Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 16:34:07 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 16:34:07 +0000 (09:34 -0700)
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove unneeded includes
  sfi: Remove unused code
  SFI: Hook PCI MMCONFIG
  x86: add arch-specific SFI support
  SFI: add capability to parse ACPI tables
  SFI: add platform-independent core support
  SFI: create linux/sfi.h
  SFI: Simple Firmware Interface - MAINTAINERS, Kconfig

2035 files changed:
Documentation/ABI/stable/sysfs-class-backlight [new file with mode: 0644]
Documentation/ABI/testing/sysfs-class-lcd [new file with mode: 0644]
Documentation/ABI/testing/sysfs-class-led [new file with mode: 0644]
Documentation/ABI/testing/sysfs-gpio
Documentation/ABI/testing/sysfs-platform-asus-laptop [new file with mode: 0644]
Documentation/ABI/testing/sysfs-platform-eeepc-laptop [new file with mode: 0644]
Documentation/DocBook/Makefile
Documentation/DocBook/dvb/.gitignore [new file with mode: 0644]
Documentation/DocBook/dvb/audio.xml [new file with mode: 0644]
Documentation/DocBook/dvb/ca.xml [new file with mode: 0644]
Documentation/DocBook/dvb/demux.xml [new file with mode: 0644]
Documentation/DocBook/dvb/dvbapi.xml [new file with mode: 0644]
Documentation/DocBook/dvb/dvbstb.pdf [new file with mode: 0644]
Documentation/DocBook/dvb/dvbstb.png [new file with mode: 0644]
Documentation/DocBook/dvb/examples.xml [new file with mode: 0644]
Documentation/DocBook/dvb/frontend.xml [new file with mode: 0644]
Documentation/DocBook/dvb/intro.xml [new file with mode: 0644]
Documentation/DocBook/dvb/isdbt.xml [new file with mode: 0644]
Documentation/DocBook/dvb/kdapi.xml [new file with mode: 0644]
Documentation/DocBook/dvb/net.xml [new file with mode: 0644]
Documentation/DocBook/dvb/video.xml [new file with mode: 0644]
Documentation/DocBook/media-entities.tmpl [new file with mode: 0644]
Documentation/DocBook/media-indices.tmpl [new file with mode: 0644]
Documentation/DocBook/media.tmpl [new file with mode: 0644]
Documentation/DocBook/mtdnand.tmpl
Documentation/DocBook/scsi.tmpl
Documentation/DocBook/stylesheet.xsl
Documentation/DocBook/v4l/.gitignore [new file with mode: 0644]
Documentation/DocBook/v4l/biblio.xml [new file with mode: 0644]
Documentation/DocBook/v4l/capture.c.xml [new file with mode: 0644]
Documentation/DocBook/v4l/common.xml [new file with mode: 0644]
Documentation/DocBook/v4l/compat.xml [new file with mode: 0644]
Documentation/DocBook/v4l/controls.xml [new file with mode: 0644]
Documentation/DocBook/v4l/crop.gif [new file with mode: 0644]
Documentation/DocBook/v4l/crop.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/dev-capture.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-codec.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-effect.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-osd.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-output.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-overlay.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-radio.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-raw-vbi.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-rds.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-sliced-vbi.xml [new file with mode: 0644]
Documentation/DocBook/v4l/dev-teletext.xml [new file with mode: 0644]
Documentation/DocBook/v4l/driver.xml [new file with mode: 0644]
Documentation/DocBook/v4l/fdl-appendix.xml [new file with mode: 0644]
Documentation/DocBook/v4l/fieldseq_bt.gif [new file with mode: 0644]
Documentation/DocBook/v4l/fieldseq_bt.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/fieldseq_tb.gif [new file with mode: 0644]
Documentation/DocBook/v4l/fieldseq_tb.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/func-close.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-ioctl.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-mmap.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-munmap.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-open.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-poll.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-read.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-select.xml [new file with mode: 0644]
Documentation/DocBook/v4l/func-write.xml [new file with mode: 0644]
Documentation/DocBook/v4l/io.xml [new file with mode: 0644]
Documentation/DocBook/v4l/keytable.c.xml [new file with mode: 0644]
Documentation/DocBook/v4l/libv4l.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-grey.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-nv12.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-nv16.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-packed-rgb.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-packed-yuv.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-sbggr16.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-sbggr8.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-sgbrg8.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-sgrbg8.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-uyvy.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-vyuy.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-y16.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-y41p.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yuv410.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yuv411p.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yuv420.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yuv422p.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yuyv.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt-yvyu.xml [new file with mode: 0644]
Documentation/DocBook/v4l/pixfmt.xml [new file with mode: 0644]
Documentation/DocBook/v4l/remote_controllers.xml [new file with mode: 0644]
Documentation/DocBook/v4l/v4l2.xml [new file with mode: 0644]
Documentation/DocBook/v4l/v4l2grab.c.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_525.gif [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_525.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_625.gif [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_625.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_hsync.gif [new file with mode: 0644]
Documentation/DocBook/v4l/vbi_hsync.pdf [new file with mode: 0644]
Documentation/DocBook/v4l/videodev2.h.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-cropcap.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-dbg-g-register.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-encoder-cmd.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enum-fmt.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enum-framesizes.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enumaudio.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enumaudioout.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enuminput.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enumoutput.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-enumstd.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-audio.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-audioout.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-crop.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-ctrl.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-enc-index.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-fbuf.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-fmt.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-frequency.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-input.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-modulator.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-output.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-parm.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-priority.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-std.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-g-tuner.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-log-status.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-overlay.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-qbuf.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-querybuf.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-querycap.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-queryctrl.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-querystd.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-reqbufs.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml [new file with mode: 0644]
Documentation/DocBook/v4l/vidioc-streamon.xml [new file with mode: 0644]
Documentation/SubmittingPatches
Documentation/accounting/getdelays.c
Documentation/auxdisplay/cfag12864b-example.c
Documentation/dvb/get_dvb_firmware
Documentation/dvb/technisat.txt
Documentation/fb/ep93xx-fb.txt [new file with mode: 0644]
Documentation/fb/matroxfb.txt
Documentation/filesystems/ncpfs.txt
Documentation/filesystems/nfs41-server.txt
Documentation/filesystems/nfsroot.txt
Documentation/filesystems/proc.txt
Documentation/gcov.txt
Documentation/gpio.txt
Documentation/hwmon/acpi_power_meter [new file with mode: 0644]
Documentation/hwmon/hpfall.c
Documentation/hwmon/pc87427
Documentation/i2c/busses/i2c-piix4
Documentation/i2c/chips/pca9539 [deleted file]
Documentation/i2c/chips/pcf8574 [deleted file]
Documentation/i2c/chips/pcf8575 [deleted file]
Documentation/ia64/aliasing-test.c
Documentation/kernel-parameters.txt
Documentation/kmemcheck.txt
Documentation/laptops/asus-laptop.txt [new file with mode: 0644]
Documentation/laptops/thinkpad-acpi.txt
Documentation/leds-class.txt
Documentation/lguest/lguest.c
Documentation/markers.txt [deleted file]
Documentation/memory.txt
Documentation/networking/regulatory.txt
Documentation/numastat.txt
Documentation/pcmcia/crc32hash.c
Documentation/powerpc/dts-bindings/fsl/esdhc.txt
Documentation/powerpc/dts-bindings/marvell.txt
Documentation/rtc.txt
Documentation/scsi/ChangeLog.megaraid
Documentation/scsi/scsi_fc_transport.txt
Documentation/sound/alsa/HD-Audio-Models.txt
Documentation/spi/spi-summary
Documentation/spi/spidev_test.c
Documentation/sysctl/kernel.txt
Documentation/sysctl/vm.txt
Documentation/trace/events-kmem.txt [new file with mode: 0644]
Documentation/trace/events.txt
Documentation/trace/ftrace.txt
Documentation/trace/postprocess/trace-pagealloc-postprocess.pl [new file with mode: 0644]
Documentation/trace/power.txt [deleted file]
Documentation/trace/tracepoint-analysis.txt [new file with mode: 0644]
Documentation/usb/authorization.txt
Documentation/usb/usbmon.txt
Documentation/video4linux/CARDLIST.cx23885
Documentation/video4linux/CARDLIST.em28xx
Documentation/video4linux/CARDLIST.saa7134
Documentation/video4linux/CARDLIST.saa7164 [new file with mode: 0644]
Documentation/video4linux/CARDLIST.tuner
Documentation/video4linux/gspca.txt
Documentation/video4linux/soc-camera.txt
Documentation/video4linux/v4l2-framework.txt
Documentation/video4linux/v4lgrab.c
Documentation/vm/00-INDEX
Documentation/vm/hugetlbpage.txt
Documentation/vm/ksm.txt [new file with mode: 0644]
Documentation/vm/map_hugetlb.c [new file with mode: 0644]
Documentation/vm/page-types.c
Documentation/vm/slabinfo.c
Documentation/watchdog/src/watchdog-test.c
Documentation/x86/earlyprintk.txt
MAINTAINERS
arch/alpha/Kconfig
arch/alpha/boot/tools/objstrip.c
arch/alpha/include/asm/hardirq.h
arch/alpha/include/asm/mman.h
arch/alpha/kernel/pci_iommu.c
arch/alpha/kernel/time.c
arch/alpha/mm/init.c
arch/alpha/mm/numa.c
arch/arm/Makefile
arch/arm/configs/n770_defconfig
arch/arm/configs/omap3_beagle_defconfig
arch/arm/configs/omap_3430sdp_defconfig
arch/arm/configs/omap_ldp_defconfig
arch/arm/include/asm/mman.h
arch/arm/include/asm/unistd.h
arch/arm/kernel/calls.S
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-qil-a9260.c
arch/arm/mach-at91/board-sam9260ek.c
arch/arm/mach-at91/board-sam9261ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c [new file with mode: 0644]
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9rlek.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-at91/include/mach/board.h
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-ep93xx/core.c
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
arch/arm/mach-ep93xx/include/mach/fb.h [new file with mode: 0644]
arch/arm/mach-ep93xx/include/mach/platform.h
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/mmc-twl4030.c
arch/arm/mach-omap2/mmc-twl4030.h
arch/arm/mm/init.c
arch/arm/plat-mxc/include/mach/spi.h [new file with mode: 0644]
arch/arm/plat-omap/include/mach/irqs.h
arch/arm/plat-omap/include/mach/lcd_mipid.h
arch/arm/plat-omap/include/mach/mmc.h
arch/arm/plat-omap/include/mach/omapfb.h
arch/avr32/include/asm/mman.h
arch/avr32/mm/init.c
arch/blackfin/include/asm/sections.h
arch/blackfin/include/asm/unistd.h
arch/blackfin/mach-bf538/include/mach/defBF539.h
arch/blackfin/mach-common/entry.S
arch/cris/include/asm/mman.h
arch/cris/mm/init.c
arch/frv/Kconfig
arch/frv/include/asm/mman.h
arch/frv/include/asm/perf_counter.h [deleted file]
arch/frv/include/asm/perf_event.h [new file with mode: 0644]
arch/frv/include/asm/unistd.h
arch/frv/kernel/entry.S
arch/frv/lib/Makefile
arch/frv/lib/cache.S
arch/frv/lib/perf_counter.c [deleted file]
arch/frv/lib/perf_event.c [new file with mode: 0644]
arch/h8300/include/asm/hardirq.h
arch/h8300/include/asm/mman.h
arch/h8300/kernel/irq.c
arch/h8300/kernel/timer/tpu.c
arch/ia64/Kconfig
arch/ia64/hp/common/sba_iommu.c
arch/ia64/ia32/sys_ia32.c
arch/ia64/include/asm/mman.h
arch/ia64/mm/init.c
arch/m32r/Kconfig
arch/m32r/include/asm/hardirq.h
arch/m32r/include/asm/mman.h
arch/m32r/kernel/ptrace.c
arch/m32r/kernel/smpboot.c
arch/m32r/kernel/time.c
arch/m32r/mm/init.c
arch/m68k/Kconfig
arch/m68k/include/asm/hardirq_mm.h
arch/m68k/include/asm/mman.h
arch/m68k/include/asm/unistd.h
arch/m68k/kernel/entry.S
arch/m68k/kernel/time.c
arch/m68k/mm/init.c
arch/m68knommu/kernel/syscalltable.S
arch/microblaze/include/asm/unistd.h
arch/microblaze/kernel/syscall_table.S
arch/microblaze/mm/init.c
arch/mips/include/asm/mman.h
arch/mips/include/asm/pgtable.h
arch/mips/include/asm/unistd.h
arch/mips/kernel/scall32-o32.S
arch/mips/kernel/scall64-64.S
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
arch/mips/loongson/common/time.c
arch/mips/mm/init.c
arch/mn10300/include/asm/cacheflush.h
arch/mn10300/include/asm/mman.h
arch/mn10300/include/asm/unistd.h
arch/mn10300/kernel/asm-offsets.c
arch/mn10300/kernel/entry.S
arch/mn10300/kernel/setup.c
arch/mn10300/mm/init.c
arch/parisc/Kconfig
arch/parisc/include/asm/mman.h
arch/parisc/include/asm/perf_counter.h [deleted file]
arch/parisc/include/asm/perf_event.h [new file with mode: 0644]
arch/parisc/include/asm/unistd.h
arch/parisc/kernel/syscall_table.S
arch/parisc/mm/init.c
arch/powerpc/Kconfig
arch/powerpc/boot/dts/mpc8377_mds.dts
arch/powerpc/boot/dts/mpc8377_rdb.dts
arch/powerpc/boot/dts/mpc8377_wlan.dts
arch/powerpc/boot/dts/mpc8378_mds.dts
arch/powerpc/boot/dts/mpc8378_rdb.dts
arch/powerpc/boot/dts/mpc8379_mds.dts
arch/powerpc/boot/dts/mpc8379_rdb.dts
arch/powerpc/include/asm/hw_irq.h
arch/powerpc/include/asm/mman.h
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/perf_counter.h [deleted file]
arch/powerpc/include/asm/perf_event.h [new file with mode: 0644]
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/mpc7450-pmu.c
arch/powerpc/kernel/perf_callchain.c
arch/powerpc/kernel/perf_counter.c [deleted file]
arch/powerpc/kernel/perf_event.c [new file with mode: 0644]
arch/powerpc/kernel/power4-pmu.c
arch/powerpc/kernel/power5+-pmu.c
arch/powerpc/kernel/power5-pmu.c
arch/powerpc/kernel/power6-pmu.c
arch/powerpc/kernel/power7-pmu.c
arch/powerpc/kernel/ppc970-pmu.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/udbg_16550.c
arch/powerpc/mm/fault.c
arch/powerpc/mm/init_32.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/mem.c
arch/powerpc/platforms/Kconfig.cputype
arch/powerpc/platforms/cell/spufs/file.c
arch/powerpc/platforms/cell/spufs/inode.c
arch/powerpc/platforms/cell/spufs/sched.c
arch/powerpc/platforms/powermac/udbg_scc.c
arch/powerpc/platforms/pseries/hvCall_inst.c
arch/powerpc/sysdev/axonram.c
arch/s390/Kconfig
arch/s390/hypfs/inode.c
arch/s390/include/asm/mman.h
arch/s390/include/asm/perf_counter.h [deleted file]
arch/s390/include/asm/perf_event.h [new file with mode: 0644]
arch/s390/include/asm/unistd.h
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/sys_s390.c
arch/s390/kernel/syscalls.S
arch/s390/kvm/interrupt.c
arch/s390/mm/fault.c
arch/s390/mm/init.c
arch/score/include/asm/page.h
arch/score/include/asm/thread_info.h
arch/score/kernel/vmlinux.lds.S
arch/sh/Kconfig
arch/sh/boards/board-ap325rxa.c
arch/sh/include/asm/perf_counter.h [deleted file]
arch/sh/include/asm/perf_event.h [new file with mode: 0644]
arch/sh/include/asm/unistd_32.h
arch/sh/include/asm/unistd_64.h
arch/sh/kernel/syscalls_32.S
arch/sh/kernel/syscalls_64.S
arch/sh/mm/fault_32.c
arch/sh/mm/init.c
arch/sh/mm/tlbflush_64.c
arch/sparc/Kconfig
arch/sparc/include/asm/mman.h
arch/sparc/include/asm/perf_counter.h [deleted file]
arch/sparc/include/asm/perf_event.h [new file with mode: 0644]
arch/sparc/include/asm/unistd.h
arch/sparc/include/asm/vio.h
arch/sparc/kernel/Makefile
arch/sparc/kernel/irq_64.c
arch/sparc/kernel/nmi.c
arch/sparc/kernel/pcr.c
arch/sparc/kernel/perf_counter.c [deleted file]
arch/sparc/kernel/perf_event.c [new file with mode: 0644]
arch/sparc/kernel/systbls_32.S
arch/sparc/kernel/systbls_64.S
arch/sparc/mm/init_32.c
arch/um/drivers/net_kern.c
arch/um/drivers/ubd_kern.c
arch/um/include/asm/hardirq.h
arch/um/include/shared/ptrace_user.h
arch/um/kernel/mem.c
arch/um/kernel/skas/mmu.c
arch/um/os-Linux/helper.c
arch/x86/Kconfig
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/apic.h
arch/x86/include/asm/entry_arch.h
arch/x86/include/asm/perf_counter.h [deleted file]
arch/x86/include/asm/perf_event.h [new file with mode: 0644]
arch/x86/include/asm/string_32.h
arch/x86/include/asm/syscall.h
arch/x86/include/asm/uaccess_32.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/include/asm/uv/uv_hub.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/probe_64.c
arch/x86/kernel/apic/x2apic_uv_x.c
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/mcheck/mce_amd.c
arch/x86/kernel/cpu/mtrr/if.c
arch/x86/kernel/cpu/perf_counter.c [deleted file]
arch/x86/kernel/cpu/perf_event.c [new file with mode: 0644]
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/kernel/cpu/vmware.c
arch/x86/kernel/cpuid.c
arch/x86/kernel/e820.c
arch/x86/kernel/early_printk.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/irqinit.c
arch/x86/kernel/microcode_core.c
arch/x86/kernel/msr.c
arch/x86/kernel/process.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/setup.c
arch/x86/kernel/syscall_table_32.S
arch/x86/kernel/trampoline.c
arch/x86/kernel/trampoline_32.S
arch/x86/kernel/trampoline_64.S
arch/x86/kernel/traps.c
arch/x86/kernel/tsc.c
arch/x86/kernel/vmlinux.lds.S
arch/x86/lguest/boot.c
arch/x86/mm/fault.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/kmemcheck/kmemcheck.c
arch/x86/mm/kmemcheck/shadow.c
arch/x86/oprofile/op_model_ppro.c
arch/x86/oprofile/op_x86_model.h
arch/x86/power/cpu.c
arch/xtensa/include/asm/mman.h
arch/xtensa/mm/init.c
block/bsg.c
block/genhd.c
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/acpi/acpi_memhotplug.c
drivers/acpi/acpica/Makefile
drivers/acpi/acpica/acconfig.h
drivers/acpi/acpica/acdebug.h
drivers/acpi/acpica/acglobal.h
drivers/acpi/acpica/achware.h
drivers/acpi/acpica/acinterp.h
drivers/acpi/acpica/aclocal.h
drivers/acpi/acpica/acmacros.h
drivers/acpi/acpica/acnamesp.h
drivers/acpi/acpica/acobject.h
drivers/acpi/acpica/acparser.h
drivers/acpi/acpica/acpredef.h
drivers/acpi/acpica/acutils.h
drivers/acpi/acpica/amlcode.h
drivers/acpi/acpica/dsfield.c
drivers/acpi/acpica/dsmethod.c
drivers/acpi/acpica/dsmthdat.c
drivers/acpi/acpica/dsobject.c
drivers/acpi/acpica/dswload.c
drivers/acpi/acpica/evgpe.c
drivers/acpi/acpica/evgpeblk.c
drivers/acpi/acpica/evrgnini.c
drivers/acpi/acpica/exconfig.c
drivers/acpi/acpica/exdump.c
drivers/acpi/acpica/exfield.c
drivers/acpi/acpica/exfldio.c
drivers/acpi/acpica/exutils.c
drivers/acpi/acpica/hwgpe.c
drivers/acpi/acpica/hwregs.c
drivers/acpi/acpica/hwtimer.c
drivers/acpi/acpica/hwxface.c
drivers/acpi/acpica/nsalloc.c
drivers/acpi/acpica/nsdumpdv.c
drivers/acpi/acpica/nseval.c
drivers/acpi/acpica/nsinit.c
drivers/acpi/acpica/nsload.c
drivers/acpi/acpica/nspredef.c
drivers/acpi/acpica/nsrepair.c [new file with mode: 0644]
drivers/acpi/acpica/nsutils.c
drivers/acpi/acpica/nsxfeval.c
drivers/acpi/acpica/nsxfname.c
drivers/acpi/acpica/psloop.c
drivers/acpi/acpica/psxface.c
drivers/acpi/acpica/tbfadt.c
drivers/acpi/acpica/tbutils.c
drivers/acpi/acpica/utdelete.c
drivers/acpi/acpica/uteval.c
drivers/acpi/acpica/utglobal.c
drivers/acpi/acpica/utids.c [new file with mode: 0644]
drivers/acpi/acpica/utinit.c
drivers/acpi/acpica/utmisc.c
drivers/acpi/acpica/utxface.c
drivers/acpi/battery.c
drivers/acpi/bus.c
drivers/acpi/container.c
drivers/acpi/debug.c
drivers/acpi/dock.c
drivers/acpi/ec.c
drivers/acpi/glue.c
drivers/acpi/osl.c
drivers/acpi/pci_slot.c
drivers/acpi/power_meter.c [new file with mode: 0644]
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/processor_thermal.c
drivers/acpi/processor_throttling.c
drivers/acpi/scan.c
drivers/acpi/sleep.c
drivers/acpi/video.c
drivers/ata/pata_hpt37x.c
drivers/base/core.c
drivers/base/devtmpfs.c
drivers/base/node.c
drivers/block/DAC960.c
drivers/block/amiflop.c
drivers/block/aoe/aoeblk.c
drivers/block/aoe/aoechr.c
drivers/block/ataflop.c
drivers/block/brd.c
drivers/block/cciss.c
drivers/block/cpqarray.c
drivers/block/floppy.c
drivers/block/hd.c
drivers/block/loop.c
drivers/block/mg_disk.c
drivers/block/nbd.c
drivers/block/osdblk.c
drivers/block/paride/pcd.c
drivers/block/paride/pd.c
drivers/block/paride/pf.c
drivers/block/pktcdvd.c
drivers/block/ps3disk.c
drivers/block/ps3vram.c
drivers/block/sunvdc.c
drivers/block/swim.c
drivers/block/swim3.c
drivers/block/sx8.c
drivers/block/ub.c
drivers/block/umem.c
drivers/block/viodasd.c
drivers/block/virtio_blk.c
drivers/block/xd.c
drivers/block/xen-blkfront.c
drivers/block/xsysace.c
drivers/block/z2ram.c
drivers/cdrom/gdrom.c
drivers/cdrom/viocd.c
drivers/char/agp/backend.c
drivers/char/agp/hp-agp.c
drivers/char/agp/uninorth-agp.c
drivers/char/cyclades.c
drivers/char/epca.c
drivers/char/esp.c
drivers/char/hw_random/core.c
drivers/char/hw_random/virtio-rng.c
drivers/char/ipmi/ipmi_poweroff.c
drivers/char/isicom.c
drivers/char/mem.c
drivers/char/misc.c
drivers/char/mxser.c
drivers/char/n_tty.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/raw.c
drivers/char/riscom8.c
drivers/char/sysrq.c
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm_bios.c
drivers/char/tty_io.c
drivers/char/tty_ioctl.c
drivers/char/tty_ldisc.c
drivers/char/tty_port.c
drivers/char/virtio_console.c
drivers/char/vt.c
drivers/char/vt_ioctl.c
drivers/connector/cn_proc.c
drivers/cpuidle/cpuidle.c
drivers/cpuidle/governors/menu.c
drivers/edac/edac_core.h
drivers/firmware/memmap.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/adp5520-gpio.c [new file with mode: 0644]
drivers/gpio/bt8xxgpio.c
drivers/gpio/gpiolib.c
drivers/gpio/langwell_gpio.c [new file with mode: 0644]
drivers/gpio/max7301.c
drivers/gpio/mc33880.c [new file with mode: 0644]
drivers/gpio/mcp23s08.c
drivers/gpio/pca953x.c
drivers/gpio/pcf857x.c
drivers/gpio/ucb1400_gpio.c [new file with mode: 0644]
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_bufs.c
drivers/gpu/drm/drm_cache.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_encoder_slave.c [new file with mode: 0644]
drivers/gpu/drm/drm_fb_helper.c [new file with mode: 0644]
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/drm_mm.c
drivers/gpu/drm/drm_modes.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_debugfs.c [new file with mode: 0644]
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_debugfs.c [deleted file]
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_i2c.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/i915/intel_tv.c
drivers/gpu/drm/mga/mga_dma.c
drivers/gpu/drm/mga/mga_drv.h
drivers/gpu/drm/mga/mga_state.c
drivers/gpu/drm/mga/mga_ucode.h [deleted file]
drivers/gpu/drm/mga/mga_warp.c
drivers/gpu/drm/r128/r128_cce.c
drivers/gpu/drm/r128/r128_drv.h
drivers/gpu/drm/r128/r128_state.c
drivers/gpu/drm/radeon/Kconfig
drivers/gpu/drm/radeon/Makefile
drivers/gpu/drm/radeon/atombios.h
drivers/gpu/drm/radeon/atombios_crtc.c
drivers/gpu/drm/radeon/avivod.h [new file with mode: 0644]
drivers/gpu/drm/radeon/mkregtable.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r100_track.h [new file with mode: 0644]
drivers/gpu/drm/radeon/r100d.h [new file with mode: 0644]
drivers/gpu/drm/radeon/r200.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r300.h [deleted file]
drivers/gpu/drm/radeon/r300d.h [new file with mode: 0644]
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/r420d.h [new file with mode: 0644]
drivers/gpu/drm/radeon/r520.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_blit.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_blit_kms.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_blit_shaders.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_blit_shaders.h [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_cp.c
drivers/gpu/drm/radeon/r600_cs.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_microcode.h [deleted file]
drivers/gpu/drm/radeon/r600d.h [new file with mode: 0644]
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_clocks.c
drivers/gpu/drm/radeon/radeon_combios.c
drivers/gpu/drm/radeon/radeon_connectors.c
drivers/gpu/drm/radeon/radeon_cp.c
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/radeon/radeon_drv.h
drivers/gpu/drm/radeon/radeon_encoders.c
drivers/gpu/drm/radeon/radeon_fb.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/gpu/drm/radeon/radeon_gart.c
drivers/gpu/drm/radeon/radeon_ioc32.c
drivers/gpu/drm/radeon/radeon_irq.c
drivers/gpu/drm/radeon/radeon_irq_kms.c
drivers/gpu/drm/radeon/radeon_kms.c
drivers/gpu/drm/radeon/radeon_legacy_crtc.c
drivers/gpu/drm/radeon/radeon_legacy_encoders.c
drivers/gpu/drm/radeon/radeon_legacy_tv.c [new file with mode: 0644]
drivers/gpu/drm/radeon/radeon_microcode.h [deleted file]
drivers/gpu/drm/radeon/radeon_mode.h
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/radeon/radeon_object.h
drivers/gpu/drm/radeon/radeon_reg.h
drivers/gpu/drm/radeon/radeon_ring.c
drivers/gpu/drm/radeon/radeon_share.h [deleted file]
drivers/gpu/drm/radeon/radeon_state.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/reg_srcs/r100 [new file with mode: 0644]
drivers/gpu/drm/radeon/reg_srcs/r200 [new file with mode: 0644]
drivers/gpu/drm/radeon/reg_srcs/r300 [new file with mode: 0644]
drivers/gpu/drm/radeon/reg_srcs/rn50 [new file with mode: 0644]
drivers/gpu/drm/radeon/reg_srcs/rs600 [new file with mode: 0644]
drivers/gpu/drm/radeon/reg_srcs/rv515 [new file with mode: 0644]
drivers/gpu/drm/radeon/rs400.c
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rs780.c [deleted file]
drivers/gpu/drm/radeon/rv515.c
drivers/gpu/drm/radeon/rv515d.h [new file with mode: 0644]
drivers/gpu/drm/radeon/rv515r.h [deleted file]
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/radeon/rv770d.h [new file with mode: 0644]
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/ttm/ttm_bo_util.c
drivers/gpu/drm/ttm/ttm_global.c
drivers/gpu/drm/ttm/ttm_memory.c
drivers/gpu/drm/ttm/ttm_module.c
drivers/gpu/drm/ttm/ttm_tt.c
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hiddev.c
drivers/hwmon/adcxx.c
drivers/hwmon/adm1021.c
drivers/hwmon/applesmc.c
drivers/hwmon/coretemp.c
drivers/hwmon/dme1737.c
drivers/hwmon/lis3lv02d.c
drivers/hwmon/lis3lv02d.h
drivers/hwmon/lis3lv02d_spi.c
drivers/hwmon/lm70.c
drivers/hwmon/max1111.c
drivers/hwmon/sht15.c
drivers/i2c/Kconfig
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-mv64xxx.c
drivers/i2c/busses/i2c-piix4.c
drivers/i2c/busses/i2c-pnx.c
drivers/i2c/busses/i2c-scmi.c [new file with mode: 0644]
drivers/i2c/busses/i2c-taos-evm.c
drivers/i2c/busses/scx200_acb.c
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/i2c/chips/pca9539.c [deleted file]
drivers/i2c/chips/pcf8574.c [deleted file]
drivers/i2c/chips/pcf8575.c [deleted file]
drivers/i2c/chips/tsl2550.c
drivers/i2c/i2c-core.c
drivers/ide/ide-acpi.c
drivers/ide/ide-cd.c
drivers/ide/ide-gd.c
drivers/ide/ide-probe.c
drivers/ide/ide-tape.c
drivers/ide/umc8672.c
drivers/infiniband/hw/ehca/ehca_mrmw.c
drivers/infiniband/hw/ipath/ipath_iba6110.c
drivers/input/input.c
drivers/input/keyboard/atkbd.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/winbond-cir.c [new file with mode: 0644]
drivers/input/touchscreen/ad7877.c
drivers/input/touchscreen/ad7879.c
drivers/input/touchscreen/ads7846.c
drivers/isdn/capi/capifs.c
drivers/isdn/capi/capiutil.c
drivers/isdn/capi/kcapi_proc.c
drivers/isdn/gigaset/interface.c
drivers/isdn/i4l/isdn_common.c
drivers/leds/leds-dac124s085.c
drivers/lguest/core.c
drivers/lguest/page_tables.c
drivers/macintosh/rack-meter.c
drivers/md/dm-ioctl.c
drivers/md/dm.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/media/common/tuners/tda18271-common.c
drivers/media/common/tuners/tda18271-fe.c
drivers/media/common/tuners/tda18271-maps.c
drivers/media/common/tuners/tda18271-priv.h
drivers/media/common/tuners/tda18271.h
drivers/media/common/tuners/tuner-types.c
drivers/media/dvb/Kconfig
drivers/media/dvb/Makefile
drivers/media/dvb/dvb-core/dvb_frontend.c
drivers/media/dvb/dvb-core/dvb_frontend.h
drivers/media/dvb/dvb-core/dvbdev.c
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/dvb/dvb-usb/Makefile
drivers/media/dvb/dvb-usb/af9015.c
drivers/media/dvb/dvb-usb/anysee.c
drivers/media/dvb/dvb-usb/ce6230.c
drivers/media/dvb/dvb-usb/dib0700_devices.c
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
drivers/media/dvb/dvb-usb/friio-fe.c [new file with mode: 0644]
drivers/media/dvb/dvb-usb/friio.c [new file with mode: 0644]
drivers/media/dvb/dvb-usb/friio.h [new file with mode: 0644]
drivers/media/dvb/dvb-usb/m920x.c
drivers/media/dvb/frontends/Kconfig
drivers/media/dvb/frontends/Makefile
drivers/media/dvb/frontends/au8522_decoder.c
drivers/media/dvb/frontends/dib0070.c
drivers/media/dvb/frontends/dib0070.h
drivers/media/dvb/frontends/dib7000p.c
drivers/media/dvb/frontends/dib8000.c [new file with mode: 0644]
drivers/media/dvb/frontends/dib8000.h [new file with mode: 0644]
drivers/media/dvb/frontends/dibx000_common.c
drivers/media/dvb/frontends/dibx000_common.h
drivers/media/dvb/frontends/lgdt3304.c
drivers/media/dvb/frontends/s921_module.c
drivers/media/dvb/pt1/Kconfig [new file with mode: 0644]
drivers/media/dvb/pt1/Makefile [new file with mode: 0644]
drivers/media/dvb/pt1/pt1.c [new file with mode: 0644]
drivers/media/dvb/pt1/va1j5jf8007s.c [new file with mode: 0644]
drivers/media/dvb/pt1/va1j5jf8007s.h [new file with mode: 0644]
drivers/media/dvb/pt1/va1j5jf8007t.c [new file with mode: 0644]
drivers/media/dvb/pt1/va1j5jf8007t.h [new file with mode: 0644]
drivers/media/dvb/siano/smscoreapi.c
drivers/media/dvb/siano/smscoreapi.h
drivers/media/radio/Kconfig
drivers/media/radio/radio-mr800.c
drivers/media/radio/radio-si4713.c
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/adv7180.c [new file with mode: 0644]
drivers/media/video/adv7343.c
drivers/media/video/au0828/au0828-cards.c
drivers/media/video/bt8xx/bttv-cards.c
drivers/media/video/cafe_ccic.c
drivers/media/video/cx18/cx18-driver.c
drivers/media/video/cx18/cx18-i2c.c
drivers/media/video/cx18/cx18-streams.c
drivers/media/video/cx231xx/cx231xx-cards.c
drivers/media/video/cx23885/cimax2.c
drivers/media/video/cx23885/cx23885-cards.c
drivers/media/video/cx23885/cx23885-core.c
drivers/media/video/cx23885/cx23885-dvb.c
drivers/media/video/cx23885/cx23885-video.c
drivers/media/video/cx23885/cx23885.h
drivers/media/video/cx23885/netup-eeprom.c
drivers/media/video/cx88/cx88-blackbird.c
drivers/media/video/cx88/cx88-cards.c
drivers/media/video/cx88/cx88-dvb.c
drivers/media/video/cx88/cx88-mpeg.c
drivers/media/video/cx88/cx88-video.c
drivers/media/video/dabusb.c
drivers/media/video/davinci/Makefile [new file with mode: 0644]
drivers/media/video/davinci/ccdc_hw_device.h [new file with mode: 0644]
drivers/media/video/davinci/dm355_ccdc.c [new file with mode: 0644]
drivers/media/video/davinci/dm355_ccdc_regs.h [new file with mode: 0644]
drivers/media/video/davinci/dm644x_ccdc.c [new file with mode: 0644]
drivers/media/video/davinci/dm644x_ccdc_regs.h [new file with mode: 0644]
drivers/media/video/davinci/vpfe_capture.c [new file with mode: 0644]
drivers/media/video/davinci/vpif.c [new file with mode: 0644]
drivers/media/video/davinci/vpif.h [new file with mode: 0644]
drivers/media/video/davinci/vpif_capture.c [new file with mode: 0644]
drivers/media/video/davinci/vpif_capture.h [new file with mode: 0644]
drivers/media/video/davinci/vpif_display.c [new file with mode: 0644]
drivers/media/video/davinci/vpif_display.h [new file with mode: 0644]
drivers/media/video/davinci/vpss.c [new file with mode: 0644]
drivers/media/video/em28xx/Kconfig
drivers/media/video/em28xx/Makefile
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/em28xx/em28xx-core.c
drivers/media/video/em28xx/em28xx-dvb.c
drivers/media/video/em28xx/em28xx-reg.h
drivers/media/video/em28xx/em28xx-vbi.c [new file with mode: 0644]
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/em28xx/em28xx.h
drivers/media/video/et61x251/et61x251_core.c
drivers/media/video/gspca/Kconfig
drivers/media/video/gspca/Makefile
drivers/media/video/gspca/gl860/Kconfig [new file with mode: 0644]
drivers/media/video/gspca/gl860/Makefile [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860-mi1320.c [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860-mi2020.c [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860-ov2640.c [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860-ov9655.c [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860.c [new file with mode: 0644]
drivers/media/video/gspca/gl860/gl860.h [new file with mode: 0644]
drivers/media/video/gspca/jeilinj.c
drivers/media/video/gspca/m5602/m5602_core.c
drivers/media/video/gspca/m5602/m5602_ov7660.c
drivers/media/video/gspca/m5602/m5602_ov7660.h
drivers/media/video/gspca/m5602/m5602_s5k4aa.c
drivers/media/video/gspca/stv06xx/stv06xx.c
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h
drivers/media/video/gspca/stv06xx/stv06xx_st6422.c
drivers/media/video/gspca/vc032x.c
drivers/media/video/ivtv/ivtv-driver.c
drivers/media/video/ivtv/ivtv-i2c.c
drivers/media/video/ivtv/ivtv-streams.c
drivers/media/video/mt9m001.c
drivers/media/video/mt9m111.c
drivers/media/video/mt9t031.c
drivers/media/video/mt9v022.c
drivers/media/video/mx1_camera.c
drivers/media/video/mx3_camera.c
drivers/media/video/mxb.c
drivers/media/video/ov772x.c
drivers/media/video/pvrusb2/pvrusb2-devattr.c
drivers/media/video/pvrusb2/pvrusb2-hdw.c
drivers/media/video/pxa_camera.c
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-core.c
drivers/media/video/saa7134/saa7134-dvb.c
drivers/media/video/saa7134/saa7134-input.c
drivers/media/video/saa7134/saa7134.h
drivers/media/video/saa7164/Kconfig [new file with mode: 0644]
drivers/media/video/saa7164/Makefile [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-api.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-buffer.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-bus.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-cards.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-cmd.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-core.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-dvb.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-fw.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-i2c.c [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-reg.h [new file with mode: 0644]
drivers/media/video/saa7164/saa7164-types.h [new file with mode: 0644]
drivers/media/video/saa7164/saa7164.h [new file with mode: 0644]
drivers/media/video/sh_mobile_ceu_camera.c
drivers/media/video/sn9c102/sn9c102_core.c
drivers/media/video/soc_camera.c
drivers/media/video/soc_camera_platform.c
drivers/media/video/tuner-core.c
drivers/media/video/tvp514x.c
drivers/media/video/tvp514x_regs.h
drivers/media/video/tw9910.c
drivers/media/video/usbvision/usbvision-i2c.c
drivers/media/video/uvc/uvc_video.c
drivers/media/video/v4l1-compat.c
drivers/media/video/v4l2-common.c
drivers/media/video/v4l2-dev.c
drivers/media/video/vino.c
drivers/media/video/w9968cf.c
drivers/media/video/zc0301/zc0301_core.c
drivers/media/video/zoran/zoran_card.c
drivers/memstick/core/mspro_block.c
drivers/message/fusion/mptbase.c
drivers/message/i2o/i2o_block.c
drivers/mfd/ab3100-core.c
drivers/mfd/ezx-pcap.c
drivers/mfd/ucb1400_core.c
drivers/misc/eeprom/at25.c
drivers/misc/ibmasm/ibmasmfs.c
drivers/misc/lkdtm.c
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/core.h
drivers/mmc/core/host.c
drivers/mmc/core/host.h
drivers/mmc/core/mmc.c
drivers/mmc/core/mmc_ops.c
drivers/mmc/core/mmc_ops.h
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/core/sdio_bus.c
drivers/mmc/core/sdio_cis.c
drivers/mmc/core/sdio_io.c
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/mmc_spi.c
drivers/mmc/host/msm_sdcc.c [new file with mode: 0644]
drivers/mmc/host/msm_sdcc.h [new file with mode: 0644]
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/sdhci-of.c
drivers/mmc/host/sdhci-pci.c
drivers/mmc/host/sdhci.c
drivers/mmc/host/sdhci.h
drivers/mtd/devices/m25p80.c
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/devices/slram.c
drivers/mtd/ftl.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/nand/cafe_nand.c
drivers/mtd/nand/cmx270_nand.c
drivers/mtd/ubi/debug.c
drivers/mtd/ubi/debug.h
drivers/mtd/ubi/eba.c
drivers/mtd/ubi/io.c
drivers/mtd/ubi/scan.c
drivers/mtd/ubi/scan.h
drivers/mtd/ubi/ubi.h
drivers/net/arcnet/arc-rawmode.c
drivers/net/arcnet/capmode.c
drivers/net/bnx2x_reg.h
drivers/net/bonding/bond_3ad.c
drivers/net/e1000/e1000_hw.c
drivers/net/ehea/ehea_qmr.c
drivers/net/enc28j60.c
drivers/net/gianfar_ethtool.c
drivers/net/ibm_newemac/core.c
drivers/net/igb/igb_main.c
drivers/net/ks8851.c
drivers/net/ll_temac_main.c
drivers/net/macb.c
drivers/net/ni52.c
drivers/net/niu.c
drivers/net/qlge/qlge_main.c
drivers/net/rionet.c
drivers/net/skfp/pcmplc.c
drivers/net/skfp/pmf.c
drivers/net/skge.c
drivers/net/sky2.c
drivers/net/slip.c
drivers/net/tun.c
drivers/net/usb/cdc_eem.c
drivers/net/virtio_net.c
drivers/net/vxge/vxge-config.h
drivers/net/vxge/vxge-main.c
drivers/net/wireless/ath/ath5k/reg.h
drivers/net/wireless/atmel.c
drivers/net/wireless/libertas/if_spi.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/wl12xx/wl1251_main.c
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/of/base.c
drivers/oprofile/oprofilefs.c
drivers/parisc/ccio-dma.c
drivers/parisc/sba_iommu.c
drivers/pci/dmar.c
drivers/pci/hotplug/acpiphp_ibm.c
drivers/pcmcia/pcmcia_ioctl.c
drivers/pcmcia/sa1100_jornada720.c
drivers/pcmcia/yenta_socket.c
drivers/platform/x86/Kconfig
drivers/platform/x86/Makefile
drivers/platform/x86/acerhdf.c
drivers/platform/x86/asus-laptop.c
drivers/platform/x86/eeepc-laptop.c
drivers/platform/x86/fujitsu-laptop.c
drivers/platform/x86/hp-wmi.c
drivers/platform/x86/sony-laptop.c
drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/topstar-laptop.c [new file with mode: 0644]
drivers/pnp/driver.c
drivers/pnp/pnpacpi/core.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/rtc-at91rm9200.c
drivers/rtc/rtc-bfin.c
drivers/rtc/rtc-coh901331.c [new file with mode: 0644]
drivers/rtc/rtc-ds1305.c
drivers/rtc/rtc-ds1307.c
drivers/rtc/rtc-ds1390.c
drivers/rtc/rtc-ds3234.c
drivers/rtc/rtc-ep93xx.c
drivers/rtc/rtc-m41t94.c
drivers/rtc/rtc-max6902.c
drivers/rtc/rtc-mxc.c [new file with mode: 0644]
drivers/rtc/rtc-omap.c
drivers/rtc/rtc-pcap.c [new file with mode: 0644]
drivers/rtc/rtc-pcf2123.c [new file with mode: 0644]
drivers/rtc/rtc-r9701.c
drivers/rtc/rtc-rs5c348.c
drivers/rtc/rtc-stmp3xxx.c [new file with mode: 0644]
drivers/rtc/rtc-sysfs.c
drivers/s390/block/dasd.c
drivers/s390/block/dasd_eckd.c
drivers/s390/block/dasd_int.h
drivers/s390/block/dcssblk.c
drivers/s390/block/xpram.c
drivers/s390/char/tape_block.c
drivers/s390/net/netiucv.c
drivers/s390/scsi/zfcp_scsi.c
drivers/sbus/char/jsflash.c
drivers/scsi/aic7xxx/aic7xxx_core.c
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/fcoe/libfcoe.c
drivers/scsi/ibmvscsi/ibmvscsi.c
drivers/scsi/lpfc/lpfc_ct.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/qla4xxx/ql4_os.c
drivers/scsi/sd.c
drivers/scsi/sg.c
drivers/scsi/sr.c
drivers/serial/21285.c
drivers/serial/8250.c
drivers/serial/8250.h
drivers/serial/amba-pl010.c
drivers/serial/amba-pl011.c
drivers/serial/atmel_serial.c
drivers/serial/bfin_5xx.c
drivers/serial/bfin_sport_uart.c
drivers/serial/clps711x.c
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/dz.c
drivers/serial/icom.c
drivers/serial/imx.c
drivers/serial/ioc3_serial.c
drivers/serial/ioc4_serial.c
drivers/serial/ip22zilog.c
drivers/serial/jsm/jsm_neo.c
drivers/serial/jsm/jsm_tty.c
drivers/serial/m32r_sio.c
drivers/serial/max3100.c
drivers/serial/mcf.c
drivers/serial/mpc52xx_uart.c
drivers/serial/mpsc.c
drivers/serial/msm_serial.c
drivers/serial/mux.c
drivers/serial/netx-serial.c
drivers/serial/nwpserial.c
drivers/serial/pmac_zilog.c
drivers/serial/pnx8xxx_uart.c
drivers/serial/pxa.c
drivers/serial/sa1100.c
drivers/serial/samsung.c
drivers/serial/sb1250-duart.c
drivers/serial/sc26xx.c
drivers/serial/serial_core.c
drivers/serial/serial_cs.c
drivers/serial/serial_ks8695.c
drivers/serial/serial_lh7a40x.c
drivers/serial/serial_txx9.c
drivers/serial/sh-sci.c
drivers/serial/sn_console.c
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/serial/timbuart.c
drivers/serial/uartlite.c
drivers/serial/ucc_uart.c
drivers/serial/vr41xx_siu.c
drivers/serial/zs.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/mxc_spi.c [new file with mode: 0644]
drivers/spi/omap2_mcspi.c
drivers/spi/omap_uwire.c
drivers/spi/pxa2xx_spi.c
drivers/spi/spi.c
drivers/spi/spi_imx.c [deleted file]
drivers/spi/spi_ppc4xx.c [new file with mode: 0644]
drivers/spi/spi_s3c24xx.c
drivers/spi/spi_stmp.c [new file with mode: 0644]
drivers/spi/spidev.c
drivers/spi/tle62x0.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cx25821/Kconfig [new file with mode: 0644]
drivers/staging/cx25821/Makefile [new file with mode: 0644]
drivers/staging/cx25821/README [new file with mode: 0644]
drivers/staging/cx25821/cx25821-alsa.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-audio-upstream.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-audio-upstream.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-audio.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-audups11.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-biffuncs.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-cards.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-core.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-gpio.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-gpio.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-i2c.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-medusa-defines.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-medusa-reg.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-medusa-video.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-medusa-video.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-reg.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-sram.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video-upstream-ch2.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video-upstream-ch2.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video-upstream.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video-upstream.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video.h [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video0.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video1.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video2.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video3.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video4.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video5.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video6.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-video7.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-videoioctl.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-vidups10.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821-vidups9.c [new file with mode: 0644]
drivers/staging/cx25821/cx25821.h [new file with mode: 0644]
drivers/staging/go7007/Kconfig
drivers/staging/go7007/Makefile
drivers/staging/go7007/go7007-driver.c
drivers/staging/go7007/go7007-fw.c
drivers/staging/go7007/go7007-i2c.c
drivers/staging/go7007/go7007-priv.h
drivers/staging/go7007/go7007-usb.c
drivers/staging/go7007/go7007-v4l2.c
drivers/staging/go7007/go7007.txt
drivers/staging/go7007/s2250-board.c
drivers/staging/go7007/s2250-loader.c
drivers/staging/go7007/snd-go7007.c
drivers/staging/go7007/wis-tw9903.c
drivers/staging/iio/industrialio-core.c
drivers/staging/rt2860/rtmp.h
drivers/staging/stlc45xx/stlc45xx.c
drivers/thermal/Kconfig
drivers/usb/Kconfig
drivers/usb/Makefile
drivers/usb/class/cdc-acm.c
drivers/usb/class/cdc-wdm.c
drivers/usb/class/usblp.c
drivers/usb/class/usbtmc.c
drivers/usb/core/config.c
drivers/usb/core/devio.c
drivers/usb/core/driver.c
drivers/usb/core/file.c
drivers/usb/core/generic.c
drivers/usb/core/hcd.c
drivers/usb/core/hcd.h
drivers/usb/core/hub.c
drivers/usb/core/inode.c
drivers/usb/core/message.c
drivers/usb/core/usb.c
drivers/usb/core/usb.h
drivers/usb/early/Makefile [new file with mode: 0644]
drivers/usb/early/ehci-dbgp.c [new file with mode: 0644]
drivers/usb/gadget/Kconfig
drivers/usb/gadget/amd5536udc.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/audio.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/dummy_hcd.c
drivers/usb/gadget/ether.c
drivers/usb/gadget/f_audio.c
drivers/usb/gadget/f_eem.c [new file with mode: 0644]
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/fsl_qe_udc.c
drivers/usb/gadget/gmidi.c
drivers/usb/gadget/inode.c
drivers/usb/gadget/pxa25x_udc.c
drivers/usb/gadget/pxa25x_udc.h
drivers/usb/gadget/rndis.c
drivers/usb/gadget/rndis.h
drivers/usb/gadget/s3c-hsotg.c
drivers/usb/gadget/s3c2410_udc.c
drivers/usb/gadget/u_audio.c
drivers/usb/gadget/u_ether.c
drivers/usb/gadget/u_ether.h
drivers/usb/gadget/u_serial.c
drivers/usb/host/Kconfig
drivers/usb/host/Makefile
drivers/usb/host/ehci-atmel.c [new file with mode: 0644]
drivers/usb/host/ehci-au1xxx.c
drivers/usb/host/ehci-dbg.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-mem.c
drivers/usb/host/ehci-pci.c
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci-w90x900.c [new file with mode: 0644]
drivers/usb/host/ehci.h
drivers/usb/host/isp1362-hcd.c [new file with mode: 0644]
drivers/usb/host/isp1362.h [new file with mode: 0644]
drivers/usb/host/isp1760-hcd.c
drivers/usb/host/isp1760-hcd.h
drivers/usb/host/isp1760-if.c
drivers/usb/host/ohci-at91.c
drivers/usb/host/ohci-au1xxx.c
drivers/usb/host/ohci-ep93xx.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-pxa27x.c
drivers/usb/host/ohci-q.c
drivers/usb/host/oxu210hp-hcd.c
drivers/usb/host/pci-quirks.c
drivers/usb/host/sl811-hcd.c
drivers/usb/host/uhci-q.c
drivers/usb/host/whci/asl.c
drivers/usb/host/whci/hcd.c
drivers/usb/host/whci/pzl.c
drivers/usb/host/whci/qset.c
drivers/usb/host/whci/whci-hc.h
drivers/usb/host/xhci-dbg.c
drivers/usb/host/xhci-hcd.c
drivers/usb/host/xhci-mem.c
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.h
drivers/usb/image/microtek.c
drivers/usb/misc/idmouse.c
drivers/usb/misc/iowarrior.c
drivers/usb/misc/ldusb.c
drivers/usb/misc/legousbtower.c
drivers/usb/misc/sisusbvga/sisusb.c
drivers/usb/misc/sisusbvga/sisusb.h
drivers/usb/misc/usbsevseg.c
drivers/usb/mon/Kconfig
drivers/usb/mon/Makefile
drivers/usb/mon/mon_bin.c
drivers/usb/mon/mon_dma.c [deleted file]
drivers/usb/mon/mon_main.c
drivers/usb/mon/mon_text.c
drivers/usb/mon/usb_mon.h
drivers/usb/musb/musb_core.c
drivers/usb/otg/isp1301_omap.c
drivers/usb/serial/ark3116.c
drivers/usb/serial/belkin_sa.c
drivers/usb/serial/ch341.c
drivers/usb/serial/console.c
drivers/usb/serial/cp210x.c
drivers/usb/serial/cyberjack.c
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/cypress_m8.h
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/empeg.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.h
drivers/usb/serial/garmin_gps.c
drivers/usb/serial/generic.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/ipaq.c
drivers/usb/serial/ipw.c
drivers/usb/serial/ir-usb.c
drivers/usb/serial/iuu_phoenix.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/keyspan.h
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/kobil_sct.c
drivers/usb/serial/mct_u232.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/moto_modem.c
drivers/usb/serial/navman.c
drivers/usb/serial/omninet.c
drivers/usb/serial/opticon.c
drivers/usb/serial/option.c
drivers/usb/serial/oti6858.c
drivers/usb/serial/pl2303.c
drivers/usb/serial/pl2303.h
drivers/usb/serial/sierra.c
drivers/usb/serial/spcp8x5.c
drivers/usb/serial/symbolserial.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/serial/usb-serial.c
drivers/usb/serial/usb_debug.c
drivers/usb/serial/visor.c
drivers/usb/serial/whiteheat.c
drivers/usb/storage/datafab.c
drivers/usb/storage/initializers.c
drivers/usb/storage/jumpshot.c
drivers/usb/storage/onetouch.c
drivers/usb/storage/unusual_devs.h
drivers/usb/usb-skeleton.c
drivers/usb/wusbcore/wa-hc.h
drivers/uwb/i1480/i1480u-wlp/netdev.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/aty/atyfb_base.c
drivers/video/au1100fb.c
drivers/video/backlight/corgi_lcd.c
drivers/video/backlight/ltv350qv.c
drivers/video/backlight/tdo24m.c
drivers/video/backlight/tosa_lcd.c
drivers/video/backlight/vgg2432a4.c
drivers/video/cfbcopyarea.c
drivers/video/console/bitblit.c
drivers/video/console/fbcon.c
drivers/video/console/newport_con.c
drivers/video/console/vgacon.c
drivers/video/da8xx-fb.c [new file with mode: 0644]
drivers/video/ep93xx-fb.c [new file with mode: 0644]
drivers/video/fbmem.c
drivers/video/imxfb.c
drivers/video/matrox/g450_pll.c
drivers/video/matrox/g450_pll.h
drivers/video/matrox/i2c-matroxfb.c
drivers/video/matrox/matroxfb_DAC1064.c
drivers/video/matrox/matroxfb_DAC1064.h
drivers/video/matrox/matroxfb_Ti3026.c
drivers/video/matrox/matroxfb_accel.c
drivers/video/matrox/matroxfb_accel.h
drivers/video/matrox/matroxfb_base.c
drivers/video/matrox/matroxfb_base.h
drivers/video/matrox/matroxfb_crtc2.c
drivers/video/matrox/matroxfb_g450.c
drivers/video/matrox/matroxfb_g450.h
drivers/video/matrox/matroxfb_maven.c
drivers/video/matrox/matroxfb_misc.c
drivers/video/matrox/matroxfb_misc.h
drivers/video/msm/Makefile [new file with mode: 0644]
drivers/video/msm/mddi.c [new file with mode: 0644]
drivers/video/msm/mddi_client_dummy.c [new file with mode: 0644]
drivers/video/msm/mddi_client_nt35399.c [new file with mode: 0644]
drivers/video/msm/mddi_client_toshiba.c [new file with mode: 0644]
drivers/video/msm/mddi_hw.h [new file with mode: 0644]
drivers/video/msm/mdp.c [new file with mode: 0644]
drivers/video/msm/mdp_csc_table.h [new file with mode: 0644]
drivers/video/msm/mdp_hw.h [new file with mode: 0644]
drivers/video/msm/mdp_ppp.c [new file with mode: 0644]
drivers/video/msm/mdp_scale_tables.c [new file with mode: 0644]
drivers/video/msm/mdp_scale_tables.h [new file with mode: 0644]
drivers/video/msm/msm_fb.c [new file with mode: 0644]
drivers/video/omap/Kconfig
drivers/video/omap/Makefile
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/dispc.h
drivers/video/omap/hwa742.c
drivers/video/omap/lcd_2430sdp.c [new file with mode: 0644]
drivers/video/omap/lcd_ams_delta.c [new file with mode: 0644]
drivers/video/omap/lcd_apollon.c [new file with mode: 0644]
drivers/video/omap/lcd_h3.c
drivers/video/omap/lcd_h4.c
drivers/video/omap/lcd_inn1510.c
drivers/video/omap/lcd_inn1610.c
drivers/video/omap/lcd_ldp.c [new file with mode: 0644]
drivers/video/omap/lcd_mipid.c [new file with mode: 0644]
drivers/video/omap/lcd_omap2evm.c [new file with mode: 0644]
drivers/video/omap/lcd_omap3beagle.c [new file with mode: 0644]
drivers/video/omap/lcd_omap3evm.c [new file with mode: 0644]
drivers/video/omap/lcd_osk.c
drivers/video/omap/lcd_overo.c [new file with mode: 0644]
drivers/video/omap/lcd_palmte.c
drivers/video/omap/lcd_palmtt.c
drivers/video/omap/lcd_palmz71.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/platinumfb.c
drivers/video/s3c-fb.c
drivers/video/s3c2410fb.c
drivers/video/sis/sis_main.c
drivers/video/sis/vstruct.h
drivers/video/tmiofb.c
drivers/video/via/accel.c
drivers/video/via/accel.h
drivers/video/via/chip.h
drivers/video/via/dvi.c
drivers/video/via/global.c
drivers/video/via/global.h
drivers/video/via/hw.c
drivers/video/via/hw.h
drivers/video/via/ioctl.h
drivers/video/via/lcd.c
drivers/video/via/share.h
drivers/video/via/via_i2c.c
drivers/video/via/viafbdev.c
drivers/video/via/viafbdev.h
drivers/video/via/viamode.c
drivers/video/via/viamode.h
drivers/video/via/vt1636.c
drivers/virtio/virtio_balloon.c
drivers/virtio/virtio_pci.c
drivers/virtio/virtio_ring.c
drivers/vlynq/vlynq.c
drivers/xen/balloon.c
drivers/xen/evtchn.c
firmware/Makefile
firmware/WHENCE
firmware/ihex2fw.c
firmware/matrox/g200_warp.H16 [new file with mode: 0644]
firmware/matrox/g400_warp.H16 [new file with mode: 0644]
firmware/r128/r128_cce.bin.ihex [new file with mode: 0644]
firmware/radeon/R100_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/R200_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/R300_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/R420_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/R520_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/R600_me.bin.ihex [new file with mode: 0644]
firmware/radeon/R600_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RS600_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/RS690_cp.bin.ihex [new file with mode: 0644]
firmware/radeon/RS780_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RS780_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV610_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV610_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV620_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV620_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV630_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV630_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV635_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV635_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV670_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV670_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV710_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV710_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV730_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV730_pfp.bin.ihex [new file with mode: 0644]
firmware/radeon/RV770_me.bin.ihex [new file with mode: 0644]
firmware/radeon/RV770_pfp.bin.ihex [new file with mode: 0644]
fs/Kconfig
fs/afs/flock.c
fs/afs/proc.c
fs/aio.c
fs/anon_inodes.c
fs/autofs/dirhash.c
fs/befs/linuxvfs.c
fs/binfmt_elf.c
fs/binfmt_elf_fdpic.c
fs/block_dev.c
fs/btrfs/disk-io.c
fs/btrfs/inode.c
fs/btrfs/super.c
fs/btrfs/tree-log.c
fs/buffer.c
fs/cifs/cifs_dfs_ref.c
fs/cifs/cifsfs.c
fs/cifs/cifsfs.h
fs/compat.c
fs/devpts/inode.c
fs/dlm/debug_fs.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ecryptfs/mmap.c
fs/eventfd.c
fs/exec.c
fs/ext2/namei.c
fs/ext2/xip.c
fs/ext3/super.c
fs/ext4/inode.c
fs/ext4/super.c
fs/gfs2/rgrp.c
fs/hugetlbfs/inode.c
fs/inode.c
fs/jbd2/journal.c
fs/jffs2/super.c
fs/lockd/clntlock.c
fs/lockd/clntproc.c
fs/lockd/host.c
fs/lockd/mon.c
fs/lockd/svclock.c
fs/lockd/svcsubs.c
fs/locks.c
fs/minix/dir.c
fs/ncpfs/dir.c
fs/ncpfs/ioctl.c
fs/nfs/callback_xdr.c
fs/nfs/client.c
fs/nfs/nfs4state.c
fs/nfs/super.c
fs/nfsd/export.c
fs/nfsd/nfs3xdr.c
fs/nfsd/nfs4acl.c
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
fs/nfsd/nfsctl.c
fs/nfsd/nfsfh.c
fs/nfsd/nfssvc.c
fs/nfsd/vfs.c
fs/nilfs2/btnode.c
fs/nilfs2/file.c
fs/nilfs2/gcinode.c
fs/nilfs2/inode.c
fs/nilfs2/mdt.c
fs/nilfs2/namei.c
fs/nilfs2/nilfs.h
fs/nilfs2/super.c
fs/ntfs/file.c
fs/ntfs/layout.h
fs/ntfs/malloc.h
fs/ocfs2/Makefile
fs/ocfs2/alloc.c
fs/ocfs2/alloc.h
fs/ocfs2/aops.c
fs/ocfs2/aops.h
fs/ocfs2/buffer_head_io.c
fs/ocfs2/buffer_head_io.h
fs/ocfs2/cluster/masklog.c
fs/ocfs2/cluster/masklog.h
fs/ocfs2/cluster/netdebug.c
fs/ocfs2/dir.c
fs/ocfs2/dlm/dlmdebug.c
fs/ocfs2/dlm/dlmthread.c
fs/ocfs2/dlmglue.c
fs/ocfs2/dlmglue.h
fs/ocfs2/extent_map.c
fs/ocfs2/extent_map.h
fs/ocfs2/file.c
fs/ocfs2/file.h
fs/ocfs2/inode.c
fs/ocfs2/inode.h
fs/ocfs2/ioctl.c
fs/ocfs2/journal.c
fs/ocfs2/journal.h
fs/ocfs2/localalloc.c
fs/ocfs2/namei.c
fs/ocfs2/namei.h
fs/ocfs2/ocfs2.h
fs/ocfs2/ocfs2_fs.h
fs/ocfs2/ocfs2_lockid.h
fs/ocfs2/quota.h
fs/ocfs2/quota_global.c
fs/ocfs2/quota_local.c
fs/ocfs2/refcounttree.c [new file with mode: 0644]
fs/ocfs2/refcounttree.h [new file with mode: 0644]
fs/ocfs2/resize.c
fs/ocfs2/slot_map.c
fs/ocfs2/suballoc.c
fs/ocfs2/super.c
fs/ocfs2/uptodate.c
fs/ocfs2/uptodate.h
fs/ocfs2/xattr.c
fs/ocfs2/xattr.h
fs/omfs/dir.c
fs/omfs/file.c
fs/omfs/inode.c
fs/omfs/omfs.h
fs/open.c
fs/partitions/check.c
fs/proc/array.c
fs/proc/base.c
fs/proc/kcore.c
fs/proc/meminfo.c
fs/proc/nommu.c
fs/proc/page.c
fs/proc/task_mmu.c
fs/qnx4/Kconfig
fs/qnx4/Makefile
fs/qnx4/bitmap.c
fs/qnx4/dir.c
fs/qnx4/file.c [deleted file]
fs/qnx4/inode.c
fs/qnx4/namei.c
fs/qnx4/qnx4.h
fs/qnx4/truncate.c [deleted file]
fs/quota/dquot.c
fs/ramfs/inode.c
fs/reiserfs/super.c
fs/romfs/super.c
fs/select.c
fs/smbfs/proc.c
fs/squashfs/super.c
fs/super.c
fs/sync.c
fs/ubifs/budget.c
fs/ubifs/commit.c
fs/ubifs/debug.c
fs/ubifs/debug.h
fs/ubifs/file.c
fs/ubifs/gc.c
fs/ubifs/io.c
fs/ubifs/journal.c
fs/ubifs/key.h
fs/ubifs/log.c
fs/ubifs/lprops.c
fs/ubifs/master.c
fs/ubifs/orphan.c
fs/ubifs/recovery.c
fs/ubifs/replay.c
fs/ubifs/scan.c
fs/ubifs/super.c
fs/ubifs/tnc.c
fs/ubifs/tnc_commit.c
fs/ubifs/ubifs-media.h
fs/ubifs/ubifs.h
fs/ubifs/xattr.c
fs/xfs/linux-2.6/xfs_quotaops.c
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/linux-2.6/xfs_super.h
fs/xfs/xfs_fs.h
include/acpi/acpi_bus.h
include/acpi/acpiosxf.h
include/acpi/acpixf.h
include/acpi/actbl.h
include/acpi/actbl1.h
include/acpi/actbl2.h [new file with mode: 0644]
include/acpi/actypes.h
include/acpi/platform/acgcc.h
include/acpi/platform/aclinux.h
include/asm-generic/gpio.h
include/asm-generic/kmap_types.h
include/asm-generic/mman-common.h
include/asm-generic/mman.h
include/asm-generic/sections.h
include/asm-generic/syscall.h
include/asm-generic/unistd.h
include/drm/drmP.h
include/drm/drm_cache.h [new file with mode: 0644]
include/drm/drm_crtc.h
include/drm/drm_crtc_helper.h
include/drm/drm_encoder_slave.h [new file with mode: 0644]
include/drm/drm_fb_helper.h [new file with mode: 0644]
include/drm/drm_memory.h
include/drm/drm_mm.h
include/drm/drm_mode.h
include/drm/drm_sysfs.h [new file with mode: 0644]
include/drm/radeon_drm.h
include/drm/ttm/ttm_bo_api.h
include/drm/ttm/ttm_bo_driver.h
include/drm/ttm/ttm_memory.h
include/drm/ttm/ttm_module.h
include/linux/acpi.h
include/linux/aio.h
include/linux/anon_inodes.h
include/linux/bootmem.h
include/linux/capability.h
include/linux/cn_proc.h
include/linux/cpumask.h
include/linux/cyclades.h
include/linux/device.h
include/linux/dvb/frontend.h
include/linux/dvb/version.h
include/linux/eventfd.h
include/linux/flex_array.h
include/linux/fs.h
include/linux/ftrace.h
include/linux/ftrace_event.h
include/linux/genhd.h
include/linux/gfp.h
include/linux/gpio.h
include/linux/hayesesp.h
include/linux/hid.h
include/linux/hugetlb.h
include/linux/i2c-id.h
include/linux/i2c.h
include/linux/init_task.h
include/linux/ioport.h
include/linux/jbd.h
include/linux/kernel.h
include/linux/kfifo.h
include/linux/kmemcheck.h
include/linux/ksm.h [new file with mode: 0644]
include/linux/kvm_host.h
include/linux/lis3lv02d.h
include/linux/lockd/lockd.h
include/linux/mISDNif.h
include/linux/magic.h
include/linux/marker.h [deleted file]
include/linux/memory_hotplug.h
include/linux/mempool.h
include/linux/miscdevice.h
include/linux/mm.h
include/linux/mm_inline.h
include/linux/mmc/card.h
include/linux/mmc/core.h
include/linux/mmc/host.h
include/linux/mmc/mmc.h
include/linux/mmc/sdio_func.h
include/linux/mmu_context.h [new file with mode: 0644]
include/linux/mmu_notifier.h
include/linux/mmzone.h
include/linux/mod_devicetable.h
include/linux/module.h
include/linux/namei.h
include/linux/nfs4.h
include/linux/nfsd/nfsd.h
include/linux/nfsd/state.h
include/linux/nfsd/xdr4.h
include/linux/oom.h
include/linux/page-flags.h
include/linux/page_cgroup.h
include/linux/pci_ids.h
include/linux/perf_counter.h
include/linux/perf_event.h [new file with mode: 0644]
include/linux/pnp.h
include/linux/poison.h
include/linux/prctl.h
include/linux/proc_fs.h
include/linux/quotaops.h
include/linux/rculist_nulls.h
include/linux/rcupdate.h
include/linux/rcutree.h
include/linux/rmap.h
include/linux/sched.h
include/linux/serial.h
include/linux/serial_8250.h
include/linux/serial_core.h
include/linux/spi/mc33880.h [new file with mode: 0644]
include/linux/spi/spi.h
include/linux/sunrpc/auth.h
include/linux/sunrpc/clnt.h
include/linux/sunrpc/svc.h
include/linux/sunrpc/svc_xprt.h
include/linux/sunrpc/svcsock.h
include/linux/sunrpc/xprt.h
include/linux/sunrpc/xprtrdma.h
include/linux/sunrpc/xprtsock.h
include/linux/swap.h
include/linux/syscalls.h
include/linux/tty.h
include/linux/ucb1400.h
include/linux/usb.h
include/linux/usb/audio.h
include/linux/usb/ch9.h
include/linux/usb/ehci_def.h
include/linux/usb/isp1362.h [new file with mode: 0644]
include/linux/usb/isp1760.h [new file with mode: 0644]
include/linux/usb/serial.h
include/linux/usbdevice_fs.h
include/linux/videodev2.h
include/linux/virtio.h
include/linux/virtio_9p.h
include/linux/virtio_balloon.h
include/linux/virtio_blk.h
include/linux/virtio_config.h
include/linux/virtio_console.h
include/linux/virtio_ids.h [new file with mode: 0644]
include/linux/virtio_net.h
include/linux/virtio_rng.h
include/linux/vmstat.h
include/linux/vt.h
include/linux/vt_kern.h
include/linux/workqueue.h
include/media/davinci/ccdc_types.h [new file with mode: 0644]
include/media/davinci/dm355_ccdc.h [new file with mode: 0644]
include/media/davinci/dm644x_ccdc.h [new file with mode: 0644]
include/media/davinci/vpfe_capture.h [new file with mode: 0644]
include/media/davinci/vpfe_types.h [new file with mode: 0644]
include/media/davinci/vpss.h [new file with mode: 0644]
include/media/soc_camera.h
include/media/soc_camera_platform.h
include/media/tuner.h
include/media/tvp514x.h
include/media/v4l2-chip-ident.h
include/media/v4l2-common.h
include/media/v4l2-dev.h
include/rdma/ib_cm.h
include/scsi/fc/fc_fc2.h
include/trace/events/kmem.h
include/trace/events/power.h [new file with mode: 0644]
include/trace/events/sched.h
include/trace/ftrace.h
include/video/da8xx-fb.h [new file with mode: 0644]
init/Kconfig
init/main.c
ipc/mqueue.c
ipc/shm.c
ipc/util.c
kernel/Makefile
kernel/cgroup.c
kernel/exit.c
kernel/fork.c
kernel/kallsyms.c
kernel/kfifo.c
kernel/kmod.c
kernel/kprobes.c
kernel/lockdep.c
kernel/lockdep_proc.c
kernel/marker.c [deleted file]
kernel/module.c
kernel/panic.c
kernel/perf_counter.c [deleted file]
kernel/perf_event.c [new file with mode: 0644]
kernel/pid.c
kernel/power/console.c
kernel/power/process.c
kernel/power/snapshot.c
kernel/printk.c
kernel/profile.c
kernel/rcupdate.c
kernel/rcutorture.c
kernel/rcutree.c
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/rcutree_trace.c
kernel/resource.c
kernel/sched.c
kernel/sched_clock.c
kernel/sched_fair.c
kernel/sched_idletask.c
kernel/sched_rt.c
kernel/smp.c
kernel/sys.c
kernel/sys_ni.c
kernel/sysctl.c
kernel/timer.c
kernel/trace/Kconfig
kernel/trace/Makefile
kernel/trace/ftrace.c
kernel/trace/power-traces.c [new file with mode: 0644]
kernel/trace/ring_buffer.c
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_entries.h
kernel/trace/trace_event_profile.c
kernel/trace/trace_events.c
kernel/trace/trace_hw_branches.c
kernel/trace/trace_power.c [deleted file]
kernel/trace/trace_printk.c
kernel/trace/trace_syscalls.c
kernel/tracepoint.c
lib/Kconfig.kmemcheck
lib/flex_array.c
lib/vsprintf.c
lib/zlib_deflate/deflate.c
mm/Kconfig
mm/Kconfig.debug
mm/Makefile
mm/filemap.c
mm/hugetlb.c
mm/internal.h
mm/ksm.c [new file with mode: 0644]
mm/madvise.c
mm/memcontrol.c
mm/memory.c
mm/memory_hotplug.c
mm/mempool.c
mm/migrate.c
mm/mlock.c
mm/mmap.c
mm/mmu_context.c [new file with mode: 0644]
mm/mmu_notifier.c
mm/mprotect.c
mm/mremap.c
mm/nommu.c
mm/oom_kill.c
mm/page-writeback.c
mm/page_alloc.c
mm/page_cgroup.c
mm/rmap.c
mm/shmem.c
mm/slab.c
mm/slub.c
mm/sparse-vmemmap.c
mm/sparse.c
mm/swap.c
mm/swap_state.c
mm/swapfile.c
mm/vmalloc.c
mm/vmscan.c
mm/vmstat.c
net/9p/trans_virtio.c
net/bluetooth/hidp/core.c
net/core/sock.c
net/dccp/proto.c
net/decnet/dn_route.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv6/ip6mr.c
net/netfilter/nf_conntrack_core.c
net/netfilter/x_tables.c
net/netfilter/xt_hashlimit.c
net/netlink/af_netlink.c
net/rxrpc/ar-call.c
net/sched/sch_hfsc.c
net/sctp/protocol.c
net/socket.c
net/sunrpc/auth.c
net/sunrpc/auth_generic.c
net/sunrpc/auth_gss/svcauth_gss.c
net/sunrpc/cache.c
net/sunrpc/clnt.c
net/sunrpc/rpc_pipe.c
net/sunrpc/sched.c
net/sunrpc/sunrpc.h
net/sunrpc/svc_xprt.c
net/sunrpc/svcauth_unix.c
net/sunrpc/svcsock.c
net/sunrpc/xprt.c
net/sunrpc/xprtrdma/svc_rdma_transport.c
net/sunrpc/xprtsock.c
net/wireless/wext-compat.c
samples/Kconfig
samples/Makefile
samples/markers/Makefile [deleted file]
samples/markers/marker-example.c [deleted file]
samples/markers/probe-example.c [deleted file]
scripts/Makefile.modpost
scripts/basic/fixdep.c
scripts/checkpatch.pl
scripts/conmakehash.c
scripts/genksyms/genksyms.c
scripts/get_maintainer.pl
scripts/kallsyms.c
scripts/mod/file2alias.c
scripts/mod/modpost.c
scripts/mod/sumversion.c
scripts/selinux/mdp/mdp.c
scripts/tracing/power.pl [deleted file]
security/integrity/ima/ima_fs.c
security/smack/smack_lsm.c
security/smack/smackfs.c
sound/oss/swarm_cs4297a.c
sound/oss/sys_timer.c
sound/soc/codecs/wm9081.c
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c24xx_uda134x.c
sound/sound_core.c
tools/perf/Documentation/perf-sched.txt [new file with mode: 0644]
tools/perf/Documentation/perf-timechart.txt [new file with mode: 0644]
tools/perf/Documentation/perf-trace.txt [new file with mode: 0644]
tools/perf/Makefile
tools/perf/builtin-annotate.c
tools/perf/builtin-record.c
tools/perf/builtin-report.c
tools/perf/builtin-sched.c [new file with mode: 0644]
tools/perf/builtin-stat.c
tools/perf/builtin-timechart.c [new file with mode: 0644]
tools/perf/builtin-top.c
tools/perf/builtin-trace.c
tools/perf/builtin.h
tools/perf/command-list.txt
tools/perf/design.txt
tools/perf/perf.c
tools/perf/perf.h
tools/perf/util/event.h
tools/perf/util/header.c
tools/perf/util/header.h
tools/perf/util/parse-events.c
tools/perf/util/parse-events.h
tools/perf/util/parse-options.h
tools/perf/util/svghelper.c [new file with mode: 0644]
tools/perf/util/svghelper.h [new file with mode: 0644]
tools/perf/util/thread.c
tools/perf/util/thread.h
tools/perf/util/trace-event-info.c
tools/perf/util/trace-event-parse.c
tools/perf/util/trace-event-read.c
tools/perf/util/trace-event.h
usr/gen_init_cpio.c

diff --git a/Documentation/ABI/stable/sysfs-class-backlight b/Documentation/ABI/stable/sysfs-class-backlight
new file mode 100644 (file)
index 0000000..4d637e1
--- /dev/null
@@ -0,0 +1,36 @@
+What:          /sys/class/backlight/<backlight>/bl_power
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Control BACKLIGHT power, values are FB_BLANK_* from fb.h
+                - FB_BLANK_UNBLANK (0)   : power on.
+                - FB_BLANK_POWERDOWN (4) : power off
+Users:         HAL
+
+What:          /sys/class/backlight/<backlight>/brightness
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Control the brightness for this <backlight>. Values
+               are between 0 and max_brightness. This file will also
+               show the brightness level stored in the driver, which
+               may not be the actual brightness (see actual_brightness).
+Users:         HAL
+
+What:          /sys/class/backlight/<backlight>/actual_brightness
+Date:          March 2006
+KernelVersion: 2.6.17
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Show the actual brightness by querying the hardware.
+Users:         HAL
+
+What:          /sys/class/backlight/<backlight>/max_brightness
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Maximum brightness for <backlight>.
+Users:         HAL
diff --git a/Documentation/ABI/testing/sysfs-class-lcd b/Documentation/ABI/testing/sysfs-class-lcd
new file mode 100644 (file)
index 0000000..35906bf
--- /dev/null
@@ -0,0 +1,23 @@
+What:          /sys/class/lcd/<lcd>/lcd_power
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Control LCD power, values are FB_BLANK_* from fb.h
+                - FB_BLANK_UNBLANK (0)   : power on.
+                - FB_BLANK_POWERDOWN (4) : power off
+
+What:          /sys/class/lcd/<lcd>/contrast
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Current contrast of this LCD device. Value is between 0 and
+               /sys/class/lcd/<lcd>/max_contrast.
+
+What:          /sys/class/lcd/<lcd>/max_contrast
+Date:          April 2005
+KernelVersion: 2.6.12
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Maximum contrast for this LCD device.
diff --git a/Documentation/ABI/testing/sysfs-class-led b/Documentation/ABI/testing/sysfs-class-led
new file mode 100644 (file)
index 0000000..9e4541d
--- /dev/null
@@ -0,0 +1,28 @@
+What:          /sys/class/leds/<led>/brightness
+Date:          March 2006
+KernelVersion: 2.6.17
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Set the brightness of the LED. Most LEDs don't
+               have hardware brightness support so will just be turned on for
+               non-zero brightness settings. The value is between 0 and
+               /sys/class/leds/<led>/max_brightness.
+
+What:          /sys/class/leds/<led>/max_brightness
+Date:          March 2006
+KernelVersion: 2.6.17
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Maximum brightness level for this led, default is 255 (LED_FULL).
+
+What:          /sys/class/leds/<led>/trigger
+Date:          March 2006
+KernelVersion: 2.6.17
+Contact:       Richard Purdie <rpurdie@rpsys.net>
+Description:
+               Set the trigger for this LED. A trigger is a kernel based source
+               of led events.
+               You can change triggers in a similar manner to the way an IO
+               scheduler is chosen. Trigger specific parameters can appear in
+               /sys/class/leds/<led> once a given trigger is selected.
+
index 8aab809..80f4c94 100644 (file)
@@ -19,6 +19,7 @@ Description:
        /gpioN ... for each exported GPIO #N
            /value ... always readable, writes fail for input GPIOs
            /direction ... r/w as: in, out (default low); write: high, low
+           /edge ... r/w as: none, falling, rising, both
        /gpiochipN ... for each gpiochip; #N is its first GPIO
            /base ... (r/o) same as N
            /label ... (r/o) descriptive, not necessarily unique
diff --git a/Documentation/ABI/testing/sysfs-platform-asus-laptop b/Documentation/ABI/testing/sysfs-platform-asus-laptop
new file mode 100644 (file)
index 0000000..a1cb660
--- /dev/null
@@ -0,0 +1,52 @@
+What:          /sys/devices/platform/asus-laptop/display
+Date:          January 2007
+KernelVersion: 2.6.20
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               This file allows display switching. The value
+               is composed by 4 bits and defined as follow:
+               4321
+               |||`- LCD
+               ||`-- CRT
+               |`--- TV
+               `---- DVI
+               Ex: - 0 (0000b) means no display
+                   - 3 (0011b) CRT+LCD.
+
+What:          /sys/devices/platform/asus-laptop/gps
+Date:          January 2007
+KernelVersion: 2.6.20
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Control the gps device. 1 means on, 0 means off.
+Users:         Lapsus
+
+What:          /sys/devices/platform/asus-laptop/ledd
+Date:          January 2007
+KernelVersion: 2.6.20
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Some models like the W1N have a LED display that can be
+               used to display several informations.
+               To control the LED display, use the following :
+                   echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
+               where T control the 3 letters display, and DDD the 3 digits display.
+               The DDD table can be found in Documentation/laptops/asus-laptop.txt
+
+What:          /sys/devices/platform/asus-laptop/bluetooth
+Date:          January 2007
+KernelVersion: 2.6.20
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Control the bluetooth device. 1 means on, 0 means off.
+               This may control the led, the device or both.
+Users:         Lapsus
+
+What:          /sys/devices/platform/asus-laptop/wlan
+Date:          January 2007
+KernelVersion: 2.6.20
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Control the bluetooth device. 1 means on, 0 means off.
+               This may control the led, the device or both.
+Users:         Lapsus
diff --git a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
new file mode 100644 (file)
index 0000000..7445dfb
--- /dev/null
@@ -0,0 +1,50 @@
+What:          /sys/devices/platform/eeepc-laptop/disp
+Date:          May 2008
+KernelVersion: 2.6.26
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               This file allows display switching.
+               - 1 = LCD
+               - 2 = CRT
+               - 3 = LCD+CRT
+               If you run X11, you should use xrandr instead.
+
+What:          /sys/devices/platform/eeepc-laptop/camera
+Date:          May 2008
+KernelVersion: 2.6.26
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Control the camera. 1 means on, 0 means off.
+
+What:          /sys/devices/platform/eeepc-laptop/cardr
+Date:          May 2008
+KernelVersion: 2.6.26
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Control the card reader. 1 means on, 0 means off.
+
+What:          /sys/devices/platform/eeepc-laptop/cpufv
+Date:          Jun 2009
+KernelVersion: 2.6.31
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               Change CPU clock configuration.
+               On the Eee PC 1000H there are three available clock configuration:
+                   * 0 -> Super Performance Mode
+                   * 1 -> High Performance Mode
+                   * 2 -> Power Saving Mode
+               On Eee PC 701 there is only 2 available clock configurations.
+               Available configuration are listed in available_cpufv file.
+               Reading this file will show the raw hexadecimal value which
+               is defined as follow:
+               | 8 bit | 8 bit |
+                   |       `---- Current mode
+                   `------------ Availables modes
+               For example, 0x301 means: mode 1 selected, 3 available modes.
+
+What:          /sys/devices/platform/eeepc-laptop/available_cpufv
+Date:          Jun 2009
+KernelVersion: 2.6.31
+Contact:       "Corentin Chary" <corentincj@iksaif.net>
+Description:
+               List available cpufv modes.
index 9632444..ab8300f 100644 (file)
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
            genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
            mac80211.xml debugobjects.xml sh.xml regulator.xml \
            alsa-driver-api.xml writing-an-alsa-driver.xml \
-           tracepoint.xml
+           tracepoint.xml media.xml
 
 ###
 # The build process is as follows (targets):
@@ -32,7 +32,7 @@ PS_METHOD     = $(prefer-db2x)
 
 ###
 # The targets that may be used.
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 xmldocs: $(BOOKS)
@@ -45,12 +45,16 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 
 HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
+htmldocs: media $(HTML)
        $(call build_main_index)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
 
+media:
+       mkdir -p $(srctree)/Documentation/DocBook/media/
+       cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/
+
 installmandocs: mandocs
        mkdir -p /usr/local/man/man9/
        install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
diff --git a/Documentation/DocBook/dvb/.gitignore b/Documentation/DocBook/dvb/.gitignore
new file mode 100644 (file)
index 0000000..d7ec32e
--- /dev/null
@@ -0,0 +1 @@
+!*.xml
diff --git a/Documentation/DocBook/dvb/audio.xml b/Documentation/DocBook/dvb/audio.xml
new file mode 100644 (file)
index 0000000..eeb96b8
--- /dev/null
@@ -0,0 +1,1473 @@
+<title>DVB Audio Device</title>
+<para>The DVB audio device controls the MPEG2 audio decoder of the DVB hardware. It
+can be accessed through <emphasis role="tt">/dev/dvb/adapter0/audio0</emphasis>. Data types and and
+ioctl definitions can be accessed by including <emphasis role="tt">linux/dvb/video.h</emphasis> in your
+application.
+</para>
+<para>Please note that some DVB cards don&#8217;t have their own MPEG decoder, which results in
+the omission of the audio and video device.
+</para>
+
+<section id="audio_data_types">
+<title>Audio Data Types</title>
+<para>This section describes the structures, data types and defines used when talking to the
+audio device.
+</para>
+
+<section id="audio_stream_source_t">
+<title>audio_stream_source_t</title>
+<para>The audio stream source is set through the AUDIO_SELECT_SOURCE call and can take
+the following values, depending on whether we are replaying from an internal (demux) or
+external (user write) source.
+</para>
+<programlisting>
+ typedef enum {
+        AUDIO_SOURCE_DEMUX,
+        AUDIO_SOURCE_MEMORY
+ } audio_stream_source_t;
+</programlisting>
+<para>AUDIO_SOURCE_DEMUX selects the demultiplexer (fed either by the frontend or the
+DVR device) as the source of the video stream. If AUDIO_SOURCE_MEMORY
+is selected the stream comes from the application through the <emphasis role="tt">write()</emphasis> system
+call.
+</para>
+
+</section>
+<section id="audio_play_state_t">
+<title>audio_play_state_t</title>
+<para>The following values can be returned by the AUDIO_GET_STATUS call representing the
+state of audio playback.
+</para>
+<programlisting>
+ typedef enum {
+        AUDIO_STOPPED,
+        AUDIO_PLAYING,
+        AUDIO_PAUSED
+ } audio_play_state_t;
+</programlisting>
+
+</section>
+<section id="audio_channel_select_t">
+<title>audio_channel_select_t</title>
+<para>The audio channel selected via AUDIO_CHANNEL_SELECT is determined by the
+following values.
+</para>
+<programlisting>
+ typedef enum {
+        AUDIO_STEREO,
+        AUDIO_MONO_LEFT,
+        AUDIO_MONO_RIGHT,
+ } audio_channel_select_t;
+</programlisting>
+
+</section>
+<section id="struct_audio_status">
+<title>struct audio_status</title>
+<para>The AUDIO_GET_STATUS call returns the following structure informing about various
+states of the playback operation.
+</para>
+<programlisting>
+ typedef struct audio_status {
+        boolean AV_sync_state;
+        boolean mute_state;
+        audio_play_state_t play_state;
+        audio_stream_source_t stream_source;
+        audio_channel_select_t channel_select;
+        boolean bypass_mode;
+ } audio_status_t;
+</programlisting>
+
+</section>
+<section id="struct_audio_mixer">
+<title>struct audio_mixer</title>
+<para>The following structure is used by the AUDIO_SET_MIXER call to set the audio
+volume.
+</para>
+<programlisting>
+ typedef struct audio_mixer {
+        unsigned int volume_left;
+        unsigned int volume_right;
+ } audio_mixer_t;
+</programlisting>
+
+</section>
+<section id="audio_encodings">
+<title>audio encodings</title>
+<para>A call to AUDIO_GET_CAPABILITIES returns an unsigned integer with the following
+bits set according to the hardwares capabilities.
+</para>
+<programlisting>
+ #define AUDIO_CAP_DTS    1
+ #define AUDIO_CAP_LPCM   2
+ #define AUDIO_CAP_MP1    4
+ #define AUDIO_CAP_MP2    8
+ #define AUDIO_CAP_MP3   16
+ #define AUDIO_CAP_AAC   32
+ #define AUDIO_CAP_OGG   64
+ #define AUDIO_CAP_SDDS 128
+ #define AUDIO_CAP_AC3  256
+</programlisting>
+
+</section>
+<section id="struct_audio_karaoke">
+<title>struct audio_karaoke</title>
+<para>The ioctl AUDIO_SET_KARAOKE uses the following format:
+</para>
+<programlisting>
+ typedef
+ struct audio_karaoke{
+        int vocal1;
+        int vocal2;
+        int melody;
+ } audio_karaoke_t;
+</programlisting>
+<para>If Vocal1 or Vocal2 are non-zero, they get mixed into left and right t at 70% each. If both,
+Vocal1 and Vocal2 are non-zero, Vocal1 gets mixed into the left channel and Vocal2 into the
+right channel at 100% each. Ff Melody is non-zero, the melody channel gets mixed into left
+and right.
+</para>
+
+</section>
+<section id="audio_attributes">
+<title>audio attributes</title>
+<para>The following attributes can be set by a call to AUDIO_SET_ATTRIBUTES:
+</para>
+<programlisting>
+ typedef uint16_t audio_attributes_t;
+ /&#x22C6;   bits: descr. &#x22C6;/
+ /&#x22C6;   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, &#x22C6;/
+ /&#x22C6;   12    multichannel extension &#x22C6;/
+ /&#x22C6;   11-10 audio type (0=not spec, 1=language included) &#x22C6;/
+ /&#x22C6;    9- 8 audio application mode (0=not spec, 1=karaoke, 2=surround) &#x22C6;/
+ /&#x22C6;    7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit,  &#x22C6;/
+ /&#x22C6;    5- 4 Sample frequency fs (0=48kHz, 1=96kHz) &#x22C6;/
+ /&#x22C6;    2- 0 number of audio channels (n+1 channels) &#x22C6;/
+</programlisting>
+ </section></section>
+<section id="audio_function_calls">
+<title>Audio Function Calls</title>
+
+
+<section id="audio_fopen">
+<title>open()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call opens a named audio device (e.g. /dev/dvb/adapter0/audio0)
+ for subsequent use. When an open() call has succeeded, the device will be ready
+ for use. The significance of blocking or non-blocking mode is described in the
+ documentation for functions where there is a difference. It does not affect the
+ semantics of the open() call itself. A device opened in blocking mode can later
+ be put into non-blocking mode (and vice versa) using the F_SETFL command
+ of the fcntl system call. This is a standard system call, documented in the Linux
+ manual page for fcntl. Only one user can open the Audio Device in O_RDWR
+ mode. All other attempts to open the device in this mode will fail, and an error
+ code will be returned. If the Audio Device is opened in O_RDONLY mode, the
+ only ioctl call that can be used is AUDIO_GET_STATUS. All other call will
+ return with an error code.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open(const char &#x22C6;deviceName, int flags);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>const char
+ *deviceName</para>
+</entry><entry
+ align="char">
+<para>Name of specific audio device.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int flags</para>
+</entry><entry
+ align="char">
+<para>A bit-wise OR of the following flags:</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDONLY read-only access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDWR read/write access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_NONBLOCK open in non-blocking mode</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>(blocking mode is the default)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="audio_fclose">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call closes a previously opened audio device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(int fd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="audio_fwrite">
+<title>write()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call can only be used if AUDIO_SOURCE_MEMORY is selected
+ in the ioctl call AUDIO_SELECT_SOURCE. The data provided shall be in
+ PES format. If O_NONBLOCK is not specified the function will block until
+ buffer space is available. The amount of data to be transferred is implied by
+ count.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>size_t write(int fd, const void &#x22C6;buf, size_t count);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>void *buf</para>
+</entry><entry
+ align="char">
+<para>Pointer to the buffer containing the PES data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t count</para>
+</entry><entry
+ align="char">
+<para>Size of buf.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Mode AUDIO_SOURCE_MEMORY not selected.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOMEM</para>
+</entry><entry
+ align="char">
+<para>Attempted to write more data than the internal buffer can
+ hold.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_STOP</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to stop playing the current stream.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_STOP);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_STOP for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_PLAY</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to start playing an audio stream from the
+ selected source.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_PLAY);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_PLAY for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_PAUSE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call suspends the audio stream being played. Decoding and playing
+ are paused. It is then possible to restart again decoding and playing process of
+ the audio stream using AUDIO_CONTINUE command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>If AUDIO_SOURCE_MEMORY is selected in the ioctl call
+ AUDIO_SELECT_SOURCE, the DVB-subsystem will not decode (consume)
+ any more data until the ioctl call AUDIO_CONTINUE or AUDIO_PLAY is
+ performed.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_PAUSE);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_PAUSE for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SELECT_SOURCE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call informs the audio device which source shall be used
+ for the input data. The possible sources are demux or memory. If
+ AUDIO_SOURCE_MEMORY is selected, the data is fed to the Audio Device
+ through the write command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_SELECT_SOURCE,
+ audio_stream_source_t source);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SELECT_SOURCE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>audio_stream_source_t
+ source</para>
+</entry><entry
+ align="char">
+<para>Indicates the source that shall be used for the Audio
+ stream.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_MUTE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the audio device to mute the stream that is currently being
+ played.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_SET_MUTE,
+ boolean state);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_MUTE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>boolean state</para>
+</entry><entry
+ align="char">
+<para>Indicates if audio device shall mute or not.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>TRUE Audio Mute</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>FALSE Audio Un-mute</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_AV_SYNC</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to turn ON or OFF A/V synchronization.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_SET_AV_SYNC,
+ boolean state);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_AV_SYNC for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>boolean state</para>
+</entry><entry
+ align="char">
+<para>Tells the DVB subsystem if A/V synchronization shall be
+ ON or OFF.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>TRUE AV-sync ON</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>FALSE AV-sync OFF</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_BYPASS_MODE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to bypass the Audio decoder and forward
+ the stream without decoding. This mode shall be used if streams that can&#8217;t be
+ handled by the DVB system shall be decoded. Dolby DigitalTM streams are
+ automatically forwarded by the DVB subsystem if the hardware can handle it.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ AUDIO_SET_BYPASS_MODE, boolean mode);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_BYPASS_MODE for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>boolean mode</para>
+</entry><entry
+ align="char">
+<para>Enables or disables the decoding of the current Audio
+ stream in the DVB subsystem.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>TRUE Bypass is disabled</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>FALSE Bypass is enabled</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_CHANNEL_SELECT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to select the requested channel if possible.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ AUDIO_CHANNEL_SELECT, audio_channel_select_t);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_CHANNEL_SELECT for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>audio_channel_select_t
+ ch</para>
+</entry><entry
+ align="char">
+<para>Select the output format of the audio (mono left/right,
+ stereo).</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter ch.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_GET_STATUS</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to return the current state of the Audio
+ Device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_GET_STATUS,
+ struct audio_status &#x22C6;status);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_GET_STATUS for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct audio_status
+ *status</para>
+</entry><entry
+ align="char">
+<para>Returns the current state of Audio Device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>status points to invalid address.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_GET_CAPABILITIES</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to tell us about the decoding capabilities
+ of the audio hardware.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ AUDIO_GET_CAPABILITIES, unsigned int &#x22C6;cap);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_GET_CAPABILITIES for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>unsigned int *cap</para>
+</entry><entry
+ align="char">
+<para>Returns a bit array of supported sound formats.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>cap points to an invalid address.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_CLEAR_BUFFER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Audio Device to clear all software and hardware buffers
+ of the audio decoder device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_CLEAR_BUFFER);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_CLEAR_BUFFER for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_ID</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl selects which sub-stream is to be decoded if a program or system
+ stream is sent to the video device. If no audio stream type is set the id has to be
+ in [0xC0,0xDF] for MPEG sound, in [0x80,0x87] for AC3 and in [0xA0,0xA7]
+ for LPCM. More specifications may follow for other stream types. If the stream
+ type is set the id just specifies the substream id of the audio stream and only
+ the first 5 bits are recognized.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_SET_ID, int
+ id);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_ID for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int id</para>
+</entry><entry
+ align="char">
+<para>audio sub-stream id</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid sub-stream id.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_MIXER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl lets you adjust the mixer settings of the audio decoder.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = AUDIO_SET_MIXER,
+ audio_mixer_t &#x22C6;mix);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_ID for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>audio_mixer_t *mix</para>
+</entry><entry
+ align="char">
+<para>mixer settings.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>mix points to an invalid address.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_STREAMTYPE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl tells the driver which kind of audio stream to expect. This is useful
+ if the stream offers several audio sub-streams like LPCM and AC3.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = AUDIO_SET_STREAMTYPE,
+ int type);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_STREAMTYPE for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int type</para>
+</entry><entry
+ align="char">
+<para>stream type</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>type is not a valid or supported stream type.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_EXT_ID</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl can be used to set the extension id for MPEG streams in DVD
+ playback. Only the first 3 bits are recognized.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = AUDIO_SET_EXT_ID, int
+ id);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_EXT_ID for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int id</para>
+</entry><entry
+ align="char">
+<para>audio sub_stream_id</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>id is not a valid id.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_ATTRIBUTES</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl is intended for DVD playback and allows you to set certain
+ information about the audio stream.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = AUDIO_SET_ATTRIBUTES,
+ audio_attributes_t attr );</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_ATTRIBUTES for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>audio_attributes_t
+ attr</para>
+</entry><entry
+ align="char">
+<para>audio attributes according to section ??</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>attr is not a valid or supported attribute setting.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>AUDIO_SET_KARAOKE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl allows one to set the mixer settings for a karaoke DVD.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = AUDIO_SET_STREAMTYPE,
+ audio_karaoke_t &#x22C6;karaoke);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals AUDIO_SET_STREAMTYPE for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>audio_karaoke_t
+ *karaoke</para>
+</entry><entry
+ align="char">
+<para>karaoke settings according to section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>karaoke is not a valid or supported karaoke setting.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section>
+</section>
diff --git a/Documentation/DocBook/dvb/ca.xml b/Documentation/DocBook/dvb/ca.xml
new file mode 100644 (file)
index 0000000..b1f1d2f
--- /dev/null
@@ -0,0 +1,221 @@
+<title>DVB CA Device</title>
+<para>The DVB CA device controls the conditional access hardware. It can be accessed through
+<emphasis role="tt">/dev/dvb/adapter0/ca0</emphasis>. Data types and and ioctl definitions can be accessed by
+including <emphasis role="tt">linux/dvb/ca.h</emphasis> in your application.
+</para>
+
+<section id="ca_data_types">
+<title>CA Data Types</title>
+
+
+<section id="ca_slot_info_t">
+<title>ca_slot_info_t</title>
+ <programlisting>
+ /&#x22C6; slot interface types and info &#x22C6;/
+
+ typedef struct ca_slot_info_s {
+        int num;               /&#x22C6; slot number &#x22C6;/
+
+        int type;           /&#x22C6; CA interface this slot supports &#x22C6;/
+ #define CA_CI            1  /&#x22C6; CI high level interface &#x22C6;/
+ #define CA_CI_LINK       2  /&#x22C6; CI link layer level interface &#x22C6;/
+ #define CA_CI_PHYS       4  /&#x22C6; CI physical layer level interface &#x22C6;/
+ #define CA_SC          128  /&#x22C6; simple smart card interface &#x22C6;/
+
+        unsigned int flags;
+ #define CA_CI_MODULE_PRESENT 1 /&#x22C6; module (or card) inserted &#x22C6;/
+ #define CA_CI_MODULE_READY   2
+ } ca_slot_info_t;
+</programlisting>
+
+</section>
+<section id="ca_descr_info_t">
+<title>ca_descr_info_t</title>
+ <programlisting>
+ typedef struct ca_descr_info_s {
+        unsigned int num;  /&#x22C6; number of available descramblers (keys) &#x22C6;/
+        unsigned int type; /&#x22C6; type of supported scrambling system &#x22C6;/
+ #define CA_ECD           1
+ #define CA_NDS           2
+ #define CA_DSS           4
+ } ca_descr_info_t;
+</programlisting>
+
+</section>
+<section id="ca_cap_t">
+<title>ca_cap_t</title>
+ <programlisting>
+ typedef struct ca_cap_s {
+        unsigned int slot_num;  /&#x22C6; total number of CA card and module slots &#x22C6;/
+        unsigned int slot_type; /&#x22C6; OR of all supported types &#x22C6;/
+        unsigned int descr_num; /&#x22C6; total number of descrambler slots (keys) &#x22C6;/
+        unsigned int descr_type;/&#x22C6; OR of all supported types &#x22C6;/
+ } ca_cap_t;
+</programlisting>
+
+</section>
+<section id="ca_msg_t">
+<title>ca_msg_t</title>
+ <programlisting>
+ /&#x22C6; a message to/from a CI-CAM &#x22C6;/
+ typedef struct ca_msg_s {
+        unsigned int index;
+        unsigned int type;
+        unsigned int length;
+        unsigned char msg[256];
+ } ca_msg_t;
+</programlisting>
+
+</section>
+<section id="ca_descr_t">
+<title>ca_descr_t</title>
+ <programlisting>
+ typedef struct ca_descr_s {
+        unsigned int index;
+        unsigned int parity;
+        unsigned char cw[8];
+ } ca_descr_t;
+</programlisting>
+ </section></section>
+<section id="ca_function_calls">
+<title>CA Function Calls</title>
+
+
+<section id="ca_fopen">
+<title>open()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call opens a named ca device (e.g. /dev/ost/ca) for subsequent use.</para>
+<para>When an open() call has succeeded, the device will be ready for use.
+ The significance of blocking or non-blocking mode is described in the
+ documentation for functions where there is a difference. It does not affect the
+ semantics of the open() call itself. A device opened in blocking mode can later
+ be put into non-blocking mode (and vice versa) using the F_SETFL command
+ of the fcntl system call. This is a standard system call, documented in the Linux
+ manual page for fcntl. Only one user can open the CA Device in O_RDWR
+ mode. All other attempts to open the device in this mode will fail, and an error
+ code will be returned.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open(const char &#x22C6;deviceName, int flags);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>const char
+ *deviceName</para>
+</entry><entry
+ align="char">
+<para>Name of specific video device.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int flags</para>
+</entry><entry
+ align="char">
+<para>A bit-wise OR of the following flags:</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDONLY read-only access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDWR read/write access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_NONBLOCK open in non-blocking mode</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>(blocking mode is the default)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="ca_fclose">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call closes a previously opened audio device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(int fd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section>
+</section>
diff --git a/Documentation/DocBook/dvb/demux.xml b/Documentation/DocBook/dvb/demux.xml
new file mode 100644 (file)
index 0000000..1b8c4e9
--- /dev/null
@@ -0,0 +1,973 @@
+<title>DVB Demux Device</title>
+
+<para>The DVB demux device controls the filters of the DVB hardware/software. It can be
+accessed through <emphasis role="tt">/dev/adapter0/demux0</emphasis>. Data types and and ioctl definitions can be
+accessed by including <emphasis role="tt">linux/dvb/dmx.h</emphasis> in your application.
+</para>
+<section id="dmx_types">
+<title>Demux Data Types</title>
+
+<section id="dmx_output_t">
+<title>dmx_output_t</title>
+ <programlisting>
+ typedef enum
+ {
+        DMX_OUT_DECODER,
+        DMX_OUT_TAP,
+        DMX_OUT_TS_TAP
+ } dmx_output_t;
+</programlisting>
+<para><emphasis role="tt">DMX_OUT_TAP</emphasis> delivers the stream output to the demux device on which the ioctl is
+called.
+</para>
+<para><emphasis role="tt">DMX_OUT_TS_TAP</emphasis> routes output to the logical DVR device <emphasis role="tt">/dev/dvb/adapter0/dvr0</emphasis>,
+which delivers a TS multiplexed from all filters for which <emphasis role="tt">DMX_OUT_TS_TAP</emphasis> was
+specified.
+</para>
+</section>
+
+<section id="dmx_input_t">
+<title>dmx_input_t</title>
+ <programlisting>
+ typedef enum
+ {
+        DMX_IN_FRONTEND,
+        DMX_IN_DVR
+ } dmx_input_t;
+</programlisting>
+</section>
+
+<section id="dmx_pes_type_t">
+<title>dmx_pes_type_t</title>
+ <programlisting>
+ typedef enum
+ {
+        DMX_PES_AUDIO,
+        DMX_PES_VIDEO,
+        DMX_PES_TELETEXT,
+        DMX_PES_SUBTITLE,
+        DMX_PES_PCR,
+        DMX_PES_OTHER
+ } dmx_pes_type_t;
+</programlisting>
+</section>
+
+<section id="dmx_event_t">
+<title>dmx_event_t</title>
+ <programlisting>
+ typedef enum
+ {
+        DMX_SCRAMBLING_EV,
+        DMX_FRONTEND_EV
+ } dmx_event_t;
+</programlisting>
+</section>
+
+<section id="dmx_scrambling_status_t">
+<title>dmx_scrambling_status_t</title>
+ <programlisting>
+ typedef enum
+ {
+        DMX_SCRAMBLING_OFF,
+        DMX_SCRAMBLING_ON
+ } dmx_scrambling_status_t;
+</programlisting>
+</section>
+
+<section id="dmx_filter">
+<title>struct dmx_filter</title>
+ <programlisting>
+ typedef struct dmx_filter
+ {
+        uint8_t         filter[DMX_FILTER_SIZE];
+        uint8_t         mask[DMX_FILTER_SIZE];
+ } dmx_filter_t;
+</programlisting>
+</section>
+
+<section id="dmx_sct_filter_params">
+<title>struct dmx_sct_filter_params</title>
+ <programlisting>
+ struct dmx_sct_filter_params
+ {
+        uint16_t            pid;
+        dmx_filter_t        filter;
+        uint32_t            timeout;
+        uint32_t            flags;
+ #define DMX_CHECK_CRC       1
+ #define DMX_ONESHOT         2
+ #define DMX_IMMEDIATE_START 4
+ };
+</programlisting>
+</section>
+
+<section id="dmx_pes_filter_params">
+<title>struct dmx_pes_filter_params</title>
+ <programlisting>
+ struct dmx_pes_filter_params
+ {
+        uint16_t            pid;
+        dmx_input_t         input;
+        dmx_output_t        output;
+        dmx_pes_type_t      pes_type;
+        uint32_t            flags;
+ };
+</programlisting>
+</section>
+
+<section id="dmx_event">
+<title>struct dmx_event</title>
+ <programlisting>
+ struct dmx_event
+ {
+        dmx_event_t          event;
+        time_t               timeStamp;
+        union
+        {
+                dmx_scrambling_status_t scrambling;
+        } u;
+ };
+</programlisting>
+</section>
+
+<section id="dmx_stc">
+<title>struct dmx_stc</title>
+ <programlisting>
+ struct dmx_stc {
+        unsigned int num;       /&#x22C6; input : which STC? 0..N &#x22C6;/
+        unsigned int base;      /&#x22C6; output: divisor for stc to get 90 kHz clock &#x22C6;/
+        uint64_t stc;           /&#x22C6; output: stc in 'base'&#x22C6;90 kHz units &#x22C6;/
+ };
+</programlisting>
+ </section>
+
+</section>
+
+<section id="dmx_fcalls">
+<title>Demux Function Calls</title>
+
+<section id="dmx_fopen">
+<title>open()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call, used with a device name of /dev/dvb/adapter0/demux0,
+ allocates a new filter and returns a handle which can be used for subsequent
+ control of that filter. This call has to be made for each filter to be used, i.e. every
+ returned file descriptor is a reference to a single filter. /dev/dvb/adapter0/dvr0
+ is a logical device to be used for retrieving Transport Streams for digital
+ video recording. When reading from this device a transport stream containing
+ the packets from all PES filters set in the corresponding demux device
+ (/dev/dvb/adapter0/demux0) having the output set to DMX_OUT_TS_TAP. A
+ recorded Transport Stream is replayed by writing to this device. </para>
+<para>The significance of blocking or non-blocking mode is described in the
+ documentation for functions where there is a difference. It does not affect the
+ semantics of the open() call itself. A device opened in blocking mode can later
+ be put into non-blocking mode (and vice versa) using the F_SETFL command
+ of the fcntl system call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open(const char &#x22C6;deviceName, int flags);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>const char
+ *deviceName</para>
+</entry><entry
+ align="char">
+<para>Name of demux device.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int flags</para>
+</entry><entry
+ align="char">
+<para>A bit-wise OR of the following flags:</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDWR read/write access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_NONBLOCK open in non-blocking mode</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>(blocking mode is the default)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EMFILE</para>
+</entry><entry
+ align="char">
+<para>&#8220;Too many open files&#8221;, i.e. no more filters available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOMEM</para>
+</entry><entry
+ align="char">
+<para>The driver failed to allocate enough memory.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_fclose">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call deactivates and deallocates a filter that was previously
+ allocated via the open() call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(int fd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_fread">
+<title>read()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call returns filtered data, which might be section or PES data. The
+ filtered data is transferred from the driver&#8217;s internal circular buffer to buf. The
+ maximum amount of data to be transferred is implied by count.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>When returning section data the driver always tries to return a complete single
+ section (even though buf would provide buffer space for more data). If the size
+ of the buffer is smaller than the section as much as possible will be returned,
+ and the remaining data will be provided in subsequent calls.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The size of the internal buffer is 2 * 4096 bytes (the size of two maximum
+ sized sections) by default. The size of this buffer may be changed by using the
+ DMX_SET_BUFFER_SIZE function. If the buffer is not large enough, or if
+ the read operations are not performed fast enough, this may result in a buffer
+ overflow error. In this case EOVERFLOW will be returned, and the circular
+ buffer will be emptied. This call is blocking if there is no data to return, i.e. the
+ process will be put to sleep waiting for data, unless the O_NONBLOCK flag
+ is specified.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>Note that in order to be able to read, the filtering process has to be started
+ by defining either a section or a PES filter by means of the ioctl functions,
+ and then starting the filtering process via the DMX_START ioctl function
+ or by setting the DMX_IMMEDIATE_START flag. If the reading is done
+ from a logical DVR demux device, the data will constitute a Transport Stream
+ including the packets from all PES filters in the corresponding demux device
+ /dev/dvb/adapter0/demux0 having the output set to DMX_OUT_TS_TAP.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>size_t read(int fd, void &#x22C6;buf, size_t count);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>void *buf</para>
+</entry><entry
+ align="char">
+<para>Pointer to the buffer to be used for returned filtered data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t count</para>
+</entry><entry
+ align="char">
+<para>Size of buf.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EWOULDBLOCK</para>
+</entry><entry
+ align="char">
+<para>No data to return and O_NONBLOCK was specified.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ECRC</para>
+</entry><entry
+ align="char">
+<para>Last section had a CRC error - no data returned. The
+ buffer is flushed.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EOVERFLOW</para>
+</entry><entry
+ align="char">
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>The filtered data was not read from the buffer in due
+ time, resulting in non-read data being lost. The buffer is
+ flushed.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ETIMEDOUT</para>
+</entry><entry
+ align="char">
+<para>The section was not loaded within the stated timeout
+ period. See ioctl DMX_SET_FILTER for how to set a
+ timeout.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>The driver failed to write to the callers buffer due to an
+ invalid *buf pointer.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_fwrite">
+<title>write()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call is only provided by the logical device /dev/dvb/adapter0/dvr0,
+ associated with the physical demux device that provides the actual DVR
+ functionality. It is used for replay of a digitally recorded Transport Stream.
+ Matching filters have to be defined in the corresponding physical demux
+ device, /dev/dvb/adapter0/demux0. The amount of data to be transferred is
+ implied by count.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>ssize_t write(int fd, const void &#x22C6;buf, size_t
+ count);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>void *buf</para>
+</entry><entry
+ align="char">
+<para>Pointer to the buffer containing the Transport Stream.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t count</para>
+</entry><entry
+ align="char">
+<para>Size of buf.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EWOULDBLOCK</para>
+</entry><entry
+ align="char">
+<para>No data was written. This
+ might happen if O_NONBLOCK was specified and there
+ is no more buffer space available (if O_NONBLOCK is
+ not specified the function will block until buffer space is
+ available).</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>This error code indicates that there are conflicting
+ requests. The corresponding demux device is setup to
+ receive data from the front- end. Make sure that these
+ filters are stopped and that the filters with input set to
+ DMX_IN_DVR are started.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_start">
+<title>DMX_START</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to start the actual filtering operation defined via the ioctl
+ calls DMX_SET_FILTER or DMX_SET_PES_FILTER.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_START);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_START for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument, i.e. no filtering parameters provided via
+ the DMX_SET_FILTER or DMX_SET_PES_FILTER
+ functions.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>This error code indicates that there are conflicting
+ requests. There are active filters filtering data from
+ another input source. Make sure that these filters are
+ stopped before starting this filter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_stop">
+<title>DMX_STOP</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to stop the actual filtering operation defined via the
+ ioctl calls DMX_SET_FILTER or DMX_SET_PES_FILTER and started via
+ the DMX_START command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_STOP);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_STOP for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_set_filter">
+<title>DMX_SET_FILTER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call sets up a filter according to the filter and mask parameters
+ provided. A timeout may be defined stating number of seconds to wait for a
+ section to be loaded. A value of 0 means that no timeout should be applied.
+ Finally there is a flag field where it is possible to state whether a section should
+ be CRC-checked, whether the filter should be a &#8221;one-shot&#8221; filter, i.e. if the
+ filtering operation should be stopped after the first section is received, and
+ whether the filtering operation should be started immediately (without waiting
+ for a DMX_START ioctl call). If a filter was previously set-up, this filter will
+ be canceled, and the receive buffer will be flushed.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_SET_FILTER,
+ struct dmx_sct_filter_params &#x22C6;params);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_SET_FILTER for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dmx_sct_filter_params
+ *params</para>
+</entry><entry
+ align="char">
+<para>Pointer to structure containing filter parameters.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_set_pes_filter">
+<title>DMX_SET_PES_FILTER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call sets up a PES filter according to the parameters provided. By a
+ PES filter is meant a filter that is based just on the packet identifier (PID), i.e.
+ no PES header or payload filtering capability is supported.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The transport stream destination for the filtered output may be set. Also the
+ PES type may be stated in order to be able to e.g. direct a video stream directly
+ to the video decoder. Finally there is a flag field where it is possible to state
+ whether the filtering operation should be started immediately (without waiting
+ for a DMX_START ioctl call). If a filter was previously set-up, this filter will
+ be cancelled, and the receive buffer will be flushed.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_SET_PES_FILTER,
+ struct dmx_pes_filter_params &#x22C6;params);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_SET_PES_FILTER for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dmx_pes_filter_params
+ *params</para>
+</entry><entry
+ align="char">
+<para>Pointer to structure containing filter parameters.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>This error code indicates that there are conflicting
+ requests. There are active filters filtering data from
+ another input source. Make sure that these filters are
+ stopped before starting this filter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dms_set_buffer_size">
+<title>DMX_SET_BUFFER_SIZE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to set the size of the circular buffer used for filtered data.
+ The default size is two maximum sized sections, i.e. if this function is not called
+ a buffer size of 2 * 4096 bytes will be used.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request =
+ DMX_SET_BUFFER_SIZE, unsigned long size);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_SET_BUFFER_SIZE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>unsigned long size</para>
+</entry><entry
+ align="char">
+<para>Size of circular buffer.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOMEM</para>
+</entry><entry
+ align="char">
+<para>The driver was not able to allocate a buffer of the
+ requested size.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_get_event">
+<title>DMX_GET_EVENT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns an event if available. If an event is not available,
+ the behavior depends on whether the device is in blocking or non-blocking
+ mode. In the latter case, the call fails immediately with errno set to
+ EWOULDBLOCK. In the former case, the call blocks until an event becomes
+ available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The standard Linux poll() and/or select() system calls can be used with the
+ device file descriptor to watch for new events. For select(), the file descriptor
+ should be included in the exceptfds argument, and for poll(), POLLPRI should
+ be specified as the wake-up condition. Only the latest event for each filter is
+ saved.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_GET_EVENT,
+ struct dmx_event &#x22C6;ev);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_GET_EVENT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct dmx_event *ev</para>
+</entry><entry
+ align="char">
+<para>Pointer to the location where the event is to be stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>ev points to an invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EWOULDBLOCK</para>
+</entry><entry
+ align="char">
+<para>There is no event pending, and the device is in
+ non-blocking mode.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="dmx_get_stc">
+<title>DMX_GET_STC</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns the current value of the system time counter (which is driven
+ by a PES filter of type DMX_PES_PCR). Some hardware supports more than one
+ STC, so you must specify which one by setting the num field of stc before the ioctl
+ (range 0...n). The result is returned in form of a ratio with a 64 bit numerator
+ and a 32 bit denominator, so the real 90kHz STC value is stc-&#x003E;stc /
+ stc-&#x003E;base
+ .</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request = DMX_GET_STC, struct
+ dmx_stc &#x22C6;stc);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals DMX_GET_STC for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct dmx_stc *stc</para>
+</entry><entry
+ align="char">
+<para>Pointer to the location where the stc is to be stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>stc points to an invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid stc number.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
diff --git a/Documentation/DocBook/dvb/dvbapi.xml b/Documentation/DocBook/dvb/dvbapi.xml
new file mode 100644 (file)
index 0000000..4fc5b23
--- /dev/null
@@ -0,0 +1,87 @@
+<partinfo>
+<authorgroup>
+<author>
+<firstname>Ralph</firstname>
+<surname>Metzler</surname>
+<othername role="mi">J. K.</othername>
+<affiliation><address><email>rjkm@metzlerbros.de</email></address></affiliation>
+</author>
+<author>
+<firstname>Marcus</firstname>
+<surname>Metzler</surname>
+<othername role="mi">O. C.</othername>
+<affiliation><address><email>rjkm@metzlerbros.de</email></address></affiliation>
+</author>
+<author>
+<firstname>Mauro</firstname>
+<surname>Chehab</surname>
+<othername role="mi">Carvalho</othername>
+<affiliation><address><email>mchehab@redhat.com</email></address></affiliation>
+<contrib>Ported document to Docbook XML.</contrib>
+</author>
+</authorgroup>
+<copyright>
+       <year>2002</year>
+       <year>2003</year>
+       <year>2009</year>
+       <holder>Convergence GmbH</holder>
+</copyright>
+
+<revhistory>
+<!-- Put document revisions here, newest first. -->
+<revision>
+<revnumber>2.0.1</revnumber>
+<date>2009-09-16</date>
+<authorinitials>mcc</authorinitials>
+<revremark>
+Added ISDB-T test originally written by Patrick Boettcher
+</revremark>
+</revision>
+<revision>
+<revnumber>2.0.0</revnumber>
+<date>2009-09-06</date>
+<authorinitials>mcc</authorinitials>
+<revremark>Conversion from LaTex to DocBook XML. The
+       contents is the same as the original LaTex version.</revremark>
+</revision>
+<revision>
+<revnumber>1.0.0</revnumber>
+<date>2003-07-24</date>
+<authorinitials>rjkm</authorinitials>
+<revremark>Initial revision on LaTEX.</revremark>
+</revision>
+</revhistory>
+</partinfo>
+
+
+<title>LINUX DVB API</title>
+<subtitle>Version 3</subtitle>
+<!-- ADD THE CHAPTERS HERE -->
+  <chapter id="dvb_introdution">
+    &sub-intro;
+  </chapter>
+  <chapter id="dvb_frontend">
+    &sub-frontend;
+  </chapter>
+  <chapter id="dvb_demux">
+    &sub-demux;
+  </chapter>
+  <chapter id="dvb_video">
+    &sub-video;
+  </chapter>
+  <chapter id="dvb_audio">
+    &sub-audio;
+  </chapter>
+  <chapter id="dvb_ca">
+    &sub-ca;
+  </chapter>
+  <chapter id="dvb_net">
+    &sub-net;
+  </chapter>
+  <chapter id="dvb_kdapi">
+    &sub-kdapi;
+  </chapter>
+  <chapter id="dvb_examples">
+    &sub-examples;
+  </chapter>
+<!-- END OF CHAPTERS -->
diff --git a/Documentation/DocBook/dvb/dvbstb.pdf b/Documentation/DocBook/dvb/dvbstb.pdf
new file mode 100644 (file)
index 0000000..0fa75d9
Binary files /dev/null and b/Documentation/DocBook/dvb/dvbstb.pdf differ
diff --git a/Documentation/DocBook/dvb/dvbstb.png b/Documentation/DocBook/dvb/dvbstb.png
new file mode 100644 (file)
index 0000000..9b8f372
Binary files /dev/null and b/Documentation/DocBook/dvb/dvbstb.png differ
diff --git a/Documentation/DocBook/dvb/examples.xml b/Documentation/DocBook/dvb/examples.xml
new file mode 100644 (file)
index 0000000..f037e56
--- /dev/null
@@ -0,0 +1,365 @@
+<title>Examples</title>
+<para>In this section we would like to present some examples for using the DVB API.
+</para>
+<para>Maintainer note: This section is out of date. Please refer to the sample programs packaged
+with the driver distribution from <ulink url="http://linuxtv.org/hg/dvb-apps" />.
+</para>
+
+<section id="tuning">
+<title>Tuning</title>
+<para>We will start with a generic tuning subroutine that uses the frontend and SEC, as well as
+the demux devices. The example is given for QPSK tuners, but can easily be adjusted for
+QAM.
+</para>
+<programlisting>
+ #include &#x003C;sys/ioctl.h&#x003E;
+ #include &#x003C;stdio.h&#x003E;
+ #include &#x003C;stdint.h&#x003E;
+ #include &#x003C;sys/types.h&#x003E;
+ #include &#x003C;sys/stat.h&#x003E;
+ #include &#x003C;fcntl.h&#x003E;
+ #include &#x003C;time.h&#x003E;
+ #include &#x003C;unistd.h&#x003E;
+
+ #include &#x003C;linux/dvb/dmx.h&#x003E;
+ #include &#x003C;linux/dvb/frontend.h&#x003E;
+ #include &#x003C;linux/dvb/sec.h&#x003E;
+ #include &#x003C;sys/poll.h&#x003E;
+
+ #define DMX "/dev/dvb/adapter0/demux1"
+ #define FRONT "/dev/dvb/adapter0/frontend1"
+ #define SEC "/dev/dvb/adapter0/sec1"
+
+ /&#x22C6; routine for checking if we have a signal and other status information&#x22C6;/
+ int FEReadStatus(int fd, fe_status_t &#x22C6;stat)
+ {
+        int ans;
+
+        if ( (ans = ioctl(fd,FE_READ_STATUS,stat) &#x003C; 0)){
+                perror("FE READ STATUS: ");
+                return -1;
+        }
+
+        if (&#x22C6;stat &amp; FE_HAS_POWER)
+                printf("FE HAS POWER\n");
+
+        if (&#x22C6;stat &amp; FE_HAS_SIGNAL)
+                printf("FE HAS SIGNAL\n");
+
+        if (&#x22C6;stat &amp; FE_SPECTRUM_INV)
+                printf("SPEKTRUM INV\n");
+
+        return 0;
+ }
+
+
+ /&#x22C6; tune qpsk &#x22C6;/
+ /&#x22C6; freq:             frequency of transponder                      &#x22C6;/
+ /&#x22C6; vpid, apid, tpid: PIDs of video, audio and teletext TS packets  &#x22C6;/
+ /&#x22C6; diseqc:           DiSEqC address of the used LNB                &#x22C6;/
+ /&#x22C6; pol:              Polarisation                                  &#x22C6;/
+ /&#x22C6; srate:            Symbol Rate                                   &#x22C6;/
+ /&#x22C6; fec.              FEC                                           &#x22C6;/
+ /&#x22C6; lnb_lof1:         local frequency of lower LNB band             &#x22C6;/
+ /&#x22C6; lnb_lof2:         local frequency of upper LNB band             &#x22C6;/
+ /&#x22C6; lnb_slof:         switch frequency of LNB                       &#x22C6;/
+
+ int set_qpsk_channel(int freq, int vpid, int apid, int tpid,
+                int diseqc, int pol, int srate, int fec, int lnb_lof1,
+                int lnb_lof2, int lnb_slof)
+ {
+        struct secCommand scmd;
+        struct secCmdSequence scmds;
+        struct dmx_pes_filter_params pesFilterParams;
+        FrontendParameters frp;
+        struct pollfd pfd[1];
+        FrontendEvent event;
+        int demux1, demux2, demux3, front;
+
+        frequency = (uint32_t) freq;
+        symbolrate = (uint32_t) srate;
+
+        if((front = open(FRONT,O_RDWR)) &#x003C; 0){
+                perror("FRONTEND DEVICE: ");
+                return -1;
+        }
+
+        if((sec = open(SEC,O_RDWR)) &#x003C; 0){
+                perror("SEC DEVICE: ");
+                return -1;
+        }
+
+        if (demux1 &#x003C; 0){
+                if ((demux1=open(DMX, O_RDWR|O_NONBLOCK))
+                    &#x003C; 0){
+                        perror("DEMUX DEVICE: ");
+                        return -1;
+                }
+        }
+
+        if (demux2 &#x003C; 0){
+                if ((demux2=open(DMX, O_RDWR|O_NONBLOCK))
+                    &#x003C; 0){
+                        perror("DEMUX DEVICE: ");
+                        return -1;
+                }
+        }
+
+        if (demux3 &#x003C; 0){
+                if ((demux3=open(DMX, O_RDWR|O_NONBLOCK))
+                    &#x003C; 0){
+                        perror("DEMUX DEVICE: ");
+                        return -1;
+                }
+        }
+
+        if (freq &#x003C; lnb_slof) {
+                frp.Frequency = (freq - lnb_lof1);
+                scmds.continuousTone = SEC_TONE_OFF;
+        } else {
+                frp.Frequency = (freq - lnb_lof2);
+                scmds.continuousTone = SEC_TONE_ON;
+        }
+        frp.Inversion = INVERSION_AUTO;
+        if (pol) scmds.voltage = SEC_VOLTAGE_18;
+        else scmds.voltage = SEC_VOLTAGE_13;
+
+        scmd.type=0;
+        scmd.u.diseqc.addr=0x10;
+        scmd.u.diseqc.cmd=0x38;
+        scmd.u.diseqc.numParams=1;
+        scmd.u.diseqc.params[0] = 0xF0 | ((diseqc &#x22C6; 4) &amp; 0x0F) |
+                (scmds.continuousTone == SEC_TONE_ON ? 1 : 0) |
+                (scmds.voltage==SEC_VOLTAGE_18 ? 2 : 0);
+
+        scmds.miniCommand=SEC_MINI_NONE;
+        scmds.numCommands=1;
+        scmds.commands=&amp;scmd;
+        if (ioctl(sec, SEC_SEND_SEQUENCE, &amp;scmds) &#x003C; 0){
+                perror("SEC SEND: ");
+                return -1;
+        }
+
+        if (ioctl(sec, SEC_SEND_SEQUENCE, &amp;scmds) &#x003C; 0){
+                perror("SEC SEND: ");
+                return -1;
+        }
+
+        frp.u.qpsk.SymbolRate = srate;
+        frp.u.qpsk.FEC_inner = fec;
+
+        if (ioctl(front, FE_SET_FRONTEND, &amp;frp) &#x003C; 0){
+                perror("QPSK TUNE: ");
+                return -1;
+        }
+
+        pfd[0].fd = front;
+        pfd[0].events = POLLIN;
+
+        if (poll(pfd,1,3000)){
+                if (pfd[0].revents &amp; POLLIN){
+                        printf("Getting QPSK event\n");
+                        if ( ioctl(front, FE_GET_EVENT, &amp;event)
+
+                             == -EOVERFLOW){
+                                perror("qpsk get event");
+                                return -1;
+                        }
+                        printf("Received ");
+                        switch(event.type){
+                        case FE_UNEXPECTED_EV:
+                                printf("unexpected event\n");
+                                return -1;
+                        case FE_FAILURE_EV:
+                                printf("failure event\n");
+                                return -1;
+
+                        case FE_COMPLETION_EV:
+                                printf("completion event\n");
+                        }
+                }
+        }
+
+
+        pesFilterParams.pid     = vpid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = DMX_OUT_DECODER;
+        pesFilterParams.pes_type = DMX_PES_VIDEO;
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(demux1, DMX_SET_PES_FILTER, &amp;pesFilterParams) &#x003C; 0){
+                perror("set_vpid");
+                return -1;
+        }
+
+        pesFilterParams.pid     = apid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = DMX_OUT_DECODER;
+        pesFilterParams.pes_type = DMX_PES_AUDIO;
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(demux2, DMX_SET_PES_FILTER, &amp;pesFilterParams) &#x003C; 0){
+                perror("set_apid");
+                return -1;
+        }
+
+        pesFilterParams.pid     = tpid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = DMX_OUT_DECODER;
+        pesFilterParams.pes_type = DMX_PES_TELETEXT;
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(demux3, DMX_SET_PES_FILTER, &amp;pesFilterParams) &#x003C; 0){
+                perror("set_tpid");
+                return -1;
+        }
+
+        return has_signal(fds);
+ }
+
+</programlisting>
+<para>The program assumes that you are using a universal LNB and a standard DiSEqC
+switch with up to 4 addresses. Of course, you could build in some more checking if
+tuning was successful and maybe try to repeat the tuning process. Depending on the
+external hardware, i.e. LNB and DiSEqC switch, and weather conditions this may be
+necessary.
+</para>
+</section>
+
+<section id="the_dvr_device">
+<title>The DVR device</title>
+<para>The following program code shows how to use the DVR device for recording.
+</para>
+<programlisting>
+ #include &#x003C;sys/ioctl.h&#x003E;
+ #include &#x003C;stdio.h&#x003E;
+ #include &#x003C;stdint.h&#x003E;
+ #include &#x003C;sys/types.h&#x003E;
+ #include &#x003C;sys/stat.h&#x003E;
+ #include &#x003C;fcntl.h&#x003E;
+ #include &#x003C;time.h&#x003E;
+ #include &#x003C;unistd.h&#x003E;
+
+ #include &#x003C;linux/dvb/dmx.h&#x003E;
+ #include &#x003C;linux/dvb/video.h&#x003E;
+ #include &#x003C;sys/poll.h&#x003E;
+ #define DVR "/dev/dvb/adapter0/dvr1"
+ #define AUDIO "/dev/dvb/adapter0/audio1"
+ #define VIDEO "/dev/dvb/adapter0/video1"
+
+ #define BUFFY (188&#x22C6;20)
+ #define MAX_LENGTH (1024&#x22C6;1024&#x22C6;5) /&#x22C6; record 5MB &#x22C6;/
+
+
+ /&#x22C6; switch the demuxes to recording, assuming the transponder is tuned &#x22C6;/
+
+ /&#x22C6; demux1, demux2: file descriptor of video and audio filters &#x22C6;/
+ /&#x22C6; vpid, apid:     PIDs of video and audio channels           &#x22C6;/
+
+ int switch_to_record(int demux1, int demux2, uint16_t vpid, uint16_t apid)
+ {
+        struct dmx_pes_filter_params pesFilterParams;
+
+        if (demux1 &#x003C; 0){
+                if ((demux1=open(DMX, O_RDWR|O_NONBLOCK))
+                    &#x003C; 0){
+                        perror("DEMUX DEVICE: ");
+                        return -1;
+                }
+        }
+
+        if (demux2 &#x003C; 0){
+                if ((demux2=open(DMX, O_RDWR|O_NONBLOCK))
+                    &#x003C; 0){
+                        perror("DEMUX DEVICE: ");
+                        return -1;
+                }
+        }
+
+        pesFilterParams.pid = vpid;
+        pesFilterParams.input = DMX_IN_FRONTEND;
+        pesFilterParams.output = DMX_OUT_TS_TAP;
+        pesFilterParams.pes_type = DMX_PES_VIDEO;
+        pesFilterParams.flags = DMX_IMMEDIATE_START;
+        if (ioctl(demux1, DMX_SET_PES_FILTER, &amp;pesFilterParams) &#x003C; 0){
+                perror("DEMUX DEVICE");
+                return -1;
+        }
+        pesFilterParams.pid = apid;
+        pesFilterParams.input = DMX_IN_FRONTEND;
+        pesFilterParams.output = DMX_OUT_TS_TAP;
+        pesFilterParams.pes_type = DMX_PES_AUDIO;
+        pesFilterParams.flags = DMX_IMMEDIATE_START;
+        if (ioctl(demux2, DMX_SET_PES_FILTER, &amp;pesFilterParams) &#x003C; 0){
+                perror("DEMUX DEVICE");
+                return -1;
+        }
+        return 0;
+ }
+
+ /&#x22C6; start recording MAX_LENGTH , assuming the transponder is tuned &#x22C6;/
+
+ /&#x22C6; demux1, demux2: file descriptor of video and audio filters &#x22C6;/
+ /&#x22C6; vpid, apid:     PIDs of video and audio channels           &#x22C6;/
+ int record_dvr(int demux1, int demux2, uint16_t vpid, uint16_t apid)
+ {
+        int i;
+        int len;
+        int written;
+        uint8_t buf[BUFFY];
+        uint64_t length;
+        struct pollfd pfd[1];
+        int dvr, dvr_out;
+
+        /&#x22C6; open dvr device &#x22C6;/
+        if ((dvr = open(DVR, O_RDONLY|O_NONBLOCK)) &#x003C; 0){
+                        perror("DVR DEVICE");
+                        return -1;
+        }
+
+        /&#x22C6; switch video and audio demuxes to dvr &#x22C6;/
+        printf ("Switching dvr on\n");
+        i = switch_to_record(demux1, demux2, vpid, apid);
+        printf("finished: ");
+
+        printf("Recording %2.0f MB of test file in TS format\n",
+               MAX_LENGTH/(1024.0&#x22C6;1024.0));
+        length = 0;
+
+        /&#x22C6; open output file &#x22C6;/
+        if ((dvr_out = open(DVR_FILE,O_WRONLY|O_CREAT
+                                 |O_TRUNC, S_IRUSR|S_IWUSR
+                                 |S_IRGRP|S_IWGRP|S_IROTH|
+                                 S_IWOTH)) &#x003C; 0){
+                perror("Can't open file for dvr test");
+                return -1;
+        }
+
+        pfd[0].fd = dvr;
+        pfd[0].events = POLLIN;
+
+        /&#x22C6; poll for dvr data and write to file &#x22C6;/
+        while (length &#x003C; MAX_LENGTH ) {
+                if (poll(pfd,1,1)){
+                        if (pfd[0].revents &amp; POLLIN){
+                                len = read(dvr, buf, BUFFY);
+                                if (len &#x003C; 0){
+                                        perror("recording");
+                                        return -1;
+                                }
+                                if (len &#x003E; 0){
+                                        written = 0;
+                                        while (written &#x003C; len)
+                                                written +=
+                                                        write (dvr_out,
+                                                               buf, len);
+                                        length += len;
+                                        printf("written %2.0f MB\r",
+                                               length/1024./1024.);
+                                }
+                        }
+                }
+        }
+        return 0;
+ }
+
+</programlisting>
+
+</section>
diff --git a/Documentation/DocBook/dvb/frontend.xml b/Documentation/DocBook/dvb/frontend.xml
new file mode 100644 (file)
index 0000000..9d89a7b
--- /dev/null
@@ -0,0 +1,1766 @@
+<title>DVB Frontend API</title>
+
+<para>The DVB frontend device controls the tuner and DVB demodulator
+hardware. It can be accessed through <emphasis
+role="tt">/dev/dvb/adapter0/frontend0</emphasis>. Data types and and
+ioctl definitions can be accessed by including <emphasis
+role="tt">linux/dvb/frontend.h</emphasis> in your application.</para>
+
+<para>DVB frontends come in three varieties: DVB-S (satellite), DVB-C
+(cable) and DVB-T (terrestrial). Transmission via the internet (DVB-IP)
+is not yet handled by this API but a future extension is possible. For
+DVB-S the frontend device also supports satellite equipment control
+(SEC) via DiSEqC and V-SEC protocols. The DiSEqC (digital SEC)
+specification is available from
+<ulink url="http://www.eutelsat.com/satellites/4_5_5.html">Eutelsat</ulink>.</para>
+
+<para>Note that the DVB API may also be used for MPEG decoder-only PCI
+cards, in which case there exists no frontend device.</para>
+
+<section id="frontend_types">
+<title>Frontend Data Types</title>
+
+<section id="frontend_type">
+<title>frontend type</title>
+
+<para>For historical reasons frontend types are named after the type of modulation used in
+transmission.</para>
+<programlisting>
+       typedef enum fe_type {
+       FE_QPSK,   /&#x22C6; DVB-S &#x22C6;/
+       FE_QAM,    /&#x22C6; DVB-C &#x22C6;/
+       FE_OFDM    /&#x22C6; DVB-T &#x22C6;/
+       } fe_type_t;
+</programlisting>
+
+</section>
+
+<section id="frontend_caps">
+<title>frontend capabilities</title>
+
+<para>Capabilities describe what a frontend can do. Some capabilities can only be supported for
+a specific frontend type.</para>
+<programlisting>
+       typedef enum fe_caps {
+       FE_IS_STUPID                  = 0,
+       FE_CAN_INVERSION_AUTO         = 0x1,
+       FE_CAN_FEC_1_2                = 0x2,
+       FE_CAN_FEC_2_3                = 0x4,
+       FE_CAN_FEC_3_4                = 0x8,
+       FE_CAN_FEC_4_5                = 0x10,
+       FE_CAN_FEC_5_6                = 0x20,
+       FE_CAN_FEC_6_7                = 0x40,
+       FE_CAN_FEC_7_8                = 0x80,
+       FE_CAN_FEC_8_9                = 0x100,
+       FE_CAN_FEC_AUTO               = 0x200,
+       FE_CAN_QPSK                   = 0x400,
+       FE_CAN_QAM_16                 = 0x800,
+       FE_CAN_QAM_32                 = 0x1000,
+       FE_CAN_QAM_64                 = 0x2000,
+       FE_CAN_QAM_128                = 0x4000,
+       FE_CAN_QAM_256                = 0x8000,
+       FE_CAN_QAM_AUTO               = 0x10000,
+       FE_CAN_TRANSMISSION_MODE_AUTO = 0x20000,
+       FE_CAN_BANDWIDTH_AUTO         = 0x40000,
+       FE_CAN_GUARD_INTERVAL_AUTO    = 0x80000,
+       FE_CAN_HIERARCHY_AUTO         = 0x100000,
+       FE_CAN_MUTE_TS                = 0x80000000,
+       FE_CAN_CLEAN_SETUP            = 0x40000000
+       } fe_caps_t;
+</programlisting>
+</section>
+
+<section id="frontend_info">
+<title>frontend information</title>
+
+<para>Information about the frontend ca be queried with FE_GET_INFO.</para>
+
+<programlisting>
+       struct dvb_frontend_info {
+       char       name[128];
+       fe_type_t  type;
+       uint32_t   frequency_min;
+       uint32_t   frequency_max;
+       uint32_t   frequency_stepsize;
+       uint32_t   frequency_tolerance;
+       uint32_t   symbol_rate_min;
+       uint32_t   symbol_rate_max;
+       uint32_t   symbol_rate_tolerance;     /&#x22C6; ppm &#x22C6;/
+       uint32_t   notifier_delay;            /&#x22C6; ms &#x22C6;/
+       fe_caps_t  caps;
+       };
+</programlisting>
+</section>
+
+<section id="frontend_diseqc">
+<title>diseqc master command</title>
+
+<para>A message sent from the frontend to DiSEqC capable equipment.</para>
+<programlisting>
+       struct dvb_diseqc_master_cmd {
+       uint8_t msg [6]; /&#x22C6;  { framing, address, command, data[3] } &#x22C6;/
+       uint8_t msg_len; /&#x22C6;  valid values are 3...6  &#x22C6;/
+       };
+</programlisting>
+</section>
+<section role="subsection">
+<title>diseqc slave reply</title>
+
+<para>A reply to the frontend from DiSEqC 2.0 capable equipment.</para>
+<programlisting>
+       struct dvb_diseqc_slave_reply {
+       uint8_t msg [4]; /&#x22C6;  { framing, data [3] } &#x22C6;/
+       uint8_t msg_len; /&#x22C6;  valid values are 0...4, 0 means no msg  &#x22C6;/
+       int     timeout; /&#x22C6;  return from ioctl after timeout ms with &#x22C6;/
+       };                       /&#x22C6;  errorcode when no message was received  &#x22C6;/
+</programlisting>
+</section>
+
+<section id="frontend_diseqc_slave_reply">
+<title>diseqc slave reply</title>
+<para>The voltage is usually used with non-DiSEqC capable LNBs to switch the polarzation
+(horizontal/vertical). When using DiSEqC epuipment this voltage has to be switched
+consistently to the DiSEqC commands as described in the DiSEqC spec.</para>
+<programlisting>
+       typedef enum fe_sec_voltage {
+       SEC_VOLTAGE_13,
+       SEC_VOLTAGE_18
+       } fe_sec_voltage_t;
+</programlisting>
+</section>
+
+<section id="frontend_sec_tone">
+<title>SEC continuous tone</title>
+
+<para>The continous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the
+high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to
+be switched consistently to the DiSEqC commands as described in the DiSEqC
+spec.</para>
+<programlisting>
+       typedef enum fe_sec_tone_mode {
+       SEC_TONE_ON,
+       SEC_TONE_OFF
+       } fe_sec_tone_mode_t;
+</programlisting>
+</section>
+
+<section id="frontend_sec_burst">
+<title>SEC tone burst</title>
+
+<para>The 22KHz tone burst is usually used with non-DiSEqC capable switches to select
+between two connected LNBs/satellites. When using DiSEqC epuipment this voltage has to
+be switched consistently to the DiSEqC commands as described in the DiSEqC
+spec.</para>
+<programlisting>
+       typedef enum fe_sec_mini_cmd {
+       SEC_MINI_A,
+       SEC_MINI_B
+       } fe_sec_mini_cmd_t;
+</programlisting>
+
+<para></para>
+</section>
+
+<section id="frontend_status">
+<title>frontend status</title>
+<para>Several functions of the frontend device use the fe_status data type defined
+by</para>
+<programlisting>
+ typedef enum fe_status {
+        FE_HAS_SIGNAL     = 0x01,   /&#x22C6;  found something above the noise level &#x22C6;/
+        FE_HAS_CARRIER    = 0x02,   /&#x22C6;  found a DVB signal  &#x22C6;/
+        FE_HAS_VITERBI    = 0x04,   /&#x22C6;  FEC is stable  &#x22C6;/
+        FE_HAS_SYNC       = 0x08,   /&#x22C6;  found sync bytes  &#x22C6;/
+        FE_HAS_LOCK       = 0x10,   /&#x22C6;  everything's working... &#x22C6;/
+        FE_TIMEDOUT       = 0x20,   /&#x22C6;  no lock within the last ~2 seconds &#x22C6;/
+        FE_REINIT         = 0x40    /&#x22C6;  frontend was reinitialized,  &#x22C6;/
+ } fe_status_t;                      /&#x22C6;  application is recommned to reset &#x22C6;/
+</programlisting>
+<para>to indicate the current state and/or state changes of the frontend hardware.
+</para>
+
+</section>
+
+<section id="frontend_params">
+<title>frontend parameters</title>
+<para>The kind of parameters passed to the frontend device for tuning depend on
+the kind of hardware you are using. All kinds of parameters are combined as an
+union in the FrontendParameters structure:</para>
+<programlisting>
+ struct dvb_frontend_parameters {
+        uint32_t frequency;       /&#x22C6; (absolute) frequency in Hz for QAM/OFDM &#x22C6;/
+                                  /&#x22C6; intermediate frequency in kHz for QPSK &#x22C6;/
+        fe_spectral_inversion_t inversion;
+        union {
+                struct dvb_qpsk_parameters qpsk;
+                struct dvb_qam_parameters  qam;
+                struct dvb_ofdm_parameters ofdm;
+        } u;
+ };
+</programlisting>
+<para>For satellite QPSK frontends you have to use the <constant>QPSKParameters</constant> member defined by</para>
+<programlisting>
+ struct dvb_qpsk_parameters {
+        uint32_t        symbol_rate;  /&#x22C6; symbol rate in Symbols per second &#x22C6;/
+        fe_code_rate_t  fec_inner;    /&#x22C6; forward error correction (see above) &#x22C6;/
+ };
+</programlisting>
+<para>for cable QAM frontend you use the <constant>QAMParameters</constant> structure</para>
+<programlisting>
+ struct dvb_qam_parameters {
+        uint32_t         symbol_rate; /&#x22C6; symbol rate in Symbols per second &#x22C6;/
+        fe_code_rate_t   fec_inner;   /&#x22C6; forward error correction (see above) &#x22C6;/
+        fe_modulation_t  modulation;  /&#x22C6; modulation type (see above) &#x22C6;/
+ };
+</programlisting>
+<para>DVB-T frontends are supported by the <constant>OFDMParamters</constant> structure
+</para>
+<programlisting>
+ struct dvb_ofdm_parameters {
+        fe_bandwidth_t      bandwidth;
+        fe_code_rate_t      code_rate_HP;  /&#x22C6; high priority stream code rate &#x22C6;/
+        fe_code_rate_t      code_rate_LP;  /&#x22C6; low priority stream code rate &#x22C6;/
+        fe_modulation_t     constellation; /&#x22C6; modulation type (see above) &#x22C6;/
+        fe_transmit_mode_t  transmission_mode;
+        fe_guard_interval_t guard_interval;
+        fe_hierarchy_t      hierarchy_information;
+ };
+</programlisting>
+<para>In the case of QPSK frontends the <constant>Frequency</constant> field specifies the intermediate
+frequency, i.e. the offset which is effectively added to the local oscillator frequency (LOF) of
+the LNB. The intermediate frequency has to be specified in units of kHz. For QAM and
+OFDM frontends the Frequency specifies the absolute frequency and is given in
+Hz.
+</para>
+<para>The Inversion field can take one of these values:
+</para>
+<programlisting>
+ typedef enum fe_spectral_inversion {
+        INVERSION_OFF,
+        INVERSION_ON,
+        INVERSION_AUTO
+ } fe_spectral_inversion_t;
+</programlisting>
+<para>It indicates if spectral inversion should be presumed or not. In the automatic setting
+(<constant>INVERSION_AUTO</constant>) the hardware will try to figure out the correct setting by
+itself.
+</para>
+<para>The possible values for the <constant>FEC_inner</constant> field are
+</para>
+<programlisting>
+ typedef enum fe_code_rate {
+        FEC_NONE = 0,
+        FEC_1_2,
+        FEC_2_3,
+        FEC_3_4,
+        FEC_4_5,
+        FEC_5_6,
+        FEC_6_7,
+        FEC_7_8,
+        FEC_8_9,
+        FEC_AUTO
+ } fe_code_rate_t;
+</programlisting>
+<para>which correspond to error correction rates of 1/2, 2/3, etc., no error correction or auto
+detection.
+</para>
+<para>For cable and terrestrial frontends (QAM and OFDM) one also has to specify the quadrature
+modulation mode which can be one of the following:
+</para>
+<programlisting>
+ typedef enum fe_modulation {
+ QPSK,
+        QAM_16,
+        QAM_32,
+        QAM_64,
+        QAM_128,
+        QAM_256,
+        QAM_AUTO
+ } fe_modulation_t;
+</programlisting>
+<para>Finally, there are several more parameters for OFDM:
+</para>
+<programlisting>
+ typedef enum fe_transmit_mode {
+        TRANSMISSION_MODE_2K,
+        TRANSMISSION_MODE_8K,
+        TRANSMISSION_MODE_AUTO
+ } fe_transmit_mode_t;
+</programlisting>
+ <programlisting>
+ typedef enum fe_bandwidth {
+        BANDWIDTH_8_MHZ,
+        BANDWIDTH_7_MHZ,
+        BANDWIDTH_6_MHZ,
+        BANDWIDTH_AUTO
+ } fe_bandwidth_t;
+</programlisting>
+ <programlisting>
+ typedef enum fe_guard_interval {
+        GUARD_INTERVAL_1_32,
+        GUARD_INTERVAL_1_16,
+        GUARD_INTERVAL_1_8,
+        GUARD_INTERVAL_1_4,
+        GUARD_INTERVAL_AUTO
+ } fe_guard_interval_t;
+</programlisting>
+ <programlisting>
+ typedef enum fe_hierarchy {
+        HIERARCHY_NONE,
+        HIERARCHY_1,
+        HIERARCHY_2,
+        HIERARCHY_4,
+        HIERARCHY_AUTO
+ } fe_hierarchy_t;
+</programlisting>
+
+</section>
+
+<section id="frontend_events">
+<title>frontend events</title>
+ <programlisting>
+ struct dvb_frontend_event {
+        fe_status_t status;
+        struct dvb_frontend_parameters parameters;
+ };
+</programlisting>
+ </section>
+</section>
+
+
+<section id="frontend_fcalls">
+<title>Frontend Function Calls</title>
+
+<section id="frontend_f_open">
+<title>open()</title>
+<para>DESCRIPTION</para>
+<informaltable><tgroup cols="1"><tbody><row>
+<entry align="char">
+<para>This system call opens a named frontend device (/dev/dvb/adapter0/frontend0)
+ for subsequent use. Usually the first thing to do after a successful open is to
+ find out the frontend type with FE_GET_INFO.</para>
+<para>The device can be opened in read-only mode, which only allows monitoring of
+ device status and statistics, or read/write mode, which allows any kind of use
+ (e.g. performing tuning operations.)
+</para>
+<para>In a system with multiple front-ends, it is usually the case that multiple devices
+ cannot be open in read/write mode simultaneously. As long as a front-end
+ device is opened in read/write mode, other open() calls in read/write mode will
+ either fail or block, depending on whether non-blocking or blocking mode was
+ specified. A front-end device opened in blocking mode can later be put into
+ non-blocking mode (and vice versa) using the F_SETFL command of the fcntl
+ system call. This is a standard system call, documented in the Linux manual
+ page for fcntl. When an open() call has succeeded, the device will be ready
+ for use in the specified mode. This implies that the corresponding hardware is
+ powered up, and that other front-ends may have been powered down to make
+ that possible.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open(const char &#x22C6;deviceName, int flags);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>const char
+ *deviceName</para>
+</entry><entry
+ align="char">
+<para>Name of specific video device.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int flags</para>
+</entry><entry
+ align="char">
+<para>A bit-wise OR of the following flags:</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDONLY read-only access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDWR read/write access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_NONBLOCK open in non-blocking mode</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>(blocking mode is the default)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_f_close">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call closes a previously opened front-end device. After closing
+ a front-end device, its corresponding hardware might be powered down
+ automatically.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(int fd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_read_status">
+<title>FE_READ_STATUS</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns status information about the front-end. This call only
+ requires read-only access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_READ_STATUS,
+ fe_status_t &#x22C6;status);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_READ_STATUS for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct fe_status_t
+ *status</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the front-end status word is
+ to be stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>status points to invalid address.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_read_ber">
+<title>FE_READ_BER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns the bit error rate for the signal currently
+ received/demodulated by the front-end. For this command, read-only access to
+ the device is sufficient.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_READ_BER,
+ uint32_t &#x22C6;ber);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_READ_BER for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>uint32_t *ber</para>
+</entry><entry
+ align="char">
+<para>The bit error rate is stored into *ber.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>ber points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSIGNAL</para>
+</entry><entry
+ align="char">
+<para>There is no signal, thus no meaningful bit error rate. Also
+ returned if the front-end is not turned on.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSYS</para>
+</entry><entry
+ align="char">
+<para>Function not available for this device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_read_snr">
+<title>FE_READ_SNR</title>
+
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns the signal-to-noise ratio for the signal currently received
+ by the front-end. For this command, read-only access to the device is sufficient.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_READ_SNR, int16_t
+ &#x22C6;snr);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_READ_SNR for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int16_t *snr</para>
+</entry><entry
+ align="char">
+<para>The signal-to-noise ratio is stored into *snr.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>snr points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSIGNAL</para>
+</entry><entry
+ align="char">
+<para>There is no signal, thus no meaningful signal strength
+ value. Also returned if front-end is not turned on.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSYS</para>
+</entry><entry
+ align="char">
+<para>Function not available for this device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_read_signal_strength">
+<title>FE_READ_SIGNAL_STRENGTH</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns the signal strength value for the signal currently received
+ by the front-end. For this command, read-only access to the device is sufficient.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request =
+ FE_READ_SIGNAL_STRENGTH, int16_t &#x22C6;strength);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_READ_SIGNAL_STRENGTH for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int16_t *strength</para>
+</entry><entry
+ align="char">
+<para>The signal strength value is stored into *strength.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>status points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSIGNAL</para>
+</entry><entry
+ align="char">
+<para>There is no signal, thus no meaningful signal strength
+ value. Also returned if front-end is not turned on.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSYS</para>
+</entry><entry
+ align="char">
+<para>Function not available for this device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_read_ub">
+<title>FE_READ_UNCORRECTED_BLOCKS</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns the number of uncorrected blocks detected by the device
+ driver during its lifetime. For meaningful measurements, the increment in block
+ count during a specific time interval should be calculated. For this command,
+ read-only access to the device is sufficient.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>Note that the counter will wrap to zero after its maximum count has been
+ reached.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl( int fd, int request =
+ FE_READ_UNCORRECTED_BLOCKS, uint32_t &#x22C6;ublocks);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_READ_UNCORRECTED_BLOCKS for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>uint32_t *ublocks</para>
+</entry><entry
+ align="char">
+<para>The total number of uncorrected blocks seen by the driver
+ so far.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>ublocks points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOSYS</para>
+</entry><entry
+ align="char">
+<para>Function not available for this device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_set_fe">
+<title>FE_SET_FRONTEND</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call starts a tuning operation using specified parameters. The result
+ of this call will be successful if the parameters were valid and the tuning could
+ be initiated. The result of the tuning operation in itself, however, will arrive
+ asynchronously as an event (see documentation for FE_GET_EVENT and
+ FrontendEvent.) If a new FE_SET_FRONTEND operation is initiated before
+ the previous one was completed, the previous operation will be aborted in favor
+ of the new one. This command requires read/write access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_SET_FRONTEND,
+ struct dvb_frontend_parameters &#x22C6;p);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_SET_FRONTEND for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_frontend_parameters
+ *p</para>
+</entry><entry
+ align="char">
+<para>Points to parameters for tuning operation.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>p points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Maximum supported symbol rate reached.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_get_fe">
+<title>FE_GET_FRONTEND</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call queries the currently effective frontend parameters. For this
+ command, read-only access to the device is sufficient.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_GET_FRONTEND,
+ struct dvb_frontend_parameters &#x22C6;p);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_SET_FRONTEND for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_frontend_parameters
+ *p</para>
+</entry><entry
+ align="char">
+<para>Points to parameters for tuning operation.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>p points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Maximum supported symbol rate reached.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+
+<section id="frontend_get_event">
+<title>FE_GET_EVENT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns a frontend event if available. If an event is not
+ available, the behavior depends on whether the device is in blocking or
+ non-blocking mode. In the latter case, the call fails immediately with errno
+ set to EWOULDBLOCK. In the former case, the call blocks until an event
+ becomes available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The standard Linux poll() and/or select() system calls can be used with the
+ device file descriptor to watch for new events. For select(), the file descriptor
+ should be included in the exceptfds argument, and for poll(), POLLPRI should
+ be specified as the wake-up condition. Since the event queue allocated is
+ rather small (room for 8 events), the queue must be serviced regularly to avoid
+ overflow. If an overflow happens, the oldest event is discarded from the queue,
+ and an error (EOVERFLOW) occurs the next time the queue is read. After
+ reporting the error condition in this fashion, subsequent FE_GET_EVENT
+ calls will return events from the queue as usual.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>For the sake of implementation simplicity, this command requires read/write
+ access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = QPSK_GET_EVENT,
+ struct dvb_frontend_event &#x22C6;ev);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_GET_EVENT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_frontend_event
+ *ev</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the event,</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>if any, is to be stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>ev points to invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EWOULDBLOCK</para>
+</entry><entry
+ align="char">
+<para>There is no event pending, and the device is in
+ non-blocking mode.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EOVERFLOW</para>
+</entry><entry
+ align="char">
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>Overflow in event queue - one or more events were lost.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_get_info">
+<title>FE_GET_INFO</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns information about the front-end. This call only requires
+ read-only access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(int fd, int request = FE_GET_INFO, struct
+ dvb_frontend_info &#x22C6;info);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_GET_INFO for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_frontend_info
+ *info</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the front-end information is
+ to be stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>info points to invalid address.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_diseqc_reset_overload">
+<title>FE_DISEQC_RESET_OVERLOAD</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>If the bus has been automatically powered off due to power overload, this ioctl
+ call restores the power to the bus. The call requires read/write access to the
+ device. This call has no effect if the device is manually powered off. Not all
+ DVB adapters support this ioctl.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ FE_DISEQC_RESET_OVERLOAD);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_DISEQC_RESET_OVERLOAD for this
+ command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Permission denied (needs read/write access).</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_diseqc_send_master_cmd">
+<title>FE_DISEQC_SEND_MASTER_CMD</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to send a a DiSEqC command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ FE_DISEQC_SEND_MASTER_CMD, struct
+ dvb_diseqc_master_cmd &#x22C6;cmd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_DISEQC_SEND_MASTER_CMD for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_diseqc_master_cmd
+ *cmd</para>
+</entry><entry
+ align="char">
+<para>Pointer to the command to be transmitted.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>Seq points to an invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>The data structure referred to by seq is invalid in some
+ way.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Permission denied (needs read/write access).</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_diseqc_recv_slave_reply">
+<title>FE_DISEQC_RECV_SLAVE_REPLY</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to receive reply to a DiSEqC 2.0 command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ FE_DISEQC_RECV_SLAVE_REPLY, struct
+ dvb_diseqc_slave_reply &#x22C6;reply);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_DISEQC_RECV_SLAVE_REPLY for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ dvb_diseqc_slave_reply
+ *reply</para>
+</entry><entry
+ align="char">
+<para>Pointer to the command to be received.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>Seq points to an invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>The data structure referred to by seq is invalid in some
+ way.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Permission denied (needs read/write access).</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_diseqc_send_burst">
+<title>FE_DISEQC_SEND_BURST</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call is used to send a 22KHz tone burst.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ FE_DISEQC_SEND_BURST, fe_sec_mini_cmd_t burst);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_DISEQC_SEND_BURST for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>fe_sec_mini_cmd_t
+ burst</para>
+</entry><entry
+ align="char">
+<para>burst A or B.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>Seq points to an invalid address.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>The data structure referred to by seq is invalid in some
+ way.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Permission denied (needs read/write access).</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_set_tone">
+<title>FE_SET_TONE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This call is used to set the generation of the continuous 22kHz tone. This call
+ requires read/write permissions.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_SET_TONE,
+ fe_sec_tone_mode_t tone);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_SET_TONE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>fe_sec_tone_mode_t
+ tone</para>
+</entry><entry
+ align="char">
+<para>The requested tone generation mode (on/off).</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>File not opened with read permissions.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+</row></tbody></tgroup></informaltable>
+</section>
+
+<section id="fe_set_voltage">
+<title>FE_SET_VOLTAGE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This call is used to set the bus voltage. This call requires read/write
+ permissions.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = FE_SET_VOLTAGE,
+ fe_sec_voltage_t voltage);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_SET_VOLTAGE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>fe_sec_voltage_t
+ voltage</para>
+</entry><entry
+ align="char">
+<para>The requested bus voltage.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>File not opened with read permissions.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="frontend_enable_high_lnb_volt">
+<title>FE_ENABLE_HIGH_LNB_VOLTAGE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>If high != 0 enables slightly higher voltages instead of 13/18V (to compensate
+ for long cables). This call requires read/write permissions. Not all DVB
+ adapters support this ioctl.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request =
+ FE_ENABLE_HIGH_LNB_VOLTAGE, int high);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals FE_SET_VOLTAGE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int high</para>
+</entry><entry
+ align="char">
+<para>The requested bus voltage.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>File not opened with read permissions.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error in the device driver.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+</section>
+&sub-isdbt;
diff --git a/Documentation/DocBook/dvb/intro.xml b/Documentation/DocBook/dvb/intro.xml
new file mode 100644 (file)
index 0000000..0dc83f6
--- /dev/null
@@ -0,0 +1,191 @@
+<title>Introduction</title>
+
+<section id="requisites">
+<title>What you need to know</title>
+
+<para>The reader of this document is required to have some knowledge in
+the area of digital video broadcasting (DVB) and should be familiar with
+part I of the MPEG2 specification ISO/IEC 13818 (aka ITU-T H.222), i.e
+you should know what a program/transport stream (PS/TS) is and what is
+meant by a packetized elementary stream (PES) or an I-frame.</para>
+
+<para>Various DVB standards documents are available from
+<ulink url="http://www.dvb.org" /> and/or
+<ulink url="http://www.etsi.org" />.</para>
+
+<para>It is also necessary to know how to access unix/linux devices and
+how to use ioctl calls. This also includes the knowledge of C or C++.
+</para>
+</section>
+
+<section id="history">
+<title>History</title>
+
+<para>The first API for DVB cards we used at Convergence in late 1999
+was an extension of the Video4Linux API which was primarily developed
+for frame grabber cards. As such it was not really well suited to be
+used for DVB cards and their new features like recording MPEG streams
+and filtering several section and PES data streams at the same time.
+</para>
+
+<para>In early 2000, we were approached by Nokia with a proposal for a
+new standard Linux DVB API. As a commitment to the development of
+terminals based on open standards, Nokia and Convergence made it
+available to all Linux developers and published it on
+<ulink url="http://www.linuxtv.org/" /> in September 2000.
+Convergence is the maintainer of the Linux DVB API. Together with the
+LinuxTV community (i.e. you, the reader of this document), the Linux DVB
+API will be constantly reviewed and improved. With the Linux driver for
+the Siemens/Hauppauge DVB PCI card Convergence provides a first
+implementation of the Linux DVB API.</para>
+</section>
+
+<section id="overview">
+<title>Overview</title>
+
+<figure id="stb_components">
+<title>Components of a DVB card/STB</title>
+<mediaobject>
+<imageobject>
+<imagedata fileref="dvbstb.pdf" format="PS" />
+</imageobject>
+<imageobject>
+<imagedata fileref="dvbstb.png" format="PNG" />
+</imageobject>
+</mediaobject>
+</figure>
+
+<para>A DVB PCI card or DVB set-top-box (STB) usually consists of the
+following main hardware components: </para>
+
+<itemizedlist>
+ <listitem>
+
+<para>Frontend consisting of tuner and DVB demodulator</para>
+
+<para>Here the raw signal reaches the DVB hardware from a satellite dish
+or antenna or directly from cable. The frontend down-converts and
+demodulates this signal into an MPEG transport stream (TS). In case of a
+satellite frontend, this includes a facility for satellite equipment
+control (SEC), which allows control of LNB polarization, multi feed
+switches or dish rotors.</para>
+
+</listitem>
+ <listitem>
+
+<para>Conditional Access (CA) hardware like CI adapters and smartcard slots
+</para>
+
+<para>The complete TS is passed through the CA hardware. Programs to
+which the user has access (controlled by the smart card) are decoded in
+real time and re-inserted into the TS.</para>
+
+</listitem>
+ <listitem>
+ <para>Demultiplexer which filters the incoming DVB stream</para>
+
+<para>The demultiplexer splits the TS into its components like audio and
+video streams. Besides usually several of such audio and video streams
+it also contains data streams with information about the programs
+offered in this or other streams of the same provider.</para>
+
+</listitem>
+<listitem>
+
+<para>MPEG2 audio and video decoder</para>
+
+<para>The main targets of the demultiplexer are the MPEG2 audio and
+video decoders. After decoding they pass on the uncompressed audio and
+video to the computer screen or (through a PAL/NTSC encoder) to a TV
+set.</para>
+
+
+</listitem>
+</itemizedlist>
+
+<para><xref linkend="stb_components" /> shows a crude schematic of the control and data flow
+between those components.</para>
+
+<para>On a DVB PCI card not all of these have to be present since some
+functionality can be provided by the main CPU of the PC (e.g. MPEG
+picture and sound decoding) or is not needed (e.g. for data-only uses
+like &#8220;internet over satellite&#8221;). Also not every card or STB
+provides conditional access hardware.</para>
+
+</section>
+
+<section id="dvb_devices">
+<title>Linux DVB Devices</title>
+
+<para>The Linux DVB API lets you control these hardware components
+through currently six Unix-style character devices for video, audio,
+frontend, demux, CA and IP-over-DVB networking. The video and audio
+devices control the MPEG2 decoder hardware, the frontend device the
+tuner and the DVB demodulator. The demux device gives you control over
+the PES and section filters of the hardware. If the hardware does not
+support filtering these filters can be implemented in software. Finally,
+the CA device controls all the conditional access capabilities of the
+hardware. It can depend on the individual security requirements of the
+platform, if and how many of the CA functions are made available to the
+application through this device.</para>
+
+<para>All devices can be found in the <emphasis role="tt">/dev</emphasis>
+tree under <emphasis role="tt">/dev/dvb</emphasis>. The individual devices
+are called:</para>
+
+<itemizedlist>
+<listitem>
+
+<para><emphasis role="tt">/dev/dvb/adapterN/audioM</emphasis>,</para>
+</listitem>
+<listitem>
+<para><emphasis role="tt">/dev/dvb/adapterN/videoM</emphasis>,</para>
+</listitem>
+<listitem>
+<para><emphasis role="tt">/dev/dvb/adapterN/frontendM</emphasis>,</para>
+</listitem>
+ <listitem>
+
+<para><emphasis role="tt">/dev/dvb/adapterN/netM</emphasis>,</para>
+</listitem>
+ <listitem>
+
+<para><emphasis role="tt">/dev/dvb/adapterN/demuxM</emphasis>,</para>
+</listitem>
+ <listitem>
+
+<para><emphasis role="tt">/dev/dvb/adapterN/caM</emphasis>,</para></listitem></itemizedlist>
+
+<para>where N enumerates the DVB PCI cards in a system starting
+from&#x00A0;0, and M enumerates the devices of each type within each
+adapter, starting from&#x00A0;0, too. We will omit the &#8220;<emphasis
+role="tt">/dev/dvb/adapterN/</emphasis>&#8221; in the further dicussion
+of these devices. The naming scheme for the devices is the same wheter
+devfs is used or not.</para>
+
+<para>More details about the data structures and function calls of all
+the devices are described in the following chapters.</para>
+
+</section>
+
+<section id="include_files">
+<title>API include files</title>
+
+<para>For each of the DVB devices a corresponding include file exists.
+The DVB API include files should be included in application sources with
+a partial path like:</para>
+
+
+<programlisting>
+       #include &#x003C;linux/dvb/frontend.h&#x003E;
+</programlisting>
+
+<para>To enable applications to support different API version, an
+additional include file <emphasis
+role="tt">linux/dvb/version.h</emphasis> exists, which defines the
+constant <emphasis role="tt">DVB_API_VERSION</emphasis>. This document
+describes <emphasis role="tt">DVB_API_VERSION&#x00A0;3</emphasis>.
+</para>
+
+</section>
+
diff --git a/Documentation/DocBook/dvb/isdbt.xml b/Documentation/DocBook/dvb/isdbt.xml
new file mode 100644 (file)
index 0000000..9285522
--- /dev/null
@@ -0,0 +1,314 @@
+<section id="isdbt">
+       <title>ISDB-T frontend</title>
+       <para>This section describes shortly what are the possible parameters in the Linux
+               DVB-API called "S2API" and now DVB API 5 in order to tune an ISDB-T/ISDB-Tsb
+               demodulator:</para>
+
+       <para>This ISDB-T/ISDB-Tsb API extension should reflect all information
+               needed to tune any ISDB-T/ISDB-Tsb hardware. Of course it is possible
+               that some very sophisticated devices won't need certain parameters to
+               tune.</para>
+
+       <para>The information given here should help application writers to know how
+               to handle ISDB-T and ISDB-Tsb hardware using the Linux DVB-API.</para>
+
+       <para>The details given here about ISDB-T and ISDB-Tsb are just enough to
+               basically show the dependencies between the needed parameter values,
+               but surely some information is left out. For more detailed information
+               see the following documents:</para>
+
+       <para>ARIB STD-B31 - "Transmission System for Digital Terrestrial
+               Television Broadcasting" and</para>
+       <para>ARIB TR-B14 - "Operational Guidelines for Digital Terrestrial
+               Television Broadcasting".</para>
+
+       <para>In order to read this document one has to have some knowledge the
+               channel structure in ISDB-T and ISDB-Tsb. I.e. it has to be known to
+               the reader that an ISDB-T channel consists of 13 segments, that it can
+               have up to 3 layer sharing those segments, and things like that.</para>
+
+       <para>Parameters used by ISDB-T and ISDB-Tsb.</para>
+
+       <section id="isdbt-parms">
+               <title>Parameters that are common with DVB-T and ATSC</title>
+
+               <section id="isdbt-freq">
+                       <title><constant>DTV_FREQUENCY</constant></title>
+
+                       <para>Central frequency of the channel.</para>
+
+                       <para>For ISDB-T the channels are usally transmitted with an offset of 143kHz. E.g. a
+                               valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of
+                               the channel which is 6MHz.</para>
+
+                       <para>As in ISDB-Tsb the channel consists of only one or three segments the
+                               frequency step is 429kHz, 3*429 respectively. As for ISDB-T the
+                               central frequency of the channel is expected.</para>
+               </section>
+
+               <section id="isdbt-bw">
+                       <title><constant>DTV_BANDWIDTH_HZ</constant> (optional)</title>
+
+                       <para>Possible values:</para>
+
+                       <para>For ISDB-T it should be always 6000000Hz (6MHz)</para>
+                       <para>For ISDB-Tsb it can vary depending on the number of connected segments</para>
+
+                       <para>Note: Hardware specific values might be given here, but standard
+                               applications should not bother to set a value to this field as
+                               standard demods are ignoring it anyway.</para>
+
+                       <para>Bandwidth in ISDB-T is fixed (6MHz) or can be easily derived from
+                               other parameters (DTV_ISDBT_SB_SEGMENT_IDX,
+                               DTV_ISDBT_SB_SEGMENT_COUNT).</para>
+               </section>
+
+               <section id="isdbt-delivery-sys">
+                       <title><constant>DTV_DELIVERY_SYSTEM</constant></title>
+
+                       <para>Possible values: <constant>SYS_ISDBT</constant></para>
+               </section>
+
+               <section id="isdbt-tx-mode">
+                       <title><constant>DTV_TRANSMISSION_MODE</constant></title>
+
+                       <para>ISDB-T supports three carrier/symbol-size: 8K, 4K, 2K. It is called
+                               'mode' in the standard: Mode 1 is 2K, mode 2 is 4K, mode 3 is 8K</para>
+
+                       <para>Possible values: <constant>TRANSMISSION_MODE_2K</constant>, <constant>TRANSMISSION_MODE_8K</constant>,
+                               <constant>TRANSMISSION_MODE_AUTO</constant>, <constant>TRANSMISSION_MODE_4K</constant></para>
+
+                       <para>If <constant>DTV_TRANSMISSION_MODE</constant> is set the <constant>TRANSMISSION_MODE_AUTO</constant> the
+                               hardware will try to find the correct FFT-size (if capable) and will
+                               use TMCC to fill in the missing parameters.</para>
+
+                       <para><constant>TRANSMISSION_MODE_4K</constant> is added at the same time as the other new parameters.</para>
+               </section>
+
+               <section id="isdbt-guard-interval">
+                       <title><constant>DTV_GUARD_INTERVAL</constant></title>
+
+                       <para>Possible values: <constant>GUARD_INTERVAL_1_32</constant>, <constant>GUARD_INTERVAL_1_16</constant>, <constant>GUARD_INTERVAL_1_8</constant>,
+                               <constant>GUARD_INTERVAL_1_4</constant>, <constant>GUARD_INTERVAL_AUTO</constant></para>
+
+                       <para>If <constant>DTV_GUARD_INTERVAL</constant> is set the <constant>GUARD_INTERVAL_AUTO</constant> the hardware will
+                               try to find the correct guard interval (if capable) and will use TMCC to fill
+                               in the missing parameters.</para>
+               </section>
+       </section>
+       <section id="isdbt-new-parms">
+               <title>ISDB-T only parameters</title>
+
+               <section id="isdbt-part-rec">
+                       <title><constant>DTV_ISDBT_PARTIAL_RECEPTION</constant></title>
+
+                       <para><constant>If DTV_ISDBT_SOUND_BROADCASTING</constant> is '0' this bit-field represents whether
+                               the channel is in partial reception mode or not.</para>
+
+                       <para>If '1' <constant>DTV_ISDBT_LAYERA_*</constant> values are assigned to the center segment and
+                               <constant>DTV_ISDBT_LAYERA_SEGMENT_COUNT</constant> has to be '1'.</para>
+
+                       <para>If in addition <constant>DTV_ISDBT_SOUND_BROADCASTING</constant> is '1'
+                               <constant>DTV_ISDBT_PARTIAL_RECEPTION</constant> represents whether this ISDB-Tsb channel
+                               is consisting of one segment and layer or three segments and two layers.</para>
+
+                       <para>Possible values: 0, 1, -1 (AUTO)</para>
+               </section>
+
+               <section id="isdbt-sound-bcast">
+                       <title><constant>DTV_ISDBT_SOUND_BROADCASTING</constant></title>
+
+                       <para>This field represents whether the other DTV_ISDBT_*-parameters are
+                               referring to an ISDB-T and an ISDB-Tsb channel. (See also
+                               <constant>DTV_ISDBT_PARTIAL_RECEPTION</constant>).</para>
+
+                       <para>Possible values: 0, 1, -1 (AUTO)</para>
+               </section>
+
+               <section id="isdbt-sb-ch-id">
+                       <title><constant>DTV_ISDBT_SB_SUBCHANNEL_ID</constant></title>
+
+                       <para>This field only applies if <constant>DTV_ISDBT_SOUND_BROADCASTING</constant> is '1'.</para>
+
+                       <para>(Note of the author: This might not be the correct description of the
+                               <constant>SUBCHANNEL-ID</constant> in all details, but it is my understanding of the technical
+                               background needed to program a device)</para>
+
+                       <para>An ISDB-Tsb channel (1 or 3 segments) can be broadcasted alone or in a
+                               set of connected ISDB-Tsb channels. In this set of channels every
+                               channel can be received independently. The number of connected
+                               ISDB-Tsb segment can vary, e.g. depending on the frequency spectrum
+                               bandwidth available.</para>
+
+                       <para>Example: Assume 8 ISDB-Tsb connected segments are broadcasted. The
+                               broadcaster has several possibilities to put those channels in the
+                               air: Assuming a normal 13-segment ISDB-T spectrum he can align the 8
+                               segments from position 1-8 to 5-13 or anything in between.</para>
+
+                       <para>The underlying layer of segments are subchannels: each segment is
+                               consisting of several subchannels with a predefined IDs. A sub-channel
+                               is used to help the demodulator to synchronize on the channel.</para>
+
+                       <para>An ISDB-T channel is always centered over all sub-channels. As for
+                               the example above, in ISDB-Tsb it is no longer as simple as that.</para>
+
+                       <para><constant>The DTV_ISDBT_SB_SUBCHANNEL_ID</constant> parameter is used to give the
+                               sub-channel ID of the segment to be demodulated.</para>
+
+                       <para>Possible values: 0 .. 41, -1 (AUTO)</para>
+               </section>
+
+               <section id="isdbt-sb-seg-idx">
+
+                       <title><constant>DTV_ISDBT_SB_SEGMENT_IDX</constant></title>
+
+                       <para>This field only applies if <constant>DTV_ISDBT_SOUND_BROADCASTING</constant> is '1'.</para>
+
+                       <para><constant>DTV_ISDBT_SB_SEGMENT_IDX</constant> gives the index of the segment to be
+                               demodulated for an ISDB-Tsb channel where several of them are
+                               transmitted in the connected manner.</para>
+
+                       <para>Possible values: 0 .. <constant>DTV_ISDBT_SB_SEGMENT_COUNT</constant> - 1</para>
+
+                       <para>Note: This value cannot be determined by an automatic channel search.</para>
+               </section>
+
+               <section id="isdbt-sb-seg-cnt">
+                       <title><constant>DTV_ISDBT_SB_SEGMENT_COUNT</constant></title>
+
+                       <para>This field only applies if <constant>DTV_ISDBT_SOUND_BROADCASTING</constant> is '1'.</para>
+
+                       <para><constant>DTV_ISDBT_SB_SEGMENT_COUNT</constant> gives the total count of connected ISDB-Tsb
+                               channels.</para>
+
+                       <para>Possible values: 1 .. 13</para>
+
+                       <para>Note: This value cannot be determined by an automatic channel search.</para>
+               </section>
+
+               <section id="isdb-hierq-layers">
+                       <title>Hierarchical layers</title>
+
+                       <para>ISDB-T channels can be coded hierarchically. As opposed to DVB-T in
+                               ISDB-T hierarchical layers can be decoded simultaneously. For that
+                               reason a ISDB-T demodulator has 3 viterbi and 3 reed-solomon-decoders.</para>
+
+                       <para>ISDB-T has 3 hierarchical layers which each can use a part of the
+                               available segments. The total number of segments over all layers has
+                               to 13 in ISDB-T.</para>
+
+                       <section id="isdbt-layer-ena">
+                               <title><constant>DTV_ISDBT_LAYER_ENABLED</constant></title>
+
+                               <para>Hierarchical reception in ISDB-T is achieved by enabling or disabling
+                                       layers in the decoding process. Setting all bits of
+                                       <constant>DTV_ISDBT_LAYER_ENABLED</constant> to '1' forces all layers (if applicable) to be
+                                       demodulated. This is the default.</para>
+
+                               <para>If the channel is in the partial reception mode
+                                       (<constant>DTV_ISDBT_PARTIAL_RECEPTION</constant> = 1) the central segment can be decoded
+                                       independently of the other 12 segments. In that mode layer A has to
+                                       have a <constant>SEGMENT_COUNT</constant> of 1.</para>
+
+                               <para>In ISDB-Tsb only layer A is used, it can be 1 or 3 in ISDB-Tsb
+                                       according to <constant>DTV_ISDBT_PARTIAL_RECEPTION</constant>. <constant>SEGMENT_COUNT</constant> must be filled
+                                       accordingly.</para>
+
+                               <para>Possible values: 0x1, 0x2, 0x4 (|-able)</para>
+
+                               <para><constant>DTV_ISDBT_LAYER_ENABLED[0:0]</constant> - layer A</para>
+                               <para><constant>DTV_ISDBT_LAYER_ENABLED[1:1]</constant> - layer B</para>
+                               <para><constant>DTV_ISDBT_LAYER_ENABLED[2:2]</constant> - layer C</para>
+                               <para><constant>DTV_ISDBT_LAYER_ENABLED[31:3]</constant> unused</para>
+                       </section>
+
+                       <section id="isdbt-layer-fec">
+                               <title><constant>DTV_ISDBT_LAYER*_FEC</constant></title>
+
+                               <para>Possible values: <constant>FEC_AUTO</constant>, <constant>FEC_1_2</constant>, <constant>FEC_2_3</constant>, <constant>FEC_3_4</constant>, <constant>FEC_5_6</constant>, <constant>FEC_7_8</constant></para>
+                       </section>
+
+                       <section id="isdbt-layer-mod">
+                               <title><constant>DTV_ISDBT_LAYER*_MODULATION</constant></title>
+
+                               <para>Possible values: <constant>QAM_AUTO</constant>, QP<constant>SK, QAM_16</constant>, <constant>QAM_64</constant>, <constant>DQPSK</constant></para>
+
+                               <para>Note: If layer C is <constant>DQPSK</constant> layer B has to be <constant>DQPSK</constant>. If layer B is <constant>DQPSK</constant>
+                                       and <constant>DTV_ISDBT_PARTIAL_RECEPTION</constant>=0 layer has to be <constant>DQPSK</constant>.</para>
+                       </section>
+
+                       <section id="isdbt-layer-seg-cnt">
+                               <title><constant>DTV_ISDBT_LAYER*_SEGMENT_COUNT</constant></title>
+
+                               <para>Possible values: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, -1 (AUTO)</para>
+
+                               <para>Note: Truth table for <constant>DTV_ISDBT_SOUND_BROADCASTING</constant> and
+                                       <constant>DTV_ISDBT_PARTIAL_RECEPTION</constant> and <constant>LAYER</constant>*_SEGMENT_COUNT</para>
+
+                               <informaltable id="isdbt-layer_seg-cnt-table">
+                                       <tgroup cols="6">
+
+                                               <tbody>
+                                                       <row>
+                                                               <entry>PR</entry>
+                                                               <entry>SB</entry>
+                                                               <entry>Layer A width</entry>
+                                                               <entry>Layer B width</entry>
+                                                               <entry>Layer C width</entry>
+                                                               <entry>total width</entry>
+                                                       </row>
+
+                                                       <row>
+                                                               <entry>0</entry>
+                                                               <entry>0</entry>
+                                                               <entry>1 .. 13</entry>
+                                                               <entry>1 .. 13</entry>
+                                                               <entry>1 .. 13</entry>
+                                                               <entry>13</entry>
+                                                       </row>
+
+                                                       <row>
+                                                               <entry>1</entry>
+                                                               <entry>0</entry>
+                                                               <entry>1</entry>
+                                                               <entry>1 .. 13</entry>
+                                                               <entry>1 .. 13</entry>
+                                                               <entry>13</entry>
+                                                       </row>
+
+                                                       <row>
+                                                               <entry>0</entry>
+                                                               <entry>1</entry>
+                                                               <entry>1</entry>
+                                                               <entry>0</entry>
+                                                               <entry>0</entry>
+                                                               <entry>1</entry>
+                                                       </row>
+
+                                                       <row>
+                                                               <entry>1</entry>
+                                                               <entry>1</entry>
+                                                               <entry>1</entry>
+                                                               <entry>2</entry>
+                                                               <entry>0</entry>
+                                                               <entry>13</entry>
+                                                       </row>
+                                               </tbody>
+
+                                       </tgroup>
+                               </informaltable>
+
+                       </section>
+
+                       <section id="isdbt_layer_t_interl">
+                               <title><constant>DTV_ISDBT_LAYER*_TIME_INTERLEAVING</constant></title>
+
+                               <para>Possible values: 0, 1, 2, 3, -1 (AUTO)</para>
+
+                               <para>Note: The real inter-leaver depth-names depend on the mode (fft-size); the values
+                                       here are referring to what can be found in the TMCC-structure -
+                                       independent of the mode.</para>
+                       </section>
+               </section>
+       </section>
+</section>
diff --git a/Documentation/DocBook/dvb/kdapi.xml b/Documentation/DocBook/dvb/kdapi.xml
new file mode 100644 (file)
index 0000000..6c67481
--- /dev/null
@@ -0,0 +1,2309 @@
+<title>Kernel Demux API</title>
+<para>The kernel demux API defines a driver-internal interface for registering low-level,
+hardware specific driver to a hardware independent demux layer. It is only of interest for
+DVB device driver writers. The header file for this API is named <emphasis role="tt">demux.h</emphasis> and located in
+<emphasis role="tt">drivers/media/dvb/dvb-core</emphasis>.
+</para>
+<para>Maintainer note: This section must be reviewed. It is probably out of date.
+</para>
+
+<section id="kernel_demux_data_types">
+<title>Kernel Demux Data Types</title>
+
+
+<section id="dmx_success_t">
+<title>dmx_success_t</title>
+ <programlisting>
+ typedef enum {
+   DMX_OK = 0, /&#x22C6; Received Ok &#x22C6;/
+   DMX_LENGTH_ERROR, /&#x22C6; Incorrect length &#x22C6;/
+   DMX_OVERRUN_ERROR, /&#x22C6; Receiver ring buffer overrun &#x22C6;/
+   DMX_CRC_ERROR, /&#x22C6; Incorrect CRC &#x22C6;/
+   DMX_FRAME_ERROR, /&#x22C6; Frame alignment error &#x22C6;/
+   DMX_FIFO_ERROR, /&#x22C6; Receiver FIFO overrun &#x22C6;/
+   DMX_MISSED_ERROR /&#x22C6; Receiver missed packet &#x22C6;/
+ } dmx_success_t;
+</programlisting>
+
+</section>
+<section id="ts_filter_types">
+<title>TS filter types</title>
+ <programlisting>
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+ /&#x22C6; TS packet reception &#x22C6;/
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+
+ /&#x22C6; TS filter type for set_type() &#x22C6;/
+
+ #define TS_PACKET       1   /&#x22C6; send TS packets (188 bytes) to callback (default) &#x22C6;/
+ #define TS_PAYLOAD_ONLY 2   /&#x22C6; in case TS_PACKET is set, only send the TS
+                               payload (&#x003C;=184 bytes per packet) to callback &#x22C6;/
+ #define TS_DECODER      4   /&#x22C6; send stream to built-in decoder (if present) &#x22C6;/
+</programlisting>
+
+</section>
+<section id="dmx_ts_pes_t">
+<title>dmx_ts_pes_t</title>
+<para>The structure
+</para>
+<programlisting>
+ typedef enum
+ {
+        DMX_TS_PES_AUDIO,   /&#x22C6; also send packets to audio decoder (if it exists) &#x22C6;/
+        DMX_TS_PES_VIDEO,   /&#x22C6; ... &#x22C6;/
+        DMX_TS_PES_TELETEXT,
+        DMX_TS_PES_SUBTITLE,
+        DMX_TS_PES_PCR,
+        DMX_TS_PES_OTHER,
+ } dmx_ts_pes_t;
+</programlisting>
+<para>describes the PES type for filters which write to a built-in decoder. The correspond (and
+should be kept identical) to the types in the demux device.
+</para>
+<programlisting>
+ struct dmx_ts_feed_s {
+        int is_filtering; /&#x22C6; Set to non-zero when filtering in progress &#x22C6;/
+        struct dmx_demux_s&#x22C6; parent; /&#x22C6; Back-pointer &#x22C6;/
+        void&#x22C6; priv; /&#x22C6; Pointer to private data of the API client &#x22C6;/
+        int (&#x22C6;set) (struct dmx_ts_feed_s&#x22C6; feed,
+                    __u16 pid,
+                    size_t callback_length,
+                    size_t circular_buffer_size,
+                    int descramble,
+                    struct timespec timeout);
+        int (&#x22C6;start_filtering) (struct dmx_ts_feed_s&#x22C6; feed);
+        int (&#x22C6;stop_filtering) (struct dmx_ts_feed_s&#x22C6; feed);
+        int (&#x22C6;set_type) (struct dmx_ts_feed_s&#x22C6; feed,
+                         int type,
+                         dmx_ts_pes_t pes_type);
+ };
+
+ typedef struct dmx_ts_feed_s dmx_ts_feed_t;
+</programlisting>
+ <programlisting>
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+ /&#x22C6; PES packet reception (not supported yet) &#x22C6;/
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+
+ typedef struct dmx_pes_filter_s {
+        struct dmx_pes_s&#x22C6; parent; /&#x22C6; Back-pointer &#x22C6;/
+        void&#x22C6; priv; /&#x22C6; Pointer to private data of the API client &#x22C6;/
+ } dmx_pes_filter_t;
+</programlisting>
+ <programlisting>
+ typedef struct dmx_pes_feed_s {
+        int is_filtering; /&#x22C6; Set to non-zero when filtering in progress &#x22C6;/
+        struct dmx_demux_s&#x22C6; parent; /&#x22C6; Back-pointer &#x22C6;/
+        void&#x22C6; priv; /&#x22C6; Pointer to private data of the API client &#x22C6;/
+        int (&#x22C6;set) (struct dmx_pes_feed_s&#x22C6; feed,
+                    __u16 pid,
+                    size_t circular_buffer_size,
+                    int descramble,
+                    struct timespec timeout);
+        int (&#x22C6;start_filtering) (struct dmx_pes_feed_s&#x22C6; feed);
+        int (&#x22C6;stop_filtering) (struct dmx_pes_feed_s&#x22C6; feed);
+        int (&#x22C6;allocate_filter) (struct dmx_pes_feed_s&#x22C6; feed,
+                                dmx_pes_filter_t&#x22C6;&#x22C6; filter);
+        int (&#x22C6;release_filter) (struct dmx_pes_feed_s&#x22C6; feed,
+                               dmx_pes_filter_t&#x22C6; filter);
+ } dmx_pes_feed_t;
+</programlisting>
+ <programlisting>
+ typedef struct {
+        __u8 filter_value [DMX_MAX_FILTER_SIZE];
+        __u8 filter_mask [DMX_MAX_FILTER_SIZE];
+        struct dmx_section_feed_s&#x22C6; parent; /&#x22C6; Back-pointer &#x22C6;/
+        void&#x22C6; priv; /&#x22C6; Pointer to private data of the API client &#x22C6;/
+ } dmx_section_filter_t;
+</programlisting>
+ <programlisting>
+ struct dmx_section_feed_s {
+        int is_filtering; /&#x22C6; Set to non-zero when filtering in progress &#x22C6;/
+        struct dmx_demux_s&#x22C6; parent; /&#x22C6; Back-pointer &#x22C6;/
+        void&#x22C6; priv; /&#x22C6; Pointer to private data of the API client &#x22C6;/
+        int (&#x22C6;set) (struct dmx_section_feed_s&#x22C6; feed,
+                    __u16 pid,
+                    size_t circular_buffer_size,
+                    int descramble,
+                    int check_crc);
+        int (&#x22C6;allocate_filter) (struct dmx_section_feed_s&#x22C6; feed,
+                                dmx_section_filter_t&#x22C6;&#x22C6; filter);
+        int (&#x22C6;release_filter) (struct dmx_section_feed_s&#x22C6; feed,
+                               dmx_section_filter_t&#x22C6; filter);
+        int (&#x22C6;start_filtering) (struct dmx_section_feed_s&#x22C6; feed);
+        int (&#x22C6;stop_filtering) (struct dmx_section_feed_s&#x22C6; feed);
+ };
+ typedef struct dmx_section_feed_s dmx_section_feed_t;
+
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+ /&#x22C6; Callback functions &#x22C6;/
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+
+ typedef int (&#x22C6;dmx_ts_cb) ( __u8 &#x22C6; buffer1,
+                           size_t buffer1_length,
+                           __u8 &#x22C6; buffer2,
+                           size_t buffer2_length,
+                           dmx_ts_feed_t&#x22C6; source,
+                           dmx_success_t success);
+
+ typedef int (&#x22C6;dmx_section_cb) ( __u8 &#x22C6; buffer1,
+                                size_t buffer1_len,
+                                __u8 &#x22C6; buffer2,
+                                size_t buffer2_len,
+                                dmx_section_filter_t &#x22C6; source,
+                                dmx_success_t success);
+
+ typedef int (&#x22C6;dmx_pes_cb) ( __u8 &#x22C6; buffer1,
+                            size_t buffer1_len,
+                            __u8 &#x22C6; buffer2,
+                            size_t buffer2_len,
+                            dmx_pes_filter_t&#x22C6; source,
+                            dmx_success_t success);
+
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+ /&#x22C6; DVB Front-End &#x22C6;/
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+
+ typedef enum {
+        DMX_OTHER_FE = 0,
+        DMX_SATELLITE_FE,
+        DMX_CABLE_FE,
+        DMX_TERRESTRIAL_FE,
+        DMX_LVDS_FE,
+        DMX_ASI_FE, /&#x22C6; DVB-ASI interface &#x22C6;/
+        DMX_MEMORY_FE
+ } dmx_frontend_source_t;
+
+ typedef struct {
+        /&#x22C6; The following char&#x22C6; fields point to NULL terminated strings &#x22C6;/
+        char&#x22C6; id;                    /&#x22C6; Unique front-end identifier &#x22C6;/
+        char&#x22C6; vendor;                /&#x22C6; Name of the front-end vendor &#x22C6;/
+        char&#x22C6; model;                 /&#x22C6; Name of the front-end model &#x22C6;/
+        struct list_head connectivity_list; /&#x22C6; List of front-ends that can
+                                               be connected to a particular
+                                               demux &#x22C6;/
+        void&#x22C6; priv;     /&#x22C6; Pointer to private data of the API client &#x22C6;/
+        dmx_frontend_source_t source;
+ } dmx_frontend_t;
+
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+ /&#x22C6; MPEG-2 TS Demux &#x22C6;/
+ /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
+
+ /&#x22C6;
+  &#x22C6; Flags OR'ed in the capabilites field of struct dmx_demux_s.
+  &#x22C6;/
+
+ #define DMX_TS_FILTERING                        1
+ #define DMX_PES_FILTERING                       2
+ #define DMX_SECTION_FILTERING                   4
+ #define DMX_MEMORY_BASED_FILTERING              8    /&#x22C6; write() available &#x22C6;/
+ #define DMX_CRC_CHECKING                        16
+ #define DMX_TS_DESCRAMBLING                     32
+ #define DMX_SECTION_PAYLOAD_DESCRAMBLING        64
+ #define DMX_MAC_ADDRESS_DESCRAMBLING            128
+</programlisting>
+
+</section>
+<section id="demux_demux_t">
+<title>demux_demux_t</title>
+ <programlisting>
+ /&#x22C6;
+  &#x22C6; DMX_FE_ENTRY(): Casts elements in the list of registered
+  &#x22C6; front-ends from the generic type struct list_head
+  &#x22C6; to the type &#x22C6; dmx_frontend_t
+  &#x22C6;.
+ &#x22C6;/
+
+ #define DMX_FE_ENTRY(list) list_entry(list, dmx_frontend_t, connectivity_list)
+
+ struct dmx_demux_s {
+        /&#x22C6; The following char&#x22C6; fields point to NULL terminated strings &#x22C6;/
+        char&#x22C6; id;                    /&#x22C6; Unique demux identifier &#x22C6;/
+        char&#x22C6; vendor;                /&#x22C6; Name of the demux vendor &#x22C6;/
+        char&#x22C6; model;                 /&#x22C6; Name of the demux model &#x22C6;/
+        __u32 capabilities;          /&#x22C6; Bitfield of capability flags &#x22C6;/
+        dmx_frontend_t&#x22C6; frontend;    /&#x22C6; Front-end connected to the demux &#x22C6;/
+        struct list_head reg_list;   /&#x22C6; List of registered demuxes &#x22C6;/
+        void&#x22C6; priv;                  /&#x22C6; Pointer to private data of the API client &#x22C6;/
+        int users;                   /&#x22C6; Number of users &#x22C6;/
+        int (&#x22C6;open) (struct dmx_demux_s&#x22C6; demux);
+        int (&#x22C6;close) (struct dmx_demux_s&#x22C6; demux);
+        int (&#x22C6;write) (struct dmx_demux_s&#x22C6; demux, const char&#x22C6; buf, size_t count);
+        int (&#x22C6;allocate_ts_feed) (struct dmx_demux_s&#x22C6; demux,
+                                 dmx_ts_feed_t&#x22C6;&#x22C6; feed,
+                                 dmx_ts_cb callback);
+        int (&#x22C6;release_ts_feed) (struct dmx_demux_s&#x22C6; demux,
+                                dmx_ts_feed_t&#x22C6; feed);
+        int (&#x22C6;allocate_pes_feed) (struct dmx_demux_s&#x22C6; demux,
+                                  dmx_pes_feed_t&#x22C6;&#x22C6; feed,
+                                  dmx_pes_cb callback);
+        int (&#x22C6;release_pes_feed) (struct dmx_demux_s&#x22C6; demux,
+                                 dmx_pes_feed_t&#x22C6; feed);
+        int (&#x22C6;allocate_section_feed) (struct dmx_demux_s&#x22C6; demux,
+                                      dmx_section_feed_t&#x22C6;&#x22C6; feed,
+                                      dmx_section_cb callback);
+        int (&#x22C6;release_section_feed) (struct dmx_demux_s&#x22C6; demux,
+                                     dmx_section_feed_t&#x22C6; feed);
+        int (&#x22C6;descramble_mac_address) (struct dmx_demux_s&#x22C6; demux,
+                                       __u8&#x22C6; buffer1,
+                                       size_t buffer1_length,
+                                       __u8&#x22C6; buffer2,
+                                       size_t buffer2_length,
+                                       __u16 pid);
+        int (&#x22C6;descramble_section_payload) (struct dmx_demux_s&#x22C6; demux,
+                                           __u8&#x22C6; buffer1,
+                                           size_t buffer1_length,
+                                           __u8&#x22C6; buffer2, size_t buffer2_length,
+                                           __u16 pid);
+        int (&#x22C6;add_frontend) (struct dmx_demux_s&#x22C6; demux,
+                             dmx_frontend_t&#x22C6; frontend);
+        int (&#x22C6;remove_frontend) (struct dmx_demux_s&#x22C6; demux,
+                                dmx_frontend_t&#x22C6; frontend);
+        struct list_head&#x22C6; (&#x22C6;get_frontends) (struct dmx_demux_s&#x22C6; demux);
+        int (&#x22C6;connect_frontend) (struct dmx_demux_s&#x22C6; demux,
+                                 dmx_frontend_t&#x22C6; frontend);
+        int (&#x22C6;disconnect_frontend) (struct dmx_demux_s&#x22C6; demux);
+
+
+        /&#x22C6; added because js cannot keep track of these himself &#x22C6;/
+        int (&#x22C6;get_pes_pids) (struct dmx_demux_s&#x22C6; demux, __u16 &#x22C6;pids);
+ };
+ typedef struct dmx_demux_s dmx_demux_t;
+</programlisting>
+
+</section>
+<section id="demux_directory">
+<title>Demux directory</title>
+ <programlisting>
+ /&#x22C6;
+  &#x22C6; DMX_DIR_ENTRY(): Casts elements in the list of registered
+  &#x22C6; demuxes from the generic type struct list_head&#x22C6; to the type dmx_demux_t
+  &#x22C6;.
+  &#x22C6;/
+
+ #define DMX_DIR_ENTRY(list) list_entry(list, dmx_demux_t, reg_list)
+
+ int dmx_register_demux (dmx_demux_t&#x22C6; demux);
+ int dmx_unregister_demux (dmx_demux_t&#x22C6; demux);
+ struct list_head&#x22C6; dmx_get_demuxes (void);
+</programlisting>
+ </section></section>
+<section id="demux_directory_api">
+<title>Demux Directory API</title>
+<para>The demux directory is a Linux kernel-wide facility for registering and accessing the
+MPEG-2 TS demuxes in the system. Run-time registering and unregistering of demux drivers
+is possible using this API.
+</para>
+<para>All demux drivers in the directory implement the abstract interface dmx_demux_t.
+</para>
+
+<section
+role="subsection"><title>dmx_register_demux()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function makes a demux driver interface available to the Linux kernel. It is
+ usually called by the init_module() function of the kernel module that contains
+ the demux driver. The caller of this function is responsible for allocating
+ dynamic or static memory for the demux structure and for initializing its fields
+ before calling this function. The memory allocated for the demux structure
+ must not be freed before calling dmx_unregister_demux(),</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int dmx_register_demux ( dmx_demux_t &#x22C6;demux )</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux structure.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EEXIST</para>
+</entry><entry
+ align="char">
+<para>A demux with the same value of the id field already stored
+ in the directory.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSPC</para>
+</entry><entry
+ align="char">
+<para>No space left in the directory.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>dmx_unregister_demux()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function is called to indicate that the given demux interface is no
+ longer available. The caller of this function is responsible for freeing the
+ memory of the demux structure, if it was dynamically allocated before calling
+ dmx_register_demux(). The cleanup_module() function of the kernel module
+ that contains the demux driver should call this function. Note that this function
+ fails if the demux is currently in use, i.e., release_demux() has not been called
+ for the interface.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int dmx_unregister_demux ( dmx_demux_t &#x22C6;demux )</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux structure which is to be
+ unregistered.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>The specified demux is not registered in the demux
+ directory.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>The specified demux is currently in use.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>dmx_get_demuxes()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Provides the caller with the list of registered demux interfaces, using the
+ standard list structure defined in the include file linux/list.h. The include file
+ demux.h defines the macro DMX_DIR_ENTRY() for converting an element of
+ the generic type struct list_head* to the type dmx_demux_t*. The caller must
+ not free the memory of any of the elements obtained via this function call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>struct list_head &#x22C6;dmx_get_demuxes ()</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>none</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>struct list_head *</para>
+</entry><entry
+ align="char">
+<para>A list of demux interfaces, or NULL in the case of an
+ empty list.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
+<section id="demux_api">
+<title>Demux API</title>
+<para>The demux API should be implemented for each demux in the system. It is used to select
+the TS source of a demux and to manage the demux resources. When the demux
+client allocates a resource via the demux API, it receives a pointer to the API of that
+resource.
+</para>
+<para>Each demux receives its TS input from a DVB front-end or from memory, as set via the
+demux API. In a system with more than one front-end, the API can be used to select one of
+the DVB front-ends as a TS source for a demux, unless this is fixed in the HW platform. The
+demux API only controls front-ends regarding their connections with demuxes; the APIs
+used to set the other front-end parameters, such as tuning, are not defined in this
+document.
+</para>
+<para>The functions that implement the abstract interface demux should be defined static or
+module private and registered to the Demux Directory for external access. It is not necessary
+to implement every function in the demux_t struct, however (for example, a demux interface
+might support Section filtering, but not TS or PES filtering). The API client is expected to
+check the value of any function pointer before calling the function: the value of NULL means
+&#8220;function not available&#8221;.
+</para>
+<para>Whenever the functions of the demux API modify shared data, the possibilities of lost
+update and race condition problems should be addressed, e.g. by protecting parts of code with
+mutexes. This is especially important on multi-processor hosts.
+</para>
+<para>Note that functions called from a bottom half context must not sleep, at least in the 2.2.x
+kernels. Even a simple memory allocation can result in a kernel thread being put to sleep if
+swapping is needed. For example, the Linux kernel calls the functions of a network device
+interface from a bottom half context. Thus, if a demux API function is called from network
+device code, the function must not sleep.
+</para>
+
+
+<section id="kdapi_fopen">
+<title>open()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function reserves the demux for use by the caller and, if necessary,
+ initializes the demux. When the demux is no longer needed, the function close()
+ should be called. It should be possible for multiple clients to access the demux
+ at the same time. Thus, the function implementation should increment the
+ demux usage count when open() is called and decrement it when close() is
+ called.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open ( demux_t&#x22C6; demux );</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t* demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EUSERS</para>
+</entry><entry
+ align="char">
+<para>Maximum usage count reached.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="kdapi_fclose">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function reserves the demux for use by the caller and, if necessary,
+ initializes the demux. When the demux is no longer needed, the function close()
+ should be called. It should be possible for multiple clients to access the demux
+ at the same time. Thus, the function implementation should increment the
+ demux usage count when open() is called and decrement it when close() is
+ called.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(demux_t&#x22C6; demux);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t* demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENODEV</para>
+</entry><entry
+ align="char">
+<para>The demux was not in use.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="kdapi_fwrite">
+<title>write()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function provides the demux driver with a memory buffer containing TS
+ packets. Instead of receiving TS packets from the DVB front-end, the demux
+ driver software will read packets from memory. Any clients of this demux
+ with active TS, PES or Section filters will receive filtered data via the Demux
+ callback API (see 0). The function returns when all the data in the buffer has
+ been consumed by the demux. Demux hardware typically cannot read TS from
+ memory. If this is the case, memory-based filtering has to be implemented
+ entirely in software.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int write(demux_t&#x22C6; demux, const char&#x22C6; buf, size_t
+ count);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t* demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>const char* buf</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS data in kernel-space memory.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t length</para>
+</entry><entry
+ align="char">
+<para>Length of the TS data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>The command is not implemented.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>allocate_ts_feed()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Allocates a new TS feed, which is used to filter the TS packets carrying a
+ certain PID. The TS feed normally corresponds to a hardware PID filter on the
+ demux chip.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int allocate_ts_feed(dmx_demux_t&#x22C6; demux,
+ dmx_ts_feed_t&#x22C6;&#x22C6; feed, dmx_ts_cb callback);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t* demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_ts_feed_t**
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_ts_cb callback</para>
+</entry><entry
+ align="char">
+<para>Pointer to the callback function for passing received TS
+ packet</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EBUSY</para>
+</entry><entry
+ align="char">
+<para>No more TS feeds available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>The command is not implemented.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>release_ts_feed()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Releases the resources allocated with allocate_ts_feed(). Any filtering in
+ progress on the TS feed should be stopped before calling this function.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int release_ts_feed(dmx_demux_t&#x22C6; demux,
+ dmx_ts_feed_t&#x22C6; feed);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t* demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_ts_feed_t* feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>allocate_section_feed()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Allocates a new section feed, i.e. a demux resource for filtering and receiving
+ sections. On platforms with hardware support for section filtering, a section
+ feed is directly mapped to the demux HW. On other platforms, TS packets are
+ first PID filtered in hardware and a hardware section filter then emulated in
+ software. The caller obtains an API pointer of type dmx_section_feed_t as an
+ out parameter. Using this API the caller can set filtering parameters and start
+ receiving sections.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int allocate_section_feed(dmx_demux_t&#x22C6; demux,
+ dmx_section_feed_t &#x22C6;&#x22C6;feed, dmx_section_cb callback);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t *demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_feed_t
+ **feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_cb
+ callback</para>
+</entry><entry
+ align="char">
+<para>Pointer to the callback function for passing received
+ sections.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EBUSY</para>
+</entry><entry
+ align="char">
+<para>No more section feeds available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>The command is not implemented.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>release_section_feed()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Releases the resources allocated with allocate_section_feed(), including
+ allocated filters. Any filtering in progress on the section feed should be stopped
+ before calling this function.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int release_section_feed(dmx_demux_t&#x22C6; demux,
+ dmx_section_feed_t &#x22C6;feed);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>demux_t *demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_feed_t
+ *feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>descramble_mac_address()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function runs a descrambling algorithm on the destination MAC
+ address field of a DVB Datagram Section, replacing the original address
+ with its un-encrypted version. Otherwise, the description on the function
+ descramble_section_payload() applies also to this function.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int descramble_mac_address(dmx_demux_t&#x22C6; demux, __u8
+ &#x22C6;buffer1, size_t buffer1_length, __u8 &#x22C6;buffer2,
+ size_t buffer2_length, __u16 pid);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t
+ *demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8 *buffer1</para>
+</entry><entry
+ align="char">
+<para>Pointer to the first byte of the section.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer1_length</para>
+</entry><entry
+ align="char">
+<para>Length of the section data, including headers and CRC,
+ in buffer1.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8* buffer2</para>
+</entry><entry
+ align="char">
+<para>Pointer to the tail of the section data, or NULL. The
+ pointer has a non-NULL value if the section wraps past
+ the end of a circular buffer.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer2_length</para>
+</entry><entry
+ align="char">
+<para>Length of the section data, including headers and CRC,
+ in buffer2.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u16 pid</para>
+</entry><entry
+ align="char">
+<para>The PID on which the section was received. Useful
+ for obtaining the descrambling key, e.g. from a DVB
+ Common Access facility.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>No descrambling facility available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>descramble_section_payload()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function runs a descrambling algorithm on the payload of a DVB
+ Datagram Section, replacing the original payload with its un-encrypted
+ version. The function will be called from the demux API implementation;
+ the API client need not call this function directly. Section-level scrambling
+ algorithms are currently standardized only for DVB-RCC (return channel
+ over 2-directional cable TV network) systems. For all other DVB networks,
+ encryption schemes are likely to be proprietary to each data broadcaster. Thus,
+ it is expected that this function pointer will have the value of NULL (i.e.,
+ function not available) in most demux API implementations. Nevertheless, it
+ should be possible to use the function pointer as a hook for dynamically adding
+ a &#8220;plug-in&#8221; descrambling facility to a demux driver.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>While this function is not needed with hardware-based section descrambling,
+ the descramble_section_payload function pointer can be used to override the
+ default hardware-based descrambling algorithm: if the function pointer has a
+ non-NULL value, the corresponding function should be used instead of any
+ descrambling hardware.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int descramble_section_payload(dmx_demux_t&#x22C6; demux,
+ __u8 &#x22C6;buffer1, size_t buffer1_length, __u8 &#x22C6;buffer2,
+ size_t buffer2_length, __u16 pid);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t
+ *demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8 *buffer1</para>
+</entry><entry
+ align="char">
+<para>Pointer to the first byte of the section.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer1_length</para>
+</entry><entry
+ align="char">
+<para>Length of the section data, including headers and CRC,
+ in buffer1.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8 *buffer2</para>
+</entry><entry
+ align="char">
+<para>Pointer to the tail of the section data, or NULL. The
+ pointer has a non-NULL value if the section wraps past
+ the end of a circular buffer.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer2_length</para>
+</entry><entry
+ align="char">
+<para>Length of the section data, including headers and CRC,
+ in buffer2.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u16 pid</para>
+</entry><entry
+ align="char">
+<para>The PID on which the section was received. Useful
+ for obtaining the descrambling key, e.g. from a DVB
+ Common Access facility.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>No descrambling facility available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>add_frontend()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Registers a connectivity between a demux and a front-end, i.e., indicates that
+ the demux can be connected via a call to connect_frontend() to use the given
+ front-end as a TS source. The client of this function has to allocate dynamic or
+ static memory for the frontend structure and initialize its fields before calling
+ this function. This function is normally called during the driver initialization.
+ The caller must not free the memory of the frontend struct before successfully
+ calling remove_frontend().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int add_frontend(dmx_demux_t &#x22C6;demux, dmx_frontend_t
+ &#x22C6;frontend);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_frontend_t*
+ frontend</para>
+</entry><entry
+ align="char">
+<para>Pointer to the front-end instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EEXIST</para>
+</entry><entry
+ align="char">
+<para>A front-end with the same value of the id field already
+ registered.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINUSE</para>
+</entry><entry
+ align="char">
+<para>The demux is in use.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOMEM</para>
+</entry><entry
+ align="char">
+<para>No more front-ends can be added.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>remove_frontend()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Indicates that the given front-end, registered by a call to add_frontend(), can
+ no longer be connected as a TS source by this demux. The function should be
+ called when a front-end driver or a demux driver is removed from the system.
+ If the front-end is in use, the function fails with the return value of -EBUSY.
+ After successfully calling this function, the caller can free the memory of
+ the frontend struct if it was dynamically allocated before the add_frontend()
+ operation.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int remove_frontend(dmx_demux_t&#x22C6; demux,
+ dmx_frontend_t&#x22C6; frontend);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_frontend_t*
+ frontend</para>
+</entry><entry
+ align="char">
+<para>Pointer to the front-end instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EBUSY</para>
+</entry><entry
+ align="char">
+<para>The front-end is in use, i.e. a call to connect_frontend()
+ has not been followed by a call to disconnect_frontend().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>get_frontends()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Provides the APIs of the front-ends that have been registered for this demux.
+ Any of the front-ends obtained with this call can be used as a parameter for
+ connect_frontend().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The include file demux.h contains the macro DMX_FE_ENTRY() for
+ converting an element of the generic type struct list_head* to the type
+ dmx_frontend_t*. The caller must not free the memory of any of the elements
+ obtained via this function call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>struct list_head&#x22C6; get_frontends(dmx_demux_t&#x22C6; demux);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*</para>
+</entry><entry
+ align="char">
+<para>A list of front-end interfaces, or NULL in the case of an
+ empty list.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>connect_frontend()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Connects the TS output of the front-end to the input of the demux. A demux
+ can only be connected to a front-end registered to the demux with the function
+ add_frontend().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>It may or may not be possible to connect multiple demuxes to the same
+ front-end, depending on the capabilities of the HW platform. When not used,
+ the front-end should be released by calling disconnect_frontend().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int connect_frontend(dmx_demux_t&#x22C6; demux,
+ dmx_frontend_t&#x22C6; frontend);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_frontend_t*
+ frontend</para>
+</entry><entry
+ align="char">
+<para>Pointer to the front-end instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EBUSY</para>
+</entry><entry
+ align="char">
+<para>The front-end is in use.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>disconnect_frontend()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Disconnects the demux and a front-end previously connected by a
+ connect_frontend() call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int disconnect_frontend(dmx_demux_t&#x22C6; demux);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_demux_t*
+ demux</para>
+</entry><entry
+ align="char">
+<para>Pointer to the demux API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
+<section id="demux_callback_api">
+<title>Demux Callback API</title>
+<para>This kernel-space API comprises the callback functions that deliver filtered data to the
+demux client. Unlike the other APIs, these API functions are provided by the client and called
+from the demux code.
+</para>
+<para>The function pointers of this abstract interface are not packed into a structure as in the
+other demux APIs, because the callback functions are registered and used independent
+of each other. As an example, it is possible for the API client to provide several
+callback functions for receiving TS packets and no callbacks for PES packets or
+sections.
+</para>
+<para>The functions that implement the callback API need not be re-entrant: when a demux
+driver calls one of these functions, the driver is not allowed to call the function again before
+the original call returns. If a callback is triggered by a hardware interrupt, it is recommended
+to use the Linux &#8220;bottom half&#8221; mechanism or start a tasklet instead of making the callback
+function call directly from a hardware interrupt.
+</para>
+
+<section
+role="subsection"><title>dmx_ts_cb()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function, provided by the client of the demux API, is called from the
+ demux code. The function is only called when filtering on this TS feed has
+ been enabled using the start_filtering() function.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>Any TS packets that match the filter settings are copied to a circular buffer. The
+ filtered TS packets are delivered to the client using this callback function. The
+ size of the circular buffer is controlled by the circular_buffer_size parameter
+ of the set() function in the TS Feed API. It is expected that the buffer1 and
+ buffer2 callback parameters point to addresses within the circular buffer, but
+ other implementations are also possible. Note that the called party should not
+ try to free the memory the buffer1 and buffer2 parameters point to.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>When this function is called, the buffer1 parameter typically points to the
+ start of the first undelivered TS packet within a circular buffer. The buffer2
+ buffer parameter is normally NULL, except when the received TS packets have
+ crossed the last address of the circular buffer and &#8221;wrapped&#8221; to the beginning
+ of the buffer. In the latter case the buffer1 parameter would contain an address
+ within the circular buffer, while the buffer2 parameter would contain the first
+ address of the circular buffer.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The number of bytes delivered with this function (i.e. buffer1_length +
+ buffer2_length) is usually equal to the value of callback_length parameter
+ given in the set() function, with one exception: if a timeout occurs before
+ receiving callback_length bytes of TS data, any undelivered packets are
+ immediately delivered to the client by calling this function. The timeout
+ duration is controlled by the set() function in the TS Feed API.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>If a TS packet is received with errors that could not be fixed by the TS-level
+ forward error correction (FEC), the Transport_error_indicator flag of the TS
+ packet header should be set. The TS packet should not be discarded, as
+ the error can possibly be corrected by a higher layer protocol. If the called
+ party is slow in processing the callback, it is possible that the circular buffer
+ eventually fills up. If this happens, the demux driver should discard any TS
+ packets received while the buffer is full. The error should be indicated to the
+ client on the next callback by setting the success parameter to the value of
+ DMX_OVERRUN_ERROR.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The type of data returned to the callback can be selected by the new
+ function int (*set_type) (struct dmx_ts_feed_s* feed, int type, dmx_ts_pes_t
+ pes_type) which is part of the dmx_ts_feed_s struct (also cf. to the
+ include file ost/demux.h) The type parameter decides if the raw TS packet
+ (TS_PACKET) or just the payload (TS_PACKET&#8212;TS_PAYLOAD_ONLY)
+ should be returned. If additionally the TS_DECODER bit is set the stream
+ will also be sent to the hardware MPEG decoder. In this case, the second
+ flag decides as what kind of data the stream should be interpreted. The
+ possible choices are one of DMX_TS_PES_AUDIO, DMX_TS_PES_VIDEO,
+ DMX_TS_PES_TELETEXT, DMX_TS_PES_SUBTITLE,
+ DMX_TS_PES_PCR, or DMX_TS_PES_OTHER.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int dmx_ts_cb(__u8&#x22C6; buffer1, size_t buffer1_length,
+ __u8&#x22C6; buffer2, size_t buffer2_length, dmx_ts_feed_t&#x22C6;
+ source, dmx_success_t success);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>__u8* buffer1</para>
+</entry><entry
+ align="char">
+<para>Pointer to the start of the filtered TS packets.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer1_length</para>
+</entry><entry
+ align="char">
+<para>Length of the TS data in buffer1.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8* buffer2</para>
+</entry><entry
+ align="char">
+<para>Pointer to the tail of the filtered TS packets, or NULL.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer2_length</para>
+</entry><entry
+ align="char">
+<para>Length of the TS data in buffer2.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_ts_feed_t*
+ source</para>
+</entry><entry
+ align="char">
+<para>Indicates which TS feed is the source of the callback.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_success_t
+ success</para>
+</entry><entry
+ align="char">
+<para>Indicates if there was an error in TS reception.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>Continue filtering.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-1</para>
+</entry><entry
+ align="char">
+<para>Stop filtering - has the same effect as a call to
+ stop_filtering() on the TS Feed API.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>dmx_section_cb()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function, provided by the client of the demux API, is called from the
+ demux code. The function is only called when filtering of sections has been
+ enabled using the function start_filtering() of the section feed API. When the
+ demux driver has received a complete section that matches at least one section
+ filter, the client is notified via this callback function. Normally this function is
+ called for each received section; however, it is also possible to deliver multiple
+ sections with one callback, for example when the system load is high. If an
+ error occurs while receiving a section, this function should be called with
+ the corresponding error type set in the success field, whether or not there is
+ data to deliver. The Section Feed implementation should maintain a circular
+ buffer for received sections. However, this is not necessary if the Section Feed
+ API is implemented as a client of the TS Feed API, because the TS Feed
+ implementation then buffers the received data. The size of the circular buffer
+ can be configured using the set() function in the Section Feed API. If there
+ is no room in the circular buffer when a new section is received, the section
+ must be discarded. If this happens, the value of the success parameter should
+ be DMX_OVERRUN_ERROR on the next callback.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int dmx_section_cb(__u8&#x22C6; buffer1, size_t
+ buffer1_length, __u8&#x22C6; buffer2, size_t
+ buffer2_length, dmx_section_filter_t&#x22C6; source,
+ dmx_success_t success);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>__u8* buffer1</para>
+</entry><entry
+ align="char">
+<para>Pointer to the start of the filtered section, e.g. within the
+ circular buffer of the demux driver.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer1_length</para>
+</entry><entry
+ align="char">
+<para>Length of the filtered section data in buffer1, including
+ headers and CRC.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u8* buffer2</para>
+</entry><entry
+ align="char">
+<para>Pointer to the tail of the filtered section data, or NULL.
+ Useful to handle the wrapping of a circular buffer.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t buffer2_length</para>
+</entry><entry
+ align="char">
+<para>Length of the filtered section data in buffer2, including
+ headers and CRC.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_filter_t*
+ filter</para>
+</entry><entry
+ align="char">
+<para>Indicates the filter that triggered the callback.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_success_t
+ success</para>
+</entry><entry
+ align="char">
+<para>Indicates if there was an error in section reception.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>Continue filtering.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-1</para>
+</entry><entry
+ align="char">
+<para>Stop filtering - has the same effect as a call to
+ stop_filtering() on the Section Feed API.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
+<section id="ts_feed_api">
+<title>TS Feed API</title>
+<para>A TS feed is typically mapped to a hardware PID filter on the demux chip.
+Using this API, the client can set the filtering properties to start/stop filtering TS
+packets on a particular TS feed. The API is defined as an abstract interface of the type
+dmx_ts_feed_t.
+</para>
+<para>The functions that implement the interface should be defined static or module private. The
+client can get the handle of a TS feed API by calling the function allocate_ts_feed() in the
+demux API.
+</para>
+
+<section
+role="subsection"><title>set()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function sets the parameters of a TS feed. Any filtering in progress on the
+ TS feed must be stopped before calling this function.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int set ( dmx_ts_feed_t&#x22C6; feed, __u16 pid, size_t
+ callback_length, size_t circular_buffer_size, int
+ descramble, struct timespec timeout);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_ts_feed_t* feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u16 pid</para>
+</entry><entry
+ align="char">
+<para>PID value to filter. Only the TS packets carrying the
+ specified PID will be passed to the API client.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t
+ callback_length</para>
+</entry><entry
+ align="char">
+<para>Number of bytes to deliver with each call to the
+ dmx_ts_cb() callback function. The value of this
+ parameter should be a multiple of 188.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t
+ circular_buffer_size</para>
+</entry><entry
+ align="char">
+<para>Size of the circular buffer for the filtered TS packets.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int descramble</para>
+</entry><entry
+ align="char">
+<para>If non-zero, descramble the filtered TS packets.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct timespec
+ timeout</para>
+</entry><entry
+ align="char">
+<para>Maximum time to wait before delivering received TS
+ packets to the client.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOMEM</para>
+</entry><entry
+ align="char">
+<para>Not enough memory for the requested buffer size.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>No descrambling facility available for TS.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>start_filtering()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Starts filtering TS packets on this TS feed, according to its settings. The PID
+ value to filter can be set by the API client. All matching TS packets are
+ delivered asynchronously to the client, using the callback function registered
+ with allocate_ts_feed().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int start_filtering(dmx_ts_feed_t&#x22C6; feed);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_ts_feed_t* feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>stop_filtering()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Stops filtering TS packets on this TS feed.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int stop_filtering(dmx_ts_feed_t&#x22C6; feed);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_ts_feed_t* feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the TS feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
+<section id="section_feed_api">
+<title>Section Feed API</title>
+<para>A section feed is a resource consisting of a PID filter and a set of section filters. Using this
+API, the client can set the properties of a section feed and to start/stop filtering. The API is
+defined as an abstract interface of the type dmx_section_feed_t. The functions that implement
+the interface should be defined static or module private. The client can get the handle of
+a section feed API by calling the function allocate_section_feed() in the demux
+API.
+</para>
+<para>On demux platforms that provide section filtering in hardware, the Section Feed API
+implementation provides a software wrapper for the demux hardware. Other platforms may
+support only PID filtering in hardware, requiring that TS packets are converted to sections in
+software. In the latter case the Section Feed API implementation can be a client of the TS
+Feed API.
+</para>
+
+</section>
+<section id="kdapi_set">
+<title>set()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function sets the parameters of a section feed. Any filtering in progress on
+ the section feed must be stopped before calling this function. If descrambling
+ is enabled, the payload_scrambling_control and address_scrambling_control
+ fields of received DVB datagram sections should be observed. If either one is
+ non-zero, the section should be descrambled either in hardware or using the
+ functions descramble_mac_address() and descramble_section_payload() of the
+ demux API. Note that according to the MPEG-2 Systems specification, only
+ the payloads of private sections can be scrambled while the rest of the section
+ data must be sent in the clear.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int set(dmx_section_feed_t&#x22C6; feed, __u16 pid, size_t
+ circular_buffer_size, int descramble, int
+ check_crc);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_section_feed_t*
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>__u16 pid</para>
+</entry><entry
+ align="char">
+<para>PID value to filter; only the TS packets carrying the
+ specified PID will be accepted.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t
+ circular_buffer_size</para>
+</entry><entry
+ align="char">
+<para>Size of the circular buffer for filtered sections.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int descramble</para>
+</entry><entry
+ align="char">
+<para>If non-zero, descramble any sections that are scrambled.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int check_crc</para>
+</entry><entry
+ align="char">
+<para>If non-zero, check the CRC values of filtered sections.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOMEM</para>
+</entry><entry
+ align="char">
+<para>Not enough memory for the requested buffer size.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSYS</para>
+</entry><entry
+ align="char">
+<para>No descrambling facility available for sections.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameters.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>allocate_filter()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function is used to allocate a section filter on the demux. It should only be
+ called when no filtering is in progress on this section feed. If a filter cannot be
+ allocated, the function fails with -ENOSPC. See in section ?? for the format of
+ the section filter.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>The bitfields filter_mask and filter_value should only be modified when no
+ filtering is in progress on this section feed. filter_mask controls which bits of
+ filter_value are compared with the section headers/payload. On a binary value
+ of 1 in filter_mask, the corresponding bits are compared. The filter only accepts
+ sections that are equal to filter_value in all the tested bit positions. Any changes
+ to the values of filter_mask and filter_value are guaranteed to take effect only
+ when the start_filtering() function is called next time. The parent pointer in
+ the struct is initialized by the API implementation to the value of the feed
+ parameter. The priv pointer is not used by the API implementation, and can
+ thus be freely utilized by the caller of this function. Any data pointed to by the
+ priv pointer is available to the recipient of the dmx_section_cb() function call.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>While the maximum section filter length (DMX_MAX_FILTER_SIZE) is
+ currently set at 16 bytes, hardware filters of that size are not available on all
+ platforms. Therefore, section filtering will often take place first in hardware,
+ followed by filtering in software for the header bytes that were not covered
+ by a hardware filter. The filter_mask field can be checked to determine how
+ many bytes of the section filter are actually used, and if the hardware filter will
+ suffice. Additionally, software-only section filters can optionally be allocated
+ to clients when all hardware section filters are in use. Note that on most demux
+ hardware it is not possible to filter on the section_length field of the section
+ header &#8211; thus this field is ignored, even though it is included in filter_value and
+ filter_mask fields.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int allocate_filter(dmx_section_feed_t&#x22C6; feed,
+ dmx_section_filter_t&#x22C6;&#x22C6; filter);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_section_feed_t*
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_filter_t**
+ filter</para>
+</entry><entry
+ align="char">
+<para>Pointer to the allocated filter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENOSPC</para>
+</entry><entry
+ align="char">
+<para>No filters of given type and length available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameters.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>release_filter()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This function releases all the resources of a previously allocated section filter.
+ The function should not be called while filtering is in progress on this section
+ feed. After calling this function, the caller should not try to dereference the
+ filter pointer.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int release_filter ( dmx_section_feed_t&#x22C6; feed,
+ dmx_section_filter_t&#x22C6; filter);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_section_feed_t*
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>dmx_section_filter_t*
+ filter</para>
+</entry><entry
+ align="char">
+<para>I/O Pointer to the instance data of a section filter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-ENODEV</para>
+</entry><entry
+ align="char">
+<para>No such filter allocated.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>start_filtering()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Starts filtering sections on this section feed, according to its settings. Sections
+ are first filtered based on their PID and then matched with the section
+ filters allocated for this feed. If the section matches the PID filter and
+ at least one section filter, it is delivered to the API client. The section
+ is delivered asynchronously using the callback function registered with
+ allocate_section_feed().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int start_filtering ( dmx_section_feed_t&#x22C6; feed );</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_section_feed_t*
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>stop_filtering()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>Stops filtering sections on this section feed. Note that any changes to the
+ filtering parameters (filter_value, filter_mask, etc.) should only be made when
+ filtering is stopped.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int stop_filtering ( dmx_section_feed_t&#x22C6; feed );</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>dmx_section_feed_t*
+ feed</para>
+</entry><entry
+ align="char">
+<para>Pointer to the section feed API and instance data.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>RETURNS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>0</para>
+</entry><entry
+ align="char">
+<para>The function was completed without errors.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>-EINVAL</para>
+</entry><entry
+ align="char">
+<para>Bad parameter.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
diff --git a/Documentation/DocBook/dvb/net.xml b/Documentation/DocBook/dvb/net.xml
new file mode 100644 (file)
index 0000000..94e388d
--- /dev/null
@@ -0,0 +1,12 @@
+<title>DVB Network API</title>
+<para>The DVB net device enables feeding of MPE (multi protocol encapsulation) packets
+received via DVB into the Linux network protocol stack, e.g. for internet via satellite
+applications. It can be accessed through <emphasis role="tt">/dev/dvb/adapter0/net0</emphasis>. Data types and
+and ioctl definitions can be accessed by including <emphasis role="tt">linux/dvb/net.h</emphasis> in your
+application.
+</para>
+<section id="dvb_net_types">
+<title>DVB Net Data Types</title>
+<para>To be written&#x2026;
+</para>
+</section>
diff --git a/Documentation/DocBook/dvb/video.xml b/Documentation/DocBook/dvb/video.xml
new file mode 100644 (file)
index 0000000..7bb287e
--- /dev/null
@@ -0,0 +1,1971 @@
+<title>DVB Video Device</title>
+<para>The DVB video device controls the MPEG2 video decoder of the DVB hardware. It
+can be accessed through <emphasis role="tt">/dev/dvb/adapter0/video0</emphasis>. Data types and and
+ioctl definitions can be accessed by including <emphasis role="tt">linux/dvb/video.h</emphasis> in your
+application.
+</para>
+<para>Note that the DVB video device only controls decoding of the MPEG video stream, not
+its presentation on the TV or computer screen. On PCs this is typically handled by an
+associated video4linux device, e.g. <emphasis role="tt">/dev/video</emphasis>, which allows scaling and defining output
+windows.
+</para>
+<para>Some DVB cards don&#8217;t have their own MPEG decoder, which results in the omission of
+the audio and video device as well as the video4linux device.
+</para>
+<para>The ioctls that deal with SPUs (sub picture units) and navigation packets are only
+supported on some MPEG decoders made for DVD playback.
+</para>
+<section id="video_types">
+<title>Video Data Types</title>
+
+<section id="video_format_t">
+<title>video_format_t</title>
+<para>The <emphasis role="tt">video_format_t</emphasis> data type defined by
+</para>
+<programlisting>
+ typedef enum {
+        VIDEO_FORMAT_4_3,
+        VIDEO_FORMAT_16_9
+ } video_format_t;
+</programlisting>
+<para>is used in the VIDEO_SET_FORMAT function (??) to tell the driver which aspect ratio
+the output hardware (e.g. TV) has. It is also used in the data structures video_status
+(??) returned by VIDEO_GET_STATUS (??) and video_event (??) returned by
+VIDEO_GET_EVENT (??) which report about the display format of the current video
+stream.
+</para>
+</section>
+
+<section id="video_display_format_t">
+<title>video_display_format_t</title>
+<para>In case the display format of the video stream and of the display hardware differ the
+application has to specify how to handle the cropping of the picture. This can be done using
+the VIDEO_SET_DISPLAY_FORMAT call (??) which accepts
+</para>
+<programlisting>
+ typedef enum {
+        VIDEO_PAN_SCAN,
+        VIDEO_LETTER_BOX,
+        VIDEO_CENTER_CUT_OUT
+ } video_display_format_t;
+</programlisting>
+<para>as argument.
+</para>
+</section>
+
+<section id="video_stream_source">
+<title>video stream source</title>
+<para>The video stream source is set through the VIDEO_SELECT_SOURCE call and can take
+the following values, depending on whether we are replaying from an internal (demuxer) or
+external (user write) source.
+</para>
+<programlisting>
+ typedef enum {
+        VIDEO_SOURCE_DEMUX,
+        VIDEO_SOURCE_MEMORY
+ } video_stream_source_t;
+</programlisting>
+<para>VIDEO_SOURCE_DEMUX selects the demultiplexer (fed either by the frontend or the
+DVR device) as the source of the video stream. If VIDEO_SOURCE_MEMORY
+is selected the stream comes from the application through the <emphasis role="tt">write()</emphasis> system
+call.
+</para>
+</section>
+
+<section id="video_play_state">
+<title>video play state</title>
+<para>The following values can be returned by the VIDEO_GET_STATUS call representing the
+state of video playback.
+</para>
+<programlisting>
+ typedef enum {
+        VIDEO_STOPPED,
+        VIDEO_PLAYING,
+        VIDEO_FREEZED
+ } video_play_state_t;
+</programlisting>
+</section>
+
+<section id="video_event">
+<title>struct video_event</title>
+<para>The following is the structure of a video event as it is returned by the VIDEO_GET_EVENT
+call.
+</para>
+<programlisting>
+ struct video_event {
+        int32_t type;
+        time_t timestamp;
+        union {
+                video_format_t video_format;
+        } u;
+ };
+</programlisting>
+</section>
+
+<section id="video_status">
+<title>struct video_status</title>
+<para>The VIDEO_GET_STATUS call returns the following structure informing about various
+states of the playback operation.
+</para>
+<programlisting>
+ struct video_status {
+        boolean video_blank;
+        video_play_state_t play_state;
+        video_stream_source_t stream_source;
+        video_format_t video_format;
+        video_displayformat_t display_format;
+ };
+</programlisting>
+<para>If video_blank is set video will be blanked out if the channel is changed or if playback is
+stopped. Otherwise, the last picture will be displayed. play_state indicates if the video is
+currently frozen, stopped, or being played back. The stream_source corresponds to the seleted
+source for the video stream. It can come either from the demultiplexer or from memory.
+The video_format indicates the aspect ratio (one of 4:3 or 16:9) of the currently
+played video stream. Finally, display_format corresponds to the selected cropping
+mode in case the source video format is not the same as the format of the output
+device.
+</para>
+</section>
+
+<section id="video_still_picture">
+<title>struct video_still_picture</title>
+<para>An I-frame displayed via the VIDEO_STILLPICTURE call is passed on within the
+following structure.
+</para>
+<programlisting>
+ /&#x22C6; pointer to and size of a single iframe in memory &#x22C6;/
+ struct video_still_picture {
+        char &#x22C6;iFrame;
+        int32_t size;
+ };
+</programlisting>
+</section>
+
+<section id="video_caps">
+<title>video capabilities</title>
+<para>A call to VIDEO_GET_CAPABILITIES returns an unsigned integer with the following
+bits set according to the hardwares capabilities.
+</para>
+<programlisting>
+ /&#x22C6; bit definitions for capabilities: &#x22C6;/
+ /&#x22C6; can the hardware decode MPEG1 and/or MPEG2? &#x22C6;/
+ #define VIDEO_CAP_MPEG1   1
+ #define VIDEO_CAP_MPEG2   2
+ /&#x22C6; can you send a system and/or program stream to video device?
+    (you still have to open the video and the audio device but only
+     send the stream to the video device) &#x22C6;/
+ #define VIDEO_CAP_SYS     4
+ #define VIDEO_CAP_PROG    8
+ /&#x22C6; can the driver also handle SPU, NAVI and CSS encoded data?
+    (CSS API is not present yet) &#x22C6;/
+ #define VIDEO_CAP_SPU    16
+ #define VIDEO_CAP_NAVI   32
+ #define VIDEO_CAP_CSS    64
+</programlisting>
+</section>
+
+<section id="video_system">
+<title>video system</title>
+<para>A call to VIDEO_SET_SYSTEM sets the desired video system for TV output. The
+following system types can be set:
+</para>
+<programlisting>
+ typedef enum {
+         VIDEO_SYSTEM_PAL,
+         VIDEO_SYSTEM_NTSC,
+         VIDEO_SYSTEM_PALN,
+         VIDEO_SYSTEM_PALNc,
+         VIDEO_SYSTEM_PALM,
+         VIDEO_SYSTEM_NTSC60,
+         VIDEO_SYSTEM_PAL60,
+         VIDEO_SYSTEM_PALM60
+ } video_system_t;
+</programlisting>
+</section>
+
+<section id="video_highlight">
+<title>struct video_highlight</title>
+<para>Calling the ioctl VIDEO_SET_HIGHLIGHTS posts the SPU highlight information. The
+call expects the following format for that information:
+</para>
+<programlisting>
+ typedef
+ struct video_highlight {
+        boolean active;      /&#x22C6;    1=show highlight, 0=hide highlight &#x22C6;/
+        uint8_t contrast1;   /&#x22C6;    7- 4  Pattern pixel contrast &#x22C6;/
+                             /&#x22C6;    3- 0  Background pixel contrast &#x22C6;/
+        uint8_t contrast2;   /&#x22C6;    7- 4  Emphasis pixel-2 contrast &#x22C6;/
+                             /&#x22C6;    3- 0  Emphasis pixel-1 contrast &#x22C6;/
+        uint8_t color1;      /&#x22C6;    7- 4  Pattern pixel color &#x22C6;/
+                             /&#x22C6;    3- 0  Background pixel color &#x22C6;/
+        uint8_t color2;      /&#x22C6;    7- 4  Emphasis pixel-2 color &#x22C6;/
+                             /&#x22C6;    3- 0  Emphasis pixel-1 color &#x22C6;/
+        uint32_t ypos;       /&#x22C6;   23-22  auto action mode &#x22C6;/
+                             /&#x22C6;   21-12  start y &#x22C6;/
+                             /&#x22C6;    9- 0  end y &#x22C6;/
+        uint32_t xpos;       /&#x22C6;   23-22  button color number &#x22C6;/
+                             /&#x22C6;   21-12  start x &#x22C6;/
+                             /&#x22C6;    9- 0  end x &#x22C6;/
+ } video_highlight_t;
+</programlisting>
+
+</section>
+<section id="video_spu">
+<title>video SPU</title>
+<para>Calling VIDEO_SET_SPU deactivates or activates SPU decoding, according to the
+following format:
+</para>
+<programlisting>
+ typedef
+ struct video_spu {
+        boolean active;
+        int stream_id;
+ } video_spu_t;
+</programlisting>
+
+</section>
+<section id="video_spu_palette">
+<title>video SPU palette</title>
+<para>The following structure is used to set the SPU palette by calling VIDEO_SPU_PALETTE:
+</para>
+<programlisting>
+ typedef
+ struct video_spu_palette{
+        int length;
+        uint8_t &#x22C6;palette;
+ } video_spu_palette_t;
+</programlisting>
+
+</section>
+<section id="video_navi_pack">
+<title>video NAVI pack</title>
+<para>In order to get the navigational data the following structure has to be passed to the ioctl
+VIDEO_GET_NAVI:
+</para>
+<programlisting>
+ typedef
+ struct video_navi_pack{
+        int length;         /&#x22C6; 0 ... 1024 &#x22C6;/
+        uint8_t data[1024];
+ } video_navi_pack_t;
+</programlisting>
+</section>
+
+
+<section id="video_attributes">
+<title>video attributes</title>
+<para>The following attributes can be set by a call to VIDEO_SET_ATTRIBUTES:
+</para>
+<programlisting>
+ typedef uint16_t video_attributes_t;
+ /&#x22C6;   bits: descr. &#x22C6;/
+ /&#x22C6;   15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) &#x22C6;/
+ /&#x22C6;   13-12 TV system (0=525/60, 1=625/50) &#x22C6;/
+ /&#x22C6;   11-10 Aspect ratio (0=4:3, 3=16:9) &#x22C6;/
+ /&#x22C6;    9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca &#x22C6;/
+ /&#x22C6;    7    line 21-1 data present in GOP (1=yes, 0=no) &#x22C6;/
+ /&#x22C6;    6    line 21-2 data present in GOP (1=yes, 0=no) &#x22C6;/
+ /&#x22C6;    5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 &#x22C6;/
+ /&#x22C6;    2    source letterboxed (1=yes, 0=no) &#x22C6;/
+ /&#x22C6;    0    film/camera mode (0=camera, 1=film (625/50 only)) &#x22C6;/
+</programlisting>
+</section></section>
+
+
+<section id="video_function_calls">
+<title>Video Function Calls</title>
+
+
+<section id="video_fopen">
+<title>open()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call opens a named video device (e.g. /dev/dvb/adapter0/video0)
+ for subsequent use.</para>
+<para>When an open() call has succeeded, the device will be ready for use.
+ The significance of blocking or non-blocking mode is described in the
+ documentation for functions where there is a difference. It does not affect the
+ semantics of the open() call itself. A device opened in blocking mode can later
+ be put into non-blocking mode (and vice versa) using the F_SETFL command
+ of the fcntl system call. This is a standard system call, documented in the Linux
+ manual page for fcntl. Only one user can open the Video Device in O_RDWR
+ mode. All other attempts to open the device in this mode will fail, and an
+ error-code will be returned. If the Video Device is opened in O_RDONLY
+ mode, the only ioctl call that can be used is VIDEO_GET_STATUS. All other
+ call will return an error code.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int open(const char &#x22C6;deviceName, int flags);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>const char
+ *deviceName</para>
+</entry><entry
+ align="char">
+<para>Name of specific video device.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int flags</para>
+</entry><entry
+ align="char">
+<para>A bit-wise OR of the following flags:</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDONLY read-only access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_RDWR read/write access</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>O_NONBLOCK open in non-blocking mode</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>(blocking mode is the default)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>ENODEV</para>
+</entry><entry
+ align="char">
+<para>Device driver not loaded/available.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBUSY</para>
+</entry><entry
+ align="char">
+<para>Device or resource busy.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid argument.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="video_fclose">
+<title>close()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call closes a previously opened video device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int close(int fd);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section>
+<section id="video_fwrite">
+<title>write()</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This system call can only be used if VIDEO_SOURCE_MEMORY is selected
+ in the ioctl call VIDEO_SELECT_SOURCE. The data provided shall be in
+ PES format, unless the capability allows other formats. If O_NONBLOCK is
+ not specified the function will block until buffer space is available. The amount
+ of data to be transferred is implied by count.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>size_t write(int fd, const void &#x22C6;buf, size_t count);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>void *buf</para>
+</entry><entry
+ align="char">
+<para>Pointer to the buffer containing the PES data.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>size_t count</para>
+</entry><entry
+ align="char">
+<para>Size of buf.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Mode VIDEO_SOURCE_MEMORY not selected.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>ENOMEM</para>
+</entry><entry
+ align="char">
+<para>Attempted to write more data than the internal buffer can
+ hold.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_STOP</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to stop playing the current stream.
+ Depending on the input parameter, the screen can be blanked out or displaying
+ the last decoded frame.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_STOP, boolean
+ mode);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_STOP for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>Boolean mode</para>
+</entry><entry
+ align="char">
+<para>Indicates how the screen shall be handled.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>TRUE: Blank screen when stop.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>FALSE: Show last decoded frame.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_PLAY</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to start playing a video stream from the
+ selected source.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_PLAY);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_PLAY for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_FREEZE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call suspends the live video stream being played. Decoding
+ and playing are frozen. It is then possible to restart the decoding
+ and playing process of the video stream using the VIDEO_CONTINUE
+ command. If VIDEO_SOURCE_MEMORY is selected in the ioctl call
+ VIDEO_SELECT_SOURCE, the DVB subsystem will not decode any more
+ data until the ioctl call VIDEO_CONTINUE or VIDEO_PLAY is performed.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_FREEZE);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_FREEZE for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_CONTINUE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call restarts decoding and playing processes of the video stream
+ which was played before a call to VIDEO_FREEZE was made.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_CONTINUE);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_CONTINUE for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SELECT_SOURCE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call informs the video device which source shall be used for the input
+ data. The possible sources are demux or memory. If memory is selected, the
+ data is fed to the video device through the write command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_SELECT_SOURCE,
+ video_stream_source_t source);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SELECT_SOURCE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_stream_source_t
+ source</para>
+</entry><entry
+ align="char">
+<para>Indicates which source shall be used for the Video stream.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_BLANK</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to blank out the picture.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_SET_BLANK, boolean
+ mode);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_BLANK for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>boolean mode</para>
+</entry><entry
+ align="char">
+<para>TRUE: Blank screen when stop.</para>
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>FALSE: Show last decoded frame.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal input parameter</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_GET_STATUS</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to return the current status of the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_GET_STATUS, struct
+ video_status &#x22C6;status);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_GET_STATUS for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct video_status
+ *status</para>
+</entry><entry
+ align="char">
+<para>Returns the current status of the Video Device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error, possibly in the communication with the
+ DVB subsystem.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>status points to invalid address</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_GET_EVENT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns an event of type video_event if available. If an event is
+ not available, the behavior depends on whether the device is in blocking or
+ non-blocking mode. In the latter case, the call fails immediately with errno
+ set to EWOULDBLOCK. In the former case, the call blocks until an event
+ becomes available. The standard Linux poll() and/or select() system calls can
+ be used with the device file descriptor to watch for new events. For select(),
+ the file descriptor should be included in the exceptfds argument, and for
+ poll(), POLLPRI should be specified as the wake-up condition. Read-only
+ permissions are sufficient for this ioctl call.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_GET_EVENT, struct
+ video_event &#x22C6;ev);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_GET_EVENT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct video_event
+ *ev</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the event, if any, is to be
+ stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>ev points to invalid address</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EWOULDBLOCK</para>
+</entry><entry
+ align="char">
+<para>There is no event pending, and the device is in
+ non-blocking mode.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EOVERFLOW</para>
+</entry><entry
+ align="char">
+</entry>
+ </row><row><entry
+ align="char">
+</entry><entry
+ align="char">
+<para>Overflow in event queue - one or more events were lost.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_DISPLAY_FORMAT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to select the video format to be applied
+ by the MPEG chip on the video.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request =
+ VIDEO_SET_DISPLAY_FORMAT, video_display_format_t
+ format);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_DISPLAY_FORMAT for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_display_format_t
+ format</para>
+</entry><entry
+ align="char">
+<para>Selects the video format to be used.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal parameter format.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_STILLPICTURE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to display a still picture (I-frame). The
+ input data shall contain an I-frame. If the pointer is NULL, then the current
+ displayed still picture is blanked.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_STILLPICTURE,
+ struct video_still_picture &#x22C6;sp);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_STILLPICTURE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct
+ video_still_picture
+ *sp</para>
+</entry><entry
+ align="char">
+<para>Pointer to a location where an I-frame and size is stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>sp points to an invalid iframe.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_FAST_FORWARD</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the Video Device to skip decoding of N number of I-frames.
+ This call can only be used if VIDEO_SOURCE_MEMORY is selected.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_FAST_FORWARD, int
+ nFrames);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_FAST_FORWARD for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int nFrames</para>
+</entry><entry
+ align="char">
+<para>The number of frames to skip.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Mode VIDEO_SOURCE_MEMORY not selected.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal parameter format.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SLOWMOTION</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the video device to repeat decoding frames N number of
+ times. This call can only be used if VIDEO_SOURCE_MEMORY is selected.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_SLOWMOTION, int
+ nFrames);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SLOWMOTION for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int nFrames</para>
+</entry><entry
+ align="char">
+<para>The number of times to repeat each frame.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EPERM</para>
+</entry><entry
+ align="char">
+<para>Mode VIDEO_SOURCE_MEMORY not selected.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Illegal parameter format.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_GET_CAPABILITIES</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call asks the video device about its decoding capabilities. On success
+ it returns and integer which has bits set according to the defines in section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_GET_CAPABILITIES,
+ unsigned int &#x22C6;cap);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_GET_CAPABILITIES for this
+ command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>unsigned int *cap</para>
+</entry><entry
+ align="char">
+<para>Pointer to a location where to store the capability
+ information.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>cap points to an invalid iframe.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_ID</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl selects which sub-stream is to be decoded if a program or system
+ stream is sent to the video device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = VIDEO_SET_ID, int
+ id);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_ID for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int id</para>
+</entry><entry
+ align="char">
+<para>video sub-stream id</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINTERNAL</para>
+</entry><entry
+ align="char">
+<para>Internal error.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>Invalid sub-stream id.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_CLEAR_BUFFER</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call clears all video buffers in the driver and in the decoder hardware.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_CLEAR_BUFFER);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_CLEAR_BUFFER for this command.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_STREAMTYPE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl tells the driver which kind of stream to expect being written to it. If
+ this call is not used the default of video PES is used. Some drivers might not
+ support this call and always expect PES.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(fd, int request = VIDEO_SET_STREAMTYPE,
+ int type);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_STREAMTYPE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int type</para>
+</entry><entry
+ align="char">
+<para>stream type</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>type is not a valid or supported stream type.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_FORMAT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl sets the screen format (aspect ratio) of the connected output device
+ (TV) so that the output of the decoder can be adjusted accordingly.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_FORMAT,
+ video_format_t format);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_FORMAT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_format_t
+ format</para>
+</entry><entry
+ align="char">
+<para>video format of TV as defined in section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>format is not a valid video format.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_SYSTEM</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl sets the television output format. The format (see section ??) may
+ vary from the color format of the displayed MPEG stream. If the hardware is
+ not able to display the requested format the call will return an error.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_SYSTEM ,
+ video_system_t system);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_FORMAT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_system_t
+ system</para>
+</entry><entry
+ align="char">
+<para>video system of TV output.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>system is not a valid or supported video system.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_HIGHLIGHT</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl sets the SPU highlight information for the menu access of a DVD.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_HIGHLIGHT
+ ,video_highlight_t &#x22C6;vhilite)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_HIGHLIGHT for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_highlight_t
+ *vhilite</para>
+</entry><entry
+ align="char">
+<para>SPU Highlight information according to section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>input is not a valid highlight setting.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_SPU</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl activates or deactivates SPU decoding in a DVD input stream. It can
+ only be used, if the driver is able to handle a DVD stream.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_SPU ,
+ video_spu_t &#x22C6;spu)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_SPU for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_spu_t *spu</para>
+</entry><entry
+ align="char">
+<para>SPU decoding (de)activation and subid setting according
+ to section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>input is not a valid spu setting or driver cannot handle
+ SPU.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_SPU_PALETTE</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl sets the SPU color palette.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_SPU_PALETTE
+ ,video_spu_palette_t &#x22C6;palette )</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_SPU_PALETTE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_spu_palette_t
+ *palette</para>
+</entry><entry
+ align="char">
+<para>SPU palette according to section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>input is not a valid palette or driver doesn&#8217;t handle SPU.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_GET_NAVI</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl returns navigational information from the DVD stream. This is
+ especially needed if an encoded stream has to be decoded by the hardware.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_GET_NAVI ,
+ video_navi_pack_t &#x22C6;navipack)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_GET_NAVI for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_navi_pack_t
+ *navipack</para>
+</entry><entry
+ align="char">
+<para>PCI or DSI pack (private stream 2) according to section
+ ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EFAULT</para>
+</entry><entry
+ align="char">
+<para>driver is not able to return navigational information</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+
+</section><section
+role="subsection"><title>VIDEO_SET_ATTRIBUTES</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl is intended for DVD playback and allows you to set certain
+ information about the stream. Some hardware may not need this information,
+ but the call also tells the hardware to prepare for DVD playback.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para> int ioctl(fd, int request = VIDEO_SET_ATTRIBUTE
+ ,video_attributes_t vattr)</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int request</para>
+</entry><entry
+ align="char">
+<para>Equals VIDEO_SET_ATTRIBUTE for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>video_attributes_t
+ vattr</para>
+</entry><entry
+ align="char">
+<para>video attributes according to section ??.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry
+ align="char">
+<para>EBADF</para>
+</entry><entry
+ align="char">
+<para>fd is not a valid open file descriptor</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>EINVAL</para>
+</entry><entry
+ align="char">
+<para>input is not a valid attribute setting.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+ </section></section>
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
new file mode 100644 (file)
index 0000000..0eb43c1
--- /dev/null
@@ -0,0 +1,364 @@
+<!-- Generated file! Do not edit. -->
+
+<!-- Functions -->
+<!ENTITY func-close "<link linkend='func-close'><function>close()</function></link>">
+<!ENTITY func-ioctl "<link linkend='func-ioctl'><function>ioctl()</function></link>">
+<!ENTITY func-mmap "<link linkend='func-mmap'><function>mmap()</function></link>">
+<!ENTITY func-munmap "<link linkend='func-munmap'><function>munmap()</function></link>">
+<!ENTITY func-open "<link linkend='func-open'><function>open()</function></link>">
+<!ENTITY func-poll "<link linkend='func-poll'><function>poll()</function></link>">
+<!ENTITY func-read "<link linkend='func-read'><function>read()</function></link>">
+<!ENTITY func-select "<link linkend='func-select'><function>select()</function></link>">
+<!ENTITY func-write "<link linkend='func-write'><function>write()</function></link>">
+
+<!-- Ioctls -->
+<!ENTITY VIDIOC-CROPCAP "<link linkend='vidioc-cropcap'><constant>VIDIOC_CROPCAP</constant></link>">
+<!ENTITY VIDIOC-DBG-G-CHIP-IDENT "<link linkend='vidioc-dbg-g-chip-ident'><constant>VIDIOC_DBG_G_CHIP_IDENT</constant></link>">
+<!ENTITY VIDIOC-DBG-G-REGISTER "<link linkend='vidioc-dbg-g-register'><constant>VIDIOC_DBG_G_REGISTER</constant></link>">
+<!ENTITY VIDIOC-DBG-S-REGISTER "<link linkend='vidioc-dbg-g-register'><constant>VIDIOC_DBG_S_REGISTER</constant></link>">
+<!ENTITY VIDIOC-DQBUF "<link linkend='vidioc-qbuf'><constant>VIDIOC_DQBUF</constant></link>">
+<!ENTITY VIDIOC-ENCODER-CMD "<link linkend='vidioc-encoder-cmd'><constant>VIDIOC_ENCODER_CMD</constant></link>">
+<!ENTITY VIDIOC-ENUMAUDIO "<link linkend='vidioc-enumaudio'><constant>VIDIOC_ENUMAUDIO</constant></link>">
+<!ENTITY VIDIOC-ENUMAUDOUT "<link linkend='vidioc-enumaudioout'><constant>VIDIOC_ENUMAUDOUT</constant></link>">
+<!ENTITY VIDIOC-ENUMINPUT "<link linkend='vidioc-enuminput'><constant>VIDIOC_ENUMINPUT</constant></link>">
+<!ENTITY VIDIOC-ENUMOUTPUT "<link linkend='vidioc-enumoutput'><constant>VIDIOC_ENUMOUTPUT</constant></link>">
+<!ENTITY VIDIOC-ENUMSTD "<link linkend='vidioc-enumstd'><constant>VIDIOC_ENUMSTD</constant></link>">
+<!ENTITY VIDIOC-ENUM-FMT "<link linkend='vidioc-enum-fmt'><constant>VIDIOC_ENUM_FMT</constant></link>">
+<!ENTITY VIDIOC-ENUM-FRAMEINTERVALS "<link linkend='vidioc-enum-frameintervals'><constant>VIDIOC_ENUM_FRAMEINTERVALS</constant></link>">
+<!ENTITY VIDIOC-ENUM-FRAMESIZES "<link linkend='vidioc-enum-framesizes'><constant>VIDIOC_ENUM_FRAMESIZES</constant></link>">
+<!ENTITY VIDIOC-G-AUDIO "<link linkend='vidioc-g-audio'><constant>VIDIOC_G_AUDIO</constant></link>">
+<!ENTITY VIDIOC-G-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_G_AUDOUT</constant></link>">
+<!ENTITY VIDIOC-G-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_G_CROP</constant></link>">
+<!ENTITY VIDIOC-G-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_G_CTRL</constant></link>">
+<!ENTITY VIDIOC-G-ENC-INDEX "<link linkend='vidioc-g-enc-index'><constant>VIDIOC_G_ENC_INDEX</constant></link>">
+<!ENTITY VIDIOC-G-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_G_EXT_CTRLS</constant></link>">
+<!ENTITY VIDIOC-G-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_G_FBUF</constant></link>">
+<!ENTITY VIDIOC-G-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_G_FMT</constant></link>">
+<!ENTITY VIDIOC-G-FREQUENCY "<link linkend='vidioc-g-frequency'><constant>VIDIOC_G_FREQUENCY</constant></link>">
+<!ENTITY VIDIOC-G-INPUT "<link linkend='vidioc-g-input'><constant>VIDIOC_G_INPUT</constant></link>">
+<!ENTITY VIDIOC-G-JPEGCOMP "<link linkend='vidioc-g-jpegcomp'><constant>VIDIOC_G_JPEGCOMP</constant></link>">
+<!ENTITY VIDIOC-G-MPEGCOMP "<link linkend=''><constant>VIDIOC_G_MPEGCOMP</constant></link>">
+<!ENTITY VIDIOC-G-MODULATOR "<link linkend='vidioc-g-modulator'><constant>VIDIOC_G_MODULATOR</constant></link>">
+<!ENTITY VIDIOC-G-OUTPUT "<link linkend='vidioc-g-output'><constant>VIDIOC_G_OUTPUT</constant></link>">
+<!ENTITY VIDIOC-G-PARM "<link linkend='vidioc-g-parm'><constant>VIDIOC_G_PARM</constant></link>">
+<!ENTITY VIDIOC-G-PRIORITY "<link linkend='vidioc-g-priority'><constant>VIDIOC_G_PRIORITY</constant></link>">
+<!ENTITY VIDIOC-G-SLICED-VBI-CAP "<link linkend='vidioc-g-sliced-vbi-cap'><constant>VIDIOC_G_SLICED_VBI_CAP</constant></link>">
+<!ENTITY VIDIOC-G-STD "<link linkend='vidioc-g-std'><constant>VIDIOC_G_STD</constant></link>">
+<!ENTITY VIDIOC-G-TUNER "<link linkend='vidioc-g-tuner'><constant>VIDIOC_G_TUNER</constant></link>">
+<!ENTITY VIDIOC-LOG-STATUS "<link linkend='vidioc-log-status'><constant>VIDIOC_LOG_STATUS</constant></link>">
+<!ENTITY VIDIOC-OVERLAY "<link linkend='vidioc-overlay'><constant>VIDIOC_OVERLAY</constant></link>">
+<!ENTITY VIDIOC-QBUF "<link linkend='vidioc-qbuf'><constant>VIDIOC_QBUF</constant></link>">
+<!ENTITY VIDIOC-QUERYBUF "<link linkend='vidioc-querybuf'><constant>VIDIOC_QUERYBUF</constant></link>">
+<!ENTITY VIDIOC-QUERYCAP "<link linkend='vidioc-querycap'><constant>VIDIOC_QUERYCAP</constant></link>">
+<!ENTITY VIDIOC-QUERYCTRL "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYCTRL</constant></link>">
+<!ENTITY VIDIOC-QUERYMENU "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYMENU</constant></link>">
+<!ENTITY VIDIOC-QUERYSTD "<link linkend='vidioc-querystd'><constant>VIDIOC_QUERYSTD</constant></link>">
+<!ENTITY VIDIOC-REQBUFS "<link linkend='vidioc-reqbufs'><constant>VIDIOC_REQBUFS</constant></link>">
+<!ENTITY VIDIOC-STREAMOFF "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMOFF</constant></link>">
+<!ENTITY VIDIOC-STREAMON "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMON</constant></link>">
+<!ENTITY VIDIOC-S-AUDIO "<link linkend='vidioc-g-audio'><constant>VIDIOC_S_AUDIO</constant></link>">
+<!ENTITY VIDIOC-S-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_S_AUDOUT</constant></link>">
+<!ENTITY VIDIOC-S-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_S_CROP</constant></link>">
+<!ENTITY VIDIOC-S-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_S_CTRL</constant></link>">
+<!ENTITY VIDIOC-S-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_S_EXT_CTRLS</constant></link>">
+<!ENTITY VIDIOC-S-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_S_FBUF</constant></link>">
+<!ENTITY VIDIOC-S-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_S_FMT</constant></link>">
+<!ENTITY VIDIOC-S-FREQUENCY "<link linkend='vidioc-g-frequency'><constant>VIDIOC_S_FREQUENCY</constant></link>">
+<!ENTITY VIDIOC-S-HW-FREQ-SEEK "<link linkend='vidioc-s-hw-freq-seek'><constant>VIDIOC_S_HW_FREQ_SEEK</constant></link>">
+<!ENTITY VIDIOC-S-INPUT "<link linkend='vidioc-g-input'><constant>VIDIOC_S_INPUT</constant></link>">
+<!ENTITY VIDIOC-S-JPEGCOMP "<link linkend='vidioc-g-jpegcomp'><constant>VIDIOC_S_JPEGCOMP</constant></link>">
+<!ENTITY VIDIOC-S-MPEGCOMP "<link linkend=''><constant>VIDIOC_S_MPEGCOMP</constant></link>">
+<!ENTITY VIDIOC-S-MODULATOR "<link linkend='vidioc-g-modulator'><constant>VIDIOC_S_MODULATOR</constant></link>">
+<!ENTITY VIDIOC-S-OUTPUT "<link linkend='vidioc-g-output'><constant>VIDIOC_S_OUTPUT</constant></link>">
+<!ENTITY VIDIOC-S-PARM "<link linkend='vidioc-g-parm'><constant>VIDIOC_S_PARM</constant></link>">
+<!ENTITY VIDIOC-S-PRIORITY "<link linkend='vidioc-g-priority'><constant>VIDIOC_S_PRIORITY</constant></link>">
+<!ENTITY VIDIOC-S-STD "<link linkend='vidioc-g-std'><constant>VIDIOC_S_STD</constant></link>">
+<!ENTITY VIDIOC-S-TUNER "<link linkend='vidioc-g-tuner'><constant>VIDIOC_S_TUNER</constant></link>">
+<!ENTITY VIDIOC-TRY-ENCODER-CMD "<link linkend='vidioc-encoder-cmd'><constant>VIDIOC_TRY_ENCODER_CMD</constant></link>">
+<!ENTITY VIDIOC-TRY-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_TRY_EXT_CTRLS</constant></link>">
+<!ENTITY VIDIOC-TRY-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>">
+
+<!-- Types -->
+<!ENTITY v4l2-std-id "<link linkend='v4l2-std-id'>v4l2_std_id</link>">
+
+<!-- Enums -->
+<!ENTITY v4l2-buf-type "enum&nbsp;<link linkend='v4l2-buf-type'>v4l2_buf_type</link>">
+<!ENTITY v4l2-colorspace "enum&nbsp;<link linkend='v4l2-colorspace'>v4l2_colorspace</link>">
+<!ENTITY v4l2-ctrl-type "enum&nbsp;<link linkend='v4l2-ctrl-type'>v4l2_ctrl_type</link>">
+<!ENTITY v4l2-exposure-auto-type "enum&nbsp;<link linkend='v4l2-exposure-auto-type'>v4l2_exposure_auto_type</link>">
+<!ENTITY v4l2-field "enum&nbsp;<link linkend='v4l2-field'>v4l2_field</link>">
+<!ENTITY v4l2-frmivaltypes "enum&nbsp;<link linkend='v4l2-frmivaltypes'>v4l2_frmivaltypes</link>">
+<!ENTITY v4l2-frmsizetypes "enum&nbsp;<link linkend='v4l2-frmsizetypes'>v4l2_frmsizetypes</link>">
+<!ENTITY v4l2-memory "enum&nbsp;<link linkend='v4l2-memory'>v4l2_memory</link>">
+<!ENTITY v4l2-mpeg-audio-ac3-bitrate "enum&nbsp;<link linkend='v4l2-mpeg-audio-ac3-bitrate'>v4l2_mpeg_audio_ac3_bitrate</link>">
+<!ENTITY v4l2-mpeg-audio-crc "enum&nbsp;<link linkend='v4l2-mpeg-audio-crc'>v4l2_mpeg_audio_crc</link>">
+<!ENTITY v4l2-mpeg-audio-emphasis "enum&nbsp;<link linkend='v4l2-mpeg-audio-emphasis'>v4l2_mpeg_audio_emphasis</link>">
+<!ENTITY v4l2-mpeg-audio-encoding "enum&nbsp;<link linkend='v4l2-mpeg-audio-encoding'>v4l2_mpeg_audio_encoding</link>">
+<!ENTITY v4l2-mpeg-audio-l1-bitrate "enum&nbsp;<link linkend='v4l2-mpeg-audio-l1-bitrate'>v4l2_mpeg_audio_l1_bitrate</link>">
+<!ENTITY v4l2-mpeg-audio-l2-bitrate "enum&nbsp;<link linkend='v4l2-mpeg-audio-l2-bitrate'>v4l2_mpeg_audio_l2_bitrate</link>">
+<!ENTITY v4l2-mpeg-audio-l3-bitrate "enum&nbsp;<link linkend='v4l2-mpeg-audio-l3-bitrate'>v4l2_mpeg_audio_l3_bitrate</link>">
+<!ENTITY v4l2-mpeg-audio-mode "enum&nbsp;<link linkend='v4l2-mpeg-audio-mode'>v4l2_mpeg_audio_mode</link>">
+<!ENTITY v4l2-mpeg-audio-mode-extension "enum&nbsp;<link linkend='v4l2-mpeg-audio-mode-extension'>v4l2_mpeg_audio_mode_extension</link>">
+<!ENTITY v4l2-mpeg-audio-sampling-freq "enum&nbsp;<link linkend='v4l2-mpeg-audio-sampling-freq'>v4l2_mpeg_audio_sampling_freq</link>">
+<!ENTITY chroma-spatial-filter-type "enum&nbsp;<link linkend='chroma-spatial-filter-type'>v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type</link>">
+<!ENTITY luma-spatial-filter-type "enum&nbsp;<link linkend='luma-spatial-filter-type'>v4l2_mpeg_cx2341x_video_luma_spatial_filter_type</link>">
+<!ENTITY v4l2-mpeg-cx2341x-video-median-filter-type "enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-median-filter-type'>v4l2_mpeg_cx2341x_video_median_filter_type</link>">
+<!ENTITY v4l2-mpeg-cx2341x-video-spatial-filter-mode "enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-spatial-filter-mode'>v4l2_mpeg_cx2341x_video_spatial_filter_mode</link>">
+<!ENTITY v4l2-mpeg-cx2341x-video-temporal-filter-mode "enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-temporal-filter-mode'>v4l2_mpeg_cx2341x_video_temporal_filter_mode</link>">
+<!ENTITY v4l2-mpeg-stream-type "enum&nbsp;<link linkend='v4l2-mpeg-stream-type'>v4l2_mpeg_stream_type</link>">
+<!ENTITY v4l2-mpeg-stream-vbi-fmt "enum&nbsp;<link linkend='v4l2-mpeg-stream-vbi-fmt'>v4l2_mpeg_stream_vbi_fmt</link>">
+<!ENTITY v4l2-mpeg-video-aspect "enum&nbsp;<link linkend='v4l2-mpeg-video-aspect'>v4l2_mpeg_video_aspect</link>">
+<!ENTITY v4l2-mpeg-video-bitrate-mode "enum&nbsp;<link linkend='v4l2-mpeg-video-bitrate-mode'>v4l2_mpeg_video_bitrate_mode</link>">
+<!ENTITY v4l2-mpeg-video-encoding "enum&nbsp;<link linkend='v4l2-mpeg-video-encoding'>v4l2_mpeg_video_encoding</link>">
+<!ENTITY v4l2-power-line-frequency "enum&nbsp;<link linkend='v4l2-power-line-frequency'>v4l2_power_line_frequency</link>">
+<!ENTITY v4l2-priority "enum&nbsp;<link linkend='v4l2-priority'>v4l2_priority</link>">
+<!ENTITY v4l2-tuner-type "enum&nbsp;<link linkend='v4l2-tuner-type'>v4l2_tuner_type</link>">
+<!ENTITY v4l2-preemphasis "enum&nbsp;<link linkend='v4l2-preemphasis'>v4l2_preemphasis</link>">
+
+<!-- Structures -->
+<!ENTITY v4l2-audio "struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link>">
+<!ENTITY v4l2-audioout "struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link>">
+<!ENTITY v4l2-buffer "struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link>">
+<!ENTITY v4l2-capability "struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link>">
+<!ENTITY v4l2-captureparm "struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link>">
+<!ENTITY v4l2-clip "struct&nbsp;<link linkend='v4l2-clip'>v4l2_clip</link>">
+<!ENTITY v4l2-control "struct&nbsp;<link linkend='v4l2-control'>v4l2_control</link>">
+<!ENTITY v4l2-crop "struct&nbsp;<link linkend='v4l2-crop'>v4l2_crop</link>">
+<!ENTITY v4l2-cropcap "struct&nbsp;<link linkend='v4l2-cropcap'>v4l2_cropcap</link>">
+<!ENTITY v4l2-dbg-chip-ident "struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link>">
+<!ENTITY v4l2-dbg-match "struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link>">
+<!ENTITY v4l2-dbg-register "struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link>">
+<!ENTITY v4l2-enc-idx "struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link>">
+<!ENTITY v4l2-enc-idx-entry "struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link>">
+<!ENTITY v4l2-encoder-cmd "struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link>">
+<!ENTITY v4l2-ext-control "struct&nbsp;<link linkend='v4l2-ext-control'>v4l2_ext_control</link>">
+<!ENTITY v4l2-ext-controls "struct&nbsp;<link linkend='v4l2-ext-controls'>v4l2_ext_controls</link>">
+<!ENTITY v4l2-fmtdesc "struct&nbsp;<link linkend='v4l2-fmtdesc'>v4l2_fmtdesc</link>">
+<!ENTITY v4l2-format "struct&nbsp;<link linkend='v4l2-format'>v4l2_format</link>">
+<!ENTITY v4l2-fract "struct&nbsp;<link linkend='v4l2-fract'>v4l2_fract</link>">
+<!ENTITY v4l2-framebuffer "struct&nbsp;<link linkend='v4l2-framebuffer'>v4l2_framebuffer</link>">
+<!ENTITY v4l2-frequency "struct&nbsp;<link linkend='v4l2-frequency'>v4l2_frequency</link>">
+<!ENTITY v4l2-frmival-stepwise "struct&nbsp;<link linkend='v4l2-frmival-stepwise'>v4l2_frmival_stepwise</link>">
+<!ENTITY v4l2-frmivalenum "struct&nbsp;<link linkend='v4l2-frmivalenum'>v4l2_frmivalenum</link>">
+<!ENTITY v4l2-frmsize-discrete "struct&nbsp;<link linkend='v4l2-frmsize-discrete'>v4l2_frmsize_discrete</link>">
+<!ENTITY v4l2-frmsize-stepwise "struct&nbsp;<link linkend='v4l2-frmsize-stepwise'>v4l2_frmsize_stepwise</link>">
+<!ENTITY v4l2-frmsizeenum "struct&nbsp;<link linkend='v4l2-frmsizeenum'>v4l2_frmsizeenum</link>">
+<!ENTITY v4l2-hw-freq-seek "struct&nbsp;<link linkend='v4l2-hw-freq-seek'>v4l2_hw_freq_seek</link>">
+<!ENTITY v4l2-input "struct&nbsp;<link linkend='v4l2-input'>v4l2_input</link>">
+<!ENTITY v4l2-jpegcompression "struct&nbsp;<link linkend='v4l2-jpegcompression'>v4l2_jpegcompression</link>">
+<!ENTITY v4l2-modulator "struct&nbsp;<link linkend='v4l2-modulator'>v4l2_modulator</link>">
+<!ENTITY v4l2-mpeg-vbi-fmt-ivtv "struct&nbsp;<link linkend='v4l2-mpeg-vbi-fmt-ivtv'>v4l2_mpeg_vbi_fmt_ivtv</link>">
+<!ENTITY v4l2-output "struct&nbsp;<link linkend='v4l2-output'>v4l2_output</link>">
+<!ENTITY v4l2-outputparm "struct&nbsp;<link linkend='v4l2-outputparm'>v4l2_outputparm</link>">
+<!ENTITY v4l2-pix-format "struct&nbsp;<link linkend='v4l2-pix-format'>v4l2_pix_format</link>">
+<!ENTITY v4l2-queryctrl "struct&nbsp;<link linkend='v4l2-queryctrl'>v4l2_queryctrl</link>">
+<!ENTITY v4l2-querymenu "struct&nbsp;<link linkend='v4l2-querymenu'>v4l2_querymenu</link>">
+<!ENTITY v4l2-rect "struct&nbsp;<link linkend='v4l2-rect'>v4l2_rect</link>">
+<!ENTITY v4l2-requestbuffers "struct&nbsp;<link linkend='v4l2-requestbuffers'>v4l2_requestbuffers</link>">
+<!ENTITY v4l2-sliced-vbi-cap "struct&nbsp;<link linkend='v4l2-sliced-vbi-cap'>v4l2_sliced_vbi_cap</link>">
+<!ENTITY v4l2-sliced-vbi-data "struct&nbsp;<link linkend='v4l2-sliced-vbi-data'>v4l2_sliced_vbi_data</link>">
+<!ENTITY v4l2-sliced-vbi-format "struct&nbsp;<link linkend='v4l2-sliced-vbi-format'>v4l2_sliced_vbi_format</link>">
+<!ENTITY v4l2-standard "struct&nbsp;<link linkend='v4l2-standard'>v4l2_standard</link>">
+<!ENTITY v4l2-streamparm "struct&nbsp;<link linkend='v4l2-streamparm'>v4l2_streamparm</link>">
+<!ENTITY v4l2-timecode "struct&nbsp;<link linkend='v4l2-timecode'>v4l2_timecode</link>">
+<!ENTITY v4l2-tuner "struct&nbsp;<link linkend='v4l2-tuner'>v4l2_tuner</link>">
+<!ENTITY v4l2-vbi-format "struct&nbsp;<link linkend='v4l2-vbi-format'>v4l2_vbi_format</link>">
+<!ENTITY v4l2-window "struct&nbsp;<link linkend='v4l2-window'>v4l2_window</link>">
+
+<!-- Error Codes -->
+<!ENTITY EACCES "<errorcode>EACCES</errorcode> error code">
+<!ENTITY EAGAIN "<errorcode>EAGAIN</errorcode> error code">
+<!ENTITY EBADF "<errorcode>EBADF</errorcode> error code">
+<!ENTITY EBUSY "<errorcode>EBUSY</errorcode> error code">
+<!ENTITY EFAULT "<errorcode>EFAULT</errorcode> error code">
+<!ENTITY EIO "<errorcode>EIO</errorcode> error code">
+<!ENTITY EINTR "<errorcode>EINTR</errorcode> error code">
+<!ENTITY EINVAL "<errorcode>EINVAL</errorcode> error code">
+<!ENTITY ENFILE "<errorcode>ENFILE</errorcode> error code">
+<!ENTITY ENOMEM "<errorcode>ENOMEM</errorcode> error code">
+<!ENTITY ENOSPC "<errorcode>ENOSPC</errorcode> error code">
+<!ENTITY ENOTTY "<errorcode>ENOTTY</errorcode> error code">
+<!ENTITY ENXIO "<errorcode>ENXIO</errorcode> error code">
+<!ENTITY EMFILE "<errorcode>EMFILE</errorcode> error code">
+<!ENTITY EPERM "<errorcode>EPERM</errorcode> error code">
+<!ENTITY ERANGE "<errorcode>ERANGE</errorcode> error code">
+
+<!-- Subsections -->
+<!ENTITY sub-biblio SYSTEM "v4l/biblio.xml">
+<!ENTITY sub-common SYSTEM "v4l/common.xml">
+<!ENTITY sub-compat SYSTEM "v4l/compat.xml">
+<!ENTITY sub-controls SYSTEM "v4l/controls.xml">
+<!ENTITY sub-dev-capture SYSTEM "v4l/dev-capture.xml">
+<!ENTITY sub-dev-codec SYSTEM "v4l/dev-codec.xml">
+<!ENTITY sub-dev-effect SYSTEM "v4l/dev-effect.xml">
+<!ENTITY sub-dev-osd SYSTEM "v4l/dev-osd.xml">
+<!ENTITY sub-dev-output SYSTEM "v4l/dev-output.xml">
+<!ENTITY sub-dev-overlay SYSTEM "v4l/dev-overlay.xml">
+<!ENTITY sub-dev-radio SYSTEM "v4l/dev-radio.xml">
+<!ENTITY sub-dev-raw-vbi SYSTEM "v4l/dev-raw-vbi.xml">
+<!ENTITY sub-dev-rds SYSTEM "v4l/dev-rds.xml">
+<!ENTITY sub-dev-sliced-vbi SYSTEM "v4l/dev-sliced-vbi.xml">
+<!ENTITY sub-dev-teletext SYSTEM "v4l/dev-teletext.xml">
+<!ENTITY sub-driver SYSTEM "v4l/driver.xml">
+<!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml">
+<!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml">
+<!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml">
+<!ENTITY sub-close SYSTEM "v4l/func-close.xml">
+<!ENTITY sub-ioctl SYSTEM "v4l/func-ioctl.xml">
+<!ENTITY sub-mmap SYSTEM "v4l/func-mmap.xml">
+<!ENTITY sub-munmap SYSTEM "v4l/func-munmap.xml">
+<!ENTITY sub-open SYSTEM "v4l/func-open.xml">
+<!ENTITY sub-poll SYSTEM "v4l/func-poll.xml">
+<!ENTITY sub-read SYSTEM "v4l/func-read.xml">
+<!ENTITY sub-select SYSTEM "v4l/func-select.xml">
+<!ENTITY sub-write SYSTEM "v4l/func-write.xml">
+<!ENTITY sub-io SYSTEM "v4l/io.xml">
+<!ENTITY sub-grey SYSTEM "v4l/pixfmt-grey.xml">
+<!ENTITY sub-nv12 SYSTEM "v4l/pixfmt-nv12.xml">
+<!ENTITY sub-nv16 SYSTEM "v4l/pixfmt-nv16.xml">
+<!ENTITY sub-packed-rgb SYSTEM "v4l/pixfmt-packed-rgb.xml">
+<!ENTITY sub-packed-yuv SYSTEM "v4l/pixfmt-packed-yuv.xml">
+<!ENTITY sub-sbggr16 SYSTEM "v4l/pixfmt-sbggr16.xml">
+<!ENTITY sub-sbggr8 SYSTEM "v4l/pixfmt-sbggr8.xml">
+<!ENTITY sub-sgbrg8 SYSTEM "v4l/pixfmt-sgbrg8.xml">
+<!ENTITY sub-sgrbg8 SYSTEM "v4l/pixfmt-sgrbg8.xml">
+<!ENTITY sub-uyvy SYSTEM "v4l/pixfmt-uyvy.xml">
+<!ENTITY sub-vyuy SYSTEM "v4l/pixfmt-vyuy.xml">
+<!ENTITY sub-y16 SYSTEM "v4l/pixfmt-y16.xml">
+<!ENTITY sub-y41p SYSTEM "v4l/pixfmt-y41p.xml">
+<!ENTITY sub-yuv410 SYSTEM "v4l/pixfmt-yuv410.xml">
+<!ENTITY sub-yuv411p SYSTEM "v4l/pixfmt-yuv411p.xml">
+<!ENTITY sub-yuv420 SYSTEM "v4l/pixfmt-yuv420.xml">
+<!ENTITY sub-yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml">
+<!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml">
+<!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml">
+<!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml">
+<!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml">
+<!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">
+<!ENTITY sub-encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml">
+<!ENTITY sub-enum-fmt SYSTEM "v4l/vidioc-enum-fmt.xml">
+<!ENTITY sub-enum-frameintervals SYSTEM "v4l/vidioc-enum-frameintervals.xml">
+<!ENTITY sub-enum-framesizes SYSTEM "v4l/vidioc-enum-framesizes.xml">
+<!ENTITY sub-enumaudio SYSTEM "v4l/vidioc-enumaudio.xml">
+<!ENTITY sub-enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">
+<!ENTITY sub-enuminput SYSTEM "v4l/vidioc-enuminput.xml">
+<!ENTITY sub-enumoutput SYSTEM "v4l/vidioc-enumoutput.xml">
+<!ENTITY sub-enumstd SYSTEM "v4l/vidioc-enumstd.xml">
+<!ENTITY sub-g-audio SYSTEM "v4l/vidioc-g-audio.xml">
+<!ENTITY sub-g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">
+<!ENTITY sub-dbg-g-chip-ident SYSTEM "v4l/vidioc-dbg-g-chip-ident.xml">
+<!ENTITY sub-g-crop SYSTEM "v4l/vidioc-g-crop.xml">
+<!ENTITY sub-g-ctrl SYSTEM "v4l/vidioc-g-ctrl.xml">
+<!ENTITY sub-g-enc-index SYSTEM "v4l/vidioc-g-enc-index.xml">
+<!ENTITY sub-g-ext-ctrls SYSTEM "v4l/vidioc-g-ext-ctrls.xml">
+<!ENTITY sub-g-fbuf SYSTEM "v4l/vidioc-g-fbuf.xml">
+<!ENTITY sub-g-fmt SYSTEM "v4l/vidioc-g-fmt.xml">
+<!ENTITY sub-g-frequency SYSTEM "v4l/vidioc-g-frequency.xml">
+<!ENTITY sub-g-input SYSTEM "v4l/vidioc-g-input.xml">
+<!ENTITY sub-g-jpegcomp SYSTEM "v4l/vidioc-g-jpegcomp.xml">
+<!ENTITY sub-g-modulator SYSTEM "v4l/vidioc-g-modulator.xml">
+<!ENTITY sub-g-output SYSTEM "v4l/vidioc-g-output.xml">
+<!ENTITY sub-g-parm SYSTEM "v4l/vidioc-g-parm.xml">
+<!ENTITY sub-g-priority SYSTEM "v4l/vidioc-g-priority.xml">
+<!ENTITY sub-g-sliced-vbi-cap SYSTEM "v4l/vidioc-g-sliced-vbi-cap.xml">
+<!ENTITY sub-g-std SYSTEM "v4l/vidioc-g-std.xml">
+<!ENTITY sub-g-tuner SYSTEM "v4l/vidioc-g-tuner.xml">
+<!ENTITY sub-log-status SYSTEM "v4l/vidioc-log-status.xml">
+<!ENTITY sub-overlay SYSTEM "v4l/vidioc-overlay.xml">
+<!ENTITY sub-qbuf SYSTEM "v4l/vidioc-qbuf.xml">
+<!ENTITY sub-querybuf SYSTEM "v4l/vidioc-querybuf.xml">
+<!ENTITY sub-querycap SYSTEM "v4l/vidioc-querycap.xml">
+<!ENTITY sub-queryctrl SYSTEM "v4l/vidioc-queryctrl.xml">
+<!ENTITY sub-querystd SYSTEM "v4l/vidioc-querystd.xml">
+<!ENTITY sub-reqbufs SYSTEM "v4l/vidioc-reqbufs.xml">
+<!ENTITY sub-s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml">
+<!ENTITY sub-streamon SYSTEM "v4l/vidioc-streamon.xml">
+<!ENTITY sub-capture-c SYSTEM "v4l/capture.c.xml">
+<!ENTITY sub-keytable-c SYSTEM "v4l/keytable.c.xml">
+<!ENTITY sub-v4l2grab-c SYSTEM "v4l/v4l2grab.c.xml">
+<!ENTITY sub-videodev2-h SYSTEM "v4l/videodev2.h.xml">
+<!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml">
+<!ENTITY sub-intro SYSTEM "dvb/intro.xml">
+<!ENTITY sub-frontend SYSTEM "dvb/frontend.xml">
+<!ENTITY sub-isdbt SYSTEM "dvb/isdbt.xml">
+<!ENTITY sub-demux SYSTEM "dvb/demux.xml">
+<!ENTITY sub-video SYSTEM "dvb/video.xml">
+<!ENTITY sub-audio SYSTEM "dvb/audio.xml">
+<!ENTITY sub-ca SYSTEM "dvb/ca.xml">
+<!ENTITY sub-net SYSTEM "dvb/net.xml">
+<!ENTITY sub-kdapi SYSTEM "dvb/kdapi.xml">
+<!ENTITY sub-examples SYSTEM "dvb/examples.xml">
+<!ENTITY sub-dvbapi SYSTEM "dvb/dvbapi.xml">
+<!ENTITY sub-media SYSTEM "media.xml">
+<!ENTITY sub-media-entities SYSTEM "media-entities.tmpl">
+<!ENTITY sub-media-indices SYSTEM "media-indices.tmpl">
+
+<!-- Function Reference -->
+<!ENTITY close SYSTEM "v4l/func-close.xml">
+<!ENTITY ioctl SYSTEM "v4l/func-ioctl.xml">
+<!ENTITY mmap SYSTEM "v4l/func-mmap.xml">
+<!ENTITY munmap SYSTEM "v4l/func-munmap.xml">
+<!ENTITY open SYSTEM "v4l/func-open.xml">
+<!ENTITY poll SYSTEM "v4l/func-poll.xml">
+<!ENTITY read SYSTEM "v4l/func-read.xml">
+<!ENTITY select SYSTEM "v4l/func-select.xml">
+<!ENTITY write SYSTEM "v4l/func-write.xml">
+<!ENTITY grey SYSTEM "v4l/pixfmt-grey.xml">
+<!ENTITY nv12 SYSTEM "v4l/pixfmt-nv12.xml">
+<!ENTITY nv16 SYSTEM "v4l/pixfmt-nv16.xml">
+<!ENTITY packed-rgb SYSTEM "v4l/pixfmt-packed-rgb.xml">
+<!ENTITY packed-yuv SYSTEM "v4l/pixfmt-packed-yuv.xml">
+<!ENTITY sbggr16 SYSTEM "v4l/pixfmt-sbggr16.xml">
+<!ENTITY sbggr8 SYSTEM "v4l/pixfmt-sbggr8.xml">
+<!ENTITY sgbrg8 SYSTEM "v4l/pixfmt-sgbrg8.xml">
+<!ENTITY sgrbg8 SYSTEM "v4l/pixfmt-sgrbg8.xml">
+<!ENTITY uyvy SYSTEM "v4l/pixfmt-uyvy.xml">
+<!ENTITY vyuy SYSTEM "v4l/pixfmt-vyuy.xml">
+<!ENTITY y16 SYSTEM "v4l/pixfmt-y16.xml">
+<!ENTITY y41p SYSTEM "v4l/pixfmt-y41p.xml">
+<!ENTITY yuv410 SYSTEM "v4l/pixfmt-yuv410.xml">
+<!ENTITY yuv411p SYSTEM "v4l/pixfmt-yuv411p.xml">
+<!ENTITY yuv420 SYSTEM "v4l/pixfmt-yuv420.xml">
+<!ENTITY yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml">
+<!ENTITY yuyv SYSTEM "v4l/pixfmt-yuyv.xml">
+<!ENTITY yvyu SYSTEM "v4l/pixfmt-yvyu.xml">
+<!ENTITY cropcap SYSTEM "v4l/vidioc-cropcap.xml">
+<!ENTITY dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">
+<!ENTITY encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml">
+<!ENTITY enum-fmt SYSTEM "v4l/vidioc-enum-fmt.xml">
+<!ENTITY enum-frameintervals SYSTEM "v4l/vidioc-enum-frameintervals.xml">
+<!ENTITY enum-framesizes SYSTEM "v4l/vidioc-enum-framesizes.xml">
+<!ENTITY enumaudio SYSTEM "v4l/vidioc-enumaudio.xml">
+<!ENTITY enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">
+<!ENTITY enuminput SYSTEM "v4l/vidioc-enuminput.xml">
+<!ENTITY enumoutput SYSTEM "v4l/vidioc-enumoutput.xml">
+<!ENTITY enumstd SYSTEM "v4l/vidioc-enumstd.xml">
+<!ENTITY g-audio SYSTEM "v4l/vidioc-g-audio.xml">
+<!ENTITY g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">
+<!ENTITY dbg-g-chip-ident SYSTEM "v4l/vidioc-dbg-g-chip-ident.xml">
+<!ENTITY g-crop SYSTEM "v4l/vidioc-g-crop.xml">
+<!ENTITY g-ctrl SYSTEM "v4l/vidioc-g-ctrl.xml">
+<!ENTITY g-enc-index SYSTEM "v4l/vidioc-g-enc-index.xml">
+<!ENTITY g-ext-ctrls SYSTEM "v4l/vidioc-g-ext-ctrls.xml">
+<!ENTITY g-fbuf SYSTEM "v4l/vidioc-g-fbuf.xml">
+<!ENTITY g-fmt SYSTEM "v4l/vidioc-g-fmt.xml">
+<!ENTITY g-frequency SYSTEM "v4l/vidioc-g-frequency.xml">
+<!ENTITY g-input SYSTEM "v4l/vidioc-g-input.xml">
+<!ENTITY g-jpegcomp SYSTEM "v4l/vidioc-g-jpegcomp.xml">
+<!ENTITY g-modulator SYSTEM "v4l/vidioc-g-modulator.xml">
+<!ENTITY g-output SYSTEM "v4l/vidioc-g-output.xml">
+<!ENTITY g-parm SYSTEM "v4l/vidioc-g-parm.xml">
+<!ENTITY g-priority SYSTEM "v4l/vidioc-g-priority.xml">
+<!ENTITY g-sliced-vbi-cap SYSTEM "v4l/vidioc-g-sliced-vbi-cap.xml">
+<!ENTITY g-std SYSTEM "v4l/vidioc-g-std.xml">
+<!ENTITY g-tuner SYSTEM "v4l/vidioc-g-tuner.xml">
+<!ENTITY log-status SYSTEM "v4l/vidioc-log-status.xml">
+<!ENTITY overlay SYSTEM "v4l/vidioc-overlay.xml">
+<!ENTITY qbuf SYSTEM "v4l/vidioc-qbuf.xml">
+<!ENTITY querybuf SYSTEM "v4l/vidioc-querybuf.xml">
+<!ENTITY querycap SYSTEM "v4l/vidioc-querycap.xml">
+<!ENTITY queryctrl SYSTEM "v4l/vidioc-queryctrl.xml">
+<!ENTITY querystd SYSTEM "v4l/vidioc-querystd.xml">
+<!ENTITY reqbufs SYSTEM "v4l/vidioc-reqbufs.xml">
+<!ENTITY s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml">
+<!ENTITY streamon SYSTEM "v4l/vidioc-streamon.xml">
diff --git a/Documentation/DocBook/media-indices.tmpl b/Documentation/DocBook/media-indices.tmpl
new file mode 100644 (file)
index 0000000..9e30a23
--- /dev/null
@@ -0,0 +1,85 @@
+<!-- Generated file! Do not edit. -->
+
+<index><title>List of Types</title>
+<indexentry><primaryie><link linkend='v4l2-std-id'>v4l2_std_id</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-buf-type'>v4l2_buf_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-colorspace'>v4l2_colorspace</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-ctrl-type'>v4l2_ctrl_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-exposure-auto-type'>v4l2_exposure_auto_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-field'>v4l2_field</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-frmivaltypes'>v4l2_frmivaltypes</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-frmsizetypes'>v4l2_frmsizetypes</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-memory'>v4l2_memory</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-ac3-bitrate'>v4l2_mpeg_audio_ac3_bitrate</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-crc'>v4l2_mpeg_audio_crc</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-emphasis'>v4l2_mpeg_audio_emphasis</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-encoding'>v4l2_mpeg_audio_encoding</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-l1-bitrate'>v4l2_mpeg_audio_l1_bitrate</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-l2-bitrate'>v4l2_mpeg_audio_l2_bitrate</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-l3-bitrate'>v4l2_mpeg_audio_l3_bitrate</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-mode'>v4l2_mpeg_audio_mode</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-mode-extension'>v4l2_mpeg_audio_mode_extension</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-audio-sampling-freq'>v4l2_mpeg_audio_sampling_freq</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='chroma-spatial-filter-type'>v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='luma-spatial-filter-type'>v4l2_mpeg_cx2341x_video_luma_spatial_filter_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-median-filter-type'>v4l2_mpeg_cx2341x_video_median_filter_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-spatial-filter-mode'>v4l2_mpeg_cx2341x_video_spatial_filter_mode</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-cx2341x-video-temporal-filter-mode'>v4l2_mpeg_cx2341x_video_temporal_filter_mode</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-stream-type'>v4l2_mpeg_stream_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-stream-vbi-fmt'>v4l2_mpeg_stream_vbi_fmt</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-video-aspect'>v4l2_mpeg_video_aspect</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-video-bitrate-mode'>v4l2_mpeg_video_bitrate_mode</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-mpeg-video-encoding'>v4l2_mpeg_video_encoding</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-power-line-frequency'>v4l2_power_line_frequency</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-priority'>v4l2_priority</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-tuner-type'>v4l2_tuner_type</link></primaryie></indexentry>
+<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-preemphasis'>v4l2_preemphasis</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-clip'>v4l2_clip</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-control'>v4l2_control</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-crop'>v4l2_crop</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-cropcap'>v4l2_cropcap</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-ext-control'>v4l2_ext_control</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-ext-controls'>v4l2_ext_controls</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-fmtdesc'>v4l2_fmtdesc</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-format'>v4l2_format</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-fract'>v4l2_fract</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-framebuffer'>v4l2_framebuffer</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frequency'>v4l2_frequency</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frmival-stepwise'>v4l2_frmival_stepwise</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frmivalenum'>v4l2_frmivalenum</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frmsize-discrete'>v4l2_frmsize_discrete</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frmsize-stepwise'>v4l2_frmsize_stepwise</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-frmsizeenum'>v4l2_frmsizeenum</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-hw-freq-seek'>v4l2_hw_freq_seek</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-input'>v4l2_input</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-jpegcompression'>v4l2_jpegcompression</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-modulator'>v4l2_modulator</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-mpeg-vbi-fmt-ivtv'>v4l2_mpeg_vbi_fmt_ivtv</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-output'>v4l2_output</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-outputparm'>v4l2_outputparm</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-pix-format'>v4l2_pix_format</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-queryctrl'>v4l2_queryctrl</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-querymenu'>v4l2_querymenu</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-rect'>v4l2_rect</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-requestbuffers'>v4l2_requestbuffers</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-sliced-vbi-cap'>v4l2_sliced_vbi_cap</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-sliced-vbi-data'>v4l2_sliced_vbi_data</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-sliced-vbi-format'>v4l2_sliced_vbi_format</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-standard'>v4l2_standard</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-streamparm'>v4l2_streamparm</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-timecode'>v4l2_timecode</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-tuner'>v4l2_tuner</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-vbi-format'>v4l2_vbi_format</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-window'>v4l2_window</link></primaryie></indexentry>
+</index>
diff --git a/Documentation/DocBook/media.tmpl b/Documentation/DocBook/media.tmpl
new file mode 100644 (file)
index 0000000..eea564b
--- /dev/null
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+       "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;
+<!ENTITY media-indices SYSTEM "./media-indices.tmpl">
+
+<!ENTITY eg                     "e.&nbsp;g.">
+<!ENTITY ie                     "i.&nbsp;e.">
+<!ENTITY fd                     "File descriptor returned by <link linkend='func-open'><function>open()</function></link>.">
+<!ENTITY i2c                    "I<superscript>2</superscript>C">
+<!ENTITY return-value          "<title>Return Value</title><para>On success <returnvalue>0</returnvalue> is returned, on error <returnvalue>-1</returnvalue> and the <varname>errno</varname> variable is set appropriately:</para>">
+<!ENTITY manvol                 "<manvolnum>2</manvolnum>">
+
+<!-- Table templates: structs, structs w/union, defines. -->
+<!ENTITY cs-str                 "<colspec colname='c1' colwidth='1*' /><colspec colname='c2' colwidth='1*' /><colspec colname='c3' colwidth='2*' /><spanspec spanname='hspan' namest='c1' nameend='c3' />">
+<!ENTITY cs-ustr                "<colspec colname='c1' colwidth='1*' /><colspec colname='c2' colwidth='1*' /><colspec colname='c3' colwidth='1*' /><colspec colname='c4' colwidth='2*' /><spanspec spanname='hspan' namest='c1' nameend='c4' />">
+<!ENTITY cs-def                 "<colspec colname='c1' colwidth='3*' /><colspec colname='c2' colwidth='1*' /><colspec colname='c3' colwidth='4*' /><spanspec spanname='hspan' namest='c1' nameend='c3' />">
+
+<!-- Video for Linux mailing list address. -->
+<!ENTITY v4l-ml                 "<ulink url='http://www.linuxtv.org/lists.php'>http://www.linuxtv.org/lists.php</ulink>">
+
+<!-- LinuxTV v4l-dvb repository. -->
+<!ENTITY v4l-dvb               "<ulink url='http://linuxtv.org/repo/'>http://linuxtv.org/repo/</ulink>">
+]>
+
+<book id="media_api">
+<bookinfo>
+<title>LINUX MEDIA INFRASTRUCTURE API</title>
+
+<copyright>
+       <year>2009</year>
+       <holder>LinuxTV Developers</holder>
+</copyright>
+
+<legalnotice>
+
+<para>Permission is granted to copy, distribute and/or modify
+this document under the terms of the GNU Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation. A copy of the license is included in the chapter entitled
+"GNU Free Documentation License"</para>
+</legalnotice>
+
+</bookinfo>
+
+<toc></toc> <!-- autogenerated -->
+
+<preface>
+       <title>Introduction</title>
+
+       <para>This document covers the Linux Kernel to Userspace API's used by
+               video and radio straming devices, including video cameras,
+               analog and digital TV receiver cards, AM/FM receiver cards,
+               streaming capture devices.</para>
+       <para>It is divided into three parts.</para>
+       <para>The first part covers radio, capture,
+               cameras and analog TV devices.</para>
+       <para>The second part covers the
+               API used for digital TV and Internet reception via one of the
+               several digital tv standards. While it is called as DVB API,
+               in fact it covers several different video standards including
+               DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated
+               to documment support also for DVB-S2, ISDB-T and ISDB-S.</para>
+       <para>The third part covers other API's used by all media infrastructure devices</para>
+       <para>For additional information and for the latest development code,
+               see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>
+       <para>For discussing improvements, reporting troubles, sending new drivers, etc, please mail to: <ulink url="http://vger.kernel.org/vger-lists.html#linux-media">Linux Media Mailing List (LMML).</ulink>.</para>
+
+</preface>
+
+<part id="v4l2spec">
+&sub-v4l2;
+</part>
+<part id="dvbapi">
+&sub-dvbapi;
+</part>
+<part id="v4ldvb_common">
+<partinfo>
+<authorgroup>
+<author>
+<firstname>Mauro</firstname>
+<surname>Chehab</surname>
+<othername role="mi">Carvalho</othername>
+<affiliation><address><email>mchehab@redhat.com</email></address></affiliation>
+<contrib>Initial version.</contrib>
+</author>
+</authorgroup>
+<copyright>
+       <year>2009</year>
+       <holder>Mauro Carvalho Chehab</holder>
+</copyright>
+
+<revhistory>
+<!-- Put document revisions here, newest first. -->
+<revision>
+<revnumber>1.0.0</revnumber>
+<date>2009-09-06</date>
+<authorinitials>mcc</authorinitials>
+<revremark>Initial revision</revremark>
+</revision>
+</revhistory>
+</partinfo>
+
+<title>Other API's used by media infrastructure drivers</title>
+<chapter id="remote_controllers">
+&sub-remote_controllers;
+</chapter>
+</part>
+
+&sub-fdl-appendix;
+
+</book>
index 8e14585..df0d089 100644 (file)
@@ -568,7 +568,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
                        <para>
                                The blocks in which the tables are stored are procteted against
                                accidental access by marking them bad in the memory bad block
-                               table. The bad block table managment functions are allowed
+                               table. The bad block table management functions are allowed
                                to circumvernt this protection.
                        </para>
                        <para>
index 10a150a..d87f456 100644 (file)
         <para>
           The SAS transport class contains common code to deal with SAS HBAs,
           an aproximated representation of SAS topologies in the driver model,
-          and various sysfs attributes to expose these topologies and managment
+          and various sysfs attributes to expose these topologies and management
           interfaces to userspace.
         </para>
         <para>
index 974e17c..254c1d5 100644 (file)
@@ -3,6 +3,7 @@
 <param name="chunk.quietly">1</param>
 <param name="funcsynopsis.style">ansi</param>
 <param name="funcsynopsis.tabular.threshold">80</param>
+<param name="callout.graphics">0</param>
 <!-- <param name="paper.type">A4</param> -->
 <param name="generate.section.toc.level">2</param>
 </stylesheet>
diff --git a/Documentation/DocBook/v4l/.gitignore b/Documentation/DocBook/v4l/.gitignore
new file mode 100644 (file)
index 0000000..d7ec32e
--- /dev/null
@@ -0,0 +1 @@
+!*.xml
diff --git a/Documentation/DocBook/v4l/biblio.xml b/Documentation/DocBook/v4l/biblio.xml
new file mode 100644 (file)
index 0000000..afc8a0d
--- /dev/null
@@ -0,0 +1,188 @@
+  <bibliography>
+    <title>References</title>
+
+    <biblioentry id="eia608">
+      <abbrev>EIA&nbsp;608-B</abbrev>
+      <authorgroup>
+       <corpauthor>Electronic Industries Alliance (<ulink
+url="http://www.eia.org">http://www.eia.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>EIA 608-B "Recommended Practice for Line 21 Data
+Service"</title>
+    </biblioentry>
+
+    <biblioentry id="en300294">
+      <abbrev>EN&nbsp;300&nbsp;294</abbrev>
+      <authorgroup>
+       <corpauthor>European Telecommunication Standards Institute
+(<ulink url="http://www.etsi.org">http://www.etsi.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>EN 300 294 "625-line television Wide Screen Signalling
+(WSS)"</title>
+    </biblioentry>
+
+    <biblioentry id="ets300231">
+      <abbrev>ETS&nbsp;300&nbsp;231</abbrev>
+      <authorgroup>
+       <corpauthor>European Telecommunication Standards Institute
+(<ulink
+url="http://www.etsi.org">http://www.etsi.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ETS 300 231 "Specification of the domestic video
+Programme Delivery Control system (PDC)"</title>
+    </biblioentry>
+
+    <biblioentry id="ets300706">
+      <abbrev>ETS&nbsp;300&nbsp;706</abbrev>
+      <authorgroup>
+       <corpauthor>European Telecommunication Standards Institute
+(<ulink url="http://www.etsi.org">http://www.etsi.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ETS 300 706 "Enhanced Teletext specification"</title>
+    </biblioentry>
+
+    <biblioentry id="mpeg2part1">
+      <abbrev>ISO&nbsp;13818-1</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>), International
+Organisation for Standardisation (<ulink
+url="http://www.iso.ch">http://www.iso.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-T Rec. H.222.0 | ISO/IEC 13818-1 "Information
+technology &mdash; Generic coding of moving pictures and associated
+audio information: Systems"</title>
+    </biblioentry>
+
+    <biblioentry id="mpeg2part2">
+      <abbrev>ISO&nbsp;13818-2</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>), International
+Organisation for Standardisation (<ulink
+url="http://www.iso.ch">http://www.iso.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-T Rec. H.262 | ISO/IEC 13818-2 "Information
+technology &mdash; Generic coding of moving pictures and associated
+audio information: Video"</title>
+    </biblioentry>
+
+    <biblioentry id="itu470">
+      <abbrev>ITU&nbsp;BT.470</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.470-6 "Conventional Television
+Systems"</title>
+    </biblioentry>
+
+    <biblioentry id="itu601">
+      <abbrev>ITU&nbsp;BT.601</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.601-5 "Studio Encoding Parameters
+of Digital Television for Standard 4:3 and Wide-Screen 16:9 Aspect
+Ratios"</title>
+    </biblioentry>
+
+    <biblioentry id="itu653">
+      <abbrev>ITU&nbsp;BT.653</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.653-3 "Teletext systems"</title>
+    </biblioentry>
+
+    <biblioentry id="itu709">
+      <abbrev>ITU&nbsp;BT.709</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.709-5 "Parameter values for the
+HDTV standards for production and international programme
+exchange"</title>
+    </biblioentry>
+
+    <biblioentry id="itu1119">
+      <abbrev>ITU&nbsp;BT.1119</abbrev>
+      <authorgroup>
+       <corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.1119 "625-line
+television Wide Screen Signalling (WSS)"</title>
+    </biblioentry>
+
+    <biblioentry id="jfif">
+      <abbrev>JFIF</abbrev>
+      <authorgroup>
+       <corpauthor>Independent JPEG Group (<ulink
+url="http://www.ijg.org">http://www.ijg.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>JPEG File Interchange Format</title>
+      <subtitle>Version 1.02</subtitle>
+    </biblioentry>
+
+    <biblioentry id="smpte12m">
+      <abbrev>SMPTE&nbsp;12M</abbrev>
+      <authorgroup>
+       <corpauthor>Society of Motion Picture and Television Engineers
+(<ulink url="http://www.smpte.org">http://www.smpte.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>SMPTE 12M-1999 "Television, Audio and Film - Time and
+Control Code"</title>
+    </biblioentry>
+
+    <biblioentry id="smpte170m">
+      <abbrev>SMPTE&nbsp;170M</abbrev>
+      <authorgroup>
+       <corpauthor>Society of Motion Picture and Television Engineers
+(<ulink url="http://www.smpte.org">http://www.smpte.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>SMPTE 170M-1999 "Television - Composite Analog Video
+Signal - NTSC for Studio Applications"</title>
+    </biblioentry>
+
+    <biblioentry id="smpte240m">
+      <abbrev>SMPTE&nbsp;240M</abbrev>
+      <authorgroup>
+       <corpauthor>Society of Motion Picture and Television Engineers
+(<ulink url="http://www.smpte.org">http://www.smpte.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>SMPTE 240M-1999 "Television - Signal Parameters -
+1125-Line High-Definition Production"</title>
+    </biblioentry>
+
+    <biblioentry id="en50067">
+      <abbrev>EN&nbsp;50067</abbrev>
+      <authorgroup>
+       <corpauthor>European Committee for Electrotechnical Standardization
+(<ulink url="http://www.cenelec.eu">http://www.cenelec.eu</ulink>)</corpauthor>
+      </authorgroup>
+      <title>Specification of the radio data system (RDS) for VHF/FM sound broadcasting
+in the frequency range from 87,5 to 108,0 MHz</title>
+    </biblioentry>
+
+    <biblioentry id="nrsc4">
+      <abbrev>NRSC-4</abbrev>
+      <authorgroup>
+       <corpauthor>National Radio Systems Committee
+(<ulink url="http://www.nrscstandards.org">http://www.nrscstandards.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>NTSC-4: United States RBDS Standard</title>
+    </biblioentry>
+
+  </bibliography>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/capture.c.xml b/Documentation/DocBook/v4l/capture.c.xml
new file mode 100644 (file)
index 0000000..1c5c49a
--- /dev/null
@@ -0,0 +1,659 @@
+<programlisting>
+/*
+ *  V4L2 video capture example
+ *
+ *  This program can be used and distributed without restrictions.
+ *
+ *      This program is provided with the V4L2 API
+ * see http://linuxtv.org/docs.php for more information
+ */
+
+#include &lt;stdio.h&gt;
+#include &lt;stdlib.h&gt;
+#include &lt;string.h&gt;
+#include &lt;assert.h&gt;
+
+#include &lt;getopt.h&gt;             /* getopt_long() */
+
+#include &lt;fcntl.h&gt;              /* low-level i/o */
+#include &lt;unistd.h&gt;
+#include &lt;errno.h&gt;
+#include &lt;sys/stat.h&gt;
+#include &lt;sys/types.h&gt;
+#include &lt;sys/time.h&gt;
+#include &lt;sys/mman.h&gt;
+#include &lt;sys/ioctl.h&gt;
+
+#include &lt;linux/videodev2.h&gt;
+
+#define CLEAR(x) memset(&amp;(x), 0, sizeof(x))
+
+enum io_method {
+        IO_METHOD_READ,
+        IO_METHOD_MMAP,
+        IO_METHOD_USERPTR,
+};
+
+struct buffer {
+        void   *start;
+        size_t  length;
+};
+
+static char            *dev_name;
+static enum io_method   io = IO_METHOD_MMAP;
+static int              fd = -1;
+struct buffer          *buffers;
+static unsigned int     n_buffers;
+static int              out_buf;
+static int              force_format;
+static int              frame_count = 70;
+
+static void errno_exit(const char *s)
+{
+        fprintf(stderr, "%s error %d, %s\n", s, errno, strerror(errno));
+        exit(EXIT_FAILURE);
+}
+
+static int xioctl(int fh, int request, void *arg)
+{
+        int r;
+
+        do {
+                r = ioctl(fh, request, arg);
+        } while (-1 == r &amp;&amp; EINTR == errno);
+
+        return r;
+}
+
+static void process_image(const void *p, int size)
+{
+        if (out_buf)
+                fwrite(p, size, 1, stdout);
+
+        fflush(stderr);
+        fprintf(stderr, ".");
+        fflush(stdout);
+}
+
+static int read_frame(void)
+{
+        struct <link linkend="v4l2-buffer">v4l2_buffer</link> buf;
+        unsigned int i;
+
+        switch (io) {
+        case IO_METHOD_READ:
+                if (-1 == read(fd, buffers[0].start, buffers[0].length)) {
+                        switch (errno) {
+                        case EAGAIN:
+                                return 0;
+
+                        case EIO:
+                                /* Could ignore EIO, see spec. */
+
+                                /* fall through */
+
+                        default:
+                                errno_exit("read");
+                        }
+                }
+
+                process_image(buffers[0].start, buffers[0].length);
+                break;
+
+        case IO_METHOD_MMAP:
+                CLEAR(buf);
+
+                buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory = V4L2_MEMORY_MMAP;
+
+                if (-1 == xioctl(fd, VIDIOC_DQBUF, &amp;buf)) {
+                        switch (errno) {
+                        case EAGAIN:
+                                return 0;
+
+                        case EIO:
+                                /* Could ignore EIO, see spec. */
+
+                                /* fall through */
+
+                        default:
+                                errno_exit("VIDIOC_DQBUF");
+                        }
+                }
+
+                assert(buf.index &lt; n_buffers);
+
+                process_image(buffers[buf.index].start, buf.bytesused);
+
+                if (-1 == xioctl(fd, VIDIOC_QBUF, &amp;buf))
+                        errno_exit("VIDIOC_QBUF");
+                break;
+
+        case IO_METHOD_USERPTR:
+                CLEAR(buf);
+
+                buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory = V4L2_MEMORY_USERPTR;
+
+                if (-1 == xioctl(fd, VIDIOC_DQBUF, &amp;buf)) {
+                        switch (errno) {
+                        case EAGAIN:
+                                return 0;
+
+                        case EIO:
+                                /* Could ignore EIO, see spec. */
+
+                                /* fall through */
+
+                        default:
+                                errno_exit("VIDIOC_DQBUF");
+                        }
+                }
+
+                for (i = 0; i &lt; n_buffers; ++i)
+                        if (buf.m.userptr == (unsigned long)buffers[i].start
+                            &amp;&amp; buf.length == buffers[i].length)
+                                break;
+
+                assert(i &lt; n_buffers);
+
+                process_image((void *)buf.m.userptr, buf.bytesused);
+
+                if (-1 == xioctl(fd, VIDIOC_QBUF, &amp;buf))
+                        errno_exit("VIDIOC_QBUF");
+                break;
+        }
+
+        return 1;
+}
+
+static void mainloop(void)
+{
+        unsigned int count;
+
+        count = frame_count;
+
+        while (count-- &gt; 0) {
+                for (;;) {
+                        fd_set fds;
+                        struct timeval tv;
+                        int r;
+
+                        FD_ZERO(&amp;fds);
+                        FD_SET(fd, &amp;fds);
+
+                        /* Timeout. */
+                        tv.tv_sec = 2;
+                        tv.tv_usec = 0;
+
+                        r = select(fd + 1, &amp;fds, NULL, NULL, &amp;tv);
+
+                        if (-1 == r) {
+                                if (EINTR == errno)
+                                        continue;
+                                errno_exit("select");
+                        }
+
+                        if (0 == r) {
+                                fprintf(stderr, "select timeout\n");
+                                exit(EXIT_FAILURE);
+                        }
+
+                        if (read_frame())
+                                break;
+                        /* EAGAIN - continue select loop. */
+                }
+        }
+}
+
+static void stop_capturing(void)
+{
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> type;
+
+        switch (io) {
+        case IO_METHOD_READ:
+                /* Nothing to do. */
+                break;
+
+        case IO_METHOD_MMAP:
+        case IO_METHOD_USERPTR:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                if (-1 == xioctl(fd, VIDIOC_STREAMOFF, &amp;type))
+                        errno_exit("VIDIOC_STREAMOFF");
+                break;
+        }
+}
+
+static void start_capturing(void)
+{
+        unsigned int i;
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> type;
+
+        switch (io) {
+        case IO_METHOD_READ:
+                /* Nothing to do. */
+                break;
+
+        case IO_METHOD_MMAP:
+                for (i = 0; i &lt; n_buffers; ++i) {
+                        struct <link linkend="v4l2-buffer">v4l2_buffer</link> buf;
+
+                        CLEAR(buf);
+                        buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                        buf.memory = V4L2_MEMORY_MMAP;
+                        buf.index = i;
+
+                        if (-1 == xioctl(fd, VIDIOC_QBUF, &amp;buf))
+                                errno_exit("VIDIOC_QBUF");
+                }
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                if (-1 == xioctl(fd, VIDIOC_STREAMON, &amp;type))
+                        errno_exit("VIDIOC_STREAMON");
+                break;
+
+        case IO_METHOD_USERPTR:
+                for (i = 0; i &lt; n_buffers; ++i) {
+                        struct <link linkend="v4l2-buffer">v4l2_buffer</link> buf;
+
+                        CLEAR(buf);
+                        buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                        buf.memory = V4L2_MEMORY_USERPTR;
+                        buf.index = i;
+                        buf.m.userptr = (unsigned long)buffers[i].start;
+                        buf.length = buffers[i].length;
+
+                        if (-1 == xioctl(fd, VIDIOC_QBUF, &amp;buf))
+                                errno_exit("VIDIOC_QBUF");
+                }
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                if (-1 == xioctl(fd, VIDIOC_STREAMON, &amp;type))
+                        errno_exit("VIDIOC_STREAMON");
+                break;
+        }
+}
+
+static void uninit_device(void)
+{
+        unsigned int i;
+
+        switch (io) {
+        case IO_METHOD_READ:
+                free(buffers[0].start);
+                break;
+
+        case IO_METHOD_MMAP:
+                for (i = 0; i &lt; n_buffers; ++i)
+                        if (-1 == munmap(buffers[i].start, buffers[i].length))
+                                errno_exit("munmap");
+                break;
+
+        case IO_METHOD_USERPTR:
+                for (i = 0; i &lt; n_buffers; ++i)
+                        free(buffers[i].start);
+                break;
+        }
+
+        free(buffers);
+}
+
+static void init_read(unsigned int buffer_size)
+{
+        buffers = calloc(1, sizeof(*buffers));
+
+        if (!buffers) {
+                fprintf(stderr, "Out of memory\n");
+                exit(EXIT_FAILURE);
+        }
+
+        buffers[0].length = buffer_size;
+        buffers[0].start = malloc(buffer_size);
+
+        if (!buffers[0].start) {
+                fprintf(stderr, "Out of memory\n");
+                exit(EXIT_FAILURE);
+        }
+}
+
+static void init_mmap(void)
+{
+        struct <link linkend="v4l2-requestbuffers">v4l2_requestbuffers</link> req;
+
+        CLEAR(req);
+
+        req.count = 4;
+        req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        req.memory = V4L2_MEMORY_MMAP;
+
+        if (-1 == xioctl(fd, VIDIOC_REQBUFS, &amp;req)) {
+                if (EINVAL == errno) {
+                        fprintf(stderr, "%s does not support "
+                                 "memory mapping\n", dev_name);
+                        exit(EXIT_FAILURE);
+                } else {
+                        errno_exit("VIDIOC_REQBUFS");
+                }
+        }
+
+        if (req.count &lt; 2) {
+                fprintf(stderr, "Insufficient buffer memory on %s\n",
+                         dev_name);
+                exit(EXIT_FAILURE);
+        }
+
+        buffers = calloc(req.count, sizeof(*buffers));
+
+        if (!buffers) {
+                fprintf(stderr, "Out of memory\n");
+                exit(EXIT_FAILURE);
+        }
+
+        for (n_buffers = 0; n_buffers &lt; req.count; ++n_buffers) {
+                struct <link linkend="v4l2-buffer">v4l2_buffer</link> buf;
+
+                CLEAR(buf);
+
+                buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory      = V4L2_MEMORY_MMAP;
+                buf.index       = n_buffers;
+
+                if (-1 == xioctl(fd, VIDIOC_QUERYBUF, &amp;buf))
+                        errno_exit("VIDIOC_QUERYBUF");
+
+                buffers[n_buffers].length = buf.length;
+                buffers[n_buffers].start =
+                        mmap(NULL /* start anywhere */,
+                              buf.length,
+                              PROT_READ | PROT_WRITE /* required */,
+                              MAP_SHARED /* recommended */,
+                              fd, buf.m.offset);
+
+                if (MAP_FAILED == buffers[n_buffers].start)
+                        errno_exit("mmap");
+        }
+}
+
+static void init_userp(unsigned int buffer_size)
+{
+        struct <link linkend="v4l2-requestbuffers">v4l2_requestbuffers</link> req;
+
+        CLEAR(req);
+
+        req.count  = 4;
+        req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        req.memory = V4L2_MEMORY_USERPTR;
+
+        if (-1 == xioctl(fd, VIDIOC_REQBUFS, &amp;req)) {
+                if (EINVAL == errno) {
+                        fprintf(stderr, "%s does not support "
+                                 "user pointer i/o\n", dev_name);
+                        exit(EXIT_FAILURE);
+                } else {
+                        errno_exit("VIDIOC_REQBUFS");
+                }
+        }
+
+        buffers = calloc(4, sizeof(*buffers));
+
+        if (!buffers) {
+                fprintf(stderr, "Out of memory\n");
+                exit(EXIT_FAILURE);
+        }
+
+        for (n_buffers = 0; n_buffers &lt; 4; ++n_buffers) {
+                buffers[n_buffers].length = buffer_size;
+                buffers[n_buffers].start = malloc(buffer_size);
+
+                if (!buffers[n_buffers].start) {
+                        fprintf(stderr, "Out of memory\n");
+                        exit(EXIT_FAILURE);
+                }
+        }
+}
+
+static void init_device(void)
+{
+        struct <link linkend="v4l2-capability">v4l2_capability</link> cap;
+        struct <link linkend="v4l2-cropcap">v4l2_cropcap</link> cropcap;
+        struct <link linkend="v4l2-crop">v4l2_crop</link> crop;
+        struct <link linkend="v4l2-format">v4l2_format</link> fmt;
+        unsigned int min;
+
+        if (-1 == xioctl(fd, VIDIOC_QUERYCAP, &amp;cap)) {
+                if (EINVAL == errno) {
+                        fprintf(stderr, "%s is no V4L2 device\n",
+                                 dev_name);
+                        exit(EXIT_FAILURE);
+                } else {
+                        errno_exit("VIDIOC_QUERYCAP");
+                }
+        }
+
+        if (!(cap.capabilities &amp; V4L2_CAP_VIDEO_CAPTURE)) {
+                fprintf(stderr, "%s is no video capture device\n",
+                         dev_name);
+                exit(EXIT_FAILURE);
+        }
+
+        switch (io) {
+        case IO_METHOD_READ:
+                if (!(cap.capabilities &amp; V4L2_CAP_READWRITE)) {
+                        fprintf(stderr, "%s does not support read i/o\n",
+                                 dev_name);
+                        exit(EXIT_FAILURE);
+                }
+                break;
+
+        case IO_METHOD_MMAP:
+        case IO_METHOD_USERPTR:
+                if (!(cap.capabilities &amp; V4L2_CAP_STREAMING)) {
+                        fprintf(stderr, "%s does not support streaming i/o\n",
+                                 dev_name);
+                        exit(EXIT_FAILURE);
+                }
+                break;
+        }
+
+
+        /* Select video input, video standard and tune here. */
+
+
+        CLEAR(cropcap);
+
+        cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        if (0 == xioctl(fd, VIDIOC_CROPCAP, &amp;cropcap)) {
+                crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                crop.c = cropcap.defrect; /* reset to default */
+
+                if (-1 == xioctl(fd, VIDIOC_S_CROP, &amp;crop)) {
+                        switch (errno) {
+                        case EINVAL:
+                                /* Cropping not supported. */
+                                break;
+                        default:
+                                /* Errors ignored. */
+                                break;
+                        }
+                }
+        } else {
+                /* Errors ignored. */
+        }
+
+
+        CLEAR(fmt);
+
+        fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        if (force_format) {
+                fmt.fmt.pix.width       = 640;
+                fmt.fmt.pix.height      = 480;
+                fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+                fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
+
+                if (-1 == xioctl(fd, VIDIOC_S_FMT, &amp;fmt))
+                        errno_exit("VIDIOC_S_FMT");
+
+                /* Note VIDIOC_S_FMT may change width and height. */
+        } else {
+                /* Preserve original settings as set by v4l2-ctl for example */
+                if (-1 == xioctl(fd, VIDIOC_G_FMT, &amp;fmt))
+                        errno_exit("VIDIOC_G_FMT");
+        }
+
+        /* Buggy driver paranoia. */
+        min = fmt.fmt.pix.width * 2;
+        if (fmt.fmt.pix.bytesperline &lt; min)
+                fmt.fmt.pix.bytesperline = min;
+        min = fmt.fmt.pix.bytesperline * fmt.fmt.pix.height;
+        if (fmt.fmt.pix.sizeimage &lt; min)
+                fmt.fmt.pix.sizeimage = min;
+
+        switch (io) {
+        case IO_METHOD_READ:
+                init_read(fmt.fmt.pix.sizeimage);
+                break;
+
+        case IO_METHOD_MMAP:
+                init_mmap();
+                break;
+
+        case IO_METHOD_USERPTR:
+                init_userp(fmt.fmt.pix.sizeimage);
+                break;
+        }
+}
+
+static void close_device(void)
+{
+        if (-1 == close(fd))
+                errno_exit("close");
+
+        fd = -1;
+}
+
+static void open_device(void)
+{
+        struct stat st;
+
+        if (-1 == stat(dev_name, &amp;st)) {
+                fprintf(stderr, "Cannot identify '%s': %d, %s\n",
+                         dev_name, errno, strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+
+        if (!S_ISCHR(st.st_mode)) {
+                fprintf(stderr, "%s is no device\n", dev_name);
+                exit(EXIT_FAILURE);
+        }
+
+        fd = open(dev_name, O_RDWR /* required */ | O_NONBLOCK, 0);
+
+        if (-1 == fd) {
+                fprintf(stderr, "Cannot open '%s': %d, %s\n",
+                         dev_name, errno, strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+}
+
+static void usage(FILE *fp, int argc, char **argv)
+{
+        fprintf(fp,
+                 "Usage: %s [options]\n\n"
+                 "Version 1.3\n"
+                 "Options:\n"
+                 "-d | --device name   Video device name [%s]\n"
+                 "-h | --help          Print this message\n"
+                 "-m | --mmap          Use memory mapped buffers [default]\n"
+                 "-r | --read          Use read() calls\n"
+                 "-u | --userp         Use application allocated buffers\n"
+                 "-o | --output        Outputs stream to stdout\n"
+                 "-f | --format        Force format to 640x480 YUYV\n"
+                 "-c | --count         Number of frames to grab [%i]\n"
+                 "",
+                 argv[0], dev_name, frame_count);
+}
+
+static const char short_options[] = "d:hmruofc:";
+
+static const struct option
+long_options[] = {
+        { "device", required_argument, NULL, 'd' },
+        { "help",   no_argument,       NULL, 'h' },
+        { "mmap",   no_argument,       NULL, 'm' },
+        { "read",   no_argument,       NULL, 'r' },
+        { "userp",  no_argument,       NULL, 'u' },
+        { "output", no_argument,       NULL, 'o' },
+        { "format", no_argument,       NULL, 'f' },
+        { "count",  required_argument, NULL, 'c' },
+        { 0, 0, 0, 0 }
+};
+
+int main(int argc, char **argv)
+{
+        dev_name = "/dev/video0";
+
+        for (;;) {
+                int idx;
+                int c;
+
+                c = getopt_long(argc, argv,
+                                short_options, long_options, &amp;idx);
+
+                if (-1 == c)
+                        break;
+
+                switch (c) {
+                case 0: /* getopt_long() flag */
+                        break;
+
+                case 'd':
+                        dev_name = optarg;
+                        break;
+
+                case 'h':
+                        usage(stdout, argc, argv);
+                        exit(EXIT_SUCCESS);
+
+                case 'm':
+                        io = IO_METHOD_MMAP;
+                        break;
+
+                case 'r':
+                        io = IO_METHOD_READ;
+                        break;
+
+                case 'u':
+                        io = IO_METHOD_USERPTR;
+                        break;
+
+                case 'o':
+                        out_buf++;
+                        break;
+
+                case 'f':
+                        force_format++;
+                        break;
+
+                case 'c':
+                        errno = 0;
+                        frame_count = strtol(optarg, NULL, 0);
+                        if (errno)
+                                errno_exit(optarg);
+                        break;
+
+                default:
+                        usage(stderr, argc, argv);
+                        exit(EXIT_FAILURE);
+                }
+        }
+
+        open_device();
+        init_device();
+        start_capturing();
+        mainloop();
+        stop_capturing();
+        uninit_device();
+        close_device();
+        fprintf(stderr, "\n");
+        return 0;
+}
+</programlisting>
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml
new file mode 100644 (file)
index 0000000..b1a81d2
--- /dev/null
@@ -0,0 +1,1160 @@
+  <title>Common API Elements</title>
+
+  <para>Programming a V4L2 device consists of these
+steps:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>Opening the device</para>
+    </listitem>
+    <listitem>
+      <para>Changing device properties, selecting a video and audio
+input, video standard, picture brightness a.&nbsp;o.</para>
+    </listitem>
+    <listitem>
+      <para>Negotiating a data format</para>
+    </listitem>
+    <listitem>
+      <para>Negotiating an input/output method</para>
+    </listitem>
+    <listitem>
+      <para>The actual input/output loop</para>
+    </listitem>
+    <listitem>
+      <para>Closing the device</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>In practice most steps are optional and can be executed out of
+order. It depends on the V4L2 device type, you can read about the
+details in <xref linkend="devices" />. In this chapter we will discuss
+the basic concepts applicable to all devices.</para>
+
+  <section id="open">
+    <title>Opening and Closing Devices</title>
+
+    <section>
+      <title>Device Naming</title>
+
+      <para>V4L2 drivers are implemented as kernel modules, loaded
+manually by the system administrator or automatically when a device is
+first opened. The driver modules plug into the "videodev" kernel
+module. It provides helper functions and a common application
+interface specified in this document.</para>
+
+      <para>Each driver thus loaded registers one or more device nodes
+with major number 81 and a minor number between 0 and 255. Assigning
+minor numbers to V4L2 devices is entirely up to the system administrator,
+this is primarily intended to solve conflicts between devices.<footnote>
+         <para>Access permissions are associated with character
+device special files, hence we must ensure device numbers cannot
+change with the module load order. To this end minor numbers are no
+longer automatically assigned by the "videodev" module as in V4L but
+requested by the driver. The defaults will suffice for most people
+unless two drivers compete for the same minor numbers.</para>
+       </footnote> The module options to select minor numbers are named
+after the device special file with a "_nr" suffix. For example "video_nr"
+for <filename>/dev/video</filename> video capture devices. The number is
+an offset to the base minor number associated with the device type.
+<footnote>
+         <para>In earlier versions of the V4L2 API the module options
+where named after the device special file with a "unit_" prefix, expressing
+the minor number itself, not an offset. Rationale for this change is unknown.
+Lastly the naming and semantics are just a convention among driver writers,
+the point to note is that minor numbers are not supposed to be hardcoded
+into drivers.</para>
+       </footnote> When the driver supports multiple devices of the same
+type more than one minor number can be assigned, separated by commas:
+<informalexample>
+         <screen>
+&gt; insmod mydriver.o video_nr=0,1 radio_nr=0,1</screen>
+       </informalexample></para>
+
+      <para>In <filename>/etc/modules.conf</filename> this may be
+written as: <informalexample>
+         <screen>
+alias char-major-81-0 mydriver
+alias char-major-81-1 mydriver
+alias char-major-81-64 mydriver              <co id="alias" />
+options mydriver video_nr=0,1 radio_nr=0,1   <co id="options" />
+         </screen>
+         <calloutlist>
+           <callout arearefs="alias">
+             <para>When an application attempts to open a device
+special file with major number 81 and minor number 0, 1, or 64, load
+"mydriver" (and the "videodev" module it depends upon).</para>
+           </callout>
+           <callout arearefs="options">
+             <para>Register the first two video capture devices with
+minor number 0 and 1 (base number is 0), the first two radio device
+with minor number 64 and 65 (base 64).</para>
+           </callout>
+         </calloutlist>
+       </informalexample> When no minor number is given as module
+option the driver supplies a default. <xref linkend="devices" />
+recommends the base minor numbers to be used for the various device
+types. Obviously minor numbers must be unique. When the number is
+already in use the <emphasis>offending device</emphasis> will not be
+registered. <!-- Blessed by Linus Torvalds on
+linux-kernel@vger.kernel.org, 2002-11-20. --></para>
+
+      <para>By convention system administrators create various
+character device special files with these major and minor numbers in
+the <filename>/dev</filename> directory. The names recomended for the
+different V4L2 device types are listed in <xref linkend="devices" />.
+</para>
+
+      <para>The creation of character special files (with
+<application>mknod</application>) is a privileged operation and
+devices cannot be opened by major and minor number. That means
+applications cannot <emphasis>reliable</emphasis> scan for loaded or
+installed drivers. The user must enter a device name, or the
+application can try the conventional device names.</para>
+
+      <para>Under the device filesystem (devfs) the minor number
+options are ignored. V4L2 drivers (or by proxy the "videodev" module)
+automatically create the required device files in the
+<filename>/dev/v4l</filename> directory using the conventional device
+names above.</para>
+    </section>
+
+    <section id="related">
+      <title>Related Devices</title>
+
+      <para>Devices can support several related functions. For example
+video capturing, video overlay and VBI capturing are related because
+these functions share, amongst other, the same video input and tuner
+frequency. V4L and earlier versions of V4L2 used the same device name
+and minor number for video capturing and overlay, but different ones
+for VBI. Experience showed this approach has several problems<footnote>
+         <para>Given a device file name one cannot reliable find
+related devices. For once names are arbitrary and in a system with
+multiple devices, where only some support VBI capturing, a
+<filename>/dev/video2</filename> is not necessarily related to
+<filename>/dev/vbi2</filename>. The V4L
+<constant>VIDIOCGUNIT</constant> ioctl would require a search for a
+device file with a particular major and minor number.</para>
+       </footnote>, and to make things worse the V4L videodev module
+used to prohibit multiple opens of a device.</para>
+
+      <para>As a remedy the present version of the V4L2 API relaxed the
+concept of device types with specific names and minor numbers. For
+compatibility with old applications drivers must still register different
+minor numbers to assign a default function to the device. But if related
+functions are supported by the driver they must be available under all
+registered minor numbers. The desired function can be selected after
+opening the device as described in <xref linkend="devices" />.</para>
+
+      <para>Imagine a driver supporting video capturing, video
+overlay, raw VBI capturing, and FM radio reception. It registers three
+devices with minor number 0, 64 and 224 (this numbering scheme is
+inherited from the V4L API). Regardless if
+<filename>/dev/video</filename> (81, 0) or
+<filename>/dev/vbi</filename> (81, 224) is opened the application can
+select any one of the video capturing, overlay or VBI capturing
+functions. Without programming (e.&nbsp;g. reading from the device
+with <application>dd</application> or <application>cat</application>)
+<filename>/dev/video</filename> captures video images, while
+<filename>/dev/vbi</filename> captures raw VBI data.
+<filename>/dev/radio</filename> (81, 64) is invariable a radio device,
+unrelated to the video functions. Being unrelated does not imply the
+devices can be used at the same time, however. The &func-open;
+function may very well return an &EBUSY;.</para>
+
+      <para>Besides video input or output the hardware may also
+support audio sampling or playback. If so, these functions are
+implemented as OSS or ALSA PCM devices and eventually OSS or ALSA
+audio mixer. The V4L2 API makes no provisions yet to find these
+related devices. If you have an idea please write to the linux-media
+mailing list: &v4l-ml;.</para>
+    </section>
+
+    <section>
+      <title>Multiple Opens</title>
+
+      <para>In general, V4L2 devices can be opened more than once.
+When this is supported by the driver, users can for example start a
+"panel" application to change controls like brightness or audio
+volume, while another application captures video and audio. In other words, panel
+applications are comparable to an OSS or ALSA audio mixer application.
+When a device supports multiple functions like capturing and overlay
+<emphasis>simultaneously</emphasis>, multiple opens allow concurrent
+use of the device by forked processes or specialized applications.</para>
+
+      <para>Multiple opens are optional, although drivers should
+permit at least concurrent accesses without data exchange, &ie; panel
+applications. This implies &func-open; can return an &EBUSY; when the
+device is already in use, as well as &func-ioctl; functions initiating
+data exchange (namely the &VIDIOC-S-FMT; ioctl), and the &func-read;
+and &func-write; functions.</para>
+
+      <para>Mere opening a V4L2 device does not grant exclusive
+access.<footnote>
+         <para>Drivers could recognize the
+<constant>O_EXCL</constant> open flag. Presently this is not required,
+so applications cannot know if it really works.</para>
+       </footnote> Initiating data exchange however assigns the right
+to read or write the requested type of data, and to change related
+properties, to this file descriptor. Applications can request
+additional access privileges using the priority mechanism described in
+<xref linkend="app-pri" />.</para>
+    </section>
+
+    <section>
+      <title>Shared Data Streams</title>
+
+      <para>V4L2 drivers should not support multiple applications
+reading or writing the same data stream on a device by copying
+buffers, time multiplexing or similar means. This is better handled by
+a proxy application in user space. When the driver supports stream
+sharing anyway it must be implemented transparently. The V4L2 API does
+not specify how conflicts are solved. <!-- For example O_EXCL when the
+application does not want to be preempted, PROT_READ mmapped buffers
+which can be mapped twice, what happens when image formats do not
+match etc.--></para>
+    </section>
+
+    <section>
+      <title>Functions</title>
+
+    <para>To open and close V4L2 devices applications use the
+&func-open; and &func-close; function, respectively. Devices are
+programmed using the &func-ioctl; function as explained in the
+following sections.</para>
+    </section>
+  </section>
+
+  <section id="querycap">
+    <title>Querying Capabilities</title>
+
+    <para>Because V4L2 covers a wide variety of devices not all
+aspects of the API are equally applicable to all types of devices.
+Furthermore devices of the same type have different capabilities and
+this specification permits the omission of a few complicated and less
+important parts of the API.</para>
+
+    <para>The &VIDIOC-QUERYCAP; ioctl is available to check if the kernel
+device is compatible with this specification, and to query the <link
+linkend="devices">functions</link> and <link linkend="io">I/O
+methods</link> supported by the device. Other features can be queried
+by calling the respective ioctl, for example &VIDIOC-ENUMINPUT;
+to learn about the number, types and names of video connectors on the
+device. Although abstraction is a major objective of this API, the
+ioctl also allows driver specific applications to reliable identify
+the driver.</para>
+
+    <para>All V4L2 drivers must support
+<constant>VIDIOC_QUERYCAP</constant>. Applications should always call
+this ioctl after opening the device.</para>
+  </section>
+
+  <section id="app-pri">
+    <title>Application Priority</title>
+
+    <para>When multiple applications share a device it may be
+desirable to assign them different priorities. Contrary to the
+traditional "rm -rf /" school of thought a video recording application
+could for example block other applications from changing video
+controls or switching the current TV channel. Another objective is to
+permit low priority applications working in background, which can be
+preempted by user controlled applications and automatically regain
+control of the device at a later time.</para>
+
+    <para>Since these features cannot be implemented entirely in user
+space V4L2 defines the &VIDIOC-G-PRIORITY; and &VIDIOC-S-PRIORITY;
+ioctls to request and query the access priority associate with a file
+descriptor. Opening a device assigns a medium priority, compatible
+with earlier versions of V4L2 and drivers not supporting these ioctls.
+Applications requiring a different priority will usually call
+<constant>VIDIOC_S_PRIORITY</constant> after verifying the device with
+the &VIDIOC-QUERYCAP; ioctl.</para>
+
+    <para>Ioctls changing driver properties, such as &VIDIOC-S-INPUT;,
+return an &EBUSY; after another application obtained higher priority.
+An event mechanism to notify applications about asynchronous property
+changes has been proposed but not added yet.</para>
+  </section>
+
+  <section id="video">
+    <title>Video Inputs and Outputs</title>
+
+    <para>Video inputs and outputs are physical connectors of a
+device. These can be for example RF connectors (antenna/cable), CVBS
+a.k.a. Composite Video, S-Video or RGB connectors. Only video and VBI
+capture devices have inputs, output devices have outputs, at least one
+each. Radio devices have no video inputs or outputs.</para>
+
+    <para>To learn about the number and attributes of the
+available inputs and outputs applications can enumerate them with the
+&VIDIOC-ENUMINPUT; and &VIDIOC-ENUMOUTPUT; ioctl, respectively. The
+&v4l2-input; returned by the <constant>VIDIOC_ENUMINPUT</constant>
+ioctl also contains signal status information applicable when the
+current video input is queried.</para>
+
+    <para>The &VIDIOC-G-INPUT; and &VIDIOC-G-OUTPUT; ioctl return the
+index of the current video input or output. To select a different
+input or output applications call the &VIDIOC-S-INPUT; and
+&VIDIOC-S-OUTPUT; ioctl. Drivers must implement all the input ioctls
+when the device has one or more inputs, all the output ioctls when the
+device has one or more outputs.</para>
+
+    <!--
+    <figure id=io-tree>
+      <title>Input and output enumeration is the root of most device properties.</title>
+      <mediaobject>
+       <imageobject>
+         <imagedata fileref="links.pdf" format="ps" />
+       </imageobject>
+       <imageobject>
+         <imagedata fileref="links.gif" format="gif" />
+       </imageobject>
+       <textobject>
+         <phrase>Links between various device property structures.</phrase>
+       </textobject>
+      </mediaobject>
+    </figure>
+    -->
+
+    <example>
+      <title>Information about the current video input</title>
+
+      <programlisting>
+&v4l2-input; input;
+int index;
+
+if (-1 == ioctl (fd, &VIDIOC-G-INPUT;, &amp;index)) {
+       perror ("VIDIOC_G_INPUT");
+       exit (EXIT_FAILURE);
+}
+
+memset (&amp;input, 0, sizeof (input));
+input.index = index;
+
+if (-1 == ioctl (fd, &VIDIOC-ENUMINPUT;, &amp;input)) {
+       perror ("VIDIOC_ENUMINPUT");
+       exit (EXIT_FAILURE);
+}
+
+printf ("Current input: %s\n", input.name);
+      </programlisting>
+    </example>
+
+    <example>
+      <title>Switching to the first video input</title>
+
+      <programlisting>
+int index;
+
+index = 0;
+
+if (-1 == ioctl (fd, &VIDIOC-S-INPUT;, &amp;index)) {
+       perror ("VIDIOC_S_INPUT");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+  </section>
+
+  <section id="audio">
+    <title>Audio Inputs and Outputs</title>
+
+    <para>Audio inputs and outputs are physical connectors of a
+device. Video capture devices have inputs, output devices have
+outputs, zero or more each. Radio devices have no audio inputs or
+outputs. They have exactly one tuner which in fact
+<emphasis>is</emphasis> an audio source, but this API associates
+tuners with video inputs or outputs only, and radio devices have
+none of these.<footnote>
+       <para>Actually &v4l2-audio; ought to have a
+<structfield>tuner</structfield> field like &v4l2-input;, not only
+making the API more consistent but also permitting radio devices with
+multiple tuners.</para>
+      </footnote> A connector on a TV card to loop back the received
+audio signal to a sound card is not considered an audio output.</para>
+
+    <para>Audio and video inputs and outputs are associated. Selecting
+a video source also selects an audio source. This is most evident when
+the video and audio source is a tuner. Further audio connectors can
+combine with more than one video input or output. Assumed two
+composite video inputs and two audio inputs exist, there may be up to
+four valid combinations. The relation of video and audio connectors
+is defined in the <structfield>audioset</structfield> field of the
+respective &v4l2-input; or &v4l2-output;, where each bit represents
+the index number, starting at zero, of one audio input or output.</para>
+
+    <para>To learn about the number and attributes of the
+available inputs and outputs applications can enumerate them with the
+&VIDIOC-ENUMAUDIO; and &VIDIOC-ENUMAUDOUT; ioctl, respectively. The
+&v4l2-audio; returned by the <constant>VIDIOC_ENUMAUDIO</constant> ioctl
+also contains signal status information applicable when the current
+audio input is queried.</para>
+
+    <para>The &VIDIOC-G-AUDIO; and &VIDIOC-G-AUDOUT; ioctl report
+the current audio input and output, respectively. Note that, unlike
+&VIDIOC-G-INPUT; and &VIDIOC-G-OUTPUT; these ioctls return a structure
+as <constant>VIDIOC_ENUMAUDIO</constant> and
+<constant>VIDIOC_ENUMAUDOUT</constant> do, not just an index.</para>
+
+    <para>To select an audio input and change its properties
+applications call the &VIDIOC-S-AUDIO; ioctl. To select an audio
+output (which presently has no changeable properties) applications
+call the &VIDIOC-S-AUDOUT; ioctl.</para>
+
+    <para>Drivers must implement all input ioctls when the device
+has one or more inputs, all output ioctls when the device has one
+or more outputs. When the device has any audio inputs or outputs the
+driver must set the <constant>V4L2_CAP_AUDIO</constant> flag in the
+&v4l2-capability; returned by the &VIDIOC-QUERYCAP; ioctl.</para>
+
+    <example>
+      <title>Information about the current audio input</title>
+
+      <programlisting>
+&v4l2-audio; audio;
+
+memset (&amp;audio, 0, sizeof (audio));
+
+if (-1 == ioctl (fd, &VIDIOC-G-AUDIO;, &amp;audio)) {
+       perror ("VIDIOC_G_AUDIO");
+       exit (EXIT_FAILURE);
+}
+
+printf ("Current input: %s\n", audio.name);
+      </programlisting>
+    </example>
+
+    <example>
+      <title>Switching to the first audio input</title>
+
+      <programlisting>
+&v4l2-audio; audio;
+
+memset (&amp;audio, 0, sizeof (audio)); /* clear audio.mode, audio.reserved */
+
+audio.index = 0;
+
+if (-1 == ioctl (fd, &VIDIOC-S-AUDIO;, &amp;audio)) {
+       perror ("VIDIOC_S_AUDIO");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+  </section>
+
+  <section id="tuner">
+    <title>Tuners and Modulators</title>
+
+    <section>
+      <title>Tuners</title>
+
+      <para>Video input devices can have one or more tuners
+demodulating a RF signal. Each tuner is associated with one or more
+video inputs, depending on the number of RF connectors on the tuner.
+The <structfield>type</structfield> field of the respective
+&v4l2-input; returned by the &VIDIOC-ENUMINPUT; ioctl is set to
+<constant>V4L2_INPUT_TYPE_TUNER</constant> and its
+<structfield>tuner</structfield> field contains the index number of
+the tuner.</para>
+
+      <para>Radio devices have exactly one tuner with index zero, no
+video inputs.</para>
+
+      <para>To query and change tuner properties applications use the
+&VIDIOC-G-TUNER; and &VIDIOC-S-TUNER; ioctl, respectively. The
+&v4l2-tuner; returned by <constant>VIDIOC_G_TUNER</constant> also
+contains signal status information applicable when the tuner of the
+current video input, or a radio tuner is queried. Note that
+<constant>VIDIOC_S_TUNER</constant> does not switch the current tuner,
+when there is more than one at all. The tuner is solely determined by
+the current video input. Drivers must support both ioctls and set the
+<constant>V4L2_CAP_TUNER</constant> flag in the &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl when the device has one or
+more tuners.</para>
+    </section>
+
+    <section>
+      <title>Modulators</title>
+
+      <para>Video output devices can have one or more modulators, uh,
+modulating a video signal for radiation or connection to the antenna
+input of a TV set or video recorder. Each modulator is associated with
+one or more video outputs, depending on the number of RF connectors on
+the modulator. The <structfield>type</structfield> field of the
+respective &v4l2-output; returned by the &VIDIOC-ENUMOUTPUT; ioctl is
+set to <constant>V4L2_OUTPUT_TYPE_MODULATOR</constant> and its
+<structfield>modulator</structfield> field contains the index number
+of the modulator. This specification does not define radio output
+devices.</para>
+
+      <para>To query and change modulator properties applications use
+the &VIDIOC-G-MODULATOR; and &VIDIOC-S-MODULATOR; ioctl. Note that
+<constant>VIDIOC_S_MODULATOR</constant> does not switch the current
+modulator, when there is more than one at all. The modulator is solely
+determined by the current video output. Drivers must support both
+ioctls and set the <constant>V4L2_CAP_MODULATOR</constant> flag in
+the &v4l2-capability; returned by the &VIDIOC-QUERYCAP; ioctl when the
+device has one or more modulators.</para>
+    </section>
+
+    <section>
+      <title>Radio Frequency</title>
+
+      <para>To get and set the tuner or modulator radio frequency
+applications use the &VIDIOC-G-FREQUENCY; and &VIDIOC-S-FREQUENCY;
+ioctl which both take a pointer to a &v4l2-frequency;. These ioctls
+are used for TV and radio devices alike. Drivers must support both
+ioctls when the tuner or modulator ioctls are supported, or
+when the device is a radio device.</para>
+    </section>
+  </section>
+
+  <section id="standard">
+    <title>Video Standards</title>
+
+    <para>Video devices typically support one or more different video
+standards or variations of standards. Each video input and output may
+support another set of standards. This set is reported by the
+<structfield>std</structfield> field of &v4l2-input; and
+&v4l2-output; returned by the &VIDIOC-ENUMINPUT; and
+&VIDIOC-ENUMOUTPUT; ioctl, respectively.</para>
+
+    <para>V4L2 defines one bit for each analog video standard
+currently in use worldwide, and sets aside bits for driver defined
+standards, &eg; hybrid standards to watch NTSC video tapes on PAL TVs
+and vice versa. Applications can use the predefined bits to select a
+particular standard, although presenting the user a menu of supported
+standards is preferred. To enumerate and query the attributes of the
+supported standards applications use the &VIDIOC-ENUMSTD; ioctl.</para>
+
+    <para>Many of the defined standards are actually just variations
+of a few major standards. The hardware may in fact not distinguish
+between them, or do so internal and switch automatically. Therefore
+enumerated standards also contain sets of one or more standard
+bits.</para>
+
+    <para>Assume a hypothetic tuner capable of demodulating B/PAL,
+G/PAL and I/PAL signals. The first enumerated standard is a set of B
+and G/PAL, switched automatically depending on the selected radio
+frequency in UHF or VHF band. Enumeration gives a "PAL-B/G" or "PAL-I"
+choice. Similar a Composite input may collapse standards, enumerating
+"PAL-B/G/H/I", "NTSC-M" and "SECAM-D/K".<footnote>
+       <para>Some users are already confused by technical terms PAL,
+NTSC and SECAM. There is no point asking them to distinguish between
+B, G, D, or K when the software or hardware can do that
+automatically.</para>
+    </footnote></para>
+
+    <para>To query and select the standard used by the current video
+input or output applications call the &VIDIOC-G-STD; and
+&VIDIOC-S-STD; ioctl, respectively. The <emphasis>received</emphasis>
+standard can be sensed with the &VIDIOC-QUERYSTD; ioctl. Note parameter of all these ioctls is a pointer to a &v4l2-std-id; type (a standard set), <emphasis>not</emphasis> an index into the standard enumeration.<footnote>
+       <para>An alternative to the current scheme is to use pointers
+to indices as arguments of <constant>VIDIOC_G_STD</constant> and
+<constant>VIDIOC_S_STD</constant>, the &v4l2-input; and
+&v4l2-output; <structfield>std</structfield> field would be a set of
+indices like <structfield>audioset</structfield>.</para>
+       <para>Indices are consistent with the rest of the API
+and identify the standard unambiguously. In the present scheme of
+things an enumerated standard is looked up by &v4l2-std-id;. Now the
+standards supported by the inputs of a device can overlap. Just
+assume the tuner and composite input in the example above both
+exist on a device. An enumeration of "PAL-B/G", "PAL-H/I" suggests
+a choice which does not exist. We cannot merge or omit sets, because
+applications would be unable to find the standards reported by
+<constant>VIDIOC_G_STD</constant>. That leaves separate enumerations
+for each input. Also selecting a standard by &v4l2-std-id; can be
+ambiguous. Advantage of this method is that applications need not
+identify the standard indirectly, after enumerating.</para><para>So in
+summary, the lookup itself is unavoidable. The difference is only
+whether the lookup is necessary to find an enumerated standard or to
+switch to a standard by &v4l2-std-id;.</para>
+      </footnote> Drivers must implement all video standard ioctls
+when the device has one or more video inputs or outputs.</para>
+
+    <para>Special rules apply to USB cameras where the notion of video
+standards makes little sense. More generally any capture device,
+output devices accordingly, which is <itemizedlist>
+       <listitem>
+         <para>incapable of capturing fields or frames at the nominal
+rate of the video standard, or</para>
+       </listitem>
+       <listitem>
+         <para>where <link linkend="buffer">timestamps</link> refer
+to the instant the field or frame was received by the driver, not the
+capture time, or</para>
+       </listitem>
+       <listitem>
+         <para>where <link linkend="buffer">sequence numbers</link>
+refer to the frames received by the driver, not the captured
+frames.</para>
+       </listitem>
+      </itemizedlist> Here the driver shall set the
+<structfield>std</structfield> field of &v4l2-input; and &v4l2-output;
+to zero, the <constant>VIDIOC_G_STD</constant>,
+<constant>VIDIOC_S_STD</constant>,
+<constant>VIDIOC_QUERYSTD</constant> and
+<constant>VIDIOC_ENUMSTD</constant> ioctls shall return the
+&EINVAL;.<footnote>
+       <para>See <xref linkend="buffer" /> for a rationale. Probably
+even USB cameras follow some well known video standard. It might have
+been better to explicitly indicate elsewhere if a device cannot live
+up to normal expectations, instead of this exception.</para>
+           </footnote></para>
+
+    <example>
+      <title>Information about the current video standard</title>
+
+      <programlisting>
+&v4l2-std-id; std_id;
+&v4l2-standard; standard;
+
+if (-1 == ioctl (fd, &VIDIOC-G-STD;, &amp;std_id)) {
+       /* Note when VIDIOC_ENUMSTD always returns EINVAL this
+          is no video device or it falls under the USB exception,
+          and VIDIOC_G_STD returning EINVAL is no error. */
+
+       perror ("VIDIOC_G_STD");
+       exit (EXIT_FAILURE);
+}
+
+memset (&amp;standard, 0, sizeof (standard));
+standard.index = 0;
+
+while (0 == ioctl (fd, &VIDIOC-ENUMSTD;, &amp;standard)) {
+       if (standard.id &amp; std_id) {
+              printf ("Current video standard: %s\n", standard.name);
+              exit (EXIT_SUCCESS);
+       }
+
+       standard.index++;
+}
+
+/* EINVAL indicates the end of the enumeration, which cannot be
+   empty unless this device falls under the USB exception. */
+
+if (errno == EINVAL || standard.index == 0) {
+       perror ("VIDIOC_ENUMSTD");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+
+    <example>
+      <title>Listing the video standards supported by the current
+input</title>
+
+      <programlisting>
+&v4l2-input; input;
+&v4l2-standard; standard;
+
+memset (&amp;input, 0, sizeof (input));
+
+if (-1 == ioctl (fd, &VIDIOC-G-INPUT;, &amp;input.index)) {
+       perror ("VIDIOC_G_INPUT");
+       exit (EXIT_FAILURE);
+}
+
+if (-1 == ioctl (fd, &VIDIOC-ENUMINPUT;, &amp;input)) {
+       perror ("VIDIOC_ENUM_INPUT");
+       exit (EXIT_FAILURE);
+}
+
+printf ("Current input %s supports:\n", input.name);
+
+memset (&amp;standard, 0, sizeof (standard));
+standard.index = 0;
+
+while (0 == ioctl (fd, &VIDIOC-ENUMSTD;, &amp;standard)) {
+       if (standard.id &amp; input.std)
+               printf ("%s\n", standard.name);
+
+       standard.index++;
+}
+
+/* EINVAL indicates the end of the enumeration, which cannot be
+   empty unless this device falls under the USB exception. */
+
+if (errno != EINVAL || standard.index == 0) {
+       perror ("VIDIOC_ENUMSTD");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+
+    <example>
+      <title>Selecting a new video standard</title>
+
+      <programlisting>
+&v4l2-input; input;
+&v4l2-std-id; std_id;
+
+memset (&amp;input, 0, sizeof (input));
+
+if (-1 == ioctl (fd, &VIDIOC-G-INPUT;, &amp;input.index)) {
+       perror ("VIDIOC_G_INPUT");
+       exit (EXIT_FAILURE);
+}
+
+if (-1 == ioctl (fd, &VIDIOC-ENUMINPUT;, &amp;input)) {
+       perror ("VIDIOC_ENUM_INPUT");
+       exit (EXIT_FAILURE);
+}
+
+if (0 == (input.std &amp; V4L2_STD_PAL_BG)) {
+       fprintf (stderr, "Oops. B/G PAL is not supported.\n");
+       exit (EXIT_FAILURE);
+}
+
+/* Note this is also supposed to work when only B
+   <emphasis>or</emphasis> G/PAL is supported. */
+
+std_id = V4L2_STD_PAL_BG;
+
+if (-1 == ioctl (fd, &VIDIOC-S-STD;, &amp;std_id)) {
+       perror ("VIDIOC_S_STD");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+  </section>
+
+  &sub-controls;
+
+  <section id="format">
+    <title>Data Formats</title>
+
+    <section>
+      <title>Data Format Negotiation</title>
+
+      <para>Different devices exchange different kinds of data with
+applications, for example video images, raw or sliced VBI data, RDS
+datagrams. Even within one kind many different formats are possible,
+in particular an abundance of image formats. Although drivers must
+provide a default and the selection persists across closing and
+reopening a device, applications should always negotiate a data format
+before engaging in data exchange. Negotiation means the application
+asks for a particular format and the driver selects and reports the
+best the hardware can do to satisfy the request. Of course
+applications can also just query the current selection.</para>
+
+      <para>A single mechanism exists to negotiate all data formats
+using the aggregate &v4l2-format; and the &VIDIOC-G-FMT; and
+&VIDIOC-S-FMT; ioctls. Additionally the &VIDIOC-TRY-FMT; ioctl can be
+used to examine what the hardware <emphasis>could</emphasis> do,
+without actually selecting a new data format. The data formats
+supported by the V4L2 API are covered in the respective device section
+in <xref linkend="devices" />. For a closer look at image formats see
+<xref linkend="pixfmt" />.</para>
+
+      <para>The <constant>VIDIOC_S_FMT</constant> ioctl is a major
+turning-point in the initialization sequence. Prior to this point
+multiple panel applications can access the same device concurrently to
+select the current input, change controls or modify other properties.
+The first <constant>VIDIOC_S_FMT</constant> assigns a logical stream
+(video data, VBI data etc.) exclusively to one file descriptor.</para>
+
+      <para>Exclusive means no other application, more precisely no
+other file descriptor, can grab this stream or change device
+properties inconsistent with the negotiated parameters. A video
+standard change for example, when the new standard uses a different
+number of scan lines, can invalidate the selected image format.
+Therefore only the file descriptor owning the stream can make
+invalidating changes. Accordingly multiple file descriptors which
+grabbed different logical streams prevent each other from interfering
+with their settings. When for example video overlay is about to start
+or already in progress, simultaneous video capturing may be restricted
+to the same cropping and image size.</para>
+
+      <para>When applications omit the
+<constant>VIDIOC_S_FMT</constant> ioctl its locking side effects are
+implied by the next step, the selection of an I/O method with the
+&VIDIOC-REQBUFS; ioctl or implicit with the first &func-read; or
+&func-write; call.</para>
+
+      <para>Generally only one logical stream can be assigned to a
+file descriptor, the exception being drivers permitting simultaneous
+video capturing and overlay using the same file descriptor for
+compatibility with V4L and earlier versions of V4L2. Switching the
+logical stream or returning into "panel mode" is possible by closing
+and reopening the device. Drivers <emphasis>may</emphasis> support a
+switch using <constant>VIDIOC_S_FMT</constant>.</para>
+
+      <para>All drivers exchanging data with
+applications must support the <constant>VIDIOC_G_FMT</constant> and
+<constant>VIDIOC_S_FMT</constant> ioctl. Implementation of the
+<constant>VIDIOC_TRY_FMT</constant> is highly recommended but
+optional.</para>
+    </section>
+
+    <section>
+      <title>Image Format Enumeration</title>
+
+      <para>Apart of the generic format negotiation functions
+a special ioctl to enumerate all image formats supported by video
+capture, overlay or output devices is available.<footnote>
+         <para>Enumerating formats an application has no a-priori
+knowledge of (otherwise it could explicitly ask for them and need not
+enumerate) seems useless, but there are applications serving as proxy
+between drivers and the actual video applications for which this is
+useful.</para>
+       </footnote></para>
+
+      <para>The &VIDIOC-ENUM-FMT; ioctl must be supported
+by all drivers exchanging image data with applications.</para>
+
+      <important>
+       <para>Drivers are not supposed to convert image formats in
+kernel space. They must enumerate only formats directly supported by
+the hardware. If necessary driver writers should publish an example
+conversion routine or library for integration into applications.</para>
+      </important>
+    </section>
+  </section>
+
+  <section id="crop">
+    <title>Image Cropping, Insertion and Scaling</title>
+
+    <para>Some video capture devices can sample a subsection of the
+picture and shrink or enlarge it to an image of arbitrary size. We
+call these abilities cropping and scaling. Some video output devices
+can scale an image up or down and insert it at an arbitrary scan line
+and horizontal offset into a video signal.</para>
+
+    <para>Applications can use the following API to select an area in
+the video signal, query the default area and the hardware limits.
+<emphasis>Despite their name, the &VIDIOC-CROPCAP;, &VIDIOC-G-CROP;
+and &VIDIOC-S-CROP; ioctls apply to input as well as output
+devices.</emphasis></para>
+
+    <para>Scaling requires a source and a target. On a video capture
+or overlay device the source is the video signal, and the cropping
+ioctls determine the area actually sampled. The target are images
+read by the application or overlaid onto the graphics screen. Their
+size (and position for an overlay) is negotiated with the
+&VIDIOC-G-FMT; and &VIDIOC-S-FMT; ioctls.</para>
+
+    <para>On a video output device the source are the images passed in
+by the application, and their size is again negotiated with the
+<constant>VIDIOC_G/S_FMT</constant> ioctls, or may be encoded in a
+compressed video stream. The target is the video signal, and the
+cropping ioctls determine the area where the images are
+inserted.</para>
+
+    <para>Source and target rectangles are defined even if the device
+does not support scaling or the <constant>VIDIOC_G/S_CROP</constant>
+ioctls. Their size (and position where applicable) will be fixed in
+this case. <emphasis>All capture and output device must support the
+<constant>VIDIOC_CROPCAP</constant> ioctl such that applications can
+determine if scaling takes place.</emphasis></para>
+
+    <section>
+      <title>Cropping Structures</title>
+
+      <figure id="crop-scale">
+       <title>Image Cropping, Insertion and Scaling</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="crop.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="crop.gif" format="GIF" />
+         </imageobject>
+         <textobject>
+           <phrase>The cropping, insertion and scaling process</phrase>
+         </textobject>
+       </mediaobject>
+      </figure>
+
+      <para>For capture devices the coordinates of the top left
+corner, width and height of the area which can be sampled is given by
+the <structfield>bounds</structfield> substructure of the
+&v4l2-cropcap; returned by the <constant>VIDIOC_CROPCAP</constant>
+ioctl. To support a wide range of hardware this specification does not
+define an origin or units. However by convention drivers should
+horizontally count unscaled samples relative to 0H (the leading edge
+of the horizontal sync pulse, see <xref linkend="vbi-hsync" />).
+Vertically ITU-R line
+numbers of the first field (<xref linkend="vbi-525" />, <xref
+linkend="vbi-625" />), multiplied by two if the driver can capture both
+fields.</para>
+
+      <para>The top left corner, width and height of the source
+rectangle, that is the area actually sampled, is given by &v4l2-crop;
+using the same coordinate system as &v4l2-cropcap;. Applications can
+use the <constant>VIDIOC_G_CROP</constant> and
+<constant>VIDIOC_S_CROP</constant> ioctls to get and set this
+rectangle. It must lie completely within the capture boundaries and
+the driver may further adjust the requested size and/or position
+according to hardware limitations.</para>
+
+      <para>Each capture device has a default source rectangle, given
+by the <structfield>defrect</structfield> substructure of
+&v4l2-cropcap;. The center of this rectangle shall align with the
+center of the active picture area of the video signal, and cover what
+the driver writer considers the complete picture. Drivers shall reset
+the source rectangle to the default when the driver is first loaded,
+but not later.</para>
+
+      <para>For output devices these structures and ioctls are used
+accordingly, defining the <emphasis>target</emphasis> rectangle where
+the images will be inserted into the video signal.</para>
+
+    </section>
+
+    <section>
+      <title>Scaling Adjustments</title>
+
+      <para>Video hardware can have various cropping, insertion and
+scaling limitations. It may only scale up or down, support only
+discrete scaling factors, or have different scaling abilities in
+horizontal and vertical direction. Also it may not support scaling at
+all. At the same time the &v4l2-crop; rectangle may have to be
+aligned, and both the source and target rectangles may have arbitrary
+upper and lower size limits. In particular the maximum
+<structfield>width</structfield> and <structfield>height</structfield>
+in &v4l2-crop; may be smaller than the
+&v4l2-cropcap;.<structfield>bounds</structfield> area. Therefore, as
+usual, drivers are expected to adjust the requested parameters and
+return the actual values selected.</para>
+
+      <para>Applications can change the source or the target rectangle
+first, as they may prefer a particular image size or a certain area in
+the video signal. If the driver has to adjust both to satisfy hardware
+limitations, the last requested rectangle shall take priority, and the
+driver should preferably adjust the opposite one. The &VIDIOC-TRY-FMT;
+ioctl however shall not change the driver state and therefore only
+adjust the requested rectangle.</para>
+
+      <para>Suppose scaling on a video capture device is restricted to
+a factor 1:1 or 2:1 in either direction and the target image size must
+be a multiple of 16&nbsp;&times;&nbsp;16 pixels. The source cropping
+rectangle is set to defaults, which are also the upper limit in this
+example, of 640&nbsp;&times;&nbsp;400 pixels at offset 0,&nbsp;0. An
+application requests an image size of 300&nbsp;&times;&nbsp;225
+pixels, assuming video will be scaled down from the "full picture"
+accordingly. The driver sets the image size to the closest possible
+values 304&nbsp;&times;&nbsp;224, then chooses the cropping rectangle
+closest to the requested size, that is 608&nbsp;&times;&nbsp;224
+(224&nbsp;&times;&nbsp;2:1 would exceed the limit 400). The offset
+0,&nbsp;0 is still valid, thus unmodified. Given the default cropping
+rectangle reported by <constant>VIDIOC_CROPCAP</constant> the
+application can easily propose another offset to center the cropping
+rectangle.</para>
+
+      <para>Now the application may insist on covering an area using a
+picture aspect ratio closer to the original request, so it asks for a
+cropping rectangle of 608&nbsp;&times;&nbsp;456 pixels. The present
+scaling factors limit cropping to 640&nbsp;&times;&nbsp;384, so the
+driver returns the cropping size 608&nbsp;&times;&nbsp;384 and adjusts
+the image size to closest possible 304&nbsp;&times;&nbsp;192.</para>
+
+    </section>
+
+    <section>
+      <title>Examples</title>
+
+      <para>Source and target rectangles shall remain unchanged across
+closing and reopening a device, such that piping data into or out of a
+device will work without special preparations. More advanced
+applications should ensure the parameters are suitable before starting
+I/O.</para>
+
+      <example>
+       <title>Resetting the cropping parameters</title>
+
+       <para>(A video capture device is assumed; change
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant> for other
+devices.)</para>
+
+       <programlisting>
+&v4l2-cropcap; cropcap;
+&v4l2-crop; crop;
+
+memset (&amp;cropcap, 0, sizeof (cropcap));
+cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+if (-1 == ioctl (fd, &VIDIOC-CROPCAP;, &amp;cropcap)) {
+       perror ("VIDIOC_CROPCAP");
+       exit (EXIT_FAILURE);
+}
+
+memset (&amp;crop, 0, sizeof (crop));
+crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+crop.c = cropcap.defrect;
+
+/* Ignore if cropping is not supported (EINVAL). */
+
+if (-1 == ioctl (fd, &VIDIOC-S-CROP;, &amp;crop)
+    &amp;&amp; errno != EINVAL) {
+       perror ("VIDIOC_S_CROP");
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+      </example>
+
+      <example>
+       <title>Simple downscaling</title>
+
+       <para>(A video capture device is assumed.)</para>
+
+       <programlisting>
+&v4l2-cropcap; cropcap;
+&v4l2-format; format;
+
+reset_cropping_parameters ();
+
+/* Scale down to 1/4 size of full picture. */
+
+memset (&amp;format, 0, sizeof (format)); /* defaults */
+
+format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+format.fmt.pix.width = cropcap.defrect.width &gt;&gt; 1;
+format.fmt.pix.height = cropcap.defrect.height &gt;&gt; 1;
+format.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+
+if (-1 == ioctl (fd, &VIDIOC-S-FMT;, &amp;format)) {
+       perror ("VIDIOC_S_FORMAT");
+       exit (EXIT_FAILURE);
+}
+
+/* We could check the actual image size now, the actual scaling factor
+   or if the driver can scale at all. */
+       </programlisting>
+      </example>
+
+      <example>
+       <title>Selecting an output area</title>
+
+       <programlisting>
+&v4l2-cropcap; cropcap;
+&v4l2-crop; crop;
+
+memset (&amp;cropcap, 0, sizeof (cropcap));
+cropcap.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+if (-1 == ioctl (fd, VIDIOC_CROPCAP;, &amp;cropcap)) {
+       perror ("VIDIOC_CROPCAP");
+       exit (EXIT_FAILURE);
+}
+
+memset (&amp;crop, 0, sizeof (crop));
+
+crop.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+crop.c = cropcap.defrect;
+
+/* Scale the width and height to 50 % of their original size
+   and center the output. */
+
+crop.c.width /= 2;
+crop.c.height /= 2;
+crop.c.left += crop.c.width / 2;
+crop.c.top += crop.c.height / 2;
+
+/* Ignore if cropping is not supported (EINVAL). */
+
+if (-1 == ioctl (fd, VIDIOC_S_CROP, &amp;crop)
+    &amp;&amp; errno != EINVAL) {
+       perror ("VIDIOC_S_CROP");
+       exit (EXIT_FAILURE);
+}
+</programlisting>
+      </example>
+
+      <example>
+       <title>Current scaling factor and pixel aspect</title>
+
+       <para>(A video capture device is assumed.)</para>
+
+       <programlisting>
+&v4l2-cropcap; cropcap;
+&v4l2-crop; crop;
+&v4l2-format; format;
+double hscale, vscale;
+double aspect;
+int dwidth, dheight;
+
+memset (&amp;cropcap, 0, sizeof (cropcap));
+cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+if (-1 == ioctl (fd, &VIDIOC-CROPCAP;, &amp;cropcap)) {
+       perror ("VIDIOC_CROPCAP");
+       exit (EXIT_FAILURE);
+}
+
+memset (&amp;crop, 0, sizeof (crop));
+crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+if (-1 == ioctl (fd, &VIDIOC-G-CROP;, &amp;crop)) {
+       if (errno != EINVAL) {
+               perror ("VIDIOC_G_CROP");
+               exit (EXIT_FAILURE);
+       }
+
+       /* Cropping not supported. */
+       crop.c = cropcap.defrect;
+}
+
+memset (&amp;format, 0, sizeof (format));
+format.fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+if (-1 == ioctl (fd, &VIDIOC-G-FMT;, &amp;format)) {
+       perror ("VIDIOC_G_FMT");
+       exit (EXIT_FAILURE);
+}
+
+/* The scaling applied by the driver. */
+
+hscale = format.fmt.pix.width / (double) crop.c.width;
+vscale = format.fmt.pix.height / (double) crop.c.height;
+
+aspect = cropcap.pixelaspect.numerator /
+        (double) cropcap.pixelaspect.denominator;
+aspect = aspect * hscale / vscale;
+
+/* Devices following ITU-R BT.601 do not capture
+   square pixels. For playback on a computer monitor
+   we should scale the images to this size. */
+
+dwidth = format.fmt.pix.width / aspect;
+dheight = format.fmt.pix.height;
+       </programlisting>
+      </example>
+    </section>
+  </section>
+
+  <section id="streaming-par">
+    <title>Streaming Parameters</title>
+
+    <para>Streaming parameters are intended to optimize the video
+capture process as well as I/O. Presently applications can request a
+high quality capture mode with the &VIDIOC-S-PARM; ioctl.</para>
+
+    <para>The current video standard determines a nominal number of
+frames per second. If less than this number of frames is to be
+captured or output, applications can request frame skipping or
+duplicating on the driver side. This is especially useful when using
+the &func-read; or &func-write;, which are not augmented by timestamps
+or sequence counters, and to avoid unneccessary data copying.</para>
+
+    <para>Finally these ioctls can be used to determine the number of
+buffers used internally by a driver in read/write mode. For
+implications see the section discussing the &func-read;
+function.</para>
+
+    <para>To get and set the streaming parameters applications call
+the &VIDIOC-G-PARM; and &VIDIOC-S-PARM; ioctl, respectively. They take
+a pointer to a &v4l2-streamparm;, which contains a union holding
+separate parameters for input and output devices.</para>
+
+    <para>These ioctls are optional, drivers need not implement
+them. If so, they return the &EINVAL;.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
new file mode 100644 (file)
index 0000000..4d1902a
--- /dev/null
@@ -0,0 +1,2457 @@
+  <title>Changes</title>
+
+  <para>The following chapters document the evolution of the V4L2 API,
+errata or extensions. They are also intended to help application and
+driver writers to port or update their code.</para>
+
+  <section id="diff-v4l">
+    <title>Differences between V4L and V4L2</title>
+
+    <para>The Video For Linux API was first introduced in Linux 2.1 to
+unify and replace various TV and radio device related interfaces,
+developed independently by driver writers in prior years. Starting
+with Linux 2.5 the much improved V4L2 API replaces the V4L API,
+although existing drivers will continue to support V4L applications in
+the future, either directly or through the V4L2 compatibility layer in
+the <filename>videodev</filename> kernel module translating ioctls on
+the fly. For a transition period not all drivers will support the V4L2
+API.</para>
+
+    <section>
+      <title>Opening and Closing Devices</title>
+
+      <para>For compatibility reasons the character device file names
+recommended for V4L2 video capture, overlay, radio, teletext and raw
+vbi capture devices did not change from those used by V4L. They are
+listed in <xref linkend="devices" /> and below in <xref
+         linkend="v4l-dev" />.</para>
+
+      <para>The V4L <filename>videodev</filename> module automatically
+assigns minor numbers to drivers in load order, depending on the
+registered device type. We recommend that V4L2 drivers by default
+register devices with the same numbers, but the system administrator
+can assign arbitrary minor numbers using driver module options. The
+major device number remains 81.</para>
+
+      <table id="v4l-dev">
+       <title>V4L Device Types, Names and Numbers</title>
+       <tgroup cols="3">
+         <thead>
+           <row>
+             <entry>Device Type</entry>
+             <entry>File Name</entry>
+             <entry>Minor Numbers</entry>
+           </row>
+         </thead>
+         <tbody valign="top">
+           <row>
+             <entry>Video capture and overlay</entry>
+             <entry><para><filename>/dev/video</filename> and
+<filename>/dev/bttv0</filename><footnote> <para>According to
+Documentation/devices.txt these should be symbolic links to
+<filename>/dev/video0</filename>. Note the original bttv interface is
+not compatible with V4L or V4L2.</para> </footnote>,
+<filename>/dev/video0</filename> to
+<filename>/dev/video63</filename></para></entry>
+             <entry>0-63</entry>
+           </row>
+           <row>
+             <entry>Radio receiver</entry>
+             <entry><para><filename>/dev/radio</filename><footnote>
+                   <para>According to
+<filename>Documentation/devices.txt</filename> a symbolic link to
+<filename>/dev/radio0</filename>.</para>
+                 </footnote>, <filename>/dev/radio0</filename> to
+<filename>/dev/radio63</filename></para></entry>
+             <entry>64-127</entry>
+           </row>
+           <row>
+             <entry>Teletext decoder</entry>
+             <entry><para><filename>/dev/vtx</filename>,
+<filename>/dev/vtx0</filename> to
+<filename>/dev/vtx31</filename></para></entry>
+             <entry>192-223</entry>
+           </row>
+           <row>
+             <entry>Raw VBI capture</entry>
+             <entry><para><filename>/dev/vbi</filename>,
+<filename>/dev/vbi0</filename> to
+<filename>/dev/vbi31</filename></para></entry>
+             <entry>224-255</entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+
+      <para>V4L prohibits (or used to prohibit) multiple opens of a
+device file. V4L2 drivers <emphasis>may</emphasis> support multiple
+opens, see <xref linkend="open" /> for details and consequences.</para>
+
+      <para>V4L drivers respond to V4L2 ioctls with an &EINVAL;. The
+compatibility layer in the V4L2 <filename>videodev</filename> module
+can translate V4L ioctl requests to their V4L2 counterpart, however a
+V4L2 driver usually needs more preparation to become fully V4L
+compatible. This is covered in more detail in <xref
+         linkend="driver" />.</para>
+    </section>
+
+    <section>
+      <title>Querying Capabilities</title>
+
+      <para>The V4L <constant>VIDIOCGCAP</constant> ioctl is
+equivalent to V4L2's &VIDIOC-QUERYCAP;.</para>
+
+      <para>The <structfield>name</structfield> field in struct
+<structname>video_capability</structname> became
+<structfield>card</structfield> in &v4l2-capability;,
+<structfield>type</structfield> was replaced by
+<structfield>capabilities</structfield>. Note V4L2 does not
+distinguish between device types like this, better think of basic
+video input, video output and radio devices supporting a set of
+related functions like video capturing, video overlay and VBI
+capturing. See <xref linkend="open" /> for an
+introduction.<informaltable>
+         <tgroup cols="3">
+           <thead>
+             <row>
+               <entry>struct
+<structname>video_capability</structname>
+<structfield>type</structfield></entry>
+               <entry>&v4l2-capability;
+<structfield>capabilities</structfield> flags</entry>
+               <entry>Purpose</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry><constant>VID_TYPE_CAPTURE</constant></entry>
+               <entry><constant>V4L2_CAP_VIDEO_CAPTURE</constant></entry>
+               <entry>The <link linkend="capture">video
+capture</link> interface is supported.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_TUNER</constant></entry>
+               <entry><constant>V4L2_CAP_TUNER</constant></entry>
+               <entry>The device has a <link linkend="tuner">tuner or
+modulator</link>.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_TELETEXT</constant></entry>
+               <entry><constant>V4L2_CAP_VBI_CAPTURE</constant></entry>
+               <entry>The <link linkend="raw-vbi">raw VBI
+capture</link> interface is supported.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_OVERLAY</constant></entry>
+               <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry>
+               <entry>The <link linkend="overlay">video
+overlay</link> interface is supported.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_CHROMAKEY</constant></entry>
+               <entry><constant>V4L2_FBUF_CAP_CHROMAKEY</constant> in
+field <structfield>capability</structfield> of
+&v4l2-framebuffer;</entry>
+               <entry>Whether chromakey overlay is supported. For
+more information on overlay see
+<xref linkend="overlay" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_CLIPPING</constant></entry>
+               <entry><constant>V4L2_FBUF_CAP_LIST_CLIPPING</constant>
+and <constant>V4L2_FBUF_CAP_BITMAP_CLIPPING</constant> in field
+<structfield>capability</structfield> of &v4l2-framebuffer;</entry>
+               <entry>Whether clipping the overlaid image is
+supported, see <xref linkend="overlay" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_FRAMERAM</constant></entry>
+               <entry><constant>V4L2_FBUF_CAP_EXTERNOVERLAY</constant>
+<emphasis>not set</emphasis> in field
+<structfield>capability</structfield> of &v4l2-framebuffer;</entry>
+               <entry>Whether overlay overwrites frame buffer memory,
+see <xref linkend="overlay" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_SCALES</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>This flag indicates if the hardware can scale
+images. The V4L2 API implies the scale factor by setting the cropping
+dimensions and image size with the &VIDIOC-S-CROP; and &VIDIOC-S-FMT;
+ioctl, respectively. The driver returns the closest sizes possible.
+For more information on cropping and scaling see <xref
+                   linkend="crop" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_MONOCHROME</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>Applications can enumerate the supported image
+formats with the &VIDIOC-ENUM-FMT; ioctl to determine if the device
+supports grey scale capturing only. For more information on image
+formats see <xref linkend="pixfmt" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_SUBCAPTURE</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>Applications can call the &VIDIOC-G-CROP; ioctl
+to determine if the device supports capturing a subsection of the full
+picture ("cropping" in V4L2). If not, the ioctl returns the &EINVAL;.
+For more information on cropping and scaling see <xref
+                   linkend="crop" />.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_MPEG_DECODER</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>Applications can enumerate the supported image
+formats with the &VIDIOC-ENUM-FMT; ioctl to determine if the device
+supports MPEG streams.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_MPEG_ENCODER</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>See above.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_MJPEG_DECODER</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>See above.</entry>
+             </row>
+             <row>
+               <entry><constant>VID_TYPE_MJPEG_ENCODER</constant></entry>
+               <entry><constant>-</constant></entry>
+               <entry>See above.</entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable></para>
+
+      <para>The <structfield>audios</structfield> field was replaced
+by <structfield>capabilities</structfield> flag
+<constant>V4L2_CAP_AUDIO</constant>, indicating
+<emphasis>if</emphasis> the device has any audio inputs or outputs. To
+determine their number applications can enumerate audio inputs with
+the &VIDIOC-G-AUDIO; ioctl. The audio ioctls are described in <xref
+         linkend="audio" />.</para>
+
+      <para>The <structfield>maxwidth</structfield>,
+<structfield>maxheight</structfield>,
+<structfield>minwidth</structfield> and
+<structfield>minheight</structfield> fields were removed. Calling the
+&VIDIOC-S-FMT; or &VIDIOC-TRY-FMT; ioctl with the desired dimensions
+returns the closest size possible, taking into account the current
+video standard, cropping and scaling limitations.</para>
+    </section>
+
+    <section>
+      <title>Video Sources</title>
+
+      <para>V4L provides the <constant>VIDIOCGCHAN</constant> and
+<constant>VIDIOCSCHAN</constant> ioctl using struct
+<structname>video_channel</structname> to enumerate
+the video inputs of a V4L device. The equivalent V4L2 ioctls
+are &VIDIOC-ENUMINPUT;, &VIDIOC-G-INPUT; and &VIDIOC-S-INPUT;
+using &v4l2-input; as discussed in <xref linkend="video" />.</para>
+
+      <para>The <structfield>channel</structfield> field counting
+inputs was renamed to <structfield>index</structfield>, the video
+input types were renamed as follows: <informaltable>
+         <tgroup cols="2">
+           <thead>
+             <row>
+               <entry>struct <structname>video_channel</structname>
+<structfield>type</structfield></entry>
+               <entry>&v4l2-input;
+<structfield>type</structfield></entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry><constant>VIDEO_TYPE_TV</constant></entry>
+               <entry><constant>V4L2_INPUT_TYPE_TUNER</constant></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_TYPE_CAMERA</constant></entry>
+               <entry><constant>V4L2_INPUT_TYPE_CAMERA</constant></entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable></para>
+
+      <para>Unlike the <structfield>tuners</structfield> field
+expressing the number of tuners of this input, V4L2 assumes each video
+input is connected to at most one tuner. However a tuner can have more
+than one input, &ie; RF connectors, and a device can have multiple
+tuners. The index number of the tuner associated with the input, if
+any, is stored in field <structfield>tuner</structfield> of
+&v4l2-input;. Enumeration of tuners is discussed in <xref
+         linkend="tuner" />.</para>
+
+      <para>The redundant <constant>VIDEO_VC_TUNER</constant> flag was
+dropped. Video inputs associated with a tuner are of type
+<constant>V4L2_INPUT_TYPE_TUNER</constant>. The
+<constant>VIDEO_VC_AUDIO</constant> flag was replaced by the
+<structfield>audioset</structfield> field. V4L2 considers devices with
+up to 32 audio inputs. Each set bit in the
+<structfield>audioset</structfield> field represents one audio input
+this video input combines with. For information about audio inputs and
+how to switch between them see <xref linkend="audio" />.</para>
+
+      <para>The <structfield>norm</structfield> field describing the
+supported video standards was replaced by
+<structfield>std</structfield>. The V4L specification mentions a flag
+<constant>VIDEO_VC_NORM</constant> indicating whether the standard can
+be changed. This flag was a later addition together with the
+<structfield>norm</structfield> field and has been removed in the
+meantime. V4L2 has a similar, albeit more comprehensive approach
+to video standards, see <xref linkend="standard" /> for more
+information.</para>
+    </section>
+
+    <section>
+      <title>Tuning</title>
+
+      <para>The V4L <constant>VIDIOCGTUNER</constant> and
+<constant>VIDIOCSTUNER</constant> ioctl and struct
+<structname>video_tuner</structname> can be used to enumerate the
+tuners of a V4L TV or radio device. The equivalent V4L2 ioctls are
+&VIDIOC-G-TUNER; and &VIDIOC-S-TUNER; using &v4l2-tuner;. Tuners are
+covered in <xref linkend="tuner" />.</para>
+
+      <para>The <structfield>tuner</structfield> field counting tuners
+was renamed to <structfield>index</structfield>. The fields
+<structfield>name</structfield>, <structfield>rangelow</structfield>
+and <structfield>rangehigh</structfield> remained unchanged.</para>
+
+      <para>The <constant>VIDEO_TUNER_PAL</constant>,
+<constant>VIDEO_TUNER_NTSC</constant> and
+<constant>VIDEO_TUNER_SECAM</constant> flags indicating the supported
+video standards were dropped. This information is now contained in the
+associated &v4l2-input;. No replacement exists for the
+<constant>VIDEO_TUNER_NORM</constant> flag indicating whether the
+video standard can be switched. The <structfield>mode</structfield>
+field to select a different video standard was replaced by a whole new
+set of ioctls and structures described in <xref linkend="standard" />.
+Due to its ubiquity it should be mentioned the BTTV driver supports
+several standards in addition to the regular
+<constant>VIDEO_MODE_PAL</constant> (0),
+<constant>VIDEO_MODE_NTSC</constant>,
+<constant>VIDEO_MODE_SECAM</constant> and
+<constant>VIDEO_MODE_AUTO</constant> (3). Namely N/PAL Argentina,
+M/PAL, N/PAL, and NTSC Japan with numbers 3-6 (sic).</para>
+
+      <para>The <constant>VIDEO_TUNER_STEREO_ON</constant> flag
+indicating stereo reception became
+<constant>V4L2_TUNER_SUB_STEREO</constant> in field
+<structfield>rxsubchans</structfield>. This field also permits the
+detection of monaural and bilingual audio, see the definition of
+&v4l2-tuner; for details. Presently no replacement exists for the
+<constant>VIDEO_TUNER_RDS_ON</constant> and
+<constant>VIDEO_TUNER_MBS_ON</constant> flags.</para>
+
+      <para> The <constant>VIDEO_TUNER_LOW</constant> flag was renamed
+to <constant>V4L2_TUNER_CAP_LOW</constant> in the &v4l2-tuner;
+<structfield>capability</structfield> field.</para>
+
+      <para>The <constant>VIDIOCGFREQ</constant> and
+<constant>VIDIOCSFREQ</constant> ioctl to change the tuner frequency
+where renamed to &VIDIOC-G-FREQUENCY; and  &VIDIOC-S-FREQUENCY;. They
+take a pointer to a &v4l2-frequency; instead of an unsigned long
+integer.</para>
+    </section>
+
+    <section id="v4l-image-properties">
+      <title>Image Properties</title>
+
+      <para>V4L2 has no equivalent of the
+<constant>VIDIOCGPICT</constant> and <constant>VIDIOCSPICT</constant>
+ioctl and struct <structname>video_picture</structname>. The following
+fields where replaced by V4L2 controls accessible with the
+&VIDIOC-QUERYCTRL;, &VIDIOC-G-CTRL; and &VIDIOC-S-CTRL; ioctls:<informaltable>
+         <tgroup cols="2">
+           <thead>
+             <row>
+               <entry>struct <structname>video_picture</structname></entry>
+               <entry>V4L2 Control ID</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry><structfield>brightness</structfield></entry>
+               <entry><constant>V4L2_CID_BRIGHTNESS</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>hue</structfield></entry>
+               <entry><constant>V4L2_CID_HUE</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>colour</structfield></entry>
+               <entry><constant>V4L2_CID_SATURATION</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>contrast</structfield></entry>
+               <entry><constant>V4L2_CID_CONTRAST</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>whiteness</structfield></entry>
+               <entry><constant>V4L2_CID_WHITENESS</constant></entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable></para>
+
+      <para>The V4L picture controls are assumed to range from 0 to
+65535 with no particular reset value. The V4L2 API permits arbitrary
+limits and defaults which can be queried with the &VIDIOC-QUERYCTRL;
+ioctl. For general information about controls see <xref
+linkend="control" />.</para>
+
+      <para>The <structfield>depth</structfield> (average number of
+bits per pixel) of a video image is implied by the selected image
+format. V4L2 does not explicitely provide such information assuming
+applications recognizing the format are aware of the image depth and
+others need not know. The <structfield>palette</structfield> field
+moved into the &v4l2-pix-format;:<informaltable>
+         <tgroup cols="2">
+           <thead>
+             <row>
+               <entry>struct <structname>video_picture</structname>
+<structfield>palette</structfield></entry>
+               <entry>&v4l2-pix-format;
+<structfield>pixfmt</structfield></entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry><constant>VIDEO_PALETTE_GREY</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-GREY"><constant>V4L2_PIX_FMT_GREY</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_HI240</constant></entry>
+               <entry><para><link
+linkend="pixfmt-reserved"><constant>V4L2_PIX_FMT_HI240</constant></link><footnote>
+                     <para>This is a custom format used by the BTTV
+driver, not one of the V4L2 standard formats.</para>
+                   </footnote></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_RGB565</constant></entry>
+               <entry><para><link
+linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_RGB565</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_RGB555</constant></entry>
+               <entry><para><link
+linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_RGB555</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_RGB24</constant></entry>
+               <entry><para><link
+linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_BGR24</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_RGB32</constant></entry>
+               <entry><para><link
+linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_BGR32</constant></link><footnote>
+                     <para>Presumably all V4L RGB formats are
+little-endian, although some drivers might interpret them according to machine endianess. V4L2 defines little-endian, big-endian and red/blue
+swapped variants. For details see <xref linkend="pixfmt-rgb" />.</para>
+                   </footnote></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV422</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YUYV"><constant>V4L2_PIX_FMT_YUYV</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><para><constant>VIDEO_PALETTE_YUYV</constant><footnote>
+                     <para><constant>VIDEO_PALETTE_YUV422</constant>
+and <constant>VIDEO_PALETTE_YUYV</constant> are the same formats. Some
+V4L drivers respond to one, some to the other.</para>
+                   </footnote></para></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YUYV"><constant>V4L2_PIX_FMT_YUYV</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_UYVY</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-UYVY"><constant>V4L2_PIX_FMT_UYVY</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV420</constant></entry>
+               <entry>None</entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV411</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-Y41P"><constant>V4L2_PIX_FMT_Y41P</constant></link><footnote>
+                     <para>Not to be confused with
+<constant>V4L2_PIX_FMT_YUV411P</constant>, which is a planar
+format.</para> </footnote></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_RAW</constant></entry>
+               <entry><para>None<footnote> <para>V4L explains this
+as: "RAW capture (BT848)"</para> </footnote></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV422P</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YUV422P"><constant>V4L2_PIX_FMT_YUV422P</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV411P</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YUV411P"><constant>V4L2_PIX_FMT_YUV411P</constant></link><footnote>
+                     <para>Not to be confused with
+<constant>V4L2_PIX_FMT_Y41P</constant>, which is a packed
+format.</para> </footnote></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV420P</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YVU420"><constant>V4L2_PIX_FMT_YVU420</constant></link></para></entry>
+             </row>
+             <row>
+               <entry><constant>VIDEO_PALETTE_YUV410P</constant></entry>
+               <entry><para><link
+linkend="V4L2-PIX-FMT-YVU410"><constant>V4L2_PIX_FMT_YVU410</constant></link></para></entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable></para>
+
+      <para>V4L2 image formats are defined in <xref
+linkend="pixfmt" />. The image format can be selected with the
+&VIDIOC-S-FMT; ioctl.</para>
+    </section>
+
+    <section>
+      <title>Audio</title>
+
+      <para>The <constant>VIDIOCGAUDIO</constant> and
+<constant>VIDIOCSAUDIO</constant> ioctl and struct
+<structname>video_audio</structname> are used to enumerate the
+audio inputs of a V4L device. The equivalent V4L2 ioctls are
+&VIDIOC-G-AUDIO; and &VIDIOC-S-AUDIO; using &v4l2-audio; as
+discussed in <xref linkend="audio" />.</para>
+
+      <para>The <structfield>audio</structfield> "channel number"
+field counting audio inputs was renamed to
+<structfield>index</structfield>.</para>
+
+      <para>On <constant>VIDIOCSAUDIO</constant> the
+<structfield>mode</structfield> field selects <emphasis>one</emphasis>
+of the <constant>VIDEO_SOUND_MONO</constant>,
+<constant>VIDEO_SOUND_STEREO</constant>,
+<constant>VIDEO_SOUND_LANG1</constant> or
+<constant>VIDEO_SOUND_LANG2</constant> audio demodulation modes. When
+the current audio standard is BTSC
+<constant>VIDEO_SOUND_LANG2</constant> refers to SAP and
+<constant>VIDEO_SOUND_LANG1</constant> is meaningless. Also
+undocumented in the V4L specification, there is no way to query the
+selected mode. On <constant>VIDIOCGAUDIO</constant> the driver returns
+the <emphasis>actually received</emphasis> audio programmes in this
+field. In the V4L2 API this information is stored in the &v4l2-tuner;
+<structfield>rxsubchans</structfield> and
+<structfield>audmode</structfield> fields, respectively. See <xref
+linkend="tuner" /> for more information on tuners. Related to audio
+modes &v4l2-audio; also reports if this is a mono or stereo
+input, regardless if the source is a tuner.</para>
+
+      <para>The following fields where replaced by V4L2 controls
+accessible with the &VIDIOC-QUERYCTRL;, &VIDIOC-G-CTRL; and
+&VIDIOC-S-CTRL; ioctls:<informaltable>
+         <tgroup cols="2">
+           <thead>
+             <row>
+               <entry>struct
+<structname>video_audio</structname></entry>
+               <entry>V4L2 Control ID</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry><structfield>volume</structfield></entry>
+               <entry><constant>V4L2_CID_AUDIO_VOLUME</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>bass</structfield></entry>
+               <entry><constant>V4L2_CID_AUDIO_BASS</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>treble</structfield></entry>
+               <entry><constant>V4L2_CID_AUDIO_TREBLE</constant></entry>
+             </row>
+             <row>
+               <entry><structfield>balance</structfield></entry>
+               <entry><constant>V4L2_CID_AUDIO_BALANCE</constant></entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable></para>
+
+      <para>To determine which of these controls are supported by a
+driver V4L provides the <structfield>flags</structfield>
+<constant>VIDEO_AUDIO_VOLUME</constant>,
+<constant>VIDEO_AUDIO_BASS</constant>,
+<constant>VIDEO_AUDIO_TREBLE</constant> and
+<constant>VIDEO_AUDIO_BALANCE</constant>. In the V4L2 API the
+&VIDIOC-QUERYCTRL; ioctl reports if the respective control is
+supported. Accordingly the <constant>VIDEO_AUDIO_MUTABLE</constant>
+and <constant>VIDEO_AUDIO_MUTE</constant> flags where replaced by the
+boolean <constant>V4L2_CID_AUDIO_MUTE</constant> control.</para>
+
+      <para>All V4L2 controls have a <structfield>step</structfield>
+attribute replacing the struct <structname>video_audio</structname>
+<structfield>step</structfield> field. The V4L audio controls are
+assumed to range from 0 to 65535 with no particular reset value. The
+V4L2 API permits arbitrary limits and defaults which can be queried
+with the &VIDIOC-QUERYCTRL; ioctl. For general information about
+controls see <xref linkend="control" />.</para>
+    </section>
+
+    <section>
+      <title>Frame Buffer Overlay</title>
+
+      <para>The V4L2 ioctls equivalent to
+<constant>VIDIOCGFBUF</constant> and <constant>VIDIOCSFBUF</constant>
+are &VIDIOC-G-FBUF; and &VIDIOC-S-FBUF;. The
+<structfield>base</structfield> field of struct
+<structname>video_buffer</structname> remained unchanged, except V4L2
+defines a flag to indicate non-destructive overlays instead of a
+<constant>NULL</constant> pointer. All other fields moved into the
+&v4l2-pix-format; <structfield>fmt</structfield> substructure of
+&v4l2-framebuffer;. The <structfield>depth</structfield> field was
+replaced by <structfield>pixelformat</structfield>. See <xref
+         linkend="pixfmt-rgb" /> for a list of RGB formats and their
+respective color depths.</para>
+
+      <para>Instead of the special ioctls
+<constant>VIDIOCGWIN</constant> and <constant>VIDIOCSWIN</constant>
+V4L2 uses the general-purpose data format negotiation ioctls
+&VIDIOC-G-FMT; and &VIDIOC-S-FMT;. They take a pointer to a
+&v4l2-format; as argument. Here the <structfield>win</structfield>
+member of the <structfield>fmt</structfield> union is used, a
+&v4l2-window;.</para>
+
+      <para>The <structfield>x</structfield>,
+<structfield>y</structfield>, <structfield>width</structfield> and
+<structfield>height</structfield> fields of struct
+<structname>video_window</structname> moved into &v4l2-rect;
+substructure <structfield>w</structfield> of struct
+<structname>v4l2_window</structname>. The
+<structfield>chromakey</structfield>,
+<structfield>clips</structfield>, and
+<structfield>clipcount</structfield> fields remained unchanged. Struct
+<structname>video_clip</structname> was renamed to &v4l2-clip;, also
+containing a struct <structname>v4l2_rect</structname>, but the
+semantics are still the same.</para>
+
+      <para>The <constant>VIDEO_WINDOW_INTERLACE</constant> flag was
+dropped. Instead applications must set the
+<structfield>field</structfield> field to
+<constant>V4L2_FIELD_ANY</constant> or
+<constant>V4L2_FIELD_INTERLACED</constant>. The
+<constant>VIDEO_WINDOW_CHROMAKEY</constant> flag moved into
+&v4l2-framebuffer;, under the new name
+<constant>V4L2_FBUF_FLAG_CHROMAKEY</constant>.</para>
+
+      <para>In V4L, storing a bitmap pointer in
+<structfield>clips</structfield> and setting
+<structfield>clipcount</structfield> to
+<constant>VIDEO_CLIP_BITMAP</constant> (-1) requests bitmap
+clipping, using a fixed size bitmap of 1024 &times; 625 bits. Struct
+<structname>v4l2_window</structname> has a separate
+<structfield>bitmap</structfield> pointer field for this purpose and
+the bitmap size is determined by <structfield>w.width</structfield> and
+<structfield>w.height</structfield>.</para>
+
+      <para>The <constant>VIDIOCCAPTURE</constant> ioctl to enable or
+disable overlay was renamed to &VIDIOC-OVERLAY;.</para>
+    </section>
+
+    <section>
+      <title>Cropping</title>
+
+      <para>To capture only a subsection of the full picture V4L
+defines the <constant>VIDIOCGCAPTURE</constant> and
+<constant>VIDIOCSCAPTURE</constant> ioctls using struct
+<structname>video_capture</structname>. The equivalent V4L2 ioctls are
+&VIDIOC-G-CROP; and &VIDIOC-S-CROP; using &v4l2-crop;, and the related
+&VIDIOC-CROPCAP; ioctl. This is a rather complex matter, see
+<xref linkend="crop" /> for details.</para>
+
+      <para>The <structfield>x</structfield>,
+<structfield>y</structfield>, <structfield>width</structfield> and
+<structfield>height</structfield> fields moved into &v4l2-rect;
+substructure <structfield>c</structfield> of struct
+<structname>v4l2_crop</structname>. The
+<structfield>decimation</structfield> field was dropped. In the V4L2
+API the scaling factor is implied by the size of the cropping
+rectangle and the size of the captured or overlaid image.</para>
+
+      <para>The <constant>VIDEO_CAPTURE_ODD</constant>
+and <constant>VIDEO_CAPTURE_EVEN</constant> flags to capture only the
+odd or even field, respectively, were replaced by
+<constant>V4L2_FIELD_TOP</constant> and
+<constant>V4L2_FIELD_BOTTOM</constant> in the field named
+<structfield>field</structfield> of &v4l2-pix-format; and
+&v4l2-window;. These structures are used to select a capture or
+overlay format with the &VIDIOC-S-FMT; ioctl.</para>
+    </section>
+
+    <section>
+      <title>Reading Images, Memory Mapping</title>
+
+      <section>
+       <title>Capturing using the read method</title>
+
+       <para>There is no essential difference between reading images
+from a V4L or V4L2 device using the &func-read; function, however V4L2
+drivers are not required to support this I/O method. Applications can
+determine if the function is available with the &VIDIOC-QUERYCAP;
+ioctl. All V4L2 devices exchanging data with applications must support
+the &func-select; and &func-poll; functions.</para>
+
+       <para>To select an image format and size, V4L provides the
+<constant>VIDIOCSPICT</constant> and <constant>VIDIOCSWIN</constant>
+ioctls. V4L2 uses the general-purpose data format negotiation ioctls
+&VIDIOC-G-FMT; and &VIDIOC-S-FMT;. They take a pointer to a
+&v4l2-format; as argument, here the &v4l2-pix-format; named
+<structfield>pix</structfield> of its <structfield>fmt</structfield>
+union is used.</para>
+
+       <para>For more information about the V4L2 read interface see
+<xref linkend="rw" />.</para>
+      </section>
+      <section>
+       <title>Capturing using memory mapping</title>
+
+       <para>Applications can read from V4L devices by mapping
+buffers in device memory, or more often just buffers allocated in
+DMA-able system memory, into their address space. This avoids the data
+copying overhead of the read method. V4L2 supports memory mapping as
+well, with a few differences.</para>
+
+       <informaltable>
+         <tgroup cols="2">
+           <thead>
+             <row>
+               <entry>V4L</entry>
+               <entry>V4L2</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row>
+               <entry></entry>
+               <entry>The image format must be selected before
+buffers are allocated, with the &VIDIOC-S-FMT; ioctl. When no format
+is selected the driver may use the last, possibly by another
+application requested format.</entry>
+             </row>
+             <row>
+               <entry><para>Applications cannot change the number of
+buffers. The it is built into the driver, unless it has a module
+option to change the number when the driver module is
+loaded.</para></entry>
+               <entry><para>The &VIDIOC-REQBUFS; ioctl allocates the
+desired number of buffers, this is a required step in the initialization
+sequence.</para></entry>
+             </row>
+             <row>
+               <entry><para>Drivers map all buffers as one contiguous
+range of memory. The <constant>VIDIOCGMBUF</constant> ioctl is
+available to query the number of buffers, the offset of each buffer
+from the start of the virtual file, and the overall amount of memory
+used, which can be used as arguments for the &func-mmap;
+function.</para></entry>
+               <entry><para>Buffers are individually mapped. The
+offset and size of each buffer can be determined with the
+&VIDIOC-QUERYBUF; ioctl.</para></entry>
+             </row>
+             <row>
+               <entry><para>The <constant>VIDIOCMCAPTURE</constant>
+ioctl prepares a buffer for capturing. It also determines the image
+format for this buffer. The ioctl returns immediately, eventually with
+an &EAGAIN; if no video signal had been detected. When the driver
+supports more than one buffer applications can call the ioctl multiple
+times and thus have multiple outstanding capture
+requests.</para><para>The <constant>VIDIOCSYNC</constant> ioctl
+suspends execution until a particular buffer has been
+filled.</para></entry>
+               <entry><para>Drivers maintain an incoming and outgoing
+queue. &VIDIOC-QBUF; enqueues any empty buffer into the incoming
+queue. Filled buffers are dequeued from the outgoing queue with the
+&VIDIOC-DQBUF; ioctl. To wait until filled buffers become available this
+function, &func-select; or &func-poll; can be used. The
+&VIDIOC-STREAMON; ioctl must be called once after enqueuing one or
+more buffers to start capturing. Its counterpart
+&VIDIOC-STREAMOFF; stops capturing and dequeues all buffers from both
+queues. Applications can query the signal status, if known, with the
+&VIDIOC-ENUMINPUT; ioctl.</para></entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </informaltable>
+
+       <para>For a more in-depth discussion of memory mapping and
+examples, see <xref linkend="mmap" />.</para>
+      </section>
+    </section>
+
+    <section>
+      <title>Reading Raw VBI Data</title>
+
+      <para>Originally the V4L API did not specify a raw VBI capture
+interface, only the device file <filename>/dev/vbi</filename> was
+reserved for this purpose. The only driver supporting this interface
+was the BTTV driver, de-facto defining the V4L VBI interface. Reading
+from the device yields a raw VBI image with the following
+parameters:<informaltable>
+           <tgroup cols="2">
+             <thead>
+               <row>
+                 <entry>&v4l2-vbi-format;</entry>
+                 <entry>V4L, BTTV driver</entry>
+               </row>
+             </thead>
+             <tbody valign="top">
+               <row>
+                 <entry>sampling_rate</entry>
+                 <entry>28636363&nbsp;Hz NTSC (or any other 525-line
+standard); 35468950&nbsp;Hz PAL and SECAM (625-line standards)</entry>
+               </row>
+               <row>
+                 <entry>offset</entry>
+                 <entry>?</entry>
+               </row>
+               <row>
+                 <entry>samples_per_line</entry>
+                 <entry>2048</entry>
+               </row>
+               <row>
+                 <entry>sample_format</entry>
+                 <entry>V4L2_PIX_FMT_GREY. The last four bytes (a
+machine endianess integer) contain a frame counter.</entry>
+               </row>
+               <row>
+                 <entry>start[]</entry>
+                 <entry>10, 273 NTSC; 22, 335 PAL and SECAM</entry>
+               </row>
+               <row>
+                 <entry>count[]</entry>
+                 <entry><para>16, 16<footnote><para>Old driver
+versions used different values, eventually the custom
+<constant>BTTV_VBISIZE</constant> ioctl was added to query the
+correct values.</para></footnote></para></entry>
+               </row>
+               <row>
+                 <entry>flags</entry>
+                 <entry>0</entry>
+               </row>
+             </tbody>
+           </tgroup>
+       </informaltable></para>
+
+      <para>Undocumented in the V4L specification, in Linux 2.3 the
+<constant>VIDIOCGVBIFMT</constant> and
+<constant>VIDIOCSVBIFMT</constant> ioctls using struct
+<structname>vbi_format</structname> were added to determine the VBI
+image parameters. These ioctls are only partially compatible with the
+V4L2 VBI interface specified in <xref linkend="raw-vbi" />.</para>
+
+      <para>An <structfield>offset</structfield> field does not
+exist, <structfield>sample_format</structfield> is supposed to be
+<constant>VIDEO_PALETTE_RAW</constant>, equivalent to
+<constant>V4L2_PIX_FMT_GREY</constant>. The remaining fields are
+probably equivalent to &v4l2-vbi-format;.</para>
+
+      <para>Apparently only the Zoran (ZR 36120) driver implements
+these ioctls. The semantics differ from those specified for V4L2 in two
+ways. The parameters are reset on &func-open; and
+<constant>VIDIOCSVBIFMT</constant> always returns an &EINVAL; if the
+parameters are invalid.</para>
+    </section>
+
+    <section>
+      <title>Miscellaneous</title>
+
+      <para>V4L2 has no equivalent of the
+<constant>VIDIOCGUNIT</constant> ioctl. Applications can find the VBI
+device associated with a video capture device (or vice versa) by
+reopening the device and requesting VBI data. For details see
+<xref linkend="open" />.</para>
+
+      <para>No replacement exists for <constant>VIDIOCKEY</constant>,
+and the V4L functions for microcode programming. A new interface for
+MPEG compression and playback devices is documented in <xref
+         linkend="extended-controls" />.</para>
+    </section>
+
+  </section>
+
+  <section id="hist-v4l2">
+    <title>Changes of the V4L2 API</title>
+
+    <para>Soon after the V4L API was added to the kernel it was
+criticised as too inflexible. In August 1998 Bill Dirks proposed a
+number of improvements and began to work on documentation, example
+drivers and applications. With the help of other volunteers this
+eventually became the V4L2 API, not just an extension but a
+replacement for the V4L API. However it took another four years and
+two stable kernel releases until the new API was finally accepted for
+inclusion into the kernel in its present form.</para>
+
+    <section>
+      <title>Early Versions</title>
+      <para>1998-08-20: First version.</para>
+
+      <para>1998-08-27: The &func-select; function was introduced.</para>
+
+      <para>1998-09-10: New video standard interface.</para>
+
+      <para>1998-09-18: The <constant>VIDIOC_NONCAP</constant> ioctl
+was replaced by the otherwise meaningless <constant>O_TRUNC</constant>
+&func-open; flag, and the aliases <constant>O_NONCAP</constant> and
+<constant>O_NOIO</constant> were defined. Applications can set this
+flag if they intend to access controls only, as opposed to capture
+applications which need exclusive access. The
+<constant>VIDEO_STD_XXX</constant> identifiers are now ordinals
+instead of flags, and the <function>video_std_construct()</function>
+helper function takes id and transmission arguments.</para>
+
+      <para>1998-09-28: Revamped video standard. Made video controls
+individually enumerable.</para>
+
+      <para>1998-10-02: The <structfield>id</structfield> field was
+removed from struct <structname>video_standard</structname> and the
+color subcarrier fields were renamed. The &VIDIOC-QUERYSTD; ioctl was
+renamed to &VIDIOC-ENUMSTD;, &VIDIOC-G-INPUT; to &VIDIOC-ENUMINPUT;. A
+first draft of the Codec API was released.</para>
+
+      <para>1998-11-08: Many minor changes. Most symbols have been
+renamed. Some material changes to &v4l2-capability;.</para>
+
+      <para>1998-11-12: The read/write directon of some ioctls was misdefined.</para>
+
+      <para>1998-11-14: <constant>V4L2_PIX_FMT_RGB24</constant>
+changed to <constant>V4L2_PIX_FMT_BGR24</constant>, and
+<constant>V4L2_PIX_FMT_RGB32</constant> changed to
+<constant>V4L2_PIX_FMT_BGR32</constant>. Audio controls are now
+accessible with the &VIDIOC-G-CTRL; and &VIDIOC-S-CTRL; ioctls under
+names starting with <constant>V4L2_CID_AUDIO</constant>. The
+<constant>V4L2_MAJOR</constant> define was removed from
+<filename>videodev.h</filename> since it was only used once in the
+<filename>videodev</filename> kernel module. The
+<constant>YUV422</constant> and <constant>YUV411</constant> planar
+image formats were added.</para>
+
+      <para>1998-11-28: A few ioctl symbols changed. Interfaces for codecs and
+video output devices were added.</para>
+
+      <para>1999-01-14: A raw VBI capture interface was added.</para>
+
+      <para>1999-01-19: The <constant>VIDIOC_NEXTBUF</constant> ioctl
+      was removed.</para>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.16 1999-01-31</title>
+      <para>1999-01-27: There is now one QBUF ioctl, VIDIOC_QWBUF and VIDIOC_QRBUF
+are gone. VIDIOC_QBUF takes a v4l2_buffer as a parameter. Added
+digital zoom (cropping) controls.</para>
+    </section>
+
+    <!-- Where's 0.17? mhs couldn't find that videodev.h, perhaps Bill
+        forgot to bump the version number or never released it. -->
+
+    <section>
+      <title>V4L2 Version 0.18 1999-03-16</title>
+      <para>Added a v4l to V4L2 ioctl compatibility layer to
+videodev.c. Driver writers, this changes how you implement your ioctl
+handler. See the Driver Writer's Guide. Added some more control id
+codes.</para>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.19 1999-06-05</title>
+      <para>1999-03-18: Fill in the category and catname fields of
+v4l2_queryctrl objects before passing them to the driver. Required a
+minor change to the VIDIOC_QUERYCTRL handlers in the sample
+drivers.</para>
+      <para>1999-03-31: Better compatibility for v4l memory capture
+ioctls. Requires changes to drivers to fully support new compatibility
+features, see Driver Writer's Guide and v4l2cap.c. Added new control
+IDs: V4L2_CID_HFLIP, _VFLIP. Changed V4L2_PIX_FMT_YUV422P to _YUV422P,
+and _YUV411P to _YUV411P.</para>
+      <para>1999-04-04: Added a few more control IDs.</para>
+      <para>1999-04-07: Added the button control type.</para>
+      <para>1999-05-02: Fixed a typo in videodev.h, and added the
+V4L2_CTRL_FLAG_GRAYED (later V4L2_CTRL_FLAG_GRABBED) flag.</para>
+      <para>1999-05-20: Definition of VIDIOC_G_CTRL was wrong causing
+a malfunction of this ioctl.</para>
+      <para>1999-06-05: Changed the value of
+V4L2_CID_WHITENESS.</para>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.20 (1999-09-10)</title>
+
+      <para>Version 0.20 introduced a number of changes which were
+<emphasis>not backward compatible</emphasis> with 0.19 and earlier
+versions. Purpose of these changes was to simplify the API, while
+making it more extensible and following common Linux driver API
+conventions.</para>
+
+      <orderedlist>
+       <listitem>
+         <para>Some typos in <constant>V4L2_FMT_FLAG</constant>
+symbols were fixed. &v4l2-clip; was changed for compatibility with
+v4l. (1999-08-30)</para>
+       </listitem>
+
+       <listitem>
+         <para><constant>V4L2_TUNER_SUB_LANG1</constant> was added.
+(1999-09-05)</para>
+       </listitem>
+
+       <listitem>
+         <para>All ioctl() commands that used an integer argument now
+take a pointer to an integer. Where it makes sense, ioctls will return
+the actual new value in the integer pointed to by the argument, a
+common convention in the V4L2 API. The affected ioctls are:
+VIDIOC_PREVIEW, VIDIOC_STREAMON, VIDIOC_STREAMOFF, VIDIOC_S_FREQ,
+VIDIOC_S_INPUT, VIDIOC_S_OUTPUT, VIDIOC_S_EFFECT. For example
+<programlisting>
+err = ioctl (fd, VIDIOC_XXX, V4L2_XXX);
+</programlisting> becomes <programlisting>
+int a = V4L2_XXX; err = ioctl(fd, VIDIOC_XXX, &amp;a);
+</programlisting>
+         </para>
+       </listitem>
+
+       <listitem>
+         <para>All the different get- and set-format commands were
+swept into one &VIDIOC-G-FMT; and &VIDIOC-S-FMT; ioctl taking a union
+and a type field selecting the union member as parameter. Purpose is to
+simplify the API by eliminating several ioctls and to allow new and
+driver private data streams without adding new ioctls.</para>
+
+         <para>This change obsoletes the following ioctls:
+<constant>VIDIOC_S_INFMT</constant>,
+<constant>VIDIOC_G_INFMT</constant>,
+<constant>VIDIOC_S_OUTFMT</constant>,
+<constant>VIDIOC_G_OUTFMT</constant>,
+<constant>VIDIOC_S_VBIFMT</constant> and
+<constant>VIDIOC_G_VBIFMT</constant>. The image format structure
+<structname>v4l2_format</structname> was renamed to &v4l2-pix-format;,
+while &v4l2-format; is now the envelopping structure for all format
+negotiations.</para>
+       </listitem>
+
+       <listitem>
+         <para>Similar to the changes above, the
+<constant>VIDIOC_G_PARM</constant> and
+<constant>VIDIOC_S_PARM</constant> ioctls were merged with
+<constant>VIDIOC_G_OUTPARM</constant> and
+<constant>VIDIOC_S_OUTPARM</constant>. A
+<structfield>type</structfield> field in the new &v4l2-streamparm;
+selects the respective union member.</para>
+
+         <para>This change obsoletes the
+<constant>VIDIOC_G_OUTPARM</constant> and
+<constant>VIDIOC_S_OUTPARM</constant> ioctls.</para>
+       </listitem>
+
+       <listitem>
+         <para>Control enumeration was simplified, and two new
+control flags were introduced and one dropped. The
+<structfield>catname</structfield> field was replaced by a
+<structfield>group</structfield> field.</para>
+
+         <para>Drivers can now flag unsupported and temporarily
+unavailable controls with <constant>V4L2_CTRL_FLAG_DISABLED</constant>
+and <constant>V4L2_CTRL_FLAG_GRABBED</constant> respectively. The
+<structfield>group</structfield> name indicates a possibly narrower
+classification than the <structfield>category</structfield>. In other
+words, there may be multiple groups within a category. Controls within
+a group would typically be drawn within a group box. Controls in
+different categories might have a greater separation, or may even
+appear in separate windows.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &v4l2-buffer; <structfield>timestamp</structfield>
+was changed to a 64 bit integer, containing the sampling or output
+time of the frame in nanoseconds. Additionally timestamps will be in
+absolute system time, not starting from zero at the beginning of a
+stream. The data type name for timestamps is stamp_t, defined as a
+signed 64-bit integer. Output devices should not send a buffer out
+until the time in the timestamp field has arrived. I would like to
+follow SGI's lead, and adopt a multimedia timestamping system like
+their UST (Unadjusted System Time). See
+http://reality.sgi.com/cpirazzi_engr/lg/time/intro.html. [This link is
+no longer valid.] UST uses timestamps that are 64-bit signed integers
+(not struct timeval's) and given in nanosecond units. The UST clock
+starts at zero when the system is booted and runs continuously and
+uniformly. It takes a little over 292 years for UST to overflow. There
+is no way to set the UST clock. The regular Linux time-of-day clock
+can be changed periodically, which would cause errors if it were being
+used for timestamping a multimedia stream. A real UST style clock will
+require some support in the kernel that is not there yet. But in
+anticipation, I will change the timestamp field to a 64-bit integer,
+and I will change the v4l2_masterclock_gettime() function (used only
+by drivers) to return a 64-bit integer.</para>
+       </listitem>
+
+       <listitem>
+         <para>A <structfield>sequence</structfield> field was added
+to &v4l2-buffer;. The <structfield>sequence</structfield> field counts
+captured frames, it is ignored by output devices. When a capture
+driver drops a frame, the sequence number of that frame is
+skipped.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.20 incremental changes</title>
+      <!-- Version number didn't change anymore, reason unknown. -->
+
+      <para>1999-12-23: In &v4l2-vbi-format; the
+<structfield>reserved1</structfield> field became
+<structfield>offset</structfield>. Previously drivers were required to
+clear the <structfield>reserved1</structfield> field.</para>
+
+      <para>2000-01-13: The
+      <constant>V4L2_FMT_FLAG_NOT_INTERLACED</constant> flag was added.</para>
+
+      <para>2000-07-31: The <filename>linux/poll.h</filename> header
+is now included by <filename>videodev.h</filename> for compatibility
+with the original <filename>videodev.h</filename> file.</para>
+
+      <para>2000-11-20: <constant>V4L2_TYPE_VBI_OUTPUT</constant> and
+<constant>V4L2_PIX_FMT_Y41P</constant> were added.</para>
+
+      <para>2000-11-25: <constant>V4L2_TYPE_VBI_INPUT</constant> was
+added.</para>
+
+      <para>2000-12-04: A couple typos in symbol names were fixed.</para>
+
+      <para>2001-01-18: To avoid namespace conflicts the
+<constant>fourcc</constant> macro defined in the
+<filename>videodev.h</filename> header file was renamed to
+<constant>v4l2_fourcc</constant>.</para>
+
+      <para>2001-01-25: A possible driver-level compatibility problem
+between the <filename>videodev.h</filename> file in Linux 2.4.0 and
+the <filename>videodev.h</filename> file included in the
+<filename>videodevX</filename> patch was fixed. Users of an earlier
+version of <filename>videodevX</filename> on Linux 2.4.0 should
+recompile their V4L and V4L2 drivers.</para>
+
+      <para>2001-01-26: A possible kernel-level incompatibility
+between the <filename>videodev.h</filename> file in the
+<filename>videodevX</filename> patch and the
+<filename>videodev.h</filename> file in Linux 2.2.x with devfs patches
+applied was fixed.</para>
+
+      <para>2001-03-02: Certain V4L ioctls which pass data in both
+direction although they are defined with read-only parameter, did not
+work correctly through the backward compatibility layer.
+[Solution?]</para>
+
+      <para>2001-04-13: Big endian 16-bit RGB formats were added.</para>
+
+      <para>2001-09-17: New YUV formats and the &VIDIOC-G-FREQUENCY; and
+&VIDIOC-S-FREQUENCY; ioctls were added. (The old
+<constant>VIDIOC_G_FREQ</constant> and
+<constant>VIDIOC_S_FREQ</constant> ioctls did not take multiple tuners
+into account.)</para>
+
+      <para>2000-09-18: <constant>V4L2_BUF_TYPE_VBI</constant> was
+added. This may <emphasis>break compatibility</emphasis> as the
+&VIDIOC-G-FMT; and &VIDIOC-S-FMT; ioctls may fail now if the struct
+<structname>v4l2_fmt</structname> <structfield>type</structfield>
+field does not contain <constant>V4L2_BUF_TYPE_VBI</constant>. In the
+documentation of the &v4l2-vbi-format;
+<structfield>offset</structfield> field the ambiguous phrase "rising
+edge" was changed to "leading edge".</para>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.20 2000-11-23</title>
+
+      <para>A number of changes were made to the raw VBI
+interface.</para>
+
+      <orderedlist>
+       <listitem>
+         <para>Figures clarifying the line numbering scheme were
+added to the V4L2 API specification. The
+<structfield>start</structfield>[0] and
+<structfield>start</structfield>[1] fields no longer count line
+numbers beginning at zero. Rationale: a) The previous definition was
+unclear. b) The <structfield>start</structfield>[] values are ordinal
+numbers. c) There is no point in inventing a new line numbering
+scheme. We now use line number as defined by ITU-R, period.
+Compatibility: Add one to the start values. Applications depending on
+the previous semantics may not function correctly.</para>
+       </listitem>
+
+       <listitem>
+         <para>The restriction "count[0] &gt; 0 and count[1] &gt; 0"
+has been relaxed  to "(count[0] + count[1]) &gt; 0". Rationale:
+Drivers may allocate resources at scan line granularity and some data
+services are transmitted only on the first field. The comment that
+both <structfield>count</structfield> values will usually be equal is
+misleading and pointless and has been removed. This change
+<emphasis>breaks compatibility</emphasis> with earlier versions:
+Drivers may return EINVAL, applications may not function
+correctly.</para>
+       </listitem>
+
+       <listitem>
+         <para>Drivers are again permitted to return negative
+(unknown) start values as proposed earlier. Why this feature was
+dropped is unclear. This change may <emphasis>break
+compatibility</emphasis> with applications depending on the start
+values being positive. The use of <constant>EBUSY</constant> and
+<constant>EINVAL</constant> error codes with the &VIDIOC-S-FMT; ioctl
+was clarified. The &EBUSY; was finally documented, and the
+<structfield>reserved2</structfield> field which was previously
+mentioned only in the <filename>videodev.h</filename> header
+file.</para>
+       </listitem>
+
+       <listitem>
+         <para>New buffer types
+<constant>V4L2_TYPE_VBI_INPUT</constant> and
+<constant>V4L2_TYPE_VBI_OUTPUT</constant> were added. The former is an
+alias for the old <constant>V4L2_TYPE_VBI</constant>, the latter was
+missing in the <filename>videodev.h</filename> file.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 Version 0.20 2002-07-25</title>
+      <para>Added sliced VBI interface proposal.</para>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.5.46, 2002-10</title>
+
+      <para>Around October-November 2002, prior to an announced
+feature freeze of Linux 2.5, the API was revised, drawing from
+experience with V4L2 0.20. This unnamed version was finally merged
+into Linux 2.5.46.</para>
+
+      <orderedlist>
+       <listitem>
+         <para>As specified in <xref linkend="related" />, drivers
+must make related device functions available under all minor device
+numbers.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &func-open; function requires access mode
+<constant>O_RDWR</constant> regardless of the device type. All V4L2
+drivers exchanging data with applications must support the
+<constant>O_NONBLOCK</constant> flag. The <constant>O_NOIO</constant>
+flag, a V4L2 symbol which aliased the meaningless
+<constant>O_TRUNC</constant> to indicate accesses without data
+exchange (panel applications) was dropped. Drivers must stay in "panel
+mode" until the application attempts to initiate a data exchange, see
+<xref linkend="open" />.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &v4l2-capability; changed dramatically. Note that
+also the size of the structure changed, which is encoded in the ioctl
+request code, thus older V4L2 devices will respond with an &EINVAL; to
+the new &VIDIOC-QUERYCAP; ioctl.</para>
+
+         <para>There are new fields to identify the driver, a new RDS
+device function <constant>V4L2_CAP_RDS_CAPTURE</constant>, the
+<constant>V4L2_CAP_AUDIO</constant> flag indicates if the device has
+any audio connectors, another I/O capability
+<constant>V4L2_CAP_ASYNCIO</constant> can be flagged. In response to
+these changes the <structfield>type</structfield> field became a bit
+set and was merged into the <structfield>flags</structfield> field.
+<constant>V4L2_FLAG_TUNER</constant> was renamed to
+<constant>V4L2_CAP_TUNER</constant>,
+<constant>V4L2_CAP_VIDEO_OVERLAY</constant> replaced
+<constant>V4L2_FLAG_PREVIEW</constant> and
+<constant>V4L2_CAP_VBI_CAPTURE</constant> and
+<constant>V4L2_CAP_VBI_OUTPUT</constant> replaced
+<constant>V4L2_FLAG_DATA_SERVICE</constant>.
+<constant>V4L2_FLAG_READ</constant> and
+<constant>V4L2_FLAG_WRITE</constant> were merged into
+<constant>V4L2_CAP_READWRITE</constant>.</para>
+
+         <para>The redundant fields
+<structfield>inputs</structfield>, <structfield>outputs</structfield>
+and <structfield>audios</structfield> were removed. These properties
+can be determined as described in <xref linkend="video" /> and <xref
+linkend="audio" />.</para>
+
+         <para>The somewhat volatile and therefore barely useful
+fields <structfield>maxwidth</structfield>,
+<structfield>maxheight</structfield>,
+<structfield>minwidth</structfield>,
+<structfield>minheight</structfield>,
+<structfield>maxframerate</structfield> were removed. This information
+is available as described in <xref linkend="format" /> and
+<xref linkend="standard" />.</para>
+
+         <para><constant>V4L2_FLAG_SELECT</constant> was removed. We
+believe the select() function is important enough to require support
+of it in all V4L2 drivers exchanging data with applications. The
+redundant <constant>V4L2_FLAG_MONOCHROME</constant> flag was removed,
+this information is available as described in <xref
+             linkend="format" />.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-input; the
+<structfield>assoc_audio</structfield> field and the
+<structfield>capability</structfield> field and its only flag
+<constant>V4L2_INPUT_CAP_AUDIO</constant> was replaced by the new
+<structfield>audioset</structfield> field. Instead of linking one
+video input to one audio input this field reports all audio inputs
+this video input combines with.</para>
+
+         <para>New fields are <structfield>tuner</structfield>
+(reversing the former link from tuners to video inputs),
+<structfield>std</structfield> and
+<structfield>status</structfield>.</para>
+
+         <para>Accordingly &v4l2-output; lost its
+<structfield>capability</structfield> and
+<structfield>assoc_audio</structfield> fields.
+<structfield>audioset</structfield>,
+<structfield>modulator</structfield> and
+<structfield>std</structfield> where added instead.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &v4l2-audio; field
+<structfield>audio</structfield> was renamed to
+<structfield>index</structfield>, for consistency with other
+structures. A new capability flag
+<constant>V4L2_AUDCAP_STEREO</constant> was added to indicated if the
+audio input in question supports stereo sound.
+<constant>V4L2_AUDCAP_EFFECTS</constant> and the corresponding
+<constant>V4L2_AUDMODE</constant> flags where removed. This can be
+easily implemented using controls. (However the same applies to AVL
+which is still there.)</para>
+
+         <para>Again for consistency the &v4l2-audioout; field
+<structfield>audio</structfield> was renamed to
+<structfield>index</structfield>.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &v4l2-tuner;
+<structfield>input</structfield> field was replaced by an
+<structfield>index</structfield> field, permitting devices with
+multiple tuners. The link between video inputs and tuners is now
+reversed, inputs point to their tuner. The
+<structfield>std</structfield> substructure became a
+simple set (more about this below) and moved into &v4l2-input;. A
+<structfield>type</structfield> field was added.</para>
+
+         <para>Accordingly in &v4l2-modulator; the
+<structfield>output</structfield> was replaced by an
+<structfield>index</structfield> field.</para>
+
+         <para>In &v4l2-frequency; the
+<structfield>port</structfield> field was replaced by a
+<structfield>tuner</structfield> field containing the respective tuner
+or modulator index number. A tuner <structfield>type</structfield>
+field was added and the <structfield>reserved</structfield> field
+became larger for future extensions (satellite tuners in
+particular).</para>
+       </listitem>
+
+       <listitem>
+         <para>The idea of completely transparent video standards was
+dropped. Experience showed that applications must be able to work with
+video standards beyond presenting the user a menu. Instead of
+enumerating supported standards with an ioctl applications can now
+refer to standards by &v4l2-std-id; and symbols defined in the
+<filename>videodev2.h</filename> header file. For details see <xref
+             linkend="standard" />. The &VIDIOC-G-STD; and
+&VIDIOC-S-STD; now take a pointer to this type as argument.
+&VIDIOC-QUERYSTD; was added to autodetect the received standard, if
+the hardware has this capability. In &v4l2-standard; an
+<structfield>index</structfield> field was added for &VIDIOC-ENUMSTD;.
+A &v4l2-std-id; field named <structfield>id</structfield> was added as
+machine readable identifier, also replacing the
+<structfield>transmission</structfield> field. The misleading
+<structfield>framerate</structfield> field was renamed
+to <structfield>frameperiod</structfield>. The now obsolete
+<structfield>colorstandard</structfield> information, originally
+needed to distguish between variations of standards, were
+removed.</para>
+
+         <para>Struct <structname>v4l2_enumstd</structname> ceased to
+be. &VIDIOC-ENUMSTD; now takes a pointer to a &v4l2-standard;
+directly. The information which standards are supported by a
+particular video input or output moved into &v4l2-input; and
+&v4l2-output; fields named <structfield>std</structfield>,
+respectively.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &v4l2-queryctrl; fields
+<structfield>category</structfield> and
+<structfield>group</structfield> did not catch on and/or were not
+implemented as expected and therefore removed.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &VIDIOC-TRY-FMT; ioctl was added to negotiate data
+formats as with &VIDIOC-S-FMT;, but without the overhead of
+programming the hardware and regardless of I/O in progress.</para>
+
+         <para>In &v4l2-format; the <structfield>fmt</structfield>
+union was extended to contain &v4l2-window;. All image format
+negotiations are now possible with <constant>VIDIOC_G_FMT</constant>,
+<constant>VIDIOC_S_FMT</constant> and
+<constant>VIDIOC_TRY_FMT</constant>; ioctl. The
+<constant>VIDIOC_G_WIN</constant> and
+<constant>VIDIOC_S_WIN</constant> ioctls to prepare for a video
+overlay were removed. The <structfield>type</structfield> field
+changed to type &v4l2-buf-type; and the buffer type names changed as
+follows.<informaltable>
+             <tgroup cols="2">
+               <thead>
+                 <row>
+                   <entry>Old defines</entry>
+                   <entry>&v4l2-buf-type;</entry>
+                 </row>
+               </thead>
+               <tbody valign="top">
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_CAPTURE</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_CODECIN</constant></entry>
+                   <entry>Omitted for now</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_CODECOUT</constant></entry>
+                   <entry>Omitted for now</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_EFFECTSIN</constant></entry>
+                   <entry>Omitted for now</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_EFFECTSIN2</constant></entry>
+                   <entry>Omitted for now</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_EFFECTSOUT</constant></entry>
+                   <entry>Omitted for now</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_VIDEOOUT</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_VBI_CAPTURE</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_VBI_OUTPUT</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_SLICED_VBI_CAPTURE</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_SLICED_VBI_OUTPUT</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_BUF_TYPE_PRIVATE_BASE</constant></entry>
+                   <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry>
+                 </row>
+               </tbody>
+             </tgroup>
+           </informaltable></para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-fmtdesc; a &v4l2-buf-type; field named
+<structfield>type</structfield> was added as in &v4l2-format;. The
+<constant>VIDIOC_ENUM_FBUFFMT</constant> ioctl is no longer needed and
+was removed. These calls can be replaced by &VIDIOC-ENUM-FMT; with
+type <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-pix-format; the
+<structfield>depth</structfield> field was removed, assuming
+applications which recognize the format by its four-character-code
+already know the color depth, and others do not care about it. The
+same rationale lead to the removal of the
+<constant>V4L2_FMT_FLAG_COMPRESSED</constant> flag. The
+<constant>V4L2_FMT_FLAG_SWCONVECOMPRESSED</constant> flag was removed
+because drivers are not supposed to convert images in kernel space. A
+user library of conversion functions should be provided instead. The
+<constant>V4L2_FMT_FLAG_BYTESPERLINE</constant> flag was redundant.
+Applications can set the <structfield>bytesperline</structfield> field
+to zero to get a reasonable default. Since the remaining flags were
+replaced as well, the <structfield>flags</structfield> field itself
+was removed.</para>
+         <para>The interlace flags were replaced by a &v4l2-field;
+value in a newly added <structfield>field</structfield>
+field.<informaltable>
+             <tgroup cols="2">
+               <thead>
+                 <row>
+                   <entry>Old flag</entry>
+                   <entry>&v4l2-field;</entry>
+                 </row>
+               </thead>
+               <tbody valign="top">
+                 <row>
+                   <entry><constant>V4L2_FMT_FLAG_NOT_INTERLACED</constant></entry>
+                   <entry>?</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_FMT_FLAG_INTERLACED</constant>
+= <constant>V4L2_FMT_FLAG_COMBINED</constant></entry>
+                   <entry><constant>V4L2_FIELD_INTERLACED</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_FMT_FLAG_TOPFIELD</constant>
+= <constant>V4L2_FMT_FLAG_ODDFIELD</constant></entry>
+                   <entry><constant>V4L2_FIELD_TOP</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_FMT_FLAG_BOTFIELD</constant>
+= <constant>V4L2_FMT_FLAG_EVENFIELD</constant></entry>
+                   <entry><constant>V4L2_FIELD_BOTTOM</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_FIELD_SEQ_TB</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_FIELD_SEQ_BT</constant></entry>
+                 </row>
+                 <row>
+                   <entry><constant>-</constant></entry>
+                   <entry><constant>V4L2_FIELD_ALTERNATE</constant></entry>
+                 </row>
+               </tbody>
+             </tgroup>
+           </informaltable></para>
+
+         <para>The color space flags were replaced by a
+&v4l2-colorspace; value in a newly added
+<structfield>colorspace</structfield> field, where one of
+<constant>V4L2_COLORSPACE_SMPTE170M</constant>,
+<constant>V4L2_COLORSPACE_BT878</constant>,
+<constant>V4L2_COLORSPACE_470_SYSTEM_M</constant> or
+<constant>V4L2_COLORSPACE_470_SYSTEM_BG</constant> replaces
+<constant>V4L2_FMT_CS_601YUV</constant>.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-requestbuffers; the
+<structfield>type</structfield> field was properly defined as
+&v4l2-buf-type;. Buffer types changed as mentioned above. A new
+<structfield>memory</structfield> field of type &v4l2-memory; was
+added to distinguish between I/O methods using buffers allocated
+by the driver or the application. See <xref linkend="io" /> for
+details.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-buffer; the <structfield>type</structfield>
+field was properly defined as &v4l2-buf-type;. Buffer types changed as
+mentioned above. A <structfield>field</structfield> field of type
+&v4l2-field; was added to indicate if a buffer contains a top or
+bottom field. The old field flags were removed. Since no unadjusted
+system time clock was added to the kernel as planned, the
+<structfield>timestamp</structfield> field changed back from type
+stamp_t, an unsigned 64 bit integer expressing the sample time in
+nanoseconds, to struct <structname>timeval</structname>. With the
+addition of a second memory mapping method the
+<structfield>offset</structfield> field moved into union
+<structfield>m</structfield>, and a new
+<structfield>memory</structfield> field of type &v4l2-memory; was
+added to distinguish between I/O methods. See <xref linkend="io" />
+for details.</para>
+
+         <para>The <constant>V4L2_BUF_REQ_CONTIG</constant>
+flag was used by the V4L compatibility layer, after changes to this
+code it was no longer needed. The
+<constant>V4L2_BUF_ATTR_DEVICEMEM</constant> flag would indicate if
+the buffer was indeed allocated in device memory rather than DMA-able
+system memory. It was barely useful and so was removed.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-framebuffer; the
+<structfield>base[3]</structfield> array anticipating double- and
+triple-buffering in off-screen video memory, however without defining
+a synchronization mechanism, was replaced by a single pointer. The
+<constant>V4L2_FBUF_CAP_SCALEUP</constant> and
+<constant>V4L2_FBUF_CAP_SCALEDOWN</constant> flags were removed.
+Applications can determine this capability more accurately using the
+new cropping and scaling interface. The
+<constant>V4L2_FBUF_CAP_CLIPPING</constant> flag was replaced by
+<constant>V4L2_FBUF_CAP_LIST_CLIPPING</constant> and
+<constant>V4L2_FBUF_CAP_BITMAP_CLIPPING</constant>.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-clip; the <structfield>x</structfield>,
+<structfield>y</structfield>, <structfield>width</structfield> and
+<structfield>height</structfield> field moved into a
+<structfield>c</structfield> substructure of type &v4l2-rect;. The
+<structfield>x</structfield> and <structfield>y</structfield> fields
+were renamed to <structfield>left</structfield> and
+<structfield>top</structfield>, &ie; offsets to a context dependent
+origin.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-window; the <structfield>x</structfield>,
+<structfield>y</structfield>, <structfield>width</structfield> and
+<structfield>height</structfield> field moved into a
+<structfield>w</structfield> substructure as above. A
+<structfield>field</structfield> field of type %v4l2-field; was added
+to distinguish between field and frame (interlaced) overlay.</para>
+       </listitem>
+
+       <listitem>
+         <para>The digital zoom interface, including struct
+<structname>v4l2_zoomcap</structname>, struct
+<structname>v4l2_zoom</structname>,
+<constant>V4L2_ZOOM_NONCAP</constant> and
+<constant>V4L2_ZOOM_WHILESTREAMING</constant> was replaced by a new
+cropping and scaling interface. The previously unused struct
+<structname>v4l2_cropcap</structname> and
+<structname>v4l2_crop</structname> where redefined for this purpose.
+See <xref linkend="crop" /> for details.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-vbi-format; the
+<structfield>SAMPLE_FORMAT</structfield> field now contains a
+four-character-code as used to identify video image formats and
+<constant>V4L2_PIX_FMT_GREY</constant> replaces the
+<constant>V4L2_VBI_SF_UBYTE</constant> define. The
+<structfield>reserved</structfield> field was extended.</para>
+       </listitem>
+
+       <listitem>
+         <para>In &v4l2-captureparm; the type of the
+<structfield>timeperframe</structfield> field changed from unsigned
+long to &v4l2-fract;. This allows the accurate expression of multiples
+of the NTSC-M frame rate 30000 / 1001. A new field
+<structfield>readbuffers</structfield> was added to control the driver
+behaviour in read I/O mode.</para>
+
+         <para>Similar changes were made to &v4l2-outputparm;.</para>
+       </listitem>
+
+       <listitem>
+         <para>The struct <structname>v4l2_performance</structname>
+and <constant>VIDIOC_G_PERF</constant> ioctl were dropped. Except when
+using the <link linkend="rw">read/write I/O method</link>, which is
+limited anyway, this information is already available to
+applications.</para>
+       </listitem>
+
+       <listitem>
+         <para>The example transformation from RGB to YCbCr color
+space in the old V4L2 documentation was inaccurate, this has been
+corrected in <xref linkend="pixfmt" />.<!-- 0.5670G should be
+0.587, and 127/112 != 255/224 --></para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 2003-06-19</title>
+
+      <orderedlist>
+       <listitem>
+         <para>A new capability flag
+<constant>V4L2_CAP_RADIO</constant> was added for radio devices. Prior
+to this change radio devices would identify solely by having exactly one
+tuner whose type field reads <constant>V4L2_TUNER_RADIO</constant>.</para>
+       </listitem>
+
+       <listitem>
+         <para>An optional driver access priority mechanism was
+added, see <xref linkend="app-pri" /> for details.</para>
+       </listitem>
+
+       <listitem>
+         <para>The audio input and output interface was found to be
+incomplete.</para>
+         <para>Previously the &VIDIOC-G-AUDIO;
+ioctl would enumerate the available audio inputs. An ioctl to
+determine the current audio input, if more than one combines with the
+current video input, did not exist. So
+<constant>VIDIOC_G_AUDIO</constant> was renamed to
+<constant>VIDIOC_G_AUDIO_OLD</constant>, this ioctl will be removed in
+the future. The &VIDIOC-ENUMAUDIO; ioctl was added to enumerate
+audio inputs, while &VIDIOC-G-AUDIO; now reports the current audio
+input.</para>
+         <para>The same changes were made to &VIDIOC-G-AUDOUT; and
+&VIDIOC-ENUMAUDOUT;.</para>
+         <para>Until further the "videodev" module will automatically
+translate between the old and new ioctls, but drivers and applications
+must be updated to successfully compile again.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &VIDIOC-OVERLAY; ioctl was incorrectly defined with
+write-read parameter. It was changed to write-only, while the write-read
+version was renamed to <constant>VIDIOC_OVERLAY_OLD</constant>. The old
+ioctl will be removed in the future. Until further the "videodev"
+kernel module will automatically translate to the new version, so drivers
+must be recompiled, but not applications.</para>
+       </listitem>
+
+       <listitem>
+         <para><xref linkend="overlay" /> incorrectly stated that
+clipping rectangles define regions where the video can be seen.
+Correct is that clipping rectangles define regions where
+<emphasis>no</emphasis> video shall be displayed and so the graphics
+surface can be seen.</para>
+       </listitem>
+
+       <listitem>
+         <para>The &VIDIOC-S-PARM; and &VIDIOC-S-CTRL; ioctls were
+defined with write-only parameter, inconsistent with other ioctls
+modifying their argument. They were changed to write-read, while a
+<constant>_OLD</constant> suffix was added to the write-only versions.
+The old ioctls will be removed in the future. Drivers and
+applications assuming a constant parameter need an update.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 2003-11-05</title>
+      <orderedlist>
+       <listitem>
+         <para>In <xref linkend="pixfmt-rgb" /> the following pixel
+formats were incorrectly transferred from Bill Dirks' V4L2
+specification. Descriptions below refer to bytes in memory, in
+ascending address order.<informaltable>
+             <tgroup cols="3">
+               <thead>
+                 <row>
+                   <entry>Symbol</entry>
+                   <entry>In this document prior to revision
+0.5</entry>
+                   <entry>Corrected</entry>
+                 </row>
+               </thead>
+               <tbody valign="top">
+                 <row>
+                   <entry><constant>V4L2_PIX_FMT_RGB24</constant></entry>
+                   <entry>B, G, R</entry>
+                   <entry>R, G, B</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
+                   <entry>R, G, B</entry>
+                   <entry>B, G, R</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_PIX_FMT_RGB32</constant></entry>
+                   <entry>B, G, R, X</entry>
+                   <entry>R, G, B, X</entry>
+                 </row>
+                 <row>
+                   <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>
+                   <entry>R, G, B, X</entry>
+                   <entry>B, G, R, X</entry>
+                 </row>
+               </tbody>
+             </tgroup>
+           </informaltable> The
+<constant>V4L2_PIX_FMT_BGR24</constant> example was always
+correct.</para>
+         <para>In <xref linkend="v4l-image-properties" /> the mapping
+of the V4L <constant>VIDEO_PALETTE_RGB24</constant> and
+<constant>VIDEO_PALETTE_RGB32</constant> formats to V4L2 pixel formats
+was accordingly corrected.</para>
+       </listitem>
+
+       <listitem>
+         <para>Unrelated to the fixes above, drivers may still
+interpret some V4L2 RGB pixel formats differently. These issues have
+yet to be addressed, for details see <xref
+             linkend="pixfmt-rgb" />.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.6, 2004-05-09</title>
+      <orderedlist>
+       <listitem>
+         <para>The &VIDIOC-CROPCAP; ioctl was incorrectly defined
+with read-only parameter. It is now defined as write-read ioctl, while
+the read-only version was renamed to
+<constant>VIDIOC_CROPCAP_OLD</constant>. The old ioctl will be removed
+in the future.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.8</title>
+      <orderedlist>
+       <listitem>
+         <para>A new field <structfield>input</structfield> (former
+<structfield>reserved[0]</structfield>) was added to the &v4l2-buffer;
+structure. Purpose of this field is to alternate between video inputs
+(&eg; cameras) in step with the video capturing process. This function
+must be enabled with the new <constant>V4L2_BUF_FLAG_INPUT</constant>
+flag. The <structfield>flags</structfield> field is no longer
+read-only.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2004-08-01</title>
+
+      <orderedlist>
+       <listitem>
+         <para>The return value of the
+<xref linkend="func-open" /> function was incorrectly documented.</para>
+       </listitem>
+
+       <listitem>
+         <para>Audio output ioctls end in -AUDOUT, not -AUDIOOUT.</para>
+       </listitem>
+
+       <listitem>
+         <para>In the Current Audio Input example the
+<constant>VIDIOC_G_AUDIO</constant> ioctl took the wrong
+argument.</para>
+       </listitem>
+
+       <listitem>
+         <para>The documentation of the &VIDIOC-QBUF; and
+&VIDIOC-DQBUF; ioctls did not mention the &v4l2-buffer;
+<structfield>memory</structfield> field. It was also missing from
+examples. Also on the <constant>VIDIOC_DQBUF</constant> page the &EIO;
+was not documented.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.14</title>
+      <orderedlist>
+       <listitem>
+         <para>A new sliced VBI interface was added. It is documented
+in <xref linkend="sliced" /> and replaces the interface first
+proposed in V4L2 specification 0.8.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.15</title>
+      <orderedlist>
+       <listitem>
+         <para>The &VIDIOC-LOG-STATUS; ioctl was added.</para>
+       </listitem>
+
+       <listitem>
+         <para>New video standards
+<constant>V4L2_STD_NTSC_443</constant>,
+<constant>V4L2_STD_SECAM_LC</constant>,
+<constant>V4L2_STD_SECAM_DK</constant> (a set of SECAM D, K and K1),
+and <constant>V4L2_STD_ATSC</constant> (a set of
+<constant>V4L2_STD_ATSC_8_VSB</constant> and
+<constant>V4L2_STD_ATSC_16_VSB</constant>) were defined. Note the
+<constant>V4L2_STD_525_60</constant> set now includes
+<constant>V4L2_STD_NTSC_443</constant>. See also <xref
+             linkend="v4l2-std-id" />.</para>
+       </listitem>
+
+       <listitem>
+         <para>The <constant>VIDIOC_G_COMP</constant> and
+<constant>VIDIOC_S_COMP</constant> ioctl were renamed to
+<constant>VIDIOC_G_MPEGCOMP</constant> and
+<constant>VIDIOC_S_MPEGCOMP</constant> respectively. Their argument
+was replaced by a struct
+<structname>v4l2_mpeg_compression</structname> pointer. (The
+<constant>VIDIOC_G_MPEGCOMP</constant> and
+<constant>VIDIOC_S_MPEGCOMP</constant> ioctls where removed in Linux
+2.6.25.)</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2005-11-27</title>
+      <para>The capture example in <xref linkend="capture-example" />
+called the &VIDIOC-S-CROP; ioctl without checking if cropping is
+supported. In the video standard selection example in
+<xref linkend="standard" /> the &VIDIOC-S-STD; call used the wrong
+argument type.</para>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2006-01-10</title>
+      <orderedlist>
+       <listitem>
+         <para>The <constant>V4L2_IN_ST_COLOR_KILL</constant> flag in
+&v4l2-input; not only indicates if the color killer is enabled, but
+also if it is active. (The color killer disables color decoding when
+it detects no color in the video signal to improve the image
+quality.)</para>
+       </listitem>
+
+       <listitem>
+         <para>&VIDIOC-S-PARM; is a write-read ioctl, not write-only as
+stated on its reference page. The ioctl changed in 2003 as noted above.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2006-02-03</title>
+      <orderedlist>
+       <listitem>
+         <para>In &v4l2-captureparm; and &v4l2-outputparm; the
+<structfield>timeperframe</structfield> field gives the time in
+seconds, not microseconds.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2006-02-04</title>
+      <orderedlist>
+       <listitem>
+         <para>The <structfield>clips</structfield> field in
+&v4l2-window; must point to an array of &v4l2-clip;, not a linked
+list, because drivers ignore the struct
+<structname>v4l2_clip</structname>.<structfield>next</structfield>
+pointer.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.17</title>
+      <orderedlist>
+       <listitem>
+         <para>New video standard macros were added:
+<constant>V4L2_STD_NTSC_M_KR</constant> (NTSC M South Korea), and the
+sets <constant>V4L2_STD_MN</constant>,
+<constant>V4L2_STD_B</constant>, <constant>V4L2_STD_GH</constant> and
+<constant>V4L2_STD_DK</constant>. The
+<constant>V4L2_STD_NTSC</constant> and
+<constant>V4L2_STD_SECAM</constant> sets now include
+<constant>V4L2_STD_NTSC_M_KR</constant> and
+<constant>V4L2_STD_SECAM_LC</constant> respectively.</para>
+       </listitem>
+
+       <listitem>
+         <para>A new <constant>V4L2_TUNER_MODE_LANG1_LANG2</constant>
+was defined to record both languages of a bilingual program. The
+use of <constant>V4L2_TUNER_MODE_STEREO</constant> for this purpose
+is deprecated now. See the &VIDIOC-G-TUNER; section for
+details.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2006-09-23 (Draft 0.15)</title>
+      <orderedlist>
+       <listitem>
+         <para>In various places
+<constant>V4L2_BUF_TYPE_SLICED_VBI_CAPTURE</constant> and
+<constant>V4L2_BUF_TYPE_SLICED_VBI_OUTPUT</constant> of the sliced VBI
+interface were not mentioned along with other buffer types.</para>
+       </listitem>
+
+       <listitem>
+         <para>In <xref linkend="vidioc-g-audio" /> it was clarified
+that the &v4l2-audio; <structfield>mode</structfield> field is a flags
+field.</para>
+       </listitem>
+
+       <listitem>
+         <para><xref linkend="vidioc-querycap" /> did not mention the
+sliced VBI and radio capability flags.</para>
+       </listitem>
+
+       <listitem>
+         <para>In <xref linkend="vidioc-g-frequency" /> it was
+clarified that applications must initialize the tuner
+<structfield>type</structfield> field of &v4l2-frequency; before
+calling &VIDIOC-S-FREQUENCY;.</para>
+       </listitem>
+
+       <listitem>
+         <para>The <structfield>reserved</structfield> array
+in &v4l2-requestbuffers; has 2 elements, not 32.</para>
+       </listitem>
+
+       <listitem>
+         <para>In <xref linkend="output" /> and <xref
+             linkend="raw-vbi" /> the device file names
+<filename>/dev/vout</filename> which never caught on were replaced
+by <filename>/dev/video</filename>.</para>
+       </listitem>
+
+       <listitem>
+         <para>With Linux 2.6.15 the possible range for VBI device minor
+numbers was extended from 224-239 to 224-255. Accordingly device file names
+<filename>/dev/vbi0</filename> to <filename>/dev/vbi31</filename> are
+possible now.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.18</title>
+      <orderedlist>
+       <listitem>
+         <para>New ioctls &VIDIOC-G-EXT-CTRLS;, &VIDIOC-S-EXT-CTRLS;
+and &VIDIOC-TRY-EXT-CTRLS; were added, a flag to skip unsupported
+controls with &VIDIOC-QUERYCTRL;, new control types
+<constant>V4L2_CTRL_TYPE_INTEGER64</constant> and
+<constant>V4L2_CTRL_TYPE_CTRL_CLASS</constant> (<xref
+             linkend="v4l2-ctrl-type" />), and new control flags
+<constant>V4L2_CTRL_FLAG_READ_ONLY</constant>,
+<constant>V4L2_CTRL_FLAG_UPDATE</constant>,
+<constant>V4L2_CTRL_FLAG_INACTIVE</constant> and
+<constant>V4L2_CTRL_FLAG_SLIDER</constant> (<xref
+             linkend="control-flags" />). See <xref
+             linkend="extended-controls" /> for details.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.19</title>
+      <orderedlist>
+       <listitem>
+         <para>In &v4l2-sliced-vbi-cap; a buffer type field was added
+replacing a reserved field. Note on architectures where the size of
+enum types differs from int types the size of the structure changed.
+The &VIDIOC-G-SLICED-VBI-CAP; ioctl was redefined from being read-only
+to write-read. Applications must initialize the type field and clear
+the reserved fields now. These changes may <emphasis>break the
+compatibility</emphasis> with older drivers and applications.</para>
+       </listitem>
+
+       <listitem>
+         <para>The ioctls &VIDIOC-ENUM-FRAMESIZES; and
+&VIDIOC-ENUM-FRAMEINTERVALS; were added.</para>
+       </listitem>
+
+       <listitem>
+         <para>A new pixel format <constant>V4L2_PIX_FMT_RGB444</constant> (<xref
+linkend="rgb-formats" />) was added.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 spec erratum 2006-10-12 (Draft 0.17)</title>
+      <orderedlist>
+       <listitem>
+         <para><constant>V4L2_PIX_FMT_HM12</constant> (<xref
+linkend="reserved-formats" />) is a YUV 4:2:0, not 4:2:2 format.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.21</title>
+      <orderedlist>
+       <listitem>
+         <para>The <filename>videodev2.h</filename> header file is
+now dual licensed under GNU General Public License version two or
+later, and under a 3-clause BSD-style license.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.22</title>
+      <orderedlist>
+       <listitem>
+         <para>Two new field orders
+         <constant>V4L2_FIELD_INTERLACED_TB</constant> and
+         <constant>V4L2_FIELD_INTERLACED_BT</constant> were
+         added. See <xref linkend="v4l2-field" /> for details.</para>
+       </listitem>
+
+       <listitem>
+         <para>Three new clipping/blending methods with a global or
+straight or inverted local alpha value were added to the video overlay
+interface. See the description of the &VIDIOC-G-FBUF; and
+&VIDIOC-S-FBUF; ioctls for details.</para>
+         <para>A new <structfield>global_alpha</structfield> field
+was added to <link
+linkend="v4l2-window"><structname>v4l2_window</structname></link>,
+extending the structure. This may <emphasis>break
+compatibility</emphasis> with applications using a struct
+<structname>v4l2_window</structname> directly. However the <link
+linkend="vidioc-g-fmt">VIDIOC_G/S/TRY_FMT</link> ioctls, which take a
+pointer to a <link linkend="v4l2-format">v4l2_format</link> parent
+structure with padding bytes at the end, are not affected.</para>
+       </listitem>
+
+       <listitem>
+         <para>The format of the <structfield>chromakey</structfield>
+field in &v4l2-window; changed from "host order RGB32" to a pixel
+value in the same format as the framebuffer. This may <emphasis>break
+compatibility</emphasis> with existing applications. Drivers
+supporting the "host order RGB32" format are not known.</para>
+       </listitem>
+
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.24</title>
+      <orderedlist>
+       <listitem>
+         <para>The pixel formats
+<constant>V4L2_PIX_FMT_PAL8</constant>,
+<constant>V4L2_PIX_FMT_YUV444</constant>,
+<constant>V4L2_PIX_FMT_YUV555</constant>,
+<constant>V4L2_PIX_FMT_YUV565</constant> and
+<constant>V4L2_PIX_FMT_YUV32</constant> were added.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.25</title>
+      <orderedlist>
+       <listitem>
+         <para>The pixel formats <link linkend="V4L2-PIX-FMT-Y16">
+<constant>V4L2_PIX_FMT_Y16</constant></link> and <link
+linkend="V4L2-PIX-FMT-SBGGR16">
+<constant>V4L2_PIX_FMT_SBGGR16</constant></link> were added.</para>
+       </listitem>
+       <listitem>
+         <para>New <link linkend="control">controls</link>
+<constant>V4L2_CID_POWER_LINE_FREQUENCY</constant>,
+<constant>V4L2_CID_HUE_AUTO</constant>,
+<constant>V4L2_CID_WHITE_BALANCE_TEMPERATURE</constant>,
+<constant>V4L2_CID_SHARPNESS</constant> and
+<constant>V4L2_CID_BACKLIGHT_COMPENSATION</constant> were added. The
+controls <constant>V4L2_CID_BLACK_LEVEL</constant>,
+<constant>V4L2_CID_WHITENESS</constant>,
+<constant>V4L2_CID_HCENTER</constant> and
+<constant>V4L2_CID_VCENTER</constant> were deprecated.
+</para>
+       </listitem>
+       <listitem>
+         <para>A <link linkend="camera-controls">Camera controls
+class</link> was added, with the new controls
+<constant>V4L2_CID_EXPOSURE_AUTO</constant>,
+<constant>V4L2_CID_EXPOSURE_ABSOLUTE</constant>,
+<constant>V4L2_CID_EXPOSURE_AUTO_PRIORITY</constant>,
+<constant>V4L2_CID_PAN_RELATIVE</constant>,
+<constant>V4L2_CID_TILT_RELATIVE</constant>,
+<constant>V4L2_CID_PAN_RESET</constant>,
+<constant>V4L2_CID_TILT_RESET</constant>,
+<constant>V4L2_CID_PAN_ABSOLUTE</constant>,
+<constant>V4L2_CID_TILT_ABSOLUTE</constant>,
+<constant>V4L2_CID_FOCUS_ABSOLUTE</constant>,
+<constant>V4L2_CID_FOCUS_RELATIVE</constant> and
+<constant>V4L2_CID_FOCUS_AUTO</constant>.</para>
+       </listitem>
+       <listitem>
+         <para>The <constant>VIDIOC_G_MPEGCOMP</constant> and
+<constant>VIDIOC_S_MPEGCOMP</constant> ioctls, which were superseded
+by the <link linkend="extended-controls">extended controls</link>
+interface in Linux 2.6.18, where finally removed from the
+<filename>videodev2.h</filename> header file.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.26</title>
+      <orderedlist>
+       <listitem>
+         <para>The pixel formats
+<constant>V4L2_PIX_FMT_Y16</constant> and
+<constant>V4L2_PIX_FMT_SBGGR16</constant> were added.</para>
+       </listitem>
+       <listitem>
+         <para>Added user controls
+<constant>V4L2_CID_CHROMA_AGC</constant> and
+<constant>V4L2_CID_COLOR_KILLER</constant>.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.27</title>
+      <orderedlist>
+       <listitem>
+         <para>The &VIDIOC-S-HW-FREQ-SEEK; ioctl and the
+<constant>V4L2_CAP_HW_FREQ_SEEK</constant> capability were added.</para>
+       </listitem>
+       <listitem>
+         <para>The pixel formats
+<constant>V4L2_PIX_FMT_YVYU</constant>,
+<constant>V4L2_PIX_FMT_PCA501</constant>,
+<constant>V4L2_PIX_FMT_PCA505</constant>,
+<constant>V4L2_PIX_FMT_PCA508</constant>,
+<constant>V4L2_PIX_FMT_PCA561</constant>,
+<constant>V4L2_PIX_FMT_SGBRG8</constant>,
+<constant>V4L2_PIX_FMT_PAC207</constant> and
+<constant>V4L2_PIX_FMT_PJPG</constant> were added.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.28</title>
+      <orderedlist>
+       <listitem>
+         <para>Added <constant>V4L2_MPEG_AUDIO_ENCODING_AAC</constant> and
+<constant>V4L2_MPEG_AUDIO_ENCODING_AC3</constant> MPEG audio encodings.</para>
+       </listitem>
+       <listitem>
+         <para>Added <constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC</constant> MPEG
+video encoding.</para>
+       </listitem>
+       <listitem>
+         <para>The pixel formats
+<constant>V4L2_PIX_FMT_SGRBG10</constant> and
+<constant>V4L2_PIX_FMT_SGRBG10DPCM8</constant> were added.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 2.6.29</title>
+      <orderedlist>
+       <listitem>
+         <para>The <constant>VIDIOC_G_CHIP_IDENT</constant> ioctl was renamed
+to <constant>VIDIOC_G_CHIP_IDENT_OLD</constant> and &VIDIOC-DBG-G-CHIP-IDENT;
+was introduced in its place. The old struct <structname>v4l2_chip_ident</structname>
+was renamed to <structname id="v4l2-chip-ident-old">v4l2_chip_ident_old</structname>.</para>
+       </listitem>
+       <listitem>
+         <para>The pixel formats
+<constant>V4L2_PIX_FMT_VYUY</constant>,
+<constant>V4L2_PIX_FMT_NV16</constant> and
+<constant>V4L2_PIX_FMT_NV61</constant> were added.</para>
+       </listitem>
+       <listitem>
+         <para>Added camera controls
+<constant>V4L2_CID_ZOOM_ABSOLUTE</constant>,
+<constant>V4L2_CID_ZOOM_RELATIVE</constant>,
+<constant>V4L2_CID_ZOOM_CONTINUOUS</constant> and
+<constant>V4L2_CID_PRIVACY</constant>.</para>
+       </listitem>
+      </orderedlist>
+    </section>
+    <section>
+      <title>V4L2 in Linux 2.6.30</title>
+      <orderedlist>
+       <listitem>
+         <para>New control flag <constant>V4L2_CTRL_FLAG_WRITE_ONLY</constant> was added.</para>
+       </listitem>
+       <listitem>
+         <para>New control <constant>V4L2_CID_COLORFX</constant> was added.</para>
+       </listitem>
+       </orderedlist>
+     </section>
+    <section>
+      <title>V4L2 in Linux 2.6.32</title>
+      <orderedlist>
+       <listitem>
+         <para>In order to be easier to compare a V4L2 API and a kernel
+version, now V4L2 API is numbered using the Linux Kernel version numeration.</para>
+       </listitem>
+       <listitem>
+         <para>Finalized the RDS capture API. See <xref linkend="rds" /> for
+more information.</para>
+       </listitem>
+       <listitem>
+         <para>Added new capabilities for modulators and RDS encoders.</para>
+       </listitem>
+       <listitem>
+         <para>Add description for libv4l API.</para>
+       </listitem>
+       <listitem>
+         <para>Added support for string controls via new type <constant>V4L2_CTRL_TYPE_STRING</constant>.</para>
+       </listitem>
+       <listitem>
+         <para>Added <constant>V4L2_CID_BAND_STOP_FILTER</constant> documentation.</para>
+       </listitem>
+       <listitem>
+         <para>Added FM Modulator (FM TX) Extended Control Class: <constant>V4L2_CTRL_CLASS_FM_TX</constant> and their Control IDs.</para>
+       </listitem>
+       <listitem>
+         <para>Added Remote Controller chapter, describing the default Remote Controller mapping for media devices.</para>
+       </listitem>
+       </orderedlist>
+     </section>
+   </section>
+
+   <section id="other">
+     <title>Relation of V4L2 to other Linux multimedia APIs</title>
+
+    <section id="xvideo">
+      <title>X Video Extension</title>
+
+      <para>The X Video Extension (abbreviated XVideo or just Xv) is
+an extension of the X Window system, implemented for example by the
+XFree86 project. Its scope is similar to V4L2, an API to video capture
+and output devices for X clients. Xv allows applications to display
+live video in a window, send window contents to a TV output, and
+capture or output still images in XPixmaps<footnote>
+         <para>This is not implemented in XFree86.</para>
+       </footnote>. With their implementation XFree86 makes the
+extension available across many operating systems and
+architectures.</para>
+
+      <para>Because the driver is embedded into the X server Xv has a
+number of advantages over the V4L2 <link linkend="overlay">video
+overlay interface</link>. The driver can easily determine the overlay
+target, &ie; visible graphics memory or off-screen buffers for a
+destructive overlay. It can program the RAMDAC for a non-destructive
+overlay, scaling or color-keying, or the clipping functions of the
+video capture hardware, always in sync with drawing operations or
+windows moving or changing their stacking order.</para>
+
+      <para>To combine the advantages of Xv and V4L a special Xv
+driver exists in XFree86 and XOrg, just programming any overlay capable
+Video4Linux device it finds. To enable it
+<filename>/etc/X11/XF86Config</filename> must contain these lines:</para>
+      <para><screen>
+Section "Module"
+    Load "v4l"
+EndSection</screen></para>
+
+      <para>As of XFree86 4.2 this driver still supports only V4L
+ioctls, however it should work just fine with all V4L2 devices through
+the V4L2 backward-compatibility layer. Since V4L2 permits multiple
+opens it is possible (if supported by the V4L2 driver) to capture
+video while an X client requested video overlay. Restrictions of
+simultaneous capturing and overlay are discussed in <xref
+         linkend="overlay" /> apply.</para>
+
+      <para>Only marginally related to V4L2, XFree86 extended Xv to
+support hardware YUV to RGB conversion and scaling for faster video
+playback, and added an interface to MPEG-2 decoding hardware. This API
+is useful to display images captured with V4L2 devices.</para>
+    </section>
+
+    <section>
+      <title>Digital Video</title>
+
+      <para>V4L2 does not support digital terrestrial, cable or
+satellite broadcast. A separate project aiming at digital receivers
+exists. You can find its homepage at <ulink
+url="http://linuxtv.org">http://linuxtv.org</ulink>. The Linux DVB API
+has no connection to the V4L2 API except that drivers for hybrid
+hardware may support both.</para>
+    </section>
+
+    <section>
+      <title>Audio Interfaces</title>
+
+      <para>[to do - OSS/ALSA]</para>
+    </section>
+  </section>
+
+  <section id="experimental">
+    <title>Experimental API Elements</title>
+
+    <para>The following V4L2 API elements are currently experimental
+and may change in the future.</para>
+
+    <itemizedlist>
+      <listitem>
+       <para>Video Output Overlay (OSD) Interface, <xref
+           linkend="osd" />.</para>
+      </listitem>
+       <listitem>
+       <para><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>,
+       &v4l2-buf-type;, <xref linkend="v4l2-buf-type" />.</para>
+      </listitem>
+      <listitem>
+       <para><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant>,
+&VIDIOC-QUERYCAP; ioctl, <xref linkend="device-capabilities" />.</para>
+      </listitem>
+      <listitem>
+       <para>&VIDIOC-ENUM-FRAMESIZES; and
+&VIDIOC-ENUM-FRAMEINTERVALS; ioctls.</para>
+      </listitem>
+      <listitem>
+       <para>&VIDIOC-G-ENC-INDEX; ioctl.</para>
+      </listitem>
+      <listitem>
+       <para>&VIDIOC-ENCODER-CMD; and &VIDIOC-TRY-ENCODER-CMD;
+ioctls.</para>
+      </listitem>
+      <listitem>
+       <para>&VIDIOC-DBG-G-REGISTER; and &VIDIOC-DBG-S-REGISTER;
+ioctls.</para>
+      </listitem>
+      <listitem>
+       <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="obsolete">
+    <title>Obsolete API Elements</title>
+
+    <para>The following V4L2 API elements were superseded by new
+interfaces and should not be implemented in new drivers.</para>
+
+    <itemizedlist>
+      <listitem>
+       <para><constant>VIDIOC_G_MPEGCOMP</constant> and
+<constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
+<xref linkend="extended-controls" />.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
new file mode 100644 (file)
index 0000000..f492acc
--- /dev/null
@@ -0,0 +1,2049 @@
+  <section id="control">
+    <title>User Controls</title>
+
+    <para>Devices typically have a number of user-settable controls
+such as brightness, saturation and so on, which would be presented to
+the user on a graphical user interface. But, different devices
+will have different controls available, and furthermore, the range of
+possible values, and the default value will vary from device to
+device. The control ioctls provide the information and a mechanism to
+create a nice user interface for these controls that will work
+correctly with any device.</para>
+
+    <para>All controls are accessed using an ID value. V4L2 defines
+several IDs for specific purposes. Drivers can also implement their
+own custom controls using <constant>V4L2_CID_PRIVATE_BASE</constant>
+and higher values. The pre-defined control IDs have the prefix
+<constant>V4L2_CID_</constant>, and are listed in <xref
+linkend="control-id" />. The ID is used when querying the attributes of
+a control, and when getting or setting the current value.</para>
+
+    <para>Generally applications should present controls to the user
+without assumptions about their purpose. Each control comes with a
+name string the user is supposed to understand. When the purpose is
+non-intuitive the driver writer should provide a user manual, a user
+interface plug-in or a driver specific panel application. Predefined
+IDs were introduced to change a few controls programmatically, for
+example to mute a device during a channel switch.</para>
+
+    <para>Drivers may enumerate different controls after switching
+the current video input or output, tuner or modulator, or audio input
+or output. Different in the sense of other bounds, another default and
+current value, step size or other menu items. A control with a certain
+<emphasis>custom</emphasis> ID can also change name and
+type.<footnote>
+       <para>It will be more convenient for applications if drivers
+make use of the <constant>V4L2_CTRL_FLAG_DISABLED</constant> flag, but
+that was never required.</para>
+      </footnote> Control values are stored globally, they do not
+change when switching except to stay within the reported bounds. They
+also do not change &eg; when the device is opened or closed, when the
+tuner radio frequency is changed or generally never without
+application request. Since V4L2 specifies no event mechanism, panel
+applications intended to cooperate with other panel applications (be
+they built into a larger application, as a TV viewer) may need to
+regularly poll control values to update their user
+interface.<footnote>
+       <para>Applications could call an ioctl to request events.
+After another process called &VIDIOC-S-CTRL; or another ioctl changing
+shared properties the &func-select; function would indicate
+readability until any ioctl (querying the properties) is
+called.</para>
+      </footnote></para>
+
+    <table pgwide="1" frame="none" id="control-id">
+      <title>Control IDs</title>
+      <tgroup cols="3">
+       &cs-def;
+       <thead>
+         <row>
+           <entry>ID</entry>
+           <entry>Type</entry>
+           <entry>Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CID_BASE</constant></entry>
+           <entry></entry>
+           <entry>First predefined ID, equal to
+<constant>V4L2_CID_BRIGHTNESS</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_USER_BASE</constant></entry>
+           <entry></entry>
+           <entry>Synonym of <constant>V4L2_CID_BASE</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_BRIGHTNESS</constant></entry>
+           <entry>integer</entry>
+           <entry>Picture brightness, or more precisely, the black
+level.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_CONTRAST</constant></entry>
+           <entry>integer</entry>
+           <entry>Picture contrast or luma gain.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_SATURATION</constant></entry>
+           <entry>integer</entry>
+           <entry>Picture color saturation or chroma gain.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_HUE</constant></entry>
+           <entry>integer</entry>
+           <entry>Hue or color balance.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_VOLUME</constant></entry>
+           <entry>integer</entry>
+           <entry>Overall audio volume. Note some drivers also
+provide an OSS or ALSA mixer interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_BALANCE</constant></entry>
+           <entry>integer</entry>
+           <entry>Audio stereo balance. Minimum corresponds to all
+the way left, maximum to right.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_BASS</constant></entry>
+           <entry>integer</entry>
+           <entry>Audio bass adjustment.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_TREBLE</constant></entry>
+           <entry>integer</entry>
+           <entry>Audio treble adjustment.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_MUTE</constant></entry>
+           <entry>boolean</entry>
+           <entry>Mute audio, &ie; set the volume to zero, however
+without affecting <constant>V4L2_CID_AUDIO_VOLUME</constant>. Like
+ALSA drivers, V4L2 drivers must mute at load time to avoid excessive
+noise. Actually the entire device should be reset to a low power
+consumption state.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUDIO_LOUDNESS</constant></entry>
+           <entry>boolean</entry>
+           <entry>Loudness mode (bass boost).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_BLACK_LEVEL</constant></entry>
+           <entry>integer</entry>
+           <entry>Another name for brightness (not a synonym of
+<constant>V4L2_CID_BRIGHTNESS</constant>). This control is deprecated
+and should not be used in new drivers and applications.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUTO_WHITE_BALANCE</constant></entry>
+           <entry>boolean</entry>
+           <entry>Automatic white balance (cameras).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_DO_WHITE_BALANCE</constant></entry>
+           <entry>button</entry>
+           <entry>This is an action control. When set (the value is
+ignored), the device will do a white balance and then hold the current
+setting. Contrast this with the boolean
+<constant>V4L2_CID_AUTO_WHITE_BALANCE</constant>, which, when
+activated, keeps adjusting the white balance.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_RED_BALANCE</constant></entry>
+           <entry>integer</entry>
+           <entry>Red chroma balance.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_BLUE_BALANCE</constant></entry>
+           <entry>integer</entry>
+           <entry>Blue chroma balance.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_GAMMA</constant></entry>
+           <entry>integer</entry>
+           <entry>Gamma adjust.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_WHITENESS</constant></entry>
+           <entry>integer</entry>
+           <entry>Whiteness for grey-scale devices. This is a synonym
+for <constant>V4L2_CID_GAMMA</constant>. This control is deprecated
+and should not be used in new drivers and applications.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_EXPOSURE</constant></entry>
+           <entry>integer</entry>
+           <entry>Exposure (cameras). [Unit?]</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_AUTOGAIN</constant></entry>
+           <entry>boolean</entry>
+           <entry>Automatic gain/exposure control.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_GAIN</constant></entry>
+           <entry>integer</entry>
+           <entry>Gain control.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_HFLIP</constant></entry>
+           <entry>boolean</entry>
+           <entry>Mirror the picture horizontally.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_VFLIP</constant></entry>
+           <entry>boolean</entry>
+           <entry>Mirror the picture vertically.</entry>
+         </row>
+       <row>
+         <entry><constant>V4L2_CID_HCENTER_DEPRECATED</constant> (formerly <constant>V4L2_CID_HCENTER</constant>)</entry>
+           <entry>integer</entry>
+           <entry>Horizontal image centering. This control is
+deprecated. New drivers and applications should use the <link
+linkend="camera-controls">Camera class controls</link>
+<constant>V4L2_CID_PAN_ABSOLUTE</constant>,
+<constant>V4L2_CID_PAN_RELATIVE</constant> and
+<constant>V4L2_CID_PAN_RESET</constant> instead.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_VCENTER_DEPRECATED</constant>
+           (formerly <constant>V4L2_CID_VCENTER</constant>)</entry>
+           <entry>integer</entry>
+           <entry>Vertical image centering. Centering is intended to
+<emphasis>physically</emphasis> adjust cameras. For image cropping see
+<xref linkend="crop" />, for clipping <xref linkend="overlay" />. This
+control is deprecated. New drivers and applications should use the
+<link linkend="camera-controls">Camera class controls</link>
+<constant>V4L2_CID_TILT_ABSOLUTE</constant>,
+<constant>V4L2_CID_TILT_RELATIVE</constant> and
+<constant>V4L2_CID_TILT_RESET</constant> instead.</entry>
+         </row>
+         <row id="v4l2-power-line-frequency">
+           <entry><constant>V4L2_CID_POWER_LINE_FREQUENCY</constant></entry>
+           <entry>enum</entry>
+           <entry>Enables a power line frequency filter to avoid
+flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0),
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1) and
+<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>
+           <entry>boolean</entry>
+           <entry>Enables automatic hue control by the device. The
+effect of setting <constant>V4L2_CID_HUE</constant> while automatic
+hue control is enabled is undefined, drivers should ignore such
+request.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_WHITE_BALANCE_TEMPERATURE</constant></entry>
+           <entry>integer</entry>
+           <entry>This control specifies the white balance settings
+as a color temperature in Kelvin. A driver should have a minimum of
+2800 (incandescent) to 6500 (daylight). For more information about
+color temperature see <ulink
+url="http://en.wikipedia.org/wiki/Color_temperature">Wikipedia</ulink>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_SHARPNESS</constant></entry>
+           <entry>integer</entry>
+           <entry>Adjusts the sharpness filters in a camera. The
+minimum value disables the filters, higher values give a sharper
+picture.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_BACKLIGHT_COMPENSATION</constant></entry>
+           <entry>integer</entry>
+           <entry>Adjusts the backlight compensation in a camera. The
+minimum value disables backlight compensation.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_CHROMA_AGC</constant></entry>
+           <entry>boolean</entry>
+           <entry>Chroma automatic gain control.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry>
+           <entry>boolean</entry>
+           <entry>Enable the color killer (&ie; force a black &amp; white image in case of a weak video signal).</entry>
+         </row>
+         <row id="v4l2-colorfx">
+           <entry><constant>V4L2_CID_COLORFX</constant></entry>
+           <entry>enum</entry>
+           <entry>Selects a color effect. Possible values for
+<constant>enum v4l2_colorfx</constant> are:
+<constant>V4L2_COLORFX_NONE</constant> (0),
+<constant>V4L2_COLORFX_BW</constant> (1) and
+<constant>V4L2_COLORFX_SEPIA</constant> (2).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_LASTP1</constant></entry>
+           <entry></entry>
+           <entry>End of the predefined control IDs (currently
+<constant>V4L2_CID_COLORFX</constant> + 1).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry>
+           <entry></entry>
+           <entry>ID of the first custom (driver specific) control.
+Applications depending on particular custom controls should check the
+driver name and version, see <xref linkend="querycap" />.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>Applications can enumerate the available controls with the
+&VIDIOC-QUERYCTRL; and &VIDIOC-QUERYMENU; ioctls, get and set a
+control value with the &VIDIOC-G-CTRL; and &VIDIOC-S-CTRL; ioctls.
+Drivers must implement <constant>VIDIOC_QUERYCTRL</constant>,
+<constant>VIDIOC_G_CTRL</constant> and
+<constant>VIDIOC_S_CTRL</constant> when the device has one or more
+controls, <constant>VIDIOC_QUERYMENU</constant> when it has one or
+more menu type controls.</para>
+
+    <example>
+      <title>Enumerating all controls</title>
+
+      <programlisting>
+&v4l2-queryctrl; queryctrl;
+&v4l2-querymenu; querymenu;
+
+static void
+enumerate_menu (void)
+{
+       printf ("  Menu items:\n");
+
+       memset (&amp;querymenu, 0, sizeof (querymenu));
+       querymenu.id = queryctrl.id;
+
+       for (querymenu.index = queryctrl.minimum;
+            querymenu.index &lt;= queryctrl.maximum;
+             querymenu.index++) {
+               if (0 == ioctl (fd, &VIDIOC-QUERYMENU;, &amp;querymenu)) {
+                       printf ("  %s\n", querymenu.name);
+               } else {
+                       perror ("VIDIOC_QUERYMENU");
+                       exit (EXIT_FAILURE);
+               }
+       }
+}
+
+memset (&amp;queryctrl, 0, sizeof (queryctrl));
+
+for (queryctrl.id = V4L2_CID_BASE;
+     queryctrl.id &lt; V4L2_CID_LASTP1;
+     queryctrl.id++) {
+       if (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+               if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)
+                       continue;
+
+               printf ("Control %s\n", queryctrl.name);
+
+               if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
+                       enumerate_menu ();
+       } else {
+               if (errno == EINVAL)
+                       continue;
+
+               perror ("VIDIOC_QUERYCTRL");
+               exit (EXIT_FAILURE);
+       }
+}
+
+for (queryctrl.id = V4L2_CID_PRIVATE_BASE;;
+     queryctrl.id++) {
+       if (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+               if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)
+                       continue;
+
+               printf ("Control %s\n", queryctrl.name);
+
+               if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
+                       enumerate_menu ();
+       } else {
+               if (errno == EINVAL)
+                       break;
+
+               perror ("VIDIOC_QUERYCTRL");
+               exit (EXIT_FAILURE);
+       }
+}
+</programlisting>
+    </example>
+
+    <example>
+      <title>Changing controls</title>
+
+      <programlisting>
+&v4l2-queryctrl; queryctrl;
+&v4l2-control; control;
+
+memset (&amp;queryctrl, 0, sizeof (queryctrl));
+queryctrl.id = V4L2_CID_BRIGHTNESS;
+
+if (-1 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;queryctrl)) {
+       if (errno != EINVAL) {
+               perror ("VIDIOC_QUERYCTRL");
+               exit (EXIT_FAILURE);
+       } else {
+               printf ("V4L2_CID_BRIGHTNESS is not supported\n");
+       }
+} else if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED) {
+       printf ("V4L2_CID_BRIGHTNESS is not supported\n");
+} else {
+       memset (&amp;control, 0, sizeof (control));
+       control.id = V4L2_CID_BRIGHTNESS;
+       control.value = queryctrl.default_value;
+
+       if (-1 == ioctl (fd, &VIDIOC-S-CTRL;, &amp;control)) {
+               perror ("VIDIOC_S_CTRL");
+               exit (EXIT_FAILURE);
+       }
+}
+
+memset (&amp;control, 0, sizeof (control));
+control.id = V4L2_CID_CONTRAST;
+
+if (0 == ioctl (fd, &VIDIOC-G-CTRL;, &amp;control)) {
+       control.value += 1;
+
+       /* The driver may clamp the value or return ERANGE, ignored here */
+
+       if (-1 == ioctl (fd, &VIDIOC-S-CTRL;, &amp;control)
+           &amp;&amp; errno != ERANGE) {
+               perror ("VIDIOC_S_CTRL");
+               exit (EXIT_FAILURE);
+       }
+/* Ignore if V4L2_CID_CONTRAST is unsupported */
+} else if (errno != EINVAL) {
+       perror ("VIDIOC_G_CTRL");
+       exit (EXIT_FAILURE);
+}
+
+control.id = V4L2_CID_AUDIO_MUTE;
+control.value = TRUE; /* silence */
+
+/* Errors ignored */
+ioctl (fd, VIDIOC_S_CTRL, &amp;control);
+</programlisting>
+    </example>
+  </section>
+
+  <section id="extended-controls">
+    <title>Extended Controls</title>
+
+    <section>
+      <title>Introduction</title>
+
+      <para>The control mechanism as originally designed was meant
+to be used for user settings (brightness, saturation, etc). However,
+it turned out to be a very useful model for implementing more
+complicated driver APIs where each driver implements only a subset of
+a larger API.</para>
+
+      <para>The MPEG encoding API was the driving force behind
+designing and implementing this extended control mechanism: the MPEG
+standard is quite large and the currently supported hardware MPEG
+encoders each only implement a subset of this standard. Further more,
+many parameters relating to how the video is encoded into an MPEG
+stream are specific to the MPEG encoding chip since the MPEG standard
+only defines the format of the resulting MPEG stream, not how the
+video is actually encoded into that format.</para>
+
+      <para>Unfortunately, the original control API lacked some
+features needed for these new uses and so it was extended into the
+(not terribly originally named) extended control API.</para>
+
+      <para>Even though the MPEG encoding API was the first effort
+to use the Extended Control API, nowadays there are also other classes
+of Extended Controls, such as Camera Controls and FM Transmitter Controls.
+The Extended Controls API as well as all Extended Controls classes are
+described in the following text.</para>
+    </section>
+
+    <section>
+      <title>The Extended Control API</title>
+
+      <para>Three new ioctls are available: &VIDIOC-G-EXT-CTRLS;,
+&VIDIOC-S-EXT-CTRLS; and &VIDIOC-TRY-EXT-CTRLS;. These ioctls act on
+arrays of controls (as opposed to the &VIDIOC-G-CTRL; and
+&VIDIOC-S-CTRL; ioctls that act on a single control). This is needed
+since it is often required to atomically change several controls at
+once.</para>
+
+      <para>Each of the new ioctls expects a pointer to a
+&v4l2-ext-controls;. This structure contains a pointer to the control
+array, a count of the number of controls in that array and a control
+class. Control classes are used to group similar controls into a
+single class. For example, control class
+<constant>V4L2_CTRL_CLASS_USER</constant> contains all user controls
+(&ie; all controls that can also be set using the old
+<constant>VIDIOC_S_CTRL</constant> ioctl). Control class
+<constant>V4L2_CTRL_CLASS_MPEG</constant> contains all controls
+relating to MPEG encoding, etc.</para>
+
+      <para>All controls in the control array must belong to the
+specified control class. An error is returned if this is not the
+case.</para>
+
+      <para>It is also possible to use an empty control array (count
+== 0) to check whether the specified control class is
+supported.</para>
+
+      <para>The control array is a &v4l2-ext-control; array. The
+<structname>v4l2_ext_control</structname> structure is very similar to
+&v4l2-control;, except for the fact that it also allows for 64-bit
+values and pointers to be passed.</para>
+
+      <para>It is important to realize that due to the flexibility of
+controls it is necessary to check whether the control you want to set
+actually is supported in the driver and what the valid range of values
+is. So use the &VIDIOC-QUERYCTRL; and &VIDIOC-QUERYMENU; ioctls to
+check this. Also note that it is possible that some of the menu
+indices in a control of type <constant>V4L2_CTRL_TYPE_MENU</constant>
+may not be supported (<constant>VIDIOC_QUERYMENU</constant> will
+return an error). A good example is the list of supported MPEG audio
+bitrates. Some drivers only support one or two bitrates, others
+support a wider range.</para>
+    </section>
+
+    <section>
+      <title>Enumerating Extended Controls</title>
+
+      <para>The recommended way to enumerate over the extended
+controls is by using &VIDIOC-QUERYCTRL; in combination with the
+<constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant> flag:</para>
+
+      <informalexample>
+       <programlisting>
+&v4l2-queryctrl; qctrl;
+
+qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
+while (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;qctrl)) {
+       /* ... */
+       qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
+}
+</programlisting>
+      </informalexample>
+
+      <para>The initial control ID is set to 0 ORed with the
+<constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant> flag. The
+<constant>VIDIOC_QUERYCTRL</constant> ioctl will return the first
+control with a higher ID than the specified one. When no such controls
+are found an error is returned.</para>
+
+      <para>If you want to get all controls within a specific control
+class, then you can set the initial
+<structfield>qctrl.id</structfield> value to the control class and add
+an extra check to break out of the loop when a control of another
+control class is found:</para>
+
+      <informalexample>
+       <programlisting>
+qctrl.id = V4L2_CTRL_CLASS_MPEG | V4L2_CTRL_FLAG_NEXT_CTRL;
+while (0 == ioctl (fd, &VIDIOC-QUERYCTRL;, &amp;qctrl)) {
+       if (V4L2_CTRL_ID2CLASS (qctrl.id) != V4L2_CTRL_CLASS_MPEG)
+               break;
+               /* ... */
+               qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
+       }
+</programlisting>
+      </informalexample>
+
+      <para>The 32-bit <structfield>qctrl.id</structfield> value is
+subdivided into three bit ranges: the top 4 bits are reserved for
+flags (&eg; <constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant>) and are not
+actually part of the ID. The remaining 28 bits form the control ID, of
+which the most significant 12 bits define the control class and the
+least significant 16 bits identify the control within the control
+class. It is guaranteed that these last 16 bits are always non-zero
+for controls. The range of 0x1000 and up are reserved for
+driver-specific controls. The macro
+<constant>V4L2_CTRL_ID2CLASS(id)</constant> returns the control class
+ID based on a control ID.</para>
+
+      <para>If the driver does not support extended controls, then
+<constant>VIDIOC_QUERYCTRL</constant> will fail when used in
+combination with <constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant>. In
+that case the old method of enumerating control should be used (see
+1.8). But if it is supported, then it is guaranteed to enumerate over
+all controls, including driver-private controls.</para>
+    </section>
+
+    <section>
+      <title>Creating Control Panels</title>
+
+      <para>It is possible to create control panels for a graphical
+user interface where the user can select the various controls.
+Basically you will have to iterate over all controls using the method
+described above. Each control class starts with a control of type
+<constant>V4L2_CTRL_TYPE_CTRL_CLASS</constant>.
+<constant>VIDIOC_QUERYCTRL</constant> will return the name of this
+control class which can be used as the title of a tab page within a
+control panel.</para>
+
+      <para>The flags field of &v4l2-queryctrl; also contains hints on
+the behavior of the control. See the &VIDIOC-QUERYCTRL; documentation
+for more details.</para>
+    </section>
+
+    <section id="mpeg-controls">
+      <title>MPEG Control Reference</title>
+
+      <para>Below all controls within the MPEG control class are
+described. First the generic controls, then controls specific for
+certain hardware.</para>
+
+      <section>
+       <title>Generic MPEG Controls</title>
+
+       <table pgwide="1" frame="none" id="mpeg-control-id">
+         <title>MPEG Control IDs</title>
+         <tgroup cols="4">
+           <colspec colname="c1" colwidth="1*" />
+           <colspec colname="c2" colwidth="6*" />
+           <colspec colname="c3" colwidth="2*" />
+           <colspec colname="c4" colwidth="6*" />
+           <spanspec namest="c1" nameend="c2" spanname="id" />
+           <spanspec namest="c2" nameend="c4" spanname="descr" />
+           <thead>
+             <row>
+               <entry spanname="id" align="left">ID</entry>
+               <entry align="left">Type</entry>
+             </row><row rowsep="1"><entry spanname="descr" align="left">Description</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CLASS</constant>&nbsp;</entry>
+               <entry>class</entry>
+             </row><row><entry spanname="descr">The MPEG class
+descriptor. Calling &VIDIOC-QUERYCTRL; for this control will return a
+description of this control class. This description can be used as the
+caption of a Tab page in a GUI, for example.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-stream-type">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_TYPE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_stream_type</entry>
+             </row><row><entry spanname="descr">The MPEG-1, -2 or -4
+output stream type. One cannot assume anything here. Each hardware
+MPEG encoder tends to support different subsets of the available MPEG
+stream types. The currently defined stream types are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG2_PS</constant>&nbsp;</entry>
+                     <entry>MPEG-2 program stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG2_TS</constant>&nbsp;</entry>
+                     <entry>MPEG-2 transport stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG1_SS</constant>&nbsp;</entry>
+                     <entry>MPEG-1 system stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG2_DVD</constant>&nbsp;</entry>
+                     <entry>MPEG-2 DVD-compatible stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG1_VCD</constant>&nbsp;</entry>
+                     <entry>MPEG-1 VCD-compatible stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD</constant>&nbsp;</entry>
+                     <entry>MPEG-2 SVCD-compatible stream</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PID_PMT</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Program Map Table
+Packet ID for the MPEG transport stream (default 16)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PID_AUDIO</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Audio Packet ID for
+the MPEG transport stream (default 256)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PID_VIDEO</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Video Packet ID for
+the MPEG transport stream (default 260)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PID_PCR</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Packet ID for the
+MPEG transport stream carrying PCR fields (default 259)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PES_ID_AUDIO</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Audio ID for MPEG
+PES</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_PES_ID_VIDEO</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Video ID for MPEG
+PES</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-stream-vbi-fmt">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_STREAM_VBI_FMT</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_stream_vbi_fmt</entry>
+             </row><row><entry spanname="descr">Some cards can embed
+VBI data (&eg; Closed Caption, Teletext) into the MPEG stream. This
+control selects whether VBI data should be embedded, and if so, what
+embedding method should be used. The list of possible VBI formats
+depends on the driver. The currently defined VBI format types
+are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_VBI_FMT_NONE</constant>&nbsp;</entry>
+                     <entry>No VBI in the MPEG stream</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_STREAM_VBI_FMT_IVTV</constant>&nbsp;</entry>
+                     <entry>VBI in private packets, IVTV format (documented
+in the kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.vbi</filename>)</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-sampling-freq">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_sampling_freq</entry>
+             </row><row><entry spanname="descr">MPEG Audio sampling
+frequency. Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100</constant>&nbsp;</entry>
+                     <entry>44.1 kHz</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000</constant>&nbsp;</entry>
+                     <entry>48 kHz</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000</constant>&nbsp;</entry>
+                     <entry>32 kHz</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-encoding">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_ENCODING</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_encoding</entry>
+             </row><row><entry spanname="descr">MPEG Audio encoding.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_1</constant>&nbsp;</entry>
+                     <entry>MPEG-1/2 Layer I encoding</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_2</constant>&nbsp;</entry>
+                     <entry>MPEG-1/2 Layer II encoding</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_3</constant>&nbsp;</entry>
+                     <entry>MPEG-1/2 Layer III encoding</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_ENCODING_AAC</constant>&nbsp;</entry>
+                     <entry>MPEG-2/4 AAC (Advanced Audio Coding)</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_ENCODING_AC3</constant>&nbsp;</entry>
+                     <entry>AC-3 aka ATSC A/52 encoding</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-l1-bitrate">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L1_BITRATE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_l1_bitrate</entry>
+             </row><row><entry spanname="descr">MPEG-1/2 Layer I bitrate.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_32K</constant>&nbsp;</entry>
+                     <entry>32 kbit/s</entry></row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_64K</constant>&nbsp;</entry>
+                     <entry>64 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_96K</constant>&nbsp;</entry>
+                     <entry>96 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_128K</constant>&nbsp;</entry>
+                     <entry>128 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_160K</constant>&nbsp;</entry>
+                     <entry>160 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_192K</constant>&nbsp;</entry>
+                     <entry>192 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_224K</constant>&nbsp;</entry>
+                     <entry>224 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_256K</constant>&nbsp;</entry>
+                     <entry>256 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_288K</constant>&nbsp;</entry>
+                     <entry>288 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_320K</constant>&nbsp;</entry>
+                     <entry>320 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_352K</constant>&nbsp;</entry>
+                     <entry>352 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_384K</constant>&nbsp;</entry>
+                     <entry>384 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_416K</constant>&nbsp;</entry>
+                     <entry>416 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L1_BITRATE_448K</constant>&nbsp;</entry>
+                     <entry>448 kbit/s</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-l2-bitrate">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L2_BITRATE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_l2_bitrate</entry>
+             </row><row><entry spanname="descr">MPEG-1/2 Layer II bitrate.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_32K</constant>&nbsp;</entry>
+                     <entry>32 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_48K</constant>&nbsp;</entry>
+                     <entry>48 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_56K</constant>&nbsp;</entry>
+                     <entry>56 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_64K</constant>&nbsp;</entry>
+                     <entry>64 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_80K</constant>&nbsp;</entry>
+                     <entry>80 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_96K</constant>&nbsp;</entry>
+                     <entry>96 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_112K</constant>&nbsp;</entry>
+                     <entry>112 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_128K</constant>&nbsp;</entry>
+                     <entry>128 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_160K</constant>&nbsp;</entry>
+                     <entry>160 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_192K</constant>&nbsp;</entry>
+                     <entry>192 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_224K</constant>&nbsp;</entry>
+                     <entry>224 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_256K</constant>&nbsp;</entry>
+                     <entry>256 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_320K</constant>&nbsp;</entry>
+                     <entry>320 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L2_BITRATE_384K</constant>&nbsp;</entry>
+                     <entry>384 kbit/s</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-l3-bitrate">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L3_BITRATE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_l3_bitrate</entry>
+             </row><row><entry spanname="descr">MPEG-1/2 Layer III bitrate.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_32K</constant>&nbsp;</entry>
+                     <entry>32 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_40K</constant>&nbsp;</entry>
+                     <entry>40 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_48K</constant>&nbsp;</entry>
+                     <entry>48 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_56K</constant>&nbsp;</entry>
+                     <entry>56 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_64K</constant>&nbsp;</entry>
+                     <entry>64 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_80K</constant>&nbsp;</entry>
+                     <entry>80 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_96K</constant>&nbsp;</entry>
+                     <entry>96 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_112K</constant>&nbsp;</entry>
+                     <entry>112 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_128K</constant>&nbsp;</entry>
+                     <entry>128 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_160K</constant>&nbsp;</entry>
+                     <entry>160 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_192K</constant>&nbsp;</entry>
+                     <entry>192 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_224K</constant>&nbsp;</entry>
+                     <entry>224 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_256K</constant>&nbsp;</entry>
+                     <entry>256 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_L3_BITRATE_320K</constant>&nbsp;</entry>
+                     <entry>320 kbit/s</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_AAC_BITRATE</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">AAC bitrate in bits per second.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-ac3-bitrate">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_AC3_BITRATE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_ac3_bitrate</entry>
+             </row><row><entry spanname="descr">AC-3 bitrate.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_32K</constant>&nbsp;</entry>
+                     <entry>32 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_40K</constant>&nbsp;</entry>
+                     <entry>40 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_48K</constant>&nbsp;</entry>
+                     <entry>48 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_56K</constant>&nbsp;</entry>
+                     <entry>56 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_64K</constant>&nbsp;</entry>
+                     <entry>64 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_80K</constant>&nbsp;</entry>
+                     <entry>80 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_96K</constant>&nbsp;</entry>
+                     <entry>96 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_112K</constant>&nbsp;</entry>
+                     <entry>112 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_128K</constant>&nbsp;</entry>
+                     <entry>128 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_160K</constant>&nbsp;</entry>
+                     <entry>160 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_192K</constant>&nbsp;</entry>
+                     <entry>192 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_224K</constant>&nbsp;</entry>
+                     <entry>224 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_256K</constant>&nbsp;</entry>
+                     <entry>256 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_320K</constant>&nbsp;</entry>
+                     <entry>320 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_384K</constant>&nbsp;</entry>
+                     <entry>384 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_448K</constant>&nbsp;</entry>
+                     <entry>448 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_512K</constant>&nbsp;</entry>
+                     <entry>512 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_576K</constant>&nbsp;</entry>
+                     <entry>576 kbit/s</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_AC3_BITRATE_640K</constant>&nbsp;</entry>
+                     <entry>640 kbit/s</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-mode">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_MODE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_mode</entry>
+             </row><row><entry spanname="descr">MPEG Audio mode.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_STEREO</constant>&nbsp;</entry>
+                     <entry>Stereo</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_JOINT_STEREO</constant>&nbsp;</entry>
+                     <entry>Joint Stereo</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_DUAL</constant>&nbsp;</entry>
+                     <entry>Bilingual</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_MONO</constant>&nbsp;</entry>
+                     <entry>Mono</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-mode-extension">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_MODE_EXTENSION</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_mode_extension</entry>
+             </row><row><entry spanname="descr">Joint Stereo
+audio mode extension. In Layer I and II they indicate which subbands
+are in intensity stereo. All other subbands are coded in stereo. Layer
+III is not (yet) supported. Possible values
+are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4</constant>&nbsp;</entry>
+                     <entry>Subbands 4-31 in intensity stereo</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8</constant>&nbsp;</entry>
+                     <entry>Subbands 8-31 in intensity stereo</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12</constant>&nbsp;</entry>
+                     <entry>Subbands 12-31 in intensity stereo</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16</constant>&nbsp;</entry>
+                     <entry>Subbands 16-31 in intensity stereo</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-emphasis">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_EMPHASIS</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_emphasis</entry>
+             </row><row><entry spanname="descr">Audio Emphasis.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_EMPHASIS_NONE</constant>&nbsp;</entry>
+                     <entry>None</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS</constant>&nbsp;</entry>
+                     <entry>50/15 microsecond emphasis</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17</constant>&nbsp;</entry>
+                     <entry>CCITT J.17</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-audio-crc">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_CRC</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_audio_crc</entry>
+             </row><row><entry spanname="descr">CRC method. Possible
+values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_CRC_NONE</constant>&nbsp;</entry>
+                     <entry>None</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_AUDIO_CRC_CRC16</constant>&nbsp;</entry>
+                     <entry>16 bit parity check</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_MUTE</constant>&nbsp;</entry>
+               <entry>boolean</entry>
+             </row><row><entry spanname="descr">Mutes the audio when
+capturing. This is not done by muting audio hardware, which can still
+produce a slight hiss, but in the encoder itself, guaranteeing a fixed
+and reproducable audio bitstream. 0 = unmuted, 1 = muted.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-video-encoding">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_ENCODING</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_video_encoding</entry>
+             </row><row><entry spanname="descr">MPEG Video encoding
+method. Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_1</constant>&nbsp;</entry>
+                     <entry>MPEG-1 Video encoding</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_2</constant>&nbsp;</entry>
+                     <entry>MPEG-2 Video encoding</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC</constant>&nbsp;</entry>
+                     <entry>MPEG-4 AVC (H.264) Video encoding</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-video-aspect">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_ASPECT</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_video_aspect</entry>
+             </row><row><entry spanname="descr">Video aspect.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ASPECT_1x1</constant>&nbsp;</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ASPECT_4x3</constant>&nbsp;</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ASPECT_16x9</constant>&nbsp;</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_ASPECT_221x100</constant>&nbsp;</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_B_FRAMES</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Number of B-Frames
+(default 2)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_GOP_SIZE</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">GOP size (default
+12)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_GOP_CLOSURE</constant>&nbsp;</entry>
+               <entry>boolean</entry>
+             </row><row><entry spanname="descr">GOP closure (default
+1)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_PULLDOWN</constant>&nbsp;</entry>
+               <entry>boolean</entry>
+             </row><row><entry spanname="descr">Enable 3:2 pulldown
+(default 0)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-video-bitrate-mode">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_BITRATE_MODE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_video_bitrate_mode</entry>
+             </row><row><entry spanname="descr">Video bitrate mode.
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_BITRATE_MODE_VBR</constant>&nbsp;</entry>
+                     <entry>Variable bitrate</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_VIDEO_BITRATE_MODE_CBR</constant>&nbsp;</entry>
+                     <entry>Constant bitrate</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_BITRATE</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Video bitrate in bits
+per second.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_BITRATE_PEAK</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Peak video bitrate in
+bits per second. Must be larger or equal to the average video bitrate.
+It is ignored if the video bitrate mode is set to constant
+bitrate.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">For every captured
+frame, skip this many subsequent frames (default 0).</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MUTE</constant>&nbsp;</entry>
+               <entry>boolean</entry>
+             </row>
+             <row><entry spanname="descr">"Mutes" the video to a
+fixed color when capturing. This is useful for testing, to produce a
+fixed video bitstream. 0 = unmuted, 1 = muted.</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MUTE_YUV</constant>&nbsp;</entry>
+               <entry>integer</entry>
+             </row><row><entry spanname="descr">Sets the "mute" color
+of the video. The supplied 32-bit integer is interpreted as follows (bit
+0 = least significant bit):</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry>Bit 0:7</entry>
+                     <entry>V chrominance information</entry>
+                   </row>
+                   <row>
+                     <entry>Bit 8:15</entry>
+                     <entry>U chrominance information</entry>
+                   </row>
+                   <row>
+                     <entry>Bit 16:23</entry>
+                     <entry>Y luminance information</entry>
+                   </row>
+                   <row>
+                     <entry>Bit 24:31</entry>
+                     <entry>Must be zero.</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+           </tbody>
+         </tgroup>
+       </table>
+      </section>
+
+      <section>
+       <title>CX2341x MPEG Controls</title>
+
+       <para>The following MPEG class controls deal with MPEG
+encoding settings that are specific to the Conexant CX23415 and
+CX23416 MPEG encoding chips.</para>
+
+       <table pgwide="1" frame="none" id="cx2341x-control-id">
+         <title>CX2341x Control IDs</title>
+         <tgroup cols="4">
+           <colspec colname="c1" colwidth="1*" />
+           <colspec colname="c2" colwidth="6*" />
+           <colspec colname="c3" colwidth="2*" />
+           <colspec colname="c4" colwidth="6*" />
+           <spanspec namest="c1" nameend="c2" spanname="id" />
+           <spanspec namest="c2" nameend="c4" spanname="descr" />
+           <thead>
+             <row>
+               <entry spanname="id" align="left">ID</entry>
+               <entry align="left">Type</entry>
+             </row><row><entry spanname="descr" align="left">Description</entry>
+             </row>
+           </thead>
+           <tbody valign="top">
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-cx2341x-video-spatial-filter-mode">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_cx2341x_video_spatial_filter_mode</entry>
+             </row><row><entry spanname="descr">Sets the Spatial
+Filter mode (default <constant>MANUAL</constant>). Possible values
+are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL</constant>&nbsp;</entry>
+                     <entry>Choose the filter manually</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO</constant>&nbsp;</entry>
+                     <entry>Choose the filter automatically</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-15)</entry>
+             </row><row><entry spanname="descr">The setting for the
+Spatial Filter. 0 = off, 15 = maximum. (Default is 0.)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="luma-spatial-filter-type">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_cx2341x_video_luma_spatial_filter_type</entry>
+             </row><row><entry spanname="descr">Select the algorithm
+to use for the Luma Spatial Filter (default
+<constant>1D_HOR</constant>). Possible values:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF</constant>&nbsp;</entry>
+                     <entry>No filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR</constant>&nbsp;</entry>
+                     <entry>One-dimensional horizontal</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT</constant>&nbsp;</entry>
+                     <entry>One-dimensional vertical</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE</constant>&nbsp;</entry>
+                     <entry>Two-dimensional separable</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE</constant>&nbsp;</entry>
+                     <entry>Two-dimensional symmetrical
+non-separable</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="chroma-spatial-filter-type">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type</entry>
+             </row><row><entry spanname="descr">Select the algorithm
+for the Chroma Spatial Filter (default <constant>1D_HOR</constant>).
+Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF</constant>&nbsp;</entry>
+                     <entry>No filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR</constant>&nbsp;</entry>
+                     <entry>One-dimensional horizontal</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-cx2341x-video-temporal-filter-mode">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_cx2341x_video_temporal_filter_mode</entry>
+             </row><row><entry spanname="descr">Sets the Temporal
+Filter mode (default <constant>MANUAL</constant>). Possible values
+are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL</constant>&nbsp;</entry>
+                     <entry>Choose the filter manually</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO</constant>&nbsp;</entry>
+                     <entry>Choose the filter automatically</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-31)</entry>
+             </row><row><entry spanname="descr">The setting for the
+Temporal Filter. 0 = off, 31 = maximum. (Default is 8 for full-scale
+capturing and 0 for scaled capturing.)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row id="v4l2-mpeg-cx2341x-video-median-filter-type">
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE</constant>&nbsp;</entry>
+               <entry>enum&nbsp;v4l2_mpeg_cx2341x_video_median_filter_type</entry>
+             </row><row><entry spanname="descr">Median Filter Type
+(default <constant>OFF</constant>). Possible values are:</entry>
+             </row>
+             <row>
+               <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF</constant>&nbsp;</entry>
+                     <entry>No filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR</constant>&nbsp;</entry>
+                     <entry>Horizontal filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT</constant>&nbsp;</entry>
+                     <entry>Vertical filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT</constant>&nbsp;</entry>
+                     <entry>Horizontal and vertical filter</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG</constant>&nbsp;</entry>
+                     <entry>Diagonal filter</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-255)</entry>
+             </row><row><entry spanname="descr">Threshold above which
+the luminance median filter is enabled (default 0)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-255)</entry>
+             </row><row><entry spanname="descr">Threshold below which
+the luminance median filter is enabled (default 255)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-255)</entry>
+             </row><row><entry spanname="descr">Threshold above which
+the chroma median filter is enabled (default 0)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP</constant>&nbsp;</entry>
+               <entry>integer&nbsp;(0-255)</entry>
+             </row><row><entry spanname="descr">Threshold below which
+the chroma median filter is enabled (default 255)</entry>
+             </row>
+             <row><entry></entry></row>
+             <row>
+               <entry spanname="id"><constant>V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS</constant>&nbsp;</entry>
+               <entry>boolean</entry>
+             </row>
+             <row><entry spanname="descr">The CX2341X MPEG encoder
+can insert one empty MPEG-2 PES packet into the stream between every
+four video frames. The packet size is 2048 bytes, including the
+packet_start_code_prefix and stream_id fields. The stream_id is 0xBF
+(private stream 2). The payload consists of 0x00 bytes, to be filled
+in by the application. 0 = do not insert, 1 = insert packets.</entry>
+             </row>
+           </tbody>
+         </tgroup>
+       </table>
+      </section>
+    </section>
+
+    <section id="camera-controls">
+      <title>Camera Control Reference</title>
+
+      <para>The Camera class includes controls for mechanical (or
+equivalent digital) features of a device such as controllable lenses
+or sensors.</para>
+
+    <table pgwide="1" frame="none" id="camera-control-id">
+      <title>Camera Control IDs</title>
+      <tgroup cols="4">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="6*" />
+       <colspec colname="c3" colwidth="2*" />
+       <colspec colname="c4" colwidth="6*" />
+       <spanspec namest="c1" nameend="c2" spanname="id" />
+       <spanspec namest="c2" nameend="c4" spanname="descr" />
+       <thead>
+         <row>
+           <entry spanname="id" align="left">ID</entry>
+           <entry align="left">Type</entry>
+         </row><row rowsep="1"><entry spanname="descr" align="left">Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row><entry></entry></row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_CAMERA_CLASS</constant>&nbsp;</entry>
+           <entry>class</entry>
+         </row><row><entry spanname="descr">The Camera class
+descriptor. Calling &VIDIOC-QUERYCTRL; for this control will return a
+description of this control class.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row id="v4l2-exposure-auto-type">
+           <entry spanname="id"><constant>V4L2_CID_EXPOSURE_AUTO</constant>&nbsp;</entry>
+           <entry>enum&nbsp;v4l2_exposure_auto_type</entry>
+         </row><row><entry spanname="descr">Enables automatic
+adjustments of the exposure time and/or iris aperture. The effect of
+manual changes of the exposure time or iris aperture while these
+features are enabled is undefined, drivers should ignore such
+requests. Possible values are:</entry>
+         </row>
+         <row>
+           <entrytbl spanname="descr" cols="2">
+             <tbody valign="top">
+               <row>
+                 <entry><constant>V4L2_EXPOSURE_AUTO</constant>&nbsp;</entry>
+                     <entry>Automatic exposure time, automatic iris
+aperture.</entry>
+               </row>
+               <row>
+                 <entry><constant>V4L2_EXPOSURE_MANUAL</constant>&nbsp;</entry>
+                 <entry>Manual exposure time, manual iris.</entry>
+               </row>
+               <row>
+                 <entry><constant>V4L2_EXPOSURE_SHUTTER_PRIORITY</constant>&nbsp;</entry>
+                 <entry>Manual exposure time, auto iris.</entry>
+               </row>
+               <row>
+                 <entry><constant>V4L2_EXPOSURE_APERTURE_PRIORITY</constant>&nbsp;</entry>
+                 <entry>Auto exposure time, manual iris.</entry>
+               </row>
+             </tbody>
+           </entrytbl>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_EXPOSURE_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">Determines the exposure
+time of the camera sensor. The exposure time is limited by the frame
+interval. Drivers should interpret the values as 100 &micro;s units,
+where the value 1 stands for 1/10000th of a second, 10000 for 1 second
+and 100000 for 10 seconds.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_EXPOSURE_AUTO_PRIORITY</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row><row><entry spanname="descr">When
+<constant>V4L2_CID_EXPOSURE_AUTO</constant> is set to
+<constant>AUTO</constant> or <constant>APERTURE_PRIORITY</constant>,
+this control determines if the device may dynamically vary the frame
+rate. By default this feature is disabled (0) and the frame rate must
+remain constant.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PAN_RELATIVE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control turns the
+camera horizontally by the specified amount. The unit is undefined. A
+positive value moves the camera to the right (clockwise when viewed
+from above), a negative value to the left. A value of zero does not
+cause motion. This is a write-only control.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TILT_RELATIVE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control turns the
+camera vertically by the specified amount. The unit is undefined. A
+positive value moves the camera up, a negative value down. A value of
+zero does not cause motion. This is a write-only control.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PAN_RESET</constant>&nbsp;</entry>
+           <entry>button</entry>
+         </row><row><entry spanname="descr">When this control is set,
+the camera moves horizontally to the default position.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TILT_RESET</constant>&nbsp;</entry>
+           <entry>button</entry>
+         </row><row><entry spanname="descr">When this control is set,
+the camera moves vertically to the default position.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PAN_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control
+turns the camera horizontally to the specified position. Positive
+values move the camera to the right (clockwise when viewed from above),
+negative values to the left. Drivers should interpret the values as arc
+seconds, with valid values between -180 * 3600 and +180 * 3600
+inclusive.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TILT_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control
+turns the camera vertically to the specified position. Positive values
+move the camera up, negative values down. Drivers should interpret the
+values as arc seconds, with valid values between -180 * 3600 and +180
+* 3600 inclusive.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_FOCUS_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control sets the
+focal point of the camera to the specified position. The unit is
+undefined. Positive values set the focus closer to the camera,
+negative values towards infinity.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_FOCUS_RELATIVE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">This control moves the
+focal point of the camera by the specified amount. The unit is
+undefined. Positive values move the focus closer to the camera,
+negative values towards infinity. This is a write-only control.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_FOCUS_AUTO</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row><row><entry spanname="descr">Enables automatic focus
+adjustments. The effect of manual focus adjustments while this feature
+is enabled is undefined, drivers should ignore such requests.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_ZOOM_ABSOLUTE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">Specify the objective lens
+focal length as an absolute value. The zoom unit is driver-specific and its
+value should be a positive integer.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_ZOOM_RELATIVE</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">Specify the objective lens
+focal length relatively to the current value. Positive values move the zoom
+lens group towards the telephoto direction, negative values towards the
+wide-angle direction. The zoom unit is driver-specific. This is a write-only control.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_ZOOM_CONTINUOUS</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">Move the objective lens group
+at the specified speed until it reaches physical device limits or until an
+explicit request to stop the movement. A positive value moves the zoom lens
+group towards the telephoto direction. A value of zero stops the zoom lens
+group movement. A negative value moves the zoom lens group towards the
+wide-angle direction. The zoom speed unit is driver-specific.</entry>
+         </row>
+         <row><entry></entry></row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PRIVACY</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row><row><entry spanname="descr">Prevent video from being acquired
+by the camera. When this control is set to <constant>TRUE</constant> (1), no
+image can be captured by the camera. Common means to enforce privacy are
+mechanical obturation of the sensor and firmware image processing, but the
+device is not restricted to these methods. Devices that implement the privacy
+control must support read access and may support write access.</entry>
+         </row>
+
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_BAND_STOP_FILTER</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row><row><entry spanname="descr">Switch the band-stop filter of a
+camera sensor on or off, or specify its strength. Such band-stop filters can
+be used, for example, to filter out the fluorescent light component.</entry>
+         </row>
+         <row><entry></entry></row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+    <section id="fm-tx-controls">
+      <title>FM Transmitter Control Reference</title>
+
+      <para>The FM Transmitter (FM_TX) class includes controls for common features of
+FM transmissions capable devices. Currently this class includes parameters for audio
+compression, pilot tone generation, audio deviation limiter, RDS transmission and
+tuning power features.</para>
+
+      <table pgwide="1" frame="none" id="fm-tx-control-id">
+      <title>FM_TX Control IDs</title>
+
+      <tgroup cols="4">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="6*" />
+       <colspec colname="c3" colwidth="2*" />
+       <colspec colname="c4" colwidth="6*" />
+       <spanspec namest="c1" nameend="c2" spanname="id" />
+       <spanspec namest="c2" nameend="c4" spanname="descr" />
+       <thead>
+         <row>
+           <entry spanname="id" align="left">ID</entry>
+           <entry align="left">Type</entry>
+         </row><row rowsep="1"><entry spanname="descr" align="left">Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row><entry></entry></row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_FM_TX_CLASS</constant>&nbsp;</entry>
+           <entry>class</entry>
+         </row><row><entry spanname="descr">The FM_TX class
+descriptor. Calling &VIDIOC-QUERYCTRL; for this control will return a
+description of this control class.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_RDS_TX_DEVIATION</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Configures RDS signal frequency deviation level in Hz.
+The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_RDS_TX_PI</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the RDS Programme Identification field
+for transmission.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_RDS_TX_PTY</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the RDS Programme Type field for transmission.
+This encodes up to 31 pre-defined programme types.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_RDS_TX_PS_NAME</constant>&nbsp;</entry>
+           <entry>string</entry>
+         </row>
+         <row><entry spanname="descr">Sets the Programme Service name (PS_NAME) for transmission.
+It is intended for static display on a receiver. It is the primary aid to listeners in programme service
+identification and selection.  In Annex E of <xref linkend="en50067" />, the RDS specification,
+there is a full description of the correct character encoding for Programme Service name strings.
+Also from RDS specification, PS is usually a single eight character text. However, it is also possible
+to find receivers which can scroll strings sized as 8 x N characters. So, this control must be configured
+with steps of 8 characters. The result is it must always contain a string with size multiple of 8.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_RDS_TX_RADIO_TEXT</constant>&nbsp;</entry>
+           <entry>string</entry>
+         </row>
+         <row><entry spanname="descr">Sets the Radio Text info for transmission. It is a textual description of
+what is being broadcasted. RDS Radio Text can be applied when broadcaster wishes to transmit longer PS names,
+programme-related information or any other text. In these cases, RadioText should be used in addition to
+<constant>V4L2_CID_RDS_TX_PS_NAME</constant>. The encoding for Radio Text strings is also fully described
+in Annex E of <xref linkend="en50067" />. The length of Radio Text strings depends on which RDS Block is being
+used to transmit it, either 32 (2A block) or 64 (2B block).  However, it is also possible
+to find receivers which can scroll strings sized as 32 x N or 64 x N characters. So, this control must be configured
+with steps of 32 or 64 characters. The result is it must always contain a string with size multiple of 32 or 64. </entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_LIMITER_ENABLED</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row>
+         <row><entry spanname="descr">Enables or disables the audio deviation limiter feature.
+The limiter is useful when trying to maximize the audio volume, minimize receiver-generated
+distortion and prevent overmodulation.
+</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_LIMITER_RELEASE_TIME</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the audio deviation limiter feature release time.
+Unit is in useconds. Step and range are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_LIMITER_DEVIATION</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Configures audio frequency deviation level in Hz.
+The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_COMPRESSION_ENABLED</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row>
+         <row><entry spanname="descr">Enables or disables the audio compression feature.
+This feature amplifies signals below the threshold by a fixed gain and compresses audio
+signals above the threshold by the ratio of Threshold/(Gain + Threshold).</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_COMPRESSION_GAIN</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the gain for audio compression feature. It is
+a dB value. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_COMPRESSION_THRESHOLD</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the threshold level for audio compression freature.
+It is a dB value. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the attack time for audio compression feature.
+It is a useconds value. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the release time for audio compression feature.
+It is a useconds value. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PILOT_TONE_ENABLED</constant>&nbsp;</entry>
+           <entry>boolean</entry>
+         </row>
+         <row><entry spanname="descr">Enables or disables the pilot tone generation feature.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PILOT_TONE_DEVIATION</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Configures pilot tone frequency deviation level. Unit is
+in Hz. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_PILOT_TONE_FREQUENCY</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Configures pilot tone frequency value. Unit is
+in Hz. The range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TUNE_PREEMPHASIS</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row id="v4l2-preemphasis"><entry spanname="descr">Configures the pre-emphasis value for broadcasting.
+A pre-emphasis filter is applied to the broadcast to accentuate the high audio frequencies.
+Depending on the region, a time constant of either 50 or 75 useconds is used. The enum&nbsp;v4l2_preemphasis
+defines possible values for pre-emphasis. Here they are:</entry>
+       </row><row>
+       <entrytbl spanname="descr" cols="2">
+                 <tbody valign="top">
+                   <row>
+                     <entry><constant>V4L2_PREEMPHASIS_DISABLED</constant>&nbsp;</entry>
+                     <entry>No pre-emphasis is applied.</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_PREEMPHASIS_50_uS</constant>&nbsp;</entry>
+                     <entry>A pre-emphasis of 50 uS is used.</entry>
+                   </row>
+                   <row>
+                     <entry><constant>V4L2_PREEMPHASIS_75_uS</constant>&nbsp;</entry>
+                     <entry>A pre-emphasis of 75 uS is used.</entry>
+                   </row>
+                 </tbody>
+               </entrytbl>
+
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TUNE_POWER_LEVEL</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">Sets the output power level for signal transmission.
+Unit is in dBuV. Range and step are driver-specific.</entry>
+         </row>
+         <row>
+           <entry spanname="id"><constant>V4L2_CID_TUNE_ANTENNA_CAPACITOR</constant>&nbsp;</entry>
+           <entry>integer</entry>
+         </row>
+         <row><entry spanname="descr">This selects the value of antenna tuning capacitor
+manually or automatically if set to zero. Unit, range and step are driver-specific.</entry>
+         </row>
+         <row><entry></entry></row>
+       </tbody>
+      </tgroup>
+      </table>
+
+<para>For more details about RDS specification, refer to
+<xref linkend="en50067" /> document, from CENELEC.</para>
+    </section>
+</section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "common.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/crop.gif b/Documentation/DocBook/v4l/crop.gif
new file mode 100644 (file)
index 0000000..3b9e7d8
Binary files /dev/null and b/Documentation/DocBook/v4l/crop.gif differ
diff --git a/Documentation/DocBook/v4l/crop.pdf b/Documentation/DocBook/v4l/crop.pdf
new file mode 100644 (file)
index 0000000..c9fb81c
Binary files /dev/null and b/Documentation/DocBook/v4l/crop.pdf differ
diff --git a/Documentation/DocBook/v4l/dev-capture.xml b/Documentation/DocBook/v4l/dev-capture.xml
new file mode 100644 (file)
index 0000000..32807e4
--- /dev/null
@@ -0,0 +1,115 @@
+  <title>Video Capture Interface</title>
+
+  <para>Video capture devices sample an analog video signal and store
+the digitized images in memory. Today nearly all devices can capture
+at full 25 or 30 frames/second. With this interface applications can
+control the capture process and move images from the driver into user
+space.</para>
+
+  <para>Conventionally V4L2 video capture devices are accessed through
+character device special files named <filename>/dev/video</filename>
+and <filename>/dev/video0</filename> to
+<filename>/dev/video63</filename> with major number 81 and minor
+numbers 0 to 63. <filename>/dev/video</filename> is typically a
+symbolic link to the preferred video device. Note the same device
+files are used for video output devices.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the video capture interface set the
+<constant>V4L2_CAP_VIDEO_CAPTURE</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. As secondary device functions
+they may also support the <link linkend="overlay">video overlay</link>
+(<constant>V4L2_CAP_VIDEO_OVERLAY</constant>) and the <link
+linkend="raw-vbi">raw VBI capture</link>
+(<constant>V4L2_CAP_VBI_CAPTURE</constant>) interface. At least one of
+the read/write or streaming I/O methods must be supported. Tuners and
+audio inputs are optional.</para>
+  </section>
+
+  <section>
+    <title>Supplemental Functions</title>
+
+    <para>Video capture devices shall support <link
+linkend="audio">audio input</link>, <link
+linkend="tuner">tuner</link>, <link linkend="control">controls</link>,
+<link linkend="crop">cropping and scaling</link> and <link
+linkend="streaming-par">streaming parameter</link> ioctls as needed.
+The <link linkend="video">video input</link> and <link
+linkend="standard">video standard</link> ioctls must be supported by
+all video capture devices.</para>
+  </section>
+
+  <section>
+    <title>Image Format Negotiation</title>
+
+    <para>The result of a capture operation is determined by
+cropping and image format parameters. The former select an area of the
+video picture to capture, the latter how images are stored in memory,
+&ie; in RGB or YUV format, the number of bits per pixel or width and
+height. Together they also define how images are scaled in the
+process.</para>
+
+    <para>As usual these parameters are <emphasis>not</emphasis> reset
+at &func-open; time to permit Unix tool chains, programming a device
+and then reading from it as if it was a plain file. Well written V4L2
+applications ensure they really get what they want, including cropping
+and scaling.</para>
+
+    <para>Cropping initialization at minimum requires to reset the
+parameters to defaults. An example is given in <xref
+linkend="crop" />.</para>
+
+    <para>To query the current image format applications set the
+<structfield>type</structfield> field of a &v4l2-format; to
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant> and call the
+&VIDIOC-G-FMT; ioctl with a pointer to this structure. Drivers fill
+the &v4l2-pix-format; <structfield>pix</structfield> member of the
+<structfield>fmt</structfield> union.</para>
+
+    <para>To request different parameters applications set the
+<structfield>type</structfield> field of a &v4l2-format; as above and
+initialize all fields of the &v4l2-pix-format;
+<structfield>vbi</structfield> member of the
+<structfield>fmt</structfield> union, or better just modify the
+results of <constant>VIDIOC_G_FMT</constant>, and call the
+&VIDIOC-S-FMT; ioctl with a pointer to this structure. Drivers may
+adjust the parameters and finally return the actual parameters as
+<constant>VIDIOC_G_FMT</constant> does.</para>
+
+    <para>Like <constant>VIDIOC_S_FMT</constant> the
+&VIDIOC-TRY-FMT; ioctl can be used to learn about hardware limitations
+without disabling I/O or possibly time consuming hardware
+preparations.</para>
+
+    <para>The contents of &v4l2-pix-format; are discussed in <xref
+linkend="pixfmt" />. See also the specification of the
+<constant>VIDIOC_G_FMT</constant>, <constant>VIDIOC_S_FMT</constant>
+and <constant>VIDIOC_TRY_FMT</constant> ioctls for details. Video
+capture devices must implement both the
+<constant>VIDIOC_G_FMT</constant> and
+<constant>VIDIOC_S_FMT</constant> ioctl, even if
+<constant>VIDIOC_S_FMT</constant> ignores all requests and always
+returns default parameters as <constant>VIDIOC_G_FMT</constant> does.
+<constant>VIDIOC_TRY_FMT</constant> is optional.</para>
+  </section>
+
+  <section>
+    <title>Reading Images</title>
+
+    <para>A video capture device may support the <link
+linkend="rw">read() function</link> and/or streaming (<link
+linkend="mmap">memory mapping</link> or <link
+linkend="userp">user pointer</link>) I/O. See <xref
+linkend="io" /> for details.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-codec.xml b/Documentation/DocBook/v4l/dev-codec.xml
new file mode 100644 (file)
index 0000000..6e156dc
--- /dev/null
@@ -0,0 +1,26 @@
+  <title>Codec Interface</title>
+
+  <note>
+    <title>Suspended</title>
+
+    <para>This interface has been be suspended from the V4L2 API
+implemented in Linux 2.6 until we have more experience with codec
+device interfaces.</para>
+  </note>
+
+  <para>A V4L2 codec can compress, decompress, transform, or otherwise
+convert video data from one format into another format, in memory.
+Applications send data to be converted to the driver through a
+&func-write; call, and receive the converted data through a
+&func-read; call. For efficiency a driver may also support streaming
+I/O.</para>
+
+  <para>[to do]</para>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-effect.xml b/Documentation/DocBook/v4l/dev-effect.xml
new file mode 100644 (file)
index 0000000..9c243be
--- /dev/null
@@ -0,0 +1,25 @@
+  <title>Effect Devices Interface</title>
+
+  <note>
+    <title>Suspended</title>
+
+    <para>This interface has been be suspended from the V4L2 API
+implemented in Linux 2.6 until we have more experience with effect
+device interfaces.</para>
+  </note>
+
+  <para>A V4L2 video effect device can do image effects, filtering, or
+combine two or more images or image streams. For example video
+transitions or wipes. Applications send data to be processed and
+receive the result data either with &func-read; and &func-write;
+functions, or through the streaming I/O mechanism.</para>
+
+  <para>[to do]</para>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-osd.xml b/Documentation/DocBook/v4l/dev-osd.xml
new file mode 100644 (file)
index 0000000..c9a68a2
--- /dev/null
@@ -0,0 +1,164 @@
+  <title>Video Output Overlay Interface</title>
+  <subtitle>Also known as On-Screen Display (OSD)</subtitle>
+
+  <note>
+    <title>Experimental</title>
+
+    <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+  </note>
+
+  <para>Some video output devices can overlay a framebuffer image onto
+the outgoing video signal. Applications can set up such an overlay
+using this interface, which borrows structures and ioctls of the <link
+linkend="overlay">Video Overlay</link> interface.</para>
+
+  <para>The OSD function is accessible through the same character
+special file as the <link linkend="capture">Video Output</link> function.
+Note the default function of such a <filename>/dev/video</filename> device
+is video capturing or output. The OSD function is only available after
+calling the &VIDIOC-S-FMT; ioctl.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the <wordasword>Video Output
+Overlay</wordasword> interface set the
+<constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl.</para>
+  </section>
+
+  <section>
+    <title>Framebuffer</title>
+
+    <para>Contrary to the <wordasword>Video Overlay</wordasword>
+interface the framebuffer is normally implemented on the TV card and
+not the graphics card. On Linux it is accessible as a framebuffer
+device (<filename>/dev/fbN</filename>). Given a V4L2 device,
+applications can find the corresponding framebuffer device by calling
+the &VIDIOC-G-FBUF; ioctl. It returns, amongst other information, the
+physical address of the framebuffer in the
+<structfield>base</structfield> field of &v4l2-framebuffer;. The
+framebuffer device ioctl <constant>FBIOGET_FSCREENINFO</constant>
+returns the same address in the <structfield>smem_start</structfield>
+field of struct <structname>fb_fix_screeninfo</structname>. The
+<constant>FBIOGET_FSCREENINFO</constant> ioctl and struct
+<structname>fb_fix_screeninfo</structname> are defined in the
+<filename>linux/fb.h</filename> header file.</para>
+
+    <para>The width and height of the framebuffer depends on the
+current video standard. A V4L2 driver may reject attempts to change
+the video standard (or any other ioctl which would imply a framebuffer
+size change) with an &EBUSY; until all applications closed the
+framebuffer device.</para>
+
+    <example>
+      <title>Finding a framebuffer device for OSD</title>
+
+      <programlisting>
+#include &lt;linux/fb.h&gt;
+
+&v4l2-framebuffer; fbuf;
+unsigned int i;
+int fb_fd;
+
+if (-1 == ioctl (fd, VIDIOC_G_FBUF, &amp;fbuf)) {
+       perror ("VIDIOC_G_FBUF");
+       exit (EXIT_FAILURE);
+}
+
+for (i = 0; i &gt; 30; ++i) {
+       char dev_name[16];
+       struct fb_fix_screeninfo si;
+
+       snprintf (dev_name, sizeof (dev_name), "/dev/fb%u", i);
+
+       fb_fd = open (dev_name, O_RDWR);
+       if (-1 == fb_fd) {
+               switch (errno) {
+               case ENOENT: /* no such file */
+               case ENXIO:  /* no driver */
+                       continue;
+
+               default:
+                       perror ("open");
+                       exit (EXIT_FAILURE);
+               }
+       }
+
+       if (0 == ioctl (fb_fd, FBIOGET_FSCREENINFO, &amp;si)) {
+               if (si.smem_start == (unsigned long) fbuf.base)
+                       break;
+       } else {
+               /* Apparently not a framebuffer device. */
+       }
+
+       close (fb_fd);
+       fb_fd = -1;
+}
+
+/* fb_fd is the file descriptor of the framebuffer device
+   for the video output overlay, or -1 if no device was found. */
+</programlisting>
+    </example>
+  </section>
+
+  <section>
+    <title>Overlay Window and Scaling</title>
+
+    <para>The overlay is controlled by source and target rectangles.
+The source rectangle selects a subsection of the framebuffer image to
+be overlaid, the target rectangle an area in the outgoing video signal
+where the image will appear. Drivers may or may not support scaling,
+and arbitrary sizes and positions of these rectangles. Further drivers
+may support any (or none) of the clipping/blending methods defined for
+the <link linkend="overlay">Video Overlay</link> interface.</para>
+
+    <para>A &v4l2-window; defines the size of the source rectangle,
+its position in the framebuffer and the clipping/blending method to be
+used for the overlay. To get the current parameters applications set
+the <structfield>type</structfield> field of a &v4l2-format; to
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant> and call the
+&VIDIOC-G-FMT; ioctl. The driver fills the
+<structname>v4l2_window</structname> substructure named
+<structfield>win</structfield>. It is not possible to retrieve a
+previously programmed clipping list or bitmap.</para>
+
+    <para>To program the source rectangle applications set the
+<structfield>type</structfield> field of a &v4l2-format; to
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant>, initialize
+the <structfield>win</structfield> substructure and call the
+&VIDIOC-S-FMT; ioctl. The driver adjusts the parameters against
+hardware limits and returns the actual parameters as
+<constant>VIDIOC_G_FMT</constant> does. Like
+<constant>VIDIOC_S_FMT</constant>, the &VIDIOC-TRY-FMT; ioctl can be
+used to learn about driver capabilities without actually changing
+driver state. Unlike <constant>VIDIOC_S_FMT</constant> this also works
+after the overlay has been enabled.</para>
+
+    <para>A &v4l2-crop; defines the size and position of the target
+rectangle. The scaling factor of the overlay is implied by the width
+and height given in &v4l2-window; and &v4l2-crop;. The cropping API
+applies to <wordasword>Video Output</wordasword> and <wordasword>Video
+Output Overlay</wordasword> devices in the same way as to
+<wordasword>Video Capture</wordasword> and <wordasword>Video
+Overlay</wordasword> devices, merely reversing the direction of the
+data flow. For more information see <xref linkend="crop" />.</para>
+  </section>
+
+  <section>
+    <title>Enabling Overlay</title>
+
+    <para>There is no V4L2 ioctl to enable or disable the overlay,
+however the framebuffer interface of the driver may support the
+<constant>FBIOBLANK</constant> ioctl.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-output.xml b/Documentation/DocBook/v4l/dev-output.xml
new file mode 100644 (file)
index 0000000..63c3c20
--- /dev/null
@@ -0,0 +1,111 @@
+  <title>Video Output Interface</title>
+
+  <para>Video output devices encode stills or image sequences as
+analog video signal. With this interface applications can
+control the encoding process and move images from user space to
+the driver.</para>
+
+  <para>Conventionally V4L2 video output devices are accessed through
+character device special files named <filename>/dev/video</filename>
+and <filename>/dev/video0</filename> to
+<filename>/dev/video63</filename> with major number 81 and minor
+numbers 0 to 63. <filename>/dev/video</filename> is typically a
+symbolic link to the preferred video device. Note the same device
+files are used for video capture devices.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the video output interface set the
+<constant>V4L2_CAP_VIDEO_OUTPUT</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. As secondary device functions
+they may also support the <link linkend="raw-vbi">raw VBI
+output</link> (<constant>V4L2_CAP_VBI_OUTPUT</constant>) interface. At
+least one of the read/write or streaming I/O methods must be
+supported. Modulators and audio outputs are optional.</para>
+  </section>
+
+  <section>
+    <title>Supplemental Functions</title>
+
+    <para>Video output devices shall support <link
+linkend="audio">audio output</link>, <link
+linkend="tuner">modulator</link>, <link linkend="control">controls</link>,
+<link linkend="crop">cropping and scaling</link> and <link
+linkend="streaming-par">streaming parameter</link> ioctls as needed.
+The <link linkend="video">video output</link> and <link
+linkend="standard">video standard</link> ioctls must be supported by
+all video output devices.</para>
+  </section>
+
+  <section>
+    <title>Image Format Negotiation</title>
+
+    <para>The output is determined by cropping and image format
+parameters. The former select an area of the video picture where the
+image will appear, the latter how images are stored in memory, &ie; in
+RGB or YUV format, the number of bits per pixel or width and height.
+Together they also define how images are scaled in the process.</para>
+
+    <para>As usual these parameters are <emphasis>not</emphasis> reset
+at &func-open; time to permit Unix tool chains, programming a device
+and then writing to it as if it was a plain file. Well written V4L2
+applications ensure they really get what they want, including cropping
+and scaling.</para>
+
+    <para>Cropping initialization at minimum requires to reset the
+parameters to defaults. An example is given in <xref
+linkend="crop" />.</para>
+
+    <para>To query the current image format applications set the
+<structfield>type</structfield> field of a &v4l2-format; to
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant> and call the
+&VIDIOC-G-FMT; ioctl with a pointer to this structure. Drivers fill
+the &v4l2-pix-format; <structfield>pix</structfield> member of the
+<structfield>fmt</structfield> union.</para>
+
+    <para>To request different parameters applications set the
+<structfield>type</structfield> field of a &v4l2-format; as above and
+initialize all fields of the &v4l2-pix-format;
+<structfield>vbi</structfield> member of the
+<structfield>fmt</structfield> union, or better just modify the
+results of <constant>VIDIOC_G_FMT</constant>, and call the
+&VIDIOC-S-FMT; ioctl with a pointer to this structure. Drivers may
+adjust the parameters and finally return the actual parameters as
+<constant>VIDIOC_G_FMT</constant> does.</para>
+
+    <para>Like <constant>VIDIOC_S_FMT</constant> the
+&VIDIOC-TRY-FMT; ioctl can be used to learn about hardware limitations
+without disabling I/O or possibly time consuming hardware
+preparations.</para>
+
+    <para>The contents of &v4l2-pix-format; are discussed in <xref
+linkend="pixfmt" />. See also the specification of the
+<constant>VIDIOC_G_FMT</constant>, <constant>VIDIOC_S_FMT</constant>
+and <constant>VIDIOC_TRY_FMT</constant> ioctls for details. Video
+output devices must implement both the
+<constant>VIDIOC_G_FMT</constant> and
+<constant>VIDIOC_S_FMT</constant> ioctl, even if
+<constant>VIDIOC_S_FMT</constant> ignores all requests and always
+returns default parameters as <constant>VIDIOC_G_FMT</constant> does.
+<constant>VIDIOC_TRY_FMT</constant> is optional.</para>
+  </section>
+
+  <section>
+    <title>Writing Images</title>
+
+    <para>A video output device may support the <link
+linkend="rw">write() function</link> and/or streaming (<link
+linkend="mmap">memory mapping</link> or <link
+linkend="userp">user pointer</link>) I/O. See <xref
+linkend="io" /> for details.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-overlay.xml b/Documentation/DocBook/v4l/dev-overlay.xml
new file mode 100644 (file)
index 0000000..92513cf
--- /dev/null
@@ -0,0 +1,379 @@
+  <title>Video Overlay Interface</title>
+  <subtitle>Also known as Framebuffer Overlay or Previewing</subtitle>
+
+  <para>Video overlay devices have the ability to genlock (TV-)video
+into the (VGA-)video signal of a graphics card, or to store captured
+images directly in video memory of a graphics card, typically with
+clipping. This can be considerable more efficient than capturing
+images and displaying them by other means. In the old days when only
+nuclear power plants needed cooling towers this used to be the only
+way to put live video into a window.</para>
+
+  <para>Video overlay devices are accessed through the same character
+special files as <link linkend="capture">video capture</link> devices.
+Note the default function of a <filename>/dev/video</filename> device
+is video capturing. The overlay function is only available after
+calling the &VIDIOC-S-FMT; ioctl.</para>
+
+    <para>The driver may support simultaneous overlay and capturing
+using the read/write and streaming I/O methods. If so, operation at
+the nominal frame rate of the video standard is not guaranteed. Frames
+may be directed away from overlay to capture, or one field may be used
+for overlay and the other for capture if the capture parameters permit
+this.</para>
+
+  <para>Applications should use different file descriptors for
+capturing and overlay. This must be supported by all drivers capable
+of simultaneous capturing and overlay. Optionally these drivers may
+also permit capturing and overlay with a single file descriptor for
+compatibility with V4L and earlier versions of V4L2.<footnote>
+       <para>A common application of two file descriptors is the
+XFree86 <link linkend="xvideo">Xv/V4L</link> interface driver and
+a V4L2 application. While the X server controls video overlay, the
+application can take advantage of memory mapping and DMA.</para>
+       <para>In the opinion of the designers of this API, no driver
+writer taking the efforts to support simultaneous capturing and
+overlay will restrict this ability by requiring a single file
+descriptor, as in V4L and earlier versions of V4L2. Making this
+optional means applications depending on two file descriptors need
+backup routines to be compatible with all drivers, which is
+considerable more work than using two fds in applications which do
+not. Also two fd's fit the general concept of one file descriptor for
+each logical stream. Hence as a complexity trade-off drivers
+<emphasis>must</emphasis> support two file descriptors and
+<emphasis>may</emphasis> support single fd operation.</para>
+      </footnote></para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the video overlay interface set the
+<constant>V4L2_CAP_VIDEO_OVERLAY</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. The overlay I/O method specified
+below must be supported. Tuners and audio inputs are optional.</para>
+  </section>
+
+  <section>
+    <title>Supplemental Functions</title>
+
+    <para>Video overlay devices shall support <link
+linkend="audio">audio input</link>, <link
+linkend="tuner">tuner</link>, <link linkend="control">controls</link>,
+<link linkend="crop">cropping and scaling</link> and <link
+linkend="streaming-par">streaming parameter</link> ioctls as needed.
+The <link linkend="video">video input</link> and <link
+linkend="standard">video standard</link> ioctls must be supported by
+all video overlay devices.</para>
+  </section>
+
+  <section>
+    <title>Setup</title>
+
+    <para>Before overlay can commence applications must program the
+driver with frame buffer parameters, namely the address and size of
+the frame buffer and the image format, for example RGB 5:6:5. The
+&VIDIOC-G-FBUF; and &VIDIOC-S-FBUF; ioctls are available to get
+and set these parameters, respectively. The
+<constant>VIDIOC_S_FBUF</constant> ioctl is privileged because it
+allows to set up DMA into physical memory, bypassing the memory
+protection mechanisms of the kernel. Only the superuser can change the
+frame buffer address and size. Users are not supposed to run TV
+applications as root or with SUID bit set. A small helper application
+with suitable privileges should query the graphics system and program
+the V4L2 driver at the appropriate time.</para>
+
+    <para>Some devices add the video overlay to the output signal
+of the graphics card. In this case the frame buffer is not modified by
+the video device, and the frame buffer address and pixel format are
+not needed by the driver. The <constant>VIDIOC_S_FBUF</constant> ioctl
+is not privileged. An application can check for this type of device by
+calling the <constant>VIDIOC_G_FBUF</constant> ioctl.</para>
+
+    <para>A driver may support any (or none) of five clipping/blending
+methods:<orderedlist>
+       <listitem>
+         <para>Chroma-keying displays the overlaid image only where
+pixels in the primary graphics surface assume a certain color.</para>
+       </listitem>
+       <listitem>
+         <para>A bitmap can be specified where each bit corresponds
+to a pixel in the overlaid image. When the bit is set, the
+corresponding video pixel is displayed, otherwise a pixel of the
+graphics surface.</para>
+       </listitem>
+       <listitem>
+         <para>A list of clipping rectangles can be specified. In
+these regions <emphasis>no</emphasis> video is displayed, so the
+graphics surface can be seen here.</para>
+       </listitem>
+       <listitem>
+         <para>The framebuffer has an alpha channel that can be used
+to clip or blend the framebuffer with the video.</para>
+       </listitem>
+       <listitem>
+         <para>A global alpha value can be specified to blend the
+framebuffer contents with video images.</para>
+       </listitem>
+      </orderedlist></para>
+
+    <para>When simultaneous capturing and overlay is supported and
+the hardware prohibits different image and frame buffer formats, the
+format requested first takes precedence. The attempt to capture
+(&VIDIOC-S-FMT;) or overlay (&VIDIOC-S-FBUF;) may fail with an
+&EBUSY; or return accordingly modified parameters..</para>
+  </section>
+
+  <section>
+    <title>Overlay Window</title>
+
+    <para>The overlaid image is determined by cropping and overlay
+window parameters. The former select an area of the video picture to
+capture, the latter how images are overlaid and clipped. Cropping
+initialization at minimum requires to reset the parameters to
+defaults. An example is given in <xref linkend="crop" />.</para>
+
+    <para>The overlay window is described by a &v4l2-window;. It
+defines the size of the image, its position over the graphics surface
+and the clipping to be applied. To get the current parameters
+applications set the <structfield>type</structfield> field of a
+&v4l2-format; to <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant> and
+call the &VIDIOC-G-FMT; ioctl. The driver fills the
+<structname>v4l2_window</structname> substructure named
+<structfield>win</structfield>. It is not possible to retrieve a
+previously programmed clipping list or bitmap.</para>
+
+    <para>To program the overlay window applications set the
+<structfield>type</structfield> field of a &v4l2-format; to
+<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, initialize the
+<structfield>win</structfield> substructure and call the
+&VIDIOC-S-FMT; ioctl. The driver adjusts the parameters against
+hardware limits and returns the actual parameters as
+<constant>VIDIOC_G_FMT</constant> does. Like
+<constant>VIDIOC_S_FMT</constant>, the &VIDIOC-TRY-FMT; ioctl can be
+used to learn about driver capabilities without actually changing
+driver state. Unlike <constant>VIDIOC_S_FMT</constant> this also works
+after the overlay has been enabled.</para>
+
+    <para>The scaling factor of the overlaid image is implied by the
+width and height given in &v4l2-window; and the size of the cropping
+rectangle. For more information see <xref linkend="crop" />.</para>
+
+    <para>When simultaneous capturing and overlay is supported and
+the hardware prohibits different image and window sizes, the size
+requested first takes precedence. The attempt to capture or overlay as
+well (&VIDIOC-S-FMT;) may fail with an &EBUSY; or return accordingly
+modified parameters.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-window">
+      <title>struct <structname>v4l2_window</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-rect;</entry>
+           <entry><structfield>w</structfield></entry>
+           <entry>Size and position of the window relative to the
+top, left corner of the frame buffer defined with &VIDIOC-S-FBUF;. The
+window can extend the frame buffer width and height, the
+<structfield>x</structfield> and <structfield>y</structfield>
+coordinates can be negative, and it can lie completely outside the
+frame buffer. The driver clips the window accordingly, or if that is
+not possible, modifies its size and/or position.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-field;</entry>
+           <entry><structfield>field</structfield></entry>
+           <entry>Applications set this field to determine which
+video field shall be overlaid, typically one of
+<constant>V4L2_FIELD_ANY</constant> (0),
+<constant>V4L2_FIELD_TOP</constant>,
+<constant>V4L2_FIELD_BOTTOM</constant> or
+<constant>V4L2_FIELD_INTERLACED</constant>. Drivers may have to choose
+a different field order and return the actual setting here.</entry>
+           </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>chromakey</structfield></entry>
+           <entry>When chroma-keying has been negotiated with
+&VIDIOC-S-FBUF; applications set this field to the desired pixel value
+for the chroma key. The format is the same as the pixel format of the
+framebuffer (&v4l2-framebuffer;
+<structfield>fmt.pixelformat</structfield> field), with bytes in host
+order. E.&nbsp;g. for <link
+linkend="V4L2-PIX-FMT-BGR32"><constant>V4L2_PIX_FMT_BGR24</constant></link>
+the value should be 0xRRGGBB on a little endian, 0xBBGGRR on a big
+endian host.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-clip; *</entry>
+           <entry><structfield>clips</structfield></entry>
+           <entry>When chroma-keying has <emphasis>not</emphasis>
+been negotiated and &VIDIOC-G-FBUF; indicated this capability,
+applications can set this field to point to an array of
+clipping rectangles.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry>Like the window coordinates
+<structfield>w</structfield>, clipping rectangles are defined relative
+to the top, left corner of the frame buffer. However clipping
+rectangles must not extend the frame buffer width and height, and they
+must not overlap. If possible applications should merge adjacent
+rectangles. Whether this must create x-y or y-x bands, or the order of
+rectangles, is not defined. When clip lists are not supported the
+driver ignores this field. Its contents after calling &VIDIOC-S-FMT;
+are undefined.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>clipcount</structfield></entry>
+           <entry>When the application set the
+<structfield>clips</structfield> field, this field must contain the
+number of clipping rectangles in the list. When clip lists are not
+supported the driver ignores this field, its contents after calling
+<constant>VIDIOC_S_FMT</constant> are undefined. When clip lists are
+supported but no clipping is desired this field must be set to
+zero.</entry>
+         </row>
+         <row>
+           <entry>void *</entry>
+           <entry><structfield>bitmap</structfield></entry>
+           <entry>When chroma-keying has
+<emphasis>not</emphasis> been negotiated and &VIDIOC-G-FBUF; indicated
+this capability, applications can set this field to point to a
+clipping bit mask.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>It must be of the same size
+as the window, <structfield>w.width</structfield> and
+<structfield>w.height</structfield>. Each bit corresponds to a pixel
+in the overlaid image, which is displayed only when the bit is
+<emphasis>set</emphasis>. Pixel coordinates translate to bits like:
+<programlisting>
+((__u8 *) <structfield>bitmap</structfield>)[<structfield>w.width</structfield> * y + x / 8] &amp; (1 &lt;&lt; (x &amp; 7))</programlisting></para><para>where <structfield>0</structfield> &le; x &lt;
+<structfield>w.width</structfield> and <structfield>0</structfield> &le;
+y &lt;<structfield>w.height</structfield>.<footnote>
+                 <para>Should we require
+             <structfield>w.width</structfield> to be a multiple of
+             eight?</para>
+               </footnote></para><para>When a clipping
+bit mask is not supported the driver ignores this field, its contents
+after calling &VIDIOC-S-FMT; are undefined. When a bit mask is supported
+but no clipping is desired this field must be set to
+<constant>NULL</constant>.</para><para>Applications need not create a
+clip list or bit mask. When they pass both, or despite negotiating
+chroma-keying, the results are undefined. Regardless of the chosen
+method, the clipping abilities of the hardware may be limited in
+quantity or quality. The results when these limits are exceeded are
+undefined.<footnote>
+                 <para>When the image is written into frame buffer
+memory it will be undesirable if the driver clips out less pixels
+than expected, because the application and graphics system are not
+aware these regions need to be refreshed. The driver should clip out
+more pixels or not write the image at all.</para>
+               </footnote></para></entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>global_alpha</structfield></entry>
+           <entry>The global alpha value used to blend the
+framebuffer with video images, if global alpha blending has been
+negotiated (<constant>V4L2_FBUF_FLAG_GLOBAL_ALPHA</constant>, see
+&VIDIOC-S-FBUF;, <xref linkend="framebuffer-flags" />).</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry>Note this field was added in Linux 2.6.23, extending the structure. However
+the <link linkend="vidioc-g-fmt">VIDIOC_G/S/TRY_FMT</link> ioctls,
+which take a pointer to a <link
+linkend="v4l2-format">v4l2_format</link> parent structure with padding
+bytes at the end, are not affected.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-clip">
+      <title>struct <structname>v4l2_clip</structname><footnote>
+         <para>The X Window system defines "regions" which are
+vectors of struct BoxRec { short x1, y1, x2, y2; } with width = x2 -
+x1 and height = y2 - y1, so one cannot pass X11 clip lists
+directly.</para>
+       </footnote></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-rect;</entry>
+           <entry><structfield>c</structfield></entry>
+           <entry>Coordinates of the clipping rectangle, relative to
+the top, left corner of the frame buffer. Only window pixels
+<emphasis>outside</emphasis> all clipping rectangles are
+displayed.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-clip; *</entry>
+           <entry><structfield>next</structfield></entry>
+           <entry>Pointer to the next clipping rectangle, NULL when
+this is the last rectangle. Drivers ignore this field, it cannot be
+used to pass a linked list of clipping rectangles.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- NB for easier reading this table is duplicated
+    in the vidioc-cropcap chapter.-->
+
+    <table pgwide="1" frame="none" id="v4l2-rect">
+      <title>struct <structname>v4l2_rect</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>left</structfield></entry>
+           <entry>Horizontal offset of the top, left corner of the
+rectangle, in pixels.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>top</structfield></entry>
+           <entry>Vertical offset of the top, left corner of the
+rectangle, in pixels. Offsets increase to the right and down.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>width</structfield></entry>
+           <entry>Width of the rectangle, in pixels.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>height</structfield></entry>
+           <entry>Height of the rectangle, in pixels. Width and
+height cannot be negative, the fields are signed for hysterical
+reasons. <!-- video4linux-list@redhat.com on 22 Oct 2002 subject
+"Re:[V4L][patches!] Re:v4l2/kernel-2.5" --></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section>
+    <title>Enabling Overlay</title>
+
+    <para>To start or stop the frame buffer overlay applications call
+the &VIDIOC-OVERLAY; ioctl.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-radio.xml b/Documentation/DocBook/v4l/dev-radio.xml
new file mode 100644 (file)
index 0000000..73aa90b
--- /dev/null
@@ -0,0 +1,57 @@
+  <title>Radio Interface</title>
+
+  <para>This interface is intended for AM and FM (analog) radio
+receivers and transmitters.</para>
+
+  <para>Conventionally V4L2 radio devices are accessed through
+character device special files named <filename>/dev/radio</filename>
+and <filename>/dev/radio0</filename> to
+<filename>/dev/radio63</filename> with major number 81 and minor
+numbers 64 to 127.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the radio interface set the
+<constant>V4L2_CAP_RADIO</constant> and
+<constant>V4L2_CAP_TUNER</constant> or
+<constant>V4L2_CAP_MODULATOR</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. Other combinations of
+capability flags are reserved for future extensions.</para>
+  </section>
+
+  <section>
+    <title>Supplemental Functions</title>
+
+    <para>Radio devices can support <link
+linkend="control">controls</link>, and must support the <link
+linkend="tuner">tuner or modulator</link> ioctls.</para>
+
+    <para>They do not support the video input or output, audio input
+or output, video standard, cropping and scaling, compression and
+streaming parameter, or overlay ioctls. All other ioctls and I/O
+methods are reserved for future extensions.</para>
+  </section>
+
+  <section>
+    <title>Programming</title>
+
+    <para>Radio devices may have a couple audio controls (as discussed
+in <xref linkend="control" />) such as a volume control, possibly custom
+controls. Further all radio devices have one tuner or modulator (these are
+discussed in <xref linkend="tuner" />) with index number zero to select
+the radio frequency and to determine if a monaural or FM stereo
+program is received/emitted. Drivers switch automatically between AM and FM
+depending on the selected frequency. The &VIDIOC-G-TUNER; or
+&VIDIOC-G-MODULATOR; ioctl
+reports the supported frequency range.</para>
+  </section>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+ -->
diff --git a/Documentation/DocBook/v4l/dev-raw-vbi.xml b/Documentation/DocBook/v4l/dev-raw-vbi.xml
new file mode 100644 (file)
index 0000000..c5a70bd
--- /dev/null
@@ -0,0 +1,347 @@
+  <title>Raw VBI Data Interface</title>
+
+  <para>VBI is an abbreviation of Vertical Blanking Interval, a gap
+in the sequence of lines of an analog video signal. During VBI
+no picture information is transmitted, allowing some time while the
+electron beam of a cathode ray tube TV returns to the top of the
+screen. Using an oscilloscope you will find here the vertical
+synchronization pulses and short data packages ASK
+modulated<footnote><para>ASK: Amplitude-Shift Keying. A high signal
+level represents a '1' bit, a low level a '0' bit.</para></footnote>
+onto the video signal. These are transmissions of services such as
+Teletext or Closed Caption.</para>
+
+  <para>Subject of this interface type is raw VBI data, as sampled off
+a video signal, or to be added to a signal for output.
+The data format is similar to uncompressed video images, a number of
+lines times a number of samples per line, we call this a VBI image.</para>
+
+  <para>Conventionally V4L2 VBI devices are accessed through character
+device special files named <filename>/dev/vbi</filename> and
+<filename>/dev/vbi0</filename> to <filename>/dev/vbi31</filename> with
+major number 81 and minor numbers 224 to 255.
+<filename>/dev/vbi</filename> is typically a symbolic link to the
+preferred VBI device. This convention applies to both input and output
+devices.</para>
+
+  <para>To address the problems of finding related video and VBI
+devices VBI capturing and output is also available as device function
+under <filename>/dev/video</filename>. To capture or output raw VBI
+data with these devices applications must call the &VIDIOC-S-FMT;
+ioctl. Accessed as <filename>/dev/vbi</filename>, raw VBI capturing
+or output is the default device function.</para>
+
+    <section>
+      <title>Querying Capabilities</title>
+
+      <para>Devices supporting the raw VBI capturing or output API set
+the <constant>V4L2_CAP_VBI_CAPTURE</constant> or
+<constant>V4L2_CAP_VBI_OUTPUT</constant> flags, respectively, in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. At least one of the
+read/write, streaming or asynchronous I/O methods must be
+supported. VBI devices may or may not have a tuner or modulator.</para>
+    </section>
+
+    <section>
+      <title>Supplemental Functions</title>
+
+      <para>VBI devices shall support <link linkend="video">video
+input or output</link>, <link linkend="tuner">tuner or
+modulator</link>, and <link linkend="control">controls</link> ioctls
+as needed. The <link linkend="standard">video standard</link> ioctls provide
+information vital to program a VBI device, therefore must be
+supported.</para>
+    </section>
+
+    <section>
+      <title>Raw VBI Format Negotiation</title>
+
+      <para>Raw VBI sampling abilities can vary, in particular the
+sampling frequency. To properly interpret the data V4L2 specifies an
+ioctl to query the sampling parameters. Moreover, to allow for some
+flexibility applications can also suggest different parameters.</para>
+
+      <para>As usual these parameters are <emphasis>not</emphasis>
+reset at &func-open; time to permit Unix tool chains, programming a
+device and then reading from it as if it was a plain file. Well
+written V4L2 applications should always ensure they really get what
+they want, requesting reasonable parameters and then checking if the
+actual parameters are suitable.</para>
+
+      <para>To query the current raw VBI capture parameters
+applications set the <structfield>type</structfield> field of a
+&v4l2-format; to <constant>V4L2_BUF_TYPE_VBI_CAPTURE</constant> or
+<constant>V4L2_BUF_TYPE_VBI_OUTPUT</constant>, and call the
+&VIDIOC-G-FMT; ioctl with a pointer to this structure. Drivers fill
+the &v4l2-vbi-format; <structfield>vbi</structfield> member of the
+<structfield>fmt</structfield> union.</para>
+
+      <para>To request different parameters applications set the
+<structfield>type</structfield> field of a &v4l2-format; as above and
+initialize all fields of the &v4l2-vbi-format;
+<structfield>vbi</structfield> member of the
+<structfield>fmt</structfield> union, or better just modify the
+results of <constant>VIDIOC_G_FMT</constant>, and call the
+&VIDIOC-S-FMT; ioctl with a pointer to this structure. Drivers return
+an &EINVAL; only when the given parameters are ambiguous, otherwise
+they modify the parameters according to the hardware capabilites and
+return the actual parameters. When the driver allocates resources at
+this point, it may return an &EBUSY; to indicate the returned
+parameters are valid but the required resources are currently not
+available. That may happen for instance when the video and VBI areas
+to capture would overlap, or when the driver supports multiple opens
+and another process already requested VBI capturing or output. Anyway,
+applications must expect other resource allocation points which may
+return <errorcode>EBUSY</errorcode>, at the &VIDIOC-STREAMON; ioctl
+and the first read(), write() and select() call.</para>
+
+      <para>VBI devices must implement both the
+<constant>VIDIOC_G_FMT</constant> and
+<constant>VIDIOC_S_FMT</constant> ioctl, even if
+<constant>VIDIOC_S_FMT</constant> ignores all requests and always
+returns default parameters as <constant>VIDIOC_G_FMT</constant> does.
+<constant>VIDIOC_TRY_FMT</constant> is optional.</para>
+
+      <table pgwide="1" frame="none" id="v4l2-vbi-format">
+       <title>struct <structname>v4l2_vbi_format</structname></title>
+       <tgroup cols="3">
+         &cs-str;
+         <tbody valign="top">
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>sampling_rate</structfield></entry>
+             <entry>Samples per second, i.&nbsp;e. unit 1 Hz.</entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>offset</structfield></entry>
+             <entry><para>Horizontal offset of the VBI image,
+relative to the leading edge of the line synchronization pulse and
+counted in samples: The first sample in the VBI image will be located
+<structfield>offset</structfield> /
+<structfield>sampling_rate</structfield> seconds following the leading
+edge. See also <xref linkend="vbi-hsync" />.</para></entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>samples_per_line</structfield></entry>
+             <entry></entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>sample_format</structfield></entry>
+             <entry><para>Defines the sample format as in <xref
+linkend="pixfmt" />, a four-character-code.<footnote>
+                   <para>A few devices may be unable to
+sample VBI data at all but can extend the video capture window to the
+VBI region.</para>
+                 </footnote> Usually this is
+<constant>V4L2_PIX_FMT_GREY</constant>, i.&nbsp;e. each sample
+consists of 8 bits with lower values oriented towards the black level.
+Do not assume any other correlation of values with the signal level.
+For example, the MSB does not necessarily indicate if the signal is
+'high' or 'low' because 128 may not be the mean value of the
+signal. Drivers shall not convert the sample format by software.</para></entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>start</structfield>[2]</entry>
+             <entry>This is the scanning system line number
+associated with the first line of the VBI image, of the first and the
+second field respectively. See <xref linkend="vbi-525" /> and
+<xref linkend="vbi-625" /> for valid values. VBI input drivers can
+return start values 0 if the hardware cannot reliable identify
+scanning lines, VBI acquisition may not require this
+information.</entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>count</structfield>[2]</entry>
+             <entry>The number of lines in the first and second
+field image, respectively.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>Drivers should be as
+flexibility as possible. For example, it may be possible to extend or
+move the VBI capture window down to the picture area, implementing a
+'full field mode' to capture data service transmissions embedded in
+the picture.</para><para>An application can set the first or second
+<structfield>count</structfield> value to zero if no data is required
+from the respective field; <structfield>count</structfield>[1] if the
+scanning system is progressive, &ie; not interlaced. The
+corresponding start value shall be ignored by the application and
+driver. Anyway, drivers may not support single field capturing and
+return both count values non-zero.</para><para>Both
+<structfield>count</structfield> values set to zero, or line numbers
+outside the bounds depicted in <xref linkend="vbi-525" /> and <xref
+                   linkend="vbi-625" />, or a field image covering
+lines of two fields, are invalid and shall not be returned by the
+driver.</para><para>To initialize the <structfield>start</structfield>
+and <structfield>count</structfield> fields, applications must first
+determine the current video standard selection. The &v4l2-std-id; or
+the <structfield>framelines</structfield> field of &v4l2-standard; can
+be evaluated for this purpose.</para></entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>flags</structfield></entry>
+             <entry>See <xref linkend="vbifmt-flags" /> below. Currently
+only drivers set flags, applications must set this field to
+zero.</entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>reserved</structfield>[2]</entry>
+             <entry>This array is reserved for future extensions.
+Drivers and applications must set it to zero.</entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+
+      <table pgwide="1" frame="none" id="vbifmt-flags">
+       <title>Raw VBI Format Flags</title>
+       <tgroup cols="3">
+         &cs-def;
+         <tbody valign="top">
+           <row>
+             <entry><constant>V4L2_VBI_UNSYNC</constant></entry>
+             <entry>0x0001</entry>
+             <entry><para>This flag indicates hardware which does not
+properly distinguish between fields. Normally the VBI image stores the
+first field (lower scanning line numbers) first in memory. This may be
+a top or bottom field depending on the video standard. When this flag
+is set the first or second field may be stored first, however the
+fields are still in correct temporal order with the older field first
+in memory.<footnote>
+                 <para>Most VBI services transmit on both fields, but
+some have different semantics depending on the field number. These
+cannot be reliable decoded or encoded when
+<constant>V4L2_VBI_UNSYNC</constant> is set.</para>
+               </footnote></para></entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_VBI_INTERLACED</constant></entry>
+             <entry>0x0002</entry>
+             <entry>By default the two field images will be passed
+sequentially; all lines of the first field followed by all lines of
+the second field (compare <xref linkend="field-order" />
+<constant>V4L2_FIELD_SEQ_TB</constant> and
+<constant>V4L2_FIELD_SEQ_BT</constant>, whether the top or bottom
+field is first in memory depends on the video standard). When this
+flag is set, the two fields are interlaced (cf.
+<constant>V4L2_FIELD_INTERLACED</constant>). The first line of the
+first field followed by the first line of the second field, then the
+two second lines, and so on. Such a layout may be necessary when the
+hardware has been programmed to capture or output interlaced video
+images and is unable to separate the fields for VBI capturing at
+the same time. For simplicity setting this flag implies that both
+<structfield>count</structfield> values are equal and non-zero.</entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+
+      <figure id="vbi-hsync">
+       <title>Line synchronization</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="vbi_hsync.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="vbi_hsync.gif" format="GIF" />
+         </imageobject>
+         <textobject>
+           <phrase>Line synchronization diagram</phrase>
+         </textobject>
+       </mediaobject>
+      </figure>
+
+      <figure id="vbi-525">
+       <title>ITU-R 525 line numbering (M/NTSC and M/PAL)</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="vbi_525.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="vbi_525.gif" format="GIF" />
+         </imageobject>
+         <textobject>
+           <phrase>NTSC field synchronization diagram</phrase>
+         </textobject>
+         <caption>
+           <para>(1) For the purpose of this specification field 2
+starts in line 264 and not 263.5 because half line capturing is not
+supported.</para>
+         </caption>
+       </mediaobject>
+      </figure>
+
+      <figure id="vbi-625">
+       <title>ITU-R 625 line numbering</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="vbi_625.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="vbi_625.gif" format="GIF" />
+         </imageobject>
+         <textobject>
+           <phrase>PAL/SECAM field synchronization diagram</phrase>
+         </textobject>
+         <caption>
+           <para>(1) For the purpose of this specification field 2
+starts in line 314 and not 313.5 because half line capturing is not
+supported.</para>
+         </caption>
+       </mediaobject>
+      </figure>
+
+      <para>Remember the VBI image format depends on the selected
+video standard, therefore the application must choose a new standard or
+query the current standard first. Attempts to read or write data ahead
+of format negotiation, or after switching the video standard which may
+invalidate the negotiated VBI parameters, should be refused by the
+driver. A format change during active I/O is not permitted.</para>
+    </section>
+
+    <section>
+      <title>Reading and writing VBI images</title>
+
+      <para>To assure synchronization with the field number and easier
+implementation, the smallest unit of data passed at a time is one
+frame, consisting of two fields of VBI images immediately following in
+memory.</para>
+
+      <para>The total size of a frame computes as follows:</para>
+
+      <programlisting>
+(<structfield>count</structfield>[0] + <structfield>count</structfield>[1]) *
+<structfield>samples_per_line</structfield> * sample size in bytes</programlisting>
+
+      <para>The sample size is most likely always one byte,
+applications must check the <structfield>sample_format</structfield>
+field though, to function properly with other drivers.</para>
+
+      <para>A VBI device may support <link
+      linkend="rw">read/write</link> and/or streaming (<link
+      linkend="mmap">memory mapping</link> or <link
+      linkend="userp">user pointer</link>) I/O. The latter bears the
+possibility of synchronizing video and
+VBI data by using buffer timestamps.</para>
+
+      <para>Remember the &VIDIOC-STREAMON; ioctl and the first read(),
+write() and select() call can be resource allocation points returning
+an &EBUSY; if the required hardware resources are temporarily
+unavailable, for example the device is already in use by another
+process.</para>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/dev-rds.xml b/Documentation/DocBook/v4l/dev-rds.xml
new file mode 100644 (file)
index 0000000..0869d70
--- /dev/null
@@ -0,0 +1,168 @@
+     <title>RDS Interface</title>
+
+      <para>The Radio Data System transmits supplementary
+information in binary format, for example the station name or travel
+information, on an inaudible audio subcarrier of a radio program. This
+interface is aimed at devices capable of receiving and decoding RDS
+information.</para>
+
+      <para>For more information see the core RDS standard <xref linkend="en50067" />
+and the RBDS standard <xref linkend="nrsc4" />.</para>
+
+      <para>Note that the RBDS standard as is used in the USA is almost identical
+to the RDS standard. Any RDS decoder can also handle RBDS. Only some of the fields
+have slightly different meanings. See the RBDS standard for more information.</para>
+
+      <para>The RBDS standard also specifies support for MMBS (Modified Mobile Search).
+This is a proprietary format which seems to be discontinued. The RDS interface does not
+support this format. Should support for MMBS (or the so-called 'E blocks' in general)
+be needed, then please contact the linux-media mailing list: &v4l-ml;.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the RDS capturing API
+set the <constant>V4L2_CAP_RDS_CAPTURE</constant> flag in
+the <structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl.
+Any tuner that supports RDS will set the
+<constant>V4L2_TUNER_CAP_RDS</constant> flag in the <structfield>capability</structfield>
+field of &v4l2-tuner;.
+Whether an RDS signal is present can be detected by looking at
+the <structfield>rxsubchans</structfield> field of &v4l2-tuner;: the
+<constant>V4L2_TUNER_SUB_RDS</constant> will be set if RDS data was detected.</para>
+
+    <para>Devices supporting the RDS output API
+set the <constant>V4L2_CAP_RDS_OUTPUT</constant> flag in
+the <structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl.
+Any modulator that supports RDS will set the
+<constant>V4L2_TUNER_CAP_RDS</constant> flag in the <structfield>capability</structfield>
+field of &v4l2-modulator;.
+In order to enable the RDS transmission one must set the <constant>V4L2_TUNER_SUB_RDS</constant>
+bit in the <structfield>txsubchans</structfield> field of &v4l2-modulator;.</para>
+
+  </section>
+
+  <section>
+    <title>Reading RDS data</title>
+
+      <para>RDS data can be read from the radio device
+with the &func-read; function. The data is packed in groups of three bytes,
+as follows:</para>
+    <table frame="none" pgwide="1" id="v4l2-rds-data">
+      <title>struct
+<structname>v4l2_rds_data</structname></title>
+      <tgroup cols="3">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colname="c3" colwidth="5*" />
+       <tbody valign="top">
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>lsb</structfield></entry>
+           <entry>Least Significant Byte of RDS Block</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>msb</structfield></entry>
+           <entry>Most Significant Byte of RDS Block</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>block</structfield></entry>
+           <entry>Block description</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+    <table frame="none" pgwide="1" id="v4l2-rds-block">
+      <title>Block description</title>
+      <tgroup cols="2">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="5*" />
+       <tbody valign="top">
+         <row>
+           <entry>Bits 0-2</entry>
+           <entry>Block (aka offset) of the received data.</entry>
+         </row>
+         <row>
+           <entry>Bits 3-5</entry>
+           <entry>Deprecated. Currently identical to bits 0-2. Do not use these bits.</entry>
+         </row>
+         <row>
+           <entry>Bit 6</entry>
+           <entry>Corrected bit. Indicates that an error was corrected for this data block.</entry>
+         </row>
+         <row>
+           <entry>Bit 7</entry>
+           <entry>Error bit. Indicates that an uncorrectable error occurred during reception of this block.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-rds-block-codes">
+      <title>Block defines</title>
+      <tgroup cols="3">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colname="c3" colwidth="5*" />
+       <tbody valign="top">
+         <row>
+           <entry>V4L2_RDS_BLOCK_MSK</entry>
+           <entry>7</entry>
+           <entry>Mask for bits 0-2 to get the block ID.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_A</entry>
+           <entry>0</entry>
+           <entry>Block A.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_B</entry>
+           <entry>1</entry>
+           <entry>Block B.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_C</entry>
+           <entry>2</entry>
+           <entry>Block C.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_D</entry>
+           <entry>3</entry>
+           <entry>Block D.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_C_ALT</entry>
+           <entry>4</entry>
+           <entry>Block C'.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_INVALID</entry>
+           <entry>7</entry>
+           <entry>An invalid block.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_CORRECTED</entry>
+           <entry>0x40</entry>
+           <entry>A bit error was detected but corrected.</entry>
+         </row>
+         <row>
+           <entry>V4L2_RDS_BLOCK_ERROR</entry>
+           <entry>0x80</entry>
+           <entry>An incorrectable error occurred.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+ -->
diff --git a/Documentation/DocBook/v4l/dev-sliced-vbi.xml b/Documentation/DocBook/v4l/dev-sliced-vbi.xml
new file mode 100644 (file)
index 0000000..69e789f
--- /dev/null
@@ -0,0 +1,708 @@
+  <title>Sliced VBI Data Interface</title>
+
+  <para>VBI stands for Vertical Blanking Interval, a gap in the
+sequence of lines of an analog video signal. During VBI no picture
+information is transmitted, allowing some time while the electron beam
+of a cathode ray tube TV returns to the top of the screen.</para>
+
+  <para>Sliced VBI devices use hardware to demodulate data transmitted
+in the VBI. V4L2 drivers shall <emphasis>not</emphasis> do this by
+software, see also the <link linkend="raw-vbi">raw VBI
+interface</link>. The data is passed as short packets of fixed size,
+covering one scan line each. The number of packets per video frame is
+variable.</para>
+
+  <para>Sliced VBI capture and output devices are accessed through the
+same character special files as raw VBI devices. When a driver
+supports both interfaces, the default function of a
+<filename>/dev/vbi</filename> device is <emphasis>raw</emphasis> VBI
+capturing or output, and the sliced VBI function is only available
+after calling the &VIDIOC-S-FMT; ioctl as defined below. Likewise a
+<filename>/dev/video</filename> device may support the sliced VBI API,
+however the default function here is video capturing or output.
+Different file descriptors must be used to pass raw and sliced VBI
+data simultaneously, if this is supported by the driver.</para>
+
+  <section>
+    <title>Querying Capabilities</title>
+
+    <para>Devices supporting the sliced VBI capturing or output API
+set the <constant>V4L2_CAP_SLICED_VBI_CAPTURE</constant> or
+<constant>V4L2_CAP_SLICED_VBI_OUTPUT</constant> flag respectively, in
+the <structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl. At least one of the
+read/write, streaming or asynchronous <link linkend="io">I/O
+methods</link> must be supported. Sliced VBI devices may have a tuner
+or modulator.</para>
+  </section>
+
+  <section>
+    <title>Supplemental Functions</title>
+
+    <para>Sliced VBI devices shall support <link linkend="video">video
+input or output</link> and <link linkend="tuner">tuner or
+modulator</link> ioctls if they have these capabilities, and they may
+support <link linkend="control">control</link> ioctls. The <link
+linkend="standard">video standard</link> ioctls provide information
+vital to program a sliced VBI device, therefore must be
+supported.</para>
+  </section>
+
+  <section id="sliced-vbi-format-negotitation">
+    <title>Sliced VBI Format Negotiation</title>
+
+    <para>To find out which data services are supported by the
+hardware applications can call the &VIDIOC-G-SLICED-VBI-CAP; ioctl.
+All drivers implementing the sliced VBI interface must support this
+ioctl. The results may differ from those of the &VIDIOC-S-FMT; ioctl
+when the number of VBI lines the hardware can capture or output per
+frame, or the number of services it can identify on a given line are
+limited. For example on PAL line 16 the hardware may be able to look
+for a VPS or Teletext signal, but not both at the same time.</para>
+
+    <para>To determine the currently selected services applications
+set the <structfield>type </structfield> field of &v4l2-format; to
+<constant> V4L2_BUF_TYPE_SLICED_VBI_CAPTURE</constant> or <constant>
+V4L2_BUF_TYPE_SLICED_VBI_OUTPUT</constant>, and the &VIDIOC-G-FMT;
+ioctl fills the <structfield>fmt.sliced</structfield> member, a
+&v4l2-sliced-vbi-format;.</para>
+
+    <para>Applications can request different parameters by
+initializing or modifying the <structfield>fmt.sliced</structfield>
+member and calling the &VIDIOC-S-FMT; ioctl with a pointer to the
+<structname>v4l2_format</structname> structure.</para>
+
+    <para>The sliced VBI API is more complicated than the raw VBI API
+because the hardware must be told which VBI service to expect on each
+scan line. Not all services may be supported by the hardware on all
+lines (this is especially true for VBI output where Teletext is often
+unsupported and other services can only be inserted in one specific
+line). In many cases, however, it is sufficient to just set the
+<structfield>service_set</structfield> field to the required services
+and let the driver fill the <structfield>service_lines</structfield>
+array according to hardware capabilities. Only if more precise control
+is needed should the programmer set the
+<structfield>service_lines</structfield> array explicitly.</para>
+
+    <para>The &VIDIOC-S-FMT; ioctl modifies the parameters
+according to hardware capabilities. When the driver allocates
+resources at this point, it may return an &EBUSY; if the required
+resources are temporarily unavailable. Other resource allocation
+points which may return <errorcode>EBUSY</errorcode> can be the
+&VIDIOC-STREAMON; ioctl and the first &func-read;, &func-write; and
+&func-select; call.</para>
+
+    <table frame="none" pgwide="1" id="v4l2-sliced-vbi-format">
+      <title>struct
+<structname>v4l2_sliced_vbi_format</structname></title>
+      <tgroup cols="5">
+       <colspec colname="c1" colwidth="3*" />
+       <colspec colname="c2" colwidth="3*" />
+       <colspec colname="c3" colwidth="2*" />
+       <colspec colname="c4" colwidth="2*" />
+       <colspec colname="c5" colwidth="2*" />
+       <spanspec namest="c3" nameend="c5" spanname="hspan" />
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>service_set</structfield></entry>
+           <entry spanname="hspan"><para>If
+<structfield>service_set</structfield> is non-zero when passed with
+&VIDIOC-S-FMT; or &VIDIOC-TRY-FMT;, the
+<structfield>service_lines</structfield> array will be filled by the
+driver according to the services specified in this field. For example,
+if <structfield>service_set</structfield> is initialized with
+<constant>V4L2_SLICED_TELETEXT_B | V4L2_SLICED_WSS_625</constant>, a
+driver for the cx25840 video decoder sets lines 7-22 of both
+fields<footnote><para>According to <link
+linkend="ets300706">ETS&nbsp;300&nbsp;706</link> lines 6-22 of the
+first field and lines 5-22 of the second field may carry Teletext
+data.</para></footnote> to <constant>V4L2_SLICED_TELETEXT_B</constant>
+and line 23 of the first field to
+<constant>V4L2_SLICED_WSS_625</constant>. If
+<structfield>service_set</structfield> is set to zero, then the values
+of <structfield>service_lines</structfield> will be used instead.
+</para><para>On return the driver sets this field to the union of all
+elements of the returned <structfield>service_lines</structfield>
+array. It may contain less services than requested, perhaps just one,
+if the hardware cannot handle more services simultaneously. It may be
+empty (zero) if none of the requested services are supported by the
+hardware.</para></entry>
+         </row>
+         <row>
+           <entry>__u16</entry>
+           <entry><structfield>service_lines</structfield>[2][24]</entry>
+           <entry spanname="hspan"><para>Applications initialize this
+array with sets of data services the driver shall look for or insert
+on the respective scan line. Subject to hardware capabilities drivers
+return the requested set, a subset, which may be just a single
+service, or an empty set. When the hardware cannot handle multiple
+services on the same line the driver shall choose one. No assumptions
+can be made on which service the driver chooses.</para><para>Data
+services are defined in <xref linkend="vbi-services2" />. Array indices
+map to ITU-R line numbers (see also <xref linkend="vbi-525" /> and <xref
+                 linkend="vbi-625" />) as follows: <!-- No nested
+tables, sigh. --></para></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry>Element</entry>
+           <entry>525 line systems</entry>
+           <entry>625 line systems</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[0][1]</entry>
+           <entry align="center">1</entry>
+           <entry align="center">1</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[0][23]</entry>
+           <entry align="center">23</entry>
+           <entry align="center">23</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[1][1]</entry>
+           <entry align="center">264</entry>
+           <entry align="center">314</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[1][23]</entry>
+           <entry align="center">286</entry>
+           <entry align="center">336</entry>
+         </row>
+         <!-- End of line numbers table. -->
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry spanname="hspan">Drivers must set
+<structfield>service_lines</structfield>[0][0] and
+<structfield>service_lines</structfield>[1][0] to zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>io_size</structfield></entry>
+           <entry spanname="hspan">Maximum number of bytes passed by
+one &func-read; or &func-write; call, and the buffer size in bytes for
+the &VIDIOC-QBUF; and &VIDIOC-DQBUF; ioctl. Drivers set this field to
+the size of &v4l2-sliced-vbi-data; times the number of non-zero
+elements in the returned <structfield>service_lines</structfield>
+array (that is the number of lines potentially carrying data).</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry spanname="hspan">This array is reserved for future
+extensions. Applications and drivers must set it to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- See also vidioc-g-sliced-vbi-cap.sgml -->
+    <table frame="none" pgwide="1" id="vbi-services2">
+      <title>Sliced VBI services</title>
+      <tgroup cols="5">
+       <colspec colname="c1" colwidth="2*" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colname="c3" colwidth="1*" />
+       <colspec colname="c4" colwidth="2*" />
+       <colspec colname="c5" colwidth="2*" />
+       <spanspec namest="c3" nameend="c5" spanname="rlp" />
+       <thead>
+         <row>
+           <entry>Symbol</entry>
+           <entry>Value</entry>
+           <entry>Reference</entry>
+           <entry>Lines, usually</entry>
+           <entry>Payload</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_SLICED_TELETEXT_B</constant>
+(Teletext System B)</entry>
+           <entry>0x0001</entry>
+           <entry><xref linkend="ets300706" />, <xref linkend="itu653" /></entry>
+           <entry>PAL/SECAM line 7-22, 320-335 (second field 7-22)</entry>
+           <entry>Last 42 of the 45 byte Teletext packet, that is
+without clock run-in and framing code, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VPS</constant></entry>
+           <entry>0x0400</entry>
+           <entry><xref linkend="ets300231" /></entry>
+           <entry>PAL line 16</entry>
+           <entry>Byte number 3 to 15 according to Figure 9 of
+ETS&nbsp;300&nbsp;231, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry>
+           <entry>0x1000</entry>
+           <entry><xref linkend="eia608" /></entry>
+           <entry>NTSC line 21, 284 (second field 21)</entry>
+           <entry>Two bytes in transmission order, including parity
+bit, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_WSS_625</constant></entry>
+           <entry>0x4000</entry>
+           <entry><xref linkend="itu1119" />, <xref linkend="en300294" /></entry>
+           <entry>PAL/SECAM line 23</entry>
+           <entry><screen>
+Byte         0                 1
+      msb         lsb  msb           lsb
+ Bit  7 6 5 4 3 2 1 0  x x 13 12 11 10 9
+</screen></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VBI_525</constant></entry>
+           <entry>0x1000</entry>
+           <entry spanname="rlp">Set of services applicable to 525
+line systems.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VBI_625</constant></entry>
+           <entry>0x4401</entry>
+           <entry spanname="rlp">Set of services applicable to 625
+line systems.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>Drivers may return an &EINVAL; when applications attempt to
+read or write data without prior format negotiation, after switching
+the video standard (which may invalidate the negotiated VBI
+parameters) and after switching the video input (which may change the
+video standard as a side effect). The &VIDIOC-S-FMT; ioctl may return
+an &EBUSY; when applications attempt to change the format while i/o is
+in progress (between a &VIDIOC-STREAMON; and &VIDIOC-STREAMOFF; call,
+and after the first &func-read; or &func-write; call).</para>
+  </section>
+
+  <section>
+    <title>Reading and writing sliced VBI data</title>
+
+    <para>A single &func-read; or &func-write; call must pass all data
+belonging to one video frame. That is an array of
+<structname>v4l2_sliced_vbi_data</structname> structures with one or
+more elements and a total size not exceeding
+<structfield>io_size</structfield> bytes. Likewise in streaming I/O
+mode one buffer of <structfield>io_size</structfield> bytes must
+contain data of one video frame. The <structfield>id</structfield> of
+unused <structname>v4l2_sliced_vbi_data</structname> elements must be
+zero.</para>
+
+    <table frame="none" pgwide="1" id="v4l2-sliced-vbi-data">
+      <title>struct
+<structname>v4l2_sliced_vbi_data</structname></title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>A flag from <xref linkend="vbi-services" />
+identifying the type of data in this packet. Only a single bit must be
+set. When the <structfield>id</structfield> of a captured packet is
+zero, the packet is empty and the contents of other fields are
+undefined. Applications shall ignore empty packets. When the
+<structfield>id</structfield> of a packet for output is zero the
+contents of the <structfield>data</structfield> field are undefined
+and the driver must no longer insert data on the requested
+<structfield>field</structfield> and
+<structfield>line</structfield>.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>field</structfield></entry>
+           <entry>The video field number this data has been captured
+from, or shall be inserted at. <constant>0</constant> for the first
+field, <constant>1</constant> for the second field.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>line</structfield></entry>
+           <entry>The field (as opposed to frame) line number this
+data has been captured from, or shall be inserted at. See <xref
+           linkend="vbi-525" /> and <xref linkend="vbi-625" /> for valid
+values. Sliced VBI capture devices can set the line number of all
+packets to <constant>0</constant> if the hardware cannot reliably
+identify scan lines. The field number must always be valid.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield></entry>
+           <entry>This field is reserved for future extensions.
+Applications and drivers must set it to zero.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>data</structfield>[48]</entry>
+           <entry>The packet payload. See <xref
+           linkend="vbi-services" /> for the contents and number of
+bytes passed for each data type. The contents of padding bytes at the
+end of this array are undefined, drivers and applications shall ignore
+them.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>Packets are always passed in ascending line number order,
+without duplicate line numbers. The &func-write; function and the
+&VIDIOC-QBUF; ioctl must return an &EINVAL; when applications violate
+this rule. They must also return an &EINVAL; when applications pass an
+incorrect field or line number, or a combination of
+<structfield>field</structfield>, <structfield>line</structfield> and
+<structfield>id</structfield> which has not been negotiated with the
+&VIDIOC-G-FMT; or &VIDIOC-S-FMT; ioctl. When the line numbers are
+unknown the driver must pass the packets in transmitted order. The
+driver can insert empty packets with <structfield>id</structfield> set
+to zero anywhere in the packet array.</para>
+
+    <para>To assure synchronization and to distinguish from frame
+dropping, when a captured frame does not carry any of the requested
+data services drivers must pass one or more empty packets. When an
+application fails to pass VBI data in time for output, the driver
+must output the last VPS and WSS packet again, and disable the output
+of Closed Caption and Teletext data, or output data which is ignored
+by Closed Caption and Teletext decoders.</para>
+
+    <para>A sliced VBI device may support <link
+linkend="rw">read/write</link> and/or streaming (<link
+linkend="mmap">memory mapping</link> and/or <link linkend="userp">user
+pointer</link>) I/O. The latter bears the possibility of synchronizing
+video and VBI data by using buffer timestamps.</para>
+
+  </section>
+
+  <section>
+    <title>Sliced VBI Data in MPEG Streams</title>
+
+    <para>If a device can produce an MPEG output stream, it may be
+capable of providing <link
+linkend="sliced-vbi-format-negotitation">negotiated sliced VBI
+services</link> as data embedded in the MPEG stream.  Users or
+applications control this sliced VBI data insertion with the <link
+linkend="v4l2-mpeg-stream-vbi-fmt">V4L2_CID_MPEG_STREAM_VBI_FMT</link>
+control.</para>
+
+    <para>If the driver does not provide the <link
+linkend="v4l2-mpeg-stream-vbi-fmt">V4L2_CID_MPEG_STREAM_VBI_FMT</link>
+control, or only allows that control to be set to <link
+linkend="v4l2-mpeg-stream-vbi-fmt"><constant>
+V4L2_MPEG_STREAM_VBI_FMT_NONE</constant></link>, then the device
+cannot embed sliced VBI data in the MPEG stream.</para>
+
+    <para>The <link linkend="v4l2-mpeg-stream-vbi-fmt">
+V4L2_CID_MPEG_STREAM_VBI_FMT</link> control does not implicitly set
+the device driver to capture nor cease capturing sliced VBI data.  The
+control only indicates to embed sliced VBI data in the MPEG stream, if
+an application has negotiated sliced VBI service be captured.</para>
+
+    <para>It may also be the case that a device can embed sliced VBI
+data in only certain types of MPEG streams: for example in an MPEG-2
+PS but not an MPEG-2 TS.  In this situation, if sliced VBI data
+insertion is requested, the sliced VBI data will be embedded in MPEG
+stream types when supported, and silently omitted from MPEG stream
+types where sliced VBI data insertion is not supported by the device.
+</para>
+
+    <para>The following subsections specify the format of the
+embedded sliced VBI data.</para>
+
+  <section>
+    <title>MPEG Stream Embedded, Sliced VBI Data Format: NONE</title>
+    <para>The <link linkend="v4l2-mpeg-stream-vbi-fmt"><constant>
+V4L2_MPEG_STREAM_VBI_FMT_NONE</constant></link> embedded sliced VBI
+format shall be interpreted by drivers as a control to cease
+embedding sliced VBI data in MPEG streams.  Neither the device nor
+driver shall insert "empty" embedded sliced VBI data packets in the
+MPEG stream when this format is set.  No MPEG stream data structures
+are specified for this format.</para>
+  </section>
+
+  <section>
+    <title>MPEG Stream Embedded, Sliced VBI Data Format: IVTV</title>
+    <para>The <link linkend="v4l2-mpeg-stream-vbi-fmt"><constant>
+V4L2_MPEG_STREAM_VBI_FMT_IVTV</constant></link> embedded sliced VBI
+format, when supported, indicates to the driver to embed up to 36
+lines of sliced VBI data per frame in an MPEG-2 <emphasis>Private
+Stream 1 PES</emphasis> packet encapsulated in an MPEG-2 <emphasis>
+Program Pack</emphasis> in the MPEG stream.</para>
+
+    <para><emphasis>Historical context</emphasis>: This format
+specification originates from a custom, embedded, sliced VBI data
+format used by the <filename>ivtv</filename> driver.  This format
+has already been informally specified in the kernel sources in the
+file <filename>Documentation/video4linux/cx2341x/README.vbi</filename>
+.  The maximum size of the payload and other aspects of this format
+are driven by the CX23415 MPEG decoder's capabilities and limitations
+with respect to extracting, decoding, and displaying sliced VBI data
+embedded within an MPEG stream.</para>
+
+    <para>This format's use is <emphasis>not</emphasis> exclusive to
+the <filename>ivtv</filename> driver <emphasis>nor</emphasis>
+exclusive to CX2341x devices, as the sliced VBI data packet insertion
+into the MPEG stream is implemented in driver software.  At least the
+<filename>cx18</filename> driver provides sliced VBI data insertion
+into an MPEG-2 PS in this format as well.</para>
+
+    <para>The following definitions specify the payload of the
+MPEG-2 <emphasis>Private Stream 1 PES</emphasis> packets that contain
+sliced VBI data when <link linkend="v4l2-mpeg-stream-vbi-fmt">
+<constant>V4L2_MPEG_STREAM_VBI_FMT_IVTV</constant></link> is set.
+(The MPEG-2 <emphasis>Private Stream 1 PES</emphasis> packet header
+and encapsulating MPEG-2 <emphasis>Program Pack</emphasis> header are
+not detailed here.  Please refer to the MPEG-2 specifications for
+details on those packet headers.)</para>
+
+    <para>The payload of the MPEG-2 <emphasis>Private Stream 1 PES
+</emphasis> packets that contain sliced VBI data is specified by
+&v4l2-mpeg-vbi-fmt-ivtv;.  The payload is variable
+length, depending on the actual number of lines of sliced VBI data
+present in a video frame.  The payload may be padded at the end with
+unspecified fill bytes to align the end of the payload to a 4-byte
+boundary.  The payload shall never exceed 1552 bytes (2 fields with
+18 lines/field with 43 bytes of data/line and a 4 byte magic number).
+</para>
+
+    <table frame="none" pgwide="1" id="v4l2-mpeg-vbi-fmt-ivtv">
+      <title>struct <structname>v4l2_mpeg_vbi_fmt_ivtv</structname>
+      </title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>magic</structfield>[4]</entry>
+           <entry></entry>
+           <entry>A "magic" constant from <xref
+           linkend="v4l2-mpeg-vbi-fmt-ivtv-magic" /> that indicates
+this is a valid sliced VBI data payload and also indicates which
+member of the anonymous union, <structfield>itv0</structfield> or
+<structfield>ITV0</structfield>, to use for the payload data.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry>(anonymous)</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>struct <link linkend="v4l2-mpeg-vbi-itv0">
+             <structname>v4l2_mpeg_vbi_itv0</structname></link>
+           </entry>
+           <entry><structfield>itv0</structfield></entry>
+           <entry>The primary form of the sliced VBI data payload
+that contains anywhere from 1 to 35 lines of sliced VBI data.
+Line masks are provided in this form of the payload indicating
+which VBI lines are provided.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>struct <link linkend="v4l2-mpeg-vbi-itv0-1">
+             <structname>v4l2_mpeg_vbi_ITV0</structname></link>
+           </entry>
+           <entry><structfield>ITV0</structfield></entry>
+           <entry>An alternate form of the sliced VBI data payload
+used when 36 lines of sliced VBI data are present.  No line masks are
+provided in this form of the payload; all valid line mask bits are
+implcitly set.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-mpeg-vbi-fmt-ivtv-magic">
+      <title>Magic Constants for &v4l2-mpeg-vbi-fmt-ivtv;
+       <structfield>magic</structfield> field</title>
+      <tgroup cols="3">
+       &cs-def;
+       <thead>
+         <row>
+           <entry align="left">Defined Symbol</entry>
+           <entry align="left">Value</entry>
+           <entry align="left">Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_MAGIC0</constant>
+           </entry>
+           <entry>"itv0"</entry>
+           <entry>Indicates the <structfield>itv0</structfield>
+member of the union in &v4l2-mpeg-vbi-fmt-ivtv; is valid.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_MAGIC1</constant>
+           </entry>
+           <entry>"ITV0"</entry>
+           <entry>Indicates the <structfield>ITV0</structfield>
+member of the union in &v4l2-mpeg-vbi-fmt-ivtv; is valid and
+that 36 lines of sliced VBI data are present.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-mpeg-vbi-itv0">
+      <title>struct <structname>v4l2_mpeg_vbi_itv0</structname>
+      </title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__le32</entry>
+           <entry><structfield>linemask</structfield>[2]</entry>
+           <entry><para>Bitmasks indicating the VBI service lines
+present.  These <structfield>linemask</structfield> values are stored
+in little endian byte order in the MPEG stream.  Some reference
+<structfield>linemask</structfield> bit positions with their
+corresponding VBI line number and video field are given below.
+b<subscript>0</subscript> indicates the least significant bit of a
+<structfield>linemask</structfield> value:<screen>
+<structfield>linemask</structfield>[0] b<subscript>0</subscript>:              line  6         first field
+<structfield>linemask</structfield>[0] b<subscript>17</subscript>:             line 23         first field
+<structfield>linemask</structfield>[0] b<subscript>18</subscript>:             line  6         second field
+<structfield>linemask</structfield>[0] b<subscript>31</subscript>:             line 19         second field
+<structfield>linemask</structfield>[1] b<subscript>0</subscript>:              line 20         second field
+<structfield>linemask</structfield>[1] b<subscript>3</subscript>:              line 23         second field
+<structfield>linemask</structfield>[1] b<subscript>4</subscript>-b<subscript>31</subscript>:   unused and set to 0</screen></para></entry>
+         </row>
+         <row>
+           <entry>struct <link linkend="v4l2-mpeg-vbi-itv0-line">
+             <structname>v4l2_mpeg_vbi_itv0_line</structname></link>
+           </entry>
+           <entry><structfield>line</structfield>[35]</entry>
+           <entry>This is a variable length array that holds from 1
+to 35 lines of sliced VBI data.  The sliced VBI data lines present
+correspond to the bits set in the <structfield>linemask</structfield>
+array, starting from b<subscript>0</subscript> of <structfield>
+linemask</structfield>[0] up through b<subscript>31</subscript> of
+<structfield>linemask</structfield>[0], and from b<subscript>0
+</subscript> of <structfield>linemask</structfield>[1] up through b
+<subscript>3</subscript> of <structfield>linemask</structfield>[1].
+<structfield>line</structfield>[0] corresponds to the first bit
+found set in the <structfield>linemask</structfield> array,
+<structfield>line</structfield>[1] corresponds to the second bit
+found set in the <structfield>linemask</structfield> array, etc.
+If no <structfield>linemask</structfield> array bits are set, then
+<structfield>line</structfield>[0] may contain one line of
+unspecified data that should be ignored by applications.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-mpeg-vbi-itv0-1">
+      <title>struct <structname>v4l2_mpeg_vbi_ITV0</structname>
+      </title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>struct <link linkend="v4l2-mpeg-vbi-itv0-line">
+             <structname>v4l2_mpeg_vbi_itv0_line</structname></link>
+           </entry>
+           <entry><structfield>line</structfield>[36]</entry>
+           <entry>A fixed length array of 36 lines of sliced VBI
+data.  <structfield>line</structfield>[0] through <structfield>line
+</structfield>[17] correspond to lines 6 through 23 of the
+first field.  <structfield>line</structfield>[18] through
+<structfield>line</structfield>[35] corresponds to lines 6
+through 23 of the second field.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-mpeg-vbi-itv0-line">
+      <title>struct <structname>v4l2_mpeg_vbi_itv0_line</structname>
+      </title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>A line identifier value from
+<xref linkend="ITV0-Line-Identifier-Constants" /> that indicates
+the type of sliced VBI data stored on this line.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>data</structfield>[42]</entry>
+           <entry>The sliced VBI data for the line.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="ITV0-Line-Identifier-Constants">
+      <title>Line Identifiers for struct <link
+      linkend="v4l2-mpeg-vbi-itv0-line"><structname>
+v4l2_mpeg_vbi_itv0_line</structname></link> <structfield>id
+</structfield> field</title>
+      <tgroup cols="3">
+       &cs-def;
+       <thead>
+         <row>
+           <entry align="left">Defined Symbol</entry>
+           <entry align="left">Value</entry>
+           <entry align="left">Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_TELETEXT_B</constant>
+           </entry>
+           <entry>1</entry>
+           <entry>Refer to <link linkend="vbi-services2">
+Sliced VBI services</link> for a description of the line payload.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_CAPTION_525</constant>
+           </entry>
+           <entry>4</entry>
+           <entry>Refer to <link linkend="vbi-services2">
+Sliced VBI services</link> for a description of the line payload.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_WSS_625</constant>
+           </entry>
+           <entry>5</entry>
+           <entry>Refer to <link linkend="vbi-services2">
+Sliced VBI services</link> for a description of the line payload.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MPEG_VBI_IVTV_VPS</constant>
+           </entry>
+           <entry>7</entry>
+           <entry>Refer to <link linkend="vbi-services2">
+Sliced VBI services</link> for a description of the line payload.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+  </section>
+  </section>
+
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+ -->
diff --git a/Documentation/DocBook/v4l/dev-teletext.xml b/Documentation/DocBook/v4l/dev-teletext.xml
new file mode 100644 (file)
index 0000000..76184e8
--- /dev/null
@@ -0,0 +1,40 @@
+  <title>Teletext Interface</title>
+
+  <para>This interface aims at devices receiving and demodulating
+Teletext data [<xref linkend="ets300706" />, <xref linkend="itu653" />], evaluating the
+Teletext packages and storing formatted pages in cache memory. Such
+devices are usually implemented as microcontrollers with serial
+interface (I<superscript>2</superscript>C) and can be found on older
+TV cards, dedicated Teletext decoding cards and home-brew devices
+connected to the PC parallel port.</para>
+
+  <para>The Teletext API was designed by Martin Buck. It is defined in
+the kernel header file <filename>linux/videotext.h</filename>, the
+specification is available from <ulink url="ftp://ftp.gwdg.de/pub/linux/misc/videotext/">
+ftp://ftp.gwdg.de/pub/linux/misc/videotext/</ulink>. (Videotext is the name of
+the German public television Teletext service.) Conventional character
+device file names are <filename>/dev/vtx</filename> and
+<filename>/dev/vttuner</filename>, with device number 83, 0 and 83, 16
+respectively. A similar interface exists for the Philips SAA5249
+Teletext decoder [specification?] with character device file names
+<filename>/dev/tlkN</filename>, device number 102, N.</para>
+
+  <para>Eventually the Teletext API was integrated into the V4L API
+with character device file names <filename>/dev/vtx0</filename> to
+<filename>/dev/vtx31</filename>, device major number 81, minor numbers
+192 to 223. For reference the V4L Teletext API specification is
+reproduced here in full: "Teletext interfaces talk the existing VTX
+API." Teletext devices with major number 83 and 102 will be removed in
+Linux 2.6.</para>
+
+  <para>There are no plans to replace the Teletext API or to integrate
+it into V4L2. Please write to the linux-media mailing list: &v4l-ml;
+when the need arises.</para>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/driver.xml b/Documentation/DocBook/v4l/driver.xml
new file mode 100644 (file)
index 0000000..1f7eea5
--- /dev/null
@@ -0,0 +1,208 @@
+  <title>V4L2 Driver Programming</title>
+
+  <!-- This part defines the interface between the "videodev"
+    module and individual drivers. -->
+
+  <para>to do</para>
+<!--
+  <para>V4L2 is a two-layer driver system. The top layer is the "videodev"
+kernel module. When videodev initializes it registers as character device
+with major number 81, and it registers a set of file operations. All V4L2
+drivers are really clients of videodev, which calls V4L2 drivers through
+driver method functions. V4L2 drivers are also written as kernel modules.
+After probing the hardware they register one or more devices with
+videodev.</para>
+
+  <section id="driver-modules">
+    <title>Driver Modules</title>
+
+    <para>V4L2 driver modules must have an initialization function which is
+called after the module was loaded into kernel, an exit function whis is
+called before the module is removed.  When the driver is compiled into the
+kernel these functions called at system boot and shutdown time.</para>
+
+    <informalexample>
+      <programlisting>
+#include &lt;linux/module.h&gt;
+
+/* Export information about this module. For details and other useful
+   macros see <filename>linux/module.h</filename>. */
+MODULE_DESCRIPTION("my - driver for my hardware");
+MODULE_AUTHOR("Your name here");
+MODULE_LICENSE("GPL");
+
+static void
+my_module_exit (void)
+{
+       /* Free all resources allocated by my_module_init(). */
+}
+
+static int
+my_module_init (void)
+{
+       /* Bind the driver to the supported hardware, see
+          <link linkend="driver-pci"> and
+          <link linkend="driver-usb"> for examples. */
+
+       return 0; /* a negative value on error, 0 on success. */
+}
+
+/* Export module functions. */
+module_init (my_module_init);
+module_exit (my_module_exit);
+</programlisting>
+    </informalexample>
+
+    <para>Users can add parameters when kernel modules are inserted:</para>
+
+    <informalexample>
+      <programlisting>
+include &lt;linux/moduleparam.h&gt;
+
+static int my_option = 123;
+static int my_option_array[47];
+
+/* Export the symbol, an int, with access permissions 0664.
+   See <filename>linux/moduleparam.h</filename> for other types. */
+module_param (my_option, int, 0644);
+module_param_array (my_option_array, int, NULL, 0644);
+
+MODULE_PARM_DESC (my_option, "Does magic things, default 123");
+</programlisting>
+    </informalexample>
+
+    <para>One parameter should be supported by all V4L2 drivers, the minor
+number of the device it will register. Purpose is to predictably link V4L2
+drivers to device nodes if more than one video device is installed. Use the
+name of the device node followed by a "_nr" suffix, for example "video_nr"
+for <filename>/dev/video</filename>.</para>
+
+    <informalexample>
+      <programlisting>
+/* Minor number of the device, -1 to allocate the first unused. */
+static int video_nr = -1;
+
+module_param (video_nr, int, 0444);
+</programlisting>
+    </informalexample>
+  </section>
+
+  <section id="driver-pci">
+    <title>PCI Devices</title>
+
+    <para>PCI devices are initialized like this:</para>
+
+    <informalexample>
+      <programlisting>
+typedef struct {
+       /* State of one physical device. */
+} my_device;
+
+static int
+my_resume               (struct pci_dev *               pci_dev)
+{
+       /* Restore the suspended device to working state. */
+}
+
+static int
+my_suspend              (struct pci_dev *               pci_dev,
+                        pm_message_t                   state)
+{
+       /* This function is called before the system goes to sleep.
+          Stop all DMAs and disable interrupts, then put the device
+          into a low power state. For details see the kernel
+          sources under <filename>Documentation/power</filename>. */
+
+       return 0; /* a negative value on error, 0 on success. */
+}
+
+static void __devexit
+my_remove               (struct pci_dev *               pci_dev)
+{
+       my_device *my = pci_get_drvdata (pci_dev);
+
+       /* Describe me. */
+}
+
+static int __devinit
+my_probe                (struct pci_dev *               pci_dev,
+                        const struct pci_device_id *   pci_id)
+{
+       my_device *my;
+
+       /* Describe me. */
+
+       /* You can allocate per-device data here and store a pointer
+          to it in the pci_dev structure. */
+       my = ...;
+       pci_set_drvdata (pci_dev, my);
+
+       return 0; /* a negative value on error, 0 on success. */
+}
+
+/* A list of supported PCI devices. */
+static struct pci_device_id
+my_pci_device_ids [] = {
+       { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { 0 } /* end of list */
+};
+
+/* Load our module if supported PCI devices are installed. */
+MODULE_DEVICE_TABLE (pci, my_pci_device_ids);
+
+static struct pci_driver
+my_pci_driver = {
+       .name     = "my",
+       .id_table = my_pci_device_ids,
+
+       .probe    = my_probe,
+       .remove   = __devexit_p (my_remove),
+
+       /* Power management functions. */
+       .suspend  = my_suspend,
+       .resume   = my_resume,
+};
+
+static void
+my_module_exit          (void)
+{
+       pci_unregister_driver (&my_pci_driver);
+}
+
+static int
+my_module_init          (void)
+{
+       return pci_register_driver (&my_pci_driver);
+}
+</programlisting>
+    </informalexample>
+  </section>
+
+  <section id="driver-usb">
+    <title>USB Devices</title>
+    <para>to do</para>
+  </section>
+  <section id="driver-registering">
+    <title>Registering V4L2 Drivers</title>
+
+    <para>After a V4L2 driver probed the hardware it registers one or more
+devices with the videodev module.</para>
+  </section>
+  <section id="driver-file-ops">
+    <title>File Operations</title>
+    <para>to do</para>
+  </section>
+  <section id="driver-internal-api">
+    <title>Internal API</title>
+    <para>to do</para>
+  </section>
+-->
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/fdl-appendix.xml b/Documentation/DocBook/v4l/fdl-appendix.xml
new file mode 100644 (file)
index 0000000..b6ce50d
--- /dev/null
@@ -0,0 +1,671 @@
+<!--
+     The GNU Free Documentation License 1.1 in DocBook
+     Markup by Eric Baudais <baudais@okstate.edu>
+     Maintained by the GNOME Documentation Project
+     http://developer.gnome.org/projects/gdp
+     Version: 1.0.1
+     Last Modified: Nov 16, 2000
+-->
+
+<appendix id="fdl">
+  <appendixinfo>
+    <releaseinfo>
+      Version 1.1, March 2000
+    </releaseinfo>
+    <copyright>
+      <year>2000</year><holder>Free Software Foundation, Inc.</holder>
+    </copyright>
+    <legalnotice id="fdl-legalnotice">
+      <para>
+       <address>Free Software Foundation, Inc. <street>59 Temple Place,
+       Suite 330</street>, <city>Boston</city>, <state>MA</state>
+       <postcode>02111-1307</postcode>  <country>USA</country></address>
+       Everyone is permitted to copy and distribute verbatim copies of this
+       license document, but changing it is not allowed.
+      </para>
+    </legalnotice>
+  </appendixinfo>
+  <title>GNU Free Documentation License</title>
+
+  <sect1 id="fdl-preamble">
+    <title>0. PREAMBLE</title>
+    <para>
+      The purpose of this License is to make a manual, textbook, or
+      other written document <quote>free</quote> in the sense of
+      freedom: to assure everyone the effective freedom to copy and
+      redistribute it, with or without modifying it, either
+      commercially or noncommercially. Secondarily, this License
+      preserves for the author and publisher a way to get credit for
+      their work, while not being considered responsible for
+      modifications made by others.
+    </para>
+
+    <para>
+      This License is a kind of <quote>copyleft</quote>, which means
+      that derivative works of the document must themselves be free in
+      the same sense. It complements the GNU General Public License,
+      which is a copyleft license designed for free software.
+    </para>
+
+    <para>
+      We have designed this License in order to use it for manuals for
+      free software, because free software needs free documentation: a
+      free program should come with manuals providing the same
+      freedoms that the software does. But this License is not limited
+      to software manuals; it can be used for any textual work,
+      regardless of subject matter or whether it is published as a
+      printed book. We recommend this License principally for works
+      whose purpose is instruction or reference.
+    </para>
+  </sect1>
+  <sect1 id="fdl-section1">
+    <title>1. APPLICABILITY AND DEFINITIONS</title>
+    <para id="fdl-document">
+      This License applies to any manual or other work that contains a
+      notice placed by the copyright holder saying it can be
+      distributed under the terms of this License. The
+      <quote>Document</quote>, below, refers to any such manual or
+      work. Any member of the public is a licensee, and is addressed
+      as <quote>you</quote>.
+    </para>
+
+    <para id="fdl-modified">
+      A <quote>Modified Version</quote> of the Document means any work
+      containing the Document or a portion of it, either copied
+      verbatim, or with modifications and/or translated into another
+      language.
+    </para>
+
+    <para id="fdl-secondary">
+      A <quote>Secondary Section</quote> is a named appendix or a
+      front-matter section of the <link
+      linkend="fdl-document">Document</link> that deals exclusively
+      with the relationship of the publishers or authors of the
+      Document to the Document's overall subject (or to related
+      matters) and contains nothing that could fall directly within
+      that overall subject. (For example, if the Document is in part a
+      textbook of mathematics, a Secondary Section may not explain any
+      mathematics.)  The relationship could be a matter of historical
+      connection with the subject or with related matters, or of
+      legal, commercial, philosophical, ethical or political position
+      regarding them.
+    </para>
+
+    <para id="fdl-invariant">
+      The <quote>Invariant Sections</quote> are certain <link
+      linkend="fdl-secondary"> Secondary Sections</link> whose titles
+      are designated, as being those of Invariant Sections, in the
+      notice that says that the <link
+      linkend="fdl-document">Document</link> is released under this
+      License.
+    </para>
+
+    <para id="fdl-cover-texts">
+      The <quote>Cover Texts</quote> are certain short passages of
+      text that are listed, as Front-Cover Texts or Back-Cover Texts,
+      in the notice that says that the <link
+      linkend="fdl-document">Document</link> is released under this
+      License.
+    </para>
+
+    <para id="fdl-transparent">
+      A <quote>Transparent</quote> copy of the <link
+      linkend="fdl-document"> Document</link> means a machine-readable
+      copy, represented in a format whose specification is available
+      to the general public, whose contents can be viewed and edited
+      directly and straightforwardly with generic text editors or (for
+      images composed of pixels) generic paint programs or (for
+      drawings) some widely available drawing editor, and that is
+      suitable for input to text formatters or for automatic
+      translation to a variety of formats suitable for input to text
+      formatters. A copy made in an otherwise Transparent file format
+      whose markup has been designed to thwart or discourage
+      subsequent modification by readers is not Transparent.  A copy
+      that is not <quote>Transparent</quote> is called
+      <quote>Opaque</quote>.
+    </para>
+
+    <para>
+      Examples of suitable formats for Transparent copies include
+      plain ASCII without markup, Texinfo input format, LaTeX input
+      format, SGML or XML using a publicly available DTD, and
+      standard-conforming simple HTML designed for human
+      modification. Opaque formats include PostScript, PDF,
+      proprietary formats that can be read and edited only by
+      proprietary word processors, SGML or XML for which the DTD
+      and/or processing tools are not generally available, and the
+      machine-generated HTML produced by some word processors for
+      output purposes only.
+    </para>
+
+    <para id="fdl-title-page">
+      The <quote>Title Page</quote> means, for a printed book, the
+      title page itself, plus such following pages as are needed to
+      hold, legibly, the material this License requires to appear in
+      the title page. For works in formats which do not have any title
+      page as such, <quote>Title Page</quote> means the text near the
+      most prominent appearance of the work's title, preceding the
+      beginning of the body of the text.
+    </para>
+  </sect1>
+
+  <sect1 id="fdl-section2">
+    <title>2. VERBATIM COPYING</title>
+    <para>
+      You may copy and distribute the <link
+      linkend="fdl-document">Document</link> in any medium, either
+      commercially or noncommercially, provided that this License, the
+      copyright notices, and the license notice saying this License
+      applies to the Document are reproduced in all copies, and that
+      you add no other conditions whatsoever to those of this
+      License. You may not use technical measures to obstruct or
+      control the reading or further copying of the copies you make or
+      distribute. However, you may accept compensation in exchange for
+      copies. If you distribute a large enough number of copies you
+      must also follow the conditions in <link
+      linkend="fdl-section3">section 3</link>.
+    </para>
+
+    <para>
+      You may also lend copies, under the same conditions stated
+      above, and you may publicly display copies.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section3">
+    <title>3. COPYING IN QUANTITY</title>
+    <para>
+      If you publish printed copies of the <link
+      linkend="fdl-document">Document</link> numbering more than 100,
+      and the Document's license notice requires <link
+      linkend="fdl-cover-texts">Cover Texts</link>, you must enclose
+      the copies in covers that carry, clearly and legibly, all these
+      Cover Texts: Front-Cover Texts on the front cover, and
+      Back-Cover Texts on the back cover. Both covers must also
+      clearly and legibly identify you as the publisher of these
+      copies. The front cover must present the full title with all
+      words of the title equally prominent and visible. You may add
+      other material on the covers in addition. Copying with changes
+      limited to the covers, as long as they preserve the title of the
+      <link linkend="fdl-document">Document</link> and satisfy these
+      conditions, can be treated as verbatim copying in other
+      respects.
+    </para>
+
+    <para>
+      If the required texts for either cover are too voluminous to fit
+      legibly, you should put the first ones listed (as many as fit
+      reasonably) on the actual cover, and continue the rest onto
+      adjacent pages.
+    </para>
+
+    <para>
+      If you publish or distribute <link
+      linkend="fdl-transparent">Opaque</link> copies of the <link
+      linkend="fdl-document">Document</link> numbering more than 100,
+      you must either include a machine-readable <link
+      linkend="fdl-transparent">Transparent</link> copy along with
+      each Opaque copy, or state in or with each Opaque copy a
+      publicly-accessible computer-network location containing a
+      complete Transparent copy of the Document, free of added
+      material, which the general network-using public has access to
+      download anonymously at no charge using public-standard network
+      protocols. If you use the latter option, you must take
+      reasonably prudent steps, when you begin distribution of Opaque
+      copies in quantity, to ensure that this Transparent copy will
+      remain thus accessible at the stated location until at least one
+      year after the last time you distribute an Opaque copy (directly
+      or through your agents or retailers) of that edition to the
+      public.
+    </para>
+
+    <para>
+      It is requested, but not required, that you contact the authors
+      of the <link linkend="fdl-document">Document</link> well before
+      redistributing any large number of copies, to give them a chance
+      to provide you with an updated version of the Document.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section4">
+    <title>4. MODIFICATIONS</title>
+    <para>
+      You may copy and distribute a <link
+      linkend="fdl-modified">Modified Version</link> of the <link
+      linkend="fdl-document">Document</link> under the conditions of
+      sections <link linkend="fdl-section2">2</link> and <link
+      linkend="fdl-section3">3</link> above, provided that you release
+      the Modified Version under precisely this License, with the
+      Modified Version filling the role of the Document, thus
+      licensing distribution and modification of the Modified Version
+      to whoever possesses a copy of it. In addition, you must do
+      these things in the Modified Version:
+    </para>
+
+    <itemizedlist mark="opencircle">
+      <listitem>
+       <formalpara>
+         <title>A</title>
+         <para>
+           Use in the <link linkend="fdl-title-page">Title
+           Page</link> (and on the covers, if any) a title distinct
+           from that of the <link
+           linkend="fdl-document">Document</link>, and from those of
+           previous versions (which should, if there were any, be
+           listed in the History section of the Document). You may
+           use the same title as a previous version if the original
+           publisher of that version gives permission.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>B</title>
+         <para>
+           List on the <link linkend="fdl-title-page">Title
+           Page</link>, as authors, one or more persons or entities
+           responsible for authorship of the modifications in the
+           <link linkend="fdl-modified">Modified Version</link>,
+           together with at least five of the principal authors of
+           the <link linkend="fdl-document">Document</link> (all of
+           its principal authors, if it has less than five).
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>C</title>
+         <para>
+           State on the <link linkend="fdl-title-page">Title
+           Page</link> the name of the publisher of the <link
+           linkend="fdl-modified">Modified Version</link>, as the
+           publisher.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>D</title>
+         <para>
+           Preserve all the copyright notices of the <link
+           linkend="fdl-document">Document</link>.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>E</title>
+         <para>
+           Add an appropriate copyright notice for your modifications
+           adjacent to the other copyright notices.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>F</title>
+         <para>
+           Include, immediately after the copyright notices, a
+           license notice giving the public permission to use the
+           <link linkend="fdl-modified">Modified Version</link> under
+           the terms of this License, in the form shown in the
+           Addendum below.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>G</title>
+         <para>
+           Preserve in that license notice the full lists of <link
+           linkend="fdl-invariant"> Invariant Sections</link> and
+           required <link linkend="fdl-cover-texts">Cover
+           Texts</link> given in the <link
+           linkend="fdl-document">Document's</link> license notice.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>H</title>
+         <para>
+           Include an unaltered copy of this License.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>I</title>
+         <para>
+           Preserve the section entitled <quote>History</quote>, and
+           its title, and add to it an item stating at least the
+           title, year, new authors, and publisher of the <link
+           linkend="fdl-modified">Modified Version </link>as given on
+           the <link linkend="fdl-title-page">Title Page</link>.  If
+           there is no section entitled <quote>History</quote> in the
+           <link linkend="fdl-document">Document</link>, create one
+           stating the title, year, authors, and publisher of the
+           Document as given on its Title Page, then add an item
+           describing the Modified Version as stated in the previous
+           sentence.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>J</title>
+         <para>
+           Preserve the network location, if any, given in the <link
+           linkend="fdl-document">Document</link> for public access
+           to a <link linkend="fdl-transparent">Transparent</link>
+           copy of the Document, and likewise the network locations
+           given in the Document for previous versions it was based
+           on. These may be placed in the <quote>History</quote>
+           section.  You may omit a network location for a work that
+           was published at least four years before the Document
+           itself, or if the original publisher of the version it
+           refers to gives permission.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>K</title>
+         <para>
+           In any section entitled <quote>Acknowledgements</quote> or
+           <quote>Dedications</quote>, preserve the section's title,
+           and preserve in the section all the substance and tone of
+           each of the contributor acknowledgements and/or
+           dedications given therein.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>L</title>
+         <para>
+           Preserve all the <link linkend="fdl-invariant">Invariant
+           Sections</link> of the <link
+           linkend="fdl-document">Document</link>, unaltered in their
+           text and in their titles.  Section numbers or the
+           equivalent are not considered part of the section titles.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>M</title>
+         <para>
+           Delete any section entitled
+           <quote>Endorsements</quote>. Such a section may not be
+           included in the <link linkend="fdl-modified">Modified
+           Version</link>.
+         </para>
+       </formalpara>
+      </listitem>
+
+      <listitem>
+       <formalpara>
+         <title>N</title>
+         <para>
+           Do not retitle any existing section as
+           <quote>Endorsements</quote> or to conflict in title with
+           any <link linkend="fdl-invariant">Invariant
+           Section</link>.
+         </para>
+       </formalpara>
+      </listitem>
+    </itemizedlist>
+
+    <para>
+      If the <link linkend="fdl-modified">Modified Version</link>
+      includes new front-matter sections or appendices that qualify as
+      <link linkend="fdl-secondary">Secondary Sections</link> and
+      contain no material copied from the Document, you may at your
+      option designate some or all of these sections as invariant. To
+      do this, add their titles to the list of <link
+      linkend="fdl-invariant">Invariant Sections</link> in the
+      Modified Version's license notice.  These titles must be
+      distinct from any other section titles.
+    </para>
+
+    <para>
+      You may add a section entitled <quote>Endorsements</quote>,
+      provided it contains nothing but endorsements of your <link
+      linkend="fdl-modified">Modified Version</link> by various
+      parties--for example, statements of peer review or that the text
+      has been approved by an organization as the authoritative
+      definition of a standard.
+    </para>
+
+    <para>
+      You may add a passage of up to five words as a <link
+      linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage
+      of up to 25 words as a <link
+      linkend="fdl-cover-texts">Back-Cover Text</link>, to the end of
+      the list of <link linkend="fdl-cover-texts">Cover Texts</link>
+      in the <link linkend="fdl-modified">Modified Version</link>.
+      Only one passage of Front-Cover Text and one of Back-Cover Text
+      may be added by (or through arrangements made by) any one
+      entity. If the <link linkend="fdl-document">Document</link>
+      already includes a cover text for the same cover, previously
+      added by you or by arrangement made by the same entity you are
+      acting on behalf of, you may not add another; but you may
+      replace the old one, on explicit permission from the previous
+      publisher that added the old one.
+    </para>
+
+    <para>
+      The author(s) and publisher(s) of the <link
+      linkend="fdl-document">Document</link> do not by this License
+      give permission to use their names for publicity for or to
+      assert or imply endorsement of any <link
+      linkend="fdl-modified">Modified Version </link>.
+    </para>
+  </sect1>
+
+  <sect1 id="fdl-section5">
+    <title>5. COMBINING DOCUMENTS</title>
+    <para>
+      You may combine the <link linkend="fdl-document">Document</link>
+      with other documents released under this License, under the
+      terms defined in <link linkend="fdl-section4">section 4</link>
+      above for modified versions, provided that you include in the
+      combination all of the <link linkend="fdl-invariant">Invariant
+      Sections</link> of all of the original documents, unmodified,
+      and list them all as Invariant Sections of your combined work in
+      its license notice.
+    </para>
+
+    <para>
+      The combined work need only contain one copy of this License,
+      and multiple identical <link linkend="fdl-invariant">Invariant
+      Sections</link> may be replaced with a single copy. If there are
+      multiple Invariant Sections with the same name but different
+      contents, make the title of each such section unique by adding
+      at the end of it, in parentheses, the name of the original
+      author or publisher of that section if known, or else a unique
+      number. Make the same adjustment to the section titles in the
+      list of Invariant Sections in the license notice of the combined
+      work.
+    </para>
+
+    <para>
+      In the combination, you must combine any sections entitled
+      <quote>History</quote> in the various original documents,
+      forming one section entitled <quote>History</quote>; likewise
+      combine any sections entitled <quote>Acknowledgements</quote>,
+      and any sections entitled <quote>Dedications</quote>.  You must
+      delete all sections entitled <quote>Endorsements.</quote>
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section6">
+    <title>6. COLLECTIONS OF DOCUMENTS</title>
+    <para>
+      You may make a collection consisting of the <link
+      linkend="fdl-document">Document</link> and other documents
+      released under this License, and replace the individual copies
+      of this License in the various documents with a single copy that
+      is included in the collection, provided that you follow the
+      rules of this License for verbatim copying of each of the
+      documents in all other respects.
+    </para>
+
+    <para>
+      You may extract a single document from such a collection, and
+      dispbibute it individually under this License, provided you
+      insert a copy of this License into the extracted document, and
+      follow this License in all other respects regarding verbatim
+      copying of that document.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section7">
+    <title>7. AGGREGATION WITH INDEPENDENT WORKS</title>
+    <para>
+      A compilation of the <link
+      linkend="fdl-document">Document</link> or its derivatives with
+      other separate and independent documents or works, in or on a
+      volume of a storage or distribution medium, does not as a whole
+      count as a <link linkend="fdl-modified">Modified Version</link>
+      of the Document, provided no compilation copyright is claimed
+      for the compilation.  Such a compilation is called an
+      <quote>aggregate</quote>, and this License does not apply to the
+      other self-contained works thus compiled with the Document , on
+      account of their being thus compiled, if they are not themselves
+      derivative works of the Document.  If the <link
+      linkend="fdl-cover-texts">Cover Text</link> requirement of <link
+      linkend="fdl-section3">section 3</link> is applicable to these
+      copies of the Document, then if the Document is less than one
+      quarter of the entire aggregate, the Document's Cover Texts may
+      be placed on covers that surround only the Document within the
+      aggregate. Otherwise they must appear on covers around the whole
+      aggregate.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section8">
+    <title>8. TRANSLATION</title>
+    <para>
+      Translation is considered a kind of modification, so you may
+      distribute translations of the <link
+      linkend="fdl-document">Document</link> under the terms of <link
+      linkend="fdl-section4">section 4</link>. Replacing <link
+      linkend="fdl-invariant"> Invariant Sections</link> with
+      translations requires special permission from their copyright
+      holders, but you may include translations of some or all
+      Invariant Sections in addition to the original versions of these
+      Invariant Sections. You may include a translation of this
+      License provided that you also include the original English
+      version of this License. In case of a disagreement between the
+      translation and the original English version of this License,
+      the original English version will prevail.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section9">
+    <title>9. TERMINATION</title>
+    <para>
+      You may not copy, modify, sublicense, or distribute the <link
+      linkend="fdl-document">Document</link> except as expressly
+      provided for under this License. Any other attempt to copy,
+      modify, sublicense or distribute the Document is void, and will
+      automatically terminate your rights under this License. However,
+      parties who have received copies, or rights, from you under this
+      License will not have their licenses terminated so long as such
+      parties remain in full compliance.
+    </para>
+    </sect1>
+
+  <sect1 id="fdl-section10">
+    <title>10. FUTURE REVISIONS OF THIS LICENSE</title>
+    <para>
+      The <ulink type="http"
+      url="http://www.gnu.org/fsf/fsf.html">Free Software
+      Foundation</ulink> may publish new, revised versions of the GNU
+      Free Documentation License from time to time. Such new versions
+      will be similar in spirit to the present version, but may differ
+      in detail to address new problems or concerns. See <ulink
+      type="http"
+      url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
+    </para>
+
+    <para>
+      Each version of the License is given a distinguishing version
+      number. If the <link linkend="fdl-document">Document</link>
+      specifies that a particular numbered version of this License
+      <quote>or any later version</quote> applies to it, you have the
+      option of following the terms and conditions either of that
+      specified version or of any later version that has been
+      published (not as a draft) by the Free Software Foundation. If
+      the Document does not specify a version number of this License,
+      you may choose any version ever published (not as a draft) by
+      the Free Software Foundation.
+    </para>
+  </sect1>
+
+  <sect1 id="fdl-using">
+    <title>Addendum</title>
+    <para>
+      To use this License in a document you have written, include a copy of
+      the License in the document and put the following copyright and
+      license notices just after the title page:
+    </para>
+
+    <blockquote>
+      <para>
+       Copyright &copy; YEAR YOUR NAME.
+      </para>
+      <para>
+       Permission is granted to copy, distribute and/or modify this
+       document under the terms of the GNU Free Documentation
+       License, Version 1.1 or any later version published by the
+       Free Software Foundation; with the <link
+       linkend="fdl-invariant">Invariant Sections</link> being LIST
+       THEIR TITLES, with the <link
+       linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
+       and with the <link linkend="fdl-cover-texts">Back-Cover
+       Texts</link> being LIST.  A copy of the license is included in
+       the section entitled <quote>GNU Free Documentation
+       License</quote>.
+      </para>
+    </blockquote>
+
+    <para>
+      If you have no <link linkend="fdl-invariant">Invariant
+      Sections</link>, write <quote>with no Invariant Sections</quote>
+      instead of saying which ones are invariant.  If you have no
+      <link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
+      <quote>no Front-Cover Texts</quote> instead of
+      <quote>Front-Cover Texts being LIST</quote>; likewise for <link
+      linkend="fdl-cover-texts">Back-Cover Texts</link>.
+    </para>
+
+    <para>
+      If your document contains nontrivial examples of program code,
+      we recommend releasing these examples in parallel under your
+      choice of free software license, such as the <ulink type="http"
+      url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
+      License</ulink>, to permit their use in free software.
+    </para>
+  </sect1>
+</appendix>
+
+
+
+
+
+
diff --git a/Documentation/DocBook/v4l/fieldseq_bt.gif b/Documentation/DocBook/v4l/fieldseq_bt.gif
new file mode 100644 (file)
index 0000000..60e8569
Binary files /dev/null and b/Documentation/DocBook/v4l/fieldseq_bt.gif differ
diff --git a/Documentation/DocBook/v4l/fieldseq_bt.pdf b/Documentation/DocBook/v4l/fieldseq_bt.pdf
new file mode 100644 (file)
index 0000000..26598b2
Binary files /dev/null and b/Documentation/DocBook/v4l/fieldseq_bt.pdf differ
diff --git a/Documentation/DocBook/v4l/fieldseq_tb.gif b/Documentation/DocBook/v4l/fieldseq_tb.gif
new file mode 100644 (file)
index 0000000..718492f
Binary files /dev/null and b/Documentation/DocBook/v4l/fieldseq_tb.gif differ
diff --git a/Documentation/DocBook/v4l/fieldseq_tb.pdf b/Documentation/DocBook/v4l/fieldseq_tb.pdf
new file mode 100644 (file)
index 0000000..4965b22
Binary files /dev/null and b/Documentation/DocBook/v4l/fieldseq_tb.pdf differ
diff --git a/Documentation/DocBook/v4l/func-close.xml b/Documentation/DocBook/v4l/func-close.xml
new file mode 100644 (file)
index 0000000..dfb41cb
--- /dev/null
@@ -0,0 +1,70 @@
+<refentry id="func-close">
+  <refmeta>
+    <refentrytitle>V4L2 close()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-close</refname>
+    <refpurpose>Close a V4L2 device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;unistd.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>close</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Closes the device. Any I/O in progress is terminated and
+resources associated with the file descriptor are freed. However data
+format parameters, current input or output, control values or other
+properties remain unchanged.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>The function returns <returnvalue>0</returnvalue> on
+success, <returnvalue>-1</returnvalue> on failure and the
+<varname>errno</varname> is set appropriately. Possible error
+codes:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is not a valid open file
+descriptor.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-ioctl.xml b/Documentation/DocBook/v4l/func-ioctl.xml
new file mode 100644 (file)
index 0000000..00f9690
--- /dev/null
@@ -0,0 +1,146 @@
+<refentry id="func-ioctl">
+  <refmeta>
+    <refentrytitle>V4L2 ioctl()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-ioctl</refname>
+    <refpurpose>Program a V4L2 device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;sys/ioctl.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>void *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>V4L2 ioctl request code as defined in the <link
+linkend="videodev">videodev.h</link> header file, for example
+VIDIOC_QUERYCAP.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para>Pointer to a function parameter, usually a structure.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The <function>ioctl()</function> function is used to program
+V4L2 devices. The argument <parameter>fd</parameter> must be an open
+file descriptor. An ioctl <parameter>request</parameter> has encoded
+in it whether the argument is an input, output or read/write
+parameter, and the size of the argument <parameter>argp</parameter> in
+bytes. Macros and defines specifying V4L2 ioctl requests are located
+in the <link linkend="videodev">videodev.h</link> header file.
+Applications should use their own copy, not include the version in the
+kernel sources on the system they compile on. All V4L2 ioctl requests,
+their respective function and parameters are specified in <xref
+       linkend="user-func" />.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success the <function>ioctl()</function> function returns
+<returnvalue>0</returnvalue> and does not reset the
+<varname>errno</varname> variable. On failure
+<returnvalue>-1</returnvalue> is returned, when the ioctl takes an
+output or read/write parameter it remains unmodified, and the
+<varname>errno</varname> variable is set appropriately. See below for
+possible error codes. Generic errors like <errorcode>EBADF</errorcode>
+or <errorcode>EFAULT</errorcode> are not listed in the sections
+discussing individual ioctl requests.</para>
+    <para>Note ioctls may return undefined error codes. Since errors
+may have side effects such as a driver reset applications should
+abort on unexpected errors.</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is not a valid open file
+descriptor.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The property cannot be changed right now. Typically
+this error code is returned when I/O is in progress or the driver
+supports multiple opens and another process locked the property.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EFAULT</errorcode></term>
+       <listitem>
+         <para><parameter>argp</parameter> references an inaccessible
+memory area.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOTTY</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is  not  associated  with  a
+character special device.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <parameter>request</parameter> or the data pointed
+to by <parameter>argp</parameter> is not valid. This is a very common
+error code, see the individual ioctl requests listed in <xref
+             linkend="user-func" /> for actual causes.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOMEM</errorcode></term>
+       <listitem>
+         <para>Not enough physical or virtual memory was available to
+complete the request.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ERANGE</errorcode></term>
+       <listitem>
+         <para>The application attempted to set a control with the
+&VIDIOC-S-CTRL; ioctl to a value which is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-mmap.xml b/Documentation/DocBook/v4l/func-mmap.xml
new file mode 100644 (file)
index 0000000..2e2fc39
--- /dev/null
@@ -0,0 +1,185 @@
+<refentry id="func-mmap">
+  <refmeta>
+    <refentrytitle>V4L2 mmap()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-mmap</refname>
+    <refpurpose>Map device memory into application address space</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>
+#include &lt;unistd.h&gt;
+#include &lt;sys/mman.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>void *<function>mmap</function></funcdef>
+       <paramdef>void *<parameter>start</parameter></paramdef>
+       <paramdef>size_t <parameter>length</parameter></paramdef>
+       <paramdef>int <parameter>prot</parameter></paramdef>
+       <paramdef>int <parameter>flags</parameter></paramdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>off_t <parameter>offset</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+    <variablelist>
+      <varlistentry>
+       <term><parameter>start</parameter></term>
+       <listitem>
+         <para>Map the buffer to this address in the
+application's address space. When the <constant>MAP_FIXED</constant>
+flag is specified, <parameter>start</parameter> must be a multiple of the
+pagesize and mmap will fail when the specified address
+cannot be used. Use of this option is discouraged; applications should
+just specify a <constant>NULL</constant> pointer here.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>length</parameter></term>
+       <listitem>
+         <para>Length of the memory area to map. This must be the
+same value as returned by the driver in the &v4l2-buffer;
+<structfield>length</structfield> field.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>prot</parameter></term>
+       <listitem>
+         <para>The <parameter>prot</parameter> argument describes the
+desired memory protection. Regardless of the device type and the
+direction of data exchange it should be set to
+<constant>PROT_READ</constant> | <constant>PROT_WRITE</constant>,
+permitting read and write access to image buffers. Drivers should
+support at least this combination of flags. Note the Linux
+<filename>video-buf</filename> kernel module, which is used by the
+bttv, saa7134, saa7146, cx88 and vivi driver supports only
+<constant>PROT_READ</constant> | <constant>PROT_WRITE</constant>. When
+the driver does not support the desired protection the
+<function>mmap()</function> function fails.</para>
+         <para>Note device memory accesses (&eg; the memory on a
+graphics card with video capturing hardware) may incur a performance
+penalty compared to main memory accesses, or reads may be
+significantly slower than writes or vice versa. Other I/O methods may
+be more efficient in this case.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>flags</parameter></term>
+       <listitem>
+         <para>The <parameter>flags</parameter> parameter
+specifies the type of the mapped object, mapping options and whether
+modifications made to the mapped copy of the page are private to the
+process or are to be shared with other references.</para>
+         <para><constant>MAP_FIXED</constant> requests that the
+driver selects no other address than the one specified. If the
+specified address cannot be used, <function>mmap()</function> will fail. If
+<constant>MAP_FIXED</constant> is specified,
+<parameter>start</parameter> must be a multiple of the pagesize. Use
+of this option is discouraged.</para>
+         <para>One of the <constant>MAP_SHARED</constant> or
+<constant>MAP_PRIVATE</constant> flags must be set.
+<constant>MAP_SHARED</constant> allows applications to share the
+mapped memory with other (&eg; child-) processes. Note the Linux
+<filename>video-buf</filename> module which is used by the bttv,
+saa7134, saa7146, cx88 and vivi driver supports only
+<constant>MAP_SHARED</constant>. <constant>MAP_PRIVATE</constant>
+requests copy-on-write semantics. V4L2 applications should not set the
+<constant>MAP_PRIVATE</constant>, <constant>MAP_DENYWRITE</constant>,
+<constant>MAP_EXECUTABLE</constant> or <constant>MAP_ANON</constant>
+flag.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>offset</parameter></term>
+       <listitem>
+         <para>Offset of the buffer in device memory. This must be the
+same value as returned by the driver in the &v4l2-buffer;
+<structfield>m</structfield> union <structfield>offset</structfield> field.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The <function>mmap()</function> function asks to map
+<parameter>length</parameter> bytes starting at
+<parameter>offset</parameter> in the memory of the device specified by
+<parameter>fd</parameter> into the application address space,
+preferably at address <parameter>start</parameter>. This latter
+address is a hint only, and is usually specified as 0.</para>
+
+    <para>Suitable length and offset parameters are queried with the
+&VIDIOC-QUERYBUF; ioctl. Buffers must be allocated with the
+&VIDIOC-REQBUFS; ioctl before they can be queried.</para>
+
+    <para>To unmap buffers the &func-munmap; function is used.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success <function>mmap()</function> returns a pointer to
+the mapped buffer. On error <constant>MAP_FAILED</constant> (-1) is
+returned, and the <varname>errno</varname> variable is set
+appropriately. Possible error codes are:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is not a valid file
+descriptor.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EACCES</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is
+not open for reading and writing.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <parameter>start</parameter> or
+<parameter>length</parameter> or <parameter>offset</parameter> are not
+suitable. (E.&nbsp;g. they are too large, or not aligned on a
+<constant>PAGESIZE</constant> boundary.)</para>
+         <para>The <parameter>flags</parameter> or
+<parameter>prot</parameter> value is not supported.</para>
+         <para>No buffers have been allocated with the
+&VIDIOC-REQBUFS; ioctl.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOMEM</errorcode></term>
+       <listitem>
+         <para>Not enough physical or virtual memory was available to
+complete the request.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-munmap.xml b/Documentation/DocBook/v4l/func-munmap.xml
new file mode 100644 (file)
index 0000000..502ed49
--- /dev/null
@@ -0,0 +1,83 @@
+<refentry id="func-munmap">
+  <refmeta>
+    <refentrytitle>V4L2 munmap()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-munmap</refname>
+    <refpurpose>Unmap device memory</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>
+#include &lt;unistd.h&gt;
+#include &lt;sys/mman.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>munmap</function></funcdef>
+       <paramdef>void *<parameter>start</parameter></paramdef>
+       <paramdef>size_t <parameter>length</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Arguments</title>
+    <variablelist>
+      <varlistentry>
+       <term><parameter>start</parameter></term>
+       <listitem>
+         <para>Address of the mapped buffer as returned by the
+&func-mmap; function.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>length</parameter></term>
+       <listitem>
+         <para>Length of the mapped buffer. This must be the same
+value as given to <function>mmap()</function> and returned by the
+driver in the &v4l2-buffer; <structfield>length</structfield>
+field.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Unmaps a previously with the &func-mmap; function mapped
+buffer and frees it, if possible. <!-- ? This function (not freeing)
+has no impact on I/O in progress, specifically it does not imply
+&VIDIOC-STREAMOFF; to terminate I/O. Unmapped buffers can still be
+enqueued, dequeued or queried, they are just not accessible by the
+application.--></para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success <function>munmap()</function> returns 0, on
+failure -1 and the <varname>errno</varname> variable is set
+appropriately:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <parameter>start</parameter> or
+<parameter>length</parameter> is incorrect, or no buffers have been
+mapped yet.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-open.xml b/Documentation/DocBook/v4l/func-open.xml
new file mode 100644 (file)
index 0000000..7595d07
--- /dev/null
@@ -0,0 +1,121 @@
+<refentry id="func-open">
+  <refmeta>
+    <refentrytitle>V4L2 open()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-open</refname>
+    <refpurpose>Open a V4L2 device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;fcntl.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>open</function></funcdef>
+       <paramdef>const char *<parameter>device_name</parameter></paramdef>
+       <paramdef>int <parameter>flags</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>device_name</parameter></term>
+       <listitem>
+         <para>Device to be opened.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>flags</parameter></term>
+       <listitem>
+         <para>Open flags. Access mode must be
+<constant>O_RDWR</constant>. This is just a technicality, input devices
+still support only reading and output devices only writing.</para>
+         <para>When the <constant>O_NONBLOCK</constant> flag is
+given, the read() function and the &VIDIOC-DQBUF; ioctl will return
+the &EAGAIN; when no data is available or no buffer is in the driver
+outgoing queue, otherwise these functions block until data becomes
+available. All V4L2 drivers exchanging data with applications must
+support the <constant>O_NONBLOCK</constant> flag.</para>
+         <para>Other flags have no effect.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>Description</title>
+
+    <para>To open a V4L2 device applications call
+<function>open()</function> with the desired device name. This
+function has no side effects; all data format parameters, current
+input or output, control values or other properties remain unchanged.
+At the first <function>open()</function> call after loading the driver
+they will be reset to default values, drivers are never in an
+undefined state.</para>
+  </refsect1>
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success <function>open</function> returns the new file
+descriptor. On error -1 is returned, and the <varname>errno</varname>
+variable is set appropriately. Possible error codes are:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EACCES</errorcode></term>
+       <listitem>
+         <para>The caller has no permission to access the
+device.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver does not support multiple opens and the
+device is already in use.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENXIO</errorcode></term>
+       <listitem>
+         <para>No device corresponding to this device special file
+exists.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOMEM</errorcode></term>
+       <listitem>
+         <para>Not enough kernel memory was available to complete the
+request.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EMFILE</errorcode></term>
+       <listitem>
+         <para>The  process  already  has  the  maximum number of
+files open.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENFILE</errorcode></term>
+       <listitem>
+         <para>The limit on the total number of files open on the
+system has been reached.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-poll.xml b/Documentation/DocBook/v4l/func-poll.xml
new file mode 100644 (file)
index 0000000..ec3c718
--- /dev/null
@@ -0,0 +1,127 @@
+<refentry id="func-poll">
+  <refmeta>
+    <refentrytitle>V4L2 poll()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-poll</refname>
+    <refpurpose>Wait for some event on a file descriptor</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;sys/poll.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>poll</function></funcdef>
+       <paramdef>struct pollfd *<parameter>ufds</parameter></paramdef>
+       <paramdef>unsigned int <parameter>nfds</parameter></paramdef>
+       <paramdef>int <parameter>timeout</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>With the <function>poll()</function> function applications
+can suspend execution until the driver has captured data or is ready
+to accept data for output.</para>
+
+    <para>When streaming I/O has been negotiated this function waits
+until a buffer has been filled or displayed and can be dequeued with
+the &VIDIOC-DQBUF; ioctl. When buffers are already in the outgoing
+queue of the driver the function returns immediately.</para>
+
+    <para>On success <function>poll()</function> returns the number of
+file descriptors that have been selected (that is, file descriptors
+for which the <structfield>revents</structfield> field of the
+respective <structname>pollfd</structname> structure is non-zero).
+Capture devices set the <constant>POLLIN</constant> and
+<constant>POLLRDNORM</constant> flags in the
+<structfield>revents</structfield> field, output devices the
+<constant>POLLOUT</constant> and <constant>POLLWRNORM</constant>
+flags. When the function timed out it returns a value of zero, on
+failure it returns <returnvalue>-1</returnvalue> and the
+<varname>errno</varname> variable is set appropriately. When the
+application did not call &VIDIOC-QBUF; or &VIDIOC-STREAMON; yet the
+<function>poll()</function> function succeeds, but sets the
+<constant>POLLERR</constant> flag in the
+<structfield>revents</structfield> field.</para>
+
+    <para>When use of the <function>read()</function> function has
+been negotiated and the driver does not capture yet, the
+<function>poll</function> function starts capturing. When that fails
+it returns a <constant>POLLERR</constant> as above. Otherwise it waits
+until data has been captured and can be read. When the driver captures
+continuously (as opposed to, for example, still images) the function
+may return immediately.</para>
+
+    <para>When use of the <function>write()</function> function has
+been negotiated the <function>poll</function> function just waits
+until the driver is ready for a non-blocking
+<function>write()</function> call.</para>
+
+    <para>All drivers implementing the <function>read()</function> or
+<function>write()</function> function or streaming I/O must also
+support the <function>poll()</function> function.</para>
+
+    <para>For more details see the
+<function>poll()</function> manual page.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, <function>poll()</function> returns the number
+structures which have non-zero <structfield>revents</structfield>
+fields, or zero if the call timed out. On error
+<returnvalue>-1</returnvalue> is returned, and the
+<varname>errno</varname> variable is set appropriately:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para>One or more of the <parameter>ufds</parameter> members
+specify an invalid file descriptor.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver does not support multiple read or write
+streams and the device is already in use.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EFAULT</errorcode></term>
+       <listitem>
+         <para><parameter>ufds</parameter> references an inaccessible
+memory area.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINTR</errorcode></term>
+       <listitem>
+         <para>The call was interrupted by a signal.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <parameter>nfds</parameter> argument is greater
+than <constant>OPEN_MAX</constant>.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-read.xml b/Documentation/DocBook/v4l/func-read.xml
new file mode 100644 (file)
index 0000000..a5089bf
--- /dev/null
@@ -0,0 +1,189 @@
+<refentry id="func-read">
+  <refmeta>
+    <refentrytitle>V4L2 read()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-read</refname>
+    <refpurpose>Read from a V4L2 device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;unistd.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>ssize_t <function>read</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>void *<parameter>buf</parameter></paramdef>
+       <paramdef>size_t <parameter>count</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>buf</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>count</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>read()</function> attempts to read up to
+<parameter>count</parameter> bytes from file descriptor
+<parameter>fd</parameter> into the buffer starting at
+<parameter>buf</parameter>. The layout of the data in the buffer is
+discussed in the respective device interface section, see ##. If <parameter>count</parameter> is zero,
+<function>read()</function> returns zero and has no other results. If
+<parameter>count</parameter> is greater than
+<constant>SSIZE_MAX</constant>, the result is unspecified. Regardless
+of the <parameter>count</parameter> value each
+<function>read()</function> call will provide at most one frame (two
+fields) worth of data.</para>
+
+    <para>By default <function>read()</function> blocks until data
+becomes available. When the <constant>O_NONBLOCK</constant> flag was
+given to the &func-open; function it
+returns immediately with an &EAGAIN; when no data is available. The
+&func-select; or &func-poll; functions
+can always be used to suspend execution until data becomes available. All
+drivers supporting the <function>read()</function> function must also
+support <function>select()</function> and
+<function>poll()</function>.</para>
+
+    <para>Drivers can implement read functionality in different
+ways, using a single or multiple buffers and discarding the oldest or
+newest frames once the internal buffers are filled.</para>
+
+    <para><function>read()</function> never returns a "snapshot" of a
+buffer being filled. Using a single buffer the driver will stop
+capturing when the application starts reading the buffer until the
+read is finished. Thus only the period of the vertical blanking
+interval is available for reading, or the capture rate must fall below
+the nominal frame rate of the video standard.</para>
+
+<para>The behavior of
+<function>read()</function> when called during the active picture
+period or the vertical blanking separating the top and bottom field
+depends on the discarding policy. A driver discarding the oldest
+frames keeps capturing into an internal buffer, continuously
+overwriting the previously, not read frame, and returns the frame
+being received at the time of the <function>read()</function> call as
+soon as it is complete.</para>
+
+    <para>A driver discarding the newest frames stops capturing until
+the next <function>read()</function> call. The frame being received at
+<function>read()</function> time is discarded, returning the following
+frame instead. Again this implies a reduction of the capture rate to
+one half or less of the nominal frame rate. An example of this model
+is the video read mode of the bttv driver, initiating a DMA to user
+memory when <function>read()</function> is called and returning when
+the DMA finished.</para>
+
+    <para>In the multiple buffer model drivers maintain a ring of
+internal buffers, automatically advancing to the next free buffer.
+This allows continuous capturing when the application can empty the
+buffers fast enough. Again, the behavior when the driver runs out of
+free buffers depends on the discarding policy.</para>
+
+    <para>Applications can get and set the number of buffers used
+internally by the driver with the &VIDIOC-G-PARM; and &VIDIOC-S-PARM;
+ioctls. They are optional, however. The discarding policy is not
+reported and cannot be changed. For minimum requirements see <xref
+       linkend="devices" />.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, the number of bytes read is returned. It is not
+an error if this number is smaller than the number of bytes requested,
+or the amount of data required for one frame. This may happen for
+example because <function>read()</function> was interrupted by a
+signal. On error, -1 is returned, and the <varname>errno</varname>
+variable is set appropriately. In this case the next read will start
+at the beginning of a new frame. Possible error codes are:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EAGAIN</errorcode></term>
+       <listitem>
+         <para>Non-blocking I/O has been selected using
+O_NONBLOCK and no data was immediately available for reading.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is not a valid file
+descriptor or is not open for reading, or the process already has the
+maximum number of files open.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver does not support multiple read streams and the
+device is already in use.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EFAULT</errorcode></term>
+       <listitem>
+         <para><parameter>buf</parameter> references an inaccessible
+memory area.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINTR</errorcode></term>
+       <listitem>
+         <para>The call was interrupted by a signal before any
+data was read.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EIO</errorcode></term>
+       <listitem>
+         <para>I/O error. This indicates some hardware problem or a
+failure to communicate with a remote device (USB camera etc.).</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <function>read()</function> function is not
+supported by this driver, not on this device, or generally not on this
+type of device.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-select.xml b/Documentation/DocBook/v4l/func-select.xml
new file mode 100644 (file)
index 0000000..b671362
--- /dev/null
@@ -0,0 +1,138 @@
+<refentry id="func-select">
+  <refmeta>
+    <refentrytitle>V4L2 select()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-select</refname>
+    <refpurpose>Synchronous I/O multiplexing</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>
+#include &lt;sys/time.h&gt;
+#include &lt;sys/types.h&gt;
+#include &lt;unistd.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>int <function>select</function></funcdef>
+       <paramdef>int <parameter>nfds</parameter></paramdef>
+       <paramdef>fd_set *<parameter>readfds</parameter></paramdef>
+       <paramdef>fd_set *<parameter>writefds</parameter></paramdef>
+       <paramdef>fd_set *<parameter>exceptfds</parameter></paramdef>
+       <paramdef>struct timeval *<parameter>timeout</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>With the <function>select()</function> function applications
+can suspend execution until the driver has captured data or is ready
+to accept data for output.</para>
+
+    <para>When streaming I/O has been negotiated this function waits
+until a buffer has been filled or displayed and can be dequeued with
+the &VIDIOC-DQBUF; ioctl. When buffers are already in the outgoing
+queue of the driver the function returns immediately.</para>
+
+    <para>On success <function>select()</function> returns the total
+number of bits set in the <structname>fd_set</structname>s. When the
+function timed out it returns a value of zero. On failure it returns
+<returnvalue>-1</returnvalue> and the <varname>errno</varname>
+variable is set appropriately. When the application did not call
+&VIDIOC-QBUF; or &VIDIOC-STREAMON; yet the
+<function>select()</function> function succeeds, setting the bit of
+the file descriptor in <parameter>readfds</parameter> or
+<parameter>writefds</parameter>, but subsequent &VIDIOC-DQBUF; calls
+will fail.<footnote><para>The Linux kernel implements
+<function>select()</function> like the &func-poll; function, but
+<function>select()</function> cannot return a
+<constant>POLLERR</constant>.</para>
+      </footnote></para>
+
+    <para>When use of the <function>read()</function> function has
+been negotiated and the driver does not capture yet, the
+<function>select()</function> function starts capturing. When that
+fails, <function>select()</function> returns successful and a
+subsequent <function>read()</function> call, which also attempts to
+start capturing, will return an appropriate error code. When the
+driver captures continuously (as opposed to, for example, still
+images) and data is already available the
+<function>select()</function> function returns immediately.</para>
+
+    <para>When use of the <function>write()</function> function has
+been negotiated the <function>select()</function> function just waits
+until the driver is ready for a non-blocking
+<function>write()</function> call.</para>
+
+    <para>All drivers implementing the <function>read()</function> or
+<function>write()</function> function or streaming I/O must also
+support the <function>select()</function> function.</para>
+
+    <para>For more details see the <function>select()</function>
+manual page.</para>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, <function>select()</function> returns the number
+of descriptors contained in the three returned descriptor sets, which
+will be zero if the timeout expired. On error
+<returnvalue>-1</returnvalue> is returned, and the
+<varname>errno</varname> variable is set appropriately; the sets and
+<parameter>timeout</parameter> are undefined. Possible error codes
+are:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para>One or more of the file descriptor sets specified a
+file descriptor that is not open.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver does not support multiple read or write
+streams and the device is already in use.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EFAULT</errorcode></term>
+       <listitem>
+         <para>The <parameter>readfds</parameter>,
+<parameter>writefds</parameter>, <parameter>exceptfds</parameter> or
+<parameter>timeout</parameter> pointer references an inaccessible memory
+area.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINTR</errorcode></term>
+       <listitem>
+         <para>The call was interrupted by a signal.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <parameter>nfds</parameter> argument is less than
+zero or greater than <constant>FD_SETSIZE</constant>.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/func-write.xml b/Documentation/DocBook/v4l/func-write.xml
new file mode 100644 (file)
index 0000000..2c09c09
--- /dev/null
@@ -0,0 +1,136 @@
+<refentry id="func-write">
+  <refmeta>
+    <refentrytitle>V4L2 write()</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>v4l2-write</refname>
+    <refpurpose>Write to a V4L2 device</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;unistd.h&gt;</funcsynopsisinfo>
+      <funcprototype>
+       <funcdef>ssize_t <function>write</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>void *<parameter>buf</parameter></paramdef>
+       <paramdef>size_t <parameter>count</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>buf</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>count</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>write()</function> writes up to
+<parameter>count</parameter> bytes to the device referenced by the
+file descriptor <parameter>fd</parameter> from the buffer starting at
+<parameter>buf</parameter>. When the hardware outputs are not active
+yet, this function enables them. When <parameter>count</parameter> is
+zero, <function>write()</function> returns
+<returnvalue>0</returnvalue> without any other effect.</para>
+
+    <para>When the application does not provide more data in time, the
+previous video frame, raw VBI image, sliced VPS or WSS data is
+displayed again. Sliced Teletext or Closed Caption data is not
+repeated, the driver inserts a blank line instead.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, the number of bytes written are returned. Zero
+indicates nothing was written. On error, <returnvalue>-1</returnvalue>
+is returned, and the <varname>errno</varname> variable is set
+appropriately. In this case the next write will start at the beginning
+of a new frame. Possible error codes are:</para>
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EAGAIN</errorcode></term>
+       <listitem>
+         <para>Non-blocking I/O has been selected using the <link
+linkend="func-open"><constant>O_NONBLOCK</constant></link> flag and no
+buffer space was available to write the data immediately.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBADF</errorcode></term>
+       <listitem>
+         <para><parameter>fd</parameter> is not a valid file
+descriptor or is not open for writing.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver does not support multiple write streams and the
+device is already in use.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EFAULT</errorcode></term>
+       <listitem>
+         <para><parameter>buf</parameter> references an inaccessible
+memory area.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINTR</errorcode></term>
+       <listitem>
+         <para>The call was interrupted by a signal before any
+data was written.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EIO</errorcode></term>
+       <listitem>
+         <para>I/O error. This indicates some hardware problem.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <function>write()</function> function is not
+supported by this driver, not on this device, or generally not on this
+type of device.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/io.xml b/Documentation/DocBook/v4l/io.xml
new file mode 100644 (file)
index 0000000..f92f243
--- /dev/null
@@ -0,0 +1,1073 @@
+  <title>Input/Output</title>
+
+  <para>The V4L2 API defines several different methods to read from or
+write to a device. All drivers exchanging data with applications must
+support at least one of them.</para>
+
+  <para>The classic I/O method using the <function>read()</function>
+and <function>write()</function> function is automatically selected
+after opening a V4L2 device. When the driver does not support this
+method attempts to read or write will fail at any time.</para>
+
+  <para>Other methods must be negotiated. To select the streaming I/O
+method with memory mapped or user buffers applications call the
+&VIDIOC-REQBUFS; ioctl. The asynchronous I/O method is not defined
+yet.</para>
+
+  <para>Video overlay can be considered another I/O method, although
+the application does not directly receive the image data. It is
+selected by initiating video overlay with the &VIDIOC-S-FMT; ioctl.
+For more information see <xref linkend="overlay" />.</para>
+
+  <para>Generally exactly one I/O method, including overlay, is
+associated with each file descriptor. The only exceptions are
+applications not exchanging data with a driver ("panel applications",
+see <xref linkend="open" />) and drivers permitting simultaneous video capturing
+and overlay using the same file descriptor, for compatibility with V4L
+and earlier versions of V4L2.</para>
+
+  <para><constant>VIDIOC_S_FMT</constant> and
+<constant>VIDIOC_REQBUFS</constant> would permit this to some degree,
+but for simplicity drivers need not support switching the I/O method
+(after first switching away from read/write) other than by closing
+and reopening the device.</para>
+
+  <para>The following sections describe the various I/O methods in
+more detail.</para>
+
+  <section id="rw">
+    <title>Read/Write</title>
+
+    <para>Input and output devices support the
+<function>read()</function> and <function>write()</function> function,
+respectively, when the <constant>V4L2_CAP_READWRITE</constant> flag in
+the <structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl is set.</para>
+
+    <para>Drivers may need the CPU to copy the data, but they may also
+support DMA to or from user memory, so this I/O method is not
+necessarily less efficient than other methods merely exchanging buffer
+pointers. It is considered inferior though because no meta-information
+like frame counters or timestamps are passed. This information is
+necessary to recognize frame dropping and to synchronize with other
+data streams. However this is also the simplest I/O method, requiring
+little or no setup to exchange data. It permits command line stunts
+like this (the <application>vidctrl</application> tool is
+fictitious):</para>
+
+    <informalexample>
+      <screen>
+&gt; vidctrl /dev/video --input=0 --format=YUYV --size=352x288
+&gt; dd if=/dev/video of=myimage.422 bs=202752 count=1
+</screen>
+    </informalexample>
+
+    <para>To read from the device applications use the
+&func-read; function, to write the &func-write; function.
+Drivers must implement one I/O method if they
+exchange data with applications, but it need not be this.<footnote>
+       <para>It would be desirable if applications could depend on
+drivers supporting all I/O interfaces, but as much as the complex
+memory mapping I/O can be inadequate for some devices we have no
+reason to require this interface, which is most useful for simple
+applications capturing still images.</para>
+      </footnote> When reading or writing is supported, the driver
+must also support the &func-select; and &func-poll;
+function.<footnote>
+       <para>At the driver level <function>select()</function> and
+<function>poll()</function> are the same, and
+<function>select()</function> is too important to be optional.</para>
+      </footnote></para>
+  </section>
+
+  <section id="mmap">
+    <title>Streaming I/O (Memory Mapping)</title>
+
+    <para>Input and output devices support this I/O method when the
+<constant>V4L2_CAP_STREAMING</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl is set. There are two
+streaming methods, to determine if the memory mapping flavor is
+supported applications must call the &VIDIOC-REQBUFS; ioctl.</para>
+
+    <para>Streaming is an I/O method where only pointers to buffers
+are exchanged between application and driver, the data itself is not
+copied. Memory mapping is primarily intended to map buffers in device
+memory into the application's address space. Device memory can be for
+example the video memory on a graphics card with a video capture
+add-on. However, being the most efficient I/O method available for a
+long time, many other drivers support streaming as well, allocating
+buffers in DMA-able main memory.</para>
+
+    <para>A driver can support many sets of buffers. Each set is
+identified by a unique buffer type value. The sets are independent and
+each set can hold a different type of data. To access different sets
+at the same time different file descriptors must be used.<footnote>
+       <para>One could use one file descriptor and set the buffer
+type field accordingly when calling &VIDIOC-QBUF; etc., but it makes
+the <function>select()</function> function ambiguous. We also like the
+clean approach of one file descriptor per logical stream. Video
+overlay for example is also a logical stream, although the CPU is not
+needed for continuous operation.</para>
+      </footnote></para>
+
+    <para>To allocate device buffers applications call the
+&VIDIOC-REQBUFS; ioctl with the desired number of buffers and buffer
+type, for example <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>.
+This ioctl can also be used to change the number of buffers or to free
+the allocated memory, provided none of the buffers are still
+mapped.</para>
+
+    <para>Before applications can access the buffers they must map
+them into their address space with the &func-mmap; function. The
+location of the buffers in device memory can be determined with the
+&VIDIOC-QUERYBUF; ioctl. The <structfield>m.offset</structfield> and
+<structfield>length</structfield> returned in a &v4l2-buffer; are
+passed as sixth and second parameter to the
+<function>mmap()</function> function. The offset and length values
+must not be modified. Remember the buffers are allocated in physical
+memory, as opposed to virtual memory which can be swapped out to disk.
+Applications should free the buffers as soon as possible with the
+&func-munmap; function.</para>
+
+    <example>
+      <title>Mapping buffers</title>
+
+      <programlisting>
+&v4l2-requestbuffers; reqbuf;
+struct {
+       void *start;
+       size_t length;
+} *buffers;
+unsigned int i;
+
+memset (&amp;reqbuf, 0, sizeof (reqbuf));
+reqbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+reqbuf.memory = V4L2_MEMORY_MMAP;
+reqbuf.count = 20;
+
+if (-1 == ioctl (fd, &VIDIOC-REQBUFS;, &amp;reqbuf)) {
+       if (errno == EINVAL)
+               printf ("Video capturing or mmap-streaming is not supported\n");
+       else
+               perror ("VIDIOC_REQBUFS");
+
+       exit (EXIT_FAILURE);
+}
+
+/* We want at least five buffers. */
+
+if (reqbuf.count &lt; 5) {
+       /* You may need to free the buffers here. */
+       printf ("Not enough buffer memory\n");
+       exit (EXIT_FAILURE);
+}
+
+buffers = calloc (reqbuf.count, sizeof (*buffers));
+assert (buffers != NULL);
+
+for (i = 0; i &lt; reqbuf.count; i++) {
+       &v4l2-buffer; buffer;
+
+       memset (&amp;buffer, 0, sizeof (buffer));
+       buffer.type = reqbuf.type;
+       buffer.memory = V4L2_MEMORY_MMAP;
+       buffer.index = i;
+
+       if (-1 == ioctl (fd, &VIDIOC-QUERYBUF;, &amp;buffer)) {
+               perror ("VIDIOC_QUERYBUF");
+               exit (EXIT_FAILURE);
+       }
+
+       buffers[i].length = buffer.length; /* remember for munmap() */
+
+       buffers[i].start = mmap (NULL, buffer.length,
+                                PROT_READ | PROT_WRITE, /* recommended */
+                                MAP_SHARED,             /* recommended */
+                                fd, buffer.m.offset);
+
+       if (MAP_FAILED == buffers[i].start) {
+               /* If you do not exit here you should unmap() and free()
+                  the buffers mapped so far. */
+               perror ("mmap");
+               exit (EXIT_FAILURE);
+       }
+}
+
+/* Cleanup. */
+
+for (i = 0; i &lt; reqbuf.count; i++)
+       munmap (buffers[i].start, buffers[i].length);
+      </programlisting>
+    </example>
+
+    <para>Conceptually streaming drivers maintain two buffer queues, an incoming
+and an outgoing queue. They separate the synchronous capture or output
+operation locked to a video clock from the application which is
+subject to random disk or network delays and preemption by
+other processes, thereby reducing the probability of data loss.
+The queues are organized as FIFOs, buffers will be
+output in the order enqueued in the incoming FIFO, and were
+captured in the order dequeued from the outgoing FIFO.</para>
+
+    <para>The driver may require a minimum number of buffers enqueued
+at all times to function, apart of this no limit exists on the number
+of buffers applications can enqueue in advance, or dequeue and
+process. They can also enqueue in a different order than buffers have
+been dequeued, and the driver can <emphasis>fill</emphasis> enqueued
+<emphasis>empty</emphasis> buffers in any order. <footnote>
+       <para>Random enqueue order permits applications processing
+images out of order (such as video codecs) to return buffers earlier,
+reducing the probability of data loss. Random fill order allows
+drivers to reuse buffers on a LIFO-basis, taking advantage of caches
+holding scatter-gather lists and the like.</para>
+      </footnote> The index number of a buffer (&v4l2-buffer;
+<structfield>index</structfield>) plays no role here, it only
+identifies the buffer.</para>
+
+    <para>Initially all mapped buffers are in dequeued state,
+inaccessible by the driver. For capturing applications it is customary
+to first enqueue all mapped buffers, then to start capturing and enter
+the read loop. Here the application waits until a filled buffer can be
+dequeued, and re-enqueues the buffer when the data is no longer
+needed. Output applications fill and enqueue buffers, when enough
+buffers are stacked up the output is started with
+<constant>VIDIOC_STREAMON</constant>. In the write loop, when
+the application runs out of free buffers, it must wait until an empty
+buffer can be dequeued and reused.</para>
+
+    <para>To enqueue and dequeue a buffer applications use the
+&VIDIOC-QBUF; and &VIDIOC-DQBUF; ioctl. The status of a buffer being
+mapped, enqueued, full or empty can be determined at any time using the
+&VIDIOC-QUERYBUF; ioctl. Two methods exist to suspend execution of the
+application until one or more buffers can be dequeued. By default
+<constant>VIDIOC_DQBUF</constant> blocks when no buffer is in the
+outgoing queue. When the <constant>O_NONBLOCK</constant> flag was
+given to the &func-open; function, <constant>VIDIOC_DQBUF</constant>
+returns immediately with an &EAGAIN; when no buffer is available. The
+&func-select; or &func-poll; function are always available.</para>
+
+    <para>To start and stop capturing or output applications call the
+&VIDIOC-STREAMON; and &VIDIOC-STREAMOFF; ioctl. Note
+<constant>VIDIOC_STREAMOFF</constant> removes all buffers from both
+queues as a side effect. Since there is no notion of doing anything
+"now" on a multitasking system, if an application needs to synchronize
+with another event it should examine the &v4l2-buffer;
+<structfield>timestamp</structfield> of captured buffers, or set the
+field before enqueuing buffers for output.</para>
+
+    <para>Drivers implementing memory mapping I/O must
+support the <constant>VIDIOC_REQBUFS</constant>,
+<constant>VIDIOC_QUERYBUF</constant>,
+<constant>VIDIOC_QBUF</constant>, <constant>VIDIOC_DQBUF</constant>,
+<constant>VIDIOC_STREAMON</constant> and
+<constant>VIDIOC_STREAMOFF</constant> ioctl, the
+<function>mmap()</function>, <function>munmap()</function>,
+<function>select()</function> and <function>poll()</function>
+function.<footnote>
+       <para>At the driver level <function>select()</function> and
+<function>poll()</function> are the same, and
+<function>select()</function> is too important to be optional. The
+rest should be evident.</para>
+      </footnote></para>
+
+    <para>[capture example]</para>
+
+  </section>
+
+  <section id="userp">
+    <title>Streaming I/O (User Pointers)</title>
+
+    <para>Input and output devices support this I/O method when the
+<constant>V4L2_CAP_STREAMING</constant> flag in the
+<structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl is set. If the particular user
+pointer method (not only memory mapping) is supported must be
+determined by calling the &VIDIOC-REQBUFS; ioctl.</para>
+
+    <para>This I/O method combines advantages of the read/write and
+memory mapping methods. Buffers are allocated by the application
+itself, and can reside for example in virtual or shared memory. Only
+pointers to data are exchanged, these pointers and meta-information
+are passed in &v4l2-buffer;. The driver must be switched
+into user pointer I/O mode by calling the &VIDIOC-REQBUFS; with the
+desired buffer type. No buffers are allocated beforehands,
+consequently they are not indexed and cannot be queried like mapped
+buffers with the <constant>VIDIOC_QUERYBUF</constant> ioctl.</para>
+
+    <example>
+      <title>Initiating streaming I/O with user pointers</title>
+
+      <programlisting>
+&v4l2-requestbuffers; reqbuf;
+
+memset (&amp;reqbuf, 0, sizeof (reqbuf));
+reqbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+reqbuf.memory = V4L2_MEMORY_USERPTR;
+
+if (ioctl (fd, &VIDIOC-REQBUFS;, &amp;reqbuf) == -1) {
+       if (errno == EINVAL)
+               printf ("Video capturing or user pointer streaming is not supported\n");
+       else
+               perror ("VIDIOC_REQBUFS");
+
+       exit (EXIT_FAILURE);
+}
+      </programlisting>
+    </example>
+
+    <para>Buffer addresses and sizes are passed on the fly with the
+&VIDIOC-QBUF; ioctl. Although buffers are commonly cycled,
+applications can pass different addresses and sizes at each
+<constant>VIDIOC_QBUF</constant> call. If required by the hardware the
+driver swaps memory pages within physical memory to create a
+continuous area of memory. This happens transparently to the
+application in the virtual memory subsystem of the kernel. When buffer
+pages have been swapped out to disk they are brought back and finally
+locked in physical memory for DMA.<footnote>
+       <para>We expect that frequently used buffers are typically not
+swapped out. Anyway, the process of swapping, locking or generating
+scatter-gather lists may be time consuming. The delay can be masked by
+the depth of the incoming buffer queue, and perhaps by maintaining
+caches assuming a buffer will be soon enqueued again. On the other
+hand, to optimize memory usage drivers can limit the number of buffers
+locked in advance and recycle the most recently used buffers first. Of
+course, the pages of empty buffers in the incoming queue need not be
+saved to disk. Output buffers must be saved on the incoming and
+outgoing queue because an application may share them with other
+processes.</para>
+      </footnote></para>
+
+    <para>Filled or displayed buffers are dequeued with the
+&VIDIOC-DQBUF; ioctl. The driver can unlock the memory pages at any
+time between the completion of the DMA and this ioctl. The memory is
+also unlocked when &VIDIOC-STREAMOFF; is called, &VIDIOC-REQBUFS;, or
+when the device is closed. Applications must take care not to free
+buffers without dequeuing. For once, the buffers remain locked until
+further, wasting physical memory. Second the driver will not be
+notified when the memory is returned to the application's free list
+and subsequently reused for other purposes, possibly completing the
+requested DMA and overwriting valuable data.</para>
+
+    <para>For capturing applications it is customary to enqueue a
+number of empty buffers, to start capturing and enter the read loop.
+Here the application waits until a filled buffer can be dequeued, and
+re-enqueues the buffer when the data is no longer needed. Output
+applications fill and enqueue buffers, when enough buffers are stacked
+up output is started. In the write loop, when the application
+runs out of free buffers it must wait until an empty buffer can be
+dequeued and reused. Two methods exist to suspend execution of the
+application until one or more buffers can be dequeued. By default
+<constant>VIDIOC_DQBUF</constant> blocks when no buffer is in the
+outgoing queue. When the <constant>O_NONBLOCK</constant> flag was
+given to the &func-open; function, <constant>VIDIOC_DQBUF</constant>
+returns immediately with an &EAGAIN; when no buffer is available. The
+&func-select; or &func-poll; function are always available.</para>
+
+    <para>To start and stop capturing or output applications call the
+&VIDIOC-STREAMON; and &VIDIOC-STREAMOFF; ioctl. Note
+<constant>VIDIOC_STREAMOFF</constant> removes all buffers from both
+queues and unlocks all buffers as a side effect. Since there is no
+notion of doing anything "now" on a multitasking system, if an
+application needs to synchronize with another event it should examine
+the &v4l2-buffer; <structfield>timestamp</structfield> of captured
+buffers, or set the field before enqueuing buffers for output.</para>
+
+    <para>Drivers implementing user pointer I/O must
+support the <constant>VIDIOC_REQBUFS</constant>,
+<constant>VIDIOC_QBUF</constant>, <constant>VIDIOC_DQBUF</constant>,
+<constant>VIDIOC_STREAMON</constant> and
+<constant>VIDIOC_STREAMOFF</constant> ioctl, the
+<function>select()</function> and <function>poll()</function> function.<footnote>
+       <para>At the driver level <function>select()</function> and
+<function>poll()</function> are the same, and
+<function>select()</function> is too important to be optional. The
+rest should be evident.</para>
+      </footnote></para>
+  </section>
+
+  <section id="async">
+    <title>Asynchronous I/O</title>
+
+    <para>This method is not defined yet.</para>
+  </section>
+
+  <section id="buffer">
+    <title>Buffers</title>
+
+    <para>A buffer contains data exchanged by application and
+driver using one of the Streaming I/O methods. Only pointers to
+buffers are exchanged, the data itself is not copied. These pointers,
+together with meta-information like timestamps or field parity, are
+stored in a struct <structname>v4l2_buffer</structname>, argument to
+the &VIDIOC-QUERYBUF;, &VIDIOC-QBUF; and &VIDIOC-DQBUF; ioctl.</para>
+
+      <para>Nominally timestamps refer to the first data byte transmitted.
+In practice however the wide range of hardware covered by the V4L2 API
+limits timestamp accuracy. Often an interrupt routine will
+sample the system clock shortly after the field or frame was stored
+completely in memory. So applications must expect a constant
+difference up to one field or frame period plus a small (few scan
+lines) random error. The delay and error can be much
+larger due to compression or transmission over an external bus when
+the frames are not properly stamped by the sender. This is frequently
+the case with USB cameras. Here timestamps refer to the instant the
+field or frame was received by the driver, not the capture time. These
+devices identify by not enumerating any video standards, see <xref
+linkend="standard" />.</para>
+
+      <para>Similar limitations apply to output timestamps. Typically
+the video hardware locks to a clock controlling the video timing, the
+horizontal and vertical synchronization pulses. At some point in the
+line sequence, possibly the vertical blanking, an interrupt routine
+samples the system clock, compares against the timestamp and programs
+the hardware to repeat the previous field or frame, or to display the
+buffer contents.</para>
+
+      <para>Apart of limitations of the video device and natural
+inaccuracies of all clocks, it should be noted system time itself is
+not perfectly stable. It can be affected by power saving cycles,
+warped to insert leap seconds, or even turned back or forth by the
+system administrator affecting long term measurements. <footnote>
+         <para>Since no other Linux multimedia
+API supports unadjusted time it would be foolish to introduce here. We
+must use a universally supported clock to synchronize different media,
+hence time of day.</para>
+       </footnote></para>
+
+    <table frame="none" pgwide="1" id="v4l2-buffer">
+      <title>struct <structname>v4l2_buffer</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry></entry>
+           <entry>Number of the buffer, set by the application. This
+field is only used for <link linkend="mmap">memory mapping</link> I/O
+and can range from zero to the number of buffers allocated
+with the &VIDIOC-REQBUFS; ioctl (&v4l2-requestbuffers; <structfield>count</structfield>) minus one.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry></entry>
+           <entry>Type of the buffer, same as &v4l2-format;
+<structfield>type</structfield> or &v4l2-requestbuffers;
+<structfield>type</structfield>, set by the application.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>bytesused</structfield></entry>
+           <entry></entry>
+           <entry>The number of bytes occupied by the data in the
+buffer. It depends on the negotiated data format and may change with
+each buffer for compressed variable size data like JPEG images.
+Drivers must set this field when <structfield>type</structfield>
+refers to an input stream, applications when an output stream.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry></entry>
+           <entry>Flags set by the application or driver, see <xref
+linkend="buffer-flags" />.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-field;</entry>
+           <entry><structfield>field</structfield></entry>
+           <entry></entry>
+           <entry>Indicates the field order of the image in the
+buffer, see <xref linkend="v4l2-field" />. This field is not used when
+the buffer contains VBI data. Drivers must set it when
+<structfield>type</structfield> refers to an input stream,
+applications when an output stream.</entry>
+         </row>
+         <row>
+           <entry>struct timeval</entry>
+           <entry><structfield>timestamp</structfield></entry>
+           <entry></entry>
+           <entry><para>For input streams this is the
+system time (as returned by the <function>gettimeofday()</function>
+function) when the first data byte was captured. For output streams
+the data will not be displayed before this time, secondary to the
+nominal frame rate determined by the current video standard in
+enqueued order. Applications can for example zero this field to
+display frames as soon as possible. The driver stores the time at
+which the first data byte was actually sent out in the
+<structfield>timestamp</structfield> field. This permits
+applications to monitor the drift between the video and system
+clock.</para></entry>
+         </row>
+         <row>
+           <entry>&v4l2-timecode;</entry>
+           <entry><structfield>timecode</structfield></entry>
+           <entry></entry>
+           <entry>When <structfield>type</structfield> is
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant> and the
+<constant>V4L2_BUF_FLAG_TIMECODE</constant> flag is set in
+<structfield>flags</structfield>, this structure contains a frame
+timecode. In <link linkend="v4l2-field">V4L2_FIELD_ALTERNATE</link>
+mode the top and bottom field contain the same timecode.
+Timecodes are intended to help video editing and are typically recorded on
+video tapes, but also embedded in compressed formats like MPEG. This
+field is independent of the <structfield>timestamp</structfield> and
+<structfield>sequence</structfield> fields.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>sequence</structfield></entry>
+           <entry></entry>
+           <entry>Set by the driver, counting the frames in the
+sequence.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>In <link
+linkend="v4l2-field">V4L2_FIELD_ALTERNATE</link> mode the top and
+bottom field have the same sequence number. The count starts at zero
+and includes dropped or repeated frames. A dropped frame was received
+by an input device but could not be stored due to lack of free buffer
+space. A repeated frame was displayed again by an output device
+because the application did not pass new data in
+time.</para><para>Note this may count the frames received
+e.g. over USB, without taking into account the frames dropped by the
+remote hardware due to limited compression throughput or bus
+bandwidth. These devices identify by not enumerating any video
+standards, see <xref linkend="standard" />.</para></entry>
+         </row>
+         <row>
+           <entry>&v4l2-memory;</entry>
+           <entry><structfield>memory</structfield></entry>
+           <entry></entry>
+           <entry>This field must be set by applications and/or drivers
+in accordance with the selected I/O method.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry><structfield>m</structfield></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>offset</structfield></entry>
+           <entry>When <structfield>memory</structfield> is
+<constant>V4L2_MEMORY_MMAP</constant> this is the offset of the buffer
+from the start of the device memory. The value is returned by the
+driver and apart of serving as parameter to the &func-mmap; function
+not useful for applications. See <xref linkend="mmap" /> for details.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>unsigned long</entry>
+           <entry><structfield>userptr</structfield></entry>
+           <entry>When <structfield>memory</structfield> is
+<constant>V4L2_MEMORY_USERPTR</constant> this is a pointer to the
+buffer (casted to unsigned long type) in virtual memory, set by the
+application. See <xref linkend="userp" /> for details.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>length</structfield></entry>
+           <entry></entry>
+           <entry>Size of the buffer (not the payload) in bytes.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>input</structfield></entry>
+           <entry></entry>
+           <entry>Some video capture drivers support rapid and
+synchronous video input changes, a function useful for example in
+video surveillance applications. For this purpose applications set the
+<constant>V4L2_BUF_FLAG_INPUT</constant> flag, and this field to the
+number of a video input as in &v4l2-input; field
+<structfield>index</structfield>.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield></entry>
+           <entry></entry>
+           <entry>A place holder for future extensions and custom
+(driver defined) buffer types
+<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="v4l2-buf-type">
+      <title>enum v4l2_buf_type</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant></entry>
+           <entry>1</entry>
+           <entry>Buffer of a video capture stream, see <xref
+               linkend="capture" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant></entry>
+           <entry>2</entry>
+           <entry>Buffer of a video output stream, see <xref
+               linkend="output" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant></entry>
+           <entry>3</entry>
+           <entry>Buffer for video overlay, see <xref linkend="overlay" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VBI_CAPTURE</constant></entry>
+           <entry>4</entry>
+           <entry>Buffer of a raw VBI capture stream, see <xref
+               linkend="raw-vbi" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VBI_OUTPUT</constant></entry>
+           <entry>5</entry>
+           <entry>Buffer of a raw VBI output stream, see <xref
+               linkend="raw-vbi" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_SLICED_VBI_CAPTURE</constant></entry>
+           <entry>6</entry>
+           <entry>Buffer of a sliced VBI capture stream, see <xref
+               linkend="sliced" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_SLICED_VBI_OUTPUT</constant></entry>
+           <entry>7</entry>
+           <entry>Buffer of a sliced VBI output stream, see <xref
+               linkend="sliced" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant></entry>
+           <entry>8</entry>
+           <entry>Buffer for video output overlay (OSD), see <xref
+               linkend="osd" />. Status: <link
+linkend="experimental">Experimental</link>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry>
+           <entry>0x80</entry>
+         <entry>This and higher values are reserved for custom
+(driver defined) buffer types.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="buffer-flags">
+      <title>Buffer Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_MAPPED</constant></entry>
+           <entry>0x0001</entry>
+           <entry>The buffer resides in device memory and has been mapped
+into the application's address space, see <xref linkend="mmap" /> for details.
+Drivers set or clear this flag when the
+<link linkend="vidioc-querybuf">VIDIOC_QUERYBUF</link>, <link
+         linkend="vidioc-qbuf">VIDIOC_QBUF</link> or <link
+         linkend="vidioc-qbuf">VIDIOC_DQBUF</link> ioctl is called. Set by the driver.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_QUEUED</constant></entry>
+           <entry>0x0002</entry>
+         <entry>Internally drivers maintain two buffer queues, an
+incoming and outgoing queue. When this flag is set, the buffer is
+currently on the incoming queue. It automatically moves to the
+outgoing queue after the buffer has been filled (capture devices) or
+displayed (output devices). Drivers set or clear this flag when the
+<constant>VIDIOC_QUERYBUF</constant> ioctl is called. After
+(successful) calling the <constant>VIDIOC_QBUF </constant>ioctl it is
+always set and after <constant>VIDIOC_DQBUF</constant> always
+cleared.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_DONE</constant></entry>
+           <entry>0x0004</entry>
+           <entry>When this flag is set, the buffer is currently on
+the outgoing queue, ready to be dequeued from the driver. Drivers set
+or clear this flag when the <constant>VIDIOC_QUERYBUF</constant> ioctl
+is called. After calling the <constant>VIDIOC_QBUF</constant> or
+<constant>VIDIOC_DQBUF</constant> it is always cleared. Of course a
+buffer cannot be on both queues at the same time, the
+<constant>V4L2_BUF_FLAG_QUEUED</constant> and
+<constant>V4L2_BUF_FLAG_DONE</constant> flag are mutually exclusive.
+They can be both cleared however, then the buffer is in "dequeued"
+state, in the application domain to say so.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_KEYFRAME</constant></entry>
+           <entry>0x0008</entry>
+         <entry>Drivers set or clear this flag when calling the
+<constant>VIDIOC_DQBUF</constant> ioctl. It may be set by video
+capture devices when the buffer contains a compressed image which is a
+key frame (or field), &ie; can be decompressed on its own.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_PFRAME</constant></entry>
+           <entry>0x0010</entry>
+           <entry>Similar to <constant>V4L2_BUF_FLAG_KEYFRAME</constant>
+this flags predicted frames or fields which contain only differences to a
+previous key frame.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_BFRAME</constant></entry>
+           <entry>0x0020</entry>
+           <entry>Similar to <constant>V4L2_BUF_FLAG_PFRAME</constant>
+       this is a bidirectional predicted frame or field. [ooc tbd]</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_TIMECODE</constant></entry>
+           <entry>0x0100</entry>
+           <entry>The <structfield>timecode</structfield> field is valid.
+Drivers set or clear this flag when the <constant>VIDIOC_DQBUF</constant>
+ioctl is called.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_BUF_FLAG_INPUT</constant></entry>
+           <entry>0x0200</entry>
+           <entry>The <structfield>input</structfield> field is valid.
+Applications set or clear this flag before calling the
+<constant>VIDIOC_QBUF</constant> ioctl.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-memory">
+      <title>enum v4l2_memory</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_MEMORY_MMAP</constant></entry>
+           <entry>1</entry>
+           <entry>The buffer is used for <link linkend="mmap">memory
+mapping</link> I/O.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MEMORY_USERPTR</constant></entry>
+           <entry>2</entry>
+           <entry>The buffer is used for <link linkend="userp">user
+pointer</link> I/O.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_MEMORY_OVERLAY</constant></entry>
+           <entry>3</entry>
+           <entry>[to do]</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <section>
+      <title>Timecodes</title>
+
+      <para>The <structname>v4l2_timecode</structname> structure is
+designed to hold a <xref linkend="smpte12m" /> or similar timecode.
+(struct <structname>timeval</structname> timestamps are stored in
+&v4l2-buffer; field <structfield>timestamp</structfield>.)</para>
+
+      <table frame="none" pgwide="1" id="v4l2-timecode">
+       <title>struct <structname>v4l2_timecode</structname></title>
+       <tgroup cols="3">
+         &cs-str;
+         <tbody valign="top">
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>type</structfield></entry>
+             <entry>Frame rate the timecodes are based on, see <xref
+                 linkend="timecode-type" />.</entry>
+           </row>
+           <row>
+             <entry>__u32</entry>
+             <entry><structfield>flags</structfield></entry>
+             <entry>Timecode flags, see <xref linkend="timecode-flags" />.</entry>
+           </row>
+           <row>
+             <entry>__u8</entry>
+             <entry><structfield>frames</structfield></entry>
+             <entry>Frame count, 0 ... 23/24/29/49/59, depending on the
+           type of timecode.</entry>
+           </row>
+           <row>
+             <entry>__u8</entry>
+             <entry><structfield>seconds</structfield></entry>
+             <entry>Seconds count, 0 ... 59. This is a binary, not BCD number.</entry>
+           </row>
+           <row>
+             <entry>__u8</entry>
+             <entry><structfield>minutes</structfield></entry>
+             <entry>Minutes count, 0 ... 59. This is a binary, not BCD number.</entry>
+           </row>
+           <row>
+             <entry>__u8</entry>
+             <entry><structfield>hours</structfield></entry>
+             <entry>Hours count, 0 ... 29. This is a binary, not BCD number.</entry>
+           </row>
+           <row>
+             <entry>__u8</entry>
+             <entry><structfield>userbits</structfield>[4]</entry>
+             <entry>The "user group" bits from the timecode.</entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+
+      <table frame="none" pgwide="1" id="timecode-type">
+       <title>Timecode Types</title>
+       <tgroup cols="3">
+       &cs-def;
+         <tbody valign="top">
+           <row>
+             <entry><constant>V4L2_TC_TYPE_24FPS</constant></entry>
+             <entry>1</entry>
+             <entry>24 frames per second, i.&nbsp;e. film.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_TYPE_25FPS</constant></entry>
+             <entry>2</entry>
+             <entry>25 frames per second, &ie; PAL or SECAM video.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_TYPE_30FPS</constant></entry>
+             <entry>3</entry>
+             <entry>30 frames per second, &ie; NTSC video.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_TYPE_50FPS</constant></entry>
+             <entry>4</entry>
+             <entry></entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_TYPE_60FPS</constant></entry>
+             <entry>5</entry>
+             <entry></entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+
+      <table frame="none" pgwide="1" id="timecode-flags">
+       <title>Timecode Flags</title>
+       <tgroup cols="3">
+       &cs-def;
+         <tbody valign="top">
+           <row>
+             <entry><constant>V4L2_TC_FLAG_DROPFRAME</constant></entry>
+             <entry>0x0001</entry>
+             <entry>Indicates "drop frame" semantics for counting frames
+in 29.97 fps material. When set, frame numbers 0 and 1 at the start of
+each minute, except minutes 0, 10, 20, 30, 40, 50 are omitted from the
+count.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_FLAG_COLORFRAME</constant></entry>
+             <entry>0x0002</entry>
+             <entry>The "color frame" flag.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_USERBITS_field</constant></entry>
+             <entry>0x000C</entry>
+             <entry>Field mask for the "binary group flags".</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_USERBITS_USERDEFINED</constant></entry>
+             <entry>0x0000</entry>
+             <entry>Unspecified format.</entry>
+           </row>
+           <row>
+             <entry><constant>V4L2_TC_USERBITS_8BITCHARS</constant></entry>
+             <entry>0x0008</entry>
+             <entry>8-bit ISO characters.</entry>
+           </row>
+         </tbody>
+       </tgroup>
+      </table>
+    </section>
+  </section>
+
+  <section id="field-order">
+    <title>Field Order</title>
+
+    <para>We have to distinguish between progressive and interlaced
+video. Progressive video transmits all lines of a video image
+sequentially. Interlaced video divides an image into two fields,
+containing only the odd and even lines of the image, respectively.
+Alternating the so called odd and even field are transmitted, and due
+to a small delay between fields a cathode ray TV displays the lines
+interleaved, yielding the original frame. This curious technique was
+invented because at refresh rates similar to film the image would
+fade out too quickly. Transmitting fields reduces the flicker without
+the necessity of doubling the frame rate and with it the bandwidth
+required for each channel.</para>
+
+    <para>It is important to understand a video camera does not expose
+one frame at a time, merely transmitting the frames separated into
+fields. The fields are in fact captured at two different instances in
+time. An object on screen may well move between one field and the
+next. For applications analysing motion it is of paramount importance
+to recognize which field of a frame is older, the <emphasis>temporal
+order</emphasis>.</para>
+
+    <para>When the driver provides or accepts images field by field
+rather than interleaved, it is also important applications understand
+how the fields combine to frames. We distinguish between top and
+bottom fields, the <emphasis>spatial order</emphasis>: The first line
+of the top field is the first line of an interlaced frame, the first
+line of the bottom field is the second line of that frame.</para>
+
+    <para>However because fields were captured one after the other,
+arguing whether a frame commences with the top or bottom field is
+pointless. Any two successive top and bottom, or bottom and top fields
+yield a valid frame. Only when the source was progressive to begin
+with, &eg; when transferring film to video, two fields may come from
+the same frame, creating a natural order.</para>
+
+    <para>Counter to intuition the top field is not necessarily the
+older field. Whether the older field contains the top or bottom lines
+is a convention determined by the video standard. Hence the
+distinction between temporal and spatial order of fields. The diagrams
+below should make this clearer.</para>
+
+    <para>All video capture and output devices must report the current
+field order. Some drivers may permit the selection of a different
+order, to this end applications initialize the
+<structfield>field</structfield> field of &v4l2-pix-format; before
+calling the &VIDIOC-S-FMT; ioctl. If this is not desired it should
+have the value <constant>V4L2_FIELD_ANY</constant> (0).</para>
+
+    <table frame="none" pgwide="1" id="v4l2-field">
+      <title>enum v4l2_field</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FIELD_ANY</constant></entry>
+           <entry>0</entry>
+           <entry>Applications request this field order when any
+one of the <constant>V4L2_FIELD_NONE</constant>,
+<constant>V4L2_FIELD_TOP</constant>,
+<constant>V4L2_FIELD_BOTTOM</constant>, or
+<constant>V4L2_FIELD_INTERLACED</constant> formats is acceptable.
+Drivers choose depending on hardware capabilities or e.&nbsp;g. the
+requested image size, and return the actual field order. &v4l2-buffer;
+<structfield>field</structfield> can never be
+<constant>V4L2_FIELD_ANY</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_NONE</constant></entry>
+           <entry>1</entry>
+           <entry>Images are in progressive format, not interlaced.
+The driver may also indicate this order when it cannot distinguish
+between <constant>V4L2_FIELD_TOP</constant> and
+<constant>V4L2_FIELD_BOTTOM</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_TOP</constant></entry>
+           <entry>2</entry>
+           <entry>Images consist of the top field only.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_BOTTOM</constant></entry>
+           <entry>3</entry>
+           <entry>Images consist of the bottom field only.
+Applications may wish to prevent a device from capturing interlaced
+images because they will have "comb" or "feathering" artefacts around
+moving objects.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_INTERLACED</constant></entry>
+           <entry>4</entry>
+           <entry>Images contain both fields, interleaved line by
+line. The temporal order of the fields (whether the top or bottom
+field is first transmitted) depends on the current video standard.
+M/NTSC transmits the bottom field first, all other standards the top
+field first.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_SEQ_TB</constant></entry>
+           <entry>5</entry>
+           <entry>Images contain both fields, the top field lines
+are stored first in memory, immediately followed by the bottom field
+lines. Fields are always stored in temporal order, the older one first
+in memory. Image sizes refer to the frame, not fields.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_SEQ_BT</constant></entry>
+           <entry>6</entry>
+           <entry>Images contain both fields, the bottom field
+lines are stored first in memory, immediately followed by the top
+field lines. Fields are always stored in temporal order, the older one
+first in memory. Image sizes refer to the frame, not fields.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_ALTERNATE</constant></entry>
+           <entry>7</entry>
+           <entry>The two fields of a frame are passed in separate
+buffers, in temporal order, &ie; the older one first. To indicate the field
+parity (whether the current field is a top or bottom field) the driver
+or application, depending on data direction, must set &v4l2-buffer;
+<structfield>field</structfield> to
+<constant>V4L2_FIELD_TOP</constant> or
+<constant>V4L2_FIELD_BOTTOM</constant>. Any two successive fields pair
+to build a frame. If fields are successive, without any dropped fields
+between them (fields can drop individually), can be determined from
+the &v4l2-buffer; <structfield>sequence</structfield> field. Image
+sizes refer to the frame, not fields. This format cannot be selected
+when using the read/write I/O method.<!-- Where it's indistinguishable
+from V4L2_FIELD_SEQ_*. --></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_INTERLACED_TB</constant></entry>
+           <entry>8</entry>
+           <entry>Images contain both fields, interleaved line by
+line, top field first. The top field is transmitted first.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FIELD_INTERLACED_BT</constant></entry>
+           <entry>9</entry>
+           <entry>Images contain both fields, interleaved line by
+line, top field first. The bottom field is transmitted first.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <figure id="fieldseq-tb">
+       <title>Field Order, Top Field First Transmitted</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="fieldseq_tb.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="fieldseq_tb.gif" format="GIF" />
+         </imageobject>
+       </mediaobject>
+    </figure>
+
+    <figure id="fieldseq-bt">
+       <title>Field Order, Bottom Field First Transmitted</title>
+       <mediaobject>
+         <imageobject>
+           <imagedata fileref="fieldseq_bt.pdf" format="PS" />
+         </imageobject>
+         <imageobject>
+           <imagedata fileref="fieldseq_bt.gif" format="GIF" />
+         </imageobject>
+       </mediaobject>
+    </figure>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/keytable.c.xml b/Documentation/DocBook/v4l/keytable.c.xml
new file mode 100644 (file)
index 0000000..d53254a
--- /dev/null
@@ -0,0 +1,172 @@
+<programlisting>
+/* keytable.c - This program allows checking/replacing keys at IR
+
+   Copyright (C) 2006-2009 Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ */
+
+#include &lt;ctype.h&gt;
+#include &lt;errno.h&gt;
+#include &lt;fcntl.h&gt;
+#include &lt;stdio.h&gt;
+#include &lt;stdlib.h&gt;
+#include &lt;string.h&gt;
+#include &lt;linux/input.h&gt;
+#include &lt;sys/ioctl.h&gt;
+
+#include "parse.h"
+
+void prtcode (int *codes)
+{
+        struct parse_key *p;
+
+        for (p=keynames;p-&gt;name!=NULL;p++) {
+                if (p-&gt;value == (unsigned)codes[1]) {
+                        printf("scancode 0x%04x = %s (0x%02x)\n", codes[0], p-&gt;name, codes[1]);
+                        return;
+                }
+        }
+
+        if (isprint (codes[1]))
+                printf("scancode %d = '%c' (0x%02x)\n", codes[0], codes[1], codes[1]);
+        else
+                printf("scancode %d = 0x%02x\n", codes[0], codes[1]);
+}
+
+int parse_code(char *string)
+{
+        struct parse_key *p;
+
+        for (p=keynames;p-&gt;name!=NULL;p++) {
+                if (!strcasecmp(p-&gt;name, string)) {
+                        return p-&gt;value;
+                }
+        }
+        return -1;
+}
+
+int main (int argc, char *argv[])
+{
+        int fd;
+        unsigned int i, j;
+        int codes[2];
+
+        if (argc&lt;2 || argc&gt;4) {
+                printf ("usage: %s &lt;device&gt; to get table; or\n"
+                        "       %s &lt;device&gt; &lt;scancode&gt; &lt;keycode&gt;\n"
+                        "       %s &lt;device&gt; &lt;keycode_file&gt;\n",*argv,*argv,*argv);
+                return -1;
+        }
+
+        if ((fd = open(argv[1], O_RDONLY)) &lt; 0) {
+                perror("Couldn't open input device");
+                return(-1);
+        }
+
+        if (argc==4) {
+                int value;
+
+                value=parse_code(argv[3]);
+
+                if (value==-1) {
+                        value = strtol(argv[3], NULL, 0);
+                        if (errno)
+                                perror("value");
+                }
+
+                codes [0] = (unsigned) strtol(argv[2], NULL, 0);
+                codes [1] = (unsigned) value;
+
+                if(ioctl(fd, EVIOCSKEYCODE, codes))
+                        perror ("EVIOCSKEYCODE");
+
+                if(ioctl(fd, EVIOCGKEYCODE, codes)==0)
+                        prtcode(codes);
+                return 0;
+        }
+
+        if (argc==3) {
+                FILE *fin;
+                int value;
+                char *scancode, *keycode, s[2048];
+
+                fin=fopen(argv[2],"r");
+                if (fin==NULL) {
+                        perror ("opening keycode file");
+                        return -1;
+                }
+
+                /* Clears old table */
+                for (j = 0; j &lt; 256; j++) {
+                        for (i = 0; i &lt; 256; i++) {
+                                codes[0] = (j &lt;&lt; 8) | i;
+                                codes[1] = KEY_RESERVED;
+                                ioctl(fd, EVIOCSKEYCODE, codes);
+                        }
+                }
+
+                while (fgets(s,sizeof(s),fin)) {
+                        scancode=strtok(s,"\n\t =:");
+                        if (!scancode) {
+                                perror ("parsing input file scancode");
+                                return -1;
+                        }
+                        if (!strcasecmp(scancode, "scancode")) {
+                                scancode = strtok(NULL,"\n\t =:");
+                                if (!scancode) {
+                                        perror ("parsing input file scancode");
+                                        return -1;
+                                }
+                        }
+
+                        keycode=strtok(NULL,"\n\t =:(");
+                        if (!keycode) {
+                                perror ("parsing input file keycode");
+                                return -1;
+                        }
+
+                        // printf ("parsing %s=%s:", scancode, keycode);
+                        value=parse_code(keycode);
+                        // printf ("\tvalue=%d\n",value);
+
+                        if (value==-1) {
+                                value = strtol(keycode, NULL, 0);
+                                if (errno)
+                                        perror("value");
+                        }
+
+                        codes [0] = (unsigned) strtol(scancode, NULL, 0);
+                        codes [1] = (unsigned) value;
+
+                        // printf("\t%04x=%04x\n",codes[0], codes[1]);
+                        if(ioctl(fd, EVIOCSKEYCODE, codes)) {
+                                fprintf(stderr, "Setting scancode 0x%04x with 0x%04x via ",codes[0], codes[1]);
+                                perror ("EVIOCSKEYCODE");
+                        }
+
+                        if(ioctl(fd, EVIOCGKEYCODE, codes)==0)
+                                prtcode(codes);
+                }
+                return 0;
+        }
+
+        /* Get scancode table */
+        for (j = 0; j &lt; 256; j++) {
+                for (i = 0; i &lt; 256; i++) {
+                        codes[0] = (j &lt;&lt; 8) | i;
+                        if (!ioctl(fd, EVIOCGKEYCODE, codes) &amp;&amp; codes[1] != KEY_RESERVED)
+                                prtcode(codes);
+                }
+        }
+        return 0;
+}
+
+</programlisting>
diff --git a/Documentation/DocBook/v4l/libv4l.xml b/Documentation/DocBook/v4l/libv4l.xml
new file mode 100644 (file)
index 0000000..c14fc3d
--- /dev/null
@@ -0,0 +1,167 @@
+<title>Libv4l Userspace Library</title>
+<section id="libv4l-introduction">
+       <title>Introduction</title>
+
+       <para>libv4l is a collection of libraries which adds a thin abstraction
+layer on top of video4linux2 devices. The purpose of this (thin) layer
+is to make it easy for application writers to support a wide variety of
+devices without having to write separate code for different devices in the
+same class.</para>
+<para>An example of using libv4l is provided by
+<link linkend='v4l2grab-example'>v4l2grab</link>.
+</para>
+
+       <para>libv4l consists of 3 different libraries:</para>
+       <section>
+               <title>libv4lconvert</title>
+
+               <para>libv4lconvert is a library that converts several
+different pixelformats found in V4L2 drivers into a few common RGB and
+YUY formats.</para>
+               <para>It currently accepts the following V4L2 driver formats:
+<link linkend="V4L2-PIX-FMT-BGR24"><constant>V4L2_PIX_FMT_BGR24</constant></link>,
+<link linkend="V4L2-PIX-FMT-HM12"><constant>V4L2_PIX_FMT_HM12</constant></link>,
+<link linkend="V4L2-PIX-FMT-JPEG"><constant>V4L2_PIX_FMT_JPEG</constant></link>,
+<link linkend="V4L2-PIX-FMT-MJPEG"><constant>V4L2_PIX_FMT_MJPEG</constant></link>,
+<link linkend="V4L2-PIX-FMT-MR97310A"><constant>V4L2_PIX_FMT_MR97310A</constant></link>,
+<link linkend="V4L2-PIX-FMT-OV511"><constant>V4L2_PIX_FMT_OV511</constant></link>,
+<link linkend="V4L2-PIX-FMT-OV518"><constant>V4L2_PIX_FMT_OV518</constant></link>,
+<link linkend="V4L2-PIX-FMT-PAC207"><constant>V4L2_PIX_FMT_PAC207</constant></link>,
+<link linkend="V4L2-PIX-FMT-PJPG"><constant>V4L2_PIX_FMT_PJPG</constant></link>,
+<link linkend="V4L2-PIX-FMT-RGB24"><constant>V4L2_PIX_FMT_RGB24</constant></link>,
+<link linkend="V4L2-PIX-FMT-SBGGR8"><constant>V4L2_PIX_FMT_SBGGR8</constant></link>,
+<link linkend="V4L2-PIX-FMT-SGBRG8"><constant>V4L2_PIX_FMT_SGBRG8</constant></link>,
+<link linkend="V4L2-PIX-FMT-SGRBG8"><constant>V4L2_PIX_FMT_SGRBG8</constant></link>,
+<link linkend="V4L2-PIX-FMT-SN9C10X"><constant>V4L2_PIX_FMT_SN9C10X</constant></link>,
+<link linkend="V4L2-PIX-FMT-SN9C20X-I420"><constant>V4L2_PIX_FMT_SN9C20X_I420</constant></link>,
+<link linkend="V4L2-PIX-FMT-SPCA501"><constant>V4L2_PIX_FMT_SPCA501</constant></link>,
+<link linkend="V4L2-PIX-FMT-SPCA505"><constant>V4L2_PIX_FMT_SPCA505</constant></link>,
+<link linkend="V4L2-PIX-FMT-SPCA508"><constant>V4L2_PIX_FMT_SPCA508</constant></link>,
+<link linkend="V4L2-PIX-FMT-SPCA561"><constant>V4L2_PIX_FMT_SPCA561</constant></link>,
+<link linkend="V4L2-PIX-FMT-SQ905C"><constant>V4L2_PIX_FMT_SQ905C</constant></link>,
+<constant>V4L2_PIX_FMT_SRGGB8</constant>,
+<link linkend="V4L2-PIX-FMT-UYVY"><constant>V4L2_PIX_FMT_UYVY</constant></link>,
+<link linkend="V4L2-PIX-FMT-YUV420"><constant>V4L2_PIX_FMT_YUV420</constant></link>,
+<link linkend="V4L2-PIX-FMT-YUYV"><constant>V4L2_PIX_FMT_YUYV</constant></link>,
+<link linkend="V4L2-PIX-FMT-YVU420"><constant>V4L2_PIX_FMT_YVU420</constant></link>,
+and <link linkend="V4L2-PIX-FMT-YVYU"><constant>V4L2_PIX_FMT_YVYU</constant></link>.
+</para>
+               <para>Later on libv4lconvert was expanded to also be able to do
+various        video processing functions to improve webcam video quality.
+The video processing is split in to 2 parts: libv4lconvert/control and
+libv4lconvert/processing.</para>
+
+               <para>The control part is used to offer video controls which can
+be used        to control the video processing functions made available by
+       libv4lconvert/processing. These controls are stored application wide
+(until reboot) by using a persistent shared memory object.</para>
+
+               <para>libv4lconvert/processing offers the actual video
+processing functionality.</para>
+       </section>
+       <section>
+               <title>libv4l1</title>
+               <para>This library offers functions that can be used to quickly
+make v4l1 applications work with v4l2 devices. These functions work exactly
+like the normal open/close/etc, except that libv4l1 does full emulation of
+the v4l1 api on top of v4l2 drivers, in case of v4l1 drivers it
+will just pass calls through.</para>
+               <para>Since those functions are emulations of the old V4L1 API,
+it shouldn't be used for new applications.</para>
+       </section>
+       <section>
+               <title>libv4l2</title>
+               <para>This library should be used for all modern V4L2
+applications.</para>
+               <para>It provides handles to call V4L2 open/ioctl/close/poll
+methods. Instead of just providing the raw output of the device, it enhances
+the calls in the sense that it will use libv4lconvert to provide more video
+formats and to enhance the image quality.</para>
+               <para>In most cases, libv4l2 just passes the calls directly
+through to the v4l2 driver, intercepting the calls to
+<link linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>,
+<link linkend='vidioc-g-fmt'><constant>VIDIOC_G_FMT</constant></link>
+<link linkend='vidioc-g-fmt'><constant>VIDIOC_S_FMT</constant></link>
+<link linkend='vidioc-enum-framesizes'><constant>VIDIOC_ENUM_FRAMESIZES</constant></link>
+and <link linkend='vidioc-enum-frameintervals'><constant>VIDIOC_ENUM_FRAMEINTERVALS</constant></link>
+in order to emulate the formats
+<link linkend="V4L2-PIX-FMT-BGR24"><constant>V4L2_PIX_FMT_BGR24</constant></link>,
+<link linkend="V4L2-PIX-FMT-RGB24"><constant>V4L2_PIX_FMT_RGB24</constant></link>,
+<link linkend="V4L2-PIX-FMT-YUV420"><constant>V4L2_PIX_FMT_YUV420</constant></link>,
+and <link linkend="V4L2-PIX-FMT-YVU420"><constant>V4L2_PIX_FMT_YVU420</constant></link>,
+if they aren't available in the driver.
+<link linkend='vidioc-enum-fmt'><constant>VIDIOC_ENUM_FMT</constant></link>
+keeps enumerating the hardware supported formats, plus the emulated formats
+offered by libv4l at the end.
+</para>
+               <section id="libv4l-ops">
+                       <title>Libv4l device control functions</title>
+                       <para>The common file operation methods are provided by
+libv4l.</para>
+                       <para>Those functions operate just like glibc
+open/close/dup/ioctl/read/mmap/munmap:</para>
+<itemizedlist><listitem>
+                       <para>int v4l2_open(const char *file, int oflag,
+...) -
+operates like the standard <link linkend='func-open'>open()</link> function.
+</para></listitem><listitem>
+                       <para>int v4l2_close(int fd) -
+operates like the standard <link linkend='func-close'>close()</link> function.
+</para></listitem><listitem>
+                       <para>int v4l2_dup(int fd) -
+operates like the standard dup() function, duplicating a file handler.
+</para></listitem><listitem>
+                       <para>int v4l2_ioctl (int fd, unsigned long int request, ...) -
+operates like the standard <link linkend='func-ioctl'>ioctl()</link> function.
+</para></listitem><listitem>
+                       <para>int v4l2_read (int fd, void* buffer, size_t n) -
+operates like the standard <link linkend='func-read'>read()</link> function.
+</para></listitem><listitem>
+                       <para>void v4l2_mmap(void *start, size_t length, int prot, int flags, int fd, int64_t offset); -
+operates like the standard <link linkend='func-mmap'>mmap()</link> function.
+</para></listitem><listitem>
+                       <para>int v4l2_munmap(void *_start, size_t length); -
+operates like the standard <link linkend='func-munmap'>munmap()</link> function.
+</para></listitem>
+</itemizedlist>
+                       <para>Those functions provide additional control:</para>
+<itemizedlist><listitem>
+                       <para>int v4l2_fd_open(int fd, int v4l2_flags) -
+opens an already opened fd for further use through v4l2lib and possibly
+modify libv4l2's default behavior through the v4l2_flags argument.
+Currently, v4l2_flags can be <constant>V4L2_DISABLE_CONVERSION</constant>,
+to disable format conversion.
+</para></listitem><listitem>
+                       <para>int v4l2_set_control(int fd, int cid, int value) -
+This function takes a value of 0 - 65535, and then scales that range to
+the actual range of the given v4l control id, and then if the cid exists
+and is not locked sets the cid to the scaled value.
+</para></listitem><listitem>
+                       <para>int v4l2_get_control(int fd, int cid) -
+This function returns a value of 0 - 65535, scaled to from the actual range
+of the given v4l control id. when the cid does not exist, could not be
+accessed for some reason, or some error occured 0 is returned.
+</para></listitem>
+</itemizedlist>
+               </section>
+       </section>
+       <section>
+
+               <title>v4l1compat.so wrapper library</title>
+
+               <para>This library intercepts calls to
+open/close/ioctl/mmap/mmunmap operations and redirects them to the libv4l
+counterparts, by using LD_PRELOAD=/usr/lib/v4l1compat.so. It also
+emulates V4L1 calls via V4L2 API.</para>
+               <para>It allows usage of binary legacy applications that
+still don't use libv4l.</para>
+       </section>
+
+</section>
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/pixfmt-grey.xml b/Documentation/DocBook/v4l/pixfmt-grey.xml
new file mode 100644 (file)
index 0000000..3b72bc6
--- /dev/null
@@ -0,0 +1,70 @@
+    <refentry id="V4L2-PIX-FMT-GREY">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_GREY ('GREY')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_GREY</constant></refname>
+       <refpurpose>Grey-scale image</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This is a grey-scale image. It is really a degenerate
+Y'CbCr format which simply contains no Cb or Cr data.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_GREY</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-nv12.xml b/Documentation/DocBook/v4l/pixfmt-nv12.xml
new file mode 100644 (file)
index 0000000..873f670
--- /dev/null
@@ -0,0 +1,151 @@
+    <refentry>
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_NV12 ('NV12'), V4L2_PIX_FMT_NV21 ('NV21')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname id="V4L2-PIX-FMT-NV12"><constant>V4L2_PIX_FMT_NV12</constant></refname>
+       <refname id="V4L2-PIX-FMT-NV21"><constant>V4L2_PIX_FMT_NV21</constant></refname>
+       <refpurpose>Formats with &frac12; horizontal and vertical
+chroma resolution, also known as YUV 4:2:0. One luminance and one
+chrominance plane with alternating chroma samples as opposed to
+<constant>V4L2_PIX_FMT_YVU420</constant></refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>These are two-plane versions of the YUV 4:2:0 format.
+The three components are separated into two sub-images or planes. The
+Y plane is first. The Y plane has one byte per pixel. For
+<constant>V4L2_PIX_FMT_NV12</constant>, a combined CbCr plane
+immediately follows the Y plane in memory.  The CbCr plane is the same
+width, in bytes, as the Y plane (and of the image), but is half as
+tall in pixels. Each CbCr pair belongs to four pixels. For example,
+Cb<subscript>0</subscript>/Cr<subscript>0</subscript> belongs to
+Y'<subscript>00</subscript>, Y'<subscript>01</subscript>,
+Y'<subscript>10</subscript>, Y'<subscript>11</subscript>.
+<constant>V4L2_PIX_FMT_NV21</constant> is the same except the Cb and
+Cr bytes are swapped, the CrCb plane starts with a Cr byte.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the
+CbCr plane has as many pad bytes after its rows.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_NV12</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;20:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-nv16.xml b/Documentation/DocBook/v4l/pixfmt-nv16.xml
new file mode 100644 (file)
index 0000000..2609403
--- /dev/null
@@ -0,0 +1,174 @@
+    <refentry>
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_NV16 ('NV16'), V4L2_PIX_FMT_NV61 ('NV61')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname id="V4L2-PIX-FMT-NV16"><constant>V4L2_PIX_FMT_NV16</constant></refname>
+       <refname id="V4L2-PIX-FMT-NV61"><constant>V4L2_PIX_FMT_NV61</constant></refname>
+       <refpurpose>Formats with &frac12; horizontal
+chroma resolution, also known as YUV 4:2:2. One luminance and one
+chrominance plane with alternating chroma samples as opposed to
+<constant>V4L2_PIX_FMT_YVU420</constant></refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>These are two-plane versions of the YUV 4:2:2 format.
+The three components are separated into two sub-images or planes. The
+Y plane is first. The Y plane has one byte per pixel. For
+<constant>V4L2_PIX_FMT_NV16</constant>, a combined CbCr plane
+immediately follows the Y plane in memory.  The CbCr plane is the same
+width and height, in bytes, as the Y plane (and of the image).
+Each CbCr pair belongs to two pixels. For example,
+Cb<subscript>0</subscript>/Cr<subscript>0</subscript> belongs to
+Y'<subscript>00</subscript>, Y'<subscript>01</subscript>.
+<constant>V4L2_PIX_FMT_NV61</constant> is the same except the Cb and
+Cr bytes are swapped, the CrCb plane starts with a Cr byte.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the
+CbCr plane has as many pad bytes after its rows.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_NV16</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;20:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;28:</entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
new file mode 100644 (file)
index 0000000..d2dd697
--- /dev/null
@@ -0,0 +1,862 @@
+<refentry id="packed-rgb">
+  <refmeta>
+    <refentrytitle>Packed RGB formats</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname>Packed RGB formats</refname>
+    <refpurpose>Packed RGB formats</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>Description</title>
+
+    <para>These formats are designed to match the pixel formats of
+typical PC graphics frame buffers. They occupy 8, 16, 24 or 32 bits
+per pixel. These are all packed-pixel formats, meaning all the data
+for a pixel lie next to each other in memory.</para>
+
+    <para>When one of these formats is used, drivers shall report the
+colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para>
+
+    <table pgwide="1" frame="none" id="rgb-formats">
+      <title>Packed RGB Image Formats</title>
+      <tgroup cols="37" align="center">
+       <colspec colname="id" align="left" />
+       <colspec colname="fourcc" />
+       <colspec colname="bit" />
+
+       <colspec colnum="4" colname="b07" align="center" />
+       <colspec colnum="5" colname="b06" align="center" />
+       <colspec colnum="6" colname="b05" align="center" />
+       <colspec colnum="7" colname="b04" align="center" />
+       <colspec colnum="8" colname="b03" align="center" />
+       <colspec colnum="9" colname="b02" align="center" />
+       <colspec colnum="10" colname="b01" align="center" />
+       <colspec colnum="11" colname="b00" align="center" />
+
+       <colspec colnum="13" colname="b17" align="center" />
+       <colspec colnum="14" colname="b16" align="center" />
+       <colspec colnum="15" colname="b15" align="center" />
+       <colspec colnum="16" colname="b14" align="center" />
+       <colspec colnum="17" colname="b13" align="center" />
+       <colspec colnum="18" colname="b12" align="center" />
+       <colspec colnum="19" colname="b11" align="center" />
+       <colspec colnum="20" colname="b10" align="center" />
+
+       <colspec colnum="22" colname="b27" align="center" />
+       <colspec colnum="23" colname="b26" align="center" />
+       <colspec colnum="24" colname="b25" align="center" />
+       <colspec colnum="25" colname="b24" align="center" />
+       <colspec colnum="26" colname="b23" align="center" />
+       <colspec colnum="27" colname="b22" align="center" />
+       <colspec colnum="28" colname="b21" align="center" />
+       <colspec colnum="29" colname="b20" align="center" />
+
+       <colspec colnum="31" colname="b37" align="center" />
+       <colspec colnum="32" colname="b36" align="center" />
+       <colspec colnum="33" colname="b35" align="center" />
+       <colspec colnum="34" colname="b34" align="center" />
+       <colspec colnum="35" colname="b33" align="center" />
+       <colspec colnum="36" colname="b32" align="center" />
+       <colspec colnum="37" colname="b31" align="center" />
+       <colspec colnum="38" colname="b30" align="center" />
+
+       <spanspec namest="b07" nameend="b00" spanname="b0" />
+       <spanspec namest="b17" nameend="b10" spanname="b1" />
+       <spanspec namest="b27" nameend="b20" spanname="b2" />
+       <spanspec namest="b37" nameend="b30" spanname="b3" />
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>&nbsp;</entry>
+           <entry spanname="b0">Byte&nbsp;0 in memory</entry>
+           <entry spanname="b1">Byte&nbsp;1</entry>
+           <entry spanname="b2">Byte&nbsp;2</entry>
+           <entry spanname="b3">Byte&nbsp;3</entry>
+         </row>
+         <row>
+           <entry>&nbsp;</entry>
+           <entry>&nbsp;</entry>
+           <entry>Bit</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row id="V4L2-PIX-FMT-RGB332">
+           <entry><constant>V4L2_PIX_FMT_RGB332</constant></entry>
+           <entry>'RGB1'</entry>
+           <entry></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB444">
+           <entry><constant>V4L2_PIX_FMT_RGB444</constant></entry>
+           <entry>'R444'</entry>
+           <entry></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB555">
+           <entry><constant>V4L2_PIX_FMT_RGB555</constant></entry>
+           <entry>'RGBO'</entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a</entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB565">
+           <entry><constant>V4L2_PIX_FMT_RGB565</constant></entry>
+           <entry>'RGBP'</entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB555X">
+           <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
+           <entry>'RGBQ'</entry>
+           <entry></entry>
+           <entry>a</entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB565X">
+           <entry><constant>V4L2_PIX_FMT_RGB565X</constant></entry>
+           <entry>'RGBR'</entry>
+           <entry></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-BGR24">
+           <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
+           <entry>'BGR3'</entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB24">
+           <entry><constant>V4L2_PIX_FMT_RGB24</constant></entry>
+           <entry>'RGB3'</entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-BGR32">
+           <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>
+           <entry>'BGR4'</entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>7</subscript></entry>
+           <entry>a<subscript>6</subscript></entry>
+           <entry>a<subscript>5</subscript></entry>
+           <entry>a<subscript>4</subscript></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-RGB32">
+           <entry><constant>V4L2_PIX_FMT_RGB32</constant></entry>
+           <entry>'RGB4'</entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>7</subscript></entry>
+           <entry>a<subscript>6</subscript></entry>
+           <entry>a<subscript>5</subscript></entry>
+           <entry>a<subscript>4</subscript></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>Bit 7 is the most significant bit. The value of a = alpha
+bits is undefined when reading from the driver, ignored when writing
+to the driver, except when alpha blending has been negotiated for a
+<link linkend="overlay">Video Overlay</link> or <link
+linkend="osd">Video Output Overlay</link>.</para>
+
+    <example>
+      <title><constant>V4L2_PIX_FMT_BGR24</constant> 4 &times; 4 pixel
+image</title>
+
+      <formalpara>
+       <title>Byte Order.</title>
+       <para>Each cell is one byte.
+             <informaltable frame="none">
+           <tgroup cols="13" align="center">
+             <colspec align="left" colwidth="2*" />
+             <tbody valign="top">
+               <row>
+                 <entry>start&nbsp;+&nbsp;0:</entry>
+                 <entry>B<subscript>00</subscript></entry>
+                 <entry>G<subscript>00</subscript></entry>
+                 <entry>R<subscript>00</subscript></entry>
+                 <entry>B<subscript>01</subscript></entry>
+                 <entry>G<subscript>01</subscript></entry>
+                 <entry>R<subscript>01</subscript></entry>
+                 <entry>B<subscript>02</subscript></entry>
+                 <entry>G<subscript>02</subscript></entry>
+                 <entry>R<subscript>02</subscript></entry>
+                 <entry>B<subscript>03</subscript></entry>
+                 <entry>G<subscript>03</subscript></entry>
+                 <entry>R<subscript>03</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;12:</entry>
+                 <entry>B<subscript>10</subscript></entry>
+                 <entry>G<subscript>10</subscript></entry>
+                 <entry>R<subscript>10</subscript></entry>
+                 <entry>B<subscript>11</subscript></entry>
+                 <entry>G<subscript>11</subscript></entry>
+                 <entry>R<subscript>11</subscript></entry>
+                 <entry>B<subscript>12</subscript></entry>
+                 <entry>G<subscript>12</subscript></entry>
+                 <entry>R<subscript>12</subscript></entry>
+                 <entry>B<subscript>13</subscript></entry>
+                 <entry>G<subscript>13</subscript></entry>
+                 <entry>R<subscript>13</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;24:</entry>
+                 <entry>B<subscript>20</subscript></entry>
+                 <entry>G<subscript>20</subscript></entry>
+                 <entry>R<subscript>20</subscript></entry>
+                 <entry>B<subscript>21</subscript></entry>
+                 <entry>G<subscript>21</subscript></entry>
+                 <entry>R<subscript>21</subscript></entry>
+                 <entry>B<subscript>22</subscript></entry>
+                 <entry>G<subscript>22</subscript></entry>
+                 <entry>R<subscript>22</subscript></entry>
+                 <entry>B<subscript>23</subscript></entry>
+                 <entry>G<subscript>23</subscript></entry>
+                 <entry>R<subscript>23</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;36:</entry>
+                 <entry>B<subscript>30</subscript></entry>
+                 <entry>G<subscript>30</subscript></entry>
+                 <entry>R<subscript>30</subscript></entry>
+                 <entry>B<subscript>31</subscript></entry>
+                 <entry>G<subscript>31</subscript></entry>
+                 <entry>R<subscript>31</subscript></entry>
+                 <entry>B<subscript>32</subscript></entry>
+                 <entry>G<subscript>32</subscript></entry>
+                 <entry>R<subscript>32</subscript></entry>
+                 <entry>B<subscript>33</subscript></entry>
+                 <entry>G<subscript>33</subscript></entry>
+                 <entry>R<subscript>33</subscript></entry>
+               </row>
+             </tbody>
+           </tgroup>
+             </informaltable>
+           </para>
+      </formalpara>
+    </example>
+
+    <important>
+      <para>Drivers may interpret these formats differently.</para>
+    </important>
+
+    <para>Some RGB formats above are uncommon and were probably
+defined in error. Drivers may interpret them as in <xref
+       linkend="rgb-formats-corrected" />.</para>
+
+    <table pgwide="1" frame="none" id="rgb-formats-corrected">
+      <title>Packed RGB Image Formats (corrected)</title>
+      <tgroup cols="37" align="center">
+       <colspec colname="id" align="left" />
+       <colspec colname="fourcc" />
+       <colspec colname="bit" />
+
+       <colspec colnum="4" colname="b07" align="center" />
+       <colspec colnum="5" colname="b06" align="center" />
+       <colspec colnum="6" colname="b05" align="center" />
+       <colspec colnum="7" colname="b04" align="center" />
+       <colspec colnum="8" colname="b03" align="center" />
+       <colspec colnum="9" colname="b02" align="center" />
+       <colspec colnum="10" colname="b01" align="center" />
+       <colspec colnum="11" colname="b00" align="center" />
+
+       <colspec colnum="13" colname="b17" align="center" />
+       <colspec colnum="14" colname="b16" align="center" />
+       <colspec colnum="15" colname="b15" align="center" />
+       <colspec colnum="16" colname="b14" align="center" />
+       <colspec colnum="17" colname="b13" align="center" />
+       <colspec colnum="18" colname="b12" align="center" />
+       <colspec colnum="19" colname="b11" align="center" />
+       <colspec colnum="20" colname="b10" align="center" />
+
+       <colspec colnum="22" colname="b27" align="center" />
+       <colspec colnum="23" colname="b26" align="center" />
+       <colspec colnum="24" colname="b25" align="center" />
+       <colspec colnum="25" colname="b24" align="center" />
+       <colspec colnum="26" colname="b23" align="center" />
+       <colspec colnum="27" colname="b22" align="center" />
+       <colspec colnum="28" colname="b21" align="center" />
+       <colspec colnum="29" colname="b20" align="center" />
+
+       <colspec colnum="31" colname="b37" align="center" />
+       <colspec colnum="32" colname="b36" align="center" />
+       <colspec colnum="33" colname="b35" align="center" />
+       <colspec colnum="34" colname="b34" align="center" />
+       <colspec colnum="35" colname="b33" align="center" />
+       <colspec colnum="36" colname="b32" align="center" />
+       <colspec colnum="37" colname="b31" align="center" />
+       <colspec colnum="38" colname="b30" align="center" />
+
+       <spanspec namest="b07" nameend="b00" spanname="b0" />
+       <spanspec namest="b17" nameend="b10" spanname="b1" />
+       <spanspec namest="b27" nameend="b20" spanname="b2" />
+       <spanspec namest="b37" nameend="b30" spanname="b3" />
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>&nbsp;</entry>
+           <entry spanname="b0">Byte&nbsp;0 in memory</entry>
+           <entry spanname="b1">Byte&nbsp;1</entry>
+           <entry spanname="b2">Byte&nbsp;2</entry>
+           <entry spanname="b3">Byte&nbsp;3</entry>
+         </row>
+         <row>
+           <entry>&nbsp;</entry>
+           <entry>&nbsp;</entry>
+           <entry>Bit</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row><!-- id="V4L2-PIX-FMT-RGB332" -->
+           <entry><constant>V4L2_PIX_FMT_RGB332</constant></entry>
+           <entry>'RGB1'</entry>
+           <entry></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB444" -->
+           <entry><constant>V4L2_PIX_FMT_RGB444</constant></entry>
+           <entry>'R444'</entry>
+           <entry></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB555" -->
+           <entry><constant>V4L2_PIX_FMT_RGB555</constant></entry>
+           <entry>'RGBO'</entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a</entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB565" -->
+           <entry><constant>V4L2_PIX_FMT_RGB565</constant></entry>
+           <entry>'RGBP'</entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB555X" -->
+           <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>
+           <entry>'RGBQ'</entry>
+           <entry></entry>
+           <entry>a</entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB565X" -->
+           <entry><constant>V4L2_PIX_FMT_RGB565X</constant></entry>
+           <entry>'RGBR'</entry>
+           <entry></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-BGR24" -->
+           <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
+           <entry>'BGR3'</entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB24" -->
+           <entry><constant>V4L2_PIX_FMT_RGB24</constant></entry>
+           <entry>'RGB3'</entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-BGR32" -->
+           <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>
+           <entry>'BGR4'</entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>7</subscript></entry>
+           <entry>a<subscript>6</subscript></entry>
+           <entry>a<subscript>5</subscript></entry>
+           <entry>a<subscript>4</subscript></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+         </row>
+         <row><!-- id="V4L2-PIX-FMT-RGB32" -->
+           <entry><constant>V4L2_PIX_FMT_RGB32</constant></entry>
+           <entry>'RGB4'</entry>
+           <entry></entry>
+           <entry>a<subscript>7</subscript></entry>
+           <entry>a<subscript>6</subscript></entry>
+           <entry>a<subscript>5</subscript></entry>
+           <entry>a<subscript>4</subscript></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>7</subscript></entry>
+           <entry>r<subscript>6</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>7</subscript></entry>
+           <entry>g<subscript>6</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>b<subscript>7</subscript></entry>
+           <entry>b<subscript>6</subscript></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>A test utility to determine which RGB formats a driver
+actually supports is available from the LinuxTV v4l-dvb repository.
+See &v4l-dvb; for access instructions.</para>
+
+  </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-packed-yuv.xml b/Documentation/DocBook/v4l/pixfmt-packed-yuv.xml
new file mode 100644 (file)
index 0000000..3cab5d0
--- /dev/null
@@ -0,0 +1,244 @@
+<refentry id="packed-yuv">
+  <refmeta>
+    <refentrytitle>Packed YUV formats</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname>Packed YUV formats</refname>
+    <refpurpose>Packed YUV formats</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>Description</title>
+
+    <para>Similar to the packed RGB formats these formats store
+the Y, Cb and Cr component of each pixel in one 16 or 32 bit
+word.</para>
+
+    <table pgwide="1" frame="none">
+      <title>Packed YUV Image Formats</title>
+      <tgroup cols="37" align="center">
+       <colspec colname="id" align="left" />
+       <colspec colname="fourcc" />
+       <colspec colname="bit" />
+
+       <colspec colnum="4" colname="b07" align="center" />
+       <colspec colnum="5" colname="b06" align="center" />
+       <colspec colnum="6" colname="b05" align="center" />
+       <colspec colnum="7" colname="b04" align="center" />
+       <colspec colnum="8" colname="b03" align="center" />
+       <colspec colnum="9" colname="b02" align="center" />
+       <colspec colnum="10" colname="b01" align="center" />
+       <colspec colnum="11" colname="b00" align="center" />
+
+       <colspec colnum="13" colname="b17" align="center" />
+       <colspec colnum="14" colname="b16" align="center" />
+       <colspec colnum="15" colname="b15" align="center" />
+       <colspec colnum="16" colname="b14" align="center" />
+       <colspec colnum="17" colname="b13" align="center" />
+       <colspec colnum="18" colname="b12" align="center" />
+       <colspec colnum="19" colname="b11" align="center" />
+       <colspec colnum="20" colname="b10" align="center" />
+
+       <colspec colnum="22" colname="b27" align="center" />
+       <colspec colnum="23" colname="b26" align="center" />
+       <colspec colnum="24" colname="b25" align="center" />
+       <colspec colnum="25" colname="b24" align="center" />
+       <colspec colnum="26" colname="b23" align="center" />
+       <colspec colnum="27" colname="b22" align="center" />
+       <colspec colnum="28" colname="b21" align="center" />
+       <colspec colnum="29" colname="b20" align="center" />
+
+       <colspec colnum="31" colname="b37" align="center" />
+       <colspec colnum="32" colname="b36" align="center" />
+       <colspec colnum="33" colname="b35" align="center" />
+       <colspec colnum="34" colname="b34" align="center" />
+       <colspec colnum="35" colname="b33" align="center" />
+       <colspec colnum="36" colname="b32" align="center" />
+       <colspec colnum="37" colname="b31" align="center" />
+       <colspec colnum="38" colname="b30" align="center" />
+
+       <spanspec namest="b07" nameend="b00" spanname="b0" />
+       <spanspec namest="b17" nameend="b10" spanname="b1" />
+       <spanspec namest="b27" nameend="b20" spanname="b2" />
+       <spanspec namest="b37" nameend="b30" spanname="b3" />
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>&nbsp;</entry>
+           <entry spanname="b0">Byte&nbsp;0 in memory</entry>
+           <entry spanname="b1">Byte&nbsp;1</entry>
+           <entry spanname="b2">Byte&nbsp;2</entry>
+           <entry spanname="b3">Byte&nbsp;3</entry>
+         </row>
+         <row>
+           <entry>&nbsp;</entry>
+           <entry>&nbsp;</entry>
+           <entry>Bit</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+           <entry>&nbsp;</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row id="V4L2-PIX-FMT-YUV444">
+           <entry><constant>V4L2_PIX_FMT_YUV444</constant></entry>
+           <entry>'Y444'</entry>
+           <entry></entry>
+           <entry>Cb<subscript>3</subscript></entry>
+           <entry>Cb<subscript>2</subscript></entry>
+           <entry>Cb<subscript>1</subscript></entry>
+           <entry>Cb<subscript>0</subscript></entry>
+           <entry>Cr<subscript>3</subscript></entry>
+           <entry>Cr<subscript>2</subscript></entry>
+           <entry>Cr<subscript>1</subscript></entry>
+           <entry>Cr<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+           <entry>Y'<subscript>3</subscript></entry>
+           <entry>Y'<subscript>2</subscript></entry>
+           <entry>Y'<subscript>1</subscript></entry>
+           <entry>Y'<subscript>0</subscript></entry>
+         </row>
+
+         <row id="V4L2-PIX-FMT-YUV555">
+           <entry><constant>V4L2_PIX_FMT_YUV555</constant></entry>
+           <entry>'YUVO'</entry>
+           <entry></entry>
+           <entry>Cb<subscript>2</subscript></entry>
+           <entry>Cb<subscript>1</subscript></entry>
+           <entry>Cb<subscript>0</subscript></entry>
+           <entry>Cr<subscript>4</subscript></entry>
+           <entry>Cr<subscript>3</subscript></entry>
+           <entry>Cr<subscript>2</subscript></entry>
+           <entry>Cr<subscript>1</subscript></entry>
+           <entry>Cr<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>a</entry>
+           <entry>Y'<subscript>4</subscript></entry>
+           <entry>Y'<subscript>3</subscript></entry>
+           <entry>Y'<subscript>2</subscript></entry>
+           <entry>Y'<subscript>1</subscript></entry>
+           <entry>Y'<subscript>0</subscript></entry>
+           <entry>Cb<subscript>4</subscript></entry>
+           <entry>Cb<subscript>3</subscript></entry>
+         </row>
+
+         <row id="V4L2-PIX-FMT-YUV565">
+           <entry><constant>V4L2_PIX_FMT_YUV565</constant></entry>
+           <entry>'YUVP'</entry>
+           <entry></entry>
+           <entry>Cb<subscript>2</subscript></entry>
+           <entry>Cb<subscript>1</subscript></entry>
+           <entry>Cb<subscript>0</subscript></entry>
+           <entry>Cr<subscript>4</subscript></entry>
+           <entry>Cr<subscript>3</subscript></entry>
+           <entry>Cr<subscript>2</subscript></entry>
+           <entry>Cr<subscript>1</subscript></entry>
+           <entry>Cr<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>Y'<subscript>4</subscript></entry>
+           <entry>Y'<subscript>3</subscript></entry>
+           <entry>Y'<subscript>2</subscript></entry>
+           <entry>Y'<subscript>1</subscript></entry>
+           <entry>Y'<subscript>0</subscript></entry>
+           <entry>Cb<subscript>5</subscript></entry>
+           <entry>Cb<subscript>4</subscript></entry>
+           <entry>Cb<subscript>3</subscript></entry>
+         </row>
+
+         <row id="V4L2-PIX-FMT-YUV32">
+           <entry><constant>V4L2_PIX_FMT_YUV32</constant></entry>
+           <entry>'YUV4'</entry>
+           <entry></entry>
+           <entry>a<subscript>7</subscript></entry>
+           <entry>a<subscript>6</subscript></entry>
+           <entry>a<subscript>5</subscript></entry>
+           <entry>a<subscript>4</subscript></entry>
+           <entry>a<subscript>3</subscript></entry>
+           <entry>a<subscript>2</subscript></entry>
+           <entry>a<subscript>1</subscript></entry>
+           <entry>a<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>Y'<subscript>7</subscript></entry>
+           <entry>Y'<subscript>6</subscript></entry>
+           <entry>Y'<subscript>5</subscript></entry>
+           <entry>Y'<subscript>4</subscript></entry>
+           <entry>Y'<subscript>3</subscript></entry>
+           <entry>Y'<subscript>2</subscript></entry>
+           <entry>Y'<subscript>1</subscript></entry>
+           <entry>Y'<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>Cb<subscript>7</subscript></entry>
+           <entry>Cb<subscript>6</subscript></entry>
+           <entry>Cb<subscript>5</subscript></entry>
+           <entry>Cb<subscript>4</subscript></entry>
+           <entry>Cb<subscript>3</subscript></entry>
+           <entry>Cb<subscript>2</subscript></entry>
+           <entry>Cb<subscript>1</subscript></entry>
+           <entry>Cb<subscript>0</subscript></entry>
+           <entry></entry>
+           <entry>Cr<subscript>7</subscript></entry>
+           <entry>Cr<subscript>6</subscript></entry>
+           <entry>Cr<subscript>5</subscript></entry>
+           <entry>Cr<subscript>4</subscript></entry>
+           <entry>Cr<subscript>3</subscript></entry>
+           <entry>Cr<subscript>2</subscript></entry>
+           <entry>Cr<subscript>1</subscript></entry>
+           <entry>Cr<subscript>0</subscript></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para>Bit 7 is the most significant bit. The value of a = alpha
+bits is undefined when reading from the driver, ignored when writing
+to the driver, except when alpha blending has been negotiated for a
+<link linkend="overlay">Video Overlay</link> or <link
+linkend="osd">Video Output Overlay</link>.</para>
+
+  </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-sbggr16.xml b/Documentation/DocBook/v4l/pixfmt-sbggr16.xml
new file mode 100644 (file)
index 0000000..519a9ef
--- /dev/null
@@ -0,0 +1,91 @@
+<refentry id="V4L2-PIX-FMT-SBGGR16">
+  <refmeta>
+    <refentrytitle>V4L2_PIX_FMT_SBGGR16 ('BYR2')</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname><constant>V4L2_PIX_FMT_SBGGR16</constant></refname>
+    <refpurpose>Bayer RGB format</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>Description</title>
+
+    <para>This format is similar to <link
+linkend="V4L2-PIX-FMT-SBGGR8">
+<constant>V4L2_PIX_FMT_SBGGR8</constant></link>, except each pixel has
+a depth of 16 bits. The least significant byte is stored at lower
+memory addresses (little-endian). Note the actual sampling precision
+may be lower than 16 bits, for example 10 bits per pixel with values
+in range 0 to 1023.</para>
+
+    <example>
+      <title><constant>V4L2_PIX_FMT_SBGGR16</constant> 4 &times; 4
+pixel image</title>
+
+      <formalpara>
+       <title>Byte Order.</title>
+       <para>Each cell is one byte.
+         <informaltable frame="none">
+           <tgroup cols="5" align="center">
+             <colspec align="left" colwidth="2*" />
+             <tbody valign="top">
+               <row>
+                 <entry>start&nbsp;+&nbsp;0:</entry>
+                 <entry>B<subscript>00low</subscript></entry>
+                 <entry>B<subscript>00high</subscript></entry>
+                 <entry>G<subscript>01low</subscript></entry>
+                 <entry>G<subscript>01high</subscript></entry>
+                 <entry>B<subscript>02low</subscript></entry>
+                 <entry>B<subscript>02high</subscript></entry>
+                 <entry>G<subscript>03low</subscript></entry>
+                 <entry>G<subscript>03high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;8:</entry>
+                 <entry>G<subscript>10low</subscript></entry>
+                 <entry>G<subscript>10high</subscript></entry>
+                 <entry>R<subscript>11low</subscript></entry>
+                 <entry>R<subscript>11high</subscript></entry>
+                 <entry>G<subscript>12low</subscript></entry>
+                 <entry>G<subscript>12high</subscript></entry>
+                 <entry>R<subscript>13low</subscript></entry>
+                 <entry>R<subscript>13high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;16:</entry>
+                 <entry>B<subscript>20low</subscript></entry>
+                 <entry>B<subscript>20high</subscript></entry>
+                 <entry>G<subscript>21low</subscript></entry>
+                 <entry>G<subscript>21high</subscript></entry>
+                 <entry>B<subscript>22low</subscript></entry>
+                 <entry>B<subscript>22high</subscript></entry>
+                 <entry>G<subscript>23low</subscript></entry>
+                 <entry>G<subscript>23high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;24:</entry>
+                 <entry>G<subscript>30low</subscript></entry>
+                 <entry>G<subscript>30high</subscript></entry>
+                 <entry>R<subscript>31low</subscript></entry>
+                 <entry>R<subscript>31high</subscript></entry>
+                 <entry>G<subscript>32low</subscript></entry>
+                 <entry>G<subscript>32high</subscript></entry>
+                 <entry>R<subscript>33low</subscript></entry>
+                 <entry>R<subscript>33high</subscript></entry>
+               </row>
+             </tbody>
+           </tgroup>
+         </informaltable>
+       </para>
+      </formalpara>
+    </example>
+  </refsect1>
+</refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-sbggr8.xml b/Documentation/DocBook/v4l/pixfmt-sbggr8.xml
new file mode 100644 (file)
index 0000000..5fe84ec
--- /dev/null
@@ -0,0 +1,75 @@
+    <refentry id="V4L2-PIX-FMT-SBGGR8">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_SBGGR8 ('BA81')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_SBGGR8</constant></refname>
+       <refpurpose>Bayer RGB format</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This is commonly the native format of digital cameras,
+reflecting the arrangement of sensors on the CCD device. Only one red,
+green or blue value is given for each pixel. Missing components must
+be interpolated from neighbouring pixels. From left to right the first
+row consists of a blue and green value, the second row of a green and
+red value. This scheme repeats to the right and down for every two
+columns and rows.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_SBGGR8</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+             <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>B<subscript>00</subscript></entry>
+                     <entry>G<subscript>01</subscript></entry>
+                     <entry>B<subscript>02</subscript></entry>
+                     <entry>G<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>G<subscript>10</subscript></entry>
+                     <entry>R<subscript>11</subscript></entry>
+                     <entry>G<subscript>12</subscript></entry>
+                     <entry>R<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>B<subscript>20</subscript></entry>
+                     <entry>G<subscript>21</subscript></entry>
+                     <entry>B<subscript>22</subscript></entry>
+                     <entry>G<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>G<subscript>30</subscript></entry>
+                     <entry>R<subscript>31</subscript></entry>
+                     <entry>G<subscript>32</subscript></entry>
+                     <entry>R<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+             </informaltable>
+           </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-sgbrg8.xml b/Documentation/DocBook/v4l/pixfmt-sgbrg8.xml
new file mode 100644 (file)
index 0000000..d67a472
--- /dev/null
@@ -0,0 +1,75 @@
+    <refentry id="V4L2-PIX-FMT-SGBRG8">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_SGBRG8 ('GBRG')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_SGBRG8</constant></refname>
+       <refpurpose>Bayer RGB format</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This is commonly the native format of digital cameras,
+reflecting the arrangement of sensors on the CCD device. Only one red,
+green or blue value is given for each pixel. Missing components must
+be interpolated from neighbouring pixels. From left to right the first
+row consists of a green and blue value, the second row of a red and
+green value. This scheme repeats to the right and down for every two
+columns and rows.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_SGBRG8</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+             <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>G<subscript>00</subscript></entry>
+                     <entry>B<subscript>01</subscript></entry>
+                     <entry>G<subscript>02</subscript></entry>
+                     <entry>B<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>R<subscript>10</subscript></entry>
+                     <entry>G<subscript>11</subscript></entry>
+                     <entry>R<subscript>12</subscript></entry>
+                     <entry>G<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>G<subscript>20</subscript></entry>
+                     <entry>B<subscript>21</subscript></entry>
+                     <entry>G<subscript>22</subscript></entry>
+                     <entry>B<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>R<subscript>30</subscript></entry>
+                     <entry>G<subscript>31</subscript></entry>
+                     <entry>R<subscript>32</subscript></entry>
+                     <entry>G<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+             </informaltable>
+           </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-sgrbg8.xml b/Documentation/DocBook/v4l/pixfmt-sgrbg8.xml
new file mode 100644 (file)
index 0000000..0cdf13b
--- /dev/null
@@ -0,0 +1,75 @@
+    <refentry id="V4L2-PIX-FMT-SGRBG8">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_SGRBG8 ('GRBG')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_SGRBG8</constant></refname>
+       <refpurpose>Bayer RGB format</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This is commonly the native format of digital cameras,
+reflecting the arrangement of sensors on the CCD device. Only one red,
+green or blue value is given for each pixel. Missing components must
+be interpolated from neighbouring pixels. From left to right the first
+row consists of a green and blue value, the second row of a red and
+green value. This scheme repeats to the right and down for every two
+columns and rows.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_SGRBG8</constant> 4 &times;
+4 pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+             <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>G<subscript>00</subscript></entry>
+                     <entry>R<subscript>01</subscript></entry>
+                     <entry>G<subscript>02</subscript></entry>
+                     <entry>R<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>R<subscript>10</subscript></entry>
+                     <entry>B<subscript>11</subscript></entry>
+                     <entry>R<subscript>12</subscript></entry>
+                     <entry>B<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>G<subscript>20</subscript></entry>
+                     <entry>R<subscript>21</subscript></entry>
+                     <entry>G<subscript>22</subscript></entry>
+                     <entry>R<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>R<subscript>30</subscript></entry>
+                     <entry>B<subscript>31</subscript></entry>
+                     <entry>R<subscript>32</subscript></entry>
+                     <entry>B<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+             </informaltable>
+           </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-uyvy.xml b/Documentation/DocBook/v4l/pixfmt-uyvy.xml
new file mode 100644 (file)
index 0000000..816c8d4
--- /dev/null
@@ -0,0 +1,128 @@
+    <refentry id="V4L2-PIX-FMT-UYVY">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_UYVY ('UYVY')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_UYVY</constant></refname>
+       <refpurpose>Variation of
+<constant>V4L2_PIX_FMT_YUYV</constant> with different order of samples
+in memory</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>In this format each four bytes is two pixels. Each four
+bytes is two Y's, a Cb and a Cr. Each Y goes to one of the pixels, and
+the Cb and Cr belong to both pixels. As you can see, the Cr and Cb
+components have half the horizontal resolution of the Y
+component.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_UYVY</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="9" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-vyuy.xml b/Documentation/DocBook/v4l/pixfmt-vyuy.xml
new file mode 100644 (file)
index 0000000..61f12a5
--- /dev/null
@@ -0,0 +1,128 @@
+    <refentry id="V4L2-PIX-FMT-VYUY">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_VYUY ('VYUY')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_VYUY</constant></refname>
+       <refpurpose>Variation of
+<constant>V4L2_PIX_FMT_YUYV</constant> with different order of samples
+in memory</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>In this format each four bytes is two pixels. Each four
+bytes is two Y's, a Cb and a Cr. Each Y goes to one of the pixels, and
+the Cb and Cr belong to both pixels. As you can see, the Cr and Cb
+components have half the horizontal resolution of the Y
+component.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_VYUY</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="9" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-y16.xml b/Documentation/DocBook/v4l/pixfmt-y16.xml
new file mode 100644 (file)
index 0000000..d584040
--- /dev/null
@@ -0,0 +1,89 @@
+<refentry id="V4L2-PIX-FMT-Y16">
+  <refmeta>
+    <refentrytitle>V4L2_PIX_FMT_Y16 ('Y16 ')</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname><constant>V4L2_PIX_FMT_Y16</constant></refname>
+    <refpurpose>Grey-scale image</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>Description</title>
+
+    <para>This is a grey-scale image with a depth of 16 bits per
+pixel. The least significant byte is stored at lower memory addresses
+(little-endian). Note the actual sampling precision may be lower than
+16 bits, for example 10 bits per pixel with values in range 0 to
+1023.</para>
+
+    <example>
+      <title><constant>V4L2_PIX_FMT_Y16</constant> 4 &times; 4
+pixel image</title>
+
+      <formalpara>
+       <title>Byte Order.</title>
+       <para>Each cell is one byte.
+         <informaltable frame="none">
+           <tgroup cols="9" align="center">
+             <colspec align="left" colwidth="2*" />
+             <tbody valign="top">
+               <row>
+                 <entry>start&nbsp;+&nbsp;0:</entry>
+                 <entry>Y'<subscript>00low</subscript></entry>
+                 <entry>Y'<subscript>00high</subscript></entry>
+                 <entry>Y'<subscript>01low</subscript></entry>
+                 <entry>Y'<subscript>01high</subscript></entry>
+                 <entry>Y'<subscript>02low</subscript></entry>
+                 <entry>Y'<subscript>02high</subscript></entry>
+                 <entry>Y'<subscript>03low</subscript></entry>
+                 <entry>Y'<subscript>03high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;8:</entry>
+                 <entry>Y'<subscript>10low</subscript></entry>
+                 <entry>Y'<subscript>10high</subscript></entry>
+                 <entry>Y'<subscript>11low</subscript></entry>
+                 <entry>Y'<subscript>11high</subscript></entry>
+                 <entry>Y'<subscript>12low</subscript></entry>
+                 <entry>Y'<subscript>12high</subscript></entry>
+                 <entry>Y'<subscript>13low</subscript></entry>
+                 <entry>Y'<subscript>13high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;16:</entry>
+                 <entry>Y'<subscript>20low</subscript></entry>
+                 <entry>Y'<subscript>20high</subscript></entry>
+                 <entry>Y'<subscript>21low</subscript></entry>
+                 <entry>Y'<subscript>21high</subscript></entry>
+                 <entry>Y'<subscript>22low</subscript></entry>
+                 <entry>Y'<subscript>22high</subscript></entry>
+                 <entry>Y'<subscript>23low</subscript></entry>
+                 <entry>Y'<subscript>23high</subscript></entry>
+               </row>
+               <row>
+                 <entry>start&nbsp;+&nbsp;24:</entry>
+                 <entry>Y'<subscript>30low</subscript></entry>
+                 <entry>Y'<subscript>30high</subscript></entry>
+                 <entry>Y'<subscript>31low</subscript></entry>
+                 <entry>Y'<subscript>31high</subscript></entry>
+                 <entry>Y'<subscript>32low</subscript></entry>
+                 <entry>Y'<subscript>32high</subscript></entry>
+                 <entry>Y'<subscript>33low</subscript></entry>
+                 <entry>Y'<subscript>33high</subscript></entry>
+               </row>
+             </tbody>
+           </tgroup>
+         </informaltable>
+       </para>
+      </formalpara>
+    </example>
+  </refsect1>
+</refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-y41p.xml b/Documentation/DocBook/v4l/pixfmt-y41p.xml
new file mode 100644 (file)
index 0000000..73c8536
--- /dev/null
@@ -0,0 +1,157 @@
+    <refentry id="V4L2-PIX-FMT-Y41P">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_Y41P ('Y41P')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_Y41P</constant></refname>
+       <refpurpose>Format with &frac14; horizontal chroma
+resolution, also known as YUV 4:1:1</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>In this format each 12 bytes is eight pixels. In the
+twelve bytes are two CbCr pairs and eight Y's. The first CbCr pair
+goes with the first four Y's, and the second CbCr pair goes with the
+other four Y's. The Cb and Cr components have one fourth the
+horizontal resolution of the Y component.</para>
+
+       <para>Do not confuse this format with <link
+linkend="V4L2-PIX-FMT-YUV411P"><constant>V4L2_PIX_FMT_YUV411P</constant></link>.
+Y41P is derived from "YUV 4:1:1 <emphasis>packed</emphasis>", while
+YUV411P stands for "YUV 4:1:1 <emphasis>planar</emphasis>".</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_Y41P</constant> 8 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="13" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                     <entry>Y'<subscript>04</subscript></entry>
+                     <entry>Y'<subscript>05</subscript></entry>
+                     <entry>Y'<subscript>06</subscript></entry>
+                     <entry>Y'<subscript>07</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                     <entry>Y'<subscript>14</subscript></entry>
+                     <entry>Y'<subscript>15</subscript></entry>
+                     <entry>Y'<subscript>16</subscript></entry>
+                     <entry>Y'<subscript>17</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                     <entry>Y'<subscript>24</subscript></entry>
+                     <entry>Y'<subscript>25</subscript></entry>
+                     <entry>Y'<subscript>26</subscript></entry>
+                     <entry>Y'<subscript>27</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;36:</entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                     <entry>Y'<subscript>34</subscript></entry>
+                     <entry>Y'<subscript>35</subscript></entry>
+                     <entry>Y'<subscript>36</subscript></entry>
+                     <entry>Y'<subscript>37</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+             </informaltable></para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="15" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry><entry></entry>
+                     <entry>4</entry><entry></entry><entry>5</entry><entry></entry>
+                     <entry>6</entry><entry></entry><entry>7</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yuv410.xml b/Documentation/DocBook/v4l/pixfmt-yuv410.xml
new file mode 100644 (file)
index 0000000..8eb4a19
--- /dev/null
@@ -0,0 +1,141 @@
+    <refentry>
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YVU410 ('YVU9'), V4L2_PIX_FMT_YUV410 ('YUV9')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname id="V4L2-PIX-FMT-YVU410"><constant>V4L2_PIX_FMT_YVU410</constant></refname>
+       <refname id="V4L2-PIX-FMT-YUV410"><constant>V4L2_PIX_FMT_YUV410</constant></refname>
+       <refpurpose>Planar formats with &frac14; horizontal and
+vertical chroma resolution, also known as YUV 4:1:0</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>These are planar formats, as opposed to a packed format.
+The three components are separated into three sub-images or planes.
+The Y plane is first. The Y plane has one byte per pixel. For
+<constant>V4L2_PIX_FMT_YVU410</constant>, the Cr plane immediately
+follows the Y plane in memory. The Cr plane is &frac14; the width and
+&frac14; the height of the Y plane (and of the image). Each Cr belongs
+to 16 pixels, a four-by-four square of the image. Following the Cr
+plane is the Cb plane, just like the Cr plane.
+<constant>V4L2_PIX_FMT_YUV410</constant> is the same, except the Cb
+plane comes first, then the Cr plane.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the Cr
+and Cb planes have &frac14; as many pad bytes after their rows. In
+other words, four Cx rows (including padding) are exactly as long as
+one Y row (including padding).</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YVU410</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;17:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry></entry><entry></entry><entry>C</entry>
+                     <entry></entry><entry></entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yuv411p.xml b/Documentation/DocBook/v4l/pixfmt-yuv411p.xml
new file mode 100644 (file)
index 0000000..00e0960
--- /dev/null
@@ -0,0 +1,155 @@
+    <refentry id="V4L2-PIX-FMT-YUV411P">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YUV411P ('411P')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_YUV411P</constant></refname>
+       <refpurpose>Format with &frac14; horizontal chroma resolution,
+also known as YUV 4:1:1. Planar layout as opposed to
+<constant>V4L2_PIX_FMT_Y41P</constant></refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This format is not commonly used. This is a planar
+format similar to the 4:2:2 planar format except with half as many
+chroma. The three components are separated into three sub-images or
+planes. The Y plane is first. The Y plane has one byte per pixel. The
+Cb plane immediately follows the Y plane in memory. The Cb plane is
+&frac14; the width of the Y plane (and of the image). Each Cb belongs
+to 4 pixels all on the same row. For example,
+Cb<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
+Y'<subscript>01</subscript>, Y'<subscript>02</subscript> and
+Y'<subscript>03</subscript>. Following the Cb plane is the Cr plane,
+just like the Cb plane.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the Cr
+and Cb planes have &frac14; as many pad bytes after their rows. In
+other words, four C x rows (including padding) is exactly as long as
+one Y row (including padding).</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YUV411P</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;17:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;18:</entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;19:</entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;20:</entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;21:</entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;22:</entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;23:</entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry>C</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yuv420.xml b/Documentation/DocBook/v4l/pixfmt-yuv420.xml
new file mode 100644 (file)
index 0000000..42d7de5
--- /dev/null
@@ -0,0 +1,157 @@
+    <refentry>
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YVU420 ('YV12'), V4L2_PIX_FMT_YUV420 ('YU12')</refentrytitle>
+       &manvol;
+     </refmeta>
+      <refnamediv>
+       <refname id="V4L2-PIX-FMT-YVU420"><constant>V4L2_PIX_FMT_YVU420</constant></refname>
+       <refname id="V4L2-PIX-FMT-YUV420"><constant>V4L2_PIX_FMT_YUV420</constant></refname>
+       <refpurpose>Planar formats with &frac12; horizontal and
+vertical chroma resolution, also known as YUV 4:2:0</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>These are planar formats, as opposed to a packed format.
+The three components are separated into three sub- images or planes.
+The Y plane is first. The Y plane has one byte per pixel. For
+<constant>V4L2_PIX_FMT_YVU420</constant>, the Cr plane immediately
+follows the Y plane in memory. The Cr plane is half the width and half
+the height of the Y plane (and of the image). Each Cr belongs to four
+pixels, a two-by-two square of the image. For example,
+Cr<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
+Y'<subscript>01</subscript>, Y'<subscript>10</subscript>, and
+Y'<subscript>11</subscript>. Following the Cr plane is the Cb plane,
+just like the Cr plane. <constant>V4L2_PIX_FMT_YUV420</constant> is
+the same except the Cb plane comes first, then the Cr plane.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the Cr
+and Cb planes have half as many pad bytes after their rows. In other
+words, two Cx rows (including padding) is exactly as long as one Y row
+(including padding).</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YVU420</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;18:</entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;20:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;22:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry><entry></entry>
+                     <entry></entry><entry>C</entry><entry></entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry></entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yuv422p.xml b/Documentation/DocBook/v4l/pixfmt-yuv422p.xml
new file mode 100644 (file)
index 0000000..4348bd9
--- /dev/null
@@ -0,0 +1,161 @@
+    <refentry id="V4L2-PIX-FMT-YUV422P">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YUV422P ('422P')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_YUV422P</constant></refname>
+       <refpurpose>Format with &frac12; horizontal chroma resolution,
+also known as YUV 4:2:2. Planar layout as opposed to
+<constant>V4L2_PIX_FMT_YUYV</constant></refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>This format is not commonly used. This is a planar
+version of the YUYV format. The three components are separated into
+three sub-images or planes. The Y plane is first. The Y plane has one
+byte per pixel. The Cb plane immediately follows the Y plane in
+memory. The Cb plane is half the width of the Y plane (and of the
+image). Each Cb belongs to two pixels. For example,
+Cb<subscript>0</subscript> belongs to Y'<subscript>00</subscript>,
+Y'<subscript>01</subscript>. Following the Cb plane is the Cr plane,
+just like the Cb plane.</para>
+
+       <para>If the Y plane has pad bytes after each row, then the Cr
+and Cb planes have half as many pad bytes after their rows. In other
+words, two Cx rows (including padding) is exactly as long as one Y row
+(including padding).</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YUV422P</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="5" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;4:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;12:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;18:</entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;20:</entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;22:</entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;26:</entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;28:</entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;30:</entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yuyv.xml b/Documentation/DocBook/v4l/pixfmt-yuyv.xml
new file mode 100644 (file)
index 0000000..bdb2ffa
--- /dev/null
@@ -0,0 +1,128 @@
+    <refentry id="V4L2-PIX-FMT-YUYV">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YUYV ('YUYV')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_YUYV</constant></refname>
+       <refpurpose>Packed format with &frac12; horizontal chroma
+resolution, also known as YUV 4:2:2</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>In this format each four bytes is two pixels. Each four
+bytes is two Y's, a Cb and a Cr. Each Y goes to one of the pixels, and
+the Cb and Cr belong to both pixels. As you can see, the Cr and Cb
+components have half the horizontal resolution of the Y component.
+<constant>V4L2_PIX_FMT_YUYV </constant> is known in the Windows
+environment as YUY2.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YUYV</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="9" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt-yvyu.xml b/Documentation/DocBook/v4l/pixfmt-yvyu.xml
new file mode 100644 (file)
index 0000000..40d17ae
--- /dev/null
@@ -0,0 +1,128 @@
+    <refentry id="V4L2-PIX-FMT-YVYU">
+      <refmeta>
+       <refentrytitle>V4L2_PIX_FMT_YVYU ('YVYU')</refentrytitle>
+       &manvol;
+      </refmeta>
+      <refnamediv>
+       <refname><constant>V4L2_PIX_FMT_YVYU</constant></refname>
+       <refpurpose>Variation of
+<constant>V4L2_PIX_FMT_YUYV</constant> with different order of samples
+in memory</refpurpose>
+      </refnamediv>
+      <refsect1>
+       <title>Description</title>
+
+       <para>In this format each four bytes is two pixels. Each four
+bytes is two Y's, a Cb and a Cr. Each Y goes to one of the pixels, and
+the Cb and Cr belong to both pixels. As you can see, the Cr and Cb
+components have half the horizontal resolution of the Y
+component.</para>
+
+       <example>
+         <title><constant>V4L2_PIX_FMT_YVYU</constant> 4 &times; 4
+pixel image</title>
+
+         <formalpara>
+           <title>Byte Order.</title>
+           <para>Each cell is one byte.
+               <informaltable frame="none">
+               <tgroup cols="9" align="center">
+                 <colspec align="left" colwidth="2*" />
+                 <tbody valign="top">
+                   <row>
+                     <entry>start&nbsp;+&nbsp;0:</entry>
+                     <entry>Y'<subscript>00</subscript></entry>
+                     <entry>Cr<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>01</subscript></entry>
+                     <entry>Cb<subscript>00</subscript></entry>
+                     <entry>Y'<subscript>02</subscript></entry>
+                     <entry>Cr<subscript>01</subscript></entry>
+                     <entry>Y'<subscript>03</subscript></entry>
+                     <entry>Cb<subscript>01</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;8:</entry>
+                     <entry>Y'<subscript>10</subscript></entry>
+                     <entry>Cr<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>11</subscript></entry>
+                     <entry>Cb<subscript>10</subscript></entry>
+                     <entry>Y'<subscript>12</subscript></entry>
+                     <entry>Cr<subscript>11</subscript></entry>
+                     <entry>Y'<subscript>13</subscript></entry>
+                     <entry>Cb<subscript>11</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;16:</entry>
+                     <entry>Y'<subscript>20</subscript></entry>
+                     <entry>Cr<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>21</subscript></entry>
+                     <entry>Cb<subscript>20</subscript></entry>
+                     <entry>Y'<subscript>22</subscript></entry>
+                     <entry>Cr<subscript>21</subscript></entry>
+                     <entry>Y'<subscript>23</subscript></entry>
+                     <entry>Cb<subscript>21</subscript></entry>
+                   </row>
+                   <row>
+                     <entry>start&nbsp;+&nbsp;24:</entry>
+                     <entry>Y'<subscript>30</subscript></entry>
+                     <entry>Cr<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>31</subscript></entry>
+                     <entry>Cb<subscript>30</subscript></entry>
+                     <entry>Y'<subscript>32</subscript></entry>
+                     <entry>Cr<subscript>31</subscript></entry>
+                     <entry>Y'<subscript>33</subscript></entry>
+                     <entry>Cb<subscript>31</subscript></entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+
+         <formalpara>
+           <title>Color Sample Location.</title>
+           <para>
+               <informaltable frame="none">
+               <tgroup cols="7" align="center">
+                 <tbody valign="top">
+                   <row>
+                     <entry></entry>
+                     <entry>0</entry><entry></entry><entry>1</entry><entry></entry>
+                     <entry>2</entry><entry></entry><entry>3</entry>
+                   </row>
+                   <row>
+                     <entry>0</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>1</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>2</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                   <row>
+                     <entry>3</entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry><entry></entry>
+                     <entry>Y</entry><entry>C</entry><entry>Y</entry>
+                   </row>
+                 </tbody>
+               </tgroup>
+               </informaltable>
+             </para>
+         </formalpara>
+       </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml
new file mode 100644 (file)
index 0000000..7d396a3
--- /dev/null
@@ -0,0 +1,801 @@
+  <title>Image Formats</title>
+
+  <para>The V4L2 API was primarily designed for devices exchanging
+image data with applications. The
+<structname>v4l2_pix_format</structname> structure defines the format
+and layout of an image in memory. Image formats are negotiated with
+the &VIDIOC-S-FMT; ioctl. (The explanations here focus on video
+capturing and output, for overlay frame buffer formats see also
+&VIDIOC-G-FBUF;.)</para>
+
+  <table pgwide="1" frame="none" id="v4l2-pix-format">
+    <title>struct <structname>v4l2_pix_format</structname></title>
+    <tgroup cols="3">
+      &cs-str;
+      <tbody valign="top">
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>width</structfield></entry>
+         <entry>Image width in pixels.</entry>
+       </row>
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>height</structfield></entry>
+         <entry>Image height in pixels.</entry>
+       </row>
+       <row>
+         <entry spanname="hspan">Applications set these fields to
+request an image size, drivers return the closest possible values. In
+case of planar formats the <structfield>width</structfield> and
+<structfield>height</structfield> applies to the largest plane. To
+avoid ambiguities drivers must return values rounded up to a multiple
+of the scale factor of any smaller planes. For example when the image
+format is YUV 4:2:0, <structfield>width</structfield> and
+<structfield>height</structfield> must be multiples of two.</entry>
+       </row>
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>pixelformat</structfield></entry>
+         <entry>The pixel format or type of compression, set by the
+application. This is a little endian <link
+linkend="v4l2-fourcc">four character code</link>. V4L2 defines
+standard RGB formats in <xref linkend="rgb-formats" />, YUV formats in <xref
+linkend="yuv-formats" />, and reserved codes in <xref
+linkend="reserved-formats" /></entry>
+       </row>
+       <row>
+         <entry>&v4l2-field;</entry>
+         <entry><structfield>field</structfield></entry>
+         <entry>Video images are typically interlaced. Applications
+can request to capture or output only the top or bottom field, or both
+fields interlaced or sequentially stored in one buffer or alternating
+in separate buffers. Drivers return the actual field order selected.
+For details see <xref linkend="field-order" />.</entry>
+       </row>
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>bytesperline</structfield></entry>
+         <entry>Distance in bytes between the leftmost pixels in two
+adjacent lines.</entry>
+       </row>
+       <row>
+         <entry spanname="hspan"><para>Both applications and drivers
+can set this field to request padding bytes at the end of each line.
+Drivers however may ignore the value requested by the application,
+returning <structfield>width</structfield> times bytes per pixel or a
+larger value required by the hardware. That implies applications can
+just set this field to zero to get a reasonable
+default.</para><para>Video hardware may access padding bytes,
+therefore they must reside in accessible memory. Consider cases where
+padding bytes after the last line of an image cross a system page
+boundary. Input devices may write padding bytes, the value is
+undefined. Output devices ignore the contents of padding
+bytes.</para><para>When the image format is planar the
+<structfield>bytesperline</structfield> value applies to the largest
+plane and is divided by the same factor as the
+<structfield>width</structfield> field for any smaller planes. For
+example the Cb and Cr planes of a YUV 4:2:0 image have half as many
+padding bytes following each line as the Y plane. To avoid ambiguities
+drivers must return a <structfield>bytesperline</structfield> value
+rounded up to a multiple of the scale factor.</para></entry>
+       </row>
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>sizeimage</structfield></entry>
+         <entry>Size in bytes of the buffer to hold a complete image,
+set by the driver. Usually this is
+<structfield>bytesperline</structfield> times
+<structfield>height</structfield>. When the image consists of variable
+length compressed data this is the maximum number of bytes required to
+hold an image.</entry>
+       </row>
+       <row>
+         <entry>&v4l2-colorspace;</entry>
+         <entry><structfield>colorspace</structfield></entry>
+         <entry>This information supplements the
+<structfield>pixelformat</structfield> and must be set by the driver,
+see <xref linkend="colorspaces" />.</entry>
+       </row>
+       <row>
+         <entry>__u32</entry>
+         <entry><structfield>priv</structfield></entry>
+         <entry>Reserved for custom (driver defined) additional
+information about formats. When not used drivers and applications must
+set this field to zero.</entry>
+       </row>
+      </tbody>
+    </tgroup>
+  </table>
+
+  <section>
+    <title>Standard Image Formats</title>
+
+    <para>In order to exchange images between drivers and
+applications, it is necessary to have standard image data formats
+which both sides will interpret the same way. V4L2 includes several
+such formats, and this section is intended to be an unambiguous
+specification of the standard image data formats in V4L2.</para>
+
+    <para>V4L2 drivers are not limited to these formats, however.
+Driver-specific formats are possible. In that case the application may
+depend on a codec to convert images to one of the standard formats
+when needed. But the data can still be stored and retrieved in the
+proprietary format. For example, a device may support a proprietary
+compressed format. Applications can still capture and save the data in
+the compressed format, saving much disk space, and later use a codec
+to convert the images to the X Windows screen format when the video is
+to be displayed.</para>
+
+    <para>Even so, ultimately, some standard formats are needed, so
+the V4L2 specification would not be complete without well-defined
+standard formats.</para>
+
+    <para>The V4L2 standard formats are mainly uncompressed formats. The
+pixels are always arranged in memory from left to right, and from top
+to bottom. The first byte of data in the image buffer is always for
+the leftmost pixel of the topmost row. Following that is the pixel
+immediately to its right, and so on until the end of the top row of
+pixels. Following the rightmost pixel of the row there may be zero or
+more bytes of padding to guarantee that each row of pixel data has a
+certain alignment. Following the pad bytes, if any, is data for the
+leftmost pixel of the second row from the top, and so on. The last row
+has just as many pad bytes after it as the other rows.</para>
+
+    <para>In V4L2 each format has an identifier which looks like
+<constant>PIX_FMT_XXX</constant>, defined in the <link
+linkend="videodev">videodev.h</link> header file. These identifiers
+represent <link linkend="v4l2-fourcc">four character codes</link>
+which are also listed below, however they are not the same as those
+used in the Windows world.</para>
+  </section>
+
+  <section id="colorspaces">
+    <title>Colorspaces</title>
+
+    <para>[intro]</para>
+
+    <!-- See proposal by Billy Biggs, video4linux-list@redhat.com
+on 11 Oct 2002, subject: "Re: [V4L] Re: v4l2 api", and
+http://vektor.theorem.ca/graphics/ycbcr/ and
+http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html -->
+
+    <para>
+      <variablelist>
+       <varlistentry>
+         <term>Gamma Correction</term>
+         <listitem>
+           <para>[to do]</para>
+           <para>E'<subscript>R</subscript> = f(R)</para>
+           <para>E'<subscript>G</subscript> = f(G)</para>
+           <para>E'<subscript>B</subscript> = f(B)</para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Construction of luminance and color-difference
+signals</term>
+         <listitem>
+           <para>[to do]</para>
+           <para>E'<subscript>Y</subscript> =
+Coeff<subscript>R</subscript> E'<subscript>R</subscript>
++ Coeff<subscript>G</subscript> E'<subscript>G</subscript>
++ Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
+           <para>(E'<subscript>R</subscript> - E'<subscript>Y</subscript>) = E'<subscript>R</subscript>
+- Coeff<subscript>R</subscript> E'<subscript>R</subscript>
+- Coeff<subscript>G</subscript> E'<subscript>G</subscript>
+- Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
+           <para>(E'<subscript>B</subscript> - E'<subscript>Y</subscript>) = E'<subscript>B</subscript>
+- Coeff<subscript>R</subscript> E'<subscript>R</subscript>
+- Coeff<subscript>G</subscript> E'<subscript>G</subscript>
+- Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Re-normalized color-difference signals</term>
+         <listitem>
+           <para>The color-difference signals are scaled back to unity
+range [-0.5;+0.5]:</para>
+           <para>K<subscript>B</subscript> = 0.5 / (1 - Coeff<subscript>B</subscript>)</para>
+           <para>K<subscript>R</subscript> = 0.5 / (1 - Coeff<subscript>R</subscript>)</para>
+           <para>P<subscript>B</subscript> =
+K<subscript>B</subscript> (E'<subscript>B</subscript> - E'<subscript>Y</subscript>) =
+  0.5 (Coeff<subscript>R</subscript> / Coeff<subscript>B</subscript>) E'<subscript>R</subscript>
++ 0.5 (Coeff<subscript>G</subscript> / Coeff<subscript>B</subscript>) E'<subscript>G</subscript>
++ 0.5 E'<subscript>B</subscript></para>
+           <para>P<subscript>R</subscript> =
+K<subscript>R</subscript> (E'<subscript>R</subscript> - E'<subscript>Y</subscript>) =
+  0.5 E'<subscript>R</subscript>
++ 0.5 (Coeff<subscript>G</subscript> / Coeff<subscript>R</subscript>) E'<subscript>G</subscript>
++ 0.5 (Coeff<subscript>B</subscript> / Coeff<subscript>R</subscript>) E'<subscript>B</subscript></para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Quantization</term>
+         <listitem>
+           <para>[to do]</para>
+           <para>Y' = (Lum. Levels - 1) &middot; E'<subscript>Y</subscript> + Lum. Offset</para>
+           <para>C<subscript>B</subscript> = (Chrom. Levels - 1)
+&middot; P<subscript>B</subscript> + Chrom. Offset</para>
+           <para>C<subscript>R</subscript> = (Chrom. Levels - 1)
+&middot; P<subscript>R</subscript> + Chrom. Offset</para>
+           <para>Rounding to the nearest integer and clamping to the range
+[0;255] finally yields the digital color components Y'CbCr
+stored in YUV images.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+    </para>
+
+    <example>
+      <title>ITU-R Rec. BT.601 color conversion</title>
+
+      <para>Forward Transformation</para>
+
+      <programlisting>
+int ER, EG, EB;         /* gamma corrected RGB input [0;255] */
+int Y1, Cb, Cr;         /* output [0;255] */
+
+double r, g, b;         /* temporaries */
+double y1, pb, pr;
+
+int
+clamp (double x)
+{
+       int r = x;      /* round to nearest */
+
+       if (r &lt; 0)         return 0;
+       else if (r &gt; 255)  return 255;
+       else               return r;
+}
+
+r = ER / 255.0;
+g = EG / 255.0;
+b = EB / 255.0;
+
+y1  =  0.299  * r + 0.587 * g + 0.114  * b;
+pb  = -0.169  * r - 0.331 * g + 0.5    * b;
+pr  =  0.5    * r - 0.419 * g - 0.081  * b;
+
+Y1 = clamp (219 * y1 + 16);
+Cb = clamp (224 * pb + 128);
+Cr = clamp (224 * pr + 128);
+
+/* or shorter */
+
+y1 = 0.299 * ER + 0.587 * EG + 0.114 * EB;
+
+Y1 = clamp ( (219 / 255.0)                    *       y1  + 16);
+Cb = clamp (((224 / 255.0) / (2 - 2 * 0.114)) * (EB - y1) + 128);
+Cr = clamp (((224 / 255.0) / (2 - 2 * 0.299)) * (ER - y1) + 128);
+      </programlisting>
+
+      <para>Inverse Transformation</para>
+
+      <programlisting>
+int Y1, Cb, Cr;         /* gamma pre-corrected input [0;255] */
+int ER, EG, EB;         /* output [0;255] */
+
+double r, g, b;         /* temporaries */
+double y1, pb, pr;
+
+int
+clamp (double x)
+{
+       int r = x;      /* round to nearest */
+
+       if (r &lt; 0)         return 0;
+       else if (r &gt; 255)  return 255;
+       else               return r;
+}
+
+y1 = (255 / 219.0) * (Y1 - 16);
+pb = (255 / 224.0) * (Cb - 128);
+pr = (255 / 224.0) * (Cr - 128);
+
+r = 1.0 * y1 + 0     * pb + 1.402 * pr;
+g = 1.0 * y1 - 0.344 * pb - 0.714 * pr;
+b = 1.0 * y1 + 1.772 * pb + 0     * pr;
+
+ER = clamp (r * 255); /* [ok? one should prob. limit y1,pb,pr] */
+EG = clamp (g * 255);
+EB = clamp (b * 255);
+      </programlisting>
+    </example>
+
+    <table pgwide="1" id="v4l2-colorspace" orient="land">
+      <title>enum v4l2_colorspace</title>
+      <tgroup cols="11" align="center">
+       <colspec align="left" />
+       <colspec align="center" />
+       <colspec align="left" />
+       <colspec colname="cr" />
+       <colspec colname="cg" />
+       <colspec colname="cb" />
+       <colspec colname="wp" />
+       <colspec colname="gc" />
+       <colspec colname="lum" />
+       <colspec colname="qy" />
+       <colspec colname="qc" />
+       <spanspec namest="cr" nameend="cb" spanname="chrom" />
+       <spanspec namest="qy" nameend="qc" spanname="quant" />
+       <spanspec namest="lum" nameend="qc" spanname="spam" />
+       <thead>
+         <row>
+           <entry morerows="1">Identifier</entry>
+           <entry morerows="1">Value</entry>
+           <entry morerows="1">Description</entry>
+           <entry spanname="chrom">Chromaticities<footnote>
+               <para>The coordinates of the color primaries are
+given in the CIE system (1931)</para>
+             </footnote></entry>
+           <entry morerows="1">White Point</entry>
+           <entry morerows="1">Gamma Correction</entry>
+           <entry morerows="1">Luminance E'<subscript>Y</subscript></entry>
+           <entry spanname="quant">Quantization</entry>
+         </row>
+         <row>
+           <entry>Red</entry>
+           <entry>Green</entry>
+           <entry>Blue</entry>
+           <entry>Y'</entry>
+           <entry>Cb, Cr</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_COLORSPACE_SMPTE170M</constant></entry>
+           <entry>1</entry>
+           <entry>NTSC/PAL according to <xref linkend="smpte170m" />,
+<xref linkend="itu601" /></entry>
+           <entry>x&nbsp;=&nbsp;0.630, y&nbsp;=&nbsp;0.340</entry>
+           <entry>x&nbsp;=&nbsp;0.310, y&nbsp;=&nbsp;0.595</entry>
+           <entry>x&nbsp;=&nbsp;0.155, y&nbsp;=&nbsp;0.070</entry>
+           <entry>x&nbsp;=&nbsp;0.3127, y&nbsp;=&nbsp;0.3290,
+           Illuminant D<subscript>65</subscript></entry>
+           <entry>E' = 4.5&nbsp;I&nbsp;for&nbsp;I&nbsp;&le;0.018,
+1.099&nbsp;I<superscript>0.45</superscript>&nbsp;-&nbsp;0.099&nbsp;for&nbsp;0.018&nbsp;&lt;&nbsp;I</entry>
+           <entry>0.299&nbsp;E'<subscript>R</subscript>
++&nbsp;0.587&nbsp;E'<subscript>G</subscript>
++&nbsp;0.114&nbsp;E'<subscript>B</subscript></entry>
+           <entry>219&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_SMPTE240M</constant></entry>
+           <entry>2</entry>
+           <entry>1125-Line (US) HDTV, see <xref
+linkend="smpte240m" /></entry>
+           <entry>x&nbsp;=&nbsp;0.630, y&nbsp;=&nbsp;0.340</entry>
+           <entry>x&nbsp;=&nbsp;0.310, y&nbsp;=&nbsp;0.595</entry>
+           <entry>x&nbsp;=&nbsp;0.155, y&nbsp;=&nbsp;0.070</entry>
+           <entry>x&nbsp;=&nbsp;0.3127, y&nbsp;=&nbsp;0.3290,
+           Illuminant D<subscript>65</subscript></entry>
+           <entry>E' = 4&nbsp;I&nbsp;for&nbsp;I&nbsp;&le;0.0228,
+1.1115&nbsp;I<superscript>0.45</superscript>&nbsp;-&nbsp;0.1115&nbsp;for&nbsp;0.0228&nbsp;&lt;&nbsp;I</entry>
+           <entry>0.212&nbsp;E'<subscript>R</subscript>
++&nbsp;0.701&nbsp;E'<subscript>G</subscript>
++&nbsp;0.087&nbsp;E'<subscript>B</subscript></entry>
+           <entry>219&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_REC709</constant></entry>
+           <entry>3</entry>
+           <entry>HDTV and modern devices, see <xref
+linkend="itu709" /></entry>
+           <entry>x&nbsp;=&nbsp;0.640, y&nbsp;=&nbsp;0.330</entry>
+           <entry>x&nbsp;=&nbsp;0.300, y&nbsp;=&nbsp;0.600</entry>
+           <entry>x&nbsp;=&nbsp;0.150, y&nbsp;=&nbsp;0.060</entry>
+           <entry>x&nbsp;=&nbsp;0.3127, y&nbsp;=&nbsp;0.3290,
+           Illuminant D<subscript>65</subscript></entry>
+           <entry>E' = 4.5&nbsp;I&nbsp;for&nbsp;I&nbsp;&le;0.018,
+1.099&nbsp;I<superscript>0.45</superscript>&nbsp;-&nbsp;0.099&nbsp;for&nbsp;0.018&nbsp;&lt;&nbsp;I</entry>
+           <entry>0.2125&nbsp;E'<subscript>R</subscript>
++&nbsp;0.7154&nbsp;E'<subscript>G</subscript>
++&nbsp;0.0721&nbsp;E'<subscript>B</subscript></entry>
+           <entry>219&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_BT878</constant></entry>
+           <entry>4</entry>
+           <entry>Broken Bt878 extents<footnote>
+               <para>The ubiquitous Bt878 video capture chip
+quantizes E'<subscript>Y</subscript> to 238 levels, yielding a range
+of Y' = 16 &hellip; 253, unlike Rec. 601 Y' = 16 &hellip;
+235. This is not a typo in the Bt878 documentation, it has been
+implemented in silicon. The chroma extents are unclear.</para>
+             </footnote>, <xref linkend="itu601" /></entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>0.299&nbsp;E'<subscript>R</subscript>
++&nbsp;0.587&nbsp;E'<subscript>G</subscript>
++&nbsp;0.114&nbsp;E'<subscript>B</subscript></entry>
+           <entry><emphasis>237</emphasis>&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128 (probably)</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_470_SYSTEM_M</constant></entry>
+           <entry>5</entry>
+           <entry>M/NTSC<footnote>
+               <para>No identifier exists for M/PAL which uses
+the chromaticities of M/NTSC, the remaining parameters are equal to B and
+G/PAL.</para>
+             </footnote> according to <xref linkend="itu470" />, <xref
+               linkend="itu601" /></entry>
+           <entry>x&nbsp;=&nbsp;0.67, y&nbsp;=&nbsp;0.33</entry>
+           <entry>x&nbsp;=&nbsp;0.21, y&nbsp;=&nbsp;0.71</entry>
+           <entry>x&nbsp;=&nbsp;0.14, y&nbsp;=&nbsp;0.08</entry>
+           <entry>x&nbsp;=&nbsp;0.310, y&nbsp;=&nbsp;0.316, Illuminant C</entry>
+           <entry>?</entry>
+           <entry>0.299&nbsp;E'<subscript>R</subscript>
++&nbsp;0.587&nbsp;E'<subscript>G</subscript>
++&nbsp;0.114&nbsp;E'<subscript>B</subscript></entry>
+           <entry>219&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_470_SYSTEM_BG</constant></entry>
+           <entry>6</entry>
+           <entry>625-line PAL and SECAM systems according to <xref
+linkend="itu470" />, <xref linkend="itu601" /></entry>
+           <entry>x&nbsp;=&nbsp;0.64, y&nbsp;=&nbsp;0.33</entry>
+           <entry>x&nbsp;=&nbsp;0.29, y&nbsp;=&nbsp;0.60</entry>
+           <entry>x&nbsp;=&nbsp;0.15, y&nbsp;=&nbsp;0.06</entry>
+           <entry>x&nbsp;=&nbsp;0.313, y&nbsp;=&nbsp;0.329,
+Illuminant D<subscript>65</subscript></entry>
+           <entry>?</entry>
+           <entry>0.299&nbsp;E'<subscript>R</subscript>
++&nbsp;0.587&nbsp;E'<subscript>G</subscript>
++&nbsp;0.114&nbsp;E'<subscript>B</subscript></entry>
+           <entry>219&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16</entry>
+           <entry>224&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_JPEG</constant></entry>
+           <entry>7</entry>
+           <entry>JPEG Y'CbCr, see <xref linkend="jfif" />, <xref linkend="itu601" /></entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>?</entry>
+           <entry>0.299&nbsp;E'<subscript>R</subscript>
++&nbsp;0.587&nbsp;E'<subscript>G</subscript>
++&nbsp;0.114&nbsp;E'<subscript>B</subscript></entry>
+           <entry>256&nbsp;E'<subscript>Y</subscript>&nbsp;+&nbsp;16<footnote>
+               <para>Note JFIF quantizes
+Y'P<subscript>B</subscript>P<subscript>R</subscript> in range [0;+1] and
+[-0.5;+0.5] to <emphasis>257</emphasis> levels, however Y'CbCr signals
+are still clamped to [0;255].</para>
+             </footnote></entry>
+           <entry>256&nbsp;P<subscript>B,R</subscript>&nbsp;+&nbsp;128</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_COLORSPACE_SRGB</constant></entry>
+           <entry>8</entry>
+           <entry>[?]</entry>
+           <entry>x&nbsp;=&nbsp;0.640, y&nbsp;=&nbsp;0.330</entry>
+           <entry>x&nbsp;=&nbsp;0.300, y&nbsp;=&nbsp;0.600</entry>
+           <entry>x&nbsp;=&nbsp;0.150, y&nbsp;=&nbsp;0.060</entry>
+           <entry>x&nbsp;=&nbsp;0.3127, y&nbsp;=&nbsp;0.3290,
+           Illuminant D<subscript>65</subscript></entry>
+           <entry>E' = 4.5&nbsp;I&nbsp;for&nbsp;I&nbsp;&le;0.018,
+1.099&nbsp;I<superscript>0.45</superscript>&nbsp;-&nbsp;0.099&nbsp;for&nbsp;0.018&nbsp;&lt;&nbsp;I</entry>
+           <entry spanname="spam">n/a</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section id="pixfmt-indexed">
+    <title>Indexed Format</title>
+
+    <para>In this format each pixel is represented by an 8 bit index
+into a 256 entry ARGB palette. It is intended for <link
+linkend="osd">Video Output Overlays</link> only. There are no ioctls to
+access the palette, this must be done with ioctls of the Linux framebuffer API.</para>
+
+    <table pgwide="0" frame="none">
+      <title>Indexed Image Format</title>
+      <tgroup cols="37" align="center">
+       <colspec colname="id" align="left" />
+       <colspec colname="fourcc" />
+       <colspec colname="bit" />
+
+       <colspec colnum="4" colname="b07" align="center" />
+       <colspec colnum="5" colname="b06" align="center" />
+       <colspec colnum="6" colname="b05" align="center" />
+       <colspec colnum="7" colname="b04" align="center" />
+       <colspec colnum="8" colname="b03" align="center" />
+       <colspec colnum="9" colname="b02" align="center" />
+       <colspec colnum="10" colname="b01" align="center" />
+       <colspec colnum="11" colname="b00" align="center" />
+
+       <spanspec namest="b07" nameend="b00" spanname="b0" />
+       <spanspec namest="b17" nameend="b10" spanname="b1" />
+       <spanspec namest="b27" nameend="b20" spanname="b2" />
+       <spanspec namest="b37" nameend="b30" spanname="b3" />
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>&nbsp;</entry>
+           <entry spanname="b0">Byte&nbsp;0</entry>
+         </row>
+         <row>
+           <entry>&nbsp;</entry>
+           <entry>&nbsp;</entry>
+           <entry>Bit</entry>
+           <entry>7</entry>
+           <entry>6</entry>
+           <entry>5</entry>
+           <entry>4</entry>
+           <entry>3</entry>
+           <entry>2</entry>
+           <entry>1</entry>
+           <entry>0</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row id="V4L2-PIX-FMT-PAL8">
+           <entry><constant>V4L2_PIX_FMT_PAL8</constant></entry>
+           <entry>'PAL8'</entry>
+           <entry></entry>
+           <entry>i<subscript>7</subscript></entry>
+           <entry>i<subscript>6</subscript></entry>
+           <entry>i<subscript>5</subscript></entry>
+           <entry>i<subscript>4</subscript></entry>
+           <entry>i<subscript>3</subscript></entry>
+           <entry>i<subscript>2</subscript></entry>
+           <entry>i<subscript>1</subscript></entry>
+           <entry>i<subscript>0</subscript></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section id="pixfmt-rgb">
+    <title>RGB Formats</title>
+
+    &sub-packed-rgb;
+    &sub-sbggr8;
+    &sub-sgbrg8;
+    &sub-sgrbg8;
+    &sub-sbggr16;
+  </section>
+
+  <section id="yuv-formats">
+    <title>YUV Formats</title>
+
+    <para>YUV is the format native to TV broadcast and composite video
+signals. It separates the brightness information (Y) from the color
+information (U and V or Cb and Cr). The color information consists of
+red and blue <emphasis>color difference</emphasis> signals, this way
+the green component can be reconstructed by subtracting from the
+brightness component. See <xref linkend="colorspaces" /> for conversion
+examples. YUV was chosen because early television would only transmit
+brightness information. To add color in a way compatible with existing
+receivers a new signal carrier was added to transmit the color
+difference signals. Secondary in the YUV format the U and V components
+usually have lower resolution than the Y component. This is an analog
+video compression technique taking advantage of a property of the
+human visual system, being more sensitive to brightness
+information.</para>
+
+    &sub-packed-yuv;
+    &sub-grey;
+    &sub-y16;
+    &sub-yuyv;
+    &sub-uyvy;
+    &sub-yvyu;
+    &sub-vyuy;
+    &sub-y41p;
+    &sub-yuv420;
+    &sub-yuv410;
+    &sub-yuv422p;
+    &sub-yuv411p;
+    &sub-nv12;
+    &sub-nv16;
+  </section>
+
+  <section>
+    <title>Compressed Formats</title>
+
+    <table pgwide="1" frame="none" id="compressed-formats">
+      <title>Compressed Image Formats</title>
+      <tgroup cols="3" align="left">
+       &cs-def;
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>Details</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+        <row id="V4L2-PIX-FMT-JPEG">
+           <entry><constant>V4L2_PIX_FMT_JPEG</constant></entry>
+           <entry>'JPEG'</entry>
+           <entry>TBD. See also &VIDIOC-G-JPEGCOMP;,
+           &VIDIOC-S-JPEGCOMP;.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-MPEG">
+           <entry><constant>V4L2_PIX_FMT_MPEG</constant></entry>
+           <entry>'MPEG'</entry>
+           <entry>MPEG stream. The actual format is determined by
+extended control <constant>V4L2_CID_MPEG_STREAM_TYPE</constant>, see
+<xref linkend="mpeg-control-id" />.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section id="pixfmt-reserved">
+    <title>Reserved Format Identifiers</title>
+
+    <para>These formats are not defined by this specification, they
+are just listed for reference and to avoid naming conflicts. If you
+want to register your own format, send an e-mail to the linux-media mailing
+list &v4l-ml; for inclusion in the <filename>videodev2.h</filename>
+file. If you want to share your format with other developers add a
+link to your documentation and send a copy to the linux-media mailing list
+for inclusion in this section. If you think your format should be listed
+in a standard format section please make a proposal on the linux-media mailing
+list.</para>
+
+    <table pgwide="1" frame="none" id="reserved-formats">
+      <title>Reserved Image Formats</title>
+      <tgroup cols="3" align="left">
+       &cs-def;
+       <thead>
+         <row>
+           <entry>Identifier</entry>
+           <entry>Code</entry>
+           <entry>Details</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row id="V4L2-PIX-FMT-DV">
+           <entry><constant>V4L2_PIX_FMT_DV</constant></entry>
+           <entry>'dvsd'</entry>
+           <entry>unknown</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-ET61X251">
+           <entry><constant>V4L2_PIX_FMT_ET61X251</constant></entry>
+           <entry>'E625'</entry>
+           <entry>Compressed format of the ET61X251 driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-HI240">
+           <entry><constant>V4L2_PIX_FMT_HI240</constant></entry>
+           <entry>'HI24'</entry>
+           <entry><para>8 bit RGB format used by the BTTV driver.</para></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-HM12">
+           <entry><constant>V4L2_PIX_FMT_HM12</constant></entry>
+           <entry>'HM12'</entry>
+           <entry><para>YUV 4:2:0 format used by the
+IVTV driver, <ulink url="http://www.ivtvdriver.org/">
+http://www.ivtvdriver.org/</ulink></para><para>The format is documented in the
+kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm12</filename>
+</para></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SPCA501">
+           <entry><constant>V4L2_PIX_FMT_SPCA501</constant></entry>
+           <entry>'S501'</entry>
+           <entry>YUYV per line used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SPCA505">
+           <entry><constant>V4L2_PIX_FMT_SPCA505</constant></entry>
+           <entry>'S505'</entry>
+           <entry>YYUV per line used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SPCA508">
+           <entry><constant>V4L2_PIX_FMT_SPCA508</constant></entry>
+           <entry>'S508'</entry>
+           <entry>YUVY per line used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SPCA561">
+           <entry><constant>V4L2_PIX_FMT_SPCA561</constant></entry>
+           <entry>'S561'</entry>
+           <entry>Compressed GBRG Bayer format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SGRBG10">
+           <entry><constant>V4L2_PIX_FMT_SGRBG10</constant></entry>
+           <entry>'DA10'</entry>
+           <entry>10 bit raw Bayer, expanded to 16 bits.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SGRBG10DPCM8">
+           <entry><constant>V4L2_PIX_FMT_SGRBG10DPCM8</constant></entry>
+           <entry>'DB10'</entry>
+           <entry>10 bit raw Bayer DPCM compressed to 8 bits.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-PAC207">
+           <entry><constant>V4L2_PIX_FMT_PAC207</constant></entry>
+           <entry>'P207'</entry>
+           <entry>Compressed BGGR Bayer format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-MR97310A">
+           <entry><constant>V4L2_PIX_FMT_MR97310A</constant></entry>
+           <entry>'M310'</entry>
+           <entry>Compressed BGGR Bayer format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-OV511">
+           <entry><constant>V4L2_PIX_FMT_OV511</constant></entry>
+           <entry>'O511'</entry>
+           <entry>OV511 JPEG format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-OV518">
+           <entry><constant>V4L2_PIX_FMT_OV518</constant></entry>
+           <entry>'O518'</entry>
+           <entry>OV518 JPEG format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-PJPG">
+           <entry><constant>V4L2_PIX_FMT_PJPG</constant></entry>
+           <entry>'PJPG'</entry>
+           <entry>Pixart 73xx JPEG format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SQ905C">
+           <entry><constant>V4L2_PIX_FMT_SQ905C</constant></entry>
+           <entry>'905C'</entry>
+           <entry>Compressed RGGB bayer format used by the gspca driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-MJPEG">
+           <entry><constant>V4L2_PIX_FMT_MJPEG</constant></entry>
+           <entry>'MJPG'</entry>
+           <entry>Compressed format used by the Zoran driver</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-PWC1">
+           <entry><constant>V4L2_PIX_FMT_PWC1</constant></entry>
+           <entry>'PWC1'</entry>
+           <entry>Compressed format of the PWC driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-PWC2">
+           <entry><constant>V4L2_PIX_FMT_PWC2</constant></entry>
+           <entry>'PWC2'</entry>
+           <entry>Compressed format of the PWC driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SN9C10X">
+           <entry><constant>V4L2_PIX_FMT_SN9C10X</constant></entry>
+           <entry>'S910'</entry>
+           <entry>Compressed format of the SN9C102 driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-SN9C20X-I420">
+           <entry><constant>V4L2_PIX_FMT_SN9C20X_I420</constant></entry>
+           <entry>'S920'</entry>
+           <entry>YUV 4:2:0 format of the gspca sn9c20x driver.</entry>
+         </row>
+         <row id="V4L2-PIX-FMT-WNVA">
+           <entry><constant>V4L2_PIX_FMT_WNVA</constant></entry>
+           <entry>'WNVA'</entry>
+           <entry><para>Used by the Winnov Videum driver, <ulink
+url="http://www.thedirks.org/winnov/">
+http://www.thedirks.org/winnov/</ulink></para></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-TM6000">
+           <entry><constant>V4L2_PIX_FMT_TM6000</constant></entry>
+           <entry>'TM60'</entry>
+           <entry><para>Used by Trident tm6000</para></entry>
+         </row>
+         <row id="V4L2-PIX-FMT-YYUV">
+           <entry><constant>V4L2_PIX_FMT_YYUV</constant></entry>
+           <entry>'YYUV'</entry>
+           <entry>unknown</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+  -->
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml
new file mode 100644 (file)
index 0000000..73f5eab
--- /dev/null
@@ -0,0 +1,175 @@
+<title>Remote Controllers</title>
+<section id="Remote_controllers_Intro">
+<title>Introduction</title>
+
+<para>Currently, most analog and digital devices have a Infrared input for remote controllers. Each
+manufacturer has their own type of control. It is not rare for the same manufacturer to ship different
+types of controls, depending on the device.</para>
+<para>Unfortunately, for several years, there was no effort to create uniform IR keycodes for
+different devices.  This caused the same IR keyname to be mapped completely differently on
+different IR devices. This resulted that the same IR keyname to be mapped completely different on
+different IR's. Due to that, V4L2 API now specifies a standard for mapping Media keys on IR.</para>
+<para>This standard should be used by both V4L/DVB drivers and userspace applications</para>
+<para>The modules register the remote as keyboard within the linux input layer. This means that the IR key strokes will look like normal keyboard key strokes (if CONFIG_INPUT_KEYBOARD is enabled). Using the event devices (CONFIG_INPUT_EVDEV) it is possible for applications to access the remote via /dev/input/event devices.</para>
+
+<table pgwide="1" frame="none" id="rc_standard_keymap">
+<title>IR default keymapping</title>
+<tgroup cols="3">
+&cs-str;
+<tbody valign="top">
+<row>
+<entry>Key code</entry>
+<entry>Meaning</entry>
+<entry>Key examples on IR</entry>
+</row>
+
+<row><entry><emphasis role="bold">Numeric keys</emphasis></entry></row>
+
+<row><entry><constant>KEY_0</constant></entry><entry>Keyboard digit 0</entry><entry>0</entry></row>
+<row><entry><constant>KEY_1</constant></entry><entry>Keyboard digit 1</entry><entry>1</entry></row>
+<row><entry><constant>KEY_2</constant></entry><entry>Keyboard digit 2</entry><entry>2</entry></row>
+<row><entry><constant>KEY_3</constant></entry><entry>Keyboard digit 3</entry><entry>3</entry></row>
+<row><entry><constant>KEY_4</constant></entry><entry>Keyboard digit 4</entry><entry>4</entry></row>
+<row><entry><constant>KEY_5</constant></entry><entry>Keyboard digit 5</entry><entry>5</entry></row>
+<row><entry><constant>KEY_6</constant></entry><entry>Keyboard digit 6</entry><entry>6</entry></row>
+<row><entry><constant>KEY_7</constant></entry><entry>Keyboard digit 7</entry><entry>7</entry></row>
+<row><entry><constant>KEY_8</constant></entry><entry>Keyboard digit 8</entry><entry>8</entry></row>
+<row><entry><constant>KEY_9</constant></entry><entry>Keyboard digit 9</entry><entry>9</entry></row>
+
+<row><entry><emphasis role="bold">Movie play control</emphasis></entry></row>
+
+<row><entry><constant>KEY_FORWARD</constant></entry><entry>Instantly advance in time</entry><entry>&gt;&gt; / FORWARD</entry></row>
+<row><entry><constant>KEY_BACK</constant></entry><entry>Instantly go back in time</entry><entry>&lt;&lt;&lt; / BACK</entry></row>
+<row><entry><constant>KEY_FASTFORWARD</constant></entry><entry>Play movie faster</entry><entry>&gt;&gt;&gt; / FORWARD</entry></row>
+<row><entry><constant>KEY_REWIND</constant></entry><entry>Play movie back</entry><entry>REWIND / BACKWARD</entry></row>
+<row><entry><constant>KEY_NEXT</constant></entry><entry>Select next chapter / sub-chapter / interval</entry><entry>NEXT / SKIP</entry></row>
+<row><entry><constant>KEY_PREVIOUS</constant></entry><entry>Select previous chapter / sub-chapter / interval</entry><entry>&lt;&lt; /  PREV / PREVIOUS</entry></row>
+<row><entry><constant>KEY_AGAIN</constant></entry><entry>Repeat the video or a video interval</entry><entry>REPEAT / LOOP / RECALL</entry></row>
+<row><entry><constant>KEY_PAUSE</constant></entry><entry>Pause sroweam</entry><entry>PAUSE / FREEZE</entry></row>
+<row><entry><constant>KEY_PLAY</constant></entry><entry>Play movie at the normal timeshift</entry><entry>NORMAL TIMESHIFT / LIVE / &gt;</entry></row>
+<row><entry><constant>KEY_PLAYPAUSE</constant></entry><entry>Alternate between play and pause</entry><entry>PLAY / PAUSE</entry></row>
+<row><entry><constant>KEY_STOP</constant></entry><entry>Stop sroweam</entry><entry>STOP</entry></row>
+<row><entry><constant>KEY_RECORD</constant></entry><entry>Start/stop recording sroweam</entry><entry>CAPTURE / REC / RECORD/PAUSE</entry></row>
+<row><entry><constant>KEY_CAMERA</constant></entry><entry>Take a picture of the image</entry><entry>CAMERA ICON / CAPTURE / SNAPSHOT</entry></row>
+<row><entry><constant>KEY_SHUFFLE</constant></entry><entry>Enable shuffle mode</entry><entry>SHUFFLE</entry></row>
+<row><entry><constant>KEY_TIME</constant></entry><entry>Activate time shift mode</entry><entry>TIME SHIFT</entry></row>
+<row><entry><constant>KEY_TITLE</constant></entry><entry>Allow changing the chapter</entry><entry>CHAPTER</entry></row>
+<row><entry><constant>KEY_SUBTITLE</constant></entry><entry>Allow changing the subtitle</entry><entry>SUBTITLE</entry></row>
+
+<row><entry><emphasis role="bold">Image control</emphasis></entry></row>
+
+<row><entry><constant>KEY_BRIGHTNESSDOWN</constant></entry><entry>Decrease Brightness</entry><entry>BRIGHTNESS DECREASE</entry></row>
+<row><entry><constant>KEY_BRIGHTNESSUP</constant></entry><entry>Increase Brightness</entry><entry>BRIGHTNESS INCREASE</entry></row>
+
+<row><entry><constant>KEY_ANGLE</constant></entry><entry>Switch video camera angle (on videos with more than one angle stored)</entry><entry>ANGLE / SWAP</entry></row>
+<row><entry><constant>KEY_EPG</constant></entry><entry>Open the Elecrowonic Play Guide (EPG)</entry><entry>EPG / GUIDE</entry></row>
+<row><entry><constant>KEY_TEXT</constant></entry><entry>Activate/change closed caption mode</entry><entry>CLOSED CAPTION/TELETEXT / DVD TEXT / TELETEXT / TTX</entry></row>
+
+<row><entry><emphasis role="bold">Audio control</emphasis></entry></row>
+
+<row><entry><constant>KEY_AUDIO</constant></entry><entry>Change audio source</entry><entry>AUDIO SOURCE / AUDIO / MUSIC</entry></row>
+<row><entry><constant>KEY_MUTE</constant></entry><entry>Mute/unmute audio</entry><entry>MUTE / DEMUTE / UNMUTE</entry></row>
+<row><entry><constant>KEY_VOLUMEDOWN</constant></entry><entry>Decrease volume</entry><entry>VOLUME- / VOLUME DOWN</entry></row>
+<row><entry><constant>KEY_VOLUMEUP</constant></entry><entry>Increase volume</entry><entry>VOLUME+ / VOLUME UP</entry></row>
+<row><entry><constant>KEY_MODE</constant></entry><entry>Change sound mode</entry><entry>MONO/STEREO</entry></row>
+<row><entry><constant>KEY_LANGUAGE</constant></entry><entry>Select Language</entry><entry>1ST / 2ND LANGUAGE / DVD LANG / MTS/SAP / MTS SEL</entry></row>
+
+<row><entry><emphasis role="bold">Channel control</emphasis></entry></row>
+
+<row><entry><constant>KEY_CHANNEL</constant></entry><entry>Go to the next favorite channel</entry><entry>ALT / CHANNEL / CH SURFING / SURF / FAV</entry></row>
+<row><entry><constant>KEY_CHANNELDOWN</constant></entry><entry>Decrease channel sequencially</entry><entry>CHANNEL - / CHANNEL DOWN / DOWN</entry></row>
+<row><entry><constant>KEY_CHANNELUP</constant></entry><entry>Increase channel sequencially</entry><entry>CHANNEL + / CHANNEL UP / UP</entry></row>
+<row><entry><constant>KEY_DIGITS</constant></entry><entry>Use more than one digit for channel</entry><entry>PLUS / 100/ 1xx / xxx /  -/--  / Single Double Triple Digit</entry></row>
+<row><entry><constant>KEY_SEARCH</constant></entry><entry>Start channel autoscan</entry><entry>SCAN / AUTOSCAN</entry></row>
+
+<row><entry><emphasis role="bold">Colored keys</emphasis></entry></row>
+
+<row><entry><constant>KEY_BLUE</constant></entry><entry>IR Blue key</entry><entry>BLUE</entry></row>
+<row><entry><constant>KEY_GREEN</constant></entry><entry>IR Green Key</entry><entry>GREEN</entry></row>
+<row><entry><constant>KEY_RED</constant></entry><entry>IR Red key</entry><entry>RED</entry></row>
+<row><entry><constant>KEY_YELLOW</constant></entry><entry>IR Yellow key</entry><entry> YELLOW</entry></row>
+
+<row><entry><emphasis role="bold">Media selection</emphasis></entry></row>
+
+<row><entry><constant>KEY_CD</constant></entry><entry>Change input source to Compact Disc</entry><entry>CD</entry></row>
+<row><entry><constant>KEY_DVD</constant></entry><entry>Change input to DVD</entry><entry>DVD / DVD MENU</entry></row>
+<row><entry><constant>KEY_EJECTCLOSECD</constant></entry><entry>Open/close the CD/DVD player</entry><entry>-&gt; ) / CLOSE / OPEN</entry></row>
+
+<row><entry><constant>KEY_MEDIA</constant></entry><entry>Turn on/off Media application</entry><entry>PC/TV /  TURN ON/OFF APP</entry></row>
+<row><entry><constant>KEY_PC</constant></entry><entry>Selects from TV to PC</entry><entry>PC</entry></row>
+<row><entry><constant>KEY_RADIO</constant></entry><entry>Put into AM/FM radio mode</entry><entry>RADIO / TV/FM / TV/RADIO / FM / FM/RADIO</entry></row>
+<row><entry><constant>KEY_TV</constant></entry><entry>Select tv mode</entry><entry>TV / LIVE TV</entry></row>
+<row><entry><constant>KEY_TV2</constant></entry><entry>Select Cable mode</entry><entry>AIR/CBL</entry></row>
+<row><entry><constant>KEY_VCR</constant></entry><entry>Select VCR mode</entry><entry>VCR MODE / DTR</entry></row>
+<row><entry><constant>KEY_VIDEO</constant></entry><entry>Alternate between input modes</entry><entry>SOURCE / SELECT / DISPLAY / SWITCH INPUTS / VIDEO</entry></row>
+
+<row><entry><emphasis role="bold">Power control</emphasis></entry></row>
+
+<row><entry><constant>KEY_POWER</constant></entry><entry>Turn on/off computer</entry><entry>SYSTEM POWER / COMPUTER POWER</entry></row>
+<row><entry><constant>KEY_POWER2</constant></entry><entry>Turn on/off application</entry><entry>TV ON/OFF / POWER</entry></row>
+<row><entry><constant>KEY_SLEEP</constant></entry><entry>Activate sleep timer</entry><entry>SLEEP / SLEEP TIMER</entry></row>
+<row><entry><constant>KEY_SUSPEND</constant></entry><entry>Put computer into suspend mode</entry><entry>STANDBY / SUSPEND</entry></row>
+
+<row><entry><emphasis role="bold">Window control</emphasis></entry></row>
+
+<row><entry><constant>KEY_CLEAR</constant></entry><entry>Stop sroweam and return to default input video/audio</entry><entry>CLEAR / RESET / BOSS KEY</entry></row>
+<row><entry><constant>KEY_CYCLEWINDOWS</constant></entry><entry>Minimize windows and move to the next one</entry><entry>ALT-TAB / MINIMIZE / DESKTOP</entry></row>
+<row><entry><constant>KEY_FAVORITES</constant></entry><entry>Open the favorites sroweam window</entry><entry>TV WALL / Favorites</entry></row>
+<row><entry><constant>KEY_MENU</constant></entry><entry>Call application menu</entry><entry>2ND CONTROLS (USA: MENU) / DVD/MENU / SHOW/HIDE CTRL</entry></row>
+<row><entry><constant>KEY_NEW</constant></entry><entry>Open/Close Picture in Picture</entry><entry>PIP</entry></row>
+<row><entry><constant>KEY_OK</constant></entry><entry>Send a confirmation code to application</entry><entry>OK / ENTER / RETURN</entry></row>
+<row><entry><constant>KEY_SCREEN</constant></entry><entry>Select screen aspect ratio</entry><entry>4:3 16:9 SELECT</entry></row>
+<row><entry><constant>KEY_ZOOM</constant></entry><entry>Put device into zoom/full screen mode</entry><entry>ZOOM / FULL SCREEN / ZOOM+ / HIDE PANNEL / SWITCH</entry></row>
+
+<row><entry><emphasis role="bold">Navigation keys</emphasis></entry></row>
+
+<row><entry><constant>KEY_ESC</constant></entry><entry>Cancel current operation</entry><entry>CANCEL / BACK</entry></row>
+<row><entry><constant>KEY_HELP</constant></entry><entry>Open a Help window</entry><entry>HELP</entry></row>
+<row><entry><constant>KEY_HOMEPAGE</constant></entry><entry>Navigate to Homepage</entry><entry>HOME</entry></row>
+<row><entry><constant>KEY_INFO</constant></entry><entry>Open On Screen Display</entry><entry>DISPLAY INFORMATION / OSD</entry></row>
+<row><entry><constant>KEY_WWW</constant></entry><entry>Open the default browser</entry><entry>WEB</entry></row>
+<row><entry><constant>KEY_UP</constant></entry><entry>Up key</entry><entry>UP</entry></row>
+<row><entry><constant>KEY_DOWN</constant></entry><entry>Down key</entry><entry>DOWN</entry></row>
+<row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row>
+<row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row>
+
+<row><entry><emphasis role="bold">Miscelaneous keys</emphasis></entry></row>
+
+<row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row>
+<row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row>
+
+</tbody>
+</tgroup>
+</table>
+
+<para>It should be noticed that, sometimes, there some fundamental missing keys at some cheaper IR's. Due to that, it is recommended to:</para>
+
+<table pgwide="1" frame="none" id="rc_keymap_notes">
+<title>Notes</title>
+<tgroup cols="1">
+&cs-str;
+<tbody valign="top">
+<row>
+<entry>On simpler IR's, without separate channel keys, you need to map UP as <constant>KEY_CHANNELUP</constant></entry>
+</row><row>
+<entry>On simpler IR's, without separate channel keys, you need to map DOWN as <constant>KEY_CHANNELDOWN</constant></entry>
+</row><row>
+<entry>On simpler IR's, without separate volume keys, you need to map LEFT as <constant>KEY_VOLUMEDOWN</constant></entry>
+</row><row>
+<entry>On simpler IR's, without separate volume keys, you need to map RIGHT as <constant>KEY_VOLUMEUP</constant></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+</section>
+
+<section id="Remote_controllers_table_change">
+<title>Changing default Remote Controller mappings</title>
+<para>The event interface provides two ioctls to be used against
+the /dev/input/event device, to allow changing the default
+keymapping.</para>
+
+<para>This program demonstrates how to replace the keymap tables.</para>
+&sub-keytable-c;
+</section>
diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
new file mode 100644 (file)
index 0000000..937b415
--- /dev/null
@@ -0,0 +1,479 @@
+ <partinfo>
+    <authorgroup>
+      <author>
+       <firstname>Michael</firstname>
+       <surname>Schimek</surname>
+       <othername role="mi">H</othername>
+       <affiliation>
+         <address>
+           <email>mschimek@gmx.at</email>
+         </address>
+       </affiliation>
+      </author>
+
+      <author>
+       <firstname>Bill</firstname>
+       <surname>Dirks</surname>
+       <!-- Commented until Bill opts in to be spammed.
+       <affiliation>
+         <address>
+           <email>bill@thedirks.org</email>
+         </address>
+       </affiliation> -->
+       <contrib>Original author of the V4L2 API and
+documentation.</contrib>
+      </author>
+
+      <author>
+       <firstname>Hans</firstname>
+       <surname>Verkuil</surname>
+       <contrib>Designed and documented the VIDIOC_LOG_STATUS ioctl,
+the extended control ioctls and major parts of the sliced VBI
+API.</contrib>
+       <affiliation>
+         <address>
+           <email>hverkuil@xs4all.nl</email>
+         </address>
+       </affiliation>
+      </author>
+
+      <author>
+       <firstname>Martin</firstname>
+       <surname>Rubli</surname>
+       <!--
+       <affiliation>
+         <address>
+           <email>martin_rubli@logitech.com</email>
+         </address>
+       </affiliation> -->
+       <contrib>Designed and documented the VIDIOC_ENUM_FRAMESIZES
+and VIDIOC_ENUM_FRAMEINTERVALS ioctls.</contrib>
+      </author>
+
+      <author>
+       <firstname>Andy</firstname>
+       <surname>Walls</surname>
+       <contrib>Documented the fielded V4L2_MPEG_STREAM_VBI_FMT_IVTV
+MPEG stream embedded, sliced VBI data format in this specification.
+</contrib>
+       <affiliation>
+         <address>
+           <email>awalls@radix.net</email>
+         </address>
+       </affiliation>
+      </author>
+
+      <author>
+       <firstname>Mauro</firstname>
+       <surname>Carvalho Chehab</surname>
+       <contrib>Documented libv4l, designed and added v4l2grab example,
+Remote Controller chapter.</contrib>
+       <affiliation>
+         <address>
+           <email>mchehab@redhat.com</email>
+         </address>
+       </affiliation>
+      </author>
+    </authorgroup>
+
+    <copyright>
+      <year>1999</year>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
+      <year>2004</year>
+      <year>2005</year>
+      <year>2006</year>
+      <year>2007</year>
+      <year>2008</year>
+      <year>2009</year>
+      <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
+Rubli, Andy Walls, Mauro Carvalho Chehab</holder>
+    </copyright>
+    <legalnotice>
+    <para>Except when explicitly stated as GPL, programming examples within
+           this part can be used and distributed without restrictions.</para>
+    </legalnotice>
+    <revhistory>
+      <!-- Put document revisions here, newest first. -->
+      <!-- API revisions (changes and additions of defines, enums,
+structs, ioctls) must be noted in more detail in the history chapter
+(compat.sgml), along with the possible impact on existing drivers and
+applications. -->
+
+      <revision>
+       <revnumber>2.6.32</revnumber>
+       <date>2009-08-31</date>
+       <authorinitials>mcc</authorinitials>
+       <revremark>Now, revisions will match the kernel version where
+the V4L2 API changes will be used by the Linux Kernel.
+Also added Remote Controller chapter.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.29</revnumber>
+       <date>2009-08-26</date>
+       <authorinitials>ev</authorinitials>
+       <revremark>Added documentation for string controls and for FM Transmitter controls.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.28</revnumber>
+       <date>2009-08-26</date>
+       <authorinitials>gl</authorinitials>
+       <revremark>Added V4L2_CID_BAND_STOP_FILTER documentation.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.27</revnumber>
+       <date>2009-08-15</date>
+       <authorinitials>mcc</authorinitials>
+       <revremark>Added libv4l and Remote Controller documentation;
+added v4l2grab and keytable application examples.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.26</revnumber>
+       <date>2009-07-23</date>
+       <authorinitials>hv</authorinitials>
+       <revremark>Finalized the RDS capture API. Added modulator and RDS encoder
+capabilities. Added support for string controls.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.25</revnumber>
+       <date>2009-01-18</date>
+       <authorinitials>hv</authorinitials>
+       <revremark>Added pixel formats VYUY, NV16 and NV61, and changed
+the debug ioctls VIDIOC_DBG_G/S_REGISTER and VIDIOC_DBG_G_CHIP_IDENT.
+Added camera controls V4L2_CID_ZOOM_ABSOLUTE, V4L2_CID_ZOOM_RELATIVE,
+V4L2_CID_ZOOM_CONTINUOUS and V4L2_CID_PRIVACY.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.24</revnumber>
+       <date>2008-03-04</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Added pixel formats Y16 and SBGGR16, new controls
+and a camera controls class. Removed VIDIOC_G/S_MPEGCOMP.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.23</revnumber>
+       <date>2007-08-30</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Fixed a typo in VIDIOC_DBG_G/S_REGISTER.
+Clarified the byte order of packed pixel formats.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.22</revnumber>
+       <date>2007-08-29</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Added the Video Output Overlay interface, new MPEG
+controls, V4L2_FIELD_INTERLACED_TB and V4L2_FIELD_INTERLACED_BT,
+VIDIOC_DBG_G/S_REGISTER, VIDIOC_(TRY_)ENCODER_CMD,
+VIDIOC_G_CHIP_IDENT, VIDIOC_G_ENC_INDEX, new pixel formats.
+Clarifications in the cropping chapter, about RGB pixel formats, the
+mmap(), poll(), select(), read() and write() functions. Typographical
+fixes.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.21</revnumber>
+       <date>2006-12-19</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Fixed a link in the VIDIOC_G_EXT_CTRLS section.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.20</revnumber>
+       <date>2006-11-24</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Clarified the purpose of the audioset field in
+struct v4l2_input and v4l2_output.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.19</revnumber>
+       <date>2006-10-19</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Documented V4L2_PIX_FMT_RGB444.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.18</revnumber>
+       <date>2006-10-18</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Added the description of extended controls by Hans
+Verkuil. Linked V4L2_PIX_FMT_MPEG to V4L2_CID_MPEG_STREAM_TYPE.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.17</revnumber>
+       <date>2006-10-12</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Corrected V4L2_PIX_FMT_HM12 description.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.16</revnumber>
+       <date>2006-10-08</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>VIDIOC_ENUM_FRAMESIZES and
+VIDIOC_ENUM_FRAMEINTERVALS are now part of the API.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.15</revnumber>
+       <date>2006-09-23</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Cleaned up the bibliography, added BT.653 and
+BT.1119. capture.c/start_capturing() for user pointer I/O did not
+initialize the buffer index. Documented the V4L MPEG and MJPEG
+VID_TYPEs and V4L2_PIX_FMT_SBGGR8. Updated the list of reserved pixel
+formats. See the history chapter for API changes.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.14</revnumber>
+       <date>2006-09-14</date>
+       <authorinitials>mr</authorinitials>
+       <revremark>Added VIDIOC_ENUM_FRAMESIZES and
+VIDIOC_ENUM_FRAMEINTERVALS proposal for frame format enumeration of
+digital devices.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.13</revnumber>
+       <date>2006-04-07</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Corrected the description of struct v4l2_window
+clips. New V4L2_STD_ and V4L2_TUNER_MODE_LANG1_LANG2
+defines.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.12</revnumber>
+       <date>2006-02-03</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Corrected the description of struct
+v4l2_captureparm and v4l2_outputparm.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.11</revnumber>
+       <date>2006-01-27</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Improved the description of struct
+v4l2_tuner.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.10</revnumber>
+       <date>2006-01-10</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>VIDIOC_G_INPUT and VIDIOC_S_PARM
+clarifications.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.9</revnumber>
+       <date>2005-11-27</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Improved the 525 line numbering diagram. Hans
+Verkuil and I rewrote the sliced VBI section. He also contributed a
+VIDIOC_LOG_STATUS page. Fixed VIDIOC_S_STD call in the video standard
+selection example. Various updates.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.8</revnumber>
+       <date>2004-10-04</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Somehow a piece of junk slipped into the capture
+example, removed.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.7</revnumber>
+       <date>2004-09-19</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Fixed video standard selection, control
+enumeration, downscaling and aspect example. Added read and user
+pointer i/o to video capture example.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.6</revnumber>
+       <date>2004-08-01</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>v4l2_buffer changes, added video capture example,
+various corrections.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.5</revnumber>
+       <date>2003-11-05</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Pixel format erratum.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.4</revnumber>
+       <date>2003-09-17</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Corrected source and Makefile to generate a PDF.
+SGML fixes. Added latest API changes. Closed gaps in the history
+chapter.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.3</revnumber>
+       <date>2003-02-05</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Another draft, more corrections.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.2</revnumber>
+       <date>2003-01-15</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>Second draft, with corrections pointed out by Gerd
+Knorr.</revremark>
+      </revision>
+
+      <revision>
+       <revnumber>0.1</revnumber>
+       <date>2002-12-01</date>
+       <authorinitials>mhs</authorinitials>
+       <revremark>First draft, based on documentation by Bill Dirks
+and discussions on the V4L mailing list.</revremark>
+      </revision>
+    </revhistory>
+</partinfo>
+
+<title>Video for Linux Two API Specification</title>
+ <subtitle>Revision 2.6.32</subtitle>
+
+  <chapter id="common">
+    &sub-common;
+  </chapter>
+
+  <chapter id="pixfmt">
+    &sub-pixfmt;
+  </chapter>
+
+  <chapter id="io">
+    &sub-io;
+  </chapter>
+
+  <chapter id="devices">
+    <title>Interfaces</title>
+
+    <section id="capture"> &sub-dev-capture; </section>
+    <section id="overlay"> &sub-dev-overlay; </section>
+    <section id="output"> &sub-dev-output; </section>
+    <section id="osd"> &sub-dev-osd; </section>
+    <section id="codec"> &sub-dev-codec; </section>
+    <section id="effect"> &sub-dev-effect; </section>
+    <section id="raw-vbi"> &sub-dev-raw-vbi; </section>
+    <section id="sliced"> &sub-dev-sliced-vbi; </section>
+    <section id="ttx"> &sub-dev-teletext; </section>
+    <section id="radio"> &sub-dev-radio; </section>
+    <section id="rds"> &sub-dev-rds; </section>
+  </chapter>
+
+  <chapter id="driver">
+         &sub-driver;
+  </chapter>
+
+  <chapter id="libv4l">
+         &sub-libv4l;
+  </chapter>
+
+  <chapter id="compat">
+         &sub-compat;
+  </chapter>
+
+  <appendix id="user-func">
+  <title>Function Reference</title>
+
+    <!-- Keep this alphabetically sorted. -->
+
+    &sub-close;
+    &sub-ioctl;
+    <!-- All ioctls go here. -->
+    &sub-cropcap;
+    &sub-dbg-g-chip-ident;
+    &sub-dbg-g-register;
+    &sub-encoder-cmd;
+    &sub-enumaudio;
+    &sub-enumaudioout;
+    &sub-enum-fmt;
+    &sub-enum-framesizes;
+    &sub-enum-frameintervals;
+    &sub-enuminput;
+    &sub-enumoutput;
+    &sub-enumstd;
+    &sub-g-audio;
+    &sub-g-audioout;
+    &sub-g-crop;
+    &sub-g-ctrl;
+    &sub-g-enc-index;
+    &sub-g-ext-ctrls;
+    &sub-g-fbuf;
+    &sub-g-fmt;
+    &sub-g-frequency;
+    &sub-g-input;
+    &sub-g-jpegcomp;
+    &sub-g-modulator;
+    &sub-g-output;
+    &sub-g-parm;
+    &sub-g-priority;
+    &sub-g-sliced-vbi-cap;
+    &sub-g-std;
+    &sub-g-tuner;
+    &sub-log-status;
+    &sub-overlay;
+    &sub-qbuf;
+    &sub-querybuf;
+    &sub-querycap;
+    &sub-queryctrl;
+    &sub-querystd;
+    &sub-reqbufs;
+    &sub-s-hw-freq-seek;
+    &sub-streamon;
+    <!-- End of ioctls. -->
+    &sub-mmap;
+    &sub-munmap;
+    &sub-open;
+    &sub-poll;
+    &sub-read;
+    &sub-select;
+    &sub-write;
+  </appendix>
+
+  <appendix id="videodev">
+    <title>Video For Linux Two Header File</title>
+    &sub-videodev2-h;
+  </appendix>
+
+  <appendix id="capture-example">
+    <title>Video Capture Example</title>
+    &sub-capture-c;
+  </appendix>
+
+  <appendix id="v4l2grab-example">
+    <title>Video Grabber example using libv4l</title>
+    <para>This program demonstrates how to grab V4L2 images in ppm format by
+using libv4l handlers. The advantage is that this grabber can potentially work
+with any V4L2 driver.</para>
+    &sub-v4l2grab-c;
+  </appendix>
+
+  &sub-media-indices;
+
+  &sub-biblio;
+
diff --git a/Documentation/DocBook/v4l/v4l2grab.c.xml b/Documentation/DocBook/v4l/v4l2grab.c.xml
new file mode 100644 (file)
index 0000000..bed12e4
--- /dev/null
@@ -0,0 +1,164 @@
+<programlisting>
+/* V4L2 video picture grabber
+   Copyright (C) 2009 Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ */
+
+#include &lt;stdio.h&gt;
+#include &lt;stdlib.h&gt;
+#include &lt;string.h&gt;
+#include &lt;fcntl.h&gt;
+#include &lt;errno.h&gt;
+#include &lt;sys/ioctl.h&gt;
+#include &lt;sys/types.h&gt;
+#include &lt;sys/time.h&gt;
+#include &lt;sys/mman.h&gt;
+#include &lt;linux/videodev2.h&gt;
+#include "../libv4l/include/libv4l2.h"
+
+#define CLEAR(x) memset(&amp;(x), 0, sizeof(x))
+
+struct buffer {
+        void   *start;
+        size_t length;
+};
+
+static void xioctl(int fh, int request, void *arg)
+{
+        int r;
+
+        do {
+                r = v4l2_ioctl(fh, request, arg);
+        } while (r == -1 &amp;&amp; ((errno == EINTR) || (errno == EAGAIN)));
+
+        if (r == -1) {
+                fprintf(stderr, "error %d, %s\n", errno, strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+}
+
+int main(int argc, char **argv)
+{
+        struct <link linkend="v4l2-format">v4l2_format</link>              fmt;
+        struct <link linkend="v4l2-buffer">v4l2_buffer</link>              buf;
+        struct <link linkend="v4l2-requestbuffers">v4l2_requestbuffers</link>      req;
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>              type;
+        fd_set                          fds;
+        struct timeval                  tv;
+        int                             r, fd = -1;
+        unsigned int                    i, n_buffers;
+        char                            *dev_name = "/dev/video0";
+        char                            out_name[256];
+        FILE                            *fout;
+        struct buffer                   *buffers;
+
+        fd = v4l2_open(dev_name, O_RDWR | O_NONBLOCK, 0);
+        if (fd &lt; 0) {
+                perror("Cannot open device");
+                exit(EXIT_FAILURE);
+        }
+
+        CLEAR(fmt);
+        fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        fmt.fmt.pix.width       = 640;
+        fmt.fmt.pix.height      = 480;
+        fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24;
+        fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
+        xioctl(fd, VIDIOC_S_FMT, &amp;fmt);
+        if (fmt.fmt.pix.pixelformat != V4L2_PIX_FMT_RGB24) {
+                printf("Libv4l didn't accept RGB24 format. Can't proceed.\n");
+                exit(EXIT_FAILURE);
+        }
+        if ((fmt.fmt.pix.width != 640) || (fmt.fmt.pix.height != 480))
+                printf("Warning: driver is sending image at %dx%d\n",
+                        fmt.fmt.pix.width, fmt.fmt.pix.height);
+
+        CLEAR(req);
+        req.count = 2;
+        req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        req.memory = V4L2_MEMORY_MMAP;
+        xioctl(fd, VIDIOC_REQBUFS, &amp;req);
+
+        buffers = calloc(req.count, sizeof(*buffers));
+        for (n_buffers = 0; n_buffers &lt; req.count; ++n_buffers) {
+                CLEAR(buf);
+
+                buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory      = V4L2_MEMORY_MMAP;
+                buf.index       = n_buffers;
+
+                xioctl(fd, VIDIOC_QUERYBUF, &amp;buf);
+
+                buffers[n_buffers].length = buf.length;
+                buffers[n_buffers].start = v4l2_mmap(NULL, buf.length,
+                              PROT_READ | PROT_WRITE, MAP_SHARED,
+                              fd, buf.m.offset);
+
+                if (MAP_FAILED == buffers[n_buffers].start) {
+                        perror("mmap");
+                        exit(EXIT_FAILURE);
+                }
+        }
+
+        for (i = 0; i &lt; n_buffers; ++i) {
+                CLEAR(buf);
+                buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory = V4L2_MEMORY_MMAP;
+                buf.index = i;
+                xioctl(fd, VIDIOC_QBUF, &amp;buf);
+        }
+        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        xioctl(fd, VIDIOC_STREAMON, &amp;type);
+        for (i = 0; i &lt; 20; i++) {
+                do {
+                        FD_ZERO(&amp;fds);
+                        FD_SET(fd, &amp;fds);
+
+                        /* Timeout. */
+                        tv.tv_sec = 2;
+                        tv.tv_usec = 0;
+
+                        r = select(fd + 1, &amp;fds, NULL, NULL, &amp;tv);
+                } while ((r == -1 &amp;&amp; (errno = EINTR)));
+                if (r == -1) {
+                        perror("select");
+                        return errno;
+                }
+
+                CLEAR(buf);
+                buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                buf.memory = V4L2_MEMORY_MMAP;
+                xioctl(fd, VIDIOC_DQBUF, &amp;buf);
+
+                sprintf(out_name, "out%03d.ppm", i);
+                fout = fopen(out_name, "w");
+                if (!fout) {
+                        perror("Cannot open image");
+                        exit(EXIT_FAILURE);
+                }
+                fprintf(fout, "P6\n%d %d 255\n",
+                        fmt.fmt.pix.width, fmt.fmt.pix.height);
+                fwrite(buffers[buf.index].start, buf.bytesused, 1, fout);
+                fclose(fout);
+
+                xioctl(fd, VIDIOC_QBUF, &amp;buf);
+        }
+
+        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        xioctl(fd, VIDIOC_STREAMOFF, &amp;type);
+        for (i = 0; i &lt; n_buffers; ++i)
+                v4l2_munmap(buffers[i].start, buffers[i].length);
+        v4l2_close(fd);
+
+        return 0;
+}
+</programlisting>
diff --git a/Documentation/DocBook/v4l/vbi_525.gif b/Documentation/DocBook/v4l/vbi_525.gif
new file mode 100644 (file)
index 0000000..5580b69
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_525.gif differ
diff --git a/Documentation/DocBook/v4l/vbi_525.pdf b/Documentation/DocBook/v4l/vbi_525.pdf
new file mode 100644 (file)
index 0000000..9e72c25
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_525.pdf differ
diff --git a/Documentation/DocBook/v4l/vbi_625.gif b/Documentation/DocBook/v4l/vbi_625.gif
new file mode 100644 (file)
index 0000000..34e3251
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_625.gif differ
diff --git a/Documentation/DocBook/v4l/vbi_625.pdf b/Documentation/DocBook/v4l/vbi_625.pdf
new file mode 100644 (file)
index 0000000..765235e
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_625.pdf differ
diff --git a/Documentation/DocBook/v4l/vbi_hsync.gif b/Documentation/DocBook/v4l/vbi_hsync.gif
new file mode 100644 (file)
index 0000000..b02434d
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_hsync.gif differ
diff --git a/Documentation/DocBook/v4l/vbi_hsync.pdf b/Documentation/DocBook/v4l/vbi_hsync.pdf
new file mode 100644 (file)
index 0000000..200b668
Binary files /dev/null and b/Documentation/DocBook/v4l/vbi_hsync.pdf differ
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml
new file mode 100644 (file)
index 0000000..9700206
--- /dev/null
@@ -0,0 +1,1640 @@
+<programlisting>
+/*
+ *  Video for Linux Two header file
+ *
+ *  Copyright (C) 1999-2007 the contributors
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *  3. The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ *      See http://linuxtv.org for more info
+ *
+ *      Author: Bill Dirks &lt;bill@thedirks.org&gt;
+ *              Justin Schoeman
+ *              Hans Verkuil &lt;hverkuil@xs4all.nl&gt;
+ *              et al.
+ */
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+
+#ifdef __KERNEL__
+#include &lt;linux/time.h&gt;     /* need struct timeval */
+#else
+#include &lt;sys/time.h&gt;
+#endif
+#include &lt;linux/compiler.h&gt;
+#include &lt;linux/ioctl.h&gt;
+#include &lt;linux/types.h&gt;
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+#define VIDEO_MAX_FRAME               32
+
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
+#define VID_TYPE_CAPTURE        1       /* Can capture */
+#define VID_TYPE_TUNER          2       /* Can tune */
+#define VID_TYPE_TELETEXT       4       /* Does teletext */
+#define VID_TYPE_OVERLAY        8       /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY      16      /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING       32      /* Can clip */
+#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES         128     /* Scalable */
+#define VID_TYPE_MONOCHROME     256     /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER   1024    /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
+#endif
+
+/*
+ *      M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a, b, c, d)\
+        ((__u32)(a) | ((__u32)(b) &lt;&lt; 8) | ((__u32)(c) &lt;&lt; 16) | ((__u32)(d) &lt;&lt; 24))
+
+/*
+ *      E N U M S
+ */
+enum <link linkend="v4l2-field">v4l2_field</link> {
+        V4L2_FIELD_ANY           = 0, /* driver can choose from none,
+                                         top, bottom, interlaced
+                                         depending on whatever it thinks
+                                         is approximate ... */
+        V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
+        V4L2_FIELD_TOP           = 2, /* top field only */
+        V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
+        V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
+        V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
+                                         buffer, top-bottom order */
+        V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
+        V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
+                                         separate buffers */
+        V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
+                                         first and the top field is
+                                         transmitted first */
+        V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
+                                         first and the bottom field is
+                                         transmitted first */
+};
+#define V4L2_FIELD_HAS_TOP(field)       \
+        ((field) == V4L2_FIELD_TOP      ||\
+         (field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB   ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTTOM(field)    \
+        ((field) == V4L2_FIELD_BOTTOM   ||\
+         (field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB   ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTH(field)      \
+        ((field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+
+enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> {
+        V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
+        V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
+        V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
+        V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
+        V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
+        V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
+        V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
+#if 1 /*KEEP*/
+        /* Experimental */
+        V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
+#endif
+        V4L2_BUF_TYPE_PRIVATE              = 0x80,
+};
+
+enum <link linkend="v4l2-ctrl-type">v4l2_ctrl_type</link> {
+        V4L2_CTRL_TYPE_INTEGER       = 1,
+        V4L2_CTRL_TYPE_BOOLEAN       = 2,
+        V4L2_CTRL_TYPE_MENU          = 3,
+        V4L2_CTRL_TYPE_BUTTON        = 4,
+        V4L2_CTRL_TYPE_INTEGER64     = 5,
+        V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
+        V4L2_CTRL_TYPE_STRING        = 7,
+};
+
+enum <link linkend="v4l2-tuner-type">v4l2_tuner_type</link> {
+        V4L2_TUNER_RADIO             = 1,
+        V4L2_TUNER_ANALOG_TV         = 2,
+        V4L2_TUNER_DIGITAL_TV        = 3,
+};
+
+enum <link linkend="v4l2-memory">v4l2_memory</link> {
+        V4L2_MEMORY_MMAP             = 1,
+        V4L2_MEMORY_USERPTR          = 2,
+        V4L2_MEMORY_OVERLAY          = 3,
+};
+
+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
+enum <link linkend="v4l2-colorspace">v4l2_colorspace</link> {
+        /* ITU-R 601 -- broadcast NTSC/PAL */
+        V4L2_COLORSPACE_SMPTE170M     = 1,
+
+        /* 1125-Line (US) HDTV */
+        V4L2_COLORSPACE_SMPTE240M     = 2,
+
+        /* HD and modern captures. */
+        V4L2_COLORSPACE_REC709        = 3,
+
+        /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
+        V4L2_COLORSPACE_BT878         = 4,
+
+        /* These should be useful.  Assume 601 extents. */
+        V4L2_COLORSPACE_470_SYSTEM_M  = 5,
+        V4L2_COLORSPACE_470_SYSTEM_BG = 6,
+
+        /* I know there will be cameras that send this.  So, this is
+         * unspecified chromaticities and full 0-255 on each of the
+         * Y'CbCr components
+         */
+        V4L2_COLORSPACE_JPEG          = 7,
+
+        /* For RGB colourspaces, this is probably a good start. */
+        V4L2_COLORSPACE_SRGB          = 8,
+};
+
+enum <link linkend="v4l2-priority">v4l2_priority</link> {
+        V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
+        V4L2_PRIORITY_BACKGROUND  = 1,
+        V4L2_PRIORITY_INTERACTIVE = 2,
+        V4L2_PRIORITY_RECORD      = 3,
+        V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
+};
+
+struct <link linkend="v4l2-rect">v4l2_rect</link> {
+        __s32   left;
+        __s32   top;
+        __s32   width;
+        __s32   height;
+};
+
+struct <link linkend="v4l2-fract">v4l2_fract</link> {
+        __u32   numerator;
+        __u32   denominator;
+};
+
+/*
+ *      D R I V E R   C A P A B I L I T I E S
+ */
+struct <link linkend="v4l2-capability">v4l2_capability</link> {
+        __u8    driver[16];     /* i.e.ie; "bttv" */
+        __u8    card[32];       /* i.e.ie; "Hauppauge WinTV" */
+        __u8    bus_info[32];   /* "PCI:" + pci_name(pci_dev) */
+        __u32   version;        /* should use KERNEL_VERSION() */
+        __u32   capabilities;   /* Device capabilities */
+        __u32   reserved[4];
+};
+
+/* Values for 'capabilities' field */
+#define V4L2_CAP_VIDEO_CAPTURE          0x00000001  /* Is a video capture device */
+#define V4L2_CAP_VIDEO_OUTPUT           0x00000002  /* Is a video output device */
+#define V4L2_CAP_VIDEO_OVERLAY          0x00000004  /* Can do video overlay */
+#define V4L2_CAP_VBI_CAPTURE            0x00000010  /* Is a raw VBI capture device */
+#define V4L2_CAP_VBI_OUTPUT             0x00000020  /* Is a raw VBI output device */
+#define V4L2_CAP_SLICED_VBI_CAPTURE     0x00000040  /* Is a sliced VBI capture device */
+#define V4L2_CAP_SLICED_VBI_OUTPUT      0x00000080  /* Is a sliced VBI output device */
+#define V4L2_CAP_RDS_CAPTURE            0x00000100  /* RDS data capture */
+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY   0x00000200  /* Can do video output overlay */
+#define V4L2_CAP_HW_FREQ_SEEK           0x00000400  /* Can do hardware frequency seek  */
+#define V4L2_CAP_RDS_OUTPUT             0x00000800  /* Is an RDS encoder */
+
+#define V4L2_CAP_TUNER                  0x00010000  /* has a tuner */
+#define V4L2_CAP_AUDIO                  0x00020000  /* has audio support */
+#define V4L2_CAP_RADIO                  0x00040000  /* is a radio device */
+#define V4L2_CAP_MODULATOR              0x00080000  /* has a modulator */
+
+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
+
+/*
+ *      V I D E O   I M A G E   F O R M A T
+ */
+struct <link linkend="v4l2-pix-format">v4l2_pix_format</link> {
+        __u32                   width;
+        __u32                   height;
+        __u32                   pixelformat;
+        enum <link linkend="v4l2-field">v4l2_field</link>         field;
+        __u32                   bytesperline;   /* for padding, zero if unused */
+        __u32                   sizeimage;
+        enum <link linkend="v4l2-colorspace">v4l2_colorspace</link>    colorspace;
+        __u32                   priv;           /* private data, depends on pixelformat */
+};
+
+/*      Pixel format         FOURCC                          depth  Description  */
+
+/* RGB formats */
+#define <link linkend="V4L2-PIX-FMT-RGB332">V4L2_PIX_FMT_RGB332</link>  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+#define <link linkend="V4L2-PIX-FMT-RGB444">V4L2_PIX_FMT_RGB444</link>  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
+#define <link linkend="V4L2-PIX-FMT-RGB555">V4L2_PIX_FMT_RGB555</link>  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
+#define <link linkend="V4L2-PIX-FMT-RGB565">V4L2_PIX_FMT_RGB565</link>  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
+#define <link linkend="V4L2-PIX-FMT-RGB555X">V4L2_PIX_FMT_RGB555X</link> v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
+#define <link linkend="V4L2-PIX-FMT-RGB565X">V4L2_PIX_FMT_RGB565X</link> v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+#define <link linkend="V4L2-PIX-FMT-BGR24">V4L2_PIX_FMT_BGR24</link>   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
+#define <link linkend="V4L2-PIX-FMT-RGB24">V4L2_PIX_FMT_RGB24</link>   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
+#define <link linkend="V4L2-PIX-FMT-BGR32">V4L2_PIX_FMT_BGR32</link>   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
+#define <link linkend="V4L2-PIX-FMT-RGB32">V4L2_PIX_FMT_RGB32</link>   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+
+/* Grey formats */
+#define <link linkend="V4L2-PIX-FMT-GREY">V4L2_PIX_FMT_GREY</link>    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
+#define <link linkend="V4L2-PIX-FMT-Y16">V4L2_PIX_FMT_Y16</link>     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
+
+/* Palette formats */
+#define <link linkend="V4L2-PIX-FMT-PAL8">V4L2_PIX_FMT_PAL8</link>    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
+
+/* Luminance+Chrominance formats */
+#define <link linkend="V4L2-PIX-FMT-YVU410">V4L2_PIX_FMT_YVU410</link>  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
+#define <link linkend="V4L2-PIX-FMT-YVU420">V4L2_PIX_FMT_YVU420</link>  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
+#define <link linkend="V4L2-PIX-FMT-YUYV">V4L2_PIX_FMT_YUYV</link>    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
+#define <link linkend="V4L2-PIX-FMT-YYUV">V4L2_PIX_FMT_YYUV</link>    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
+#define <link linkend="V4L2-PIX-FMT-YVYU">V4L2_PIX_FMT_YVYU</link>    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
+#define <link linkend="V4L2-PIX-FMT-UYVY">V4L2_PIX_FMT_UYVY</link>    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
+#define <link linkend="V4L2-PIX-FMT-VYUY">V4L2_PIX_FMT_VYUY</link>    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
+#define <link linkend="V4L2-PIX-FMT-YUV422P">V4L2_PIX_FMT_YUV422P</link> v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
+#define <link linkend="V4L2-PIX-FMT-YUV411P">V4L2_PIX_FMT_YUV411P</link> v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
+#define <link linkend="V4L2-PIX-FMT-Y41P">V4L2_PIX_FMT_Y41P</link>    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+#define <link linkend="V4L2-PIX-FMT-YUV444">V4L2_PIX_FMT_YUV444</link>  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
+#define <link linkend="V4L2-PIX-FMT-YUV555">V4L2_PIX_FMT_YUV555</link>  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+#define <link linkend="V4L2-PIX-FMT-YUV565">V4L2_PIX_FMT_YUV565</link>  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define <link linkend="V4L2-PIX-FMT-YUV32">V4L2_PIX_FMT_YUV32</link>   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+#define <link linkend="V4L2-PIX-FMT-YUV410">V4L2_PIX_FMT_YUV410</link>  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
+#define <link linkend="V4L2-PIX-FMT-YUV420">V4L2_PIX_FMT_YUV420</link>  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
+#define <link linkend="V4L2-PIX-FMT-HI240">V4L2_PIX_FMT_HI240</link>   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
+#define <link linkend="V4L2-PIX-FMT-HM12">V4L2_PIX_FMT_HM12</link>    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
+
+/* two planes -- one Y, one Cr + Cb interleaved  */
+#define <link linkend="V4L2-PIX-FMT-NV12">V4L2_PIX_FMT_NV12</link>    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define <link linkend="V4L2-PIX-FMT-NV21">V4L2_PIX_FMT_NV21</link>    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
+#define <link linkend="V4L2-PIX-FMT-NV16">V4L2_PIX_FMT_NV16</link>    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
+#define <link linkend="V4L2-PIX-FMT-NV61">V4L2_PIX_FMT_NV61</link>    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
+
+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
+#define <link linkend="V4L2-PIX-FMT-SBGGR8">V4L2_PIX_FMT_SBGGR8</link>  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+#define <link linkend="V4L2-PIX-FMT-SGBRG8">V4L2_PIX_FMT_SGBRG8</link>  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+#define <link linkend="V4L2-PIX-FMT-SGRBG8">V4L2_PIX_FMT_SGRBG8</link>  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
+#define <link linkend="V4L2-PIX-FMT-SGRBG10">V4L2_PIX_FMT_SGRBG10</link> v4l2_fourcc('B', 'A', '1', '0') /* 10bit raw bayer */
+        /* 10bit raw bayer DPCM compressed to 8 bits */
+#define <link linkend="V4L2-PIX-FMT-SGRBG10DPCM8">V4L2_PIX_FMT_SGRBG10DPCM8</link> v4l2_fourcc('B', 'D', '1', '0')
+        /*
+         * 10bit raw bayer, expanded to 16 bits
+         * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
+         */
+#define <link linkend="V4L2-PIX-FMT-SBGGR16">V4L2_PIX_FMT_SBGGR16</link> v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
+
+/* compressed formats */
+#define <link linkend="V4L2-PIX-FMT-MJPEG">V4L2_PIX_FMT_MJPEG</link>    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
+#define <link linkend="V4L2-PIX-FMT-JPEG">V4L2_PIX_FMT_JPEG</link>     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
+#define <link linkend="V4L2-PIX-FMT-DV">V4L2_PIX_FMT_DV</link>       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
+#define <link linkend="V4L2-PIX-FMT-MPEG">V4L2_PIX_FMT_MPEG</link>     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
+
+/*  Vendor-specific formats   */
+#define <link linkend="V4L2-PIX-FMT-WNVA">V4L2_PIX_FMT_WNVA</link>     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
+#define <link linkend="V4L2-PIX-FMT-SN9C10X">V4L2_PIX_FMT_SN9C10X</link>  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
+#define <link linkend="V4L2-PIX-FMT-SN9C20X-I420">V4L2_PIX_FMT_SN9C20X_I420</link> v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
+#define <link linkend="V4L2-PIX-FMT-PWC1">V4L2_PIX_FMT_PWC1</link>     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+#define <link linkend="V4L2-PIX-FMT-PWC2">V4L2_PIX_FMT_PWC2</link>     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
+#define <link linkend="V4L2-PIX-FMT-ET61X251">V4L2_PIX_FMT_ET61X251</link> v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
+#define <link linkend="V4L2-PIX-FMT-SPCA501">V4L2_PIX_FMT_SPCA501</link>  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
+#define <link linkend="V4L2-PIX-FMT-SPCA505">V4L2_PIX_FMT_SPCA505</link>  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
+#define <link linkend="V4L2-PIX-FMT-SPCA508">V4L2_PIX_FMT_SPCA508</link>  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
+#define <link linkend="V4L2-PIX-FMT-SPCA561">V4L2_PIX_FMT_SPCA561</link>  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
+#define <link linkend="V4L2-PIX-FMT-PAC207">V4L2_PIX_FMT_PAC207</link>   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
+#define <link linkend="V4L2-PIX-FMT-MR97310A">V4L2_PIX_FMT_MR97310A</link> v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
+#define <link linkend="V4L2-PIX-FMT-SQ905C">V4L2_PIX_FMT_SQ905C</link>   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
+#define <link linkend="V4L2-PIX-FMT-PJPG">V4L2_PIX_FMT_PJPG</link>     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
+#define <link linkend="V4L2-PIX-FMT-OV511">V4L2_PIX_FMT_OV511</link>    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
+#define <link linkend="V4L2-PIX-FMT-OV518">V4L2_PIX_FMT_OV518</link>    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
+#define <link linkend="V4L2-PIX-FMT-TM6000">V4L2_PIX_FMT_TM6000</link>   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
+
+/*
+ *      F O R M A T   E N U M E R A T I O N
+ */
+struct <link linkend="v4l2-fmtdesc">v4l2_fmtdesc</link> {
+        __u32               index;             /* Format number      */
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>  type;              /* buffer type        */
+        __u32               flags;
+        __u8                description[32];   /* Description string */
+        __u32               pixelformat;       /* Format fourcc      */
+        __u32               reserved[4];
+};
+
+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+#define V4L2_FMT_FLAG_EMULATED   0x0002
+
+#if 1 /*KEEP*/
+        /* Experimental Frame Size and frame rate enumeration */
+/*
+ *      F R A M E   S I Z E   E N U M E R A T I O N
+ */
+enum <link linkend="v4l2-frmsizetypes">v4l2_frmsizetypes</link> {
+        V4L2_FRMSIZE_TYPE_DISCRETE      = 1,
+        V4L2_FRMSIZE_TYPE_CONTINUOUS    = 2,
+        V4L2_FRMSIZE_TYPE_STEPWISE      = 3,
+};
+
+struct <link linkend="v4l2-frmsize-discrete">v4l2_frmsize_discrete</link> {
+        __u32                   width;          /* Frame width [pixel] */
+        __u32                   height;         /* Frame height [pixel] */
+};
+
+struct <link linkend="v4l2-frmsize-stepwise">v4l2_frmsize_stepwise</link> {
+        __u32                   min_width;      /* Minimum frame width [pixel] */
+        __u32                   max_width;      /* Maximum frame width [pixel] */
+        __u32                   step_width;     /* Frame width step size [pixel] */
+        __u32                   min_height;     /* Minimum frame height [pixel] */
+        __u32                   max_height;     /* Maximum frame height [pixel] */
+        __u32                   step_height;    /* Frame height step size [pixel] */
+};
+
+struct <link linkend="v4l2-frmsizeenum">v4l2_frmsizeenum</link> {
+        __u32                   index;          /* Frame size number */
+        __u32                   pixel_format;   /* Pixel format */
+        __u32                   type;           /* Frame size type the device supports. */
+
+        union {                                 /* Frame size */
+                struct <link linkend="v4l2-frmsize-discrete">v4l2_frmsize_discrete</link>    discrete;
+                struct <link linkend="v4l2-frmsize-stepwise">v4l2_frmsize_stepwise</link>    stepwise;
+        };
+
+        __u32   reserved[2];                    /* Reserved space for future use */
+};
+
+/*
+ *      F R A M E   R A T E   E N U M E R A T I O N
+ */
+enum <link linkend="v4l2-frmivaltypes">v4l2_frmivaltypes</link> {
+        V4L2_FRMIVAL_TYPE_DISCRETE      = 1,
+        V4L2_FRMIVAL_TYPE_CONTINUOUS    = 2,
+        V4L2_FRMIVAL_TYPE_STEPWISE      = 3,
+};
+
+struct <link linkend="v4l2-frmival-stepwise">v4l2_frmival_stepwise</link> {
+        struct <link linkend="v4l2-fract">v4l2_fract</link>       min;            /* Minimum frame interval [s] */
+        struct <link linkend="v4l2-fract">v4l2_fract</link>       max;            /* Maximum frame interval [s] */
+        struct <link linkend="v4l2-fract">v4l2_fract</link>       step;           /* Frame interval step size [s] */
+};
+
+struct <link linkend="v4l2-frmivalenum">v4l2_frmivalenum</link> {
+        __u32                   index;          /* Frame format index */
+        __u32                   pixel_format;   /* Pixel format */
+        __u32                   width;          /* Frame width */
+        __u32                   height;         /* Frame height */
+        __u32                   type;           /* Frame interval type the device supports. */
+
+        union {                                 /* Frame interval */
+                struct <link linkend="v4l2-fract">v4l2_fract</link>               discrete;
+                struct <link linkend="v4l2-frmival-stepwise">v4l2_frmival_stepwise</link>    stepwise;
+        };
+
+        __u32   reserved[2];                    /* Reserved space for future use */
+};
+#endif
+
+/*
+ *      T I M E C O D E
+ */
+struct <link linkend="v4l2-timecode">v4l2_timecode</link> {
+        __u32   type;
+        __u32   flags;
+        __u8    frames;
+        __u8    seconds;
+        __u8    minutes;
+        __u8    hours;
+        __u8    userbits[4];
+};
+
+/*  Type  */
+#define V4L2_TC_TYPE_24FPS              1
+#define V4L2_TC_TYPE_25FPS              2
+#define V4L2_TC_TYPE_30FPS              3
+#define V4L2_TC_TYPE_50FPS              4
+#define V4L2_TC_TYPE_60FPS              5
+
+/*  Flags  */
+#define V4L2_TC_FLAG_DROPFRAME          0x0001 /* "drop-frame" mode */
+#define V4L2_TC_FLAG_COLORFRAME         0x0002
+#define V4L2_TC_USERBITS_field          0x000C
+#define V4L2_TC_USERBITS_USERDEFINED    0x0000
+#define V4L2_TC_USERBITS_8BITCHARS      0x0008
+/* The above is based on SMPTE timecodes */
+
+struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> {
+        int quality;
+
+        int  APPn;              /* Number of APP segment to be written,
+                                 * must be 0..15 */
+        int  APP_len;           /* Length of data in JPEG APPn segment */
+        char APP_data[60];      /* Data in the JPEG APPn segment. */
+
+        int  COM_len;           /* Length of data in JPEG COM segment */
+        char COM_data[60];      /* Data in JPEG COM segment */
+
+        __u32 jpeg_markers;     /* Which markers should go into the JPEG
+                                 * output. Unless you exactly know what
+                                 * you do, leave them untouched.
+                                 * Inluding less markers will make the
+                                 * resulting code smaller, but there will
+                                 * be fewer aplications which can read it.
+                                 * The presence of the APP and COM marker
+                                 * is influenced by APP_len and COM_len
+                                 * ONLY, not by this property! */
+
+#define V4L2_JPEG_MARKER_DHT (1&lt;&lt;3)    /* Define Huffman Tables */
+#define V4L2_JPEG_MARKER_DQT (1&lt;&lt;4)    /* Define Quantization Tables */
+#define V4L2_JPEG_MARKER_DRI (1&lt;&lt;5)    /* Define Restart Interval */
+#define V4L2_JPEG_MARKER_COM (1&lt;&lt;6)    /* Comment segment */
+#define V4L2_JPEG_MARKER_APP (1&lt;&lt;7)    /* App segment, driver will
+                                        * allways use APP0 */
+};
+
+/*
+ *      M E M O R Y - M A P P I N G   B U F F E R S
+ */
+struct <link linkend="v4l2-requestbuffers">v4l2_requestbuffers</link> {
+        __u32                   count;
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>      type;
+        enum <link linkend="v4l2-memory">v4l2_memory</link>        memory;
+        __u32                   reserved[2];
+};
+
+struct <link linkend="v4l2-buffer">v4l2_buffer</link> {
+        __u32                   index;
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>      type;
+        __u32                   bytesused;
+        __u32                   flags;
+        enum <link linkend="v4l2-field">v4l2_field</link>         field;
+        struct timeval          timestamp;
+        struct <link linkend="v4l2-timecode">v4l2_timecode</link>    timecode;
+        __u32                   sequence;
+
+        /* memory location */
+        enum <link linkend="v4l2-memory">v4l2_memory</link>        memory;
+        union {
+                __u32           offset;
+                unsigned long   userptr;
+        } m;
+        __u32                   length;
+        __u32                   input;
+        __u32                   reserved;
+};
+
+/*  Flags for 'flags' field */
+#define V4L2_BUF_FLAG_MAPPED    0x0001  /* Buffer is mapped (flag) */
+#define V4L2_BUF_FLAG_QUEUED    0x0002  /* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_DONE      0x0004  /* Buffer is ready */
+#define V4L2_BUF_FLAG_KEYFRAME  0x0008  /* Image is a keyframe (I-frame) */
+#define V4L2_BUF_FLAG_PFRAME    0x0010  /* Image is a P-frame */
+#define V4L2_BUF_FLAG_BFRAME    0x0020  /* Image is a B-frame */
+#define V4L2_BUF_FLAG_TIMECODE  0x0100  /* timecode field is valid */
+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
+
+/*
+ *      O V E R L A Y   P R E V I E W
+ */
+struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link> {
+        __u32                   capability;
+        __u32                   flags;
+/* FIXME: in theory we should pass something like PCI device + memory
+ * region + offset instead of some physical address */
+        void                    *base;
+        struct <link linkend="v4l2-pix-format">v4l2_pix_format</link>  fmt;
+};
+/*  Flags for the 'capability' field. Read only */
+#define V4L2_FBUF_CAP_EXTERNOVERLAY     0x0001
+#define V4L2_FBUF_CAP_CHROMAKEY         0x0002
+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
+#define V4L2_FBUF_CAP_BITMAP_CLIPPING   0x0008
+#define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
+#define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
+/*  Flags for the 'flags' field. */
+#define V4L2_FBUF_FLAG_PRIMARY          0x0001
+#define V4L2_FBUF_FLAG_OVERLAY          0x0002
+#define V4L2_FBUF_FLAG_CHROMAKEY        0x0004
+#define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
+
+struct <link linkend="v4l2-clip">v4l2_clip</link> {
+        struct <link linkend="v4l2-rect">v4l2_rect</link>        c;
+        struct <link linkend="v4l2-clip">v4l2_clip</link>        __user *next;
+};
+
+struct <link linkend="v4l2-window">v4l2_window</link> {
+        struct <link linkend="v4l2-rect">v4l2_rect</link>        w;
+        enum <link linkend="v4l2-field">v4l2_field</link>         field;
+        __u32                   chromakey;
+        struct <link linkend="v4l2-clip">v4l2_clip</link>        __user *clips;
+        __u32                   clipcount;
+        void                    __user *bitmap;
+        __u8                    global_alpha;
+};
+
+/*
+ *      C A P T U R E   P A R A M E T E R S
+ */
+struct <link linkend="v4l2-captureparm">v4l2_captureparm</link> {
+        __u32              capability;    /*  Supported modes */
+        __u32              capturemode;   /*  Current mode */
+        struct <link linkend="v4l2-fract">v4l2_fract</link>  timeperframe;  /*  Time per frame in .1us units */
+        __u32              extendedmode;  /*  Driver-specific extensions */
+        __u32              readbuffers;   /*  # of buffers for read */
+        __u32              reserved[4];
+};
+
+/*  Flags for 'capability' and 'capturemode' fields */
+#define V4L2_MODE_HIGHQUALITY   0x0001  /*  High quality imaging mode */
+#define V4L2_CAP_TIMEPERFRAME   0x1000  /*  timeperframe field is supported */
+
+struct <link linkend="v4l2-outputparm">v4l2_outputparm</link> {
+        __u32              capability;   /*  Supported modes */
+        __u32              outputmode;   /*  Current mode */
+        struct <link linkend="v4l2-fract">v4l2_fract</link>  timeperframe; /*  Time per frame in seconds */
+        __u32              extendedmode; /*  Driver-specific extensions */
+        __u32              writebuffers; /*  # of buffers for write */
+        __u32              reserved[4];
+};
+
+/*
+ *      I N P U T   I M A G E   C R O P P I N G
+ */
+struct <link linkend="v4l2-cropcap">v4l2_cropcap</link> {
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>      type;
+        struct <link linkend="v4l2-rect">v4l2_rect</link>        bounds;
+        struct <link linkend="v4l2-rect">v4l2_rect</link>        defrect;
+        struct <link linkend="v4l2-fract">v4l2_fract</link>       pixelaspect;
+};
+
+struct <link linkend="v4l2-crop">v4l2_crop</link> {
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link>      type;
+        struct <link linkend="v4l2-rect">v4l2_rect</link>        c;
+};
+
+/*
+ *      A N A L O G   V I D E O   S T A N D A R D
+ */
+
+typedef __u64 v4l2_std_id;
+
+/* one bit for each */
+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
+
+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
+
+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
+
+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
+
+/* ATSC/HDTV */
+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
+
+/* FIXME:
+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
+   this value to 32 bits.
+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
+   it should work fine. However, if needed to add more than two standards,
+   v4l2-common.c should be fixed.
+ */
+
+/* some merged standards */
+#define V4L2_STD_MN     (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
+#define V4L2_STD_B      (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
+#define V4L2_STD_GH     (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
+#define V4L2_STD_DK     (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
+
+/* some common needed stuff */
+#define V4L2_STD_PAL_BG         (V4L2_STD_PAL_B         |\
+                                 V4L2_STD_PAL_B1        |\
+                                 V4L2_STD_PAL_G)
+#define V4L2_STD_PAL_DK         (V4L2_STD_PAL_D         |\
+                                 V4L2_STD_PAL_D1        |\
+                                 V4L2_STD_PAL_K)
+#define V4L2_STD_PAL            (V4L2_STD_PAL_BG        |\
+                                 V4L2_STD_PAL_DK        |\
+                                 V4L2_STD_PAL_H         |\
+                                 V4L2_STD_PAL_I)
+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M        |\
+                                 V4L2_STD_NTSC_M_JP     |\
+                                 V4L2_STD_NTSC_M_KR)
+#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
+                                 V4L2_STD_SECAM_K       |\
+                                 V4L2_STD_SECAM_K1)
+#define V4L2_STD_SECAM          (V4L2_STD_SECAM_B       |\
+                                 V4L2_STD_SECAM_G       |\
+                                 V4L2_STD_SECAM_H       |\
+                                 V4L2_STD_SECAM_DK      |\
+                                 V4L2_STD_SECAM_L       |\
+                                 V4L2_STD_SECAM_LC)
+
+#define V4L2_STD_525_60         (V4L2_STD_PAL_M         |\
+                                 V4L2_STD_PAL_60        |\
+                                 V4L2_STD_NTSC          |\
+                                 V4L2_STD_NTSC_443)
+#define V4L2_STD_625_50         (V4L2_STD_PAL           |\
+                                 V4L2_STD_PAL_N         |\
+                                 V4L2_STD_PAL_Nc        |\
+                                 V4L2_STD_SECAM)
+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
+                                 V4L2_STD_ATSC_16_VSB)
+
+#define V4L2_STD_UNKNOWN        0
+#define V4L2_STD_ALL            (V4L2_STD_525_60        |\
+                                 V4L2_STD_625_50)
+
+struct <link linkend="v4l2-standard">v4l2_standard</link> {
+        __u32                index;
+        v4l2_std_id          id;
+        __u8                 name[24];
+        struct <link linkend="v4l2-fract">v4l2_fract</link>    frameperiod; /* Frames, not fields */
+        __u32                framelines;
+        __u32                reserved[4];
+};
+
+/*
+ *      V I D E O   I N P U T S
+ */
+struct <link linkend="v4l2-input">v4l2_input</link> {
+        __u32        index;             /*  Which input */
+        __u8         name[32];          /*  Label */
+        __u32        type;              /*  Type of input */
+        __u32        audioset;          /*  Associated audios (bitfield) */
+        __u32        tuner;             /*  Associated tuner */
+        v4l2_std_id  std;
+        __u32        status;
+        __u32        reserved[4];
+};
+
+/*  Values for the 'type' field */
+#define V4L2_INPUT_TYPE_TUNER           1
+#define V4L2_INPUT_TYPE_CAMERA          2
+
+/* field 'status' - general */
+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
+#define V4L2_IN_ST_NO_COLOR    0x00000004
+
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
+
+/* field 'status' - analog */
+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
+
+/* field 'status' - digital */
+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
+
+/* field 'status' - VCR and set-top box */
+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
+
+/*
+ *      V I D E O   O U T P U T S
+ */
+struct <link linkend="v4l2-output">v4l2_output</link> {
+        __u32        index;             /*  Which output */
+        __u8         name[32];          /*  Label */
+        __u32        type;              /*  Type of output */
+        __u32        audioset;          /*  Associated audios (bitfield) */
+        __u32        modulator;         /*  Associated modulator */
+        v4l2_std_id  std;
+        __u32        reserved[4];
+};
+/*  Values for the 'type' field */
+#define V4L2_OUTPUT_TYPE_MODULATOR              1
+#define V4L2_OUTPUT_TYPE_ANALOG                 2
+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
+
+/*
+ *      C O N T R O L S
+ */
+struct <link linkend="v4l2-control">v4l2_control</link> {
+        __u32                id;
+        __s32                value;
+};
+
+struct <link linkend="v4l2-ext-control">v4l2_ext_control</link> {
+        __u32 id;
+        __u32 size;
+        __u32 reserved2[1];
+        union {
+                __s32 value;
+                __s64 value64;
+                char *string;
+        };
+} __attribute__ ((packed));
+
+struct <link linkend="v4l2-ext-controls">v4l2_ext_controls</link> {
+        __u32 ctrl_class;
+        __u32 count;
+        __u32 error_idx;
+        __u32 reserved[2];
+        struct <link linkend="v4l2-ext-control">v4l2_ext_control</link> *controls;
+};
+
+/*  Values for ctrl_class field */
+#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
+#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000       /* Camera class controls */
+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000        /* FM Modulator control class */
+
+#define V4L2_CTRL_ID_MASK         (0x0fffffff)
+#define V4L2_CTRL_ID2CLASS(id)    ((id) &amp; 0x0fff0000UL)
+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) &amp; 0xffff) &gt;= 0x1000)
+
+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
+struct <link linkend="v4l2-queryctrl">v4l2_queryctrl</link> {
+        __u32                id;
+        enum <link linkend="v4l2-ctrl-type">v4l2_ctrl_type</link>  type;
+        __u8                 name[32];  /* Whatever */
+        __s32                minimum;   /* Note signedness */
+        __s32                maximum;
+        __s32                step;
+        __s32                default_value;
+        __u32                flags;
+        __u32                reserved[2];
+};
+
+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
+struct <link linkend="v4l2-querymenu">v4l2_querymenu</link> {
+        __u32           id;
+        __u32           index;
+        __u8            name[32];       /* Whatever */
+        __u32           reserved;
+};
+
+/*  Control flags  */
+#define V4L2_CTRL_FLAG_DISABLED         0x0001
+#define V4L2_CTRL_FLAG_GRABBED          0x0002
+#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
+#define V4L2_CTRL_FLAG_UPDATE           0x0008
+#define V4L2_CTRL_FLAG_INACTIVE         0x0010
+#define V4L2_CTRL_FLAG_SLIDER           0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
+
+/*  Query flag, to be ORed with the control ID */
+#define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
+
+/*  User-class control IDs defined by V4L2 */
+#define V4L2_CID_BASE                   (V4L2_CTRL_CLASS_USER | 0x900)
+#define V4L2_CID_USER_BASE              V4L2_CID_BASE
+/*  IDs reserved for driver specific controls */
+#define V4L2_CID_PRIVATE_BASE           0x08000000
+
+#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_BRIGHTNESS             (V4L2_CID_BASE+0)
+#define V4L2_CID_CONTRAST               (V4L2_CID_BASE+1)
+#define V4L2_CID_SATURATION             (V4L2_CID_BASE+2)
+#define V4L2_CID_HUE                    (V4L2_CID_BASE+3)
+#define V4L2_CID_AUDIO_VOLUME           (V4L2_CID_BASE+5)
+#define V4L2_CID_AUDIO_BALANCE          (V4L2_CID_BASE+6)
+#define V4L2_CID_AUDIO_BASS             (V4L2_CID_BASE+7)
+#define V4L2_CID_AUDIO_TREBLE           (V4L2_CID_BASE+8)
+#define V4L2_CID_AUDIO_MUTE             (V4L2_CID_BASE+9)
+#define V4L2_CID_AUDIO_LOUDNESS         (V4L2_CID_BASE+10)
+#define V4L2_CID_BLACK_LEVEL            (V4L2_CID_BASE+11) /* Deprecated */
+#define V4L2_CID_AUTO_WHITE_BALANCE     (V4L2_CID_BASE+12)
+#define V4L2_CID_DO_WHITE_BALANCE       (V4L2_CID_BASE+13)
+#define V4L2_CID_RED_BALANCE            (V4L2_CID_BASE+14)
+#define V4L2_CID_BLUE_BALANCE           (V4L2_CID_BASE+15)
+#define V4L2_CID_GAMMA                  (V4L2_CID_BASE+16)
+#define V4L2_CID_WHITENESS              (V4L2_CID_GAMMA) /* Deprecated */
+#define V4L2_CID_EXPOSURE               (V4L2_CID_BASE+17)
+#define V4L2_CID_AUTOGAIN               (V4L2_CID_BASE+18)
+#define V4L2_CID_GAIN                   (V4L2_CID_BASE+19)
+#define V4L2_CID_HFLIP                  (V4L2_CID_BASE+20)
+#define V4L2_CID_VFLIP                  (V4L2_CID_BASE+21)
+
+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
+#define V4L2_CID_HCENTER                (V4L2_CID_BASE+22)
+#define V4L2_CID_VCENTER                (V4L2_CID_BASE+23)
+
+#define V4L2_CID_POWER_LINE_FREQUENCY   (V4L2_CID_BASE+24)
+enum <link linkend="v4l2-power-line-frequency">v4l2_power_line_frequency</link> {
+        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED  = 0,
+        V4L2_CID_POWER_LINE_FREQUENCY_50HZ      = 1,
+        V4L2_CID_POWER_LINE_FREQUENCY_60HZ      = 2,
+};
+#define V4L2_CID_HUE_AUTO                       (V4L2_CID_BASE+25)
+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE      (V4L2_CID_BASE+26)
+#define V4L2_CID_SHARPNESS                      (V4L2_CID_BASE+27)
+#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
+#define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
+enum <link linkend="v4l2-colorfx">v4l2_colorfx</link> {
+        V4L2_COLORFX_NONE       = 0,
+        V4L2_COLORFX_BW         = 1,
+        V4L2_COLORFX_SEPIA      = 2,
+};
+#define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
+#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
+
+/* last CID + 1 */
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
+
+/*  MPEG-class control IDs defined by V4L2 */
+#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
+
+/*  MPEG streams */
+#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
+enum <link linkend="v4l2-mpeg-stream-type">v4l2_mpeg_stream_type</link> {
+        V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
+};
+#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
+enum <link linkend="v4l2-mpeg-stream-vbi-fmt">v4l2_mpeg_stream_vbi_fmt</link> {
+        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
+        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
+};
+
+/*  MPEG audio */
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
+enum <link linkend="v4l2-mpeg-audio-sampling-freq">v4l2_mpeg_audio_sampling_freq</link> {
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
+enum <link linkend="v4l2-mpeg-audio-encoding">v4l2_mpeg_audio_encoding</link> {
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
+        V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
+        V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
+};
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
+enum <link linkend="v4l2-mpeg-audio-l1-bitrate">v4l2_mpeg_audio_l1_bitrate</link> {
+        V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
+        V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
+        V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
+        V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
+        V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
+        V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
+        V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
+        V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
+        V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
+        V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
+        V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
+        V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
+        V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
+enum <link linkend="v4l2-mpeg-audio-l2-bitrate">v4l2_mpeg_audio_l2_bitrate</link> {
+        V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
+        V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
+        V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
+        V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
+        V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
+        V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
+        V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
+        V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
+        V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
+        V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
+        V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
+        V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
+        V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
+enum <link linkend="v4l2-mpeg-audio-l3-bitrate">v4l2_mpeg_audio_l3_bitrate</link> {
+        V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
+        V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
+        V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
+        V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
+        V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
+        V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
+        V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
+        V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
+        V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
+        V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
+        V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
+        V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
+        V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
+enum <link linkend="v4l2-mpeg-audio-mode">v4l2_mpeg_audio_mode</link> {
+        V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
+        V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
+        V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
+        V4L2_MPEG_AUDIO_MODE_MONO         = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
+enum <link linkend="v4l2-mpeg-audio-mode-extension">v4l2_mpeg_audio_mode_extension</link> {
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
+enum <link linkend="v4l2-mpeg-audio-emphasis">v4l2_mpeg_audio_emphasis</link> {
+        V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
+        V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
+        V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
+enum <link linkend="v4l2-mpeg-audio-crc">v4l2_mpeg_audio_crc</link> {
+        V4L2_MPEG_AUDIO_CRC_NONE  = 0,
+        V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
+};
+#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE         (V4L2_CID_MPEG_BASE+110)
+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE         (V4L2_CID_MPEG_BASE+111)
+enum <link linkend="v4l2-mpeg-audio-ac3-bitrate">v4l2_mpeg_audio_ac3_bitrate</link> {
+        V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
+};
+
+/*  MPEG video */
+#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
+enum <link linkend="v4l2-mpeg-video-encoding">v4l2_mpeg_video_encoding</link> {
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
+enum <link linkend="v4l2-mpeg-video-aspect">v4l2_mpeg_video_aspect</link> {
+        V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
+        V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
+        V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
+        V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
+};
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
+enum <link linkend="v4l2-mpeg-video-bitrate-mode">v4l2_mpeg_video_bitrate_mode</link> {
+        V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
+        V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
+#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
+
+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
+#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
+enum <link linkend="v4l2-mpeg-cx2341x-video-spatial-filter-mode">v4l2_mpeg_cx2341x_video_spatial_filter_mode</link> {
+        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
+        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
+enum <link linkend="luma-spatial-filter-type">v4l2_mpeg_cx2341x_video_luma_spatial_filter_type</link> {
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
+enum <link linkend="chroma-spatial-filter-type">v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type</link> {
+        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
+        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
+enum <link linkend="v4l2-mpeg-cx2341x-video-temporal-filter-mode">v4l2_mpeg_cx2341x_video_temporal_filter_mode</link> {
+        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
+        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
+enum <link linkend="v4l2-mpeg-cx2341x-video-median-filter-type">v4l2_mpeg_cx2341x_video_median_filter_type</link> {
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
+
+/*  Camera class control IDs */
+#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
+
+#define V4L2_CID_EXPOSURE_AUTO                  (V4L2_CID_CAMERA_CLASS_BASE+1)
+enum  <link linkend="v4l2-exposure-auto-type">v4l2_exposure_auto_type</link> {
+        V4L2_EXPOSURE_AUTO = 0,
+        V4L2_EXPOSURE_MANUAL = 1,
+        V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
+        V4L2_EXPOSURE_APERTURE_PRIORITY = 3
+};
+#define V4L2_CID_EXPOSURE_ABSOLUTE              (V4L2_CID_CAMERA_CLASS_BASE+2)
+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY         (V4L2_CID_CAMERA_CLASS_BASE+3)
+
+#define V4L2_CID_PAN_RELATIVE                   (V4L2_CID_CAMERA_CLASS_BASE+4)
+#define V4L2_CID_TILT_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+5)
+#define V4L2_CID_PAN_RESET                      (V4L2_CID_CAMERA_CLASS_BASE+6)
+#define V4L2_CID_TILT_RESET                     (V4L2_CID_CAMERA_CLASS_BASE+7)
+
+#define V4L2_CID_PAN_ABSOLUTE                   (V4L2_CID_CAMERA_CLASS_BASE+8)
+#define V4L2_CID_TILT_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+9)
+
+#define V4L2_CID_FOCUS_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+10)
+#define V4L2_CID_FOCUS_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+11)
+#define V4L2_CID_FOCUS_AUTO                     (V4L2_CID_CAMERA_CLASS_BASE+12)
+
+#define V4L2_CID_ZOOM_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS                (V4L2_CID_CAMERA_CLASS_BASE+15)
+
+#define V4L2_CID_PRIVACY                        (V4L2_CID_CAMERA_CLASS_BASE+16)
+
+/* FM Modulator class control IDs */
+#define V4L2_CID_FM_TX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_TX | 0x900)
+#define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
+
+#define V4L2_CID_RDS_TX_DEVIATION               (V4L2_CID_FM_TX_CLASS_BASE + 1)
+#define V4L2_CID_RDS_TX_PI                      (V4L2_CID_FM_TX_CLASS_BASE + 2)
+#define V4L2_CID_RDS_TX_PTY                     (V4L2_CID_FM_TX_CLASS_BASE + 3)
+#define V4L2_CID_RDS_TX_PS_NAME                 (V4L2_CID_FM_TX_CLASS_BASE + 5)
+#define V4L2_CID_RDS_TX_RADIO_TEXT              (V4L2_CID_FM_TX_CLASS_BASE + 6)
+
+#define V4L2_CID_AUDIO_LIMITER_ENABLED          (V4L2_CID_FM_TX_CLASS_BASE + 64)
+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME     (V4L2_CID_FM_TX_CLASS_BASE + 65)
+#define V4L2_CID_AUDIO_LIMITER_DEVIATION        (V4L2_CID_FM_TX_CLASS_BASE + 66)
+
+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED      (V4L2_CID_FM_TX_CLASS_BASE + 80)
+#define V4L2_CID_AUDIO_COMPRESSION_GAIN         (V4L2_CID_FM_TX_CLASS_BASE + 81)
+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD    (V4L2_CID_FM_TX_CLASS_BASE + 82)
+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME  (V4L2_CID_FM_TX_CLASS_BASE + 83)
+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 84)
+
+#define V4L2_CID_PILOT_TONE_ENABLED             (V4L2_CID_FM_TX_CLASS_BASE + 96)
+#define V4L2_CID_PILOT_TONE_DEVIATION           (V4L2_CID_FM_TX_CLASS_BASE + 97)
+#define V4L2_CID_PILOT_TONE_FREQUENCY           (V4L2_CID_FM_TX_CLASS_BASE + 98)
+
+#define V4L2_CID_TUNE_PREEMPHASIS               (V4L2_CID_FM_TX_CLASS_BASE + 112)
+enum <link linkend="v4l2-preemphasis">v4l2_preemphasis</link> {
+        V4L2_PREEMPHASIS_DISABLED       = 0,
+        V4L2_PREEMPHASIS_50_uS          = 1,
+        V4L2_PREEMPHASIS_75_uS          = 2,
+};
+#define V4L2_CID_TUNE_POWER_LEVEL               (V4L2_CID_FM_TX_CLASS_BASE + 113)
+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR         (V4L2_CID_FM_TX_CLASS_BASE + 114)
+
+/*
+ *      T U N I N G
+ */
+struct <link linkend="v4l2-tuner">v4l2_tuner</link> {
+        __u32                   index;
+        __u8                    name[32];
+        enum <link linkend="v4l2-tuner-type">v4l2_tuner_type</link>    type;
+        __u32                   capability;
+        __u32                   rangelow;
+        __u32                   rangehigh;
+        __u32                   rxsubchans;
+        __u32                   audmode;
+        __s32                   signal;
+        __s32                   afc;
+        __u32                   reserved[4];
+};
+
+struct <link linkend="v4l2-modulator">v4l2_modulator</link> {
+        __u32                   index;
+        __u8                    name[32];
+        __u32                   capability;
+        __u32                   rangelow;
+        __u32                   rangehigh;
+        __u32                   txsubchans;
+        __u32                   reserved[4];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_TUNER_CAP_LOW              0x0001
+#define V4L2_TUNER_CAP_NORM             0x0002
+#define V4L2_TUNER_CAP_STEREO           0x0010
+#define V4L2_TUNER_CAP_LANG2            0x0020
+#define V4L2_TUNER_CAP_SAP              0x0020
+#define V4L2_TUNER_CAP_LANG1            0x0040
+#define V4L2_TUNER_CAP_RDS              0x0080
+
+/*  Flags for the 'rxsubchans' field */
+#define V4L2_TUNER_SUB_MONO             0x0001
+#define V4L2_TUNER_SUB_STEREO           0x0002
+#define V4L2_TUNER_SUB_LANG2            0x0004
+#define V4L2_TUNER_SUB_SAP              0x0004
+#define V4L2_TUNER_SUB_LANG1            0x0008
+#define V4L2_TUNER_SUB_RDS              0x0010
+
+/*  Values for the 'audmode' field */
+#define V4L2_TUNER_MODE_MONO            0x0000
+#define V4L2_TUNER_MODE_STEREO          0x0001
+#define V4L2_TUNER_MODE_LANG2           0x0002
+#define V4L2_TUNER_MODE_SAP             0x0002
+#define V4L2_TUNER_MODE_LANG1           0x0003
+#define V4L2_TUNER_MODE_LANG1_LANG2     0x0004
+
+struct <link linkend="v4l2-frequency">v4l2_frequency</link> {
+        __u32                 tuner;
+        enum <link linkend="v4l2-tuner-type">v4l2_tuner_type</link>  type;
+        __u32                 frequency;
+        __u32                 reserved[8];
+};
+
+struct <link linkend="v4l2-hw-freq-seek">v4l2_hw_freq_seek</link> {
+        __u32                 tuner;
+        enum <link linkend="v4l2-tuner-type">v4l2_tuner_type</link>  type;
+        __u32                 seek_upward;
+        __u32                 wrap_around;
+        __u32                 reserved[8];
+};
+
+/*
+ *      R D S
+ */
+
+struct <link linkend="v4l2-rds-data">v4l2_rds_data</link> {
+        __u8    lsb;
+        __u8    msb;
+        __u8    block;
+} __attribute__ ((packed));
+
+#define V4L2_RDS_BLOCK_MSK       0x7
+#define V4L2_RDS_BLOCK_A         0
+#define V4L2_RDS_BLOCK_B         1
+#define V4L2_RDS_BLOCK_C         2
+#define V4L2_RDS_BLOCK_D         3
+#define V4L2_RDS_BLOCK_C_ALT     4
+#define V4L2_RDS_BLOCK_INVALID   7
+
+#define V4L2_RDS_BLOCK_CORRECTED 0x40
+#define V4L2_RDS_BLOCK_ERROR     0x80
+
+/*
+ *      A U D I O
+ */
+struct <link linkend="v4l2-audio">v4l2_audio</link> {
+        __u32   index;
+        __u8    name[32];
+        __u32   capability;
+        __u32   mode;
+        __u32   reserved[2];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_AUDCAP_STEREO              0x00001
+#define V4L2_AUDCAP_AVL                 0x00002
+
+/*  Flags for the 'mode' field */
+#define V4L2_AUDMODE_AVL                0x00001
+
+struct <link linkend="v4l2-audioout">v4l2_audioout</link> {
+        __u32   index;
+        __u8    name[32];
+        __u32   capability;
+        __u32   mode;
+        __u32   reserved[2];
+};
+
+/*
+ *      M P E G   S E R V I C E S
+ *
+ *      NOTE: EXPERIMENTAL API
+ */
+#if 1 /*KEEP*/
+#define V4L2_ENC_IDX_FRAME_I    (0)
+#define V4L2_ENC_IDX_FRAME_P    (1)
+#define V4L2_ENC_IDX_FRAME_B    (2)
+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
+
+struct <link linkend="v4l2-enc-idx-entry">v4l2_enc_idx_entry</link> {
+        __u64 offset;
+        __u64 pts;
+        __u32 length;
+        __u32 flags;
+        __u32 reserved[2];
+};
+
+#define V4L2_ENC_IDX_ENTRIES (64)
+struct <link linkend="v4l2-enc-idx">v4l2_enc_idx</link> {
+        __u32 entries;
+        __u32 entries_cap;
+        __u32 reserved[4];
+        struct <link linkend="v4l2-enc-idx-entry">v4l2_enc_idx_entry</link> entry[V4L2_ENC_IDX_ENTRIES];
+};
+
+
+#define V4L2_ENC_CMD_START      (0)
+#define V4L2_ENC_CMD_STOP       (1)
+#define V4L2_ENC_CMD_PAUSE      (2)
+#define V4L2_ENC_CMD_RESUME     (3)
+
+/* Flags for V4L2_ENC_CMD_STOP */
+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 &lt;&lt; 0)
+
+struct <link linkend="v4l2-encoder-cmd">v4l2_encoder_cmd</link> {
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u32 data[8];
+                } raw;
+        };
+};
+
+#endif
+
+
+/*
+ *      D A T A   S E R V I C E S   ( V B I )
+ *
+ *      Data services API by Michael Schimek
+ */
+
+/* Raw VBI */
+struct <link linkend="v4l2-vbi-format">v4l2_vbi_format</link> {
+        __u32   sampling_rate;          /* in 1 Hz */
+        __u32   offset;
+        __u32   samples_per_line;
+        __u32   sample_format;          /* V4L2_PIX_FMT_* */
+        __s32   start[2];
+        __u32   count[2];
+        __u32   flags;                  /* V4L2_VBI_* */
+        __u32   reserved[2];            /* must be zero */
+};
+
+/*  VBI flags  */
+#define V4L2_VBI_UNSYNC         (1 &lt;&lt; 0)
+#define V4L2_VBI_INTERLACED     (1 &lt;&lt; 1)
+
+/* Sliced VBI
+ *
+ *    This implements is a proposal V4L2 API to allow SLICED VBI
+ * required for some hardware encoders. It should change without
+ * notice in the definitive implementation.
+ */
+
+struct <link linkend="v4l2-sliced-vbi-format">v4l2_sliced_vbi_format</link> {
+        __u16   service_set;
+        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+                                 (equals frame lines 313-336 for 625 line video
+                                  standards, 263-286 for 525 line standards) */
+        __u16   service_lines[2][24];
+        __u32   io_size;
+        __u32   reserved[2];            /* must be zero */
+};
+
+/* Teletext World System Teletext
+   (WST), defined on ITU-R BT.653-2 */
+#define V4L2_SLICED_TELETEXT_B          (0x0001)
+/* Video Program System, defined on ETS 300 231*/
+#define V4L2_SLICED_VPS                 (0x0400)
+/* Closed Caption, defined on EIA-608 */
+#define V4L2_SLICED_CAPTION_525         (0x1000)
+/* Wide Screen System, defined on ITU-R BT1119.1 */
+#define V4L2_SLICED_WSS_625             (0x4000)
+
+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
+
+struct <link linkend="v4l2-sliced-vbi-cap">v4l2_sliced_vbi_cap</link> {
+        __u16   service_set;
+        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+                                 (equals frame lines 313-336 for 625 line video
+                                  standards, 263-286 for 525 line standards) */
+        __u16   service_lines[2][24];
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> type;
+        __u32   reserved[3];    /* must be 0 */
+};
+
+struct <link linkend="v4l2-sliced-vbi-data">v4l2_sliced_vbi_data</link> {
+        __u32   id;
+        __u32   field;          /* 0: first field, 1: second field */
+        __u32   line;           /* 1-23 */
+        __u32   reserved;       /* must be 0 */
+        __u8    data[48];
+};
+
+/*
+ * Sliced VBI data inserted into MPEG Streams
+ */
+
+/*
+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
+ *
+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
+ * data
+ *
+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
+ * definitions are not included here.  See the MPEG-2 specifications for details
+ * on these headers.
+ */
+
+/* Line type IDs */
+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
+
+struct <link linkend="v4l2-mpeg-vbi-itv0-line">v4l2_mpeg_vbi_itv0_line</link> {
+        __u8 id;        /* One of V4L2_MPEG_VBI_IVTV_* above */
+        __u8 data[42];  /* Sliced VBI data for the line */
+} __attribute__ ((packed));
+
+struct <link linkend="v4l2-mpeg-vbi-itv0">v4l2_mpeg_vbi_itv0</link> {
+        __le32 linemask[2]; /* Bitmasks of VBI service lines present */
+        struct <link linkend="v4l2-mpeg-vbi-itv0-line">v4l2_mpeg_vbi_itv0_line</link> line[35];
+} __attribute__ ((packed));
+
+struct <link linkend="v4l2-mpeg-vbi-itv0-1">v4l2_mpeg_vbi_ITV0</link> {
+        struct <link linkend="v4l2-mpeg-vbi-itv0-line">v4l2_mpeg_vbi_itv0_line</link> line[36];
+} __attribute__ ((packed));
+
+#define V4L2_MPEG_VBI_IVTV_MAGIC0       "itv0"
+#define V4L2_MPEG_VBI_IVTV_MAGIC1       "ITV0"
+
+struct <link linkend="v4l2-mpeg-vbi-fmt-ivtv">v4l2_mpeg_vbi_fmt_ivtv</link> {
+        __u8 magic[4];
+        union {
+                struct <link linkend="v4l2-mpeg-vbi-itv0">v4l2_mpeg_vbi_itv0</link> itv0;
+                struct <link linkend="v4l2-mpeg-vbi-itv0-1">v4l2_mpeg_vbi_ITV0</link> ITV0;
+        };
+} __attribute__ ((packed));
+
+/*
+ *      A G G R E G A T E   S T R U C T U R E S
+ */
+
+/*      Stream data format
+ */
+struct <link linkend="v4l2-format">v4l2_format</link> {
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> type;
+        union {
+                struct <link linkend="v4l2-pix-format">v4l2_pix_format</link>          pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
+                struct <link linkend="v4l2-window">v4l2_window</link>              win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
+                struct <link linkend="v4l2-vbi-format">v4l2_vbi_format</link>          vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
+                struct <link linkend="v4l2-sliced-vbi-format">v4l2_sliced_vbi_format</link>   sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
+                __u8    raw_data[200];                   /* user-defined */
+        } fmt;
+};
+
+
+/*      Stream type-dependent parameters
+ */
+struct <link linkend="v4l2-streamparm">v4l2_streamparm</link> {
+        enum <link linkend="v4l2-buf-type">v4l2_buf_type</link> type;
+        union {
+                struct <link linkend="v4l2-captureparm">v4l2_captureparm</link> capture;
+                struct <link linkend="v4l2-outputparm">v4l2_outputparm</link>  output;
+                __u8    raw_data[200];  /* user-defined */
+        } parm;
+};
+
+/*
+ *      A D V A N C E D   D E B U G G I N G
+ *
+ *      NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
+ *      FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
+ */
+
+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
+
+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
+
+struct <link linkend="v4l2-dbg-match">v4l2_dbg_match</link> {
+        __u32 type; /* Match type */
+        union {     /* Match this chip, meaning determined by type */
+                __u32 addr;
+                char name[32];
+        };
+} __attribute__ ((packed));
+
+struct <link linkend="v4l2-dbg-register">v4l2_dbg_register</link> {
+        struct <link linkend="v4l2-dbg-match">v4l2_dbg_match</link> match;
+        __u32 size;     /* register size in bytes */
+        __u64 reg;
+        __u64 val;
+} __attribute__ ((packed));
+
+/* VIDIOC_DBG_G_CHIP_IDENT */
+struct <link linkend="v4l2-dbg-chip-ident">v4l2_dbg_chip_ident</link> {
+        struct <link linkend="v4l2-dbg-match">v4l2_dbg_match</link> match;
+        __u32 ident;       /* chip identifier as specified in &lt;media/v4l2-chip-ident.h&gt; */
+        __u32 revision;    /* chip revision, chip specific */
+} __attribute__ ((packed));
+
+/*
+ *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
+ *
+ */
+#define VIDIOC_QUERYCAP          _IOR('V',  0, struct <link linkend="v4l2-capability">v4l2_capability</link>)
+#define VIDIOC_RESERVED           _IO('V',  1)
+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct <link linkend="v4l2-fmtdesc">v4l2_fmtdesc</link>)
+#define VIDIOC_G_FMT            _IOWR('V',  4, struct <link linkend="v4l2-format">v4l2_format</link>)
+#define VIDIOC_S_FMT            _IOWR('V',  5, struct <link linkend="v4l2-format">v4l2_format</link>)
+#define VIDIOC_REQBUFS          _IOWR('V',  8, struct <link linkend="v4l2-requestbuffers">v4l2_requestbuffers</link>)
+#define VIDIOC_QUERYBUF         _IOWR('V',  9, struct <link linkend="v4l2-buffer">v4l2_buffer</link>)
+#define VIDIOC_G_FBUF            _IOR('V', 10, struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link>)
+#define VIDIOC_S_FBUF            _IOW('V', 11, struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link>)
+#define VIDIOC_OVERLAY           _IOW('V', 14, int)
+#define VIDIOC_QBUF             _IOWR('V', 15, struct <link linkend="v4l2-buffer">v4l2_buffer</link>)
+#define VIDIOC_DQBUF            _IOWR('V', 17, struct <link linkend="v4l2-buffer">v4l2_buffer</link>)
+#define VIDIOC_STREAMON          _IOW('V', 18, int)
+#define VIDIOC_STREAMOFF         _IOW('V', 19, int)
+#define VIDIOC_G_PARM           _IOWR('V', 21, struct <link linkend="v4l2-streamparm">v4l2_streamparm</link>)
+#define VIDIOC_S_PARM           _IOWR('V', 22, struct <link linkend="v4l2-streamparm">v4l2_streamparm</link>)
+#define VIDIOC_G_STD             _IOR('V', 23, v4l2_std_id)
+#define VIDIOC_S_STD             _IOW('V', 24, v4l2_std_id)
+#define VIDIOC_ENUMSTD          _IOWR('V', 25, struct <link linkend="v4l2-standard">v4l2_standard</link>)
+#define VIDIOC_ENUMINPUT        _IOWR('V', 26, struct <link linkend="v4l2-input">v4l2_input</link>)
+#define VIDIOC_G_CTRL           _IOWR('V', 27, struct <link linkend="v4l2-control">v4l2_control</link>)
+#define VIDIOC_S_CTRL           _IOWR('V', 28, struct <link linkend="v4l2-control">v4l2_control</link>)
+#define VIDIOC_G_TUNER          _IOWR('V', 29, struct <link linkend="v4l2-tuner">v4l2_tuner</link>)
+#define VIDIOC_S_TUNER           _IOW('V', 30, struct <link linkend="v4l2-tuner">v4l2_tuner</link>)
+#define VIDIOC_G_AUDIO           _IOR('V', 33, struct <link linkend="v4l2-audio">v4l2_audio</link>)
+#define VIDIOC_S_AUDIO           _IOW('V', 34, struct <link linkend="v4l2-audio">v4l2_audio</link>)
+#define VIDIOC_QUERYCTRL        _IOWR('V', 36, struct <link linkend="v4l2-queryctrl">v4l2_queryctrl</link>)
+#define VIDIOC_QUERYMENU        _IOWR('V', 37, struct <link linkend="v4l2-querymenu">v4l2_querymenu</link>)
+#define VIDIOC_G_INPUT           _IOR('V', 38, int)
+#define VIDIOC_S_INPUT          _IOWR('V', 39, int)
+#define VIDIOC_G_OUTPUT          _IOR('V', 46, int)
+#define VIDIOC_S_OUTPUT         _IOWR('V', 47, int)
+#define VIDIOC_ENUMOUTPUT       _IOWR('V', 48, struct <link linkend="v4l2-output">v4l2_output</link>)
+#define VIDIOC_G_AUDOUT          _IOR('V', 49, struct <link linkend="v4l2-audioout">v4l2_audioout</link>)
+#define VIDIOC_S_AUDOUT          _IOW('V', 50, struct <link linkend="v4l2-audioout">v4l2_audioout</link>)
+#define VIDIOC_G_MODULATOR      _IOWR('V', 54, struct <link linkend="v4l2-modulator">v4l2_modulator</link>)
+#define VIDIOC_S_MODULATOR       _IOW('V', 55, struct <link linkend="v4l2-modulator">v4l2_modulator</link>)
+#define VIDIOC_G_FREQUENCY      _IOWR('V', 56, struct <link linkend="v4l2-frequency">v4l2_frequency</link>)
+#define VIDIOC_S_FREQUENCY       _IOW('V', 57, struct <link linkend="v4l2-frequency">v4l2_frequency</link>)
+#define VIDIOC_CROPCAP          _IOWR('V', 58, struct <link linkend="v4l2-cropcap">v4l2_cropcap</link>)
+#define VIDIOC_G_CROP           _IOWR('V', 59, struct <link linkend="v4l2-crop">v4l2_crop</link>)
+#define VIDIOC_S_CROP            _IOW('V', 60, struct <link linkend="v4l2-crop">v4l2_crop</link>)
+#define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link>)
+#define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link>)
+#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct <link linkend="v4l2-format">v4l2_format</link>)
+#define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct <link linkend="v4l2-audio">v4l2_audio</link>)
+#define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct <link linkend="v4l2-audioout">v4l2_audioout</link>)
+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum <link linkend="v4l2-priority">v4l2_priority</link>)
+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum <link linkend="v4l2-priority">v4l2_priority</link>)
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct <link linkend="v4l2-sliced-vbi-cap">v4l2_sliced_vbi_cap</link>)
+#define VIDIOC_LOG_STATUS         _IO('V', 70)
+#define VIDIOC_G_EXT_CTRLS      _IOWR('V', 71, struct <link linkend="v4l2-ext-controls">v4l2_ext_controls</link>)
+#define VIDIOC_S_EXT_CTRLS      _IOWR('V', 72, struct <link linkend="v4l2-ext-controls">v4l2_ext_controls</link>)
+#define VIDIOC_TRY_EXT_CTRLS    _IOWR('V', 73, struct <link linkend="v4l2-ext-controls">v4l2_ext_controls</link>)
+#if 1 /*KEEP*/
+#define VIDIOC_ENUM_FRAMESIZES  _IOWR('V', 74, struct <link linkend="v4l2-frmsizeenum">v4l2_frmsizeenum</link>)
+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct <link linkend="v4l2-frmivalenum">v4l2_frmivalenum</link>)
+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct <link linkend="v4l2-enc-idx">v4l2_enc_idx</link>)
+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct <link linkend="v4l2-encoder-cmd">v4l2_encoder_cmd</link>)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct <link linkend="v4l2-encoder-cmd">v4l2_encoder_cmd</link>)
+#endif
+
+#if 1 /*KEEP*/
+/* Experimental, meant for debugging, testing and internal use.
+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
+   You must be root to use these ioctls. Never use these in applications! */
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct <link linkend="v4l2-dbg-register">v4l2_dbg_register</link>)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct <link linkend="v4l2-dbg-register">v4l2_dbg_register</link>)
+
+/* Experimental, meant for debugging, testing and internal use.
+   Never use this ioctl in applications! */
+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct <link linkend="v4l2-dbg-chip-ident">v4l2_dbg_chip_ident</link>)
+#endif
+
+#define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct <link linkend="v4l2-hw-freq-seek">v4l2_hw_freq_seek</link>)
+/* Reminder: when adding new ioctls please add support for them to
+   drivers/media/video/v4l2-compat-ioctl32.c as well! */
+
+#ifdef __OLD_VIDIOC_
+/* for compatibility, will go away some day */
+#define VIDIOC_OVERLAY_OLD      _IOWR('V', 14, int)
+#define VIDIOC_S_PARM_OLD        _IOW('V', 22, struct <link linkend="v4l2-streamparm">v4l2_streamparm</link>)
+#define VIDIOC_S_CTRL_OLD        _IOW('V', 28, struct <link linkend="v4l2-control">v4l2_control</link>)
+#define VIDIOC_G_AUDIO_OLD      _IOWR('V', 33, struct <link linkend="v4l2-audio">v4l2_audio</link>)
+#define VIDIOC_G_AUDOUT_OLD     _IOWR('V', 49, struct <link linkend="v4l2-audioout">v4l2_audioout</link>)
+#define VIDIOC_CROPCAP_OLD       _IOR('V', 58, struct <link linkend="v4l2-cropcap">v4l2_cropcap</link>)
+#endif
+
+#define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
+
+#endif /* __LINUX_VIDEODEV2_H */
+</programlisting>
diff --git a/Documentation/DocBook/v4l/vidioc-cropcap.xml b/Documentation/DocBook/v4l/vidioc-cropcap.xml
new file mode 100644 (file)
index 0000000..816e90e
--- /dev/null
@@ -0,0 +1,174 @@
+<refentry id="vidioc-cropcap">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_CROPCAP</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_CROPCAP</refname>
+    <refpurpose>Information about the video cropping and scaling abilities</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_cropcap
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_CROPCAP</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Applications use this function to query the cropping
+limits, the pixel aspect of images and to calculate scale factors.
+They set the <structfield>type</structfield> field of a v4l2_cropcap
+structure to the respective buffer (stream) type and call the
+<constant>VIDIOC_CROPCAP</constant> ioctl with a pointer to this
+structure. Drivers fill the rest of the structure. The results are
+constant except when switching the video standard. Remember this
+switch can occur implicit when switching the video input or
+output.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-cropcap">
+      <title>struct <structname>v4l2_cropcap</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the data stream, set by the application.
+Only these types are valid here:
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver
+defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
+and higher.</entry>
+         </row>
+         <row>
+           <entry>struct <link linkend="v4l2-rect-crop">v4l2_rect</link></entry>
+           <entry><structfield>bounds</structfield></entry>
+           <entry>Defines the window within capturing or output is
+possible, this may exclude for example the horizontal and vertical
+blanking areas. The cropping rectangle cannot exceed these limits.
+Width and height are defined in pixels, the driver writer is free to
+choose origin and units of the coordinate system in the analog
+domain.</entry>
+         </row>
+         <row>
+           <entry>struct <link linkend="v4l2-rect-crop">v4l2_rect</link></entry>
+           <entry><structfield>defrect</structfield></entry>
+           <entry>Default cropping rectangle, it shall cover the
+"whole picture". Assuming pixel aspect 1/1 this could be for example a
+640&nbsp;&times;&nbsp;480 rectangle for NTSC, a
+768&nbsp;&times;&nbsp;576 rectangle for PAL and SECAM centered over
+the active picture area. The same co-ordinate system as for
+           <structfield>bounds</structfield> is used.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>pixelaspect</structfield></entry>
+           <entry><para>This is the pixel aspect (y / x) when no
+scaling is applied, the ratio of the actual sampling
+frequency and the frequency required to get square
+pixels.</para><para>When cropping coordinates refer to square pixels,
+the driver sets <structfield>pixelaspect</structfield> to 1/1. Other
+common values are 54/59 for PAL and SECAM, 11/10 for NTSC sampled
+according to [<xref linkend="itu601" />].</para></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- NB this table is duplicated in the overlay chapter. -->
+
+    <table pgwide="1" frame="none" id="v4l2-rect-crop">
+      <title>struct <structname>v4l2_rect</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>left</structfield></entry>
+           <entry>Horizontal offset of the top, left corner of the
+rectangle, in pixels.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>top</structfield></entry>
+           <entry>Vertical offset of the top, left corner of the
+rectangle, in pixels.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>width</structfield></entry>
+           <entry>Width of the rectangle, in pixels.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>height</structfield></entry>
+           <entry>Height of the rectangle, in pixels. Width
+and height cannot be negative, the fields are signed for
+hysterical reasons. <!-- video4linux-list@redhat.com
+on 22 Oct 2002 subject "Re:[V4L][patches!] Re:v4l2/kernel-2.5" -->
+</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-cropcap; <structfield>type</structfield> is
+invalid or the ioctl is not supported. This is not permitted for
+video capture, output and overlay devices, which must support
+<constant>VIDIOC_CROPCAP</constant>.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml b/Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml
new file mode 100644 (file)
index 0000000..4a09e20
--- /dev/null
@@ -0,0 +1,275 @@
+<refentry id="vidioc-dbg-g-chip-ident">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_DBG_G_CHIP_IDENT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_DBG_G_CHIP_IDENT</refname>
+    <refpurpose>Identify the chips on a TV card</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_dbg_chip_ident
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_DBG_G_CHIP_IDENT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <note>
+      <title>Experimental</title>
+
+      <para>This is an <link
+linkend="experimental">experimental</link> interface and may change in
+the future.</para>
+    </note>
+
+    <para>For driver debugging purposes this ioctl allows test
+applications to query the driver about the chips present on the TV
+card. Regular applications must not use it. When you found a chip
+specific bug, please contact the linux-media mailing list (&v4l-ml;)
+so it can be fixed.</para>
+
+    <para>To query the driver applications must initialize the
+<structfield>match.type</structfield> and
+<structfield>match.addr</structfield> or <structfield>match.name</structfield>
+fields of a &v4l2-dbg-chip-ident;
+and call <constant>VIDIOC_DBG_G_CHIP_IDENT</constant> with a pointer to
+this structure. On success the driver stores information about the
+selected chip in the <structfield>ident</structfield> and
+<structfield>revision</structfield> fields. On failure the structure
+remains unchanged.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_HOST</constant>,
+<structfield>match.addr</structfield> selects the nth non-&i2c; chip
+on the TV card. You can enumerate all chips by starting at zero and
+incrementing <structfield>match.addr</structfield> by one until
+<constant>VIDIOC_DBG_G_CHIP_IDENT</constant> fails with an &EINVAL;.
+The number zero always selects the host chip, &eg; the chip connected
+to the PCI or USB bus.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant>,
+<structfield>match.name</structfield> contains the I2C driver name.
+For instance
+<constant>"saa7127"</constant> will match any chip
+supported by the saa7127 driver, regardless of its &i2c; bus address.
+When multiple chips supported by the same driver are present, the
+ioctl will return <constant>V4L2_IDENT_AMBIGUOUS</constant> in the
+<structfield>ident</structfield> field.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_I2C_ADDR</constant>,
+<structfield>match.addr</structfield> selects a chip by its 7 bit
+&i2c; bus address.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_AC97</constant>,
+<structfield>match.addr</structfield> selects the nth AC97 chip
+on the TV card. You can enumerate all chips by starting at zero and
+incrementing <structfield>match.addr</structfield> by one until
+<constant>VIDIOC_DBG_G_CHIP_IDENT</constant> fails with an &EINVAL;.</para>
+
+    <para>On success, the <structfield>ident</structfield> field will
+contain a chip ID from the Linux
+<filename>media/v4l2-chip-ident.h</filename> header file, and the
+<structfield>revision</structfield> field will contain a driver
+specific value, or zero if no particular revision is associated with
+this chip.</para>
+
+    <para>When the driver could not identify the selected chip,
+<structfield>ident</structfield> will contain
+<constant>V4L2_IDENT_UNKNOWN</constant>. When no chip matched
+the ioctl will succeed but the
+<structfield>ident</structfield> field will contain
+<constant>V4L2_IDENT_NONE</constant>. If multiple chips matched,
+<structfield>ident</structfield> will contain
+<constant>V4L2_IDENT_AMBIGUOUS</constant>. In all these cases the
+<structfield>revision</structfield> field remains unchanged.</para>
+
+    <para>This ioctl is optional, not all drivers may support it. It
+was introduced in Linux 2.6.21, but the API was changed to the
+one described here in 2.6.29.</para>
+
+    <para>We recommended the <application>v4l2-dbg</application>
+utility over calling this ioctl directly. It is available from the
+LinuxTV v4l-dvb repository; see <ulink
+url="http://linuxtv.org/repo/">http://linuxtv.org/repo/</ulink> for
+access instructions.</para>
+
+    <!-- Note for convenience vidioc-dbg-g-register.sgml
+        contains a duplicate of this table. -->
+    <table pgwide="1" frame="none" id="ident-v4l2-dbg-match">
+      <title>struct <structname>v4l2_dbg_match</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>See <xref linkend="ident-chip-match-types" /> for a list of
+possible types.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry>(anonymous)</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>addr</structfield></entry>
+           <entry>Match a chip by this number, interpreted according
+to the <structfield>type</structfield> field.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>char</entry>
+           <entry><structfield>name[32]</structfield></entry>
+           <entry>Match a chip by this name, interpreted according
+to the <structfield>type</structfield> field.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-dbg-chip-ident">
+      <title>struct <structname>v4l2_dbg_chip_ident</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>struct v4l2_dbg_match</entry>
+           <entry><structfield>match</structfield></entry>
+           <entry>How to match the chip, see <xref linkend="ident-v4l2-dbg-match" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>ident</structfield></entry>
+           <entry>A chip identifier as defined in the Linux
+<filename>media/v4l2-chip-ident.h</filename> header file, or one of
+the values from <xref linkend="chip-ids" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>revision</structfield></entry>
+           <entry>A chip revision, chip and driver specific.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- Note for convenience vidioc-dbg-g-register.sgml
+        contains a duplicate of this table. -->
+    <table pgwide="1" frame="none" id="ident-chip-match-types">
+      <title>Chip Match Types</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_HOST</constant></entry>
+           <entry>0</entry>
+           <entry>Match the nth chip on the card, zero for the
+           host chip. Does not match &i2c; chips.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant></entry>
+           <entry>1</entry>
+           <entry>Match an &i2c; chip by its driver name.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_I2C_ADDR</constant></entry>
+           <entry>2</entry>
+           <entry>Match a chip by its 7 bit &i2c; bus address.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_AC97</constant></entry>
+           <entry>3</entry>
+           <entry>Match the nth anciliary AC97 chip.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- This is an anonymous enum in media/v4l2-chip-ident.h. -->
+    <table pgwide="1" frame="none" id="chip-ids">
+      <title>Chip Identifiers</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_IDENT_NONE</constant></entry>
+           <entry>0</entry>
+           <entry>No chip matched.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IDENT_AMBIGUOUS</constant></entry>
+           <entry>1</entry>
+           <entry>Multiple chips matched.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IDENT_UNKNOWN</constant></entry>
+           <entry>2</entry>
+           <entry>A chip is present at this address, but the driver
+could not identify it.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The driver does not support this ioctl, or the
+<structfield>match_type</structfield> is invalid.</para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-dbg-g-register.xml b/Documentation/DocBook/v4l/vidioc-dbg-g-register.xml
new file mode 100644 (file)
index 0000000..980c7f3
--- /dev/null
@@ -0,0 +1,275 @@
+<refentry id="vidioc-dbg-g-register">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_DBG_G_REGISTER, VIDIOC_DBG_S_REGISTER</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_DBG_G_REGISTER</refname>
+    <refname>VIDIOC_DBG_S_REGISTER</refname>
+    <refpurpose>Read or write hardware registers</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_dbg_register *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_dbg_register
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_DBG_G_REGISTER, VIDIOC_DBG_S_REGISTER</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <note>
+      <title>Experimental</title>
+
+      <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+    </note>
+
+    <para>For driver debugging purposes these ioctls allow test
+applications to access hardware registers directly. Regular
+applications must not use them.</para>
+
+    <para>Since writing or even reading registers can jeopardize the
+system security, its stability and damage the hardware, both ioctls
+require superuser privileges. Additionally the Linux kernel must be
+compiled with the <constant>CONFIG_VIDEO_ADV_DEBUG</constant> option
+to enable these ioctls.</para>
+
+    <para>To write a register applications must initialize all fields
+of a &v4l2-dbg-register; and call
+<constant>VIDIOC_DBG_S_REGISTER</constant> with a pointer to this
+structure. The <structfield>match.type</structfield> and
+<structfield>match.addr</structfield> or <structfield>match.name</structfield>
+fields select a chip on the TV
+card, the <structfield>reg</structfield> field specifies a register
+number and the <structfield>val</structfield> field the value to be
+written into the register.</para>
+
+    <para>To read a register applications must initialize the
+<structfield>match.type</structfield>,
+<structfield>match.chip</structfield> or <structfield>match.name</structfield> and
+<structfield>reg</structfield> fields, and call
+<constant>VIDIOC_DBG_G_REGISTER</constant> with a pointer to this
+structure. On success the driver stores the register value in the
+<structfield>val</structfield> field. On failure the structure remains
+unchanged.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_HOST</constant>,
+<structfield>match.addr</structfield> selects the nth non-&i2c; chip
+on the TV card.  The number zero always selects the host chip, &eg; the
+chip connected to the PCI or USB bus. You can find out which chips are
+present with the &VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant>,
+<structfield>match.name</structfield> contains the I2C driver name.
+For instance
+<constant>"saa7127"</constant> will match any chip
+supported by the saa7127 driver, regardless of its &i2c; bus address.
+When multiple chips supported by the same driver are present, the
+effect of these ioctls is undefined. Again with the
+&VIDIOC-DBG-G-CHIP-IDENT; ioctl you can find out which &i2c; chips are
+present.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_I2C_ADDR</constant>,
+<structfield>match.addr</structfield> selects a chip by its 7 bit &i2c;
+bus address.</para>
+
+    <para>When <structfield>match.type</structfield> is
+<constant>V4L2_CHIP_MATCH_AC97</constant>,
+<structfield>match.addr</structfield> selects the nth AC97 chip
+on the TV card.</para>
+
+    <note>
+      <title>Success not guaranteed</title>
+
+      <para>Due to a flaw in the Linux &i2c; bus driver these ioctls may
+return successfully without actually reading or writing a register. To
+catch the most likely failure we recommend a &VIDIOC-DBG-G-CHIP-IDENT;
+call confirming the presence of the selected &i2c; chip.</para>
+    </note>
+
+    <para>These ioctls are optional, not all drivers may support them.
+However when a driver supports these ioctls it must also support
+&VIDIOC-DBG-G-CHIP-IDENT;. Conversely it may support
+<constant>VIDIOC_DBG_G_CHIP_IDENT</constant> but not these ioctls.</para>
+
+    <para><constant>VIDIOC_DBG_G_REGISTER</constant> and
+<constant>VIDIOC_DBG_S_REGISTER</constant> were introduced in Linux
+2.6.21, but their API was changed to the one described here in kernel 2.6.29.</para>
+
+    <para>We recommended the <application>v4l2-dbg</application>
+utility over calling these ioctls directly. It is available from the
+LinuxTV v4l-dvb repository; see <ulink
+url="http://linuxtv.org/repo/">http://linuxtv.org/repo/</ulink> for
+access instructions.</para>
+
+    <!-- Note for convenience vidioc-dbg-g-chip-ident.sgml
+        contains a duplicate of this table. -->
+    <table pgwide="1" frame="none" id="v4l2-dbg-match">
+      <title>struct <structname>v4l2_dbg_match</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>See <xref linkend="ident-chip-match-types" /> for a list of
+possible types.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry>(anonymous)</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>addr</structfield></entry>
+           <entry>Match a chip by this number, interpreted according
+to the <structfield>type</structfield> field.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>char</entry>
+           <entry><structfield>name[32]</structfield></entry>
+           <entry>Match a chip by this name, interpreted according
+to the <structfield>type</structfield> field.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+
+    <table pgwide="1" frame="none" id="v4l2-dbg-register">
+      <title>struct <structname>v4l2_dbg_register</structname></title>
+      <tgroup cols="4">
+       <colspec colname="c1" />
+       <colspec colname="c2" />
+       <colspec colname="c4" />
+       <tbody valign="top">
+         <row>
+           <entry>struct v4l2_dbg_match</entry>
+           <entry><structfield>match</structfield></entry>
+           <entry>How to match the chip, see <xref linkend="v4l2-dbg-match" />.</entry>
+         </row>
+         <row>
+           <entry>__u64</entry>
+           <entry><structfield>reg</structfield></entry>
+           <entry>A register number.</entry>
+         </row>
+         <row>
+           <entry>__u64</entry>
+           <entry><structfield>val</structfield></entry>
+           <entry>The value read from, or to be written into the
+register.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- Note for convenience vidioc-dbg-g-chip-ident.sgml
+        contains a duplicate of this table. -->
+    <table pgwide="1" frame="none" id="chip-match-types">
+      <title>Chip Match Types</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_HOST</constant></entry>
+           <entry>0</entry>
+           <entry>Match the nth chip on the card, zero for the
+           host chip. Does not match &i2c; chips.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant></entry>
+           <entry>1</entry>
+           <entry>Match an &i2c; chip by its driver name.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_I2C_ADDR</constant></entry>
+           <entry>2</entry>
+           <entry>Match a chip by its 7 bit &i2c; bus address.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CHIP_MATCH_AC97</constant></entry>
+           <entry>3</entry>
+           <entry>Match the nth anciliary AC97 chip.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The driver does not support this ioctl, or the kernel
+was not compiled with the <constant>CONFIG_VIDEO_ADV_DEBUG</constant>
+option, or the <structfield>match_type</structfield> is invalid, or the
+selected chip or register does not exist.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EPERM</errorcode></term>
+       <listitem>
+         <para>Insufficient permissions. Root privileges are required
+to execute these ioctls.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-encoder-cmd.xml b/Documentation/DocBook/v4l/vidioc-encoder-cmd.xml
new file mode 100644 (file)
index 0000000..b0dde94
--- /dev/null
@@ -0,0 +1,204 @@
+<refentry id="vidioc-encoder-cmd">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENCODER_CMD, VIDIOC_TRY_ENCODER_CMD</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENCODER_CMD</refname>
+    <refname>VIDIOC_TRY_ENCODER_CMD</refname>
+    <refpurpose>Execute an encoder command</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_encoder_cmd *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENCODER_CMD, VIDIOC_TRY_ENCODER_CMD</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <note>
+      <title>Experimental</title>
+
+      <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+    </note>
+
+    <para>These ioctls control an audio/video (usually MPEG-) encoder.
+<constant>VIDIOC_ENCODER_CMD</constant> sends a command to the
+encoder, <constant>VIDIOC_TRY_ENCODER_CMD</constant> can be used to
+try a command without actually executing it.</para>
+
+    <para>To send a command applications must initialize all fields of a
+    &v4l2-encoder-cmd; and call
+    <constant>VIDIOC_ENCODER_CMD</constant> or
+    <constant>VIDIOC_TRY_ENCODER_CMD</constant> with a pointer to this
+    structure.</para>
+
+    <para>The <structfield>cmd</structfield> field must contain the
+command code. The <structfield>flags</structfield> field is currently
+only used by the STOP command and contains one bit: If the
+<constant>V4L2_ENC_CMD_STOP_AT_GOP_END</constant> flag is set,
+encoding will continue until the end of the current <wordasword>Group
+Of Pictures</wordasword>, otherwise it will stop immediately.</para>
+
+    <para>A <function>read</function>() call sends a START command to
+the encoder if it has not been started yet. After a STOP command,
+<function>read</function>() calls will read the remaining data
+buffered by the driver. When the buffer is empty,
+<function>read</function>() will return zero and the next
+<function>read</function>() call will restart the encoder.</para>
+
+    <para>A <function>close</function>() call sends an immediate STOP
+to the encoder, and all buffered data is discarded.</para>
+
+    <para>These ioctls are optional, not all drivers may support
+them. They were introduced in Linux 2.6.21.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-encoder-cmd">
+      <title>struct <structname>v4l2_encoder_cmd</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>cmd</structfield></entry>
+           <entry>The encoder command, see <xref linkend="encoder-cmds" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry>Flags to go with the command, see <xref
+               linkend="encoder-flags" />. If no flags are defined for
+this command, drivers and applications must set this field to
+zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>data</structfield>[8]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="encoder-cmds">
+      <title>Encoder Commands</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_ENC_CMD_START</constant></entry>
+           <entry>0</entry>
+           <entry>Start the encoder. When the encoder is already
+running or paused, this command does nothing. No flags are defined for
+this command.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_CMD_STOP</constant></entry>
+           <entry>1</entry>
+           <entry>Stop the encoder. When the
+<constant>V4L2_ENC_CMD_STOP_AT_GOP_END</constant> flag is set,
+encoding will continue until the end of the current <wordasword>Group
+Of Pictures</wordasword>, otherwise encoding will stop immediately.
+When the encoder is already stopped, this command does
+nothing.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_CMD_PAUSE</constant></entry>
+           <entry>2</entry>
+           <entry>Pause the encoder. When the encoder has not been
+started yet, the driver will return an &EPERM;. When the encoder is
+already paused, this command does nothing. No flags are defined for
+this command.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_CMD_RESUME</constant></entry>
+           <entry>3</entry>
+           <entry>Resume encoding after a PAUSE command. When the
+encoder has not been started yet, the driver will return an &EPERM;.
+When the encoder is already running, this command does nothing. No
+flags are defined for this command.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="encoder-flags">
+      <title>Encoder Command Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_ENC_CMD_STOP_AT_GOP_END</constant></entry>
+           <entry>0x0001</entry>
+           <entry>Stop encoding at the end of the current <wordasword>Group Of
+Pictures</wordasword>, rather than immediately.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The driver does not support this ioctl, or the
+<structfield>cmd</structfield> field is invalid.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EPERM</errorcode></term>
+       <listitem>
+         <para>The application sent a PAUSE or RESUME command when
+the encoder was not running.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enum-fmt.xml b/Documentation/DocBook/v4l/vidioc-enum-fmt.xml
new file mode 100644 (file)
index 0000000..960d446
--- /dev/null
@@ -0,0 +1,164 @@
+<refentry id="vidioc-enum-fmt">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUM_FMT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUM_FMT</refname>
+    <refpurpose>Enumerate image formats</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_fmtdesc
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUM_FMT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To enumerate image formats applications initialize the
+<structfield>type</structfield> and <structfield>index</structfield>
+field of &v4l2-fmtdesc; and call the
+<constant>VIDIOC_ENUM_FMT</constant> ioctl with a pointer to this
+structure. Drivers fill the rest of the structure or return an
+&EINVAL;. All formats are enumerable by beginning at index zero and
+incrementing by one until <errorcode>EINVAL</errorcode> is
+returned.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-fmtdesc">
+      <title>struct <structname>v4l2_fmtdesc</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Number of the format in the enumeration, set by
+the application. This is in no way related to the <structfield>
+pixelformat</structfield> field.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the data stream, set by the application.
+Only these types are valid here:
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver
+defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
+and higher.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry>See <xref linkend="fmtdesc-flags" /></entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>description</structfield>[32]</entry>
+           <entry>Description of the format, a NUL-terminated ASCII
+string. This information is intended for the user, for example: "YUV
+4:2:2".</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>pixelformat</structfield></entry>
+           <entry>The image format identifier. This is a
+four character code as computed by the v4l2_fourcc()
+macro:</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para><programlisting id="v4l2-fourcc">
+#define v4l2_fourcc(a,b,c,d) (((__u32)(a)&lt;&lt;0)|((__u32)(b)&lt;&lt;8)|((__u32)(c)&lt;&lt;16)|((__u32)(d)&lt;&lt;24))
+</programlisting></para><para>Several image formats are already
+defined by this specification in <xref linkend="pixfmt" />. Note these
+codes are not the same as those used in the Windows world.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="fmtdesc-flags">
+      <title>Image Format Description Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FMT_FLAG_COMPRESSED</constant></entry>
+           <entry>0x0001</entry>
+           <entry>This is a compressed format.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FMT_FLAG_EMULATED</constant></entry>
+           <entry>0x0002</entry>
+           <entry>This format is not native to the device but emulated
+through software (usually libv4l2), where possible try to use a native format
+instead for better performance.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-fmtdesc; <structfield>type</structfield>
+is not supported or the <structfield>index</structfield> is out of
+bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml b/Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml
new file mode 100644 (file)
index 0000000..3c216e1
--- /dev/null
@@ -0,0 +1,270 @@
+<refentry id="vidioc-enum-frameintervals">
+
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUM_FRAMEINTERVALS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUM_FRAMEINTERVALS</refname>
+    <refpurpose>Enumerate frame intervals</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_frmivalenum *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUM_FRAMEINTERVALS</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para>Pointer to a &v4l2-frmivalenum; structure that
+contains a pixel format and size and receives a frame interval.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>This ioctl allows applications to enumerate all frame
+intervals that the device supports for the given pixel format and
+frame size.</para>
+    <para>The supported pixel formats and frame sizes can be obtained
+by using the &VIDIOC-ENUM-FMT; and &VIDIOC-ENUM-FRAMESIZES;
+functions.</para>
+    <para>The return value and the content of the
+<structfield>v4l2_frmivalenum.type</structfield> field depend on the
+type of frame intervals the device supports. Here are the semantics of
+the function for the different cases:</para>
+    <itemizedlist>
+      <listitem>
+       <para><emphasis role="bold">Discrete:</emphasis> The function
+returns success if the given index value (zero-based) is valid. The
+application should increase the index by one for each call until
+<constant>EINVAL</constant> is returned. The `v4l2_frmivalenum.type`
+field is set to `V4L2_FRMIVAL_TYPE_DISCRETE` by the driver. Of the
+union only the `discrete` member is valid.</para>
+      </listitem>
+      <listitem>
+       <para><emphasis role="bold">Step-wise:</emphasis> The function
+returns success if the given index value is zero and
+<constant>EINVAL</constant> for any other index value. The
+<structfield>v4l2_frmivalenum.type</structfield> field is set to
+<constant>V4L2_FRMIVAL_TYPE_STEPWISE</constant> by the driver. Of the
+union only the <structfield>stepwise</structfield> member is
+valid.</para>
+      </listitem>
+      <listitem>
+       <para><emphasis role="bold">Continuous:</emphasis> This is a
+special case of the step-wise type above. The function returns success
+if the given index value is zero and <constant>EINVAL</constant> for
+any other index value. The
+<structfield>v4l2_frmivalenum.type</structfield> field is set to
+<constant>V4L2_FRMIVAL_TYPE_CONTINUOUS</constant> by the driver. Of
+the union only the <structfield>stepwise</structfield> member is valid
+and the <structfield>step</structfield> value is set to 1.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>When the application calls the function with index zero, it
+must check the <structfield>type</structfield> field to determine the
+type of frame interval enumeration the device supports. Only for the
+<constant>V4L2_FRMIVAL_TYPE_DISCRETE</constant> type does it make
+sense to increase the index value to receive more frame
+intervals.</para>
+    <para>Note that the order in which the frame intervals are
+returned has no special meaning. In particular does it not say
+anything about potential default frame intervals.</para>
+    <para>Applications can assume that the enumeration data does not
+change without any interaction from the application itself. This means
+that the enumeration data is consistent if the application does not
+perform any other ioctl calls while it runs the frame interval
+enumeration.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <itemizedlist>
+      <listitem>
+       <para><emphasis role="bold">Frame intervals and frame
+rates:</emphasis> The V4L2 API uses frame intervals instead of frame
+rates. Given the frame interval the frame rate can be computed as
+follows:<screen>frame_rate = 1 / frame_interval</screen></para>
+      </listitem>
+    </itemizedlist>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Structs</title>
+
+    <para>In the structs below, <emphasis>IN</emphasis> denotes a
+value that has to be filled in by the application,
+<emphasis>OUT</emphasis> denotes values that the driver fills in. The
+application should zero out all members except for the
+<emphasis>IN</emphasis> fields.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-frmival-stepwise">
+      <title>struct <structname>v4l2_frmival_stepwise</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>min</structfield></entry>
+           <entry>Minimum frame interval [s].</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>max</structfield></entry>
+           <entry>Maximum frame interval [s].</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>step</structfield></entry>
+           <entry>Frame interval step size [s].</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-frmivalenum">
+      <title>struct <structname>v4l2_frmivalenum</structname></title>
+      <tgroup cols="4">
+       <colspec colname="c1" />
+       <colspec colname="c2" />
+       <colspec colname="c3" />
+       <colspec colname="c4" />
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry></entry>
+           <entry>IN: Index of the given frame interval in the
+enumeration.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>pixel_format</structfield></entry>
+           <entry></entry>
+           <entry>IN: Pixel format for which the frame intervals are
+enumerated.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>width</structfield></entry>
+           <entry></entry>
+           <entry>IN: Frame width for which the frame intervals are
+enumerated.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>height</structfield></entry>
+           <entry></entry>
+           <entry>IN: Frame height for which the frame intervals are
+enumerated.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry></entry>
+           <entry>OUT: Frame interval type the device supports.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>OUT: Frame interval with the given index.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>discrete</structfield></entry>
+           <entry>Frame interval [s].</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-frmival-stepwise;</entry>
+           <entry><structfield>stepwise</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved[2]</structfield></entry>
+           <entry></entry>
+           <entry>Reserved space for future use.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    <title>Enums</title>
+
+    <table pgwide="1" frame="none" id="v4l2-frmivaltypes">
+      <title>enum <structname>v4l2_frmivaltypes</structname></title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FRMIVAL_TYPE_DISCRETE</constant></entry>
+           <entry>1</entry>
+           <entry>Discrete frame interval.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FRMIVAL_TYPE_CONTINUOUS</constant></entry>
+           <entry>2</entry>
+           <entry>Continuous frame interval.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FRMIVAL_TYPE_STEPWISE</constant></entry>
+           <entry>3</entry>
+           <entry>Step-wise defined frame interval.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <para>See the description section above for a list of return
+values that <varname>errno</varname> can have.</para>
+  </refsect1>
+
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enum-framesizes.xml b/Documentation/DocBook/v4l/vidioc-enum-framesizes.xml
new file mode 100644 (file)
index 0000000..6afa454
--- /dev/null
@@ -0,0 +1,282 @@
+<refentry id="vidioc-enum-framesizes">
+
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUM_FRAMESIZES</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUM_FRAMESIZES</refname>
+    <refpurpose>Enumerate frame sizes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_frmsizeenum *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUM_FRAMESIZES</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para>Pointer to a &v4l2-frmsizeenum; that contains an index
+and pixel format and receives a frame width and height.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <note>
+      <title>Experimental</title>
+
+      <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+    </note>
+
+    <para>This ioctl allows applications to enumerate all frame sizes
+(&ie; width and height in pixels) that the device supports for the
+given pixel format.</para>
+    <para>The supported pixel formats can be obtained by using the
+&VIDIOC-ENUM-FMT; function.</para>
+    <para>The return value and the content of the
+<structfield>v4l2_frmsizeenum.type</structfield> field depend on the
+type of frame sizes the device supports. Here are the semantics of the
+function for the different cases:</para>
+
+    <itemizedlist>
+      <listitem>
+       <para><emphasis role="bold">Discrete:</emphasis> The function
+returns success if the given index value (zero-based) is valid. The
+application should increase the index by one for each call until
+<constant>EINVAL</constant> is returned. The
+<structfield>v4l2_frmsizeenum.type</structfield> field is set to
+<constant>V4L2_FRMSIZE_TYPE_DISCRETE</constant> by the driver. Of the
+union only the <structfield>discrete</structfield> member is
+valid.</para>
+      </listitem>
+      <listitem>
+       <para><emphasis role="bold">Step-wise:</emphasis> The function
+returns success if the given index value is zero and
+<constant>EINVAL</constant> for any other index value. The
+<structfield>v4l2_frmsizeenum.type</structfield> field is set to
+<constant>V4L2_FRMSIZE_TYPE_STEPWISE</constant> by the driver. Of the
+union only the <structfield>stepwise</structfield> member is
+valid.</para>
+      </listitem>
+      <listitem>
+       <para><emphasis role="bold">Continuous:</emphasis> This is a
+special case of the step-wise type above. The function returns success
+if the given index value is zero and <constant>EINVAL</constant> for
+any other index value. The
+<structfield>v4l2_frmsizeenum.type</structfield> field is set to
+<constant>V4L2_FRMSIZE_TYPE_CONTINUOUS</constant> by the driver. Of
+the union only the <structfield>stepwise</structfield> member is valid
+and the <structfield>step_width</structfield> and
+<structfield>step_height</structfield> values are set to 1.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>When the application calls the function with index zero, it
+must check the <structfield>type</structfield> field to determine the
+type of frame size enumeration the device supports. Only for the
+<constant>V4L2_FRMSIZE_TYPE_DISCRETE</constant> type does it make
+sense to increase the index value to receive more frame sizes.</para>
+    <para>Note that the order in which the frame sizes are returned
+has no special meaning. In particular does it not say anything about
+potential default format sizes.</para>
+    <para>Applications can assume that the enumeration data does not
+change without any interaction from the application itself. This means
+that the enumeration data is consistent if the application does not
+perform any other ioctl calls while it runs the frame size
+enumeration.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Structs</title>
+
+    <para>In the structs below, <emphasis>IN</emphasis> denotes a
+value that has to be filled in by the application,
+<emphasis>OUT</emphasis> denotes values that the driver fills in. The
+application should zero out all members except for the
+<emphasis>IN</emphasis> fields.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-frmsize-discrete">
+      <title>struct <structname>v4l2_frmsize_discrete</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>width</structfield></entry>
+           <entry>Width of the frame [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>height</structfield></entry>
+           <entry>Height of the frame [pixel].</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-frmsize-stepwise">
+      <title>struct <structname>v4l2_frmsize_stepwise</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>min_width</structfield></entry>
+           <entry>Minimum frame width [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>max_width</structfield></entry>
+           <entry>Maximum frame width [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>step_width</structfield></entry>
+           <entry>Frame width step size [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>min_height</structfield></entry>
+           <entry>Minimum frame height [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>max_height</structfield></entry>
+           <entry>Maximum frame height [pixel].</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>step_height</structfield></entry>
+           <entry>Frame height step size [pixel].</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-frmsizeenum">
+      <title>struct <structname>v4l2_frmsizeenum</structname></title>
+      <tgroup cols="4">
+       <colspec colname="c1" />
+       <colspec colname="c2" />
+       <colspec colname="c3" />
+       <colspec colname="c4" />
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry></entry>
+           <entry>IN: Index of the given frame size in the enumeration.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>pixel_format</structfield></entry>
+           <entry></entry>
+           <entry>IN: Pixel format for which the frame sizes are enumerated.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry></entry>
+           <entry>OUT: Frame size type the device supports.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>OUT: Frame size with the given index.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-frmsize-discrete;</entry>
+           <entry><structfield>discrete</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-frmsize-stepwise;</entry>
+           <entry><structfield>stepwise</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved[2]</structfield></entry>
+           <entry></entry>
+           <entry>Reserved space for future use.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    <title>Enums</title>
+
+    <table pgwide="1" frame="none" id="v4l2-frmsizetypes">
+      <title>enum <structname>v4l2_frmsizetypes</structname></title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FRMSIZE_TYPE_DISCRETE</constant></entry>
+           <entry>1</entry>
+           <entry>Discrete frame size.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FRMSIZE_TYPE_CONTINUOUS</constant></entry>
+           <entry>2</entry>
+           <entry>Continuous frame size.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FRMSIZE_TYPE_STEPWISE</constant></entry>
+           <entry>3</entry>
+           <entry>Step-wise defined frame size.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <para>See the description section above for a list of return
+values that <varname>errno</varname> can have.</para>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enumaudio.xml b/Documentation/DocBook/v4l/vidioc-enumaudio.xml
new file mode 100644 (file)
index 0000000..9ae8f2d
--- /dev/null
@@ -0,0 +1,86 @@
+<refentry id="vidioc-enumaudio">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUMAUDIO</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUMAUDIO</refname>
+    <refpurpose>Enumerate audio inputs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_audio *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUMAUDIO</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of an audio input applications
+initialize the <structfield>index</structfield> field and zero out the
+<structfield>reserved</structfield> array of a &v4l2-audio;
+and call the <constant>VIDIOC_ENUMAUDIO</constant> ioctl with a pointer
+to this structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all audio
+inputs applications shall begin at index zero, incrementing by one
+until the driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <para>See <xref linkend="vidioc-g-audio" /> for a description of
+&v4l2-audio;.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The number of the audio input is out of bounds, or
+there are no audio inputs at all and this ioctl is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enumaudioout.xml b/Documentation/DocBook/v4l/vidioc-enumaudioout.xml
new file mode 100644 (file)
index 0000000..d3d7c0a
--- /dev/null
@@ -0,0 +1,89 @@
+<refentry id="vidioc-enumaudioout">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUMAUDOUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUMAUDOUT</refname>
+    <refpurpose>Enumerate audio outputs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_audioout *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUMAUDOUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of an audio output applications
+initialize the <structfield>index</structfield> field and zero out the
+<structfield>reserved</structfield> array of a &v4l2-audioout; and
+call the <constant>VIDIOC_G_AUDOUT</constant> ioctl with a pointer
+to this structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all audio
+outputs applications shall begin at index zero, incrementing by one
+until the driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <para>Note connectors on a TV card to loop back the received audio
+signal to a sound card are not audio outputs in this sense.</para>
+
+    <para>See <xref linkend="vidioc-g-audioout" /> for a description of
+&v4l2-audioout;.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The number of the audio output is out of bounds, or
+there are no audio outputs at all and this ioctl is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enuminput.xml b/Documentation/DocBook/v4l/vidioc-enuminput.xml
new file mode 100644 (file)
index 0000000..414856b
--- /dev/null
@@ -0,0 +1,287 @@
+<refentry id="vidioc-enuminput">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUMINPUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUMINPUT</refname>
+    <refpurpose>Enumerate video inputs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_input
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUMINPUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a video input applications
+initialize the <structfield>index</structfield> field of &v4l2-input;
+and call the <constant>VIDIOC_ENUMINPUT</constant> ioctl with a
+pointer to this structure. Drivers fill the rest of the structure or
+return an &EINVAL; when the index is out of bounds. To enumerate all
+inputs applications shall begin at index zero, incrementing by one
+until the driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <table frame="none" pgwide="1" id="v4l2-input">
+      <title>struct <structname>v4l2_input</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Identifies the input, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the video input, a NUL-terminated ASCII
+string, for example: "Vin (Composite 2)". This information is intended
+for the user, preferably the connector label on the device itself.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the input, see <xref
+               linkend="input-type" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>audioset</structfield></entry>
+           <entry><para>Drivers can enumerate up to 32 video and
+audio inputs. This field shows which audio inputs were selectable as
+audio source if this was the currently selected video input. It is a
+bit mask. The LSB corresponds to audio input 0, the MSB to input 31.
+Any number of bits can be set, or none.</para><para>When the driver
+does not enumerate audio inputs no bits must be set. Applications
+shall not interpret this as lack of audio support. Some drivers
+automatically select audio sources and do not enumerate them since
+there is no choice anyway.</para><para>For details on audio inputs and
+how to select the current input see <xref
+                 linkend="audio" />.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>tuner</structfield></entry>
+           <entry>Capture devices can have zero or more tuners (RF
+demodulators). When the <structfield>type</structfield> is set to
+<constant>V4L2_INPUT_TYPE_TUNER</constant> this is an RF connector and
+this field identifies the tuner. It corresponds to
+&v4l2-tuner; field <structfield>index</structfield>. For details on
+tuners see <xref linkend="tuner" />.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-std-id;</entry>
+           <entry><structfield>std</structfield></entry>
+           <entry>Every video input supports one or more different
+video standards. This field is a set of all supported standards. For
+details on video standards and how to switch see <xref
+linkend="standard" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>status</structfield></entry>
+           <entry>This field provides status information about the
+input. See <xref linkend="input-status" /> for flags.
+With the exception of the sensor orientation bits <structfield>status</structfield> is only valid when this is the
+current input.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="input-type">
+      <title>Input Types</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_INPUT_TYPE_TUNER</constant></entry>
+           <entry>1</entry>
+           <entry>This input uses a tuner (RF demodulator).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_INPUT_TYPE_CAMERA</constant></entry>
+           <entry>2</entry>
+           <entry>Analog baseband input, for example CVBS /
+Composite Video, S-Video, RGB.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- Status flags based on proposal by Mark McClelland,
+video4linux-list@redhat.com on 18 Oct 2002, subject "Re: [V4L] Re:
+v4l2 api". "Why are some of them inverted? So that the driver doesn't
+have to lie about the status in cases where it can't tell one way or
+the other. Plus, a status of zero would generally mean that everything
+is OK." -->
+
+    <table frame="none" pgwide="1" id="input-status">
+      <title>Input Status Flags</title>
+      <tgroup cols="3">
+       <colspec colname="c1" />
+       <colspec colname="c2" align="center" />
+       <colspec colname="c3" />
+       <spanspec namest="c1" nameend="c3" spanname="hspan"
+         align="left" />
+       <tbody valign="top">
+         <row>
+           <entry spanname="hspan">General</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_POWER</constant></entry>
+           <entry>0x00000001</entry>
+           <entry>Attached device is off.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_SIGNAL</constant></entry>
+           <entry>0x00000002</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_COLOR</constant></entry>
+           <entry>0x00000004</entry>
+           <entry>The hardware supports color decoding, but does not
+detect color modulation in the signal.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">Sensor Orientation</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_HFLIP</constant></entry>
+           <entry>0x00000010</entry>
+           <entry>The input is connected to a device that produces a signal
+that is flipped horizontally and does not correct this before passing the
+signal to userspace.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_VFLIP</constant></entry>
+           <entry>0x00000020</entry>
+           <entry>The input is connected to a device that produces a signal
+that is flipped vertically and does not correct this before passing the
+signal to userspace. Note that a 180 degree rotation is the same as HFLIP | VFLIP</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">Analog Video</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_H_LOCK</constant></entry>
+           <entry>0x00000100</entry>
+           <entry>No horizontal sync lock.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_COLOR_KILL</constant></entry>
+           <entry>0x00000200</entry>
+           <entry>A color killer circuit automatically disables color
+decoding when it detects no color modulation. When this flag is set
+the color killer is enabled <emphasis>and</emphasis> has shut off
+color decoding.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">Digital Video</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_SYNC</constant></entry>
+           <entry>0x00010000</entry>
+           <entry>No synchronization lock.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_EQU</constant></entry>
+           <entry>0x00020000</entry>
+           <entry>No equalizer lock.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_CARRIER</constant></entry>
+           <entry>0x00040000</entry>
+           <entry>Carrier recovery failed.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">VCR and Set-Top Box</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_MACROVISION</constant></entry>
+           <entry>0x01000000</entry>
+           <entry>Macrovision is an analog copy prevention system
+mangling the video signal to confuse video recorders. When this
+flag is set Macrovision has been detected.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_NO_ACCESS</constant></entry>
+           <entry>0x02000000</entry>
+           <entry>Conditional access denied.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_IN_ST_VTR</constant></entry>
+           <entry>0x04000000</entry>
+           <entry>VTR time constant. [?]</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-input; <structfield>index</structfield> is
+out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/v4l/vidioc-enumoutput.xml
new file mode 100644 (file)
index 0000000..e8d16dc
--- /dev/null
@@ -0,0 +1,172 @@
+<refentry id="vidioc-enumoutput">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUMOUTPUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUMOUTPUT</refname>
+    <refpurpose>Enumerate video outputs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_output *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUMOUTPUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a video outputs applications
+initialize the <structfield>index</structfield> field of &v4l2-output;
+and call the <constant>VIDIOC_ENUMOUTPUT</constant> ioctl with a
+pointer to this structure. Drivers fill the rest of the structure or
+return an &EINVAL; when the index is out of bounds. To enumerate all
+outputs applications shall begin at index zero, incrementing by one
+until the driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <table frame="none" pgwide="1" id="v4l2-output">
+      <title>struct <structname>v4l2_output</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Identifies the output, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the video output, a NUL-terminated ASCII
+string, for example: "Vout". This information is intended for the
+user, preferably the connector label on the device itself.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the output, see <xref
+               linkend="output-type" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>audioset</structfield></entry>
+           <entry><para>Drivers can enumerate up to 32 video and
+audio outputs. This field shows which audio outputs were
+selectable as the current output if this was the currently selected
+video output. It is a bit mask. The LSB corresponds to audio output 0,
+the MSB to output 31. Any number of bits can be set, or
+none.</para><para>When the driver does not enumerate audio outputs no
+bits must be set. Applications shall not interpret this as lack of
+audio support. Drivers may automatically select audio outputs without
+enumerating them.</para><para>For details on audio outputs and how to
+select the current output see <xref linkend="audio" />.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>modulator</structfield></entry>
+           <entry>Output devices can have zero or more RF modulators.
+When the <structfield>type</structfield> is
+<constant>V4L2_OUTPUT_TYPE_MODULATOR</constant> this is an RF
+connector and this field identifies the modulator. It corresponds to
+&v4l2-modulator; field <structfield>index</structfield>. For details
+on modulators see <xref linkend="tuner" />.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-std-id;</entry>
+           <entry><structfield>std</structfield></entry>
+           <entry>Every video output supports one or more different
+video standards. This field is a set of all supported standards. For
+details on video standards and how to switch see <xref
+               linkend="standard" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table frame="none" pgwide="1" id="output-type">
+      <title>Output Type</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_OUTPUT_TYPE_MODULATOR</constant></entry>
+           <entry>1</entry>
+           <entry>This output is an analog TV modulator.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_OUTPUT_TYPE_ANALOG</constant></entry>
+           <entry>2</entry>
+           <entry>Analog baseband output, for example Composite /
+CVBS, S-Video, RGB.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY</constant></entry>
+           <entry>3</entry>
+           <entry>[?]</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+  </refsect1>
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-output; <structfield>index</structfield>
+is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enumstd.xml b/Documentation/DocBook/v4l/vidioc-enumstd.xml
new file mode 100644 (file)
index 0000000..95803fe
--- /dev/null
@@ -0,0 +1,391 @@
+<refentry id="vidioc-enumstd">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUMSTD</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUMSTD</refname>
+    <refpurpose>Enumerate supported video standards</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_standard *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_ENUMSTD</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a video standard,
+especially a custom (driver defined) one, applications initialize the
+<structfield>index</structfield> field of &v4l2-standard; and call the
+<constant>VIDIOC_ENUMSTD</constant> ioctl with a pointer to this
+structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all standards
+applications shall begin  at index zero, incrementing by one until the
+driver returns <errorcode>EINVAL</errorcode>. Drivers may enumerate a
+different set of standards after switching the video input or
+output.<footnote>
+       <para>The supported standards may overlap and we need an
+unambiguous set to find the current standard returned by
+<constant>VIDIOC_G_STD</constant>.</para>
+      </footnote></para>
+
+    <table pgwide="1" frame="none" id="v4l2-standard">
+      <title>struct <structname>v4l2_standard</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Number of the video standard, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-std-id;</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>The bits in this field identify the standard as
+one of the common standards listed in <xref linkend="v4l2-std-id" />,
+or if bits 32 to 63 are set as custom standards. Multiple bits can be
+set if the hardware does not distinguish between these standards,
+however separate indices do not indicate the opposite. The
+<structfield>id</structfield> must be unique. No other enumerated
+<structname>v4l2_standard</structname> structure, for this input or
+output anyway, can contain the same set of bits.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[24]</entry>
+           <entry>Name of the standard, a NUL-terminated ASCII
+string, for example: "PAL-B/G", "NTSC Japan". This information is
+intended for the user.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>frameperiod</structfield></entry>
+           <entry>The frame period (not field period) is numerator
+/ denominator. For example M/NTSC has a frame period of 1001 /
+30000 seconds.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>framelines</structfield></entry>
+           <entry>Total lines per frame including blanking,
+e.&nbsp;g. 625 for B/PAL.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-fract">
+      <title>struct <structname>v4l2_fract</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>numerator</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>denominator</structfield></entry>
+           <entry></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-std-id">
+      <title>typedef <structname>v4l2_std_id</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u64</entry>
+           <entry><structfield>v4l2_std_id</structfield></entry>
+           <entry>This type is a set, each bit representing another
+video standard as listed below and in <xref
+linkend="video-standards" />. The 32 most significant bits are reserved
+for custom (driver defined) video standards.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <para><programlisting>
+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
+
+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
+</programlisting></para><para><constant>V4L2_STD_PAL_60</constant> is
+a hybrid standard with 525 lines, 60 Hz refresh rate, and PAL color
+modulation with a 4.43 MHz color subcarrier. Some PAL video recorders
+can play back NTSC tapes in this mode for display on a 50/60 Hz agnostic
+PAL TV.</para><para><programlisting>
+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
+</programlisting></para><para><constant>V4L2_STD_NTSC_443</constant>
+is a hybrid standard with 525 lines, 60 Hz refresh rate, and NTSC
+color modulation with a 4.43 MHz color
+subcarrier.</para><para><programlisting>
+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
+
+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
+
+/* ATSC/HDTV */
+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
+</programlisting></para><para><!-- ATSC proposal by Mark McClelland,
+video4linux-list@redhat.com on 17 Oct 2002
+--><constant>V4L2_STD_ATSC_8_VSB</constant> and
+<constant>V4L2_STD_ATSC_16_VSB</constant> are U.S. terrestrial digital
+TV standards. Presently the V4L2 API does not support digital TV. See
+also the Linux DVB API at <ulink
+url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>
+<para><programlisting>
+#define V4L2_STD_PAL_BG         (V4L2_STD_PAL_B         |\
+                                V4L2_STD_PAL_B1        |\
+                                V4L2_STD_PAL_G)
+#define V4L2_STD_B              (V4L2_STD_PAL_B         |\
+                                V4L2_STD_PAL_B1        |\
+                                V4L2_STD_SECAM_B)
+#define V4L2_STD_GH             (V4L2_STD_PAL_G         |\
+                                V4L2_STD_PAL_H         |\
+                                V4L2_STD_SECAM_G       |\
+                                V4L2_STD_SECAM_H)
+#define V4L2_STD_PAL_DK         (V4L2_STD_PAL_D         |\
+                                V4L2_STD_PAL_D1        |\
+                                V4L2_STD_PAL_K)
+#define V4L2_STD_PAL            (V4L2_STD_PAL_BG        |\
+                                V4L2_STD_PAL_DK        |\
+                                V4L2_STD_PAL_H         |\
+                                V4L2_STD_PAL_I)
+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M        |\
+                                V4L2_STD_NTSC_M_JP     |\
+                                V4L2_STD_NTSC_M_KR)
+#define V4L2_STD_MN             (V4L2_STD_PAL_M         |\
+                                V4L2_STD_PAL_N         |\
+                                V4L2_STD_PAL_Nc        |\
+                                V4L2_STD_NTSC)
+#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
+                                V4L2_STD_SECAM_K       |\
+                                V4L2_STD_SECAM_K1)
+#define V4L2_STD_DK             (V4L2_STD_PAL_DK        |\
+                                V4L2_STD_SECAM_DK)
+
+#define V4L2_STD_SECAM          (V4L2_STD_SECAM_B       |\
+                                V4L2_STD_SECAM_G       |\
+                                V4L2_STD_SECAM_H       |\
+                                V4L2_STD_SECAM_DK      |\
+                                V4L2_STD_SECAM_L       |\
+                                V4L2_STD_SECAM_LC)
+
+#define V4L2_STD_525_60         (V4L2_STD_PAL_M         |\
+                                V4L2_STD_PAL_60        |\
+                                V4L2_STD_NTSC          |\
+                                V4L2_STD_NTSC_443)
+#define V4L2_STD_625_50         (V4L2_STD_PAL           |\
+                                V4L2_STD_PAL_N         |\
+                                V4L2_STD_PAL_Nc        |\
+                                V4L2_STD_SECAM)
+
+#define V4L2_STD_UNKNOWN        0
+#define V4L2_STD_ALL            (V4L2_STD_525_60        |\
+                                V4L2_STD_625_50)
+</programlisting></para>
+
+    <table pgwide="1" id="video-standards" orient="land">
+      <title>Video Standards (based on [<xref linkend="itu470" />])</title>
+      <tgroup cols="12" colsep="1" rowsep="1" align="center">
+       <colspec colname="c1" align="left" />
+       <colspec colname="c2" />
+       <colspec colname="c3" />
+       <colspec colname="c4" />
+       <colspec colname="c5" />
+       <colspec colnum="7" colname="c7" />
+       <colspec colnum="9" colname="c9" />
+       <colspec colnum="12" colname="c12" />
+       <spanspec namest="c2" nameend="c3" spanname="m" align="center" />
+       <spanspec namest="c4" nameend="c12" spanname="x" align="center" />
+       <spanspec namest="c5" nameend="c7" spanname="b" align="center" />
+       <spanspec namest="c9" nameend="c12" spanname="s" align="center" />
+       <thead>
+         <row>
+           <entry>Characteristics</entry>
+           <entry><para>M/NTSC<footnote><para>Japan uses a standard
+similar to M/NTSC
+(V4L2_STD_NTSC_M_JP).</para></footnote></para></entry>
+           <entry>M/PAL</entry>
+           <entry><para>N/PAL<footnote><para> The values in
+brackets apply to the combination N/PAL a.k.a.
+N<subscript>C</subscript> used in Argentina
+(V4L2_STD_PAL_Nc).</para></footnote></para></entry>
+           <entry align="center">B, B1, G/PAL</entry>
+           <entry align="center">D, D1, K/PAL</entry>
+           <entry align="center">H/PAL</entry>
+           <entry align="center">I/PAL</entry>
+           <entry align="center">B, G/SECAM</entry>
+           <entry align="center">D, K/SECAM</entry>
+           <entry align="center">K1/SECAM</entry>
+           <entry align="center">L/SECAM</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry>Frame lines</entry>
+           <entry spanname="m">525</entry>
+           <entry spanname="x">625</entry>
+         </row>
+         <row>
+           <entry>Frame period (s)</entry>
+           <entry spanname="m">1001/30000</entry>
+           <entry spanname="x">1/25</entry>
+         </row>
+         <row>
+           <entry>Chrominance sub-carrier frequency (Hz)</entry>
+           <entry>3579545 &plusmn;&nbsp;10</entry>
+           <entry>3579611.49 &plusmn;&nbsp;10</entry>
+           <entry>4433618.75 &plusmn;&nbsp;5 (3582056.25
+&plusmn;&nbsp;5)</entry>
+           <entry spanname="b">4433618.75 &plusmn;&nbsp;5</entry>
+           <entry>4433618.75 &plusmn;&nbsp;1</entry>
+           <entry spanname="s">f<subscript>OR</subscript>&nbsp;=
+4406250 &plusmn;&nbsp;2000, f<subscript>OB</subscript>&nbsp;= 4250000
+&plusmn;&nbsp;2000</entry>
+         </row>
+         <row>
+           <entry>Nominal radio-frequency channel bandwidth
+(MHz)</entry>
+           <entry>6</entry>
+           <entry>6</entry>
+           <entry>6</entry>
+           <entry>B: 7; B1, G: 8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+           <entry>8</entry>
+         </row>
+         <row>
+           <entry>Sound carrier relative to vision carrier
+(MHz)</entry>
+           <entry>+&nbsp;4.5</entry>
+           <entry>+&nbsp;4.5</entry>
+           <entry>+&nbsp;4.5</entry>
+           <entry><para>+&nbsp;5.5 &plusmn;&nbsp;0.001
+<footnote><para>In the Federal Republic of Germany, Austria, Italy,
+the Netherlands, Slovakia and Switzerland a system of two sound
+carriers is used, the frequency of the second carrier being
+242.1875&nbsp;kHz above the frequency of the first sound carrier. For
+stereophonic sound transmissions a similar system is used in
+Australia.</para></footnote> <footnote><para>New Zealand uses a sound
+carrier displaced 5.4996 &plusmn;&nbsp;0.0005 MHz from the vision
+carrier.</para></footnote> <footnote><para>In Denmark, Finland, New
+Zealand, Sweden and Spain a system of two sound carriers is used. In
+Iceland, Norway and Poland the same system is being introduced. The
+second carrier is 5.85&nbsp;MHz above the vision carrier and is DQPSK
+modulated with 728&nbsp;kbit/s sound and data multiplex. (NICAM
+system)</para></footnote> <footnote><para>In the United Kingdom, a
+system of two sound carriers is used. The second sound carrier is
+6.552&nbsp;MHz above the vision carrier and is DQPSK modulated with a
+728&nbsp;kbit/s sound and data multiplex able to carry two sound
+channels. (NICAM system)</para></footnote></para></entry>
+           <entry>+&nbsp;6.5 &plusmn;&nbsp;0.001</entry>
+           <entry>+&nbsp;5.5</entry>
+           <entry>+&nbsp;5.9996 &plusmn;&nbsp;0.0005</entry>
+           <entry>+&nbsp;5.5 &plusmn;&nbsp;0.001</entry>
+           <entry>+&nbsp;6.5 &plusmn;&nbsp;0.001</entry>
+           <entry>+&nbsp;6.5</entry>
+           <entry><para>+&nbsp;6.5 <footnote><para>In France, a
+digital carrier 5.85 MHz away from the vision carrier may be used in
+addition to the main sound carrier. It is modulated in differentially
+encoded QPSK with a 728 kbit/s sound and data multiplexer capable of
+carrying two sound channels. (NICAM
+system)</para></footnote></para></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-standard; <structfield>index</structfield>
+is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-audio.xml b/Documentation/DocBook/v4l/vidioc-g-audio.xml
new file mode 100644 (file)
index 0000000..65361a8
--- /dev/null
@@ -0,0 +1,188 @@
+<refentry id="vidioc-g-audio">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_AUDIO, VIDIOC_S_AUDIO</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_AUDIO</refname>
+    <refname>VIDIOC_S_AUDIO</refname>
+    <refpurpose>Query or select the current audio input and its
+attributes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_audio *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_audio *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_AUDIO, VIDIOC_S_AUDIO</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the current audio input applications zero out the
+<structfield>reserved</structfield> array of a &v4l2-audio;
+and call the <constant>VIDIOC_G_AUDIO</constant> ioctl with a pointer
+to this structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the device has no audio inputs, or none which combine
+with the current video input.</para>
+
+    <para>Audio inputs have one writable property, the audio mode. To
+select the current audio input <emphasis>and</emphasis> change the
+audio mode, applications initialize the
+<structfield>index</structfield> and <structfield>mode</structfield>
+fields, and the
+<structfield>reserved</structfield> array of a
+<structname>v4l2_audio</structname> structure and call the
+<constant>VIDIOC_S_AUDIO</constant> ioctl. Drivers may switch to a
+different audio mode if the request cannot be satisfied. However, this
+is a write-only ioctl, it does not return the actual new audio
+mode.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-audio">
+      <title>struct <structname>v4l2_audio</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Identifies the audio input, set by the
+driver or application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the audio input, a NUL-terminated ASCII
+string, for example: "Line In". This information is intended for the
+user, preferably the connector label on the device itself.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry>Audio capability flags, see <xref
+               linkend="audio-capability" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>mode</structfield></entry>
+           <entry>Audio mode flags set by drivers and applications (on
+           <constant>VIDIOC_S_AUDIO</constant> ioctl), see <xref linkend="audio-mode" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="audio-capability">
+      <title>Audio Capability Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_AUDCAP_STEREO</constant></entry>
+           <entry>0x00001</entry>
+           <entry>This is a stereo input. The flag is intended to
+automatically disable stereo recording etc. when the signal is always
+monaural. The API provides no means to detect if stereo is
+<emphasis>received</emphasis>, unless the audio input belongs to a
+tuner.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_AUDCAP_AVL</constant></entry>
+           <entry>0x00002</entry>
+           <entry>Automatic Volume Level mode is supported.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="audio-mode">
+      <title>Audio Mode Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_AUDMODE_AVL</constant></entry>
+           <entry>0x00001</entry>
+           <entry>AVL mode is on.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>No audio inputs combine with the current video input,
+or the number of the selected audio input is out of bounds or it does
+not combine, or there are no audio inputs at all and the ioctl is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>I/O is in progress, the input cannot be
+switched.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-audioout.xml b/Documentation/DocBook/v4l/vidioc-g-audioout.xml
new file mode 100644 (file)
index 0000000..3632730
--- /dev/null
@@ -0,0 +1,154 @@
+<refentry id="vidioc-g-audioout">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_AUDOUT, VIDIOC_S_AUDOUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_AUDOUT</refname>
+    <refname>VIDIOC_S_AUDOUT</refname>
+    <refpurpose>Query or select the current audio output</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_audioout *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_audioout *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_AUDOUT, VIDIOC_S_AUDOUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the current audio output applications zero out the
+<structfield>reserved</structfield> array of a &v4l2-audioout; and
+call the <constant>VIDIOC_G_AUDOUT</constant> ioctl with a pointer
+to this structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the device has no audio inputs, or none which combine
+with the current video output.</para>
+
+    <para>Audio outputs have no writable properties. Nevertheless, to
+select the current audio output applications can initialize the
+<structfield>index</structfield> field and
+<structfield>reserved</structfield> array (which in the future may
+contain writable properties) of a
+<structname>v4l2_audioout</structname> structure and call the
+<constant>VIDIOC_S_AUDOUT</constant> ioctl. Drivers switch to the
+requested output or return the &EINVAL; when the index is out of
+bounds. This is a write-only ioctl, it does not return the current
+audio output attributes as <constant>VIDIOC_G_AUDOUT</constant>
+does.</para>
+
+    <para>Note connectors on a TV card to loop back the received audio
+signal to a sound card are not audio outputs in this sense.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-audioout">
+      <title>struct <structname>v4l2_audioout</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Identifies the audio output, set by the
+driver or application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the audio output, a NUL-terminated ASCII
+string, for example: "Line Out". This information is intended for the
+user, preferably the connector label on the device itself.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry>Audio capability flags, none defined yet. Drivers
+must set this field to zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>mode</structfield></entry>
+           <entry>Audio mode, none defined yet. Drivers and
+applications (on <constant>VIDIOC_S_AUDOUT</constant>) must set this
+field to zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>No audio outputs combine with the current video
+output, or the number of the selected audio output is out of bounds or
+it does not combine, or there are no audio outputs at all and the
+ioctl is not supported.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>I/O is in progress, the output cannot be
+switched.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-crop.xml b/Documentation/DocBook/v4l/vidioc-g-crop.xml
new file mode 100644 (file)
index 0000000..d235b1d
--- /dev/null
@@ -0,0 +1,143 @@
+<refentry id="vidioc-g-crop">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_CROP, VIDIOC_S_CROP</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_CROP</refname>
+    <refname>VIDIOC_S_CROP</refname>
+    <refpurpose>Get or set the current cropping rectangle</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_crop *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_crop *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_CROP, VIDIOC_S_CROP</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the cropping rectangle size and position
+applications set the <structfield>type</structfield> field of a
+<structname>v4l2_crop</structname> structure to the respective buffer
+(stream) type and call the <constant>VIDIOC_G_CROP</constant> ioctl
+with a pointer to this structure. The driver fills the rest of the
+structure or returns the &EINVAL; if cropping is not supported.</para>
+
+    <para>To change the cropping rectangle applications initialize the
+<structfield>type</structfield> and &v4l2-rect; substructure named
+<structfield>c</structfield> of a v4l2_crop structure and call the
+<constant>VIDIOC_S_CROP</constant> ioctl with a pointer to this
+structure.</para>
+
+    <para>The driver first adjusts the requested dimensions against
+hardware limits, &ie; the bounds given by the capture/output window,
+and it rounds to the closest possible values of horizontal and
+vertical offset, width and height. In particular the driver must round
+the vertical offset of the cropping rectangle to frame lines modulo
+two, such that the field order cannot be confused.</para>
+
+    <para>Second the driver adjusts the image size (the opposite
+rectangle of the scaling process, source or target depending on the
+data direction) to the closest size possible while maintaining the
+current horizontal and vertical scaling factor.</para>
+
+    <para>Finally the driver programs the hardware with the actual
+cropping and image parameters. <constant>VIDIOC_S_CROP</constant> is a
+write-only ioctl, it does not return the actual parameters. To query
+them applications must call <constant>VIDIOC_G_CROP</constant> and
+&VIDIOC-G-FMT;. When the parameters are unsuitable the application may
+modify the cropping or image parameters and repeat the cycle until
+satisfactory parameters have been negotiated.</para>
+
+    <para>When cropping is not supported then no parameters are
+changed and <constant>VIDIOC_S_CROP</constant> returns the
+&EINVAL;.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-crop">
+      <title>struct <structname>v4l2_crop</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the data stream, set by the application.
+Only these types are valid here: <constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>,
+<constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>, and custom (driver
+defined) types with code <constant>V4L2_BUF_TYPE_PRIVATE</constant>
+and higher.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-rect;</entry>
+           <entry><structfield>c</structfield></entry>
+           <entry>Cropping rectangle. The same co-ordinate system as
+for &v4l2-cropcap; <structfield>bounds</structfield> is used.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>Cropping is not supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-ctrl.xml b/Documentation/DocBook/v4l/vidioc-g-ctrl.xml
new file mode 100644 (file)
index 0000000..8b5e6ff
--- /dev/null
@@ -0,0 +1,130 @@
+<refentry id="vidioc-g-ctrl">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_CTRL, VIDIOC_S_CTRL</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_CTRL</refname>
+    <refname>VIDIOC_S_CTRL</refname>
+    <refpurpose>Get or set the value of a control</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_control
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_CTRL, VIDIOC_S_CTRL</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To get the current value of a control applications
+initialize the <structfield>id</structfield> field of a struct
+<structname>v4l2_control</structname> and call the
+<constant>VIDIOC_G_CTRL</constant> ioctl with a pointer to this
+structure. To change the value of a control applications initialize
+the <structfield>id</structfield> and <structfield>value</structfield>
+fields of a struct <structname>v4l2_control</structname> and call the
+<constant>VIDIOC_S_CTRL</constant> ioctl.</para>
+
+    <para>When the <structfield>id</structfield> is invalid drivers
+return an &EINVAL;. When the <structfield>value</structfield> is out
+of bounds drivers can choose to take the closest valid value or return
+an &ERANGE;, whatever seems more appropriate. However,
+<constant>VIDIOC_S_CTRL</constant> is a write-only ioctl, it does not
+return the actual new value.</para>
+
+    <para>These ioctls work only with user controls. For other
+control classes the &VIDIOC-G-EXT-CTRLS;, &VIDIOC-S-EXT-CTRLS; or
+&VIDIOC-TRY-EXT-CTRLS; must be used.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-control">
+      <title>struct <structname>v4l2_control</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>Identifies the control, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>value</structfield></entry>
+           <entry>New value or current value.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-control; <structfield>id</structfield> is
+invalid.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ERANGE</errorcode></term>
+       <listitem>
+         <para>The &v4l2-control; <structfield>value</structfield>
+is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The control is temporarily not changeable, possibly
+because another applications took over control of the device function
+this control belongs to.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-enc-index.xml b/Documentation/DocBook/v4l/vidioc-g-enc-index.xml
new file mode 100644 (file)
index 0000000..9f242e4
--- /dev/null
@@ -0,0 +1,213 @@
+<refentry id="vidioc-g-enc-index">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_ENC_INDEX</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_ENC_INDEX</refname>
+    <refpurpose>Get meta data about a compressed video stream</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_enc_idx *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_ENC_INDEX</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <note>
+      <title>Experimental</title>
+
+      <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+    </note>
+
+    <para>The <constant>VIDIOC_G_ENC_INDEX</constant> ioctl provides
+meta data about a compressed video stream the same or another
+application currently reads from the driver, which is useful for
+random access into the stream without decoding it.</para>
+
+    <para>To read the data applications must call
+<constant>VIDIOC_G_ENC_INDEX</constant> with a pointer to a
+&v4l2-enc-idx;. On success the driver fills the
+<structfield>entry</structfield> array, stores the number of elements
+written in the <structfield>entries</structfield> field, and
+initializes the <structfield>entries_cap</structfield> field.</para>
+
+    <para>Each element of the <structfield>entry</structfield> array
+contains meta data about one picture. A
+<constant>VIDIOC_G_ENC_INDEX</constant> call reads up to
+<constant>V4L2_ENC_IDX_ENTRIES</constant> entries from a driver
+buffer, which can hold up to <structfield>entries_cap</structfield>
+entries. This number can be lower or higher than
+<constant>V4L2_ENC_IDX_ENTRIES</constant>, but not zero. When the
+application fails to read the meta data in time the oldest entries
+will be lost. When the buffer is empty or no capturing/encoding is in
+progress, <structfield>entries</structfield> will be zero.</para>
+
+    <para>Currently this ioctl is only defined for MPEG-2 program
+streams and video elementary streams.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-enc-idx">
+      <title>struct <structname>v4l2_enc_idx</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>entries</structfield></entry>
+           <entry>The number of entries the driver stored in the
+<structfield>entry</structfield> array.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>entries_cap</structfield></entry>
+           <entry>The number of entries the driver can
+buffer. Must be greater than zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry spanname="hspan">Reserved for future extensions.
+Drivers must set the array to zero.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-enc-idx-entry;</entry>
+           <entry><structfield>entry</structfield>[<constant>V4L2_ENC_IDX_ENTRIES</constant>]</entry>
+           <entry>Meta data about a compressed video stream. Each
+element of the array corresponds to one picture, sorted in ascending
+order by their <structfield>offset</structfield>.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-enc-idx-entry">
+      <title>struct <structname>v4l2_enc_idx_entry</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u64</entry>
+           <entry><structfield>offset</structfield></entry>
+           <entry>The offset in bytes from the beginning of the
+compressed video stream to the beginning of this picture, that is a
+<wordasword>PES packet header</wordasword> as defined in <xref
+           linkend="mpeg2part1" /> or a <wordasword>picture
+header</wordasword> as defined in <xref linkend="mpeg2part2" />. When
+the encoder is stopped, the driver resets the offset to zero.</entry>
+         </row>
+         <row>
+           <entry>__u64</entry>
+           <entry><structfield>pts</structfield></entry>
+           <entry>The 33 bit <wordasword>Presentation Time
+Stamp</wordasword> of this picture as defined in <xref
+               linkend="mpeg2part1" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>length</structfield></entry>
+           <entry>The length of this picture in bytes.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry>Flags containing the coding type of this picture, see <xref
+               linkend="enc-idx-flags" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>Reserved for future extensions.
+Drivers must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="enc-idx-flags">
+      <title>Index Entry Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_ENC_IDX_FRAME_I</constant></entry>
+           <entry>0x00</entry>
+           <entry>This is an Intra-coded picture.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_IDX_FRAME_P</constant></entry>
+           <entry>0x01</entry>
+           <entry>This is a Predictive-coded picture.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_IDX_FRAME_B</constant></entry>
+           <entry>0x02</entry>
+           <entry>This is a Bidirectionally predictive-coded
+picture.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_ENC_IDX_FRAME_MASK</constant></entry>
+           <entry>0x0F</entry>
+           <entry><wordasword>AND</wordasword> the flags field with
+this mask to obtain the picture coding type.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The driver does not support this ioctl.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml
new file mode 100644 (file)
index 0000000..3aa7f8f
--- /dev/null
@@ -0,0 +1,307 @@
+<refentry id="vidioc-g-ext-ctrls">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_EXT_CTRLS, VIDIOC_S_EXT_CTRLS,
+VIDIOC_TRY_EXT_CTRLS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_EXT_CTRLS</refname>
+    <refname>VIDIOC_S_EXT_CTRLS</refname>
+    <refname>VIDIOC_TRY_EXT_CTRLS</refname>
+    <refpurpose>Get or set the value of several controls, try control
+values</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_ext_controls
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_EXT_CTRLS, VIDIOC_S_EXT_CTRLS,
+VIDIOC_TRY_EXT_CTRLS</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>These ioctls allow the caller to get or set multiple
+controls atomically. Control IDs are grouped into control classes (see
+<xref linkend="ctrl-class" />) and all controls in the control array
+must belong to the same control class.</para>
+
+    <para>Applications must always fill in the
+<structfield>count</structfield>,
+<structfield>ctrl_class</structfield>,
+<structfield>controls</structfield> and
+<structfield>reserved</structfield> fields of &v4l2-ext-controls;, and
+initialize the &v4l2-ext-control; array pointed to by the
+<structfield>controls</structfield> fields.</para>
+
+    <para>To get the current value of a set of controls applications
+initialize the <structfield>id</structfield>,
+<structfield>size</structfield> and <structfield>reserved2</structfield> fields
+of each &v4l2-ext-control; and call the
+<constant>VIDIOC_G_EXT_CTRLS</constant> ioctl. String controls controls
+must also set the <structfield>string</structfield> field.</para>
+
+    <para>If the <structfield>size</structfield> is too small to
+receive the control result (only relevant for pointer-type controls
+like strings), then the driver will set <structfield>size</structfield>
+to a valid value and return an &ENOSPC;. You should re-allocate the
+string memory to this new size and try again. It is possible that the
+same issue occurs again if the string has grown in the meantime. It is
+recommended to call &VIDIOC-QUERYCTRL; first and use
+<structfield>maximum</structfield>+1 as the new <structfield>size</structfield>
+value. It is guaranteed that that is sufficient memory.
+</para>
+
+    <para>To change the value of a set of controls applications
+initialize the <structfield>id</structfield>, <structfield>size</structfield>,
+<structfield>reserved2</structfield> and
+<structfield>value/string</structfield> fields of each &v4l2-ext-control; and
+call the <constant>VIDIOC_S_EXT_CTRLS</constant> ioctl. The controls
+will only be set if <emphasis>all</emphasis> control values are
+valid.</para>
+
+    <para>To check if a set of controls have correct values applications
+initialize the <structfield>id</structfield>, <structfield>size</structfield>,
+<structfield>reserved2</structfield> and
+<structfield>value/string</structfield> fields of each &v4l2-ext-control; and
+call the <constant>VIDIOC_TRY_EXT_CTRLS</constant> ioctl. It is up to
+the driver whether wrong values are automatically adjusted to a valid
+value or if an error is returned.</para>
+
+    <para>When the <structfield>id</structfield> or
+<structfield>ctrl_class</structfield> is invalid drivers return an
+&EINVAL;. When the value is out of bounds drivers can choose to take
+the closest valid value or return an &ERANGE;, whatever seems more
+appropriate. In the first case the new value is set in
+&v4l2-ext-control;.</para>
+
+    <para>The driver will only set/get these controls if all control
+values are correct. This prevents the situation where only some of the
+controls were set/get. Only low-level errors (&eg; a failed i2c
+command) can still cause this situation.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-ext-control">
+      <title>struct <structname>v4l2_ext_control</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry></entry>
+           <entry>Identifies the control, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>size</structfield></entry>
+           <entry></entry>
+           <entry>The total size in bytes of the payload of this
+control. This is normally 0, but for pointer controls this should be
+set to the size of the memory containing the payload, or that will
+receive the payload. If <constant>VIDIOC_G_EXT_CTRLS</constant> finds
+that this value is less than is required to store
+the payload result, then it is set to a value large enough to store the
+payload result and ENOSPC is returned. Note that for string controls
+this <structfield>size</structfield> field should not be confused with the length of the string.
+This field refers to the size of the memory that contains the string.
+The actual <emphasis>length</emphasis> of the string may well be much smaller.
+</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved2</structfield>[1]</entry>
+           <entry></entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry>(anonymous)</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__s32</entry>
+           <entry><structfield>value</structfield></entry>
+           <entry>New value or current value.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__s64</entry>
+           <entry><structfield>value64</structfield></entry>
+           <entry>New value or current value.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>char *</entry>
+           <entry><structfield>string</structfield></entry>
+           <entry>A pointer to a string.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-ext-controls">
+      <title>struct <structname>v4l2_ext_controls</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>ctrl_class</structfield></entry>
+           <entry>The control class to which all controls belong, see
+<xref linkend="ctrl-class" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>count</structfield></entry>
+           <entry>The number of controls in the controls array. May
+also be zero.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>error_idx</structfield></entry>
+           <entry>Set by the driver in case of an error. It is the
+index of the control causing the error or equal to 'count' when the
+error is not associated with a particular control. Undefined when the
+ioctl returns 0 (success).</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-ext-control; *</entry>
+           <entry><structfield>controls</structfield></entry>
+           <entry>Pointer to an array of
+<structfield>count</structfield> v4l2_ext_control structures. Ignored
+if <structfield>count</structfield> equals zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="ctrl-class">
+      <title>Control classes</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CTRL_CLASS_USER</constant></entry>
+           <entry>0x980000</entry>
+           <entry>The class containing user controls. These controls
+are described in <xref linkend="control" />. All controls that can be set
+using the &VIDIOC-S-CTRL; and &VIDIOC-G-CTRL; ioctl belong to this
+class.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_CLASS_MPEG</constant></entry>
+           <entry>0x990000</entry>
+           <entry>The class containing MPEG compression controls.
+These controls are described in <xref
+               linkend="mpeg-controls" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_CLASS_CAMERA</constant></entry>
+           <entry>0x9a0000</entry>
+           <entry>The class containing camera controls.
+These controls are described in <xref
+               linkend="camera-controls" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_CLASS_FM_TX</constant></entry>
+           <entry>0x9b0000</entry>
+           <entry>The class containing FM Transmitter (FM TX) controls.
+These controls are described in <xref
+               linkend="fm-tx-controls" />.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-ext-control; <structfield>id</structfield>
+is invalid or the &v4l2-ext-controls;
+<structfield>ctrl_class</structfield> is invalid. This error code is
+also returned by the <constant>VIDIOC_S_EXT_CTRLS</constant> and
+<constant>VIDIOC_TRY_EXT_CTRLS</constant> ioctls if two or more
+control values are in conflict.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ERANGE</errorcode></term>
+       <listitem>
+         <para>The &v4l2-ext-control; <structfield>value</structfield>
+is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The control is temporarily not changeable, possibly
+because another applications took over control of the device function
+this control belongs to.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOSPC</errorcode></term>
+       <listitem>
+         <para>The space reserved for the control's payload is insufficient.
+The field <structfield>size</structfield> is set to a value that is enough
+to store the payload and this error code is returned.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-fbuf.xml b/Documentation/DocBook/v4l/vidioc-g-fbuf.xml
new file mode 100644 (file)
index 0000000..f701706
--- /dev/null
@@ -0,0 +1,456 @@
+<refentry id="vidioc-g-fbuf">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_FBUF, VIDIOC_S_FBUF</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_FBUF</refname>
+    <refname>VIDIOC_S_FBUF</refname>
+    <refpurpose>Get or set frame buffer overlay parameters</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_framebuffer *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_framebuffer *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_FBUF, VIDIOC_S_FBUF</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Applications can use the <constant>VIDIOC_G_FBUF</constant> and
+<constant>VIDIOC_S_FBUF</constant> ioctl to get and set the
+framebuffer parameters for a <link linkend="overlay">Video
+Overlay</link> or <link linkend="osd">Video Output Overlay</link>
+(OSD). The type of overlay is implied by the device type (capture or
+output device) and can be determined with the &VIDIOC-QUERYCAP; ioctl.
+One <filename>/dev/videoN</filename> device must not support both
+kinds of overlay.</para>
+
+    <para>The V4L2 API distinguishes destructive and non-destructive
+overlays. A destructive overlay copies captured video images into the
+video memory of a graphics card. A non-destructive overlay blends
+video images into a VGA signal or graphics into a video signal.
+<wordasword>Video Output Overlays</wordasword> are always
+non-destructive.</para>
+
+    <para>To get the current parameters applications call the
+<constant>VIDIOC_G_FBUF</constant> ioctl with a pointer to a
+<structname>v4l2_framebuffer</structname> structure. The driver fills
+all fields of the structure or returns an &EINVAL; when overlays are
+not supported.</para>
+
+    <para>To set the parameters for a <wordasword>Video Output
+Overlay</wordasword>, applications must initialize the
+<structfield>flags</structfield> field of a struct
+<structname>v4l2_framebuffer</structname>. Since the framebuffer is
+implemented on the TV card all other parameters are determined by the
+driver. When an application calls <constant>VIDIOC_S_FBUF</constant>
+with a pointer to this structure, the driver prepares for the overlay
+and returns the framebuffer parameters as
+<constant>VIDIOC_G_FBUF</constant> does, or it returns an error
+code.</para>
+
+    <para>To set the parameters for a <wordasword>non-destructive
+Video Overlay</wordasword>, applications must initialize the
+<structfield>flags</structfield> field, the
+<structfield>fmt</structfield> substructure, and call
+<constant>VIDIOC_S_FBUF</constant>. Again the driver prepares for the
+overlay and returns the framebuffer parameters as
+<constant>VIDIOC_G_FBUF</constant> does, or it returns an error
+code.</para>
+
+    <para>For a <wordasword>destructive Video Overlay</wordasword>
+applications must additionally provide a
+<structfield>base</structfield> address. Setting up a DMA to a
+random memory location can jeopardize the system security, its
+stability or even damage the hardware, therefore only the superuser
+can set the parameters for a destructive video overlay.</para>
+
+    <!-- NB v4l2_pix_format is also specified in pixfmt.sgml.-->
+
+    <table pgwide="1" frame="none" id="v4l2-framebuffer">
+      <title>struct <structname>v4l2_framebuffer</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry></entry>
+           <entry>Overlay capability flags set by the driver, see
+<xref linkend="framebuffer-cap" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry></entry>
+           <entry>Overlay control flags set by application and
+driver, see <xref linkend="framebuffer-flags" /></entry>
+         </row>
+         <row>
+           <entry>void *</entry>
+           <entry><structfield>base</structfield></entry>
+           <entry></entry>
+           <entry>Physical base address of the framebuffer,
+that is the address of the pixel in the top left corner of the
+framebuffer.<footnote><para>A physical base address may not suit all
+platforms. GK notes in theory we should pass something like PCI device
++ memory region + offset instead. If you encounter problems please
+discuss on the linux-media mailing list: &v4l-ml;.</para></footnote></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>This field is irrelevant to
+<wordasword>non-destructive Video Overlays</wordasword>. For
+<wordasword>destructive Video Overlays</wordasword> applications must
+provide a base address. The driver may accept only base addresses
+which are a multiple of two, four or eight bytes. For
+<wordasword>Video Output Overlays</wordasword> the driver must return
+a valid base address, so applications can find the corresponding Linux
+framebuffer device (see <xref linkend="osd" />).</entry>
+         </row>
+         <row>
+           <entry>&v4l2-pix-format;</entry>
+           <entry><structfield>fmt</structfield></entry>
+           <entry></entry>
+           <entry>Layout of the frame buffer. The
+<structname>v4l2_pix_format</structname> structure is defined in <xref
+linkend="pixfmt" />, for clarification the fields and acceptable values
+           are listed below:</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>width</structfield></entry>
+           <entry>Width of the frame buffer in pixels.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>height</structfield></entry>
+           <entry>Height of the frame buffer in pixels.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>pixelformat</structfield></entry>
+           <entry>The pixel format of the
+framebuffer.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>For <wordasword>non-destructive Video
+Overlays</wordasword> this field only defines a format for the
+&v4l2-window; <structfield>chromakey</structfield> field.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>For <wordasword>destructive Video
+Overlays</wordasword> applications must initialize this field. For
+<wordasword>Video Output Overlays</wordasword> the driver must return
+a valid format.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry></entry>
+           <entry>Usually this is an RGB format (for example
+<link linkend="V4L2-PIX-FMT-RGB565"><constant>V4L2_PIX_FMT_RGB565</constant></link>)
+but YUV formats (only packed YUV formats when chroma keying is used,
+not including <constant>V4L2_PIX_FMT_YUYV</constant> and
+<constant>V4L2_PIX_FMT_UYVY</constant>) and the
+<constant>V4L2_PIX_FMT_PAL8</constant> format are also permitted. The
+behavior of the driver when an application requests a compressed
+format is undefined. See <xref linkend="pixfmt" /> for information on
+pixel formats.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-field;</entry>
+           <entry><structfield>field</structfield></entry>
+           <entry>Drivers and applications shall ignore this field.
+If applicable, the field order is selected with the &VIDIOC-S-FMT;
+ioctl, using the <structfield>field</structfield> field of
+&v4l2-window;.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>bytesperline</structfield></entry>
+           <entry>Distance in bytes between the leftmost pixels in
+two adjacent lines.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>This field is irrelevant to
+<wordasword>non-destructive Video
+Overlays</wordasword>.</para><para>For <wordasword>destructive Video
+Overlays</wordasword> both applications and drivers can set this field
+to request padding bytes at the end of each line. Drivers however may
+ignore the requested value, returning <structfield>width</structfield>
+times bytes-per-pixel or a larger value required by the hardware. That
+implies applications can just set this field to zero to get a
+reasonable default.</para><para>For <wordasword>Video Output
+Overlays</wordasword> the driver must return a valid
+value.</para><para>Video hardware may access padding bytes, therefore
+they must reside in accessible memory. Consider for example the case
+where padding bytes after the last line of an image cross a system
+page boundary. Capture devices may write padding bytes, the value is
+undefined. Output devices ignore the contents of padding
+bytes.</para><para>When the image format is planar the
+<structfield>bytesperline</structfield> value applies to the largest
+plane and is divided by the same factor as the
+<structfield>width</structfield> field for any smaller planes. For
+example the Cb and Cr planes of a YUV 4:2:0 image have half as many
+padding bytes following each line as the Y plane. To avoid ambiguities
+drivers must return a <structfield>bytesperline</structfield> value
+rounded up to a multiple of the scale factor.</para></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>sizeimage</structfield></entry>
+           <entry><para>This field is irrelevant to
+<wordasword>non-destructive Video Overlays</wordasword>. For
+<wordasword>destructive Video Overlays</wordasword> applications must
+initialize this field. For <wordasword>Video Output
+Overlays</wordasword> the driver must return a valid
+format.</para><para>Together with <structfield>base</structfield> it
+defines the framebuffer memory accessible by the
+driver.</para></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-colorspace;</entry>
+           <entry><structfield>colorspace</structfield></entry>
+           <entry>This information supplements the
+<structfield>pixelformat</structfield> and must be set by the driver,
+see <xref linkend="colorspaces" />.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u32</entry>
+           <entry><structfield>priv</structfield></entry>
+           <entry>Reserved for additional information about custom
+(driver defined) formats. When not used drivers and applications must
+set this field to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="framebuffer-cap">
+      <title>Frame Buffer Capability Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_EXTERNOVERLAY</constant></entry>
+           <entry>0x0001</entry>
+           <entry>The device is capable of non-destructive overlays.
+When the driver clears this flag, only destructive overlays are
+supported. There are no drivers yet which support both destructive and
+non-destructive overlays.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_CHROMAKEY</constant></entry>
+           <entry>0x0002</entry>
+           <entry>The device supports clipping by chroma-keying the
+images. That is, image pixels replace pixels in the VGA or video
+signal only where the latter assume a certain color. Chroma-keying
+makes no sense for destructive overlays.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_LIST_CLIPPING</constant></entry>
+           <entry>0x0004</entry>
+           <entry>The device supports clipping using a list of clip
+rectangles.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_BITMAP_CLIPPING</constant></entry>
+           <entry>0x0008</entry>
+           <entry>The device supports clipping using a bit mask.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_LOCAL_ALPHA</constant></entry>
+           <entry>0x0010</entry>
+           <entry>The device supports clipping/blending using the
+alpha channel of the framebuffer or VGA signal. Alpha blending makes
+no sense for destructive overlays.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_GLOBAL_ALPHA</constant></entry>
+           <entry>0x0020</entry>
+           <entry>The device supports alpha blending using a global
+alpha value. Alpha blending makes no sense for destructive overlays.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_CAP_LOCAL_INV_ALPHA</constant></entry>
+           <entry>0x0040</entry>
+           <entry>The device supports clipping/blending using the
+inverted alpha channel of the framebuffer or VGA signal. Alpha
+blending makes no sense for destructive overlays.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="framebuffer-flags">
+      <title>Frame Buffer Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_PRIMARY</constant></entry>
+           <entry>0x0001</entry>
+           <entry>The framebuffer is the primary graphics surface.
+In other words, the overlay is destructive. [?]</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_OVERLAY</constant></entry>
+           <entry>0x0002</entry>
+           <entry>The frame buffer is an overlay surface the same
+size as the capture. [?]</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">The purpose of
+<constant>V4L2_FBUF_FLAG_PRIMARY</constant> and
+<constant>V4L2_FBUF_FLAG_OVERLAY</constant> was never quite clear.
+Most drivers seem to ignore these flags. For compatibility with the
+<wordasword>bttv</wordasword> driver applications should set the
+<constant>V4L2_FBUF_FLAG_OVERLAY</constant> flag.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_CHROMAKEY</constant></entry>
+           <entry>0x0004</entry>
+           <entry>Use chroma-keying. The chroma-key color is
+determined by the <structfield>chromakey</structfield> field of
+&v4l2-window; and negotiated with the &VIDIOC-S-FMT; ioctl, see <xref
+               linkend="overlay" />
+and
+           <xref linkend="osd" />.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan">There are no flags to enable
+clipping using a list of clip rectangles or a bitmap. These methods
+are negotiated with the &VIDIOC-S-FMT; ioctl, see <xref
+               linkend="overlay" /> and <xref linkend="osd" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_LOCAL_ALPHA</constant></entry>
+           <entry>0x0008</entry>
+           <entry>Use the alpha channel of the framebuffer to clip or
+blend framebuffer pixels with video images. The blend
+function is: output = framebuffer pixel * alpha + video pixel * (1 -
+alpha). The actual alpha depth depends on the framebuffer pixel
+format.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_GLOBAL_ALPHA</constant></entry>
+           <entry>0x0010</entry>
+           <entry>Use a global alpha value to blend the framebuffer
+with video images. The blend function is: output = (framebuffer pixel
+* alpha + video pixel * (255 - alpha)) / 255. The alpha value is
+determined by the <structfield>global_alpha</structfield> field of
+&v4l2-window; and negotiated with the &VIDIOC-S-FMT; ioctl, see <xref
+               linkend="overlay" />
+and <xref linkend="osd" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_FBUF_FLAG_LOCAL_INV_ALPHA</constant></entry>
+           <entry>0x0020</entry>
+           <entry>Like
+<constant>V4L2_FBUF_FLAG_LOCAL_ALPHA</constant>, use the alpha channel
+of the framebuffer to clip or blend framebuffer pixels with video
+images, but with an inverted alpha value. The blend function is:
+output = framebuffer pixel * (1 - alpha) + video pixel * alpha. The
+actual alpha depth depends on the framebuffer pixel format.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EPERM</errorcode></term>
+       <listitem>
+         <para><constant>VIDIOC_S_FBUF</constant> can only be called
+by a privileged user to negotiate the parameters for a destructive
+overlay.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The framebuffer parameters cannot be changed at this
+time because overlay is already enabled, or capturing is enabled
+and the hardware cannot capture and overlay simultaneously.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The ioctl is not supported or the
+<constant>VIDIOC_S_FBUF</constant> parameters are unsuitable.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-fmt.xml b/Documentation/DocBook/v4l/vidioc-g-fmt.xml
new file mode 100644 (file)
index 0000000..7c7d1b7
--- /dev/null
@@ -0,0 +1,201 @@
+<refentry id="vidioc-g-fmt">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_FMT, VIDIOC_S_FMT,
+VIDIOC_TRY_FMT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_FMT</refname>
+    <refname>VIDIOC_S_FMT</refname>
+    <refname>VIDIOC_TRY_FMT</refname>
+    <refpurpose>Get or set the data format, try a format</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_format
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_FMT, VIDIOC_S_FMT, VIDIOC_TRY_FMT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>These ioctls are used to negotiate the format of data
+(typically image format) exchanged between driver and
+application.</para>
+
+    <para>To query the current parameters applications set the
+<structfield>type</structfield> field of a struct
+<structname>v4l2_format</structname> to the respective buffer (stream)
+type. For example video capture devices use
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>. When the application
+calls the <constant>VIDIOC_G_FMT</constant> ioctl with a pointer to
+this structure the driver fills the respective member of the
+<structfield>fmt</structfield> union. In case of video capture devices
+that is the &v4l2-pix-format; <structfield>pix</structfield> member.
+When the requested buffer type is not supported drivers return an
+&EINVAL;.</para>
+
+    <para>To change the current format parameters applications
+initialize the <structfield>type</structfield> field and all
+fields of the respective <structfield>fmt</structfield>
+union member. For details see the documentation of the various devices
+types in <xref linkend="devices" />. Good practice is to query the
+current parameters first, and to
+modify only those parameters not suitable for the application. When
+the application calls the <constant>VIDIOC_S_FMT</constant> ioctl
+with a pointer to a <structname>v4l2_format</structname> structure
+the driver checks
+and adjusts the parameters against hardware abilities. Drivers
+should not return an error code unless the input is ambiguous, this is
+a mechanism to fathom device capabilities and to approach parameters
+acceptable for both the application and driver. On success the driver
+may program the hardware, allocate resources and generally prepare for
+data exchange.
+Finally the <constant>VIDIOC_S_FMT</constant> ioctl returns the
+current format parameters as <constant>VIDIOC_G_FMT</constant> does.
+Very simple, inflexible devices may even ignore all input and always
+return the default parameters. However all V4L2 devices exchanging
+data with the application must implement the
+<constant>VIDIOC_G_FMT</constant> and
+<constant>VIDIOC_S_FMT</constant> ioctl. When the requested buffer
+type is not supported drivers return an &EINVAL; on a
+<constant>VIDIOC_S_FMT</constant> attempt. When I/O is already in
+progress or the resource is not available for other reasons drivers
+return the &EBUSY;.</para>
+
+    <para>The <constant>VIDIOC_TRY_FMT</constant> ioctl is equivalent
+to <constant>VIDIOC_S_FMT</constant> with one exception: it does not
+change driver state. It can also be called at any time, never
+returning <errorcode>EBUSY</errorcode>. This function is provided to
+negotiate parameters, to learn about hardware limitations, without
+disabling I/O or possibly time consuming hardware preparations.
+Although strongly recommended drivers are not required to implement
+this ioctl.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-format">
+      <title>struct <structname>v4l2_format</structname></title>
+      <tgroup cols="4">
+       <colspec colname="c1" />
+       <colspec colname="c2" />
+       <colspec colname="c3" />
+       <colspec colname="c4" />
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry></entry>
+           <entry>Type of the data stream, see <xref
+               linkend="v4l2-buf-type" />.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry><structfield>fmt</structfield></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-pix-format;</entry>
+           <entry><structfield>pix</structfield></entry>
+           <entry>Definition of an image format, see <xref
+               linkend="pixfmt" />, used by video capture and output
+devices.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-window;</entry>
+           <entry><structfield>win</structfield></entry>
+           <entry>Definition of an overlaid image, see <xref
+           linkend="overlay" />, used by video overlay devices.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-vbi-format;</entry>
+           <entry><structfield>vbi</structfield></entry>
+           <entry>Raw VBI capture or output parameters. This is
+discussed in more detail in <xref linkend="raw-vbi" />. Used by raw VBI
+capture and output devices.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-sliced-vbi-format;</entry>
+           <entry><structfield>sliced</structfield></entry>
+           <entry>Sliced VBI capture or output parameters. See
+<xref linkend="sliced" /> for details. Used by sliced VBI
+capture and output devices.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u8</entry>
+           <entry><structfield>raw_data</structfield>[200]</entry>
+           <entry>Place holder for future extensions and custom
+(driver defined) formats with <structfield>type</structfield>
+<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The data format cannot be changed at this
+time, for example because I/O is already in progress.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-format; <structfield>type</structfield>
+field is invalid, the requested buffer type not supported, or
+<constant>VIDIOC_TRY_FMT</constant> was called and is not
+supported with this buffer type.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/v4l/vidioc-g-frequency.xml
new file mode 100644 (file)
index 0000000..062d720
--- /dev/null
@@ -0,0 +1,145 @@
+<refentry id="vidioc-g-frequency">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_FREQUENCY, VIDIOC_S_FREQUENCY</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_FREQUENCY</refname>
+    <refname>VIDIOC_S_FREQUENCY</refname>
+    <refpurpose>Get or set tuner or modulator radio
+frequency</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_frequency
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_frequency
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_FREQUENCY, VIDIOC_S_FREQUENCY</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To get the current tuner or modulator radio frequency
+applications set the <structfield>tuner</structfield> field of a
+&v4l2-frequency; to the respective tuner or modulator number (only
+input devices have tuners, only output devices have modulators), zero
+out the <structfield>reserved</structfield> array and
+call the <constant>VIDIOC_G_FREQUENCY</constant> ioctl with a pointer
+to this structure. The driver stores the current frequency in the
+<structfield>frequency</structfield> field.</para>
+
+    <para>To change the current tuner or modulator radio frequency
+applications initialize the <structfield>tuner</structfield>,
+<structfield>type</structfield> and
+<structfield>frequency</structfield> fields, and the
+<structfield>reserved</structfield> array of a &v4l2-frequency; and
+call the <constant>VIDIOC_S_FREQUENCY</constant> ioctl with a pointer
+to this structure. When the requested frequency is not possible the
+driver assumes the closest possible value. However
+<constant>VIDIOC_S_FREQUENCY</constant> is a write-only ioctl, it does
+not return the actual new frequency.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-frequency">
+      <title>struct <structname>v4l2_frequency</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>tuner</structfield></entry>
+           <entry>The tuner or modulator index number. This is the
+same value as in the &v4l2-input; <structfield>tuner</structfield>
+field and the &v4l2-tuner; <structfield>index</structfield> field, or
+the &v4l2-output; <structfield>modulator</structfield> field and the
+&v4l2-modulator; <structfield>index</structfield> field.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-tuner-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>The tuner type. This is the same value as in the
+&v4l2-tuner; <structfield>type</structfield> field. The field is not
+applicable to modulators, &ie; ignored by drivers.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>frequency</structfield></entry>
+           <entry>Tuning frequency in units of 62.5 kHz, or if the
+&v4l2-tuner; or &v4l2-modulator; <structfield>capabilities</structfield> flag
+<constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[8]</entry>
+           <entry>Reserved for future extensions. Drivers and
+           applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <structfield>tuner</structfield> index is out of
+bounds or the value in the <structfield>type</structfield> field is
+wrong.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-input.xml b/Documentation/DocBook/v4l/vidioc-g-input.xml
new file mode 100644 (file)
index 0000000..ed076e9
--- /dev/null
@@ -0,0 +1,100 @@
+<refentry id="vidioc-g-input">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_INPUT, VIDIOC_S_INPUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_INPUT</refname>
+    <refname>VIDIOC_S_INPUT</refname>
+    <refpurpose>Query or select the current video input</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>int *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_INPUT, VIDIOC_S_INPUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the current video input applications call the
+<constant>VIDIOC_G_INPUT</constant> ioctl with a pointer to an integer
+where the driver stores the number of the input, as in the
+&v4l2-input; <structfield>index</structfield> field. This ioctl will
+fail only when there are no video inputs, returning
+<errorcode>EINVAL</errorcode>.</para>
+
+    <para>To select a video input applications store the number of the
+desired input in an integer and call the
+<constant>VIDIOC_S_INPUT</constant> ioctl with a pointer to this
+integer. Side effects are possible. For example inputs may support
+different video standards, so the driver may implicitly switch the
+current standard. It is good practice to select an input before
+querying or negotiating any other parameters.</para>
+
+    <para>Information about video inputs is available using the
+&VIDIOC-ENUMINPUT; ioctl.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The number of the video input is out of bounds, or
+there are no video inputs at all and this ioctl is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>I/O is in progress, the input cannot be
+switched.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml b/Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml
new file mode 100644 (file)
index 0000000..77394b2
--- /dev/null
@@ -0,0 +1,180 @@
+<refentry id="vidioc-g-jpegcomp">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_JPEGCOMP, VIDIOC_S_JPEGCOMP</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_JPEGCOMP</refname>
+    <refname>VIDIOC_S_JPEGCOMP</refname>
+    <refpurpose></refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>v4l2_jpegcompression *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const v4l2_jpegcompression *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_JPEGCOMP, VIDIOC_S_JPEGCOMP</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>[to do]</para>
+
+    <para>Ronald Bultje elaborates:</para>
+
+    <!-- See video4linux-list@redhat.com on 16 Oct 2002, subject
+"Re: [V4L] Re: v4l2 api / Zoran v4l2_jpegcompression" -->
+
+    <para>APP is some application-specific information. The
+application can set it itself, and it'll be stored in the JPEG-encoded
+fields (eg; interlacing information for in an AVI or so). COM is the
+same, but it's comments, like 'encoded by me' or so.</para>
+
+    <para>jpeg_markers describes whether the huffman tables,
+quantization tables and the restart interval information (all
+JPEG-specific stuff) should be stored in the JPEG-encoded fields.
+These define how the JPEG field is encoded. If you omit them,
+applications assume you've used standard encoding. You usually do want
+to add them.</para>
+
+    <!-- NB VIDIOC_S_JPEGCOMP is w/o. -->
+
+    <table pgwide="1" frame="none" id="v4l2-jpegcompression">
+      <title>struct <structname>v4l2_jpegcompression</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>int</entry>
+           <entry><structfield>quality</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>int</entry>
+           <entry><structfield>APPn</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>int</entry>
+           <entry><structfield>APP_len</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>char</entry>
+           <entry><structfield>APP_data</structfield>[60]</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>int</entry>
+           <entry><structfield>COM_len</structfield></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>char</entry>
+           <entry><structfield>COM_data</structfield>[60]</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>jpeg_markers</structfield></entry>
+           <entry>See <xref linkend="jpeg-markers" />.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="jpeg-markers">
+      <title>JPEG Markers Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_JPEG_MARKER_DHT</constant></entry>
+           <entry>(1&lt;&lt;3)</entry>
+           <entry>Define Huffman Tables</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_JPEG_MARKER_DQT</constant></entry>
+           <entry>(1&lt;&lt;4)</entry>
+           <entry>Define Quantization Tables</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_JPEG_MARKER_DRI</constant></entry>
+           <entry>(1&lt;&lt;5)</entry>
+           <entry>Define Restart Interval</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_JPEG_MARKER_COM</constant></entry>
+           <entry>(1&lt;&lt;6)</entry>
+           <entry>Comment segment</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_JPEG_MARKER_APP</constant></entry>
+           <entry>(1&lt;&lt;7)</entry>
+           <entry>App segment, driver will always use APP0</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>This ioctl is not supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-modulator.xml b/Documentation/DocBook/v4l/vidioc-g-modulator.xml
new file mode 100644 (file)
index 0000000..15ce660
--- /dev/null
@@ -0,0 +1,246 @@
+<refentry id="vidioc-g-modulator">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_MODULATOR, VIDIOC_S_MODULATOR</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_MODULATOR</refname>
+    <refname>VIDIOC_S_MODULATOR</refname>
+    <refpurpose>Get or set modulator attributes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_modulator
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_modulator
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_MODULATOR, VIDIOC_S_MODULATOR</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a modulator applications initialize
+the <structfield>index</structfield> field and zero out the
+<structfield>reserved</structfield> array of a &v4l2-modulator; and
+call the <constant>VIDIOC_G_MODULATOR</constant> ioctl with a pointer
+to this structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all modulators
+applications shall begin at index zero, incrementing by one until the
+driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <para>Modulators have two writable properties, an audio
+modulation set and the radio frequency. To change the modulated audio
+subprograms, applications initialize the <structfield>index
+</structfield> and <structfield>txsubchans</structfield> fields and the
+<structfield>reserved</structfield> array and call the
+<constant>VIDIOC_S_MODULATOR</constant> ioctl. Drivers may choose a
+different audio modulation if the request cannot be satisfied. However
+this is a write-only ioctl, it does not return the actual audio
+modulation selected.</para>
+
+    <para>To change the radio frequency the &VIDIOC-S-FREQUENCY; ioctl
+is available.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-modulator">
+      <title>struct <structname>v4l2_modulator</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Identifies the modulator, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the modulator, a NUL-terminated ASCII
+string. This information is intended for the user.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry>Modulator capability flags. No flags are defined
+for this field, the tuner flags in &v4l2-tuner;
+are used accordingly. The audio flags indicate the ability
+to encode audio subprograms. They will <emphasis>not</emphasis>
+change for example with the current video standard.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>rangelow</structfield></entry>
+           <entry>The lowest tunable frequency in units of 62.5
+KHz, or if the <structfield>capability</structfield> flag
+<constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>rangehigh</structfield></entry>
+           <entry>The highest tunable frequency in units of 62.5
+KHz, or if the <structfield>capability</structfield> flag
+<constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>txsubchans</structfield></entry>
+           <entry>With this field applications can determine how
+audio sub-carriers shall be modulated. It contains a set of flags as
+defined in <xref linkend="modulator-txsubchans" />. Note the tuner
+<structfield>rxsubchans</structfield> flags are reused, but the
+semantics are different. Video output devices are assumed to have an
+analog or PCM audio input with 1-3 channels. The
+<structfield>txsubchans</structfield> flags select one or more
+channels for modulation, together with some audio subprogram
+indicator, for example a stereo pilot tone.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="modulator-txsubchans">
+      <title>Modulator Audio Transmission Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_MONO</constant></entry>
+           <entry>0x0001</entry>
+           <entry>Modulate channel 1 as mono audio, when the input
+has more channels, a down-mix of channel 1 and 2. This flag does not
+combine with <constant>V4L2_TUNER_SUB_STEREO</constant> or
+<constant>V4L2_TUNER_SUB_LANG1</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_STEREO</constant></entry>
+           <entry>0x0002</entry>
+           <entry>Modulate channel 1 and 2 as left and right
+channel of a stereo audio signal. When the input has only one channel
+or two channels and <constant>V4L2_TUNER_SUB_SAP</constant> is also
+set, channel 1 is encoded as left and right channel. This flag does
+not combine with <constant>V4L2_TUNER_SUB_MONO</constant> or
+<constant>V4L2_TUNER_SUB_LANG1</constant>. When the driver does not
+support stereo audio it shall fall back to mono.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_LANG1</constant></entry>
+           <entry>0x0008</entry>
+           <entry>Modulate channel 1 and 2 as primary and secondary
+language of a bilingual audio signal. When the input has only one
+channel it is used for both languages. It is not possible to encode
+the primary or secondary language only. This flag does not combine
+with <constant>V4L2_TUNER_SUB_MONO</constant>,
+<constant>V4L2_TUNER_SUB_STEREO</constant> or
+<constant>V4L2_TUNER_SUB_SAP</constant>. If the hardware does not
+support the respective audio matrix, or the current video standard
+does not permit bilingual audio the
+<constant>VIDIOC_S_MODULATOR</constant> ioctl shall return an &EINVAL;
+and the driver shall fall back to mono or stereo mode.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_LANG2</constant></entry>
+           <entry>0x0004</entry>
+           <entry>Same effect as
+<constant>V4L2_TUNER_SUB_SAP</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_SAP</constant></entry>
+           <entry>0x0004</entry>
+           <entry>When combined with <constant>V4L2_TUNER_SUB_MONO
+</constant> the first channel is encoded as mono audio, the last
+channel as Second Audio Program. When the input has only one channel
+it is used for both audio tracks. When the input has three channels
+the mono track is a down-mix of channel 1 and 2. When combined with
+<constant>V4L2_TUNER_SUB_STEREO</constant> channel 1 and 2 are
+encoded as left and right stereo audio, channel 3 as Second Audio
+Program. When the input has only two channels, the first is encoded as
+left and right channel and the second as SAP. When the input has only
+one channel it is used for all audio tracks. It is not possible to
+encode a Second Audio Program only. This flag must combine with
+<constant>V4L2_TUNER_SUB_MONO</constant> or
+<constant>V4L2_TUNER_SUB_STEREO</constant>. If the hardware does not
+support the respective audio matrix, or the current video standard
+does not permit SAP the <constant>VIDIOC_S_MODULATOR</constant> ioctl
+shall return an &EINVAL; and driver shall fall back to mono or stereo
+mode.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_RDS</constant></entry>
+           <entry>0x0010</entry>
+           <entry>Enable the RDS encoder for a radio FM transmitter.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-modulator;
+<structfield>index</structfield> is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-output.xml b/Documentation/DocBook/v4l/vidioc-g-output.xml
new file mode 100644 (file)
index 0000000..3ea8c0e
--- /dev/null
@@ -0,0 +1,100 @@
+<refentry id="vidioc-g-output">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_OUTPUT, VIDIOC_S_OUTPUT</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_OUTPUT</refname>
+    <refname>VIDIOC_S_OUTPUT</refname>
+    <refpurpose>Query or select the current video output</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>int *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_OUTPUT, VIDIOC_S_OUTPUT</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the current video output applications call the
+<constant>VIDIOC_G_OUTPUT</constant> ioctl with a pointer to an integer
+where the driver stores the number of the output, as in the
+&v4l2-output; <structfield>index</structfield> field. This ioctl
+will fail only when there are no video outputs, returning the
+&EINVAL;.</para>
+
+    <para>To select a video output applications store the number of the
+desired output in an integer and call the
+<constant>VIDIOC_S_OUTPUT</constant> ioctl with a pointer to this integer.
+Side effects are possible. For example outputs may support different
+video standards, so the driver may implicitly switch the current
+standard. It is good practice to select an output before querying or
+negotiating any other parameters.</para>
+
+    <para>Information about video outputs is available using the
+&VIDIOC-ENUMOUTPUT; ioctl.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The number of the video output is out of bounds, or
+there are no video outputs at all and this ioctl is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>I/O is in progress, the output cannot be
+switched.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-parm.xml b/Documentation/DocBook/v4l/vidioc-g-parm.xml
new file mode 100644 (file)
index 0000000..78332d3
--- /dev/null
@@ -0,0 +1,332 @@
+<refentry id="vidioc-g-parm">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_PARM, VIDIOC_S_PARM</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_PARM</refname>
+    <refname>VIDIOC_S_PARM</refname>
+    <refpurpose>Get or set streaming parameters</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>v4l2_streamparm *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_PARM, VIDIOC_S_PARM</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The current video standard determines a nominal number of
+frames per second. If less than this number of frames is to be
+captured or output, applications can request frame skipping or
+duplicating on the driver side. This is especially useful when using
+the <function>read()</function> or <function>write()</function>, which
+are not augmented by timestamps or sequence counters, and to avoid
+unneccessary data copying.</para>
+
+    <para>Further these ioctls can be used to determine the number of
+buffers used internally by a driver in read/write mode. For
+implications see the section discussing the &func-read;
+function.</para>
+
+    <para>To get and set the streaming parameters applications call
+the <constant>VIDIOC_G_PARM</constant> and
+<constant>VIDIOC_S_PARM</constant> ioctl, respectively. They take a
+pointer to a struct <structname>v4l2_streamparm</structname> which
+contains a union holding separate parameters for input and output
+devices.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-streamparm">
+      <title>struct <structname>v4l2_streamparm</structname></title>
+      <tgroup cols="4">
+       &cs-ustr;
+       <tbody valign="top">
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry></entry>
+           <entry>The buffer (stream) type, same as &v4l2-format;
+<structfield>type</structfield>, set by the application.</entry>
+         </row>
+         <row>
+           <entry>union</entry>
+           <entry><structfield>parm</structfield></entry>
+           <entry></entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-captureparm;</entry>
+           <entry><structfield>capture</structfield></entry>
+           <entry>Parameters for capture devices, used when
+<structfield>type</structfield> is
+<constant>V4L2_BUF_TYPE_VIDEO_CAPTURE</constant>.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>&v4l2-outputparm;</entry>
+           <entry><structfield>output</structfield></entry>
+           <entry>Parameters for output devices, used when
+<structfield>type</structfield> is
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant>.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u8</entry>
+           <entry><structfield>raw_data</structfield>[200]</entry>
+           <entry>A place holder for future extensions and custom
+(driver defined) buffer types <constant>V4L2_BUF_TYPE_PRIVATE</constant> and
+higher.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-captureparm">
+      <title>struct <structname>v4l2_captureparm</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry>See <xref linkend="parm-caps" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capturemode</structfield></entry>
+           <entry>Set by drivers and applications, see <xref linkend="parm-flags" />.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>timeperframe</structfield></entry>
+           <entry><para>This is is the desired period between
+successive frames captured by the driver, in seconds. The
+field is intended to skip frames on the driver side, saving I/O
+bandwidth.</para><para>Applications store here the desired frame
+period, drivers return the actual frame period, which must be greater
+or equal to the nominal frame period determined by the current video
+standard (&v4l2-standard; <structfield>frameperiod</structfield>
+field). Changing the video standard (also implicitly by switching the
+video input) may reset this parameter to the nominal frame period. To
+reset manually applications can just set this field to
+zero.</para><para>Drivers support this function only when they set the
+<constant>V4L2_CAP_TIMEPERFRAME</constant> flag in the
+<structfield>capability</structfield> field.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>extendedmode</structfield></entry>
+           <entry>Custom (driver specific) streaming parameters. When
+unused, applications and drivers must set this field to zero.
+Applications using this field should check the driver name and
+version, see <xref linkend="querycap" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>readbuffers</structfield></entry>
+           <entry>Applications set this field to the desired number
+of buffers used internally by the driver in &func-read; mode. Drivers
+return the actual number of buffers. When an application requests zero
+buffers, drivers should just return the current setting rather than
+the minimum or an error code. For details see <xref
+               linkend="rw" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-outputparm">
+      <title>struct <structname>v4l2_outputparm</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry>See <xref linkend="parm-caps" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>outputmode</structfield></entry>
+           <entry>Set by drivers and applications, see <xref
+           linkend="parm-flags" />.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-fract;</entry>
+           <entry><structfield>timeperframe</structfield></entry>
+           <entry>This is is the desired period between
+successive frames output by the driver, in seconds.</entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>The field is intended to
+repeat frames on the driver side in &func-write; mode (in streaming
+mode timestamps can be used to throttle the output), saving I/O
+bandwidth.</para><para>Applications store here the desired frame
+period, drivers return the actual frame period, which must be greater
+or equal to the nominal frame period determined by the current video
+standard (&v4l2-standard; <structfield>frameperiod</structfield>
+field). Changing the video standard (also implicitly by switching the
+video output) may reset this parameter to the nominal frame period. To
+reset manually applications can just set this field to
+zero.</para><para>Drivers support this function only when they set the
+<constant>V4L2_CAP_TIMEPERFRAME</constant> flag in the
+<structfield>capability</structfield> field.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>extendedmode</structfield></entry>
+           <entry>Custom (driver specific) streaming parameters. When
+unused, applications and drivers must set this field to zero.
+Applications using this field should check the driver name and
+version, see <xref linkend="querycap" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>writebuffers</structfield></entry>
+           <entry>Applications set this field to the desired number
+of buffers used internally by the driver in
+<function>write()</function> mode. Drivers return the actual number of
+buffers. When an application requests zero buffers, drivers should
+just return the current setting rather than the minimum or an error
+code. For details see <xref linkend="rw" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="parm-caps">
+      <title>Streaming Parameters Capabilites</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CAP_TIMEPERFRAME</constant></entry>
+           <entry>0x1000</entry>
+           <entry>The frame skipping/repeating controlled by the
+<structfield>timeperframe</structfield> field is supported.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="parm-flags">
+      <title>Capture Parameters Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_MODE_HIGHQUALITY</constant></entry>
+           <entry>0x0001</entry>
+           <entry><para>High quality imaging mode. High quality mode
+is intended for still imaging applications. The idea is to get the
+best possible image quality that the hardware can deliver. It is not
+defined how the driver writer may achieve that; it will depend on the
+hardware and the ingenuity of the driver writer. High quality mode is
+a different mode from the the regular motion video capture modes. In
+high quality mode:<itemizedlist>
+                 <listitem>
+                   <para>The driver may be able to capture higher
+resolutions than for motion capture.</para>
+                 </listitem>
+                 <listitem>
+                   <para>The driver may support fewer pixel formats
+than motion capture (eg; true color).</para>
+                 </listitem>
+                 <listitem>
+                   <para>The driver may capture and arithmetically
+combine multiple successive fields or frames to remove color edge
+artifacts and reduce the noise in the video data.
+</para>
+                 </listitem>
+                 <listitem>
+                   <para>The driver may capture images in slices like
+a scanner in order to handle larger format images than would otherwise
+be possible. </para>
+                 </listitem>
+                 <listitem>
+                   <para>An image capture operation may be
+significantly slower than motion capture. </para>
+                 </listitem>
+                 <listitem>
+                   <para>Moving objects in the image might have
+excessive motion blur. </para>
+                 </listitem>
+                 <listitem>
+                   <para>Capture might only work through the
+<function>read()</function> call.</para>
+                 </listitem>
+               </itemizedlist></para></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>This ioctl is not supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-priority.xml b/Documentation/DocBook/v4l/vidioc-g-priority.xml
new file mode 100644 (file)
index 0000000..5fb0019
--- /dev/null
@@ -0,0 +1,144 @@
+<refentry id="vidioc-g-priority">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_PRIORITY, VIDIOC_S_PRIORITY</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_PRIORITY</refname>
+    <refname>VIDIOC_S_PRIORITY</refname>
+    <refpurpose>Query or request the access priority associated with a
+file descriptor</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>enum v4l2_priority *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const enum v4l2_priority *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_PRIORITY, VIDIOC_S_PRIORITY</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para>Pointer to an enum v4l2_priority type.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the current access priority
+applications call the <constant>VIDIOC_G_PRIORITY</constant> ioctl
+with a pointer to an enum v4l2_priority variable where the driver stores
+the current priority.</para>
+
+    <para>To request an access priority applications store the
+desired priority in an enum v4l2_priority variable and call
+<constant>VIDIOC_S_PRIORITY</constant> ioctl with a pointer to this
+variable.</para>
+
+    <table frame="none" pgwide="1" id="v4l2-priority">
+      <title>enum v4l2_priority</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_PRIORITY_UNSET</constant></entry>
+           <entry>0</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_PRIORITY_BACKGROUND</constant></entry>
+           <entry>1</entry>
+           <entry>Lowest priority, usually applications running in
+background, for example monitoring VBI transmissions. A proxy
+application running in user space will be necessary if multiple
+applications want to read from a device at this priority.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_PRIORITY_INTERACTIVE</constant></entry>
+           <entry>2</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_PRIORITY_DEFAULT</constant></entry>
+           <entry>2</entry>
+           <entry>Medium priority, usually applications started and
+interactively controlled by the user. For example TV viewers, Teletext
+browsers, or just "panel" applications to change the channel or video
+controls. This is the default priority unless an application requests
+another.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_PRIORITY_RECORD</constant></entry>
+           <entry>3</entry>
+           <entry>Highest priority. Only one file descriptor can have
+this priority, it blocks any other fd from changing device properties.
+Usually applications which must not be interrupted, like video
+recording.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The requested priority value is invalid, or the
+driver does not support access priorities.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>Another application already requested higher
+priority.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml b/Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml
new file mode 100644 (file)
index 0000000..10e721b
--- /dev/null
@@ -0,0 +1,264 @@
+<refentry id="vidioc-g-sliced-vbi-cap">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_SLICED_VBI_CAP</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_SLICED_VBI_CAP</refname>
+    <refpurpose>Query sliced VBI capabilities</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_sliced_vbi_cap *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_SLICED_VBI_CAP</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To find out which data services are supported by a sliced
+VBI capture or output device, applications initialize the
+<structfield>type</structfield> field of a &v4l2-sliced-vbi-cap;,
+clear the <structfield>reserved</structfield> array and
+call the <constant>VIDIOC_G_SLICED_VBI_CAP</constant> ioctl. The
+driver fills in the remaining fields or returns an &EINVAL; if the
+sliced VBI API is unsupported or <structfield>type</structfield>
+is invalid.</para>
+
+    <para>Note the <structfield>type</structfield> field was added,
+and the ioctl changed from read-only to write-read, in Linux 2.6.19.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-sliced-vbi-cap">
+      <title>struct <structname>v4l2_sliced_vbi_cap</structname></title>
+      <tgroup cols="5">
+       <colspec colname="c1" colwidth="3*" />
+       <colspec colname="c2" colwidth="3*" />
+       <colspec colname="c3" colwidth="2*" />
+       <colspec colname="c4" colwidth="2*" />
+       <colspec colname="c5" colwidth="2*" />
+       <spanspec spanname="hspan" namest="c3" nameend="c5" />
+       <tbody valign="top">
+         <row>
+           <entry>__u16</entry>
+           <entry><structfield>service_set</structfield></entry>
+           <entry spanname="hspan">A set of all data services
+supported by the driver. Equal to the union of all elements of the
+<structfield>service_lines </structfield> array.</entry>
+         </row>
+         <row>
+           <entry>__u16</entry>
+           <entry><structfield>service_lines</structfield>[2][24]</entry>
+           <entry spanname="hspan">Each element of this array
+contains a set of data services the hardware can look for or insert
+into a particular scan line. Data services are defined in <xref
+               linkend="vbi-services" />. Array indices map to ITU-R
+line numbers (see also <xref
+               linkend="vbi-525" /> and <xref
+linkend="vbi-625" />) as follows:</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry>Element</entry>
+           <entry>525 line systems</entry>
+           <entry>625 line systems</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[0][1]</entry>
+           <entry align="center">1</entry>
+           <entry align="center">1</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[0][23]</entry>
+           <entry align="center">23</entry>
+           <entry align="center">23</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[1][1]</entry>
+           <entry align="center">264</entry>
+           <entry align="center">314</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><structfield>service_lines</structfield>[1][23]</entry>
+           <entry align="center">286</entry>
+           <entry align="center">336</entry>
+         </row>
+         <row>
+           <entry></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry spanname="hspan">The number of VBI lines the
+hardware can capture or output per frame, or the number of services it
+can identify on a given line may be limited. For example on PAL line
+16 the hardware may be able to look for a VPS or Teletext signal, but
+not both at the same time. Applications can learn about these limits
+using the &VIDIOC-S-FMT; ioctl as described in <xref
+               linkend="sliced" />.</entry>
+         </row>
+         <row>
+           <entry></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry spanname="hspan">Drivers must set
+<structfield>service_lines</structfield>[0][0] and
+<structfield>service_lines</structfield>[1][0] to zero.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the data stream, see <xref
+                 linkend="v4l2-buf-type" />. Should be
+<constant>V4L2_BUF_TYPE_SLICED_VBI_CAPTURE</constant> or
+<constant>V4L2_BUF_TYPE_SLICED_VBI_OUTPUT</constant>.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[3]</entry>
+           <entry spanname="hspan">This array is reserved for future
+extensions. Applications and drivers must set it to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <!-- See also dev-sliced-vbi.sgml -->
+    <table pgwide="1" frame="none" id="vbi-services">
+      <title>Sliced VBI services</title>
+      <tgroup cols="5">
+       <colspec colname="c1" colwidth="2*" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colname="c3" colwidth="1*" />
+       <colspec colname="c4" colwidth="2*" />
+       <colspec colname="c5" colwidth="2*" />
+       <spanspec spanname='rlp' namest='c3' nameend='c5' />
+       <thead>
+         <row>
+           <entry>Symbol</entry>
+           <entry>Value</entry>
+           <entry>Reference</entry>
+           <entry>Lines, usually</entry>
+           <entry>Payload</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_SLICED_TELETEXT_B</constant> (Teletext
+System B)</entry>
+           <entry>0x0001</entry>
+           <entry><xref linkend="ets300706" />, <xref linkend="itu653" /></entry>
+           <entry>PAL/SECAM line 7-22, 320-335 (second field 7-22)</entry>
+           <entry>Last 42 of the 45 byte Teletext packet, that is
+without clock run-in and framing code, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VPS</constant></entry>
+           <entry>0x0400</entry>
+           <entry><xref linkend="ets300231" /></entry>
+           <entry>PAL line 16</entry>
+           <entry>Byte number 3 to 15 according to Figure 9 of
+ETS&nbsp;300&nbsp;231, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry>
+           <entry>0x1000</entry>
+           <entry><xref linkend="eia608" /></entry>
+           <entry>NTSC line 21, 284 (second field 21)</entry>
+           <entry>Two bytes in transmission order, including parity
+bit, lsb first transmitted.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_WSS_625</constant></entry>
+           <entry>0x4000</entry>
+           <entry><xref linkend="en300294" />, <xref linkend="itu1119" /></entry>
+           <entry>PAL/SECAM line 23</entry>
+           <entry><screen>
+Byte        0                 1
+     msb         lsb  msb           lsb
+Bit  7 6 5 4 3 2 1 0  x x 13 12 11 10 9
+</screen></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VBI_525</constant></entry>
+           <entry>0x1000</entry>
+           <entry spanname="rlp">Set of services applicable to 525
+line systems.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_SLICED_VBI_625</constant></entry>
+           <entry>0x4401</entry>
+           <entry spanname="rlp">Set of services applicable to 625
+line systems.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The device does not support sliced VBI capturing or
+output, or the value in the <structfield>type</structfield> field is
+wrong.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-std.xml b/Documentation/DocBook/v4l/vidioc-g-std.xml
new file mode 100644 (file)
index 0000000..b6f5d26
--- /dev/null
@@ -0,0 +1,99 @@
+<refentry id="vidioc-g-std">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_STD, VIDIOC_S_STD</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_STD</refname>
+    <refname>VIDIOC_S_STD</refname>
+    <refpurpose>Query or select the video standard of the current input</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>v4l2_std_id
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const v4l2_std_id
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_STD, VIDIOC_S_STD</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query and select the current video standard applications
+use the <constant>VIDIOC_G_STD</constant> and <constant>VIDIOC_S_STD</constant> ioctls which take a pointer to a
+&v4l2-std-id; type as argument. <constant>VIDIOC_G_STD</constant> can
+return a single flag or a set of flags as in &v4l2-standard; field
+<structfield>id</structfield>. The flags must be unambiguous such
+that they appear in only one enumerated <structname>v4l2_standard</structname> structure.</para>
+
+    <para><constant>VIDIOC_S_STD</constant> accepts one or more
+flags, being a write-only ioctl it does not return the actual new standard as
+<constant>VIDIOC_G_STD</constant> does. When no flags are given or
+the current input does not support the requested standard the driver
+returns an &EINVAL;. When the standard set is ambiguous drivers may
+return <errorcode>EINVAL</errorcode> or choose any of the requested
+standards.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>This ioctl is not supported, or the
+<constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-tuner.xml b/Documentation/DocBook/v4l/vidioc-g-tuner.xml
new file mode 100644 (file)
index 0000000..bd98c73
--- /dev/null
@@ -0,0 +1,535 @@
+<refentry id="vidioc-g-tuner">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_TUNER, VIDIOC_S_TUNER</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_TUNER</refname>
+    <refname>VIDIOC_S_TUNER</refname>
+    <refpurpose>Get or set tuner attributes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_tuner
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const struct v4l2_tuner
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_G_TUNER, VIDIOC_S_TUNER</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a tuner applications initialize the
+<structfield>index</structfield> field and zero out the
+<structfield>reserved</structfield> array of a &v4l2-tuner; and call the
+<constant>VIDIOC_G_TUNER</constant> ioctl with a pointer to this
+structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all tuners
+applications shall begin at index zero, incrementing by one until the
+driver returns <errorcode>EINVAL</errorcode>.</para>
+
+    <para>Tuners have two writable properties, the audio mode and
+the radio frequency. To change the audio mode, applications initialize
+the <structfield>index</structfield>,
+<structfield>audmode</structfield> and
+<structfield>reserved</structfield> fields and call the
+<constant>VIDIOC_S_TUNER</constant> ioctl. This will
+<emphasis>not</emphasis> change the current tuner, which is determined
+by the current video input. Drivers may choose a different audio mode
+if the requested mode is invalid or unsupported. Since this is a
+<!-- FIXME -->write-only ioctl, it does not return the actually
+selected audio mode.</para>
+
+    <para>To change the radio frequency the &VIDIOC-S-FREQUENCY; ioctl
+is available.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-tuner">
+      <title>struct <structname>v4l2_tuner</structname></title>
+      <tgroup cols="3">
+       <colspec colname="c1" colwidth="1*" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colname="c3" colwidth="1*" />
+       <colspec colname="c4" colwidth="1*" />
+       <spanspec spanname="hspan" namest="c3" nameend="c4" />
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry spanname="hspan">Identifies the tuner, set by the
+application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry spanname="hspan"><para>Name of the tuner, a
+NUL-terminated ASCII string. This information is intended for the
+user.<!-- FIXME Video inputs already have a name, the purpose of this
+field is not quite clear.--></para></entry>
+         </row>
+         <row>
+           <entry>&v4l2-tuner-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry spanname="hspan">Type of the tuner, see <xref
+               linkend="v4l2-tuner-type" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capability</structfield></entry>
+           <entry spanname="hspan"><para>Tuner capability flags, see
+<xref linkend="tuner-capability" />. Audio flags indicate the ability
+to decode audio subprograms. They will <emphasis>not</emphasis>
+change, for example with the current video standard.</para><para>When
+the structure refers to a radio tuner only the
+<constant>V4L2_TUNER_CAP_LOW</constant>,
+<constant>V4L2_TUNER_CAP_STEREO</constant> and
+<constant>V4L2_TUNER_CAP_RDS</constant> flags can be set.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>rangelow</structfield></entry>
+           <entry spanname="hspan">The lowest tunable frequency in
+units of 62.5 kHz, or if the <structfield>capability</structfield>
+flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>rangehigh</structfield></entry>
+           <entry spanname="hspan">The highest tunable frequency in
+units of 62.5 kHz, or if the <structfield>capability</structfield>
+flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>rxsubchans</structfield></entry>
+           <entry spanname="hspan"><para>Some tuners or audio
+decoders can determine the received audio subprograms by analyzing
+audio carriers, pilot tones or other indicators. To pass this
+information drivers set flags defined in <xref
+                 linkend="tuner-rxsubchans" /> in this field. For
+example:</para></entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><constant>V4L2_TUNER_SUB_MONO</constant></entry>
+           <entry>receiving mono audio</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><constant>STEREO | SAP</constant></entry>
+           <entry>receiving stereo audio and a secondary audio
+program</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><constant>MONO | STEREO</constant></entry>
+           <entry>receiving mono or stereo audio, the hardware cannot
+distinguish</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><constant>LANG1 | LANG2</constant></entry>
+           <entry>receiving bilingual audio</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry><constant>MONO | STEREO | LANG1 | LANG2</constant></entry>
+           <entry>receiving mono, stereo or bilingual
+audio</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry></entry>
+           <entry spanname="hspan"><para>When the
+<constant>V4L2_TUNER_CAP_STEREO</constant>,
+<constant>_LANG1</constant>, <constant>_LANG2</constant> or
+<constant>_SAP</constant> flag is cleared in the
+<structfield>capability</structfield> field, the corresponding
+<constant>V4L2_TUNER_SUB_</constant> flag must not be set
+here.</para><para>This field is valid only if this is the tuner of the
+current video input, or when the structure refers to a radio
+tuner.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>audmode</structfield></entry>
+           <entry spanname="hspan"><para>The selected audio mode, see
+<xref linkend="tuner-audmode" /> for valid values. The audio mode does
+not affect audio subprogram detection, and like a <link
+linkend="control">control</link> it does not automatically change
+unless the requested mode is invalid or unsupported. See <xref
+                 linkend="tuner-matrix" /> for possible results when
+the selected and received audio programs do not
+match.</para><para>Currently this is the only field of struct
+<structname>v4l2_tuner</structname> applications can
+change.</para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>signal</structfield></entry>
+           <entry spanname="hspan">The signal strength if known, ranging
+from 0 to 65535. Higher values indicate a better signal.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>afc</structfield></entry>
+           <entry spanname="hspan">Automatic frequency control: When the
+<structfield>afc</structfield> value is negative, the frequency is too
+low, when positive too high.<!-- FIXME need example what to do when it never
+settles at zero, &ie; range is what? --></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry spanname="hspan">Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-tuner-type">
+      <title>enum v4l2_tuner_type</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_TUNER_RADIO</constant></entry>
+           <entry>1</entry>
+           <entry></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_ANALOG_TV</constant></entry>
+           <entry>2</entry>
+           <entry></entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="tuner-capability">
+      <title>Tuner and Modulator Capability Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_TUNER_CAP_LOW</constant></entry>
+           <entry>0x0001</entry>
+           <entry>When set, tuning frequencies are expressed in units of
+62.5&nbsp;Hz, otherwise in units of 62.5&nbsp;kHz.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_CAP_NORM</constant></entry>
+           <entry>0x0002</entry>
+           <entry>This is a multi-standard tuner; the video standard
+can or must be switched. (B/G PAL tuners for example are typically not
+      considered multi-standard because the video standard is automatically
+      determined from the frequency band.) The set of supported video
+      standards is available from the &v4l2-input; pointing to this tuner,
+      see the description of ioctl &VIDIOC-ENUMINPUT; for details. Only
+      <constant>V4L2_TUNER_ANALOG_TV</constant> tuners can have this capability.</entry>
+         </row>
+         <row>
+       <entry><constant>V4L2_TUNER_CAP_STEREO</constant></entry>
+       <entry>0x0010</entry>
+       <entry>Stereo audio reception is supported.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_CAP_LANG1</constant></entry>
+           <entry>0x0040</entry>
+           <entry>Reception of the primary language of a bilingual
+audio program is supported. Bilingual audio is a feature of
+two-channel systems, transmitting the primary language monaural on the
+main audio carrier and a secondary language monaural on a second
+carrier. Only
+      <constant>V4L2_TUNER_ANALOG_TV</constant> tuners can have this capability.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_CAP_LANG2</constant></entry>
+           <entry>0x0020</entry>
+           <entry>Reception of the secondary language of a bilingual
+audio program is supported. Only
+      <constant>V4L2_TUNER_ANALOG_TV</constant> tuners can have this capability.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_CAP_SAP</constant></entry>
+           <entry>0x0020</entry>
+           <entry><para>Reception of a secondary audio program is
+supported. This is a feature of the BTSC system which accompanies the
+NTSC video standard. Two audio carriers are available for mono or
+stereo transmissions of a primary language, and an independent third
+carrier for a monaural secondary language. Only
+      <constant>V4L2_TUNER_ANALOG_TV</constant> tuners can have this capability.</para><para>Note the
+<constant>V4L2_TUNER_CAP_LANG2</constant> and
+<constant>V4L2_TUNER_CAP_SAP</constant> flags are synonyms.
+<constant>V4L2_TUNER_CAP_SAP</constant> applies when the tuner
+supports the <constant>V4L2_STD_NTSC_M</constant> video
+standard.</para><!-- FIXME what if PAL+NTSC and Bi but not SAP? --></entry>
+         </row>
+         <row>
+       <entry><constant>V4L2_TUNER_CAP_RDS</constant></entry>
+       <entry>0x0080</entry>
+       <entry>RDS capture is supported. This capability is only valid for
+radio tuners.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="tuner-rxsubchans">
+      <title>Tuner Audio Reception Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_MONO</constant></entry>
+           <entry>0x0001</entry>
+           <entry>The tuner receives a mono audio signal.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_STEREO</constant></entry>
+           <entry>0x0002</entry>
+           <entry>The tuner receives a stereo audio signal.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_LANG1</constant></entry>
+           <entry>0x0008</entry>
+           <entry>The tuner receives the primary language of a
+bilingual audio signal. Drivers must clear this flag when the current
+video standard is <constant>V4L2_STD_NTSC_M</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_LANG2</constant></entry>
+           <entry>0x0004</entry>
+           <entry>The tuner receives the secondary language of a
+bilingual audio signal (or a second audio program).</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_SAP</constant></entry>
+           <entry>0x0004</entry>
+           <entry>The tuner receives a Second Audio Program. Note the
+<constant>V4L2_TUNER_SUB_LANG2</constant> and
+<constant>V4L2_TUNER_SUB_SAP</constant> flags are synonyms. The
+<constant>V4L2_TUNER_SUB_SAP</constant> flag applies when the
+current video standard is <constant>V4L2_STD_NTSC_M</constant>.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_SUB_RDS</constant></entry>
+           <entry>0x0010</entry>
+           <entry>The tuner receives an RDS channel.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="tuner-audmode">
+      <title>Tuner Audio Modes</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_MONO</constant></entry>
+           <entry>0</entry>
+           <entry>Play mono audio. When the tuner receives a stereo
+signal this a down-mix of the left and right channel. When the tuner
+receives a bilingual or SAP signal this mode selects the primary
+language.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_STEREO</constant></entry>
+           <entry>1</entry>
+           <entry><para>Play stereo audio. When the tuner receives
+bilingual audio it may play different languages on the left and right
+channel or the primary language is played on both channels.</para><para>Playing
+different languages in this mode is
+deprecated. New drivers should do this only in
+<constant>MODE_LANG1_LANG2</constant>.</para><para>When the tuner
+receives no stereo signal or does not support stereo reception the
+driver shall fall back to <constant>MODE_MONO</constant>.</para></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_LANG1</constant></entry>
+           <entry>3</entry>
+           <entry>Play the primary language, mono or stereo. Only
+<constant>V4L2_TUNER_ANALOG_TV</constant> tuners support this
+mode.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_LANG2</constant></entry>
+           <entry>2</entry>
+           <entry>Play the secondary language, mono. When the tuner
+receives no bilingual audio or SAP, or their reception is not
+supported the driver shall fall back to mono or stereo mode. Only
+<constant>V4L2_TUNER_ANALOG_TV</constant> tuners support this
+mode.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_SAP</constant></entry>
+           <entry>2</entry>
+           <entry>Play the Second Audio Program. When the tuner
+receives no bilingual audio or SAP, or their reception is not
+supported the driver shall fall back to mono or stereo mode. Only
+<constant>V4L2_TUNER_ANALOG_TV</constant> tuners support this mode.
+Note the <constant>V4L2_TUNER_MODE_LANG2</constant> and
+<constant>V4L2_TUNER_MODE_SAP</constant> are synonyms.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_TUNER_MODE_LANG1_LANG2</constant></entry>
+           <entry>4</entry>
+           <entry>Play the primary language on the left channel, the
+secondary language on the right channel. When the tuner receives no
+bilingual audio or SAP, it shall fall back to
+<constant>MODE_LANG1</constant> or <constant>MODE_MONO</constant>.
+Only <constant>V4L2_TUNER_ANALOG_TV</constant> tuners support this
+mode.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="all" id="tuner-matrix">
+      <title>Tuner Audio Matrix</title>
+      <tgroup cols="6" align="center">
+       <colspec align="left" />
+       <colspec colname="c2" colwidth="1*" />
+       <colspec colwidth="1*" />
+       <colspec colwidth="1*" />
+       <colspec colnum="6" colname="c6" colwidth="1*" />
+       <spanspec namest="c2" nameend="c6" spanname="hspan" align="center" />
+       <thead>
+         <row>
+           <entry></entry>
+           <entry spanname="hspan">Selected
+<constant>V4L2_TUNER_MODE_</constant></entry>
+         </row>
+         <row>
+           <entry>Received <constant>V4L2_TUNER_SUB_</constant></entry>
+           <entry><constant>MONO</constant></entry>
+           <entry><constant>STEREO</constant></entry>
+           <entry><constant>LANG1</constant></entry>
+           <entry><constant>LANG2 = SAP</constant></entry>
+           <entry><constant>LANG1_LANG2</constant><footnote><para>This
+mode has been added in Linux 2.6.17 and may not be supported by older
+drivers.</para></footnote></entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>MONO</constant></entry>
+           <entry>Mono</entry>
+           <entry>Mono/Mono</entry>
+           <entry>Mono</entry>
+           <entry>Mono</entry>
+           <entry>Mono/Mono</entry>
+         </row>
+         <row>
+           <entry><constant>MONO | SAP</constant></entry>
+           <entry>Mono</entry>
+           <entry>Mono/Mono</entry>
+           <entry>Mono</entry>
+           <entry>SAP</entry>
+           <entry>Mono/SAP (preferred) or Mono/Mono</entry>
+         </row>
+         <row>
+           <entry><constant>STEREO</constant></entry>
+           <entry>L+R</entry>
+           <entry>L/R</entry>
+           <entry>Stereo L/R (preferred) or Mono L+R</entry>
+           <entry>Stereo L/R (preferred) or Mono L+R</entry>
+           <entry>L/R (preferred) or L+R/L+R</entry>
+         </row>
+         <row>
+           <entry><constant>STEREO | SAP</constant></entry>
+           <entry>L+R</entry>
+           <entry>L/R</entry>
+           <entry>Stereo L/R (preferred) or Mono L+R</entry>
+           <entry>SAP</entry>
+           <entry>L+R/SAP (preferred) or L/R or L+R/L+R</entry>
+         </row>
+         <row>
+           <entry><constant>LANG1 | LANG2</constant></entry>
+           <entry>Language&nbsp;1</entry>
+           <entry>Lang1/Lang2 (deprecated<footnote><para>Playback of
+both languages in <constant>MODE_STEREO</constant> is deprecated. In
+the future drivers should produce only the primary language in this
+mode. Applications should request
+<constant>MODE_LANG1_LANG2</constant> to record both languages or a
+stereo signal.</para></footnote>) or
+Lang1/Lang1</entry>
+           <entry>Language&nbsp;1</entry>
+           <entry>Language&nbsp;2</entry>
+           <entry>Lang1/Lang2 (preferred) or Lang1/Lang1</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-tuner; <structfield>index</structfield> is
+out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-log-status.xml b/Documentation/DocBook/v4l/vidioc-log-status.xml
new file mode 100644 (file)
index 0000000..2634b7c
--- /dev/null
@@ -0,0 +1,58 @@
+<refentry id="vidioc-log-status">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_LOG_STATUS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_LOG_STATUS</refname>
+    <refpurpose>Log driver status information</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>As the video/audio devices become more complicated it
+becomes harder to debug problems. When this ioctl is called the driver
+will output the current device status to the kernel log. This is
+particular useful when dealing with problems like no sound, no video
+and incorrectly tuned channels. Also many modern devices autodetect
+video and audio standards and this ioctl will report what the device
+thinks what the standard is. Mismatches may give an indication where
+the problem is.</para>
+
+    <para>This ioctl is optional and not all drivers support it. It
+was introduced in Linux 2.6.15.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The driver does not support this ioctl.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-overlay.xml b/Documentation/DocBook/v4l/vidioc-overlay.xml
new file mode 100644 (file)
index 0000000..1036c58
--- /dev/null
@@ -0,0 +1,83 @@
+<refentry id="vidioc-overlay">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_OVERLAY</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_OVERLAY</refname>
+    <refpurpose>Start or stop video overlay</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const int *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_OVERLAY</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>This ioctl is part of the <link linkend="overlay">video
+    overlay</link> I/O method. Applications call
+    <constant>VIDIOC_OVERLAY</constant> to start or stop the
+    overlay. It takes a pointer to an integer which must be set to
+    zero by the application to stop overlay, to one to start.</para>
+
+    <para>Drivers do not support &VIDIOC-STREAMON; or
+&VIDIOC-STREAMOFF; with <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>Video overlay is not supported, or the
+parameters have not been set up. See <xref
+linkend="overlay" /> for the necessary steps.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-qbuf.xml b/Documentation/DocBook/v4l/vidioc-qbuf.xml
new file mode 100644 (file)
index 0000000..1870817
--- /dev/null
@@ -0,0 +1,168 @@
+<refentry id="vidioc-qbuf">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QBUF, VIDIOC_DQBUF</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QBUF</refname>
+    <refname>VIDIOC_DQBUF</refname>
+    <refpurpose>Exchange a buffer with the driver</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_buffer *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_QBUF, VIDIOC_DQBUF</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Applications call the <constant>VIDIOC_QBUF</constant> ioctl
+to enqueue an empty (capturing) or filled (output) buffer in the
+driver's incoming queue. The semantics depend on the selected I/O
+method.</para>
+
+    <para>To enqueue a <link linkend="mmap">memory mapped</link>
+buffer applications set the <structfield>type</structfield> field of a
+&v4l2-buffer; to the same buffer type as previously &v4l2-format;
+<structfield>type</structfield> and &v4l2-requestbuffers;
+<structfield>type</structfield>, the <structfield>memory</structfield>
+field to <constant>V4L2_MEMORY_MMAP</constant> and the
+<structfield>index</structfield> field. Valid index numbers range from
+zero to the number of buffers allocated with &VIDIOC-REQBUFS;
+(&v4l2-requestbuffers; <structfield>count</structfield>) minus one. The
+contents of the struct <structname>v4l2_buffer</structname> returned
+by a &VIDIOC-QUERYBUF; ioctl will do as well. When the buffer is
+intended for output (<structfield>type</structfield> is
+<constant>V4L2_BUF_TYPE_VIDEO_OUTPUT</constant> or
+<constant>V4L2_BUF_TYPE_VBI_OUTPUT</constant>) applications must also
+initialize the <structfield>bytesused</structfield>,
+<structfield>field</structfield> and
+<structfield>timestamp</structfield> fields. See <xref
+       linkend="buffer" /> for details. When
+<constant>VIDIOC_QBUF</constant> is called with a pointer to this
+structure the driver sets the
+<constant>V4L2_BUF_FLAG_MAPPED</constant> and
+<constant>V4L2_BUF_FLAG_QUEUED</constant> flags and clears the
+<constant>V4L2_BUF_FLAG_DONE</constant> flag in the
+<structfield>flags</structfield> field, or it returns an
+&EINVAL;.</para>
+
+    <para>To enqueue a <link linkend="userp">user pointer</link>
+buffer applications set the <structfield>type</structfield> field of a
+&v4l2-buffer; to the same buffer type as previously &v4l2-format;
+<structfield>type</structfield> and &v4l2-requestbuffers;
+<structfield>type</structfield>, the <structfield>memory</structfield>
+field to <constant>V4L2_MEMORY_USERPTR</constant> and the
+<structfield>m.userptr</structfield> field to the address of the
+buffer and <structfield>length</structfield> to its size. When the
+buffer is intended for output additional fields must be set as above.
+When <constant>VIDIOC_QBUF</constant> is called with a pointer to this
+structure the driver sets the <constant>V4L2_BUF_FLAG_QUEUED</constant>
+flag and clears the <constant>V4L2_BUF_FLAG_MAPPED</constant> and
+<constant>V4L2_BUF_FLAG_DONE</constant> flags in the
+<structfield>flags</structfield> field, or it returns an error code.
+This ioctl locks the memory pages of the buffer in physical memory,
+they cannot be swapped out to disk. Buffers remain locked until
+dequeued, until the &VIDIOC-STREAMOFF; or &VIDIOC-REQBUFS; ioctl are
+called, or until the device is closed.</para>
+
+    <para>Applications call the <constant>VIDIOC_DQBUF</constant>
+ioctl to dequeue a filled (capturing) or displayed (output) buffer
+from the driver's outgoing queue. They just set the
+<structfield>type</structfield> and <structfield>memory</structfield>
+fields of a &v4l2-buffer; as above, when <constant>VIDIOC_DQBUF</constant>
+is called with a pointer to this structure the driver fills the
+remaining fields or returns an error code.</para>
+
+    <para>By default <constant>VIDIOC_DQBUF</constant> blocks when no
+buffer is in the outgoing queue. When the
+<constant>O_NONBLOCK</constant> flag was given to the &func-open;
+function, <constant>VIDIOC_DQBUF</constant> returns immediately
+with an &EAGAIN; when no buffer is available.</para>
+
+    <para>The <structname>v4l2_buffer</structname> structure is
+specified in <xref linkend="buffer" />.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EAGAIN</errorcode></term>
+       <listitem>
+         <para>Non-blocking I/O has been selected using
+<constant>O_NONBLOCK</constant> and no buffer was in the outgoing
+queue.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The buffer <structfield>type</structfield> is not
+supported, or the <structfield>index</structfield> is out of bounds,
+or no buffers have been allocated yet, or the
+<structfield>userptr</structfield> or
+<structfield>length</structfield> are invalid.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>ENOMEM</errorcode></term>
+       <listitem>
+         <para>Not enough physical or virtual memory was available to
+enqueue a user pointer buffer.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EIO</errorcode></term>
+       <listitem>
+         <para><constant>VIDIOC_DQBUF</constant> failed due to an
+internal error. Can also indicate temporary problems like signal
+loss. Note the driver might dequeue an (empty) buffer despite
+returning an error, or even stop capturing.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-querybuf.xml b/Documentation/DocBook/v4l/vidioc-querybuf.xml
new file mode 100644 (file)
index 0000000..d834993
--- /dev/null
@@ -0,0 +1,103 @@
+<refentry id="vidioc-querybuf">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QUERYBUF</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QUERYBUF</refname>
+    <refpurpose>Query the status of a buffer</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_buffer *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_QUERYBUF</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>This ioctl is part of the <link linkend="mmap">memory
+mapping</link> I/O method. It can be used to query the status of a
+buffer at any time after buffers have been allocated with the
+&VIDIOC-REQBUFS; ioctl.</para>
+
+    <para>Applications set the <structfield>type</structfield> field
+    of a &v4l2-buffer; to the same buffer type as previously
+&v4l2-format; <structfield>type</structfield> and &v4l2-requestbuffers;
+<structfield>type</structfield>, and the <structfield>index</structfield>
+    field. Valid index numbers range from zero
+to the number of buffers allocated with &VIDIOC-REQBUFS;
+    (&v4l2-requestbuffers; <structfield>count</structfield>) minus one.
+After calling <constant>VIDIOC_QUERYBUF</constant> with a pointer to
+    this structure drivers return an error code or fill the rest of
+the structure.</para>
+
+    <para>In the <structfield>flags</structfield> field the
+<constant>V4L2_BUF_FLAG_MAPPED</constant>,
+<constant>V4L2_BUF_FLAG_QUEUED</constant> and
+<constant>V4L2_BUF_FLAG_DONE</constant> flags will be valid. The
+<structfield>memory</structfield> field will be set to
+<constant>V4L2_MEMORY_MMAP</constant>, the <structfield>m.offset</structfield>
+contains the offset of the buffer from the start of the device memory,
+the <structfield>length</structfield> field its size. The driver may
+or may not set the remaining fields and flags, they are meaningless in
+this context.</para>
+
+    <para>The <structname>v4l2_buffer</structname> structure is
+    specified in <xref linkend="buffer" />.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The buffer <structfield>type</structfield> is not
+supported, or the <structfield>index</structfield> is out of bounds.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-querycap.xml b/Documentation/DocBook/v4l/vidioc-querycap.xml
new file mode 100644 (file)
index 0000000..6ab7e25
--- /dev/null
@@ -0,0 +1,284 @@
+<refentry id="vidioc-querycap">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QUERYCAP</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QUERYCAP</refname>
+    <refpurpose>Query device capabilities</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_capability *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_QUERYCAP</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>All V4L2 devices support the
+<constant>VIDIOC_QUERYCAP</constant> ioctl. It is used to identify
+kernel devices compatible with this specification and to obtain
+information about driver and hardware capabilities. The ioctl takes a
+pointer to a &v4l2-capability; which is filled by the driver. When the
+driver is not compatible with this specification the ioctl returns an
+&EINVAL;.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-capability">
+      <title>struct <structname>v4l2_capability</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>driver</structfield>[16]</entry>
+           <entry><para>Name of the driver, a unique NUL-terminated
+ASCII string. For example: "bttv". Driver specific applications can
+use this information to verify the driver identity. It is also useful
+to work around known bugs, or to identify drivers in error reports.
+The driver version is stored in the <structfield>version</structfield>
+field.</para><para>Storing strings in fixed sized arrays is bad
+practice but unavoidable here. Drivers and applications should take
+precautions to never read or write beyond the end of the array and to
+make sure the strings are properly NUL-terminated.</para></entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>card</structfield>[32]</entry>
+           <entry>Name of the device, a NUL-terminated ASCII string.
+For example: "Yoyodyne TV/FM". One driver may support different brands
+or models of video hardware. This information is intended for users,
+for example in a menu of available devices. Since multiple TV cards of
+the same brand may be installed which are supported by the same
+driver, this name should be combined with the character device file
+name (&eg; <filename>/dev/video2</filename>) or the
+<structfield>bus_info</structfield> string to avoid
+ambiguities.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>bus_info</structfield>[32]</entry>
+           <entry>Location of the device in the system, a
+NUL-terminated ASCII string. For example: "PCI Slot 4". This
+information is intended for users, to distinguish multiple
+identical devices. If no such information is available the field may
+simply count the devices controlled by the driver, or contain the
+empty string (<structfield>bus_info</structfield>[0] = 0).<!-- XXX pci_dev->slot_name example --></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>version</structfield></entry>
+           <entry><para>Version number of the driver. Together with
+the <structfield>driver</structfield> field this identifies a
+particular driver. The version number is formatted using the
+<constant>KERNEL_VERSION()</constant> macro:</para></entry>
+         </row>
+         <row>
+           <entry spanname="hspan"><para>
+<programlisting>
+#define KERNEL_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))
+
+__u32 version = KERNEL_VERSION(0, 8, 1);
+
+printf ("Version: %u.%u.%u\n",
+       (version &gt;&gt; 16) &amp; 0xFF,
+       (version &gt;&gt; 8) &amp; 0xFF,
+        version &amp; 0xFF);
+</programlisting></para></entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>capabilities</structfield></entry>
+           <entry>Device capabilities, see <xref
+               linkend="device-capabilities" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[4]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+this array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="device-capabilities">
+      <title>Device Capabilities Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CAP_VIDEO_CAPTURE</constant></entry>
+           <entry>0x00000001</entry>
+           <entry>The device supports the <link
+linkend="capture">Video Capture</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_VIDEO_OUTPUT</constant></entry>
+           <entry>0x00000002</entry>
+           <entry>The device supports the <link
+linkend="output">Video Output</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry>
+           <entry>0x00000004</entry>
+           <entry>The device supports the <link
+linkend="overlay">Video Overlay</link> interface. A video overlay device
+typically stores captured images directly in the video memory of a
+graphics card, with hardware clipping and scaling.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_VBI_CAPTURE</constant></entry>
+           <entry>0x00000010</entry>
+           <entry>The device supports the <link linkend="raw-vbi">Raw
+VBI Capture</link> interface, providing Teletext and Closed Caption
+data.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_VBI_OUTPUT</constant></entry>
+           <entry>0x00000020</entry>
+           <entry>The device supports the <link linkend="raw-vbi">Raw VBI Output</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_SLICED_VBI_CAPTURE</constant></entry>
+           <entry>0x00000040</entry>
+           <entry>The device supports the <link linkend="sliced">Sliced VBI Capture</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_SLICED_VBI_OUTPUT</constant></entry>
+           <entry>0x00000080</entry>
+           <entry>The device supports the <link linkend="sliced">Sliced VBI Output</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_RDS_CAPTURE</constant></entry>
+           <entry>0x00000100</entry>
+           <entry>The device supports the <link linkend="rds">RDS</link> interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_VIDEO_OUTPUT_OVERLAY</constant></entry>
+           <entry>0x00000200</entry>
+           <entry>The device supports the <link linkend="osd">Video
+Output Overlay</link> (OSD) interface. Unlike the <wordasword>Video
+Overlay</wordasword> interface, this is a secondary function of video
+output devices and overlays an image onto an outgoing video signal.
+When the driver sets this flag, it must clear the
+<constant>V4L2_CAP_VIDEO_OVERLAY</constant> flag and vice
+versa.<footnote><para>The &v4l2-framebuffer; lacks an
+&v4l2-buf-type; field, therefore the type of overlay is implied by the
+driver capabilities.</para></footnote></entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_HW_FREQ_SEEK</constant></entry>
+           <entry>0x00000400</entry>
+           <entry>The device supports the &VIDIOC-S-HW-FREQ-SEEK; ioctl for
+hardware frequency seeking.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_TUNER</constant></entry>
+           <entry>0x00010000</entry>
+           <entry>The device has some sort of tuner to
+receive RF-modulated video signals. For more information about
+tuner programming see
+<xref linkend="tuner" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_AUDIO</constant></entry>
+           <entry>0x00020000</entry>
+           <entry>The device has audio inputs or outputs. It may or
+may not support audio recording or playback, in PCM or compressed
+formats. PCM audio support must be implemented as ALSA or OSS
+interface. For more information on audio inputs and outputs see <xref
+               linkend="audio" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_RADIO</constant></entry>
+           <entry>0x00040000</entry>
+           <entry>This is a radio receiver.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_MODULATOR</constant></entry>
+           <entry>0x00080000</entry>
+           <entry>The device has some sort of modulator to
+emit RF-modulated video/audio signals. For more information about
+modulator programming see
+<xref linkend="tuner" />.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_READWRITE</constant></entry>
+           <entry>0x01000000</entry>
+           <entry>The device supports the <link
+linkend="rw">read()</link> and/or <link linkend="rw">write()</link>
+I/O methods.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_ASYNCIO</constant></entry>
+           <entry>0x02000000</entry>
+           <entry>The device supports the <link
+linkend="async">asynchronous</link> I/O methods.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CAP_STREAMING</constant></entry>
+           <entry>0x04000000</entry>
+           <entry>The device supports the <link
+linkend="mmap">streaming</link> I/O method.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The device is not compatible with this
+specification.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
+
diff --git a/Documentation/DocBook/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/v4l/vidioc-queryctrl.xml
new file mode 100644 (file)
index 0000000..4876ff1
--- /dev/null
@@ -0,0 +1,428 @@
+<refentry id="vidioc-queryctrl">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QUERYCTRL, VIDIOC_QUERYMENU</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QUERYCTRL</refname>
+    <refname>VIDIOC_QUERYMENU</refname>
+    <refpurpose>Enumerate controls and menu control items</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_queryctrl *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_querymenu *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_QUERYCTRL, VIDIOC_QUERYMENU</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a control applications set the
+<structfield>id</structfield> field of a &v4l2-queryctrl; and call the
+<constant>VIDIOC_QUERYCTRL</constant> ioctl with a pointer to this
+structure. The driver fills the rest of the structure or returns an
+&EINVAL; when the <structfield>id</structfield> is invalid.</para>
+
+    <para>It is possible to enumerate controls by calling
+<constant>VIDIOC_QUERYCTRL</constant> with successive
+<structfield>id</structfield> values starting from
+<constant>V4L2_CID_BASE</constant> up to and exclusive
+<constant>V4L2_CID_BASE_LASTP1</constant>. Drivers may return
+<errorcode>EINVAL</errorcode> if a control in this range is not
+supported. Further applications can enumerate private controls, which
+are not defined in this specification, by starting at
+<constant>V4L2_CID_PRIVATE_BASE</constant> and incrementing
+<structfield>id</structfield> until the driver returns
+<errorcode>EINVAL</errorcode>.</para>
+
+    <para>In both cases, when the driver sets the
+<constant>V4L2_CTRL_FLAG_DISABLED</constant> flag in the
+<structfield>flags</structfield> field this control is permanently
+disabled and should be ignored by the application.<footnote>
+       <para><constant>V4L2_CTRL_FLAG_DISABLED</constant> was
+intended for two purposes: Drivers can skip predefined controls not
+supported by the hardware (although returning EINVAL would do as
+well), or disable predefined and private controls after hardware
+detection without the trouble of reordering control arrays and indices
+(EINVAL cannot be used to skip private controls because it would
+prematurely end the enumeration).</para></footnote></para>
+
+    <para>When the application ORs <structfield>id</structfield> with
+<constant>V4L2_CTRL_FLAG_NEXT_CTRL</constant> the driver returns the
+next supported control, or <errorcode>EINVAL</errorcode> if there is
+none. Drivers which do not support this flag yet always return
+<errorcode>EINVAL</errorcode>.</para>
+
+    <para>Additional information is required for menu controls: the
+names of the menu items. To query them applications set the
+<structfield>id</structfield> and <structfield>index</structfield>
+fields of &v4l2-querymenu; and call the
+<constant>VIDIOC_QUERYMENU</constant> ioctl with a pointer to this
+structure. The driver fills the rest of the structure or returns an
+&EINVAL; when the <structfield>id</structfield> or
+<structfield>index</structfield> is invalid. Menu items are enumerated
+by calling <constant>VIDIOC_QUERYMENU</constant> with successive
+<structfield>index</structfield> values from &v4l2-queryctrl;
+<structfield>minimum</structfield> (0) to
+<structfield>maximum</structfield>, inclusive.</para>
+
+    <para>See also the examples in <xref linkend="control" />.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-queryctrl">
+      <title>struct <structname>v4l2_queryctrl</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>Identifies the control, set by the application. See
+<xref linkend="control-id" /> for predefined IDs. When the ID is ORed
+with V4L2_CTRL_FLAG_NEXT_CTRL the driver clears the flag and returns
+the first control with a higher ID. Drivers which do not support this
+flag yet always return an &EINVAL;.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-ctrl-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of control, see <xref
+               linkend="v4l2-ctrl-type" />.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the control, a NUL-terminated ASCII
+string. This information is intended for the user.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>minimum</structfield></entry>
+           <entry>Minimum value, inclusive. This field gives a lower
+bound for <constant>V4L2_CTRL_TYPE_INTEGER</constant> controls and the
+lowest valid index (always 0) for <constant>V4L2_CTRL_TYPE_MENU</constant> controls.
+For <constant>V4L2_CTRL_TYPE_STRING</constant> controls the minimum value
+gives the minimum length of the string. This length <emphasis>does not include the terminating
+zero</emphasis>. It may not be valid for any other type of control, including
+<constant>V4L2_CTRL_TYPE_INTEGER64</constant> controls. Note that this is a
+signed value.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>maximum</structfield></entry>
+           <entry>Maximum value, inclusive. This field gives an upper
+bound for <constant>V4L2_CTRL_TYPE_INTEGER</constant> controls and the
+highest valid index for <constant>V4L2_CTRL_TYPE_MENU</constant>
+controls.
+For <constant>V4L2_CTRL_TYPE_STRING</constant> controls the maximum value
+gives the maximum length of the string. This length <emphasis>does not include the terminating
+zero</emphasis>. It may not be valid for any other type of control, including
+<constant>V4L2_CTRL_TYPE_INTEGER64</constant> controls. Note that this is a
+signed value.</entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>step</structfield></entry>
+           <entry><para>This field gives a step size for
+<constant>V4L2_CTRL_TYPE_INTEGER</constant> controls. For
+<constant>V4L2_CTRL_TYPE_STRING</constant> controls this field refers to
+the string length that has to be a multiple of this step size.
+It may not be valid for any other type of control, including
+<constant>V4L2_CTRL_TYPE_INTEGER64</constant>
+controls.</para><para>Generally drivers should not scale hardware
+control values. It may be necessary for example when the
+<structfield>name</structfield> or <structfield>id</structfield> imply
+a particular unit and the hardware actually accepts only multiples of
+said unit. If so, drivers must take care values are properly rounded
+when scaling, such that errors will not accumulate on repeated
+read-write cycles.</para><para>This field gives the smallest change of
+an integer control actually affecting hardware. Often the information
+is needed when the user can change controls by keyboard or GUI
+buttons, rather than a slider. When for example a hardware register
+accepts values 0-511 and the driver reports 0-65535, step should be
+128.</para><para>Note that although signed, the step value is supposed to
+be always positive.</para></entry>
+         </row>
+         <row>
+           <entry>__s32</entry>
+           <entry><structfield>default_value</structfield></entry>
+           <entry>The default value of a
+<constant>V4L2_CTRL_TYPE_INTEGER</constant>,
+<constant>_BOOLEAN</constant> or <constant>_MENU</constant> control.
+Not valid for other types of controls. Drivers reset controls only
+when the driver is loaded, not later, in particular not when the
+func-open; is called.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>flags</structfield></entry>
+           <entry>Control flags, see <xref
+               linkend="control-flags" />.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-querymenu">
+      <title>struct <structname>v4l2_querymenu</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>id</structfield></entry>
+           <entry>Identifies the control, set by the application
+from the respective &v4l2-queryctrl;
+<structfield>id</structfield>.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>index</structfield></entry>
+           <entry>Index of the menu item, starting at zero, set by
+           the application.</entry>
+         </row>
+         <row>
+           <entry>__u8</entry>
+           <entry><structfield>name</structfield>[32]</entry>
+           <entry>Name of the menu item, a NUL-terminated ASCII
+string. This information is intended for the user.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield></entry>
+           <entry>Reserved for future extensions. Drivers must set
+the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-ctrl-type">
+      <title>enum v4l2_ctrl_type</title>
+      <tgroup cols="5" align="left">
+       <colspec colwidth="30*" />
+       <colspec colwidth="5*" align="center" />
+       <colspec colwidth="5*" align="center" />
+       <colspec colwidth="5*" align="center" />
+       <colspec colwidth="55*" />
+       <thead>
+         <row>
+           <entry>Type</entry>
+           <entry><structfield>minimum</structfield></entry>
+           <entry><structfield>step</structfield></entry>
+           <entry><structfield>maximum</structfield></entry>
+           <entry>Description</entry>
+         </row>
+       </thead>
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_INTEGER</constant></entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>An integer-valued control ranging from minimum to
+maximum inclusive. The step value indicates the increment between
+values which are actually different on the hardware.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_BOOLEAN</constant></entry>
+           <entry>0</entry>
+           <entry>1</entry>
+           <entry>1</entry>
+           <entry>A boolean-valued control. Zero corresponds to
+"disabled", and one means "enabled".</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_MENU</constant></entry>
+           <entry>0</entry>
+           <entry>1</entry>
+           <entry>N-1</entry>
+           <entry>The control has a menu of N choices. The names of
+the menu items can be enumerated with the
+<constant>VIDIOC_QUERYMENU</constant> ioctl.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_BUTTON</constant></entry>
+           <entry>0</entry>
+           <entry>0</entry>
+           <entry>0</entry>
+           <entry>A control which performs an action when set.
+Drivers must ignore the value passed with
+<constant>VIDIOC_S_CTRL</constant> and return an &EINVAL; on a
+<constant>VIDIOC_G_CTRL</constant> attempt.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_INTEGER64</constant></entry>
+           <entry>n/a</entry>
+           <entry>n/a</entry>
+           <entry>n/a</entry>
+           <entry>A 64-bit integer valued control. Minimum, maximum
+and step size cannot be queried.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_STRING</constant></entry>
+           <entry>&ge; 0</entry>
+           <entry>&ge; 1</entry>
+           <entry>&ge; 0</entry>
+           <entry>The minimum and maximum string lengths. The step size
+means that the string must be (minimum + N * step) characters long for
+N &ge; 0. These lengths do not include the terminating zero, so in order to
+pass a string of length 8 to &VIDIOC-S-EXT-CTRLS; you need to set the
+<structfield>size</structfield> field of &v4l2-ext-control; to 9. For &VIDIOC-G-EXT-CTRLS; you can
+set the <structfield>size</structfield> field to <structfield>maximum</structfield> + 1.
+Which character encoding is used will depend on the string control itself and
+should be part of the control documentation.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_CTRL_CLASS</constant></entry>
+           <entry>n/a</entry>
+           <entry>n/a</entry>
+           <entry>n/a</entry>
+           <entry>This is not a control. When
+<constant>VIDIOC_QUERYCTRL</constant> is called with a control ID
+equal to a control class code (see <xref linkend="ctrl-class" />), the
+ioctl returns the name of the control class and this control type.
+Older drivers which do not support this feature return an
+&EINVAL;.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="control-flags">
+      <title>Control Flags</title>
+      <tgroup cols="3">
+       &cs-def;
+       <tbody valign="top">
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_DISABLED</constant></entry>
+           <entry>0x0001</entry>
+           <entry>This control is permanently disabled and should be
+ignored by the application. Any attempt to change the control will
+result in an &EINVAL;.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_GRABBED</constant></entry>
+           <entry>0x0002</entry>
+           <entry>This control is temporarily unchangeable, for
+example because another application took over control of the
+respective resource. Such controls may be displayed specially in a
+user interface. Attempts to change the control may result in an
+&EBUSY;.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_READ_ONLY</constant></entry>
+           <entry>0x0004</entry>
+           <entry>This control is permanently readable only. Any
+attempt to change the control will result in an &EINVAL;.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_UPDATE</constant></entry>
+           <entry>0x0008</entry>
+           <entry>A hint that changing this control may affect the
+value of other controls within the same control class. Applications
+should update their user interface accordingly.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_INACTIVE</constant></entry>
+           <entry>0x0010</entry>
+           <entry>This control is not applicable to the current
+configuration and should be displayed accordingly in a user interface.
+For example the flag may be set on a MPEG audio level 2 bitrate
+control when MPEG audio encoding level 1 was selected with another
+control.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_SLIDER</constant></entry>
+           <entry>0x0020</entry>
+           <entry>A hint that this control is best represented as a
+slider-like element in a user interface.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_FLAG_WRITE_ONLY</constant></entry>
+           <entry>0x0040</entry>
+           <entry>This control is permanently writable only. Any
+attempt to read the control will result in an &EACCES; error code. This
+flag is typically present for relative controls or action controls where
+writing a value will cause the device to carry out a given action
+(&eg; motor control) but no meaningful value can be returned.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The &v4l2-queryctrl; <structfield>id</structfield>
+is invalid. The &v4l2-querymenu; <structfield>id</structfield> or
+<structfield>index</structfield> is invalid.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EACCES</errorcode></term>
+       <listitem>
+         <para>An attempt was made to read a write-only control.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-querystd.xml b/Documentation/DocBook/v4l/vidioc-querystd.xml
new file mode 100644 (file)
index 0000000..b5a7ff9
--- /dev/null
@@ -0,0 +1,83 @@
+<refentry id="vidioc-querystd">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QUERYSTD</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QUERYSTD</refname>
+    <refpurpose>Sense the video standard received by the current
+input</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>v4l2_std_id *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+       <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_QUERYSTD</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The hardware may be able to detect the current video
+standard automatically. To do so, applications call <constant>
+VIDIOC_QUERYSTD</constant> with a pointer to a &v4l2-std-id; type. The
+driver stores here a set of candidates, this can be a single flag or a
+set of supported standards if for example the hardware can only
+distinguish between 50 and 60 Hz systems. When detection is not
+possible or fails, the set must contain all standards supported by the
+current video input or output.</para>
+
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>This ioctl is not supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-reqbufs.xml b/Documentation/DocBook/v4l/vidioc-reqbufs.xml
new file mode 100644 (file)
index 0000000..bab3808
--- /dev/null
@@ -0,0 +1,160 @@
+<refentry id="vidioc-reqbufs">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_REQBUFS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_REQBUFS</refname>
+    <refpurpose>Initiate Memory Mapping or User Pointer I/O</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_requestbuffers *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_REQBUFS</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>This ioctl is used to initiate <link linkend="mmap">memory
+mapped</link> or <link linkend="userp">user pointer</link>
+I/O. Memory mapped buffers are located in device memory and must be
+allocated with this ioctl before they can be mapped into the
+application's address space. User buffers are allocated by
+applications themselves, and this ioctl is merely used to switch the
+driver into user pointer I/O mode.</para>
+
+    <para>To allocate device buffers applications initialize three
+fields of a <structname>v4l2_requestbuffers</structname> structure.
+They set the <structfield>type</structfield> field to the respective
+stream or buffer type, the <structfield>count</structfield> field to
+the desired number of buffers, and <structfield>memory</structfield>
+must be set to <constant>V4L2_MEMORY_MMAP</constant>. When the ioctl
+is called with a pointer to this structure the driver attempts to
+allocate the requested number of buffers and stores the actual number
+allocated in the <structfield>count</structfield> field. It can be
+smaller than the number requested, even zero, when the driver runs out
+of free memory. A larger number is possible when the driver requires
+more buffers to function correctly.<footnote>
+       <para>For example video output requires at least two buffers,
+one displayed and one filled by the application.</para>
+       </footnote> When memory mapping I/O is not supported the ioctl
+returns an &EINVAL;.</para>
+
+    <para>Applications can call <constant>VIDIOC_REQBUFS</constant>
+again to change the number of buffers, however this cannot succeed
+when any buffers are still mapped. A <structfield>count</structfield>
+value of zero frees all buffers, after aborting or finishing any DMA
+in progress, an implicit &VIDIOC-STREAMOFF;. <!-- mhs: I see no
+reason why munmap()ping one or even all buffers must imply
+streamoff.--></para>
+
+    <para>To negotiate user pointer I/O, applications initialize only
+the <structfield>type</structfield> field and set
+<structfield>memory</structfield> to
+<constant>V4L2_MEMORY_USERPTR</constant>. When the ioctl is called
+with a pointer to this structure the driver prepares for user pointer
+I/O, when this I/O method is not supported the ioctl returns an
+&EINVAL;.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-requestbuffers">
+      <title>struct <structname>v4l2_requestbuffers</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>count</structfield></entry>
+           <entry>The number of buffers requested or granted. This
+field is only used when <structfield>memory</structfield> is set to
+<constant>V4L2_MEMORY_MMAP</constant>.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-buf-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>Type of the stream or buffers, this is the same
+as the &v4l2-format; <structfield>type</structfield> field. See <xref
+               linkend="v4l2-buf-type" /> for valid values.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-memory;</entry>
+           <entry><structfield>memory</structfield></entry>
+           <entry>Applications set this field to
+<constant>V4L2_MEMORY_MMAP</constant> or
+<constant>V4L2_MEMORY_USERPTR</constant>.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[2]</entry>
+           <entry>A place holder for future extensions and custom
+(driver defined) buffer types <constant>V4L2_BUF_TYPE_PRIVATE</constant> and
+higher.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EBUSY</errorcode></term>
+       <listitem>
+         <para>The driver supports multiple opens and I/O is already
+in progress, or reallocation of buffers was attempted although one or
+more are still mapped.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The buffer type (<structfield>type</structfield> field) or the
+requested I/O method (<structfield>memory</structfield>) is not
+supported.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml b/Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml
new file mode 100644 (file)
index 0000000..14b3ec7
--- /dev/null
@@ -0,0 +1,129 @@
+<refentry id="vidioc-s-hw-freq-seek">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_S_HW_FREQ_SEEK</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_S_HW_FREQ_SEEK</refname>
+    <refpurpose>Perform a hardware frequency seek</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>struct v4l2_hw_freq_seek
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_S_HW_FREQ_SEEK</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>Start a hardware frequency seek from the current frequency.
+To do this applications initialize the <structfield>tuner</structfield>,
+<structfield>type</structfield>, <structfield>seek_upward</structfield> and
+<structfield>wrap_around</structfield> fields, and zero out the
+<structfield>reserved</structfield> array of a &v4l2-hw-freq-seek; and
+call the <constant>VIDIOC_S_HW_FREQ_SEEK</constant> ioctl with a pointer
+to this structure.</para>
+
+    <para>This ioctl is supported if the <constant>V4L2_CAP_HW_FREQ_SEEK</constant> capability is set.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-hw-freq-seek">
+      <title>struct <structname>v4l2_hw_freq_seek</structname></title>
+      <tgroup cols="3">
+       &cs-str;
+       <tbody valign="top">
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>tuner</structfield></entry>
+           <entry>The tuner index number. This is the
+same value as in the &v4l2-input; <structfield>tuner</structfield>
+field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
+         </row>
+         <row>
+           <entry>&v4l2-tuner-type;</entry>
+           <entry><structfield>type</structfield></entry>
+           <entry>The tuner type. This is the same value as in the
+&v4l2-tuner; <structfield>type</structfield> field.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>seek_upward</structfield></entry>
+           <entry>If non-zero, seek upward from the current frequency, else seek downward.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>wrap_around</structfield></entry>
+           <entry>If non-zero, wrap around when at the end of the frequency range, else stop seeking.</entry>
+         </row>
+         <row>
+           <entry>__u32</entry>
+           <entry><structfield>reserved</structfield>[8]</entry>
+           <entry>Reserved for future extensions. Drivers and
+           applications must set the array to zero.</entry>
+         </row>
+       </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>The <structfield>tuner</structfield> index is out of
+bounds or the value in the <structfield>type</structfield> field is
+wrong.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><errorcode>EAGAIN</errorcode></term>
+       <listitem>
+         <para>The ioctl timed-out. Try again.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-streamon.xml b/Documentation/DocBook/v4l/vidioc-streamon.xml
new file mode 100644 (file)
index 0000000..e42bff1
--- /dev/null
@@ -0,0 +1,106 @@
+<refentry id="vidioc-streamon">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_STREAMON, VIDIOC_STREAMOFF</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_STREAMON</refname>
+    <refname>VIDIOC_STREAMOFF</refname>
+    <refpurpose>Start or stop streaming I/O</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+       <funcdef>int <function>ioctl</function></funcdef>
+       <paramdef>int <parameter>fd</parameter></paramdef>
+       <paramdef>int <parameter>request</parameter></paramdef>
+       <paramdef>const int *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+       <term><parameter>fd</parameter></term>
+       <listitem>
+         <para>&fd;</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>request</parameter></term>
+       <listitem>
+         <para>VIDIOC_STREAMON, VIDIOC_STREAMOFF</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><parameter>argp</parameter></term>
+       <listitem>
+         <para></para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The <constant>VIDIOC_STREAMON</constant> and
+<constant>VIDIOC_STREAMOFF</constant> ioctl start and stop the capture
+or output process during streaming (<link linkend="mmap">memory
+mapping</link> or <link linkend="userp">user pointer</link>) I/O.</para>
+
+    <para>Specifically the capture hardware is disabled and no input
+buffers are filled (if there are any empty buffers in the incoming
+queue) until <constant>VIDIOC_STREAMON</constant> has been called.
+Accordingly the output hardware is disabled, no video signal is
+produced until <constant>VIDIOC_STREAMON</constant> has been called.
+The ioctl will succeed only when at least one output buffer is in the
+incoming queue.</para>
+
+    <para>The <constant>VIDIOC_STREAMOFF</constant> ioctl, apart of
+aborting or finishing any DMA in progress, unlocks any user pointer
+buffers locked in physical memory, and it removes all buffers from the
+incoming and outgoing queues. That means all images captured but not
+dequeued yet will be lost, likewise all images enqueued for output but
+not transmitted yet. I/O returns to the same state as after calling
+&VIDIOC-REQBUFS; and can be restarted accordingly.</para>
+
+    <para>Both ioctls take a pointer to an integer, the desired buffer or
+stream type. This is the same as &v4l2-requestbuffers;
+<structfield>type</structfield>.</para>
+
+    <para>Note applications can be preempted for unknown periods right
+before or after the <constant>VIDIOC_STREAMON</constant> or
+<constant>VIDIOC_STREAMOFF</constant> calls, there is no notion of
+starting or stopping "now". Buffer timestamps can be used to
+synchronize with other events.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+       <term><errorcode>EINVAL</errorcode></term>
+       <listitem>
+         <para>Streaming I/O is not supported, the buffer
+<structfield>type</structfield> is not supported, or no buffers have
+been allocated (memory mapping) or enqueued (output) yet.</para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
index 5c555a8..b7f9d3b 100644 (file)
@@ -183,7 +183,7 @@ the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
 a man-pages patch, or at least a notification of the change,
 so that some information makes its way into the manual pages.
 
-Even if the maintainer did not respond in step #4, make sure to ALWAYS
+Even if the maintainer did not respond in step #5, make sure to ALWAYS
 copy the maintainer when you change their code.
 
 For small patches you may want to CC the Trivial Patch Monkey
index aa73e72..6e25c26 100644 (file)
@@ -116,7 +116,7 @@ error:
 }
 
 
-int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
+static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
             __u8 genl_cmd, __u16 nla_type,
             void *nla_data, int nla_len)
 {
@@ -160,7 +160,7 @@ int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
  * Probe the controller in genetlink to find the family id
  * for the TASKSTATS family
  */
-int get_family_id(int sd)
+static int get_family_id(int sd)
 {
        struct {
                struct nlmsghdr n;
@@ -190,7 +190,7 @@ int get_family_id(int sd)
        return id;
 }
 
-void print_delayacct(struct taskstats *t)
+static void print_delayacct(struct taskstats *t)
 {
        printf("\n\nCPU   %15s%15s%15s%15s\n"
               "      %15llu%15llu%15llu%15llu\n"
@@ -216,7 +216,7 @@ void print_delayacct(struct taskstats *t)
               (unsigned long long)t->freepages_delay_total);
 }
 
-void task_context_switch_counts(struct taskstats *t)
+static void task_context_switch_counts(struct taskstats *t)
 {
        printf("\n\nTask   %15s%15s\n"
               "       %15llu%15llu\n",
@@ -224,7 +224,7 @@ void task_context_switch_counts(struct taskstats *t)
               (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
 }
 
-void print_cgroupstats(struct cgroupstats *c)
+static void print_cgroupstats(struct cgroupstats *c)
 {
        printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
                "uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
@@ -235,7 +235,7 @@ void print_cgroupstats(struct cgroupstats *c)
 }
 
 
-void print_ioacct(struct taskstats *t)
+static void print_ioacct(struct taskstats *t)
 {
        printf("%s: read=%llu, write=%llu, cancelled_write=%llu\n",
                t->ac_comm,
index 2caeea5..1d2c010 100644 (file)
@@ -62,7 +62,7 @@ unsigned char cfag12864b_buffer[CFAG12864B_SIZE];
  * Unable to open: return = -1
  * Unable to mmap: return = -2
  */
-int cfag12864b_init(char *path)
+static int cfag12864b_init(char *path)
 {
        cfag12864b_fd = open(path, O_RDWR);
        if (cfag12864b_fd == -1)
@@ -81,7 +81,7 @@ int cfag12864b_init(char *path)
 /*
  * exit a cfag12864b framebuffer device
  */
-void cfag12864b_exit(void)
+static void cfag12864b_exit(void)
 {
        munmap(cfag12864b_mem, CFAG12864B_SIZE);
        close(cfag12864b_fd);
@@ -90,7 +90,7 @@ void cfag12864b_exit(void)
 /*
  * set (x, y) pixel
  */
-void cfag12864b_set(unsigned char x, unsigned char y)
+static void cfag12864b_set(unsigned char x, unsigned char y)
 {
        if (CFAG12864B_CHECK(x, y))
                cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] |=
@@ -100,7 +100,7 @@ void cfag12864b_set(unsigned char x, unsigned char y)
 /*
  * unset (x, y) pixel
  */
-void cfag12864b_unset(unsigned char x, unsigned char y)
+static void cfag12864b_unset(unsigned char x, unsigned char y)
 {
        if (CFAG12864B_CHECK(x, y))
                cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] &=
@@ -113,7 +113,7 @@ void cfag12864b_unset(unsigned char x, unsigned char y)
  * Pixel off: return = 0
  * Pixel on:  return = 1
  */
-unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
+static unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
 {
        if (CFAG12864B_CHECK(x, y))
                if (cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] &
@@ -126,7 +126,7 @@ unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
 /*
  * not (x, y) pixel
  */
-void cfag12864b_not(unsigned char x, unsigned char y)
+static void cfag12864b_not(unsigned char x, unsigned char y)
 {
        if (cfag12864b_isset(x, y))
                cfag12864b_unset(x, y);
@@ -137,7 +137,7 @@ void cfag12864b_not(unsigned char x, unsigned char y)
 /*
  * fill (set all pixels)
  */
-void cfag12864b_fill(void)
+static void cfag12864b_fill(void)
 {
        unsigned short i;
 
@@ -148,7 +148,7 @@ void cfag12864b_fill(void)
 /*
  * clear (unset all pixels)
  */
-void cfag12864b_clear(void)
+static void cfag12864b_clear(void)
 {
        unsigned short i;
 
@@ -162,7 +162,7 @@ void cfag12864b_clear(void)
  * Pixel off: src[i] = 0
  * Pixel on:  src[i] > 0
  */
-void cfag12864b_format(unsigned char * matrix)
+static void cfag12864b_format(unsigned char * matrix)
 {
        unsigned char i, j, n;
 
@@ -182,7 +182,7 @@ void cfag12864b_format(unsigned char * matrix)
 /*
  * blit buffer to lcd
  */
-void cfag12864b_blit(void)
+static void cfag12864b_blit(void)
 {
        memcpy(cfag12864b_mem, cfag12864b_buffer, CFAG12864B_SIZE);
 }
@@ -198,7 +198,7 @@ void cfag12864b_blit(void)
 
 #define EXAMPLES       6
 
-void example(unsigned char n)
+static void example(unsigned char n)
 {
        unsigned short i, j;
        unsigned char matrix[CFAG12864B_WIDTH * CFAG12864B_HEIGHT];
index 3d1b0ab..14b7b5a 100644 (file)
@@ -25,7 +25,8 @@ use IO::Handle;
                "tda10046lifeview", "av7110", "dec2000t", "dec2540t",
                "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
                "or51211", "or51132_qam", "or51132_vsb", "bluebird",
-               "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718" );
+               "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718",
+               "af9015");
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -514,6 +515,40 @@ sub bluebird {
        $outfile;
 }
 
+sub af9015 {
+       my $sourcefile = "download.ashx?file=57";
+       my $url = "http://www.ite.com.tw/EN/Services/$sourcefile";
+       my $hash = "ff5b096ed47c080870eacdab2de33ad6";
+       my $outfile = "dvb-usb-af9015.fw";
+       my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
+       my $fwoffset = 0x22708;
+       my $fwlength = 18225;
+       my ($chunklength, $buf, $rcount);
+
+       checkstandard();
+
+       wgetfile($sourcefile, $url);
+       unzip($sourcefile, $tmpdir);
+       verify("$tmpdir/Driver/Files/AF15BDA.sys", $hash);
+
+       open INFILE, '<', "$tmpdir/Driver/Files/AF15BDA.sys";
+       open OUTFILE, '>', $outfile;
+
+       sysseek(INFILE, $fwoffset, SEEK_SET);
+       while($fwlength > 0) {
+               $chunklength = 55;
+               $chunklength = $fwlength if ($chunklength > $fwlength);
+               $rcount = sysread(INFILE, $buf, $chunklength);
+               die "Ran out of data\n" if ($rcount != $chunklength);
+               syswrite(OUTFILE, $buf);
+               sysread(INFILE, $buf, 8);
+               $fwlength -= $rcount + 8;
+       }
+
+       close OUTFILE;
+       close INFILE;
+}
+
 # ---------------------------------------------------------------
 # Utilities
 
index 3f435ff..f0cc4f2 100644 (file)
@@ -4,9 +4,12 @@ How to set up the Technisat/B2C2 Flexcop devices
 1) Find out what device you have
 ================================
 
+Important Notice: The driver does NOT support Technisat USB 2 devices!
+
 First start your linux box with a shipped kernel:
 lspci -vvv for a PCI device (lsusb -vvv for an USB device) will show you for example:
-02:0b.0 Network controller: Techsan Electronics Co Ltd B2C2 FlexCopII DVB chip / Technisat SkyStar2 DVB card (rev 02)
+02:0b.0 Network controller: Techsan Electronics Co Ltd B2C2 FlexCopII DVB chip /
+ Technisat SkyStar2 DVB card (rev 02)
 
 dmesg | grep frontend may show you for example:
 DVB: registering frontend 0 (Conexant CX24123/CX24109)...
@@ -14,62 +17,62 @@ DVB: registering frontend 0 (Conexant CX24123/CX24109)...
 2) Kernel compilation:
 ======================
 
-If the Technisat is the only TV device in your box get rid of unnecessary modules and check this one:
-"Multimedia devices" => "Customise analog and hybrid tuner modules to build"
-In this directory uncheck every driver which is activated there (except "Simple tuner support" for case 9 only).
+If the Flexcop / Technisat is the only DVB / TV / Radio device in your box
+ get rid of unnecessary modules and check this one:
+"Multimedia support" => "Customise analog and hybrid tuner modules to build"
+In this directory uncheck every driver which is activated there
+ (except "Simple tuner support" for ATSC 3rd generation only -> see case 9 please).
 
 Then please activate:
 2a) Main module part:
+"Multimedia support" => "DVB/ATSC adapters"
+ => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters"
 
-a.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters"
-b.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Technisat/B2C2 Air/Sky/Cable2PC PCI" in case of a PCI card
-OR
-c.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Technisat/B2C2 Air/Sky/Cable2PC USB" in case of an USB 1.1 adapter
-d.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Enable debug for the B2C2 FlexCop drivers"
-Notice: d.) is helpful for troubleshooting
+a.) => "Technisat/B2C2 Air/Sky/Cable2PC PCI" (PCI card) or
+b.) => "Technisat/B2C2 Air/Sky/Cable2PC USB" (USB 1.1 adapter)
+ and for troubleshooting purposes:
+c.) => "Enable debug for the B2C2 FlexCop drivers"
 
-2b) Frontend module part:
+2b) Frontend / Tuner / Demodulator module part:
+"Multimedia support" => "DVB/ATSC adapters"
+ => "Customise the frontend modules to build" "Customise DVB frontends" =>
 
 1.) SkyStar DVB-S Revision 2.3:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "Zarlink VP310/MT312/ZL10313 based"
+a.) => "Zarlink VP310/MT312/ZL10313 based"
+b.) => "Generic I2C PLL based tuners"
 
 2.) SkyStar DVB-S Revision 2.6:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "ST STV0299 based"
+a.) => "ST STV0299 based"
+b.) => "Generic I2C PLL based tuners"
 
 3.) SkyStar DVB-S Revision 2.7:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "Samsung S5H1420 based"
-c.)"Multimedia devices" => "Customise DVB frontends" => "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"
-d.)"Multimedia devices" => "Customise DVB frontends" => "ISL6421 SEC controller"
+a.) => "Samsung S5H1420 based"
+b.) => "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"
+c.) => "ISL6421 SEC controller"
 
 4.) SkyStar DVB-S Revision 2.8:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "Conexant CX24113/CX24128 tuner for DVB-S/DSS"
-c.)"Multimedia devices" => "Customise DVB frontends" => "Conexant CX24123 based"
-d.)"Multimedia devices" => "Customise DVB frontends" => "ISL6421 SEC controller"
+a.) => "Conexant CX24123 based"
+b.) => "Conexant CX24113/CX24128 tuner for DVB-S/DSS"
+c.) => "ISL6421 SEC controller"
 
 5.) AirStar DVB-T card:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "Zarlink MT352 based"
+a.) => "Zarlink MT352 based"
+b.) => "Generic I2C PLL based tuners"
 
 6.) CableStar DVB-C card:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "ST STV0297 based"
+a.) => "ST STV0297 based"
+b.) => "Generic I2C PLL based tuners"
 
 7.) AirStar ATSC card 1st generation:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "Broadcom BCM3510"
+a.) => "Broadcom BCM3510"
 
 8.) AirStar ATSC card 2nd generation:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "NxtWave Communications NXT2002/NXT2004 based"
-c.)"Multimedia devices" => "Customise DVB frontends" => "Generic I2C PLL based tuners"
+a.) => "NxtWave Communications NXT2002/NXT2004 based"
+b.) => "Generic I2C PLL based tuners"
 
 9.) AirStar ATSC card 3rd generation:
-a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"
-b.)"Multimedia devices" => "Customise DVB frontends" => "LG Electronics LGDT3302/LGDT3303 based"
-c.)"Multimedia devices" => "Customise analog and hybrid tuner modules to build" => "Simple tuner support"
+a.) => "LG Electronics LGDT3302/LGDT3303 based"
+b.) "Multimedia support" => "Customise analog and hybrid tuner modules to build"
+ => "Simple tuner support"
 
-Author: Uwe Bugla <uwe.bugla@gmx.de> February 2009
+Author: Uwe Bugla <uwe.bugla@gmx.de> August 2009
diff --git a/Documentation/fb/ep93xx-fb.txt b/Documentation/fb/ep93xx-fb.txt
new file mode 100644 (file)
index 0000000..5af1bd9
--- /dev/null
@@ -0,0 +1,135 @@
+================================
+Driver for EP93xx LCD controller
+================================
+
+The EP93xx LCD controller can drive both standard desktop monitors and
+embedded LCD displays. If you have a standard desktop monitor then you
+can use the standard Linux video mode database. In your board file:
+
+       static struct ep93xxfb_mach_info some_board_fb_info = {
+               .num_modes      = EP93XXFB_USE_MODEDB,
+               .bpp            = 16,
+       };
+
+If you have an embedded LCD display then you need to define a video
+mode for it as follows:
+
+       static struct fb_videomode some_board_video_modes[] = {
+               {
+                       .name           = "some_lcd_name",
+                       /* Pixel clock, porches, etc */
+               },
+       };
+
+Note that the pixel clock value is in pico-seconds. You can use the
+KHZ2PICOS macro to convert the pixel clock value. Most other values
+are in pixel clocks. See Documentation/fb/framebuffer.txt for further
+details.
+
+The ep93xxfb_mach_info structure for your board should look like the
+following:
+
+       static struct ep93xxfb_mach_info some_board_fb_info = {
+               .num_modes      = ARRAY_SIZE(some_board_video_modes),
+               .modes          = some_board_video_modes,
+               .default_mode   = &some_board_video_modes[0],
+               .bpp            = 16,
+       };
+
+The framebuffer device can be registered by adding the following to
+your board initialisation function:
+
+       ep93xx_register_fb(&some_board_fb_info);
+
+=====================
+Video Attribute Flags
+=====================
+
+The ep93xxfb_mach_info structure has a flags field which can be used
+to configure the controller. The video attributes flags are fully
+documented in section 7 of the EP93xx users' guide. The following
+flags are available:
+
+EP93XXFB_PCLK_FALLING          Clock data on the falling edge of the
+                               pixel clock. The default is to clock
+                               data on the rising edge.
+
+EP93XXFB_SYNC_BLANK_HIGH       Blank signal is active high. By
+                               default the blank signal is active low.
+
+EP93XXFB_SYNC_HORIZ_HIGH       Horizontal sync is active high. By
+                               default the horizontal sync is active low.
+
+EP93XXFB_SYNC_VERT_HIGH                Vertical sync is active high. By
+                               default the vertical sync is active high.
+
+The physical address of the framebuffer can be controlled using the
+following flags:
+
+EP93XXFB_USE_SDCSN0            Use SDCSn[0] for the framebuffer. This
+                               is the default setting.
+
+EP93XXFB_USE_SDCSN1            Use SDCSn[1] for the framebuffer.
+
+EP93XXFB_USE_SDCSN2            Use SDCSn[2] for the framebuffer.
+
+EP93XXFB_USE_SDCSN3            Use SDCSn[3] for the framebuffer.
+
+==================
+Platform callbacks
+==================
+
+The EP93xx framebuffer driver supports three optional platform
+callbacks: setup, teardown and blank. The setup and teardown functions
+are called when the framebuffer driver is installed and removed
+respectively. The blank function is called whenever the display is
+blanked or unblanked.
+
+The setup and teardown devices pass the platform_device structure as
+an argument. The fb_info and ep93xxfb_mach_info structures can be
+obtained as follows:
+
+       static int some_board_fb_setup(struct platform_device *pdev)
+       {
+               struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
+               struct fb_info *fb_info = platform_get_drvdata(pdev);
+
+               /* Board specific framebuffer setup */
+       }
+
+======================
+Setting the video mode
+======================
+
+The video mode is set using the following syntax:
+
+       video=XRESxYRES[-BPP][@REFRESH]
+
+If the EP93xx video driver is built-in then the video mode is set on
+the Linux kernel command line, for example:
+
+       video=ep93xx-fb:800x600-16@60
+
+If the EP93xx video driver is built as a module then the video mode is
+set when the module is installed:
+
+       modprobe ep93xx-fb video=320x240
+
+==============
+Screenpage bug
+==============
+
+At least on the EP9315 there is a silicon bug which causes bit 27 of
+the VIDSCRNPAGE (framebuffer physical offset) to be tied low. There is
+an unofficial errata for this bug at:
+       http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2
+
+By default the EP93xx framebuffer driver checks if the allocated physical
+address has bit 27 set. If it does, then the memory is freed and an
+error is returned. The check can be disabled by adding the following
+option when loading the driver:
+
+      ep93xx-fb.check_screenpage_bug=0
+
+In some cases it may be possible to reconfigure your SDRAM layout to
+avoid this bug. See section 13 of the EP93xx users' guide for details.
index ad7a677..e5ce8a1 100644 (file)
@@ -186,9 +186,7 @@ noinverse - show true colors on screen. It is default.
 dev:X    - bind driver to device X. Driver numbers device from 0 up to N,
            where device 0 is first `known' device found, 1 second and so on.
           lspci lists devices in this order.
-          Default is `every' known device for driver with multihead support
-          and first working device (usually dev:0) for driver without
-          multihead support.
+          Default is `every' known device.
 nohwcursor - disables hardware cursor (use software cursor instead).
 hwcursor - enables hardware cursor. It is default. If you are using
            non-accelerated mode (`noaccel' or `fbset -accel false'), software
index f12c30c..5af164f 100644 (file)
@@ -7,6 +7,6 @@ ftp.gwdg.de/pub/linux/misc/ncpfs, but sunsite and its many mirrors
 will have it as well.
 
 Related products are linware and mars_nwe, which will give Linux partial
-NetWare server functionality.  Linware's home site is
-klokan.sh.cvut.cz/pub/linux/linware; mars_nwe can be found on
-ftp.gwdg.de/pub/linux/misc/ncpfs.
+NetWare server functionality.
+
+mars_nwe can be found on ftp.gwdg.de/pub/linux/misc/ncpfs.
index 05d81cb..5920fe2 100644 (file)
@@ -11,6 +11,11 @@ the /proc/fs/nfsd/versions control file.  Note that to write this
 control file, the nfsd service must be taken down.  Use your user-mode
 nfs-utils to set this up; see rpc.nfsd(8)
 
+(Warning: older servers will interpret "+4.1" and "-4.1" as "+4" and
+"-4", respectively.  Therefore, code meant to work on both new and old
+kernels must turn 4.1 on or off *before* turning support for version 4
+on or off; rpc.nfsd does this correctly.)
+
 The NFSv4 minorversion 1 (NFSv4.1) implementation in nfsd is based
 on the latest NFSv4.1 Internet Draft:
 http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29
@@ -25,6 +30,49 @@ are still under development out of tree.
 See http://wiki.linux-nfs.org/wiki/index.php/PNFS_prototype_design
 for more information.
 
+The current implementation is intended for developers only: while it
+does support ordinary file operations on clients we have tested against
+(including the linux client), it is incomplete in ways which may limit
+features unexpectedly, cause known bugs in rare cases, or cause
+interoperability problems with future clients.  Known issues:
+
+       - gss support is questionable: currently mounts with kerberos
+         from a linux client are possible, but we aren't really
+         conformant with the spec (for example, we don't use kerberos
+         on the backchannel correctly).
+       - no trunking support: no clients currently take advantage of
+         trunking, but this is a mandatory failure, and its use is
+         recommended to clients in a number of places.  (E.g. to ensure
+         timely renewal in case an existing connection's retry timeouts
+         have gotten too long; see section 8.3 of the draft.)
+         Therefore, lack of this feature may cause future clients to
+         fail.
+       - Incomplete backchannel support: incomplete backchannel gss
+         support and no support for BACKCHANNEL_CTL mean that
+         callbacks (hence delegations and layouts) may not be
+         available and clients confused by the incomplete
+         implementation may fail.
+       - Server reboot recovery is unsupported; if the server reboots,
+         clients may fail.
+       - We do not support SSV, which provides security for shared
+         client-server state (thus preventing unauthorized tampering
+         with locks and opens, for example).  It is mandatory for
+         servers to support this, though no clients use it yet.
+       - Mandatory operations which we do not support, such as
+         DESTROY_CLIENTID, FREE_STATEID, SECINFO_NO_NAME, and
+         TEST_STATEID, are not currently used by clients, but will be
+         (and the spec recommends their uses in common cases), and
+         clients should not be expected to know how to recover from the
+         case where they are not supported.  This will eventually cause
+         interoperability failures.
+
+In addition, some limitations are inherited from the current NFSv4
+implementation:
+
+       - Incomplete delegation enforcement: if a file is renamed or
+         unlinked, a client holding a delegation may continue to
+         indefinitely allow opens of the file under the old name.
+
 The table below, taken from the NFSv4.1 document, lists
 the operations that are mandatory to implement (REQ), optional
 (OPT), and NFSv4.0 operations that are required not to implement (MNI)
@@ -142,6 +190,12 @@ NS*| CB_WANTS_CANCELLED      | OPT       | FDELG,      | Section 20.10 |
 
 Implementation notes:
 
+DELEGPURGE:
+* mandatory only for servers that support CLAIM_DELEGATE_PREV and/or
+  CLAIM_DELEG_PREV_FH (which allows clients to keep delegations that
+  persist across client reboots).  Thus we need not implement this for
+  now.
+
 EXCHANGE_ID:
 * only SP4_NONE state protection supported
 * implementation ids are ignored
index 68baddf..3ba0b94 100644 (file)
@@ -105,7 +105,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
                the client address and this parameter is NOT empty only
                replies from the specified server are accepted.
 
-               Only required for for NFS root. That is autoconfiguration
+               Only required for NFS root. That is autoconfiguration
                will not be triggered if it is missing and NFS root is not
                in operation.
 
index ffead13..b5aee78 100644 (file)
@@ -176,6 +176,7 @@ read the file /proc/PID/status:
   CapBnd: ffffffffffffffff
   voluntary_ctxt_switches:        0
   nonvoluntary_ctxt_switches:     1
+  Stack usage:    12 kB
 
 This shows you nearly the same information you would get if you viewed it with
 the ps  command.  In  fact,  ps  uses  the  proc  file  system  to  obtain its
@@ -229,6 +230,7 @@ Table 1-2: Contents of the statm files (as of 2.6.30-rc7)
  Mems_allowed_list           Same as previous, but in "list format"
  voluntary_ctxt_switches     number of voluntary context switches
  nonvoluntary_ctxt_switches  number of non voluntary context switches
+ Stack usage:                stack usage high water mark (round up to page size)
 ..............................................................................
 
 Table 1-3: Contents of the statm files (as of 2.6.8-rc3)
@@ -307,7 +309,7 @@ address           perms offset  dev   inode      pathname
 08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test
 0804a000-0806b000 rw-p 00000000 00:00 0          [heap]
 a7cb1000-a7cb2000 ---p 00000000 00:00 0
-a7cb2000-a7eb2000 rw-p 00000000 00:00 0
+a7cb2000-a7eb2000 rw-p 00000000 00:00 0          [threadstack:001ff4b4]
 a7eb2000-a7eb3000 ---p 00000000 00:00 0
 a7eb3000-a7ed5000 rw-p 00000000 00:00 0
 a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6
@@ -343,6 +345,7 @@ is not associated with a file:
  [stack]                  = the stack of the main process
  [vdso]                   = the "virtual dynamic shared object",
                             the kernel system call handler
+ [threadstack:xxxxxxxx]   = the stack of the thread, xxxxxxxx is the stack size
 
  or if empty, the mapping is anonymous.
 
@@ -375,6 +378,19 @@ of memory currently marked as referenced or accessed.
 This file is only present if the CONFIG_MMU kernel configuration option is
 enabled.
 
+The /proc/PID/clear_refs is used to reset the PG_Referenced and ACCESSED/YOUNG
+bits on both physical and virtual pages associated with a process.
+To clear the bits for all the pages associated with the process
+    > echo 1 > /proc/PID/clear_refs
+
+To clear the bits for the anonymous pages associated with the process
+    > echo 2 > /proc/PID/clear_refs
+
+To clear the bits for the file mapped pages associated with the process
+    > echo 3 > /proc/PID/clear_refs
+Any other value written to /proc/PID/clear_refs will have no effect.
+
+
 1.2 Kernel data
 ---------------
 
@@ -1032,9 +1048,9 @@ Various pieces   of  information about  kernel activity  are  available in the
 since the system first booted.  For a quick look, simply cat the file:
 
   > cat /proc/stat
-  cpu  2255 34 2290 22625563 6290 127 456 0
-  cpu0 1132 34 1441 11311718 3675 127 438 0
-  cpu1 1123 0 849 11313845 2614 0 18 0
+  cpu  2255 34 2290 22625563 6290 127 456 0 0
+  cpu0 1132 34 1441 11311718 3675 127 438 0 0
+  cpu1 1123 0 849 11313845 2614 0 18 0 0
   intr 114930548 113199788 3 0 5 263 0 4 [... lots more numbers ...]
   ctxt 1990473
   btime 1062191376
@@ -1056,6 +1072,7 @@ second).  The meanings of the columns are as follows, from left to right:
 - irq: servicing interrupts
 - softirq: servicing softirqs
 - steal: involuntary wait
+- guest: running a guest
 
 The "intr" line gives counts of interrupts  serviced since boot time, for each
 of the  possible system interrupts.   The first  column  is the  total of  all
@@ -1191,7 +1208,7 @@ The following heuristics are then applied:
  * if the task was reniced, its score doubles
  * superuser or direct hardware access tasks (CAP_SYS_ADMIN, CAP_SYS_RESOURCE
        or CAP_SYS_RAWIO) have their score divided by 4
- * if oom condition happened in one cpuset and checked task does not belong
+ * if oom condition happened in one cpuset and checked process does not belong
        to it, its score is divided by 8
  * the resulting score is multiplied by two to the power of oom_adj, i.e.
        points <<= oom_adj when it is positive and
index 40ec633..e7ca647 100644 (file)
@@ -47,7 +47,7 @@ Possible uses:
 
 Configure the kernel with:
 
-        CONFIG_DEBUGFS=y
+        CONFIG_DEBUG_FS=y
         CONFIG_GCOV_KERNEL=y
 
 and to get coverage data for the entire kernel:
index e4b6985..fa4dc07 100644 (file)
@@ -524,6 +524,13 @@ and have the following read/write attributes:
                is configured as an output, this value may be written;
                any nonzero value is treated as high.
 
+       "edge" ... reads as either "none", "rising", "falling", or
+               "both". Write these strings to select the signal edge(s)
+               that will make poll(2) on the "value" file return.
+
+               This file exists only if the pin can be configured as an
+               interrupt generating input pin.
+
 GPIO controllers have paths like /sys/class/gpio/chipchip42/ (for the
 controller implementing GPIOs starting at #42) and have the following
 read-only attributes:
@@ -555,6 +562,11 @@ requested using gpio_request():
        /* reverse gpio_export() */
        void gpio_unexport();
 
+       /* create a sysfs link to an exported GPIO node */
+       int gpio_export_link(struct device *dev, const char *name,
+               unsigned gpio)
+
+
 After a kernel driver requests a GPIO, it may only be made available in
 the sysfs interface by gpio_export().  The driver can control whether the
 signal direction may change.  This helps drivers prevent userspace code
@@ -563,3 +575,8 @@ from accidentally clobbering important system state.
 This explicit exporting can help with debugging (by making some kinds
 of experiments easier), or can provide an always-there interface that's
 suitable for documenting as part of a board support package.
+
+After the GPIO has been exported, gpio_export_link() allows creating
+symlinks from elsewhere in sysfs to the GPIO sysfs node.  Drivers can
+use this to provide the interface under their own device in sysfs with
+a descriptive name.
diff --git a/Documentation/hwmon/acpi_power_meter b/Documentation/hwmon/acpi_power_meter
new file mode 100644 (file)
index 0000000..c80399a
--- /dev/null
@@ -0,0 +1,51 @@
+Kernel driver power_meter
+=========================
+
+This driver talks to ACPI 4.0 power meters.
+
+Supported systems:
+  * Any recent system with ACPI 4.0.
+    Prefix: 'power_meter'
+    Datasheet: http://acpi.info/, section 10.4.
+
+Author: Darrick J. Wong
+
+Description
+-----------
+
+This driver implements sensor reading support for the power meters exposed in
+the ACPI 4.0 spec (Chapter 10.4).  These devices have a simple set of
+features--a power meter that returns average power use over a configurable
+interval, an optional capping mechanism, and a couple of trip points.  The
+sysfs interface conforms with the specification outlined in the "Power" section
+of Documentation/hwmon/sysfs-interface.
+
+Special Features
+----------------
+
+The power[1-*]_is_battery knob indicates if the power supply is a battery.
+Both power[1-*]_average_{min,max} must be set before the trip points will work.
+When both of them are set, an ACPI event will be broadcast on the ACPI netlink
+socket and a poll notification will be sent to the appropriate
+power[1-*]_average sysfs file.
+
+The power[1-*]_{model_number, serial_number, oem_info} fields display arbitrary
+strings that ACPI provides with the meter.  The measures/ directory contains
+symlinks to the devices that this meter measures.
+
+Some computers have the ability to enforce a power cap in hardware.  If this is
+the case, the power[1-*]_cap and related sysfs files will appear.  When the
+average power consumption exceeds the cap, an ACPI event will be broadcast on
+the netlink event socket and a poll notification will be sent to the
+appropriate power[1-*]_alarm file to indicate that capping has begun, and the
+hardware has taken action to reduce power consumption.  Most likely this will
+result in reduced performance.
+
+There are a few other ACPI notifications that can be sent by the firmware.  In
+all cases the ACPI event will be broadcast on the ACPI netlink event socket as
+well as sent as a poll notification to a sysfs file.  The events are as
+follows:
+
+power[1-*]_cap will be notified if the firmware changes the power cap.
+power[1-*]_interval will be notified if the firmware changes the averaging
+interval.
index bbea1cc..681ec22 100644 (file)
 #include <stdint.h>
 #include <errno.h>
 #include <signal.h>
+#include <sys/mman.h>
+#include <sched.h>
+
+char unload_heads_path[64];
+
+int set_unload_heads_path(char *device)
+{
+       char devname[64];
+
+       if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)
+               return -EINVAL;
+       strncpy(devname, device + 5, sizeof(devname));
+
+       snprintf(unload_heads_path, sizeof(unload_heads_path),
+                               "/sys/block/%s/device/unload_heads", devname);
+       return 0;
+}
+int valid_disk(void)
+{
+       int fd = open(unload_heads_path, O_RDONLY);
+       if (fd < 0) {
+               perror(unload_heads_path);
+               return 0;
+       }
+
+       close(fd);
+       return 1;
+}
 
 void write_int(char *path, int i)
 {
@@ -40,7 +68,7 @@ void set_led(int on)
 
 void protect(int seconds)
 {
-       write_int("/sys/block/sda/device/unload_heads", seconds*1000);
+       write_int(unload_heads_path, seconds*1000);
 }
 
 int on_ac(void)
@@ -57,45 +85,62 @@ void ignore_me(void)
 {
        protect(0);
        set_led(0);
-
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char **argv)
 {
-       int fd, ret;
+       int fd, ret;
+       struct sched_param param;
+
+       if (argc == 1)
+               ret = set_unload_heads_path("/dev/sda");
+       else if (argc == 2)
+               ret = set_unload_heads_path(argv[1]);
+       else
+               ret = -EINVAL;
+
+       if (ret || !valid_disk()) {
+               fprintf(stderr, "usage: %s <device> (default: /dev/sda)\n",
+                               argv[0]);
+               exit(1);
+       }
+
+       fd = open("/dev/freefall", O_RDONLY);
+       if (fd < 0) {
+               perror("/dev/freefall");
+               return EXIT_FAILURE;
+       }
 
-       fd = open("/dev/freefall", O_RDONLY);
-       if (fd < 0) {
-               perror("open");
-               return EXIT_FAILURE;
-       }
+       daemon(0, 0);
+       param.sched_priority = sched_get_priority_max(SCHED_FIFO);
+       sched_setscheduler(0, SCHED_FIFO, &param);
+       mlockall(MCL_CURRENT|MCL_FUTURE);
 
        signal(SIGALRM, ignore_me);
 
-       for (;;) {
-              unsigned char count;
-
-               ret = read(fd, &count, sizeof(count));
-              alarm(0);
-              if ((ret == -1) && (errno == EINTR)) {
-                      /* Alarm expired, time to unpark the heads */
-                      continue;
-              }
-
-               if (ret != sizeof(count)) {
-                       perror("read");
-                       break;
-               }
-
-              protect(21);
-              set_led(1);
-              if (1 || on_ac() || lid_open()) {
-                      alarm(2);
-              } else {
-                      alarm(20);
-              }
-       }
-
-       close(fd);
-       return EXIT_SUCCESS;
+       for (;;) {
+               unsigned char count;
+
+               ret = read(fd, &count, sizeof(count));
+               alarm(0);
+               if ((ret == -1) && (errno == EINTR)) {
+                       /* Alarm expired, time to unpark the heads */
+                       continue;
+               }
+
+               if (ret != sizeof(count)) {
+                       perror("read");
+                       break;
+               }
+
+               protect(21);
+               set_led(1);
+               if (1 || on_ac() || lid_open())
+                       alarm(2);
+               else
+                       alarm(20);
+       }
+
+       close(fd);
+       return EXIT_SUCCESS;
 }
index d1ebbe5..db5cc12 100644 (file)
@@ -34,5 +34,5 @@ Fan rotation speeds are reported as 14-bit values from a gated clock
 signal. Speeds down to 83 RPM can be measured.
 
 An alarm is triggered if the rotation speed drops below a programmable
-limit. Another alarm is triggered if the speed is too low to to be measured
+limit. Another alarm is triggered if the speed is too low to be measured
 (including stalled or missing fan).
index f889481..c5b37c5 100644 (file)
@@ -8,6 +8,8 @@ Supported adapters:
     Datasheet: Only available via NDA from ServerWorks
   * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
     Datasheet: Not publicly available
+  * AMD SB900
+    Datasheet: Not publicly available
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com
 
diff --git a/Documentation/i2c/chips/pca9539 b/Documentation/i2c/chips/pca9539
deleted file mode 100644 (file)
index 6aff890..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-Kernel driver pca9539
-=====================
-
-NOTE: this driver is deprecated and will be dropped soon, use
-drivers/gpio/pca9539.c instead.
-
-Supported chips:
-  * Philips PCA9539
-    Prefix: 'pca9539'
-    Addresses scanned: none
-    Datasheet:
-        http://www.semiconductors.philips.com/acrobat/datasheets/PCA9539_2.pdf
-
-Author: Ben Gardner <bgardner@wabtec.com>
-
-
-Description
------------
-
-The Philips PCA9539 is a 16 bit low power I/O device.
-All 16 lines can be individually configured as an input or output.
-The input sense can also be inverted.
-The 16 lines are split between two bytes.
-
-
-Detection
----------
-
-The PCA9539 is difficult to detect and not commonly found in PC machines,
-so you have to pass the I2C bus and address of the installed PCA9539
-devices explicitly to the driver at load time via the force=... parameter.
-
-
-Sysfs entries
--------------
-
-Each is a byte that maps to the 8 I/O bits.
-A '0' suffix is for bits 0-7, while '1' is for bits 8-15.
-
-input[01]     - read the current value
-output[01]    - sets the output value
-direction[01] - direction of each bit: 1=input, 0=output
-invert[01]    - toggle the input bit sense
-
-input reads the actual state of the line and is always available.
-The direction defaults to input for all channels.
-
-
-General Remarks
----------------
-
-Note that each output, direction, and invert entry controls 8 lines.
-You should use the read, modify, write sequence.
-For example. to set output bit 0 of 1.
-  val=$(cat output0)
-  val=$(( $val | 1 ))
-  echo $val > output0
-
diff --git a/Documentation/i2c/chips/pcf8574 b/Documentation/i2c/chips/pcf8574
deleted file mode 100644 (file)
index 235815c..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-Kernel driver pcf8574
-=====================
-
-Supported chips:
-  * Philips PCF8574
-    Prefix: 'pcf8574'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Philips Semiconductors website
-               http://www.semiconductors.philips.com/pip/PCF8574P.html
-
- * Philips PCF8574A
-    Prefix: 'pcf8574a'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Philips Semiconductors website
-               http://www.semiconductors.philips.com/pip/PCF8574P.html
-
-Authors:
-        Frodo Looijaard <frodol@dds.nl>,
-        Philip Edelbrock <phil@netroedge.com>,
-        Dan Eaton <dan.eaton@rocketlogix.com>,
-        Aurelien Jarno <aurelien@aurel32.net>,
-        Jean Delvare <khali@linux-fr.org>,
-
-
-Description
------------
-The PCF8574(A) is an 8-bit I/O expander for the I2C bus produced by Philips
-Semiconductors. It is designed to provide a byte I2C interface to up to 16
-separate devices (8 x PCF8574 and 8 x PCF8574A).
-
-This device consists of a quasi-bidirectional port. Each of the eight I/Os
-can be independently used as an input or output. To setup an I/O as an
-input, you have to write a 1 to the corresponding output.
-
-For more informations see the datasheet.
-
-
-Accessing PCF8574(A) via /sys interface
--------------------------------------
-
-The PCF8574(A) is plainly impossible to detect ! Stupid chip.
-So, you have to pass the I2C bus and address of the installed PCF857A
-and PCF8574A devices explicitly to the driver at load time via the
-force=... parameter.
-
-On detection (i.e. insmod, modprobe et al.), directories are being
-created for each detected PCF8574(A):
-
-/sys/bus/i2c/devices/<0>-<1>/
-where <0> is the bus the chip was detected on (e. g. i2c-0)
-and <1> the chip address ([20..27] or [38..3f]):
-
-(example: /sys/bus/i2c/devices/1-0020/)
-
-Inside these directories, there are two files each:
-read and write (and one file with chip name).
-
-The read file is read-only. Reading gives you the current I/O input
-if the corresponding output is set as 1, otherwise the current output
-value, that is to say 0.
-
-The write file is read/write. Writing a value outputs it on the I/O
-port. Reading returns the last written value. As it is not possible
-to read this value from the chip, you need to write at least once to
-this file before you can read back from it.
diff --git a/Documentation/i2c/chips/pcf8575 b/Documentation/i2c/chips/pcf8575
deleted file mode 100644 (file)
index 40b268e..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-About the PCF8575 chip and the pcf8575 kernel driver
-====================================================
-
-The PCF8575 chip is produced by the following manufacturers:
-
-  * Philips NXP
-    http://www.nxp.com/#/pip/cb=[type=product,path=50807/41735/41850,final=PCF8575_3]|pip=[pip=PCF8575_3][0]
-
-  * Texas Instruments
-    http://focus.ti.com/docs/prod/folders/print/pcf8575.html
-
-
-Some vendors sell small PCB's with the PCF8575 mounted on it. You can connect
-such a board to a Linux host via e.g. an USB to I2C interface. Examples of
-PCB boards with a PCF8575:
-
-  * SFE Breakout Board for PCF8575 I2C Expander by RobotShop
-    http://www.robotshop.ca/home/products/robot-parts/electronics/adapters-converters/sfe-pcf8575-i2c-expander-board.html
-
-  * Breakout Board for PCF8575 I2C Expander by Spark Fun Electronics
-    http://www.sparkfun.com/commerce/product_info.php?products_id=8130
-
-
-Description
------------
-The PCF8575 chip is a 16-bit I/O expander for the I2C bus. Up to eight of
-these chips can be connected to the same I2C bus. You can find this
-chip on some custom designed hardware, but you won't find it on PC
-motherboards.
-
-The PCF8575 chip consists of a 16-bit quasi-bidirectional port and an I2C-bus
-interface. Each of the sixteen I/O's can be independently used as an input or
-an output. To set up an I/O pin as an input, you have to write a 1 to the
-corresponding output.
-
-For more information please see the datasheet.
-
-
-Detection
----------
-
-There is no method known to detect whether a chip on a given I2C address is
-a PCF8575 or whether it is any other I2C device, so you have to pass the I2C
-bus and address of the installed PCF8575 devices explicitly to the driver at
-load time via the force=... parameter.
-
-/sys interface
---------------
-
-For each address on which a PCF8575 chip was found or forced the following
-files will be created under /sys:
-* /sys/bus/i2c/devices/<bus>-<address>/read
-* /sys/bus/i2c/devices/<bus>-<address>/write
-where bus is the I2C bus number (0, 1, ...) and address is the four-digit
-hexadecimal representation of the 7-bit I2C address of the PCF8575
-(0020 .. 0027).
-
-The read file is read-only. Reading it will trigger an I2C read and will hence
-report the current input state for the pins configured as inputs, and the
-current output value for the pins configured as outputs.
-
-The write file is read-write. Writing a value to it will configure all pins
-as output for which the corresponding bit is zero. Reading the write file will
-return the value last written, or -EAGAIN if no value has yet been written to
-the write file.
-
-On module initialization the configuration of the chip is not changed -- the
-chip is left in the state it was already configured in through either power-up
-or through previous I2C write actions.
index d23610f..3dfb76c 100644 (file)
@@ -24,7 +24,7 @@
 
 int sum;
 
-int map_mem(char *path, off_t offset, size_t length, int touch)
+static int map_mem(char *path, off_t offset, size_t length, int touch)
 {
        int fd, rc;
        void *addr;
@@ -62,7 +62,7 @@ int map_mem(char *path, off_t offset, size_t length, int touch)
        return 0;
 }
 
-int scan_tree(char *path, char *file, off_t offset, size_t length, int touch)
+static int scan_tree(char *path, char *file, off_t offset, size_t length, int touch)
 {
        struct dirent **namelist;
        char *name, *path2;
@@ -119,7 +119,7 @@ skip:
 
 char buf[1024];
 
-int read_rom(char *path)
+static int read_rom(char *path)
 {
        int fd, rc;
        size_t size = 0;
@@ -146,7 +146,7 @@ int read_rom(char *path)
        return size;
 }
 
-int scan_rom(char *path, char *file)
+static int scan_rom(char *path, char *file)
 {
        struct dirent **namelist;
        char *name, *path2;
index 0f17d16..6fa7292 100644 (file)
@@ -671,7 +671,7 @@ and is between 256 and 4096 characters. It is defined in the file
        earlyprintk=    [X86,SH,BLACKFIN]
                        earlyprintk=vga
                        earlyprintk=serial[,ttySn[,baudrate]]
-                       earlyprintk=dbgp
+                       earlyprintk=dbgp[debugController#]
 
                        Append ",keep" to not disable it when the real console
                        takes over.
@@ -933,7 +933,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        1 -- enable informational integrity auditing messages.
 
        ima_hash=       [IMA]
-                       Formt: { "sha1" | "md5" }
+                       Format: { "sha1" | "md5" }
                        default: "sha1"
 
        ima_tcb         [IMA]
index 3630446..c28f828 100644 (file)
@@ -43,26 +43,7 @@ feature.
 1. Downloading
 ==============
 
-kmemcheck can only be downloaded using git. If you want to write patches
-against the current code, you should use the kmemcheck development branch of
-the tip tree. It is also possible to use the linux-next tree, which also
-includes the latest version of kmemcheck.
-
-Assuming that you've already cloned the linux-2.6.git repository, all you
-have to do is add the -tip tree as a remote, like this:
-
-       $ git remote add tip git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
-
-To actually download the tree, fetch the remote:
-
-       $ git fetch tip
-
-And to check out a new local branch with the kmemcheck code:
-
-       $ git checkout -b kmemcheck tip/kmemcheck
-
-General instructions for the -tip tree can be found here:
-http://people.redhat.com/mingo/tip.git/readme.txt
+As of version 2.6.31-rc1, kmemcheck is included in the mainline kernel.
 
 
 2. Configuring and compiling
diff --git a/Documentation/laptops/asus-laptop.txt b/Documentation/laptops/asus-laptop.txt
new file mode 100644 (file)
index 0000000..c1c5be8
--- /dev/null
@@ -0,0 +1,258 @@
+Asus Laptop Extras
+
+Version 0.1
+August 6, 2009
+
+Corentin Chary <corentincj@iksaif.net>
+http://acpi4asus.sf.net/
+
+ This driver provides support for extra features of ACPI-compatible ASUS laptops.
+ It may also support some MEDION, JVC or VICTOR laptops (such as MEDION 9675 or
+ VICTOR XP7210 for example). It makes all the extra buttons generate standard
+ ACPI events that go through /proc/acpi/events and input events (like keyboards).
+ On some models adds support for changing the display brightness and output,
+ switching the LCD backlight on and off, and most importantly, allows you to
+ blink those fancy LEDs intended for reporting mail and wireless status.
+
+This driver supercedes the old asus_acpi driver.
+
+Requirements
+------------
+
+  Kernel 2.6.X sources, configured for your computer, with ACPI support.
+  You also need CONFIG_INPUT and CONFIG_ACPI.
+
+Status
+------
+
+ The features currently supported are the following (see below for
+ detailed description):
+
+ - Fn key combinations
+ - Bluetooth enable and disable
+ - Wlan enable and disable
+ - GPS enable and disable
+ - Video output switching
+ - Ambient Light Sensor on and off
+ - LED control
+ - LED Display control
+ - LCD brightness control
+ - LCD on and off
+
+ A compatibility table by model and feature is maintained on the web
+ site, http://acpi4asus.sf.net/.
+
+Usage
+-----
+
+  Try "modprobe asus_acpi". Check your dmesg (simply type dmesg). You should
+  see some lines like this :
+
+      Asus Laptop Extras version 0.42
+        L2D model detected.
+
+  If it is not the output you have on your laptop, send it (and the laptop's
+  DSDT) to me.
+
+  That's all, now, all the events generated by the hotkeys of your laptop
+  should be reported in your /proc/acpi/event entry. You can check with
+  "acpi_listen".
+
+  Hotkeys are also reported as input keys (like keyboards) you can check
+  which key are supported using "xev" under X11.
+
+  You can get informations on the version of your DSDT table by reading the
+  /sys/devices/platform/asus-laptop/infos entry. If you have a question or a
+  bug report to do, please include the output of this entry.
+
+LEDs
+----
+
+  You can modify LEDs be echoing values to /sys/class/leds/asus::*/brightness :
+    echo 1 >  /sys/class/leds/asus::mail/brightness
+  will switch the mail LED on.
+  You can also know if they are on/off by reading their content and use
+  kernel triggers like ide-disk or heartbeat.
+
+Backlight
+---------
+
+  You can control lcd backlight power and brightness with
+  /sys/class/backlight/asus-laptop/. Brightness Values are between 0 and 15.
+
+Wireless devices
+---------------
+
+  You can turn the internal Bluetooth adapter on/off with the bluetooth entry
+  (only on models with Bluetooth). This usually controls the associated LED.
+  Same for Wlan adapter.
+
+Display switching
+-----------------
+
+  Note: the display switching code is currently considered EXPERIMENTAL.
+
+  Switching works for the following models:
+    L3800C
+    A2500H
+    L5800C
+    M5200N
+    W1000N (albeit with some glitches)
+    M6700R
+    A6JC
+    F3J
+
+  Switching doesn't work for the following:
+    M3700N
+    L2X00D (locks the laptop under certain conditions)
+
+  To switch the displays, echo values from 0 to 15 to
+  /sys/devices/platform/asus-laptop/display. The significance of those values
+  is as follows:
+
+  +-------+-----+-----+-----+-----+-----+
+  | Bin   | Val | DVI | TV  | CRT | LCD |
+  +-------+-----+-----+-----+-----+-----+
+  + 0000  +   0 +     +     +     +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 0001  +   1 +     +     +     +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 0010  +   2 +     +     +  X  +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 0011  +   3 +     +     +  X  +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 0100  +   4 +     +  X  +     +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 0101  +   5 +     +  X  +     + X   +
+  +-------+-----+-----+-----+-----+-----+
+  + 0110  +   6 +     +  X  +  X  +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 0111  +   7 +     +  X  +  X  +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 1000  +   8 +  X  +     +     +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 1001  +   9 +  X  +     +     +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 1010  +  10 +  X  +     +  X  +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 1011  +  11 +  X  +     +  X  +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 1100  +  12 +  X  +  X  +     +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 1101  +  13 +  X  +  X  +     +  X  +
+  +-------+-----+-----+-----+-----+-----+
+  + 1110  +  14 +  X  +  X  +  X  +     +
+  +-------+-----+-----+-----+-----+-----+
+  + 1111  +  15 +  X  +  X  +  X  +  X  +
+  +-------+-----+-----+-----+-----+-----+
+
+  In most cases, the appropriate displays must be plugged in for the above
+  combinations to work. TV-Out may need to be initialized at boot time.
+
+  Debugging:
+  1) Check whether the Fn+F8 key:
+     a) does not lock the laptop (try disabling CONFIG_X86_UP_APIC or boot with
+        noapic / nolapic if it does)
+     b) generates events (0x6n, where n is the value corresponding to the
+        configuration above)
+     c) actually works
+     Record the disp value at every configuration.
+  2) Echo values from 0 to 15 to /sys/devices/platform/asus-laptop/display.
+     Record its value, note any change. If nothing changes, try a broader range,
+     up to 65535.
+  3) Send ANY output (both positive and negative reports are needed, unless your
+     machine is already listed above) to the acpi4asus-user mailing list.
+
+  Note: on some machines (e.g. L3C), after the module has been loaded, only 0x6n
+  events are generated and no actual switching occurs. In such a case, a line
+  like:
+
+    echo $((10#$arg-60)) > /sys/devices/platform/asus-laptop/display
+
+  will usually do the trick ($arg is the 0000006n-like event passed to acpid).
+
+  Note: there is currently no reliable way to read display status on xxN
+  (Centrino) models.
+
+LED display
+-----------
+
+  Some models like the W1N have a LED display that can be used to display
+  several informations.
+
+  LED display works for the following models:
+    W1000N
+    W1J
+
+  To control the LED display, use the following :
+
+    echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
+
+  where T control the 3 letters display, and DDD the 3 digits display,
+  according to the tables below.
+
+         DDD (digits)
+         000 to 999 = display digits
+         AAA        = ---
+         BBB to FFF = turn-off
+
+         T  (type)
+         0 = off
+         1 = dvd
+         2 = vcd
+         3 = mp3
+         4 = cd
+         5 = tv
+         6 = cpu
+         7 = vol
+
+  For example "echo 0x01000001 >/sys/devices/platform/asus-laptop/ledd"
+  would display "DVD001".
+
+Driver options:
+---------------
+
+ Options can be passed to the asus-laptop driver using the standard
+ module argument syntax (<param>=<value> when passing the option to the
+ module or asus-laptop.<param>=<value> on the kernel boot line when
+ asus-laptop is statically linked into the kernel).
+
+            wapf: WAPF defines the behavior of the Fn+Fx wlan key
+                  The significance of values is yet to be found, but
+                  most of the time:
+                  - 0x0 should do nothing
+                  - 0x1 should allow to control the device with Fn+Fx key.
+                  - 0x4 should send an ACPI event (0x88) while pressing the Fn+Fx key
+                  - 0x5 like 0x1 or 0x4
+
+ The default value is 0x1.
+
+Unsupported models
+------------------
+
+ These models will never be supported by this module, as they use a completely
+ different mechanism to handle LEDs and extra stuff (meaning we have no clue
+ how it works):
+
+ - ASUS A1300 (A1B), A1370D
+ - ASUS L7300G
+ - ASUS L8400
+
+Patches, Errors, Questions:
+--------------------------
+
+ I appreciate any success or failure
+ reports, especially if they add to or correct the compatibility table.
+ Please include the following information in your report:
+
+ - Asus model name
+ - a copy of your ACPI tables, using the "acpidump" utility
+ - a copy of /sys/devices/platform/asus-laptop/infos
+ - which driver features work and which don't
+ - the observed behavior of non-working features
+
+ Any other comments or patches are also more than welcome.
+
+ acpi4asus-user@lists.sourceforge.net
+ http://sourceforge.net/projects/acpi4asus
+
index e2ddcde..6d03487 100644 (file)
@@ -219,7 +219,7 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file:
        echo 0xffffffff > /proc/acpi/ibm/hotkey -- enable all hot keys
        echo 0 > /proc/acpi/ibm/hotkey -- disable all possible hot keys
        ... any other 8-hex-digit mask ...
-       echo reset > /proc/acpi/ibm/hotkey -- restore the original mask
+       echo reset > /proc/acpi/ibm/hotkey -- restore the recommended mask
 
 The following commands have been deprecated and will cause the kernel
 to log a warning:
@@ -240,9 +240,13 @@ sysfs notes:
                Returns 0.
 
        hotkey_bios_mask:
+               DEPRECATED, DON'T USE, WILL BE REMOVED IN THE FUTURE.
+
                Returns the hot keys mask when thinkpad-acpi was loaded.
                Upon module unload, the hot keys mask will be restored
-               to this value.
+               to this value.   This is always 0x80c, because those are
+               the hotkeys that were supported by ancient firmware
+               without mask support.
 
        hotkey_enable:
                DEPRECATED, WILL BE REMOVED SOON.
index 6399557..8fd5ca2 100644 (file)
@@ -1,3 +1,4 @@
+
 LED handling under Linux
 ========================
 
@@ -5,10 +6,10 @@ If you're reading this and thinking about keyboard leds, these are
 handled by the input subsystem and the led class is *not* needed.
 
 In its simplest form, the LED class just allows control of LEDs from
-userspace. LEDs appear in /sys/class/leds/. The brightness file will
-set the brightness of the LED (taking a value 0-255). Most LEDs don't
-have hardware brightness support so will just be turned on for non-zero
-brightness settings.
+userspace. LEDs appear in /sys/class/leds/. The maximum brightness of the
+LED is defined in max_brightness file. The brightness file will set the brightness
+of the LED (taking a value 0-max_brightness). Most LEDs don't have hardware
+brightness support so will just be turned on for non-zero brightness settings.
 
 The class also introduces the optional concept of an LED trigger. A trigger
 is a kernel based source of led events. Triggers can either be simple or
index 950cde6..ba9373f 100644 (file)
@@ -42,6 +42,7 @@
 #include <signal.h>
 #include "linux/lguest_launcher.h"
 #include "linux/virtio_config.h"
+#include <linux/virtio_ids.h>
 #include "linux/virtio_net.h"
 #include "linux/virtio_blk.h"
 #include "linux/virtio_console.h"
@@ -133,6 +134,9 @@ struct device {
        /* Is it operational */
        bool running;
 
+       /* Does Guest want an intrrupt on empty? */
+       bool irq_on_empty;
+
        /* Device-specific data. */
        void *priv;
 };
@@ -623,10 +627,13 @@ static void trigger_irq(struct virtqueue *vq)
                return;
        vq->pending_used = 0;
 
-       /* If they don't want an interrupt, don't send one, unless empty. */
-       if ((vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT)
-           && lg_last_avail(vq) != vq->vring.avail->idx)
-               return;
+       /* If they don't want an interrupt, don't send one... */
+       if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) {
+               /* ... unless they've asked us to force one on empty. */
+               if (!vq->dev->irq_on_empty
+                   || lg_last_avail(vq) != vq->vring.avail->idx)
+                       return;
+       }
 
        /* Send the Guest an interrupt tell them we used something up. */
        if (write(lguest_fd, buf, sizeof(buf)) != 0)
@@ -1042,6 +1049,15 @@ static void create_thread(struct virtqueue *vq)
        close(vq->eventfd);
 }
 
+static bool accepted_feature(struct device *dev, unsigned int bit)
+{
+       const u8 *features = get_feature_bits(dev) + dev->feature_len;
+
+       if (dev->feature_len < bit / CHAR_BIT)
+               return false;
+       return features[bit / CHAR_BIT] & (1 << (bit % CHAR_BIT));
+}
+
 static void start_device(struct device *dev)
 {
        unsigned int i;
@@ -1055,6 +1071,8 @@ static void start_device(struct device *dev)
                verbose(" %02x", get_feature_bits(dev)
                        [dev->feature_len+i]);
 
+       dev->irq_on_empty = accepted_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
+
        for (vq = dev->vq; vq; vq = vq->next) {
                if (vq->service)
                        create_thread(vq);
diff --git a/Documentation/markers.txt b/Documentation/markers.txt
deleted file mode 100644 (file)
index d2b3d0e..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-                    Using the Linux Kernel Markers
-
-                           Mathieu Desnoyers
-
-
-This document introduces Linux Kernel Markers and their use. It provides
-examples of how to insert markers in the kernel and connect probe functions to
-them and provides some examples of probe functions.
-
-
-* Purpose of markers
-
-A marker placed in code provides a hook to call a function (probe) that you can
-provide at runtime. A marker can be "on" (a probe is connected to it) or "off"
-(no probe is attached). When a marker is "off" it has no effect, except for
-adding a tiny time penalty (checking a condition for a branch) and space
-penalty (adding a few bytes for the function call at the end of the
-instrumented function and adds a data structure in a separate section).  When a
-marker is "on", the function you provide is called each time the marker is
-executed, in the execution context of the caller. When the function provided
-ends its execution, it returns to the caller (continuing from the marker site).
-
-You can put markers at important locations in the code. Markers are
-lightweight hooks that can pass an arbitrary number of parameters,
-described in a printk-like format string, to the attached probe function.
-
-They can be used for tracing and performance accounting.
-
-
-* Usage
-
-In order to use the macro trace_mark, you should include linux/marker.h.
-
-#include <linux/marker.h>
-
-And,
-
-trace_mark(subsystem_event, "myint %d mystring %s", someint, somestring);
-Where :
-- subsystem_event is an identifier unique to your event
-    - subsystem is the name of your subsystem.
-    - event is the name of the event to mark.
-- "myint %d mystring %s" is the formatted string for the serializer. "myint" and
-  "mystring" are repectively the field names associated with the first and
-  second parameter.
-- someint is an integer.
-- somestring is a char pointer.
-
-Connecting a function (probe) to a marker is done by providing a probe (function
-to call) for the specific marker through marker_probe_register() and can be
-activated by calling marker_arm(). Marker deactivation can be done by calling
-marker_disarm() as many times as marker_arm() has been called. Removing a probe
-is done through marker_probe_unregister(); it will disarm the probe.
-
-marker_synchronize_unregister() must be called between probe unregistration and
-the first occurrence of
-- the end of module exit function,
-  to make sure there is no caller left using the probe;
-- the free of any resource used by the probes,
-  to make sure the probes wont be accessing invalid data.
-This, and the fact that preemption is disabled around the probe call, make sure
-that probe removal and module unload are safe. See the "Probe example" section
-below for a sample probe module.
-
-The marker mechanism supports inserting multiple instances of the same marker.
-Markers can be put in inline functions, inlined static functions, and
-unrolled loops as well as regular functions.
-
-The naming scheme "subsystem_event" is suggested here as a convention intended
-to limit collisions. Marker names are global to the kernel: they are considered
-as being the same whether they are in the core kernel image or in modules.
-Conflicting format strings for markers with the same name will cause the markers
-to be detected to have a different format string not to be armed and will output
-a printk warning which identifies the inconsistency:
-
-"Format mismatch for probe probe_name (format), marker (format)"
-
-Another way to use markers is to simply define the marker without generating any
-function call to actually call into the marker. This is useful in combination
-with tracepoint probes in a scheme like this :
-
-void probe_tracepoint_name(unsigned int arg1, struct task_struct *tsk);
-
-DEFINE_MARKER_TP(marker_eventname, tracepoint_name, probe_tracepoint_name,
-       "arg1 %u pid %d");
-
-notrace void probe_tracepoint_name(unsigned int arg1, struct task_struct *tsk)
-{
-       struct marker *marker = &GET_MARKER(kernel_irq_entry);
-       /* write data to trace buffers ... */
-}
-
-* Probe / marker example
-
-See the example provided in samples/markers/src
-
-Compile them with your kernel.
-
-Run, as root :
-modprobe marker-example (insmod order is not important)
-modprobe probe-example
-cat /proc/marker-example (returns an expected error)
-rmmod marker-example probe-example
-dmesg
index 2b3dedd..802efe5 100644 (file)
@@ -1,18 +1,7 @@
 There are several classic problems related to memory on Linux
 systems.
 
-       1) There are some buggy motherboards which cannot properly 
-          deal with the memory above 16MB.  Consider exchanging
-          your motherboard.
-
-       2) You cannot do DMA on the ISA bus to addresses above
-          16M.  Most device drivers under Linux allow the use
-           of bounce buffers which work around this problem.  Drivers
-          that don't use bounce buffers will be unstable with
-          more than 16M installed.  Drivers that use bounce buffers
-          will be OK, but may have slightly higher overhead.
-       
-       3) There are some motherboards that will not cache above
+       1) There are some motherboards that will not cache above
           a certain quantity of memory.  If you have one of these
           motherboards, your system will be SLOWER, not faster
           as you add more memory.  Consider exchanging your 
@@ -24,7 +13,7 @@ It can also tell Linux to use less memory than is actually installed.
 If you use "mem=" on a machine with PCI, consider using "memmap=" to avoid
 physical address space collisions.
 
-See the documentation of your boot loader (LILO, loadlin, etc.) about
+See the documentation of your boot loader (LILO, grub, loadlin, etc.) about
 how to pass options to the kernel.
 
 There are other memory problems which Linux cannot deal with.  Random
@@ -42,19 +31,3 @@ Try:
          with the vendor. Consider testing it with memtest86 yourself.
        
        * Exchanging your CPU, cache, or motherboard for one that works.
-
-       * Disabling the cache from the BIOS.
-
-       * Try passing the "mem=4M" option to the kernel to limit
-         Linux to using a very small amount of memory. Use "memmap="-option
-         together with "mem=" on systems with PCI to avoid physical address
-         space collisions.
-
-
-Other tricks:
-
-       * Try passing the "no-387" option to the kernel to ignore
-         a buggy FPU.
-
-       * Try passing the "no-hlt" option to disable the potentially
-          buggy HLT instruction in your CPU.
index eaa1a25..ee31369 100644 (file)
@@ -96,7 +96,7 @@ Example code - drivers hinting an alpha2:
 
 This example comes from the zd1211rw device driver. You can start
 by having a mapping of your device's EEPROM country/regulatory
-domain value to to a specific alpha2 as follows:
+domain value to a specific alpha2 as follows:
 
 static struct zd_reg_alpha2_map reg_alpha2_map[] = {
        { ZD_REGDOMAIN_FCC, "US" },
index 80133ac..9fcc9a6 100644 (file)
@@ -7,10 +7,10 @@ All units are pages. Hugepages have separate counters.
 
 numa_hit                       A process wanted to allocate memory from this node,
                                        and succeeded.
-numa_miss                      A process wanted to allocate memory from this node,
-                                       but ended up with memory from another.
-numa_foreign           A process wanted to allocate on another node,
-                                   but ended up with memory from this one.
+numa_miss                      A process wanted to allocate memory from another node,
+                                       but ended up with memory from this node.
+numa_foreign           A process wanted to allocate on this node,
+                                   but ended up with memory from another one.
 local_node                     A process ran on this node and got memory from it.
 other_node                     A process ran on this node and got memory from another node.
 interleave_hit                 Interleaving wanted to allocate from this node
index 4210e5a..44f8bee 100644 (file)
@@ -8,7 +8,7 @@ $ ./crc32hash "Dual Speed"
 #include <ctype.h>
 #include <stdlib.h>
 
-unsigned int crc32(unsigned char const *p, unsigned int len)
+static unsigned int crc32(unsigned char const *p, unsigned int len)
 {
        int i;
        unsigned int crc = 0;
index 3ed3797..8a00407 100644 (file)
@@ -10,6 +10,8 @@ Required properties:
   - interrupts : should contain eSDHC interrupt.
   - interrupt-parent : interrupt source phandle.
   - clock-frequency : specifies eSDHC base clock frequency.
+  - sdhci,wp-inverted : (optional) specifies that eSDHC controller
+    reports inverted write-protect state;
   - sdhci,1-bit-only : (optional) specifies that a controller can
     only handle 1-bit data transfers.
 
index 3708a2f..f1533d9 100644 (file)
@@ -32,7 +32,7 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
       devices.  This field represents the number of cells needed to
       represent the address of the memory-mapped registers of devices
       within the system controller chip.
-    - #size-cells : Size representation for for the memory-mapped
+    - #size-cells : Size representation for the memory-mapped
       registers within the system controller chip.
     - #interrupt-cells : Defines the width of cells used to represent
       interrupts.
index 8deffcd..9104c10 100644 (file)
@@ -135,6 +135,30 @@ a high functionality RTC is integrated into the SOC.  That system might read
 the system clock from the discrete RTC, but use the integrated one for all
 other tasks, because of its greater functionality.
 
+SYSFS INTERFACE
+---------------
+
+The sysfs interface under /sys/class/rtc/rtcN provides access to various
+rtc attributes without requiring the use of ioctls. All dates and times
+are in the RTC's timezone, rather than in system time.
+
+date:                   RTC-provided date
+hctosys:        1 if the RTC provided the system time at boot via the
+                CONFIG_RTC_HCTOSYS kernel option, 0 otherwise
+max_user_freq:  The maximum interrupt rate an unprivileged user may request
+                from this RTC.
+name:           The name of the RTC corresponding to this sysfs directory
+since_epoch:    The number of seconds since the epoch according to the RTC
+time:           RTC-provided time
+wakealarm:      The time at which the clock will generate a system wakeup
+                event. This is a one shot wakeup event, so must be reset
+                after wake if a daily wakeup is required. Format is either
+                seconds since the epoch or, if there's a leading +, seconds
+                in the future.
+
+IOCTL INTERFACE
+---------------
+
 The ioctl() calls supported by /dev/rtc are also supported by the RTC class
 framework.  However, because the chips and systems are not standardized,
 some PC/AT functionality might not be provided.  And in the same way, some
@@ -185,6 +209,8 @@ driver returns ENOIOCTLCMD.  Some common examples:
        hardware in the irq_set_freq function.  If it isn't, return -EINVAL.  If
        you cannot actually change the frequency, do not define irq_set_freq.
 
+    *  RTC_PIE_ON, RTC_PIE_OFF: the irq_set_state function will be called.
+
 If all else fails, check out the rtc-test.c driver!
 
 
index eaa4801..38e9e7c 100644 (file)
@@ -514,7 +514,7 @@ iv. Remove yield() while mailbox handshake in synchronous commands
 
 v.     Remove redundant __megaraid_busywait_mbox routine
 
-vi.    Fix bug in the managment module, which causes a system lockup when the
+vi.    Fix bug in the management module, which causes a system lockup when the
        IO module is loaded and then unloaded, followed by executing any
        management utility. The current version of management module does not
        handle the adapter unregister properly.
index d7f1817..aec6549 100644 (file)
@@ -378,7 +378,7 @@ Vport Disable/Enable:
       int vport_disable(struct fc_vport *vport, bool disable)
 
     where:
-      vport:    Is vport to to be enabled or disabled
+      vport:    Is vport to be enabled or disabled
       disable:  If "true", the vport is to be disabled.
                 If "false", the vport is to be enabled.
 
index 97eebd6..f1708b7 100644 (file)
@@ -387,7 +387,7 @@ STAC92HD73*
 STAC92HD83*
 ===========
   ref          Reference board
-  mic-ref      Reference board with power managment for ports
+  mic-ref      Reference board with power management for ports
   dell-s14     Dell laptop
   auto         BIOS setup (default)
 
index 4a02d25..deab51d 100644 (file)
@@ -350,7 +350,7 @@ SPI protocol drivers somewhat resemble platform device drivers:
                .resume         = CHIP_resume,
        };
 
-The driver core will autmatically attempt to bind this driver to any SPI
+The driver core will automatically attempt to bind this driver to any SPI
 device whose board_info gave a modalias of "CHIP".  Your probe() code
 might look like this unless you're creating a device which is managing
 a bus (appearing under /sys/class/spi_master).
index c1a5aad..10abd37 100644 (file)
@@ -69,7 +69,7 @@ static void transfer(int fd)
        puts("");
 }
 
-void print_usage(const char *prog)
+static void print_usage(const char *prog)
 {
        printf("Usage: %s [-DsbdlHOLC3]\n", prog);
        puts("  -D --device   device to use (default /dev/spidev1.1)\n"
@@ -85,7 +85,7 @@ void print_usage(const char *prog)
        exit(1);
 }
 
-void parse_opts(int argc, char *argv[])
+static void parse_opts(int argc, char *argv[])
 {
        while (1) {
                static const struct option lopts[] = {
index 2dbff53..b3d8b49 100644 (file)
@@ -313,31 +313,43 @@ send before ratelimiting kicks in.
 
 ==============================================================
 
+printk_delay:
+
+Delay each printk message in printk_delay milliseconds
+
+Value from 0 - 10000 is allowed.
+
+==============================================================
+
 randomize-va-space:
 
 This option can be used to select the type of process address
 space randomization that is used in the system, for architectures
 that support this feature.
 
-0 - Turn the process address space randomization off by default.
+0 - Turn the process address space randomization off.  This is the
+    default for architectures that do not support this feature anyways,
+    and kernels that are booted with the "norandmaps" parameter.
 
 1 - Make the addresses of mmap base, stack and VDSO page randomized.
     This, among other things, implies that shared libraries will be
-    loaded to random addresses. Also for PIE-linked binaries, the location
-    of code start is randomized.
+    loaded to random addresses.  Also for PIE-linked binaries, the
+    location of code start is randomized.  This is the default if the
+    CONFIG_COMPAT_BRK option is enabled.
+
+2 - Additionally enable heap randomization.  This is the default if
+    CONFIG_COMPAT_BRK is disabled.
 
-    With heap randomization, the situation is a little bit more
-    complicated.
-    There a few legacy applications out there (such as some ancient
+    There are a few legacy applications out there (such as some ancient
     versions of libc.so.5 from 1996) that assume that brk area starts
-    just after the end of the code+bss. These applications break when
-    start of the brk area is randomized. There are however no known
+    just after the end of the code+bss.  These applications break when
+    start of the brk area is randomized.  There are however no known
     non-legacy applications that would be broken this way, so for most
-    systems it is safe to choose full randomization. However there is
-    a CONFIG_COMPAT_BRK option for systems with ancient and/or broken
-    binaries, that makes heap non-randomized, but keeps all other
-    parts of process address space randomized if randomize_va_space
-    sysctl is turned on.
+    systems it is safe to choose full randomization.
+
+    Systems with ancient and/or broken binaries should be configured
+    with CONFIG_COMPAT_BRK enabled, which excludes the heap from process
+    address space randomization.
 
 ==============================================================
 
index c4de635..e6fb1ec 100644 (file)
@@ -585,7 +585,9 @@ caching of directory and inode objects.
 At the default value of vfs_cache_pressure=100 the kernel will attempt to
 reclaim dentries and inodes at a "fair" rate with respect to pagecache and
 swapcache reclaim.  Decreasing vfs_cache_pressure causes the kernel to prefer
-to retain dentry and inode caches.  Increasing vfs_cache_pressure beyond 100
+to retain dentry and inode caches. When vfs_cache_pressure=0, the kernel will
+never reclaim dentries and inodes due to memory pressure and this can easily
+lead to out-of-memory conditions. Increasing vfs_cache_pressure beyond 100
 causes the kernel to prefer to reclaim dentries and inodes.
 
 ==============================================================
diff --git a/Documentation/trace/events-kmem.txt b/Documentation/trace/events-kmem.txt
new file mode 100644 (file)
index 0000000..6ef2a86
--- /dev/null
@@ -0,0 +1,107 @@
+                       Subsystem Trace Points: kmem
+
+The tracing system kmem captures events related to object and page allocation
+within the kernel. Broadly speaking there are four major subheadings.
+
+  o Slab allocation of small objects of unknown type (kmalloc)
+  o Slab allocation of small objects of known type
+  o Page allocation
+  o Per-CPU Allocator Activity
+  o External Fragmentation
+
+This document will describe what each of the tracepoints are and why they
+might be useful.
+
+1. Slab allocation of small objects of unknown type
+===================================================
+kmalloc                call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s
+kmalloc_node   call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d
+kfree          call_site=%lx ptr=%p
+
+Heavy activity for these events may indicate that a specific cache is
+justified, particularly if kmalloc slab pages are getting significantly
+internal fragmented as a result of the allocation pattern. By correlating
+kmalloc with kfree, it may be possible to identify memory leaks and where
+the allocation sites were.
+
+
+2. Slab allocation of small objects of known type
+=================================================
+kmem_cache_alloc       call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s
+kmem_cache_alloc_node  call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d
+kmem_cache_free                call_site=%lx ptr=%p
+
+These events are similar in usage to the kmalloc-related events except that
+it is likely easier to pin the event down to a specific cache. At the time
+of writing, no information is available on what slab is being allocated from,
+but the call_site can usually be used to extrapolate that information
+
+3. Page allocation
+==================
+mm_page_alloc            page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s
+mm_page_alloc_zone_locked page=%p pfn=%lu order=%u migratetype=%d cpu=%d percpu_refill=%d
+mm_page_free_direct      page=%p pfn=%lu order=%d
+mm_pagevec_free                  page=%p pfn=%lu order=%d cold=%d
+
+These four events deal with page allocation and freeing. mm_page_alloc is
+a simple indicator of page allocator activity. Pages may be allocated from
+the per-CPU allocator (high performance) or the buddy allocator.
+
+If pages are allocated directly from the buddy allocator, the
+mm_page_alloc_zone_locked event is triggered. This event is important as high
+amounts of activity imply high activity on the zone->lock. Taking this lock
+impairs performance by disabling interrupts, dirtying cache lines between
+CPUs and serialising many CPUs.
+
+When a page is freed directly by the caller, the mm_page_free_direct event
+is triggered. Significant amounts of activity here could indicate that the
+callers should be batching their activities.
+
+When pages are freed using a pagevec, the mm_pagevec_free is
+triggered. Broadly speaking, pages are taken off the LRU lock in bulk and
+freed in batch with a pagevec. Significant amounts of activity here could
+indicate that the system is under memory pressure and can also indicate
+contention on the zone->lru_lock.
+
+4. Per-CPU Allocator Activity
+=============================
+mm_page_alloc_zone_locked      page=%p pfn=%lu order=%u migratetype=%d cpu=%d percpu_refill=%d
+mm_page_pcpu_drain             page=%p pfn=%lu order=%d cpu=%d migratetype=%d
+
+In front of the page allocator is a per-cpu page allocator. It exists only
+for order-0 pages, reduces contention on the zone->lock and reduces the
+amount of writing on struct page.
+
+When a per-CPU list is empty or pages of the wrong type are allocated,
+the zone->lock will be taken once and the per-CPU list refilled. The event
+triggered is mm_page_alloc_zone_locked for each page allocated with the
+event indicating whether it is for a percpu_refill or not.
+
+When the per-CPU list is too full, a number of pages are freed, each one
+which triggers a mm_page_pcpu_drain event.
+
+The individual nature of the events are so that pages can be tracked
+between allocation and freeing. A number of drain or refill pages that occur
+consecutively imply the zone->lock being taken once. Large amounts of PCP
+refills and drains could imply an imbalance between CPUs where too much work
+is being concentrated in one place. It could also indicate that the per-CPU
+lists should be a larger size. Finally, large amounts of refills on one CPU
+and drains on another could be a factor in causing large amounts of cache
+line bounces due to writes between CPUs and worth investigating if pages
+can be allocated and freed on the same CPU through some algorithm change.
+
+5. External Fragmentation
+=========================
+mm_page_alloc_extfrag          page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d
+
+External fragmentation affects whether a high-order allocation will be
+successful or not. For some types of hardware, this is important although
+it is avoided where possible. If the system is using huge pages and needs
+to be able to resize the pool over the lifetime of the system, this value
+is important.
+
+Large numbers of this event implies that memory is fragmenting and
+high-order allocations will start failing at some time in the future. One
+means of reducing the occurange of this event is to increase the size of
+min_free_kbytes in increments of 3*pageblock_size*nr_online_nodes where
+pageblock_size is usually the size of the default hugepage size.
index 78c45a8..02ac6ed 100644 (file)
@@ -72,7 +72,7 @@ To enable all events in sched subsystem:
 
        # echo 1 > /sys/kernel/debug/tracing/events/sched/enable
 
-To eanble all events:
+To enable all events:
 
        # echo 1 > /sys/kernel/debug/tracing/events/enable
 
index 1b6292b..957b22f 100644 (file)
@@ -133,7 +133,7 @@ of ftrace. Here is a list of some of the key files:
        than requested, the rest of the page will be used,
        making the actual allocation bigger than requested.
        ( Note, the size may not be a multiple of the page size
-         due to buffer managment overhead. )
+         due to buffer management overhead. )
 
        This can only be updated when the current_tracer
        is set to "nop".
diff --git a/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl b/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl
new file mode 100644 (file)
index 0000000..7df50e8
--- /dev/null
@@ -0,0 +1,418 @@
+#!/usr/bin/perl
+# This is a POC (proof of concept or piece of crap, take your pick) for reading the
+# text representation of trace output related to page allocation. It makes an attempt
+# to extract some high-level information on what is going on. The accuracy of the parser
+# may vary considerably
+#
+# Example usage: trace-pagealloc-postprocess.pl < /sys/kernel/debug/tracing/trace_pipe
+# other options
+#   --prepend-parent   Report on the parent proc and PID
+#   --read-procstat    If the trace lacks process info, get it from /proc
+#   --ignore-pid       Aggregate processes of the same name together
+#
+# Copyright (c) IBM Corporation 2009
+# Author: Mel Gorman <mel@csn.ul.ie>
+use strict;
+use Getopt::Long;
+
+# Tracepoint events
+use constant MM_PAGE_ALLOC             => 1;
+use constant MM_PAGE_FREE_DIRECT       => 2;
+use constant MM_PAGEVEC_FREE           => 3;
+use constant MM_PAGE_PCPU_DRAIN                => 4;
+use constant MM_PAGE_ALLOC_ZONE_LOCKED => 5;
+use constant MM_PAGE_ALLOC_EXTFRAG     => 6;
+use constant EVENT_UNKNOWN             => 7;
+
+# Constants used to track state
+use constant STATE_PCPU_PAGES_DRAINED  => 8;
+use constant STATE_PCPU_PAGES_REFILLED => 9;
+
+# High-level events extrapolated from tracepoints
+use constant HIGH_PCPU_DRAINS          => 10;
+use constant HIGH_PCPU_REFILLS         => 11;
+use constant HIGH_EXT_FRAGMENT         => 12;
+use constant HIGH_EXT_FRAGMENT_SEVERE  => 13;
+use constant HIGH_EXT_FRAGMENT_MODERATE        => 14;
+use constant HIGH_EXT_FRAGMENT_CHANGED => 15;
+
+my %perprocesspid;
+my %perprocess;
+my $opt_ignorepid;
+my $opt_read_procstat;
+my $opt_prepend_parent;
+
+# Catch sigint and exit on request
+my $sigint_report = 0;
+my $sigint_exit = 0;
+my $sigint_pending = 0;
+my $sigint_received = 0;
+sub sigint_handler {
+       my $current_time = time;
+       if ($current_time - 2 > $sigint_received) {
+               print "SIGINT received, report pending. Hit ctrl-c again to exit\n";
+               $sigint_report = 1;
+       } else {
+               if (!$sigint_exit) {
+                       print "Second SIGINT received quickly, exiting\n";
+               }
+               $sigint_exit++;
+       }
+
+       if ($sigint_exit > 3) {
+               print "Many SIGINTs received, exiting now without report\n";
+               exit;
+       }
+
+       $sigint_received = $current_time;
+       $sigint_pending = 1;
+}
+$SIG{INT} = "sigint_handler";
+
+# Parse command line options
+GetOptions(
+       'ignore-pid'     =>     \$opt_ignorepid,
+       'read-procstat'  =>     \$opt_read_procstat,
+       'prepend-parent' =>     \$opt_prepend_parent,
+);
+
+# Defaults for dynamically discovered regex's
+my $regex_fragdetails_default = 'page=([0-9a-f]*) pfn=([0-9]*) alloc_order=([-0-9]*) fallback_order=([-0-9]*) pageblock_order=([-0-9]*) alloc_migratetype=([-0-9]*) fallback_migratetype=([-0-9]*) fragmenting=([-0-9]) change_ownership=([-0-9])';
+
+# Dyanically discovered regex
+my $regex_fragdetails;
+
+# Static regex used. Specified like this for readability and for use with /o
+#                      (process_pid)     (cpus      )   ( time  )   (tpoint    ) (details)
+my $regex_traceevent = '\s*([a-zA-Z0-9-]*)\s*(\[[0-9]*\])\s*([0-9.]*):\s*([a-zA-Z_]*):\s*(.*)';
+my $regex_statname = '[-0-9]*\s\((.*)\).*';
+my $regex_statppid = '[-0-9]*\s\(.*\)\s[A-Za-z]\s([0-9]*).*';
+
+sub generate_traceevent_regex {
+       my $event = shift;
+       my $default = shift;
+       my $regex;
+
+       # Read the event format or use the default
+       if (!open (FORMAT, "/sys/kernel/debug/tracing/events/$event/format")) {
+               $regex = $default;
+       } else {
+               my $line;
+               while (!eof(FORMAT)) {
+                       $line = <FORMAT>;
+                       if ($line =~ /^print fmt:\s"(.*)",.*/) {
+                               $regex = $1;
+                               $regex =~ s/%p/\([0-9a-f]*\)/g;
+                               $regex =~ s/%d/\([-0-9]*\)/g;
+                               $regex =~ s/%lu/\([0-9]*\)/g;
+                       }
+               }
+       }
+
+       # Verify fields are in the right order
+       my $tuple;
+       foreach $tuple (split /\s/, $regex) {
+               my ($key, $value) = split(/=/, $tuple);
+               my $expected = shift;
+               if ($key ne $expected) {
+                       print("WARNING: Format not as expected '$key' != '$expected'");
+                       $regex =~ s/$key=\((.*)\)/$key=$1/;
+               }
+       }
+
+       if (defined shift) {
+               die("Fewer fields than expected in format");
+       }
+
+       return $regex;
+}
+$regex_fragdetails = generate_traceevent_regex("kmem/mm_page_alloc_extfrag",
+                       $regex_fragdetails_default,
+                       "page", "pfn",
+                       "alloc_order", "fallback_order", "pageblock_order",
+                       "alloc_migratetype", "fallback_migratetype",
+                       "fragmenting", "change_ownership");
+
+sub read_statline($) {
+       my $pid = $_[0];
+       my $statline;
+
+       if (open(STAT, "/proc/$pid/stat")) {
+               $statline = <STAT>;
+               close(STAT);
+       }
+
+       if ($statline eq '') {
+               $statline = "-1 (UNKNOWN_PROCESS_NAME) R 0";
+       }
+
+       return $statline;
+}
+
+sub guess_process_pid($$) {
+       my $pid = $_[0];
+       my $statline = $_[1];
+
+       if ($pid == 0) {
+               return "swapper-0";
+       }
+
+       if ($statline !~ /$regex_statname/o) {
+               die("Failed to math stat line for process name :: $statline");
+       }
+       return "$1-$pid";
+}
+
+sub parent_info($$) {
+       my $pid = $_[0];
+       my $statline = $_[1];
+       my $ppid;
+
+       if ($pid == 0) {
+               return "NOPARENT-0";
+       }
+
+       if ($statline !~ /$regex_statppid/o) {
+               die("Failed to match stat line process ppid:: $statline");
+       }
+
+       # Read the ppid stat line
+       $ppid = $1;
+       return guess_process_pid($ppid, read_statline($ppid));
+}
+
+sub process_events {
+       my $traceevent;
+       my $process_pid;
+       my $cpus;
+       my $timestamp;
+       my $tracepoint;
+       my $details;
+       my $statline;
+
+       # Read each line of the event log
+EVENT_PROCESS:
+       while ($traceevent = <STDIN>) {
+               if ($traceevent =~ /$regex_traceevent/o) {
+                       $process_pid = $1;
+                       $tracepoint = $4;
+
+                       if ($opt_read_procstat || $opt_prepend_parent) {
+                               $process_pid =~ /(.*)-([0-9]*)$/;
+                               my $process = $1;
+                               my $pid = $2;
+
+                               $statline = read_statline($pid);
+
+                               if ($opt_read_procstat && $process eq '') {
+                                       $process_pid = guess_process_pid($pid, $statline);
+                               }
+
+                               if ($opt_prepend_parent) {
+                                       $process_pid = parent_info($pid, $statline) . " :: $process_pid";
+                               }
+                       }
+
+                       # Unnecessary in this script. Uncomment if required
+                       # $cpus = $2;
+                       # $timestamp = $3;
+               } else {
+                       next;
+               }
+
+               # Perl Switch() sucks majorly
+               if ($tracepoint eq "mm_page_alloc") {
+                       $perprocesspid{$process_pid}->{MM_PAGE_ALLOC}++;
+               } elsif ($tracepoint eq "mm_page_free_direct") {
+                       $perprocesspid{$process_pid}->{MM_PAGE_FREE_DIRECT}++;
+               } elsif ($tracepoint eq "mm_pagevec_free") {
+                       $perprocesspid{$process_pid}->{MM_PAGEVEC_FREE}++;
+               } elsif ($tracepoint eq "mm_page_pcpu_drain") {
+                       $perprocesspid{$process_pid}->{MM_PAGE_PCPU_DRAIN}++;
+                       $perprocesspid{$process_pid}->{STATE_PCPU_PAGES_DRAINED}++;
+               } elsif ($tracepoint eq "mm_page_alloc_zone_locked") {
+                       $perprocesspid{$process_pid}->{MM_PAGE_ALLOC_ZONE_LOCKED}++;
+                       $perprocesspid{$process_pid}->{STATE_PCPU_PAGES_REFILLED}++;
+               } elsif ($tracepoint eq "mm_page_alloc_extfrag") {
+
+                       # Extract the details of the event now
+                       $details = $5;
+
+                       my ($page, $pfn);
+                       my ($alloc_order, $fallback_order, $pageblock_order);
+                       my ($alloc_migratetype, $fallback_migratetype);
+                       my ($fragmenting, $change_ownership);
+
+                       if ($details !~ /$regex_fragdetails/o) {
+                               print "WARNING: Failed to parse mm_page_alloc_extfrag as expected\n";
+                               next;
+                       }
+
+                       $perprocesspid{$process_pid}->{MM_PAGE_ALLOC_EXTFRAG}++;
+                       $page = $1;
+                       $pfn = $2;
+                       $alloc_order = $3;
+                       $fallback_order = $4;
+                       $pageblock_order = $5;
+                       $alloc_migratetype = $6;
+                       $fallback_migratetype = $7;
+                       $fragmenting = $8;
+                       $change_ownership = $9;
+
+                       if ($fragmenting) {
+                               $perprocesspid{$process_pid}->{HIGH_EXT_FRAG}++;
+                               if ($fallback_order <= 3) {
+                                       $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_SEVERE}++;
+                               } else {
+                                       $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_MODERATE}++;
+                               }
+                       }
+                       if ($change_ownership) {
+                               $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_CHANGED}++;
+                       }
+               } else {
+                       $perprocesspid{$process_pid}->{EVENT_UNKNOWN}++;
+               }
+
+               # Catch a full pcpu drain event
+               if ($perprocesspid{$process_pid}->{STATE_PCPU_PAGES_DRAINED} &&
+                               $tracepoint ne "mm_page_pcpu_drain") {
+
+                       $perprocesspid{$process_pid}->{HIGH_PCPU_DRAINS}++;
+                       $perprocesspid{$process_pid}->{STATE_PCPU_PAGES_DRAINED} = 0;
+               }
+
+               # Catch a full pcpu refill event
+               if ($perprocesspid{$process_pid}->{STATE_PCPU_PAGES_REFILLED} &&
+                               $tracepoint ne "mm_page_alloc_zone_locked") {
+                       $perprocesspid{$process_pid}->{HIGH_PCPU_REFILLS}++;
+                       $perprocesspid{$process_pid}->{STATE_PCPU_PAGES_REFILLED} = 0;
+               }
+
+               if ($sigint_pending) {
+                       last EVENT_PROCESS;
+               }
+       }
+}
+
+sub dump_stats {
+       my $hashref = shift;
+       my %stats = %$hashref;
+
+       # Dump per-process stats
+       my $process_pid;
+       my $max_strlen = 0;
+
+       # Get the maximum process name
+       foreach $process_pid (keys %perprocesspid) {
+               my $len = length($process_pid);
+               if ($len > $max_strlen) {
+                       $max_strlen = $len;
+               }
+       }
+       $max_strlen += 2;
+
+       printf("\n");
+       printf("%-" . $max_strlen . "s %8s %10s   %8s %8s   %8s %8s %8s   %8s %8s %8s %8s %8s %8s\n",
+               "Process", "Pages",  "Pages",      "Pages", "Pages", "PCPU",  "PCPU",   "PCPU",    "Fragment",  "Fragment", "MigType", "Fragment", "Fragment", "Unknown");
+       printf("%-" . $max_strlen . "s %8s %10s   %8s %8s   %8s %8s %8s   %8s %8s %8s %8s %8s %8s\n",
+               "details", "allocd", "allocd",     "freed", "freed", "pages", "drains", "refills", "Fallback", "Causing",   "Changed", "Severe", "Moderate", "");
+
+       printf("%-" . $max_strlen . "s %8s %10s   %8s %8s   %8s %8s %8s   %8s %8s %8s %8s %8s %8s\n",
+               "",        "",       "under lock", "direct", "pagevec", "drain", "", "", "", "", "", "", "", "");
+
+       foreach $process_pid (keys %stats) {
+               # Dump final aggregates
+               if ($stats{$process_pid}->{STATE_PCPU_PAGES_DRAINED}) {
+                       $stats{$process_pid}->{HIGH_PCPU_DRAINS}++;
+                       $stats{$process_pid}->{STATE_PCPU_PAGES_DRAINED} = 0;
+               }
+               if ($stats{$process_pid}->{STATE_PCPU_PAGES_REFILLED}) {
+                       $stats{$process_pid}->{HIGH_PCPU_REFILLS}++;
+                       $stats{$process_pid}->{STATE_PCPU_PAGES_REFILLED} = 0;
+               }
+
+               printf("%-" . $max_strlen . "s %8d %10d   %8d %8d   %8d %8d %8d   %8d %8d %8d %8d %8d %8d\n",
+                       $process_pid,
+                       $stats{$process_pid}->{MM_PAGE_ALLOC},
+                       $stats{$process_pid}->{MM_PAGE_ALLOC_ZONE_LOCKED},
+                       $stats{$process_pid}->{MM_PAGE_FREE_DIRECT},
+                       $stats{$process_pid}->{MM_PAGEVEC_FREE},
+                       $stats{$process_pid}->{MM_PAGE_PCPU_DRAIN},
+                       $stats{$process_pid}->{HIGH_PCPU_DRAINS},
+                       $stats{$process_pid}->{HIGH_PCPU_REFILLS},
+                       $stats{$process_pid}->{MM_PAGE_ALLOC_EXTFRAG},
+                       $stats{$process_pid}->{HIGH_EXT_FRAG},
+                       $stats{$process_pid}->{HIGH_EXT_FRAGMENT_CHANGED},
+                       $stats{$process_pid}->{HIGH_EXT_FRAGMENT_SEVERE},
+                       $stats{$process_pid}->{HIGH_EXT_FRAGMENT_MODERATE},
+                       $stats{$process_pid}->{EVENT_UNKNOWN});
+       }
+}
+
+sub aggregate_perprocesspid() {
+       my $process_pid;
+       my $process;
+       undef %perprocess;
+
+       foreach $process_pid (keys %perprocesspid) {
+               $process = $process_pid;
+               $process =~ s/-([0-9])*$//;
+               if ($process eq '') {
+                       $process = "NO_PROCESS_NAME";
+               }
+
+               $perprocess{$process}->{MM_PAGE_ALLOC} += $perprocesspid{$process_pid}->{MM_PAGE_ALLOC};
+               $perprocess{$process}->{MM_PAGE_ALLOC_ZONE_LOCKED} += $perprocesspid{$process_pid}->{MM_PAGE_ALLOC_ZONE_LOCKED};
+               $perprocess{$process}->{MM_PAGE_FREE_DIRECT} += $perprocesspid{$process_pid}->{MM_PAGE_FREE_DIRECT};
+               $perprocess{$process}->{MM_PAGEVEC_FREE} += $perprocesspid{$process_pid}->{MM_PAGEVEC_FREE};
+               $perprocess{$process}->{MM_PAGE_PCPU_DRAIN} += $perprocesspid{$process_pid}->{MM_PAGE_PCPU_DRAIN};
+               $perprocess{$process}->{HIGH_PCPU_DRAINS} += $perprocesspid{$process_pid}->{HIGH_PCPU_DRAINS};
+               $perprocess{$process}->{HIGH_PCPU_REFILLS} += $perprocesspid{$process_pid}->{HIGH_PCPU_REFILLS};
+               $perprocess{$process}->{MM_PAGE_ALLOC_EXTFRAG} += $perprocesspid{$process_pid}->{MM_PAGE_ALLOC_EXTFRAG};
+               $perprocess{$process}->{HIGH_EXT_FRAG} += $perprocesspid{$process_pid}->{HIGH_EXT_FRAG};
+               $perprocess{$process}->{HIGH_EXT_FRAGMENT_CHANGED} += $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_CHANGED};
+               $perprocess{$process}->{HIGH_EXT_FRAGMENT_SEVERE} += $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_SEVERE};
+               $perprocess{$process}->{HIGH_EXT_FRAGMENT_MODERATE} += $perprocesspid{$process_pid}->{HIGH_EXT_FRAGMENT_MODERATE};
+               $perprocess{$process}->{EVENT_UNKNOWN} += $perprocesspid{$process_pid}->{EVENT_UNKNOWN};
+       }
+}
+
+sub report() {
+       if (!$opt_ignorepid) {
+               dump_stats(\%perprocesspid);
+       } else {
+               aggregate_perprocesspid();
+               dump_stats(\%perprocess);
+       }
+}
+
+# Process events or signals until neither is available
+sub signal_loop() {
+       my $sigint_processed;
+       do {
+               $sigint_processed = 0;
+               process_events();
+
+               # Handle pending signals if any
+               if ($sigint_pending) {
+                       my $current_time = time;
+
+                       if ($sigint_exit) {
+                               print "Received exit signal\n";
+                               $sigint_pending = 0;
+                       }
+                       if ($sigint_report) {
+                               if ($current_time >= $sigint_received + 2) {
+                                       report();
+                                       $sigint_report = 0;
+                                       $sigint_pending = 0;
+                                       $sigint_processed = 1;
+                               }
+                       }
+               }
+       } while ($sigint_pending || $sigint_processed);
+}
+
+signal_loop();
+report();
diff --git a/Documentation/trace/power.txt b/Documentation/trace/power.txt
deleted file mode 100644 (file)
index cd805e1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-The power tracer collects detailed information about C-state and P-state
-transitions, instead of just looking at the high-level "average"
-information.
-
-There is a helper script found in scrips/tracing/power.pl in the kernel
-sources which can be used to parse this information and create a
-Scalable Vector Graphics (SVG) picture from the trace data.
-
-To use this tracer:
-
-       echo 0 > /sys/kernel/debug/tracing/tracing_enabled
-       echo power > /sys/kernel/debug/tracing/current_tracer
-       echo 1 > /sys/kernel/debug/tracing/tracing_enabled
-       sleep 1
-       echo 0 > /sys/kernel/debug/tracing/tracing_enabled
-       cat /sys/kernel/debug/tracing/trace | \
-               perl scripts/tracing/power.pl > out.sv
diff --git a/Documentation/trace/tracepoint-analysis.txt b/Documentation/trace/tracepoint-analysis.txt
new file mode 100644 (file)
index 0000000..5eb4e48
--- /dev/null
@@ -0,0 +1,327 @@
+               Notes on Analysing Behaviour Using Events and Tracepoints
+
+                       Documentation written by Mel Gorman
+               PCL information heavily based on email from Ingo Molnar
+
+1. Introduction
+===============
+
+Tracepoints (see Documentation/trace/tracepoints.txt) can be used without
+creating custom kernel modules to register probe functions using the event
+tracing infrastructure.
+
+Simplistically, tracepoints will represent an important event that when can
+be taken in conjunction with other tracepoints to build a "Big Picture" of
+what is going on within the system. There are a large number of methods for
+gathering and interpreting these events. Lacking any current Best Practises,
+this document describes some of the methods that can be used.
+
+This document assumes that debugfs is mounted on /sys/kernel/debug and that
+the appropriate tracing options have been configured into the kernel. It is
+assumed that the PCL tool tools/perf has been installed and is in your path.
+
+2. Listing Available Events
+===========================
+
+2.1 Standard Utilities
+----------------------
+
+All possible events are visible from /sys/kernel/debug/tracing/events. Simply
+calling
+
+  $ find /sys/kernel/debug/tracing/events -type d
+
+will give a fair indication of the number of events available.
+
+2.2 PCL
+-------
+
+Discovery and enumeration of all counters and events, including tracepoints
+are available with the perf tool. Getting a list of available events is a
+simple case of
+
+  $ perf list 2>&1 | grep Tracepoint
+  ext4:ext4_free_inode                     [Tracepoint event]
+  ext4:ext4_request_inode                  [Tracepoint event]
+  ext4:ext4_allocate_inode                 [Tracepoint event]
+  ext4:ext4_write_begin                    [Tracepoint event]
+  ext4:ext4_ordered_write_end              [Tracepoint event]
+  [ .... remaining output snipped .... ]
+
+
+2. Enabling Events
+==================
+
+2.1 System-Wide Event Enabling
+------------------------------
+
+See Documentation/trace/events.txt for a proper description on how events
+can be enabled system-wide. A short example of enabling all events related
+to page allocation would look something like
+
+  $ for i in `find /sys/kernel/debug/tracing/events -name "enable" | grep mm_`; do echo 1 > $i; done
+
+2.2 System-Wide Event Enabling with SystemTap
+---------------------------------------------
+
+In SystemTap, tracepoints are accessible using the kernel.trace() function
+call. The following is an example that reports every 5 seconds what processes
+were allocating the pages.
+
+  global page_allocs
+
+  probe kernel.trace("mm_page_alloc") {
+       page_allocs[execname()]++
+  }
+
+  function print_count() {
+       printf ("%-25s %-s\n", "#Pages Allocated", "Process Name")
+       foreach (proc in page_allocs-)
+               printf("%-25d %s\n", page_allocs[proc], proc)
+       printf ("\n")
+       delete page_allocs
+  }
+
+  probe timer.s(5) {
+          print_count()
+  }
+
+2.3 System-Wide Event Enabling with PCL
+---------------------------------------
+
+By specifying the -a switch and analysing sleep, the system-wide events
+for a duration of time can be examined.
+
+ $ perf stat -a \
+       -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \
+       -e kmem:mm_pagevec_free \
+       sleep 10
+ Performance counter stats for 'sleep 10':
+
+           9630  kmem:mm_page_alloc
+           2143  kmem:mm_page_free_direct
+           7424  kmem:mm_pagevec_free
+
+   10.002577764  seconds time elapsed
+
+Similarly, one could execute a shell and exit it as desired to get a report
+at that point.
+
+2.4 Local Event Enabling
+------------------------
+
+Documentation/trace/ftrace.txt describes how to enable events on a per-thread
+basis using set_ftrace_pid.
+
+2.5 Local Event Enablement with PCL
+-----------------------------------
+
+Events can be activate and tracked for the duration of a process on a local
+basis using PCL such as follows.
+
+  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \
+                -e kmem:mm_pagevec_free ./hackbench 10
+  Time: 0.909
+
+    Performance counter stats for './hackbench 10':
+
+          17803  kmem:mm_page_alloc
+          12398  kmem:mm_page_free_direct
+           4827  kmem:mm_pagevec_free
+
+    0.973913387  seconds time elapsed
+
+3. Event Filtering
+==================
+
+Documentation/trace/ftrace.txt covers in-depth how to filter events in
+ftrace.  Obviously using grep and awk of trace_pipe is an option as well
+as any script reading trace_pipe.
+
+4. Analysing Event Variances with PCL
+=====================================
+
+Any workload can exhibit variances between runs and it can be important
+to know what the standard deviation in. By and large, this is left to the
+performance analyst to do it by hand. In the event that the discrete event
+occurrences are useful to the performance analyst, then perf can be used.
+
+  $ perf stat --repeat 5 -e kmem:mm_page_alloc -e kmem:mm_page_free_direct
+                       -e kmem:mm_pagevec_free ./hackbench 10
+  Time: 0.890
+  Time: 0.895
+  Time: 0.915
+  Time: 1.001
+  Time: 0.899
+
+   Performance counter stats for './hackbench 10' (5 runs):
+
+          16630  kmem:mm_page_alloc         ( +-   3.542% )
+          11486  kmem:mm_page_free_direct   ( +-   4.771% )
+           4730  kmem:mm_pagevec_free       ( +-   2.325% )
+
+    0.982653002  seconds time elapsed   ( +-   1.448% )
+
+In the event that some higher-level event is required that depends on some
+aggregation of discrete events, then a script would need to be developed.
+
+Using --repeat, it is also possible to view how events are fluctuating over
+time on a system wide basis using -a and sleep.
+
+  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \
+               -e kmem:mm_pagevec_free \
+               -a --repeat 10 \
+               sleep 1
+  Performance counter stats for 'sleep 1' (10 runs):
+
+           1066  kmem:mm_page_alloc         ( +-  26.148% )
+            182  kmem:mm_page_free_direct   ( +-   5.464% )
+            890  kmem:mm_pagevec_free       ( +-  30.079% )
+
+    1.002251757  seconds time elapsed   ( +-   0.005% )
+
+5. Higher-Level Analysis with Helper Scripts
+============================================
+
+When events are enabled the events that are triggering can be read from
+/sys/kernel/debug/tracing/trace_pipe in human-readable format although binary
+options exist as well. By post-processing the output, further information can
+be gathered on-line as appropriate. Examples of post-processing might include
+
+  o Reading information from /proc for the PID that triggered the event
+  o Deriving a higher-level event from a series of lower-level events.
+  o Calculate latencies between two events
+
+Documentation/trace/postprocess/trace-pagealloc-postprocess.pl is an example
+script that can read trace_pipe from STDIN or a copy of a trace. When used
+on-line, it can be interrupted once to generate a report without existing
+and twice to exit.
+
+Simplistically, the script just reads STDIN and counts up events but it
+also can do more such as
+
+  o Derive high-level events from many low-level events. If a number of pages
+    are freed to the main allocator from the per-CPU lists, it recognises
+    that as one per-CPU drain even though there is no specific tracepoint
+    for that event
+  o It can aggregate based on PID or individual process number
+  o In the event memory is getting externally fragmented, it reports
+    on whether the fragmentation event was severe or moderate.
+  o When receiving an event about a PID, it can record who the parent was so
+    that if large numbers of events are coming from very short-lived
+    processes, the parent process responsible for creating all the helpers
+    can be identified
+
+6. Lower-Level Analysis with PCL
+================================
+
+There may also be a requirement to identify what functions with a program
+were generating events within the kernel. To begin this sort of analysis, the
+data must be recorded. At the time of writing, this required root
+
+  $ perf record -c 1 \
+       -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \
+       -e kmem:mm_pagevec_free \
+       ./hackbench 10
+  Time: 0.894
+  [ perf record: Captured and wrote 0.733 MB perf.data (~32010 samples) ]
+
+Note the use of '-c 1' to set the event period to sample. The default sample
+period is quite high to minimise overhead but the information collected can be
+very coarse as a result.
+
+This record outputted a file called perf.data which can be analysed using
+perf report.
+
+  $ perf report
+  # Samples: 30922
+  #
+  # Overhead    Command                     Shared Object
+  # ........  .........  ................................
+  #
+      87.27%  hackbench  [vdso]
+       6.85%  hackbench  /lib/i686/cmov/libc-2.9.so
+       2.62%  hackbench  /lib/ld-2.9.so
+       1.52%       perf  [vdso]
+       1.22%  hackbench  ./hackbench
+       0.48%  hackbench  [kernel]
+       0.02%       perf  /lib/i686/cmov/libc-2.9.so
+       0.01%       perf  /usr/bin/perf
+       0.01%       perf  /lib/ld-2.9.so
+       0.00%  hackbench  /lib/i686/cmov/libpthread-2.9.so
+  #
+  # (For more details, try: perf report --sort comm,dso,symbol)
+  #
+
+According to this, the vast majority of events occured triggered on events
+within the VDSO. With simple binaries, this will often be the case so lets
+take a slightly different example. In the course of writing this, it was
+noticed that X was generating an insane amount of page allocations so lets look
+at it
+
+  $ perf record -c 1 -f \
+               -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \
+               -e kmem:mm_pagevec_free \
+               -p `pidof X`
+
+This was interrupted after a few seconds and
+
+  $ perf report
+  # Samples: 27666
+  #
+  # Overhead  Command                            Shared Object
+  # ........  .......  .......................................
+  #
+      51.95%     Xorg  [vdso]
+      47.95%     Xorg  /opt/gfx-test/lib/libpixman-1.so.0.13.1
+       0.09%     Xorg  /lib/i686/cmov/libc-2.9.so
+       0.01%     Xorg  [kernel]
+  #
+  # (For more details, try: perf report --sort comm,dso,symbol)
+  #
+
+So, almost half of the events are occuring in a library. To get an idea which
+symbol.
+
+  $ perf report --sort comm,dso,symbol
+  # Samples: 27666
+  #
+  # Overhead  Command                            Shared Object  Symbol
+  # ........  .......  .......................................  ......
+  #
+      51.95%     Xorg  [vdso]                                   [.] 0x000000ffffe424
+      47.93%     Xorg  /opt/gfx-test/lib/libpixman-1.so.0.13.1  [.] pixmanFillsse2
+       0.09%     Xorg  /lib/i686/cmov/libc-2.9.so               [.] _int_malloc
+       0.01%     Xorg  /opt/gfx-test/lib/libpixman-1.so.0.13.1  [.] pixman_region32_copy_f
+       0.01%     Xorg  [kernel]                                 [k] read_hpet
+       0.01%     Xorg  /opt/gfx-test/lib/libpixman-1.so.0.13.1  [.] get_fast_path
+       0.00%     Xorg  [kernel]                                 [k] ftrace_trace_userstack
+
+To see where within the function pixmanFillsse2 things are going wrong
+
+  $ perf annotate pixmanFillsse2
+  [ ... ]
+    0.00 :         34eeb:       0f 18 08                prefetcht0 (%eax)
+         :      }
+         :
+         :      extern __inline void __attribute__((__gnu_inline__, __always_inline__, _
+         :      _mm_store_si128 (__m128i *__P, __m128i __B) :      {
+         :        *__P = __B;
+   12.40 :         34eee:       66 0f 7f 80 40 ff ff    movdqa %xmm0,-0xc0(%eax)
+    0.00 :         34ef5:       ff
+   12.40 :         34ef6:       66 0f 7f 80 50 ff ff    movdqa %xmm0,-0xb0(%eax)
+    0.00 :         34efd:       ff
+   12.39 :         34efe:       66 0f 7f 80 60 ff ff    movdqa %xmm0,-0xa0(%eax)
+    0.00 :         34f05:       ff
+   12.67 :         34f06:       66 0f 7f 80 70 ff ff    movdqa %xmm0,-0x90(%eax)
+    0.00 :         34f0d:       ff
+   12.58 :         34f0e:       66 0f 7f 40 80          movdqa %xmm0,-0x80(%eax)
+   12.31 :         34f13:       66 0f 7f 40 90          movdqa %xmm0,-0x70(%eax)
+   12.40 :         34f18:       66 0f 7f 40 a0          movdqa %xmm0,-0x60(%eax)
+   12.31 :         34f1d:       66 0f 7f 40 b0          movdqa %xmm0,-0x50(%eax)
+
+At a glance, it looks like the time is being spent copying pixmaps to
+the card.  Further investigation would be needed to determine why pixmaps
+are being copied around so much but a starting point would be to take an
+ancient build of libpixmap out of the library path where it was totally
+forgotten about from months ago!
index 381b22e..c069b68 100644 (file)
@@ -16,20 +16,20 @@ Usage:
 
 Authorize a device to connect:
 
-$ echo 1 > /sys/usb/devices/DEVICE/authorized
+$ echo 1 > /sys/bus/usb/devices/DEVICE/authorized
 
 Deauthorize a device:
 
-$ echo 0 > /sys/usb/devices/DEVICE/authorized
+$ echo 0 > /sys/bus/usb/devices/DEVICE/authorized
 
 Set new devices connected to hostX to be deauthorized by default (ie:
 lock down):
 
-$ echo 0 > /sys/bus/devices/usbX/authorized_default
+$ echo 0 > /sys/bus/usb/devices/usbX/authorized_default
 
 Remove the lock down:
 
-$ echo 1 > /sys/bus/devices/usbX/authorized_default
+$ echo 1 > /sys/bus/usb/devices/usbX/authorized_default
 
 By default, Wired USB devices are authorized by default to
 connect. Wireless USB hosts deauthorize by default all new connected
@@ -47,7 +47,7 @@ USB port):
 boot up
 rc.local ->
 
- for host in /sys/bus/devices/usb*
+ for host in /sys/bus/usb/devices/usb*
  do
     echo 0 > $host/authorized_default
  done
index 6c3c625..66f92d1 100644 (file)
@@ -33,7 +33,7 @@ if usbmon is built into the kernel.
 
 Verify that bus sockets are present.
 
-# ls /sys/kernel/debug/usbmon
+# ls /sys/kernel/debug/usb/usbmon
 0s  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u
 #
 
@@ -58,11 +58,11 @@ Bus=03 means it's bus 3.
 
 3. Start 'cat'
 
-# cat /sys/kernel/debug/usbmon/3u > /tmp/1.mon.out
+# cat /sys/kernel/debug/usb/usbmon/3u > /tmp/1.mon.out
 
 to listen on a single bus, otherwise, to listen on all buses, type:
 
-# cat /sys/kernel/debug/usbmon/0u > /tmp/1.mon.out
+# cat /sys/kernel/debug/usb/usbmon/0u > /tmp/1.mon.out
 
 This process will be reading until killed. Naturally, the output can be
 redirected to a desirable location. This is preferred, because it is going
@@ -305,7 +305,7 @@ Before the call, hdr, data, and alloc should be filled. Upon return, the area
 pointed by hdr contains the next event structure, and the data buffer contains
 the data, if any. The event is removed from the kernel buffer.
 
-The MON_IOCX_GET copies 48 bytes, MON_IOCX_GETX copies 64 bytes.
+The MON_IOCX_GET copies 48 bytes to hdr area, MON_IOCX_GETX copies 64 bytes.
 
  MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg)
 
index 525edb3..5f33d84 100644 (file)
@@ -23,3 +23,4 @@
  22 -> Mygica X8506 DMB-TH                                 [14f1:8651]
  23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]
  24 -> Hauppauge WinTV-HVR1850                             [0070:8541]
+ 25 -> Compro VideoMate E800                               [1858:e800]
index b13fcbd..b8afef4 100644 (file)
@@ -1,5 +1,5 @@
   0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]
-  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868]
   2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]
   3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]
   4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]
@@ -68,3 +68,4 @@
  70 -> Evga inDtube                             (em2882)
  71 -> Silvercrest Webcam 1.3mpix               (em2820/em2840)
  72 -> Gadmei UTV330+                           (em2861)
+ 73 -> Reddo DVB-C USB TV Box                   (em2870)
index 0ac4d25..2620d60 100644 (file)
 170 -> AverMedia AverTV Studio 505              [1461:a115]
 171 -> Beholder BeholdTV X7                     [5ace:7595]
 172 -> RoverMedia TV Link Pro FM                [19d1:0138]
+173 -> Zolid Hybrid TV Tuner PCI                [1131:2004]
diff --git a/Documentation/video4linux/CARDLIST.saa7164 b/Documentation/video4linux/CARDLIST.saa7164
new file mode 100644 (file)
index 0000000..152bd7b
--- /dev/null
@@ -0,0 +1,9 @@
+  0 -> Unknown
+  1 -> Generic Rev2
+  2 -> Generic Rev3
+  3 -> Hauppauge WinTV-HVR2250                             [0070:8880,0070:8810]
+  4 -> Hauppauge WinTV-HVR2200                             [0070:8980]
+  5 -> Hauppauge WinTV-HVR2200                             [0070:8900]
+  6 -> Hauppauge WinTV-HVR2200                             [0070:8901]
+  7 -> Hauppauge WinTV-HVR2250                             [0070:8891,0070:8851]
+  8 -> Hauppauge WinTV-HVR2250                             [0070:88A1]
index ba9fa67..e0d298f 100644 (file)
@@ -79,3 +79,5 @@ tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner
 tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)
 tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough
 tuner=81 - Partsnic (Daewoo) PTI-5NF05
+tuner=82 - Philips CU1216L
+tuner=83 - NXP TDA18271
index 4686e84..3f61825 100644 (file)
@@ -173,6 +173,8 @@ ov519               05a9:8519       OmniVision
 ov519          05a9:a518       D-Link DSB-C310 Webcam
 sunplus                05da:1018       Digital Dream Enigma 1.3
 stk014         05e1:0893       Syntek DV4000
+gl860          05e3:0503       Genesys Logic PC Camera
+gl860          05e3:f191       Genesys Logic PC Camera
 spca561                060b:a001       Maxell Compact Pc PM3
 zc3xx          0698:2003       CTX M730V built in
 spca500                06bd:0404       Agfa CL20
index 178ef3c..3f87c7d 100644 (file)
@@ -116,5 +116,45 @@ functionality.
 struct soc_camera_device also links to an array of struct soc_camera_data_format,
 listing pixel formats, supported by the camera.
 
+VIDIOC_S_CROP and VIDIOC_S_FMT behaviour
+----------------------------------------
+
+Above user ioctls modify image geometry as follows:
+
+VIDIOC_S_CROP: sets location and sizes of the sensor window. Unit is one sensor
+pixel. Changing sensor window sizes preserves any scaling factors, therefore
+user window sizes change as well.
+
+VIDIOC_S_FMT: sets user window. Should preserve previously set sensor window as
+much as possible by modifying scaling factors. If the sensor window cannot be
+preserved precisely, it may be changed too.
+
+In soc-camera there are two locations, where scaling and cropping can taks
+place: in the camera driver and in the host driver. User ioctls are first passed
+to the host driver, which then generally passes them down to the camera driver.
+It is more efficient to perform scaling and cropping in the camera driver to
+save camera bus bandwidth and maximise the framerate. However, if the camera
+driver failed to set the required parameters with sufficient precision, the host
+driver may decide to also use its own scaling and cropping to fulfill the user's
+request.
+
+Camera drivers are interfaced to the soc-camera core and to host drivers over
+the v4l2-subdev API, which is completely functional, it doesn't pass any data.
+Therefore all camera drivers shall reply to .g_fmt() requests with their current
+output geometry. This is necessary to correctly configure the camera bus.
+.s_fmt() and .try_fmt() have to be implemented too. Sensor window and scaling
+factors have to be maintained by camera drivers internally. According to the
+V4L2 API all capture drivers must support the VIDIOC_CROPCAP ioctl, hence we
+rely on camera drivers implementing .cropcap(). If the camera driver does not
+support cropping, it may choose to not implement .s_crop(), but to enable
+cropping support by the camera host driver at least the .g_crop method must be
+implemented.
+
+User window geometry is kept in .user_width and .user_height fields in struct
+soc_camera_device and used by the soc-camera core and host drivers. The core
+updates these fields upon successful completion of a .s_fmt() call, but if these
+fields change elsewhere, e.g., during .s_crop() processing, the host driver is
+responsible for updating them.
+
 --
 Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
index ba4706a..b806eda 100644 (file)
@@ -370,19 +370,20 @@ from the remove() callback ensures that this is always done correctly.
 The bridge driver also has some helper functions it can use:
 
 struct v4l2_subdev *sd = v4l2_i2c_new_subdev(v4l2_dev, adapter,
-              "module_foo", "chipid", 0x36);
+              "module_foo", "chipid", 0x36, NULL);
 
 This loads the given module (can be NULL if no module needs to be loaded) and
 calls i2c_new_device() with the given i2c_adapter and chip/address arguments.
 If all goes well, then it registers the subdev with the v4l2_device.
 
-You can also use v4l2_i2c_new_probed_subdev() which is very similar to
-v4l2_i2c_new_subdev(), except that it has an array of possible I2C addresses
-that it should probe. Internally it calls i2c_new_probed_device().
+You can also use the last argument of v4l2_i2c_new_subdev() to pass an array
+of possible I2C addresses that it should probe. These probe addresses are
+only used if the previous argument is 0. A non-zero argument means that you
+know the exact i2c address so in that case no probing will take place.
 
 Both functions return NULL if something went wrong.
 
-Note that the chipid you pass to v4l2_i2c_new_(probed_)subdev() is usually
+Note that the chipid you pass to v4l2_i2c_new_subdev() is usually
 the same as the module name. It allows you to specify a chip variant, e.g.
 "saa7114" or "saa7115". In general though the i2c driver autodetects this.
 The use of chipid is something that needs to be looked at more closely at a
@@ -410,11 +411,6 @@ the irq and platform_data arguments after the subdev was setup. The older
 v4l2_i2c_new_(probed_)subdev functions will call s_config as well, but with
 irq set to 0 and platform_data set to NULL.
 
-Note that in the next kernel release the functions v4l2_i2c_new_subdev,
-v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr will all be
-replaced by a single v4l2_i2c_new_subdev that is identical to
-v4l2_i2c_new_subdev_cfg but without the irq and platform_data arguments.
-
 struct video_device
 -------------------
 
@@ -490,31 +486,35 @@ VFL_TYPE_RADIO: radioX for radio tuners
 VFL_TYPE_VTX: vtxX for teletext devices (deprecated, don't use)
 
 The last argument gives you a certain amount of control over the device
-kernel number used (i.e. the X in videoX). Normally you will pass -1 to
-let the v4l2 framework pick the first free number. But if a driver creates
-many devices, then it can be useful to have different video devices in
-separate ranges. For example, video capture devices start at 0, video
-output devices start at 16.
-
-So you can use the last argument to specify a minimum kernel number and
-the v4l2 framework will try to pick the first free number that is equal
+device node number used (i.e. the X in videoX). Normally you will pass -1
+to let the v4l2 framework pick the first free number. But sometimes users
+want to select a specific node number. It is common that drivers allow
+the user to select a specific device node number through a driver module
+option. That number is then passed to this function and video_register_device
+will attempt to select that device node number. If that number was already
+in use, then the next free device node number will be selected and it
+will send a warning to the kernel log.
+
+Another use-case is if a driver creates many devices. In that case it can
+be useful to place different video devices in separate ranges. For example,
+video capture devices start at 0, video output devices start at 16.
+So you can use the last argument to specify a minimum device node number
+and the v4l2 framework will try to pick the first free number that is equal
 or higher to what you passed. If that fails, then it will just pick the
 first free number.
 
+Since in this case you do not care about a warning about not being able
+to select the specified device node number, you can call the function
+video_register_device_no_warn() instead.
+
 Whenever a device node is created some attributes are also created for you.
 If you look in /sys/class/video4linux you see the devices. Go into e.g.
 video0 and you will see 'name' and 'index' attributes. The 'name' attribute
-is the 'name' field of the video_device struct. The 'index' attribute is
-a device node index that can be assigned by the driver, or that is calculated
-for you.
-
-If you call video_register_device(), then the index is just increased by
-1 for each device node you register. The first video device node you register
-always starts off with 0.
+is the 'name' field of the video_device struct.
 
-Alternatively you can call video_register_device_index() which is identical
-to video_register_device(), but with an extra index argument. Here you can
-pass a specific index value (between 0 and 31) that should be used.
+The 'index' attribute is the index of the device node: for each call to
+video_register_device() the index is just increased by 1. The first video
+device node you register always starts with index 0.
 
 Users can setup udev rules that utilize the index attribute to make fancy
 device names (e.g. 'mpegX' for MPEG video capture device nodes).
@@ -523,9 +523,8 @@ After the device was successfully registered, then you can use these fields:
 
 - vfl_type: the device type passed to video_register_device.
 - minor: the assigned device minor number.
-- num: the device kernel number (i.e. the X in videoX).
-- index: the device index number (calculated or set explicitly using
-  video_register_device_index).
+- num: the device node number (i.e. the X in videoX).
+- index: the device index number.
 
 If the registration failed, then you need to call video_device_release()
 to free the allocated video_device struct, or free your own struct if the
index 05769cf..c8ded17 100644 (file)
@@ -89,7 +89,7 @@
        }                                                               \
 }
 
-int get_brightness_adj(unsigned char *image, long size, int *brightness) {
+static int get_brightness_adj(unsigned char *image, long size, int *brightness) {
   long i, tot = 0;
   for (i=0;i<size*3;i++)
     tot += image[i];
index 2f77ced..e57d6a9 100644 (file)
@@ -6,6 +6,8 @@ balance
        - various information on memory balancing.
 hugetlbpage.txt
        - a brief summary of hugetlbpage support in the Linux kernel.
+ksm.txt
+       - how to use the Kernel Samepage Merging feature.
 locking
        - info on how locking and synchronization is done in the Linux vm code.
 numa
@@ -20,3 +22,5 @@ slabinfo.c
        - source code for a tool to get reports about slabs.
 slub.txt
        - a short users guide for SLUB.
+map_hugetlb.c
+       - an example program that uses the MAP_HUGETLB mmap flag.
index ea8714f..82a7bd1 100644 (file)
@@ -18,13 +18,13 @@ First the Linux kernel needs to be built with the CONFIG_HUGETLBFS
 automatically when CONFIG_HUGETLBFS is selected) configuration
 options.
 
-The kernel built with hugepage support should show the number of configured
-hugepages in the system by running the "cat /proc/meminfo" command.
+The kernel built with huge page support should show the number of configured
+huge pages in the system by running the "cat /proc/meminfo" command.
 
 /proc/meminfo also provides information about the total number of hugetlb
 pages configured in the kernel.  It also displays information about the
 number of free hugetlb pages at any time.  It also displays information about
-the configured hugepage size - this is needed for generating the proper
+the configured huge page size - this is needed for generating the proper
 alignment and size of the arguments to the above system calls.
 
 The output of "cat /proc/meminfo" will have lines like:
@@ -37,25 +37,27 @@ HugePages_Surp:  yyy
 Hugepagesize:    zzz kB
 
 where:
-HugePages_Total is the size of the pool of hugepages.
-HugePages_Free is the number of hugepages in the pool that are not yet
-allocated.
-HugePages_Rsvd is short for "reserved," and is the number of hugepages
-for which a commitment to allocate from the pool has been made, but no
-allocation has yet been made. It's vaguely analogous to overcommit.
-HugePages_Surp is short for "surplus," and is the number of hugepages in
-the pool above the value in /proc/sys/vm/nr_hugepages. The maximum
-number of surplus hugepages is controlled by
-/proc/sys/vm/nr_overcommit_hugepages.
+HugePages_Total is the size of the pool of huge pages.
+HugePages_Free  is the number of huge pages in the pool that are not yet
+                allocated.
+HugePages_Rsvd  is short for "reserved," and is the number of huge pages for
+                which a commitment to allocate from the pool has been made,
+                but no allocation has yet been made.  Reserved huge pages
+                guarantee that an application will be able to allocate a
+                huge page from the pool of huge pages at fault time.
+HugePages_Surp  is short for "surplus," and is the number of huge pages in
+                the pool above the value in /proc/sys/vm/nr_hugepages. The
+                maximum number of surplus huge pages is controlled by
+                /proc/sys/vm/nr_overcommit_hugepages.
 
 /proc/filesystems should also show a filesystem of type "hugetlbfs" configured
 in the kernel.
 
 /proc/sys/vm/nr_hugepages indicates the current number of configured hugetlb
 pages in the kernel.  Super user can dynamically request more (or free some
-pre-configured) hugepages.
+pre-configured) huge pages.
 The allocation (or deallocation) of hugetlb pages is possible only if there are
-enough physically contiguous free pages in system (freeing of hugepages is
+enough physically contiguous free pages in system (freeing of huge pages is
 possible only if there are enough hugetlb pages free that can be transferred
 back to regular memory pool).
 
@@ -67,43 +69,82 @@ use either the mmap system call or shared memory system calls to start using
 the huge pages.  It is required that the system administrator preallocate
 enough memory for huge page purposes.
 
-Use the following command to dynamically allocate/deallocate hugepages:
+The administrator can preallocate huge pages on the kernel boot command line by
+specifying the "hugepages=N" parameter, where 'N' = the number of huge pages
+requested.  This is the most reliable method for preallocating huge pages as
+memory has not yet become fragmented.
+
+Some platforms support multiple huge page sizes.  To preallocate huge pages
+of a specific size, one must preceed the huge pages boot command parameters
+with a huge page size selection parameter "hugepagesz=<size>".  <size> must
+be specified in bytes with optional scale suffix [kKmMgG].  The default huge
+page size may be selected with the "default_hugepagesz=<size>" boot parameter.
+
+/proc/sys/vm/nr_hugepages indicates the current number of configured [default
+size] hugetlb pages in the kernel.  Super user can dynamically request more
+(or free some pre-configured) huge pages.
+
+Use the following command to dynamically allocate/deallocate default sized
+huge pages:
 
        echo 20 > /proc/sys/vm/nr_hugepages
 
-This command will try to configure 20 hugepages in the system.  The success
-or failure of allocation depends on the amount of physically contiguous
-memory that is preset in system at this time.  System administrators may want
-to put this command in one of the local rc init files.  This will enable the
-kernel to request huge pages early in the boot process (when the possibility
-of getting physical contiguous pages is still very high). In either
-case, administrators will want to verify the number of hugepages actually
-allocated by checking the sysctl or meminfo.
-
-/proc/sys/vm/nr_overcommit_hugepages indicates how large the pool of
-hugepages can grow, if more hugepages than /proc/sys/vm/nr_hugepages are
-requested by applications. echo'ing any non-zero value into this file
-indicates that the hugetlb subsystem is allowed to try to obtain
-hugepages from the buddy allocator, if the normal pool is exhausted. As
-these surplus hugepages go out of use, they are freed back to the buddy
+This command will try to configure 20 default sized huge pages in the system.
+On a NUMA platform, the kernel will attempt to distribute the huge page pool
+over the all on-line nodes.  These huge pages, allocated when nr_hugepages
+is increased, are called "persistent huge pages".
+
+The success or failure of huge page allocation depends on the amount of
+physically contiguous memory that is preset in system at the time of the
+allocation attempt.  If the kernel is unable to allocate huge pages from
+some nodes in a NUMA system, it will attempt to make up the difference by
+allocating extra pages on other nodes with sufficient available contiguous
+memory, if any.
+
+System administrators may want to put this command in one of the local rc init
+files.  This will enable the kernel to request huge pages early in the boot
+process when the possibility of getting physical contiguous pages is still
+very high.  Administrators can verify the number of huge pages actually
+allocated by checking the sysctl or meminfo.  To check the per node
+distribution of huge pages in a NUMA system, use:
+
+       cat /sys/devices/system/node/node*/meminfo | fgrep Huge
+
+/proc/sys/vm/nr_overcommit_hugepages specifies how large the pool of
+huge pages can grow, if more huge pages than /proc/sys/vm/nr_hugepages are
+requested by applications.  Writing any non-zero value into this file
+indicates that the hugetlb subsystem is allowed to try to obtain "surplus"
+huge pages from the buddy allocator, when the normal pool is exhausted. As
+these surplus huge pages go out of use, they are freed back to the buddy
 allocator.
 
+When increasing the huge page pool size via nr_hugepages, any surplus
+pages will first be promoted to persistent huge pages.  Then, additional
+huge pages will be allocated, if necessary and if possible, to fulfill
+the new huge page pool size.
+
+The administrator may shrink the pool of preallocated huge pages for
+the default huge page size by setting the nr_hugepages sysctl to a
+smaller value.  The kernel will attempt to balance the freeing of huge pages
+across all on-line nodes.  Any free huge pages on the selected nodes will
+be freed back to the buddy allocator.
+
 Caveat: Shrinking the pool via nr_hugepages such that it becomes less
-than the number of hugepages in use will convert the balance to surplus
+than the number of huge pages in use will convert the balance to surplus
 huge pages even if it would exceed the overcommit value.  As long as
 this condition holds, however, no more surplus huge pages will be
 allowed on the system until one of the two sysctls are increased
 sufficiently, or the surplus huge pages go out of use and are freed.
 
-With support for multiple hugepage pools at run-time available, much of
-the hugepage userspace interface has been duplicated in sysfs. The above
-information applies to the default hugepage size (which will be
-controlled by the proc interfaces for backwards compatibility). The root
-hugepage control directory is
+With support for multiple huge page pools at run-time available, much of
+the huge page userspace interface has been duplicated in sysfs. The above
+information applies to the default huge page size which will be
+controlled by the /proc interfaces for backwards compatibility. The root
+huge page control directory in sysfs is:
 
        /sys/kernel/mm/hugepages
 
-For each hugepage size supported by the running kernel, a subdirectory
+For each huge page size supported by the running kernel, a subdirectory
 will exist, of the form
 
        hugepages-${size}kB
@@ -116,9 +157,9 @@ Inside each of these directories, the same set of files will exist:
        resv_hugepages
        surplus_hugepages
 
-which function as described above for the default hugepage-sized case.
+which function as described above for the default huge page-sized case.
 
-If the user applications are going to request hugepages using mmap system
+If the user applications are going to request huge pages using mmap system
 call, then it is required that system administrator mount a file system of
 type hugetlbfs:
 
@@ -127,7 +168,7 @@ type hugetlbfs:
        none /mnt/huge
 
 This command mounts a (pseudo) filesystem of type hugetlbfs on the directory
-/mnt/huge.  Any files created on /mnt/huge uses hugepages.  The uid and gid
+/mnt/huge.  Any files created on /mnt/huge uses huge pages.  The uid and gid
 options sets the owner and group of the root of the file system.  By default
 the uid and gid of the current process are taken.  The mode option sets the
 mode of root of file system to value & 0777.  This value is given in octal.
@@ -146,24 +187,26 @@ Regular chown, chgrp, and chmod commands (with right permissions) could be
 used to change the file attributes on hugetlbfs.
 
 Also, it is important to note that no such mount command is required if the
-applications are going to use only shmat/shmget system calls.  Users who
-wish to use hugetlb page via shared memory segment should be a member of
-a supplementary group and system admin needs to configure that gid into
-/proc/sys/vm/hugetlb_shm_group.  It is possible for same or different
-applications to use any combination of mmaps and shm* calls, though the
-mount of filesystem will be required for using mmap calls.
+applications are going to use only shmat/shmget system calls or mmap with
+MAP_HUGETLB.  Users who wish to use hugetlb page via shared memory segment
+should be a member of a supplementary group and system admin needs to
+configure that gid into /proc/sys/vm/hugetlb_shm_group.  It is possible for
+same or different applications to use any combination of mmaps and shm*
+calls, though the mount of filesystem will be required for using mmap calls
+without MAP_HUGETLB.  For an example of how to use mmap with MAP_HUGETLB see
+map_hugetlb.c.
 
 *******************************************************************
 
 /*
- * Example of using hugepage memory in a user application using Sys V shared
+ * Example of using huge page memory in a user application using Sys V shared
  * memory system calls.  In this example the app is requesting 256MB of
  * memory that is backed by huge pages.  The application uses the flag
  * SHM_HUGETLB in the shmget system call to inform the kernel that it is
- * requesting hugepages.
+ * requesting huge pages.
  *
  * For the ia64 architecture, the Linux kernel reserves Region number 4 for
- * hugepages.  That means the addresses starting with 0x800000... will need
+ * huge pages.  That means the addresses starting with 0x800000... will need
  * to be specified.  Specifying a fixed address is not required on ppc64,
  * i386 or x86_64.
  *
@@ -252,14 +295,14 @@ int main(void)
 *******************************************************************
 
 /*
- * Example of using hugepage memory in a user application using the mmap
+ * Example of using huge page memory in a user application using the mmap
  * system call.  Before running this application, make sure that the
  * administrator has mounted the hugetlbfs filesystem (on some directory
  * like /mnt) using the command mount -t hugetlbfs nodev /mnt. In this
  * example, the app is requesting memory of size 256MB that is backed by
  * huge pages.
  *
- * For ia64 architecture, Linux kernel reserves Region number 4 for hugepages.
+ * For ia64 architecture, Linux kernel reserves Region number 4 for huge pages.
  * That means the addresses starting with 0x800000... will need to be
  * specified.  Specifying a fixed address is not required on ppc64, i386
  * or x86_64.
diff --git a/Documentation/vm/ksm.txt b/Documentation/vm/ksm.txt
new file mode 100644 (file)
index 0000000..72a22f6
--- /dev/null
@@ -0,0 +1,89 @@
+How to use the Kernel Samepage Merging feature
+----------------------------------------------
+
+KSM is a memory-saving de-duplication feature, enabled by CONFIG_KSM=y,
+added to the Linux kernel in 2.6.32.  See mm/ksm.c for its implementation,
+and http://lwn.net/Articles/306704/ and http://lwn.net/Articles/330589/
+
+The KSM daemon ksmd periodically scans those areas of user memory which
+have been registered with it, looking for pages of identical content which
+can be replaced by a single write-protected page (which is automatically
+copied if a process later wants to update its content).
+
+KSM was originally developed for use with KVM (where it was known as
+Kernel Shared Memory), to fit more virtual machines into physical memory,
+by sharing the data common between them.  But it can be useful to any
+application which generates many instances of the same data.
+
+KSM only merges anonymous (private) pages, never pagecache (file) pages.
+KSM's merged pages are at present locked into kernel memory for as long
+as they are shared: so cannot be swapped out like the user pages they
+replace (but swapping KSM pages should follow soon in a later release).
+
+KSM only operates on those areas of address space which an application
+has advised to be likely candidates for merging, by using the madvise(2)
+system call: int madvise(addr, length, MADV_MERGEABLE).
+
+The app may call int madvise(addr, length, MADV_UNMERGEABLE) to cancel
+that advice and restore unshared pages: whereupon KSM unmerges whatever
+it merged in that range.  Note: this unmerging call may suddenly require
+more memory than is available - possibly failing with EAGAIN, but more
+probably arousing the Out-Of-Memory killer.
+
+If KSM is not configured into the running kernel, madvise MADV_MERGEABLE
+and MADV_UNMERGEABLE simply fail with EINVAL.  If the running kernel was
+built with CONFIG_KSM=y, those calls will normally succeed: even if the
+the KSM daemon is not currently running, MADV_MERGEABLE still registers
+the range for whenever the KSM daemon is started; even if the range
+cannot contain any pages which KSM could actually merge; even if
+MADV_UNMERGEABLE is applied to a range which was never MADV_MERGEABLE.
+
+Like other madvise calls, they are intended for use on mapped areas of
+the user address space: they will report ENOMEM if the specified range
+includes unmapped gaps (though working on the intervening mapped areas),
+and might fail with EAGAIN if not enough memory for internal structures.
+
+Applications should be considerate in their use of MADV_MERGEABLE,
+restricting its use to areas likely to benefit.  KSM's scans may use
+a lot of processing power, and its kernel-resident pages are a limited
+resource.  Some installations will disable KSM for these reasons.
+
+The KSM daemon is controlled by sysfs files in /sys/kernel/mm/ksm/,
+readable by all but writable only by root:
+
+max_kernel_pages - set to maximum number of kernel pages that KSM may use
+                   e.g. "echo 2000 > /sys/kernel/mm/ksm/max_kernel_pages"
+                   Value 0 imposes no limit on the kernel pages KSM may use;
+                   but note that any process using MADV_MERGEABLE can cause
+                   KSM to allocate these pages, unswappable until it exits.
+                   Default: 2000 (chosen for demonstration purposes)
+
+pages_to_scan    - how many present pages to scan before ksmd goes to sleep
+                   e.g. "echo 200 > /sys/kernel/mm/ksm/pages_to_scan"
+                   Default: 200 (chosen for demonstration purposes)
+
+sleep_millisecs  - how many milliseconds ksmd should sleep before next scan
+                   e.g. "echo 20 > /sys/kernel/mm/ksm/sleep_millisecs"
+                   Default: 20 (chosen for demonstration purposes)
+
+run              - set 0 to stop ksmd from running but keep merged pages,
+                   set 1 to run ksmd e.g. "echo 1 > /sys/kernel/mm/ksm/run",
+                   set 2 to stop ksmd and unmerge all pages currently merged,
+                         but leave mergeable areas registered for next run
+                   Default: 1 (for immediate use by apps which register)
+
+The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:
+
+pages_shared     - how many shared unswappable kernel pages KSM is using
+pages_sharing    - how many more sites are sharing them i.e. how much saved
+pages_unshared   - how many pages unique but repeatedly checked for merging
+pages_volatile   - how many pages changing too fast to be placed in a tree
+full_scans       - how many times all mergeable areas have been scanned
+
+A high ratio of pages_sharing to pages_shared indicates good sharing, but
+a high ratio of pages_unshared to pages_sharing indicates wasted effort.
+pages_volatile embraces several different kinds of activity, but a high
+proportion there would also indicate poor use of madvise MADV_MERGEABLE.
+
+Izik Eidus,
+Hugh Dickins, 30 July 2009
diff --git a/Documentation/vm/map_hugetlb.c b/Documentation/vm/map_hugetlb.c
new file mode 100644 (file)
index 0000000..e2bdae3
--- /dev/null
@@ -0,0 +1,77 @@
+/*
+ * Example of using hugepage memory in a user application using the mmap
+ * system call with MAP_HUGETLB flag.  Before running this program make
+ * sure the administrator has allocated enough default sized huge pages
+ * to cover the 256 MB allocation.
+ *
+ * For ia64 architecture, Linux kernel reserves Region number 4 for hugepages.
+ * That means the addresses starting with 0x800000... will need to be
+ * specified.  Specifying a fixed address is not required on ppc64, i386
+ * or x86_64.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+
+#define LENGTH (256UL*1024*1024)
+#define PROTECTION (PROT_READ | PROT_WRITE)
+
+#ifndef MAP_HUGETLB
+#define MAP_HUGETLB 0x40
+#endif
+
+/* Only ia64 requires this */
+#ifdef __ia64__
+#define ADDR (void *)(0x8000000000000000UL)
+#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_FIXED)
+#else
+#define ADDR (void *)(0x0UL)
+#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB)
+#endif
+
+void check_bytes(char *addr)
+{
+       printf("First hex is %x\n", *((unsigned int *)addr));
+}
+
+void write_bytes(char *addr)
+{
+       unsigned long i;
+
+       for (i = 0; i < LENGTH; i++)
+               *(addr + i) = (char)i;
+}
+
+void read_bytes(char *addr)
+{
+       unsigned long i;
+
+       check_bytes(addr);
+       for (i = 0; i < LENGTH; i++)
+               if (*(addr + i) != (char)i) {
+                       printf("Mismatch at %lu\n", i);
+                       break;
+               }
+}
+
+int main(void)
+{
+       void *addr;
+
+       addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0);
+       if (addr == MAP_FAILED) {
+               perror("mmap");
+               exit(1);
+       }
+
+       printf("Returned address is %p\n", addr);
+       check_bytes(addr);
+       write_bytes(addr);
+       read_bytes(addr);
+
+       munmap(addr, LENGTH);
+
+       return 0;
+}
index 0833f44..3eda8ea 100644 (file)
@@ -158,12 +158,12 @@ static uint64_t   page_flags[HASH_SIZE];
        type __min2 = (y);                      \
        __min1 < __min2 ? __min1 : __min2; })
 
-unsigned long pages2mb(unsigned long pages)
+static unsigned long pages2mb(unsigned long pages)
 {
        return (pages * page_size) >> 20;
 }
 
-void fatal(const char *x, ...)
+static void fatal(const char *x, ...)
 {
        va_list ap;
 
@@ -178,7 +178,7 @@ void fatal(const char *x, ...)
  * page flag names
  */
 
-char *page_flag_name(uint64_t flags)
+static char *page_flag_name(uint64_t flags)
 {
        static char buf[65];
        int present;
@@ -197,7 +197,7 @@ char *page_flag_name(uint64_t flags)
        return buf;
 }
 
-char *page_flag_longname(uint64_t flags)
+static char *page_flag_longname(uint64_t flags)
 {
        static char buf[1024];
        int i, n;
@@ -221,7 +221,7 @@ char *page_flag_longname(uint64_t flags)
  * page list and summary
  */
 
-void show_page_range(unsigned long offset, uint64_t flags)
+static void show_page_range(unsigned long offset, uint64_t flags)
 {
        static uint64_t      flags0;
        static unsigned long index;
@@ -241,12 +241,12 @@ void show_page_range(unsigned long offset, uint64_t flags)
        count  = 1;
 }
 
-void show_page(unsigned long offset, uint64_t flags)
+static void show_page(unsigned long offset, uint64_t flags)
 {
        printf("%lu\t%s\n", offset, page_flag_name(flags));
 }
 
-void show_summary(void)
+static void show_summary(void)
 {
        int i;
 
@@ -272,7 +272,7 @@ void show_summary(void)
  * page flag filters
  */
 
-int bit_mask_ok(uint64_t flags)
+static int bit_mask_ok(uint64_t flags)
 {
        int i;
 
@@ -289,7 +289,7 @@ int bit_mask_ok(uint64_t flags)
        return 1;
 }
 
-uint64_t expand_overloaded_flags(uint64_t flags)
+static uint64_t expand_overloaded_flags(uint64_t flags)
 {
        /* SLOB/SLUB overload several page flags */
        if (flags & BIT(SLAB)) {
@@ -308,7 +308,7 @@ uint64_t expand_overloaded_flags(uint64_t flags)
        return flags;
 }
 
-uint64_t well_known_flags(uint64_t flags)
+static uint64_t well_known_flags(uint64_t flags)
 {
        /* hide flags intended only for kernel hacker */
        flags &= ~KPF_HACKERS_BITS;
@@ -325,7 +325,7 @@ uint64_t well_known_flags(uint64_t flags)
  * page frame walker
  */
 
-int hash_slot(uint64_t flags)
+static int hash_slot(uint64_t flags)
 {
        int k = HASH_KEY(flags);
        int i;
@@ -352,7 +352,7 @@ int hash_slot(uint64_t flags)
        exit(EXIT_FAILURE);
 }
 
-void add_page(unsigned long offset, uint64_t flags)
+static void add_page(unsigned long offset, uint64_t flags)
 {
        flags = expand_overloaded_flags(flags);
 
@@ -371,7 +371,7 @@ void add_page(unsigned long offset, uint64_t flags)
        total_pages++;
 }
 
-void walk_pfn(unsigned long index, unsigned long count)
+static void walk_pfn(unsigned long index, unsigned long count)
 {
        unsigned long batch;
        unsigned long n;
@@ -404,7 +404,7 @@ void walk_pfn(unsigned long index, unsigned long count)
        }
 }
 
-void walk_addr_ranges(void)
+static void walk_addr_ranges(void)
 {
        int i;
 
@@ -428,7 +428,7 @@ void walk_addr_ranges(void)
  * user interface
  */
 
-const char *page_flag_type(uint64_t flag)
+static const char *page_flag_type(uint64_t flag)
 {
        if (flag & KPF_HACKERS_BITS)
                return "(r)";
@@ -437,7 +437,7 @@ const char *page_flag_type(uint64_t flag)
        return "   ";
 }
 
-void usage(void)
+static void usage(void)
 {
        int i, j;
 
@@ -482,7 +482,7 @@ void usage(void)
                "(r) raw mode bits  (o) overloaded bits\n");
 }
 
-unsigned long long parse_number(const char *str)
+static unsigned long long parse_number(const char *str)
 {
        unsigned long long n;
 
@@ -494,16 +494,16 @@ unsigned long long parse_number(const char *str)
        return n;
 }
 
-void parse_pid(const char *str)
+static void parse_pid(const char *str)
 {
        opt_pid = parse_number(str);
 }
 
-void parse_file(const char *name)
+static void parse_file(const char *name)
 {
 }
 
-void add_addr_range(unsigned long offset, unsigned long size)
+static void add_addr_range(unsigned long offset, unsigned long size)
 {
        if (nr_addr_ranges >= MAX_ADDR_RANGES)
                fatal("too much addr ranges\n");
@@ -513,7 +513,7 @@ void add_addr_range(unsigned long offset, unsigned long size)
        nr_addr_ranges++;
 }
 
-void parse_addr_range(const char *optarg)
+static void parse_addr_range(const char *optarg)
 {
        unsigned long offset;
        unsigned long size;
@@ -547,7 +547,7 @@ void parse_addr_range(const char *optarg)
        add_addr_range(offset, size);
 }
 
-void add_bits_filter(uint64_t mask, uint64_t bits)
+static void add_bits_filter(uint64_t mask, uint64_t bits)
 {
        if (nr_bit_filters >= MAX_BIT_FILTERS)
                fatal("too much bit filters\n");
@@ -557,7 +557,7 @@ void add_bits_filter(uint64_t mask, uint64_t bits)
        nr_bit_filters++;
 }
 
-uint64_t parse_flag_name(const char *str, int len)
+static uint64_t parse_flag_name(const char *str, int len)
 {
        int i;
 
@@ -577,7 +577,7 @@ uint64_t parse_flag_name(const char *str, int len)
        return parse_number(str);
 }
 
-uint64_t parse_flag_names(const char *str, int all)
+static uint64_t parse_flag_names(const char *str, int all)
 {
        const char *p    = str;
        uint64_t   flags = 0;
@@ -596,7 +596,7 @@ uint64_t parse_flag_names(const char *str, int all)
        return flags;
 }
 
-void parse_bits_mask(const char *optarg)
+static void parse_bits_mask(const char *optarg)
 {
        uint64_t mask;
        uint64_t bits;
@@ -621,7 +621,7 @@ void parse_bits_mask(const char *optarg)
 }
 
 
-struct option opts[] = {
+static struct option opts[] = {
        { "raw"       , 0, NULL, 'r' },
        { "pid"       , 1, NULL, 'p' },
        { "file"      , 1, NULL, 'f' },
index df32276..92e729f 100644 (file)
@@ -87,7 +87,7 @@ int page_size;
 
 regex_t pattern;
 
-void fatal(const char *x, ...)
+static void fatal(const char *x, ...)
 {
        va_list ap;
 
@@ -97,7 +97,7 @@ void fatal(const char *x, ...)
        exit(EXIT_FAILURE);
 }
 
-void usage(void)
+static void usage(void)
 {
        printf("slabinfo 5/7/2007. (c) 2007 sgi.\n\n"
                "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n"
@@ -131,7 +131,7 @@ void usage(void)
        );
 }
 
-unsigned long read_obj(const char *name)
+static unsigned long read_obj(const char *name)
 {
        FILE *f = fopen(name, "r");
 
@@ -151,7 +151,7 @@ unsigned long read_obj(const char *name)
 /*
  * Get the contents of an attribute
  */
-unsigned long get_obj(const char *name)
+static unsigned long get_obj(const char *name)
 {
        if (!read_obj(name))
                return 0;
@@ -159,7 +159,7 @@ unsigned long get_obj(const char *name)
        return atol(buffer);
 }
 
-unsigned long get_obj_and_str(const char *name, char **x)
+static unsigned long get_obj_and_str(const char *name, char **x)
 {
        unsigned long result = 0;
        char *p;
@@ -178,7 +178,7 @@ unsigned long get_obj_and_str(const char *name, char **x)
        return result;
 }
 
-void set_obj(struct slabinfo *s, const char *name, int n)
+static void set_obj(struct slabinfo *s, const char *name, int n)
 {
        char x[100];
        FILE *f;
@@ -192,7 +192,7 @@ void set_obj(struct slabinfo *s, const char *name, int n)
        fclose(f);
 }
 
-unsigned long read_slab_obj(struct slabinfo *s, const char *name)
+static unsigned long read_slab_obj(struct slabinfo *s, const char *name)
 {
        char x[100];
        FILE *f;
@@ -215,7 +215,7 @@ unsigned long read_slab_obj(struct slabinfo *s, const char *name)
 /*
  * Put a size string together
  */
-int store_size(char *buffer, unsigned long value)
+static int store_size(char *buffer, unsigned long value)
 {
        unsigned long divisor = 1;
        char trailer = 0;
@@ -247,7 +247,7 @@ int store_size(char *buffer, unsigned long value)
        return n;
 }
 
-void decode_numa_list(int *numa, char *t)
+static void decode_numa_list(int *numa, char *t)
 {
        int node;
        int nr;
@@ -272,7 +272,7 @@ void decode_numa_list(int *numa, char *t)
        }
 }
 
-void slab_validate(struct slabinfo *s)
+static void slab_validate(struct slabinfo *s)
 {
        if (strcmp(s->name, "*") == 0)
                return;
@@ -280,7 +280,7 @@ void slab_validate(struct slabinfo *s)
        set_obj(s, "validate", 1);
 }
 
-void slab_shrink(struct slabinfo *s)
+static void slab_shrink(struct slabinfo *s)
 {
        if (strcmp(s->name, "*") == 0)
                return;
@@ -290,7 +290,7 @@ void slab_shrink(struct slabinfo *s)
 
 int line = 0;
 
-void first_line(void)
+static void first_line(void)
 {
        if (show_activity)
                printf("Name                   Objects      Alloc       Free   %%Fast Fallb O\n");
@@ -302,7 +302,7 @@ void first_line(void)
 /*
  * Find the shortest alias of a slab
  */
-struct aliasinfo *find_one_alias(struct slabinfo *find)
+static struct aliasinfo *find_one_alias(struct slabinfo *find)
 {
        struct aliasinfo *a;
        struct aliasinfo *best = NULL;
@@ -318,18 +318,18 @@ struct aliasinfo *find_one_alias(struct slabinfo *find)
        return best;
 }
 
-unsigned long slab_size(struct slabinfo *s)
+static unsigned long slab_size(struct slabinfo *s)
 {
        return  s->slabs * (page_size << s->order);
 }
 
-unsigned long slab_activity(struct slabinfo *s)
+static unsigned long slab_activity(struct slabinfo *s)
 {
        return  s->alloc_fastpath + s->free_fastpath +
                s->alloc_slowpath + s->free_slowpath;
 }
 
-void slab_numa(struct slabinfo *s, int mode)
+static void slab_numa(struct slabinfo *s, int mode)
 {
        int node;
 
@@ -374,7 +374,7 @@ void slab_numa(struct slabinfo *s, int mode)
        line++;
 }
 
-void show_tracking(struct slabinfo *s)
+static void show_tracking(struct slabinfo *s)
 {
        printf("\n%s: Kernel object allocation\n", s->name);
        printf("-----------------------------------------------------------------------\n");
@@ -392,7 +392,7 @@ void show_tracking(struct slabinfo *s)
 
 }
 
-void ops(struct slabinfo *s)
+static void ops(struct slabinfo *s)
 {
        if (strcmp(s->name, "*") == 0)
                return;
@@ -405,14 +405,14 @@ void ops(struct slabinfo *s)
                printf("\n%s has no kmem_cache operations\n", s->name);
 }
 
-const char *onoff(int x)
+static const char *onoff(int x)
 {
        if (x)
                return "On ";
        return "Off";
 }
 
-void slab_stats(struct slabinfo *s)
+static void slab_stats(struct slabinfo *s)
 {
        unsigned long total_alloc;
        unsigned long total_free;
@@ -477,7 +477,7 @@ void slab_stats(struct slabinfo *s)
                        s->deactivate_to_tail, (s->deactivate_to_tail * 100) / total);
 }
 
-void report(struct slabinfo *s)
+static void report(struct slabinfo *s)
 {
        if (strcmp(s->name, "*") == 0)
                return;
@@ -518,7 +518,7 @@ void report(struct slabinfo *s)
        slab_stats(s);
 }
 
-void slabcache(struct slabinfo *s)
+static void slabcache(struct slabinfo *s)
 {
        char size_str[20];
        char dist_str[40];
@@ -593,7 +593,7 @@ void slabcache(struct slabinfo *s)
 /*
  * Analyze debug options. Return false if something is amiss.
  */
-int debug_opt_scan(char *opt)
+static int debug_opt_scan(char *opt)
 {
        if (!opt || !opt[0] || strcmp(opt, "-") == 0)
                return 1;
@@ -642,7 +642,7 @@ int debug_opt_scan(char *opt)
        return 1;
 }
 
-int slab_empty(struct slabinfo *s)
+static int slab_empty(struct slabinfo *s)
 {
        if (s->objects > 0)
                return 0;
@@ -657,7 +657,7 @@ int slab_empty(struct slabinfo *s)
        return 1;
 }
 
-void slab_debug(struct slabinfo *s)
+static void slab_debug(struct slabinfo *s)
 {
        if (strcmp(s->name, "*") == 0)
                return;
@@ -717,7 +717,7 @@ void slab_debug(struct slabinfo *s)
                set_obj(s, "trace", 1);
 }
 
-void totals(void)
+static void totals(void)
 {
        struct slabinfo *s;
 
@@ -976,7 +976,7 @@ void totals(void)
                        b1,     b2,     b3);
 }
 
-void sort_slabs(void)
+static void sort_slabs(void)
 {
        struct slabinfo *s1,*s2;
 
@@ -1005,7 +1005,7 @@ void sort_slabs(void)
        }
 }
 
-void sort_aliases(void)
+static void sort_aliases(void)
 {
        struct aliasinfo *a1,*a2;
 
@@ -1030,7 +1030,7 @@ void sort_aliases(void)
        }
 }
 
-void link_slabs(void)
+static void link_slabs(void)
 {
        struct aliasinfo *a;
        struct slabinfo *s;
@@ -1048,7 +1048,7 @@ void link_slabs(void)
        }
 }
 
-void alias(void)
+static void alias(void)
 {
        struct aliasinfo *a;
        char *active = NULL;
@@ -1079,7 +1079,7 @@ void alias(void)
 }
 
 
-void rename_slabs(void)
+static void rename_slabs(void)
 {
        struct slabinfo *s;
        struct aliasinfo *a;
@@ -1102,12 +1102,12 @@ void rename_slabs(void)
        }
 }
 
-int slab_mismatch(char *slab)
+static int slab_mismatch(char *slab)
 {
        return regexec(&pattern, slab, 0, NULL, 0);
 }
 
-void read_slab_dir(void)
+static void read_slab_dir(void)
 {
        DIR *dir;
        struct dirent *de;
@@ -1209,7 +1209,7 @@ void read_slab_dir(void)
                fatal("Too many aliases\n");
 }
 
-void output_slabs(void)
+static void output_slabs(void)
 {
        struct slabinfo *slab;
 
index 65f6c19..a750532 100644 (file)
@@ -18,7 +18,7 @@ int fd;
  * the PC Watchdog card to reset its internal timer so it doesn't trigger
  * a computer reset.
  */
-void keep_alive(void)
+static void keep_alive(void)
 {
     int dummy;
 
index 607b1a0..f19802c 100644 (file)
@@ -7,7 +7,7 @@ and two USB cables, connected like this:
 
   [host/target] <-------> [USB debug key] <-------> [client/console]
 
-1. There are three specific hardware requirements:
+1. There are a number of specific hardware requirements:
 
  a.) Host/target system needs to have USB debug port capability.
 
@@ -42,7 +42,35 @@ and two USB cables, connected like this:
      This is a small blue plastic connector with two USB connections,
      it draws power from its USB connections.
 
- c.) Thirdly, you need a second client/console system with a regular USB port.
+ c.) You need a second client/console system with a high speed USB 2.0
+     port.
+
+ d.) The Netchip device must be plugged directly into the physical
+     debug port on the "host/target" system.  You cannot use a USB hub in
+     between the physical debug port and the "host/target" system.
+
+     The EHCI debug controller is bound to a specific physical USB
+     port and the Netchip device will only work as an early printk
+     device in this port.  The EHCI host controllers are electrically
+     wired such that the EHCI debug controller is hooked up to the
+     first physical and there is no way to change this via software.
+     You can find the physical port through experimentation by trying
+     each physical port on the system and rebooting.  Or you can try
+     and use lsusb or look at the kernel info messages emitted by the
+     usb stack when you plug a usb device into various ports on the
+     "host/target" system.
+
+     Some hardware vendors do not expose the usb debug port with a
+     physical connector and if you find such a device send a complaint
+     to the hardware vendor, because there is no reason not to wire
+     this port into one of the physically accessible ports.
+
+ e.) It is also important to note, that many versions of the Netchip
+     device require the "client/console" system to be plugged into the
+     right and side of the device (with the product logo facing up and
+     readable left to right).  The reason being is that the 5 volt
+     power supply is taken from only one side of the device and it
+     must be the side that does not get rebooted.
 
 2. Software requirements:
 
@@ -56,6 +84,13 @@ and two USB cables, connected like this:
     (If you are using Grub, append it to the 'kernel' line in
      /etc/grub.conf)
 
+    On systems with more than one EHCI debug controller you must
+    specify the correct EHCI debug controller number.  The ordering
+    comes from the PCI bus enumeration of the EHCI controllers.  The
+    default with no number argument is "0" the first EHCI debug
+    controller.  To use the second EHCI debug controller, you would
+    use the command line: "earlyprintk=dbgp1"
+
     NOTE: normally earlyprintk console gets turned off once the
     regular console is alive - use "earlyprintk=dbgp,keep" to keep
     this channel open beyond early bootup. This can be useful for
index 81061c3..8f62978 100644 (file)
@@ -233,6 +233,7 @@ S:  Supported
 F:     drivers/acpi/
 F:     drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
+F:     include/acpi/
 
 ACPI BATTERY DRIVERS
 M:     Alexey Starikovskiy <astarikovskiy@suse.de>
@@ -497,7 +498,7 @@ F:  arch/arm/include/asm/floppy.h
 
 ARM PORT
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/
@@ -508,36 +509,36 @@ F:        drivers/mmc/host/mmci.*
 
 ARM/ADI ROADRUNNER MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-ixp23xx/
 F:     arch/arm/mach-ixp23xx/include/mach/
 
 ARM/ADS SPHERE MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/AFEB9260 MACHINE SUPPORT
 M:     Sergey Lapin <slapin@ossfans.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/AJECO 1ARM MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
 M:     Andrew Victor <linux@maxim.org.za>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://maxim.org.za/at91_26.html
 S:     Maintained
 
 ARM/BCMRING ARM ARCHITECTURE
 M:     Leo Chen <leochen@broadcom.com>
 M:     Scott Branden <sbranden@broadcom.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-bcmring
 
@@ -554,25 +555,25 @@ F:        drivers/mtd/nand/nand_bcm_umi.h
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:     Hartley Sweeten <hsweeten@visionengravers.com>
 M:     Ryan Mallon <ryan@bluewatersys.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-ep93xx/
 F:     arch/arm/mach-ep93xx/include/mach/
 
 ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/CLKDEV SUPPORT
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 F:     arch/arm/common/clkdev.c
 F:     arch/arm/include/asm/clkdev.h
 
 ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 M:     Mike Rapoport <mike@compulab.co.il>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/CORGI MACHINE SUPPORT
@@ -581,14 +582,14 @@ S:        Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
 M:     Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://gitorious.org/linux-gemini/mainline.git
 S:     Maintained
 F:     arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/mach-ebsa110/
@@ -606,13 +607,13 @@ F:        arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
 M:     Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/include/asm/hardware/dec21285.h
@@ -620,17 +621,17 @@ F:        arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:     Sascha Hauer <kernel@pengutronix.de>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/GUMSTIX MACHINE SUPPORT
 M:     Steve Sakoman <sakoman@gmail.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
@@ -650,55 +651,55 @@ F:        arch/arm/mach-sa1100/include/mach/jornada720.h
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 M:     Dan Williams <dan.j.williams@intel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 
 ARM/INTEL IOP33X ARM ARCHITECTURE
 M:     Dan Williams <dan.j.williams@intel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 M:     Dan Williams <dan.j.williams@intel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 
 ARM/INTEL IQ81342EX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 M:     Dan Williams <dan.j.williams@intel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 
 ARM/INTEL IXP2000 ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL IXDP2850 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL IXP23XX ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 M:     Dan Williams <dan.j.williams@intel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 
 ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/MAGICIAN MACHINE SUPPORT
@@ -708,7 +709,7 @@ S:  Maintained
 ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
 M:     Lennert Buytenhek <buytenh@marvell.com>
 M:     Nicolas Pitre <nico@marvell.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.marvell.com/orion
 S:     Maintained
 F:     arch/arm/mach-loki/
@@ -719,7 +720,7 @@ F:  arch/arm/plat-orion/
 
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 F:     arch/arm/mach-pxa/mioa701.c
 S:     Maintained
 
@@ -760,18 +761,18 @@ S:        Maintained
 
 ARM/PT DIGITAL BOARD PORT
 M:     Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/RISCPC ARCHITECTURE
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/common/time-acorn.c
@@ -790,7 +791,7 @@ S:  Maintained
 
 ARM/SAMSUNG ARM ARCHITECTURES
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/plat-s3c/
@@ -798,65 +799,65 @@ F:        arch/arm/plat-s3c24xx/
 
 ARM/S3C2410 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c2410/
 
 ARM/S3C2440 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c2440/
 
 ARM/S3C2442 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c2442/
 
 ARM/S3C2443 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c2443/
 
 ARM/S3C6400 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c6400/
 
 ARM/S3C6410 ARM ARCHITECTURE
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/mach-s3c6410/
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/THECUS N2100 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/NUVOTON W90X900 ARM ARCHITECTURE
 M:     Wan ZongShun <mcuos.com@gmail.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.mcuos.com
 S:     Maintained
 
 ARM/VFP SUPPORT
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/vfp/
@@ -894,6 +895,13 @@ F: drivers/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/async_tx.h
 
+AT24 EEPROM DRIVER
+M:     Wolfram Sang <w.sang@pengutronix.de>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/misc/eeprom/at24.c
+F:     include/linux/i2c/at24.h
+
 ATA OVER ETHERNET (AOE) DRIVER
 M:     "Ed L. Cashin" <ecashin@coraid.com>
 W:     http://www.coraid.com/support/linux
@@ -963,7 +971,7 @@ F:  include/linux/atm*
 
 ATMEL AT91 MCI DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.atmel.com/products/AT91/
 W:     http://www.at91.com/
 S:     Maintained
@@ -1541,7 +1549,7 @@ F:        drivers/infiniband/hw/cxgb3/
 
 CYBERPRO FB DRIVER
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     drivers/video/cyber2000fb.*
@@ -2085,7 +2093,7 @@ F:        drivers/i2c/busses/i2c-cpm.c
 FREESCALE IMX / MXC FRAMEBUFFER DRIVER
 M:     Sascha Hauer <kernel@pengutronix.de>
 L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/plat-mxc/include/mach/imxfb.h
 F:     drivers/video/imxfb.c
@@ -2106,12 +2114,12 @@ S:      Supported
 F:     arch/powerpc/sysdev/qe_lib/
 F:     arch/powerpc/include/asm/*qe.h
 
-FREESCALE HIGHSPEED USB DEVICE DRIVER
+FREESCALE USB PERIPHERIAL DRIVERS
 M:     Li Yang <leoli@freescale.com>
 L:     linux-usb@vger.kernel.org
 L:     linuxppc-dev@ozlabs.org
 S:     Maintained
-F:     drivers/usb/gadget/fsl_usb2_udc.c
+F:     drivers/usb/gadget/fsl*
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <leoli@freescale.com>
@@ -2803,6 +2811,8 @@ L:        netdev@vger.kernel.org
 L:     lvs-devel@vger.kernel.org
 S:     Maintained
 F:     Documentation/networking/ipvs-sysctl.txt
+F:     include/net/ip_vs.h
+F:     include/linux/ip_vs.h
 F:     net/netfilter/ipvs/
 
 IPWIRELESS DRIVER
@@ -2955,7 +2965,7 @@ F:        scripts/Makefile.*
 KERNEL JANITORS
 L:     kernel-janitors@vger.kernel.org
 W:     http://www.kerneljanitors.org/
-S:     Odd fixes
+S:     Maintained
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:     "J. Bruce Fields" <bfields@fieldses.org>
@@ -3449,7 +3459,7 @@ F:        include/linux/meye.h
 
 MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
 M:     Pavel Pisa <ppisa@pikron.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/mmc/host/imxmmc.*
 
@@ -3524,7 +3534,6 @@ F:        drivers/net/natsemi.c
 
 NCP FILESYSTEM
 M:     Petr Vandrovec <vandrove@vc.cvut.cz>
-L:     linware@sh.cvut.cz
 S:     Maintained
 F:     fs/ncpfs/
 
@@ -3734,7 +3743,7 @@ W:        http://www.muru.com/linux/omap/
 W:     http://linux.omap.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 S:     Maintained
-F:     arch/arm/*omap*
+F:     arch/arm/*omap*/
 
 OMAP CLOCK FRAMEWORK SUPPORT
 M:     Paul Walmsley <paul@pwsan.com>
@@ -3766,7 +3775,13 @@ OMAP MMC SUPPORT
 M:     Jarkko Lavinen <jarkko.lavinen@nokia.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
-F:     drivers/mmc/host/*omap*
+F:     drivers/mmc/host/omap.c
+
+OMAP HS MMC SUPPORT
+M:     Madhusudhan Chikkature <madhu.cr@ti.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
 M:     Deepak Saxena <dsaxena@plexity.net>
@@ -3956,6 +3971,15 @@ S:       Maintained
 F:     drivers/leds/leds-pca9532.c
 F:     include/linux/leds-pca9532.h
 
+PCA9564/PCA9665 I2C BUS DRIVER
+M:     Wolfram Sang <w.sang@pengutronix.de>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/algos/i2c-algo-pca.c
+F:     drivers/i2c/busses/i2c-pca-*
+F:     include/linux/i2c-algo-pca.h
+F:     include/linux/i2c-pca-platform.h
+
 PCI ERROR RECOVERY
 M:     Linas Vepstas <linas@austin.ibm.com>
 L:     linux-pci@vger.kernel.org
@@ -4000,7 +4024,7 @@ S:        Maintained
 F:     include/linux/delayacct.h
 F:     kernel/delayacct.c
 
-PERFORMANCE COUNTER SUBSYSTEM
+PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:     Paul Mackerras <paulus@samba.org>
 M:     Ingo Molnar <mingo@elte.hu>
@@ -4025,8 +4049,7 @@ F:        drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
 
 PMC SIERRA MaxRAID DRIVER
-P:     Anil Ravindranath
-M:     anil_ravindranath@pmc-sierra.com
+M:     Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.pmc-sierra.com/
 S:     Supported
@@ -4168,7 +4191,7 @@ F:        drivers/media/video/pvrusb2/
 PXA2xx/PXA3xx SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
 M:     Russell King <linux@arm.linux.org.uk>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-pxa/
 F:     drivers/pcmcia/pxa2xx*
@@ -4181,13 +4204,13 @@ F:      sound/soc/pxa
 PXA168 SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
 M:     Jason Chagas <jason.chagas@marvell.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 S:     Maintained
 
 PXA910 SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 S:     Maintained
 
@@ -4428,7 +4451,7 @@ F:        net/iucv/
 
 S3C24XX SD/MMC Driver
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/mmc/host/s3cmci.*
 
@@ -4458,7 +4481,7 @@ SCORE ARCHITECTURE
 P:     Chen Liqin
 M:     liqin.chen@sunplusct.com
 P:     Lennox Wu
-M:     lennox.wu@sunplusct.com
+M:     lennox.wu@gmail.com
 W:     http://www.sunplusct.com
 S:     Supported
 
@@ -4533,20 +4556,20 @@ S:      Maintained
 F:     drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
-M:     Pierre Ossman <pierre@ossman.eu>
-L:     sdhci-devel@lists.ossman.eu
-S:     Maintained
+S:     Orphan
+L:     linux-mmc@vger.kernel.org
+F:     drivers/mmc/host/sdhci.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:     Anton Vorontsov <avorontsov@ru.mvista.com>
 L:     linuxppc-dev@ozlabs.org
-L:     sdhci-devel@lists.ossman.eu
+L:     linux-mmc@vger.kernel.org
 S:     Maintained
-F:     drivers/mmc/host/sdhci.*
+F:     drivers/mmc/host/sdhci-of.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:     Ben Dooks <ben-linux@fluff.org>
-L:     sdhci-devel@lists.ossman.eu
+L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci-s3c.c
 
@@ -4632,7 +4655,7 @@ F:        drivers/misc/sgi-xp/
 SHARP LH SUPPORT (LH7952X & LH7A40X)
 M:     Marc Singer <elf@buici.com>
 W:     http://projects.buici.com/arm
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
 F:     arch/arm/mach-lh7a40x/
@@ -5058,6 +5081,11 @@ T:       quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches
 S:     Maintained
 F:     security/tomoyo/
 
+TOPSTAR LAPTOP EXTRAS DRIVER
+M:     Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+S:     Maintained
+F:     drivers/platform/x86/topstar-laptop.c
+
 TOSHIBA ACPI EXTRAS DRIVER
 S:     Orphan
 F:     drivers/platform/x86/toshiba_acpi.c
@@ -5650,6 +5678,12 @@ L:       linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/wd7000.c
 
+WINBOND CIR DRIVER
+P:     David Härdeman
+M:     david@hardeman.nu
+S:     Maintained
+F:     drivers/input/misc/winbond-cir.c
+
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
@@ -5669,8 +5703,7 @@ S:        Maintained
 F:     drivers/input/misc/wistron_btns.c
 
 WL1251 WIRELESS DRIVER
-P:     Kalle Valo
-M:     kalle.valo@nokia.com
+M:     Kalle Valo <kalle.valo@nokia.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
index 9fb8aae..4434481 100644 (file)
@@ -45,6 +45,14 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
+config ARCH_USES_GETTIMEOFFSET
+       bool
+       default y
+
 config ZONE_DMA
        bool
        default y
index ef18382..9d0727d 100644 (file)
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
     ofd = 1;
     if (i < argc) {
        ofd = open(argv[i++], O_WRONLY | O_CREAT | O_TRUNC, 0666);
-       if (fd == -1) {
+       if (ofd == -1) {
            perror("open");
            exit(1);
        }
index 8897146..242c09b 100644 (file)
@@ -1,17 +1,9 @@
 #ifndef _ALPHA_HARDIRQ_H
 #define _ALPHA_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-       unsigned long __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
 void ack_bad_irq(unsigned int irq);
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
 
 #endif /* _ALPHA_HARDIRQ_H */
index 90d7c35..99c56d4 100644 (file)
@@ -28,6 +28,8 @@
 #define MAP_NORESERVE  0x10000         /* don't check for reservations */
 #define MAP_POPULATE   0x20000         /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x40000         /* do not block on IO */
+#define MAP_STACK      0x80000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x100000        /* create a huge page mapping */
 
 #define MS_ASYNC       1               /* sync memory asynchronously */
 #define MS_SYNC                2               /* synchronous memory sync */
@@ -48,6 +50,9 @@
 #define MADV_DONTFORK  10              /* don't inherit across fork */
 #define MADV_DOFORK    11              /* do inherit across fork */
 
+#define MADV_MERGEABLE   12            /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 13            /* KSM may not merge identical pages */
+
 /* compatibility flags */
 #define MAP_FILE       0
 
index bfb880a..d15aedf 100644 (file)
@@ -268,11 +268,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,
           assume it doesn't support sg mapping, and, since we tried to
           use direct_map above, it now must be considered an error. */
        if (! alpha_mv.mv_pci_tbi) {
-               static int been_here = 0; /* Only print the message once. */
-               if (!been_here) {
-                   printk(KERN_WARNING "pci_map_single: no HW sg\n");
-                   been_here = 1;
-               }
+               printk_once(KERN_WARNING "pci_map_single: no HW sg\n");
                return 0;
        }
 
index b04e2cb..5d08266 100644 (file)
@@ -408,28 +408,17 @@ time_init(void)
  * part.  So we can't do the "find absolute time in terms of cycles" thing
  * that the other ports do.
  */
-void
-do_gettimeofday(struct timeval *tv)
+u32 arch_gettimeoffset(void)
 {
-       unsigned long flags;
-       unsigned long sec, usec, seq;
-       unsigned long delta_cycles, delta_usec, partial_tick;
-
-       do {
-               seq = read_seqbegin_irqsave(&xtime_lock, flags);
-
-               delta_cycles = rpcc() - state.last_time;
-               sec = xtime.tv_sec;
-               usec = (xtime.tv_nsec / 1000);
-               partial_tick = state.partial_tick;
-
-       } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
 #ifdef CONFIG_SMP
        /* Until and unless we figure out how to get cpu cycle counters
           in sync and keep them there, we can't use the rpcc tricks.  */
-       delta_usec = 0;
+       return 0;
 #else
+       unsigned long delta_cycles, delta_usec, partial_tick;
+
+       delta_cycles = rpcc() - state.last_time;
+       partial_tick = state.partial_tick;
        /*
         * usec = cycles * ticks_per_cycle * 2**48 * 1e6 / (2**48 * ticks)
         *      = cycles * (s_t_p_c) * 1e6 / (2**48 * ticks)
@@ -446,64 +435,10 @@ do_gettimeofday(struct timeval *tv)
        delta_usec = (delta_cycles * state.scaled_ticks_per_cycle 
                      + partial_tick) * 15625;
        delta_usec = ((delta_usec / ((1UL << (FIX_SHIFT-6-1)) * HZ)) + 1) / 2;
+       return delta_usec * 1000;
 #endif
-
-       usec += delta_usec;
-       if (usec >= 1000000) {
-               sec += 1;
-               usec -= 1000000;
-       }
-
-       tv->tv_sec = sec;
-       tv->tv_usec = usec;
 }
 
-EXPORT_SYMBOL(do_gettimeofday);
-
-int
-do_settimeofday(struct timespec *tv)
-{
-       time_t wtm_sec, sec = tv->tv_sec;
-       long wtm_nsec, nsec = tv->tv_nsec;
-       unsigned long delta_nsec;
-
-       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-               return -EINVAL;
-
-       write_seqlock_irq(&xtime_lock);
-
-       /* The offset that is added into time in do_gettimeofday above
-          must be subtracted out here to keep a coherent view of the
-          time.  Without this, a full-tick error is possible.  */
-
-#ifdef CONFIG_SMP
-       delta_nsec = 0;
-#else
-       delta_nsec = rpcc() - state.last_time;
-       delta_nsec = (delta_nsec * state.scaled_ticks_per_cycle 
-                     + state.partial_tick) * 15625;
-       delta_nsec = ((delta_nsec / ((1UL << (FIX_SHIFT-6-1)) * HZ)) + 1) / 2;
-       delta_nsec *= 1000;
-#endif
-
-       nsec -= delta_nsec;
-
-       wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-       wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-       set_normalized_timespec(&xtime, sec, nsec);
-       set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-       ntp_clear();
-
-       write_sequnlock_irq(&xtime_lock);
-       clock_was_set();
-       return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
-
 /*
  * In order to set the CMOS clock precisely, set_rtc_mmss has to be
  * called 500 ms after the second nowtime has started, because when
index af71d38..a0902c2 100644 (file)
@@ -299,7 +299,7 @@ printk_memory_info(void)
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
 
        printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, %luk data, %luk init)\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               max_mapnr << (PAGE_SHIFT-10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT-10),
index 0eab557..10b4035 100644 (file)
@@ -349,7 +349,7 @@ void __init mem_init(void)
 
        printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, "
               "%luk data, %luk init)\n",
-              (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               num_physpages << (PAGE_SHIFT-10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT-10),
index 7350557..5466112 100644 (file)
@@ -25,7 +25,7 @@ KBUILD_CFLAGS +=$(call cc-option,-marm,)
 # Select a platform tht is kept up-to-date
 KBUILD_DEFCONFIG := versatile_defconfig
 
-# defines filename extension depending memory manement type.
+# defines filename extension depending memory management type.
 ifeq ($(CONFIG_MMU),)
 MMUEXT         := -nommu
 endif
index 672f6db..a1657b7 100644 (file)
@@ -875,7 +875,7 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y
 CONFIG_FB_OMAP_LCDC_HWA742=y
 # CONFIG_FB_OMAP_LCDC_BLIZZARD is not set
 CONFIG_FB_OMAP_MANUAL_UPDATE=y
-# CONFIG_FB_OMAP_LCD_MIPID is not set
+CONFIG_FB_OMAP_LCD_MIPID=y
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 # CONFIG_FB_OMAP_DMA_TUNE is not set
index 51c0fa8..357d402 100644 (file)
@@ -778,7 +778,33 @@ CONFIG_DAB=y
 #
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -791,6 +817,25 @@ CONFIG_DAB=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB_SUPPORT=y
index 9a510ea..8a4a7e2 100644 (file)
@@ -1313,8 +1313,33 @@ CONFIG_DVB_ISL6421=m
 # Graphics support
 #
 # CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -1331,6 +1356,16 @@ CONFIG_DISPLAY_SUPPORT=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SND=y
index 679a4a3..b9c4891 100644 (file)
@@ -690,6 +690,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
+CONFIG_GPIO_TWL4030=y
 
 #
 # PCI GPIO expanders:
@@ -742,6 +743,7 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+CONFIG_TWL4030_CORE=y
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
@@ -767,8 +769,46 @@ CONFIG_DAB=y
 #
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
-# CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_OMAP=y
+CONFIG_FB_OMAP_LCD_VGA=y
+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
 
 #
 # Display device support
@@ -780,6 +820,16 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SEQUENCER is not set
index fc26976..8eebf89 100644 (file)
@@ -1,17 +1 @@
-#ifndef __ARM_MMAN_H__
-#define __ARM_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) page tables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __ARM_MMAN_H__ */
+#include <asm-generic/mman.h>
index 9122c9e..89f7ead 100644 (file)
 #define __NR_preadv                    (__NR_SYSCALL_BASE+361)
 #define __NR_pwritev                   (__NR_SYSCALL_BASE+362)
 #define __NR_rt_tgsigqueueinfo         (__NR_SYSCALL_BASE+363)
-#define __NR_perf_counter_open         (__NR_SYSCALL_BASE+364)
+#define __NR_perf_event_open           (__NR_SYSCALL_BASE+364)
 
 /*
  * The following SWIs are ARM private.
index ecfa989..fafce1b 100644 (file)
                CALL(sys_preadv)
                CALL(sys_pwritev)
                CALL(sys_rt_tgsigqueueinfo)
-               CALL(sys_perf_counter_open)
+               CALL(sys_perf_event_open)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
index a24d824..e35d54d 100644 (file)
@@ -289,6 +289,13 @@ config MACH_NEOCORE926
        help
          Select this if you are using the Adeneo Neocore 926 board.
 
+config MACH_AT91SAM9G20EK_2MMC
+       bool "Atmel AT91SAM9G20-EK Evaluation Kit modified for 2 MMC Slots"
+       depends on ARCH_AT91SAM9G20
+       help
+         Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit
+         Rev A or B modified for 2 MMC Slots.
+
 endif
 
 # ----------------------------------------------------------
index a6ed015..ada440a 100644 (file)
@@ -59,6 +59,7 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK)       += board-sam9rlek.o
 
 # AT91SAM9G20 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
+obj-$(CONFIG_MACH_AT91SAM9G20EK_2MMC) += board-sam9g20ek-2slot-mmc.o
 obj-$(CONFIG_MACH_CPU9G20)     += board-cpu9krea.o
 
 # AT91SAM9G45 board-specific support
index ee4ea0e..07eb7b0 100644 (file)
@@ -278,6 +278,102 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
 void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
 #endif
 
+/* --------------------------------------------------------------------
+ *  MMC / SD Slot for Atmel MCI Driver
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
+static u64 mmc_dmamask = DMA_BIT_MASK(32);
+static struct mci_platform_data mmc_data;
+
+static struct resource mmc_resources[] = {
+       [0] = {
+               .start  = AT91SAM9260_BASE_MCI,
+               .end    = AT91SAM9260_BASE_MCI + SZ_16K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = AT91SAM9260_ID_MCI,
+               .end    = AT91SAM9260_ID_MCI,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device at91sam9260_mmc_device = {
+       .name           = "atmel_mci",
+       .id             = -1,
+       .dev            = {
+                               .dma_mask               = &mmc_dmamask,
+                               .coherent_dma_mask      = DMA_BIT_MASK(32),
+                               .platform_data          = &mmc_data,
+       },
+       .resource       = mmc_resources,
+       .num_resources  = ARRAY_SIZE(mmc_resources),
+};
+
+void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
+{
+       unsigned int i;
+       unsigned int slot_count = 0;
+
+       if (!data)
+               return;
+
+       for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+               if (data->slot[i].bus_width) {
+                       /* input/irq */
+                       if (data->slot[i].detect_pin) {
+                               at91_set_gpio_input(data->slot[i].detect_pin, 1);
+                               at91_set_deglitch(data->slot[i].detect_pin, 1);
+                       }
+                       if (data->slot[i].wp_pin)
+                               at91_set_gpio_input(data->slot[i].wp_pin, 1);
+
+                       switch (i) {
+                       case 0:
+                               /* CMD */
+                               at91_set_A_periph(AT91_PIN_PA7, 1);
+                               /* DAT0, maybe DAT1..DAT3 */
+                               at91_set_A_periph(AT91_PIN_PA6, 1);
+                               if (data->slot[i].bus_width == 4) {
+                                       at91_set_A_periph(AT91_PIN_PA9, 1);
+                                       at91_set_A_periph(AT91_PIN_PA10, 1);
+                                       at91_set_A_periph(AT91_PIN_PA11, 1);
+                               }
+                               slot_count++;
+                               break;
+                       case 1:
+                               /* CMD */
+                               at91_set_B_periph(AT91_PIN_PA1, 1);
+                               /* DAT0, maybe DAT1..DAT3 */
+                               at91_set_B_periph(AT91_PIN_PA0, 1);
+                               if (data->slot[i].bus_width == 4) {
+                                       at91_set_B_periph(AT91_PIN_PA5, 1);
+                                       at91_set_B_periph(AT91_PIN_PA4, 1);
+                                       at91_set_B_periph(AT91_PIN_PA3, 1);
+                               }
+                               slot_count++;
+                               break;
+                       default:
+                               printk(KERN_ERR
+                                       "AT91: SD/MMC slot %d not available\n", i);
+                               break;
+                       }
+               }
+       }
+
+       if (slot_count) {
+               /* CLK */
+               at91_set_A_periph(AT91_PIN_PA8, 0);
+
+               mmc_data = *data;
+               platform_device_register(&at91sam9260_mmc_device);
+       }
+}
+#else
+void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) {}
+#endif
+
 
 /* --------------------------------------------------------------------
  *  NAND / SmartMedia
index 61e52b6..50667be 100644 (file)
@@ -53,7 +53,7 @@ static void __init afeb9260_map_io(void)
        /* Initialize processor: 18.432 MHz crystal */
        at91sam9260_initialize(18432000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
index d3ba29c..02138af 100644 (file)
@@ -50,7 +50,7 @@ static void __init cam60_map_io(void)
        /* Initialize processor: 10 MHz crystal */
        at91sam9260_initialize(10000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* set serial console to ttyS0 (ie, DBGU) */
index 9ba7ba2..8c0b71c 100644 (file)
@@ -56,7 +56,7 @@ static void __init neocore926_map_io(void)
        /* Initialize processor: 20 MHz crystal */
        at91sam9263_initialize(20000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
index 4cff9a7..664938e 100644 (file)
@@ -53,7 +53,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 12.000 MHz crystal */
        at91sam9260_initialize(12000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
index 93a0f8b..ba9d501 100644 (file)
@@ -54,7 +54,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 18.432 MHz crystal */
        at91sam9260_initialize(18432000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
index f9b1999..c4c8865 100644 (file)
@@ -61,7 +61,7 @@ static void __init ek_map_io(void)
        /* Setup the LEDs */
        at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* set serial console to ttyS0 (ie, DBGU) */
index 1bf7bd4..26f1aa6 100644 (file)
@@ -57,7 +57,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 16.367 MHz crystal */
        at91sam9263_initialize(16367660);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
diff --git a/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c b/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c
new file mode 100644 (file)
index 0000000..a28e53f
--- /dev/null
@@ -0,0 +1,277 @@
+/*
+ *  Copyright (C) 2005 SAN People
+ *  Copyright (C) 2008 Atmel
+ *  Copyright (C) 2009 Rob Emanuele
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/at73c213.h>
+#include <linux/clk.h>
+
+#include <mach/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9_smc.h>
+
+#include "sam9_smc.h"
+#include "generic.h"
+
+
+static void __init ek_map_io(void)
+{
+       /* Initialize processor: 18.432 MHz crystal */
+       at91sam9260_initialize(18432000);
+
+       /* DGBU on ttyS0. (Rx & Tx only) */
+       at91_register_uart(0, 0, 0);
+
+       /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
+       at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
+                          | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
+                          | ATMEL_UART_RI);
+
+       /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
+       at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
+
+       /* set serial console to ttyS0 (ie, DBGU) */
+       at91_set_serial_console(0);
+}
+
+static void __init ek_init_irq(void)
+{
+       at91sam9260_init_interrupts(NULL);
+}
+
+
+/*
+ * USB Host port
+ */
+static struct at91_usbh_data __initdata ek_usbh_data = {
+       .ports          = 2,
+};
+
+/*
+ * USB Device port
+ */
+static struct at91_udc_data __initdata ek_udc_data = {
+       .vbus_pin       = AT91_PIN_PC5,
+       .pullup_pin     = 0,            /* pull-up driven by UDC */
+};
+
+
+/*
+ * SPI devices.
+ */
+static struct spi_board_info ek_spi_devices[] = {
+#if !defined(CONFIG_MMC_ATMELMCI)
+       {       /* DataFlash chip */
+               .modalias       = "mtd_dataflash",
+               .chip_select    = 1,
+               .max_speed_hz   = 15 * 1000 * 1000,
+               .bus_num        = 0,
+       },
+#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
+       {       /* DataFlash card */
+               .modalias       = "mtd_dataflash",
+               .chip_select    = 0,
+               .max_speed_hz   = 15 * 1000 * 1000,
+               .bus_num        = 0,
+       },
+#endif
+#endif
+};
+
+
+/*
+ * MACB Ethernet device
+ */
+static struct at91_eth_data __initdata ek_macb_data = {
+       .phy_irq_pin    = AT91_PIN_PC12,
+       .is_rmii        = 1,
+};
+
+
+/*
+ * NAND flash
+ */
+static struct mtd_partition __initdata ek_nand_partition[] = {
+       {
+               .name   = "Bootstrap",
+               .offset = 0,
+               .size   = 4 * SZ_1M,
+       },
+       {
+               .name   = "Partition 1",
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 60 * SZ_1M,
+       },
+       {
+               .name   = "Partition 2",
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
+{
+       *num_partitions = ARRAY_SIZE(ek_nand_partition);
+       return ek_nand_partition;
+}
+
+/* det_pin is not connected */
+static struct atmel_nand_data __initdata ek_nand_data = {
+       .ale            = 21,
+       .cle            = 22,
+       .rdy_pin        = AT91_PIN_PC13,
+       .enable_pin     = AT91_PIN_PC14,
+       .partition_info = nand_partitions,
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
+       .bus_width_16   = 1,
+#else
+       .bus_width_16   = 0,
+#endif
+};
+
+static struct sam9_smc_config __initdata ek_nand_smc_config = {
+       .ncs_read_setup         = 0,
+       .nrd_setup              = 2,
+       .ncs_write_setup        = 0,
+       .nwe_setup              = 2,
+
+       .ncs_read_pulse         = 4,
+       .nrd_pulse              = 4,
+       .ncs_write_pulse        = 4,
+       .nwe_pulse              = 4,
+
+       .read_cycle             = 7,
+       .write_cycle            = 7,
+
+       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
+       .tdf_cycles             = 3,
+};
+
+static void __init ek_add_device_nand(void)
+{
+       /* setup bus-width (8 or 16) */
+       if (ek_nand_data.bus_width_16)
+               ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
+       else
+               ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
+
+       /* configure chip-select 3 (NAND) */
+       sam9_smc_configure(3, &ek_nand_smc_config);
+
+       at91_add_device_nand(&ek_nand_data);
+}
+
+
+/*
+ * MCI (SD/MMC)
+ * det_pin and wp_pin are not connected
+ */
+#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
+static struct mci_platform_data __initdata ek_mmc_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = -ENODEV,
+               .wp_pin         = -ENODEV,
+       },
+       .slot[1] = {
+               .bus_width      = 4,
+               .detect_pin     = -ENODEV,
+               .wp_pin         = -ENODEV,
+       },
+
+};
+#else
+static struct amci_platform_data __initdata ek_mmc_data = {
+};
+#endif
+
+/*
+ * LEDs
+ */
+static struct gpio_led ek_leds[] = {
+       {       /* "bottom" led, green, userled1 to be defined */
+               .name                   = "ds5",
+               .gpio                   = AT91_PIN_PB12,
+               .active_low             = 1,
+               .default_trigger        = "none",
+       },
+       {       /* "power" led, yellow */
+               .name                   = "ds1",
+               .gpio                   = AT91_PIN_PB13,
+               .default_trigger        = "heartbeat",
+       }
+};
+
+static struct i2c_board_info __initdata ek_i2c_devices[] = {
+       {
+               I2C_BOARD_INFO("24c512", 0x50),
+       },
+};
+
+
+static void __init ek_board_init(void)
+{
+       /* Serial */
+       at91_add_device_serial();
+       /* USB Host */
+       at91_add_device_usbh(&ek_usbh_data);
+       /* USB Device */
+       at91_add_device_udc(&ek_udc_data);
+       /* SPI */
+       at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
+       /* NAND */
+       ek_add_device_nand();
+       /* Ethernet */
+       at91_add_device_eth(&ek_macb_data);
+       /* MMC */
+       at91_add_device_mci(0, &ek_mmc_data);
+       /* I2C */
+       at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
+       /* LEDs */
+       at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
+       /* PCK0 provides MCLK to the WM8731 */
+       at91_set_B_periph(AT91_PIN_PC1, 0);
+       /* SSC (for WM8731) */
+       at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
+}
+
+MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
+       /* Maintainer: Rob Emanuele */
+       .phys_io        = AT91_BASE_SYS,
+       .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+       .boot_params    = AT91_SDRAM_BASE + 0x100,
+       .timer          = &at91sam926x_timer,
+       .map_io         = ek_map_io,
+       .init_irq       = ek_init_irq,
+       .init_machine   = ek_board_init,
+MACHINE_END
index ca470d5..29cf831 100644 (file)
@@ -50,7 +50,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 18.432 MHz crystal */
        at91sam9260_initialize(18432000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
index 9d07679..94ffb5c 100644 (file)
@@ -43,7 +43,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 12.000 MHz crystal */
        at91sam9rl_initialize(12000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */
index d13304c..905d6ef 100644 (file)
@@ -53,7 +53,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 12.000 MHz crystal */
        at91sam9260_initialize(12000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* set serial console to ttyS0 (ie, DBGU) */
index d96405b..b6a3480 100644 (file)
@@ -52,7 +52,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 12.00 MHz crystal */
        at91sam9263_initialize(12000000);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* set serial console to ttyS0 (ie, DBGU) */
index 13f27a4..583f38a 100644 (file)
@@ -37,6 +37,7 @@
 #include <linux/leds.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
+#include <linux/atmel-mci.h>
 #include <sound/atmel-ac97c.h>
 
  /* USB Device */
@@ -64,6 +65,7 @@ struct at91_cf_data {
 extern void __init at91_add_device_cf(struct at91_cf_data *data);
 
  /* MMC / SD */
+  /* at91_mci platform config */
 struct at91_mmc_data {
        u8              det_pin;        /* card detect IRQ */
        unsigned        slot_b:1;       /* uses Slot B */
@@ -73,6 +75,9 @@ struct at91_mmc_data {
 };
 extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);
 
+  /* atmel-mci platform config */
+extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data);
+
  /* Ethernet (EMAC & MACB) */
 struct at91_eth_data {
        u32             phy_mask;
index 3dd0e2a..dda19cd 100644 (file)
@@ -37,7 +37,7 @@ struct clk {
 static unsigned long get_uart_rate(struct clk *clk);
 
 static int set_keytchclk_rate(struct clk *clk, unsigned long rate);
-
+static int set_div_rate(struct clk *clk, unsigned long rate);
 
 static struct clk clk_uart1 = {
        .sw_locked      = 1,
@@ -76,6 +76,13 @@ static struct clk clk_pwm = {
        .rate           = EP93XX_EXT_CLK_RATE,
 };
 
+static struct clk clk_video = {
+       .sw_locked      = 1,
+       .enable_reg     = EP93XX_SYSCON_VIDCLKDIV,
+       .enable_mask    = EP93XX_SYSCON_CLKDIV_ENABLE,
+       .set_rate       = set_div_rate,
+};
+
 /* DMA Clocks */
 static struct clk clk_m2p0 = {
        .enable_reg     = EP93XX_SYSCON_PWRCNT,
@@ -140,6 +147,7 @@ static struct clk_lookup clocks[] = {
        INIT_CK(NULL,                   "pll2",         &clk_pll2),
        INIT_CK("ep93xx-ohci",          NULL,           &clk_usb_host),
        INIT_CK("ep93xx-keypad",        NULL,           &clk_keypad),
+       INIT_CK("ep93xx-fb",            NULL,           &clk_video),
        INIT_CK(NULL,                   "pwm_clk",      &clk_pwm),
        INIT_CK(NULL,                   "m2p0",         &clk_m2p0),
        INIT_CK(NULL,                   "m2p1",         &clk_m2p1),
@@ -236,6 +244,84 @@ static int set_keytchclk_rate(struct clk *clk, unsigned long rate)
        return 0;
 }
 
+static unsigned long calc_clk_div(unsigned long rate, int *psel, int *esel,
+                                 int *pdiv, int *div)
+{
+       unsigned long max_rate, best_rate = 0,
+               actual_rate = 0, mclk_rate = 0, rate_err = -1;
+       int i, found = 0, __div = 0, __pdiv = 0;
+
+       /* Don't exceed the maximum rate */
+       max_rate = max(max(clk_pll1.rate / 4, clk_pll2.rate / 4),
+                      (unsigned long)EP93XX_EXT_CLK_RATE / 4);
+       rate = min(rate, max_rate);
+
+       /*
+        * Try the two pll's and the external clock
+        * Because the valid predividers are 2, 2.5 and 3, we multiply
+        * all the clocks by 2 to avoid floating point math.
+        *
+        * This is based on the algorithm in the ep93xx raster guide:
+        * http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf
+        *
+        */
+       for (i = 0; i < 3; i++) {
+               if (i == 0)
+                       mclk_rate = EP93XX_EXT_CLK_RATE * 2;
+               else if (i == 1)
+                       mclk_rate = clk_pll1.rate * 2;
+               else if (i == 2)
+                       mclk_rate = clk_pll2.rate * 2;
+
+               /* Try each predivider value */
+               for (__pdiv = 4; __pdiv <= 6; __pdiv++) {
+                       __div = mclk_rate / (rate * __pdiv);
+                       if (__div < 2 || __div > 127)
+                               continue;
+
+                       actual_rate = mclk_rate / (__pdiv * __div);
+
+                       if (!found || abs(actual_rate - rate) < rate_err) {
+                               *pdiv = __pdiv - 3;
+                               *div = __div;
+                               *psel = (i == 2);
+                               *esel = (i != 0);
+                               best_rate = actual_rate;
+                               rate_err = abs(actual_rate - rate);
+                               found = 1;
+                       }
+               }
+       }
+
+       if (!found)
+               return 0;
+
+       return best_rate;
+}
+
+static int set_div_rate(struct clk *clk, unsigned long rate)
+{
+       unsigned long actual_rate;
+       int psel = 0, esel = 0, pdiv = 0, div = 0;
+       u32 val;
+
+       actual_rate = calc_clk_div(rate, &psel, &esel, &pdiv, &div);
+       if (actual_rate == 0)
+               return -EINVAL;
+       clk->rate = actual_rate;
+
+       /* Clear the esel, psel, pdiv and div bits */
+       val = __raw_readl(clk->enable_reg);
+       val &= ~0x7fff;
+
+       /* Set the new esel, psel, pdiv and div bits for the new clock rate */
+       val |= (esel ? EP93XX_SYSCON_CLKDIV_ESEL : 0) |
+               (psel ? EP93XX_SYSCON_CLKDIV_PSEL : 0) |
+               (pdiv << EP93XX_SYSCON_CLKDIV_PDIV_SHIFT) | div;
+       ep93xx_syscon_swlocked_write(val, clk->enable_reg);
+       return 0;
+}
+
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
        if (clk->set_rate)
index 16b92c3..f7ebed9 100644 (file)
@@ -30,6 +30,7 @@
 #include <linux/i2c-gpio.h>
 
 #include <mach/hardware.h>
+#include <mach/fb.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -682,6 +683,37 @@ void ep93xx_pwm_release_gpio(struct platform_device *pdev)
 EXPORT_SYMBOL(ep93xx_pwm_release_gpio);
 
 
+/*************************************************************************
+ * EP93xx video peripheral handling
+ *************************************************************************/
+static struct ep93xxfb_mach_info ep93xxfb_data;
+
+static struct resource ep93xx_fb_resource[] = {
+       {
+               .start          = EP93XX_RASTER_PHYS_BASE,
+               .end            = EP93XX_RASTER_PHYS_BASE + 0x800 - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device ep93xx_fb_device = {
+       .name                   = "ep93xx-fb",
+       .id                     = -1,
+       .dev                    = {
+               .platform_data  = &ep93xxfb_data,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .dma_mask               = &ep93xx_fb_device.dev.coherent_dma_mask,
+       },
+       .num_resources          = ARRAY_SIZE(ep93xx_fb_resource),
+       .resource               = ep93xx_fb_resource,
+};
+
+void __init ep93xx_register_fb(struct ep93xxfb_mach_info *data)
+{
+       ep93xxfb_data = *data;
+       platform_device_register(&ep93xx_fb_device);
+}
+
 extern void ep93xx_gpio_init(void);
 
 void __init ep93xx_init_devices(void)
index ea78e90..0fbf87b 100644 (file)
@@ -70,6 +70,7 @@
 #define EP93XX_USB_PHYS_BASE           (EP93XX_AHB_PHYS_BASE + 0x00020000)
 #define EP93XX_USB_BASE                        EP93XX_AHB_IOMEM(0x00020000)
 
+#define EP93XX_RASTER_PHYS_BASE                (EP93XX_AHB_PHYS_BASE + 0x00030000)
 #define EP93XX_RASTER_BASE             EP93XX_AHB_IOMEM(0x00030000)
 
 #define EP93XX_GRAPHICS_ACCEL_BASE     EP93XX_AHB_IOMEM(0x00040000)
 #define EP93XX_SYSCON_DEVCFG_ADCPD     (1<<2)
 #define EP93XX_SYSCON_DEVCFG_KEYS      (1<<1)
 #define EP93XX_SYSCON_DEVCFG_SHENA     (1<<0)
+#define EP93XX_SYSCON_VIDCLKDIV                EP93XX_SYSCON_REG(0x84)
+#define EP93XX_SYSCON_CLKDIV_ENABLE    (1<<15)
+#define EP93XX_SYSCON_CLKDIV_ESEL      (1<<14)
+#define EP93XX_SYSCON_CLKDIV_PSEL      (1<<13)
+#define EP93XX_SYSCON_CLKDIV_PDIV_SHIFT        8
 #define EP93XX_SYSCON_KEYTCHCLKDIV     EP93XX_SYSCON_REG(0x90)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_TSEN        (1<<31)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV        (1<<16)
diff --git a/arch/arm/mach-ep93xx/include/mach/fb.h b/arch/arm/mach-ep93xx/include/mach/fb.h
new file mode 100644 (file)
index 0000000..d5ae11d
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * arch/arm/mach-ep93xx/include/mach/fb.h
+ */
+
+#ifndef __ASM_ARCH_EP93XXFB_H
+#define __ASM_ARCH_EP93XXFB_H
+
+struct platform_device;
+struct fb_videomode;
+struct fb_info;
+
+#define EP93XXFB_USE_MODEDB            0
+
+/* VideoAttributes flags */
+#define EP93XXFB_STATE_MACHINE_ENABLE  (1 << 0)
+#define EP93XXFB_PIXEL_CLOCK_ENABLE    (1 << 1)
+#define EP93XXFB_VSYNC_ENABLE          (1 << 2)
+#define EP93XXFB_PIXEL_DATA_ENABLE     (1 << 3)
+#define EP93XXFB_COMPOSITE_SYNC                (1 << 4)
+#define EP93XXFB_SYNC_VERT_HIGH                (1 << 5)
+#define EP93XXFB_SYNC_HORIZ_HIGH       (1 << 6)
+#define EP93XXFB_SYNC_BLANK_HIGH       (1 << 7)
+#define EP93XXFB_PCLK_FALLING          (1 << 8)
+#define EP93XXFB_ENABLE_AC             (1 << 9)
+#define EP93XXFB_ENABLE_LCD            (1 << 10)
+#define EP93XXFB_ENABLE_CCIR           (1 << 12)
+#define EP93XXFB_USE_PARALLEL_INTERFACE        (1 << 13)
+#define EP93XXFB_ENABLE_INTERRUPT      (1 << 14)
+#define EP93XXFB_USB_INTERLACE         (1 << 16)
+#define EP93XXFB_USE_EQUALIZATION      (1 << 17)
+#define EP93XXFB_USE_DOUBLE_HORZ       (1 << 18)
+#define EP93XXFB_USE_DOUBLE_VERT       (1 << 19)
+#define EP93XXFB_USE_BLANK_PIXEL       (1 << 20)
+#define EP93XXFB_USE_SDCSN0            (0 << 21)
+#define EP93XXFB_USE_SDCSN1            (1 << 21)
+#define EP93XXFB_USE_SDCSN2            (2 << 21)
+#define EP93XXFB_USE_SDCSN3            (3 << 21)
+
+#define EP93XXFB_ENABLE                        (EP93XXFB_STATE_MACHINE_ENABLE  | \
+                                        EP93XXFB_PIXEL_CLOCK_ENABLE    | \
+                                        EP93XXFB_VSYNC_ENABLE          | \
+                                        EP93XXFB_PIXEL_DATA_ENABLE)
+
+struct ep93xxfb_mach_info {
+       unsigned int                    num_modes;
+       const struct fb_videomode       *modes;
+       const struct fb_videomode       *default_mode;
+       int                             bpp;
+       unsigned int                    flags;
+
+       int     (*setup)(struct platform_device *pdev);
+       void    (*teardown)(struct platform_device *pdev);
+       void    (*blank)(int blank_mode, struct fb_info *info);
+};
+
+#endif /* __ASM_ARCH_EP93XXFB_H */
index 5f5fa65..01a0f08 100644 (file)
@@ -6,6 +6,7 @@
 
 struct i2c_board_info;
 struct platform_device;
+struct ep93xxfb_mach_info;
 
 struct ep93xx_eth_data
 {
@@ -33,6 +34,7 @@ static inline void ep93xx_devcfg_clear_bits(unsigned int bits)
 
 void ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr);
 void ep93xx_register_i2c(struct i2c_board_info *devices, int num);
+void ep93xx_register_fb(struct ep93xxfb_mach_info *data);
 void ep93xx_register_pwm(int pwm0, int pwm1);
 int ep93xx_pwm_acquire_gpio(struct platform_device *pdev);
 void ep93xx_pwm_release_gpio(struct platform_device *pdev);
index e70baa7..e6e8290 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/regulator/machine.h>
 #include <linux/gpio.h>
+#include <linux/mmc/host.h>
 
 #include <mach/mcspi.h>
 #include <mach/mux.h>
@@ -102,6 +103,7 @@ static struct twl4030_hsmmc_info mmc[] = {
                .cover_only     = true,
                .gpio_cd        = 160,
                .gpio_wp        = -EINVAL,
+               .power_saving   = true,
        },
        {
                .name           = "internal",
@@ -109,6 +111,8 @@ static struct twl4030_hsmmc_info mmc[] = {
                .wires          = 8,
                .gpio_cd        = -EINVAL,
                .gpio_wp        = -EINVAL,
+               .nonremovable   = true,
+               .power_saving   = true,
        },
        {}      /* Terminator */
 };
index a2e9156..bcfcfc7 100644 (file)
@@ -257,6 +257,11 @@ static inline void omap_init_sti(void) {}
 #define OMAP2_MCSPI3_BASE              0x480b8000
 #define OMAP2_MCSPI4_BASE              0x480ba000
 
+#define OMAP4_MCSPI1_BASE              0x48098100
+#define OMAP4_MCSPI2_BASE              0x4809a100
+#define OMAP4_MCSPI3_BASE              0x480b8100
+#define OMAP4_MCSPI4_BASE              0x480ba100
+
 static struct omap2_mcspi_platform_config omap2_mcspi1_config = {
        .num_cs         = 4,
 };
@@ -301,7 +306,8 @@ static struct platform_device omap2_mcspi2 = {
        },
 };
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
+       defined(CONFIG_ARCH_OMAP4)
 static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
        .num_cs         = 2,
 };
@@ -325,7 +331,7 @@ static struct platform_device omap2_mcspi3 = {
 };
 #endif
 
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static struct omap2_mcspi_platform_config omap2_mcspi4_config = {
        .num_cs         = 1,
 };
@@ -351,14 +357,25 @@ static struct platform_device omap2_mcspi4 = {
 
 static void omap_init_mcspi(void)
 {
+       if (cpu_is_omap44xx()) {
+               omap2_mcspi1_resources[0].start = OMAP4_MCSPI1_BASE;
+               omap2_mcspi1_resources[0].end   = OMAP4_MCSPI1_BASE + 0xff;
+               omap2_mcspi2_resources[0].start = OMAP4_MCSPI2_BASE;
+               omap2_mcspi2_resources[0].end   = OMAP4_MCSPI2_BASE + 0xff;
+               omap2_mcspi3_resources[0].start = OMAP4_MCSPI3_BASE;
+               omap2_mcspi3_resources[0].end   = OMAP4_MCSPI3_BASE + 0xff;
+               omap2_mcspi4_resources[0].start = OMAP4_MCSPI4_BASE;
+               omap2_mcspi4_resources[0].end   = OMAP4_MCSPI4_BASE + 0xff;
+       }
        platform_device_register(&omap2_mcspi1);
        platform_device_register(&omap2_mcspi2);
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
-       if (cpu_is_omap2430() || cpu_is_omap343x())
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
+       defined(CONFIG_ARCH_OMAP4)
+       if (cpu_is_omap2430() || cpu_is_omap343x() || cpu_is_omap44xx())
                platform_device_register(&omap2_mcspi3);
 #endif
-#ifdef CONFIG_ARCH_OMAP3
-       if (cpu_is_omap343x())
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+       if (cpu_is_omap343x() || cpu_is_omap44xx())
                platform_device_register(&omap2_mcspi4);
 #endif
 }
@@ -397,7 +414,7 @@ static inline void omap_init_sha1_md5(void) { }
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 
 #define MMCHS_SYSCONFIG                        0x0010
 #define MMCHS_SYSCONFIG_SWRESET                (1 << 1)
@@ -424,8 +441,8 @@ static struct platform_device dummy_pdev = {
  **/
 static void __init omap_hsmmc_reset(void)
 {
-       u32 i, nr_controllers = cpu_is_omap34xx() ? OMAP34XX_NR_MMC :
-               OMAP24XX_NR_MMC;
+       u32 i, nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :
+               (cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);
 
        for (i = 0; i < nr_controllers; i++) {
                u32 v, base = 0;
@@ -442,8 +459,21 @@ static void __init omap_hsmmc_reset(void)
                case 2:
                        base = OMAP3_MMC3_BASE;
                        break;
+               case 3:
+                       if (!cpu_is_omap44xx())
+                               return;
+                       base = OMAP4_MMC4_BASE;
+                       break;
+               case 4:
+                       if (!cpu_is_omap44xx())
+                               return;
+                       base = OMAP4_MMC5_BASE;
+                       break;
                }
 
+               if (cpu_is_omap44xx())
+                       base += OMAP4_MMC_REG_OFFSET;
+
                dummy_pdev.id = i;
                dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
                iclk = clk_get(dev, "ick");
@@ -581,11 +611,23 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                        irq = INT_24XX_MMC2_IRQ;
                        break;
                case 2:
-                       if (!cpu_is_omap34xx())
+                       if (!cpu_is_omap44xx() && !cpu_is_omap34xx())
                                return;
                        base = OMAP3_MMC3_BASE;
                        irq = INT_34XX_MMC3_IRQ;
                        break;
+               case 3:
+                       if (!cpu_is_omap44xx())
+                               return;
+                       base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;
+                       irq = INT_44XX_MMC4_IRQ;
+                       break;
+               case 4:
+                       if (!cpu_is_omap44xx())
+                               return;
+                       base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
+                       irq = INT_44XX_MMC5_IRQ;
+                       break;
                default:
                        continue;
                }
@@ -593,8 +635,15 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                if (cpu_is_omap2420()) {
                        size = OMAP2420_MMC_SIZE;
                        name = "mmci-omap";
+               } else if (cpu_is_omap44xx()) {
+                       if (i < 3) {
+                               base += OMAP4_MMC_REG_OFFSET;
+                               irq += IRQ_GIC_START;
+                       }
+                       size = OMAP4_HSMMC_SIZE;
+                       name = "mmci-omap-hs";
                } else {
-                       size = HSMMC_SIZE;
+                       size = OMAP3_HSMMC_SIZE;
                        name = "mmci-omap-hs";
                }
                omap_mmc_add(name, i, base, size, irq, mmc_data[i]);
index 3c04c2f..c9c59a2 100644 (file)
@@ -198,6 +198,18 @@ static int twl_mmc_resume(struct device *dev, int slot)
 #define twl_mmc_resume NULL
 #endif
 
+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
+
+static int twl4030_mmc_get_context_loss(struct device *dev)
+{
+       /* FIXME: PM DPS not implemented yet */
+       return 0;
+}
+
+#else
+#define twl4030_mmc_get_context_loss NULL
+#endif
+
 static int twl_mmc1_set_power(struct device *dev, int slot, int power_on,
                                int vdd)
 {
@@ -328,6 +340,61 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v
        return ret;
 }
 
+static int twl_mmc1_set_sleep(struct device *dev, int slot, int sleep, int vdd,
+                             int cardsleep)
+{
+       struct twl_mmc_controller *c = &hsmmc[0];
+       int mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL;
+
+       return regulator_set_mode(c->vcc, mode);
+}
+
+static int twl_mmc23_set_sleep(struct device *dev, int slot, int sleep, int vdd,
+                              int cardsleep)
+{
+       struct twl_mmc_controller *c = NULL;
+       struct omap_mmc_platform_data *mmc = dev->platform_data;
+       int i, err, mode;
+
+       for (i = 1; i < ARRAY_SIZE(hsmmc); i++) {
+               if (mmc == hsmmc[i].mmc) {
+                       c = &hsmmc[i];
+                       break;
+               }
+       }
+
+       if (c == NULL)
+               return -ENODEV;
+
+       /*
+        * If we don't see a Vcc regulator, assume it's a fixed
+        * voltage always-on regulator.
+        */
+       if (!c->vcc)
+               return 0;
+
+       mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL;
+
+       if (!c->vcc_aux)
+               return regulator_set_mode(c->vcc, mode);
+
+       if (cardsleep) {
+               /* VCC can be turned off if card is asleep */
+               struct regulator *vcc_aux = c->vcc_aux;
+
+               c->vcc_aux = NULL;
+               if (sleep)
+                       err = twl_mmc23_set_power(dev, slot, 0, 0);
+               else
+                       err = twl_mmc23_set_power(dev, slot, 1, vdd);
+               c->vcc_aux = vcc_aux;
+       } else
+               err = regulator_set_mode(c->vcc, mode);
+       if (err)
+               return err;
+       return regulator_set_mode(c->vcc_aux, mode);
+}
+
 static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;
 
 void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
@@ -390,6 +457,9 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
                } else
                        mmc->slots[0].switch_pin = -EINVAL;
 
+               mmc->get_context_loss_count =
+                               twl4030_mmc_get_context_loss;
+
                /* write protect normally uses an OMAP gpio */
                if (gpio_is_valid(c->gpio_wp)) {
                        gpio_request(c->gpio_wp, "mmc_wp");
@@ -400,6 +470,12 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
                } else
                        mmc->slots[0].gpio_wp = -EINVAL;
 
+               if (c->nonremovable)
+                       mmc->slots[0].nonremovable = 1;
+
+               if (c->power_saving)
+                       mmc->slots[0].power_saving = 1;
+
                /* NOTE:  MMC slots should have a Vcc regulator set up.
                 * This may be from a TWL4030-family chip, another
                 * controllable regulator, or a fixed supply.
@@ -412,6 +488,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
                case 1:
                        /* on-chip level shifting via PBIAS0/PBIAS1 */
                        mmc->slots[0].set_power = twl_mmc1_set_power;
+                       mmc->slots[0].set_sleep = twl_mmc1_set_sleep;
                        break;
                case 2:
                        if (c->ext_clock)
@@ -422,6 +499,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
                case 3:
                        /* off-chip level shifting, or none */
                        mmc->slots[0].set_power = twl_mmc23_set_power;
+                       mmc->slots[0].set_sleep = twl_mmc23_set_sleep;
                        break;
                default:
                        pr_err("MMC%d configuration not supported!\n", c->mmc);
index 3807c45..a47e685 100644 (file)
@@ -12,6 +12,8 @@ struct twl4030_hsmmc_info {
        bool    transceiver;    /* MMC-2 option */
        bool    ext_clock;      /* use external pin for input clock */
        bool    cover_only;     /* No card detect - just cover switch */
+       bool    nonremovable;   /* Nonremovable e.g. eMMC */
+       bool    power_saving;   /* Try to sleep or power off when possible */
        int     gpio_cd;        /* or -EINVAL */
        int     gpio_wp;        /* or -EINVAL */
        char    *name;          /* or NULL for default */
index ea36186..f982606 100644 (file)
@@ -596,8 +596,8 @@ void __init mem_init(void)
 
        printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
                "%dK data, %dK init, %luK highmem)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-               codesize >> 10, datasize >> 10, initsize >> 10,
+               nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
+               datasize >> 10, initsize >> 10,
                (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
 
        if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
diff --git a/arch/arm/plat-mxc/include/mach/spi.h b/arch/arm/plat-mxc/include/mach/spi.h
new file mode 100644 (file)
index 0000000..08be445
--- /dev/null
@@ -0,0 +1,27 @@
+
+#ifndef __MACH_SPI_H_
+#define __MACH_SPI_H_
+
+/*
+ * struct spi_imx_master - device.platform_data for SPI controller devices.
+ * @chipselect: Array of chipselects for this master. Numbers >= 0 mean gpio
+ *              pins, numbers < 0 mean internal CSPI chipselects according
+ *              to MXC_SPI_CS(). Normally you want to use gpio based chip
+ *              selects as the CSPI module tries to be intelligent about
+ *              when to assert the chipselect: The CSPI module deasserts the
+ *              chipselect once it runs out of input data. The other problem
+ *              is that it is not possible to mix between high active and low
+ *              active chipselects on one single bus using the internal
+ *              chipselects. Unfortunately Freescale decided to put some
+ *              chipselects on dedicated pins which are not usable as gpios,
+ *              so we have to support the internal chipselects.
+ * @num_chipselect: ARRAY_SIZE(chipselect)
+ */
+struct spi_imx_master {
+       int     *chipselect;
+       int     num_chipselect;
+};
+
+#define MXC_SPI_CS(no) ((no) - 32)
+
+#endif /* __MACH_SPI_H_*/
index fb7cb77..28a1650 100644 (file)
 #define INT_44XX_FPKA_READY_IRQ        (50 + IRQ_GIC_START)
 #define INT_44XX_SHA1MD51_IRQ  (51 + IRQ_GIC_START)
 #define INT_44XX_RNG_IRQ       (52 + IRQ_GIC_START)
+#define INT_44XX_MMC5_IRQ      (59 + IRQ_GIC_START)
 #define INT_44XX_I2C3_IRQ      (61 + IRQ_GIC_START)
 #define INT_44XX_FPKA_ERROR_IRQ        (64 + IRQ_GIC_START)
 #define INT_44XX_PBIAS_IRQ     (75 + IRQ_GIC_START)
 #define INT_44XX_TLL_IRQ       (78 + IRQ_GIC_START)
 #define INT_44XX_PARTHASH_IRQ  (79 + IRQ_GIC_START)
 #define INT_44XX_MMC3_IRQ      (94 + IRQ_GIC_START)
+#define INT_44XX_MMC4_IRQ      (96 + IRQ_GIC_START)
 
 
 /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and
index f8fbc48..8e52c65 100644 (file)
@@ -16,7 +16,12 @@ enum mipid_test_result {
 struct mipid_platform_data {
        int     nreset_gpio;
        int     data_lines;
+
        void    (*shutdown)(struct mipid_platform_data *pdata);
+       void    (*set_bklight_level)(struct mipid_platform_data *pdata,
+                                    int level);
+       int     (*get_bklight_level)(struct mipid_platform_data *pdata);
+       int     (*get_bklight_max)(struct mipid_platform_data *pdata);
 };
 
 #endif
index 81d5b36..7229b95 100644 (file)
 
 #define OMAP24XX_NR_MMC                2
 #define OMAP34XX_NR_MMC                3
+#define OMAP44XX_NR_MMC                5
 #define OMAP2420_MMC_SIZE      OMAP1_MMC_SIZE
-#define HSMMC_SIZE             0x200
+#define OMAP3_HSMMC_SIZE       0x200
+#define OMAP4_HSMMC_SIZE       0x1000
 #define OMAP2_MMC1_BASE                0x4809c000
 #define OMAP2_MMC2_BASE                0x480b4000
 #define OMAP3_MMC3_BASE                0x480ad000
+#define OMAP4_MMC4_BASE                0x480d1000
+#define OMAP4_MMC5_BASE                0x480d5000
+#define OMAP4_MMC_REG_OFFSET   0x100
+#define HSMMC5                 (1 << 4)
+#define HSMMC4                 (1 << 3)
 #define HSMMC3                 (1 << 2)
 #define HSMMC2                 (1 << 1)
 #define HSMMC1                 (1 << 0)
@@ -59,6 +66,9 @@ struct omap_mmc_platform_data {
        int (*suspend)(struct device *dev, int slot);
        int (*resume)(struct device *dev, int slot);
 
+       /* Return context loss count due to PM states changing */
+       int (*get_context_loss_count)(struct device *dev);
+
        u64 dma_mask;
 
        struct omap_mmc_slot_data {
@@ -80,12 +90,20 @@ struct omap_mmc_platform_data {
                /* use the internal clock */
                unsigned internal_clock:1;
 
+               /* nonremovable e.g. eMMC */
+               unsigned nonremovable:1;
+
+               /* Try to sleep or power off when possible */
+               unsigned power_saving:1;
+
                int switch_pin;                 /* gpio (card detect) */
                int gpio_wp;                    /* gpio (write protect) */
 
                int (* set_bus_mode)(struct device *dev, int slot, int bus_mode);
                int (* set_power)(struct device *dev, int slot, int power_on, int vdd);
                int (* get_ro)(struct device *dev, int slot);
+               int (*set_sleep)(struct device *dev, int slot, int sleep,
+                                int vdd, int cardsleep);
 
                /* return MMC cover switch state, can be NULL if not supported.
                 *
index 7b74d12..b226bdf 100644 (file)
@@ -276,8 +276,8 @@ typedef int (*omapfb_notifier_callback_t)(struct notifier_block *,
                                          void *fbi);
 
 struct omapfb_mem_region {
-       dma_addr_t      paddr;
-       void            *vaddr;
+       u32             paddr;
+       void __iomem    *vaddr;
        unsigned long   size;
        u8              type;           /* OMAPFB_PLANE_MEM_* */
        unsigned        alloc:1;        /* allocated by the driver */
index 9a92b15..8eebf89 100644 (file)
@@ -1,17 +1 @@
-#ifndef __ASM_AVR32_MMAN_H__
-#define __ASM_AVR32_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) page tables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __ASM_AVR32_MMAN_H__ */
+#include <asm-generic/mman.h>
index e819fa6..376f18c 100644 (file)
@@ -141,7 +141,7 @@ void __init mem_init(void)
 
        printk ("Memory: %luk/%luk available (%dk kernel code, "
                "%dk reserved, %dk data, %dk init)\n",
-               (unsigned long)nr_free_pages() << (PAGE_SHIFT - 10),
+               nr_free_pages() << (PAGE_SHIFT - 10),
                totalram_pages << (PAGE_SHIFT - 10),
                codesize >> 10,
                reservedpages << (PAGE_SHIFT - 10),
index e7fd0ec..ae4dae1 100644 (file)
@@ -1,9 +1,6 @@
 #ifndef _BLACKFIN_SECTIONS_H
 #define _BLACKFIN_SECTIONS_H
 
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
 /* only used when MTD_UCLINUX */
 extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;
 
@@ -15,4 +12,39 @@ extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],
        _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],
        _ebss_l2[], _l2_lma_start[];
 
+#include <asm/mem_map.h>
+
+/* Blackfin systems have discontinuous memory map and no virtualized memory */
+static inline int arch_is_kernel_text(unsigned long addr)
+{
+       return
+               (L1_CODE_LENGTH &&
+                addr >= (unsigned long)_stext_l1 &&
+                addr <  (unsigned long)_etext_l1)
+               ||
+               (L2_LENGTH &&
+                addr >= (unsigned long)_stext_l2 &&
+                addr <  (unsigned long)_etext_l2);
+}
+#define arch_is_kernel_text(addr) arch_is_kernel_text(addr)
+
+static inline int arch_is_kernel_data(unsigned long addr)
+{
+       return
+               (L1_DATA_A_LENGTH &&
+                addr >= (unsigned long)_sdata_l1 &&
+                addr <  (unsigned long)_ebss_l1)
+               ||
+               (L1_DATA_B_LENGTH &&
+                addr >= (unsigned long)_sdata_b_l1 &&
+                addr <  (unsigned long)_ebss_b_l1)
+               ||
+               (L2_LENGTH &&
+                addr >= (unsigned long)_sdata_l2 &&
+                addr <  (unsigned long)_ebss_l2);
+}
+#define arch_is_kernel_data(addr) arch_is_kernel_data(addr)
+
+#include <asm-generic/sections.h>
+
 #endif
index c8e7ee4..02b1529 100644 (file)
 #define __NR_preadv            366
 #define __NR_pwritev           367
 #define __NR_rt_tgsigqueueinfo 368
-#define __NR_perf_counter_open 369
+#define __NR_perf_event_open   369
 
 #define __NR_syscall           370
 #define NR_syscalls            __NR_syscall
index bdc330c..1c58914 100644 (file)
 #define        AMBEN_B0_B1     0x0004  /* Enable Asynchronous Memory Banks 0 & 1 only */
 #define        AMBEN_B0_B1_B2  0x0006  /* Enable Asynchronous Memory Banks 0, 1, and 2 */
 #define        AMBEN_ALL       0x0008  /* Enable Asynchronous Memory Banks (all) 0, 1, 2, and 3 */
-#define        CDPRIO          0x0100  /* DMA has priority over core for for external accesses */
+#define        CDPRIO          0x0100  /* DMA has priority over core for external accesses */
 
 /* EBIU_AMGCTL Bit Positions */
 #define        AMCKEN_P                0x0000  /* Enable CLKOUT */
index 01af24c..1e7cac2 100644 (file)
@@ -1620,7 +1620,7 @@ ENTRY(_sys_call_table)
        .long _sys_preadv
        .long _sys_pwritev
        .long _sys_rt_tgsigqueueinfo
-       .long _sys_perf_counter_open
+       .long _sys_perf_event_open
 
        .rept NR_syscalls-(.-_sys_call_table)/4
        .long _sys_ni_syscall
index b7f0afb..8eebf89 100644 (file)
@@ -1,19 +1 @@
-#ifndef __CRIS_MMAN_H__
-#define __CRIS_MMAN_H__
-
-/* verbatim copy of asm-i386/ version */
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __CRIS_MMAN_H__ */
+#include <asm-generic/mman.h>
index 514f46a..ff68b9f 100644 (file)
@@ -54,7 +54,7 @@ mem_init(void)
         printk(KERN_INFO
                "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, "
               "%dk init)\n" ,
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               max_mapnr << (PAGE_SHIFT-10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT-10),
index b86e19c..4b5830b 100644 (file)
@@ -7,7 +7,7 @@ config FRV
        default y
        select HAVE_IDE
        select HAVE_ARCH_TRACEHOOK
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
 
 config ZONE_DMA
        bool
index 58c1d11..8eebf89 100644 (file)
@@ -1,18 +1 @@
-#ifndef __ASM_MMAN_H__
-#define __ASM_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __ASM_MMAN_H__ */
-
+#include <asm-generic/mman.h>
diff --git a/arch/frv/include/asm/perf_counter.h b/arch/frv/include/asm/perf_counter.h
deleted file mode 100644 (file)
index ccf726e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* FRV performance counter support
- *
- * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#ifndef _ASM_PERF_COUNTER_H
-#define _ASM_PERF_COUNTER_H
-
-#define PERF_COUNTER_INDEX_OFFSET      0
-
-#endif /* _ASM_PERF_COUNTER_H */
diff --git a/arch/frv/include/asm/perf_event.h b/arch/frv/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..a69e015
--- /dev/null
@@ -0,0 +1,17 @@
+/* FRV performance event support
+ *
+ * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_PERF_EVENT_H
+#define _ASM_PERF_EVENT_H
+
+#define PERF_EVENT_INDEX_OFFSET        0
+
+#endif /* _ASM_PERF_EVENT_H */
index 4a8fb42..be6ef0f 100644 (file)
 #define __NR_preadv            333
 #define __NR_pwritev           334
 #define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open   336
 
 #ifdef __KERNEL__
 
index fde1e44..189397e 100644 (file)
@@ -1525,6 +1525,6 @@ sys_call_table:
        .long sys_preadv
        .long sys_pwritev
        .long sys_rt_tgsigqueueinfo     /* 335 */
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
 
 syscall_table_size = (. - sys_call_table)
index 0a37721..f470975 100644 (file)
@@ -5,4 +5,4 @@
 lib-y := \
        __ashldi3.o __lshrdi3.o __muldi3.o __ashrdi3.o __negdi2.o __ucmpdi2.o \
        checksum.o memcpy.o memset.o atomic-ops.o atomic64-ops.o \
-       outsl_ns.o outsl_sw.o insl_ns.o insl_sw.o cache.o perf_counter.o
+       outsl_ns.o outsl_sw.o insl_ns.o insl_sw.o cache.o perf_event.o
index 0e10ad8..0c4fb20 100644 (file)
@@ -1,4 +1,4 @@
-/* cache.S: cache managment routines
+/* cache.S: cache management routines
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
diff --git a/arch/frv/lib/perf_counter.c b/arch/frv/lib/perf_counter.c
deleted file mode 100644 (file)
index 2000fee..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Performance counter handling
- *
- * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#include <linux/perf_counter.h>
-
-/*
- * mark the performance counter as pending
- */
-void set_perf_counter_pending(void)
-{
-}
diff --git a/arch/frv/lib/perf_event.c b/arch/frv/lib/perf_event.c
new file mode 100644 (file)
index 0000000..9ac5acf
--- /dev/null
@@ -0,0 +1,19 @@
+/* Performance event handling
+ *
+ * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/perf_event.h>
+
+/*
+ * mark the performance event as pending
+ */
+void set_perf_event_pending(void)
+{
+}
index 9d7f7a7..c2e1aa0 100644 (file)
@@ -1,18 +1,7 @@
 #ifndef __H8300_HARDIRQ_H
 #define __H8300_HARDIRQ_H
 
-#include <linux/kernel.h>
-#include <linux/threads.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-
-typedef struct {
-       unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-extern void ack_bad_irq(unsigned int irq);
+#include <asm/irq.h>
 
 #define HARDIRQ_BITS   8
 
@@ -25,4 +14,6 @@ extern void ack_bad_irq(unsigned int irq);
 # error HARDIRQ_BITS is too low!
 #endif
 
+#include <asm-generic/hardirq.h>
+
 #endif
index cf35f0a..8eebf89 100644 (file)
@@ -1,17 +1 @@
-#ifndef __H8300_MMAN_H__
-#define __H8300_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __H8300_MMAN_H__ */
+#include <asm-generic/mman.h>
index 74f8dd7..5c913d4 100644 (file)
@@ -81,11 +81,6 @@ struct irq_chip h8300irq_chip = {
        .end            = h8300_end_irq,
 };
 
-void ack_bad_irq(unsigned int irq)
-{
-       printk("unexpected IRQ trap at vector %02x\n", irq);
-}
-
 #if defined(CONFIG_RAMKERNEL)
 static unsigned long __init *get_vector_address(void)
 {
index e7c6e61..2193a2e 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
index 011a1cd..6851e52 100644 (file)
@@ -500,6 +500,10 @@ config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y
        depends on NUMA
 
+config ARCH_PROC_KCORE_TEXT
+       def_bool y
+       depends on PROC_KCORE
+
 config IA32_SUPPORT
        bool "Support for Linux/x86 binaries"
        help
index 8cfb001..674a837 100644 (file)
@@ -2026,24 +2026,21 @@ acpi_sba_ioc_add(struct acpi_device *device)
        struct ioc *ioc;
        acpi_status status;
        u64 hpa, length;
-       struct acpi_buffer buffer;
        struct acpi_device_info *dev_info;
 
        status = hp_acpi_csr_space(device->handle, &hpa, &length);
        if (ACPI_FAILURE(status))
                return 1;
 
-       buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
-       status = acpi_get_object_info(device->handle, &buffer);
+       status = acpi_get_object_info(device->handle, &dev_info);
        if (ACPI_FAILURE(status))
                return 1;
-       dev_info = buffer.pointer;
 
        /*
         * For HWP0001, only SBA appears in ACPI namespace.  It encloses the PCI
         * root bridges, and its CSR space includes the IOC function.
         */
-       if (strncmp("HWP0001", dev_info->hardware_id.value, 7) == 0) {
+       if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {
                hpa += ZX1_IOC_OFFSET;
                /* zx1 based systems default to kernel page size iommu pages */
                if (!iovp_shift)
index 16ef61a..625ed8f 100644 (file)
@@ -1270,7 +1270,7 @@ putreg (struct task_struct *child, int regno, unsigned int value)
              case PT_CS:
                if (value != __USER_CS)
                        printk(KERN_ERR
-                              "ia32.putreg: attempt to to set invalid segment register %d = %x\n",
+                              "ia32.putreg: attempt to set invalid segment register %d = %x\n",
                               regno, value);
                break;
              default:
index 48cf8b9..4459028 100644 (file)
@@ -8,19 +8,9 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
  */
 
-#include <asm-generic/mman-common.h>
+#include <asm-generic/mman.h>
 
-#define MAP_GROWSDOWN  0x00100         /* stack-like segment */
-#define MAP_GROWSUP    0x00200         /* register stack-like segment */
-#define MAP_DENYWRITE  0x00800         /* ETXTBSY */
-#define MAP_EXECUTABLE 0x01000         /* mark it as an executable */
-#define MAP_LOCKED     0x02000         /* pages are locked */
-#define MAP_NORESERVE  0x04000         /* don't check for reservations */
-#define MAP_POPULATE   0x08000         /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
+#define MAP_GROWSUP    0x0200          /* register stack-like segment */
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
index b115b3b..1857766 100644 (file)
@@ -617,7 +617,6 @@ mem_init (void)
        long reserved_pages, codesize, datasize, initsize;
        pg_data_t *pgdat;
        int i;
-       static struct kcore_list kcore_mem, kcore_vmem, kcore_kernel;
 
        BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);
        BUG_ON(PTRS_PER_PMD * sizeof(pmd_t) != PAGE_SIZE);
@@ -639,10 +638,6 @@ mem_init (void)
 
        high_memory = __va(max_low_pfn * PAGE_SIZE);
 
-       kclist_add(&kcore_mem, __va(0), max_low_pfn * PAGE_SIZE);
-       kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START);
-       kclist_add(&kcore_kernel, _stext, _end - _stext);
-
        for_each_online_pgdat(pgdat)
                if (pgdat->bdata->node_bootmem_map)
                        totalram_pages += free_all_bootmem_node(pgdat);
@@ -655,7 +650,7 @@ mem_init (void)
        initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
 
        printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
-              "%luk data, %luk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
+              "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
               num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
               reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);
 
index cabba33..c41234f 100644 (file)
@@ -41,6 +41,12 @@ config HZ
        int
        default 100
 
+config GENERIC_TIME
+       def_bool y
+
+config ARCH_USES_GETTIMEOFFSET
+       def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
index cb8aa76..4c31c0a 100644 (file)
@@ -2,14 +2,7 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
-       unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
+#include <asm/irq.h>
 
 #if NR_IRQS > 256
 #define HARDIRQ_BITS   9
@@ -26,11 +19,7 @@ typedef struct {
 # error HARDIRQ_BITS is too low!
 #endif
 
-static inline void ack_bad_irq(int irq)
-{
-       printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
-       BUG();
-}
+#include <asm-generic/hardirq.h>
 
 #endif /* __ASM_HARDIRQ_H */
 #endif /* __KERNEL__ */
index 04a5f40..8eebf89 100644 (file)
@@ -1,17 +1 @@
-#ifndef __M32R_MMAN_H__
-#define __M32R_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __M32R_MMAN_H__ */
+#include <asm-generic/mman.h>
index 98b8feb..98682bb 100644 (file)
@@ -77,7 +77,7 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
        struct user * dummy = NULL;
 #endif
 
-       if ((off & 3) || (off < 0) || (off > sizeof(struct user) - 3))
+       if ((off & 3) || off > sizeof(struct user) - 3)
                return -EIO;
 
        off >>= 2;
@@ -139,8 +139,7 @@ static int ptrace_write_user(struct task_struct *tsk, unsigned long off,
        struct user * dummy = NULL;
 #endif
 
-       if ((off & 3) || off < 0 ||
-           off > sizeof(struct user) - 3)
+       if ((off & 3) || off > sizeof(struct user) - 3)
                return -EIO;
 
        off >>= 2;
index 2547d6c..655ea1c 100644 (file)
@@ -213,7 +213,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                if (!physid_isset(phys_id, phys_cpu_present_map))
                        continue;
 
-               if ((max_cpus >= 0) && (max_cpus <= cpucount + 1))
+               if (max_cpus <= cpucount + 1)
                        continue;
 
                do_boot_cpu(phys_id);
index cada3ba..ba61c4c 100644 (file)
@@ -48,7 +48,7 @@ extern void smp_local_timer_interrupt(void);
 
 static unsigned long latch;
 
-static unsigned long do_gettimeoffset(void)
+u32 arch_gettimeoffset(void)
 {
        unsigned long  elapsed_time = 0;  /* [us] */
 
@@ -93,78 +93,9 @@ static unsigned long do_gettimeoffset(void)
 #error no chip configuration
 #endif
 
-       return elapsed_time;
+       return elapsed_time * 1000;
 }
 
-/*
- * This version of gettimeofday has near microsecond resolution.
- */
-void do_gettimeofday(struct timeval *tv)
-{
-       unsigned long seq;
-       unsigned long usec, sec;
-       unsigned long max_ntp_tick = tick_usec - tickadj;
-
-       do {
-               seq = read_seqbegin(&xtime_lock);
-
-               usec = do_gettimeoffset();
-
-               /*
-                * If time_adjust is negative then NTP is slowing the clock
-                * so make sure not to go into next possible interval.
-                * Better to lose some accuracy than have time go backwards..
-                */
-               if (unlikely(time_adjust < 0))
-                       usec = min(usec, max_ntp_tick);
-
-               sec = xtime.tv_sec;
-               usec += (xtime.tv_nsec / 1000);
-       } while (read_seqretry(&xtime_lock, seq));
-
-       while (usec >= 1000000) {
-               usec -= 1000000;
-               sec++;
-       }
-
-       tv->tv_sec = sec;
-       tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
-       time_t wtm_sec, sec = tv->tv_sec;
-       long wtm_nsec, nsec = tv->tv_nsec;
-
-       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-               return -EINVAL;
-
-       write_seqlock_irq(&xtime_lock);
-       /*
-        * This is revolting. We need to set "xtime" correctly. However, the
-        * value in this location is the value at the most recent update of
-        * wall time.  Discover what correction gettimeofday() would have
-        * made, and then undo it!
-        */
-       nsec -= do_gettimeoffset() * NSEC_PER_USEC;
-
-       wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-       wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-       set_normalized_timespec(&xtime, sec, nsec);
-       set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-       ntp_clear();
-       write_sequnlock_irq(&xtime_lock);
-       clock_was_set();
-
-       return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
 /*
  * In order to set the CMOS clock precisely, set_rtc_mmss has to be
  * called 500 ms after the second nowtime has started, because when
@@ -192,6 +123,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 #ifndef CONFIG_SMP
        profile_tick(CPU_PROFILING);
 #endif
+       /* XXX FIXME. Uh, the xtime_lock should be held here, no? */
        do_timer(1);
 
 #ifndef CONFIG_SMP
index 24d429f..9f581df 100644 (file)
@@ -171,7 +171,7 @@ void __init mem_init(void)
 
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
                "%dk reserved, %dk data, %dk init)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
                reservedpages << (PAGE_SHIFT-10),
index fb87c08..29dd848 100644 (file)
@@ -58,6 +58,12 @@ config HZ
        int
        default 100
 
+config GENERIC_TIME
+       def_bool y
+
+config ARCH_USES_GETTIMEOFFSET
+       def_bool y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
index 394ee94..554f65b 100644 (file)
@@ -1,16 +1,8 @@
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-       unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
 #define HARDIRQ_BITS   8
 
+#include <asm-generic/hardirq.h>
+
 #endif
index 9f5c4c4..8eebf89 100644 (file)
@@ -1,17 +1 @@
-#ifndef __M68K_MMAN_H__
-#define __M68K_MMAN_H__
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* __M68K_MMAN_H__ */
+#include <asm-generic/mman.h>
index 946d869..48b87f5 100644 (file)
 #define __NR_preadv            329
 #define __NR_pwritev           330
 #define __NR_rt_tgsigqueueinfo 331
-#define __NR_perf_counter_open 332
+#define __NR_perf_event_open   332
 
 #ifdef __KERNEL__
 
index 922f52e..c5b3363 100644 (file)
@@ -756,5 +756,5 @@ sys_call_table:
        .long sys_preadv
        .long sys_pwritev               /* 330 */
        .long sys_rt_tgsigqueueinfo
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
 
index 54d9807..17dc2a3 100644 (file)
@@ -91,77 +91,11 @@ void __init time_init(void)
        mach_sched_init(timer_interrupt);
 }
 
-/*
- * This version of gettimeofday has near microsecond resolution.
- */
-void do_gettimeofday(struct timeval *tv)
+u32 arch_gettimeoffset(void)
 {
-       unsigned long flags;
-       unsigned long seq;
-       unsigned long usec, sec;
-       unsigned long max_ntp_tick = tick_usec - tickadj;
-
-       do {
-               seq = read_seqbegin_irqsave(&xtime_lock, flags);
-
-               usec = mach_gettimeoffset();
-
-               /*
-                * If time_adjust is negative then NTP is slowing the clock
-                * so make sure not to go into next possible interval.
-                * Better to lose some accuracy than have time go backwards..
-                */
-               if (unlikely(time_adjust < 0))
-                       usec = min(usec, max_ntp_tick);
-
-               sec = xtime.tv_sec;
-               usec += xtime.tv_nsec/1000;
-       } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-
-       while (usec >= 1000000) {
-               usec -= 1000000;
-               sec++;
-       }
-
-       tv->tv_sec = sec;
-       tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
-       time_t wtm_sec, sec = tv->tv_sec;
-       long wtm_nsec, nsec = tv->tv_nsec;
-
-       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-               return -EINVAL;
-
-       write_seqlock_irq(&xtime_lock);
-       /* This is revolting. We need to set the xtime.tv_nsec
-        * correctly. However, the value in this location is
-        * is value at the last tick.
-        * Discover what correction gettimeofday
-        * would have done, and then undo it!
-        */
-       nsec -= 1000 * mach_gettimeoffset();
-
-       wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-       wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-       set_normalized_timespec(&xtime, sec, nsec);
-       set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-       ntp_clear();
-       write_sequnlock_irq(&xtime_lock);
-       clock_was_set();
-       return 0;
+       return mach_gettimeoffset() * 1000;
 }
 
-EXPORT_SYMBOL(do_settimeofday);
-
-
 static int __init rtc_init(void)
 {
        struct platform_device *pdev;
index 0007b2a..774549a 100644 (file)
@@ -126,7 +126,7 @@ void __init mem_init(void)
 #endif
 
        printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
-              (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               totalram_pages << (PAGE_SHIFT-10),
               codepages << (PAGE_SHIFT-10),
               datapages << (PAGE_SHIFT-10),
index 0ae123e..23535cc 100644 (file)
@@ -350,7 +350,7 @@ ENTRY(sys_call_table)
        .long sys_preadv
        .long sys_pwritev               /* 330 */
        .long sys_rt_tgsigqueueinfo
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
 
        .rept NR_syscalls-(.-sys_call_table)/4
                .long sys_ni_syscall
index 0b85232..cb05a07 100644 (file)
 #define __NR_preadv            363 /* new */
 #define __NR_pwritev           364 /* new */
 #define __NR_rt_tgsigqueueinfo 365 /* new */
-#define __NR_perf_counter_open 366 /* new */
+#define __NR_perf_event_open   366 /* new */
 
 #define __NR_syscalls          367
 
index 4572160..ecec191 100644 (file)
@@ -370,4 +370,4 @@ ENTRY(sys_call_table)
        .long sys_ni_syscall
        .long sys_ni_syscall
        .long sys_rt_tgsigqueueinfo     /* 365 */
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
index f207f1a..1110784 100644 (file)
@@ -204,7 +204,7 @@ void __init mem_init(void)
        totalram_pages += free_all_bootmem();
 
        printk(KERN_INFO "Memory: %luk/%luk available\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               num_physpages << (PAGE_SHIFT-10));
 #ifdef CONFIG_MMU
        mem_init_done = 1;
index e4d6f1f..a2250f3 100644 (file)
@@ -46,6 +46,8 @@
 #define MAP_LOCKED     0x8000          /* pages are locked */
 #define MAP_POPULATE   0x10000         /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x20000         /* do not block on IO */
+#define MAP_STACK      0x40000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x80000         /* create a huge page mapping */
 
 /*
  * Flags for msync
@@ -71,6 +73,9 @@
 #define MADV_DONTFORK  10              /* don't inherit across fork */
 #define MADV_DOFORK    11              /* do inherit across fork */
 
+#define MADV_MERGEABLE   12            /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 13            /* KSM may not merge identical pages */
+
 /* compatibility flags */
 #define MAP_FILE       0
 
index 1a9f9b2..d6eb613 100644 (file)
@@ -76,6 +76,16 @@ extern unsigned long zero_page_mask;
 #define ZERO_PAGE(vaddr) \
        (virt_to_page((void *)(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))))
 
+#define is_zero_pfn is_zero_pfn
+static inline int is_zero_pfn(unsigned long pfn)
+{
+       extern unsigned long zero_pfn;
+       unsigned long offset_from_zero_pfn = pfn - zero_pfn;
+       return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);
+}
+
+#define my_zero_pfn(addr)      page_to_pfn(ZERO_PAGE(addr))
+
 extern void paging_init(void);
 
 /*
index e753a77..8c9dfa9 100644 (file)
 #define __NR_preadv                    (__NR_Linux + 330)
 #define __NR_pwritev                   (__NR_Linux + 331)
 #define __NR_rt_tgsigqueueinfo         (__NR_Linux + 332)
-#define __NR_perf_counter_open         (__NR_Linux + 333)
+#define __NR_perf_event_open           (__NR_Linux + 333)
 #define __NR_accept4                   (__NR_Linux + 334)
 
 /*
 #define __NR_preadv                    (__NR_Linux + 289)
 #define __NR_pwritev                   (__NR_Linux + 290)
 #define __NR_rt_tgsigqueueinfo         (__NR_Linux + 291)
-#define __NR_perf_counter_open         (__NR_Linux + 292)
+#define __NR_perf_event_open           (__NR_Linux + 292)
 #define __NR_accept4                   (__NR_Linux + 293)
 
 /*
 #define __NR_preadv                    (__NR_Linux + 293)
 #define __NR_pwritev                   (__NR_Linux + 294)
 #define __NR_rt_tgsigqueueinfo         (__NR_Linux + 295)
-#define __NR_perf_counter_open         (__NR_Linux + 296)
+#define __NR_perf_event_open           (__NR_Linux + 296)
 #define __NR_accept4                   (__NR_Linux + 297)
 
 /*
index 7c2de4f..fd2a9bb 100644 (file)
@@ -581,7 +581,7 @@ einval:     li      v0, -ENOSYS
        sys     sys_preadv              6       /* 4330 */
        sys     sys_pwritev             6
        sys     sys_rt_tgsigqueueinfo   4
-       sys     sys_perf_counter_open   5
+       sys     sys_perf_event_open     5
        sys     sys_accept4             4
        .endm
 
index b97b993..18bf7f3 100644 (file)
@@ -418,6 +418,6 @@ sys_call_table:
        PTR     sys_preadv
        PTR     sys_pwritev                     /* 5390 */
        PTR     sys_rt_tgsigqueueinfo
-       PTR     sys_perf_counter_open
+       PTR     sys_perf_event_open
        PTR     sys_accept4
        .size   sys_call_table,.-sys_call_table
index 1a6ae12..6ebc079 100644 (file)
@@ -416,6 +416,6 @@ EXPORT(sysn32_call_table)
        PTR     sys_preadv
        PTR     sys_pwritev
        PTR     compat_sys_rt_tgsigqueueinfo    /* 5295 */
-       PTR     sys_perf_counter_open
+       PTR     sys_perf_event_open
        PTR     sys_accept4
        .size   sysn32_call_table,.-sysn32_call_table
index cd31087..9bbf977 100644 (file)
@@ -536,6 +536,6 @@ sys_call_table:
        PTR     compat_sys_preadv               /* 4330 */
        PTR     compat_sys_pwritev
        PTR     compat_sys_rt_tgsigqueueinfo
-       PTR     sys_perf_counter_open
+       PTR     sys_perf_event_open
        PTR     sys_accept4
        .size   sys_call_table,.-sys_call_table
index 0edbef3..6e08c82 100644 (file)
@@ -23,6 +23,6 @@ void __init plat_time_init(void)
 
 void read_persistent_clock(struct timespec *ts)
 {
-       ts->tv_sec = return mc146818_get_cmos_time();
+       ts->tv_sec = mc146818_get_cmos_time();
        ts->tv_nsec = 0;
 }
index 38c79c5..15aa190 100644 (file)
@@ -352,7 +352,6 @@ void __init paging_init(void)
        free_area_init_nodes(max_zone_pfns);
 }
 
-static struct kcore_list kcore_mem, kcore_vmalloc;
 #ifdef CONFIG_64BIT
 static struct kcore_list kcore_kseg0;
 #endif
@@ -409,15 +408,13 @@ void __init mem_init(void)
        if ((unsigned long) &_text > (unsigned long) CKSEG0)
                /* The -4 is a hack so that user tools don't have to handle
                   the overflow.  */
-               kclist_add(&kcore_kseg0, (void *) CKSEG0, 0x80000000 - 4);
+               kclist_add(&kcore_kseg0, (void *) CKSEG0,
+                               0x80000000 - 4, KCORE_TEXT);
 #endif
-       kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
-       kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
-                  VMALLOC_END-VMALLOC_START);
 
        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
               "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               ram << (PAGE_SHIFT-10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT-10),
index 2db746a..1a55d61 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/mm.h>
 
 /*
- * virtually-indexed cache managment (our cache is physically indexed)
+ * virtually-indexed cache management (our cache is physically indexed)
  */
 #define flush_cache_all()                      do {} while (0)
 #define flush_cache_mm(mm)                     do {} while (0)
@@ -31,7 +31,7 @@
 #define flush_dcache_mmap_unlock(mapping)      do {} while (0)
 
 /*
- * physically-indexed cache managment
+ * physically-indexed cache management
  */
 #ifndef CONFIG_MN10300_CACHE_DISABLED
 
index d04fac1..8eebf89 100644 (file)
@@ -1,28 +1 @@
-/* MN10300 Constants for mmap and co.
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * - Derived from asm-x86/mman.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_MMAN_H
-#define _ASM_MMAN_H
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
-
-#endif /* _ASM_MMAN_H */
+#include <asm-generic/mman.h>
index fad6861..2a98393 100644 (file)
 #define __NR_preadv            334
 #define __NR_pwritev           335
 #define __NR_rt_tgsigqueueinfo 336
-#define __NR_perf_counter_open 337
+#define __NR_perf_event_open   337
 
 #ifdef __KERNEL__
 
index 2646fcb..82b4007 100644 (file)
@@ -95,7 +95,7 @@ void foo(void)
        OFFSET(__iobase,                mn10300_serial_port, _iobase);
 
        DEFINE(__UART_XMIT_SIZE,        UART_XMIT_SIZE);
-       OFFSET(__xmit_buffer,           uart_info, xmit.buf);
-       OFFSET(__xmit_head,             uart_info, xmit.head);
-       OFFSET(__xmit_tail,             uart_info, xmit.tail);
+       OFFSET(__xmit_buffer,           uart_state, xmit.buf);
+       OFFSET(__xmit_head,             uart_state, xmit.head);
+       OFFSET(__xmit_tail,             uart_state, xmit.tail);
 }
index e0d2563..a94e7ea 100644 (file)
@@ -723,7 +723,7 @@ ENTRY(sys_call_table)
        .long sys_preadv
        .long sys_pwritev               /* 335 */
        .long sys_rt_tgsigqueueinfo
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
 
 
 nr_syscalls=(.-sys_call_table)/4
index 79890ed..3f24c29 100644 (file)
@@ -285,7 +285,7 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
-struct seq_operations cpuinfo_op = {
+const struct seq_operations cpuinfo_op = {
        .start  = c_start,
        .next   = c_next,
        .stop   = c_stop,
index 8cee387..ec14205 100644 (file)
@@ -112,7 +112,7 @@ void __init mem_init(void)
               "Memory: %luk/%luk available"
               " (%dk kernel code, %dk reserved, %dk data, %dk init,"
               " %ldk highmem)\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
+              nr_free_pages() << (PAGE_SHIFT - 10),
               max_mapnr << (PAGE_SHIFT - 10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT - 10),
index 06f8d5b..f388dc6 100644 (file)
@@ -16,7 +16,7 @@ config PARISC
        select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE
        select BUG
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
index defe752..9749c8a 100644 (file)
@@ -22,6 +22,8 @@
 #define MAP_GROWSDOWN  0x8000          /* stack-like segment */
 #define MAP_POPULATE   0x10000         /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x20000         /* do not block on IO */
+#define MAP_STACK      0x40000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x80000         /* create a huge page mapping */
 
 #define MS_SYNC                1               /* synchronous memory sync */
 #define MS_ASYNC       2               /* sync memory asynchronously */
@@ -54,6 +56,9 @@
 #define MADV_16M_PAGES  24              /* Use 16 Megabyte pages */
 #define MADV_64M_PAGES  26              /* Use 64 Megabyte pages */
 
+#define MADV_MERGEABLE   65            /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 66            /* KSM may not merge identical pages */
+
 /* compatibility flags */
 #define MAP_FILE       0
 #define MAP_VARIABLE   0
diff --git a/arch/parisc/include/asm/perf_counter.h b/arch/parisc/include/asm/perf_counter.h
deleted file mode 100644 (file)
index dc9e829..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_PARISC_PERF_COUNTER_H
-#define __ASM_PARISC_PERF_COUNTER_H
-
-/* parisc only supports software counters through this interface. */
-static inline void set_perf_counter_pending(void) { }
-
-#endif /* __ASM_PARISC_PERF_COUNTER_H */
diff --git a/arch/parisc/include/asm/perf_event.h b/arch/parisc/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..cc14642
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef __ASM_PARISC_PERF_EVENT_H
+#define __ASM_PARISC_PERF_EVENT_H
+
+/* parisc only supports software events through this interface. */
+static inline void set_perf_event_pending(void) { }
+
+#endif /* __ASM_PARISC_PERF_EVENT_H */
index f3d3b8b..cda1583 100644 (file)
 #define __NR_preadv            (__NR_Linux + 315)
 #define __NR_pwritev           (__NR_Linux + 316)
 #define __NR_rt_tgsigqueueinfo (__NR_Linux + 317)
-#define __NR_perf_counter_open (__NR_Linux + 318)
+#define __NR_perf_event_open   (__NR_Linux + 318)
 
-#define __NR_Linux_syscalls    (__NR_perf_counter_open + 1)
+#define __NR_Linux_syscalls    (__NR_perf_event_open + 1)
 
 
 #define __IGNORE_select                /* newselect */
index cf145eb..843f423 100644 (file)
        ENTRY_COMP(preadv)              /* 315 */
        ENTRY_COMP(pwritev)
        ENTRY_COMP(rt_tgsigqueueinfo)
-       ENTRY_SAME(perf_counter_open)
+       ENTRY_SAME(perf_event_open)
 
        /* Nothing yet */
 
index b0831d9..d5aca31 100644 (file)
@@ -506,7 +506,7 @@ void __init mem_init(void)
 #endif
 
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
-               (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
                reservedpages << (PAGE_SHIFT-10),
index 8250902..4fd4790 100644 (file)
@@ -129,7 +129,7 @@ config PPC
        select HAVE_OPROFILE
        select HAVE_SYSCALL_WRAPPERS if PPC64
        select GENERIC_ATOMIC64 if PPC32
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
 
 config EARLY_PRINTK
        bool
index f32c281..855782c 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index 28e022a..9e2264b 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index 3febc4e..9a60369 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                clock-frequency = <133333333>;
                        };
                };
index f720ab9..f70cf60 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index a11ead8..4e6a1a4 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index 4fa221f..645ec51 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index e35dfba..72336d5 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index e73d554..abbc2aa 100644 (file)
@@ -135,43 +135,43 @@ static inline int irqs_disabled_flags(unsigned long flags)
  */
 struct irq_chip;
 
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
 
 #ifdef CONFIG_PPC64
-static inline unsigned long test_perf_counter_pending(void)
+static inline unsigned long test_perf_event_pending(void)
 {
        unsigned long x;
 
        asm volatile("lbz %0,%1(13)"
                : "=r" (x)
-               : "i" (offsetof(struct paca_struct, perf_counter_pending)));
+               : "i" (offsetof(struct paca_struct, perf_event_pending)));
        return x;
 }
 
-static inline void set_perf_counter_pending(void)
+static inline void set_perf_event_pending(void)
 {
        asm volatile("stb %0,%1(13)" : :
                "r" (1),
-               "i" (offsetof(struct paca_struct, perf_counter_pending)));
+               "i" (offsetof(struct paca_struct, perf_event_pending)));
 }
 
-static inline void clear_perf_counter_pending(void)
+static inline void clear_perf_event_pending(void)
 {
        asm volatile("stb %0,%1(13)" : :
                "r" (0),
-               "i" (offsetof(struct paca_struct, perf_counter_pending)));
+               "i" (offsetof(struct paca_struct, perf_event_pending)));
 }
 #endif /* CONFIG_PPC64 */
 
-#else  /* CONFIG_PERF_COUNTERS */
+#else  /* CONFIG_PERF_EVENTS */
 
-static inline unsigned long test_perf_counter_pending(void)
+static inline unsigned long test_perf_event_pending(void)
 {
        return 0;
 }
 
-static inline void clear_perf_counter_pending(void) {}
-#endif /* CONFIG_PERF_COUNTERS */
+static inline void clear_perf_event_pending(void) {}
+#endif /* CONFIG_PERF_EVENTS */
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_HW_IRQ_H */
index 7b1c498..d4a7f64 100644 (file)
@@ -25,6 +25,8 @@
 
 #define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x10000         /* do not block on IO */
+#define MAP_STACK      0x20000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x40000         /* create a huge page mapping */
 
 #ifdef __KERNEL__
 #ifdef CONFIG_PPC64
index b634456..7d8514c 100644 (file)
@@ -122,7 +122,7 @@ struct paca_struct {
        u8 soft_enabled;                /* irq soft-enable flag */
        u8 hard_enabled;                /* set if irqs are enabled in MSR */
        u8 io_sync;                     /* writel() needs spin_unlock sync */
-       u8 perf_counter_pending;        /* PM interrupt while soft-disabled */
+       u8 perf_event_pending;          /* PM interrupt while soft-disabled */
 
        /* Stuff for accurate time accounting */
        u64 user_time;                  /* accumulated usermode TB ticks */
diff --git a/arch/powerpc/include/asm/perf_counter.h b/arch/powerpc/include/asm/perf_counter.h
deleted file mode 100644 (file)
index 0ea0639..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Performance counter support - PowerPC-specific definitions.
- *
- * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/types.h>
-
-#include <asm/hw_irq.h>
-
-#define MAX_HWCOUNTERS         8
-#define MAX_EVENT_ALTERNATIVES 8
-#define MAX_LIMITED_HWCOUNTERS 2
-
-/*
- * This struct provides the constants and functions needed to
- * describe the PMU on a particular POWER-family CPU.
- */
-struct power_pmu {
-       const char      *name;
-       int             n_counter;
-       int             max_alternatives;
-       unsigned long   add_fields;
-       unsigned long   test_adder;
-       int             (*compute_mmcr)(u64 events[], int n_ev,
-                               unsigned int hwc[], unsigned long mmcr[]);
-       int             (*get_constraint)(u64 event, unsigned long *mskp,
-                               unsigned long *valp);
-       int             (*get_alternatives)(u64 event, unsigned int flags,
-                               u64 alt[]);
-       void            (*disable_pmc)(unsigned int pmc, unsigned long mmcr[]);
-       int             (*limited_pmc_event)(u64 event);
-       u32             flags;
-       int             n_generic;
-       int             *generic_events;
-       int             (*cache_events)[PERF_COUNT_HW_CACHE_MAX]
-                              [PERF_COUNT_HW_CACHE_OP_MAX]
-                              [PERF_COUNT_HW_CACHE_RESULT_MAX];
-};
-
-/*
- * Values for power_pmu.flags
- */
-#define PPMU_LIMITED_PMC5_6    1       /* PMC5/6 have limited function */
-#define PPMU_ALT_SIPR          2       /* uses alternate posn for SIPR/HV */
-
-/*
- * Values for flags to get_alternatives()
- */
-#define PPMU_LIMITED_PMC_OK    1       /* can put this on a limited PMC */
-#define PPMU_LIMITED_PMC_REQD  2       /* have to put this on a limited PMC */
-#define PPMU_ONLY_COUNT_RUN    4       /* only counting in run state */
-
-extern int register_power_pmu(struct power_pmu *);
-
-struct pt_regs;
-extern unsigned long perf_misc_flags(struct pt_regs *regs);
-extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
-
-#define PERF_COUNTER_INDEX_OFFSET      1
-
-/*
- * Only override the default definitions in include/linux/perf_counter.h
- * if we have hardware PMU support.
- */
-#ifdef CONFIG_PPC_PERF_CTRS
-#define perf_misc_flags(regs)  perf_misc_flags(regs)
-#endif
-
-/*
- * The power_pmu.get_constraint function returns a 32/64-bit value and
- * a 32/64-bit mask that express the constraints between this event and
- * other events.
- *
- * The value and mask are divided up into (non-overlapping) bitfields
- * of three different types:
- *
- * Select field: this expresses the constraint that some set of bits
- * in MMCR* needs to be set to a specific value for this event.  For a
- * select field, the mask contains 1s in every bit of the field, and
- * the value contains a unique value for each possible setting of the
- * MMCR* bits.  The constraint checking code will ensure that two events
- * that set the same field in their masks have the same value in their
- * value dwords.
- *
- * Add field: this expresses the constraint that there can be at most
- * N events in a particular class.  A field of k bits can be used for
- * N <= 2^(k-1) - 1.  The mask has the most significant bit of the field
- * set (and the other bits 0), and the value has only the least significant
- * bit of the field set.  In addition, the 'add_fields' and 'test_adder'
- * in the struct power_pmu for this processor come into play.  The
- * add_fields value contains 1 in the LSB of the field, and the
- * test_adder contains 2^(k-1) - 1 - N in the field.
- *
- * NAND field: this expresses the constraint that you may not have events
- * in all of a set of classes.  (For example, on PPC970, you can't select
- * events from the FPU, ISU and IDU simultaneously, although any two are
- * possible.)  For N classes, the field is N+1 bits wide, and each class
- * is assigned one bit from the least-significant N bits.  The mask has
- * only the most-significant bit set, and the value has only the bit
- * for the event's class set.  The test_adder has the least significant
- * bit set in the field.
- *
- * If an event is not subject to the constraint expressed by a particular
- * field, then it will have 0 in both the mask and value for that field.
- */
diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..3288ce3
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * Performance event support - PowerPC-specific definitions.
+ *
+ * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <linux/types.h>
+
+#include <asm/hw_irq.h>
+
+#define MAX_HWEVENTS           8
+#define MAX_EVENT_ALTERNATIVES 8
+#define MAX_LIMITED_HWCOUNTERS 2
+
+/*
+ * This struct provides the constants and functions needed to
+ * describe the PMU on a particular POWER-family CPU.
+ */
+struct power_pmu {
+       const char      *name;
+       int             n_counter;
+       int             max_alternatives;
+       unsigned long   add_fields;
+       unsigned long   test_adder;
+       int             (*compute_mmcr)(u64 events[], int n_ev,
+                               unsigned int hwc[], unsigned long mmcr[]);
+       int             (*get_constraint)(u64 event_id, unsigned long *mskp,
+                               unsigned long *valp);
+       int             (*get_alternatives)(u64 event_id, unsigned int flags,
+                               u64 alt[]);
+       void            (*disable_pmc)(unsigned int pmc, unsigned long mmcr[]);
+       int             (*limited_pmc_event)(u64 event_id);
+       u32             flags;
+       int             n_generic;
+       int             *generic_events;
+       int             (*cache_events)[PERF_COUNT_HW_CACHE_MAX]
+                              [PERF_COUNT_HW_CACHE_OP_MAX]
+                              [PERF_COUNT_HW_CACHE_RESULT_MAX];
+};
+
+/*
+ * Values for power_pmu.flags
+ */
+#define PPMU_LIMITED_PMC5_6    1       /* PMC5/6 have limited function */
+#define PPMU_ALT_SIPR          2       /* uses alternate posn for SIPR/HV */
+
+/*
+ * Values for flags to get_alternatives()
+ */
+#define PPMU_LIMITED_PMC_OK    1       /* can put this on a limited PMC */
+#define PPMU_LIMITED_PMC_REQD  2       /* have to put this on a limited PMC */
+#define PPMU_ONLY_COUNT_RUN    4       /* only counting in run state */
+
+extern int register_power_pmu(struct power_pmu *);
+
+struct pt_regs;
+extern unsigned long perf_misc_flags(struct pt_regs *regs);
+extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
+
+#define PERF_EVENT_INDEX_OFFSET        1
+
+/*
+ * Only override the default definitions in include/linux/perf_event.h
+ * if we have hardware PMU support.
+ */
+#ifdef CONFIG_PPC_PERF_CTRS
+#define perf_misc_flags(regs)  perf_misc_flags(regs)
+#endif
+
+/*
+ * The power_pmu.get_constraint function returns a 32/64-bit value and
+ * a 32/64-bit mask that express the constraints between this event_id and
+ * other events.
+ *
+ * The value and mask are divided up into (non-overlapping) bitfields
+ * of three different types:
+ *
+ * Select field: this expresses the constraint that some set of bits
+ * in MMCR* needs to be set to a specific value for this event_id.  For a
+ * select field, the mask contains 1s in every bit of the field, and
+ * the value contains a unique value for each possible setting of the
+ * MMCR* bits.  The constraint checking code will ensure that two events
+ * that set the same field in their masks have the same value in their
+ * value dwords.
+ *
+ * Add field: this expresses the constraint that there can be at most
+ * N events in a particular class.  A field of k bits can be used for
+ * N <= 2^(k-1) - 1.  The mask has the most significant bit of the field
+ * set (and the other bits 0), and the value has only the least significant
+ * bit of the field set.  In addition, the 'add_fields' and 'test_adder'
+ * in the struct power_pmu for this processor come into play.  The
+ * add_fields value contains 1 in the LSB of the field, and the
+ * test_adder contains 2^(k-1) - 1 - N in the field.
+ *
+ * NAND field: this expresses the constraint that you may not have events
+ * in all of a set of classes.  (For example, on PPC970, you can't select
+ * events from the FPU, ISU and IDU simultaneously, although any two are
+ * possible.)  For N classes, the field is N+1 bits wide, and each class
+ * is assigned one bit from the least-significant N bits.  The mask has
+ * only the most-significant bit set, and the value has only the bit
+ * for the event_id's class set.  The test_adder has the least significant
+ * bit set in the field.
+ *
+ * If an event_id is not subject to the constraint expressed by a particular
+ * field, then it will have 0 in both the mask and value for that field.
+ */
index ed24bd9..c7d671a 100644 (file)
@@ -322,7 +322,7 @@ SYSCALL_SPU(epoll_create1)
 SYSCALL_SPU(dup3)
 SYSCALL_SPU(pipe2)
 SYSCALL(inotify_init1)
-SYSCALL_SPU(perf_counter_open)
+SYSCALL_SPU(perf_event_open)
 COMPAT_SYS_SPU(preadv)
 COMPAT_SYS_SPU(pwritev)
 COMPAT_SYS(rt_tgsigqueueinfo)
index cef080b..f6ca761 100644 (file)
 #define __NR_dup3              316
 #define __NR_pipe2             317
 #define __NR_inotify_init1     318
-#define __NR_perf_counter_open 319
+#define __NR_perf_event_open   319
 #define __NR_preadv            320
 #define __NR_pwritev           321
 #define __NR_rt_tgsigqueueinfo 322
index 569f79c..b23664a 100644 (file)
@@ -97,7 +97,7 @@ obj64-$(CONFIG_AUDIT)         += compat_audit.o
 
 obj-$(CONFIG_DYNAMIC_FTRACE)   += ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)    += ftrace.o
-obj-$(CONFIG_PPC_PERF_CTRS)    += perf_counter.o perf_callchain.o
+obj-$(CONFIG_PPC_PERF_CTRS)    += perf_event.o perf_callchain.o
 obj64-$(CONFIG_PPC_PERF_CTRS)  += power4-pmu.o ppc970-pmu.o power5-pmu.o \
                                   power5+-pmu.o power6-pmu.o power7-pmu.o
 obj32-$(CONFIG_PPC_PERF_CTRS)  += mpc7450-pmu.o
index f0df285..0812b0f 100644 (file)
@@ -133,7 +133,7 @@ int main(void)
        DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));
        DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
        DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));
-       DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending));
+       DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_event_pending));
        DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));
 #ifdef CONFIG_PPC_MM_SLICES
        DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,
index 66bcda3..900e0ee 100644 (file)
@@ -556,14 +556,14 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
 2:
        TRACE_AND_RESTORE_IRQ(r5);
 
-#ifdef CONFIG_PERF_COUNTERS
-       /* check paca->perf_counter_pending if we're enabling ints */
+#ifdef CONFIG_PERF_EVENTS
+       /* check paca->perf_event_pending if we're enabling ints */
        lbz     r3,PACAPERFPEND(r13)
        and.    r3,r3,r5
        beq     27f
-       bl      .perf_counter_do_pending
+       bl      .perf_event_do_pending
 27:
-#endif /* CONFIG_PERF_COUNTERS */
+#endif /* CONFIG_PERF_EVENTS */
 
        /* extract EE bit and use it to restore paca->hard_enabled */
        ld      r3,_MSR(r1)
index f7f376e..e5d1211 100644 (file)
@@ -53,7 +53,7 @@
 #include <linux/bootmem.h>
 #include <linux/pci.h>
 #include <linux/debugfs.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -138,9 +138,9 @@ notrace void raw_local_irq_restore(unsigned long en)
        }
 #endif /* CONFIG_PPC_STD_MMU_64 */
 
-       if (test_perf_counter_pending()) {
-               clear_perf_counter_pending();
-               perf_counter_do_pending();
+       if (test_perf_event_pending()) {
+               clear_perf_event_pending();
+               perf_event_do_pending();
        }
 
        /*
index cc466d0..09d7202 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/string.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
 
index f74b62c..0a03cf7 100644 (file)
@@ -10,7 +10,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/percpu.h>
 #include <linux/uaccess.h>
 #include <linux/mm.h>
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
deleted file mode 100644 (file)
index 7ceefaf..0000000
+++ /dev/null
@@ -1,1316 +0,0 @@
-/*
- * Performance counter support - powerpc architecture code
- *
- * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/perf_counter.h>
-#include <linux/percpu.h>
-#include <linux/hardirq.h>
-#include <asm/reg.h>
-#include <asm/pmc.h>
-#include <asm/machdep.h>
-#include <asm/firmware.h>
-#include <asm/ptrace.h>
-
-struct cpu_hw_counters {
-       int n_counters;
-       int n_percpu;
-       int disabled;
-       int n_added;
-       int n_limited;
-       u8  pmcs_enabled;
-       struct perf_counter *counter[MAX_HWCOUNTERS];
-       u64 events[MAX_HWCOUNTERS];
-       unsigned int flags[MAX_HWCOUNTERS];
-       unsigned long mmcr[3];
-       struct perf_counter *limited_counter[MAX_LIMITED_HWCOUNTERS];
-       u8  limited_hwidx[MAX_LIMITED_HWCOUNTERS];
-       u64 alternatives[MAX_HWCOUNTERS][MAX_EVENT_ALTERNATIVES];
-       unsigned long amasks[MAX_HWCOUNTERS][MAX_EVENT_ALTERNATIVES];
-       unsigned long avalues[MAX_HWCOUNTERS][MAX_EVENT_ALTERNATIVES];
-};
-DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters);
-
-struct power_pmu *ppmu;
-
-/*
- * Normally, to ignore kernel events we set the FCS (freeze counters
- * in supervisor mode) bit in MMCR0, but if the kernel runs with the
- * hypervisor bit set in the MSR, or if we are running on a processor
- * where the hypervisor bit is forced to 1 (as on Apple G5 processors),
- * then we need to use the FCHV bit to ignore kernel events.
- */
-static unsigned int freeze_counters_kernel = MMCR0_FCS;
-
-/*
- * 32-bit doesn't have MMCRA but does have an MMCR2,
- * and a few other names are different.
- */
-#ifdef CONFIG_PPC32
-
-#define MMCR0_FCHV             0
-#define MMCR0_PMCjCE           MMCR0_PMCnCE
-
-#define SPRN_MMCRA             SPRN_MMCR2
-#define MMCRA_SAMPLE_ENABLE    0
-
-static inline unsigned long perf_ip_adjust(struct pt_regs *regs)
-{
-       return 0;
-}
-static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) { }
-static inline u32 perf_get_misc_flags(struct pt_regs *regs)
-{
-       return 0;
-}
-static inline void perf_read_regs(struct pt_regs *regs) { }
-static inline int perf_intr_is_nmi(struct pt_regs *regs)
-{
-       return 0;
-}
-
-#endif /* CONFIG_PPC32 */
-
-/*
- * Things that are specific to 64-bit implementations.
- */
-#ifdef CONFIG_PPC64
-
-static inline unsigned long perf_ip_adjust(struct pt_regs *regs)
-{
-       unsigned long mmcra = regs->dsisr;
-
-       if ((mmcra & MMCRA_SAMPLE_ENABLE) && !(ppmu->flags & PPMU_ALT_SIPR)) {
-               unsigned long slot = (mmcra & MMCRA_SLOT) >> MMCRA_SLOT_SHIFT;
-               if (slot > 1)
-                       return 4 * (slot - 1);
-       }
-       return 0;
-}
-
-/*
- * The user wants a data address recorded.
- * If we're not doing instruction sampling, give them the SDAR
- * (sampled data address).  If we are doing instruction sampling, then
- * only give them the SDAR if it corresponds to the instruction
- * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC
- * bit in MMCRA.
- */
-static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp)
-{
-       unsigned long mmcra = regs->dsisr;
-       unsigned long sdsync = (ppmu->flags & PPMU_ALT_SIPR) ?
-               POWER6_MMCRA_SDSYNC : MMCRA_SDSYNC;
-
-       if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync))
-               *addrp = mfspr(SPRN_SDAR);
-}
-
-static inline u32 perf_get_misc_flags(struct pt_regs *regs)
-{
-       unsigned long mmcra = regs->dsisr;
-
-       if (TRAP(regs) != 0xf00)
-               return 0;       /* not a PMU interrupt */
-
-       if (ppmu->flags & PPMU_ALT_SIPR) {
-               if (mmcra & POWER6_MMCRA_SIHV)
-                       return PERF_EVENT_MISC_HYPERVISOR;
-               return (mmcra & POWER6_MMCRA_SIPR) ?
-                       PERF_EVENT_MISC_USER : PERF_EVENT_MISC_KERNEL;
-       }
-       if (mmcra & MMCRA_SIHV)
-               return PERF_EVENT_MISC_HYPERVISOR;
-       return (mmcra & MMCRA_SIPR) ? PERF_EVENT_MISC_USER :
-               PERF_EVENT_MISC_KERNEL;
-}
-
-/*
- * Overload regs->dsisr to store MMCRA so we only need to read it once
- * on each interrupt.
- */
-static inline void perf_read_regs(struct pt_regs *regs)
-{
-       regs->dsisr = mfspr(SPRN_MMCRA);
-}
-
-/*
- * If interrupts were soft-disabled when a PMU interrupt occurs, treat
- * it as an NMI.
- */
-static inline int perf_intr_is_nmi(struct pt_regs *regs)
-{
-       return !regs->softe;
-}
-
-#endif /* CONFIG_PPC64 */
-
-static void perf_counter_interrupt(struct pt_regs *regs);
-
-void perf_counter_print_debug(void)
-{
-}
-
-/*
- * Read one performance monitor counter (PMC).
- */
-static unsigned long read_pmc(int idx)
-{
-       unsigned long val;
-
-       switch (idx) {
-       case 1:
-               val = mfspr(SPRN_PMC1);
-               break;
-       case 2:
-               val = mfspr(SPRN_PMC2);
-               break;
-       case 3:
-               val = mfspr(SPRN_PMC3);
-               break;
-       case 4:
-               val = mfspr(SPRN_PMC4);
-               break;
-       case 5:
-               val = mfspr(SPRN_PMC5);
-               break;
-       case 6:
-               val = mfspr(SPRN_PMC6);
-               break;
-#ifdef CONFIG_PPC64
-       case 7:
-               val = mfspr(SPRN_PMC7);
-               break;
-       case 8:
-               val = mfspr(SPRN_PMC8);
-               break;
-#endif /* CONFIG_PPC64 */
-       default:
-               printk(KERN_ERR "oops trying to read PMC%d\n", idx);
-               val = 0;
-       }
-       return val;
-}
-
-/*
- * Write one PMC.
- */
-static void write_pmc(int idx, unsigned long val)
-{
-       switch (idx) {
-       case 1:
-               mtspr(SPRN_PMC1, val);
-               break;
-       case 2:
-               mtspr(SPRN_PMC2, val);
-               break;
-       case 3:
-               mtspr(SPRN_PMC3, val);
-               break;
-       case 4:
-               mtspr(SPRN_PMC4, val);
-               break;
-       case 5:
-               mtspr(SPRN_PMC5, val);
-               break;
-       case 6:
-               mtspr(SPRN_PMC6, val);
-               break;
-#ifdef CONFIG_PPC64
-       case 7:
-               mtspr(SPRN_PMC7, val);
-               break;
-       case 8:
-               mtspr(SPRN_PMC8, val);
-               break;
-#endif /* CONFIG_PPC64 */
-       default:
-               printk(KERN_ERR "oops trying to write PMC%d\n", idx);
-       }
-}
-
-/*
- * Check if a set of events can all go on the PMU at once.
- * If they can't, this will look at alternative codes for the events
- * and see if any combination of alternative codes is feasible.
- * The feasible set is returned in event[].
- */
-static int power_check_constraints(struct cpu_hw_counters *cpuhw,
-                                  u64 event[], unsigned int cflags[],
-                                  int n_ev)
-{
-       unsigned long mask, value, nv;
-       unsigned long smasks[MAX_HWCOUNTERS], svalues[MAX_HWCOUNTERS];
-       int n_alt[MAX_HWCOUNTERS], choice[MAX_HWCOUNTERS];
-       int i, j;
-       unsigned long addf = ppmu->add_fields;
-       unsigned long tadd = ppmu->test_adder;
-
-       if (n_ev > ppmu->n_counter)
-               return -1;
-
-       /* First see if the events will go on as-is */
-       for (i = 0; i < n_ev; ++i) {
-               if ((cflags[i] & PPMU_LIMITED_PMC_REQD)
-                   && !ppmu->limited_pmc_event(event[i])) {
-                       ppmu->get_alternatives(event[i], cflags[i],
-                                              cpuhw->alternatives[i]);
-                       event[i] = cpuhw->alternatives[i][0];
-               }
-               if (ppmu->get_constraint(event[i], &cpuhw->amasks[i][0],
-                                        &cpuhw->avalues[i][0]))
-                       return -1;
-       }
-       value = mask = 0;
-       for (i = 0; i < n_ev; ++i) {
-               nv = (value | cpuhw->avalues[i][0]) +
-                       (value & cpuhw->avalues[i][0] & addf);
-               if ((((nv + tadd) ^ value) & mask) != 0 ||
-                   (((nv + tadd) ^ cpuhw->avalues[i][0]) &
-                    cpuhw->amasks[i][0]) != 0)
-                       break;
-               value = nv;
-               mask |= cpuhw->amasks[i][0];
-       }
-       if (i == n_ev)
-               return 0;       /* all OK */
-
-       /* doesn't work, gather alternatives... */
-       if (!ppmu->get_alternatives)
-               return -1;
-       for (i = 0; i < n_ev; ++i) {
-               choice[i] = 0;
-               n_alt[i] = ppmu->get_alternatives(event[i], cflags[i],
-                                                 cpuhw->alternatives[i]);
-               for (j = 1; j < n_alt[i]; ++j)
-                       ppmu->get_constraint(cpuhw->alternatives[i][j],
-                                            &cpuhw->amasks[i][j],
-                                            &cpuhw->avalues[i][j]);
-       }
-
-       /* enumerate all possibilities and see if any will work */
-       i = 0;
-       j = -1;
-       value = mask = nv = 0;
-       while (i < n_ev) {
-               if (j >= 0) {
-                       /* we're backtracking, restore context */
-                       value = svalues[i];
-                       mask = smasks[i];
-                       j = choice[i];
-               }
-               /*
-                * See if any alternative k for event i,
-                * where k > j, will satisfy the constraints.
-                */
-               while (++j < n_alt[i]) {
-                       nv = (value | cpuhw->avalues[i][j]) +
-                               (value & cpuhw->avalues[i][j] & addf);
-                       if ((((nv + tadd) ^ value) & mask) == 0 &&
-                           (((nv + tadd) ^ cpuhw->avalues[i][j])
-                            & cpuhw->amasks[i][j]) == 0)
-                               break;
-               }
-               if (j >= n_alt[i]) {
-                       /*
-                        * No feasible alternative, backtrack
-                        * to event i-1 and continue enumerating its
-                        * alternatives from where we got up to.
-                        */
-                       if (--i < 0)
-                               return -1;
-               } else {
-                       /*
-                        * Found a feasible alternative for event i,
-                        * remember where we got up to with this event,
-                        * go on to the next event, and start with
-                        * the first alternative for it.
-                        */
-                       choice[i] = j;
-                       svalues[i] = value;
-                       smasks[i] = mask;
-                       value = nv;
-                       mask |= cpuhw->amasks[i][j];
-                       ++i;
-                       j = -1;
-               }
-       }
-
-       /* OK, we have a feasible combination, tell the caller the solution */
-       for (i = 0; i < n_ev; ++i)
-               event[i] = cpuhw->alternatives[i][choice[i]];
-       return 0;
-}
-
-/*
- * Check if newly-added counters have consistent settings for
- * exclude_{user,kernel,hv} with each other and any previously
- * added counters.
- */
-static int check_excludes(struct perf_counter **ctrs, unsigned int cflags[],
-                         int n_prev, int n_new)
-{
-       int eu = 0, ek = 0, eh = 0;
-       int i, n, first;
-       struct perf_counter *counter;
-
-       n = n_prev + n_new;
-       if (n <= 1)
-               return 0;
-
-       first = 1;
-       for (i = 0; i < n; ++i) {
-               if (cflags[i] & PPMU_LIMITED_PMC_OK) {
-                       cflags[i] &= ~PPMU_LIMITED_PMC_REQD;
-                       continue;
-               }
-               counter = ctrs[i];
-               if (first) {
-                       eu = counter->attr.exclude_user;
-                       ek = counter->attr.exclude_kernel;
-                       eh = counter->attr.exclude_hv;
-                       first = 0;
-               } else if (counter->attr.exclude_user != eu ||
-                          counter->attr.exclude_kernel != ek ||
-                          counter->attr.exclude_hv != eh) {
-                       return -EAGAIN;
-               }
-       }
-
-       if (eu || ek || eh)
-               for (i = 0; i < n; ++i)
-                       if (cflags[i] & PPMU_LIMITED_PMC_OK)
-                               cflags[i] |= PPMU_LIMITED_PMC_REQD;
-
-       return 0;
-}
-
-static void power_pmu_read(struct perf_counter *counter)
-{
-       s64 val, delta, prev;
-
-       if (!counter->hw.idx)
-               return;
-       /*
-        * Performance monitor interrupts come even when interrupts
-        * are soft-disabled, as long as interrupts are hard-enabled.
-        * Therefore we treat them like NMIs.
-        */
-       do {
-               prev = atomic64_read(&counter->hw.prev_count);
-               barrier();
-               val = read_pmc(counter->hw.idx);
-       } while (atomic64_cmpxchg(&counter->hw.prev_count, prev, val) != prev);
-
-       /* The counters are only 32 bits wide */
-       delta = (val - prev) & 0xfffffffful;
-       atomic64_add(delta, &counter->count);
-       atomic64_sub(delta, &counter->hw.period_left);
-}
-
-/*
- * On some machines, PMC5 and PMC6 can't be written, don't respect
- * the freeze conditions, and don't generate interrupts.  This tells
- * us if `counter' is using such a PMC.
- */
-static int is_limited_pmc(int pmcnum)
-{
-       return (ppmu->flags & PPMU_LIMITED_PMC5_6)
-               && (pmcnum == 5 || pmcnum == 6);
-}
-
-static void freeze_limited_counters(struct cpu_hw_counters *cpuhw,
-                                   unsigned long pmc5, unsigned long pmc6)
-{
-       struct perf_counter *counter;
-       u64 val, prev, delta;
-       int i;
-
-       for (i = 0; i < cpuhw->n_limited; ++i) {
-               counter = cpuhw->limited_counter[i];
-               if (!counter->hw.idx)
-                       continue;
-               val = (counter->hw.idx == 5) ? pmc5 : pmc6;
-               prev = atomic64_read(&counter->hw.prev_count);
-               counter->hw.idx = 0;
-               delta = (val - prev) & 0xfffffffful;
-               atomic64_add(delta, &counter->count);
-       }
-}
-
-static void thaw_limited_counters(struct cpu_hw_counters *cpuhw,
-                                 unsigned long pmc5, unsigned long pmc6)
-{
-       struct perf_counter *counter;
-       u64 val;
-       int i;
-
-       for (i = 0; i < cpuhw->n_limited; ++i) {
-               counter = cpuhw->limited_counter[i];
-               counter->hw.idx = cpuhw->limited_hwidx[i];
-               val = (counter->hw.idx == 5) ? pmc5 : pmc6;
-               atomic64_set(&counter->hw.prev_count, val);
-               perf_counter_update_userpage(counter);
-       }
-}
-
-/*
- * Since limited counters don't respect the freeze conditions, we
- * have to read them immediately after freezing or unfreezing the
- * other counters.  We try to keep the values from the limited
- * counters as consistent as possible by keeping the delay (in
- * cycles and instructions) between freezing/unfreezing and reading
- * the limited counters as small and consistent as possible.
- * Therefore, if any limited counters are in use, we read them
- * both, and always in the same order, to minimize variability,
- * and do it inside the same asm that writes MMCR0.
- */
-static void write_mmcr0(struct cpu_hw_counters *cpuhw, unsigned long mmcr0)
-{
-       unsigned long pmc5, pmc6;
-
-       if (!cpuhw->n_limited) {
-               mtspr(SPRN_MMCR0, mmcr0);
-               return;
-       }
-
-       /*
-        * Write MMCR0, then read PMC5 and PMC6 immediately.
-        * To ensure we don't get a performance monitor interrupt
-        * between writing MMCR0 and freezing/thawing the limited
-        * counters, we first write MMCR0 with the counter overflow
-        * interrupt enable bits turned off.
-        */
-       asm volatile("mtspr %3,%2; mfspr %0,%4; mfspr %1,%5"
-                    : "=&r" (pmc5), "=&r" (pmc6)
-                    : "r" (mmcr0 & ~(MMCR0_PMC1CE | MMCR0_PMCjCE)),
-                      "i" (SPRN_MMCR0),
-                      "i" (SPRN_PMC5), "i" (SPRN_PMC6));
-
-       if (mmcr0 & MMCR0_FC)
-               freeze_limited_counters(cpuhw, pmc5, pmc6);
-       else
-               thaw_limited_counters(cpuhw, pmc5, pmc6);
-
-       /*
-        * Write the full MMCR0 including the counter overflow interrupt
-        * enable bits, if necessary.
-        */
-       if (mmcr0 & (MMCR0_PMC1CE | MMCR0_PMCjCE))
-               mtspr(SPRN_MMCR0, mmcr0);
-}
-
-/*
- * Disable all counters to prevent PMU interrupts and to allow
- * counters to be added or removed.
- */
-void hw_perf_disable(void)
-{
-       struct cpu_hw_counters *cpuhw;
-       unsigned long flags;
-
-       if (!ppmu)
-               return;
-       local_irq_save(flags);
-       cpuhw = &__get_cpu_var(cpu_hw_counters);
-
-       if (!cpuhw->disabled) {
-               cpuhw->disabled = 1;
-               cpuhw->n_added = 0;
-
-               /*
-                * Check if we ever enabled the PMU on this cpu.
-                */
-               if (!cpuhw->pmcs_enabled) {
-                       ppc_enable_pmcs();
-                       cpuhw->pmcs_enabled = 1;
-               }
-
-               /*
-                * Disable instruction sampling if it was enabled
-                */
-               if (cpuhw->mmcr[2] & MMCRA_SAMPLE_ENABLE) {
-                       mtspr(SPRN_MMCRA,
-                             cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
-                       mb();
-               }
-
-               /*
-                * Set the 'freeze counters' bit.
-                * The barrier is to make sure the mtspr has been
-                * executed and the PMU has frozen the counters
-                * before we return.
-                */
-               write_mmcr0(cpuhw, mfspr(SPRN_MMCR0) | MMCR0_FC);
-               mb();
-       }
-       local_irq_restore(flags);
-}
-
-/*
- * Re-enable all counters if disable == 0.
- * If we were previously disabled and counters were added, then
- * put the new config on the PMU.
- */
-void hw_perf_enable(void)
-{
-       struct perf_counter *counter;
-       struct cpu_hw_counters *cpuhw;
-       unsigned long flags;
-       long i;
-       unsigned long val;
-       s64 left;
-       unsigned int hwc_index[MAX_HWCOUNTERS];
-       int n_lim;
-       int idx;
-
-       if (!ppmu)
-               return;
-       local_irq_save(flags);
-       cpuhw = &__get_cpu_var(cpu_hw_counters);
-       if (!cpuhw->disabled) {
-               local_irq_restore(flags);
-               return;
-       }
-       cpuhw->disabled = 0;
-
-       /*
-        * If we didn't change anything, or only removed counters,
-        * no need to recalculate MMCR* settings and reset the PMCs.
-        * Just reenable the PMU with the current MMCR* settings
-        * (possibly updated for removal of counters).
-        */
-       if (!cpuhw->n_added) {
-               mtspr(SPRN_MMCRA, cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
-               mtspr(SPRN_MMCR1, cpuhw->mmcr[1]);
-               if (cpuhw->n_counters == 0)
-                       ppc_set_pmu_inuse(0);
-               goto out_enable;
-       }
-
-       /*
-        * Compute MMCR* values for the new set of counters
-        */
-       if (ppmu->compute_mmcr(cpuhw->events, cpuhw->n_counters, hwc_index,
-                              cpuhw->mmcr)) {
-               /* shouldn't ever get here */
-               printk(KERN_ERR "oops compute_mmcr failed\n");
-               goto out;
-       }
-
-       /*
-        * Add in MMCR0 freeze bits corresponding to the
-        * attr.exclude_* bits for the first counter.
-        * We have already checked that all counters have the
-        * same values for these bits as the first counter.
-        */
-       counter = cpuhw->counter[0];
-       if (counter->attr.exclude_user)
-               cpuhw->mmcr[0] |= MMCR0_FCP;
-       if (counter->attr.exclude_kernel)
-               cpuhw->mmcr[0] |= freeze_counters_kernel;
-       if (counter->attr.exclude_hv)
-               cpuhw->mmcr[0] |= MMCR0_FCHV;
-
-       /*
-        * Write the new configuration to MMCR* with the freeze
-        * bit set and set the hardware counters to their initial values.
-        * Then unfreeze the counters.
-        */
-       ppc_set_pmu_inuse(1);
-       mtspr(SPRN_MMCRA, cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
-       mtspr(SPRN_MMCR1, cpuhw->mmcr[1]);
-       mtspr(SPRN_MMCR0, (cpuhw->mmcr[0] & ~(MMCR0_PMC1CE | MMCR0_PMCjCE))
-                               | MMCR0_FC);
-
-       /*
-        * Read off any pre-existing counters that need to move
-        * to another PMC.
-        */
-       for (i = 0; i < cpuhw->n_counters; ++i) {
-               counter = cpuhw->counter[i];
-               if (counter->hw.idx && counter->hw.idx != hwc_index[i] + 1) {
-                       power_pmu_read(counter);
-                       write_pmc(counter->hw.idx, 0);
-                       counter->hw.idx = 0;
-               }
-       }
-
-       /*
-        * Initialize the PMCs for all the new and moved counters.
-        */
-       cpuhw->n_limited = n_lim = 0;
-       for (i = 0; i < cpuhw->n_counters; ++i) {
-               counter = cpuhw->counter[i];
-               if (counter->hw.idx)
-                       continue;
-               idx = hwc_index[i] + 1;
-               if (is_limited_pmc(idx)) {
-                       cpuhw->limited_counter[n_lim] = counter;
-                       cpuhw->limited_hwidx[n_lim] = idx;
-                       ++n_lim;
-                       continue;
-               }
-               val = 0;
-               if (counter->hw.sample_period) {
-                       left = atomic64_read(&counter->hw.period_left);
-                       if (left < 0x80000000L)
-                               val = 0x80000000L - left;
-               }
-               atomic64_set(&counter->hw.prev_count, val);
-               counter->hw.idx = idx;
-               write_pmc(idx, val);
-               perf_counter_update_userpage(counter);
-       }
-       cpuhw->n_limited = n_lim;
-       cpuhw->mmcr[0] |= MMCR0_PMXE | MMCR0_FCECE;
-
- out_enable:
-       mb();
-       write_mmcr0(cpuhw, cpuhw->mmcr[0]);
-
-       /*
-        * Enable instruction sampling if necessary
-        */
-       if (cpuhw->mmcr[2] & MMCRA_SAMPLE_ENABLE) {
-               mb();
-               mtspr(SPRN_MMCRA, cpuhw->mmcr[2]);
-       }
-
- out:
-       local_irq_restore(flags);
-}
-
-static int collect_events(struct perf_counter *group, int max_count,
-                         struct perf_counter *ctrs[], u64 *events,
-                         unsigned int *flags)
-{
-       int n = 0;
-       struct perf_counter *counter;
-
-       if (!is_software_counter(group)) {
-               if (n >= max_count)
-                       return -1;
-               ctrs[n] = group;
-               flags[n] = group->hw.counter_base;
-               events[n++] = group->hw.config;
-       }
-       list_for_each_entry(counter, &group->sibling_list, list_entry) {
-               if (!is_software_counter(counter) &&
-                   counter->state != PERF_COUNTER_STATE_OFF) {
-                       if (n >= max_count)
-                               return -1;
-                       ctrs[n] = counter;
-                       flags[n] = counter->hw.counter_base;
-                       events[n++] = counter->hw.config;
-               }
-       }
-       return n;
-}
-
-static void counter_sched_in(struct perf_counter *counter, int cpu)
-{
-       counter->state = PERF_COUNTER_STATE_ACTIVE;
-       counter->oncpu = cpu;
-       counter->tstamp_running += counter->ctx->time - counter->tstamp_stopped;
-       if (is_software_counter(counter))
-               counter->pmu->enable(counter);
-}
-
-/*
- * Called to enable a whole group of counters.
- * Returns 1 if the group was enabled, or -EAGAIN if it could not be.
- * Assumes the caller has disabled interrupts and has
- * frozen the PMU with hw_perf_save_disable.
- */
-int hw_perf_group_sched_in(struct perf_counter *group_leader,
-              struct perf_cpu_context *cpuctx,
-              struct perf_counter_context *ctx, int cpu)
-{
-       struct cpu_hw_counters *cpuhw;
-       long i, n, n0;
-       struct perf_counter *sub;
-
-       if (!ppmu)
-               return 0;
-       cpuhw = &__get_cpu_var(cpu_hw_counters);
-       n0 = cpuhw->n_counters;
-       n = collect_events(group_leader, ppmu->n_counter - n0,
-                          &cpuhw->counter[n0], &cpuhw->events[n0],
-                          &cpuhw->flags[n0]);
-       if (n < 0)
-               return -EAGAIN;
-       if (check_excludes(cpuhw->counter, cpuhw->flags, n0, n))
-               return -EAGAIN;
-       i = power_check_constraints(cpuhw, cpuhw->events, cpuhw->flags, n + n0);
-       if (i < 0)
-               return -EAGAIN;
-       cpuhw->n_counters = n0 + n;
-       cpuhw->n_added += n;
-
-       /*
-        * OK, this group can go on; update counter states etc.,
-        * and enable any software counters
-        */
-       for (i = n0; i < n0 + n; ++i)
-               cpuhw->counter[i]->hw.config = cpuhw->events[i];
-       cpuctx->active_oncpu += n;
-       n = 1;
-       counter_sched_in(group_leader, cpu);
-       list_for_each_entry(sub, &group_leader->sibling_list, list_entry) {
-               if (sub->state != PERF_COUNTER_STATE_OFF) {
-                       counter_sched_in(sub, cpu);
-                       ++n;
-               }
-       }
-       ctx->nr_active += n;
-
-       return 1;
-}
-
-/*
- * Add a counter to the PMU.
- * If all counters are not already frozen, then we disable and
- * re-enable the PMU in order to get hw_perf_enable to do the
- * actual work of reconfiguring the PMU.
- */
-static int power_pmu_enable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuhw;
-       unsigned long flags;
-       int n0;
-       int ret = -EAGAIN;
-
-       local_irq_save(flags);
-       perf_disable();
-
-       /*
-        * Add the counter to the list (if there is room)
-        * and check whether the total set is still feasible.
-        */
-       cpuhw = &__get_cpu_var(cpu_hw_counters);
-       n0 = cpuhw->n_counters;
-       if (n0 >= ppmu->n_counter)
-               goto out;
-       cpuhw->counter[n0] = counter;
-       cpuhw->events[n0] = counter->hw.config;
-       cpuhw->flags[n0] = counter->hw.counter_base;
-       if (check_excludes(cpuhw->counter, cpuhw->flags, n0, 1))
-               goto out;
-       if (power_check_constraints(cpuhw, cpuhw->events, cpuhw->flags, n0 + 1))
-               goto out;
-
-       counter->hw.config = cpuhw->events[n0];
-       ++cpuhw->n_counters;
-       ++cpuhw->n_added;
-
-       ret = 0;
- out:
-       perf_enable();
-       local_irq_restore(flags);
-       return ret;
-}
-
-/*
- * Remove a counter from the PMU.
- */
-static void power_pmu_disable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuhw;
-       long i;
-       unsigned long flags;
-
-       local_irq_save(flags);
-       perf_disable();
-
-       power_pmu_read(counter);
-
-       cpuhw = &__get_cpu_var(cpu_hw_counters);
-       for (i = 0; i < cpuhw->n_counters; ++i) {
-               if (counter == cpuhw->counter[i]) {
-                       while (++i < cpuhw->n_counters)
-                               cpuhw->counter[i-1] = cpuhw->counter[i];
-                       --cpuhw->n_counters;
-                       ppmu->disable_pmc(counter->hw.idx - 1, cpuhw->mmcr);
-                       if (counter->hw.idx) {
-                               write_pmc(counter->hw.idx, 0);
-                               counter->hw.idx = 0;
-                       }
-                       perf_counter_update_userpage(counter);
-                       break;
-               }
-       }
-       for (i = 0; i < cpuhw->n_limited; ++i)
-               if (counter == cpuhw->limited_counter[i])
-                       break;
-       if (i < cpuhw->n_limited) {
-               while (++i < cpuhw->n_limited) {
-                       cpuhw->limited_counter[i-1] = cpuhw->limited_counter[i];
-                       cpuhw->limited_hwidx[i-1] = cpuhw->limited_hwidx[i];
-               }
-               --cpuhw->n_limited;
-       }
-       if (cpuhw->n_counters == 0) {
-               /* disable exceptions if no counters are running */
-               cpuhw->mmcr[0] &= ~(MMCR0_PMXE | MMCR0_FCECE);
-       }
-
-       perf_enable();
-       local_irq_restore(flags);
-}
-
-/*
- * Re-enable interrupts on a counter after they were throttled
- * because they were coming too fast.
- */
-static void power_pmu_unthrottle(struct perf_counter *counter)
-{
-       s64 val, left;
-       unsigned long flags;
-
-       if (!counter->hw.idx || !counter->hw.sample_period)
-               return;
-       local_irq_save(flags);
-       perf_disable();
-       power_pmu_read(counter);
-       left = counter->hw.sample_period;
-       counter->hw.last_period = left;
-       val = 0;
-       if (left < 0x80000000L)
-               val = 0x80000000L - left;
-       write_pmc(counter->hw.idx, val);
-       atomic64_set(&counter->hw.prev_count, val);
-       atomic64_set(&counter->hw.period_left, left);
-       perf_counter_update_userpage(counter);
-       perf_enable();
-       local_irq_restore(flags);
-}
-
-struct pmu power_pmu = {
-       .enable         = power_pmu_enable,
-       .disable        = power_pmu_disable,
-       .read           = power_pmu_read,
-       .unthrottle     = power_pmu_unthrottle,
-};
-
-/*
- * Return 1 if we might be able to put counter on a limited PMC,
- * or 0 if not.
- * A counter can only go on a limited PMC if it counts something
- * that a limited PMC can count, doesn't require interrupts, and
- * doesn't exclude any processor mode.
- */
-static int can_go_on_limited_pmc(struct perf_counter *counter, u64 ev,
-                                unsigned int flags)
-{
-       int n;
-       u64 alt[MAX_EVENT_ALTERNATIVES];
-
-       if (counter->attr.exclude_user
-           || counter->attr.exclude_kernel
-           || counter->attr.exclude_hv
-           || counter->attr.sample_period)
-               return 0;
-
-       if (ppmu->limited_pmc_event(ev))
-               return 1;
-
-       /*
-        * The requested event isn't on a limited PMC already;
-        * see if any alternative code goes on a limited PMC.
-        */
-       if (!ppmu->get_alternatives)
-               return 0;
-
-       flags |= PPMU_LIMITED_PMC_OK | PPMU_LIMITED_PMC_REQD;
-       n = ppmu->get_alternatives(ev, flags, alt);
-
-       return n > 0;
-}
-
-/*
- * Find an alternative event that goes on a normal PMC, if possible,
- * and return the event code, or 0 if there is no such alternative.
- * (Note: event code 0 is "don't count" on all machines.)
- */
-static u64 normal_pmc_alternative(u64 ev, unsigned long flags)
-{
-       u64 alt[MAX_EVENT_ALTERNATIVES];
-       int n;
-
-       flags &= ~(PPMU_LIMITED_PMC_OK | PPMU_LIMITED_PMC_REQD);
-       n = ppmu->get_alternatives(ev, flags, alt);
-       if (!n)
-               return 0;
-       return alt[0];
-}
-
-/* Number of perf_counters counting hardware events */
-static atomic_t num_counters;
-/* Used to avoid races in calling reserve/release_pmc_hardware */
-static DEFINE_MUTEX(pmc_reserve_mutex);
-
-/*
- * Release the PMU if this is the last perf_counter.
- */
-static void hw_perf_counter_destroy(struct perf_counter *counter)
-{
-       if (!atomic_add_unless(&num_counters, -1, 1)) {
-               mutex_lock(&pmc_reserve_mutex);
-               if (atomic_dec_return(&num_counters) == 0)
-                       release_pmc_hardware();
-               mutex_unlock(&pmc_reserve_mutex);
-       }
-}
-
-/*
- * Translate a generic cache event config to a raw event code.
- */
-static int hw_perf_cache_event(u64 config, u64 *eventp)
-{
-       unsigned long type, op, result;
-       int ev;
-
-       if (!ppmu->cache_events)
-               return -EINVAL;
-
-       /* unpack config */
-       type = config & 0xff;
-       op = (config >> 8) & 0xff;
-       result = (config >> 16) & 0xff;
-
-       if (type >= PERF_COUNT_HW_CACHE_MAX ||
-           op >= PERF_COUNT_HW_CACHE_OP_MAX ||
-           result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
-               return -EINVAL;
-
-       ev = (*ppmu->cache_events)[type][op][result];
-       if (ev == 0)
-               return -EOPNOTSUPP;
-       if (ev == -1)
-               return -EINVAL;
-       *eventp = ev;
-       return 0;
-}
-
-const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
-{
-       u64 ev;
-       unsigned long flags;
-       struct perf_counter *ctrs[MAX_HWCOUNTERS];
-       u64 events[MAX_HWCOUNTERS];
-       unsigned int cflags[MAX_HWCOUNTERS];
-       int n;
-       int err;
-       struct cpu_hw_counters *cpuhw;
-
-       if (!ppmu)
-               return ERR_PTR(-ENXIO);
-       switch (counter->attr.type) {
-       case PERF_TYPE_HARDWARE:
-               ev = counter->attr.config;
-               if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0)
-                       return ERR_PTR(-EOPNOTSUPP);
-               ev = ppmu->generic_events[ev];
-               break;
-       case PERF_TYPE_HW_CACHE:
-               err = hw_perf_cache_event(counter->attr.config, &ev);
-               if (err)
-                       return ERR_PTR(err);
-               break;
-       case PERF_TYPE_RAW:
-               ev = counter->attr.config;
-               break;
-       default:
-               return ERR_PTR(-EINVAL);
-       }
-       counter->hw.config_base = ev;
-       counter->hw.idx = 0;
-
-       /*
-        * If we are not running on a hypervisor, force the
-        * exclude_hv bit to 0 so that we don't care what
-        * the user set it to.
-        */
-       if (!firmware_has_feature(FW_FEATURE_LPAR))
-               counter->attr.exclude_hv = 0;
-
-       /*
-        * If this is a per-task counter, then we can use
-        * PM_RUN_* events interchangeably with their non RUN_*
-        * equivalents, e.g. PM_RUN_CYC instead of PM_CYC.
-        * XXX we should check if the task is an idle task.
-        */
-       flags = 0;
-       if (counter->ctx->task)
-               flags |= PPMU_ONLY_COUNT_RUN;
-
-       /*
-        * If this machine has limited counters, check whether this
-        * event could go on a limited counter.
-        */
-       if (ppmu->flags & PPMU_LIMITED_PMC5_6) {
-               if (can_go_on_limited_pmc(counter, ev, flags)) {
-                       flags |= PPMU_LIMITED_PMC_OK;
-               } else if (ppmu->limited_pmc_event(ev)) {
-                       /*
-                        * The requested event is on a limited PMC,
-                        * but we can't use a limited PMC; see if any
-                        * alternative goes on a normal PMC.
-                        */
-                       ev = normal_pmc_alternative(ev, flags);
-                       if (!ev)
-                               return ERR_PTR(-EINVAL);
-               }
-       }
-
-       /*
-        * If this is in a group, check if it can go on with all the
-        * other hardware counters in the group.  We assume the counter
-        * hasn't been linked into its leader's sibling list at this point.
-        */
-       n = 0;
-       if (counter->group_leader != counter) {
-               n = collect_events(counter->group_leader, ppmu->n_counter - 1,
-                                  ctrs, events, cflags);
-               if (n < 0)
-                       return ERR_PTR(-EINVAL);
-       }
-       events[n] = ev;
-       ctrs[n] = counter;
-       cflags[n] = flags;
-       if (check_excludes(ctrs, cflags, n, 1))
-               return ERR_PTR(-EINVAL);
-
-       cpuhw = &get_cpu_var(cpu_hw_counters);
-       err = power_check_constraints(cpuhw, events, cflags, n + 1);
-       put_cpu_var(cpu_hw_counters);
-       if (err)
-               return ERR_PTR(-EINVAL);
-
-       counter->hw.config = events[n];
-       counter->hw.counter_base = cflags[n];
-       counter->hw.last_period = counter->hw.sample_period;
-       atomic64_set(&counter->hw.period_left, counter->hw.last_period);
-
-       /*
-        * See if we need to reserve the PMU.
-        * If no counters are currently in use, then we have to take a
-        * mutex to ensure that we don't race with another task doing
-        * reserve_pmc_hardware or release_pmc_hardware.
-        */
-       err = 0;
-       if (!atomic_inc_not_zero(&num_counters)) {
-               mutex_lock(&pmc_reserve_mutex);
-               if (atomic_read(&num_counters) == 0 &&
-                   reserve_pmc_hardware(perf_counter_interrupt))
-                       err = -EBUSY;
-               else
-                       atomic_inc(&num_counters);
-               mutex_unlock(&pmc_reserve_mutex);
-       }
-       counter->destroy = hw_perf_counter_destroy;
-
-       if (err)
-               return ERR_PTR(err);
-       return &power_pmu;
-}
-
-/*
- * A counter has overflowed; update its count and record
- * things if requested.  Note that interrupts are hard-disabled
- * here so there is no possibility of being interrupted.
- */
-static void record_and_restart(struct perf_counter *counter, unsigned long val,
-                              struct pt_regs *regs, int nmi)
-{
-       u64 period = counter->hw.sample_period;
-       s64 prev, delta, left;
-       int record = 0;
-
-       /* we don't have to worry about interrupts here */
-       prev = atomic64_read(&counter->hw.prev_count);
-       delta = (val - prev) & 0xfffffffful;
-       atomic64_add(delta, &counter->count);
-
-       /*
-        * See if the total period for this counter has expired,
-        * and update for the next period.
-        */
-       val = 0;
-       left = atomic64_read(&counter->hw.period_left) - delta;
-       if (period) {
-               if (left <= 0) {
-                       left += period;
-                       if (left <= 0)
-                               left = period;
-                       record = 1;
-               }
-               if (left < 0x80000000LL)
-                       val = 0x80000000LL - left;
-       }
-
-       /*
-        * Finally record data if requested.
-        */
-       if (record) {
-               struct perf_sample_data data = {
-                       .regs   = regs,
-                       .addr   = 0,
-                       .period = counter->hw.last_period,
-               };
-
-               if (counter->attr.sample_type & PERF_SAMPLE_ADDR)
-                       perf_get_data_addr(regs, &data.addr);
-
-               if (perf_counter_overflow(counter, nmi, &data)) {
-                       /*
-                        * Interrupts are coming too fast - throttle them
-                        * by setting the counter to 0, so it will be
-                        * at least 2^30 cycles until the next interrupt
-                        * (assuming each counter counts at most 2 counts
-                        * per cycle).
-                        */
-                       val = 0;
-                       left = ~0ULL >> 1;
-               }
-       }
-
-       write_pmc(counter->hw.idx, val);
-       atomic64_set(&counter->hw.prev_count, val);
-       atomic64_set(&counter->hw.period_left, left);
-       perf_counter_update_userpage(counter);
-}
-
-/*
- * Called from generic code to get the misc flags (i.e. processor mode)
- * for an event.
- */
-unsigned long perf_misc_flags(struct pt_regs *regs)
-{
-       u32 flags = perf_get_misc_flags(regs);
-
-       if (flags)
-               return flags;
-       return user_mode(regs) ? PERF_EVENT_MISC_USER :
-               PERF_EVENT_MISC_KERNEL;
-}
-
-/*
- * Called from generic code to get the instruction pointer
- * for an event.
- */
-unsigned long perf_instruction_pointer(struct pt_regs *regs)
-{
-       unsigned long ip;
-
-       if (TRAP(regs) != 0xf00)
-               return regs->nip;       /* not a PMU interrupt */
-
-       ip = mfspr(SPRN_SIAR) + perf_ip_adjust(regs);
-       return ip;
-}
-
-/*
- * Performance monitor interrupt stuff
- */
-static void perf_counter_interrupt(struct pt_regs *regs)
-{
-       int i;
-       struct cpu_hw_counters *cpuhw = &__get_cpu_var(cpu_hw_counters);
-       struct perf_counter *counter;
-       unsigned long val;
-       int found = 0;
-       int nmi;
-
-       if (cpuhw->n_limited)
-               freeze_limited_counters(cpuhw, mfspr(SPRN_PMC5),
-                                       mfspr(SPRN_PMC6));
-
-       perf_read_regs(regs);
-
-       nmi = perf_intr_is_nmi(regs);
-       if (nmi)
-               nmi_enter();
-       else
-               irq_enter();
-
-       for (i = 0; i < cpuhw->n_counters; ++i) {
-               counter = cpuhw->counter[i];
-               if (!counter->hw.idx || is_limited_pmc(counter->hw.idx))
-                       continue;
-               val = read_pmc(counter->hw.idx);
-               if ((int)val < 0) {
-                       /* counter has overflowed */
-                       found = 1;
-                       record_and_restart(counter, val, regs, nmi);
-               }
-       }
-
-       /*
-        * In case we didn't find and reset the counter that caused
-        * the interrupt, scan all counters and reset any that are
-        * negative, to avoid getting continual interrupts.
-        * Any that we processed in the previous loop will not be negative.
-        */
-       if (!found) {
-               for (i = 0; i < ppmu->n_counter; ++i) {
-                       if (is_limited_pmc(i + 1))
-                               continue;
-                       val = read_pmc(i + 1);
-                       if ((int)val < 0)
-                               write_pmc(i + 1, 0);
-               }
-       }
-
-       /*
-        * Reset MMCR0 to its normal value.  This will set PMXE and
-        * clear FC (freeze counters) and PMAO (perf mon alert occurred)
-        * and thus allow interrupts to occur again.
-        * XXX might want to use MSR.PM to keep the counters frozen until
-        * we get back out of this interrupt.
-        */
-       write_mmcr0(cpuhw, cpuhw->mmcr[0]);
-
-       if (nmi)
-               nmi_exit();
-       else
-               irq_exit();
-}
-
-void hw_perf_counter_setup(int cpu)
-{
-       struct cpu_hw_counters *cpuhw = &per_cpu(cpu_hw_counters, cpu);
-
-       if (!ppmu)
-               return;
-       memset(cpuhw, 0, sizeof(*cpuhw));
-       cpuhw->mmcr[0] = MMCR0_FC;
-}
-
-int register_power_pmu(struct power_pmu *pmu)
-{
-       if (ppmu)
-               return -EBUSY;          /* something's already registered */
-
-       ppmu = pmu;
-       pr_info("%s performance monitor hardware support registered\n",
-               pmu->name);
-
-#ifdef MSR_HV
-       /*
-        * Use FCHV to ignore kernel events if MSR.HV is set.
-        */
-       if (mfmsr() & MSR_HV)
-               freeze_counters_kernel = MMCR0_FCHV;
-#endif /* CONFIG_PPC64 */
-
-       return 0;
-}
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
new file mode 100644 (file)
index 0000000..bbcbae1
--- /dev/null
@@ -0,0 +1,1315 @@
+/*
+ * Performance event support - powerpc architecture code
+ *
+ * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/perf_event.h>
+#include <linux/percpu.h>
+#include <linux/hardirq.h>
+#include <asm/reg.h>
+#include <asm/pmc.h>
+#include <asm/machdep.h>
+#include <asm/firmware.h>
+#include <asm/ptrace.h>
+
+struct cpu_hw_events {
+       int n_events;
+       int n_percpu;
+       int disabled;
+       int n_added;
+       int n_limited;
+       u8  pmcs_enabled;
+       struct perf_event *event[MAX_HWEVENTS];
+       u64 events[MAX_HWEVENTS];
+       unsigned int flags[MAX_HWEVENTS];
+       unsigned long mmcr[3];
+       struct perf_event *limited_counter[MAX_LIMITED_HWCOUNTERS];
+       u8  limited_hwidx[MAX_LIMITED_HWCOUNTERS];
+       u64 alternatives[MAX_HWEVENTS][MAX_EVENT_ALTERNATIVES];
+       unsigned long amasks[MAX_HWEVENTS][MAX_EVENT_ALTERNATIVES];
+       unsigned long avalues[MAX_HWEVENTS][MAX_EVENT_ALTERNATIVES];
+};
+DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events);
+
+struct power_pmu *ppmu;
+
+/*
+ * Normally, to ignore kernel events we set the FCS (freeze counters
+ * in supervisor mode) bit in MMCR0, but if the kernel runs with the
+ * hypervisor bit set in the MSR, or if we are running on a processor
+ * where the hypervisor bit is forced to 1 (as on Apple G5 processors),
+ * then we need to use the FCHV bit to ignore kernel events.
+ */
+static unsigned int freeze_events_kernel = MMCR0_FCS;
+
+/*
+ * 32-bit doesn't have MMCRA but does have an MMCR2,
+ * and a few other names are different.
+ */
+#ifdef CONFIG_PPC32
+
+#define MMCR0_FCHV             0
+#define MMCR0_PMCjCE           MMCR0_PMCnCE
+
+#define SPRN_MMCRA             SPRN_MMCR2
+#define MMCRA_SAMPLE_ENABLE    0
+
+static inline unsigned long perf_ip_adjust(struct pt_regs *regs)
+{
+       return 0;
+}
+static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) { }
+static inline u32 perf_get_misc_flags(struct pt_regs *regs)
+{
+       return 0;
+}
+static inline void perf_read_regs(struct pt_regs *regs) { }
+static inline int perf_intr_is_nmi(struct pt_regs *regs)
+{
+       return 0;
+}
+
+#endif /* CONFIG_PPC32 */
+
+/*
+ * Things that are specific to 64-bit implementations.
+ */
+#ifdef CONFIG_PPC64
+
+static inline unsigned long perf_ip_adjust(struct pt_regs *regs)
+{
+       unsigned long mmcra = regs->dsisr;
+
+       if ((mmcra & MMCRA_SAMPLE_ENABLE) && !(ppmu->flags & PPMU_ALT_SIPR)) {
+               unsigned long slot = (mmcra & MMCRA_SLOT) >> MMCRA_SLOT_SHIFT;
+               if (slot > 1)
+                       return 4 * (slot - 1);
+       }
+       return 0;
+}
+
+/*
+ * The user wants a data address recorded.
+ * If we're not doing instruction sampling, give them the SDAR
+ * (sampled data address).  If we are doing instruction sampling, then
+ * only give them the SDAR if it corresponds to the instruction
+ * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC
+ * bit in MMCRA.
+ */
+static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp)
+{
+       unsigned long mmcra = regs->dsisr;
+       unsigned long sdsync = (ppmu->flags & PPMU_ALT_SIPR) ?
+               POWER6_MMCRA_SDSYNC : MMCRA_SDSYNC;
+
+       if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync))
+               *addrp = mfspr(SPRN_SDAR);
+}
+
+static inline u32 perf_get_misc_flags(struct pt_regs *regs)
+{
+       unsigned long mmcra = regs->dsisr;
+
+       if (TRAP(regs) != 0xf00)
+               return 0;       /* not a PMU interrupt */
+
+       if (ppmu->flags & PPMU_ALT_SIPR) {
+               if (mmcra & POWER6_MMCRA_SIHV)
+                       return PERF_RECORD_MISC_HYPERVISOR;
+               return (mmcra & POWER6_MMCRA_SIPR) ?
+                       PERF_RECORD_MISC_USER : PERF_RECORD_MISC_KERNEL;
+       }
+       if (mmcra & MMCRA_SIHV)
+               return PERF_RECORD_MISC_HYPERVISOR;
+       return (mmcra & MMCRA_SIPR) ? PERF_RECORD_MISC_USER :
+               PERF_RECORD_MISC_KERNEL;
+}
+
+/*
+ * Overload regs->dsisr to store MMCRA so we only need to read it once
+ * on each interrupt.
+ */
+static inline void perf_read_regs(struct pt_regs *regs)
+{
+       regs->dsisr = mfspr(SPRN_MMCRA);
+}
+
+/*
+ * If interrupts were soft-disabled when a PMU interrupt occurs, treat
+ * it as an NMI.
+ */
+static inline int perf_intr_is_nmi(struct pt_regs *regs)
+{
+       return !regs->softe;
+}
+
+#endif /* CONFIG_PPC64 */
+
+static void perf_event_interrupt(struct pt_regs *regs);
+
+void perf_event_print_debug(void)
+{
+}
+
+/*
+ * Read one performance monitor counter (PMC).
+ */
+static unsigned long read_pmc(int idx)
+{
+       unsigned long val;
+
+       switch (idx) {
+       case 1:
+               val = mfspr(SPRN_PMC1);
+               break;
+       case 2:
+               val = mfspr(SPRN_PMC2);
+               break;
+       case 3:
+               val = mfspr(SPRN_PMC3);
+               break;
+       case 4:
+               val = mfspr(SPRN_PMC4);
+               break;
+       case 5:
+               val = mfspr(SPRN_PMC5);
+               break;
+       case 6:
+               val = mfspr(SPRN_PMC6);
+               break;
+#ifdef CONFIG_PPC64
+       case 7:
+               val = mfspr(SPRN_PMC7);
+               break;
+       case 8:
+               val = mfspr(SPRN_PMC8);
+               break;
+#endif /* CONFIG_PPC64 */
+       default:
+               printk(KERN_ERR "oops trying to read PMC%d\n", idx);
+               val = 0;
+       }
+       return val;
+}
+
+/*
+ * Write one PMC.
+ */
+static void write_pmc(int idx, unsigned long val)
+{
+       switch (idx) {
+       case 1:
+               mtspr(SPRN_PMC1, val);
+               break;
+       case 2:
+               mtspr(SPRN_PMC2, val);
+               break;
+       case 3:
+               mtspr(SPRN_PMC3, val);
+               break;
+       case 4:
+               mtspr(SPRN_PMC4, val);
+               break;
+       case 5:
+               mtspr(SPRN_PMC5, val);
+               break;
+       case 6:
+               mtspr(SPRN_PMC6, val);
+               break;
+#ifdef CONFIG_PPC64
+       case 7:
+               mtspr(SPRN_PMC7, val);
+               break;
+       case 8:
+               mtspr(SPRN_PMC8, val);
+               break;
+#endif /* CONFIG_PPC64 */
+       default:
+               printk(KERN_ERR "oops trying to write PMC%d\n", idx);
+       }
+}
+
+/*
+ * Check if a set of events can all go on the PMU at once.
+ * If they can't, this will look at alternative codes for the events
+ * and see if any combination of alternative codes is feasible.
+ * The feasible set is returned in event_id[].
+ */
+static int power_check_constraints(struct cpu_hw_events *cpuhw,
+                                  u64 event_id[], unsigned int cflags[],
+                                  int n_ev)
+{
+       unsigned long mask, value, nv;
+       unsigned long smasks[MAX_HWEVENTS], svalues[MAX_HWEVENTS];
+       int n_alt[MAX_HWEVENTS], choice[MAX_HWEVENTS];
+       int i, j;
+       unsigned long addf = ppmu->add_fields;
+       unsigned long tadd = ppmu->test_adder;
+
+       if (n_ev > ppmu->n_counter)
+               return -1;
+
+       /* First see if the events will go on as-is */
+       for (i = 0; i < n_ev; ++i) {
+               if ((cflags[i] & PPMU_LIMITED_PMC_REQD)
+                   && !ppmu->limited_pmc_event(event_id[i])) {
+                       ppmu->get_alternatives(event_id[i], cflags[i],
+                                              cpuhw->alternatives[i]);
+                       event_id[i] = cpuhw->alternatives[i][0];
+               }
+               if (ppmu->get_constraint(event_id[i], &cpuhw->amasks[i][0],
+                                        &cpuhw->avalues[i][0]))
+                       return -1;
+       }
+       value = mask = 0;
+       for (i = 0; i < n_ev; ++i) {
+               nv = (value | cpuhw->avalues[i][0]) +
+                       (value & cpuhw->avalues[i][0] & addf);
+               if ((((nv + tadd) ^ value) & mask) != 0 ||
+                   (((nv + tadd) ^ cpuhw->avalues[i][0]) &
+                    cpuhw->amasks[i][0]) != 0)
+                       break;
+               value = nv;
+               mask |= cpuhw->amasks[i][0];
+       }
+       if (i == n_ev)
+               return 0;       /* all OK */
+
+       /* doesn't work, gather alternatives... */
+       if (!ppmu->get_alternatives)
+               return -1;
+       for (i = 0; i < n_ev; ++i) {
+               choice[i] = 0;
+               n_alt[i] = ppmu->get_alternatives(event_id[i], cflags[i],
+                                                 cpuhw->alternatives[i]);
+               for (j = 1; j < n_alt[i]; ++j)
+                       ppmu->get_constraint(cpuhw->alternatives[i][j],
+                                            &cpuhw->amasks[i][j],
+                                            &cpuhw->avalues[i][j]);
+       }
+
+       /* enumerate all possibilities and see if any will work */
+       i = 0;
+       j = -1;
+       value = mask = nv = 0;
+       while (i < n_ev) {
+               if (j >= 0) {
+                       /* we're backtracking, restore context */
+                       value = svalues[i];
+                       mask = smasks[i];
+                       j = choice[i];
+               }
+               /*
+                * See if any alternative k for event_id i,
+                * where k > j, will satisfy the constraints.
+                */
+               while (++j < n_alt[i]) {
+                       nv = (value | cpuhw->avalues[i][j]) +
+                               (value & cpuhw->avalues[i][j] & addf);
+                       if ((((nv + tadd) ^ value) & mask) == 0 &&
+                           (((nv + tadd) ^ cpuhw->avalues[i][j])
+                            & cpuhw->amasks[i][j]) == 0)
+                               break;
+               }
+               if (j >= n_alt[i]) {
+                       /*
+                        * No feasible alternative, backtrack
+                        * to event_id i-1 and continue enumerating its
+                        * alternatives from where we got up to.
+                        */
+                       if (--i < 0)
+                               return -1;
+               } else {
+                       /*
+                        * Found a feasible alternative for event_id i,
+                        * remember where we got up to with this event_id,
+                        * go on to the next event_id, and start with
+                        * the first alternative for it.
+                        */
+                       choice[i] = j;
+                       svalues[i] = value;
+                       smasks[i] = mask;
+                       value = nv;
+                       mask |= cpuhw->amasks[i][j];
+                       ++i;
+                       j = -1;
+               }
+       }
+
+       /* OK, we have a feasible combination, tell the caller the solution */
+       for (i = 0; i < n_ev; ++i)
+               event_id[i] = cpuhw->alternatives[i][choice[i]];
+       return 0;
+}
+
+/*
+ * Check if newly-added events have consistent settings for
+ * exclude_{user,kernel,hv} with each other and any previously
+ * added events.
+ */
+static int check_excludes(struct perf_event **ctrs, unsigned int cflags[],
+                         int n_prev, int n_new)
+{
+       int eu = 0, ek = 0, eh = 0;
+       int i, n, first;
+       struct perf_event *event;
+
+       n = n_prev + n_new;
+       if (n <= 1)
+               return 0;
+
+       first = 1;
+       for (i = 0; i < n; ++i) {
+               if (cflags[i] & PPMU_LIMITED_PMC_OK) {
+                       cflags[i] &= ~PPMU_LIMITED_PMC_REQD;
+                       continue;
+               }
+               event = ctrs[i];
+               if (first) {
+                       eu = event->attr.exclude_user;
+                       ek = event->attr.exclude_kernel;
+                       eh = event->attr.exclude_hv;
+                       first = 0;
+               } else if (event->attr.exclude_user != eu ||
+                          event->attr.exclude_kernel != ek ||
+                          event->attr.exclude_hv != eh) {
+                       return -EAGAIN;
+               }
+       }
+
+       if (eu || ek || eh)
+               for (i = 0; i < n; ++i)
+                       if (cflags[i] & PPMU_LIMITED_PMC_OK)
+                               cflags[i] |= PPMU_LIMITED_PMC_REQD;
+
+       return 0;
+}
+
+static void power_pmu_read(struct perf_event *event)
+{
+       s64 val, delta, prev;
+
+       if (!event->hw.idx)
+               return;
+       /*
+        * Performance monitor interrupts come even when interrupts
+        * are soft-disabled, as long as interrupts are hard-enabled.
+        * Therefore we treat them like NMIs.
+        */
+       do {
+               prev = atomic64_read(&event->hw.prev_count);
+               barrier();
+               val = read_pmc(event->hw.idx);
+       } while (atomic64_cmpxchg(&event->hw.prev_count, prev, val) != prev);
+
+       /* The counters are only 32 bits wide */
+       delta = (val - prev) & 0xfffffffful;
+       atomic64_add(delta, &event->count);
+       atomic64_sub(delta, &event->hw.period_left);
+}
+
+/*
+ * On some machines, PMC5 and PMC6 can't be written, don't respect
+ * the freeze conditions, and don't generate interrupts.  This tells
+ * us if `event' is using such a PMC.
+ */
+static int is_limited_pmc(int pmcnum)
+{
+       return (ppmu->flags & PPMU_LIMITED_PMC5_6)
+               && (pmcnum == 5 || pmcnum == 6);
+}
+
+static void freeze_limited_counters(struct cpu_hw_events *cpuhw,
+                                   unsigned long pmc5, unsigned long pmc6)
+{
+       struct perf_event *event;
+       u64 val, prev, delta;
+       int i;
+
+       for (i = 0; i < cpuhw->n_limited; ++i) {
+               event = cpuhw->limited_counter[i];
+               if (!event->hw.idx)
+                       continue;
+               val = (event->hw.idx == 5) ? pmc5 : pmc6;
+               prev = atomic64_read(&event->hw.prev_count);
+               event->hw.idx = 0;
+               delta = (val - prev) & 0xfffffffful;
+               atomic64_add(delta, &event->count);
+       }
+}
+
+static void thaw_limited_counters(struct cpu_hw_events *cpuhw,
+                                 unsigned long pmc5, unsigned long pmc6)
+{
+       struct perf_event *event;
+       u64 val;
+       int i;
+
+       for (i = 0; i < cpuhw->n_limited; ++i) {
+               event = cpuhw->limited_counter[i];
+               event->hw.idx = cpuhw->limited_hwidx[i];
+               val = (event->hw.idx == 5) ? pmc5 : pmc6;
+               atomic64_set(&event->hw.prev_count, val);
+               perf_event_update_userpage(event);
+       }
+}
+
+/*
+ * Since limited events don't respect the freeze conditions, we
+ * have to read them immediately after freezing or unfreezing the
+ * other events.  We try to keep the values from the limited
+ * events as consistent as possible by keeping the delay (in
+ * cycles and instructions) between freezing/unfreezing and reading
+ * the limited events as small and consistent as possible.
+ * Therefore, if any limited events are in use, we read them
+ * both, and always in the same order, to minimize variability,
+ * and do it inside the same asm that writes MMCR0.
+ */
+static void write_mmcr0(struct cpu_hw_events *cpuhw, unsigned long mmcr0)
+{
+       unsigned long pmc5, pmc6;
+
+       if (!cpuhw->n_limited) {
+               mtspr(SPRN_MMCR0, mmcr0);
+               return;
+       }
+
+       /*
+        * Write MMCR0, then read PMC5 and PMC6 immediately.
+        * To ensure we don't get a performance monitor interrupt
+        * between writing MMCR0 and freezing/thawing the limited
+        * events, we first write MMCR0 with the event overflow
+        * interrupt enable bits turned off.
+        */
+       asm volatile("mtspr %3,%2; mfspr %0,%4; mfspr %1,%5"
+                    : "=&r" (pmc5), "=&r" (pmc6)
+                    : "r" (mmcr0 & ~(MMCR0_PMC1CE | MMCR0_PMCjCE)),
+                      "i" (SPRN_MMCR0),
+                      "i" (SPRN_PMC5), "i" (SPRN_PMC6));
+
+       if (mmcr0 & MMCR0_FC)
+               freeze_limited_counters(cpuhw, pmc5, pmc6);
+       else
+               thaw_limited_counters(cpuhw, pmc5, pmc6);
+
+       /*
+        * Write the full MMCR0 including the event overflow interrupt
+        * enable bits, if necessary.
+        */
+       if (mmcr0 & (MMCR0_PMC1CE | MMCR0_PMCjCE))
+               mtspr(SPRN_MMCR0, mmcr0);
+}
+
+/*
+ * Disable all events to prevent PMU interrupts and to allow
+ * events to be added or removed.
+ */
+void hw_perf_disable(void)
+{
+       struct cpu_hw_events *cpuhw;
+       unsigned long flags;
+
+       if (!ppmu)
+               return;
+       local_irq_save(flags);
+       cpuhw = &__get_cpu_var(cpu_hw_events);
+
+       if (!cpuhw->disabled) {
+               cpuhw->disabled = 1;
+               cpuhw->n_added = 0;
+
+               /*
+                * Check if we ever enabled the PMU on this cpu.
+                */
+               if (!cpuhw->pmcs_enabled) {
+                       ppc_enable_pmcs();
+                       cpuhw->pmcs_enabled = 1;
+               }
+
+               /*
+                * Disable instruction sampling if it was enabled
+                */
+               if (cpuhw->mmcr[2] & MMCRA_SAMPLE_ENABLE) {
+                       mtspr(SPRN_MMCRA,
+                             cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
+                       mb();
+               }
+
+               /*
+                * Set the 'freeze counters' bit.
+                * The barrier is to make sure the mtspr has been
+                * executed and the PMU has frozen the events
+                * before we return.
+                */
+               write_mmcr0(cpuhw, mfspr(SPRN_MMCR0) | MMCR0_FC);
+               mb();
+       }
+       local_irq_restore(flags);
+}
+
+/*
+ * Re-enable all events if disable == 0.
+ * If we were previously disabled and events were added, then
+ * put the new config on the PMU.
+ */
+void hw_perf_enable(void)
+{
+       struct perf_event *event;
+       struct cpu_hw_events *cpuhw;
+       unsigned long flags;
+       long i;
+       unsigned long val;
+       s64 left;
+       unsigned int hwc_index[MAX_HWEVENTS];
+       int n_lim;
+       int idx;
+
+       if (!ppmu)
+               return;
+       local_irq_save(flags);
+       cpuhw = &__get_cpu_var(cpu_hw_events);
+       if (!cpuhw->disabled) {
+               local_irq_restore(flags);
+               return;
+       }
+       cpuhw->disabled = 0;
+
+       /*
+        * If we didn't change anything, or only removed events,
+        * no need to recalculate MMCR* settings and reset the PMCs.
+        * Just reenable the PMU with the current MMCR* settings
+        * (possibly updated for removal of events).
+        */
+       if (!cpuhw->n_added) {
+               mtspr(SPRN_MMCRA, cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
+               mtspr(SPRN_MMCR1, cpuhw->mmcr[1]);
+               if (cpuhw->n_events == 0)
+                       ppc_set_pmu_inuse(0);
+               goto out_enable;
+       }
+
+       /*
+        * Compute MMCR* values for the new set of events
+        */
+       if (ppmu->compute_mmcr(cpuhw->events, cpuhw->n_events, hwc_index,
+                              cpuhw->mmcr)) {
+               /* shouldn't ever get here */
+               printk(KERN_ERR "oops compute_mmcr failed\n");
+               goto out;
+       }
+
+       /*
+        * Add in MMCR0 freeze bits corresponding to the
+        * attr.exclude_* bits for the first event.
+        * We have already checked that all events have the
+        * same values for these bits as the first event.
+        */
+       event = cpuhw->event[0];
+       if (event->attr.exclude_user)
+               cpuhw->mmcr[0] |= MMCR0_FCP;
+       if (event->attr.exclude_kernel)
+               cpuhw->mmcr[0] |= freeze_events_kernel;
+       if (event->attr.exclude_hv)
+               cpuhw->mmcr[0] |= MMCR0_FCHV;
+
+       /*
+        * Write the new configuration to MMCR* with the freeze
+        * bit set and set the hardware events to their initial values.
+        * Then unfreeze the events.
+        */
+       ppc_set_pmu_inuse(1);
+       mtspr(SPRN_MMCRA, cpuhw->mmcr[2] & ~MMCRA_SAMPLE_ENABLE);
+       mtspr(SPRN_MMCR1, cpuhw->mmcr[1]);
+       mtspr(SPRN_MMCR0, (cpuhw->mmcr[0] & ~(MMCR0_PMC1CE | MMCR0_PMCjCE))
+                               | MMCR0_FC);
+
+       /*
+        * Read off any pre-existing events that need to move
+        * to another PMC.
+        */
+       for (i = 0; i < cpuhw->n_events; ++i) {
+               event = cpuhw->event[i];
+               if (event->hw.idx && event->hw.idx != hwc_index[i] + 1) {
+                       power_pmu_read(event);
+                       write_pmc(event->hw.idx, 0);
+                       event->hw.idx = 0;
+               }
+       }
+
+       /*
+        * Initialize the PMCs for all the new and moved events.
+        */
+       cpuhw->n_limited = n_lim = 0;
+       for (i = 0; i < cpuhw->n_events; ++i) {
+               event = cpuhw->event[i];
+               if (event->hw.idx)
+                       continue;
+               idx = hwc_index[i] + 1;
+               if (is_limited_pmc(idx)) {
+                       cpuhw->limited_counter[n_lim] = event;
+                       cpuhw->limited_hwidx[n_lim] = idx;
+                       ++n_lim;
+                       continue;
+               }
+               val = 0;
+               if (event->hw.sample_period) {
+                       left = atomic64_read(&event->hw.period_left);
+                       if (left < 0x80000000L)
+                               val = 0x80000000L - left;
+               }
+               atomic64_set(&event->hw.prev_count, val);
+               event->hw.idx = idx;
+               write_pmc(idx, val);
+               perf_event_update_userpage(event);
+       }
+       cpuhw->n_limited = n_lim;
+       cpuhw->mmcr[0] |= MMCR0_PMXE | MMCR0_FCECE;
+
+ out_enable:
+       mb();
+       write_mmcr0(cpuhw, cpuhw->mmcr[0]);
+
+       /*
+        * Enable instruction sampling if necessary
+        */
+       if (cpuhw->mmcr[2] & MMCRA_SAMPLE_ENABLE) {
+               mb();
+               mtspr(SPRN_MMCRA, cpuhw->mmcr[2]);
+       }
+
+ out:
+       local_irq_restore(flags);
+}
+
+static int collect_events(struct perf_event *group, int max_count,
+                         struct perf_event *ctrs[], u64 *events,
+                         unsigned int *flags)
+{
+       int n = 0;
+       struct perf_event *event;
+
+       if (!is_software_event(group)) {
+               if (n >= max_count)
+                       return -1;
+               ctrs[n] = group;
+               flags[n] = group->hw.event_base;
+               events[n++] = group->hw.config;
+       }
+       list_for_each_entry(event, &group->sibling_list, group_entry) {
+               if (!is_software_event(event) &&
+                   event->state != PERF_EVENT_STATE_OFF) {
+                       if (n >= max_count)
+                               return -1;
+                       ctrs[n] = event;
+                       flags[n] = event->hw.event_base;
+                       events[n++] = event->hw.config;
+               }
+       }
+       return n;
+}
+
+static void event_sched_in(struct perf_event *event, int cpu)
+{
+       event->state = PERF_EVENT_STATE_ACTIVE;
+       event->oncpu = cpu;
+       event->tstamp_running += event->ctx->time - event->tstamp_stopped;
+       if (is_software_event(event))
+               event->pmu->enable(event);
+}
+
+/*
+ * Called to enable a whole group of events.
+ * Returns 1 if the group was enabled, or -EAGAIN if it could not be.
+ * Assumes the caller has disabled interrupts and has
+ * frozen the PMU with hw_perf_save_disable.
+ */
+int hw_perf_group_sched_in(struct perf_event *group_leader,
+              struct perf_cpu_context *cpuctx,
+              struct perf_event_context *ctx, int cpu)
+{
+       struct cpu_hw_events *cpuhw;
+       long i, n, n0;
+       struct perf_event *sub;
+
+       if (!ppmu)
+               return 0;
+       cpuhw = &__get_cpu_var(cpu_hw_events);
+       n0 = cpuhw->n_events;
+       n = collect_events(group_leader, ppmu->n_counter - n0,
+                          &cpuhw->event[n0], &cpuhw->events[n0],
+                          &cpuhw->flags[n0]);
+       if (n < 0)
+               return -EAGAIN;
+       if (check_excludes(cpuhw->event, cpuhw->flags, n0, n))
+               return -EAGAIN;
+       i = power_check_constraints(cpuhw, cpuhw->events, cpuhw->flags, n + n0);
+       if (i < 0)
+               return -EAGAIN;
+       cpuhw->n_events = n0 + n;
+       cpuhw->n_added += n;
+
+       /*
+        * OK, this group can go on; update event states etc.,
+        * and enable any software events
+        */
+       for (i = n0; i < n0 + n; ++i)
+               cpuhw->event[i]->hw.config = cpuhw->events[i];
+       cpuctx->active_oncpu += n;
+       n = 1;
+       event_sched_in(group_leader, cpu);
+       list_for_each_entry(sub, &group_leader->sibling_list, group_entry) {
+               if (sub->state != PERF_EVENT_STATE_OFF) {
+                       event_sched_in(sub, cpu);
+                       ++n;
+               }
+       }
+       ctx->nr_active += n;
+
+       return 1;
+}
+
+/*
+ * Add a event to the PMU.
+ * If all events are not already frozen, then we disable and
+ * re-enable the PMU in order to get hw_perf_enable to do the
+ * actual work of reconfiguring the PMU.
+ */
+static int power_pmu_enable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuhw;
+       unsigned long flags;
+       int n0;
+       int ret = -EAGAIN;
+
+       local_irq_save(flags);
+       perf_disable();
+
+       /*
+        * Add the event to the list (if there is room)
+        * and check whether the total set is still feasible.
+        */
+       cpuhw = &__get_cpu_var(cpu_hw_events);
+       n0 = cpuhw->n_events;
+       if (n0 >= ppmu->n_counter)
+               goto out;
+       cpuhw->event[n0] = event;
+       cpuhw->events[n0] = event->hw.config;
+       cpuhw->flags[n0] = event->hw.event_base;
+       if (check_excludes(cpuhw->event, cpuhw->flags, n0, 1))
+               goto out;
+       if (power_check_constraints(cpuhw, cpuhw->events, cpuhw->flags, n0 + 1))
+               goto out;
+
+       event->hw.config = cpuhw->events[n0];
+       ++cpuhw->n_events;
+       ++cpuhw->n_added;
+
+       ret = 0;
+ out:
+       perf_enable();
+       local_irq_restore(flags);
+       return ret;
+}
+
+/*
+ * Remove a event from the PMU.
+ */
+static void power_pmu_disable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuhw;
+       long i;
+       unsigned long flags;
+
+       local_irq_save(flags);
+       perf_disable();
+
+       power_pmu_read(event);
+
+       cpuhw = &__get_cpu_var(cpu_hw_events);
+       for (i = 0; i < cpuhw->n_events; ++i) {
+               if (event == cpuhw->event[i]) {
+                       while (++i < cpuhw->n_events)
+                               cpuhw->event[i-1] = cpuhw->event[i];
+                       --cpuhw->n_events;
+                       ppmu->disable_pmc(event->hw.idx - 1, cpuhw->mmcr);
+                       if (event->hw.idx) {
+                               write_pmc(event->hw.idx, 0);
+                               event->hw.idx = 0;
+                       }
+                       perf_event_update_userpage(event);
+                       break;
+               }
+       }
+       for (i = 0; i < cpuhw->n_limited; ++i)
+               if (event == cpuhw->limited_counter[i])
+                       break;
+       if (i < cpuhw->n_limited) {
+               while (++i < cpuhw->n_limited) {
+                       cpuhw->limited_counter[i-1] = cpuhw->limited_counter[i];
+                       cpuhw->limited_hwidx[i-1] = cpuhw->limited_hwidx[i];
+               }
+               --cpuhw->n_limited;
+       }
+       if (cpuhw->n_events == 0) {
+               /* disable exceptions if no events are running */
+               cpuhw->mmcr[0] &= ~(MMCR0_PMXE | MMCR0_FCECE);
+       }
+
+       perf_enable();
+       local_irq_restore(flags);
+}
+
+/*
+ * Re-enable interrupts on a event after they were throttled
+ * because they were coming too fast.
+ */
+static void power_pmu_unthrottle(struct perf_event *event)
+{
+       s64 val, left;
+       unsigned long flags;
+
+       if (!event->hw.idx || !event->hw.sample_period)
+               return;
+       local_irq_save(flags);
+       perf_disable();
+       power_pmu_read(event);
+       left = event->hw.sample_period;
+       event->hw.last_period = left;
+       val = 0;
+       if (left < 0x80000000L)
+               val = 0x80000000L - left;
+       write_pmc(event->hw.idx, val);
+       atomic64_set(&event->hw.prev_count, val);
+       atomic64_set(&event->hw.period_left, left);
+       perf_event_update_userpage(event);
+       perf_enable();
+       local_irq_restore(flags);
+}
+
+struct pmu power_pmu = {
+       .enable         = power_pmu_enable,
+       .disable        = power_pmu_disable,
+       .read           = power_pmu_read,
+       .unthrottle     = power_pmu_unthrottle,
+};
+
+/*
+ * Return 1 if we might be able to put event on a limited PMC,
+ * or 0 if not.
+ * A event can only go on a limited PMC if it counts something
+ * that a limited PMC can count, doesn't require interrupts, and
+ * doesn't exclude any processor mode.
+ */
+static int can_go_on_limited_pmc(struct perf_event *event, u64 ev,
+                                unsigned int flags)
+{
+       int n;
+       u64 alt[MAX_EVENT_ALTERNATIVES];
+
+       if (event->attr.exclude_user
+           || event->attr.exclude_kernel
+           || event->attr.exclude_hv
+           || event->attr.sample_period)
+               return 0;
+
+       if (ppmu->limited_pmc_event(ev))
+               return 1;
+
+       /*
+        * The requested event_id isn't on a limited PMC already;
+        * see if any alternative code goes on a limited PMC.
+        */
+       if (!ppmu->get_alternatives)
+               return 0;
+
+       flags |= PPMU_LIMITED_PMC_OK | PPMU_LIMITED_PMC_REQD;
+       n = ppmu->get_alternatives(ev, flags, alt);
+
+       return n > 0;
+}
+
+/*
+ * Find an alternative event_id that goes on a normal PMC, if possible,
+ * and return the event_id code, or 0 if there is no such alternative.
+ * (Note: event_id code 0 is "don't count" on all machines.)
+ */
+static u64 normal_pmc_alternative(u64 ev, unsigned long flags)
+{
+       u64 alt[MAX_EVENT_ALTERNATIVES];
+       int n;
+
+       flags &= ~(PPMU_LIMITED_PMC_OK | PPMU_LIMITED_PMC_REQD);
+       n = ppmu->get_alternatives(ev, flags, alt);
+       if (!n)
+               return 0;
+       return alt[0];
+}
+
+/* Number of perf_events counting hardware events */
+static atomic_t num_events;
+/* Used to avoid races in calling reserve/release_pmc_hardware */
+static DEFINE_MUTEX(pmc_reserve_mutex);
+
+/*
+ * Release the PMU if this is the last perf_event.
+ */
+static void hw_perf_event_destroy(struct perf_event *event)
+{
+       if (!atomic_add_unless(&num_events, -1, 1)) {
+               mutex_lock(&pmc_reserve_mutex);
+               if (atomic_dec_return(&num_events) == 0)
+                       release_pmc_hardware();
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+}
+
+/*
+ * Translate a generic cache event_id config to a raw event_id code.
+ */
+static int hw_perf_cache_event(u64 config, u64 *eventp)
+{
+       unsigned long type, op, result;
+       int ev;
+
+       if (!ppmu->cache_events)
+               return -EINVAL;
+
+       /* unpack config */
+       type = config & 0xff;
+       op = (config >> 8) & 0xff;
+       result = (config >> 16) & 0xff;
+
+       if (type >= PERF_COUNT_HW_CACHE_MAX ||
+           op >= PERF_COUNT_HW_CACHE_OP_MAX ||
+           result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
+               return -EINVAL;
+
+       ev = (*ppmu->cache_events)[type][op][result];
+       if (ev == 0)
+               return -EOPNOTSUPP;
+       if (ev == -1)
+               return -EINVAL;
+       *eventp = ev;
+       return 0;
+}
+
+const struct pmu *hw_perf_event_init(struct perf_event *event)
+{
+       u64 ev;
+       unsigned long flags;
+       struct perf_event *ctrs[MAX_HWEVENTS];
+       u64 events[MAX_HWEVENTS];
+       unsigned int cflags[MAX_HWEVENTS];
+       int n;
+       int err;
+       struct cpu_hw_events *cpuhw;
+
+       if (!ppmu)
+               return ERR_PTR(-ENXIO);
+       switch (event->attr.type) {
+       case PERF_TYPE_HARDWARE:
+               ev = event->attr.config;
+               if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0)
+                       return ERR_PTR(-EOPNOTSUPP);
+               ev = ppmu->generic_events[ev];
+               break;
+       case PERF_TYPE_HW_CACHE:
+               err = hw_perf_cache_event(event->attr.config, &ev);
+               if (err)
+                       return ERR_PTR(err);
+               break;
+       case PERF_TYPE_RAW:
+               ev = event->attr.config;
+               break;
+       default:
+               return ERR_PTR(-EINVAL);
+       }
+       event->hw.config_base = ev;
+       event->hw.idx = 0;
+
+       /*
+        * If we are not running on a hypervisor, force the
+        * exclude_hv bit to 0 so that we don't care what
+        * the user set it to.
+        */
+       if (!firmware_has_feature(FW_FEATURE_LPAR))
+               event->attr.exclude_hv = 0;
+
+       /*
+        * If this is a per-task event, then we can use
+        * PM_RUN_* events interchangeably with their non RUN_*
+        * equivalents, e.g. PM_RUN_CYC instead of PM_CYC.
+        * XXX we should check if the task is an idle task.
+        */
+       flags = 0;
+       if (event->ctx->task)
+               flags |= PPMU_ONLY_COUNT_RUN;
+
+       /*
+        * If this machine has limited events, check whether this
+        * event_id could go on a limited event.
+        */
+       if (ppmu->flags & PPMU_LIMITED_PMC5_6) {
+               if (can_go_on_limited_pmc(event, ev, flags)) {
+                       flags |= PPMU_LIMITED_PMC_OK;
+               } else if (ppmu->limited_pmc_event(ev)) {
+                       /*
+                        * The requested event_id is on a limited PMC,
+                        * but we can't use a limited PMC; see if any
+                        * alternative goes on a normal PMC.
+                        */
+                       ev = normal_pmc_alternative(ev, flags);
+                       if (!ev)
+                               return ERR_PTR(-EINVAL);
+               }
+       }
+
+       /*
+        * If this is in a group, check if it can go on with all the
+        * other hardware events in the group.  We assume the event
+        * hasn't been linked into its leader's sibling list at this point.
+        */
+       n = 0;
+       if (event->group_leader != event) {
+               n = collect_events(event->group_leader, ppmu->n_counter - 1,
+                                  ctrs, events, cflags);
+               if (n < 0)
+                       return ERR_PTR(-EINVAL);
+       }
+       events[n] = ev;
+       ctrs[n] = event;
+       cflags[n] = flags;
+       if (check_excludes(ctrs, cflags, n, 1))
+               return ERR_PTR(-EINVAL);
+
+       cpuhw = &get_cpu_var(cpu_hw_events);
+       err = power_check_constraints(cpuhw, events, cflags, n + 1);
+       put_cpu_var(cpu_hw_events);
+       if (err)
+               return ERR_PTR(-EINVAL);
+
+       event->hw.config = events[n];
+       event->hw.event_base = cflags[n];
+       event->hw.last_period = event->hw.sample_period;
+       atomic64_set(&event->hw.period_left, event->hw.last_period);
+
+       /*
+        * See if we need to reserve the PMU.
+        * If no events are currently in use, then we have to take a
+        * mutex to ensure that we don't race with another task doing
+        * reserve_pmc_hardware or release_pmc_hardware.
+        */
+       err = 0;
+       if (!atomic_inc_not_zero(&num_events)) {
+               mutex_lock(&pmc_reserve_mutex);
+               if (atomic_read(&num_events) == 0 &&
+                   reserve_pmc_hardware(perf_event_interrupt))
+                       err = -EBUSY;
+               else
+                       atomic_inc(&num_events);
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+       event->destroy = hw_perf_event_destroy;
+
+       if (err)
+               return ERR_PTR(err);
+       return &power_pmu;
+}
+
+/*
+ * A counter has overflowed; update its count and record
+ * things if requested.  Note that interrupts are hard-disabled
+ * here so there is no possibility of being interrupted.
+ */
+static void record_and_restart(struct perf_event *event, unsigned long val,
+                              struct pt_regs *regs, int nmi)
+{
+       u64 period = event->hw.sample_period;
+       s64 prev, delta, left;
+       int record = 0;
+
+       /* we don't have to worry about interrupts here */
+       prev = atomic64_read(&event->hw.prev_count);
+       delta = (val - prev) & 0xfffffffful;
+       atomic64_add(delta, &event->count);
+
+       /*
+        * See if the total period for this event has expired,
+        * and update for the next period.
+        */
+       val = 0;
+       left = atomic64_read(&event->hw.period_left) - delta;
+       if (period) {
+               if (left <= 0) {
+                       left += period;
+                       if (left <= 0)
+                               left = period;
+                       record = 1;
+               }
+               if (left < 0x80000000LL)
+                       val = 0x80000000LL - left;
+       }
+
+       /*
+        * Finally record data if requested.
+        */
+       if (record) {
+               struct perf_sample_data data = {
+                       .addr   = 0,
+                       .period = event->hw.last_period,
+               };
+
+               if (event->attr.sample_type & PERF_SAMPLE_ADDR)
+                       perf_get_data_addr(regs, &data.addr);
+
+               if (perf_event_overflow(event, nmi, &data, regs)) {
+                       /*
+                        * Interrupts are coming too fast - throttle them
+                        * by setting the event to 0, so it will be
+                        * at least 2^30 cycles until the next interrupt
+                        * (assuming each event counts at most 2 counts
+                        * per cycle).
+                        */
+                       val = 0;
+                       left = ~0ULL >> 1;
+               }
+       }
+
+       write_pmc(event->hw.idx, val);
+       atomic64_set(&event->hw.prev_count, val);
+       atomic64_set(&event->hw.period_left, left);
+       perf_event_update_userpage(event);
+}
+
+/*
+ * Called from generic code to get the misc flags (i.e. processor mode)
+ * for an event_id.
+ */
+unsigned long perf_misc_flags(struct pt_regs *regs)
+{
+       u32 flags = perf_get_misc_flags(regs);
+
+       if (flags)
+               return flags;
+       return user_mode(regs) ? PERF_RECORD_MISC_USER :
+               PERF_RECORD_MISC_KERNEL;
+}
+
+/*
+ * Called from generic code to get the instruction pointer
+ * for an event_id.
+ */
+unsigned long perf_instruction_pointer(struct pt_regs *regs)
+{
+       unsigned long ip;
+
+       if (TRAP(regs) != 0xf00)
+               return regs->nip;       /* not a PMU interrupt */
+
+       ip = mfspr(SPRN_SIAR) + perf_ip_adjust(regs);
+       return ip;
+}
+
+/*
+ * Performance monitor interrupt stuff
+ */
+static void perf_event_interrupt(struct pt_regs *regs)
+{
+       int i;
+       struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+       struct perf_event *event;
+       unsigned long val;
+       int found = 0;
+       int nmi;
+
+       if (cpuhw->n_limited)
+               freeze_limited_counters(cpuhw, mfspr(SPRN_PMC5),
+                                       mfspr(SPRN_PMC6));
+
+       perf_read_regs(regs);
+
+       nmi = perf_intr_is_nmi(regs);
+       if (nmi)
+               nmi_enter();
+       else
+               irq_enter();
+
+       for (i = 0; i < cpuhw->n_events; ++i) {
+               event = cpuhw->event[i];
+               if (!event->hw.idx || is_limited_pmc(event->hw.idx))
+                       continue;
+               val = read_pmc(event->hw.idx);
+               if ((int)val < 0) {
+                       /* event has overflowed */
+                       found = 1;
+                       record_and_restart(event, val, regs, nmi);
+               }
+       }
+
+       /*
+        * In case we didn't find and reset the event that caused
+        * the interrupt, scan all events and reset any that are
+        * negative, to avoid getting continual interrupts.
+        * Any that we processed in the previous loop will not be negative.
+        */
+       if (!found) {
+               for (i = 0; i < ppmu->n_counter; ++i) {
+                       if (is_limited_pmc(i + 1))
+                               continue;
+                       val = read_pmc(i + 1);
+                       if ((int)val < 0)
+                               write_pmc(i + 1, 0);
+               }
+       }
+
+       /*
+        * Reset MMCR0 to its normal value.  This will set PMXE and
+        * clear FC (freeze counters) and PMAO (perf mon alert occurred)
+        * and thus allow interrupts to occur again.
+        * XXX might want to use MSR.PM to keep the events frozen until
+        * we get back out of this interrupt.
+        */
+       write_mmcr0(cpuhw, cpuhw->mmcr[0]);
+
+       if (nmi)
+               nmi_exit();
+       else
+               irq_exit();
+}
+
+void hw_perf_event_setup(int cpu)
+{
+       struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
+
+       if (!ppmu)
+               return;
+       memset(cpuhw, 0, sizeof(*cpuhw));
+       cpuhw->mmcr[0] = MMCR0_FC;
+}
+
+int register_power_pmu(struct power_pmu *pmu)
+{
+       if (ppmu)
+               return -EBUSY;          /* something's already registered */
+
+       ppmu = pmu;
+       pr_info("%s performance monitor hardware support registered\n",
+               pmu->name);
+
+#ifdef MSR_HV
+       /*
+        * Use FCHV to ignore kernel events if MSR.HV is set.
+        */
+       if (mfmsr() & MSR_HV)
+               freeze_events_kernel = MMCR0_FCHV;
+#endif /* CONFIG_PPC64 */
+
+       return 0;
+}
index 3c90a3d..2a361cd 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
index 31918af..0f4c1c7 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
index 867f6f6..c351b3a 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
index fa21890..ca399ba 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
index 018d094..28a4daa 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
index 75dccb7..4795744 100644 (file)
@@ -9,7 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/string.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <asm/reg.h>
 #include <asm/cputable.h>
 
index 02fed27..1d5570a 100644 (file)
@@ -328,7 +328,7 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
-struct seq_operations cpuinfo_op = {
+const struct seq_operations cpuinfo_op = {
        .start =c_start,
        .next = c_next,
        .stop = c_stop,
index 465e498..df45a74 100644 (file)
@@ -53,7 +53,7 @@
 #include <linux/posix-timers.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -527,25 +527,25 @@ void __init iSeries_time_init_early(void)
 }
 #endif /* CONFIG_PPC_ISERIES */
 
-#if defined(CONFIG_PERF_COUNTERS) && defined(CONFIG_PPC32)
-DEFINE_PER_CPU(u8, perf_counter_pending);
+#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_PPC32)
+DEFINE_PER_CPU(u8, perf_event_pending);
 
-void set_perf_counter_pending(void)
+void set_perf_event_pending(void)
 {
-       get_cpu_var(perf_counter_pending) = 1;
+       get_cpu_var(perf_event_pending) = 1;
        set_dec(1);
-       put_cpu_var(perf_counter_pending);
+       put_cpu_var(perf_event_pending);
 }
 
-#define test_perf_counter_pending()    __get_cpu_var(perf_counter_pending)
-#define clear_perf_counter_pending()   __get_cpu_var(perf_counter_pending) = 0
+#define test_perf_event_pending()      __get_cpu_var(perf_event_pending)
+#define clear_perf_event_pending()     __get_cpu_var(perf_event_pending) = 0
 
-#else  /* CONFIG_PERF_COUNTERS && CONFIG_PPC32 */
+#else  /* CONFIG_PERF_EVENTS && CONFIG_PPC32 */
 
-#define test_perf_counter_pending()    0
-#define clear_perf_counter_pending()
+#define test_perf_event_pending()      0
+#define clear_perf_event_pending()
 
-#endif /* CONFIG_PERF_COUNTERS && CONFIG_PPC32 */
+#endif /* CONFIG_PERF_EVENTS && CONFIG_PPC32 */
 
 /*
  * For iSeries shared processors, we have to let the hypervisor
@@ -573,9 +573,9 @@ void timer_interrupt(struct pt_regs * regs)
        set_dec(DECREMENTER_MAX);
 
 #ifdef CONFIG_PPC32
-       if (test_perf_counter_pending()) {
-               clear_perf_counter_pending();
-               perf_counter_do_pending();
+       if (test_perf_event_pending()) {
+               clear_perf_event_pending();
+               perf_event_do_pending();
        }
        if (atomic_read(&ppc_n_lost_interrupts) != 0)
                do_IRQ(regs);
index acb74a1..b4b167b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * udbg for for NS16550 compatable serial ports
+ * udbg for NS16550 compatable serial ports
  *
  * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp
  *
index 830bef0..e7dae82 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/firmware.h>
 #include <asm/page.h>
@@ -171,7 +171,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
                die("Weird page fault", regs, SIGSEGV);
        }
 
-       perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+       perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
 
        /* When running in the kernel we expect faults to occur only to
         * addresses in user space.  All other faults represent errors in the
@@ -312,7 +312,7 @@ good_area:
        }
        if (ret & VM_FAULT_MAJOR) {
                current->maj_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
                                     regs, address);
 #ifdef CONFIG_PPC_SMLPAR
                if (firmware_has_feature(FW_FEATURE_CMO)) {
@@ -323,7 +323,7 @@ good_area:
 #endif
        } else {
                current->min_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
                                     regs, address);
        }
        up_read(&mm->mmap_sem);
index 3ef5084..9ddcfb4 100644 (file)
@@ -242,39 +242,3 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-#ifdef CONFIG_PROC_KCORE
-static struct kcore_list kcore_vmem;
-
-static int __init setup_kcore(void)
-{
-       int i;
-
-       for (i = 0; i < lmb.memory.cnt; i++) {
-               unsigned long base;
-               unsigned long size;
-               struct kcore_list *kcore_mem;
-
-               base = lmb.memory.region[i].base;
-               size = lmb.memory.region[i].size;
-
-               kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
-               if (!kcore_mem)
-                       panic("%s: kmalloc failed\n", __func__);
-
-               /* must stay under 32 bits */
-               if ( 0xfffffffful - (unsigned long)__va(base) < size) {
-                       size = 0xfffffffful - (unsigned long)(__va(base));
-                       printk(KERN_DEBUG "setup_kcore: restrict size=%lx\n",
-                                               size);
-               }
-
-               kclist_add(kcore_mem, __va(base), size);
-       }
-
-       kclist_add(&kcore_vmem, (void *)VMALLOC_START,
-               VMALLOC_END-VMALLOC_START);
-
-       return 0;
-}
-module_init(setup_kcore);
-#endif
index 3158232..335c578 100644 (file)
@@ -109,35 +109,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-#ifdef CONFIG_PROC_KCORE
-static struct kcore_list kcore_vmem;
-
-static int __init setup_kcore(void)
-{
-       int i;
-
-       for (i=0; i < lmb.memory.cnt; i++) {
-               unsigned long base, size;
-               struct kcore_list *kcore_mem;
-
-               base = lmb.memory.region[i].base;
-               size = lmb.memory.region[i].size;
-
-               /* GFP_ATOMIC to avoid might_sleep warnings during boot */
-               kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
-               if (!kcore_mem)
-                       panic("%s: kmalloc failed\n", __func__);
-
-               kclist_add(kcore_mem, __va(base), size);
-       }
-
-       kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START);
-
-       return 0;
-}
-module_init(setup_kcore);
-#endif
-
 static void pgd_ctor(void *addr)
 {
        memset(addr, 0, PGD_TABLE_SIZE);
index 579382c..5973631 100644 (file)
@@ -143,8 +143,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
  * memory regions, find holes and callback for contiguous regions.
  */
 int
-walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
-                       int (*func)(unsigned long, unsigned long, void *))
+walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
+               void *arg, int (*func)(unsigned long, unsigned long, void *))
 {
        struct lmb_property res;
        unsigned long pfn, len;
@@ -166,7 +166,7 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
        }
        return ret;
 }
-EXPORT_SYMBOL_GPL(walk_memory_resource);
+EXPORT_SYMBOL_GPL(walk_system_ram_range);
 
 /*
  * Initialize the bootmem system and give it all the memory we
@@ -372,7 +372,7 @@ void __init mem_init(void)
 
        printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, "
               "%luk reserved, %luk data, %luk bss, %luk init)\n",
-               (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
                reservedpages << (PAGE_SHIFT-10),
index 9efc8bd..e382cae 100644 (file)
@@ -280,9 +280,9 @@ config PPC_HAVE_PMU_SUPPORT
 
 config PPC_PERF_CTRS
        def_bool y
-       depends on PERF_COUNTERS && PPC_HAVE_PMU_SUPPORT
+       depends on PERF_EVENTS && PPC_HAVE_PMU_SUPPORT
        help
-         This enables the powerpc-specific perf_counter back-end.
+         This enables the powerpc-specific perf_event back-end.
 
 config SMP
        depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE
index ab8aef9..8f079b8 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/poll.h>
 #include <linux/ptrace.h>
 #include <linux/seq_file.h>
-#include <linux/marker.h>
 
 #include <asm/io.h>
 #include <asm/time.h>
index 24b30b6..fc1b1c4 100644 (file)
@@ -119,7 +119,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry,
                const struct file_operations *fops, int mode,
                size_t size, struct spu_context *ctx)
 {
-       static struct inode_operations spufs_file_iops = {
+       static const struct inode_operations spufs_file_iops = {
                .setattr = spufs_setattr,
        };
        struct inode *inode;
@@ -773,7 +773,7 @@ static int
 spufs_fill_super(struct super_block *sb, void *data, int silent)
 {
        struct spufs_sb_info *info;
-       static struct super_operations s_ops = {
+       static const struct super_operations s_ops = {
                .alloc_inode = spufs_alloc_inode,
                .destroy_inode = spufs_destroy_inode,
                .statfs = simple_statfs,
index bb5b77c..4678078 100644 (file)
@@ -39,7 +39,6 @@
 #include <linux/pid_namespace.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/marker.h>
 
 #include <asm/io.h>
 #include <asm/mmu_context.h>
index 572771f..9490157 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * udbg for for zilog scc ports as found on Apple PowerMacs
+ * udbg for zilog scc ports as found on Apple PowerMacs
  *
  * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp
  *
index eae51ef..3631a4f 100644 (file)
@@ -71,7 +71,7 @@ static int hc_show(struct seq_file *m, void *p)
        return 0;
 }
 
-static struct seq_operations hcall_inst_seq_ops = {
+static const struct seq_operations hcall_inst_seq_ops = {
         .start = hc_start,
         .next  = hc_next,
         .stop  = hc_stop,
index a477991..88f4ae7 100644 (file)
@@ -165,7 +165,7 @@ axon_ram_direct_access(struct block_device *device, sector_t sector,
        return 0;
 }
 
-static struct block_device_operations axon_ram_devops = {
+static const struct block_device_operations axon_ram_devops = {
        .owner          = THIS_MODULE,
        .direct_access  = axon_ram_direct_access
 };
index 1c866ef..43c0aca 100644 (file)
@@ -94,7 +94,7 @@ config S390
        select HAVE_KVM if 64BIT
        select HAVE_ARCH_TRACEHOOK
        select INIT_ALL_POSSIBLE
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
 
 config SCHED_OMIT_FRAME_POINTER
        bool
index bd9914b..341aff2 100644 (file)
@@ -41,7 +41,7 @@ struct hypfs_sb_info {
 
 static const struct file_operations hypfs_file_ops;
 static struct file_system_type hypfs_type;
-static struct super_operations hypfs_s_ops;
+static const struct super_operations hypfs_s_ops;
 
 /* start of list of all dentries, which have to be deleted on update */
 static struct dentry *hypfs_last_dentry;
@@ -472,7 +472,7 @@ static struct file_system_type hypfs_type = {
        .kill_sb        = hypfs_kill_super
 };
 
-static struct super_operations hypfs_s_ops = {
+static const struct super_operations hypfs_s_ops = {
        .statfs         = simple_statfs,
        .drop_inode     = hypfs_drop_inode,
        .show_options   = hypfs_show_options,
@@ -496,7 +496,7 @@ static int __init hypfs_init(void)
        }
        s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
        if (!s390_kobj) {
-               rc = -ENOMEM;;
+               rc = -ENOMEM;
                goto fail_sysfs;
        }
        rc = register_filesystem(&hypfs_type);
index f63fe7b..4e9c8ae 100644 (file)
@@ -9,18 +9,7 @@
 #ifndef __S390_MMAN_H__
 #define __S390_MMAN_H__
 
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN  0x0100          /* stack-like segment */
-#define MAP_DENYWRITE  0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE 0x1000          /* mark it as an executable */
-#define MAP_LOCKED     0x2000          /* pages are locked */
-#define MAP_NORESERVE  0x4000          /* don't check for reservations */
-#define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK   0x10000         /* do not block on IO */
-
-#define MCL_CURRENT    1               /* lock all current mappings */
-#define MCL_FUTURE     2               /* lock all future mappings */
+#include <asm-generic/mman.h>
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)
 int s390_mmap_check(unsigned long addr, unsigned long len);
diff --git a/arch/s390/include/asm/perf_counter.h b/arch/s390/include/asm/perf_counter.h
deleted file mode 100644 (file)
index 7015188..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Performance counter support - s390 specific definitions.
- *
- * Copyright 2009 Martin Schwidefsky, IBM Corporation.
- */
-
-static inline void set_perf_counter_pending(void) {}
-static inline void clear_perf_counter_pending(void) {}
-
-#define PERF_COUNTER_INDEX_OFFSET 0
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..3840cbe
--- /dev/null
@@ -0,0 +1,10 @@
+/*
+ * Performance event support - s390 specific definitions.
+ *
+ * Copyright 2009 Martin Schwidefsky, IBM Corporation.
+ */
+
+static inline void set_perf_event_pending(void) {}
+static inline void clear_perf_event_pending(void) {}
+
+#define PERF_EVENT_INDEX_OFFSET 0
index c80602d..cb5232d 100644 (file)
 #define        __NR_preadv             328
 #define        __NR_pwritev            329
 #define __NR_rt_tgsigqueueinfo 330
-#define __NR_perf_counter_open 331
+#define __NR_perf_event_open   331
 #define NR_syscalls 332
 
 /* 
index 88a8336..6247900 100644 (file)
@@ -1832,11 +1832,11 @@ compat_sys_rt_tgsigqueueinfo_wrapper:
        llgtr   %r5,%r5                 # struct compat_siginfo *
        jg      compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call
 
-       .globl  sys_perf_counter_open_wrapper
-sys_perf_counter_open_wrapper:
-       llgtr   %r2,%r2                 # const struct perf_counter_attr *
+       .globl  sys_perf_event_open_wrapper
+sys_perf_event_open_wrapper:
+       llgtr   %r2,%r2                 # const struct perf_event_attr *
        lgfr    %r3,%r3                 # pid_t
        lgfr    %r4,%r4                 # int
        lgfr    %r5,%r5                 # int
        llgfr   %r6,%r6                 # unsigned long
-       jg      sys_perf_counter_open   # branch to system call
+       jg      sys_perf_event_open     # branch to system call
index c7ae4b1..e9d94f6 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/personality.h>
 #include <linux/unistd.h>
 #include <linux/ipc.h>
-#include <linux/syscalls.h>
 #include <asm/uaccess.h>
 #include "entry.h"
 
index ad1acd2..0b50836 100644 (file)
@@ -339,4 +339,4 @@ SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper)
 SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper)
 SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper)
 SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */
-SYSCALL(sys_perf_counter_open,sys_perf_counter_open,sys_perf_counter_open_wrapper)
+SYSCALL(sys_perf_event_open,sys_perf_event_open,sys_perf_event_open_wrapper)
index 2c2f983..43486c2 100644 (file)
@@ -478,7 +478,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)
        if (!inti)
                return -ENOMEM;
 
-       inti->type = KVM_S390_PROGRAM_INT;;
+       inti->type = KVM_S390_PROGRAM_INT;
        inti->pgm.code = code;
 
        VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code);
index 1abbadd..6d50746 100644 (file)
@@ -10,7 +10,7 @@
  *    Copyright (C) 1995  Linus Torvalds
  */
 
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -306,7 +306,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int write)
         * interrupts again and then search the VMAs
         */
        local_irq_enable();
-       perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+       perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
        down_read(&mm->mmap_sem);
 
        si_code = SEGV_MAPERR;
@@ -366,11 +366,11 @@ good_area:
        }
        if (fault & VM_FAULT_MAJOR) {
                tsk->maj_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
                                     regs, address);
        } else {
                tsk->min_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
                                     regs, address);
        }
         up_read(&mm->mmap_sem);
index c634dfb..7656479 100644 (file)
@@ -105,7 +105,7 @@ void __init mem_init(void)
        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
         printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n",
-                (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                 max_mapnr << (PAGE_SHIFT-10),
                 codesize >> 10,
                 reservedpages << (PAGE_SHIFT-10),
index ee58210..d92a5a2 100644 (file)
@@ -2,10 +2,11 @@
 #define _ASM_SCORE_PAGE_H
 
 #include <linux/pfn.h>
+#include <linux/const.h>
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT     (12)
-#define PAGE_SIZE      (1UL << PAGE_SHIFT)
+#define PAGE_SIZE      (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK      (~(PAGE_SIZE-1))
 
 #ifdef __KERNEL__
index 3a11228..5593999 100644 (file)
@@ -7,6 +7,15 @@
 #define KU_USER        0x08
 #define KU_KERN        0x00
 
+#include <asm/page.h>
+#include <linux/const.h>
+
+/* thread information allocation */
+#define THREAD_SIZE_ORDER      (1)
+#define THREAD_SIZE            (PAGE_SIZE << THREAD_SIZE_ORDER)
+#define THREAD_MASK            (THREAD_SIZE - _AC(1,UL))
+#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
+
 #ifndef __ASSEMBLY__
 
 #include <asm/processor.h>
@@ -62,12 +71,6 @@ struct thread_info {
 register struct thread_info *__current_thread_info __asm__("r28");
 #define current_thread_info()  __current_thread_info
 
-/* thread information allocation */
-#define THREAD_SIZE_ORDER      (1)
-#define THREAD_SIZE            (PAGE_SIZE << THREAD_SIZE_ORDER)
-#define THREAD_MASK            (THREAD_SIZE - 1UL)
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
 #define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
 #define free_thread_info(info) kfree(info)
 
index f855698..eebcbaa 100644 (file)
@@ -24,6 +24,8 @@
  */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/thread_info.h>
+#include <asm/page.h>
 
 OUTPUT_ARCH(score)
 ENTRY(_stext)
@@ -49,21 +51,9 @@ SECTIONS
        . = ALIGN(16);
        RODATA
 
-       /* Exception table */
-       . = ALIGN(16);
-       __ex_table : {
-               __start___ex_table = .;
-               *(__ex_table)
-               __stop___ex_table = .;
-       }
+       EXCEPTION_TABLE(16)
 
-       /* writeable */
-       .data ALIGN (4096): {
-               *(.data.init_task)
-
-               DATA_DATA
-               CONSTRUCTORS
-       }
+       RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
 
        /* We want the small data sections together, so single-instruction offsets
           can access them all, and initialized data all before uninitialized, so
@@ -72,45 +62,14 @@ SECTIONS
        .sdata : {
                *(.sdata)
        }
-
-       . = ALIGN(32);
-       .data.cacheline_aligned : {
-               *(.data.cacheline_aligned)
-       }
        _edata =  .;                    /* End of data section */
 
        /* will be freed after init */
-       . = ALIGN(4096);                /* Init code and data */
+       . = ALIGN(PAGE_SIZE);           /* Init code and data */
        __init_begin = .;
 
-       . = ALIGN(4096);
-       .init.text : {
-               _sinittext = .;
-               INIT_TEXT
-               _einittext = .;
-       }
-       .init.data : {
-               INIT_DATA
-       }
-       . = ALIGN(16);
-       .init.setup : {
-               __setup_start = .;
-               *(.init.setup)
-               __setup_end = .;
-       }
-
-       .initcall.init : {
-               __initcall_start = .;
-               INITCALLS
-               __initcall_end = .;
-       }
-
-       .con_initcall.init : {
-               __con_initcall_start = .;
-               *(.con_initcall.init)
-               __con_initcall_end = .;
-       }
-       SECURITY_INIT
+       INIT_TEXT_SECTION(PAGE_SIZE)
+       INIT_DATA_SECTION(16)
 
        /* .exit.text is discarded at runtime, not link time, to deal with
         * references from .rodata
@@ -121,28 +80,10 @@ SECTIONS
        .exit.data : {
                EXIT_DATA
        }
-#if defined(CONFIG_BLK_DEV_INITRD)
-       .init.ramfs ALIGN(4096): {
-               __initramfs_start = .;
-               *(.init.ramfs)
-               __initramfs_end = .;
-               . = ALIGN(4);
-               LONG(0);
-       }
-#endif
-       . = ALIGN(4096);
+       . = ALIGN(PAGE_SIZE);
        __init_end = .;
        /* freed after init ends here */
 
-       __bss_start = .;        /* BSS */
-       .sbss  : {
-               *(.sbss)
-               *(.scommon)
-       }
-       .bss : {
-               *(.bss)
-               *(COMMON)
-       }
-       __bss_stop = .;
+       BSS_SECTION(0, 0, 0)
        _end = .;
 }
index 4df3570..b940424 100644 (file)
@@ -16,7 +16,7 @@ config SUPERH
        select HAVE_IOREMAP_PROT if MMU
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA
index 327d47c..2d08073 100644 (file)
@@ -310,8 +310,10 @@ static int camera_set_capture(struct soc_camera_platform_info *info,
        return ret;
 }
 
+static int ap325rxa_camera_add(struct soc_camera_link *icl, struct device *dev);
+static void ap325rxa_camera_del(struct soc_camera_link *icl);
+
 static struct soc_camera_platform_info camera_info = {
-       .iface = 0,
        .format_name = "UYVY",
        .format_depth = 16,
        .format = {
@@ -323,24 +325,46 @@ static struct soc_camera_platform_info camera_info = {
        .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
        .set_capture = camera_set_capture,
+       .link = {
+               .bus_id         = 0,
+               .add_device     = ap325rxa_camera_add,
+               .del_device     = ap325rxa_camera_del,
+               .module_name    = "soc_camera_platform",
+       },
 };
 
+static void dummy_release(struct device *dev)
+{
+}
+
 static struct platform_device camera_device = {
        .name           = "soc_camera_platform",
        .dev            = {
                .platform_data  = &camera_info,
+               .release        = dummy_release,
        },
 };
 
-static int __init camera_setup(void)
+static int ap325rxa_camera_add(struct soc_camera_link *icl,
+                              struct device *dev)
 {
-       if (camera_probe() > 0)
-               platform_device_register(&camera_device);
+       if (icl != &camera_info.link || camera_probe() <= 0)
+               return -ENODEV;
 
-       return 0;
+       camera_info.dev = dev;
+
+       return platform_device_register(&camera_device);
 }
-late_initcall(camera_setup);
 
+static void ap325rxa_camera_del(struct soc_camera_link *icl)
+{
+       if (icl != &camera_info.link)
+               return;
+
+       platform_device_unregister(&camera_device);
+       memset(&camera_device.dev.kobj, 0,
+              sizeof(camera_device.dev.kobj));
+}
 #endif /* CONFIG_I2C */
 
 static int ov7725_power(struct device *dev, int mode)
@@ -416,6 +440,7 @@ static struct ov772x_camera_info ov7725_info = {
        .flags          = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
        .edgectrl       = OV772X_AUTO_EDGECTRL(0xf, 0),
        .link = {
+               .bus_id         = 0,
                .power          = ov7725_power,
                .board_info     = &ap325rxa_i2c_camera[0],
                .i2c_adapter_id = 0,
@@ -423,11 +448,19 @@ static struct ov772x_camera_info ov7725_info = {
        },
 };
 
-static struct platform_device ap325rxa_camera = {
-       .name   = "soc-camera-pdrv",
-       .id     = 0,
-       .dev    = {
-               .platform_data = &ov7725_info.link,
+static struct platform_device ap325rxa_camera[] = {
+       {
+               .name   = "soc-camera-pdrv",
+               .id     = 0,
+               .dev    = {
+                       .platform_data = &ov7725_info.link,
+               },
+       }, {
+               .name   = "soc-camera-pdrv",
+               .id     = 1,
+               .dev    = {
+                       .platform_data = &camera_info.link,
+               },
        },
 };
 
@@ -438,7 +471,8 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
        &ceu_device,
        &nand_flash_device,
        &sdcard_cn3_device,
-       &ap325rxa_camera,
+       &ap325rxa_camera[0],
+       &ap325rxa_camera[1],
 };
 
 static struct spi_board_info ap325rxa_spi_devices[] = {
diff --git a/arch/sh/include/asm/perf_counter.h b/arch/sh/include/asm/perf_counter.h
deleted file mode 100644 (file)
index d8e6bb9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_SH_PERF_COUNTER_H
-#define __ASM_SH_PERF_COUNTER_H
-
-/* SH only supports software counters through this interface. */
-static inline void set_perf_counter_pending(void) {}
-
-#define PERF_COUNTER_INDEX_OFFSET      0
-
-#endif /* __ASM_SH_PERF_COUNTER_H */
diff --git a/arch/sh/include/asm/perf_event.h b/arch/sh/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..11a3022
--- /dev/null
@@ -0,0 +1,9 @@
+#ifndef __ASM_SH_PERF_EVENT_H
+#define __ASM_SH_PERF_EVENT_H
+
+/* SH only supports software events through this interface. */
+static inline void set_perf_event_pending(void) {}
+
+#define PERF_EVENT_INDEX_OFFSET        0
+
+#endif /* __ASM_SH_PERF_EVENT_H */
index 925dd40..f3fd1b9 100644 (file)
 #define __NR_preadv            333
 #define __NR_pwritev           334
 #define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open   336
 
 #define NR_syscalls 337
 
index 2b84bc9..343ce8f 100644 (file)
 #define __NR_preadv            361
 #define __NR_pwritev           362
 #define __NR_rt_tgsigqueueinfo 363
-#define __NR_perf_counter_open 364
+#define __NR_perf_event_open   364
 
 #ifdef __KERNEL__
 
index 16ba225..19fd11d 100644 (file)
@@ -352,4 +352,4 @@ ENTRY(sys_call_table)
        .long sys_preadv
        .long sys_pwritev
        .long sys_rt_tgsigqueueinfo     /* 335 */
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
index af6fb74..5bfde6c 100644 (file)
@@ -390,4 +390,4 @@ sys_call_table:
        .long sys_preadv
        .long sys_pwritev
        .long sys_rt_tgsigqueueinfo
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
index 781b413..4753010 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/mm.h>
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <asm/io_trapped.h>
 #include <asm/system.h>
 #include <asm/mmu_context.h>
@@ -157,7 +157,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
        if ((regs->sr & SR_IMASK) != SR_IMASK)
                local_irq_enable();
 
-       perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+       perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
 
        /*
         * If we're in an interrupt, have no user context or are running
@@ -208,11 +208,11 @@ survive:
        }
        if (fault & VM_FAULT_MAJOR) {
                tsk->maj_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
                                     regs, address);
        } else {
                tsk->min_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
                                     regs, address);
        }
 
index edc842f..8173e38 100644 (file)
@@ -186,8 +186,6 @@ void __init paging_init(void)
        set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start));
 }
 
-static struct kcore_list kcore_mem, kcore_vmalloc;
-
 void __init mem_init(void)
 {
        int codesize, datasize, initsize;
@@ -226,13 +224,9 @@ void __init mem_init(void)
        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
 
-       kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
-       kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
-                  VMALLOC_END - VMALLOC_START);
-
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
               "%dk data, %dk init)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
                datasize >> 10,
index 2dcc485..de0b0e8 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/interrupt.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -116,7 +116,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
        /* Not an IO address, so reenable interrupts */
        local_irq_enable();
 
-       perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+       perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
 
        /*
         * If we're in an interrupt or have no user
@@ -201,11 +201,11 @@ survive:
 
        if (fault & VM_FAULT_MAJOR) {
                tsk->maj_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
                                     regs, address);
        } else {
                tsk->min_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
                                     regs, address);
        }
 
index 86b8234..97fca46 100644 (file)
@@ -25,7 +25,7 @@ config SPARC
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select RTC_CLASS
        select RTC_DRV_M48T59
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
 
@@ -47,7 +47,7 @@ config SPARC64
        select RTC_DRV_BQ4802
        select RTC_DRV_SUN4V
        select RTC_DRV_STARFIRE
-       select HAVE_PERF_COUNTERS
+       select HAVE_PERF_EVENTS
 
 config ARCH_DEFCONFIG
        string
index 988192e..c3029ad 100644 (file)
@@ -20,6 +20,8 @@
 
 #define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x10000         /* do not block on IO */
+#define MAP_STACK      0x20000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x40000         /* create a huge page mapping */
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
diff --git a/arch/sparc/include/asm/perf_counter.h b/arch/sparc/include/asm/perf_counter.h
deleted file mode 100644 (file)
index 5d7a8ca..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ASM_SPARC_PERF_COUNTER_H
-#define __ASM_SPARC_PERF_COUNTER_H
-
-extern void set_perf_counter_pending(void);
-
-#define        PERF_COUNTER_INDEX_OFFSET       0
-
-#ifdef CONFIG_PERF_COUNTERS
-extern void init_hw_perf_counters(void);
-#else
-static inline void init_hw_perf_counters(void) { }
-#endif
-
-#endif
diff --git a/arch/sparc/include/asm/perf_event.h b/arch/sparc/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..7e26698
--- /dev/null
@@ -0,0 +1,14 @@
+#ifndef __ASM_SPARC_PERF_EVENT_H
+#define __ASM_SPARC_PERF_EVENT_H
+
+extern void set_perf_event_pending(void);
+
+#define        PERF_EVENT_INDEX_OFFSET 0
+
+#ifdef CONFIG_PERF_EVENTS
+extern void init_hw_perf_events(void);
+#else
+static inline void init_hw_perf_events(void)   { }
+#endif
+
+#endif
index 706df66..42f2316 100644 (file)
 #define __NR_preadv            324
 #define __NR_pwritev           325
 #define __NR_rt_tgsigqueueinfo 326
-#define __NR_perf_counter_open 327
+#define __NR_perf_event_open   327
 
 #define NR_SYSCALLS            328
 
index d4de32f..6cdbf7e 100644 (file)
@@ -258,7 +258,7 @@ static inline void *vio_dring_entry(struct vio_dring_state *dr,
 static inline u32 vio_dring_avail(struct vio_dring_state *dr,
                                  unsigned int ring_size)
 {
-       BUILD_BUG_ON(!is_power_of_2(ring_size));
+       MAYBE_BUILD_BUG_ON(!is_power_of_2(ring_size));
 
        return (dr->pending -
                ((dr->prod - dr->cons) & (ring_size - 1)));
index 247cc62..3a048fa 100644 (file)
@@ -104,5 +104,5 @@ obj-$(CONFIG_AUDIT)     += audit.o
 audit--$(CONFIG_AUDIT)  := compat_audit.o
 obj-$(CONFIG_COMPAT)    += $(audit--y)
 
-pc--$(CONFIG_PERF_COUNTERS) := perf_counter.o
+pc--$(CONFIG_PERF_EVENTS) := perf_event.o
 obj-$(CONFIG_SPARC64)  += $(pc--y)
index 8daab33..8ab1d47 100644 (file)
@@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid)
                                tid = ((a << IMAP_AID_SHIFT) |
                                       (n << IMAP_NID_SHIFT));
                                tid &= (IMAP_AID_SAFARI |
-                                       IMAP_NID_SAFARI);;
+                                       IMAP_NID_SAFARI);
                        }
                } else {
                        tid = cpuid << IMAP_TID_SHIFT;
index 378eb53..b129611 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/delay.h>
 #include <linux/smp.h>
 
-#include <asm/perf_counter.h>
+#include <asm/perf_event.h>
 #include <asm/ptrace.h>
 #include <asm/local.h>
 #include <asm/pcr.h>
@@ -265,7 +265,7 @@ int __init nmi_init(void)
                }
        }
        if (!err)
-               init_hw_perf_counters();
+               init_hw_perf_events();
 
        return err;
 }
index 68ff001..2d94e7a 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/pil.h>
 #include <asm/pcr.h>
@@ -15,7 +15,7 @@
 
 /* This code is shared between various users of the performance
  * counters.  Users will be oprofile, pseudo-NMI watchdog, and the
- * perf_counter support layer.
+ * perf_event support layer.
  */
 
 #define PCR_SUN4U_ENABLE       (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE)
@@ -42,14 +42,14 @@ void deferred_pcr_work_irq(int irq, struct pt_regs *regs)
 
        old_regs = set_irq_regs(regs);
        irq_enter();
-#ifdef CONFIG_PERF_COUNTERS
-       perf_counter_do_pending();
+#ifdef CONFIG_PERF_EVENTS
+       perf_event_do_pending();
 #endif
        irq_exit();
        set_irq_regs(old_regs);
 }
 
-void set_perf_counter_pending(void)
+void set_perf_event_pending(void)
 {
        set_softint(1 << PIL_DEFERRED_PCR_WORK);
 }
diff --git a/arch/sparc/kernel/perf_counter.c b/arch/sparc/kernel/perf_counter.c
deleted file mode 100644 (file)
index 09de403..0000000
+++ /dev/null
@@ -1,557 +0,0 @@
-/* Performance counter support for sparc64.
- *
- * Copyright (C) 2009 David S. Miller <davem@davemloft.net>
- *
- * This code is based almost entirely upon the x86 perf counter
- * code, which is:
- *
- *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
- *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
- *  Copyright (C) 2009 Jaswinder Singh Rajput
- *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
- *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- */
-
-#include <linux/perf_counter.h>
-#include <linux/kprobes.h>
-#include <linux/kernel.h>
-#include <linux/kdebug.h>
-#include <linux/mutex.h>
-
-#include <asm/cpudata.h>
-#include <asm/atomic.h>
-#include <asm/nmi.h>
-#include <asm/pcr.h>
-
-/* Sparc64 chips have two performance counters, 32-bits each, with
- * overflow interrupts generated on transition from 0xffffffff to 0.
- * The counters are accessed in one go using a 64-bit register.
- *
- * Both counters are controlled using a single control register.  The
- * only way to stop all sampling is to clear all of the context (user,
- * supervisor, hypervisor) sampling enable bits.  But these bits apply
- * to both counters, thus the two counters can't be enabled/disabled
- * individually.
- *
- * The control register has two event fields, one for each of the two
- * counters.  It's thus nearly impossible to have one counter going
- * while keeping the other one stopped.  Therefore it is possible to
- * get overflow interrupts for counters not currently "in use" and
- * that condition must be checked in the overflow interrupt handler.
- *
- * So we use a hack, in that we program inactive counters with the
- * "sw_count0" and "sw_count1" events.  These count how many times
- * the instruction "sethi %hi(0xfc000), %g0" is executed.  It's an
- * unusual way to encode a NOP and therefore will not trigger in
- * normal code.
- */
-
-#define MAX_HWCOUNTERS                 2
-#define MAX_PERIOD                     ((1UL << 32) - 1)
-
-#define PIC_UPPER_INDEX                        0
-#define PIC_LOWER_INDEX                        1
-
-struct cpu_hw_counters {
-       struct perf_counter     *counters[MAX_HWCOUNTERS];
-       unsigned long           used_mask[BITS_TO_LONGS(MAX_HWCOUNTERS)];
-       unsigned long           active_mask[BITS_TO_LONGS(MAX_HWCOUNTERS)];
-       int enabled;
-};
-DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = { .enabled = 1, };
-
-struct perf_event_map {
-       u16     encoding;
-       u8      pic_mask;
-#define PIC_NONE       0x00
-#define PIC_UPPER      0x01
-#define PIC_LOWER      0x02
-};
-
-struct sparc_pmu {
-       const struct perf_event_map     *(*event_map)(int);
-       int                             max_events;
-       int                             upper_shift;
-       int                             lower_shift;
-       int                             event_mask;
-       int                             hv_bit;
-       int                             irq_bit;
-       int                             upper_nop;
-       int                             lower_nop;
-};
-
-static const struct perf_event_map ultra3i_perfmon_event_map[] = {
-       [PERF_COUNT_HW_CPU_CYCLES] = { 0x0000, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_INSTRUCTIONS] = { 0x0001, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_CACHE_REFERENCES] = { 0x0009, PIC_LOWER },
-       [PERF_COUNT_HW_CACHE_MISSES] = { 0x0009, PIC_UPPER },
-};
-
-static const struct perf_event_map *ultra3i_event_map(int event)
-{
-       return &ultra3i_perfmon_event_map[event];
-}
-
-static const struct sparc_pmu ultra3i_pmu = {
-       .event_map      = ultra3i_event_map,
-       .max_events     = ARRAY_SIZE(ultra3i_perfmon_event_map),
-       .upper_shift    = 11,
-       .lower_shift    = 4,
-       .event_mask     = 0x3f,
-       .upper_nop      = 0x1c,
-       .lower_nop      = 0x14,
-};
-
-static const struct perf_event_map niagara2_perfmon_event_map[] = {
-       [PERF_COUNT_HW_CPU_CYCLES] = { 0x02ff, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_INSTRUCTIONS] = { 0x02ff, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_CACHE_REFERENCES] = { 0x0208, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_CACHE_MISSES] = { 0x0302, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x0201, PIC_UPPER | PIC_LOWER },
-       [PERF_COUNT_HW_BRANCH_MISSES] = { 0x0202, PIC_UPPER | PIC_LOWER },
-};
-
-static const struct perf_event_map *niagara2_event_map(int event)
-{
-       return &niagara2_perfmon_event_map[event];
-}
-
-static const struct sparc_pmu niagara2_pmu = {
-       .event_map      = niagara2_event_map,
-       .max_events     = ARRAY_SIZE(niagara2_perfmon_event_map),
-       .upper_shift    = 19,
-       .lower_shift    = 6,
-       .event_mask     = 0xfff,
-       .hv_bit         = 0x8,
-       .irq_bit        = 0x03,
-       .upper_nop      = 0x220,
-       .lower_nop      = 0x220,
-};
-
-static const struct sparc_pmu *sparc_pmu __read_mostly;
-
-static u64 event_encoding(u64 event, int idx)
-{
-       if (idx == PIC_UPPER_INDEX)
-               event <<= sparc_pmu->upper_shift;
-       else
-               event <<= sparc_pmu->lower_shift;
-       return event;
-}
-
-static u64 mask_for_index(int idx)
-{
-       return event_encoding(sparc_pmu->event_mask, idx);
-}
-
-static u64 nop_for_index(int idx)
-{
-       return event_encoding(idx == PIC_UPPER_INDEX ?
-                             sparc_pmu->upper_nop :
-                             sparc_pmu->lower_nop, idx);
-}
-
-static inline void sparc_pmu_enable_counter(struct hw_perf_counter *hwc,
-                                           int idx)
-{
-       u64 val, mask = mask_for_index(idx);
-
-       val = pcr_ops->read();
-       pcr_ops->write((val & ~mask) | hwc->config);
-}
-
-static inline void sparc_pmu_disable_counter(struct hw_perf_counter *hwc,
-                                            int idx)
-{
-       u64 mask = mask_for_index(idx);
-       u64 nop = nop_for_index(idx);
-       u64 val = pcr_ops->read();
-
-       pcr_ops->write((val & ~mask) | nop);
-}
-
-void hw_perf_enable(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       u64 val;
-       int i;
-
-       if (cpuc->enabled)
-               return;
-
-       cpuc->enabled = 1;
-       barrier();
-
-       val = pcr_ops->read();
-
-       for (i = 0; i < MAX_HWCOUNTERS; i++) {
-               struct perf_counter *cp = cpuc->counters[i];
-               struct hw_perf_counter *hwc;
-
-               if (!cp)
-                       continue;
-               hwc = &cp->hw;
-               val |= hwc->config_base;
-       }
-
-       pcr_ops->write(val);
-}
-
-void hw_perf_disable(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       u64 val;
-
-       if (!cpuc->enabled)
-               return;
-
-       cpuc->enabled = 0;
-
-       val = pcr_ops->read();
-       val &= ~(PCR_UTRACE | PCR_STRACE |
-                sparc_pmu->hv_bit | sparc_pmu->irq_bit);
-       pcr_ops->write(val);
-}
-
-static u32 read_pmc(int idx)
-{
-       u64 val;
-
-       read_pic(val);
-       if (idx == PIC_UPPER_INDEX)
-               val >>= 32;
-
-       return val & 0xffffffff;
-}
-
-static void write_pmc(int idx, u64 val)
-{
-       u64 shift, mask, pic;
-
-       shift = 0;
-       if (idx == PIC_UPPER_INDEX)
-               shift = 32;
-
-       mask = ((u64) 0xffffffff) << shift;
-       val <<= shift;
-
-       read_pic(pic);
-       pic &= ~mask;
-       pic |= val;
-       write_pic(pic);
-}
-
-static int sparc_perf_counter_set_period(struct perf_counter *counter,
-                                        struct hw_perf_counter *hwc, int idx)
-{
-       s64 left = atomic64_read(&hwc->period_left);
-       s64 period = hwc->sample_period;
-       int ret = 0;
-
-       if (unlikely(left <= -period)) {
-               left = period;
-               atomic64_set(&hwc->period_left, left);
-               hwc->last_period = period;
-               ret = 1;
-       }
-
-       if (unlikely(left <= 0)) {
-               left += period;
-               atomic64_set(&hwc->period_left, left);
-               hwc->last_period = period;
-               ret = 1;
-       }
-       if (left > MAX_PERIOD)
-               left = MAX_PERIOD;
-
-       atomic64_set(&hwc->prev_count, (u64)-left);
-
-       write_pmc(idx, (u64)(-left) & 0xffffffff);
-
-       perf_counter_update_userpage(counter);
-
-       return ret;
-}
-
-static int sparc_pmu_enable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       struct hw_perf_counter *hwc = &counter->hw;
-       int idx = hwc->idx;
-
-       if (test_and_set_bit(idx, cpuc->used_mask))
-               return -EAGAIN;
-
-       sparc_pmu_disable_counter(hwc, idx);
-
-       cpuc->counters[idx] = counter;
-       set_bit(idx, cpuc->active_mask);
-
-       sparc_perf_counter_set_period(counter, hwc, idx);
-       sparc_pmu_enable_counter(hwc, idx);
-       perf_counter_update_userpage(counter);
-       return 0;
-}
-
-static u64 sparc_perf_counter_update(struct perf_counter *counter,
-                                    struct hw_perf_counter *hwc, int idx)
-{
-       int shift = 64 - 32;
-       u64 prev_raw_count, new_raw_count;
-       s64 delta;
-
-again:
-       prev_raw_count = atomic64_read(&hwc->prev_count);
-       new_raw_count = read_pmc(idx);
-
-       if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
-                            new_raw_count) != prev_raw_count)
-               goto again;
-
-       delta = (new_raw_count << shift) - (prev_raw_count << shift);
-       delta >>= shift;
-
-       atomic64_add(delta, &counter->count);
-       atomic64_sub(delta, &hwc->period_left);
-
-       return new_raw_count;
-}
-
-static void sparc_pmu_disable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       struct hw_perf_counter *hwc = &counter->hw;
-       int idx = hwc->idx;
-
-       clear_bit(idx, cpuc->active_mask);
-       sparc_pmu_disable_counter(hwc, idx);
-
-       barrier();
-
-       sparc_perf_counter_update(counter, hwc, idx);
-       cpuc->counters[idx] = NULL;
-       clear_bit(idx, cpuc->used_mask);
-
-       perf_counter_update_userpage(counter);
-}
-
-static void sparc_pmu_read(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       sparc_perf_counter_update(counter, hwc, hwc->idx);
-}
-
-static void sparc_pmu_unthrottle(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       sparc_pmu_enable_counter(hwc, hwc->idx);
-}
-
-static atomic_t active_counters = ATOMIC_INIT(0);
-static DEFINE_MUTEX(pmc_grab_mutex);
-
-void perf_counter_grab_pmc(void)
-{
-       if (atomic_inc_not_zero(&active_counters))
-               return;
-
-       mutex_lock(&pmc_grab_mutex);
-       if (atomic_read(&active_counters) == 0) {
-               if (atomic_read(&nmi_active) > 0) {
-                       on_each_cpu(stop_nmi_watchdog, NULL, 1);
-                       BUG_ON(atomic_read(&nmi_active) != 0);
-               }
-               atomic_inc(&active_counters);
-       }
-       mutex_unlock(&pmc_grab_mutex);
-}
-
-void perf_counter_release_pmc(void)
-{
-       if (atomic_dec_and_mutex_lock(&active_counters, &pmc_grab_mutex)) {
-               if (atomic_read(&nmi_active) == 0)
-                       on_each_cpu(start_nmi_watchdog, NULL, 1);
-               mutex_unlock(&pmc_grab_mutex);
-       }
-}
-
-static void hw_perf_counter_destroy(struct perf_counter *counter)
-{
-       perf_counter_release_pmc();
-}
-
-static int __hw_perf_counter_init(struct perf_counter *counter)
-{
-       struct perf_counter_attr *attr = &counter->attr;
-       struct hw_perf_counter *hwc = &counter->hw;
-       const struct perf_event_map *pmap;
-       u64 enc;
-
-       if (atomic_read(&nmi_active) < 0)
-               return -ENODEV;
-
-       if (attr->type != PERF_TYPE_HARDWARE)
-               return -EOPNOTSUPP;
-
-       if (attr->config >= sparc_pmu->max_events)
-               return -EINVAL;
-
-       perf_counter_grab_pmc();
-       counter->destroy = hw_perf_counter_destroy;
-
-       /* We save the enable bits in the config_base.  So to
-        * turn off sampling just write 'config', and to enable
-        * things write 'config | config_base'.
-        */
-       hwc->config_base = sparc_pmu->irq_bit;
-       if (!attr->exclude_user)
-               hwc->config_base |= PCR_UTRACE;
-       if (!attr->exclude_kernel)
-               hwc->config_base |= PCR_STRACE;
-       if (!attr->exclude_hv)
-               hwc->config_base |= sparc_pmu->hv_bit;
-
-       if (!hwc->sample_period) {
-               hwc->sample_period = MAX_PERIOD;
-               hwc->last_period = hwc->sample_period;
-               atomic64_set(&hwc->period_left, hwc->sample_period);
-       }
-
-       pmap = sparc_pmu->event_map(attr->config);
-
-       enc = pmap->encoding;
-       if (pmap->pic_mask & PIC_UPPER) {
-               hwc->idx = PIC_UPPER_INDEX;
-               enc <<= sparc_pmu->upper_shift;
-       } else {
-               hwc->idx = PIC_LOWER_INDEX;
-               enc <<= sparc_pmu->lower_shift;
-       }
-
-       hwc->config |= enc;
-       return 0;
-}
-
-static const struct pmu pmu = {
-       .enable         = sparc_pmu_enable,
-       .disable        = sparc_pmu_disable,
-       .read           = sparc_pmu_read,
-       .unthrottle     = sparc_pmu_unthrottle,
-};
-
-const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
-{
-       int err = __hw_perf_counter_init(counter);
-
-       if (err)
-               return ERR_PTR(err);
-       return &pmu;
-}
-
-void perf_counter_print_debug(void)
-{
-       unsigned long flags;
-       u64 pcr, pic;
-       int cpu;
-
-       if (!sparc_pmu)
-               return;
-
-       local_irq_save(flags);
-
-       cpu = smp_processor_id();
-
-       pcr = pcr_ops->read();
-       read_pic(pic);
-
-       pr_info("\n");
-       pr_info("CPU#%d: PCR[%016llx] PIC[%016llx]\n",
-               cpu, pcr, pic);
-
-       local_irq_restore(flags);
-}
-
-static int __kprobes perf_counter_nmi_handler(struct notifier_block *self,
-                                             unsigned long cmd, void *__args)
-{
-       struct die_args *args = __args;
-       struct perf_sample_data data;
-       struct cpu_hw_counters *cpuc;
-       struct pt_regs *regs;
-       int idx;
-
-       if (!atomic_read(&active_counters))
-               return NOTIFY_DONE;
-
-       switch (cmd) {
-       case DIE_NMI:
-               break;
-
-       default:
-               return NOTIFY_DONE;
-       }
-
-       regs = args->regs;
-
-       data.regs = regs;
-       data.addr = 0;
-
-       cpuc = &__get_cpu_var(cpu_hw_counters);
-       for (idx = 0; idx < MAX_HWCOUNTERS; idx++) {
-               struct perf_counter *counter = cpuc->counters[idx];
-               struct hw_perf_counter *hwc;
-               u64 val;
-
-               if (!test_bit(idx, cpuc->active_mask))
-                       continue;
-               hwc = &counter->hw;
-               val = sparc_perf_counter_update(counter, hwc, idx);
-               if (val & (1ULL << 31))
-                       continue;
-
-               data.period = counter->hw.last_period;
-               if (!sparc_perf_counter_set_period(counter, hwc, idx))
-                       continue;
-
-               if (perf_counter_overflow(counter, 1, &data))
-                       sparc_pmu_disable_counter(hwc, idx);
-       }
-
-       return NOTIFY_STOP;
-}
-
-static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
-       .notifier_call          = perf_counter_nmi_handler,
-};
-
-static bool __init supported_pmu(void)
-{
-       if (!strcmp(sparc_pmu_type, "ultra3i")) {
-               sparc_pmu = &ultra3i_pmu;
-               return true;
-       }
-       if (!strcmp(sparc_pmu_type, "niagara2")) {
-               sparc_pmu = &niagara2_pmu;
-               return true;
-       }
-       return false;
-}
-
-void __init init_hw_perf_counters(void)
-{
-       pr_info("Performance counters: ");
-
-       if (!supported_pmu()) {
-               pr_cont("No support for PMU type '%s'\n", sparc_pmu_type);
-               return;
-       }
-
-       pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type);
-
-       /* All sparc64 PMUs currently have 2 counters.  But this simple
-        * driver only supports one active counter at a time.
-        */
-       perf_max_counters = 1;
-
-       register_die_notifier(&perf_counter_nmi_notifier);
-}
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
new file mode 100644 (file)
index 0000000..2d6a1b1
--- /dev/null
@@ -0,0 +1,556 @@
+/* Performance event support for sparc64.
+ *
+ * Copyright (C) 2009 David S. Miller <davem@davemloft.net>
+ *
+ * This code is based almost entirely upon the x86 perf event
+ * code, which is:
+ *
+ *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
+ *  Copyright (C) 2009 Jaswinder Singh Rajput
+ *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
+ */
+
+#include <linux/perf_event.h>
+#include <linux/kprobes.h>
+#include <linux/kernel.h>
+#include <linux/kdebug.h>
+#include <linux/mutex.h>
+
+#include <asm/cpudata.h>
+#include <asm/atomic.h>
+#include <asm/nmi.h>
+#include <asm/pcr.h>
+
+/* Sparc64 chips have two performance counters, 32-bits each, with
+ * overflow interrupts generated on transition from 0xffffffff to 0.
+ * The counters are accessed in one go using a 64-bit register.
+ *
+ * Both counters are controlled using a single control register.  The
+ * only way to stop all sampling is to clear all of the context (user,
+ * supervisor, hypervisor) sampling enable bits.  But these bits apply
+ * to both counters, thus the two counters can't be enabled/disabled
+ * individually.
+ *
+ * The control register has two event fields, one for each of the two
+ * counters.  It's thus nearly impossible to have one counter going
+ * while keeping the other one stopped.  Therefore it is possible to
+ * get overflow interrupts for counters not currently "in use" and
+ * that condition must be checked in the overflow interrupt handler.
+ *
+ * So we use a hack, in that we program inactive counters with the
+ * "sw_count0" and "sw_count1" events.  These count how many times
+ * the instruction "sethi %hi(0xfc000), %g0" is executed.  It's an
+ * unusual way to encode a NOP and therefore will not trigger in
+ * normal code.
+ */
+
+#define MAX_HWEVENTS                   2
+#define MAX_PERIOD                     ((1UL << 32) - 1)
+
+#define PIC_UPPER_INDEX                        0
+#define PIC_LOWER_INDEX                        1
+
+struct cpu_hw_events {
+       struct perf_event       *events[MAX_HWEVENTS];
+       unsigned long           used_mask[BITS_TO_LONGS(MAX_HWEVENTS)];
+       unsigned long           active_mask[BITS_TO_LONGS(MAX_HWEVENTS)];
+       int enabled;
+};
+DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { .enabled = 1, };
+
+struct perf_event_map {
+       u16     encoding;
+       u8      pic_mask;
+#define PIC_NONE       0x00
+#define PIC_UPPER      0x01
+#define PIC_LOWER      0x02
+};
+
+struct sparc_pmu {
+       const struct perf_event_map     *(*event_map)(int);
+       int                             max_events;
+       int                             upper_shift;
+       int                             lower_shift;
+       int                             event_mask;
+       int                             hv_bit;
+       int                             irq_bit;
+       int                             upper_nop;
+       int                             lower_nop;
+};
+
+static const struct perf_event_map ultra3i_perfmon_event_map[] = {
+       [PERF_COUNT_HW_CPU_CYCLES] = { 0x0000, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_INSTRUCTIONS] = { 0x0001, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_CACHE_REFERENCES] = { 0x0009, PIC_LOWER },
+       [PERF_COUNT_HW_CACHE_MISSES] = { 0x0009, PIC_UPPER },
+};
+
+static const struct perf_event_map *ultra3i_event_map(int event_id)
+{
+       return &ultra3i_perfmon_event_map[event_id];
+}
+
+static const struct sparc_pmu ultra3i_pmu = {
+       .event_map      = ultra3i_event_map,
+       .max_events     = ARRAY_SIZE(ultra3i_perfmon_event_map),
+       .upper_shift    = 11,
+       .lower_shift    = 4,
+       .event_mask     = 0x3f,
+       .upper_nop      = 0x1c,
+       .lower_nop      = 0x14,
+};
+
+static const struct perf_event_map niagara2_perfmon_event_map[] = {
+       [PERF_COUNT_HW_CPU_CYCLES] = { 0x02ff, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_INSTRUCTIONS] = { 0x02ff, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_CACHE_REFERENCES] = { 0x0208, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_CACHE_MISSES] = { 0x0302, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x0201, PIC_UPPER | PIC_LOWER },
+       [PERF_COUNT_HW_BRANCH_MISSES] = { 0x0202, PIC_UPPER | PIC_LOWER },
+};
+
+static const struct perf_event_map *niagara2_event_map(int event_id)
+{
+       return &niagara2_perfmon_event_map[event_id];
+}
+
+static const struct sparc_pmu niagara2_pmu = {
+       .event_map      = niagara2_event_map,
+       .max_events     = ARRAY_SIZE(niagara2_perfmon_event_map),
+       .upper_shift    = 19,
+       .lower_shift    = 6,
+       .event_mask     = 0xfff,
+       .hv_bit         = 0x8,
+       .irq_bit        = 0x03,
+       .upper_nop      = 0x220,
+       .lower_nop      = 0x220,
+};
+
+static const struct sparc_pmu *sparc_pmu __read_mostly;
+
+static u64 event_encoding(u64 event_id, int idx)
+{
+       if (idx == PIC_UPPER_INDEX)
+               event_id <<= sparc_pmu->upper_shift;
+       else
+               event_id <<= sparc_pmu->lower_shift;
+       return event_id;
+}
+
+static u64 mask_for_index(int idx)
+{
+       return event_encoding(sparc_pmu->event_mask, idx);
+}
+
+static u64 nop_for_index(int idx)
+{
+       return event_encoding(idx == PIC_UPPER_INDEX ?
+                             sparc_pmu->upper_nop :
+                             sparc_pmu->lower_nop, idx);
+}
+
+static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc,
+                                           int idx)
+{
+       u64 val, mask = mask_for_index(idx);
+
+       val = pcr_ops->read();
+       pcr_ops->write((val & ~mask) | hwc->config);
+}
+
+static inline void sparc_pmu_disable_event(struct hw_perf_event *hwc,
+                                            int idx)
+{
+       u64 mask = mask_for_index(idx);
+       u64 nop = nop_for_index(idx);
+       u64 val = pcr_ops->read();
+
+       pcr_ops->write((val & ~mask) | nop);
+}
+
+void hw_perf_enable(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       u64 val;
+       int i;
+
+       if (cpuc->enabled)
+               return;
+
+       cpuc->enabled = 1;
+       barrier();
+
+       val = pcr_ops->read();
+
+       for (i = 0; i < MAX_HWEVENTS; i++) {
+               struct perf_event *cp = cpuc->events[i];
+               struct hw_perf_event *hwc;
+
+               if (!cp)
+                       continue;
+               hwc = &cp->hw;
+               val |= hwc->config_base;
+       }
+
+       pcr_ops->write(val);
+}
+
+void hw_perf_disable(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       u64 val;
+
+       if (!cpuc->enabled)
+               return;
+
+       cpuc->enabled = 0;
+
+       val = pcr_ops->read();
+       val &= ~(PCR_UTRACE | PCR_STRACE |
+                sparc_pmu->hv_bit | sparc_pmu->irq_bit);
+       pcr_ops->write(val);
+}
+
+static u32 read_pmc(int idx)
+{
+       u64 val;
+
+       read_pic(val);
+       if (idx == PIC_UPPER_INDEX)
+               val >>= 32;
+
+       return val & 0xffffffff;
+}
+
+static void write_pmc(int idx, u64 val)
+{
+       u64 shift, mask, pic;
+
+       shift = 0;
+       if (idx == PIC_UPPER_INDEX)
+               shift = 32;
+
+       mask = ((u64) 0xffffffff) << shift;
+       val <<= shift;
+
+       read_pic(pic);
+       pic &= ~mask;
+       pic |= val;
+       write_pic(pic);
+}
+
+static int sparc_perf_event_set_period(struct perf_event *event,
+                                        struct hw_perf_event *hwc, int idx)
+{
+       s64 left = atomic64_read(&hwc->period_left);
+       s64 period = hwc->sample_period;
+       int ret = 0;
+
+       if (unlikely(left <= -period)) {
+               left = period;
+               atomic64_set(&hwc->period_left, left);
+               hwc->last_period = period;
+               ret = 1;
+       }
+
+       if (unlikely(left <= 0)) {
+               left += period;
+               atomic64_set(&hwc->period_left, left);
+               hwc->last_period = period;
+               ret = 1;
+       }
+       if (left > MAX_PERIOD)
+               left = MAX_PERIOD;
+
+       atomic64_set(&hwc->prev_count, (u64)-left);
+
+       write_pmc(idx, (u64)(-left) & 0xffffffff);
+
+       perf_event_update_userpage(event);
+
+       return ret;
+}
+
+static int sparc_pmu_enable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       struct hw_perf_event *hwc = &event->hw;
+       int idx = hwc->idx;
+
+       if (test_and_set_bit(idx, cpuc->used_mask))
+               return -EAGAIN;
+
+       sparc_pmu_disable_event(hwc, idx);
+
+       cpuc->events[idx] = event;
+       set_bit(idx, cpuc->active_mask);
+
+       sparc_perf_event_set_period(event, hwc, idx);
+       sparc_pmu_enable_event(hwc, idx);
+       perf_event_update_userpage(event);
+       return 0;
+}
+
+static u64 sparc_perf_event_update(struct perf_event *event,
+                                    struct hw_perf_event *hwc, int idx)
+{
+       int shift = 64 - 32;
+       u64 prev_raw_count, new_raw_count;
+       s64 delta;
+
+again:
+       prev_raw_count = atomic64_read(&hwc->prev_count);
+       new_raw_count = read_pmc(idx);
+
+       if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
+                            new_raw_count) != prev_raw_count)
+               goto again;
+
+       delta = (new_raw_count << shift) - (prev_raw_count << shift);
+       delta >>= shift;
+
+       atomic64_add(delta, &event->count);
+       atomic64_sub(delta, &hwc->period_left);
+
+       return new_raw_count;
+}
+
+static void sparc_pmu_disable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       struct hw_perf_event *hwc = &event->hw;
+       int idx = hwc->idx;
+
+       clear_bit(idx, cpuc->active_mask);
+       sparc_pmu_disable_event(hwc, idx);
+
+       barrier();
+
+       sparc_perf_event_update(event, hwc, idx);
+       cpuc->events[idx] = NULL;
+       clear_bit(idx, cpuc->used_mask);
+
+       perf_event_update_userpage(event);
+}
+
+static void sparc_pmu_read(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       sparc_perf_event_update(event, hwc, hwc->idx);
+}
+
+static void sparc_pmu_unthrottle(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       sparc_pmu_enable_event(hwc, hwc->idx);
+}
+
+static atomic_t active_events = ATOMIC_INIT(0);
+static DEFINE_MUTEX(pmc_grab_mutex);
+
+void perf_event_grab_pmc(void)
+{
+       if (atomic_inc_not_zero(&active_events))
+               return;
+
+       mutex_lock(&pmc_grab_mutex);
+       if (atomic_read(&active_events) == 0) {
+               if (atomic_read(&nmi_active) > 0) {
+                       on_each_cpu(stop_nmi_watchdog, NULL, 1);
+                       BUG_ON(atomic_read(&nmi_active) != 0);
+               }
+               atomic_inc(&active_events);
+       }
+       mutex_unlock(&pmc_grab_mutex);
+}
+
+void perf_event_release_pmc(void)
+{
+       if (atomic_dec_and_mutex_lock(&active_events, &pmc_grab_mutex)) {
+               if (atomic_read(&nmi_active) == 0)
+                       on_each_cpu(start_nmi_watchdog, NULL, 1);
+               mutex_unlock(&pmc_grab_mutex);
+       }
+}
+
+static void hw_perf_event_destroy(struct perf_event *event)
+{
+       perf_event_release_pmc();
+}
+
+static int __hw_perf_event_init(struct perf_event *event)
+{
+       struct perf_event_attr *attr = &event->attr;
+       struct hw_perf_event *hwc = &event->hw;
+       const struct perf_event_map *pmap;
+       u64 enc;
+
+       if (atomic_read(&nmi_active) < 0)
+               return -ENODEV;
+
+       if (attr->type != PERF_TYPE_HARDWARE)
+               return -EOPNOTSUPP;
+
+       if (attr->config >= sparc_pmu->max_events)
+               return -EINVAL;
+
+       perf_event_grab_pmc();
+       event->destroy = hw_perf_event_destroy;
+
+       /* We save the enable bits in the config_base.  So to
+        * turn off sampling just write 'config', and to enable
+        * things write 'config | config_base'.
+        */
+       hwc->config_base = sparc_pmu->irq_bit;
+       if (!attr->exclude_user)
+               hwc->config_base |= PCR_UTRACE;
+       if (!attr->exclude_kernel)
+               hwc->config_base |= PCR_STRACE;
+       if (!attr->exclude_hv)
+               hwc->config_base |= sparc_pmu->hv_bit;
+
+       if (!hwc->sample_period) {
+               hwc->sample_period = MAX_PERIOD;
+               hwc->last_period = hwc->sample_period;
+               atomic64_set(&hwc->period_left, hwc->sample_period);
+       }
+
+       pmap = sparc_pmu->event_map(attr->config);
+
+       enc = pmap->encoding;
+       if (pmap->pic_mask & PIC_UPPER) {
+               hwc->idx = PIC_UPPER_INDEX;
+               enc <<= sparc_pmu->upper_shift;
+       } else {
+               hwc->idx = PIC_LOWER_INDEX;
+               enc <<= sparc_pmu->lower_shift;
+       }
+
+       hwc->config |= enc;
+       return 0;
+}
+
+static const struct pmu pmu = {
+       .enable         = sparc_pmu_enable,
+       .disable        = sparc_pmu_disable,
+       .read           = sparc_pmu_read,
+       .unthrottle     = sparc_pmu_unthrottle,
+};
+
+const struct pmu *hw_perf_event_init(struct perf_event *event)
+{
+       int err = __hw_perf_event_init(event);
+
+       if (err)
+               return ERR_PTR(err);
+       return &pmu;
+}
+
+void perf_event_print_debug(void)
+{
+       unsigned long flags;
+       u64 pcr, pic;
+       int cpu;
+
+       if (!sparc_pmu)
+               return;
+
+       local_irq_save(flags);
+
+       cpu = smp_processor_id();
+
+       pcr = pcr_ops->read();
+       read_pic(pic);
+
+       pr_info("\n");
+       pr_info("CPU#%d: PCR[%016llx] PIC[%016llx]\n",
+               cpu, pcr, pic);
+
+       local_irq_restore(flags);
+}
+
+static int __kprobes perf_event_nmi_handler(struct notifier_block *self,
+                                             unsigned long cmd, void *__args)
+{
+       struct die_args *args = __args;
+       struct perf_sample_data data;
+       struct cpu_hw_events *cpuc;
+       struct pt_regs *regs;
+       int idx;
+
+       if (!atomic_read(&active_events))
+               return NOTIFY_DONE;
+
+       switch (cmd) {
+       case DIE_NMI:
+               break;
+
+       default:
+               return NOTIFY_DONE;
+       }
+
+       regs = args->regs;
+
+       data.addr = 0;
+
+       cpuc = &__get_cpu_var(cpu_hw_events);
+       for (idx = 0; idx < MAX_HWEVENTS; idx++) {
+               struct perf_event *event = cpuc->events[idx];
+               struct hw_perf_event *hwc;
+               u64 val;
+
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+               hwc = &event->hw;
+               val = sparc_perf_event_update(event, hwc, idx);
+               if (val & (1ULL << 31))
+                       continue;
+
+               data.period = event->hw.last_period;
+               if (!sparc_perf_event_set_period(event, hwc, idx))
+                       continue;
+
+               if (perf_event_overflow(event, 1, &data, regs))
+                       sparc_pmu_disable_event(hwc, idx);
+       }
+
+       return NOTIFY_STOP;
+}
+
+static __read_mostly struct notifier_block perf_event_nmi_notifier = {
+       .notifier_call          = perf_event_nmi_handler,
+};
+
+static bool __init supported_pmu(void)
+{
+       if (!strcmp(sparc_pmu_type, "ultra3i")) {
+               sparc_pmu = &ultra3i_pmu;
+               return true;
+       }
+       if (!strcmp(sparc_pmu_type, "niagara2")) {
+               sparc_pmu = &niagara2_pmu;
+               return true;
+       }
+       return false;
+}
+
+void __init init_hw_perf_events(void)
+{
+       pr_info("Performance events: ");
+
+       if (!supported_pmu()) {
+               pr_cont("No support for PMU type '%s'\n", sparc_pmu_type);
+               return;
+       }
+
+       pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type);
+
+       /* All sparc64 PMUs currently have 2 events.  But this simple
+        * driver only supports one active event at a time.
+        */
+       perf_max_events = 1;
+
+       register_die_notifier(&perf_event_nmi_notifier);
+}
index 0418157..0f1658d 100644 (file)
@@ -82,5 +82,5 @@ sys_call_table:
 /*310*/        .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
 /*315*/        .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
 /*320*/        .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
-/*325*/        .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_counter_open
+/*325*/        .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open
 
index 91b06b7..009825f 100644 (file)
@@ -83,7 +83,7 @@ sys_call_table32:
 /*310*/        .word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate
        .word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1
 /*320*/        .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv
-       .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_counter_open
+       .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open
 
 #endif /* CONFIG_COMPAT */
 
@@ -158,4 +158,4 @@ sys_call_table:
 /*310*/        .word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
        .word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
 /*320*/        .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
-       .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_counter_open
+       .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open
index 54114ad..dc7c3b1 100644 (file)
@@ -472,7 +472,7 @@ void __init mem_init(void)
                        reservedpages++;
 
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               num_physpages << (PAGE_SHIFT - 10),
               codepages << (PAGE_SHIFT-10),
               reservedpages << (PAGE_SHIFT - 10),
index f114813..a74245a 100644 (file)
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out,
                     char **error_out)
 {
        char *end;
-       int n, err = -EINVAL;;
+       int n, err = -EINVAL;
 
        n = simple_strtoul(str, &end, 0);
        if (end == str) {
index 8f05d4d..635d16d 100644 (file)
@@ -106,7 +106,7 @@ static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
 #define MAX_DEV (16)
 
-static struct block_device_operations ubd_blops = {
+static const struct block_device_operations ubd_blops = {
         .owner         = THIS_MODULE,
         .open          = ubd_open,
         .release       = ubd_release,
index 313ebb8..fb3c05a 100644 (file)
@@ -1,25 +1 @@
-/* (c) 2004 cw@f00f.org, GPLv2 blah blah */
-
-#ifndef __ASM_UM_HARDIRQ_H
-#define __ASM_UM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-/* NOTE: When SMP works again we might want to make this
- * ____cacheline_aligned or maybe use per_cpu state? --cw */
-typedef struct {
-       unsigned int __softirq_pending;
-} irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>
-
-/* As this would be very strange for UML to get we BUG() after the
- * printk. */
-static inline void ack_bad_irq(unsigned int irq)
-{
-       printk(KERN_ERR "unexpected IRQ %02x\n", irq);
-       BUG();
-}
-
-#endif /* __ASM_UM_HARDIRQ_H */
+#include <asm-generic/hardirq.h>
index 4bce6e0..7fd8539 100644 (file)
@@ -29,7 +29,7 @@ extern int ptrace_setregs(long pid, unsigned long *regs_in);
  * recompilation. So, we use PTRACE_OLDSETOPTIONS in UML.
  * We also want to be able to build the kernel on 2.4, which doesn't
  * have PTRACE_OLDSETOPTIONS. So, if it is missing, we declare
- * PTRACE_OLDSETOPTIONS to to be the same as PTRACE_SETOPTIONS.
+ * PTRACE_OLDSETOPTIONS to be the same as PTRACE_SETOPTIONS.
  *
  * On architectures, that start to support PTRACE_O_TRACESYSGOOD on
  * linux 2.6, PTRACE_OLDSETOPTIONS never is defined, and also isn't
index 61d7e61..a5d5e70 100644 (file)
@@ -77,7 +77,7 @@ void __init mem_init(void)
        num_physpages = totalram_pages;
        max_pfn = totalram_pages;
        printk(KERN_INFO "Memory: %luk available\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
+              nr_free_pages() << (PAGE_SHIFT-10));
        kmalloc_ok = 1;
 
 #ifdef CONFIG_HIGHMEM
index 0cd9a7a..8bfd1e9 100644 (file)
@@ -38,10 +38,10 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
        *pte = pte_mkread(*pte);
        return 0;
 
- out_pmd:
-       pud_free(mm, pud);
  out_pte:
        pmd_free(mm, pmd);
+ out_pmd:
+       pud_free(mm, pud);
  out:
        return -ENOMEM;
 }
index 30860b8..b6b1096 100644 (file)
@@ -15,7 +15,6 @@
 #include "os.h"
 #include "um_malloc.h"
 #include "user.h"
-#include <linux/limits.h>
 
 struct helper_data {
        void (*pre_exec)(void*);
index 1c9a181..74d647e 100644 (file)
@@ -24,7 +24,7 @@ config X86
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
-       select HAVE_PERF_COUNTERS if (!M386 && !M486)
+       select HAVE_PERF_EVENTS if (!M386 && !M486)
        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -1204,6 +1204,10 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on NUMA && X86_32
 
+config ARCH_PROC_KCORE_TEXT
+       def_bool y
+       depends on X86_64 && PROC_KCORE
+
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
        depends on X86_64
index ba331bf..74619c4 100644 (file)
@@ -831,5 +831,5 @@ ia32_sys_call_table:
        .quad compat_sys_preadv
        .quad compat_sys_pwritev
        .quad compat_sys_rt_tgsigqueueinfo      /* 335 */
-       .quad sys_perf_counter_open
+       .quad sys_perf_event_open
 ia32_syscall_end:
index c6d21b1..474d80d 100644 (file)
@@ -65,6 +65,19 @@ static inline void default_inquire_remote_apic(int apicid)
                __inquire_remote_apic(apicid);
 }
 
+/*
+ * With 82489DX we can't rely on apic feature bit
+ * retrieved via cpuid but still have to deal with
+ * such an apic chip so we assume that SMP configuration
+ * is found from MP table (64bit case uses ACPI mostly
+ * which set smp presence flag as well so we are safe
+ * to use this helper too).
+ */
+static inline bool apic_from_smp_config(void)
+{
+       return smp_found_config && !disable_apic;
+}
+
 /*
  * Basic functions accessing APICs.
  */
index 5e3f204..f5693c8 100644 (file)
@@ -49,7 +49,7 @@ BUILD_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
 BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
 BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
 
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
 BUILD_INTERRUPT(perf_pending_interrupt, LOCAL_PENDING_VECTOR)
 #endif
 
diff --git a/arch/x86/include/asm/perf_counter.h b/arch/x86/include/asm/perf_counter.h
deleted file mode 100644 (file)
index e7b7c93..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef _ASM_X86_PERF_COUNTER_H
-#define _ASM_X86_PERF_COUNTER_H
-
-/*
- * Performance counter hw details:
- */
-
-#define X86_PMC_MAX_GENERIC                                    8
-#define X86_PMC_MAX_FIXED                                      3
-
-#define X86_PMC_IDX_GENERIC                                    0
-#define X86_PMC_IDX_FIXED                                     32
-#define X86_PMC_IDX_MAX                                               64
-
-#define MSR_ARCH_PERFMON_PERFCTR0                            0xc1
-#define MSR_ARCH_PERFMON_PERFCTR1                            0xc2
-
-#define MSR_ARCH_PERFMON_EVENTSEL0                          0x186
-#define MSR_ARCH_PERFMON_EVENTSEL1                          0x187
-
-#define ARCH_PERFMON_EVENTSEL0_ENABLE                    (1 << 22)
-#define ARCH_PERFMON_EVENTSEL_INT                        (1 << 20)
-#define ARCH_PERFMON_EVENTSEL_OS                         (1 << 17)
-#define ARCH_PERFMON_EVENTSEL_USR                        (1 << 16)
-
-/*
- * Includes eventsel and unit mask as well:
- */
-#define ARCH_PERFMON_EVENT_MASK                                    0xffff
-
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL                0x3c
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK                (0x00 << 8)
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX                 0
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \
-               (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX))
-
-#define ARCH_PERFMON_BRANCH_MISSES_RETIRED                      6
-
-/*
- * Intel "Architectural Performance Monitoring" CPUID
- * detection/enumeration details:
- */
-union cpuid10_eax {
-       struct {
-               unsigned int version_id:8;
-               unsigned int num_counters:8;
-               unsigned int bit_width:8;
-               unsigned int mask_length:8;
-       } split;
-       unsigned int full;
-};
-
-union cpuid10_edx {
-       struct {
-               unsigned int num_counters_fixed:4;
-               unsigned int reserved:28;
-       } split;
-       unsigned int full;
-};
-
-
-/*
- * Fixed-purpose performance counters:
- */
-
-/*
- * All 3 fixed-mode PMCs are configured via this single MSR:
- */
-#define MSR_ARCH_PERFMON_FIXED_CTR_CTRL                        0x38d
-
-/*
- * The counts are available in three separate MSRs:
- */
-
-/* Instr_Retired.Any: */
-#define MSR_ARCH_PERFMON_FIXED_CTR0                    0x309
-#define X86_PMC_IDX_FIXED_INSTRUCTIONS                 (X86_PMC_IDX_FIXED + 0)
-
-/* CPU_CLK_Unhalted.Core: */
-#define MSR_ARCH_PERFMON_FIXED_CTR1                    0x30a
-#define X86_PMC_IDX_FIXED_CPU_CYCLES                   (X86_PMC_IDX_FIXED + 1)
-
-/* CPU_CLK_Unhalted.Ref: */
-#define MSR_ARCH_PERFMON_FIXED_CTR2                    0x30b
-#define X86_PMC_IDX_FIXED_BUS_CYCLES                   (X86_PMC_IDX_FIXED + 2)
-
-/*
- * We model BTS tracing as another fixed-mode PMC.
- *
- * We choose a value in the middle of the fixed counter range, since lower
- * values are used by actual fixed counters and higher values are used
- * to indicate other overflow conditions in the PERF_GLOBAL_STATUS msr.
- */
-#define X86_PMC_IDX_FIXED_BTS                          (X86_PMC_IDX_FIXED + 16)
-
-
-#ifdef CONFIG_PERF_COUNTERS
-extern void init_hw_perf_counters(void);
-extern void perf_counters_lapic_init(void);
-
-#define PERF_COUNTER_INDEX_OFFSET                      0
-
-#else
-static inline void init_hw_perf_counters(void)         { }
-static inline void perf_counters_lapic_init(void)      { }
-#endif
-
-#endif /* _ASM_X86_PERF_COUNTER_H */
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
new file mode 100644 (file)
index 0000000..ad7ce3f
--- /dev/null
@@ -0,0 +1,108 @@
+#ifndef _ASM_X86_PERF_EVENT_H
+#define _ASM_X86_PERF_EVENT_H
+
+/*
+ * Performance event hw details:
+ */
+
+#define X86_PMC_MAX_GENERIC                                    8
+#define X86_PMC_MAX_FIXED                                      3
+
+#define X86_PMC_IDX_GENERIC                                    0
+#define X86_PMC_IDX_FIXED                                     32
+#define X86_PMC_IDX_MAX                                               64
+
+#define MSR_ARCH_PERFMON_PERFCTR0                            0xc1
+#define MSR_ARCH_PERFMON_PERFCTR1                            0xc2
+
+#define MSR_ARCH_PERFMON_EVENTSEL0                          0x186
+#define MSR_ARCH_PERFMON_EVENTSEL1                          0x187
+
+#define ARCH_PERFMON_EVENTSEL0_ENABLE                    (1 << 22)
+#define ARCH_PERFMON_EVENTSEL_INT                        (1 << 20)
+#define ARCH_PERFMON_EVENTSEL_OS                         (1 << 17)
+#define ARCH_PERFMON_EVENTSEL_USR                        (1 << 16)
+
+/*
+ * Includes eventsel and unit mask as well:
+ */
+#define ARCH_PERFMON_EVENT_MASK                                    0xffff
+
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL                0x3c
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK                (0x00 << 8)
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX                 0
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \
+               (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX))
+
+#define ARCH_PERFMON_BRANCH_MISSES_RETIRED                      6
+
+/*
+ * Intel "Architectural Performance Monitoring" CPUID
+ * detection/enumeration details:
+ */
+union cpuid10_eax {
+       struct {
+               unsigned int version_id:8;
+               unsigned int num_events:8;
+               unsigned int bit_width:8;
+               unsigned int mask_length:8;
+       } split;
+       unsigned int full;
+};
+
+union cpuid10_edx {
+       struct {
+               unsigned int num_events_fixed:4;
+               unsigned int reserved:28;
+       } split;
+       unsigned int full;
+};
+
+
+/*
+ * Fixed-purpose performance events:
+ */
+
+/*
+ * All 3 fixed-mode PMCs are configured via this single MSR:
+ */
+#define MSR_ARCH_PERFMON_FIXED_CTR_CTRL                        0x38d
+
+/*
+ * The counts are available in three separate MSRs:
+ */
+
+/* Instr_Retired.Any: */
+#define MSR_ARCH_PERFMON_FIXED_CTR0                    0x309
+#define X86_PMC_IDX_FIXED_INSTRUCTIONS                 (X86_PMC_IDX_FIXED + 0)
+
+/* CPU_CLK_Unhalted.Core: */
+#define MSR_ARCH_PERFMON_FIXED_CTR1                    0x30a
+#define X86_PMC_IDX_FIXED_CPU_CYCLES                   (X86_PMC_IDX_FIXED + 1)
+
+/* CPU_CLK_Unhalted.Ref: */
+#define MSR_ARCH_PERFMON_FIXED_CTR2                    0x30b
+#define X86_PMC_IDX_FIXED_BUS_CYCLES                   (X86_PMC_IDX_FIXED + 2)
+
+/*
+ * We model BTS tracing as another fixed-mode PMC.
+ *
+ * We choose a value in the middle of the fixed event range, since lower
+ * values are used by actual fixed events and higher values are used
+ * to indicate other overflow conditions in the PERF_GLOBAL_STATUS msr.
+ */
+#define X86_PMC_IDX_FIXED_BTS                          (X86_PMC_IDX_FIXED + 16)
+
+
+#ifdef CONFIG_PERF_EVENTS
+extern void init_hw_perf_events(void);
+extern void perf_events_lapic_init(void);
+
+#define PERF_EVENT_INDEX_OFFSET                        0
+
+#else
+static inline void init_hw_perf_events(void)           { }
+static inline void perf_events_lapic_init(void)        { }
+#endif
+
+#endif /* _ASM_X86_PERF_EVENT_H */
index c86f452..ae907e6 100644 (file)
@@ -65,7 +65,6 @@ static __always_inline void *__constant_memcpy(void *to, const void *from,
        case 4:
                *(int *)to = *(int *)from;
                return to;
-
        case 3:
                *(short *)to = *(short *)from;
                *((char *)to + 2) = *((char *)from + 2);
index d82f39b..8d33bc5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Access to user system call parameters and results
  *
- * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2008-2009 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
 #include <linux/sched.h>
 #include <linux/err.h>
 
-static inline long syscall_get_nr(struct task_struct *task,
-                                 struct pt_regs *regs)
+/*
+ * Only the low 32 bits of orig_ax are meaningful, so we return int.
+ * This importantly ignores the high bits on 64-bit, so comparisons
+ * sign-extend the low 32 bits.
+ */
+static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
 {
-       /*
-        * We always sign-extend a -1 value being set here,
-        * so this is always either -1L or a syscall number.
-        */
        return regs->orig_ax;
 }
 
index 5e06259..632fb44 100644 (file)
@@ -33,7 +33,7 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
  * Copy data from kernel space to user space.  Caller must check
  * the specified block with access_ok() before calling this function.
  * The caller should also make sure he pins the user space address
- * so that the we don't result in page fault and sleep.
+ * so that we don't result in page fault and sleep.
  *
  * Here we special-case 1, 2 and 4-byte copy_*_user invocations.  On a fault
  * we return the initial request size (1, 2 or 4), as copy_*_user should do.
index 8deaada..6fb3c20 100644 (file)
 #define __NR_preadv            333
 #define __NR_pwritev           334
 #define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open   336
 
 #ifdef __KERNEL__
 
index b9f3c60..8d3ad0a 100644 (file)
@@ -659,8 +659,8 @@ __SYSCALL(__NR_preadv, sys_preadv)
 __SYSCALL(__NR_pwritev, sys_pwritev)
 #define __NR_rt_tgsigqueueinfo                 297
 __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open                 298
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open                   298
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR
index 77a6850..04eb6c9 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/numa.h>
 #include <linux/percpu.h>
 #include <linux/timer.h>
+#include <linux/io.h>
 #include <asm/types.h>
 #include <asm/percpu.h>
 #include <asm/uv/uv_mmrs.h>
@@ -258,13 +259,13 @@ static inline unsigned long *uv_global_mmr32_address(int pnode,
 static inline void uv_write_global_mmr32(int pnode, unsigned long offset,
                                 unsigned long val)
 {
-       *uv_global_mmr32_address(pnode, offset) = val;
+       writeq(val, uv_global_mmr32_address(pnode, offset));
 }
 
 static inline unsigned long uv_read_global_mmr32(int pnode,
                                                 unsigned long offset)
 {
-       return *uv_global_mmr32_address(pnode, offset);
+       return readq(uv_global_mmr32_address(pnode, offset));
 }
 
 /*
@@ -281,13 +282,13 @@ static inline unsigned long *uv_global_mmr64_address(int pnode,
 static inline void uv_write_global_mmr64(int pnode, unsigned long offset,
                                unsigned long val)
 {
-       *uv_global_mmr64_address(pnode, offset) = val;
+       writeq(val, uv_global_mmr64_address(pnode, offset));
 }
 
 static inline unsigned long uv_read_global_mmr64(int pnode,
                                                 unsigned long offset)
 {
-       return *uv_global_mmr64_address(pnode, offset);
+       return readq(uv_global_mmr64_address(pnode, offset));
 }
 
 /*
@@ -301,22 +302,22 @@ static inline unsigned long *uv_local_mmr_address(unsigned long offset)
 
 static inline unsigned long uv_read_local_mmr(unsigned long offset)
 {
-       return *uv_local_mmr_address(offset);
+       return readq(uv_local_mmr_address(offset));
 }
 
 static inline void uv_write_local_mmr(unsigned long offset, unsigned long val)
 {
-       *uv_local_mmr_address(offset) = val;
+       writeq(val, uv_local_mmr_address(offset));
 }
 
 static inline unsigned char uv_read_local_mmr8(unsigned long offset)
 {
-       return *((unsigned char *)uv_local_mmr_address(offset));
+       return readb(uv_local_mmr_address(offset));
 }
 
 static inline void uv_write_local_mmr8(unsigned long offset, unsigned char val)
 {
-       *((unsigned char *)uv_local_mmr_address(offset)) = val;
+       writeb(val, uv_local_mmr_address(offset));
 }
 
 /*
@@ -422,7 +423,7 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
        unsigned long val;
 
        val = (1UL << UVH_IPI_INT_SEND_SHFT) |
-                       ((apicid & 0x3f) << UVH_IPI_INT_APIC_ID_SHFT) |
+                       ((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
                        (vector << UVH_IPI_INT_VECTOR_SHFT);
        uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
 }
index a34601f..894aa97 100644 (file)
@@ -14,7 +14,7 @@
  *     Mikael Pettersson       :       PM converted to driver model.
  */
 
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/kernel_stat.h>
 #include <linux/mc146818rtc.h>
 #include <linux/acpi_pmtmr.h>
@@ -35,7 +35,7 @@
 #include <linux/smp.h>
 #include <linux/mm.h>
 
-#include <asm/perf_counter.h>
+#include <asm/perf_event.h>
 #include <asm/x86_init.h>
 #include <asm/pgalloc.h>
 #include <asm/atomic.h>
@@ -62,7 +62,7 @@ unsigned int boot_cpu_physical_apicid = -1U;
 /*
  * The highest APIC ID seen during enumeration.
  *
- * This determines the messaging protocol we can use: if all APIC IDs
+ * On AMD, this determines the messaging protocol we can use: if all APIC IDs
  * are in the 0 ... 7 range, then we can use logical addressing which
  * has some performance advantages (better broadcasting).
  *
@@ -979,7 +979,7 @@ void lapic_shutdown(void)
 {
        unsigned long flags;
 
-       if (!cpu_has_apic)
+       if (!cpu_has_apic && !apic_from_smp_config())
                return;
 
        local_irq_save(flags);
@@ -1189,7 +1189,7 @@ void __cpuinit setup_local_APIC(void)
                apic_write(APIC_ESR, 0);
        }
 #endif
-       perf_counters_lapic_init();
+       perf_events_lapic_init();
 
        preempt_disable();
 
@@ -1197,8 +1197,7 @@ void __cpuinit setup_local_APIC(void)
         * Double-check whether this APIC is really registered.
         * This is meaningless in clustered apic mode, so we skip it.
         */
-       if (!apic->apic_id_registered())
-               BUG();
+       BUG_ON(!apic->apic_id_registered());
 
        /*
         * Intel recommends to set DFR, LDR and TPR before enabling
@@ -1917,24 +1916,14 @@ void __cpuinit generic_processor_info(int apicid, int version)
                max_physical_apicid = apicid;
 
 #ifdef CONFIG_X86_32
-       /*
-        * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y
-        * but we need to work other dependencies like SMP_SUSPEND etc
-        * before this can be done without some confusion.
-        * if (CPU_HOTPLUG_ENABLED || num_processors > 8)
-        *       - Ashok Raj <ashok.raj@intel.com>
-        */
-       if (max_physical_apicid >= 8) {
-               switch (boot_cpu_data.x86_vendor) {
-               case X86_VENDOR_INTEL:
-                       if (!APIC_XAPIC(version)) {
-                               def_to_bigsmp = 0;
-                               break;
-                       }
-                       /* If P4 and above fall through */
-               case X86_VENDOR_AMD:
+       switch (boot_cpu_data.x86_vendor) {
+       case X86_VENDOR_INTEL:
+               if (num_processors > 8)
+                       def_to_bigsmp = 1;
+               break;
+       case X86_VENDOR_AMD:
+               if (max_physical_apicid >= 8)
                        def_to_bigsmp = 1;
-               }
        }
 #endif
 
index 809e1cf..64970b9 100644 (file)
@@ -1874,7 +1874,7 @@ __apicdebuginit(int) print_all_ICs(void)
        print_PIC();
 
        /* don't print out if apic is not there */
-       if (!cpu_has_apic || disable_apic)
+       if (!cpu_has_apic && !apic_from_smp_config())
                return 0;
 
        print_all_local_APICs();
@@ -1999,7 +1999,7 @@ void disable_IO_APIC(void)
        /*
         * Use virtual wire A mode when interrupt remapping is enabled.
         */
-       if (cpu_has_apic)
+       if (cpu_has_apic || apic_from_smp_config())
                disconnect_bsp_APIC(!intr_remapping_enabled &&
                                ioapic_i8259.pin != -1);
 }
index 65edc18..c4cbd30 100644 (file)
@@ -64,16 +64,23 @@ void __init default_setup_apic_routing(void)
                        apic = &apic_x2apic_phys;
                else
                        apic = &apic_x2apic_cluster;
-               printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
        }
 #endif
 
        if (apic == &apic_flat) {
-               if (max_physical_apicid >= 8)
-                       apic = &apic_physflat;
-               printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
+               switch (boot_cpu_data.x86_vendor) {
+               case X86_VENDOR_INTEL:
+                       if (num_processors > 8)
+                               apic = &apic_physflat;
+                       break;
+               case X86_VENDOR_AMD:
+                       if (max_physical_apicid >= 8)
+                               apic = &apic_physflat;
+               }
        }
 
+       printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
+
        if (is_vsmp_box()) {
                /* need to update phys_pkg_id */
                apic->phys_pkg_id = apicid_phys_pkg_id;
index 6011593..f5f5886 100644 (file)
@@ -389,6 +389,16 @@ static __init void map_gru_high(int max_pnode)
                map_high("GRU", gru.s.base, shift, max_pnode, map_wb);
 }
 
+static __init void map_mmr_high(int max_pnode)
+{
+       union uvh_rh_gam_mmr_overlay_config_mmr_u mmr;
+       int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT;
+
+       mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR);
+       if (mmr.s.enable)
+               map_high("MMR", mmr.s.base, shift, max_pnode, map_uc);
+}
+
 static __init void map_mmioh_high(int max_pnode)
 {
        union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh;
@@ -643,6 +653,7 @@ void __init uv_system_init(void)
        }
 
        map_gru_high(max_pnode);
+       map_mmr_high(max_pnode);
        map_mmioh_high(max_pnode);
 
        uv_cpu_init();
index 8dd3063..68537e9 100644 (file)
@@ -27,7 +27,7 @@ obj-$(CONFIG_CPU_SUP_CENTAUR)         += centaur.o
 obj-$(CONFIG_CPU_SUP_TRANSMETA_32)     += transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)           += umc.o
 
-obj-$(CONFIG_PERF_COUNTERS)            += perf_counter.o
+obj-$(CONFIG_PERF_EVENTS)              += perf_event.o
 
 obj-$(CONFIG_X86_MCE)                  += mcheck/
 obj-$(CONFIG_MTRR)                     += mtrr/
index f32fa71..c910a71 100644 (file)
@@ -184,7 +184,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
         * approved Athlon
         */
        WARN_ONCE(1, "WARNING: This combination of AMD"
-               "processors is not suitable for SMP.\n");
+               " processors is not suitable for SMP.\n");
        if (!test_taint(TAINT_UNSAFE_SMP))
                add_taint(TAINT_UNSAFE_SMP);
 
index 2055fc2..cc25c2b 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/io.h>
 
 #include <asm/stackprotector.h>
-#include <asm/perf_counter.h>
+#include <asm/perf_event.h>
 #include <asm/mmu_context.h>
 #include <asm/hypervisor.h>
 #include <asm/processor.h>
@@ -34,7 +34,6 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 #include <asm/pat.h>
-#include <linux/smp.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/uv/uv.h>
@@ -870,7 +869,7 @@ void __init identify_boot_cpu(void)
 #else
        vgetcpu_set_mode();
 #endif
-       init_hw_perf_counters();
+       init_hw_perf_events();
 }
 
 void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c)
index 7bb676c..7d5c3b0 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/cpufreq.h>
 #include <linux/compiler.h>
 #include <linux/dmi.h>
-#include <trace/power.h>
+#include <trace/events/power.h>
 
 #include <linux/acpi.h>
 #include <linux/io.h>
@@ -72,8 +72,6 @@ static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);
 
 static DEFINE_PER_CPU(struct aperfmperf, old_perf);
 
-DEFINE_TRACE(power_mark);
-
 /* acpi_perf_data is a pointer to percpu data. */
 static struct acpi_processor_performance *acpi_perf_data;
 
@@ -332,7 +330,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        unsigned int next_perf_state = 0; /* Index into perf table */
        unsigned int i;
        int result = 0;
-       struct power_trace it;
 
        dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
 
@@ -364,7 +361,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                }
        }
 
-       trace_power_mark(&it, POWER_PSTATE, next_perf_state);
+       trace_power_frequency(POWER_PSTATE, data->freq_table[next_state].frequency);
 
        switch (data->cpu_feature) {
        case SYSTEM_INTEL_MSR_CAPABLE:
index 8cd5224..83a3d1f 100644 (file)
@@ -489,8 +489,9 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
        int i, err = 0;
        struct threshold_bank *b = NULL;
        char name[32];
+#ifdef CONFIG_SMP
        struct cpuinfo_x86 *c = &cpu_data(cpu);
-
+#endif
 
        sprintf(name, "threshold_bank%i", bank);
 
index 08b6ea4..f04e725 100644 (file)
@@ -126,8 +126,8 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
                return -EINVAL;
 
        base = simple_strtoull(line + 5, &ptr, 0);
-       for (; isspace(*ptr); ++ptr)
-               ;
+       while (isspace(*ptr))
+               ptr++;
 
        if (strncmp(ptr, "size=", 5))
                return -EINVAL;
@@ -135,14 +135,14 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
        size = simple_strtoull(ptr + 5, &ptr, 0);
        if ((base & 0xfff) || (size & 0xfff))
                return -EINVAL;
-       for (; isspace(*ptr); ++ptr)
-               ;
+       while (isspace(*ptr))
+               ptr++;
 
        if (strncmp(ptr, "type=", 5))
                return -EINVAL;
        ptr += 5;
-       for (; isspace(*ptr); ++ptr)
-               ;
+       while (isspace(*ptr))
+               ptr++;
 
        for (i = 0; i < MTRR_NUM_TYPES; ++i) {
                if (strcmp(ptr, mtrr_strings[i]))
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
deleted file mode 100644 (file)
index 2732e2c..0000000
+++ /dev/null
@@ -1,2281 +0,0 @@
-/*
- * Performance counter x86 architecture code
- *
- *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
- *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
- *  Copyright (C) 2009 Jaswinder Singh Rajput
- *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
- *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
- *
- *  For licencing details see kernel-base/COPYING
- */
-
-#include <linux/perf_counter.h>
-#include <linux/capability.h>
-#include <linux/notifier.h>
-#include <linux/hardirq.h>
-#include <linux/kprobes.h>
-#include <linux/module.h>
-#include <linux/kdebug.h>
-#include <linux/sched.h>
-#include <linux/uaccess.h>
-#include <linux/highmem.h>
-#include <linux/cpu.h>
-
-#include <asm/apic.h>
-#include <asm/stacktrace.h>
-#include <asm/nmi.h>
-
-static u64 perf_counter_mask __read_mostly;
-
-/* The maximal number of PEBS counters: */
-#define MAX_PEBS_COUNTERS      4
-
-/* The size of a BTS record in bytes: */
-#define BTS_RECORD_SIZE                24
-
-/* The size of a per-cpu BTS buffer in bytes: */
-#define BTS_BUFFER_SIZE                (BTS_RECORD_SIZE * 1024)
-
-/* The BTS overflow threshold in bytes from the end of the buffer: */
-#define BTS_OVFL_TH            (BTS_RECORD_SIZE * 64)
-
-
-/*
- * Bits in the debugctlmsr controlling branch tracing.
- */
-#define X86_DEBUGCTL_TR                        (1 << 6)
-#define X86_DEBUGCTL_BTS               (1 << 7)
-#define X86_DEBUGCTL_BTINT             (1 << 8)
-#define X86_DEBUGCTL_BTS_OFF_OS                (1 << 9)
-#define X86_DEBUGCTL_BTS_OFF_USR       (1 << 10)
-
-/*
- * A debug store configuration.
- *
- * We only support architectures that use 64bit fields.
- */
-struct debug_store {
-       u64     bts_buffer_base;
-       u64     bts_index;
-       u64     bts_absolute_maximum;
-       u64     bts_interrupt_threshold;
-       u64     pebs_buffer_base;
-       u64     pebs_index;
-       u64     pebs_absolute_maximum;
-       u64     pebs_interrupt_threshold;
-       u64     pebs_counter_reset[MAX_PEBS_COUNTERS];
-};
-
-struct cpu_hw_counters {
-       struct perf_counter     *counters[X86_PMC_IDX_MAX];
-       unsigned long           used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
-       unsigned long           active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
-       unsigned long           interrupts;
-       int                     enabled;
-       struct debug_store      *ds;
-};
-
-/*
- * struct x86_pmu - generic x86 pmu
- */
-struct x86_pmu {
-       const char      *name;
-       int             version;
-       int             (*handle_irq)(struct pt_regs *);
-       void            (*disable_all)(void);
-       void            (*enable_all)(void);
-       void            (*enable)(struct hw_perf_counter *, int);
-       void            (*disable)(struct hw_perf_counter *, int);
-       unsigned        eventsel;
-       unsigned        perfctr;
-       u64             (*event_map)(int);
-       u64             (*raw_event)(u64);
-       int             max_events;
-       int             num_counters;
-       int             num_counters_fixed;
-       int             counter_bits;
-       u64             counter_mask;
-       int             apic;
-       u64             max_period;
-       u64             intel_ctrl;
-       void            (*enable_bts)(u64 config);
-       void            (*disable_bts)(void);
-};
-
-static struct x86_pmu x86_pmu __read_mostly;
-
-static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = {
-       .enabled = 1,
-};
-
-/*
- * Not sure about some of these
- */
-static const u64 p6_perfmon_event_map[] =
-{
-  [PERF_COUNT_HW_CPU_CYCLES]           = 0x0079,
-  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
-  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x0f2e,
-  [PERF_COUNT_HW_CACHE_MISSES]         = 0x012e,
-  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
-  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
-  [PERF_COUNT_HW_BUS_CYCLES]           = 0x0062,
-};
-
-static u64 p6_pmu_event_map(int event)
-{
-       return p6_perfmon_event_map[event];
-}
-
-/*
- * Counter setting that is specified not to count anything.
- * We use this to effectively disable a counter.
- *
- * L2_RQSTS with 0 MESI unit mask.
- */
-#define P6_NOP_COUNTER                 0x0000002EULL
-
-static u64 p6_pmu_raw_event(u64 event)
-{
-#define P6_EVNTSEL_EVENT_MASK          0x000000FFULL
-#define P6_EVNTSEL_UNIT_MASK           0x0000FF00ULL
-#define P6_EVNTSEL_EDGE_MASK           0x00040000ULL
-#define P6_EVNTSEL_INV_MASK            0x00800000ULL
-#define P6_EVNTSEL_COUNTER_MASK                0xFF000000ULL
-
-#define P6_EVNTSEL_MASK                        \
-       (P6_EVNTSEL_EVENT_MASK |        \
-        P6_EVNTSEL_UNIT_MASK  |        \
-        P6_EVNTSEL_EDGE_MASK  |        \
-        P6_EVNTSEL_INV_MASK   |        \
-        P6_EVNTSEL_COUNTER_MASK)
-
-       return event & P6_EVNTSEL_MASK;
-}
-
-
-/*
- * Intel PerfMon v3. Used on Core2 and later.
- */
-static const u64 intel_perfmon_event_map[] =
-{
-  [PERF_COUNT_HW_CPU_CYCLES]           = 0x003c,
-  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
-  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x4f2e,
-  [PERF_COUNT_HW_CACHE_MISSES]         = 0x412e,
-  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
-  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
-  [PERF_COUNT_HW_BUS_CYCLES]           = 0x013c,
-};
-
-static u64 intel_pmu_event_map(int event)
-{
-       return intel_perfmon_event_map[event];
-}
-
-/*
- * Generalized hw caching related event table, filled
- * in on a per model basis. A value of 0 means
- * 'not supported', -1 means 'event makes no sense on
- * this CPU', any other value means the raw event
- * ID.
- */
-
-#define C(x) PERF_COUNT_HW_CACHE_##x
-
-static u64 __read_mostly hw_cache_event_ids
-                               [PERF_COUNT_HW_CACHE_MAX]
-                               [PERF_COUNT_HW_CACHE_OP_MAX]
-                               [PERF_COUNT_HW_CACHE_RESULT_MAX];
-
-static const u64 nehalem_hw_cache_event_ids
-                               [PERF_COUNT_HW_CACHE_MAX]
-                               [PERF_COUNT_HW_CACHE_OP_MAX]
-                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
-{
- [ C(L1D) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI            */
-               [ C(RESULT_MISS)   ] = 0x0140, /* L1D_CACHE_LD.I_STATE         */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI            */
-               [ C(RESULT_MISS)   ] = 0x0141, /* L1D_CACHE_ST.I_STATE         */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x014e, /* L1D_PREFETCH.REQUESTS        */
-               [ C(RESULT_MISS)   ] = 0x024e, /* L1D_PREFETCH.MISS            */
-       },
- },
- [ C(L1I ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0380, /* L1I.READS                    */
-               [ C(RESULT_MISS)   ] = 0x0280, /* L1I.MISSES                   */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0,
-               [ C(RESULT_MISS)   ] = 0x0,
-       },
- },
- [ C(LL  ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0324, /* L2_RQSTS.LOADS               */
-               [ C(RESULT_MISS)   ] = 0x0224, /* L2_RQSTS.LD_MISS             */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0c24, /* L2_RQSTS.RFOS                */
-               [ C(RESULT_MISS)   ] = 0x0824, /* L2_RQSTS.RFO_MISS            */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x4f2e, /* LLC Reference                */
-               [ C(RESULT_MISS)   ] = 0x412e, /* LLC Misses                   */
-       },
- },
- [ C(DTLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI   (alias)  */
-               [ C(RESULT_MISS)   ] = 0x0108, /* DTLB_LOAD_MISSES.ANY         */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI   (alias)  */
-               [ C(RESULT_MISS)   ] = 0x010c, /* MEM_STORE_RETIRED.DTLB_MISS  */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0,
-               [ C(RESULT_MISS)   ] = 0x0,
-       },
- },
- [ C(ITLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x01c0, /* INST_RETIRED.ANY_P           */
-               [ C(RESULT_MISS)   ] = 0x20c8, /* ITLB_MISS_RETIRED            */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
- [ C(BPU ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ALL_BRANCHES */
-               [ C(RESULT_MISS)   ] = 0x03e8, /* BPU_CLEARS.ANY               */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
-};
-
-static const u64 core2_hw_cache_event_ids
-                               [PERF_COUNT_HW_CACHE_MAX]
-                               [PERF_COUNT_HW_CACHE_OP_MAX]
-                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
-{
- [ C(L1D) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI          */
-               [ C(RESULT_MISS)   ] = 0x0140, /* L1D_CACHE_LD.I_STATE       */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI          */
-               [ C(RESULT_MISS)   ] = 0x0141, /* L1D_CACHE_ST.I_STATE       */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x104e, /* L1D_PREFETCH.REQUESTS      */
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(L1I ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0080, /* L1I.READS                  */
-               [ C(RESULT_MISS)   ] = 0x0081, /* L1I.MISSES                 */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(LL  ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x4f29, /* L2_LD.MESI                 */
-               [ C(RESULT_MISS)   ] = 0x4129, /* L2_LD.ISTATE               */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x4f2A, /* L2_ST.MESI                 */
-               [ C(RESULT_MISS)   ] = 0x412A, /* L2_ST.ISTATE               */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(DTLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI  (alias) */
-               [ C(RESULT_MISS)   ] = 0x0208, /* DTLB_MISSES.MISS_LD        */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI  (alias) */
-               [ C(RESULT_MISS)   ] = 0x0808, /* DTLB_MISSES.MISS_ST        */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(ITLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P         */
-               [ C(RESULT_MISS)   ] = 0x1282, /* ITLBMISSES                 */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
- [ C(BPU ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ANY        */
-               [ C(RESULT_MISS)   ] = 0x00c5, /* BP_INST_RETIRED.MISPRED    */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
-};
-
-static const u64 atom_hw_cache_event_ids
-                               [PERF_COUNT_HW_CACHE_MAX]
-                               [PERF_COUNT_HW_CACHE_OP_MAX]
-                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
-{
- [ C(L1D) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x2140, /* L1D_CACHE.LD               */
-               [ C(RESULT_MISS)   ] = 0,
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x2240, /* L1D_CACHE.ST               */
-               [ C(RESULT_MISS)   ] = 0,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(L1I ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0380, /* L1I.READS                  */
-               [ C(RESULT_MISS)   ] = 0x0280, /* L1I.MISSES                 */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(LL  ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x4f29, /* L2_LD.MESI                 */
-               [ C(RESULT_MISS)   ] = 0x4129, /* L2_LD.ISTATE               */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x4f2A, /* L2_ST.MESI                 */
-               [ C(RESULT_MISS)   ] = 0x412A, /* L2_ST.ISTATE               */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(DTLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x2140, /* L1D_CACHE_LD.MESI  (alias) */
-               [ C(RESULT_MISS)   ] = 0x0508, /* DTLB_MISSES.MISS_LD        */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x2240, /* L1D_CACHE_ST.MESI  (alias) */
-               [ C(RESULT_MISS)   ] = 0x0608, /* DTLB_MISSES.MISS_ST        */
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(ITLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P         */
-               [ C(RESULT_MISS)   ] = 0x0282, /* ITLB.MISSES                */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
- [ C(BPU ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ANY        */
-               [ C(RESULT_MISS)   ] = 0x00c5, /* BP_INST_RETIRED.MISPRED    */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
-};
-
-static u64 intel_pmu_raw_event(u64 event)
-{
-#define CORE_EVNTSEL_EVENT_MASK                0x000000FFULL
-#define CORE_EVNTSEL_UNIT_MASK         0x0000FF00ULL
-#define CORE_EVNTSEL_EDGE_MASK         0x00040000ULL
-#define CORE_EVNTSEL_INV_MASK          0x00800000ULL
-#define CORE_EVNTSEL_COUNTER_MASK      0xFF000000ULL
-
-#define CORE_EVNTSEL_MASK              \
-       (CORE_EVNTSEL_EVENT_MASK |      \
-        CORE_EVNTSEL_UNIT_MASK  |      \
-        CORE_EVNTSEL_EDGE_MASK  |      \
-        CORE_EVNTSEL_INV_MASK  |       \
-        CORE_EVNTSEL_COUNTER_MASK)
-
-       return event & CORE_EVNTSEL_MASK;
-}
-
-static const u64 amd_hw_cache_event_ids
-                               [PERF_COUNT_HW_CACHE_MAX]
-                               [PERF_COUNT_HW_CACHE_OP_MAX]
-                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
-{
- [ C(L1D) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses        */
-               [ C(RESULT_MISS)   ] = 0x0041, /* Data Cache Misses          */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0142, /* Data Cache Refills :system */
-               [ C(RESULT_MISS)   ] = 0,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0267, /* Data Prefetcher :attempts  */
-               [ C(RESULT_MISS)   ] = 0x0167, /* Data Prefetcher :cancelled */
-       },
- },
- [ C(L1I ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0080, /* Instruction cache fetches  */
-               [ C(RESULT_MISS)   ] = 0x0081, /* Instruction cache misses   */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0x014B, /* Prefetch Instructions :Load */
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(LL  ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x037D, /* Requests to L2 Cache :IC+DC */
-               [ C(RESULT_MISS)   ] = 0x037E, /* L2 Cache Misses : IC+DC     */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0x017F, /* L2 Fill/Writeback           */
-               [ C(RESULT_MISS)   ] = 0,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(DTLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses        */
-               [ C(RESULT_MISS)   ] = 0x0046, /* L1 DTLB and L2 DLTB Miss   */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = 0,
-               [ C(RESULT_MISS)   ] = 0,
-       },
- },
- [ C(ITLB) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x0080, /* Instruction fecthes        */
-               [ C(RESULT_MISS)   ] = 0x0085, /* Instr. fetch ITLB misses   */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
- [ C(BPU ) ] = {
-       [ C(OP_READ) ] = {
-               [ C(RESULT_ACCESS) ] = 0x00c2, /* Retired Branch Instr.      */
-               [ C(RESULT_MISS)   ] = 0x00c3, /* Retired Mispredicted BI    */
-       },
-       [ C(OP_WRITE) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
-       [ C(OP_PREFETCH) ] = {
-               [ C(RESULT_ACCESS) ] = -1,
-               [ C(RESULT_MISS)   ] = -1,
-       },
- },
-};
-
-/*
- * AMD Performance Monitor K7 and later.
- */
-static const u64 amd_perfmon_event_map[] =
-{
-  [PERF_COUNT_HW_CPU_CYCLES]           = 0x0076,
-  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
-  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x0080,
-  [PERF_COUNT_HW_CACHE_MISSES]         = 0x0081,
-  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
-  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
-};
-
-static u64 amd_pmu_event_map(int event)
-{
-       return amd_perfmon_event_map[event];
-}
-
-static u64 amd_pmu_raw_event(u64 event)
-{
-#define K7_EVNTSEL_EVENT_MASK  0x7000000FFULL
-#define K7_EVNTSEL_UNIT_MASK   0x00000FF00ULL
-#define K7_EVNTSEL_EDGE_MASK   0x000040000ULL
-#define K7_EVNTSEL_INV_MASK    0x000800000ULL
-#define K7_EVNTSEL_COUNTER_MASK        0x0FF000000ULL
-
-#define K7_EVNTSEL_MASK                        \
-       (K7_EVNTSEL_EVENT_MASK |        \
-        K7_EVNTSEL_UNIT_MASK  |        \
-        K7_EVNTSEL_EDGE_MASK  |        \
-        K7_EVNTSEL_INV_MASK   |        \
-        K7_EVNTSEL_COUNTER_MASK)
-
-       return event & K7_EVNTSEL_MASK;
-}
-
-/*
- * Propagate counter elapsed time into the generic counter.
- * Can only be executed on the CPU where the counter is active.
- * Returns the delta events processed.
- */
-static u64
-x86_perf_counter_update(struct perf_counter *counter,
-                       struct hw_perf_counter *hwc, int idx)
-{
-       int shift = 64 - x86_pmu.counter_bits;
-       u64 prev_raw_count, new_raw_count;
-       s64 delta;
-
-       if (idx == X86_PMC_IDX_FIXED_BTS)
-               return 0;
-
-       /*
-        * Careful: an NMI might modify the previous counter value.
-        *
-        * Our tactic to handle this is to first atomically read and
-        * exchange a new raw count - then add that new-prev delta
-        * count to the generic counter atomically:
-        */
-again:
-       prev_raw_count = atomic64_read(&hwc->prev_count);
-       rdmsrl(hwc->counter_base + idx, new_raw_count);
-
-       if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
-                                       new_raw_count) != prev_raw_count)
-               goto again;
-
-       /*
-        * Now we have the new raw value and have updated the prev
-        * timestamp already. We can now calculate the elapsed delta
-        * (counter-)time and add that to the generic counter.
-        *
-        * Careful, not all hw sign-extends above the physical width
-        * of the count.
-        */
-       delta = (new_raw_count << shift) - (prev_raw_count << shift);
-       delta >>= shift;
-
-       atomic64_add(delta, &counter->count);
-       atomic64_sub(delta, &hwc->period_left);
-
-       return new_raw_count;
-}
-
-static atomic_t active_counters;
-static DEFINE_MUTEX(pmc_reserve_mutex);
-
-static bool reserve_pmc_hardware(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-       int i;
-
-       if (nmi_watchdog == NMI_LOCAL_APIC)
-               disable_lapic_nmi_watchdog();
-
-       for (i = 0; i < x86_pmu.num_counters; i++) {
-               if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
-                       goto perfctr_fail;
-       }
-
-       for (i = 0; i < x86_pmu.num_counters; i++) {
-               if (!reserve_evntsel_nmi(x86_pmu.eventsel + i))
-                       goto eventsel_fail;
-       }
-#endif
-
-       return true;
-
-#ifdef CONFIG_X86_LOCAL_APIC
-eventsel_fail:
-       for (i--; i >= 0; i--)
-               release_evntsel_nmi(x86_pmu.eventsel + i);
-
-       i = x86_pmu.num_counters;
-
-perfctr_fail:
-       for (i--; i >= 0; i--)
-               release_perfctr_nmi(x86_pmu.perfctr + i);
-
-       if (nmi_watchdog == NMI_LOCAL_APIC)
-               enable_lapic_nmi_watchdog();
-
-       return false;
-#endif
-}
-
-static void release_pmc_hardware(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-       int i;
-
-       for (i = 0; i < x86_pmu.num_counters; i++) {
-               release_perfctr_nmi(x86_pmu.perfctr + i);
-               release_evntsel_nmi(x86_pmu.eventsel + i);
-       }
-
-       if (nmi_watchdog == NMI_LOCAL_APIC)
-               enable_lapic_nmi_watchdog();
-#endif
-}
-
-static inline bool bts_available(void)
-{
-       return x86_pmu.enable_bts != NULL;
-}
-
-static inline void init_debug_store_on_cpu(int cpu)
-{
-       struct debug_store *ds = per_cpu(cpu_hw_counters, cpu).ds;
-
-       if (!ds)
-               return;
-
-       wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA,
-                    (u32)((u64)(unsigned long)ds),
-                    (u32)((u64)(unsigned long)ds >> 32));
-}
-
-static inline void fini_debug_store_on_cpu(int cpu)
-{
-       if (!per_cpu(cpu_hw_counters, cpu).ds)
-               return;
-
-       wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA, 0, 0);
-}
-
-static void release_bts_hardware(void)
-{
-       int cpu;
-
-       if (!bts_available())
-               return;
-
-       get_online_cpus();
-
-       for_each_online_cpu(cpu)
-               fini_debug_store_on_cpu(cpu);
-
-       for_each_possible_cpu(cpu) {
-               struct debug_store *ds = per_cpu(cpu_hw_counters, cpu).ds;
-
-               if (!ds)
-                       continue;
-
-               per_cpu(cpu_hw_counters, cpu).ds = NULL;
-
-               kfree((void *)(unsigned long)ds->bts_buffer_base);
-               kfree(ds);
-       }
-
-       put_online_cpus();
-}
-
-static int reserve_bts_hardware(void)
-{
-       int cpu, err = 0;
-
-       if (!bts_available())
-               return 0;
-
-       get_online_cpus();
-
-       for_each_possible_cpu(cpu) {
-               struct debug_store *ds;
-               void *buffer;
-
-               err = -ENOMEM;
-               buffer = kzalloc(BTS_BUFFER_SIZE, GFP_KERNEL);
-               if (unlikely(!buffer))
-                       break;
-
-               ds = kzalloc(sizeof(*ds), GFP_KERNEL);
-               if (unlikely(!ds)) {
-                       kfree(buffer);
-                       break;
-               }
-
-               ds->bts_buffer_base = (u64)(unsigned long)buffer;
-               ds->bts_index = ds->bts_buffer_base;
-               ds->bts_absolute_maximum =
-                       ds->bts_buffer_base + BTS_BUFFER_SIZE;
-               ds->bts_interrupt_threshold =
-                       ds->bts_absolute_maximum - BTS_OVFL_TH;
-
-               per_cpu(cpu_hw_counters, cpu).ds = ds;
-               err = 0;
-       }
-
-       if (err)
-               release_bts_hardware();
-       else {
-               for_each_online_cpu(cpu)
-                       init_debug_store_on_cpu(cpu);
-       }
-
-       put_online_cpus();
-
-       return err;
-}
-
-static void hw_perf_counter_destroy(struct perf_counter *counter)
-{
-       if (atomic_dec_and_mutex_lock(&active_counters, &pmc_reserve_mutex)) {
-               release_pmc_hardware();
-               release_bts_hardware();
-               mutex_unlock(&pmc_reserve_mutex);
-       }
-}
-
-static inline int x86_pmu_initialized(void)
-{
-       return x86_pmu.handle_irq != NULL;
-}
-
-static inline int
-set_ext_hw_attr(struct hw_perf_counter *hwc, struct perf_counter_attr *attr)
-{
-       unsigned int cache_type, cache_op, cache_result;
-       u64 config, val;
-
-       config = attr->config;
-
-       cache_type = (config >>  0) & 0xff;
-       if (cache_type >= PERF_COUNT_HW_CACHE_MAX)
-               return -EINVAL;
-
-       cache_op = (config >>  8) & 0xff;
-       if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)
-               return -EINVAL;
-
-       cache_result = (config >> 16) & 0xff;
-       if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
-               return -EINVAL;
-
-       val = hw_cache_event_ids[cache_type][cache_op][cache_result];
-
-       if (val == 0)
-               return -ENOENT;
-
-       if (val == -1)
-               return -EINVAL;
-
-       hwc->config |= val;
-
-       return 0;
-}
-
-static void intel_pmu_enable_bts(u64 config)
-{
-       unsigned long debugctlmsr;
-
-       debugctlmsr = get_debugctlmsr();
-
-       debugctlmsr |= X86_DEBUGCTL_TR;
-       debugctlmsr |= X86_DEBUGCTL_BTS;
-       debugctlmsr |= X86_DEBUGCTL_BTINT;
-
-       if (!(config & ARCH_PERFMON_EVENTSEL_OS))
-               debugctlmsr |= X86_DEBUGCTL_BTS_OFF_OS;
-
-       if (!(config & ARCH_PERFMON_EVENTSEL_USR))
-               debugctlmsr |= X86_DEBUGCTL_BTS_OFF_USR;
-
-       update_debugctlmsr(debugctlmsr);
-}
-
-static void intel_pmu_disable_bts(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       unsigned long debugctlmsr;
-
-       if (!cpuc->ds)
-               return;
-
-       debugctlmsr = get_debugctlmsr();
-
-       debugctlmsr &=
-               ~(X86_DEBUGCTL_TR | X86_DEBUGCTL_BTS | X86_DEBUGCTL_BTINT |
-                 X86_DEBUGCTL_BTS_OFF_OS | X86_DEBUGCTL_BTS_OFF_USR);
-
-       update_debugctlmsr(debugctlmsr);
-}
-
-/*
- * Setup the hardware configuration for a given attr_type
- */
-static int __hw_perf_counter_init(struct perf_counter *counter)
-{
-       struct perf_counter_attr *attr = &counter->attr;
-       struct hw_perf_counter *hwc = &counter->hw;
-       u64 config;
-       int err;
-
-       if (!x86_pmu_initialized())
-               return -ENODEV;
-
-       err = 0;
-       if (!atomic_inc_not_zero(&active_counters)) {
-               mutex_lock(&pmc_reserve_mutex);
-               if (atomic_read(&active_counters) == 0) {
-                       if (!reserve_pmc_hardware())
-                               err = -EBUSY;
-                       else
-                               err = reserve_bts_hardware();
-               }
-               if (!err)
-                       atomic_inc(&active_counters);
-               mutex_unlock(&pmc_reserve_mutex);
-       }
-       if (err)
-               return err;
-
-       /*
-        * Generate PMC IRQs:
-        * (keep 'enabled' bit clear for now)
-        */
-       hwc->config = ARCH_PERFMON_EVENTSEL_INT;
-
-       /*
-        * Count user and OS events unless requested not to.
-        */
-       if (!attr->exclude_user)
-               hwc->config |= ARCH_PERFMON_EVENTSEL_USR;
-       if (!attr->exclude_kernel)
-               hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
-
-       if (!hwc->sample_period) {
-               hwc->sample_period = x86_pmu.max_period;
-               hwc->last_period = hwc->sample_period;
-               atomic64_set(&hwc->period_left, hwc->sample_period);
-       } else {
-               /*
-                * If we have a PMU initialized but no APIC
-                * interrupts, we cannot sample hardware
-                * counters (user-space has to fall back and
-                * sample via a hrtimer based software counter):
-                */
-               if (!x86_pmu.apic)
-                       return -EOPNOTSUPP;
-       }
-
-       counter->destroy = hw_perf_counter_destroy;
-
-       /*
-        * Raw event type provide the config in the event structure
-        */
-       if (attr->type == PERF_TYPE_RAW) {
-               hwc->config |= x86_pmu.raw_event(attr->config);
-               return 0;
-       }
-
-       if (attr->type == PERF_TYPE_HW_CACHE)
-               return set_ext_hw_attr(hwc, attr);
-
-       if (attr->config >= x86_pmu.max_events)
-               return -EINVAL;
-
-       /*
-        * The generic map:
-        */
-       config = x86_pmu.event_map(attr->config);
-
-       if (config == 0)
-               return -ENOENT;
-
-       if (config == -1LL)
-               return -EINVAL;
-
-       /*
-        * Branch tracing:
-        */
-       if ((attr->config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS) &&
-           (hwc->sample_period == 1)) {
-               /* BTS is not supported by this architecture. */
-               if (!bts_available())
-                       return -EOPNOTSUPP;
-
-               /* BTS is currently only allowed for user-mode. */
-               if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
-                       return -EOPNOTSUPP;
-       }
-
-       hwc->config |= config;
-
-       return 0;
-}
-
-static void p6_pmu_disable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       u64 val;
-
-       if (!cpuc->enabled)
-               return;
-
-       cpuc->enabled = 0;
-       barrier();
-
-       /* p6 only has one enable register */
-       rdmsrl(MSR_P6_EVNTSEL0, val);
-       val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
-       wrmsrl(MSR_P6_EVNTSEL0, val);
-}
-
-static void intel_pmu_disable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       if (!cpuc->enabled)
-               return;
-
-       cpuc->enabled = 0;
-       barrier();
-
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
-
-       if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask))
-               intel_pmu_disable_bts();
-}
-
-static void amd_pmu_disable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       int idx;
-
-       if (!cpuc->enabled)
-               return;
-
-       cpuc->enabled = 0;
-       /*
-        * ensure we write the disable before we start disabling the
-        * counters proper, so that amd_pmu_enable_counter() does the
-        * right thing.
-        */
-       barrier();
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               u64 val;
-
-               if (!test_bit(idx, cpuc->active_mask))
-                       continue;
-               rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
-               if (!(val & ARCH_PERFMON_EVENTSEL0_ENABLE))
-                       continue;
-               val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
-               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
-       }
-}
-
-void hw_perf_disable(void)
-{
-       if (!x86_pmu_initialized())
-               return;
-       return x86_pmu.disable_all();
-}
-
-static void p6_pmu_enable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       unsigned long val;
-
-       if (cpuc->enabled)
-               return;
-
-       cpuc->enabled = 1;
-       barrier();
-
-       /* p6 only has one enable register */
-       rdmsrl(MSR_P6_EVNTSEL0, val);
-       val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
-       wrmsrl(MSR_P6_EVNTSEL0, val);
-}
-
-static void intel_pmu_enable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       if (cpuc->enabled)
-               return;
-
-       cpuc->enabled = 1;
-       barrier();
-
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, x86_pmu.intel_ctrl);
-
-       if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask)) {
-               struct perf_counter *counter =
-                       cpuc->counters[X86_PMC_IDX_FIXED_BTS];
-
-               if (WARN_ON_ONCE(!counter))
-                       return;
-
-               intel_pmu_enable_bts(counter->hw.config);
-       }
-}
-
-static void amd_pmu_enable_all(void)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       int idx;
-
-       if (cpuc->enabled)
-               return;
-
-       cpuc->enabled = 1;
-       barrier();
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               struct perf_counter *counter = cpuc->counters[idx];
-               u64 val;
-
-               if (!test_bit(idx, cpuc->active_mask))
-                       continue;
-
-               val = counter->hw.config;
-               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
-               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
-       }
-}
-
-void hw_perf_enable(void)
-{
-       if (!x86_pmu_initialized())
-               return;
-       x86_pmu.enable_all();
-}
-
-static inline u64 intel_pmu_get_status(void)
-{
-       u64 status;
-
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
-
-       return status;
-}
-
-static inline void intel_pmu_ack_status(u64 ack)
-{
-       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
-}
-
-static inline void x86_pmu_enable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       (void)checking_wrmsrl(hwc->config_base + idx,
-                             hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE);
-}
-
-static inline void x86_pmu_disable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       (void)checking_wrmsrl(hwc->config_base + idx, hwc->config);
-}
-
-static inline void
-intel_pmu_disable_fixed(struct hw_perf_counter *hwc, int __idx)
-{
-       int idx = __idx - X86_PMC_IDX_FIXED;
-       u64 ctrl_val, mask;
-
-       mask = 0xfULL << (idx * 4);
-
-       rdmsrl(hwc->config_base, ctrl_val);
-       ctrl_val &= ~mask;
-       (void)checking_wrmsrl(hwc->config_base, ctrl_val);
-}
-
-static inline void
-p6_pmu_disable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       u64 val = P6_NOP_COUNTER;
-
-       if (cpuc->enabled)
-               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
-
-       (void)checking_wrmsrl(hwc->config_base + idx, val);
-}
-
-static inline void
-intel_pmu_disable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
-               intel_pmu_disable_bts();
-               return;
-       }
-
-       if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
-               intel_pmu_disable_fixed(hwc, idx);
-               return;
-       }
-
-       x86_pmu_disable_counter(hwc, idx);
-}
-
-static inline void
-amd_pmu_disable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       x86_pmu_disable_counter(hwc, idx);
-}
-
-static DEFINE_PER_CPU(u64 [X86_PMC_IDX_MAX], pmc_prev_left);
-
-/*
- * Set the next IRQ period, based on the hwc->period_left value.
- * To be called with the counter disabled in hw:
- */
-static int
-x86_perf_counter_set_period(struct perf_counter *counter,
-                            struct hw_perf_counter *hwc, int idx)
-{
-       s64 left = atomic64_read(&hwc->period_left);
-       s64 period = hwc->sample_period;
-       int err, ret = 0;
-
-       if (idx == X86_PMC_IDX_FIXED_BTS)
-               return 0;
-
-       /*
-        * If we are way outside a reasoable range then just skip forward:
-        */
-       if (unlikely(left <= -period)) {
-               left = period;
-               atomic64_set(&hwc->period_left, left);
-               hwc->last_period = period;
-               ret = 1;
-       }
-
-       if (unlikely(left <= 0)) {
-               left += period;
-               atomic64_set(&hwc->period_left, left);
-               hwc->last_period = period;
-               ret = 1;
-       }
-       /*
-        * Quirk: certain CPUs dont like it if just 1 event is left:
-        */
-       if (unlikely(left < 2))
-               left = 2;
-
-       if (left > x86_pmu.max_period)
-               left = x86_pmu.max_period;
-
-       per_cpu(pmc_prev_left[idx], smp_processor_id()) = left;
-
-       /*
-        * The hw counter starts counting from this counter offset,
-        * mark it to be able to extra future deltas:
-        */
-       atomic64_set(&hwc->prev_count, (u64)-left);
-
-       err = checking_wrmsrl(hwc->counter_base + idx,
-                            (u64)(-left) & x86_pmu.counter_mask);
-
-       perf_counter_update_userpage(counter);
-
-       return ret;
-}
-
-static inline void
-intel_pmu_enable_fixed(struct hw_perf_counter *hwc, int __idx)
-{
-       int idx = __idx - X86_PMC_IDX_FIXED;
-       u64 ctrl_val, bits, mask;
-       int err;
-
-       /*
-        * Enable IRQ generation (0x8),
-        * and enable ring-3 counting (0x2) and ring-0 counting (0x1)
-        * if requested:
-        */
-       bits = 0x8ULL;
-       if (hwc->config & ARCH_PERFMON_EVENTSEL_USR)
-               bits |= 0x2;
-       if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
-               bits |= 0x1;
-       bits <<= (idx * 4);
-       mask = 0xfULL << (idx * 4);
-
-       rdmsrl(hwc->config_base, ctrl_val);
-       ctrl_val &= ~mask;
-       ctrl_val |= bits;
-       err = checking_wrmsrl(hwc->config_base, ctrl_val);
-}
-
-static void p6_pmu_enable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       u64 val;
-
-       val = hwc->config;
-       if (cpuc->enabled)
-               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
-
-       (void)checking_wrmsrl(hwc->config_base + idx, val);
-}
-
-
-static void intel_pmu_enable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
-               if (!__get_cpu_var(cpu_hw_counters).enabled)
-                       return;
-
-               intel_pmu_enable_bts(hwc->config);
-               return;
-       }
-
-       if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
-               intel_pmu_enable_fixed(hwc, idx);
-               return;
-       }
-
-       x86_pmu_enable_counter(hwc, idx);
-}
-
-static void amd_pmu_enable_counter(struct hw_perf_counter *hwc, int idx)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       if (cpuc->enabled)
-               x86_pmu_enable_counter(hwc, idx);
-}
-
-static int
-fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)
-{
-       unsigned int event;
-
-       event = hwc->config & ARCH_PERFMON_EVENT_MASK;
-
-       if (unlikely((event ==
-                     x86_pmu.event_map(PERF_COUNT_HW_BRANCH_INSTRUCTIONS)) &&
-                    (hwc->sample_period == 1)))
-               return X86_PMC_IDX_FIXED_BTS;
-
-       if (!x86_pmu.num_counters_fixed)
-               return -1;
-
-       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_HW_INSTRUCTIONS)))
-               return X86_PMC_IDX_FIXED_INSTRUCTIONS;
-       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_HW_CPU_CYCLES)))
-               return X86_PMC_IDX_FIXED_CPU_CYCLES;
-       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_HW_BUS_CYCLES)))
-               return X86_PMC_IDX_FIXED_BUS_CYCLES;
-
-       return -1;
-}
-
-/*
- * Find a PMC slot for the freshly enabled / scheduled in counter:
- */
-static int x86_pmu_enable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       struct hw_perf_counter *hwc = &counter->hw;
-       int idx;
-
-       idx = fixed_mode_idx(counter, hwc);
-       if (idx == X86_PMC_IDX_FIXED_BTS) {
-               /* BTS is already occupied. */
-               if (test_and_set_bit(idx, cpuc->used_mask))
-                       return -EAGAIN;
-
-               hwc->config_base        = 0;
-               hwc->counter_base       = 0;
-               hwc->idx                = idx;
-       } else if (idx >= 0) {
-               /*
-                * Try to get the fixed counter, if that is already taken
-                * then try to get a generic counter:
-                */
-               if (test_and_set_bit(idx, cpuc->used_mask))
-                       goto try_generic;
-
-               hwc->config_base = MSR_ARCH_PERFMON_FIXED_CTR_CTRL;
-               /*
-                * We set it so that counter_base + idx in wrmsr/rdmsr maps to
-                * MSR_ARCH_PERFMON_FIXED_CTR0 ... CTR2:
-                */
-               hwc->counter_base =
-                       MSR_ARCH_PERFMON_FIXED_CTR0 - X86_PMC_IDX_FIXED;
-               hwc->idx = idx;
-       } else {
-               idx = hwc->idx;
-               /* Try to get the previous generic counter again */
-               if (test_and_set_bit(idx, cpuc->used_mask)) {
-try_generic:
-                       idx = find_first_zero_bit(cpuc->used_mask,
-                                                 x86_pmu.num_counters);
-                       if (idx == x86_pmu.num_counters)
-                               return -EAGAIN;
-
-                       set_bit(idx, cpuc->used_mask);
-                       hwc->idx = idx;
-               }
-               hwc->config_base  = x86_pmu.eventsel;
-               hwc->counter_base = x86_pmu.perfctr;
-       }
-
-       perf_counters_lapic_init();
-
-       x86_pmu.disable(hwc, idx);
-
-       cpuc->counters[idx] = counter;
-       set_bit(idx, cpuc->active_mask);
-
-       x86_perf_counter_set_period(counter, hwc, idx);
-       x86_pmu.enable(hwc, idx);
-
-       perf_counter_update_userpage(counter);
-
-       return 0;
-}
-
-static void x86_pmu_unthrottle(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       struct hw_perf_counter *hwc = &counter->hw;
-
-       if (WARN_ON_ONCE(hwc->idx >= X86_PMC_IDX_MAX ||
-                               cpuc->counters[hwc->idx] != counter))
-               return;
-
-       x86_pmu.enable(hwc, hwc->idx);
-}
-
-void perf_counter_print_debug(void)
-{
-       u64 ctrl, status, overflow, pmc_ctrl, pmc_count, prev_left, fixed;
-       struct cpu_hw_counters *cpuc;
-       unsigned long flags;
-       int cpu, idx;
-
-       if (!x86_pmu.num_counters)
-               return;
-
-       local_irq_save(flags);
-
-       cpu = smp_processor_id();
-       cpuc = &per_cpu(cpu_hw_counters, cpu);
-
-       if (x86_pmu.version >= 2) {
-               rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
-               rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
-               rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
-               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
-
-               pr_info("\n");
-               pr_info("CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
-               pr_info("CPU#%d: status:     %016llx\n", cpu, status);
-               pr_info("CPU#%d: overflow:   %016llx\n", cpu, overflow);
-               pr_info("CPU#%d: fixed:      %016llx\n", cpu, fixed);
-       }
-       pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used_mask);
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);
-               rdmsrl(x86_pmu.perfctr  + idx, pmc_count);
-
-               prev_left = per_cpu(pmc_prev_left[idx], cpu);
-
-               pr_info("CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
-                       cpu, idx, pmc_ctrl);
-               pr_info("CPU#%d:   gen-PMC%d count: %016llx\n",
-                       cpu, idx, pmc_count);
-               pr_info("CPU#%d:   gen-PMC%d left:  %016llx\n",
-                       cpu, idx, prev_left);
-       }
-       for (idx = 0; idx < x86_pmu.num_counters_fixed; idx++) {
-               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count);
-
-               pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
-                       cpu, idx, pmc_count);
-       }
-       local_irq_restore(flags);
-}
-
-static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
-                                      struct perf_sample_data *data)
-{
-       struct debug_store *ds = cpuc->ds;
-       struct bts_record {
-               u64     from;
-               u64     to;
-               u64     flags;
-       };
-       struct perf_counter *counter = cpuc->counters[X86_PMC_IDX_FIXED_BTS];
-       unsigned long orig_ip = data->regs->ip;
-       struct bts_record *at, *top;
-
-       if (!counter)
-               return;
-
-       if (!ds)
-               return;
-
-       at  = (struct bts_record *)(unsigned long)ds->bts_buffer_base;
-       top = (struct bts_record *)(unsigned long)ds->bts_index;
-
-       ds->bts_index = ds->bts_buffer_base;
-
-       for (; at < top; at++) {
-               data->regs->ip  = at->from;
-               data->addr      = at->to;
-
-               perf_counter_output(counter, 1, data);
-       }
-
-       data->regs->ip  = orig_ip;
-       data->addr      = 0;
-
-       /* There's new data available. */
-       counter->pending_kill = POLL_IN;
-}
-
-static void x86_pmu_disable(struct perf_counter *counter)
-{
-       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
-       struct hw_perf_counter *hwc = &counter->hw;
-       int idx = hwc->idx;
-
-       /*
-        * Must be done before we disable, otherwise the nmi handler
-        * could reenable again:
-        */
-       clear_bit(idx, cpuc->active_mask);
-       x86_pmu.disable(hwc, idx);
-
-       /*
-        * Make sure the cleared pointer becomes visible before we
-        * (potentially) free the counter:
-        */
-       barrier();
-
-       /*
-        * Drain the remaining delta count out of a counter
-        * that we are disabling:
-        */
-       x86_perf_counter_update(counter, hwc, idx);
-
-       /* Drain the remaining BTS records. */
-       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
-               struct perf_sample_data data;
-               struct pt_regs regs;
-
-               data.regs = &regs;
-               intel_pmu_drain_bts_buffer(cpuc, &data);
-       }
-       cpuc->counters[idx] = NULL;
-       clear_bit(idx, cpuc->used_mask);
-
-       perf_counter_update_userpage(counter);
-}
-
-/*
- * Save and restart an expired counter. Called by NMI contexts,
- * so it has to be careful about preempting normal counter ops:
- */
-static int intel_pmu_save_and_restart(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       int idx = hwc->idx;
-       int ret;
-
-       x86_perf_counter_update(counter, hwc, idx);
-       ret = x86_perf_counter_set_period(counter, hwc, idx);
-
-       if (counter->state == PERF_COUNTER_STATE_ACTIVE)
-               intel_pmu_enable_counter(hwc, idx);
-
-       return ret;
-}
-
-static void intel_pmu_reset(void)
-{
-       struct debug_store *ds = __get_cpu_var(cpu_hw_counters).ds;
-       unsigned long flags;
-       int idx;
-
-       if (!x86_pmu.num_counters)
-               return;
-
-       local_irq_save(flags);
-
-       printk("clearing PMU state on CPU#%d\n", smp_processor_id());
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               checking_wrmsrl(x86_pmu.eventsel + idx, 0ull);
-               checking_wrmsrl(x86_pmu.perfctr  + idx, 0ull);
-       }
-       for (idx = 0; idx < x86_pmu.num_counters_fixed; idx++) {
-               checking_wrmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull);
-       }
-       if (ds)
-               ds->bts_index = ds->bts_buffer_base;
-
-       local_irq_restore(flags);
-}
-
-static int p6_pmu_handle_irq(struct pt_regs *regs)
-{
-       struct perf_sample_data data;
-       struct cpu_hw_counters *cpuc;
-       struct perf_counter *counter;
-       struct hw_perf_counter *hwc;
-       int idx, handled = 0;
-       u64 val;
-
-       data.regs = regs;
-       data.addr = 0;
-
-       cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               if (!test_bit(idx, cpuc->active_mask))
-                       continue;
-
-               counter = cpuc->counters[idx];
-               hwc = &counter->hw;
-
-               val = x86_perf_counter_update(counter, hwc, idx);
-               if (val & (1ULL << (x86_pmu.counter_bits - 1)))
-                       continue;
-
-               /*
-                * counter overflow
-                */
-               handled         = 1;
-               data.period     = counter->hw.last_period;
-
-               if (!x86_perf_counter_set_period(counter, hwc, idx))
-                       continue;
-
-               if (perf_counter_overflow(counter, 1, &data))
-                       p6_pmu_disable_counter(hwc, idx);
-       }
-
-       if (handled)
-               inc_irq_stat(apic_perf_irqs);
-
-       return handled;
-}
-
-/*
- * This handler is triggered by the local APIC, so the APIC IRQ handling
- * rules apply:
- */
-static int intel_pmu_handle_irq(struct pt_regs *regs)
-{
-       struct perf_sample_data data;
-       struct cpu_hw_counters *cpuc;
-       int bit, loops;
-       u64 ack, status;
-
-       data.regs = regs;
-       data.addr = 0;
-
-       cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       perf_disable();
-       intel_pmu_drain_bts_buffer(cpuc, &data);
-       status = intel_pmu_get_status();
-       if (!status) {
-               perf_enable();
-               return 0;
-       }
-
-       loops = 0;
-again:
-       if (++loops > 100) {
-               WARN_ONCE(1, "perfcounters: irq loop stuck!\n");
-               perf_counter_print_debug();
-               intel_pmu_reset();
-               perf_enable();
-               return 1;
-       }
-
-       inc_irq_stat(apic_perf_irqs);
-       ack = status;
-       for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
-               struct perf_counter *counter = cpuc->counters[bit];
-
-               clear_bit(bit, (unsigned long *) &status);
-               if (!test_bit(bit, cpuc->active_mask))
-                       continue;
-
-               if (!intel_pmu_save_and_restart(counter))
-                       continue;
-
-               data.period = counter->hw.last_period;
-
-               if (perf_counter_overflow(counter, 1, &data))
-                       intel_pmu_disable_counter(&counter->hw, bit);
-       }
-
-       intel_pmu_ack_status(ack);
-
-       /*
-        * Repeat if there is more work to be done:
-        */
-       status = intel_pmu_get_status();
-       if (status)
-               goto again;
-
-       perf_enable();
-
-       return 1;
-}
-
-static int amd_pmu_handle_irq(struct pt_regs *regs)
-{
-       struct perf_sample_data data;
-       struct cpu_hw_counters *cpuc;
-       struct perf_counter *counter;
-       struct hw_perf_counter *hwc;
-       int idx, handled = 0;
-       u64 val;
-
-       data.regs = regs;
-       data.addr = 0;
-
-       cpuc = &__get_cpu_var(cpu_hw_counters);
-
-       for (idx = 0; idx < x86_pmu.num_counters; idx++) {
-               if (!test_bit(idx, cpuc->active_mask))
-                       continue;
-
-               counter = cpuc->counters[idx];
-               hwc = &counter->hw;
-
-               val = x86_perf_counter_update(counter, hwc, idx);
-               if (val & (1ULL << (x86_pmu.counter_bits - 1)))
-                       continue;
-
-               /*
-                * counter overflow
-                */
-               handled         = 1;
-               data.period     = counter->hw.last_period;
-
-               if (!x86_perf_counter_set_period(counter, hwc, idx))
-                       continue;
-
-               if (perf_counter_overflow(counter, 1, &data))
-                       amd_pmu_disable_counter(hwc, idx);
-       }
-
-       if (handled)
-               inc_irq_stat(apic_perf_irqs);
-
-       return handled;
-}
-
-void smp_perf_pending_interrupt(struct pt_regs *regs)
-{
-       irq_enter();
-       ack_APIC_irq();
-       inc_irq_stat(apic_pending_irqs);
-       perf_counter_do_pending();
-       irq_exit();
-}
-
-void set_perf_counter_pending(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-       apic->send_IPI_self(LOCAL_PENDING_VECTOR);
-#endif
-}
-
-void perf_counters_lapic_init(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-       if (!x86_pmu.apic || !x86_pmu_initialized())
-               return;
-
-       /*
-        * Always use NMI for PMU
-        */
-       apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
-}
-
-static int __kprobes
-perf_counter_nmi_handler(struct notifier_block *self,
-                        unsigned long cmd, void *__args)
-{
-       struct die_args *args = __args;
-       struct pt_regs *regs;
-
-       if (!atomic_read(&active_counters))
-               return NOTIFY_DONE;
-
-       switch (cmd) {
-       case DIE_NMI:
-       case DIE_NMI_IPI:
-               break;
-
-       default:
-               return NOTIFY_DONE;
-       }
-
-       regs = args->regs;
-
-#ifdef CONFIG_X86_LOCAL_APIC
-       apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
-       /*
-        * Can't rely on the handled return value to say it was our NMI, two
-        * counters could trigger 'simultaneously' raising two back-to-back NMIs.
-        *
-        * If the first NMI handles both, the latter will be empty and daze
-        * the CPU.
-        */
-       x86_pmu.handle_irq(regs);
-
-       return NOTIFY_STOP;
-}
-
-static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
-       .notifier_call          = perf_counter_nmi_handler,
-       .next                   = NULL,
-       .priority               = 1
-};
-
-static struct x86_pmu p6_pmu = {
-       .name                   = "p6",
-       .handle_irq             = p6_pmu_handle_irq,
-       .disable_all            = p6_pmu_disable_all,
-       .enable_all             = p6_pmu_enable_all,
-       .enable                 = p6_pmu_enable_counter,
-       .disable                = p6_pmu_disable_counter,
-       .eventsel               = MSR_P6_EVNTSEL0,
-       .perfctr                = MSR_P6_PERFCTR0,
-       .event_map              = p6_pmu_event_map,
-       .raw_event              = p6_pmu_raw_event,
-       .max_events             = ARRAY_SIZE(p6_perfmon_event_map),
-       .apic                   = 1,
-       .max_period             = (1ULL << 31) - 1,
-       .version                = 0,
-       .num_counters           = 2,
-       /*
-        * Counters have 40 bits implemented. However they are designed such
-        * that bits [32-39] are sign extensions of bit 31. As such the
-        * effective width of a counter for P6-like PMU is 32 bits only.
-        *
-        * See IA-32 Intel Architecture Software developer manual Vol 3B
-        */
-       .counter_bits           = 32,
-       .counter_mask           = (1ULL << 32) - 1,
-};
-
-static struct x86_pmu intel_pmu = {
-       .name                   = "Intel",
-       .handle_irq             = intel_pmu_handle_irq,
-       .disable_all            = intel_pmu_disable_all,
-       .enable_all             = intel_pmu_enable_all,
-       .enable                 = intel_pmu_enable_counter,
-       .disable                = intel_pmu_disable_counter,
-       .eventsel               = MSR_ARCH_PERFMON_EVENTSEL0,
-       .perfctr                = MSR_ARCH_PERFMON_PERFCTR0,
-       .event_map              = intel_pmu_event_map,
-       .raw_event              = intel_pmu_raw_event,
-       .max_events             = ARRAY_SIZE(intel_perfmon_event_map),
-       .apic                   = 1,
-       /*
-        * Intel PMCs cannot be accessed sanely above 32 bit width,
-        * so we install an artificial 1<<31 period regardless of
-        * the generic counter period:
-        */
-       .max_period             = (1ULL << 31) - 1,
-       .enable_bts             = intel_pmu_enable_bts,
-       .disable_bts            = intel_pmu_disable_bts,
-};
-
-static struct x86_pmu amd_pmu = {
-       .name                   = "AMD",
-       .handle_irq             = amd_pmu_handle_irq,
-       .disable_all            = amd_pmu_disable_all,
-       .enable_all             = amd_pmu_enable_all,
-       .enable                 = amd_pmu_enable_counter,
-       .disable                = amd_pmu_disable_counter,
-       .eventsel               = MSR_K7_EVNTSEL0,
-       .perfctr                = MSR_K7_PERFCTR0,
-       .event_map              = amd_pmu_event_map,
-       .raw_event              = amd_pmu_raw_event,
-       .max_events             = ARRAY_SIZE(amd_perfmon_event_map),
-       .num_counters           = 4,
-       .counter_bits           = 48,
-       .counter_mask           = (1ULL << 48) - 1,
-       .apic                   = 1,
-       /* use highest bit to detect overflow */
-       .max_period             = (1ULL << 47) - 1,
-};
-
-static int p6_pmu_init(void)
-{
-       switch (boot_cpu_data.x86_model) {
-       case 1:
-       case 3:  /* Pentium Pro */
-       case 5:
-       case 6:  /* Pentium II */
-       case 7:
-       case 8:
-       case 11: /* Pentium III */
-               break;
-       case 9:
-       case 13:
-               /* Pentium M */
-               break;
-       default:
-               pr_cont("unsupported p6 CPU model %d ",
-                       boot_cpu_data.x86_model);
-               return -ENODEV;
-       }
-
-       x86_pmu = p6_pmu;
-
-       if (!cpu_has_apic) {
-               pr_info("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n");
-               pr_info("no hardware sampling interrupt available.\n");
-               x86_pmu.apic = 0;
-       }
-
-       return 0;
-}
-
-static int intel_pmu_init(void)
-{
-       union cpuid10_edx edx;
-       union cpuid10_eax eax;
-       unsigned int unused;
-       unsigned int ebx;
-       int version;
-
-       if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {
-               /* check for P6 processor family */
-          if (boot_cpu_data.x86 == 6) {
-               return p6_pmu_init();
-          } else {
-               return -ENODEV;
-          }
-       }
-
-       /*
-        * Check whether the Architectural PerfMon supports
-        * Branch Misses Retired Event or not.
-        */
-       cpuid(10, &eax.full, &ebx, &unused, &edx.full);
-       if (eax.split.mask_length <= ARCH_PERFMON_BRANCH_MISSES_RETIRED)
-               return -ENODEV;
-
-       version = eax.split.version_id;
-       if (version < 2)
-               return -ENODEV;
-
-       x86_pmu                         = intel_pmu;
-       x86_pmu.version                 = version;
-       x86_pmu.num_counters            = eax.split.num_counters;
-       x86_pmu.counter_bits            = eax.split.bit_width;
-       x86_pmu.counter_mask            = (1ULL << eax.split.bit_width) - 1;
-
-       /*
-        * Quirk: v2 perfmon does not report fixed-purpose counters, so
-        * assume at least 3 counters:
-        */
-       x86_pmu.num_counters_fixed      = max((int)edx.split.num_counters_fixed, 3);
-
-       /*
-        * Install the hw-cache-events table:
-        */
-       switch (boot_cpu_data.x86_model) {
-       case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */
-       case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */
-       case 23: /* current 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */
-       case 29: /* six-core 45 nm xeon "Dunnington" */
-               memcpy(hw_cache_event_ids, core2_hw_cache_event_ids,
-                      sizeof(hw_cache_event_ids));
-
-               pr_cont("Core2 events, ");
-               break;
-       default:
-       case 26:
-               memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
-                      sizeof(hw_cache_event_ids));
-
-               pr_cont("Nehalem/Corei7 events, ");
-               break;
-       case 28:
-               memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,
-                      sizeof(hw_cache_event_ids));
-
-               pr_cont("Atom events, ");
-               break;
-       }
-       return 0;
-}
-
-static int amd_pmu_init(void)
-{
-       /* Performance-monitoring supported from K7 and later: */
-       if (boot_cpu_data.x86 < 6)
-               return -ENODEV;
-
-       x86_pmu = amd_pmu;
-
-       /* Events are common for all AMDs */
-       memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
-              sizeof(hw_cache_event_ids));
-
-       return 0;
-}
-
-void __init init_hw_perf_counters(void)
-{
-       int err;
-
-       pr_info("Performance Counters: ");
-
-       switch (boot_cpu_data.x86_vendor) {
-       case X86_VENDOR_INTEL:
-               err = intel_pmu_init();
-               break;
-       case X86_VENDOR_AMD:
-               err = amd_pmu_init();
-               break;
-       default:
-               return;
-       }
-       if (err != 0) {
-               pr_cont("no PMU driver, software counters only.\n");
-               return;
-       }
-
-       pr_cont("%s PMU driver.\n", x86_pmu.name);
-
-       if (x86_pmu.num_counters > X86_PMC_MAX_GENERIC) {
-               WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
-                    x86_pmu.num_counters, X86_PMC_MAX_GENERIC);
-               x86_pmu.num_counters = X86_PMC_MAX_GENERIC;
-       }
-       perf_counter_mask = (1 << x86_pmu.num_counters) - 1;
-       perf_max_counters = x86_pmu.num_counters;
-
-       if (x86_pmu.num_counters_fixed > X86_PMC_MAX_FIXED) {
-               WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",
-                    x86_pmu.num_counters_fixed, X86_PMC_MAX_FIXED);
-               x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;
-       }
-
-       perf_counter_mask |=
-               ((1LL << x86_pmu.num_counters_fixed)-1) << X86_PMC_IDX_FIXED;
-       x86_pmu.intel_ctrl = perf_counter_mask;
-
-       perf_counters_lapic_init();
-       register_die_notifier(&perf_counter_nmi_notifier);
-
-       pr_info("... version:                 %d\n",     x86_pmu.version);
-       pr_info("... bit width:               %d\n",     x86_pmu.counter_bits);
-       pr_info("... generic counters:        %d\n",     x86_pmu.num_counters);
-       pr_info("... value mask:              %016Lx\n", x86_pmu.counter_mask);
-       pr_info("... max period:              %016Lx\n", x86_pmu.max_period);
-       pr_info("... fixed-purpose counters:  %d\n",     x86_pmu.num_counters_fixed);
-       pr_info("... counter mask:            %016Lx\n", perf_counter_mask);
-}
-
-static inline void x86_pmu_read(struct perf_counter *counter)
-{
-       x86_perf_counter_update(counter, &counter->hw, counter->hw.idx);
-}
-
-static const struct pmu pmu = {
-       .enable         = x86_pmu_enable,
-       .disable        = x86_pmu_disable,
-       .read           = x86_pmu_read,
-       .unthrottle     = x86_pmu_unthrottle,
-};
-
-const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
-{
-       int err;
-
-       err = __hw_perf_counter_init(counter);
-       if (err)
-               return ERR_PTR(err);
-
-       return &pmu;
-}
-
-/*
- * callchain support
- */
-
-static inline
-void callchain_store(struct perf_callchain_entry *entry, u64 ip)
-{
-       if (entry->nr < PERF_MAX_STACK_DEPTH)
-               entry->ip[entry->nr++] = ip;
-}
-
-static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry);
-static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry);
-static DEFINE_PER_CPU(int, in_nmi_frame);
-
-
-static void
-backtrace_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-       /* Ignore warnings */
-}
-
-static void backtrace_warning(void *data, char *msg)
-{
-       /* Ignore warnings */
-}
-
-static int backtrace_stack(void *data, char *name)
-{
-       per_cpu(in_nmi_frame, smp_processor_id()) =
-                       x86_is_stack_id(NMI_STACK, name);
-
-       return 0;
-}
-
-static void backtrace_address(void *data, unsigned long addr, int reliable)
-{
-       struct perf_callchain_entry *entry = data;
-
-       if (per_cpu(in_nmi_frame, smp_processor_id()))
-               return;
-
-       if (reliable)
-               callchain_store(entry, addr);
-}
-
-static const struct stacktrace_ops backtrace_ops = {
-       .warning                = backtrace_warning,
-       .warning_symbol         = backtrace_warning_symbol,
-       .stack                  = backtrace_stack,
-       .address                = backtrace_address,
-};
-
-#include "../dumpstack.h"
-
-static void
-perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
-{
-       callchain_store(entry, PERF_CONTEXT_KERNEL);
-       callchain_store(entry, regs->ip);
-
-       dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry);
-}
-
-/*
- * best effort, GUP based copy_from_user() that assumes IRQ or NMI context
- */
-static unsigned long
-copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
-{
-       unsigned long offset, addr = (unsigned long)from;
-       int type = in_nmi() ? KM_NMI : KM_IRQ0;
-       unsigned long size, len = 0;
-       struct page *page;
-       void *map;
-       int ret;
-
-       do {
-               ret = __get_user_pages_fast(addr, 1, 0, &page);
-               if (!ret)
-                       break;
-
-               offset = addr & (PAGE_SIZE - 1);
-               size = min(PAGE_SIZE - offset, n - len);
-
-               map = kmap_atomic(page, type);
-               memcpy(to, map+offset, size);
-               kunmap_atomic(map, type);
-               put_page(page);
-
-               len  += size;
-               to   += size;
-               addr += size;
-
-       } while (len < n);
-
-       return len;
-}
-
-static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
-{
-       unsigned long bytes;
-
-       bytes = copy_from_user_nmi(frame, fp, sizeof(*frame));
-
-       return bytes == sizeof(*frame);
-}
-
-static void
-perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
-{
-       struct stack_frame frame;
-       const void __user *fp;
-
-       if (!user_mode(regs))
-               regs = task_pt_regs(current);
-
-       fp = (void __user *)regs->bp;
-
-       callchain_store(entry, PERF_CONTEXT_USER);
-       callchain_store(entry, regs->ip);
-
-       while (entry->nr < PERF_MAX_STACK_DEPTH) {
-               frame.next_frame             = NULL;
-               frame.return_address = 0;
-
-               if (!copy_stack_frame(fp, &frame))
-                       break;
-
-               if ((unsigned long)fp < regs->sp)
-                       break;
-
-               callchain_store(entry, frame.return_address);
-               fp = frame.next_frame;
-       }
-}
-
-static void
-perf_do_callchain(struct pt_regs *regs, struct perf_callchain_entry *entry)
-{
-       int is_user;
-
-       if (!regs)
-               return;
-
-       is_user = user_mode(regs);
-
-       if (!current || current->pid == 0)
-               return;
-
-       if (is_user && current->state != TASK_RUNNING)
-               return;
-
-       if (!is_user)
-               perf_callchain_kernel(regs, entry);
-
-       if (current->mm)
-               perf_callchain_user(regs, entry);
-}
-
-struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
-{
-       struct perf_callchain_entry *entry;
-
-       if (in_nmi())
-               entry = &__get_cpu_var(pmc_nmi_entry);
-       else
-               entry = &__get_cpu_var(pmc_irq_entry);
-
-       entry->nr = 0;
-
-       perf_do_callchain(regs, entry);
-
-       return entry;
-}
-
-void hw_perf_counter_setup_online(int cpu)
-{
-       init_debug_store_on_cpu(cpu);
-}
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
new file mode 100644 (file)
index 0000000..a3c7adb
--- /dev/null
@@ -0,0 +1,2298 @@
+/*
+ * Performance events x86 architecture code
+ *
+ *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
+ *  Copyright (C) 2009 Jaswinder Singh Rajput
+ *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
+ *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
+ *
+ *  For licencing details see kernel-base/COPYING
+ */
+
+#include <linux/perf_event.h>
+#include <linux/capability.h>
+#include <linux/notifier.h>
+#include <linux/hardirq.h>
+#include <linux/kprobes.h>
+#include <linux/module.h>
+#include <linux/kdebug.h>
+#include <linux/sched.h>
+#include <linux/uaccess.h>
+#include <linux/highmem.h>
+#include <linux/cpu.h>
+
+#include <asm/apic.h>
+#include <asm/stacktrace.h>
+#include <asm/nmi.h>
+
+static u64 perf_event_mask __read_mostly;
+
+/* The maximal number of PEBS events: */
+#define MAX_PEBS_EVENTS        4
+
+/* The size of a BTS record in bytes: */
+#define BTS_RECORD_SIZE                24
+
+/* The size of a per-cpu BTS buffer in bytes: */
+#define BTS_BUFFER_SIZE                (BTS_RECORD_SIZE * 2048)
+
+/* The BTS overflow threshold in bytes from the end of the buffer: */
+#define BTS_OVFL_TH            (BTS_RECORD_SIZE * 128)
+
+
+/*
+ * Bits in the debugctlmsr controlling branch tracing.
+ */
+#define X86_DEBUGCTL_TR                        (1 << 6)
+#define X86_DEBUGCTL_BTS               (1 << 7)
+#define X86_DEBUGCTL_BTINT             (1 << 8)
+#define X86_DEBUGCTL_BTS_OFF_OS                (1 << 9)
+#define X86_DEBUGCTL_BTS_OFF_USR       (1 << 10)
+
+/*
+ * A debug store configuration.
+ *
+ * We only support architectures that use 64bit fields.
+ */
+struct debug_store {
+       u64     bts_buffer_base;
+       u64     bts_index;
+       u64     bts_absolute_maximum;
+       u64     bts_interrupt_threshold;
+       u64     pebs_buffer_base;
+       u64     pebs_index;
+       u64     pebs_absolute_maximum;
+       u64     pebs_interrupt_threshold;
+       u64     pebs_event_reset[MAX_PEBS_EVENTS];
+};
+
+struct cpu_hw_events {
+       struct perf_event       *events[X86_PMC_IDX_MAX];
+       unsigned long           used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
+       unsigned long           active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
+       unsigned long           interrupts;
+       int                     enabled;
+       struct debug_store      *ds;
+};
+
+/*
+ * struct x86_pmu - generic x86 pmu
+ */
+struct x86_pmu {
+       const char      *name;
+       int             version;
+       int             (*handle_irq)(struct pt_regs *);
+       void            (*disable_all)(void);
+       void            (*enable_all)(void);
+       void            (*enable)(struct hw_perf_event *, int);
+       void            (*disable)(struct hw_perf_event *, int);
+       unsigned        eventsel;
+       unsigned        perfctr;
+       u64             (*event_map)(int);
+       u64             (*raw_event)(u64);
+       int             max_events;
+       int             num_events;
+       int             num_events_fixed;
+       int             event_bits;
+       u64             event_mask;
+       int             apic;
+       u64             max_period;
+       u64             intel_ctrl;
+       void            (*enable_bts)(u64 config);
+       void            (*disable_bts)(void);
+};
+
+static struct x86_pmu x86_pmu __read_mostly;
+
+static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = {
+       .enabled = 1,
+};
+
+/*
+ * Not sure about some of these
+ */
+static const u64 p6_perfmon_event_map[] =
+{
+  [PERF_COUNT_HW_CPU_CYCLES]           = 0x0079,
+  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
+  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x0f2e,
+  [PERF_COUNT_HW_CACHE_MISSES]         = 0x012e,
+  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
+  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
+  [PERF_COUNT_HW_BUS_CYCLES]           = 0x0062,
+};
+
+static u64 p6_pmu_event_map(int hw_event)
+{
+       return p6_perfmon_event_map[hw_event];
+}
+
+/*
+ * Event setting that is specified not to count anything.
+ * We use this to effectively disable a counter.
+ *
+ * L2_RQSTS with 0 MESI unit mask.
+ */
+#define P6_NOP_EVENT                   0x0000002EULL
+
+static u64 p6_pmu_raw_event(u64 hw_event)
+{
+#define P6_EVNTSEL_EVENT_MASK          0x000000FFULL
+#define P6_EVNTSEL_UNIT_MASK           0x0000FF00ULL
+#define P6_EVNTSEL_EDGE_MASK           0x00040000ULL
+#define P6_EVNTSEL_INV_MASK            0x00800000ULL
+#define P6_EVNTSEL_REG_MASK            0xFF000000ULL
+
+#define P6_EVNTSEL_MASK                        \
+       (P6_EVNTSEL_EVENT_MASK |        \
+        P6_EVNTSEL_UNIT_MASK  |        \
+        P6_EVNTSEL_EDGE_MASK  |        \
+        P6_EVNTSEL_INV_MASK   |        \
+        P6_EVNTSEL_REG_MASK)
+
+       return hw_event & P6_EVNTSEL_MASK;
+}
+
+
+/*
+ * Intel PerfMon v3. Used on Core2 and later.
+ */
+static const u64 intel_perfmon_event_map[] =
+{
+  [PERF_COUNT_HW_CPU_CYCLES]           = 0x003c,
+  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
+  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x4f2e,
+  [PERF_COUNT_HW_CACHE_MISSES]         = 0x412e,
+  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
+  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
+  [PERF_COUNT_HW_BUS_CYCLES]           = 0x013c,
+};
+
+static u64 intel_pmu_event_map(int hw_event)
+{
+       return intel_perfmon_event_map[hw_event];
+}
+
+/*
+ * Generalized hw caching related hw_event table, filled
+ * in on a per model basis. A value of 0 means
+ * 'not supported', -1 means 'hw_event makes no sense on
+ * this CPU', any other value means the raw hw_event
+ * ID.
+ */
+
+#define C(x) PERF_COUNT_HW_CACHE_##x
+
+static u64 __read_mostly hw_cache_event_ids
+                               [PERF_COUNT_HW_CACHE_MAX]
+                               [PERF_COUNT_HW_CACHE_OP_MAX]
+                               [PERF_COUNT_HW_CACHE_RESULT_MAX];
+
+static const u64 nehalem_hw_cache_event_ids
+                               [PERF_COUNT_HW_CACHE_MAX]
+                               [PERF_COUNT_HW_CACHE_OP_MAX]
+                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI            */
+               [ C(RESULT_MISS)   ] = 0x0140, /* L1D_CACHE_LD.I_STATE         */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI            */
+               [ C(RESULT_MISS)   ] = 0x0141, /* L1D_CACHE_ST.I_STATE         */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x014e, /* L1D_PREFETCH.REQUESTS        */
+               [ C(RESULT_MISS)   ] = 0x024e, /* L1D_PREFETCH.MISS            */
+       },
+ },
+ [ C(L1I ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0380, /* L1I.READS                    */
+               [ C(RESULT_MISS)   ] = 0x0280, /* L1I.MISSES                   */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0,
+               [ C(RESULT_MISS)   ] = 0x0,
+       },
+ },
+ [ C(LL  ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0324, /* L2_RQSTS.LOADS               */
+               [ C(RESULT_MISS)   ] = 0x0224, /* L2_RQSTS.LD_MISS             */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0c24, /* L2_RQSTS.RFOS                */
+               [ C(RESULT_MISS)   ] = 0x0824, /* L2_RQSTS.RFO_MISS            */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x4f2e, /* LLC Reference                */
+               [ C(RESULT_MISS)   ] = 0x412e, /* LLC Misses                   */
+       },
+ },
+ [ C(DTLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI   (alias)  */
+               [ C(RESULT_MISS)   ] = 0x0108, /* DTLB_LOAD_MISSES.ANY         */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI   (alias)  */
+               [ C(RESULT_MISS)   ] = 0x010c, /* MEM_STORE_RETIRED.DTLB_MISS  */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0,
+               [ C(RESULT_MISS)   ] = 0x0,
+       },
+ },
+ [ C(ITLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x01c0, /* INST_RETIRED.ANY_P           */
+               [ C(RESULT_MISS)   ] = 0x20c8, /* ITLB_MISS_RETIRED            */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+ [ C(BPU ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ALL_BRANCHES */
+               [ C(RESULT_MISS)   ] = 0x03e8, /* BPU_CLEARS.ANY               */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+};
+
+static const u64 core2_hw_cache_event_ids
+                               [PERF_COUNT_HW_CACHE_MAX]
+                               [PERF_COUNT_HW_CACHE_OP_MAX]
+                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI          */
+               [ C(RESULT_MISS)   ] = 0x0140, /* L1D_CACHE_LD.I_STATE       */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI          */
+               [ C(RESULT_MISS)   ] = 0x0141, /* L1D_CACHE_ST.I_STATE       */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x104e, /* L1D_PREFETCH.REQUESTS      */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(L1I ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0080, /* L1I.READS                  */
+               [ C(RESULT_MISS)   ] = 0x0081, /* L1I.MISSES                 */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(LL  ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x4f29, /* L2_LD.MESI                 */
+               [ C(RESULT_MISS)   ] = 0x4129, /* L2_LD.ISTATE               */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x4f2A, /* L2_ST.MESI                 */
+               [ C(RESULT_MISS)   ] = 0x412A, /* L2_ST.ISTATE               */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(DTLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f40, /* L1D_CACHE_LD.MESI  (alias) */
+               [ C(RESULT_MISS)   ] = 0x0208, /* DTLB_MISSES.MISS_LD        */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0f41, /* L1D_CACHE_ST.MESI  (alias) */
+               [ C(RESULT_MISS)   ] = 0x0808, /* DTLB_MISSES.MISS_ST        */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(ITLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P         */
+               [ C(RESULT_MISS)   ] = 0x1282, /* ITLBMISSES                 */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+ [ C(BPU ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ANY        */
+               [ C(RESULT_MISS)   ] = 0x00c5, /* BP_INST_RETIRED.MISPRED    */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+};
+
+static const u64 atom_hw_cache_event_ids
+                               [PERF_COUNT_HW_CACHE_MAX]
+                               [PERF_COUNT_HW_CACHE_OP_MAX]
+                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x2140, /* L1D_CACHE.LD               */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x2240, /* L1D_CACHE.ST               */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(L1I ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0380, /* L1I.READS                  */
+               [ C(RESULT_MISS)   ] = 0x0280, /* L1I.MISSES                 */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(LL  ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x4f29, /* L2_LD.MESI                 */
+               [ C(RESULT_MISS)   ] = 0x4129, /* L2_LD.ISTATE               */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x4f2A, /* L2_ST.MESI                 */
+               [ C(RESULT_MISS)   ] = 0x412A, /* L2_ST.ISTATE               */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(DTLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x2140, /* L1D_CACHE_LD.MESI  (alias) */
+               [ C(RESULT_MISS)   ] = 0x0508, /* DTLB_MISSES.MISS_LD        */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x2240, /* L1D_CACHE_ST.MESI  (alias) */
+               [ C(RESULT_MISS)   ] = 0x0608, /* DTLB_MISSES.MISS_ST        */
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(ITLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P         */
+               [ C(RESULT_MISS)   ] = 0x0282, /* ITLB.MISSES                */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+ [ C(BPU ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ANY        */
+               [ C(RESULT_MISS)   ] = 0x00c5, /* BP_INST_RETIRED.MISPRED    */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+};
+
+static u64 intel_pmu_raw_event(u64 hw_event)
+{
+#define CORE_EVNTSEL_EVENT_MASK                0x000000FFULL
+#define CORE_EVNTSEL_UNIT_MASK         0x0000FF00ULL
+#define CORE_EVNTSEL_EDGE_MASK         0x00040000ULL
+#define CORE_EVNTSEL_INV_MASK          0x00800000ULL
+#define CORE_EVNTSEL_REG_MASK  0xFF000000ULL
+
+#define CORE_EVNTSEL_MASK              \
+       (CORE_EVNTSEL_EVENT_MASK |      \
+        CORE_EVNTSEL_UNIT_MASK  |      \
+        CORE_EVNTSEL_EDGE_MASK  |      \
+        CORE_EVNTSEL_INV_MASK  |       \
+        CORE_EVNTSEL_REG_MASK)
+
+       return hw_event & CORE_EVNTSEL_MASK;
+}
+
+static const u64 amd_hw_cache_event_ids
+                               [PERF_COUNT_HW_CACHE_MAX]
+                               [PERF_COUNT_HW_CACHE_OP_MAX]
+                               [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses        */
+               [ C(RESULT_MISS)   ] = 0x0041, /* Data Cache Misses          */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0142, /* Data Cache Refills :system */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0267, /* Data Prefetcher :attempts  */
+               [ C(RESULT_MISS)   ] = 0x0167, /* Data Prefetcher :cancelled */
+       },
+ },
+ [ C(L1I ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0080, /* Instruction cache fetches  */
+               [ C(RESULT_MISS)   ] = 0x0081, /* Instruction cache misses   */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0x014B, /* Prefetch Instructions :Load */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(LL  ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x037D, /* Requests to L2 Cache :IC+DC */
+               [ C(RESULT_MISS)   ] = 0x037E, /* L2 Cache Misses : IC+DC     */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0x017F, /* L2 Fill/Writeback           */
+               [ C(RESULT_MISS)   ] = 0,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(DTLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses        */
+               [ C(RESULT_MISS)   ] = 0x0046, /* L1 DTLB and L2 DLTB Miss   */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = 0,
+               [ C(RESULT_MISS)   ] = 0,
+       },
+ },
+ [ C(ITLB) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x0080, /* Instruction fecthes        */
+               [ C(RESULT_MISS)   ] = 0x0085, /* Instr. fetch ITLB misses   */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+ [ C(BPU ) ] = {
+       [ C(OP_READ) ] = {
+               [ C(RESULT_ACCESS) ] = 0x00c2, /* Retired Branch Instr.      */
+               [ C(RESULT_MISS)   ] = 0x00c3, /* Retired Mispredicted BI    */
+       },
+       [ C(OP_WRITE) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+       [ C(OP_PREFETCH) ] = {
+               [ C(RESULT_ACCESS) ] = -1,
+               [ C(RESULT_MISS)   ] = -1,
+       },
+ },
+};
+
+/*
+ * AMD Performance Monitor K7 and later.
+ */
+static const u64 amd_perfmon_event_map[] =
+{
+  [PERF_COUNT_HW_CPU_CYCLES]           = 0x0076,
+  [PERF_COUNT_HW_INSTRUCTIONS]         = 0x00c0,
+  [PERF_COUNT_HW_CACHE_REFERENCES]     = 0x0080,
+  [PERF_COUNT_HW_CACHE_MISSES]         = 0x0081,
+  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]  = 0x00c4,
+  [PERF_COUNT_HW_BRANCH_MISSES]                = 0x00c5,
+};
+
+static u64 amd_pmu_event_map(int hw_event)
+{
+       return amd_perfmon_event_map[hw_event];
+}
+
+static u64 amd_pmu_raw_event(u64 hw_event)
+{
+#define K7_EVNTSEL_EVENT_MASK  0x7000000FFULL
+#define K7_EVNTSEL_UNIT_MASK   0x00000FF00ULL
+#define K7_EVNTSEL_EDGE_MASK   0x000040000ULL
+#define K7_EVNTSEL_INV_MASK    0x000800000ULL
+#define K7_EVNTSEL_REG_MASK    0x0FF000000ULL
+
+#define K7_EVNTSEL_MASK                        \
+       (K7_EVNTSEL_EVENT_MASK |        \
+        K7_EVNTSEL_UNIT_MASK  |        \
+        K7_EVNTSEL_EDGE_MASK  |        \
+        K7_EVNTSEL_INV_MASK   |        \
+        K7_EVNTSEL_REG_MASK)
+
+       return hw_event & K7_EVNTSEL_MASK;
+}
+
+/*
+ * Propagate event elapsed time into the generic event.
+ * Can only be executed on the CPU where the event is active.
+ * Returns the delta events processed.
+ */
+static u64
+x86_perf_event_update(struct perf_event *event,
+                       struct hw_perf_event *hwc, int idx)
+{
+       int shift = 64 - x86_pmu.event_bits;
+       u64 prev_raw_count, new_raw_count;
+       s64 delta;
+
+       if (idx == X86_PMC_IDX_FIXED_BTS)
+               return 0;
+
+       /*
+        * Careful: an NMI might modify the previous event value.
+        *
+        * Our tactic to handle this is to first atomically read and
+        * exchange a new raw count - then add that new-prev delta
+        * count to the generic event atomically:
+        */
+again:
+       prev_raw_count = atomic64_read(&hwc->prev_count);
+       rdmsrl(hwc->event_base + idx, new_raw_count);
+
+       if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
+                                       new_raw_count) != prev_raw_count)
+               goto again;
+
+       /*
+        * Now we have the new raw value and have updated the prev
+        * timestamp already. We can now calculate the elapsed delta
+        * (event-)time and add that to the generic event.
+        *
+        * Careful, not all hw sign-extends above the physical width
+        * of the count.
+        */
+       delta = (new_raw_count << shift) - (prev_raw_count << shift);
+       delta >>= shift;
+
+       atomic64_add(delta, &event->count);
+       atomic64_sub(delta, &hwc->period_left);
+
+       return new_raw_count;
+}
+
+static atomic_t active_events;
+static DEFINE_MUTEX(pmc_reserve_mutex);
+
+static bool reserve_pmc_hardware(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+       int i;
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               disable_lapic_nmi_watchdog();
+
+       for (i = 0; i < x86_pmu.num_events; i++) {
+               if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
+                       goto perfctr_fail;
+       }
+
+       for (i = 0; i < x86_pmu.num_events; i++) {
+               if (!reserve_evntsel_nmi(x86_pmu.eventsel + i))
+                       goto eventsel_fail;
+       }
+#endif
+
+       return true;
+
+#ifdef CONFIG_X86_LOCAL_APIC
+eventsel_fail:
+       for (i--; i >= 0; i--)
+               release_evntsel_nmi(x86_pmu.eventsel + i);
+
+       i = x86_pmu.num_events;
+
+perfctr_fail:
+       for (i--; i >= 0; i--)
+               release_perfctr_nmi(x86_pmu.perfctr + i);
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               enable_lapic_nmi_watchdog();
+
+       return false;
+#endif
+}
+
+static void release_pmc_hardware(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+       int i;
+
+       for (i = 0; i < x86_pmu.num_events; i++) {
+               release_perfctr_nmi(x86_pmu.perfctr + i);
+               release_evntsel_nmi(x86_pmu.eventsel + i);
+       }
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               enable_lapic_nmi_watchdog();
+#endif
+}
+
+static inline bool bts_available(void)
+{
+       return x86_pmu.enable_bts != NULL;
+}
+
+static inline void init_debug_store_on_cpu(int cpu)
+{
+       struct debug_store *ds = per_cpu(cpu_hw_events, cpu).ds;
+
+       if (!ds)
+               return;
+
+       wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA,
+                    (u32)((u64)(unsigned long)ds),
+                    (u32)((u64)(unsigned long)ds >> 32));
+}
+
+static inline void fini_debug_store_on_cpu(int cpu)
+{
+       if (!per_cpu(cpu_hw_events, cpu).ds)
+               return;
+
+       wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA, 0, 0);
+}
+
+static void release_bts_hardware(void)
+{
+       int cpu;
+
+       if (!bts_available())
+               return;
+
+       get_online_cpus();
+
+       for_each_online_cpu(cpu)
+               fini_debug_store_on_cpu(cpu);
+
+       for_each_possible_cpu(cpu) {
+               struct debug_store *ds = per_cpu(cpu_hw_events, cpu).ds;
+
+               if (!ds)
+                       continue;
+
+               per_cpu(cpu_hw_events, cpu).ds = NULL;
+
+               kfree((void *)(unsigned long)ds->bts_buffer_base);
+               kfree(ds);
+       }
+
+       put_online_cpus();
+}
+
+static int reserve_bts_hardware(void)
+{
+       int cpu, err = 0;
+
+       if (!bts_available())
+               return 0;
+
+       get_online_cpus();
+
+       for_each_possible_cpu(cpu) {
+               struct debug_store *ds;
+               void *buffer;
+
+               err = -ENOMEM;
+               buffer = kzalloc(BTS_BUFFER_SIZE, GFP_KERNEL);
+               if (unlikely(!buffer))
+                       break;
+
+               ds = kzalloc(sizeof(*ds), GFP_KERNEL);
+               if (unlikely(!ds)) {
+                       kfree(buffer);
+                       break;
+               }
+
+               ds->bts_buffer_base = (u64)(unsigned long)buffer;
+               ds->bts_index = ds->bts_buffer_base;
+               ds->bts_absolute_maximum =
+                       ds->bts_buffer_base + BTS_BUFFER_SIZE;
+               ds->bts_interrupt_threshold =
+                       ds->bts_absolute_maximum - BTS_OVFL_TH;
+
+               per_cpu(cpu_hw_events, cpu).ds = ds;
+               err = 0;
+       }
+
+       if (err)
+               release_bts_hardware();
+       else {
+               for_each_online_cpu(cpu)
+                       init_debug_store_on_cpu(cpu);
+       }
+
+       put_online_cpus();
+
+       return err;
+}
+
+static void hw_perf_event_destroy(struct perf_event *event)
+{
+       if (atomic_dec_and_mutex_lock(&active_events, &pmc_reserve_mutex)) {
+               release_pmc_hardware();
+               release_bts_hardware();
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+}
+
+static inline int x86_pmu_initialized(void)
+{
+       return x86_pmu.handle_irq != NULL;
+}
+
+static inline int
+set_ext_hw_attr(struct hw_perf_event *hwc, struct perf_event_attr *attr)
+{
+       unsigned int cache_type, cache_op, cache_result;
+       u64 config, val;
+
+       config = attr->config;
+
+       cache_type = (config >>  0) & 0xff;
+       if (cache_type >= PERF_COUNT_HW_CACHE_MAX)
+               return -EINVAL;
+
+       cache_op = (config >>  8) & 0xff;
+       if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)
+               return -EINVAL;
+
+       cache_result = (config >> 16) & 0xff;
+       if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
+               return -EINVAL;
+
+       val = hw_cache_event_ids[cache_type][cache_op][cache_result];
+
+       if (val == 0)
+               return -ENOENT;
+
+       if (val == -1)
+               return -EINVAL;
+
+       hwc->config |= val;
+
+       return 0;
+}
+
+static void intel_pmu_enable_bts(u64 config)
+{
+       unsigned long debugctlmsr;
+
+       debugctlmsr = get_debugctlmsr();
+
+       debugctlmsr |= X86_DEBUGCTL_TR;
+       debugctlmsr |= X86_DEBUGCTL_BTS;
+       debugctlmsr |= X86_DEBUGCTL_BTINT;
+
+       if (!(config & ARCH_PERFMON_EVENTSEL_OS))
+               debugctlmsr |= X86_DEBUGCTL_BTS_OFF_OS;
+
+       if (!(config & ARCH_PERFMON_EVENTSEL_USR))
+               debugctlmsr |= X86_DEBUGCTL_BTS_OFF_USR;
+
+       update_debugctlmsr(debugctlmsr);
+}
+
+static void intel_pmu_disable_bts(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       unsigned long debugctlmsr;
+
+       if (!cpuc->ds)
+               return;
+
+       debugctlmsr = get_debugctlmsr();
+
+       debugctlmsr &=
+               ~(X86_DEBUGCTL_TR | X86_DEBUGCTL_BTS | X86_DEBUGCTL_BTINT |
+                 X86_DEBUGCTL_BTS_OFF_OS | X86_DEBUGCTL_BTS_OFF_USR);
+
+       update_debugctlmsr(debugctlmsr);
+}
+
+/*
+ * Setup the hardware configuration for a given attr_type
+ */
+static int __hw_perf_event_init(struct perf_event *event)
+{
+       struct perf_event_attr *attr = &event->attr;
+       struct hw_perf_event *hwc = &event->hw;
+       u64 config;
+       int err;
+
+       if (!x86_pmu_initialized())
+               return -ENODEV;
+
+       err = 0;
+       if (!atomic_inc_not_zero(&active_events)) {
+               mutex_lock(&pmc_reserve_mutex);
+               if (atomic_read(&active_events) == 0) {
+                       if (!reserve_pmc_hardware())
+                               err = -EBUSY;
+                       else
+                               err = reserve_bts_hardware();
+               }
+               if (!err)
+                       atomic_inc(&active_events);
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+       if (err)
+               return err;
+
+       event->destroy = hw_perf_event_destroy;
+
+       /*
+        * Generate PMC IRQs:
+        * (keep 'enabled' bit clear for now)
+        */
+       hwc->config = ARCH_PERFMON_EVENTSEL_INT;
+
+       /*
+        * Count user and OS events unless requested not to.
+        */
+       if (!attr->exclude_user)
+               hwc->config |= ARCH_PERFMON_EVENTSEL_USR;
+       if (!attr->exclude_kernel)
+               hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
+
+       if (!hwc->sample_period) {
+               hwc->sample_period = x86_pmu.max_period;
+               hwc->last_period = hwc->sample_period;
+               atomic64_set(&hwc->period_left, hwc->sample_period);
+       } else {
+               /*
+                * If we have a PMU initialized but no APIC
+                * interrupts, we cannot sample hardware
+                * events (user-space has to fall back and
+                * sample via a hrtimer based software event):
+                */
+               if (!x86_pmu.apic)
+                       return -EOPNOTSUPP;
+       }
+
+       /*
+        * Raw hw_event type provide the config in the hw_event structure
+        */
+       if (attr->type == PERF_TYPE_RAW) {
+               hwc->config |= x86_pmu.raw_event(attr->config);
+               return 0;
+       }
+
+       if (attr->type == PERF_TYPE_HW_CACHE)
+               return set_ext_hw_attr(hwc, attr);
+
+       if (attr->config >= x86_pmu.max_events)
+               return -EINVAL;
+
+       /*
+        * The generic map:
+        */
+       config = x86_pmu.event_map(attr->config);
+
+       if (config == 0)
+               return -ENOENT;
+
+       if (config == -1LL)
+               return -EINVAL;
+
+       /*
+        * Branch tracing:
+        */
+       if ((attr->config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS) &&
+           (hwc->sample_period == 1)) {
+               /* BTS is not supported by this architecture. */
+               if (!bts_available())
+                       return -EOPNOTSUPP;
+
+               /* BTS is currently only allowed for user-mode. */
+               if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
+                       return -EOPNOTSUPP;
+       }
+
+       hwc->config |= config;
+
+       return 0;
+}
+
+static void p6_pmu_disable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       u64 val;
+
+       if (!cpuc->enabled)
+               return;
+
+       cpuc->enabled = 0;
+       barrier();
+
+       /* p6 only has one enable register */
+       rdmsrl(MSR_P6_EVNTSEL0, val);
+       val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
+       wrmsrl(MSR_P6_EVNTSEL0, val);
+}
+
+static void intel_pmu_disable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+       if (!cpuc->enabled)
+               return;
+
+       cpuc->enabled = 0;
+       barrier();
+
+       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
+
+       if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask))
+               intel_pmu_disable_bts();
+}
+
+static void amd_pmu_disable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       int idx;
+
+       if (!cpuc->enabled)
+               return;
+
+       cpuc->enabled = 0;
+       /*
+        * ensure we write the disable before we start disabling the
+        * events proper, so that amd_pmu_enable_event() does the
+        * right thing.
+        */
+       barrier();
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               u64 val;
+
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+               rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               if (!(val & ARCH_PERFMON_EVENTSEL0_ENABLE))
+                       continue;
+               val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
+               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+       }
+}
+
+void hw_perf_disable(void)
+{
+       if (!x86_pmu_initialized())
+               return;
+       return x86_pmu.disable_all();
+}
+
+static void p6_pmu_enable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       unsigned long val;
+
+       if (cpuc->enabled)
+               return;
+
+       cpuc->enabled = 1;
+       barrier();
+
+       /* p6 only has one enable register */
+       rdmsrl(MSR_P6_EVNTSEL0, val);
+       val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+       wrmsrl(MSR_P6_EVNTSEL0, val);
+}
+
+static void intel_pmu_enable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+       if (cpuc->enabled)
+               return;
+
+       cpuc->enabled = 1;
+       barrier();
+
+       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, x86_pmu.intel_ctrl);
+
+       if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask)) {
+               struct perf_event *event =
+                       cpuc->events[X86_PMC_IDX_FIXED_BTS];
+
+               if (WARN_ON_ONCE(!event))
+                       return;
+
+               intel_pmu_enable_bts(event->hw.config);
+       }
+}
+
+static void amd_pmu_enable_all(void)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       int idx;
+
+       if (cpuc->enabled)
+               return;
+
+       cpuc->enabled = 1;
+       barrier();
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               struct perf_event *event = cpuc->events[idx];
+               u64 val;
+
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+
+               val = event->hw.config;
+               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+       }
+}
+
+void hw_perf_enable(void)
+{
+       if (!x86_pmu_initialized())
+               return;
+       x86_pmu.enable_all();
+}
+
+static inline u64 intel_pmu_get_status(void)
+{
+       u64 status;
+
+       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+
+       return status;
+}
+
+static inline void intel_pmu_ack_status(u64 ack)
+{
+       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
+}
+
+static inline void x86_pmu_enable_event(struct hw_perf_event *hwc, int idx)
+{
+       (void)checking_wrmsrl(hwc->config_base + idx,
+                             hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE);
+}
+
+static inline void x86_pmu_disable_event(struct hw_perf_event *hwc, int idx)
+{
+       (void)checking_wrmsrl(hwc->config_base + idx, hwc->config);
+}
+
+static inline void
+intel_pmu_disable_fixed(struct hw_perf_event *hwc, int __idx)
+{
+       int idx = __idx - X86_PMC_IDX_FIXED;
+       u64 ctrl_val, mask;
+
+       mask = 0xfULL << (idx * 4);
+
+       rdmsrl(hwc->config_base, ctrl_val);
+       ctrl_val &= ~mask;
+       (void)checking_wrmsrl(hwc->config_base, ctrl_val);
+}
+
+static inline void
+p6_pmu_disable_event(struct hw_perf_event *hwc, int idx)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       u64 val = P6_NOP_EVENT;
+
+       if (cpuc->enabled)
+               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+
+       (void)checking_wrmsrl(hwc->config_base + idx, val);
+}
+
+static inline void
+intel_pmu_disable_event(struct hw_perf_event *hwc, int idx)
+{
+       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
+               intel_pmu_disable_bts();
+               return;
+       }
+
+       if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
+               intel_pmu_disable_fixed(hwc, idx);
+               return;
+       }
+
+       x86_pmu_disable_event(hwc, idx);
+}
+
+static inline void
+amd_pmu_disable_event(struct hw_perf_event *hwc, int idx)
+{
+       x86_pmu_disable_event(hwc, idx);
+}
+
+static DEFINE_PER_CPU(u64 [X86_PMC_IDX_MAX], pmc_prev_left);
+
+/*
+ * Set the next IRQ period, based on the hwc->period_left value.
+ * To be called with the event disabled in hw:
+ */
+static int
+x86_perf_event_set_period(struct perf_event *event,
+                            struct hw_perf_event *hwc, int idx)
+{
+       s64 left = atomic64_read(&hwc->period_left);
+       s64 period = hwc->sample_period;
+       int err, ret = 0;
+
+       if (idx == X86_PMC_IDX_FIXED_BTS)
+               return 0;
+
+       /*
+        * If we are way outside a reasoable range then just skip forward:
+        */
+       if (unlikely(left <= -period)) {
+               left = period;
+               atomic64_set(&hwc->period_left, left);
+               hwc->last_period = period;
+               ret = 1;
+       }
+
+       if (unlikely(left <= 0)) {
+               left += period;
+               atomic64_set(&hwc->period_left, left);
+               hwc->last_period = period;
+               ret = 1;
+       }
+       /*
+        * Quirk: certain CPUs dont like it if just 1 hw_event is left:
+        */
+       if (unlikely(left < 2))
+               left = 2;
+
+       if (left > x86_pmu.max_period)
+               left = x86_pmu.max_period;
+
+       per_cpu(pmc_prev_left[idx], smp_processor_id()) = left;
+
+       /*
+        * The hw event starts counting from this event offset,
+        * mark it to be able to extra future deltas:
+        */
+       atomic64_set(&hwc->prev_count, (u64)-left);
+
+       err = checking_wrmsrl(hwc->event_base + idx,
+                            (u64)(-left) & x86_pmu.event_mask);
+
+       perf_event_update_userpage(event);
+
+       return ret;
+}
+
+static inline void
+intel_pmu_enable_fixed(struct hw_perf_event *hwc, int __idx)
+{
+       int idx = __idx - X86_PMC_IDX_FIXED;
+       u64 ctrl_val, bits, mask;
+       int err;
+
+       /*
+        * Enable IRQ generation (0x8),
+        * and enable ring-3 counting (0x2) and ring-0 counting (0x1)
+        * if requested:
+        */
+       bits = 0x8ULL;
+       if (hwc->config & ARCH_PERFMON_EVENTSEL_USR)
+               bits |= 0x2;
+       if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
+               bits |= 0x1;
+       bits <<= (idx * 4);
+       mask = 0xfULL << (idx * 4);
+
+       rdmsrl(hwc->config_base, ctrl_val);
+       ctrl_val &= ~mask;
+       ctrl_val |= bits;
+       err = checking_wrmsrl(hwc->config_base, ctrl_val);
+}
+
+static void p6_pmu_enable_event(struct hw_perf_event *hwc, int idx)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       u64 val;
+
+       val = hwc->config;
+       if (cpuc->enabled)
+               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+
+       (void)checking_wrmsrl(hwc->config_base + idx, val);
+}
+
+
+static void intel_pmu_enable_event(struct hw_perf_event *hwc, int idx)
+{
+       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
+               if (!__get_cpu_var(cpu_hw_events).enabled)
+                       return;
+
+               intel_pmu_enable_bts(hwc->config);
+               return;
+       }
+
+       if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
+               intel_pmu_enable_fixed(hwc, idx);
+               return;
+       }
+
+       x86_pmu_enable_event(hwc, idx);
+}
+
+static void amd_pmu_enable_event(struct hw_perf_event *hwc, int idx)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+       if (cpuc->enabled)
+               x86_pmu_enable_event(hwc, idx);
+}
+
+static int
+fixed_mode_idx(struct perf_event *event, struct hw_perf_event *hwc)
+{
+       unsigned int hw_event;
+
+       hw_event = hwc->config & ARCH_PERFMON_EVENT_MASK;
+
+       if (unlikely((hw_event ==
+                     x86_pmu.event_map(PERF_COUNT_HW_BRANCH_INSTRUCTIONS)) &&
+                    (hwc->sample_period == 1)))
+               return X86_PMC_IDX_FIXED_BTS;
+
+       if (!x86_pmu.num_events_fixed)
+               return -1;
+
+       if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_INSTRUCTIONS)))
+               return X86_PMC_IDX_FIXED_INSTRUCTIONS;
+       if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_CPU_CYCLES)))
+               return X86_PMC_IDX_FIXED_CPU_CYCLES;
+       if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_BUS_CYCLES)))
+               return X86_PMC_IDX_FIXED_BUS_CYCLES;
+
+       return -1;
+}
+
+/*
+ * Find a PMC slot for the freshly enabled / scheduled in event:
+ */
+static int x86_pmu_enable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       struct hw_perf_event *hwc = &event->hw;
+       int idx;
+
+       idx = fixed_mode_idx(event, hwc);
+       if (idx == X86_PMC_IDX_FIXED_BTS) {
+               /* BTS is already occupied. */
+               if (test_and_set_bit(idx, cpuc->used_mask))
+                       return -EAGAIN;
+
+               hwc->config_base        = 0;
+               hwc->event_base = 0;
+               hwc->idx                = idx;
+       } else if (idx >= 0) {
+               /*
+                * Try to get the fixed event, if that is already taken
+                * then try to get a generic event:
+                */
+               if (test_and_set_bit(idx, cpuc->used_mask))
+                       goto try_generic;
+
+               hwc->config_base = MSR_ARCH_PERFMON_FIXED_CTR_CTRL;
+               /*
+                * We set it so that event_base + idx in wrmsr/rdmsr maps to
+                * MSR_ARCH_PERFMON_FIXED_CTR0 ... CTR2:
+                */
+               hwc->event_base =
+                       MSR_ARCH_PERFMON_FIXED_CTR0 - X86_PMC_IDX_FIXED;
+               hwc->idx = idx;
+       } else {
+               idx = hwc->idx;
+               /* Try to get the previous generic event again */
+               if (test_and_set_bit(idx, cpuc->used_mask)) {
+try_generic:
+                       idx = find_first_zero_bit(cpuc->used_mask,
+                                                 x86_pmu.num_events);
+                       if (idx == x86_pmu.num_events)
+                               return -EAGAIN;
+
+                       set_bit(idx, cpuc->used_mask);
+                       hwc->idx = idx;
+               }
+               hwc->config_base  = x86_pmu.eventsel;
+               hwc->event_base = x86_pmu.perfctr;
+       }
+
+       perf_events_lapic_init();
+
+       x86_pmu.disable(hwc, idx);
+
+       cpuc->events[idx] = event;
+       set_bit(idx, cpuc->active_mask);
+
+       x86_perf_event_set_period(event, hwc, idx);
+       x86_pmu.enable(hwc, idx);
+
+       perf_event_update_userpage(event);
+
+       return 0;
+}
+
+static void x86_pmu_unthrottle(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       struct hw_perf_event *hwc = &event->hw;
+
+       if (WARN_ON_ONCE(hwc->idx >= X86_PMC_IDX_MAX ||
+                               cpuc->events[hwc->idx] != event))
+               return;
+
+       x86_pmu.enable(hwc, hwc->idx);
+}
+
+void perf_event_print_debug(void)
+{
+       u64 ctrl, status, overflow, pmc_ctrl, pmc_count, prev_left, fixed;
+       struct cpu_hw_events *cpuc;
+       unsigned long flags;
+       int cpu, idx;
+
+       if (!x86_pmu.num_events)
+               return;
+
+       local_irq_save(flags);
+
+       cpu = smp_processor_id();
+       cpuc = &per_cpu(cpu_hw_events, cpu);
+
+       if (x86_pmu.version >= 2) {
+               rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
+               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
+
+               pr_info("\n");
+               pr_info("CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
+               pr_info("CPU#%d: status:     %016llx\n", cpu, status);
+               pr_info("CPU#%d: overflow:   %016llx\n", cpu, overflow);
+               pr_info("CPU#%d: fixed:      %016llx\n", cpu, fixed);
+       }
+       pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used_mask);
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);
+               rdmsrl(x86_pmu.perfctr  + idx, pmc_count);
+
+               prev_left = per_cpu(pmc_prev_left[idx], cpu);
+
+               pr_info("CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
+                       cpu, idx, pmc_ctrl);
+               pr_info("CPU#%d:   gen-PMC%d count: %016llx\n",
+                       cpu, idx, pmc_count);
+               pr_info("CPU#%d:   gen-PMC%d left:  %016llx\n",
+                       cpu, idx, prev_left);
+       }
+       for (idx = 0; idx < x86_pmu.num_events_fixed; idx++) {
+               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count);
+
+               pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
+                       cpu, idx, pmc_count);
+       }
+       local_irq_restore(flags);
+}
+
+static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc)
+{
+       struct debug_store *ds = cpuc->ds;
+       struct bts_record {
+               u64     from;
+               u64     to;
+               u64     flags;
+       };
+       struct perf_event *event = cpuc->events[X86_PMC_IDX_FIXED_BTS];
+       struct bts_record *at, *top;
+       struct perf_output_handle handle;
+       struct perf_event_header header;
+       struct perf_sample_data data;
+       struct pt_regs regs;
+
+       if (!event)
+               return;
+
+       if (!ds)
+               return;
+
+       at  = (struct bts_record *)(unsigned long)ds->bts_buffer_base;
+       top = (struct bts_record *)(unsigned long)ds->bts_index;
+
+       if (top <= at)
+               return;
+
+       ds->bts_index = ds->bts_buffer_base;
+
+
+       data.period     = event->hw.last_period;
+       data.addr       = 0;
+       regs.ip         = 0;
+
+       /*
+        * Prepare a generic sample, i.e. fill in the invariant fields.
+        * We will overwrite the from and to address before we output
+        * the sample.
+        */
+       perf_prepare_sample(&header, &data, event, &regs);
+
+       if (perf_output_begin(&handle, event,
+                             header.size * (top - at), 1, 1))
+               return;
+
+       for (; at < top; at++) {
+               data.ip         = at->from;
+               data.addr       = at->to;
+
+               perf_output_sample(&handle, &header, &data, event);
+       }
+
+       perf_output_end(&handle);
+
+       /* There's new data available. */
+       event->hw.interrupts++;
+       event->pending_kill = POLL_IN;
+}
+
+static void x86_pmu_disable(struct perf_event *event)
+{
+       struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+       struct hw_perf_event *hwc = &event->hw;
+       int idx = hwc->idx;
+
+       /*
+        * Must be done before we disable, otherwise the nmi handler
+        * could reenable again:
+        */
+       clear_bit(idx, cpuc->active_mask);
+       x86_pmu.disable(hwc, idx);
+
+       /*
+        * Make sure the cleared pointer becomes visible before we
+        * (potentially) free the event:
+        */
+       barrier();
+
+       /*
+        * Drain the remaining delta count out of a event
+        * that we are disabling:
+        */
+       x86_perf_event_update(event, hwc, idx);
+
+       /* Drain the remaining BTS records. */
+       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS))
+               intel_pmu_drain_bts_buffer(cpuc);
+
+       cpuc->events[idx] = NULL;
+       clear_bit(idx, cpuc->used_mask);
+
+       perf_event_update_userpage(event);
+}
+
+/*
+ * Save and restart an expired event. Called by NMI contexts,
+ * so it has to be careful about preempting normal event ops:
+ */
+static int intel_pmu_save_and_restart(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       int idx = hwc->idx;
+       int ret;
+
+       x86_perf_event_update(event, hwc, idx);
+       ret = x86_perf_event_set_period(event, hwc, idx);
+
+       if (event->state == PERF_EVENT_STATE_ACTIVE)
+               intel_pmu_enable_event(hwc, idx);
+
+       return ret;
+}
+
+static void intel_pmu_reset(void)
+{
+       struct debug_store *ds = __get_cpu_var(cpu_hw_events).ds;
+       unsigned long flags;
+       int idx;
+
+       if (!x86_pmu.num_events)
+               return;
+
+       local_irq_save(flags);
+
+       printk("clearing PMU state on CPU#%d\n", smp_processor_id());
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               checking_wrmsrl(x86_pmu.eventsel + idx, 0ull);
+               checking_wrmsrl(x86_pmu.perfctr  + idx, 0ull);
+       }
+       for (idx = 0; idx < x86_pmu.num_events_fixed; idx++) {
+               checking_wrmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull);
+       }
+       if (ds)
+               ds->bts_index = ds->bts_buffer_base;
+
+       local_irq_restore(flags);
+}
+
+static int p6_pmu_handle_irq(struct pt_regs *regs)
+{
+       struct perf_sample_data data;
+       struct cpu_hw_events *cpuc;
+       struct perf_event *event;
+       struct hw_perf_event *hwc;
+       int idx, handled = 0;
+       u64 val;
+
+       data.addr = 0;
+
+       cpuc = &__get_cpu_var(cpu_hw_events);
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+
+               event = cpuc->events[idx];
+               hwc = &event->hw;
+
+               val = x86_perf_event_update(event, hwc, idx);
+               if (val & (1ULL << (x86_pmu.event_bits - 1)))
+                       continue;
+
+               /*
+                * event overflow
+                */
+               handled         = 1;
+               data.period     = event->hw.last_period;
+
+               if (!x86_perf_event_set_period(event, hwc, idx))
+                       continue;
+
+               if (perf_event_overflow(event, 1, &data, regs))
+                       p6_pmu_disable_event(hwc, idx);
+       }
+
+       if (handled)
+               inc_irq_stat(apic_perf_irqs);
+
+       return handled;
+}
+
+/*
+ * This handler is triggered by the local APIC, so the APIC IRQ handling
+ * rules apply:
+ */
+static int intel_pmu_handle_irq(struct pt_regs *regs)
+{
+       struct perf_sample_data data;
+       struct cpu_hw_events *cpuc;
+       int bit, loops;
+       u64 ack, status;
+
+       data.addr = 0;
+
+       cpuc = &__get_cpu_var(cpu_hw_events);
+
+       perf_disable();
+       intel_pmu_drain_bts_buffer(cpuc);
+       status = intel_pmu_get_status();
+       if (!status) {
+               perf_enable();
+               return 0;
+       }
+
+       loops = 0;
+again:
+       if (++loops > 100) {
+               WARN_ONCE(1, "perfevents: irq loop stuck!\n");
+               perf_event_print_debug();
+               intel_pmu_reset();
+               perf_enable();
+               return 1;
+       }
+
+       inc_irq_stat(apic_perf_irqs);
+       ack = status;
+       for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
+               struct perf_event *event = cpuc->events[bit];
+
+               clear_bit(bit, (unsigned long *) &status);
+               if (!test_bit(bit, cpuc->active_mask))
+                       continue;
+
+               if (!intel_pmu_save_and_restart(event))
+                       continue;
+
+               data.period = event->hw.last_period;
+
+               if (perf_event_overflow(event, 1, &data, regs))
+                       intel_pmu_disable_event(&event->hw, bit);
+       }
+
+       intel_pmu_ack_status(ack);
+
+       /*
+        * Repeat if there is more work to be done:
+        */
+       status = intel_pmu_get_status();
+       if (status)
+               goto again;
+
+       perf_enable();
+
+       return 1;
+}
+
+static int amd_pmu_handle_irq(struct pt_regs *regs)
+{
+       struct perf_sample_data data;
+       struct cpu_hw_events *cpuc;
+       struct perf_event *event;
+       struct hw_perf_event *hwc;
+       int idx, handled = 0;
+       u64 val;
+
+       data.addr = 0;
+
+       cpuc = &__get_cpu_var(cpu_hw_events);
+
+       for (idx = 0; idx < x86_pmu.num_events; idx++) {
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+
+               event = cpuc->events[idx];
+               hwc = &event->hw;
+
+               val = x86_perf_event_update(event, hwc, idx);
+               if (val & (1ULL << (x86_pmu.event_bits - 1)))
+                       continue;
+
+               /*
+                * event overflow
+                */
+               handled         = 1;
+               data.period     = event->hw.last_period;
+
+               if (!x86_perf_event_set_period(event, hwc, idx))
+                       continue;
+
+               if (perf_event_overflow(event, 1, &data, regs))
+                       amd_pmu_disable_event(hwc, idx);
+       }
+
+       if (handled)
+               inc_irq_stat(apic_perf_irqs);
+
+       return handled;
+}
+
+void smp_perf_pending_interrupt(struct pt_regs *regs)
+{
+       irq_enter();
+       ack_APIC_irq();
+       inc_irq_stat(apic_pending_irqs);
+       perf_event_do_pending();
+       irq_exit();
+}
+
+void set_perf_event_pending(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+       apic->send_IPI_self(LOCAL_PENDING_VECTOR);
+#endif
+}
+
+void perf_events_lapic_init(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+       if (!x86_pmu.apic || !x86_pmu_initialized())
+               return;
+
+       /*
+        * Always use NMI for PMU
+        */
+       apic_write(APIC_LVTPC, APIC_DM_NMI);
+#endif
+}
+
+static int __kprobes
+perf_event_nmi_handler(struct notifier_block *self,
+                        unsigned long cmd, void *__args)
+{
+       struct die_args *args = __args;
+       struct pt_regs *regs;
+
+       if (!atomic_read(&active_events))
+               return NOTIFY_DONE;
+
+       switch (cmd) {
+       case DIE_NMI:
+       case DIE_NMI_IPI:
+               break;
+
+       default:
+               return NOTIFY_DONE;
+       }
+
+       regs = args->regs;
+
+#ifdef CONFIG_X86_LOCAL_APIC
+       apic_write(APIC_LVTPC, APIC_DM_NMI);
+#endif
+       /*
+        * Can't rely on the handled return value to say it was our NMI, two
+        * events could trigger 'simultaneously' raising two back-to-back NMIs.
+        *
+        * If the first NMI handles both, the latter will be empty and daze
+        * the CPU.
+        */
+       x86_pmu.handle_irq(regs);
+
+       return NOTIFY_STOP;
+}
+
+static __read_mostly struct notifier_block perf_event_nmi_notifier = {
+       .notifier_call          = perf_event_nmi_handler,
+       .next                   = NULL,
+       .priority               = 1
+};
+
+static struct x86_pmu p6_pmu = {
+       .name                   = "p6",
+       .handle_irq             = p6_pmu_handle_irq,
+       .disable_all            = p6_pmu_disable_all,
+       .enable_all             = p6_pmu_enable_all,
+       .enable                 = p6_pmu_enable_event,
+       .disable                = p6_pmu_disable_event,
+       .eventsel               = MSR_P6_EVNTSEL0,
+       .perfctr                = MSR_P6_PERFCTR0,
+       .event_map              = p6_pmu_event_map,
+       .raw_event              = p6_pmu_raw_event,
+       .max_events             = ARRAY_SIZE(p6_perfmon_event_map),
+       .apic                   = 1,
+       .max_period             = (1ULL << 31) - 1,
+       .version                = 0,
+       .num_events             = 2,
+       /*
+        * Events have 40 bits implemented. However they are designed such
+        * that bits [32-39] are sign extensions of bit 31. As such the
+        * effective width of a event for P6-like PMU is 32 bits only.
+        *
+        * See IA-32 Intel Architecture Software developer manual Vol 3B
+        */
+       .event_bits             = 32,
+       .event_mask             = (1ULL << 32) - 1,
+};
+
+static struct x86_pmu intel_pmu = {
+       .name                   = "Intel",
+       .handle_irq             = intel_pmu_handle_irq,
+       .disable_all            = intel_pmu_disable_all,
+       .enable_all             = intel_pmu_enable_all,
+       .enable                 = intel_pmu_enable_event,
+       .disable                = intel_pmu_disable_event,
+       .eventsel               = MSR_ARCH_PERFMON_EVENTSEL0,
+       .perfctr                = MSR_ARCH_PERFMON_PERFCTR0,
+       .event_map              = intel_pmu_event_map,
+       .raw_event              = intel_pmu_raw_event,
+       .max_events             = ARRAY_SIZE(intel_perfmon_event_map),
+       .apic                   = 1,
+       /*
+        * Intel PMCs cannot be accessed sanely above 32 bit width,
+        * so we install an artificial 1<<31 period regardless of
+        * the generic event period:
+        */
+       .max_period             = (1ULL << 31) - 1,
+       .enable_bts             = intel_pmu_enable_bts,
+       .disable_bts            = intel_pmu_disable_bts,
+};
+
+static struct x86_pmu amd_pmu = {
+       .name                   = "AMD",
+       .handle_irq             = amd_pmu_handle_irq,
+       .disable_all            = amd_pmu_disable_all,
+       .enable_all             = amd_pmu_enable_all,
+       .enable                 = amd_pmu_enable_event,
+       .disable                = amd_pmu_disable_event,
+       .eventsel               = MSR_K7_EVNTSEL0,
+       .perfctr                = MSR_K7_PERFCTR0,
+       .event_map              = amd_pmu_event_map,
+       .raw_event              = amd_pmu_raw_event,
+       .max_events             = ARRAY_SIZE(amd_perfmon_event_map),
+       .num_events             = 4,
+       .event_bits             = 48,
+       .event_mask             = (1ULL << 48) - 1,
+       .apic                   = 1,
+       /* use highest bit to detect overflow */
+       .max_period             = (1ULL << 47) - 1,
+};
+
+static int p6_pmu_init(void)
+{
+       switch (boot_cpu_data.x86_model) {
+       case 1:
+       case 3:  /* Pentium Pro */
+       case 5:
+       case 6:  /* Pentium II */
+       case 7:
+       case 8:
+       case 11: /* Pentium III */
+               break;
+       case 9:
+       case 13:
+               /* Pentium M */
+               break;
+       default:
+               pr_cont("unsupported p6 CPU model %d ",
+                       boot_cpu_data.x86_model);
+               return -ENODEV;
+       }
+
+       x86_pmu = p6_pmu;
+
+       if (!cpu_has_apic) {
+               pr_info("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n");
+               pr_info("no hardware sampling interrupt available.\n");
+               x86_pmu.apic = 0;
+       }
+
+       return 0;
+}
+
+static int intel_pmu_init(void)
+{
+       union cpuid10_edx edx;
+       union cpuid10_eax eax;
+       unsigned int unused;
+       unsigned int ebx;
+       int version;
+
+       if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {
+               /* check for P6 processor family */
+          if (boot_cpu_data.x86 == 6) {
+               return p6_pmu_init();
+          } else {
+               return -ENODEV;
+          }
+       }
+
+       /*
+        * Check whether the Architectural PerfMon supports
+        * Branch Misses Retired hw_event or not.
+        */
+       cpuid(10, &eax.full, &ebx, &unused, &edx.full);
+       if (eax.split.mask_length <= ARCH_PERFMON_BRANCH_MISSES_RETIRED)
+               return -ENODEV;
+
+       version = eax.split.version_id;
+       if (version < 2)
+               return -ENODEV;
+
+       x86_pmu                         = intel_pmu;
+       x86_pmu.version                 = version;
+       x86_pmu.num_events              = eax.split.num_events;
+       x86_pmu.event_bits              = eax.split.bit_width;
+       x86_pmu.event_mask              = (1ULL << eax.split.bit_width) - 1;
+
+       /*
+        * Quirk: v2 perfmon does not report fixed-purpose events, so
+        * assume at least 3 events:
+        */
+       x86_pmu.num_events_fixed        = max((int)edx.split.num_events_fixed, 3);
+
+       /*
+        * Install the hw-cache-events table:
+        */
+       switch (boot_cpu_data.x86_model) {
+       case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */
+       case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */
+       case 23: /* current 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */
+       case 29: /* six-core 45 nm xeon "Dunnington" */
+               memcpy(hw_cache_event_ids, core2_hw_cache_event_ids,
+                      sizeof(hw_cache_event_ids));
+
+               pr_cont("Core2 events, ");
+               break;
+       default:
+       case 26:
+               memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
+                      sizeof(hw_cache_event_ids));
+
+               pr_cont("Nehalem/Corei7 events, ");
+               break;
+       case 28:
+               memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,
+                      sizeof(hw_cache_event_ids));
+
+               pr_cont("Atom events, ");
+               break;
+       }
+       return 0;
+}
+
+static int amd_pmu_init(void)
+{
+       /* Performance-monitoring supported from K7 and later: */
+       if (boot_cpu_data.x86 < 6)
+               return -ENODEV;
+
+       x86_pmu = amd_pmu;
+
+       /* Events are common for all AMDs */
+       memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
+              sizeof(hw_cache_event_ids));
+
+       return 0;
+}
+
+void __init init_hw_perf_events(void)
+{
+       int err;
+
+       pr_info("Performance Events: ");
+
+       switch (boot_cpu_data.x86_vendor) {
+       case X86_VENDOR_INTEL:
+               err = intel_pmu_init();
+               break;
+       case X86_VENDOR_AMD:
+               err = amd_pmu_init();
+               break;
+       default:
+               return;
+       }
+       if (err != 0) {
+               pr_cont("no PMU driver, software events only.\n");
+               return;
+       }
+
+       pr_cont("%s PMU driver.\n", x86_pmu.name);
+
+       if (x86_pmu.num_events > X86_PMC_MAX_GENERIC) {
+               WARN(1, KERN_ERR "hw perf events %d > max(%d), clipping!",
+                    x86_pmu.num_events, X86_PMC_MAX_GENERIC);
+               x86_pmu.num_events = X86_PMC_MAX_GENERIC;
+       }
+       perf_event_mask = (1 << x86_pmu.num_events) - 1;
+       perf_max_events = x86_pmu.num_events;
+
+       if (x86_pmu.num_events_fixed > X86_PMC_MAX_FIXED) {
+               WARN(1, KERN_ERR "hw perf events fixed %d > max(%d), clipping!",
+                    x86_pmu.num_events_fixed, X86_PMC_MAX_FIXED);
+               x86_pmu.num_events_fixed = X86_PMC_MAX_FIXED;
+       }
+
+       perf_event_mask |=
+               ((1LL << x86_pmu.num_events_fixed)-1) << X86_PMC_IDX_FIXED;
+       x86_pmu.intel_ctrl = perf_event_mask;
+
+       perf_events_lapic_init();
+       register_die_notifier(&perf_event_nmi_notifier);
+
+       pr_info("... version:                %d\n",     x86_pmu.version);
+       pr_info("... bit width:              %d\n",     x86_pmu.event_bits);
+       pr_info("... generic registers:      %d\n",     x86_pmu.num_events);
+       pr_info("... value mask:             %016Lx\n", x86_pmu.event_mask);
+       pr_info("... max period:             %016Lx\n", x86_pmu.max_period);
+       pr_info("... fixed-purpose events:   %d\n",     x86_pmu.num_events_fixed);
+       pr_info("... event mask:             %016Lx\n", perf_event_mask);
+}
+
+static inline void x86_pmu_read(struct perf_event *event)
+{
+       x86_perf_event_update(event, &event->hw, event->hw.idx);
+}
+
+static const struct pmu pmu = {
+       .enable         = x86_pmu_enable,
+       .disable        = x86_pmu_disable,
+       .read           = x86_pmu_read,
+       .unthrottle     = x86_pmu_unthrottle,
+};
+
+const struct pmu *hw_perf_event_init(struct perf_event *event)
+{
+       int err;
+
+       err = __hw_perf_event_init(event);
+       if (err) {
+               if (event->destroy)
+                       event->destroy(event);
+               return ERR_PTR(err);
+       }
+
+       return &pmu;
+}
+
+/*
+ * callchain support
+ */
+
+static inline
+void callchain_store(struct perf_callchain_entry *entry, u64 ip)
+{
+       if (entry->nr < PERF_MAX_STACK_DEPTH)
+               entry->ip[entry->nr++] = ip;
+}
+
+static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry);
+static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry);
+static DEFINE_PER_CPU(int, in_nmi_frame);
+
+
+static void
+backtrace_warning_symbol(void *data, char *msg, unsigned long symbol)
+{
+       /* Ignore warnings */
+}
+
+static void backtrace_warning(void *data, char *msg)
+{
+       /* Ignore warnings */
+}
+
+static int backtrace_stack(void *data, char *name)
+{
+       per_cpu(in_nmi_frame, smp_processor_id()) =
+                       x86_is_stack_id(NMI_STACK, name);
+
+       return 0;
+}
+
+static void backtrace_address(void *data, unsigned long addr, int reliable)
+{
+       struct perf_callchain_entry *entry = data;
+
+       if (per_cpu(in_nmi_frame, smp_processor_id()))
+               return;
+
+       if (reliable)
+               callchain_store(entry, addr);
+}
+
+static const struct stacktrace_ops backtrace_ops = {
+       .warning                = backtrace_warning,
+       .warning_symbol         = backtrace_warning_symbol,
+       .stack                  = backtrace_stack,
+       .address                = backtrace_address,
+};
+
+#include "../dumpstack.h"
+
+static void
+perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       callchain_store(entry, PERF_CONTEXT_KERNEL);
+       callchain_store(entry, regs->ip);
+
+       dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry);
+}
+
+/*
+ * best effort, GUP based copy_from_user() that assumes IRQ or NMI context
+ */
+static unsigned long
+copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
+{
+       unsigned long offset, addr = (unsigned long)from;
+       int type = in_nmi() ? KM_NMI : KM_IRQ0;
+       unsigned long size, len = 0;
+       struct page *page;
+       void *map;
+       int ret;
+
+       do {
+               ret = __get_user_pages_fast(addr, 1, 0, &page);
+               if (!ret)
+                       break;
+
+               offset = addr & (PAGE_SIZE - 1);
+               size = min(PAGE_SIZE - offset, n - len);
+
+               map = kmap_atomic(page, type);
+               memcpy(to, map+offset, size);
+               kunmap_atomic(map, type);
+               put_page(page);
+
+               len  += size;
+               to   += size;
+               addr += size;
+
+       } while (len < n);
+
+       return len;
+}
+
+static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
+{
+       unsigned long bytes;
+
+       bytes = copy_from_user_nmi(frame, fp, sizeof(*frame));
+
+       return bytes == sizeof(*frame);
+}
+
+static void
+perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       struct stack_frame frame;
+       const void __user *fp;
+
+       if (!user_mode(regs))
+               regs = task_pt_regs(current);
+
+       fp = (void __user *)regs->bp;
+
+       callchain_store(entry, PERF_CONTEXT_USER);
+       callchain_store(entry, regs->ip);
+
+       while (entry->nr < PERF_MAX_STACK_DEPTH) {
+               frame.next_frame             = NULL;
+               frame.return_address = 0;
+
+               if (!copy_stack_frame(fp, &frame))
+                       break;
+
+               if ((unsigned long)fp < regs->sp)
+                       break;
+
+               callchain_store(entry, frame.return_address);
+               fp = frame.next_frame;
+       }
+}
+
+static void
+perf_do_callchain(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       int is_user;
+
+       if (!regs)
+               return;
+
+       is_user = user_mode(regs);
+
+       if (!current || current->pid == 0)
+               return;
+
+       if (is_user && current->state != TASK_RUNNING)
+               return;
+
+       if (!is_user)
+               perf_callchain_kernel(regs, entry);
+
+       if (current->mm)
+               perf_callchain_user(regs, entry);
+}
+
+struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
+{
+       struct perf_callchain_entry *entry;
+
+       if (in_nmi())
+               entry = &__get_cpu_var(pmc_nmi_entry);
+       else
+               entry = &__get_cpu_var(pmc_irq_entry);
+
+       entry->nr = 0;
+
+       perf_do_callchain(regs, entry);
+
+       return entry;
+}
+
+void hw_perf_event_setup_online(int cpu)
+{
+       init_debug_store_on_cpu(cpu);
+}
index 392bea4..fab786f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/kprobes.h>
 
 #include <asm/apic.h>
-#include <asm/perf_counter.h>
+#include <asm/perf_event.h>
 
 struct nmi_watchdog_ctlblk {
        unsigned int cccr_msr;
index 0a46b4d..1cbed97 100644 (file)
@@ -58,6 +58,9 @@ static unsigned long vmware_get_tsc_khz(void)
        tsc_hz = eax | (((uint64_t)ebx) << 32);
        do_div(tsc_hz, 1000);
        BUG_ON(tsc_hz >> 32);
+       printk(KERN_INFO "TSC freq read from hypervisor : %lu.%03lu MHz\n",
+                        (unsigned long) tsc_hz / 1000,
+                        (unsigned long) tsc_hz % 1000);
        return tsc_hz;
 }
 
@@ -69,6 +72,9 @@ void __init vmware_platform_setup(void)
 
        if (ebx != UINT_MAX)
                x86_platform.calibrate_tsc = vmware_get_tsc_khz;
+       else
+               printk(KERN_WARNING
+                      "Failed to get TSC freq from the hypervisor\n");
 }
 
 /*
index b07af88..6a52d4b 100644 (file)
@@ -182,7 +182,7 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier =
        .notifier_call = cpuid_class_cpu_callback,
 };
 
-static char *cpuid_nodename(struct device *dev)
+static char *cpuid_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));
 }
@@ -203,7 +203,7 @@ static int __init cpuid_init(void)
                err = PTR_ERR(cpuid_class);
                goto out_chrdev;
        }
-       cpuid_class->nodename = cpuid_nodename;
+       cpuid_class->devnode = cpuid_devnode;
        for_each_online_cpu(i) {
                err = cpuid_device_create(i);
                if (err != 0)
index a3210ce..85419bb 100644 (file)
@@ -1331,7 +1331,7 @@ void __init e820_reserve_resources(void)
        struct resource *res;
        u64 end;
 
-       res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);
+       res = alloc_bootmem(sizeof(struct resource) * e820.nr_map);
        e820_res = res;
        for (i = 0; i < e820.nr_map; i++) {
                end = e820.map[i].addr + e820.map[i].size - 1;
index 335f049..2acfd3f 100644 (file)
@@ -160,721 +160,6 @@ static struct console early_serial_console = {
        .index =        -1,
 };
 
-#ifdef CONFIG_EARLY_PRINTK_DBGP
-
-static struct ehci_caps __iomem *ehci_caps;
-static struct ehci_regs __iomem *ehci_regs;
-static struct ehci_dbg_port __iomem *ehci_debug;
-static unsigned int dbgp_endpoint_out;
-
-struct ehci_dev {
-       u32 bus;
-       u32 slot;
-       u32 func;
-};
-
-static struct ehci_dev ehci_dev;
-
-#define USB_DEBUG_DEVNUM 127
-
-#define DBGP_DATA_TOGGLE       0x8800
-
-static inline u32 dbgp_pid_update(u32 x, u32 tok)
-{
-       return ((x ^ DBGP_DATA_TOGGLE) & 0xffff00) | (tok & 0xff);
-}
-
-static inline u32 dbgp_len_update(u32 x, u32 len)
-{
-       return (x & ~0x0f) | (len & 0x0f);
-}
-
-/*
- * USB Packet IDs (PIDs)
- */
-
-/* token */
-#define USB_PID_OUT            0xe1
-#define USB_PID_IN             0x69
-#define USB_PID_SOF            0xa5
-#define USB_PID_SETUP          0x2d
-/* handshake */
-#define USB_PID_ACK            0xd2
-#define USB_PID_NAK            0x5a
-#define USB_PID_STALL          0x1e
-#define USB_PID_NYET           0x96
-/* data */
-#define USB_PID_DATA0          0xc3
-#define USB_PID_DATA1          0x4b
-#define USB_PID_DATA2          0x87
-#define USB_PID_MDATA          0x0f
-/* Special */
-#define USB_PID_PREAMBLE       0x3c
-#define USB_PID_ERR            0x3c
-#define USB_PID_SPLIT          0x78
-#define USB_PID_PING           0xb4
-#define USB_PID_UNDEF_0                0xf0
-
-#define USB_PID_DATA_TOGGLE    0x88
-#define DBGP_CLAIM (DBGP_OWNER | DBGP_ENABLED | DBGP_INUSE)
-
-#define PCI_CAP_ID_EHCI_DEBUG  0xa
-
-#define HUB_ROOT_RESET_TIME    50      /* times are in msec */
-#define HUB_SHORT_RESET_TIME   10
-#define HUB_LONG_RESET_TIME    200
-#define HUB_RESET_TIMEOUT      500
-
-#define DBGP_MAX_PACKET                8
-
-static int dbgp_wait_until_complete(void)
-{
-       u32 ctrl;
-       int loop = 0x100000;
-
-       do {
-               ctrl = readl(&ehci_debug->control);
-               /* Stop when the transaction is finished */
-               if (ctrl & DBGP_DONE)
-                       break;
-       } while (--loop > 0);
-
-       if (!loop)
-               return -1;
-
-       /*
-        * Now that we have observed the completed transaction,
-        * clear the done bit.
-        */
-       writel(ctrl | DBGP_DONE, &ehci_debug->control);
-       return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);
-}
-
-static void __init dbgp_mdelay(int ms)
-{
-       int i;
-
-       while (ms--) {
-               for (i = 0; i < 1000; i++)
-                       outb(0x1, 0x80);
-       }
-}
-
-static void dbgp_breath(void)
-{
-       /* Sleep to give the debug port a chance to breathe */
-}
-
-static int dbgp_wait_until_done(unsigned ctrl)
-{
-       u32 pids, lpid;
-       int ret;
-       int loop = 3;
-
-retry:
-       writel(ctrl | DBGP_GO, &ehci_debug->control);
-       ret = dbgp_wait_until_complete();
-       pids = readl(&ehci_debug->pids);
-       lpid = DBGP_PID_GET(pids);
-
-       if (ret < 0)
-               return ret;
-
-       /*
-        * If the port is getting full or it has dropped data
-        * start pacing ourselves, not necessary but it's friendly.
-        */
-       if ((lpid == USB_PID_NAK) || (lpid == USB_PID_NYET))
-               dbgp_breath();
-
-       /* If I get a NACK reissue the transmission */
-       if (lpid == USB_PID_NAK) {
-               if (--loop > 0)
-                       goto retry;
-       }
-
-       return ret;
-}
-
-static void dbgp_set_data(const void *buf, int size)
-{
-       const unsigned char *bytes = buf;
-       u32 lo, hi;
-       int i;
-
-       lo = hi = 0;
-       for (i = 0; i < 4 && i < size; i++)
-               lo |= bytes[i] << (8*i);
-       for (; i < 8 && i < size; i++)
-               hi |= bytes[i] << (8*(i - 4));
-       writel(lo, &ehci_debug->data03);
-       writel(hi, &ehci_debug->data47);
-}
-
-static void __init dbgp_get_data(void *buf, int size)
-{
-       unsigned char *bytes = buf;
-       u32 lo, hi;
-       int i;
-
-       lo = readl(&ehci_debug->data03);
-       hi = readl(&ehci_debug->data47);
-       for (i = 0; i < 4 && i < size; i++)
-               bytes[i] = (lo >> (8*i)) & 0xff;
-       for (; i < 8 && i < size; i++)
-               bytes[i] = (hi >> (8*(i - 4))) & 0xff;
-}
-
-static int dbgp_bulk_write(unsigned devnum, unsigned endpoint,
-                        const char *bytes, int size)
-{
-       u32 pids, addr, ctrl;
-       int ret;
-
-       if (size > DBGP_MAX_PACKET)
-               return -1;
-
-       addr = DBGP_EPADDR(devnum, endpoint);
-
-       pids = readl(&ehci_debug->pids);
-       pids = dbgp_pid_update(pids, USB_PID_OUT);
-
-       ctrl = readl(&ehci_debug->control);
-       ctrl = dbgp_len_update(ctrl, size);
-       ctrl |= DBGP_OUT;
-       ctrl |= DBGP_GO;
-
-       dbgp_set_data(bytes, size);
-       writel(addr, &ehci_debug->address);
-       writel(pids, &ehci_debug->pids);
-
-       ret = dbgp_wait_until_done(ctrl);
-       if (ret < 0)
-               return ret;
-
-       return ret;
-}
-
-static int __init dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data,
-                                int size)
-{
-       u32 pids, addr, ctrl;
-       int ret;
-
-       if (size > DBGP_MAX_PACKET)
-               return -1;
-
-       addr = DBGP_EPADDR(devnum, endpoint);
-
-       pids = readl(&ehci_debug->pids);
-       pids = dbgp_pid_update(pids, USB_PID_IN);
-
-       ctrl = readl(&ehci_debug->control);
-       ctrl = dbgp_len_update(ctrl, size);
-       ctrl &= ~DBGP_OUT;
-       ctrl |= DBGP_GO;
-
-       writel(addr, &ehci_debug->address);
-       writel(pids, &ehci_debug->pids);
-       ret = dbgp_wait_until_done(ctrl);
-       if (ret < 0)
-               return ret;
-
-       if (size > ret)
-               size = ret;
-       dbgp_get_data(data, size);
-       return ret;
-}
-
-static int __init dbgp_control_msg(unsigned devnum, int requesttype,
-       int request, int value, int index, void *data, int size)
-{
-       u32 pids, addr, ctrl;
-       struct usb_ctrlrequest req;
-       int read;
-       int ret;
-
-       read = (requesttype & USB_DIR_IN) != 0;
-       if (size > (read ? DBGP_MAX_PACKET:0))
-               return -1;
-
-       /* Compute the control message */
-       req.bRequestType = requesttype;
-       req.bRequest = request;
-       req.wValue = cpu_to_le16(value);
-       req.wIndex = cpu_to_le16(index);
-       req.wLength = cpu_to_le16(size);
-
-       pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);
-       addr = DBGP_EPADDR(devnum, 0);
-
-       ctrl = readl(&ehci_debug->control);
-       ctrl = dbgp_len_update(ctrl, sizeof(req));
-       ctrl |= DBGP_OUT;
-       ctrl |= DBGP_GO;
-
-       /* Send the setup message */
-       dbgp_set_data(&req, sizeof(req));
-       writel(addr, &ehci_debug->address);
-       writel(pids, &ehci_debug->pids);
-       ret = dbgp_wait_until_done(ctrl);
-       if (ret < 0)
-               return ret;
-
-       /* Read the result */
-       return dbgp_bulk_read(devnum, 0, data, size);
-}
-
-
-/* Find a PCI capability */
-static u32 __init find_cap(u32 num, u32 slot, u32 func, int cap)
-{
-       u8 pos;
-       int bytes;
-
-       if (!(read_pci_config_16(num, slot, func, PCI_STATUS) &
-               PCI_STATUS_CAP_LIST))
-               return 0;
-
-       pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST);
-       for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) {
-               u8 id;
-
-               pos &= ~3;
-               id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID);
-               if (id == 0xff)
-                       break;
-               if (id == cap)
-                       return pos;
-
-               pos = read_pci_config_byte(num, slot, func,
-                                                pos+PCI_CAP_LIST_NEXT);
-       }
-       return 0;
-}
-
-static u32 __init __find_dbgp(u32 bus, u32 slot, u32 func)
-{
-       u32 class;
-
-       class = read_pci_config(bus, slot, func, PCI_CLASS_REVISION);
-       if ((class >> 8) != PCI_CLASS_SERIAL_USB_EHCI)
-               return 0;
-
-       return find_cap(bus, slot, func, PCI_CAP_ID_EHCI_DEBUG);
-}
-
-static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc)
-{
-       u32 bus, slot, func;
-
-       for (bus = 0; bus < 256; bus++) {
-               for (slot = 0; slot < 32; slot++) {
-                       for (func = 0; func < 8; func++) {
-                               unsigned cap;
-
-                               cap = __find_dbgp(bus, slot, func);
-
-                               if (!cap)
-                                       continue;
-                               if (ehci_num-- != 0)
-                                       continue;
-                               *rbus = bus;
-                               *rslot = slot;
-                               *rfunc = func;
-                               return cap;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int __init ehci_reset_port(int port)
-{
-       u32 portsc;
-       u32 delay_time, delay;
-       int loop;
-
-       /* Reset the usb debug port */
-       portsc = readl(&ehci_regs->port_status[port - 1]);
-       portsc &= ~PORT_PE;
-       portsc |= PORT_RESET;
-       writel(portsc, &ehci_regs->port_status[port - 1]);
-
-       delay = HUB_ROOT_RESET_TIME;
-       for (delay_time = 0; delay_time < HUB_RESET_TIMEOUT;
-            delay_time += delay) {
-               dbgp_mdelay(delay);
-
-               portsc = readl(&ehci_regs->port_status[port - 1]);
-               if (portsc & PORT_RESET) {
-                       /* force reset to complete */
-                       loop = 2;
-                       writel(portsc & ~(PORT_RWC_BITS | PORT_RESET),
-                               &ehci_regs->port_status[port - 1]);
-                       do {
-                               portsc = readl(&ehci_regs->port_status[port-1]);
-                       } while ((portsc & PORT_RESET) && (--loop > 0));
-               }
-
-               /* Device went away? */
-               if (!(portsc & PORT_CONNECT))
-                       return -ENOTCONN;
-
-               /* bomb out completely if something weird happend */
-               if ((portsc & PORT_CSC))
-                       return -EINVAL;
-
-               /* If we've finished resetting, then break out of the loop */
-               if (!(portsc & PORT_RESET) && (portsc & PORT_PE))
-                       return 0;
-       }
-       return -EBUSY;
-}
-
-static int __init ehci_wait_for_port(int port)
-{
-       u32 status;
-       int ret, reps;
-
-       for (reps = 0; reps < 3; reps++) {
-               dbgp_mdelay(100);
-               status = readl(&ehci_regs->status);
-               if (status & STS_PCD) {
-                       ret = ehci_reset_port(port);
-                       if (ret == 0)
-                               return 0;
-               }
-       }
-       return -ENOTCONN;
-}
-
-#ifdef DBGP_DEBUG
-# define dbgp_printk early_printk
-#else
-static inline void dbgp_printk(const char *fmt, ...) { }
-#endif
-
-typedef void (*set_debug_port_t)(int port);
-
-static void __init default_set_debug_port(int port)
-{
-}
-
-static set_debug_port_t __initdata set_debug_port = default_set_debug_port;
-
-static void __init nvidia_set_debug_port(int port)
-{
-       u32 dword;
-       dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
-                                0x74);
-       dword &= ~(0x0f<<12);
-       dword |= ((port & 0x0f)<<12);
-       write_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, 0x74,
-                                dword);
-       dbgp_printk("set debug port to %d\n", port);
-}
-
-static void __init detect_set_debug_port(void)
-{
-       u32 vendorid;
-
-       vendorid = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
-                0x00);
-
-       if ((vendorid & 0xffff) == 0x10de) {
-               dbgp_printk("using nvidia set_debug_port\n");
-               set_debug_port = nvidia_set_debug_port;
-       }
-}
-
-static int __init ehci_setup(void)
-{
-       struct usb_debug_descriptor dbgp_desc;
-       u32 cmd, ctrl, status, portsc, hcs_params;
-       u32 debug_port, new_debug_port = 0, n_ports;
-       u32  devnum;
-       int ret, i;
-       int loop;
-       int port_map_tried;
-       int playtimes = 3;
-
-try_next_time:
-       port_map_tried = 0;
-
-try_next_port:
-
-       hcs_params = readl(&ehci_caps->hcs_params);
-       debug_port = HCS_DEBUG_PORT(hcs_params);
-       n_ports    = HCS_N_PORTS(hcs_params);
-
-       dbgp_printk("debug_port: %d\n", debug_port);
-       dbgp_printk("n_ports:    %d\n", n_ports);
-
-       for (i = 1; i <= n_ports; i++) {
-               portsc = readl(&ehci_regs->port_status[i-1]);
-               dbgp_printk("portstatus%d: %08x\n", i, portsc);
-       }
-
-       if (port_map_tried && (new_debug_port != debug_port)) {
-               if (--playtimes) {
-                       set_debug_port(new_debug_port);
-                       goto try_next_time;
-               }
-               return -1;
-       }
-
-       loop = 10;
-       /* Reset the EHCI controller */
-       cmd = readl(&ehci_regs->command);
-       cmd |= CMD_RESET;
-       writel(cmd, &ehci_regs->command);
-       do {
-               cmd = readl(&ehci_regs->command);
-       } while ((cmd & CMD_RESET) && (--loop > 0));
-
-       if (!loop) {
-               dbgp_printk("can not reset ehci\n");
-               return -1;
-       }
-       dbgp_printk("ehci reset done\n");
-
-       /* Claim ownership, but do not enable yet */
-       ctrl = readl(&ehci_debug->control);
-       ctrl |= DBGP_OWNER;
-       ctrl &= ~(DBGP_ENABLED | DBGP_INUSE);
-       writel(ctrl, &ehci_debug->control);
-
-       /* Start the ehci running */
-       cmd = readl(&ehci_regs->command);
-       cmd &= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET);
-       cmd |= CMD_RUN;
-       writel(cmd, &ehci_regs->command);
-
-       /* Ensure everything is routed to the EHCI */
-       writel(FLAG_CF, &ehci_regs->configured_flag);
-
-       /* Wait until the controller is no longer halted */
-       loop = 10;
-       do {
-               status = readl(&ehci_regs->status);
-       } while ((status & STS_HALT) && (--loop > 0));
-
-       if (!loop) {
-               dbgp_printk("ehci can be started\n");
-               return -1;
-       }
-       dbgp_printk("ehci started\n");
-
-       /* Wait for a device to show up in the debug port */
-       ret = ehci_wait_for_port(debug_port);
-       if (ret < 0) {
-               dbgp_printk("No device found in debug port\n");
-               goto next_debug_port;
-       }
-       dbgp_printk("ehci wait for port done\n");
-
-       /* Enable the debug port */
-       ctrl = readl(&ehci_debug->control);
-       ctrl |= DBGP_CLAIM;
-       writel(ctrl, &ehci_debug->control);
-       ctrl = readl(&ehci_debug->control);
-       if ((ctrl & DBGP_CLAIM) != DBGP_CLAIM) {
-               dbgp_printk("No device in debug port\n");
-               writel(ctrl & ~DBGP_CLAIM, &ehci_debug->control);
-               goto err;
-       }
-       dbgp_printk("debug ported enabled\n");
-
-       /* Completely transfer the debug device to the debug controller */
-       portsc = readl(&ehci_regs->port_status[debug_port - 1]);
-       portsc &= ~PORT_PE;
-       writel(portsc, &ehci_regs->port_status[debug_port - 1]);
-
-       dbgp_mdelay(100);
-
-       /* Find the debug device and make it device number 127 */
-       for (devnum = 0; devnum <= 127; devnum++) {
-               ret = dbgp_control_msg(devnum,
-                       USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-                       USB_REQ_GET_DESCRIPTOR, (USB_DT_DEBUG << 8), 0,
-                       &dbgp_desc, sizeof(dbgp_desc));
-               if (ret > 0)
-                       break;
-       }
-       if (devnum > 127) {
-               dbgp_printk("Could not find attached debug device\n");
-               goto err;
-       }
-       if (ret < 0) {
-               dbgp_printk("Attached device is not a debug device\n");
-               goto err;
-       }
-       dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint;
-
-       /* Move the device to 127 if it isn't already there */
-       if (devnum != USB_DEBUG_DEVNUM) {
-               ret = dbgp_control_msg(devnum,
-                       USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-                       USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, NULL, 0);
-               if (ret < 0) {
-                       dbgp_printk("Could not move attached device to %d\n",
-                               USB_DEBUG_DEVNUM);
-                       goto err;
-               }
-               devnum = USB_DEBUG_DEVNUM;
-               dbgp_printk("debug device renamed to 127\n");
-       }
-
-       /* Enable the debug interface */
-       ret = dbgp_control_msg(USB_DEBUG_DEVNUM,
-               USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-               USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, NULL, 0);
-       if (ret < 0) {
-               dbgp_printk(" Could not enable the debug device\n");
-               goto err;
-       }
-       dbgp_printk("debug interface enabled\n");
-
-       /* Perform a small write to get the even/odd data state in sync
-        */
-       ret = dbgp_bulk_write(USB_DEBUG_DEVNUM, dbgp_endpoint_out, " ", 1);
-       if (ret < 0) {
-               dbgp_printk("dbgp_bulk_write failed: %d\n", ret);
-               goto err;
-       }
-       dbgp_printk("small write doned\n");
-
-       return 0;
-err:
-       /* Things didn't work so remove my claim */
-       ctrl = readl(&ehci_debug->control);
-       ctrl &= ~(DBGP_CLAIM | DBGP_OUT);
-       writel(ctrl, &ehci_debug->control);
-       return -1;
-
-next_debug_port:
-       port_map_tried |= (1<<(debug_port - 1));
-       new_debug_port = ((debug_port-1+1)%n_ports) + 1;
-       if (port_map_tried != ((1<<n_ports) - 1)) {
-               set_debug_port(new_debug_port);
-               goto try_next_port;
-       }
-       if (--playtimes) {
-               set_debug_port(new_debug_port);
-               goto try_next_time;
-       }
-
-       return -1;
-}
-
-static int __init early_dbgp_init(char *s)
-{
-       u32 debug_port, bar, offset;
-       u32 bus, slot, func, cap;
-       void __iomem *ehci_bar;
-       u32 dbgp_num;
-       u32 bar_val;
-       char *e;
-       int ret;
-       u8 byte;
-
-       if (!early_pci_allowed())
-               return -1;
-
-       dbgp_num = 0;
-       if (*s)
-               dbgp_num = simple_strtoul(s, &e, 10);
-       dbgp_printk("dbgp_num: %d\n", dbgp_num);
-
-       cap = find_dbgp(dbgp_num, &bus, &slot, &func);
-       if (!cap)
-               return -1;
-
-       dbgp_printk("Found EHCI debug port on %02x:%02x.%1x\n", bus, slot,
-                        func);
-
-       debug_port = read_pci_config(bus, slot, func, cap);
-       bar = (debug_port >> 29) & 0x7;
-       bar = (bar * 4) + 0xc;
-       offset = (debug_port >> 16) & 0xfff;
-       dbgp_printk("bar: %02x offset: %03x\n", bar, offset);
-       if (bar != PCI_BASE_ADDRESS_0) {
-               dbgp_printk("only debug ports on bar 1 handled.\n");
-
-               return -1;
-       }
-
-       bar_val = read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_0);
-       dbgp_printk("bar_val: %02x offset: %03x\n", bar_val, offset);
-       if (bar_val & ~PCI_BASE_ADDRESS_MEM_MASK) {
-               dbgp_printk("only simple 32bit mmio bars supported\n");
-
-               return -1;
-       }
-
-       /* double check if the mem space is enabled */
-       byte = read_pci_config_byte(bus, slot, func, 0x04);
-       if (!(byte & 0x2)) {
-               byte  |= 0x02;
-               write_pci_config_byte(bus, slot, func, 0x04, byte);
-               dbgp_printk("mmio for ehci enabled\n");
-       }
-
-       /*
-        * FIXME I don't have the bar size so just guess PAGE_SIZE is more
-        * than enough.  1K is the biggest I have seen.
-        */
-       set_fixmap_nocache(FIX_DBGP_BASE, bar_val & PAGE_MASK);
-       ehci_bar = (void __iomem *)__fix_to_virt(FIX_DBGP_BASE);
-       ehci_bar += bar_val & ~PAGE_MASK;
-       dbgp_printk("ehci_bar: %p\n", ehci_bar);
-
-       ehci_caps  = ehci_bar;
-       ehci_regs  = ehci_bar + HC_LENGTH(readl(&ehci_caps->hc_capbase));
-       ehci_debug = ehci_bar + offset;
-       ehci_dev.bus = bus;
-       ehci_dev.slot = slot;
-       ehci_dev.func = func;
-
-       detect_set_debug_port();
-
-       ret = ehci_setup();
-       if (ret < 0) {
-               dbgp_printk("ehci_setup failed\n");
-               ehci_debug = NULL;
-
-               return -1;
-       }
-
-       return 0;
-}
-
-static void early_dbgp_write(struct console *con, const char *str, u32 n)
-{
-       int chunk, ret;
-
-       if (!ehci_debug)
-               return;
-       while (n > 0) {
-               chunk = n;
-               if (chunk > DBGP_MAX_PACKET)
-                       chunk = DBGP_MAX_PACKET;
-               ret = dbgp_bulk_write(USB_DEBUG_DEVNUM,
-                       dbgp_endpoint_out, str, chunk);
-               str += chunk;
-               n -= chunk;
-       }
-}
-
-static struct console early_dbgp_console = {
-       .name =         "earlydbg",
-       .write =        early_dbgp_write,
-       .flags =        CON_PRINTBUFFER,
-       .index =        -1,
-};
-#endif
-
 /* Direct interface for emergencies */
 static struct console *early_console = &early_vga_console;
 static int __initdata early_console_initialized;
@@ -891,10 +176,19 @@ asmlinkage void early_printk(const char *fmt, ...)
        va_end(ap);
 }
 
+static inline void early_console_register(struct console *con, int keep_early)
+{
+       early_console = con;
+       if (keep_early)
+               early_console->flags &= ~CON_BOOT;
+       else
+               early_console->flags |= CON_BOOT;
+       register_console(early_console);
+}
 
 static int __init setup_early_printk(char *buf)
 {
-       int keep_early;
+       int keep;
 
        if (!buf)
                return 0;
@@ -903,42 +197,34 @@ static int __init setup_early_printk(char *buf)
                return 0;
        early_console_initialized = 1;
 
-       keep_early = (strstr(buf, "keep") != NULL);
-
-       if (!strncmp(buf, "serial", 6)) {
-               early_serial_init(buf + 6);
-               early_console = &early_serial_console;
-       } else if (!strncmp(buf, "ttyS", 4)) {
-               early_serial_init(buf);
-               early_console = &early_serial_console;
-       } else if (!strncmp(buf, "vga", 3)
-               && boot_params.screen_info.orig_video_isVGA == 1) {
-               max_xpos = boot_params.screen_info.orig_video_cols;
-               max_ypos = boot_params.screen_info.orig_video_lines;
-               current_ypos = boot_params.screen_info.orig_y;
-               early_console = &early_vga_console;
+       keep = (strstr(buf, "keep") != NULL);
+
+       while (*buf != '\0') {
+               if (!strncmp(buf, "serial", 6)) {
+                       early_serial_init(buf + 6);
+                       early_console_register(&early_serial_console, keep);
+               }
+               if (!strncmp(buf, "ttyS", 4)) {
+                       early_serial_init(buf + 4);
+                       early_console_register(&early_serial_console, keep);
+               }
+               if (!strncmp(buf, "vga", 3) &&
+                   boot_params.screen_info.orig_video_isVGA == 1) {
+                       max_xpos = boot_params.screen_info.orig_video_cols;
+                       max_ypos = boot_params.screen_info.orig_video_lines;
+                       current_ypos = boot_params.screen_info.orig_y;
+                       early_console_register(&early_vga_console, keep);
+               }
 #ifdef CONFIG_EARLY_PRINTK_DBGP
-       } else if (!strncmp(buf, "dbgp", 4)) {
-               if (early_dbgp_init(buf+4) < 0)
-                       return 0;
-               early_console = &early_dbgp_console;
-               /*
-                * usb subsys will reset ehci controller, so don't keep
-                * that early console
-                */
-               keep_early = 0;
+               if (!strncmp(buf, "dbgp", 4) && !early_dbgp_init(buf + 4))
+                       early_console_register(&early_dbgp_console, keep);
 #endif
 #ifdef CONFIG_HVC_XEN
-       } else if (!strncmp(buf, "xen", 3)) {
-               early_console = &xenboot_console;
+               if (!strncmp(buf, "xen", 3))
+                       early_console_register(&xenboot_console, keep);
 #endif
+               buf++;
        }
-
-       if (keep_early)
-               early_console->flags &= ~CON_BOOT;
-       else
-               early_console->flags |= CON_BOOT;
-       register_console(early_console);
        return 0;
 }
 
index d59fe32..681c3fd 100644 (file)
@@ -1021,7 +1021,7 @@ apicinterrupt ERROR_APIC_VECTOR \
 apicinterrupt SPURIOUS_APIC_VECTOR \
        spurious_interrupt smp_spurious_interrupt
 
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
 apicinterrupt LOCAL_PENDING_VECTOR \
        perf_pending_interrupt smp_perf_pending_interrupt
 #endif
index 3008831..40f3077 100644 (file)
@@ -208,7 +208,7 @@ static void __init apic_intr_init(void)
        alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
 
        /* Performance monitoring interrupts: */
-# ifdef CONFIG_PERF_COUNTERS
+# ifdef CONFIG_PERF_EVENTS
        alloc_intr_gate(LOCAL_PENDING_VECTOR, perf_pending_interrupt);
 # endif
 
index 9371448..378e9a8 100644 (file)
@@ -210,8 +210,8 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,
 {
        ssize_t ret = -EINVAL;
 
-       if ((len >> PAGE_SHIFT) > num_physpages) {
-               pr_err("microcode: too much data (max %ld pages)\n", num_physpages);
+       if ((len >> PAGE_SHIFT) > totalram_pages) {
+               pr_err("microcode: too much data (max %ld pages)\n", totalram_pages);
                return ret;
        }
 
@@ -236,7 +236,7 @@ static const struct file_operations microcode_fops = {
 static struct miscdevice microcode_dev = {
        .minor                  = MICROCODE_MINOR,
        .name                   = "microcode",
-       .devnode                = "cpu/microcode",
+       .nodename               = "cpu/microcode",
        .fops                   = &microcode_fops,
 };
 
index 7dd9500..6a3cefc 100644 (file)
@@ -241,7 +241,7 @@ static struct notifier_block __refdata msr_class_cpu_notifier = {
        .notifier_call = msr_class_cpu_callback,
 };
 
-static char *msr_nodename(struct device *dev)
+static char *msr_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt));
 }
@@ -262,7 +262,7 @@ static int __init msr_init(void)
                err = PTR_ERR(msr_class);
                goto out_chrdev;
        }
-       msr_class->nodename = msr_nodename;
+       msr_class->devnode = msr_devnode;
        for_each_online_cpu(i) {
                err = msr_device_create(i);
                if (err != 0)
index 071166a..847ab41 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/pm.h>
 #include <linux/clockchips.h>
 #include <linux/random.h>
-#include <trace/power.h>
+#include <trace/events/power.h>
 #include <asm/system.h>
 #include <asm/apic.h>
 #include <asm/syscalls.h>
@@ -25,9 +25,6 @@ EXPORT_SYMBOL(idle_nomwait);
 
 struct kmem_cache *task_xstate_cachep;
 
-DEFINE_TRACE(power_start);
-DEFINE_TRACE(power_end);
-
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
        *dst = *src;
@@ -299,9 +296,7 @@ static inline int hlt_use_halt(void)
 void default_idle(void)
 {
        if (hlt_use_halt()) {
-               struct power_trace it;
-
-               trace_power_start(&it, POWER_CSTATE, 1);
+               trace_power_start(POWER_CSTATE, 1);
                current_thread_info()->status &= ~TS_POLLING;
                /*
                 * TS_POLLING-cleared state must be visible before we
@@ -314,7 +309,6 @@ void default_idle(void)
                else
                        local_irq_enable();
                current_thread_info()->status |= TS_POLLING;
-               trace_power_end(&it);
        } else {
                local_irq_enable();
                /* loop is done by the caller */
@@ -372,9 +366,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
  */
 void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
 {
-       struct power_trace it;
-
-       trace_power_start(&it, POWER_CSTATE, (ax>>4)+1);
+       trace_power_start(POWER_CSTATE, (ax>>4)+1);
        if (!need_resched()) {
                if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
                        clflush((void *)&current_thread_info()->flags);
@@ -384,15 +376,13 @@ void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
                if (!need_resched())
                        __mwait(ax, cx);
        }
-       trace_power_end(&it);
 }
 
 /* Default MONITOR/MWAIT with no hints, used for default C1 state */
 static void mwait_idle(void)
 {
-       struct power_trace it;
        if (!need_resched()) {
-               trace_power_start(&it, POWER_CSTATE, 1);
+               trace_power_start(POWER_CSTATE, 1);
                if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
                        clflush((void *)&current_thread_info()->flags);
 
@@ -402,7 +392,6 @@ static void mwait_idle(void)
                        __sti_mwait(0, 0);
                else
                        local_irq_enable();
-               trace_power_end(&it);
        } else
                local_irq_enable();
 }
@@ -414,13 +403,11 @@ static void mwait_idle(void)
  */
 static void poll_idle(void)
 {
-       struct power_trace it;
-
-       trace_power_start(&it, POWER_CSTATE, 0);
+       trace_power_start(POWER_CSTATE, 0);
        local_irq_enable();
        while (!need_resched())
                cpu_relax();
-       trace_power_end(&it);
+       trace_power_end(0);
 }
 
 /*
index 8d7d5c9..7b058a2 100644 (file)
@@ -325,16 +325,6 @@ static int putreg(struct task_struct *child,
                return set_flags(child, value);
 
 #ifdef CONFIG_X86_64
-       /*
-        * Orig_ax is really just a flag with small positive and
-        * negative values, so make sure to always sign-extend it
-        * from 32 bits so that it works correctly regardless of
-        * whether we come from a 32-bit environment or not.
-        */
-       case offsetof(struct user_regs_struct, orig_ax):
-               value = (long) (s32) value;
-               break;
-
        case offsetof(struct user_regs_struct,fs_base):
                if (value >= TASK_SIZE_OF(child))
                        return -EIO;
@@ -1126,10 +1116,15 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value)
 
        case offsetof(struct user32, regs.orig_eax):
                /*
-                * Sign-extend the value so that orig_eax = -1
-                * causes (long)orig_ax < 0 tests to fire correctly.
+                * A 32-bit debugger setting orig_eax means to restore
+                * the state of the task restarting a 32-bit syscall.
+                * Make sure we interpret the -ERESTART* codes correctly
+                * in case the task is not actually still sitting at the
+                * exit from a 32-bit syscall with TS_COMPAT still set.
                 */
-               regs->orig_ax = (long) (s32) value;
+               regs->orig_ax = value;
+               if (syscall_get_nr(child, regs) >= 0)
+                       task_thread_info(child)->status |= TS_COMPAT;
                break;
 
        case offsetof(struct user32, regs.eflags):
index 6c78868..e09f0e2 100644 (file)
@@ -698,21 +698,6 @@ void __init setup_arch(char **cmdline_p)
        printk(KERN_INFO "Command line: %s\n", boot_command_line);
 #endif
 
-       strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
-       *cmdline_p = command_line;
-
-#ifdef CONFIG_X86_64
-       /*
-        * Must call this twice: Once just to detect whether hardware doesn't
-        * support NX (so that the early EHCI debug console setup can safely
-        * call set_fixmap(), and then again after parsing early parameters to
-        * honor the respective command line option.
-        */
-       check_efer();
-#endif
-
-       parse_early_param();
-
        /* VMI may relocate the fixmap; do this before touching ioremap area */
        vmi_init();
 
@@ -795,6 +780,21 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
 
+       strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
+       *cmdline_p = command_line;
+
+#ifdef CONFIG_X86_64
+       /*
+        * Must call this twice: Once just to detect whether hardware doesn't
+        * support NX (so that the early EHCI debug console setup can safely
+        * call set_fixmap(), and then again after parsing early parameters to
+        * honor the respective command line option.
+        */
+       check_efer();
+#endif
+
+       parse_early_param();
+
 #ifdef CONFIG_X86_64
        check_efer();
 #endif
index d51321d..0157cd2 100644 (file)
@@ -335,4 +335,4 @@ ENTRY(sys_call_table)
        .long sys_preadv
        .long sys_pwritev
        .long sys_rt_tgsigqueueinfo     /* 335 */
-       .long sys_perf_counter_open
+       .long sys_perf_event_open
index 808031a..699f7ee 100644 (file)
@@ -4,7 +4,7 @@
 #include <asm/e820.h>
 
 /* ready for x86_64 and x86 */
-unsigned char *trampoline_base = __va(TRAMPOLINE_BASE);
+unsigned char *__cpuinitdata trampoline_base = __va(TRAMPOLINE_BASE);
 
 void __init reserve_trampoline_memory(void)
 {
@@ -26,7 +26,7 @@ void __init reserve_trampoline_memory(void)
  * bootstrap into the page concerned. The caller
  * has made sure it's suitably aligned.
  */
-unsigned long setup_trampoline(void)
+unsigned long __cpuinit setup_trampoline(void)
 {
        memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
        return virt_to_phys(trampoline_base);
index 66d874e..8508237 100644 (file)
  */
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
 
 /* We can free up trampoline after bootup if cpu hotplug is not supported. */
-#ifndef CONFIG_HOTPLUG_CPU
-.section ".cpuinit.data","aw",@progbits
-#else
-.section .rodata,"a",@progbits
-#endif
-
+__CPUINITRODATA
 .code16
 
 ENTRY(trampoline_data)
index cddfb8d..596d54c 100644 (file)
  */
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 #include <asm/pgtable_types.h>
 #include <asm/page_types.h>
 #include <asm/msr.h>
 #include <asm/segment.h>
 #include <asm/processor-flags.h>
 
-.section .rodata, "a", @progbits
-
+/* We can free up the trampoline after bootup if cpu hotplug is not supported. */
+__CPUINITRODATA
 .code16
 
 ENTRY(trampoline_data)
index 7dc0de9..9346e10 100644 (file)
@@ -65,7 +65,6 @@
 #else
 #include <asm/processor-flags.h>
 #include <asm/setup.h>
-#include <asm/traps.h>
 
 asmlinkage int system_call(void);
 
index 17409e8..cd982f4 100644 (file)
@@ -666,7 +666,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
        if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
                        (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||
                        (val == CPUFREQ_RESUMECHANGE)) {
-               *lpj =  cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
+               *lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
 
                tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new);
                if (!(freq->flags & CPUFREQ_CONST_LOOPS))
index 0ccb57d..a46accc 100644 (file)
@@ -45,9 +45,9 @@ PHDRS {
        text PT_LOAD FLAGS(5);          /* R_E */
        data PT_LOAD FLAGS(7);          /* RWE */
 #ifdef CONFIG_X86_64
-       user PT_LOAD FLAGS(7);          /* RWE */
+       user PT_LOAD FLAGS(5);          /* R_E */
 #ifdef CONFIG_SMP
-       percpu PT_LOAD FLAGS(7);        /* RWE */
+       percpu PT_LOAD FLAGS(6);        /* RW_ */
 #endif
        init PT_LOAD FLAGS(7);          /* RWE */
 #endif
index 4cb7d5d..7e59dc1 100644 (file)
@@ -1135,11 +1135,6 @@ static struct notifier_block paniced = {
 /* Setting up memory is fairly easy. */
 static __init char *lguest_memory_setup(void)
 {
-       /* We do this here and not earlier because lockcheck used to barf if we
-        * did it before start_kernel().  I think we fixed that, so it'd be
-        * nice to move it back to lguest_init.  Patch welcome... */
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-
        /*
         *The Linux bootloader header contains an "e820" memory map: the
         * Launcher populated the first entry with our memory limit.
@@ -1364,10 +1359,13 @@ __init void lguest_init(void)
 
        /*
         * If we don't initialize the lock dependency checker now, it crashes
-        * paravirt_disable_iospace.
+        * atomic_notifier_chain_register, then paravirt_disable_iospace.
         */
        lockdep_init();
 
+       /* Hook in our special panic hypercall code. */
+       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
+
        /*
         * The IDE code spends about 3 seconds probing for disks: if we reserve
         * all the I/O ports up front it can't get them and so doesn't probe.
index 775a020..82728f2 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/bootmem.h>             /* max_low_pfn                  */
 #include <linux/kprobes.h>             /* __kprobes, ...               */
 #include <linux/mmiotrace.h>           /* kmmio_handler, ...           */
-#include <linux/perf_counter.h>                /* perf_swcounter_event         */
+#include <linux/perf_event.h>          /* perf_sw_event                */
 
 #include <asm/traps.h>                 /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>               /* pgd_*(), ...                 */
@@ -1017,7 +1017,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
        if (unlikely(error_code & PF_RSVD))
                pgtable_bad(regs, error_code, address);
 
-       perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+       perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
 
        /*
         * If we're in an interrupt, have no user context or are running
@@ -1114,11 +1114,11 @@ good_area:
 
        if (fault & VM_FAULT_MAJOR) {
                tsk->maj_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
                                     regs, address);
        } else {
                tsk->min_flt++;
-               perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
                                     regs, address);
        }
 
index 3cd7711..30938c1 100644 (file)
@@ -84,7 +84,7 @@ static pmd_t * __init one_md_table_init(pgd_t *pgd)
 #ifdef CONFIG_X86_PAE
        if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
                if (after_bootmem)
-                       pmd_table = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE);
+                       pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
                else
                        pmd_table = (pmd_t *)alloc_low_page();
                paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
@@ -116,7 +116,7 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
 #endif
                        if (!page_table)
                                page_table =
-                               (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);
+                               (pte_t *)alloc_bootmem_pages(PAGE_SIZE);
                } else
                        page_table = (pte_t *)alloc_low_page();
 
@@ -857,8 +857,6 @@ static void __init test_wp_bit(void)
        }
 }
 
-static struct kcore_list kcore_mem, kcore_vmalloc;
-
 void __init mem_init(void)
 {
        int codesize, reservedpages, datasize, initsize;
@@ -886,13 +884,9 @@ void __init mem_init(void)
        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
 
-       kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
-       kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
-                  VMALLOC_END-VMALLOC_START);
-
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
                        "%dk reserved, %dk data, %dk init, %ldk highmem)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
                reservedpages << (PAGE_SHIFT-10),
index ea56b8c..5a4398a 100644 (file)
@@ -647,8 +647,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel,
-                        kcore_modules, kcore_vsyscall;
+static struct kcore_list kcore_vsyscall;
 
 void __init mem_init(void)
 {
@@ -677,17 +676,12 @@ void __init mem_init(void)
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
 
        /* Register memory areas for /proc/kcore */
-       kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
-       kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
-                  VMALLOC_END-VMALLOC_START);
-       kclist_add(&kcore_kernel, &_stext, _end - _stext);
-       kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN);
        kclist_add(&kcore_vsyscall, (void *)VSYSCALL_START,
-                                VSYSCALL_END - VSYSCALL_START);
+                        VSYSCALL_END - VSYSCALL_START, KCORE_OTHER);
 
        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
                         "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+               nr_free_pages() << (PAGE_SHIFT-10),
                max_pfn << (PAGE_SHIFT-10),
                codesize >> 10,
                absent_pages << (PAGE_SHIFT-10),
index 528bf95..8cc1833 100644 (file)
@@ -225,9 +225,6 @@ void kmemcheck_hide(struct pt_regs *regs)
 
        BUG_ON(!irqs_disabled());
 
-       if (data->balance == 0)
-               return;
-
        if (unlikely(data->balance != 1)) {
                kmemcheck_show_all();
                kmemcheck_error_save_bug(regs);
index e773b6b..3f66b82 100644 (file)
@@ -1,7 +1,6 @@
 #include <linux/kmemcheck.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/module.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
index 4899215..8eb0587 100644 (file)
@@ -234,11 +234,11 @@ static void arch_perfmon_setup_counters(void)
        if (eax.split.version_id == 0 && current_cpu_data.x86 == 6 &&
                current_cpu_data.x86_model == 15) {
                eax.split.version_id = 2;
-               eax.split.num_counters = 2;
+               eax.split.num_events = 2;
                eax.split.bit_width = 40;
        }
 
-       num_counters = eax.split.num_counters;
+       num_counters = eax.split.num_events;
 
        op_arch_perfmon_spec.num_counters = num_counters;
        op_arch_perfmon_spec.num_controls = num_counters;
index b837761..7b8e75d 100644 (file)
@@ -13,7 +13,7 @@
 #define OP_X86_MODEL_H
 
 #include <asm/types.h>
-#include <asm/perf_counter.h>
+#include <asm/perf_event.h>
 
 struct op_msr {
        unsigned long   addr;
index 417c9f5..8aa85f1 100644 (file)
@@ -243,10 +243,6 @@ static void __restore_processor_state(struct saved_context *ctxt)
 
        do_fpu_end();
        mtrr_bp_restore();
-
-#ifdef CONFIG_X86_OLD_MCE
-       mcheck_init(&boot_cpu_data);
-#endif
 }
 
 /* Needed by apm.c */
index 9b92620..fca4db4 100644 (file)
@@ -53,6 +53,8 @@
 #define MAP_LOCKED     0x8000          /* pages are locked */
 #define MAP_POPULATE   0x10000         /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x20000         /* do not block on IO */
+#define MAP_STACK      0x40000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x80000         /* create a huge page mapping */
 
 /*
  * Flags for msync
@@ -78,6 +80,9 @@
 #define MADV_DONTFORK  10              /* don't inherit across fork */
 #define MADV_DOFORK    11              /* do inherit across fork */
 
+#define MADV_MERGEABLE   12            /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 13            /* KSM may not merge identical pages */
+
 /* compatibility flags */
 #define MAP_FILE       0
 
index 427e14f..cdbc27c 100644 (file)
@@ -203,7 +203,7 @@ void __init mem_init(void)
 
        printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
               "%ldk data, %ldk init %ldk highmem)\n",
-              (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
+              nr_free_pages() << (PAGE_SHIFT-10),
               ram << (PAGE_SHIFT-10),
               codesize >> 10,
               reservedpages << (PAGE_SHIFT-10),
index 5f184bb..0676301 100644 (file)
@@ -1062,7 +1062,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
 
 static struct cdev bsg_cdev;
 
-static char *bsg_nodename(struct device *dev)
+static char *bsg_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));
 }
@@ -1087,7 +1087,7 @@ static int __init bsg_init(void)
                ret = PTR_ERR(bsg_class);
                goto destroy_kmemcache;
        }
-       bsg_class->nodename = bsg_nodename;
+       bsg_class->devnode = bsg_devnode;
 
        ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
        if (ret)
index 2ad91dd..517e433 100644 (file)
@@ -998,12 +998,12 @@ struct class block_class = {
        .name           = "block",
 };
 
-static char *block_nodename(struct device *dev)
+static char *block_devnode(struct device *dev, mode_t *mode)
 {
        struct gendisk *disk = dev_to_disk(dev);
 
-       if (disk->nodename)
-               return disk->nodename(disk);
+       if (disk->devnode)
+               return disk->devnode(disk, mode);
        return NULL;
 }
 
@@ -1011,7 +1011,7 @@ static struct device_type disk_type = {
        .name           = "disk",
        .groups         = disk_attr_groups,
        .release        = disk_release,
-       .nodename       = block_nodename,
+       .devnode        = block_devnode,
 };
 
 #ifdef CONFIG_PROC_FS
index 7ec7d88..dd8729d 100644 (file)
@@ -60,7 +60,11 @@ config ACPI_PROCFS
          /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
          /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
          /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
-
+         /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)
+         /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/
+               cpufreq/*)
+         /proc/acpi/processor/*/throttling (/sys/class/thermal/
+               cooling_device*/*)
          This option has no effect on /proc/acpi/ files
          and functions which do not yet exist in /sys.
 
@@ -82,6 +86,17 @@ config ACPI_PROCFS_POWER
 
          Say N to delete power /proc/acpi/ directories that have moved to /sys/
 
+config ACPI_POWER_METER
+       tristate "ACPI 4.0 power meter"
+       depends on HWMON
+       help
+         This driver exposes ACPI 4.0 power meters as hardware monitoring
+         devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware
+         and a power meter.
+
+         To compile this driver as a module, choose M here:
+         the module will be called power-meter.
+
 config ACPI_SYSFS_POWER
        bool "Future power /sys interface"
        select POWER_SUPPLY
index 03a985b..82cd49d 100644 (file)
@@ -56,6 +56,7 @@ obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
 obj-$(CONFIG_ACPI_BATTERY)     += battery.o
 obj-$(CONFIG_ACPI_SBS)         += sbshc.o
 obj-$(CONFIG_ACPI_SBS)         += sbs.o
+obj-$(CONFIG_ACPI_POWER_METER) += power_meter.o
 
 # processor has its own "processor." module_param namespace
 processor-y                    := processor_core.o processor_throttling.o
index 9a62224..28ccdbc 100644 (file)
@@ -53,7 +53,6 @@ MODULE_LICENSE("GPL");
 
 static int acpi_memory_device_add(struct acpi_device *device);
 static int acpi_memory_device_remove(struct acpi_device *device, int type);
-static int acpi_memory_device_start(struct acpi_device *device);
 
 static const struct acpi_device_id memory_device_ids[] = {
        {ACPI_MEMORY_DEVICE_HID, 0},
@@ -68,7 +67,6 @@ static struct acpi_driver acpi_memory_device_driver = {
        .ops = {
                .add = acpi_memory_device_add,
                .remove = acpi_memory_device_remove,
-               .start = acpi_memory_device_start,
                },
 };
 
@@ -431,28 +429,6 @@ static int acpi_memory_device_add(struct acpi_device *device)
 
        printk(KERN_DEBUG "%s \n", acpi_device_name(device));
 
-       return result;
-}
-
-static int acpi_memory_device_remove(struct acpi_device *device, int type)
-{
-       struct acpi_memory_device *mem_device = NULL;
-
-
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
-
-       mem_device = acpi_driver_data(device);
-       kfree(mem_device);
-
-       return 0;
-}
-
-static int acpi_memory_device_start (struct acpi_device *device)
-{
-       struct acpi_memory_device *mem_device;
-       int result = 0;
-
        /*
         * Early boot code has recognized memory area by EFI/E820.
         * If DSDT shows these memory devices on boot, hotplug is not necessary
@@ -462,8 +438,6 @@ static int acpi_memory_device_start (struct acpi_device *device)
        if (!acpi_hotmem_initialized)
                return 0;
 
-       mem_device = acpi_driver_data(device);
-
        if (!acpi_memory_check_device(mem_device)) {
                /* call add_memory func */
                result = acpi_memory_enable_device(mem_device);
@@ -474,6 +448,20 @@ static int acpi_memory_device_start (struct acpi_device *device)
        return result;
 }
 
+static int acpi_memory_device_remove(struct acpi_device *device, int type)
+{
+       struct acpi_memory_device *mem_device = NULL;
+
+
+       if (!device || !acpi_driver_data(device))
+               return -EINVAL;
+
+       mem_device = acpi_driver_data(device);
+       kfree(mem_device);
+
+       return 0;
+}
+
 /*
  * Helper function to check for memory device
  */
@@ -481,26 +469,23 @@ static acpi_status is_memory_device(acpi_handle handle)
 {
        char *hardware_id;
        acpi_status status;
-       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_device_info *info;
 
-
-       status = acpi_get_object_info(handle, &buffer);
+       status = acpi_get_object_info(handle, &info);
        if (ACPI_FAILURE(status))
                return status;
 
-       info = buffer.pointer;
        if (!(info->valid & ACPI_VALID_HID)) {
-               kfree(buffer.pointer);
+               kfree(info);
                return AE_ERROR;
        }
 
-       hardware_id = info->hardware_id.value;
+       hardware_id = info->hardware_id.string;
        if ((hardware_id == NULL) ||
            (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
                status = AE_ERROR;
 
-       kfree(buffer.pointer);
+       kfree(info);
        return status;
 }
 
index 72ac28d..e7973bc 100644 (file)
@@ -28,7 +28,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
-        nsparse.o   nspredef.o
+        nsparse.o   nspredef.o  nsrepair.o
 
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
 
@@ -44,4 +44,4 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
 
 acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
-               utstate.o utmutex.o utobject.o utresrc.o utlock.o
+               utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o
index e6777fb..8e679ef 100644 (file)
 
 /* Operation regions */
 
-#define ACPI_NUM_PREDEFINED_REGIONS     8
+#define ACPI_NUM_PREDEFINED_REGIONS     9
 #define ACPI_USER_REGION_BEGIN          0x80
 
 /* Maximum space_ids for Operation Regions */
 #define ACPI_RSDP_CHECKSUM_LENGTH       20
 #define ACPI_RSDP_XCHECKSUM_LENGTH      36
 
-/* SMBus bidirectional buffer size */
+/* SMBus and IPMI bidirectional buffer size */
 
 #define ACPI_SMBUS_BUFFER_SIZE          34
+#define ACPI_IPMI_BUFFER_SIZE           66
+
+/* _sx_d and _sx_w control methods */
+
+#define ACPI_NUM_sx_d_METHODS           4
+#define ACPI_NUM_sx_w_METHODS           5
 
 /******************************************************************************
  *
index 62c59df..a4fb001 100644 (file)
@@ -154,10 +154,6 @@ void
 acpi_db_display_argument_object(union acpi_operand_object *obj_desc,
                                struct acpi_walk_state *walk_state);
 
-void acpi_db_check_predefined_names(void);
-
-void acpi_db_batch_execute(void);
-
 /*
  * dbexec - debugger control method execution
  */
index 3d87362..29ba66d 100644 (file)
 #define ACPI_INIT_GLOBAL(a,b) a
 #endif
 
+#ifdef DEFINE_ACPI_GLOBALS
+
+/* Public globals, available from outside ACPICA subsystem */
+
 /*****************************************************************************
  *
  * Runtime configuration (static defaults that can be overriden at runtime)
@@ -78,7 +82,7 @@
  * 5) Allow unresolved references (invalid target name) in package objects
  * 6) Enable warning messages for behavior that is not ACPI spec compliant
  */
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);
+u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);
 
 /*
  * Automatically serialize ALL control methods? Default is FALSE, meaning
@@ -86,27 +90,36 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);
  * Only change this if the ASL code is poorly written and cannot handle
  * reentrancy even though methods are marked "NotSerialized".
  */
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);
+u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);
 
 /*
  * Create the predefined _OSI method in the namespace? Default is TRUE
  * because ACPI CA is fully compatible with other ACPI implementations.
  * Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.
  */
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);
+u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);
 
 /*
  * Disable wakeup GPEs during runtime? Default is TRUE because WAKE and
  * RUNTIME GPEs should never be shared, and WAKE GPEs should typically only
  * be enabled just before going to sleep.
  */
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
+u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
 
 /*
  * Optionally use default values for the ACPI register widths. Set this to
  * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
  */
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
+u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
+
+/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
+
+struct acpi_table_fadt acpi_gbl_FADT;
+u32 acpi_current_gpe_count;
+u32 acpi_gbl_trace_flags;
+acpi_name acpi_gbl_trace_method_name;
+
+#endif
 
 /*****************************************************************************
  *
@@ -114,11 +127,6 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
  *
  ****************************************************************************/
 
-/* Runtime configuration of debug print levels */
-
-extern u32 acpi_dbg_level;
-extern u32 acpi_dbg_layer;
-
 /* Procedure nesting level for debug output */
 
 extern u32 acpi_gbl_nesting_level;
@@ -127,10 +135,8 @@ extern u32 acpi_gbl_nesting_level;
 
 ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
 ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
-ACPI_EXTERN acpi_name acpi_gbl_trace_method_name;
 ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
 ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
-ACPI_EXTERN u32 acpi_gbl_trace_flags;
 
 /*****************************************************************************
  *
@@ -142,10 +148,8 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags;
  * acpi_gbl_root_table_list is the master list of ACPI tables found in the
  * RSDT/XSDT.
  *
- * acpi_gbl_FADT is a local copy of the FADT, converted to a common format.
  */
 ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
-ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
 ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
 
 /* These addresses are calculated from the FADT Event Block addresses */
@@ -261,7 +265,8 @@ ACPI_EXTERN u8 acpi_gbl_osi_data;
 extern u8 acpi_gbl_shutdown;
 extern u32 acpi_gbl_startup_flags;
 extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];
-extern const char *acpi_gbl_highest_dstate_names[4];
+extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];
+extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];
 extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
 extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
@@ -290,6 +295,7 @@ extern char const *acpi_gbl_exception_names_ctrl[];
 ACPI_EXTERN struct acpi_namespace_node acpi_gbl_root_node_struct;
 ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node;
 ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_fadt_gpe_device;
+ACPI_EXTERN union acpi_operand_object *acpi_gbl_module_code_list;
 
 extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];
 extern const struct acpi_predefined_names
@@ -340,7 +346,6 @@ ACPI_EXTERN struct acpi_fixed_event_handler
 ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
 ACPI_EXTERN struct acpi_gpe_block_info
 *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
-ACPI_EXTERN u32 acpi_current_gpe_count;
 
 /*****************************************************************************
  *
index 4afa3d8..36192f1 100644 (file)
@@ -62,6 +62,14 @@ u32 acpi_hw_get_mode(void);
 /*
  * hwregs - ACPI Register I/O
  */
+acpi_status
+acpi_hw_validate_register(struct acpi_generic_address *reg,
+                         u8 max_bit_width, u64 *address);
+
+acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg);
+
+acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg);
+
 struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id);
 
 acpi_status acpi_hw_write_pm1_control(u32 pm1a_control, u32 pm1b_control);
index e8db7a3..5db9f29 100644 (file)
@@ -461,9 +461,9 @@ void acpi_ex_acquire_global_lock(u32 rule);
 
 void acpi_ex_release_global_lock(u32 rule);
 
-void acpi_ex_eisa_id_to_string(u32 numeric_id, char *out_string);
+void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id);
 
-void acpi_ex_unsigned_integer_to_string(acpi_integer value, char *out_string);
+void acpi_ex_integer_to_string(char *dest, acpi_integer value);
 
 /*
  * exregion - default op_region handlers
index ee986ed..81e64f4 100644 (file)
@@ -369,6 +369,19 @@ union acpi_predefined_info {
        struct acpi_package_info3 ret_info3;
 };
 
+/* Data block used during object validation */
+
+struct acpi_predefined_data {
+       char *pathname;
+       const union acpi_predefined_info *predefined;
+       u32 flags;
+       u8 node_flags;
+};
+
+/* Defines for Flags field above */
+
+#define ACPI_OBJECT_REPAIRED    1
+
 /*
  * Bitmapped return value types
  * Note: the actual data types must be contiguous, a loop in nspredef.c
@@ -885,6 +898,9 @@ struct acpi_bit_register_info {
 #define ACPI_OSI_WIN_XP_SP2             0x05
 #define ACPI_OSI_WINSRV_2003_SP1        0x06
 #define ACPI_OSI_WIN_VISTA              0x07
+#define ACPI_OSI_WINSRV_2008            0x08
+#define ACPI_OSI_WIN_VISTA_SP1          0x09
+#define ACPI_OSI_WIN_7                  0x0A
 
 #define ACPI_ALWAYS_ILLEGAL             0x00
 
index 91ac7d7..3acd9c6 100644 (file)
  */
 #define ACPI_ERROR_NAMESPACE(s, e)      acpi_ns_report_error (AE_INFO, s, e);
 #define ACPI_ERROR_METHOD(s, n, p, e)   acpi_ns_report_method_error (AE_INFO, s, n, p, e);
+#define ACPI_WARN_PREDEFINED(plist)     acpi_ut_predefined_warning plist
 
 #else
 
 
 #define ACPI_ERROR_NAMESPACE(s, e)
 #define ACPI_ERROR_METHOD(s, n, p, e)
+#define ACPI_WARN_PREDEFINED(plist)
 #endif         /* ACPI_NO_ERROR_MESSAGES */
 
 /*
index 94cdc2b..09a2764 100644 (file)
 #define ACPI_NS_WALK_UNLOCK         0x01
 #define ACPI_NS_WALK_TEMP_NODES     0x02
 
+/* Object is not a package element */
+
+#define ACPI_NOT_PACKAGE_ELEMENT    ACPI_UINT32_MAX
+
+/* Always emit warning message, not dependent on node flags */
+
+#define ACPI_WARN_ALWAYS            0
+
 /*
  * nsinit - Namespace initialization
  */
@@ -144,6 +152,8 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name);
 
 void acpi_ns_delete_node(struct acpi_namespace_node *node);
 
+void acpi_ns_remove_node(struct acpi_namespace_node *node);
+
 void
 acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_handle);
 
@@ -186,6 +196,8 @@ acpi_ns_dump_objects(acpi_object_type type,
  */
 acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info);
 
+void acpi_ns_exec_module_code_list(void);
+
 /*
  * nspredef - Support for predefined/reserved names
  */
@@ -259,6 +271,19 @@ acpi_status
 acpi_ns_get_attached_data(struct acpi_namespace_node *node,
                          acpi_object_handler handler, void **data);
 
+/*
+ * nsrepair - return object repair for predefined methods/objects
+ */
+acpi_status
+acpi_ns_repair_object(struct acpi_predefined_data *data,
+                     u32 expected_btypes,
+                     u32 package_index,
+                     union acpi_operand_object **return_object_ptr);
+
+acpi_status
+acpi_ns_repair_package_list(struct acpi_predefined_data *data,
+                           union acpi_operand_object **obj_desc_ptr);
+
 /*
  * nssearch - Namespace searching and entry
  */
index eb6f038..b39d682 100644 (file)
@@ -98,6 +98,7 @@
 #define AOPOBJ_SETUP_COMPLETE       0x10
 #define AOPOBJ_SINGLE_DATUM         0x20
 #define AOPOBJ_INVALID              0x40       /* Used if host OS won't allow an op_region address */
+#define AOPOBJ_MODULE_LEVEL         0x80
 
 /******************************************************************************
  *
index 23ee0fb..22881e8 100644 (file)
@@ -62,6 +62,8 @@
 #define ACPI_PARSE_DEFERRED_OP          0x0100
 #define ACPI_PARSE_DISASSEMBLE          0x0200
 
+#define ACPI_PARSE_MODULE_LEVEL         0x0400
+
 /******************************************************************************
  *
  * Parser interfaces
index 63f656a..cd80d1d 100644 (file)
@@ -64,8 +64,8 @@
  *      (Used for _PRW)
  *
  *
- * 2) PTYPE2 packages contain a variable number of sub-packages. Each of the
- *    different types describe the contents of each of the sub-packages.
+ * 2) PTYPE2 packages contain a Variable-length number of sub-packages. Each
+ *    of the different types describe the contents of each of the sub-packages.
  *
  * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types:
  *      object type
@@ -91,6 +91,9 @@
  * ACPI_PTYPE2_MIN: Each subpackage has a variable but minimum length
  *      (Used for _HPX)
  *
+ * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
+ *      (Used for _ART, _FPS)
+ *
  *****************************************************************************/
 
 enum acpi_return_package_types {
@@ -101,9 +104,11 @@ enum acpi_return_package_types {
        ACPI_PTYPE2_COUNT = 5,
        ACPI_PTYPE2_PKG_COUNT = 6,
        ACPI_PTYPE2_FIXED = 7,
-       ACPI_PTYPE2_MIN = 8
+       ACPI_PTYPE2_MIN = 8,
+       ACPI_PTYPE2_REV_FIXED = 9
 };
 
+#ifdef ACPI_CREATE_PREDEFINED_TABLE
 /*
  * Predefined method/object information table.
  *
@@ -136,239 +141,384 @@ enum acpi_return_package_types {
  * is saved here (rather than in a separate table) in order to minimize the
  * overall size of the stored data.
  */
-static const union acpi_predefined_info predefined_names[] = {
-       {.info = {"_AC0", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC1", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC2", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC3", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC4", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC5", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC6", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC7", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC8", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AC9", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_ADR", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_AL0", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL1", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL2", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL3", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL4", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL5", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL6", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL7", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL8", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_AL9", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_ALC", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_ALI", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_ALP", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_ALR", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* variable (Pkgs) each 2 (Ints) */
-       {.info = {"_ALT", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_BBN", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_BCL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
-       {.info = {"_BCM", 1, 0}},
-       {.info = {"_BDN", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_BFS", 1, 0}},
-       {.info = {"_BIF", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER,
-                                         9,
-                                         ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER, 4, 0}},        /* fixed (9 Int),(4 Str) */
-       {.info = {"_BLT", 3, 0}},
-       {.info = {"_BMC", 1, 0}},
-       {.info = {"_BMD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},   /* fixed (5 Int) */
-       {.info = {"_BQC", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_BST", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
-       {.info = {"_BTM", 1, ACPI_RTYPE_INTEGER}},
-       {.info = {"_BTP", 1, 0}},
-       {.info = {"_CBA", 0, ACPI_RTYPE_INTEGER}},      /* see PCI firmware spec 3.0 */
-       {.info = {"_CID", 0,
-        ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}},
-       {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0, 0, 0, 0}},    /* variable (Ints/Strs) */
-       {.info = {"_CRS", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_CRT", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_CSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},   /* variable (1 Int(n), n-1 Int) */
-       {.info = {"_CST", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_PKG_COUNT,
-                                         ACPI_RTYPE_BUFFER, 1,
-                                         ACPI_RTYPE_INTEGER, 3, 0}},   /* variable (1 Int(n), n Pkg (1 Buf/3 Int) */
-       {.info = {"_DCK", 1, ACPI_RTYPE_INTEGER}},
-       {.info = {"_DCS", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
-       {.info = {"_DDN", 0, ACPI_RTYPE_STRING}},
-       {.info = {"_DGS", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_DIS", 0, 0}},
-       {.info = {"_DMA", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_DOD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
-       {.info = {"_DOS", 1, 0}},
-       {.info = {"_DSM", 4, ACPI_RTYPE_ALL}},  /* Must return a type, but it can be of any type */
-       {.info = {"_DSS", 1, 0}},
-       {.info = {"_DSW", 3, 0}},
-       {.info = {"_EC_", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_EDL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_EJ0", 1, 0}},
-       {.info = {"_EJ1", 1, 0}},
-       {.info = {"_EJ2", 1, 0}},
-       {.info = {"_EJ3", 1, 0}},
-       {.info = {"_EJ4", 1, 0}},
-       {.info = {"_EJD", 0, ACPI_RTYPE_STRING}},
-       {.info = {"_FDE", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_FDI", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, 0, 0, 0}},  /* fixed (16 Int) */
-       {.info = {"_FDM", 1, 0}},
-       {.info = {"_FIX", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
-       {.info = {"_GLK", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_GPD", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_GPE", 0, ACPI_RTYPE_INTEGER}},      /* _GPE method, not _GPE scope */
-       {.info = {"_GSB", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_GTF", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_GTM", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_GTS", 1, 0}},
-       {.info = {"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
-       {.info = {"_HOT", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_HPP", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
+static const union acpi_predefined_info predefined_names[] =
+{
+       {{"_AC0", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC1", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC2", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC3", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC4", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC5", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC6", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC7", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC8", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AC9", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ADR", 0, ACPI_RTYPE_INTEGER}},
+       {{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL3", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL4", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL5", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL6", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL7", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL8", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_AL9", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_ALC", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ALI", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ALP", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ALR", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 (Ints) */
+                         {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2,0}, 0,0}},
+
+       {{"_ALT", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ART", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (1 Int(rev), n Pkg (2 Ref/11 Int) */
+       {{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER},
+         11, 0}},
+
+       {{"_BBN", 0, ACPI_RTYPE_INTEGER}},
+       {{"_BCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
+
+       {{"_BCM", 1, 0}},
+       {{"_BCT", 1, ACPI_RTYPE_INTEGER}},
+       {{"_BDN", 0, ACPI_RTYPE_INTEGER}},
+       {{"_BFS", 1, 0}},
+       {{"_BIF", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (9 Int),(4 Str) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9, ACPI_RTYPE_STRING}, 4,0}},
+
+       {{"_BIX", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (16 Int),(4 Str) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING}, 4,
+         0}},
+
+       {{"_BLT", 3, 0}},
+       {{"_BMA", 1, ACPI_RTYPE_INTEGER}},
+       {{"_BMC", 1, 0}},
+       {{"_BMD", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (5 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
+
+       {{"_BMS", 1, ACPI_RTYPE_INTEGER}},
+       {{"_BQC", 0, ACPI_RTYPE_INTEGER}},
+       {{"_BST", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
+
+       {{"_BTM", 1, ACPI_RTYPE_INTEGER}},
+       {{"_BTP", 1, 0}},
+       {{"_CBA", 0, ACPI_RTYPE_INTEGER}}, /* See PCI firmware spec 3.0 */
+       {{"_CDM", 0, ACPI_RTYPE_INTEGER}},
+       {{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,0}, 0,0}},
+
+       {{"_CRS", 0, ACPI_RTYPE_BUFFER}},
+       {{"_CRT", 0, ACPI_RTYPE_INTEGER}},
+       {{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */
+                         {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
+
+       {{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
+                         {{{ACPI_PTYPE2_PKG_COUNT,ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,0}},
+
+       {{"_DCK", 1, ACPI_RTYPE_INTEGER}},
+       {{"_DCS", 0, ACPI_RTYPE_INTEGER}},
+       {{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
+       {{"_DDN", 0, ACPI_RTYPE_STRING}},
+       {{"_DGS", 0, ACPI_RTYPE_INTEGER}},
+       {{"_DIS", 0, 0}},
+       {{"_DMA", 0, ACPI_RTYPE_BUFFER}},
+       {{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
+
+       {{"_DOS", 1, 0}},
+       {{"_DSM", 4, ACPI_RTYPE_ALL}},     /* Must return a type, but it can be of any type */
+       {{"_DSS", 1, 0}},
+       {{"_DSW", 3, 0}},
+       {{"_DTI", 1, 0}},
+       {{"_EC_", 0, ACPI_RTYPE_INTEGER}},
+       {{"_EDL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs)*/
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_EJ0", 1, 0}},
+       {{"_EJ1", 1, 0}},
+       {{"_EJ2", 1, 0}},
+       {{"_EJ3", 1, 0}},
+       {{"_EJ4", 1, 0}},
+       {{"_EJD", 0, ACPI_RTYPE_STRING}},
+       {{"_FDE", 0, ACPI_RTYPE_BUFFER}},
+       {{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},
+
+       {{"_FDM", 1, 0}},
+       {{"_FIF", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (4 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0}, 0, 0}},
+
+       {{"_FIX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
+
+       {{"_FPS", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (1 Int(rev), n Pkg (5 Int) */
+       {{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 5, 0}, 0, 0}},
+
+       {{"_FSL", 1, 0}},
+       {{"_FST", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
+
+       {{"_GAI", 0, ACPI_RTYPE_INTEGER}},
+       {{"_GHL", 0, ACPI_RTYPE_INTEGER}},
+       {{"_GLK", 0, ACPI_RTYPE_INTEGER}},
+       {{"_GPD", 0, ACPI_RTYPE_INTEGER}},
+       {{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */
+       {{"_GSB", 0, ACPI_RTYPE_INTEGER}},
+       {{"_GTF", 0, ACPI_RTYPE_BUFFER}},
+       {{"_GTM", 0, ACPI_RTYPE_BUFFER}},
+       {{"_GTS", 1, 0}},
+       {{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
+       {{"_HOT", 0, ACPI_RTYPE_INTEGER}},
+       {{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
 
        /*
-        * For _HPX, a single package is returned, containing a variable number of sub-packages.
-        * Each sub-package contains a PCI record setting. There are several different type of
-        * record settings, of different lengths, but all elements of all settings are Integers.
+        * For _HPX, a single package is returned, containing a Variable-length number
+        * of sub-packages. Each sub-package contains a PCI record setting.
+        * There are several different type of record settings, of different
+        * lengths, but all elements of all settings are Integers.
         */
-       {.info = {"_HPX", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},     /* variable (Pkgs) each (var Ints) */
-       {.info = {"_IFT", 0, ACPI_RTYPE_INTEGER}},      /* see IPMI spec */
-       {.info = {"_INI", 0, 0}},
-       {.info = {"_IRC", 0, 0}},
-       {.info = {"_LCK", 1, 0}},
-       {.info = {"_LID", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_MAT", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_MLS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_STRING, 2, 0, 0, 0}},  /* variable (Pkgs) each (2 Str) */
-       {.info = {"_MSG", 1, 0}},
-       {.info = {"_OFF", 0, 0}},
-       {.info = {"_ON_", 0, 0}},
-       {.info = {"_OS_", 0, ACPI_RTYPE_STRING}},
-       {.info = {"_OSC", 4, ACPI_RTYPE_BUFFER}},
-       {.info = {"_OST", 3, 0}},
-       {.info = {"_PCL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_PCT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0}},    /* fixed (2 Buf) */
-       {.info = {"_PDC", 1, 0}},
-       {.info = {"_PIC", 1, 0}},
-       {.info = {"_PLD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0, 0, 0, 0}},      /* variable (Bufs) */
-       {.info = {"_PPC", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_PPE", 0, ACPI_RTYPE_INTEGER}},      /* see dig64 spec */
-       {.info = {"_PR0", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_PR1", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_PR2", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_PRS", 0, ACPI_RTYPE_BUFFER}},
+       {{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */
+                         {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
+
+       {{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
+       {{"_INI", 0, 0}},
+       {{"_IRC", 0, 0}},
+       {{"_LCK", 1, 0}},
+       {{"_LID", 0, ACPI_RTYPE_INTEGER}},
+       {{"_MAT", 0, ACPI_RTYPE_BUFFER}},
+       {{"_MBM", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (8 Int) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 8, 0}, 0, 0}},
+
+       {{"_MLS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (2 Str) */
+                         {{{ACPI_PTYPE2, ACPI_RTYPE_STRING, 2,0}, 0,0}},
+
+       {{"_MSG", 1, 0}},
+       {{"_MSM", 4, ACPI_RTYPE_INTEGER}},
+       {{"_NTT", 0, ACPI_RTYPE_INTEGER}},
+       {{"_OFF", 0, 0}},
+       {{"_ON_", 0, 0}},
+       {{"_OS_", 0, ACPI_RTYPE_STRING}},
+       {{"_OSC", 4, ACPI_RTYPE_BUFFER}},
+       {{"_OST", 3, 0}},
+       {{"_PAI", 1, ACPI_RTYPE_INTEGER}},
+       {{"_PCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_PCT", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}},
+
+       {{"_PDC", 1, 0}},
+       {{"_PDL", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PIC", 1, 0}},
+       {{"_PIF", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int),(3 Str) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, ACPI_RTYPE_STRING}, 3, 0}},
+
+       {{"_PLD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Bufs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0,0}, 0,0}},
+
+       {{"_PMC", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (11 Int),(3 Str) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 11, ACPI_RTYPE_STRING}, 3,
+         0}},
+
+       {{"_PMD", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
+       {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
+
+       {{"_PMM", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PPC", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PPE", 0, ACPI_RTYPE_INTEGER}}, /* See dig64 spec */
+       {{"_PR0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_PR1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_PR2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_PR3", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
+       {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
+
+       {{"_PRL", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
+       {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
+
+       {{"_PRS", 0, ACPI_RTYPE_BUFFER}},
 
        /*
-        * For _PRT, many BIOSs reverse the 2nd and 3rd Package elements. This bug is so prevalent that there
-        * is code in the ACPICA Resource Manager to detect this and switch them back. For now, do not allow
-        * and issue a warning. To allow this and eliminate the warning, add the ACPI_RTYPE_REFERENCE
-        * type to the 2nd element (index 1) in the statement below.
+        * For _PRT, many BIOSs reverse the 3rd and 4th Package elements (Source
+        * and source_index). This bug is so prevalent that there is code in the
+        * ACPICA Resource Manager to detect this and switch them back. For now,
+        * do not allow and issue a warning. To allow this and eliminate the
+        * warning, add the ACPI_RTYPE_REFERENCE type to the 4th element (index 3)
+        * in the statement below.
         */
-       {.info = {"_PRT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_FIXED, 4,
-                                         ACPI_RTYPE_INTEGER,
-                                         ACPI_RTYPE_INTEGER,
-                                         ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE, ACPI_RTYPE_INTEGER}},      /* variable (Pkgs) each (4): Int,Int,Int/Ref,Int */
-
-       {.info = {"_PRW", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_OPTION, 2,
-                                         ACPI_RTYPE_INTEGER |
-                                         ACPI_RTYPE_PACKAGE,
-                                         ACPI_RTYPE_INTEGER, ACPI_RTYPE_REFERENCE, 0}},        /* variable (Pkgs) each: Pkg/Int,Int,[variable Refs] (Pkg is Ref/Int) */
-
-       {.info = {"_PS0", 0, 0}},
-       {.info = {"_PS1", 0, 0}},
-       {.info = {"_PS2", 0, 0}},
-       {.info = {"_PS3", 0, 0}},
-       {.info = {"_PSC", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_PSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},   /* variable (Pkgs) each (5 Int) with count */
-       {.info = {"_PSL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_PSR", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_PSS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6, 0, 0, 0}}, /* variable (Pkgs) each (6 Int) */
-       {.info = {"_PSV", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_PSW", 1, 0}},
-       {.info = {"_PTC", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0}},    /* fixed (2 Buf) */
-       {.info = {"_PTS", 1, 0}},
-       {.info = {"_PXM", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_REG", 2, 0}},
-       {.info = {"_REV", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_RMV", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_ROM", 2, ACPI_RTYPE_BUFFER}},
-       {.info = {"_RTV", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (4): Int,Int,Int/Ref,Int */
+                         {{{ACPI_PTYPE2_FIXED, 4, ACPI_RTYPE_INTEGER,ACPI_RTYPE_INTEGER},
+                         ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE,
+                         ACPI_RTYPE_INTEGER}},
+
+       {{"_PRW", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each: Pkg/Int,Int,[Variable-length Refs] (Pkg is Ref/Int) */
+                         {{{ACPI_PTYPE1_OPTION, 2, ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE,
+                         ACPI_RTYPE_INTEGER}, ACPI_RTYPE_REFERENCE,0}},
+
+       {{"_PS0", 0, 0}},
+       {{"_PS1", 0, 0}},
+       {{"_PS2", 0, 0}},
+       {{"_PS3", 0, 0}},
+       {{"_PSC", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */
+                         {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}},
+
+       {{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_PSR", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (6 Int) */
+                         {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6,0}, 0,0}},
+
+       {{"_PSV", 0, ACPI_RTYPE_INTEGER}},
+       {{"_PSW", 1, 0}},
+       {{"_PTC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}},
+
+       {{"_PTP", 2, ACPI_RTYPE_INTEGER}},
+       {{"_PTS", 1, 0}},
+       {{"_PUR", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (2 Int) */
+       {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0}, 0, 0}},
+
+       {{"_PXM", 0, ACPI_RTYPE_INTEGER}},
+       {{"_REG", 2, 0}},
+       {{"_REV", 0, ACPI_RTYPE_INTEGER}},
+       {{"_RMV", 0, ACPI_RTYPE_INTEGER}},
+       {{"_ROM", 2, ACPI_RTYPE_BUFFER}},
+       {{"_RTV", 0, ACPI_RTYPE_INTEGER}},
 
        /*
-        * For _S0_ through _S5_, the ACPI spec defines a return Package containing 1 Integer,
-        * but most DSDTs have it wrong - 2,3, or 4 integers. Allow this by making the objects "variable length",
-        * but all elements must be Integers.
+        * For _S0_ through _S5_, the ACPI spec defines a return Package
+        * containing 1 Integer, but most DSDTs have it wrong - 2,3, or 4 integers.
+        * Allow this by making the objects "Variable-length length", but all elements
+        * must be Integers.
         */
-       {.info = {"_S0_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-       {.info = {"_S1_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-       {.info = {"_S2_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-       {.info = {"_S3_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-       {.info = {"_S4_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-       {.info = {"_S5_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
-
-       {.info = {"_S1D", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S2D", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S3D", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S4D", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S0W", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S1W", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S2W", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S3W", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_S4W", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_SBS", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_SCP", 0x13, 0}},    /* Acpi 1.0 allowed 1 arg. Acpi 3.0 expanded to 3 args. Allow both. */
-       /* Note: the 3-arg definition may be removed for ACPI 4.0 */
-       {.info = {"_SDD", 1, 0}},
-       {.info = {"_SEG", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_SLI", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_SPD", 1, ACPI_RTYPE_INTEGER}},
-       {.info = {"_SRS", 1, 0}},
-       {.info = {"_SRV", 0, ACPI_RTYPE_INTEGER}},      /* see IPMI spec */
-       {.info = {"_SST", 1, 0}},
-       {.info = {"_STA", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_STM", 3, 0}},
-       {.info = {"_STR", 0, ACPI_RTYPE_BUFFER}},
-       {.info = {"_SUN", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_SWS", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TC1", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TC2", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TMP", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TPC", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TPT", 1, 0}},
-       {.info = {"_TRT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2,
-                                         ACPI_RTYPE_INTEGER, 6, 0}},   /* variable (Pkgs) each 2_ref/6_int */
-       {.info = {"_TSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},   /* variable (Pkgs) each 5_int with count */
-       {.info = {"_TSP", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TSS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}}, /* variable (Pkgs) each 5_int */
-       {.info = {"_TST", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_TTS", 1, 0}},
-       {.info = {"_TZD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
-       {.info = {"_TZM", 0, ACPI_RTYPE_REFERENCE}},
-       {.info = {"_TZP", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_UID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
-       {.info = {"_UPC", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
-       {.info = {"_UPD", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_UPP", 0, ACPI_RTYPE_INTEGER}},
-       {.info = {"_VPO", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S0_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S1_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S2_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S3_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S4_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S5_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
+
+       {{"_S1D", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S2D", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S3D", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S4D", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S0W", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S1W", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S2W", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S3W", 0, ACPI_RTYPE_INTEGER}},
+       {{"_S4W", 0, ACPI_RTYPE_INTEGER}},
+       {{"_SBS", 0, ACPI_RTYPE_INTEGER}},
+       {{"_SCP", 0x13, 0}},               /* Acpi 1.0 allowed 1 arg. Acpi 3.0 expanded to 3 args. Allow both. */
+                          /* Note: the 3-arg definition may be removed for ACPI 4.0 */
+       {{"_SDD", 1, 0}},
+       {{"_SEG", 0, ACPI_RTYPE_INTEGER}},
+       {{"_SHL", 1, ACPI_RTYPE_INTEGER}},
+       {{"_SLI", 0, ACPI_RTYPE_BUFFER}},
+       {{"_SPD", 1, ACPI_RTYPE_INTEGER}},
+       {{"_SRS", 1, 0}},
+       {{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
+       {{"_SST", 1, 0}},
+       {{"_STA", 0, ACPI_RTYPE_INTEGER}},
+       {{"_STM", 3, 0}},
+       {{"_STP", 2, ACPI_RTYPE_INTEGER}},
+       {{"_STR", 0, ACPI_RTYPE_BUFFER}},
+       {{"_STV", 2, ACPI_RTYPE_INTEGER}},
+       {{"_SUN", 0, ACPI_RTYPE_INTEGER}},
+       {{"_SWS", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TC1", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TC2", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TIP", 1, ACPI_RTYPE_INTEGER}},
+       {{"_TIV", 1, ACPI_RTYPE_INTEGER}},
+       {{"_TMP", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TPC", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TPT", 1, 0}},
+       {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2_ref/6_int */
+                         {{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
+
+       {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int with count */
+                         {{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
+
+       {{"_TSP", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int */
+                         {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
+
+       {{"_TST", 0, ACPI_RTYPE_INTEGER}},
+       {{"_TTS", 1, 0}},
+       {{"_TZD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
+                         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
+
+       {{"_TZM", 0, ACPI_RTYPE_REFERENCE}},
+       {{"_TZP", 0, ACPI_RTYPE_INTEGER}},
+       {{"_UID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
+       {{"_UPC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
+
+       {{"_UPD", 0, ACPI_RTYPE_INTEGER}},
+       {{"_UPP", 0, ACPI_RTYPE_INTEGER}},
+       {{"_VPO", 0, ACPI_RTYPE_INTEGER}},
 
        /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
 
-       {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
-       {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}},      /* fixed (2 Int), but is optional */
-       {.ret_info = {0, 0, 0, 0, 0, 0}}        /* Table terminator */
+       {{"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
+                         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */
+
+       {{{0,0,0,0}, 0,0}} /* Table terminator */
 };
 
 #if 0
        /* Not implemented */
 
-{
-"_WDG", 0, ACPI_RTYPE_BUFFER}, /* MS Extension */
+       {{"_WDG", 0, ACPI_RTYPE_BUFFER}},  /* MS Extension */
+       {{"_WED", 1, ACPI_RTYPE_PACKAGE}}, /* MS Extension */
 
-{
-"_WED", 1, ACPI_RTYPE_PACKAGE},        /* MS Extension */
+       /* This is an internally implemented control method, no need to check */
+       {{"_OSI", 1, ACPI_RTYPE_INTEGER}},
 
-    /* This is an internally implemented control method, no need to check */
-{
-"_OSI", 1, ACPI_RTYPE_INTEGER},
+       /* TBD: */
+
+       _PRT - currently ignore reversed entries. attempt to fix here?
+       think about possibly fixing package elements like _BIF, etc.
+#endif
 
-    /* TBD: */
-    _PRT - currently ignore reversed entries.attempt to fix here ?
-    think about code that attempts to fix package elements like _BIF, etc.
 #endif
 #endif
index 897810b..863a264 100644 (file)
@@ -324,26 +324,30 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
                                struct acpi_namespace_node *device_node,
-                               acpi_integer * address);
+                               acpi_integer *value);
 
 acpi_status
-acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                   struct acpica_device_id *hid);
+acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 *status_flags);
 
 acpi_status
-acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                   struct acpi_compatible_id_list **return_cid_list);
+acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
+                             const char **method_names,
+                             u8 method_count, u8 *out_values);
 
+/*
+ * utids - device ID support
+ */
 acpi_status
-acpi_ut_execute_STA(struct acpi_namespace_node *device_node,
-                   u32 * status_flags);
+acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
+                   struct acpica_device_id **return_id);
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                   struct acpica_device_id *uid);
+                   struct acpica_device_id **return_id);
 
 acpi_status
-acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest);
+acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
+                   struct acpica_device_id_list **return_cid_list);
 
 /*
  * utlock - reader/writer locks
@@ -445,6 +449,8 @@ acpi_ut_short_divide(acpi_integer in_dividend,
  */
 const char *acpi_ut_validate_exception(acpi_status status);
 
+u8 acpi_ut_is_pci_root_bridge(char *id);
+
 u8 acpi_ut_is_aml_table(struct acpi_table_header *table);
 
 acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id);
@@ -469,6 +475,12 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position);
 acpi_status
 acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer);
 
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_warning(const char *module_name,
+                          u32 line_number,
+                          char *pathname,
+                          u8 node_flags, const char *format, ...);
+
 /* Values for Base above (16=Hex, 10=Decimal) */
 
 #define ACPI_ANY_BASE        0
index 067f967..4940249 100644 (file)
@@ -404,6 +404,7 @@ typedef enum {
        REGION_SMBUS,
        REGION_CMOS,
        REGION_PCI_BAR,
+       REGION_IPMI,
        REGION_DATA_TABLE,      /* Internal use only */
        REGION_FIXED_HW = 0x7F
 } AML_REGION_TYPES;
index 53e27bc..54a225e 100644 (file)
@@ -123,9 +123,12 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
                    ACPI_NS_ERROR_IF_FOUND;
 
-               /* Mark node temporary if we are executing a method */
-
-               if (walk_state->method_node) {
+               /*
+                * Mark node temporary if we are executing a normal control
+                * method. (Don't mark if this is a module-level code method)
+                */
+               if (walk_state->method_node &&
+                   !(walk_state->parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
                        flags |= ACPI_NS_TEMPORARY;
                }
 
@@ -456,9 +459,12 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
        flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
            ACPI_NS_ERROR_IF_FOUND;
 
-       /* Mark node(s) temporary if we are executing a method */
-
-       if (walk_state->method_node) {
+       /*
+        * Mark node(s) temporary if we are executing a normal control
+        * method. (Don't mark if this is a module-level code method)
+        */
+       if (walk_state->method_node &&
+           !(walk_state->parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
                flags |= ACPI_NS_TEMPORARY;
        }
 
index 14b8b8e..567a489 100644 (file)
@@ -578,10 +578,15 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                }
 
                /*
-                * Delete any namespace objects created anywhere within
-                * the namespace by the execution of this method
+                * Delete any namespace objects created anywhere within the
+                * namespace by the execution of this method. Unless this method
+                * is a module-level executable code method, in which case we
+                * want make the objects permanent.
                 */
-               acpi_ns_delete_namespace_by_owner(method_desc->method.owner_id);
+               if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                       acpi_ns_delete_namespace_by_owner(method_desc->method.
+                                                         owner_id);
+               }
        }
 
        /* Decrement the thread count on the method */
@@ -622,7 +627,9 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                /* No more threads, we can free the owner_id */
 
-               acpi_ut_release_owner_id(&method_desc->method.owner_id);
+               if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                       acpi_ut_release_owner_id(&method_desc->method.owner_id);
+               }
        }
 
        return_VOID;
index 22b1a3c..7d077bb 100644 (file)
@@ -433,10 +433,10 @@ acpi_ds_method_data_get_value(u8 type,
 
                        case ACPI_REFCLASS_LOCAL:
 
-                               ACPI_ERROR((AE_INFO,
-                                           "Uninitialized Local[%d] at node %p",
-                                           index, node));
-
+                               /*
+                                * No error message for this case, will be trapped again later to
+                                * detect and ignore cases of Store(local_x,local_x)
+                                */
                                return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);
 
                        default:
index 02e6caa..507e1f0 100644 (file)
@@ -482,14 +482,27 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
        if (arg) {
                /*
                 * num_elements was exhausted, but there are remaining elements in the
-                * package_list.
+                * package_list. Truncate the package to num_elements.
                 *
                 * Note: technically, this is an error, from ACPI spec: "It is an error
                 * for NumElements to be less than the number of elements in the
-                * PackageList". However, for now, we just print an error message and
-                * no exception is returned.
+                * PackageList". However, we just print an error message and
+                * no exception is returned. This provides Windows compatibility. Some
+                * BIOSs will alter the num_elements on the fly, creating this type
+                * of ill-formed package object.
                 */
                while (arg) {
+                       /*
+                        * We must delete any package elements that were created earlier
+                        * and are not going to be used because of the package truncation.
+                        */
+                       if (arg->common.node) {
+                               acpi_ut_remove_reference(ACPI_CAST_PTR
+                                                        (union
+                                                         acpi_operand_object,
+                                                         arg->common.node));
+                               arg->common.node = NULL;
+                       }
 
                        /* Find out how many elements there really are */
 
@@ -498,7 +511,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                }
 
                ACPI_WARNING((AE_INFO,
-                           "Package List length (%X) larger than NumElements count (%X), truncated\n",
+                           "Package List length (0x%X) larger than NumElements count (0x%X), truncated\n",
                            i, element_count));
        } else if (i < element_count) {
                /*
@@ -506,7 +519,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                 * Note: this is not an error, the package is padded out with NULLs.
                 */
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Package List length (%X) smaller than NumElements count (%X), padded with null elements\n",
+                                 "Package List length (0x%X) smaller than NumElements count (0x%X), padded with null elements\n",
                                  i, element_count));
        }
 
index 3023cea..6de3a99 100644 (file)
@@ -581,21 +581,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
                     (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
                    (!(walk_state->op_info->flags & AML_NAMED))) {
-#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-                       if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
-                           (walk_state->op_info->class == AML_CLASS_CONTROL)) {
-                               ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                                 "Begin/EXEC: %s (fl %8.8X)\n",
-                                                 walk_state->op_info->name,
-                                                 walk_state->op_info->flags));
-
-                               /* Executing a type1 or type2 opcode outside of a method */
-
-                               status =
-                                   acpi_ds_exec_begin_op(walk_state, out_op);
-                               return_ACPI_STATUS(status);
-                       }
-#endif
                        return_ACPI_STATUS(AE_OK);
                }
 
@@ -768,7 +753,13 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
 
                        /* Execution mode, node cannot already exist, node is temporary */
 
-                       flags |= (ACPI_NS_ERROR_IF_FOUND | ACPI_NS_TEMPORARY);
+                       flags |= ACPI_NS_ERROR_IF_FOUND;
+
+                       if (!
+                           (walk_state->
+                            parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
+                               flags |= ACPI_NS_TEMPORARY;
+                       }
                }
 
                /* Add new entry or lookup existing entry */
@@ -851,24 +842,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
        /* Check if opcode had an associated namespace object */
 
        if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
-#ifndef ACPI_NO_METHOD_EXECUTION
-#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-               /* No namespace object. Executable opcode? */
-
-               if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
-                   (walk_state->op_info->class == AML_CLASS_CONTROL)) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                         "End/EXEC:   %s (fl %8.8X)\n",
-                                         walk_state->op_info->name,
-                                         walk_state->op_info->flags));
-
-                       /* Executing a type1 or type2 opcode outside of a method */
-
-                       status = acpi_ds_exec_end_op(walk_state);
-                       return_ACPI_STATUS(status);
-               }
-#endif
-#endif
                return_ACPI_STATUS(AE_OK);
        }
 
index b9d8ee6..afacf44 100644 (file)
@@ -424,8 +424,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                        /* Read the Status Register */
 
                        status =
-                           acpi_read(&status_reg,
-                                     &gpe_register_info->status_address);
+                           acpi_hw_read(&status_reg,
+                                        &gpe_register_info->status_address);
                        if (ACPI_FAILURE(status)) {
                                goto unlock_and_exit;
                        }
@@ -433,8 +433,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                        /* Read the Enable Register */
 
                        status =
-                           acpi_read(&enable_reg,
-                                     &gpe_register_info->enable_address);
+                           acpi_hw_read(&enable_reg,
+                                        &gpe_register_info->enable_address);
                        if (ACPI_FAILURE(status)) {
                                goto unlock_and_exit;
                        }
index 7b34636..a60aaa7 100644 (file)
@@ -843,14 +843,14 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 
                /* Disable all GPEs within this register */
 
-               status = acpi_write(0x00, &this_register->enable_address);
+               status = acpi_hw_write(0x00, &this_register->enable_address);
                if (ACPI_FAILURE(status)) {
                        goto error_exit;
                }
 
                /* Clear any pending GPE events within this register */
 
-               status = acpi_write(0xFF, &this_register->status_address);
+               status = acpi_hw_write(0xFF, &this_register->status_address);
                if (ACPI_FAILURE(status)) {
                        goto error_exit;
                }
index 284a7be..cf29c49 100644 (file)
@@ -50,8 +50,6 @@
 ACPI_MODULE_NAME("evrgnini")
 
 /* Local prototypes */
-static u8 acpi_ev_match_pci_root_bridge(char *id);
-
 static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);
 
 /*******************************************************************************
@@ -330,37 +328,6 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
        return_ACPI_STATUS(AE_OK);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_match_pci_root_bridge
- *
- * PARAMETERS:  Id              - The HID/CID in string format
- *
- * RETURN:      TRUE if the Id is a match for a PCI/PCI-Express Root Bridge
- *
- * DESCRIPTION: Determine if the input ID is a PCI Root Bridge ID.
- *
- ******************************************************************************/
-
-static u8 acpi_ev_match_pci_root_bridge(char *id)
-{
-
-       /*
-        * Check if this is a PCI root.
-        * ACPI 3.0+: check for a PCI Express root also.
-        */
-       if (!(ACPI_STRNCMP(id,
-                          PCI_ROOT_HID_STRING,
-                          sizeof(PCI_ROOT_HID_STRING))) ||
-           !(ACPI_STRNCMP(id,
-                          PCI_EXPRESS_ROOT_HID_STRING,
-                          sizeof(PCI_EXPRESS_ROOT_HID_STRING)))) {
-               return (TRUE);
-       }
-
-       return (FALSE);
-}
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_is_pci_root_bridge
@@ -377,9 +344,10 @@ static u8 acpi_ev_match_pci_root_bridge(char *id)
 static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
 {
        acpi_status status;
-       struct acpica_device_id hid;
-       struct acpi_compatible_id_list *cid;
+       struct acpica_device_id *hid;
+       struct acpica_device_id_list *cid;
        u32 i;
+       u8 match;
 
        /* Get the _HID and check for a PCI Root Bridge */
 
@@ -388,7 +356,10 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
                return (FALSE);
        }
 
-       if (acpi_ev_match_pci_root_bridge(hid.value)) {
+       match = acpi_ut_is_pci_root_bridge(hid->string);
+       ACPI_FREE(hid);
+
+       if (match) {
                return (TRUE);
        }
 
@@ -402,7 +373,7 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
        /* Check all _CIDs in the returned list */
 
        for (i = 0; i < cid->count; i++) {
-               if (acpi_ev_match_pci_root_bridge(cid->id[i].value)) {
+               if (acpi_ut_is_pci_root_bridge(cid->ids[i].string)) {
                        ACPI_FREE(cid);
                        return (TRUE);
                }
index 277fd60..24afef8 100644 (file)
@@ -110,8 +110,15 @@ acpi_ex_add_table(u32 table_index,
        if (ACPI_FAILURE(status)) {
                acpi_ut_remove_reference(obj_desc);
                *ddb_handle = NULL;
+               return_ACPI_STATUS(status);
        }
 
+       /* Execute any module-level code that was found in the table */
+
+       acpi_ex_exit_interpreter();
+       acpi_ns_exec_module_code_list();
+       acpi_ex_enter_interpreter();
+
        return_ACPI_STATUS(status);
 }
 
index ec52461..de34463 100644 (file)
@@ -418,9 +418,9 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
                case ACPI_EXD_REFERENCE:
 
                        acpi_ex_out_string("Class Name",
-                                          (char *)
-                                          acpi_ut_get_reference_name
-                                          (obj_desc));
+                                          ACPI_CAST_PTR(char,
+                                                        acpi_ut_get_reference_name
+                                                        (obj_desc)));
                        acpi_ex_dump_reference_obj(obj_desc);
                        break;
 
index 546dcdd..0b33d6c 100644 (file)
@@ -72,6 +72,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
        union acpi_operand_object *buffer_desc;
        acpi_size length;
        void *buffer;
+       u32 function;
 
        ACPI_FUNCTION_TRACE_PTR(ex_read_data_from_field, obj_desc);
 
@@ -97,13 +98,27 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
                }
        } else if ((obj_desc->common.type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
                   (obj_desc->field.region_obj->region.space_id ==
-                   ACPI_ADR_SPACE_SMBUS)) {
+                   ACPI_ADR_SPACE_SMBUS
+                   || obj_desc->field.region_obj->region.space_id ==
+                   ACPI_ADR_SPACE_IPMI)) {
                /*
-                * This is an SMBus read.  We must create a buffer to hold the data
-                * and directly access the region handler.
+                * This is an SMBus or IPMI read. We must create a buffer to hold
+                * the data and then directly access the region handler.
+                *
+                * Note: Smbus protocol value is passed in upper 16-bits of Function
                 */
-               buffer_desc =
-                   acpi_ut_create_buffer_object(ACPI_SMBUS_BUFFER_SIZE);
+               if (obj_desc->field.region_obj->region.space_id ==
+                   ACPI_ADR_SPACE_SMBUS) {
+                       length = ACPI_SMBUS_BUFFER_SIZE;
+                       function =
+                           ACPI_READ | (obj_desc->field.attribute << 16);
+               } else {        /* IPMI */
+
+                       length = ACPI_IPMI_BUFFER_SIZE;
+                       function = ACPI_READ;
+               }
+
+               buffer_desc = acpi_ut_create_buffer_object(length);
                if (!buffer_desc) {
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
@@ -112,16 +127,13 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
 
                acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
-               /*
-                * Perform the read.
-                * Note: Smbus protocol value is passed in upper 16-bits of Function
-                */
+               /* Call the region handler for the read */
+
                status = acpi_ex_access_region(obj_desc, 0,
                                               ACPI_CAST_PTR(acpi_integer,
                                                             buffer_desc->
                                                             buffer.pointer),
-                                              ACPI_READ | (obj_desc->field.
-                                                           attribute << 16));
+                                              function);
                acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
                goto exit;
        }
@@ -212,6 +224,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
        u32 length;
        void *buffer;
        union acpi_operand_object *buffer_desc;
+       u32 function;
 
        ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);
 
@@ -234,39 +247,56 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                }
        } else if ((obj_desc->common.type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
                   (obj_desc->field.region_obj->region.space_id ==
-                   ACPI_ADR_SPACE_SMBUS)) {
+                   ACPI_ADR_SPACE_SMBUS
+                   || obj_desc->field.region_obj->region.space_id ==
+                   ACPI_ADR_SPACE_IPMI)) {
                /*
-                * This is an SMBus write.  We will bypass the entire field mechanism
-                * and handoff the buffer directly to the handler.
+                * This is an SMBus or IPMI write. We will bypass the entire field
+                * mechanism and handoff the buffer directly to the handler. For
+                * these address spaces, the buffer is bi-directional; on a write,
+                * return data is returned in the same buffer.
+                *
+                * Source must be a buffer of sufficient size:
+                * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE.
                 *
-                * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE).
+                * Note: SMBus protocol type is passed in upper 16-bits of Function
                 */
                if (source_desc->common.type != ACPI_TYPE_BUFFER) {
                        ACPI_ERROR((AE_INFO,
-                                   "SMBus write requires Buffer, found type %s",
+                                   "SMBus or IPMI write requires Buffer, found type %s",
                                    acpi_ut_get_object_type_name(source_desc)));
 
                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                }
 
-               if (source_desc->buffer.length < ACPI_SMBUS_BUFFER_SIZE) {
+               if (obj_desc->field.region_obj->region.space_id ==
+                   ACPI_ADR_SPACE_SMBUS) {
+                       length = ACPI_SMBUS_BUFFER_SIZE;
+                       function =
+                           ACPI_WRITE | (obj_desc->field.attribute << 16);
+               } else {        /* IPMI */
+
+                       length = ACPI_IPMI_BUFFER_SIZE;
+                       function = ACPI_WRITE;
+               }
+
+               if (source_desc->buffer.length < length) {
                        ACPI_ERROR((AE_INFO,
-                                   "SMBus write requires Buffer of length %X, found length %X",
-                                   ACPI_SMBUS_BUFFER_SIZE,
-                                   source_desc->buffer.length));
+                                   "SMBus or IPMI write requires Buffer of length %X, found length %X",
+                                   length, source_desc->buffer.length));
 
                        return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
                }
 
-               buffer_desc =
-                   acpi_ut_create_buffer_object(ACPI_SMBUS_BUFFER_SIZE);
+               /* Create the bi-directional buffer */
+
+               buffer_desc = acpi_ut_create_buffer_object(length);
                if (!buffer_desc) {
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
 
                buffer = buffer_desc->buffer.pointer;
-               ACPI_MEMCPY(buffer, source_desc->buffer.pointer,
-                           ACPI_SMBUS_BUFFER_SIZE);
+               ACPI_MEMCPY(buffer, source_desc->buffer.pointer, length);
 
                /* Lock entire transaction if requested */
 
@@ -275,12 +305,10 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                /*
                 * Perform the write (returns status and perhaps data in the
                 * same buffer)
-                * Note: SMBus protocol type is passed in upper 16-bits of Function.
                 */
                status = acpi_ex_access_region(obj_desc, 0,
                                               (acpi_integer *) buffer,
-                                              ACPI_WRITE | (obj_desc->field.
-                                                            attribute << 16));
+                                              function);
                acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
 
                *result_desc = buffer_desc;
index 6687be1..d7b3b41 100644 (file)
@@ -120,12 +120,13 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
        }
 
        /*
-        * Exit now for SMBus address space, it has a non-linear address space
+        * Exit now for SMBus or IPMI address space, it has a non-linear address space
         * and the request cannot be directly validated
         */
-       if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS) {
+       if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS ||
+           rgn_desc->region.space_id == ACPI_ADR_SPACE_IPMI) {
 
-               /* SMBus has a non-linear address space */
+               /* SMBus or IPMI has a non-linear address space */
 
                return_ACPI_STATUS(AE_OK);
        }
index 87730e9..7d41f99 100644 (file)
@@ -358,50 +358,67 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
  *
  * FUNCTION:    acpi_ex_eisa_id_to_string
  *
- * PARAMETERS:  numeric_id      - EISA ID to be converted
+ * PARAMETERS:  compressed_id   - EISAID to be converted
  *              out_string      - Where to put the converted string (8 bytes)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Convert a numeric EISA ID to string representation
+ * DESCRIPTION: Convert a numeric EISAID to string representation. Return
+ *              buffer must be large enough to hold the string. The string
+ *              returned is always exactly of length ACPI_EISAID_STRING_SIZE
+ *              (includes null terminator). The EISAID is always 32 bits.
  *
  ******************************************************************************/
 
-void acpi_ex_eisa_id_to_string(u32 numeric_id, char *out_string)
+void acpi_ex_eisa_id_to_string(char *out_string, acpi_integer compressed_id)
 {
-       u32 eisa_id;
+       u32 swapped_id;
 
        ACPI_FUNCTION_ENTRY();
 
+       /* The EISAID should be a 32-bit integer */
+
+       if (compressed_id > ACPI_UINT32_MAX) {
+               ACPI_WARNING((AE_INFO,
+                             "Expected EISAID is larger than 32 bits: 0x%8.8X%8.8X, truncating",
+                             ACPI_FORMAT_UINT64(compressed_id)));
+       }
+
        /* Swap ID to big-endian to get contiguous bits */
 
-       eisa_id = acpi_ut_dword_byte_swap(numeric_id);
+       swapped_id = acpi_ut_dword_byte_swap((u32)compressed_id);
 
-       out_string[0] = (char)('@' + (((unsigned long)eisa_id >> 26) & 0x1f));
-       out_string[1] = (char)('@' + ((eisa_id >> 21) & 0x1f));
-       out_string[2] = (char)('@' + ((eisa_id >> 16) & 0x1f));
-       out_string[3] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 12);
-       out_string[4] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 8);
-       out_string[5] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 4);
-       out_string[6] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 0);
+       /* First 3 bytes are uppercase letters. Next 4 bytes are hexadecimal */
+
+       out_string[0] =
+           (char)(0x40 + (((unsigned long)swapped_id >> 26) & 0x1F));
+       out_string[1] = (char)(0x40 + ((swapped_id >> 21) & 0x1F));
+       out_string[2] = (char)(0x40 + ((swapped_id >> 16) & 0x1F));
+       out_string[3] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 12);
+       out_string[4] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 8);
+       out_string[5] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 4);
+       out_string[6] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 0);
        out_string[7] = 0;
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_unsigned_integer_to_string
+ * FUNCTION:    acpi_ex_integer_to_string
  *
- * PARAMETERS:  Value           - Value to be converted
- *              out_string      - Where to put the converted string (8 bytes)
+ * PARAMETERS:  out_string      - Where to put the converted string. At least
+ *                                21 bytes are needed to hold the largest
+ *                                possible 64-bit integer.
+ *              Value           - Value to be converted
  *
  * RETURN:      None, string
  *
- * DESCRIPTION: Convert a number to string representation. Assumes string
- *              buffer is large enough to hold the string.
+ * DESCRIPTION: Convert a 64-bit integer to decimal string representation.
+ *              Assumes string buffer is large enough to hold the string. The
+ *              largest string is (ACPI_MAX64_DECIMAL_DIGITS + 1).
  *
  ******************************************************************************/
 
-void acpi_ex_unsigned_integer_to_string(acpi_integer value, char *out_string)
+void acpi_ex_integer_to_string(char *out_string, acpi_integer value)
 {
        u32 count;
        u32 digits_needed;
index d3b7e37..c28c41b 100644 (file)
@@ -82,7 +82,7 @@ acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
        /* Get current value of the enable register that contains this GPE */
 
-       status = acpi_read(&enable_mask, &gpe_register_info->enable_address);
+       status = acpi_hw_read(&enable_mask, &gpe_register_info->enable_address);
        if (ACPI_FAILURE(status)) {
                return (status);
        }
@@ -95,7 +95,7 @@ acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
        /* Write the updated enable mask */
 
-       status = acpi_write(enable_mask, &gpe_register_info->enable_address);
+       status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);
        return (status);
 }
 
@@ -130,8 +130,8 @@ acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info * gpe_event_info)
 
        /* Write the entire GPE (runtime) enable register */
 
-       status = acpi_write(gpe_register_info->enable_for_run,
-                           &gpe_register_info->enable_address);
+       status = acpi_hw_write(gpe_register_info->enable_for_run,
+                              &gpe_register_info->enable_address);
 
        return (status);
 }
@@ -163,8 +163,8 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
         * Write a one to the appropriate bit in the status register to
         * clear this GPE.
         */
-       status = acpi_write(register_bit,
-                           &gpe_event_info->register_info->status_address);
+       status = acpi_hw_write(register_bit,
+                              &gpe_event_info->register_info->status_address);
 
        return (status);
 }
@@ -222,7 +222,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
 
        /* GPE currently active (status bit == 1)? */
 
-       status = acpi_read(&in_byte, &gpe_register_info->status_address);
+       status = acpi_hw_read(&in_byte, &gpe_register_info->status_address);
        if (ACPI_FAILURE(status)) {
                goto unlock_and_exit;
        }
@@ -266,8 +266,8 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                /* Disable all GPEs in this register */
 
                status =
-                   acpi_write(0x00,
-                              &gpe_block->register_info[i].enable_address);
+                   acpi_hw_write(0x00,
+                                 &gpe_block->register_info[i].enable_address);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
@@ -303,8 +303,8 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                /* Clear status on all GPEs in this register */
 
                status =
-                   acpi_write(0xFF,
-                              &gpe_block->register_info[i].status_address);
+                   acpi_hw_write(0xFF,
+                                 &gpe_block->register_info[i].status_address);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
@@ -345,9 +345,9 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
                /* Enable all "runtime" GPEs in this register */
 
-               status = acpi_write(gpe_block->register_info[i].enable_for_run,
-                                   &gpe_block->register_info[i].
-                                   enable_address);
+               status =
+                   acpi_hw_write(gpe_block->register_info[i].enable_for_run,
+                                 &gpe_block->register_info[i].enable_address);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
@@ -387,9 +387,9 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
                /* Enable all "wake" GPEs in this register */
 
-               status = acpi_write(gpe_block->register_info[i].enable_for_wake,
-                                   &gpe_block->register_info[i].
-                                   enable_address);
+               status =
+                   acpi_hw_write(gpe_block->register_info[i].enable_for_wake,
+                                 &gpe_block->register_info[i].enable_address);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
index 23d5505..15c9ed2 100644 (file)
@@ -62,6 +62,184 @@ acpi_hw_write_multiple(u32 value,
                       struct acpi_generic_address *register_a,
                       struct acpi_generic_address *register_b);
 
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_validate_register
+ *
+ * PARAMETERS:  Reg                 - GAS register structure
+ *              max_bit_width       - Max bit_width supported (32 or 64)
+ *              Address             - Pointer to where the gas->address
+ *                                    is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Validate the contents of a GAS register. Checks the GAS
+ *              pointer, Address, space_id, bit_width, and bit_offset.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_hw_validate_register(struct acpi_generic_address *reg,
+                         u8 max_bit_width, u64 *address)
+{
+
+       /* Must have a valid pointer to a GAS structure */
+
+       if (!reg) {
+               return (AE_BAD_PARAMETER);
+       }
+
+       /*
+        * Copy the target address. This handles possible alignment issues.
+        * Address must not be null. A null address also indicates an optional
+        * ACPI register that is not supported, so no error message.
+        */
+       ACPI_MOVE_64_TO_64(address, &reg->address);
+       if (!(*address)) {
+               return (AE_BAD_ADDRESS);
+       }
+
+       /* Validate the space_iD */
+
+       if ((reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
+           (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
+               ACPI_ERROR((AE_INFO,
+                           "Unsupported address space: 0x%X", reg->space_id));
+               return (AE_SUPPORT);
+       }
+
+       /* Validate the bit_width */
+
+       if ((reg->bit_width != 8) &&
+           (reg->bit_width != 16) &&
+           (reg->bit_width != 32) && (reg->bit_width != max_bit_width)) {
+               ACPI_ERROR((AE_INFO,
+                           "Unsupported register bit width: 0x%X",
+                           reg->bit_width));
+               return (AE_SUPPORT);
+       }
+
+       /* Validate the bit_offset. Just a warning for now. */
+
+       if (reg->bit_offset != 0) {
+               ACPI_WARNING((AE_INFO,
+                             "Unsupported register bit offset: 0x%X",
+                             reg->bit_offset));
+       }
+
+       return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_read
+ *
+ * PARAMETERS:  Value               - Where the value is returned
+ *              Reg                 - GAS register structure
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Read from either memory or IO space. This is a 32-bit max
+ *              version of acpi_read, used internally since the overhead of
+ *              64-bit values is not needed.
+ *
+ * LIMITATIONS: <These limitations also apply to acpi_hw_write>
+ *      bit_width must be exactly 8, 16, or 32.
+ *      space_iD must be system_memory or system_iO.
+ *      bit_offset and access_width are currently ignored, as there has
+ *          not been a need to implement these.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
+{
+       u64 address;
+       acpi_status status;
+
+       ACPI_FUNCTION_NAME(hw_read);
+
+       /* Validate contents of the GAS register */
+
+       status = acpi_hw_validate_register(reg, 32, &address);
+       if (ACPI_FAILURE(status)) {
+               return (status);
+       }
+
+       /* Initialize entire 32-bit return value to zero */
+
+       *value = 0;
+
+       /*
+        * Two address spaces supported: Memory or IO. PCI_Config is
+        * not supported here because the GAS structure is insufficient
+        */
+       if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+               status = acpi_os_read_memory((acpi_physical_address)
+                                            address, value, reg->bit_width);
+       } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+
+               status = acpi_hw_read_port((acpi_io_address)
+                                          address, value, reg->bit_width);
+       }
+
+       ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                         "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
+                         *value, reg->bit_width, ACPI_FORMAT_UINT64(address),
+                         acpi_ut_get_region_name(reg->space_id)));
+
+       return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_write
+ *
+ * PARAMETERS:  Value               - Value to be written
+ *              Reg                 - GAS register structure
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Write to either memory or IO space. This is a 32-bit max
+ *              version of acpi_write, used internally since the overhead of
+ *              64-bit values is not needed.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
+{
+       u64 address;
+       acpi_status status;
+
+       ACPI_FUNCTION_NAME(hw_write);
+
+       /* Validate contents of the GAS register */
+
+       status = acpi_hw_validate_register(reg, 32, &address);
+       if (ACPI_FAILURE(status)) {
+               return (status);
+       }
+
+       /*
+        * Two address spaces supported: Memory or IO. PCI_Config is
+        * not supported here because the GAS structure is insufficient
+        */
+       if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+               status = acpi_os_write_memory((acpi_physical_address)
+                                             address, value, reg->bit_width);
+       } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+
+               status = acpi_hw_write_port((acpi_io_address)
+                                           address, value, reg->bit_width);
+       }
+
+       ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                         "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
+                         value, reg->bit_width, ACPI_FORMAT_UINT64(address),
+                         acpi_ut_get_region_name(reg->space_id)));
+
+       return (status);
+}
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_hw_clear_acpi_status
@@ -152,15 +330,16 @@ acpi_status acpi_hw_write_pm1_control(u32 pm1a_control, u32 pm1b_control)
 
        ACPI_FUNCTION_TRACE(hw_write_pm1_control);
 
-       status = acpi_write(pm1a_control, &acpi_gbl_FADT.xpm1a_control_block);
+       status =
+           acpi_hw_write(pm1a_control, &acpi_gbl_FADT.xpm1a_control_block);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
 
        if (acpi_gbl_FADT.xpm1b_control_block.address) {
                status =
-                   acpi_write(pm1b_control,
-                              &acpi_gbl_FADT.xpm1b_control_block);
+                   acpi_hw_write(pm1b_control,
+                                 &acpi_gbl_FADT.xpm1b_control_block);
        }
        return_ACPI_STATUS(status);
 }
@@ -218,12 +397,13 @@ acpi_hw_register_read(u32 register_id, u32 * return_value)
 
        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
 
-               status = acpi_read(&value, &acpi_gbl_FADT.xpm2_control_block);
+               status =
+                   acpi_hw_read(&value, &acpi_gbl_FADT.xpm2_control_block);
                break;
 
        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
 
-               status = acpi_read(&value, &acpi_gbl_FADT.xpm_timer_block);
+               status = acpi_hw_read(&value, &acpi_gbl_FADT.xpm_timer_block);
                break;
 
        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
@@ -340,7 +520,8 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                 * as per the ACPI spec.
                 */
                status =
-                   acpi_read(&read_value, &acpi_gbl_FADT.xpm2_control_block);
+                   acpi_hw_read(&read_value,
+                                &acpi_gbl_FADT.xpm2_control_block);
                if (ACPI_FAILURE(status)) {
                        goto exit;
                }
@@ -350,12 +531,13 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                ACPI_INSERT_BITS(value, ACPI_PM2_CONTROL_PRESERVED_BITS,
                                 read_value);
 
-               status = acpi_write(value, &acpi_gbl_FADT.xpm2_control_block);
+               status =
+                   acpi_hw_write(value, &acpi_gbl_FADT.xpm2_control_block);
                break;
 
        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
 
-               status = acpi_write(value, &acpi_gbl_FADT.xpm_timer_block);
+               status = acpi_hw_write(value, &acpi_gbl_FADT.xpm_timer_block);
                break;
 
        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
@@ -401,7 +583,7 @@ acpi_hw_read_multiple(u32 *value,
 
        /* The first register is always required */
 
-       status = acpi_read(&value_a, register_a);
+       status = acpi_hw_read(&value_a, register_a);
        if (ACPI_FAILURE(status)) {
                return (status);
        }
@@ -409,7 +591,7 @@ acpi_hw_read_multiple(u32 *value,
        /* Second register is optional */
 
        if (register_b->address) {
-               status = acpi_read(&value_b, register_b);
+               status = acpi_hw_read(&value_b, register_b);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
@@ -452,7 +634,7 @@ acpi_hw_write_multiple(u32 value,
 
        /* The first register is always required */
 
-       status = acpi_write(value, register_a);
+       status = acpi_hw_write(value, register_a);
        if (ACPI_FAILURE(status)) {
                return (status);
        }
@@ -470,7 +652,7 @@ acpi_hw_write_multiple(u32 value,
         * and writes have no side effects"
         */
        if (register_b->address) {
-               status = acpi_write(value, register_b);
+               status = acpi_hw_write(value, register_b);
        }
 
        return (status);
index b7f522c..6b282e8 100644 (file)
@@ -100,7 +100,7 @@ acpi_status acpi_get_timer(u32 * ticks)
        }
 
        status =
-           acpi_hw_low_level_read(32, ticks, &acpi_gbl_FADT.xpm_timer_block);
+           acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
 
        return_ACPI_STATUS(status);
 }
index 9829979..647c7b6 100644 (file)
@@ -78,9 +78,22 @@ acpi_status acpi_reset(void)
                return_ACPI_STATUS(AE_NOT_EXIST);
        }
 
-       /* Write the reset value to the reset register */
+       if (reset_reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
+               /*
+                * For I/O space, write directly to the OSL. This bypasses the port
+                * validation mechanism, which may block a valid write to the reset
+                * register.
+                */
+               status =
+                   acpi_os_write_port((acpi_io_address) reset_reg->address,
+                                      acpi_gbl_FADT.reset_value,
+                                      reset_reg->bit_width);
+       } else {
+               /* Write the reset value to the reset register */
+
+               status = acpi_hw_write(acpi_gbl_FADT.reset_value, reset_reg);
+       }
 
-       status = acpi_write(acpi_gbl_FADT.reset_value, reset_reg);
        return_ACPI_STATUS(status);
 }
 
@@ -97,67 +110,92 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
  *
  * DESCRIPTION: Read from either memory or IO space.
  *
+ * LIMITATIONS: <These limitations also apply to acpi_write>
+ *      bit_width must be exactly 8, 16, 32, or 64.
+ *      space_iD must be system_memory or system_iO.
+ *      bit_offset and access_width are currently ignored, as there has
+ *          not been a need to implement these.
+ *
  ******************************************************************************/
-acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg)
+acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
 {
+       u32 value;
        u32 width;
        u64 address;
        acpi_status status;
 
        ACPI_FUNCTION_NAME(acpi_read);
 
-       /*
-        * Must have a valid pointer to a GAS structure, and a non-zero address
-        * within.
-        */
-       if (!reg) {
+       if (!return_value) {
                return (AE_BAD_PARAMETER);
        }
 
-       /* Get a local copy of the address. Handles possible alignment issues */
+       /* Validate contents of the GAS register. Allow 64-bit transfers */
 
-       ACPI_MOVE_64_TO_64(&address, &reg->address);
-       if (!address) {
-               return (AE_BAD_ADDRESS);
+       status = acpi_hw_validate_register(reg, 64, &address);
+       if (ACPI_FAILURE(status)) {
+               return (status);
        }
 
-       /* Supported widths are 8/16/32 */
-
        width = reg->bit_width;
-       if ((width != 8) && (width != 16) && (width != 32)) {
-               return (AE_SUPPORT);
+       if (width == 64) {
+               width = 32;     /* Break into two 32-bit transfers */
        }
 
-       /* Initialize entire 32-bit return value to zero */
+       /* Initialize entire 64-bit return value to zero */
 
-       *value = 0;
+       *return_value = 0;
+       value = 0;
 
        /*
         * Two address spaces supported: Memory or IO. PCI_Config is
         * not supported here because the GAS structure is insufficient
         */
-       switch (reg->space_id) {
-       case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+       if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+               status = acpi_os_read_memory((acpi_physical_address)
+                                            address, &value, width);
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
+               *return_value = value;
 
-               status = acpi_os_read_memory((acpi_physical_address) address,
-                                            value, width);
-               break;
+               if (reg->bit_width == 64) {
 
-       case ACPI_ADR_SPACE_SYSTEM_IO:
+                       /* Read the top 32 bits */
 
-               status =
-                   acpi_hw_read_port((acpi_io_address) address, value, width);
-               break;
+                       status = acpi_os_read_memory((acpi_physical_address)
+                                                    (address + 4), &value, 32);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+                       *return_value |= ((u64)value << 32);
+               }
+       } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
-       default:
-               ACPI_ERROR((AE_INFO,
-                           "Unsupported address space: %X", reg->space_id));
-               return (AE_BAD_PARAMETER);
+               status = acpi_hw_read_port((acpi_io_address)
+                                          address, &value, width);
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
+               *return_value = value;
+
+               if (reg->bit_width == 64) {
+
+                       /* Read the top 32 bits */
+
+                       status = acpi_hw_read_port((acpi_io_address)
+                                                  (address + 4), &value, 32);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+                       *return_value |= ((u64)value << 32);
+               }
        }
 
        ACPI_DEBUG_PRINT((ACPI_DB_IO,
-                         "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
-                         *value, width, ACPI_FORMAT_UINT64(address),
+                         "Read:  %8.8X%8.8X width %2d from %8.8X%8.8X (%s)\n",
+                         ACPI_FORMAT_UINT64(*return_value), reg->bit_width,
+                         ACPI_FORMAT_UINT64(address),
                          acpi_ut_get_region_name(reg->space_id)));
 
        return (status);
@@ -169,7 +207,7 @@ ACPI_EXPORT_SYMBOL(acpi_read)
  *
  * FUNCTION:    acpi_write
  *
- * PARAMETERS:  Value               - To be written
+ * PARAMETERS:  Value               - Value to be written
  *              Reg                 - GAS register structure
  *
  * RETURN:      Status
@@ -177,7 +215,7 @@ ACPI_EXPORT_SYMBOL(acpi_read)
  * DESCRIPTION: Write to either memory or IO space.
  *
  ******************************************************************************/
-acpi_status acpi_write(u32 value, struct acpi_generic_address *reg)
+acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
 {
        u32 width;
        u64 address;
@@ -185,54 +223,61 @@ acpi_status acpi_write(u32 value, struct acpi_generic_address *reg)
 
        ACPI_FUNCTION_NAME(acpi_write);
 
-       /*
-        * Must have a valid pointer to a GAS structure, and a non-zero address
-        * within.
-        */
-       if (!reg) {
-               return (AE_BAD_PARAMETER);
-       }
-
-       /* Get a local copy of the address. Handles possible alignment issues */
+       /* Validate contents of the GAS register. Allow 64-bit transfers */
 
-       ACPI_MOVE_64_TO_64(&address, &reg->address);
-       if (!address) {
-               return (AE_BAD_ADDRESS);
+       status = acpi_hw_validate_register(reg, 64, &address);
+       if (ACPI_FAILURE(status)) {
+               return (status);
        }
 
-       /* Supported widths are 8/16/32 */
-
        width = reg->bit_width;
-       if ((width != 8) && (width != 16) && (width != 32)) {
-               return (AE_SUPPORT);
+       if (width == 64) {
+               width = 32;     /* Break into two 32-bit transfers */
        }
 
        /*
-        * Two address spaces supported: Memory or IO.
-        * PCI_Config is not supported here because the GAS struct is insufficient
+        * Two address spaces supported: Memory or IO. PCI_Config is
+        * not supported here because the GAS structure is insufficient
         */
-       switch (reg->space_id) {
-       case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-
-               status = acpi_os_write_memory((acpi_physical_address) address,
-                                             value, width);
-               break;
+       if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+               status = acpi_os_write_memory((acpi_physical_address)
+                                             address, ACPI_LODWORD(value),
+                                             width);
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
 
-       case ACPI_ADR_SPACE_SYSTEM_IO:
+               if (reg->bit_width == 64) {
+                       status = acpi_os_write_memory((acpi_physical_address)
+                                                     (address + 4),
+                                                     ACPI_HIDWORD(value), 32);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+               }
+       } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
-               status = acpi_hw_write_port((acpi_io_address) address, value,
+               status = acpi_hw_write_port((acpi_io_address)
+                                           address, ACPI_LODWORD(value),
                                            width);
-               break;
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
 
-       default:
-               ACPI_ERROR((AE_INFO,
-                           "Unsupported address space: %X", reg->space_id));
-               return (AE_BAD_PARAMETER);
+               if (reg->bit_width == 64) {
+                       status = acpi_hw_write_port((acpi_io_address)
+                                                   (address + 4),
+                                                   ACPI_HIDWORD(value), 32);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+               }
        }
 
        ACPI_DEBUG_PRINT((ACPI_DB_IO,
-                         "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                         value, width, ACPI_FORMAT_UINT64(address),
+                         "Wrote: %8.8X%8.8X width %2d   to %8.8X%8.8X (%s)\n",
+                         ACPI_FORMAT_UINT64(value), reg->bit_width,
+                         ACPI_FORMAT_UINT64(address),
                          acpi_ut_get_region_name(reg->space_id)));
 
        return (status);
index efc971a..8a58a1b 100644 (file)
@@ -96,17 +96,68 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete a namespace node
+ * DESCRIPTION: Delete a namespace node. All node deletions must come through
+ *              here. Detaches any attached objects, including any attached
+ *              data. If a handler is associated with attached data, it is
+ *              invoked before the node is deleted.
  *
  ******************************************************************************/
 
 void acpi_ns_delete_node(struct acpi_namespace_node *node)
+{
+       union acpi_operand_object *obj_desc;
+
+       ACPI_FUNCTION_NAME(ns_delete_node);
+
+       /* Detach an object if there is one */
+
+       acpi_ns_detach_object(node);
+
+       /*
+        * Delete an attached data object if present (an object that was created
+        * and attached via acpi_attach_data). Note: After any normal object is
+        * detached above, the only possible remaining object is a data object.
+        */
+       obj_desc = node->object;
+       if (obj_desc && (obj_desc->common.type == ACPI_TYPE_LOCAL_DATA)) {
+
+               /* Invoke the attached data deletion handler if present */
+
+               if (obj_desc->data.handler) {
+                       obj_desc->data.handler(node, obj_desc->data.pointer);
+               }
+
+               acpi_ut_remove_reference(obj_desc);
+       }
+
+       /* Now we can delete the node */
+
+       (void)acpi_os_release_object(acpi_gbl_namespace_cache, node);
+
+       ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
+       ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Node %p, Remaining %X\n",
+                         node, acpi_gbl_current_node_count));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_remove_node
+ *
+ * PARAMETERS:  Node            - Node to be removed/deleted
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Remove (unlink) and delete a namespace node
+ *
+ ******************************************************************************/
+
+void acpi_ns_remove_node(struct acpi_namespace_node *node)
 {
        struct acpi_namespace_node *parent_node;
        struct acpi_namespace_node *prev_node;
        struct acpi_namespace_node *next_node;
 
-       ACPI_FUNCTION_TRACE_PTR(ns_delete_node, node);
+       ACPI_FUNCTION_TRACE_PTR(ns_remove_node, node);
 
        parent_node = acpi_ns_get_parent_node(node);
 
@@ -142,12 +193,9 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
                }
        }
 
-       ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
-
-       /* Detach an object if there is one, then delete the node */
+       /* Delete the node and any attached objects */
 
-       acpi_ns_detach_object(node);
-       (void)acpi_os_release_object(acpi_gbl_namespace_cache, node);
+       acpi_ns_delete_node(node);
        return_VOID;
 }
 
@@ -273,25 +321,11 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                                    parent_node, child_node));
                }
 
-               /* Now we can free this child object */
-
-               ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_freed++);
-
-               ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                 "Object %p, Remaining %X\n", child_node,
-                                 acpi_gbl_current_node_count));
-
-               /* Detach an object if there is one, then free the child node */
-
-               acpi_ns_detach_object(child_node);
-
-               /* Now we can delete the node */
-
-               (void)acpi_os_release_object(acpi_gbl_namespace_cache,
-                                            child_node);
-
-               /* And move on to the next child in the list */
-
+               /*
+                * Delete this child node and move on to the next child in the list.
+                * No need to unlink the node since we are deleting the entire branch.
+                */
+               acpi_ns_delete_node(child_node);
                child_node = next_node;
 
        } while (!(flags & ANOBJ_END_OF_PEER_LIST));
@@ -433,7 +467,7 @@ void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)
 
                if (deletion_node) {
                        acpi_ns_delete_children(deletion_node);
-                       acpi_ns_delete_node(deletion_node);
+                       acpi_ns_remove_node(deletion_node);
                        deletion_node = NULL;
                }
 
index 41994fe..0fe87f1 100644 (file)
@@ -70,7 +70,6 @@ static acpi_status
 acpi_ns_dump_one_device(acpi_handle obj_handle,
                        u32 level, void *context, void **return_value)
 {
-       struct acpi_buffer buffer;
        struct acpi_device_info *info;
        acpi_status status;
        u32 i;
@@ -80,17 +79,15 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
        status =
            acpi_ns_dump_one_object(obj_handle, level, context, return_value);
 
-       buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
-       status = acpi_get_object_info(obj_handle, &buffer);
+       status = acpi_get_object_info(obj_handle, &info);
        if (ACPI_SUCCESS(status)) {
-               info = buffer.pointer;
                for (i = 0; i < level; i++) {
                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, " "));
                }
 
                ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES,
                                      "    HID: %s, ADR: %8.8X%8.8X, Status: %X\n",
-                                     info->hardware_id.value,
+                                     info->hardware_id.string,
                                      ACPI_FORMAT_UINT64(info->address),
                                      info->current_status));
                ACPI_FREE(info);
index 8e7dec1..846d113 100644 (file)
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nseval")
 
+/* Local prototypes */
+static void
+acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
+                        struct acpi_evaluate_info *info);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_evaluate
@@ -76,6 +81,7 @@ ACPI_MODULE_NAME("nseval")
  * MUTEX:       Locks interpreter
  *
  ******************************************************************************/
+
 acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
 {
        acpi_status status;
@@ -276,3 +282,134 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
         */
        return_ACPI_STATUS(status);
 }
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_exec_module_code_list
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None. Exceptions during method execution are ignored, since
+ *              we cannot abort a table load.
+ *
+ * DESCRIPTION: Execute all elements of the global module-level code list.
+ *              Each element is executed as a single control method.
+ *
+ ******************************************************************************/
+
+void acpi_ns_exec_module_code_list(void)
+{
+       union acpi_operand_object *prev;
+       union acpi_operand_object *next;
+       struct acpi_evaluate_info *info;
+       u32 method_count = 0;
+
+       ACPI_FUNCTION_TRACE(ns_exec_module_code_list);
+
+       /* Exit now if the list is empty */
+
+       next = acpi_gbl_module_code_list;
+       if (!next) {
+               return_VOID;
+       }
+
+       /* Allocate the evaluation information block */
+
+       info = ACPI_ALLOCATE(sizeof(struct acpi_evaluate_info));
+       if (!info) {
+               return_VOID;
+       }
+
+       /* Walk the list, executing each "method" */
+
+       while (next) {
+               prev = next;
+               next = next->method.mutex;
+
+               /* Clear the link field and execute the method */
+
+               prev->method.mutex = NULL;
+               acpi_ns_exec_module_code(prev, info);
+               method_count++;
+
+               /* Delete the (temporary) method object */
+
+               acpi_ut_remove_reference(prev);
+       }
+
+       ACPI_INFO((AE_INFO,
+                  "Executed %u blocks of module-level executable AML code",
+                  method_count));
+
+       ACPI_FREE(info);
+       acpi_gbl_module_code_list = NULL;
+       return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_exec_module_code
+ *
+ * PARAMETERS:  method_obj          - Object container for the module-level code
+ *              Info                - Info block for method evaluation
+ *
+ * RETURN:      None. Exceptions during method execution are ignored, since
+ *              we cannot abort a table load.
+ *
+ * DESCRIPTION: Execute a control method containing a block of module-level
+ *              executable AML code. The control method is temporarily
+ *              installed to the root node, then evaluated.
+ *
+ ******************************************************************************/
+
+static void
+acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
+                        struct acpi_evaluate_info *info)
+{
+       union acpi_operand_object *root_obj;
+       acpi_status status;
+
+       ACPI_FUNCTION_TRACE(ns_exec_module_code);
+
+       /* Initialize the evaluation information block */
+
+       ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info));
+       info->prefix_node = acpi_gbl_root_node;
+
+       /*
+        * Get the currently attached root object. Add a reference, because the
+        * ref count will be decreased when the method object is installed to
+        * the root node.
+        */
+       root_obj = acpi_ns_get_attached_object(acpi_gbl_root_node);
+       acpi_ut_add_reference(root_obj);
+
+       /* Install the method (module-level code) in the root node */
+
+       status = acpi_ns_attach_object(acpi_gbl_root_node, method_obj,
+                                      ACPI_TYPE_METHOD);
+       if (ACPI_FAILURE(status)) {
+               goto exit;
+       }
+
+       /* Execute the root node as a control method */
+
+       status = acpi_ns_evaluate(info);
+
+       ACPI_DEBUG_PRINT((ACPI_DB_INIT, "Executed module-level code at %p\n",
+                         method_obj->method.aml_start));
+
+       /* Detach the temporary method object */
+
+       acpi_ns_detach_object(acpi_gbl_root_node);
+
+       /* Restore the original root object */
+
+       status =
+           acpi_ns_attach_object(acpi_gbl_root_node, root_obj,
+                                 ACPI_TYPE_DEVICE);
+
+      exit:
+       acpi_ut_remove_reference(root_obj);
+       return_VOID;
+}
index 2adfcf3..1d5b360 100644 (file)
@@ -170,6 +170,21 @@ acpi_status acpi_ns_initialize_devices(void)
                goto error_exit;
        }
 
+       /*
+        * Execute the "global" _INI method that may appear at the root. This
+        * support is provided for Windows compatibility (Vista+) and is not
+        * part of the ACPI specification.
+        */
+       info.evaluate_info->prefix_node = acpi_gbl_root_node;
+       info.evaluate_info->pathname = METHOD_NAME__INI;
+       info.evaluate_info->parameters = NULL;
+       info.evaluate_info->flags = ACPI_IGNORE_RETURN_VALUE;
+
+       status = acpi_ns_evaluate(info.evaluate_info);
+       if (ACPI_SUCCESS(status)) {
+               info.num_INI++;
+       }
+
        /* Walk namespace to execute all _INIs on present devices */
 
        status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
index dcd7a6a..a7234e6 100644 (file)
@@ -270,8 +270,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
 
        /* Now delete the starting object, and we are done */
 
-       acpi_ns_delete_node(child_handle);
-
+       acpi_ns_remove_node(child_handle);
        return_ACPI_STATUS(AE_OK);
 }
 
index 7f8e066..f8427af 100644 (file)
@@ -42,6 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#define ACPI_CREATE_PREDEFINED_TABLE
+
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -72,30 +74,31 @@ ACPI_MODULE_NAME("nspredef")
  ******************************************************************************/
 /* Local prototypes */
 static acpi_status
-acpi_ns_check_package(char *pathname,
-                     union acpi_operand_object **return_object_ptr,
-                     const union acpi_predefined_info *predefined);
+acpi_ns_check_package(struct acpi_predefined_data *data,
+                     union acpi_operand_object **return_object_ptr);
+
+static acpi_status
+acpi_ns_check_package_list(struct acpi_predefined_data *data,
+                          const union acpi_predefined_info *package,
+                          union acpi_operand_object **elements, u32 count);
 
 static acpi_status
-acpi_ns_check_package_elements(char *pathname,
+acpi_ns_check_package_elements(struct acpi_predefined_data *data,
                               union acpi_operand_object **elements,
                               u8 type1,
                               u32 count1,
                               u8 type2, u32 count2, u32 start_index);
 
 static acpi_status
-acpi_ns_check_object_type(char *pathname,
+acpi_ns_check_object_type(struct acpi_predefined_data *data,
                          union acpi_operand_object **return_object_ptr,
                          u32 expected_btypes, u32 package_index);
 
 static acpi_status
-acpi_ns_check_reference(char *pathname,
+acpi_ns_check_reference(struct acpi_predefined_data *data,
                        union acpi_operand_object *return_object);
 
-static acpi_status
-acpi_ns_repair_object(u32 expected_btypes,
-                     u32 package_index,
-                     union acpi_operand_object **return_object_ptr);
+static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes);
 
 /*
  * Names for the types that can be returned by the predefined objects.
@@ -109,13 +112,13 @@ static const char *acpi_rtype_names[] = {
        "/Reference",
 };
 
-#define ACPI_NOT_PACKAGE    ACPI_UINT32_MAX
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_check_predefined_names
  *
  * PARAMETERS:  Node            - Namespace node for the method/object
+ *              user_param_count - Number of parameters actually passed
+ *              return_status   - Status from the object evaluation
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
  *
@@ -135,12 +138,13 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
        acpi_status status = AE_OK;
        const union acpi_predefined_info *predefined;
        char *pathname;
+       struct acpi_predefined_data *data;
 
        /* Match the name for this method/object against the predefined list */
 
        predefined = acpi_ns_check_for_predefined_name(node);
 
-       /* Get the full pathname to the object, for use in error messages */
+       /* Get the full pathname to the object, for use in warning messages */
 
        pathname = acpi_ns_get_external_pathname(node);
        if (!pathname) {
@@ -158,28 +162,17 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
        /* If not a predefined name, we cannot validate the return object */
 
        if (!predefined) {
-               goto exit;
-       }
-
-       /* If the method failed, we cannot validate the return object */
-
-       if ((return_status != AE_OK) && (return_status != AE_CTRL_RETURN_VALUE)) {
-               goto exit;
+               goto cleanup;
        }
 
        /*
-        * Only validate the return value on the first successful evaluation of
-        * the method. This ensures that any warnings will only be emitted during
-        * the very first evaluation of the method/object.
+        * If the method failed or did not actually return an object, we cannot
+        * validate the return object
         */
-       if (node->flags & ANOBJ_EVALUATED) {
-               goto exit;
+       if ((return_status != AE_OK) && (return_status != AE_CTRL_RETURN_VALUE)) {
+               goto cleanup;
        }
 
-       /* Mark the node as having been successfully evaluated */
-
-       node->flags |= ANOBJ_EVALUATED;
-
        /*
         * If there is no return value, check if we require a return value for
         * this predefined name. Either one return value is expected, or none,
@@ -190,46 +183,67 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
        if (!return_object) {
                if ((predefined->info.expected_btypes) &&
                    (!(predefined->info.expected_btypes & ACPI_RTYPE_NONE))) {
-                       ACPI_ERROR((AE_INFO,
-                                   "%s: Missing expected return value",
-                                   pathname));
+                       ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                             ACPI_WARN_ALWAYS,
+                                             "Missing expected return value"));
 
                        status = AE_AML_NO_RETURN_VALUE;
                }
-               goto exit;
+               goto cleanup;
        }
 
        /*
-        * We have a return value, but if one wasn't expected, just exit, this is
-        * not a problem
+        * 1) We have a return value, but if one wasn't expected, just exit, this is
+        * not a problem. For example, if the "Implicit Return" feature is
+        * enabled, methods will always return a value.
         *
-        * For example, if the "Implicit Return" feature is enabled, methods will
-        * always return a value
+        * 2) If the return value can be of any type, then we cannot perform any
+        * validation, exit.
         */
-       if (!predefined->info.expected_btypes) {
-               goto exit;
+       if ((!predefined->info.expected_btypes) ||
+           (predefined->info.expected_btypes == ACPI_RTYPE_ALL)) {
+               goto cleanup;
        }
 
+       /* Create the parameter data block for object validation */
+
+       data = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_predefined_data));
+       if (!data) {
+               goto cleanup;
+       }
+       data->predefined = predefined;
+       data->node_flags = node->flags;
+       data->pathname = pathname;
+
        /*
         * Check that the type of the return object is what is expected for
         * this predefined name
         */
-       status = acpi_ns_check_object_type(pathname, return_object_ptr,
+       status = acpi_ns_check_object_type(data, return_object_ptr,
                                           predefined->info.expected_btypes,
-                                          ACPI_NOT_PACKAGE);
+                                          ACPI_NOT_PACKAGE_ELEMENT);
        if (ACPI_FAILURE(status)) {
-               goto exit;
+               goto check_validation_status;
        }
 
        /* For returned Package objects, check the type of all sub-objects */
 
        if (return_object->common.type == ACPI_TYPE_PACKAGE) {
-               status =
-                   acpi_ns_check_package(pathname, return_object_ptr,
-                                         predefined);
+               status = acpi_ns_check_package(data, return_object_ptr);
+       }
+
+check_validation_status:
+       /*
+        * If the object validation failed or if we successfully repaired one
+        * or more objects, mark the parent node to suppress further warning
+        * messages during the next evaluation of the same method/object.
+        */
+       if (ACPI_FAILURE(status) || (data->flags & ACPI_OBJECT_REPAIRED)) {
+               node->flags |= ANOBJ_EVALUATED;
        }
+       ACPI_FREE(data);
 
-      exit:
+cleanup:
        ACPI_FREE(pathname);
        return (status);
 }
@@ -268,64 +282,58 @@ acpi_ns_check_parameter_count(char *pathname,
                param_count = node->object->method.param_count;
        }
 
-       /* Argument count check for non-predefined methods/objects */
-
        if (!predefined) {
                /*
+                * Check the parameter count for non-predefined methods/objects.
+                *
                 * Warning if too few or too many arguments have been passed by the
                 * caller. An incorrect number of arguments may not cause the method
                 * to fail. However, the method will fail if there are too few
                 * arguments and the method attempts to use one of the missing ones.
                 */
                if (user_param_count < param_count) {
-                       ACPI_WARNING((AE_INFO,
-                                     "%s: Insufficient arguments - needs %d, found %d",
-                                     pathname, param_count, user_param_count));
+                       ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                             ACPI_WARN_ALWAYS,
+                                             "Insufficient arguments - needs %u, found %u",
+                                             param_count, user_param_count));
                } else if (user_param_count > param_count) {
-                       ACPI_WARNING((AE_INFO,
-                                     "%s: Excess arguments - needs %d, found %d",
-                                     pathname, param_count, user_param_count));
+                       ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                             ACPI_WARN_ALWAYS,
+                                             "Excess arguments - needs %u, found %u",
+                                             param_count, user_param_count));
                }
                return;
        }
 
-       /* Allow two different legal argument counts (_SCP, etc.) */
-
+       /*
+        * Validate the user-supplied parameter count.
+        * Allow two different legal argument counts (_SCP, etc.)
+        */
        required_params_current = predefined->info.param_count & 0x0F;
        required_params_old = predefined->info.param_count >> 4;
 
        if (user_param_count != ACPI_UINT32_MAX) {
-
-               /* Validate the user-supplied parameter count */
-
                if ((user_param_count != required_params_current) &&
                    (user_param_count != required_params_old)) {
-                       ACPI_WARNING((AE_INFO,
-                                     "%s: Parameter count mismatch - "
-                                     "caller passed %d, ACPI requires %d",
-                                     pathname, user_param_count,
-                                     required_params_current));
+                       ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                             ACPI_WARN_ALWAYS,
+                                             "Parameter count mismatch - "
+                                             "caller passed %u, ACPI requires %u",
+                                             user_param_count,
+                                             required_params_current));
                }
        }
 
-       /*
-        * Only validate the argument count on the first successful evaluation of
-        * the method. This ensures that any warnings will only be emitted during
-        * the very first evaluation of the method/object.
-        */
-       if (node->flags & ANOBJ_EVALUATED) {
-               return;
-       }
-
        /*
         * Check that the ASL-defined parameter count is what is expected for
-        * this predefined name.
+        * this predefined name (parameter count as defined by the ACPI
+        * specification)
         */
        if ((param_count != required_params_current) &&
            (param_count != required_params_old)) {
-               ACPI_WARNING((AE_INFO,
-                             "%s: Parameter count mismatch - ASL declared %d, ACPI requires %d",
-                             pathname, param_count, required_params_current));
+               ACPI_WARN_PREDEFINED((AE_INFO, pathname, node->flags,
+                                     "Parameter count mismatch - ASL declared %u, ACPI requires %u",
+                                     param_count, required_params_current));
        }
 }
 
@@ -358,9 +366,6 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
        this_name = predefined_names;
        while (this_name->info.name[0]) {
                if (ACPI_COMPARE_NAME(node->name.ascii, this_name->info.name)) {
-
-                       /* Return pointer to this table entry */
-
                        return (this_name);
                }
 
@@ -375,17 +380,16 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
                this_name++;
        }
 
-       return (NULL);
+       return (NULL);          /* Not found */
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_check_package
  *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
- *              Predefined      - Pointer to entry in predefined name table
  *
  * RETURN:      Status
  *
@@ -395,30 +399,26 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_package(char *pathname,
-                     union acpi_operand_object **return_object_ptr,
-                     const union acpi_predefined_info *predefined)
+acpi_ns_check_package(struct acpi_predefined_data *data,
+                     union acpi_operand_object **return_object_ptr)
 {
        union acpi_operand_object *return_object = *return_object_ptr;
        const union acpi_predefined_info *package;
-       union acpi_operand_object *sub_package;
        union acpi_operand_object **elements;
-       union acpi_operand_object **sub_elements;
-       acpi_status status;
+       acpi_status status = AE_OK;
        u32 expected_count;
        u32 count;
        u32 i;
-       u32 j;
 
        ACPI_FUNCTION_NAME(ns_check_package);
 
        /* The package info for this name is in the next table entry */
 
-       package = predefined + 1;
+       package = data->predefined + 1;
 
        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                          "%s Validating return Package of Type %X, Count %X\n",
-                         pathname, package->ret_info.type,
+                         data->pathname, package->ret_info.type,
                          return_object->package.count));
 
        /* Extract package count and elements array */
@@ -429,9 +429,8 @@ acpi_ns_check_package(char *pathname,
        /* The package must have at least one element, else invalid */
 
        if (!count) {
-               ACPI_WARNING((AE_INFO,
-                             "%s: Return Package has no elements (empty)",
-                             pathname));
+               ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                                     "Return Package has no elements (empty)"));
 
                return (AE_AML_OPERAND_VALUE);
        }
@@ -456,15 +455,16 @@ acpi_ns_check_package(char *pathname,
                if (count < expected_count) {
                        goto package_too_small;
                } else if (count > expected_count) {
-                       ACPI_WARNING((AE_INFO,
-                                     "%s: Return Package is larger than needed - "
-                                     "found %u, expected %u", pathname, count,
-                                     expected_count));
+                       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                                             data->node_flags,
+                                             "Return Package is larger than needed - "
+                                             "found %u, expected %u", count,
+                                             expected_count));
                }
 
                /* Validate all elements of the returned package */
 
-               status = acpi_ns_check_package_elements(pathname, elements,
+               status = acpi_ns_check_package_elements(data, elements,
                                                        package->ret_info.
                                                        object_type1,
                                                        package->ret_info.
@@ -473,9 +473,6 @@ acpi_ns_check_package(char *pathname,
                                                        object_type2,
                                                        package->ret_info.
                                                        count2, 0);
-               if (ACPI_FAILURE(status)) {
-                       return (status);
-               }
                break;
 
        case ACPI_PTYPE1_VAR:
@@ -485,7 +482,7 @@ acpi_ns_check_package(char *pathname,
                 * elements must be of the same type
                 */
                for (i = 0; i < count; i++) {
-                       status = acpi_ns_check_object_type(pathname, elements,
+                       status = acpi_ns_check_object_type(data, elements,
                                                           package->ret_info.
                                                           object_type1, i);
                        if (ACPI_FAILURE(status)) {
@@ -517,8 +514,7 @@ acpi_ns_check_package(char *pathname,
                                /* These are the required package elements (0, 1, or 2) */
 
                                status =
-                                   acpi_ns_check_object_type(pathname,
-                                                             elements,
+                                   acpi_ns_check_object_type(data, elements,
                                                              package->
                                                              ret_info3.
                                                              object_type[i],
@@ -530,8 +526,7 @@ acpi_ns_check_package(char *pathname,
                                /* These are the optional package elements */
 
                                status =
-                                   acpi_ns_check_object_type(pathname,
-                                                             elements,
+                                   acpi_ns_check_object_type(data, elements,
                                                              package->
                                                              ret_info3.
                                                              tail_object_type,
@@ -544,11 +539,30 @@ acpi_ns_check_package(char *pathname,
                }
                break;
 
+       case ACPI_PTYPE2_REV_FIXED:
+
+               /* First element is the (Integer) revision */
+
+               status = acpi_ns_check_object_type(data, elements,
+                                                  ACPI_RTYPE_INTEGER, 0);
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
+
+               elements++;
+               count--;
+
+               /* Examine the sub-packages */
+
+               status =
+                   acpi_ns_check_package_list(data, package, elements, count);
+               break;
+
        case ACPI_PTYPE2_PKG_COUNT:
 
                /* First element is the (Integer) count of sub-packages to follow */
 
-               status = acpi_ns_check_object_type(pathname, elements,
+               status = acpi_ns_check_object_type(data, elements,
                                                   ACPI_RTYPE_INTEGER, 0);
                if (ACPI_FAILURE(status)) {
                        return (status);
@@ -566,9 +580,11 @@ acpi_ns_check_package(char *pathname,
                count = expected_count;
                elements++;
 
-               /* Now we can walk the sub-packages */
+               /* Examine the sub-packages */
 
-               /*lint -fallthrough */
+               status =
+                   acpi_ns_check_package_list(data, package, elements, count);
+               break;
 
        case ACPI_PTYPE2:
        case ACPI_PTYPE2_FIXED:
@@ -576,176 +592,240 @@ acpi_ns_check_package(char *pathname,
        case ACPI_PTYPE2_COUNT:
 
                /*
-                * These types all return a single package that consists of a variable
-                * number of sub-packages
+                * These types all return a single Package that consists of a
+                * variable number of sub-Packages.
+                *
+                * First, ensure that the first element is a sub-Package. If not,
+                * the BIOS may have incorrectly returned the object as a single
+                * package instead of a Package of Packages (a common error if
+                * there is only one entry). We may be able to repair this by
+                * wrapping the returned Package with a new outer Package.
                 */
-               for (i = 0; i < count; i++) {
-                       sub_package = *elements;
-                       sub_elements = sub_package->package.elements;
+               if ((*elements)->common.type != ACPI_TYPE_PACKAGE) {
 
-                       /* Each sub-object must be of type Package */
+                       /* Create the new outer package and populate it */
 
                        status =
-                           acpi_ns_check_object_type(pathname, &sub_package,
-                                                     ACPI_RTYPE_PACKAGE, i);
+                           acpi_ns_repair_package_list(data,
+                                                       return_object_ptr);
                        if (ACPI_FAILURE(status)) {
                                return (status);
                        }
 
-                       /* Examine the different types of sub-packages */
+                       /* Update locals to point to the new package (of 1 element) */
 
-                       switch (package->ret_info.type) {
-                       case ACPI_PTYPE2:
-                       case ACPI_PTYPE2_PKG_COUNT:
+                       return_object = *return_object_ptr;
+                       elements = return_object->package.elements;
+                       count = 1;
+               }
 
-                               /* Each subpackage has a fixed number of elements */
+               /* Examine the sub-packages */
 
-                               expected_count =
-                                   package->ret_info.count1 +
-                                   package->ret_info.count2;
-                               if (sub_package->package.count !=
-                                   expected_count) {
-                                       count = sub_package->package.count;
-                                       goto package_too_small;
-                               }
+               status =
+                   acpi_ns_check_package_list(data, package, elements, count);
+               break;
 
-                               status =
-                                   acpi_ns_check_package_elements(pathname,
-                                                                  sub_elements,
-                                                                  package->
-                                                                  ret_info.
-                                                                  object_type1,
-                                                                  package->
-                                                                  ret_info.
-                                                                  count1,
-                                                                  package->
-                                                                  ret_info.
-                                                                  object_type2,
-                                                                  package->
-                                                                  ret_info.
-                                                                  count2, 0);
-                               if (ACPI_FAILURE(status)) {
-                                       return (status);
-                               }
-                               break;
+       default:
 
-                       case ACPI_PTYPE2_FIXED:
+               /* Should not get here if predefined info table is correct */
 
-                               /* Each sub-package has a fixed length */
+               ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                                     "Invalid internal return type in table entry: %X",
+                                     package->ret_info.type));
 
-                               expected_count = package->ret_info2.count;
-                               if (sub_package->package.count < expected_count) {
-                                       count = sub_package->package.count;
-                                       goto package_too_small;
-                               }
+               return (AE_AML_INTERNAL);
+       }
 
-                               /* Check the type of each sub-package element */
+       return (status);
 
-                               for (j = 0; j < expected_count; j++) {
-                                       status =
-                                           acpi_ns_check_object_type(pathname,
-                                               &sub_elements[j],
-                                               package->ret_info2.object_type[j], j);
-                                       if (ACPI_FAILURE(status)) {
-                                               return (status);
-                                       }
-                               }
-                               break;
+package_too_small:
 
-                       case ACPI_PTYPE2_MIN:
+       /* Error exit for the case with an incorrect package count */
 
-                               /* Each sub-package has a variable but minimum length */
+       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                             "Return Package is too small - found %u elements, expected %u",
+                             count, expected_count));
 
-                               expected_count = package->ret_info.count1;
-                               if (sub_package->package.count < expected_count) {
-                                       count = sub_package->package.count;
-                                       goto package_too_small;
-                               }
+       return (AE_AML_OPERAND_VALUE);
+}
 
-                               /* Check the type of each sub-package element */
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_check_package_list
+ *
+ * PARAMETERS:  Data            - Pointer to validation data structure
+ *              Package         - Pointer to package-specific info for method
+ *              Elements        - Element list of parent package. All elements
+ *                                of this list should be of type Package.
+ *              Count           - Count of subpackages
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Examine a list of subpackages
+ *
+ ******************************************************************************/
 
-                               status =
-                                   acpi_ns_check_package_elements(pathname,
-                                                                  sub_elements,
-                                                                  package->
-                                                                  ret_info.
-                                                                  object_type1,
-                                                                  sub_package->
-                                                                  package.
-                                                                  count, 0, 0,
-                                                                  0);
-                               if (ACPI_FAILURE(status)) {
-                                       return (status);
-                               }
-                               break;
+static acpi_status
+acpi_ns_check_package_list(struct acpi_predefined_data *data,
+                          const union acpi_predefined_info *package,
+                          union acpi_operand_object **elements, u32 count)
+{
+       union acpi_operand_object *sub_package;
+       union acpi_operand_object **sub_elements;
+       acpi_status status;
+       u32 expected_count;
+       u32 i;
+       u32 j;
 
-                       case ACPI_PTYPE2_COUNT:
+       /* Validate each sub-Package in the parent Package */
 
-                               /* First element is the (Integer) count of elements to follow */
+       for (i = 0; i < count; i++) {
+               sub_package = *elements;
+               sub_elements = sub_package->package.elements;
 
-                               status =
-                                   acpi_ns_check_object_type(pathname,
-                                                             sub_elements,
-                                                             ACPI_RTYPE_INTEGER,
-                                                             0);
-                               if (ACPI_FAILURE(status)) {
-                                       return (status);
-                               }
+               /* Each sub-object must be of type Package */
 
-                               /* Make sure package is large enough for the Count */
+               status = acpi_ns_check_object_type(data, &sub_package,
+                                                  ACPI_RTYPE_PACKAGE, i);
+               if (ACPI_FAILURE(status)) {
+                       return (status);
+               }
 
-                               expected_count =
-                                   (u32) (*sub_elements)->integer.value;
-                               if (sub_package->package.count < expected_count) {
-                                       count = sub_package->package.count;
-                                       goto package_too_small;
-                               }
+               /* Examine the different types of expected sub-packages */
+
+               switch (package->ret_info.type) {
+               case ACPI_PTYPE2:
+               case ACPI_PTYPE2_PKG_COUNT:
+               case ACPI_PTYPE2_REV_FIXED:
+
+                       /* Each subpackage has a fixed number of elements */
+
+                       expected_count =
+                           package->ret_info.count1 + package->ret_info.count2;
+                       if (sub_package->package.count < expected_count) {
+                               goto package_too_small;
+                       }
+
+                       status =
+                           acpi_ns_check_package_elements(data, sub_elements,
+                                                          package->ret_info.
+                                                          object_type1,
+                                                          package->ret_info.
+                                                          count1,
+                                                          package->ret_info.
+                                                          object_type2,
+                                                          package->ret_info.
+                                                          count2, 0);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+                       break;
 
-                               /* Check the type of each sub-package element */
+               case ACPI_PTYPE2_FIXED:
 
+                       /* Each sub-package has a fixed length */
+
+                       expected_count = package->ret_info2.count;
+                       if (sub_package->package.count < expected_count) {
+                               goto package_too_small;
+                       }
+
+                       /* Check the type of each sub-package element */
+
+                       for (j = 0; j < expected_count; j++) {
                                status =
-                                   acpi_ns_check_package_elements(pathname,
-                                                                  (sub_elements
-                                                                   + 1),
-                                                                  package->
-                                                                  ret_info.
-                                                                  object_type1,
-                                                                  (expected_count
-                                                                   - 1), 0, 0,
-                                                                  1);
+                                   acpi_ns_check_object_type(data,
+                                                             &sub_elements[j],
+                                                             package->
+                                                             ret_info2.
+                                                             object_type[j],
+                                                             j);
                                if (ACPI_FAILURE(status)) {
                                        return (status);
                                }
-                               break;
+                       }
+                       break;
+
+               case ACPI_PTYPE2_MIN:
 
-                       default:
-                               break;
+                       /* Each sub-package has a variable but minimum length */
+
+                       expected_count = package->ret_info.count1;
+                       if (sub_package->package.count < expected_count) {
+                               goto package_too_small;
                        }
 
-                       elements++;
-               }
-               break;
+                       /* Check the type of each sub-package element */
 
-       default:
+                       status =
+                           acpi_ns_check_package_elements(data, sub_elements,
+                                                          package->ret_info.
+                                                          object_type1,
+                                                          sub_package->package.
+                                                          count, 0, 0, 0);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+                       break;
 
-               /* Should not get here if predefined info table is correct */
+               case ACPI_PTYPE2_COUNT:
+
+                       /*
+                        * First element is the (Integer) count of elements, including
+                        * the count field.
+                        */
+                       status = acpi_ns_check_object_type(data, sub_elements,
+                                                          ACPI_RTYPE_INTEGER,
+                                                          0);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
 
-               ACPI_WARNING((AE_INFO,
-                             "%s: Invalid internal return type in table entry: %X",
-                             pathname, package->ret_info.type));
+                       /*
+                        * Make sure package is large enough for the Count and is
+                        * is as large as the minimum size
+                        */
+                       expected_count = (u32)(*sub_elements)->integer.value;
+                       if (sub_package->package.count < expected_count) {
+                               goto package_too_small;
+                       }
+                       if (sub_package->package.count <
+                           package->ret_info.count1) {
+                               expected_count = package->ret_info.count1;
+                               goto package_too_small;
+                       }
 
-               return (AE_AML_INTERNAL);
+                       /* Check the type of each sub-package element */
+
+                       status =
+                           acpi_ns_check_package_elements(data,
+                                                          (sub_elements + 1),
+                                                          package->ret_info.
+                                                          object_type1,
+                                                          (expected_count - 1),
+                                                          0, 0, 1);
+                       if (ACPI_FAILURE(status)) {
+                               return (status);
+                       }
+                       break;
+
+               default:        /* Should not get here, type was validated by caller */
+
+                       return (AE_AML_INTERNAL);
+               }
+
+               elements++;
        }
 
        return (AE_OK);
 
-      package_too_small:
+package_too_small:
 
-       /* Error exit for the case with an incorrect package count */
+       /* The sub-package count was smaller than required */
 
-       ACPI_WARNING((AE_INFO, "%s: Return Package is too small - "
-                     "found %u, expected %u", pathname, count,
-                     expected_count));
+       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                             "Return Sub-Package[%u] is too small - found %u elements, expected %u",
+                             i, sub_package->package.count, expected_count));
 
        return (AE_AML_OPERAND_VALUE);
 }
@@ -754,7 +834,7 @@ acpi_ns_check_package(char *pathname,
  *
  * FUNCTION:    acpi_ns_check_package_elements
  *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              Elements        - Pointer to the package elements array
  *              Type1           - Object type for first group
  *              Count1          - Count for first group
@@ -770,7 +850,7 @@ acpi_ns_check_package(char *pathname,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_package_elements(char *pathname,
+acpi_ns_check_package_elements(struct acpi_predefined_data *data,
                               union acpi_operand_object **elements,
                               u8 type1,
                               u32 count1,
@@ -786,7 +866,7 @@ acpi_ns_check_package_elements(char *pathname,
         * The second group can have a count of zero.
         */
        for (i = 0; i < count1; i++) {
-               status = acpi_ns_check_object_type(pathname, this_element,
+               status = acpi_ns_check_object_type(data, this_element,
                                                   type1, i + start_index);
                if (ACPI_FAILURE(status)) {
                        return (status);
@@ -795,7 +875,7 @@ acpi_ns_check_package_elements(char *pathname,
        }
 
        for (i = 0; i < count2; i++) {
-               status = acpi_ns_check_object_type(pathname, this_element,
+               status = acpi_ns_check_object_type(data, this_element,
                                                   type2,
                                                   (i + count1 + start_index));
                if (ACPI_FAILURE(status)) {
@@ -811,12 +891,13 @@ acpi_ns_check_package_elements(char *pathname,
  *
  * FUNCTION:    acpi_ns_check_object_type
  *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
  *              expected_btypes - Bitmap of expected return type(s)
  *              package_index   - Index of object within parent package (if
- *                                applicable - ACPI_NOT_PACKAGE otherwise)
+ *                                applicable - ACPI_NOT_PACKAGE_ELEMENT
+ *                                otherwise)
  *
  * RETURN:      Status
  *
@@ -826,7 +907,7 @@ acpi_ns_check_package_elements(char *pathname,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_object_type(char *pathname,
+acpi_ns_check_object_type(struct acpi_predefined_data *data,
                          union acpi_operand_object **return_object_ptr,
                          u32 expected_btypes, u32 package_index)
 {
@@ -834,9 +915,6 @@ acpi_ns_check_object_type(char *pathname,
        acpi_status status = AE_OK;
        u32 return_btype;
        char type_buffer[48];   /* Room for 5 types */
-       u32 this_rtype;
-       u32 i;
-       u32 j;
 
        /*
         * If we get a NULL return_object here, it is a NULL package element,
@@ -849,10 +927,11 @@ acpi_ns_check_object_type(char *pathname,
        /* A Namespace node should not get here, but make sure */
 
        if (ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) {
-               ACPI_WARNING((AE_INFO,
-                             "%s: Invalid return type - Found a Namespace node [%4.4s] type %s",
-                             pathname, return_object->node.name.ascii,
-                             acpi_ut_get_type_name(return_object->node.type)));
+               ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                                     "Invalid return type - Found a Namespace node [%4.4s] type %s",
+                                     return_object->node.name.ascii,
+                                     acpi_ut_get_type_name(return_object->node.
+                                                           type)));
                return (AE_AML_OPERAND_TYPE);
        }
 
@@ -897,10 +976,11 @@ acpi_ns_check_object_type(char *pathname,
 
                /* Type mismatch -- attempt repair of the returned object */
 
-               status = acpi_ns_repair_object(expected_btypes, package_index,
+               status = acpi_ns_repair_object(data, expected_btypes,
+                                              package_index,
                                               return_object_ptr);
                if (ACPI_SUCCESS(status)) {
-                       return (status);
+                       return (AE_OK); /* Repair was successful */
                }
                goto type_error_exit;
        }
@@ -908,7 +988,7 @@ acpi_ns_check_object_type(char *pathname,
        /* For reference objects, check that the reference type is correct */
 
        if (return_object->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
-               status = acpi_ns_check_reference(pathname, return_object);
+               status = acpi_ns_check_reference(data, return_object);
        }
 
        return (status);
@@ -917,33 +997,19 @@ acpi_ns_check_object_type(char *pathname,
 
        /* Create a string with all expected types for this predefined object */
 
-       j = 1;
-       type_buffer[0] = 0;
-       this_rtype = ACPI_RTYPE_INTEGER;
-
-       for (i = 0; i < ACPI_NUM_RTYPES; i++) {
-
-               /* If one of the expected types, concatenate the name of this type */
-
-               if (expected_btypes & this_rtype) {
-                       ACPI_STRCAT(type_buffer, &acpi_rtype_names[i][j]);
-                       j = 0;  /* Use name separator from now on */
-               }
-               this_rtype <<= 1;       /* Next Rtype */
-       }
+       acpi_ns_get_expected_types(type_buffer, expected_btypes);
 
-       if (package_index == ACPI_NOT_PACKAGE) {
-               ACPI_WARNING((AE_INFO,
-                             "%s: Return type mismatch - found %s, expected %s",
-                             pathname,
-                             acpi_ut_get_object_type_name(return_object),
-                             type_buffer));
+       if (package_index == ACPI_NOT_PACKAGE_ELEMENT) {
+               ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                                     "Return type mismatch - found %s, expected %s",
+                                     acpi_ut_get_object_type_name
+                                     (return_object), type_buffer));
        } else {
-               ACPI_WARNING((AE_INFO,
-                             "%s: Return Package type mismatch at index %u - "
-                             "found %s, expected %s", pathname, package_index,
-                             acpi_ut_get_object_type_name(return_object),
-                             type_buffer));
+               ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                                     "Return Package type mismatch at index %u - "
+                                     "found %s, expected %s", package_index,
+                                     acpi_ut_get_object_type_name
+                                     (return_object), type_buffer));
        }
 
        return (AE_AML_OPERAND_TYPE);
@@ -953,7 +1019,7 @@ acpi_ns_check_object_type(char *pathname,
  *
  * FUNCTION:    acpi_ns_check_reference
  *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object   - Object returned from the evaluation of a
  *                                method or object
  *
@@ -966,7 +1032,7 @@ acpi_ns_check_object_type(char *pathname,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_reference(char *pathname,
+acpi_ns_check_reference(struct acpi_predefined_data *data,
                        union acpi_operand_object *return_object)
 {
 
@@ -979,94 +1045,46 @@ acpi_ns_check_reference(char *pathname,
                return (AE_OK);
        }
 
-       ACPI_WARNING((AE_INFO,
-                     "%s: Return type mismatch - "
-                     "unexpected reference object type [%s] %2.2X",
-                     pathname, acpi_ut_get_reference_name(return_object),
-                     return_object->reference.class));
+       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                             "Return type mismatch - unexpected reference object type [%s] %2.2X",
+                             acpi_ut_get_reference_name(return_object),
+                             return_object->reference.class));
 
        return (AE_AML_OPERAND_TYPE);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_repair_object
+ * FUNCTION:    acpi_ns_get_expected_types
  *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
- *              package_index   - Used to determine if target is in a package
- *              return_object_ptr - Pointer to the object returned from the
- *                                evaluation of a method or object
+ * PARAMETERS:  Buffer          - Pointer to where the string is returned
+ *              expected_btypes - Bitmap of expected return type(s)
  *
- * RETURN:      Status. AE_OK if repair was successful.
+ * RETURN:      Buffer is populated with type names.
  *
- * DESCRIPTION: Attempt to repair/convert a return object of a type that was
- *              not expected.
+ * DESCRIPTION: Translate the expected types bitmap into a string of ascii
+ *              names of expected types, for use in warning messages.
  *
  ******************************************************************************/
 
-static acpi_status
-acpi_ns_repair_object(u32 expected_btypes,
-                     u32 package_index,
-                     union acpi_operand_object **return_object_ptr)
+static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes)
 {
-       union acpi_operand_object *return_object = *return_object_ptr;
-       union acpi_operand_object *new_object;
-       acpi_size length;
-
-       switch (return_object->common.type) {
-       case ACPI_TYPE_BUFFER:
-
-               if (!(expected_btypes & ACPI_RTYPE_STRING)) {
-                       return (AE_AML_OPERAND_TYPE);
-               }
-
-               /*
-                * Have a Buffer, expected a String, convert. Use a to_string
-                * conversion, no transform performed on the buffer data. The best
-                * example of this is the _BIF method, where the string data from
-                * the battery is often (incorrectly) returned as buffer object(s).
-                */
-               length = 0;
-               while ((length < return_object->buffer.length) &&
-                      (return_object->buffer.pointer[length])) {
-                       length++;
-               }
-
-               /* Allocate a new string object */
-
-               new_object = acpi_ut_create_string_object(length);
-               if (!new_object) {
-                       return (AE_NO_MEMORY);
-               }
+       u32 this_rtype;
+       u32 i;
+       u32 j;
 
-               /*
-                * Copy the raw buffer data with no transform. String is already NULL
-                * terminated at Length+1.
-                */
-               ACPI_MEMCPY(new_object->string.pointer,
-                           return_object->buffer.pointer, length);
+       j = 1;
+       buffer[0] = 0;
+       this_rtype = ACPI_RTYPE_INTEGER;
 
-               /* Install the new return object */
+       for (i = 0; i < ACPI_NUM_RTYPES; i++) {
 
-               acpi_ut_remove_reference(return_object);
-               *return_object_ptr = new_object;
+               /* If one of the expected types, concatenate the name of this type */
 
-               /*
-                * If the object is a package element, we need to:
-                * 1. Decrement the reference count of the orignal object, it was
-                *    incremented when building the package
-                * 2. Increment the reference count of the new object, it will be
-                *    decremented when releasing the package
-                */
-               if (package_index != ACPI_NOT_PACKAGE) {
-                       acpi_ut_remove_reference(return_object);
-                       acpi_ut_add_reference(new_object);
+               if (expected_btypes & this_rtype) {
+                       ACPI_STRCAT(buffer, &acpi_rtype_names[i][j]);
+                       j = 0;  /* Use name separator from now on */
                }
-               return (AE_OK);
-
-       default:
-               break;
+               this_rtype <<= 1;       /* Next Rtype */
        }
-
-       return (AE_AML_OPERAND_TYPE);
 }
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
new file mode 100644 (file)
index 0000000..db2b2a9
--- /dev/null
@@ -0,0 +1,203 @@
+/******************************************************************************
+ *
+ * Module Name: nsrepair - Repair for objects returned by predefined methods
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2009, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acpredef.h"
+
+#define _COMPONENT          ACPI_NAMESPACE
+ACPI_MODULE_NAME("nsrepair")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_repair_object
+ *
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              expected_btypes     - Object types expected
+ *              package_index       - Index of object within parent package (if
+ *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
+ *                                    otherwise)
+ *              return_object_ptr   - Pointer to the object returned from the
+ *                                    evaluation of a method or object
+ *
+ * RETURN:      Status. AE_OK if repair was successful.
+ *
+ * DESCRIPTION: Attempt to repair/convert a return object of a type that was
+ *              not expected.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ns_repair_object(struct acpi_predefined_data *data,
+                     u32 expected_btypes,
+                     u32 package_index,
+                     union acpi_operand_object **return_object_ptr)
+{
+       union acpi_operand_object *return_object = *return_object_ptr;
+       union acpi_operand_object *new_object;
+       acpi_size length;
+
+       switch (return_object->common.type) {
+       case ACPI_TYPE_BUFFER:
+
+               /* Does the method/object legally return a string? */
+
+               if (!(expected_btypes & ACPI_RTYPE_STRING)) {
+                       return (AE_AML_OPERAND_TYPE);
+               }
+
+               /*
+                * Have a Buffer, expected a String, convert. Use a to_string
+                * conversion, no transform performed on the buffer data. The best
+                * example of this is the _BIF method, where the string data from
+                * the battery is often (incorrectly) returned as buffer object(s).
+                */
+               length = 0;
+               while ((length < return_object->buffer.length) &&
+                      (return_object->buffer.pointer[length])) {
+                       length++;
+               }
+
+               /* Allocate a new string object */
+
+               new_object = acpi_ut_create_string_object(length);
+               if (!new_object) {
+                       return (AE_NO_MEMORY);
+               }
+
+               /*
+                * Copy the raw buffer data with no transform. String is already NULL
+                * terminated at Length+1.
+                */
+               ACPI_MEMCPY(new_object->string.pointer,
+                           return_object->buffer.pointer, length);
+
+               /*
+                * If the original object is a package element, we need to:
+                * 1. Set the reference count of the new object to match the
+                *    reference count of the old object.
+                * 2. Decrement the reference count of the original object.
+                */
+               if (package_index != ACPI_NOT_PACKAGE_ELEMENT) {
+                       new_object->common.reference_count =
+                           return_object->common.reference_count;
+
+                       if (return_object->common.reference_count > 1) {
+                               return_object->common.reference_count--;
+                       }
+
+                       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                                             data->node_flags,
+                                             "Converted Buffer to expected String at index %u",
+                                             package_index));
+               } else {
+                       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                                             data->node_flags,
+                                             "Converted Buffer to expected String"));
+               }
+
+               /* Delete old object, install the new return object */
+
+               acpi_ut_remove_reference(return_object);
+               *return_object_ptr = new_object;
+               data->flags |= ACPI_OBJECT_REPAIRED;
+               return (AE_OK);
+
+       default:
+               break;
+       }
+
+       return (AE_AML_OPERAND_TYPE);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_repair_package_list
+ *
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              obj_desc_ptr        - Pointer to the object to repair. The new
+ *                                    package object is returned here,
+ *                                    overwriting the old object.
+ *
+ * RETURN:      Status, new object in *obj_desc_ptr
+ *
+ * DESCRIPTION: Repair a common problem with objects that are defined to return
+ *              a variable-length Package of Packages. If the variable-length
+ *              is one, some BIOS code mistakenly simply declares a single
+ *              Package instead of a Package with one sub-Package. This
+ *              function attempts to repair this error by wrapping a Package
+ *              object around the original Package, creating the correct
+ *              Package with one sub-Package.
+ *
+ *              Names that can be repaired in this manner include:
+ *              _ALR, _CSD, _HPX, _MLS, _PRT, _PSS, _TRT, TSS
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ns_repair_package_list(struct acpi_predefined_data *data,
+                           union acpi_operand_object **obj_desc_ptr)
+{
+       union acpi_operand_object *pkg_obj_desc;
+
+       /*
+        * Create the new outer package and populate it. The new package will
+        * have a single element, the lone subpackage.
+        */
+       pkg_obj_desc = acpi_ut_create_package_object(1);
+       if (!pkg_obj_desc) {
+               return (AE_NO_MEMORY);
+       }
+
+       pkg_obj_desc->package.elements[0] = *obj_desc_ptr;
+
+       /* Return the new object in the object pointer */
+
+       *obj_desc_ptr = pkg_obj_desc;
+       data->flags |= ACPI_OBJECT_REPAIRED;
+
+       ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                             "Incorrectly formed Package, attempting repair"));
+
+       return (AE_OK);
+}
index 78277ed..ea55ab4 100644 (file)
@@ -88,7 +88,8 @@ acpi_ns_report_error(const char *module_name,
 
                /* There is a non-ascii character in the name */
 
-               ACPI_MOVE_32_TO_32(&bad_name, internal_name);
+               ACPI_MOVE_32_TO_32(&bad_name,
+                                  ACPI_CAST_PTR(u32, internal_name));
                acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);
        } else {
                /* Convert path to external format */
@@ -836,7 +837,7 @@ acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
        acpi_status status;
        char *internal_path;
 
-       ACPI_FUNCTION_TRACE_PTR(ns_get_node, pathname);
+       ACPI_FUNCTION_TRACE_PTR(ns_get_node, ACPI_CAST_PTR(char, pathname));
 
        if (!pathname) {
                *return_node = prefix_node;
index daf4ad3..4929dbd 100644 (file)
@@ -535,10 +535,11 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
        acpi_status status;
        struct acpi_namespace_node *node;
        u32 flags;
-       struct acpica_device_id hid;
-       struct acpi_compatible_id_list *cid;
+       struct acpica_device_id *hid;
+       struct acpica_device_id_list *cid;
        u32 i;
-       int found;
+       u8 found;
+       int no_match;
 
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
@@ -582,10 +583,14 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                        return (AE_CTRL_DEPTH);
                }
 
-               if (ACPI_STRNCMP(hid.value, info->hid, sizeof(hid.value)) != 0) {
-
-                       /* Get the list of Compatible IDs */
+               no_match = ACPI_STRCMP(hid->string, info->hid);
+               ACPI_FREE(hid);
 
+               if (no_match) {
+                       /*
+                        * HID does not match, attempt match within the
+                        * list of Compatible IDs (CIDs)
+                        */
                        status = acpi_ut_execute_CID(node, &cid);
                        if (status == AE_NOT_FOUND) {
                                return (AE_OK);
@@ -597,10 +602,8 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
 
                        found = 0;
                        for (i = 0; i < cid->count; i++) {
-                               if (ACPI_STRNCMP(cid->id[i].value, info->hid,
-                                                sizeof(struct
-                                                       acpi_compatible_id)) ==
-                                   0) {
+                               if (ACPI_STRCMP(cid->ids[i].string, info->hid)
+                                   == 0) {
                                        found = 1;
                                        break;
                                }
index f23593d..ddc84af 100644 (file)
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfname")
 
+/* Local prototypes */
+static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
+                                   struct acpica_device_id *source,
+                                   char *string_area);
+
 /******************************************************************************
  *
  * FUNCTION:    acpi_get_handle
@@ -68,6 +73,7 @@ ACPI_MODULE_NAME("nsxfname")
  *              namespace handle.
  *
  ******************************************************************************/
+
 acpi_status
 acpi_get_handle(acpi_handle parent,
                acpi_string pathname, acpi_handle * ret_handle)
@@ -208,12 +214,40 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
 
 ACPI_EXPORT_SYMBOL(acpi_get_name)
 
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_copy_device_id
+ *
+ * PARAMETERS:  Dest                - Pointer to the destination DEVICE_ID
+ *              Source              - Pointer to the source DEVICE_ID
+ *              string_area         - Pointer to where to copy the dest string
+ *
+ * RETURN:      Pointer to the next string area
+ *
+ * DESCRIPTION: Copy a single DEVICE_ID, including the string data.
+ *
+ ******************************************************************************/
+static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
+                                   struct acpica_device_id *source,
+                                   char *string_area)
+{
+       /* Create the destination DEVICE_ID */
+
+       dest->string = string_area;
+       dest->length = source->length;
+
+       /* Copy actual string and return a pointer to the next string area */
+
+       ACPI_MEMCPY(string_area, source->string, source->length);
+       return (string_area + source->length);
+}
+
 /******************************************************************************
  *
  * FUNCTION:    acpi_get_object_info
  *
- * PARAMETERS:  Handle          - Object Handle
- *              Buffer          - Where the info is returned
+ * PARAMETERS:  Handle              - Object Handle
+ *              return_buffer       - Where the info is returned
  *
  * RETURN:      Status
  *
@@ -221,33 +255,37 @@ ACPI_EXPORT_SYMBOL(acpi_get_name)
  *              namespace node and possibly by running several standard
  *              control methods (Such as in the case of a device.)
  *
+ * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA,
+ * _ADR, _sx_w, and _sx_d methods.
+ *
+ * Note: Allocates the return buffer, must be freed by the caller.
+ *
  ******************************************************************************/
+
 acpi_status
-acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
+acpi_get_object_info(acpi_handle handle,
+                    struct acpi_device_info **return_buffer)
 {
-       acpi_status status;
        struct acpi_namespace_node *node;
        struct acpi_device_info *info;
-       struct acpi_device_info *return_info;
-       struct acpi_compatible_id_list *cid_list = NULL;
-       acpi_size size;
+       struct acpica_device_id_list *cid_list = NULL;
+       struct acpica_device_id *hid = NULL;
+       struct acpica_device_id *uid = NULL;
+       char *next_id_string;
+       acpi_object_type type;
+       acpi_name name;
+       u8 param_count = 0;
+       u8 valid = 0;
+       u32 info_size;
+       u32 i;
+       acpi_status status;
 
        /* Parameter validation */
 
-       if (!handle || !buffer) {
+       if (!handle || !return_buffer) {
                return (AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_validate_buffer(buffer);
-       if (ACPI_FAILURE(status)) {
-               return (status);
-       }
-
-       info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_device_info));
-       if (!info) {
-               return (AE_NO_MEMORY);
-       }
-
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
                goto cleanup;
@@ -256,66 +294,91 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
        node = acpi_ns_map_handle_to_node(handle);
        if (!node) {
                (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-               status = AE_BAD_PARAMETER;
-               goto cleanup;
+               return (AE_BAD_PARAMETER);
        }
 
-       /* Init return structure */
-
-       size = sizeof(struct acpi_device_info);
+       /* Get the namespace node data while the namespace is locked */
 
-       info->type = node->type;
-       info->name = node->name.integer;
-       info->valid = 0;
+       info_size = sizeof(struct acpi_device_info);
+       type = node->type;
+       name = node->name.integer;
 
        if (node->type == ACPI_TYPE_METHOD) {
-               info->param_count = node->object->method.param_count;
+               param_count = node->object->method.param_count;
        }
 
        status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
-               goto cleanup;
+               return (status);
        }
 
-       /* If not a device, we are all done */
-
-       if (info->type == ACPI_TYPE_DEVICE) {
+       if ((type == ACPI_TYPE_DEVICE) || (type == ACPI_TYPE_PROCESSOR)) {
                /*
-                * Get extra info for ACPI Devices objects only:
-                * Run the Device _HID, _UID, _CID, _STA, _ADR and _sx_d methods.
+                * Get extra info for ACPI Device/Processor objects only:
+                * Run the Device _HID, _UID, and _CID methods.
                 *
                 * Note: none of these methods are required, so they may or may
-                * not be present for this device.  The Info->Valid bitfield is used
-                * to indicate which methods were found and ran successfully.
+                * not be present for this device. The Info->Valid bitfield is used
+                * to indicate which methods were found and run successfully.
                 */
 
                /* Execute the Device._HID method */
 
-               status = acpi_ut_execute_HID(node, &info->hardware_id);
+               status = acpi_ut_execute_HID(node, &hid);
                if (ACPI_SUCCESS(status)) {
-                       info->valid |= ACPI_VALID_HID;
+                       info_size += hid->length;
+                       valid |= ACPI_VALID_HID;
                }
 
                /* Execute the Device._UID method */
 
-               status = acpi_ut_execute_UID(node, &info->unique_id);
+               status = acpi_ut_execute_UID(node, &uid);
                if (ACPI_SUCCESS(status)) {
-                       info->valid |= ACPI_VALID_UID;
+                       info_size += uid->length;
+                       valid |= ACPI_VALID_UID;
                }
 
                /* Execute the Device._CID method */
 
                status = acpi_ut_execute_CID(node, &cid_list);
                if (ACPI_SUCCESS(status)) {
-                       size += cid_list->size;
-                       info->valid |= ACPI_VALID_CID;
+
+                       /* Add size of CID strings and CID pointer array */
+
+                       info_size +=
+                           (cid_list->list_size -
+                            sizeof(struct acpica_device_id_list));
+                       valid |= ACPI_VALID_CID;
                }
+       }
+
+       /*
+        * Now that we have the variable-length data, we can allocate the
+        * return buffer
+        */
+       info = ACPI_ALLOCATE_ZEROED(info_size);
+       if (!info) {
+               status = AE_NO_MEMORY;
+               goto cleanup;
+       }
+
+       /* Get the fixed-length data */
+
+       if ((type == ACPI_TYPE_DEVICE) || (type == ACPI_TYPE_PROCESSOR)) {
+               /*
+                * Get extra info for ACPI Device/Processor objects only:
+                * Run the _STA, _ADR and, sx_w, and _sx_d methods.
+                *
+                * Note: none of these methods are required, so they may or may
+                * not be present for this device. The Info->Valid bitfield is used
+                * to indicate which methods were found and run successfully.
+                */
 
                /* Execute the Device._STA method */
 
                status = acpi_ut_execute_STA(node, &info->current_status);
                if (ACPI_SUCCESS(status)) {
-                       info->valid |= ACPI_VALID_STA;
+                       valid |= ACPI_VALID_STA;
                }
 
                /* Execute the Device._ADR method */
@@ -323,36 +386,100 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
                status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, node,
                                                         &info->address);
                if (ACPI_SUCCESS(status)) {
-                       info->valid |= ACPI_VALID_ADR;
+                       valid |= ACPI_VALID_ADR;
+               }
+
+               /* Execute the Device._sx_w methods */
+
+               status = acpi_ut_execute_power_methods(node,
+                                                      acpi_gbl_lowest_dstate_names,
+                                                      ACPI_NUM_sx_w_METHODS,
+                                                      info->lowest_dstates);
+               if (ACPI_SUCCESS(status)) {
+                       valid |= ACPI_VALID_SXWS;
                }
 
                /* Execute the Device._sx_d methods */
 
-               status = acpi_ut_execute_sxds(node, info->highest_dstates);
+               status = acpi_ut_execute_power_methods(node,
+                                                      acpi_gbl_highest_dstate_names,
+                                                      ACPI_NUM_sx_d_METHODS,
+                                                      info->highest_dstates);
                if (ACPI_SUCCESS(status)) {
-                       info->valid |= ACPI_VALID_SXDS;
+                       valid |= ACPI_VALID_SXDS;
                }
        }
 
-       /* Validate/Allocate/Clear caller buffer */
+       /*
+        * Create a pointer to the string area of the return buffer.
+        * Point to the end of the base struct acpi_device_info structure.
+        */
+       next_id_string = ACPI_CAST_PTR(char, info->compatible_id_list.ids);
+       if (cid_list) {
 
-       status = acpi_ut_initialize_buffer(buffer, size);
-       if (ACPI_FAILURE(status)) {
-               goto cleanup;
+               /* Point past the CID DEVICE_ID array */
+
+               next_id_string +=
+                   ((acpi_size) cid_list->count *
+                    sizeof(struct acpica_device_id));
        }
 
-       /* Populate the return buffer */
+       /*
+        * Copy the HID, UID, and CIDs to the return buffer. The variable-length
+        * strings are copied to the reserved area at the end of the buffer.
+        *
+        * For HID and CID, check if the ID is a PCI Root Bridge.
+        */
+       if (hid) {
+               next_id_string = acpi_ns_copy_device_id(&info->hardware_id,
+                                                       hid, next_id_string);
+
+               if (acpi_ut_is_pci_root_bridge(hid->string)) {
+                       info->flags |= ACPI_PCI_ROOT_BRIDGE;
+               }
+       }
 
-       return_info = buffer->pointer;
-       ACPI_MEMCPY(return_info, info, sizeof(struct acpi_device_info));
+       if (uid) {
+               next_id_string = acpi_ns_copy_device_id(&info->unique_id,
+                                                       uid, next_id_string);
+       }
 
        if (cid_list) {
-               ACPI_MEMCPY(&return_info->compatibility_id, cid_list,
-                           cid_list->size);
+               info->compatible_id_list.count = cid_list->count;
+               info->compatible_id_list.list_size = cid_list->list_size;
+
+               /* Copy each CID */
+
+               for (i = 0; i < cid_list->count; i++) {
+                       next_id_string =
+                           acpi_ns_copy_device_id(&info->compatible_id_list.
+                                                  ids[i], &cid_list->ids[i],
+                                                  next_id_string);
+
+                       if (acpi_ut_is_pci_root_bridge(cid_list->ids[i].string)) {
+                               info->flags |= ACPI_PCI_ROOT_BRIDGE;
+                       }
+               }
        }
 
+       /* Copy the fixed-length data */
+
+       info->info_size = info_size;
+       info->type = type;
+       info->name = name;
+       info->param_count = param_count;
+       info->valid = valid;
+
+       *return_buffer = info;
+       status = AE_OK;
+
       cleanup:
-       ACPI_FREE(info);
+       if (hid) {
+               ACPI_FREE(hid);
+       }
+       if (uid) {
+               ACPI_FREE(uid);
+       }
        if (cid_list) {
                ACPI_FREE(cid_list);
        }
index c5f6ce1..cd7995b 100644 (file)
@@ -86,6 +86,9 @@ static acpi_status
 acpi_ps_complete_final_op(struct acpi_walk_state *walk_state,
                          union acpi_parse_object *op, acpi_status status);
 
+static void
+acpi_ps_link_module_code(u8 *aml_start, u32 aml_length, acpi_owner_id owner_id);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_get_aml_opcode
@@ -390,6 +393,7 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
 {
        acpi_status status = AE_OK;
        union acpi_parse_object *arg = NULL;
+       const struct acpi_opcode_info *op_info;
 
        ACPI_FUNCTION_TRACE_PTR(ps_get_arguments, walk_state);
 
@@ -449,13 +453,11 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                        INCREMENT_ARG_LIST(walk_state->arg_types);
                }
 
-               /* Special processing for certain opcodes */
-
-               /* TBD (remove): Temporary mechanism to disable this code if needed */
-
-#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-
-               if ((walk_state->pass_number <= ACPI_IMODE_LOAD_PASS1) &&
+               /*
+                * Handle executable code at "module-level". This refers to
+                * executable opcodes that appear outside of any control method.
+                */
+               if ((walk_state->pass_number <= ACPI_IMODE_LOAD_PASS2) &&
                    ((walk_state->parse_flags & ACPI_PARSE_DISASSEMBLE) == 0)) {
                        /*
                         * We want to skip If/Else/While constructs during Pass1 because we
@@ -469,6 +471,23 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                        case AML_ELSE_OP:
                        case AML_WHILE_OP:
 
+                               /*
+                                * Currently supported module-level opcodes are:
+                                * IF/ELSE/WHILE. These appear to be the most common,
+                                * and easiest to support since they open an AML
+                                * package.
+                                */
+                               if (walk_state->pass_number ==
+                                   ACPI_IMODE_LOAD_PASS1) {
+                                       acpi_ps_link_module_code(aml_op_start,
+                                                                walk_state->
+                                                                parser_state.
+                                                                pkg_end -
+                                                                aml_op_start,
+                                                                walk_state->
+                                                                owner_id);
+                               }
+
                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
                                                  "Pass1: Skipping an If/Else/While body\n"));
 
@@ -480,10 +499,34 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                                break;
 
                        default:
+                               /*
+                                * Check for an unsupported executable opcode at module
+                                * level. We must be in PASS1, the parent must be a SCOPE,
+                                * The opcode class must be EXECUTE, and the opcode must
+                                * not be an argument to another opcode.
+                                */
+                               if ((walk_state->pass_number ==
+                                    ACPI_IMODE_LOAD_PASS1)
+                                   && (op->common.parent->common.aml_opcode ==
+                                       AML_SCOPE_OP)) {
+                                       op_info =
+                                           acpi_ps_get_opcode_info(op->common.
+                                                                   aml_opcode);
+                                       if ((op_info->class ==
+                                            AML_CLASS_EXECUTE) && (!arg)) {
+                                               ACPI_WARNING((AE_INFO,
+                                                             "Detected an unsupported executable opcode "
+                                                             "at module-level: [0x%.4X] at table offset 0x%.4X",
+                                                             op->common.aml_opcode,
+                                                             (u32)((aml_op_start - walk_state->parser_state.aml_start)
+                                                               + sizeof(struct acpi_table_header))));
+                                       }
+                               }
                                break;
                        }
                }
-#endif
+
+               /* Special processing for certain opcodes */
 
                switch (op->common.aml_opcode) {
                case AML_METHOD_OP:
@@ -551,6 +594,66 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
        return_ACPI_STATUS(AE_OK);
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_link_module_code
+ *
+ * PARAMETERS:  aml_start           - Pointer to the AML
+ *              aml_length          - Length of executable AML
+ *              owner_id            - owner_id of module level code
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Wrap the module-level code with a method object and link the
+ *              object to the global list. Note, the mutex field of the method
+ *              object is used to link multiple module-level code objects.
+ *
+ ******************************************************************************/
+
+static void
+acpi_ps_link_module_code(u8 *aml_start, u32 aml_length, acpi_owner_id owner_id)
+{
+       union acpi_operand_object *prev;
+       union acpi_operand_object *next;
+       union acpi_operand_object *method_obj;
+
+       /* Get the tail of the list */
+
+       prev = next = acpi_gbl_module_code_list;
+       while (next) {
+               prev = next;
+               next = next->method.mutex;
+       }
+
+       /*
+        * Insert the module level code into the list. Merge it if it is
+        * adjacent to the previous element.
+        */
+       if (!prev ||
+           ((prev->method.aml_start + prev->method.aml_length) != aml_start)) {
+
+               /* Create, initialize, and link a new temporary method object */
+
+               method_obj = acpi_ut_create_internal_object(ACPI_TYPE_METHOD);
+               if (!method_obj) {
+                       return;
+               }
+
+               method_obj->method.aml_start = aml_start;
+               method_obj->method.aml_length = aml_length;
+               method_obj->method.owner_id = owner_id;
+               method_obj->method.flags |= AOPOBJ_MODULE_LEVEL;
+
+               if (!prev) {
+                       acpi_gbl_module_code_list = method_obj;
+               } else {
+                       prev->method.mutex = method_obj;
+               }
+       } else {
+               prev->method.aml_length += aml_length;
+       }
+}
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ps_complete_op
index ff06032..dd9731c 100644 (file)
@@ -280,6 +280,10 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                goto cleanup;
        }
 
+       if (info->obj_desc->method.flags & AOPOBJ_MODULE_LEVEL) {
+               walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
+       }
+
        /* Invoke an internal method if necessary */
 
        if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
index 82b02dc..c016335 100644 (file)
@@ -275,7 +275,6 @@ void acpi_tb_parse_fadt(u32 table_index)
 
 void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 {
-
        /*
         * Check if the FADT is larger than the largest table that we expect
         * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
index ef7d2c2..1f15497 100644 (file)
 ACPI_MODULE_NAME("tbutils")
 
 /* Local prototypes */
+static void acpi_tb_fix_string(char *string, acpi_size length);
+
+static void
+acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
+                            struct acpi_table_header *header);
+
 static acpi_physical_address
 acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
 
@@ -159,6 +165,59 @@ u8 acpi_tb_tables_loaded(void)
        return (FALSE);
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_fix_string
+ *
+ * PARAMETERS:  String              - String to be repaired
+ *              Length              - Maximum length
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Replace every non-printable or non-ascii byte in the string
+ *              with a question mark '?'.
+ *
+ ******************************************************************************/
+
+static void acpi_tb_fix_string(char *string, acpi_size length)
+{
+
+       while (length && *string) {
+               if (!ACPI_IS_PRINT(*string)) {
+                       *string = '?';
+               }
+               string++;
+               length--;
+       }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_cleanup_table_header
+ *
+ * PARAMETERS:  out_header          - Where the cleaned header is returned
+ *              Header              - Input ACPI table header
+ *
+ * RETURN:      Returns the cleaned header in out_header
+ *
+ * DESCRIPTION: Copy the table header and ensure that all "string" fields in
+ *              the header consist of printable characters.
+ *
+ ******************************************************************************/
+
+static void
+acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
+                            struct acpi_table_header *header)
+{
+
+       ACPI_MEMCPY(out_header, header, sizeof(struct acpi_table_header));
+
+       acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
+       acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
+       acpi_tb_fix_string(out_header->oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
+       acpi_tb_fix_string(out_header->asl_compiler_id, ACPI_NAME_SIZE);
+}
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_tb_print_table_header
@@ -176,6 +235,7 @@ void
 acpi_tb_print_table_header(acpi_physical_address address,
                           struct acpi_table_header *header)
 {
+       struct acpi_table_header local_header;
 
        /*
         * The reason that the Address is cast to a void pointer is so that we
@@ -192,6 +252,11 @@ acpi_tb_print_table_header(acpi_physical_address address,
 
                /* RSDP has no common fields */
 
+               ACPI_MEMCPY(local_header.oem_id,
+                           ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                         header)->oem_id, ACPI_OEM_ID_SIZE);
+               acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
+
                ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
                           ACPI_CAST_PTR (void, address),
                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
@@ -200,18 +265,21 @@ acpi_tb_print_table_header(acpi_physical_address address,
                                               header)->length : 20,
                           ACPI_CAST_PTR(struct acpi_table_rsdp,
                                         header)->revision,
-                          ACPI_CAST_PTR(struct acpi_table_rsdp,
-                                        header)->oem_id));
+                          local_header.oem_id));
        } else {
                /* Standard ACPI table with full common header */
 
+               acpi_tb_cleanup_table_header(&local_header, header);
+
                ACPI_INFO((AE_INFO,
                           "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
-                          header->signature, ACPI_CAST_PTR (void, address),
-                          header->length, header->revision, header->oem_id,
-                          header->oem_table_id, header->oem_revision,
-                          header->asl_compiler_id,
-                          header->asl_compiler_revision));
+                          local_header.signature, ACPI_CAST_PTR(void, address),
+                          local_header.length, local_header.revision,
+                          local_header.oem_id, local_header.oem_table_id,
+                          local_header.oem_revision,
+                          local_header.asl_compiler_id,
+                          local_header.asl_compiler_revision));
+
        }
 }
 
index bc17103..96e26e7 100644 (file)
@@ -215,6 +215,12 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
                                  "***** Region %p\n", object));
 
+               /* Invalidate the region address/length via the host OS */
+
+               acpi_os_invalidate_address(object->region.space_id,
+                                         object->region.address,
+                                         (acpi_size) object->region.length);
+
                second_desc = acpi_ns_get_secondary_object(object);
                if (second_desc) {
                        /*
index 006b16c..5d54e36 100644 (file)
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("uteval")
 
-/* Local prototypes */
-static void
-acpi_ut_copy_id_string(char *destination, char *source, acpi_size max_length);
-
-static acpi_status
-acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
-                         struct acpi_compatible_id *one_cid);
-
 /*
  * Strings supported by the _OSI predefined (internal) method.
  *
@@ -78,6 +69,9 @@ static struct acpi_interface_info acpi_interfaces_supported[] = {
        {"Windows 2001 SP2", ACPI_OSI_WIN_XP_SP2},      /* Windows XP SP2 */
        {"Windows 2001.1 SP1", ACPI_OSI_WINSRV_2003_SP1},       /* Windows Server 2003 SP1 - Added 03/2006 */
        {"Windows 2006", ACPI_OSI_WIN_VISTA},   /* Windows Vista - Added 03/2006 */
+       {"Windows 2006.1", ACPI_OSI_WINSRV_2008},       /* Windows Server 2008 - Added 09/2009 */
+       {"Windows 2006 SP1", ACPI_OSI_WIN_VISTA_SP1},   /* Windows Vista SP1 - Added 09/2009 */
+       {"Windows 2009", ACPI_OSI_WIN_7},       /* Windows 7 and Server 2008 R2 - Added 09/2009 */
 
        /* Feature Group Strings */
 
@@ -213,7 +207,7 @@ acpi_status acpi_osi_invalidate(char *interface)
  * RETURN:      Status
  *
  * DESCRIPTION: Evaluates a namespace object and verifies the type of the
- *              return object.  Common code that simplifies accessing objects
+ *              return object. Common code that simplifies accessing objects
  *              that have required return objects of fixed types.
  *
  *              NOTE: Internal function, no parameter validation
@@ -298,7 +292,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
        if ((acpi_gbl_enable_interpreter_slack) && (!expected_return_btypes)) {
                /*
-                * We received a return object, but one was not expected.  This can
+                * We received a return object, but one was not expected. This can
                 * happen frequently if the "implicit return" feature is enabled.
                 * Just delete the return object and return AE_OK.
                 */
@@ -340,12 +334,12 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
  *
  * PARAMETERS:  object_name         - Object name to be evaluated
  *              device_node         - Node for the device
- *              Address             - Where the value is returned
+ *              Value               - Where the value is returned
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Evaluates a numeric namespace object for a selected device
- *              and stores result in *Address.
+ *              and stores result in *Value.
  *
  *              NOTE: Internal function, no parameter validation
  *
@@ -354,7 +348,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
                                struct acpi_namespace_node *device_node,
-                               acpi_integer * address)
+                               acpi_integer *value)
 {
        union acpi_operand_object *obj_desc;
        acpi_status status;
@@ -369,295 +363,7 @@ acpi_ut_evaluate_numeric_object(char *object_name,
 
        /* Get the returned Integer */
 
-       *address = obj_desc->integer.value;
-
-       /* On exit, we must delete the return object */
-
-       acpi_ut_remove_reference(obj_desc);
-       return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_copy_id_string
- *
- * PARAMETERS:  Destination         - Where to copy the string
- *              Source              - Source string
- *              max_length          - Length of the destination buffer
- *
- * RETURN:      None
- *
- * DESCRIPTION: Copies an ID string for the _HID, _CID, and _UID methods.
- *              Performs removal of a leading asterisk if present -- workaround
- *              for a known issue on a bunch of machines.
- *
- ******************************************************************************/
-
-static void
-acpi_ut_copy_id_string(char *destination, char *source, acpi_size max_length)
-{
-
-       /*
-        * Workaround for ID strings that have a leading asterisk. This construct
-        * is not allowed by the ACPI specification  (ID strings must be
-        * alphanumeric), but enough existing machines have this embedded in their
-        * ID strings that the following code is useful.
-        */
-       if (*source == '*') {
-               source++;
-       }
-
-       /* Do the actual copy */
-
-       ACPI_STRNCPY(destination, source, max_length);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_execute_HID
- *
- * PARAMETERS:  device_node         - Node for the device
- *              Hid                 - Where the HID is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Executes the _HID control method that returns the hardware
- *              ID of the device.
- *
- *              NOTE: Internal function, no parameter validation
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                   struct acpica_device_id *hid)
-{
-       union acpi_operand_object *obj_desc;
-       acpi_status status;
-
-       ACPI_FUNCTION_TRACE(ut_execute_HID);
-
-       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__HID,
-                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
-                                        &obj_desc);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-
-       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
-
-               /* Convert the Numeric HID to string */
-
-               acpi_ex_eisa_id_to_string((u32) obj_desc->integer.value,
-                                         hid->value);
-       } else {
-               /* Copy the String HID from the returned object */
-
-               acpi_ut_copy_id_string(hid->value, obj_desc->string.pointer,
-                                      sizeof(hid->value));
-       }
-
-       /* On exit, we must delete the return object */
-
-       acpi_ut_remove_reference(obj_desc);
-       return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_translate_one_cid
- *
- * PARAMETERS:  obj_desc            - _CID object, must be integer or string
- *              one_cid             - Where the CID string is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Return a numeric or string _CID value as a string.
- *              (Compatible ID)
- *
- *              NOTE:  Assumes a maximum _CID string length of
- *                     ACPI_MAX_CID_LENGTH.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
-                         struct acpi_compatible_id *one_cid)
-{
-
-       switch (obj_desc->common.type) {
-       case ACPI_TYPE_INTEGER:
-
-               /* Convert the Numeric CID to string */
-
-               acpi_ex_eisa_id_to_string((u32) obj_desc->integer.value,
-                                         one_cid->value);
-               return (AE_OK);
-
-       case ACPI_TYPE_STRING:
-
-               if (obj_desc->string.length > ACPI_MAX_CID_LENGTH) {
-                       return (AE_AML_STRING_LIMIT);
-               }
-
-               /* Copy the String CID from the returned object */
-
-               acpi_ut_copy_id_string(one_cid->value, obj_desc->string.pointer,
-                                      ACPI_MAX_CID_LENGTH);
-               return (AE_OK);
-
-       default:
-
-               return (AE_TYPE);
-       }
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_execute_CID
- *
- * PARAMETERS:  device_node         - Node for the device
- *              return_cid_list     - Where the CID list is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Executes the _CID control method that returns one or more
- *              compatible hardware IDs for the device.
- *
- *              NOTE: Internal function, no parameter validation
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ut_execute_CID(struct acpi_namespace_node * device_node,
-                   struct acpi_compatible_id_list ** return_cid_list)
-{
-       union acpi_operand_object *obj_desc;
-       acpi_status status;
-       u32 count;
-       u32 size;
-       struct acpi_compatible_id_list *cid_list;
-       u32 i;
-
-       ACPI_FUNCTION_TRACE(ut_execute_CID);
-
-       /* Evaluate the _CID method for this device */
-
-       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__CID,
-                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING
-                                        | ACPI_BTYPE_PACKAGE, &obj_desc);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-
-       /* Get the number of _CIDs returned */
-
-       count = 1;
-       if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
-               count = obj_desc->package.count;
-       }
-
-       /* Allocate a worst-case buffer for the _CIDs */
-
-       size = (((count - 1) * sizeof(struct acpi_compatible_id)) +
-               sizeof(struct acpi_compatible_id_list));
-
-       cid_list = ACPI_ALLOCATE_ZEROED((acpi_size) size);
-       if (!cid_list) {
-               return_ACPI_STATUS(AE_NO_MEMORY);
-       }
-
-       /* Init CID list */
-
-       cid_list->count = count;
-       cid_list->size = size;
-
-       /*
-        *  A _CID can return either a single compatible ID or a package of
-        *  compatible IDs.  Each compatible ID can be one of the following:
-        *  1) Integer (32 bit compressed EISA ID) or
-        *  2) String (PCI ID format, e.g. "PCI\VEN_vvvv&DEV_dddd&SUBSYS_ssssssss")
-        */
-
-       /* The _CID object can be either a single CID or a package (list) of CIDs */
-
-       if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
-
-               /* Translate each package element */
-
-               for (i = 0; i < count; i++) {
-                       status =
-                           acpi_ut_translate_one_cid(obj_desc->package.
-                                                     elements[i],
-                                                     &cid_list->id[i]);
-                       if (ACPI_FAILURE(status)) {
-                               break;
-                       }
-               }
-       } else {
-               /* Only one CID, translate to a string */
-
-               status = acpi_ut_translate_one_cid(obj_desc, cid_list->id);
-       }
-
-       /* Cleanup on error */
-
-       if (ACPI_FAILURE(status)) {
-               ACPI_FREE(cid_list);
-       } else {
-               *return_cid_list = cid_list;
-       }
-
-       /* On exit, we must delete the _CID return object */
-
-       acpi_ut_remove_reference(obj_desc);
-       return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_execute_UID
- *
- * PARAMETERS:  device_node         - Node for the device
- *              Uid                 - Where the UID is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Executes the _UID control method that returns the hardware
- *              ID of the device.
- *
- *              NOTE: Internal function, no parameter validation
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                   struct acpica_device_id *uid)
-{
-       union acpi_operand_object *obj_desc;
-       acpi_status status;
-
-       ACPI_FUNCTION_TRACE(ut_execute_UID);
-
-       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__UID,
-                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
-                                        &obj_desc);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-
-       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
-
-               /* Convert the Numeric UID to string */
-
-               acpi_ex_unsigned_integer_to_string(obj_desc->integer.value,
-                                                  uid->value);
-       } else {
-               /* Copy the String UID from the returned object */
-
-               acpi_ut_copy_id_string(uid->value, obj_desc->string.pointer,
-                                      sizeof(uid->value));
-       }
+       *value = obj_desc->integer.value;
 
        /* On exit, we must delete the return object */
 
@@ -716,60 +422,64 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 * flags)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_execute_Sxds
+ * FUNCTION:    acpi_ut_execute_power_methods
  *
  * PARAMETERS:  device_node         - Node for the device
- *              Flags               - Where the status flags are returned
+ *              method_names        - Array of power method names
+ *              method_count        - Number of methods to execute
+ *              out_values          - Where the power method values are returned
  *
- * RETURN:      Status
+ * RETURN:      Status, out_values
  *
- * DESCRIPTION: Executes _STA for selected device and stores results in
- *              *Flags.
+ * DESCRIPTION: Executes the specified power methods for the device and returns
+ *              the result(s).
  *
  *              NOTE: Internal function, no parameter validation
  *
- ******************************************************************************/
+******************************************************************************/
 
 acpi_status
-acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest)
+acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
+                             const char **method_names,
+                             u8 method_count, u8 *out_values)
 {
        union acpi_operand_object *obj_desc;
        acpi_status status;
+       acpi_status final_status = AE_NOT_FOUND;
        u32 i;
 
-       ACPI_FUNCTION_TRACE(ut_execute_sxds);
+       ACPI_FUNCTION_TRACE(ut_execute_power_methods);
 
-       for (i = 0; i < 4; i++) {
-               highest[i] = 0xFF;
+       for (i = 0; i < method_count; i++) {
+               /*
+                * Execute the power method (_sx_d or _sx_w). The only allowable
+                * return type is an Integer.
+                */
                status = acpi_ut_evaluate_object(device_node,
                                                 ACPI_CAST_PTR(char,
-                                                              acpi_gbl_highest_dstate_names
-                                                              [i]),
+                                                              method_names[i]),
                                                 ACPI_BTYPE_INTEGER, &obj_desc);
-               if (ACPI_FAILURE(status)) {
-                       if (status != AE_NOT_FOUND) {
-                               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                                 "%s on Device %4.4s, %s\n",
-                                                 ACPI_CAST_PTR(char,
-                                                               acpi_gbl_highest_dstate_names
-                                                               [i]),
-                                                 acpi_ut_get_node_name
-                                                 (device_node),
-                                                 acpi_format_exception
-                                                 (status)));
-
-                               return_ACPI_STATUS(status);
-                       }
-               } else {
-                       /* Extract the Dstate value */
-
-                       highest[i] = (u8) obj_desc->integer.value;
+               if (ACPI_SUCCESS(status)) {
+                       out_values[i] = (u8)obj_desc->integer.value;
 
                        /* Delete the return object */
 
                        acpi_ut_remove_reference(obj_desc);
+                       final_status = AE_OK;   /* At least one value is valid */
+                       continue;
                }
+
+               out_values[i] = ACPI_UINT8_MAX;
+               if (status == AE_NOT_FOUND) {
+                       continue;       /* Ignore if not found */
+               }
+
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "Failed %s on Device %4.4s, %s\n",
+                                 ACPI_CAST_PTR(char, method_names[i]),
+                                 acpi_ut_get_node_name(device_node),
+                                 acpi_format_exception(status)));
        }
 
-       return_ACPI_STATUS(AE_OK);
+       return_ACPI_STATUS(final_status);
 }
index 59e46f2..3f2c68f 100644 (file)
@@ -90,7 +90,15 @@ const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {
        "\\_S5_"
 };
 
-const char *acpi_gbl_highest_dstate_names[4] = {
+const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS] = {
+       "_S0W",
+       "_S1W",
+       "_S2W",
+       "_S3W",
+       "_S4W"
+};
+
+const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS] = {
        "_S1D",
        "_S2D",
        "_S3D",
@@ -351,6 +359,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
        "SMBus",
        "SystemCMOS",
        "PCIBARTarget",
+       "IPMI",
        "DataTable"
 };
 
@@ -798,6 +807,7 @@ acpi_status acpi_ut_init_globals(void)
 
        /* Namespace */
 
+       acpi_gbl_module_code_list = NULL;
        acpi_gbl_root_node = NULL;
        acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME;
        acpi_gbl_root_node_struct.descriptor_type = ACPI_DESC_TYPE_NAMED;
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
new file mode 100644 (file)
index 0000000..52eaae4
--- /dev/null
@@ -0,0 +1,382 @@
+/******************************************************************************
+ *
+ * Module Name: utids - support for device IDs - HID, UID, CID
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2009, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acinterp.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utids")
+
+/* Local prototypes */
+static void acpi_ut_copy_id_string(char *destination, char *source);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_copy_id_string
+ *
+ * PARAMETERS:  Destination         - Where to copy the string
+ *              Source              - Source string
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Copies an ID string for the _HID, _CID, and _UID methods.
+ *              Performs removal of a leading asterisk if present -- workaround
+ *              for a known issue on a bunch of machines.
+ *
+ ******************************************************************************/
+
+static void acpi_ut_copy_id_string(char *destination, char *source)
+{
+
+       /*
+        * Workaround for ID strings that have a leading asterisk. This construct
+        * is not allowed by the ACPI specification  (ID strings must be
+        * alphanumeric), but enough existing machines have this embedded in their
+        * ID strings that the following code is useful.
+        */
+       if (*source == '*') {
+               source++;
+       }
+
+       /* Do the actual copy */
+
+       ACPI_STRCPY(destination, source);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_execute_HID
+ *
+ * PARAMETERS:  device_node         - Node for the device
+ *              return_id           - Where the string HID is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Executes the _HID control method that returns the hardware
+ *              ID of the device. The HID is either an 32-bit encoded EISAID
+ *              Integer or a String. A string is always returned. An EISAID
+ *              is converted to a string.
+ *
+ *              NOTE: Internal function, no parameter validation
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
+                   struct acpica_device_id **return_id)
+{
+       union acpi_operand_object *obj_desc;
+       struct acpica_device_id *hid;
+       u32 length;
+       acpi_status status;
+
+       ACPI_FUNCTION_TRACE(ut_execute_HID);
+
+       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__HID,
+                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
+                                        &obj_desc);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       /* Get the size of the String to be returned, includes null terminator */
+
+       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
+               length = ACPI_EISAID_STRING_SIZE;
+       } else {
+               length = obj_desc->string.length + 1;
+       }
+
+       /* Allocate a buffer for the HID */
+
+       hid =
+           ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+                                (acpi_size) length);
+       if (!hid) {
+               status = AE_NO_MEMORY;
+               goto cleanup;
+       }
+
+       /* Area for the string starts after DEVICE_ID struct */
+
+       hid->string = ACPI_ADD_PTR(char, hid, sizeof(struct acpica_device_id));
+
+       /* Convert EISAID to a string or simply copy existing string */
+
+       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
+               acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value);
+       } else {
+               acpi_ut_copy_id_string(hid->string, obj_desc->string.pointer);
+       }
+
+       hid->length = length;
+       *return_id = hid;
+
+cleanup:
+
+       /* On exit, we must delete the return object */
+
+       acpi_ut_remove_reference(obj_desc);
+       return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_execute_UID
+ *
+ * PARAMETERS:  device_node         - Node for the device
+ *              return_id           - Where the string UID is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Executes the _UID control method that returns the unique
+ *              ID of the device. The UID is either a 64-bit Integer (NOT an
+ *              EISAID) or a string. Always returns a string. A 64-bit integer
+ *              is converted to a decimal string.
+ *
+ *              NOTE: Internal function, no parameter validation
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
+                   struct acpica_device_id **return_id)
+{
+       union acpi_operand_object *obj_desc;
+       struct acpica_device_id *uid;
+       u32 length;
+       acpi_status status;
+
+       ACPI_FUNCTION_TRACE(ut_execute_UID);
+
+       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__UID,
+                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,
+                                        &obj_desc);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       /* Get the size of the String to be returned, includes null terminator */
+
+       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
+               length = ACPI_MAX64_DECIMAL_DIGITS + 1;
+       } else {
+               length = obj_desc->string.length + 1;
+       }
+
+       /* Allocate a buffer for the UID */
+
+       uid =
+           ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+                                (acpi_size) length);
+       if (!uid) {
+               status = AE_NO_MEMORY;
+               goto cleanup;
+       }
+
+       /* Area for the string starts after DEVICE_ID struct */
+
+       uid->string = ACPI_ADD_PTR(char, uid, sizeof(struct acpica_device_id));
+
+       /* Convert an Integer to string, or just copy an existing string */
+
+       if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
+               acpi_ex_integer_to_string(uid->string, obj_desc->integer.value);
+       } else {
+               acpi_ut_copy_id_string(uid->string, obj_desc->string.pointer);
+       }
+
+       uid->length = length;
+       *return_id = uid;
+
+cleanup:
+
+       /* On exit, we must delete the return object */
+
+       acpi_ut_remove_reference(obj_desc);
+       return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_execute_CID
+ *
+ * PARAMETERS:  device_node         - Node for the device
+ *              return_cid_list     - Where the CID list is returned
+ *
+ * RETURN:      Status, list of CID strings
+ *
+ * DESCRIPTION: Executes the _CID control method that returns one or more
+ *              compatible hardware IDs for the device.
+ *
+ *              NOTE: Internal function, no parameter validation
+ *
+ * A _CID method can return either a single compatible ID or a package of
+ * compatible IDs. Each compatible ID can be one of the following:
+ * 1) Integer (32 bit compressed EISA ID) or
+ * 2) String (PCI ID format, e.g. "PCI\VEN_vvvv&DEV_dddd&SUBSYS_ssssssss")
+ *
+ * The Integer CIDs are converted to string format by this function.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
+                   struct acpica_device_id_list **return_cid_list)
+{
+       union acpi_operand_object **cid_objects;
+       union acpi_operand_object *obj_desc;
+       struct acpica_device_id_list *cid_list;
+       char *next_id_string;
+       u32 string_area_size;
+       u32 length;
+       u32 cid_list_size;
+       acpi_status status;
+       u32 count;
+       u32 i;
+
+       ACPI_FUNCTION_TRACE(ut_execute_CID);
+
+       /* Evaluate the _CID method for this device */
+
+       status = acpi_ut_evaluate_object(device_node, METHOD_NAME__CID,
+                                        ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING
+                                        | ACPI_BTYPE_PACKAGE, &obj_desc);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       /*
+        * Get the count and size of the returned _CIDs. _CID can return either
+        * a Package of Integers/Strings or a single Integer or String.
+        * Note: This section also validates that all CID elements are of the
+        * correct type (Integer or String).
+        */
+       if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
+               count = obj_desc->package.count;
+               cid_objects = obj_desc->package.elements;
+       } else {                /* Single Integer or String CID */
+
+               count = 1;
+               cid_objects = &obj_desc;
+       }
+
+       string_area_size = 0;
+       for (i = 0; i < count; i++) {
+
+               /* String lengths include null terminator */
+
+               switch (cid_objects[i]->common.type) {
+               case ACPI_TYPE_INTEGER:
+                       string_area_size += ACPI_EISAID_STRING_SIZE;
+                       break;
+
+               case ACPI_TYPE_STRING:
+                       string_area_size += cid_objects[i]->string.length + 1;
+                       break;
+
+               default:
+                       status = AE_TYPE;
+                       goto cleanup;
+               }
+       }
+
+       /*
+        * Now that we know the length of the CIDs, allocate return buffer:
+        * 1) Size of the base structure +
+        * 2) Size of the CID DEVICE_ID array +
+        * 3) Size of the actual CID strings
+        */
+       cid_list_size = sizeof(struct acpica_device_id_list) +
+           ((count - 1) * sizeof(struct acpica_device_id)) + string_area_size;
+
+       cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
+       if (!cid_list) {
+               status = AE_NO_MEMORY;
+               goto cleanup;
+       }
+
+       /* Area for CID strings starts after the CID DEVICE_ID array */
+
+       next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
+           ((acpi_size) count * sizeof(struct acpica_device_id));
+
+       /* Copy/convert the CIDs to the return buffer */
+
+       for (i = 0; i < count; i++) {
+               if (cid_objects[i]->common.type == ACPI_TYPE_INTEGER) {
+
+                       /* Convert the Integer (EISAID) CID to a string */
+
+                       acpi_ex_eisa_id_to_string(next_id_string,
+                                                 cid_objects[i]->integer.
+                                                 value);
+                       length = ACPI_EISAID_STRING_SIZE;
+               } else {        /* ACPI_TYPE_STRING */
+
+                       /* Copy the String CID from the returned object */
+
+                       acpi_ut_copy_id_string(next_id_string,
+                                              cid_objects[i]->string.pointer);
+                       length = cid_objects[i]->string.length + 1;
+               }
+
+               cid_list->ids[i].string = next_id_string;
+               cid_list->ids[i].length = length;
+               next_id_string += length;
+       }
+
+       /* Finish the CID list */
+
+       cid_list->count = count;
+       cid_list->list_size = cid_list_size;
+       *return_cid_list = cid_list;
+
+cleanup:
+
+       /* On exit, we must delete the _CID return object */
+
+       acpi_ut_remove_reference(obj_desc);
+       return_ACPI_STATUS(status);
+}
index a54ca84..9d0919e 100644 (file)
@@ -99,33 +99,19 @@ static void acpi_ut_terminate(void)
  *
  * FUNCTION:    acpi_ut_subsystem_shutdown
  *
- * PARAMETERS:  none
+ * PARAMETERS:  None
  *
- * RETURN:      none
+ * RETURN:      None
  *
- * DESCRIPTION: Shutdown the various subsystems.  Don't delete the mutex
- *              objects here -- because the AML debugger may be still running.
+ * DESCRIPTION: Shutdown the various components. Do not delete the mutex
+ *              objects here, because the AML debugger may be still running.
  *
  ******************************************************************************/
 
 void acpi_ut_subsystem_shutdown(void)
 {
-
        ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
 
-       /* Just exit if subsystem is already shutdown */
-
-       if (acpi_gbl_shutdown) {
-               ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
-               return_VOID;
-       }
-
-       /* Subsystem appears active, go ahead and shut it down */
-
-       acpi_gbl_shutdown = TRUE;
-       acpi_gbl_startup_flags = 0;
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
-
 #ifndef ACPI_ASL_COMPILER
 
        /* Close the acpi_event Handling */
index fbe7823..61f6315 100644 (file)
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
 
+/*
+ * Common suffix for messages
+ */
+#define ACPI_COMMON_MSG_SUFFIX \
+       acpi_os_printf(" (%8.8X/%s-%u)\n", ACPI_CA_VERSION, module_name, line_number)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_validate_exception
@@ -118,6 +123,34 @@ const char *acpi_ut_validate_exception(acpi_status status)
        return (ACPI_CAST_PTR(const char, exception));
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_is_pci_root_bridge
+ *
+ * PARAMETERS:  Id              - The HID/CID in string format
+ *
+ * RETURN:      TRUE if the Id is a match for a PCI/PCI-Express Root Bridge
+ *
+ * DESCRIPTION: Determine if the input ID is a PCI Root Bridge ID.
+ *
+ ******************************************************************************/
+
+u8 acpi_ut_is_pci_root_bridge(char *id)
+{
+
+       /*
+        * Check if this is a PCI root bridge.
+        * ACPI 3.0+: check for a PCI Express root also.
+        */
+       if (!(ACPI_STRCMP(id,
+                         PCI_ROOT_HID_STRING)) ||
+           !(ACPI_STRCMP(id, PCI_EXPRESS_ROOT_HID_STRING))) {
+               return (TRUE);
+       }
+
+       return (FALSE);
+}
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_is_aml_table
@@ -1037,8 +1070,7 @@ acpi_error(const char *module_name, u32 line_number, const char *format, ...)
 
        va_start(args, format);
        acpi_os_vprintf(format, args);
-       acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
-                      line_number);
+       ACPI_COMMON_MSG_SUFFIX;
        va_end(args);
 }
 
@@ -1052,8 +1084,7 @@ acpi_exception(const char *module_name,
 
        va_start(args, format);
        acpi_os_vprintf(format, args);
-       acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
-                      line_number);
+       ACPI_COMMON_MSG_SUFFIX;
        va_end(args);
 }
 
@@ -1066,8 +1097,7 @@ acpi_warning(const char *module_name, u32 line_number, const char *format, ...)
 
        va_start(args, format);
        acpi_os_vprintf(format, args);
-       acpi_os_printf(" %8.8X %s-%u\n", ACPI_CA_VERSION, module_name,
-                      line_number);
+       ACPI_COMMON_MSG_SUFFIX;
        va_end(args);
 }
 
@@ -1088,3 +1118,46 @@ ACPI_EXPORT_SYMBOL(acpi_error)
 ACPI_EXPORT_SYMBOL(acpi_exception)
 ACPI_EXPORT_SYMBOL(acpi_warning)
 ACPI_EXPORT_SYMBOL(acpi_info)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_predefined_warning
+ *
+ * PARAMETERS:  module_name     - Caller's module name (for error output)
+ *              line_number     - Caller's line number (for error output)
+ *              Pathname        - Full pathname to the node
+ *              node_flags      - From Namespace node for the method/object
+ *              Format          - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Warnings for the predefined validation module. Messages are
+ *              only emitted the first time a problem with a particular
+ *              method/object is detected. This prevents a flood of error
+ *              messages for methods that are repeatedly evaluated.
+ *
+******************************************************************************/
+
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_warning(const char *module_name,
+                          u32 line_number,
+                          char *pathname,
+                          u8 node_flags, const char *format, ...)
+{
+       va_list args;
+
+       /*
+        * Warning messages for this method/object will be disabled after the
+        * first time a validation fails or an object is successfully repaired.
+        */
+       if (node_flags & ANOBJ_EVALUATED) {
+               return;
+       }
+
+       acpi_os_printf("ACPI Warning for %s: ", pathname);
+
+       va_start(args, format);
+       acpi_os_vprintf(format, args);
+       ACPI_COMMON_MSG_SUFFIX;
+       va_end(args);
+}
index 078a227..b1f5f68 100644 (file)
@@ -250,6 +250,16 @@ acpi_status acpi_initialize_objects(u32 flags)
                }
        }
 
+       /*
+        * Execute any module-level code that was detected during the table load
+        * phase. Although illegal since ACPI 2.0, there are many machines that
+        * contain this type of code. Each block of detected executable AML code
+        * outside of any control method is wrapped with a temporary control
+        * method object and placed on a global list. The methods on this list
+        * are executed below.
+        */
+       acpi_ns_exec_module_code_list();
+
        /*
         * Initialize the objects that remain uninitialized. This runs the
         * executable AML that may be part of the declaration of these objects:
@@ -318,7 +328,7 @@ ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Shutdown the ACPI subsystem.  Release all resources.
+ * DESCRIPTION: Shutdown the ACPICA subsystem and release all resources.
  *
  ******************************************************************************/
 acpi_status acpi_terminate(void)
@@ -327,6 +337,19 @@ acpi_status acpi_terminate(void)
 
        ACPI_FUNCTION_TRACE(acpi_terminate);
 
+       /* Just exit if subsystem is already shutdown */
+
+       if (acpi_gbl_shutdown) {
+               ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
+               return_ACPI_STATUS(AE_OK);
+       }
+
+       /* Subsystem appears active, go ahead and shut it down */
+
+       acpi_gbl_shutdown = TRUE;
+       acpi_gbl_startup_flags = 0;
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
+
        /* Terminate the AML Debugger if present */
 
        ACPI_DEBUGGER_EXEC(acpi_gbl_db_terminate_threads = TRUE);
@@ -353,6 +376,7 @@ acpi_status acpi_terminate(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_terminate)
+
 #ifndef ACPI_ASL_COMPILER
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
index f8c3d1b..3f4602b 100644 (file)
@@ -31,6 +31,7 @@
 #include <linux/types.h>
 #include <linux/jiffies.h>
 #include <linux/async.h>
+#include <linux/dmi.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
@@ -87,6 +88,10 @@ static const struct acpi_device_id battery_device_ids[] = {
 
 MODULE_DEVICE_TABLE(acpi, battery_device_ids);
 
+/* For buggy DSDTs that report negative 16-bit values for either charging
+ * or discharging current and/or report 0 as 65536 due to bad math.
+ */
+#define QUIRK_SIGNED16_CURRENT 0x0001
 
 struct acpi_battery {
        struct mutex lock;
@@ -114,6 +119,7 @@ struct acpi_battery {
        int state;
        int power_unit;
        u8 alarm_present;
+       long quirks;
 };
 
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
@@ -392,6 +398,11 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
                                 state_offsets, ARRAY_SIZE(state_offsets));
        battery->update_time = jiffies;
        kfree(buffer.pointer);
+
+       if ((battery->quirks & QUIRK_SIGNED16_CURRENT) &&
+           battery->rate_now != -1)
+               battery->rate_now = abs((s16)battery->rate_now);
+
        return result;
 }
 
@@ -497,6 +508,14 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
 }
 #endif
 
+static void acpi_battery_quirks(struct acpi_battery *battery)
+{
+       battery->quirks = 0;
+       if (dmi_name_in_vendors("Acer") && battery->power_unit) {
+               battery->quirks |= QUIRK_SIGNED16_CURRENT;
+       }
+}
+
 static int acpi_battery_update(struct acpi_battery *battery)
 {
        int result, old_present = acpi_battery_present(battery);
@@ -515,6 +534,7 @@ static int acpi_battery_update(struct acpi_battery *battery)
                result = acpi_battery_get_info(battery);
                if (result)
                        return result;
+               acpi_battery_quirks(battery);
                acpi_battery_init_alarm(battery);
        }
 #ifdef CONFIG_ACPI_SYSFS_POWER
index 2876fc7..135fbfe 100644 (file)
@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #include "internal.h"
 
@@ -141,7 +142,7 @@ int acpi_bus_get_status(struct acpi_device *device)
 EXPORT_SYMBOL(acpi_bus_get_status);
 
 void acpi_bus_private_data_handler(acpi_handle handle,
-                                  u32 function, void *context)
+                                  void *context)
 {
        return;
 }
index 5f2c3c0..642bb30 100644 (file)
@@ -202,20 +202,17 @@ container_walk_namespace_cb(acpi_handle handle,
                            u32 lvl, void *context, void **rv)
 {
        char *hid = NULL;
-       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_device_info *info;
        acpi_status status;
        int *action = context;
 
-
-       status = acpi_get_object_info(handle, &buffer);
-       if (ACPI_FAILURE(status) || !buffer.pointer) {
+       status = acpi_get_object_info(handle, &info);
+       if (ACPI_FAILURE(status)) {
                return AE_OK;
        }
 
-       info = buffer.pointer;
        if (info->valid & ACPI_VALID_HID)
-               hid = info->hardware_id.value;
+               hid = info->hardware_id.string;
 
        if (hid == NULL) {
                goto end;
@@ -242,7 +239,7 @@ container_walk_namespace_cb(acpi_handle handle,
        }
 
       end:
-       kfree(buffer.pointer);
+       kfree(info);
 
        return AE_OK;
 }
index a8287be..8a690c3 100644 (file)
@@ -3,6 +3,7 @@
  */
 
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -201,72 +202,54 @@ module_param_call(trace_state, param_set_trace_state, param_get_trace_state,
 #define ACPI_SYSTEM_FILE_DEBUG_LAYER   "debug_layer"
 #define ACPI_SYSTEM_FILE_DEBUG_LEVEL           "debug_level"
 
-static int
-acpi_system_read_debug(char *page,
-                      char **start, off_t off, int count, int *eof, void *data)
+static int acpi_system_debug_proc_show(struct seq_file *m, void *v)
 {
-       char *p = page;
-       int size = 0;
        unsigned int i;
 
-       if (off != 0)
-               goto end;
+       seq_printf(m, "%-25s\tHex        SET\n", "Description");
 
-       p += sprintf(p, "%-25s\tHex        SET\n", "Description");
-
-       switch ((unsigned long)data) {
+       switch ((unsigned long)m->private) {
        case 0:
                for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) {
-                       p += sprintf(p, "%-25s\t0x%08lX [%c]\n",
+                       seq_printf(m, "%-25s\t0x%08lX [%c]\n",
                                     acpi_debug_layers[i].name,
                                     acpi_debug_layers[i].value,
                                     (acpi_dbg_layer & acpi_debug_layers[i].
                                      value) ? '*' : ' ');
                }
-               p += sprintf(p, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",
+               seq_printf(m, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",
                             ACPI_ALL_DRIVERS,
                             (acpi_dbg_layer & ACPI_ALL_DRIVERS) ==
                             ACPI_ALL_DRIVERS ? '*' : (acpi_dbg_layer &
                                                       ACPI_ALL_DRIVERS) ==
                             0 ? ' ' : '-');
-               p += sprintf(p,
+               seq_printf(m,
                             "--\ndebug_layer = 0x%08X (* = enabled, - = partial)\n",
                             acpi_dbg_layer);
                break;
        case 1:
                for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) {
-                       p += sprintf(p, "%-25s\t0x%08lX [%c]\n",
+                       seq_printf(m, "%-25s\t0x%08lX [%c]\n",
                                     acpi_debug_levels[i].name,
                                     acpi_debug_levels[i].value,
                                     (acpi_dbg_level & acpi_debug_levels[i].
                                      value) ? '*' : ' ');
                }
-               p += sprintf(p, "--\ndebug_level = 0x%08X (* = enabled)\n",
+               seq_printf(m, "--\ndebug_level = 0x%08X (* = enabled)\n",
                             acpi_dbg_level);
                break;
-       default:
-               p += sprintf(p, "Invalid debug option\n");
-               break;
        }
+       return 0;
+}
 
-      end:
-       size = (p - page);
-       if (size <= off + count)
-               *eof = 1;
-       *start = page + off;
-       size -= off;
-       if (size > count)
-               size = count;
-       if (size < 0)
-               size = 0;
-
-       return size;
+static int acpi_system_debug_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, acpi_system_debug_proc_show, PDE(inode)->data);
 }
 
-static int
-acpi_system_write_debug(struct file *file,
+static ssize_t acpi_system_debug_proc_write(struct file *file,
                        const char __user * buffer,
-                       unsigned long count, void *data)
+                       size_t count, loff_t *pos)
 {
        char debug_string[12] = { '\0' };
 
@@ -279,7 +262,7 @@ acpi_system_write_debug(struct file *file,
 
        debug_string[count] = '\0';
 
-       switch ((unsigned long)data) {
+       switch ((unsigned long)PDE(file->f_path.dentry->d_inode)->data) {
        case 0:
                acpi_dbg_layer = simple_strtoul(debug_string, NULL, 0);
                break;
@@ -292,6 +275,15 @@ acpi_system_write_debug(struct file *file,
 
        return count;
 }
+
+static const struct file_operations acpi_system_debug_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = acpi_system_debug_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = acpi_system_debug_proc_write,
+};
 #endif
 
 int __init acpi_debug_init(void)
@@ -303,24 +295,18 @@ int __init acpi_debug_init(void)
 
        /* 'debug_layer' [R/W] */
        name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
-       entry =
-           create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
-                                  acpi_root_dir, acpi_system_read_debug,
-                                  (void *)0);
-       if (entry)
-               entry->write_proc = acpi_system_write_debug;
-       else
+       entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
+                                acpi_root_dir, &acpi_system_debug_proc_fops,
+                                (void *)0);
+       if (!entry)
                goto Error;
 
        /* 'debug_level' [R/W] */
        name = ACPI_SYSTEM_FILE_DEBUG_LEVEL;
-       entry =
-           create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
-                                  acpi_root_dir, acpi_system_read_debug,
-                                  (void *)1);
-       if (entry)
-               entry->write_proc = acpi_system_write_debug;
-       else
+       entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
+                                acpi_root_dir, &acpi_system_debug_proc_fops,
+                                (void *)1);
+       if (!entry)
                goto Error;
 
       Done:
index 9a85566..3a2cfef 100644 (file)
@@ -233,18 +233,16 @@ static int is_ata(acpi_handle handle)
 static int is_battery(acpi_handle handle)
 {
        struct acpi_device_info *info;
-       struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
        int ret = 1;
 
-       if (!ACPI_SUCCESS(acpi_get_object_info(handle, &buffer)))
+       if (!ACPI_SUCCESS(acpi_get_object_info(handle, &info)))
                return 0;
-       info = buffer.pointer;
        if (!(info->valid & ACPI_VALID_HID))
                ret = 0;
        else
-               ret = !strcmp("PNP0C0A", info->hardware_id.value);
+               ret = !strcmp("PNP0C0A", info->hardware_id.string);
 
-       kfree(buffer.pointer);
+       kfree(info);
        return ret;
 }
 
index 5180f0f..f707960 100644 (file)
@@ -42,6 +42,7 @@
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #define ACPI_EC_CLASS                  "embedded_controller"
 #define ACPI_EC_DEVICE_NAME            "Embedded Controller"
@@ -67,15 +68,13 @@ enum ec_command {
 #define ACPI_EC_DELAY          500     /* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK     1000    /* Wait 1ms max. to get global lock */
 #define ACPI_EC_CDELAY         10      /* Wait 10us before polling EC */
+#define ACPI_EC_MSI_UDELAY     550     /* Wait 550us for MSI EC */
 
 #define ACPI_EC_STORM_THRESHOLD 8      /* number of false interrupts
                                           per one transaction */
 
 enum {
        EC_FLAGS_QUERY_PENDING,         /* Query is pending */
-       EC_FLAGS_GPE_MODE,              /* Expect GPE to be sent
-                                        * for status change */
-       EC_FLAGS_NO_GPE,                /* Don't use GPE mode */
        EC_FLAGS_GPE_STORM,             /* GPE storm detected */
        EC_FLAGS_HANDLERS_INSTALLED     /* Handlers for GPE and
                                         * OpReg are installed */
@@ -169,7 +168,7 @@ static void start_transaction(struct acpi_ec *ec)
        acpi_ec_write_cmd(ec, ec->curr->command);
 }
 
-static void gpe_transaction(struct acpi_ec *ec, u8 status)
+static void advance_transaction(struct acpi_ec *ec, u8 status)
 {
        unsigned long flags;
        spin_lock_irqsave(&ec->curr_lock, flags);
@@ -200,29 +199,6 @@ unlock:
        spin_unlock_irqrestore(&ec->curr_lock, flags);
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec)
-{
-       if (wait_event_timeout(ec->wait, ec_transaction_done(ec),
-                              msecs_to_jiffies(ACPI_EC_DELAY)))
-               return 0;
-       /* try restart command if we get any false interrupts */
-       if (ec->curr->irq_count &&
-           (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) == 0) {
-               pr_debug(PREFIX "controller reset, restart transaction\n");
-               start_transaction(ec);
-               if (wait_event_timeout(ec->wait, ec_transaction_done(ec),
-                                       msecs_to_jiffies(ACPI_EC_DELAY)))
-                       return 0;
-       }
-       /* missing GPEs, switch back to poll mode */
-       if (printk_ratelimit())
-               pr_info(PREFIX "missing confirmations, "
-                               "switch off interrupt mode.\n");
-       set_bit(EC_FLAGS_NO_GPE, &ec->flags);
-       clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-       return 1;
-}
-
 static void acpi_ec_gpe_query(void *ec_cxt);
 
 static int ec_check_sci(struct acpi_ec *ec, u8 state)
@@ -235,43 +211,51 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
        return 0;
 }
 
-static void ec_delay(void)
-{
-       /* EC in MSI notebooks don't tolerate delays other than 550 usec */
-       if (EC_FLAGS_MSI)
-               udelay(ACPI_EC_DELAY);
-       else
-               /* Use shortest sleep available */
-               msleep(1);
-}
-
 static int ec_poll(struct acpi_ec *ec)
 {
-       unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
-       udelay(ACPI_EC_CDELAY);
-       while (time_before(jiffies, delay)) {
-               gpe_transaction(ec, acpi_ec_read_status(ec));
-               ec_delay();
-               if (ec_transaction_done(ec))
-                       return 0;
+       unsigned long flags;
+       int repeat = 2; /* number of command restarts */
+       while (repeat--) {
+               unsigned long delay = jiffies +
+                       msecs_to_jiffies(ACPI_EC_DELAY);
+               do {
+                       /* don't sleep with disabled interrupts */
+                       if (EC_FLAGS_MSI || irqs_disabled()) {
+                               udelay(ACPI_EC_MSI_UDELAY);
+                               if (ec_transaction_done(ec))
+                                       return 0;
+                       } else {
+                               if (wait_event_timeout(ec->wait,
+                                               ec_transaction_done(ec),
+                                               msecs_to_jiffies(1)))
+                                       return 0;
+                       }
+                       advance_transaction(ec, acpi_ec_read_status(ec));
+               } while (time_before(jiffies, delay));
+               if (!ec->curr->irq_count ||
+                   (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF))
+                       break;
+               /* try restart command if we get any false interrupts */
+               pr_debug(PREFIX "controller reset, restart transaction\n");
+               spin_lock_irqsave(&ec->curr_lock, flags);
+               start_transaction(ec);
+               spin_unlock_irqrestore(&ec->curr_lock, flags);
        }
        return -ETIME;
 }
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
-                                       struct transaction *t,
-                                       int force_poll)
+                                       struct transaction *t)
 {
        unsigned long tmp;
        int ret = 0;
        pr_debug(PREFIX "transaction start\n");
        /* disable GPE during transaction if storm is detected */
        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-               clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
                acpi_disable_gpe(NULL, ec->gpe);
        }
        if (EC_FLAGS_MSI)
-               udelay(ACPI_EC_DELAY);
+               udelay(ACPI_EC_MSI_UDELAY);
        /* start transaction */
        spin_lock_irqsave(&ec->curr_lock, tmp);
        /* following two actions should be kept atomic */
@@ -280,11 +264,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
        if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
                clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
        spin_unlock_irqrestore(&ec->curr_lock, tmp);
-       /* if we selected poll mode or failed in GPE-mode do a poll loop */
-       if (force_poll ||
-           !test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ||
-           acpi_ec_wait(ec))
-               ret = ec_poll(ec);
+       ret = ec_poll(ec);
        pr_debug(PREFIX "transaction end\n");
        spin_lock_irqsave(&ec->curr_lock, tmp);
        ec->curr = NULL;
@@ -294,8 +274,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
                ec_check_sci(ec, acpi_ec_read_status(ec));
                /* it is safe to enable GPE outside of transaction */
                acpi_enable_gpe(NULL, ec->gpe);
-       } else if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags) &&
-                  t->irq_count > ACPI_EC_STORM_THRESHOLD) {
+       } else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
                pr_info(PREFIX "GPE storm detected, "
                        "transactions will use polling mode\n");
                set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
@@ -313,16 +292,14 @@ static int ec_wait_ibf0(struct acpi_ec *ec)
 {
        unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
        /* interrupt wait manually if GPE mode is not active */
-       unsigned long timeout = test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ?
-               msecs_to_jiffies(ACPI_EC_DELAY) : msecs_to_jiffies(1);
        while (time_before(jiffies, delay))
-               if (wait_event_timeout(ec->wait, ec_check_ibf0(ec), timeout))
+               if (wait_event_timeout(ec->wait, ec_check_ibf0(ec),
+                                       msecs_to_jiffies(1)))
                        return 0;
        return -ETIME;
 }
 
-static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
-                              int force_poll)
+static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
 {
        int status;
        u32 glk;
@@ -344,7 +321,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
                status = -ETIME;
                goto end;
        }
-       status = acpi_ec_transaction_unlocked(ec, t, force_poll);
+       status = acpi_ec_transaction_unlocked(ec, t);
 end:
        if (ec->global_lock)
                acpi_release_global_lock(glk);
@@ -353,10 +330,6 @@ unlock:
        return status;
 }
 
-/*
- * Note: samsung nv5000 doesn't work with ec burst mode.
- * http://bugzilla.kernel.org/show_bug.cgi?id=4980
- */
 static int acpi_ec_burst_enable(struct acpi_ec *ec)
 {
        u8 d;
@@ -364,7 +337,7 @@ static int acpi_ec_burst_enable(struct acpi_ec *ec)
                                .wdata = NULL, .rdata = &d,
                                .wlen = 0, .rlen = 1};
 
-       return acpi_ec_transaction(ec, &t, 0);
+       return acpi_ec_transaction(ec, &t);
 }
 
 static int acpi_ec_burst_disable(struct acpi_ec *ec)
@@ -374,7 +347,7 @@ static int acpi_ec_burst_disable(struct acpi_ec *ec)
                                .wlen = 0, .rlen = 0};
 
        return (acpi_ec_read_status(ec) & ACPI_EC_FLAG_BURST) ?
-                               acpi_ec_transaction(ec, &t, 0) : 0;
+                               acpi_ec_transaction(ec, &t) : 0;
 }
 
 static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
@@ -385,7 +358,7 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
                                .wdata = &address, .rdata = &d,
                                .wlen = 1, .rlen = 1};
 
-       result = acpi_ec_transaction(ec, &t, 0);
+       result = acpi_ec_transaction(ec, &t);
        *data = d;
        return result;
 }
@@ -397,7 +370,7 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
                                .wdata = wdata, .rdata = NULL,
                                .wlen = 2, .rlen = 0};
 
-       return acpi_ec_transaction(ec, &t, 0);
+       return acpi_ec_transaction(ec, &t);
 }
 
 /*
@@ -465,7 +438,7 @@ int ec_transaction(u8 command,
        if (!first_ec)
                return -ENODEV;
 
-       return acpi_ec_transaction(first_ec, &t, force_poll);
+       return acpi_ec_transaction(first_ec, &t);
 }
 
 EXPORT_SYMBOL(ec_transaction);
@@ -486,7 +459,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
         * bit to be cleared (and thus clearing the interrupt source).
         */
 
-       result = acpi_ec_transaction(ec, &t, 0);
+       result = acpi_ec_transaction(ec, &t);
        if (result)
                return result;
 
@@ -569,28 +542,10 @@ static u32 acpi_ec_gpe_handler(void *data)
        pr_debug(PREFIX "~~~> interrupt\n");
        status = acpi_ec_read_status(ec);
 
-       if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) {
-               gpe_transaction(ec, status);
-               if (ec_transaction_done(ec) &&
-                   (status & ACPI_EC_FLAG_IBF) == 0)
-                       wake_up(&ec->wait);
-       }
-
+       advance_transaction(ec, status);
+       if (ec_transaction_done(ec) && (status & ACPI_EC_FLAG_IBF) == 0)
+               wake_up(&ec->wait);
        ec_check_sci(ec, status);
-       if (!test_bit(EC_FLAGS_GPE_MODE, &ec->flags) &&
-           !test_bit(EC_FLAGS_NO_GPE, &ec->flags)) {
-               /* this is non-query, must be confirmation */
-               if (!test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-                       if (printk_ratelimit())
-                               pr_info(PREFIX "non-query interrupt received,"
-                                       " switching to interrupt mode\n");
-               } else {
-                       /* hush, STORM switches the mode every transaction */
-                       pr_debug(PREFIX "non-query interrupt received,"
-                               " switching to interrupt mode\n");
-               }
-               set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-       }
        return ACPI_INTERRUPT_HANDLED;
 }
 
@@ -616,7 +571,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
        if (bits != 8 && acpi_strict)
                return AE_BAD_PARAMETER;
 
-       acpi_ec_burst_enable(ec);
+       if (EC_FLAGS_MSI)
+               acpi_ec_burst_enable(ec);
 
        if (function == ACPI_READ) {
                result = acpi_ec_read(ec, address, &temp);
@@ -637,7 +593,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
                }
        }
 
-       acpi_ec_burst_disable(ec);
+       if (EC_FLAGS_MSI)
+               acpi_ec_burst_disable(ec);
 
        switch (result) {
        case -EINVAL:
@@ -787,6 +744,42 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
        return AE_CTRL_TERMINATE;
 }
 
+static int ec_install_handlers(struct acpi_ec *ec)
+{
+       acpi_status status;
+       if (test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
+               return 0;
+       status = acpi_install_gpe_handler(NULL, ec->gpe,
+                                 ACPI_GPE_EDGE_TRIGGERED,
+                                 &acpi_ec_gpe_handler, ec);
+       if (ACPI_FAILURE(status))
+               return -ENODEV;
+       acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+       acpi_enable_gpe(NULL, ec->gpe);
+       status = acpi_install_address_space_handler(ec->handle,
+                                                   ACPI_ADR_SPACE_EC,
+                                                   &acpi_ec_space_handler,
+                                                   NULL, ec);
+       if (ACPI_FAILURE(status)) {
+               if (status == AE_NOT_FOUND) {
+                       /*
+                        * Maybe OS fails in evaluating the _REG object.
+                        * The AE_NOT_FOUND error will be ignored and OS
+                        * continue to initialize EC.
+                        */
+                       printk(KERN_ERR "Fail in evaluating the _REG object"
+                               " of EC device. Broken bios is suspected.\n");
+               } else {
+                       acpi_remove_gpe_handler(NULL, ec->gpe,
+                               &acpi_ec_gpe_handler);
+                       return -ENODEV;
+               }
+       }
+
+       set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
+       return 0;
+}
+
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
        if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
@@ -801,9 +794,8 @@ static void ec_remove_handlers(struct acpi_ec *ec)
 static int acpi_ec_add(struct acpi_device *device)
 {
        struct acpi_ec *ec = NULL;
+       int ret;
 
-       if (!device)
-               return -EINVAL;
        strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
@@ -836,9 +828,12 @@ static int acpi_ec_add(struct acpi_device *device)
        acpi_ec_add_fs(device);
        pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                          ec->gpe, ec->command_addr, ec->data_addr);
-       pr_info(PREFIX "driver started in %s mode\n",
-               (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
-       return 0;
+
+       ret = ec_install_handlers(ec);
+
+       /* EC is fully operational, allow queries */
+       clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
+       return ret;
 }
 
 static int acpi_ec_remove(struct acpi_device *device, int type)
@@ -850,6 +845,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
                return -EINVAL;
 
        ec = acpi_driver_data(device);
+       ec_remove_handlers(ec);
        mutex_lock(&ec->lock);
        list_for_each_entry_safe(handler, tmp, &ec->list, node) {
                list_del(&handler->node);
@@ -887,75 +883,6 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
        return AE_OK;
 }
 
-static int ec_install_handlers(struct acpi_ec *ec)
-{
-       acpi_status status;
-       if (test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
-               return 0;
-       status = acpi_install_gpe_handler(NULL, ec->gpe,
-                                 ACPI_GPE_EDGE_TRIGGERED,
-                                 &acpi_ec_gpe_handler, ec);
-       if (ACPI_FAILURE(status))
-               return -ENODEV;
-       acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
-       acpi_enable_gpe(NULL, ec->gpe);
-       status = acpi_install_address_space_handler(ec->handle,
-                                                   ACPI_ADR_SPACE_EC,
-                                                   &acpi_ec_space_handler,
-                                                   NULL, ec);
-       if (ACPI_FAILURE(status)) {
-               if (status == AE_NOT_FOUND) {
-                       /*
-                        * Maybe OS fails in evaluating the _REG object.
-                        * The AE_NOT_FOUND error will be ignored and OS
-                        * continue to initialize EC.
-                        */
-                       printk(KERN_ERR "Fail in evaluating the _REG object"
-                               " of EC device. Broken bios is suspected.\n");
-               } else {
-                       acpi_remove_gpe_handler(NULL, ec->gpe,
-                               &acpi_ec_gpe_handler);
-                       return -ENODEV;
-               }
-       }
-
-       set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
-       return 0;
-}
-
-static int acpi_ec_start(struct acpi_device *device)
-{
-       struct acpi_ec *ec;
-       int ret = 0;
-
-       if (!device)
-               return -EINVAL;
-
-       ec = acpi_driver_data(device);
-
-       if (!ec)
-               return -EINVAL;
-
-       ret = ec_install_handlers(ec);
-
-       /* EC is fully operational, allow queries */
-       clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
-       return ret;
-}
-
-static int acpi_ec_stop(struct acpi_device *device, int type)
-{
-       struct acpi_ec *ec;
-       if (!device)
-               return -EINVAL;
-       ec = acpi_driver_data(device);
-       if (!ec)
-               return -EINVAL;
-       ec_remove_handlers(ec);
-
-       return 0;
-}
-
 int __init acpi_boot_ec_enable(void)
 {
        if (!boot_ec || test_bit(EC_FLAGS_HANDLERS_INSTALLED, &boot_ec->flags))
@@ -1053,8 +980,6 @@ static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
 {
        struct acpi_ec *ec = acpi_driver_data(device);
        /* Stop using GPE */
-       set_bit(EC_FLAGS_NO_GPE, &ec->flags);
-       clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
        acpi_disable_gpe(NULL, ec->gpe);
        return 0;
 }
@@ -1063,8 +988,6 @@ static int acpi_ec_resume(struct acpi_device *device)
 {
        struct acpi_ec *ec = acpi_driver_data(device);
        /* Enable use of GPE back */
-       clear_bit(EC_FLAGS_NO_GPE, &ec->flags);
-       set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
        acpi_enable_gpe(NULL, ec->gpe);
        return 0;
 }
@@ -1076,8 +999,6 @@ static struct acpi_driver acpi_ec_driver = {
        .ops = {
                .add = acpi_ec_add,
                .remove = acpi_ec_remove,
-               .start = acpi_ec_start,
-               .stop = acpi_ec_stop,
                .suspend = acpi_ec_suspend,
                .resume = acpi_ec_resume,
                },
index dc36a44..c6645f2 100644 (file)
@@ -95,15 +95,13 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
        acpi_status status;
        struct acpi_device_info *info;
-       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_find_child *find = context;
 
-       status = acpi_get_object_info(handle, &buffer);
+       status = acpi_get_object_info(handle, &info);
        if (ACPI_SUCCESS(status)) {
-               info = buffer.pointer;
                if (info->address == find->address)
                        find->handle = handle;
-               kfree(buffer.pointer);
+               kfree(info);
        }
        return AE_OK;
 }
@@ -123,7 +121,7 @@ EXPORT_SYMBOL(acpi_get_child);
 
 /* Link ACPI devices with physical devices */
 static void acpi_glue_data_handler(acpi_handle handle,
-                                  u32 function, void *context)
+                                  void *context)
 {
        /* we provide an empty handler */
 }
index 5691f16..56071b6 100644 (file)
@@ -58,6 +58,7 @@ struct acpi_os_dpc {
        acpi_osd_exec_callback function;
        void *context;
        struct work_struct work;
+       int wait;
 };
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -88,6 +89,7 @@ struct acpi_res_list {
        char name[5];   /* only can have a length of 4 chars, make use of this
                           one instead of res->name, no need to kalloc then */
        struct list_head resource_list;
+       int count;
 };
 
 static LIST_HEAD(resource_list_head);
@@ -697,31 +699,12 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,   /* upper bound  */
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
-       if (!dpc) {
-               printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
-               return;
-       }
-
-       dpc->function(dpc->context);
-       kfree(dpc);
-
-       return;
-}
-
-static void acpi_os_execute_hp_deferred(struct work_struct *work)
-{
-       struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
-       if (!dpc) {
-               printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
-               return;
-       }
 
-       acpi_os_wait_events_complete(NULL);
+       if (dpc->wait)
+               acpi_os_wait_events_complete(NULL);
 
        dpc->function(dpc->context);
        kfree(dpc);
-
-       return;
 }
 
 /*******************************************************************************
@@ -745,15 +728,11 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
        acpi_status status = AE_OK;
        struct acpi_os_dpc *dpc;
        struct workqueue_struct *queue;
-       work_func_t func;
        int ret;
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Scheduling function [%p(%p)] for deferred execution.\n",
                          function, context));
 
-       if (!function)
-               return AE_BAD_PARAMETER;
-
        /*
         * Allocate/initialize DPC structure.  Note that this memory will be
         * freed by the callee.  The kernel handles the work_struct list  in a
@@ -778,8 +757,8 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
         */
        queue = hp ? kacpi_hotplug_wq :
                (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq);
-       func = hp ? acpi_os_execute_hp_deferred : acpi_os_execute_deferred;
-       INIT_WORK(&dpc->work, func);
+       dpc->wait = hp ? 1 : 0;
+       INIT_WORK(&dpc->work, acpi_os_execute_deferred);
        ret = queue_work(queue, &dpc->work);
 
        if (!ret) {
@@ -1358,6 +1337,89 @@ acpi_os_validate_interface (char *interface)
        return AE_SUPPORT;
 }
 
+static inline int acpi_res_list_add(struct acpi_res_list *res)
+{
+       struct acpi_res_list *res_list_elem;
+
+       list_for_each_entry(res_list_elem, &resource_list_head,
+                           resource_list) {
+
+               if (res->resource_type == res_list_elem->resource_type &&
+                   res->start == res_list_elem->start &&
+                   res->end == res_list_elem->end) {
+
+                       /*
+                        * The Region(addr,len) already exist in the list,
+                        * just increase the count
+                        */
+
+                       res_list_elem->count++;
+                       return 0;
+               }
+       }
+
+       res->count = 1;
+       list_add(&res->resource_list, &resource_list_head);
+       return 1;
+}
+
+static inline void acpi_res_list_del(struct acpi_res_list *res)
+{
+       struct acpi_res_list *res_list_elem;
+
+       list_for_each_entry(res_list_elem, &resource_list_head,
+                           resource_list) {
+
+               if (res->resource_type == res_list_elem->resource_type &&
+                   res->start == res_list_elem->start &&
+                   res->end == res_list_elem->end) {
+
+                       /*
+                        * If the res count is decreased to 0,
+                        * remove and free it
+                        */
+
+                       if (--res_list_elem->count == 0) {
+                               list_del(&res_list_elem->resource_list);
+                               kfree(res_list_elem);
+                       }
+                       return;
+               }
+       }
+}
+
+acpi_status
+acpi_os_invalidate_address(
+    u8                   space_id,
+    acpi_physical_address   address,
+    acpi_size               length)
+{
+       struct acpi_res_list res;
+
+       switch (space_id) {
+       case ACPI_ADR_SPACE_SYSTEM_IO:
+       case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+               /* Only interference checks against SystemIO and SytemMemory
+                  are needed */
+               res.start = address;
+               res.end = address + length - 1;
+               res.resource_type = space_id;
+               spin_lock(&acpi_res_lock);
+               acpi_res_list_del(&res);
+               spin_unlock(&acpi_res_lock);
+               break;
+       case ACPI_ADR_SPACE_PCI_CONFIG:
+       case ACPI_ADR_SPACE_EC:
+       case ACPI_ADR_SPACE_SMBUS:
+       case ACPI_ADR_SPACE_CMOS:
+       case ACPI_ADR_SPACE_PCI_BAR_TARGET:
+       case ACPI_ADR_SPACE_DATA_TABLE:
+       case ACPI_ADR_SPACE_FIXED_HARDWARE:
+               break;
+       }
+       return AE_OK;
+}
+
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_address
@@ -1382,6 +1444,7 @@ acpi_os_validate_address (
     char *name)
 {
        struct acpi_res_list *res;
+       int added;
        if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
                return AE_OK;
 
@@ -1399,14 +1462,17 @@ acpi_os_validate_address (
                res->end = address + length - 1;
                res->resource_type = space_id;
                spin_lock(&acpi_res_lock);
-               list_add(&res->resource_list, &resource_list_head);
+               added = acpi_res_list_add(res);
                spin_unlock(&acpi_res_lock);
-               pr_debug("Added %s resource: start: 0x%llx, end: 0x%llx, "
-                        "name: %s\n", (space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+               pr_debug("%s %s resource: start: 0x%llx, end: 0x%llx, "
+                        "name: %s\n", added ? "Added" : "Already exist",
+                        (space_id == ACPI_ADR_SPACE_SYSTEM_IO)
                         ? "SystemIO" : "System Memory",
                         (unsigned long long)res->start,
                         (unsigned long long)res->end,
                         res->name);
+               if (!added)
+                       kfree(res);
                break;
        case ACPI_ADR_SPACE_PCI_CONFIG:
        case ACPI_ADR_SPACE_EC:
index 12158e0..45da2ba 100644 (file)
@@ -31,6 +31,7 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 static int debug;
 static int check_sta_before_sun;
@@ -57,7 +58,7 @@ ACPI_MODULE_NAME("pci_slot");
                                MY_NAME , ## arg);              \
        } while (0)
 
-#define SLOT_NAME_SIZE 20              /* Inspired by #define in acpiphp.h */
+#define SLOT_NAME_SIZE 21              /* Inspired by #define in acpiphp.h */
 
 struct acpi_pci_slot {
        acpi_handle root_handle;        /* handle of the root bridge */
@@ -149,7 +150,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                return AE_OK;
        }
 
-       snprintf(name, sizeof(name), "%u", (u32)sun);
+       snprintf(name, sizeof(name), "%llu", sun);
        pci_slot = pci_create_slot(pci_bus, device, name, NULL);
        if (IS_ERR(pci_slot)) {
                err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
new file mode 100644 (file)
index 0000000..e6bfd77
--- /dev/null
@@ -0,0 +1,1018 @@
+/*
+ * A hwmon driver for ACPI 4.0 power meters
+ * Copyright (C) 2009 IBM
+ *
+ * Author: Darrick J. Wong <djwong@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/module.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/jiffies.h>
+#include <linux/mutex.h>
+#include <linux/dmi.h>
+#include <linux/kdev_t.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
+
+#define ACPI_POWER_METER_NAME          "power_meter"
+ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);
+#define ACPI_POWER_METER_DEVICE_NAME   "Power Meter"
+#define ACPI_POWER_METER_CLASS         "power_meter_resource"
+
+#define NUM_SENSORS                    17
+
+#define POWER_METER_CAN_MEASURE        (1 << 0)
+#define POWER_METER_CAN_TRIP   (1 << 1)
+#define POWER_METER_CAN_CAP    (1 << 2)
+#define POWER_METER_CAN_NOTIFY (1 << 3)
+#define POWER_METER_IS_BATTERY (1 << 8)
+#define UNKNOWN_HYSTERESIS     0xFFFFFFFF
+
+#define METER_NOTIFY_CONFIG    0x80
+#define METER_NOTIFY_TRIP      0x81
+#define METER_NOTIFY_CAP       0x82
+#define METER_NOTIFY_CAPPING   0x83
+#define METER_NOTIFY_INTERVAL  0x84
+
+#define POWER_AVERAGE_NAME     "power1_average"
+#define POWER_CAP_NAME         "power1_cap"
+#define POWER_AVG_INTERVAL_NAME        "power1_average_interval"
+#define POWER_ALARM_NAME       "power1_alarm"
+
+static int cap_in_hardware;
+static int force_cap_on;
+
+static int can_cap_in_hardware(void)
+{
+       return force_cap_on || cap_in_hardware;
+}
+
+static struct acpi_device_id power_meter_ids[] = {
+       {"ACPI000D", 0},
+       {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, power_meter_ids);
+
+struct acpi_power_meter_capabilities {
+       acpi_integer            flags;
+       acpi_integer            units;
+       acpi_integer            type;
+       acpi_integer            accuracy;
+       acpi_integer            sampling_time;
+       acpi_integer            min_avg_interval;
+       acpi_integer            max_avg_interval;
+       acpi_integer            hysteresis;
+       acpi_integer            configurable_cap;
+       acpi_integer            min_cap;
+       acpi_integer            max_cap;
+};
+
+struct acpi_power_meter_resource {
+       struct acpi_device      *acpi_dev;
+       acpi_bus_id             name;
+       struct mutex            lock;
+       struct device           *hwmon_dev;
+       struct acpi_power_meter_capabilities    caps;
+       acpi_string             model_number;
+       acpi_string             serial_number;
+       acpi_string             oem_info;
+       acpi_integer            power;
+       acpi_integer            cap;
+       acpi_integer            avg_interval;
+       int                     sensors_valid;
+       unsigned long           sensors_last_updated;
+       struct sensor_device_attribute  sensors[NUM_SENSORS];
+       int                     num_sensors;
+       int                     trip[2];
+       int                     num_domain_devices;
+       struct acpi_device      **domain_devices;
+       struct kobject          *holders_dir;
+};
+
+struct ro_sensor_template {
+       char *label;
+       ssize_t (*show)(struct device *dev,
+                       struct device_attribute *devattr,
+                       char *buf);
+       int index;
+};
+
+struct rw_sensor_template {
+       char *label;
+       ssize_t (*show)(struct device *dev,
+                       struct device_attribute *devattr,
+                       char *buf);
+       ssize_t (*set)(struct device *dev,
+                      struct device_attribute *devattr,
+                      const char *buf, size_t count);
+       int index;
+};
+
+/* Averaging interval */
+static int update_avg_interval(struct acpi_power_meter_resource *resource)
+{
+       unsigned long long data;
+       acpi_status status;
+
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GAI",
+                                      NULL, &data);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GAI"));
+               return -ENODEV;
+       }
+
+       resource->avg_interval = data;
+       return 0;
+}
+
+static ssize_t show_avg_interval(struct device *dev,
+                                struct device_attribute *devattr,
+                                char *buf)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+
+       mutex_lock(&resource->lock);
+       update_avg_interval(resource);
+       mutex_unlock(&resource->lock);
+
+       return sprintf(buf, "%llu\n", resource->avg_interval);
+}
+
+static ssize_t set_avg_interval(struct device *dev,
+                               struct device_attribute *devattr,
+                               const char *buf, size_t count)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
+       int res;
+       unsigned long temp;
+       unsigned long long data;
+       acpi_status status;
+
+       res = strict_strtoul(buf, 10, &temp);
+       if (res)
+               return res;
+
+       if (temp > resource->caps.max_avg_interval ||
+           temp < resource->caps.min_avg_interval)
+               return -EINVAL;
+       arg0.integer.value = temp;
+
+       mutex_lock(&resource->lock);
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PAI",
+                                      &args, &data);
+       if (!ACPI_FAILURE(status))
+               resource->avg_interval = temp;
+       mutex_unlock(&resource->lock);
+
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PAI"));
+               return -EINVAL;
+       }
+
+       /* _PAI returns 0 on success, nonzero otherwise */
+       if (data)
+               return -EINVAL;
+
+       return count;
+}
+
+/* Cap functions */
+static int update_cap(struct acpi_power_meter_resource *resource)
+{
+       unsigned long long data;
+       acpi_status status;
+
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GHL",
+                                      NULL, &data);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GHL"));
+               return -ENODEV;
+       }
+
+       resource->cap = data;
+       return 0;
+}
+
+static ssize_t show_cap(struct device *dev,
+                       struct device_attribute *devattr,
+                       char *buf)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+
+       mutex_lock(&resource->lock);
+       update_cap(resource);
+       mutex_unlock(&resource->lock);
+
+       return sprintf(buf, "%llu\n", resource->cap * 1000);
+}
+
+static ssize_t set_cap(struct device *dev, struct device_attribute *devattr,
+                      const char *buf, size_t count)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
+       int res;
+       unsigned long temp;
+       unsigned long long data;
+       acpi_status status;
+
+       res = strict_strtoul(buf, 10, &temp);
+       if (res)
+               return res;
+
+       temp /= 1000;
+       if (temp > resource->caps.max_cap || temp < resource->caps.min_cap)
+               return -EINVAL;
+       arg0.integer.value = temp;
+
+       mutex_lock(&resource->lock);
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_SHL",
+                                      &args, &data);
+       if (!ACPI_FAILURE(status))
+               resource->cap = temp;
+       mutex_unlock(&resource->lock);
+
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SHL"));
+               return -EINVAL;
+       }
+
+       /* _SHL returns 0 on success, nonzero otherwise */
+       if (data)
+               return -EINVAL;
+
+       return count;
+}
+
+/* Power meter trip points */
+static int set_acpi_trip(struct acpi_power_meter_resource *resource)
+{
+       union acpi_object arg_objs[] = {
+               {ACPI_TYPE_INTEGER},
+               {ACPI_TYPE_INTEGER}
+       };
+       struct acpi_object_list args = { 2, arg_objs };
+       unsigned long long data;
+       acpi_status status;
+
+       /* Both trip levels must be set */
+       if (resource->trip[0] < 0 || resource->trip[1] < 0)
+               return 0;
+
+       /* This driver stores min, max; ACPI wants max, min. */
+       arg_objs[0].integer.value = resource->trip[1];
+       arg_objs[1].integer.value = resource->trip[0];
+
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PTP",
+                                      &args, &data);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PTP"));
+               return -EINVAL;
+       }
+
+       return data;
+}
+
+static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
+                       const char *buf, size_t count)
+{
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       int res;
+       unsigned long temp;
+
+       res = strict_strtoul(buf, 10, &temp);
+       if (res)
+               return res;
+
+       temp /= 1000;
+       if (temp < 0)
+               return -EINVAL;
+
+       mutex_lock(&resource->lock);
+       resource->trip[attr->index - 7] = temp;
+       res = set_acpi_trip(resource);
+       mutex_unlock(&resource->lock);
+
+       if (res)
+               return res;
+
+       return count;
+}
+
+/* Power meter */
+static int update_meter(struct acpi_power_meter_resource *resource)
+{
+       unsigned long long data;
+       acpi_status status;
+       unsigned long local_jiffies = jiffies;
+
+       if (time_before(local_jiffies, resource->sensors_last_updated +
+                       msecs_to_jiffies(resource->caps.sampling_time)) &&
+                       resource->sensors_valid)
+               return 0;
+
+       status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PMM",
+                                      NULL, &data);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMM"));
+               return -ENODEV;
+       }
+
+       resource->power = data;
+       resource->sensors_valid = 1;
+       resource->sensors_last_updated = jiffies;
+       return 0;
+}
+
+static ssize_t show_power(struct device *dev,
+                         struct device_attribute *devattr,
+                         char *buf)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+
+       mutex_lock(&resource->lock);
+       update_meter(resource);
+       mutex_unlock(&resource->lock);
+
+       return sprintf(buf, "%llu\n", resource->power * 1000);
+}
+
+/* Miscellaneous */
+static ssize_t show_str(struct device *dev,
+                       struct device_attribute *devattr,
+                       char *buf)
+{
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       acpi_string val;
+
+       switch (attr->index) {
+       case 0:
+               val = resource->model_number;
+               break;
+       case 1:
+               val = resource->serial_number;
+               break;
+       case 2:
+               val = resource->oem_info;
+               break;
+       default:
+               BUG();
+       }
+
+       return sprintf(buf, "%s\n", val);
+}
+
+static ssize_t show_val(struct device *dev,
+                       struct device_attribute *devattr,
+                       char *buf)
+{
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       acpi_integer val = 0;
+
+       switch (attr->index) {
+       case 0:
+               val = resource->caps.min_avg_interval;
+               break;
+       case 1:
+               val = resource->caps.max_avg_interval;
+               break;
+       case 2:
+               val = resource->caps.min_cap * 1000;
+               break;
+       case 3:
+               val = resource->caps.max_cap * 1000;
+               break;
+       case 4:
+               if (resource->caps.hysteresis == UNKNOWN_HYSTERESIS)
+                       return sprintf(buf, "unknown\n");
+
+               val = resource->caps.hysteresis * 1000;
+               break;
+       case 5:
+               if (resource->caps.flags & POWER_METER_IS_BATTERY)
+                       val = 1;
+               else
+                       val = 0;
+               break;
+       case 6:
+               if (resource->power > resource->cap)
+                       val = 1;
+               else
+                       val = 0;
+               break;
+       case 7:
+       case 8:
+               if (resource->trip[attr->index - 7] < 0)
+                       return sprintf(buf, "unknown\n");
+
+               val = resource->trip[attr->index - 7] * 1000;
+               break;
+       default:
+               BUG();
+       }
+
+       return sprintf(buf, "%llu\n", val);
+}
+
+static ssize_t show_accuracy(struct device *dev,
+                            struct device_attribute *devattr,
+                            char *buf)
+{
+       struct acpi_device *acpi_dev = to_acpi_device(dev);
+       struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       unsigned int acc = resource->caps.accuracy;
+
+       return sprintf(buf, "%u.%u%%\n", acc / 1000, acc % 1000);
+}
+
+static ssize_t show_name(struct device *dev,
+                        struct device_attribute *devattr,
+                        char *buf)
+{
+       return sprintf(buf, "%s\n", ACPI_POWER_METER_NAME);
+}
+
+/* Sensor descriptions.  If you add a sensor, update NUM_SENSORS above! */
+static struct ro_sensor_template meter_ro_attrs[] = {
+{POWER_AVERAGE_NAME, show_power, 0},
+{"power1_accuracy", show_accuracy, 0},
+{"power1_average_interval_min", show_val, 0},
+{"power1_average_interval_max", show_val, 1},
+{"power1_is_battery", show_val, 5},
+{NULL, NULL, 0},
+};
+
+static struct rw_sensor_template meter_rw_attrs[] = {
+{POWER_AVG_INTERVAL_NAME, show_avg_interval, set_avg_interval, 0},
+{NULL, NULL, NULL, 0},
+};
+
+static struct ro_sensor_template misc_cap_attrs[] = {
+{"power1_cap_min", show_val, 2},
+{"power1_cap_max", show_val, 3},
+{"power1_cap_hyst", show_val, 4},
+{POWER_ALARM_NAME, show_val, 6},
+{NULL, NULL, 0},
+};
+
+static struct ro_sensor_template ro_cap_attrs[] = {
+{POWER_CAP_NAME, show_cap, 0},
+{NULL, NULL, 0},
+};
+
+static struct rw_sensor_template rw_cap_attrs[] = {
+{POWER_CAP_NAME, show_cap, set_cap, 0},
+{NULL, NULL, NULL, 0},
+};
+
+static struct rw_sensor_template trip_attrs[] = {
+{"power1_average_min", show_val, set_trip, 7},
+{"power1_average_max", show_val, set_trip, 8},
+{NULL, NULL, NULL, 0},
+};
+
+static struct ro_sensor_template misc_attrs[] = {
+{"name", show_name, 0},
+{"power1_model_number", show_str, 0},
+{"power1_oem_info", show_str, 2},
+{"power1_serial_number", show_str, 1},
+{NULL, NULL, 0},
+};
+
+/* Read power domain data */
+static void remove_domain_devices(struct acpi_power_meter_resource *resource)
+{
+       int i;
+
+       if (!resource->num_domain_devices)
+               return;
+
+       for (i = 0; i < resource->num_domain_devices; i++) {
+               struct acpi_device *obj = resource->domain_devices[i];
+               if (!obj)
+                       continue;
+
+               sysfs_remove_link(resource->holders_dir,
+                                 kobject_name(&obj->dev.kobj));
+               put_device(&obj->dev);
+       }
+
+       kfree(resource->domain_devices);
+       kobject_put(resource->holders_dir);
+}
+
+static int read_domain_devices(struct acpi_power_meter_resource *resource)
+{
+       int res = 0;
+       int i;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *pss;
+       acpi_status status;
+
+       status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMD", NULL,
+                                     &buffer);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMD"));
+               return -ENODEV;
+       }
+
+       pss = buffer.pointer;
+       if (!pss ||
+           pss->type != ACPI_TYPE_PACKAGE) {
+               dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME
+                       "Invalid _PMD data\n");
+               res = -EFAULT;
+               goto end;
+       }
+
+       if (!pss->package.count)
+               goto end;
+
+       resource->domain_devices = kzalloc(sizeof(struct acpi_device *) *
+                                          pss->package.count, GFP_KERNEL);
+       if (!resource->domain_devices) {
+               res = -ENOMEM;
+               goto end;
+       }
+
+       resource->holders_dir = kobject_create_and_add("measures",
+                                       &resource->acpi_dev->dev.kobj);
+       if (!resource->holders_dir) {
+               res = -ENOMEM;
+               goto exit_free;
+       }
+
+       resource->num_domain_devices = pss->package.count;
+
+       for (i = 0; i < pss->package.count; i++) {
+               struct acpi_device *obj;
+               union acpi_object *element = &(pss->package.elements[i]);
+
+               /* Refuse non-references */
+               if (element->type != ACPI_TYPE_LOCAL_REFERENCE)
+                       continue;
+
+               /* Create a symlink to domain objects */
+               resource->domain_devices[i] = NULL;
+               status = acpi_bus_get_device(element->reference.handle,
+                                            &resource->domain_devices[i]);
+               if (ACPI_FAILURE(status))
+                       continue;
+
+               obj = resource->domain_devices[i];
+               get_device(&obj->dev);
+
+               res = sysfs_create_link(resource->holders_dir, &obj->dev.kobj,
+                                     kobject_name(&obj->dev.kobj));
+               if (res) {
+                       put_device(&obj->dev);
+                       resource->domain_devices[i] = NULL;
+               }
+       }
+
+       res = 0;
+       goto end;
+
+exit_free:
+       kfree(resource->domain_devices);
+end:
+       kfree(buffer.pointer);
+       return res;
+}
+
+/* Registration and deregistration */
+static int register_ro_attrs(struct acpi_power_meter_resource *resource,
+                            struct ro_sensor_template *ro)
+{
+       struct device *dev = &resource->acpi_dev->dev;
+       struct sensor_device_attribute *sensors =
+               &resource->sensors[resource->num_sensors];
+       int res = 0;
+
+       while (ro->label) {
+               sensors->dev_attr.attr.name = ro->label;
+               sensors->dev_attr.attr.mode = S_IRUGO;
+               sensors->dev_attr.show = ro->show;
+               sensors->index = ro->index;
+
+               res = device_create_file(dev, &sensors->dev_attr);
+               if (res) {
+                       sensors->dev_attr.attr.name = NULL;
+                       goto error;
+               }
+               sensors++;
+               resource->num_sensors++;
+               ro++;
+       }
+
+error:
+       return res;
+}
+
+static int register_rw_attrs(struct acpi_power_meter_resource *resource,
+                            struct rw_sensor_template *rw)
+{
+       struct device *dev = &resource->acpi_dev->dev;
+       struct sensor_device_attribute *sensors =
+               &resource->sensors[resource->num_sensors];
+       int res = 0;
+
+       while (rw->label) {
+               sensors->dev_attr.attr.name = rw->label;
+               sensors->dev_attr.attr.mode = S_IRUGO | S_IWUSR;
+               sensors->dev_attr.show = rw->show;
+               sensors->dev_attr.store = rw->set;
+               sensors->index = rw->index;
+
+               res = device_create_file(dev, &sensors->dev_attr);
+               if (res) {
+                       sensors->dev_attr.attr.name = NULL;
+                       goto error;
+               }
+               sensors++;
+               resource->num_sensors++;
+               rw++;
+       }
+
+error:
+       return res;
+}
+
+static void remove_attrs(struct acpi_power_meter_resource *resource)
+{
+       int i;
+
+       for (i = 0; i < resource->num_sensors; i++) {
+               if (!resource->sensors[i].dev_attr.attr.name)
+                       continue;
+               device_remove_file(&resource->acpi_dev->dev,
+                                  &resource->sensors[i].dev_attr);
+       }
+
+       remove_domain_devices(resource);
+
+       resource->num_sensors = 0;
+}
+
+static int setup_attrs(struct acpi_power_meter_resource *resource)
+{
+       int res = 0;
+
+       res = read_domain_devices(resource);
+       if (res)
+               return res;
+
+       if (resource->caps.flags & POWER_METER_CAN_MEASURE) {
+               res = register_ro_attrs(resource, meter_ro_attrs);
+               if (res)
+                       goto error;
+               res = register_rw_attrs(resource, meter_rw_attrs);
+               if (res)
+                       goto error;
+       }
+
+       if (resource->caps.flags & POWER_METER_CAN_CAP) {
+               if (!can_cap_in_hardware()) {
+                       dev_err(&resource->acpi_dev->dev,
+                               "Ignoring unsafe software power cap!\n");
+                       goto skip_unsafe_cap;
+               }
+
+               if (resource->caps.configurable_cap) {
+                       res = register_rw_attrs(resource, rw_cap_attrs);
+                       if (res)
+                               goto error;
+               } else {
+                       res = register_ro_attrs(resource, ro_cap_attrs);
+                       if (res)
+                               goto error;
+               }
+               res = register_ro_attrs(resource, misc_cap_attrs);
+               if (res)
+                       goto error;
+       }
+skip_unsafe_cap:
+
+       if (resource->caps.flags & POWER_METER_CAN_TRIP) {
+               res = register_rw_attrs(resource, trip_attrs);
+               if (res)
+                       goto error;
+       }
+
+       res = register_ro_attrs(resource, misc_attrs);
+       if (res)
+               goto error;
+
+       return res;
+error:
+       remove_domain_devices(resource);
+       remove_attrs(resource);
+       return res;
+}
+
+static void free_capabilities(struct acpi_power_meter_resource *resource)
+{
+       acpi_string *str;
+       int i;
+
+       str = &resource->model_number;
+       for (i = 0; i < 3; i++, str++)
+               kfree(*str);
+}
+
+static int read_capabilities(struct acpi_power_meter_resource *resource)
+{
+       int res = 0;
+       int i;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       struct acpi_buffer state = { 0, NULL };
+       struct acpi_buffer format = { sizeof("NNNNNNNNNNN"), "NNNNNNNNNNN" };
+       union acpi_object *pss;
+       acpi_string *str;
+       acpi_status status;
+
+       status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMC", NULL,
+                                     &buffer);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMC"));
+               return -ENODEV;
+       }
+
+       pss = buffer.pointer;
+       if (!pss ||
+           pss->type != ACPI_TYPE_PACKAGE ||
+           pss->package.count != 14) {
+               dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME
+                       "Invalid _PMC data\n");
+               res = -EFAULT;
+               goto end;
+       }
+
+       /* Grab all the integer data at once */
+       state.length = sizeof(struct acpi_power_meter_capabilities);
+       state.pointer = &resource->caps;
+
+       status = acpi_extract_package(pss, &format, &state);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Invalid data"));
+               res = -EFAULT;
+               goto end;
+       }
+
+       if (resource->caps.units) {
+               dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME
+                       "Unknown units %llu.\n",
+                       resource->caps.units);
+               res = -EINVAL;
+               goto end;
+       }
+
+       /* Grab the string data */
+       str = &resource->model_number;
+
+       for (i = 11; i < 14; i++) {
+               union acpi_object *element = &(pss->package.elements[i]);
+
+               if (element->type != ACPI_TYPE_STRING) {
+                       res = -EINVAL;
+                       goto error;
+               }
+
+               *str = kzalloc(sizeof(u8) * (element->string.length + 1),
+                              GFP_KERNEL);
+               if (!*str) {
+                       res = -ENOMEM;
+                       goto error;
+               }
+
+               strncpy(*str, element->string.pointer, element->string.length);
+               str++;
+       }
+
+       dev_info(&resource->acpi_dev->dev, "Found ACPI power meter.\n");
+       goto end;
+error:
+       str = &resource->model_number;
+       for (i = 0; i < 3; i++, str++)
+               kfree(*str);
+end:
+       kfree(buffer.pointer);
+       return res;
+}
+
+/* Handle ACPI event notifications */
+static void acpi_power_meter_notify(struct acpi_device *device, u32 event)
+{
+       struct acpi_power_meter_resource *resource;
+       int res;
+
+       if (!device || !acpi_driver_data(device))
+               return;
+
+       resource = acpi_driver_data(device);
+
+       mutex_lock(&resource->lock);
+       switch (event) {
+       case METER_NOTIFY_CONFIG:
+               free_capabilities(resource);
+               res = read_capabilities(resource);
+               if (res)
+                       break;
+
+               remove_attrs(resource);
+               setup_attrs(resource);
+               break;
+       case METER_NOTIFY_TRIP:
+               sysfs_notify(&device->dev.kobj, NULL, POWER_AVERAGE_NAME);
+               update_meter(resource);
+               break;
+       case METER_NOTIFY_CAP:
+               sysfs_notify(&device->dev.kobj, NULL, POWER_CAP_NAME);
+               update_cap(resource);
+               break;
+       case METER_NOTIFY_INTERVAL:
+               sysfs_notify(&device->dev.kobj, NULL, POWER_AVG_INTERVAL_NAME);
+               update_avg_interval(resource);
+               break;
+       case METER_NOTIFY_CAPPING:
+               sysfs_notify(&device->dev.kobj, NULL, POWER_ALARM_NAME);
+               dev_info(&device->dev, "Capping in progress.\n");
+               break;
+       default:
+               BUG();
+       }
+       mutex_unlock(&resource->lock);
+
+       acpi_bus_generate_netlink_event(ACPI_POWER_METER_CLASS,
+                                       dev_name(&device->dev), event, 0);
+}
+
+static int acpi_power_meter_add(struct acpi_device *device)
+{
+       int res;
+       struct acpi_power_meter_resource *resource;
+
+       if (!device)
+               return -EINVAL;
+
+       resource = kzalloc(sizeof(struct acpi_power_meter_resource),
+                          GFP_KERNEL);
+       if (!resource)
+               return -ENOMEM;
+
+       resource->sensors_valid = 0;
+       resource->acpi_dev = device;
+       mutex_init(&resource->lock);
+       strcpy(acpi_device_name(device), ACPI_POWER_METER_DEVICE_NAME);
+       strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS);
+       device->driver_data = resource;
+
+       free_capabilities(resource);
+       res = read_capabilities(resource);
+       if (res)
+               goto exit_free;
+
+       resource->trip[0] = resource->trip[1] = -1;
+
+       res = setup_attrs(resource);
+       if (res)
+               goto exit_free;
+
+       resource->hwmon_dev = hwmon_device_register(&device->dev);
+       if (IS_ERR(resource->hwmon_dev)) {
+               res = PTR_ERR(resource->hwmon_dev);
+               goto exit_remove;
+       }
+
+       res = 0;
+       goto exit;
+
+exit_remove:
+       remove_attrs(resource);
+exit_free:
+       kfree(resource);
+exit:
+       return res;
+}
+
+static int acpi_power_meter_remove(struct acpi_device *device, int type)
+{
+       struct acpi_power_meter_resource *resource;
+
+       if (!device || !acpi_driver_data(device))
+               return -EINVAL;
+
+       resource = acpi_driver_data(device);
+       hwmon_device_unregister(resource->hwmon_dev);
+
+       free_capabilities(resource);
+       remove_attrs(resource);
+
+       kfree(resource);
+       return 0;
+}
+
+static int acpi_power_meter_resume(struct acpi_device *device)
+{
+       struct acpi_power_meter_resource *resource;
+
+       if (!device || !acpi_driver_data(device))
+               return -EINVAL;
+
+       resource = acpi_driver_data(device);
+       free_capabilities(resource);
+       read_capabilities(resource);
+
+       return 0;
+}
+
+static struct acpi_driver acpi_power_meter_driver = {
+       .name = "power_meter",
+       .class = ACPI_POWER_METER_CLASS,
+       .ids = power_meter_ids,
+       .ops = {
+               .add = acpi_power_meter_add,
+               .remove = acpi_power_meter_remove,
+               .resume = acpi_power_meter_resume,
+               .notify = acpi_power_meter_notify,
+               },
+};
+
+/* Module init/exit routines */
+static int __init enable_cap_knobs(const struct dmi_system_id *d)
+{
+       cap_in_hardware = 1;
+       return 0;
+}
+
+static struct dmi_system_id __initdata pm_dmi_table[] = {
+       {
+               enable_cap_knobs, "IBM Active Energy Manager",
+               {
+                       DMI_MATCH(DMI_SYS_VENDOR, "IBM")
+               },
+       },
+       {}
+};
+
+static int __init acpi_power_meter_init(void)
+{
+       int result;
+
+       if (acpi_disabled)
+               return -ENODEV;
+
+       dmi_check_system(pm_dmi_table);
+
+       result = acpi_bus_register_driver(&acpi_power_meter_driver);
+       if (result < 0)
+               return -ENODEV;
+
+       return 0;
+}
+
+static void __exit acpi_power_meter_exit(void)
+{
+       acpi_bus_unregister_driver(&acpi_power_meter_driver);
+}
+
+MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
+MODULE_DESCRIPTION("ACPI 4.0 power meter driver");
+MODULE_LICENSE("GPL");
+
+module_param(force_cap_on, bool, 0644);
+MODULE_PARM_DESC(force_cap_on, "Enable power cap even it is unsafe to do so.");
+
+module_init(acpi_power_meter_init);
+module_exit(acpi_power_meter_exit);
index b4a1ab2..c2d4d6e 100644 (file)
@@ -81,9 +81,10 @@ MODULE_DESCRIPTION("ACPI Processor Driver");
 MODULE_LICENSE("GPL");
 
 static int acpi_processor_add(struct acpi_device *device);
-static int acpi_processor_start(struct acpi_device *device);
 static int acpi_processor_remove(struct acpi_device *device, int type);
+#ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_info_open_fs(struct inode *inode, struct file *file);
+#endif
 static void acpi_processor_notify(struct acpi_device *device, u32 event);
 static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
 static int acpi_processor_handle_eject(struct acpi_processor *pr);
@@ -103,7 +104,6 @@ static struct acpi_driver acpi_processor_driver = {
        .ops = {
                .add = acpi_processor_add,
                .remove = acpi_processor_remove,
-               .start = acpi_processor_start,
                .suspend = acpi_processor_suspend,
                .resume = acpi_processor_resume,
                .notify = acpi_processor_notify,
@@ -112,7 +112,7 @@ static struct acpi_driver acpi_processor_driver = {
 
 #define INSTALL_NOTIFY_HANDLER         1
 #define UNINSTALL_NOTIFY_HANDLER       2
-
+#ifdef CONFIG_ACPI_PROCFS
 static const struct file_operations acpi_processor_info_fops = {
        .owner = THIS_MODULE,
        .open = acpi_processor_info_open_fs,
@@ -120,6 +120,7 @@ static const struct file_operations acpi_processor_info_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
+#endif
 
 DEFINE_PER_CPU(struct acpi_processor *, processors);
 struct acpi_processor_errata errata __read_mostly;
@@ -318,6 +319,7 @@ static int acpi_processor_set_pdc(struct acpi_processor *pr)
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
 
+#ifdef CONFIG_ACPI_PROCFS
 static struct proc_dir_entry *acpi_processor_dir = NULL;
 
 static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)
@@ -390,7 +392,6 @@ static int acpi_processor_add_fs(struct acpi_device *device)
                return -EIO;
        return 0;
 }
-
 static int acpi_processor_remove_fs(struct acpi_device *device)
 {
 
@@ -407,6 +408,16 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
 
        return 0;
 }
+#else
+static inline int acpi_processor_add_fs(struct acpi_device *device)
+{
+       return 0;
+}
+static inline int acpi_processor_remove_fs(struct acpi_device *device)
+{
+       return 0;
+}
+#endif
 
 /* Use the acpiid in MADT to map cpus in case of SMP */
 
@@ -700,92 +711,6 @@ static int acpi_processor_get_info(struct acpi_device *device)
 
 static DEFINE_PER_CPU(void *, processor_device_array);
 
-static int __cpuinit acpi_processor_start(struct acpi_device *device)
-{
-       int result = 0;
-       struct acpi_processor *pr;
-       struct sys_device *sysdev;
-
-       pr = acpi_driver_data(device);
-
-       result = acpi_processor_get_info(device);
-       if (result) {
-               /* Processor is physically not present */
-               return 0;
-       }
-
-       BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
-
-       /*
-        * Buggy BIOS check
-        * ACPI id of processors can be reported wrongly by the BIOS.
-        * Don't trust it blindly
-        */
-       if (per_cpu(processor_device_array, pr->id) != NULL &&
-           per_cpu(processor_device_array, pr->id) != device) {
-               printk(KERN_WARNING "BIOS reported wrong ACPI id "
-                       "for the processor\n");
-               return -ENODEV;
-       }
-       per_cpu(processor_device_array, pr->id) = device;
-
-       per_cpu(processors, pr->id) = pr;
-
-       result = acpi_processor_add_fs(device);
-       if (result)
-               goto end;
-
-       sysdev = get_cpu_sysdev(pr->id);
-       if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev"))
-               return -EFAULT;
-
-       /* _PDC call should be done before doing anything else (if reqd.). */
-       arch_acpi_processor_init_pdc(pr);
-       acpi_processor_set_pdc(pr);
-       arch_acpi_processor_cleanup_pdc(pr);
-
-#ifdef CONFIG_CPU_FREQ
-       acpi_processor_ppc_has_changed(pr);
-#endif
-       acpi_processor_get_throttling_info(pr);
-       acpi_processor_get_limit_info(pr);
-
-
-       acpi_processor_power_init(pr, device);
-
-       pr->cdev = thermal_cooling_device_register("Processor", device,
-                                               &processor_cooling_ops);
-       if (IS_ERR(pr->cdev)) {
-               result = PTR_ERR(pr->cdev);
-               goto end;
-       }
-
-       dev_info(&device->dev, "registered as cooling_device%d\n",
-                pr->cdev->id);
-
-       result = sysfs_create_link(&device->dev.kobj,
-                                  &pr->cdev->device.kobj,
-                                  "thermal_cooling");
-       if (result)
-               printk(KERN_ERR PREFIX "Create sysfs link\n");
-       result = sysfs_create_link(&pr->cdev->device.kobj,
-                                  &device->dev.kobj,
-                                  "device");
-       if (result)
-               printk(KERN_ERR PREFIX "Create sysfs link\n");
-
-       if (pr->flags.throttling) {
-               printk(KERN_INFO PREFIX "%s [%s] (supports",
-                      acpi_device_name(device), acpi_device_bid(device));
-               printk(" %d throttling states", pr->throttling.state_count);
-               printk(")\n");
-       }
-
-      end:
-
-       return result;
-}
-
 static void acpi_processor_notify(struct acpi_device *device, u32 event)
 {
        struct acpi_processor *pr = acpi_driver_data(device);
@@ -848,10 +773,8 @@ static struct notifier_block acpi_cpu_notifier =
 static int acpi_processor_add(struct acpi_device *device)
 {
        struct acpi_processor *pr = NULL;
-
-
-       if (!device)
-               return -EINVAL;
+       int result = 0;
+       struct sys_device *sysdev;
 
        pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
        if (!pr)
@@ -867,7 +790,100 @@ static int acpi_processor_add(struct acpi_device *device)
        strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);
        device->driver_data = pr;
 
+       result = acpi_processor_get_info(device);
+       if (result) {
+               /* Processor is physically not present */
+               return 0;
+       }
+
+       BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
+
+       /*
+        * Buggy BIOS check
+        * ACPI id of processors can be reported wrongly by the BIOS.
+        * Don't trust it blindly
+        */
+       if (per_cpu(processor_device_array, pr->id) != NULL &&
+           per_cpu(processor_device_array, pr->id) != device) {
+               printk(KERN_WARNING "BIOS reported wrong ACPI id "
+                       "for the processor\n");
+               result = -ENODEV;
+               goto err_free_cpumask;
+       }
+       per_cpu(processor_device_array, pr->id) = device;
+
+       per_cpu(processors, pr->id) = pr;
+
+       result = acpi_processor_add_fs(device);
+       if (result)
+               goto err_free_cpumask;
+
+       sysdev = get_cpu_sysdev(pr->id);
+       if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
+               result = -EFAULT;
+               goto err_remove_fs;
+       }
+
+       /* _PDC call should be done before doing anything else (if reqd.). */
+       arch_acpi_processor_init_pdc(pr);
+       acpi_processor_set_pdc(pr);
+       arch_acpi_processor_cleanup_pdc(pr);
+
+#ifdef CONFIG_CPU_FREQ
+       acpi_processor_ppc_has_changed(pr);
+#endif
+       acpi_processor_get_throttling_info(pr);
+       acpi_processor_get_limit_info(pr);
+
+
+       acpi_processor_power_init(pr, device);
+
+       pr->cdev = thermal_cooling_device_register("Processor", device,
+                                               &processor_cooling_ops);
+       if (IS_ERR(pr->cdev)) {
+               result = PTR_ERR(pr->cdev);
+               goto err_power_exit;
+       }
+
+       dev_info(&device->dev, "registered as cooling_device%d\n",
+                pr->cdev->id);
+
+       result = sysfs_create_link(&device->dev.kobj,
+                                  &pr->cdev->device.kobj,
+                                  "thermal_cooling");
+       if (result) {
+               printk(KERN_ERR PREFIX "Create sysfs link\n");
+               goto err_thermal_unregister;
+       }
+       result = sysfs_create_link(&pr->cdev->device.kobj,
+                                  &device->dev.kobj,
+                                  "device");
+       if (result) {
+               printk(KERN_ERR PREFIX "Create sysfs link\n");
+               goto err_remove_sysfs;
+       }
+
+       if (pr->flags.throttling) {
+               printk(KERN_INFO PREFIX "%s [%s] (supports",
+                      acpi_device_name(device), acpi_device_bid(device));
+               printk(" %d throttling states", pr->throttling.state_count);
+               printk(")\n");
+       }
+
        return 0;
+
+err_remove_sysfs:
+       sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+err_thermal_unregister:
+       thermal_cooling_device_unregister(pr->cdev);
+err_power_exit:
+       acpi_processor_power_exit(pr, device);
+err_remove_fs:
+       acpi_processor_remove_fs(device);
+err_free_cpumask:
+       free_cpumask_var(pr->throttling.shared_cpu_map);
+
+       return result;
 }
 
 static int acpi_processor_remove(struct acpi_device *device, int type)
@@ -944,7 +960,6 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
 {
        acpi_handle phandle;
        struct acpi_device *pdev;
-       struct acpi_processor *pr;
 
 
        if (acpi_get_parent(handle, &phandle)) {
@@ -959,15 +974,6 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
                return -ENODEV;
        }
 
-       acpi_bus_start(*device);
-
-       pr = acpi_driver_data(*device);
-       if (!pr)
-               return -ENODEV;
-
-       if ((pr->id >= 0) && (pr->id < nr_cpu_ids)) {
-               kobject_uevent(&(*device)->dev.kobj, KOBJ_ONLINE);
-       }
        return 0;
 }
 
@@ -997,25 +1003,6 @@ static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
                                            "Unable to add the device\n");
                        break;
                }
-
-               pr = acpi_driver_data(device);
-               if (!pr) {
-                       printk(KERN_ERR PREFIX "Driver data is NULL\n");
-                       break;
-               }
-
-               if (pr->id >= 0 && (pr->id < nr_cpu_ids)) {
-                       kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-                       break;
-               }
-
-               result = acpi_processor_start(device);
-               if ((!result) && ((pr->id >= 0) && (pr->id < nr_cpu_ids))) {
-                       kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
-               } else {
-                       printk(KERN_ERR PREFIX "Device [%s] failed to start\n",
-                                   acpi_device_bid(device));
-               }
                break;
        case ACPI_NOTIFY_EJECT_REQUEST:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -1032,9 +1019,6 @@ static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
                                    "Driver data is NULL, dropping EJECT\n");
                        return;
                }
-
-               if ((pr->id < nr_cpu_ids) && (cpu_present(pr->id)))
-                       kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -1163,11 +1147,11 @@ static int __init acpi_processor_init(void)
                                (struct acpi_table_header **)&madt)))
                madt = NULL;
 #endif
-
+#ifdef CONFIG_ACPI_PROCFS
        acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
        if (!acpi_processor_dir)
                return -ENOMEM;
-
+#endif
        /*
         * Check whether the system is DMI table. If yes, OSPM
         * should not use mwait for CPU-states.
@@ -1195,7 +1179,9 @@ out_cpuidle:
        cpuidle_unregister_driver(&acpi_idle_driver);
 
 out_proc:
+#ifdef CONFIG_ACPI_PROCFS
        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
+#endif
 
        return result;
 }
@@ -1215,7 +1201,9 @@ static void __exit acpi_processor_exit(void)
 
        cpuidle_unregister_driver(&acpi_idle_driver);
 
+#ifdef CONFIG_ACPI_PROCFS
        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
+#endif
 
        return;
 }
index 22aab1f..cc61a62 100644 (file)
@@ -682,6 +682,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
        return 0;
 }
 
+#ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_processor *pr = seq->private;
@@ -761,7 +762,7 @@ static const struct file_operations acpi_processor_power_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
-
+#endif
 
 /**
  * acpi_idle_bm_check - checks if bus master activity was detected
@@ -1162,7 +1163,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 {
        acpi_status status = 0;
        static int first_run;
+#ifdef CONFIG_ACPI_PROCFS
        struct proc_dir_entry *entry = NULL;
+#endif
        unsigned int i;
 
        if (boot_option_idle_override)
@@ -1219,7 +1222,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                       pr->power.states[i].type);
                printk(")\n");
        }
-
+#ifdef CONFIG_ACPI_PROCFS
        /* 'power' [R] */
        entry = proc_create_data(ACPI_PROCESSOR_FILE_POWER,
                                 S_IRUGO, acpi_device_dir(device),
@@ -1227,6 +1230,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                 acpi_driver_data(device));
        if (!entry)
                return -EIO;
+#endif
        return 0;
 }
 
@@ -1239,9 +1243,11 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
        cpuidle_unregister_device(&pr->power.dev);
        pr->flags.power_setup_done = 0;
 
+#ifdef CONFIG_ACPI_PROCFS
        if (acpi_device_dir(device))
                remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
                                  acpi_device_dir(device));
+#endif
 
        return 0;
 }
index 3e3181c..140c5c5 100644 (file)
@@ -440,7 +440,7 @@ struct thermal_cooling_device_ops processor_cooling_ops = {
 };
 
 /* /proc interface */
-
+#ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
@@ -519,3 +519,4 @@ const struct file_operations acpi_processor_limit_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
+#endif
index b366b9c..ce7cf3b 100644 (file)
@@ -1218,7 +1218,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
 }
 
 /* proc interface */
-
+#ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_throttling_seq_show(struct seq_file *seq,
                                              void *offset)
 {
@@ -1326,3 +1326,4 @@ const struct file_operations acpi_processor_throttling_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
+#endif
index 318b1ea..408ebde 100644 (file)
@@ -60,13 +60,13 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
        }
 
        if (acpi_dev->flags.compatible_ids) {
-               struct acpi_compatible_id_list *cid_list;
+               struct acpica_device_id_list *cid_list;
                int i;
 
                cid_list = acpi_dev->pnp.cid_list;
                for (i = 0; i < cid_list->count; i++) {
                        count = snprintf(&modalias[len], size, "%s:",
-                                        cid_list->id[i].value);
+                                        cid_list->ids[i].string);
                        if (count < 0 || count >= size) {
                                printk(KERN_ERR PREFIX "%s cid[%i] exceeds event buffer size",
                                       acpi_dev->pnp.device_name, i);
@@ -287,14 +287,14 @@ int acpi_match_device_ids(struct acpi_device *device,
        }
 
        if (device->flags.compatible_ids) {
-               struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
+               struct acpica_device_id_list *cid_list = device->pnp.cid_list;
                int i;
 
                for (id = ids; id->id[0]; id++) {
                        /* compare multiple _CID entries against driver ids */
                        for (i = 0; i < cid_list->count; i++) {
                                if (!strcmp((char*)id->id,
-                                           cid_list->id[i].value))
+                                           cid_list->ids[i].string))
                                        return 0;
                        }
                }
@@ -309,6 +309,10 @@ static void acpi_device_release(struct device *dev)
        struct acpi_device *acpi_dev = to_acpi_device(dev);
 
        kfree(acpi_dev->pnp.cid_list);
+       if (acpi_dev->flags.hardware_id)
+               kfree(acpi_dev->pnp.hardware_id);
+       if (acpi_dev->flags.unique_id)
+               kfree(acpi_dev->pnp.unique_id);
        kfree(acpi_dev);
 }
 
@@ -366,7 +370,8 @@ static acpi_status acpi_device_notify_fixed(void *data)
 {
        struct acpi_device *device = data;
 
-       acpi_device_notify(device->handle, ACPI_FIXED_HARDWARE_EVENT, device);
+       /* Fixed hardware devices have no handles */
+       acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
        return AE_OK;
 }
 
@@ -426,9 +431,6 @@ static int acpi_device_probe(struct device * dev)
                if (acpi_drv->ops.notify) {
                        ret = acpi_device_install_notify_handler(acpi_dev);
                        if (ret) {
-                               if (acpi_drv->ops.stop)
-                                       acpi_drv->ops.stop(acpi_dev,
-                                                  acpi_dev->removal_type);
                                if (acpi_drv->ops.remove)
                                        acpi_drv->ops.remove(acpi_dev,
                                                     acpi_dev->removal_type);
@@ -452,8 +454,6 @@ static int acpi_device_remove(struct device * dev)
        if (acpi_drv) {
                if (acpi_drv->ops.notify)
                        acpi_device_remove_notify_handler(acpi_dev);
-               if (acpi_drv->ops.stop)
-                       acpi_drv->ops.stop(acpi_dev, acpi_dev->removal_type);
                if (acpi_drv->ops.remove)
                        acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type);
        }
@@ -687,7 +687,7 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 }
 EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);
 
-void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)
+void acpi_bus_data_handler(acpi_handle handle, void *context)
 {
 
        /* TBD */
@@ -1000,33 +1000,89 @@ static int acpi_dock_match(struct acpi_device *device)
        return acpi_get_handle(device->handle, "_DCK", &tmp);
 }
 
+static struct acpica_device_id_list*
+acpi_add_cid(
+       struct acpi_device_info         *info,
+       struct acpica_device_id         *new_cid)
+{
+       struct acpica_device_id_list    *cid;
+       char                            *next_id_string;
+       acpi_size                       cid_length;
+       acpi_size                       new_cid_length;
+       u32                             i;
+
+
+       /* Allocate new CID list with room for the new CID */
+
+       if (!new_cid)
+               new_cid_length = info->compatible_id_list.list_size;
+       else if (info->compatible_id_list.list_size)
+               new_cid_length = info->compatible_id_list.list_size +
+                       new_cid->length + sizeof(struct acpica_device_id);
+       else
+               new_cid_length = sizeof(struct acpica_device_id_list) + new_cid->length;
+
+       cid = ACPI_ALLOCATE_ZEROED(new_cid_length);
+       if (!cid) {
+               return NULL;
+       }
+
+       cid->list_size = new_cid_length;
+       cid->count = info->compatible_id_list.count;
+       if (new_cid)
+               cid->count++;
+       next_id_string = (char *) cid->ids + (cid->count * sizeof(struct acpica_device_id));
+
+       /* Copy all existing CIDs */
+
+       for (i = 0; i < info->compatible_id_list.count; i++) {
+               cid_length = info->compatible_id_list.ids[i].length;
+               cid->ids[i].string = next_id_string;
+               cid->ids[i].length = cid_length;
+
+               ACPI_MEMCPY(next_id_string, info->compatible_id_list.ids[i].string,
+                       cid_length);
+
+               next_id_string += cid_length;
+       }
+
+       /* Append the new CID */
+
+       if (new_cid) {
+               cid->ids[i].string = next_id_string;
+               cid->ids[i].length = new_cid->length;
+
+               ACPI_MEMCPY(next_id_string, new_cid->string, new_cid->length);
+       }
+
+       return cid;
+}
+
 static void acpi_device_set_id(struct acpi_device *device,
                               struct acpi_device *parent, acpi_handle handle,
                               int type)
 {
-       struct acpi_device_info *info;
-       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       struct acpi_device_info *info = NULL;
        char *hid = NULL;
        char *uid = NULL;
-       struct acpi_compatible_id_list *cid_list = NULL;
-       const char *cid_add = NULL;
+       struct acpica_device_id_list *cid_list = NULL;
+       char *cid_add = NULL;
        acpi_status status;
 
        switch (type) {
        case ACPI_BUS_TYPE_DEVICE:
-               status = acpi_get_object_info(handle, &buffer);
+               status = acpi_get_object_info(handle, &info);
                if (ACPI_FAILURE(status)) {
                        printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
                        return;
                }
 
-               info = buffer.pointer;
                if (info->valid & ACPI_VALID_HID)
-                       hid = info->hardware_id.value;
+                       hid = info->hardware_id.string;
                if (info->valid & ACPI_VALID_UID)
-                       uid = info->unique_id.value;
+                       uid = info->unique_id.string;
                if (info->valid & ACPI_VALID_CID)
-                       cid_list = &info->compatibility_id;
+                       cid_list = &info->compatible_id_list;
                if (info->valid & ACPI_VALID_ADR) {
                        device->pnp.bus_address = info->address;
                        device->flags.bus_address = 1;
@@ -1077,55 +1133,46 @@ static void acpi_device_set_id(struct acpi_device *device,
        }
 
        if (hid) {
-               strcpy(device->pnp.hardware_id, hid);
-               device->flags.hardware_id = 1;
+               device->pnp.hardware_id = ACPI_ALLOCATE_ZEROED(strlen (hid) + 1);
+               if (device->pnp.hardware_id) {
+                       strcpy(device->pnp.hardware_id, hid);
+                       device->flags.hardware_id = 1;
+               }
        }
+       if (!device->flags.hardware_id)
+               device->pnp.hardware_id = "";
+
        if (uid) {
-               strcpy(device->pnp.unique_id, uid);
-               device->flags.unique_id = 1;
+               device->pnp.unique_id = ACPI_ALLOCATE_ZEROED(strlen (uid) + 1);
+               if (device->pnp.unique_id) {
+                       strcpy(device->pnp.unique_id, uid);
+                       device->flags.unique_id = 1;
+               }
        }
+       if (!device->flags.unique_id)
+               device->pnp.unique_id = "";
+
        if (cid_list || cid_add) {
-               struct  acpi_compatible_id_list *list;
-               int size = 0;
-               int count = 0;
-
-               if (cid_list) {
-                       size = cid_list->size;
-               } else if (cid_add) {
-                       size = sizeof(struct acpi_compatible_id_list);
-                       cid_list = ACPI_ALLOCATE_ZEROED((acpi_size) size);
-                       if (!cid_list) {
-                               printk(KERN_ERR "Memory allocation error\n");
-                               kfree(buffer.pointer);
-                               return;
-                       } else {
-                               cid_list->count = 0;
-                               cid_list->size = size;
-                       }
+               struct acpica_device_id_list *list;
+
+               if (cid_add) {
+                       struct acpica_device_id cid;
+                       cid.length = strlen (cid_add) + 1;
+                       cid.string = cid_add;
+
+                       list = acpi_add_cid(info, &cid);
+               } else {
+                       list = acpi_add_cid(info, NULL);
                }
-               if (cid_add)
-                       size += sizeof(struct acpi_compatible_id);
-               list = kmalloc(size, GFP_KERNEL);
 
                if (list) {
-                       if (cid_list) {
-                               memcpy(list, cid_list, cid_list->size);
-                               count = cid_list->count;
-                       }
-                       if (cid_add) {
-                               strncpy(list->id[count].value, cid_add,
-                                       ACPI_MAX_CID_LENGTH);
-                               count++;
-                               device->flags.compatible_ids = 1;
-                       }
-                       list->size = size;
-                       list->count = count;
                        device->pnp.cid_list = list;
-               } else
-                       printk(KERN_ERR PREFIX "Memory allocation error\n");
+                       if (cid_add)
+                               device->flags.compatible_ids = 1;
+               }
        }
 
-       kfree(buffer.pointer);
+       kfree(info);
 }
 
 static int acpi_device_set_context(struct acpi_device *device, int type)
@@ -1264,16 +1311,6 @@ acpi_add_single_object(struct acpi_device **child,
         */
        acpi_device_set_id(device, parent, handle, type);
 
-       /*
-        * The ACPI device is attached to acpi handle before getting
-        * the power/wakeup/peformance flags. Otherwise OS can't get
-        * the corresponding ACPI device by the acpi handle in the course
-        * of getting the power/wakeup/performance flags.
-        */
-       result = acpi_device_set_context(device, type);
-       if (result)
-               goto end;
-
        /*
         * Power Management
         * ----------------
@@ -1304,6 +1341,8 @@ acpi_add_single_object(struct acpi_device **child,
                        goto end;
        }
 
+       if ((result = acpi_device_set_context(device, type)))
+               goto end;
 
        result = acpi_device_register(device, parent);
 
@@ -1318,10 +1357,8 @@ acpi_add_single_object(struct acpi_device **child,
 end:
        if (!result)
                *child = device;
-       else {
-               kfree(device->pnp.cid_list);
-               kfree(device);
-       }
+       else
+               acpi_device_release(&device->dev);
 
        return result;
 }
index feece69..a90afcc 100644 (file)
@@ -405,6 +405,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                },
        },
        {
+       .callback = init_set_sci_en_on_resume,
+       .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
+               },
+       },
+       {
        .callback = init_old_suspend_ordering,
        .ident = "Panasonic CF51-2L",
        .matches = {
index 9b578b5..94b1a4c 100644 (file)
@@ -40,7 +40,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <asm/uaccess.h>
-
+#include <linux/dmi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -200,7 +200,7 @@ struct acpi_video_device {
        struct acpi_device *dev;
        struct acpi_video_device_brightness *brightness;
        struct backlight_device *backlight;
-       struct thermal_cooling_device *cdev;
+       struct thermal_cooling_device *cooling_dev;
        struct output_device *output_dev;
 };
 
@@ -389,20 +389,20 @@ static struct output_properties acpi_output_properties = {
 
 
 /* thermal cooling device callbacks */
-static int video_get_max_state(struct thermal_cooling_device *cdev, unsigned
+static int video_get_max_state(struct thermal_cooling_device *cooling_dev, unsigned
                               long *state)
 {
-       struct acpi_device *device = cdev->devdata;
+       struct acpi_device *device = cooling_dev->devdata;
        struct acpi_video_device *video = acpi_driver_data(device);
 
        *state = video->brightness->count - 3;
        return 0;
 }
 
-static int video_get_cur_state(struct thermal_cooling_device *cdev, unsigned
+static int video_get_cur_state(struct thermal_cooling_device *cooling_dev, unsigned
                               long *state)
 {
-       struct acpi_device *device = cdev->devdata;
+       struct acpi_device *device = cooling_dev->devdata;
        struct acpi_video_device *video = acpi_driver_data(device);
        unsigned long long level;
        int offset;
@@ -419,9 +419,9 @@ static int video_get_cur_state(struct thermal_cooling_device *cdev, unsigned
 }
 
 static int
-video_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
+video_set_cur_state(struct thermal_cooling_device *cooling_dev, unsigned long state)
 {
-       struct acpi_device *device = cdev->devdata;
+       struct acpi_device *device = cooling_dev->devdata;
        struct acpi_video_device *video = acpi_driver_data(device);
        int level;
 
@@ -605,6 +605,7 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
                                        unsigned long long *level)
 {
        acpi_status status = AE_OK;
+       int i;
 
        if (device->cap._BQC || device->cap._BCQ) {
                char *buf = device->cap._BQC ? "_BQC" : "_BCQ";
@@ -620,8 +621,15 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
 
                        }
                        *level += bqc_offset_aml_bug_workaround;
-                       device->brightness->curr = *level;
-                       return 0;
+                       for (i = 2; i < device->brightness->count; i++)
+                               if (device->brightness->levels[i] == *level) {
+                                       device->brightness->curr = *level;
+                                       return 0;
+                       }
+                       /* BQC returned an invalid level. Stop using it.  */
+                       ACPI_WARNING((AE_INFO, "%s returned an invalid level",
+                                               buf));
+                       device->cap._BQC = device->cap._BCQ = 0;
                } else {
                        /* Fixme:
                         * should we return an error or ignore this failure?
@@ -872,7 +880,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
        br->flags._BCM_use_index = br->flags._BCL_use_index;
 
        /* _BQC uses INDEX while _BCL uses VALUE in some laptops */
-       br->curr = level_old = max_level;
+       br->curr = level = max_level;
 
        if (!device->cap._BQC)
                goto set_level;
@@ -894,15 +902,25 @@ acpi_video_init_brightness(struct acpi_video_device *device)
 
        br->flags._BQC_use_index = (level == max_level ? 0 : 1);
 
-       if (!br->flags._BQC_use_index)
+       if (!br->flags._BQC_use_index) {
+               /*
+                * Set the backlight to the initial state.
+                * On some buggy laptops, _BQC returns an uninitialized value
+                * when invoked for the first time, i.e. level_old is invalid.
+                * set the backlight to max_level in this case
+                */
+               for (i = 2; i < br->count; i++)
+                       if (level_old == br->levels[i])
+                               level = level_old;
                goto set_level;
+       }
 
        if (br->flags._BCL_reversed)
                level_old = (br->count - 1) - level_old;
-       level_old = br->levels[level_old];
+       level = br->levels[level_old];
 
 set_level:
-       result = acpi_video_device_lcd_set_level(device, level_old);
+       result = acpi_video_device_lcd_set_level(device, level);
        if (result)
                goto out_free_levels;
 
@@ -936,9 +954,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 {
        acpi_handle h_dummy1;
 
-
-       memset(&device->cap, 0, sizeof(device->cap));
-
        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_ADR", &h_dummy1))) {
                device->cap._ADR = 1;
        }
@@ -992,19 +1007,29 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                if (result)
                        printk(KERN_ERR PREFIX "Create sysfs link\n");
 
-               device->cdev = thermal_cooling_device_register("LCD",
+               device->cooling_dev = thermal_cooling_device_register("LCD",
                                        device->dev, &video_cooling_ops);
-               if (IS_ERR(device->cdev))
+               if (IS_ERR(device->cooling_dev)) {
+                       /*
+                        * Set cooling_dev to NULL so we don't crash trying to
+                        * free it.
+                        * Also, why the hell we are returning early and
+                        * not attempt to register video output if cooling
+                        * device registration failed?
+                        * -- dtor
+                        */
+                       device->cooling_dev = NULL;
                        return;
+               }
 
                dev_info(&device->dev->dev, "registered as cooling_device%d\n",
-                        device->cdev->id);
+                        device->cooling_dev->id);
                result = sysfs_create_link(&device->dev->dev.kobj,
-                               &device->cdev->device.kobj,
+                               &device->cooling_dev->device.kobj,
                                "thermal_cooling");
                if (result)
                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-               result = sysfs_create_link(&device->cdev->device.kobj,
+               result = sysfs_create_link(&device->cooling_dev->device.kobj,
                                &device->dev->dev.kobj, "device");
                if (result)
                        printk(KERN_ERR PREFIX "Create sysfs link\n");
@@ -1041,7 +1066,6 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 {
        acpi_handle h_dummy1;
 
-       memset(&video->cap, 0, sizeof(video->cap));
        if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) {
                video->cap._DOS = 1;
        }
@@ -2011,13 +2035,13 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                backlight_device_unregister(device->backlight);
                device->backlight = NULL;
        }
-       if (device->cdev) {
+       if (device->cooling_dev) {
                sysfs_remove_link(&device->dev->dev.kobj,
                                  "thermal_cooling");
-               sysfs_remove_link(&device->cdev->device.kobj,
+               sysfs_remove_link(&device->cooling_dev->device.kobj,
                                  "device");
-               thermal_cooling_device_unregister(device->cdev);
-               device->cdev = NULL;
+               thermal_cooling_device_unregister(device->cooling_dev);
+               device->cooling_dev = NULL;
        }
        video_output_unregister(device->output_dev);
 
index 122c786..d0a7df2 100644 (file)
@@ -624,7 +624,7 @@ static struct ata_port_operations hpt374_fn1_port_ops = {
 };
 
 /**
- *     htp37x_clock_slot       -       Turn timing to PC clock entry
+ *     hpt37x_clock_slot       -       Turn timing to PC clock entry
  *     @freq: Reported frequency timing
  *     @base: Base timing
  *
index 390e664..6bee6af 100644 (file)
@@ -166,13 +166,16 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
        if (MAJOR(dev->devt)) {
                const char *tmp;
                const char *name;
+               mode_t mode = 0;
 
                add_uevent_var(env, "MAJOR=%u", MAJOR(dev->devt));
                add_uevent_var(env, "MINOR=%u", MINOR(dev->devt));
-               name = device_get_nodename(dev, &tmp);
+               name = device_get_devnode(dev, &mode, &tmp);
                if (name) {
                        add_uevent_var(env, "DEVNAME=%s", name);
                        kfree(tmp);
+                       if (mode)
+                               add_uevent_var(env, "DEVMODE=%#o", mode & 0777);
                }
        }
 
@@ -1148,8 +1151,9 @@ static struct device *next_device(struct klist_iter *i)
 }
 
 /**
- * device_get_nodename - path of device node file
+ * device_get_devnode - path of device node file
  * @dev: device
+ * @mode: returned file access mode
  * @tmp: possibly allocated string
  *
  * Return the relative path of a possible device node.
@@ -1157,21 +1161,22 @@ static struct device *next_device(struct klist_iter *i)
  * a name. This memory is returned in tmp and needs to be
  * freed by the caller.
  */
-const char *device_get_nodename(struct device *dev, const char **tmp)
+const char *device_get_devnode(struct device *dev,
+                              mode_t *mode, const char **tmp)
 {
        char *s;
 
        *tmp = NULL;
 
        /* the device type may provide a specific name */
-       if (dev->type && dev->type->nodename)
-               *tmp = dev->type->nodename(dev);
+       if (dev->type && dev->type->devnode)
+               *tmp = dev->type->devnode(dev, mode);
        if (*tmp)
                return *tmp;
 
        /* the class may provide a specific name */
-       if (dev->class && dev->class->nodename)
-               *tmp = dev->class->nodename(dev);
+       if (dev->class && dev->class->devnode)
+               *tmp = dev->class->devnode(dev, mode);
        if (*tmp)
                return *tmp;
 
index fd488ad..a1cb5af 100644 (file)
@@ -6,9 +6,10 @@
  * During bootup, before any driver core device is registered,
  * devtmpfs, a tmpfs-based filesystem is created. Every driver-core
  * device which requests a device node, will add a node in this
- * filesystem. The node is named after the the name of the device,
- * or the susbsytem can provide a custom name. All devices are
- * owned by root and have a mode of 0600.
+ * filesystem.
+ * By default, all devices are named after the the name of the
+ * device, owned by root and have a default mode of 0600. Subsystems
+ * can overwrite the default setting if needed.
  */
 
 #include <linux/kernel.h>
@@ -20,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/shmem_fs.h>
 #include <linux/cred.h>
+#include <linux/sched.h>
 #include <linux/init_task.h>
 
 static struct vfsmount *dev_mnt;
@@ -134,7 +136,7 @@ int devtmpfs_create_node(struct device *dev)
        const char *tmp = NULL;
        const char *nodename;
        const struct cred *curr_cred;
-       mode_t mode;
+       mode_t mode = 0;
        struct nameidata nd;
        struct dentry *dentry;
        int err;
@@ -142,14 +144,16 @@ int devtmpfs_create_node(struct device *dev)
        if (!dev_mnt)
                return 0;
 
-       nodename = device_get_nodename(dev, &tmp);
+       nodename = device_get_devnode(dev, &mode, &tmp);
        if (!nodename)
                return -ENOMEM;
 
+       if (mode == 0)
+               mode = 0600;
        if (is_blockdev(dev))
-               mode = S_IFBLK|0600;
+               mode |= S_IFBLK;
        else
-               mode = S_IFCHR|0600;
+               mode |= S_IFCHR;
 
        curr_cred = override_creds(&init_cred);
        err = vfs_path_lookup(dev_mnt->mnt_root, dev_mnt,
@@ -165,8 +169,12 @@ int devtmpfs_create_node(struct device *dev)
 
        dentry = lookup_create(&nd, 0);
        if (!IS_ERR(dentry)) {
+               int umask;
+
+               umask = sys_umask(0000);
                err = vfs_mknod(nd.path.dentry->d_inode,
                                dentry, mode, dev->devt);
+               sys_umask(umask);
                /* mark as kernel created inode */
                if (!err)
                        dentry->d_inode->i_private = &dev_mnt;
@@ -271,7 +279,7 @@ int devtmpfs_delete_node(struct device *dev)
        if (!dev_mnt)
                return 0;
 
-       nodename = device_get_nodename(dev, &tmp);
+       nodename = device_get_devnode(dev, NULL, &tmp);
        if (!nodename)
                return -ENOMEM;
 
index 91d4087..1fe5536 100644 (file)
@@ -85,6 +85,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                       "Node %d FilePages:      %8lu kB\n"
                       "Node %d Mapped:         %8lu kB\n"
                       "Node %d AnonPages:      %8lu kB\n"
+                      "Node %d Shmem:          %8lu kB\n"
+                      "Node %d KernelStack:    %8lu kB\n"
                       "Node %d PageTables:     %8lu kB\n"
                       "Node %d NFS_Unstable:   %8lu kB\n"
                       "Node %d Bounce:         %8lu kB\n"
@@ -116,6 +118,9 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                       nid, K(node_page_state(nid, NR_FILE_PAGES)),
                       nid, K(node_page_state(nid, NR_FILE_MAPPED)),
                       nid, K(node_page_state(nid, NR_ANON_PAGES)),
+                      nid, K(node_page_state(nid, NR_SHMEM)),
+                      nid, node_page_state(nid, NR_KERNEL_STACK) *
+                               THREAD_SIZE / 1024,
                       nid, K(node_page_state(nid, NR_PAGETABLE)),
                       nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
                       nid, K(node_page_state(nid, NR_BOUNCE)),
index 1e6b7c1..6fa7b0f 100644 (file)
@@ -152,7 +152,7 @@ static int DAC960_revalidate_disk(struct gendisk *disk)
        return 0;
 }
 
-static struct block_device_operations DAC960_BlockDeviceOperations = {
+static const struct block_device_operations DAC960_BlockDeviceOperations = {
        .owner                  = THIS_MODULE,
        .open                   = DAC960_open,
        .getgeo                 = DAC960_getgeo,
@@ -6562,7 +6562,7 @@ static int DAC960_ProcWriteUserCommand(struct file *file,
   if (copy_from_user(CommandBuffer, Buffer, Count)) return -EFAULT;
   CommandBuffer[Count] = '\0';
   Length = strlen(CommandBuffer);
-  if (CommandBuffer[Length-1] == '\n')
+  if (Length > 0 && CommandBuffer[Length-1] == '\n')
     CommandBuffer[--Length] = '\0';
   if (Controller->FirmwareType == DAC960_V1_Controller)
     return (DAC960_V1_ExecuteUserCommand(Controller, CommandBuffer)
@@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
        else ErrorCode = get_user(ControllerNumber,
                             &UserSpaceControllerInfo->ControllerNumber);
        if (ErrorCode != 0)
-               break;;
+               break;
        ErrorCode = -ENXIO;
        if (ControllerNumber < 0 ||
            ControllerNumber > DAC960_ControllerCount - 1) {
@@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
        }
        Controller = DAC960_Controllers[ControllerNumber];
        if (Controller == NULL)
-               break;;
+               break;
        memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
        ControllerInfo.ControllerNumber = ControllerNumber;
        ControllerInfo.FirmwareType = Controller->FirmwareType;
@@ -7210,7 +7210,7 @@ static struct pci_driver DAC960_pci_driver = {
        .remove         = DAC960_Remove,
 };
 
-static int DAC960_init_module(void)
+static int __init DAC960_init_module(void)
 {
        int ret;
 
@@ -7222,7 +7222,7 @@ static int DAC960_init_module(void)
        return ret;
 }
 
-static void DAC960_cleanup_module(void)
+static void __exit DAC960_cleanup_module(void)
 {
        int i;
 
index 2f07b7c..0552258 100644 (file)
@@ -1632,7 +1632,7 @@ static int amiga_floppy_change(struct gendisk *disk)
        return 0;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .owner          = THIS_MODULE,
        .open           = floppy_open,
        .release        = floppy_release,
index b6cd571..3af97d4 100644 (file)
@@ -237,7 +237,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations aoe_bdops = {
+static const struct block_device_operations aoe_bdops = {
        .open = aoeblk_open,
        .release = aoeblk_release,
        .getgeo = aoeblk_getgeo,
index 1988835..62141ec 100644 (file)
@@ -266,7 +266,7 @@ static const struct file_operations aoe_fops = {
        .owner = THIS_MODULE,
 };
 
-static char *aoe_nodename(struct device *dev)
+static char *aoe_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev));
 }
@@ -288,7 +288,7 @@ aoechr_init(void)
                unregister_chrdev(AOE_MAJOR, "aoechr");
                return PTR_ERR(aoe_class);
        }
-       aoe_class->nodename = aoe_nodename;
+       aoe_class->devnode = aoe_devnode;
 
        for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
                device_create(aoe_class, NULL,
index 3ff0294..847a9e5 100644 (file)
@@ -1856,7 +1856,7 @@ static int floppy_release(struct gendisk *disk, fmode_t mode)
        return 0;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .owner          = THIS_MODULE,
        .open           = floppy_open,
        .release        = floppy_release,
index 4bf8705..4f68843 100644 (file)
@@ -375,7 +375,7 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode,
        return error;
 }
 
-static struct block_device_operations brd_fops = {
+static const struct block_device_operations brd_fops = {
        .owner =                THIS_MODULE,
        .locked_ioctl =         brd_ioctl,
 #ifdef CONFIG_BLK_DEV_XIP
index d8372b4..24c3e21 100644 (file)
@@ -205,7 +205,7 @@ static int cciss_compat_ioctl(struct block_device *, fmode_t,
                              unsigned, unsigned long);
 #endif
 
-static struct block_device_operations cciss_fops = {
+static const struct block_device_operations cciss_fops = {
        .owner = THIS_MODULE,
        .open = cciss_open,
        .release = cciss_release,
@@ -363,7 +363,7 @@ static void cciss_seq_stop(struct seq_file *seq, void *v)
        h->busy_configuring = 0;
 }
 
-static struct seq_operations cciss_seq_ops = {
+static const struct seq_operations cciss_seq_ops = {
        .start = cciss_seq_start,
        .show  = cciss_seq_show,
        .next  = cciss_seq_next,
index 44fa201..b82d438 100644 (file)
@@ -193,7 +193,7 @@ static inline ctlr_info_t *get_host(struct gendisk *disk)
 }
 
 
-static struct block_device_operations ida_fops  = {
+static const struct block_device_operations ida_fops  = {
        .owner          = THIS_MODULE,
        .open           = ida_open,
        .release        = ida_release,
index 2b387c2..5c01f74 100644 (file)
@@ -3907,7 +3907,7 @@ static int floppy_revalidate(struct gendisk *disk)
        return res;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .owner                  = THIS_MODULE,
        .open                   = floppy_open,
        .release                = floppy_release,
index f9d0160..d5cdce0 100644 (file)
@@ -692,7 +692,7 @@ static irqreturn_t hd_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct block_device_operations hd_fops = {
+static const struct block_device_operations hd_fops = {
        .getgeo =       hd_getgeo,
 };
 
index bbb7944..edda9ea 100644 (file)
@@ -1438,7 +1438,7 @@ out_unlocked:
        return 0;
 }
 
-static struct block_device_operations lo_fops = {
+static const struct block_device_operations lo_fops = {
        .owner =        THIS_MODULE,
        .open =         lo_open,
        .release =      lo_release,
index 6d7fbaa..e0339aa 100644 (file)
@@ -775,7 +775,7 @@ static int mg_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations mg_disk_ops = {
+static const struct block_device_operations mg_disk_ops = {
        .getgeo = mg_getgeo
 };
 
index 5d23ffa..cc923a5 100644 (file)
@@ -722,7 +722,7 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
        return error;
 }
 
-static struct block_device_operations nbd_fops =
+static const struct block_device_operations nbd_fops =
 {
        .owner =        THIS_MODULE,
        .locked_ioctl = nbd_ioctl,
index 13c1aee..a808b15 100644 (file)
@@ -125,7 +125,7 @@ static struct class *class_osdblk;          /* /sys/class/osdblk */
 static DEFINE_MUTEX(ctl_mutex);        /* Serialize open/close/setup/teardown */
 static LIST_HEAD(osdblkdev_list);
 
-static struct block_device_operations osdblk_bd_ops = {
+static const struct block_device_operations osdblk_bd_ops = {
        .owner          = THIS_MODULE,
 };
 
index 9f3518c..8866ca3 100644 (file)
@@ -247,7 +247,7 @@ static int pcd_block_media_changed(struct gendisk *disk)
        return cdrom_media_changed(&cd->info);
 }
 
-static struct block_device_operations pcd_bdops = {
+static const struct block_device_operations pcd_bdops = {
        .owner          = THIS_MODULE,
        .open           = pcd_block_open,
        .release        = pcd_block_release,
index bf5955b..569e39e 100644 (file)
@@ -807,7 +807,7 @@ static int pd_revalidate(struct gendisk *p)
        return 0;
 }
 
-static struct block_device_operations pd_fops = {
+static const struct block_device_operations pd_fops = {
        .owner          = THIS_MODULE,
        .open           = pd_open,
        .release        = pd_release,
index 68a9083..ea54ea3 100644 (file)
@@ -262,7 +262,7 @@ static char *pf_buf;                /* buffer for request in progress */
 
 /* kernel glue structures */
 
-static struct block_device_operations pf_fops = {
+static const struct block_device_operations pf_fops = {
        .owner          = THIS_MODULE,
        .open           = pf_open,
        .release        = pf_release,
index 95f11cd..2ddf03a 100644 (file)
@@ -2849,7 +2849,7 @@ static int pkt_media_changed(struct gendisk *disk)
        return attached_disk->fops->media_changed(attached_disk);
 }
 
-static struct block_device_operations pktcdvd_ops = {
+static const struct block_device_operations pktcdvd_ops = {
        .owner =                THIS_MODULE,
        .open =                 pkt_open,
        .release =              pkt_close,
@@ -2857,7 +2857,7 @@ static struct block_device_operations pktcdvd_ops = {
        .media_changed =        pkt_media_changed,
 };
 
-static char *pktcdvd_nodename(struct gendisk *gd)
+static char *pktcdvd_devnode(struct gendisk *gd, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "pktcdvd/%s", gd->disk_name);
 }
@@ -2914,7 +2914,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
        disk->fops = &pktcdvd_ops;
        disk->flags = GENHD_FL_REMOVABLE;
        strcpy(disk->disk_name, pd->name);
-       disk->nodename = pktcdvd_nodename;
+       disk->devnode = pktcdvd_devnode;
        disk->private_data = pd;
        disk->queue = blk_alloc_queue(GFP_KERNEL);
        if (!disk->queue)
@@ -3070,7 +3070,7 @@ static const struct file_operations pkt_ctl_fops = {
 static struct miscdevice pkt_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DRIVER_NAME,
-       .name           = "pktcdvd/control",
+       .nodename       = "pktcdvd/control",
        .fops           = &pkt_ctl_fops
 };
 
index 34cbb7f..03a130d 100644 (file)
@@ -82,7 +82,7 @@ enum lv1_ata_in_out {
 static int ps3disk_major;
 
 
-static struct block_device_operations ps3disk_fops = {
+static const struct block_device_operations ps3disk_fops = {
        .owner          = THIS_MODULE,
 };
 
index c8753a9..3bb7c47 100644 (file)
@@ -88,7 +88,7 @@ struct ps3vram_priv {
 static int ps3vram_major;
 
 
-static struct block_device_operations ps3vram_fops = {
+static const struct block_device_operations ps3vram_fops = {
        .owner          = THIS_MODULE,
 };
 
index cbfd9c0..411f064 100644 (file)
@@ -103,7 +103,7 @@ static int vdc_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations vdc_fops = {
+static const struct block_device_operations vdc_fops = {
        .owner          = THIS_MODULE,
        .getgeo         = vdc_getgeo,
 };
index cf7877f..8f569e3 100644 (file)
@@ -748,7 +748,7 @@ static int floppy_revalidate(struct gendisk *disk)
        return !fs->disk_in;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .owner           = THIS_MODULE,
        .open            = floppy_open,
        .release         = floppy_release,
index 80df93e..6380ad8 100644 (file)
@@ -998,7 +998,7 @@ static int floppy_revalidate(struct gendisk *disk)
        return ret;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
        .open           = floppy_open,
        .release        = floppy_release,
        .locked_ioctl   = floppy_ioctl,
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
                goto out_release;
        }
        fs->swim3_intr = macio_irq(mdev, 0);
-       fs->dma_intr = macio_irq(mdev, 1);;
+       fs->dma_intr = macio_irq(mdev, 1);
        fs->cur_cyl = -1;
        fs->cur_sector = -1;
        fs->secpercyl = 36;
index f5cd2e8..a7c4184 100644 (file)
@@ -423,7 +423,7 @@ static struct pci_driver carm_driver = {
        .remove         = carm_remove_one,
 };
 
-static struct block_device_operations carm_bd_ops = {
+static const struct block_device_operations carm_bd_ops = {
        .owner          = THIS_MODULE,
        .getgeo         = carm_bdev_getgeo,
 };
index cc54473..c739b20 100644 (file)
@@ -1789,7 +1789,7 @@ static int ub_bd_media_changed(struct gendisk *disk)
        return lun->changed;
 }
 
-static struct block_device_operations ub_bd_fops = {
+static const struct block_device_operations ub_bd_fops = {
        .owner          = THIS_MODULE,
        .open           = ub_bd_open,
        .release        = ub_bd_release,
index 858c34d..ad1ba39 100644 (file)
@@ -140,7 +140,6 @@ struct cardinfo {
 };
 
 static struct cardinfo cards[MM_MAXCARDS];
-static struct block_device_operations mm_fops;
 static struct timer_list battery_timer;
 
 static int num_cards;
@@ -789,7 +788,7 @@ static int mm_check_change(struct gendisk *disk)
        return 0;
 }
 
-static struct block_device_operations mm_fops = {
+static const struct block_device_operations mm_fops = {
        .owner          = THIS_MODULE,
        .getgeo         = mm_getgeo,
        .revalidate_disk = mm_revalidate,
index b441ce3..a8c8b56 100644 (file)
@@ -219,7 +219,7 @@ static int viodasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 /*
  * Our file operations table
  */
-static struct block_device_operations viodasd_fops = {
+static const struct block_device_operations viodasd_fops = {
        .owner = THIS_MODULE,
        .open = viodasd_open,
        .release = viodasd_release,
index aa1a3d5..43f1938 100644 (file)
@@ -3,6 +3,7 @@
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_blk.h>
 #include <linux/scatterlist.h>
 
@@ -91,15 +92,26 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
                return false;
 
        vbr->req = req;
-       if (blk_fs_request(vbr->req)) {
+       switch (req->cmd_type) {
+       case REQ_TYPE_FS:
                vbr->out_hdr.type = 0;
                vbr->out_hdr.sector = blk_rq_pos(vbr->req);
                vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-       } else if (blk_pc_request(vbr->req)) {
+               break;
+       case REQ_TYPE_BLOCK_PC:
                vbr->out_hdr.type = VIRTIO_BLK_T_SCSI_CMD;
                vbr->out_hdr.sector = 0;
                vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-       } else {
+               break;
+       case REQ_TYPE_LINUX_BLOCK:
+               if (req->cmd[0] == REQ_LB_OP_FLUSH) {
+                       vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
+                       vbr->out_hdr.sector = 0;
+                       vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
+                       break;
+               }
+               /*FALLTHRU*/
+       default:
                /* We don't put anything else in the queue. */
                BUG();
        }
@@ -139,7 +151,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
                }
        }
 
-       if (vblk->vq->vq_ops->add_buf(vblk->vq, vblk->sg, out, in, vbr)) {
+       if (vblk->vq->vq_ops->add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {
                mempool_free(vbr, vblk->pool);
                return false;
        }
@@ -199,6 +211,12 @@ out:
        return err;
 }
 
+static void virtblk_prepare_flush(struct request_queue *q, struct request *req)
+{
+       req->cmd_type = REQ_TYPE_LINUX_BLOCK;
+       req->cmd[0] = REQ_LB_OP_FLUSH;
+}
+
 static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
                         unsigned cmd, unsigned long data)
 {
@@ -243,7 +261,7 @@ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations virtblk_fops = {
+static const struct block_device_operations virtblk_fops = {
        .locked_ioctl = virtblk_ioctl,
        .owner  = THIS_MODULE,
        .getgeo = virtblk_getgeo,
@@ -337,7 +355,10 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
        index++;
 
        /* If barriers are supported, tell block layer that queue is ordered */
-       if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
+       if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))
+               blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_DRAIN_FLUSH,
+                                 virtblk_prepare_flush);
+       else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
                blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_TAG, NULL);
 
        /* If disk is read-only in the host, the guest should obey */
@@ -424,7 +445,7 @@ static struct virtio_device_id id_table[] = {
 static unsigned int features[] = {
        VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX,
        VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,
-       VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY
+       VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY, VIRTIO_BLK_F_FLUSH
 };
 
 /*
index ce24292..0877d36 100644 (file)
@@ -130,7 +130,7 @@ static struct gendisk *xd_gendisk[2];
 
 static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
-static struct block_device_operations xd_fops = {
+static const struct block_device_operations xd_fops = {
        .owner  = THIS_MODULE,
        .locked_ioctl   = xd_ioctl,
        .getgeo = xd_getgeo,
index e532847..b8578bb 100644 (file)
@@ -65,7 +65,7 @@ struct blk_shadow {
        unsigned long frame[BLKIF_MAX_SEGMENTS_PER_REQUEST];
 };
 
-static struct block_device_operations xlvbd_block_fops;
+static const struct block_device_operations xlvbd_block_fops;
 
 #define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE)
 
@@ -1039,7 +1039,7 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
        return 0;
 }
 
-static struct block_device_operations xlvbd_block_fops =
+static const struct block_device_operations xlvbd_block_fops =
 {
        .owner = THIS_MODULE,
        .open = blkif_open,
index b20abe1..e5c5415 100644 (file)
@@ -941,7 +941,7 @@ static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations ace_fops = {
+static const struct block_device_operations ace_fops = {
        .owner = THIS_MODULE,
        .open = ace_open,
        .release = ace_release,
index b259040..64f941e 100644 (file)
@@ -64,7 +64,6 @@ static int current_device   = -1;
 
 static DEFINE_SPINLOCK(z2ram_lock);
 
-static struct block_device_operations z2_fops;
 static struct gendisk *z2ram_gendisk;
 
 static void do_z2_request(struct request_queue *q)
@@ -315,7 +314,7 @@ z2_release(struct gendisk *disk, fmode_t mode)
     return 0;
 }
 
-static struct block_device_operations z2_fops =
+static const struct block_device_operations z2_fops =
 {
        .owner          = THIS_MODULE,
        .open           = z2_open,
index b5621f2..a762283 100644 (file)
@@ -512,7 +512,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode,
        return cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg);
 }
 
-static struct block_device_operations gdrom_bdops = {
+static const struct block_device_operations gdrom_bdops = {
        .owner                  = THIS_MODULE,
        .open                   = gdrom_bdops_open,
        .release                = gdrom_bdops_release,
index 0fff646..57ca69e 100644 (file)
@@ -177,7 +177,7 @@ static int viocd_blk_media_changed(struct gendisk *disk)
        return cdrom_media_changed(&di->viocd_info);
 }
 
-struct block_device_operations viocd_fops = {
+static const struct block_device_operations viocd_fops = {
        .owner =                THIS_MODULE,
        .open =                 viocd_blk_open,
        .release =              viocd_blk_release,
index ad87753..a56ca08 100644 (file)
@@ -114,9 +114,9 @@ static int agp_find_max(void)
        long memory, index, result;
 
 #if PAGE_SHIFT < 20
-       memory = num_physpages >> (20 - PAGE_SHIFT);
+       memory = totalram_pages >> (20 - PAGE_SHIFT);
 #else
-       memory = num_physpages << (PAGE_SHIFT - 20);
+       memory = totalram_pages << (PAGE_SHIFT - 20);
 #endif
        index = 1;
 
index 501e293..9047b27 100644 (file)
@@ -476,7 +476,6 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
 {
        acpi_handle handle, parent;
        acpi_status status;
-       struct acpi_buffer buffer;
        struct acpi_device_info *info;
        u64 lba_hpa, sba_hpa, length;
        int match;
@@ -488,13 +487,11 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
        /* Look for an enclosing IOC scope and find its CSR space */
        handle = obj;
        do {
-               buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
-               status = acpi_get_object_info(handle, &buffer);
+               status = acpi_get_object_info(handle, &info);
                if (ACPI_SUCCESS(status)) {
                        /* TBD check _CID also */
-                       info = buffer.pointer;
-                       info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0';
-                       match = (strcmp(info->hardware_id.value, "HWP0001") == 0);
+                       info->hardware_id.string[sizeof(info->hardware_id.length)-1] = '\0';
+                       match = (strcmp(info->hardware_id.string, "HWP0001") == 0);
                        kfree(info);
                        if (match) {
                                status = hp_acpi_csr_space(handle, &sba_hpa, &length);
index 20ef1bf..703959e 100644 (file)
@@ -270,7 +270,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode)
 
        if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) {
                /*
-                * We need to to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1,
+                * We need to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1,
                 * 2.2 and 2.3, Darwin do so.
                 */
                if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7)
index 2dafc2d..df5038b 100644 (file)
@@ -11,7 +11,7 @@
  * Initially written by Randolph Bentson <bentson@grieg.seaslug.org>.
  * Modified and maintained by Marcio Saito <marcio@cyclades.com>.
  *
- * Copyright (C) 2007 Jiri Slaby <jirislaby@gmail.com>
+ * Copyright (C) 2007-2009 Jiri Slaby <jirislaby@gmail.com>
  *
  * Much of the design and some of the code came from serial.c
  * which was copyright (C) 1991, 1992  Linus Torvalds.  It was
  * and then fixed as suggested by Michael K. Johnson 12/12/92.
  * Converted to pci probing and cleaned up by Jiri Slaby.
  *
- * This version supports shared IRQ's (only for PCI boards).
- *
- * Prevent users from opening non-existing Z ports.
- *
- * Revision 2.3.2.8   2000/07/06 18:14:16 ivan
- * Fixed the PCI detection function to work properly on Alpha systems.
- * Implemented support for TIOCSERGETLSR ioctl.
- * Implemented full support for non-standard baud rates.
- *
- * Revision 2.3.2.7   2000/06/01 18:26:34 ivan
- * Request PLX I/O region, although driver doesn't use it, to avoid
- * problems with other drivers accessing it.
- * Removed count for on-board buffer characters in cy_chars_in_buffer
- * (Cyclades-Z only).
- *
- * Revision 2.3.2.6   2000/05/05 13:56:05 ivan
- * Driver now reports physical instead of virtual memory addresses.
- * Masks were added to some Cyclades-Z read accesses.
- * Implemented workaround for PLX9050 bug that would cause a system lockup
- * in certain systems, depending on the MMIO addresses allocated to the
- * board.
- * Changed the Tx interrupt programming in the CD1400 chips to boost up
- * performance (Cyclom-Y only).
- * Code is now compliant with the new module interface (module_[init|exit]).
- * Make use of the PCI helper functions to access PCI resources.
- * Did some code "housekeeping".
- *
- * Revision 2.3.2.5   2000/01/19 14:35:33 ivan
- * Fixed bug in cy_set_termios on CRTSCTS flag turnoff.
- *
- * Revision 2.3.2.4   2000/01/17 09:19:40 ivan
- * Fixed SMP locking in Cyclom-Y interrupt handler.
- *
- * Revision 2.3.2.3   1999/12/28 12:11:39 ivan
- * Added a new cyclades_card field called nports to allow the driver to
- * know the exact number of ports found by the Z firmware after its load;
- * RX buffer contention prevention logic on interrupt op mode revisited
- * (Cyclades-Z only);
- * Revisited printk's for Z debug;
- * Driver now makes sure that the constant SERIAL_XMIT_SIZE is defined;
- *
- * Revision 2.3.2.2   1999/10/01 11:27:43 ivan
- * Fixed bug in cyz_poll that would make all ports but port 0
- * unable to transmit/receive data (Cyclades-Z only);
- * Implemented logic to prevent the RX buffer from being stuck with data
- * due to a driver / firmware race condition in interrupt op mode
- * (Cyclades-Z only);
- * Fixed bug in block_til_ready logic that would lead to a system crash;
- * Revisited cy_close spinlock usage;
- *
- * Revision 2.3.2.1   1999/09/28 11:01:22 ivan
- * Revisited CONFIG_PCI conditional compilation for PCI board support;
- * Implemented TIOCGICOUNT and TIOCMIWAIT ioctl support;
- * _Major_ cleanup on the Cyclades-Z interrupt support code / logic;
- * Removed CTS handling from the driver -- this is now completely handled
- * by the firmware (Cyclades-Z only);
- * Flush RX on-board buffers on a port open (Cyclades-Z only);
- * Fixed handling of ASYNC_SPD_* TTY flags;
- * Module unload now unmaps all memory area allocated by ioremap;
- *
- * Revision 2.3.1.1   1999/07/15 16:45:53 ivan
- * Removed CY_PROC conditional compilation;
- * Implemented SMP-awareness for the driver;
- * Implemented a new ISA IRQ autoprobe that uses the irq_probe_[on|off]
- * functions;
- * The driver now accepts memory addresses (maddr=0xMMMMM) and IRQs
- * (irq=NN) as parameters (only for ISA boards);
- * Fixed bug in set_line_char that would prevent the Cyclades-Z
- * ports from being configured at speeds above 115.2Kbps;
- * Fixed bug in cy_set_termios that would prevent XON/XOFF flow control
- * switching from working properly;
- * The driver now only prints IRQ info for the Cyclades-Z if it's
- * configured to work in interrupt mode;
- *
- * Revision 2.2.2.3   1999/06/28 11:13:29 ivan
- * Added support for interrupt mode operation for the Z cards;
- * Removed the driver inactivity control for the Z;
- * Added a missing MOD_DEC_USE_COUNT in the cy_open function for when
- * the Z firmware is not loaded yet;
- * Replaced the "manual" Z Tx flush buffer by a call to a FW command of
- * same functionality;
- * Implemented workaround for IRQ setting loss on the PCI configuration
- * registers after a PCI bridge EEPROM reload (affects PLX9060 only);
- *
- * Revision 2.2.2.2  1999/05/14 17:18:15 ivan
- * /proc entry location changed to /proc/tty/driver/cyclades;
- * Added support to shared IRQ's (only for PCI boards);
- * Added support for Cobalt Qube2 systems;
- * IRQ [de]allocation scheme revisited;
- * BREAK implementation changed in order to make use of the 'break_ctl'
- * TTY facility;
- * Fixed typo in TTY structure field 'driver_name';
- * Included a PCI bridge reset and EEPROM reload in the board
- * initialization code (for both Y and Z series).
- *
- * Revision 2.2.2.1  1999/04/08 16:17:43 ivan
- * Fixed a bug in cy_wait_until_sent that was preventing the port to be
- * closed properly after a SIGINT;
- * Module usage counter scheme revisited;
- * Added support to the upcoming Y PCI boards (i.e., support to additional
- * PCI Device ID's).
- *
- * Revision 2.2.1.10 1999/01/20 16:14:29 ivan
- * Removed all unnecessary page-alignement operations in ioremap calls
- * (ioremap is currently safe for these operations).
- *
- * Revision 2.2.1.9  1998/12/30 18:18:30 ivan
- * Changed access to PLX PCI bridge registers from I/O to MMIO, in
- * order to make PLX9050-based boards work with certain motherboards.
- *
- * Revision 2.2.1.8  1998/11/13 12:46:20 ivan
- * cy_close function now resets (correctly) the tty->closing flag;
- * JIFFIES_DIFF macro fixed.
- *
- * Revision 2.2.1.7  1998/09/03 12:07:28 ivan
- * Fixed bug in cy_close function, which was not informing HW of
- * which port should have the reception disabled before doing so;
- * fixed Cyclom-8YoP hardware detection bug.
- *
- * Revision 2.2.1.6  1998/08/20 17:15:39 ivan
- * Fixed bug in cy_close function, which causes malfunction
- * of one of the first 4 ports when a higher port is closed
- * (Cyclom-Y only).
- *
- * Revision 2.2.1.5  1998/08/10 18:10:28 ivan
- * Fixed Cyclom-4Yo hardware detection bug.
- *
- * Revision 2.2.1.4  1998/08/04 11:02:50 ivan
- * /proc/cyclades implementation with great collaboration of
- * Marc Lewis <marc@blarg.net>;
- * cyy_interrupt was changed to avoid occurrence of kernel oopses
- * during PPP operation.
- *
- * Revision 2.2.1.3  1998/06/01 12:09:10 ivan
- * General code review in order to comply with 2.1 kernel standards;
- * data loss prevention for slow devices revisited (cy_wait_until_sent
- * was created);
- * removed conditional compilation for new/old PCI structure support
- * (now the driver only supports the new PCI structure).
- *
- * Revision 2.2.1.1  1998/03/19 16:43:12 ivan
- * added conditional compilation for new/old PCI structure support;
- * removed kernel series (2.0.x / 2.1.x) conditional compilation.
- *
- * Revision 2.1.1.3  1998/03/16 18:01:12 ivan
- * cleaned up the data loss fix;
- * fixed XON/XOFF handling once more (Cyclades-Z);
- * general review of the driver routines;
- * introduction of a mechanism to prevent data loss with slow
- * printers, by forcing a delay before closing the port.
- *
- * Revision 2.1.1.2  1998/02/17 16:50:00 ivan
- * fixed detection/handling of new CD1400 in Ye boards;
- * fixed XON/XOFF handling (Cyclades-Z);
- * fixed data loss caused by a premature port close;
- * introduction of a flag that holds the CD1400 version ID per port
- * (used by the CYGETCD1400VER new ioctl).
- *
- * Revision 2.1.1.1  1997/12/03 17:31:19 ivan
- * Code review for the module cleanup routine;
- * fixed RTS and DTR status report for new CD1400's in get_modem_info;
- * includes anonymous changes regarding signal_pending.
- *
- * Revision 2.1  1997/11/01 17:42:41 ivan
- * Changes in the driver to support Alpha systems (except 8Zo V_1);
- * BREAK fix for the Cyclades-Z boards;
- * driver inactivity control by FW implemented;
- * introduction of flag that allows driver to take advantage of
- * a special CD1400 feature related to HW flow control;
- * added support for the CD1400  rev. J (Cyclom-Y boards);
- * introduction of ioctls to:
- *  - control the rtsdtr_inv flag (Cyclom-Y);
- *  - control the rflow flag (Cyclom-Y);
- *  - adjust the polling interval (Cyclades-Z);
- *
- * Revision 1.36.4.33  1997/06/27 19:00:00  ivan
- * Fixes related to kernel version conditional
- * compilation.
- *
- * Revision 1.36.4.32  1997/06/14 19:30:00  ivan
- * Compatibility issues between kernels 2.0.x and
- * 2.1.x (mainly related to clear_bit function).
- *
- * Revision 1.36.4.31  1997/06/03 15:30:00  ivan
- * Changes to define the memory window according to the
- * board type.
- *
- * Revision 1.36.4.30  1997/05/16 15:30:00  daniel
- * Changes to support new cycladesZ boards.
- *
- * Revision 1.36.4.29  1997/05/12 11:30:00  daniel
- * Merge of Bentson's and Daniel's version 1.36.4.28.
- * Corrects bug in cy_detect_pci: check if there are more
- * ports than the number of static structs allocated.
- * Warning message during initialization if this driver is
- * used with the new generation of cycladesZ boards.  Those
- * will be supported only in next release of the driver.
- * Corrects bug in cy_detect_pci and cy_detect_isa that
- * returned wrong number of VALID boards, when a cyclomY
- * was found with no serial modules connected.
- * Changes to use current (2.1.x) kernel subroutine names
- * and created macros for compilation with 2.0.x kernel,
- * instead of the other way around.
- *
- * Revision 1.36.4.28  1997/05/?? ??:00:00  bentson
- * Change queue_task_irq_off to queue_task_irq.
- * The inline function queue_task_irq_off (tqueue.h)
- * was removed from latest releases of 2.1.x kernel.
- * Use of macro __init to mark the initialization
- * routines, so memory can be reused.
- * Also incorporate implementation of critical region
- * in function cleanup_module() created by anonymous
- * linuxer.
- *
- * Revision 1.36.4.28  1997/04/25 16:00:00  daniel
- * Change to support new firmware that solves DCD problem:
- * application could fail to receive SIGHUP signal when DCD
- * varying too fast.
- *
- * Revision 1.36.4.27  1997/03/26 10:30:00  daniel
- * Changed for support linux versions 2.1.X.
- * Backward compatible with linux versions 2.0.X.
- * Corrected illegal use of filler field in
- * CH_CTRL struct.
- * Deleted some debug messages.
- *
- * Revision 1.36.4.26  1997/02/27 12:00:00  daniel
- * Included check for NULL tty pointer in cyz_poll.
- *
- * Revision 1.36.4.25  1997/02/26 16:28:30  bentson
- * Bill Foster at Blarg! Online services noticed that
- * some of the switch elements of -Z modem control
- * lacked a closing "break;"
- *
- * Revision 1.36.4.24  1997/02/24 11:00:00  daniel
- * Changed low water threshold for buffer xmit_buf
- *
- * Revision 1.36.4.23  1996/12/02 21:50:16  bentson
- * Marcio provided fix to modem status fetch for -Z
- *
- * Revision 1.36.4.22  1996/10/28 22:41:17  bentson
- * improve mapping of -Z control page (thanks to Steve
- * Price <stevep@fa.tdktca.com> for help on this)
- *
- * Revision 1.36.4.21  1996/09/10 17:00:10  bentson
- * shift from CPU-bound to memcopy in cyz_polling operation
- *
- * Revision 1.36.4.20  1996/09/09 18:30:32  Bentson
- * Added support to set and report higher speeds.
- *
- * Revision 1.36.4.19c  1996/08/09 10:00:00  Marcio Saito
- * Some fixes in the HW flow control for the BETA release.
- * Don't try to register the IRQ.
- *
- * Revision 1.36.4.19  1996/08/08 16:23:18  Bentson
- * make sure "cyc" appears in all kernel messages; all soft interrupts
- * handled by same routine; recognize out-of-band reception; comment
- * out some diagnostic messages; leave RTS/CTS flow control to hardware;
- * fix race condition in -Z buffer management; only -Y needs to explicitly
- * flush chars; tidy up some startup messages;
- *
- * Revision 1.36.4.18  1996/07/25 18:57:31  bentson
- * shift MOD_INC_USE_COUNT location to match
- * serial.c; purge some diagnostic messages;
- *
- * Revision 1.36.4.17  1996/07/25 18:01:08  bentson
- * enable modem status messages and fetch & process them; note
- * time of last activity type for each port; set_line_char now
- * supports more than line 0 and treats 0 baud correctly;
- * get_modem_info senses rs_status;
- *
- * Revision 1.36.4.16  1996/07/20 08:43:15  bentson
- * barely works--now's time to turn on
- * more features 'til it breaks
- *
- * Revision 1.36.4.15  1996/07/19 22:30:06  bentson
- * check more -Z board status; shorten boot message
- *
- * Revision 1.36.4.14  1996/07/19 22:20:37  bentson
- * fix reference to ch_ctrl in startup; verify return
- * values from cyz_issue_cmd and cyz_update_channel;
- * more stuff to get modem control correct;
- *
- * Revision 1.36.4.13  1996/07/11 19:53:33  bentson
- * more -Z stuff folded in; re-order changes to put -Z stuff
- * after -Y stuff (to make changes clearer)
- *
- * Revision 1.36.4.12  1996/07/11 15:40:55  bentson
- * Add code to poll Cyclades-Z.  Add code to get & set RS-232 control.
- * Add code to send break.  Clear firmware ID word at startup (so
- * that other code won't talk to inactive board).
- *
- * Revision 1.36.4.11  1996/07/09 05:28:29  bentson
- * add code for -Z in set_line_char
- *
- * Revision 1.36.4.10  1996/07/08 19:28:37  bentson
- * fold more -Z stuff (or in some cases, error messages)
- * into driver; add text to "don't know what to do" messages.
- *
- * Revision 1.36.4.9  1996/07/08 18:38:38  bentson
- * moved compile-time flags near top of file; cosmetic changes
- * to narrow text (to allow 2-up printing); changed many declarations
- * to "static" to limit external symbols; shuffled code order to
- * coalesce -Y and -Z specific code, also to put internal functions
- * in order of tty_driver structure; added code to recognize -Z
- * ports (and for moment, do nothing or report error); add cy_startup
- * to parse boot command line for extra base addresses for ISA probes;
- *
- * Revision 1.36.4.8  1996/06/25 17:40:19  bentson
- * reorder some code, fix types of some vars (int vs. long),
- * add cy_setup to support user declared ISA addresses
- *
- * Revision 1.36.4.7  1996/06/21 23:06:18  bentson
- * dump ioctl based firmware load (it's now a user level
- * program); ensure uninitialzed ports cannot be used
- *
- * Revision 1.36.4.6  1996/06/20 23:17:19  bentson
- * rename vars and restructure some code
- *
- * Revision 1.36.4.5  1996/06/14 15:09:44  bentson
- * get right status back after boot load
- *
- * Revision 1.36.4.4  1996/06/13 19:51:44  bentson
- * successfully loads firmware
- *
- * Revision 1.36.4.3  1996/06/13 06:08:33  bentson
- * add more of the code for the boot/load ioctls
- *
- * Revision 1.36.4.2  1996/06/11 21:00:51  bentson
- * start to add Z functionality--starting with ioctl
- * for loading firmware
- *
- * Revision 1.36.4.1  1996/06/10 18:03:02  bentson
- * added code to recognize Z/PCI card at initialization; report
- * presence, but card is not initialized (because firmware needs
- * to be loaded)
- *
- * Revision 1.36.3.8  1996/06/07 16:29:00  bentson
- * starting minor number at zero; added missing verify_area
- * as noted by Heiko Eißfeldt <heiko@colossus.escape.de>
- *
- * Revision 1.36.3.7  1996/04/19 21:06:18  bentson
- * remove unneeded boot message & fix CLOCAL hardware flow
- * control (Miquel van Smoorenburg <miquels@Q.cistron.nl>);
- * remove unused diagnostic statements; minor 0 is first;
- *
- * Revision 1.36.3.6  1996/03/13 13:21:17  marcio
- * The kernel function vremap (available only in later 1.3.xx kernels)
- * allows the access to memory addresses above the RAM. This revision
- * of the driver supports PCI boards below 1Mb (device id 0x100) and
- * above 1Mb (device id 0x101).
- *
- * Revision 1.36.3.5  1996/03/07 15:20:17  bentson
- * Some global changes to interrupt handling spilled into
- * this driver--mostly unused arguments in system function
- * calls.  Also added change by Marcio Saito which should
- * reduce lost interrupts at startup by fast processors.
- *
- * Revision 1.36.3.4  1995/11/13  20:45:10  bentson
- * Changes by Corey Minyard <minyard@wf-rch.cirr.com> distributed
- * in 1.3.41 kernel to remove a possible race condition, extend
- * some error messages, and let the driver run as a loadable module
- * Change by Alan Wendt <alan@ez0.ezlink.com> to remove a
- * possible race condition.
- * Change by Marcio Saito <marcio@cyclades.com> to fix PCI addressing.
- *
- * Revision 1.36.3.3  1995/11/13  19:44:48  bentson
- * Changes by Linus Torvalds in 1.3.33 kernel distribution
- * required due to reordering of driver initialization.
- * Drivers are now initialized *after* memory management.
- *
- * Revision 1.36.3.2  1995/09/08  22:07:14  bentson
- * remove printk from ISR; fix typo
- *
- * Revision 1.36.3.1  1995/09/01  12:00:42  marcio
- * Minor fixes in the PCI board support. PCI function calls in
- * conditional compilation (CONFIG_PCI). Thanks to Jim Duncan
- * <duncan@okay.com>. "bad serial count" message removed.
- *
- * Revision 1.36.3  1995/08/22  09:19:42  marcio
- * Cyclom-Y/PCI support added. Changes in the cy_init routine and
- * board initialization. Changes in the boot messages. The driver
- * supports up to 4 boards and 64 ports by default.
- *
- * Revision 1.36.1.4  1995/03/29  06:14:14  bentson
- * disambiguate between Cyclom-16Y and Cyclom-32Ye;
- *
- * Revision 1.36.1.3  1995/03/23  22:15:35  bentson
- * add missing break in modem control block in ioctl switch statement
- * (discovered by Michael Edward Chastain <mec@jobe.shell.portal.com>);
- *
- * Revision 1.36.1.2  1995/03/22  19:16:22  bentson
- * make sure CTS flow control is set as soon as possible (thanks
- * to note from David Lambert <lambert@chesapeake.rps.slb.com>);
- *
- * Revision 1.36.1.1  1995/03/13  15:44:43  bentson
- * initialize defaults for receive threshold and stale data timeout;
- * cosmetic changes;
- *
- * Revision 1.36  1995/03/10  23:33:53  bentson
- * added support of chips 4-7 in 32 port Cyclom-Ye;
- * fix cy_interrupt pointer dereference problem
- * (Joe Portman <baron@aa.net>);
- * give better error response if open is attempted on non-existent port
- * (Zachariah Vaum <jchryslr@netcom.com>);
- * correct command timeout (Kenneth Lerman <lerman@@seltd.newnet.com>);
- * conditional compilation for -16Y on systems with fast, noisy bus;
- * comment out diagnostic print function;
- * cleaned up table of base addresses;
- * set receiver time-out period register to correct value,
- * set receive threshold to better default values,
- * set chip timer to more accurate 200 Hz ticking,
- * add code to monitor and modify receive parameters
- * (Rik Faith <faith@cs.unc.edu> Nick Simicich
- * <njs@scifi.emi.net>);
- *
- * Revision 1.35  1994/12/16  13:54:18  steffen
- * additional patch by Marcio Saito for board detection
- * Accidently left out in 1.34
- *
- * Revision 1.34  1994/12/10  12:37:12  steffen
- * This is the corrected version as suggested by Marcio Saito
- *
- * Revision 1.33  1994/12/01  22:41:18  bentson
- * add hooks to support more high speeds directly; add tytso
- * patch regarding CLOCAL wakeups
- *
- * Revision 1.32  1994/11/23  19:50:04  bentson
- * allow direct kernel control of higher signalling rates;
- * look for cards at additional locations
- *
- * Revision 1.31  1994/11/16  04:33:28  bentson
- * ANOTHER fix from Corey Minyard, minyard@wf-rch.cirr.com--
- * a problem in chars_in_buffer has been resolved by some
- * small changes;  this should yield smoother output
- *
- * Revision 1.30  1994/11/16  04:28:05  bentson
- * Fix from Corey Minyard, Internet: minyard@metronet.com,
- * UUCP: minyard@wf-rch.cirr.com, WORK: minyardbnr.ca, to
- * cy_hangup that appears to clear up much (all?) of the
- * DTR glitches; also he's added/cleaned-up diagnostic messages
- *
- * Revision 1.29  1994/11/16  04:16:07  bentson
- * add change proposed by Ralph Sims, ralphs@halcyon.com, to
- * operate higher speeds in same way as other serial ports;
- * add more serial ports (for up to two 16-port muxes).
- *
- * Revision 1.28  1994/11/04  00:13:16  root
- * turn off diagnostic messages
- *
- * Revision 1.27  1994/11/03  23:46:37  root
- * bunch of changes to bring driver into greater conformance
- * with the serial.c driver (looking for missed fixes)
- *
- * Revision 1.26  1994/11/03  22:40:36  root
- * automatic interrupt probing fixed.
- *
- * Revision 1.25  1994/11/03  20:17:02  root
- * start to implement auto-irq
- *
- * Revision 1.24  1994/11/03  18:01:55  root
- * still working on modem signals--trying not to drop DTR
- * during the getty/login processes
- *
- * Revision 1.23  1994/11/03  17:51:36  root
- * extend baud rate support; set receive threshold as function
- * of baud rate; fix some problems with RTS/CTS;
- *
- * Revision 1.22  1994/11/02  18:05:35  root
- * changed arguments to udelay to type long to get
- * delays to be of correct duration
- *
- * Revision 1.21  1994/11/02  17:37:30  root
- * employ udelay (after calibrating loops_per_second earlier
- * in init/main.c) instead of using home-grown delay routines
- *
- * Revision 1.20  1994/11/02  03:11:38  root
- * cy_chars_in_buffer forces a return value of 0 to let
- * login work (don't know why it does); some functions
- * that were returning EFAULT, now executes the code;
- * more work on deciding when to disable xmit interrupts;
- *
- * Revision 1.19  1994/11/01  20:10:14  root
- * define routine to start transmission interrupts (by enabling
- * transmit interrupts); directly enable/disable modem interrupts;
- *
- * Revision 1.18  1994/11/01  18:40:45  bentson
- * Don't always enable transmit interrupts in startup; interrupt on
- * TxMpty instead of TxRdy to help characters get out before shutdown;
- * restructure xmit interrupt to check for chars first and quit if
- * none are ready to go; modem status (MXVRx) is upright, _not_ inverted
- * (to my view);
- *
- * Revision 1.17  1994/10/30  04:39:45  bentson
- * rename serial_driver and callout_driver to cy_serial_driver and
- * cy_callout_driver to avoid linkage interference; initialize
- * info->type to PORT_CIRRUS; ruggedize paranoia test; elide ->port
- * from cyclades_port structure; add paranoia check to cy_close;
- *
- * Revision 1.16  1994/10/30  01:14:33  bentson
- * change major numbers; add some _early_ return statements;
- *
- * Revision 1.15  1994/10/29  06:43:15  bentson
- * final tidying up for clean compile;  enable some error reporting
- *
- * Revision 1.14  1994/10/28  20:30:22  Bentson
- * lots of changes to drag the driver towards the new tty_io
- * structures and operation.  not expected to work, but may
- * compile cleanly.
- *
- * Revision 1.13  1994/07/21  23:08:57  Bentson
- * add some diagnostic cruft; support 24 lines (for testing
- * both -8Y and -16Y cards; be more thorough in servicing all
- * chips during interrupt; add "volatile" a few places to
- * circumvent compiler optimizations; fix base & offset
- * computations in block_til_ready (was causing chip 0 to
- * stop operation)
- *
- * Revision 1.12  1994/07/19  16:42:11  Bentson
- * add some hackery for kernel version 1.1.8; expand
- * error messages; refine timing for delay loops and
- * declare loop params volatile
- *
- * Revision 1.11  1994/06/11  21:53:10  bentson
- * get use of save_car right in transmit interrupt service
- *
- * Revision 1.10.1.1  1994/06/11  21:31:18  bentson
- * add some diagnostic printing; try to fix save_car stuff
- *
- * Revision 1.10  1994/06/11  20:36:08  bentson
- * clean up compiler warnings
- *
- * Revision 1.9  1994/06/11  19:42:46  bentson
- * added a bunch of code to support modem signalling
- *
- * Revision 1.8  1994/06/11  17:57:07  bentson
- * recognize break & parity error
- *
- * Revision 1.7  1994/06/05  05:51:34  bentson
- * Reorder baud table to be monotonic; add cli to CP; discard
- * incoming characters and status if the line isn't open; start to
- * fold code into cy_throttle; start to port get_serial_info,
- * set_serial_info, get_modem_info, set_modem_info, and send_break
- * from serial.c; expand cy_ioctl; relocate and expand config_setup;
- * get flow control characters from tty struct; invalidate ports w/o
- * hardware;
- *
- * Revision 1.6  1994/05/31  18:42:21  bentson
- * add a loop-breaker in the interrupt service routine;
- * note when port is initialized so that it can be shut
- * down under the right conditions; receive works without
- * any obvious errors
- *
- * Revision 1.5  1994/05/30  00:55:02  bentson
- * transmit works without obvious errors
- *
- * Revision 1.4  1994/05/27  18:46:27  bentson
- * incorporated more code from lib_y.c; can now print short
- * strings under interrupt control to port zero; seems to
- * select ports/channels/lines correctly
- *
- * Revision 1.3  1994/05/25  22:12:44  bentson
- * shifting from multi-port on a card to proper multiplexor
- * data structures;  added skeletons of most routines
- *
- * Revision 1.2  1994/05/19  13:21:43  bentson
- * start to crib from other sources
- *
  */
 
-#define CY_VERSION     "2.5"
+#define CY_VERSION     "2.6"
 
 /* If you need to install more boards than NR_CARDS, change the constant
    in the definition below. No other change is necessary to support up to
 #include <linux/firmware.h>
 #include <linux/device.h>
 
-#include <asm/system.h>
 #include <linux/io.h>
-#include <asm/irq.h>
 #include <linux/uaccess.h>
 
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
-static void cy_throttle(struct tty_struct *tty);
 static void cy_send_xchar(struct tty_struct *tty, char ch);
 
 #ifndef SERIAL_XMIT_SIZE
 #define        SERIAL_XMIT_SIZE        (min(PAGE_SIZE, 4096))
 #endif
-#define WAKEUP_CHARS           256
 
 #define STD_COM_FLAGS (0)
 
@@ -756,25 +184,25 @@ static int cy_next_channel;       /* next minor available */
  *                                               HI            VHI
  *     20
  */
-static int baud_table[] = {
+static const int baud_table[] = {
        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200,
        1800, 2400, 4800, 9600, 19200, 38400, 57600, 76800, 115200, 150000,
        230400, 0
 };
 
-static char baud_co_25[] = {   /* 25 MHz clock option table */
+static const char baud_co_25[] = {     /* 25 MHz clock option table */
        /* value =>    00    01   02    03    04 */
        /* divide by    8    32   128   512  2048 */
        0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x02,
        0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static char baud_bpr_25[] = {  /* 25 MHz baud rate period table */
+static const char baud_bpr_25[] = {    /* 25 MHz baud rate period table */
        0x00, 0xf5, 0xa3, 0x6f, 0x5c, 0x51, 0xf5, 0xa3, 0x51, 0xa3,
        0x6d, 0x51, 0xa3, 0x51, 0xa3, 0x51, 0x36, 0x29, 0x1b, 0x15
 };
 
-static char baud_co_60[] = {   /* 60 MHz clock option table (CD1400 J) */
+static const char baud_co_60[] = {     /* 60 MHz clock option table (CD1400 J) */
        /* value =>    00    01   02    03    04 */
        /* divide by    8    32   128   512  2048 */
        0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03,
@@ -782,13 +210,13 @@ static char baud_co_60[] = {      /* 60 MHz clock option table (CD1400 J) */
        0x00
 };
 
-static char baud_bpr_60[] = {  /* 60 MHz baud rate period table (CD1400 J) */
+static const char baud_bpr_60[] = {    /* 60 MHz baud rate period table (CD1400 J) */
        0x00, 0x82, 0x21, 0xff, 0xdb, 0xc3, 0x92, 0x62, 0xc3, 0x62,
        0x41, 0xc3, 0x62, 0xc3, 0x62, 0xc3, 0x82, 0x62, 0x41, 0x32,
        0x21
 };
 
-static char baud_cor3[] = {    /* receive threshold */
+static const char baud_cor3[] = {      /* receive threshold */
        0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
        0x0a, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x07,
        0x07
@@ -805,7 +233,7 @@ static char baud_cor3[] = { /* receive threshold */
  * cables.
  */
 
-static char rflow_thr[] = {    /* rflow threshold */
+static const char rflow_thr[] = {      /* rflow threshold */
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
        0x0a
@@ -814,7 +242,7 @@ static char rflow_thr[] = { /* rflow threshold */
 /*  The Cyclom-Ye has placed the sequential chips in non-sequential
  *  address order.  This look-up table overcomes that problem.
  */
-static int cy_chip_offset[] = { 0x0000,
+static const unsigned int cy_chip_offset[] = { 0x0000,
        0x0400,
        0x0800,
        0x0C00,
@@ -827,7 +255,7 @@ static int cy_chip_offset[] = { 0x0000,
 /* PCI related definitions */
 
 #ifdef CONFIG_PCI
-static struct pci_device_id cy_pci_dev_id[] __devinitdata = {
+static const struct pci_device_id cy_pci_dev_id[] = {
        /* PCI < 1Mb */
        { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) },
        /* PCI > 1Mb */
@@ -850,7 +278,7 @@ MODULE_DEVICE_TABLE(pci, cy_pci_dev_id);
 #endif
 
 static void cy_start(struct tty_struct *);
-static void set_line_char(struct cyclades_port *);
+static void cy_set_line_char(struct cyclades_port *, struct tty_struct *);
 static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);
 #ifdef CONFIG_ISA
 static unsigned detect_isa_irq(void __iomem *);
@@ -869,6 +297,20 @@ static void cyz_rx_restart(unsigned long);
 static struct timer_list cyz_rx_full_timer[NR_PORTS];
 #endif                         /* CONFIG_CYZ_INTR */
 
+static inline void cyy_writeb(struct cyclades_port *port, u32 reg, u8 val)
+{
+       struct cyclades_card *card = port->card;
+
+       cy_writeb(port->u.cyy.base_addr + (reg << card->bus_index), val);
+}
+
+static inline u8 cyy_readb(struct cyclades_port *port, u32 reg)
+{
+       struct cyclades_card *card = port->card;
+
+       return readb(port->u.cyy.base_addr + (reg << card->bus_index));
+}
+
 static inline bool cy_is_Z(struct cyclades_card *card)
 {
        return card->num_chips == (unsigned int)-1;
@@ -893,7 +335,7 @@ static inline bool cyz_is_loaded(struct cyclades_card *card)
 }
 
 static inline int serial_paranoia_check(struct cyclades_port *info,
-               char *name, const char *routine)
+               const char *name, const char *routine)
 {
 #ifdef SERIAL_PARANOIA_CHECK
        if (!info) {
@@ -909,7 +351,7 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
        }
 #endif
        return 0;
-}                              /* serial_paranoia_check */
+}
 
 /***********************************************************/
 /********* Start of block of Cyclom-Y specific code ********/
@@ -921,13 +363,14 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
 
    This function is only called from inside spinlock-protected code.
  */
-static int cyy_issue_cmd(void __iomem *base_addr, u_char cmd, int index)
+static int __cyy_issue_cmd(void __iomem *base_addr, u8 cmd, int index)
 {
+       void __iomem *ccr = base_addr + (CyCCR << index);
        unsigned int i;
 
        /* Check to see that the previous command has completed */
        for (i = 0; i < 100; i++) {
-               if (readb(base_addr + (CyCCR << index)) == 0)
+               if (readb(ccr) == 0)
                        break;
                udelay(10L);
        }
@@ -937,10 +380,16 @@ static int cyy_issue_cmd(void __iomem *base_addr, u_char cmd, int index)
                return -1;
 
        /* Issue the new command */
-       cy_writeb(base_addr + (CyCCR << index), cmd);
+       cy_writeb(ccr, cmd);
 
        return 0;
-}                              /* cyy_issue_cmd */
+}
+
+static inline int cyy_issue_cmd(struct cyclades_port *port, u8 cmd)
+{
+       return __cyy_issue_cmd(port->u.cyy.base_addr, cmd,
+                       port->card->bus_index);
+}
 
 #ifdef CONFIG_ISA
 /* ISA interrupt detection code */
@@ -960,12 +409,12 @@ static unsigned detect_isa_irq(void __iomem *address)
 
        irqs = probe_irq_on();
        /* Wait ... */
-       udelay(5000L);
+       msleep(5);
 
        /* Enable the Tx interrupts on the CD1400 */
        local_irq_save(flags);
        cy_writeb(address + (CyCAR << index), 0);
-       cyy_issue_cmd(address, CyCHAN_CTL | CyENB_XMTR, index);
+       __cyy_issue_cmd(address, CyCHAN_CTL | CyENB_XMTR, index);
 
        cy_writeb(address + (CyCAR << index), 0);
        cy_writeb(address + (CySRER << index),
@@ -973,7 +422,7 @@ static unsigned detect_isa_irq(void __iomem *address)
        local_irq_restore(flags);
 
        /* Wait ... */
-       udelay(5000L);
+       msleep(5);
 
        /* Check which interrupt is in use */
        irq = probe_irq_off(irqs);
@@ -999,7 +448,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
        struct cyclades_port *info;
        struct tty_struct *tty;
        int len, index = cinfo->bus_index;
-       u8 save_xir, channel, save_car, data, char_count;
+       u8 ivr, save_xir, channel, save_car, data, char_count;
 
 #ifdef CY_DEBUG_INTERRUPTS
        printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
@@ -1008,26 +457,25 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
        save_xir = readb(base_addr + (CyRIR << index));
        channel = save_xir & CyIRChannel;
        info = &cinfo->ports[channel + chip * 4];
-       save_car = readb(base_addr + (CyCAR << index));
-       cy_writeb(base_addr + (CyCAR << index), save_xir);
+       save_car = cyy_readb(info, CyCAR);
+       cyy_writeb(info, CyCAR, save_xir);
+       ivr = cyy_readb(info, CyRIVR) & CyIVRMask;
 
+       tty = tty_port_tty_get(&info->port);
        /* if there is nowhere to put the data, discard it */
-       if (info->port.tty == NULL) {
-               if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
-                               CyIVRRxEx) {    /* exception */
-                       data = readb(base_addr + (CyRDSR << index));
+       if (tty == NULL) {
+               if (ivr == CyIVRRxEx) { /* exception */
+                       data = cyy_readb(info, CyRDSR);
                } else {        /* normal character reception */
-                       char_count = readb(base_addr + (CyRDCR << index));
+                       char_count = cyy_readb(info, CyRDCR);
                        while (char_count--)
-                               data = readb(base_addr + (CyRDSR << index));
+                               data = cyy_readb(info, CyRDSR);
                }
                goto end;
        }
        /* there is an open port for this data */
-       tty = info->port.tty;
-       if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
-                       CyIVRRxEx) {    /* exception */
-               data = readb(base_addr + (CyRDSR << index));
+       if (ivr == CyIVRRxEx) { /* exception */
+               data = cyy_readb(info, CyRDSR);
 
                /* For statistics only */
                if (data & CyBREAK)
@@ -1041,28 +489,29 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
 
                if (data & info->ignore_status_mask) {
                        info->icount.rx++;
+                       tty_kref_put(tty);
                        return;
                }
                if (tty_buffer_request_room(tty, 1)) {
                        if (data & info->read_status_mask) {
                                if (data & CyBREAK) {
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_BREAK);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_BREAK);
                                        info->icount.rx++;
                                        if (info->port.flags & ASYNC_SAK)
                                                do_SAK(tty);
                                } else if (data & CyFRAME) {
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_FRAME);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_FRAME);
                                        info->icount.rx++;
                                        info->idle_stats.frame_errs++;
                                } else if (data & CyPARITY) {
                                        /* Pieces of seven... */
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_PARITY);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_PARITY);
                                        info->icount.rx++;
                                        info->idle_stats.parity_errs++;
                                } else if (data & CyOVERRUN) {
@@ -1074,8 +523,8 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                                           the next incoming character.
                                         */
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_FRAME);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_FRAME);
                                        info->icount.rx++;
                                        info->idle_stats.overruns++;
                                /* These two conditions may imply */
@@ -1099,7 +548,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                }
        } else {        /* normal character reception */
                /* load # chars available from the chip */
-               char_count = readb(base_addr + (CyRDCR << index));
+               char_count = cyy_readb(info, CyRDCR);
 
 #ifdef CY_ENABLE_MONITORING
                ++info->mon.int_count;
@@ -1110,7 +559,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
 #endif
                len = tty_buffer_request_room(tty, char_count);
                while (len--) {
-                       data = readb(base_addr + (CyRDSR << index));
+                       data = cyy_readb(info, CyRDSR);
                        tty_insert_flip_char(tty, data, TTY_NORMAL);
                        info->idle_stats.recv_bytes++;
                        info->icount.rx++;
@@ -1121,16 +570,18 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                info->idle_stats.recv_idle = jiffies;
        }
        tty_schedule_flip(tty);
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyRIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyRIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                void __iomem *base_addr)
 {
        struct cyclades_port *info;
+       struct tty_struct *tty;
        int char_count, index = cinfo->bus_index;
        u8 save_xir, channel, save_car, outch;
 
@@ -1154,9 +605,9 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                goto end;
        }
        info = &cinfo->ports[channel + chip * 4];
-       if (info->port.tty == NULL) {
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+       tty = tty_port_tty_get(&info->port);
+       if (tty == NULL) {
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
                goto end;
        }
 
@@ -1165,7 +616,7 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        if (info->x_char) {     /* send special char */
                outch = info->x_char;
-               cy_writeb(base_addr + (CyTDR << index), outch);
+               cyy_writeb(info, CyTDR, outch);
                char_count--;
                info->icount.tx++;
                info->x_char = 0;
@@ -1173,14 +624,14 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        if (info->breakon || info->breakoff) {
                if (info->breakon) {
-                       cy_writeb(base_addr + (CyTDR << index), 0);
-                       cy_writeb(base_addr + (CyTDR << index), 0x81);
+                       cyy_writeb(info, CyTDR, 0);
+                       cyy_writeb(info, CyTDR, 0x81);
                        info->breakon = 0;
                        char_count -= 2;
                }
                if (info->breakoff) {
-                       cy_writeb(base_addr + (CyTDR << index), 0);
-                       cy_writeb(base_addr + (CyTDR << index), 0x83);
+                       cyy_writeb(info, CyTDR, 0);
+                       cyy_writeb(info, CyTDR, 0x83);
                        info->breakoff = 0;
                        char_count -= 2;
                }
@@ -1188,27 +639,23 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        while (char_count-- > 0) {
                if (!info->xmit_cnt) {
-                       if (readb(base_addr + (CySRER << index)) & CyTxMpty) {
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) &
-                                               ~CyTxMpty);
+                       if (cyy_readb(info, CySRER) & CyTxMpty) {
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) & ~CyTxMpty);
                        } else {
-                               cy_writeb(base_addr + (CySRER << index),
-                                       (readb(base_addr + (CySRER << index)) &
-                                               ~CyTxRdy) | CyTxMpty);
+                               cyy_writeb(info, CySRER, CyTxMpty |
+                                       (cyy_readb(info, CySRER) & ~CyTxRdy));
                        }
                        goto done;
                }
                if (info->port.xmit_buf == NULL) {
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) &
-                                       ~CyTxRdy);
+                       cyy_writeb(info, CySRER,
+                               cyy_readb(info, CySRER) & ~CyTxRdy);
                        goto done;
                }
-               if (info->port.tty->stopped || info->port.tty->hw_stopped) {
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) &
-                                       ~CyTxRdy);
+               if (tty->stopped || tty->hw_stopped) {
+                       cyy_writeb(info, CySRER,
+                               cyy_readb(info, CySRER) & ~CyTxRdy);
                        goto done;
                }
                /* Because the Embedded Transmit Commands have been enabled,
@@ -1225,15 +672,15 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                        info->xmit_cnt--;
                        info->xmit_tail = (info->xmit_tail + 1) &
                                        (SERIAL_XMIT_SIZE - 1);
-                       cy_writeb(base_addr + (CyTDR << index), outch);
+                       cyy_writeb(info, CyTDR, outch);
                        info->icount.tx++;
                } else {
                        if (char_count > 1) {
                                info->xmit_cnt--;
                                info->xmit_tail = (info->xmit_tail + 1) &
                                        (SERIAL_XMIT_SIZE - 1);
-                               cy_writeb(base_addr + (CyTDR << index), outch);
-                               cy_writeb(base_addr + (CyTDR << index), 0);
+                               cyy_writeb(info, CyTDR, outch);
+                               cyy_writeb(info, CyTDR, 0);
                                info->icount.tx++;
                                char_count--;
                        }
@@ -1241,17 +688,19 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
        }
 
 done:
-       tty_wakeup(info->port.tty);
+       tty_wakeup(tty);
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyTIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyTIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                void __iomem *base_addr)
 {
        struct cyclades_port *info;
+       struct tty_struct *tty;
        int index = cinfo->bus_index;
        u8 save_xir, channel, save_car, mdm_change, mdm_status;
 
@@ -1259,13 +708,14 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
        save_xir = readb(base_addr + (CyMIR << index));
        channel = save_xir & CyIRChannel;
        info = &cinfo->ports[channel + chip * 4];
-       save_car = readb(base_addr + (CyCAR << index));
-       cy_writeb(base_addr + (CyCAR << index), save_xir);
+       save_car = cyy_readb(info, CyCAR);
+       cyy_writeb(info, CyCAR, save_xir);
 
-       mdm_change = readb(base_addr + (CyMISR << index));
-       mdm_status = readb(base_addr + (CyMSVR1 << index));
+       mdm_change = cyy_readb(info, CyMISR);
+       mdm_status = cyy_readb(info, CyMSVR1);
 
-       if (!info->port.tty)
+       tty = tty_port_tty_get(&info->port);
+       if (!tty)
                goto end;
 
        if (mdm_change & CyANY_DELTA) {
@@ -1279,35 +729,32 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                if (mdm_change & CyRI)
                        info->icount.rng++;
 
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
        }
 
        if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
-               if (!(mdm_status & CyDCD)) {
-                       tty_hangup(info->port.tty);
-                       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-               }
-               wake_up_interruptible(&info->port.open_wait);
+               if (mdm_status & CyDCD)
+                       wake_up_interruptible(&info->port.open_wait);
+               else
+                       tty_hangup(tty);
        }
        if ((mdm_change & CyCTS) && (info->port.flags & ASYNC_CTS_FLOW)) {
-               if (info->port.tty->hw_stopped) {
+               if (tty->hw_stopped) {
                        if (mdm_status & CyCTS) {
                                /* cy_start isn't used
                                   because... !!! */
-                               info->port.tty->hw_stopped = 0;
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) |
-                                               CyTxRdy);
-                               tty_wakeup(info->port.tty);
+                               tty->hw_stopped = 0;
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) | CyTxRdy);
+                               tty_wakeup(tty);
                        }
                } else {
                        if (!(mdm_status & CyCTS)) {
                                /* cy_stop isn't used
                                   because ... !!! */
-                               info->port.tty->hw_stopped = 1;
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) &
-                                               ~CyTxRdy);
+                               tty->hw_stopped = 1;
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) & ~CyTxRdy);
                        }
                }
        }
@@ -1315,10 +762,11 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
        }
        if (mdm_change & CyRI) {
        }*/
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyMIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyMIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 /* The real interrupt service routine is called
@@ -1389,6 +837,56 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }                              /* cyy_interrupt */
 
+static void cyy_change_rts_dtr(struct cyclades_port *info, unsigned int set,
+               unsigned int clear)
+{
+       struct cyclades_card *card = info->card;
+       int channel = info->line - card->first_line;
+       u32 rts, dtr, msvrr, msvrd;
+
+       channel &= 0x03;
+
+       if (info->rtsdtr_inv) {
+               msvrr = CyMSVR2;
+               msvrd = CyMSVR1;
+               rts = CyDTR;
+               dtr = CyRTS;
+       } else {
+               msvrr = CyMSVR1;
+               msvrd = CyMSVR2;
+               rts = CyRTS;
+               dtr = CyDTR;
+       }
+       if (set & TIOCM_RTS) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrr, rts);
+       }
+       if (clear & TIOCM_RTS) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrr, ~rts);
+       }
+       if (set & TIOCM_DTR) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrd, dtr);
+#ifdef CY_DEBUG_DTR
+               printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
+               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                       cyy_readb(info, CyMSVR1),
+                       cyy_readb(info, CyMSVR2));
+#endif
+       }
+       if (clear & TIOCM_DTR) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrd, ~dtr);
+#ifdef CY_DEBUG_DTR
+               printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
+               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                       cyy_readb(info, CyMSVR1),
+                       cyy_readb(info, CyMSVR2));
+#endif
+       }
+}
+
 /***********************************************************/
 /********* End of block of Cyclom-Y specific code **********/
 /******** Start of block of Cyclades-Z specific code *******/
@@ -1398,15 +896,9 @@ static int
 cyz_fetch_msg(struct cyclades_card *cinfo,
                __u32 *channel, __u8 *cmd, __u32 *param)
 {
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        unsigned long loc_doorbell;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
-
        loc_doorbell = readl(&cinfo->ctl_addr.p9060->loc_doorbell);
        if (loc_doorbell) {
                *cmd = (char)(0xff & loc_doorbell);
@@ -1422,19 +914,13 @@ static int
 cyz_issue_cmd(struct cyclades_card *cinfo,
                __u32 channel, __u8 cmd, __u32 param)
 {
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        __u32 __iomem *pci_doorbell;
        unsigned int index;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
        if (!cyz_is_loaded(cinfo))
                return -1;
 
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
-
        index = 0;
        pci_doorbell = &cinfo->ctl_addr.p9060->pci_doorbell;
        while ((readl(pci_doorbell) & 0xff) != 0) {
@@ -1449,11 +935,10 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
        return 0;
 }                              /* cyz_issue_cmd */
 
-static void cyz_handle_rx(struct cyclades_port *info,
-               struct BUF_CTRL __iomem *buf_ctrl)
+static void cyz_handle_rx(struct cyclades_port *info, struct tty_struct *tty)
 {
+       struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
        struct cyclades_card *cinfo = info->card;
-       struct tty_struct *tty = info->port.tty;
        unsigned int char_count;
        int len;
 #ifdef BLOCKMOVE
@@ -1542,11 +1027,10 @@ static void cyz_handle_rx(struct cyclades_port *info,
        }
 }
 
-static void cyz_handle_tx(struct cyclades_port *info,
-               struct BUF_CTRL __iomem *buf_ctrl)
+static void cyz_handle_tx(struct cyclades_port *info, struct tty_struct *tty)
 {
+       struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
        struct cyclades_card *cinfo = info->card;
-       struct tty_struct *tty = info->port.tty;
        u8 data;
        unsigned int char_count;
 #ifdef BLOCKMOVE
@@ -1621,34 +1105,24 @@ ztxdone:
 
 static void cyz_handle_cmd(struct cyclades_card *cinfo)
 {
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        struct tty_struct *tty;
        struct cyclades_port *info;
-       static struct FIRM_ID __iomem *firm_id;
-       static struct ZFW_CTRL __iomem *zfw_ctrl;
-       static struct BOARD_CTRL __iomem *board_ctrl;
-       static struct CH_CTRL __iomem *ch_ctrl;
-       static struct BUF_CTRL __iomem *buf_ctrl;
        __u32 channel, param, fw_ver;
        __u8 cmd;
        int special_count;
        int delta_count;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
        fw_ver = readl(&board_ctrl->fw_version);
 
        while (cyz_fetch_msg(cinfo, &channel, &cmd, &param) == 1) {
                special_count = 0;
                delta_count = 0;
                info = &cinfo->ports[channel];
-               tty = info->port.tty;
+               tty = tty_port_tty_get(&info->port);
                if (tty == NULL)
                        continue;
 
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-               buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
-
                switch (cmd) {
                case C_CM_PR_ERROR:
                        tty_insert_flip_char(tty, 0, TTY_PARITY);
@@ -1669,15 +1143,12 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        info->icount.dcd++;
                        delta_count++;
                        if (info->port.flags & ASYNC_CHECK_CD) {
-                               if ((fw_ver > 241 ? ((u_long) param) :
-                                               readl(&ch_ctrl->rs_status)) &
-                                               C_RS_DCD) {
-                                       wake_up_interruptible(&info->port.open_wait);
-                               } else {
-                                       tty_hangup(info->port.tty);
+                               u32 dcd = fw_ver > 241 ? param :
+                                       readl(&info->u.cyz.ch_ctrl->rs_status);
+                               if (dcd & C_RS_DCD)
                                        wake_up_interruptible(&info->port.open_wait);
-                                       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-                               }
+                               else
+                                       tty_hangup(tty);
                        }
                        break;
                case C_CM_MCTS:
@@ -1706,7 +1177,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        printk(KERN_DEBUG "cyz_interrupt: rcvd intr, card %d, "
                                        "port %ld\n", info->card, channel);
 #endif
-                       cyz_handle_rx(info, buf_ctrl);
+                       cyz_handle_rx(info, tty);
                        break;
                case C_CM_TXBEMPTY:
                case C_CM_TXLOWWM:
@@ -1716,7 +1187,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        printk(KERN_DEBUG "cyz_interrupt: xmit intr, card %d, "
                                        "port %ld\n", info->card, channel);
 #endif
-                       cyz_handle_tx(info, buf_ctrl);
+                       cyz_handle_tx(info, tty);
                        break;
 #endif                         /* CONFIG_CYZ_INTR */
                case C_CM_FATAL:
@@ -1726,9 +1197,10 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        break;
                }
                if (delta_count)
-                       wake_up_interruptible(&info->delta_msr_wait);
+                       wake_up_interruptible(&info->port.delta_msr_wait);
                if (special_count)
                        tty_schedule_flip(tty);
+               tty_kref_put(tty);
        }
 }
 
@@ -1774,10 +1246,6 @@ static void cyz_poll(unsigned long arg)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info;
-       struct tty_struct *tty;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BUF_CTRL __iomem *buf_ctrl;
        unsigned long expires = jiffies + HZ;
        unsigned int port, card;
 
@@ -1789,10 +1257,6 @@ static void cyz_poll(unsigned long arg)
                if (!cyz_is_loaded(cinfo))
                        continue;
 
-               firm_id = cinfo->base_addr + ID_ADDRESS;
-               zfw_ctrl = cinfo->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-
        /* Skip first polling cycle to avoid racing conditions with the FW */
                if (!cinfo->intr_enabled) {
                        cinfo->intr_enabled = 1;
@@ -1802,13 +1266,17 @@ static void cyz_poll(unsigned long arg)
                cyz_handle_cmd(cinfo);
 
                for (port = 0; port < cinfo->nports; port++) {
+                       struct tty_struct *tty;
+
                        info = &cinfo->ports[port];
-                       tty = info->port.tty;
-                       buf_ctrl = &(zfw_ctrl->buf_ctrl[port]);
+                       tty = tty_port_tty_get(&info->port);
+                       /* OK to pass NULL to the handle functions below.
+                          They need to drop the data in that case. */
 
                        if (!info->throttle)
-                               cyz_handle_rx(info, buf_ctrl);
-                       cyz_handle_tx(info, buf_ctrl);
+                               cyz_handle_rx(info, tty);
+                       cyz_handle_tx(info, tty);
+                       tty_kref_put(tty);
                }
                /* poll every 'cyz_polling_cycle' period */
                expires = jiffies + cyz_polling_cycle;
@@ -1824,13 +1292,12 @@ static void cyz_poll(unsigned long arg)
 /* This is called whenever a port becomes active;
    interrupts are enabled and DTR & RTS are turned on.
  */
-static int startup(struct cyclades_port *info)
+static int cy_startup(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
        int retval = 0;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long page;
 
        card = info->card;
@@ -1842,15 +1309,11 @@ static int startup(struct cyclades_port *info)
 
        spin_lock_irqsave(&card->card_lock, flags);
 
-       if (info->port.flags & ASYNC_INITIALIZED) {
-               free_page(page);
+       if (info->port.flags & ASYNC_INITIALIZED)
                goto errout;
-       }
 
        if (!info->type) {
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               free_page(page);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                goto errout;
        }
 
@@ -1861,96 +1324,53 @@ static int startup(struct cyclades_port *info)
 
        spin_unlock_irqrestore(&card->card_lock, flags);
 
-       set_line_char(info);
+       cy_set_line_char(info, tty);
 
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
                channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-#ifdef CY_DEBUG_OPEN
-               printk(KERN_DEBUG "cyc startup card %d, chip %d, channel %d, "
-                               "base_addr %p\n",
-                               card, chip, channel, base_addr);
-#endif
                spin_lock_irqsave(&card->card_lock, flags);
 
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
+               cyy_writeb(info, CyCAR, channel);
 
-               cy_writeb(base_addr + (CyRTPR << index),
+               cyy_writeb(info, CyRTPR,
                        (info->default_timeout ? info->default_timeout : 0x02));
                /* 10ms rx timeout */
 
-               cyy_issue_cmd(base_addr, CyCHAN_CTL | CyENB_RCVR | CyENB_XMTR,
-                               index);
-
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CyMSVR1 << index), CyRTS);
-               cy_writeb(base_addr + (CyMSVR2 << index), CyDTR);
+               cyy_issue_cmd(info, CyCHAN_CTL | CyENB_RCVR | CyENB_XMTR);
 
-#ifdef CY_DEBUG_DTR
-               printk(KERN_DEBUG "cyc:startup raising DTR\n");
-               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                       readb(base_addr + (CyMSVR1 << index)),
-                       readb(base_addr + (CyMSVR2 << index)));
-#endif
-
-               cy_writeb(base_addr + (CySRER << index),
-                       readb(base_addr + (CySRER << index)) | CyRxData);
-               info->port.flags |= ASYNC_INITIALIZED;
-
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-               info->breakon = info->breakoff = 0;
-               memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
-               info->idle_stats.in_use =
-               info->idle_stats.recv_idle =
-               info->idle_stats.xmit_idle = jiffies;
-
-               spin_unlock_irqrestore(&card->card_lock, flags);
+               cyy_change_rts_dtr(info, TIOCM_RTS | TIOCM_DTR, 0);
 
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyRxData);
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
 
-               base_addr = card->base_addr;
-
-               firm_id = base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return -ENODEV;
 
-               zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc startup Z card %d, channel %d, "
-                       "base_addr %p\n", card, channel, base_addr);
+                       "base_addr %p\n", card, channel, card->base_addr);
 #endif
                spin_lock_irqsave(&card->card_lock, flags);
 
-               cy_writel(&ch_ctrl[channel].op_mode, C_CH_ENABLE);
+               cy_writel(&ch_ctrl->op_mode, C_CH_ENABLE);
 #ifdef Z_WAKE
 #ifdef CONFIG_CYZ_INTR
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
                          C_IN_RXNNDT | C_IN_IOCTLW | C_IN_MDCD);
 #else
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_IOCTLW | C_IN_MDCD);
 #endif                         /* CONFIG_CYZ_INTR */
 #else
 #ifdef CONFIG_CYZ_INTR
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
                          C_IN_RXNNDT | C_IN_MDCD);
 #else
-               cy_writel(&ch_ctrl[channel].intr_enable, C_IN_MDCD);
+               cy_writel(&ch_ctrl->intr_enable, C_IN_MDCD);
 #endif                         /* CONFIG_CYZ_INTR */
 #endif                         /* Z_WAKE */
 
@@ -1969,32 +1389,22 @@ static int startup(struct cyclades_port *info)
 
                /* set timeout !!! */
                /* set RTS and DTR !!! */
-               cy_writel(&ch_ctrl[channel].rs_control,
-                       readl(&ch_ctrl[channel].rs_control) | C_RS_RTS |
-                       C_RS_DTR);
-               retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
-               if (retval != 0) {
-                       printk(KERN_ERR "cyc:startup(3) retval on ttyC%d was "
-                               "%x\n", info->line, retval);
-               }
-#ifdef CY_DEBUG_DTR
-               printk(KERN_DEBUG "cyc:startup raising Z DTR\n");
-#endif
+               tty_port_raise_dtr_rts(&info->port);
 
                /* enable send, recv, modem !!! */
+       }
 
-               info->port.flags |= ASYNC_INITIALIZED;
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-               info->breakon = info->breakoff = 0;
-               memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
-               info->idle_stats.in_use =
-               info->idle_stats.recv_idle =
-               info->idle_stats.xmit_idle = jiffies;
+       info->port.flags |= ASYNC_INITIALIZED;
 
-               spin_unlock_irqrestore(&card->card_lock, flags);
-       }
+       clear_bit(TTY_IO_ERROR, &tty->flags);
+       info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+       info->breakon = info->breakoff = 0;
+       memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
+       info->idle_stats.in_use =
+       info->idle_stats.recv_idle =
+       info->idle_stats.xmit_idle = jiffies;
+
+       spin_unlock_irqrestore(&card->card_lock, flags);
 
 #ifdef CY_DEBUG_OPEN
        printk(KERN_DEBUG "cyc startup done\n");
@@ -2003,28 +1413,20 @@ static int startup(struct cyclades_port *info)
 
 errout:
        spin_unlock_irqrestore(&card->card_lock, flags);
+       free_page(page);
        return retval;
 }                              /* startup */
 
 static void start_xmit(struct cyclades_port *info)
 {
-       struct cyclades_card *card;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel = info->line - card->first_line;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), channel);
-               cy_writeb(base_addr + (CySRER << index),
-                       readb(base_addr + (CySRER << index)) | CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
                spin_unlock_irqrestore(&card->card_lock, flags);
        } else {
 #ifdef CONFIG_CYZ_INTR
@@ -2047,12 +1449,11 @@ static void start_xmit(struct cyclades_port *info)
  * This routine shuts down a serial port; interrupts are disabled,
  * and DTR is dropped if the hangup on close termio flag is on.
  */
-static void shutdown(struct cyclades_port *info)
+static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
 
        if (!(info->port.flags & ASYNC_INITIALIZED))
                return;
@@ -2060,21 +1461,10 @@ static void shutdown(struct cyclades_port *info)
        card = info->card;
        channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-#ifdef CY_DEBUG_OPEN
-               printk(KERN_DEBUG "cyc shutdown Y card %d, chip %d, "
-                               "channel %d, base_addr %p\n",
-                               card, chip, channel, base_addr);
-#endif
-
                spin_lock_irqsave(&card->card_lock, flags);
 
                /* Clear delta_msr_wait queue to avoid mem leaks. */
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
 
                if (info->port.xmit_buf) {
                        unsigned char *temp;
@@ -2082,47 +1472,25 @@ static void shutdown(struct cyclades_port *info)
                        info->port.xmit_buf = NULL;
                        free_page((unsigned long)temp);
                }
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
-                       cy_writeb(base_addr + (CyMSVR1 << index), ~CyRTS);
-                       cy_writeb(base_addr + (CyMSVR2 << index), ~CyDTR);
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc shutdown dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               }
-               cyy_issue_cmd(base_addr, CyCHAN_CTL | CyDIS_RCVR, index);
+               if (tty->termios->c_cflag & HUPCL)
+                       cyy_change_rts_dtr(info, 0, TIOCM_RTS | TIOCM_DTR);
+
+               cyy_issue_cmd(info, CyCHAN_CTL | CyDIS_RCVR);
                /* it may be appropriate to clear _XMIT at
                   some later date (after testing)!!! */
 
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                info->port.flags &= ~ASYNC_INITIALIZED;
                spin_unlock_irqrestore(&card->card_lock, flags);
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
-               int retval;
-
-               base_addr = card->base_addr;
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, "
-                       "base_addr %p\n", card, channel, base_addr);
+                       "base_addr %p\n", card, channel, card->base_addr);
 #endif
 
-               firm_id = base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return;
 
-               zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
                spin_lock_irqsave(&card->card_lock, flags);
 
                if (info->port.xmit_buf) {
@@ -2132,23 +1500,10 @@ static void shutdown(struct cyclades_port *info)
                        free_page((unsigned long)temp);
                }
 
-               if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
-                       cy_writel(&ch_ctrl[channel].rs_control,
-                               (__u32)(readl(&ch_ctrl[channel].rs_control) &
-                                       ~(C_RS_RTS | C_RS_DTR)));
-                       retval = cyz_issue_cmd(info->card, channel,
-                                       C_CM_IOCTLM, 0L);
-                       if (retval != 0) {
-                               printk(KERN_ERR"cyc:shutdown retval on ttyC%d "
-                                       "was %x\n", info->line, retval);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:shutdown dropping Z DTR\n");
-#endif
-               }
+               if (tty->termios->c_cflag & HUPCL)
+                       tty_port_lower_dtr_rts(&info->port);
 
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                info->port.flags &= ~ASYNC_INITIALIZED;
 
                spin_unlock_irqrestore(&card->card_lock, flags);
@@ -2165,199 +1520,6 @@ static void shutdown(struct cyclades_port *info)
  * ------------------------------------------------------------
  */
 
-static int
-block_til_ready(struct tty_struct *tty, struct file *filp,
-               struct cyclades_port *info)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       struct cyclades_card *cinfo;
-       unsigned long flags;
-       int chip, channel, index;
-       int retval;
-       void __iomem *base_addr;
-
-       cinfo = info->card;
-       channel = info->line - cinfo->first_line;
-
-       /*
-        * If the device is in the middle of being closed, then block
-        * until it's done, and then try again.
-        */
-       if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
-               wait_event_interruptible(info->port.close_wait,
-                               !(info->port.flags & ASYNC_CLOSING));
-               return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
-       }
-
-       /*
-        * If non-blocking mode is set, then make the check up front
-        * and then exit.
-        */
-       if ((filp->f_flags & O_NONBLOCK) ||
-                                       (tty->flags & (1 << TTY_IO_ERROR))) {
-               info->port.flags |= ASYNC_NORMAL_ACTIVE;
-               return 0;
-       }
-
-       /*
-        * Block waiting for the carrier detect and the line to become
-        * free (i.e., not in use by the callout).  While we are in
-        * this loop, info->port.count is dropped by one, so that
-        * cy_close() knows when to free things.  We restore it upon
-        * exit, either normal or abnormal.
-        */
-       retval = 0;
-       add_wait_queue(&info->port.open_wait, &wait);
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc block_til_ready before block: ttyC%d, "
-               "count = %d\n", info->line, info->port.count);
-#endif
-       spin_lock_irqsave(&cinfo->card_lock, flags);
-       if (!tty_hung_up_p(filp))
-               info->port.count--;
-       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG "cyc block_til_ready: (%d): decrementing count to "
-               "%d\n", current->pid, info->port.count);
-#endif
-       info->port.blocked_open++;
-
-       if (!cy_is_Z(cinfo)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = cinfo->bus_index;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
-               while (1) {
-                       spin_lock_irqsave(&cinfo->card_lock, flags);
-                       if ((tty->termios->c_cflag & CBAUD)) {
-                               cy_writeb(base_addr + (CyCAR << index),
-                                         (u_char) channel);
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:block_til_ready raising "
-                                       "DTR\n");
-                               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                                       readb(base_addr + (CyMSVR1 << index)),
-                                       readb(base_addr + (CyMSVR2 << index)));
-#endif
-                       }
-                       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       if (tty_hung_up_p(filp) ||
-                                       !(info->port.flags & ASYNC_INITIALIZED)) {
-                               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                                         -EAGAIN : -ERESTARTSYS);
-                               break;
-                       }
-
-                       spin_lock_irqsave(&cinfo->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                       (readb(base_addr +
-                                               (CyMSVR1 << index)) & CyDCD))) {
-                               spin_unlock_irqrestore(&cinfo->card_lock, flags);
-                               break;
-                       }
-                       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-
-                       if (signal_pending(current)) {
-                               retval = -ERESTARTSYS;
-                               break;
-                       }
-#ifdef CY_DEBUG_OPEN
-                       printk(KERN_DEBUG "cyc block_til_ready blocking: "
-                               "ttyC%d, count = %d\n",
-                               info->line, info->port.count);
-#endif
-                       schedule();
-               }
-       } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
-
-               base_addr = cinfo->base_addr;
-               firm_id = base_addr + ID_ADDRESS;
-               if (!cyz_is_loaded(cinfo)) {
-                       __set_current_state(TASK_RUNNING);
-                       remove_wait_queue(&info->port.open_wait, &wait);
-                       return -EINVAL;
-               }
-
-               zfw_ctrl = base_addr + (readl(&firm_id->zfwctrl_addr)
-                                                               & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
-               while (1) {
-                       if ((tty->termios->c_cflag & CBAUD)) {
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_RTS | C_RS_DTR);
-                               retval = cyz_issue_cmd(cinfo,
-                                       channel, C_CM_IOCTLM, 0L);
-                               if (retval != 0) {
-                                       printk(KERN_ERR "cyc:block_til_ready "
-                                               "retval on ttyC%d was %x\n",
-                                               info->line, retval);
-                               }
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:block_til_ready raising "
-                                       "Z DTR\n");
-#endif
-                       }
-
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       if (tty_hung_up_p(filp) ||
-                                       !(info->port.flags & ASYNC_INITIALIZED)) {
-                               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                                         -EAGAIN : -ERESTARTSYS);
-                               break;
-                       }
-                       if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                       (readl(&ch_ctrl[channel].rs_status) &
-                                               C_RS_DCD))) {
-                               break;
-                       }
-                       if (signal_pending(current)) {
-                               retval = -ERESTARTSYS;
-                               break;
-                       }
-#ifdef CY_DEBUG_OPEN
-                       printk(KERN_DEBUG "cyc block_til_ready blocking: "
-                               "ttyC%d, count = %d\n",
-                               info->line, info->port.count);
-#endif
-                       schedule();
-               }
-       }
-       __set_current_state(TASK_RUNNING);
-       remove_wait_queue(&info->port.open_wait, &wait);
-       if (!tty_hung_up_p(filp)) {
-               info->port.count++;
-#ifdef CY_DEBUG_COUNT
-               printk(KERN_DEBUG "cyc:block_til_ready (%d): incrementing "
-                       "count to %d\n", current->pid, info->port.count);
-#endif
-       }
-       info->port.blocked_open--;
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc:block_til_ready after blocking: ttyC%d, "
-               "count = %d\n", info->line, info->port.count);
-#endif
-       if (retval)
-               return retval;
-       info->port.flags |= ASYNC_NORMAL_ACTIVE;
-       return 0;
-}                              /* block_til_ready */
-
 /*
  * This routine is called whenever a serial port is opened.  It
  * performs the serial-specific initialization for the tty structure.
@@ -2436,7 +1598,6 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        printk(KERN_DEBUG "cyc:cy_open ttyC%d\n", info->line);
 #endif
        tty->driver_data = info;
-       info->port.tty = tty;
        if (serial_paranoia_check(info, tty->name, "cy_open"))
                return -ENODEV;
 
@@ -2462,11 +1623,11 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        /*
         * Start up serial port
         */
-       retval = startup(info);
+       retval = cy_startup(info, tty);
        if (retval)
                return retval;
 
-       retval = block_til_ready(tty, filp, info);
+       retval = tty_port_block_til_ready(&info->port, tty, filp);
        if (retval) {
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc:cy_open returning after block_til_ready "
@@ -2476,6 +1637,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        }
 
        info->throttle = 0;
+       tty_port_tty_set(&info->port, tty);
 
 #ifdef CY_DEBUG_OPEN
        printk(KERN_DEBUG "cyc:cy_open done\n");
@@ -2490,8 +1652,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
 {
        struct cyclades_card *card;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
        unsigned long orig_jiffies;
        int char_time;
 
@@ -2535,13 +1695,8 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
                timeout, char_time, jiffies);
 #endif
        card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-               while (readb(base_addr + (CySRER << index)) & CyTxRdy) {
+               while (cyy_readb(info, CySRER) & CyTxRdy) {
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
                        printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
 #endif
@@ -2595,140 +1750,61 @@ static void cy_flush_buffer(struct tty_struct *tty)
 }                              /* cy_flush_buffer */
 
 
-/*
- * This routine is called when a particular tty device is closed.
- */
-static void cy_close(struct tty_struct *tty, struct file *filp)
+static void cy_do_close(struct tty_port *port)
 {
-       struct cyclades_port *info = tty->driver_data;
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                                                               port);
        struct cyclades_card *card;
        unsigned long flags;
-
-#ifdef CY_DEBUG_OTHER
-       printk(KERN_DEBUG "cyc:cy_close ttyC%d\n", info->line);
-#endif
-
-       if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
-               return;
+       int channel;
 
        card = info->card;
-
-       spin_lock_irqsave(&card->card_lock, flags);
-       /* If the TTY is being hung up, nothing to do */
-       if (tty_hung_up_p(filp)) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               return;
-       }
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc:cy_close ttyC%d, count = %d\n", info->line,
-               info->port.count);
-#endif
-       if ((tty->count == 1) && (info->port.count != 1)) {
-               /*
-                * Uh, oh.  tty->count is 1, which means that the tty
-                * structure will be freed.  Info->count should always
-                * be one in these conditions.  If it's greater than
-                * one, we've got real problems, since it means the
-                * serial port won't be shutdown.
-                */
-               printk(KERN_ERR "cyc:cy_close: bad serial port count; "
-                       "tty->count is 1, info->port.count is %d\n", info->port.count);
-               info->port.count = 1;
-       }
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG  "cyc:cy_close at (%d): decrementing count to %d\n",
-               current->pid, info->port.count - 1);
-#endif
-       if (--info->port.count < 0) {
-#ifdef CY_DEBUG_COUNT
-               printk(KERN_DEBUG "cyc:cyc_close setting count to 0\n");
-#endif
-               info->port.count = 0;
-       }
-       if (info->port.count) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               return;
-       }
-       info->port.flags |= ASYNC_CLOSING;
-
-       /*
-        * Now we wait for the transmit buffer to clear; and we notify
-        * the line discipline to only process XON/XOFF characters.
-        */
-       tty->closing = 1;
-       spin_unlock_irqrestore(&card->card_lock, flags);
-       if (info->port.closing_wait != CY_CLOSING_WAIT_NONE)
-               tty_wait_until_sent(tty, info->port.closing_wait);
-
+       channel = info->line - card->first_line;
        spin_lock_irqsave(&card->card_lock, flags);
 
        if (!cy_is_Z(card)) {
-               int channel = info->line - card->first_line;
-               int index = card->bus_index;
-               void __iomem *base_addr = card->base_addr +
-                       (cy_chip_offset[channel >> 2] << index);
                /* Stop accepting input */
-               channel &= 0x03;
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyRxData);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyRxData);
                if (info->port.flags & ASYNC_INITIALIZED) {
                        /* Waiting for on-board buffers to be empty before
                           closing the port */
                        spin_unlock_irqrestore(&card->card_lock, flags);
-                       cy_wait_until_sent(tty, info->timeout);
+                       cy_wait_until_sent(port->tty, info->timeout);
                        spin_lock_irqsave(&card->card_lock, flags);
                }
        } else {
 #ifdef Z_WAKE
                /* Waiting for on-board buffers to be empty before closing
                   the port */
-               void __iomem *base_addr = card->base_addr;
-               struct FIRM_ID __iomem *firm_id = base_addr + ID_ADDRESS;
-               struct ZFW_CTRL __iomem *zfw_ctrl =
-                   base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               struct CH_CTRL __iomem *ch_ctrl = zfw_ctrl->ch_ctrl;
-               int channel = info->line - card->first_line;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
                int retval;
 
-               if (readl(&ch_ctrl[channel].flow_status) != C_FS_TXIDLE) {
+               if (readl(&ch_ctrl->flow_status) != C_FS_TXIDLE) {
                        retval = cyz_issue_cmd(card, channel, C_CM_IOCTLW, 0L);
                        if (retval != 0) {
                                printk(KERN_DEBUG "cyc:cy_close retval on "
                                        "ttyC%d was %x\n", info->line, retval);
-                       }
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-                       wait_for_completion_interruptible(&info->shutdown_wait);
-                       spin_lock_irqsave(&card->card_lock, flags);
-               }
-#endif
-       }
-
-       spin_unlock_irqrestore(&card->card_lock, flags);
-       shutdown(info);
-       cy_flush_buffer(tty);
-       tty_ldisc_flush(tty);
-       spin_lock_irqsave(&card->card_lock, flags);
-
-       tty->closing = 0;
-       info->port.tty = NULL;
-       if (info->port.blocked_open) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               if (info->port.close_delay) {
-                       msleep_interruptible(jiffies_to_msecs
-                                               (info->port.close_delay));
+                       }
+                       spin_unlock_irqrestore(&card->card_lock, flags);
+                       wait_for_completion_interruptible(&info->shutdown_wait);
+                       spin_lock_irqsave(&card->card_lock, flags);
                }
-               wake_up_interruptible(&info->port.open_wait);
-               spin_lock_irqsave(&card->card_lock, flags);
-       }
-       info->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-       wake_up_interruptible(&info->port.close_wait);
-
-#ifdef CY_DEBUG_OTHER
-       printk(KERN_DEBUG "cyc:cy_close done\n");
 #endif
-
+       }
        spin_unlock_irqrestore(&card->card_lock, flags);
+       cy_shutdown(info, port->tty);
+}
+
+/*
+ * This routine is called when a particular tty device is closed.
+ */
+static void cy_close(struct tty_struct *tty, struct file *filp)
+{
+       struct cyclades_port *info = tty->driver_data;
+       if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
+               return;
+       tty_port_close(&info->port, tty, filp);
 }                              /* cy_close */
 
 /* This routine gets called when tty_write has put something into
@@ -2871,18 +1947,13 @@ static int cy_write_room(struct tty_struct *tty)
 
 static int cy_chars_in_buffer(struct tty_struct *tty)
 {
-       struct cyclades_card *card;
        struct cyclades_port *info = tty->driver_data;
-       int channel;
 
        if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
                return 0;
 
-       card = info->card;
-       channel = (info->line) - (card->first_line);
-
 #ifdef Z_EXT_CHARS_IN_BUFFER
-       if (!cy_is_Z(card)) {
+       if (!cy_is_Z(info->card)) {
 #endif                         /* Z_EXT_CHARS_IN_BUFFER */
 #ifdef CY_DEBUG_IO
                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
@@ -2891,20 +1962,11 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
                return info->xmit_cnt;
 #ifdef Z_EXT_CHARS_IN_BUFFER
        } else {
-               static struct FIRM_ID *firm_id;
-               static struct ZFW_CTRL *zfw_ctrl;
-               static struct CH_CTRL *ch_ctrl;
-               static struct BUF_CTRL *buf_ctrl;
+               struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
                int char_count;
                __u32 tx_put, tx_get, tx_bufsize;
 
                lock_kernel();
-               firm_id = card->base_addr + ID_ADDRESS;
-               zfw_ctrl = card->base_addr +
-                       (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-               buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
-
                tx_get = readl(&buf_ctrl->tx_get);
                tx_put = readl(&buf_ctrl->tx_put);
                tx_bufsize = readl(&buf_ctrl->tx_bufsize);
@@ -2957,48 +2019,44 @@ static void cyy_baud_calc(struct cyclades_port *info, __u32 baud)
  * This routine finds or computes the various line characteristics.
  * It used to be called config_setup
  */
-static void set_line_char(struct cyclades_port *info)
+static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned cflag, iflag;
        int baud, baud_rate = 0;
        int i;
 
-       if (!info->port.tty || !info->port.tty->termios)
+       if (!tty->termios) /* XXX can this happen at all? */
                return;
 
        if (info->line == -1)
                return;
 
-       cflag = info->port.tty->termios->c_cflag;
-       iflag = info->port.tty->termios->c_iflag;
+       cflag = tty->termios->c_cflag;
+       iflag = tty->termios->c_iflag;
 
        /*
         * Set up the tty->alt_speed kludge
         */
-       if (info->port.tty) {
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                       info->port.tty->alt_speed = 57600;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                       info->port.tty->alt_speed = 115200;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                       info->port.tty->alt_speed = 230400;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                       info->port.tty->alt_speed = 460800;
-       }
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+               tty->alt_speed = 57600;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+               tty->alt_speed = 115200;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+               tty->alt_speed = 230400;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+               tty->alt_speed = 460800;
 
        card = info->card;
        channel = info->line - card->first_line;
 
        if (!cy_is_Z(card)) {
-
-               index = card->bus_index;
+               u32 cflags;
 
                /* baud rate */
-               baud = tty_get_baud_rate(info->port.tty);
+               baud = tty_get_baud_rate(tty);
                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                ASYNC_SPD_CUST) {
                        if (info->custom_divisor)
@@ -3107,124 +2165,68 @@ static void set_line_char(struct cyclades_port *info)
            cable.  Contact Marcio Saito for details.
         ***********************************************/
 
-               chip = channel >> 2;
                channel &= 0x03;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
+               cyy_writeb(info, CyCAR, channel);
 
                /* tx and rx baud rate */
 
-               cy_writeb(base_addr + (CyTCOR << index), info->tco);
-               cy_writeb(base_addr + (CyTBPR << index), info->tbpr);
-               cy_writeb(base_addr + (CyRCOR << index), info->rco);
-               cy_writeb(base_addr + (CyRBPR << index), info->rbpr);
+               cyy_writeb(info, CyTCOR, info->tco);
+               cyy_writeb(info, CyTBPR, info->tbpr);
+               cyy_writeb(info, CyRCOR, info->rco);
+               cyy_writeb(info, CyRBPR, info->rbpr);
 
                /* set line characteristics  according configuration */
 
-               cy_writeb(base_addr + (CySCHR1 << index),
-                         START_CHAR(info->port.tty));
-               cy_writeb(base_addr + (CySCHR2 << index), STOP_CHAR(info->port.tty));
-               cy_writeb(base_addr + (CyCOR1 << index), info->cor1);
-               cy_writeb(base_addr + (CyCOR2 << index), info->cor2);
-               cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
-               cy_writeb(base_addr + (CyCOR4 << index), info->cor4);
-               cy_writeb(base_addr + (CyCOR5 << index), info->cor5);
+               cyy_writeb(info, CySCHR1, START_CHAR(tty));
+               cyy_writeb(info, CySCHR2, STOP_CHAR(tty));
+               cyy_writeb(info, CyCOR1, info->cor1);
+               cyy_writeb(info, CyCOR2, info->cor2);
+               cyy_writeb(info, CyCOR3, info->cor3);
+               cyy_writeb(info, CyCOR4, info->cor4);
+               cyy_writeb(info, CyCOR5, info->cor5);
 
-               cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
-                               CyCOR3ch, index);
+               cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
+                               CyCOR3ch);
 
                /* !!! Is this needed? */
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CyRTPR << index),
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, CyRTPR,
                        (info->default_timeout ? info->default_timeout : 0x02));
                /* 10ms rx timeout */
 
-               if (C_CLOCAL(info->port.tty)) {
-                       /* without modem intr */
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) | CyMdmCh);
-                       /* act on 1->0 modem transitions */
-                       if ((cflag & CRTSCTS) && info->rflow) {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         (CyCTS | rflow_thr[i]));
-                       } else {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         CyCTS);
-                       }
-                       /* act on 0->1 modem transitions */
-                       cy_writeb(base_addr + (CyMCOR2 << index), CyCTS);
-               } else {
-                       /* without modem intr */
-                       cy_writeb(base_addr + (CySRER << index),
-                                 readb(base_addr +
-                                          (CySRER << index)) | CyMdmCh);
-                       /* act on 1->0 modem transitions */
-                       if ((cflag & CRTSCTS) && info->rflow) {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         (CyDSR | CyCTS | CyRI | CyDCD |
-                                          rflow_thr[i]));
-                       } else {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         CyDSR | CyCTS | CyRI | CyDCD);
-                       }
-                       /* act on 0->1 modem transitions */
-                       cy_writeb(base_addr + (CyMCOR2 << index),
-                                 CyDSR | CyCTS | CyRI | CyDCD);
-               }
+               cflags = CyCTS;
+               if (!C_CLOCAL(tty))
+                       cflags |= CyDSR | CyRI | CyDCD;
+               /* without modem intr */
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyMdmCh);
+               /* act on 1->0 modem transitions */
+               if ((cflag & CRTSCTS) && info->rflow)
+                       cyy_writeb(info, CyMCOR1, cflags | rflow_thr[i]);
+               else
+                       cyy_writeb(info, CyMCOR1, cflags);
+               /* act on 0->1 modem transitions */
+               cyy_writeb(info, CyMCOR2, cflags);
 
-               if (i == 0) {   /* baud rate is zero, turn off line */
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_line_char dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               } else {
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_line_char raising DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               }
+               if (i == 0)     /* baud rate is zero, turn off line */
+                       cyy_change_rts_dtr(info, 0, TIOCM_DTR);
+               else
+                       cyy_change_rts_dtr(info, TIOCM_DTR, 0);
 
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               clear_bit(TTY_IO_ERROR, &tty->flags);
                spin_unlock_irqrestore(&card->card_lock, flags);
 
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
                __u32 sw_flow;
                int retval;
 
-               firm_id = card->base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return;
 
-               zfw_ctrl = card->base_addr +
-                       (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-
                /* baud rate */
-               baud = tty_get_baud_rate(info->port.tty);
+               baud = tty_get_baud_rate(tty);
                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                ASYNC_SPD_CUST) {
                        if (info->custom_divisor)
@@ -3335,45 +2337,38 @@ static void set_line_char(struct cyclades_port *info)
                                "was %x\n", info->line, retval);
                }
 
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               clear_bit(TTY_IO_ERROR, &tty->flags);
        }
 }                              /* set_line_char */
 
-static int
-get_serial_info(struct cyclades_port *info,
+static int cy_get_serial_info(struct cyclades_port *info,
                struct serial_struct __user *retinfo)
 {
-       struct serial_struct tmp;
        struct cyclades_card *cinfo = info->card;
-
-       if (!retinfo)
-               return -EFAULT;
-       memset(&tmp, 0, sizeof(tmp));
-       tmp.type = info->type;
-       tmp.line = info->line;
-       tmp.port = (info->card - cy_card) * 0x100 + info->line -
-               cinfo->first_line;
-       tmp.irq = cinfo->irq;
-       tmp.flags = info->port.flags;
-       tmp.close_delay = info->port.close_delay;
-       tmp.closing_wait = info->port.closing_wait;
-       tmp.baud_base = info->baud;
-       tmp.custom_divisor = info->custom_divisor;
-       tmp.hub6 = 0;           /*!!! */
+       struct serial_struct tmp = {
+               .type = info->type,
+               .line = info->line,
+               .port = (info->card - cy_card) * 0x100 + info->line -
+                       cinfo->first_line,
+               .irq = cinfo->irq,
+               .flags = info->port.flags,
+               .close_delay = info->port.close_delay,
+               .closing_wait = info->port.closing_wait,
+               .baud_base = info->baud,
+               .custom_divisor = info->custom_divisor,
+               .hub6 = 0,              /*!!! */
+       };
        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
-}                              /* get_serial_info */
+}
 
 static int
-set_serial_info(struct cyclades_port *info,
+cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
                struct serial_struct __user *new_info)
 {
        struct serial_struct new_serial;
-       struct cyclades_port old_info;
 
        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
                return -EFAULT;
-       old_info = *info;
 
        if (!capable(CAP_SYS_ADMIN)) {
                if (new_serial.close_delay != info->port.close_delay ||
@@ -3403,10 +2398,10 @@ set_serial_info(struct cyclades_port *info,
 
 check_and_exit:
        if (info->port.flags & ASYNC_INITIALIZED) {
-               set_line_char(info);
+               cy_set_line_char(info, tty);
                return 0;
        } else {
-               return startup(info);
+               return cy_startup(info, tty);
        }
 }                              /* set_serial_info */
 
@@ -3422,24 +2417,14 @@ check_and_exit:
  */
 static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
 {
-       struct cyclades_card *card;
-       int chip, channel, index;
-       unsigned char status;
+       struct cyclades_card *card = info->card;
        unsigned int result;
        unsigned long flags;
-       void __iomem *base_addr;
+       u8 status;
 
-       card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               status = readb(base_addr + (CySRER << index)) &
-                               (CyTxRdy | CyTxMpty);
+               status = cyy_readb(info, CySRER) & (CyTxRdy | CyTxMpty);
                spin_unlock_irqrestore(&card->card_lock, flags);
                result = (status ? 0 : TIOCSER_TEMT);
        } else {
@@ -3453,34 +2438,23 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
 {
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
-       int chip, channel, index;
-       void __iomem *base_addr;
-       unsigned long flags;
-       unsigned char status;
-       unsigned long lstatus;
-       unsigned int result;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
-       struct CH_CTRL __iomem *ch_ctrl;
+       int result;
 
        if (serial_paranoia_check(info, tty->name, __func__))
                return -ENODEV;
 
-       lock_kernel();
-
        card = info->card;
-       channel = info->line - card->first_line;
+
+       lock_kernel();
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
+               unsigned long flags;
+               int channel = info->line - card->first_line;
+               u8 status;
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               status = readb(base_addr + (CyMSVR1 << index));
-               status |= readb(base_addr + (CyMSVR2 << index));
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               status = cyy_readb(info, CyMSVR1);
+               status |= cyy_readb(info, CyMSVR2);
                spin_unlock_irqrestore(&card->card_lock, flags);
 
                if (info->rtsdtr_inv) {
@@ -3495,27 +2469,22 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
                        ((status & CyDSR) ? TIOCM_DSR : 0) |
                        ((status & CyCTS) ? TIOCM_CTS : 0);
        } else {
-               base_addr = card->base_addr;
-               firm_id = card->base_addr + ID_ADDRESS;
-               if (cyz_is_loaded(card)) {
-                       zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-                       board_ctrl = &zfw_ctrl->board_ctrl;
-                       ch_ctrl = zfw_ctrl->ch_ctrl;
-                       lstatus = readl(&ch_ctrl[channel].rs_status);
-                       result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
-                               ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
-                               ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
-                               ((lstatus & C_RS_RI) ? TIOCM_RNG : 0) |
-                               ((lstatus & C_RS_DSR) ? TIOCM_DSR : 0) |
-                               ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
-               } else {
-                       result = 0;
-                       unlock_kernel();
-                       return -ENODEV;
+               u32 lstatus;
+
+               if (!cyz_is_loaded(card)) {
+                       result = -ENODEV;
+                       goto end;
                }
 
+               lstatus = readl(&info->u.cyz.ch_ctrl->rs_status);
+               result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
+                       ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
+                       ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
+                       ((lstatus & C_RS_RI) ? TIOCM_RNG : 0) |
+                       ((lstatus & C_RS_DSR) ? TIOCM_DSR : 0) |
+                       ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
        }
+end:
        unlock_kernel();
        return result;
 }                              /* cy_tiomget */
@@ -3526,150 +2495,53 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
 {
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
-       int chip, channel, index;
-       void __iomem *base_addr;
        unsigned long flags;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
-       struct CH_CTRL __iomem *ch_ctrl;
-       int retval;
 
        if (serial_paranoia_check(info, tty->name, __func__))
                return -ENODEV;
 
        card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
+               spin_lock_irqsave(&card->card_lock, flags);
+               cyy_change_rts_dtr(info, set, clear);
+               spin_unlock_irqrestore(&card->card_lock, flags);
+       } else {
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
+               int retval, channel = info->line - card->first_line;
+               u32 rs;
 
-               if (set & TIOCM_RTS) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       }
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-               }
-               if (clear & TIOCM_RTS) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       }
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-               }
+               if (!cyz_is_loaded(card))
+                       return -ENODEV;
+
+               spin_lock_irqsave(&card->card_lock, flags);
+               rs = readl(&ch_ctrl->rs_control);
+               if (set & TIOCM_RTS)
+                       rs |= C_RS_RTS;
+               if (clear & TIOCM_RTS)
+                       rs &= ~C_RS_RTS;
                if (set & TIOCM_DTR) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       }
+                       rs |= C_RS_DTR;
 #ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
+                       printk(KERN_DEBUG "cyc:set_modem_info raising Z DTR\n");
 #endif
-                       spin_unlock_irqrestore(&card->card_lock, flags);
                }
                if (clear & TIOCM_DTR) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       }
-
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-               }
-       } else {
-               base_addr = card->base_addr;
-
-               firm_id = card->base_addr + ID_ADDRESS;
-               if (cyz_is_loaded(card)) {
-                       zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-                       board_ctrl = &zfw_ctrl->board_ctrl;
-                       ch_ctrl = zfw_ctrl->ch_ctrl;
-
-                       if (set & TIOCM_RTS) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_RTS);
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (clear & TIOCM_RTS) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) &
-                                       ~C_RS_RTS);
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (set & TIOCM_DTR) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_DTR);
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:set_modem_info raising "
-                                       "Z DTR\n");
-#endif
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (clear & TIOCM_DTR) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) &
-                                       ~C_RS_DTR);
+                       rs &= ~C_RS_DTR;
 #ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:set_modem_info clearing "
-                                       "Z DTR\n");
+                       printk(KERN_DEBUG "cyc:set_modem_info clearing "
+                               "Z DTR\n");
 #endif
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-               } else {
-                       return -ENODEV;
                }
-               spin_lock_irqsave(&card->card_lock, flags);
+               cy_writel(&ch_ctrl->rs_control, rs);
                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
+               spin_unlock_irqrestore(&card->card_lock, flags);
                if (retval != 0) {
                        printk(KERN_ERR "cyc:set_modem_info retval on ttyC%d "
                                "was %x\n", info->line, retval);
                }
-               spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
-}                              /* cy_tiocmset */
+}
 
 /*
  * cy_break() --- routine which turns the break handling on or off
@@ -3734,41 +2606,18 @@ static int cy_break(struct tty_struct *tty, int break_state)
        return retval;
 }                              /* cy_break */
 
-static int get_mon_info(struct cyclades_port *info,
-                               struct cyclades_monitor __user *mon)
-{
-
-       if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))
-               return -EFAULT;
-       info->mon.int_count = 0;
-       info->mon.char_count = 0;
-       info->mon.char_max = 0;
-       info->mon.char_last = 0;
-       return 0;
-}                              /* get_mon_info */
-
 static int set_threshold(struct cyclades_port *info, unsigned long value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr =
-                   card->base_addr + (cy_chip_offset[chip] << index);
-
                info->cor3 &= ~CyREC_FIFO;
                info->cor3 |= value & CyREC_FIFO;
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
-               cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR3ch, index);
+               cyy_writeb(info, CyCOR3, info->cor3);
+               cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR3ch);
                spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
@@ -3777,55 +2626,23 @@ static int set_threshold(struct cyclades_port *info, unsigned long value)
 static int get_threshold(struct cyclades_port *info,
                                                unsigned long __user *value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
-       unsigned long tmp;
+       struct cyclades_card *card = info->card;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-               tmp = readb(base_addr + (CyCOR3 << index)) & CyREC_FIFO;
+               u8 tmp = cyy_readb(info, CyCOR3) & CyREC_FIFO;
                return put_user(tmp, value);
        }
        return 0;
 }                              /* get_threshold */
 
-static int set_default_threshold(struct cyclades_port *info,
-                                                       unsigned long value)
-{
-       info->default_threshold = value & 0x0f;
-       return 0;
-}                              /* set_default_threshold */
-
-static int get_default_threshold(struct cyclades_port *info,
-                                               unsigned long __user *value)
-{
-       return put_user(info->default_threshold, value);
-}                              /* get_default_threshold */
-
 static int set_timeout(struct cyclades_port *info, unsigned long value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyRTPR << index), value & 0xff);
+               cyy_writeb(info, CyRTPR, value & 0xff);
                spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
@@ -3834,36 +2651,35 @@ static int set_timeout(struct cyclades_port *info, unsigned long value)
 static int get_timeout(struct cyclades_port *info,
                                                unsigned long __user *value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
-       unsigned long tmp;
+       struct cyclades_card *card = info->card;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-               tmp = readb(base_addr + (CyRTPR << index));
+               u8 tmp = cyy_readb(info, CyRTPR);
                return put_user(tmp, value);
        }
        return 0;
 }                              /* get_timeout */
 
-static int set_default_timeout(struct cyclades_port *info, unsigned long value)
+static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg,
+               struct cyclades_icount *cprev)
 {
-       info->default_timeout = value & 0xff;
-       return 0;
-}                              /* set_default_timeout */
+       struct cyclades_icount cnow;
+       unsigned long flags;
+       int ret;
 
-static int get_default_timeout(struct cyclades_port *info,
-                                       unsigned long __user *value)
-{
-       return put_user(info->default_timeout, value);
-}                              /* get_default_timeout */
+       spin_lock_irqsave(&info->card->card_lock, flags);
+       cnow = info->icount;    /* atomic copy */
+       spin_unlock_irqrestore(&info->card->card_lock, flags);
+
+       ret =   ((arg & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
+               ((arg & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
+               ((arg & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
+               ((arg & TIOCM_CTS) && (cnow.cts != cprev->cts));
+
+       *cprev = cnow;
+
+       return ret;
+}
 
 /*
  * This routine allows the tty driver to implement device-
@@ -3875,8 +2691,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
         unsigned int cmd, unsigned long arg)
 {
        struct cyclades_port *info = tty->driver_data;
-       struct cyclades_icount cprev, cnow;     /* kernel counter temps */
-       struct serial_icounter_struct __user *p_cuser;  /* user space */
+       struct cyclades_icount cnow;    /* kernel counter temps */
        int ret_val = 0;
        unsigned long flags;
        void __user *argp = (void __user *)arg;
@@ -3892,7 +2707,11 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 
        switch (cmd) {
        case CYGETMON:
-               ret_val = get_mon_info(info, argp);
+               if (copy_to_user(argp, &info->mon, sizeof(info->mon))) {
+                       ret_val = -EFAULT;
+                       break;
+               }
+               memset(&info->mon, 0, sizeof(info->mon));
                break;
        case CYGETTHRESH:
                ret_val = get_threshold(info, argp);
@@ -3901,10 +2720,11 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                ret_val = set_threshold(info, arg);
                break;
        case CYGETDEFTHRESH:
-               ret_val = get_default_threshold(info, argp);
+               ret_val = put_user(info->default_threshold,
+                               (unsigned long __user *)argp);
                break;
        case CYSETDEFTHRESH:
-               ret_val = set_default_threshold(info, arg);
+               info->default_threshold = arg & 0x0f;
                break;
        case CYGETTIMEOUT:
                ret_val = get_timeout(info, argp);
@@ -3913,21 +2733,20 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                ret_val = set_timeout(info, arg);
                break;
        case CYGETDEFTIMEOUT:
-               ret_val = get_default_timeout(info, argp);
+               ret_val = put_user(info->default_timeout,
+                               (unsigned long __user *)argp);
                break;
        case CYSETDEFTIMEOUT:
-               ret_val = set_default_timeout(info, arg);
+               info->default_timeout = arg & 0xff;
                break;
        case CYSETRFLOW:
                info->rflow = (int)arg;
-               ret_val = 0;
                break;
        case CYGETRFLOW:
                ret_val = info->rflow;
                break;
        case CYSETRTSDTR_INV:
                info->rtsdtr_inv = (int)arg;
-               ret_val = 0;
                break;
        case CYGETRTSDTR_INV:
                ret_val = info->rtsdtr_inv;
@@ -3938,7 +2757,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 #ifndef CONFIG_CYZ_INTR
        case CYZSETPOLLCYCLE:
                cyz_polling_cycle = (arg * HZ) / 1000;
-               ret_val = 0;
                break;
        case CYZGETPOLLCYCLE:
                ret_val = (cyz_polling_cycle * 1000) / HZ;
@@ -3946,16 +2764,15 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 #endif                         /* CONFIG_CYZ_INTR */
        case CYSETWAIT:
                info->port.closing_wait = (unsigned short)arg * HZ / 100;
-               ret_val = 0;
                break;
        case CYGETWAIT:
                ret_val = info->port.closing_wait / (HZ / 100);
                break;
        case TIOCGSERIAL:
-               ret_val = get_serial_info(info, argp);
+               ret_val = cy_get_serial_info(info, argp);
                break;
        case TIOCSSERIAL:
-               ret_val = set_serial_info(info, argp);
+               ret_val = cy_set_serial_info(info, tty, argp);
                break;
        case TIOCSERGETLSR:     /* Get line status register */
                ret_val = get_lsr_info(info, argp);
@@ -3971,17 +2788,8 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                /* note the counters on entry */
                cnow = info->icount;
                spin_unlock_irqrestore(&info->card->card_lock, flags);
-               ret_val = wait_event_interruptible(info->delta_msr_wait, ({
-                       cprev = cnow;
-                       spin_lock_irqsave(&info->card->card_lock, flags);
-                       cnow = info->icount;    /* atomic copy */
-                       spin_unlock_irqrestore(&info->card->card_lock, flags);
-
-                       ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                       ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                       ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                       ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts));
-               }));
+               ret_val = wait_event_interruptible(info->port.delta_msr_wait,
+                               cy_cflags_changed(info, arg, &cnow));
                break;
 
                /*
@@ -3990,46 +2798,29 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                 * NB: both 1->0 and 0->1 transitions are counted except for
                 *     RI where only 0->1 is counted.
                 */
-       case TIOCGICOUNT:
+       case TIOCGICOUNT: {
+               struct serial_icounter_struct sic = { };
+
                spin_lock_irqsave(&info->card->card_lock, flags);
                cnow = info->icount;
                spin_unlock_irqrestore(&info->card->card_lock, flags);
-               p_cuser = argp;
-               ret_val = put_user(cnow.cts, &p_cuser->cts);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.dsr, &p_cuser->dsr);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.rng, &p_cuser->rng);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.dcd, &p_cuser->dcd);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.rx, &p_cuser->rx);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.tx, &p_cuser->tx);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.frame, &p_cuser->frame);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.overrun, &p_cuser->overrun);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.parity, &p_cuser->parity);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.brk, &p_cuser->brk);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.buf_overrun, &p_cuser->buf_overrun);
-               if (ret_val)
-                       break;
-               ret_val = 0;
+
+               sic.cts = cnow.cts;
+               sic.dsr = cnow.dsr;
+               sic.rng = cnow.rng;
+               sic.dcd = cnow.dcd;
+               sic.rx = cnow.rx;
+               sic.tx = cnow.tx;
+               sic.frame = cnow.frame;
+               sic.overrun = cnow.overrun;
+               sic.parity = cnow.parity;
+               sic.brk = cnow.brk;
+               sic.buf_overrun = cnow.buf_overrun;
+
+               if (copy_to_user(argp, &sic, sizeof(sic)))
+                       ret_val = -EFAULT;
                break;
+       }
        default:
                ret_val = -ENOIOCTLCMD;
        }
@@ -4055,7 +2846,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        printk(KERN_DEBUG "cyc:cy_set_termios ttyC%d\n", info->line);
 #endif
 
-       set_line_char(info);
+       cy_set_line_char(info, tty);
 
        if ((old_termios->c_cflag & CRTSCTS) &&
                        !(tty->termios->c_cflag & CRTSCTS)) {
@@ -4112,8 +2903,6 @@ static void cy_throttle(struct tty_struct *tty)
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
        char buf[64];
@@ -4135,24 +2924,9 @@ static void cy_throttle(struct tty_struct *tty)
        }
 
        if (tty->termios->c_cflag & CRTSCTS) {
-               channel = info->line - card->first_line;
                if (!cy_is_Z(card)) {
-                       chip = channel >> 2;
-                       channel &= 0x03;
-                       index = card->bus_index;
-                       base_addr = card->base_addr +
-                               (cy_chip_offset[chip] << index);
-
                        spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       }
+                       cyy_change_rts_dtr(info, 0, TIOCM_RTS);
                        spin_unlock_irqrestore(&card->card_lock, flags);
                } else {
                        info->throttle = 1;
@@ -4170,8 +2944,6 @@ static void cy_unthrottle(struct tty_struct *tty)
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
        char buf[64];
@@ -4192,24 +2964,9 @@ static void cy_unthrottle(struct tty_struct *tty)
 
        if (tty->termios->c_cflag & CRTSCTS) {
                card = info->card;
-               channel = info->line - card->first_line;
                if (!cy_is_Z(card)) {
-                       chip = channel >> 2;
-                       channel &= 0x03;
-                       index = card->bus_index;
-                       base_addr = card->base_addr +
-                               (cy_chip_offset[chip] << index);
-
                        spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       }
+                       cyy_change_rts_dtr(info, TIOCM_RTS, 0);
                        spin_unlock_irqrestore(&card->card_lock, flags);
                } else {
                        info->throttle = 0;
@@ -4224,8 +2981,7 @@ static void cy_stop(struct tty_struct *tty)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
@@ -4238,16 +2994,9 @@ static void cy_stop(struct tty_struct *tty)
        cinfo = info->card;
        channel = info->line - cinfo->first_line;
        if (!cy_is_Z(cinfo)) {
-               index = cinfo->bus_index;
-               chip = channel >> 2;
-               channel &= 0x03;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&cinfo->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index),
-                       (u_char)(channel & 0x0003)); /* index channel */
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
                spin_unlock_irqrestore(&cinfo->card_lock, flags);
        }
 }                              /* cy_stop */
@@ -4256,8 +3005,7 @@ static void cy_start(struct tty_struct *tty)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
@@ -4269,17 +3017,10 @@ static void cy_start(struct tty_struct *tty)
 
        cinfo = info->card;
        channel = info->line - cinfo->first_line;
-       index = cinfo->bus_index;
        if (!cy_is_Z(cinfo)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&cinfo->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index),
-                       (u_char) (channel & 0x0003));   /* index channel */
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) | CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
                spin_unlock_irqrestore(&cinfo->card_lock, flags);
        }
 }                              /* cy_start */
@@ -4299,17 +3040,84 @@ static void cy_hangup(struct tty_struct *tty)
                return;
 
        cy_flush_buffer(tty);
-       shutdown(info);
-       info->port.count = 0;
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG "cyc:cy_hangup (%d): setting count to 0\n",
-               current->pid);
-#endif
-       info->port.tty = NULL;
-       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-       wake_up_interruptible(&info->port.open_wait);
+       cy_shutdown(info, tty);
+       tty_port_hangup(&info->port);
 }                              /* cy_hangup */
 
+static int cyy_carrier_raised(struct tty_port *port)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       unsigned long flags;
+       int channel = info->line - cinfo->first_line;
+       u32 cd;
+
+       spin_lock_irqsave(&cinfo->card_lock, flags);
+       cyy_writeb(info, CyCAR, channel & 0x03);
+       cd = cyy_readb(info, CyMSVR1) & CyDCD;
+       spin_unlock_irqrestore(&cinfo->card_lock, flags);
+
+       return cd;
+}
+
+static void cyy_dtr_rts(struct tty_port *port, int raise)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       unsigned long flags;
+
+       spin_lock_irqsave(&cinfo->card_lock, flags);
+       cyy_change_rts_dtr(info, raise ? TIOCM_RTS | TIOCM_DTR : 0,
+                       raise ? 0 : TIOCM_RTS | TIOCM_DTR);
+       spin_unlock_irqrestore(&cinfo->card_lock, flags);
+}
+
+static int cyz_carrier_raised(struct tty_port *port)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+
+       return readl(&info->u.cyz.ch_ctrl->rs_status) & C_RS_DCD;
+}
+
+static void cyz_dtr_rts(struct tty_port *port, int raise)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
+       int ret, channel = info->line - cinfo->first_line;
+       u32 rs;
+
+       rs = readl(&ch_ctrl->rs_control);
+       if (raise)
+               rs |= C_RS_RTS | C_RS_DTR;
+       else
+               rs &= ~(C_RS_RTS | C_RS_DTR);
+       cy_writel(&ch_ctrl->rs_control, rs);
+       ret = cyz_issue_cmd(cinfo, channel, C_CM_IOCTLM, 0L);
+       if (ret != 0)
+               printk(KERN_ERR "%s: retval on ttyC%d was %x\n",
+                               __func__, info->line, ret);
+#ifdef CY_DEBUG_DTR
+       printk(KERN_DEBUG "%s: raising Z DTR\n", __func__);
+#endif
+}
+
+static const struct tty_port_operations cyy_port_ops = {
+       .carrier_raised = cyy_carrier_raised,
+       .dtr_rts = cyy_dtr_rts,
+       .shutdown = cy_do_close,
+};
+
+static const struct tty_port_operations cyz_port_ops = {
+       .carrier_raised = cyz_carrier_raised,
+       .dtr_rts = cyz_dtr_rts,
+       .shutdown = cy_do_close,
+};
+
 /*
  * ---------------------------------------------------------------------
  * cy_init() and friends
@@ -4321,8 +3129,7 @@ static void cy_hangup(struct tty_struct *tty)
 static int __devinit cy_init_card(struct cyclades_card *cinfo)
 {
        struct cyclades_port *info;
-       unsigned int port;
-       unsigned short chip_number;
+       unsigned int channel, port;
 
        spin_lock_init(&cinfo->card_lock);
        cinfo->intr_enabled = 0;
@@ -4334,9 +3141,9 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                return -ENOMEM;
        }
 
-       for (port = cinfo->first_line; port < cinfo->first_line + cinfo->nports;
-                       port++) {
-               info = &cinfo->ports[port - cinfo->first_line];
+       for (channel = 0, port = cinfo->first_line; channel < cinfo->nports;
+                       channel++, port++) {
+               info = &cinfo->ports[channel];
                tty_port_init(&info->port);
                info->magic = CYCLADES_MAGIC;
                info->card = cinfo;
@@ -4346,10 +3153,19 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                info->port.close_delay = 5 * HZ / 10;
                info->port.flags = STD_COM_FLAGS;
                init_completion(&info->shutdown_wait);
-               init_waitqueue_head(&info->delta_msr_wait);
 
                if (cy_is_Z(cinfo)) {
+                       struct FIRM_ID *firm_id = cinfo->base_addr + ID_ADDRESS;
+                       struct ZFW_CTRL *zfw_ctrl;
+
+                       info->port.ops = &cyz_port_ops;
                        info->type = PORT_STARTECH;
+
+                       zfw_ctrl = cinfo->base_addr +
+                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                       info->u.cyz.ch_ctrl = &zfw_ctrl->ch_ctrl[channel];
+                       info->u.cyz.buf_ctrl = &zfw_ctrl->buf_ctrl[channel];
+
                        if (cinfo->hw_ver == ZO_V1)
                                info->xmit_fifo_size = CYZ_FIFO_SIZE;
                        else
@@ -4359,17 +3175,20 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                                cyz_rx_restart, (unsigned long)info);
 #endif
                } else {
+                       unsigned short chip_number;
                        int index = cinfo->bus_index;
+
+                       info->port.ops = &cyy_port_ops;
                        info->type = PORT_CIRRUS;
                        info->xmit_fifo_size = CyMAX_CHAR_FIFO;
                        info->cor1 = CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
                        info->cor2 = CyETC;
                        info->cor3 = 0x08;      /* _very_ small rcv threshold */
 
-                       chip_number = (port - cinfo->first_line) / 4;
-                       info->chip_rev = readb(cinfo->base_addr +
-                                     (cy_chip_offset[chip_number] << index) +
-                                     (CyGFRCR << index));
+                       chip_number = channel / CyPORTS_PER_CHIP;
+                       info->u.cyy.base_addr = cinfo->base_addr +
+                               (cy_chip_offset[chip_number] << index);
+                       info->chip_rev = cyy_readb(info, CyGFRCR);
 
                        if (info->chip_rev >= CD1400_REV_J) {
                                /* It is a CD1400 rev. J or later */
@@ -5060,8 +3879,14 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                }
                cy_card[card_no].num_chips = nchan / CyPORTS_PER_CHIP;
        } else {
+               struct FIRM_ID __iomem *firm_id = addr2 + ID_ADDRESS;
+               struct ZFW_CTRL __iomem *zfw_ctrl;
+
+               zfw_ctrl = addr2 + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
+
                cy_card[card_no].hw_ver = mailbox;
                cy_card[card_no].num_chips = (unsigned int)-1;
+               cy_card[card_no].board_ctrl = &zfw_ctrl->board_ctrl;
 #ifdef CONFIG_CYZ_INTR
                /* allocate IRQ only if board has an IRQ */
                if (irq != 0 && irq != 255) {
@@ -5191,18 +4016,30 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
                for (j = 0; j < cy_card[i].nports; j++) {
                        info = &cy_card[i].ports[j];
 
-                       if (info->port.count)
+                       if (info->port.count) {
+                               /* XXX is the ldisc num worth this? */
+                               struct tty_struct *tty;
+                               struct tty_ldisc *ld;
+                               int num = 0;
+                               tty = tty_port_tty_get(&info->port);
+                               if (tty) {
+                                       ld = tty_ldisc_ref(tty);
+                                       if (ld) {
+                                               num = ld->ops->num;
+                                               tty_ldisc_deref(ld);
+                                       }
+                                       tty_kref_put(tty);
+                               }
                                seq_printf(m, "%3d %8lu %10lu %8lu "
-                                       "%10lu %8lu %9lu %6ld\n", info->line,
+                                       "%10lu %8lu %9lu %6d\n", info->line,
                                        (cur_jifs - info->idle_stats.in_use) /
                                        HZ, info->idle_stats.xmit_bytes,
                                        (cur_jifs - info->idle_stats.xmit_idle)/
                                        HZ, info->idle_stats.recv_bytes,
                                        (cur_jifs - info->idle_stats.recv_idle)/
                                        HZ, info->idle_stats.overruns,
-                                       /* FIXME: double check locking */
-                                       (long)info->port.tty->ldisc->ops->num);
-                       else
+                                       num);
+                       } else
                                seq_printf(m, "%3d %8lu %10lu %8lu "
                                        "%10lu %8lu %9lu %6ld\n",
                                        info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
index ff647ca..9d589e3 100644 (file)
@@ -2239,7 +2239,7 @@ static void do_softint(struct work_struct *work)
        struct channel *ch = container_of(work, struct channel, tqueue);
        /* Called in response to a modem change event */
        if (ch && ch->magic == EPCA_MAGIC) {
-               struct tty_struct *tty = tty_port_tty_get(&ch->port);;
+               struct tty_struct *tty = tty_port_tty_get(&ch->port);
 
                if (tty && tty->driver_data) {
                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
index a5c59fc..b19d43c 100644 (file)
@@ -572,7 +572,7 @@ static void check_modem_status(struct esp_struct *info)
                        info->icount.dcd++;
                if (status & UART_MSR_DCTS)
                        info->icount.cts++;
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
        }
 
        if ((info->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
@@ -927,7 +927,7 @@ static void shutdown(struct esp_struct *info)
         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
         * here so the queue might never be waken up
         */
-       wake_up_interruptible(&info->delta_msr_wait);
+       wake_up_interruptible(&info->port.delta_msr_wait);
        wake_up_interruptible(&info->break_wait);
 
        /* stop a DMA transfer on the port being closed */
@@ -1800,7 +1800,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file *file,
                spin_unlock_irqrestore(&info->lock, flags);
                while (1) {
                        /* FIXME: convert to new style wakeup */
-                       interruptible_sleep_on(&info->delta_msr_wait);
+                       interruptible_sleep_on(&info->port.delta_msr_wait);
                        /* see if a signal did it */
                        if (signal_pending(current))
                                return -ERESTARTSYS;
@@ -2452,7 +2452,6 @@ static int __init espserial_init(void)
                info->config.flow_off = flow_off;
                info->config.pio_threshold = pio_threshold;
                info->next_port = ports;
-               init_waitqueue_head(&info->delta_msr_wait);
                init_waitqueue_head(&info->break_wait);
                ports = info;
                printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ",
index fc93e2f..1573aeb 100644 (file)
@@ -153,7 +153,7 @@ static const struct file_operations rng_chrdev_ops = {
 static struct miscdevice rng_miscdev = {
        .minor          = RNG_MISCDEV_MINOR,
        .name           = RNG_MODULE_NAME,
-       .devnode        = "hwrng",
+       .nodename       = "hwrng",
        .fops           = &rng_chrdev_ops,
 };
 
index 32216b6..962968f 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/scatterlist.h>
 #include <linux/spinlock.h>
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_rng.h>
 
 /* The host will fill any buffer we give it with sweet, sweet randomness.  We
@@ -51,7 +52,7 @@ static void register_buffer(void)
 
        sg_init_one(&sg, random_data+data_left, RANDOM_DATA_SIZE-data_left);
        /* There should always be room for one buffer. */
-       if (vq->vq_ops->add_buf(vq, &sg, 0, 1, random_data) != 0)
+       if (vq->vq_ops->add_buf(vq, &sg, 0, 1, random_data) < 0)
                BUG();
        vq->vq_ops->kick(vq);
 }
index a261bd7..2e66b5f 100644 (file)
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header;
 /*
  * Startup and shutdown functions.
  */
-static int ipmi_poweroff_init(void)
+static int __init ipmi_poweroff_init(void)
 {
        int rv;
 
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void)
 }
 
 #ifdef MODULE
-static __exit void ipmi_poweroff_cleanup(void)
+static void __exit ipmi_poweroff_cleanup(void)
 {
        int rv;
 
index 4f1f4cd..426bfdd 100644 (file)
@@ -846,37 +846,53 @@ static int isicom_carrier_raised(struct tty_port *port)
        return (ip->status & ISI_DCD)?1 : 0;
 }
 
-static int isicom_open(struct tty_struct *tty, struct file *filp)
+static struct tty_port *isicom_find_port(struct tty_struct *tty)
 {
        struct isi_port *port;
        struct isi_board *card;
        unsigned int board;
-       int error, line;
+       int line = tty->index;
 
-       line = tty->index;
        if (line < 0 || line > PORT_COUNT-1)
-               return -ENODEV;
+               return NULL;
        board = BOARD(line);
        card = &isi_card[board];
 
        if (!(card->status & FIRMWARE_LOADED))
-               return -ENODEV;
+               return NULL;
 
        /*  open on a port greater than the port count for the card !!! */
        if (line > ((board * 16) + card->port_count - 1))
-               return -ENODEV;
+               return NULL;
 
        port = &isi_ports[line];
        if (isicom_paranoia_check(port, tty->name, "isicom_open"))
-               return -ENODEV;
+               return NULL;
 
+       return &port->port;
+}
+       
+static int isicom_open(struct tty_struct *tty, struct file *filp)
+{
+       struct isi_port *port;
+       struct isi_board *card;
+       struct tty_port *tport;
+       int error = 0;
+
+       tport = isicom_find_port(tty);
+       if (tport == NULL)
+               return -ENODEV;
+       port = container_of(tport, struct isi_port, port);
+       card = &isi_card[BOARD(tty->index)];
        isicom_setup_board(card);
 
        /* FIXME: locking on port.count etc */
        port->port.count++;
        tty->driver_data = port;
        tty_port_tty_set(&port->port, tty);
-       error = isicom_setup_port(tty);
+       /* FIXME: Locking on Initialized flag */
+       if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
+               error = isicom_setup_port(tty);
        if (error == 0)
                error = tty_port_block_til_ready(&port->port, tty, filp);
        return error;
@@ -952,19 +968,12 @@ static void isicom_flush_buffer(struct tty_struct *tty)
        tty_wakeup(tty);
 }
 
-static void isicom_close(struct tty_struct *tty, struct file *filp)
+static void isicom_close_port(struct tty_port *port)
 {
-       struct isi_port *ip = tty->driver_data;
-       struct tty_port *port = &ip->port;
-       struct isi_board *card;
+       struct isi_port *ip = container_of(port, struct isi_port, port);
+       struct isi_board *card = ip->card;
        unsigned long flags;
 
-       BUG_ON(!ip);
-
-       card = ip->card;
-       if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
-               return;
-
        /* indicate to the card that no more data can be received
           on this port */
        spin_lock_irqsave(&card->card_lock, flags);
@@ -974,9 +983,19 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
        }
        isicom_shutdown_port(ip);
        spin_unlock_irqrestore(&card->card_lock, flags);
+}
+
+static void isicom_close(struct tty_struct *tty, struct file *filp)
+{
+       struct isi_port *ip = tty->driver_data;
+       struct tty_port *port = &ip->port;
+       if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
+               return;
 
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       isicom_close_port(port);
        isicom_flush_buffer(tty);
-       
        tty_port_close_end(port, tty);
 }
 
index 0491cdf..0aede1d 100644 (file)
@@ -866,24 +866,25 @@ static const struct file_operations kmsg_fops = {
 
 static const struct memdev {
        const char *name;
+       mode_t mode;
        const struct file_operations *fops;
        struct backing_dev_info *dev_info;
 } devlist[] = {
-       [ 1] = { "mem", &mem_fops, &directly_mappable_cdev_bdi },
+        [1] = { "mem", 0, &mem_fops, &directly_mappable_cdev_bdi },
 #ifdef CONFIG_DEVKMEM
-       [ 2] = { "kmem", &kmem_fops, &directly_mappable_cdev_bdi },
+        [2] = { "kmem", 0, &kmem_fops, &directly_mappable_cdev_bdi },
 #endif
-       [ 3] = {"null", &null_fops, NULL },
+        [3] = { "null", 0666, &null_fops, NULL },
 #ifdef CONFIG_DEVPORT
-       [ 4] = { "port", &port_fops, NULL },
+        [4] = { "port", 0, &port_fops, NULL },
 #endif
-       [ 5] = { "zero", &zero_fops, &zero_bdi },
-       [ 7] = { "full", &full_fops, NULL },
-       [ 8] = { "random", &random_fops, NULL },
-       [ 9] = { "urandom", &urandom_fops, NULL },
-       [11] = { "kmsg", &kmsg_fops, NULL },
+        [5] = { "zero", 0666, &zero_fops, &zero_bdi },
+        [7] = { "full", 0666, &full_fops, NULL },
+        [8] = { "random", 0666, &random_fops, NULL },
+        [9] = { "urandom", 0666, &urandom_fops, NULL },
+       [11] = { "kmsg", 0, &kmsg_fops, NULL },
 #ifdef CONFIG_CRASH_DUMP
-       [12] = { "oldmem", &oldmem_fops, NULL },
+       [12] = { "oldmem", 0, &oldmem_fops, NULL },
 #endif
 };
 
@@ -920,6 +921,13 @@ static const struct file_operations memory_fops = {
        .open           = memory_open,
 };
 
+static char *mem_devnode(struct device *dev, mode_t *mode)
+{
+       if (mode && devlist[MINOR(dev->devt)].mode)
+               *mode = devlist[MINOR(dev->devt)].mode;
+       return NULL;
+}
+
 static struct class *mem_class;
 
 static int __init chr_dev_init(void)
@@ -935,6 +943,7 @@ static int __init chr_dev_init(void)
                printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
        mem_class = class_create(THIS_MODULE, "mem");
+       mem_class->devnode = mem_devnode;
        for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
                if (!devlist[minor].name)
                        continue;
index 62c99fa..07fa612 100644 (file)
@@ -91,7 +91,7 @@ static int misc_seq_show(struct seq_file *seq, void *v)
 }
 
 
-static struct seq_operations misc_seq_ops = {
+static const struct seq_operations misc_seq_ops = {
        .start = misc_seq_start,
        .next  = misc_seq_next,
        .stop  = misc_seq_stop,
@@ -263,12 +263,14 @@ int misc_deregister(struct miscdevice *misc)
 EXPORT_SYMBOL(misc_register);
 EXPORT_SYMBOL(misc_deregister);
 
-static char *misc_nodename(struct device *dev)
+static char *misc_devnode(struct device *dev, mode_t *mode)
 {
        struct miscdevice *c = dev_get_drvdata(dev);
 
-       if (c->devnode)
-               return kstrdup(c->devnode, GFP_KERNEL);
+       if (mode && c->mode)
+               *mode = c->mode;
+       if (c->nodename)
+               return kstrdup(c->nodename, GFP_KERNEL);
        return NULL;
 }
 
@@ -287,7 +289,7 @@ static int __init misc_init(void)
        err = -EIO;
        if (register_chrdev(MISC_MAJOR,"misc",&misc_fops))
                goto fail_printk;
-       misc_class->nodename = misc_nodename;
+       misc_class->devnode = misc_devnode;
        return 0;
 
 fail_printk:
index dbf8d52..5e28d39 100644 (file)
@@ -48,7 +48,7 @@
 
 #include "mxser.h"
 
-#define        MXSER_VERSION   "2.0.4"         /* 1.12 */
+#define        MXSER_VERSION   "2.0.5"         /* 1.14 */
 #define        MXSERMAJOR       174
 
 #define MXSER_BOARDS           4       /* Max. boards */
@@ -69,6 +69,7 @@
 #define PCI_DEVICE_ID_POS104UL 0x1044
 #define PCI_DEVICE_ID_CB108    0x1080
 #define PCI_DEVICE_ID_CP102UF  0x1023
+#define PCI_DEVICE_ID_CP112UL  0x1120
 #define PCI_DEVICE_ID_CB114    0x1142
 #define PCI_DEVICE_ID_CP114UL  0x1143
 #define PCI_DEVICE_ID_CB134I   0x1341
@@ -139,7 +140,8 @@ static const struct mxser_cardinfo mxser_cards[] = {
        { "CP-138U series",     8, },
        { "POS-104UL series",   4, },
        { "CP-114UL series",    4, },
-/*30*/ { "CP-102UF series",    2, }
+/*30*/ { "CP-102UF series",    2, },
+       { "CP-112UL series",    2, },
 };
 
 /* driver_data correspond to the lines in the structure above
@@ -170,6 +172,7 @@ static struct pci_device_id mxser_pcibrds[] = {
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL),    .driver_data = 28 },
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL),     .driver_data = 29 },
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF),     .driver_data = 30 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL),     .driver_data = 31 },
        { }
 };
 MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
@@ -258,7 +261,6 @@ struct mxser_port {
        struct mxser_mon mon_data;
 
        spinlock_t slock;
-       wait_queue_head_t delta_msr_wait;
 };
 
 struct mxser_board {
@@ -818,7 +820,7 @@ static void mxser_check_modem_status(struct tty_struct *tty,
        if (status & UART_MSR_DCTS)
                port->icount.cts++;
        port->mon_data.modem_status = status;
-       wake_up_interruptible(&port->delta_msr_wait);
+       wake_up_interruptible(&port->port.delta_msr_wait);
 
        if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
                if (status & UART_MSR_DCD)
@@ -973,7 +975,7 @@ static void mxser_shutdown(struct tty_struct *tty)
         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
         * here so the queue might never be waken up
         */
-       wake_up_interruptible(&info->delta_msr_wait);
+       wake_up_interruptible(&info->port.delta_msr_wait);
 
        /*
         * Free the IRQ, if necessary
@@ -1073,34 +1075,17 @@ static void mxser_flush_buffer(struct tty_struct *tty)
 }
 
 
-/*
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * async structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- */
-static void mxser_close(struct tty_struct *tty, struct file *filp)
+static void mxser_close_port(struct tty_struct *tty, struct tty_port *port)
 {
-       struct mxser_port *info = tty->driver_data;
-       struct tty_port *port = &info->port;
-
+       struct mxser_port *info = container_of(port, struct mxser_port, port);
        unsigned long timeout;
-
-       if (tty->index == MXSER_PORTS)
-               return;
-       if (!info)
-               return;
-
-       if (tty_port_close_start(port, tty, filp) == 0)
-               return;
-
        /*
         * Save the termios structure, since this port may have
         * separate termios for callout and dialin.
         *
         * FIXME: Can this go ?
         */
-       if (info->port.flags & ASYNC_NORMAL_ACTIVE)
+       if (port->flags & ASYNC_NORMAL_ACTIVE)
                info->normal_termios = *tty->termios;
        /*
         * At this point we stop accepting input.  To do this, we
@@ -1112,7 +1097,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
        if (info->board->chip_flag)
                info->IER &= ~MOXA_MUST_RECV_ISR;
 
-       if (info->port.flags & ASYNC_INITIALIZED) {
+       if (port->flags & ASYNC_INITIALIZED) {
                outb(info->IER, info->ioaddr + UART_IER);
                /*
                 * Before we drop DTR, make sure the UART transmitter
@@ -1127,8 +1112,26 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
                }
        }
        mxser_shutdown(tty);
-       mxser_flush_buffer(tty);
 
+}
+
+/*
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * async structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ */
+static void mxser_close(struct tty_struct *tty, struct file *filp)
+{
+       struct mxser_port *info = tty->driver_data;
+       struct tty_port *port = &info->port;
+
+       if (tty->index == MXSER_PORTS)
+               return;
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       mxser_close_port(tty, port);
+       mxser_flush_buffer(tty);
        /* Right now the tty_port set is done outside of the close_end helper
           as we don't yet have everyone using refcounts */     
        tty_port_close_end(port, tty);
@@ -1761,7 +1764,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
                cnow = info->icount;    /* note the counters on entry */
                spin_unlock_irqrestore(&info->slock, flags);
 
-               return wait_event_interruptible(info->delta_msr_wait,
+               return wait_event_interruptible(info->port.delta_msr_wait,
                                mxser_cflags_changed(info, arg, &cnow));
        /*
         * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
@@ -1803,7 +1806,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
 
                lock_kernel();
                len = mxser_chars_in_buffer(tty);
-               lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT;
+               lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;
                len += (lsr ? 0 : 1);
                unlock_kernel();
 
@@ -2413,7 +2416,6 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
                info->port.close_delay = 5 * HZ / 10;
                info->port.closing_wait = 30 * HZ;
                info->normal_termios = mxvar_sdriver->init_termios;
-               init_waitqueue_head(&info->delta_msr_wait);
                memset(&info->mon_data, 0, sizeof(struct mxser_mon));
                info->err_shadow = 0;
                spin_lock_init(&info->slock);
index 4e28b35..2e50f4d 100644 (file)
@@ -272,7 +272,8 @@ static inline int is_continuation(unsigned char c, struct tty_struct *tty)
  *
  *     This is a helper function that handles one output character
  *     (including special characters like TAB, CR, LF, etc.),
- *     putting the results in the tty driver's write buffer.
+ *     doing OPOST processing and putting the results in the
+ *     tty driver's write buffer.
  *
  *     Note that Linux currently ignores TABDLY, CRDLY, VTDLY, FFDLY
  *     and NLDLY.  They simply aren't relevant in the world today.
@@ -350,8 +351,9 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
  *     @c: character (or partial unicode symbol)
  *     @tty: terminal device
  *
- *     Perform OPOST processing.  Returns -1 when the output device is
- *     full and the character must be retried.
+ *     Output one character with OPOST processing.
+ *     Returns -1 when the output device is full and the character
+ *     must be retried.
  *
  *     Locking: output_lock to protect column state and space left
  *              (also, this is called from n_tty_write under the
@@ -377,8 +379,11 @@ static int process_output(unsigned char c, struct tty_struct *tty)
 /**
  *     process_output_block            -       block post processor
  *     @tty: terminal device
- *     @inbuf: user buffer
- *     @nr: number of bytes
+ *     @buf: character buffer
+ *     @nr: number of bytes to output
+ *
+ *     Output a block of characters with OPOST processing.
+ *     Returns the number of characters output.
  *
  *     This path is used to speed up block console writes, among other
  *     things when processing blocks of output data. It handles only
@@ -571,33 +576,23 @@ static void process_echoes(struct tty_struct *tty)
                                break;
 
                        default:
-                               if (iscntrl(op)) {
-                                       if (L_ECHOCTL(tty)) {
-                                               /*
-                                                * Ensure there is enough space
-                                                * for the whole ctrl pair.
-                                                */
-                                               if (space < 2) {
-                                                       no_space_left = 1;
-                                                       break;
-                                               }
-                                               tty_put_char(tty, '^');
-                                               tty_put_char(tty, op ^ 0100);
-                                               tty->column += 2;
-                                               space -= 2;
-                                       } else {
-                                               if (!space) {
-                                                       no_space_left = 1;
-                                                       break;
-                                               }
-                                               tty_put_char(tty, op);
-                                               space--;
-                                       }
-                               }
                                /*
-                                * If above falls through, this was an
-                                * undefined op.
+                                * If the op is not a special byte code,
+                                * it is a ctrl char tagged to be echoed
+                                * as "^X" (where X is the letter
+                                * representing the control char).
+                                * Note that we must ensure there is
+                                * enough space for the whole ctrl pair.
+                                *
                                 */
+                               if (space < 2) {
+                                       no_space_left = 1;
+                                       break;
+                               }
+                               tty_put_char(tty, '^');
+                               tty_put_char(tty, op ^ 0100);
+                               tty->column += 2;
+                               space -= 2;
                                cp += 2;
                                nr -= 2;
                        }
@@ -605,12 +600,18 @@ static void process_echoes(struct tty_struct *tty)
                        if (no_space_left)
                                break;
                } else {
-                       int retval;
-
-                       retval = do_output_char(c, tty, space);
-                       if (retval < 0)
-                               break;
-                       space -= retval;
+                       if (O_OPOST(tty) &&
+                           !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
+                               int retval = do_output_char(c, tty, space);
+                               if (retval < 0)
+                                       break;
+                               space -= retval;
+                       } else {
+                               if (!space)
+                                       break;
+                               tty_put_char(tty, c);
+                               space -= 1;
+                       }
                        cp += 1;
                        nr -= 1;
                }
@@ -798,8 +799,8 @@ static void echo_char_raw(unsigned char c, struct tty_struct *tty)
  *     Echo user input back onto the screen. This must be called only when
  *     L_ECHO(tty) is true. Called from the driver receive_buf path.
  *
- *     This variant tags control characters to be possibly echoed as
- *     as "^X" (where X is the letter representing the control char).
+ *     This variant tags control characters to be echoed as "^X"
+ *     (where X is the letter representing the control char).
  *
  *     Locking: echo_lock to protect the echo buffer
  */
@@ -812,7 +813,7 @@ static void echo_char(unsigned char c, struct tty_struct *tty)
                add_echo_byte(ECHO_OP_START, tty);
                add_echo_byte(ECHO_OP_START, tty);
        } else {
-               if (iscntrl(c) && c != '\t')
+               if (L_ECHOCTL(tty) && iscntrl(c) && c != '\t')
                        add_echo_byte(ECHO_OP_START, tty);
                add_echo_byte(c, tty);
        }
index 881934c..c250a31 100644 (file)
@@ -1017,7 +1017,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
                }
        }
 
-       if (dev->proto == 0 && count > dev->rlen - dev->rpos) {
+       if (dev->proto == 0 && count > dev->rlen - dev->rpos && i) {
                DEBUGP(4, dev, "T=0 and count > buffer\n");
                dev->rbuf[i] = dev->rbuf[i - 1];
                dev->rbuf[i - 1] = dev->procbyte;
index 40268db..64acd05 100644 (file)
@@ -261,7 +261,7 @@ static const struct file_operations raw_ctl_fops = {
 
 static struct cdev raw_cdev;
 
-static char *raw_nodename(struct device *dev)
+static char *raw_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "raw/%s", dev_name(dev));
 }
@@ -289,7 +289,7 @@ static int __init raw_init(void)
                ret = PTR_ERR(raw_class);
                goto error_region;
        }
-       raw_class->nodename = raw_nodename;
+       raw_class->devnode = raw_devnode;
        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
        return 0;
index 171711a..3cfa22d 100644 (file)
@@ -343,7 +343,7 @@ static void rc_receive_exc(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
 #ifdef RC_REPORT_OVERRUN
        status = rc_in(bp, CD180_RCSR);
@@ -355,18 +355,18 @@ static void rc_receive_exc(struct riscom_board const *bp)
 #endif
        ch = rc_in(bp, CD180_RDR);
        if (!status)
-               return;
+               goto out;
        if (status & RCSR_TOUT)  {
                printk(KERN_WARNING "rc%d: port %d: Receiver timeout. "
                                    "Hardware problems ?\n",
                       board_No(bp), port_No(port));
-               return;
+               goto out;
 
        } else if (status & RCSR_BREAK)  {
                printk(KERN_INFO "rc%d: port %d: Handling break...\n",
                       board_No(bp), port_No(port));
                flag = TTY_BREAK;
-               if (port->port.flags & ASYNC_SAK)
+               if (tty && (port->port.flags & ASYNC_SAK))
                        do_SAK(tty);
 
        } else if (status & RCSR_PE)
@@ -380,8 +380,12 @@ static void rc_receive_exc(struct riscom_board const *bp)
        else
                flag = TTY_NORMAL;
 
-       tty_insert_flip_char(tty, ch, flag);
-       tty_flip_buffer_push(tty);
+       if (tty) {
+               tty_insert_flip_char(tty, ch, flag);
+               tty_flip_buffer_push(tty);
+       }
+out:
+       tty_kref_put(tty);
 }
 
 static void rc_receive(struct riscom_board const *bp)
@@ -394,7 +398,7 @@ static void rc_receive(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        count = rc_in(bp, CD180_RDCR);
 
@@ -403,15 +407,14 @@ static void rc_receive(struct riscom_board const *bp)
 #endif
 
        while (count--)  {
-               if (tty_buffer_request_room(tty, 1) == 0)  {
-                       printk(KERN_WARNING "rc%d: port %d: Working around "
-                                           "flip buffer overflow.\n",
-                              board_No(bp), port_No(port));
-                       break;
-               }
-               tty_insert_flip_char(tty, rc_in(bp, CD180_RDR), TTY_NORMAL);
+               u8 ch = rc_in(bp, CD180_RDR);
+               if (tty)
+                       tty_insert_flip_char(tty, ch, TTY_NORMAL);
+       }
+       if (tty) {
+               tty_flip_buffer_push(tty);
+               tty_kref_put(tty);
        }
-       tty_flip_buffer_push(tty);
 }
 
 static void rc_transmit(struct riscom_board const *bp)
@@ -424,22 +427,22 @@ static void rc_transmit(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        if (port->IER & IER_TXEMPTY) {
                /* FIFO drained */
                rc_out(bp, CD180_CAR, port_No(port));
                port->IER &= ~IER_TXEMPTY;
                rc_out(bp, CD180_IER, port->IER);
-               return;
+               goto out;
        }
 
        if ((port->xmit_cnt <= 0 && !port->break_length)
-           || tty->stopped || tty->hw_stopped)  {
+           || (tty && (tty->stopped || tty->hw_stopped)))  {
                rc_out(bp, CD180_CAR, port_No(port));
                port->IER &= ~IER_TXRDY;
                rc_out(bp, CD180_IER, port->IER);
-               return;
+               goto out;
        }
 
        if (port->break_length)  {
@@ -464,7 +467,7 @@ static void rc_transmit(struct riscom_board const *bp)
                        rc_out(bp, CD180_CCR, CCR_CORCHG2);
                        port->break_length = 0;
                }
-               return;
+               goto out;
        }
 
        count = CD180_NFIFO;
@@ -480,8 +483,10 @@ static void rc_transmit(struct riscom_board const *bp)
                port->IER &= ~IER_TXRDY;
                rc_out(bp, CD180_IER, port->IER);
        }
-       if (port->xmit_cnt <= port->wakeup_chars)
+       if (tty && port->xmit_cnt <= port->wakeup_chars)
                tty_wakeup(tty);
+out:
+       tty_kref_put(tty);
 }
 
 static void rc_check_modem(struct riscom_board const *bp)
@@ -494,37 +499,43 @@ static void rc_check_modem(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        mcr = rc_in(bp, CD180_MCR);
        if (mcr & MCR_CDCHG) {
                if (rc_in(bp, CD180_MSVR) & MSVR_CD)
                        wake_up_interruptible(&port->port.open_wait);
-               else
+               else if (tty)
                        tty_hangup(tty);
        }
 
 #ifdef RISCOM_BRAIN_DAMAGED_CTS
        if (mcr & MCR_CTSCHG)  {
                if (rc_in(bp, CD180_MSVR) & MSVR_CTS)  {
-                       tty->hw_stopped = 0;
                        port->IER |= IER_TXRDY;
-                       if (port->xmit_cnt <= port->wakeup_chars)
-                               tty_wakeup(tty);
+                       if (tty) {
+                               tty->hw_stopped = 0;
+                               if (port->xmit_cnt <= port->wakeup_chars)
+                                       tty_wakeup(tty);
+                       }
                } else  {
-                       tty->hw_stopped = 1;
+                       if (tty)
+                               tty->hw_stopped = 1;
                        port->IER &= ~IER_TXRDY;
                }
                rc_out(bp, CD180_IER, port->IER);
        }
        if (mcr & MCR_DSRCHG)  {
                if (rc_in(bp, CD180_MSVR) & MSVR_DSR)  {
-                       tty->hw_stopped = 0;
                        port->IER |= IER_TXRDY;
-                       if (port->xmit_cnt <= port->wakeup_chars)
-                               tty_wakeup(tty);
+                       if (tty) {
+                               tty->hw_stopped = 0;
+                               if (port->xmit_cnt <= port->wakeup_chars)
+                                       tty_wakeup(tty);
+                       }
                } else  {
-                       tty->hw_stopped = 1;
+                       if (tty)
+                               tty->hw_stopped = 1;
                        port->IER &= ~IER_TXRDY;
                }
                rc_out(bp, CD180_IER, port->IER);
@@ -533,6 +544,7 @@ static void rc_check_modem(struct riscom_board const *bp)
 
        /* Clear change bits */
        rc_out(bp, CD180_MCR, 0);
+       tty_kref_put(tty);
 }
 
 /* The main interrupt processing routine */
@@ -632,9 +644,9 @@ static void rc_shutdown_board(struct riscom_board *bp)
  * Setting up port characteristics.
  * Must be called with disabled interrupts
  */
-static void rc_change_speed(struct riscom_board *bp, struct riscom_port *port)
+static void rc_change_speed(struct tty_struct *tty, struct riscom_board *bp,
+                                               struct riscom_port *port)
 {
-       struct tty_struct *tty = port->port.tty;
        unsigned long baud;
        long tmp;
        unsigned char cor1 = 0, cor3 = 0;
@@ -781,7 +793,8 @@ static void rc_change_speed(struct riscom_board *bp, struct riscom_port *port)
 }
 
 /* Must be called with interrupts enabled */
-static int rc_setup_port(struct riscom_board *bp, struct riscom_port *port)
+static int rc_setup_port(struct tty_struct *tty, struct riscom_board *bp,
+                                               struct riscom_port *port)
 {
        unsigned long flags;
 
@@ -793,11 +806,11 @@ static int rc_setup_port(struct riscom_board *bp, struct riscom_port *port)
 
        spin_lock_irqsave(&riscom_lock, flags);
 
-       clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
+       clear_bit(TTY_IO_ERROR, &tty->flags);
        if (port->port.count == 1)
                bp->count++;
        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-       rc_change_speed(bp, port);
+       rc_change_speed(tty, bp, port);
        port->port.flags |= ASYNC_INITIALIZED;
 
        spin_unlock_irqrestore(&riscom_lock, flags);
@@ -898,9 +911,9 @@ static int rc_open(struct tty_struct *tty, struct file *filp)
 
        port->port.count++;
        tty->driver_data = port;
-       port->port.tty = tty;
+       tty_port_tty_set(&port->port, tty);
 
-       error = rc_setup_port(bp, port);
+       error = rc_setup_port(tty, bp, port);
        if (error == 0)
                error = tty_port_block_til_ready(&port->port, tty, filp);
        return error;
@@ -921,20 +934,12 @@ static void rc_flush_buffer(struct tty_struct *tty)
        tty_wakeup(tty);
 }
 
-static void rc_close(struct tty_struct *tty, struct file *filp)
+static void rc_close_port(struct tty_port *port)
 {
-       struct riscom_port *port = tty->driver_data;
-       struct riscom_board *bp;
        unsigned long flags;
+       struct riscom_port *rp = container_of(port, struct riscom_port, port);
+       struct riscom_board *bp = port_Board(rp);
        unsigned long timeout;
-
-       if (!port || rc_paranoia_check(port, tty->name, "close"))
-               return;
-
-       bp = port_Board(port);
-       
-       if (tty_port_close_start(&port->port, tty, filp) == 0)
-               return;
        
        /*
         * At this point we stop accepting input.  To do this, we
@@ -944,31 +949,37 @@ static void rc_close(struct tty_struct *tty, struct file *filp)
         */
 
        spin_lock_irqsave(&riscom_lock, flags);
-       port->IER &= ~IER_RXD;
-       if (port->port.flags & ASYNC_INITIALIZED) {
-               port->IER &= ~IER_TXRDY;
-               port->IER |= IER_TXEMPTY;
-               rc_out(bp, CD180_CAR, port_No(port));
-               rc_out(bp, CD180_IER, port->IER);
+       rp->IER &= ~IER_RXD;
+       if (port->flags & ASYNC_INITIALIZED) {
+               rp->IER &= ~IER_TXRDY;
+               rp->IER |= IER_TXEMPTY;
+               rc_out(bp, CD180_CAR, port_No(rp));
+               rc_out(bp, CD180_IER, rp->IER);
                /*
                 * Before we drop DTR, make sure the UART transmitter
                 * has completely drained; this is especially
                 * important if there is a transmit FIFO!
                 */
                timeout = jiffies + HZ;
-               while (port->IER & IER_TXEMPTY) {
+               while (rp->IER & IER_TXEMPTY) {
                        spin_unlock_irqrestore(&riscom_lock, flags);
-                       msleep_interruptible(jiffies_to_msecs(port->timeout));
+                       msleep_interruptible(jiffies_to_msecs(rp->timeout));
                        spin_lock_irqsave(&riscom_lock, flags);
                        if (time_after(jiffies, timeout))
                                break;
                }
        }
-       rc_shutdown_port(tty, bp, port);
-       rc_flush_buffer(tty);
+       rc_shutdown_port(port->tty, bp, rp);
        spin_unlock_irqrestore(&riscom_lock, flags);
+}
+
+static void rc_close(struct tty_struct *tty, struct file *filp)
+{
+       struct riscom_port *port = tty->driver_data;
 
-       tty_port_close_end(&port->port, tty);
+       if (!port || rc_paranoia_check(port, tty->name, "close"))
+               return;
+       tty_port_close(&port->port, tty, filp);
 }
 
 static int rc_write(struct tty_struct *tty,
@@ -1170,7 +1181,7 @@ static int rc_send_break(struct tty_struct *tty, int length)
        return 0;
 }
 
-static int rc_set_serial_info(struct riscom_port *port,
+static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,
                                     struct serial_struct __user *newinfo)
 {
        struct serial_struct tmp;
@@ -1180,17 +1191,6 @@ static int rc_set_serial_info(struct riscom_port *port,
        if (copy_from_user(&tmp, newinfo, sizeof(tmp)))
                return -EFAULT;
 
-#if 0
-       if ((tmp.irq != bp->irq) ||
-           (tmp.port != bp->base) ||
-           (tmp.type != PORT_CIRRUS) ||
-           (tmp.baud_base != (RC_OSCFREQ + CD180_TPC/2) / CD180_TPC) ||
-           (tmp.custom_divisor != 0) ||
-           (tmp.xmit_fifo_size != CD180_NFIFO) ||
-           (tmp.flags & ~RISCOM_LEGAL_FLAGS))
-               return -EINVAL;
-#endif
-
        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
                        (tmp.flags & ASYNC_SPD_MASK));
 
@@ -1212,7 +1212,7 @@ static int rc_set_serial_info(struct riscom_port *port,
                unsigned long flags;
 
                spin_lock_irqsave(&riscom_lock, flags);
-               rc_change_speed(bp, port);
+               rc_change_speed(tty, bp, port);
                spin_unlock_irqrestore(&riscom_lock, flags);
        }
        return 0;
@@ -1255,7 +1255,7 @@ static int rc_ioctl(struct tty_struct *tty, struct file *filp,
                break;
        case TIOCSSERIAL:
                lock_kernel();
-               retval = rc_set_serial_info(port, argp);
+               retval = rc_set_serial_info(tty, port, argp);
                unlock_kernel();
                break;
        default:
@@ -1350,21 +1350,12 @@ static void rc_start(struct tty_struct *tty)
 static void rc_hangup(struct tty_struct *tty)
 {
        struct riscom_port *port = tty->driver_data;
-       struct riscom_board *bp;
-       unsigned long flags;
 
        if (rc_paranoia_check(port, tty->name, "rc_hangup"))
                return;
 
-       bp = port_Board(port);
-
-       rc_shutdown_port(tty, bp, port);
-       spin_lock_irqsave(&port->port.lock, flags);
-       port->port.count = 0;
-       port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-       port->port.tty = NULL;
-       wake_up_interruptible(&port->port.open_wait);
-       spin_unlock_irqrestore(&port->port.lock, flags);
+       rc_shutdown_port(tty, port_Board(port), port);
+       tty_port_hangup(&port->port);
 }
 
 static void rc_set_termios(struct tty_struct *tty,
@@ -1377,7 +1368,7 @@ static void rc_set_termios(struct tty_struct *tty,
                return;
 
        spin_lock_irqsave(&riscom_lock, flags);
-       rc_change_speed(port_Board(port), port);
+       rc_change_speed(tty, port_Board(port), port);
        spin_unlock_irqrestore(&riscom_lock, flags);
 
        if ((old_termios->c_cflag & CRTSCTS) &&
@@ -1410,6 +1401,7 @@ static const struct tty_operations riscom_ops = {
 
 static const struct tty_port_operations riscom_port_ops = {
        .carrier_raised = carrier_raised,
+       .shutdown = rc_close_port,
 };
 
 
index 50eecfe..44203ff 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/proc_fs.h>
 #include <linux/nmi.h>
 #include <linux/quotaops.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
@@ -252,7 +252,7 @@ static void sysrq_handle_showregs(int key, struct tty_struct *tty)
        struct pt_regs *regs = get_irq_regs();
        if (regs)
                show_regs(regs);
-       perf_counter_print_debug();
+       perf_event_print_debug();
 }
 static struct sysrq_key_op sysrq_showregs_op = {
        .handler        = sysrq_handle_showregs,
index b0603b2..32b957e 100644 (file)
@@ -696,7 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
 
        cmd.header.in = pcrread_header;
        cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);
-       BUILD_BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);
+       BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);
        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
                          "attempting to read a pcr value");
 
@@ -760,7 +760,7 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
                return -ENODEV;
 
        cmd.header.in = pcrextend_header;
-       BUILD_BUG_ON(be32_to_cpu(cmd.header.in.length) > EXTEND_PCR_SIZE);
+       BUG_ON(be32_to_cpu(cmd.header.in.length) > EXTEND_PCR_SIZE);
        cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);
        memcpy(cmd.params.pcrextend_in.hash, hash, TPM_DIGEST_SIZE);
        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
index 0c2f55a..bf2170f 100644 (file)
@@ -343,14 +343,14 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations tpm_ascii_b_measurments_seqops = {
+static const struct seq_operations tpm_ascii_b_measurments_seqops = {
        .start = tpm_bios_measurements_start,
        .next = tpm_bios_measurements_next,
        .stop = tpm_bios_measurements_stop,
        .show = tpm_ascii_bios_measurements_show,
 };
 
-static struct seq_operations tpm_binary_b_measurments_seqops = {
+static const struct seq_operations tpm_binary_b_measurments_seqops = {
        .start = tpm_bios_measurements_start,
        .next = tpm_bios_measurements_next,
        .stop = tpm_bios_measurements_stop,
index a3afa0c..ea18a12 100644 (file)
@@ -1184,6 +1184,7 @@ int tty_init_termios(struct tty_struct *tty)
        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
        return 0;
 }
+EXPORT_SYMBOL_GPL(tty_init_termios);
 
 /**
  *     tty_driver_install_tty() - install a tty entry in the driver
@@ -1386,10 +1387,14 @@ EXPORT_SYMBOL(tty_shutdown);
  *             tty_mutex - sometimes only
  *             takes the file list lock internally when working on the list
  *     of ttys that the driver keeps.
+ *
+ *     This method gets called from a work queue so that the driver private
+ *     shutdown ops can sleep (needed for USB at least)
  */
-static void release_one_tty(struct kref *kref)
+static void release_one_tty(struct work_struct *work)
 {
-       struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
+       struct tty_struct *tty =
+               container_of(work, struct tty_struct, hangup_work);
        struct tty_driver *driver = tty->driver;
 
        if (tty->ops->shutdown)
@@ -1407,6 +1412,15 @@ static void release_one_tty(struct kref *kref)
        free_tty_struct(tty);
 }
 
+static void queue_release_one_tty(struct kref *kref)
+{
+       struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
+       /* The hangup queue is now free so we can reuse it rather than
+          waste a chunk of memory for each port */
+       INIT_WORK(&tty->hangup_work, release_one_tty);
+       schedule_work(&tty->hangup_work);
+}
+
 /**
  *     tty_kref_put            -       release a tty kref
  *     @tty: tty device
@@ -1418,7 +1432,7 @@ static void release_one_tty(struct kref *kref)
 void tty_kref_put(struct tty_struct *tty)
 {
        if (tty)
-               kref_put(&tty->kref, release_one_tty);
+               kref_put(&tty->kref, queue_release_one_tty);
 }
 EXPORT_SYMBOL(tty_kref_put);
 
@@ -2085,7 +2099,7 @@ static int tioccons(struct file *file)
  *     the generic functionality existed. This piece of history is preserved
  *     in the expected tty API of posix OS's.
  *
- *     Locking: none, the open fle handle ensures it won't go away.
+ *     Locking: none, the open file handle ensures it won't go away.
  */
 
 static int fionbio(struct file *file, int __user *p)
@@ -3056,11 +3070,22 @@ void __init console_init(void)
        }
 }
 
+static char *tty_devnode(struct device *dev, mode_t *mode)
+{
+       if (!mode)
+               return NULL;
+       if (dev->devt == MKDEV(TTYAUX_MAJOR, 0) ||
+           dev->devt == MKDEV(TTYAUX_MAJOR, 2))
+               *mode = 0666;
+       return NULL;
+}
+
 static int __init tty_class_init(void)
 {
        tty_class = class_create(THIS_MODULE, "tty");
        if (IS_ERR(tty_class))
                return PTR_ERR(tty_class);
+       tty_class->devnode = tty_devnode;
        return 0;
 }
 
index ad6ba4e..8e67d5c 100644 (file)
@@ -393,9 +393,7 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
                termios->c_cflag |= (BOTHER << IBSHIFT);
 #else
        if (ifound == -1 || ofound == -1) {
-               static int warned;
-               if (!warned++)
-                       printk(KERN_WARNING "tty: Unable to return correct "
+               printk_once(KERN_WARNING "tty: Unable to return correct "
                          "speed data as your architecture needs updating.\n");
        }
 #endif
index e48af9f..aafdbae 100644 (file)
@@ -145,48 +145,33 @@ int tty_unregister_ldisc(int disc)
 }
 EXPORT_SYMBOL(tty_unregister_ldisc);
 
-
-/**
- *     tty_ldisc_try_get       -       try and reference an ldisc
- *     @disc: ldisc number
- *
- *     Attempt to open and lock a line discipline into place. Return
- *     the line discipline refcounted or an error.
- */
-
-static struct tty_ldisc *tty_ldisc_try_get(int disc)
+static struct tty_ldisc_ops *get_ldops(int disc)
 {
        unsigned long flags;
-       struct tty_ldisc *ld;
-       struct tty_ldisc_ops *ldops;
-       int err = -EINVAL;
-
-       ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
-       if (ld == NULL)
-               return ERR_PTR(-ENOMEM);
+       struct tty_ldisc_ops *ldops, *ret;
 
        spin_lock_irqsave(&tty_ldisc_lock, flags);
-       ld->ops = NULL;
+       ret = ERR_PTR(-EINVAL);
        ldops = tty_ldiscs[disc];
-       /* Check the entry is defined */
        if (ldops) {
-               /* If the module is being unloaded we can't use it */
-               if (!try_module_get(ldops->owner))
-                       err = -EAGAIN;
-               else {
-                       /* lock it */
+               ret = ERR_PTR(-EAGAIN);
+               if (try_module_get(ldops->owner)) {
                        ldops->refcount++;
-                       ld->ops = ldops;
-                       atomic_set(&ld->users, 1);
-                       err = 0;
+                       ret = ldops;
                }
        }
        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-       if (err) {
-               kfree(ld);
-               return ERR_PTR(err);
-       }
-       return ld;
+       return ret;
+}
+
+static void put_ldops(struct tty_ldisc_ops *ldops)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&tty_ldisc_lock, flags);
+       ldops->refcount--;
+       module_put(ldops->owner);
+       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
 
 /**
@@ -205,14 +190,31 @@ static struct tty_ldisc *tty_ldisc_try_get(int disc)
 static struct tty_ldisc *tty_ldisc_get(int disc)
 {
        struct tty_ldisc *ld;
+       struct tty_ldisc_ops *ldops;
 
        if (disc < N_TTY || disc >= NR_LDISCS)
                return ERR_PTR(-EINVAL);
-       ld = tty_ldisc_try_get(disc);
-       if (IS_ERR(ld)) {
+
+       /*
+        * Get the ldisc ops - we may need to request them to be loaded
+        * dynamically and try again.
+        */
+       ldops = get_ldops(disc);
+       if (IS_ERR(ldops)) {
                request_module("tty-ldisc-%d", disc);
-               ld = tty_ldisc_try_get(disc);
+               ldops = get_ldops(disc);
+               if (IS_ERR(ldops))
+                       return ERR_CAST(ldops);
        }
+
+       ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
+       if (ld == NULL) {
+               put_ldops(ldops);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       ld->ops = ldops;
+       atomic_set(&ld->users, 1);
        return ld;
 }
 
@@ -234,13 +236,13 @@ static void tty_ldiscs_seq_stop(struct seq_file *m, void *v)
 static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
 {
        int i = *(loff_t *)v;
-       struct tty_ldisc *ld;
+       struct tty_ldisc_ops *ldops;
 
-       ld = tty_ldisc_try_get(i);
-       if (IS_ERR(ld))
+       ldops = get_ldops(i);
+       if (IS_ERR(ldops))
                return 0;
-       seq_printf(m, "%-10s %2d\n", ld->ops->name ? ld->ops->name : "???", i);
-       put_ldisc(ld);
+       seq_printf(m, "%-10s %2d\n", ldops->name ? ldops->name : "???", i);
+       put_ldops(ldops);
        return 0;
 }
 
index 9769b11..a4bbb28 100644 (file)
@@ -23,6 +23,7 @@ void tty_port_init(struct tty_port *port)
        memset(port, 0, sizeof(*port));
        init_waitqueue_head(&port->open_wait);
        init_waitqueue_head(&port->close_wait);
+       init_waitqueue_head(&port->delta_msr_wait);
        mutex_init(&port->mutex);
        spin_lock_init(&port->lock);
        port->close_delay = (50 * HZ) / 100;
@@ -96,6 +97,14 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
 }
 EXPORT_SYMBOL(tty_port_tty_set);
 
+static void tty_port_shutdown(struct tty_port *port)
+{
+       if (port->ops->shutdown &&
+               test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
+                       port->ops->shutdown(port);
+
+}
+
 /**
  *     tty_port_hangup         -       hangup helper
  *     @port: tty port
@@ -116,6 +125,8 @@ void tty_port_hangup(struct tty_port *port)
        port->tty = NULL;
        spin_unlock_irqrestore(&port->lock, flags);
        wake_up_interruptible(&port->open_wait);
+       wake_up_interruptible(&port->delta_msr_wait);
+       tty_port_shutdown(port);
 }
 EXPORT_SYMBOL(tty_port_hangup);
 
@@ -296,15 +307,17 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
 
        if (port->count) {
                spin_unlock_irqrestore(&port->lock, flags);
+               if (port->ops->drop)
+                       port->ops->drop(port);
                return 0;
        }
-       port->flags |= ASYNC_CLOSING;
+       set_bit(ASYNCB_CLOSING, &port->flags);
        tty->closing = 1;
        spin_unlock_irqrestore(&port->lock, flags);
        /* Don't block on a stalled port, just pull the chain */
        if (tty->flow_stopped)
                tty_driver_flush_buffer(tty);
-       if (port->flags & ASYNC_INITIALIZED &&
+       if (test_bit(ASYNCB_INITIALIZED, &port->flags) &&
                        port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
                tty_wait_until_sent(tty, port->closing_wait);
        if (port->drain_delay) {
@@ -318,6 +331,9 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
                        timeout = 2 * HZ;
                schedule_timeout_interruptible(timeout);
        }
+       /* Don't call port->drop for the last reference. Callers will want
+          to drop the last active reference in ->shutdown() or the tty
+          shutdown path */
        return 1;
 }
 EXPORT_SYMBOL(tty_port_close_start);
@@ -348,3 +364,14 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
        spin_unlock_irqrestore(&port->lock, flags);
 }
 EXPORT_SYMBOL(tty_port_close_end);
+
+void tty_port_close(struct tty_port *port, struct tty_struct *tty,
+                                                       struct file *filp)
+{
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       tty_port_shutdown(port);
+       tty_port_close_end(port, tty);
+       tty_port_tty_set(port, NULL);
+}
+EXPORT_SYMBOL(tty_port_close);
index c74dacf..0d328b5 100644 (file)
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_console.h>
 #include "hvc_console.h"
 
@@ -65,7 +66,7 @@ static int put_chars(u32 vtermno, const char *buf, int count)
 
        /* add_buf wants a token to identify this buffer: we hand it any
         * non-NULL pointer, since there's only ever one buffer. */
-       if (out_vq->vq_ops->add_buf(out_vq, sg, 1, 0, (void *)1) == 0) {
+       if (out_vq->vq_ops->add_buf(out_vq, sg, 1, 0, (void *)1) >= 0) {
                /* Tell Host to go! */
                out_vq->vq_ops->kick(out_vq);
                /* Chill out until it's done with the buffer. */
@@ -85,7 +86,7 @@ static void add_inbuf(void)
        sg_init_one(sg, inbuf, PAGE_SIZE);
 
        /* We should always be able to add one buffer to an empty queue. */
-       if (in_vq->vq_ops->add_buf(in_vq, sg, 0, 1, inbuf) != 0)
+       if (in_vq->vq_ops->add_buf(in_vq, sg, 0, 1, inbuf) < 0)
                BUG();
        in_vq->vq_ops->kick(in_vq);
 }
index 6aa88f5..0c80c68 100644 (file)
@@ -252,7 +252,6 @@ static void notify_update(struct vc_data *vc)
        struct vt_notifier_param param = { .vc = vc };
        atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, &param);
 }
-
 /*
  *     Low-Level Functions
  */
@@ -935,6 +934,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 
        if (CON_IS_VISIBLE(vc))
                update_screen(vc);
+       vt_event_post(VT_EVENT_RESIZE, vc->vc_num, vc->vc_num);
        return err;
 }
 
@@ -2129,11 +2129,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
        currcons = vc->vc_num;
        if (!vc_cons_allocated(currcons)) {
            /* could this happen? */
-           static int error = 0;
-           if (!error) {
-               error = 1;
-               printk("con_write: tty %d not allocated\n", currcons+1);
-           }
+               printk_once("con_write: tty %d not allocated\n", currcons+1);
            release_console_sem();
            return 0;
        }
@@ -2910,6 +2906,9 @@ static const struct tty_operations con_ops = {
        .flush_chars = con_flush_chars,
        .chars_in_buffer = con_chars_in_buffer,
        .ioctl = vt_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = vt_compat_ioctl,
+#endif
        .stop = con_stop,
        .start = con_start,
        .throttle = con_throttle,
@@ -2955,7 +2954,6 @@ int __init vty_init(const struct file_operations *console_fops)
 }
 
 #ifndef VT_SINGLE_DRIVER
-#include <linux/device.h>
 
 static struct class *vtconsole_class;
 
@@ -3638,6 +3636,7 @@ void do_blank_screen(int entering_gfx)
                blank_state = blank_vesa_wait;
                mod_timer(&console_timer, jiffies + vesa_off_interval);
        }
+       vt_event_post(VT_EVENT_BLANK, vc->vc_num, vc->vc_num);
 }
 EXPORT_SYMBOL(do_blank_screen);
 
@@ -3682,6 +3681,7 @@ void do_unblank_screen(int leaving_gfx)
                console_blank_hook(0);
        set_palette(vc);
        set_cursor(vc);
+       vt_event_post(VT_EVENT_UNBLANK, vc->vc_num, vc->vc_num);
 }
 EXPORT_SYMBOL(do_unblank_screen);
 
index 95189f2..29c651a 100644 (file)
@@ -16,6 +16,8 @@
 #include <linux/tty.h>
 #include <linux/timer.h>
 #include <linux/kernel.h>
+#include <linux/compat.h>
+#include <linux/module.h>
 #include <linux/kd.h>
 #include <linux/vt.h>
 #include <linux/string.h>
@@ -61,6 +63,133 @@ extern struct tty_driver *console_driver;
 
 static void complete_change_console(struct vc_data *vc);
 
+/*
+ *     User space VT_EVENT handlers
+ */
+
+struct vt_event_wait {
+       struct list_head list;
+       struct vt_event event;
+       int done;
+};
+
+static LIST_HEAD(vt_events);
+static DEFINE_SPINLOCK(vt_event_lock);
+static DECLARE_WAIT_QUEUE_HEAD(vt_event_waitqueue);
+
+/**
+ *     vt_event_post
+ *     @event: the event that occurred
+ *     @old: old console
+ *     @new: new console
+ *
+ *     Post an VT event to interested VT handlers
+ */
+
+void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
+{
+       struct list_head *pos, *head;
+       unsigned long flags;
+       int wake = 0;
+
+       spin_lock_irqsave(&vt_event_lock, flags);
+       head = &vt_events;
+
+       list_for_each(pos, head) {
+               struct vt_event_wait *ve = list_entry(pos,
+                                               struct vt_event_wait, list);
+               if (!(ve->event.event & event))
+                       continue;
+               ve->event.event = event;
+               /* kernel view is consoles 0..n-1, user space view is
+                  console 1..n with 0 meaning current, so we must bias */
+               ve->event.old = old + 1;
+               ve->event.new = new + 1;
+               wake = 1;
+               ve->done = 1;
+       }
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+       if (wake)
+               wake_up_interruptible(&vt_event_waitqueue);
+}
+
+/**
+ *     vt_event_wait           -       wait for an event
+ *     @vw: our event
+ *
+ *     Waits for an event to occur which completes our vt_event_wait
+ *     structure. On return the structure has wv->done set to 1 for success
+ *     or 0 if some event such as a signal ended the wait.
+ */
+
+static void vt_event_wait(struct vt_event_wait *vw)
+{
+       unsigned long flags;
+       /* Prepare the event */
+       INIT_LIST_HEAD(&vw->list);
+       vw->done = 0;
+       /* Queue our event */
+       spin_lock_irqsave(&vt_event_lock, flags);
+       list_add(&vw->list, &vt_events);
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+       /* Wait for it to pass */
+       wait_event_interruptible(vt_event_waitqueue, vw->done);
+       /* Dequeue it */
+       spin_lock_irqsave(&vt_event_lock, flags);
+       list_del(&vw->list);
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+}
+
+/**
+ *     vt_event_wait_ioctl     -       event ioctl handler
+ *     @arg: argument to ioctl
+ *
+ *     Implement the VT_WAITEVENT ioctl using the VT event interface
+ */
+
+static int vt_event_wait_ioctl(struct vt_event __user *event)
+{
+       struct vt_event_wait vw;
+
+       if (copy_from_user(&vw.event, event, sizeof(struct vt_event)))
+               return -EFAULT;
+       /* Highest supported event for now */
+       if (vw.event.event & ~VT_MAX_EVENT)
+               return -EINVAL;
+
+       vt_event_wait(&vw);
+       /* If it occurred report it */
+       if (vw.done) {
+               if (copy_to_user(event, &vw.event, sizeof(struct vt_event)))
+                       return -EFAULT;
+               return 0;
+       }
+       return -EINTR;
+}
+
+/**
+ *     vt_waitactive   -       active console wait
+ *     @event: event code
+ *     @n: new console
+ *
+ *     Helper for event waits. Used to implement the legacy
+ *     event waiting ioctls in terms of events
+ */
+
+int vt_waitactive(int n)
+{
+       struct vt_event_wait vw;
+       do {
+               if (n == fg_console + 1)
+                       break;
+               vw.event.event = VT_EVENT_SWITCH;
+               vt_event_wait(&vw);
+               if (vw.done == 0)
+                       return -EINTR;
+       } while (vw.event.new != n);
+       return 0;
+}
+
 /*
  * these are the valid i/o ports we're allowed to change. they map all the
  * video ports
@@ -360,6 +489,8 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_
        return 0;
 }
 
+
+
 /*
  * We handle the console-specific ioctl's here.  We allow the
  * capability to modify any console, not just the fg_console. 
@@ -842,6 +973,41 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                }
                break;
 
+       case VT_SETACTIVATE:
+       {
+               struct vt_setactivate vsa;
+
+               if (!perm)
+                       goto eperm;
+
+               if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
+                                               sizeof(struct vt_setactivate)))
+                       return -EFAULT;
+               if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
+                       ret = -ENXIO;
+               else {
+                       vsa.console--;
+                       acquire_console_sem();
+                       ret = vc_allocate(vsa.console);
+                       if (ret == 0) {
+                               struct vc_data *nvc;
+                               /* This is safe providing we don't drop the
+                                  console sem between vc_allocate and
+                                  finishing referencing nvc */
+                               nvc = vc_cons[vsa.console].d;
+                               nvc->vt_mode = vsa.mode;
+                               nvc->vt_mode.frsig = 0;
+                               put_pid(nvc->vt_pid);
+                               nvc->vt_pid = get_pid(task_pid(current));
+                       }
+                       release_console_sem();
+                       if (ret)
+                               break;
+                       /* Commence switch and lock */
+                       set_console(arg);
+               }
+       }
+
        /*
         * wait until the specified VT has been activated
         */
@@ -851,7 +1017,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                if (arg == 0 || arg > MAX_NR_CONSOLES)
                        ret = -ENXIO;
                else
-                       ret = vt_waitactive(arg - 1);
+                       ret = vt_waitactive(arg);
                break;
 
        /*
@@ -1159,6 +1325,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                ret = put_user(vc->vc_hi_font_mask,
                                        (unsigned short __user *)arg);
                break;
+       case VT_WAITEVENT:
+               ret = vt_event_wait_ioctl((struct vt_event __user *)arg);
+               break;
        default:
                ret = -ENOIOCTLCMD;
        }
@@ -1170,54 +1339,6 @@ eperm:
        goto out;
 }
 
-/*
- * Sometimes we want to wait until a particular VT has been activated. We
- * do it in a very simple manner. Everybody waits on a single queue and
- * get woken up at once. Those that are satisfied go on with their business,
- * while those not ready go back to sleep. Seems overkill to add a wait
- * to each vt just for this - usually this does nothing!
- */
-static DECLARE_WAIT_QUEUE_HEAD(vt_activate_queue);
-
-/*
- * Sleeps until a vt is activated, or the task is interrupted. Returns
- * 0 if activation, -EINTR if interrupted by a signal handler.
- */
-int vt_waitactive(int vt)
-{
-       int retval;
-       DECLARE_WAITQUEUE(wait, current);
-
-       add_wait_queue(&vt_activate_queue, &wait);
-       for (;;) {
-               retval = 0;
-
-               /*
-                * Synchronize with redraw_screen(). By acquiring the console
-                * semaphore we make sure that the console switch is completed
-                * before we return. If we didn't wait for the semaphore, we
-                * could return at a point where fg_console has already been
-                * updated, but the console switch hasn't been completed.
-                */
-               acquire_console_sem();
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (vt == fg_console) {
-                       release_console_sem();
-                       break;
-               }
-               release_console_sem();
-               retval = -ERESTARTNOHAND;
-               if (signal_pending(current))
-                       break;
-               schedule();
-       }
-       remove_wait_queue(&vt_activate_queue, &wait);
-       __set_current_state(TASK_RUNNING);
-       return retval;
-}
-
-#define vt_wake_waitactive() wake_up(&vt_activate_queue)
-
 void reset_vc(struct vc_data *vc)
 {
        vc->vc_mode = KD_TEXT;
@@ -1256,12 +1377,216 @@ void vc_SAK(struct work_struct *work)
        release_console_sem();
 }
 
+#ifdef CONFIG_COMPAT
+
+struct compat_consolefontdesc {
+       unsigned short charcount;       /* characters in font (256 or 512) */
+       unsigned short charheight;      /* scan lines per character (1-32) */
+       compat_caddr_t chardata;        /* font data in expanded form */
+};
+
+static inline int
+compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd,
+                        int perm, struct console_font_op *op)
+{
+       struct compat_consolefontdesc cfdarg;
+       int i;
+
+       if (copy_from_user(&cfdarg, user_cfd, sizeof(struct compat_consolefontdesc)))
+               return -EFAULT;
+
+       switch (cmd) {
+       case PIO_FONTX:
+               if (!perm)
+                       return -EPERM;
+               op->op = KD_FONT_OP_SET;
+               op->flags = KD_FONT_FLAG_OLD;
+               op->width = 8;
+               op->height = cfdarg.charheight;
+               op->charcount = cfdarg.charcount;
+               op->data = compat_ptr(cfdarg.chardata);
+               return con_font_op(vc_cons[fg_console].d, op);
+       case GIO_FONTX:
+               op->op = KD_FONT_OP_GET;
+               op->flags = KD_FONT_FLAG_OLD;
+               op->width = 8;
+               op->height = cfdarg.charheight;
+               op->charcount = cfdarg.charcount;
+               op->data = compat_ptr(cfdarg.chardata);
+               i = con_font_op(vc_cons[fg_console].d, op);
+               if (i)
+                       return i;
+               cfdarg.charheight = op->height;
+               cfdarg.charcount = op->charcount;
+               if (copy_to_user(user_cfd, &cfdarg, sizeof(struct compat_consolefontdesc)))
+                       return -EFAULT;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+struct compat_console_font_op {
+       compat_uint_t op;        /* operation code KD_FONT_OP_* */
+       compat_uint_t flags;     /* KD_FONT_FLAG_* */
+       compat_uint_t width, height;     /* font size */
+       compat_uint_t charcount;
+       compat_caddr_t data;    /* font data with height fixed to 32 */
+};
+
+static inline int
+compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
+                        int perm, struct console_font_op *op, struct vc_data *vc)
+{
+       int i;
+
+       if (copy_from_user(op, fontop, sizeof(struct compat_console_font_op)))
+               return -EFAULT;
+       if (!perm && op->op != KD_FONT_OP_GET)
+               return -EPERM;
+       op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
+       op->flags |= KD_FONT_FLAG_OLD;
+       i = con_font_op(vc, op);
+       if (i)
+               return i;
+       ((struct compat_console_font_op *)op)->data = (unsigned long)op->data;
+       if (copy_to_user(fontop, op, sizeof(struct compat_console_font_op)))
+               return -EFAULT;
+       return 0;
+}
+
+struct compat_unimapdesc {
+       unsigned short entry_ct;
+       compat_caddr_t entries;
+};
+
+static inline int
+compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
+                        int perm, struct vc_data *vc)
+{
+       struct compat_unimapdesc tmp;
+       struct unipair __user *tmp_entries;
+
+       if (copy_from_user(&tmp, user_ud, sizeof tmp))
+               return -EFAULT;
+       tmp_entries = compat_ptr(tmp.entries);
+       if (tmp_entries)
+               if (!access_ok(VERIFY_WRITE, tmp_entries,
+                               tmp.entry_ct*sizeof(struct unipair)))
+                       return -EFAULT;
+       switch (cmd) {
+       case PIO_UNIMAP:
+               if (!perm)
+                       return -EPERM;
+               return con_set_unimap(vc, tmp.entry_ct, tmp_entries);
+       case GIO_UNIMAP:
+               if (!perm && fg_console != vc->vc_num)
+                       return -EPERM;
+               return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp_entries);
+       }
+       return 0;
+}
+
+long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
+            unsigned int cmd, unsigned long arg)
+{
+       struct vc_data *vc = tty->driver_data;
+       struct console_font_op op;      /* used in multiple places here */
+       struct kbd_struct *kbd;
+       unsigned int console;
+       void __user *up = (void __user *)arg;
+       int perm;
+       int ret = 0;
+
+       console = vc->vc_num;
+
+       lock_kernel();
+
+       if (!vc_cons_allocated(console)) {      /* impossible? */
+               ret = -ENOIOCTLCMD;
+               goto out;
+       }
+
+       /*
+        * To have permissions to do most of the vt ioctls, we either have
+        * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
+        */
+       perm = 0;
+       if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
+               perm = 1;
+
+       kbd = kbd_table + console;
+       switch (cmd) {
+       /*
+        * these need special handlers for incompatible data structures
+        */
+       case PIO_FONTX:
+       case GIO_FONTX:
+               ret = compat_fontx_ioctl(cmd, up, perm, &op);
+               break;
+
+       case KDFONTOP:
+               ret = compat_kdfontop_ioctl(up, perm, &op, vc);
+               break;
+
+       case PIO_UNIMAP:
+       case GIO_UNIMAP:
+               ret = do_unimap_ioctl(cmd, up, perm, vc);
+               break;
+
+       /*
+        * all these treat 'arg' as an integer
+        */
+       case KIOCSOUND:
+       case KDMKTONE:
+#ifdef CONFIG_X86
+       case KDADDIO:
+       case KDDELIO:
+#endif
+       case KDSETMODE:
+       case KDMAPDISP:
+       case KDUNMAPDISP:
+       case KDSKBMODE:
+       case KDSKBMETA:
+       case KDSKBLED:
+       case KDSETLED:
+       case KDSIGACCEPT:
+       case VT_ACTIVATE:
+       case VT_WAITACTIVE:
+       case VT_RELDISP:
+       case VT_DISALLOCATE:
+       case VT_RESIZE:
+       case VT_RESIZEX:
+               goto fallback;
+
+       /*
+        * the rest has a compatible data structure behind arg,
+        * but we have to convert it to a proper 64 bit pointer.
+        */
+       default:
+               arg = (unsigned long)compat_ptr(arg);
+               goto fallback;
+       }
+out:
+       unlock_kernel();
+       return ret;
+
+fallback:
+       unlock_kernel();
+       return vt_ioctl(tty, file, cmd, arg);
+}
+
+
+#endif /* CONFIG_COMPAT */
+
+
 /*
- * Performs the back end of a vt switch
+ * Performs the back end of a vt switch. Called under the console
+ * semaphore.
  */
 static void complete_change_console(struct vc_data *vc)
 {
        unsigned char old_vc_mode;
+       int old = fg_console;
 
        last_console = fg_console;
 
@@ -1325,7 +1650,7 @@ static void complete_change_console(struct vc_data *vc)
        /*
         * Wake anyone waiting for their VT to activate
         */
-       vt_wake_waitactive();
+       vt_event_post(VT_EVENT_SWITCH, old, vc->vc_num);
        return;
 }
 
@@ -1398,3 +1723,58 @@ void change_console(struct vc_data *new_vc)
 
        complete_change_console(new_vc);
 }
+
+/* Perform a kernel triggered VT switch for suspend/resume */
+
+static int disable_vt_switch;
+
+int vt_move_to_console(unsigned int vt, int alloc)
+{
+       int prev;
+
+       acquire_console_sem();
+       /* Graphics mode - up to X */
+       if (disable_vt_switch) {
+               release_console_sem();
+               return 0;
+       }
+       prev = fg_console;
+
+       if (alloc && vc_allocate(vt)) {
+               /* we can't have a free VC for now. Too bad,
+                * we don't want to mess the screen for now. */
+               release_console_sem();
+               return -ENOSPC;
+       }
+
+       if (set_console(vt)) {
+               /*
+                * We're unable to switch to the SUSPEND_CONSOLE.
+                * Let the calling function know so it can decide
+                * what to do.
+                */
+               release_console_sem();
+               return -EIO;
+       }
+       release_console_sem();
+       if (vt_waitactive(vt + 1)) {
+               pr_debug("Suspend: Can't switch VCs.");
+               return -EINTR;
+       }
+       return prev;
+}
+
+/*
+ * Normally during a suspend, we allocate a new console and switch to it.
+ * When we resume, we switch back to the original console.  This switch
+ * can be slow, so on systems where the framebuffer can handle restoration
+ * of video registers anyways, there's little point in doing the console
+ * switch.  This function allows you to disable it by passing it '0'.
+ */
+void pm_set_vt_switch(int do_switch)
+{
+       acquire_console_sem();
+       disable_vt_switch = !do_switch;
+       release_console_sem();
+}
+EXPORT_SYMBOL(pm_set_vt_switch);
index 85e5dc0..abf4a25 100644 (file)
@@ -139,6 +139,31 @@ void proc_id_connector(struct task_struct *task, int which_id)
        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
+void proc_sid_connector(struct task_struct *task)
+{
+       struct cn_msg *msg;
+       struct proc_event *ev;
+       struct timespec ts;
+       __u8 buffer[CN_PROC_MSG_SIZE];
+
+       if (atomic_read(&proc_event_num_listeners) < 1)
+               return;
+
+       msg = (struct cn_msg *)buffer;
+       ev = (struct proc_event *)msg->data;
+       get_seq(&msg->seq, &ev->cpu);
+       ktime_get_ts(&ts); /* get high res monotonic timestamp */
+       put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+       ev->what = PROC_EVENT_SID;
+       ev->event_data.sid.process_pid = task->pid;
+       ev->event_data.sid.process_tgid = task->tgid;
+
+       memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+       msg->ack = 0; /* not used */
+       msg->len = sizeof(*ev);
+       cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
 void proc_exit_connector(struct task_struct *task)
 {
        struct cn_msg *msg;
index 8504a21..ad41f19 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/cpuidle.h>
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
+#include <trace/events/power.h>
 
 #include "cpuidle.h"
 
@@ -91,6 +92,7 @@ static void cpuidle_idle_call(void)
        /* give the governor an opportunity to reflect on the outcome */
        if (cpuidle_curr_governor->reflect)
                cpuidle_curr_governor->reflect(dev);
+       trace_power_end(0);
 }
 
 /**
index f1df59f..6810443 100644 (file)
@@ -2,8 +2,12 @@
  * menu.c - the menu idle governor
  *
  * Copyright (C) 2006-2007 Adam Belay <abelay@novell.com>
+ * Copyright (C) 2009 Intel Corporation
+ * Author:
+ *        Arjan van de Ven <arjan@linux.intel.com>
  *
- * This code is licenced under the GPL.
+ * This code is licenced under the GPL version 2 as described
+ * in the COPYING file that acompanies the Linux Kernel.
  */
 
 #include <linux/kernel.h>
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 
-#define BREAK_FUZZ     4       /* 4 us */
-#define PRED_HISTORY_PCT       50
+#define BUCKETS 12
+#define RESOLUTION 1024
+#define DECAY 4
+#define MAX_INTERESTING 50000
+
+/*
+ * Concepts and ideas behind the menu governor
+ *
+ * For the menu governor, there are 3 decision factors for picking a C
+ * state:
+ * 1) Energy break even point
+ * 2) Performance impact
+ * 3) Latency tolerance (from pmqos infrastructure)
+ * These these three factors are treated independently.
+ *
+ * Energy break even point
+ * -----------------------
+ * C state entry and exit have an energy cost, and a certain amount of time in
+ * the  C state is required to actually break even on this cost. CPUIDLE
+ * provides us this duration in the "target_residency" field. So all that we
+ * need is a good prediction of how long we'll be idle. Like the traditional
+ * menu governor, we start with the actual known "next timer event" time.
+ *
+ * Since there are other source of wakeups (interrupts for example) than
+ * the next timer event, this estimation is rather optimistic. To get a
+ * more realistic estimate, a correction factor is applied to the estimate,
+ * that is based on historic behavior. For example, if in the past the actual
+ * duration always was 50% of the next timer tick, the correction factor will
+ * be 0.5.
+ *
+ * menu uses a running average for this correction factor, however it uses a
+ * set of factors, not just a single factor. This stems from the realization
+ * that the ratio is dependent on the order of magnitude of the expected
+ * duration; if we expect 500 milliseconds of idle time the likelihood of
+ * getting an interrupt very early is much higher than if we expect 50 micro
+ * seconds of idle time. A second independent factor that has big impact on
+ * the actual factor is if there is (disk) IO outstanding or not.
+ * (as a special twist, we consider every sleep longer than 50 milliseconds
+ * as perfect; there are no power gains for sleeping longer than this)
+ *
+ * For these two reasons we keep an array of 12 independent factors, that gets
+ * indexed based on the magnitude of the expected duration as well as the
+ * "is IO outstanding" property.
+ *
+ * Limiting Performance Impact
+ * ---------------------------
+ * C states, especially those with large exit latencies, can have a real
+ * noticable impact on workloads, which is not acceptable for most sysadmins,
+ * and in addition, less performance has a power price of its own.
+ *
+ * As a general rule of thumb, menu assumes that the following heuristic
+ * holds:
+ *     The busier the system, the less impact of C states is acceptable
+ *
+ * This rule-of-thumb is implemented using a performance-multiplier:
+ * If the exit latency times the performance multiplier is longer than
+ * the predicted duration, the C state is not considered a candidate
+ * for selection due to a too high performance impact. So the higher
+ * this multiplier is, the longer we need to be idle to pick a deep C
+ * state, and thus the less likely a busy CPU will hit such a deep
+ * C state.
+ *
+ * Two factors are used in determing this multiplier:
+ * a value of 10 is added for each point of "per cpu load average" we have.
+ * a value of 5 points is added for each process that is waiting for
+ * IO on this CPU.
+ * (these values are experimentally determined)
+ *
+ * The load average factor gives a longer term (few seconds) input to the
+ * decision, while the iowait value gives a cpu local instantanious input.
+ * The iowait factor may look low, but realize that this is also already
+ * represented in the system load average.
+ *
+ */
 
 struct menu_device {
        int             last_state_idx;
+       int             needs_update;
 
        unsigned int    expected_us;
-       unsigned int    predicted_us;
-       unsigned int    current_predicted_us;
-       unsigned int    last_measured_us;
-       unsigned int    elapsed_us;
+       u64             predicted_us;
+       unsigned int    measured_us;
+       unsigned int    exit_us;
+       unsigned int    bucket;
+       u64             correction_factor[BUCKETS];
 };
 
+
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
+static int get_loadavg(void)
+{
+       unsigned long this = this_cpu_load();
+
+
+       return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10;
+}
+
+static inline int which_bucket(unsigned int duration)
+{
+       int bucket = 0;
+
+       /*
+        * We keep two groups of stats; one with no
+        * IO pending, one without.
+        * This allows us to calculate
+        * E(duration)|iowait
+        */
+       if (nr_iowait_cpu())
+               bucket = BUCKETS/2;
+
+       if (duration < 10)
+               return bucket;
+       if (duration < 100)
+               return bucket + 1;
+       if (duration < 1000)
+               return bucket + 2;
+       if (duration < 10000)
+               return bucket + 3;
+       if (duration < 100000)
+               return bucket + 4;
+       return bucket + 5;
+}
+
+/*
+ * Return a multiplier for the exit latency that is intended
+ * to take performance requirements into account.
+ * The more performance critical we estimate the system
+ * to be, the higher this multiplier, and thus the higher
+ * the barrier to go to an expensive C state.
+ */
+static inline int performance_multiplier(void)
+{
+       int mult = 1;
+
+       /* for higher loadavg, we are more reluctant */
+
+       mult += 2 * get_loadavg();
+
+       /* for IO wait tasks (per cpu!) we add 5x each */
+       mult += 10 * nr_iowait_cpu();
+
+       return mult;
+}
+
 static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
+static void menu_update(struct cpuidle_device *dev);
+
 /**
  * menu_select - selects the next idle state to enter
  * @dev: the CPU
@@ -38,82 +178,133 @@ static int menu_select(struct cpuidle_device *dev)
        struct menu_device *data = &__get_cpu_var(menu_devices);
        int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
        int i;
+       int multiplier;
+
+       data->last_state_idx = 0;
+       data->exit_us = 0;
+
+       if (data->needs_update) {
+               menu_update(dev);
+               data->needs_update = 0;
+       }
 
        /* Special case when user has set very strict latency requirement */
-       if (unlikely(latency_req == 0)) {
-               data->last_state_idx = 0;
+       if (unlikely(latency_req == 0))
                return 0;
-       }
 
-       /* determine the expected residency time */
+       /* determine the expected residency time, round up */
        data->expected_us =
-               (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+           DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000);
+
+
+       data->bucket = which_bucket(data->expected_us);
+
+       multiplier = performance_multiplier();
+
+       /*
+        * if the correction factor is 0 (eg first time init or cpu hotplug
+        * etc), we actually want to start out with a unity factor.
+        */
+       if (data->correction_factor[data->bucket] == 0)
+               data->correction_factor[data->bucket] = RESOLUTION * DECAY;
+
+       /* Make sure to round up for half microseconds */
+       data->predicted_us = DIV_ROUND_CLOSEST(
+               data->expected_us * data->correction_factor[data->bucket],
+               RESOLUTION * DECAY);
+
+       /*
+        * We want to default to C1 (hlt), not to busy polling
+        * unless the timer is happening really really soon.
+        */
+       if (data->expected_us > 5)
+               data->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-       /* Recalculate predicted_us based on prediction_history_pct */
-       data->predicted_us *= PRED_HISTORY_PCT;
-       data->predicted_us += (100 - PRED_HISTORY_PCT) *
-                               data->current_predicted_us;
-       data->predicted_us /= 100;
 
        /* find the deepest idle state that satisfies our constraints */
-       for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
+       for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) {
                struct cpuidle_state *s = &dev->states[i];
 
-               if (s->target_residency > data->expected_us)
-                       break;
                if (s->target_residency > data->predicted_us)
                        break;
                if (s->exit_latency > latency_req)
                        break;
+               if (s->exit_latency * multiplier > data->predicted_us)
+                       break;
+               data->exit_us = s->exit_latency;
+               data->last_state_idx = i;
        }
 
-       data->last_state_idx = i - 1;
-       return i - 1;
+       return data->last_state_idx;
 }
 
 /**
- * menu_reflect - attempts to guess what happened after entry
+ * menu_reflect - records that data structures need update
  * @dev: the CPU
  *
  * NOTE: it's important to be fast here because this operation will add to
  *       the overall exit latency.
  */
 static void menu_reflect(struct cpuidle_device *dev)
+{
+       struct menu_device *data = &__get_cpu_var(menu_devices);
+       data->needs_update = 1;
+}
+
+/**
+ * menu_update - attempts to guess what happened after entry
+ * @dev: the CPU
+ */
+static void menu_update(struct cpuidle_device *dev)
 {
        struct menu_device *data = &__get_cpu_var(menu_devices);
        int last_idx = data->last_state_idx;
        unsigned int last_idle_us = cpuidle_get_last_residency(dev);
        struct cpuidle_state *target = &dev->states[last_idx];
        unsigned int measured_us;
+       u64 new_factor;
 
        /*
         * Ugh, this idle state doesn't support residency measurements, so we
         * are basically lost in the dark.  As a compromise, assume we slept
-        * for one full standard timer tick.  However, be aware that this
-        * could potentially result in a suboptimal state transition.
+        * for the whole expected time.
         */
        if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
-               last_idle_us = USEC_PER_SEC / HZ;
+               last_idle_us = data->expected_us;
+
+
+       measured_us = last_idle_us;
 
        /*
-        * measured_us and elapsed_us are the cumulative idle time, since the
-        * last time we were woken out of idle by an interrupt.
+        * We correct for the exit latency; we are assuming here that the
+        * exit latency happens after the event that we're interested in.
         */
-       if (data->elapsed_us <= data->elapsed_us + last_idle_us)
-               measured_us = data->elapsed_us + last_idle_us;
+       if (measured_us > data->exit_us)
+               measured_us -= data->exit_us;
+
+
+       /* update our correction ratio */
+
+       new_factor = data->correction_factor[data->bucket]
+                       * (DECAY - 1) / DECAY;
+
+       if (data->expected_us > 0 && data->measured_us < MAX_INTERESTING)
+               new_factor += RESOLUTION * measured_us / data->expected_us;
        else
-               measured_us = -1;
+               /*
+                * we were idle so long that we count it as a perfect
+                * prediction
+                */
+               new_factor += RESOLUTION;
 
-       /* Predict time until next break event */
-       data->current_predicted_us = max(measured_us, data->last_measured_us);
+       /*
+        * We don't want 0 as factor; we always want at least
+        * a tiny bit of estimated time.
+        */
+       if (new_factor == 0)
+               new_factor = 1;
 
-       if (last_idle_us + BREAK_FUZZ <
-           data->expected_us - target->exit_latency) {
-               data->last_measured_us = measured_us;
-               data->elapsed_us = 0;
-       } else {
-               data->elapsed_us = measured_us;
-       }
+       data->correction_factor[data->bucket] = new_factor;
 }
 
 /**
index 871c13b..12f355c 100644 (file)
@@ -286,7 +286,7 @@ enum scrub_type {
  *                     is irrespective of the memory devices being mounted
  *                     on both sides of the memory stick.
  *
- * Socket set:         All of the memory sticks that are required for for
+ * Socket set:         All of the memory sticks that are required for
  *                     a single memory access or all of the memory sticks
  *                     spanned by a chip-select row.  A single socket set
  *                     has two chip-select rows and if double-sided sticks
index d5ea8a6..56f9234 100644 (file)
@@ -164,7 +164,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type)
 {
        struct firmware_map_entry *entry;
 
-       entry = alloc_bootmem_low(sizeof(struct firmware_map_entry));
+       entry = alloc_bootmem(sizeof(struct firmware_map_entry));
        if (WARN_ON(!entry))
                return -ENOMEM;
 
index 6b4c484..2ad0128 100644 (file)
@@ -162,6 +162,16 @@ config GPIO_WM831X
          Say yes here to access the GPIO signals of WM831x power management
          chips from Wolfson Microelectronics.
 
+config GPIO_ADP5520
+       tristate "GPIO Support for ADP5520 PMIC"
+       depends on PMIC_ADP5520
+       help
+         This option enables support for on-chip GPIO found
+         on Analog Devices ADP5520 PMICs.
+
+         To compile this driver as a module, choose M here: the module will
+         be called adp5520-gpio.
+
 comment "PCI GPIO expanders:"
 
 config GPIO_BT8XX
@@ -180,6 +190,12 @@ config GPIO_BT8XX
 
          If unsure, say N.
 
+config GPIO_LANGWELL
+       bool "Intel Moorestown Platform Langwell GPIO support"
+       depends on PCI
+       help
+         Say Y here to support Intel Moorestown platform GPIO.
+
 comment "SPI GPIO expanders:"
 
 config GPIO_MAX7301
@@ -195,4 +211,23 @@ config GPIO_MCP23S08
          SPI driver for Microchip MCP23S08 I/O expander.  This provides
          a GPIO interface supporting inputs and outputs.
 
+config GPIO_MC33880
+       tristate "Freescale MC33880 high-side/low-side switch"
+       depends on SPI_MASTER
+       help
+         SPI driver for Freescale MC33880 high-side/low-side switch.
+         This provides GPIO interface supporting inputs and outputs.
+
+comment "AC97 GPIO expanders:"
+
+config GPIO_UCB1400
+       bool "Philips UCB1400 GPIO"
+       depends on UCB1400_CORE
+       help
+         This enables support for the Philips UCB1400 GPIO pins.
+         The UCB1400 is an AC97 audio codec.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ucb1400_gpio.
+
 endif
index ea7c745..00a532c 100644 (file)
@@ -4,13 +4,17 @@ ccflags-$(CONFIG_DEBUG_GPIO)  += -DDEBUG
 
 obj-$(CONFIG_GPIOLIB)          += gpiolib.o
 
+obj-$(CONFIG_GPIO_ADP5520)     += adp5520-gpio.o
+obj-$(CONFIG_GPIO_LANGWELL)    += langwell_gpio.o
 obj-$(CONFIG_GPIO_MAX7301)     += max7301.o
 obj-$(CONFIG_GPIO_MAX732X)     += max732x.o
+obj-$(CONFIG_GPIO_MC33880)     += mc33880.o
 obj-$(CONFIG_GPIO_MCP23S08)    += mcp23s08.o
 obj-$(CONFIG_GPIO_PCA953X)     += pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)     += pcf857x.o
 obj-$(CONFIG_GPIO_PL061)       += pl061.o
 obj-$(CONFIG_GPIO_TWL4030)     += twl4030-gpio.o
+obj-$(CONFIG_GPIO_UCB1400)     += ucb1400_gpio.o
 obj-$(CONFIG_GPIO_XILINX)      += xilinx_gpio.o
 obj-$(CONFIG_GPIO_BT8XX)       += bt8xxgpio.o
 obj-$(CONFIG_GPIO_VR41XX)      += vr41xx_giu.o
diff --git a/drivers/gpio/adp5520-gpio.c b/drivers/gpio/adp5520-gpio.c
new file mode 100644 (file)
index 0000000..ad05bbc
--- /dev/null
@@ -0,0 +1,206 @@
+/*
+ * GPIO driver for Analog Devices ADP5520 MFD PMICs
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/adp5520.h>
+
+#include <linux/gpio.h>
+
+struct adp5520_gpio {
+       struct device *master;
+       struct gpio_chip gpio_chip;
+       unsigned char lut[ADP5520_MAXGPIOS];
+       unsigned long output;
+};
+
+static int adp5520_gpio_get_value(struct gpio_chip *chip, unsigned off)
+{
+       struct adp5520_gpio *dev;
+       uint8_t reg_val;
+
+       dev = container_of(chip, struct adp5520_gpio, gpio_chip);
+
+       /*
+        * There are dedicated registers for GPIO IN/OUT.
+        * Make sure we return the right value, even when configured as output
+        */
+
+       if (test_bit(off, &dev->output))
+               adp5520_read(dev->master, GPIO_OUT, &reg_val);
+       else
+               adp5520_read(dev->master, GPIO_IN, &reg_val);
+
+       return !!(reg_val & dev->lut[off]);
+}
+
+static void adp5520_gpio_set_value(struct gpio_chip *chip,
+               unsigned off, int val)
+{
+       struct adp5520_gpio *dev;
+       dev = container_of(chip, struct adp5520_gpio, gpio_chip);
+
+       if (val)
+               adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);
+       else
+               adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);
+}
+
+static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)
+{
+       struct adp5520_gpio *dev;
+       dev = container_of(chip, struct adp5520_gpio, gpio_chip);
+
+       clear_bit(off, &dev->output);
+
+       return adp5520_clr_bits(dev->master, GPIO_CFG_2, dev->lut[off]);
+}
+
+static int adp5520_gpio_direction_output(struct gpio_chip *chip,
+               unsigned off, int val)
+{
+       struct adp5520_gpio *dev;
+       int ret = 0;
+       dev = container_of(chip, struct adp5520_gpio, gpio_chip);
+
+       set_bit(off, &dev->output);
+
+       if (val)
+               ret |= adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);
+       else
+               ret |= adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);
+
+       ret |= adp5520_set_bits(dev->master, GPIO_CFG_2, dev->lut[off]);
+
+       return ret;
+}
+
+static int __devinit adp5520_gpio_probe(struct platform_device *pdev)
+{
+       struct adp5520_gpio_platfrom_data *pdata = pdev->dev.platform_data;
+       struct adp5520_gpio *dev;
+       struct gpio_chip *gc;
+       int ret, i, gpios;
+       unsigned char ctl_mask = 0;
+
+       if (pdata == NULL) {
+               dev_err(&pdev->dev, "missing platform data\n");
+               return -ENODEV;
+       }
+
+       if (pdev->id != ID_ADP5520) {
+               dev_err(&pdev->dev, "only ADP5520 supports GPIO\n");
+               return -ENODEV;
+       }
+
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (dev == NULL) {
+               dev_err(&pdev->dev, "failed to alloc memory\n");
+               return -ENOMEM;
+       }
+
+       dev->master = pdev->dev.parent;
+
+       for (gpios = 0, i = 0; i < ADP5520_MAXGPIOS; i++)
+               if (pdata->gpio_en_mask & (1 << i))
+                       dev->lut[gpios++] = 1 << i;
+
+       if (gpios < 1) {
+               ret = -EINVAL;
+               goto err;
+       }
+
+       gc = &dev->gpio_chip;
+       gc->direction_input  = adp5520_gpio_direction_input;
+       gc->direction_output = adp5520_gpio_direction_output;
+       gc->get = adp5520_gpio_get_value;
+       gc->set = adp5520_gpio_set_value;
+       gc->can_sleep = 1;
+
+       gc->base = pdata->gpio_start;
+       gc->ngpio = gpios;
+       gc->label = pdev->name;
+       gc->owner = THIS_MODULE;
+
+       ret = adp5520_clr_bits(dev->master, GPIO_CFG_1,
+               pdata->gpio_en_mask);
+
+       if (pdata->gpio_en_mask & GPIO_C3)
+               ctl_mask |= C3_MODE;
+
+       if (pdata->gpio_en_mask & GPIO_R3)
+               ctl_mask |= R3_MODE;
+
+       if (ctl_mask)
+               ret = adp5520_set_bits(dev->master, LED_CONTROL,
+                       ctl_mask);
+
+       ret |= adp5520_set_bits(dev->master, GPIO_PULLUP,
+               pdata->gpio_pullup_mask);
+
+       if (ret) {
+               dev_err(&pdev->dev, "failed to write\n");
+               goto err;
+       }
+
+       ret = gpiochip_add(&dev->gpio_chip);
+       if (ret)
+               goto err;
+
+       platform_set_drvdata(pdev, dev);
+       return 0;
+
+err:
+       kfree(dev);
+       return ret;
+}
+
+static int __devexit adp5520_gpio_remove(struct platform_device *pdev)
+{
+       struct adp5520_gpio *dev;
+       int ret;
+
+       dev = platform_get_drvdata(pdev);
+       ret = gpiochip_remove(&dev->gpio_chip);
+       if (ret) {
+               dev_err(&pdev->dev, "%s failed, %d\n",
+                               "gpiochip_remove()", ret);
+               return ret;
+       }
+
+       kfree(dev);
+       return 0;
+}
+
+static struct platform_driver adp5520_gpio_driver = {
+       .driver = {
+               .name   = "adp5520-gpio",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = adp5520_gpio_probe,
+       .remove         = __devexit_p(adp5520_gpio_remove),
+};
+
+static int __init adp5520_gpio_init(void)
+{
+       return platform_driver_register(&adp5520_gpio_driver);
+}
+module_init(adp5520_gpio_init);
+
+static void __exit adp5520_gpio_exit(void)
+{
+       platform_driver_unregister(&adp5520_gpio_driver);
+}
+module_exit(adp5520_gpio_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("GPIO ADP5520 Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:adp5520-gpio");
index 984b587..2559f22 100644 (file)
@@ -46,8 +46,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 /* Steal the hardware definitions from the bttv driver. */
 #include "../media/video/bt8xx/bt848.h"
@@ -331,13 +330,13 @@ static struct pci_driver bt8xxgpio_pci_driver = {
        .resume         = bt8xxgpio_resume,
 };
 
-static int bt8xxgpio_init(void)
+static int __init bt8xxgpio_init(void)
 {
        return pci_register_driver(&bt8xxgpio_pci_driver);
 }
 module_init(bt8xxgpio_init)
 
-static void bt8xxgpio_exit(void)
+static void __exit bt8xxgpio_exit(void)
 {
        pci_unregister_driver(&bt8xxgpio_pci_driver);
 }
index 51a8d41..bb11a42 100644 (file)
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
@@ -7,6 +8,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/gpio.h>
+#include <linux/idr.h>
 
 
 /* Optional implementation infrastructure for GPIO interfaces.
@@ -49,6 +51,13 @@ struct gpio_desc {
 #define FLAG_RESERVED  2
 #define FLAG_EXPORT    3       /* protected by sysfs_lock */
 #define FLAG_SYSFS     4       /* exported via /sys/class/gpio/control */
+#define FLAG_TRIG_FALL 5       /* trigger on falling edge */
+#define FLAG_TRIG_RISE 6       /* trigger on rising edge */
+
+#define PDESC_ID_SHIFT 16      /* add new flags before this one */
+
+#define GPIO_FLAGS_MASK                ((1 << PDESC_ID_SHIFT) - 1)
+#define GPIO_TRIGGER_MASK      (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE))
 
 #ifdef CONFIG_DEBUG_FS
        const char              *label;
@@ -56,6 +65,15 @@ struct gpio_desc {
 };
 static struct gpio_desc gpio_desc[ARCH_NR_GPIOS];
 
+#ifdef CONFIG_GPIO_SYSFS
+struct poll_desc {
+       struct work_struct      work;
+       struct sysfs_dirent     *value_sd;
+};
+
+static struct idr pdesc_idr;
+#endif
+
 static inline void desc_set_label(struct gpio_desc *d, const char *label)
 {
 #ifdef CONFIG_DEBUG_FS
@@ -188,10 +206,10 @@ static DEFINE_MUTEX(sysfs_lock);
  *   /value
  *      * always readable, subject to hardware behavior
  *      * may be writable, as zero/nonzero
- *
- * REVISIT there will likely be an attribute for configuring async
- * notifications, e.g. to specify polling interval or IRQ trigger type
- * that would for example trigger a poll() on the "value".
+ *   /edge
+ *      * configures behavior of poll(2) on /value
+ *      * available only if pin can generate IRQs on input
+ *      * is read/write as "none", "falling", "rising", or "both"
  */
 
 static ssize_t gpio_direction_show(struct device *dev,
@@ -288,6 +306,175 @@ static ssize_t gpio_value_store(struct device *dev,
 static /*const*/ DEVICE_ATTR(value, 0644,
                gpio_value_show, gpio_value_store);
 
+static irqreturn_t gpio_sysfs_irq(int irq, void *priv)
+{
+       struct work_struct      *work = priv;
+
+       schedule_work(work);
+       return IRQ_HANDLED;
+}
+
+static void gpio_notify_sysfs(struct work_struct *work)
+{
+       struct poll_desc        *pdesc;
+
+       pdesc = container_of(work, struct poll_desc, work);
+       sysfs_notify_dirent(pdesc->value_sd);
+}
+
+static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
+               unsigned long gpio_flags)
+{
+       struct poll_desc        *pdesc;
+       unsigned long           irq_flags;
+       int                     ret, irq, id;
+
+       if ((desc->flags & GPIO_TRIGGER_MASK) == gpio_flags)
+               return 0;
+
+       irq = gpio_to_irq(desc - gpio_desc);
+       if (irq < 0)
+               return -EIO;
+
+       id = desc->flags >> PDESC_ID_SHIFT;
+       pdesc = idr_find(&pdesc_idr, id);
+       if (pdesc) {
+               free_irq(irq, &pdesc->work);
+               cancel_work_sync(&pdesc->work);
+       }
+
+       desc->flags &= ~GPIO_TRIGGER_MASK;
+
+       if (!gpio_flags) {
+               ret = 0;
+               goto free_sd;
+       }
+
+       irq_flags = IRQF_SHARED;
+       if (test_bit(FLAG_TRIG_FALL, &gpio_flags))
+               irq_flags |= IRQF_TRIGGER_FALLING;
+       if (test_bit(FLAG_TRIG_RISE, &gpio_flags))
+               irq_flags |= IRQF_TRIGGER_RISING;
+
+       if (!pdesc) {
+               pdesc = kmalloc(sizeof(*pdesc), GFP_KERNEL);
+               if (!pdesc) {
+                       ret = -ENOMEM;
+                       goto err_out;
+               }
+
+               do {
+                       ret = -ENOMEM;
+                       if (idr_pre_get(&pdesc_idr, GFP_KERNEL))
+                               ret = idr_get_new_above(&pdesc_idr,
+                                               pdesc, 1, &id);
+               } while (ret == -EAGAIN);
+
+               if (ret)
+                       goto free_mem;
+
+               desc->flags &= GPIO_FLAGS_MASK;
+               desc->flags |= (unsigned long)id << PDESC_ID_SHIFT;
+
+               if (desc->flags >> PDESC_ID_SHIFT != id) {
+                       ret = -ERANGE;
+                       goto free_id;
+               }
+
+               pdesc->value_sd = sysfs_get_dirent(dev->kobj.sd, "value");
+               if (!pdesc->value_sd) {
+                       ret = -ENODEV;
+                       goto free_id;
+               }
+               INIT_WORK(&pdesc->work, gpio_notify_sysfs);
+       }
+
+       ret = request_irq(irq, gpio_sysfs_irq, irq_flags,
+                       "gpiolib", &pdesc->work);
+       if (ret)
+               goto free_sd;
+
+       desc->flags |= gpio_flags;
+       return 0;
+
+free_sd:
+       sysfs_put(pdesc->value_sd);
+free_id:
+       idr_remove(&pdesc_idr, id);
+       desc->flags &= GPIO_FLAGS_MASK;
+free_mem:
+       kfree(pdesc);
+err_out:
+       return ret;
+}
+
+static const struct {
+       const char *name;
+       unsigned long flags;
+} trigger_types[] = {
+       { "none",    0 },
+       { "falling", BIT(FLAG_TRIG_FALL) },
+       { "rising",  BIT(FLAG_TRIG_RISE) },
+       { "both",    BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE) },
+};
+
+static ssize_t gpio_edge_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       const struct gpio_desc  *desc = dev_get_drvdata(dev);
+       ssize_t                 status;
+
+       mutex_lock(&sysfs_lock);
+
+       if (!test_bit(FLAG_EXPORT, &desc->flags))
+               status = -EIO;
+       else {
+               int i;
+
+               status = 0;
+               for (i = 0; i < ARRAY_SIZE(trigger_types); i++)
+                       if ((desc->flags & GPIO_TRIGGER_MASK)
+                                       == trigger_types[i].flags) {
+                               status = sprintf(buf, "%s\n",
+                                                trigger_types[i].name);
+                               break;
+                       }
+       }
+
+       mutex_unlock(&sysfs_lock);
+       return status;
+}
+
+static ssize_t gpio_edge_store(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t size)
+{
+       struct gpio_desc        *desc = dev_get_drvdata(dev);
+       ssize_t                 status;
+       int                     i;
+
+       for (i = 0; i < ARRAY_SIZE(trigger_types); i++)
+               if (sysfs_streq(trigger_types[i].name, buf))
+                       goto found;
+       return -EINVAL;
+
+found:
+       mutex_lock(&sysfs_lock);
+
+       if (!test_bit(FLAG_EXPORT, &desc->flags))
+               status = -EIO;
+       else {
+               status = gpio_setup_irq(desc, dev, trigger_types[i].flags);
+               if (!status)
+                       status = size;
+       }
+
+       mutex_unlock(&sysfs_lock);
+
+       return status;
+}
+
+static DEVICE_ATTR(edge, 0644, gpio_edge_show, gpio_edge_store);
+
 static const struct attribute *gpio_attrs[] = {
        &dev_attr_direction.attr,
        &dev_attr_value.attr,
@@ -473,7 +660,7 @@ int gpio_export(unsigned gpio, bool direction_may_change)
                struct device   *dev;
 
                dev = device_create(&gpio_class, desc->chip->dev, MKDEV(0, 0),
-                                   desc, ioname ? ioname : "gpio%d", gpio);
+                               desc, ioname ? ioname : "gpio%d", gpio);
                if (dev) {
                        if (direction_may_change)
                                status = sysfs_create_group(&dev->kobj,
@@ -481,6 +668,14 @@ int gpio_export(unsigned gpio, bool direction_may_change)
                        else
                                status = device_create_file(dev,
                                                &dev_attr_value);
+
+                       if (!status && gpio_to_irq(gpio) >= 0
+                                       && (direction_may_change
+                                               || !test_bit(FLAG_IS_OUT,
+                                                       &desc->flags)))
+                               status = device_create_file(dev,
+                                               &dev_attr_edge);
+
                        if (status != 0)
                                device_unregister(dev);
                } else
@@ -504,6 +699,51 @@ static int match_export(struct device *dev, void *data)
        return dev_get_drvdata(dev) == data;
 }
 
+/**
+ * gpio_export_link - create a sysfs link to an exported GPIO node
+ * @dev: device under which to create symlink
+ * @name: name of the symlink
+ * @gpio: gpio to create symlink to, already exported
+ *
+ * Set up a symlink from /sys/.../dev/name to /sys/class/gpio/gpioN
+ * node. Caller is responsible for unlinking.
+ *
+ * Returns zero on success, else an error.
+ */
+int gpio_export_link(struct device *dev, const char *name, unsigned gpio)
+{
+       struct gpio_desc        *desc;
+       int                     status = -EINVAL;
+
+       if (!gpio_is_valid(gpio))
+               goto done;
+
+       mutex_lock(&sysfs_lock);
+
+       desc = &gpio_desc[gpio];
+
+       if (test_bit(FLAG_EXPORT, &desc->flags)) {
+               struct device *tdev;
+
+               tdev = class_find_device(&gpio_class, NULL, desc, match_export);
+               if (tdev != NULL) {
+                       status = sysfs_create_link(&dev->kobj, &tdev->kobj,
+                                               name);
+               } else {
+                       status = -ENODEV;
+               }
+       }
+
+       mutex_unlock(&sysfs_lock);
+
+done:
+       if (status)
+               pr_debug("%s: gpio%d status %d\n", __func__, gpio, status);
+
+       return status;
+}
+EXPORT_SYMBOL_GPL(gpio_export_link);
+
 /**
  * gpio_unexport - reverse effect of gpio_export()
  * @gpio: gpio to make unavailable
@@ -527,6 +767,7 @@ void gpio_unexport(unsigned gpio)
 
                dev = class_find_device(&gpio_class, NULL, desc, match_export);
                if (dev) {
+                       gpio_setup_irq(desc, dev, 0);
                        clear_bit(FLAG_EXPORT, &desc->flags);
                        put_device(dev);
                        device_unregister(dev);
@@ -611,6 +852,8 @@ static int __init gpiolib_sysfs_init(void)
        unsigned long   flags;
        unsigned        gpio;
 
+       idr_init(&pdesc_idr);
+
        status = class_register(&gpio_class);
        if (status < 0)
                return status;
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
new file mode 100644 (file)
index 0000000..5711ce5
--- /dev/null
@@ -0,0 +1,297 @@
+/* langwell_gpio.c Moorestown platform Langwell chip GPIO driver
+ * Copyright (c) 2008 - 2009,  Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Supports:
+ * Moorestown platform Langwell chip.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/stddef.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+struct lnw_gpio_register {
+       u32     GPLR[2];
+       u32     GPDR[2];
+       u32     GPSR[2];
+       u32     GPCR[2];
+       u32     GRER[2];
+       u32     GFER[2];
+       u32     GEDR[2];
+};
+
+struct lnw_gpio {
+       struct gpio_chip                chip;
+       struct lnw_gpio_register        *reg_base;
+       spinlock_t                      lock;
+       unsigned                        irq_base;
+};
+
+static int lnw_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+       struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
+       u8 reg = offset / 32;
+       void __iomem *gplr;
+
+       gplr = (void __iomem *)(&lnw->reg_base->GPLR[reg]);
+       return readl(gplr) & BIT(offset % 32);
+}
+
+static void lnw_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+       struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
+       u8 reg = offset / 32;
+       void __iomem *gpsr, *gpcr;
+
+       if (value) {
+               gpsr = (void __iomem *)(&lnw->reg_base->GPSR[reg]);
+               writel(BIT(offset % 32), gpsr);
+       } else {
+               gpcr = (void __iomem *)(&lnw->reg_base->GPCR[reg]);
+               writel(BIT(offset % 32), gpcr);
+       }
+}
+
+static int lnw_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+{
+       struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
+       u8 reg = offset / 32;
+       u32 value;
+       unsigned long flags;
+       void __iomem *gpdr;
+
+       gpdr = (void __iomem *)(&lnw->reg_base->GPDR[reg]);
+       spin_lock_irqsave(&lnw->lock, flags);
+       value = readl(gpdr);
+       value &= ~BIT(offset % 32);
+       writel(value, gpdr);
+       spin_unlock_irqrestore(&lnw->lock, flags);
+       return 0;
+}
+
+static int lnw_gpio_direction_output(struct gpio_chip *chip,
+                       unsigned offset, int value)
+{
+       struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
+       u8 reg = offset / 32;
+       unsigned long flags;
+       void __iomem *gpdr;
+
+       lnw_gpio_set(chip, offset, value);
+       gpdr = (void __iomem *)(&lnw->reg_base->GPDR[reg]);
+       spin_lock_irqsave(&lnw->lock, flags);
+       value = readl(gpdr);
+       value |= BIT(offset % 32);;
+       writel(value, gpdr);
+       spin_unlock_irqrestore(&lnw->lock, flags);
+       return 0;
+}
+
+static int lnw_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+       struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
+       return lnw->irq_base + offset;
+}
+
+static int lnw_irq_type(unsigned irq, unsigned type)
+{
+       struct lnw_gpio *lnw = get_irq_chip_data(irq);
+       u32 gpio = irq - lnw->irq_base;
+       u8 reg = gpio / 32;
+       unsigned long flags;
+       u32 value;
+       void __iomem *grer = (void __iomem *)(&lnw->reg_base->GRER[reg]);
+       void __iomem *gfer = (void __iomem *)(&lnw->reg_base->GFER[reg]);
+
+       if (gpio < 0 || gpio > lnw->chip.ngpio)
+               return -EINVAL;
+       spin_lock_irqsave(&lnw->lock, flags);
+       if (type & IRQ_TYPE_EDGE_RISING)
+               value = readl(grer) | BIT(gpio % 32);
+       else
+               value = readl(grer) & (~BIT(gpio % 32));
+       writel(value, grer);
+
+       if (type & IRQ_TYPE_EDGE_FALLING)
+               value = readl(gfer) | BIT(gpio % 32);
+       else
+               value = readl(gfer) & (~BIT(gpio % 32));
+       writel(value, gfer);
+       spin_unlock_irqrestore(&lnw->lock, flags);
+
+       return 0;
+};
+
+static void lnw_irq_unmask(unsigned irq)
+{
+       struct lnw_gpio *lnw = get_irq_chip_data(irq);
+       u32 gpio = irq - lnw->irq_base;
+       u8 reg = gpio / 32;
+       void __iomem *gedr;
+
+       gedr = (void __iomem *)(&lnw->reg_base->GEDR[reg]);
+       writel(BIT(gpio % 32), gedr);
+};
+
+static void lnw_irq_mask(unsigned irq)
+{
+};
+
+static struct irq_chip lnw_irqchip = {
+       .name           = "LNW-GPIO",
+       .mask           = lnw_irq_mask,
+       .unmask         = lnw_irq_unmask,
+       .set_type       = lnw_irq_type,
+};
+
+static struct pci_device_id lnw_gpio_ids[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f) },
+       { 0, }
+};
+MODULE_DEVICE_TABLE(pci, lnw_gpio_ids);
+
+static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
+{
+       struct lnw_gpio *lnw = (struct lnw_gpio *)get_irq_data(irq);
+       u32 reg, gpio;
+       void __iomem *gedr;
+       u32 gedr_v;
+
+       /* check GPIO controller to check which pin triggered the interrupt */
+       for (reg = 0; reg < lnw->chip.ngpio / 32; reg++) {
+               gedr = (void __iomem *)(&lnw->reg_base->GEDR[reg]);
+               gedr_v = readl(gedr);
+               if (!gedr_v)
+                       continue;
+               for (gpio = reg*32; gpio < reg*32+32; gpio++) {
+                       gedr_v = readl(gedr);
+                       if (gedr_v & BIT(gpio % 32)) {
+                               pr_debug("pin %d triggered\n", gpio);
+                               generic_handle_irq(lnw->irq_base + gpio);
+                       }
+               }
+               /* clear the edge detect status bit */
+               writel(gedr_v, gedr);
+       }
+       desc->chip->eoi(irq);
+}
+
+static int __devinit lnw_gpio_probe(struct pci_dev *pdev,
+                       const struct pci_device_id *id)
+{
+       void *base;
+       int i;
+       resource_size_t start, len;
+       struct lnw_gpio *lnw;
+       u32 irq_base;
+       u32 gpio_base;
+       int retval = 0;
+
+       retval = pci_enable_device(pdev);
+       if (retval)
+               goto done;
+
+       retval = pci_request_regions(pdev, "langwell_gpio");
+       if (retval) {
+               dev_err(&pdev->dev, "error requesting resources\n");
+               goto err2;
+       }
+       /* get the irq_base from bar1 */
+       start = pci_resource_start(pdev, 1);
+       len = pci_resource_len(pdev, 1);
+       base = ioremap_nocache(start, len);
+       if (!base) {
+               dev_err(&pdev->dev, "error mapping bar1\n");
+               goto err3;
+       }
+       irq_base = *(u32 *)base;
+       gpio_base = *((u32 *)base + 1);
+       /* release the IO mapping, since we already get the info from bar1 */
+       iounmap(base);
+       /* get the register base from bar0 */
+       start = pci_resource_start(pdev, 0);
+       len = pci_resource_len(pdev, 0);
+       base = ioremap_nocache(start, len);
+       if (!base) {
+               dev_err(&pdev->dev, "error mapping bar0\n");
+               retval = -EFAULT;
+               goto err3;
+       }
+
+       lnw = kzalloc(sizeof(struct lnw_gpio), GFP_KERNEL);
+       if (!lnw) {
+               dev_err(&pdev->dev, "can't allocate langwell_gpio chip data\n");
+               retval = -ENOMEM;
+               goto err4;
+       }
+       lnw->reg_base = base;
+       lnw->irq_base = irq_base;
+       lnw->chip.label = dev_name(&pdev->dev);
+       lnw->chip.direction_input = lnw_gpio_direction_input;
+       lnw->chip.direction_output = lnw_gpio_direction_output;
+       lnw->chip.get = lnw_gpio_get;
+       lnw->chip.set = lnw_gpio_set;
+       lnw->chip.to_irq = lnw_gpio_to_irq;
+       lnw->chip.base = gpio_base;
+       lnw->chip.ngpio = 64;
+       lnw->chip.can_sleep = 0;
+       pci_set_drvdata(pdev, lnw);
+       retval = gpiochip_add(&lnw->chip);
+       if (retval) {
+               dev_err(&pdev->dev, "langwell gpiochip_add error %d\n", retval);
+               goto err5;
+       }
+       set_irq_data(pdev->irq, lnw);
+       set_irq_chained_handler(pdev->irq, lnw_irq_handler);
+       for (i = 0; i < lnw->chip.ngpio; i++) {
+               set_irq_chip_and_handler_name(i + lnw->irq_base, &lnw_irqchip,
+                                       handle_simple_irq, "demux");
+               set_irq_chip_data(i + lnw->irq_base, lnw);
+       }
+
+       spin_lock_init(&lnw->lock);
+       goto done;
+err5:
+       kfree(lnw);
+err4:
+       iounmap(base);
+err3:
+       pci_release_regions(pdev);
+err2:
+       pci_disable_device(pdev);
+done:
+       return retval;
+}
+
+static struct pci_driver lnw_gpio_driver = {
+       .name           = "langwell_gpio",
+       .id_table       = lnw_gpio_ids,
+       .probe          = lnw_gpio_probe,
+};
+
+static int __init lnw_gpio_init(void)
+{
+       return pci_register_driver(&lnw_gpio_driver);
+}
+
+device_initcall(lnw_gpio_init);
index 7b82eaa..480956f 100644 (file)
@@ -339,3 +339,4 @@ module_exit(max7301_exit);
 MODULE_AUTHOR("Juergen Beisert");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("MAX7301 SPI based GPIO-Expander");
+MODULE_ALIAS("spi:" DRIVER_NAME);
diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c
new file mode 100644 (file)
index 0000000..e7d01bd
--- /dev/null
@@ -0,0 +1,196 @@
+/*
+ * mc33880.c MC33880 high-side/low-side switch GPIO driver
+ * Copyright (c) 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Supports:
+ * Freescale MC33880 high-side/low-side switch
+ */
+
+#include <linux/init.h>
+#include <linux/mutex.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/mc33880.h>
+#include <linux/gpio.h>
+
+#define DRIVER_NAME "mc33880"
+
+/*
+ * Pin configurations, see MAX7301 datasheet page 6
+ */
+#define PIN_CONFIG_MASK 0x03
+#define PIN_CONFIG_IN_PULLUP 0x03
+#define PIN_CONFIG_IN_WO_PULLUP 0x02
+#define PIN_CONFIG_OUT 0x01
+
+#define PIN_NUMBER 8
+
+
+/*
+ * Some registers must be read back to modify.
+ * To save time we cache them here in memory
+ */
+struct mc33880 {
+       struct mutex    lock;   /* protect from simultanous accesses */
+       u8              port_config;
+       struct gpio_chip chip;
+       struct spi_device *spi;
+};
+
+static int mc33880_write_config(struct mc33880 *mc)
+{
+       return spi_write(mc->spi, &mc->port_config, sizeof(mc->port_config));
+}
+
+
+static int __mc33880_set(struct mc33880 *mc, unsigned offset, int value)
+{
+       if (value)
+               mc->port_config |= 1 << offset;
+       else
+               mc->port_config &= ~(1 << offset);
+
+       return mc33880_write_config(mc);
+}
+
+
+static void mc33880_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+       struct mc33880 *mc = container_of(chip, struct mc33880, chip);
+
+       mutex_lock(&mc->lock);
+
+       __mc33880_set(mc, offset, value);
+
+       mutex_unlock(&mc->lock);
+}
+
+static int __devinit mc33880_probe(struct spi_device *spi)
+{
+       struct mc33880 *mc;
+       struct mc33880_platform_data *pdata;
+       int ret;
+
+       pdata = spi->dev.platform_data;
+       if (!pdata || !pdata->base) {
+               dev_dbg(&spi->dev, "incorrect or missing platform data\n");
+               return -EINVAL;
+       }
+
+       /*
+        * bits_per_word cannot be configured in platform data
+        */
+       spi->bits_per_word = 8;
+
+       ret = spi_setup(spi);
+       if (ret < 0)
+               return ret;
+
+       mc = kzalloc(sizeof(struct mc33880), GFP_KERNEL);
+       if (!mc)
+               return -ENOMEM;
+
+       mutex_init(&mc->lock);
+
+       dev_set_drvdata(&spi->dev, mc);
+
+       mc->spi = spi;
+
+       mc->chip.label = DRIVER_NAME,
+       mc->chip.set = mc33880_set;
+       mc->chip.base = pdata->base;
+       mc->chip.ngpio = PIN_NUMBER;
+       mc->chip.can_sleep = 1;
+       mc->chip.dev = &spi->dev;
+       mc->chip.owner = THIS_MODULE;
+
+       mc->port_config = 0x00;
+       /* write twice, because during initialisation the first setting
+        * is just for testing SPI communication, and the second is the
+        * "real" configuration
+        */
+       ret = mc33880_write_config(mc);
+       mc->port_config = 0x00;
+       if (!ret)
+               ret = mc33880_write_config(mc);
+
+       if (ret) {
+               printk(KERN_ERR "Failed writing to " DRIVER_NAME ": %d\n", ret);
+               goto exit_destroy;
+       }
+
+       ret = gpiochip_add(&mc->chip);
+       if (ret)
+               goto exit_destroy;
+
+       return ret;
+
+exit_destroy:
+       dev_set_drvdata(&spi->dev, NULL);
+       mutex_destroy(&mc->lock);
+       kfree(mc);
+       return ret;
+}
+
+static int mc33880_remove(struct spi_device *spi)
+{
+       struct mc33880 *mc;
+       int ret;
+
+       mc = dev_get_drvdata(&spi->dev);
+       if (mc == NULL)
+               return -ENODEV;
+
+       dev_set_drvdata(&spi->dev, NULL);
+
+       ret = gpiochip_remove(&mc->chip);
+       if (!ret) {
+               mutex_destroy(&mc->lock);
+               kfree(mc);
+       } else
+               dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n",
+                       ret);
+
+       return ret;
+}
+
+static struct spi_driver mc33880_driver = {
+       .driver = {
+               .name           = DRIVER_NAME,
+               .owner          = THIS_MODULE,
+       },
+       .probe          = mc33880_probe,
+       .remove         = __devexit_p(mc33880_remove),
+};
+
+static int __init mc33880_init(void)
+{
+       return spi_register_driver(&mc33880_driver);
+}
+/* register after spi postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(mc33880_init);
+
+static void __exit mc33880_exit(void)
+{
+       spi_unregister_driver(&mc33880_driver);
+}
+module_exit(mc33880_exit);
+
+MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
+MODULE_LICENSE("GPL v2");
+
index f6fae0e..cd651ec 100644 (file)
@@ -6,12 +6,10 @@
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
-
+#include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/mcp23s08.h>
 
-#include <asm/gpio.h>
-
 
 /* Registers are all 8 bits wide.
  *
@@ -433,3 +431,4 @@ static void __exit mcp23s08_exit(void)
 module_exit(mcp23s08_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:mcp23s08");
index cdb6574..6a2fb3f 100644 (file)
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
 #ifdef CONFIG_OF_GPIO
@@ -20,8 +21,6 @@
 #include <linux/of_gpio.h>
 #endif
 
-#include <asm/gpio.h>
-
 #define PCA953X_INPUT          0
 #define PCA953X_OUTPUT         1
 #define PCA953X_INVERT         2
@@ -40,6 +39,7 @@ static const struct i2c_device_id pca953x_id[] = {
        { "pca9557", 8, },
 
        { "max7310", 8, },
+       { "max7315", 8, },
        { "pca6107", 8, },
        { "tca6408", 8, },
        { "tca6416", 16, },
index 9525724..29f19ce 100644 (file)
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
 
-#include <asm/gpio.h>
-
 
 static const struct i2c_device_id pcf857x_id[] = {
        { "pcf8574", 8 },
+       { "pcf8574a", 8 },
        { "pca8574", 8 },
        { "pca9670", 8 },
        { "pca9672", 8 },
diff --git a/drivers/gpio/ucb1400_gpio.c b/drivers/gpio/ucb1400_gpio.c
new file mode 100644 (file)
index 0000000..50e6bd1
--- /dev/null
@@ -0,0 +1,125 @@
+/*
+ * Philips UCB1400 GPIO driver
+ *
+ * Author: Marek Vasut <marek.vasut@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/ucb1400.h>
+
+struct ucb1400_gpio_data *ucbdata;
+
+static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off)
+{
+       struct ucb1400_gpio *gpio;
+       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       ucb1400_gpio_set_direction(gpio->ac97, off, 0);
+       return 0;
+}
+
+static int ucb1400_gpio_dir_out(struct gpio_chip *gc, unsigned off, int val)
+{
+       struct ucb1400_gpio *gpio;
+       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       ucb1400_gpio_set_direction(gpio->ac97, off, 1);
+       ucb1400_gpio_set_value(gpio->ac97, off, val);
+       return 0;
+}
+
+static int ucb1400_gpio_get(struct gpio_chip *gc, unsigned off)
+{
+       struct ucb1400_gpio *gpio;
+       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       return ucb1400_gpio_get_value(gpio->ac97, off);
+}
+
+static void ucb1400_gpio_set(struct gpio_chip *gc, unsigned off, int val)
+{
+       struct ucb1400_gpio *gpio;
+       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       ucb1400_gpio_set_value(gpio->ac97, off, val);
+}
+
+static int ucb1400_gpio_probe(struct platform_device *dev)
+{
+       struct ucb1400_gpio *ucb = dev->dev.platform_data;
+       int err = 0;
+
+       if (!(ucbdata && ucbdata->gpio_offset)) {
+               err = -EINVAL;
+               goto err;
+       }
+
+       platform_set_drvdata(dev, ucb);
+
+       ucb->gc.label = "ucb1400_gpio";
+       ucb->gc.base = ucbdata->gpio_offset;
+       ucb->gc.ngpio = 10;
+       ucb->gc.owner = THIS_MODULE;
+
+       ucb->gc.direction_input = ucb1400_gpio_dir_in;
+       ucb->gc.direction_output = ucb1400_gpio_dir_out;
+       ucb->gc.get = ucb1400_gpio_get;
+       ucb->gc.set = ucb1400_gpio_set;
+       ucb->gc.can_sleep = 1;
+
+       err = gpiochip_add(&ucb->gc);
+       if (err)
+               goto err;
+
+       if (ucbdata && ucbdata->gpio_setup)
+               err = ucbdata->gpio_setup(&dev->dev, ucb->gc.ngpio);
+
+err:
+       return err;
+
+}
+
+static int ucb1400_gpio_remove(struct platform_device *dev)
+{
+       int err = 0;
+       struct ucb1400_gpio *ucb = platform_get_drvdata(dev);
+
+       if (ucbdata && ucbdata->gpio_teardown) {
+               err = ucbdata->gpio_teardown(&dev->dev, ucb->gc.ngpio);
+               if (err)
+                       return err;
+       }
+
+       err = gpiochip_remove(&ucb->gc);
+       return err;
+}
+
+static struct platform_driver ucb1400_gpio_driver = {
+       .probe  = ucb1400_gpio_probe,
+       .remove = ucb1400_gpio_remove,
+       .driver = {
+               .name   = "ucb1400_gpio"
+       },
+};
+
+static int __init ucb1400_gpio_init(void)
+{
+       return platform_driver_register(&ucb1400_gpio_driver);
+}
+
+static void __exit ucb1400_gpio_exit(void)
+{
+       platform_driver_unregister(&ucb1400_gpio_driver);
+}
+
+void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)
+{
+       ucbdata = data;
+}
+
+module_init(ucb1400_gpio_init);
+module_exit(ucb1400_gpio_exit);
+
+MODULE_DESCRIPTION("Philips UCB1400 GPIO driver");
+MODULE_LICENSE("GPL");
index 39b393d..e4d971c 100644 (file)
@@ -18,6 +18,14 @@ menuconfig DRM
          details.  You should also select and configure AGP
          (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+       tristate
+       depends on DRM
+       select FB
+       select FRAMEBUFFER_CONSOLE if !EMBEDDED
+       help
+         FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
        tristate
        depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
        tristate "ATI Rage 128"
        depends on DRM && PCI
+       select FW_LOADER
        help
          Choose this option if you have an ATI Rage 128 graphics card.  If M
          is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select FB
-       select FRAMEBUFFER_CONSOLE if !EMBEDDED
+       select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
        help
          Choose this option if you have an ATI Radeon graphics card.  There
          are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
        tristate "i915 driver"
        depends on AGP_INTEL
+       select DRM_KMS_HELPER
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select FB
-       select FRAMEBUFFER_CONSOLE if !EMBEDDED
        # i915 depends on ACPI_VIDEO when ACPI is enabled
        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
        select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
        tristate "Matrox g200/g400"
        depends on DRM
+       select FW_LOADER
        help
          Choose this option if you have a Matrox G200, G400 or G450 graphics
          card.  If M is selected, the module will be called mga.  AGP
index fe23f29..3c8827a 100644 (file)
@@ -10,11 +10,15 @@ drm-y       :=      drm_auth.o drm_bufs.o drm_cache.o \
                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-               drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-               drm_info.o drm_debugfs.o
+               drm_crtc.o drm_modes.o drm_edid.o \
+               drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)      += drm.o
 obj-$(CONFIG_DRM_TTM)  += ttm/
 obj-$(CONFIG_DRM_TDFX) += tdfx/
index 6246e3f..3d09e30 100644 (file)
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                          (unsigned long long)map->offset, map->size);
 
                break;
+       }
        case _DRM_GEM:
-               DRM_ERROR("tried to rmmap GEM object\n");
+               DRM_ERROR("tried to addmap GEM object\n");
                break;
-       }
        case _DRM_SCATTER_GATHER:
                if (!dev->sg) {
                        kfree(map);
index 0e994a0..0e3bd5b 100644 (file)
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
                clflush(page_virtual + i);
        kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+                                   unsigned long num_pages)
+{
+       unsigned long i;
+
+       mb();
+       for (i = 0; i < num_pages; i++)
+               drm_clflush_page(*pages++);
+       mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+       wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
        if (cpu_has_clflush) {
-               unsigned long i;
-
-               mb();
-               for (i = 0; i < num_pages; ++i)
-                       drm_clflush_page(*pages++);
-               mb();
-
+               drm_cache_flush_clflush(pages, num_pages);
                return;
        }
 
-       wbinvd();
+       if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+               printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+       unsigned long i;
+       for (i = 0; i < num_pages; i++) {
+               struct page *page = pages[i];
+               void *page_virtual;
+
+               if (unlikely(page == NULL))
+                       continue;
+
+               page_virtual = kmap_atomic(page, KM_USER0);
+               flush_dcache_range((unsigned long)page_virtual,
+                                  (unsigned long)page_virtual + PAGE_SIZE);
+               kunmap_atomic(page_virtual, KM_USER0);
+       }
+#else
+       printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+       WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
index 2f631c7..ba728ad 100644 (file)
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-       { DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-       { DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-       { DRM_MODE_SCALE_NO_SCALE, "No scale" },
-       { DRM_MODE_SCALE_ASPECT, "Aspect" },
+       { DRM_MODE_SCALE_NONE, "None" },
+       { DRM_MODE_SCALE_FULLSCREEN, "Full" },
+       { DRM_MODE_SCALE_CENTER, "Center" },
+       { DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
        { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
        { DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
        { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+       { DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
        { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
        { DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
        { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+       { DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,
@@ -146,6 +148,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
        { DRM_MODE_CONNECTOR_DisplayPort, "DisplayPort", 0 },
        { DRM_MODE_CONNECTOR_HDMIA, "HDMI Type A", 0 },
        { DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 },
+       { DRM_MODE_CONNECTOR_TV, "TV", 0 },
 };
 
 static struct drm_prop_enum_list drm_encoder_enum_list[] =
@@ -165,6 +168,7 @@ char *drm_get_encoder_name(struct drm_encoder *encoder)
                 encoder->base.id);
        return buf;
 }
+EXPORT_SYMBOL(drm_get_encoder_name);
 
 char *drm_get_connector_name(struct drm_connector *connector)
 {
@@ -699,6 +703,42 @@ int drm_mode_create_tv_properties(struct drm_device *dev, int num_modes,
                drm_property_add_enum(dev->mode_config.tv_mode_property, i,
                                      i, modes[i]);
 
+       dev->mode_config.tv_brightness_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "brightness", 2);
+       dev->mode_config.tv_brightness_property->values[0] = 0;
+       dev->mode_config.tv_brightness_property->values[1] = 100;
+
+       dev->mode_config.tv_contrast_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "contrast", 2);
+       dev->mode_config.tv_contrast_property->values[0] = 0;
+       dev->mode_config.tv_contrast_property->values[1] = 100;
+
+       dev->mode_config.tv_flicker_reduction_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "flicker reduction", 2);
+       dev->mode_config.tv_flicker_reduction_property->values[0] = 0;
+       dev->mode_config.tv_flicker_reduction_property->values[1] = 100;
+
+       dev->mode_config.tv_overscan_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "overscan", 2);
+       dev->mode_config.tv_overscan_property->values[0] = 0;
+       dev->mode_config.tv_overscan_property->values[1] = 100;
+
+       dev->mode_config.tv_saturation_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "saturation", 2);
+       dev->mode_config.tv_saturation_property->values[0] = 0;
+       dev->mode_config.tv_saturation_property->values[1] = 100;
+
+       dev->mode_config.tv_hue_property =
+               drm_property_create(dev, DRM_MODE_PROP_RANGE,
+                                   "hue", 2);
+       dev->mode_config.tv_hue_property->values[0] = 0;
+       dev->mode_config.tv_hue_property->values[1] = 100;
+
        return 0;
 }
 EXPORT_SYMBOL(drm_mode_create_tv_properties);
@@ -1044,7 +1084,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
                        list_for_each_entry(crtc, &dev->mode_config.crtc_list,
                                            head) {
-                               DRM_DEBUG("CRTC ID is %d\n", crtc->base.id);
+                               DRM_DEBUG_KMS("CRTC ID is %d\n", crtc->base.id);
                                if (put_user(crtc->base.id, crtc_id + copied)) {
                                        ret = -EFAULT;
                                        goto out;
@@ -1072,7 +1112,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                        list_for_each_entry(encoder,
                                            &dev->mode_config.encoder_list,
                                            head) {
-                               DRM_DEBUG("ENCODER ID is %d\n",
+                               DRM_DEBUG_KMS("ENCODER ID is %d\n",
                                          encoder->base.id);
                                if (put_user(encoder->base.id, encoder_id +
                                             copied)) {
@@ -1103,7 +1143,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                        list_for_each_entry(connector,
                                            &dev->mode_config.connector_list,
                                            head) {
-                               DRM_DEBUG("CONNECTOR ID is %d\n",
+                               DRM_DEBUG_KMS("CONNECTOR ID is %d\n",
                                          connector->base.id);
                                if (put_user(connector->base.id,
                                             connector_id + copied)) {
@@ -1127,7 +1167,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
        }
        card_res->count_connectors = connector_count;
 
-       DRM_DEBUG("Counted %d %d %d\n", card_res->count_crtcs,
+       DRM_DEBUG_KMS("Counted %d %d %d\n", card_res->count_crtcs,
                  card_res->count_connectors, card_res->count_encoders);
 
 out:
@@ -1230,7 +1270,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
 
        memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));
 
-       DRM_DEBUG("connector id %d:\n", out_resp->connector_id);
+       DRM_DEBUG_KMS("connector id %d:\n", out_resp->connector_id);
 
        mutex_lock(&dev->mode_config.mutex);
 
@@ -1406,7 +1446,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
        obj = drm_mode_object_find(dev, crtc_req->crtc_id,
                                   DRM_MODE_OBJECT_CRTC);
        if (!obj) {
-               DRM_DEBUG("Unknown CRTC ID %d\n", crtc_req->crtc_id);
+               DRM_DEBUG_KMS("Unknown CRTC ID %d\n", crtc_req->crtc_id);
                ret = -EINVAL;
                goto out;
        }
@@ -1419,7 +1459,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                        list_for_each_entry(crtcfb,
                                            &dev->mode_config.crtc_list, head) {
                                if (crtcfb == crtc) {
-                                       DRM_DEBUG("Using current fb for setmode\n");
+                                       DRM_DEBUG_KMS("Using current fb for "
+                                                       "setmode\n");
                                        fb = crtc->fb;
                                }
                        }
@@ -1427,7 +1468,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                        obj = drm_mode_object_find(dev, crtc_req->fb_id,
                                                   DRM_MODE_OBJECT_FB);
                        if (!obj) {
-                               DRM_DEBUG("Unknown FB ID%d\n", crtc_req->fb_id);
+                               DRM_DEBUG_KMS("Unknown FB ID%d\n",
+                                               crtc_req->fb_id);
                                ret = -EINVAL;
                                goto out;
                        }
@@ -1440,13 +1482,13 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
        }
 
        if (crtc_req->count_connectors == 0 && mode) {
-               DRM_DEBUG("Count connectors is 0 but mode set\n");
+               DRM_DEBUG_KMS("Count connectors is 0 but mode set\n");
                ret = -EINVAL;
                goto out;
        }
 
        if (crtc_req->count_connectors > 0 && (!mode || !fb)) {
-               DRM_DEBUG("Count connectors is %d but no mode or fb set\n",
+               DRM_DEBUG_KMS("Count connectors is %d but no mode or fb set\n",
                          crtc_req->count_connectors);
                ret = -EINVAL;
                goto out;
@@ -1479,7 +1521,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                        obj = drm_mode_object_find(dev, out_id,
                                                   DRM_MODE_OBJECT_CONNECTOR);
                        if (!obj) {
-                               DRM_DEBUG("Connector id %d unknown\n", out_id);
+                               DRM_DEBUG_KMS("Connector id %d unknown\n",
+                                               out_id);
                                ret = -EINVAL;
                                goto out;
                        }
@@ -1512,7 +1555,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
        struct drm_crtc *crtc;
        int ret = 0;
 
-       DRM_DEBUG("\n");
+       DRM_DEBUG_KMS("\n");
 
        if (!req->flags) {
                DRM_ERROR("no operation set\n");
@@ -1522,7 +1565,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
        mutex_lock(&dev->mode_config.mutex);
        obj = drm_mode_object_find(dev, req->crtc_id, DRM_MODE_OBJECT_CRTC);
        if (!obj) {
-               DRM_DEBUG("Unknown CRTC ID %d\n", req->crtc_id);
+               DRM_DEBUG_KMS("Unknown CRTC ID %d\n", req->crtc_id);
                ret = -EINVAL;
                goto out;
        }
index 6aaa2cb..fe86974 100644 (file)
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 
-/*
- * Detailed mode info for 800x600@60Hz
- */
-static struct drm_display_mode std_modes[] = {
-       { DRM_MODE("800x600", DRM_MODE_TYPE_DEFAULT, 40000, 800, 840,
-                  968, 1056, 0, 600, 601, 605, 628, 0,
-                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
-};
-
 static void drm_mode_validate_flag(struct drm_connector *connector,
                                   int flags)
 {
@@ -94,7 +85,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
        int count = 0;
        int mode_flags = 0;
 
-       DRM_DEBUG("%s\n", drm_get_connector_name(connector));
+       DRM_DEBUG_KMS("%s\n", drm_get_connector_name(connector));
        /* set all modes to the unverified state */
        list_for_each_entry_safe(mode, t, &connector->modes, head)
                mode->status = MODE_UNVERIFIED;
@@ -102,15 +93,17 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
        connector->status = connector->funcs->detect(connector);
 
        if (connector->status == connector_status_disconnected) {
-               DRM_DEBUG("%s is disconnected\n",
+               DRM_DEBUG_KMS("%s is disconnected\n",
                          drm_get_connector_name(connector));
-               /* TODO set EDID to NULL */
-               return 0;
+               goto prune;
        }
 
        count = (*connector_funcs->get_modes)(connector);
-       if (!count)
-               return 0;
+       if (!count) {
+               count = drm_add_modes_noedid(connector, 800, 600);
+               if (!count)
+                       return 0;
+       }
 
        drm_mode_connector_list_update(connector);
 
@@ -130,7 +123,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
                                                                   mode);
        }
 
-
+prune:
        drm_mode_prune_invalid(dev, &connector->modes, true);
 
        if (list_empty(&connector->modes))
@@ -138,7 +131,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
 
        drm_mode_sort(&connector->modes);
 
-       DRM_DEBUG("Probed modes for %s\n", drm_get_connector_name(connector));
+       DRM_DEBUG_KMS("Probed modes for %s\n",
+                               drm_get_connector_name(connector));
        list_for_each_entry_safe(mode, t, &connector->modes, head) {
                mode->vrefresh = drm_mode_vrefresh(mode);
 
@@ -165,39 +159,6 @@ int drm_helper_probe_connector_modes(struct drm_device *dev, uint32_t maxX,
 }
 EXPORT_SYMBOL(drm_helper_probe_connector_modes);
 
-static void drm_helper_add_std_modes(struct drm_device *dev,
-                                    struct drm_connector *connector)
-{
-       struct drm_display_mode *mode, *t;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(std_modes); i++) {
-               struct drm_display_mode *stdmode;
-
-               /*
-                * When no valid EDID modes are available we end up
-                * here and bailed in the past, now we add some standard
-                * modes and move on.
-                */
-               stdmode = drm_mode_duplicate(dev, &std_modes[i]);
-               drm_mode_probed_add(connector, stdmode);
-               drm_mode_list_concat(&connector->probed_modes,
-                                    &connector->modes);
-
-               DRM_DEBUG("Adding mode %s to %s\n", stdmode->name,
-                         drm_get_connector_name(connector));
-       }
-       drm_mode_sort(&connector->modes);
-
-       DRM_DEBUG("Added std modes on %s\n", drm_get_connector_name(connector));
-       list_for_each_entry_safe(mode, t, &connector->modes, head) {
-               mode->vrefresh = drm_mode_vrefresh(mode);
-
-               drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
-               drm_mode_debug_printmodeline(mode);
-       }
-}
-
 /**
  * drm_helper_encoder_in_use - check if a given encoder is in use
  * @encoder: encoder to check
@@ -258,13 +219,27 @@ EXPORT_SYMBOL(drm_helper_crtc_in_use);
 void drm_helper_disable_unused_functions(struct drm_device *dev)
 {
        struct drm_encoder *encoder;
+       struct drm_connector *connector;
        struct drm_encoder_helper_funcs *encoder_funcs;
        struct drm_crtc *crtc;
 
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               if (!connector->encoder)
+                       continue;
+               if (connector->status == connector_status_disconnected)
+                       connector->encoder = NULL;
+       }
+
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                encoder_funcs = encoder->helper_private;
-               if (!drm_helper_encoder_in_use(encoder))
-                       (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+               if (!drm_helper_encoder_in_use(encoder)) {
+                       if (encoder_funcs->disable)
+                               (*encoder_funcs->disable)(encoder);
+                       else
+                               (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+                       /* disconnector encoder from any connector */
+                       encoder->crtc = NULL;
+               }
        }
 
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -312,7 +287,7 @@ static void drm_enable_connectors(struct drm_device *dev, bool *enabled)
 
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                enabled[i] = drm_connector_enabled(connector, true);
-               DRM_DEBUG("connector %d enabled? %s\n", connector->base.id,
+               DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id,
                          enabled[i] ? "yes" : "no");
                any_enabled |= enabled[i];
                i++;
@@ -342,7 +317,7 @@ static bool drm_target_preferred(struct drm_device *dev,
                        continue;
                }
 
-               DRM_DEBUG("looking for preferred mode on connector %d\n",
+               DRM_DEBUG_KMS("looking for preferred mode on connector %d\n",
                          connector->base.id);
 
                modes[i] = drm_has_preferred_mode(connector, width, height);
@@ -351,7 +326,7 @@ static bool drm_target_preferred(struct drm_device *dev,
                        list_for_each_entry(modes[i], &connector->modes, head)
                                break;
                }
-               DRM_DEBUG("found mode %s\n", modes[i] ? modes[i]->name :
+               DRM_DEBUG_KMS("found mode %s\n", modes[i] ? modes[i]->name :
                          "none");
                i++;
        }
@@ -409,7 +384,7 @@ static int drm_pick_crtcs(struct drm_device *dev,
        c = 0;
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 
-               if ((connector->encoder->possible_crtcs & (1 << c)) == 0) {
+               if ((encoder->possible_crtcs & (1 << c)) == 0) {
                        c++;
                        continue;
                }
@@ -452,7 +427,7 @@ static void drm_setup_crtcs(struct drm_device *dev)
        int width, height;
        int i, ret;
 
-       DRM_DEBUG("\n");
+       DRM_DEBUG_KMS("\n");
 
        width = dev->mode_config.max_width;
        height = dev->mode_config.max_height;
@@ -475,7 +450,7 @@ static void drm_setup_crtcs(struct drm_device *dev)
        if (!ret)
                DRM_ERROR("Unable to find initial modes\n");
 
-       DRM_DEBUG("picking CRTCs for %dx%d config\n", width, height);
+       DRM_DEBUG_KMS("picking CRTCs for %dx%d config\n", width, height);
 
        drm_pick_crtcs(dev, crtcs, modes, 0, width, height);
 
@@ -490,12 +465,14 @@ static void drm_setup_crtcs(struct drm_device *dev)
                }
 
                if (mode && crtc) {
-                       DRM_DEBUG("desired mode %s set on crtc %d\n",
+                       DRM_DEBUG_KMS("desired mode %s set on crtc %d\n",
                                  mode->name, crtc->base.id);
                        crtc->desired_mode = mode;
                        connector->encoder->crtc = crtc;
-               } else
+               } else {
                        connector->encoder->crtc = NULL;
+                       connector->encoder = NULL;
+               }
                i++;
        }
 
@@ -702,18 +679,17 @@ EXPORT_SYMBOL(drm_crtc_helper_set_mode);
 int drm_crtc_helper_set_config(struct drm_mode_set *set)
 {
        struct drm_device *dev;
-       struct drm_crtc **save_crtcs, *new_crtc;
-       struct drm_encoder **save_encoders, *new_encoder;
+       struct drm_crtc *save_crtcs, *new_crtc, *crtc;
+       struct drm_encoder *save_encoders, *new_encoder, *encoder;
        struct drm_framebuffer *old_fb = NULL;
-       bool save_enabled;
        bool mode_changed = false; /* if true do a full mode set */
        bool fb_changed = false; /* if true and !mode_changed just do a flip */
-       struct drm_connector *connector;
+       struct drm_connector *save_connectors, *connector;
        int count = 0, ro, fail = 0;
        struct drm_crtc_helper_funcs *crtc_funcs;
        int ret = 0;
 
-       DRM_DEBUG("\n");
+       DRM_DEBUG_KMS("\n");
 
        if (!set)
                return -EINVAL;
@@ -726,37 +702,60 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 
        crtc_funcs = set->crtc->helper_private;
 
-       DRM_DEBUG("crtc: %p %d fb: %p connectors: %p num_connectors: %d (x, y) (%i, %i)\n",
+       DRM_DEBUG_KMS("crtc: %p %d fb: %p connectors: %p num_connectors:"
+                       " %d (x, y) (%i, %i)\n",
                  set->crtc, set->crtc->base.id, set->fb, set->connectors,
                  (int)set->num_connectors, set->x, set->y);
 
        dev = set->crtc->dev;
 
-       /* save previous config */
-       save_enabled = set->crtc->enabled;
-
-       /*
-        * We do mode_config.num_connectors here since we'll look at the
-        * CRTC and encoder associated with each connector later.
-        */
-       save_crtcs = kzalloc(dev->mode_config.num_connector *
-                            sizeof(struct drm_crtc *), GFP_KERNEL);
+       /* Allocate space for the backup of all (non-pointer) crtc, encoder and
+        * connector data. */
+       save_crtcs = kzalloc(dev->mode_config.num_crtc *
+                            sizeof(struct drm_crtc), GFP_KERNEL);
        if (!save_crtcs)
                return -ENOMEM;
 
-       save_encoders = kzalloc(dev->mode_config.num_connector *
-                               sizeof(struct drm_encoders *), GFP_KERNEL);
+       save_encoders = kzalloc(dev->mode_config.num_encoder *
+                               sizeof(struct drm_encoder), GFP_KERNEL);
        if (!save_encoders) {
                kfree(save_crtcs);
                return -ENOMEM;
        }
 
+       save_connectors = kzalloc(dev->mode_config.num_connector *
+                               sizeof(struct drm_connector), GFP_KERNEL);
+       if (!save_connectors) {
+               kfree(save_crtcs);
+               kfree(save_encoders);
+               return -ENOMEM;
+       }
+
+       /* Copy data. Note that driver private data is not affected.
+        * Should anything bad happen only the expected state is
+        * restored, not the drivers personal bookkeeping.
+        */
+       count = 0;
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               save_crtcs[count++] = *crtc;
+       }
+
+       count = 0;
+       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+               save_encoders[count++] = *encoder;
+       }
+
+       count = 0;
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               save_connectors[count++] = *connector;
+       }
+
        /* We should be able to check here if the fb has the same properties
         * and then just flip_or_move it */
        if (set->crtc->fb != set->fb) {
                /* If we have no fb then treat it as a full mode set */
                if (set->crtc->fb == NULL) {
-                       DRM_DEBUG("crtc has no fb, full mode set\n");
+                       DRM_DEBUG_KMS("crtc has no fb, full mode set\n");
                        mode_changed = true;
                } else if (set->fb == NULL) {
                        mode_changed = true;
@@ -772,7 +771,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                fb_changed = true;
 
        if (set->mode && !drm_mode_equal(set->mode, &set->crtc->mode)) {
-               DRM_DEBUG("modes are different, full mode set\n");
+               DRM_DEBUG_KMS("modes are different, full mode set\n");
                drm_mode_debug_printmodeline(&set->crtc->mode);
                drm_mode_debug_printmodeline(set->mode);
                mode_changed = true;
@@ -783,7 +782,6 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                struct drm_connector_helper_funcs *connector_funcs =
                        connector->helper_private;
-               save_encoders[count++] = connector->encoder;
                new_encoder = connector->encoder;
                for (ro = 0; ro < set->num_connectors; ro++) {
                        if (set->connectors[ro] == connector) {
@@ -798,15 +796,20 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                }
 
                if (new_encoder != connector->encoder) {
-                       DRM_DEBUG("encoder changed, full mode switch\n");
+                       DRM_DEBUG_KMS("encoder changed, full mode switch\n");
                        mode_changed = true;
+                       /* If the encoder is reused for another connector, then
+                        * the appropriate crtc will be set later.
+                        */
+                       if (connector->encoder)
+                               connector->encoder->crtc = NULL;
                        connector->encoder = new_encoder;
                }
        }
 
        if (fail) {
                ret = -EINVAL;
-               goto fail_no_encoder;
+               goto fail;
        }
 
        count = 0;
@@ -814,8 +817,6 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                if (!connector->encoder)
                        continue;
 
-               save_crtcs[count++] = connector->encoder->crtc;
-
                if (connector->encoder->crtc == set->crtc)
                        new_crtc = NULL;
                else
@@ -830,14 +831,14 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                if (new_crtc &&
                    !drm_encoder_crtc_ok(connector->encoder, new_crtc)) {
                        ret = -EINVAL;
-                       goto fail_set_mode;
+                       goto fail;
                }
                if (new_crtc != connector->encoder->crtc) {
-                       DRM_DEBUG("crtc changed, full mode switch\n");
+                       DRM_DEBUG_KMS("crtc changed, full mode switch\n");
                        mode_changed = true;
                        connector->encoder->crtc = new_crtc;
                }
-               DRM_DEBUG("setting connector %d crtc to %p\n",
+               DRM_DEBUG_KMS("setting connector %d crtc to %p\n",
                          connector->base.id, new_crtc);
        }
 
@@ -850,7 +851,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                set->crtc->fb = set->fb;
                set->crtc->enabled = (set->mode != NULL);
                if (set->mode != NULL) {
-                       DRM_DEBUG("attempting to set mode from userspace\n");
+                       DRM_DEBUG_KMS("attempting to set mode from"
+                                       " userspace\n");
                        drm_mode_debug_printmodeline(set->mode);
                        if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
                                                      set->x, set->y,
@@ -858,7 +860,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                                DRM_ERROR("failed to set mode on crtc %p\n",
                                          set->crtc);
                                ret = -EINVAL;
-                               goto fail_set_mode;
+                               goto fail;
                        }
                        /* TODO are these needed? */
                        set->crtc->desired_x = set->x;
@@ -867,43 +869,50 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                }
                drm_helper_disable_unused_functions(dev);
        } else if (fb_changed) {
+               set->crtc->x = set->x;
+               set->crtc->y = set->y;
+
                old_fb = set->crtc->fb;
                if (set->crtc->fb != set->fb)
                        set->crtc->fb = set->fb;
                ret = crtc_funcs->mode_set_base(set->crtc,
                                                set->x, set->y, old_fb);
                if (ret != 0)
-                   goto fail_set_mode;
+                       goto fail;
        }
 
+       kfree(save_connectors);
        kfree(save_encoders);
        kfree(save_crtcs);
        return 0;
 
-fail_set_mode:
-       set->crtc->enabled = save_enabled;
-       set->crtc->fb = old_fb;
+fail:
+       /* Restore all previous data. */
        count = 0;
-       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-               if (!connector->encoder)
-                       continue;
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               *crtc = save_crtcs[count++];
+       }
 
-               connector->encoder->crtc = save_crtcs[count++];
+       count = 0;
+       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+               *encoder = save_encoders[count++];
        }
-fail_no_encoder:
-       kfree(save_crtcs);
+
        count = 0;
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-               connector->encoder = save_encoders[count++];
+               *connector = save_connectors[count++];
        }
+
+       kfree(save_connectors);
        kfree(save_encoders);
+       kfree(save_crtcs);
        return ret;
 }
 EXPORT_SYMBOL(drm_crtc_helper_set_config);
 
 bool drm_helper_plugged_event(struct drm_device *dev)
 {
-       DRM_DEBUG("\n");
+       DRM_DEBUG_KMS("\n");
 
        drm_helper_probe_connector_modes(dev, dev->mode_config.max_width,
                                         dev->mode_config.max_height);
@@ -932,7 +941,6 @@ bool drm_helper_plugged_event(struct drm_device *dev)
  */
 bool drm_helper_initial_config(struct drm_device *dev)
 {
-       struct drm_connector *connector;
        int count = 0;
 
        count = drm_helper_probe_connector_modes(dev,
@@ -940,16 +948,9 @@ bool drm_helper_initial_config(struct drm_device *dev)
                                                 dev->mode_config.max_height);
 
        /*
-        * None of the available connectors had any modes, so add some
-        * and try to light them up anyway
+        * we shouldn't end up with no modes here.
         */
-       if (!count) {
-               DRM_ERROR("connectors have no modes, using standard modes\n");
-               list_for_each_entry(connector,
-                                   &dev->mode_config.connector_list,
-                                   head)
-                       drm_helper_add_std_modes(dev, connector);
-       }
+       WARN(!count, "Connected connector with 0 modes\n");
 
        drm_setup_crtcs(dev);
 
index b39d7bf..a75ca63 100644 (file)
@@ -63,12 +63,12 @@ static struct drm_ioctl_desc drm_ioctls[] = {
        DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, 0),
-       DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER|DRM_ROOT_ONLY),
+       DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
 
        DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-       DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+       DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
 
        DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
index 7f2728b..90d76ba 100644 (file)
 #define EDID_QUIRK_FIRST_DETAILED_PREFERRED    (1 << 5)
 /* use +hsync +vsync for detailed mode */
 #define EDID_QUIRK_DETAILED_SYNC_PP            (1 << 6)
+/* define the number of Extension EDID block */
+#define MAX_EDID_EXT_NUM 4
+
+#define LEVEL_DMT      0
+#define LEVEL_GTF      1
+#define LEVEL_CVT      2
 
 static struct edid_quirk {
        char *vendor;
@@ -237,28 +243,291 @@ static void edid_fixup_preferred(struct drm_connector *connector,
        preferred_mode->type |= DRM_MODE_TYPE_PREFERRED;
 }
 
+/*
+ * Add the Autogenerated from the DMT spec.
+ * This table is copied from xfree86/modes/xf86EdidModes.c.
+ * But the mode with Reduced blank feature is deleted.
+ */
+static struct drm_display_mode drm_dmt_modes[] = {
+       /* 640x350@85Hz */
+       { DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 31500, 640, 672,
+                  736, 832, 0, 350, 382, 385, 445, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 640x400@85Hz */
+       { DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 31500, 640, 672,
+                  736, 832, 0, 400, 401, 404, 445, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 720x400@85Hz */
+       { DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 35500, 720, 756,
+                  828, 936, 0, 400, 401, 404, 446, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 640x480@60Hz */
+       { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,
+                  752, 800, 0, 480, 489, 492, 525, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 640x480@72Hz */
+       { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664,
+                  704, 832, 0, 480, 489, 492, 520, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 640x480@75Hz */
+       { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 656,
+                  720, 840, 0, 480, 481, 484, 500, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 640x480@85Hz */
+       { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 36000, 640, 696,
+                  752, 832, 0, 480, 481, 484, 509, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 800x600@56Hz */
+       { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 36000, 800, 824,
+                  896, 1024, 0, 600, 601, 603, 625, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 800x600@60Hz */
+       { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840,
+                  968, 1056, 0, 600, 601, 605, 628, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 800x600@72Hz */
+       { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 50000, 800, 856,
+                  976, 1040, 0, 600, 637, 643, 666, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 800x600@75Hz */
+       { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 49500, 800, 816,
+                  896, 1056, 0, 600, 601, 604, 625, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 800x600@85Hz */
+       { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 56250, 800, 832,
+                  896, 1048, 0, 600, 601, 604, 631, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 848x480@60Hz */
+       { DRM_MODE("848x480", DRM_MODE_TYPE_DRIVER, 33750, 848, 864,
+                  976, 1088, 0, 480, 486, 494, 517, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1024x768@43Hz, interlace */
+       { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 44900, 1024, 1032,
+                  1208, 1264, 0, 768, 768, 772, 817, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
+                       DRM_MODE_FLAG_INTERLACE) },
+       /* 1024x768@60Hz */
+       { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048,
+                  1184, 1344, 0, 768, 771, 777, 806, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 1024x768@70Hz */
+       { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 75000, 1024, 1048,
+                  1184, 1328, 0, 768, 771, 777, 806, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 1024x768@75Hz */
+       { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 78750, 1024, 1040,
+                  1136, 1312, 0, 768, 769, 772, 800, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1024x768@85Hz */
+       { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072,
+                  1072, 1376, 0, 768, 769, 772, 808, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1152x864@75Hz */
+       { DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216,
+                  1344, 1600, 0, 864, 865, 868, 900, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x768@60Hz */
+       { DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 79500, 1280, 1344,
+                  1472, 1664, 0, 768, 771, 778, 798, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x768@75Hz */
+       { DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 102250, 1280, 1360,
+                  1488, 1696, 0, 768, 771, 778, 805, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 1280x768@85Hz */
+       { DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 117500, 1280, 1360,
+                  1496, 1712, 0, 768, 771, 778, 809, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x800@60Hz */
+       { DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 83500, 1280, 1352,
+                  1480, 1680, 0, 800, 803, 809, 831, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) },
+       /* 1280x800@75Hz */
+       { DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 106500, 1280, 1360,
+                  1488, 1696, 0, 800, 803, 809, 838, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x800@85Hz */
+       { DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 122500, 1280, 1360,
+                  1496, 1712, 0, 800, 803, 809, 843, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x960@60Hz */
+       { DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 108000, 1280, 1376,
+                  1488, 1800, 0, 960, 961, 964, 1000, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x960@85Hz */
+       { DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1344,
+                  1504, 1728, 0, 960, 961, 964, 1011, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x1024@60Hz */
+       { DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 108000, 1280, 1328,
+                  1440, 1688, 0, 1024, 1025, 1028, 1066, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x1024@75Hz */
+       { DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 135000, 1280, 1296,
+                  1440, 1688, 0, 1024, 1025, 1028, 1066, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1280x1024@85Hz */
+       { DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 157500, 1280, 1344,
+                  1504, 1728, 0, 1024, 1025, 1028, 1072, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1360x768@60Hz */
+       { DRM_MODE("1360x768", DRM_MODE_TYPE_DRIVER, 85500, 1360, 1424,
+                  1536, 1792, 0, 768, 771, 777, 795, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x1050@60Hz */
+       { DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 121750, 1400, 1488,
+                  1632, 1864, 0, 1050, 1053, 1057, 1089, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x1050@75Hz */
+       { DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 156000, 1400, 1504,
+                  1648, 1896, 0, 1050, 1053, 1057, 1099, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x1050@85Hz */
+       { DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 179500, 1400, 1504,
+                  1656, 1912, 0, 1050, 1053, 1057, 1105, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x900@60Hz */
+       { DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 106500, 1440, 1520,
+                  1672, 1904, 0, 900, 903, 909, 934, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x900@75Hz */
+       { DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 136750, 1440, 1536,
+                  1688, 1936, 0, 900, 903, 909, 942, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1440x900@85Hz */
+       { DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 157000, 1440, 1544,
+                  1696, 1952, 0, 900, 903, 909, 948, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1600x1200@60Hz */
+       { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 162000, 1600, 1664,
+                  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1600x1200@65Hz */
+       { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 175500, 1600, 1664,
+                  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1600x1200@70Hz */
+       { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 189000, 1600, 1664,
+                  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1600x1200@75Hz */
+       { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 2025000, 1600, 1664,
+                  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1600x1200@85Hz */
+       { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 229500, 1600, 1664,
+                  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
+                  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1680x1050@60Hz */
+       { DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 146250, 1680, 1784,
+                  1960, 2240, 0, 1050, 1053, 1059, 1089, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1680x1050@75Hz */
+       { DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 187000, 1680, 1800,
+                  1976, 2272, 0, 1050, 1053, 1059, 1099, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1680x1050@85Hz */
+       { DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 214750, 1680, 1808,
+                  1984, 2288, 0, 1050, 1053, 1059, 1105, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1792x1344@60Hz */
+       { DRM_MODE("1792x1344", DRM_MODE_TYPE_DRIVER, 204750, 1792, 1920,
+                  2120, 2448, 0, 1344, 1345, 1348, 1394, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1729x1344@75Hz */
+       { DRM_MODE("1792x1344", DRM_MODE_TYPE_DRIVER, 261000, 1792, 1888,
+                  2104, 2456, 0, 1344, 1345, 1348, 1417, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1853x1392@60Hz */
+       { DRM_MODE("1856x1392", DRM_MODE_TYPE_DRIVER, 218250, 1856, 1952,
+                  2176, 2528, 0, 1392, 1393, 1396, 1439, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1856x1392@75Hz */
+       { DRM_MODE("1856x1392", DRM_MODE_TYPE_DRIVER, 288000, 1856, 1984,
+                  2208, 2560, 0, 1392, 1395, 1399, 1500, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1920x1200@60Hz */
+       { DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 193250, 1920, 2056,
+                  2256, 2592, 0, 1200, 1203, 1209, 1245, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1920x1200@75Hz */
+       { DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 245250, 1920, 2056,
+                  2264, 2608, 0, 1200, 1203, 1209, 1255, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1920x1200@85Hz */
+       { DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 281250, 1920, 2064,
+                  2272, 2624, 0, 1200, 1203, 1209, 1262, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1920x1440@60Hz */
+       { DRM_MODE("1920x1440", DRM_MODE_TYPE_DRIVER, 234000, 1920, 2048,
+                  2256, 2600, 0, 1440, 1441, 1444, 1500, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 1920x1440@75Hz */
+       { DRM_MODE("1920x1440", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2064,
+                  2288, 2640, 0, 1440, 1441, 1444, 1500, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 2560x1600@60Hz */
+       { DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 348500, 2560, 2752,
+                  3032, 3504, 0, 1600, 1603, 1609, 1658, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 2560x1600@75HZ */
+       { DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 443250, 2560, 2768,
+                  3048, 3536, 0, 1600, 1603, 1609, 1672, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+       /* 2560x1600@85HZ */
+       { DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 505250, 2560, 2768,
+                  3048, 3536, 0, 1600, 1603, 1609, 1682, 0,
+                  DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
+};
+
+static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
+                       int hsize, int vsize, int fresh)
+{
+       int i, count;
+       struct drm_display_mode *ptr, *mode;
+
+       count = sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
+       mode = NULL;
+       for (i = 0; i < count; i++) {
+               ptr = &drm_dmt_modes[i];
+               if (hsize == ptr->hdisplay &&
+                       vsize == ptr->vdisplay &&
+                       fresh == drm_mode_vrefresh(ptr)) {
+                       /* get the expected default mode */
+                       mode = drm_mode_duplicate(dev, ptr);
+                       break;
+               }
+       }
+       return mode;
+}
 /**
  * drm_mode_std - convert standard mode info (width, height, refresh) into mode
  * @t: standard timing params
+ * @timing_level: standard timing level
  *
  * Take the standard timing params (in this case width, aspect, and refresh)
- * and convert them into a real mode using CVT.
+ * and convert them into a real mode using CVT/GTF/DMT.
  *
  * Punts for now, but should eventually use the FB layer's CVT based mode
  * generation code.
  */
 struct drm_display_mode *drm_mode_std(struct drm_device *dev,
-                                     struct std_timing *t)
+                                     struct std_timing *t,
+                                     int timing_level)
 {
        struct drm_display_mode *mode;
-       int hsize = t->hsize * 8 + 248, vsize;
+       int hsize, vsize;
+       int vrefresh_rate;
        unsigned aspect_ratio = (t->vfreq_aspect & EDID_TIMING_ASPECT_MASK)
                >> EDID_TIMING_ASPECT_SHIFT;
-
-       mode = drm_mode_create(dev);
-       if (!mode)
-               return NULL;
-
+       unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
+               >> EDID_TIMING_VFREQ_SHIFT;
+
+       /* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
+       hsize = t->hsize * 8 + 248;
+       /* vrefresh_rate = vfreq + 60 */
+       vrefresh_rate = vfreq + 60;
+       /* the vdisplay is calculated based on the aspect ratio */
        if (aspect_ratio == 0)
                vsize = (hsize * 10) / 16;
        else if (aspect_ratio == 1)
@@ -267,9 +536,30 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
                vsize = (hsize * 4) / 5;
        else
                vsize = (hsize * 9) / 16;
-
-       drm_mode_set_name(mode);
-
+       /* HDTV hack */
+       if (hsize == 1360 && vsize == 765 && vrefresh_rate == 60) {
+               mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
+               mode->hdisplay = 1366;
+               mode->vsync_start = mode->vsync_start - 1;
+               mode->vsync_end = mode->vsync_end - 1;
+               return mode;
+       }
+       mode = NULL;
+       /* check whether it can be found in default mode table */
+       mode = drm_find_dmt(dev, hsize, vsize, vrefresh_rate);
+       if (mode)
+               return mode;
+
+       switch (timing_level) {
+       case LEVEL_DMT:
+               break;
+       case LEVEL_GTF:
+               mode = drm_gtf_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
+               break;
+       case LEVEL_CVT:
+               mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
+               break;
+       }
        return mode;
 }
 
@@ -451,6 +741,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
 
        return modes;
 }
+/**
+ * stanard_timing_level - get std. timing level(CVT/GTF/DMT)
+ * @edid: EDID block to scan
+ */
+static int standard_timing_level(struct edid *edid)
+{
+       if (edid->revision >= 2) {
+               if (edid->revision >= 4 && (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF))
+                       return LEVEL_CVT;
+               return LEVEL_GTF;
+       }
+       return LEVEL_DMT;
+}
 
 /**
  * add_standard_modes - get std. modes from EDID and add them
@@ -463,6 +766,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 {
        struct drm_device *dev = connector->dev;
        int i, modes = 0;
+       int timing_level;
+
+       timing_level = standard_timing_level(edid);
 
        for (i = 0; i < EDID_STD_TIMINGS; i++) {
                struct std_timing *t = &edid->standard_timings[i];
@@ -472,7 +778,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
                if (t->hsize == 1 && t->vfreq_aspect == 1)
                        continue;
 
-               newmode = drm_mode_std(dev, &edid->standard_timings[i]);
+               newmode = drm_mode_std(dev, &edid->standard_timings[i],
+                                       timing_level);
                if (newmode) {
                        drm_mode_probed_add(connector, newmode);
                        modes++;
@@ -496,6 +803,9 @@ static int add_detailed_info(struct drm_connector *connector,
 {
        struct drm_device *dev = connector->dev;
        int i, j, modes = 0;
+       int timing_level;
+
+       timing_level = standard_timing_level(edid);
 
        for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
                struct detailed_timing *timing = &edid->detailed_timings[i];
@@ -525,7 +835,8 @@ static int add_detailed_info(struct drm_connector *connector,
                                        struct drm_display_mode *newmode;
 
                                        std = &data->data.timings[j];
-                                       newmode = drm_mode_std(dev, std);
+                                       newmode = drm_mode_std(dev, std,
+                                                              timing_level);
                                        if (newmode) {
                                                drm_mode_probed_add(connector, newmode);
                                                modes++;
@@ -551,6 +862,122 @@ static int add_detailed_info(struct drm_connector *connector,
 
        return modes;
 }
+/**
+ * add_detailed_mode_eedid - get detailed mode info from addtional timing
+ *                     EDID block
+ * @connector: attached connector
+ * @edid: EDID block to scan(It is only to get addtional timing EDID block)
+ * @quirks: quirks to apply
+ *
+ * Some of the detailed timing sections may contain mode information.  Grab
+ * it and add it to the list.
+ */
+static int add_detailed_info_eedid(struct drm_connector *connector,
+                            struct edid *edid, u32 quirks)
+{
+       struct drm_device *dev = connector->dev;
+       int i, j, modes = 0;
+       char *edid_ext = NULL;
+       struct detailed_timing *timing;
+       struct detailed_non_pixel *data;
+       struct drm_display_mode *newmode;
+       int edid_ext_num;
+       int start_offset, end_offset;
+       int timing_level;
+
+       if (edid->version == 1 && edid->revision < 3) {
+               /* If the EDID version is less than 1.3, there is no
+                * extension EDID.
+                */
+               return 0;
+       }
+       if (!edid->extensions) {
+               /* if there is no extension EDID, it is unnecessary to
+                * parse the E-EDID to get detailed info
+                */
+               return 0;
+       }
+
+       /* Chose real EDID extension number */
+       edid_ext_num = edid->extensions > MAX_EDID_EXT_NUM ?
+                      MAX_EDID_EXT_NUM : edid->extensions;
+
+       /* Find CEA extension */
+       for (i = 0; i < edid_ext_num; i++) {
+               edid_ext = (char *)edid + EDID_LENGTH * (i + 1);
+               /* This block is CEA extension */
+               if (edid_ext[0] == 0x02)
+                       break;
+       }
+
+       if (i == edid_ext_num) {
+               /* if there is no additional timing EDID block, return */
+               return 0;
+       }
+
+       /* Get the start offset of detailed timing block */
+       start_offset = edid_ext[2];
+       if (start_offset == 0) {
+               /* If the start_offset is zero, it means that neither detailed
+                * info nor data block exist. In such case it is also
+                * unnecessary to parse the detailed timing info.
+                */
+               return 0;
+       }
+
+       timing_level = standard_timing_level(edid);
+       end_offset = EDID_LENGTH;
+       end_offset -= sizeof(struct detailed_timing);
+       for (i = start_offset; i < end_offset;
+                       i += sizeof(struct detailed_timing)) {
+               timing = (struct detailed_timing *)(edid_ext + i);
+               data = &timing->data.other_data;
+               /* Detailed mode timing */
+               if (timing->pixel_clock) {
+                       newmode = drm_mode_detailed(dev, edid, timing, quirks);
+                       if (!newmode)
+                               continue;
+
+                       drm_mode_probed_add(connector, newmode);
+
+                       modes++;
+                       continue;
+               }
+
+               /* Other timing or info */
+               switch (data->type) {
+               case EDID_DETAIL_MONITOR_SERIAL:
+                       break;
+               case EDID_DETAIL_MONITOR_STRING:
+                       break;
+               case EDID_DETAIL_MONITOR_RANGE:
+                       /* Get monitor range data */
+                       break;
+               case EDID_DETAIL_MONITOR_NAME:
+                       break;
+               case EDID_DETAIL_MONITOR_CPDATA:
+                       break;
+               case EDID_DETAIL_STD_MODES:
+                       /* Five modes per detailed section */
+                       for (j = 0; j < 5; i++) {
+                               struct std_timing *std;
+                               struct drm_display_mode *newmode;
+
+                               std = &data->data.timings[j];
+                               newmode = drm_mode_std(dev, std, timing_level);
+                               if (newmode) {
+                                       drm_mode_probed_add(connector, newmode);
+                                       modes++;
+                               }
+                       }
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       return modes;
+}
 
 #define DDC_ADDR 0x50
 /**
@@ -584,7 +1011,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
        if (i2c_transfer(adapter, msgs, 2) == 2)
                return 0;
 
-       dev_info(&adapter->dev, "unable to read EDID block.\n");
        return -1;
 }
 EXPORT_SYMBOL(drm_do_probe_ddc_edid);
@@ -597,8 +1023,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
 
        ret = drm_do_probe_ddc_edid(adapter, buf, len);
        if (ret != 0) {
-               dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
-                        drm_get_connector_name(connector));
                goto end;
        }
        if (!edid_is_valid((struct edid *)buf)) {
@@ -610,7 +1034,6 @@ end:
        return ret;
 }
 
-#define MAX_EDID_EXT_NUM 4
 /**
  * drm_get_edid - get EDID data, if available
  * @connector: connector we're probing
@@ -763,6 +1186,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
        num_modes += add_established_modes(connector, edid);
        num_modes += add_standard_modes(connector, edid);
        num_modes += add_detailed_info(connector, edid, quirks);
+       num_modes += add_detailed_info_eedid(connector, edid, quirks);
 
        if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
                edid_fixup_preferred(connector, quirks);
@@ -788,3 +1212,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
        return num_modes;
 }
 EXPORT_SYMBOL(drm_add_edid_modes);
+
+/**
+ * drm_add_modes_noedid - add modes for the connectors without EDID
+ * @connector: connector we're probing
+ * @hdisplay: the horizontal display limit
+ * @vdisplay: the vertical display limit
+ *
+ * Add the specified modes to the connector's mode list. Only when the
+ * hdisplay/vdisplay is not beyond the given limit, it will be added.
+ *
+ * Return number of modes added or 0 if we couldn't find any.
+ */
+int drm_add_modes_noedid(struct drm_connector *connector,
+                       int hdisplay, int vdisplay)
+{
+       int i, count, num_modes = 0;
+       struct drm_display_mode *mode, *ptr;
+       struct drm_device *dev = connector->dev;
+
+       count = sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
+       if (hdisplay < 0)
+               hdisplay = 0;
+       if (vdisplay < 0)
+               vdisplay = 0;
+
+       for (i = 0; i < count; i++) {
+               ptr = &drm_dmt_modes[i];
+               if (hdisplay && vdisplay) {
+                       /*
+                        * Only when two are valid, they will be used to check
+                        * whether the mode should be added to the mode list of
+                        * the connector.
+                        */
+                       if (ptr->hdisplay > hdisplay ||
+                                       ptr->vdisplay > vdisplay)
+                               continue;
+               }
+               mode = drm_mode_duplicate(dev, ptr);
+               if (mode) {
+                       drm_mode_probed_add(connector, mode);
+                       num_modes++;
+               }
+       }
+       return num_modes;
+}
+EXPORT_SYMBOL(drm_add_modes_noedid);
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
new file mode 100644 (file)
index 0000000..f018469
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "drm_encoder_slave.h"
+
+/**
+ * drm_i2c_encoder_init - Initialize an I2C slave encoder
+ * @dev:       DRM device.
+ * @encoder:    Encoder to be attached to the I2C device. You aren't
+ *             required to have called drm_encoder_init() before.
+ * @adap:      I2C adapter that will be used to communicate with
+ *             the device.
+ * @info:      Information that will be used to create the I2C device.
+ *             Required fields are @addr and @type.
+ *
+ * Create an I2C device on the specified bus (the module containing its
+ * driver is transparently loaded) and attach it to the specified
+ * &drm_encoder_slave. The @slave_funcs field will be initialized with
+ * the hooks provided by the slave driver.
+ *
+ * Returns 0 on success or a negative errno on failure, in particular,
+ * -ENODEV is returned when no matching driver is found.
+ */
+int drm_i2c_encoder_init(struct drm_device *dev,
+                        struct drm_encoder_slave *encoder,
+                        struct i2c_adapter *adap,
+                        const struct i2c_board_info *info)
+{
+       char modalias[sizeof(I2C_MODULE_PREFIX)
+                     + I2C_NAME_SIZE];
+       struct module *module = NULL;
+       struct i2c_client *client;
+       struct drm_i2c_encoder_driver *encoder_drv;
+       int err = 0;
+
+       snprintf(modalias, sizeof(modalias),
+                "%s%s", I2C_MODULE_PREFIX, info->type);
+       request_module(modalias);
+
+       client = i2c_new_device(adap, info);
+       if (!client) {
+               err = -ENOMEM;
+               goto fail;
+       }
+
+       if (!client->driver) {
+               err = -ENODEV;
+               goto fail_unregister;
+       }
+
+       module = client->driver->driver.owner;
+       if (!try_module_get(module)) {
+               err = -ENODEV;
+               goto fail_unregister;
+       }
+
+       encoder->bus_priv = client;
+
+       encoder_drv = to_drm_i2c_encoder_driver(client->driver);
+
+       err = encoder_drv->encoder_init(client, dev, encoder);
+       if (err)
+               goto fail_unregister;
+
+       return 0;
+
+fail_unregister:
+       i2c_unregister_device(client);
+       module_put(module);
+fail:
+       return err;
+}
+EXPORT_SYMBOL(drm_i2c_encoder_init);
+
+/**
+ * drm_i2c_encoder_destroy - Unregister the I2C device backing an encoder
+ * @drm_encoder:       Encoder to be unregistered.
+ *
+ * This should be called from the @destroy method of an I2C slave
+ * encoder driver once I2C access is no longer needed.
+ */
+void drm_i2c_encoder_destroy(struct drm_encoder *drm_encoder)
+{
+       struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder);
+       struct i2c_client *client = drm_i2c_encoder_get_client(drm_encoder);
+       struct module *module = client->driver->driver.owner;
+
+       i2c_unregister_device(client);
+       encoder->bus_priv = NULL;
+
+       module_put(module);
+}
+EXPORT_SYMBOL(drm_i2c_encoder_destroy);
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
new file mode 100644 (file)
index 0000000..2c46713
--- /dev/null
@@ -0,0 +1,707 @@
+/*
+ * Copyright (c) 2006-2009 Red Hat Inc.
+ * Copyright (c) 2006-2008 Intel Corporation
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
+ * DRM framebuffer helper functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@linux.ie>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+#include <linux/sysrq.h>
+#include <linux/fb.h>
+#include "drmP.h"
+#include "drm_crtc.h"
+#include "drm_fb_helper.h"
+#include "drm_crtc_helper.h"
+
+MODULE_AUTHOR("David Airlie, Jesse Barnes");
+MODULE_DESCRIPTION("DRM KMS helper");
+MODULE_LICENSE("GPL and additional rights");
+
+static LIST_HEAD(kernel_fb_helper_list);
+
+bool drm_fb_helper_force_kernel_mode(void)
+{
+       int i = 0;
+       bool ret, error = false;
+       struct drm_fb_helper *helper;
+
+       if (list_empty(&kernel_fb_helper_list))
+               return false;
+
+       list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
+               for (i = 0; i < helper->crtc_count; i++) {
+                       struct drm_mode_set *mode_set = &helper->crtc_info[i].mode_set;
+                       ret = drm_crtc_helper_set_config(mode_set);
+                       if (ret)
+                               error = true;
+               }
+       }
+       return error;
+}
+
+int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,
+                       void *panic_str)
+{
+       DRM_ERROR("panic occurred, switching back to text console\n");
+       return drm_fb_helper_force_kernel_mode();
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_panic);
+
+static struct notifier_block paniced = {
+       .notifier_call = drm_fb_helper_panic,
+};
+
+/**
+ * drm_fb_helper_restore - restore the framebuffer console (kernel) config
+ *
+ * Restore's the kernel's fbcon mode, used for lastclose & panic paths.
+ */
+void drm_fb_helper_restore(void)
+{
+       bool ret;
+       ret = drm_fb_helper_force_kernel_mode();
+       if (ret == true)
+               DRM_ERROR("Failed to restore crtc configuration\n");
+}
+EXPORT_SYMBOL(drm_fb_helper_restore);
+
+static void drm_fb_helper_restore_work_fn(struct work_struct *ignored)
+{
+       drm_fb_helper_restore();
+}
+static DECLARE_WORK(drm_fb_helper_restore_work, drm_fb_helper_restore_work_fn);
+
+static void drm_fb_helper_sysrq(int dummy1, struct tty_struct *dummy3)
+{
+       schedule_work(&drm_fb_helper_restore_work);
+}
+
+static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
+       .handler = drm_fb_helper_sysrq,
+       .help_msg = "force-fb(V)",
+       .action_msg = "Restore framebuffer console",
+};
+
+static void drm_fb_helper_on(struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       struct drm_encoder *encoder;
+       int i;
+
+       /*
+        * For each CRTC in this fb, turn the crtc on then,
+        * find all associated encoders and turn them on.
+        */
+       for (i = 0; i < fb_helper->crtc_count; i++) {
+               list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+                       struct drm_crtc_helper_funcs *crtc_funcs =
+                               crtc->helper_private;
+
+                       /* Only mess with CRTCs in this fb */
+                       if (crtc->base.id != fb_helper->crtc_info[i].crtc_id ||
+                           !crtc->enabled)
+                               continue;
+
+                       mutex_lock(&dev->mode_config.mutex);
+                       crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
+                       mutex_unlock(&dev->mode_config.mutex);
+
+                       /* Found a CRTC on this fb, now find encoders */
+                       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                               if (encoder->crtc == crtc) {
+                                       struct drm_encoder_helper_funcs *encoder_funcs;
+
+                                       encoder_funcs = encoder->helper_private;
+                                       mutex_lock(&dev->mode_config.mutex);
+                                       encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
+                                       mutex_unlock(&dev->mode_config.mutex);
+                               }
+                       }
+               }
+       }
+}
+
+static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       struct drm_encoder *encoder;
+       int i;
+
+       /*
+        * For each CRTC in this fb, find all associated encoders
+        * and turn them off, then turn off the CRTC.
+        */
+       for (i = 0; i < fb_helper->crtc_count; i++) {
+               list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+                       struct drm_crtc_helper_funcs *crtc_funcs =
+                               crtc->helper_private;
+
+                       /* Only mess with CRTCs in this fb */
+                       if (crtc->base.id != fb_helper->crtc_info[i].crtc_id ||
+                           !crtc->enabled)
+                               continue;
+
+                       /* Found a CRTC on this fb, now find encoders */
+                       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                               if (encoder->crtc == crtc) {
+                                       struct drm_encoder_helper_funcs *encoder_funcs;
+
+                                       encoder_funcs = encoder->helper_private;
+                                       mutex_lock(&dev->mode_config.mutex);
+                                       encoder_funcs->dpms(encoder, dpms_mode);
+                                       mutex_unlock(&dev->mode_config.mutex);
+                               }
+                       }
+                       if (dpms_mode == DRM_MODE_DPMS_OFF) {
+                               mutex_lock(&dev->mode_config.mutex);
+                               crtc_funcs->dpms(crtc, dpms_mode);
+                               mutex_unlock(&dev->mode_config.mutex);
+                       }
+               }
+       }
+}
+
+int drm_fb_helper_blank(int blank, struct fb_info *info)
+{
+       switch (blank) {
+       case FB_BLANK_UNBLANK:
+               drm_fb_helper_on(info);
+               break;
+       case FB_BLANK_NORMAL:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+               break;
+       case FB_BLANK_HSYNC_SUSPEND:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+               break;
+       case FB_BLANK_VSYNC_SUSPEND:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_SUSPEND);
+               break;
+       case FB_BLANK_POWERDOWN:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_OFF);
+               break;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_blank);
+
+static void drm_fb_helper_crtc_free(struct drm_fb_helper *helper)
+{
+       int i;
+
+       for (i = 0; i < helper->crtc_count; i++)
+               kfree(helper->crtc_info[i].mode_set.connectors);
+       kfree(helper->crtc_info);
+}
+
+int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count, int max_conn_count)
+{
+       struct drm_device *dev = helper->dev;
+       struct drm_crtc *crtc;
+       int ret = 0;
+       int i;
+
+       helper->crtc_info = kcalloc(crtc_count, sizeof(struct drm_fb_helper_crtc), GFP_KERNEL);
+       if (!helper->crtc_info)
+               return -ENOMEM;
+
+       helper->crtc_count = crtc_count;
+
+       for (i = 0; i < crtc_count; i++) {
+               helper->crtc_info[i].mode_set.connectors =
+                       kcalloc(max_conn_count,
+                               sizeof(struct drm_connector *),
+                               GFP_KERNEL);
+
+               if (!helper->crtc_info[i].mode_set.connectors) {
+                       ret = -ENOMEM;
+                       goto out_free;
+               }
+               helper->crtc_info[i].mode_set.num_connectors = 0;
+       }
+
+       i = 0;
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               helper->crtc_info[i].crtc_id = crtc->base.id;
+               helper->crtc_info[i].mode_set.crtc = crtc;
+               i++;
+       }
+       helper->conn_limit = max_conn_count;
+       return 0;
+out_free:
+       drm_fb_helper_crtc_free(helper);
+       return -ENOMEM;
+}
+EXPORT_SYMBOL(drm_fb_helper_init_crtc_count);
+
+int drm_fb_helper_setcolreg(unsigned regno,
+                           unsigned red,
+                           unsigned green,
+                           unsigned blue,
+                           unsigned transp,
+                           struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       int i;
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               struct drm_framebuffer *fb = fb_helper->fb;
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               if (regno > 255)
+                       return 1;
+
+               if (fb->depth == 8) {
+                       fb_helper->funcs->gamma_set(crtc, red, green, blue, regno);
+                       return 0;
+               }
+
+               if (regno < 16) {
+                       switch (fb->depth) {
+                       case 15:
+                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
+                                       ((green & 0xf800) >>  6) |
+                                       ((blue & 0xf800) >> 11);
+                               break;
+                       case 16:
+                               fb->pseudo_palette[regno] = (red & 0xf800) |
+                                       ((green & 0xfc00) >>  5) |
+                                       ((blue  & 0xf800) >> 11);
+                               break;
+                       case 24:
+                       case 32:
+                               fb->pseudo_palette[regno] =
+                                       (((red >> 8) & 0xff) << info->var.red.offset) |
+                                       (((green >> 8) & 0xff) << info->var.green.offset) |
+                                       (((blue >> 8) & 0xff) << info->var.blue.offset);
+                               break;
+                       }
+               }
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_setcolreg);
+
+int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_framebuffer *fb = fb_helper->fb;
+       int depth;
+
+       if (var->pixclock == -1 || !var->pixclock)
+               return -EINVAL;
+
+       /* Need to resize the fb object !!! */
+       if (var->xres > fb->width || var->yres > fb->height) {
+               DRM_ERROR("Requested width/height is greater than current fb "
+                          "object %dx%d > %dx%d\n", var->xres, var->yres,
+                          fb->width, fb->height);
+               DRM_ERROR("Need resizing code.\n");
+               return -EINVAL;
+       }
+
+       switch (var->bits_per_pixel) {
+       case 16:
+               depth = (var->green.length == 6) ? 16 : 15;
+               break;
+       case 32:
+               depth = (var->transp.length > 0) ? 32 : 24;
+               break;
+       default:
+               depth = var->bits_per_pixel;
+               break;
+       }
+
+       switch (depth) {
+       case 8:
+               var->red.offset = 0;
+               var->green.offset = 0;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 15:
+               var->red.offset = 10;
+               var->green.offset = 5;
+               var->blue.offset = 0;
+               var->red.length = 5;
+               var->green.length = 5;
+               var->blue.length = 5;
+               var->transp.length = 1;
+               var->transp.offset = 15;
+               break;
+       case 16:
+               var->red.offset = 11;
+               var->green.offset = 5;
+               var->blue.offset = 0;
+               var->red.length = 5;
+               var->green.length = 6;
+               var->blue.length = 5;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 24:
+               var->red.offset = 16;
+               var->green.offset = 8;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 32:
+               var->red.offset = 16;
+               var->green.offset = 8;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 8;
+               var->transp.offset = 24;
+               break;
+       default:
+               return -EINVAL;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_check_var);
+
+/* this will let fbcon do the mode init */
+int drm_fb_helper_set_par(struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct fb_var_screeninfo *var = &info->var;
+       struct drm_crtc *crtc;
+       int ret;
+       int i;
+
+       if (var->pixclock != -1) {
+               DRM_ERROR("PIXEL CLCOK SET\n");
+               return -EINVAL;
+       }
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               if (crtc->fb == fb_helper->crtc_info[i].mode_set.fb) {
+                       mutex_lock(&dev->mode_config.mutex);
+                       ret = crtc->funcs->set_config(&fb_helper->crtc_info->mode_set);
+                       mutex_unlock(&dev->mode_config.mutex);
+                       if (ret)
+                               return ret;
+               }
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_set_par);
+
+int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_mode_set *modeset;
+       struct drm_crtc *crtc;
+       int ret = 0;
+       int i;
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               modeset = &fb_helper->crtc_info[i].mode_set;
+
+               modeset->x = var->xoffset;
+               modeset->y = var->yoffset;
+
+               if (modeset->num_connectors) {
+                       mutex_lock(&dev->mode_config.mutex);
+                       ret = crtc->funcs->set_config(modeset);
+                       mutex_unlock(&dev->mode_config.mutex);
+                       if (!ret) {
+                               info->var.xoffset = var->xoffset;
+                               info->var.yoffset = var->yoffset;
+                       }
+               }
+       }
+       return ret;
+}
+EXPORT_SYMBOL(drm_fb_helper_pan_display);
+
+int drm_fb_helper_single_fb_probe(struct drm_device *dev,
+                                 int (*fb_create)(struct drm_device *dev,
+                                                  uint32_t fb_width,
+                                                  uint32_t fb_height,
+                                                  uint32_t surface_width,
+                                                  uint32_t surface_height,
+                                                  struct drm_framebuffer **fb_ptr))
+{
+       struct drm_crtc *crtc;
+       struct drm_connector *connector;
+       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
+       unsigned int surface_width = 0, surface_height = 0;
+       int new_fb = 0;
+       int crtc_count = 0;
+       int ret, i, conn_count = 0;
+       struct fb_info *info;
+       struct drm_framebuffer *fb;
+       struct drm_mode_set *modeset = NULL;
+       struct drm_fb_helper *fb_helper;
+
+       /* first up get a count of crtcs now in use and new min/maxes width/heights */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               if (drm_helper_crtc_in_use(crtc)) {
+                       if (crtc->desired_mode) {
+                               if (crtc->desired_mode->hdisplay < fb_width)
+                                       fb_width = crtc->desired_mode->hdisplay;
+
+                               if (crtc->desired_mode->vdisplay < fb_height)
+                                       fb_height = crtc->desired_mode->vdisplay;
+
+                               if (crtc->desired_mode->hdisplay > surface_width)
+                                       surface_width = crtc->desired_mode->hdisplay;
+
+                               if (crtc->desired_mode->vdisplay > surface_height)
+                                       surface_height = crtc->desired_mode->vdisplay;
+                       }
+                       crtc_count++;
+               }
+       }
+
+       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
+               /* hmm everyone went away - assume VGA cable just fell out
+                  and will come back later. */
+               return 0;
+       }
+
+       /* do we have an fb already? */
+       if (list_empty(&dev->mode_config.fb_kernel_list)) {
+               ret = (*fb_create)(dev, fb_width, fb_height, surface_width,
+                                  surface_height, &fb);
+               if (ret)
+                       return -EINVAL;
+               new_fb = 1;
+       } else {
+               fb = list_first_entry(&dev->mode_config.fb_kernel_list,
+                                     struct drm_framebuffer, filp_head);
+
+               /* if someone hotplugs something bigger than we have already allocated, we are pwned.
+                  As really we can't resize an fbdev that is in the wild currently due to fbdev
+                  not really being designed for the lower layers moving stuff around under it.
+                  - so in the grand style of things - punt. */
+               if ((fb->width < surface_width) ||
+                   (fb->height < surface_height)) {
+                       DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
+                       return -EINVAL;
+               }
+       }
+
+       info = fb->fbdev;
+       fb_helper = info->par;
+
+       crtc_count = 0;
+       /* okay we need to setup new connector sets in the crtcs */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               modeset = &fb_helper->crtc_info[crtc_count].mode_set;
+               modeset->fb = fb;
+               conn_count = 0;
+               list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                       if (connector->encoder)
+                               if (connector->encoder->crtc == modeset->crtc) {
+                                       modeset->connectors[conn_count] = connector;
+                                       conn_count++;
+                                       if (conn_count > fb_helper->conn_limit)
+                                               BUG();
+                               }
+               }
+
+               for (i = conn_count; i < fb_helper->conn_limit; i++)
+                       modeset->connectors[i] = NULL;
+
+               modeset->crtc = crtc;
+               crtc_count++;
+
+               modeset->num_connectors = conn_count;
+               if (modeset->crtc->desired_mode) {
+                       if (modeset->mode)
+                               drm_mode_destroy(dev, modeset->mode);
+                       modeset->mode = drm_mode_duplicate(dev,
+                                                          modeset->crtc->desired_mode);
+               }
+       }
+       fb_helper->crtc_count = crtc_count;
+       fb_helper->fb = fb;
+
+       if (new_fb) {
+               info->var.pixclock = -1;
+               if (register_framebuffer(info) < 0)
+                       return -EINVAL;
+       } else {
+               drm_fb_helper_set_par(info);
+       }
+       printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
+              info->fix.id);
+
+       /* Switch back to kernel console on panic */
+       /* multi card linked list maybe */
+       if (list_empty(&kernel_fb_helper_list)) {
+               printk(KERN_INFO "registered panic notifier\n");
+               atomic_notifier_chain_register(&panic_notifier_list,
+                                              &paniced);
+               register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+       }
+       list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list);
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_single_fb_probe);
+
+void drm_fb_helper_free(struct drm_fb_helper *helper)
+{
+       list_del(&helper->kernel_fb_list);
+       if (list_empty(&kernel_fb_helper_list)) {
+               printk(KERN_INFO "unregistered panic notifier\n");
+               atomic_notifier_chain_unregister(&panic_notifier_list,
+                                                &paniced);
+               unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+       }
+       drm_fb_helper_crtc_free(helper);
+}
+EXPORT_SYMBOL(drm_fb_helper_free);
+
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch)
+{
+       info->fix.type = FB_TYPE_PACKED_PIXELS;
+       info->fix.visual = FB_VISUAL_TRUECOLOR;
+       info->fix.type_aux = 0;
+       info->fix.xpanstep = 1; /* doing it in hw */
+       info->fix.ypanstep = 1; /* doing it in hw */
+       info->fix.ywrapstep = 0;
+       info->fix.accel = FB_ACCEL_NONE;
+       info->fix.type_aux = 0;
+
+       info->fix.line_length = pitch;
+       return;
+}
+EXPORT_SYMBOL(drm_fb_helper_fill_fix);
+
+void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
+                           uint32_t fb_width, uint32_t fb_height)
+{
+       info->pseudo_palette = fb->pseudo_palette;
+       info->var.xres_virtual = fb->width;
+       info->var.yres_virtual = fb->height;
+       info->var.bits_per_pixel = fb->bits_per_pixel;
+       info->var.xoffset = 0;
+       info->var.yoffset = 0;
+       info->var.activate = FB_ACTIVATE_NOW;
+       info->var.height = -1;
+       info->var.width = -1;
+
+       switch (fb->depth) {
+       case 8:
+               info->var.red.offset = 0;
+               info->var.green.offset = 0;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8; /* 8bit DAC */
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 0;
+               info->var.transp.length = 0;
+               break;
+       case 15:
+               info->var.red.offset = 10;
+               info->var.green.offset = 5;
+               info->var.blue.offset = 0;
+               info->var.red.length = 5;
+               info->var.green.length = 5;
+               info->var.blue.length = 5;
+               info->var.transp.offset = 15;
+               info->var.transp.length = 1;
+               break;
+       case 16:
+               info->var.red.offset = 11;
+               info->var.green.offset = 5;
+               info->var.blue.offset = 0;
+               info->var.red.length = 5;
+               info->var.green.length = 6;
+               info->var.blue.length = 5;
+               info->var.transp.offset = 0;
+               break;
+       case 24:
+               info->var.red.offset = 16;
+               info->var.green.offset = 8;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8;
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 0;
+               info->var.transp.length = 0;
+               break;
+       case 32:
+               info->var.red.offset = 16;
+               info->var.green.offset = 8;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8;
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 24;
+               info->var.transp.length = 8;
+               break;
+       default:
+               break;
+       }
+
+       info->var.xres = fb_width;
+       info->var.yres = fb_height;
+}
+EXPORT_SYMBOL(drm_fb_helper_fill_var);
index ffe8f43..230c9ff 100644 (file)
@@ -164,7 +164,7 @@ EXPORT_SYMBOL(drm_gem_object_alloc);
  * Removes the mapping from handle to filp for this object.
  */
 static int
-drm_gem_handle_delete(struct drm_file *filp, int handle)
+drm_gem_handle_delete(struct drm_file *filp, u32 handle)
 {
        struct drm_device *dev;
        struct drm_gem_object *obj;
@@ -207,7 +207,7 @@ drm_gem_handle_delete(struct drm_file *filp, int handle)
 int
 drm_gem_handle_create(struct drm_file *file_priv,
                       struct drm_gem_object *obj,
-                      int *handlep)
+                      u32 *handlep)
 {
        int     ret;
 
@@ -221,7 +221,7 @@ again:
 
        /* do the allocation under our spinlock */
        spin_lock(&file_priv->table_lock);
-       ret = idr_get_new_above(&file_priv->object_idr, obj, 1, handlep);
+       ret = idr_get_new_above(&file_priv->object_idr, obj, 1, (int *)handlep);
        spin_unlock(&file_priv->table_lock);
        if (ret == -EAGAIN)
                goto again;
@@ -237,7 +237,7 @@ EXPORT_SYMBOL(drm_gem_handle_create);
 /** Returns a reference to the object named by the handle. */
 struct drm_gem_object *
 drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
-                     int handle)
+                     u32 handle)
 {
        struct drm_gem_object *obj;
 
@@ -344,7 +344,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
        struct drm_gem_open *args = data;
        struct drm_gem_object *obj;
        int ret;
-       int handle;
+       u32 handle;
 
        if (!(dev->driver->driver_features & DRIVER_GEM))
                return -ENODEV;
@@ -539,7 +539,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
        vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
        vma->vm_ops = obj->dev->driver->gem_vm_ops;
        vma->vm_private_data = map->handle;
-       /* FIXME: use pgprot_writecombine when available */
        vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 
        /* Take a ref for this mapping of the object, so that the fault
index f85aaf2..0a6f0b3 100644 (file)
@@ -37,6 +37,7 @@
 
 #include <linux/interrupt.h>   /* For task queue support */
 
+#include <linux/vgaarb.h>
 /**
  * Get interrupt from bus id.
  *
@@ -171,6 +172,26 @@ err:
 }
 EXPORT_SYMBOL(drm_vblank_init);
 
+static void drm_irq_vgaarb_nokms(void *cookie, bool state)
+{
+       struct drm_device *dev = cookie;
+
+       if (dev->driver->vgaarb_irq) {
+               dev->driver->vgaarb_irq(dev, state);
+               return;
+       }
+
+       if (!dev->irq_enabled)
+               return;
+
+       if (state)
+               dev->driver->irq_uninstall(dev);
+       else {
+               dev->driver->irq_preinstall(dev);
+               dev->driver->irq_postinstall(dev);
+       }
+}
+
 /**
  * Install IRQ handler.
  *
@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
                return ret;
        }
 
+       if (!drm_core_check_feature(dev, DRIVER_MODESET))
+               vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
+
        /* After installing handler */
        ret = dev->driver->irq_postinstall(dev);
        if (ret < 0) {
@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device * dev)
 
        DRM_DEBUG("irq=%d\n", dev->pdev->irq);
 
+       if (!drm_core_check_feature(dev, DRIVER_MODESET))
+               vga_client_register(dev->pdev, NULL, NULL, NULL);
+
        dev->driver->irq_uninstall(dev);
 
        free_irq(dev->pdev->irq, dev);
index 3e47869..c861d80 100644 (file)
@@ -44,6 +44,7 @@
 #include "drmP.h"
 #include "drm_mm.h"
 #include <linux/slab.h>
+#include <linux/seq_file.h>
 
 #define MM_UNUSED_TARGET 4
 
@@ -370,3 +371,23 @@ void drm_mm_takedown(struct drm_mm * mm)
        BUG_ON(mm->num_unused != 0);
 }
 EXPORT_SYMBOL(drm_mm_takedown);
+
+#if defined(CONFIG_DEBUG_FS)
+int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)
+{
+       struct drm_mm_node *entry;
+       int total_used = 0, total_free = 0, total = 0;
+
+       list_for_each_entry(entry, &mm->ml_entry, ml_entry) {
+               seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: %s\n", entry->start, entry->start + entry->size, entry->size, entry->free ? "free" : "used");
+               total += entry->size;
+               if (entry->free)
+                       total_free += entry->size;
+               else
+                       total_used += entry->size;
+       }
+       seq_printf(m, "total: %d, used %d free %d\n", total, total_free, total_used);
+       return 0;
+}
+EXPORT_SYMBOL(drm_mm_dump_table);
+#endif
index 7914097..49404ce 100644 (file)
@@ -8,6 +8,8 @@
  * Copyright Â© 2007 Dave Airlie
  * Copyright Â© 2007-2008 Intel Corporation
  *   Jesse Barnes <jesse.barnes@intel.com>
+ * Copyright 2005-2006 Luc Verhaegen
+ * Copyright (c) 2001, Andy Ritger  aritger@nvidia.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,7 +40,6 @@
 #include "drm.h"
 #include "drm_crtc.h"
 
-#define DRM_MODESET_DEBUG      "drm_mode"
 /**
  * drm_mode_debug_printmodeline - debug print a mode
  * @dev: DRM device
@@ -51,8 +52,8 @@
  */
 void drm_mode_debug_printmodeline(struct drm_display_mode *mode)
 {
-       DRM_DEBUG_MODE(DRM_MODESET_DEBUG,
-               "Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n",
+       DRM_DEBUG_KMS("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d "
+                       "0x%x 0x%x\n",
                mode->base.id, mode->name, mode->vrefresh, mode->clock,
                mode->hdisplay, mode->hsync_start,
                mode->hsync_end, mode->htotal,
@@ -61,6 +62,420 @@ void drm_mode_debug_printmodeline(struct drm_display_mode *mode)
 }
 EXPORT_SYMBOL(drm_mode_debug_printmodeline);
 
+/**
+ * drm_cvt_mode -create a modeline based on CVT algorithm
+ * @dev: DRM device
+ * @hdisplay: hdisplay size
+ * @vdisplay: vdisplay size
+ * @vrefresh  : vrefresh rate
+ * @reduced : Whether the GTF calculation is simplified
+ * @interlaced:Whether the interlace is supported
+ *
+ * LOCKING:
+ * none.
+ *
+ * return the modeline based on CVT algorithm
+ *
+ * This function is called to generate the modeline based on CVT algorithm
+ * according to the hdisplay, vdisplay, vrefresh.
+ * It is based from the VESA(TM) Coordinated Video Timing Generator by
+ * Graham Loveridge April 9, 2003 available at
+ * http://www.vesa.org/public/CVT/CVTd6r1.xls
+ *
+ * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c.
+ * What I have done is to translate it by using integer calculation.
+ */
+#define HV_FACTOR                      1000
+struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay,
+                                     int vdisplay, int vrefresh,
+                                     bool reduced, bool interlaced)
+{
+       /* 1) top/bottom margin size (% of height) - default: 1.8, */
+#define        CVT_MARGIN_PERCENTAGE           18
+       /* 2) character cell horizontal granularity (pixels) - default 8 */
+#define        CVT_H_GRANULARITY               8
+       /* 3) Minimum vertical porch (lines) - default 3 */
+#define        CVT_MIN_V_PORCH                 3
+       /* 4) Minimum number of vertical back porch lines - default 6 */
+#define        CVT_MIN_V_BPORCH                6
+       /* Pixel Clock step (kHz) */
+#define CVT_CLOCK_STEP                 250
+       struct drm_display_mode *drm_mode;
+       bool margins = false;
+       unsigned int vfieldrate, hperiod;
+       int hdisplay_rnd, hmargin, vdisplay_rnd, vmargin, vsync;
+       int interlace;
+
+       /* allocate the drm_display_mode structure. If failure, we will
+        * return directly
+        */
+       drm_mode = drm_mode_create(dev);
+       if (!drm_mode)
+               return NULL;
+
+       /* the CVT default refresh rate is 60Hz */
+       if (!vrefresh)
+               vrefresh = 60;
+
+       /* the required field fresh rate */
+       if (interlaced)
+               vfieldrate = vrefresh * 2;
+       else
+               vfieldrate = vrefresh;
+
+       /* horizontal pixels */
+       hdisplay_rnd = hdisplay - (hdisplay % CVT_H_GRANULARITY);
+
+       /* determine the left&right borders */
+       hmargin = 0;
+       if (margins) {
+               hmargin = hdisplay_rnd * CVT_MARGIN_PERCENTAGE / 1000;
+               hmargin -= hmargin % CVT_H_GRANULARITY;
+       }
+       /* find the total active pixels */
+       drm_mode->hdisplay = hdisplay_rnd + 2 * hmargin;
+
+       /* find the number of lines per field */
+       if (interlaced)
+               vdisplay_rnd = vdisplay / 2;
+       else
+               vdisplay_rnd = vdisplay;
+
+       /* find the top & bottom borders */
+       vmargin = 0;
+       if (margins)
+               vmargin = vdisplay_rnd * CVT_MARGIN_PERCENTAGE / 1000;
+
+       drm_mode->vdisplay = vdisplay + 2 * vmargin;
+
+       /* Interlaced */
+       if (interlaced)
+               interlace = 1;
+       else
+               interlace = 0;
+
+       /* Determine VSync Width from aspect ratio */
+       if (!(vdisplay % 3) && ((vdisplay * 4 / 3) == hdisplay))
+               vsync = 4;
+       else if (!(vdisplay % 9) && ((vdisplay * 16 / 9) == hdisplay))
+               vsync = 5;
+       else if (!(vdisplay % 10) && ((vdisplay * 16 / 10) == hdisplay))
+               vsync = 6;
+       else if (!(vdisplay % 4) && ((vdisplay * 5 / 4) == hdisplay))
+               vsync = 7;
+       else if (!(vdisplay % 9) && ((vdisplay * 15 / 9) == hdisplay))
+               vsync = 7;
+       else /* custom */
+               vsync = 10;
+
+       if (!reduced) {
+               /* simplify the GTF calculation */
+               /* 4) Minimum time of vertical sync + back porch interval (µs)
+                * default 550.0
+                */
+               int tmp1, tmp2;
+#define CVT_MIN_VSYNC_BP       550
+               /* 3) Nominal HSync width (% of line period) - default 8 */
+#define CVT_HSYNC_PERCENTAGE   8
+               unsigned int hblank_percentage;
+               int vsyncandback_porch, vback_porch, hblank;
+
+               /* estimated the horizontal period */
+               tmp1 = HV_FACTOR * 1000000  -
+                               CVT_MIN_VSYNC_BP * HV_FACTOR * vfieldrate;
+               tmp2 = (vdisplay_rnd + 2 * vmargin + CVT_MIN_V_PORCH) * 2 +
+                               interlace;
+               hperiod = tmp1 * 2 / (tmp2 * vfieldrate);
+
+               tmp1 = CVT_MIN_VSYNC_BP * HV_FACTOR / hperiod + 1;
+               /* 9. Find number of lines in sync + backporch */
+               if (tmp1 < (vsync + CVT_MIN_V_PORCH))
+                       vsyncandback_porch = vsync + CVT_MIN_V_PORCH;
+               else
+                       vsyncandback_porch = tmp1;
+               /* 10. Find number of lines in back porch */
+               vback_porch = vsyncandback_porch - vsync;
+               drm_mode->vtotal = vdisplay_rnd + 2 * vmargin +
+                               vsyncandback_porch + CVT_MIN_V_PORCH;
+               /* 5) Definition of Horizontal blanking time limitation */
+               /* Gradient (%/kHz) - default 600 */
+#define CVT_M_FACTOR   600
+               /* Offset (%) - default 40 */
+#define CVT_C_FACTOR   40
+               /* Blanking time scaling factor - default 128 */
+#define CVT_K_FACTOR   128
+               /* Scaling factor weighting - default 20 */
+#define CVT_J_FACTOR   20
+#define CVT_M_PRIME    (CVT_M_FACTOR * CVT_K_FACTOR / 256)
+#define CVT_C_PRIME    ((CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \
+                        CVT_J_FACTOR)
+               /* 12. Find ideal blanking duty cycle from formula */
+               hblank_percentage = CVT_C_PRIME * HV_FACTOR - CVT_M_PRIME *
+                                       hperiod / 1000;
+               /* 13. Blanking time */
+               if (hblank_percentage < 20 * HV_FACTOR)
+                       hblank_percentage = 20 * HV_FACTOR;
+               hblank = drm_mode->hdisplay * hblank_percentage /
+                        (100 * HV_FACTOR - hblank_percentage);
+               hblank -= hblank % (2 * CVT_H_GRANULARITY);
+               /* 14. find the total pixes per line */
+               drm_mode->htotal = drm_mode->hdisplay + hblank;
+               drm_mode->hsync_end = drm_mode->hdisplay + hblank / 2;
+               drm_mode->hsync_start = drm_mode->hsync_end -
+                       (drm_mode->htotal * CVT_HSYNC_PERCENTAGE) / 100;
+               drm_mode->hsync_start += CVT_H_GRANULARITY -
+                       drm_mode->hsync_start % CVT_H_GRANULARITY;
+               /* fill the Vsync values */
+               drm_mode->vsync_start = drm_mode->vdisplay + CVT_MIN_V_PORCH;
+               drm_mode->vsync_end = drm_mode->vsync_start + vsync;
+       } else {
+               /* Reduced blanking */
+               /* Minimum vertical blanking interval time (µs)- default 460 */
+#define CVT_RB_MIN_VBLANK      460
+               /* Fixed number of clocks for horizontal sync */
+#define CVT_RB_H_SYNC          32
+               /* Fixed number of clocks for horizontal blanking */
+#define CVT_RB_H_BLANK         160
+               /* Fixed number of lines for vertical front porch - default 3*/
+#define CVT_RB_VFPORCH         3
+               int vbilines;
+               int tmp1, tmp2;
+               /* 8. Estimate Horizontal period. */
+               tmp1 = HV_FACTOR * 1000000 -
+                       CVT_RB_MIN_VBLANK * HV_FACTOR * vfieldrate;
+               tmp2 = vdisplay_rnd + 2 * vmargin;
+               hperiod = tmp1 / (tmp2 * vfieldrate);
+               /* 9. Find number of lines in vertical blanking */
+               vbilines = CVT_RB_MIN_VBLANK * HV_FACTOR / hperiod + 1;
+               /* 10. Check if vertical blanking is sufficient */
+               if (vbilines < (CVT_RB_VFPORCH + vsync + CVT_MIN_V_BPORCH))
+                       vbilines = CVT_RB_VFPORCH + vsync + CVT_MIN_V_BPORCH;
+               /* 11. Find total number of lines in vertical field */
+               drm_mode->vtotal = vdisplay_rnd + 2 * vmargin + vbilines;
+               /* 12. Find total number of pixels in a line */
+               drm_mode->htotal = drm_mode->hdisplay + CVT_RB_H_BLANK;
+               /* Fill in HSync values */
+               drm_mode->hsync_end = drm_mode->hdisplay + CVT_RB_H_BLANK / 2;
+               drm_mode->hsync_start = drm_mode->hsync_end = CVT_RB_H_SYNC;
+       }
+       /* 15/13. Find pixel clock frequency (kHz for xf86) */
+       drm_mode->clock = drm_mode->htotal * HV_FACTOR * 1000 / hperiod;
+       drm_mode->clock -= drm_mode->clock % CVT_CLOCK_STEP;
+       /* 18/16. Find actual vertical frame frequency */
+       /* ignore - just set the mode flag for interlaced */
+       if (interlaced)
+               drm_mode->vtotal *= 2;
+       /* Fill the mode line name */
+       drm_mode_set_name(drm_mode);
+       if (reduced)
+               drm_mode->flags |= (DRM_MODE_FLAG_PHSYNC |
+                                       DRM_MODE_FLAG_NVSYNC);
+       else
+               drm_mode->flags |= (DRM_MODE_FLAG_PVSYNC |
+                                       DRM_MODE_FLAG_NHSYNC);
+       if (interlaced)
+               drm_mode->flags |= DRM_MODE_FLAG_INTERLACE;
+
+    return drm_mode;
+}
+EXPORT_SYMBOL(drm_cvt_mode);
+
+/**
+ * drm_gtf_mode - create the modeline based on GTF algorithm
+ *
+ * @dev                :drm device
+ * @hdisplay   :hdisplay size
+ * @vdisplay   :vdisplay size
+ * @vrefresh   :vrefresh rate.
+ * @interlaced :whether the interlace is supported
+ * @margins    :whether the margin is supported
+ *
+ * LOCKING.
+ * none.
+ *
+ * return the modeline based on GTF algorithm
+ *
+ * This function is to create the modeline based on the GTF algorithm.
+ * Generalized Timing Formula is derived from:
+ *     GTF Spreadsheet by Andy Morrish (1/5/97)
+ *     available at http://www.vesa.org
+ *
+ * And it is copied from the file of xserver/hw/xfree86/modes/xf86gtf.c.
+ * What I have done is to translate it by using integer calculation.
+ * I also refer to the function of fb_get_mode in the file of
+ * drivers/video/fbmon.c
+ */
+struct drm_display_mode *drm_gtf_mode(struct drm_device *dev, int hdisplay,
+                                     int vdisplay, int vrefresh,
+                                     bool interlaced, int margins)
+{
+       /* 1) top/bottom margin size (% of height) - default: 1.8, */
+#define        GTF_MARGIN_PERCENTAGE           18
+       /* 2) character cell horizontal granularity (pixels) - default 8 */
+#define        GTF_CELL_GRAN                   8
+       /* 3) Minimum vertical porch (lines) - default 3 */
+#define        GTF_MIN_V_PORCH                 1
+       /* width of vsync in lines */
+#define V_SYNC_RQD                     3
+       /* width of hsync as % of total line */
+#define H_SYNC_PERCENT                 8
+       /* min time of vsync + back porch (microsec) */
+#define MIN_VSYNC_PLUS_BP              550
+       /* blanking formula gradient */
+#define GTF_M                          600
+       /* blanking formula offset */
+#define GTF_C                          40
+       /* blanking formula scaling factor */
+#define GTF_K                          128
+       /* blanking formula scaling factor */
+#define GTF_J                          20
+       /* C' and M' are part of the Blanking Duty Cycle computation */
+#define GTF_C_PRIME            (((GTF_C - GTF_J) * GTF_K / 256) + GTF_J)
+#define GTF_M_PRIME            (GTF_K * GTF_M / 256)
+       struct drm_display_mode *drm_mode;
+       unsigned int hdisplay_rnd, vdisplay_rnd, vfieldrate_rqd;
+       int top_margin, bottom_margin;
+       int interlace;
+       unsigned int hfreq_est;
+       int vsync_plus_bp, vback_porch;
+       unsigned int vtotal_lines, vfieldrate_est, hperiod;
+       unsigned int vfield_rate, vframe_rate;
+       int left_margin, right_margin;
+       unsigned int total_active_pixels, ideal_duty_cycle;
+       unsigned int hblank, total_pixels, pixel_freq;
+       int hsync, hfront_porch, vodd_front_porch_lines;
+       unsigned int tmp1, tmp2;
+
+       drm_mode = drm_mode_create(dev);
+       if (!drm_mode)
+               return NULL;
+
+       /* 1. In order to give correct results, the number of horizontal
+        * pixels requested is first processed to ensure that it is divisible
+        * by the character size, by rounding it to the nearest character
+        * cell boundary:
+        */
+       hdisplay_rnd = (hdisplay + GTF_CELL_GRAN / 2) / GTF_CELL_GRAN;
+       hdisplay_rnd = hdisplay_rnd * GTF_CELL_GRAN;
+
+       /* 2. If interlace is requested, the number of vertical lines assumed
+        * by the calculation must be halved, as the computation calculates
+        * the number of vertical lines per field.
+        */
+       if (interlaced)
+               vdisplay_rnd = vdisplay / 2;
+       else
+               vdisplay_rnd = vdisplay;
+
+       /* 3. Find the frame rate required: */
+       if (interlaced)
+               vfieldrate_rqd = vrefresh * 2;
+       else
+               vfieldrate_rqd = vrefresh;
+
+       /* 4. Find number of lines in Top margin: */
+       top_margin = 0;
+       if (margins)
+               top_margin = (vdisplay_rnd * GTF_MARGIN_PERCENTAGE + 500) /
+                               1000;
+       /* 5. Find number of lines in bottom margin: */
+       bottom_margin = top_margin;
+
+       /* 6. If interlace is required, then set variable interlace: */
+       if (interlaced)
+               interlace = 1;
+       else
+               interlace = 0;
+
+       /* 7. Estimate the Horizontal frequency */
+       {
+               tmp1 = (1000000  - MIN_VSYNC_PLUS_BP * vfieldrate_rqd) / 500;
+               tmp2 = (vdisplay_rnd + 2 * top_margin + GTF_MIN_V_PORCH) *
+                               2 + interlace;
+               hfreq_est = (tmp2 * 1000 * vfieldrate_rqd) / tmp1;
+       }
+
+       /* 8. Find the number of lines in V sync + back porch */
+       /* [V SYNC+BP] = RINT(([MIN VSYNC+BP] * hfreq_est / 1000000)) */
+       vsync_plus_bp = MIN_VSYNC_PLUS_BP * hfreq_est / 1000;
+       vsync_plus_bp = (vsync_plus_bp + 500) / 1000;
+       /*  9. Find the number of lines in V back porch alone: */
+       vback_porch = vsync_plus_bp - V_SYNC_RQD;
+       /*  10. Find the total number of lines in Vertical field period: */
+       vtotal_lines = vdisplay_rnd + top_margin + bottom_margin +
+                       vsync_plus_bp + GTF_MIN_V_PORCH;
+       /*  11. Estimate the Vertical field frequency: */
+       vfieldrate_est = hfreq_est / vtotal_lines;
+       /*  12. Find the actual horizontal period: */
+       hperiod = 1000000 / (vfieldrate_rqd * vtotal_lines);
+
+       /*  13. Find the actual Vertical field frequency: */
+       vfield_rate = hfreq_est / vtotal_lines;
+       /*  14. Find the Vertical frame frequency: */
+       if (interlaced)
+               vframe_rate = vfield_rate / 2;
+       else
+               vframe_rate = vfield_rate;
+       /*  15. Find number of pixels in left margin: */
+       if (margins)
+               left_margin = (hdisplay_rnd * GTF_MARGIN_PERCENTAGE + 500) /
+                               1000;
+       else
+               left_margin = 0;
+
+       /* 16.Find number of pixels in right margin: */
+       right_margin = left_margin;
+       /* 17.Find total number of active pixels in image and left and right */
+       total_active_pixels = hdisplay_rnd + left_margin + right_margin;
+       /* 18.Find the ideal blanking duty cycle from blanking duty cycle */
+       ideal_duty_cycle = GTF_C_PRIME * 1000 -
+                               (GTF_M_PRIME * 1000000 / hfreq_est);
+       /* 19.Find the number of pixels in the blanking time to the nearest
+        * double character cell: */
+       hblank = total_active_pixels * ideal_duty_cycle /
+                       (100000 - ideal_duty_cycle);
+       hblank = (hblank + GTF_CELL_GRAN) / (2 * GTF_CELL_GRAN);
+       hblank = hblank * 2 * GTF_CELL_GRAN;
+       /* 20.Find total number of pixels: */
+       total_pixels = total_active_pixels + hblank;
+       /* 21.Find pixel clock frequency: */
+       pixel_freq = total_pixels * hfreq_est / 1000;
+       /* Stage 1 computations are now complete; I should really pass
+        * the results to another function and do the Stage 2 computations,
+        * but I only need a few more values so I'll just append the
+        * computations here for now */
+       /* 17. Find the number of pixels in the horizontal sync period: */
+       hsync = H_SYNC_PERCENT * total_pixels / 100;
+       hsync = (hsync + GTF_CELL_GRAN / 2) / GTF_CELL_GRAN;
+       hsync = hsync * GTF_CELL_GRAN;
+       /* 18. Find the number of pixels in horizontal front porch period */
+       hfront_porch = hblank / 2 - hsync;
+       /*  36. Find the number of lines in the odd front porch period: */
+       vodd_front_porch_lines = GTF_MIN_V_PORCH ;
+
+       /* finally, pack the results in the mode struct */
+       drm_mode->hdisplay = hdisplay_rnd;
+       drm_mode->hsync_start = hdisplay_rnd + hfront_porch;
+       drm_mode->hsync_end = drm_mode->hsync_start + hsync;
+       drm_mode->htotal = total_pixels;
+       drm_mode->vdisplay = vdisplay_rnd;
+       drm_mode->vsync_start = vdisplay_rnd + vodd_front_porch_lines;
+       drm_mode->vsync_end = drm_mode->vsync_start + V_SYNC_RQD;
+       drm_mode->vtotal = vtotal_lines;
+
+       drm_mode->clock = pixel_freq;
+
+       drm_mode_set_name(drm_mode);
+       drm_mode->flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC;
+
+       if (interlaced) {
+               drm_mode->vtotal *= 2;
+               drm_mode->flags |= DRM_MODE_FLAG_INTERLACE;
+       }
+
+       return drm_mode;
+}
+EXPORT_SYMBOL(drm_gtf_mode);
 /**
  * drm_mode_set_name - set the name on a mode
  * @mode: name will be set in this mode
@@ -151,7 +566,9 @@ EXPORT_SYMBOL(drm_mode_height);
  * FIXME: why is this needed?  shouldn't vrefresh be set already?
  *
  * RETURNS:
- * Vertical refresh rate of @mode x 1000. For precision reasons.
+ * Vertical refresh rate. It will be the result of actual value plus 0.5.
+ * If it is 70.288, it will return 70Hz.
+ * If it is 59.6, it will return 60Hz.
  */
 int drm_mode_vrefresh(struct drm_display_mode *mode)
 {
@@ -161,14 +578,13 @@ int drm_mode_vrefresh(struct drm_display_mode *mode)
        if (mode->vrefresh > 0)
                refresh = mode->vrefresh;
        else if (mode->htotal > 0 && mode->vtotal > 0) {
+               int vtotal;
+               vtotal = mode->vtotal;
                /* work out vrefresh the value will be x1000 */
                calc_val = (mode->clock * 1000);
-
                calc_val /= mode->htotal;
-               calc_val *= 1000;
-               calc_val /= mode->vtotal;
+               refresh = (calc_val + vtotal / 2) / vtotal;
 
-               refresh = calc_val;
                if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                        refresh *= 2;
                if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -403,8 +819,7 @@ void drm_mode_prune_invalid(struct drm_device *dev,
                        list_del(&mode->head);
                        if (verbose) {
                                drm_mode_debug_printmodeline(mode);
-                               DRM_DEBUG_MODE(DRM_MODESET_DEBUG,
-                                       "Not using %s mode %d\n",
+                               DRM_DEBUG_KMS("Not using %s mode %d\n",
                                        mode->name, mode->status);
                        }
                        drm_mode_destroy(dev, mode);
index bbd4b3d..d379c4f 100644 (file)
@@ -106,20 +106,25 @@ int drm_proc_create_files(struct drm_info_list *files, int count,
                        continue;
 
                tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);
-               ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root);
+               if (tmp == NULL) {
+                       ret = -1;
+                       goto fail;
+               }
+               tmp->minor = minor;
+               tmp->info_ent = &files[i];
+               list_add(&tmp->list, &minor->proc_nodes.list);
+
+               ent = proc_create_data(files[i].name, S_IRUGO, root,
+                                      &drm_proc_fops, tmp);
                if (!ent) {
                        DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
                                  name, files[i].name);
+                       list_del(&tmp->list);
                        kfree(tmp);
                        ret = -1;
                        goto fail;
                }
 
-               ent->proc_fops = &drm_proc_fops;
-               ent->data = tmp;
-               tmp->minor = minor;
-               tmp->info_ent = &files[i];
-               list_add(&(tmp->list), &(minor->proc_nodes.list));
        }
        return 0;
 
index f7a615b..7e42b7e 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/kdev_t.h>
 #include <linux/err.h>
 
+#include "drm_sysfs.h"
 #include "drm_core.h"
 #include "drmP.h"
 
@@ -76,7 +77,7 @@ static ssize_t version_show(struct class *dev, char *buf)
                       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
 }
 
-static char *drm_nodename(struct device *dev)
+static char *drm_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
 }
@@ -112,7 +113,7 @@ struct class *drm_sysfs_create(struct module *owner, char *name)
        if (err)
                goto err_out_class;
 
-       class->nodename = drm_nodename;
+       class->devnode = drm_devnode;
 
        return class;
 
@@ -253,6 +254,7 @@ static ssize_t subconnector_show(struct device *device,
                case DRM_MODE_CONNECTOR_Composite:
                case DRM_MODE_CONNECTOR_SVIDEO:
                case DRM_MODE_CONNECTOR_Component:
+               case DRM_MODE_CONNECTOR_TV:
                        prop = dev->mode_config.tv_subconnector_property;
                        is_tv = 1;
                        break;
@@ -293,6 +295,7 @@ static ssize_t select_subconnector_show(struct device *device,
                case DRM_MODE_CONNECTOR_Composite:
                case DRM_MODE_CONNECTOR_SVIDEO:
                case DRM_MODE_CONNECTOR_Component:
+               case DRM_MODE_CONNECTOR_TV:
                        prop = dev->mode_config.tv_select_subconnector_property;
                        is_tv = 1;
                        break;
@@ -391,6 +394,7 @@ int drm_sysfs_connector_add(struct drm_connector *connector)
                case DRM_MODE_CONNECTOR_Composite:
                case DRM_MODE_CONNECTOR_SVIDEO:
                case DRM_MODE_CONNECTOR_Component:
+               case DRM_MODE_CONNECTOR_TV:
                        for (i = 0; i < ARRAY_SIZE(connector_attrs_opt1); i++) {
                                ret = device_create_file(&connector->kdev, &connector_attrs_opt1[i]);
                                if (ret)
@@ -519,3 +523,27 @@ void drm_sysfs_device_remove(struct drm_minor *minor)
 {
        device_unregister(&minor->kdev);
 }
+
+
+/**
+ * drm_class_device_register - Register a struct device in the drm class.
+ *
+ * @dev: pointer to struct device to register.
+ *
+ * @dev should have all relevant members pre-filled with the exception
+ * of the class member. In particular, the device_type member must
+ * be set.
+ */
+
+int drm_class_device_register(struct device *dev)
+{
+       dev->class = drm_class;
+       return device_register(dev);
+}
+EXPORT_SYMBOL_GPL(drm_class_device_register);
+
+void drm_class_device_unregister(struct device *dev)
+{
+       return device_unregister(dev);
+}
+EXPORT_SYMBOL_GPL(drm_class_device_unregister);
index 30d6b99..5269dfa 100644 (file)
@@ -4,10 +4,10 @@
 
 ccflags-y := -Iinclude/drm
 i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
+         i915_debugfs.o \
           i915_suspend.o \
          i915_gem.o \
          i915_gem_debug.o \
-         i915_gem_debugfs.o \
          i915_gem_tiling.o \
          intel_display.o \
          intel_crt.o \
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
new file mode 100644 (file)
index 0000000..1e3bdce
--- /dev/null
@@ -0,0 +1,445 @@
+/*
+ * Copyright Â© 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *    Keith Packard <keithp@keithp.com>
+ *
+ */
+
+#include <linux/seq_file.h>
+#include "drmP.h"
+#include "drm.h"
+#include "i915_drm.h"
+#include "i915_drv.h"
+
+#define DRM_I915_RING_DEBUG 1
+
+
+#if defined(CONFIG_DEBUG_FS)
+
+#define ACTIVE_LIST    1
+#define FLUSHING_LIST  2
+#define INACTIVE_LIST  3
+
+static const char *get_pin_flag(struct drm_i915_gem_object *obj_priv)
+{
+       if (obj_priv->user_pin_count > 0)
+               return "P";
+       else if (obj_priv->pin_count > 0)
+               return "p";
+       else
+               return " ";
+}
+
+static const char *get_tiling_flag(struct drm_i915_gem_object *obj_priv)
+{
+    switch (obj_priv->tiling_mode) {
+    default:
+    case I915_TILING_NONE: return " ";
+    case I915_TILING_X: return "X";
+    case I915_TILING_Y: return "Y";
+    }
+}
+
+static int i915_gem_object_list_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       uintptr_t list = (uintptr_t) node->info_ent->data;
+       struct list_head *head;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_i915_gem_object *obj_priv;
+       spinlock_t *lock = NULL;
+
+       switch (list) {
+       case ACTIVE_LIST:
+               seq_printf(m, "Active:\n");
+               lock = &dev_priv->mm.active_list_lock;
+               head = &dev_priv->mm.active_list;
+               break;
+       case INACTIVE_LIST:
+               seq_printf(m, "Inactive:\n");
+               head = &dev_priv->mm.inactive_list;
+               break;
+       case FLUSHING_LIST:
+               seq_printf(m, "Flushing:\n");
+               head = &dev_priv->mm.flushing_list;
+               break;
+       default:
+               DRM_INFO("Ooops, unexpected list\n");
+               return 0;
+       }
+
+       if (lock)
+               spin_lock(lock);
+       list_for_each_entry(obj_priv, head, list)
+       {
+               struct drm_gem_object *obj = obj_priv->obj;
+
+               seq_printf(m, "    %p: %s %08x %08x %d",
+                          obj,
+                          get_pin_flag(obj_priv),
+                          obj->read_domains, obj->write_domain,
+                          obj_priv->last_rendering_seqno);
+
+               if (obj->name)
+                       seq_printf(m, " (name: %d)", obj->name);
+               if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
+                       seq_printf(m, " (fence: %d)", obj_priv->fence_reg);
+               if (obj_priv->gtt_space != NULL)
+                       seq_printf(m, " (gtt_offset: %08x)", obj_priv->gtt_offset);
+
+               seq_printf(m, "\n");
+       }
+
+       if (lock)
+           spin_unlock(lock);
+       return 0;
+}
+
+static int i915_gem_request_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_i915_gem_request *gem_request;
+
+       seq_printf(m, "Request:\n");
+       list_for_each_entry(gem_request, &dev_priv->mm.request_list, list) {
+               seq_printf(m, "    %d @ %d\n",
+                          gem_request->seqno,
+                          (int) (jiffies - gem_request->emitted_jiffies));
+       }
+       return 0;
+}
+
+static int i915_gem_seqno_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+
+       if (dev_priv->hw_status_page != NULL) {
+               seq_printf(m, "Current sequence: %d\n",
+                          i915_get_gem_seqno(dev));
+       } else {
+               seq_printf(m, "Current sequence: hws uninitialized\n");
+       }
+       seq_printf(m, "Waiter sequence:  %d\n",
+                       dev_priv->mm.waiting_gem_seqno);
+       seq_printf(m, "IRQ sequence:     %d\n", dev_priv->mm.irq_gem_seqno);
+       return 0;
+}
+
+
+static int i915_interrupt_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+
+       if (!IS_IGDNG(dev)) {
+               seq_printf(m, "Interrupt enable:    %08x\n",
+                          I915_READ(IER));
+               seq_printf(m, "Interrupt identity:  %08x\n",
+                          I915_READ(IIR));
+               seq_printf(m, "Interrupt mask:      %08x\n",
+                          I915_READ(IMR));
+               seq_printf(m, "Pipe A stat:         %08x\n",
+                          I915_READ(PIPEASTAT));
+               seq_printf(m, "Pipe B stat:         %08x\n",
+                          I915_READ(PIPEBSTAT));
+       } else {
+               seq_printf(m, "North Display Interrupt enable:          %08x\n",
+                          I915_READ(DEIER));
+               seq_printf(m, "North Display Interrupt identity:        %08x\n",
+                          I915_READ(DEIIR));
+               seq_printf(m, "North Display Interrupt mask:            %08x\n",
+                          I915_READ(DEIMR));
+               seq_printf(m, "South Display Interrupt enable:          %08x\n",
+                          I915_READ(SDEIER));
+               seq_printf(m, "South Display Interrupt identity:        %08x\n",
+                          I915_READ(SDEIIR));
+               seq_printf(m, "South Display Interrupt mask:            %08x\n",
+                          I915_READ(SDEIMR));
+               seq_printf(m, "Graphics Interrupt enable:               %08x\n",
+                          I915_READ(GTIER));
+               seq_printf(m, "Graphics Interrupt identity:             %08x\n",
+                          I915_READ(GTIIR));
+               seq_printf(m, "Graphics Interrupt mask:         %08x\n",
+                          I915_READ(GTIMR));
+       }
+       seq_printf(m, "Interrupts received: %d\n",
+                  atomic_read(&dev_priv->irq_received));
+       if (dev_priv->hw_status_page != NULL) {
+               seq_printf(m, "Current sequence:    %d\n",
+                          i915_get_gem_seqno(dev));
+       } else {
+               seq_printf(m, "Current sequence:    hws uninitialized\n");
+       }
+       seq_printf(m, "Waiter sequence:     %d\n",
+                  dev_priv->mm.waiting_gem_seqno);
+       seq_printf(m, "IRQ sequence:        %d\n",
+                  dev_priv->mm.irq_gem_seqno);
+       return 0;
+}
+
+static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       int i;
+
+       seq_printf(m, "Reserved fences = %d\n", dev_priv->fence_reg_start);
+       seq_printf(m, "Total fences = %d\n", dev_priv->num_fence_regs);
+       for (i = 0; i < dev_priv->num_fence_regs; i++) {
+               struct drm_gem_object *obj = dev_priv->fence_regs[i].obj;
+
+               if (obj == NULL) {
+                       seq_printf(m, "Fenced object[%2d] = unused\n", i);
+               } else {
+                       struct drm_i915_gem_object *obj_priv;
+
+                       obj_priv = obj->driver_private;
+                       seq_printf(m, "Fenced object[%2d] = %p: %s "
+                                  "%08x %08zx %08x %s %08x %08x %d",
+                                  i, obj, get_pin_flag(obj_priv),
+                                  obj_priv->gtt_offset,
+                                  obj->size, obj_priv->stride,
+                                  get_tiling_flag(obj_priv),
+                                  obj->read_domains, obj->write_domain,
+                                  obj_priv->last_rendering_seqno);
+                       if (obj->name)
+                               seq_printf(m, " (name: %d)", obj->name);
+                       seq_printf(m, "\n");
+               }
+       }
+
+       return 0;
+}
+
+static int i915_hws_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       int i;
+       volatile u32 *hws;
+
+       hws = (volatile u32 *)dev_priv->hw_status_page;
+       if (hws == NULL)
+               return 0;
+
+       for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {
+               seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
+                          i * 4,
+                          hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
+       }
+       return 0;
+}
+
+static void i915_dump_pages(struct seq_file *m, struct page **pages, int page_count)
+{
+       int page, i;
+       uint32_t *mem;
+
+       for (page = 0; page < page_count; page++) {
+               mem = kmap(pages[page]);
+               for (i = 0; i < PAGE_SIZE; i += 4)
+                       seq_printf(m, "%08x :  %08x\n", i, mem[i / 4]);
+               kunmap(pages[page]);
+       }
+}
+
+static int i915_batchbuffer_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_gem_object *obj;
+       struct drm_i915_gem_object *obj_priv;
+       int ret;
+
+       spin_lock(&dev_priv->mm.active_list_lock);
+
+       list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {
+               obj = obj_priv->obj;
+               if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {
+                   ret = i915_gem_object_get_pages(obj);
+                   if (ret) {
+                           DRM_ERROR("Failed to get pages: %d\n", ret);
+                           spin_unlock(&dev_priv->mm.active_list_lock);
+                           return ret;
+                   }
+
+                   seq_printf(m, "--- gtt_offset = 0x%08x\n", obj_priv->gtt_offset);
+                   i915_dump_pages(m, obj_priv->pages, obj->size / PAGE_SIZE);
+
+                   i915_gem_object_put_pages(obj);
+               }
+       }
+
+       spin_unlock(&dev_priv->mm.active_list_lock);
+
+       return 0;
+}
+
+static int i915_ringbuffer_data(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       u8 *virt;
+       uint32_t *ptr, off;
+
+       if (!dev_priv->ring.ring_obj) {
+               seq_printf(m, "No ringbuffer setup\n");
+               return 0;
+       }
+
+       virt = dev_priv->ring.virtual_start;
+
+       for (off = 0; off < dev_priv->ring.Size; off += 4) {
+               ptr = (uint32_t *)(virt + off);
+               seq_printf(m, "%08x :  %08x\n", off, *ptr);
+       }
+
+       return 0;
+}
+
+static int i915_ringbuffer_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       unsigned int head, tail;
+
+       head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
+       tail = I915_READ(PRB0_TAIL) & TAIL_ADDR;
+
+       seq_printf(m, "RingHead :  %08x\n", head);
+       seq_printf(m, "RingTail :  %08x\n", tail);
+       seq_printf(m, "RingSize :  %08lx\n", dev_priv->ring.Size);
+       seq_printf(m, "Acthd :     %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD));
+
+       return 0;
+}
+
+static int i915_error_state(struct seq_file *m, void *unused)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_i915_error_state *error;
+       unsigned long flags;
+
+       spin_lock_irqsave(&dev_priv->error_lock, flags);
+       if (!dev_priv->first_error) {
+               seq_printf(m, "no error state collected\n");
+               goto out;
+       }
+
+       error = dev_priv->first_error;
+
+       seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+                  error->time.tv_usec);
+       seq_printf(m, "EIR: 0x%08x\n", error->eir);
+       seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
+       seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
+       seq_printf(m, "  IPEIR: 0x%08x\n", error->ipeir);
+       seq_printf(m, "  IPEHR: 0x%08x\n", error->ipehr);
+       seq_printf(m, "  INSTDONE: 0x%08x\n", error->instdone);
+       seq_printf(m, "  ACTHD: 0x%08x\n", error->acthd);
+       if (IS_I965G(dev)) {
+               seq_printf(m, "  INSTPS: 0x%08x\n", error->instps);
+               seq_printf(m, "  INSTDONE1: 0x%08x\n", error->instdone1);
+       }
+
+out:
+       spin_unlock_irqrestore(&dev_priv->error_lock, flags);
+
+       return 0;
+}
+
+static int i915_registers_info(struct seq_file *m, void *data) {
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       uint32_t reg;
+
+#define DUMP_RANGE(start, end) \
+       for (reg=start; reg < end; reg += 4) \
+       seq_printf(m, "%08x\t%08x\n", reg, I915_READ(reg));
+
+       DUMP_RANGE(0x00000, 0x00fff);   /* VGA registers */
+       DUMP_RANGE(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
+       DUMP_RANGE(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
+       DUMP_RANGE(0x03200, 0x03fff);   /* frame buffer compression registers */
+       DUMP_RANGE(0x05000, 0x05fff);   /* I/O control registers */
+       DUMP_RANGE(0x06000, 0x06fff);   /* clock control registers */
+       DUMP_RANGE(0x07000, 0x07fff);   /* 3D internal debug registers */
+       DUMP_RANGE(0x07400, 0x088ff);   /* GPE debug registers */
+       DUMP_RANGE(0x0a000, 0x0afff);   /* display palette registers */
+       DUMP_RANGE(0x10000, 0x13fff);   /* MMIO MCHBAR */
+       DUMP_RANGE(0x30000, 0x3ffff);   /* overlay registers */
+       DUMP_RANGE(0x60000, 0x6ffff);   /* display engine pipeline registers */
+       DUMP_RANGE(0x70000, 0x72fff);   /* display and cursor registers */
+       DUMP_RANGE(0x73000, 0x73fff);   /* performance counters */
+
+       return 0;
+}
+
+
+static struct drm_info_list i915_debugfs_list[] = {
+       {"i915_regs", i915_registers_info, 0},
+       {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},
+       {"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},
+       {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},
+       {"i915_gem_request", i915_gem_request_info, 0},
+       {"i915_gem_seqno", i915_gem_seqno_info, 0},
+       {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},
+       {"i915_gem_interrupt", i915_interrupt_info, 0},
+       {"i915_gem_hws", i915_hws_info, 0},
+       {"i915_ringbuffer_data", i915_ringbuffer_data, 0},
+       {"i915_ringbuffer_info", i915_ringbuffer_info, 0},
+       {"i915_batchbuffers", i915_batchbuffer_info, 0},
+       {"i915_error_state", i915_error_state, 0},
+};
+#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)
+
+int i915_debugfs_init(struct drm_minor *minor)
+{
+       return drm_debugfs_create_files(i915_debugfs_list,
+                                       I915_DEBUGFS_ENTRIES,
+                                       minor->debugfs_root, minor);
+}
+
+void i915_debugfs_cleanup(struct drm_minor *minor)
+{
+       drm_debugfs_remove_files(i915_debugfs_list,
+                                I915_DEBUGFS_ENTRIES, minor);
+}
+
+#endif /* CONFIG_DEBUG_FS */
+
index 50d1f78..5a49a18 100644 (file)
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc_helper.h"
+#include "drm_fb_helper.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
-
-#define I915_DRV       "i915_drv"
+#include <linux/vgaarb.h>
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time
@@ -80,6 +80,34 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
        return -EBUSY;
 }
 
+/* As a ringbuffer is only allowed to wrap between instructions, fill
+ * the tail with NOOPs.
+ */
+int i915_wrap_ring(struct drm_device *dev)
+{
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       volatile unsigned int *virt;
+       int rem;
+
+       rem = dev_priv->ring.Size - dev_priv->ring.tail;
+       if (dev_priv->ring.space < rem) {
+               int ret = i915_wait_ring(dev, rem, __func__);
+               if (ret)
+                       return ret;
+       }
+       dev_priv->ring.space -= rem;
+
+       virt = (unsigned int *)
+               (dev_priv->ring.virtual_start + dev_priv->ring.tail);
+       rem /= 4;
+       while (rem--)
+               *virt++ = MI_NOOP;
+
+       dev_priv->ring.tail = 0;
+
+       return 0;
+}
+
 /**
  * Sets up the hardware status page for devices that need a physical address
  * in the register.
@@ -101,7 +129,7 @@ static int i915_init_phys_hws(struct drm_device *dev)
        memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 
        I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
-       DRM_DEBUG_DRIVER(I915_DRV, "Enabled hardware status page\n");
+       DRM_DEBUG_DRIVER("Enabled hardware status page\n");
        return 0;
 }
 
@@ -187,8 +215,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
                master_priv->sarea_priv = (drm_i915_sarea_t *)
                        ((u8 *)master_priv->sarea->handle + init->sarea_priv_offset);
        } else {
-               DRM_DEBUG_DRIVER(I915_DRV,
-                               "sarea not found assuming DRI2 userspace\n");
+               DRM_DEBUG_DRIVER("sarea not found assuming DRI2 userspace\n");
        }
 
        if (init->ring_size != 0) {
@@ -200,7 +227,6 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
                }
 
                dev_priv->ring.Size = init->ring_size;
-               dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 
                dev_priv->ring.map.offset = init->ring_start;
                dev_priv->ring.map.size = init->ring_size;
@@ -238,7 +264,7 @@ static int i915_dma_resume(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 
-       DRM_DEBUG_DRIVER(I915_DRV, "%s\n", __func__);
+       DRM_DEBUG_DRIVER("%s\n", __func__);
 
        if (dev_priv->ring.map.handle == NULL) {
                DRM_ERROR("can not ioremap virtual address for"
@@ -251,14 +277,14 @@ static int i915_dma_resume(struct drm_device * dev)
                DRM_ERROR("Can not find hardware status page\n");
                return -EINVAL;
        }
-       DRM_DEBUG_DRIVER(I915_DRV, "hw status page @ %p\n",
+       DRM_DEBUG_DRIVER("hw status page @ %p\n",
                                dev_priv->hw_status_page);
 
        if (dev_priv->status_gfx_addr != 0)
                I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
        else
                I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
-       DRM_DEBUG_DRIVER(I915_DRV, "Enabled hardware status page\n");
+       DRM_DEBUG_DRIVER("Enabled hardware status page\n");
 
        return 0;
 }
@@ -552,7 +578,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
        if (!master_priv->sarea_priv)
                return -EINVAL;
 
-       DRM_DEBUG_DRIVER(I915_DRV, "%s: page=%d pfCurrentPage=%d\n",
+       DRM_DEBUG_DRIVER("%s: page=%d pfCurrentPage=%d\n",
                          __func__,
                         dev_priv->current_page,
                         master_priv->sarea_priv->pf_current_page);
@@ -633,8 +659,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                return -EINVAL;
        }
 
-       DRM_DEBUG_DRIVER(I915_DRV,
-                       "i915 batchbuffer, start %x used %d cliprects %d\n",
+       DRM_DEBUG_DRIVER("i915 batchbuffer, start %x used %d cliprects %d\n",
                        batch->start, batch->used, batch->num_cliprects);
 
        RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -681,8 +706,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
        void *batch_data;
        int ret;
 
-       DRM_DEBUG_DRIVER(I915_DRV,
-                       "i915 cmdbuffer, buf %p sz %d cliprects %d\n",
+       DRM_DEBUG_DRIVER("i915 cmdbuffer, buf %p sz %d cliprects %d\n",
                        cmdbuf->buf, cmdbuf->sz, cmdbuf->num_cliprects);
 
        RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -735,7 +759,7 @@ static int i915_flip_bufs(struct drm_device *dev, void *data,
 {
        int ret;
 
-       DRM_DEBUG_DRIVER(I915_DRV, "%s\n", __func__);
+       DRM_DEBUG_DRIVER("%s\n", __func__);
 
        RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
 
@@ -778,7 +802,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
                value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;
                break;
        default:
-               DRM_DEBUG_DRIVER(I915_DRV, "Unknown parameter %d\n",
+               DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                        param->param);
                return -EINVAL;
        }
@@ -819,7 +843,7 @@ static int i915_setparam(struct drm_device *dev, void *data,
                dev_priv->fence_reg_start = param->value;
                break;
        default:
-               DRM_DEBUG_DRIVER(I915_DRV, "unknown parameter %d\n",
+               DRM_DEBUG_DRIVER("unknown parameter %d\n",
                                        param->param);
                return -EINVAL;
        }
@@ -846,7 +870,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
                return 0;
        }
 
-       DRM_DEBUG("set status page addr 0x%08x\n", (u32)hws->addr);
+       DRM_DEBUG_DRIVER("set status page addr 0x%08x\n", (u32)hws->addr);
 
        dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);
 
@@ -868,13 +892,25 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
 
        memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
        I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
-       DRM_DEBUG_DRIVER(I915_DRV, "load hws HWS_PGA with gfx mem 0x%x\n",
+       DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n",
                                dev_priv->status_gfx_addr);
-       DRM_DEBUG_DRIVER(I915_DRV, "load hws at %p\n",
+       DRM_DEBUG_DRIVER("load hws at %p\n",
                                dev_priv->hw_status_page);
        return 0;
 }
 
+static int i915_get_bridge_dev(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+
+       dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
+       if (!dev_priv->bridge_dev) {
+               DRM_ERROR("bridge device not found\n");
+               return -1;
+       }
+       return 0;
+}
+
 /**
  * i915_probe_agp - get AGP bootup configuration
  * @pdev: PCI device
@@ -888,20 +924,13 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
 static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
                          uint32_t *preallocated_size)
 {
-       struct pci_dev *bridge_dev;
+       struct drm_i915_private *dev_priv = dev->dev_private;
        u16 tmp = 0;
        unsigned long overhead;
        unsigned long stolen;
 
-       bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
-       if (!bridge_dev) {
-               DRM_ERROR("bridge device not found\n");
-               return -1;
-       }
-
        /* Get the fb aperture size and "stolen" memory amount. */
-       pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp);
-       pci_dev_put(bridge_dev);
+       pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &tmp);
 
        *aperture_size = 1024 * 1024;
        *preallocated_size = 1024 * 1024;
@@ -984,6 +1013,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
        return 0;
 }
 
+/* true = enable decode, false = disable decoder */
+static unsigned int i915_vga_set_decode(void *cookie, bool state)
+{
+       struct drm_device *dev = cookie;
+
+       intel_modeset_vga_set_state(dev, state);
+       if (state)
+               return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+                      VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+       else
+               return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+}
+
 static int i915_load_modeset_init(struct drm_device *dev,
                                  unsigned long prealloc_size,
                                  unsigned long agp_size)
@@ -1029,6 +1071,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
        if (ret)
                DRM_INFO("failed to find VBIOS tables\n");
 
+       /* if we have > 1 VGA cards, then disable the radeon VGA resources */
+       ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
+       if (ret)
+               goto destroy_ringbuffer;
+
        ret = drm_irq_install(dev);
        if (ret)
                goto destroy_ringbuffer;
@@ -1153,11 +1200,16 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        base = drm_get_resource_start(dev, mmio_bar);
        size = drm_get_resource_len(dev, mmio_bar);
 
+       if (i915_get_bridge_dev(dev)) {
+               ret = -EIO;
+               goto free_priv;
+       }
+
        dev_priv->regs = ioremap(base, size);
        if (!dev_priv->regs) {
                DRM_ERROR("failed to map registers\n");
                ret = -EIO;
-               goto free_priv;
+               goto put_bridge;
        }
 
         dev_priv->mm.gtt_mapping =
@@ -1269,6 +1321,8 @@ out_iomapfree:
        io_mapping_free(dev_priv->mm.gtt_mapping);
 out_rmmap:
        iounmap(dev_priv->regs);
+put_bridge:
+       pci_dev_put(dev_priv->bridge_dev);
 free_priv:
        kfree(dev_priv);
        return ret;
@@ -1289,6 +1343,7 @@ int i915_driver_unload(struct drm_device *dev)
 
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                drm_irq_uninstall(dev);
+               vga_client_register(dev->pdev, NULL, NULL, NULL);
        }
 
        if (dev->pdev->msi_enabled)
@@ -1312,6 +1367,7 @@ int i915_driver_unload(struct drm_device *dev)
                i915_gem_lastclose(dev);
        }
 
+       pci_dev_put(dev_priv->bridge_dev);
        kfree(dev->dev_private);
 
        return 0;
@@ -1321,7 +1377,7 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
 {
        struct drm_i915_file_private *i915_file_priv;
 
-       DRM_DEBUG_DRIVER(I915_DRV, "\n");
+       DRM_DEBUG_DRIVER("\n");
        i915_file_priv = (struct drm_i915_file_private *)
            kmalloc(sizeof(*i915_file_priv), GFP_KERNEL);
 
@@ -1352,7 +1408,7 @@ void i915_driver_lastclose(struct drm_device * dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
 
        if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
-               intelfb_restore();
+               drm_fb_helper_restore();
                return;
        }
 
index fc4b68a..dbe568c 100644 (file)
 #include <linux/console.h>
 #include "drm_crtc_helper.h"
 
-static unsigned int i915_modeset = -1;
+static int i915_modeset = -1;
 module_param_named(modeset, i915_modeset, int, 0400);
 
 unsigned int i915_fbpercrtc = 0;
 module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 
+unsigned int i915_powersave = 1;
+module_param_named(powersave, i915_powersave, int, 0400);
+
 static struct drm_driver driver;
 
 static struct pci_device_id pciidlist[] = {
@@ -188,8 +191,8 @@ static struct drm_driver driver = {
        .master_create = i915_master_create,
        .master_destroy = i915_master_destroy,
 #if defined(CONFIG_DEBUG_FS)
-       .debugfs_init = i915_gem_debugfs_init,
-       .debugfs_cleanup = i915_gem_debugfs_cleanup,
+       .debugfs_init = i915_debugfs_init,
+       .debugfs_cleanup = i915_debugfs_cleanup,
 #endif
        .gem_init_object = i915_gem_init_object,
        .gem_free_object = i915_gem_free_object,
index 5b4f87e..a0632f8 100644 (file)
@@ -85,7 +85,6 @@ struct drm_i915_gem_phys_object {
 };
 
 typedef struct _drm_i915_ring_buffer {
-       int tail_mask;
        unsigned long Size;
        u8 *virtual_start;
        int head;
@@ -156,6 +155,7 @@ typedef struct drm_i915_private {
 
        void __iomem *regs;
 
+       struct pci_dev *bridge_dev;
        drm_i915_ring_buffer_t ring;
 
        drm_dma_handle_t *status_page_dmah;
@@ -311,7 +311,7 @@ typedef struct drm_i915_private {
        u32 saveIMR;
        u32 saveCACHE_MODE_0;
        u32 saveD_STATE;
-       u32 saveCG_2D_DIS;
+       u32 saveDSPCLK_GATE_D;
        u32 saveMI_ARB_STATE;
        u32 saveSWF0[16];
        u32 saveSWF1[16];
@@ -443,6 +443,14 @@ typedef struct drm_i915_private {
                struct drm_i915_gem_phys_object *phys_objs[I915_MAX_PHYS_OBJECT];
        } mm;
        struct sdvo_device_mapping sdvo_mappings[2];
+
+       /* Reclocking support */
+       bool render_reclock_avail;
+       bool lvds_downclock_avail;
+       struct work_struct idle_work;
+       struct timer_list idle_timer;
+       bool busy;
+       u16 orig_clock;
 } drm_i915_private_t;
 
 /** driver private structure attached to each drm_gem_object */
@@ -575,6 +583,7 @@ enum intel_chip_family {
 extern struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc;
+extern unsigned int i915_powersave;
 
 extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
 extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
@@ -730,8 +739,8 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
 void i915_dump_lru(struct drm_device *dev, const char *where);
 
 /* i915_debugfs.c */
-int i915_gem_debugfs_init(struct drm_minor *minor);
-void i915_gem_debugfs_cleanup(struct drm_minor *minor);
+int i915_debugfs_init(struct drm_minor *minor);
+void i915_debugfs_cleanup(struct drm_minor *minor);
 
 /* i915_suspend.c */
 extern int i915_save_state(struct drm_device *dev);
@@ -757,6 +766,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
 /* modesetting */
 extern void intel_modeset_init(struct drm_device *dev);
 extern void intel_modeset_cleanup(struct drm_device *dev);
+extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 
 /**
  * Lock test for when it's just for synchronization of ring access.
@@ -781,33 +791,32 @@ extern void intel_modeset_cleanup(struct drm_device *dev);
 
 #define I915_VERBOSE 0
 
-#define RING_LOCALS    unsigned int outring, ringmask, outcount; \
-                        volatile char *virt;
-
-#define BEGIN_LP_RING(n) do {                          \
-       if (I915_VERBOSE)                               \
-               DRM_DEBUG("BEGIN_LP_RING(%d)\n", (n));  \
-       if (dev_priv->ring.space < (n)*4)               \
-               i915_wait_ring(dev, (n)*4, __func__);           \
-       outcount = 0;                                   \
-       outring = dev_priv->ring.tail;                  \
-       ringmask = dev_priv->ring.tail_mask;            \
-       virt = dev_priv->ring.virtual_start;            \
+#define RING_LOCALS    volatile unsigned int *ring_virt__;
+
+#define BEGIN_LP_RING(n) do {                                          \
+       int bytes__ = 4*(n);                                            \
+       if (I915_VERBOSE) DRM_DEBUG("BEGIN_LP_RING(%d)\n", (n));        \
+       /* a wrap must occur between instructions so pad beforehand */  \
+       if (unlikely (dev_priv->ring.tail + bytes__ > dev_priv->ring.Size)) \
+               i915_wrap_ring(dev);                                    \
+       if (unlikely (dev_priv->ring.space < bytes__))                  \
+               i915_wait_ring(dev, bytes__, __func__);                 \
+       ring_virt__ = (unsigned int *)                                  \
+               (dev_priv->ring.virtual_start + dev_priv->ring.tail);   \
+       dev_priv->ring.tail += bytes__;                                 \
+       dev_priv->ring.tail &= dev_priv->ring.Size - 1;                 \
+       dev_priv->ring.space -= bytes__;                                \
 } while (0)
 
-#define OUT_RING(n) do {                                       \
+#define OUT_RING(n) do {                                               \
        if (I915_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));      \
-       *(volatile unsigned int *)(virt + outring) = (n);       \
-        outcount++;                                            \
-       outring += 4;                                           \
-       outring &= ringmask;                                    \
+       *ring_virt__++ = (n);                                           \
 } while (0)
 
 #define ADVANCE_LP_RING() do {                                         \
-       if (I915_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING %x\n", outring);   \
-       dev_priv->ring.tail = outring;                                  \
-       dev_priv->ring.space -= outcount * 4;                           \
-       I915_WRITE(PRB0_TAIL, outring);                 \
+       if (I915_VERBOSE)                                               \
+               DRM_DEBUG("ADVANCE_LP_RING %x\n", dev_priv->ring.tail); \
+       I915_WRITE(PRB0_TAIL, dev_priv->ring.tail);                     \
 } while(0)
 
 /**
@@ -830,6 +839,7 @@ extern void intel_modeset_cleanup(struct drm_device *dev);
 #define I915_GEM_HWS_INDEX             0x20
 #define I915_BREADCRUMB_INDEX          0x21
 
+extern int i915_wrap_ring(struct drm_device * dev);
 extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 
 #define IS_I830(dev) ((dev)->pci_device == 0x3577)
@@ -903,6 +913,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 /* dsparb controlled by hw only */
 #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
 
+#define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IGDNG(dev))
+#define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
 
 #endif
index 80e5ba4..c673171 100644 (file)
@@ -29,6 +29,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
+#include "intel_drv.h"
 #include <linux/swap.h>
 #include <linux/pci.h>
 
@@ -111,7 +112,8 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
 {
        struct drm_i915_gem_create *args = data;
        struct drm_gem_object *obj;
-       int handle, ret;
+       int ret;
+       u32 handle;
 
        args->size = roundup(args->size, PAGE_SIZE);
 
@@ -981,6 +983,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_i915_gem_set_domain *args = data;
        struct drm_gem_object *obj;
+       struct drm_i915_gem_object *obj_priv;
        uint32_t read_domains = args->read_domains;
        uint32_t write_domain = args->write_domain;
        int ret;
@@ -1004,15 +1007,17 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
        if (obj == NULL)
                return -EBADF;
+       obj_priv = obj->driver_private;
 
        mutex_lock(&dev->struct_mutex);
+
+       intel_mark_busy(dev, obj);
+
 #if WATCH_BUF
        DRM_INFO("set_domain_ioctl %p(%zd), %08x %08x\n",
                 obj, obj->size, read_domains, write_domain);
 #endif
        if (read_domains & I915_GEM_DOMAIN_GTT) {
-               struct drm_i915_gem_object *obj_priv = obj->driver_private;
-
                ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0);
 
                /* Update the LRU on the fence for the CPU access that's
@@ -2776,6 +2781,8 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
        BUG_ON(obj->pending_read_domains & I915_GEM_DOMAIN_CPU);
        BUG_ON(obj->pending_write_domain == I915_GEM_DOMAIN_CPU);
 
+       intel_mark_busy(dev, obj);
+
 #if WATCH_BUF
        DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
                 __func__, obj,
@@ -4093,7 +4100,6 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
 
        /* Set up the kernel mapping for the ring. */
        ring->Size = obj->size;
-       ring->tail_mask = obj->size - 1;
 
        ring->map.offset = dev->agp->base + obj_priv->gtt_offset;
        ring->map.size = obj->size;
diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
deleted file mode 100644 (file)
index cb3b974..0000000
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright Â© 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *    Keith Packard <keithp@keithp.com>
- *
- */
-
-#include <linux/seq_file.h>
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
-#include "i915_drv.h"
-
-#define DRM_I915_RING_DEBUG 1
-
-
-#if defined(CONFIG_DEBUG_FS)
-
-#define ACTIVE_LIST    1
-#define FLUSHING_LIST  2
-#define INACTIVE_LIST  3
-
-static const char *get_pin_flag(struct drm_i915_gem_object *obj_priv)
-{
-       if (obj_priv->user_pin_count > 0)
-               return "P";
-       else if (obj_priv->pin_count > 0)
-               return "p";
-       else
-               return " ";
-}
-
-static const char *get_tiling_flag(struct drm_i915_gem_object *obj_priv)
-{
-    switch (obj_priv->tiling_mode) {
-    default:
-    case I915_TILING_NONE: return " ";
-    case I915_TILING_X: return "X";
-    case I915_TILING_Y: return "Y";
-    }
-}
-
-static int i915_gem_object_list_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       uintptr_t list = (uintptr_t) node->info_ent->data;
-       struct list_head *head;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       struct drm_i915_gem_object *obj_priv;
-       spinlock_t *lock = NULL;
-
-       switch (list) {
-       case ACTIVE_LIST:
-               seq_printf(m, "Active:\n");
-               lock = &dev_priv->mm.active_list_lock;
-               head = &dev_priv->mm.active_list;
-               break;
-       case INACTIVE_LIST:
-               seq_printf(m, "Inactive:\n");
-               head = &dev_priv->mm.inactive_list;
-               break;
-       case FLUSHING_LIST:
-               seq_printf(m, "Flushing:\n");
-               head = &dev_priv->mm.flushing_list;
-               break;
-       default:
-               DRM_INFO("Ooops, unexpected list\n");
-               return 0;
-       }
-
-       if (lock)
-               spin_lock(lock);
-       list_for_each_entry(obj_priv, head, list)
-       {
-               struct drm_gem_object *obj = obj_priv->obj;
-
-               seq_printf(m, "    %p: %s %08x %08x %d",
-                          obj,
-                          get_pin_flag(obj_priv),
-                          obj->read_domains, obj->write_domain,
-                          obj_priv->last_rendering_seqno);
-
-               if (obj->name)
-                       seq_printf(m, " (name: %d)", obj->name);
-               if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
-                       seq_printf(m, " (fence: %d)", obj_priv->fence_reg);
-               if (obj_priv->gtt_space != NULL)
-                       seq_printf(m, " (gtt_offset: %08x)", obj_priv->gtt_offset);
-
-               seq_printf(m, "\n");
-       }
-
-       if (lock)
-           spin_unlock(lock);
-       return 0;
-}
-
-static int i915_gem_request_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       struct drm_i915_gem_request *gem_request;
-
-       seq_printf(m, "Request:\n");
-       list_for_each_entry(gem_request, &dev_priv->mm.request_list, list) {
-               seq_printf(m, "    %d @ %d\n",
-                          gem_request->seqno,
-                          (int) (jiffies - gem_request->emitted_jiffies));
-       }
-       return 0;
-}
-
-static int i915_gem_seqno_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-
-       if (dev_priv->hw_status_page != NULL) {
-               seq_printf(m, "Current sequence: %d\n",
-                          i915_get_gem_seqno(dev));
-       } else {
-               seq_printf(m, "Current sequence: hws uninitialized\n");
-       }
-       seq_printf(m, "Waiter sequence:  %d\n",
-                       dev_priv->mm.waiting_gem_seqno);
-       seq_printf(m, "IRQ sequence:     %d\n", dev_priv->mm.irq_gem_seqno);
-       return 0;
-}
-
-
-static int i915_interrupt_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-
-       seq_printf(m, "Interrupt enable:    %08x\n",
-                  I915_READ(IER));
-       seq_printf(m, "Interrupt identity:  %08x\n",
-                  I915_READ(IIR));
-       seq_printf(m, "Interrupt mask:      %08x\n",
-                  I915_READ(IMR));
-       seq_printf(m, "Pipe A stat:         %08x\n",
-                  I915_READ(PIPEASTAT));
-       seq_printf(m, "Pipe B stat:         %08x\n",
-                  I915_READ(PIPEBSTAT));
-       seq_printf(m, "Interrupts received: %d\n",
-                  atomic_read(&dev_priv->irq_received));
-       if (dev_priv->hw_status_page != NULL) {
-               seq_printf(m, "Current sequence:    %d\n",
-                          i915_get_gem_seqno(dev));
-       } else {
-               seq_printf(m, "Current sequence:    hws uninitialized\n");
-       }
-       seq_printf(m, "Waiter sequence:     %d\n",
-                  dev_priv->mm.waiting_gem_seqno);
-       seq_printf(m, "IRQ sequence:        %d\n",
-                  dev_priv->mm.irq_gem_seqno);
-       return 0;
-}
-
-static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       int i;
-
-       seq_printf(m, "Reserved fences = %d\n", dev_priv->fence_reg_start);
-       seq_printf(m, "Total fences = %d\n", dev_priv->num_fence_regs);
-       for (i = 0; i < dev_priv->num_fence_regs; i++) {
-               struct drm_gem_object *obj = dev_priv->fence_regs[i].obj;
-
-               if (obj == NULL) {
-                       seq_printf(m, "Fenced object[%2d] = unused\n", i);
-               } else {
-                       struct drm_i915_gem_object *obj_priv;
-
-                       obj_priv = obj->driver_private;
-                       seq_printf(m, "Fenced object[%2d] = %p: %s "
-                                  "%08x %08zx %08x %s %08x %08x %d",
-                                  i, obj, get_pin_flag(obj_priv),
-                                  obj_priv->gtt_offset,
-                                  obj->size, obj_priv->stride,
-                                  get_tiling_flag(obj_priv),
-                                  obj->read_domains, obj->write_domain,
-                                  obj_priv->last_rendering_seqno);
-                       if (obj->name)
-                               seq_printf(m, " (name: %d)", obj->name);
-                       seq_printf(m, "\n");
-               }
-       }
-
-       return 0;
-}
-
-static int i915_hws_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       int i;
-       volatile u32 *hws;
-
-       hws = (volatile u32 *)dev_priv->hw_status_page;
-       if (hws == NULL)
-               return 0;
-
-       for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {
-               seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
-                          i * 4,
-                          hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
-       }
-       return 0;
-}
-
-static void i915_dump_pages(struct seq_file *m, struct page **pages, int page_count)
-{
-       int page, i;
-       uint32_t *mem;
-
-       for (page = 0; page < page_count; page++) {
-               mem = kmap(pages[page]);
-               for (i = 0; i < PAGE_SIZE; i += 4)
-                       seq_printf(m, "%08x :  %08x\n", i, mem[i / 4]);
-               kunmap(pages[page]);
-       }
-}
-
-static int i915_batchbuffer_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       struct drm_gem_object *obj;
-       struct drm_i915_gem_object *obj_priv;
-       int ret;
-
-       spin_lock(&dev_priv->mm.active_list_lock);
-
-       list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {
-               obj = obj_priv->obj;
-               if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {
-                   ret = i915_gem_object_get_pages(obj);
-                   if (ret) {
-                           DRM_ERROR("Failed to get pages: %d\n", ret);
-                           spin_unlock(&dev_priv->mm.active_list_lock);
-                           return ret;
-                   }
-
-                   seq_printf(m, "--- gtt_offset = 0x%08x\n", obj_priv->gtt_offset);
-                   i915_dump_pages(m, obj_priv->pages, obj->size / PAGE_SIZE);
-
-                   i915_gem_object_put_pages(obj);
-               }
-       }
-
-       spin_unlock(&dev_priv->mm.active_list_lock);
-
-       return 0;
-}
-
-static int i915_ringbuffer_data(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       u8 *virt;
-       uint32_t *ptr, off;
-
-       if (!dev_priv->ring.ring_obj) {
-               seq_printf(m, "No ringbuffer setup\n");
-               return 0;
-       }
-
-       virt = dev_priv->ring.virtual_start;
-
-       for (off = 0; off < dev_priv->ring.Size; off += 4) {
-               ptr = (uint32_t *)(virt + off);
-               seq_printf(m, "%08x :  %08x\n", off, *ptr);
-       }
-
-       return 0;
-}
-
-static int i915_ringbuffer_info(struct seq_file *m, void *data)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       unsigned int head, tail, mask;
-
-       head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
-       tail = I915_READ(PRB0_TAIL) & TAIL_ADDR;
-       mask = dev_priv->ring.tail_mask;
-
-       seq_printf(m, "RingHead :  %08x\n", head);
-       seq_printf(m, "RingTail :  %08x\n", tail);
-       seq_printf(m, "RingMask :  %08x\n", mask);
-       seq_printf(m, "RingSize :  %08lx\n", dev_priv->ring.Size);
-       seq_printf(m, "Acthd :     %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD));
-
-       return 0;
-}
-
-static int i915_error_state(struct seq_file *m, void *unused)
-{
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct drm_device *dev = node->minor->dev;
-       drm_i915_private_t *dev_priv = dev->dev_private;
-       struct drm_i915_error_state *error;
-       unsigned long flags;
-
-       spin_lock_irqsave(&dev_priv->error_lock, flags);
-       if (!dev_priv->first_error) {
-               seq_printf(m, "no error state collected\n");
-               goto out;
-       }
-
-       error = dev_priv->first_error;
-
-       seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
-                  error->time.tv_usec);
-       seq_printf(m, "EIR: 0x%08x\n", error->eir);
-       seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
-       seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
-       seq_printf(m, "  IPEIR: 0x%08x\n", error->ipeir);
-       seq_printf(m, "  IPEHR: 0x%08x\n", error->ipehr);
-       seq_printf(m, "  INSTDONE: 0x%08x\n", error->instdone);
-       seq_printf(m, "  ACTHD: 0x%08x\n", error->acthd);
-       if (IS_I965G(dev)) {
-               seq_printf(m, "  INSTPS: 0x%08x\n", error->instps);
-               seq_printf(m, "  INSTDONE1: 0x%08x\n", error->instdone1);
-       }
-
-out:
-       spin_unlock_irqrestore(&dev_priv->error_lock, flags);
-
-       return 0;
-}
-
-static struct drm_info_list i915_gem_debugfs_list[] = {
-       {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},
-       {"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},
-       {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},
-       {"i915_gem_request", i915_gem_request_info, 0},
-       {"i915_gem_seqno", i915_gem_seqno_info, 0},
-       {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},
-       {"i915_gem_interrupt", i915_interrupt_info, 0},
-       {"i915_gem_hws", i915_hws_info, 0},
-       {"i915_ringbuffer_data", i915_ringbuffer_data, 0},
-       {"i915_ringbuffer_info", i915_ringbuffer_info, 0},
-       {"i915_batchbuffers", i915_batchbuffer_info, 0},
-       {"i915_error_state", i915_error_state, 0},
-};
-#define I915_GEM_DEBUGFS_ENTRIES ARRAY_SIZE(i915_gem_debugfs_list)
-
-int i915_gem_debugfs_init(struct drm_minor *minor)
-{
-       return drm_debugfs_create_files(i915_gem_debugfs_list,
-                                       I915_GEM_DEBUGFS_ENTRIES,
-                                       minor->debugfs_root, minor);
-}
-
-void i915_gem_debugfs_cleanup(struct drm_minor *minor)
-{
-       drm_debugfs_remove_files(i915_gem_debugfs_list,
-                                I915_GEM_DEBUGFS_ENTRIES, minor);
-}
-
-#endif /* CONFIG_DEBUG_FS */
-
index a2d527b..200e398 100644 (file)
 static int
 intel_alloc_mchbar_resource(struct drm_device *dev)
 {
-       struct pci_dev *bridge_dev;
        drm_i915_private_t *dev_priv = dev->dev_private;
        int reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
        u32 temp_lo, temp_hi = 0;
        u64 mchbar_addr;
        int ret = 0;
 
-       bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
-       if (!bridge_dev) {
-               DRM_DEBUG("no bridge dev?!\n");
-               ret = -ENODEV;
-               goto out;
-       }
-
        if (IS_I965G(dev))
-               pci_read_config_dword(bridge_dev, reg + 4, &temp_hi);
-       pci_read_config_dword(bridge_dev, reg, &temp_lo);
+               pci_read_config_dword(dev_priv->bridge_dev, reg + 4, &temp_hi);
+       pci_read_config_dword(dev_priv->bridge_dev, reg, &temp_lo);
        mchbar_addr = ((u64)temp_hi << 32) | temp_lo;
 
        /* If ACPI doesn't have it, assume we need to allocate it ourselves */
@@ -118,30 +110,28 @@ intel_alloc_mchbar_resource(struct drm_device *dev)
        if (mchbar_addr &&
            pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) {
                ret = 0;
-               goto out_put;
+               goto out;
        }
 #endif
 
        /* Get some space for it */
-       ret = pci_bus_alloc_resource(bridge_dev->bus, &dev_priv->mch_res,
+       ret = pci_bus_alloc_resource(dev_priv->bridge_dev->bus, &dev_priv->mch_res,
                                     MCHBAR_SIZE, MCHBAR_SIZE,
                                     PCIBIOS_MIN_MEM,
                                     0,   pcibios_align_resource,
-                                    bridge_dev);
+                                    dev_priv->bridge_dev);
        if (ret) {
                DRM_DEBUG("failed bus alloc: %d\n", ret);
                dev_priv->mch_res.start = 0;
-               goto out_put;
+               goto out;
        }
 
        if (IS_I965G(dev))
-               pci_write_config_dword(bridge_dev, reg + 4,
+               pci_write_config_dword(dev_priv->bridge_dev, reg + 4,
                                       upper_32_bits(dev_priv->mch_res.start));
 
-       pci_write_config_dword(bridge_dev, reg,
+       pci_write_config_dword(dev_priv->bridge_dev, reg,
                               lower_32_bits(dev_priv->mch_res.start));
-out_put:
-       pci_dev_put(bridge_dev);
 out:
        return ret;
 }
@@ -150,44 +140,36 @@ out:
 static bool
 intel_setup_mchbar(struct drm_device *dev)
 {
-       struct pci_dev *bridge_dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
        int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
        u32 temp;
        bool need_disable = false, enabled;
 
-       bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
-       if (!bridge_dev) {
-               DRM_DEBUG("no bridge dev?!\n");
-               goto out;
-       }
-
        if (IS_I915G(dev) || IS_I915GM(dev)) {
-               pci_read_config_dword(bridge_dev, DEVEN_REG, &temp);
+               pci_read_config_dword(dev_priv->bridge_dev, DEVEN_REG, &temp);
                enabled = !!(temp & DEVEN_MCHBAR_EN);
        } else {
-               pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
+               pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp);
                enabled = temp & 1;
        }
 
        /* If it's already enabled, don't have to do anything */
        if (enabled)
-               goto out_put;
+               goto out;
 
        if (intel_alloc_mchbar_resource(dev))
-               goto out_put;
+               goto out;
 
        need_disable = true;
 
        /* Space is allocated or reserved, so enable it. */
        if (IS_I915G(dev) || IS_I915GM(dev)) {
-               pci_write_config_dword(bridge_dev, DEVEN_REG,
+               pci_write_config_dword(dev_priv->bridge_dev, DEVEN_REG,
                                       temp | DEVEN_MCHBAR_EN);
        } else {
-               pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
-               pci_write_config_dword(bridge_dev, mchbar_reg, temp | 1);
+               pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp);
+               pci_write_config_dword(dev_priv->bridge_dev, mchbar_reg, temp | 1);
        }
-out_put:
-       pci_dev_put(bridge_dev);
 out:
        return need_disable;
 }
@@ -196,25 +178,18 @@ static void
 intel_teardown_mchbar(struct drm_device *dev, bool disable)
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
-       struct pci_dev *bridge_dev;
        int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
        u32 temp;
 
-       bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
-       if (!bridge_dev) {
-               DRM_DEBUG("no bridge dev?!\n");
-               return;
-       }
-
        if (disable) {
                if (IS_I915G(dev) || IS_I915GM(dev)) {
-                       pci_read_config_dword(bridge_dev, DEVEN_REG, &temp);
+                       pci_read_config_dword(dev_priv->bridge_dev, DEVEN_REG, &temp);
                        temp &= ~DEVEN_MCHBAR_EN;
-                       pci_write_config_dword(bridge_dev, DEVEN_REG, temp);
+                       pci_write_config_dword(dev_priv->bridge_dev, DEVEN_REG, temp);
                } else {
-                       pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
+                       pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp);
                        temp &= ~1;
-                       pci_write_config_dword(bridge_dev, mchbar_reg, temp);
+                       pci_write_config_dword(dev_priv->bridge_dev, mchbar_reg, temp);
                }
        }
 
@@ -234,7 +209,13 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
        uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
        bool need_disable;
 
-       if (!IS_I9XX(dev)) {
+       if (IS_IGDNG(dev)) {
+               /* On IGDNG whatever DRAM config, GPU always do
+                * same swizzling setup.
+                */
+               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+               swizzle_y = I915_BIT_6_SWIZZLE_9;
+       } else if (!IS_I9XX(dev)) {
                /* As far as we know, the 865 doesn't have these bit 6
                 * swizzling issues.
                 */
@@ -317,13 +298,6 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
                }
        }
 
-       /* FIXME: check with memory config on IGDNG */
-       if (IS_IGDNG(dev)) {
-               DRM_ERROR("disable tiling on IGDNG...\n");
-               swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
-               swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
-       }
-
        dev_priv->mm.bit_6_swizzle_x = swizzle_x;
        dev_priv->mm.bit_6_swizzle_y = swizzle_y;
 }
index 7ebc84c..6c89f2f 100644 (file)
@@ -565,6 +565,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
                        I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
                        I915_READ(PORT_HOTPLUG_STAT);
+
+                       /* EOS interrupts occurs */
+                       if (IS_IGD(dev) &&
+                               (hotplug_status & CRT_EOS_INT_STATUS)) {
+                               u32 temp;
+
+                               DRM_DEBUG("EOS interrupt occurs\n");
+                               /* status is already cleared */
+                               temp = I915_READ(ADPA);
+                               temp &= ~ADPA_DAC_ENABLE;
+                               I915_WRITE(ADPA, temp);
+
+                               temp = I915_READ(PORT_HOTPLUG_EN);
+                               temp &= ~CRT_EOS_INT_EN;
+                               I915_WRITE(PORT_HOTPLUG_EN, temp);
+
+                               temp = I915_READ(PORT_HOTPLUG_STAT);
+                               if (temp & CRT_EOS_INT_STATUS)
+                                       I915_WRITE(PORT_HOTPLUG_STAT,
+                                               CRT_EOS_INT_STATUS);
+                       }
                }
 
                I915_WRITE(IIR, iir);
index 2955083..3f79635 100644 (file)
@@ -30,6 +30,7 @@
  * fb aperture size and the amount of pre-reserved memory.
  */
 #define INTEL_GMCH_CTRL                0x52
+#define INTEL_GMCH_VGA_DISABLE  (1 << 1)
 #define INTEL_GMCH_ENABLED     0x4
 #define INTEL_GMCH_MEM_MASK    0x1
 #define INTEL_GMCH_MEM_64M     0x1
@@ -55,7 +56,7 @@
 /* PCI config space */
 
 #define HPLLCC 0xc0 /* 855 only */
-#define   GC_CLOCK_CONTROL_MASK                (3 << 0)
+#define   GC_CLOCK_CONTROL_MASK                (0xf << 0)
 #define   GC_CLOCK_133_200             (0 << 0)
 #define   GC_CLOCK_100_200             (1 << 0)
 #define   GC_CLOCK_100_133             (2 << 0)
 #define   GC_DISPLAY_CLOCK_190_200_MHZ (0 << 4)
 #define   GC_DISPLAY_CLOCK_333_MHZ     (4 << 4)
 #define   GC_DISPLAY_CLOCK_MASK                (7 << 4)
+#define   GM45_GC_RENDER_CLOCK_MASK    (0xf << 0)
+#define   GM45_GC_RENDER_CLOCK_266_MHZ (8 << 0)
+#define   GM45_GC_RENDER_CLOCK_320_MHZ (9 << 0)
+#define   GM45_GC_RENDER_CLOCK_400_MHZ (0xb << 0)
+#define   GM45_GC_RENDER_CLOCK_533_MHZ (0xc << 0)
+#define   I965_GC_RENDER_CLOCK_MASK    (0xf << 0)
+#define   I965_GC_RENDER_CLOCK_267_MHZ (2 << 0)
+#define   I965_GC_RENDER_CLOCK_333_MHZ (3 << 0)
+#define   I965_GC_RENDER_CLOCK_444_MHZ (4 << 0)
+#define   I965_GC_RENDER_CLOCK_533_MHZ (5 << 0)
+#define   I945_GC_RENDER_CLOCK_MASK    (7 << 0)
+#define   I945_GC_RENDER_CLOCK_166_MHZ (0 << 0)
+#define   I945_GC_RENDER_CLOCK_200_MHZ (1 << 0)
+#define   I945_GC_RENDER_CLOCK_250_MHZ (3 << 0)
+#define   I945_GC_RENDER_CLOCK_400_MHZ (5 << 0)
+#define   I915_GC_RENDER_CLOCK_MASK    (7 << 0)
+#define   I915_GC_RENDER_CLOCK_166_MHZ (0 << 0)
+#define   I915_GC_RENDER_CLOCK_200_MHZ (1 << 0)
+#define   I915_GC_RENDER_CLOCK_333_MHZ (4 << 0)
 #define LBB    0xf4
 
 /* VGA stuff */
 #define   DPLLA_TEST_M_BYPASS          (1 << 2)
 #define   DPLLA_INPUT_BUFFER_ENABLE    (1 << 0)
 #define D_STATE                0x6104
-#define CG_2D_DIS      0x6200
-#define DPCUNIT_CLOCK_GATE_DISABLE     (1 << 24)
-#define CG_3D_DIS      0x6204
+#define  DSTATE_PLL_D3_OFF                     (1<<3)
+#define  DSTATE_GFX_CLOCK_GATING               (1<<1)
+#define  DSTATE_DOT_CLOCK_GATING               (1<<0)
+#define DSPCLK_GATE_D          0x6200
+# define DPUNIT_B_CLOCK_GATE_DISABLE           (1 << 30) /* 965 */
+# define VSUNIT_CLOCK_GATE_DISABLE             (1 << 29) /* 965 */
+# define VRHUNIT_CLOCK_GATE_DISABLE            (1 << 28) /* 965 */
+# define VRDUNIT_CLOCK_GATE_DISABLE            (1 << 27) /* 965 */
+# define AUDUNIT_CLOCK_GATE_DISABLE            (1 << 26) /* 965 */
+# define DPUNIT_A_CLOCK_GATE_DISABLE           (1 << 25) /* 965 */
+# define DPCUNIT_CLOCK_GATE_DISABLE            (1 << 24) /* 965 */
+# define TVRUNIT_CLOCK_GATE_DISABLE            (1 << 23) /* 915-945 */
+# define TVCUNIT_CLOCK_GATE_DISABLE            (1 << 22) /* 915-945 */
+# define TVFUNIT_CLOCK_GATE_DISABLE            (1 << 21) /* 915-945 */
+# define TVEUNIT_CLOCK_GATE_DISABLE            (1 << 20) /* 915-945 */
+# define DVSUNIT_CLOCK_GATE_DISABLE            (1 << 19) /* 915-945 */
+# define DSSUNIT_CLOCK_GATE_DISABLE            (1 << 18) /* 915-945 */
+# define DDBUNIT_CLOCK_GATE_DISABLE            (1 << 17) /* 915-945 */
+# define DPRUNIT_CLOCK_GATE_DISABLE            (1 << 16) /* 915-945 */
+# define DPFUNIT_CLOCK_GATE_DISABLE            (1 << 15) /* 915-945 */
+# define DPBMUNIT_CLOCK_GATE_DISABLE           (1 << 14) /* 915-945 */
+# define DPLSUNIT_CLOCK_GATE_DISABLE           (1 << 13) /* 915-945 */
+# define DPLUNIT_CLOCK_GATE_DISABLE            (1 << 12) /* 915-945 */
+# define DPOUNIT_CLOCK_GATE_DISABLE            (1 << 11)
+# define DPBUNIT_CLOCK_GATE_DISABLE            (1 << 10)
+# define DCUNIT_CLOCK_GATE_DISABLE             (1 << 9)
+# define DPUNIT_CLOCK_GATE_DISABLE             (1 << 8)
+# define VRUNIT_CLOCK_GATE_DISABLE             (1 << 7) /* 915+: reserved */
+# define OVHUNIT_CLOCK_GATE_DISABLE            (1 << 6) /* 830-865 */
+# define DPIOUNIT_CLOCK_GATE_DISABLE           (1 << 6) /* 915-945 */
+# define OVFUNIT_CLOCK_GATE_DISABLE            (1 << 5)
+# define OVBUNIT_CLOCK_GATE_DISABLE            (1 << 4)
+/**
+ * This bit must be set on the 830 to prevent hangs when turning off the
+ * overlay scaler.
+ */
+# define OVRUNIT_CLOCK_GATE_DISABLE            (1 << 3)
+# define OVCUNIT_CLOCK_GATE_DISABLE            (1 << 2)
+# define OVUUNIT_CLOCK_GATE_DISABLE            (1 << 1)
+# define ZVUNIT_CLOCK_GATE_DISABLE             (1 << 0) /* 830 */
+# define OVLUNIT_CLOCK_GATE_DISABLE            (1 << 0) /* 845,865 */
+
+#define RENCLK_GATE_D1         0x6204
+# define BLITTER_CLOCK_GATE_DISABLE            (1 << 13) /* 945GM only */
+# define MPEG_CLOCK_GATE_DISABLE               (1 << 12) /* 945GM only */
+# define PC_FE_CLOCK_GATE_DISABLE              (1 << 11)
+# define PC_BE_CLOCK_GATE_DISABLE              (1 << 10)
+# define WINDOWER_CLOCK_GATE_DISABLE           (1 << 9)
+# define INTERPOLATOR_CLOCK_GATE_DISABLE       (1 << 8)
+# define COLOR_CALCULATOR_CLOCK_GATE_DISABLE   (1 << 7)
+# define MOTION_COMP_CLOCK_GATE_DISABLE                (1 << 6)
+# define MAG_CLOCK_GATE_DISABLE                        (1 << 5)
+/** This bit must be unset on 855,865 */
+# define MECI_CLOCK_GATE_DISABLE               (1 << 4)
+# define DCMP_CLOCK_GATE_DISABLE               (1 << 3)
+# define MEC_CLOCK_GATE_DISABLE                        (1 << 2)
+# define MECO_CLOCK_GATE_DISABLE               (1 << 1)
+/** This bit must be set on 855,865. */
+# define SV_CLOCK_GATE_DISABLE                 (1 << 0)
+# define I915_MPEG_CLOCK_GATE_DISABLE          (1 << 16)
+# define I915_VLD_IP_PR_CLOCK_GATE_DISABLE     (1 << 15)
+# define I915_MOTION_COMP_CLOCK_GATE_DISABLE   (1 << 14)
+# define I915_BD_BF_CLOCK_GATE_DISABLE         (1 << 13)
+# define I915_SF_SE_CLOCK_GATE_DISABLE         (1 << 12)
+# define I915_WM_CLOCK_GATE_DISABLE            (1 << 11)
+# define I915_IZ_CLOCK_GATE_DISABLE            (1 << 10)
+# define I915_PI_CLOCK_GATE_DISABLE            (1 << 9)
+# define I915_DI_CLOCK_GATE_DISABLE            (1 << 8)
+# define I915_SH_SV_CLOCK_GATE_DISABLE         (1 << 7)
+# define I915_PL_DG_QC_FT_CLOCK_GATE_DISABLE   (1 << 6)
+# define I915_SC_CLOCK_GATE_DISABLE            (1 << 5)
+# define I915_FL_CLOCK_GATE_DISABLE            (1 << 4)
+# define I915_DM_CLOCK_GATE_DISABLE            (1 << 3)
+# define I915_PS_CLOCK_GATE_DISABLE            (1 << 2)
+# define I915_CC_CLOCK_GATE_DISABLE            (1 << 1)
+# define I915_BY_CLOCK_GATE_DISABLE            (1 << 0)
+
+# define I965_RCZ_CLOCK_GATE_DISABLE           (1 << 30)
+/** This bit must always be set on 965G/965GM */
+# define I965_RCC_CLOCK_GATE_DISABLE           (1 << 29)
+# define I965_RCPB_CLOCK_GATE_DISABLE          (1 << 28)
+# define I965_DAP_CLOCK_GATE_DISABLE           (1 << 27)
+# define I965_ROC_CLOCK_GATE_DISABLE           (1 << 26)
+# define I965_GW_CLOCK_GATE_DISABLE            (1 << 25)
+# define I965_TD_CLOCK_GATE_DISABLE            (1 << 24)
+/** This bit must always be set on 965G */
+# define I965_ISC_CLOCK_GATE_DISABLE           (1 << 23)
+# define I965_IC_CLOCK_GATE_DISABLE            (1 << 22)
+# define I965_EU_CLOCK_GATE_DISABLE            (1 << 21)
+# define I965_IF_CLOCK_GATE_DISABLE            (1 << 20)
+# define I965_TC_CLOCK_GATE_DISABLE            (1 << 19)
+# define I965_SO_CLOCK_GATE_DISABLE            (1 << 17)
+# define I965_FBC_CLOCK_GATE_DISABLE           (1 << 16)
+# define I965_MARI_CLOCK_GATE_DISABLE          (1 << 15)
+# define I965_MASF_CLOCK_GATE_DISABLE          (1 << 14)
+# define I965_MAWB_CLOCK_GATE_DISABLE          (1 << 13)
+# define I965_EM_CLOCK_GATE_DISABLE            (1 << 12)
+# define I965_UC_CLOCK_GATE_DISABLE            (1 << 11)
+# define I965_SI_CLOCK_GATE_DISABLE            (1 << 6)
+# define I965_MT_CLOCK_GATE_DISABLE            (1 << 5)
+# define I965_PL_CLOCK_GATE_DISABLE            (1 << 4)
+# define I965_DG_CLOCK_GATE_DISABLE            (1 << 3)
+# define I965_QC_CLOCK_GATE_DISABLE            (1 << 2)
+# define I965_FT_CLOCK_GATE_DISABLE            (1 << 1)
+# define I965_DM_CLOCK_GATE_DISABLE            (1 << 0)
+
+#define RENCLK_GATE_D2         0x6208
+#define VF_UNIT_CLOCK_GATE_DISABLE             (1 << 9)
+#define GS_UNIT_CLOCK_GATE_DISABLE             (1 << 7)
+#define CL_UNIT_CLOCK_GATE_DISABLE             (1 << 6)
+#define RAMCLK_GATE_D          0x6210          /* CRL only */
+#define DEUC                   0x6214          /* CRL only */
 
 /*
  * Palette regs
 #define   SDVOB_HOTPLUG_INT_EN                 (1 << 26)
 #define   SDVOC_HOTPLUG_INT_EN                 (1 << 25)
 #define   TV_HOTPLUG_INT_EN                    (1 << 18)
+#define   CRT_EOS_INT_EN                       (1 << 10)
 #define   CRT_HOTPLUG_INT_EN                   (1 << 9)
 #define   CRT_HOTPLUG_FORCE_DETECT             (1 << 3)
 #define CRT_HOTPLUG_ACTIVATION_PERIOD_32       (0 << 8)
 #define   DPC_HOTPLUG_INT_STATUS               (1 << 28)
 #define   HDMID_HOTPLUG_INT_STATUS             (1 << 27)
 #define   DPD_HOTPLUG_INT_STATUS               (1 << 27)
+#define   CRT_EOS_INT_STATUS                   (1 << 12)
 #define   CRT_HOTPLUG_INT_STATUS               (1 << 11)
 #define   TV_HOTPLUG_INT_STATUS                        (1 << 10)
 #define   CRT_HOTPLUG_MONITOR_MASK             (3 << 8)
 #define   PIPECONF_PROGRESSIVE (0 << 21)
 #define   PIPECONF_INTERLACE_W_FIELD_INDICATION        (6 << 21)
 #define   PIPECONF_INTERLACE_FIELD_0_ONLY              (7 << 21)
+#define   PIPECONF_CXSR_DOWNCLOCK      (1<<16)
 #define PIPEASTAT              0x70024
 #define   PIPE_FIFO_UNDERRUN_STATUS            (1UL<<31)
 #define   PIPE_CRC_ERROR_ENABLE                        (1UL<<29)
 #define   DISPPLANE_NO_LINE_DOUBLE             0
 #define   DISPPLANE_STEREO_POLARITY_FIRST      0
 #define   DISPPLANE_STEREO_POLARITY_SECOND     (1<<18)
+#define   DISPPLANE_TRICKLE_FEED_DISABLE       (1<<14) /* IGDNG */
 #define   DISPPLANE_TILED                      (1<<10)
 #define DSPAADDR               0x70184
 #define DSPASTRIDE             0x70188
 #define GTIIR   0x44018
 #define GTIER   0x4401c
 
+#define DISP_ARB_CTL   0x45000
+#define  DISP_TILE_SURFACE_SWIZZLING   (1<<13)
+
 /* PCH */
 
 /* south display engine interrupt */
index 1d04e19..20d4d19 100644 (file)
@@ -461,7 +461,7 @@ int i915_save_state(struct drm_device *dev)
 
        /* Clock gating state */
        dev_priv->saveD_STATE = I915_READ(D_STATE);
-       dev_priv->saveCG_2D_DIS = I915_READ(CG_2D_DIS);
+       dev_priv->saveDSPCLK_GATE_D = I915_READ(DSPCLK_GATE_D);
 
        /* Cache mode state */
        dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
@@ -588,7 +588,7 @@ int i915_restore_state(struct drm_device *dev)
 
        /* Clock gating state */
        I915_WRITE (D_STATE, dev_priv->saveD_STATE);
-       I915_WRITE (CG_2D_DIS, dev_priv->saveCG_2D_DIS);
+       I915_WRITE (DSPCLK_GATE_D, dev_priv->saveDSPCLK_GATE_D);
 
        /* Cache mode state */
        I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);
index f806fcc..1e28c16 100644 (file)
@@ -355,8 +355,14 @@ parse_driver_features(struct drm_i915_private *dev_priv,
        }
 
        driver = find_section(bdb, BDB_DRIVER_FEATURES);
-       if (driver && driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
+       if (!driver)
+               return;
+
+       if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
                dev_priv->edp_support = 1;
+
+       if (driver->dual_frequency)
+               dev_priv->render_reclock_avail = true;
 }
 
 /**
index 590f81c..88814fa 100644 (file)
@@ -64,6 +64,34 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
        }
 
        I915_WRITE(reg, temp);
+
+       if (IS_IGD(dev)) {
+               if (mode == DRM_MODE_DPMS_OFF) {
+                       /* turn off DAC */
+                       temp = I915_READ(PORT_HOTPLUG_EN);
+                       temp &= ~CRT_EOS_INT_EN;
+                       I915_WRITE(PORT_HOTPLUG_EN, temp);
+
+                       temp = I915_READ(PORT_HOTPLUG_STAT);
+                       if (temp & CRT_EOS_INT_STATUS)
+                               I915_WRITE(PORT_HOTPLUG_STAT,
+                                       CRT_EOS_INT_STATUS);
+               } else {
+                       /* turn on DAC. EOS interrupt must be enabled after DAC
+                        * is enabled, so it sounds not good to enable it in
+                        * i915_driver_irq_postinstall()
+                        * wait 12.5ms after DAC is enabled
+                        */
+                       msleep(13);
+                       temp = I915_READ(PORT_HOTPLUG_STAT);
+                       if (temp & CRT_EOS_INT_STATUS)
+                               I915_WRITE(PORT_HOTPLUG_STAT,
+                                       CRT_EOS_INT_STATUS);
+                       temp = I915_READ(PORT_HOTPLUG_EN);
+                       temp |= CRT_EOS_INT_EN;
+                       I915_WRITE(PORT_HOTPLUG_EN, temp);
+               }
+       }
 }
 
 static int intel_crt_mode_valid(struct drm_connector *connector,
index 748ed50..0227b16 100644 (file)
@@ -38,6 +38,7 @@
 
 bool intel_pipe_has_type (struct drm_crtc *crtc, int type);
 static void intel_update_watermarks(struct drm_device *dev);
+static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule);
 
 typedef struct {
     /* given values */
@@ -67,6 +68,8 @@ struct intel_limit {
     intel_p2_t     p2;
     bool (* find_pll)(const intel_limit_t *, struct drm_crtc *,
                      int, int, intel_clock_t *);
+    bool (* find_reduced_pll)(const intel_limit_t *, struct drm_crtc *,
+                             int, int, intel_clock_t *);
 };
 
 #define I8XX_DOT_MIN             25000
@@ -261,6 +264,9 @@ static bool
 intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                    int target, int refclk, intel_clock_t *best_clock);
 static bool
+intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
+                           int target, int refclk, intel_clock_t *best_clock);
+static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                        int target, int refclk, intel_clock_t *best_clock);
 static bool
@@ -286,6 +292,7 @@ static const intel_limit_t intel_limits_i8xx_dvo = {
        .p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
                 .p2_slow = I8XX_P2_SLOW,       .p2_fast = I8XX_P2_FAST },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i8xx_lvds = {
@@ -300,6 +307,7 @@ static const intel_limit_t intel_limits_i8xx_lvds = {
        .p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
                 .p2_slow = I8XX_P2_LVDS_SLOW,  .p2_fast = I8XX_P2_LVDS_FAST },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
        
 static const intel_limit_t intel_limits_i9xx_sdvo = {
@@ -314,6 +322,7 @@ static const intel_limit_t intel_limits_i9xx_sdvo = {
        .p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
                 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,      .p2_fast = I9XX_P2_SDVO_DAC_FAST },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i9xx_lvds = {
@@ -331,6 +340,7 @@ static const intel_limit_t intel_limits_i9xx_lvds = {
        .p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
                 .p2_slow = I9XX_P2_LVDS_SLOW,  .p2_fast = I9XX_P2_LVDS_FAST },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
     /* below parameter and function is for G4X Chipset Family*/
@@ -348,6 +358,7 @@ static const intel_limit_t intel_limits_g4x_sdvo = {
                 .p2_fast = G4X_P2_SDVO_FAST
        },
        .find_pll = intel_g4x_find_best_PLL,
+       .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_hdmi = {
@@ -364,6 +375,7 @@ static const intel_limit_t intel_limits_g4x_hdmi = {
                 .p2_fast = G4X_P2_HDMI_DAC_FAST
        },
        .find_pll = intel_g4x_find_best_PLL,
+       .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
@@ -388,6 +400,7 @@ static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
                 .p2_fast = G4X_P2_SINGLE_CHANNEL_LVDS_FAST
        },
        .find_pll = intel_g4x_find_best_PLL,
+       .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
@@ -412,6 +425,7 @@ static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
                 .p2_fast = G4X_P2_DUAL_CHANNEL_LVDS_FAST
        },
        .find_pll = intel_g4x_find_best_PLL,
+       .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_display_port = {
@@ -449,6 +463,7 @@ static const intel_limit_t intel_limits_igd_sdvo = {
        .p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
                 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,      .p2_fast = I9XX_P2_SDVO_DAC_FAST },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_igd_lvds = {
@@ -464,6 +479,7 @@ static const intel_limit_t intel_limits_igd_lvds = {
        .p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
                 .p2_slow = I9XX_P2_LVDS_SLOW,  .p2_fast = I9XX_P2_LVDS_SLOW },
        .find_pll = intel_find_best_PLL,
+       .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_igdng_sdvo = {
@@ -688,15 +704,16 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
 
        memset (best_clock, 0, sizeof (*best_clock));
 
-       for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
-               for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++) {
-                       /* m1 is always 0 in IGD */
-                       if (clock.m2 >= clock.m1 && !IS_IGD(dev))
-                               break;
-                       for (clock.n = limit->n.min; clock.n <= limit->n.max;
-                            clock.n++) {
-                               for (clock.p1 = limit->p1.min;
-                                    clock.p1 <= limit->p1.max; clock.p1++) {
+       for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
+               for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max;
+                    clock.m1++) {
+                       for (clock.m2 = limit->m2.min;
+                            clock.m2 <= limit->m2.max; clock.m2++) {
+                               /* m1 is always 0 in IGD */
+                               if (clock.m2 >= clock.m1 && !IS_IGD(dev))
+                                       break;
+                               for (clock.n = limit->n.min;
+                                    clock.n <= limit->n.max; clock.n++) {
                                        int this_err;
 
                                        intel_clock(dev, refclk, &clock);
@@ -717,6 +734,46 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
        return (err != target);
 }
 
+
+static bool
+intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
+                           int target, int refclk, intel_clock_t *best_clock)
+
+{
+       struct drm_device *dev = crtc->dev;
+       intel_clock_t clock;
+       int err = target;
+       bool found = false;
+
+       memcpy(&clock, best_clock, sizeof(intel_clock_t));
+
+       for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
+               for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++) {
+                       /* m1 is always 0 in IGD */
+                       if (clock.m2 >= clock.m1 && !IS_IGD(dev))
+                               break;
+                       for (clock.n = limit->n.min; clock.n <= limit->n.max;
+                            clock.n++) {
+                               int this_err;
+
+                               intel_clock(dev, refclk, &clock);
+
+                               if (!intel_PLL_is_valid(crtc, &clock))
+                                       continue;
+
+                               this_err = abs(clock.dot - target);
+                               if (this_err < err) {
+                                       *best_clock = clock;
+                                       err = this_err;
+                                       found = true;
+                               }
+                       }
+               }
+       }
+
+       return found;
+}
+
 static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                        int target, int refclk, intel_clock_t *best_clock)
@@ -747,7 +804,7 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
        max_n = limit->n.max;
        /* based on hardware requriment prefer smaller n to precision */
        for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
-               /* based on hardware requirment prefere larger m1,m2, p1 */
+               /* based on hardware requirment prefere larger m1,m2 */
                for (clock.m1 = limit->m1.max;
                     clock.m1 >= limit->m1.min; clock.m1--) {
                        for (clock.m2 = limit->m2.max;
@@ -832,15 +889,14 @@ intel_igdng_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
 
        memset(best_clock, 0, sizeof(*best_clock));
        max_n = limit->n.max;
-       /* based on hardware requriment prefer smaller n to precision */
-       for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
-               /* based on hardware requirment prefere larger m1,m2, p1 */
-               for (clock.m1 = limit->m1.max;
-                    clock.m1 >= limit->m1.min; clock.m1--) {
-                       for (clock.m2 = limit->m2.max;
-                            clock.m2 >= limit->m2.min; clock.m2--) {
-                               for (clock.p1 = limit->p1.max;
-                                    clock.p1 >= limit->p1.min; clock.p1--) {
+       for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
+               /* based on hardware requriment prefer smaller n to precision */
+               for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
+                       /* based on hardware requirment prefere larger m1,m2 */
+                       for (clock.m1 = limit->m1.max;
+                            clock.m1 >= limit->m1.min; clock.m1--) {
+                               for (clock.m2 = limit->m2.max;
+                                    clock.m2 >= limit->m2.min; clock.m2--) {
                                        int this_err;
 
                                        intel_clock(dev, refclk, &clock);
@@ -1008,6 +1064,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                        dspcntr &= ~DISPPLANE_TILED;
        }
 
+       if (IS_IGDNG(dev))
+               /* must disable */
+               dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
+
        I915_WRITE(dspcntr_reg, dspcntr);
 
        Start = obj_priv->gtt_offset;
@@ -1030,8 +1090,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 
        if (old_fb) {
                intel_fb = to_intel_framebuffer(old_fb);
+               obj_priv = intel_fb->obj->driver_private;
                i915_gem_object_unpin(intel_fb->obj);
        }
+       intel_increase_pllclock(crtc, true);
+
        mutex_unlock(&dev->struct_mutex);
 
        if (!dev->primary->master)
@@ -1581,6 +1644,8 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
        else
                i9xx_crtc_dpms(crtc, mode);
 
+       intel_crtc->dpms_mode = mode;
+
        if (!dev->primary->master)
                return;
 
@@ -1603,8 +1668,6 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
                DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
                break;
        }
-
-       intel_crtc->dpms_mode = mode;
 }
 
 static void intel_crtc_prepare (struct drm_crtc *crtc)
@@ -2054,6 +2117,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
        return size;
 }
 
+static void g4x_update_wm(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       u32 fw_blc_self = I915_READ(FW_BLC_SELF);
+
+       if (i915_powersave)
+               fw_blc_self |= FW_BLC_SELF_EN;
+       else
+               fw_blc_self &= ~FW_BLC_SELF_EN;
+       I915_WRITE(FW_BLC_SELF, fw_blc_self);
+}
+
 static void i965_update_wm(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2105,7 +2180,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
        cwm = 2;
 
        /* Calc sr entries for one plane configs */
-       if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
+       if (HAS_FW_BLC(dev) && sr_hdisplay &&
+           (!planea_clock || !planeb_clock)) {
                /* self-refresh has much higher latency */
                const static int sr_latency_ns = 6000;
 
@@ -2120,8 +2196,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
                srwm = total_size - sr_entries;
                if (srwm < 0)
                        srwm = 1;
-               if (IS_I9XX(dev))
-                       I915_WRITE(FW_BLC_SELF, (srwm & 0x3f));
+               I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
        }
 
        DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
@@ -2195,9 +2270,6 @@ static void intel_update_watermarks(struct drm_device *dev)
        unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
        int enabled = 0, pixel_size = 0;
 
-       if (DSPARB_HWCONTROL(dev))
-               return;
-
        /* Get the clock config from both planes */
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                intel_crtc = to_intel_crtc(crtc);
@@ -2230,7 +2302,9 @@ static void intel_update_watermarks(struct drm_device *dev)
        else if (IS_IGD(dev))
                igd_disable_cxsr(dev);
 
-       if (IS_I965G(dev))
+       if (IS_G4X(dev))
+               g4x_update_wm(dev);
+       else if (IS_I965G(dev))
                i965_update_wm(dev);
        else if (IS_I9XX(dev) || IS_MOBILE(dev))
                i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
@@ -2264,9 +2338,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
        int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
        int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
        int refclk, num_outputs = 0;
-       intel_clock_t clock;
-       u32 dpll = 0, fp = 0, dspcntr, pipeconf;
-       bool ok, is_sdvo = false, is_dvo = false;
+       intel_clock_t clock, reduced_clock;
+       u32 dpll = 0, fp = 0, fp2 = 0, dspcntr, pipeconf;
+       bool ok, has_reduced_clock = false, is_sdvo = false, is_dvo = false;
        bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false;
        bool is_edp = false;
        struct drm_mode_config *mode_config = &dev->mode_config;
@@ -2349,6 +2423,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                return -EINVAL;
        }
 
+       if (limit->find_reduced_pll && dev_priv->lvds_downclock_avail) {
+               memcpy(&reduced_clock, &clock, sizeof(intel_clock_t));
+               has_reduced_clock = limit->find_reduced_pll(limit, crtc,
+                                                           (adjusted_mode->clock*3/4),
+                                                           refclk,
+                                                           &reduced_clock);
+       }
+
        /* SDVO TV has fixed PLL values depend on its clock range,
           this mirrors vbios setting. */
        if (is_sdvo && is_tv) {
@@ -2394,10 +2476,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                                  link_bw, &m_n);
        }
 
-       if (IS_IGD(dev))
+       if (IS_IGD(dev)) {
                fp = (1 << clock.n) << 16 | clock.m1 << 8 | clock.m2;
-       else
+               if (has_reduced_clock)
+                       fp2 = (1 << reduced_clock.n) << 16 |
+                               reduced_clock.m1 << 8 | reduced_clock.m2;
+       } else {
                fp = clock.n << 16 | clock.m1 << 8 | clock.m2;
+               if (has_reduced_clock)
+                       fp2 = reduced_clock.n << 16 | reduced_clock.m1 << 8 |
+                               reduced_clock.m2;
+       }
 
        if (!IS_IGDNG(dev))
                dpll = DPLL_VGA_MODE_DIS;
@@ -2426,6 +2515,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                        /* also FPA1 */
                        if (IS_IGDNG(dev))
                                dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
+                       if (IS_G4X(dev) && has_reduced_clock)
+                               dpll |= (1 << (reduced_clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
                }
                switch (clock.p2) {
                case 5:
@@ -2573,6 +2664,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                udelay(150);
        }
 
+       if (is_lvds && has_reduced_clock && i915_powersave) {
+               I915_WRITE(fp_reg + 4, fp2);
+               intel_crtc->lowfreq_avail = true;
+               if (HAS_PIPE_CXSR(dev)) {
+                       DRM_DEBUG("enabling CxSR downclocking\n");
+                       pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
+               }
+       } else {
+               I915_WRITE(fp_reg + 4, fp);
+               intel_crtc->lowfreq_avail = false;
+               if (HAS_PIPE_CXSR(dev)) {
+                       DRM_DEBUG("disabling CxSR downclocking\n");
+                       pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK;
+               }
+       }
+
        I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
                   ((adjusted_mode->crtc_htotal - 1) << 16));
        I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
@@ -2616,6 +2723,12 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 
        intel_wait_for_vblank(dev);
 
+       if (IS_IGDNG(dev)) {
+               /* enable address swizzle for tiling buffer */
+               temp = I915_READ(DISP_ARB_CTL);
+               I915_WRITE(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);
+       }
+
        I915_WRITE(dspcntr_reg, dspcntr);
 
        /* Flush the plane changes */
@@ -2769,10 +2882,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
        struct drm_device *dev = crtc->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+       struct intel_framebuffer *intel_fb;
        int pipe = intel_crtc->pipe;
        uint32_t temp = 0;
        uint32_t adder;
 
+       if (crtc->fb) {
+               intel_fb = to_intel_framebuffer(crtc->fb);
+               intel_mark_busy(dev, intel_fb->obj);
+       }
+
        if (x < 0) {
                temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
                x = -x;
@@ -3070,12 +3189,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
        return mode;
 }
 
+#define GPU_IDLE_TIMEOUT 500 /* ms */
+
+/* When this timer fires, we've been idle for awhile */
+static void intel_gpu_idle_timer(unsigned long arg)
+{
+       struct drm_device *dev = (struct drm_device *)arg;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+
+       DRM_DEBUG("idle timer fired, downclocking\n");
+
+       dev_priv->busy = false;
+
+       queue_work(dev_priv->wq, &dev_priv->idle_work);
+}
+
+void intel_increase_renderclock(struct drm_device *dev, bool schedule)
+{
+       drm_i915_private_t *dev_priv = dev->dev_private;
+
+       if (IS_IGDNG(dev))
+               return;
+
+       if (!dev_priv->render_reclock_avail) {
+               DRM_DEBUG("not reclocking render clock\n");
+               return;
+       }
+
+       /* Restore render clock frequency to original value */
+       if (IS_G4X(dev) || IS_I9XX(dev))
+               pci_write_config_word(dev->pdev, GCFGC, dev_priv->orig_clock);
+       else if (IS_I85X(dev))
+               pci_write_config_word(dev->pdev, HPLLCC, dev_priv->orig_clock);
+       DRM_DEBUG("increasing render clock frequency\n");
+
+       /* Schedule downclock */
+       if (schedule)
+               mod_timer(&dev_priv->idle_timer, jiffies +
+                         msecs_to_jiffies(GPU_IDLE_TIMEOUT));
+}
+
+void intel_decrease_renderclock(struct drm_device *dev)
+{
+       drm_i915_private_t *dev_priv = dev->dev_private;
+
+       if (IS_IGDNG(dev))
+               return;
+
+       if (!dev_priv->render_reclock_avail) {
+               DRM_DEBUG("not reclocking render clock\n");
+               return;
+       }
+
+       if (IS_G4X(dev)) {
+               u16 gcfgc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+               /* Down to minimum... */
+               gcfgc &= ~GM45_GC_RENDER_CLOCK_MASK;
+               gcfgc |= GM45_GC_RENDER_CLOCK_266_MHZ;
+
+               pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+       } else if (IS_I965G(dev)) {
+               u16 gcfgc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+               /* Down to minimum... */
+               gcfgc &= ~I965_GC_RENDER_CLOCK_MASK;
+               gcfgc |= I965_GC_RENDER_CLOCK_267_MHZ;
+
+               pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+       } else if (IS_I945G(dev) || IS_I945GM(dev)) {
+               u16 gcfgc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+               /* Down to minimum... */
+               gcfgc &= ~I945_GC_RENDER_CLOCK_MASK;
+               gcfgc |= I945_GC_RENDER_CLOCK_166_MHZ;
+
+               pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+       } else if (IS_I915G(dev)) {
+               u16 gcfgc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+               /* Down to minimum... */
+               gcfgc &= ~I915_GC_RENDER_CLOCK_MASK;
+               gcfgc |= I915_GC_RENDER_CLOCK_166_MHZ;
+
+               pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+       } else if (IS_I85X(dev)) {
+               u16 hpllcc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, HPLLCC, &hpllcc);
+
+               /* Up to maximum... */
+               hpllcc &= ~GC_CLOCK_CONTROL_MASK;
+               hpllcc |= GC_CLOCK_133_200;
+
+               pci_write_config_word(dev->pdev, HPLLCC, hpllcc);
+       }
+       DRM_DEBUG("decreasing render clock frequency\n");
+}
+
+/* Note that no increase function is needed for this - increase_renderclock()
+ *  will also rewrite these bits
+ */
+void intel_decrease_displayclock(struct drm_device *dev)
+{
+       if (IS_IGDNG(dev))
+               return;
+
+       if (IS_I945G(dev) || IS_I945GM(dev) || IS_I915G(dev) ||
+           IS_I915GM(dev)) {
+               u16 gcfgc;
+
+               /* Adjust render clock... */
+               pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+               /* Down to minimum... */
+               gcfgc &= ~0xf0;
+               gcfgc |= 0x80;
+
+               pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+       }
+}
+
+#define CRTC_IDLE_TIMEOUT 1000 /* ms */
+
+static void intel_crtc_idle_timer(unsigned long arg)
+{
+       struct intel_crtc *intel_crtc = (struct intel_crtc *)arg;
+       struct drm_crtc *crtc = &intel_crtc->base;
+       drm_i915_private_t *dev_priv = crtc->dev->dev_private;
+
+       DRM_DEBUG("idle timer fired, downclocking\n");
+
+       intel_crtc->busy = false;
+
+       queue_work(dev_priv->wq, &dev_priv->idle_work);
+}
+
+static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule)
+{
+       struct drm_device *dev = crtc->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+       int pipe = intel_crtc->pipe;
+       int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+       int dpll = I915_READ(dpll_reg);
+
+       if (IS_IGDNG(dev))
+               return;
+
+       if (!dev_priv->lvds_downclock_avail)
+               return;
+
+       if (!HAS_PIPE_CXSR(dev) && (dpll & DISPLAY_RATE_SELECT_FPA1)) {
+               DRM_DEBUG("upclocking LVDS\n");
+
+               /* Unlock panel regs */
+               I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+
+               dpll &= ~DISPLAY_RATE_SELECT_FPA1;
+               I915_WRITE(dpll_reg, dpll);
+               dpll = I915_READ(dpll_reg);
+               intel_wait_for_vblank(dev);
+               dpll = I915_READ(dpll_reg);
+               if (dpll & DISPLAY_RATE_SELECT_FPA1)
+                       DRM_DEBUG("failed to upclock LVDS!\n");
+
+               /* ...and lock them again */
+               I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);
+       }
+
+       /* Schedule downclock */
+       if (schedule)
+               mod_timer(&intel_crtc->idle_timer, jiffies +
+                         msecs_to_jiffies(CRTC_IDLE_TIMEOUT));
+}
+
+static void intel_decrease_pllclock(struct drm_crtc *crtc)
+{
+       struct drm_device *dev = crtc->dev;
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+       int pipe = intel_crtc->pipe;
+       int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+       int dpll = I915_READ(dpll_reg);
+
+       if (IS_IGDNG(dev))
+               return;
+
+       if (!dev_priv->lvds_downclock_avail)
+               return;
+
+       /*
+        * Since this is called by a timer, we should never get here in
+        * the manual case.
+        */
+       if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
+               DRM_DEBUG("downclocking LVDS\n");
+
+               /* Unlock panel regs */
+               I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+
+               dpll |= DISPLAY_RATE_SELECT_FPA1;
+               I915_WRITE(dpll_reg, dpll);
+               dpll = I915_READ(dpll_reg);
+               intel_wait_for_vblank(dev);
+               dpll = I915_READ(dpll_reg);
+               if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
+                       DRM_DEBUG("failed to downclock LVDS!\n");
+
+               /* ...and lock them again */
+               I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);
+       }
+
+}
+
+/**
+ * intel_idle_update - adjust clocks for idleness
+ * @work: work struct
+ *
+ * Either the GPU or display (or both) went idle.  Check the busy status
+ * here and adjust the CRTC and GPU clocks as necessary.
+ */
+static void intel_idle_update(struct work_struct *work)
+{
+       drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
+                                                   idle_work);
+       struct drm_device *dev = dev_priv->dev;
+       struct drm_crtc *crtc;
+       struct intel_crtc *intel_crtc;
+
+       if (!i915_powersave)
+               return;
+
+       mutex_lock(&dev->struct_mutex);
+
+       /* GPU isn't processing, downclock it. */
+       if (!dev_priv->busy) {
+               intel_decrease_renderclock(dev);
+               intel_decrease_displayclock(dev);
+       }
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               /* Skip inactive CRTCs */
+               if (!crtc->fb)
+                       continue;
+
+               intel_crtc = to_intel_crtc(crtc);
+               if (!intel_crtc->busy)
+                       intel_decrease_pllclock(crtc);
+       }
+
+       mutex_unlock(&dev->struct_mutex);
+}
+
+/**
+ * intel_mark_busy - mark the GPU and possibly the display busy
+ * @dev: drm device
+ * @obj: object we're operating on
+ *
+ * Callers can use this function to indicate that the GPU is busy processing
+ * commands.  If @obj matches one of the CRTC objects (i.e. it's a scanout
+ * buffer), we'll also mark the display as busy, so we know to increase its
+ * clock frequency.
+ */
+void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj)
+{
+       drm_i915_private_t *dev_priv = dev->dev_private;
+       struct drm_crtc *crtc = NULL;
+       struct intel_framebuffer *intel_fb;
+       struct intel_crtc *intel_crtc;
+
+       if (!drm_core_check_feature(dev, DRIVER_MODESET))
+               return;
+
+       dev_priv->busy = true;
+       intel_increase_renderclock(dev, true);
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               if (!crtc->fb)
+                       continue;
+
+               intel_crtc = to_intel_crtc(crtc);
+               intel_fb = to_intel_framebuffer(crtc->fb);
+               if (intel_fb->obj == obj) {
+                       if (!intel_crtc->busy) {
+                               /* Non-busy -> busy, upclock */
+                               intel_increase_pllclock(crtc, true);
+                               intel_crtc->busy = true;
+                       } else {
+                               /* Busy -> busy, put off timer */
+                               mod_timer(&intel_crtc->idle_timer, jiffies +
+                                         msecs_to_jiffies(CRTC_IDLE_TIMEOUT));
+                       }
+               }
+       }
+}
+
 static void intel_crtc_destroy(struct drm_crtc *crtc)
 {
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
-       if (intel_crtc->mode_set.mode)
-               drm_mode_destroy(crtc->dev, intel_crtc->mode_set.mode);
        drm_crtc_cleanup(crtc);
        kfree(intel_crtc);
 }
@@ -3122,15 +3548,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
        intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
        drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
 
-       intel_crtc->mode_set.crtc = &intel_crtc->base;
-       intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1);
-       intel_crtc->mode_set.num_connectors = 0;
-
-       if (i915_fbpercrtc) {
+       intel_crtc->busy = false;
 
-
-
-       }
+       setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,
+                   (unsigned long)intel_crtc);
 }
 
 int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
@@ -3138,30 +3559,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
        struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;
-       struct drm_crtc *crtc = NULL;
-       int pipe = -1;
+       struct drm_mode_object *drmmode_obj;
+       struct intel_crtc *crtc;
 
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
 
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-               if (crtc->base.id == pipe_from_crtc_id->crtc_id) {
-                       pipe = intel_crtc->pipe;
-                       break;
-               }
-       }
+       drmmode_obj = drm_mode_object_find(dev, pipe_from_crtc_id->crtc_id,
+                       DRM_MODE_OBJECT_CRTC);
 
-       if (pipe == -1) {
+       if (!drmmode_obj) {
                DRM_ERROR("no such CRTC id\n");
                return -EINVAL;
        }
 
-       pipe_from_crtc_id->pipe = pipe;
+       crtc = to_intel_crtc(obj_to_crtc(drmmode_obj));
+       pipe_from_crtc_id->pipe = crtc->pipe;
 
-       return 0;
+       return 0;
 }
 
 struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
@@ -3362,8 +3779,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
        .fb_changed = intelfb_probe,
 };
 
+void intel_init_clock_gating(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+
+       /*
+        * Disable clock gating reported to work incorrectly according to the
+        * specs, but enable as much else as we can.
+        */
+       if (IS_G4X(dev)) {
+               uint32_t dspclk_gate;
+               I915_WRITE(RENCLK_GATE_D1, 0);
+               I915_WRITE(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |
+                      GS_UNIT_CLOCK_GATE_DISABLE |
+                      CL_UNIT_CLOCK_GATE_DISABLE);
+               I915_WRITE(RAMCLK_GATE_D, 0);
+               dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE |
+                       OVRUNIT_CLOCK_GATE_DISABLE |
+                       OVCUNIT_CLOCK_GATE_DISABLE;
+               if (IS_GM45(dev))
+                       dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE;
+               I915_WRITE(DSPCLK_GATE_D, dspclk_gate);
+       } else if (IS_I965GM(dev)) {
+               I915_WRITE(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
+               I915_WRITE(RENCLK_GATE_D2, 0);
+               I915_WRITE(DSPCLK_GATE_D, 0);
+               I915_WRITE(RAMCLK_GATE_D, 0);
+               I915_WRITE16(DEUC, 0);
+       } else if (IS_I965G(dev)) {
+               I915_WRITE(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
+                      I965_RCC_CLOCK_GATE_DISABLE |
+                      I965_RCPB_CLOCK_GATE_DISABLE |
+                      I965_ISC_CLOCK_GATE_DISABLE |
+                      I965_FBC_CLOCK_GATE_DISABLE);
+               I915_WRITE(RENCLK_GATE_D2, 0);
+       } else if (IS_I9XX(dev)) {
+               u32 dstate = I915_READ(D_STATE);
+
+               dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |
+                       DSTATE_DOT_CLOCK_GATING;
+               I915_WRITE(D_STATE, dstate);
+       } else if (IS_I855(dev) || IS_I865G(dev)) {
+               I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
+       } else if (IS_I830(dev)) {
+               I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
+       }
+}
+
 void intel_modeset_init(struct drm_device *dev)
 {
+       struct drm_i915_private *dev_priv = dev->dev_private;
        int num_pipe;
        int i;
 
@@ -3398,15 +3863,47 @@ void intel_modeset_init(struct drm_device *dev)
        DRM_DEBUG("%d display pipe%s available.\n",
                  num_pipe, num_pipe > 1 ? "s" : "");
 
+       if (IS_I85X(dev))
+               pci_read_config_word(dev->pdev, HPLLCC, &dev_priv->orig_clock);
+       else if (IS_I9XX(dev) || IS_G4X(dev))
+               pci_read_config_word(dev->pdev, GCFGC, &dev_priv->orig_clock);
+
        for (i = 0; i < num_pipe; i++) {
                intel_crtc_init(dev, i);
        }
 
        intel_setup_outputs(dev);
+
+       intel_init_clock_gating(dev);
+
+       INIT_WORK(&dev_priv->idle_work, intel_idle_update);
+       setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer,
+                   (unsigned long)dev);
 }
 
 void intel_modeset_cleanup(struct drm_device *dev)
 {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct drm_crtc *crtc;
+       struct intel_crtc *intel_crtc;
+
+       mutex_lock(&dev->struct_mutex);
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               /* Skip inactive CRTCs */
+               if (!crtc->fb)
+                       continue;
+
+               intel_crtc = to_intel_crtc(crtc);
+               intel_increase_pllclock(crtc, false);
+               del_timer_sync(&intel_crtc->idle_timer);
+       }
+
+       intel_increase_renderclock(dev, false);
+       del_timer_sync(&dev_priv->idle_timer);
+
+       mutex_unlock(&dev->struct_mutex);
+
        drm_mode_config_cleanup(dev);
 }
 
@@ -3420,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
 
        return &intel_output->enc;
 }
+
+/*
+ * set vga decode state - true == enable VGA decode
+ */
+int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       u16 gmch_ctrl;
+
+       pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
+       if (state)
+               gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE;
+       else
+               gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
+       pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
+       return 0;
+}
index 2b914d7..f4856a5 100644 (file)
@@ -232,7 +232,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,
        for (try = 0; try < 5; try++) {
                /* Load the send data into the aux channel data registers */
                for (i = 0; i < send_bytes; i += 4) {
-                       uint32_t    d = pack_aux(send + i, send_bytes - i);;
+                       uint32_t    d = pack_aux(send + i, send_bytes - i);
        
                        I915_WRITE(ch_data + i, d);
                }
index 26a6227..3ebbbab 100644 (file)
@@ -117,9 +117,9 @@ struct intel_crtc {
        uint32_t cursor_addr;
        u8 lut_r[256], lut_g[256], lut_b[256];
        int dpms_mode;
-       struct intel_framebuffer *fbdev_fb;
-       /* a mode_set for fbdev users on this crtc */
-       struct drm_mode_set mode_set;
+       bool busy; /* is scanout buffer being updated frequently? */
+       struct timer_list idle_timer;
+       bool lowfreq_avail;
 };
 
 #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
@@ -138,6 +138,7 @@ extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
 extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
 extern void intel_dvo_init(struct drm_device *dev);
 extern void intel_tv_init(struct drm_device *dev);
+extern void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj);
 extern void intel_lvds_init(struct drm_device *dev);
 extern void intel_dp_init(struct drm_device *dev, int dp_reg);
 void
@@ -178,4 +179,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
                                    struct drm_mode_fb_cmd *mode_cmd,
                                    struct drm_framebuffer **fb,
                                    struct drm_gem_object *obj);
+
 #endif /* __INTEL_DRV_H__ */
index 1d30802..7ba4a23 100644 (file)
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
+#include "drm_fb_helper.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
 struct intelfb_par {
-       struct drm_device *dev;
-       struct drm_display_mode *our_mode;
+       struct drm_fb_helper helper;
        struct intel_framebuffer *intel_fb;
-       int crtc_count;
-       /* crtc currently bound to this */
-       uint32_t crtc_ids[2];
+       struct drm_display_mode *our_mode;
 };
 
-static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                       unsigned blue, unsigned transp,
-                       struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-               struct drm_mode_set *modeset = &intel_crtc->mode_set;
-               struct drm_framebuffer *fb = modeset->fb;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               if (i == par->crtc_count)
-                       continue;
-
-
-               if (regno > 255)
-                       return 1;
-
-               if (fb->depth == 8) {
-                       intel_crtc_fb_gamma_set(crtc, red, green, blue, regno);
-                       return 0;
-               }
-
-               if (regno < 16) {
-                       switch (fb->depth) {
-                       case 15:
-                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
-                                       ((green & 0xf800) >>  6) |
-                                       ((blue & 0xf800) >> 11);
-                               break;
-                       case 16:
-                               fb->pseudo_palette[regno] = (red & 0xf800) |
-                                       ((green & 0xfc00) >>  5) |
-                                       ((blue  & 0xf800) >> 11);
-                               break;
-                       case 24:
-                       case 32:
-                               fb->pseudo_palette[regno] = ((red & 0xff00) << 8) |
-                                       (green & 0xff00) |
-                                       ((blue  & 0xff00) >> 8);
-                               break;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int intelfb_check_var(struct fb_var_screeninfo *var,
-                       struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct intel_framebuffer *intel_fb = par->intel_fb;
-       struct drm_framebuffer *fb = &intel_fb->base;
-       int depth;
-
-       if (var->pixclock == -1 || !var->pixclock)
-               return -EINVAL;
-
-       /* Need to resize the fb object !!! */
-       if (var->xres > fb->width || var->yres > fb->height) {
-               DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height);
-               DRM_ERROR("Need resizing code.\n");
-               return -EINVAL;
-       }
-
-       switch (var->bits_per_pixel) {
-       case 16:
-               depth = (var->green.length == 6) ? 16 : 15;
-               break;
-       case 32:
-               depth = (var->transp.length > 0) ? 32 : 24;
-               break;
-       default:
-               depth = var->bits_per_pixel;
-               break;
-       }
-
-       switch (depth) {
-       case 8:
-               var->red.offset = 0;
-               var->green.offset = 0;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 15:
-               var->red.offset = 10;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 5;
-               var->blue.length = 5;
-               var->transp.length = 1;
-               var->transp.offset = 15;
-               break;
-       case 16:
-               var->red.offset = 11;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 6;
-               var->blue.length = 5;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 24:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 24;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-/* this will let fbcon do the mode init */
-/* FIXME: take mode config lock? */
-static int intelfb_set_par(struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct fb_var_screeninfo *var = &info->var;
-       int i;
-
-       DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
-
-       if (var->pixclock != -1) {
-
-               DRM_ERROR("PIXEL CLOCK SET\n");
-               return -EINVAL;
-       } else {
-               struct drm_crtc *crtc;
-               int ret;
-
-               list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
-                       for (i = 0; i < par->crtc_count; i++)
-                               if (crtc->base.id == par->crtc_ids[i])
-                                       break;
-
-                       if (i == par->crtc_count)
-                               continue;
-
-                       if (crtc->fb == intel_crtc->mode_set.fb) {
-                               mutex_lock(&dev->mode_config.mutex);
-                               ret = crtc->funcs->set_config(&intel_crtc->mode_set);
-                               mutex_unlock(&dev->mode_config.mutex);
-                               if (ret)
-                                       return ret;
-                       }
-               }
-               return 0;
-       }
-}
-
-static int intelfb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_mode_set *modeset;
-       struct drm_crtc *crtc;
-       struct intel_crtc *intel_crtc;
-       int ret = 0;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               if (i == par->crtc_count)
-                       continue;
-
-               intel_crtc = to_intel_crtc(crtc);
-               modeset = &intel_crtc->mode_set;
-
-               modeset->x = var->xoffset;
-               modeset->y = var->yoffset;
-
-               if (modeset->num_connectors) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(modeset);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (!ret) {
-                               info->var.xoffset = var->xoffset;
-                               info->var.yoffset = var->yoffset;
-                       }
-               }
-       }
-
-       return ret;
-}
-
-static void intelfb_on(struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-                               encoder_funcs = encoder->helper_private;
-                               encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-                       }
-               }
-       }
-}
-
-static void intelfb_off(struct fb_info *info, int dpms_mode)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-                               encoder_funcs = encoder->helper_private;
-                               encoder_funcs->dpms(encoder, dpms_mode);
-                       }
-               }
-               if (dpms_mode == DRM_MODE_DPMS_OFF)
-                       crtc_funcs->dpms(crtc, dpms_mode);
-       }
-}
-
-static int intelfb_blank(int blank, struct fb_info *info)
-{
-       switch (blank) {
-       case FB_BLANK_UNBLANK:
-               intelfb_on(info);
-               break;
-       case FB_BLANK_NORMAL:
-               intelfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_HSYNC_SUSPEND:
-               intelfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-               intelfb_off(info, DRM_MODE_DPMS_SUSPEND);
-               break;
-       case FB_BLANK_POWERDOWN:
-               intelfb_off(info, DRM_MODE_DPMS_OFF);
-               break;
-       }
-       return 0;
-}
-
 static struct fb_ops intelfb_ops = {
        .owner = THIS_MODULE,
-       .fb_check_var = intelfb_check_var,
-       .fb_set_par = intelfb_set_par,
-       .fb_setcolreg = intelfb_setcolreg,
+       .fb_check_var = drm_fb_helper_check_var,
+       .fb_set_par = drm_fb_helper_set_par,
+       .fb_setcolreg = drm_fb_helper_setcolreg,
        .fb_fillrect = cfb_fillrect,
        .fb_copyarea = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_pan_display = intelfb_pan_display,
-       .fb_blank = intelfb_blank,
+       .fb_pan_display = drm_fb_helper_pan_display,
+       .fb_blank = drm_fb_helper_blank,
 };
 
+static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
+       .gamma_set = intel_crtc_fb_gamma_set,
+};
+
+
 /**
  * Curretly it is assumed that the old framebuffer is reused.
  *
@@ -412,25 +107,10 @@ int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(intelfb_resize);
 
-static struct drm_mode_set kernelfb_mode;
-
-static int intelfb_panic(struct notifier_block *n, unsigned long ununsed,
-                        void *panic_str)
-{
-       DRM_ERROR("panic occurred, switching back to text console\n");
-
-       intelfb_restore();
-       return 0;
-}
-
-static struct notifier_block paniced = {
-       .notifier_call = intelfb_panic,
-};
-
 static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
                          uint32_t fb_height, uint32_t surface_width,
                          uint32_t surface_height,
-                         struct intel_framebuffer **intel_fb_p)
+                         struct drm_framebuffer **fb_p)
 {
        struct fb_info *info;
        struct intelfb_par *par;
@@ -479,7 +159,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
        list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
 
        intel_fb = to_intel_framebuffer(fb);
-       *intel_fb_p = intel_fb;
+       *fb_p = fb;
 
        info = framebuffer_alloc(sizeof(struct intelfb_par), device);
        if (!info) {
@@ -489,21 +169,19 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
 
        par = info->par;
 
+       par->helper.funcs = &intel_fb_helper_funcs;
+       par->helper.dev = dev;
+       ret = drm_fb_helper_init_crtc_count(&par->helper, 2,
+                                           INTELFB_CONN_LIMIT);
+       if (ret)
+               goto out_unref;
+
        strcpy(info->fix.id, "inteldrmfb");
-       info->fix.type = FB_TYPE_PACKED_PIXELS;
-       info->fix.visual = FB_VISUAL_TRUECOLOR;
-       info->fix.type_aux = 0;
-       info->fix.xpanstep = 1; /* doing it in hw */
-       info->fix.ypanstep = 1; /* doing it in hw */
-       info->fix.ywrapstep = 0;
-       info->fix.accel = FB_ACCEL_I830;
-       info->fix.type_aux = 0;
 
        info->flags = FBINFO_DEFAULT;
 
        info->fbops = &intelfb_ops;
 
-       info->fix.line_length = fb->pitch;
 
        /* setup aperture base/size for vesafb takeover */
        info->aperture_base = dev->mode_config.fb_base;
@@ -527,18 +205,8 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
 
 //     memset(info->screen_base, 0, size);
 
-       info->pseudo_palette = fb->pseudo_palette;
-       info->var.xres_virtual = fb->width;
-       info->var.yres_virtual = fb->height;
-       info->var.bits_per_pixel = fb->bits_per_pixel;
-       info->var.xoffset = 0;
-       info->var.yoffset = 0;
-       info->var.activate = FB_ACTIVATE_NOW;
-       info->var.height = -1;
-       info->var.width = -1;
-
-       info->var.xres = fb_width;
-       info->var.yres = fb_height;
+       drm_fb_helper_fill_fix(info, fb->pitch);
+       drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
 
        /* FIXME: we really shouldn't expose mmio space at all */
        info->fix.mmio_start = pci_resource_start(dev->pdev, mmio_bar);
@@ -550,64 +218,9 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
        info->pixmap.flags = FB_PIXMAP_SYSTEM;
        info->pixmap.scan_align = 1;
 
-       switch(fb->depth) {
-       case 8:
-               info->var.red.offset = 0;
-               info->var.green.offset = 0;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8; /* 8bit DAC */
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 15:
-               info->var.red.offset = 10;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 5;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 15;
-               info->var.transp.length = 1;
-               break;
-       case 16:
-               info->var.red.offset = 11;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 6;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 0;
-               break;
-       case 24:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 32:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 24;
-               info->var.transp.length = 8;
-               break;
-       default:
-               break;
-       }
-
        fb->fbdev = info;
 
        par->intel_fb = intel_fb;
-       par->dev = dev;
 
        /* To allow resizeing without swapping buffers */
        DRM_DEBUG("allocated %dx%d fb: 0x%08x, bo %p\n", intel_fb->base.width,
@@ -625,307 +238,12 @@ out:
        return ret;
 }
 
-static int intelfb_multi_fb_probe_crtc(struct drm_device *dev, struct drm_crtc *crtc)
-{
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-       struct intel_framebuffer *intel_fb;
-       struct drm_framebuffer *fb;
-       struct drm_connector *connector;
-       struct fb_info *info;
-       struct intelfb_par *par;
-       struct drm_mode_set *modeset;
-       unsigned int width, height;
-       int new_fb = 0;
-       int ret, i, conn_count;
-
-       if (!drm_helper_crtc_in_use(crtc))
-               return 0;
-
-       if (!crtc->desired_mode)
-               return 0;
-
-       width = crtc->desired_mode->hdisplay;
-       height = crtc->desired_mode->vdisplay;
-
-       /* is there an fb bound to this crtc already */
-       if (!intel_crtc->mode_set.fb) {
-               ret = intelfb_create(dev, width, height, width, height, &intel_fb);
-               if (ret)
-                       return -EINVAL;
-               new_fb = 1;
-       } else {
-               fb = intel_crtc->mode_set.fb;
-               intel_fb = to_intel_framebuffer(fb);
-               if ((intel_fb->base.width < width) || (intel_fb->base.height < height))
-                       return -EINVAL;
-       }
-
-       info = intel_fb->base.fbdev;
-       par = info->par;
-
-       modeset = &intel_crtc->mode_set;
-       modeset->fb = &intel_fb->base;
-       conn_count = 0;
-       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-               if (connector->encoder)
-                       if (connector->encoder->crtc == modeset->crtc) {
-                               modeset->connectors[conn_count] = connector;
-                               conn_count++;
-                               if (conn_count > INTELFB_CONN_LIMIT)
-                                       BUG();
-                       }
-       }
-
-       for (i = conn_count; i < INTELFB_CONN_LIMIT; i++)
-               modeset->connectors[i] = NULL;
-
-       par->crtc_ids[0] = crtc->base.id;
-
-       modeset->num_connectors = conn_count;
-       if (modeset->crtc->desired_mode) {
-               if (modeset->mode)
-                       drm_mode_destroy(dev, modeset->mode);
-               modeset->mode = drm_mode_duplicate(dev,
-                                                  modeset->crtc->desired_mode);
-       }
-
-       par->crtc_count = 1;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else
-               intelfb_set_par(info);
-
-       DRM_INFO("fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       kernelfb_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       DRM_DEBUG("registered panic notifier\n");
-
-       return 0;
-}
-
-static int intelfb_multi_fb_probe(struct drm_device *dev)
-{
-
-       struct drm_crtc *crtc;
-       int ret = 0;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               ret = intelfb_multi_fb_probe_crtc(dev, crtc);
-               if (ret)
-                       return ret;
-       }
-       return ret;
-}
-
-static int intelfb_single_fb_probe(struct drm_device *dev)
-{
-       struct drm_crtc *crtc;
-       struct drm_connector *connector;
-       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
-       unsigned int surface_width = 0, surface_height = 0;
-       int new_fb = 0;
-       int crtc_count = 0;
-       int ret, i, conn_count = 0;
-       struct intel_framebuffer *intel_fb;
-       struct fb_info *info;
-       struct intelfb_par *par;
-       struct drm_mode_set *modeset = NULL;
-
-       DRM_DEBUG("\n");
-
-       /* Get a count of crtcs now in use and new min/maxes width/heights */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               if (!drm_helper_crtc_in_use(crtc))
-                       continue;
-
-               crtc_count++;
-               if (!crtc->desired_mode)
-                       continue;
-
-               /* Smallest mode determines console size... */
-               if (crtc->desired_mode->hdisplay < fb_width)
-                       fb_width = crtc->desired_mode->hdisplay;
-
-               if (crtc->desired_mode->vdisplay < fb_height)
-                       fb_height = crtc->desired_mode->vdisplay;
-
-               /* ... but largest for memory allocation dimensions */
-               if (crtc->desired_mode->hdisplay > surface_width)
-                       surface_width = crtc->desired_mode->hdisplay;
-
-               if (crtc->desired_mode->vdisplay > surface_height)
-                       surface_height = crtc->desired_mode->vdisplay;
-       }
-
-       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
-               /* hmm everyone went away - assume VGA cable just fell out
-                  and will come back later. */
-               DRM_DEBUG("no CRTCs available?\n");
-               return 0;
-       }
-
-//fail
-       /* Find the fb for our new config */
-       if (list_empty(&dev->mode_config.fb_kernel_list)) {
-               DRM_DEBUG("creating new fb (console size %dx%d, "
-                         "buffer size %dx%d)\n", fb_width, fb_height,
-                         surface_width, surface_height);
-               ret = intelfb_create(dev, fb_width, fb_height, surface_width,
-                                    surface_height, &intel_fb);
-               if (ret)
-                       return -EINVAL;
-               new_fb = 1;
-       } else {
-               struct drm_framebuffer *fb;
-
-               fb = list_first_entry(&dev->mode_config.fb_kernel_list,
-                                     struct drm_framebuffer, filp_head);
-               intel_fb = to_intel_framebuffer(fb);
-
-               /* if someone hotplugs something bigger than we have already
-                * allocated, we are pwned.  As really we can't resize an
-                * fbdev that is in the wild currently due to fbdev not really
-                * being designed for the lower layers moving stuff around
-                * under it.
-                * - so in the grand style of things - punt.
-                */
-               if ((fb->width < surface_width) ||
-                   (fb->height < surface_height)) {
-                       DRM_ERROR("fb not large enough for console\n");
-                       return -EINVAL;
-               }
-       }
-// fail
-
-       info = intel_fb->base.fbdev;
-       par = info->par;
-
-       crtc_count = 0;
-       /*
-        * For each CRTC, set up the connector list for the CRTC's mode
-        * set configuration.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
-               modeset = &intel_crtc->mode_set;
-               modeset->fb = &intel_fb->base;
-               conn_count = 0;
-               list_for_each_entry(connector, &dev->mode_config.connector_list,
-                                   head) {
-                       if (!connector->encoder)
-                               continue;
-
-                       if(connector->encoder->crtc == modeset->crtc) {
-                               modeset->connectors[conn_count++] = connector;
-                               if (conn_count > INTELFB_CONN_LIMIT)
-                                       BUG();
-                       }
-               }
-
-               /* Zero out remaining connector pointers */
-               for (i = conn_count; i < INTELFB_CONN_LIMIT; i++)
-                       modeset->connectors[i] = NULL;
-
-               par->crtc_ids[crtc_count++] = crtc->base.id;
-
-               modeset->num_connectors = conn_count;
-               if (modeset->crtc->desired_mode) {
-                       if (modeset->mode)
-                               drm_mode_destroy(dev, modeset->mode);
-                       modeset->mode = drm_mode_duplicate(dev,
-                                                          modeset->crtc->desired_mode);
-               }
-       }
-       par->crtc_count = crtc_count;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else
-               intelfb_set_par(info);
-
-       DRM_INFO("fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       kernelfb_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       DRM_DEBUG("registered panic notifier\n");
-
-       return 0;
-}
-
-/**
- * intelfb_restore - restore the framebuffer console (kernel) config
- *
- * Restore's the kernel's fbcon mode, used for lastclose & panic paths.
- */
-void intelfb_restore(void)
-{
-       int ret;
-       if ((ret = drm_crtc_helper_set_config(&kernelfb_mode)) != 0) {
-               DRM_ERROR("Failed to restore crtc configuration: %d\n",
-                         ret);
-       }
-}
-
-static void intelfb_restore_work_fn(struct work_struct *ignored)
-{
-       intelfb_restore();
-}
-static DECLARE_WORK(intelfb_restore_work, intelfb_restore_work_fn);
-
-static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3)
-{
-        schedule_work(&intelfb_restore_work);
-}
-
-static struct sysrq_key_op sysrq_intelfb_restore_op = {
-        .handler = intelfb_sysrq,
-        .help_msg = "force-fb(V)",
-        .action_msg = "Restore framebuffer console",
-};
-
 int intelfb_probe(struct drm_device *dev)
 {
        int ret;
 
        DRM_DEBUG("\n");
-
-       /* something has changed in the lower levels of hell - deal with it
-          here */
-
-       /* two modes : a) 1 fb to rule all crtcs.
-                      b) one fb per crtc.
-          two actions 1) new connected device
-                      2) device removed.
-          case a/1 : if the fb surface isn't big enough - resize the surface fb.
-                     if the fb size isn't big enough - resize fb into surface.
-                     if everything big enough configure the new crtc/etc.
-          case a/2 : undo the configuration
-                     possibly resize down the fb to fit the new configuration.
-           case b/1 : see if it is on a new crtc - setup a new fb and add it.
-          case b/2 : teardown the new fb.
-       */
-
-       /* mode a first */
-       /* search for an fb */
-       if (i915_fbpercrtc == 1) {
-               ret = intelfb_multi_fb_probe(dev);
-       } else {
-               ret = intelfb_single_fb_probe(dev);
-       }
-
-       register_sysrq_key('v', &sysrq_intelfb_restore_op);
-
+       ret = drm_fb_helper_single_fb_probe(dev, intelfb_create);
        return ret;
 }
 EXPORT_SYMBOL(intelfb_probe);
@@ -940,13 +258,14 @@ int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
        info = fb->fbdev;
 
        if (info) {
+               struct intelfb_par *par = info->par;
                unregister_framebuffer(info);
                iounmap(info->screen_base);
+               if (info->par)
+                       drm_fb_helper_free(&par->helper);
                framebuffer_release(info);
        }
 
-       atomic_notifier_chain_unregister(&panic_notifier_list, &paniced);
-       memset(&kernelfb_mode, 0, sizeof(struct drm_mode_set));
        return 0;
 }
 EXPORT_SYMBOL(intelfb_remove);
index 62b8bea..c7eab72 100644 (file)
@@ -42,11 +42,11 @@ void intel_i2c_quirk_set(struct drm_device *dev, bool enable)
        if (!IS_IGD(dev))
                return;
        if (enable)
-               I915_WRITE(CG_2D_DIS,
-                       I915_READ(CG_2D_DIS) | DPCUNIT_CLOCK_GATE_DISABLE);
+               I915_WRITE(DSPCLK_GATE_D,
+                       I915_READ(DSPCLK_GATE_D) | DPCUNIT_CLOCK_GATE_DISABLE);
        else
-               I915_WRITE(CG_2D_DIS,
-                       I915_READ(CG_2D_DIS) & (~DPCUNIT_CLOCK_GATE_DISABLE));
+               I915_WRITE(DSPCLK_GATE_D,
+                       I915_READ(DSPCLK_GATE_D) & (~DPCUNIT_CLOCK_GATE_DISABLE));
 }
 
 /*
index 8df02ef..dafc0da 100644 (file)
 #include "i915_drv.h"
 #include <linux/acpi.h>
 
-#define I915_LVDS "i915_lvds"
-
-/*
- * the following four scaling options are defined.
- * #define DRM_MODE_SCALE_NON_GPU      0
- * #define DRM_MODE_SCALE_FULLSCREEN   1
- * #define DRM_MODE_SCALE_NO_SCALE     2
- * #define DRM_MODE_SCALE_ASPECT       3
- */
-
 /* Private structure for the integrated LVDS support */
 struct intel_lvds_priv {
        int fitting_mode;
@@ -336,7 +326,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
        I915_WRITE(BCLRPAT_B, 0);
 
        switch (lvds_priv->fitting_mode) {
-       case DRM_MODE_SCALE_NO_SCALE:
+       case DRM_MODE_SCALE_CENTER:
                /*
                 * For centered modes, we have to calculate border widths &
                 * heights and modify the values programmed into the CRTC.
@@ -672,9 +662,8 @@ static int intel_lvds_set_property(struct drm_connector *connector,
                                connector->encoder) {
                struct drm_crtc *crtc = connector->encoder->crtc;
                struct intel_lvds_priv *lvds_priv = intel_output->dev_priv;
-               if (value == DRM_MODE_SCALE_NON_GPU) {
-                       DRM_DEBUG_KMS(I915_LVDS,
-                                       "non_GPU property is unsupported\n");
+               if (value == DRM_MODE_SCALE_NONE) {
+                       DRM_DEBUG_KMS("no scaling not supported\n");
                        return 0;
                }
                if (lvds_priv->fitting_mode == value) {
@@ -731,8 +720,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
 
 static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
 {
-       DRM_DEBUG_KMS(I915_LVDS,
-                     "Skipping LVDS initialization for %s\n", id->ident);
+       DRM_DEBUG_KMS("Skipping LVDS initialization for %s\n", id->ident);
        return 1;
 }
 
@@ -1027,7 +1015,7 @@ out:
        return;
 
 failed:
-       DRM_DEBUG_KMS(I915_LVDS, "No LVDS modes found, disabling.\n");
+       DRM_DEBUG_KMS("No LVDS modes found, disabling.\n");
        if (intel_output->ddc_bus)
                intel_i2c_destroy(intel_output->ddc_bus);
        drm_connector_cleanup(connector);
index d3b74ba..0bf28ef 100644 (file)
 #include "intel_sdvo_regs.h"
 
 #undef SDVO_DEBUG
-#define I915_SDVO      "i915_sdvo"
+
+static char *tv_format_names[] = {
+       "NTSC_M"   , "NTSC_J"  , "NTSC_443",
+       "PAL_B"    , "PAL_D"   , "PAL_G"   ,
+       "PAL_H"    , "PAL_I"   , "PAL_M"   ,
+       "PAL_N"    , "PAL_NC"  , "PAL_60"  ,
+       "SECAM_B"  , "SECAM_D" , "SECAM_G" ,
+       "SECAM_K"  , "SECAM_K1", "SECAM_L" ,
+       "SECAM_60"
+};
+
+#define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))
+
 struct intel_sdvo_priv {
        u8 slave_addr;
 
@@ -71,6 +83,15 @@ struct intel_sdvo_priv {
         */
        bool is_tv;
 
+       /* This is for current tv format name */
+       char *tv_format_name;
+
+       /* This contains all current supported TV format */
+       char *tv_format_supported[TV_FORMAT_NUM];
+       int   format_supported_num;
+       struct drm_property *tv_format_property;
+       struct drm_property *tv_format_name_property[TV_FORMAT_NUM];
+
        /**
         * This is set if we treat the device as HDMI, instead of DVI.
         */
@@ -97,14 +118,6 @@ struct intel_sdvo_priv {
         */
        struct intel_sdvo_sdtv_resolution_reply sdtv_resolutions;
 
-       /**
-        * Current selected TV format.
-        *
-        * This is stored in the same structure that's passed to the device, for
-        * convenience.
-        */
-       struct intel_sdvo_tv_format tv_format;
-
        /*
         * supported encoding mode, used to determine whether HDMI is
         * supported
@@ -114,6 +127,9 @@ struct intel_sdvo_priv {
        /* DDC bus used by this SDVO output */
        uint8_t ddc_bus;
 
+       /* Mac mini hack -- use the same DDC as the analog connector */
+       struct i2c_adapter *analog_ddc_bus;
+
        int save_sdvo_mult;
        u16 save_active_outputs;
        struct intel_sdvo_dtd save_input_dtd_1, save_input_dtd_2;
@@ -188,7 +204,7 @@ static bool intel_sdvo_read_byte(struct intel_output *intel_output, u8 addr,
                return true;
        }
 
-       DRM_DEBUG("i2c transfer returned %d\n", ret);
+       DRM_DEBUG_KMS("i2c transfer returned %d\n", ret);
        return false;
 }
 
@@ -298,7 +314,7 @@ static void intel_sdvo_debug_write(struct intel_output *intel_output, u8 cmd,
        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
        int i;
 
-       DRM_DEBUG_KMS(I915_SDVO, "%s: W: %02X ",
+       DRM_DEBUG_KMS("%s: W: %02X ",
                                SDVO_NAME(sdvo_priv), cmd);
        for (i = 0; i < args_len; i++)
                DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
@@ -351,7 +367,7 @@ static void intel_sdvo_debug_response(struct intel_output *intel_output,
        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
        int i;
 
-       DRM_DEBUG_KMS(I915_SDVO, "%s: R: ", SDVO_NAME(sdvo_priv));
+       DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(sdvo_priv));
        for (i = 0; i < response_len; i++)
                DRM_LOG_KMS("%02X ", ((u8 *)response)[i]);
        for (; i < 8; i++)
@@ -668,10 +684,10 @@ static int intel_sdvo_get_clock_rate_mult(struct intel_output *intel_output)
        status = intel_sdvo_read_response(intel_output, &response, 1);
 
        if (status != SDVO_CMD_STATUS_SUCCESS) {
-               DRM_DEBUG("Couldn't get SDVO clock rate multiplier\n");
+               DRM_DEBUG_KMS("Couldn't get SDVO clock rate multiplier\n");
                return SDVO_CLOCK_RATE_MULT_1X;
        } else {
-               DRM_DEBUG("Current clock rate multiplier: %d\n", response);
+               DRM_DEBUG_KMS("Current clock rate multiplier: %d\n", response);
        }
 
        return response;
@@ -945,23 +961,28 @@ static void intel_sdvo_set_avi_infoframe(struct intel_output *output,
 
 static void intel_sdvo_set_tv_format(struct intel_output *output)
 {
+
+       struct intel_sdvo_tv_format format;
        struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
-       struct intel_sdvo_tv_format *format, unset;
-       u8 status;
+       uint32_t format_map, i;
+       uint8_t status;
 
-       format = &sdvo_priv->tv_format;
-       memset(&unset, 0, sizeof(unset));
-       if (memcmp(format, &unset, sizeof(*format))) {
-               DRM_DEBUG("%s: Choosing default TV format of NTSC-M\n",
-                               SDVO_NAME(sdvo_priv));
-               format->ntsc_m = 1;
-               intel_sdvo_write_cmd(output, SDVO_CMD_SET_TV_FORMAT, format,
-                               sizeof(*format));
-               status = intel_sdvo_read_response(output, NULL, 0);
-               if (status != SDVO_CMD_STATUS_SUCCESS)
-                       DRM_DEBUG("%s: Failed to set TV format\n",
-                                       SDVO_NAME(sdvo_priv));
-       }
+       for (i = 0; i < TV_FORMAT_NUM; i++)
+               if (tv_format_names[i] == sdvo_priv->tv_format_name)
+                       break;
+
+       format_map = 1 << i;
+       memset(&format, 0, sizeof(format));
+       memcpy(&format, &format_map, sizeof(format_map) > sizeof(format) ?
+                       sizeof(format) : sizeof(format_map));
+
+       intel_sdvo_write_cmd(output, SDVO_CMD_SET_TV_FORMAT, &format_map,
+                            sizeof(format));
+
+       status = intel_sdvo_read_response(output, NULL, 0);
+       if (status != SDVO_CMD_STATUS_SUCCESS)
+               DRM_DEBUG("%s: Failed to set TV format\n",
+                         SDVO_NAME(sdvo_priv));
 }
 
 static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
@@ -1230,8 +1251,8 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
                 * a given it the status is a success, we succeeded.
                 */
                if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
-                       DRM_DEBUG("First %s output reported failure to sync\n",
-                                  SDVO_NAME(sdvo_priv));
+                       DRM_DEBUG_KMS("First %s output reported failure to "
+                                       "sync\n", SDVO_NAME(sdvo_priv));
                }
 
                if (0)
@@ -1326,8 +1347,8 @@ static void intel_sdvo_restore(struct drm_connector *connector)
                        intel_wait_for_vblank(dev);
                status = intel_sdvo_get_trained_inputs(intel_output, &input1, &input2);
                if (status == SDVO_CMD_STATUS_SUCCESS && !input1)
-                       DRM_DEBUG("First %s output reported failure to sync\n",
-                                  SDVO_NAME(sdvo_priv));
+                       DRM_DEBUG_KMS("First %s output reported failure to "
+                                       "sync\n", SDVO_NAME(sdvo_priv));
        }
 
        intel_sdvo_set_active_outputs(intel_output, sdvo_priv->save_active_outputs);
@@ -1405,7 +1426,7 @@ int intel_sdvo_supports_hotplug(struct drm_connector *connector)
        u8 response[2];
        u8 status;
        struct intel_output *intel_output;
-       DRM_DEBUG("\n");
+       DRM_DEBUG_KMS("\n");
 
        if (!connector)
                return 0;
@@ -1478,6 +1499,36 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output)
        return (caps > 1);
 }
 
+static struct drm_connector *
+intel_find_analog_connector(struct drm_device *dev)
+{
+       struct drm_connector *connector;
+       struct intel_output *intel_output;
+
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               intel_output = to_intel_output(connector);
+               if (intel_output->type == INTEL_OUTPUT_ANALOG)
+                       return connector;
+       }
+       return NULL;
+}
+
+static int
+intel_analog_is_connected(struct drm_device *dev)
+{
+       struct drm_connector *analog_connector;
+       analog_connector = intel_find_analog_connector(dev);
+
+       if (!analog_connector)
+               return false;
+
+       if (analog_connector->funcs->detect(analog_connector) ==
+                       connector_status_disconnected)
+               return false;
+
+       return true;
+}
+
 enum drm_connector_status
 intel_sdvo_hdmi_sink_detect(struct drm_connector *connector, u16 response)
 {
@@ -1488,6 +1539,15 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector, u16 response)
 
        edid = drm_get_edid(&intel_output->base,
                            intel_output->ddc_bus);
+
+       /* when there is no edid and no monitor is connected with VGA
+        * port, try to use the CRT ddc to read the EDID for DVI-connector
+        */
+       if (edid == NULL &&
+           sdvo_priv->analog_ddc_bus &&
+           !intel_analog_is_connected(intel_output->base.dev))
+               edid = drm_get_edid(&intel_output->base,
+                                   sdvo_priv->analog_ddc_bus);
        if (edid != NULL) {
                /* Don't report the output as connected if it's a DVI-I
                 * connector with a non-digital EDID coming out.
@@ -1516,10 +1576,11 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
        struct intel_output *intel_output = to_intel_output(connector);
        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
 
-       intel_sdvo_write_cmd(intel_output, SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0);
+       intel_sdvo_write_cmd(intel_output,
+                            SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0);
        status = intel_sdvo_read_response(intel_output, &response, 2);
 
-       DRM_DEBUG("SDVO response %d %d\n", response & 0xff, response >> 8);
+       DRM_DEBUG_KMS("SDVO response %d %d\n", response & 0xff, response >> 8);
 
        if (status != SDVO_CMD_STATUS_SUCCESS)
                return connector_status_unknown;
@@ -1540,50 +1601,32 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
 static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 {
        struct intel_output *intel_output = to_intel_output(connector);
+       struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+       int num_modes;
 
        /* set the bus switch and get the modes */
-       intel_ddc_get_modes(intel_output);
+       num_modes = intel_ddc_get_modes(intel_output);
 
-#if 0
-       struct drm_device *dev = encoder->dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
-       /* Mac mini hack.  On this device, I get DDC through the analog, which
-        * load-detects as disconnected.  I fail to DDC through the SDVO DDC,
-        * but it does load-detect as connected.  So, just steal the DDC bits
-        * from analog when we fail at finding it the right way.
+       /*
+        * Mac mini hack.  On this device, the DVI-I connector shares one DDC
+        * link between analog and digital outputs. So, if the regular SDVO
+        * DDC fails, check to see if the analog output is disconnected, in
+        * which case we'll look there for the digital DDC data.
         */
-       crt = xf86_config->output[0];
-       intel_output = crt->driver_private;
-       if (intel_output->type == I830_OUTPUT_ANALOG &&
-           crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
-               I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
-               edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
-               xf86DestroyI2CBusRec(intel_output->pDDCBus, true, true);
-       }
-       if (edid_mon) {
-               xf86OutputSetEDID(output, edid_mon);
-               modes = xf86OutputGetEDIDModes(output);
-       }
-#endif
-}
+       if (num_modes == 0 &&
+           sdvo_priv->analog_ddc_bus &&
+           !intel_analog_is_connected(intel_output->base.dev)) {
+               struct i2c_adapter *digital_ddc_bus;
 
-/**
- * This function checks the current TV format, and chooses a default if
- * it hasn't been set.
- */
-static void
-intel_sdvo_check_tv_format(struct intel_output *output)
-{
-       struct intel_sdvo_priv *dev_priv = output->dev_priv;
-       struct intel_sdvo_tv_format format;
-       uint8_t status;
+               /* Switch to the analog ddc bus and try that
+                */
+               digital_ddc_bus = intel_output->ddc_bus;
+               intel_output->ddc_bus = sdvo_priv->analog_ddc_bus;
 
-       intel_sdvo_write_cmd(output, SDVO_CMD_GET_TV_FORMAT, NULL, 0);
-       status = intel_sdvo_read_response(output, &format, sizeof(format));
-       if (status != SDVO_CMD_STATUS_SUCCESS)
-               return;
+               (void) intel_ddc_get_modes(intel_output);
 
-       memcpy(&dev_priv->tv_format, &format, sizeof(format));
+               intel_output->ddc_bus = digital_ddc_bus;
+       }
 }
 
 /*
@@ -1656,17 +1699,26 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
        struct intel_output *output = to_intel_output(connector);
        struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
        struct intel_sdvo_sdtv_resolution_request tv_res;
-       uint32_t reply = 0;
+       uint32_t reply = 0, format_map = 0;
+       int i;
        uint8_t status;
-       int i = 0;
 
-       intel_sdvo_check_tv_format(output);
 
        /* Read the list of supported input resolutions for the selected TV
         * format.
         */
-       memset(&tv_res, 0, sizeof(tv_res));
-       memcpy(&tv_res, &sdvo_priv->tv_format, sizeof(tv_res));
+       for (i = 0; i < TV_FORMAT_NUM; i++)
+               if (tv_format_names[i] ==  sdvo_priv->tv_format_name)
+                       break;
+
+       format_map = (1 << i);
+       memcpy(&tv_res, &format_map,
+              sizeof(struct intel_sdvo_sdtv_resolution_request) >
+              sizeof(format_map) ? sizeof(format_map) :
+              sizeof(struct intel_sdvo_sdtv_resolution_request));
+
+       intel_sdvo_set_target_output(output, sdvo_priv->controlled_output);
+
        intel_sdvo_write_cmd(output, SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT,
                             &tv_res, sizeof(tv_res));
        status = intel_sdvo_read_response(output, &reply, 3);
@@ -1681,6 +1733,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
                        if (nmode)
                                drm_mode_probed_add(connector, nmode);
                }
+
 }
 
 static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
@@ -1748,17 +1801,62 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
                intel_i2c_destroy(intel_output->i2c_bus);
        if (intel_output->ddc_bus)
                intel_i2c_destroy(intel_output->ddc_bus);
+       if (sdvo_priv->analog_ddc_bus)
+               intel_i2c_destroy(sdvo_priv->analog_ddc_bus);
 
        if (sdvo_priv->sdvo_lvds_fixed_mode != NULL)
                drm_mode_destroy(connector->dev,
                                 sdvo_priv->sdvo_lvds_fixed_mode);
 
+       if (sdvo_priv->tv_format_property)
+               drm_property_destroy(connector->dev,
+                                    sdvo_priv->tv_format_property);
+
        drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
 
        kfree(intel_output);
 }
 
+static int
+intel_sdvo_set_property(struct drm_connector *connector,
+                       struct drm_property *property,
+                       uint64_t val)
+{
+       struct intel_output *intel_output = to_intel_output(connector);
+       struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+       struct drm_encoder *encoder = &intel_output->enc;
+       struct drm_crtc *crtc = encoder->crtc;
+       int ret = 0;
+       bool changed = false;
+
+       ret = drm_connector_property_set_value(connector, property, val);
+       if (ret < 0)
+               goto out;
+
+       if (property == sdvo_priv->tv_format_property) {
+               if (val >= TV_FORMAT_NUM) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if (sdvo_priv->tv_format_name ==
+                   sdvo_priv->tv_format_supported[val])
+                       goto out;
+
+               sdvo_priv->tv_format_name = sdvo_priv->tv_format_supported[val];
+               changed = true;
+       } else {
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (changed && crtc)
+               drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
+                               crtc->y, crtc->fb);
+out:
+       return ret;
+}
+
 static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
        .dpms = intel_sdvo_dpms,
        .mode_fixup = intel_sdvo_mode_fixup,
@@ -1773,6 +1871,7 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
        .restore = intel_sdvo_restore,
        .detect = intel_sdvo_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
+       .set_property = intel_sdvo_set_property,
        .destroy = intel_sdvo_destroy,
 };
 
@@ -2013,10 +2112,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
 
                sdvo_priv->controlled_output = 0;
                memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
-               DRM_DEBUG_KMS(I915_SDVO,
-                               "%s: Unknown SDVO output type (0x%02x%02x)\n",
-                                 SDVO_NAME(sdvo_priv),
-                                 bytes[0], bytes[1]);
+               DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
+                             SDVO_NAME(sdvo_priv),
+                             bytes[0], bytes[1]);
                ret = false;
        }
        intel_output->crtc_mask = (1 << 0) | (1 << 1);
@@ -2029,6 +2127,55 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
 
 }
 
+static void intel_sdvo_tv_create_property(struct drm_connector *connector)
+{
+      struct intel_output *intel_output = to_intel_output(connector);
+       struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+       struct intel_sdvo_tv_format format;
+       uint32_t format_map, i;
+       uint8_t status;
+
+       intel_sdvo_set_target_output(intel_output,
+                                    sdvo_priv->controlled_output);
+
+       intel_sdvo_write_cmd(intel_output,
+                            SDVO_CMD_GET_SUPPORTED_TV_FORMATS, NULL, 0);
+       status = intel_sdvo_read_response(intel_output,
+                                         &format, sizeof(format));
+       if (status != SDVO_CMD_STATUS_SUCCESS)
+               return;
+
+       memcpy(&format_map, &format, sizeof(format) > sizeof(format_map) ?
+              sizeof(format_map) : sizeof(format));
+
+       if (format_map == 0)
+               return;
+
+       sdvo_priv->format_supported_num = 0;
+       for (i = 0 ; i < TV_FORMAT_NUM; i++)
+               if (format_map & (1 << i)) {
+                       sdvo_priv->tv_format_supported
+                       [sdvo_priv->format_supported_num++] =
+                       tv_format_names[i];
+               }
+
+
+       sdvo_priv->tv_format_property =
+                       drm_property_create(
+                               connector->dev, DRM_MODE_PROP_ENUM,
+                               "mode", sdvo_priv->format_supported_num);
+
+       for (i = 0; i < sdvo_priv->format_supported_num; i++)
+               drm_property_add_enum(
+                               sdvo_priv->tv_format_property, i,
+                               i, sdvo_priv->tv_format_supported[i]);
+
+       sdvo_priv->tv_format_name = sdvo_priv->tv_format_supported[0];
+       drm_connector_attach_property(
+                       connector, sdvo_priv->tv_format_property, 0);
+
+}
+
 bool intel_sdvo_init(struct drm_device *dev, int output_device)
 {
        struct drm_connector *connector;
@@ -2066,18 +2213,22 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
        /* Read the regs to test if we can talk to the device */
        for (i = 0; i < 0x40; i++) {
                if (!intel_sdvo_read_byte(intel_output, i, &ch[i])) {
-                       DRM_DEBUG_KMS(I915_SDVO,
-                                       "No SDVO device found on SDVO%c\n",
+                       DRM_DEBUG_KMS("No SDVO device found on SDVO%c\n",
                                        output_device == SDVOB ? 'B' : 'C');
                        goto err_i2c;
                }
        }
 
        /* setup the DDC bus. */
-       if (output_device == SDVOB)
+       if (output_device == SDVOB) {
                intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOB DDC BUS");
-       else
+               sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
+                                               "SDVOB/VGA DDC BUS");
+       } else {
                intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOC DDC BUS");
+               sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
+                                               "SDVOC/VGA DDC BUS");
+       }
 
        if (intel_output->ddc_bus == NULL)
                goto err_i2c;
@@ -2090,7 +2241,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
 
        if (intel_sdvo_output_setup(intel_output,
                                    sdvo_priv->caps.output_flags) != true) {
-               DRM_DEBUG("SDVO output failed to setup on SDVO%c\n",
+               DRM_DEBUG_KMS("SDVO output failed to setup on SDVO%c\n",
                          output_device == SDVOB ? 'B' : 'C');
                goto err_i2c;
        }
@@ -2111,6 +2262,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
        drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
 
        drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
+       if (sdvo_priv->is_tv)
+               intel_sdvo_tv_create_property(connector);
        drm_sysfs_connector_add(connector);
 
        intel_sdvo_select_ddc_bus(sdvo_priv);
@@ -2123,7 +2276,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                                               &sdvo_priv->pixel_clock_max);
 
 
-       DRM_DEBUG_KMS(I915_SDVO, "%s device VID/DID: %02X:%02X.%02X, "
+       DRM_DEBUG_KMS("%s device VID/DID: %02X:%02X.%02X, "
                        "clock range %dMHz - %dMHz, "
                        "input 1: %c, input 2: %c, "
                        "output 1: %c, output 2: %c\n",
@@ -2143,6 +2296,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
        return true;
 
 err_i2c:
+       if (sdvo_priv->analog_ddc_bus != NULL)
+               intel_i2c_destroy(sdvo_priv->analog_ddc_bus);
        if (intel_output->ddc_bus != NULL)
                intel_i2c_destroy(intel_output->ddc_bus);
        if (intel_output->i2c_bus != NULL)
index 5b1c9e9..c64eab4 100644 (file)
@@ -1437,6 +1437,35 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)
        return type;
 }
 
+/*
+ * Here we set accurate tv format according to connector type
+ * i.e Component TV should not be assigned by NTSC or PAL
+ */
+static void intel_tv_find_better_format(struct drm_connector *connector)
+{
+       struct intel_output *intel_output = to_intel_output(connector);
+       struct intel_tv_priv *tv_priv = intel_output->dev_priv;
+       const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
+       int i;
+
+       if ((tv_priv->type == DRM_MODE_CONNECTOR_Component) ==
+               tv_mode->component_only)
+               return;
+
+
+       for (i = 0; i < sizeof(tv_modes) / sizeof(*tv_modes); i++) {
+               tv_mode = tv_modes + i;
+
+               if ((tv_priv->type == DRM_MODE_CONNECTOR_Component) ==
+                       tv_mode->component_only)
+                       break;
+       }
+
+       tv_priv->tv_format = tv_mode->name;
+       drm_connector_property_set_value(connector,
+               connector->dev->mode_config.tv_mode_property, i);
+}
+
 /**
  * Detect the TV connection.
  *
@@ -1473,6 +1502,7 @@ intel_tv_detect(struct drm_connector *connector)
        if (type < 0)
                return connector_status_disconnected;
 
+       intel_tv_find_better_format(connector);
        return connector_status_connected;
 }
 
index 6c67a02..3c917fb 100644 (file)
@@ -444,7 +444,7 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
 {
        drm_mga_private_t *const dev_priv =
            (drm_mga_private_t *) dev->dev_private;
-       unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+       unsigned int warp_size = MGA_WARP_UCODE_SIZE;
        int err;
        unsigned offset;
        const unsigned secondary_size = dma_bs->secondary_bin_count
@@ -619,7 +619,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
 {
        drm_mga_private_t *const dev_priv =
            (drm_mga_private_t *) dev->dev_private;
-       unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+       unsigned int warp_size = MGA_WARP_UCODE_SIZE;
        unsigned int primary_size;
        unsigned int bin_count;
        int err;
index 3d264f2..be6c6b9 100644 (file)
@@ -177,7 +177,6 @@ extern void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv);
 extern int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf);
 
                                /* mga_warp.c */
-extern unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv);
 extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
 extern int mga_warp_init(drm_mga_private_t * dev_priv);
 
index b710fab..a53b848 100644 (file)
@@ -239,7 +239,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv)
                  MGA_WR34, 0x00000000,
                  MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff);
 
-       /* Padding required to to hardware bug.
+       /* Padding required due to hardware bug.
         */
        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,
@@ -317,7 +317,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
                  MGA_WR52, MGA_G400_WR_MAGIC,  /* tex1 width        */
                  MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height       */
 
-       /* Padding required to to hardware bug */
+       /* Padding required due to hardware bug */
        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,
diff --git a/drivers/gpu/drm/mga/mga_ucode.h b/drivers/gpu/drm/mga/mga_ucode.h
deleted file mode 100644 (file)
index b611e27..0000000
+++ /dev/null
@@ -1,11645 +0,0 @@
-/* mga_ucode.h -- Matrox G200/G400 WARP engine microcode -*- linux-c -*-
- * Created: Thu Jan 11 21:20:43 2001 by gareth@valinux.com
- *
- * Copyright 1999 Matrox Graphics Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Kernel-based WARP engine management:
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-/*
- * WARP pipes are named according to the functions they perform, where:
- *
- *   - T stands for computation of texture stage 0
- *   - T2 stands for computation of both texture stage 0 and texture stage 1
- *   - G stands for computation of triangle intensity (Gouraud interpolation)
- *   - Z stands for computation of Z buffer interpolation
- *   - S stands for computation of specular highlight
- *   - A stands for computation of the alpha channel
- *   - F stands for computation of vertex fog interpolation
- */
-
-static unsigned char warp_g200_tgz[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x72, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x60, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x03, 0x80, 0x0A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x57, 0x39, 0x20, 0xE9,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0x2B, 0x32, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0xB3, 0x05,
-       0x00, 0xE0,
-       0x16, 0x28, 0x20, 0xE9,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x1E, 0x2B, 0x20, 0xE9,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x85, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x84, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x82, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x7F, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgza[] = {
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x7D, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x6B, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2D, 0x44, 0x4C, 0xB6,
-       0x25, 0x44, 0x54, 0xB6,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x07, 0xC0, 0x44, 0xC6,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x1F, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x3F, 0x3D, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x07, 0x20,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0xB3, 0x05,
-       0x00, 0xE0,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0x26, 0x1F, 0xDF,
-       0x9D, 0x1F, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x9E, 0x3F, 0x4F, 0xE9,
-
-       0x07, 0x07, 0x1F, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x9C, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x7A, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x79, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x77, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x74, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzaf[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x83, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x6F, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0D, 0x21, 0x1A, 0xB6,
-       0x05, 0x21, 0x31, 0xB6,
-
-       0x2D, 0x44, 0x4C, 0xB6,
-       0x25, 0x44, 0x54, 0xB6,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x0D, 0x20,
-       0x05, 0x20,
-       0x2F, 0xC0, 0x21, 0xC6,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x07, 0xC0, 0x44, 0xC6,
-
-       0x17, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x2D, 0x20,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x1F, 0x62, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x07, 0x20,
-
-       0x3F, 0x3D, 0x5D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0xB3, 0x05,
-       0x00, 0xE0,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x35, 0x17, 0x4F, 0xE9,
-
-       0x1F, 0x26, 0x1F, 0xDF,
-       0x9D, 0x1F, 0x4F, 0xE9,
-
-       0x9E, 0x3F, 0x4F, 0xE9,
-       0x39, 0x37, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x17, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x07, 0x07, 0x1F, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x31, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x9C, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x74, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x73, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x71, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6E, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzf[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x7F, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x6B, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0D, 0x21, 0x1A, 0xB6,
-       0x05, 0x21, 0x31, 0xB6,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x0D, 0x20,
-       0x05, 0x20,
-       0x2F, 0xC0, 0x21, 0xC6,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x17, 0x50, 0x56, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0xB3, 0x05,
-       0x00, 0xE0,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x17, 0x26, 0x17, 0xDF,
-       0x35, 0x17, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x39, 0x37, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x17, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x31, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x78, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x77, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x75, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x72, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzs[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x8B, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x77, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2D, 0x21, 0x1A, 0xB0,
-       0x25, 0x21, 0x31, 0xB0,
-
-       0x0D, 0x21, 0x1A, 0xB2,
-       0x05, 0x21, 0x31, 0xB2,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x05, 0x20,
-       0x0D, 0x20,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x2F, 0xC0, 0x21, 0xC0,
-
-       0x16, 0x42, 0x56, 0x9F,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x1E, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x21, 0x31, 0xB4,
-       0x2D, 0x21, 0x1A, 0xB4,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0x05,
-       0x00, 0xE0,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x1E, 0x26, 0x1E, 0xDF,
-
-       0xA7, 0x1E, 0x4F, 0xE9,
-       0x17, 0x26, 0x16, 0xDF,
-
-       0x2D, 0x20,
-       0x00, 0xE0,
-       0xA8, 0x3F, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x1E, 0xAF,
-       0x25, 0x20,
-       0x00, 0xE0,
-
-       0xA4, 0x16, 0x4F, 0xE9,
-       0x0F, 0xC0, 0x21, 0xC2,
-
-       0xA6, 0x80, 0x4F, 0xE9,
-       0x1F, 0x62, 0x57, 0x9F,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x8F, 0x20,
-
-       0xA5, 0x37, 0x4F, 0xE9,
-       0x0F, 0x17, 0x0F, 0xAF,
-
-       0x06, 0xC0, 0x21, 0xC4,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0xA3, 0x80, 0x4F, 0xE9,
-
-       0x06, 0x20,
-       0x00, 0xE0,
-       0x1F, 0x26, 0x1F, 0xDF,
-
-       0xA1, 0x1F, 0x4F, 0xE9,
-       0xA2, 0x3F, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x06, 0x06, 0x1F, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x6C, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6B, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x69, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzsa[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x8F, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x7B, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2D, 0x21, 0x1A, 0xB0,
-       0x25, 0x21, 0x31, 0xB0,
-
-       0x0D, 0x21, 0x1A, 0xB2,
-       0x05, 0x21, 0x31, 0xB2,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x05, 0x20,
-       0x0D, 0x20,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x2F, 0xC0, 0x21, 0xC0,
-
-       0x16, 0x42, 0x56, 0x9F,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x1E, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x21, 0x31, 0xB4,
-       0x2D, 0x21, 0x1A, 0xB4,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0x05,
-       0x00, 0xE0,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0x0D, 0x44, 0x4C, 0xB6,
-       0x05, 0x44, 0x54, 0xB6,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x1E, 0x26, 0x1E, 0xDF,
-
-       0xA7, 0x1E, 0x4F, 0xE9,
-       0x17, 0x26, 0x16, 0xDF,
-
-       0x2D, 0x20,
-       0x00, 0xE0,
-       0xA8, 0x3F, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x1E, 0xAF,
-       0x25, 0x20,
-       0x00, 0xE0,
-
-       0xA4, 0x16, 0x4F, 0xE9,
-       0x0F, 0xC0, 0x21, 0xC2,
-
-       0xA6, 0x80, 0x4F, 0xE9,
-       0x1F, 0x62, 0x57, 0x9F,
-
-       0x0D, 0x20,
-       0x05, 0x20,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x0F, 0x20,
-
-       0x17, 0x50, 0x56, 0x9F,
-       0xA5, 0x37, 0x4F, 0xE9,
-
-       0x06, 0xC0, 0x21, 0xC4,
-       0x0F, 0x17, 0x0F, 0xAF,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2F, 0xC0, 0x44, 0xC6,
-       0xA3, 0x80, 0x4F, 0xE9,
-
-       0x06, 0x20,
-       0x00, 0xE0,
-       0x1F, 0x26, 0x1F, 0xDF,
-
-       0x17, 0x26, 0x17, 0xDF,
-       0x9D, 0x17, 0x4F, 0xE9,
-
-       0xA1, 0x1F, 0x4F, 0xE9,
-       0xA2, 0x3F, 0x4F, 0xE9,
-
-       0x06, 0x06, 0x1F, 0xAF,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x9E, 0x37, 0x4F, 0xE9,
-       0x2F, 0x17, 0x2F, 0xAF,
-
-       0xA0, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x9C, 0x80, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x68, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x67, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x65, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x62, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzsaf[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x94, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x80, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2D, 0x21, 0x1A, 0xB0,
-       0x25, 0x21, 0x31, 0xB0,
-
-       0x0D, 0x21, 0x1A, 0xB2,
-       0x05, 0x21, 0x31, 0xB2,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x05, 0x20,
-       0x0D, 0x20,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x2F, 0xC0, 0x21, 0xC0,
-
-       0x16, 0x42, 0x56, 0x9F,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x1E, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x21, 0x31, 0xB4,
-       0x2D, 0x21, 0x1A, 0xB4,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0x05,
-       0x00, 0xE0,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0x0D, 0x21, 0x1A, 0xB6,
-       0x05, 0x21, 0x31, 0xB6,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x1E, 0x26, 0x1E, 0xDF,
-
-       0xA7, 0x1E, 0x4F, 0xE9,
-       0x17, 0x26, 0x16, 0xDF,
-
-       0x2D, 0x20,
-       0x00, 0xE0,
-       0xA8, 0x3F, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x1E, 0xAF,
-       0x25, 0x20,
-       0x00, 0xE0,
-
-       0xA4, 0x16, 0x4F, 0xE9,
-       0x0F, 0xC0, 0x21, 0xC2,
-
-       0xA6, 0x80, 0x4F, 0xE9,
-       0x1F, 0x62, 0x57, 0x9F,
-
-       0x0D, 0x20,
-       0x05, 0x20,
-       0x2F, 0xC0, 0x21, 0xC6,
-
-       0x2D, 0x44, 0x4C, 0xB6,
-       0x25, 0x44, 0x54, 0xB6,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x0F, 0x20,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x07, 0xC0, 0x44, 0xC6,
-
-       0x17, 0x50, 0x56, 0x9F,
-       0xA5, 0x37, 0x4F, 0xE9,
-
-       0x06, 0xC0, 0x21, 0xC4,
-       0x0F, 0x17, 0x0F, 0xAF,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1E, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x3E, 0x3D, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x07, 0x20,
-
-       0x2F, 0x20,
-       0x00, 0xE0,
-       0xA3, 0x0F, 0x4F, 0xE9,
-
-       0x06, 0x20,
-       0x00, 0xE0,
-       0x1F, 0x26, 0x1F, 0xDF,
-
-       0x17, 0x26, 0x17, 0xDF,
-       0xA1, 0x1F, 0x4F, 0xE9,
-
-       0x1E, 0x26, 0x1E, 0xDF,
-       0x9D, 0x1E, 0x4F, 0xE9,
-
-       0x35, 0x17, 0x4F, 0xE9,
-       0xA2, 0x3F, 0x4F, 0xE9,
-
-       0x06, 0x06, 0x1F, 0xAF,
-       0x39, 0x37, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x17, 0xAF,
-       0x07, 0x07, 0x1E, 0xAF,
-
-       0xA0, 0x80, 0x4F, 0xE9,
-       0x9E, 0x3E, 0x4F, 0xE9,
-
-       0x31, 0x80, 0x4F, 0xE9,
-       0x9C, 0x80, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x63, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x62, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x60, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x5D, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g200_tgzsf[] = {
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x98, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x81, 0x04,
-       0x89, 0x04,
-       0x01, 0x04,
-       0x09, 0x04,
-
-       0xC9, 0x41, 0xC0, 0xEC,
-       0x11, 0x04,
-       0x00, 0xE0,
-
-       0x41, 0xCC, 0x41, 0xCD,
-       0x49, 0xCC, 0x49, 0xCD,
-
-       0xD1, 0x41, 0xC0, 0xEC,
-       0x51, 0xCC, 0x51, 0xCD,
-
-       0x80, 0x04,
-       0x10, 0x04,
-       0x08, 0x04,
-       0x00, 0xE0,
-
-       0x00, 0xCC, 0xC0, 0xCD,
-       0xD1, 0x49, 0xC0, 0xEC,
-
-       0x8A, 0x1F, 0x20, 0xE9,
-       0x8B, 0x3F, 0x20, 0xE9,
-
-       0x41, 0x3C, 0x41, 0xAD,
-       0x49, 0x3C, 0x49, 0xAD,
-
-       0x10, 0xCC, 0x10, 0xCD,
-       0x08, 0xCC, 0x08, 0xCD,
-
-       0xB9, 0x41, 0x49, 0xBB,
-       0x1F, 0xF0, 0x41, 0xCD,
-
-       0x51, 0x3C, 0x51, 0xAD,
-       0x00, 0x98, 0x80, 0xE9,
-
-       0x8F, 0x80, 0x07, 0xEA,
-       0x24, 0x1F, 0x20, 0xE9,
-
-       0x21, 0x45, 0x80, 0xE8,
-       0x1A, 0x4D, 0x80, 0xE8,
-
-       0x31, 0x55, 0x80, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0x41, 0x49, 0xBD,
-       0x1D, 0x41, 0x51, 0xBD,
-
-       0x2E, 0x41, 0x2A, 0xB8,
-       0x34, 0x53, 0xA0, 0xE8,
-
-       0x15, 0x30,
-       0x1D, 0x30,
-       0x58, 0xE3,
-       0x00, 0xE0,
-
-       0xB5, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x24, 0x43, 0xA0, 0xE8,
-       0x2C, 0x4B, 0xA0, 0xE8,
-
-       0x15, 0x72,
-       0x09, 0xE3,
-       0x00, 0xE0,
-       0x1D, 0x72,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0x97, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x6C, 0x64, 0xC8, 0xEC,
-       0x98, 0xE1,
-       0xB5, 0x05,
-
-       0xBD, 0x05,
-       0x2E, 0x30,
-       0x32, 0xC0, 0xA0, 0xE8,
-
-       0x33, 0xC0, 0xA0, 0xE8,
-       0x74, 0x64, 0xC8, 0xEC,
-
-       0x40, 0x3C, 0x40, 0xAD,
-       0x32, 0x6A,
-       0x2A, 0x30,
-
-       0x20, 0x73,
-       0x33, 0x6A,
-       0x00, 0xE0,
-       0x28, 0x73,
-
-       0x1C, 0x72,
-       0x83, 0xE2,
-       0x7B, 0x80, 0x15, 0xEA,
-
-       0xB8, 0x3D, 0x28, 0xDF,
-       0x30, 0x35, 0x20, 0xDF,
-
-       0x40, 0x30,
-       0x00, 0xE0,
-       0xCC, 0xE2,
-       0x64, 0x72,
-
-       0x25, 0x42, 0x52, 0xBF,
-       0x2D, 0x42, 0x4A, 0xBF,
-
-       0x30, 0x2E, 0x30, 0xDF,
-       0x38, 0x2E, 0x38, 0xDF,
-
-       0x18, 0x1D, 0x45, 0xE9,
-       0x1E, 0x15, 0x45, 0xE9,
-
-       0x2B, 0x49, 0x51, 0xBD,
-       0x00, 0xE0,
-       0x1F, 0x73,
-
-       0x38, 0x38, 0x40, 0xAF,
-       0x30, 0x30, 0x40, 0xAF,
-
-       0x24, 0x1F, 0x24, 0xDF,
-       0x1D, 0x32, 0x20, 0xE9,
-
-       0x2C, 0x1F, 0x2C, 0xDF,
-       0x1A, 0x33, 0x20, 0xE9,
-
-       0xB0, 0x10,
-       0x08, 0xE3,
-       0x40, 0x10,
-       0xB8, 0x10,
-
-       0x26, 0xF0, 0x30, 0xCD,
-       0x2F, 0xF0, 0x38, 0xCD,
-
-       0x2B, 0x80, 0x20, 0xE9,
-       0x2A, 0x80, 0x20, 0xE9,
-
-       0xA6, 0x20,
-       0x88, 0xE2,
-       0x00, 0xE0,
-       0xAF, 0x20,
-
-       0x28, 0x2A, 0x26, 0xAF,
-       0x20, 0x2A, 0xC0, 0xAF,
-
-       0x34, 0x1F, 0x34, 0xDF,
-       0x46, 0x24, 0x46, 0xDF,
-
-       0x28, 0x30, 0x80, 0xBF,
-       0x20, 0x38, 0x80, 0xBF,
-
-       0x47, 0x24, 0x47, 0xDF,
-       0x4E, 0x2C, 0x4E, 0xDF,
-
-       0x4F, 0x2C, 0x4F, 0xDF,
-       0x56, 0x34, 0x56, 0xDF,
-
-       0x28, 0x15, 0x28, 0xDF,
-       0x20, 0x1D, 0x20, 0xDF,
-
-       0x57, 0x34, 0x57, 0xDF,
-       0x00, 0xE0,
-       0x1D, 0x05,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x89, 0xE2,
-       0x2B, 0x30,
-
-       0x3F, 0xC1, 0x1D, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x68,
-       0xBF, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x20, 0xC0, 0x20, 0xAF,
-       0x28, 0x05,
-       0x97, 0x74,
-
-       0x00, 0xE0,
-       0x2A, 0x10,
-       0x16, 0xC0, 0x20, 0xE9,
-
-       0x04, 0x80, 0x10, 0xEA,
-       0x8C, 0xE2,
-       0x95, 0x05,
-
-       0x28, 0xC1, 0x28, 0xAD,
-       0x1F, 0xC1, 0x15, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA8, 0x67,
-       0x9F, 0x6B,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x28, 0xC0, 0x28, 0xAD,
-       0x1D, 0x25,
-       0x20, 0x05,
-
-       0x28, 0x32, 0x80, 0xAD,
-       0x40, 0x2A, 0x40, 0xBD,
-
-       0x1C, 0x80, 0x20, 0xE9,
-       0x20, 0x33, 0x20, 0xAD,
-
-       0x20, 0x73,
-       0x00, 0xE0,
-       0xB6, 0x49, 0x51, 0xBB,
-
-       0x26, 0x2F, 0xB0, 0xE8,
-       0x19, 0x20, 0x20, 0xE9,
-
-       0x35, 0x20, 0x35, 0xDF,
-       0x3D, 0x20, 0x3D, 0xDF,
-
-       0x15, 0x20, 0x15, 0xDF,
-       0x1D, 0x20, 0x1D, 0xDF,
-
-       0x26, 0xD0, 0x26, 0xCD,
-       0x29, 0x49, 0x2A, 0xB8,
-
-       0x26, 0x40, 0x80, 0xBD,
-       0x3B, 0x48, 0x50, 0xBD,
-
-       0x3E, 0x54, 0x57, 0x9F,
-       0x00, 0xE0,
-       0x82, 0xE1,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x26, 0x30,
-       0x29, 0x30,
-       0x48, 0x3C, 0x48, 0xAD,
-
-       0x2B, 0x72,
-       0xC2, 0xE1,
-       0x2C, 0xC0, 0x44, 0xC2,
-
-       0x05, 0x24, 0x34, 0xBF,
-       0x0D, 0x24, 0x2C, 0xBF,
-
-       0x2D, 0x46, 0x4E, 0xBF,
-       0x25, 0x46, 0x56, 0xBF,
-
-       0x20, 0x1D, 0x6F, 0x8F,
-       0x32, 0x3E, 0x5F, 0xE9,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x30,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x33, 0x1E, 0x5F, 0xE9,
-
-       0x05, 0x44, 0x54, 0xB2,
-       0x0D, 0x44, 0x4C, 0xB2,
-
-       0x19, 0xC0, 0xB0, 0xE8,
-       0x34, 0xC0, 0x44, 0xC4,
-
-       0x33, 0x73,
-       0x00, 0xE0,
-       0x3E, 0x62, 0x57, 0x9F,
-
-       0x1E, 0xAF, 0x59, 0x9F,
-       0x00, 0xE0,
-       0x0D, 0x20,
-
-       0x84, 0x3E, 0x58, 0xE9,
-       0x28, 0x1D, 0x6F, 0x8F,
-
-       0x05, 0x20,
-       0x00, 0xE0,
-       0x85, 0x1E, 0x58, 0xE9,
-
-       0x9B, 0x3B, 0x33, 0xDF,
-       0x20, 0x20, 0x42, 0xAF,
-
-       0x30, 0x42, 0x56, 0x9F,
-       0x80, 0x3E, 0x57, 0xE9,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x30, 0x80, 0x5F, 0xE9,
-
-       0x28, 0x28, 0x24, 0xAF,
-       0x81, 0x1E, 0x57, 0xE9,
-
-       0x05, 0x47, 0x57, 0xBF,
-       0x0D, 0x47, 0x4F, 0xBF,
-
-       0x88, 0x80, 0x58, 0xE9,
-       0x1B, 0x29, 0x1B, 0xDF,
-
-       0x30, 0x1D, 0x6F, 0x8F,
-       0x3A, 0x30, 0x4F, 0xE9,
-
-       0x1C, 0x30, 0x26, 0xDF,
-       0x09, 0xE3,
-       0x3B, 0x05,
-
-       0x3E, 0x50, 0x56, 0x9F,
-       0x3B, 0x3F, 0x4F, 0xE9,
-
-       0x1E, 0x8F, 0x51, 0x9F,
-       0x00, 0xE0,
-       0xAC, 0x20,
-
-       0x2D, 0x44, 0x4C, 0xB4,
-       0x2C, 0x1C, 0xC0, 0xAF,
-
-       0x25, 0x44, 0x54, 0xB4,
-       0x00, 0xE0,
-       0xC8, 0x30,
-
-       0x30, 0x46, 0x30, 0xAF,
-       0x1B, 0x1B, 0x48, 0xAF,
-
-       0x00, 0xE0,
-       0x25, 0x20,
-       0x38, 0x2C, 0x4F, 0xE9,
-
-       0x86, 0x80, 0x57, 0xE9,
-       0x38, 0x1D, 0x6F, 0x8F,
-
-       0x28, 0x74,
-       0x00, 0xE0,
-       0x0D, 0x44, 0x4C, 0xB0,
-
-       0x05, 0x44, 0x54, 0xB0,
-       0x2D, 0x20,
-       0x9B, 0x10,
-
-       0x82, 0x3E, 0x57, 0xE9,
-       0x32, 0xF0, 0x1B, 0xCD,
-
-       0x1E, 0xBD, 0x59, 0x9F,
-       0x83, 0x1E, 0x57, 0xE9,
-
-       0x38, 0x47, 0x38, 0xAF,
-       0x34, 0x20,
-       0x2A, 0x30,
-
-       0x00, 0xE0,
-       0x0D, 0x20,
-       0x32, 0x20,
-       0x05, 0x20,
-
-       0x87, 0x80, 0x57, 0xE9,
-       0x1F, 0x54, 0x57, 0x9F,
-
-       0x17, 0x42, 0x56, 0x9F,
-       0x00, 0xE0,
-       0x3B, 0x6A,
-
-       0x3F, 0x8F, 0x51, 0x9F,
-       0x37, 0x1E, 0x4F, 0xE9,
-
-       0x37, 0x32, 0x2A, 0xAF,
-       0x00, 0xE0,
-       0x32, 0x00,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x27, 0xC0, 0x44, 0xC0,
-
-       0x36, 0x1F, 0x4F, 0xE9,
-       0x1F, 0x1F, 0x26, 0xDF,
-
-       0x37, 0x1B, 0x37, 0xBF,
-       0x17, 0x26, 0x17, 0xDF,
-
-       0x3E, 0x17, 0x4F, 0xE9,
-       0x3F, 0x3F, 0x4F, 0xE9,
-
-       0x34, 0x1F, 0x34, 0xAF,
-       0x2B, 0x05,
-       0xA7, 0x20,
-
-       0x33, 0x2B, 0x37, 0xDF,
-       0x27, 0x17, 0xC0, 0xAF,
-
-       0x34, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2D, 0x21, 0x1A, 0xB0,
-       0x25, 0x21, 0x31, 0xB0,
-
-       0x0D, 0x21, 0x1A, 0xB2,
-       0x05, 0x21, 0x31, 0xB2,
-
-       0x03, 0x80, 0x2A, 0xEA,
-       0x17, 0xC1, 0x2B, 0xBD,
-
-       0x2D, 0x20,
-       0x25, 0x20,
-       0x05, 0x20,
-       0x0D, 0x20,
-
-       0xB3, 0x68,
-       0x97, 0x25,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0xC0, 0x33, 0xAF,
-       0x2F, 0xC0, 0x21, 0xC0,
-
-       0x16, 0x42, 0x56, 0x9F,
-       0x3C, 0x27, 0x4F, 0xE9,
-
-       0x1E, 0x62, 0x57, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x21, 0x31, 0xB4,
-       0x2D, 0x21, 0x1A, 0xB4,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x33, 0x05,
-       0x00, 0xE0,
-       0x28, 0x19, 0x60, 0xEC,
-
-       0x0D, 0x21, 0x1A, 0xB6,
-       0x05, 0x21, 0x31, 0xB6,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0xE0,
-       0x2F, 0x20,
-
-       0x23, 0x3B, 0x33, 0xAD,
-       0x1E, 0x26, 0x1E, 0xDF,
-
-       0xA7, 0x1E, 0x4F, 0xE9,
-       0x17, 0x26, 0x16, 0xDF,
-
-       0x2D, 0x20,
-       0x00, 0xE0,
-       0xA8, 0x3F, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x1E, 0xAF,
-       0x25, 0x20,
-       0x00, 0xE0,
-
-       0xA4, 0x16, 0x4F, 0xE9,
-       0x0F, 0xC0, 0x21, 0xC2,
-
-       0xA6, 0x80, 0x4F, 0xE9,
-       0x1F, 0x62, 0x57, 0x9F,
-
-       0x0D, 0x20,
-       0x05, 0x20,
-       0x2F, 0xC0, 0x21, 0xC6,
-
-       0x3F, 0x2F, 0x5D, 0x9F,
-       0x00, 0xE0,
-       0x0F, 0x20,
-
-       0x17, 0x50, 0x56, 0x9F,
-       0xA5, 0x37, 0x4F, 0xE9,
-
-       0x06, 0xC0, 0x21, 0xC4,
-       0x0F, 0x17, 0x0F, 0xAF,
-
-       0x37, 0x0F, 0x5C, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2F, 0x20,
-       0x00, 0xE0,
-       0xA3, 0x80, 0x4F, 0xE9,
-
-       0x06, 0x20,
-       0x00, 0xE0,
-       0x1F, 0x26, 0x1F, 0xDF,
-
-       0x17, 0x26, 0x17, 0xDF,
-       0x35, 0x17, 0x4F, 0xE9,
-
-       0xA1, 0x1F, 0x4F, 0xE9,
-       0xA2, 0x3F, 0x4F, 0xE9,
-
-       0x06, 0x06, 0x1F, 0xAF,
-       0x39, 0x37, 0x4F, 0xE9,
-
-       0x2F, 0x2F, 0x17, 0xAF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xA0, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x31, 0x80, 0x4F, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x57, 0x39, 0x20, 0xE9,
-
-       0x16, 0x28, 0x20, 0xE9,
-       0x1D, 0x3B, 0x20, 0xE9,
-
-       0x1E, 0x2B, 0x20, 0xE9,
-       0x2B, 0x32, 0x20, 0xE9,
-
-       0x1C, 0x23, 0x20, 0xE9,
-       0x57, 0x36, 0x20, 0xE9,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x40, 0x40, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x90, 0xE2,
-       0x00, 0xE0,
-
-       0x68, 0xFF, 0x20, 0xEA,
-       0x19, 0xC8, 0xC1, 0xCD,
-
-       0x1F, 0xD7, 0x18, 0xBD,
-       0x3F, 0xD7, 0x22, 0xBD,
-
-       0x9F, 0x41, 0x49, 0xBD,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x25, 0x41, 0x49, 0xBD,
-       0x2D, 0x41, 0x51, 0xBD,
-
-       0x0D, 0x80, 0x07, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x35, 0x40, 0x48, 0xBD,
-       0x3D, 0x40, 0x50, 0xBD,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x25, 0x30,
-       0x2D, 0x30,
-
-       0x35, 0x30,
-       0xB5, 0x30,
-       0xBD, 0x30,
-       0x3D, 0x30,
-
-       0x9C, 0xA7, 0x5B, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x67, 0xFF, 0x0A, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC9, 0x41, 0xC8, 0xEC,
-       0x42, 0xE1,
-       0x00, 0xE0,
-
-       0x65, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xC8, 0x40, 0xC0, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x62, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-};
-
-static unsigned char warp_g400_t2gz[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x78, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x69, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x25, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2A, 0x44, 0x54, 0xB4,
-       0x1A, 0x44, 0x64, 0xB4,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x9F, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xBE, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x7D, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gza[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x7C, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x6D, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x29, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0F, 0xCF, 0x74, 0xC6,
-       0x3D, 0xCF, 0x74, 0xC2,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x0F, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB4,
-       0x02, 0x44, 0x64, 0xB4,
-
-       0x2A, 0x44, 0x54, 0xB6,
-       0x1A, 0x44, 0x64, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x9B, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xBA, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x79, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzaf[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x81, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x72, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x2E, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x0F, 0xCF, 0x74, 0xC6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x0F, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB4,
-       0x02, 0x44, 0x64, 0xB4,
-
-       0x2A, 0x44, 0x54, 0xB6,
-       0x1A, 0x44, 0x64, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x3D, 0xCF, 0x75, 0xC6,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x45, 0x55, 0xB6,
-       0x02, 0x45, 0x65, 0xB6,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x3D, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x96, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xB5, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x74, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzf[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x7D, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x6E, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0F, 0xCF, 0x75, 0xC6,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x28, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x31, 0x0F, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x54, 0xB4,
-       0x02, 0x44, 0x64, 0xB4,
-
-       0x2A, 0x45, 0x55, 0xB6,
-       0x1A, 0x45, 0x65, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x9A, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xBB, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x78, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzs[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x85, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x76, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x0F, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x31, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0F, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB4,
-       0x1A, 0x44, 0x64, 0xB4,
-
-       0x0A, 0x45, 0x55, 0xB0,
-       0x02, 0x45, 0x65, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x55, 0xB2,
-       0x1A, 0x45, 0x65, 0xB2,
-
-       0x0A, 0x45, 0x55, 0xB4,
-       0x02, 0x45, 0x65, 0xB4,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x20,
-       0x1A, 0x20,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA7, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x92, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xB2, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x70, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzsa[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x8A, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x7B, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x0F, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x36, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0F, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB4,
-       0x1A, 0x44, 0x64, 0xB4,
-
-       0x0A, 0x45, 0x55, 0xB0,
-       0x02, 0x45, 0x65, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x55, 0xB2,
-       0x1A, 0x45, 0x65, 0xB2,
-
-       0x0A, 0x45, 0x55, 0xB4,
-       0x02, 0x45, 0x65, 0xB4,
-
-       0x0F, 0xCF, 0x74, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB6,
-       0x1A, 0x44, 0x64, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x8D, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xAD, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x6B, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzsaf[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x8E, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x7F, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x0F, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x3A, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0F, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB4,
-       0x1A, 0x44, 0x64, 0xB4,
-
-       0x0A, 0x45, 0x55, 0xB0,
-       0x02, 0x45, 0x65, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x55, 0xB2,
-       0x1A, 0x45, 0x65, 0xB2,
-
-       0x0A, 0x45, 0x55, 0xB4,
-       0x02, 0x45, 0x65, 0xB4,
-
-       0x0F, 0xCF, 0x74, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB6,
-       0x1A, 0x44, 0x64, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x45, 0x55, 0xB6,
-       0x02, 0x45, 0x65, 0xB6,
-
-       0x3D, 0xCF, 0x75, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x3D, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x89, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xA9, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x67, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_t2gzsf[] = {
-
-       0x00, 0x8A, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x0A, 0x40, 0x50, 0xBF,
-       0x2A, 0x40, 0x60, 0xBF,
-
-       0x32, 0x41, 0x51, 0xBF,
-       0x3A, 0x41, 0x61, 0xBF,
-
-       0xC3, 0x6B,
-       0xD3, 0x6B,
-       0x00, 0x8A, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x23, 0x9F,
-       0x00, 0xE0,
-       0x51, 0x04,
-
-       0x90, 0xE2,
-       0x61, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x51, 0x41, 0xE0, 0xEC,
-       0x39, 0x67, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x63, 0xA0, 0xE8,
-
-       0x61, 0x41, 0xE0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x8A, 0x80, 0x15, 0xEA,
-       0x10, 0x04,
-       0x20, 0x04,
-
-       0x61, 0x51, 0xE0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x52, 0xBF,
-       0x0F, 0x52, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x62, 0xBF,
-       0x1E, 0x51, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x0E, 0x61, 0x60, 0xEA,
-
-       0x32, 0x40, 0x50, 0xBD,
-       0x22, 0x40, 0x60, 0xBD,
-
-       0x12, 0x41, 0x51, 0xBD,
-       0x3A, 0x41, 0x61, 0xBD,
-
-       0xBF, 0x2F, 0x0E, 0xBD,
-       0x97, 0xE2,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x35, 0x48, 0xB1, 0xE8,
-       0x3D, 0x59, 0xB1, 0xE8,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x56, 0x31, 0x56, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x66, 0x31, 0x66, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x57, 0x39, 0x57, 0xBF,
-       0x67, 0x39, 0x67, 0xBF,
-
-       0x7B, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x35, 0x00,
-       0x3D, 0x00,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0x8D, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x75, 0xF8, 0xEC,
-       0x35, 0x20,
-       0x3D, 0x20,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x53, 0x53, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x0E, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x48, 0x35, 0x48, 0xBF,
-       0x58, 0x35, 0x58, 0xBF,
-
-       0x68, 0x35, 0x68, 0xBF,
-       0x49, 0x3D, 0x49, 0xBF,
-
-       0x59, 0x3D, 0x59, 0xBF,
-       0x69, 0x3D, 0x69, 0xBF,
-
-       0x63, 0x63, 0x2D, 0xDF,
-       0x4D, 0x7D, 0xF8, 0xEC,
-
-       0x59, 0xE3,
-       0x00, 0xE0,
-       0xB8, 0x38, 0x33, 0xBF,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x18, 0x3A, 0x41, 0xE9,
-
-       0x3F, 0x53, 0xA0, 0xE8,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x63, 0xA0, 0xE8,
-
-       0x50, 0x70, 0xF8, 0xEC,
-       0x2B, 0x50, 0x3C, 0xE9,
-
-       0x1F, 0x0F, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x59, 0x78, 0xF8, 0xEC,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x56, 0x3F, 0x56, 0xDF,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x66, 0x3D, 0x66, 0xDF,
-
-       0x1D, 0x32, 0x41, 0xE9,
-       0x67, 0x3D, 0x67, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3F, 0x57, 0xDF,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x59, 0x3F, 0x59, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x69, 0x3D, 0x69, 0xDF,
-
-       0x48, 0x37, 0x48, 0xDF,
-       0x58, 0x3F, 0x58, 0xDF,
-
-       0x68, 0x3D, 0x68, 0xDF,
-       0x49, 0x37, 0x49, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x0F, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x54, 0xB0,
-       0x02, 0x44, 0x64, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB2,
-       0x1A, 0x44, 0x64, 0xB2,
-
-       0x36, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0F, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x54, 0xB4,
-       0x1A, 0x44, 0x64, 0xB4,
-
-       0x0A, 0x45, 0x55, 0xB0,
-       0x02, 0x45, 0x65, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x55, 0xB2,
-       0x1A, 0x45, 0x65, 0xB2,
-
-       0x0A, 0x45, 0x55, 0xB4,
-       0x02, 0x45, 0x65, 0xB4,
-
-       0x0F, 0xCF, 0x75, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x31, 0x0F, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x55, 0xB6,
-       0x1A, 0x45, 0x65, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x56, 0xBF,
-       0x1A, 0x46, 0x66, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x57, 0xBF,
-       0x02, 0x47, 0x67, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x53, 0xBF,
-       0x1A, 0x43, 0x63, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x48, 0x58, 0xBF,
-       0x02, 0x48, 0x68, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x2A, 0x49, 0x59, 0xBF,
-       0x1A, 0x49, 0x69, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x82, 0x30, 0x57, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x83, 0x38, 0x57, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x84, 0x31, 0x5E, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x85, 0x39, 0x5E, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x87, 0x77, 0x57, 0xE9,
-       0x8B, 0x3E, 0xBF, 0xEA,
-
-       0x80, 0x30, 0x57, 0xE9,
-       0x81, 0x38, 0x57, 0xE9,
-
-       0x82, 0x31, 0x57, 0xE9,
-       0x86, 0x78, 0x57, 0xE9,
-
-       0x83, 0x39, 0x57, 0xE9,
-       0x87, 0x79, 0x57, 0xE9,
-
-       0x30, 0x1F, 0x5F, 0xE9,
-       0x8A, 0x34, 0x20, 0xE9,
-
-       0x8B, 0x3C, 0x20, 0xE9,
-       0x37, 0x50, 0x60, 0xBD,
-
-       0x57, 0x0D, 0x20, 0xE9,
-       0x35, 0x51, 0x61, 0xBD,
-
-       0x2B, 0x50, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x0E, 0x77,
-
-       0x24, 0x51, 0x20, 0xE9,
-       0x8D, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x0E, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x0B, 0x46, 0xA0, 0xE8,
-       0x1B, 0x56, 0xA0, 0xE8,
-
-       0x2B, 0x66, 0xA0, 0xE8,
-       0x0C, 0x47, 0xA0, 0xE8,
-
-       0x1C, 0x57, 0xA0, 0xE8,
-       0x2C, 0x67, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x57, 0x80, 0x57, 0xCF,
-
-       0x66, 0x33, 0x66, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x67, 0x3B, 0x67, 0xCF,
-
-       0x0B, 0x48, 0xA0, 0xE8,
-       0x1B, 0x58, 0xA0, 0xE8,
-
-       0x2B, 0x68, 0xA0, 0xE8,
-       0x0C, 0x49, 0xA0, 0xE8,
-
-       0x1C, 0x59, 0xA0, 0xE8,
-       0x2C, 0x69, 0xA0, 0xE8,
-
-       0x0B, 0x00,
-       0x1B, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x0C, 0x00,
-       0x1C, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x0B, 0x65,
-       0x1B, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x0C, 0x65,
-       0x1C, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x0B, 0x1B, 0x60, 0xEC,
-       0x34, 0xD7, 0x34, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x0C, 0x1C, 0x60, 0xEC,
-
-       0x3C, 0xD7, 0x3C, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x0B, 0x2B, 0xDE, 0xE8,
-       0x1B, 0x80, 0xDE, 0xE8,
-
-       0x34, 0x80, 0x34, 0xBD,
-       0x3C, 0x80, 0x3C, 0xBD,
-
-       0x33, 0xD7, 0x0B, 0xBD,
-       0x3B, 0xD7, 0x1B, 0xBD,
-
-       0x48, 0x80, 0x48, 0xCF,
-       0x59, 0x80, 0x59, 0xCF,
-
-       0x68, 0x33, 0x68, 0xCF,
-       0x49, 0x3B, 0x49, 0xCF,
-
-       0xAD, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x58, 0x33, 0x58, 0xCF,
-       0x69, 0x3B, 0x69, 0xCF,
-
-       0x6B, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgz[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x58, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x4A, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x1D, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x2A, 0x44, 0x4C, 0xB4,
-       0x1A, 0x44, 0x54, 0xB4,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0xAF, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xD6, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x9D, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgza[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x5C, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x4E, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x27, 0xCF, 0x74, 0xC6,
-       0x3D, 0xCF, 0x74, 0xC2,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x20, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x27, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x4C, 0xB4,
-       0x02, 0x44, 0x54, 0xB4,
-
-       0x2A, 0x44, 0x4C, 0xB6,
-       0x1A, 0x44, 0x54, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0xAB, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xD3, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x99, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzaf[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x61, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x53, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x26, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x27, 0xCF, 0x74, 0xC6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x27, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x4C, 0xB4,
-       0x02, 0x44, 0x54, 0xB4,
-
-       0x2A, 0x44, 0x4C, 0xB6,
-       0x1A, 0x44, 0x54, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x3D, 0xCF, 0x75, 0xC6,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x45, 0x4D, 0xB6,
-       0x02, 0x45, 0x55, 0xB6,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x3D, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0xA6, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xCD, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x94, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzf[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x5D, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x4F, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x34, 0x80, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x27, 0xCF, 0x75, 0xC6,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x20, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x3D, 0xCF, 0x74, 0xC2,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x31, 0x27, 0x20, 0xE9,
-
-       0x0A, 0x44, 0x4C, 0xB4,
-       0x02, 0x44, 0x54, 0xB4,
-
-       0x2A, 0x45, 0x4D, 0xB6,
-       0x1A, 0x45, 0x55, 0xB6,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x38, 0x3D, 0x20, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0xAA, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xD3, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x98, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzs[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x65, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x57, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x27, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x29, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x27, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB4,
-       0x1A, 0x44, 0x54, 0xB4,
-
-       0x0A, 0x45, 0x4D, 0xB0,
-       0x02, 0x45, 0x55, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x4D, 0xB2,
-       0x1A, 0x45, 0x55, 0xB2,
-
-       0x0A, 0x45, 0x4D, 0xB4,
-       0x02, 0x45, 0x55, 0xB4,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x20,
-       0x02, 0x20,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA7, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0xA2, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xCA, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x90, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzsa[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x6A, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x5C, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x27, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x2E, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x27, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB4,
-       0x1A, 0x44, 0x54, 0xB4,
-
-       0x0A, 0x45, 0x4D, 0xB0,
-       0x02, 0x45, 0x55, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x4D, 0xB2,
-       0x1A, 0x45, 0x55, 0xB2,
-
-       0x0A, 0x45, 0x4D, 0xB4,
-       0x02, 0x45, 0x55, 0xB4,
-
-       0x27, 0xCF, 0x74, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB6,
-       0x1A, 0x44, 0x54, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0x9D, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xC5, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x8B, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzsaf[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x6E, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x60, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x27, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x32, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x27, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB4,
-       0x1A, 0x44, 0x54, 0xB4,
-
-       0x0A, 0x45, 0x4D, 0xB0,
-       0x02, 0x45, 0x55, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x4D, 0xB2,
-       0x1A, 0x45, 0x55, 0xB2,
-
-       0x0A, 0x45, 0x4D, 0xB4,
-       0x02, 0x45, 0x55, 0xB4,
-
-       0x27, 0xCF, 0x74, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9C, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB6,
-       0x1A, 0x44, 0x54, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x45, 0x4D, 0xB6,
-       0x02, 0x45, 0x55, 0xB6,
-
-       0x3D, 0xCF, 0x75, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x3D, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x9D, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x9E, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x30, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x38, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0x99, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xC1, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x87, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
-
-static unsigned char warp_g400_tgzsf[] = {
-
-       0x00, 0x88, 0x98, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-       0xFF, 0x80, 0xC0, 0xE9,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x22, 0x40, 0x48, 0xBF,
-       0x2A, 0x40, 0x50, 0xBF,
-
-       0x32, 0x41, 0x49, 0xBF,
-       0x3A, 0x41, 0x51, 0xBF,
-
-       0xC3, 0x6B,
-       0xCB, 0x6B,
-       0x00, 0x88, 0x98, 0xE9,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x96, 0xE2,
-       0x41, 0x04,
-
-       0x7B, 0x43, 0xA0, 0xE8,
-       0x73, 0x4B, 0xA0, 0xE8,
-
-       0xAD, 0xEE, 0x29, 0x9F,
-       0x00, 0xE0,
-       0x49, 0x04,
-
-       0x90, 0xE2,
-       0x51, 0x04,
-       0x31, 0x46, 0xB1, 0xE8,
-
-       0x49, 0x41, 0xC0, 0xEC,
-       0x39, 0x57, 0xB1, 0xE8,
-
-       0x00, 0x04,
-       0x46, 0xE2,
-       0x73, 0x53, 0xA0, 0xE8,
-
-       0x51, 0x41, 0xC0, 0xEC,
-       0x31, 0x00,
-       0x39, 0x00,
-
-       0x6A, 0x80, 0x15, 0xEA,
-       0x08, 0x04,
-       0x10, 0x04,
-
-       0x51, 0x49, 0xC0, 0xEC,
-       0x2F, 0x41, 0x60, 0xEA,
-
-       0x31, 0x20,
-       0x39, 0x20,
-       0x1F, 0x42, 0xA0, 0xE8,
-
-       0x2A, 0x42, 0x4A, 0xBF,
-       0x27, 0x4A, 0xA0, 0xE8,
-
-       0x1A, 0x42, 0x52, 0xBF,
-       0x1E, 0x49, 0x60, 0xEA,
-
-       0x73, 0x7B, 0xC8, 0xEC,
-       0x26, 0x51, 0x60, 0xEA,
-
-       0x32, 0x40, 0x48, 0xBD,
-       0x22, 0x40, 0x50, 0xBD,
-
-       0x12, 0x41, 0x49, 0xBD,
-       0x3A, 0x41, 0x51, 0xBD,
-
-       0xBF, 0x2F, 0x26, 0xBD,
-       0x00, 0xE0,
-       0x7B, 0x72,
-
-       0x32, 0x20,
-       0x22, 0x20,
-       0x12, 0x20,
-       0x3A, 0x20,
-
-       0x46, 0x31, 0x46, 0xBF,
-       0x4E, 0x31, 0x4E, 0xBF,
-
-       0xB3, 0xE2, 0x2D, 0x9F,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x56, 0x31, 0x56, 0xBF,
-       0x47, 0x39, 0x47, 0xBF,
-
-       0x4F, 0x39, 0x4F, 0xBF,
-       0x57, 0x39, 0x57, 0xBF,
-
-       0x5C, 0x80, 0x07, 0xEA,
-       0x24, 0x41, 0x20, 0xE9,
-
-       0x42, 0x73, 0xF8, 0xEC,
-       0x00, 0xE0,
-       0x2D, 0x73,
-
-       0x33, 0x72,
-       0x0C, 0xE3,
-       0xA5, 0x2F, 0x1E, 0xBD,
-
-       0x43, 0x43, 0x2D, 0xDF,
-       0x4B, 0x4B, 0x2D, 0xDF,
-
-       0xAE, 0x1E, 0x26, 0xBD,
-       0x58, 0xE3,
-       0x33, 0x66,
-
-       0x53, 0x53, 0x2D, 0xDF,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0xB8, 0x38, 0x33, 0xBF,
-       0x00, 0xE0,
-       0x59, 0xE3,
-
-       0x1E, 0x12, 0x41, 0xE9,
-       0x1A, 0x22, 0x41, 0xE9,
-
-       0x2B, 0x40, 0x3D, 0xE9,
-       0x3F, 0x4B, 0xA0, 0xE8,
-
-       0x2D, 0x73,
-       0x30, 0x76,
-       0x05, 0x80, 0x3D, 0xEA,
-
-       0x37, 0x43, 0xA0, 0xE8,
-       0x3D, 0x53, 0xA0, 0xE8,
-
-       0x48, 0x70, 0xF8, 0xEC,
-       0x2B, 0x48, 0x3C, 0xE9,
-
-       0x1F, 0x27, 0xBC, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x15, 0xC0, 0x20, 0xE9,
-       0x15, 0xC0, 0x20, 0xE9,
-
-       0x18, 0x3A, 0x41, 0xE9,
-       0x1D, 0x32, 0x41, 0xE9,
-
-       0x2A, 0x40, 0x20, 0xE9,
-       0x56, 0x3D, 0x56, 0xDF,
-
-       0x46, 0x37, 0x46, 0xDF,
-       0x4E, 0x3F, 0x4E, 0xDF,
-
-       0x16, 0x30, 0x20, 0xE9,
-       0x4F, 0x3F, 0x4F, 0xDF,
-
-       0x47, 0x37, 0x47, 0xDF,
-       0x57, 0x3D, 0x57, 0xDF,
-
-       0x32, 0x32, 0x2D, 0xDF,
-       0x22, 0x22, 0x2D, 0xDF,
-
-       0x12, 0x12, 0x2D, 0xDF,
-       0x3A, 0x3A, 0x2D, 0xDF,
-
-       0x27, 0xCF, 0x74, 0xC2,
-       0x37, 0xCF, 0x74, 0xC4,
-
-       0x0A, 0x44, 0x4C, 0xB0,
-       0x02, 0x44, 0x54, 0xB0,
-
-       0x3D, 0xCF, 0x74, 0xC0,
-       0x34, 0x37, 0x20, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x38, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3C, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB2,
-       0x1A, 0x44, 0x54, 0xB2,
-
-       0x2E, 0x80, 0x3A, 0xEA,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x27, 0xCF, 0x75, 0xC0,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x32, 0x31, 0x5F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x33, 0x39, 0x5F, 0xE9,
-
-       0x3D, 0xCF, 0x75, 0xC2,
-       0x37, 0xCF, 0x75, 0xC4,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA6, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA3, 0x3D, 0x20, 0xE9,
-
-       0x2A, 0x44, 0x4C, 0xB4,
-       0x1A, 0x44, 0x54, 0xB4,
-
-       0x0A, 0x45, 0x4D, 0xB0,
-       0x02, 0x45, 0x55, 0xB0,
-
-       0x88, 0x73, 0x5E, 0xE9,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA0, 0x37, 0x20, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x3E, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x3F, 0x38, 0x4F, 0xE9,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x3A, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x3B, 0x39, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x4D, 0xB2,
-       0x1A, 0x45, 0x55, 0xB2,
-
-       0x0A, 0x45, 0x4D, 0xB4,
-       0x02, 0x45, 0x55, 0xB4,
-
-       0x27, 0xCF, 0x75, 0xC6,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0xA7, 0x30, 0x4F, 0xE9,
-       0x0A, 0x20,
-       0x02, 0x20,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x31, 0x27, 0x20, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA8, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x45, 0x4D, 0xB6,
-       0x1A, 0x45, 0x55, 0xB6,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x36, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x37, 0x39, 0x4F, 0xE9,
-
-       0x00, 0x80, 0x00, 0xE8,
-       0x2A, 0x20,
-       0x1A, 0x20,
-
-       0x2A, 0x46, 0x4E, 0xBF,
-       0x1A, 0x46, 0x56, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA4, 0x31, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA5, 0x39, 0x4F, 0xE9,
-
-       0x0A, 0x47, 0x4F, 0xBF,
-       0x02, 0x47, 0x57, 0xBF,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0xA1, 0x30, 0x4F, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0xA2, 0x38, 0x4F, 0xE9,
-
-       0x2A, 0x43, 0x4B, 0xBF,
-       0x1A, 0x43, 0x53, 0xBF,
-
-       0x30, 0x50, 0x2E, 0x9F,
-       0x35, 0x31, 0x4F, 0xE9,
-
-       0x38, 0x21, 0x2C, 0x9F,
-       0x39, 0x39, 0x4F, 0xE9,
-
-       0x31, 0x53, 0x2F, 0x9F,
-       0x80, 0x31, 0x57, 0xE9,
-
-       0x39, 0xE5, 0x2C, 0x9F,
-       0x81, 0x39, 0x57, 0xE9,
-
-       0x37, 0x48, 0x50, 0xBD,
-       0x8A, 0x36, 0x20, 0xE9,
-
-       0x86, 0x76, 0x57, 0xE9,
-       0x8B, 0x3E, 0x20, 0xE9,
-
-       0x82, 0x30, 0x57, 0xE9,
-       0x87, 0x77, 0x57, 0xE9,
-
-       0x83, 0x38, 0x57, 0xE9,
-       0x35, 0x49, 0x51, 0xBD,
-
-       0x84, 0x31, 0x5E, 0xE9,
-       0x30, 0x1F, 0x5F, 0xE9,
-
-       0x85, 0x39, 0x5E, 0xE9,
-       0x57, 0x25, 0x20, 0xE9,
-
-       0x2B, 0x48, 0x20, 0xE9,
-       0x1D, 0x37, 0xE1, 0xEA,
-
-       0x1E, 0x35, 0xE1, 0xEA,
-       0x00, 0xE0,
-       0x26, 0x77,
-
-       0x24, 0x49, 0x20, 0xE9,
-       0x9D, 0xFF, 0x20, 0xEA,
-
-       0x16, 0x26, 0x20, 0xE9,
-       0x57, 0x2E, 0xBF, 0xEA,
-
-       0x1C, 0x46, 0xA0, 0xE8,
-       0x23, 0x4E, 0xA0, 0xE8,
-
-       0x2B, 0x56, 0xA0, 0xE8,
-       0x1D, 0x47, 0xA0, 0xE8,
-
-       0x24, 0x4F, 0xA0, 0xE8,
-       0x2C, 0x57, 0xA0, 0xE8,
-
-       0x1C, 0x00,
-       0x23, 0x00,
-       0x2B, 0x00,
-       0x00, 0xE0,
-
-       0x1D, 0x00,
-       0x24, 0x00,
-       0x2C, 0x00,
-       0x00, 0xE0,
-
-       0x1C, 0x65,
-       0x23, 0x65,
-       0x2B, 0x65,
-       0x00, 0xE0,
-
-       0x1D, 0x65,
-       0x24, 0x65,
-       0x2C, 0x65,
-       0x00, 0xE0,
-
-       0x1C, 0x23, 0x60, 0xEC,
-       0x36, 0xD7, 0x36, 0xAD,
-
-       0x2B, 0x80, 0x60, 0xEC,
-       0x1D, 0x24, 0x60, 0xEC,
-
-       0x3E, 0xD7, 0x3E, 0xAD,
-       0x2C, 0x80, 0x60, 0xEC,
-
-       0x1C, 0x2B, 0xDE, 0xE8,
-       0x23, 0x80, 0xDE, 0xE8,
-
-       0x36, 0x80, 0x36, 0xBD,
-       0x3E, 0x80, 0x3E, 0xBD,
-
-       0x33, 0xD7, 0x1C, 0xBD,
-       0x3B, 0xD7, 0x23, 0xBD,
-
-       0x46, 0x80, 0x46, 0xCF,
-       0x4F, 0x80, 0x4F, 0xCF,
-
-       0x56, 0x33, 0x56, 0xCF,
-       0x47, 0x3B, 0x47, 0xCF,
-
-       0xC5, 0xFF, 0x20, 0xEA,
-       0x00, 0x80, 0x00, 0xE8,
-
-       0x4E, 0x33, 0x4E, 0xCF,
-       0x57, 0x3B, 0x57, 0xCF,
-
-       0x8B, 0xFF, 0x20, 0xEA,
-       0x57, 0xC0, 0xBF, 0xEA,
-
-       0x00, 0x80, 0xA0, 0xE9,
-       0x00, 0x00, 0xD8, 0xEC,
-
-};
index 651b93c..9aad484 100644 (file)
  *    Gareth Hughes <gareth@valinux.com>
  */
 
+#include <linux/firmware.h>
+#include <linux/ihex.h>
+#include <linux/platform_device.h>
+
 #include "drmP.h"
 #include "drm.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
-#include "mga_ucode.h"
+
+#define FIRMWARE_G200 "matrox/g200_warp.fw"
+#define FIRMWARE_G400 "matrox/g400_warp.fw"
+
+MODULE_FIRMWARE(FIRMWARE_G200);
+MODULE_FIRMWARE(FIRMWARE_G400);
 
 #define MGA_WARP_CODE_ALIGN            256     /* in bytes */
 
-#define WARP_UCODE_SIZE( which )                                       \
-       ((sizeof(which) / MGA_WARP_CODE_ALIGN + 1) * MGA_WARP_CODE_ALIGN)
-
-#define WARP_UCODE_INSTALL( which, where )                             \
-do {                                                                   \
-       DRM_DEBUG( " pcbase = 0x%08lx  vcbase = %p\n", pcbase, vcbase );\
-       dev_priv->warp_pipe_phys[where] = pcbase;                       \
-       memcpy( vcbase, which, sizeof(which) );                         \
-       pcbase += WARP_UCODE_SIZE( which );                             \
-       vcbase += WARP_UCODE_SIZE( which );                             \
-} while (0)
-
-static const unsigned int mga_warp_g400_microcode_size =
-    (WARP_UCODE_SIZE(warp_g400_tgz) +
-     WARP_UCODE_SIZE(warp_g400_tgza) +
-     WARP_UCODE_SIZE(warp_g400_tgzaf) +
-     WARP_UCODE_SIZE(warp_g400_tgzf) +
-     WARP_UCODE_SIZE(warp_g400_tgzs) +
-     WARP_UCODE_SIZE(warp_g400_tgzsa) +
-     WARP_UCODE_SIZE(warp_g400_tgzsaf) +
-     WARP_UCODE_SIZE(warp_g400_tgzsf) +
-     WARP_UCODE_SIZE(warp_g400_t2gz) +
-     WARP_UCODE_SIZE(warp_g400_t2gza) +
-     WARP_UCODE_SIZE(warp_g400_t2gzaf) +
-     WARP_UCODE_SIZE(warp_g400_t2gzf) +
-     WARP_UCODE_SIZE(warp_g400_t2gzs) +
-     WARP_UCODE_SIZE(warp_g400_t2gzsa) +
-     WARP_UCODE_SIZE(warp_g400_t2gzsaf) + WARP_UCODE_SIZE(warp_g400_t2gzsf));
-
-static const unsigned int mga_warp_g200_microcode_size =
-    (WARP_UCODE_SIZE(warp_g200_tgz) +
-     WARP_UCODE_SIZE(warp_g200_tgza) +
-     WARP_UCODE_SIZE(warp_g200_tgzaf) +
-     WARP_UCODE_SIZE(warp_g200_tgzf) +
-     WARP_UCODE_SIZE(warp_g200_tgzs) +
-     WARP_UCODE_SIZE(warp_g200_tgzsa) +
-     WARP_UCODE_SIZE(warp_g200_tgzsaf) + WARP_UCODE_SIZE(warp_g200_tgzsf));
-
-unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv)
+#define WARP_UCODE_SIZE(size)          ALIGN(size, MGA_WARP_CODE_ALIGN)
+
+int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
 {
+       unsigned char *vcbase = dev_priv->warp->handle;
+       unsigned long pcbase = dev_priv->warp->offset;
+       const char *firmware_name;
+       struct platform_device *pdev;
+       const struct firmware *fw = NULL;
+       const struct ihex_binrec *rec;
+       unsigned int size;
+       int n_pipes, where;
+       int rc = 0;
+
        switch (dev_priv->chipset) {
        case MGA_CARD_TYPE_G400:
        case MGA_CARD_TYPE_G550:
-               return PAGE_ALIGN(mga_warp_g400_microcode_size);
+               firmware_name = FIRMWARE_G400;
+               n_pipes = MGA_MAX_G400_PIPES;
+               break;
        case MGA_CARD_TYPE_G200:
-               return PAGE_ALIGN(mga_warp_g200_microcode_size);
+               firmware_name = FIRMWARE_G200;
+               n_pipes = MGA_MAX_G200_PIPES;
+               break;
        default:
-               return 0;
+               return -EINVAL;
        }
-}
-
-static int mga_warp_install_g400_microcode(drm_mga_private_t * dev_priv)
-{
-       unsigned char *vcbase = dev_priv->warp->handle;
-       unsigned long pcbase = dev_priv->warp->offset;
-
-       memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
-
-       WARP_UCODE_INSTALL(warp_g400_tgz, MGA_WARP_TGZ);
-       WARP_UCODE_INSTALL(warp_g400_tgzf, MGA_WARP_TGZF);
-       WARP_UCODE_INSTALL(warp_g400_tgza, MGA_WARP_TGZA);
-       WARP_UCODE_INSTALL(warp_g400_tgzaf, MGA_WARP_TGZAF);
-       WARP_UCODE_INSTALL(warp_g400_tgzs, MGA_WARP_TGZS);
-       WARP_UCODE_INSTALL(warp_g400_tgzsf, MGA_WARP_TGZSF);
-       WARP_UCODE_INSTALL(warp_g400_tgzsa, MGA_WARP_TGZSA);
-       WARP_UCODE_INSTALL(warp_g400_tgzsaf, MGA_WARP_TGZSAF);
-
-       WARP_UCODE_INSTALL(warp_g400_t2gz, MGA_WARP_T2GZ);
-       WARP_UCODE_INSTALL(warp_g400_t2gzf, MGA_WARP_T2GZF);
-       WARP_UCODE_INSTALL(warp_g400_t2gza, MGA_WARP_T2GZA);
-       WARP_UCODE_INSTALL(warp_g400_t2gzaf, MGA_WARP_T2GZAF);
-       WARP_UCODE_INSTALL(warp_g400_t2gzs, MGA_WARP_T2GZS);
-       WARP_UCODE_INSTALL(warp_g400_t2gzsf, MGA_WARP_T2GZSF);
-       WARP_UCODE_INSTALL(warp_g400_t2gzsa, MGA_WARP_T2GZSA);
-       WARP_UCODE_INSTALL(warp_g400_t2gzsaf, MGA_WARP_T2GZSAF);
-
-       return 0;
-}
-
-static int mga_warp_install_g200_microcode(drm_mga_private_t * dev_priv)
-{
-       unsigned char *vcbase = dev_priv->warp->handle;
-       unsigned long pcbase = dev_priv->warp->offset;
-
-       memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
-
-       WARP_UCODE_INSTALL(warp_g200_tgz, MGA_WARP_TGZ);
-       WARP_UCODE_INSTALL(warp_g200_tgzf, MGA_WARP_TGZF);
-       WARP_UCODE_INSTALL(warp_g200_tgza, MGA_WARP_TGZA);
-       WARP_UCODE_INSTALL(warp_g200_tgzaf, MGA_WARP_TGZAF);
-       WARP_UCODE_INSTALL(warp_g200_tgzs, MGA_WARP_TGZS);
-       WARP_UCODE_INSTALL(warp_g200_tgzsf, MGA_WARP_TGZSF);
-       WARP_UCODE_INSTALL(warp_g200_tgzsa, MGA_WARP_TGZSA);
-       WARP_UCODE_INSTALL(warp_g200_tgzsaf, MGA_WARP_TGZSAF);
 
-       return 0;
-}
+       pdev = platform_device_register_simple("mga_warp", 0, NULL, 0);
+       if (IS_ERR(pdev)) {
+               DRM_ERROR("mga: Failed to register microcode\n");
+               return PTR_ERR(pdev);
+       }
+       rc = request_ihex_firmware(&fw, firmware_name, &pdev->dev);
+       platform_device_unregister(pdev);
+       if (rc) {
+               DRM_ERROR("mga: Failed to load microcode \"%s\"\n",
+                         firmware_name);
+               return rc;
+       }
 
-int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
-{
-       const unsigned int size = mga_warp_microcode_size(dev_priv);
+       size = 0;
+       where = 0;
+       for (rec = (const struct ihex_binrec *)fw->data;
+            rec;
+            rec = ihex_next_binrec(rec)) {
+               size += WARP_UCODE_SIZE(be16_to_cpu(rec->len));
+               where++;
+       }
 
+       if (where != n_pipes) {
+               DRM_ERROR("mga: Invalid microcode \"%s\"\n", firmware_name);
+               rc = -EINVAL;
+               goto out;
+       }
+       size = PAGE_ALIGN(size);
        DRM_DEBUG("MGA ucode size = %d bytes\n", size);
        if (size > dev_priv->warp->size) {
                DRM_ERROR("microcode too large! (%u > %lu)\n",
                          size, dev_priv->warp->size);
-               return -ENOMEM;
+               rc = -ENOMEM;
+               goto out;
        }
 
-       switch (dev_priv->chipset) {
-       case MGA_CARD_TYPE_G400:
-       case MGA_CARD_TYPE_G550:
-               return mga_warp_install_g400_microcode(dev_priv);
-       case MGA_CARD_TYPE_G200:
-               return mga_warp_install_g200_microcode(dev_priv);
-       default:
-               return -EINVAL;
+       memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
+
+       where = 0;
+       for (rec = (const struct ihex_binrec *)fw->data;
+            rec;
+            rec = ihex_next_binrec(rec)) {
+               unsigned int src_size, dst_size;
+
+               DRM_DEBUG(" pcbase = 0x%08lx  vcbase = %p\n", pcbase, vcbase);
+               dev_priv->warp_pipe_phys[where] = pcbase;
+               src_size = be16_to_cpu(rec->len);
+               dst_size = WARP_UCODE_SIZE(src_size);
+               memcpy(vcbase, rec->data, src_size);
+               pcbase += dst_size;
+               vcbase += dst_size;
+               where++;
        }
+
+out:
+       release_firmware(fw);
+       return rc;
 }
 
 #define WMISC_EXPECTED         (MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
index c75fd35..4c39a40 100644 (file)
@@ -29,6 +29,9 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
+#include <linux/firmware.h>
+#include <linux/platform_device.h>
+
 #include "drmP.h"
 #include "drm.h"
 #include "r128_drm.h"
 
 #define R128_FIFO_DEBUG                0
 
-/* CCE microcode (from ATI) */
-static u32 r128_cce_microcode[] = {
-       0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0,
-       1617039951, 0, 774592877, 0, 1987540286, 0, 2307490946U, 0,
-       599558925, 0, 589505315, 0, 596487092, 0, 589505315, 1,
-       11544576, 1, 206848, 1, 311296, 1, 198656, 2, 912273422, 11,
-       262144, 0, 0, 1, 33559837, 1, 7438, 1, 14809, 1, 6615, 12, 28,
-       1, 6614, 12, 28, 2, 23, 11, 18874368, 0, 16790922, 1, 409600, 9,
-       30, 1, 147854772, 16, 420483072, 3, 8192, 0, 10240, 1, 198656,
-       1, 15630, 1, 51200, 10, 34858, 9, 42, 1, 33559823, 2, 10276, 1,
-       15717, 1, 15718, 2, 43, 1, 15936948, 1, 570480831, 1, 14715071,
-       12, 322123831, 1, 33953125, 12, 55, 1, 33559908, 1, 15718, 2,
-       46, 4, 2099258, 1, 526336, 1, 442623, 4, 4194365, 1, 509952, 1,
-       459007, 3, 0, 12, 92, 2, 46, 12, 176, 1, 15734, 1, 206848, 1,
-       18432, 1, 133120, 1, 100670734, 1, 149504, 1, 165888, 1,
-       15975928, 1, 1048576, 6, 3145806, 1, 15715, 16, 2150645232U, 2,
-       268449859, 2, 10307, 12, 176, 1, 15734, 1, 15735, 1, 15630, 1,
-       15631, 1, 5253120, 6, 3145810, 16, 2150645232U, 1, 15864, 2, 82,
-       1, 343310, 1, 1064207, 2, 3145813, 1, 15728, 1, 7817, 1, 15729,
-       3, 15730, 12, 92, 2, 98, 1, 16168, 1, 16167, 1, 16002, 1, 16008,
-       1, 15974, 1, 15975, 1, 15990, 1, 15976, 1, 15977, 1, 15980, 0,
-       15981, 1, 10240, 1, 5253120, 1, 15720, 1, 198656, 6, 110, 1,
-       180224, 1, 103824738, 2, 112, 2, 3145839, 0, 536885440, 1,
-       114880, 14, 125, 12, 206975, 1, 33559995, 12, 198784, 0,
-       33570236, 1, 15803, 0, 15804, 3, 294912, 1, 294912, 3, 442370,
-       1, 11544576, 0, 811612160, 1, 12593152, 1, 11536384, 1,
-       14024704, 7, 310382726, 0, 10240, 1, 14796, 1, 14797, 1, 14793,
-       1, 14794, 0, 14795, 1, 268679168, 1, 9437184, 1, 268449792, 1,
-       198656, 1, 9452827, 1, 1075854602, 1, 1075854603, 1, 557056, 1,
-       114880, 14, 159, 12, 198784, 1, 1109409213, 12, 198783, 1,
-       1107312059, 12, 198784, 1, 1109409212, 2, 162, 1, 1075854781, 1,
-       1073757627, 1, 1075854780, 1, 540672, 1, 10485760, 6, 3145894,
-       16, 274741248, 9, 168, 3, 4194304, 3, 4209949, 0, 0, 0, 256, 14,
-       174, 1, 114857, 1, 33560007, 12, 176, 0, 10240, 1, 114858, 1,
-       33560018, 1, 114857, 3, 33560007, 1, 16008, 1, 114874, 1,
-       33560360, 1, 114875, 1, 33560154, 0, 15963, 0, 256, 0, 4096, 1,
-       409611, 9, 188, 0, 10240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
+#define FIRMWARE_NAME          "r128/r128_cce.bin"
+
+MODULE_FIRMWARE(FIRMWARE_NAME);
 
 static int R128_READ_PLL(struct drm_device * dev, int addr)
 {
@@ -176,20 +138,50 @@ static int r128_do_wait_for_idle(drm_r128_private_t * dev_priv)
  */
 
 /* Load the microcode for the CCE */
-static void r128_cce_load_microcode(drm_r128_private_t * dev_priv)
+static int r128_cce_load_microcode(drm_r128_private_t *dev_priv)
 {
-       int i;
+       struct platform_device *pdev;
+       const struct firmware *fw;
+       const __be32 *fw_data;
+       int rc, i;
 
        DRM_DEBUG("\n");
 
+       pdev = platform_device_register_simple("r128_cce", 0, NULL, 0);
+       if (IS_ERR(pdev)) {
+               printk(KERN_ERR "r128_cce: Failed to register firmware\n");
+               return PTR_ERR(pdev);
+       }
+       rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev);
+       platform_device_unregister(pdev);
+       if (rc) {
+               printk(KERN_ERR "r128_cce: Failed to load firmware \"%s\"\n",
+                      FIRMWARE_NAME);
+               return rc;
+       }
+
+       if (fw->size != 256 * 8) {
+               printk(KERN_ERR
+                      "r128_cce: Bogus length %zu in firmware \"%s\"\n",
+                      fw->size, FIRMWARE_NAME);
+               rc = -EINVAL;
+               goto out_release;
+       }
+
        r128_do_wait_for_idle(dev_priv);
 
+       fw_data = (const __be32 *)fw->data;
        R128_WRITE(R128_PM4_MICROCODE_ADDR, 0);
        for (i = 0; i < 256; i++) {
-               R128_WRITE(R128_PM4_MICROCODE_DATAH, r128_cce_microcode[i * 2]);
+               R128_WRITE(R128_PM4_MICROCODE_DATAH,
+                          be32_to_cpup(&fw_data[i * 2]));
                R128_WRITE(R128_PM4_MICROCODE_DATAL,
-                          r128_cce_microcode[i * 2 + 1]);
+                          be32_to_cpup(&fw_data[i * 2 + 1]));
        }
+
+out_release:
+       release_firmware(fw);
+       return rc;
 }
 
 /* Flush any pending commands to the CCE.  This should only be used just
@@ -350,9 +342,15 @@ static void r128_cce_init_ring_buffer(struct drm_device * dev,
 static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 {
        drm_r128_private_t *dev_priv;
+       int rc;
 
        DRM_DEBUG("\n");
 
+       if (dev->dev_private) {
+               DRM_DEBUG("called when already initialized\n");
+               return -EINVAL;
+       }
+
        dev_priv = kzalloc(sizeof(drm_r128_private_t), GFP_KERNEL);
        if (dev_priv == NULL)
                return -ENOMEM;
@@ -575,13 +573,18 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 #endif
 
        r128_cce_init_ring_buffer(dev, dev_priv);
-       r128_cce_load_microcode(dev_priv);
+       rc = r128_cce_load_microcode(dev_priv);
 
        dev->dev_private = (void *)dev_priv;
 
        r128_do_engine_reset(dev);
 
-       return 0;
+       if (rc) {
+               DRM_ERROR("Failed to load firmware!\n");
+               r128_do_cleanup_cce(dev);
+       }
+
+       return rc;
 }
 
 int r128_do_cleanup_cce(struct drm_device * dev)
@@ -649,6 +652,8 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_pri
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) {
                DRM_DEBUG("while CCE running\n");
                return 0;
@@ -671,6 +676,8 @@ int r128_cce_stop(struct drm_device *dev, void *data, struct drm_file *file_priv
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        /* Flush any pending CCE commands.  This ensures any outstanding
         * commands are exectuted by the engine before we turn it off.
         */
@@ -708,10 +715,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_pri
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-       if (!dev_priv) {
-               DRM_DEBUG("called before init done\n");
-               return -EINVAL;
-       }
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
        r128_do_cce_reset(dev_priv);
 
@@ -728,6 +732,8 @@ int r128_cce_idle(struct drm_device *dev, void *data, struct drm_file *file_priv
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        if (dev_priv->cce_running) {
                r128_do_cce_flush(dev_priv);
        }
@@ -741,6 +747,8 @@ int r128_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev->dev_private);
+
        return r128_do_engine_reset(dev);
 }
 
index 797a26c..3c60829 100644 (file)
@@ -422,6 +422,14 @@ static __inline__ void r128_update_ring_snapshot(drm_r128_private_t * dev_priv)
  * Misc helper macros
  */
 
+#define DEV_INIT_TEST_WITH_RETURN(_dev_priv)                           \
+do {                                                                   \
+       if (!_dev_priv) {                                               \
+               DRM_ERROR("called with no initialization\n");           \
+               return -EINVAL;                                         \
+       }                                                               \
+} while (0)
+
 #define RING_SPACE_TEST_WITH_RETURN( dev_priv )                                \
 do {                                                                   \
        drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i;          \
index 026a48c..af2665c 100644 (file)
@@ -1244,14 +1244,18 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
 static int r128_cce_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
-       drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+       drm_r128_sarea_t *sarea_priv;
        drm_r128_clear_t *clear = data;
        DRM_DEBUG("\n");
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
+       sarea_priv = dev_priv->sarea_priv;
+
        if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
                sarea_priv->nbox = R128_NR_SAREA_CLIPRECTS;
 
@@ -1312,6 +1316,8 @@ static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *fi
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
        if (!dev_priv->page_flipping)
@@ -1331,6 +1337,8 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fi
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
        if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
@@ -1354,10 +1362,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-       if (!dev_priv) {
-               DRM_ERROR("called with no initialization\n");
-               return -EINVAL;
-       }
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
        DRM_DEBUG("pid=%d index=%d count=%d discard=%d\n",
                  DRM_CURRENTPID, vertex->idx, vertex->count, vertex->discard);
@@ -1410,10 +1415,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-       if (!dev_priv) {
-               DRM_ERROR("called with no initialization\n");
-               return -EINVAL;
-       }
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
        DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
                  elts->idx, elts->start, elts->end, elts->discard);
@@ -1476,6 +1478,8 @@ static int r128_cce_blit(struct drm_device *dev, void *data, struct drm_file *fi
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        DRM_DEBUG("pid=%d index=%d\n", DRM_CURRENTPID, blit->idx);
 
        if (blit->idx < 0 || blit->idx >= dma->buf_count) {
@@ -1501,6 +1505,8 @@ static int r128_cce_depth(struct drm_device *dev, void *data, struct drm_file *f
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
        ret = -EINVAL;
@@ -1531,6 +1537,8 @@ static int r128_cce_stipple(struct drm_device *dev, void *data, struct drm_file
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
        if (DRM_COPY_FROM_USER(&mask, stipple->mask, 32 * sizeof(u32)))
                return -EFAULT;
 
@@ -1555,10 +1563,7 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-       if (!dev_priv) {
-               DRM_ERROR("called with no initialization\n");
-               return -EINVAL;
-       }
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
        DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
                  indirect->idx, indirect->start, indirect->end,
@@ -1620,10 +1625,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
        drm_r128_getparam_t *param = data;
        int value;
 
-       if (!dev_priv) {
-               DRM_ERROR("called with no initialization\n");
-               return -EINVAL;
-       }
+       DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
 
index 2168d67..5982321 100644 (file)
@@ -1,7 +1,6 @@
 config DRM_RADEON_KMS
        bool "Enable modesetting on radeon by default"
        depends on DRM_RADEON
-       select DRM_TTM
        help
          Choose this option if you want kernel modesetting enabled by default,
          and you have a new enough userspace to support this. Running old
index 013d380..09a2892 100644 (file)
@@ -3,18 +3,53 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ccflags-y := -Iinclude/drm
+
+hostprogs-y := mkregtable
+
+quiet_cmd_mkregtable = MKREGTABLE $@
+      cmd_mkregtable = $(obj)/mkregtable $< > $@
+
+$(obj)/rn50_reg_safe.h: $(src)/reg_srcs/rn50 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/r100_reg_safe.h: $(src)/reg_srcs/r100 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/r200_reg_safe.h: $(src)/reg_srcs/r200 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/rv515_reg_safe.h: $(src)/reg_srcs/rv515 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/r300_reg_safe.h: $(src)/reg_srcs/r300 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/rs600_reg_safe.h: $(src)/reg_srcs/rs600 $(obj)/mkregtable
+       $(call if_changed,mkregtable)
+
+$(obj)/r100.o: $(obj)/r100_reg_safe.h $(obj)/rn50_reg_safe.h
+
+$(obj)/r200.o: $(obj)/r200_reg_safe.h
+
+$(obj)/rv515.o: $(obj)/rv515_reg_safe.h
+
+$(obj)/r300.o: $(obj)/r300_reg_safe.h
+
+$(obj)/rs600.o: $(obj)/rs600_reg_safe.h
+
 radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \
        radeon_irq.o r300_cmdbuf.o r600_cp.o
-
-radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
+# add KMS driver
+radeon-y += radeon_device.o radeon_kms.o \
        radeon_atombios.o radeon_agp.o atombios_crtc.o radeon_combios.o \
        atom.o radeon_fence.o radeon_ttm.o radeon_object.o radeon_gart.o \
        radeon_legacy_crtc.o radeon_legacy_encoders.o radeon_connectors.o \
        radeon_encoders.o radeon_display.o radeon_cursor.o radeon_i2c.o \
        radeon_clocks.o radeon_fb.o radeon_gem.o radeon_ring.o radeon_irq_kms.o \
        radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
-       rs400.o rs600.o rs690.o rv515.o r520.o r600.o rs780.o rv770.o \
-       radeon_test.o
+       rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \
+       r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \
+       r600_blit_kms.o
 
 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
 
index cf67928..5d40208 100644 (file)
@@ -2374,6 +2374,17 @@ typedef struct _ATOM_ANALOG_TV_INFO {
        ATOM_MODE_TIMING aModeTimings[MAX_SUPPORTED_TV_TIMING];
 } ATOM_ANALOG_TV_INFO;
 
+#define MAX_SUPPORTED_TV_TIMING_V1_2    3
+
+typedef struct _ATOM_ANALOG_TV_INFO_V1_2 {
+       ATOM_COMMON_TABLE_HEADER sHeader;
+       UCHAR                    ucTV_SupportedStandard;
+       UCHAR                    ucTV_BootUpDefaultStandard;
+       UCHAR                    ucExt_TV_ASIC_ID;
+       UCHAR                    ucExt_TV_ASIC_SlaveAddr;
+       ATOM_DTD_FORMAT          aModeTimings[MAX_SUPPORTED_TV_TIMING];
+} ATOM_ANALOG_TV_INFO_V1_2;
+
 /**************************************************************************/
 /*  VRAM usage and their defintions */
 
index 74d034f..6a01592 100644 (file)
 #include "atom.h"
 #include "atom-bits.h"
 
+/* evil but including atombios.h is much worse */
+bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
+                               SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing,
+                               int32_t *pixel_clock);
 static void atombios_overscan_setup(struct drm_crtc *crtc,
                                    struct drm_display_mode *mode,
                                    struct drm_display_mode *adjusted_mode)
@@ -89,17 +93,32 @@ static void atombios_scaler_setup(struct drm_crtc *crtc)
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
        ENABLE_SCALER_PS_ALLOCATION args;
        int index = GetIndexIntoMasterTable(COMMAND, EnableScaler);
+
        /* fixme - fill in enc_priv for atom dac */
        enum radeon_tv_std tv_std = TV_STD_NTSC;
+       bool is_tv = false, is_cv = false;
+       struct drm_encoder *encoder;
 
        if (!ASIC_IS_AVIVO(rdev) && radeon_crtc->crtc_id)
                return;
 
+       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+               /* find tv std */
+               if (encoder->crtc == crtc) {
+                       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+                       if (radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT) {
+                               struct radeon_encoder_atom_dac *tv_dac = radeon_encoder->enc_priv;
+                               tv_std = tv_dac->tv_std;
+                               is_tv = true;
+                       }
+               }
+       }
+
        memset(&args, 0, sizeof(args));
 
        args.ucScaler = radeon_crtc->crtc_id;
 
-       if (radeon_crtc->devices & (ATOM_DEVICE_TV_SUPPORT)) {
+       if (is_tv) {
                switch (tv_std) {
                case TV_STD_NTSC:
                default:
@@ -128,7 +147,7 @@ static void atombios_scaler_setup(struct drm_crtc *crtc)
                        break;
                }
                args.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
-       } else if (radeon_crtc->devices & (ATOM_DEVICE_CV_SUPPORT)) {
+       } else if (is_cv) {
                args.ucTVStandard = ATOM_TV_CV;
                args.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
        } else {
@@ -151,9 +170,9 @@ static void atombios_scaler_setup(struct drm_crtc *crtc)
                }
        }
        atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
-       if (radeon_crtc->devices & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)
-           && rdev->family >= CHIP_RV515 && rdev->family <= CHIP_RV570) {
-               atom_rv515_force_tv_scaler(rdev);
+       if ((is_tv || is_cv)
+           && rdev->family >= CHIP_RV515 && rdev->family <= CHIP_R580) {
+               atom_rv515_force_tv_scaler(rdev, radeon_crtc);
        }
 }
 
@@ -370,6 +389,7 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                                        pll_flags |= RADEON_PLL_USE_REF_DIV;
                        }
                        radeon_encoder = to_radeon_encoder(encoder);
+                       break;
                }
        }
 
@@ -468,6 +488,11 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        }
 
        switch (crtc->fb->bits_per_pixel) {
+       case 8:
+               fb_format =
+                   AVIVO_D1GRPH_CONTROL_DEPTH_8BPP |
+                   AVIVO_D1GRPH_CONTROL_8BPP_INDEXED;
+               break;
        case 15:
                fb_format =
                    AVIVO_D1GRPH_CONTROL_DEPTH_16BPP |
@@ -551,42 +576,68 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc,
        struct radeon_device *rdev = dev->dev_private;
        struct drm_encoder *encoder;
        SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION crtc_timing;
+       int need_tv_timings = 0;
+       bool ret;
 
        /* TODO color tiling */
        memset(&crtc_timing, 0, sizeof(crtc_timing));
 
-       /* TODO tv */
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-
+               /* find tv std */
+               if (encoder->crtc == crtc) {
+                       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+
+                       if (radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT) {
+                               struct radeon_encoder_atom_dac *tv_dac = radeon_encoder->enc_priv;
+                               if (tv_dac) {
+                                       if (tv_dac->tv_std == TV_STD_NTSC ||
+                                           tv_dac->tv_std == TV_STD_NTSC_J ||
+                                           tv_dac->tv_std == TV_STD_PAL_M)
+                                               need_tv_timings = 1;
+                                       else
+                                               need_tv_timings = 2;
+                                       break;
+                               }
+                       }
+               }
        }
 
        crtc_timing.ucCRTC = radeon_crtc->crtc_id;
-       crtc_timing.usH_Total = adjusted_mode->crtc_htotal;
-       crtc_timing.usH_Disp = adjusted_mode->crtc_hdisplay;
-       crtc_timing.usH_SyncStart = adjusted_mode->crtc_hsync_start;
-       crtc_timing.usH_SyncWidth =
-           adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
+       if (need_tv_timings) {
+               ret = radeon_atom_get_tv_timings(rdev, need_tv_timings - 1,
+                                                &crtc_timing, &adjusted_mode->clock);
+               if (ret == false)
+                       need_tv_timings = 0;
+       }
 
-       crtc_timing.usV_Total = adjusted_mode->crtc_vtotal;
-       crtc_timing.usV_Disp = adjusted_mode->crtc_vdisplay;
-       crtc_timing.usV_SyncStart = adjusted_mode->crtc_vsync_start;
-       crtc_timing.usV_SyncWidth =
-           adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start;
+       if (!need_tv_timings) {
+               crtc_timing.usH_Total = adjusted_mode->crtc_htotal;
+               crtc_timing.usH_Disp = adjusted_mode->crtc_hdisplay;
+               crtc_timing.usH_SyncStart = adjusted_mode->crtc_hsync_start;
+               crtc_timing.usH_SyncWidth =
+                       adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
 
-       if (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC)
-               crtc_timing.susModeMiscInfo.usAccess |= ATOM_VSYNC_POLARITY;
+               crtc_timing.usV_Total = adjusted_mode->crtc_vtotal;
+               crtc_timing.usV_Disp = adjusted_mode->crtc_vdisplay;
+               crtc_timing.usV_SyncStart = adjusted_mode->crtc_vsync_start;
+               crtc_timing.usV_SyncWidth =
+                       adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start;
 
-       if (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC)
-               crtc_timing.susModeMiscInfo.usAccess |= ATOM_HSYNC_POLARITY;
+               if (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC)
+                       crtc_timing.susModeMiscInfo.usAccess |= ATOM_VSYNC_POLARITY;
 
-       if (adjusted_mode->flags & DRM_MODE_FLAG_CSYNC)
-               crtc_timing.susModeMiscInfo.usAccess |= ATOM_COMPOSITESYNC;
+               if (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC)
+                       crtc_timing.susModeMiscInfo.usAccess |= ATOM_HSYNC_POLARITY;
 
-       if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
-               crtc_timing.susModeMiscInfo.usAccess |= ATOM_INTERLACE;
+               if (adjusted_mode->flags & DRM_MODE_FLAG_CSYNC)
+                       crtc_timing.susModeMiscInfo.usAccess |= ATOM_COMPOSITESYNC;
 
-       if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-               crtc_timing.susModeMiscInfo.usAccess |= ATOM_DOUBLE_CLOCK_MODE;
+               if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
+                       crtc_timing.susModeMiscInfo.usAccess |= ATOM_INTERLACE;
+
+               if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                       crtc_timing.susModeMiscInfo.usAccess |= ATOM_DOUBLE_CLOCK_MODE;
+       }
 
        atombios_crtc_set_pll(crtc, adjusted_mode);
        atombios_crtc_set_timing(crtc, &crtc_timing);
diff --git a/drivers/gpu/drm/radeon/avivod.h b/drivers/gpu/drm/radeon/avivod.h
new file mode 100644 (file)
index 0000000..e2b92c4
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef AVIVOD_H
+#define AVIVOD_H
+
+
+#define        D1CRTC_CONTROL                                  0x6080
+#define                CRTC_EN                                         (1 << 0)
+#define        D1CRTC_UPDATE_LOCK                              0x60E8
+#define        D1GRPH_PRIMARY_SURFACE_ADDRESS                  0x6110
+#define        D1GRPH_SECONDARY_SURFACE_ADDRESS                0x6118
+
+#define        D2CRTC_CONTROL                                  0x6880
+#define        D2CRTC_UPDATE_LOCK                              0x68E8
+#define        D2GRPH_PRIMARY_SURFACE_ADDRESS                  0x6910
+#define        D2GRPH_SECONDARY_SURFACE_ADDRESS                0x6918
+
+#define        D1VGA_CONTROL                                   0x0330
+#define                DVGA_CONTROL_MODE_ENABLE                        (1 << 0)
+#define                DVGA_CONTROL_TIMING_SELECT                      (1 << 8)
+#define                DVGA_CONTROL_SYNC_POLARITY_SELECT               (1 << 9)
+#define                DVGA_CONTROL_OVERSCAN_TIMING_SELECT             (1 << 10)
+#define                DVGA_CONTROL_OVERSCAN_COLOR_EN                  (1 << 16)
+#define                DVGA_CONTROL_ROTATE                             (1 << 24)
+#define D2VGA_CONTROL                                  0x0338
+
+#define        VGA_HDP_CONTROL                                 0x328
+#define                VGA_MEM_PAGE_SELECT_EN                          (1 << 0)
+#define                VGA_MEMORY_DISABLE                              (1 << 4)
+#define                VGA_RBBM_LOCK_DISABLE                           (1 << 8)
+#define                VGA_SOFT_RESET                                  (1 << 16)
+#define        VGA_MEMORY_BASE_ADDRESS                         0x0310
+#define        VGA_RENDER_CONTROL                              0x0300
+#define                VGA_VSTATUS_CNTL_MASK                           0x00030000
+
+/* AVIVO disable VGA rendering */
+static inline void radeon_avivo_vga_render_disable(struct radeon_device *rdev)
+{
+       u32 vga_render;
+       vga_render = RREG32(VGA_RENDER_CONTROL);
+       vga_render &= ~VGA_VSTATUS_CNTL_MASK;
+       WREG32(VGA_RENDER_CONTROL, vga_render);
+}
+
+#endif
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
new file mode 100644 (file)
index 0000000..fb211e5
--- /dev/null
@@ -0,0 +1,720 @@
+/* utility to create the register check tables
+ * this includes inlined list.h safe for userspace.
+ *
+ * Copyright 2009 Jerome Glisse
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Authors:
+ *     Jerome Glisse
+ *     Dave Airlie
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <regex.h>
+#include <libgen.h>
+
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:    the pointer to the member.
+ * @type:   the type of the container struct this is embedded in.
+ * @member: the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({          \
+       const typeof(((type *)0)->member)*__mptr = (ptr);    \
+                    (type *)((char *)__mptr - offsetof(type, member)); })
+
+/*
+ * Simple doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+struct list_head {
+       struct list_head *next, *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+       struct list_head name = LIST_HEAD_INIT(name)
+
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+       list->next = list;
+       list->prev = list;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+#ifndef CONFIG_DEBUG_LIST
+static inline void __list_add(struct list_head *new,
+                             struct list_head *prev, struct list_head *next)
+{
+       next->prev = new;
+       new->next = next;
+       new->prev = prev;
+       prev->next = new;
+}
+#else
+extern void __list_add(struct list_head *new,
+                      struct list_head *prev, struct list_head *next);
+#endif
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+       __list_add(new, head, head->next);
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+       __list_add(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head *prev, struct list_head *next)
+{
+       next->prev = prev;
+       prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+#ifndef CONFIG_DEBUG_LIST
+static inline void list_del(struct list_head *entry)
+{
+       __list_del(entry->prev, entry->next);
+       entry->next = (void *)0xDEADBEEF;
+       entry->prev = (void *)0xBEEFDEAD;
+}
+#else
+extern void list_del(struct list_head *entry);
+#endif
+
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace(struct list_head *old, struct list_head *new)
+{
+       new->next = old->next;
+       new->next->prev = new;
+       new->prev = old->prev;
+       new->prev->next = new;
+}
+
+static inline void list_replace_init(struct list_head *old,
+                                    struct list_head *new)
+{
+       list_replace(old, new);
+       INIT_LIST_HEAD(old);
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+static inline void list_del_init(struct list_head *entry)
+{
+       __list_del(entry->prev, entry->next);
+       INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+       __list_del(list->prev, list->next);
+       list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+                                 struct list_head *head)
+{
+       __list_del(list->prev, list->next);
+       list_add_tail(list, head);
+}
+
+/**
+ * list_is_last - tests whether @list is the last entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+static inline int list_is_last(const struct list_head *list,
+                              const struct list_head *head)
+{
+       return list->next == head;
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+       return head->next == head;
+}
+
+/**
+ * list_empty_careful - tests whether a list is empty and not being modified
+ * @head: the list to test
+ *
+ * Description:
+ * tests whether a list is empty _and_ checks that no other CPU might be
+ * in the process of modifying either member (next or prev)
+ *
+ * NOTE: using list_empty_careful() without synchronization
+ * can only be safe if the only activity that can happen
+ * to the list entry is list_del_init(). Eg. it cannot be used
+ * if another CPU could re-list_add() it.
+ */
+static inline int list_empty_careful(const struct list_head *head)
+{
+       struct list_head *next = head->next;
+       return (next == head) && (next == head->prev);
+}
+
+/**
+ * list_is_singular - tests whether a list has just one entry.
+ * @head: the list to test.
+ */
+static inline int list_is_singular(const struct list_head *head)
+{
+       return !list_empty(head) && (head->next == head->prev);
+}
+
+static inline void __list_cut_position(struct list_head *list,
+                                      struct list_head *head,
+                                      struct list_head *entry)
+{
+       struct list_head *new_first = entry->next;
+       list->next = head->next;
+       list->next->prev = list;
+       list->prev = entry;
+       entry->next = list;
+       head->next = new_first;
+       new_first->prev = head;
+}
+
+/**
+ * list_cut_position - cut a list into two
+ * @list: a new list to add all removed entries
+ * @head: a list with entries
+ * @entry: an entry within head, could be the head itself
+ *     and if so we won't cut the list
+ *
+ * This helper moves the initial part of @head, up to and
+ * including @entry, from @head to @list. You should
+ * pass on @entry an element you know is on @head. @list
+ * should be an empty list or a list you do not care about
+ * losing its data.
+ *
+ */
+static inline void list_cut_position(struct list_head *list,
+                                    struct list_head *head,
+                                    struct list_head *entry)
+{
+       if (list_empty(head))
+               return;
+       if (list_is_singular(head) && (head->next != entry && head != entry))
+               return;
+       if (entry == head)
+               INIT_LIST_HEAD(list);
+       else
+               __list_cut_position(list, head, entry);
+}
+
+static inline void __list_splice(const struct list_head *list,
+                                struct list_head *prev, struct list_head *next)
+{
+       struct list_head *first = list->next;
+       struct list_head *last = list->prev;
+
+       first->prev = prev;
+       prev->next = first;
+
+       last->next = next;
+       next->prev = last;
+}
+
+/**
+ * list_splice - join two lists, this is designed for stacks
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(const struct list_head *list,
+                              struct list_head *head)
+{
+       if (!list_empty(list))
+               __list_splice(list, head, head->next);
+}
+
+/**
+ * list_splice_tail - join two lists, each list being a queue
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice_tail(struct list_head *list,
+                                   struct list_head *head)
+{
+       if (!list_empty(list))
+               __list_splice(list, head->prev, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_init(struct list_head *list,
+                                   struct list_head *head)
+{
+       if (!list_empty(list)) {
+               __list_splice(list, head, head->next);
+               INIT_LIST_HEAD(list);
+       }
+}
+
+/**
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * Each of the lists is a queue.
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_tail_init(struct list_head *list,
+                                        struct list_head *head)
+{
+       if (!list_empty(list)) {
+               __list_splice(list, head->prev, head);
+               INIT_LIST_HEAD(list);
+       }
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:       the &struct list_head pointer.
+ * @type:      the type of the struct this is embedded in.
+ * @member:    the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+       container_of(ptr, type, member)
+
+/**
+ * list_first_entry - get the first element from a list
+ * @ptr:       the list head to take the element from.
+ * @type:      the type of the struct this is embedded in.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_first_entry(ptr, type, member) \
+       list_entry((ptr)->next, type, member)
+
+/**
+ * list_for_each       -       iterate over a list
+ * @pos:       the &struct list_head to use as a loop cursor.
+ * @head:      the head for your list.
+ */
+#define list_for_each(pos, head) \
+       for (pos = (head)->next; prefetch(pos->next), pos != (head); \
+               pos = pos->next)
+
+/**
+ * __list_for_each     -       iterate over a list
+ * @pos:       the &struct list_head to use as a loop cursor.
+ * @head:      the head for your list.
+ *
+ * This variant differs from list_for_each() in that it's the
+ * simplest possible list iteration code, no prefetching is done.
+ * Use this for code that knows the list to be very short (empty
+ * or 1 entry) most of the time.
+ */
+#define __list_for_each(pos, head) \
+       for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev  -       iterate over a list backwards
+ * @pos:       the &struct list_head to use as a loop cursor.
+ * @head:      the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+       for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \
+               pos = pos->prev)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:       the &struct list_head to use as a loop cursor.
+ * @n:         another &struct list_head to use as temporary storage
+ * @head:      the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+       for (pos = (head)->next, n = pos->next; pos != (head); \
+               pos = n, n = pos->next)
+
+/**
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:       the &struct list_head to use as a loop cursor.
+ * @n:         another &struct list_head to use as temporary storage
+ * @head:      the head for your list.
+ */
+#define list_for_each_prev_safe(pos, n, head) \
+       for (pos = (head)->prev, n = pos->prev; \
+            prefetch(pos->prev), pos != (head); \
+            pos = n, n = pos->prev)
+
+/**
+ * list_for_each_entry -       iterate over list of given type
+ * @pos:       the type * to use as a loop cursor.
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)                         \
+       for (pos = list_entry((head)->next, typeof(*pos), member);      \
+            &pos->member != (head);    \
+            pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:       the type * to use as a loop cursor.
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)                 \
+       for (pos = list_entry((head)->prev, typeof(*pos), member);      \
+            prefetch(pos->member.prev), &pos->member != (head);        \
+            pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
+ * @pos:       the type * to use as a start point
+ * @head:      the head of the list
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
+ */
+#define list_prepare_entry(pos, head, member) \
+       ((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue - continue iteration over list of given type
+ * @pos:       the type * to use as a loop cursor.
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue(pos, head, member)                \
+       for (pos = list_entry(pos->member.next, typeof(*pos), member);  \
+            prefetch(pos->member.next), &pos->member != (head);        \
+            pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:       the type * to use as a loop cursor.
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)                \
+       for (pos = list_entry(pos->member.prev, typeof(*pos), member);  \
+            prefetch(pos->member.prev), &pos->member != (head);        \
+            pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_from - iterate over list of given type from the current point
+ * @pos:       the type * to use as a loop cursor.
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from(pos, head, member)                    \
+       for (; prefetch(pos->member.next), &pos->member != (head);      \
+            pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:       the type * to use as a loop cursor.
+ * @n:         another type * to use as temporary storage
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)                 \
+       for (pos = list_entry((head)->next, typeof(*pos), member),      \
+               n = list_entry(pos->member.next, typeof(*pos), member); \
+            &pos->member != (head);                                    \
+            pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_continue
+ * @pos:       the type * to use as a loop cursor.
+ * @n:         another type * to use as temporary storage
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing after current point,
+ * safe against removal of list entry.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member)                \
+       for (pos = list_entry(pos->member.next, typeof(*pos), member),          \
+               n = list_entry(pos->member.next, typeof(*pos), member);         \
+            &pos->member != (head);                                            \
+            pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_from
+ * @pos:       the type * to use as a loop cursor.
+ * @n:         another type * to use as temporary storage
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type from current point, safe against
+ * removal of list entry.
+ */
+#define list_for_each_entry_safe_from(pos, n, head, member)                    \
+       for (n = list_entry(pos->member.next, typeof(*pos), member);            \
+            &pos->member != (head);                                            \
+            pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_reverse
+ * @pos:       the type * to use as a loop cursor.
+ * @n:         another type * to use as temporary storage
+ * @head:      the head for your list.
+ * @member:    the name of the list_struct within the struct.
+ *
+ * Iterate backwards over list of given type, safe against removal
+ * of list entry.
+ */
+#define list_for_each_entry_safe_reverse(pos, n, head, member)         \
+       for (pos = list_entry((head)->prev, typeof(*pos), member),      \
+               n = list_entry(pos->member.prev, typeof(*pos), member); \
+            &pos->member != (head);                                    \
+            pos = n, n = list_entry(n->member.prev, typeof(*n), member))
+
+struct offset {
+       struct list_head list;
+       unsigned offset;
+};
+
+struct table {
+       struct list_head offsets;
+       unsigned offset_max;
+       unsigned nentry;
+       unsigned *table;
+       char *gpu_prefix;
+};
+
+struct offset *offset_new(unsigned o)
+{
+       struct offset *offset;
+
+       offset = (struct offset *)malloc(sizeof(struct offset));
+       if (offset) {
+               INIT_LIST_HEAD(&offset->list);
+               offset->offset = o;
+       }
+       return offset;
+}
+
+void table_offset_add(struct table *t, struct offset *offset)
+{
+       list_add_tail(&offset->list, &t->offsets);
+}
+
+void table_init(struct table *t)
+{
+       INIT_LIST_HEAD(&t->offsets);
+       t->offset_max = 0;
+       t->nentry = 0;
+       t->table = NULL;
+}
+
+void table_print(struct table *t)
+{
+       unsigned nlloop, i, j, n, c, id;
+
+       nlloop = (t->nentry + 3) / 4;
+       c = t->nentry;
+       printf("static const unsigned %s_reg_safe_bm[%d] = {\n", t->gpu_prefix,
+              t->nentry);
+       for (i = 0, id = 0; i < nlloop; i++) {
+               n = 4;
+               if (n > c)
+                       n = c;
+               c -= n;
+               for (j = 0; j < n; j++) {
+                       if (j == 0)
+                               printf("\t");
+                       else
+                               printf(" ");
+                       printf("0x%08X,", t->table[id++]);
+               }
+               printf("\n");
+       }
+       printf("};\n");
+}
+
+int table_build(struct table *t)
+{
+       struct offset *offset;
+       unsigned i, m;
+
+       t->nentry = ((t->offset_max >> 2) + 31) / 32;
+       t->table = (unsigned *)malloc(sizeof(unsigned) * t->nentry);
+       if (t->table == NULL)
+               return -1;
+       memset(t->table, 0xff, sizeof(unsigned) * t->nentry);
+       list_for_each_entry(offset, &t->offsets, list) {
+               i = (offset->offset >> 2) / 32;
+               m = (offset->offset >> 2) & 31;
+               m = 1 << m;
+               t->table[i] ^= m;
+       }
+       return 0;
+}
+
+static char gpu_name[10];
+int parser_auth(struct table *t, const char *filename)
+{
+       FILE *file;
+       regex_t mask_rex;
+       regmatch_t match[4];
+       char buf[1024];
+       size_t end;
+       int len;
+       int done = 0;
+       int r;
+       unsigned o;
+       struct offset *offset;
+       char last_reg_s[10];
+       int last_reg;
+
+       if (regcomp
+           (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
+               fprintf(stderr, "Failed to compile regular expression\n");
+               return -1;
+       }
+       file = fopen(filename, "r");
+       if (file == NULL) {
+               fprintf(stderr, "Failed to open: %s\n", filename);
+               return -1;
+       }
+       fseek(file, 0, SEEK_END);
+       end = ftell(file);
+       fseek(file, 0, SEEK_SET);
+
+       /* get header */
+       if (fgets(buf, 1024, file) == NULL)
+               return -1;
+
+       /* first line will contain the last register
+        * and gpu name */
+       sscanf(buf, "%s %s", gpu_name, last_reg_s);
+       t->gpu_prefix = gpu_name;
+       last_reg = strtol(last_reg_s, NULL, 16);
+
+       do {
+               if (fgets(buf, 1024, file) == NULL)
+                       return -1;
+               len = strlen(buf);
+               if (ftell(file) == end)
+                       done = 1;
+               if (len) {
+                       r = regexec(&mask_rex, buf, 4, match, 0);
+                       if (r == REG_NOMATCH) {
+                       } else if (r) {
+                               fprintf(stderr,
+                                       "Error matching regular expression %d in %s\n",
+                                       r, filename);
+                               return -1;
+                       } else {
+                               buf[match[0].rm_eo] = 0;
+                               buf[match[1].rm_eo] = 0;
+                               buf[match[2].rm_eo] = 0;
+                               o = strtol(&buf[match[1].rm_so], NULL, 16);
+                               offset = offset_new(o);
+                               table_offset_add(t, offset);
+                               if (o > t->offset_max)
+                                       t->offset_max = o;
+                       }
+               }
+       } while (!done);
+       fclose(file);
+       if (t->offset_max < last_reg)
+               t->offset_max = last_reg;
+       return table_build(t);
+}
+
+int main(int argc, char *argv[])
+{
+       struct table t;
+
+       if (argc != 2) {
+               fprintf(stderr, "Usage: %s <authfile>\n", argv[0]);
+               exit(1);
+       }
+       table_init(&t);
+       if (parser_auth(&t, argv[1])) {
+               fprintf(stderr, "Failed to parse file %s\n", argv[1]);
+               return -1;
+       }
+       table_print(&t);
+       return 0;
+}
index 68e728e..be51c5f 100644 (file)
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
-#include "radeon_microcode.h"
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "r100d.h"
+
+#include <linux/firmware.h>
+#include <linux/platform_device.h>
+
+#include "r100_reg_safe.h"
+#include "rn50_reg_safe.h"
+
+/* Firmware Names */
+#define FIRMWARE_R100          "radeon/R100_cp.bin"
+#define FIRMWARE_R200          "radeon/R200_cp.bin"
+#define FIRMWARE_R300          "radeon/R300_cp.bin"
+#define FIRMWARE_R420          "radeon/R420_cp.bin"
+#define FIRMWARE_RS690         "radeon/RS690_cp.bin"
+#define FIRMWARE_RS600         "radeon/RS600_cp.bin"
+#define FIRMWARE_R520          "radeon/R520_cp.bin"
+
+MODULE_FIRMWARE(FIRMWARE_R100);
+MODULE_FIRMWARE(FIRMWARE_R200);
+MODULE_FIRMWARE(FIRMWARE_R300);
+MODULE_FIRMWARE(FIRMWARE_R420);
+MODULE_FIRMWARE(FIRMWARE_RS690);
+MODULE_FIRMWARE(FIRMWARE_RS600);
+MODULE_FIRMWARE(FIRMWARE_R520);
+
+#include "r100_track.h"
 
 /* This files gather functions specifics to:
  * r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280
  *
  * Some of these functions might be used by newer ASICs.
  */
+int r200_init(struct radeon_device *rdev);
 void r100_hdp_reset(struct radeon_device *rdev);
 void r100_gpu_init(struct radeon_device *rdev);
 int r100_gui_wait_for_idle(struct radeon_device *rdev);
@@ -58,23 +84,28 @@ void r100_pci_gart_tlb_flush(struct radeon_device *rdev)
         * could end up in wrong address. */
 }
 
-int r100_pci_gart_enable(struct radeon_device *rdev)
+int r100_pci_gart_init(struct radeon_device *rdev)
 {
-       uint32_t tmp;
        int r;
 
+       if (rdev->gart.table.ram.ptr) {
+               WARN(1, "R100 PCI GART already initialized.\n");
+               return 0;
+       }
        /* Initialize common gart structure */
        r = radeon_gart_init(rdev);
-       if (r) {
+       if (r)
                return r;
-       }
-       if (rdev->gart.table.ram.ptr == NULL) {
-               rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
-               r = radeon_gart_table_ram_alloc(rdev);
-               if (r) {
-                       return r;
-               }
-       }
+       rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
+       rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+       rdev->asic->gart_set_page = &r100_pci_gart_set_page;
+       return radeon_gart_table_ram_alloc(rdev);
+}
+
+int r100_pci_gart_enable(struct radeon_device *rdev)
+{
+       uint32_t tmp;
+
        /* discard memory request outside of configured range */
        tmp = RREG32(RADEON_AIC_CNTL) | RADEON_DIS_OUT_OF_PCI_GART_ACCESS;
        WREG32(RADEON_AIC_CNTL, tmp);
@@ -114,13 +145,11 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
        return 0;
 }
 
-int r100_gart_enable(struct radeon_device *rdev)
+void r100_pci_gart_fini(struct radeon_device *rdev)
 {
-       if (rdev->flags & RADEON_IS_AGP) {
-               r100_pci_gart_disable(rdev);
-               return 0;
-       }
-       return r100_pci_gart_enable(rdev);
+       r100_pci_gart_disable(rdev);
+       radeon_gart_table_ram_free(rdev);
+       radeon_gart_fini(rdev);
 }
 
 
@@ -247,9 +276,6 @@ int r100_mc_init(struct radeon_device *rdev)
 
 void r100_mc_fini(struct radeon_device *rdev)
 {
-       r100_pci_gart_disable(rdev);
-       radeon_gart_table_ram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
@@ -273,6 +299,17 @@ int r100_irq_set(struct radeon_device *rdev)
        return 0;
 }
 
+void r100_irq_disable(struct radeon_device *rdev)
+{
+       u32 tmp;
+
+       WREG32(R_000040_GEN_INT_CNTL, 0);
+       /* Wait and acknowledge irq */
+       mdelay(1);
+       tmp = RREG32(R_000044_GEN_INT_STATUS);
+       WREG32(R_000044_GEN_INT_STATUS, tmp);
+}
+
 static inline uint32_t r100_irq_ack(struct radeon_device *rdev)
 {
        uint32_t irqs = RREG32(RADEON_GEN_INT_STATUS);
@@ -293,6 +330,9 @@ int r100_irq_process(struct radeon_device *rdev)
        if (!status) {
                return IRQ_NONE;
        }
+       if (rdev->shutdown) {
+               return IRQ_NONE;
+       }
        while (status) {
                /* SW interrupt */
                if (status & RADEON_SW_INT_TEST) {
@@ -367,14 +407,21 @@ int r100_wb_init(struct radeon_device *rdev)
                        return r;
                }
        }
-       WREG32(0x774, rdev->wb.gpu_addr);
-       WREG32(0x70C, rdev->wb.gpu_addr + 1024);
-       WREG32(0x770, 0xff);
+       WREG32(R_000774_SCRATCH_ADDR, rdev->wb.gpu_addr);
+       WREG32(R_00070C_CP_RB_RPTR_ADDR,
+               S_00070C_RB_RPTR_ADDR((rdev->wb.gpu_addr + 1024) >> 2));
+       WREG32(R_000770_SCRATCH_UMSK, 0xff);
        return 0;
 }
 
+void r100_wb_disable(struct radeon_device *rdev)
+{
+       WREG32(R_000770_SCRATCH_UMSK, 0);
+}
+
 void r100_wb_fini(struct radeon_device *rdev)
 {
+       r100_wb_disable(rdev);
        if (rdev->wb.wb_obj) {
                radeon_object_kunmap(rdev->wb.wb_obj);
                radeon_object_unpin(rdev->wb.wb_obj);
@@ -461,6 +508,21 @@ int r100_copy_blit(struct radeon_device *rdev,
 /*
  * CP
  */
+static int r100_cp_wait_for_idle(struct radeon_device *rdev)
+{
+       unsigned i;
+       u32 tmp;
+
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(R_000E40_RBBM_STATUS);
+               if (!G_000E40_CP_CMDSTRM_BUSY(tmp)) {
+                       return 0;
+               }
+               udelay(1);
+       }
+       return -1;
+}
+
 void r100_ring_start(struct radeon_device *rdev)
 {
        int r;
@@ -478,33 +540,33 @@ void r100_ring_start(struct radeon_device *rdev)
        radeon_ring_unlock_commit(rdev);
 }
 
-static void r100_cp_load_microcode(struct radeon_device *rdev)
+
+/* Load the microcode for the CP */
+static int r100_cp_init_microcode(struct radeon_device *rdev)
 {
-       int i;
+       struct platform_device *pdev;
+       const char *fw_name = NULL;
+       int err;
 
-       if (r100_gui_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait GUI idle while "
-                      "programming pipes. Bad things might happen.\n");
-       }
+       DRM_DEBUG("\n");
 
-       WREG32(RADEON_CP_ME_RAM_ADDR, 0);
+       pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0);
+       err = IS_ERR(pdev);
+       if (err) {
+               printk(KERN_ERR "radeon_cp: Failed to register firmware\n");
+               return -EINVAL;
+       }
        if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) ||
            (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) ||
            (rdev->family == CHIP_RS200)) {
                DRM_INFO("Loading R100 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, R100_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, R100_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R100;
        } else if ((rdev->family == CHIP_R200) ||
                   (rdev->family == CHIP_RV250) ||
                   (rdev->family == CHIP_RV280) ||
                   (rdev->family == CHIP_RS300)) {
                DRM_INFO("Loading R200 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, R200_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, R200_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R200;
        } else if ((rdev->family == CHIP_R300) ||
                   (rdev->family == CHIP_R350) ||
                   (rdev->family == CHIP_RV350) ||
@@ -512,31 +574,19 @@ static void r100_cp_load_microcode(struct radeon_device *rdev)
                   (rdev->family == CHIP_RS400) ||
                   (rdev->family == CHIP_RS480)) {
                DRM_INFO("Loading R300 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, R300_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, R300_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R300;
        } else if ((rdev->family == CHIP_R420) ||
                   (rdev->family == CHIP_R423) ||
                   (rdev->family == CHIP_RV410)) {
                DRM_INFO("Loading R400 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, R420_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, R420_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R420;
        } else if ((rdev->family == CHIP_RS690) ||
                   (rdev->family == CHIP_RS740)) {
                DRM_INFO("Loading RS690/RS740 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, RS690_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, RS690_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_RS690;
        } else if (rdev->family == CHIP_RS600) {
                DRM_INFO("Loading RS600 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, RS600_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, RS600_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_RS600;
        } else if ((rdev->family == CHIP_RV515) ||
                   (rdev->family == CHIP_R520) ||
                   (rdev->family == CHIP_RV530) ||
@@ -544,9 +594,43 @@ static void r100_cp_load_microcode(struct radeon_device *rdev)
                   (rdev->family == CHIP_RV560) ||
                   (rdev->family == CHIP_RV570)) {
                DRM_INFO("Loading R500 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_CP_ME_RAM_DATAH, R520_cp_microcode[i][1]);
-                       WREG32(RADEON_CP_ME_RAM_DATAL, R520_cp_microcode[i][0]);
+               fw_name = FIRMWARE_R520;
+       }
+
+       err = request_firmware(&rdev->me_fw, fw_name, &pdev->dev);
+       platform_device_unregister(pdev);
+       if (err) {
+               printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n",
+                      fw_name);
+       } else if (rdev->me_fw->size % 8) {
+               printk(KERN_ERR
+                      "radeon_cp: Bogus length %zu in firmware \"%s\"\n",
+                      rdev->me_fw->size, fw_name);
+               err = -EINVAL;
+               release_firmware(rdev->me_fw);
+               rdev->me_fw = NULL;
+       }
+       return err;
+}
+static void r100_cp_load_microcode(struct radeon_device *rdev)
+{
+       const __be32 *fw_data;
+       int i, size;
+
+       if (r100_gui_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "Failed to wait GUI idle while "
+                      "programming pipes. Bad things might happen.\n");
+       }
+
+       if (rdev->me_fw) {
+               size = rdev->me_fw->size / 4;
+               fw_data = (const __be32 *)&rdev->me_fw->data[0];
+               WREG32(RADEON_CP_ME_RAM_ADDR, 0);
+               for (i = 0; i < size; i += 2) {
+                       WREG32(RADEON_CP_ME_RAM_DATAH,
+                              be32_to_cpup(&fw_data[i]));
+                       WREG32(RADEON_CP_ME_RAM_DATAL,
+                              be32_to_cpup(&fw_data[i + 1]));
                }
        }
 }
@@ -585,6 +669,15 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
        } else {
                DRM_INFO("radeon: cp idle (0x%08X)\n", tmp);
        }
+
+       if (!rdev->me_fw) {
+               r = r100_cp_init_microcode(rdev);
+               if (r) {
+                       DRM_ERROR("Failed to load firmware!\n");
+                       return r;
+               }
+       }
+
        /* Align ring size */
        rb_bufsz = drm_order(ring_size / 8);
        ring_size = (1 << (rb_bufsz + 1)) * 4;
@@ -658,9 +751,11 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
 
 void r100_cp_fini(struct radeon_device *rdev)
 {
+       if (r100_cp_wait_for_idle(rdev)) {
+               DRM_ERROR("Wait for CP idle timeout, shutting down CP.\n");
+       }
        /* Disable ring */
-       rdev->cp.ready = false;
-       WREG32(RADEON_CP_CSQ_CNTL, 0);
+       r100_cp_disable(rdev);
        radeon_ring_fini(rdev);
        DRM_INFO("radeon: cp finalized\n");
 }
@@ -710,6 +805,12 @@ int r100_cp_reset(struct radeon_device *rdev)
        return -1;
 }
 
+void r100_cp_commit(struct radeon_device *rdev)
+{
+       WREG32(RADEON_CP_RB_WPTR, rdev->cp.wptr);
+       (void)RREG32(RADEON_CP_RB_WPTR);
+}
+
 
 /*
  * CS functions
@@ -968,147 +1069,356 @@ int r100_cs_packet_next_reloc(struct radeon_cs_parser *p,
        return 0;
 }
 
+static int r100_get_vtx_size(uint32_t vtx_fmt)
+{
+       int vtx_size;
+       vtx_size = 2;
+       /* ordered according to bits in spec */
+       if (vtx_fmt & RADEON_SE_VTX_FMT_W0)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_FPCOLOR)
+               vtx_size += 3;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_FPALPHA)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_PKCOLOR)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_FPSPEC)
+               vtx_size += 3;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_FPFOG)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_PKSPEC)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_ST0)
+               vtx_size += 2;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_ST1)
+               vtx_size += 2;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Q1)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_ST2)
+               vtx_size += 2;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Q2)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_ST3)
+               vtx_size += 2;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Q3)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Q0)
+               vtx_size++;
+       /* blend weight */
+       if (vtx_fmt & (0x7 << 15))
+               vtx_size += (vtx_fmt >> 15) & 0x7;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_N0)
+               vtx_size += 3;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_XY1)
+               vtx_size += 2;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Z1)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_W1)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_N1)
+               vtx_size++;
+       if (vtx_fmt & RADEON_SE_VTX_FMT_Z)
+               vtx_size++;
+       return vtx_size;
+}
+
 static int r100_packet0_check(struct radeon_cs_parser *p,
-                             struct radeon_cs_packet *pkt)
+                             struct radeon_cs_packet *pkt,
+                             unsigned idx, unsigned reg)
 {
        struct radeon_cs_chunk *ib_chunk;
        struct radeon_cs_reloc *reloc;
+       struct r100_cs_track *track;
        volatile uint32_t *ib;
        uint32_t tmp;
-       unsigned reg;
-       unsigned i;
-       unsigned idx;
-       bool onereg;
        int r;
+       int i, face;
        u32 tile_flags = 0;
 
        ib = p->ib->ptr;
        ib_chunk = &p->chunks[p->chunk_ib_idx];
-       idx = pkt->idx + 1;
-       reg = pkt->reg;
-       onereg = false;
-       if (CP_PACKET0_GET_ONE_REG_WR(ib_chunk->kdata[pkt->idx])) {
-               onereg = true;
-       }
-       for (i = 0; i <= pkt->count; i++, idx++, reg += 4) {
-               switch (reg) {
-               case RADEON_CRTC_GUI_TRIG_VLINE:
-                       r = r100_cs_packet_parse_vline(p);
-                       if (r) {
-                               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                               idx, reg);
-                               r100_cs_dump_packet(p, pkt);
-                               return r;
-                       }
-                       break;
+       track = (struct r100_cs_track *)p->track;
+
+       switch (reg) {
+       case RADEON_CRTC_GUI_TRIG_VLINE:
+               r = r100_cs_packet_parse_vline(p);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               break;
                /* FIXME: only allow PACKET3 blit? easier to check for out of
                 * range access */
-               case RADEON_DST_PITCH_OFFSET:
-               case RADEON_SRC_PITCH_OFFSET:
-                       r = r100_cs_packet_next_reloc(p, &reloc);
-                       if (r) {
-                               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                         idx, reg);
-                               r100_cs_dump_packet(p, pkt);
-                               return r;
-                       }
-                       tmp = ib_chunk->kdata[idx] & 0x003fffff;
-                       tmp += (((u32)reloc->lobj.gpu_offset) >> 10);
-
-                       if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
-                               tile_flags |= RADEON_DST_TILE_MACRO;
-                       if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) {
-                               if (reg == RADEON_SRC_PITCH_OFFSET) {
-                                       DRM_ERROR("Cannot src blit from microtiled surface\n");
-                                       r100_cs_dump_packet(p, pkt);
-                                       return -EINVAL;
-                               }
-                               tile_flags |= RADEON_DST_TILE_MICRO;
-                       }
+       case RADEON_DST_PITCH_OFFSET:
+       case RADEON_SRC_PITCH_OFFSET:
+               r = r100_reloc_pitch_offset(p, pkt, idx, reg);
+               if (r)
+                       return r;
+               break;
+       case RADEON_RB3D_DEPTHOFFSET:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->zb.robj = reloc->robj;
+               track->zb.offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case RADEON_RB3D_COLOROFFSET:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->cb[0].robj = reloc->robj;
+               track->cb[0].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case RADEON_PP_TXOFFSET_0:
+       case RADEON_PP_TXOFFSET_1:
+       case RADEON_PP_TXOFFSET_2:
+               i = (reg - RADEON_PP_TXOFFSET_0) / 24;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[i].robj = reloc->robj;
+               break;
+       case RADEON_PP_CUBIC_OFFSET_T0_0:
+       case RADEON_PP_CUBIC_OFFSET_T0_1:
+       case RADEON_PP_CUBIC_OFFSET_T0_2:
+       case RADEON_PP_CUBIC_OFFSET_T0_3:
+       case RADEON_PP_CUBIC_OFFSET_T0_4:
+               i = (reg - RADEON_PP_CUBIC_OFFSET_T0_0) / 4;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->textures[0].cube_info[i].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[0].cube_info[i].robj = reloc->robj;
+               break;
+       case RADEON_PP_CUBIC_OFFSET_T1_0:
+       case RADEON_PP_CUBIC_OFFSET_T1_1:
+       case RADEON_PP_CUBIC_OFFSET_T1_2:
+       case RADEON_PP_CUBIC_OFFSET_T1_3:
+       case RADEON_PP_CUBIC_OFFSET_T1_4:
+               i = (reg - RADEON_PP_CUBIC_OFFSET_T1_0) / 4;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->textures[1].cube_info[i].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[1].cube_info[i].robj = reloc->robj;
+               break;
+       case RADEON_PP_CUBIC_OFFSET_T2_0:
+       case RADEON_PP_CUBIC_OFFSET_T2_1:
+       case RADEON_PP_CUBIC_OFFSET_T2_2:
+       case RADEON_PP_CUBIC_OFFSET_T2_3:
+       case RADEON_PP_CUBIC_OFFSET_T2_4:
+               i = (reg - RADEON_PP_CUBIC_OFFSET_T2_0) / 4;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->textures[2].cube_info[i].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[2].cube_info[i].robj = reloc->robj;
+               break;
+       case RADEON_RE_WIDTH_HEIGHT:
+               track->maxy = ((ib_chunk->kdata[idx] >> 16) & 0x7FF);
+               break;
+       case RADEON_RB3D_COLORPITCH:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
 
-                       tmp |= tile_flags;
-                       ib[idx] = (ib_chunk->kdata[idx] & 0x3fc00000) | tmp;
-                       break;
-               case RADEON_RB3D_DEPTHOFFSET:
-               case RADEON_RB3D_COLOROFFSET:
-               case R300_RB3D_COLOROFFSET0:
-               case R300_ZB_DEPTHOFFSET:
-               case R200_PP_TXOFFSET_0:
-               case R200_PP_TXOFFSET_1:
-               case R200_PP_TXOFFSET_2:
-               case R200_PP_TXOFFSET_3:
-               case R200_PP_TXOFFSET_4:
-               case R200_PP_TXOFFSET_5:
-               case RADEON_PP_TXOFFSET_0:
-               case RADEON_PP_TXOFFSET_1:
-               case RADEON_PP_TXOFFSET_2:
-               case R300_TX_OFFSET_0:
-               case R300_TX_OFFSET_0+4:
-               case R300_TX_OFFSET_0+8:
-               case R300_TX_OFFSET_0+12:
-               case R300_TX_OFFSET_0+16:
-               case R300_TX_OFFSET_0+20:
-               case R300_TX_OFFSET_0+24:
-               case R300_TX_OFFSET_0+28:
-               case R300_TX_OFFSET_0+32:
-               case R300_TX_OFFSET_0+36:
-               case R300_TX_OFFSET_0+40:
-               case R300_TX_OFFSET_0+44:
-               case R300_TX_OFFSET_0+48:
-               case R300_TX_OFFSET_0+52:
-               case R300_TX_OFFSET_0+56:
-               case R300_TX_OFFSET_0+60:
-                       /* rn50 has no 3D engine so fail on any 3d setup */
-                       if (ASIC_IS_RN50(p->rdev)) {
-                               DRM_ERROR("attempt to use RN50 3D engine failed\n");
-                               return -EINVAL;
-                       }
-                       r = r100_cs_packet_next_reloc(p, &reloc);
-                       if (r) {
-                               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                         idx, reg);
-                               r100_cs_dump_packet(p, pkt);
-                               return r;
-                       }
-                       ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
-                       break;
-               case R300_RB3D_COLORPITCH0:
-               case RADEON_RB3D_COLORPITCH:
-                       r = r100_cs_packet_next_reloc(p, &reloc);
-                       if (r) {
-                               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                         idx, reg);
-                               r100_cs_dump_packet(p, pkt);
-                               return r;
-                       }
+               if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+                       tile_flags |= RADEON_COLOR_TILE_ENABLE;
+               if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
+                       tile_flags |= RADEON_COLOR_MICROTILE_ENABLE;
 
-                       if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
-                               tile_flags |= RADEON_COLOR_TILE_ENABLE;
-                       if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
-                               tile_flags |= RADEON_COLOR_MICROTILE_ENABLE;
+               tmp = ib_chunk->kdata[idx] & ~(0x7 << 16);
+               tmp |= tile_flags;
+               ib[idx] = tmp;
 
-                       tmp = ib_chunk->kdata[idx] & ~(0x7 << 16);
-                       tmp |= tile_flags;
-                       ib[idx] = tmp;
+               track->cb[0].pitch = ib_chunk->kdata[idx] & RADEON_COLORPITCH_MASK;
+               break;
+       case RADEON_RB3D_DEPTHPITCH:
+               track->zb.pitch = ib_chunk->kdata[idx] & RADEON_DEPTHPITCH_MASK;
+               break;
+       case RADEON_RB3D_CNTL:
+               switch ((ib_chunk->kdata[idx] >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f) {
+               case 7:
+               case 8:
+               case 9:
+               case 11:
+               case 12:
+                       track->cb[0].cpp = 1;
                        break;
-               case RADEON_RB3D_ZPASS_ADDR:
-                       r = r100_cs_packet_next_reloc(p, &reloc);
-                       if (r) {
-                               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                         idx, reg);
-                               r100_cs_dump_packet(p, pkt);
-                               return r;
-                       }
-                       ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               case 3:
+               case 4:
+               case 15:
+                       track->cb[0].cpp = 2;
+                       break;
+               case 6:
+                       track->cb[0].cpp = 4;
                        break;
                default:
-                       /* FIXME: we don't want to allow anyothers packet */
+                       DRM_ERROR("Invalid color buffer format (%d) !\n",
+                                 ((ib_chunk->kdata[idx] >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f));
+                       return -EINVAL;
+               }
+               track->z_enabled = !!(ib_chunk->kdata[idx] & RADEON_Z_ENABLE);
+               break;
+       case RADEON_RB3D_ZSTENCILCNTL:
+               switch (ib_chunk->kdata[idx] & 0xf) {
+               case 0:
+                       track->zb.cpp = 2;
+                       break;
+               case 2:
+               case 3:
+               case 4:
+               case 5:
+               case 9:
+               case 11:
+                       track->zb.cpp = 4;
                        break;
+               default:
+                       break;
+               }
+               break;
+       case RADEON_RB3D_ZPASS_ADDR:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case RADEON_PP_CNTL:
+               {
+                       uint32_t temp = ib_chunk->kdata[idx] >> 4;
+                       for (i = 0; i < track->num_texture; i++)
+                               track->textures[i].enabled = !!(temp & (1 << i));
                }
-               if (onereg) {
-                       /* FIXME: forbid onereg write to register on relocate */
+               break;
+       case RADEON_SE_VF_CNTL:
+               track->vap_vf_cntl = ib_chunk->kdata[idx];
+               break;
+       case RADEON_SE_VTX_FMT:
+               track->vtx_size = r100_get_vtx_size(ib_chunk->kdata[idx]);
+               break;
+       case RADEON_PP_TEX_SIZE_0:
+       case RADEON_PP_TEX_SIZE_1:
+       case RADEON_PP_TEX_SIZE_2:
+               i = (reg - RADEON_PP_TEX_SIZE_0) / 8;
+               track->textures[i].width = (ib_chunk->kdata[idx] & RADEON_TEX_USIZE_MASK) + 1;
+               track->textures[i].height = ((ib_chunk->kdata[idx] & RADEON_TEX_VSIZE_MASK) >> RADEON_TEX_VSIZE_SHIFT) + 1;
+               break;
+       case RADEON_PP_TEX_PITCH_0:
+       case RADEON_PP_TEX_PITCH_1:
+       case RADEON_PP_TEX_PITCH_2:
+               i = (reg - RADEON_PP_TEX_PITCH_0) / 8;
+               track->textures[i].pitch = ib_chunk->kdata[idx] + 32;
+               break;
+       case RADEON_PP_TXFILTER_0:
+       case RADEON_PP_TXFILTER_1:
+       case RADEON_PP_TXFILTER_2:
+               i = (reg - RADEON_PP_TXFILTER_0) / 24;
+               track->textures[i].num_levels = ((ib_chunk->kdata[idx] & RADEON_MAX_MIP_LEVEL_MASK)
+                                                >> RADEON_MAX_MIP_LEVEL_SHIFT);
+               tmp = (ib_chunk->kdata[idx] >> 23) & 0x7;
+               if (tmp == 2 || tmp == 6)
+                       track->textures[i].roundup_w = false;
+               tmp = (ib_chunk->kdata[idx] >> 27) & 0x7;
+               if (tmp == 2 || tmp == 6)
+                       track->textures[i].roundup_h = false;
+               break;
+       case RADEON_PP_TXFORMAT_0:
+       case RADEON_PP_TXFORMAT_1:
+       case RADEON_PP_TXFORMAT_2:
+               i = (reg - RADEON_PP_TXFORMAT_0) / 24;
+               if (ib_chunk->kdata[idx] & RADEON_TXFORMAT_NON_POWER2) {
+                       track->textures[i].use_pitch = 1;
+               } else {
+                       track->textures[i].use_pitch = 0;
+                       track->textures[i].width = 1 << ((ib_chunk->kdata[idx] >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK);
+                       track->textures[i].height = 1 << ((ib_chunk->kdata[idx] >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK);
+               }
+               if (ib_chunk->kdata[idx] & RADEON_TXFORMAT_CUBIC_MAP_ENABLE)
+                       track->textures[i].tex_coord_type = 2;
+               switch ((ib_chunk->kdata[idx] & RADEON_TXFORMAT_FORMAT_MASK)) {
+               case RADEON_TXFORMAT_I8:
+               case RADEON_TXFORMAT_RGB332:
+               case RADEON_TXFORMAT_Y8:
+                       track->textures[i].cpp = 1;
                        break;
+               case RADEON_TXFORMAT_AI88:
+               case RADEON_TXFORMAT_ARGB1555:
+               case RADEON_TXFORMAT_RGB565:
+               case RADEON_TXFORMAT_ARGB4444:
+               case RADEON_TXFORMAT_VYUY422:
+               case RADEON_TXFORMAT_YVYU422:
+               case RADEON_TXFORMAT_DXT1:
+               case RADEON_TXFORMAT_SHADOW16:
+               case RADEON_TXFORMAT_LDUDV655:
+               case RADEON_TXFORMAT_DUDV88:
+                       track->textures[i].cpp = 2;
+                       break;
+               case RADEON_TXFORMAT_ARGB8888:
+               case RADEON_TXFORMAT_RGBA8888:
+               case RADEON_TXFORMAT_DXT23:
+               case RADEON_TXFORMAT_DXT45:
+               case RADEON_TXFORMAT_SHADOW32:
+               case RADEON_TXFORMAT_LDUDUV8888:
+                       track->textures[i].cpp = 4;
+                       break;
+               }
+               track->textures[i].cube_info[4].width = 1 << ((ib_chunk->kdata[idx] >> 16) & 0xf);
+               track->textures[i].cube_info[4].height = 1 << ((ib_chunk->kdata[idx] >> 20) & 0xf);
+               break;
+       case RADEON_PP_CUBIC_FACES_0:
+       case RADEON_PP_CUBIC_FACES_1:
+       case RADEON_PP_CUBIC_FACES_2:
+               tmp = ib_chunk->kdata[idx];
+               i = (reg - RADEON_PP_CUBIC_FACES_0) / 4;
+               for (face = 0; face < 4; face++) {
+                       track->textures[i].cube_info[face].width = 1 << ((tmp >> (face * 8)) & 0xf);
+                       track->textures[i].cube_info[face].height = 1 << ((tmp >> ((face * 8) + 4)) & 0xf);
                }
+               break;
+       default:
+               printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n",
+                      reg, idx);
+               return -EINVAL;
        }
        return 0;
 }
@@ -1137,6 +1447,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
 {
        struct radeon_cs_chunk *ib_chunk;
        struct radeon_cs_reloc *reloc;
+       struct r100_cs_track *track;
        unsigned idx;
        unsigned i, c;
        volatile uint32_t *ib;
@@ -1145,9 +1456,11 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
        ib = p->ib->ptr;
        ib_chunk = &p->chunks[p->chunk_ib_idx];
        idx = pkt->idx + 1;
+       track = (struct r100_cs_track *)p->track;
        switch (pkt->opcode) {
        case PACKET3_3D_LOAD_VBPNTR:
                c = ib_chunk->kdata[idx++];
+               track->num_arrays = c;
                for (i = 0; i < (c - 1); i += 2, idx += 3) {
                        r = r100_cs_packet_next_reloc(p, &reloc);
                        if (r) {
@@ -1157,6 +1470,9 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                                return r;
                        }
                        ib[idx+1] = ib_chunk->kdata[idx+1] + ((u32)reloc->lobj.gpu_offset);
+                       track->arrays[i + 0].robj = reloc->robj;
+                       track->arrays[i + 0].esize = ib_chunk->kdata[idx] >> 8;
+                       track->arrays[i + 0].esize &= 0x7F;
                        r = r100_cs_packet_next_reloc(p, &reloc);
                        if (r) {
                                DRM_ERROR("No reloc for packet3 %d\n",
@@ -1165,6 +1481,9 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                                return r;
                        }
                        ib[idx+2] = ib_chunk->kdata[idx+2] + ((u32)reloc->lobj.gpu_offset);
+                       track->arrays[i + 1].robj = reloc->robj;
+                       track->arrays[i + 1].esize = ib_chunk->kdata[idx] >> 24;
+                       track->arrays[i + 1].esize &= 0x7F;
                }
                if (c & 1) {
                        r = r100_cs_packet_next_reloc(p, &reloc);
@@ -1175,6 +1494,9 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                                return r;
                        }
                        ib[idx+1] = ib_chunk->kdata[idx+1] + ((u32)reloc->lobj.gpu_offset);
+                       track->arrays[i + 0].robj = reloc->robj;
+                       track->arrays[i + 0].esize = ib_chunk->kdata[idx] >> 8;
+                       track->arrays[i + 0].esize &= 0x7F;
                }
                break;
        case PACKET3_INDX_BUFFER:
@@ -1191,7 +1513,6 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                }
                break;
        case 0x23:
-               /* FIXME: cleanup */
                /* 3D_RNDR_GEN_INDX_PRIM on r100/r200 */
                r = r100_cs_packet_next_reloc(p, &reloc);
                if (r) {
@@ -1200,18 +1521,71 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                        return r;
                }
                ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->num_arrays = 1;
+               track->vtx_size = r100_get_vtx_size(ib_chunk->kdata[idx+2]);
+
+               track->arrays[0].robj = reloc->robj;
+               track->arrays[0].esize = track->vtx_size;
+
+               track->max_indx = ib_chunk->kdata[idx+1];
+
+               track->vap_vf_cntl = ib_chunk->kdata[idx+3];
+               track->immd_dwords = pkt->count - 1;
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
                break;
        case PACKET3_3D_DRAW_IMMD:
+               if (((ib_chunk->kdata[idx+1] >> 4) & 0x3) != 3) {
+                       DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");
+                       return -EINVAL;
+               }
+               track->vap_vf_cntl = ib_chunk->kdata[idx+1];
+               track->immd_dwords = pkt->count - 1;
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing using in-packet vertex data */
        case PACKET3_3D_DRAW_IMMD_2:
+               if (((ib_chunk->kdata[idx] >> 4) & 0x3) != 3) {
+                       DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");
+                       return -EINVAL;
+               }
+               track->vap_vf_cntl = ib_chunk->kdata[idx];
+               track->immd_dwords = pkt->count;
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing using in-packet vertex data */
        case PACKET3_3D_DRAW_VBUF_2:
+               track->vap_vf_cntl = ib_chunk->kdata[idx];
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing of vertex buffers setup elsewhere */
        case PACKET3_3D_DRAW_INDX_2:
+               track->vap_vf_cntl = ib_chunk->kdata[idx];
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing using indices to vertex buffer */
        case PACKET3_3D_DRAW_VBUF:
+               track->vap_vf_cntl = ib_chunk->kdata[idx + 1];
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing of vertex buffers setup elsewhere */
        case PACKET3_3D_DRAW_INDX:
+               track->vap_vf_cntl = ib_chunk->kdata[idx + 1];
+               r = r100_cs_track_check(p->rdev, track);
+               if (r)
+                       return r;
+               break;
                /* triggers drawing using indices to vertex buffer */
        case PACKET3_NOP:
                break;
@@ -1225,8 +1599,12 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
 int r100_cs_parse(struct radeon_cs_parser *p)
 {
        struct radeon_cs_packet pkt;
+       struct r100_cs_track *track;
        int r;
 
+       track = kzalloc(sizeof(*track), GFP_KERNEL);
+       r100_cs_track_clear(p->rdev, track);
+       p->track = track;
        do {
                r = r100_cs_packet_parse(p, &pkt, p->idx);
                if (r) {
@@ -1235,7 +1613,16 @@ int r100_cs_parse(struct radeon_cs_parser *p)
                p->idx += pkt.count + 2;
                switch (pkt.type) {
                        case PACKET_TYPE0:
-                               r = r100_packet0_check(p, &pkt);
+                               if (p->rdev->family >= CHIP_R200)
+                                       r = r100_cs_parse_packet0(p, &pkt,
+                                                                 p->rdev->config.r100.reg_safe_bm,
+                                                                 p->rdev->config.r100.reg_safe_bm_size,
+                                                                 &r200_packet0_check);
+                               else
+                                       r = r100_cs_parse_packet0(p, &pkt,
+                                                                 p->rdev->config.r100.reg_safe_bm,
+                                                                 p->rdev->config.r100.reg_safe_bm_size,
+                                                                 &r100_packet0_check);
                                break;
                        case PACKET_TYPE2:
                                break;
@@ -1568,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
                rdev->mc.real_vram_size = rdev->mc.aper_size;
 }
 
+void r100_vga_set_state(struct radeon_device *rdev, bool state)
+{
+       uint32_t temp;
+
+       temp = RREG32(RADEON_CONFIG_CNTL);
+       if (state == false) {
+               temp &= ~(1<<8);
+               temp |= (1<<9);
+       } else {
+               temp &= ~(1<<9);
+       }
+       WREG32(RADEON_CONFIG_CNTL, temp);
+}
+
 void r100_vram_info(struct radeon_device *rdev)
 {
        r100_vram_get_type(rdev);
@@ -1634,6 +2035,15 @@ void r100_pll_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
 
 int r100_init(struct radeon_device *rdev)
 {
+       if (ASIC_IS_RN50(rdev)) {
+               rdev->config.r100.reg_safe_bm = rn50_reg_safe_bm;
+               rdev->config.r100.reg_safe_bm_size = ARRAY_SIZE(rn50_reg_safe_bm);
+       } else if (rdev->family < CHIP_R200) {
+               rdev->config.r100.reg_safe_bm = r100_reg_safe_bm;
+               rdev->config.r100.reg_safe_bm_size = ARRAY_SIZE(r100_reg_safe_bm);
+       } else {
+               return r200_init(rdev);
+       }
        return 0;
 }
 
@@ -1839,6 +2249,11 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg,
                        flags |= R300_SURF_TILE_MICRO;
        }
 
+       if (tiling_flags & RADEON_TILING_SWAP_16BIT)
+               flags |= RADEON_SURF_AP0_SWP_16BPP | RADEON_SURF_AP1_SWP_16BPP;
+       if (tiling_flags & RADEON_TILING_SWAP_32BIT)
+               flags |= RADEON_SURF_AP0_SWP_32BPP | RADEON_SURF_AP1_SWP_32BPP;
+
        DRM_DEBUG("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1);
        WREG32(RADEON_SURFACE0_INFO + surf_index, flags);
        WREG32(RADEON_SURFACE0_LOWER_BOUND + surf_index, offset);
@@ -2334,3 +2749,460 @@ void r100_bandwidth_update(struct radeon_device *rdev)
                          (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL));
        }
 }
+
+static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t)
+{
+       DRM_ERROR("pitch                      %d\n", t->pitch);
+       DRM_ERROR("width                      %d\n", t->width);
+       DRM_ERROR("height                     %d\n", t->height);
+       DRM_ERROR("num levels                 %d\n", t->num_levels);
+       DRM_ERROR("depth                      %d\n", t->txdepth);
+       DRM_ERROR("bpp                        %d\n", t->cpp);
+       DRM_ERROR("coordinate type            %d\n", t->tex_coord_type);
+       DRM_ERROR("width round to power of 2  %d\n", t->roundup_w);
+       DRM_ERROR("height round to power of 2 %d\n", t->roundup_h);
+}
+
+static int r100_cs_track_cube(struct radeon_device *rdev,
+                             struct r100_cs_track *track, unsigned idx)
+{
+       unsigned face, w, h;
+       struct radeon_object *cube_robj;
+       unsigned long size;
+
+       for (face = 0; face < 5; face++) {
+               cube_robj = track->textures[idx].cube_info[face].robj;
+               w = track->textures[idx].cube_info[face].width;
+               h = track->textures[idx].cube_info[face].height;
+
+               size = w * h;
+               size *= track->textures[idx].cpp;
+
+               size += track->textures[idx].cube_info[face].offset;
+
+               if (size > radeon_object_size(cube_robj)) {
+                       DRM_ERROR("Cube texture offset greater than object size %lu %lu\n",
+                                 size, radeon_object_size(cube_robj));
+                       r100_cs_track_texture_print(&track->textures[idx]);
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+static int r100_cs_track_texture_check(struct radeon_device *rdev,
+                                      struct r100_cs_track *track)
+{
+       struct radeon_object *robj;
+       unsigned long size;
+       unsigned u, i, w, h;
+       int ret;
+
+       for (u = 0; u < track->num_texture; u++) {
+               if (!track->textures[u].enabled)
+                       continue;
+               robj = track->textures[u].robj;
+               if (robj == NULL) {
+                       DRM_ERROR("No texture bound to unit %u\n", u);
+                       return -EINVAL;
+               }
+               size = 0;
+               for (i = 0; i <= track->textures[u].num_levels; i++) {
+                       if (track->textures[u].use_pitch) {
+                               if (rdev->family < CHIP_R300)
+                                       w = (track->textures[u].pitch / track->textures[u].cpp) / (1 << i);
+                               else
+                                       w = track->textures[u].pitch / (1 << i);
+                       } else {
+                               w = track->textures[u].width / (1 << i);
+                               if (rdev->family >= CHIP_RV515)
+                                       w |= track->textures[u].width_11;
+                               if (track->textures[u].roundup_w)
+                                       w = roundup_pow_of_two(w);
+                       }
+                       h = track->textures[u].height / (1 << i);
+                       if (rdev->family >= CHIP_RV515)
+                               h |= track->textures[u].height_11;
+                       if (track->textures[u].roundup_h)
+                               h = roundup_pow_of_two(h);
+                       size += w * h;
+               }
+               size *= track->textures[u].cpp;
+               switch (track->textures[u].tex_coord_type) {
+               case 0:
+                       break;
+               case 1:
+                       size *= (1 << track->textures[u].txdepth);
+                       break;
+               case 2:
+                       if (track->separate_cube) {
+                               ret = r100_cs_track_cube(rdev, track, u);
+                               if (ret)
+                                       return ret;
+                       } else
+                               size *= 6;
+                       break;
+               default:
+                       DRM_ERROR("Invalid texture coordinate type %u for unit "
+                                 "%u\n", track->textures[u].tex_coord_type, u);
+                       return -EINVAL;
+               }
+               if (size > radeon_object_size(robj)) {
+                       DRM_ERROR("Texture of unit %u needs %lu bytes but is "
+                                 "%lu\n", u, size, radeon_object_size(robj));
+                       r100_cs_track_texture_print(&track->textures[u]);
+                       return -EINVAL;
+               }
+       }
+       return 0;
+}
+
+int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)
+{
+       unsigned i;
+       unsigned long size;
+       unsigned prim_walk;
+       unsigned nverts;
+
+       for (i = 0; i < track->num_cb; i++) {
+               if (track->cb[i].robj == NULL) {
+                       DRM_ERROR("[drm] No buffer for color buffer %d !\n", i);
+                       return -EINVAL;
+               }
+               size = track->cb[i].pitch * track->cb[i].cpp * track->maxy;
+               size += track->cb[i].offset;
+               if (size > radeon_object_size(track->cb[i].robj)) {
+                       DRM_ERROR("[drm] Buffer too small for color buffer %d "
+                                 "(need %lu have %lu) !\n", i, size,
+                                 radeon_object_size(track->cb[i].robj));
+                       DRM_ERROR("[drm] color buffer %d (%u %u %u %u)\n",
+                                 i, track->cb[i].pitch, track->cb[i].cpp,
+                                 track->cb[i].offset, track->maxy);
+                       return -EINVAL;
+               }
+       }
+       if (track->z_enabled) {
+               if (track->zb.robj == NULL) {
+                       DRM_ERROR("[drm] No buffer for z buffer !\n");
+                       return -EINVAL;
+               }
+               size = track->zb.pitch * track->zb.cpp * track->maxy;
+               size += track->zb.offset;
+               if (size > radeon_object_size(track->zb.robj)) {
+                       DRM_ERROR("[drm] Buffer too small for z buffer "
+                                 "(need %lu have %lu) !\n", size,
+                                 radeon_object_size(track->zb.robj));
+                       DRM_ERROR("[drm] zbuffer (%u %u %u %u)\n",
+                                 track->zb.pitch, track->zb.cpp,
+                                 track->zb.offset, track->maxy);
+                       return -EINVAL;
+               }
+       }
+       prim_walk = (track->vap_vf_cntl >> 4) & 0x3;
+       nverts = (track->vap_vf_cntl >> 16) & 0xFFFF;
+       switch (prim_walk) {
+       case 1:
+               for (i = 0; i < track->num_arrays; i++) {
+                       size = track->arrays[i].esize * track->max_indx * 4;
+                       if (track->arrays[i].robj == NULL) {
+                               DRM_ERROR("(PW %u) Vertex array %u no buffer "
+                                         "bound\n", prim_walk, i);
+                               return -EINVAL;
+                       }
+                       if (size > radeon_object_size(track->arrays[i].robj)) {
+                               DRM_ERROR("(PW %u) Vertex array %u need %lu dwords "
+                                          "have %lu dwords\n", prim_walk, i,
+                                          size >> 2,
+                                          radeon_object_size(track->arrays[i].robj) >> 2);
+                               DRM_ERROR("Max indices %u\n", track->max_indx);
+                               return -EINVAL;
+                       }
+               }
+               break;
+       case 2:
+               for (i = 0; i < track->num_arrays; i++) {
+                       size = track->arrays[i].esize * (nverts - 1) * 4;
+                       if (track->arrays[i].robj == NULL) {
+                               DRM_ERROR("(PW %u) Vertex array %u no buffer "
+                                         "bound\n", prim_walk, i);
+                               return -EINVAL;
+                       }
+                       if (size > radeon_object_size(track->arrays[i].robj)) {
+                               DRM_ERROR("(PW %u) Vertex array %u need %lu dwords "
+                                          "have %lu dwords\n", prim_walk, i, size >> 2,
+                                          radeon_object_size(track->arrays[i].robj) >> 2);
+                               return -EINVAL;
+                       }
+               }
+               break;
+       case 3:
+               size = track->vtx_size * nverts;
+               if (size != track->immd_dwords) {
+                       DRM_ERROR("IMMD draw %u dwors but needs %lu dwords\n",
+                                 track->immd_dwords, size);
+                       DRM_ERROR("VAP_VF_CNTL.NUM_VERTICES %u, VTX_SIZE %u\n",
+                                 nverts, track->vtx_size);
+                       return -EINVAL;
+               }
+               break;
+       default:
+               DRM_ERROR("[drm] Invalid primitive walk %d for VAP_VF_CNTL\n",
+                         prim_walk);
+               return -EINVAL;
+       }
+       return r100_cs_track_texture_check(rdev, track);
+}
+
+void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track)
+{
+       unsigned i, face;
+
+       if (rdev->family < CHIP_R300) {
+               track->num_cb = 1;
+               if (rdev->family <= CHIP_RS200)
+                       track->num_texture = 3;
+               else
+                       track->num_texture = 6;
+               track->maxy = 2048;
+               track->separate_cube = 1;
+       } else {
+               track->num_cb = 4;
+               track->num_texture = 16;
+               track->maxy = 4096;
+               track->separate_cube = 0;
+       }
+
+       for (i = 0; i < track->num_cb; i++) {
+               track->cb[i].robj = NULL;
+               track->cb[i].pitch = 8192;
+               track->cb[i].cpp = 16;
+               track->cb[i].offset = 0;
+       }
+       track->z_enabled = true;
+       track->zb.robj = NULL;
+       track->zb.pitch = 8192;
+       track->zb.cpp = 4;
+       track->zb.offset = 0;
+       track->vtx_size = 0x7F;
+       track->immd_dwords = 0xFFFFFFFFUL;
+       track->num_arrays = 11;
+       track->max_indx = 0x00FFFFFFUL;
+       for (i = 0; i < track->num_arrays; i++) {
+               track->arrays[i].robj = NULL;
+               track->arrays[i].esize = 0x7F;
+       }
+       for (i = 0; i < track->num_texture; i++) {
+               track->textures[i].pitch = 16536;
+               track->textures[i].width = 16536;
+               track->textures[i].height = 16536;
+               track->textures[i].width_11 = 1 << 11;
+               track->textures[i].height_11 = 1 << 11;
+               track->textures[i].num_levels = 12;
+               if (rdev->family <= CHIP_RS200) {
+                       track->textures[i].tex_coord_type = 0;
+                       track->textures[i].txdepth = 0;
+               } else {
+                       track->textures[i].txdepth = 16;
+                       track->textures[i].tex_coord_type = 1;
+               }
+               track->textures[i].cpp = 64;
+               track->textures[i].robj = NULL;
+               /* CS IB emission code makes sure texture unit are disabled */
+               track->textures[i].enabled = false;
+               track->textures[i].roundup_w = true;
+               track->textures[i].roundup_h = true;
+               if (track->separate_cube)
+                       for (face = 0; face < 5; face++) {
+                               track->textures[i].cube_info[face].robj = NULL;
+                               track->textures[i].cube_info[face].width = 16536;
+                               track->textures[i].cube_info[face].height = 16536;
+                               track->textures[i].cube_info[face].offset = 0;
+                       }
+       }
+}
+
+int r100_ring_test(struct radeon_device *rdev)
+{
+       uint32_t scratch;
+       uint32_t tmp = 0;
+       unsigned i;
+       int r;
+
+       r = radeon_scratch_get(rdev, &scratch);
+       if (r) {
+               DRM_ERROR("radeon: cp failed to get scratch reg (%d).\n", r);
+               return r;
+       }
+       WREG32(scratch, 0xCAFEDEAD);
+       r = radeon_ring_lock(rdev, 2);
+       if (r) {
+               DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);
+               radeon_scratch_free(rdev, scratch);
+               return r;
+       }
+       radeon_ring_write(rdev, PACKET0(scratch, 0));
+       radeon_ring_write(rdev, 0xDEADBEEF);
+       radeon_ring_unlock_commit(rdev);
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(scratch);
+               if (tmp == 0xDEADBEEF) {
+                       break;
+               }
+               DRM_UDELAY(1);
+       }
+       if (i < rdev->usec_timeout) {
+               DRM_INFO("ring test succeeded in %d usecs\n", i);
+       } else {
+               DRM_ERROR("radeon: ring test failed (sracth(0x%04X)=0x%08X)\n",
+                         scratch, tmp);
+               r = -EINVAL;
+       }
+       radeon_scratch_free(rdev, scratch);
+       return r;
+}
+
+void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
+{
+       radeon_ring_write(rdev, PACKET0(RADEON_CP_IB_BASE, 1));
+       radeon_ring_write(rdev, ib->gpu_addr);
+       radeon_ring_write(rdev, ib->length_dw);
+}
+
+int r100_ib_test(struct radeon_device *rdev)
+{
+       struct radeon_ib *ib;
+       uint32_t scratch;
+       uint32_t tmp = 0;
+       unsigned i;
+       int r;
+
+       r = radeon_scratch_get(rdev, &scratch);
+       if (r) {
+               DRM_ERROR("radeon: failed to get scratch reg (%d).\n", r);
+               return r;
+       }
+       WREG32(scratch, 0xCAFEDEAD);
+       r = radeon_ib_get(rdev, &ib);
+       if (r) {
+               return r;
+       }
+       ib->ptr[0] = PACKET0(scratch, 0);
+       ib->ptr[1] = 0xDEADBEEF;
+       ib->ptr[2] = PACKET2(0);
+       ib->ptr[3] = PACKET2(0);
+       ib->ptr[4] = PACKET2(0);
+       ib->ptr[5] = PACKET2(0);
+       ib->ptr[6] = PACKET2(0);
+       ib->ptr[7] = PACKET2(0);
+       ib->length_dw = 8;
+       r = radeon_ib_schedule(rdev, ib);
+       if (r) {
+               radeon_scratch_free(rdev, scratch);
+               radeon_ib_free(rdev, &ib);
+               return r;
+       }
+       r = radeon_fence_wait(ib->fence, false);
+       if (r) {
+               return r;
+       }
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(scratch);
+               if (tmp == 0xDEADBEEF) {
+                       break;
+               }
+               DRM_UDELAY(1);
+       }
+       if (i < rdev->usec_timeout) {
+               DRM_INFO("ib test succeeded in %u usecs\n", i);
+       } else {
+               DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
+                         scratch, tmp);
+               r = -EINVAL;
+       }
+       radeon_scratch_free(rdev, scratch);
+       radeon_ib_free(rdev, &ib);
+       return r;
+}
+
+void r100_ib_fini(struct radeon_device *rdev)
+{
+       radeon_ib_pool_fini(rdev);
+}
+
+int r100_ib_init(struct radeon_device *rdev)
+{
+       int r;
+
+       r = radeon_ib_pool_init(rdev);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing IB pool (%d).\n", r);
+               r100_ib_fini(rdev);
+               return r;
+       }
+       r = r100_ib_test(rdev);
+       if (r) {
+               dev_err(rdev->dev, "failled testing IB (%d).\n", r);
+               r100_ib_fini(rdev);
+               return r;
+       }
+       return 0;
+}
+
+void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save)
+{
+       /* Shutdown CP we shouldn't need to do that but better be safe than
+        * sorry
+        */
+       rdev->cp.ready = false;
+       WREG32(R_000740_CP_CSQ_CNTL, 0);
+
+       /* Save few CRTC registers */
+       save->GENMO_WT = RREG32(R_0003C0_GENMO_WT);
+       save->CRTC_EXT_CNTL = RREG32(R_000054_CRTC_EXT_CNTL);
+       save->CRTC_GEN_CNTL = RREG32(R_000050_CRTC_GEN_CNTL);
+       save->CUR_OFFSET = RREG32(R_000260_CUR_OFFSET);
+       if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
+               save->CRTC2_GEN_CNTL = RREG32(R_0003F8_CRTC2_GEN_CNTL);
+               save->CUR2_OFFSET = RREG32(R_000360_CUR2_OFFSET);
+       }
+
+       /* Disable VGA aperture access */
+       WREG32(R_0003C0_GENMO_WT, C_0003C0_VGA_RAM_EN & save->GENMO_WT);
+       /* Disable cursor, overlay, crtc */
+       WREG32(R_000260_CUR_OFFSET, save->CUR_OFFSET | S_000260_CUR_LOCK(1));
+       WREG32(R_000054_CRTC_EXT_CNTL, save->CRTC_EXT_CNTL |
+                                       S_000054_CRTC_DISPLAY_DIS(1));
+       WREG32(R_000050_CRTC_GEN_CNTL,
+                       (C_000050_CRTC_CUR_EN & save->CRTC_GEN_CNTL) |
+                       S_000050_CRTC_DISP_REQ_EN_B(1));
+       WREG32(R_000420_OV0_SCALE_CNTL,
+               C_000420_OV0_OVERLAY_EN & RREG32(R_000420_OV0_SCALE_CNTL));
+       WREG32(R_000260_CUR_OFFSET, C_000260_CUR_LOCK & save->CUR_OFFSET);
+       if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
+               WREG32(R_000360_CUR2_OFFSET, save->CUR2_OFFSET |
+                                               S_000360_CUR2_LOCK(1));
+               WREG32(R_0003F8_CRTC2_GEN_CNTL,
+                       (C_0003F8_CRTC2_CUR_EN & save->CRTC2_GEN_CNTL) |
+                       S_0003F8_CRTC2_DISPLAY_DIS(1) |
+                       S_0003F8_CRTC2_DISP_REQ_EN_B(1));
+               WREG32(R_000360_CUR2_OFFSET,
+                       C_000360_CUR2_LOCK & save->CUR2_OFFSET);
+       }
+}
+
+void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save)
+{
+       /* Update base address for crtc */
+       WREG32(R_00023C_DISPLAY_BASE_ADDR, rdev->mc.vram_location);
+       if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
+               WREG32(R_00033C_CRTC2_DISPLAY_BASE_ADDR,
+                               rdev->mc.vram_location);
+       }
+       /* Restore CRTC registers */
+       WREG32(R_0003C0_GENMO_WT, save->GENMO_WT);
+       WREG32(R_000054_CRTC_EXT_CNTL, save->CRTC_EXT_CNTL);
+       WREG32(R_000050_CRTC_GEN_CNTL, save->CRTC_GEN_CNTL);
+       if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
+               WREG32(R_0003F8_CRTC2_GEN_CNTL, save->CRTC2_GEN_CNTL);
+       }
+}
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h
new file mode 100644 (file)
index 0000000..70a82ed
--- /dev/null
@@ -0,0 +1,124 @@
+
+#define R100_TRACK_MAX_TEXTURE 3
+#define R200_TRACK_MAX_TEXTURE 6
+#define R300_TRACK_MAX_TEXTURE 16
+
+#define R100_MAX_CB 1
+#define R300_MAX_CB 4
+
+/*
+ * CS functions
+ */
+struct r100_cs_track_cb {
+       struct radeon_object    *robj;
+       unsigned                pitch;
+       unsigned                cpp;
+       unsigned                offset;
+};
+
+struct r100_cs_track_array {
+       struct radeon_object    *robj;
+       unsigned                esize;
+};
+
+struct r100_cs_cube_info {
+       struct radeon_object    *robj;
+       unsigned                offset;
+       unsigned                width;
+       unsigned                height;
+};
+
+struct r100_cs_track_texture {
+       struct radeon_object    *robj;
+       struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */
+       unsigned                pitch;
+       unsigned                width;
+       unsigned                height;
+       unsigned                num_levels;
+       unsigned                cpp;
+       unsigned                tex_coord_type;
+       unsigned                txdepth;
+       unsigned                width_11;
+       unsigned                height_11;
+       bool                    use_pitch;
+       bool                    enabled;
+       bool                    roundup_w;
+       bool                    roundup_h;
+};
+
+struct r100_cs_track_limits {
+       unsigned num_cb;
+       unsigned num_texture;
+       unsigned max_levels;
+};
+
+struct r100_cs_track {
+       struct radeon_device *rdev;
+       unsigned                        num_cb;
+       unsigned                        num_texture;
+       unsigned                        maxy;
+       unsigned                        vtx_size;
+       unsigned                        vap_vf_cntl;
+       unsigned                        immd_dwords;
+       unsigned                        num_arrays;
+       unsigned                        max_indx;
+       struct r100_cs_track_array      arrays[11];
+       struct r100_cs_track_cb         cb[R300_MAX_CB];
+       struct r100_cs_track_cb         zb;
+       struct r100_cs_track_texture    textures[R300_TRACK_MAX_TEXTURE];
+       bool                            z_enabled;
+       bool                            separate_cube;
+
+};
+
+int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track);
+void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track);
+int r100_cs_packet_next_reloc(struct radeon_cs_parser *p,
+                             struct radeon_cs_reloc **cs_reloc);
+void r100_cs_dump_packet(struct radeon_cs_parser *p,
+                        struct radeon_cs_packet *pkt);
+
+int r100_cs_packet_parse_vline(struct radeon_cs_parser *p);
+
+int r200_packet0_check(struct radeon_cs_parser *p,
+                      struct radeon_cs_packet *pkt,
+                      unsigned idx, unsigned reg);
+
+static inline int r100_reloc_pitch_offset(struct radeon_cs_parser *p,
+                                         struct radeon_cs_packet *pkt,
+                                         unsigned idx,
+                                         unsigned reg)
+{
+       int r;
+       u32 tile_flags = 0;
+       u32 tmp;
+       struct radeon_cs_reloc *reloc;
+       struct radeon_cs_chunk *ib_chunk;
+
+       ib_chunk = &p->chunks[p->chunk_ib_idx];
+
+       r = r100_cs_packet_next_reloc(p, &reloc);
+       if (r) {
+               DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                         idx, reg);
+               r100_cs_dump_packet(p, pkt);
+               return r;
+       }
+       tmp = ib_chunk->kdata[idx] & 0x003fffff;
+       tmp += (((u32)reloc->lobj.gpu_offset) >> 10);
+
+       if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+               tile_flags |= RADEON_DST_TILE_MACRO;
+       if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) {
+               if (reg == RADEON_SRC_PITCH_OFFSET) {
+                       DRM_ERROR("Cannot src blit from microtiled surface\n");
+                       r100_cs_dump_packet(p, pkt);
+                       return -EINVAL;
+               }
+               tile_flags |= RADEON_DST_TILE_MICRO;
+       }
+
+       tmp |= tile_flags;
+       p->ib->ptr[idx] = (ib_chunk->kdata[idx] & 0x3fc00000) | tmp;
+       return 0;
+}
diff --git a/drivers/gpu/drm/radeon/r100d.h b/drivers/gpu/drm/radeon/r100d.h
new file mode 100644 (file)
index 0000000..c4b257e
--- /dev/null
@@ -0,0 +1,607 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef __R100D_H__
+#define __R100D_H__
+
+#define CP_PACKET0                     0x00000000
+#define                PACKET0_BASE_INDEX_SHIFT        0
+#define                PACKET0_BASE_INDEX_MASK         (0x1ffff << 0)
+#define                PACKET0_COUNT_SHIFT             16
+#define                PACKET0_COUNT_MASK              (0x3fff << 16)
+#define CP_PACKET1                     0x40000000
+#define CP_PACKET2                     0x80000000
+#define                PACKET2_PAD_SHIFT               0
+#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
+#define CP_PACKET3                     0xC0000000
+#define                PACKET3_IT_OPCODE_SHIFT         8
+#define                PACKET3_IT_OPCODE_MASK          (0xff << 8)
+#define                PACKET3_COUNT_SHIFT             16
+#define                PACKET3_COUNT_MASK              (0x3fff << 16)
+/* PACKET3 op code */
+#define                PACKET3_NOP                     0x10
+#define                PACKET3_3D_DRAW_VBUF            0x28
+#define                PACKET3_3D_DRAW_IMMD            0x29
+#define                PACKET3_3D_DRAW_INDX            0x2A
+#define                PACKET3_3D_LOAD_VBPNTR          0x2F
+#define                PACKET3_INDX_BUFFER             0x33
+#define                PACKET3_3D_DRAW_VBUF_2          0x34
+#define                PACKET3_3D_DRAW_IMMD_2          0x35
+#define                PACKET3_3D_DRAW_INDX_2          0x36
+#define                PACKET3_BITBLT_MULTI            0x9B
+
+#define PACKET0(reg, n)        (CP_PACKET0 |                                   \
+                        REG_SET(PACKET0_BASE_INDEX, (reg) >> 2) |      \
+                        REG_SET(PACKET0_COUNT, (n)))
+#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
+#define PACKET3(op, n) (CP_PACKET3 |                                   \
+                        REG_SET(PACKET3_IT_OPCODE, (op)) |             \
+                        REG_SET(PACKET3_COUNT, (n)))
+
+#define        PACKET_TYPE0    0
+#define        PACKET_TYPE1    1
+#define        PACKET_TYPE2    2
+#define        PACKET_TYPE3    3
+
+#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
+#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
+#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
+#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
+#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
+
+/* Registers */
+#define R_000040_GEN_INT_CNTL                        0x000040
+#define   S_000040_CRTC_VBLANK(x)                      (((x) & 0x1) << 0)
+#define   G_000040_CRTC_VBLANK(x)                      (((x) >> 0) & 0x1)
+#define   C_000040_CRTC_VBLANK                         0xFFFFFFFE
+#define   S_000040_CRTC_VLINE(x)                       (((x) & 0x1) << 1)
+#define   G_000040_CRTC_VLINE(x)                       (((x) >> 1) & 0x1)
+#define   C_000040_CRTC_VLINE                          0xFFFFFFFD
+#define   S_000040_CRTC_VSYNC(x)                       (((x) & 0x1) << 2)
+#define   G_000040_CRTC_VSYNC(x)                       (((x) >> 2) & 0x1)
+#define   C_000040_CRTC_VSYNC                          0xFFFFFFFB
+#define   S_000040_SNAPSHOT(x)                         (((x) & 0x1) << 3)
+#define   G_000040_SNAPSHOT(x)                         (((x) >> 3) & 0x1)
+#define   C_000040_SNAPSHOT                            0xFFFFFFF7
+#define   S_000040_FP_DETECT(x)                        (((x) & 0x1) << 4)
+#define   G_000040_FP_DETECT(x)                        (((x) >> 4) & 0x1)
+#define   C_000040_FP_DETECT                           0xFFFFFFEF
+#define   S_000040_CRTC2_VLINE(x)                      (((x) & 0x1) << 5)
+#define   G_000040_CRTC2_VLINE(x)                      (((x) >> 5) & 0x1)
+#define   C_000040_CRTC2_VLINE                         0xFFFFFFDF
+#define   S_000040_DMA_VIPH0_INT_EN(x)                 (((x) & 0x1) << 12)
+#define   G_000040_DMA_VIPH0_INT_EN(x)                 (((x) >> 12) & 0x1)
+#define   C_000040_DMA_VIPH0_INT_EN                    0xFFFFEFFF
+#define   S_000040_CRTC2_VSYNC(x)                      (((x) & 0x1) << 6)
+#define   G_000040_CRTC2_VSYNC(x)                      (((x) >> 6) & 0x1)
+#define   C_000040_CRTC2_VSYNC                         0xFFFFFFBF
+#define   S_000040_SNAPSHOT2(x)                        (((x) & 0x1) << 7)
+#define   G_000040_SNAPSHOT2(x)                        (((x) >> 7) & 0x1)
+#define   C_000040_SNAPSHOT2                           0xFFFFFF7F
+#define   S_000040_CRTC2_VBLANK(x)                     (((x) & 0x1) << 9)
+#define   G_000040_CRTC2_VBLANK(x)                     (((x) >> 9) & 0x1)
+#define   C_000040_CRTC2_VBLANK                        0xFFFFFDFF
+#define   S_000040_FP2_DETECT(x)                       (((x) & 0x1) << 10)
+#define   G_000040_FP2_DETECT(x)                       (((x) >> 10) & 0x1)
+#define   C_000040_FP2_DETECT                          0xFFFFFBFF
+#define   S_000040_VSYNC_DIFF_OVER_LIMIT(x)            (((x) & 0x1) << 11)
+#define   G_000040_VSYNC_DIFF_OVER_LIMIT(x)            (((x) >> 11) & 0x1)
+#define   C_000040_VSYNC_DIFF_OVER_LIMIT               0xFFFFF7FF
+#define   S_000040_DMA_VIPH1_INT_EN(x)                 (((x) & 0x1) << 13)
+#define   G_000040_DMA_VIPH1_INT_EN(x)                 (((x) >> 13) & 0x1)
+#define   C_000040_DMA_VIPH1_INT_EN                    0xFFFFDFFF
+#define   S_000040_DMA_VIPH2_INT_EN(x)                 (((x) & 0x1) << 14)
+#define   G_000040_DMA_VIPH2_INT_EN(x)                 (((x) >> 14) & 0x1)
+#define   C_000040_DMA_VIPH2_INT_EN                    0xFFFFBFFF
+#define   S_000040_DMA_VIPH3_INT_EN(x)                 (((x) & 0x1) << 15)
+#define   G_000040_DMA_VIPH3_INT_EN(x)                 (((x) >> 15) & 0x1)
+#define   C_000040_DMA_VIPH3_INT_EN                    0xFFFF7FFF
+#define   S_000040_I2C_INT_EN(x)                       (((x) & 0x1) << 17)
+#define   G_000040_I2C_INT_EN(x)                       (((x) >> 17) & 0x1)
+#define   C_000040_I2C_INT_EN                          0xFFFDFFFF
+#define   S_000040_GUI_IDLE(x)                         (((x) & 0x1) << 19)
+#define   G_000040_GUI_IDLE(x)                         (((x) >> 19) & 0x1)
+#define   C_000040_GUI_IDLE                            0xFFF7FFFF
+#define   S_000040_VIPH_INT_EN(x)                      (((x) & 0x1) << 24)
+#define   G_000040_VIPH_INT_EN(x)                      (((x) >> 24) & 0x1)
+#define   C_000040_VIPH_INT_EN                         0xFEFFFFFF
+#define   S_000040_SW_INT_EN(x)                        (((x) & 0x1) << 25)
+#define   G_000040_SW_INT_EN(x)                        (((x) >> 25) & 0x1)
+#define   C_000040_SW_INT_EN                           0xFDFFFFFF
+#define   S_000040_GEYSERVILLE(x)                      (((x) & 0x1) << 27)
+#define   G_000040_GEYSERVILLE(x)                      (((x) >> 27) & 0x1)
+#define   C_000040_GEYSERVILLE                         0xF7FFFFFF
+#define   S_000040_HDCP_AUTHORIZED_INT(x)              (((x) & 0x1) << 28)
+#define   G_000040_HDCP_AUTHORIZED_INT(x)              (((x) >> 28) & 0x1)
+#define   C_000040_HDCP_AUTHORIZED_INT                 0xEFFFFFFF
+#define   S_000040_DVI_I2C_INT(x)                      (((x) & 0x1) << 29)
+#define   G_000040_DVI_I2C_INT(x)                      (((x) >> 29) & 0x1)
+#define   C_000040_DVI_I2C_INT                         0xDFFFFFFF
+#define   S_000040_GUIDMA(x)                           (((x) & 0x1) << 30)
+#define   G_000040_GUIDMA(x)                           (((x) >> 30) & 0x1)
+#define   C_000040_GUIDMA                              0xBFFFFFFF
+#define   S_000040_VIDDMA(x)                           (((x) & 0x1) << 31)
+#define   G_000040_VIDDMA(x)                           (((x) >> 31) & 0x1)
+#define   C_000040_VIDDMA                              0x7FFFFFFF
+#define R_000044_GEN_INT_STATUS                      0x000044
+#define   S_000044_CRTC_VBLANK_STAT(x)                 (((x) & 0x1) << 0)
+#define   G_000044_CRTC_VBLANK_STAT(x)                 (((x) >> 0) & 0x1)
+#define   C_000044_CRTC_VBLANK_STAT                    0xFFFFFFFE
+#define   S_000044_CRTC_VBLANK_STAT_AK(x)              (((x) & 0x1) << 0)
+#define   G_000044_CRTC_VBLANK_STAT_AK(x)              (((x) >> 0) & 0x1)
+#define   C_000044_CRTC_VBLANK_STAT_AK                 0xFFFFFFFE
+#define   S_000044_CRTC_VLINE_STAT(x)                  (((x) & 0x1) << 1)
+#define   G_000044_CRTC_VLINE_STAT(x)                  (((x) >> 1) & 0x1)
+#define   C_000044_CRTC_VLINE_STAT                     0xFFFFFFFD
+#define   S_000044_CRTC_VLINE_STAT_AK(x)               (((x) & 0x1) << 1)
+#define   G_000044_CRTC_VLINE_STAT_AK(x)               (((x) >> 1) & 0x1)
+#define   C_000044_CRTC_VLINE_STAT_AK                  0xFFFFFFFD
+#define   S_000044_CRTC_VSYNC_STAT(x)                  (((x) & 0x1) << 2)
+#define   G_000044_CRTC_VSYNC_STAT(x)                  (((x) >> 2) & 0x1)
+#define   C_000044_CRTC_VSYNC_STAT                     0xFFFFFFFB
+#define   S_000044_CRTC_VSYNC_STAT_AK(x)               (((x) & 0x1) << 2)
+#define   G_000044_CRTC_VSYNC_STAT_AK(x)               (((x) >> 2) & 0x1)
+#define   C_000044_CRTC_VSYNC_STAT_AK                  0xFFFFFFFB
+#define   S_000044_SNAPSHOT_STAT(x)                    (((x) & 0x1) << 3)
+#define   G_000044_SNAPSHOT_STAT(x)                    (((x) >> 3) & 0x1)
+#define   C_000044_SNAPSHOT_STAT                       0xFFFFFFF7
+#define   S_000044_SNAPSHOT_STAT_AK(x)                 (((x) & 0x1) << 3)
+#define   G_000044_SNAPSHOT_STAT_AK(x)                 (((x) >> 3) & 0x1)
+#define   C_000044_SNAPSHOT_STAT_AK                    0xFFFFFFF7
+#define   S_000044_FP_DETECT_STAT(x)                   (((x) & 0x1) << 4)
+#define   G_000044_FP_DETECT_STAT(x)                   (((x) >> 4) & 0x1)
+#define   C_000044_FP_DETECT_STAT                      0xFFFFFFEF
+#define   S_000044_FP_DETECT_STAT_AK(x)                (((x) & 0x1) << 4)
+#define   G_000044_FP_DETECT_STAT_AK(x)                (((x) >> 4) & 0x1)
+#define   C_000044_FP_DETECT_STAT_AK                   0xFFFFFFEF
+#define   S_000044_CRTC2_VLINE_STAT(x)                 (((x) & 0x1) << 5)
+#define   G_000044_CRTC2_VLINE_STAT(x)                 (((x) >> 5) & 0x1)
+#define   C_000044_CRTC2_VLINE_STAT                    0xFFFFFFDF
+#define   S_000044_CRTC2_VLINE_STAT_AK(x)              (((x) & 0x1) << 5)
+#define   G_000044_CRTC2_VLINE_STAT_AK(x)              (((x) >> 5) & 0x1)
+#define   C_000044_CRTC2_VLINE_STAT_AK                 0xFFFFFFDF
+#define   S_000044_CRTC2_VSYNC_STAT(x)                 (((x) & 0x1) << 6)
+#define   G_000044_CRTC2_VSYNC_STAT(x)                 (((x) >> 6) & 0x1)
+#define   C_000044_CRTC2_VSYNC_STAT                    0xFFFFFFBF
+#define   S_000044_CRTC2_VSYNC_STAT_AK(x)              (((x) & 0x1) << 6)
+#define   G_000044_CRTC2_VSYNC_STAT_AK(x)              (((x) >> 6) & 0x1)
+#define   C_000044_CRTC2_VSYNC_STAT_AK                 0xFFFFFFBF
+#define   S_000044_SNAPSHOT2_STAT(x)                   (((x) & 0x1) << 7)
+#define   G_000044_SNAPSHOT2_STAT(x)                   (((x) >> 7) & 0x1)
+#define   C_000044_SNAPSHOT2_STAT                      0xFFFFFF7F
+#define   S_000044_SNAPSHOT2_STAT_AK(x)                (((x) & 0x1) << 7)
+#define   G_000044_SNAPSHOT2_STAT_AK(x)                (((x) >> 7) & 0x1)
+#define   C_000044_SNAPSHOT2_STAT_AK                   0xFFFFFF7F
+#define   S_000044_CAP0_INT_ACTIVE(x)                  (((x) & 0x1) << 8)
+#define   G_000044_CAP0_INT_ACTIVE(x)                  (((x) >> 8) & 0x1)
+#define   C_000044_CAP0_INT_ACTIVE                     0xFFFFFEFF
+#define   S_000044_CRTC2_VBLANK_STAT(x)                (((x) & 0x1) << 9)
+#define   G_000044_CRTC2_VBLANK_STAT(x)                (((x) >> 9) & 0x1)
+#define   C_000044_CRTC2_VBLANK_STAT                   0xFFFFFDFF
+#define   S_000044_CRTC2_VBLANK_STAT_AK(x)             (((x) & 0x1) << 9)
+#define   G_000044_CRTC2_VBLANK_STAT_AK(x)             (((x) >> 9) & 0x1)
+#define   C_000044_CRTC2_VBLANK_STAT_AK                0xFFFFFDFF
+#define   S_000044_FP2_DETECT_STAT(x)                  (((x) & 0x1) << 10)
+#define   G_000044_FP2_DETECT_STAT(x)                  (((x) >> 10) & 0x1)
+#define   C_000044_FP2_DETECT_STAT                     0xFFFFFBFF
+#define   S_000044_FP2_DETECT_STAT_AK(x)               (((x) & 0x1) << 10)
+#define   G_000044_FP2_DETECT_STAT_AK(x)               (((x) >> 10) & 0x1)
+#define   C_000044_FP2_DETECT_STAT_AK                  0xFFFFFBFF
+#define   S_000044_VSYNC_DIFF_OVER_LIMIT_STAT(x)       (((x) & 0x1) << 11)
+#define   G_000044_VSYNC_DIFF_OVER_LIMIT_STAT(x)       (((x) >> 11) & 0x1)
+#define   C_000044_VSYNC_DIFF_OVER_LIMIT_STAT          0xFFFFF7FF
+#define   S_000044_VSYNC_DIFF_OVER_LIMIT_STAT_AK(x)    (((x) & 0x1) << 11)
+#define   G_000044_VSYNC_DIFF_OVER_LIMIT_STAT_AK(x)    (((x) >> 11) & 0x1)
+#define   C_000044_VSYNC_DIFF_OVER_LIMIT_STAT_AK       0xFFFFF7FF
+#define   S_000044_DMA_VIPH0_INT(x)                    (((x) & 0x1) << 12)
+#define   G_000044_DMA_VIPH0_INT(x)                    (((x) >> 12) & 0x1)
+#define   C_000044_DMA_VIPH0_INT                       0xFFFFEFFF
+#define   S_000044_DMA_VIPH0_INT_AK(x)                 (((x) & 0x1) << 12)
+#define   G_000044_DMA_VIPH0_INT_AK(x)                 (((x) >> 12) & 0x1)
+#define   C_000044_DMA_VIPH0_INT_AK                    0xFFFFEFFF
+#define   S_000044_DMA_VIPH1_INT(x)                    (((x) & 0x1) << 13)
+#define   G_000044_DMA_VIPH1_INT(x)                    (((x) >> 13) & 0x1)
+#define   C_000044_DMA_VIPH1_INT                       0xFFFFDFFF
+#define   S_000044_DMA_VIPH1_INT_AK(x)                 (((x) & 0x1) << 13)
+#define   G_000044_DMA_VIPH1_INT_AK(x)                 (((x) >> 13) & 0x1)
+#define   C_000044_DMA_VIPH1_INT_AK                    0xFFFFDFFF
+#define   S_000044_DMA_VIPH2_INT(x)                    (((x) & 0x1) << 14)
+#define   G_000044_DMA_VIPH2_INT(x)                    (((x) >> 14) & 0x1)
+#define   C_000044_DMA_VIPH2_INT                       0xFFFFBFFF
+#define   S_000044_DMA_VIPH2_INT_AK(x)                 (((x) & 0x1) << 14)
+#define   G_000044_DMA_VIPH2_INT_AK(x)                 (((x) >> 14) & 0x1)
+#define   C_000044_DMA_VIPH2_INT_AK                    0xFFFFBFFF
+#define   S_000044_DMA_VIPH3_INT(x)                    (((x) & 0x1) << 15)
+#define   G_000044_DMA_VIPH3_INT(x)                    (((x) >> 15) & 0x1)
+#define   C_000044_DMA_VIPH3_INT                       0xFFFF7FFF
+#define   S_000044_DMA_VIPH3_INT_AK(x)                 (((x) & 0x1) << 15)
+#define   G_000044_DMA_VIPH3_INT_AK(x)                 (((x) >> 15) & 0x1)
+#define   C_000044_DMA_VIPH3_INT_AK                    0xFFFF7FFF
+#define   S_000044_I2C_INT(x)                          (((x) & 0x1) << 17)
+#define   G_000044_I2C_INT(x)                          (((x) >> 17) & 0x1)
+#define   C_000044_I2C_INT                             0xFFFDFFFF
+#define   S_000044_I2C_INT_AK(x)                       (((x) & 0x1) << 17)
+#define   G_000044_I2C_INT_AK(x)                       (((x) >> 17) & 0x1)
+#define   C_000044_I2C_INT_AK                          0xFFFDFFFF
+#define   S_000044_GUI_IDLE_STAT(x)                    (((x) & 0x1) << 19)
+#define   G_000044_GUI_IDLE_STAT(x)                    (((x) >> 19) & 0x1)
+#define   C_000044_GUI_IDLE_STAT                       0xFFF7FFFF
+#define   S_000044_GUI_IDLE_STAT_AK(x)                 (((x) & 0x1) << 19)
+#define   G_000044_GUI_IDLE_STAT_AK(x)                 (((x) >> 19) & 0x1)
+#define   C_000044_GUI_IDLE_STAT_AK                    0xFFF7FFFF
+#define   S_000044_VIPH_INT(x)                         (((x) & 0x1) << 24)
+#define   G_000044_VIPH_INT(x)                         (((x) >> 24) & 0x1)
+#define   C_000044_VIPH_INT                            0xFEFFFFFF
+#define   S_000044_SW_INT(x)                           (((x) & 0x1) << 25)
+#define   G_000044_SW_INT(x)                           (((x) >> 25) & 0x1)
+#define   C_000044_SW_INT                              0xFDFFFFFF
+#define   S_000044_SW_INT_AK(x)                        (((x) & 0x1) << 25)
+#define   G_000044_SW_INT_AK(x)                        (((x) >> 25) & 0x1)
+#define   C_000044_SW_INT_AK                           0xFDFFFFFF
+#define   S_000044_SW_INT_SET(x)                       (((x) & 0x1) << 26)
+#define   G_000044_SW_INT_SET(x)                       (((x) >> 26) & 0x1)
+#define   C_000044_SW_INT_SET                          0xFBFFFFFF
+#define   S_000044_GEYSERVILLE_STAT(x)                 (((x) & 0x1) << 27)
+#define   G_000044_GEYSERVILLE_STAT(x)                 (((x) >> 27) & 0x1)
+#define   C_000044_GEYSERVILLE_STAT                    0xF7FFFFFF
+#define   S_000044_GEYSERVILLE_STAT_AK(x)              (((x) & 0x1) << 27)
+#define   G_000044_GEYSERVILLE_STAT_AK(x)              (((x) >> 27) & 0x1)
+#define   C_000044_GEYSERVILLE_STAT_AK                 0xF7FFFFFF
+#define   S_000044_HDCP_AUTHORIZED_INT_STAT(x)         (((x) & 0x1) << 28)
+#define   G_000044_HDCP_AUTHORIZED_INT_STAT(x)         (((x) >> 28) & 0x1)
+#define   C_000044_HDCP_AUTHORIZED_INT_STAT            0xEFFFFFFF
+#define   S_000044_HDCP_AUTHORIZED_INT_AK(x)           (((x) & 0x1) << 28)
+#define   G_000044_HDCP_AUTHORIZED_INT_AK(x)           (((x) >> 28) & 0x1)
+#define   C_000044_HDCP_AUTHORIZED_INT_AK              0xEFFFFFFF
+#define   S_000044_DVI_I2C_INT_STAT(x)                 (((x) & 0x1) << 29)
+#define   G_000044_DVI_I2C_INT_STAT(x)                 (((x) >> 29) & 0x1)
+#define   C_000044_DVI_I2C_INT_STAT                    0xDFFFFFFF
+#define   S_000044_DVI_I2C_INT_AK(x)                   (((x) & 0x1) << 29)
+#define   G_000044_DVI_I2C_INT_AK(x)                   (((x) >> 29) & 0x1)
+#define   C_000044_DVI_I2C_INT_AK                      0xDFFFFFFF
+#define   S_000044_GUIDMA_STAT(x)                      (((x) & 0x1) << 30)
+#define   G_000044_GUIDMA_STAT(x)                      (((x) >> 30) & 0x1)
+#define   C_000044_GUIDMA_STAT                         0xBFFFFFFF
+#define   S_000044_GUIDMA_AK(x)                        (((x) & 0x1) << 30)
+#define   G_000044_GUIDMA_AK(x)                        (((x) >> 30) & 0x1)
+#define   C_000044_GUIDMA_AK                           0xBFFFFFFF
+#define   S_000044_VIDDMA_STAT(x)                      (((x) & 0x1) << 31)
+#define   G_000044_VIDDMA_STAT(x)                      (((x) >> 31) & 0x1)
+#define   C_000044_VIDDMA_STAT                         0x7FFFFFFF
+#define   S_000044_VIDDMA_AK(x)                        (((x) & 0x1) << 31)
+#define   G_000044_VIDDMA_AK(x)                        (((x) >> 31) & 0x1)
+#define   C_000044_VIDDMA_AK                           0x7FFFFFFF
+#define R_000050_CRTC_GEN_CNTL                       0x000050
+#define   S_000050_CRTC_DBL_SCAN_EN(x)                 (((x) & 0x1) << 0)
+#define   G_000050_CRTC_DBL_SCAN_EN(x)                 (((x) >> 0) & 0x1)
+#define   C_000050_CRTC_DBL_SCAN_EN                    0xFFFFFFFE
+#define   S_000050_CRTC_INTERLACE_EN(x)                (((x) & 0x1) << 1)
+#define   G_000050_CRTC_INTERLACE_EN(x)                (((x) >> 1) & 0x1)
+#define   C_000050_CRTC_INTERLACE_EN                   0xFFFFFFFD
+#define   S_000050_CRTC_C_SYNC_EN(x)                   (((x) & 0x1) << 4)
+#define   G_000050_CRTC_C_SYNC_EN(x)                   (((x) >> 4) & 0x1)
+#define   C_000050_CRTC_C_SYNC_EN                      0xFFFFFFEF
+#define   S_000050_CRTC_PIX_WIDTH(x)                   (((x) & 0xF) << 8)
+#define   G_000050_CRTC_PIX_WIDTH(x)                   (((x) >> 8) & 0xF)
+#define   C_000050_CRTC_PIX_WIDTH                      0xFFFFF0FF
+#define   S_000050_CRTC_ICON_EN(x)                     (((x) & 0x1) << 15)
+#define   G_000050_CRTC_ICON_EN(x)                     (((x) >> 15) & 0x1)
+#define   C_000050_CRTC_ICON_EN                        0xFFFF7FFF
+#define   S_000050_CRTC_CUR_EN(x)                      (((x) & 0x1) << 16)
+#define   G_000050_CRTC_CUR_EN(x)                      (((x) >> 16) & 0x1)
+#define   C_000050_CRTC_CUR_EN                         0xFFFEFFFF
+#define   S_000050_CRTC_VSTAT_MODE(x)                  (((x) & 0x3) << 17)
+#define   G_000050_CRTC_VSTAT_MODE(x)                  (((x) >> 17) & 0x3)
+#define   C_000050_CRTC_VSTAT_MODE                     0xFFF9FFFF
+#define   S_000050_CRTC_CUR_MODE(x)                    (((x) & 0x7) << 20)
+#define   G_000050_CRTC_CUR_MODE(x)                    (((x) >> 20) & 0x7)
+#define   C_000050_CRTC_CUR_MODE                       0xFF8FFFFF
+#define   S_000050_CRTC_EXT_DISP_EN(x)                 (((x) & 0x1) << 24)
+#define   G_000050_CRTC_EXT_DISP_EN(x)                 (((x) >> 24) & 0x1)
+#define   C_000050_CRTC_EXT_DISP_EN                    0xFEFFFFFF
+#define   S_000050_CRTC_EN(x)                          (((x) & 0x1) << 25)
+#define   G_000050_CRTC_EN(x)                          (((x) >> 25) & 0x1)
+#define   C_000050_CRTC_EN                             0xFDFFFFFF
+#define   S_000050_CRTC_DISP_REQ_EN_B(x)               (((x) & 0x1) << 26)
+#define   G_000050_CRTC_DISP_REQ_EN_B(x)               (((x) >> 26) & 0x1)
+#define   C_000050_CRTC_DISP_REQ_EN_B                  0xFBFFFFFF
+#define R_000054_CRTC_EXT_CNTL                       0x000054
+#define   S_000054_CRTC_VGA_XOVERSCAN(x)               (((x) & 0x1) << 0)
+#define   G_000054_CRTC_VGA_XOVERSCAN(x)               (((x) >> 0) & 0x1)
+#define   C_000054_CRTC_VGA_XOVERSCAN                  0xFFFFFFFE
+#define   S_000054_VGA_BLINK_RATE(x)                   (((x) & 0x3) << 1)
+#define   G_000054_VGA_BLINK_RATE(x)                   (((x) >> 1) & 0x3)
+#define   C_000054_VGA_BLINK_RATE                      0xFFFFFFF9
+#define   S_000054_VGA_ATI_LINEAR(x)                   (((x) & 0x1) << 3)
+#define   G_000054_VGA_ATI_LINEAR(x)                   (((x) >> 3) & 0x1)
+#define   C_000054_VGA_ATI_LINEAR                      0xFFFFFFF7
+#define   S_000054_VGA_128KAP_PAGING(x)                (((x) & 0x1) << 4)
+#define   G_000054_VGA_128KAP_PAGING(x)                (((x) >> 4) & 0x1)
+#define   C_000054_VGA_128KAP_PAGING                   0xFFFFFFEF
+#define   S_000054_VGA_TEXT_132(x)                     (((x) & 0x1) << 5)
+#define   G_000054_VGA_TEXT_132(x)                     (((x) >> 5) & 0x1)
+#define   C_000054_VGA_TEXT_132                        0xFFFFFFDF
+#define   S_000054_VGA_XCRT_CNT_EN(x)                  (((x) & 0x1) << 6)
+#define   G_000054_VGA_XCRT_CNT_EN(x)                  (((x) >> 6) & 0x1)
+#define   C_000054_VGA_XCRT_CNT_EN                     0xFFFFFFBF
+#define   S_000054_CRTC_HSYNC_DIS(x)                   (((x) & 0x1) << 8)
+#define   G_000054_CRTC_HSYNC_DIS(x)                   (((x) >> 8) & 0x1)
+#define   C_000054_CRTC_HSYNC_DIS                      0xFFFFFEFF
+#define   S_000054_CRTC_VSYNC_DIS(x)                   (((x) & 0x1) << 9)
+#define   G_000054_CRTC_VSYNC_DIS(x)                   (((x) >> 9) & 0x1)
+#define   C_000054_CRTC_VSYNC_DIS                      0xFFFFFDFF
+#define   S_000054_CRTC_DISPLAY_DIS(x)                 (((x) & 0x1) << 10)
+#define   G_000054_CRTC_DISPLAY_DIS(x)                 (((x) >> 10) & 0x1)
+#define   C_000054_CRTC_DISPLAY_DIS                    0xFFFFFBFF
+#define   S_000054_CRTC_SYNC_TRISTATE(x)               (((x) & 0x1) << 11)
+#define   G_000054_CRTC_SYNC_TRISTATE(x)               (((x) >> 11) & 0x1)
+#define   C_000054_CRTC_SYNC_TRISTATE                  0xFFFFF7FF
+#define   S_000054_CRTC_HSYNC_TRISTATE(x)              (((x) & 0x1) << 12)
+#define   G_000054_CRTC_HSYNC_TRISTATE(x)              (((x) >> 12) & 0x1)
+#define   C_000054_CRTC_HSYNC_TRISTATE                 0xFFFFEFFF
+#define   S_000054_CRTC_VSYNC_TRISTATE(x)              (((x) & 0x1) << 13)
+#define   G_000054_CRTC_VSYNC_TRISTATE(x)              (((x) >> 13) & 0x1)
+#define   C_000054_CRTC_VSYNC_TRISTATE                 0xFFFFDFFF
+#define   S_000054_CRT_ON(x)                           (((x) & 0x1) << 15)
+#define   G_000054_CRT_ON(x)                           (((x) >> 15) & 0x1)
+#define   C_000054_CRT_ON                              0xFFFF7FFF
+#define   S_000054_VGA_CUR_B_TEST(x)                   (((x) & 0x1) << 17)
+#define   G_000054_VGA_CUR_B_TEST(x)                   (((x) >> 17) & 0x1)
+#define   C_000054_VGA_CUR_B_TEST                      0xFFFDFFFF
+#define   S_000054_VGA_PACK_DIS(x)                     (((x) & 0x1) << 18)
+#define   G_000054_VGA_PACK_DIS(x)                     (((x) >> 18) & 0x1)
+#define   C_000054_VGA_PACK_DIS                        0xFFFBFFFF
+#define   S_000054_VGA_MEM_PS_EN(x)                    (((x) & 0x1) << 19)
+#define   G_000054_VGA_MEM_PS_EN(x)                    (((x) >> 19) & 0x1)
+#define   C_000054_VGA_MEM_PS_EN                       0xFFF7FFFF
+#define   S_000054_VCRTC_IDX_MASTER(x)                 (((x) & 0x7F) << 24)
+#define   G_000054_VCRTC_IDX_MASTER(x)                 (((x) >> 24) & 0x7F)
+#define   C_000054_VCRTC_IDX_MASTER                    0x80FFFFFF
+#define R_00023C_DISPLAY_BASE_ADDR                   0x00023C
+#define   S_00023C_DISPLAY_BASE_ADDR(x)                (((x) & 0xFFFFFFFF) << 0)
+#define   G_00023C_DISPLAY_BASE_ADDR(x)                (((x) >> 0) & 0xFFFFFFFF)
+#define   C_00023C_DISPLAY_BASE_ADDR                   0x00000000
+#define R_000260_CUR_OFFSET                          0x000260
+#define   S_000260_CUR_OFFSET(x)                       (((x) & 0x7FFFFFF) << 0)
+#define   G_000260_CUR_OFFSET(x)                       (((x) >> 0) & 0x7FFFFFF)
+#define   C_000260_CUR_OFFSET                          0xF8000000
+#define   S_000260_CUR_LOCK(x)                         (((x) & 0x1) << 31)
+#define   G_000260_CUR_LOCK(x)                         (((x) >> 31) & 0x1)
+#define   C_000260_CUR_LOCK                            0x7FFFFFFF
+#define R_00033C_CRTC2_DISPLAY_BASE_ADDR             0x00033C
+#define   S_00033C_CRTC2_DISPLAY_BASE_ADDR(x)          (((x) & 0xFFFFFFFF) << 0)
+#define   G_00033C_CRTC2_DISPLAY_BASE_ADDR(x)          (((x) >> 0) & 0xFFFFFFFF)
+#define   C_00033C_CRTC2_DISPLAY_BASE_ADDR             0x00000000
+#define R_000360_CUR2_OFFSET                         0x000360
+#define   S_000360_CUR2_OFFSET(x)                      (((x) & 0x7FFFFFF) << 0)
+#define   G_000360_CUR2_OFFSET(x)                      (((x) >> 0) & 0x7FFFFFF)
+#define   C_000360_CUR2_OFFSET                         0xF8000000
+#define   S_000360_CUR2_LOCK(x)                        (((x) & 0x1) << 31)
+#define   G_000360_CUR2_LOCK(x)                        (((x) >> 31) & 0x1)
+#define   C_000360_CUR2_LOCK                           0x7FFFFFFF
+#define R_0003C0_GENMO_WT                            0x0003C0
+#define   S_0003C0_GENMO_MONO_ADDRESS_B(x)             (((x) & 0x1) << 0)
+#define   G_0003C0_GENMO_MONO_ADDRESS_B(x)             (((x) >> 0) & 0x1)
+#define   C_0003C0_GENMO_MONO_ADDRESS_B                0xFFFFFFFE
+#define   S_0003C0_VGA_RAM_EN(x)                       (((x) & 0x1) << 1)
+#define   G_0003C0_VGA_RAM_EN(x)                       (((x) >> 1) & 0x1)
+#define   C_0003C0_VGA_RAM_EN                          0xFFFFFFFD
+#define   S_0003C0_VGA_CKSEL(x)                        (((x) & 0x3) << 2)
+#define   G_0003C0_VGA_CKSEL(x)                        (((x) >> 2) & 0x3)
+#define   C_0003C0_VGA_CKSEL                           0xFFFFFFF3
+#define   S_0003C0_ODD_EVEN_MD_PGSEL(x)                (((x) & 0x1) << 5)
+#define   G_0003C0_ODD_EVEN_MD_PGSEL(x)                (((x) >> 5) & 0x1)
+#define   C_0003C0_ODD_EVEN_MD_PGSEL                   0xFFFFFFDF
+#define   S_0003C0_VGA_HSYNC_POL(x)                    (((x) & 0x1) << 6)
+#define   G_0003C0_VGA_HSYNC_POL(x)                    (((x) >> 6) & 0x1)
+#define   C_0003C0_VGA_HSYNC_POL                       0xFFFFFFBF
+#define   S_0003C0_VGA_VSYNC_POL(x)                    (((x) & 0x1) << 7)
+#define   G_0003C0_VGA_VSYNC_POL(x)                    (((x) >> 7) & 0x1)
+#define   C_0003C0_VGA_VSYNC_POL                       0xFFFFFF7F
+#define R_0003F8_CRTC2_GEN_CNTL                      0x0003F8
+#define   S_0003F8_CRTC2_DBL_SCAN_EN(x)                (((x) & 0x1) << 0)
+#define   G_0003F8_CRTC2_DBL_SCAN_EN(x)                (((x) >> 0) & 0x1)
+#define   C_0003F8_CRTC2_DBL_SCAN_EN                   0xFFFFFFFE
+#define   S_0003F8_CRTC2_INTERLACE_EN(x)               (((x) & 0x1) << 1)
+#define   G_0003F8_CRTC2_INTERLACE_EN(x)               (((x) >> 1) & 0x1)
+#define   C_0003F8_CRTC2_INTERLACE_EN                  0xFFFFFFFD
+#define   S_0003F8_CRTC2_SYNC_TRISTATE(x)              (((x) & 0x1) << 4)
+#define   G_0003F8_CRTC2_SYNC_TRISTATE(x)              (((x) >> 4) & 0x1)
+#define   C_0003F8_CRTC2_SYNC_TRISTATE                 0xFFFFFFEF
+#define   S_0003F8_CRTC2_HSYNC_TRISTATE(x)             (((x) & 0x1) << 5)
+#define   G_0003F8_CRTC2_HSYNC_TRISTATE(x)             (((x) >> 5) & 0x1)
+#define   C_0003F8_CRTC2_HSYNC_TRISTATE                0xFFFFFFDF
+#define   S_0003F8_CRTC2_VSYNC_TRISTATE(x)             (((x) & 0x1) << 6)
+#define   G_0003F8_CRTC2_VSYNC_TRISTATE(x)             (((x) >> 6) & 0x1)
+#define   C_0003F8_CRTC2_VSYNC_TRISTATE                0xFFFFFFBF
+#define   S_0003F8_CRT2_ON(x)                          (((x) & 0x1) << 7)
+#define   G_0003F8_CRT2_ON(x)                          (((x) >> 7) & 0x1)
+#define   C_0003F8_CRT2_ON                             0xFFFFFF7F
+#define   S_0003F8_CRTC2_PIX_WIDTH(x)                  (((x) & 0xF) << 8)
+#define   G_0003F8_CRTC2_PIX_WIDTH(x)                  (((x) >> 8) & 0xF)
+#define   C_0003F8_CRTC2_PIX_WIDTH                     0xFFFFF0FF
+#define   S_0003F8_CRTC2_ICON_EN(x)                    (((x) & 0x1) << 15)
+#define   G_0003F8_CRTC2_ICON_EN(x)                    (((x) >> 15) & 0x1)
+#define   C_0003F8_CRTC2_ICON_EN                       0xFFFF7FFF
+#define   S_0003F8_CRTC2_CUR_EN(x)                     (((x) & 0x1) << 16)
+#define   G_0003F8_CRTC2_CUR_EN(x)                     (((x) >> 16) & 0x1)
+#define   C_0003F8_CRTC2_CUR_EN                        0xFFFEFFFF
+#define   S_0003F8_CRTC2_CUR_MODE(x)                   (((x) & 0x7) << 20)
+#define   G_0003F8_CRTC2_CUR_MODE(x)                   (((x) >> 20) & 0x7)
+#define   C_0003F8_CRTC2_CUR_MODE                      0xFF8FFFFF
+#define   S_0003F8_CRTC2_DISPLAY_DIS(x)                (((x) & 0x1) << 23)
+#define   G_0003F8_CRTC2_DISPLAY_DIS(x)                (((x) >> 23) & 0x1)
+#define   C_0003F8_CRTC2_DISPLAY_DIS                   0xFF7FFFFF
+#define   S_0003F8_CRTC2_EN(x)                         (((x) & 0x1) << 25)
+#define   G_0003F8_CRTC2_EN(x)                         (((x) >> 25) & 0x1)
+#define   C_0003F8_CRTC2_EN                            0xFDFFFFFF
+#define   S_0003F8_CRTC2_DISP_REQ_EN_B(x)              (((x) & 0x1) << 26)
+#define   G_0003F8_CRTC2_DISP_REQ_EN_B(x)              (((x) >> 26) & 0x1)
+#define   C_0003F8_CRTC2_DISP_REQ_EN_B                 0xFBFFFFFF
+#define   S_0003F8_CRTC2_C_SYNC_EN(x)                  (((x) & 0x1) << 27)
+#define   G_0003F8_CRTC2_C_SYNC_EN(x)                  (((x) >> 27) & 0x1)
+#define   C_0003F8_CRTC2_C_SYNC_EN                     0xF7FFFFFF
+#define   S_0003F8_CRTC2_HSYNC_DIS(x)                  (((x) & 0x1) << 28)
+#define   G_0003F8_CRTC2_HSYNC_DIS(x)                  (((x) >> 28) & 0x1)
+#define   C_0003F8_CRTC2_HSYNC_DIS                     0xEFFFFFFF
+#define   S_0003F8_CRTC2_VSYNC_DIS(x)                  (((x) & 0x1) << 29)
+#define   G_0003F8_CRTC2_VSYNC_DIS(x)                  (((x) >> 29) & 0x1)
+#define   C_0003F8_CRTC2_VSYNC_DIS                     0xDFFFFFFF
+#define R_000420_OV0_SCALE_CNTL                      0x000420
+#define   S_000420_OV0_NO_READ_BEHIND_SCAN(x)          (((x) & 0x1) << 1)
+#define   G_000420_OV0_NO_READ_BEHIND_SCAN(x)          (((x) >> 1) & 0x1)
+#define   C_000420_OV0_NO_READ_BEHIND_SCAN             0xFFFFFFFD
+#define   S_000420_OV0_HORZ_PICK_NEAREST(x)            (((x) & 0x1) << 2)
+#define   G_000420_OV0_HORZ_PICK_NEAREST(x)            (((x) >> 2) & 0x1)
+#define   C_000420_OV0_HORZ_PICK_NEAREST               0xFFFFFFFB
+#define   S_000420_OV0_VERT_PICK_NEAREST(x)            (((x) & 0x1) << 3)
+#define   G_000420_OV0_VERT_PICK_NEAREST(x)            (((x) >> 3) & 0x1)
+#define   C_000420_OV0_VERT_PICK_NEAREST               0xFFFFFFF7
+#define   S_000420_OV0_SIGNED_UV(x)                    (((x) & 0x1) << 4)
+#define   G_000420_OV0_SIGNED_UV(x)                    (((x) >> 4) & 0x1)
+#define   C_000420_OV0_SIGNED_UV                       0xFFFFFFEF
+#define   S_000420_OV0_GAMMA_SEL(x)                    (((x) & 0x7) << 5)
+#define   G_000420_OV0_GAMMA_SEL(x)                    (((x) >> 5) & 0x7)
+#define   C_000420_OV0_GAMMA_SEL                       0xFFFFFF1F
+#define   S_000420_OV0_SURFACE_FORMAT(x)               (((x) & 0xF) << 8)
+#define   G_000420_OV0_SURFACE_FORMAT(x)               (((x) >> 8) & 0xF)
+#define   C_000420_OV0_SURFACE_FORMAT                  0xFFFFF0FF
+#define   S_000420_OV0_ADAPTIVE_DEINT(x)               (((x) & 0x1) << 12)
+#define   G_000420_OV0_ADAPTIVE_DEINT(x)               (((x) >> 12) & 0x1)
+#define   C_000420_OV0_ADAPTIVE_DEINT                  0xFFFFEFFF
+#define   S_000420_OV0_CRTC_SEL(x)                     (((x) & 0x1) << 14)
+#define   G_000420_OV0_CRTC_SEL(x)                     (((x) >> 14) & 0x1)
+#define   C_000420_OV0_CRTC_SEL                        0xFFFFBFFF
+#define   S_000420_OV0_BURST_PER_PLANE(x)              (((x) & 0x7F) << 16)
+#define   G_000420_OV0_BURST_PER_PLANE(x)              (((x) >> 16) & 0x7F)
+#define   C_000420_OV0_BURST_PER_PLANE                 0xFF80FFFF
+#define   S_000420_OV0_DOUBLE_BUFFER_REGS(x)           (((x) & 0x1) << 24)
+#define   G_000420_OV0_DOUBLE_BUFFER_REGS(x)           (((x) >> 24) & 0x1)
+#define   C_000420_OV0_DOUBLE_BUFFER_REGS              0xFEFFFFFF
+#define   S_000420_OV0_BANDWIDTH(x)                    (((x) & 0x1) << 26)
+#define   G_000420_OV0_BANDWIDTH(x)                    (((x) >> 26) & 0x1)
+#define   C_000420_OV0_BANDWIDTH                       0xFBFFFFFF
+#define   S_000420_OV0_LIN_TRANS_BYPASS(x)             (((x) & 0x1) << 28)
+#define   G_000420_OV0_LIN_TRANS_BYPASS(x)             (((x) >> 28) & 0x1)
+#define   C_000420_OV0_LIN_TRANS_BYPASS                0xEFFFFFFF
+#define   S_000420_OV0_INT_EMU(x)                      (((x) & 0x1) << 29)
+#define   G_000420_OV0_INT_EMU(x)                      (((x) >> 29) & 0x1)
+#define   C_000420_OV0_INT_EMU                         0xDFFFFFFF
+#define   S_000420_OV0_OVERLAY_EN(x)                   (((x) & 0x1) << 30)
+#define   G_000420_OV0_OVERLAY_EN(x)                   (((x) >> 30) & 0x1)
+#define   C_000420_OV0_OVERLAY_EN                      0xBFFFFFFF
+#define   S_000420_OV0_SOFT_RESET(x)                   (((x) & 0x1) << 31)
+#define   G_000420_OV0_SOFT_RESET(x)                   (((x) >> 31) & 0x1)
+#define   C_000420_OV0_SOFT_RESET                      0x7FFFFFFF
+#define R_00070C_CP_RB_RPTR_ADDR                     0x00070C
+#define   S_00070C_RB_RPTR_SWAP(x)                     (((x) & 0x3) << 0)
+#define   G_00070C_RB_RPTR_SWAP(x)                     (((x) >> 0) & 0x3)
+#define   C_00070C_RB_RPTR_SWAP                        0xFFFFFFFC
+#define   S_00070C_RB_RPTR_ADDR(x)                     (((x) & 0x3FFFFFFF) << 2)
+#define   G_00070C_RB_RPTR_ADDR(x)                     (((x) >> 2) & 0x3FFFFFFF)
+#define   C_00070C_RB_RPTR_ADDR                        0x00000003
+#define R_000740_CP_CSQ_CNTL                         0x000740
+#define   S_000740_CSQ_CNT_PRIMARY(x)                  (((x) & 0xFF) << 0)
+#define   G_000740_CSQ_CNT_PRIMARY(x)                  (((x) >> 0) & 0xFF)
+#define   C_000740_CSQ_CNT_PRIMARY                     0xFFFFFF00
+#define   S_000740_CSQ_CNT_INDIRECT(x)                 (((x) & 0xFF) << 8)
+#define   G_000740_CSQ_CNT_INDIRECT(x)                 (((x) >> 8) & 0xFF)
+#define   C_000740_CSQ_CNT_INDIRECT                    0xFFFF00FF
+#define   S_000740_CSQ_MODE(x)                         (((x) & 0xF) << 28)
+#define   G_000740_CSQ_MODE(x)                         (((x) >> 28) & 0xF)
+#define   C_000740_CSQ_MODE                            0x0FFFFFFF
+#define R_000770_SCRATCH_UMSK                        0x000770
+#define   S_000770_SCRATCH_UMSK(x)                     (((x) & 0x3F) << 0)
+#define   G_000770_SCRATCH_UMSK(x)                     (((x) >> 0) & 0x3F)
+#define   C_000770_SCRATCH_UMSK                        0xFFFFFFC0
+#define   S_000770_SCRATCH_SWAP(x)                     (((x) & 0x3) << 16)
+#define   G_000770_SCRATCH_SWAP(x)                     (((x) >> 16) & 0x3)
+#define   C_000770_SCRATCH_SWAP                        0xFFFCFFFF
+#define R_000774_SCRATCH_ADDR                        0x000774
+#define   S_000774_SCRATCH_ADDR(x)                     (((x) & 0x7FFFFFF) << 5)
+#define   G_000774_SCRATCH_ADDR(x)                     (((x) >> 5) & 0x7FFFFFF)
+#define   C_000774_SCRATCH_ADDR                        0x0000001F
+#define R_000E40_RBBM_STATUS                         0x000E40
+#define   S_000E40_CMDFIFO_AVAIL(x)                    (((x) & 0x7F) << 0)
+#define   G_000E40_CMDFIFO_AVAIL(x)                    (((x) >> 0) & 0x7F)
+#define   C_000E40_CMDFIFO_AVAIL                       0xFFFFFF80
+#define   S_000E40_HIRQ_ON_RBB(x)                      (((x) & 0x1) << 8)
+#define   G_000E40_HIRQ_ON_RBB(x)                      (((x) >> 8) & 0x1)
+#define   C_000E40_HIRQ_ON_RBB                         0xFFFFFEFF
+#define   S_000E40_CPRQ_ON_RBB(x)                      (((x) & 0x1) << 9)
+#define   G_000E40_CPRQ_ON_RBB(x)                      (((x) >> 9) & 0x1)
+#define   C_000E40_CPRQ_ON_RBB                         0xFFFFFDFF
+#define   S_000E40_CFRQ_ON_RBB(x)                      (((x) & 0x1) << 10)
+#define   G_000E40_CFRQ_ON_RBB(x)                      (((x) >> 10) & 0x1)
+#define   C_000E40_CFRQ_ON_RBB                         0xFFFFFBFF
+#define   S_000E40_HIRQ_IN_RTBUF(x)                    (((x) & 0x1) << 11)
+#define   G_000E40_HIRQ_IN_RTBUF(x)                    (((x) >> 11) & 0x1)
+#define   C_000E40_HIRQ_IN_RTBUF                       0xFFFFF7FF
+#define   S_000E40_CPRQ_IN_RTBUF(x)                    (((x) & 0x1) << 12)
+#define   G_000E40_CPRQ_IN_RTBUF(x)                    (((x) >> 12) & 0x1)
+#define   C_000E40_CPRQ_IN_RTBUF                       0xFFFFEFFF
+#define   S_000E40_CFRQ_IN_RTBUF(x)                    (((x) & 0x1) << 13)
+#define   G_000E40_CFRQ_IN_RTBUF(x)                    (((x) >> 13) & 0x1)
+#define   C_000E40_CFRQ_IN_RTBUF                       0xFFFFDFFF
+#define   S_000E40_CF_PIPE_BUSY(x)                     (((x) & 0x1) << 14)
+#define   G_000E40_CF_PIPE_BUSY(x)                     (((x) >> 14) & 0x1)
+#define   C_000E40_CF_PIPE_BUSY                        0xFFFFBFFF
+#define   S_000E40_ENG_EV_BUSY(x)                      (((x) & 0x1) << 15)
+#define   G_000E40_ENG_EV_BUSY(x)                      (((x) >> 15) & 0x1)
+#define   C_000E40_ENG_EV_BUSY                         0xFFFF7FFF
+#define   S_000E40_CP_CMDSTRM_BUSY(x)                  (((x) & 0x1) << 16)
+#define   G_000E40_CP_CMDSTRM_BUSY(x)                  (((x) >> 16) & 0x1)
+#define   C_000E40_CP_CMDSTRM_BUSY                     0xFFFEFFFF
+#define   S_000E40_E2_BUSY(x)                          (((x) & 0x1) << 17)
+#define   G_000E40_E2_BUSY(x)                          (((x) >> 17) & 0x1)
+#define   C_000E40_E2_BUSY                             0xFFFDFFFF
+#define   S_000E40_RB2D_BUSY(x)                        (((x) & 0x1) << 18)
+#define   G_000E40_RB2D_BUSY(x)                        (((x) >> 18) & 0x1)
+#define   C_000E40_RB2D_BUSY                           0xFFFBFFFF
+#define   S_000E40_RB3D_BUSY(x)                        (((x) & 0x1) << 19)
+#define   G_000E40_RB3D_BUSY(x)                        (((x) >> 19) & 0x1)
+#define   C_000E40_RB3D_BUSY                           0xFFF7FFFF
+#define   S_000E40_SE_BUSY(x)                          (((x) & 0x1) << 20)
+#define   G_000E40_SE_BUSY(x)                          (((x) >> 20) & 0x1)
+#define   C_000E40_SE_BUSY                             0xFFEFFFFF
+#define   S_000E40_RE_BUSY(x)                          (((x) & 0x1) << 21)
+#define   G_000E40_RE_BUSY(x)                          (((x) >> 21) & 0x1)
+#define   C_000E40_RE_BUSY                             0xFFDFFFFF
+#define   S_000E40_TAM_BUSY(x)                         (((x) & 0x1) << 22)
+#define   G_000E40_TAM_BUSY(x)                         (((x) >> 22) & 0x1)
+#define   C_000E40_TAM_BUSY                            0xFFBFFFFF
+#define   S_000E40_TDM_BUSY(x)                         (((x) & 0x1) << 23)
+#define   G_000E40_TDM_BUSY(x)                         (((x) >> 23) & 0x1)
+#define   C_000E40_TDM_BUSY                            0xFF7FFFFF
+#define   S_000E40_PB_BUSY(x)                          (((x) & 0x1) << 24)
+#define   G_000E40_PB_BUSY(x)                          (((x) >> 24) & 0x1)
+#define   C_000E40_PB_BUSY                             0xFEFFFFFF
+#define   S_000E40_GUI_ACTIVE(x)                       (((x) & 0x1) << 31)
+#define   G_000E40_GUI_ACTIVE(x)                       (((x) >> 31) & 0x1)
+#define   C_000E40_GUI_ACTIVE                          0x7FFFFFFF
+
+#endif
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
new file mode 100644 (file)
index 0000000..568c74b
--- /dev/null
@@ -0,0 +1,456 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_reg.h"
+#include "radeon.h"
+
+#include "r200_reg_safe.h"
+
+#include "r100_track.h"
+
+static int r200_get_vtx_size_0(uint32_t vtx_fmt_0)
+{
+       int vtx_size, i;
+       vtx_size = 2;
+
+       if (vtx_fmt_0 & R200_VTX_Z0)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_W0)
+               vtx_size++;
+       /* blend weight */
+       if (vtx_fmt_0 & (0x7 << R200_VTX_WEIGHT_COUNT_SHIFT))
+               vtx_size += (vtx_fmt_0 >> R200_VTX_WEIGHT_COUNT_SHIFT) & 0x7;
+       if (vtx_fmt_0 & R200_VTX_PV_MATRIX_SEL)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_N0)
+               vtx_size += 3;
+       if (vtx_fmt_0 & R200_VTX_POINT_SIZE)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_DISCRETE_FOG)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_SHININESS_0)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_SHININESS_1)
+               vtx_size++;
+       for (i = 0; i < 8; i++) {
+               int color_size = (vtx_fmt_0 >> (11 + 2*i)) & 0x3;
+               switch (color_size) {
+               case 0: break;
+               case 1: vtx_size++; break;
+               case 2: vtx_size += 3; break;
+               case 3: vtx_size += 4; break;
+               }
+       }
+       if (vtx_fmt_0 & R200_VTX_XY1)
+               vtx_size += 2;
+       if (vtx_fmt_0 & R200_VTX_Z1)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_W1)
+               vtx_size++;
+       if (vtx_fmt_0 & R200_VTX_N1)
+               vtx_size += 3;
+       return vtx_size;
+}
+
+static int r200_get_vtx_size_1(uint32_t vtx_fmt_1)
+{
+       int vtx_size, i, tex_size;
+       vtx_size = 0;
+       for (i = 0; i < 6; i++) {
+               tex_size = (vtx_fmt_1 >> (i * 3)) & 0x7;
+               if (tex_size > 4)
+                       continue;
+               vtx_size += tex_size;
+       }
+       return vtx_size;
+}
+
+int r200_packet0_check(struct radeon_cs_parser *p,
+                      struct radeon_cs_packet *pkt,
+                      unsigned idx, unsigned reg)
+{
+       struct radeon_cs_chunk *ib_chunk;
+       struct radeon_cs_reloc *reloc;
+       struct r100_cs_track *track;
+       volatile uint32_t *ib;
+       uint32_t tmp;
+       int r;
+       int i;
+       int face;
+       u32 tile_flags = 0;
+
+       ib = p->ib->ptr;
+       ib_chunk = &p->chunks[p->chunk_ib_idx];
+       track = (struct r100_cs_track *)p->track;
+
+       switch (reg) {
+       case RADEON_CRTC_GUI_TRIG_VLINE:
+               r = r100_cs_packet_parse_vline(p);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               break;
+               /* FIXME: only allow PACKET3 blit? easier to check for out of
+                * range access */
+       case RADEON_DST_PITCH_OFFSET:
+       case RADEON_SRC_PITCH_OFFSET:
+               r = r100_reloc_pitch_offset(p, pkt, idx, reg);
+               if (r)
+                       return r;
+               break;
+       case RADEON_RB3D_DEPTHOFFSET:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->zb.robj = reloc->robj;
+               track->zb.offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case RADEON_RB3D_COLOROFFSET:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->cb[0].robj = reloc->robj;
+               track->cb[0].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case R200_PP_TXOFFSET_0:
+       case R200_PP_TXOFFSET_1:
+       case R200_PP_TXOFFSET_2:
+       case R200_PP_TXOFFSET_3:
+       case R200_PP_TXOFFSET_4:
+       case R200_PP_TXOFFSET_5:
+               i = (reg - R200_PP_TXOFFSET_0) / 24;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[i].robj = reloc->robj;
+               break;
+       case R200_PP_CUBIC_OFFSET_F1_0:
+       case R200_PP_CUBIC_OFFSET_F2_0:
+       case R200_PP_CUBIC_OFFSET_F3_0:
+       case R200_PP_CUBIC_OFFSET_F4_0:
+       case R200_PP_CUBIC_OFFSET_F5_0:
+       case R200_PP_CUBIC_OFFSET_F1_1:
+       case R200_PP_CUBIC_OFFSET_F2_1:
+       case R200_PP_CUBIC_OFFSET_F3_1:
+       case R200_PP_CUBIC_OFFSET_F4_1:
+       case R200_PP_CUBIC_OFFSET_F5_1:
+       case R200_PP_CUBIC_OFFSET_F1_2:
+       case R200_PP_CUBIC_OFFSET_F2_2:
+       case R200_PP_CUBIC_OFFSET_F3_2:
+       case R200_PP_CUBIC_OFFSET_F4_2:
+       case R200_PP_CUBIC_OFFSET_F5_2:
+       case R200_PP_CUBIC_OFFSET_F1_3:
+       case R200_PP_CUBIC_OFFSET_F2_3:
+       case R200_PP_CUBIC_OFFSET_F3_3:
+       case R200_PP_CUBIC_OFFSET_F4_3:
+       case R200_PP_CUBIC_OFFSET_F5_3:
+       case R200_PP_CUBIC_OFFSET_F1_4:
+       case R200_PP_CUBIC_OFFSET_F2_4:
+       case R200_PP_CUBIC_OFFSET_F3_4:
+       case R200_PP_CUBIC_OFFSET_F4_4:
+       case R200_PP_CUBIC_OFFSET_F5_4:
+       case R200_PP_CUBIC_OFFSET_F1_5:
+       case R200_PP_CUBIC_OFFSET_F2_5:
+       case R200_PP_CUBIC_OFFSET_F3_5:
+       case R200_PP_CUBIC_OFFSET_F4_5:
+       case R200_PP_CUBIC_OFFSET_F5_5:
+               i = (reg - R200_PP_TXOFFSET_0) / 24;
+               face = (reg - ((i * 24) + R200_PP_TXOFFSET_0)) / 4;
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               track->textures[i].cube_info[face - 1].offset = ib_chunk->kdata[idx];
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               track->textures[i].cube_info[face - 1].robj = reloc->robj;
+               break;
+       case RADEON_RE_WIDTH_HEIGHT:
+               track->maxy = ((ib_chunk->kdata[idx] >> 16) & 0x7FF);
+               break;
+       case RADEON_RB3D_COLORPITCH:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+
+               if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+                       tile_flags |= RADEON_COLOR_TILE_ENABLE;
+               if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
+                       tile_flags |= RADEON_COLOR_MICROTILE_ENABLE;
+
+               tmp = ib_chunk->kdata[idx] & ~(0x7 << 16);
+               tmp |= tile_flags;
+               ib[idx] = tmp;
+
+               track->cb[0].pitch = ib_chunk->kdata[idx] & RADEON_COLORPITCH_MASK;
+               break;
+       case RADEON_RB3D_DEPTHPITCH:
+               track->zb.pitch = ib_chunk->kdata[idx] & RADEON_DEPTHPITCH_MASK;
+               break;
+       case RADEON_RB3D_CNTL:
+               switch ((ib_chunk->kdata[idx] >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f) {
+               case 7:
+               case 8:
+               case 9:
+               case 11:
+               case 12:
+                       track->cb[0].cpp = 1;
+                       break;
+               case 3:
+               case 4:
+               case 15:
+                       track->cb[0].cpp = 2;
+                       break;
+               case 6:
+                       track->cb[0].cpp = 4;
+                       break;
+               default:
+                       DRM_ERROR("Invalid color buffer format (%d) !\n",
+                                 ((ib_chunk->kdata[idx] >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f));
+                       return -EINVAL;
+               }
+               if (ib_chunk->kdata[idx] & RADEON_DEPTHXY_OFFSET_ENABLE) {
+                       DRM_ERROR("No support for depth xy offset in kms\n");
+                       return -EINVAL;
+               }
+
+               track->z_enabled = !!(ib_chunk->kdata[idx] & RADEON_Z_ENABLE);
+               break;
+       case RADEON_RB3D_ZSTENCILCNTL:
+               switch (ib_chunk->kdata[idx] & 0xf) {
+               case 0:
+                       track->zb.cpp = 2;
+                       break;
+               case 2:
+               case 3:
+               case 4:
+               case 5:
+               case 9:
+               case 11:
+                       track->zb.cpp = 4;
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case RADEON_RB3D_ZPASS_ADDR:
+               r = r100_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
+                                 idx, reg);
+                       r100_cs_dump_packet(p, pkt);
+                       return r;
+               }
+               ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
+               break;
+       case RADEON_PP_CNTL:
+               {
+                       uint32_t temp = ib_chunk->kdata[idx] >> 4;
+                       for (i = 0; i < track->num_texture; i++)
+                               track->textures[i].enabled = !!(temp & (1 << i));
+               }
+               break;
+       case RADEON_SE_VF_CNTL:
+               track->vap_vf_cntl = ib_chunk->kdata[idx];
+               break;
+       case 0x210c:
+               /* VAP_VF_MAX_VTX_INDX */
+               track->max_indx = ib_chunk->kdata[idx] & 0x00FFFFFFUL;
+               break;
+       case R200_SE_VTX_FMT_0:
+               track->vtx_size = r200_get_vtx_size_0(ib_chunk->kdata[idx]);
+               break;
+       case R200_SE_VTX_FMT_1:
+               track->vtx_size += r200_get_vtx_size_1(ib_chunk->kdata[idx]);
+               break;
+       case R200_PP_TXSIZE_0:
+       case R200_PP_TXSIZE_1:
+       case R200_PP_TXSIZE_2:
+       case R200_PP_TXSIZE_3:
+       case R200_PP_TXSIZE_4:
+       case R200_PP_TXSIZE_5:
+               i = (reg - R200_PP_TXSIZE_0) / 32;
+               track->textures[i].width = (ib_chunk->kdata[idx] & RADEON_TEX_USIZE_MASK) + 1;
+               track->textures[i].height = ((ib_chunk->kdata[idx] & RADEON_TEX_VSIZE_MASK) >> RADEON_TEX_VSIZE_SHIFT) + 1;
+               break;
+       case R200_PP_TXPITCH_0:
+       case R200_PP_TXPITCH_1:
+       case R200_PP_TXPITCH_2:
+       case R200_PP_TXPITCH_3:
+       case R200_PP_TXPITCH_4:
+       case R200_PP_TXPITCH_5:
+               i = (reg - R200_PP_TXPITCH_0) / 32;
+               track->textures[i].pitch = ib_chunk->kdata[idx] + 32;
+               break;
+       case R200_PP_TXFILTER_0:
+       case R200_PP_TXFILTER_1:
+       case R200_PP_TXFILTER_2:
+       case R200_PP_TXFILTER_3:
+       case R200_PP_TXFILTER_4:
+       case R200_PP_TXFILTER_5:
+               i = (reg - R200_PP_TXFILTER_0) / 32;
+               track->textures[i].num_levels = ((ib_chunk->kdata[idx] & R200_MAX_MIP_LEVEL_MASK)
+                                                >> R200_MAX_MIP_LEVEL_SHIFT);
+               tmp = (ib_chunk->kdata[idx] >> 23) & 0x7;
+               if (tmp == 2 || tmp == 6)
+                       track->textures[i].roundup_w = false;
+               tmp = (ib_chunk->kdata[idx] >> 27) & 0x7;
+               if (tmp == 2 || tmp == 6)
+                       track->textures[i].roundup_h = false;
+               break;
+       case R200_PP_TXMULTI_CTL_0:
+       case R200_PP_TXMULTI_CTL_1:
+       case R200_PP_TXMULTI_CTL_2:
+       case R200_PP_TXMULTI_CTL_3:
+       case R200_PP_TXMULTI_CTL_4:
+       case R200_PP_TXMULTI_CTL_5:
+               i = (reg - R200_PP_TXMULTI_CTL_0) / 32;
+               break;
+       case R200_PP_TXFORMAT_X_0:
+       case R200_PP_TXFORMAT_X_1:
+       case R200_PP_TXFORMAT_X_2:
+       case R200_PP_TXFORMAT_X_3:
+       case R200_PP_TXFORMAT_X_4:
+       case R200_PP_TXFORMAT_X_5:
+               i = (reg - R200_PP_TXFORMAT_X_0) / 32;
+               track->textures[i].txdepth = ib_chunk->kdata[idx] & 0x7;
+               tmp = (ib_chunk->kdata[idx] >> 16) & 0x3;
+               /* 2D, 3D, CUBE */
+               switch (tmp) {
+               case 0:
+               case 5:
+               case 6:
+               case 7:
+                       track->textures[i].tex_coord_type = 0;
+                       break;
+               case 1:
+                       track->textures[i].tex_coord_type = 1;
+                       break;
+               case 2:
+                       track->textures[i].tex_coord_type = 2;
+                       break;
+               }
+               break;
+       case R200_PP_TXFORMAT_0:
+       case R200_PP_TXFORMAT_1:
+       case R200_PP_TXFORMAT_2:
+       case R200_PP_TXFORMAT_3:
+       case R200_PP_TXFORMAT_4:
+       case R200_PP_TXFORMAT_5:
+               i = (reg - R200_PP_TXFORMAT_0) / 32;
+               if (ib_chunk->kdata[idx] & R200_TXFORMAT_NON_POWER2) {
+                       track->textures[i].use_pitch = 1;
+               } else {
+                       track->textures[i].use_pitch = 0;
+                       track->textures[i].width = 1 << ((ib_chunk->kdata[idx] >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK);
+                       track->textures[i].height = 1 << ((ib_chunk->kdata[idx] >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK);
+               }
+               switch ((ib_chunk->kdata[idx] & RADEON_TXFORMAT_FORMAT_MASK)) {
+               case R200_TXFORMAT_I8:
+               case R200_TXFORMAT_RGB332:
+               case R200_TXFORMAT_Y8:
+                       track->textures[i].cpp = 1;
+                       break;
+               case R200_TXFORMAT_DXT1:
+               case R200_TXFORMAT_AI88:
+               case R200_TXFORMAT_ARGB1555:
+               case R200_TXFORMAT_RGB565:
+               case R200_TXFORMAT_ARGB4444:
+               case R200_TXFORMAT_VYUY422:
+               case R200_TXFORMAT_YVYU422:
+               case R200_TXFORMAT_LDVDU655:
+               case R200_TXFORMAT_DVDU88:
+               case R200_TXFORMAT_AVYU4444:
+                       track->textures[i].cpp = 2;
+                       break;
+               case R200_TXFORMAT_ARGB8888:
+               case R200_TXFORMAT_RGBA8888:
+               case R200_TXFORMAT_ABGR8888:
+               case R200_TXFORMAT_BGR111110:
+               case R200_TXFORMAT_LDVDU8888:
+               case R200_TXFORMAT_DXT23:
+               case R200_TXFORMAT_DXT45:
+                       track->textures[i].cpp = 4;
+                       break;
+               }
+               track->textures[i].cube_info[4].width = 1 << ((ib_chunk->kdata[idx] >> 16) & 0xf);
+               track->textures[i].cube_info[4].height = 1 << ((ib_chunk->kdata[idx] >> 20) & 0xf);
+               break;
+       case R200_PP_CUBIC_FACES_0:
+       case R200_PP_CUBIC_FACES_1:
+       case R200_PP_CUBIC_FACES_2:
+       case R200_PP_CUBIC_FACES_3:
+       case R200_PP_CUBIC_FACES_4:
+       case R200_PP_CUBIC_FACES_5:
+               tmp = ib_chunk->kdata[idx];
+               i = (reg - R200_PP_CUBIC_FACES_0) / 32;
+               for (face = 0; face < 4; face++) {
+                       track->textures[i].cube_info[face].width = 1 << ((tmp >> (face * 8)) & 0xf);
+                       track->textures[i].cube_info[face].height = 1 << ((tmp >> ((face * 8) + 4)) & 0xf);
+               }
+               break;
+       default:
+               printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n",
+                      reg, idx);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+int r200_init(struct radeon_device *rdev)
+{
+       rdev->config.r100.reg_safe_bm = r200_reg_safe_bm;
+       rdev->config.r100.reg_safe_bm_size = ARRAY_SIZE(r200_reg_safe_bm);
+       return 0;
+}
index 051bca6..bb151ec 100644 (file)
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "radeon_drm.h"
-#include "radeon_share.h"
+#include "r100_track.h"
+#include "r300d.h"
+
+#include "r300_reg_safe.h"
 
 /* r300,r350,rv350,rv370,rv380 depends on : */
 void r100_hdp_reset(struct radeon_device *rdev);
@@ -39,7 +42,6 @@ int r100_cp_reset(struct radeon_device *rdev);
 int r100_rb2d_reset(struct radeon_device *rdev);
 int r100_cp_init(struct radeon_device *rdev, unsigned ring_size);
 int r100_pci_gart_enable(struct radeon_device *rdev);
-void r100_pci_gart_disable(struct radeon_device *rdev);
 void r100_mc_setup(struct radeon_device *rdev);
 void r100_mc_disable_clients(struct radeon_device *rdev);
 int r100_gui_wait_for_idle(struct radeon_device *rdev);
@@ -47,14 +49,10 @@ int r100_cs_packet_parse(struct radeon_cs_parser *p,
                         struct radeon_cs_packet *pkt,
                         unsigned idx);
 int r100_cs_packet_parse_vline(struct radeon_cs_parser *p);
-int r100_cs_packet_next_reloc(struct radeon_cs_parser *p,
-                             struct radeon_cs_reloc **cs_reloc);
 int r100_cs_parse_packet0(struct radeon_cs_parser *p,
                          struct radeon_cs_packet *pkt,
                          const unsigned *auth, unsigned n,
                          radeon_packet0_check_t check);
-void r100_cs_dump_packet(struct radeon_cs_parser *p,
-                        struct radeon_cs_packet *pkt);
 int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p,
                                         struct radeon_cs_packet *pkt,
                                         struct radeon_object *robj);
@@ -87,26 +85,57 @@ void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev)
        mb();
 }
 
-int rv370_pcie_gart_enable(struct radeon_device *rdev)
+int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
+{
+       void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+
+       if (i < 0 || i > rdev->gart.num_gpu_pages) {
+               return -EINVAL;
+       }
+       addr = (lower_32_bits(addr) >> 8) |
+              ((upper_32_bits(addr) & 0xff) << 24) |
+              0xc;
+       /* on x86 we want this to be CPU endian, on powerpc
+        * on powerpc without HW swappers, it'll get swapped on way
+        * into VRAM - so no need for cpu_to_le32 on VRAM tables */
+       writel(addr, ((void __iomem *)ptr) + (i * 4));
+       return 0;
+}
+
+int rv370_pcie_gart_init(struct radeon_device *rdev)
 {
-       uint32_t table_addr;
-       uint32_t tmp;
        int r;
 
+       if (rdev->gart.table.vram.robj) {
+               WARN(1, "RV370 PCIE GART already initialized.\n");
+               return 0;
+       }
        /* Initialize common gart structure */
        r = radeon_gart_init(rdev);
-       if (r) {
+       if (r)
                return r;
-       }
        r = rv370_debugfs_pcie_gart_info_init(rdev);
-       if (r) {
+       if (r)
                DRM_ERROR("Failed to register debugfs file for PCIE gart !\n");
-       }
        rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
-       r = radeon_gart_table_vram_alloc(rdev);
-       if (r) {
-               return r;
+       rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+       rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
+       return radeon_gart_table_vram_alloc(rdev);
+}
+
+int rv370_pcie_gart_enable(struct radeon_device *rdev)
+{
+       uint32_t table_addr;
+       uint32_t tmp;
+       int r;
+
+       if (rdev->gart.table.vram.robj == NULL) {
+               dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
+               return -EINVAL;
        }
+       r = radeon_gart_table_vram_pin(rdev);
+       if (r)
+               return r;
        /* discard memory request outside of configured range */
        tmp = RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;
        WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
@@ -128,7 +157,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
        WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
        rv370_pcie_gart_tlb_flush(rdev);
        DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n",
-                rdev->mc.gtt_size >> 20, table_addr);
+                (unsigned)(rdev->mc.gtt_size >> 20), table_addr);
        rdev->gart.ready = true;
        return 0;
 }
@@ -146,45 +175,13 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev)
        }
 }
 
-int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
+void rv370_pcie_gart_fini(struct radeon_device *rdev)
 {
-       void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
-
-       if (i < 0 || i > rdev->gart.num_gpu_pages) {
-               return -EINVAL;
-       }
-       addr = (lower_32_bits(addr) >> 8) |
-              ((upper_32_bits(addr) & 0xff) << 24) |
-              0xc;
-       /* on x86 we want this to be CPU endian, on powerpc
-        * on powerpc without HW swappers, it'll get swapped on way
-        * into VRAM - so no need for cpu_to_le32 on VRAM tables */
-       writel(addr, ((void __iomem *)ptr) + (i * 4));
-       return 0;
-}
-
-int r300_gart_enable(struct radeon_device *rdev)
-{
-#if __OS_HAS_AGP
-       if (rdev->flags & RADEON_IS_AGP) {
-               if (rdev->family > CHIP_RV350) {
-                       rv370_pcie_gart_disable(rdev);
-               } else {
-                       r100_pci_gart_disable(rdev);
-               }
-               return 0;
-       }
-#endif
-       if (rdev->flags & RADEON_IS_PCIE) {
-               rdev->asic->gart_disable = &rv370_pcie_gart_disable;
-               rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
-               rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
-               return rv370_pcie_gart_enable(rdev);
-       }
-       return r100_pci_gart_enable(rdev);
+       rv370_pcie_gart_disable(rdev);
+       radeon_gart_table_vram_free(rdev);
+       radeon_gart_fini(rdev);
 }
 
-
 /*
  * MC
  */
@@ -232,14 +229,6 @@ int r300_mc_init(struct radeon_device *rdev)
 
 void r300_mc_fini(struct radeon_device *rdev)
 {
-       if (rdev->flags & RADEON_IS_PCIE) {
-               rv370_pcie_gart_disable(rdev);
-               radeon_gart_table_vram_free(rdev);
-       } else {
-               r100_pci_gart_disable(rdev);
-               radeon_gart_table_ram_free(rdev);
-       }
-       radeon_gart_fini(rdev);
 }
 
 
@@ -704,307 +693,13 @@ int rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev)
 /*
  * CS functions
  */
-struct r300_cs_track_cb {
-       struct radeon_object    *robj;
-       unsigned                pitch;
-       unsigned                cpp;
-       unsigned                offset;
-};
-
-struct r300_cs_track_array {
-       struct radeon_object    *robj;
-       unsigned                esize;
-};
-
-struct r300_cs_track_texture {
-       struct radeon_object    *robj;
-       unsigned                pitch;
-       unsigned                width;
-       unsigned                height;
-       unsigned                num_levels;
-       unsigned                cpp;
-       unsigned                tex_coord_type;
-       unsigned                txdepth;
-       unsigned                width_11;
-       unsigned                height_11;
-       bool                    use_pitch;
-       bool                    enabled;
-       bool                    roundup_w;
-       bool                    roundup_h;
-};
-
-struct r300_cs_track {
-       unsigned                        num_cb;
-       unsigned                        maxy;
-       unsigned                        vtx_size;
-       unsigned                        vap_vf_cntl;
-       unsigned                        immd_dwords;
-       unsigned                        num_arrays;
-       unsigned                        max_indx;
-       struct r300_cs_track_array      arrays[11];
-       struct r300_cs_track_cb         cb[4];
-       struct r300_cs_track_cb         zb;
-       struct r300_cs_track_texture    textures[16];
-       bool                            z_enabled;
-};
-
-static inline void r300_cs_track_texture_print(struct r300_cs_track_texture *t)
-{
-       DRM_ERROR("pitch                      %d\n", t->pitch);
-       DRM_ERROR("width                      %d\n", t->width);
-       DRM_ERROR("height                     %d\n", t->height);
-       DRM_ERROR("num levels                 %d\n", t->num_levels);
-       DRM_ERROR("depth                      %d\n", t->txdepth);
-       DRM_ERROR("bpp                        %d\n", t->cpp);
-       DRM_ERROR("coordinate type            %d\n", t->tex_coord_type);
-       DRM_ERROR("width round to power of 2  %d\n", t->roundup_w);
-       DRM_ERROR("height round to power of 2 %d\n", t->roundup_h);
-}
-
-static inline int r300_cs_track_texture_check(struct radeon_device *rdev,
-                                             struct r300_cs_track *track)
-{
-       struct radeon_object *robj;
-       unsigned long size;
-       unsigned u, i, w, h;
-
-       for (u = 0; u < 16; u++) {
-               if (!track->textures[u].enabled)
-                       continue;
-               robj = track->textures[u].robj;
-               if (robj == NULL) {
-                       DRM_ERROR("No texture bound to unit %u\n", u);
-                       return -EINVAL;
-               }
-               size = 0;
-               for (i = 0; i <= track->textures[u].num_levels; i++) {
-                       if (track->textures[u].use_pitch) {
-                               w = track->textures[u].pitch / (1 << i);
-                       } else {
-                               w = track->textures[u].width / (1 << i);
-                               if (rdev->family >= CHIP_RV515)
-                                       w |= track->textures[u].width_11;
-                               if (track->textures[u].roundup_w)
-                                       w = roundup_pow_of_two(w);
-                       }
-                       h = track->textures[u].height / (1 << i);
-                       if (rdev->family >= CHIP_RV515)
-                               h |= track->textures[u].height_11;
-                       if (track->textures[u].roundup_h)
-                               h = roundup_pow_of_two(h);
-                       size += w * h;
-               }
-               size *= track->textures[u].cpp;
-               switch (track->textures[u].tex_coord_type) {
-               case 0:
-                       break;
-               case 1:
-                       size *= (1 << track->textures[u].txdepth);
-                       break;
-               case 2:
-                       size *= 6;
-                       break;
-               default:
-                       DRM_ERROR("Invalid texture coordinate type %u for unit "
-                                 "%u\n", track->textures[u].tex_coord_type, u);
-                       return -EINVAL;
-               }
-               if (size > radeon_object_size(robj)) {
-                       DRM_ERROR("Texture of unit %u needs %lu bytes but is "
-                                 "%lu\n", u, size, radeon_object_size(robj));
-                       r300_cs_track_texture_print(&track->textures[u]);
-                       return -EINVAL;
-               }
-       }
-       return 0;
-}
-
-int r300_cs_track_check(struct radeon_device *rdev, struct r300_cs_track *track)
-{
-       unsigned i;
-       unsigned long size;
-       unsigned prim_walk;
-       unsigned nverts;
-
-       for (i = 0; i < track->num_cb; i++) {
-               if (track->cb[i].robj == NULL) {
-                       DRM_ERROR("[drm] No buffer for color buffer %d !\n", i);
-                       return -EINVAL;
-               }
-               size = track->cb[i].pitch * track->cb[i].cpp * track->maxy;
-               size += track->cb[i].offset;
-               if (size > radeon_object_size(track->cb[i].robj)) {
-                       DRM_ERROR("[drm] Buffer too small for color buffer %d "
-                                 "(need %lu have %lu) !\n", i, size,
-                                 radeon_object_size(track->cb[i].robj));
-                       DRM_ERROR("[drm] color buffer %d (%u %u %u %u)\n",
-                                 i, track->cb[i].pitch, track->cb[i].cpp,
-                                 track->cb[i].offset, track->maxy);
-                       return -EINVAL;
-               }
-       }
-       if (track->z_enabled) {
-               if (track->zb.robj == NULL) {
-                       DRM_ERROR("[drm] No buffer for z buffer !\n");
-                       return -EINVAL;
-               }
-               size = track->zb.pitch * track->zb.cpp * track->maxy;
-               size += track->zb.offset;
-               if (size > radeon_object_size(track->zb.robj)) {
-                       DRM_ERROR("[drm] Buffer too small for z buffer "
-                                 "(need %lu have %lu) !\n", size,
-                                 radeon_object_size(track->zb.robj));
-                       return -EINVAL;
-               }
-       }
-       prim_walk = (track->vap_vf_cntl >> 4) & 0x3;
-       nverts = (track->vap_vf_cntl >> 16) & 0xFFFF;
-       switch (prim_walk) {
-       case 1:
-               for (i = 0; i < track->num_arrays; i++) {
-                       size = track->arrays[i].esize * track->max_indx * 4;
-                       if (track->arrays[i].robj == NULL) {
-                               DRM_ERROR("(PW %u) Vertex array %u no buffer "
-                                         "bound\n", prim_walk, i);
-                               return -EINVAL;
-                       }
-                       if (size > radeon_object_size(track->arrays[i].robj)) {
-                               DRM_ERROR("(PW %u) Vertex array %u need %lu dwords "
-                                          "have %lu dwords\n", prim_walk, i,
-                                          size >> 2,
-                                          radeon_object_size(track->arrays[i].robj) >> 2);
-                               DRM_ERROR("Max indices %u\n", track->max_indx);
-                               return -EINVAL;
-                       }
-               }
-               break;
-       case 2:
-               for (i = 0; i < track->num_arrays; i++) {
-                       size = track->arrays[i].esize * (nverts - 1) * 4;
-                       if (track->arrays[i].robj == NULL) {
-                               DRM_ERROR("(PW %u) Vertex array %u no buffer "
-                                         "bound\n", prim_walk, i);
-                               return -EINVAL;
-                       }
-                       if (size > radeon_object_size(track->arrays[i].robj)) {
-                               DRM_ERROR("(PW %u) Vertex array %u need %lu dwords "
-                                          "have %lu dwords\n", prim_walk, i, size >> 2,
-                                          radeon_object_size(track->arrays[i].robj) >> 2);
-                               return -EINVAL;
-                       }
-               }
-               break;
-       case 3:
-               size = track->vtx_size * nverts;
-               if (size != track->immd_dwords) {
-                       DRM_ERROR("IMMD draw %u dwors but needs %lu dwords\n",
-                                 track->immd_dwords, size);
-                       DRM_ERROR("VAP_VF_CNTL.NUM_VERTICES %u, VTX_SIZE %u\n",
-                                 nverts, track->vtx_size);
-                       return -EINVAL;
-               }
-               break;
-       default:
-               DRM_ERROR("[drm] Invalid primitive walk %d for VAP_VF_CNTL\n",
-                         prim_walk);
-               return -EINVAL;
-       }
-       return r300_cs_track_texture_check(rdev, track);
-}
-
-static inline void r300_cs_track_clear(struct r300_cs_track *track)
-{
-       unsigned i;
-
-       track->num_cb = 4;
-       track->maxy = 4096;
-       for (i = 0; i < track->num_cb; i++) {
-               track->cb[i].robj = NULL;
-               track->cb[i].pitch = 8192;
-               track->cb[i].cpp = 16;
-               track->cb[i].offset = 0;
-       }
-       track->z_enabled = true;
-       track->zb.robj = NULL;
-       track->zb.pitch = 8192;
-       track->zb.cpp = 4;
-       track->zb.offset = 0;
-       track->vtx_size = 0x7F;
-       track->immd_dwords = 0xFFFFFFFFUL;
-       track->num_arrays = 11;
-       track->max_indx = 0x00FFFFFFUL;
-       for (i = 0; i < track->num_arrays; i++) {
-               track->arrays[i].robj = NULL;
-               track->arrays[i].esize = 0x7F;
-       }
-       for (i = 0; i < 16; i++) {
-               track->textures[i].pitch = 16536;
-               track->textures[i].width = 16536;
-               track->textures[i].height = 16536;
-               track->textures[i].width_11 = 1 << 11;
-               track->textures[i].height_11 = 1 << 11;
-               track->textures[i].num_levels = 12;
-               track->textures[i].txdepth = 16;
-               track->textures[i].cpp = 64;
-               track->textures[i].tex_coord_type = 1;
-               track->textures[i].robj = NULL;
-               /* CS IB emission code makes sure texture unit are disabled */
-               track->textures[i].enabled = false;
-               track->textures[i].roundup_w = true;
-               track->textures[i].roundup_h = true;
-       }
-}
-
-static const unsigned r300_reg_safe_bm[159] = {
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-       0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-       0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-       0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
-       0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-       0x00000000, 0x0000C100, 0x00000000, 0x00000000,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
-};
-
 static int r300_packet0_check(struct radeon_cs_parser *p,
                struct radeon_cs_packet *pkt,
                unsigned idx, unsigned reg)
 {
        struct radeon_cs_chunk *ib_chunk;
        struct radeon_cs_reloc *reloc;
-       struct r300_cs_track *track;
+       struct r100_cs_track *track;
        volatile uint32_t *ib;
        uint32_t tmp, tile_flags = 0;
        unsigned i;
@@ -1012,7 +707,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
 
        ib = p->ib->ptr;
        ib_chunk = &p->chunks[p->chunk_ib_idx];
-       track = (struct r300_cs_track*)p->track;
+       track = (struct r100_cs_track *)p->track;
        switch(reg) {
        case AVIVO_D1MODE_VLINE_START_END:
        case RADEON_CRTC_GUI_TRIG_VLINE:
@@ -1026,28 +721,9 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                break;
        case RADEON_DST_PITCH_OFFSET:
        case RADEON_SRC_PITCH_OFFSET:
-               r = r100_cs_packet_next_reloc(p, &reloc);
-               if (r) {
-                       DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
-                                       idx, reg);
-                       r100_cs_dump_packet(p, pkt);
+               r = r100_reloc_pitch_offset(p, pkt, idx, reg);
+               if (r)
                        return r;
-               }
-               tmp = ib_chunk->kdata[idx] & 0x003fffff;
-               tmp += (((u32)reloc->lobj.gpu_offset) >> 10);
-
-               if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
-                       tile_flags |= RADEON_DST_TILE_MACRO;
-               if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) {
-                       if (reg == RADEON_SRC_PITCH_OFFSET) {
-                               DRM_ERROR("Cannot src blit from microtiled surface\n");
-                               r100_cs_dump_packet(p, pkt);
-                               return -EINVAL;
-                       }
-                       tile_flags |= RADEON_DST_TILE_MICRO;
-               }
-               tmp |= tile_flags;
-               ib[idx] = (ib_chunk->kdata[idx] & 0x3fc00000) | tmp;
                break;
        case R300_RB3D_COLOROFFSET0:
        case R300_RB3D_COLOROFFSET1:
@@ -1256,42 +932,41 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                tmp = (ib_chunk->kdata[idx] >> 25) & 0x3;
                track->textures[i].tex_coord_type = tmp;
                switch ((ib_chunk->kdata[idx] & 0x1F)) {
-               case 0:
-               case 2:
-               case 5:
-               case 18:
-               case 20:
-               case 21:
+               case R300_TX_FORMAT_X8:
+               case R300_TX_FORMAT_Y4X4:
+               case R300_TX_FORMAT_Z3Y3X2:
                        track->textures[i].cpp = 1;
                        break;
-               case 1:
-               case 3:
-               case 6:
-               case 7:
-               case 10:
-               case 11:
-               case 19:
-               case 22:
-               case 24:
+               case R300_TX_FORMAT_X16:
+               case R300_TX_FORMAT_Y8X8:
+               case R300_TX_FORMAT_Z5Y6X5:
+               case R300_TX_FORMAT_Z6Y5X5:
+               case R300_TX_FORMAT_W4Z4Y4X4:
+               case R300_TX_FORMAT_W1Z5Y5X5:
+               case R300_TX_FORMAT_DXT1:
+               case R300_TX_FORMAT_D3DMFT_CxV8U8:
+               case R300_TX_FORMAT_B8G8_B8G8:
+               case R300_TX_FORMAT_G8R8_G8B8:
                        track->textures[i].cpp = 2;
                        break;
-               case 4:
-               case 8:
-               case 9:
-               case 12:
-               case 13:
-               case 23:
-               case 25:
-               case 27:
-               case 30:
+               case R300_TX_FORMAT_Y16X16:
+               case R300_TX_FORMAT_Z11Y11X10:
+               case R300_TX_FORMAT_Z10Y11X11:
+               case R300_TX_FORMAT_W8Z8Y8X8:
+               case R300_TX_FORMAT_W2Z10Y10X10:
+               case 0x17:
+               case R300_TX_FORMAT_FL_I32:
+               case 0x1e:
+               case R300_TX_FORMAT_DXT3:
+               case R300_TX_FORMAT_DXT5:
                        track->textures[i].cpp = 4;
                        break;
-               case 14:
-               case 26:
-               case 28:
+               case R300_TX_FORMAT_W16Z16Y16X16:
+               case R300_TX_FORMAT_FL_R16G16B16A16:
+               case R300_TX_FORMAT_FL_I32A32:
                        track->textures[i].cpp = 8;
                        break;
-               case 29:
+               case R300_TX_FORMAT_FL_R32G32B32A32:
                        track->textures[i].cpp = 16;
                        break;
                default:
@@ -1319,11 +994,11 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
        case 0x443C:
                /* TX_FILTER0_[0-15] */
                i = (reg - 0x4400) >> 2;
-               tmp = ib_chunk->kdata[idx] & 0x7;;
+               tmp = ib_chunk->kdata[idx] & 0x7;
                if (tmp == 2 || tmp == 4 || tmp == 6) {
                        track->textures[i].roundup_w = false;
                }
-               tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;;
+               tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;
                if (tmp == 2 || tmp == 4 || tmp == 6) {
                        track->textures[i].roundup_h = false;
                }
@@ -1411,8 +1086,9 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
                              struct radeon_cs_packet *pkt)
 {
        struct radeon_cs_chunk *ib_chunk;
+
        struct radeon_cs_reloc *reloc;
-       struct r300_cs_track *track;
+       struct r100_cs_track *track;
        volatile uint32_t *ib;
        unsigned idx;
        unsigned i, c;
@@ -1421,7 +1097,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
        ib = p->ib->ptr;
        ib_chunk = &p->chunks[p->chunk_ib_idx];
        idx = pkt->idx + 1;
-       track = (struct r300_cs_track*)p->track;
+       track = (struct r100_cs_track *)p->track;
        switch(pkt->opcode) {
        case PACKET3_3D_LOAD_VBPNTR:
                c = ib_chunk->kdata[idx++] & 0x1F;
@@ -1488,7 +1164,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
                }
                track->vap_vf_cntl = ib_chunk->kdata[idx+1];
                track->immd_dwords = pkt->count - 1;
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
@@ -1503,35 +1179,35 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
                }
                track->vap_vf_cntl = ib_chunk->kdata[idx];
                track->immd_dwords = pkt->count;
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
                break;
        case PACKET3_3D_DRAW_VBUF:
                track->vap_vf_cntl = ib_chunk->kdata[idx + 1];
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
                break;
        case PACKET3_3D_DRAW_VBUF_2:
                track->vap_vf_cntl = ib_chunk->kdata[idx];
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
                break;
        case PACKET3_3D_DRAW_INDX:
                track->vap_vf_cntl = ib_chunk->kdata[idx + 1];
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
                break;
        case PACKET3_3D_DRAW_INDX_2:
                track->vap_vf_cntl = ib_chunk->kdata[idx];
-               r = r300_cs_track_check(p->rdev, track);
+               r = r100_cs_track_check(p->rdev, track);
                if (r) {
                        return r;
                }
@@ -1548,11 +1224,12 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
 int r300_cs_parse(struct radeon_cs_parser *p)
 {
        struct radeon_cs_packet pkt;
-       struct r300_cs_track track;
+       struct r100_cs_track *track;
        int r;
 
-       r300_cs_track_clear(&track);
-       p->track = &track;
+       track = kzalloc(sizeof(*track), GFP_KERNEL);
+       r100_cs_track_clear(p->rdev, track);
+       p->track = track;
        do {
                r = r100_cs_packet_parse(p, &pkt, p->idx);
                if (r) {
@@ -1582,9 +1259,48 @@ int r300_cs_parse(struct radeon_cs_parser *p)
        return 0;
 }
 
-int r300_init(struct radeon_device *rdev)
+void r300_set_reg_safe(struct radeon_device *rdev)
 {
        rdev->config.r300.reg_safe_bm = r300_reg_safe_bm;
        rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(r300_reg_safe_bm);
+}
+
+int r300_init(struct radeon_device *rdev)
+{
+       r300_set_reg_safe(rdev);
        return 0;
 }
+
+void r300_mc_program(struct radeon_device *rdev)
+{
+       struct r100_mc_save save;
+       int r;
+
+       r = r100_debugfs_mc_info_init(rdev);
+       if (r) {
+               dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
+       }
+
+       /* Stops all mc clients */
+       r100_mc_stop(rdev, &save);
+       if (rdev->flags & RADEON_IS_AGP) {
+               WREG32(R_00014C_MC_AGP_LOCATION,
+                       S_00014C_MC_AGP_START(rdev->mc.gtt_start >> 16) |
+                       S_00014C_MC_AGP_TOP(rdev->mc.gtt_end >> 16));
+               WREG32(R_000170_AGP_BASE, lower_32_bits(rdev->mc.agp_base));
+               WREG32(R_00015C_AGP_BASE_2,
+                       upper_32_bits(rdev->mc.agp_base) & 0xff);
+       } else {
+               WREG32(R_00014C_MC_AGP_LOCATION, 0x0FFFFFFF);
+               WREG32(R_000170_AGP_BASE, 0);
+               WREG32(R_00015C_AGP_BASE_2, 0);
+       }
+       /* Wait for mc idle */
+       if (r300_mc_wait_for_idle(rdev))
+               DRM_INFO("Failed to wait MC idle before programming MC.\n");
+       /* Program MC, should be a 32bits limited address space */
+       WREG32(R_000148_MC_FB_LOCATION,
+               S_000148_MC_FB_START(rdev->mc.vram_start >> 16) |
+               S_000148_MC_FB_TOP(rdev->mc.vram_end >> 16));
+       r100_mc_resume(rdev, &save);
+}
diff --git a/drivers/gpu/drm/radeon/r300.h b/drivers/gpu/drm/radeon/r300.h
deleted file mode 100644 (file)
index 8486b4d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- * Copyright 2008 Red Hat Inc.
- * Copyright 2009 Jerome Glisse.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Dave Airlie
- *          Alex Deucher
- *          Jerome Glisse
- */
-#ifndef R300_H
-#define R300_H
-
-struct r300_asic {
-       const unsigned  *reg_safe_bm;
-       unsigned        reg_safe_bm_size;
-};
-
-#endif
diff --git a/drivers/gpu/drm/radeon/r300d.h b/drivers/gpu/drm/radeon/r300d.h
new file mode 100644 (file)
index 0000000..d4fa3eb
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef __R300D_H__
+#define __R300D_H__
+
+#define CP_PACKET0                     0x00000000
+#define                PACKET0_BASE_INDEX_SHIFT        0
+#define                PACKET0_BASE_INDEX_MASK         (0x1ffff << 0)
+#define                PACKET0_COUNT_SHIFT             16
+#define                PACKET0_COUNT_MASK              (0x3fff << 16)
+#define CP_PACKET1                     0x40000000
+#define CP_PACKET2                     0x80000000
+#define                PACKET2_PAD_SHIFT               0
+#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
+#define CP_PACKET3                     0xC0000000
+#define                PACKET3_IT_OPCODE_SHIFT         8
+#define                PACKET3_IT_OPCODE_MASK          (0xff << 8)
+#define                PACKET3_COUNT_SHIFT             16
+#define                PACKET3_COUNT_MASK              (0x3fff << 16)
+/* PACKET3 op code */
+#define                PACKET3_NOP                     0x10
+#define                PACKET3_3D_DRAW_VBUF            0x28
+#define                PACKET3_3D_DRAW_IMMD            0x29
+#define                PACKET3_3D_DRAW_INDX            0x2A
+#define                PACKET3_3D_LOAD_VBPNTR          0x2F
+#define                PACKET3_INDX_BUFFER             0x33
+#define                PACKET3_3D_DRAW_VBUF_2          0x34
+#define                PACKET3_3D_DRAW_IMMD_2          0x35
+#define                PACKET3_3D_DRAW_INDX_2          0x36
+#define                PACKET3_BITBLT_MULTI            0x9B
+
+#define PACKET0(reg, n)        (CP_PACKET0 |                                   \
+                        REG_SET(PACKET0_BASE_INDEX, (reg) >> 2) |      \
+                        REG_SET(PACKET0_COUNT, (n)))
+#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
+#define PACKET3(op, n) (CP_PACKET3 |                                   \
+                        REG_SET(PACKET3_IT_OPCODE, (op)) |             \
+                        REG_SET(PACKET3_COUNT, (n)))
+
+#define        PACKET_TYPE0    0
+#define        PACKET_TYPE1    1
+#define        PACKET_TYPE2    2
+#define        PACKET_TYPE3    3
+
+#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
+#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
+#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
+#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
+#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
+
+/* Registers */
+#define R_000148_MC_FB_LOCATION                      0x000148
+#define   S_000148_MC_FB_START(x)                      (((x) & 0xFFFF) << 0)
+#define   G_000148_MC_FB_START(x)                      (((x) >> 0) & 0xFFFF)
+#define   C_000148_MC_FB_START                         0xFFFF0000
+#define   S_000148_MC_FB_TOP(x)                        (((x) & 0xFFFF) << 16)
+#define   G_000148_MC_FB_TOP(x)                        (((x) >> 16) & 0xFFFF)
+#define   C_000148_MC_FB_TOP                           0x0000FFFF
+#define R_00014C_MC_AGP_LOCATION                     0x00014C
+#define   S_00014C_MC_AGP_START(x)                     (((x) & 0xFFFF) << 0)
+#define   G_00014C_MC_AGP_START(x)                     (((x) >> 0) & 0xFFFF)
+#define   C_00014C_MC_AGP_START                        0xFFFF0000
+#define   S_00014C_MC_AGP_TOP(x)                       (((x) & 0xFFFF) << 16)
+#define   G_00014C_MC_AGP_TOP(x)                       (((x) >> 16) & 0xFFFF)
+#define   C_00014C_MC_AGP_TOP                          0x0000FFFF
+#define R_00015C_AGP_BASE_2                          0x00015C
+#define   S_00015C_AGP_BASE_ADDR_2(x)                  (((x) & 0xF) << 0)
+#define   G_00015C_AGP_BASE_ADDR_2(x)                  (((x) >> 0) & 0xF)
+#define   C_00015C_AGP_BASE_ADDR_2                     0xFFFFFFF0
+#define R_000170_AGP_BASE                            0x000170
+#define   S_000170_AGP_BASE_ADDR(x)                    (((x) & 0xFFFFFFFF) << 0)
+#define   G_000170_AGP_BASE_ADDR(x)                    (((x) >> 0) & 0xFFFFFFFF)
+#define   C_000170_AGP_BASE_ADDR                       0x00000000
+
+
+#endif
index 97426a6..49a2fdc 100644 (file)
 #include "drmP.h"
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "atom.h"
+#include "r420d.h"
 
-/* r420,r423,rv410 depends on : */
-void r100_pci_gart_disable(struct radeon_device *rdev);
-void r100_hdp_reset(struct radeon_device *rdev);
-void r100_mc_setup(struct radeon_device *rdev);
-int r100_gui_wait_for_idle(struct radeon_device *rdev);
-void r100_mc_disable_clients(struct radeon_device *rdev);
-void r300_vram_info(struct radeon_device *rdev);
-int r300_mc_wait_for_idle(struct radeon_device *rdev);
-int rv370_pcie_gart_enable(struct radeon_device *rdev);
-void rv370_pcie_gart_disable(struct radeon_device *rdev);
-
-/* This files gather functions specifics to :
- * r420,r423,rv410
- *
- * Some of these functions might be used by newer ASICs.
- */
-void r420_gpu_init(struct radeon_device *rdev);
-int r420_debugfs_pipes_info_init(struct radeon_device *rdev);
-
-
-/*
- * MC
- */
 int r420_mc_init(struct radeon_device *rdev)
 {
        int r;
 
-       if (r100_debugfs_rbbm_init(rdev)) {
-               DRM_ERROR("Failed to register debugfs file for RBBM !\n");
-       }
-       if (r420_debugfs_pipes_info_init(rdev)) {
-               DRM_ERROR("Failed to register debugfs file for pipes !\n");
-       }
-
-       r420_gpu_init(rdev);
-       r100_pci_gart_disable(rdev);
-       if (rdev->flags & RADEON_IS_PCIE) {
-               rv370_pcie_gart_disable(rdev);
-       }
-
        /* Setup GPU memory space */
        rdev->mc.vram_location = 0xFFFFFFFFUL;
        rdev->mc.gtt_location = 0xFFFFFFFFUL;
@@ -87,33 +53,9 @@ int r420_mc_init(struct radeon_device *rdev)
        if (r) {
                return r;
        }
-
-       /* Program GPU memory space */
-       r100_mc_disable_clients(rdev);
-       if (r300_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
-       }
-       r100_mc_setup(rdev);
        return 0;
 }
 
-void r420_mc_fini(struct radeon_device *rdev)
-{
-       rv370_pcie_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
-       radeon_gart_fini(rdev);
-}
-
-
-/*
- * Global GPU functions
- */
-void r420_errata(struct radeon_device *rdev)
-{
-       rdev->pll_errata = 0;
-}
-
 void r420_pipes_init(struct radeon_device *rdev)
 {
        unsigned tmp;
@@ -122,6 +64,11 @@ void r420_pipes_init(struct radeon_device *rdev)
 
        /* GA_ENHANCE workaround TCL deadlock issue */
        WREG32(0x4274, (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3));
+       /* add idle wait as per freedesktop.org bug 24041 */
+       if (r100_gui_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "Failed to wait GUI idle while "
+                      "programming pipes. Bad things might happen.\n");
+       }
        /* get max number of pipes */
        gb_pipe_select = RREG32(0x402C);
        num_pipes = ((gb_pipe_select >> 12) & 3) + 1;
@@ -179,25 +126,239 @@ void r420_pipes_init(struct radeon_device *rdev)
                 rdev->num_gb_pipes, rdev->num_z_pipes);
 }
 
-void r420_gpu_init(struct radeon_device *rdev)
+u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg)
+{
+       u32 r;
+
+       WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg));
+       r = RREG32(R_0001FC_MC_IND_DATA);
+       return r;
+}
+
+void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v)
+{
+       WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg) |
+               S_0001F8_MC_IND_WR_EN(1));
+       WREG32(R_0001FC_MC_IND_DATA, v);
+}
+
+static void r420_debugfs(struct radeon_device *rdev)
+{
+       if (r100_debugfs_rbbm_init(rdev)) {
+               DRM_ERROR("Failed to register debugfs file for RBBM !\n");
+       }
+       if (r420_debugfs_pipes_info_init(rdev)) {
+               DRM_ERROR("Failed to register debugfs file for pipes !\n");
+       }
+}
+
+static void r420_clock_resume(struct radeon_device *rdev)
+{
+       u32 sclk_cntl;
+       sclk_cntl = RREG32_PLL(R_00000D_SCLK_CNTL);
+       sclk_cntl |= S_00000D_FORCE_CP(1) | S_00000D_FORCE_VIP(1);
+       if (rdev->family == CHIP_R420)
+               sclk_cntl |= S_00000D_FORCE_PX(1) | S_00000D_FORCE_TX(1);
+       WREG32_PLL(R_00000D_SCLK_CNTL, sclk_cntl);
+}
+
+static int r420_startup(struct radeon_device *rdev)
 {
-       r100_hdp_reset(rdev);
+       int r;
+
+       r300_mc_program(rdev);
+       /* Initialize GART (initialize after TTM so we can allocate
+        * memory through TTM but finalize after TTM) */
+       if (rdev->flags & RADEON_IS_PCIE) {
+               r = rv370_pcie_gart_enable(rdev);
+               if (r)
+                       return r;
+       }
+       if (rdev->flags & RADEON_IS_PCI) {
+               r = r100_pci_gart_enable(rdev);
+               if (r)
+                       return r;
+       }
        r420_pipes_init(rdev);
-       if (r300_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
+       /* Enable IRQ */
+       rdev->irq.sw_int = true;
+       r100_irq_set(rdev);
+       /* 1M ring buffer */
+       r = r100_cp_init(rdev, 1024 * 1024);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
+               return r;
+       }
+       r = r100_wb_init(rdev);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing WB (%d).\n", r);
+       }
+       r = r100_ib_init(rdev);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
+               return r;
        }
+       return 0;
 }
 
+int r420_resume(struct radeon_device *rdev)
+{
+       /* Make sur GART are not working */
+       if (rdev->flags & RADEON_IS_PCIE)
+               rv370_pcie_gart_disable(rdev);
+       if (rdev->flags & RADEON_IS_PCI)
+               r100_pci_gart_disable(rdev);
+       /* Resume clock before doing reset */
+       r420_clock_resume(rdev);
+       /* Reset gpu before posting otherwise ATOM will enter infinite loop */
+       if (radeon_gpu_reset(rdev)) {
+               dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
+                       RREG32(R_000E40_RBBM_STATUS),
+                       RREG32(R_0007C0_CP_STAT));
+       }
+       /* check if cards are posted or not */
+       if (rdev->is_atom_bios) {
+               atom_asic_init(rdev->mode_info.atom_context);
+       } else {
+               radeon_combios_asic_init(rdev->ddev);
+       }
+       /* Resume clock after posting */
+       r420_clock_resume(rdev);
 
-/*
- * r420,r423,rv410 VRAM info
- */
-void r420_vram_info(struct radeon_device *rdev)
+       return r420_startup(rdev);
+}
+
+int r420_suspend(struct radeon_device *rdev)
 {
-       r300_vram_info(rdev);
+       r100_cp_disable(rdev);
+       r100_wb_disable(rdev);
+       r100_irq_disable(rdev);
+       if (rdev->flags & RADEON_IS_PCIE)
+               rv370_pcie_gart_disable(rdev);
+       if (rdev->flags & RADEON_IS_PCI)
+               r100_pci_gart_disable(rdev);
+       return 0;
+}
+
+void r420_fini(struct radeon_device *rdev)
+{
+       r100_cp_fini(rdev);
+       r100_wb_fini(rdev);
+       r100_ib_fini(rdev);
+       radeon_gem_fini(rdev);
+       if (rdev->flags & RADEON_IS_PCIE)
+               rv370_pcie_gart_fini(rdev);
+       if (rdev->flags & RADEON_IS_PCI)
+               r100_pci_gart_fini(rdev);
+       radeon_agp_fini(rdev);
+       radeon_irq_kms_fini(rdev);
+       radeon_fence_driver_fini(rdev);
+       radeon_object_fini(rdev);
+       if (rdev->is_atom_bios) {
+               radeon_atombios_fini(rdev);
+       } else {
+               radeon_combios_fini(rdev);
+       }
+       kfree(rdev->bios);
+       rdev->bios = NULL;
 }
 
+int r420_init(struct radeon_device *rdev)
+{
+       int r;
+
+       rdev->new_init_path = true;
+       /* Initialize scratch registers */
+       radeon_scratch_init(rdev);
+       /* Initialize surface registers */
+       radeon_surface_init(rdev);
+       /* TODO: disable VGA need to use VGA request */
+       /* BIOS*/
+       if (!radeon_get_bios(rdev)) {
+               if (ASIC_IS_AVIVO(rdev))
+                       return -EINVAL;
+       }
+       if (rdev->is_atom_bios) {
+               r = radeon_atombios_init(rdev);
+               if (r) {
+                       return r;
+               }
+       } else {
+               r = radeon_combios_init(rdev);
+               if (r) {
+                       return r;
+               }
+       }
+       /* Reset gpu before posting otherwise ATOM will enter infinite loop */
+       if (radeon_gpu_reset(rdev)) {
+               dev_warn(rdev->dev,
+                       "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
+                       RREG32(R_000E40_RBBM_STATUS),
+                       RREG32(R_0007C0_CP_STAT));
+       }
+       /* check if cards are posted or not */
+       if (!radeon_card_posted(rdev) && rdev->bios) {
+               DRM_INFO("GPU not posted. posting now...\n");
+               if (rdev->is_atom_bios) {
+                       atom_asic_init(rdev->mode_info.atom_context);
+               } else {
+                       radeon_combios_asic_init(rdev->ddev);
+               }
+       }
+       /* Initialize clocks */
+       radeon_get_clock_info(rdev->ddev);
+       /* Get vram informations */
+       r300_vram_info(rdev);
+       /* Initialize memory controller (also test AGP) */
+       r = r420_mc_init(rdev);
+       if (r) {
+               return r;
+       }
+       r420_debugfs(rdev);
+       /* Fence driver */
+       r = radeon_fence_driver_init(rdev);
+       if (r) {
+               return r;
+       }
+       r = radeon_irq_kms_init(rdev);
+       if (r) {
+               return r;
+       }
+       /* Memory manager */
+       r = radeon_object_init(rdev);
+       if (r) {
+               return r;
+       }
+       if (rdev->flags & RADEON_IS_PCIE) {
+               r = rv370_pcie_gart_init(rdev);
+               if (r)
+                       return r;
+       }
+       if (rdev->flags & RADEON_IS_PCI) {
+               r = r100_pci_gart_init(rdev);
+               if (r)
+                       return r;
+       }
+       r300_set_reg_safe(rdev);
+       rdev->accel_working = true;
+       r = r420_startup(rdev);
+       if (r) {
+               /* Somethings want wront with the accel init stop accel */
+               dev_err(rdev->dev, "Disabling GPU acceleration\n");
+               r420_suspend(rdev);
+               r100_cp_fini(rdev);
+               r100_wb_fini(rdev);
+               r100_ib_fini(rdev);
+               if (rdev->flags & RADEON_IS_PCIE)
+                       rv370_pcie_gart_fini(rdev);
+               if (rdev->flags & RADEON_IS_PCI)
+                       r100_pci_gart_fini(rdev);
+               radeon_agp_fini(rdev);
+               radeon_irq_kms_fini(rdev);
+               rdev->accel_working = false;
+       }
+       return 0;
+}
 
 /*
  * Debugfs info
diff --git a/drivers/gpu/drm/radeon/r420d.h b/drivers/gpu/drm/radeon/r420d.h
new file mode 100644 (file)
index 0000000..a48a7db
--- /dev/null
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef R420D_H
+#define R420D_H
+
+#define R_0001F8_MC_IND_INDEX                        0x0001F8
+#define   S_0001F8_MC_IND_ADDR(x)                      (((x) & 0x7F) << 0)
+#define   G_0001F8_MC_IND_ADDR(x)                      (((x) >> 0) & 0x7F)
+#define   C_0001F8_MC_IND_ADDR                         0xFFFFFF80
+#define   S_0001F8_MC_IND_WR_EN(x)                     (((x) & 0x1) << 8)
+#define   G_0001F8_MC_IND_WR_EN(x)                     (((x) >> 8) & 0x1)
+#define   C_0001F8_MC_IND_WR_EN                        0xFFFFFEFF
+#define R_0001FC_MC_IND_DATA                         0x0001FC
+#define   S_0001FC_MC_IND_DATA(x)                      (((x) & 0xFFFFFFFF) << 0)
+#define   G_0001FC_MC_IND_DATA(x)                      (((x) >> 0) & 0xFFFFFFFF)
+#define   C_0001FC_MC_IND_DATA                         0x00000000
+#define R_0007C0_CP_STAT                             0x0007C0
+#define   S_0007C0_MRU_BUSY(x)                         (((x) & 0x1) << 0)
+#define   G_0007C0_MRU_BUSY(x)                         (((x) >> 0) & 0x1)
+#define   C_0007C0_MRU_BUSY                            0xFFFFFFFE
+#define   S_0007C0_MWU_BUSY(x)                         (((x) & 0x1) << 1)
+#define   G_0007C0_MWU_BUSY(x)                         (((x) >> 1) & 0x1)
+#define   C_0007C0_MWU_BUSY                            0xFFFFFFFD
+#define   S_0007C0_RSIU_BUSY(x)                        (((x) & 0x1) << 2)
+#define   G_0007C0_RSIU_BUSY(x)                        (((x) >> 2) & 0x1)
+#define   C_0007C0_RSIU_BUSY                           0xFFFFFFFB
+#define   S_0007C0_RCIU_BUSY(x)                        (((x) & 0x1) << 3)
+#define   G_0007C0_RCIU_BUSY(x)                        (((x) >> 3) & 0x1)
+#define   C_0007C0_RCIU_BUSY                           0xFFFFFFF7
+#define   S_0007C0_CSF_PRIMARY_BUSY(x)                 (((x) & 0x1) << 9)
+#define   G_0007C0_CSF_PRIMARY_BUSY(x)                 (((x) >> 9) & 0x1)
+#define   C_0007C0_CSF_PRIMARY_BUSY                    0xFFFFFDFF
+#define   S_0007C0_CSF_INDIRECT_BUSY(x)                (((x) & 0x1) << 10)
+#define   G_0007C0_CSF_INDIRECT_BUSY(x)                (((x) >> 10) & 0x1)
+#define   C_0007C0_CSF_INDIRECT_BUSY                   0xFFFFFBFF
+#define   S_0007C0_CSQ_PRIMARY_BUSY(x)                 (((x) & 0x1) << 11)
+#define   G_0007C0_CSQ_PRIMARY_BUSY(x)                 (((x) >> 11) & 0x1)
+#define   C_0007C0_CSQ_PRIMARY_BUSY                    0xFFFFF7FF
+#define   S_0007C0_CSQ_INDIRECT_BUSY(x)                (((x) & 0x1) << 12)
+#define   G_0007C0_CSQ_INDIRECT_BUSY(x)                (((x) >> 12) & 0x1)
+#define   C_0007C0_CSQ_INDIRECT_BUSY                   0xFFFFEFFF
+#define   S_0007C0_CSI_BUSY(x)                         (((x) & 0x1) << 13)
+#define   G_0007C0_CSI_BUSY(x)                         (((x) >> 13) & 0x1)
+#define   C_0007C0_CSI_BUSY                            0xFFFFDFFF
+#define   S_0007C0_CSF_INDIRECT2_BUSY(x)               (((x) & 0x1) << 14)
+#define   G_0007C0_CSF_INDIRECT2_BUSY(x)               (((x) >> 14) & 0x1)
+#define   C_0007C0_CSF_INDIRECT2_BUSY                  0xFFFFBFFF
+#define   S_0007C0_CSQ_INDIRECT2_BUSY(x)               (((x) & 0x1) << 15)
+#define   G_0007C0_CSQ_INDIRECT2_BUSY(x)               (((x) >> 15) & 0x1)
+#define   C_0007C0_CSQ_INDIRECT2_BUSY                  0xFFFF7FFF
+#define   S_0007C0_GUIDMA_BUSY(x)                      (((x) & 0x1) << 28)
+#define   G_0007C0_GUIDMA_BUSY(x)                      (((x) >> 28) & 0x1)
+#define   C_0007C0_GUIDMA_BUSY                         0xEFFFFFFF
+#define   S_0007C0_VIDDMA_BUSY(x)                      (((x) & 0x1) << 29)
+#define   G_0007C0_VIDDMA_BUSY(x)                      (((x) >> 29) & 0x1)
+#define   C_0007C0_VIDDMA_BUSY                         0xDFFFFFFF
+#define   S_0007C0_CMDSTRM_BUSY(x)                     (((x) & 0x1) << 30)
+#define   G_0007C0_CMDSTRM_BUSY(x)                     (((x) >> 30) & 0x1)
+#define   C_0007C0_CMDSTRM_BUSY                        0xBFFFFFFF
+#define   S_0007C0_CP_BUSY(x)                          (((x) & 0x1) << 31)
+#define   G_0007C0_CP_BUSY(x)                          (((x) >> 31) & 0x1)
+#define   C_0007C0_CP_BUSY                             0x7FFFFFFF
+#define R_000E40_RBBM_STATUS                         0x000E40
+#define   S_000E40_CMDFIFO_AVAIL(x)                    (((x) & 0x7F) << 0)
+#define   G_000E40_CMDFIFO_AVAIL(x)                    (((x) >> 0) & 0x7F)
+#define   C_000E40_CMDFIFO_AVAIL                       0xFFFFFF80
+#define   S_000E40_HIRQ_ON_RBB(x)                      (((x) & 0x1) << 8)
+#define   G_000E40_HIRQ_ON_RBB(x)                      (((x) >> 8) & 0x1)
+#define   C_000E40_HIRQ_ON_RBB                         0xFFFFFEFF
+#define   S_000E40_CPRQ_ON_RBB(x)                      (((x) & 0x1) << 9)
+#define   G_000E40_CPRQ_ON_RBB(x)                      (((x) >> 9) & 0x1)
+#define   C_000E40_CPRQ_ON_RBB                         0xFFFFFDFF
+#define   S_000E40_CFRQ_ON_RBB(x)                      (((x) & 0x1) << 10)
+#define   G_000E40_CFRQ_ON_RBB(x)                      (((x) >> 10) & 0x1)
+#define   C_000E40_CFRQ_ON_RBB                         0xFFFFFBFF
+#define   S_000E40_HIRQ_IN_RTBUF(x)                    (((x) & 0x1) << 11)
+#define   G_000E40_HIRQ_IN_RTBUF(x)                    (((x) >> 11) & 0x1)
+#define   C_000E40_HIRQ_IN_RTBUF                       0xFFFFF7FF
+#define   S_000E40_CPRQ_IN_RTBUF(x)                    (((x) & 0x1) << 12)
+#define   G_000E40_CPRQ_IN_RTBUF(x)                    (((x) >> 12) & 0x1)
+#define   C_000E40_CPRQ_IN_RTBUF                       0xFFFFEFFF
+#define   S_000E40_CFRQ_IN_RTBUF(x)                    (((x) & 0x1) << 13)
+#define   G_000E40_CFRQ_IN_RTBUF(x)                    (((x) >> 13) & 0x1)
+#define   C_000E40_CFRQ_IN_RTBUF                       0xFFFFDFFF
+#define   S_000E40_CF_PIPE_BUSY(x)                     (((x) & 0x1) << 14)
+#define   G_000E40_CF_PIPE_BUSY(x)                     (((x) >> 14) & 0x1)
+#define   C_000E40_CF_PIPE_BUSY                        0xFFFFBFFF
+#define   S_000E40_ENG_EV_BUSY(x)                      (((x) & 0x1) << 15)
+#define   G_000E40_ENG_EV_BUSY(x)                      (((x) >> 15) & 0x1)
+#define   C_000E40_ENG_EV_BUSY                         0xFFFF7FFF
+#define   S_000E40_CP_CMDSTRM_BUSY(x)                  (((x) & 0x1) << 16)
+#define   G_000E40_CP_CMDSTRM_BUSY(x)                  (((x) >> 16) & 0x1)
+#define   C_000E40_CP_CMDSTRM_BUSY                     0xFFFEFFFF
+#define   S_000E40_E2_BUSY(x)                          (((x) & 0x1) << 17)
+#define   G_000E40_E2_BUSY(x)                          (((x) >> 17) & 0x1)
+#define   C_000E40_E2_BUSY                             0xFFFDFFFF
+#define   S_000E40_RB2D_BUSY(x)                        (((x) & 0x1) << 18)
+#define   G_000E40_RB2D_BUSY(x)                        (((x) >> 18) & 0x1)
+#define   C_000E40_RB2D_BUSY                           0xFFFBFFFF
+#define   S_000E40_RB3D_BUSY(x)                        (((x) & 0x1) << 19)
+#define   G_000E40_RB3D_BUSY(x)                        (((x) >> 19) & 0x1)
+#define   C_000E40_RB3D_BUSY                           0xFFF7FFFF
+#define   S_000E40_VAP_BUSY(x)                         (((x) & 0x1) << 20)
+#define   G_000E40_VAP_BUSY(x)                         (((x) >> 20) & 0x1)
+#define   C_000E40_VAP_BUSY                            0xFFEFFFFF
+#define   S_000E40_RE_BUSY(x)                          (((x) & 0x1) << 21)
+#define   G_000E40_RE_BUSY(x)                          (((x) >> 21) & 0x1)
+#define   C_000E40_RE_BUSY                             0xFFDFFFFF
+#define   S_000E40_TAM_BUSY(x)                         (((x) & 0x1) << 22)
+#define   G_000E40_TAM_BUSY(x)                         (((x) >> 22) & 0x1)
+#define   C_000E40_TAM_BUSY                            0xFFBFFFFF
+#define   S_000E40_TDM_BUSY(x)                         (((x) & 0x1) << 23)
+#define   G_000E40_TDM_BUSY(x)                         (((x) >> 23) & 0x1)
+#define   C_000E40_TDM_BUSY                            0xFF7FFFFF
+#define   S_000E40_PB_BUSY(x)                          (((x) & 0x1) << 24)
+#define   G_000E40_PB_BUSY(x)                          (((x) >> 24) & 0x1)
+#define   C_000E40_PB_BUSY                             0xFEFFFFFF
+#define   S_000E40_TIM_BUSY(x)                         (((x) & 0x1) << 25)
+#define   G_000E40_TIM_BUSY(x)                         (((x) >> 25) & 0x1)
+#define   C_000E40_TIM_BUSY                            0xFDFFFFFF
+#define   S_000E40_GA_BUSY(x)                          (((x) & 0x1) << 26)
+#define   G_000E40_GA_BUSY(x)                          (((x) >> 26) & 0x1)
+#define   C_000E40_GA_BUSY                             0xFBFFFFFF
+#define   S_000E40_CBA2D_BUSY(x)                       (((x) & 0x1) << 27)
+#define   G_000E40_CBA2D_BUSY(x)                       (((x) >> 27) & 0x1)
+#define   C_000E40_CBA2D_BUSY                          0xF7FFFFFF
+#define   S_000E40_GUI_ACTIVE(x)                       (((x) & 0x1) << 31)
+#define   G_000E40_GUI_ACTIVE(x)                       (((x) >> 31) & 0x1)
+#define   C_000E40_GUI_ACTIVE                          0x7FFFFFFF
+
+/* CLK registers */
+#define R_00000D_SCLK_CNTL                           0x00000D
+#define   S_00000D_SCLK_SRC_SEL(x)                     (((x) & 0x7) << 0)
+#define   G_00000D_SCLK_SRC_SEL(x)                     (((x) >> 0) & 0x7)
+#define   C_00000D_SCLK_SRC_SEL                        0xFFFFFFF8
+#define   S_00000D_CP_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 3)
+#define   G_00000D_CP_MAX_DYN_STOP_LAT(x)              (((x) >> 3) & 0x1)
+#define   C_00000D_CP_MAX_DYN_STOP_LAT                 0xFFFFFFF7
+#define   S_00000D_HDP_MAX_DYN_STOP_LAT(x)             (((x) & 0x1) << 4)
+#define   G_00000D_HDP_MAX_DYN_STOP_LAT(x)             (((x) >> 4) & 0x1)
+#define   C_00000D_HDP_MAX_DYN_STOP_LAT                0xFFFFFFEF
+#define   S_00000D_TV_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 5)
+#define   G_00000D_TV_MAX_DYN_STOP_LAT(x)              (((x) >> 5) & 0x1)
+#define   C_00000D_TV_MAX_DYN_STOP_LAT                 0xFFFFFFDF
+#define   S_00000D_E2_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 6)
+#define   G_00000D_E2_MAX_DYN_STOP_LAT(x)              (((x) >> 6) & 0x1)
+#define   C_00000D_E2_MAX_DYN_STOP_LAT                 0xFFFFFFBF
+#define   S_00000D_SE_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 7)
+#define   G_00000D_SE_MAX_DYN_STOP_LAT(x)              (((x) >> 7) & 0x1)
+#define   C_00000D_SE_MAX_DYN_STOP_LAT                 0xFFFFFF7F
+#define   S_00000D_IDCT_MAX_DYN_STOP_LAT(x)            (((x) & 0x1) << 8)
+#define   G_00000D_IDCT_MAX_DYN_STOP_LAT(x)            (((x) >> 8) & 0x1)
+#define   C_00000D_IDCT_MAX_DYN_STOP_LAT               0xFFFFFEFF
+#define   S_00000D_VIP_MAX_DYN_STOP_LAT(x)             (((x) & 0x1) << 9)
+#define   G_00000D_VIP_MAX_DYN_STOP_LAT(x)             (((x) >> 9) & 0x1)
+#define   C_00000D_VIP_MAX_DYN_STOP_LAT                0xFFFFFDFF
+#define   S_00000D_RE_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 10)
+#define   G_00000D_RE_MAX_DYN_STOP_LAT(x)              (((x) >> 10) & 0x1)
+#define   C_00000D_RE_MAX_DYN_STOP_LAT                 0xFFFFFBFF
+#define   S_00000D_PB_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 11)
+#define   G_00000D_PB_MAX_DYN_STOP_LAT(x)              (((x) >> 11) & 0x1)
+#define   C_00000D_PB_MAX_DYN_STOP_LAT                 0xFFFFF7FF
+#define   S_00000D_TAM_MAX_DYN_STOP_LAT(x)             (((x) & 0x1) << 12)
+#define   G_00000D_TAM_MAX_DYN_STOP_LAT(x)             (((x) >> 12) & 0x1)
+#define   C_00000D_TAM_MAX_DYN_STOP_LAT                0xFFFFEFFF
+#define   S_00000D_TDM_MAX_DYN_STOP_LAT(x)             (((x) & 0x1) << 13)
+#define   G_00000D_TDM_MAX_DYN_STOP_LAT(x)             (((x) >> 13) & 0x1)
+#define   C_00000D_TDM_MAX_DYN_STOP_LAT                0xFFFFDFFF
+#define   S_00000D_RB_MAX_DYN_STOP_LAT(x)              (((x) & 0x1) << 14)
+#define   G_00000D_RB_MAX_DYN_STOP_LAT(x)              (((x) >> 14) & 0x1)
+#define   C_00000D_RB_MAX_DYN_STOP_LAT                 0xFFFFBFFF
+#define   S_00000D_FORCE_DISP2(x)                      (((x) & 0x1) << 15)
+#define   G_00000D_FORCE_DISP2(x)                      (((x) >> 15) & 0x1)
+#define   C_00000D_FORCE_DISP2                         0xFFFF7FFF
+#define   S_00000D_FORCE_CP(x)                         (((x) & 0x1) << 16)
+#define   G_00000D_FORCE_CP(x)                         (((x) >> 16) & 0x1)
+#define   C_00000D_FORCE_CP                            0xFFFEFFFF
+#define   S_00000D_FORCE_HDP(x)                        (((x) & 0x1) << 17)
+#define   G_00000D_FORCE_HDP(x)                        (((x) >> 17) & 0x1)
+#define   C_00000D_FORCE_HDP                           0xFFFDFFFF
+#define   S_00000D_FORCE_DISP1(x)                      (((x) & 0x1) << 18)
+#define   G_00000D_FORCE_DISP1(x)                      (((x) >> 18) & 0x1)
+#define   C_00000D_FORCE_DISP1                         0xFFFBFFFF
+#define   S_00000D_FORCE_TOP(x)                        (((x) & 0x1) << 19)
+#define   G_00000D_FORCE_TOP(x)                        (((x) >> 19) & 0x1)
+#define   C_00000D_FORCE_TOP                           0xFFF7FFFF
+#define   S_00000D_FORCE_E2(x)                         (((x) & 0x1) << 20)
+#define   G_00000D_FORCE_E2(x)                         (((x) >> 20) & 0x1)
+#define   C_00000D_FORCE_E2                            0xFFEFFFFF
+#define   S_00000D_FORCE_SE(x)                         (((x) & 0x1) << 21)
+#define   G_00000D_FORCE_SE(x)                         (((x) >> 21) & 0x1)
+#define   C_00000D_FORCE_SE                            0xFFDFFFFF
+#define   S_00000D_FORCE_IDCT(x)                       (((x) & 0x1) << 22)
+#define   G_00000D_FORCE_IDCT(x)                       (((x) >> 22) & 0x1)
+#define   C_00000D_FORCE_IDCT                          0xFFBFFFFF
+#define   S_00000D_FORCE_VIP(x)                        (((x) & 0x1) << 23)
+#define   G_00000D_FORCE_VIP(x)                        (((x) >> 23) & 0x1)
+#define   C_00000D_FORCE_VIP                           0xFF7FFFFF
+#define   S_00000D_FORCE_RE(x)                         (((x) & 0x1) << 24)
+#define   G_00000D_FORCE_RE(x)                         (((x) >> 24) & 0x1)
+#define   C_00000D_FORCE_RE                            0xFEFFFFFF
+#define   S_00000D_FORCE_PB(x)                         (((x) & 0x1) << 25)
+#define   G_00000D_FORCE_PB(x)                         (((x) >> 25) & 0x1)
+#define   C_00000D_FORCE_PB                            0xFDFFFFFF
+#define   S_00000D_FORCE_PX(x)                         (((x) & 0x1) << 26)
+#define   G_00000D_FORCE_PX(x)                         (((x) >> 26) & 0x1)
+#define   C_00000D_FORCE_PX                            0xFBFFFFFF
+#define   S_00000D_FORCE_TX(x)                         (((x) & 0x1) << 27)
+#define   G_00000D_FORCE_TX(x)                         (((x) >> 27) & 0x1)
+#define   C_00000D_FORCE_TX                            0xF7FFFFFF
+#define   S_00000D_FORCE_RB(x)                         (((x) & 0x1) << 28)
+#define   G_00000D_FORCE_RB(x)                         (((x) >> 28) & 0x1)
+#define   C_00000D_FORCE_RB                            0xEFFFFFFF
+#define   S_00000D_FORCE_TV_SCLK(x)                    (((x) & 0x1) << 29)
+#define   G_00000D_FORCE_TV_SCLK(x)                    (((x) >> 29) & 0x1)
+#define   C_00000D_FORCE_TV_SCLK                       0xDFFFFFFF
+#define   S_00000D_FORCE_SUBPIC(x)                     (((x) & 0x1) << 30)
+#define   G_00000D_FORCE_SUBPIC(x)                     (((x) >> 30) & 0x1)
+#define   C_00000D_FORCE_SUBPIC                        0xBFFFFFFF
+#define   S_00000D_FORCE_OV0(x)                        (((x) & 0x1) << 31)
+#define   G_00000D_FORCE_OV0(x)                        (((x) >> 31) & 0x1)
+#define   C_00000D_FORCE_OV0                           0x7FFFFFFF
+
+#endif
index ebd6b0f..d4b0b9d 100644 (file)
 #include "drmP.h"
 #include "radeon_reg.h"
 #include "radeon.h"
-#include "radeon_share.h"
 
 /* r520,rv530,rv560,rv570,r580 depends on : */
 void r100_hdp_reset(struct radeon_device *rdev);
-int rv370_pcie_gart_enable(struct radeon_device *rdev);
-void rv370_pcie_gart_disable(struct radeon_device *rdev);
 void r420_pipes_init(struct radeon_device *rdev);
 void rs600_mc_disable_clients(struct radeon_device *rdev);
 void rs600_disable_vga(struct radeon_device *rdev);
@@ -119,9 +116,6 @@ int r520_mc_init(struct radeon_device *rdev)
 
 void r520_mc_fini(struct radeon_device *rdev)
 {
-       rv370_pcie_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
index 538cd90..eab31c1 100644 (file)
  *          Alex Deucher
  *          Jerome Glisse
  */
+#include <linux/seq_file.h>
+#include <linux/firmware.h>
+#include <linux/platform_device.h>
 #include "drmP.h"
-#include "radeon_reg.h"
+#include "radeon_drm.h"
 #include "radeon.h"
+#include "radeon_mode.h"
+#include "r600d.h"
+#include "avivod.h"
+#include "atom.h"
 
-/* r600,rv610,rv630,rv620,rv635,rv670 depends on : */
-void rs600_mc_disable_clients(struct radeon_device *rdev);
+#define PFP_UCODE_SIZE 576
+#define PM4_UCODE_SIZE 1792
+#define R700_PFP_UCODE_SIZE 848
+#define R700_PM4_UCODE_SIZE 1360
+
+/* Firmware Names */
+MODULE_FIRMWARE("radeon/R600_pfp.bin");
+MODULE_FIRMWARE("radeon/R600_me.bin");
+MODULE_FIRMWARE("radeon/RV610_pfp.bin");
+MODULE_FIRMWARE("radeon/RV610_me.bin");
+MODULE_FIRMWARE("radeon/RV630_pfp.bin");
+MODULE_FIRMWARE("radeon/RV630_me.bin");
+MODULE_FIRMWARE("radeon/RV620_pfp.bin");
+MODULE_FIRMWARE("radeon/RV620_me.bin");
+MODULE_FIRMWARE("radeon/RV635_pfp.bin");
+MODULE_FIRMWARE("radeon/RV635_me.bin");
+MODULE_FIRMWARE("radeon/RV670_pfp.bin");
+MODULE_FIRMWARE("radeon/RV670_me.bin");
+MODULE_FIRMWARE("radeon/RS780_pfp.bin");
+MODULE_FIRMWARE("radeon/RS780_me.bin");
+MODULE_FIRMWARE("radeon/RV770_pfp.bin");
+MODULE_FIRMWARE("radeon/RV770_me.bin");
+MODULE_FIRMWARE("radeon/RV730_pfp.bin");
+MODULE_FIRMWARE("radeon/RV730_me.bin");
+MODULE_FIRMWARE("radeon/RV710_pfp.bin");
+MODULE_FIRMWARE("radeon/RV710_me.bin");
+
+int r600_debugfs_mc_info_init(struct radeon_device *rdev);
 
 /* This files gather functions specifics to:
  * r600,rv610,rv630,rv620,rv635,rv670
@@ -39,87 +72,293 @@ void rs600_mc_disable_clients(struct radeon_device *rdev);
  */
 int r600_mc_wait_for_idle(struct radeon_device *rdev);
 void r600_gpu_init(struct radeon_device *rdev);
+void r600_fini(struct radeon_device *rdev);
 
 
 /*
- * MC
+ * R600 PCIE GART
  */
-int r600_mc_init(struct radeon_device *rdev)
+int r600_gart_clear_page(struct radeon_device *rdev, int i)
 {
-       uint32_t tmp;
+       void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+       u64 pte;
 
-       r600_gpu_init(rdev);
+       if (i < 0 || i > rdev->gart.num_gpu_pages)
+               return -EINVAL;
+       pte = 0;
+       writeq(pte, ((void __iomem *)ptr) + (i * 8));
+       return 0;
+}
 
-       /* setup the gart before changing location so we can ask to
-        * discard unmapped mc request
-        */
-       /* FIXME: disable out of gart access */
-       tmp = rdev->mc.gtt_location / 4096;
-       tmp = REG_SET(R600_LOGICAL_PAGE_NUMBER, tmp);
-       WREG32(R600_MC_VM_SYSTEM_APERTURE_LOW_ADDR, tmp);
-       tmp = (rdev->mc.gtt_location + rdev->mc.gtt_size) / 4096;
-       tmp = REG_SET(R600_LOGICAL_PAGE_NUMBER, tmp);
-       WREG32(R600_MC_VM_SYSTEM_APERTURE_HIGH_ADDR, tmp);
-
-       rs600_mc_disable_clients(rdev);
-       if (r600_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
+void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)
+{
+       unsigned i;
+       u32 tmp;
+
+       WREG32(VM_CONTEXT0_INVALIDATION_LOW_ADDR, rdev->mc.gtt_start >> 12);
+       WREG32(VM_CONTEXT0_INVALIDATION_HIGH_ADDR, (rdev->mc.gtt_end - 1) >> 12);
+       WREG32(VM_CONTEXT0_REQUEST_RESPONSE, REQUEST_TYPE(1));
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               /* read MC_STATUS */
+               tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE);
+               tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT;
+               if (tmp == 2) {
+                       printk(KERN_WARNING "[drm] r600 flush TLB failed\n");
+                       return;
+               }
+               if (tmp) {
+                       return;
+               }
+               udelay(1);
        }
+}
 
-       tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1;
-       tmp = REG_SET(R600_MC_FB_TOP, tmp >> 24);
-       tmp |= REG_SET(R600_MC_FB_BASE, rdev->mc.vram_location >> 24);
-       WREG32(R600_MC_VM_FB_LOCATION, tmp);
-       tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1;
-       tmp = REG_SET(R600_MC_AGP_TOP, tmp >> 22);
-       WREG32(R600_MC_VM_AGP_TOP, tmp);
-       tmp = REG_SET(R600_MC_AGP_BOT, rdev->mc.gtt_location >> 22);
-       WREG32(R600_MC_VM_AGP_BOT, tmp);
-       return 0;
+int r600_pcie_gart_init(struct radeon_device *rdev)
+{
+       int r;
+
+       if (rdev->gart.table.vram.robj) {
+               WARN(1, "R600 PCIE GART already initialized.\n");
+               return 0;
+       }
+       /* Initialize common gart structure */
+       r = radeon_gart_init(rdev);
+       if (r)
+               return r;
+       rdev->gart.table_size = rdev->gart.num_gpu_pages * 8;
+       return radeon_gart_table_vram_alloc(rdev);
 }
 
-void r600_mc_fini(struct radeon_device *rdev)
+int r600_pcie_gart_enable(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
+       u32 tmp;
+       int r, i;
+
+       if (rdev->gart.table.vram.robj == NULL) {
+               dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
+               return -EINVAL;
+       }
+       r = radeon_gart_table_vram_pin(rdev);
+       if (r)
+               return r;
+
+       /* Setup L2 cache */
+       WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |
+                               ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE |
+                               EFFECTIVE_L2_QUEUE_SIZE(7));
+       WREG32(VM_L2_CNTL2, 0);
+       WREG32(VM_L2_CNTL3, BANK_SELECT_0(0) | BANK_SELECT_1(1));
+       /* Setup TLB control */
+       tmp = ENABLE_L1_TLB | ENABLE_L1_FRAGMENT_PROCESSING |
+               SYSTEM_ACCESS_MODE_NOT_IN_SYS |
+               EFFECTIVE_L1_TLB_SIZE(5) | EFFECTIVE_L1_QUEUE_SIZE(5) |
+               ENABLE_WAIT_L2_QUERY;
+       WREG32(MC_VM_L1_TLB_MCB_RD_SYS_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_SYS_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_HDP_CNTL, tmp | ENABLE_L1_STRICT_ORDERING);
+       WREG32(MC_VM_L1_TLB_MCB_WR_HDP_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_RD_A_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_WR_A_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_RD_B_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_WR_B_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_GFX_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_GFX_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_PDMA_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_PDMA_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
+       WREG32(MC_VM_L1_TLB_MCB_WR_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end - 1) >> 12);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
+       WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
+                               RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
+       WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
+                       (u32)(rdev->dummy_page.addr >> 12));
+       for (i = 1; i < 7; i++)
+               WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
+
+       r600_pcie_gart_tlb_flush(rdev);
+       rdev->gart.ready = true;
+       return 0;
 }
 
+void r600_pcie_gart_disable(struct radeon_device *rdev)
+{
+       u32 tmp;
+       int i;
 
-/*
- * Global GPU functions
- */
-void r600_errata(struct radeon_device *rdev)
+       /* Disable all tables */
+       for (i = 0; i < 7; i++)
+               WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
+
+       /* Disable L2 cache */
+       WREG32(VM_L2_CNTL, ENABLE_L2_FRAGMENT_PROCESSING |
+                               EFFECTIVE_L2_QUEUE_SIZE(7));
+       WREG32(VM_L2_CNTL3, BANK_SELECT_0(0) | BANK_SELECT_1(1));
+       /* Setup L1 TLB control */
+       tmp = EFFECTIVE_L1_TLB_SIZE(5) | EFFECTIVE_L1_QUEUE_SIZE(5) |
+               ENABLE_WAIT_L2_QUERY;
+       WREG32(MC_VM_L1_TLB_MCD_RD_A_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_WR_A_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_RD_B_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCD_WR_B_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_GFX_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_GFX_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_PDMA_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_PDMA_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_SEM_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_SEM_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_SYS_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_SYS_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_RD_HDP_CNTL, tmp);
+       WREG32(MC_VM_L1_TLB_MCB_WR_HDP_CNTL, tmp);
+       if (rdev->gart.table.vram.robj) {
+               radeon_object_kunmap(rdev->gart.table.vram.robj);
+               radeon_object_unpin(rdev->gart.table.vram.robj);
+       }
+}
+
+void r600_pcie_gart_fini(struct radeon_device *rdev)
 {
-       rdev->pll_errata = 0;
+       r600_pcie_gart_disable(rdev);
+       radeon_gart_table_vram_free(rdev);
+       radeon_gart_fini(rdev);
 }
 
 int r600_mc_wait_for_idle(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
-       return 0;
+       unsigned i;
+       u32 tmp;
+
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               /* read MC_STATUS */
+               tmp = RREG32(R_000E50_SRBM_STATUS) & 0x3F00;
+               if (!tmp)
+                       return 0;
+               udelay(1);
+       }
+       return -1;
 }
 
-void r600_gpu_init(struct radeon_device *rdev)
+static void r600_mc_resume(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
-}
+       u32 d1vga_control, d2vga_control;
+       u32 vga_render_control, vga_hdp_control;
+       u32 d1crtc_control, d2crtc_control;
+       u32 new_d1grph_primary, new_d1grph_secondary;
+       u32 new_d2grph_primary, new_d2grph_secondary;
+       u64 old_vram_start;
+       u32 tmp;
+       int i, j;
 
+       /* Initialize HDP */
+       for (i = 0, j = 0; i < 32; i++, j += 0x18) {
+               WREG32((0x2c14 + j), 0x00000000);
+               WREG32((0x2c18 + j), 0x00000000);
+               WREG32((0x2c1c + j), 0x00000000);
+               WREG32((0x2c20 + j), 0x00000000);
+               WREG32((0x2c24 + j), 0x00000000);
+       }
+       WREG32(HDP_REG_COHERENCY_FLUSH_CNTL, 0);
 
-/*
- * VRAM info
- */
-void r600_vram_get_type(struct radeon_device *rdev)
+       d1vga_control = RREG32(D1VGA_CONTROL);
+       d2vga_control = RREG32(D2VGA_CONTROL);
+       vga_render_control = RREG32(VGA_RENDER_CONTROL);
+       vga_hdp_control = RREG32(VGA_HDP_CONTROL);
+       d1crtc_control = RREG32(D1CRTC_CONTROL);
+       d2crtc_control = RREG32(D2CRTC_CONTROL);
+       old_vram_start = (u64)(RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
+       new_d1grph_primary = RREG32(D1GRPH_PRIMARY_SURFACE_ADDRESS);
+       new_d1grph_secondary = RREG32(D1GRPH_SECONDARY_SURFACE_ADDRESS);
+       new_d1grph_primary += rdev->mc.vram_start - old_vram_start;
+       new_d1grph_secondary += rdev->mc.vram_start - old_vram_start;
+       new_d2grph_primary = RREG32(D2GRPH_PRIMARY_SURFACE_ADDRESS);
+       new_d2grph_secondary = RREG32(D2GRPH_SECONDARY_SURFACE_ADDRESS);
+       new_d2grph_primary += rdev->mc.vram_start - old_vram_start;
+       new_d2grph_secondary += rdev->mc.vram_start - old_vram_start;
+
+       /* Stop all video */
+       WREG32(D1VGA_CONTROL, 0);
+       WREG32(D2VGA_CONTROL, 0);
+       WREG32(VGA_RENDER_CONTROL, 0);
+       WREG32(D1CRTC_UPDATE_LOCK, 1);
+       WREG32(D2CRTC_UPDATE_LOCK, 1);
+       WREG32(D1CRTC_CONTROL, 0);
+       WREG32(D2CRTC_CONTROL, 0);
+       WREG32(D1CRTC_UPDATE_LOCK, 0);
+       WREG32(D2CRTC_UPDATE_LOCK, 0);
+
+       mdelay(1);
+       if (r600_mc_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "[drm] MC not idle !\n");
+       }
+
+       /* Lockout access through VGA aperture*/
+       WREG32(VGA_HDP_CONTROL, VGA_MEMORY_DISABLE);
+
+       /* Update configuration */
+       WREG32(MC_VM_SYSTEM_APERTURE_LOW_ADDR, rdev->mc.vram_start >> 12);
+       WREG32(MC_VM_SYSTEM_APERTURE_HIGH_ADDR, (rdev->mc.vram_end - 1) >> 12);
+       WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0);
+       tmp = (((rdev->mc.vram_end - 1) >> 24) & 0xFFFF) << 16;
+       tmp |= ((rdev->mc.vram_start >> 24) & 0xFFFF);
+       WREG32(MC_VM_FB_LOCATION, tmp);
+       WREG32(HDP_NONSURFACE_BASE, (rdev->mc.vram_start >> 8));
+       WREG32(HDP_NONSURFACE_INFO, (2 << 7));
+       WREG32(HDP_NONSURFACE_SIZE, (rdev->mc.mc_vram_size - 1) | 0x3FF);
+       if (rdev->flags & RADEON_IS_AGP) {
+               WREG32(MC_VM_AGP_TOP, (rdev->mc.gtt_end - 1) >> 16);
+               WREG32(MC_VM_AGP_BOT, rdev->mc.gtt_start >> 16);
+               WREG32(MC_VM_AGP_BASE, rdev->mc.agp_base >> 22);
+       } else {
+               WREG32(MC_VM_AGP_BASE, 0);
+               WREG32(MC_VM_AGP_TOP, 0x0FFFFFFF);
+               WREG32(MC_VM_AGP_BOT, 0x0FFFFFFF);
+       }
+       WREG32(D1GRPH_PRIMARY_SURFACE_ADDRESS, new_d1grph_primary);
+       WREG32(D1GRPH_SECONDARY_SURFACE_ADDRESS, new_d1grph_secondary);
+       WREG32(D2GRPH_PRIMARY_SURFACE_ADDRESS, new_d2grph_primary);
+       WREG32(D2GRPH_SECONDARY_SURFACE_ADDRESS, new_d2grph_secondary);
+       WREG32(VGA_MEMORY_BASE_ADDRESS, rdev->mc.vram_start);
+
+       /* Unlock host access */
+       WREG32(VGA_HDP_CONTROL, vga_hdp_control);
+
+       mdelay(1);
+       if (r600_mc_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "[drm] MC not idle !\n");
+       }
+
+       /* Restore video state */
+       WREG32(D1CRTC_UPDATE_LOCK, 1);
+       WREG32(D2CRTC_UPDATE_LOCK, 1);
+       WREG32(D1CRTC_CONTROL, d1crtc_control);
+       WREG32(D2CRTC_CONTROL, d2crtc_control);
+       WREG32(D1CRTC_UPDATE_LOCK, 0);
+       WREG32(D2CRTC_UPDATE_LOCK, 0);
+       WREG32(D1VGA_CONTROL, d1vga_control);
+       WREG32(D2VGA_CONTROL, d2vga_control);
+       WREG32(VGA_RENDER_CONTROL, vga_render_control);
+
+       /* we need to own VRAM, so turn off the VGA renderer here
+        * to stop it overwriting our objects */
+       radeon_avivo_vga_render_disable(rdev);
+}
+
+int r600_mc_init(struct radeon_device *rdev)
 {
-       uint32_t tmp;
+       fixed20_12 a;
+       u32 tmp;
        int chansize;
+       int r;
 
+       /* Get VRAM informations */
        rdev->mc.vram_width = 128;
        rdev->mc.vram_is_ddr = true;
-
-       tmp = RREG32(R600_RAMCFG);
-       if (tmp & R600_CHANSIZE_OVERRIDE) {
+       tmp = RREG32(RAMCFG);
+       if (tmp & CHANSIZE_OVERRIDE) {
                chansize = 16;
-       } else if (tmp & R600_CHANSIZE) {
+       } else if (tmp & CHANSIZE_MASK) {
                chansize = 64;
        } else {
                chansize = 32;
@@ -135,36 +374,1459 @@ void r600_vram_get_type(struct radeon_device *rdev)
                        (rdev->family == CHIP_RV635)) {
                rdev->mc.vram_width = 2 * chansize;
        }
+       /* Could aper size report 0 ? */
+       rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+       rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+       /* Setup GPU memory space */
+       rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
+       rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
+       if (rdev->flags & RADEON_IS_AGP) {
+               r = radeon_agp_init(rdev);
+               if (r)
+                       return r;
+               /* gtt_size is setup by radeon_agp_init */
+               rdev->mc.gtt_location = rdev->mc.agp_base;
+               tmp = 0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size;
+               /* Try to put vram before or after AGP because we
+                * we want SYSTEM_APERTURE to cover both VRAM and
+                * AGP so that GPU can catch out of VRAM/AGP access
+                */
+               if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) {
+                       /* Enought place before */
+                       rdev->mc.vram_location = rdev->mc.gtt_location -
+                                                       rdev->mc.mc_vram_size;
+               } else if (tmp > rdev->mc.mc_vram_size) {
+                       /* Enought place after */
+                       rdev->mc.vram_location = rdev->mc.gtt_location +
+                                                       rdev->mc.gtt_size;
+               } else {
+                       /* Try to setup VRAM then AGP might not
+                        * not work on some card
+                        */
+                       rdev->mc.vram_location = 0x00000000UL;
+                       rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+               }
+       } else {
+               if (rdev->family == CHIP_RS780 || rdev->family == CHIP_RS880) {
+                       rdev->mc.vram_location = (RREG32(MC_VM_FB_LOCATION) &
+                                                               0xFFFF) << 24;
+                       rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+                       tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size;
+                       if ((0xFFFFFFFFUL - tmp) >= rdev->mc.gtt_size) {
+                               /* Enough place after vram */
+                               rdev->mc.gtt_location = tmp;
+                       } else if (rdev->mc.vram_location >= rdev->mc.gtt_size) {
+                               /* Enough place before vram */
+                               rdev->mc.gtt_location = 0;
+                       } else {
+                               /* Not enough place after or before shrink
+                                * gart size
+                                */
+                               if (rdev->mc.vram_location > (0xFFFFFFFFUL - tmp)) {
+                                       rdev->mc.gtt_location = 0;
+                                       rdev->mc.gtt_size = rdev->mc.vram_location;
+                               } else {
+                                       rdev->mc.gtt_location = tmp;
+                                       rdev->mc.gtt_size = 0xFFFFFFFFUL - tmp;
+                               }
+                       }
+                       rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+               } else {
+                       rdev->mc.vram_location = 0x00000000UL;
+                       rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+                       rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+               }
+       }
+       rdev->mc.vram_start = rdev->mc.vram_location;
+       rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size;
+       rdev->mc.gtt_start = rdev->mc.gtt_location;
+       rdev->mc.gtt_end = rdev->mc.gtt_location + rdev->mc.gtt_size;
+       /* FIXME: we should enforce default clock in case GPU is not in
+        * default setup
+        */
+       a.full = rfixed_const(100);
+       rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
+       rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
+       return 0;
 }
 
-void r600_vram_info(struct radeon_device *rdev)
+/* We doesn't check that the GPU really needs a reset we simply do the
+ * reset, it's up to the caller to determine if the GPU needs one. We
+ * might add an helper function to check that.
+ */
+int r600_gpu_soft_reset(struct radeon_device *rdev)
 {
-       r600_vram_get_type(rdev);
-       rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE);
-       rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
+       u32 grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) |
+                               S_008010_VGT_BUSY(1) | S_008010_TA03_BUSY(1) |
+                               S_008010_TC_BUSY(1) | S_008010_SX_BUSY(1) |
+                               S_008010_SH_BUSY(1) | S_008010_SPI03_BUSY(1) |
+                               S_008010_SMX_BUSY(1) | S_008010_SC_BUSY(1) |
+                               S_008010_PA_BUSY(1) | S_008010_DB03_BUSY(1) |
+                               S_008010_CR_BUSY(1) | S_008010_CB03_BUSY(1) |
+                               S_008010_GUI_ACTIVE(1);
+       u32 grbm2_busy_mask = S_008014_SPI0_BUSY(1) | S_008014_SPI1_BUSY(1) |
+                       S_008014_SPI2_BUSY(1) | S_008014_SPI3_BUSY(1) |
+                       S_008014_TA0_BUSY(1) | S_008014_TA1_BUSY(1) |
+                       S_008014_TA2_BUSY(1) | S_008014_TA3_BUSY(1) |
+                       S_008014_DB0_BUSY(1) | S_008014_DB1_BUSY(1) |
+                       S_008014_DB2_BUSY(1) | S_008014_DB3_BUSY(1) |
+                       S_008014_CB0_BUSY(1) | S_008014_CB1_BUSY(1) |
+                       S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1);
+       u32 srbm_reset = 0;
 
-       /* Could aper size report 0 ? */
-       rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
-       rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+       /* Disable CP parsing/prefetching */
+       WREG32(R_0086D8_CP_ME_CNTL, S_0086D8_CP_ME_HALT(0xff));
+       /* Check if any of the rendering block is busy and reset it */
+       if ((RREG32(R_008010_GRBM_STATUS) & grbm_busy_mask) ||
+           (RREG32(R_008014_GRBM_STATUS2) & grbm2_busy_mask)) {
+               WREG32(R_008020_GRBM_SOFT_RESET, S_008020_SOFT_RESET_CR(1) |
+                       S_008020_SOFT_RESET_DB(1) |
+                       S_008020_SOFT_RESET_CB(1) |
+                       S_008020_SOFT_RESET_PA(1) |
+                       S_008020_SOFT_RESET_SC(1) |
+                       S_008020_SOFT_RESET_SMX(1) |
+                       S_008020_SOFT_RESET_SPI(1) |
+                       S_008020_SOFT_RESET_SX(1) |
+                       S_008020_SOFT_RESET_SH(1) |
+                       S_008020_SOFT_RESET_TC(1) |
+                       S_008020_SOFT_RESET_TA(1) |
+                       S_008020_SOFT_RESET_VC(1) |
+                       S_008020_SOFT_RESET_VGT(1));
+               (void)RREG32(R_008020_GRBM_SOFT_RESET);
+               udelay(50);
+               WREG32(R_008020_GRBM_SOFT_RESET, 0);
+               (void)RREG32(R_008020_GRBM_SOFT_RESET);
+       }
+       /* Reset CP (we always reset CP) */
+       WREG32(R_008020_GRBM_SOFT_RESET, S_008020_SOFT_RESET_CP(1));
+       (void)RREG32(R_008020_GRBM_SOFT_RESET);
+       udelay(50);
+       WREG32(R_008020_GRBM_SOFT_RESET, 0);
+       (void)RREG32(R_008020_GRBM_SOFT_RESET);
+       /* Reset others GPU block if necessary */
+       if (G_000E50_RLC_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_RLC(1);
+       if (G_000E50_GRBM_RQ_PENDING(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_GRBM(1);
+       if (G_000E50_HI_RQ_PENDING(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_IH(1);
+       if (G_000E50_VMC_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_VMC(1);
+       if (G_000E50_MCB_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_MC(1);
+       if (G_000E50_MCDZ_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_MC(1);
+       if (G_000E50_MCDY_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_MC(1);
+       if (G_000E50_MCDX_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_MC(1);
+       if (G_000E50_MCDW_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_MC(1);
+       if (G_000E50_RLC_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_RLC(1);
+       if (G_000E50_SEM_BUSY(RREG32(R_000E50_SRBM_STATUS)))
+               srbm_reset |= S_000E60_SOFT_RESET_SEM(1);
+       WREG32(R_000E60_SRBM_SOFT_RESET, srbm_reset);
+       (void)RREG32(R_000E60_SRBM_SOFT_RESET);
+       udelay(50);
+       WREG32(R_000E60_SRBM_SOFT_RESET, 0);
+       (void)RREG32(R_000E60_SRBM_SOFT_RESET);
+       /* Wait a little for things to settle down */
+       udelay(50);
+       return 0;
 }
 
+int r600_gpu_reset(struct radeon_device *rdev)
+{
+       return r600_gpu_soft_reset(rdev);
+}
+
+static u32 r600_get_tile_pipe_to_backend_map(u32 num_tile_pipes,
+                                            u32 num_backends,
+                                            u32 backend_disable_mask)
+{
+       u32 backend_map = 0;
+       u32 enabled_backends_mask;
+       u32 enabled_backends_count;
+       u32 cur_pipe;
+       u32 swizzle_pipe[R6XX_MAX_PIPES];
+       u32 cur_backend;
+       u32 i;
+
+       if (num_tile_pipes > R6XX_MAX_PIPES)
+               num_tile_pipes = R6XX_MAX_PIPES;
+       if (num_tile_pipes < 1)
+               num_tile_pipes = 1;
+       if (num_backends > R6XX_MAX_BACKENDS)
+               num_backends = R6XX_MAX_BACKENDS;
+       if (num_backends < 1)
+               num_backends = 1;
+
+       enabled_backends_mask = 0;
+       enabled_backends_count = 0;
+       for (i = 0; i < R6XX_MAX_BACKENDS; ++i) {
+               if (((backend_disable_mask >> i) & 1) == 0) {
+                       enabled_backends_mask |= (1 << i);
+                       ++enabled_backends_count;
+               }
+               if (enabled_backends_count == num_backends)
+                       break;
+       }
+
+       if (enabled_backends_count == 0) {
+               enabled_backends_mask = 1;
+               enabled_backends_count = 1;
+       }
+
+       if (enabled_backends_count != num_backends)
+               num_backends = enabled_backends_count;
+
+       memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * R6XX_MAX_PIPES);
+       switch (num_tile_pipes) {
+       case 1:
+               swizzle_pipe[0] = 0;
+               break;
+       case 2:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 1;
+               break;
+       case 3:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 1;
+               swizzle_pipe[2] = 2;
+               break;
+       case 4:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 1;
+               swizzle_pipe[2] = 2;
+               swizzle_pipe[3] = 3;
+               break;
+       case 5:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 1;
+               swizzle_pipe[2] = 2;
+               swizzle_pipe[3] = 3;
+               swizzle_pipe[4] = 4;
+               break;
+       case 6:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 5;
+               swizzle_pipe[4] = 1;
+               swizzle_pipe[5] = 3;
+               break;
+       case 7:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 6;
+               swizzle_pipe[4] = 1;
+               swizzle_pipe[5] = 3;
+               swizzle_pipe[6] = 5;
+               break;
+       case 8:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 6;
+               swizzle_pipe[4] = 1;
+               swizzle_pipe[5] = 3;
+               swizzle_pipe[6] = 5;
+               swizzle_pipe[7] = 7;
+               break;
+       }
+
+       cur_backend = 0;
+       for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
+               while (((1 << cur_backend) & enabled_backends_mask) == 0)
+                       cur_backend = (cur_backend + 1) % R6XX_MAX_BACKENDS;
+
+               backend_map |= (u32)(((cur_backend & 3) << (swizzle_pipe[cur_pipe] * 2)));
+
+               cur_backend = (cur_backend + 1) % R6XX_MAX_BACKENDS;
+       }
+
+       return backend_map;
+}
+
+int r600_count_pipe_bits(uint32_t val)
+{
+       int i, ret = 0;
+
+       for (i = 0; i < 32; i++) {
+               ret += val & 1;
+               val >>= 1;
+       }
+       return ret;
+}
+
+void r600_gpu_init(struct radeon_device *rdev)
+{
+       u32 tiling_config;
+       u32 ramcfg;
+       u32 tmp;
+       int i, j;
+       u32 sq_config;
+       u32 sq_gpr_resource_mgmt_1 = 0;
+       u32 sq_gpr_resource_mgmt_2 = 0;
+       u32 sq_thread_resource_mgmt = 0;
+       u32 sq_stack_resource_mgmt_1 = 0;
+       u32 sq_stack_resource_mgmt_2 = 0;
+
+       /* FIXME: implement */
+       switch (rdev->family) {
+       case CHIP_R600:
+               rdev->config.r600.max_pipes = 4;
+               rdev->config.r600.max_tile_pipes = 8;
+               rdev->config.r600.max_simds = 4;
+               rdev->config.r600.max_backends = 4;
+               rdev->config.r600.max_gprs = 256;
+               rdev->config.r600.max_threads = 192;
+               rdev->config.r600.max_stack_entries = 256;
+               rdev->config.r600.max_hw_contexts = 8;
+               rdev->config.r600.max_gs_threads = 16;
+               rdev->config.r600.sx_max_export_size = 128;
+               rdev->config.r600.sx_max_export_pos_size = 16;
+               rdev->config.r600.sx_max_export_smx_size = 128;
+               rdev->config.r600.sq_num_cf_insts = 2;
+               break;
+       case CHIP_RV630:
+       case CHIP_RV635:
+               rdev->config.r600.max_pipes = 2;
+               rdev->config.r600.max_tile_pipes = 2;
+               rdev->config.r600.max_simds = 3;
+               rdev->config.r600.max_backends = 1;
+               rdev->config.r600.max_gprs = 128;
+               rdev->config.r600.max_threads = 192;
+               rdev->config.r600.max_stack_entries = 128;
+               rdev->config.r600.max_hw_contexts = 8;
+               rdev->config.r600.max_gs_threads = 4;
+               rdev->config.r600.sx_max_export_size = 128;
+               rdev->config.r600.sx_max_export_pos_size = 16;
+               rdev->config.r600.sx_max_export_smx_size = 128;
+               rdev->config.r600.sq_num_cf_insts = 2;
+               break;
+       case CHIP_RV610:
+       case CHIP_RV620:
+       case CHIP_RS780:
+       case CHIP_RS880:
+               rdev->config.r600.max_pipes = 1;
+               rdev->config.r600.max_tile_pipes = 1;
+               rdev->config.r600.max_simds = 2;
+               rdev->config.r600.max_backends = 1;
+               rdev->config.r600.max_gprs = 128;
+               rdev->config.r600.max_threads = 192;
+               rdev->config.r600.max_stack_entries = 128;
+               rdev->config.r600.max_hw_contexts = 4;
+               rdev->config.r600.max_gs_threads = 4;
+               rdev->config.r600.sx_max_export_size = 128;
+               rdev->config.r600.sx_max_export_pos_size = 16;
+               rdev->config.r600.sx_max_export_smx_size = 128;
+               rdev->config.r600.sq_num_cf_insts = 1;
+               break;
+       case CHIP_RV670:
+               rdev->config.r600.max_pipes = 4;
+               rdev->config.r600.max_tile_pipes = 4;
+               rdev->config.r600.max_simds = 4;
+               rdev->config.r600.max_backends = 4;
+               rdev->config.r600.max_gprs = 192;
+               rdev->config.r600.max_threads = 192;
+               rdev->config.r600.max_stack_entries = 256;
+               rdev->config.r600.max_hw_contexts = 8;
+               rdev->config.r600.max_gs_threads = 16;
+               rdev->config.r600.sx_max_export_size = 128;
+               rdev->config.r600.sx_max_export_pos_size = 16;
+               rdev->config.r600.sx_max_export_smx_size = 128;
+               rdev->config.r600.sq_num_cf_insts = 2;
+               break;
+       default:
+               break;
+       }
+
+       /* Initialize HDP */
+       for (i = 0, j = 0; i < 32; i++, j += 0x18) {
+               WREG32((0x2c14 + j), 0x00000000);
+               WREG32((0x2c18 + j), 0x00000000);
+               WREG32((0x2c1c + j), 0x00000000);
+               WREG32((0x2c20 + j), 0x00000000);
+               WREG32((0x2c24 + j), 0x00000000);
+       }
+
+       WREG32(GRBM_CNTL, GRBM_READ_TIMEOUT(0xff));
+
+       /* Setup tiling */
+       tiling_config = 0;
+       ramcfg = RREG32(RAMCFG);
+       switch (rdev->config.r600.max_tile_pipes) {
+       case 1:
+               tiling_config |= PIPE_TILING(0);
+               break;
+       case 2:
+               tiling_config |= PIPE_TILING(1);
+               break;
+       case 4:
+               tiling_config |= PIPE_TILING(2);
+               break;
+       case 8:
+               tiling_config |= PIPE_TILING(3);
+               break;
+       default:
+               break;
+       }
+       tiling_config |= BANK_TILING((ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT);
+       tiling_config |= GROUP_SIZE(0);
+       tmp = (ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT;
+       if (tmp > 3) {
+               tiling_config |= ROW_TILING(3);
+               tiling_config |= SAMPLE_SPLIT(3);
+       } else {
+               tiling_config |= ROW_TILING(tmp);
+               tiling_config |= SAMPLE_SPLIT(tmp);
+       }
+       tiling_config |= BANK_SWAPS(1);
+       tmp = r600_get_tile_pipe_to_backend_map(rdev->config.r600.max_tile_pipes,
+                                               rdev->config.r600.max_backends,
+                                               (0xff << rdev->config.r600.max_backends) & 0xff);
+       tiling_config |= BACKEND_MAP(tmp);
+       WREG32(GB_TILING_CONFIG, tiling_config);
+       WREG32(DCP_TILING_CONFIG, tiling_config & 0xffff);
+       WREG32(HDP_TILING_CONFIG, tiling_config & 0xffff);
+
+       tmp = BACKEND_DISABLE((R6XX_MAX_BACKENDS_MASK << rdev->config.r600.max_backends) & R6XX_MAX_BACKENDS_MASK);
+       WREG32(CC_RB_BACKEND_DISABLE, tmp);
+
+       /* Setup pipes */
+       tmp = INACTIVE_QD_PIPES((R6XX_MAX_PIPES_MASK << rdev->config.r600.max_pipes) & R6XX_MAX_PIPES_MASK);
+       tmp |= INACTIVE_SIMDS((R6XX_MAX_SIMDS_MASK << rdev->config.r600.max_simds) & R6XX_MAX_SIMDS_MASK);
+       WREG32(CC_GC_SHADER_PIPE_CONFIG, tmp);
+       WREG32(GC_USER_SHADER_PIPE_CONFIG, tmp);
+
+       tmp = R6XX_MAX_BACKENDS - r600_count_pipe_bits(tmp & INACTIVE_QD_PIPES_MASK);
+       WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK);
+       WREG32(VGT_VERTEX_REUSE_BLOCK_CNTL, ((tmp * 4) - 2) & VTX_REUSE_DEPTH_MASK);
+
+       /* Setup some CP states */
+       WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) | ROQ_IB2_START(0x2b)));
+       WREG32(CP_MEQ_THRESHOLDS, (MEQ_END(0x40) | ROQ_END(0x40)));
+
+       WREG32(TA_CNTL_AUX, (DISABLE_CUBE_ANISO | SYNC_GRADIENT |
+                            SYNC_WALKER | SYNC_ALIGNER));
+       /* Setup various GPU states */
+       if (rdev->family == CHIP_RV670)
+               WREG32(ARB_GDEC_RD_CNTL, 0x00000021);
+
+       tmp = RREG32(SX_DEBUG_1);
+       tmp |= SMX_EVENT_RELEASE;
+       if ((rdev->family > CHIP_R600))
+               tmp |= ENABLE_NEW_SMX_ADDRESS;
+       WREG32(SX_DEBUG_1, tmp);
+
+       if (((rdev->family) == CHIP_R600) ||
+           ((rdev->family) == CHIP_RV630) ||
+           ((rdev->family) == CHIP_RV610) ||
+           ((rdev->family) == CHIP_RV620) ||
+           ((rdev->family) == CHIP_RS780)) {
+               WREG32(DB_DEBUG, PREZ_MUST_WAIT_FOR_POSTZ_DONE);
+       } else {
+               WREG32(DB_DEBUG, 0);
+       }
+       WREG32(DB_WATERMARKS, (DEPTH_FREE(4) | DEPTH_CACHELINE_FREE(16) |
+                              DEPTH_FLUSH(16) | DEPTH_PENDING_FREE(4)));
+
+       WREG32(PA_SC_MULTI_CHIP_CNTL, 0);
+       WREG32(VGT_NUM_INSTANCES, 0);
+
+       WREG32(SPI_CONFIG_CNTL, GPR_WRITE_PRIORITY(0));
+       WREG32(SPI_CONFIG_CNTL_1, VTX_DONE_DELAY(0));
+
+       tmp = RREG32(SQ_MS_FIFO_SIZES);
+       if (((rdev->family) == CHIP_RV610) ||
+           ((rdev->family) == CHIP_RV620) ||
+           ((rdev->family) == CHIP_RS780)) {
+               tmp = (CACHE_FIFO_SIZE(0xa) |
+                      FETCH_FIFO_HIWATER(0xa) |
+                      DONE_FIFO_HIWATER(0xe0) |
+                      ALU_UPDATE_FIFO_HIWATER(0x8));
+       } else if (((rdev->family) == CHIP_R600) ||
+                  ((rdev->family) == CHIP_RV630)) {
+               tmp &= ~DONE_FIFO_HIWATER(0xff);
+               tmp |= DONE_FIFO_HIWATER(0x4);
+       }
+       WREG32(SQ_MS_FIFO_SIZES, tmp);
+
+       /* SQ_CONFIG, SQ_GPR_RESOURCE_MGMT, SQ_THREAD_RESOURCE_MGMT, SQ_STACK_RESOURCE_MGMT
+        * should be adjusted as needed by the 2D/3D drivers.  This just sets default values
+        */
+       sq_config = RREG32(SQ_CONFIG);
+       sq_config &= ~(PS_PRIO(3) |
+                      VS_PRIO(3) |
+                      GS_PRIO(3) |
+                      ES_PRIO(3));
+       sq_config |= (DX9_CONSTS |
+                     VC_ENABLE |
+                     PS_PRIO(0) |
+                     VS_PRIO(1) |
+                     GS_PRIO(2) |
+                     ES_PRIO(3));
+
+       if ((rdev->family) == CHIP_R600) {
+               sq_gpr_resource_mgmt_1 = (NUM_PS_GPRS(124) |
+                                         NUM_VS_GPRS(124) |
+                                         NUM_CLAUSE_TEMP_GPRS(4));
+               sq_gpr_resource_mgmt_2 = (NUM_GS_GPRS(0) |
+                                         NUM_ES_GPRS(0));
+               sq_thread_resource_mgmt = (NUM_PS_THREADS(136) |
+                                          NUM_VS_THREADS(48) |
+                                          NUM_GS_THREADS(4) |
+                                          NUM_ES_THREADS(4));
+               sq_stack_resource_mgmt_1 = (NUM_PS_STACK_ENTRIES(128) |
+                                           NUM_VS_STACK_ENTRIES(128));
+               sq_stack_resource_mgmt_2 = (NUM_GS_STACK_ENTRIES(0) |
+                                           NUM_ES_STACK_ENTRIES(0));
+       } else if (((rdev->family) == CHIP_RV610) ||
+                  ((rdev->family) == CHIP_RV620) ||
+                  ((rdev->family) == CHIP_RS780)) {
+               /* no vertex cache */
+               sq_config &= ~VC_ENABLE;
+
+               sq_gpr_resource_mgmt_1 = (NUM_PS_GPRS(44) |
+                                         NUM_VS_GPRS(44) |
+                                         NUM_CLAUSE_TEMP_GPRS(2));
+               sq_gpr_resource_mgmt_2 = (NUM_GS_GPRS(17) |
+                                         NUM_ES_GPRS(17));
+               sq_thread_resource_mgmt = (NUM_PS_THREADS(79) |
+                                          NUM_VS_THREADS(78) |
+                                          NUM_GS_THREADS(4) |
+                                          NUM_ES_THREADS(31));
+               sq_stack_resource_mgmt_1 = (NUM_PS_STACK_ENTRIES(40) |
+                                           NUM_VS_STACK_ENTRIES(40));
+               sq_stack_resource_mgmt_2 = (NUM_GS_STACK_ENTRIES(32) |
+                                           NUM_ES_STACK_ENTRIES(16));
+       } else if (((rdev->family) == CHIP_RV630) ||
+                  ((rdev->family) == CHIP_RV635)) {
+               sq_gpr_resource_mgmt_1 = (NUM_PS_GPRS(44) |
+                                         NUM_VS_GPRS(44) |
+                                         NUM_CLAUSE_TEMP_GPRS(2));
+               sq_gpr_resource_mgmt_2 = (NUM_GS_GPRS(18) |
+                                         NUM_ES_GPRS(18));
+               sq_thread_resource_mgmt = (NUM_PS_THREADS(79) |
+                                          NUM_VS_THREADS(78) |
+                                          NUM_GS_THREADS(4) |
+                                          NUM_ES_THREADS(31));
+               sq_stack_resource_mgmt_1 = (NUM_PS_STACK_ENTRIES(40) |
+                                           NUM_VS_STACK_ENTRIES(40));
+               sq_stack_resource_mgmt_2 = (NUM_GS_STACK_ENTRIES(32) |
+                                           NUM_ES_STACK_ENTRIES(16));
+       } else if ((rdev->family) == CHIP_RV670) {
+               sq_gpr_resource_mgmt_1 = (NUM_PS_GPRS(44) |
+                                         NUM_VS_GPRS(44) |
+                                         NUM_CLAUSE_TEMP_GPRS(2));
+               sq_gpr_resource_mgmt_2 = (NUM_GS_GPRS(17) |
+                                         NUM_ES_GPRS(17));
+               sq_thread_resource_mgmt = (NUM_PS_THREADS(79) |
+                                          NUM_VS_THREADS(78) |
+                                          NUM_GS_THREADS(4) |
+                                          NUM_ES_THREADS(31));
+               sq_stack_resource_mgmt_1 = (NUM_PS_STACK_ENTRIES(64) |
+                                           NUM_VS_STACK_ENTRIES(64));
+               sq_stack_resource_mgmt_2 = (NUM_GS_STACK_ENTRIES(64) |
+                                           NUM_ES_STACK_ENTRIES(64));
+       }
+
+       WREG32(SQ_CONFIG, sq_config);
+       WREG32(SQ_GPR_RESOURCE_MGMT_1,  sq_gpr_resource_mgmt_1);
+       WREG32(SQ_GPR_RESOURCE_MGMT_2,  sq_gpr_resource_mgmt_2);
+       WREG32(SQ_THREAD_RESOURCE_MGMT, sq_thread_resource_mgmt);
+       WREG32(SQ_STACK_RESOURCE_MGMT_1, sq_stack_resource_mgmt_1);
+       WREG32(SQ_STACK_RESOURCE_MGMT_2, sq_stack_resource_mgmt_2);
+
+       if (((rdev->family) == CHIP_RV610) ||
+           ((rdev->family) == CHIP_RV620) ||
+           ((rdev->family) == CHIP_RS780)) {
+               WREG32(VGT_CACHE_INVALIDATION, CACHE_INVALIDATION(TC_ONLY));
+       } else {
+               WREG32(VGT_CACHE_INVALIDATION, CACHE_INVALIDATION(VC_AND_TC));
+       }
+
+       /* More default values. 2D/3D driver should adjust as needed */
+       WREG32(PA_SC_AA_SAMPLE_LOCS_2S, (S0_X(0xc) | S0_Y(0x4) |
+                                        S1_X(0x4) | S1_Y(0xc)));
+       WREG32(PA_SC_AA_SAMPLE_LOCS_4S, (S0_X(0xe) | S0_Y(0xe) |
+                                        S1_X(0x2) | S1_Y(0x2) |
+                                        S2_X(0xa) | S2_Y(0x6) |
+                                        S3_X(0x6) | S3_Y(0xa)));
+       WREG32(PA_SC_AA_SAMPLE_LOCS_8S_WD0, (S0_X(0xe) | S0_Y(0xb) |
+                                            S1_X(0x4) | S1_Y(0xc) |
+                                            S2_X(0x1) | S2_Y(0x6) |
+                                            S3_X(0xa) | S3_Y(0xe)));
+       WREG32(PA_SC_AA_SAMPLE_LOCS_8S_WD1, (S4_X(0x6) | S4_Y(0x1) |
+                                            S5_X(0x0) | S5_Y(0x0) |
+                                            S6_X(0xb) | S6_Y(0x4) |
+                                            S7_X(0x7) | S7_Y(0x8)));
+
+       WREG32(VGT_STRMOUT_EN, 0);
+       tmp = rdev->config.r600.max_pipes * 16;
+       switch (rdev->family) {
+       case CHIP_RV610:
+       case CHIP_RS780:
+       case CHIP_RV620:
+               tmp += 32;
+               break;
+       case CHIP_RV670:
+               tmp += 128;
+               break;
+       default:
+               break;
+       }
+       if (tmp > 256) {
+               tmp = 256;
+       }
+       WREG32(VGT_ES_PER_GS, 128);
+       WREG32(VGT_GS_PER_ES, tmp);
+       WREG32(VGT_GS_PER_VS, 2);
+       WREG32(VGT_GS_VERTEX_REUSE, 16);
+
+       /* more default values. 2D/3D driver should adjust as needed */
+       WREG32(PA_SC_LINE_STIPPLE_STATE, 0);
+       WREG32(VGT_STRMOUT_EN, 0);
+       WREG32(SX_MISC, 0);
+       WREG32(PA_SC_MODE_CNTL, 0);
+       WREG32(PA_SC_AA_CONFIG, 0);
+       WREG32(PA_SC_LINE_STIPPLE, 0);
+       WREG32(SPI_INPUT_Z, 0);
+       WREG32(SPI_PS_IN_CONTROL_0, NUM_INTERP(2));
+       WREG32(CB_COLOR7_FRAG, 0);
+
+       /* Clear render buffer base addresses */
+       WREG32(CB_COLOR0_BASE, 0);
+       WREG32(CB_COLOR1_BASE, 0);
+       WREG32(CB_COLOR2_BASE, 0);
+       WREG32(CB_COLOR3_BASE, 0);
+       WREG32(CB_COLOR4_BASE, 0);
+       WREG32(CB_COLOR5_BASE, 0);
+       WREG32(CB_COLOR6_BASE, 0);
+       WREG32(CB_COLOR7_BASE, 0);
+       WREG32(CB_COLOR7_FRAG, 0);
+
+       switch (rdev->family) {
+       case CHIP_RV610:
+       case CHIP_RS780:
+       case CHIP_RV620:
+               tmp = TC_L2_SIZE(8);
+               break;
+       case CHIP_RV630:
+       case CHIP_RV635:
+               tmp = TC_L2_SIZE(4);
+               break;
+       case CHIP_R600:
+               tmp = TC_L2_SIZE(0) | L2_DISABLE_LATE_HIT;
+               break;
+       default:
+               tmp = TC_L2_SIZE(0);
+               break;
+       }
+       WREG32(TC_CNTL, tmp);
+
+       tmp = RREG32(HDP_HOST_PATH_CNTL);
+       WREG32(HDP_HOST_PATH_CNTL, tmp);
+
+       tmp = RREG32(ARB_POP);
+       tmp |= ENABLE_TC128;
+       WREG32(ARB_POP, tmp);
+
+       WREG32(PA_SC_MULTI_CHIP_CNTL, 0);
+       WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
+                              NUM_CLIP_SEQ(3)));
+       WREG32(PA_SC_ENHANCE, FORCE_EOV_MAX_CLK_CNT(4095));
+}
+
+
 /*
  * Indirect registers accessor
  */
-uint32_t r600_pciep_rreg(struct radeon_device *rdev, uint32_t reg)
+u32 r600_pciep_rreg(struct radeon_device *rdev, u32 reg)
 {
-       uint32_t r;
+       u32 r;
 
-       WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
-       (void)RREG32(R600_PCIE_PORT_INDEX);
-       r = RREG32(R600_PCIE_PORT_DATA);
+       WREG32(PCIE_PORT_INDEX, ((reg) & 0xff));
+       (void)RREG32(PCIE_PORT_INDEX);
+       r = RREG32(PCIE_PORT_DATA);
        return r;
 }
 
-void r600_pciep_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
+void r600_pciep_wreg(struct radeon_device *rdev, u32 reg, u32 v)
 {
-       WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
-       (void)RREG32(R600_PCIE_PORT_INDEX);
-       WREG32(R600_PCIE_PORT_DATA, (v));
-       (void)RREG32(R600_PCIE_PORT_DATA);
+       WREG32(PCIE_PORT_INDEX, ((reg) & 0xff));
+       (void)RREG32(PCIE_PORT_INDEX);
+       WREG32(PCIE_PORT_DATA, (v));
+       (void)RREG32(PCIE_PORT_DATA);
+}
+
+
+/*
+ * CP & Ring
+ */
+void r600_cp_stop(struct radeon_device *rdev)
+{
+       WREG32(R_0086D8_CP_ME_CNTL, S_0086D8_CP_ME_HALT(1));
+}
+
+int r600_cp_init_microcode(struct radeon_device *rdev)
+{
+       struct platform_device *pdev;
+       const char *chip_name;
+       size_t pfp_req_size, me_req_size;
+       char fw_name[30];
+       int err;
+
+       DRM_DEBUG("\n");
+
+       pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0);
+       err = IS_ERR(pdev);
+       if (err) {
+               printk(KERN_ERR "radeon_cp: Failed to register firmware\n");
+               return -EINVAL;
+       }
+
+       switch (rdev->family) {
+       case CHIP_R600: chip_name = "R600"; break;
+       case CHIP_RV610: chip_name = "RV610"; break;
+       case CHIP_RV630: chip_name = "RV630"; break;
+       case CHIP_RV620: chip_name = "RV620"; break;
+       case CHIP_RV635: chip_name = "RV635"; break;
+       case CHIP_RV670: chip_name = "RV670"; break;
+       case CHIP_RS780:
+       case CHIP_RS880: chip_name = "RS780"; break;
+       case CHIP_RV770: chip_name = "RV770"; break;
+       case CHIP_RV730:
+       case CHIP_RV740: chip_name = "RV730"; break;
+       case CHIP_RV710: chip_name = "RV710"; break;
+       default: BUG();
+       }
+
+       if (rdev->family >= CHIP_RV770) {
+               pfp_req_size = R700_PFP_UCODE_SIZE * 4;
+               me_req_size = R700_PM4_UCODE_SIZE * 4;
+       } else {
+               pfp_req_size = PFP_UCODE_SIZE * 4;
+               me_req_size = PM4_UCODE_SIZE * 12;
+       }
+
+       DRM_INFO("Loading %s CP Microcode\n", chip_name);
+
+       snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name);
+       err = request_firmware(&rdev->pfp_fw, fw_name, &pdev->dev);
+       if (err)
+               goto out;
+       if (rdev->pfp_fw->size != pfp_req_size) {
+               printk(KERN_ERR
+                      "r600_cp: Bogus length %zu in firmware \"%s\"\n",
+                      rdev->pfp_fw->size, fw_name);
+               err = -EINVAL;
+               goto out;
+       }
+
+       snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", chip_name);
+       err = request_firmware(&rdev->me_fw, fw_name, &pdev->dev);
+       if (err)
+               goto out;
+       if (rdev->me_fw->size != me_req_size) {
+               printk(KERN_ERR
+                      "r600_cp: Bogus length %zu in firmware \"%s\"\n",
+                      rdev->me_fw->size, fw_name);
+               err = -EINVAL;
+       }
+out:
+       platform_device_unregister(pdev);
+
+       if (err) {
+               if (err != -EINVAL)
+                       printk(KERN_ERR
+                              "r600_cp: Failed to load firmware \"%s\"\n",
+                              fw_name);
+               release_firmware(rdev->pfp_fw);
+               rdev->pfp_fw = NULL;
+               release_firmware(rdev->me_fw);
+               rdev->me_fw = NULL;
+       }
+       return err;
+}
+
+static int r600_cp_load_microcode(struct radeon_device *rdev)
+{
+       const __be32 *fw_data;
+       int i;
+
+       if (!rdev->me_fw || !rdev->pfp_fw)
+               return -EINVAL;
+
+       r600_cp_stop(rdev);
+
+       WREG32(CP_RB_CNTL, RB_NO_UPDATE | RB_BLKSZ(15) | RB_BUFSZ(3));
+
+       /* Reset cp */
+       WREG32(GRBM_SOFT_RESET, SOFT_RESET_CP);
+       RREG32(GRBM_SOFT_RESET);
+       mdelay(15);
+       WREG32(GRBM_SOFT_RESET, 0);
+
+       WREG32(CP_ME_RAM_WADDR, 0);
+
+       fw_data = (const __be32 *)rdev->me_fw->data;
+       WREG32(CP_ME_RAM_WADDR, 0);
+       for (i = 0; i < PM4_UCODE_SIZE * 3; i++)
+               WREG32(CP_ME_RAM_DATA,
+                      be32_to_cpup(fw_data++));
+
+       fw_data = (const __be32 *)rdev->pfp_fw->data;
+       WREG32(CP_PFP_UCODE_ADDR, 0);
+       for (i = 0; i < PFP_UCODE_SIZE; i++)
+               WREG32(CP_PFP_UCODE_DATA,
+                      be32_to_cpup(fw_data++));
+
+       WREG32(CP_PFP_UCODE_ADDR, 0);
+       WREG32(CP_ME_RAM_WADDR, 0);
+       WREG32(CP_ME_RAM_RADDR, 0);
+       return 0;
+}
+
+int r600_cp_start(struct radeon_device *rdev)
+{
+       int r;
+       uint32_t cp_me;
+
+       r = radeon_ring_lock(rdev, 7);
+       if (r) {
+               DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);
+               return r;
+       }
+       radeon_ring_write(rdev, PACKET3(PACKET3_ME_INITIALIZE, 5));
+       radeon_ring_write(rdev, 0x1);
+       if (rdev->family < CHIP_RV770) {
+               radeon_ring_write(rdev, 0x3);
+               radeon_ring_write(rdev, rdev->config.r600.max_hw_contexts - 1);
+       } else {
+               radeon_ring_write(rdev, 0x0);
+               radeon_ring_write(rdev, rdev->config.rv770.max_hw_contexts - 1);
+       }
+       radeon_ring_write(rdev, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
+       radeon_ring_write(rdev, 0);
+       radeon_ring_write(rdev, 0);
+       radeon_ring_unlock_commit(rdev);
+
+       cp_me = 0xff;
+       WREG32(R_0086D8_CP_ME_CNTL, cp_me);
+       return 0;
+}
+
+int r600_cp_resume(struct radeon_device *rdev)
+{
+       u32 tmp;
+       u32 rb_bufsz;
+       int r;
+
+       /* Reset cp */
+       WREG32(GRBM_SOFT_RESET, SOFT_RESET_CP);
+       RREG32(GRBM_SOFT_RESET);
+       mdelay(15);
+       WREG32(GRBM_SOFT_RESET, 0);
+
+       /* Set ring buffer size */
+       rb_bufsz = drm_order(rdev->cp.ring_size / 8);
+#ifdef __BIG_ENDIAN
+       WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE |
+               (drm_order(4096/8) << 8) | rb_bufsz);
+#else
+       WREG32(CP_RB_CNTL, RB_NO_UPDATE | (drm_order(4096/8) << 8) | rb_bufsz);
+#endif
+       WREG32(CP_SEM_WAIT_TIMER, 0x4);
+
+       /* Set the write pointer delay */
+       WREG32(CP_RB_WPTR_DELAY, 0);
+
+       /* Initialize the ring buffer's read and write pointers */
+       tmp = RREG32(CP_RB_CNTL);
+       WREG32(CP_RB_CNTL, tmp | RB_RPTR_WR_ENA);
+       WREG32(CP_RB_RPTR_WR, 0);
+       WREG32(CP_RB_WPTR, 0);
+       WREG32(CP_RB_RPTR_ADDR, rdev->cp.gpu_addr & 0xFFFFFFFF);
+       WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->cp.gpu_addr));
+       mdelay(1);
+       WREG32(CP_RB_CNTL, tmp);
+
+       WREG32(CP_RB_BASE, rdev->cp.gpu_addr >> 8);
+       WREG32(CP_DEBUG, (1 << 27) | (1 << 28));
+
+       rdev->cp.rptr = RREG32(CP_RB_RPTR);
+       rdev->cp.wptr = RREG32(CP_RB_WPTR);
+
+       r600_cp_start(rdev);
+       rdev->cp.ready = true;
+       r = radeon_ring_test(rdev);
+       if (r) {
+               rdev->cp.ready = false;
+               return r;
+       }
+       return 0;
+}
+
+void r600_cp_commit(struct radeon_device *rdev)
+{
+       WREG32(CP_RB_WPTR, rdev->cp.wptr);
+       (void)RREG32(CP_RB_WPTR);
+}
+
+void r600_ring_init(struct radeon_device *rdev, unsigned ring_size)
+{
+       u32 rb_bufsz;
+
+       /* Align ring size */
+       rb_bufsz = drm_order(ring_size / 8);
+       ring_size = (1 << (rb_bufsz + 1)) * 4;
+       rdev->cp.ring_size = ring_size;
+       rdev->cp.align_mask = 16 - 1;
+}
+
+
+/*
+ * GPU scratch registers helpers function.
+ */
+void r600_scratch_init(struct radeon_device *rdev)
+{
+       int i;
+
+       rdev->scratch.num_reg = 7;
+       for (i = 0; i < rdev->scratch.num_reg; i++) {
+               rdev->scratch.free[i] = true;
+               rdev->scratch.reg[i] = SCRATCH_REG0 + (i * 4);
+       }
+}
+
+int r600_ring_test(struct radeon_device *rdev)
+{
+       uint32_t scratch;
+       uint32_t tmp = 0;
+       unsigned i;
+       int r;
+
+       r = radeon_scratch_get(rdev, &scratch);
+       if (r) {
+               DRM_ERROR("radeon: cp failed to get scratch reg (%d).\n", r);
+               return r;
+       }
+       WREG32(scratch, 0xCAFEDEAD);
+       r = radeon_ring_lock(rdev, 3);
+       if (r) {
+               DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);
+               radeon_scratch_free(rdev, scratch);
+               return r;
+       }
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));
+       radeon_ring_write(rdev, ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));
+       radeon_ring_write(rdev, 0xDEADBEEF);
+       radeon_ring_unlock_commit(rdev);
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(scratch);
+               if (tmp == 0xDEADBEEF)
+                       break;
+               DRM_UDELAY(1);
+       }
+       if (i < rdev->usec_timeout) {
+               DRM_INFO("ring test succeeded in %d usecs\n", i);
+       } else {
+               DRM_ERROR("radeon: ring test failed (scratch(0x%04X)=0x%08X)\n",
+                         scratch, tmp);
+               r = -EINVAL;
+       }
+       radeon_scratch_free(rdev, scratch);
+       return r;
+}
+
+/*
+ * Writeback
+ */
+int r600_wb_init(struct radeon_device *rdev)
+{
+       int r;
+
+       if (rdev->wb.wb_obj == NULL) {
+               r = radeon_object_create(rdev, NULL, 4096,
+                                        true,
+                                        RADEON_GEM_DOMAIN_GTT,
+                                        false, &rdev->wb.wb_obj);
+               if (r) {
+                       DRM_ERROR("radeon: failed to create WB buffer (%d).\n", r);
+                       return r;
+               }
+               r = radeon_object_pin(rdev->wb.wb_obj,
+                                     RADEON_GEM_DOMAIN_GTT,
+                                     &rdev->wb.gpu_addr);
+               if (r) {
+                       DRM_ERROR("radeon: failed to pin WB buffer (%d).\n", r);
+                       return r;
+               }
+               r = radeon_object_kmap(rdev->wb.wb_obj, (void **)&rdev->wb.wb);
+               if (r) {
+                       DRM_ERROR("radeon: failed to map WB buffer (%d).\n", r);
+                       return r;
+               }
+       }
+       WREG32(SCRATCH_ADDR, (rdev->wb.gpu_addr >> 8) & 0xFFFFFFFF);
+       WREG32(CP_RB_RPTR_ADDR, (rdev->wb.gpu_addr + 1024) & 0xFFFFFFFC);
+       WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + 1024) & 0xFF);
+       WREG32(SCRATCH_UMSK, 0xff);
+       return 0;
+}
+
+void r600_wb_fini(struct radeon_device *rdev)
+{
+       if (rdev->wb.wb_obj) {
+               radeon_object_kunmap(rdev->wb.wb_obj);
+               radeon_object_unpin(rdev->wb.wb_obj);
+               radeon_object_unref(&rdev->wb.wb_obj);
+               rdev->wb.wb = NULL;
+               rdev->wb.wb_obj = NULL;
+       }
+}
+
+
+/*
+ * CS
+ */
+void r600_fence_ring_emit(struct radeon_device *rdev,
+                         struct radeon_fence *fence)
+{
+       /* Emit fence sequence & fire IRQ */
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));
+       radeon_ring_write(rdev, ((rdev->fence_drv.scratch_reg - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));
+       radeon_ring_write(rdev, fence->seq);
+}
+
+int r600_copy_dma(struct radeon_device *rdev,
+                 uint64_t src_offset,
+                 uint64_t dst_offset,
+                 unsigned num_pages,
+                 struct radeon_fence *fence)
+{
+       /* FIXME: implement */
+       return 0;
+}
+
+int r600_copy_blit(struct radeon_device *rdev,
+                  uint64_t src_offset, uint64_t dst_offset,
+                  unsigned num_pages, struct radeon_fence *fence)
+{
+       r600_blit_prepare_copy(rdev, num_pages * 4096);
+       r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * 4096);
+       r600_blit_done_copy(rdev, fence);
+       return 0;
+}
+
+int r600_irq_process(struct radeon_device *rdev)
+{
+       /* FIXME: implement */
+       return 0;
+}
+
+int r600_irq_set(struct radeon_device *rdev)
+{
+       /* FIXME: implement */
+       return 0;
+}
+
+int r600_set_surface_reg(struct radeon_device *rdev, int reg,
+                        uint32_t tiling_flags, uint32_t pitch,
+                        uint32_t offset, uint32_t obj_size)
+{
+       /* FIXME: implement */
+       return 0;
+}
+
+void r600_clear_surface_reg(struct radeon_device *rdev, int reg)
+{
+       /* FIXME: implement */
+}
+
+
+bool r600_card_posted(struct radeon_device *rdev)
+{
+       uint32_t reg;
+
+       /* first check CRTCs */
+       reg = RREG32(D1CRTC_CONTROL) |
+               RREG32(D2CRTC_CONTROL);
+       if (reg & CRTC_EN)
+               return true;
+
+       /* then check MEM_SIZE, in case the crtcs are off */
+       if (RREG32(CONFIG_MEMSIZE))
+               return true;
+
+       return false;
+}
+
+int r600_startup(struct radeon_device *rdev)
+{
+       int r;
+
+       r600_gpu_reset(rdev);
+       r600_mc_resume(rdev);
+       r = r600_pcie_gart_enable(rdev);
+       if (r)
+               return r;
+       r600_gpu_init(rdev);
+
+       r = radeon_object_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
+                             &rdev->r600_blit.shader_gpu_addr);
+       if (r) {
+               DRM_ERROR("failed to pin blit object %d\n", r);
+               return r;
+       }
+
+       r = radeon_ring_init(rdev, rdev->cp.ring_size);
+       if (r)
+               return r;
+       r = r600_cp_load_microcode(rdev);
+       if (r)
+               return r;
+       r = r600_cp_resume(rdev);
+       if (r)
+               return r;
+       r = r600_wb_init(rdev);
+       if (r)
+               return r;
+       return 0;
+}
+
+void r600_vga_set_state(struct radeon_device *rdev, bool state)
+{
+       uint32_t temp;
+
+       temp = RREG32(CONFIG_CNTL);
+       if (state == false) {
+               temp &= ~(1<<0);
+               temp |= (1<<1);
+       } else {
+               temp &= ~(1<<1);
+       }
+       WREG32(CONFIG_CNTL, temp);
+}
+
+int r600_resume(struct radeon_device *rdev)
+{
+       int r;
+
+       if (radeon_gpu_reset(rdev)) {
+               /* FIXME: what do we want to do here ? */
+       }
+       /* post card */
+       if (rdev->is_atom_bios) {
+               atom_asic_init(rdev->mode_info.atom_context);
+       } else {
+               radeon_combios_asic_init(rdev->ddev);
+       }
+       /* Initialize clocks */
+       r = radeon_clocks_init(rdev);
+       if (r) {
+               return r;
+       }
+
+       r = r600_startup(rdev);
+       if (r) {
+               DRM_ERROR("r600 startup failed on resume\n");
+               return r;
+       }
+
+       r = radeon_ib_test(rdev);
+       if (r) {
+               DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+               return r;
+       }
+       return r;
+}
+
+
+int r600_suspend(struct radeon_device *rdev)
+{
+       /* FIXME: we should wait for ring to be empty */
+       r600_cp_stop(rdev);
+       rdev->cp.ready = false;
+
+       r600_pcie_gart_disable(rdev);
+       /* unpin shaders bo */
+       radeon_object_unpin(rdev->r600_blit.shader_obj);
+       return 0;
+}
+
+/* Plan is to move initialization in that function and use
+ * helper function so that radeon_device_init pretty much
+ * do nothing more than calling asic specific function. This
+ * should also allow to remove a bunch of callback function
+ * like vram_info.
+ */
+int r600_init(struct radeon_device *rdev)
+{
+       int r;
+
+       rdev->new_init_path = true;
+       r = radeon_dummy_page_init(rdev);
+       if (r)
+               return r;
+       if (r600_debugfs_mc_info_init(rdev)) {
+               DRM_ERROR("Failed to register debugfs file for mc !\n");
+       }
+       /* This don't do much */
+       r = radeon_gem_init(rdev);
+       if (r)
+               return r;
+       /* Read BIOS */
+       if (!radeon_get_bios(rdev)) {
+               if (ASIC_IS_AVIVO(rdev))
+                       return -EINVAL;
+       }
+       /* Must be an ATOMBIOS */
+       if (!rdev->is_atom_bios)
+               return -EINVAL;
+       r = radeon_atombios_init(rdev);
+       if (r)
+               return r;
+       /* Post card if necessary */
+       if (!r600_card_posted(rdev) && rdev->bios) {
+               DRM_INFO("GPU not posted. posting now...\n");
+               atom_asic_init(rdev->mode_info.atom_context);
+       }
+       /* Initialize scratch registers */
+       r600_scratch_init(rdev);
+       /* Initialize surface registers */
+       radeon_surface_init(rdev);
+       radeon_get_clock_info(rdev->ddev);
+       r = radeon_clocks_init(rdev);
+       if (r)
+               return r;
+       /* Fence driver */
+       r = radeon_fence_driver_init(rdev);
+       if (r)
+               return r;
+       r = r600_mc_init(rdev);
+       if (r) {
+               if (rdev->flags & RADEON_IS_AGP) {
+                       /* Retry with disabling AGP */
+                       r600_fini(rdev);
+                       rdev->flags &= ~RADEON_IS_AGP;
+                       return r600_init(rdev);
+               }
+               return r;
+       }
+       /* Memory manager */
+       r = radeon_object_init(rdev);
+       if (r)
+               return r;
+       rdev->cp.ring_obj = NULL;
+       r600_ring_init(rdev, 1024 * 1024);
+
+       if (!rdev->me_fw || !rdev->pfp_fw) {
+               r = r600_cp_init_microcode(rdev);
+               if (r) {
+                       DRM_ERROR("Failed to load firmware!\n");
+                       return r;
+               }
+       }
+
+       r = r600_pcie_gart_init(rdev);
+       if (r)
+               return r;
+
+       rdev->accel_working = true;
+       r = r600_blit_init(rdev);
+       if (r) {
+               DRM_ERROR("radeon: failled blitter (%d).\n", r);
+               return r;
+       }
+
+       r = r600_startup(rdev);
+       if (r) {
+               if (rdev->flags & RADEON_IS_AGP) {
+                       /* Retry with disabling AGP */
+                       r600_fini(rdev);
+                       rdev->flags &= ~RADEON_IS_AGP;
+                       return r600_init(rdev);
+               }
+               rdev->accel_working = false;
+       }
+       if (rdev->accel_working) {
+               r = radeon_ib_pool_init(rdev);
+               if (r) {
+                       DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
+                       rdev->accel_working = false;
+               }
+               r = radeon_ib_test(rdev);
+               if (r) {
+                       DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+                       rdev->accel_working = false;
+               }
+       }
+       return 0;
+}
+
+void r600_fini(struct radeon_device *rdev)
+{
+       /* Suspend operations */
+       r600_suspend(rdev);
+
+       r600_blit_fini(rdev);
+       radeon_ring_fini(rdev);
+       r600_pcie_gart_fini(rdev);
+       radeon_gem_fini(rdev);
+       radeon_fence_driver_fini(rdev);
+       radeon_clocks_fini(rdev);
+#if __OS_HAS_AGP
+       if (rdev->flags & RADEON_IS_AGP)
+               radeon_agp_fini(rdev);
+#endif
+       radeon_object_fini(rdev);
+       if (rdev->is_atom_bios)
+               radeon_atombios_fini(rdev);
+       else
+               radeon_combios_fini(rdev);
+       kfree(rdev->bios);
+       rdev->bios = NULL;
+       radeon_dummy_page_fini(rdev);
+}
+
+
+/*
+ * CS stuff
+ */
+void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
+{
+       /* FIXME: implement */
+       radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
+       radeon_ring_write(rdev, ib->gpu_addr & 0xFFFFFFFC);
+       radeon_ring_write(rdev, upper_32_bits(ib->gpu_addr) & 0xFF);
+       radeon_ring_write(rdev, ib->length_dw);
+}
+
+int r600_ib_test(struct radeon_device *rdev)
+{
+       struct radeon_ib *ib;
+       uint32_t scratch;
+       uint32_t tmp = 0;
+       unsigned i;
+       int r;
+
+       r = radeon_scratch_get(rdev, &scratch);
+       if (r) {
+               DRM_ERROR("radeon: failed to get scratch reg (%d).\n", r);
+               return r;
+       }
+       WREG32(scratch, 0xCAFEDEAD);
+       r = radeon_ib_get(rdev, &ib);
+       if (r) {
+               DRM_ERROR("radeon: failed to get ib (%d).\n", r);
+               return r;
+       }
+       ib->ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
+       ib->ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
+       ib->ptr[2] = 0xDEADBEEF;
+       ib->ptr[3] = PACKET2(0);
+       ib->ptr[4] = PACKET2(0);
+       ib->ptr[5] = PACKET2(0);
+       ib->ptr[6] = PACKET2(0);
+       ib->ptr[7] = PACKET2(0);
+       ib->ptr[8] = PACKET2(0);
+       ib->ptr[9] = PACKET2(0);
+       ib->ptr[10] = PACKET2(0);
+       ib->ptr[11] = PACKET2(0);
+       ib->ptr[12] = PACKET2(0);
+       ib->ptr[13] = PACKET2(0);
+       ib->ptr[14] = PACKET2(0);
+       ib->ptr[15] = PACKET2(0);
+       ib->length_dw = 16;
+       r = radeon_ib_schedule(rdev, ib);
+       if (r) {
+               radeon_scratch_free(rdev, scratch);
+               radeon_ib_free(rdev, &ib);
+               DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
+               return r;
+       }
+       r = radeon_fence_wait(ib->fence, false);
+       if (r) {
+               DRM_ERROR("radeon: fence wait failed (%d).\n", r);
+               return r;
+       }
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(scratch);
+               if (tmp == 0xDEADBEEF)
+                       break;
+               DRM_UDELAY(1);
+       }
+       if (i < rdev->usec_timeout) {
+               DRM_INFO("ib test succeeded in %u usecs\n", i);
+       } else {
+               DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
+                         scratch, tmp);
+               r = -EINVAL;
+       }
+       radeon_scratch_free(rdev, scratch);
+       radeon_ib_free(rdev, &ib);
+       return r;
+}
+
+
+
+
+/*
+ * Debugfs info
+ */
+#if defined(CONFIG_DEBUG_FS)
+
+static int r600_debugfs_cp_ring_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t rdp, wdp;
+       unsigned count, i, j;
+
+       radeon_ring_free_size(rdev);
+       rdp = RREG32(CP_RB_RPTR);
+       wdp = RREG32(CP_RB_WPTR);
+       count = (rdp + rdev->cp.ring_size - wdp) & rdev->cp.ptr_mask;
+       seq_printf(m, "CP_STAT 0x%08x\n", RREG32(CP_STAT));
+       seq_printf(m, "CP_RB_WPTR 0x%08x\n", wdp);
+       seq_printf(m, "CP_RB_RPTR 0x%08x\n", rdp);
+       seq_printf(m, "%u free dwords in ring\n", rdev->cp.ring_free_dw);
+       seq_printf(m, "%u dwords in ring\n", count);
+       for (j = 0; j <= count; j++) {
+               i = (rdp + j) & rdev->cp.ptr_mask;
+               seq_printf(m, "r[%04d]=0x%08x\n", i, rdev->cp.ring[i]);
+       }
+       return 0;
+}
+
+static int r600_debugfs_mc_info(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *) m->private;
+       struct drm_device *dev = node->minor->dev;
+       struct radeon_device *rdev = dev->dev_private;
+
+       DREG32_SYS(m, rdev, R_000E50_SRBM_STATUS);
+       DREG32_SYS(m, rdev, VM_L2_STATUS);
+       return 0;
+}
+
+static struct drm_info_list r600_mc_info_list[] = {
+       {"r600_mc_info", r600_debugfs_mc_info, 0, NULL},
+       {"r600_ring_info", r600_debugfs_cp_ring_info, 0, NULL},
+};
+#endif
+
+int r600_debugfs_mc_info_init(struct radeon_device *rdev)
+{
+#if defined(CONFIG_DEBUG_FS)
+       return radeon_debugfs_add_files(rdev, r600_mc_info_list, ARRAY_SIZE(r600_mc_info_list));
+#else
+       return 0;
+#endif
 }
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
new file mode 100644 (file)
index 0000000..dde2ccb
--- /dev/null
@@ -0,0 +1,850 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *     Alex Deucher <alexander.deucher@amd.com>
+ */
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+#include "r600_blit_shaders.h"
+
+#define DI_PT_RECTLIST        0x11
+#define DI_INDEX_SIZE_16_BIT  0x0
+#define DI_SRC_SEL_AUTO_INDEX 0x2
+
+#define FMT_8                 0x1
+#define FMT_5_6_5             0x8
+#define FMT_8_8_8_8           0x1a
+#define COLOR_8               0x1
+#define COLOR_5_6_5           0x8
+#define COLOR_8_8_8_8         0x1a
+
+static inline void
+set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64 gpu_addr)
+{
+       u32 cb_color_info;
+       int pitch, slice;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       h = (h + 7) & ~7;
+       if (h < 8)
+               h = 8;
+
+       cb_color_info = ((format << 2) | (1 << 27));
+       pitch = (w / 8) - 1;
+       slice = ((w * h) / 64) - 1;
+
+       if (((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_R600) &&
+           ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_RV770)) {
+               BEGIN_RING(21 + 2);
+               OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+               OUT_RING((R600_CB_COLOR0_BASE - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+               OUT_RING(gpu_addr >> 8);
+               OUT_RING(CP_PACKET3(R600_IT_SURFACE_BASE_UPDATE, 0));
+               OUT_RING(2 << 0);
+       } else {
+               BEGIN_RING(21);
+               OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+               OUT_RING((R600_CB_COLOR0_BASE - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+               OUT_RING(gpu_addr >> 8);
+       }
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_SIZE - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING((pitch << 0) | (slice << 10));
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_VIEW - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_INFO - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(cb_color_info);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_TILE - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_FRAG - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_CB_COLOR0_MASK - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+
+       ADVANCE_RING();
+}
+
+static inline void
+cp_set_surface_sync(drm_radeon_private_t *dev_priv,
+                   u32 sync_type, u32 size, u64 mc_addr)
+{
+       u32 cp_coher_size;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       if (size == 0xffffffff)
+               cp_coher_size = 0xffffffff;
+       else
+               cp_coher_size = ((size + 255) >> 8);
+
+       BEGIN_RING(5);
+       OUT_RING(CP_PACKET3(R600_IT_SURFACE_SYNC, 3));
+       OUT_RING(sync_type);
+       OUT_RING(cp_coher_size);
+       OUT_RING((mc_addr >> 8));
+       OUT_RING(10); /* poll interval */
+       ADVANCE_RING();
+}
+
+static inline void
+set_shaders(struct drm_device *dev)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       u64 gpu_addr;
+       int i;
+       u32 *vs, *ps;
+       uint32_t sq_pgm_resources;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       /* load shaders */
+       vs = (u32 *) ((char *)dev->agp_buffer_map->handle + dev_priv->blit_vb->offset);
+       ps = (u32 *) ((char *)dev->agp_buffer_map->handle + dev_priv->blit_vb->offset + 256);
+
+       for (i = 0; i < r6xx_vs_size; i++)
+               vs[i] = r6xx_vs[i];
+       for (i = 0; i < r6xx_ps_size; i++)
+               ps[i] = r6xx_ps[i];
+
+       dev_priv->blit_vb->used = 512;
+
+       gpu_addr = dev_priv->gart_buffers_offset + dev_priv->blit_vb->offset;
+
+       /* setup shader regs */
+       sq_pgm_resources = (1 << 0);
+
+       BEGIN_RING(9 + 12);
+       /* VS */
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_START_VS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(gpu_addr >> 8);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_RESOURCES_VS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(sq_pgm_resources);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_CF_OFFSET_VS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+
+       /* PS */
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_START_PS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING((gpu_addr + 256) >> 8);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_RESOURCES_PS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(sq_pgm_resources | (1 << 28));
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_EXPORTS_PS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(2);
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 1));
+       OUT_RING((R600_SQ_PGM_CF_OFFSET_PS - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING(0);
+       ADVANCE_RING();
+
+       cp_set_surface_sync(dev_priv,
+                           R600_SH_ACTION_ENA, 512, gpu_addr);
+}
+
+static inline void
+set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr)
+{
+       uint32_t sq_vtx_constant_word2;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       sq_vtx_constant_word2 = (((gpu_addr >> 32) & 0xff) | (16 << 8));
+
+       BEGIN_RING(9);
+       OUT_RING(CP_PACKET3(R600_IT_SET_RESOURCE, 7));
+       OUT_RING(0x460);
+       OUT_RING(gpu_addr & 0xffffffff);
+       OUT_RING(48 - 1);
+       OUT_RING(sq_vtx_constant_word2);
+       OUT_RING(1 << 0);
+       OUT_RING(0);
+       OUT_RING(0);
+       OUT_RING(R600_SQ_TEX_VTX_VALID_BUFFER << 30);
+       ADVANCE_RING();
+
+       if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV710))
+               cp_set_surface_sync(dev_priv,
+                                   R600_TC_ACTION_ENA, 48, gpu_addr);
+       else
+               cp_set_surface_sync(dev_priv,
+                                   R600_VC_ACTION_ENA, 48, gpu_addr);
+}
+
+static inline void
+set_tex_resource(drm_radeon_private_t *dev_priv,
+                int format, int w, int h, int pitch, u64 gpu_addr)
+{
+       uint32_t sq_tex_resource_word0, sq_tex_resource_word1, sq_tex_resource_word4;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       if (h < 1)
+               h = 1;
+
+       sq_tex_resource_word0 = (1 << 0);
+       sq_tex_resource_word0 |= ((((pitch >> 3) - 1) << 8) |
+                                 ((w - 1) << 19));
+
+       sq_tex_resource_word1 = (format << 26);
+       sq_tex_resource_word1 |= ((h - 1) << 0);
+
+       sq_tex_resource_word4 = ((1 << 14) |
+                                (0 << 16) |
+                                (1 << 19) |
+                                (2 << 22) |
+                                (3 << 25));
+
+       BEGIN_RING(9);
+       OUT_RING(CP_PACKET3(R600_IT_SET_RESOURCE, 7));
+       OUT_RING(0);
+       OUT_RING(sq_tex_resource_word0);
+       OUT_RING(sq_tex_resource_word1);
+       OUT_RING(gpu_addr >> 8);
+       OUT_RING(gpu_addr >> 8);
+       OUT_RING(sq_tex_resource_word4);
+       OUT_RING(0);
+       OUT_RING(R600_SQ_TEX_VTX_VALID_TEXTURE << 30);
+       ADVANCE_RING();
+
+}
+
+static inline void
+set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)
+{
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       BEGIN_RING(12);
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
+       OUT_RING((R600_PA_SC_SCREEN_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING((x1 << 0) | (y1 << 16));
+       OUT_RING((x2 << 0) | (y2 << 16));
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
+       OUT_RING((R600_PA_SC_GENERIC_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+       OUT_RING((x2 << 0) | (y2 << 16));
+
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
+       OUT_RING((R600_PA_SC_WINDOW_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
+       OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+       OUT_RING((x2 << 0) | (y2 << 16));
+       ADVANCE_RING();
+}
+
+static inline void
+draw_auto(drm_radeon_private_t *dev_priv)
+{
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       BEGIN_RING(10);
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONFIG_REG, 1));
+       OUT_RING((R600_VGT_PRIMITIVE_TYPE - R600_SET_CONFIG_REG_OFFSET) >> 2);
+       OUT_RING(DI_PT_RECTLIST);
+
+       OUT_RING(CP_PACKET3(R600_IT_INDEX_TYPE, 0));
+       OUT_RING(DI_INDEX_SIZE_16_BIT);
+
+       OUT_RING(CP_PACKET3(R600_IT_NUM_INSTANCES, 0));
+       OUT_RING(1);
+
+       OUT_RING(CP_PACKET3(R600_IT_DRAW_INDEX_AUTO, 1));
+       OUT_RING(3);
+       OUT_RING(DI_SRC_SEL_AUTO_INDEX);
+
+       ADVANCE_RING();
+       COMMIT_RING();
+}
+
+static inline void
+set_default_state(drm_radeon_private_t *dev_priv)
+{
+       int i;
+       u32 sq_config, sq_gpr_resource_mgmt_1, sq_gpr_resource_mgmt_2;
+       u32 sq_thread_resource_mgmt, sq_stack_resource_mgmt_1, sq_stack_resource_mgmt_2;
+       int num_ps_gprs, num_vs_gprs, num_temp_gprs, num_gs_gprs, num_es_gprs;
+       int num_ps_threads, num_vs_threads, num_gs_threads, num_es_threads;
+       int num_ps_stack_entries, num_vs_stack_entries, num_gs_stack_entries, num_es_stack_entries;
+       RING_LOCALS;
+
+       switch ((dev_priv->flags & RADEON_FAMILY_MASK)) {
+       case CHIP_R600:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV630:
+       case CHIP_RV635:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 144;
+               num_vs_threads = 40;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV610:
+       case CHIP_RV620:
+       case CHIP_RS780:
+       case CHIP_RS880:
+       default:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV670:
+               num_ps_gprs = 144;
+               num_vs_gprs = 40;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV770:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 188;
+               num_vs_threads = 60;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 256;
+               num_vs_stack_entries = 256;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV730:
+       case CHIP_RV740:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 188;
+               num_vs_threads = 60;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV710:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 144;
+               num_vs_threads = 48;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       }
+
+       if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880) ||
+           ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV710))
+               sq_config = 0;
+       else
+               sq_config = R600_VC_ENABLE;
+
+       sq_config |= (R600_DX9_CONSTS |
+                     R600_ALU_INST_PREFER_VECTOR |
+                     R600_PS_PRIO(0) |
+                     R600_VS_PRIO(1) |
+                     R600_GS_PRIO(2) |
+                     R600_ES_PRIO(3));
+
+       sq_gpr_resource_mgmt_1 = (R600_NUM_PS_GPRS(num_ps_gprs) |
+                                 R600_NUM_VS_GPRS(num_vs_gprs) |
+                                 R600_NUM_CLAUSE_TEMP_GPRS(num_temp_gprs));
+       sq_gpr_resource_mgmt_2 = (R600_NUM_GS_GPRS(num_gs_gprs) |
+                                 R600_NUM_ES_GPRS(num_es_gprs));
+       sq_thread_resource_mgmt = (R600_NUM_PS_THREADS(num_ps_threads) |
+                                  R600_NUM_VS_THREADS(num_vs_threads) |
+                                  R600_NUM_GS_THREADS(num_gs_threads) |
+                                  R600_NUM_ES_THREADS(num_es_threads));
+       sq_stack_resource_mgmt_1 = (R600_NUM_PS_STACK_ENTRIES(num_ps_stack_entries) |
+                                   R600_NUM_VS_STACK_ENTRIES(num_vs_stack_entries));
+       sq_stack_resource_mgmt_2 = (R600_NUM_GS_STACK_ENTRIES(num_gs_stack_entries) |
+                                   R600_NUM_ES_STACK_ENTRIES(num_es_stack_entries));
+
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770) {
+               BEGIN_RING(r7xx_default_size + 10);
+               for (i = 0; i < r7xx_default_size; i++)
+                       OUT_RING(r7xx_default_state[i]);
+       } else {
+               BEGIN_RING(r6xx_default_size + 10);
+               for (i = 0; i < r6xx_default_size; i++)
+                       OUT_RING(r6xx_default_state[i]);
+       }
+       OUT_RING(CP_PACKET3(R600_IT_EVENT_WRITE, 0));
+       OUT_RING(R600_CACHE_FLUSH_AND_INV_EVENT);
+       /* SQ config */
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONFIG_REG, 6));
+       OUT_RING((R600_SQ_CONFIG - R600_SET_CONFIG_REG_OFFSET) >> 2);
+       OUT_RING(sq_config);
+       OUT_RING(sq_gpr_resource_mgmt_1);
+       OUT_RING(sq_gpr_resource_mgmt_2);
+       OUT_RING(sq_thread_resource_mgmt);
+       OUT_RING(sq_stack_resource_mgmt_1);
+       OUT_RING(sq_stack_resource_mgmt_2);
+       ADVANCE_RING();
+}
+
+static inline uint32_t i2f(uint32_t input)
+{
+       u32 result, i, exponent, fraction;
+
+       if ((input & 0x3fff) == 0)
+               result = 0; /* 0 is a special case */
+       else {
+               exponent = 140; /* exponent biased by 127; */
+               fraction = (input & 0x3fff) << 10; /* cheat and only
+                                                     handle numbers below 2^^15 */
+               for (i = 0; i < 14; i++) {
+                       if (fraction & 0x800000)
+                               break;
+                       else {
+                               fraction = fraction << 1; /* keep
+                                                            shifting left until top bit = 1 */
+                               exponent = exponent - 1;
+                       }
+               }
+               result = exponent << 23 | (fraction & 0x7fffff); /* mask
+                                                                   off top bit; assumed 1 */
+       }
+       return result;
+}
+
+
+static inline int r600_nomm_get_vb(struct drm_device *dev)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       dev_priv->blit_vb = radeon_freelist_get(dev);
+       if (!dev_priv->blit_vb) {
+               DRM_ERROR("Unable to allocate vertex buffer for blit\n");
+               return -EAGAIN;
+       }
+       return 0;
+}
+
+static inline void r600_nomm_put_vb(struct drm_device *dev)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+
+       dev_priv->blit_vb->used = 0;
+       radeon_cp_discard_buffer(dev, dev_priv->blit_vb->file_priv->master, dev_priv->blit_vb);
+}
+
+static inline void *r600_nomm_get_vb_ptr(struct drm_device *dev)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       return (((char *)dev->agp_buffer_map->handle +
+                dev_priv->blit_vb->offset + dev_priv->blit_vb->used));
+}
+
+int
+r600_prepare_blit_copy(struct drm_device *dev, struct drm_file *file_priv)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       DRM_DEBUG("\n");
+
+       r600_nomm_get_vb(dev);
+
+       dev_priv->blit_vb->file_priv = file_priv;
+
+       set_default_state(dev_priv);
+       set_shaders(dev);
+
+       return 0;
+}
+
+
+void
+r600_done_blit_copy(struct drm_device *dev)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       BEGIN_RING(5);
+       OUT_RING(CP_PACKET3(R600_IT_EVENT_WRITE, 0));
+       OUT_RING(R600_CACHE_FLUSH_AND_INV_EVENT);
+       /* wait for 3D idle clean */
+       OUT_RING(CP_PACKET3(R600_IT_SET_CONFIG_REG, 1));
+       OUT_RING((R600_WAIT_UNTIL - R600_SET_CONFIG_REG_OFFSET) >> 2);
+       OUT_RING(RADEON_WAIT_3D_IDLE | RADEON_WAIT_3D_IDLECLEAN);
+
+       ADVANCE_RING();
+       COMMIT_RING();
+
+       r600_nomm_put_vb(dev);
+}
+
+void
+r600_blit_copy(struct drm_device *dev,
+              uint64_t src_gpu_addr, uint64_t dst_gpu_addr,
+              int size_bytes)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       int max_bytes;
+       u64 vb_addr;
+       u32 *vb;
+
+       vb = r600_nomm_get_vb_ptr(dev);
+
+       if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {
+               max_bytes = 8192;
+
+               while (size_bytes) {
+                       int cur_size = size_bytes;
+                       int src_x = src_gpu_addr & 255;
+                       int dst_x = dst_gpu_addr & 255;
+                       int h = 1;
+                       src_gpu_addr = src_gpu_addr & ~255;
+                       dst_gpu_addr = dst_gpu_addr & ~255;
+
+                       if (!src_x && !dst_x) {
+                               h = (cur_size / max_bytes);
+                               if (h > 8192)
+                                       h = 8192;
+                               if (h == 0)
+                                       h = 1;
+                               else
+                                       cur_size = max_bytes;
+                       } else {
+                               if (cur_size > max_bytes)
+                                       cur_size = max_bytes;
+                               if (cur_size > (max_bytes - dst_x))
+                                       cur_size = (max_bytes - dst_x);
+                               if (cur_size > (max_bytes - src_x))
+                                       cur_size = (max_bytes - src_x);
+                       }
+
+                       if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
+
+                               r600_nomm_put_vb(dev);
+                               r600_nomm_get_vb(dev);
+                               if (!dev_priv->blit_vb)
+                                       return;
+                               set_shaders(dev);
+                               vb = r600_nomm_get_vb_ptr(dev);
+                       }
+
+                       vb[0] = i2f(dst_x);
+                       vb[1] = 0;
+                       vb[2] = i2f(src_x);
+                       vb[3] = 0;
+
+                       vb[4] = i2f(dst_x);
+                       vb[5] = i2f(h);
+                       vb[6] = i2f(src_x);
+                       vb[7] = i2f(h);
+
+                       vb[8] = i2f(dst_x + cur_size);
+                       vb[9] = i2f(h);
+                       vb[10] = i2f(src_x + cur_size);
+                       vb[11] = i2f(h);
+
+                       /* src */
+                       set_tex_resource(dev_priv, FMT_8,
+                                        src_x + cur_size, h, src_x + cur_size,
+                                        src_gpu_addr);
+
+                       cp_set_surface_sync(dev_priv,
+                                           R600_TC_ACTION_ENA, (src_x + cur_size * h), src_gpu_addr);
+
+                       /* dst */
+                       set_render_target(dev_priv, COLOR_8,
+                                         dst_x + cur_size, h,
+                                         dst_gpu_addr);
+
+                       /* scissors */
+                       set_scissors(dev_priv, dst_x, 0, dst_x + cur_size, h);
+
+                       /* Vertex buffer setup */
+                       vb_addr = dev_priv->gart_buffers_offset +
+                               dev_priv->blit_vb->offset +
+                               dev_priv->blit_vb->used;
+                       set_vtx_resource(dev_priv, vb_addr);
+
+                       /* draw */
+                       draw_auto(dev_priv);
+
+                       cp_set_surface_sync(dev_priv,
+                                           R600_CB_ACTION_ENA | R600_CB0_DEST_BASE_ENA,
+                                           cur_size * h, dst_gpu_addr);
+
+                       vb += 12;
+                       dev_priv->blit_vb->used += 12 * 4;
+
+                       src_gpu_addr += cur_size * h;
+                       dst_gpu_addr += cur_size * h;
+                       size_bytes -= cur_size * h;
+               }
+       } else {
+               max_bytes = 8192 * 4;
+
+               while (size_bytes) {
+                       int cur_size = size_bytes;
+                       int src_x = (src_gpu_addr & 255);
+                       int dst_x = (dst_gpu_addr & 255);
+                       int h = 1;
+                       src_gpu_addr = src_gpu_addr & ~255;
+                       dst_gpu_addr = dst_gpu_addr & ~255;
+
+                       if (!src_x && !dst_x) {
+                               h = (cur_size / max_bytes);
+                               if (h > 8192)
+                                       h = 8192;
+                               if (h == 0)
+                                       h = 1;
+                               else
+                                       cur_size = max_bytes;
+                       } else {
+                               if (cur_size > max_bytes)
+                                       cur_size = max_bytes;
+                               if (cur_size > (max_bytes - dst_x))
+                                       cur_size = (max_bytes - dst_x);
+                               if (cur_size > (max_bytes - src_x))
+                                       cur_size = (max_bytes - src_x);
+                       }
+
+                       if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
+                               r600_nomm_put_vb(dev);
+                               r600_nomm_get_vb(dev);
+                               if (!dev_priv->blit_vb)
+                                       return;
+
+                               set_shaders(dev);
+                               vb = r600_nomm_get_vb_ptr(dev);
+                       }
+
+                       vb[0] = i2f(dst_x / 4);
+                       vb[1] = 0;
+                       vb[2] = i2f(src_x / 4);
+                       vb[3] = 0;
+
+                       vb[4] = i2f(dst_x / 4);
+                       vb[5] = i2f(h);
+                       vb[6] = i2f(src_x / 4);
+                       vb[7] = i2f(h);
+
+                       vb[8] = i2f((dst_x + cur_size) / 4);
+                       vb[9] = i2f(h);
+                       vb[10] = i2f((src_x + cur_size) / 4);
+                       vb[11] = i2f(h);
+
+                       /* src */
+                       set_tex_resource(dev_priv, FMT_8_8_8_8,
+                                        (src_x + cur_size) / 4,
+                                        h, (src_x + cur_size) / 4,
+                                        src_gpu_addr);
+
+                       cp_set_surface_sync(dev_priv,
+                                           R600_TC_ACTION_ENA, (src_x + cur_size * h), src_gpu_addr);
+
+                       /* dst */
+                       set_render_target(dev_priv, COLOR_8_8_8_8,
+                                         dst_x + cur_size, h,
+                                         dst_gpu_addr);
+
+                       /* scissors */
+                       set_scissors(dev_priv, (dst_x / 4), 0, (dst_x + cur_size / 4), h);
+
+                       /* Vertex buffer setup */
+                       vb_addr = dev_priv->gart_buffers_offset +
+                               dev_priv->blit_vb->offset +
+                               dev_priv->blit_vb->used;
+                       set_vtx_resource(dev_priv, vb_addr);
+
+                       /* draw */
+                       draw_auto(dev_priv);
+
+                       cp_set_surface_sync(dev_priv,
+                                           R600_CB_ACTION_ENA | R600_CB0_DEST_BASE_ENA,
+                                           cur_size * h, dst_gpu_addr);
+
+                       vb += 12;
+                       dev_priv->blit_vb->used += 12 * 4;
+
+                       src_gpu_addr += cur_size * h;
+                       dst_gpu_addr += cur_size * h;
+                       size_bytes -= cur_size * h;
+               }
+       }
+}
+
+void
+r600_blit_swap(struct drm_device *dev,
+              uint64_t src_gpu_addr, uint64_t dst_gpu_addr,
+              int sx, int sy, int dx, int dy,
+              int w, int h, int src_pitch, int dst_pitch, int cpp)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       int cb_format, tex_format;
+       u64 vb_addr;
+       u32 *vb;
+
+       vb = r600_nomm_get_vb_ptr(dev);
+
+       if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
+
+               r600_nomm_put_vb(dev);
+               r600_nomm_get_vb(dev);
+               if (!dev_priv->blit_vb)
+                       return;
+
+               set_shaders(dev);
+               vb = r600_nomm_get_vb_ptr(dev);
+       }
+
+       if (cpp == 4) {
+               cb_format = COLOR_8_8_8_8;
+               tex_format = FMT_8_8_8_8;
+       } else if (cpp == 2) {
+               cb_format = COLOR_5_6_5;
+               tex_format = FMT_5_6_5;
+       } else {
+               cb_format = COLOR_8;
+               tex_format = FMT_8;
+       }
+
+       vb[0] = i2f(dx);
+       vb[1] = i2f(dy);
+       vb[2] = i2f(sx);
+       vb[3] = i2f(sy);
+
+       vb[4] = i2f(dx);
+       vb[5] = i2f(dy + h);
+       vb[6] = i2f(sx);
+       vb[7] = i2f(sy + h);
+
+       vb[8] = i2f(dx + w);
+       vb[9] = i2f(dy + h);
+       vb[10] = i2f(sx + w);
+       vb[11] = i2f(sy + h);
+
+       /* src */
+       set_tex_resource(dev_priv, tex_format,
+                        src_pitch / cpp,
+                        sy + h, src_pitch / cpp,
+                        src_gpu_addr);
+
+       cp_set_surface_sync(dev_priv,
+                           R600_TC_ACTION_ENA, (src_pitch * (sy + h)), src_gpu_addr);
+
+       /* dst */
+       set_render_target(dev_priv, cb_format,
+                         dst_pitch / cpp, dy + h,
+                         dst_gpu_addr);
+
+       /* scissors */
+       set_scissors(dev_priv, dx, dy, dx + w, dy + h);
+
+       /* Vertex buffer setup */
+       vb_addr = dev_priv->gart_buffers_offset +
+               dev_priv->blit_vb->offset +
+               dev_priv->blit_vb->used;
+       set_vtx_resource(dev_priv, vb_addr);
+
+       /* draw */
+       draw_auto(dev_priv);
+
+       cp_set_surface_sync(dev_priv,
+                           R600_CB_ACTION_ENA | R600_CB0_DEST_BASE_ENA,
+                           dst_pitch * (dy + h), dst_gpu_addr);
+
+       dev_priv->blit_vb->used += 12 * 4;
+}
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
new file mode 100644 (file)
index 0000000..0a6f468
--- /dev/null
@@ -0,0 +1,805 @@
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon.h"
+
+#include "r600d.h"
+#include "r600_blit_shaders.h"
+
+#define DI_PT_RECTLIST        0x11
+#define DI_INDEX_SIZE_16_BIT  0x0
+#define DI_SRC_SEL_AUTO_INDEX 0x2
+
+#define FMT_8                 0x1
+#define FMT_5_6_5             0x8
+#define FMT_8_8_8_8           0x1a
+#define COLOR_8               0x1
+#define COLOR_5_6_5           0x8
+#define COLOR_8_8_8_8         0x1a
+
+/* emits 21 on rv770+, 23 on r600 */
+static void
+set_render_target(struct radeon_device *rdev, int format,
+                 int w, int h, u64 gpu_addr)
+{
+       u32 cb_color_info;
+       int pitch, slice;
+
+       h = (h + 7) & ~7;
+       if (h < 8)
+               h = 8;
+
+       cb_color_info = ((format << 2) | (1 << 27));
+       pitch = (w / 8) - 1;
+       slice = ((w * h) / 64) - 1;
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_BASE - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, gpu_addr >> 8);
+
+       if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770) {
+               radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_BASE_UPDATE, 0));
+               radeon_ring_write(rdev, 2 << 0);
+       }
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_SIZE - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, (pitch << 0) | (slice << 10));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_VIEW - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_INFO - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, cb_color_info);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_TILE - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_FRAG - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (CB_COLOR0_MASK - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+}
+
+/* emits 5dw */
+static void
+cp_set_surface_sync(struct radeon_device *rdev,
+                   u32 sync_type, u32 size,
+                   u64 mc_addr)
+{
+       u32 cp_coher_size;
+
+       if (size == 0xffffffff)
+               cp_coher_size = 0xffffffff;
+       else
+               cp_coher_size = ((size + 255) >> 8);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_SYNC, 3));
+       radeon_ring_write(rdev, sync_type);
+       radeon_ring_write(rdev, cp_coher_size);
+       radeon_ring_write(rdev, mc_addr >> 8);
+       radeon_ring_write(rdev, 10); /* poll interval */
+}
+
+/* emits 21dw + 1 surface sync = 26dw */
+static void
+set_shaders(struct radeon_device *rdev)
+{
+       u64 gpu_addr;
+       u32 sq_pgm_resources;
+
+       /* setup shader regs */
+       sq_pgm_resources = (1 << 0);
+
+       /* VS */
+       gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.vs_offset;
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_START_VS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, gpu_addr >> 8);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_RESOURCES_VS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, sq_pgm_resources);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_CF_OFFSET_VS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+
+       /* PS */
+       gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.ps_offset;
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_START_PS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, gpu_addr >> 8);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_RESOURCES_PS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, sq_pgm_resources | (1 << 28));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_EXPORTS_PS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 2);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));
+       radeon_ring_write(rdev, (SQ_PGM_CF_OFFSET_PS - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, 0);
+
+       gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.vs_offset;
+       cp_set_surface_sync(rdev, PACKET3_SH_ACTION_ENA, 512, gpu_addr);
+}
+
+/* emits 9 + 1 sync (5) = 14*/
+static void
+set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)
+{
+       u32 sq_vtx_constant_word2;
+
+       sq_vtx_constant_word2 = ((upper_32_bits(gpu_addr) & 0xff) | (16 << 8));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 7));
+       radeon_ring_write(rdev, 0x460);
+       radeon_ring_write(rdev, gpu_addr & 0xffffffff);
+       radeon_ring_write(rdev, 48 - 1);
+       radeon_ring_write(rdev, sq_vtx_constant_word2);
+       radeon_ring_write(rdev, 1 << 0);
+       radeon_ring_write(rdev, 0);
+       radeon_ring_write(rdev, 0);
+       radeon_ring_write(rdev, SQ_TEX_VTX_VALID_BUFFER << 30);
+
+       if ((rdev->family == CHIP_RV610) ||
+           (rdev->family == CHIP_RV620) ||
+           (rdev->family == CHIP_RS780) ||
+           (rdev->family == CHIP_RS880) ||
+           (rdev->family == CHIP_RV710))
+               cp_set_surface_sync(rdev,
+                                   PACKET3_TC_ACTION_ENA, 48, gpu_addr);
+       else
+               cp_set_surface_sync(rdev,
+                                   PACKET3_VC_ACTION_ENA, 48, gpu_addr);
+}
+
+/* emits 9 */
+static void
+set_tex_resource(struct radeon_device *rdev,
+                int format, int w, int h, int pitch,
+                u64 gpu_addr)
+{
+       uint32_t sq_tex_resource_word0, sq_tex_resource_word1, sq_tex_resource_word4;
+
+       if (h < 1)
+               h = 1;
+
+       sq_tex_resource_word0 = (1 << 0);
+       sq_tex_resource_word0 |= ((((pitch >> 3) - 1) << 8) |
+                                 ((w - 1) << 19));
+
+       sq_tex_resource_word1 = (format << 26);
+       sq_tex_resource_word1 |= ((h - 1) << 0);
+
+       sq_tex_resource_word4 = ((1 << 14) |
+                                (0 << 16) |
+                                (1 << 19) |
+                                (2 << 22) |
+                                (3 << 25));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 7));
+       radeon_ring_write(rdev, 0);
+       radeon_ring_write(rdev, sq_tex_resource_word0);
+       radeon_ring_write(rdev, sq_tex_resource_word1);
+       radeon_ring_write(rdev, gpu_addr >> 8);
+       radeon_ring_write(rdev, gpu_addr >> 8);
+       radeon_ring_write(rdev, sq_tex_resource_word4);
+       radeon_ring_write(rdev, 0);
+       radeon_ring_write(rdev, SQ_TEX_VTX_VALID_TEXTURE << 30);
+}
+
+/* emits 12 */
+static void
+set_scissors(struct radeon_device *rdev, int x1, int y1,
+            int x2, int y2)
+{
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
+       radeon_ring_write(rdev, (PA_SC_SCREEN_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, (x1 << 0) | (y1 << 16));
+       radeon_ring_write(rdev, (x2 << 0) | (y2 << 16));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
+       radeon_ring_write(rdev, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, (x1 << 0) | (y1 << 16) | (1 << 31));
+       radeon_ring_write(rdev, (x2 << 0) | (y2 << 16));
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
+       radeon_ring_write(rdev, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, (x1 << 0) | (y1 << 16) | (1 << 31));
+       radeon_ring_write(rdev, (x2 << 0) | (y2 << 16));
+}
+
+/* emits 10 */
+static void
+draw_auto(struct radeon_device *rdev)
+{
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));
+       radeon_ring_write(rdev, (VGT_PRIMITIVE_TYPE - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, DI_PT_RECTLIST);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_INDEX_TYPE, 0));
+       radeon_ring_write(rdev, DI_INDEX_SIZE_16_BIT);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_NUM_INSTANCES, 0));
+       radeon_ring_write(rdev, 1);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_DRAW_INDEX_AUTO, 1));
+       radeon_ring_write(rdev, 3);
+       radeon_ring_write(rdev, DI_SRC_SEL_AUTO_INDEX);
+
+}
+
+/* emits 14 */
+static void
+set_default_state(struct radeon_device *rdev)
+{
+       u32 sq_config, sq_gpr_resource_mgmt_1, sq_gpr_resource_mgmt_2;
+       u32 sq_thread_resource_mgmt, sq_stack_resource_mgmt_1, sq_stack_resource_mgmt_2;
+       int num_ps_gprs, num_vs_gprs, num_temp_gprs, num_gs_gprs, num_es_gprs;
+       int num_ps_threads, num_vs_threads, num_gs_threads, num_es_threads;
+       int num_ps_stack_entries, num_vs_stack_entries, num_gs_stack_entries, num_es_stack_entries;
+       u64 gpu_addr;
+       int dwords;
+
+       switch (rdev->family) {
+       case CHIP_R600:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV630:
+       case CHIP_RV635:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 144;
+               num_vs_threads = 40;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV610:
+       case CHIP_RV620:
+       case CHIP_RS780:
+       case CHIP_RS880:
+       default:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV670:
+               num_ps_gprs = 144;
+               num_vs_gprs = 40;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 136;
+               num_vs_threads = 48;
+               num_gs_threads = 4;
+               num_es_threads = 4;
+               num_ps_stack_entries = 40;
+               num_vs_stack_entries = 40;
+               num_gs_stack_entries = 32;
+               num_es_stack_entries = 16;
+               break;
+       case CHIP_RV770:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 188;
+               num_vs_threads = 60;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 256;
+               num_vs_stack_entries = 256;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV730:
+       case CHIP_RV740:
+               num_ps_gprs = 84;
+               num_vs_gprs = 36;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 188;
+               num_vs_threads = 60;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       case CHIP_RV710:
+               num_ps_gprs = 192;
+               num_vs_gprs = 56;
+               num_temp_gprs = 4;
+               num_gs_gprs = 0;
+               num_es_gprs = 0;
+               num_ps_threads = 144;
+               num_vs_threads = 48;
+               num_gs_threads = 0;
+               num_es_threads = 0;
+               num_ps_stack_entries = 128;
+               num_vs_stack_entries = 128;
+               num_gs_stack_entries = 0;
+               num_es_stack_entries = 0;
+               break;
+       }
+
+       if ((rdev->family == CHIP_RV610) ||
+           (rdev->family == CHIP_RV620) ||
+           (rdev->family == CHIP_RS780) ||
+           (rdev->family == CHIP_RS780) ||
+           (rdev->family == CHIP_RV710))
+               sq_config = 0;
+       else
+               sq_config = VC_ENABLE;
+
+       sq_config |= (DX9_CONSTS |
+                     ALU_INST_PREFER_VECTOR |
+                     PS_PRIO(0) |
+                     VS_PRIO(1) |
+                     GS_PRIO(2) |
+                     ES_PRIO(3));
+
+       sq_gpr_resource_mgmt_1 = (NUM_PS_GPRS(num_ps_gprs) |
+                                 NUM_VS_GPRS(num_vs_gprs) |
+                                 NUM_CLAUSE_TEMP_GPRS(num_temp_gprs));
+       sq_gpr_resource_mgmt_2 = (NUM_GS_GPRS(num_gs_gprs) |
+                                 NUM_ES_GPRS(num_es_gprs));
+       sq_thread_resource_mgmt = (NUM_PS_THREADS(num_ps_threads) |
+                                  NUM_VS_THREADS(num_vs_threads) |
+                                  NUM_GS_THREADS(num_gs_threads) |
+                                  NUM_ES_THREADS(num_es_threads));
+       sq_stack_resource_mgmt_1 = (NUM_PS_STACK_ENTRIES(num_ps_stack_entries) |
+                                   NUM_VS_STACK_ENTRIES(num_vs_stack_entries));
+       sq_stack_resource_mgmt_2 = (NUM_GS_STACK_ENTRIES(num_gs_stack_entries) |
+                                   NUM_ES_STACK_ENTRIES(num_es_stack_entries));
+
+       /* emit an IB pointing at default state */
+       dwords = (rdev->r600_blit.state_len + 0xf) & ~0xf;
+       gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.state_offset;
+       radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
+       radeon_ring_write(rdev, gpu_addr & 0xFFFFFFFC);
+       radeon_ring_write(rdev, upper_32_bits(gpu_addr) & 0xFF);
+       radeon_ring_write(rdev, dwords);
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_EVENT_WRITE, 0));
+       radeon_ring_write(rdev, CACHE_FLUSH_AND_INV_EVENT);
+       /* SQ config */
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 6));
+       radeon_ring_write(rdev, (SQ_CONFIG - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, sq_config);
+       radeon_ring_write(rdev, sq_gpr_resource_mgmt_1);
+       radeon_ring_write(rdev, sq_gpr_resource_mgmt_2);
+       radeon_ring_write(rdev, sq_thread_resource_mgmt);
+       radeon_ring_write(rdev, sq_stack_resource_mgmt_1);
+       radeon_ring_write(rdev, sq_stack_resource_mgmt_2);
+}
+
+static inline uint32_t i2f(uint32_t input)
+{
+       u32 result, i, exponent, fraction;
+
+       if ((input & 0x3fff) == 0)
+               result = 0; /* 0 is a special case */
+       else {
+               exponent = 140; /* exponent biased by 127; */
+               fraction = (input & 0x3fff) << 10; /* cheat and only
+                                                     handle numbers below 2^^15 */
+               for (i = 0; i < 14; i++) {
+                       if (fraction & 0x800000)
+                               break;
+                       else {
+                               fraction = fraction << 1; /* keep
+                                                            shifting left until top bit = 1 */
+                               exponent = exponent - 1;
+                       }
+               }
+               result = exponent << 23 | (fraction & 0x7fffff); /* mask
+                                                                   off top bit; assumed 1 */
+       }
+       return result;
+}
+
+int r600_blit_init(struct radeon_device *rdev)
+{
+       u32 obj_size;
+       int r, dwords;
+       void *ptr;
+       u32 packet2s[16];
+       int num_packet2s = 0;
+
+       rdev->r600_blit.state_offset = 0;
+
+       if (rdev->family >= CHIP_RV770)
+               rdev->r600_blit.state_len = r7xx_default_size;
+       else
+               rdev->r600_blit.state_len = r6xx_default_size;
+
+       dwords = rdev->r600_blit.state_len;
+       while (dwords & 0xf) {
+               packet2s[num_packet2s++] = PACKET2(0);
+               dwords++;
+       }
+
+       obj_size = dwords * 4;
+       obj_size = ALIGN(obj_size, 256);
+
+       rdev->r600_blit.vs_offset = obj_size;
+       obj_size += r6xx_vs_size * 4;
+       obj_size = ALIGN(obj_size, 256);
+
+       rdev->r600_blit.ps_offset = obj_size;
+       obj_size += r6xx_ps_size * 4;
+       obj_size = ALIGN(obj_size, 256);
+
+       r = radeon_object_create(rdev, NULL, obj_size,
+                                true, RADEON_GEM_DOMAIN_VRAM,
+                                false, &rdev->r600_blit.shader_obj);
+       if (r) {
+               DRM_ERROR("r600 failed to allocate shader\n");
+               return r;
+       }
+
+       DRM_DEBUG("r6xx blit allocated bo %08x vs %08x ps %08x\n",
+                 obj_size,
+                 rdev->r600_blit.vs_offset, rdev->r600_blit.ps_offset);
+
+       r = radeon_object_kmap(rdev->r600_blit.shader_obj, &ptr);
+       if (r) {
+               DRM_ERROR("failed to map blit object %d\n", r);
+               return r;
+       }
+
+       if (rdev->family >= CHIP_RV770)
+               memcpy_toio(ptr + rdev->r600_blit.state_offset,
+                           r7xx_default_state, rdev->r600_blit.state_len * 4);
+       else
+               memcpy_toio(ptr + rdev->r600_blit.state_offset,
+                           r6xx_default_state, rdev->r600_blit.state_len * 4);
+       if (num_packet2s)
+               memcpy_toio(ptr + rdev->r600_blit.state_offset + (rdev->r600_blit.state_len * 4),
+                           packet2s, num_packet2s * 4);
+
+
+       memcpy(ptr + rdev->r600_blit.vs_offset, r6xx_vs, r6xx_vs_size * 4);
+       memcpy(ptr + rdev->r600_blit.ps_offset, r6xx_ps, r6xx_ps_size * 4);
+
+       radeon_object_kunmap(rdev->r600_blit.shader_obj);
+       return 0;
+}
+
+void r600_blit_fini(struct radeon_device *rdev)
+{
+       radeon_object_unpin(rdev->r600_blit.shader_obj);
+       radeon_object_unref(&rdev->r600_blit.shader_obj);
+}
+
+int r600_vb_ib_get(struct radeon_device *rdev)
+{
+       int r;
+       r = radeon_ib_get(rdev, &rdev->r600_blit.vb_ib);
+       if (r) {
+               DRM_ERROR("failed to get IB for vertex buffer\n");
+               return r;
+       }
+
+       rdev->r600_blit.vb_total = 64*1024;
+       rdev->r600_blit.vb_used = 0;
+       return 0;
+}
+
+void r600_vb_ib_put(struct radeon_device *rdev)
+{
+       radeon_fence_emit(rdev, rdev->r600_blit.vb_ib->fence);
+       mutex_lock(&rdev->ib_pool.mutex);
+       list_add_tail(&rdev->r600_blit.vb_ib->list, &rdev->ib_pool.scheduled_ibs);
+       mutex_unlock(&rdev->ib_pool.mutex);
+       radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);
+}
+
+int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
+{
+       int r;
+       int ring_size, line_size;
+       int max_size;
+       /* loops of emits 64 + fence emit possible */
+       int dwords_per_loop = 76, num_loops;
+
+       r = r600_vb_ib_get(rdev);
+       WARN_ON(r);
+
+       /* set_render_target emits 2 extra dwords on rv6xx */
+       if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770)
+               dwords_per_loop += 2;
+
+       /* 8 bpp vs 32 bpp for xfer unit */
+       if (size_bytes & 3)
+               line_size = 8192;
+       else
+               line_size = 8192*4;
+
+       max_size = 8192 * line_size;
+
+       /* major loops cover the max size transfer */
+       num_loops = ((size_bytes + max_size) / max_size);
+       /* minor loops cover the extra non aligned bits */
+       num_loops += ((size_bytes % line_size) ? 1 : 0);
+       /* calculate number of loops correctly */
+       ring_size = num_loops * dwords_per_loop;
+       /* set default  + shaders */
+       ring_size += 40; /* shaders + def state */
+       ring_size += 3; /* fence emit for VB IB */
+       ring_size += 5; /* done copy */
+       ring_size += 3; /* fence emit for done copy */
+       r = radeon_ring_lock(rdev, ring_size);
+       WARN_ON(r);
+
+       set_default_state(rdev); /* 14 */
+       set_shaders(rdev); /* 26 */
+       return 0;
+}
+
+void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence)
+{
+       int r;
+
+       radeon_ring_write(rdev, PACKET3(PACKET3_EVENT_WRITE, 0));
+       radeon_ring_write(rdev, CACHE_FLUSH_AND_INV_EVENT);
+       /* wait for 3D idle clean */
+       radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));
+       radeon_ring_write(rdev, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
+       radeon_ring_write(rdev, WAIT_3D_IDLE_bit | WAIT_3D_IDLECLEAN_bit);
+
+       if (rdev->r600_blit.vb_ib)
+               r600_vb_ib_put(rdev);
+
+       if (fence)
+               r = radeon_fence_emit(rdev, fence);
+
+       radeon_ring_unlock_commit(rdev);
+}
+
+void r600_kms_blit_copy(struct radeon_device *rdev,
+                       u64 src_gpu_addr, u64 dst_gpu_addr,
+                       int size_bytes)
+{
+       int max_bytes;
+       u64 vb_gpu_addr;
+       u32 *vb;
+
+       DRM_DEBUG("emitting copy %16llx %16llx %d %d\n", src_gpu_addr, dst_gpu_addr,
+                 size_bytes, rdev->r600_blit.vb_used);
+       vb = (u32 *)(rdev->r600_blit.vb_ib->ptr + rdev->r600_blit.vb_used);
+       if ((size_bytes & 3) || (src_gpu_addr & 3) || (dst_gpu_addr & 3)) {
+               max_bytes = 8192;
+
+               while (size_bytes) {
+                       int cur_size = size_bytes;
+                       int src_x = src_gpu_addr & 255;
+                       int dst_x = dst_gpu_addr & 255;
+                       int h = 1;
+                       src_gpu_addr = src_gpu_addr & ~255;
+                       dst_gpu_addr = dst_gpu_addr & ~255;
+
+                       if (!src_x && !dst_x) {
+                               h = (cur_size / max_bytes);
+                               if (h > 8192)
+                                       h = 8192;
+                               if (h == 0)
+                                       h = 1;
+                               else
+                                       cur_size = max_bytes;
+                       } else {
+                               if (cur_size > max_bytes)
+                                       cur_size = max_bytes;
+                               if (cur_size > (max_bytes - dst_x))
+                                       cur_size = (max_bytes - dst_x);
+                               if (cur_size > (max_bytes - src_x))
+                                       cur_size = (max_bytes - src_x);
+                       }
+
+                       if ((rdev->r600_blit.vb_used + 48) > rdev->r600_blit.vb_total) {
+                               WARN_ON(1);
+
+#if 0
+                               r600_vb_ib_put(rdev);
+
+                               r600_nomm_put_vb(dev);
+                               r600_nomm_get_vb(dev);
+                               if (!dev_priv->blit_vb)
+                                       return;
+                               set_shaders(dev);
+                               vb = r600_nomm_get_vb_ptr(dev);
+#endif
+                       }
+
+                       vb[0] = i2f(dst_x);
+                       vb[1] = 0;
+                       vb[2] = i2f(src_x);
+                       vb[3] = 0;
+
+                       vb[4] = i2f(dst_x);
+                       vb[5] = i2f(h);
+                       vb[6] = i2f(src_x);
+                       vb[7] = i2f(h);
+
+                       vb[8] = i2f(dst_x + cur_size);
+                       vb[9] = i2f(h);
+                       vb[10] = i2f(src_x + cur_size);
+                       vb[11] = i2f(h);
+
+                       /* src 9 */
+                       set_tex_resource(rdev, FMT_8,
+                                        src_x + cur_size, h, src_x + cur_size,
+                                        src_gpu_addr);
+
+                       /* 5 */
+                       cp_set_surface_sync(rdev,
+                                           PACKET3_TC_ACTION_ENA, (src_x + cur_size * h), src_gpu_addr);
+
+                       /* dst 23 */
+                       set_render_target(rdev, COLOR_8,
+                                         dst_x + cur_size, h,
+                                         dst_gpu_addr);
+
+                       /* scissors 12 */
+                       set_scissors(rdev, dst_x, 0, dst_x + cur_size, h);
+
+                       /* 14 */
+                       vb_gpu_addr = rdev->r600_blit.vb_ib->gpu_addr + rdev->r600_blit.vb_used;
+                       set_vtx_resource(rdev, vb_gpu_addr);
+
+                       /* draw 10 */
+                       draw_auto(rdev);
+
+                       /* 5 */
+                       cp_set_surface_sync(rdev,
+                                           PACKET3_CB_ACTION_ENA | PACKET3_CB0_DEST_BASE_ENA,
+                                           cur_size * h, dst_gpu_addr);
+
+                       vb += 12;
+                       rdev->r600_blit.vb_used += 12 * 4;
+
+                       src_gpu_addr += cur_size * h;
+                       dst_gpu_addr += cur_size * h;
+                       size_bytes -= cur_size * h;
+               }
+       } else {
+               max_bytes = 8192 * 4;
+
+               while (size_bytes) {
+                       int cur_size = size_bytes;
+                       int src_x = (src_gpu_addr & 255);
+                       int dst_x = (dst_gpu_addr & 255);
+                       int h = 1;
+                       src_gpu_addr = src_gpu_addr & ~255;
+                       dst_gpu_addr = dst_gpu_addr & ~255;
+
+                       if (!src_x && !dst_x) {
+                               h = (cur_size / max_bytes);
+                               if (h > 8192)
+                                       h = 8192;
+                               if (h == 0)
+                                       h = 1;
+                               else
+                                       cur_size = max_bytes;
+                       } else {
+                               if (cur_size > max_bytes)
+                                       cur_size = max_bytes;
+                               if (cur_size > (max_bytes - dst_x))
+                                       cur_size = (max_bytes - dst_x);
+                               if (cur_size > (max_bytes - src_x))
+                                       cur_size = (max_bytes - src_x);
+                       }
+
+                       if ((rdev->r600_blit.vb_used + 48) > rdev->r600_blit.vb_total) {
+                               WARN_ON(1);
+                       }
+#if 0
+                       if ((rdev->blit_vb->used + 48) > rdev->blit_vb->total) {
+                               r600_nomm_put_vb(dev);
+                               r600_nomm_get_vb(dev);
+                               if (!rdev->blit_vb)
+                                       return;
+
+                               set_shaders(dev);
+                               vb = r600_nomm_get_vb_ptr(dev);
+                       }
+#endif
+
+                       vb[0] = i2f(dst_x / 4);
+                       vb[1] = 0;
+                       vb[2] = i2f(src_x / 4);
+                       vb[3] = 0;
+
+                       vb[4] = i2f(dst_x / 4);
+                       vb[5] = i2f(h);
+                       vb[6] = i2f(src_x / 4);
+                       vb[7] = i2f(h);
+
+                       vb[8] = i2f((dst_x + cur_size) / 4);
+                       vb[9] = i2f(h);
+                       vb[10] = i2f((src_x + cur_size) / 4);
+                       vb[11] = i2f(h);
+
+                       /* src 9 */
+                       set_tex_resource(rdev, FMT_8_8_8_8,
+                                        (src_x + cur_size) / 4,
+                                        h, (src_x + cur_size) / 4,
+                                        src_gpu_addr);
+                       /* 5 */
+                       cp_set_surface_sync(rdev,
+                                           PACKET3_TC_ACTION_ENA, (src_x + cur_size * h), src_gpu_addr);
+
+                       /* dst 23 */
+                       set_render_target(rdev, COLOR_8_8_8_8,
+                                         dst_x + cur_size, h,
+                                         dst_gpu_addr);
+
+                       /* scissors 12  */
+                       set_scissors(rdev, (dst_x / 4), 0, (dst_x + cur_size / 4), h);
+
+                       /* Vertex buffer setup 14 */
+                       vb_gpu_addr = rdev->r600_blit.vb_ib->gpu_addr + rdev->r600_blit.vb_used;
+                       set_vtx_resource(rdev, vb_gpu_addr);
+
+                       /* draw 10 */
+                       draw_auto(rdev);
+
+                       /* 5 */
+                       cp_set_surface_sync(rdev,
+                                           PACKET3_CB_ACTION_ENA | PACKET3_CB0_DEST_BASE_ENA,
+                                           cur_size * h, dst_gpu_addr);
+
+                       /* 78 ring dwords per loop */
+                       vb += 12;
+                       rdev->r600_blit.vb_used += 12 * 4;
+
+                       src_gpu_addr += cur_size * h;
+                       dst_gpu_addr += cur_size * h;
+                       size_bytes -= cur_size * h;
+               }
+       }
+}
+
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
new file mode 100644 (file)
index 0000000..d745e81
--- /dev/null
@@ -0,0 +1,1072 @@
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+const u32 r6xx_default_state[] =
+{
+       0xc0002400,
+       0x00000000,
+       0xc0012800,
+       0x80000000,
+       0x80000000,
+       0xc0004600,
+       0x00000016,
+       0xc0016800,
+       0x00000010,
+       0x00028000,
+       0xc0016800,
+       0x00000010,
+       0x00008000,
+       0xc0016800,
+       0x00000542,
+       0x07000003,
+       0xc0016800,
+       0x000005c5,
+       0x00000000,
+       0xc0016800,
+       0x00000363,
+       0x00000000,
+       0xc0016800,
+       0x0000060c,
+       0x82000000,
+       0xc0016800,
+       0x0000060e,
+       0x01020204,
+       0xc0016f00,
+       0x00000000,
+       0x00000000,
+       0xc0016f00,
+       0x00000001,
+       0x00000000,
+       0xc0096900,
+       0x0000022a,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x00000004,
+       0x00000000,
+       0xc0016900,
+       0x0000000a,
+       0x00000000,
+       0xc0016900,
+       0x0000000b,
+       0x00000000,
+       0xc0016900,
+       0x0000010c,
+       0x00000000,
+       0xc0016900,
+       0x0000010d,
+       0x00000000,
+       0xc0016900,
+       0x00000200,
+       0x00000000,
+       0xc0016900,
+       0x00000343,
+       0x00000060,
+       0xc0016900,
+       0x00000344,
+       0x00000040,
+       0xc0016900,
+       0x00000351,
+       0x0000aa00,
+       0xc0016900,
+       0x00000104,
+       0x00000000,
+       0xc0016900,
+       0x0000010e,
+       0x00000000,
+       0xc0046900,
+       0x00000105,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0036900,
+       0x00000109,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0046900,
+       0x0000030c,
+       0x01000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0046900,
+       0x00000048,
+       0x3f800000,
+       0x00000000,
+       0x3f800000,
+       0x3f800000,
+       0xc0016900,
+       0x0000008e,
+       0x0000000f,
+       0xc0016900,
+       0x00000080,
+       0x00000000,
+       0xc0016900,
+       0x00000083,
+       0x0000ffff,
+       0xc0016900,
+       0x00000084,
+       0x00000000,
+       0xc0016900,
+       0x00000085,
+       0x20002000,
+       0xc0016900,
+       0x00000086,
+       0x00000000,
+       0xc0016900,
+       0x00000087,
+       0x20002000,
+       0xc0016900,
+       0x00000088,
+       0x00000000,
+       0xc0016900,
+       0x00000089,
+       0x20002000,
+       0xc0016900,
+       0x0000008a,
+       0x00000000,
+       0xc0016900,
+       0x0000008b,
+       0x20002000,
+       0xc0016900,
+       0x0000008c,
+       0x00000000,
+       0xc0016900,
+       0x00000094,
+       0x80000000,
+       0xc0016900,
+       0x00000095,
+       0x20002000,
+       0xc0026900,
+       0x000000b4,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000096,
+       0x80000000,
+       0xc0016900,
+       0x00000097,
+       0x20002000,
+       0xc0026900,
+       0x000000b6,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000098,
+       0x80000000,
+       0xc0016900,
+       0x00000099,
+       0x20002000,
+       0xc0026900,
+       0x000000b8,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009a,
+       0x80000000,
+       0xc0016900,
+       0x0000009b,
+       0x20002000,
+       0xc0026900,
+       0x000000ba,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009c,
+       0x80000000,
+       0xc0016900,
+       0x0000009d,
+       0x20002000,
+       0xc0026900,
+       0x000000bc,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009e,
+       0x80000000,
+       0xc0016900,
+       0x0000009f,
+       0x20002000,
+       0xc0026900,
+       0x000000be,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a0,
+       0x80000000,
+       0xc0016900,
+       0x000000a1,
+       0x20002000,
+       0xc0026900,
+       0x000000c0,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a2,
+       0x80000000,
+       0xc0016900,
+       0x000000a3,
+       0x20002000,
+       0xc0026900,
+       0x000000c2,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a4,
+       0x80000000,
+       0xc0016900,
+       0x000000a5,
+       0x20002000,
+       0xc0026900,
+       0x000000c4,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a6,
+       0x80000000,
+       0xc0016900,
+       0x000000a7,
+       0x20002000,
+       0xc0026900,
+       0x000000c6,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a8,
+       0x80000000,
+       0xc0016900,
+       0x000000a9,
+       0x20002000,
+       0xc0026900,
+       0x000000c8,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000aa,
+       0x80000000,
+       0xc0016900,
+       0x000000ab,
+       0x20002000,
+       0xc0026900,
+       0x000000ca,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000ac,
+       0x80000000,
+       0xc0016900,
+       0x000000ad,
+       0x20002000,
+       0xc0026900,
+       0x000000cc,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000ae,
+       0x80000000,
+       0xc0016900,
+       0x000000af,
+       0x20002000,
+       0xc0026900,
+       0x000000ce,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000b0,
+       0x80000000,
+       0xc0016900,
+       0x000000b1,
+       0x20002000,
+       0xc0026900,
+       0x000000d0,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000b2,
+       0x80000000,
+       0xc0016900,
+       0x000000b3,
+       0x20002000,
+       0xc0026900,
+       0x000000d2,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000293,
+       0x00004010,
+       0xc0016900,
+       0x00000300,
+       0x00000000,
+       0xc0016900,
+       0x00000301,
+       0x00000000,
+       0xc0016900,
+       0x00000312,
+       0xffffffff,
+       0xc0016900,
+       0x00000307,
+       0x00000000,
+       0xc0016900,
+       0x00000308,
+       0x00000000,
+       0xc0016900,
+       0x00000283,
+       0x00000000,
+       0xc0016900,
+       0x00000292,
+       0x00000000,
+       0xc0066900,
+       0x0000010f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x00000206,
+       0x00000000,
+       0xc0016900,
+       0x00000207,
+       0x00000000,
+       0xc0016900,
+       0x00000208,
+       0x00000000,
+       0xc0046900,
+       0x00000303,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0xc0016900,
+       0x00000205,
+       0x00000004,
+       0xc0016900,
+       0x00000280,
+       0x00000000,
+       0xc0016900,
+       0x00000281,
+       0x00000000,
+       0xc0016900,
+       0x0000037e,
+       0x00000000,
+       0xc0016900,
+       0x00000382,
+       0x00000000,
+       0xc0016900,
+       0x00000380,
+       0x00000000,
+       0xc0016900,
+       0x00000383,
+       0x00000000,
+       0xc0016900,
+       0x00000381,
+       0x00000000,
+       0xc0016900,
+       0x00000282,
+       0x00000008,
+       0xc0016900,
+       0x00000302,
+       0x0000002d,
+       0xc0016900,
+       0x0000037f,
+       0x00000000,
+       0xc0016900,
+       0x000001b2,
+       0x00000000,
+       0xc0016900,
+       0x000001b6,
+       0x00000000,
+       0xc0016900,
+       0x000001b7,
+       0x00000000,
+       0xc0016900,
+       0x000001b8,
+       0x00000000,
+       0xc0016900,
+       0x000001b9,
+       0x00000000,
+       0xc0016900,
+       0x00000225,
+       0x00000000,
+       0xc0016900,
+       0x00000229,
+       0x00000000,
+       0xc0016900,
+       0x00000237,
+       0x00000000,
+       0xc0016900,
+       0x00000100,
+       0x00000800,
+       0xc0016900,
+       0x00000101,
+       0x00000000,
+       0xc0016900,
+       0x00000102,
+       0x00000000,
+       0xc0016900,
+       0x000002a8,
+       0x00000000,
+       0xc0016900,
+       0x000002a9,
+       0x00000000,
+       0xc0016900,
+       0x00000103,
+       0x00000000,
+       0xc0016900,
+       0x00000284,
+       0x00000000,
+       0xc0016900,
+       0x00000290,
+       0x00000000,
+       0xc0016900,
+       0x00000285,
+       0x00000000,
+       0xc0016900,
+       0x00000286,
+       0x00000000,
+       0xc0016900,
+       0x00000287,
+       0x00000000,
+       0xc0016900,
+       0x00000288,
+       0x00000000,
+       0xc0016900,
+       0x00000289,
+       0x00000000,
+       0xc0016900,
+       0x0000028a,
+       0x00000000,
+       0xc0016900,
+       0x0000028b,
+       0x00000000,
+       0xc0016900,
+       0x0000028c,
+       0x00000000,
+       0xc0016900,
+       0x0000028d,
+       0x00000000,
+       0xc0016900,
+       0x0000028e,
+       0x00000000,
+       0xc0016900,
+       0x0000028f,
+       0x00000000,
+       0xc0016900,
+       0x000002a1,
+       0x00000000,
+       0xc0016900,
+       0x000002a5,
+       0x00000000,
+       0xc0016900,
+       0x000002ac,
+       0x00000000,
+       0xc0016900,
+       0x000002ad,
+       0x00000000,
+       0xc0016900,
+       0x000002ae,
+       0x00000000,
+       0xc0016900,
+       0x000002c8,
+       0x00000000,
+       0xc0016900,
+       0x00000206,
+       0x00000100,
+       0xc0016900,
+       0x00000204,
+       0x00010000,
+       0xc0036e00,
+       0x00000000,
+       0x00000012,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x0000008f,
+       0x0000000f,
+       0xc0016900,
+       0x000001e8,
+       0x00000001,
+       0xc0016900,
+       0x00000202,
+       0x00cc0000,
+       0xc0016900,
+       0x00000205,
+       0x00000244,
+       0xc0016900,
+       0x00000203,
+       0x00000210,
+       0xc0016900,
+       0x000001b1,
+       0x00000000,
+       0xc0016900,
+       0x00000185,
+       0x00000000,
+       0xc0016900,
+       0x000001b3,
+       0x00000001,
+       0xc0016900,
+       0x000001b4,
+       0x00000000,
+       0xc0016900,
+       0x00000191,
+       0x00000b00,
+       0xc0016900,
+       0x000001b5,
+       0x00000000,
+};
+
+const u32 r7xx_default_state[] =
+{
+       0xc0012800,
+       0x80000000,
+       0x80000000,
+       0xc0004600,
+       0x00000016,
+       0xc0016800,
+       0x00000010,
+       0x00028000,
+       0xc0016800,
+       0x00000010,
+       0x00008000,
+       0xc0016800,
+       0x00000542,
+       0x07000002,
+       0xc0016800,
+       0x000005c5,
+       0x00000000,
+       0xc0016800,
+       0x00000363,
+       0x00004000,
+       0xc0016800,
+       0x0000060c,
+       0x00000000,
+       0xc0016800,
+       0x0000060e,
+       0x00420204,
+       0xc0016f00,
+       0x00000000,
+       0x00000000,
+       0xc0016f00,
+       0x00000001,
+       0x00000000,
+       0xc0096900,
+       0x0000022a,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x00000004,
+       0x00000000,
+       0xc0016900,
+       0x0000000a,
+       0x00000000,
+       0xc0016900,
+       0x0000000b,
+       0x00000000,
+       0xc0016900,
+       0x0000010c,
+       0x00000000,
+       0xc0016900,
+       0x0000010d,
+       0x00000000,
+       0xc0016900,
+       0x00000200,
+       0x00000000,
+       0xc0016900,
+       0x00000343,
+       0x00000060,
+       0xc0016900,
+       0x00000344,
+       0x00000000,
+       0xc0016900,
+       0x00000351,
+       0x0000aa00,
+       0xc0016900,
+       0x00000104,
+       0x00000000,
+       0xc0016900,
+       0x0000010e,
+       0x00000000,
+       0xc0046900,
+       0x00000105,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0046900,
+       0x0000030c,
+       0x01000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x0000008e,
+       0x0000000f,
+       0xc0016900,
+       0x00000080,
+       0x00000000,
+       0xc0016900,
+       0x00000083,
+       0x0000ffff,
+       0xc0016900,
+       0x00000084,
+       0x00000000,
+       0xc0016900,
+       0x00000085,
+       0x20002000,
+       0xc0016900,
+       0x00000086,
+       0x00000000,
+       0xc0016900,
+       0x00000087,
+       0x20002000,
+       0xc0016900,
+       0x00000088,
+       0x00000000,
+       0xc0016900,
+       0x00000089,
+       0x20002000,
+       0xc0016900,
+       0x0000008a,
+       0x00000000,
+       0xc0016900,
+       0x0000008b,
+       0x20002000,
+       0xc0016900,
+       0x0000008c,
+       0xaaaaaaaa,
+       0xc0016900,
+       0x00000094,
+       0x80000000,
+       0xc0016900,
+       0x00000095,
+       0x20002000,
+       0xc0026900,
+       0x000000b4,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000096,
+       0x80000000,
+       0xc0016900,
+       0x00000097,
+       0x20002000,
+       0xc0026900,
+       0x000000b6,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000098,
+       0x80000000,
+       0xc0016900,
+       0x00000099,
+       0x20002000,
+       0xc0026900,
+       0x000000b8,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009a,
+       0x80000000,
+       0xc0016900,
+       0x0000009b,
+       0x20002000,
+       0xc0026900,
+       0x000000ba,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009c,
+       0x80000000,
+       0xc0016900,
+       0x0000009d,
+       0x20002000,
+       0xc0026900,
+       0x000000bc,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x0000009e,
+       0x80000000,
+       0xc0016900,
+       0x0000009f,
+       0x20002000,
+       0xc0026900,
+       0x000000be,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a0,
+       0x80000000,
+       0xc0016900,
+       0x000000a1,
+       0x20002000,
+       0xc0026900,
+       0x000000c0,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a2,
+       0x80000000,
+       0xc0016900,
+       0x000000a3,
+       0x20002000,
+       0xc0026900,
+       0x000000c2,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a4,
+       0x80000000,
+       0xc0016900,
+       0x000000a5,
+       0x20002000,
+       0xc0026900,
+       0x000000c4,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a6,
+       0x80000000,
+       0xc0016900,
+       0x000000a7,
+       0x20002000,
+       0xc0026900,
+       0x000000c6,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000a8,
+       0x80000000,
+       0xc0016900,
+       0x000000a9,
+       0x20002000,
+       0xc0026900,
+       0x000000c8,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000aa,
+       0x80000000,
+       0xc0016900,
+       0x000000ab,
+       0x20002000,
+       0xc0026900,
+       0x000000ca,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000ac,
+       0x80000000,
+       0xc0016900,
+       0x000000ad,
+       0x20002000,
+       0xc0026900,
+       0x000000cc,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000ae,
+       0x80000000,
+       0xc0016900,
+       0x000000af,
+       0x20002000,
+       0xc0026900,
+       0x000000ce,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000b0,
+       0x80000000,
+       0xc0016900,
+       0x000000b1,
+       0x20002000,
+       0xc0026900,
+       0x000000d0,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x000000b2,
+       0x80000000,
+       0xc0016900,
+       0x000000b3,
+       0x20002000,
+       0xc0026900,
+       0x000000d2,
+       0x00000000,
+       0x3f800000,
+       0xc0016900,
+       0x00000293,
+       0x00514000,
+       0xc0016900,
+       0x00000300,
+       0x00000000,
+       0xc0016900,
+       0x00000301,
+       0x00000000,
+       0xc0016900,
+       0x00000312,
+       0xffffffff,
+       0xc0016900,
+       0x00000307,
+       0x00000000,
+       0xc0016900,
+       0x00000308,
+       0x00000000,
+       0xc0016900,
+       0x00000283,
+       0x00000000,
+       0xc0016900,
+       0x00000292,
+       0x00000000,
+       0xc0066900,
+       0x0000010f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x00000206,
+       0x00000000,
+       0xc0016900,
+       0x00000207,
+       0x00000000,
+       0xc0016900,
+       0x00000208,
+       0x00000000,
+       0xc0046900,
+       0x00000303,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0xc0016900,
+       0x00000205,
+       0x00000004,
+       0xc0016900,
+       0x00000280,
+       0x00000000,
+       0xc0016900,
+       0x00000281,
+       0x00000000,
+       0xc0016900,
+       0x0000037e,
+       0x00000000,
+       0xc0016900,
+       0x00000382,
+       0x00000000,
+       0xc0016900,
+       0x00000380,
+       0x00000000,
+       0xc0016900,
+       0x00000383,
+       0x00000000,
+       0xc0016900,
+       0x00000381,
+       0x00000000,
+       0xc0016900,
+       0x00000282,
+       0x00000008,
+       0xc0016900,
+       0x00000302,
+       0x0000002d,
+       0xc0016900,
+       0x0000037f,
+       0x00000000,
+       0xc0016900,
+       0x000001b2,
+       0x00000001,
+       0xc0016900,
+       0x000001b6,
+       0x00000000,
+       0xc0016900,
+       0x000001b7,
+       0x00000000,
+       0xc0016900,
+       0x000001b8,
+       0x00000000,
+       0xc0016900,
+       0x000001b9,
+       0x00000000,
+       0xc0016900,
+       0x00000225,
+       0x00000000,
+       0xc0016900,
+       0x00000229,
+       0x00000000,
+       0xc0016900,
+       0x00000237,
+       0x00000000,
+       0xc0016900,
+       0x00000100,
+       0x00000800,
+       0xc0016900,
+       0x00000101,
+       0x00000000,
+       0xc0016900,
+       0x00000102,
+       0x00000000,
+       0xc0016900,
+       0x000002a8,
+       0x00000000,
+       0xc0016900,
+       0x000002a9,
+       0x00000000,
+       0xc0016900,
+       0x00000103,
+       0x00000000,
+       0xc0016900,
+       0x00000284,
+       0x00000000,
+       0xc0016900,
+       0x00000290,
+       0x00000000,
+       0xc0016900,
+       0x00000285,
+       0x00000000,
+       0xc0016900,
+       0x00000286,
+       0x00000000,
+       0xc0016900,
+       0x00000287,
+       0x00000000,
+       0xc0016900,
+       0x00000288,
+       0x00000000,
+       0xc0016900,
+       0x00000289,
+       0x00000000,
+       0xc0016900,
+       0x0000028a,
+       0x00000000,
+       0xc0016900,
+       0x0000028b,
+       0x00000000,
+       0xc0016900,
+       0x0000028c,
+       0x00000000,
+       0xc0016900,
+       0x0000028d,
+       0x00000000,
+       0xc0016900,
+       0x0000028e,
+       0x00000000,
+       0xc0016900,
+       0x0000028f,
+       0x00000000,
+       0xc0016900,
+       0x000002a1,
+       0x00000000,
+       0xc0016900,
+       0x000002a5,
+       0x00000000,
+       0xc0016900,
+       0x000002ac,
+       0x00000000,
+       0xc0016900,
+       0x000002ad,
+       0x00000000,
+       0xc0016900,
+       0x000002ae,
+       0x00000000,
+       0xc0016900,
+       0x000002c8,
+       0x00000000,
+       0xc0016900,
+       0x00000206,
+       0x00000100,
+       0xc0016900,
+       0x00000204,
+       0x00010000,
+       0xc0036e00,
+       0x00000000,
+       0x00000012,
+       0x00000000,
+       0x00000000,
+       0xc0016900,
+       0x0000008f,
+       0x0000000f,
+       0xc0016900,
+       0x000001e8,
+       0x00000001,
+       0xc0016900,
+       0x00000202,
+       0x00cc0000,
+       0xc0016900,
+       0x00000205,
+       0x00000244,
+       0xc0016900,
+       0x00000203,
+       0x00000210,
+       0xc0016900,
+       0x000001b1,
+       0x00000000,
+       0xc0016900,
+       0x00000185,
+       0x00000000,
+       0xc0016900,
+       0x000001b3,
+       0x00000001,
+       0xc0016900,
+       0x000001b4,
+       0x00000000,
+       0xc0016900,
+       0x00000191,
+       0x00000b00,
+       0xc0016900,
+       0x000001b5,
+       0x00000000,
+};
+
+/* same for r6xx/r7xx */
+const u32 r6xx_vs[] =
+{
+       0x00000004,
+       0x81000000,
+       0x0000203c,
+       0x94000b08,
+       0x00004000,
+       0x14200b1a,
+       0x00000000,
+       0x00000000,
+       0x3c000000,
+       0x68cd1000,
+       0x00080000,
+       0x00000000,
+};
+
+const u32 r6xx_ps[] =
+{
+       0x00000002,
+       0x80800000,
+       0x00000000,
+       0x94200688,
+       0x00000010,
+       0x000d1000,
+       0xb0800000,
+       0x00000000,
+};
+
+const u32 r6xx_ps_size = ARRAY_SIZE(r6xx_ps);
+const u32 r6xx_vs_size = ARRAY_SIZE(r6xx_vs);
+const u32 r6xx_default_size = ARRAY_SIZE(r6xx_default_state);
+const u32 r7xx_default_size = ARRAY_SIZE(r7xx_default_state);
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.h b/drivers/gpu/drm/radeon/r600_blit_shaders.h
new file mode 100644 (file)
index 0000000..fdc3b37
--- /dev/null
@@ -0,0 +1,14 @@
+
+#ifndef R600_BLIT_SHADERS_H
+#define R600_BLIT_SHADERS_H
+
+extern const u32 r6xx_ps[];
+extern const u32 r6xx_vs[];
+extern const u32 r7xx_default_state[];
+extern const u32 r6xx_default_state[];
+
+
+extern const u32 r6xx_ps_size, r6xx_vs_size;
+extern const u32 r6xx_default_size, r7xx_default_size;
+
+#endif
index 20f1790..6d5a711 100644 (file)
 #include "radeon_drm.h"
 #include "radeon_drv.h"
 
-#include "r600_microcode.h"
+#define PFP_UCODE_SIZE 576
+#define PM4_UCODE_SIZE 1792
+#define R700_PFP_UCODE_SIZE 848
+#define R700_PM4_UCODE_SIZE 1360
+
+/* Firmware Names */
+MODULE_FIRMWARE("radeon/R600_pfp.bin");
+MODULE_FIRMWARE("radeon/R600_me.bin");
+MODULE_FIRMWARE("radeon/RV610_pfp.bin");
+MODULE_FIRMWARE("radeon/RV610_me.bin");
+MODULE_FIRMWARE("radeon/RV630_pfp.bin");
+MODULE_FIRMWARE("radeon/RV630_me.bin");
+MODULE_FIRMWARE("radeon/RV620_pfp.bin");
+MODULE_FIRMWARE("radeon/RV620_me.bin");
+MODULE_FIRMWARE("radeon/RV635_pfp.bin");
+MODULE_FIRMWARE("radeon/RV635_me.bin");
+MODULE_FIRMWARE("radeon/RV670_pfp.bin");
+MODULE_FIRMWARE("radeon/RV670_me.bin");
+MODULE_FIRMWARE("radeon/RS780_pfp.bin");
+MODULE_FIRMWARE("radeon/RS780_me.bin");
+MODULE_FIRMWARE("radeon/RV770_pfp.bin");
+MODULE_FIRMWARE("radeon/RV770_me.bin");
+MODULE_FIRMWARE("radeon/RV730_pfp.bin");
+MODULE_FIRMWARE("radeon/RV730_me.bin");
+MODULE_FIRMWARE("radeon/RV710_pfp.bin");
+MODULE_FIRMWARE("radeon/RV710_me.bin");
+
+
+int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp,
+                       unsigned family, u32 *ib, int *l);
+void r600_cs_legacy_init(void);
+
 
 # define ATI_PCIGART_PAGE_SIZE         4096    /**< PCI GART page size */
 # define ATI_PCIGART_PAGE_MASK         (~(ATI_PCIGART_PAGE_SIZE-1))
@@ -275,11 +306,93 @@ static void r600_vm_init(struct drm_device *dev)
        r600_vm_flush_gart_range(dev);
 }
 
-/* load r600 microcode */
+static int r600_cp_init_microcode(drm_radeon_private_t *dev_priv)
+{
+       struct platform_device *pdev;
+       const char *chip_name;
+       size_t pfp_req_size, me_req_size;
+       char fw_name[30];
+       int err;
+
+       pdev = platform_device_register_simple("r600_cp", 0, NULL, 0);
+       err = IS_ERR(pdev);
+       if (err) {
+               printk(KERN_ERR "r600_cp: Failed to register firmware\n");
+               return -EINVAL;
+       }
+
+       switch (dev_priv->flags & RADEON_FAMILY_MASK) {
+       case CHIP_R600:  chip_name = "R600";  break;
+       case CHIP_RV610: chip_name = "RV610"; break;
+       case CHIP_RV630: chip_name = "RV630"; break;
+       case CHIP_RV620: chip_name = "RV620"; break;
+       case CHIP_RV635: chip_name = "RV635"; break;
+       case CHIP_RV670: chip_name = "RV670"; break;
+       case CHIP_RS780:
+       case CHIP_RS880: chip_name = "RS780"; break;
+       case CHIP_RV770: chip_name = "RV770"; break;
+       case CHIP_RV730:
+       case CHIP_RV740: chip_name = "RV730"; break;
+       case CHIP_RV710: chip_name = "RV710"; break;
+       default:         BUG();
+       }
+
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770) {
+               pfp_req_size = R700_PFP_UCODE_SIZE * 4;
+               me_req_size = R700_PM4_UCODE_SIZE * 4;
+       } else {
+               pfp_req_size = PFP_UCODE_SIZE * 4;
+               me_req_size = PM4_UCODE_SIZE * 12;
+       }
+
+       DRM_INFO("Loading %s CP Microcode\n", chip_name);
+
+       snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name);
+       err = request_firmware(&dev_priv->pfp_fw, fw_name, &pdev->dev);
+       if (err)
+               goto out;
+       if (dev_priv->pfp_fw->size != pfp_req_size) {
+               printk(KERN_ERR
+                      "r600_cp: Bogus length %zu in firmware \"%s\"\n",
+                      dev_priv->pfp_fw->size, fw_name);
+               err = -EINVAL;
+               goto out;
+       }
+
+       snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", chip_name);
+       err = request_firmware(&dev_priv->me_fw, fw_name, &pdev->dev);
+       if (err)
+               goto out;
+       if (dev_priv->me_fw->size != me_req_size) {
+               printk(KERN_ERR
+                      "r600_cp: Bogus length %zu in firmware \"%s\"\n",
+                      dev_priv->me_fw->size, fw_name);
+               err = -EINVAL;
+       }
+out:
+       platform_device_unregister(pdev);
+
+       if (err) {
+               if (err != -EINVAL)
+                       printk(KERN_ERR
+                              "r600_cp: Failed to load firmware \"%s\"\n",
+                              fw_name);
+               release_firmware(dev_priv->pfp_fw);
+               dev_priv->pfp_fw = NULL;
+               release_firmware(dev_priv->me_fw);
+               dev_priv->me_fw = NULL;
+       }
+       return err;
+}
+
 static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
 {
+       const __be32 *fw_data;
        int i;
 
+       if (!dev_priv->me_fw || !dev_priv->pfp_fw)
+               return;
+
        r600_do_cp_stop(dev_priv);
 
        RADEON_WRITE(R600_CP_RB_CNTL,
@@ -292,115 +405,18 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
        DRM_UDELAY(15000);
        RADEON_WRITE(R600_GRBM_SOFT_RESET, 0);
 
+       fw_data = (const __be32 *)dev_priv->me_fw->data;
        RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+       for (i = 0; i < PM4_UCODE_SIZE * 3; i++)
+               RADEON_WRITE(R600_CP_ME_RAM_DATA,
+                            be32_to_cpup(fw_data++));
 
-       if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R600)) {
-               DRM_INFO("Loading R600 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    R600_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    R600_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    R600_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading R600 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, R600_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610)) {
-               DRM_INFO("Loading RV610 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV610_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV610_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV610_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV610 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV610_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV630)) {
-               DRM_INFO("Loading RV630 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV630_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV630_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV630_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV630 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV630_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620)) {
-               DRM_INFO("Loading RV620 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV620_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV620_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV620_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV620 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV620_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV635)) {
-               DRM_INFO("Loading RV635 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV635_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV635_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV635_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV635 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV635_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV670)) {
-               DRM_INFO("Loading RV670 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV670_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV670_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RV670_cp_microcode[i][2]);
-               }
-
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV670 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]);
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
-                  ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
-               DRM_INFO("Loading RS780/RS880 CP Microcode\n");
-               for (i = 0; i < PM4_UCODE_SIZE; i++) {
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RS780_cp_microcode[i][0]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RS780_cp_microcode[i][1]);
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA,
-                                    RS780_cp_microcode[i][2]);
-               }
+       fw_data = (const __be32 *)dev_priv->pfp_fw->data;
+       RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+       for (i = 0; i < PFP_UCODE_SIZE; i++)
+               RADEON_WRITE(R600_CP_PFP_UCODE_DATA,
+                            be32_to_cpup(fw_data++));
 
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RS780/RS880 PFP Microcode\n");
-               for (i = 0; i < PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]);
-       }
        RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
        RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
        RADEON_WRITE(R600_CP_ME_RAM_RADDR, 0);
@@ -459,11 +475,14 @@ static void r700_vm_init(struct drm_device *dev)
        r600_vm_flush_gart_range(dev);
 }
 
-/* load r600 microcode */
 static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv)
 {
+       const __be32 *fw_data;
        int i;
 
+       if (!dev_priv->me_fw || !dev_priv->pfp_fw)
+               return;
+
        r600_do_cp_stop(dev_priv);
 
        RADEON_WRITE(R600_CP_RB_CNTL,
@@ -476,48 +495,18 @@ static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv)
        DRM_UDELAY(15000);
        RADEON_WRITE(R600_GRBM_SOFT_RESET, 0);
 
+       fw_data = (const __be32 *)dev_priv->pfp_fw->data;
+       RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+       for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
+               RADEON_WRITE(R600_CP_PFP_UCODE_DATA, be32_to_cpup(fw_data++));
+       RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
 
-       if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV770)) {
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV770/RV790 PFP Microcode\n");
-               for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV770_pfp_microcode[i]);
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-               DRM_INFO("Loading RV770/RV790 CP Microcode\n");
-               for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA, RV770_cp_microcode[i]);
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV730) ||
-                  ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV740)) {
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV730/RV740 PFP Microcode\n");
-               for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV730_pfp_microcode[i]);
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-               DRM_INFO("Loading RV730/RV740 CP Microcode\n");
-               for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA, RV730_cp_microcode[i]);
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-
-       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV710)) {
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-               DRM_INFO("Loading RV710 PFP Microcode\n");
-               for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV710_pfp_microcode[i]);
-               RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-               DRM_INFO("Loading RV710 CP Microcode\n");
-               for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
-                       RADEON_WRITE(R600_CP_ME_RAM_DATA, RV710_cp_microcode[i]);
-               RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+       fw_data = (const __be32 *)dev_priv->me_fw->data;
+       RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+       for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
+               RADEON_WRITE(R600_CP_ME_RAM_DATA, be32_to_cpup(fw_data++));
+       RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
 
-       }
        RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
        RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
        RADEON_WRITE(R600_CP_ME_RAM_RADDR, 0);
@@ -1874,6 +1863,8 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
 
        DRM_DEBUG("\n");
 
+       mutex_init(&dev_priv->cs_mutex);
+       r600_cs_legacy_init();
        /* if we require new memory map but we don't have it fail */
        if ((dev_priv->flags & RADEON_NEW_MEMMAP) && !dev_priv->new_memmap) {
                DRM_ERROR("Cannot initialise DRM on this card\nThis card requires a new X.org DDX for 3D\n");
@@ -1905,7 +1896,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
        /* Enable vblank on CRTC1 for older X servers
         */
        dev_priv->vblank_crtc = DRM_RADEON_VBLANK_CRTC1;
-
+       dev_priv->do_boxes = 0;
        dev_priv->cp_mode = init->cp_mode;
 
        /* We don't support anything other than bus-mastering ring mode,
@@ -1991,11 +1982,11 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
        } else
 #endif
        {
-               dev_priv->cp_ring->handle = (void *)dev_priv->cp_ring->offset;
+               dev_priv->cp_ring->handle = (void *)(unsigned long)dev_priv->cp_ring->offset;
                dev_priv->ring_rptr->handle =
-                   (void *)dev_priv->ring_rptr->offset;
+                       (void *)(unsigned long)dev_priv->ring_rptr->offset;
                dev->agp_buffer_map->handle =
-                   (void *)dev->agp_buffer_map->offset;
+                       (void *)(unsigned long)dev->agp_buffer_map->offset;
 
                DRM_DEBUG("dev_priv->cp_ring->handle %p\n",
                          dev_priv->cp_ring->handle);
@@ -2147,6 +2138,14 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
                        r600_vm_init(dev);
        }
 
+       if (!dev_priv->me_fw || !dev_priv->pfp_fw) {
+               int err = r600_cp_init_microcode(dev_priv);
+               if (err) {
+                       DRM_ERROR("Failed to load firmware!\n");
+                       r600_do_cleanup_cp(dev);
+                       return err;
+               }
+       }
        if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770))
                r700_cp_load_microcode(dev_priv);
        else
@@ -2291,3 +2290,239 @@ int r600_cp_dispatch_indirect(struct drm_device *dev,
 
        return 0;
 }
+
+void r600_cp_dispatch_swap(struct drm_device *dev, struct drm_file *file_priv)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       struct drm_master *master = file_priv->master;
+       struct drm_radeon_master_private *master_priv = master->driver_priv;
+       drm_radeon_sarea_t *sarea_priv = master_priv->sarea_priv;
+       int nbox = sarea_priv->nbox;
+       struct drm_clip_rect *pbox = sarea_priv->boxes;
+       int i, cpp, src_pitch, dst_pitch;
+       uint64_t src, dst;
+       RING_LOCALS;
+       DRM_DEBUG("\n");
+
+       if (dev_priv->color_fmt == RADEON_COLOR_FORMAT_ARGB8888)
+               cpp = 4;
+       else
+               cpp = 2;
+
+       if (sarea_priv->pfCurrentPage == 0) {
+               src_pitch = dev_priv->back_pitch;
+               dst_pitch = dev_priv->front_pitch;
+               src = dev_priv->back_offset + dev_priv->fb_location;
+               dst = dev_priv->front_offset + dev_priv->fb_location;
+       } else {
+               src_pitch = dev_priv->front_pitch;
+               dst_pitch = dev_priv->back_pitch;
+               src = dev_priv->front_offset + dev_priv->fb_location;
+               dst = dev_priv->back_offset + dev_priv->fb_location;
+       }
+
+       if (r600_prepare_blit_copy(dev, file_priv)) {
+               DRM_ERROR("unable to allocate vertex buffer for swap buffer\n");
+               return;
+       }
+       for (i = 0; i < nbox; i++) {
+               int x = pbox[i].x1;
+               int y = pbox[i].y1;
+               int w = pbox[i].x2 - x;
+               int h = pbox[i].y2 - y;
+
+               DRM_DEBUG("%d,%d-%d,%d\n", x, y, w, h);
+
+               r600_blit_swap(dev,
+                              src, dst,
+                              x, y, x, y, w, h,
+                              src_pitch, dst_pitch, cpp);
+       }
+       r600_done_blit_copy(dev);
+
+       /* Increment the frame counter.  The client-side 3D driver must
+        * throttle the framerate by waiting for this value before
+        * performing the swapbuffer ioctl.
+        */
+       sarea_priv->last_frame++;
+
+       BEGIN_RING(3);
+       R600_FRAME_AGE(sarea_priv->last_frame);
+       ADVANCE_RING();
+}
+
+int r600_cp_dispatch_texture(struct drm_device *dev,
+                            struct drm_file *file_priv,
+                            drm_radeon_texture_t *tex,
+                            drm_radeon_tex_image_t *image)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       struct drm_buf *buf;
+       u32 *buffer;
+       const u8 __user *data;
+       int size, pass_size;
+       u64 src_offset, dst_offset;
+
+       if (!radeon_check_offset(dev_priv, tex->offset)) {
+               DRM_ERROR("Invalid destination offset\n");
+               return -EINVAL;
+       }
+
+       /* this might fail for zero-sized uploads - are those illegal? */
+       if (!radeon_check_offset(dev_priv, tex->offset + tex->height * tex->pitch - 1)) {
+               DRM_ERROR("Invalid final destination offset\n");
+               return -EINVAL;
+       }
+
+       size = tex->height * tex->pitch;
+
+       if (size == 0)
+               return 0;
+
+       dst_offset = tex->offset;
+
+       if (r600_prepare_blit_copy(dev, file_priv)) {
+               DRM_ERROR("unable to allocate vertex buffer for swap buffer\n");
+               return -EAGAIN;
+       }
+       do {
+               data = (const u8 __user *)image->data;
+               pass_size = size;
+
+               buf = radeon_freelist_get(dev);
+               if (!buf) {
+                       DRM_DEBUG("EAGAIN\n");
+                       if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
+                               return -EFAULT;
+                       return -EAGAIN;
+               }
+
+               if (pass_size > buf->total)
+                       pass_size = buf->total;
+
+               /* Dispatch the indirect buffer.
+                */
+               buffer =
+                   (u32 *) ((char *)dev->agp_buffer_map->handle + buf->offset);
+
+               if (DRM_COPY_FROM_USER(buffer, data, pass_size)) {
+                       DRM_ERROR("EFAULT on pad, %d bytes\n", pass_size);
+                       return -EFAULT;
+               }
+
+               buf->file_priv = file_priv;
+               buf->used = pass_size;
+               src_offset = dev_priv->gart_buffers_offset + buf->offset;
+
+               r600_blit_copy(dev, src_offset, dst_offset, pass_size);
+
+               radeon_cp_discard_buffer(dev, file_priv->master, buf);
+
+               /* Update the input parameters for next time */
+               image->data = (const u8 __user *)image->data + pass_size;
+               dst_offset += pass_size;
+               size -= pass_size;
+       } while (size > 0);
+       r600_done_blit_copy(dev);
+
+       return 0;
+}
+
+/*
+ * Legacy cs ioctl
+ */
+static u32 radeon_cs_id_get(struct drm_radeon_private *radeon)
+{
+       /* FIXME: check if wrap affect last reported wrap & sequence */
+       radeon->cs_id_scnt = (radeon->cs_id_scnt + 1) & 0x00FFFFFF;
+       if (!radeon->cs_id_scnt) {
+               /* increment wrap counter */
+               radeon->cs_id_wcnt += 0x01000000;
+               /* valid sequence counter start at 1 */
+               radeon->cs_id_scnt = 1;
+       }
+       return (radeon->cs_id_scnt | radeon->cs_id_wcnt);
+}
+
+static void r600_cs_id_emit(drm_radeon_private_t *dev_priv, u32 *id)
+{
+       RING_LOCALS;
+
+       *id = radeon_cs_id_get(dev_priv);
+
+       /* SCRATCH 2 */
+       BEGIN_RING(3);
+       R600_CLEAR_AGE(*id);
+       ADVANCE_RING();
+       COMMIT_RING();
+}
+
+static int r600_ib_get(struct drm_device *dev,
+                       struct drm_file *fpriv,
+                       struct drm_buf **buffer)
+{
+       struct drm_buf *buf;
+
+       *buffer = NULL;
+       buf = radeon_freelist_get(dev);
+       if (!buf) {
+               return -EBUSY;
+       }
+       buf->file_priv = fpriv;
+       *buffer = buf;
+       return 0;
+}
+
+static void r600_ib_free(struct drm_device *dev, struct drm_buf *buf,
+                       struct drm_file *fpriv, int l, int r)
+{
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+
+       if (buf) {
+               if (!r)
+                       r600_cp_dispatch_indirect(dev, buf, 0, l * 4);
+               radeon_cp_discard_buffer(dev, fpriv->master, buf);
+               COMMIT_RING();
+       }
+}
+
+int r600_cs_legacy_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv)
+{
+       struct drm_radeon_private *dev_priv = dev->dev_private;
+       struct drm_radeon_cs *cs = data;
+       struct drm_buf *buf;
+       unsigned family;
+       int l, r = 0;
+       u32 *ib, cs_id = 0;
+
+       if (dev_priv == NULL) {
+               DRM_ERROR("called with no initialization\n");
+               return -EINVAL;
+       }
+       family = dev_priv->flags & RADEON_FAMILY_MASK;
+       if (family < CHIP_R600) {
+               DRM_ERROR("cs ioctl valid only for R6XX & R7XX in legacy mode\n");
+               return -EINVAL;
+       }
+       mutex_lock(&dev_priv->cs_mutex);
+       /* get ib */
+       r = r600_ib_get(dev, fpriv, &buf);
+       if (r) {
+               DRM_ERROR("ib_get failed\n");
+               goto out;
+       }
+       ib = dev->agp_buffer_map->handle + buf->offset;
+       /* now parse command stream */
+       r = r600_cs_legacy(dev, data,  fpriv, family, ib, &l);
+       if (r) {
+               goto out;
+       }
+
+out:
+       r600_ib_free(dev, buf, fpriv, l, r);
+       /* emit cs id sequence */
+       r600_cs_id_emit(dev_priv, &cs_id);
+       cs->cs_id = cs_id;
+       mutex_unlock(&dev_priv->cs_mutex);
+       return r;
+}
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
new file mode 100644 (file)
index 0000000..33b89cd
--- /dev/null
@@ -0,0 +1,657 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#include "drmP.h"
+#include "radeon.h"
+#include "r600d.h"
+#include "avivod.h"
+
+static int r600_cs_packet_next_reloc_mm(struct radeon_cs_parser *p,
+                                       struct radeon_cs_reloc **cs_reloc);
+static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,
+                                       struct radeon_cs_reloc **cs_reloc);
+typedef int (*next_reloc_t)(struct radeon_cs_parser*, struct radeon_cs_reloc**);
+static next_reloc_t r600_cs_packet_next_reloc = &r600_cs_packet_next_reloc_mm;
+
+/**
+ * r600_cs_packet_parse() - parse cp packet and point ib index to next packet
+ * @parser:    parser structure holding parsing context.
+ * @pkt:       where to store packet informations
+ *
+ * Assume that chunk_ib_index is properly set. Will return -EINVAL
+ * if packet is bigger than remaining ib size. or if packets is unknown.
+ **/
+int r600_cs_packet_parse(struct radeon_cs_parser *p,
+                       struct radeon_cs_packet *pkt,
+                       unsigned idx)
+{
+       struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx];
+       uint32_t header;
+
+       if (idx >= ib_chunk->length_dw) {
+               DRM_ERROR("Can not parse packet at %d after CS end %d !\n",
+                         idx, ib_chunk->length_dw);
+               return -EINVAL;
+       }
+       header = ib_chunk->kdata[idx];
+       pkt->idx = idx;
+       pkt->type = CP_PACKET_GET_TYPE(header);
+       pkt->count = CP_PACKET_GET_COUNT(header);
+       pkt->one_reg_wr = 0;
+       switch (pkt->type) {
+       case PACKET_TYPE0:
+               pkt->reg = CP_PACKET0_GET_REG(header);
+               break;
+       case PACKET_TYPE3:
+               pkt->opcode = CP_PACKET3_GET_OPCODE(header);
+               break;
+       case PACKET_TYPE2:
+               pkt->count = -1;
+               break;
+       default:
+               DRM_ERROR("Unknown packet type %d at %d !\n", pkt->type, idx);
+               return -EINVAL;
+       }
+       if ((pkt->count + 1 + pkt->idx) >= ib_chunk->length_dw) {
+               DRM_ERROR("Packet (%d:%d:%d) end after CS buffer (%d) !\n",
+                         pkt->idx, pkt->type, pkt->count, ib_chunk->length_dw);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+/**
+ * r600_cs_packet_next_reloc_mm() - parse next packet which should be reloc packet3
+ * @parser:            parser structure holding parsing context.
+ * @data:              pointer to relocation data
+ * @offset_start:      starting offset
+ * @offset_mask:       offset mask (to align start offset on)
+ * @reloc:             reloc informations
+ *
+ * Check next packet is relocation packet3, do bo validation and compute
+ * GPU offset using the provided start.
+ **/
+static int r600_cs_packet_next_reloc_mm(struct radeon_cs_parser *p,
+                                       struct radeon_cs_reloc **cs_reloc)
+{
+       struct radeon_cs_chunk *ib_chunk;
+       struct radeon_cs_chunk *relocs_chunk;
+       struct radeon_cs_packet p3reloc;
+       unsigned idx;
+       int r;
+
+       if (p->chunk_relocs_idx == -1) {
+               DRM_ERROR("No relocation chunk !\n");
+               return -EINVAL;
+       }
+       *cs_reloc = NULL;
+       ib_chunk = &p->chunks[p->chunk_ib_idx];
+       relocs_chunk = &p->chunks[p->chunk_relocs_idx];
+       r = r600_cs_packet_parse(p, &p3reloc, p->idx);
+       if (r) {
+               return r;
+       }
+       p->idx += p3reloc.count + 2;
+       if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) {
+               DRM_ERROR("No packet3 for relocation for packet at %d.\n",
+                         p3reloc.idx);
+               return -EINVAL;
+       }
+       idx = ib_chunk->kdata[p3reloc.idx + 1];
+       if (idx >= relocs_chunk->length_dw) {
+               DRM_ERROR("Relocs at %d after relocations chunk end %d !\n",
+                         idx, relocs_chunk->length_dw);
+               return -EINVAL;
+       }
+       /* FIXME: we assume reloc size is 4 dwords */
+       *cs_reloc = p->relocs_ptr[(idx / 4)];
+       return 0;
+}
+
+/**
+ * r600_cs_packet_next_reloc_nomm() - parse next packet which should be reloc packet3
+ * @parser:            parser structure holding parsing context.
+ * @data:              pointer to relocation data
+ * @offset_start:      starting offset
+ * @offset_mask:       offset mask (to align start offset on)
+ * @reloc:             reloc informations
+ *
+ * Check next packet is relocation packet3, do bo validation and compute
+ * GPU offset using the provided start.
+ **/
+static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,
+                                       struct radeon_cs_reloc **cs_reloc)
+{
+       struct radeon_cs_chunk *ib_chunk;
+       struct radeon_cs_chunk *relocs_chunk;
+       struct radeon_cs_packet p3reloc;
+       unsigned idx;
+       int r;
+
+       if (p->chunk_relocs_idx == -1) {
+               DRM_ERROR("No relocation chunk !\n");
+               return -EINVAL;
+       }
+       *cs_reloc = NULL;
+       ib_chunk = &p->chunks[p->chunk_ib_idx];
+       relocs_chunk = &p->chunks[p->chunk_relocs_idx];
+       r = r600_cs_packet_parse(p, &p3reloc, p->idx);
+       if (r) {
+               return r;
+       }
+       p->idx += p3reloc.count + 2;
+       if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) {
+               DRM_ERROR("No packet3 for relocation for packet at %d.\n",
+                         p3reloc.idx);
+               return -EINVAL;
+       }
+       idx = ib_chunk->kdata[p3reloc.idx + 1];
+       if (idx >= relocs_chunk->length_dw) {
+               DRM_ERROR("Relocs at %d after relocations chunk end %d !\n",
+                         idx, relocs_chunk->length_dw);
+               return -EINVAL;
+       }
+       *cs_reloc = &p->relocs[0];
+       (*cs_reloc)->lobj.gpu_offset = (u64)relocs_chunk->kdata[idx + 3] << 32;
+       (*cs_reloc)->lobj.gpu_offset |= relocs_chunk->kdata[idx + 0];
+       return 0;
+}
+
+static int r600_packet0_check(struct radeon_cs_parser *p,
+                               struct radeon_cs_packet *pkt,
+                               unsigned idx, unsigned reg)
+{
+       switch (reg) {
+       case AVIVO_D1MODE_VLINE_START_END:
+       case AVIVO_D2MODE_VLINE_START_END:
+               break;
+       default:
+               printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n",
+                      reg, idx);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int r600_cs_parse_packet0(struct radeon_cs_parser *p,
+                               struct radeon_cs_packet *pkt)
+{
+       unsigned reg, i;
+       unsigned idx;
+       int r;
+
+       idx = pkt->idx + 1;
+       reg = pkt->reg;
+       for (i = 0; i <= pkt->count; i++, idx++, reg += 4) {
+               r = r600_packet0_check(p, pkt, idx, reg);
+               if (r) {
+                       return r;
+               }
+       }
+       return 0;
+}
+
+static int r600_packet3_check(struct radeon_cs_parser *p,
+                               struct radeon_cs_packet *pkt)
+{
+       struct radeon_cs_chunk *ib_chunk;
+       struct radeon_cs_reloc *reloc;
+       volatile u32 *ib;
+       unsigned idx;
+       unsigned i;
+       unsigned start_reg, end_reg, reg;
+       int r;
+
+       ib = p->ib->ptr;
+       ib_chunk = &p->chunks[p->chunk_ib_idx];
+       idx = pkt->idx + 1;
+       switch (pkt->opcode) {
+       case PACKET3_START_3D_CMDBUF:
+               if (p->family >= CHIP_RV770 || pkt->count) {
+                       DRM_ERROR("bad START_3D\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_CONTEXT_CONTROL:
+               if (pkt->count != 1) {
+                       DRM_ERROR("bad CONTEXT_CONTROL\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_INDEX_TYPE:
+       case PACKET3_NUM_INSTANCES:
+               if (pkt->count) {
+                       DRM_ERROR("bad INDEX_TYPE/NUM_INSTANCES\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_DRAW_INDEX:
+               if (pkt->count != 3) {
+                       DRM_ERROR("bad DRAW_INDEX\n");
+                       return -EINVAL;
+               }
+               r = r600_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("bad DRAW_INDEX\n");
+                       return -EINVAL;
+               }
+               ib[idx+0] += (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+               ib[idx+1] = upper_32_bits(reloc->lobj.gpu_offset) & 0xff;
+               break;
+       case PACKET3_DRAW_INDEX_AUTO:
+               if (pkt->count != 1) {
+                       DRM_ERROR("bad DRAW_INDEX_AUTO\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_DRAW_INDEX_IMMD_BE:
+       case PACKET3_DRAW_INDEX_IMMD:
+               if (pkt->count < 2) {
+                       DRM_ERROR("bad DRAW_INDEX_IMMD\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_WAIT_REG_MEM:
+               if (pkt->count != 5) {
+                       DRM_ERROR("bad WAIT_REG_MEM\n");
+                       return -EINVAL;
+               }
+               /* bit 4 is reg (0) or mem (1) */
+               if (ib_chunk->kdata[idx+0] & 0x10) {
+                       r = r600_cs_packet_next_reloc(p, &reloc);
+                       if (r) {
+                               DRM_ERROR("bad WAIT_REG_MEM\n");
+                               return -EINVAL;
+                       }
+                       ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+                       ib[idx+2] = upper_32_bits(reloc->lobj.gpu_offset) & 0xff;
+               }
+               break;
+       case PACKET3_SURFACE_SYNC:
+               if (pkt->count != 3) {
+                       DRM_ERROR("bad SURFACE_SYNC\n");
+                       return -EINVAL;
+               }
+               /* 0xffffffff/0x0 is flush all cache flag */
+               if (ib_chunk->kdata[idx+1] != 0xffffffff ||
+                   ib_chunk->kdata[idx+2] != 0) {
+                       r = r600_cs_packet_next_reloc(p, &reloc);
+                       if (r) {
+                               DRM_ERROR("bad SURFACE_SYNC\n");
+                               return -EINVAL;
+                       }
+                       ib[idx+2] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+               }
+               break;
+       case PACKET3_EVENT_WRITE:
+               if (pkt->count != 2 && pkt->count != 0) {
+                       DRM_ERROR("bad EVENT_WRITE\n");
+                       return -EINVAL;
+               }
+               if (pkt->count) {
+                       r = r600_cs_packet_next_reloc(p, &reloc);
+                       if (r) {
+                               DRM_ERROR("bad EVENT_WRITE\n");
+                               return -EINVAL;
+                       }
+                       ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+                       ib[idx+2] |= upper_32_bits(reloc->lobj.gpu_offset) & 0xff;
+               }
+               break;
+       case PACKET3_EVENT_WRITE_EOP:
+               if (pkt->count != 4) {
+                       DRM_ERROR("bad EVENT_WRITE_EOP\n");
+                       return -EINVAL;
+               }
+               r = r600_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("bad EVENT_WRITE\n");
+                       return -EINVAL;
+               }
+               ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+               ib[idx+2] |= upper_32_bits(reloc->lobj.gpu_offset) & 0xff;
+               break;
+       case PACKET3_SET_CONFIG_REG:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_CONFIG_REG_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_CONFIG_REG_OFFSET) ||
+                   (start_reg >= PACKET3_SET_CONFIG_REG_END) ||
+                   (end_reg >= PACKET3_SET_CONFIG_REG_END)) {
+                       DRM_ERROR("bad PACKET3_SET_CONFIG_REG\n");
+                       return -EINVAL;
+               }
+               for (i = 0; i < pkt->count; i++) {
+                       reg = start_reg + (4 * i);
+                       switch (reg) {
+                       case CP_COHER_BASE:
+                               /* use PACKET3_SURFACE_SYNC */
+                               return -EINVAL;
+                       default:
+                               break;
+                       }
+               }
+               break;
+       case PACKET3_SET_CONTEXT_REG:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_CONTEXT_REG_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_CONTEXT_REG_OFFSET) ||
+                   (start_reg >= PACKET3_SET_CONTEXT_REG_END) ||
+                   (end_reg >= PACKET3_SET_CONTEXT_REG_END)) {
+                       DRM_ERROR("bad PACKET3_SET_CONTEXT_REG\n");
+                       return -EINVAL;
+               }
+               for (i = 0; i < pkt->count; i++) {
+                       reg = start_reg + (4 * i);
+                       switch (reg) {
+                       case DB_DEPTH_BASE:
+                       case CB_COLOR0_BASE:
+                       case CB_COLOR1_BASE:
+                       case CB_COLOR2_BASE:
+                       case CB_COLOR3_BASE:
+                       case CB_COLOR4_BASE:
+                       case CB_COLOR5_BASE:
+                       case CB_COLOR6_BASE:
+                       case CB_COLOR7_BASE:
+                       case SQ_PGM_START_FS:
+                       case SQ_PGM_START_ES:
+                       case SQ_PGM_START_VS:
+                       case SQ_PGM_START_GS:
+                       case SQ_PGM_START_PS:
+                               r = r600_cs_packet_next_reloc(p, &reloc);
+                               if (r) {
+                                       DRM_ERROR("bad SET_CONTEXT_REG "
+                                                       "0x%04X\n", reg);
+                                       return -EINVAL;
+                               }
+                               ib[idx+1+i] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                               break;
+                       case VGT_DMA_BASE:
+                       case VGT_DMA_BASE_HI:
+                               /* These should be handled by DRAW_INDEX packet 3 */
+                       case VGT_STRMOUT_BASE_OFFSET_0:
+                       case VGT_STRMOUT_BASE_OFFSET_1:
+                       case VGT_STRMOUT_BASE_OFFSET_2:
+                       case VGT_STRMOUT_BASE_OFFSET_3:
+                       case VGT_STRMOUT_BASE_OFFSET_HI_0:
+                       case VGT_STRMOUT_BASE_OFFSET_HI_1:
+                       case VGT_STRMOUT_BASE_OFFSET_HI_2:
+                       case VGT_STRMOUT_BASE_OFFSET_HI_3:
+                       case VGT_STRMOUT_BUFFER_BASE_0:
+                       case VGT_STRMOUT_BUFFER_BASE_1:
+                       case VGT_STRMOUT_BUFFER_BASE_2:
+                       case VGT_STRMOUT_BUFFER_BASE_3:
+                       case VGT_STRMOUT_BUFFER_OFFSET_0:
+                       case VGT_STRMOUT_BUFFER_OFFSET_1:
+                       case VGT_STRMOUT_BUFFER_OFFSET_2:
+                       case VGT_STRMOUT_BUFFER_OFFSET_3:
+                               /* These should be handled by STRMOUT_BUFFER packet 3 */
+                               DRM_ERROR("bad context reg: 0x%08x\n", reg);
+                               return -EINVAL;
+                       default:
+                               break;
+                       }
+               }
+               break;
+       case PACKET3_SET_RESOURCE:
+               if (pkt->count % 7) {
+                       DRM_ERROR("bad SET_RESOURCE\n");
+                       return -EINVAL;
+               }
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_RESOURCE_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_RESOURCE_OFFSET) ||
+                   (start_reg >= PACKET3_SET_RESOURCE_END) ||
+                   (end_reg >= PACKET3_SET_RESOURCE_END)) {
+                       DRM_ERROR("bad SET_RESOURCE\n");
+                       return -EINVAL;
+               }
+               for (i = 0; i < (pkt->count / 7); i++) {
+                       switch (G__SQ_VTX_CONSTANT_TYPE(ib[idx+(i*7)+6+1])) {
+                       case SQ_TEX_VTX_VALID_TEXTURE:
+                               /* tex base */
+                               r = r600_cs_packet_next_reloc(p, &reloc);
+                               if (r) {
+                                       DRM_ERROR("bad SET_RESOURCE\n");
+                                       return -EINVAL;
+                               }
+                               ib[idx+1+(i*7)+2] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                               /* tex mip base */
+                               r = r600_cs_packet_next_reloc(p, &reloc);
+                               if (r) {
+                                       DRM_ERROR("bad SET_RESOURCE\n");
+                                       return -EINVAL;
+                               }
+                               ib[idx+1+(i*7)+3] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                               break;
+                       case SQ_TEX_VTX_VALID_BUFFER:
+                               /* vtx base */
+                               r = r600_cs_packet_next_reloc(p, &reloc);
+                               if (r) {
+                                       DRM_ERROR("bad SET_RESOURCE\n");
+                                       return -EINVAL;
+                               }
+                               ib[idx+1+(i*7)+0] += (u32)((reloc->lobj.gpu_offset) & 0xffffffff);
+                               ib[idx+1+(i*7)+2] |= upper_32_bits(reloc->lobj.gpu_offset) & 0xff;
+                               break;
+                       case SQ_TEX_VTX_INVALID_TEXTURE:
+                       case SQ_TEX_VTX_INVALID_BUFFER:
+                       default:
+                               DRM_ERROR("bad SET_RESOURCE\n");
+                               return -EINVAL;
+                       }
+               }
+               break;
+       case PACKET3_SET_ALU_CONST:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_ALU_CONST_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_ALU_CONST_OFFSET) ||
+                   (start_reg >= PACKET3_SET_ALU_CONST_END) ||
+                   (end_reg >= PACKET3_SET_ALU_CONST_END)) {
+                       DRM_ERROR("bad SET_ALU_CONST\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_SET_BOOL_CONST:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_BOOL_CONST_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_BOOL_CONST_OFFSET) ||
+                   (start_reg >= PACKET3_SET_BOOL_CONST_END) ||
+                   (end_reg >= PACKET3_SET_BOOL_CONST_END)) {
+                       DRM_ERROR("bad SET_BOOL_CONST\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_SET_LOOP_CONST:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_LOOP_CONST_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_LOOP_CONST_OFFSET) ||
+                   (start_reg >= PACKET3_SET_LOOP_CONST_END) ||
+                   (end_reg >= PACKET3_SET_LOOP_CONST_END)) {
+                       DRM_ERROR("bad SET_LOOP_CONST\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_SET_CTL_CONST:
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_CTL_CONST_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_CTL_CONST_OFFSET) ||
+                   (start_reg >= PACKET3_SET_CTL_CONST_END) ||
+                   (end_reg >= PACKET3_SET_CTL_CONST_END)) {
+                       DRM_ERROR("bad SET_CTL_CONST\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_SET_SAMPLER:
+               if (pkt->count % 3) {
+                       DRM_ERROR("bad SET_SAMPLER\n");
+                       return -EINVAL;
+               }
+               start_reg = (ib[idx+0] << 2) + PACKET3_SET_SAMPLER_OFFSET;
+               end_reg = 4 * pkt->count + start_reg - 4;
+               if ((start_reg < PACKET3_SET_SAMPLER_OFFSET) ||
+                   (start_reg >= PACKET3_SET_SAMPLER_END) ||
+                   (end_reg >= PACKET3_SET_SAMPLER_END)) {
+                       DRM_ERROR("bad SET_SAMPLER\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_SURFACE_BASE_UPDATE:
+               if (p->family >= CHIP_RV770 || p->family == CHIP_R600) {
+                       DRM_ERROR("bad SURFACE_BASE_UPDATE\n");
+                       return -EINVAL;
+               }
+               if (pkt->count) {
+                       DRM_ERROR("bad SURFACE_BASE_UPDATE\n");
+                       return -EINVAL;
+               }
+               break;
+       case PACKET3_NOP:
+               break;
+       default:
+               DRM_ERROR("Packet3 opcode %x not supported\n", pkt->opcode);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+int r600_cs_parse(struct radeon_cs_parser *p)
+{
+       struct radeon_cs_packet pkt;
+       int r;
+
+       do {
+               r = r600_cs_packet_parse(p, &pkt, p->idx);
+               if (r) {
+                       return r;
+               }
+               p->idx += pkt.count + 2;
+               switch (pkt.type) {
+               case PACKET_TYPE0:
+                       r = r600_cs_parse_packet0(p, &pkt);
+                       break;
+               case PACKET_TYPE2:
+                       break;
+               case PACKET_TYPE3:
+                       r = r600_packet3_check(p, &pkt);
+                       break;
+               default:
+                       DRM_ERROR("Unknown packet type %d !\n", pkt.type);
+                       return -EINVAL;
+               }
+               if (r) {
+                       return r;
+               }
+       } while (p->idx < p->chunks[p->chunk_ib_idx].length_dw);
+#if 0
+       for (r = 0; r < p->ib->length_dw; r++) {
+               printk(KERN_INFO "%05d  0x%08X\n", r, p->ib->ptr[r]);
+               mdelay(1);
+       }
+#endif
+       return 0;
+}
+
+static int r600_cs_parser_relocs_legacy(struct radeon_cs_parser *p)
+{
+       if (p->chunk_relocs_idx == -1) {
+               return 0;
+       }
+       p->relocs = kcalloc(1, sizeof(struct radeon_cs_reloc), GFP_KERNEL);
+       if (p->relocs == NULL) {
+               return -ENOMEM;
+       }
+       return 0;
+}
+
+/**
+ * cs_parser_fini() - clean parser states
+ * @parser:    parser structure holding parsing context.
+ * @error:     error number
+ *
+ * If error is set than unvalidate buffer, otherwise just free memory
+ * used by parsing context.
+ **/
+static void r600_cs_parser_fini(struct radeon_cs_parser *parser, int error)
+{
+       unsigned i;
+
+       kfree(parser->relocs);
+       for (i = 0; i < parser->nchunks; i++) {
+               kfree(parser->chunks[i].kdata);
+       }
+       kfree(parser->chunks);
+       kfree(parser->chunks_array);
+}
+
+int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp,
+                       unsigned family, u32 *ib, int *l)
+{
+       struct radeon_cs_parser parser;
+       struct radeon_cs_chunk *ib_chunk;
+       struct radeon_ib        fake_ib;
+       int r;
+
+       /* initialize parser */
+       memset(&parser, 0, sizeof(struct radeon_cs_parser));
+       parser.filp = filp;
+       parser.rdev = NULL;
+       parser.family = family;
+       parser.ib = &fake_ib;
+       fake_ib.ptr = ib;
+       r = radeon_cs_parser_init(&parser, data);
+       if (r) {
+               DRM_ERROR("Failed to initialize parser !\n");
+               r600_cs_parser_fini(&parser, r);
+               return r;
+       }
+       r = r600_cs_parser_relocs_legacy(&parser);
+       if (r) {
+               DRM_ERROR("Failed to parse relocation !\n");
+               r600_cs_parser_fini(&parser, r);
+               return r;
+       }
+       /* Copy the packet into the IB, the parser will read from the
+        * input memory (cached) and write to the IB (which can be
+        * uncached). */
+       ib_chunk = &parser.chunks[parser.chunk_ib_idx];
+       parser.ib->length_dw = ib_chunk->length_dw;
+       memcpy((void *)parser.ib->ptr, ib_chunk->kdata, ib_chunk->length_dw*4);
+       *l = parser.ib->length_dw;
+       r = r600_cs_parse(&parser);
+       if (r) {
+               DRM_ERROR("Invalid command stream !\n");
+               r600_cs_parser_fini(&parser, r);
+               return r;
+       }
+       r600_cs_parser_fini(&parser, r);
+       return r;
+}
+
+void r600_cs_legacy_init(void)
+{
+       r600_cs_packet_next_reloc = &r600_cs_packet_next_reloc_nomm;
+}
diff --git a/drivers/gpu/drm/radeon/r600_microcode.h b/drivers/gpu/drm/radeon/r600_microcode.h
deleted file mode 100644 (file)
index 778c8b4..0000000
+++ /dev/null
@@ -1,23297 +0,0 @@
-/*
- * Copyright 2008-2009 Advanced Micro Devices, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef R600_MICROCODE_H
-#define R600_MICROCODE_H
-
-static const int ME_JUMP_TABLE_START = 1764;
-static const int ME_JUMP_TABLE_END   = 1792;
-
-#define PFP_UCODE_SIZE 576
-#define PM4_UCODE_SIZE 1792
-#define R700_PFP_UCODE_SIZE 848
-#define R700_PM4_UCODE_SIZE 1360
-
-static const u32 R600_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x614 },
-    { 0x00000000, 0x00600000, 0x5b2 },
-    { 0x00000000, 0x00600000, 0x5c5 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000020, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000021, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x0000001d, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x0000001d, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000030, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x00000010, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000030, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000032, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x0000002d, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x080 },
-    { 0x0000002e, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x081 },
-    { 0x00000000, 0x00400000, 0x087 },
-    { 0x0000002d, 0x00203623, 0x000 },
-    { 0x0000002e, 0x00203624, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x087 },
-    { 0x00000000, 0x00600000, 0x5ed },
-    { 0x00000000, 0x00600000, 0x5e1 },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08a },
-    { 0x00000018, 0xc0403620, 0x090 },
-    { 0x00000000, 0x2ee00000, 0x08e },
-    { 0x00000000, 0x2ce00000, 0x08d },
-    { 0x00000002, 0x00400e2d, 0x08f },
-    { 0x00000003, 0x00400e2d, 0x08f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000018, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x095 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x09d },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09b },
-    { 0x00000000, 0x2ce00000, 0x09a },
-    { 0x00000002, 0x00400e2d, 0x09c },
-    { 0x00000003, 0x00400e2d, 0x09c },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a4 },
-    { 0x0000001c, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x0000001b, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0db },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x28c },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x128 },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0c5 },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0d6 },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0d4 },
-    { 0x00000013, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0cf },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ce },
-    { 0x00003f00, 0x00400c11, 0x0d0 },
-    { 0x00001f00, 0x00400c11, 0x0d0 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0d6 },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00284a22, 0x000 },
-    { 0x00000030, 0x00200e2d, 0x000 },
-    { 0x0000002e, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e3 },
-    { 0x00000000, 0x00600000, 0x5e7 },
-    { 0x00000000, 0x00400000, 0x0e4 },
-    { 0x00000000, 0x00600000, 0x5ea },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x0000001d, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f1 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f1 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x0000001a, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f6 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x104 },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000013, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0fd },
-    { 0xffffffff, 0x00404811, 0x104 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x100 },
-    { 0x0000ffff, 0x00404811, 0x104 },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x103 },
-    { 0x000000ff, 0x00404811, 0x104 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000019, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x10d },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000019, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x114 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x110 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x127 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x614 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x613 },
-    { 0x00000004, 0x00404c11, 0x12e },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x00000000, 0x00600000, 0x151 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2a4 },
-    { 0x0001a1fd, 0x00604411, 0x2c9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x138 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x151 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2a4 },
-    { 0x0001a1fd, 0x00604411, 0x2c9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x149 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x17c },
-    { 0x00000000, 0x00600000, 0x18d },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x189 },
-    { 0x00000000, 0x00600000, 0x2a4 },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x28c },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x173 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x16f },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x184 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000013, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2e4 },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x165 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x2fe },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x181 },
-    { 0x0000001b, 0xc0203620, 0x000 },
-    { 0x0000001c, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x19f },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x188 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000032, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x00000011, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x128 },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00600e2d, 0x1aa },
-    { 0x0000001c, 0x00600e2d, 0x1aa },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x0000001d, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1a6 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000020, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000019, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1cd },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1c9 },
-    { 0x00000000, 0x00600000, 0x1d6 },
-    { 0x00000001, 0x00531e27, 0x1c5 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1be },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1d6 },
-    { 0x00000001, 0x00531e27, 0x1d2 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2a4 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e5 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x1f2 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x1f2 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x613 },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2a4 },
-    { 0x0001a1fd, 0x00604411, 0x2c9 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x206 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x1ff },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x5c5 },
-    { 0x00000000, 0x0040040f, 0x200 },
-    { 0x00000000, 0x00600000, 0x5b2 },
-    { 0x00000000, 0x00600000, 0x5c5 },
-    { 0x00000210, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00600000, 0x18d },
-    { 0x00000000, 0x00600000, 0x189 },
-    { 0x00000000, 0x00600000, 0x2a4 },
-    { 0x00000000, 0x00600000, 0x28c },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x21f },
-    { 0x00000000, 0xc0404800, 0x21c },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2e4 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x5b2 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x235 },
-    { 0x0000001a, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x0000001a, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x23a },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x2fe },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x265 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x253 },
-    { 0x00000018, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x248 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x24b },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000018, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x250 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x253 },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2aa },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25b },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25a },
-    { 0x00000016, 0x00404811, 0x25f },
-    { 0x00000018, 0x00404811, 0x25f },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25e },
-    { 0x00000017, 0x00404811, 0x25f },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2d2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x23f },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x614 },
-    { 0x00000000, 0x00600000, 0x5b2 },
-    { 0x00000000, 0xc0600000, 0x28c },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x00000034, 0x00201a2d, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x00000033, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x27b },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000034, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x128 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x286 },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000024, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000032, 0x00203622, 0x000 },
-    { 0x00000031, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000029, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000029, 0x00203627, 0x000 },
-    { 0x0000002a, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x0000002a, 0x00203627, 0x000 },
-    { 0x0000002b, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x0000002b, 0x00203627, 0x000 },
-    { 0x0000002c, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x0000002c, 0x00803627, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x0000002a, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x0000002b, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x0000002c, 0x00803627, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00203628, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2c5 },
-    { 0x00000000, 0x00400000, 0x2c2 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00203628, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2c2 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2c5 },
-    { 0x0000002b, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2c5 },
-    { 0x00000029, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2c5 },
-    { 0x0000002c, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2c5 },
-    { 0x0000002a, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2c5 },
-    { 0x00000000, 0x00600000, 0x5ed },
-    { 0x00000000, 0x00600000, 0x29e },
-    { 0x00000000, 0x00400000, 0x2c7 },
-    { 0x00000000, 0x00600000, 0x29e },
-    { 0x00000000, 0x00600000, 0x5e4 },
-    { 0x00000000, 0x00400000, 0x2c7 },
-    { 0x00000000, 0x00600000, 0x290 },
-    { 0x00000000, 0x00400000, 0x2c7 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000023, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x0000001d, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x301 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x0000001a, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x5c5 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x334 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x614 },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x33d },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x351 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000016, 0x00604811, 0x35e },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x355 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00404811, 0x349 },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x349 },
-    { 0x00002104, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x00000035, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x360 },
-    { 0x00000035, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x376 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x380 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x38c },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x398 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x398 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39a },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39f },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000015, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x614 },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x382 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x614 },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x38e },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000016, 0x00604811, 0x35e },
-    { 0x00000016, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3b9 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x614 },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ab },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3be },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x614 },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3cc },
-    { 0x00000000, 0xc0401800, 0x3cf },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x614 },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3d2 },
-    { 0x00000000, 0xc0401c00, 0x3d5 },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x614 },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x3fd },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3e2 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ea },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x3fd },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x3fd },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3e5 },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3e5 },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3e5 },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3e5 },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3e5 },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3e5 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0018f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x614 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x42e },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x43c },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x444 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x614 },
-    { 0x00000000, 0x00400000, 0x44d },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x449 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x44c },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x454 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x459 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x45e },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x463 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x468 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46d },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x46d },
-    { 0x00000000, 0x00400000, 0x47a },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x477 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x480 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x43c },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x48a },
-    { 0x00040000, 0xc0494a20, 0x48b },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x497 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x493 },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x491 },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4ae },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x4a9 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x4ac },
-    { 0x00000000, 0x00400000, 0x4b2 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x614 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4b9 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x614 },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4bb },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4eb },
-    { 0x00000035, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4da },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4ce },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000036, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x491 },
-    { 0x00000035, 0xc0203620, 0x000 },
-    { 0x00000036, 0xc0403620, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0xe0000000, 0xc0484a20, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4f2 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x4f6 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x50b },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0x00000034, 0x00203623, 0x000 },
-    { 0x00000032, 0x00203623, 0x000 },
-    { 0x00000031, 0x00203623, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x0000002d, 0x00203623, 0x000 },
-    { 0x0000002e, 0x00203623, 0x000 },
-    { 0x0000001b, 0x00203623, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x0000002a, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x0000002c, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000033, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000027, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000028, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x00000026, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x602 },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x541 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x614 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x549 },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x55b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x549 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x614 },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x55b },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x54d },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x55b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x559 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x554 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x557 },
-    { 0x00000000, 0x00401c10, 0x55b },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x55d },
-    { 0x00000000, 0x00600000, 0x5a4 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56d },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x614 },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x56b },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x57d },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x614 },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x57b },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x58d },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x614 },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x58b },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x614 },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x599 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x59f },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5a4 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x5b7 },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x00000034, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x5bb },
-    { 0x00000000, 0x00600000, 0x5a4 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5bb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x0000217a, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x5e1 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000016, 0x00604811, 0x35e },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x614 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x5dc },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x0000001d, 0x00803627, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x0000001d, 0x00803627, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x0000001d, 0x00803627, 0x000 },
-    { 0x0000001d, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x0000001d, 0x00803627, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000016, 0x00604811, 0x35e },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0x00ffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x614 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x613 },
-    { 0x00000010, 0x00404c11, 0x5f9 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x00000025, 0x00200a2d, 0x000 },
-    { 0x00000026, 0x00200e2d, 0x000 },
-    { 0x00000027, 0x0020122d, 0x000 },
-    { 0x00000028, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x612 },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x00000027, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x614 },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x617 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x2fe },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x19f },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000029, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x0000002c, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000002a, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000002b, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x013304ef, 0x059b0239, 0x000 },
-    { 0x01b00159, 0x0425059b, 0x000 },
-    { 0x021201f6, 0x02390142, 0x000 },
-    { 0x0210022e, 0x0289022a, 0x000 },
-    { 0x03c2059b, 0x059b059b, 0x000 },
-    { 0x05cd05ce, 0x0308059b, 0x000 },
-    { 0x059b05a0, 0x03090329, 0x000 },
-    { 0x0313026b, 0x032b031d, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b052c, 0x059b059b, 0x000 },
-    { 0x03a5059b, 0x04a2032d, 0x000 },
-    { 0x04810433, 0x0423059b, 0x000 },
-    { 0x04bb04ed, 0x042704c8, 0x000 },
-    { 0x043304f4, 0x033a0365, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b059b, 0x05b905a2, 0x000 },
-    { 0x059b059b, 0x0007059b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x03e303d8, 0x03f303f1, 0x000 },
-    { 0x03f903f5, 0x03f703fb, 0x000 },
-    { 0x04070403, 0x040f040b, 0x000 },
-    { 0x04170413, 0x041f041b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x059b059b, 0x059b059b, 0x000 },
-    { 0x00020600, 0x06190006, 0x000 },
-};
-
-static const u32 R600_pfp_microcode[] = {
-0xd40071,
-0xd40072,
-0xca0400,
-0xa00000,
-0x7e828b,
-0x800003,
-0xca0400,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d4,
-0xd5c01e,
-0xca0800,
-0x80001b,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000d,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000d,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800054,
-0xd40073,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800002,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800002,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b9,
-0xd4c01e,
-0xc6083e,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800002,
-0x062001,
-0xc6083e,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x80007a,
-0xd42013,
-0xc6083e,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008e,
-0x000000,
-0xc41432,
-0xc6183e,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800002,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xd40073,
-0xe4015e,
-0xd4001e,
-0x8001b9,
-0x062001,
-0x0a2001,
-0xd60074,
-0xc40836,
-0xc61040,
-0x988007,
-0xcc3835,
-0x95010f,
-0xd4001f,
-0xd46062,
-0x800002,
-0xd42062,
-0xcc1433,
-0x8401bc,
-0xd40070,
-0xd5401e,
-0x800002,
-0xee001e,
-0xca0c00,
-0xca1000,
-0xd4c01a,
-0x8401bc,
-0xd5001a,
-0xcc0443,
-0x35101f,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b9,
-0xd4006d,
-0x344401,
-0xcc0c44,
-0x98403a,
-0xcc2c46,
-0x958004,
-0xcc0445,
-0x8001b9,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f3,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f3,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f3,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f3,
-0xcc1003,
-0x988014,
-0xcc1047,
-0x9a8009,
-0xcc1448,
-0x9840da,
-0xd4006d,
-0xcc1844,
-0xd5001a,
-0xd5401a,
-0x8000cc,
-0xd5801a,
-0x96c0d3,
-0xd4006d,
-0x8001b9,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800002,
-0xec007f,
-0x9ac0ca,
-0xd4006d,
-0x8001b9,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b9,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809c,
-0xd4006d,
-0x98409a,
-0xd4006e,
-0xcc0847,
-0xcc0c48,
-0xcc1044,
-0xd4801a,
-0xd4c01a,
-0x800104,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d8,
-0xca0c00,
-0xd4401e,
-0x800002,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800002,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bc,
-0x000000,
-0x8401bc,
-0xd7806f,
-0x800002,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902af,
-0x7c738b,
-0x8401bc,
-0xd7806f,
-0x800002,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984296,
-0x000000,
-0x800164,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800002,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc1049,
-0x990004,
-0xd40071,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800002,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x95001f,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x7d8380,
-0xd5806f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0x8001b9,
-0xd60074,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800002,
-0xee001e,
-0x800002,
-0xee001f,
-0xd4001f,
-0x800002,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010174,
-0x02017b,
-0x030090,
-0x040080,
-0x050005,
-0x060040,
-0x070033,
-0x08012f,
-0x090047,
-0x0a0037,
-0x1001b7,
-0x1700a4,
-0x22013d,
-0x23014c,
-0x2000b5,
-0x240128,
-0x27004e,
-0x28006b,
-0x2a0061,
-0x2b0053,
-0x2f0066,
-0x320088,
-0x340182,
-0x3c0159,
-0x3f0073,
-0x41018f,
-0x440131,
-0x550176,
-0x56017d,
-0x60000c,
-0x610035,
-0x620039,
-0x630039,
-0x640039,
-0x650039,
-0x660039,
-0x670039,
-0x68003b,
-0x690042,
-0x6a0049,
-0x6b0049,
-0x6c0049,
-0x6d0049,
-0x6e0049,
-0x6f0049,
-0x7301b7,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-0x000007,
-};
-
-static const u32 RV610_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x668 },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x662 },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x668 },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x65f },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x34b },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x354 },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x364 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x36e },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5c0 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x370 },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x386 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b1 },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b5 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39c },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x390 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x392 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x39e },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3ae },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ce },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c0 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3d3 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e1 },
-    { 0x00000000, 0xc0401800, 0x3e4 },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x68d },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e7 },
-    { 0x00000000, 0xc0401c00, 0x3ea },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x68d },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3f7 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ff },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3fa },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3fa },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3fa },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3fa },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3fa },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3fa },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000018, 0x40210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x445 },
-    { 0x00800000, 0xc0494a20, 0x446 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x44b },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x459 },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x461 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x68d },
-    { 0x00000000, 0x00400000, 0x466 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x692 },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46d },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x472 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x477 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47c },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x481 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x486 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x490 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x499 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x459 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4a3 },
-    { 0x00040000, 0xc0494a20, 0x4a4 },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4b0 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4ac },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4aa },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c3 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x692 },
-    { 0x00000000, 0x00400000, 0x4c7 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x68d },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4ce },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4d0 },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x500 },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4ef },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4e3 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4aa },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x505 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x519 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x52e },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x67b },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x566 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56e },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x572 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x57a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x692 },
-    { 0x00000000, 0x00401c10, 0x57c },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x57e },
-    { 0x00000000, 0x00600000, 0x5c9 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x58f },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x58d },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5a0 },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x59e },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5b1 },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5af },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5be },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5c4 },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5c9 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000002c, 0x00203621, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5d0 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000030, 0x00403621, 0x5e3 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5e3 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a092, 0x00604411, 0x68d },
-    { 0x00000031, 0x00203630, 0x000 },
-    { 0x0004a093, 0x00604411, 0x68d },
-    { 0x00000032, 0x00203630, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68d },
-    { 0x00000033, 0x00203630, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68d },
-    { 0x00000034, 0x00203630, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68d },
-    { 0x00000035, 0x00203630, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68d },
-    { 0x00000036, 0x00203630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000001, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62c },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62c },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x605 },
-    { 0x0000a092, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x0000a093, 0x00204411, 0x000 },
-    { 0x00000032, 0x00204a2d, 0x000 },
-    { 0x0000a2b6, 0x00204411, 0x000 },
-    { 0x00000033, 0x00204a2d, 0x000 },
-    { 0x0000a2ba, 0x00204411, 0x000 },
-    { 0x00000034, 0x00204a2d, 0x000 },
-    { 0x0000a2be, 0x00204411, 0x000 },
-    { 0x00000035, 0x00204a2d, 0x000 },
-    { 0x0000a2c2, 0x00204411, 0x000 },
-    { 0x00000036, 0x00204a2d, 0x000 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x000001ff, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62b },
-    { 0x00000000, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x60e },
-    { 0x0004a003, 0x00604411, 0x68d },
-    { 0x0000a003, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x14c00000, 0x613 },
-    { 0x0004a010, 0x00604411, 0x68d },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62b },
-    { 0x0004a011, 0x00604411, 0x68d },
-    { 0x0000a011, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a012, 0x00604411, 0x68d },
-    { 0x0000a012, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a013, 0x00604411, 0x68d },
-    { 0x0000a013, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a014, 0x00604411, 0x68d },
-    { 0x0000a014, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a015, 0x00604411, 0x68d },
-    { 0x0000a015, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a016, 0x00604411, 0x68d },
-    { 0x0000a016, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a017, 0x00604411, 0x68d },
-    { 0x0000a017, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000002c, 0x0080062d, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x63d },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000002, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x63b },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x641 },
-    { 0x00000000, 0x00600000, 0x5c9 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x641 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x62d },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x62d },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x656 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000010, 0x00404c11, 0x672 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x68b },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68d },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x690 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x692 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x695 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x01420502, 0x05c00250, 0x000 },
-    { 0x01c30168, 0x043f05c0, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03d705c0, 0x05c005c0, 0x000 },
-    { 0x0649064a, 0x031f05c0, 0x000 },
-    { 0x05c005c5, 0x03200340, 0x000 },
-    { 0x032a0282, 0x03420334, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c00551, 0x05c005c0, 0x000 },
-    { 0x03ba05c0, 0x04bb0344, 0x000 },
-    { 0x049a0450, 0x043d05c0, 0x000 },
-    { 0x04d005c0, 0x044104dd, 0x000 },
-    { 0x04500507, 0x03510375, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x063f05c7, 0x000 },
-    { 0x05c005c0, 0x000705c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x03f803ed, 0x04080406, 0x000 },
-    { 0x040e040a, 0x040c0410, 0x000 },
-    { 0x041c0418, 0x04240420, 0x000 },
-    { 0x042c0428, 0x04340430, 0x000 },
-    { 0x05c005c0, 0x043805c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x00020679, 0x06970006, 0x000 },
-};
-
-static const u32 RV610_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001b8,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800053,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b8,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x800079,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008d,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401bb,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401bb,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b8,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f0,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f0,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f0,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f0,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000c9,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800101,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d9,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bd,
-0x000000,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902b0,
-0x7c738b,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984297,
-0x000000,
-0x800161,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001b8,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010171,
-0x020178,
-0x03008f,
-0x04007f,
-0x050003,
-0x06003f,
-0x070032,
-0x08012c,
-0x090046,
-0x0a0036,
-0x1001b6,
-0x1700a2,
-0x22013a,
-0x230149,
-0x2000b4,
-0x240125,
-0x27004d,
-0x28006a,
-0x2a0060,
-0x2b0052,
-0x2f0065,
-0x320087,
-0x34017f,
-0x3c0156,
-0x3f0072,
-0x41018c,
-0x44012e,
-0x550173,
-0x56017a,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RV620_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x668 },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x662 },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00000000, 0x00600000, 0x631 },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x668 },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x65f },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x645 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x34b },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x354 },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x364 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x36e },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5c0 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x370 },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x386 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b1 },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b5 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39c },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x390 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x392 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x39e },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3ae },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ce },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c0 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3d3 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e1 },
-    { 0x00000000, 0xc0401800, 0x3e4 },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x68d },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e7 },
-    { 0x00000000, 0xc0401c00, 0x3ea },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x68d },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3f7 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ff },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3fa },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3fa },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3fa },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3fa },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3fa },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3fa },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000018, 0x40210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x445 },
-    { 0x00800000, 0xc0494a20, 0x446 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x44b },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x459 },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x461 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x68d },
-    { 0x00000000, 0x00400000, 0x466 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x692 },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46d },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x472 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x477 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47c },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x481 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x486 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x486 },
-    { 0x00000000, 0x00400000, 0x493 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x490 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x499 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x459 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4a3 },
-    { 0x00040000, 0xc0494a20, 0x4a4 },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4b0 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4ac },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4aa },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c3 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x692 },
-    { 0x00000000, 0x00400000, 0x4c7 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x68d },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4ce },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68d },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4d0 },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x500 },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4ef },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4e3 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4aa },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x505 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x519 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x52e },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x67b },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x566 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56e },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68d },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x572 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x57c },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x57a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x692 },
-    { 0x00000000, 0x00401c10, 0x57c },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x57e },
-    { 0x00000000, 0x00600000, 0x5c9 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x58f },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x58d },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5a0 },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x59e },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5b1 },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5af },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68d },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5be },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5c4 },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5c9 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000002c, 0x00203621, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5d0 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000030, 0x00403621, 0x5e3 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5e3 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a092, 0x00604411, 0x68d },
-    { 0x00000031, 0x00203630, 0x000 },
-    { 0x0004a093, 0x00604411, 0x68d },
-    { 0x00000032, 0x00203630, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68d },
-    { 0x00000033, 0x00203630, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68d },
-    { 0x00000034, 0x00203630, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68d },
-    { 0x00000035, 0x00203630, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68d },
-    { 0x00000036, 0x00203630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000001, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62c },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62c },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x605 },
-    { 0x0000a092, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x0000a093, 0x00204411, 0x000 },
-    { 0x00000032, 0x00204a2d, 0x000 },
-    { 0x0000a2b6, 0x00204411, 0x000 },
-    { 0x00000033, 0x00204a2d, 0x000 },
-    { 0x0000a2ba, 0x00204411, 0x000 },
-    { 0x00000034, 0x00204a2d, 0x000 },
-    { 0x0000a2be, 0x00204411, 0x000 },
-    { 0x00000035, 0x00204a2d, 0x000 },
-    { 0x0000a2c2, 0x00204411, 0x000 },
-    { 0x00000036, 0x00204a2d, 0x000 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x000001ff, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62b },
-    { 0x00000000, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x60e },
-    { 0x0004a003, 0x00604411, 0x68d },
-    { 0x0000a003, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x14c00000, 0x613 },
-    { 0x0004a010, 0x00604411, 0x68d },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62b },
-    { 0x0004a011, 0x00604411, 0x68d },
-    { 0x0000a011, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a012, 0x00604411, 0x68d },
-    { 0x0000a012, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a013, 0x00604411, 0x68d },
-    { 0x0000a013, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a014, 0x00604411, 0x68d },
-    { 0x0000a014, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a015, 0x00604411, 0x68d },
-    { 0x0000a015, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a016, 0x00604411, 0x68d },
-    { 0x0000a016, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a017, 0x00604411, 0x68d },
-    { 0x0000a017, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x0000002c, 0x0080062d, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x63d },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000002, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x63b },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68d },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x641 },
-    { 0x00000000, 0x00600000, 0x5c9 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x641 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x62d },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x62d },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x656 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68d },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x68c },
-    { 0x00000010, 0x00404c11, 0x672 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x68b },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68d },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x690 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x692 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x695 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x01420502, 0x05c00250, 0x000 },
-    { 0x01c30168, 0x043f05c0, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03d705c0, 0x05c005c0, 0x000 },
-    { 0x0649064a, 0x031f05c0, 0x000 },
-    { 0x05c005c5, 0x03200340, 0x000 },
-    { 0x032a0282, 0x03420334, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c00551, 0x05c005c0, 0x000 },
-    { 0x03ba05c0, 0x04bb0344, 0x000 },
-    { 0x049a0450, 0x043d05c0, 0x000 },
-    { 0x04d005c0, 0x044104dd, 0x000 },
-    { 0x04500507, 0x03510375, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x063f05c7, 0x000 },
-    { 0x05c005c0, 0x000705c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x03f803ed, 0x04080406, 0x000 },
-    { 0x040e040a, 0x040c0410, 0x000 },
-    { 0x041c0418, 0x04240420, 0x000 },
-    { 0x042c0428, 0x04340430, 0x000 },
-    { 0x05c005c0, 0x043805c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x05c005c0, 0x05c005c0, 0x000 },
-    { 0x00020679, 0x06970006, 0x000 },
-};
-
-static const u32 RV620_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001b8,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800053,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b8,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x800079,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008d,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401bb,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401bb,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b8,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f0,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f0,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f0,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f0,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000c9,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800101,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d9,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bd,
-0x000000,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902b0,
-0x7c738b,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984297,
-0x000000,
-0x800161,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001b8,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010171,
-0x020178,
-0x03008f,
-0x04007f,
-0x050003,
-0x06003f,
-0x070032,
-0x08012c,
-0x090046,
-0x0a0036,
-0x1001b6,
-0x1700a2,
-0x22013a,
-0x230149,
-0x2000b4,
-0x240125,
-0x27004d,
-0x28006a,
-0x2a0060,
-0x2b0052,
-0x2f0065,
-0x320087,
-0x34017f,
-0x3c0156,
-0x3f0072,
-0x41018c,
-0x44012e,
-0x550173,
-0x56017a,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RV630_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x65f },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x662 },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x34b },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x354 },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x364 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x36e },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5bd },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x370 },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x386 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b1 },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b5 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39c },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x390 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x392 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x39e },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3ae },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ce },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c0 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3d3 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e1 },
-    { 0x00000000, 0xc0401800, 0x3e4 },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x68a },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e7 },
-    { 0x00000000, 0xc0401c00, 0x3ea },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x68a },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3f7 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ff },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3fa },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3fa },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3fa },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3fa },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3fa },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3fa },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x448 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x456 },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x45e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x68a },
-    { 0x00000000, 0x00400000, 0x463 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x68f },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46a },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46f },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x474 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x479 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47e },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x483 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x48d },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x496 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x456 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4a0 },
-    { 0x00040000, 0xc0494a20, 0x4a1 },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4ad },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4a9 },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4a7 },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c0 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x68f },
-    { 0x00000000, 0x00400000, 0x4c4 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x68a },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4cb },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4cd },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4fd },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4ec },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4e0 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4a7 },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x502 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x516 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x52b },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x678 },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x563 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56b },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56b },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56f },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x577 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x68f },
-    { 0x00000000, 0x00401c10, 0x579 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x57b },
-    { 0x00000000, 0x00600000, 0x5c6 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x58c },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x58a },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x59d },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x59b },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5ae },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5ac },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5bb },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5c1 },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5c6 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000002c, 0x00203621, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5cd },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000030, 0x00403621, 0x5e0 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5e0 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a092, 0x00604411, 0x68a },
-    { 0x00000031, 0x00203630, 0x000 },
-    { 0x0004a093, 0x00604411, 0x68a },
-    { 0x00000032, 0x00203630, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68a },
-    { 0x00000033, 0x00203630, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68a },
-    { 0x00000034, 0x00203630, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68a },
-    { 0x00000035, 0x00203630, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68a },
-    { 0x00000036, 0x00203630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000001, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x629 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x629 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x602 },
-    { 0x0000a092, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x0000a093, 0x00204411, 0x000 },
-    { 0x00000032, 0x00204a2d, 0x000 },
-    { 0x0000a2b6, 0x00204411, 0x000 },
-    { 0x00000033, 0x00204a2d, 0x000 },
-    { 0x0000a2ba, 0x00204411, 0x000 },
-    { 0x00000034, 0x00204a2d, 0x000 },
-    { 0x0000a2be, 0x00204411, 0x000 },
-    { 0x00000035, 0x00204a2d, 0x000 },
-    { 0x0000a2c2, 0x00204411, 0x000 },
-    { 0x00000036, 0x00204a2d, 0x000 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x000001ff, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x628 },
-    { 0x00000000, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x60b },
-    { 0x0004a003, 0x00604411, 0x68a },
-    { 0x0000a003, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x14c00000, 0x610 },
-    { 0x0004a010, 0x00604411, 0x68a },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x628 },
-    { 0x0004a011, 0x00604411, 0x68a },
-    { 0x0000a011, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a012, 0x00604411, 0x68a },
-    { 0x0000a012, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a013, 0x00604411, 0x68a },
-    { 0x0000a013, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a014, 0x00604411, 0x68a },
-    { 0x0000a014, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a015, 0x00604411, 0x68a },
-    { 0x0000a015, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a016, 0x00604411, 0x68a },
-    { 0x0000a016, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a017, 0x00604411, 0x68a },
-    { 0x0000a017, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000002c, 0x0080062d, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x63a },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000002, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x638 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x63e },
-    { 0x00000000, 0x00600000, 0x5c6 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x63e },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x62a },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x62a },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x653 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000010, 0x00404c11, 0x66f },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x688 },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68a },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x68d },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68f },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x692 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x014204ff, 0x05bd0250, 0x000 },
-    { 0x01c30168, 0x043f05bd, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03d705bd, 0x05bd05bd, 0x000 },
-    { 0x06460647, 0x031f05bd, 0x000 },
-    { 0x05bd05c2, 0x03200340, 0x000 },
-    { 0x032a0282, 0x03420334, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd054e, 0x05bd05bd, 0x000 },
-    { 0x03ba05bd, 0x04b80344, 0x000 },
-    { 0x0497044d, 0x043d05bd, 0x000 },
-    { 0x04cd05bd, 0x044104da, 0x000 },
-    { 0x044d0504, 0x03510375, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x063c05c4, 0x000 },
-    { 0x05bd05bd, 0x000705bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x03f803ed, 0x04080406, 0x000 },
-    { 0x040e040a, 0x040c0410, 0x000 },
-    { 0x041c0418, 0x04240420, 0x000 },
-    { 0x042c0428, 0x04340430, 0x000 },
-    { 0x05bd05bd, 0x043805bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x00020676, 0x06940006, 0x000 },
-};
-
-static const u32 RV630_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001b8,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800053,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b8,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x800079,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008d,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401bb,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401bb,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b8,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f0,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f0,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f0,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f0,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000c9,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800101,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d9,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bd,
-0x000000,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902b0,
-0x7c738b,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984297,
-0x000000,
-0x800161,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001b8,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010171,
-0x020178,
-0x03008f,
-0x04007f,
-0x050003,
-0x06003f,
-0x070032,
-0x08012c,
-0x090046,
-0x0a0036,
-0x1001b6,
-0x1700a2,
-0x22013a,
-0x230149,
-0x2000b4,
-0x240125,
-0x27004d,
-0x28006a,
-0x2a0060,
-0x2b0052,
-0x2f0065,
-0x320087,
-0x34017f,
-0x3c0156,
-0x3f0072,
-0x41018c,
-0x44012e,
-0x550173,
-0x56017a,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RV635_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x65f },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x662 },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00000000, 0x00600000, 0x62e },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x665 },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x65c },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x642 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x34b },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x354 },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x364 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x36e },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5bd },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35f },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x370 },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x386 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b1 },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b5 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x39c },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a8 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x390 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x392 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x39e },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3ae },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ce },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c0 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3d3 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e1 },
-    { 0x00000000, 0xc0401800, 0x3e4 },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x68a },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e7 },
-    { 0x00000000, 0xc0401c00, 0x3ea },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x68a },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3f7 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ff },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3fa },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3fa },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3fa },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3fa },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3fa },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3fa },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x448 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x456 },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x45e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x68a },
-    { 0x00000000, 0x00400000, 0x463 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x68f },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46a },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46f },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x474 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x479 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47e },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x483 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x483 },
-    { 0x00000000, 0x00400000, 0x490 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x48d },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x496 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x456 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4a0 },
-    { 0x00040000, 0xc0494a20, 0x4a1 },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4ad },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4a9 },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4a7 },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c0 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x68f },
-    { 0x00000000, 0x00400000, 0x4c4 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x68a },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4cb },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x68a },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4cd },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4fd },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4ec },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4e0 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4a7 },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x502 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x516 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x52b },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x678 },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x563 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56b },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56b },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x68a },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56f },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x579 },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x577 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x68f },
-    { 0x00000000, 0x00401c10, 0x579 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x57b },
-    { 0x00000000, 0x00600000, 0x5c6 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x58c },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x58a },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x59d },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x59b },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5ae },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5ac },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68a },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5bb },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5c1 },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5c6 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000002c, 0x00203621, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5cd },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000030, 0x00403621, 0x5e0 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5e0 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a092, 0x00604411, 0x68a },
-    { 0x00000031, 0x00203630, 0x000 },
-    { 0x0004a093, 0x00604411, 0x68a },
-    { 0x00000032, 0x00203630, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x68a },
-    { 0x00000033, 0x00203630, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x68a },
-    { 0x00000034, 0x00203630, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x68a },
-    { 0x00000035, 0x00203630, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x68a },
-    { 0x00000036, 0x00203630, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000001, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x629 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x629 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x602 },
-    { 0x0000a092, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x0000a093, 0x00204411, 0x000 },
-    { 0x00000032, 0x00204a2d, 0x000 },
-    { 0x0000a2b6, 0x00204411, 0x000 },
-    { 0x00000033, 0x00204a2d, 0x000 },
-    { 0x0000a2ba, 0x00204411, 0x000 },
-    { 0x00000034, 0x00204a2d, 0x000 },
-    { 0x0000a2be, 0x00204411, 0x000 },
-    { 0x00000035, 0x00204a2d, 0x000 },
-    { 0x0000a2c2, 0x00204411, 0x000 },
-    { 0x00000036, 0x00204a2d, 0x000 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x000001ff, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x628 },
-    { 0x00000000, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x60b },
-    { 0x0004a003, 0x00604411, 0x68a },
-    { 0x0000a003, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x14c00000, 0x610 },
-    { 0x0004a010, 0x00604411, 0x68a },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x628 },
-    { 0x0004a011, 0x00604411, 0x68a },
-    { 0x0000a011, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a012, 0x00604411, 0x68a },
-    { 0x0000a012, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a013, 0x00604411, 0x68a },
-    { 0x0000a013, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a014, 0x00604411, 0x68a },
-    { 0x0000a014, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a015, 0x00604411, 0x68a },
-    { 0x0000a015, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a016, 0x00604411, 0x68a },
-    { 0x0000a016, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a017, 0x00604411, 0x68a },
-    { 0x0000a017, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x0000002c, 0x0080062d, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x63a },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000002, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x638 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x68a },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x63e },
-    { 0x00000000, 0x00600000, 0x5c6 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x63e },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x62a },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x62a },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x653 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36e },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x68a },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x689 },
-    { 0x00000010, 0x00404c11, 0x66f },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x688 },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68a },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x68d },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x68f },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x692 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x014204ff, 0x05bd0250, 0x000 },
-    { 0x01c30168, 0x043f05bd, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03d705bd, 0x05bd05bd, 0x000 },
-    { 0x06460647, 0x031f05bd, 0x000 },
-    { 0x05bd05c2, 0x03200340, 0x000 },
-    { 0x032a0282, 0x03420334, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd054e, 0x05bd05bd, 0x000 },
-    { 0x03ba05bd, 0x04b80344, 0x000 },
-    { 0x0497044d, 0x043d05bd, 0x000 },
-    { 0x04cd05bd, 0x044104da, 0x000 },
-    { 0x044d0504, 0x03510375, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x063c05c4, 0x000 },
-    { 0x05bd05bd, 0x000705bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x03f803ed, 0x04080406, 0x000 },
-    { 0x040e040a, 0x040c0410, 0x000 },
-    { 0x041c0418, 0x04240420, 0x000 },
-    { 0x042c0428, 0x04340430, 0x000 },
-    { 0x05bd05bd, 0x043805bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x05bd05bd, 0x05bd05bd, 0x000 },
-    { 0x00020676, 0x06940006, 0x000 },
-};
-
-static const u32 RV635_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001b8,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800053,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b8,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x800079,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008d,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401bb,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401bb,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b8,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f0,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f0,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f0,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f0,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000c9,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800101,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d9,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bd,
-0x000000,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902b0,
-0x7c738b,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984297,
-0x000000,
-0x800161,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001b8,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010171,
-0x020178,
-0x03008f,
-0x04007f,
-0x050003,
-0x06003f,
-0x070032,
-0x08012c,
-0x090046,
-0x0a0036,
-0x1001b6,
-0x1700a2,
-0x22013a,
-0x230149,
-0x2000b4,
-0x240125,
-0x27004d,
-0x28006a,
-0x2a0060,
-0x2b0052,
-0x2f0065,
-0x320087,
-0x34017f,
-0x3c0156,
-0x3f0072,
-0x41018c,
-0x44012e,
-0x550173,
-0x56017a,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RV670_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x00000000, 0x00600000, 0x624 },
-    { 0x00000000, 0x00600000, 0x638 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00000000, 0x00600000, 0x64d },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x653 },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x656 },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x67c },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x67b },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x67b },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x638 },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x624 },
-    { 0x00000000, 0x00600000, 0x638 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x624 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x00000000, 0x00600000, 0x624 },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x659 },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x650 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x638 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x34b },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x354 },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x362 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x36a },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x366 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35d },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5b3 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x35d },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36c },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x382 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3ad },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3af },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x398 },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a4 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a4 },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x38c },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x38e },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x39a },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3aa },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36a },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c4 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3b8 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3c9 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x67c },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3d7 },
-    { 0x00000000, 0xc0401800, 0x3da },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x67c },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3dd },
-    { 0x00000000, 0xc0401c00, 0x3e0 },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x67c },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x408 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3ed },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3f5 },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x408 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x408 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3f0 },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3f0 },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3f0 },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3f0 },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3f0 },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3f0 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x67c },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x43e },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x44c },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x454 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x67c },
-    { 0x00000000, 0x00400000, 0x459 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x681 },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x460 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x465 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46a },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x46f },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x474 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x479 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x479 },
-    { 0x00000000, 0x00400000, 0x486 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x483 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x48c },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x44c },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x496 },
-    { 0x00040000, 0xc0494a20, 0x497 },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4a3 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x49f },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x49d },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4b6 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x681 },
-    { 0x00000000, 0x00400000, 0x4ba },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x67c },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c1 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x67c },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4c3 },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4f3 },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4e2 },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4d6 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x49d },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4f8 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x50c },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x521 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x66a },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x559 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x67c },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x561 },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x56f },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x561 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x67c },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x56f },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x565 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x56f },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x56d },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x681 },
-    { 0x00000000, 0x00401c10, 0x56f },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x571 },
-    { 0x00000000, 0x00600000, 0x5bc },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x582 },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x67c },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x580 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x593 },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x67c },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x591 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5a4 },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x67c },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5a2 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x67c },
-    { 0x0000001a, 0x00212230, 0x000 },
-    { 0x00000006, 0x00222630, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5b1 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5b7 },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5bc },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000002c, 0x00203621, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5c3 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000030, 0x00403621, 0x5d6 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5d6 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004a092, 0x00604411, 0x67c },
-    { 0x00000031, 0x00203630, 0x000 },
-    { 0x0004a093, 0x00604411, 0x67c },
-    { 0x00000032, 0x00203630, 0x000 },
-    { 0x0004a2b6, 0x00604411, 0x67c },
-    { 0x00000033, 0x00203630, 0x000 },
-    { 0x0004a2ba, 0x00604411, 0x67c },
-    { 0x00000034, 0x00203630, 0x000 },
-    { 0x0004a2be, 0x00604411, 0x67c },
-    { 0x00000035, 0x00203630, 0x000 },
-    { 0x0004a2c2, 0x00604411, 0x67c },
-    { 0x00000036, 0x00203630, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000001, 0x002f0230, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x61f },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x61f },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00007e00, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x5f8 },
-    { 0x0000a092, 0x00204411, 0x000 },
-    { 0x00000031, 0x00204a2d, 0x000 },
-    { 0x0000a093, 0x00204411, 0x000 },
-    { 0x00000032, 0x00204a2d, 0x000 },
-    { 0x0000a2b6, 0x00204411, 0x000 },
-    { 0x00000033, 0x00204a2d, 0x000 },
-    { 0x0000a2ba, 0x00204411, 0x000 },
-    { 0x00000034, 0x00204a2d, 0x000 },
-    { 0x0000a2be, 0x00204411, 0x000 },
-    { 0x00000035, 0x00204a2d, 0x000 },
-    { 0x0000a2c2, 0x00204411, 0x000 },
-    { 0x00000036, 0x00204a2d, 0x000 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x000001ff, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x61e },
-    { 0x00000000, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x601 },
-    { 0x0004a003, 0x00604411, 0x67c },
-    { 0x0000a003, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x14c00000, 0x606 },
-    { 0x0004a010, 0x00604411, 0x67c },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00000001, 0x00210621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x61e },
-    { 0x0004a011, 0x00604411, 0x67c },
-    { 0x0000a011, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a012, 0x00604411, 0x67c },
-    { 0x0000a012, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a013, 0x00604411, 0x67c },
-    { 0x0000a013, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a014, 0x00604411, 0x67c },
-    { 0x0000a014, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a015, 0x00604411, 0x67c },
-    { 0x0000a015, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a016, 0x00604411, 0x67c },
-    { 0x0000a016, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x0004a017, 0x00604411, 0x67c },
-    { 0x0000a017, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x0000002c, 0x0080062d, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x630 },
-    { 0x00000030, 0x0020062d, 0x000 },
-    { 0x00000002, 0x00280621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x62e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x67c },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x634 },
-    { 0x00000000, 0x00600000, 0x5bc },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x634 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x620 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x620 },
-    { 0x00000000, 0x00600000, 0x64d },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x67c },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x647 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x36a },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x67c },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x67b },
-    { 0x00000010, 0x00404c11, 0x661 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x67a },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x67c },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x67f },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x681 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x684 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x014204f5, 0x05b30250, 0x000 },
-    { 0x01c30168, 0x043505b3, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03cd05b3, 0x05b305b3, 0x000 },
-    { 0x063c063d, 0x031f05b3, 0x000 },
-    { 0x05b305b8, 0x03200340, 0x000 },
-    { 0x032a0282, 0x03420334, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x05b30544, 0x05b305b3, 0x000 },
-    { 0x03b205b3, 0x04ae0344, 0x000 },
-    { 0x048d0443, 0x043305b3, 0x000 },
-    { 0x04c305b3, 0x043704d0, 0x000 },
-    { 0x044304fa, 0x03510371, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x05b305b3, 0x063205ba, 0x000 },
-    { 0x05b305b3, 0x000705b3, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x03ee03e3, 0x03fe03fc, 0x000 },
-    { 0x04040400, 0x04020406, 0x000 },
-    { 0x0412040e, 0x041a0416, 0x000 },
-    { 0x0422041e, 0x042a0426, 0x000 },
-    { 0x05b305b3, 0x042e05b3, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x05b305b3, 0x05b305b3, 0x000 },
-    { 0x00020668, 0x06860006, 0x000 },
-};
-
-static const u32 RV670_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001b8,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581a8,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0fff0,
-0x042c04,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255403,
-0x7cd580,
-0x259c03,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800053,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xd48060,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001b8,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x800079,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x80008d,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401bb,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401bb,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001b8,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x8400f0,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x8400f0,
-0xcc1003,
-0x988017,
-0x043808,
-0x8400f0,
-0xcc1003,
-0x988013,
-0x043804,
-0x8400f0,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000c9,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001b8,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001b8,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800101,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482d9,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x9882bd,
-0x000000,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x9902b0,
-0x7c738b,
-0x8401bb,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984297,
-0x000000,
-0x800161,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001b8,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010171,
-0x020178,
-0x03008f,
-0x04007f,
-0x050003,
-0x06003f,
-0x070032,
-0x08012c,
-0x090046,
-0x0a0036,
-0x1001b6,
-0x1700a2,
-0x22013a,
-0x230149,
-0x2000b4,
-0x240125,
-0x27004d,
-0x28006a,
-0x2a0060,
-0x2b0052,
-0x2f0065,
-0x320087,
-0x34017f,
-0x3c0156,
-0x3f0072,
-0x41018c,
-0x44012e,
-0x550173,
-0x56017a,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RS780_cp_microcode[][3] = {
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0000ffff, 0x00284621, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000000, 0x00e00000, 0x000 },
-    { 0x00010000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x622 },
-    { 0x00000000, 0x00600000, 0x5d1 },
-    { 0x00000000, 0x00600000, 0x5de },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000f00, 0x00281622, 0x000 },
-    { 0x00000008, 0x00211625, 0x000 },
-    { 0x00000018, 0x00203625, 0x000 },
-    { 0x8d000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x002f0225, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x018 },
-    { 0x00412000, 0x00404811, 0x019 },
-    { 0x00422000, 0x00204811, 0x000 },
-    { 0x8e000000, 0x00204411, 0x000 },
-    { 0x00000028, 0x00204a2d, 0x000 },
-    { 0x90000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x0000000c, 0x00211622, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000019, 0x00211a22, 0x000 },
-    { 0x00000004, 0x00281a26, 0x000 },
-    { 0x00000000, 0x002914c5, 0x000 },
-    { 0x00000019, 0x00203625, 0x000 },
-    { 0x00000000, 0x003a1402, 0x000 },
-    { 0x00000016, 0x00211625, 0x000 },
-    { 0x00000003, 0x00281625, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0xfffffffc, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002914a3, 0x000 },
-    { 0x00000017, 0x00203625, 0x000 },
-    { 0x00008000, 0x00280e22, 0x000 },
-    { 0x00000007, 0x00220e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x20000000, 0x00280e22, 0x000 },
-    { 0x00000006, 0x00210e23, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x00000000, 0x00220222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x038 },
-    { 0x00000000, 0x2ee00000, 0x035 },
-    { 0x00000000, 0x2ce00000, 0x037 },
-    { 0x00000000, 0x00400e2d, 0x039 },
-    { 0x00000008, 0x00200e2d, 0x000 },
-    { 0x00000009, 0x0040122d, 0x046 },
-    { 0x00000001, 0x00400e2d, 0x039 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x03e },
-    { 0x00000008, 0x00401c11, 0x041 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x0000000f, 0x00281e27, 0x000 },
-    { 0x00000003, 0x00221e27, 0x000 },
-    { 0x7fc00000, 0x00281a23, 0x000 },
-    { 0x00000014, 0x00211a26, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000008, 0x00221a26, 0x000 },
-    { 0x00000000, 0x00290cc7, 0x000 },
-    { 0x00000027, 0x00203624, 0x000 },
-    { 0x00007f00, 0x00281221, 0x000 },
-    { 0x00001400, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x04b },
-    { 0x00000001, 0x00290e23, 0x000 },
-    { 0x0000000e, 0x00203623, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfff80000, 0x00294a23, 0x000 },
-    { 0x00000000, 0x003a2c02, 0x000 },
-    { 0x00000002, 0x00220e2b, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x0000000f, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00204a2d, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000029, 0x00200e2d, 0x000 },
-    { 0x060a0200, 0x00294a23, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14e00000, 0x061 },
-    { 0x00000000, 0x2ee00000, 0x05f },
-    { 0x00000000, 0x2ce00000, 0x05e },
-    { 0x00000000, 0x00400e2d, 0x062 },
-    { 0x00000001, 0x00400e2d, 0x062 },
-    { 0x0000000a, 0x00200e2d, 0x000 },
-    { 0x0000000b, 0x0040122d, 0x06a },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x003ffffc, 0x00281223, 0x000 },
-    { 0x00000002, 0x00221224, 0x000 },
-    { 0x7fc00000, 0x00281623, 0x000 },
-    { 0x00000014, 0x00211625, 0x000 },
-    { 0x00000001, 0x00331625, 0x000 },
-    { 0x80000000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00290ca3, 0x000 },
-    { 0x3ffffc00, 0x00290e23, 0x000 },
-    { 0x0000001f, 0x00211e23, 0x000 },
-    { 0x00000000, 0x14e00000, 0x06d },
-    { 0x00000100, 0x00401c11, 0x070 },
-    { 0x0000000d, 0x00201e2d, 0x000 },
-    { 0x000000f0, 0x00281e27, 0x000 },
-    { 0x00000004, 0x00221e27, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0xfffff0ff, 0x00281a30, 0x000 },
-    { 0x0000a028, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948e6, 0x000 },
-    { 0x0000a018, 0x00204411, 0x000 },
-    { 0x3fffffff, 0x00284a23, 0x000 },
-    { 0x0000a010, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000030, 0x0020162d, 0x000 },
-    { 0x00000002, 0x00291625, 0x000 },
-    { 0x00000030, 0x00203625, 0x000 },
-    { 0x00000025, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a3, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x083 },
-    { 0x00000026, 0x0020162d, 0x000 },
-    { 0x00000000, 0x002f00a4, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x084 },
-    { 0x00000000, 0x00400000, 0x08a },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203624, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x08a },
-    { 0x00000000, 0x00600000, 0x5ff },
-    { 0x00000000, 0x00600000, 0x5f3 },
-    { 0x00000002, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x08d },
-    { 0x00000012, 0xc0403620, 0x093 },
-    { 0x00000000, 0x2ee00000, 0x091 },
-    { 0x00000000, 0x2ce00000, 0x090 },
-    { 0x00000002, 0x00400e2d, 0x092 },
-    { 0x00000003, 0x00400e2d, 0x092 },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000012, 0x00203623, 0x000 },
-    { 0x00000003, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x098 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x0a0 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x2ee00000, 0x09e },
-    { 0x00000000, 0x2ce00000, 0x09d },
-    { 0x00000002, 0x00400e2d, 0x09f },
-    { 0x00000003, 0x00400e2d, 0x09f },
-    { 0x0000000c, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x003f0000, 0x00280e23, 0x000 },
-    { 0x00000010, 0x00210e23, 0x000 },
-    { 0x00000011, 0x00203623, 0x000 },
-    { 0x0000001e, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0a7 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x0000001f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0aa },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000008, 0x00210e2b, 0x000 },
-    { 0x0000007f, 0x00280e23, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0e1 },
-    { 0x00000000, 0x27000000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x0b3 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000000c, 0x00221e30, 0x000 },
-    { 0x99800000, 0x00204411, 0x000 },
-    { 0x00000004, 0x0020122d, 0x000 },
-    { 0x00000008, 0x00221224, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00291ce4, 0x000 },
-    { 0x00000000, 0x00604807, 0x12f },
-    { 0x9b000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x9c000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x0033146f, 0x000 },
-    { 0x00000001, 0x00333e23, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0x00203c05, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e007, 0x00204411, 0x000 },
-    { 0x0000000f, 0x0021022b, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0cb },
-    { 0x00f8ff08, 0x00204811, 0x000 },
-    { 0x98000000, 0x00404811, 0x0dc },
-    { 0x000000f0, 0x00280e22, 0x000 },
-    { 0x000000a0, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x0da },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d5 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0d4 },
-    { 0x00003f00, 0x00400c11, 0x0d6 },
-    { 0x00001f00, 0x00400c11, 0x0d6 },
-    { 0x00000f00, 0x00200c11, 0x000 },
-    { 0x00380009, 0x00294a23, 0x000 },
-    { 0x3f000000, 0x00280e2b, 0x000 },
-    { 0x00000002, 0x00220e23, 0x000 },
-    { 0x00000007, 0x00494a23, 0x0dc },
-    { 0x00380f09, 0x00204811, 0x000 },
-    { 0x68000007, 0x00204811, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000a202, 0x00204411, 0x000 },
-    { 0x00ff0000, 0x00280e22, 0x000 },
-    { 0x00000080, 0x00294a23, 0x000 },
-    { 0x00000027, 0x00200e2d, 0x000 },
-    { 0x00000026, 0x0020122d, 0x000 },
-    { 0x00000000, 0x002f0083, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x0ea },
-    { 0x00000000, 0x00600000, 0x5f9 },
-    { 0x00000000, 0x00400000, 0x0eb },
-    { 0x00000000, 0x00600000, 0x5fc },
-    { 0x00000007, 0x0020222d, 0x000 },
-    { 0x00000005, 0x00220e22, 0x000 },
-    { 0x00100000, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000000, 0x003a0c02, 0x000 },
-    { 0x000000ef, 0x00280e23, 0x000 },
-    { 0x00000000, 0x00292068, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000003, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x0f8 },
-    { 0x0000000b, 0x00210228, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0f8 },
-    { 0x00000400, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000001c, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x0fd },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000001e, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x10b },
-    { 0x0000a30f, 0x00204411, 0x000 },
-    { 0x00000011, 0x00200e2d, 0x000 },
-    { 0x00000001, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x104 },
-    { 0xffffffff, 0x00404811, 0x10b },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x107 },
-    { 0x0000ffff, 0x00404811, 0x10b },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x10a },
-    { 0x000000ff, 0x00404811, 0x10b },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0002c400, 0x00204411, 0x000 },
-    { 0x0000001f, 0x00210e22, 0x000 },
-    { 0x00000000, 0x14c00000, 0x112 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000018, 0x40224a20, 0x000 },
-    { 0x00000010, 0xc0424a20, 0x114 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x00000013, 0x00203623, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000000a, 0x00201011, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x11b },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00531224, 0x117 },
-    { 0xffbfffff, 0x00283a2e, 0x000 },
-    { 0x0000001b, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x12e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000d, 0x00204811, 0x000 },
-    { 0x00000018, 0x00220e30, 0x000 },
-    { 0xfc000000, 0x00280e23, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x00000000, 0x00201010, 0x000 },
-    { 0x0000e00e, 0x00204411, 0x000 },
-    { 0x07f8ff08, 0x00204811, 0x000 },
-    { 0x00000000, 0x00294a23, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a24, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00800000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204806, 0x000 },
-    { 0x00000008, 0x00214a27, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x622 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x621 },
-    { 0x00000004, 0x00404c11, 0x135 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000001c, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x13c },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40280620, 0x000 },
-    { 0x00000010, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x00341461, 0x000 },
-    { 0x00000000, 0x00741882, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x147 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x160 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0681a20, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x158 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000001, 0x00300a2f, 0x000 },
-    { 0x00000001, 0x00210a22, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600000, 0x18f },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00202c08, 0x000 },
-    { 0x00000000, 0x00202411, 0x000 },
-    { 0x00000000, 0x00202811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00221e29, 0x000 },
-    { 0x00000000, 0x007048eb, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000001, 0x40330620, 0x000 },
-    { 0x00000000, 0xc0302409, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x181 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x186 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x186 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000001, 0x00530621, 0x182 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0604800, 0x197 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000011, 0x0020062d, 0x000 },
-    { 0x00000000, 0x0078042a, 0x2fb },
-    { 0x00000000, 0x00202809, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x174 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x194 },
-    { 0x00000015, 0xc0203620, 0x000 },
-    { 0x00000016, 0xc0203620, 0x000 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x46000000, 0x00600811, 0x1b2 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x19b },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00804811, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000ffff, 0x40281620, 0x000 },
-    { 0x00000010, 0xc0811a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x00000008, 0x00221e30, 0x000 },
-    { 0x00000029, 0x00201a2d, 0x000 },
-    { 0x0000e000, 0x00204411, 0x000 },
-    { 0xfffbff09, 0x00204811, 0x000 },
-    { 0x0000000f, 0x0020222d, 0x000 },
-    { 0x00001fff, 0x00294a28, 0x000 },
-    { 0x00000006, 0x0020222d, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000100, 0x00201811, 0x000 },
-    { 0x00000008, 0x00621e28, 0x12f },
-    { 0x00000008, 0x00822228, 0x000 },
-    { 0x0002c000, 0x00204411, 0x000 },
-    { 0x00000015, 0x00600e2d, 0x1bd },
-    { 0x00000016, 0x00600e2d, 0x1bd },
-    { 0x0000c008, 0x00204411, 0x000 },
-    { 0x00000017, 0x00200e2d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x1b9 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x39000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00804802, 0x000 },
-    { 0x00000018, 0x00202e2d, 0x000 },
-    { 0x00000000, 0x003b0d63, 0x000 },
-    { 0x00000008, 0x00224a23, 0x000 },
-    { 0x00000010, 0x00224a23, 0x000 },
-    { 0x00000018, 0x00224a23, 0x000 },
-    { 0x00000000, 0x00804803, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00000007, 0x0021062f, 0x000 },
-    { 0x00000013, 0x00200a2d, 0x000 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000ffff, 0x40282220, 0x000 },
-    { 0x0000000f, 0x00262228, 0x000 },
-    { 0x00000010, 0x40212620, 0x000 },
-    { 0x0000000f, 0x00262629, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1e0 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000081, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000080, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1dc },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1d8 },
-    { 0x00000001, 0x00202c11, 0x000 },
-    { 0x0000001f, 0x00280a22, 0x000 },
-    { 0x0000001f, 0x00282a2a, 0x000 },
-    { 0x00000001, 0x00530621, 0x1d1 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000002, 0x00304a2f, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000001, 0x00301e2f, 0x000 },
-    { 0x00000000, 0x002f0227, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00600000, 0x1e9 },
-    { 0x00000001, 0x00531e27, 0x1e5 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x0000000f, 0x00260e23, 0x000 },
-    { 0x00000010, 0xc0211220, 0x000 },
-    { 0x0000000f, 0x00261224, 0x000 },
-    { 0x00000000, 0x00201411, 0x000 },
-    { 0x00000000, 0x00601811, 0x2bb },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022b, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x1f8 },
-    { 0x00000010, 0x00221628, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a29, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x0020480a, 0x000 },
-    { 0x00000000, 0x00202c11, 0x000 },
-    { 0x00000010, 0x00221623, 0x000 },
-    { 0xffff0000, 0x00281625, 0x000 },
-    { 0x0000ffff, 0x00281a24, 0x000 },
-    { 0x00000000, 0x002948c5, 0x000 },
-    { 0x00000000, 0x00731503, 0x205 },
-    { 0x00000000, 0x00201805, 0x000 },
-    { 0x00000000, 0x00731524, 0x205 },
-    { 0x00000000, 0x002d14c5, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00202802, 0x000 },
-    { 0x00000000, 0x00202003, 0x000 },
-    { 0x00000000, 0x00802404, 0x000 },
-    { 0x0000000f, 0x00210225, 0x000 },
-    { 0x00000000, 0x14c00000, 0x621 },
-    { 0x00000000, 0x002b1405, 0x000 },
-    { 0x00000001, 0x00901625, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001a, 0x00294a22, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a21, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000ffff, 0x40281220, 0x000 },
-    { 0x00000010, 0xc0211a20, 0x000 },
-    { 0x0000ffff, 0x40280e20, 0x000 },
-    { 0x00000010, 0xc0211620, 0x000 },
-    { 0x00000000, 0x00741465, 0x2bb },
-    { 0x0001a1fd, 0x00604411, 0x2e0 },
-    { 0x00000001, 0x00330621, 0x000 },
-    { 0x00000000, 0x002f0221, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x219 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x212 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x5de },
-    { 0x00000000, 0x0040040f, 0x213 },
-    { 0x00000000, 0x00600000, 0x5d1 },
-    { 0x00000000, 0x00600000, 0x5de },
-    { 0x00000210, 0x00600411, 0x315 },
-    { 0x00000000, 0x00600000, 0x1a0 },
-    { 0x00000000, 0x00600000, 0x19c },
-    { 0x00000000, 0x00600000, 0x2bb },
-    { 0x00000000, 0x00600000, 0x2a3 },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204808, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x232 },
-    { 0x00000000, 0x00600000, 0x13a },
-    { 0x00000000, 0x00400000, 0x236 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x236 },
-    { 0x00000000, 0xc0404800, 0x233 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x00600411, 0x2fb },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000000, 0x00600000, 0x5d1 },
-    { 0x0000a00c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000018, 0x40210a20, 0x000 },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x24c },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x00080101, 0x00292228, 0x000 },
-    { 0x00000014, 0x00203628, 0x000 },
-    { 0x0000a30c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x251 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000010, 0x00600411, 0x315 },
-    { 0x3f800000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00000000, 0x00600000, 0x27c },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000001, 0x00211e27, 0x000 },
-    { 0x00000000, 0x14e00000, 0x26a },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x0000ffff, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00341c27, 0x000 },
-    { 0x00000000, 0x12c00000, 0x25f },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e5, 0x000 },
-    { 0x00000000, 0x08c00000, 0x262 },
-    { 0x00000000, 0x00201407, 0x000 },
-    { 0x00000012, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00211e27, 0x000 },
-    { 0x00000000, 0x00341c47, 0x000 },
-    { 0x00000000, 0x12c00000, 0x267 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x08c00000, 0x26a },
-    { 0x00000000, 0x00201807, 0x000 },
-    { 0x00000000, 0x00600000, 0x2c1 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x00000000, 0x00342023, 0x000 },
-    { 0x00000000, 0x12c00000, 0x272 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x271 },
-    { 0x00000016, 0x00404811, 0x276 },
-    { 0x00000018, 0x00404811, 0x276 },
-    { 0x00000000, 0x00342044, 0x000 },
-    { 0x00000000, 0x12c00000, 0x275 },
-    { 0x00000017, 0x00404811, 0x276 },
-    { 0x00000019, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0x00604411, 0x2e9 },
-    { 0x00003fff, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x256 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x00000010, 0x40210620, 0x000 },
-    { 0x0000ffff, 0xc0280a20, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x00000010, 0x40211620, 0x000 },
-    { 0x0000ffff, 0xc0881a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00042004, 0x00604411, 0x622 },
-    { 0x00000000, 0x00600000, 0x5d1 },
-    { 0x00000000, 0xc0600000, 0x2a3 },
-    { 0x00000005, 0x00200a2d, 0x000 },
-    { 0x00000008, 0x00220a22, 0x000 },
-    { 0x0000002b, 0x00201a2d, 0x000 },
-    { 0x0000001c, 0x00201e2d, 0x000 },
-    { 0x00007000, 0x00281e27, 0x000 },
-    { 0x00000000, 0x00311ce6, 0x000 },
-    { 0x0000002a, 0x00201a2d, 0x000 },
-    { 0x0000000c, 0x00221a26, 0x000 },
-    { 0x00000000, 0x002f00e6, 0x000 },
-    { 0x00000000, 0x06e00000, 0x292 },
-    { 0x00000000, 0x00201c11, 0x000 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000010, 0x00201811, 0x000 },
-    { 0x00000000, 0x00691ce2, 0x12f },
-    { 0x93800000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x95000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f022f, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x29d },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x92000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000001c, 0x00403627, 0x000 },
-    { 0x0000000c, 0xc0220a20, 0x000 },
-    { 0x00000029, 0x00203622, 0x000 },
-    { 0x00000028, 0xc0403620, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000009, 0x00204811, 0x000 },
-    { 0xa1000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00804811, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce3, 0x000 },
-    { 0x00000021, 0x00203627, 0x000 },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002c1ce4, 0x000 },
-    { 0x00000022, 0x00203627, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a3, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x00000000, 0x002d1d07, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203624, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000023, 0x00203627, 0x000 },
-    { 0x00000000, 0x00311cc4, 0x000 },
-    { 0x00000024, 0x00803627, 0x000 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14c00000, 0x2dc },
-    { 0x00000000, 0x00400000, 0x2d9 },
-    { 0x0000001a, 0x00203627, 0x000 },
-    { 0x0000001b, 0x00203628, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000002, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2d9 },
-    { 0x00000003, 0x00210227, 0x000 },
-    { 0x00000000, 0x14e00000, 0x2dc },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e1, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120a1, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000024, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x002e00e2, 0x000 },
-    { 0x00000000, 0x02c00000, 0x2dc },
-    { 0x00000022, 0x00201e2d, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x00000000, 0x002e00e8, 0x000 },
-    { 0x00000000, 0x06c00000, 0x2dc },
-    { 0x00000000, 0x00600000, 0x5ff },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2b5 },
-    { 0x00000000, 0x00600000, 0x5f6 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x00000000, 0x00600000, 0x2a7 },
-    { 0x00000000, 0x00400000, 0x2de },
-    { 0x0000001a, 0x00201e2d, 0x000 },
-    { 0x0000001b, 0x0080222d, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000000, 0x00311ca1, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294847, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e21, 0x000 },
-    { 0x00000000, 0x003120c2, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00311ca3, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294887, 0x000 },
-    { 0x00000001, 0x00220a21, 0x000 },
-    { 0x00000000, 0x003008a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000010, 0x00221e23, 0x000 },
-    { 0x00000000, 0x003120c4, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x003808c5, 0x000 },
-    { 0x00000000, 0x00300841, 0x000 },
-    { 0x00000001, 0x00220a22, 0x000 },
-    { 0x00000000, 0x003308a2, 0x000 },
-    { 0x00000010, 0x00221e22, 0x000 },
-    { 0x00000010, 0x00212222, 0x000 },
-    { 0x00000000, 0x00894907, 0x000 },
-    { 0x00000017, 0x0020222d, 0x000 },
-    { 0x00000000, 0x14c00000, 0x318 },
-    { 0xffffffef, 0x00280621, 0x000 },
-    { 0x00000014, 0x0020222d, 0x000 },
-    { 0x0000f8e0, 0x00204411, 0x000 },
-    { 0x00000000, 0x00294901, 0x000 },
-    { 0x00000000, 0x00894901, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x060a0200, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0204811, 0x000 },
-    { 0x8a000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00002257, 0x00204411, 0x000 },
-    { 0x00000003, 0xc0484a20, 0x000 },
-    { 0x0000225d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0x00600000, 0x5de },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00384a22, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0001a1fd, 0x00204411, 0x000 },
-    { 0x00000000, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x00000001, 0x40304a20, 0x000 },
-    { 0x00000002, 0xc0304a20, 0x000 },
-    { 0x00000001, 0x00530a22, 0x355 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x35e },
-    { 0x00000014, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x36c },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00604802, 0x374 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x370 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x367 },
-    { 0x00000028, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5ba },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x367 },
-    { 0x0000002c, 0x00203626, 0x000 },
-    { 0x00000049, 0x00201811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000001, 0x00331a26, 0x000 },
-    { 0x00000000, 0x002f0226, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x376 },
-    { 0x0000002c, 0x00801a2d, 0x000 },
-    { 0x0000003f, 0xc0280a20, 0x000 },
-    { 0x00000015, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x38c },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b7 },
-    { 0x00000016, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3b9 },
-    { 0x00000020, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3a2 },
-    { 0x0000000f, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3ae },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x3ae },
-    { 0x0000001e, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x396 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x08000000, 0x00290a22, 0x000 },
-    { 0x00000003, 0x40210e20, 0x000 },
-    { 0x0000000c, 0xc0211220, 0x000 },
-    { 0x00080000, 0x00281224, 0x000 },
-    { 0x00000014, 0xc0221620, 0x000 },
-    { 0x00000000, 0x002914a4, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x002948a2, 0x000 },
-    { 0x0000a1fe, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000016, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000015, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x398 },
-    { 0x0000210e, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000017, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000003, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3a4 },
-    { 0x00002108, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404802, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x80000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000010, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3b4 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000006, 0x00404811, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x374 },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x0000001d, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3ce },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x00000018, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000011, 0x00210230, 0x000 },
-    { 0x00000000, 0x14e00000, 0x3c2 },
-    { 0x00002100, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0xbabecafe, 0x00204811, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000004, 0x00404811, 0x000 },
-    { 0x00002170, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000a, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3d3 },
-    { 0x8c000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00003fff, 0x40280a20, 0x000 },
-    { 0x80000000, 0x40280e20, 0x000 },
-    { 0x40000000, 0xc0281220, 0x000 },
-    { 0x00040000, 0x00694622, 0x622 },
-    { 0x00000000, 0x00201410, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e1 },
-    { 0x00000000, 0xc0401800, 0x3e4 },
-    { 0x00003fff, 0xc0281a20, 0x000 },
-    { 0x00040000, 0x00694626, 0x622 },
-    { 0x00000000, 0x00201810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x3e7 },
-    { 0x00000000, 0xc0401c00, 0x3ea },
-    { 0x00003fff, 0xc0281e20, 0x000 },
-    { 0x00040000, 0x00694627, 0x622 },
-    { 0x00000000, 0x00201c10, 0x000 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0x002820c5, 0x000 },
-    { 0x00000000, 0x004948e8, 0x000 },
-    { 0xa5800000, 0x00200811, 0x000 },
-    { 0x00002000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x40204800, 0x000 },
-    { 0x0000001f, 0xc0210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x3f7 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00008000, 0x00204811, 0x000 },
-    { 0x0000ffff, 0xc0481220, 0x3ff },
-    { 0xa7800000, 0x00200811, 0x000 },
-    { 0x0000a000, 0x00200c11, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0x00204402, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000ffff, 0xc0281220, 0x000 },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00304883, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x83000000, 0x00604411, 0x412 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xa9800000, 0x00200811, 0x000 },
-    { 0x0000c000, 0x00400c11, 0x3fa },
-    { 0xab800000, 0x00200811, 0x000 },
-    { 0x0000f8e0, 0x00400c11, 0x3fa },
-    { 0xad800000, 0x00200811, 0x000 },
-    { 0x0000f880, 0x00400c11, 0x3fa },
-    { 0xb3800000, 0x00200811, 0x000 },
-    { 0x0000f3fc, 0x00400c11, 0x3fa },
-    { 0xaf800000, 0x00200811, 0x000 },
-    { 0x0000e000, 0x00400c11, 0x3fa },
-    { 0xb1800000, 0x00200811, 0x000 },
-    { 0x0000f000, 0x00400c11, 0x3fa },
-    { 0x83000000, 0x00204411, 0x000 },
-    { 0x00002148, 0x00204811, 0x000 },
-    { 0x84000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x1d000000, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x01182000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0218a000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0318c000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0418f8e0, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0518f880, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0618e000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0718f000, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x0818f3fc, 0xc0304620, 0x000 },
-    { 0x00000000, 0xd9004800, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x00000033, 0xc0300a20, 0x000 },
-    { 0x00000000, 0xc0403440, 0x000 },
-    { 0x00000030, 0x00200a2d, 0x000 },
-    { 0x00000000, 0xc0290c40, 0x000 },
-    { 0x00000030, 0x00203623, 0x000 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x00a0000a, 0x000 },
-    { 0x86000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x85000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0x00404801, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x00000018, 0x40210220, 0x000 },
-    { 0x00000000, 0x14c00000, 0x447 },
-    { 0x00800000, 0xc0494a20, 0x448 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x06e00000, 0x450 },
-    { 0x00000004, 0x00200811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x622 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00404c02, 0x450 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x00000000, 0xc0201400, 0x000 },
-    { 0x00000000, 0xc0201800, 0x000 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x461 },
-    { 0x00000000, 0xc0202000, 0x000 },
-    { 0x00000004, 0x002f0228, 0x000 },
-    { 0x00000000, 0x06e00000, 0x461 },
-    { 0x00000004, 0x00202011, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x00000010, 0x00280a23, 0x000 },
-    { 0x00000010, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x469 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0x00694624, 0x622 },
-    { 0x00000000, 0x00400000, 0x46e },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00604805, 0x627 },
-    { 0x00000000, 0x002824f0, 0x000 },
-    { 0x00000007, 0x00280a23, 0x000 },
-    { 0x00000001, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x475 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x04e00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00000002, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47a },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x02e00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00000003, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x47f },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00000004, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x484 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00000005, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x489 },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x06e00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00000006, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x48e },
-    { 0x00000000, 0x002f00c9, 0x000 },
-    { 0x00000000, 0x08e00000, 0x48e },
-    { 0x00000000, 0x00400000, 0x49b },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x000 },
-    { 0x00000008, 0x00210a23, 0x000 },
-    { 0x00000000, 0x14c00000, 0x498 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00007f00, 0x00280a21, 0x000 },
-    { 0x00004500, 0x002f0222, 0x000 },
-    { 0x00000000, 0x0ae00000, 0x4a1 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x00404c08, 0x461 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000010, 0x40210e20, 0x000 },
-    { 0x00000011, 0x40211220, 0x000 },
-    { 0x00000012, 0x40211620, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00210225, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4ab },
-    { 0x00040000, 0xc0494a20, 0x4ac },
-    { 0xfffbffff, 0xc0284a20, 0x000 },
-    { 0x00000000, 0x00210223, 0x000 },
-    { 0x00000000, 0x14e00000, 0x4b8 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x0000000c, 0x00204811, 0x000 },
-    { 0x00000000, 0x00200010, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4b4 },
-    { 0xa0000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000004, 0x00204811, 0x000 },
-    { 0x0000216b, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000216c, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204810, 0x000 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0ce00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4b2 },
-    { 0x00000000, 0xc0210a20, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4cb },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x627 },
-    { 0x00000000, 0x00400000, 0x4cf },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00040000, 0xc0294620, 0x000 },
-    { 0x00000000, 0xc0600000, 0x622 },
-    { 0x00000001, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4d6 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00404811, 0x000 },
-    { 0x00000000, 0xc0204400, 0x000 },
-    { 0x00000000, 0xc0404810, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x000021f8, 0x00204411, 0x000 },
-    { 0x0000000e, 0x00204811, 0x000 },
-    { 0x000421f9, 0x00604411, 0x622 },
-    { 0x00000000, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x4d8 },
-    { 0x00002180, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000003, 0x00333e2f, 0x000 },
-    { 0x00000001, 0x00210221, 0x000 },
-    { 0x00000000, 0x14e00000, 0x508 },
-    { 0x0000002c, 0x00200a2d, 0x000 },
-    { 0x00040000, 0x18e00c11, 0x4f7 },
-    { 0x00000001, 0x00333e2f, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xd8c04800, 0x4eb },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000002d, 0x0020122d, 0x000 },
-    { 0x00000000, 0x00290c83, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204802, 0x000 },
-    { 0x00000000, 0x00204803, 0x000 },
-    { 0x00000008, 0x00300a22, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000011, 0x00210224, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000000, 0x00400000, 0x4b2 },
-    { 0x0000002c, 0xc0203620, 0x000 },
-    { 0x0000002d, 0xc0403620, 0x000 },
-    { 0x0000000f, 0x00210221, 0x000 },
-    { 0x00000000, 0x14c00000, 0x50d },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00000000, 0xd9000000, 0x000 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0xb5000000, 0x00204411, 0x000 },
-    { 0x00002000, 0x00204811, 0x000 },
-    { 0xb6000000, 0x00204411, 0x000 },
-    { 0x0000a000, 0x00204811, 0x000 },
-    { 0xb7000000, 0x00204411, 0x000 },
-    { 0x0000c000, 0x00204811, 0x000 },
-    { 0xb8000000, 0x00204411, 0x000 },
-    { 0x0000f8e0, 0x00204811, 0x000 },
-    { 0xb9000000, 0x00204411, 0x000 },
-    { 0x0000f880, 0x00204811, 0x000 },
-    { 0xba000000, 0x00204411, 0x000 },
-    { 0x0000e000, 0x00204811, 0x000 },
-    { 0xbb000000, 0x00204411, 0x000 },
-    { 0x0000f000, 0x00204811, 0x000 },
-    { 0xbc000000, 0x00204411, 0x000 },
-    { 0x0000f3fc, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000002, 0x00204811, 0x000 },
-    { 0x000000ff, 0x00280e30, 0x000 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x521 },
-    { 0x00000000, 0xc0200800, 0x000 },
-    { 0x00000000, 0x14c00000, 0x536 },
-    { 0x00000000, 0x00200c11, 0x000 },
-    { 0x0000001c, 0x00203623, 0x000 },
-    { 0x0000002b, 0x00203623, 0x000 },
-    { 0x00000029, 0x00203623, 0x000 },
-    { 0x00000028, 0x00203623, 0x000 },
-    { 0x00000017, 0x00203623, 0x000 },
-    { 0x00000025, 0x00203623, 0x000 },
-    { 0x00000026, 0x00203623, 0x000 },
-    { 0x00000015, 0x00203623, 0x000 },
-    { 0x00000016, 0x00203623, 0x000 },
-    { 0xffffe000, 0x00200c11, 0x000 },
-    { 0x00000021, 0x00203623, 0x000 },
-    { 0x00000022, 0x00203623, 0x000 },
-    { 0x00001fff, 0x00200c11, 0x000 },
-    { 0x00000023, 0x00203623, 0x000 },
-    { 0x00000024, 0x00203623, 0x000 },
-    { 0xf1ffffff, 0x00283a2e, 0x000 },
-    { 0x0000001a, 0xc0220e20, 0x000 },
-    { 0x00000000, 0x0029386e, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000006, 0x00204811, 0x000 },
-    { 0x0000002a, 0x40203620, 0x000 },
-    { 0x87000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0x9d000000, 0x00204411, 0x000 },
-    { 0x0000001f, 0x40214a20, 0x000 },
-    { 0x96000000, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0200c00, 0x000 },
-    { 0x00000000, 0xc0201000, 0x000 },
-    { 0x0000001f, 0x00211624, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x0000001d, 0x00203623, 0x000 },
-    { 0x00000003, 0x00281e23, 0x000 },
-    { 0x00000008, 0x00222223, 0x000 },
-    { 0xfffff000, 0x00282228, 0x000 },
-    { 0x00000000, 0x002920e8, 0x000 },
-    { 0x0000001f, 0x00203628, 0x000 },
-    { 0x00000018, 0x00211e23, 0x000 },
-    { 0x00000020, 0x00203627, 0x000 },
-    { 0x00000002, 0x00221624, 0x000 },
-    { 0x00000000, 0x003014a8, 0x000 },
-    { 0x0000001e, 0x00203625, 0x000 },
-    { 0x00000003, 0x00211a24, 0x000 },
-    { 0x10000000, 0x00281a26, 0x000 },
-    { 0xefffffff, 0x00283a2e, 0x000 },
-    { 0x00000000, 0x004938ce, 0x610 },
-    { 0x00000001, 0x40280a20, 0x000 },
-    { 0x00000006, 0x40280e20, 0x000 },
-    { 0x00000300, 0xc0281220, 0x000 },
-    { 0x00000008, 0x00211224, 0x000 },
-    { 0x00000000, 0xc0201620, 0x000 },
-    { 0x00000000, 0xc0201a20, 0x000 },
-    { 0x00000000, 0x00210222, 0x000 },
-    { 0x00000000, 0x14c00000, 0x56c },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x622 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00020000, 0x00294a26, 0x000 },
-    { 0x00000000, 0x00204810, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x574 },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x582 },
-    { 0x00000002, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x574 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00002258, 0x00300a24, 0x000 },
-    { 0x00040000, 0x00694622, 0x622 },
-    { 0x00000000, 0xc0201c10, 0x000 },
-    { 0x00000000, 0xc0400000, 0x582 },
-    { 0x00000000, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x578 },
-    { 0x00000000, 0xc0201c00, 0x000 },
-    { 0x00000000, 0xc0400000, 0x582 },
-    { 0x00000004, 0x002f0223, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x580 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x0000216d, 0x00204411, 0x000 },
-    { 0x00000000, 0xc0204800, 0x000 },
-    { 0x00000000, 0xc0604800, 0x627 },
-    { 0x00000000, 0x00401c10, 0x582 },
-    { 0x00000000, 0xc0200000, 0x000 },
-    { 0x00000000, 0xc0400000, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x584 },
-    { 0x00000000, 0x00600000, 0x5c3 },
-    { 0x00000000, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x592 },
-    { 0x0000a2b7, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x00000033, 0x0020262d, 0x000 },
-    { 0x0000001a, 0x00212229, 0x000 },
-    { 0x00000006, 0x00222629, 0x000 },
-    { 0x0000a2c4, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x590 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d1, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000001, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5a0 },
-    { 0x0000a2bb, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x00000034, 0x0020262d, 0x000 },
-    { 0x0000001a, 0x00212229, 0x000 },
-    { 0x00000006, 0x00222629, 0x000 },
-    { 0x0000a2c5, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x59e },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d2, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x00000002, 0x002f0224, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x5ae },
-    { 0x0000a2bf, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x00000035, 0x0020262d, 0x000 },
-    { 0x0000001a, 0x00212229, 0x000 },
-    { 0x00000006, 0x00222629, 0x000 },
-    { 0x0000a2c6, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5ac },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d3, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x0000a2c3, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204807, 0x000 },
-    { 0x00000036, 0x0020262d, 0x000 },
-    { 0x0000001a, 0x00212229, 0x000 },
-    { 0x00000006, 0x00222629, 0x000 },
-    { 0x0000a2c7, 0x00204411, 0x000 },
-    { 0x00000000, 0x003048e9, 0x000 },
-    { 0x00000000, 0x00e00000, 0x5b8 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404808, 0x000 },
-    { 0x0000a2d4, 0x00204411, 0x000 },
-    { 0x00000001, 0x00504a28, 0x000 },
-    { 0x85000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0x0000304a, 0x00204411, 0x000 },
-    { 0x01000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x00400000, 0x5be },
-    { 0xa4000000, 0xc0204411, 0x000 },
-    { 0x00000000, 0xc0404800, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5c3 },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x0000003f, 0x00204811, 0x000 },
-    { 0x00000005, 0x00204811, 0x000 },
-    { 0x0000a1f4, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x88000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0xff000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x00000002, 0x00804811, 0x000 },
-    { 0x00000000, 0x0ee00000, 0x5d6 },
-    { 0x00001000, 0x00200811, 0x000 },
-    { 0x0000002b, 0x00203622, 0x000 },
-    { 0x00000000, 0x00600000, 0x5da },
-    { 0x00000000, 0x00600000, 0x5c3 },
-    { 0x98000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00804811, 0x000 },
-    { 0x00000000, 0xc0600000, 0x5da },
-    { 0x00000000, 0xc0400400, 0x001 },
-    { 0x0000a2a4, 0x00204411, 0x000 },
-    { 0x00000022, 0x00204811, 0x000 },
-    { 0x89000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00404811, 0x5cd },
-    { 0x97000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x8a000000, 0x00204411, 0x000 },
-    { 0x00000000, 0x00404811, 0x5cd },
-    { 0x00000000, 0x00600000, 0x5f3 },
-    { 0x0001a2a4, 0xc0204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x374 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x09800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x0004217f, 0x00604411, 0x622 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x000 },
-    { 0x00000004, 0x00404c11, 0x5ed },
-    { 0x00000000, 0x00400000, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000004, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffffb, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0x00000008, 0x00291e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x00000017, 0x00201e2d, 0x000 },
-    { 0xfffffff7, 0x00281e27, 0x000 },
-    { 0x00000017, 0x00803627, 0x000 },
-    { 0x0001a2a4, 0x00204411, 0x000 },
-    { 0x00000016, 0x00604811, 0x374 },
-    { 0x00002010, 0x00204411, 0x000 },
-    { 0x00010000, 0x00204811, 0x000 },
-    { 0x0000217c, 0x00204411, 0x000 },
-    { 0x01800000, 0x00204811, 0x000 },
-    { 0xffffffff, 0x00204811, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000000, 0x17000000, 0x000 },
-    { 0x81000000, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0004217f, 0x00604411, 0x622 },
-    { 0x0000001f, 0x00210230, 0x000 },
-    { 0x00000000, 0x14c00000, 0x621 },
-    { 0x00000010, 0x00404c11, 0x607 },
-    { 0x00000000, 0xc0200400, 0x000 },
-    { 0x00000000, 0x38c00000, 0x000 },
-    { 0x0000001d, 0x00200a2d, 0x000 },
-    { 0x0000001e, 0x00200e2d, 0x000 },
-    { 0x0000001f, 0x0020122d, 0x000 },
-    { 0x00000020, 0x0020162d, 0x000 },
-    { 0x00002169, 0x00204411, 0x000 },
-    { 0x00000000, 0x00204804, 0x000 },
-    { 0x00000000, 0x00204805, 0x000 },
-    { 0x00000000, 0x00204801, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000004, 0x00301224, 0x000 },
-    { 0x00000000, 0x002f0064, 0x000 },
-    { 0x00000000, 0x0cc00000, 0x620 },
-    { 0x00000003, 0x00281a22, 0x000 },
-    { 0x00000008, 0x00221222, 0x000 },
-    { 0xfffff000, 0x00281224, 0x000 },
-    { 0x00000000, 0x002910c4, 0x000 },
-    { 0x0000001f, 0x00403624, 0x000 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x622 },
-    { 0x9f000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x625 },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x1ac00000, 0x627 },
-    { 0x9e000000, 0x00204411, 0x000 },
-    { 0xcafebabe, 0x00204811, 0x000 },
-    { 0x00000000, 0x1ae00000, 0x62a },
-    { 0x00000000, 0x00800000, 0x000 },
-    { 0x00000000, 0x00600000, 0x00b },
-    { 0x00001000, 0x00600411, 0x315 },
-    { 0x00000000, 0x00200411, 0x000 },
-    { 0x00000000, 0x00600811, 0x1b2 },
-    { 0x0000225c, 0x00204411, 0x000 },
-    { 0x00000003, 0x00204811, 0x000 },
-    { 0x00002256, 0x00204411, 0x000 },
-    { 0x0000001b, 0x00204811, 0x000 },
-    { 0x0000a1fc, 0x00204411, 0x000 },
-    { 0x00000001, 0x00204811, 0x000 },
-    { 0x0001a1fd, 0xc0204411, 0x000 },
-    { 0x00000021, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000024, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000022, 0x0020222d, 0x000 },
-    { 0x0000ffff, 0x00282228, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00204811, 0x000 },
-    { 0x00000023, 0x00201e2d, 0x000 },
-    { 0x00000010, 0x00221e27, 0x000 },
-    { 0x00000000, 0x00294907, 0x000 },
-    { 0x00000000, 0x00404811, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x00000000, 0x00000000, 0x000 },
-    { 0x0142050a, 0x05ba0250, 0x000 },
-    { 0x01c30168, 0x044105ba, 0x000 },
-    { 0x02250209, 0x02500151, 0x000 },
-    { 0x02230245, 0x02a00241, 0x000 },
-    { 0x03d705ba, 0x05ba05ba, 0x000 },
-    { 0x05e205e3, 0x031f05ba, 0x000 },
-    { 0x032005bf, 0x0320034a, 0x000 },
-    { 0x03340282, 0x034c033e, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x05ba0557, 0x05ba032a, 0x000 },
-    { 0x03bc05ba, 0x04c3034e, 0x000 },
-    { 0x04a20455, 0x043f05ba, 0x000 },
-    { 0x04d805ba, 0x044304e5, 0x000 },
-    { 0x0455050f, 0x035b037b, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x05ba05ba, 0x05d805c1, 0x000 },
-    { 0x05ba05ba, 0x000705ba, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x03f803ed, 0x04080406, 0x000 },
-    { 0x040e040a, 0x040c0410, 0x000 },
-    { 0x041c0418, 0x04240420, 0x000 },
-    { 0x042c0428, 0x04340430, 0x000 },
-    { 0x05ba05ba, 0x043a0438, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x05ba05ba, 0x05ba05ba, 0x000 },
-    { 0x0002060e, 0x062c0006, 0x000 },
-};
-
-static const u32 RS780_pfp_microcode[] = {
-0xca0400,
-0xa00000,
-0x7e828b,
-0x7c038b,
-0x8001db,
-0x7c038b,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xc41838,
-0xca2400,
-0xca2800,
-0x9581cb,
-0xc41c3a,
-0xc3c000,
-0xca0800,
-0xca0c00,
-0x7c744b,
-0xc20005,
-0x99c000,
-0xc41c3a,
-0x7c744c,
-0xc0ffe0,
-0x042c08,
-0x309002,
-0x7d2500,
-0x351402,
-0x7d350b,
-0x255407,
-0x7cd580,
-0x259c07,
-0x95c004,
-0xd5001b,
-0x7eddc1,
-0x7d9d80,
-0xd6801b,
-0xd5801b,
-0xd4401e,
-0xd5401e,
-0xd6401e,
-0xd6801e,
-0xd4801e,
-0xd4c01e,
-0x9783d3,
-0xd5c01e,
-0xca0800,
-0x80001a,
-0xca0c00,
-0xe4011e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xe4013e,
-0xd4001e,
-0x80000c,
-0xc41838,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0xca0c00,
-0x8001db,
-0xd48024,
-0xca0800,
-0x7c00c0,
-0xc81425,
-0xc81824,
-0x7c9488,
-0x7c9880,
-0xc20003,
-0xd40075,
-0x7c744c,
-0x800064,
-0xd4401e,
-0xca1800,
-0xd4401e,
-0xd5801e,
-0x800062,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xe2001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xd40075,
-0xd4401e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd48019,
-0xd4c018,
-0xd50017,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c01,
-0xd48060,
-0x94c003,
-0x041001,
-0x041002,
-0xd50025,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xd48061,
-0xd4401e,
-0x800000,
-0xd4801e,
-0xca0800,
-0xca0c00,
-0xd4401e,
-0xd48016,
-0xd4c016,
-0xd4801e,
-0x8001db,
-0xd4c01e,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x948004,
-0xca1400,
-0xe420f3,
-0xd42013,
-0xd56065,
-0xd4e01c,
-0xd5201c,
-0xd5601c,
-0x800000,
-0x062001,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9483f7,
-0xca1400,
-0xe420f3,
-0x80009c,
-0xd42013,
-0xc60843,
-0xca0c00,
-0xca1000,
-0x9883ef,
-0xca1400,
-0xd40064,
-0x8000b0,
-0x000000,
-0xc41432,
-0xc61843,
-0xc4082f,
-0x954005,
-0xc40c30,
-0xd4401e,
-0x800000,
-0xee001e,
-0x9583f5,
-0xc41031,
-0xd44033,
-0xd52065,
-0xd4a01c,
-0xd4e01c,
-0xd5201c,
-0xe4015e,
-0xd4001e,
-0x800000,
-0x062001,
-0xca1800,
-0x0a2001,
-0xd60076,
-0xc40836,
-0x988007,
-0xc61045,
-0x950110,
-0xd4001f,
-0xd46062,
-0x800000,
-0xd42062,
-0xcc3835,
-0xcc1433,
-0x8401de,
-0xd40072,
-0xd5401e,
-0x800000,
-0xee001e,
-0xe2001a,
-0x8401de,
-0xe2001a,
-0xcc104b,
-0xcc0447,
-0x2c9401,
-0x7d098b,
-0x984005,
-0x7d15cb,
-0xd4001a,
-0x8001db,
-0xd4006d,
-0x344401,
-0xcc0c48,
-0x98403a,
-0xcc2c4a,
-0x958004,
-0xcc0449,
-0x8001db,
-0xd4001a,
-0xd4c01a,
-0x282801,
-0x840113,
-0xcc1003,
-0x98801b,
-0x04380c,
-0x840113,
-0xcc1003,
-0x988017,
-0x043808,
-0x840113,
-0xcc1003,
-0x988013,
-0x043804,
-0x840113,
-0xcc1003,
-0x988014,
-0xcc104c,
-0x9a8009,
-0xcc144d,
-0x9840dc,
-0xd4006d,
-0xcc1848,
-0xd5001a,
-0xd5401a,
-0x8000ec,
-0xd5801a,
-0x96c0d5,
-0xd4006d,
-0x8001db,
-0xd4006e,
-0x9ac003,
-0xd4006d,
-0xd4006e,
-0x800000,
-0xec007f,
-0x9ac0cc,
-0xd4006d,
-0x8001db,
-0xd4006e,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0x7d9103,
-0x7dd583,
-0x7d190c,
-0x35cc1f,
-0x35701f,
-0x7cf0cb,
-0x7cd08b,
-0x880000,
-0x7e8e8b,
-0x95c004,
-0xd4006e,
-0x8001db,
-0xd4001a,
-0xd4c01a,
-0xcc0803,
-0xcc0c03,
-0xcc1003,
-0xcc1403,
-0xcc1803,
-0xcc1c03,
-0xcc2403,
-0xcc2803,
-0x35c41f,
-0x36b01f,
-0x7c704b,
-0x34f01f,
-0x7c704b,
-0x35701f,
-0x7c704b,
-0x7d8881,
-0x7dccc1,
-0x7e5101,
-0x7e9541,
-0x7c9082,
-0x7cd4c2,
-0x7c848b,
-0x9ac003,
-0x7c8c8b,
-0x2c8801,
-0x98809e,
-0xd4006d,
-0x98409c,
-0xd4006e,
-0xcc084c,
-0xcc0c4d,
-0xcc1048,
-0xd4801a,
-0xd4c01a,
-0x800124,
-0xd5001a,
-0xcc0832,
-0xd40032,
-0x9482b6,
-0xca0c00,
-0xd4401e,
-0x800000,
-0xd4001e,
-0xe4011e,
-0xd4001e,
-0xca0800,
-0xca0c00,
-0xca1000,
-0xd4401e,
-0xca1400,
-0xd4801e,
-0xd4c01e,
-0xd5001e,
-0xd5401e,
-0xd54034,
-0x800000,
-0xee001e,
-0x280404,
-0xe2001a,
-0xe2001a,
-0xd4401a,
-0xca3800,
-0xcc0803,
-0xcc0c03,
-0xcc0c03,
-0xcc0c03,
-0x98829a,
-0x000000,
-0x8401de,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0400,
-0xc2ff00,
-0xcc0834,
-0xc13fff,
-0x7c74cb,
-0x7cc90b,
-0x7d010f,
-0x99028d,
-0x7c738b,
-0x8401de,
-0xd7a06f,
-0x800000,
-0xee001f,
-0xca0800,
-0x281900,
-0x7d898b,
-0x958014,
-0x281404,
-0xca0c00,
-0xca1000,
-0xca1c00,
-0xca2400,
-0xe2001f,
-0xd4c01a,
-0xd5001a,
-0xd5401a,
-0xcc1803,
-0xcc2c03,
-0xcc2c03,
-0xcc2c03,
-0x7da58b,
-0x7d9c47,
-0x984274,
-0x000000,
-0x800184,
-0xd4c01a,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xe4013e,
-0xd4001e,
-0xd4401e,
-0xee001e,
-0xca0400,
-0xa00000,
-0x7e828b,
-0xca0800,
-0x248c06,
-0x0ccc06,
-0x98c006,
-0xcc104e,
-0x990004,
-0xd40073,
-0xe4011e,
-0xd4001e,
-0xd4401e,
-0xd4801e,
-0x800000,
-0xee001e,
-0xca0800,
-0xca0c00,
-0x34d018,
-0x251001,
-0x950021,
-0xc17fff,
-0xca1000,
-0xca1400,
-0xca1800,
-0xd4801d,
-0xd4c01d,
-0x7db18b,
-0xc14202,
-0xc2c001,
-0xd5801d,
-0x34dc0e,
-0x7d5d4c,
-0x7f734c,
-0xd7401e,
-0xd5001e,
-0xd5401e,
-0xc14200,
-0xc2c000,
-0x099c01,
-0x31dc10,
-0x7f5f4c,
-0x7f734c,
-0x042802,
-0x7d8380,
-0xd5a86f,
-0xd58066,
-0xd7401e,
-0xec005e,
-0xc82402,
-0xc82402,
-0x8001db,
-0xd60076,
-0xd4401e,
-0xd4801e,
-0xd4c01e,
-0x800000,
-0xee001e,
-0x800000,
-0xee001f,
-0xd4001f,
-0x800000,
-0xd4001f,
-0xd4001f,
-0x880000,
-0xd4001f,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x000000,
-0x010194,
-0x02019b,
-0x0300b2,
-0x0400a2,
-0x050003,
-0x06003f,
-0x070032,
-0x08014f,
-0x090046,
-0x0a0036,
-0x1001d9,
-0x1700c5,
-0x22015d,
-0x23016c,
-0x2000d7,
-0x240148,
-0x26004d,
-0x27005c,
-0x28008d,
-0x290051,
-0x2a007e,
-0x2b0061,
-0x2f0088,
-0x3200aa,
-0x3401a2,
-0x36006f,
-0x3c0179,
-0x3f0095,
-0x4101af,
-0x440151,
-0x550196,
-0x56019d,
-0x60000b,
-0x610034,
-0x620038,
-0x630038,
-0x640038,
-0x650038,
-0x660038,
-0x670038,
-0x68003a,
-0x690041,
-0x6a0048,
-0x6b0048,
-0x6c0048,
-0x6d0048,
-0x6e0048,
-0x6f0048,
-0x7301d9,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-0x000006,
-};
-
-static const u32 RV770_cp_microcode[] = {
-0xcc0003ea,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000001,
-0xd040007f,
-0x80000001,
-0xcc400041,
-0x7c40c000,
-0xc0160004,
-0x30d03fff,
-0x7d15000c,
-0xcc110000,
-0x28d8001e,
-0x31980001,
-0x28dc001f,
-0xc8200004,
-0x95c00006,
-0x7c424000,
-0xcc000062,
-0x7e56800c,
-0xcc290000,
-0xc8240004,
-0x7e26000b,
-0x95800006,
-0x7c42c000,
-0xcc000062,
-0x7ed7000c,
-0xcc310000,
-0xc82c0004,
-0x7e2e000c,
-0xcc000062,
-0x31103fff,
-0x80000001,
-0xce110000,
-0x7c40c000,
-0x80000001,
-0xcc400040,
-0x80000001,
-0xcc412257,
-0x7c418000,
-0xcc400045,
-0xcc400048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc400045,
-0xcc400048,
-0x7c40c000,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc000045,
-0xcc000048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x040ca1fd,
-0xc0120001,
-0xcc000045,
-0xcc000048,
-0x7cd0c00c,
-0xcc41225c,
-0xcc41a1fc,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000001,
-0xcc41225d,
-0x7c408000,
-0x7c40c000,
-0xc02a0002,
-0x7c410000,
-0x7d29000c,
-0x30940001,
-0x30980006,
-0x309c0300,
-0x29dc0008,
-0x7c420000,
-0x7c424000,
-0x9540000f,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0xccc12169,
-0xcd01216a,
-0xce81216b,
-0x0db40002,
-0xcc01216c,
-0x9740000e,
-0x0db40000,
-0x8000007b,
-0xc834000a,
-0x0db40002,
-0x97400009,
-0x0db40000,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0x8000007b,
-0xc834000a,
-0x97400004,
-0x7e028000,
-0x8000007b,
-0xc834000a,
-0x0db40004,
-0x9740ff8c,
-0x00000000,
-0xce01216d,
-0xce41216e,
-0xc8280003,
-0xc834000a,
-0x9b400004,
-0x043c0005,
-0x8400026d,
-0xcc000062,
-0x0df40000,
-0x9740000b,
-0xc82c03e6,
-0xce81a2b7,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c4,
-0x80000001,
-0xcfc1a2d1,
-0x0df40001,
-0x9740000b,
-0xc82c03e7,
-0xce81a2bb,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c5,
-0x80000001,
-0xcfc1a2d2,
-0x0df40002,
-0x9740000b,
-0xc82c03e8,
-0xce81a2bf,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c6,
-0x80000001,
-0xcfc1a2d3,
-0xc82c03e9,
-0xce81a2c3,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c7,
-0x80000001,
-0xcfc1a2d4,
-0x80000001,
-0xcc400042,
-0x7c40c000,
-0x7c410000,
-0x2914001d,
-0x31540001,
-0x9940000d,
-0x31181000,
-0xc81c0011,
-0x09dc0001,
-0x95c0ffff,
-0xc81c0011,
-0xccc12100,
-0xcd012101,
-0xccc12102,
-0xcd012103,
-0x04180004,
-0x8000039f,
-0xcd81a2a4,
-0xc02a0004,
-0x95800008,
-0x36a821a3,
-0xcc290000,
-0xc8280004,
-0xc81c0011,
-0x0de40040,
-0x9640ffff,
-0xc81c0011,
-0xccc12170,
-0xcd012171,
-0xc8200012,
-0x96000000,
-0xc8200012,
-0x8000039f,
-0xcc000064,
-0x7c40c000,
-0x7c410000,
-0xcc000045,
-0xcc000048,
-0x40d40003,
-0xcd41225c,
-0xcd01a1fc,
-0xc01a0001,
-0x041ca1fd,
-0x7dd9c00c,
-0x7c420000,
-0x08cc0001,
-0x06240001,
-0x06280002,
-0xce1d0000,
-0xce5d0000,
-0x98c0fffa,
-0xce9d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0x30d00001,
-0x28cc0001,
-0x7c414000,
-0x95000006,
-0x7c418000,
-0xcd41216d,
-0xcd81216e,
-0x800000f3,
-0xc81c0003,
-0xc0220004,
-0x7e16000c,
-0xcc210000,
-0xc81c0004,
-0x7c424000,
-0x98c00004,
-0x7c428000,
-0x80000001,
-0xcde50000,
-0xce412169,
-0xce81216a,
-0xcdc1216b,
-0x80000001,
-0xcc01216c,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x7c41c000,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9680000a,
-0x7c020000,
-0x7c420000,
-0x1e300003,
-0xcc00006a,
-0x9b000003,
-0x42200005,
-0x04200040,
-0x80000110,
-0x7c024000,
-0x7e024000,
-0x9a400000,
-0x0a640001,
-0x30ec0010,
-0x9ac0000a,
-0xcc000062,
-0xc02a0004,
-0xc82c0021,
-0x7e92800c,
-0xcc000041,
-0xcc290000,
-0xcec00021,
-0x80000120,
-0xc8300004,
-0xcd01216d,
-0xcd41216e,
-0xc8300003,
-0x7f1f000b,
-0x30f40007,
-0x27780001,
-0x9740002a,
-0x07b80125,
-0x9f800000,
-0x00000000,
-0x80000135,
-0x7f1b8004,
-0x80000139,
-0x7f1b8005,
-0x8000013d,
-0x7f1b8002,
-0x80000141,
-0x7f1b8003,
-0x80000145,
-0x7f1b8007,
-0x80000149,
-0x7f1b8006,
-0x8000014e,
-0x28a40008,
-0x9b800019,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x9b800015,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x9b800011,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x9b80000d,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x9b800009,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x9b800005,
-0x28a40008,
-0x8000015e,
-0x326400ff,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9a80feb1,
-0x28ec0008,
-0x7c434000,
-0x7c438000,
-0x7c43c000,
-0x96c00007,
-0xcc000062,
-0xcf412169,
-0xcf81216a,
-0xcfc1216b,
-0x80000001,
-0xcc01216c,
-0x80000001,
-0xcff50000,
-0xcc00006b,
-0x840003a2,
-0x0e68003c,
-0x9a800004,
-0xc8280015,
-0x80000001,
-0xd040007f,
-0x9680ffab,
-0x7e024000,
-0x8400023b,
-0xc00e0002,
-0xcc000041,
-0x80000239,
-0xccc1304a,
-0x7c40c000,
-0x7c410000,
-0xc01e0001,
-0x29240012,
-0xc0220002,
-0x96400005,
-0xc0260004,
-0xc027fffb,
-0x7d25000b,
-0xc0260000,
-0x7dd2800b,
-0x7e12c00b,
-0x7d25000c,
-0x7c414000,
-0x7c418000,
-0xccc12169,
-0x9a80000a,
-0xcd01216a,
-0xcd41216b,
-0x96c0fe82,
-0xcd81216c,
-0xc8300018,
-0x97000000,
-0xc8300018,
-0x80000001,
-0xcc000018,
-0x840003a2,
-0xcc00007f,
-0xc8140013,
-0xc8180014,
-0xcd41216b,
-0x96c0fe76,
-0xcd81216c,
-0x80000182,
-0xc8300018,
-0xc80c0008,
-0x98c00000,
-0xc80c0008,
-0x7c410000,
-0x95000002,
-0x00000000,
-0x7c414000,
-0xc8200009,
-0xcc400043,
-0xce01a1f4,
-0xcc400044,
-0xc00e8000,
-0x7c424000,
-0x7c428000,
-0x2aac001f,
-0x96c0fe63,
-0xc035f000,
-0xce4003e2,
-0x32780003,
-0x267c0008,
-0x7ff7c00b,
-0x7ffbc00c,
-0x2a780018,
-0xcfc003e3,
-0xcf8003e4,
-0x26b00002,
-0x7f3f0000,
-0xcf0003e5,
-0x8000031f,
-0x7c80c000,
-0x7c40c000,
-0x28d00008,
-0x3110000f,
-0x9500000f,
-0x25280001,
-0x06a801b3,
-0x9e800000,
-0x00000000,
-0x800001d4,
-0xc0120800,
-0x800001e2,
-0xc814000f,
-0x800001e9,
-0xc8140010,
-0x800001f0,
-0xccc1a2a4,
-0x800001f9,
-0xc8140011,
-0x30d0003f,
-0x0d280015,
-0x9a800012,
-0x0d28001e,
-0x9a80001e,
-0x0d280020,
-0x9a800023,
-0x0d24000f,
-0x0d280010,
-0x7e6a800c,
-0x9a800026,
-0x0d200004,
-0x0d240014,
-0x0d280028,
-0x7e62400c,
-0x7ea6800c,
-0x9a80002a,
-0xc8140011,
-0x80000001,
-0xccc1a2a4,
-0xc0120800,
-0x7c414000,
-0x7d0cc00c,
-0xc0120008,
-0x29580003,
-0x295c000c,
-0x7c420000,
-0x7dd1c00b,
-0x26200014,
-0x7e1e400c,
-0x7e4e800c,
-0xce81a2a4,
-0x80000001,
-0xcd81a1fe,
-0xc814000f,
-0x0410210e,
-0x95400000,
-0xc814000f,
-0xd0510000,
-0x80000001,
-0xccc1a2a4,
-0xc8140010,
-0x04102108,
-0x95400000,
-0xc8140010,
-0xd0510000,
-0x80000001,
-0xccc1a2a4,
-0xccc1a2a4,
-0x04100001,
-0xcd000019,
-0x840003a2,
-0xcc00007f,
-0xc8100019,
-0x99000000,
-0xc8100019,
-0x80000002,
-0x7c408000,
-0x04102100,
-0x09540001,
-0x9540ffff,
-0xc8140011,
-0xd0510000,
-0x8000039f,
-0xccc1a2a4,
-0x7c40c000,
-0xcc40000d,
-0x94c0fdff,
-0xcc40000e,
-0x7c410000,
-0x95000005,
-0x08cc0001,
-0xc8140005,
-0x99400014,
-0x00000000,
-0x98c0fffb,
-0x7c410000,
-0x80000002,
-0x7d008000,
-0xc8140005,
-0x7c40c000,
-0x9940000c,
-0xc818000c,
-0x7c410000,
-0x9580fdee,
-0xc820000e,
-0xc81c000d,
-0x66200020,
-0x7e1e002c,
-0x25240002,
-0x7e624020,
-0x80000001,
-0xcce60000,
-0x7c410000,
-0xcc00006c,
-0xcc00006d,
-0xc818001f,
-0xc81c001e,
-0x65980020,
-0x7dd9c02c,
-0x7cd4c00c,
-0xccde0000,
-0x45dc0004,
-0xc8280017,
-0x9680000f,
-0xc00e0001,
-0x28680008,
-0x2aac0016,
-0x32a800ff,
-0x0eb00049,
-0x7f2f000b,
-0x97000006,
-0x00000000,
-0xc8140005,
-0x7c40c000,
-0x80000223,
-0x7c410000,
-0x80000226,
-0xd040007f,
-0x8400023b,
-0xcc000041,
-0xccc1304a,
-0x94000000,
-0xc83c001a,
-0x043c0005,
-0xcfc1a2a4,
-0xc0361f90,
-0xc0387fff,
-0x7c03c010,
-0x7f7b400c,
-0xcf41217c,
-0xcfc1217d,
-0xcc01217e,
-0xc03a0004,
-0x0434217f,
-0x7f7b400c,
-0xcc350000,
-0xc83c0004,
-0x2bfc001f,
-0x04380020,
-0x97c00005,
-0xcc000062,
-0x9b800000,
-0x0bb80001,
-0x80000247,
-0xcc000071,
-0xcc01a1f4,
-0x04380016,
-0xc0360002,
-0xcf81a2a4,
-0x88000000,
-0xcf412010,
-0x7c40c000,
-0x28d0001c,
-0x95000005,
-0x04d40001,
-0xcd400065,
-0x80000001,
-0xcd400068,
-0x09540002,
-0x80000001,
-0xcd400066,
-0x8400026c,
-0xc81803ea,
-0x7c40c000,
-0x9980fd9d,
-0xc8140016,
-0x08d00001,
-0x9940002b,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0005,
-0xcfc1a2a4,
-0xcc01a1f4,
-0x840003a2,
-0xcc000046,
-0x88000000,
-0xcc00007f,
-0x8400027e,
-0xc81803ea,
-0x7c40c000,
-0x9980fd8b,
-0xc8140016,
-0x08d00001,
-0x99400019,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0022,
-0xcfc1a2a4,
-0x840003a2,
-0xcc000047,
-0x88000000,
-0xcc00007f,
-0xc8100016,
-0x9900000d,
-0xcc400067,
-0x80000002,
-0x7c408000,
-0xc81803ea,
-0x9980fd77,
-0x7c40c000,
-0x94c00003,
-0xc8100016,
-0x99000004,
-0xccc00068,
-0x80000002,
-0x7c408000,
-0x8400023b,
-0xc0148000,
-0xcc000041,
-0xcd41304a,
-0xc0148000,
-0x99000000,
-0xc8100016,
-0x80000002,
-0x7c408000,
-0xc0120001,
-0x7c51400c,
-0x80000001,
-0xd0550000,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x291c001f,
-0xccc0004a,
-0xcd00004b,
-0x95c00003,
-0xc01c8000,
-0xcdc12010,
-0xdd830000,
-0x055c2000,
-0xcc000062,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004c,
-0xcd00004d,
-0xdd830000,
-0x055ca000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004e,
-0xcd00004f,
-0xdd830000,
-0x055cc000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00050,
-0xcd000051,
-0xdd830000,
-0x055cf8e0,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00052,
-0xcd000053,
-0xdd830000,
-0x055cf880,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00054,
-0xcd000055,
-0xdd830000,
-0x055ce000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00056,
-0xcd000057,
-0xdd830000,
-0x055cf000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00058,
-0xcd000059,
-0xdd830000,
-0x055cf3fc,
-0x80000001,
-0xd81f4100,
-0xd0432000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043a000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043c000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f8e0,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f880,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043e000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f3fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xc81403e0,
-0xcc430000,
-0xcc430000,
-0xcc430000,
-0x7d45c000,
-0xcdc30000,
-0xd0430000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0xc81003e2,
-0xc81403e5,
-0xc81803e3,
-0xc81c03e4,
-0xcd812169,
-0xcdc1216a,
-0xccc1216b,
-0xcc01216c,
-0x04200004,
-0x7da18000,
-0x7d964002,
-0x9640fcd7,
-0xcd8003e3,
-0x31280003,
-0xc02df000,
-0x25180008,
-0x7dad800b,
-0x7da9800c,
-0x80000001,
-0xcd8003e3,
-0x308cffff,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0x7c410000,
-0x29240018,
-0x32640001,
-0x9a400013,
-0xc8140020,
-0x15580002,
-0x9580ffff,
-0xc8140020,
-0xcc00006e,
-0xccc12180,
-0xcd01218d,
-0xcc412181,
-0x2914001f,
-0x34588000,
-0xcd81218c,
-0x9540fcb9,
-0xcc412182,
-0xc8140020,
-0x9940ffff,
-0xc8140020,
-0x80000002,
-0x7c408000,
-0x7c414000,
-0x7c418000,
-0x7c41c000,
-0x65b40020,
-0x7f57402c,
-0xd4378100,
-0x47740004,
-0xd4378100,
-0x47740004,
-0xd4378100,
-0x47740004,
-0x09dc0004,
-0xd4378100,
-0x99c0fff8,
-0x47740004,
-0x2924001f,
-0xc0380019,
-0x9640fca1,
-0xc03e0004,
-0xcf8121f8,
-0x37e021f9,
-0xcc210000,
-0xc8200004,
-0x2a200018,
-0x32200001,
-0x9a00fffb,
-0xcf8121f8,
-0x80000002,
-0x7c408000,
-0x7c40c000,
-0x28d00018,
-0x31100001,
-0xc0160080,
-0x95000003,
-0xc02a0004,
-0x7cd4c00c,
-0xccc1217c,
-0xcc41217d,
-0xcc41217e,
-0x7c418000,
-0x1db00003,
-0x36a0217f,
-0x9b000003,
-0x419c0005,
-0x041c0040,
-0x99c00000,
-0x09dc0001,
-0xcc210000,
-0xc8240004,
-0x2a6c001f,
-0x419c0005,
-0x9ac0fffa,
-0xcc800062,
-0x80000002,
-0x7c408000,
-0x7c40c000,
-0x04d403e6,
-0x80000001,
-0xcc540000,
-0x8000039f,
-0xcc4003ea,
-0xc01c8000,
-0x044ca000,
-0xcdc12010,
-0x7c410000,
-0xc8140009,
-0x04180000,
-0x041c0008,
-0xcd800071,
-0x09dc0001,
-0x05980001,
-0xcd0d0000,
-0x99c0fffc,
-0xcc800062,
-0x8000039f,
-0xcd400071,
-0xc00e0100,
-0xcc000041,
-0xccc1304a,
-0xc83c007f,
-0xcc00007f,
-0x80000001,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00010333,
-0x00100004,
-0x00170006,
-0x00210008,
-0x00270028,
-0x00280023,
-0x00290029,
-0x002a0026,
-0x002b0029,
-0x002d0038,
-0x002e003f,
-0x002f004a,
-0x0034004c,
-0x00360030,
-0x003900af,
-0x003a00d0,
-0x003b00e5,
-0x003c00fd,
-0x003d016c,
-0x003f00ad,
-0x00410338,
-0x0043036c,
-0x0044018f,
-0x004500fd,
-0x004601ad,
-0x004701ad,
-0x00480200,
-0x0049020e,
-0x004a0257,
-0x004b0284,
-0x00520261,
-0x00530273,
-0x00540289,
-0x0057029b,
-0x0060029f,
-0x006102ae,
-0x006202b8,
-0x006302c2,
-0x006402cc,
-0x006502d6,
-0x006602e0,
-0x006702ea,
-0x006802f4,
-0x006902f8,
-0x006a02fc,
-0x006b0300,
-0x006c0304,
-0x006d0308,
-0x006e030c,
-0x006f0310,
-0x00700314,
-0x00720386,
-0x0074038c,
-0x0079038a,
-0x007c031e,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-0x000f039b,
-};
-
-static const u32 RV770_pfp_microcode[] = {
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x80000000,
-0xdc030000,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xc818000e,
-0x31980001,
-0x7c424000,
-0x95800252,
-0x7c428000,
-0xc81c001c,
-0xc037c000,
-0x7c40c000,
-0x7c410000,
-0x7cb4800b,
-0xc0360003,
-0x99c00000,
-0xc81c001c,
-0x7cb4800c,
-0x24d40002,
-0x7d654000,
-0xcd400043,
-0xce800043,
-0xcd000043,
-0xcc800040,
-0xce400040,
-0xce800040,
-0xccc00040,
-0xdc3a0000,
-0x9780ffde,
-0xcd000040,
-0x7c40c000,
-0x80000018,
-0x7c410000,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x8000000c,
-0x31980002,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x288c0008,
-0x30cc000f,
-0x34100001,
-0x7d0d0008,
-0x8000000c,
-0x7d91800b,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc4003f9,
-0x80000261,
-0xcc4003f8,
-0xc82003f8,
-0xc81c03f9,
-0xc81803fb,
-0xc037ffff,
-0x7c414000,
-0xcf41a29e,
-0x66200020,
-0x7de1c02c,
-0x7d58c008,
-0x7cdcc020,
-0x68d00020,
-0xc0360003,
-0xcc000054,
-0x7cb4800c,
-0x8000006a,
-0xcc800040,
-0x7c418000,
-0xcd81a29e,
-0xcc800040,
-0xcd800040,
-0x80000068,
-0xcc000054,
-0xc019ffff,
-0xcc800040,
-0xcd81a29e,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xcc400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc000054,
-0xcc800040,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00001,
-0xccc1a29f,
-0x95000003,
-0x04140001,
-0x04140002,
-0xcd4003fb,
-0xcc800040,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0xcc800040,
-0xccc1a2a2,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0x28d4001f,
-0xcc800040,
-0x95400003,
-0x7c410000,
-0xccc00057,
-0x2918001f,
-0xccc00040,
-0x95800003,
-0xcd000040,
-0xcd000058,
-0x80000261,
-0xcc00007f,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0xca0c0010,
-0x7c410000,
-0x94c00004,
-0x7c414000,
-0xd42002c4,
-0xcde00044,
-0x9b00000b,
-0x7c418000,
-0xcc00004b,
-0xcda00049,
-0xcd200041,
-0xcd600041,
-0xcda00041,
-0x06200001,
-0xce000056,
-0x80000261,
-0xcc00007f,
-0xc8280020,
-0xc82c0021,
-0xcc000063,
-0x7eea4001,
-0x65740020,
-0x7f53402c,
-0x269c0002,
-0x7df5c020,
-0x69f80020,
-0xce80004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0xce600041,
-0x271c0002,
-0x7df5c020,
-0x69f80020,
-0x7db24001,
-0xcf00004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0x800000bd,
-0xce600041,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xca0c0010,
-0x7c410000,
-0x94c0000b,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0x800000b6,
-0x7c414000,
-0xcc000048,
-0x800000ef,
-0x00000000,
-0xc8200017,
-0xc81c0023,
-0x0e240002,
-0x99c00015,
-0x7c418000,
-0x0a200001,
-0xce000056,
-0xd4000440,
-0xcc000040,
-0xc036c000,
-0xca140013,
-0x96400007,
-0x37747900,
-0xcf400040,
-0xcc000040,
-0xc83003fa,
-0x80000104,
-0xcf000022,
-0xcc000022,
-0x9540015d,
-0xcc00007f,
-0xcca00046,
-0x80000000,
-0xcc200046,
-0x80000261,
-0xcc000064,
-0xc8200017,
-0xc810001f,
-0x96000005,
-0x09100001,
-0xd4000440,
-0xcd000040,
-0xcd000022,
-0xcc800040,
-0xd0400040,
-0xc80c0025,
-0x94c0feeb,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0x7c40c000,
-0x7c410000,
-0xccc003fd,
-0xcd0003fc,
-0xccc00042,
-0xcd000042,
-0x2914001f,
-0x29180010,
-0x31980007,
-0x3b5c0001,
-0x7d76000b,
-0x99800005,
-0x7d5e400b,
-0xcc000042,
-0x80000261,
-0xcc00004d,
-0x29980001,
-0x292c0008,
-0x9980003d,
-0x32ec0001,
-0x96000004,
-0x2930000c,
-0x80000261,
-0xcc000042,
-0x04140010,
-0xcd400042,
-0x33300001,
-0x34280001,
-0x8400015e,
-0xc8140003,
-0x9b40001b,
-0x0438000c,
-0x8400015e,
-0xc8140003,
-0x9b400017,
-0x04380008,
-0x8400015e,
-0xc8140003,
-0x9b400013,
-0x04380004,
-0x8400015e,
-0xc8140003,
-0x9b400015,
-0xc80c03fd,
-0x9a800009,
-0xc81003fc,
-0x9b000118,
-0xcc00004d,
-0x04140010,
-0xccc00042,
-0xcd000042,
-0x80000136,
-0xcd400042,
-0x96c00111,
-0xcc00004d,
-0x80000261,
-0xcc00004e,
-0x9ac00003,
-0xcc00004d,
-0xcc00004e,
-0xdf830000,
-0x80000000,
-0xd80301ff,
-0x9ac00107,
-0xcc00004d,
-0x80000261,
-0xcc00004e,
-0xc8180003,
-0xc81c0003,
-0xc8200003,
-0x7d5d4003,
-0x7da1c003,
-0x7d5d400c,
-0x2a10001f,
-0x299c001f,
-0x7d1d000b,
-0x7d17400b,
-0x88000000,
-0x7e92800b,
-0x96400004,
-0xcc00004e,
-0x80000261,
-0xcc000042,
-0x04380008,
-0xcf800042,
-0xc8080003,
-0xc80c0003,
-0xc8100003,
-0xc8140003,
-0xc8180003,
-0xc81c0003,
-0xc8240003,
-0xc8280003,
-0x29fc001f,
-0x2ab0001f,
-0x7ff3c00b,
-0x28f0001f,
-0x7ff3c00b,
-0x2970001f,
-0x7ff3c00b,
-0x7d888001,
-0x7dccc001,
-0x7e510001,
-0x7e954001,
-0x7c908002,
-0x7cd4c002,
-0x7cbc800b,
-0x9ac00003,
-0x7c8f400b,
-0x38b40001,
-0x9b4000d8,
-0xcc00004d,
-0x9bc000d6,
-0xcc00004e,
-0xc80c03fd,
-0xc81003fc,
-0xccc00042,
-0x8000016f,
-0xcd000042,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xcc400040,
-0xcc400040,
-0xcc400040,
-0x7c40c000,
-0xccc00040,
-0xccc0000d,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0x7c410000,
-0x65140020,
-0x7d4d402c,
-0x24580002,
-0x7d598020,
-0x7c41c000,
-0xcd800042,
-0x69980020,
-0xcd800042,
-0xcdc00042,
-0xc023c000,
-0x05e40002,
-0x7ca0800b,
-0x26640010,
-0x7ca4800c,
-0xcc800040,
-0xcdc00040,
-0xccc00040,
-0x95c0000e,
-0xcd000040,
-0x09dc0001,
-0xc8280003,
-0x96800008,
-0xce800040,
-0xc834001d,
-0x97400000,
-0xc834001d,
-0x26a80008,
-0x84000264,
-0xcc2b0000,
-0x99c0fff7,
-0x09dc0001,
-0xdc3a0000,
-0x97800004,
-0x7c418000,
-0x800001a3,
-0x25980002,
-0xa0000000,
-0x7d808000,
-0xc818001d,
-0x7c40c000,
-0x64d00008,
-0x95800000,
-0xc818001d,
-0xcc130000,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xcc400040,
-0xc810001f,
-0x7c40c000,
-0xcc800040,
-0x7cd1400c,
-0xcd400040,
-0x05180001,
-0x80000000,
-0xcd800022,
-0x7c40c000,
-0x64500020,
-0x84000264,
-0xcc000061,
-0x7cd0c02c,
-0xc8200017,
-0xc8d60000,
-0x99400008,
-0x7c438000,
-0xdf830000,
-0xcfa0004f,
-0x84000264,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000261,
-0xcc000062,
-0x84000264,
-0xcc000061,
-0xc8200017,
-0x7c40c000,
-0xc036ff00,
-0xc810000d,
-0xc0303fff,
-0x7cf5400b,
-0x7d51800b,
-0x7d81800f,
-0x99800008,
-0x7cf3800b,
-0xdf830000,
-0xcfa0004f,
-0x84000264,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000261,
-0xcc000062,
-0x84000264,
-0x7c40c000,
-0x28dc0008,
-0x95c00019,
-0x30dc0010,
-0x7c410000,
-0x99c00004,
-0x64540020,
-0x80000209,
-0xc91d0000,
-0x7d15002c,
-0xc91e0000,
-0x7c420000,
-0x7c424000,
-0x7c418000,
-0x7de5c00b,
-0x7de28007,
-0x9a80000e,
-0x41ac0005,
-0x9ac00000,
-0x0aec0001,
-0x30dc0010,
-0x99c00004,
-0x00000000,
-0x8000020c,
-0xc91d0000,
-0x8000020c,
-0xc91e0000,
-0xcc800040,
-0xccc00040,
-0xd0400040,
-0xc80c0025,
-0x94c0fde3,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00006,
-0x0d100006,
-0x99000007,
-0xc8140015,
-0x99400005,
-0xcc000052,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0xcc4d0000,
-0xdc3a0000,
-0x9780fdbc,
-0x04cc0001,
-0x80000243,
-0xcc4d0000,
-0x7c40c000,
-0x7c410000,
-0x29240018,
-0x32640001,
-0x9640000f,
-0xcc800040,
-0x7c414000,
-0x7c418000,
-0x7c41c000,
-0xccc00043,
-0xcd000043,
-0x31dc7fff,
-0xcdc00043,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xcd800040,
-0x80000000,
-0xcdc00040,
-0xccc00040,
-0xcd000040,
-0x80000000,
-0xd0400040,
-0x80000000,
-0xd040007f,
-0xcc00007f,
-0x80000000,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00030223,
-0x0004022b,
-0x000500a0,
-0x00020003,
-0x0006003c,
-0x00070027,
-0x00080192,
-0x00090044,
-0x000a002d,
-0x0010025f,
-0x001700f1,
-0x002201d8,
-0x002301e9,
-0x0026004c,
-0x0027005f,
-0x0020011b,
-0x00280093,
-0x0029004f,
-0x002a0084,
-0x002b0065,
-0x002f008e,
-0x003200d9,
-0x00340233,
-0x00360075,
-0x0039010b,
-0x003c01fd,
-0x003f00a0,
-0x00410248,
-0x00440195,
-0x0048019e,
-0x004901c6,
-0x004a01d0,
-0x00550226,
-0x0056022e,
-0x0060000a,
-0x0061002a,
-0x00620030,
-0x00630030,
-0x00640030,
-0x00650030,
-0x00660030,
-0x00670030,
-0x00680037,
-0x0069003f,
-0x006a0047,
-0x006b0047,
-0x006c0047,
-0x006d0047,
-0x006e0047,
-0x006f0047,
-0x00700047,
-0x0073025f,
-0x007b0241,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-};
-
-static const u32 RV730_pfp_microcode[] = {
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x80000000,
-0xdc030000,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xc818000e,
-0x31980001,
-0x7c424000,
-0x9580023a,
-0x7c428000,
-0xc81c001c,
-0xc037c000,
-0x7c40c000,
-0x7c410000,
-0x7cb4800b,
-0xc0360003,
-0x99c00000,
-0xc81c001c,
-0x7cb4800c,
-0x24d40002,
-0x7d654000,
-0xcd400043,
-0xce800043,
-0xcd000043,
-0xcc800040,
-0xce400040,
-0xce800040,
-0xccc00040,
-0xdc3a0000,
-0x9780ffde,
-0xcd000040,
-0x7c40c000,
-0x80000018,
-0x7c410000,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x8000000c,
-0x31980002,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x288c0008,
-0x30cc000f,
-0x34100001,
-0x7d0d0008,
-0x8000000c,
-0x7d91800b,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc4003f9,
-0x80000249,
-0xcc4003f8,
-0xc037ffff,
-0x7c414000,
-0xcf41a29e,
-0xc82003f8,
-0xc81c03f9,
-0x66200020,
-0xc81803fb,
-0x7de1c02c,
-0x7d58c008,
-0x7cdcc020,
-0x69100020,
-0xc0360003,
-0xcc000054,
-0x7cb4800c,
-0x80000069,
-0xcc800040,
-0x7c418000,
-0xcd81a29e,
-0xcc800040,
-0x80000067,
-0xcd800040,
-0xc019ffff,
-0xcc800040,
-0xcd81a29e,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xcc400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc000054,
-0xcc800040,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00001,
-0xccc1a29f,
-0x95000003,
-0x04140001,
-0x04140002,
-0xcd4003fb,
-0xcc800040,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0xcc800040,
-0xccc1a2a2,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0x28d4001f,
-0xcc800040,
-0x95400003,
-0x7c410000,
-0xccc00057,
-0x2918001f,
-0xccc00040,
-0x95800003,
-0xcd000040,
-0xcd000058,
-0x80000249,
-0xcc00007f,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0xca0c0010,
-0x7c410000,
-0x94c00004,
-0x7c414000,
-0xd42002c4,
-0xcde00044,
-0x9b00000b,
-0x7c418000,
-0xcc00004b,
-0xcda00049,
-0xcd200041,
-0xcd600041,
-0xcda00041,
-0x06200001,
-0xce000056,
-0x80000249,
-0xcc00007f,
-0xc8280020,
-0xc82c0021,
-0xcc000063,
-0x7eea4001,
-0x65740020,
-0x7f53402c,
-0x269c0002,
-0x7df5c020,
-0x69f80020,
-0xce80004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0xce600041,
-0x271c0002,
-0x7df5c020,
-0x69f80020,
-0x7db24001,
-0xcf00004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0x800000bc,
-0xce600041,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xca0c0010,
-0x7c410000,
-0x94c0000b,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0x800000b5,
-0x7c414000,
-0xcc000048,
-0x800000ee,
-0x00000000,
-0xc8200017,
-0xc81c0023,
-0x0e240002,
-0x99c00015,
-0x7c418000,
-0x0a200001,
-0xce000056,
-0xd4000440,
-0xcc000040,
-0xc036c000,
-0xca140013,
-0x96400007,
-0x37747900,
-0xcf400040,
-0xcc000040,
-0xc83003fa,
-0x80000103,
-0xcf000022,
-0xcc000022,
-0x95400146,
-0xcc00007f,
-0xcca00046,
-0x80000000,
-0xcc200046,
-0x80000249,
-0xcc000064,
-0xc8200017,
-0xc810001f,
-0x96000005,
-0x09100001,
-0xd4000440,
-0xcd000040,
-0xcd000022,
-0xcc800040,
-0xd0400040,
-0xc80c0025,
-0x94c0feec,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0x7c40c000,
-0x7c410000,
-0xccc003fd,
-0xcd0003fc,
-0xccc00042,
-0xcd000042,
-0x2914001f,
-0x29180010,
-0x31980007,
-0x3b5c0001,
-0x7d76000b,
-0x99800005,
-0x7d5e400b,
-0xcc000042,
-0x80000249,
-0xcc00004d,
-0x29980001,
-0x292c0008,
-0x9980003d,
-0x32ec0001,
-0x96000004,
-0x2930000c,
-0x80000249,
-0xcc000042,
-0x04140010,
-0xcd400042,
-0x33300001,
-0x34280001,
-0x8400015d,
-0xc8140003,
-0x9b40001b,
-0x0438000c,
-0x8400015d,
-0xc8140003,
-0x9b400017,
-0x04380008,
-0x8400015d,
-0xc8140003,
-0x9b400013,
-0x04380004,
-0x8400015d,
-0xc8140003,
-0x9b400015,
-0xc80c03fd,
-0x9a800009,
-0xc81003fc,
-0x9b000101,
-0xcc00004d,
-0x04140010,
-0xccc00042,
-0xcd000042,
-0x80000135,
-0xcd400042,
-0x96c000fa,
-0xcc00004d,
-0x80000249,
-0xcc00004e,
-0x9ac00003,
-0xcc00004d,
-0xcc00004e,
-0xdf830000,
-0x80000000,
-0xd80301ff,
-0x9ac000f0,
-0xcc00004d,
-0x80000249,
-0xcc00004e,
-0xc8180003,
-0xc81c0003,
-0xc8200003,
-0x7d5d4003,
-0x7da1c003,
-0x7d5d400c,
-0x2a10001f,
-0x299c001f,
-0x7d1d000b,
-0x7d17400b,
-0x88000000,
-0x7e92800b,
-0x96400004,
-0xcc00004e,
-0x80000249,
-0xcc000042,
-0x04380008,
-0xcf800042,
-0xc8080003,
-0xc80c0003,
-0xc8100003,
-0xc8140003,
-0xc8180003,
-0xc81c0003,
-0xc8240003,
-0xc8280003,
-0x29fc001f,
-0x2ab0001f,
-0x7ff3c00b,
-0x28f0001f,
-0x7ff3c00b,
-0x2970001f,
-0x7ff3c00b,
-0x7d888001,
-0x7dccc001,
-0x7e510001,
-0x7e954001,
-0x7c908002,
-0x7cd4c002,
-0x7cbc800b,
-0x9ac00003,
-0x7c8f400b,
-0x38b40001,
-0x9b4000c1,
-0xcc00004d,
-0x9bc000bf,
-0xcc00004e,
-0xc80c03fd,
-0xc81003fc,
-0xccc00042,
-0x8000016e,
-0xcd000042,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xcc400040,
-0xcc400040,
-0xcc400040,
-0x7c40c000,
-0xccc00040,
-0xccc0000d,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0x7c410000,
-0x65140020,
-0x7d4d402c,
-0x24580002,
-0x7d598020,
-0x7c41c000,
-0xcd800042,
-0x69980020,
-0xcd800042,
-0xcdc00042,
-0xc023c000,
-0x05e40002,
-0x7ca0800b,
-0x26640010,
-0x7ca4800c,
-0xcc800040,
-0xcdc00040,
-0xccc00040,
-0x95c0000e,
-0xcd000040,
-0x09dc0001,
-0xc8280003,
-0x96800008,
-0xce800040,
-0xc834001d,
-0x97400000,
-0xc834001d,
-0x26a80008,
-0x8400024c,
-0xcc2b0000,
-0x99c0fff7,
-0x09dc0001,
-0xdc3a0000,
-0x97800004,
-0x7c418000,
-0x800001a2,
-0x25980002,
-0xa0000000,
-0x7d808000,
-0xc818001d,
-0x7c40c000,
-0x64d00008,
-0x95800000,
-0xc818001d,
-0xcc130000,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xcc400040,
-0xc810001f,
-0x7c40c000,
-0xcc800040,
-0x7cd1400c,
-0xcd400040,
-0x05180001,
-0x80000000,
-0xcd800022,
-0x7c40c000,
-0x64500020,
-0x8400024c,
-0xcc000061,
-0x7cd0c02c,
-0xc8200017,
-0xc8d60000,
-0x99400008,
-0x7c438000,
-0xdf830000,
-0xcfa0004f,
-0x8400024c,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000249,
-0xcc000062,
-0x8400024c,
-0xcc000061,
-0xc8200017,
-0x7c40c000,
-0xc036ff00,
-0xc810000d,
-0xc0303fff,
-0x7cf5400b,
-0x7d51800b,
-0x7d81800f,
-0x99800008,
-0x7cf3800b,
-0xdf830000,
-0xcfa0004f,
-0x8400024c,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000249,
-0xcc000062,
-0x8400024c,
-0x7c40c000,
-0x28dc0008,
-0x95c00019,
-0x30dc0010,
-0x7c410000,
-0x99c00004,
-0x64540020,
-0x80000208,
-0xc91d0000,
-0x7d15002c,
-0xc91e0000,
-0x7c420000,
-0x7c424000,
-0x7c418000,
-0x7de5c00b,
-0x7de28007,
-0x9a80000e,
-0x41ac0005,
-0x9ac00000,
-0x0aec0001,
-0x30dc0010,
-0x99c00004,
-0x00000000,
-0x8000020b,
-0xc91d0000,
-0x8000020b,
-0xc91e0000,
-0xcc800040,
-0xccc00040,
-0xd0400040,
-0xc80c0025,
-0x94c0fde4,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00006,
-0x0d100006,
-0x99000007,
-0xc8140015,
-0x99400005,
-0xcc000052,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0xcc4d0000,
-0xdc3a0000,
-0x9780fdbd,
-0x04cc0001,
-0x80000242,
-0xcc4d0000,
-0x80000000,
-0xd040007f,
-0xcc00007f,
-0x80000000,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00030222,
-0x0004022a,
-0x0005009f,
-0x00020003,
-0x0006003c,
-0x00070027,
-0x00080191,
-0x00090044,
-0x000a002d,
-0x00100247,
-0x001700f0,
-0x002201d7,
-0x002301e8,
-0x0026004c,
-0x0027005f,
-0x0020011a,
-0x00280092,
-0x0029004f,
-0x002a0083,
-0x002b0064,
-0x002f008d,
-0x003200d8,
-0x00340232,
-0x00360074,
-0x0039010a,
-0x003c01fc,
-0x003f009f,
-0x00410005,
-0x00440194,
-0x0048019d,
-0x004901c5,
-0x004a01cf,
-0x00550225,
-0x0056022d,
-0x0060000a,
-0x0061002a,
-0x00620030,
-0x00630030,
-0x00640030,
-0x00650030,
-0x00660030,
-0x00670030,
-0x00680037,
-0x0069003f,
-0x006a0047,
-0x006b0047,
-0x006c0047,
-0x006d0047,
-0x006e0047,
-0x006f0047,
-0x00700047,
-0x00730247,
-0x007b0240,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-};
-
-static const u32 RV730_cp_microcode[] = {
-0xcc0003ea,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000001,
-0xd040007f,
-0x80000001,
-0xcc400041,
-0x7c40c000,
-0xc0160004,
-0x30d03fff,
-0x7d15000c,
-0xcc110000,
-0x28d8001e,
-0x31980001,
-0x28dc001f,
-0xc8200004,
-0x95c00006,
-0x7c424000,
-0xcc000062,
-0x7e56800c,
-0xcc290000,
-0xc8240004,
-0x7e26000b,
-0x95800006,
-0x7c42c000,
-0xcc000062,
-0x7ed7000c,
-0xcc310000,
-0xc82c0004,
-0x7e2e000c,
-0xcc000062,
-0x31103fff,
-0x80000001,
-0xce110000,
-0x7c40c000,
-0x80000001,
-0xcc400040,
-0x80000001,
-0xcc412257,
-0x7c418000,
-0xcc400045,
-0xcc400048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc400045,
-0xcc400048,
-0x7c40c000,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc000045,
-0xcc000048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x040ca1fd,
-0xc0120001,
-0xcc000045,
-0xcc000048,
-0x7cd0c00c,
-0xcc41225c,
-0xcc41a1fc,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000001,
-0xcc41225d,
-0x7c408000,
-0x7c40c000,
-0xc02a0002,
-0x7c410000,
-0x7d29000c,
-0x30940001,
-0x30980006,
-0x309c0300,
-0x29dc0008,
-0x7c420000,
-0x7c424000,
-0x9540000f,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0xccc12169,
-0xcd01216a,
-0xce81216b,
-0x0db40002,
-0xcc01216c,
-0x9740000e,
-0x0db40000,
-0x8000007b,
-0xc834000a,
-0x0db40002,
-0x97400009,
-0x0db40000,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0x8000007b,
-0xc834000a,
-0x97400004,
-0x7e028000,
-0x8000007b,
-0xc834000a,
-0x0db40004,
-0x9740ff8c,
-0x00000000,
-0xce01216d,
-0xce41216e,
-0xc8280003,
-0xc834000a,
-0x9b400004,
-0x043c0005,
-0x8400026b,
-0xcc000062,
-0x0df40000,
-0x9740000b,
-0xc82c03e6,
-0xce81a2b7,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c4,
-0x80000001,
-0xcfc1a2d1,
-0x0df40001,
-0x9740000b,
-0xc82c03e7,
-0xce81a2bb,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c5,
-0x80000001,
-0xcfc1a2d2,
-0x0df40002,
-0x9740000b,
-0xc82c03e8,
-0xce81a2bf,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c6,
-0x80000001,
-0xcfc1a2d3,
-0xc82c03e9,
-0xce81a2c3,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c7,
-0x80000001,
-0xcfc1a2d4,
-0x80000001,
-0xcc400042,
-0x7c40c000,
-0x7c410000,
-0x2914001d,
-0x31540001,
-0x9940000c,
-0x31181000,
-0xc81c0011,
-0x95c00000,
-0xc81c0011,
-0xccc12100,
-0xcd012101,
-0xccc12102,
-0xcd012103,
-0x04180004,
-0x8000037c,
-0xcd81a2a4,
-0xc02a0004,
-0x95800008,
-0x36a821a3,
-0xcc290000,
-0xc8280004,
-0xc81c0011,
-0x0de40040,
-0x9640ffff,
-0xc81c0011,
-0xccc12170,
-0xcd012171,
-0xc8200012,
-0x96000000,
-0xc8200012,
-0x8000037c,
-0xcc000064,
-0x7c40c000,
-0x7c410000,
-0xcc000045,
-0xcc000048,
-0x40d40003,
-0xcd41225c,
-0xcd01a1fc,
-0xc01a0001,
-0x041ca1fd,
-0x7dd9c00c,
-0x7c420000,
-0x08cc0001,
-0x06240001,
-0x06280002,
-0xce1d0000,
-0xce5d0000,
-0x98c0fffa,
-0xce9d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0x30d00001,
-0x28cc0001,
-0x7c414000,
-0x95000006,
-0x7c418000,
-0xcd41216d,
-0xcd81216e,
-0x800000f2,
-0xc81c0003,
-0xc0220004,
-0x7e16000c,
-0xcc210000,
-0xc81c0004,
-0x7c424000,
-0x98c00004,
-0x7c428000,
-0x80000001,
-0xcde50000,
-0xce412169,
-0xce81216a,
-0xcdc1216b,
-0x80000001,
-0xcc01216c,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x7c41c000,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9680000a,
-0x7c020000,
-0x7c420000,
-0x1e300003,
-0xcc00006a,
-0x9b000003,
-0x42200005,
-0x04200040,
-0x8000010f,
-0x7c024000,
-0x7e024000,
-0x9a400000,
-0x0a640001,
-0x30ec0010,
-0x9ac0000a,
-0xcc000062,
-0xc02a0004,
-0xc82c0021,
-0x7e92800c,
-0xcc000041,
-0xcc290000,
-0xcec00021,
-0x8000011f,
-0xc8300004,
-0xcd01216d,
-0xcd41216e,
-0xc8300003,
-0x7f1f000b,
-0x30f40007,
-0x27780001,
-0x9740002a,
-0x07b80124,
-0x9f800000,
-0x00000000,
-0x80000134,
-0x7f1b8004,
-0x80000138,
-0x7f1b8005,
-0x8000013c,
-0x7f1b8002,
-0x80000140,
-0x7f1b8003,
-0x80000144,
-0x7f1b8007,
-0x80000148,
-0x7f1b8006,
-0x8000014d,
-0x28a40008,
-0x9b800019,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x9b800015,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x9b800011,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x9b80000d,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x9b800009,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x9b800005,
-0x28a40008,
-0x8000015d,
-0x326400ff,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9a80feb2,
-0x28ec0008,
-0x7c434000,
-0x7c438000,
-0x7c43c000,
-0x96c00007,
-0xcc000062,
-0xcf412169,
-0xcf81216a,
-0xcfc1216b,
-0x80000001,
-0xcc01216c,
-0x80000001,
-0xcff50000,
-0xcc00006b,
-0x8400037f,
-0x0e68003c,
-0x9a800004,
-0xc8280015,
-0x80000001,
-0xd040007f,
-0x9680ffab,
-0x7e024000,
-0x84000239,
-0xc00e0002,
-0xcc000041,
-0x80000237,
-0xccc1304a,
-0x7c40c000,
-0x7c410000,
-0xc01e0001,
-0x29240012,
-0xc0220002,
-0x96400005,
-0xc0260004,
-0xc027fffb,
-0x7d25000b,
-0xc0260000,
-0x7dd2800b,
-0x7e12c00b,
-0x7d25000c,
-0x7c414000,
-0x7c418000,
-0xccc12169,
-0x9a80000a,
-0xcd01216a,
-0xcd41216b,
-0x96c0fe83,
-0xcd81216c,
-0xc8300018,
-0x97000000,
-0xc8300018,
-0x80000001,
-0xcc000018,
-0x8400037f,
-0xcc00007f,
-0xc8140013,
-0xc8180014,
-0xcd41216b,
-0x96c0fe77,
-0xcd81216c,
-0x80000181,
-0xc8300018,
-0xc80c0008,
-0x98c00000,
-0xc80c0008,
-0x7c410000,
-0x95000002,
-0x00000000,
-0x7c414000,
-0xc8200009,
-0xcc400043,
-0xce01a1f4,
-0xcc400044,
-0xc00e8000,
-0x7c424000,
-0x7c428000,
-0x2aac001f,
-0x96c0fe64,
-0xc035f000,
-0xce4003e2,
-0x32780003,
-0x267c0008,
-0x7ff7c00b,
-0x7ffbc00c,
-0x2a780018,
-0xcfc003e3,
-0xcf8003e4,
-0x26b00002,
-0x7f3f0000,
-0xcf0003e5,
-0x8000031d,
-0x7c80c000,
-0x7c40c000,
-0x28d00008,
-0x3110000f,
-0x9500000f,
-0x25280001,
-0x06a801b2,
-0x9e800000,
-0x00000000,
-0x800001d3,
-0xc0120800,
-0x800001e1,
-0xc814000f,
-0x800001e8,
-0xc8140010,
-0x800001ef,
-0xccc1a2a4,
-0x800001f8,
-0xc8140011,
-0x30d0003f,
-0x0d280015,
-0x9a800012,
-0x0d28001e,
-0x9a80001e,
-0x0d280020,
-0x9a800023,
-0x0d24000f,
-0x0d280010,
-0x7e6a800c,
-0x9a800026,
-0x0d200004,
-0x0d240014,
-0x0d280028,
-0x7e62400c,
-0x7ea6800c,
-0x9a80002a,
-0xc8140011,
-0x80000001,
-0xccc1a2a4,
-0xc0120800,
-0x7c414000,
-0x7d0cc00c,
-0xc0120008,
-0x29580003,
-0x295c000c,
-0x7c420000,
-0x7dd1c00b,
-0x26200014,
-0x7e1e400c,
-0x7e4e800c,
-0xce81a2a4,
-0x80000001,
-0xcd81a1fe,
-0xc814000f,
-0x0410210e,
-0x95400000,
-0xc814000f,
-0xd0510000,
-0x80000001,
-0xccc1a2a4,
-0xc8140010,
-0x04102108,
-0x95400000,
-0xc8140010,
-0xd0510000,
-0x80000001,
-0xccc1a2a4,
-0xccc1a2a4,
-0x04100001,
-0xcd000019,
-0x8400037f,
-0xcc00007f,
-0xc8100019,
-0x99000000,
-0xc8100019,
-0x80000002,
-0x7c408000,
-0x04102100,
-0x95400000,
-0xc8140011,
-0xd0510000,
-0x8000037c,
-0xccc1a2a4,
-0x7c40c000,
-0xcc40000d,
-0x94c0fe01,
-0xcc40000e,
-0x7c410000,
-0x95000005,
-0x08cc0001,
-0xc8140005,
-0x99400014,
-0x00000000,
-0x98c0fffb,
-0x7c410000,
-0x80000002,
-0x7d008000,
-0xc8140005,
-0x7c40c000,
-0x9940000c,
-0xc818000c,
-0x7c410000,
-0x9580fdf0,
-0xc820000e,
-0xc81c000d,
-0x66200020,
-0x7e1e002c,
-0x25240002,
-0x7e624020,
-0x80000001,
-0xcce60000,
-0x7c410000,
-0xcc00006c,
-0xcc00006d,
-0xc818001f,
-0xc81c001e,
-0x65980020,
-0x7dd9c02c,
-0x7cd4c00c,
-0xccde0000,
-0x45dc0004,
-0xc8280017,
-0x9680000f,
-0xc00e0001,
-0x28680008,
-0x2aac0016,
-0x32a800ff,
-0x0eb00049,
-0x7f2f000b,
-0x97000006,
-0x00000000,
-0xc8140005,
-0x7c40c000,
-0x80000221,
-0x7c410000,
-0x80000224,
-0xd040007f,
-0x84000239,
-0xcc000041,
-0xccc1304a,
-0x94000000,
-0xc83c001a,
-0x043c0005,
-0xcfc1a2a4,
-0xc0361f90,
-0xc0387fff,
-0x7c03c010,
-0x7f7b400c,
-0xcf41217c,
-0xcfc1217d,
-0xcc01217e,
-0xc03a0004,
-0x0434217f,
-0x7f7b400c,
-0xcc350000,
-0xc83c0004,
-0x2bfc001f,
-0x04380020,
-0x97c00005,
-0xcc000062,
-0x9b800000,
-0x0bb80001,
-0x80000245,
-0xcc000071,
-0xcc01a1f4,
-0x04380016,
-0xc0360002,
-0xcf81a2a4,
-0x88000000,
-0xcf412010,
-0x7c40c000,
-0x28d0001c,
-0x95000005,
-0x04d40001,
-0xcd400065,
-0x80000001,
-0xcd400068,
-0x09540002,
-0x80000001,
-0xcd400066,
-0x8400026a,
-0xc81803ea,
-0x7c40c000,
-0x9980fd9f,
-0xc8140016,
-0x08d00001,
-0x9940002b,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0005,
-0xcfc1a2a4,
-0xcc01a1f4,
-0x8400037f,
-0xcc000046,
-0x88000000,
-0xcc00007f,
-0x8400027c,
-0xc81803ea,
-0x7c40c000,
-0x9980fd8d,
-0xc8140016,
-0x08d00001,
-0x99400019,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0022,
-0xcfc1a2a4,
-0x8400037f,
-0xcc000047,
-0x88000000,
-0xcc00007f,
-0xc8100016,
-0x9900000d,
-0xcc400067,
-0x80000002,
-0x7c408000,
-0xc81803ea,
-0x9980fd79,
-0x7c40c000,
-0x94c00003,
-0xc8100016,
-0x99000004,
-0xccc00068,
-0x80000002,
-0x7c408000,
-0x84000239,
-0xc0148000,
-0xcc000041,
-0xcd41304a,
-0xc0148000,
-0x99000000,
-0xc8100016,
-0x80000002,
-0x7c408000,
-0xc0120001,
-0x7c51400c,
-0x80000001,
-0xd0550000,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x291c001f,
-0xccc0004a,
-0xcd00004b,
-0x95c00003,
-0xc01c8000,
-0xcdc12010,
-0xdd830000,
-0x055c2000,
-0xcc000062,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004c,
-0xcd00004d,
-0xdd830000,
-0x055ca000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004e,
-0xcd00004f,
-0xdd830000,
-0x055cc000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00050,
-0xcd000051,
-0xdd830000,
-0x055cf8e0,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00052,
-0xcd000053,
-0xdd830000,
-0x055cf880,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00054,
-0xcd000055,
-0xdd830000,
-0x055ce000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00056,
-0xcd000057,
-0xdd830000,
-0x055cf000,
-0x80000001,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00058,
-0xcd000059,
-0xdd830000,
-0x055cf3fc,
-0x80000001,
-0xd81f4100,
-0xd0432000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043a000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043c000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f8e0,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f880,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043e000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f3fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xc81403e0,
-0xcc430000,
-0xcc430000,
-0xcc430000,
-0x7d45c000,
-0xcdc30000,
-0xd0430000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0xc81003e2,
-0xc81403e5,
-0xc81803e3,
-0xc81c03e4,
-0xcd812169,
-0xcdc1216a,
-0xccc1216b,
-0xcc01216c,
-0x04200004,
-0x7da18000,
-0x7d964002,
-0x9640fcd9,
-0xcd8003e3,
-0x31280003,
-0xc02df000,
-0x25180008,
-0x7dad800b,
-0x7da9800c,
-0x80000001,
-0xcd8003e3,
-0x308cffff,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xc8140020,
-0x15580002,
-0x9580ffff,
-0xc8140020,
-0xcc00006e,
-0xcc412180,
-0x7c40c000,
-0xccc1218d,
-0xcc412181,
-0x28d0001f,
-0x34588000,
-0xcd81218c,
-0x9500fcbf,
-0xcc412182,
-0xc8140020,
-0x9940ffff,
-0xc8140020,
-0x80000002,
-0x7c408000,
-0x7c40c000,
-0x28d00018,
-0x31100001,
-0xc0160080,
-0x95000003,
-0xc02a0004,
-0x7cd4c00c,
-0xccc1217c,
-0xcc41217d,
-0xcc41217e,
-0x7c418000,
-0x1db00003,
-0x36a0217f,
-0x9b000003,
-0x419c0005,
-0x041c0040,
-0x99c00000,
-0x09dc0001,
-0xcc210000,
-0xc8240004,
-0x2a6c001f,
-0x419c0005,
-0x9ac0fffa,
-0xcc800062,
-0x80000002,
-0x7c408000,
-0x7c40c000,
-0x04d403e6,
-0x80000001,
-0xcc540000,
-0x8000037c,
-0xcc4003ea,
-0xc01c8000,
-0x044ca000,
-0xcdc12010,
-0x7c410000,
-0xc8140009,
-0x04180000,
-0x041c0008,
-0xcd800071,
-0x09dc0001,
-0x05980001,
-0xcd0d0000,
-0x99c0fffc,
-0xcc800062,
-0x8000037c,
-0xcd400071,
-0xc00e0100,
-0xcc000041,
-0xccc1304a,
-0xc83c007f,
-0xcc00007f,
-0x80000001,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00010331,
-0x00100004,
-0x00170006,
-0x00210008,
-0x00270028,
-0x00280023,
-0x00290029,
-0x002a0026,
-0x002b0029,
-0x002d0038,
-0x002e003f,
-0x002f004a,
-0x0034004c,
-0x00360030,
-0x003900af,
-0x003a00cf,
-0x003b00e4,
-0x003c00fc,
-0x003d016b,
-0x003f00ad,
-0x00410336,
-0x00430349,
-0x0044018e,
-0x004500fc,
-0x004601ac,
-0x004701ac,
-0x004801fe,
-0x0049020c,
-0x004a0255,
-0x004b0282,
-0x0052025f,
-0x00530271,
-0x00540287,
-0x00570299,
-0x0060029d,
-0x006102ac,
-0x006202b6,
-0x006302c0,
-0x006402ca,
-0x006502d4,
-0x006602de,
-0x006702e8,
-0x006802f2,
-0x006902f6,
-0x006a02fa,
-0x006b02fe,
-0x006c0302,
-0x006d0306,
-0x006e030a,
-0x006f030e,
-0x00700312,
-0x00720363,
-0x00740369,
-0x00790367,
-0x007c031c,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-0x000f0378,
-};
-
-static const u32 RV710_pfp_microcode[] = {
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x80000000,
-0xdc030000,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xc818000e,
-0x31980001,
-0x7c424000,
-0x9580023a,
-0x7c428000,
-0xc81c001c,
-0xc037c000,
-0x7c40c000,
-0x7c410000,
-0x7cb4800b,
-0xc0360003,
-0x99c00000,
-0xc81c001c,
-0x7cb4800c,
-0x24d40002,
-0x7d654000,
-0xcd400043,
-0xce800043,
-0xcd000043,
-0xcc800040,
-0xce400040,
-0xce800040,
-0xccc00040,
-0xdc3a0000,
-0x9780ffde,
-0xcd000040,
-0x7c40c000,
-0x80000018,
-0x7c410000,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x8000000c,
-0x31980002,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xc818000e,
-0x288c0008,
-0x30cc000f,
-0x34100001,
-0x7d0d0008,
-0x8000000c,
-0x7d91800b,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc4003f9,
-0x80000249,
-0xcc4003f8,
-0xc037ffff,
-0x7c414000,
-0xcf41a29e,
-0xc82003f8,
-0xc81c03f9,
-0x66200020,
-0xc81803fb,
-0x7de1c02c,
-0x7d58c008,
-0x7cdcc020,
-0x69100020,
-0xc0360003,
-0xcc000054,
-0x7cb4800c,
-0x80000069,
-0xcc800040,
-0x7c418000,
-0xcd81a29e,
-0xcc800040,
-0x80000067,
-0xcd800040,
-0xc019ffff,
-0xcc800040,
-0xcd81a29e,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xcc400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xcc000054,
-0xcc800040,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0xccc1a1fa,
-0xcd01a1f9,
-0xcd41a29d,
-0xccc00040,
-0xcd000040,
-0xcd400040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00001,
-0xccc1a29f,
-0x95000003,
-0x04140001,
-0x04140002,
-0xcd4003fb,
-0xcc800040,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0xcc800040,
-0xccc1a2a2,
-0x80000000,
-0xccc00040,
-0x7c40c000,
-0x28d4001f,
-0xcc800040,
-0x95400003,
-0x7c410000,
-0xccc00057,
-0x2918001f,
-0xccc00040,
-0x95800003,
-0xcd000040,
-0xcd000058,
-0x80000249,
-0xcc00007f,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0xca0c0010,
-0x7c410000,
-0x94c00004,
-0x7c414000,
-0xd42002c4,
-0xcde00044,
-0x9b00000b,
-0x7c418000,
-0xcc00004b,
-0xcda00049,
-0xcd200041,
-0xcd600041,
-0xcda00041,
-0x06200001,
-0xce000056,
-0x80000249,
-0xcc00007f,
-0xc8280020,
-0xc82c0021,
-0xcc000063,
-0x7eea4001,
-0x65740020,
-0x7f53402c,
-0x269c0002,
-0x7df5c020,
-0x69f80020,
-0xce80004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0xce600041,
-0x271c0002,
-0x7df5c020,
-0x69f80020,
-0x7db24001,
-0xcf00004b,
-0xce600049,
-0xcde00041,
-0xcfa00041,
-0x800000bc,
-0xce600041,
-0xc8200017,
-0xc8300022,
-0x9a000006,
-0x0e280001,
-0xc824001e,
-0x0a640001,
-0xd4001240,
-0xce400040,
-0xca0c0010,
-0x7c410000,
-0x94c0000b,
-0xc036c000,
-0x96800007,
-0x37747900,
-0x041c0001,
-0xcf400040,
-0xcdc00040,
-0xcf0003fa,
-0x7c030000,
-0x800000b5,
-0x7c414000,
-0xcc000048,
-0x800000ee,
-0x00000000,
-0xc8200017,
-0xc81c0023,
-0x0e240002,
-0x99c00015,
-0x7c418000,
-0x0a200001,
-0xce000056,
-0xd4000440,
-0xcc000040,
-0xc036c000,
-0xca140013,
-0x96400007,
-0x37747900,
-0xcf400040,
-0xcc000040,
-0xc83003fa,
-0x80000103,
-0xcf000022,
-0xcc000022,
-0x95400146,
-0xcc00007f,
-0xcca00046,
-0x80000000,
-0xcc200046,
-0x80000249,
-0xcc000064,
-0xc8200017,
-0xc810001f,
-0x96000005,
-0x09100001,
-0xd4000440,
-0xcd000040,
-0xcd000022,
-0xcc800040,
-0xd0400040,
-0xc80c0025,
-0x94c0feec,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0x7c40c000,
-0x7c410000,
-0xccc003fd,
-0xcd0003fc,
-0xccc00042,
-0xcd000042,
-0x2914001f,
-0x29180010,
-0x31980007,
-0x3b5c0001,
-0x7d76000b,
-0x99800005,
-0x7d5e400b,
-0xcc000042,
-0x80000249,
-0xcc00004d,
-0x29980001,
-0x292c0008,
-0x9980003d,
-0x32ec0001,
-0x96000004,
-0x2930000c,
-0x80000249,
-0xcc000042,
-0x04140010,
-0xcd400042,
-0x33300001,
-0x34280001,
-0x8400015d,
-0xc8140003,
-0x9b40001b,
-0x0438000c,
-0x8400015d,
-0xc8140003,
-0x9b400017,
-0x04380008,
-0x8400015d,
-0xc8140003,
-0x9b400013,
-0x04380004,
-0x8400015d,
-0xc8140003,
-0x9b400015,
-0xc80c03fd,
-0x9a800009,
-0xc81003fc,
-0x9b000101,
-0xcc00004d,
-0x04140010,
-0xccc00042,
-0xcd000042,
-0x80000135,
-0xcd400042,
-0x96c000fa,
-0xcc00004d,
-0x80000249,
-0xcc00004e,
-0x9ac00003,
-0xcc00004d,
-0xcc00004e,
-0xdf830000,
-0x80000000,
-0xd80301ff,
-0x9ac000f0,
-0xcc00004d,
-0x80000249,
-0xcc00004e,
-0xc8180003,
-0xc81c0003,
-0xc8200003,
-0x7d5d4003,
-0x7da1c003,
-0x7d5d400c,
-0x2a10001f,
-0x299c001f,
-0x7d1d000b,
-0x7d17400b,
-0x88000000,
-0x7e92800b,
-0x96400004,
-0xcc00004e,
-0x80000249,
-0xcc000042,
-0x04380008,
-0xcf800042,
-0xc8080003,
-0xc80c0003,
-0xc8100003,
-0xc8140003,
-0xc8180003,
-0xc81c0003,
-0xc8240003,
-0xc8280003,
-0x29fc001f,
-0x2ab0001f,
-0x7ff3c00b,
-0x28f0001f,
-0x7ff3c00b,
-0x2970001f,
-0x7ff3c00b,
-0x7d888001,
-0x7dccc001,
-0x7e510001,
-0x7e954001,
-0x7c908002,
-0x7cd4c002,
-0x7cbc800b,
-0x9ac00003,
-0x7c8f400b,
-0x38b40001,
-0x9b4000c1,
-0xcc00004d,
-0x9bc000bf,
-0xcc00004e,
-0xc80c03fd,
-0xc81003fc,
-0xccc00042,
-0x8000016e,
-0xcd000042,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xcc400040,
-0xcc400040,
-0xcc400040,
-0x7c40c000,
-0xccc00040,
-0xccc0000d,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0x7c410000,
-0x65140020,
-0x7d4d402c,
-0x24580002,
-0x7d598020,
-0x7c41c000,
-0xcd800042,
-0x69980020,
-0xcd800042,
-0xcdc00042,
-0xc023c000,
-0x05e40002,
-0x7ca0800b,
-0x26640010,
-0x7ca4800c,
-0xcc800040,
-0xcdc00040,
-0xccc00040,
-0x95c0000e,
-0xcd000040,
-0x09dc0001,
-0xc8280003,
-0x96800008,
-0xce800040,
-0xc834001d,
-0x97400000,
-0xc834001d,
-0x26a80008,
-0x8400024c,
-0xcc2b0000,
-0x99c0fff7,
-0x09dc0001,
-0xdc3a0000,
-0x97800004,
-0x7c418000,
-0x800001a2,
-0x25980002,
-0xa0000000,
-0x7d808000,
-0xc818001d,
-0x7c40c000,
-0x64d00008,
-0x95800000,
-0xc818001d,
-0xcc130000,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xcc400040,
-0xc810001f,
-0x7c40c000,
-0xcc800040,
-0x7cd1400c,
-0xcd400040,
-0x05180001,
-0x80000000,
-0xcd800022,
-0x7c40c000,
-0x64500020,
-0x8400024c,
-0xcc000061,
-0x7cd0c02c,
-0xc8200017,
-0xc8d60000,
-0x99400008,
-0x7c438000,
-0xdf830000,
-0xcfa0004f,
-0x8400024c,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000249,
-0xcc000062,
-0x8400024c,
-0xcc000061,
-0xc8200017,
-0x7c40c000,
-0xc036ff00,
-0xc810000d,
-0xc0303fff,
-0x7cf5400b,
-0x7d51800b,
-0x7d81800f,
-0x99800008,
-0x7cf3800b,
-0xdf830000,
-0xcfa0004f,
-0x8400024c,
-0xcc000062,
-0x80000000,
-0xd040007f,
-0x80000249,
-0xcc000062,
-0x8400024c,
-0x7c40c000,
-0x28dc0008,
-0x95c00019,
-0x30dc0010,
-0x7c410000,
-0x99c00004,
-0x64540020,
-0x80000208,
-0xc91d0000,
-0x7d15002c,
-0xc91e0000,
-0x7c420000,
-0x7c424000,
-0x7c418000,
-0x7de5c00b,
-0x7de28007,
-0x9a80000e,
-0x41ac0005,
-0x9ac00000,
-0x0aec0001,
-0x30dc0010,
-0x99c00004,
-0x00000000,
-0x8000020b,
-0xc91d0000,
-0x8000020b,
-0xc91e0000,
-0xcc800040,
-0xccc00040,
-0xd0400040,
-0xc80c0025,
-0x94c0fde4,
-0xc8100008,
-0xcd000040,
-0xd4000fc0,
-0x80000000,
-0xd4000fa2,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0xd40003c0,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xd0400040,
-0x7c408000,
-0xa0000000,
-0x7e82800b,
-0x7c40c000,
-0x30d00006,
-0x0d100006,
-0x99000007,
-0xc8140015,
-0x99400005,
-0xcc000052,
-0xd4000340,
-0xd4000fc0,
-0xd4000fa2,
-0xcc800040,
-0xccc00040,
-0x80000000,
-0xd0400040,
-0x7c40c000,
-0xcc4d0000,
-0xdc3a0000,
-0x9780fdbd,
-0x04cc0001,
-0x80000242,
-0xcc4d0000,
-0x80000000,
-0xd040007f,
-0xcc00007f,
-0x80000000,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00030222,
-0x0004022a,
-0x0005009f,
-0x00020003,
-0x0006003c,
-0x00070027,
-0x00080191,
-0x00090044,
-0x000a002d,
-0x00100247,
-0x001700f0,
-0x002201d7,
-0x002301e8,
-0x0026004c,
-0x0027005f,
-0x0020011a,
-0x00280092,
-0x0029004f,
-0x002a0083,
-0x002b0064,
-0x002f008d,
-0x003200d8,
-0x00340232,
-0x00360074,
-0x0039010a,
-0x003c01fc,
-0x003f009f,
-0x00410005,
-0x00440194,
-0x0048019d,
-0x004901c5,
-0x004a01cf,
-0x00550225,
-0x0056022d,
-0x0060000a,
-0x0061002a,
-0x00620030,
-0x00630030,
-0x00640030,
-0x00650030,
-0x00660030,
-0x00670030,
-0x00680037,
-0x0069003f,
-0x006a0047,
-0x006b0047,
-0x006c0047,
-0x006d0047,
-0x006e0047,
-0x006f0047,
-0x00700047,
-0x00730247,
-0x007b0240,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-0x00000005,
-};
-
-static const u32 RV710_cp_microcode[] = {
-0xcc0003ea,
-0x04080003,
-0xcc800043,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000003,
-0xd040007f,
-0x80000003,
-0xcc400041,
-0x7c40c000,
-0xc0160004,
-0x30d03fff,
-0x7d15000c,
-0xcc110000,
-0x28d8001e,
-0x31980001,
-0x28dc001f,
-0xc8200004,
-0x95c00006,
-0x7c424000,
-0xcc000062,
-0x7e56800c,
-0xcc290000,
-0xc8240004,
-0x7e26000b,
-0x95800006,
-0x7c42c000,
-0xcc000062,
-0x7ed7000c,
-0xcc310000,
-0xc82c0004,
-0x7e2e000c,
-0xcc000062,
-0x31103fff,
-0x80000003,
-0xce110000,
-0x7c40c000,
-0x80000003,
-0xcc400040,
-0x80000003,
-0xcc412257,
-0x7c418000,
-0xcc400045,
-0xcc400048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc400045,
-0xcc400048,
-0x7c40c000,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xcc000045,
-0xcc000048,
-0xcc41225c,
-0xcc41a1fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x040ca1fd,
-0xc0120001,
-0xcc000045,
-0xcc000048,
-0x7cd0c00c,
-0xcc41225c,
-0xcc41a1fc,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x80000003,
-0xcc41225d,
-0x7c408000,
-0x7c40c000,
-0xc02a0002,
-0x7c410000,
-0x7d29000c,
-0x30940001,
-0x30980006,
-0x309c0300,
-0x29dc0008,
-0x7c420000,
-0x7c424000,
-0x9540000f,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0xccc12169,
-0xcd01216a,
-0xce81216b,
-0x0db40002,
-0xcc01216c,
-0x9740000e,
-0x0db40000,
-0x8000007d,
-0xc834000a,
-0x0db40002,
-0x97400009,
-0x0db40000,
-0xc02e0004,
-0x05f02258,
-0x7f2f000c,
-0xcc310000,
-0xc8280004,
-0x8000007d,
-0xc834000a,
-0x97400004,
-0x7e028000,
-0x8000007d,
-0xc834000a,
-0x0db40004,
-0x9740ff8c,
-0x00000000,
-0xce01216d,
-0xce41216e,
-0xc8280003,
-0xc834000a,
-0x9b400004,
-0x043c0005,
-0x8400026d,
-0xcc000062,
-0x0df40000,
-0x9740000b,
-0xc82c03e6,
-0xce81a2b7,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c4,
-0x80000003,
-0xcfc1a2d1,
-0x0df40001,
-0x9740000b,
-0xc82c03e7,
-0xce81a2bb,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c5,
-0x80000003,
-0xcfc1a2d2,
-0x0df40002,
-0x9740000b,
-0xc82c03e8,
-0xce81a2bf,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c6,
-0x80000003,
-0xcfc1a2d3,
-0xc82c03e9,
-0xce81a2c3,
-0xc0300006,
-0x7ef34028,
-0xc0300020,
-0x7f6b8020,
-0x7fb3c029,
-0xcf81a2c7,
-0x80000003,
-0xcfc1a2d4,
-0x80000003,
-0xcc400042,
-0x7c40c000,
-0x7c410000,
-0x2914001d,
-0x31540001,
-0x9940000c,
-0x31181000,
-0xc81c0011,
-0x95c00000,
-0xc81c0011,
-0xccc12100,
-0xcd012101,
-0xccc12102,
-0xcd012103,
-0x04180004,
-0x8000037e,
-0xcd81a2a4,
-0xc02a0004,
-0x95800008,
-0x36a821a3,
-0xcc290000,
-0xc8280004,
-0xc81c0011,
-0x0de40040,
-0x9640ffff,
-0xc81c0011,
-0xccc12170,
-0xcd012171,
-0xc8200012,
-0x96000000,
-0xc8200012,
-0x8000037e,
-0xcc000064,
-0x7c40c000,
-0x7c410000,
-0xcc000045,
-0xcc000048,
-0x40d40003,
-0xcd41225c,
-0xcd01a1fc,
-0xc01a0001,
-0x041ca1fd,
-0x7dd9c00c,
-0x7c420000,
-0x08cc0001,
-0x06240001,
-0x06280002,
-0xce1d0000,
-0xce5d0000,
-0x98c0fffa,
-0xce9d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0x30d00001,
-0x28cc0001,
-0x7c414000,
-0x95000006,
-0x7c418000,
-0xcd41216d,
-0xcd81216e,
-0x800000f4,
-0xc81c0003,
-0xc0220004,
-0x7e16000c,
-0xcc210000,
-0xc81c0004,
-0x7c424000,
-0x98c00004,
-0x7c428000,
-0x80000003,
-0xcde50000,
-0xce412169,
-0xce81216a,
-0xcdc1216b,
-0x80000003,
-0xcc01216c,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x7c41c000,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9680000a,
-0x7c020000,
-0x7c420000,
-0x1e300003,
-0xcc00006a,
-0x9b000003,
-0x42200005,
-0x04200040,
-0x80000111,
-0x7c024000,
-0x7e024000,
-0x9a400000,
-0x0a640001,
-0x30ec0010,
-0x9ac0000a,
-0xcc000062,
-0xc02a0004,
-0xc82c0021,
-0x7e92800c,
-0xcc000041,
-0xcc290000,
-0xcec00021,
-0x80000121,
-0xc8300004,
-0xcd01216d,
-0xcd41216e,
-0xc8300003,
-0x7f1f000b,
-0x30f40007,
-0x27780001,
-0x9740002a,
-0x07b80126,
-0x9f800000,
-0x00000000,
-0x80000136,
-0x7f1b8004,
-0x8000013a,
-0x7f1b8005,
-0x8000013e,
-0x7f1b8002,
-0x80000142,
-0x7f1b8003,
-0x80000146,
-0x7f1b8007,
-0x8000014a,
-0x7f1b8006,
-0x8000014f,
-0x28a40008,
-0x9b800019,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x9b800015,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x9b800011,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x9b80000d,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x9b800009,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x9b800005,
-0x28a40008,
-0x8000015f,
-0x326400ff,
-0x28a40008,
-0x326400ff,
-0x0e68003c,
-0x9a80feb2,
-0x28ec0008,
-0x7c434000,
-0x7c438000,
-0x7c43c000,
-0x96c00007,
-0xcc000062,
-0xcf412169,
-0xcf81216a,
-0xcfc1216b,
-0x80000003,
-0xcc01216c,
-0x80000003,
-0xcff50000,
-0xcc00006b,
-0x84000381,
-0x0e68003c,
-0x9a800004,
-0xc8280015,
-0x80000003,
-0xd040007f,
-0x9680ffab,
-0x7e024000,
-0x8400023b,
-0xc00e0002,
-0xcc000041,
-0x80000239,
-0xccc1304a,
-0x7c40c000,
-0x7c410000,
-0xc01e0001,
-0x29240012,
-0xc0220002,
-0x96400005,
-0xc0260004,
-0xc027fffb,
-0x7d25000b,
-0xc0260000,
-0x7dd2800b,
-0x7e12c00b,
-0x7d25000c,
-0x7c414000,
-0x7c418000,
-0xccc12169,
-0x9a80000a,
-0xcd01216a,
-0xcd41216b,
-0x96c0fe83,
-0xcd81216c,
-0xc8300018,
-0x97000000,
-0xc8300018,
-0x80000003,
-0xcc000018,
-0x84000381,
-0xcc00007f,
-0xc8140013,
-0xc8180014,
-0xcd41216b,
-0x96c0fe77,
-0xcd81216c,
-0x80000183,
-0xc8300018,
-0xc80c0008,
-0x98c00000,
-0xc80c0008,
-0x7c410000,
-0x95000002,
-0x00000000,
-0x7c414000,
-0xc8200009,
-0xcc400043,
-0xce01a1f4,
-0xcc400044,
-0xc00e8000,
-0x7c424000,
-0x7c428000,
-0x2aac001f,
-0x96c0fe64,
-0xc035f000,
-0xce4003e2,
-0x32780003,
-0x267c0008,
-0x7ff7c00b,
-0x7ffbc00c,
-0x2a780018,
-0xcfc003e3,
-0xcf8003e4,
-0x26b00002,
-0x7f3f0000,
-0xcf0003e5,
-0x8000031f,
-0x7c80c000,
-0x7c40c000,
-0x28d00008,
-0x3110000f,
-0x9500000f,
-0x25280001,
-0x06a801b4,
-0x9e800000,
-0x00000000,
-0x800001d5,
-0xc0120800,
-0x800001e3,
-0xc814000f,
-0x800001ea,
-0xc8140010,
-0x800001f1,
-0xccc1a2a4,
-0x800001fa,
-0xc8140011,
-0x30d0003f,
-0x0d280015,
-0x9a800012,
-0x0d28001e,
-0x9a80001e,
-0x0d280020,
-0x9a800023,
-0x0d24000f,
-0x0d280010,
-0x7e6a800c,
-0x9a800026,
-0x0d200004,
-0x0d240014,
-0x0d280028,
-0x7e62400c,
-0x7ea6800c,
-0x9a80002a,
-0xc8140011,
-0x80000003,
-0xccc1a2a4,
-0xc0120800,
-0x7c414000,
-0x7d0cc00c,
-0xc0120008,
-0x29580003,
-0x295c000c,
-0x7c420000,
-0x7dd1c00b,
-0x26200014,
-0x7e1e400c,
-0x7e4e800c,
-0xce81a2a4,
-0x80000003,
-0xcd81a1fe,
-0xc814000f,
-0x0410210e,
-0x95400000,
-0xc814000f,
-0xd0510000,
-0x80000003,
-0xccc1a2a4,
-0xc8140010,
-0x04102108,
-0x95400000,
-0xc8140010,
-0xd0510000,
-0x80000003,
-0xccc1a2a4,
-0xccc1a2a4,
-0x04100001,
-0xcd000019,
-0x84000381,
-0xcc00007f,
-0xc8100019,
-0x99000000,
-0xc8100019,
-0x80000004,
-0x7c408000,
-0x04102100,
-0x95400000,
-0xc8140011,
-0xd0510000,
-0x8000037e,
-0xccc1a2a4,
-0x7c40c000,
-0xcc40000d,
-0x94c0fe01,
-0xcc40000e,
-0x7c410000,
-0x95000005,
-0x08cc0001,
-0xc8140005,
-0x99400014,
-0x00000000,
-0x98c0fffb,
-0x7c410000,
-0x80000004,
-0x7d008000,
-0xc8140005,
-0x7c40c000,
-0x9940000c,
-0xc818000c,
-0x7c410000,
-0x9580fdf0,
-0xc820000e,
-0xc81c000d,
-0x66200020,
-0x7e1e002c,
-0x25240002,
-0x7e624020,
-0x80000003,
-0xcce60000,
-0x7c410000,
-0xcc00006c,
-0xcc00006d,
-0xc818001f,
-0xc81c001e,
-0x65980020,
-0x7dd9c02c,
-0x7cd4c00c,
-0xccde0000,
-0x45dc0004,
-0xc8280017,
-0x9680000f,
-0xc00e0001,
-0x28680008,
-0x2aac0016,
-0x32a800ff,
-0x0eb00049,
-0x7f2f000b,
-0x97000006,
-0x00000000,
-0xc8140005,
-0x7c40c000,
-0x80000223,
-0x7c410000,
-0x80000226,
-0xd040007f,
-0x8400023b,
-0xcc000041,
-0xccc1304a,
-0x94000000,
-0xc83c001a,
-0x043c0005,
-0xcfc1a2a4,
-0xc0361f90,
-0xc0387fff,
-0x7c03c010,
-0x7f7b400c,
-0xcf41217c,
-0xcfc1217d,
-0xcc01217e,
-0xc03a0004,
-0x0434217f,
-0x7f7b400c,
-0xcc350000,
-0xc83c0004,
-0x2bfc001f,
-0x04380020,
-0x97c00005,
-0xcc000062,
-0x9b800000,
-0x0bb80001,
-0x80000247,
-0xcc000071,
-0xcc01a1f4,
-0x04380016,
-0xc0360002,
-0xcf81a2a4,
-0x88000000,
-0xcf412010,
-0x7c40c000,
-0x28d0001c,
-0x95000005,
-0x04d40001,
-0xcd400065,
-0x80000003,
-0xcd400068,
-0x09540002,
-0x80000003,
-0xcd400066,
-0x8400026c,
-0xc81803ea,
-0x7c40c000,
-0x9980fd9f,
-0xc8140016,
-0x08d00001,
-0x9940002b,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0005,
-0xcfc1a2a4,
-0xcc01a1f4,
-0x84000381,
-0xcc000046,
-0x88000000,
-0xcc00007f,
-0x8400027e,
-0xc81803ea,
-0x7c40c000,
-0x9980fd8d,
-0xc8140016,
-0x08d00001,
-0x99400019,
-0xcd000068,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x043c0022,
-0xcfc1a2a4,
-0x84000381,
-0xcc000047,
-0x88000000,
-0xcc00007f,
-0xc8100016,
-0x9900000d,
-0xcc400067,
-0x80000004,
-0x7c408000,
-0xc81803ea,
-0x9980fd79,
-0x7c40c000,
-0x94c00003,
-0xc8100016,
-0x99000004,
-0xccc00068,
-0x80000004,
-0x7c408000,
-0x8400023b,
-0xc0148000,
-0xcc000041,
-0xcd41304a,
-0xc0148000,
-0x99000000,
-0xc8100016,
-0x80000004,
-0x7c408000,
-0xc0120001,
-0x7c51400c,
-0x80000003,
-0xd0550000,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0x291c001f,
-0xccc0004a,
-0xcd00004b,
-0x95c00003,
-0xc01c8000,
-0xcdc12010,
-0xdd830000,
-0x055c2000,
-0xcc000062,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004c,
-0xcd00004d,
-0xdd830000,
-0x055ca000,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc0004e,
-0xcd00004f,
-0xdd830000,
-0x055cc000,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00050,
-0xcd000051,
-0xdd830000,
-0x055cf8e0,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00052,
-0xcd000053,
-0xdd830000,
-0x055cf880,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00054,
-0xcd000055,
-0xdd830000,
-0x055ce000,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00056,
-0xcd000057,
-0xdd830000,
-0x055cf000,
-0x80000003,
-0xd81f4100,
-0x7c40c000,
-0x7c410000,
-0x7c414000,
-0x7c418000,
-0xccc00058,
-0xcd000059,
-0xdd830000,
-0x055cf3fc,
-0x80000003,
-0xd81f4100,
-0xd0432000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043a000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043c000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f8e0,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f880,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043e000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xd043f3fc,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xc81403e0,
-0xcc430000,
-0xcc430000,
-0xcc430000,
-0x7d45c000,
-0xcdc30000,
-0xd0430000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0x7c40c000,
-0xc81003e2,
-0xc81403e5,
-0xc81803e3,
-0xc81c03e4,
-0xcd812169,
-0xcdc1216a,
-0xccc1216b,
-0xcc01216c,
-0x04200004,
-0x7da18000,
-0x7d964002,
-0x9640fcd9,
-0xcd8003e3,
-0x31280003,
-0xc02df000,
-0x25180008,
-0x7dad800b,
-0x7da9800c,
-0x80000003,
-0xcd8003e3,
-0x308cffff,
-0xd04d0000,
-0x7c408000,
-0xa0000000,
-0xcc800062,
-0xc8140020,
-0x15580002,
-0x9580ffff,
-0xc8140020,
-0xcc00006e,
-0xcc412180,
-0x7c40c000,
-0xccc1218d,
-0xcc412181,
-0x28d0001f,
-0x34588000,
-0xcd81218c,
-0x9500fcbf,
-0xcc412182,
-0xc8140020,
-0x9940ffff,
-0xc8140020,
-0x80000004,
-0x7c408000,
-0x7c40c000,
-0x28d00018,
-0x31100001,
-0xc0160080,
-0x95000003,
-0xc02a0004,
-0x7cd4c00c,
-0xccc1217c,
-0xcc41217d,
-0xcc41217e,
-0x7c418000,
-0x1db00003,
-0x36a0217f,
-0x9b000003,
-0x419c0005,
-0x041c0040,
-0x99c00000,
-0x09dc0001,
-0xcc210000,
-0xc8240004,
-0x2a6c001f,
-0x419c0005,
-0x9ac0fffa,
-0xcc800062,
-0x80000004,
-0x7c408000,
-0x7c40c000,
-0x04d403e6,
-0x80000003,
-0xcc540000,
-0x8000037e,
-0xcc4003ea,
-0xc01c8000,
-0x044ca000,
-0xcdc12010,
-0x7c410000,
-0xc8140009,
-0x04180000,
-0x041c0008,
-0xcd800071,
-0x09dc0001,
-0x05980001,
-0xcd0d0000,
-0x99c0fffc,
-0xcc800062,
-0x8000037e,
-0xcd400071,
-0xc00e0100,
-0xcc000041,
-0xccc1304a,
-0xc83c007f,
-0xcc00007f,
-0x80000003,
-0xcc00007f,
-0xcc00007f,
-0x88000000,
-0xcc00007f,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00000000,
-0x00010333,
-0x00100006,
-0x00170008,
-0x0021000a,
-0x0027002a,
-0x00280025,
-0x0029002b,
-0x002a0028,
-0x002b002b,
-0x002d003a,
-0x002e0041,
-0x002f004c,
-0x0034004e,
-0x00360032,
-0x003900b1,
-0x003a00d1,
-0x003b00e6,
-0x003c00fe,
-0x003d016d,
-0x003f00af,
-0x00410338,
-0x0043034b,
-0x00440190,
-0x004500fe,
-0x004601ae,
-0x004701ae,
-0x00480200,
-0x0049020e,
-0x004a0257,
-0x004b0284,
-0x00520261,
-0x00530273,
-0x00540289,
-0x0057029b,
-0x0060029f,
-0x006102ae,
-0x006202b8,
-0x006302c2,
-0x006402cc,
-0x006502d6,
-0x006602e0,
-0x006702ea,
-0x006802f4,
-0x006902f8,
-0x006a02fc,
-0x006b0300,
-0x006c0304,
-0x006d0308,
-0x006e030c,
-0x006f0310,
-0x00700314,
-0x00720365,
-0x0074036b,
-0x00790369,
-0x007c031e,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-0x000f037a,
-};
-
-#endif
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
new file mode 100644 (file)
index 0000000..4a9028a
--- /dev/null
@@ -0,0 +1,662 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef R600D_H
+#define R600D_H
+
+#define CP_PACKET2                     0x80000000
+#define                PACKET2_PAD_SHIFT               0
+#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
+
+#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
+
+#define R6XX_MAX_SH_GPRS                       256
+#define R6XX_MAX_TEMP_GPRS                     16
+#define R6XX_MAX_SH_THREADS                    256
+#define R6XX_MAX_SH_STACK_ENTRIES              4096
+#define R6XX_MAX_BACKENDS                      8
+#define R6XX_MAX_BACKENDS_MASK                 0xff
+#define R6XX_MAX_SIMDS                         8
+#define R6XX_MAX_SIMDS_MASK                    0xff
+#define R6XX_MAX_PIPES                         8
+#define R6XX_MAX_PIPES_MASK                    0xff
+
+/* PTE flags */
+#define PTE_VALID                              (1 << 0)
+#define PTE_SYSTEM                             (1 << 1)
+#define PTE_SNOOPED                            (1 << 2)
+#define PTE_READABLE                           (1 << 5)
+#define PTE_WRITEABLE                          (1 << 6)
+
+/* Registers */
+#define        ARB_POP                                         0x2418
+#define        ENABLE_TC128                                    (1 << 30)
+#define        ARB_GDEC_RD_CNTL                                0x246C
+
+#define        CC_GC_SHADER_PIPE_CONFIG                        0x8950
+#define        CC_RB_BACKEND_DISABLE                           0x98F4
+#define                BACKEND_DISABLE(x)                              ((x) << 16)
+
+#define        CB_COLOR0_BASE                                  0x28040
+#define        CB_COLOR1_BASE                                  0x28044
+#define        CB_COLOR2_BASE                                  0x28048
+#define        CB_COLOR3_BASE                                  0x2804C
+#define        CB_COLOR4_BASE                                  0x28050
+#define        CB_COLOR5_BASE                                  0x28054
+#define        CB_COLOR6_BASE                                  0x28058
+#define        CB_COLOR7_BASE                                  0x2805C
+#define        CB_COLOR7_FRAG                                  0x280FC
+
+#define CB_COLOR0_SIZE                                  0x28060
+#define CB_COLOR0_VIEW                                  0x28080
+#define CB_COLOR0_INFO                                  0x280a0
+#define CB_COLOR0_TILE                                  0x280c0
+#define CB_COLOR0_FRAG                                  0x280e0
+#define CB_COLOR0_MASK                                  0x28100
+
+#define        CONFIG_MEMSIZE                                  0x5428
+#define CONFIG_CNTL                                    0x5424
+#define        CP_STAT                                         0x8680
+#define        CP_COHER_BASE                                   0x85F8
+#define        CP_DEBUG                                        0xC1FC
+#define        R_0086D8_CP_ME_CNTL                     0x86D8
+#define                S_0086D8_CP_ME_HALT(x)                  (((x) & 1)<<28)
+#define                C_0086D8_CP_ME_HALT(x)                  ((x) & 0xEFFFFFFF)
+#define        CP_ME_RAM_DATA                                  0xC160
+#define        CP_ME_RAM_RADDR                                 0xC158
+#define        CP_ME_RAM_WADDR                                 0xC15C
+#define CP_MEQ_THRESHOLDS                              0x8764
+#define                MEQ_END(x)                                      ((x) << 16)
+#define                ROQ_END(x)                                      ((x) << 24)
+#define        CP_PERFMON_CNTL                                 0x87FC
+#define        CP_PFP_UCODE_ADDR                               0xC150
+#define        CP_PFP_UCODE_DATA                               0xC154
+#define        CP_QUEUE_THRESHOLDS                             0x8760
+#define                ROQ_IB1_START(x)                                ((x) << 0)
+#define                ROQ_IB2_START(x)                                ((x) << 8)
+#define        CP_RB_BASE                                      0xC100
+#define        CP_RB_CNTL                                      0xC104
+#define                RB_BUFSZ(x)                                     ((x)<<0)
+#define                RB_BLKSZ(x)                                     ((x)<<8)
+#define                RB_NO_UPDATE                                    (1<<27)
+#define                RB_RPTR_WR_ENA                                  (1<<31)
+#define                BUF_SWAP_32BIT                                  (2 << 16)
+#define        CP_RB_RPTR                                      0x8700
+#define        CP_RB_RPTR_ADDR                                 0xC10C
+#define        CP_RB_RPTR_ADDR_HI                              0xC110
+#define        CP_RB_RPTR_WR                                   0xC108
+#define        CP_RB_WPTR                                      0xC114
+#define        CP_RB_WPTR_ADDR                                 0xC118
+#define        CP_RB_WPTR_ADDR_HI                              0xC11C
+#define        CP_RB_WPTR_DELAY                                0x8704
+#define        CP_ROQ_IB1_STAT                                 0x8784
+#define        CP_ROQ_IB2_STAT                                 0x8788
+#define        CP_SEM_WAIT_TIMER                               0x85BC
+
+#define        DB_DEBUG                                        0x9830
+#define                PREZ_MUST_WAIT_FOR_POSTZ_DONE                   (1 << 31)
+#define        DB_DEPTH_BASE                                   0x2800C
+#define        DB_WATERMARKS                                   0x9838
+#define                DEPTH_FREE(x)                                   ((x) << 0)
+#define                DEPTH_FLUSH(x)                                  ((x) << 5)
+#define                DEPTH_PENDING_FREE(x)                           ((x) << 15)
+#define                DEPTH_CACHELINE_FREE(x)                         ((x) << 20)
+
+#define        DCP_TILING_CONFIG                               0x6CA0
+#define                PIPE_TILING(x)                                  ((x) << 1)
+#define        BANK_TILING(x)                                  ((x) << 4)
+#define                GROUP_SIZE(x)                                   ((x) << 6)
+#define                ROW_TILING(x)                                   ((x) << 8)
+#define                BANK_SWAPS(x)                                   ((x) << 11)
+#define                SAMPLE_SPLIT(x)                                 ((x) << 14)
+#define                BACKEND_MAP(x)                                  ((x) << 16)
+
+#define GB_TILING_CONFIG                               0x98F0
+
+#define        GC_USER_SHADER_PIPE_CONFIG                      0x8954
+#define                INACTIVE_QD_PIPES(x)                            ((x) << 8)
+#define                INACTIVE_QD_PIPES_MASK                          0x0000FF00
+#define                INACTIVE_SIMDS(x)                               ((x) << 16)
+#define                INACTIVE_SIMDS_MASK                             0x00FF0000
+
+#define SQ_CONFIG                                         0x8c00
+#       define VC_ENABLE                                  (1 << 0)
+#       define EXPORT_SRC_C                               (1 << 1)
+#       define DX9_CONSTS                                 (1 << 2)
+#       define ALU_INST_PREFER_VECTOR                     (1 << 3)
+#       define DX10_CLAMP                                 (1 << 4)
+#       define CLAUSE_SEQ_PRIO(x)                         ((x) << 8)
+#       define PS_PRIO(x)                                 ((x) << 24)
+#       define VS_PRIO(x)                                 ((x) << 26)
+#       define GS_PRIO(x)                                 ((x) << 28)
+#       define ES_PRIO(x)                                 ((x) << 30)
+#define SQ_GPR_RESOURCE_MGMT_1                            0x8c04
+#       define NUM_PS_GPRS(x)                             ((x) << 0)
+#       define NUM_VS_GPRS(x)                             ((x) << 16)
+#       define NUM_CLAUSE_TEMP_GPRS(x)                    ((x) << 28)
+#define SQ_GPR_RESOURCE_MGMT_2                            0x8c08
+#       define NUM_GS_GPRS(x)                             ((x) << 0)
+#       define NUM_ES_GPRS(x)                             ((x) << 16)
+#define SQ_THREAD_RESOURCE_MGMT                           0x8c0c
+#       define NUM_PS_THREADS(x)                          ((x) << 0)
+#       define NUM_VS_THREADS(x)                          ((x) << 8)
+#       define NUM_GS_THREADS(x)                          ((x) << 16)
+#       define NUM_ES_THREADS(x)                          ((x) << 24)
+#define SQ_STACK_RESOURCE_MGMT_1                          0x8c10
+#       define NUM_PS_STACK_ENTRIES(x)                    ((x) << 0)
+#       define NUM_VS_STACK_ENTRIES(x)                    ((x) << 16)
+#define SQ_STACK_RESOURCE_MGMT_2                          0x8c14
+#       define NUM_GS_STACK_ENTRIES(x)                    ((x) << 0)
+#       define NUM_ES_STACK_ENTRIES(x)                    ((x) << 16)
+
+#define GRBM_CNTL                                       0x8000
+#       define GRBM_READ_TIMEOUT(x)                     ((x) << 0)
+#define        GRBM_STATUS                                     0x8010
+#define                CMDFIFO_AVAIL_MASK                              0x0000001F
+#define                GUI_ACTIVE                                      (1<<31)
+#define        GRBM_STATUS2                                    0x8014
+#define        GRBM_SOFT_RESET                                 0x8020
+#define                SOFT_RESET_CP                                   (1<<0)
+
+#define        HDP_HOST_PATH_CNTL                              0x2C00
+#define        HDP_NONSURFACE_BASE                             0x2C04
+#define        HDP_NONSURFACE_INFO                             0x2C08
+#define        HDP_NONSURFACE_SIZE                             0x2C0C
+#define HDP_REG_COHERENCY_FLUSH_CNTL                   0x54A0
+#define        HDP_TILING_CONFIG                               0x2F3C
+
+#define MC_VM_AGP_TOP                                  0x2184
+#define MC_VM_AGP_BOT                                  0x2188
+#define        MC_VM_AGP_BASE                                  0x218C
+#define MC_VM_FB_LOCATION                              0x2180
+#define MC_VM_L1_TLB_MCD_RD_A_CNTL                     0x219C
+#define        ENABLE_L1_TLB                                   (1 << 0)
+#define                ENABLE_L1_FRAGMENT_PROCESSING                   (1 << 1)
+#define                ENABLE_L1_STRICT_ORDERING                       (1 << 2)
+#define                SYSTEM_ACCESS_MODE_MASK                         0x000000C0
+#define                SYSTEM_ACCESS_MODE_SHIFT                        6
+#define                SYSTEM_ACCESS_MODE_PA_ONLY                      (0 << 6)
+#define                SYSTEM_ACCESS_MODE_USE_SYS_MAP                  (1 << 6)
+#define                SYSTEM_ACCESS_MODE_IN_SYS                       (2 << 6)
+#define                SYSTEM_ACCESS_MODE_NOT_IN_SYS                   (3 << 6)
+#define                SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU       (0 << 8)
+#define                SYSTEM_APERTURE_UNMAPPED_ACCESS_DEFAULT_PAGE    (1 << 8)
+#define                ENABLE_SEMAPHORE_MODE                           (1 << 10)
+#define                ENABLE_WAIT_L2_QUERY                            (1 << 11)
+#define                EFFECTIVE_L1_TLB_SIZE(x)                        (((x) & 7) << 12)
+#define                EFFECTIVE_L1_TLB_SIZE_MASK                      0x00007000
+#define                EFFECTIVE_L1_TLB_SIZE_SHIFT                     12
+#define                EFFECTIVE_L1_QUEUE_SIZE(x)                      (((x) & 7) << 15)
+#define                EFFECTIVE_L1_QUEUE_SIZE_MASK                    0x00038000
+#define                EFFECTIVE_L1_QUEUE_SIZE_SHIFT                   15
+#define MC_VM_L1_TLB_MCD_RD_B_CNTL                     0x21A0
+#define MC_VM_L1_TLB_MCB_RD_GFX_CNTL                   0x21FC
+#define MC_VM_L1_TLB_MCB_RD_HDP_CNTL                   0x2204
+#define MC_VM_L1_TLB_MCB_RD_PDMA_CNTL                  0x2208
+#define MC_VM_L1_TLB_MCB_RD_SEM_CNTL                   0x220C
+#define        MC_VM_L1_TLB_MCB_RD_SYS_CNTL                    0x2200
+#define MC_VM_L1_TLB_MCD_WR_A_CNTL                     0x21A4
+#define MC_VM_L1_TLB_MCD_WR_B_CNTL                     0x21A8
+#define MC_VM_L1_TLB_MCB_WR_GFX_CNTL                   0x2210
+#define MC_VM_L1_TLB_MCB_WR_HDP_CNTL                   0x2218
+#define MC_VM_L1_TLB_MCB_WR_PDMA_CNTL                  0x221C
+#define MC_VM_L1_TLB_MCB_WR_SEM_CNTL                   0x2220
+#define MC_VM_L1_TLB_MCB_WR_SYS_CNTL                   0x2214
+#define MC_VM_SYSTEM_APERTURE_LOW_ADDR                 0x2190
+#define                LOGICAL_PAGE_NUMBER_MASK                        0x000FFFFF
+#define                LOGICAL_PAGE_NUMBER_SHIFT                       0
+#define MC_VM_SYSTEM_APERTURE_HIGH_ADDR                        0x2194
+#define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR             0x2198
+
+#define        PA_CL_ENHANCE                                   0x8A14
+#define                CLIP_VTX_REORDER_ENA                            (1 << 0)
+#define                NUM_CLIP_SEQ(x)                                 ((x) << 1)
+#define PA_SC_AA_CONFIG                                        0x28C04
+#define        PA_SC_AA_SAMPLE_LOCS_2S                         0x8B40
+#define        PA_SC_AA_SAMPLE_LOCS_4S                         0x8B44
+#define        PA_SC_AA_SAMPLE_LOCS_8S_WD0                     0x8B48
+#define        PA_SC_AA_SAMPLE_LOCS_8S_WD1                     0x8B4C
+#define                S0_X(x)                                         ((x) << 0)
+#define                S0_Y(x)                                         ((x) << 4)
+#define                S1_X(x)                                         ((x) << 8)
+#define                S1_Y(x)                                         ((x) << 12)
+#define                S2_X(x)                                         ((x) << 16)
+#define                S2_Y(x)                                         ((x) << 20)
+#define                S3_X(x)                                         ((x) << 24)
+#define                S3_Y(x)                                         ((x) << 28)
+#define                S4_X(x)                                         ((x) << 0)
+#define                S4_Y(x)                                         ((x) << 4)
+#define                S5_X(x)                                         ((x) << 8)
+#define                S5_Y(x)                                         ((x) << 12)
+#define                S6_X(x)                                         ((x) << 16)
+#define                S6_Y(x)                                         ((x) << 20)
+#define                S7_X(x)                                         ((x) << 24)
+#define                S7_Y(x)                                         ((x) << 28)
+#define PA_SC_CLIPRECT_RULE                            0x2820c
+#define        PA_SC_ENHANCE                                   0x8BF0
+#define                FORCE_EOV_MAX_CLK_CNT(x)                        ((x) << 0)
+#define                FORCE_EOV_MAX_TILE_CNT(x)                       ((x) << 12)
+#define PA_SC_LINE_STIPPLE                             0x28A0C
+#define        PA_SC_LINE_STIPPLE_STATE                        0x8B10
+#define PA_SC_MODE_CNTL                                        0x28A4C
+#define        PA_SC_MULTI_CHIP_CNTL                           0x8B20
+
+#define PA_SC_SCREEN_SCISSOR_TL                         0x28030
+#define PA_SC_GENERIC_SCISSOR_TL                        0x28240
+#define PA_SC_WINDOW_SCISSOR_TL                         0x28204
+
+#define        PCIE_PORT_INDEX                                 0x0038
+#define        PCIE_PORT_DATA                                  0x003C
+
+#define RAMCFG                                         0x2408
+#define                NOOFBANK_SHIFT                                  0
+#define                NOOFBANK_MASK                                   0x00000001
+#define                NOOFRANK_SHIFT                                  1
+#define                NOOFRANK_MASK                                   0x00000002
+#define                NOOFROWS_SHIFT                                  2
+#define                NOOFROWS_MASK                                   0x0000001C
+#define                NOOFCOLS_SHIFT                                  5
+#define                NOOFCOLS_MASK                                   0x00000060
+#define                CHANSIZE_SHIFT                                  7
+#define                CHANSIZE_MASK                                   0x00000080
+#define                BURSTLENGTH_SHIFT                               8
+#define                BURSTLENGTH_MASK                                0x00000100
+#define                CHANSIZE_OVERRIDE                               (1 << 10)
+
+#define        SCRATCH_REG0                                    0x8500
+#define        SCRATCH_REG1                                    0x8504
+#define        SCRATCH_REG2                                    0x8508
+#define        SCRATCH_REG3                                    0x850C
+#define        SCRATCH_REG4                                    0x8510
+#define        SCRATCH_REG5                                    0x8514
+#define        SCRATCH_REG6                                    0x8518
+#define        SCRATCH_REG7                                    0x851C
+#define        SCRATCH_UMSK                                    0x8540
+#define        SCRATCH_ADDR                                    0x8544
+
+#define        SPI_CONFIG_CNTL                                 0x9100
+#define                GPR_WRITE_PRIORITY(x)                           ((x) << 0)
+#define                DISABLE_INTERP_1                                (1 << 5)
+#define        SPI_CONFIG_CNTL_1                               0x913C
+#define                VTX_DONE_DELAY(x)                               ((x) << 0)
+#define                INTERP_ONE_PRIM_PER_ROW                         (1 << 4)
+#define        SPI_INPUT_Z                                     0x286D8
+#define        SPI_PS_IN_CONTROL_0                             0x286CC
+#define                NUM_INTERP(x)                                   ((x)<<0)
+#define                POSITION_ENA                                    (1<<8)
+#define                POSITION_CENTROID                               (1<<9)
+#define                POSITION_ADDR(x)                                ((x)<<10)
+#define                PARAM_GEN(x)                                    ((x)<<15)
+#define                PARAM_GEN_ADDR(x)                               ((x)<<19)
+#define                BARYC_SAMPLE_CNTL(x)                            ((x)<<26)
+#define                PERSP_GRADIENT_ENA                              (1<<28)
+#define                LINEAR_GRADIENT_ENA                             (1<<29)
+#define                POSITION_SAMPLE                                 (1<<30)
+#define                BARYC_AT_SAMPLE_ENA                             (1<<31)
+#define        SPI_PS_IN_CONTROL_1                             0x286D0
+#define                GEN_INDEX_PIX                                   (1<<0)
+#define                GEN_INDEX_PIX_ADDR(x)                           ((x)<<1)
+#define                FRONT_FACE_ENA                                  (1<<8)
+#define                FRONT_FACE_CHAN(x)                              ((x)<<9)
+#define                FRONT_FACE_ALL_BITS                             (1<<11)
+#define                FRONT_FACE_ADDR(x)                              ((x)<<12)
+#define                FOG_ADDR(x)                                     ((x)<<17)
+#define                FIXED_PT_POSITION_ENA                           (1<<24)
+#define                FIXED_PT_POSITION_ADDR(x)                       ((x)<<25)
+
+#define        SQ_MS_FIFO_SIZES                                0x8CF0
+#define                CACHE_FIFO_SIZE(x)                              ((x) << 0)
+#define                FETCH_FIFO_HIWATER(x)                           ((x) << 8)
+#define                DONE_FIFO_HIWATER(x)                            ((x) << 16)
+#define                ALU_UPDATE_FIFO_HIWATER(x)                      ((x) << 24)
+#define        SQ_PGM_START_ES                                 0x28880
+#define        SQ_PGM_START_FS                                 0x28894
+#define        SQ_PGM_START_GS                                 0x2886C
+#define        SQ_PGM_START_PS                                 0x28840
+#define SQ_PGM_RESOURCES_PS                             0x28850
+#define SQ_PGM_EXPORTS_PS                               0x28854
+#define SQ_PGM_CF_OFFSET_PS                             0x288cc
+#define        SQ_PGM_START_VS                                 0x28858
+#define SQ_PGM_RESOURCES_VS                             0x28868
+#define SQ_PGM_CF_OFFSET_VS                             0x288d0
+#define        SQ_VTX_CONSTANT_WORD6_0                         0x38018
+#define                S__SQ_VTX_CONSTANT_TYPE(x)                      (((x) & 3) << 30)
+#define                G__SQ_VTX_CONSTANT_TYPE(x)                      (((x) >> 30) & 3)
+#define                        SQ_TEX_VTX_INVALID_TEXTURE                      0x0
+#define                        SQ_TEX_VTX_INVALID_BUFFER                       0x1
+#define                        SQ_TEX_VTX_VALID_TEXTURE                        0x2
+#define                        SQ_TEX_VTX_VALID_BUFFER                         0x3
+
+
+#define        SX_MISC                                         0x28350
+#define        SX_DEBUG_1                                      0x9054
+#define                SMX_EVENT_RELEASE                               (1 << 0)
+#define                ENABLE_NEW_SMX_ADDRESS                          (1 << 16)
+
+#define        TA_CNTL_AUX                                     0x9508
+#define                DISABLE_CUBE_WRAP                               (1 << 0)
+#define                DISABLE_CUBE_ANISO                              (1 << 1)
+#define                SYNC_GRADIENT                                   (1 << 24)
+#define                SYNC_WALKER                                     (1 << 25)
+#define                SYNC_ALIGNER                                    (1 << 26)
+#define                BILINEAR_PRECISION_6_BIT                        (0 << 31)
+#define                BILINEAR_PRECISION_8_BIT                        (1 << 31)
+
+#define        TC_CNTL                                         0x9608
+#define                TC_L2_SIZE(x)                                   ((x)<<5)
+#define                L2_DISABLE_LATE_HIT                             (1<<9)
+
+
+#define        VGT_CACHE_INVALIDATION                          0x88C4
+#define                CACHE_INVALIDATION(x)                           ((x)<<0)
+#define                        VC_ONLY                                         0
+#define                        TC_ONLY                                         1
+#define                        VC_AND_TC                                       2
+#define        VGT_DMA_BASE                                    0x287E8
+#define        VGT_DMA_BASE_HI                                 0x287E4
+#define        VGT_ES_PER_GS                                   0x88CC
+#define        VGT_GS_PER_ES                                   0x88C8
+#define        VGT_GS_PER_VS                                   0x88E8
+#define        VGT_GS_VERTEX_REUSE                             0x88D4
+#define VGT_PRIMITIVE_TYPE                              0x8958
+#define        VGT_NUM_INSTANCES                               0x8974
+#define        VGT_OUT_DEALLOC_CNTL                            0x28C5C
+#define                DEALLOC_DIST_MASK                               0x0000007F
+#define        VGT_STRMOUT_BASE_OFFSET_0                       0x28B10
+#define        VGT_STRMOUT_BASE_OFFSET_1                       0x28B14
+#define        VGT_STRMOUT_BASE_OFFSET_2                       0x28B18
+#define        VGT_STRMOUT_BASE_OFFSET_3                       0x28B1c
+#define        VGT_STRMOUT_BASE_OFFSET_HI_0                    0x28B44
+#define        VGT_STRMOUT_BASE_OFFSET_HI_1                    0x28B48
+#define        VGT_STRMOUT_BASE_OFFSET_HI_2                    0x28B4c
+#define        VGT_STRMOUT_BASE_OFFSET_HI_3                    0x28B50
+#define        VGT_STRMOUT_BUFFER_BASE_0                       0x28AD8
+#define        VGT_STRMOUT_BUFFER_BASE_1                       0x28AE8
+#define        VGT_STRMOUT_BUFFER_BASE_2                       0x28AF8
+#define        VGT_STRMOUT_BUFFER_BASE_3                       0x28B08
+#define        VGT_STRMOUT_BUFFER_OFFSET_0                     0x28ADC
+#define        VGT_STRMOUT_BUFFER_OFFSET_1                     0x28AEC
+#define        VGT_STRMOUT_BUFFER_OFFSET_2                     0x28AFC
+#define        VGT_STRMOUT_BUFFER_OFFSET_3                     0x28B0C
+#define        VGT_STRMOUT_EN                                  0x28AB0
+#define        VGT_VERTEX_REUSE_BLOCK_CNTL                     0x28C58
+#define                VTX_REUSE_DEPTH_MASK                            0x000000FF
+#define VGT_EVENT_INITIATOR                             0x28a90
+#       define CACHE_FLUSH_AND_INV_EVENT                        (0x16 << 0)
+
+#define VM_CONTEXT0_CNTL                               0x1410
+#define                ENABLE_CONTEXT                                  (1 << 0)
+#define                PAGE_TABLE_DEPTH(x)                             (((x) & 3) << 1)
+#define                RANGE_PROTECTION_FAULT_ENABLE_DEFAULT           (1 << 4)
+#define VM_CONTEXT0_INVALIDATION_LOW_ADDR              0x1490
+#define VM_CONTEXT0_INVALIDATION_HIGH_ADDR             0x14B0
+#define VM_CONTEXT0_PAGE_TABLE_BASE_ADDR               0x1574
+#define VM_CONTEXT0_PAGE_TABLE_START_ADDR              0x1594
+#define VM_CONTEXT0_PAGE_TABLE_END_ADDR                        0x15B4
+#define VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR      0x1554
+#define VM_CONTEXT0_REQUEST_RESPONSE                   0x1470
+#define                REQUEST_TYPE(x)                                 (((x) & 0xf) << 0)
+#define                RESPONSE_TYPE_MASK                              0x000000F0
+#define                RESPONSE_TYPE_SHIFT                             4
+#define VM_L2_CNTL                                     0x1400
+#define                ENABLE_L2_CACHE                                 (1 << 0)
+#define                ENABLE_L2_FRAGMENT_PROCESSING                   (1 << 1)
+#define                ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE         (1 << 9)
+#define                EFFECTIVE_L2_QUEUE_SIZE(x)                      (((x) & 7) << 13)
+#define VM_L2_CNTL2                                    0x1404
+#define                INVALIDATE_ALL_L1_TLBS                          (1 << 0)
+#define                INVALIDATE_L2_CACHE                             (1 << 1)
+#define VM_L2_CNTL3                                    0x1408
+#define                BANK_SELECT_0(x)                                (((x) & 0x1f) << 0)
+#define                BANK_SELECT_1(x)                                (((x) & 0x1f) << 5)
+#define                L2_CACHE_UPDATE_MODE(x)                         (((x) & 3) << 10)
+#define        VM_L2_STATUS                                    0x140C
+#define                L2_BUSY                                         (1 << 0)
+
+#define        WAIT_UNTIL                                      0x8040
+#define         WAIT_2D_IDLE_bit                                (1 << 14)
+#define         WAIT_3D_IDLE_bit                                (1 << 15)
+#define         WAIT_2D_IDLECLEAN_bit                           (1 << 16)
+#define         WAIT_3D_IDLECLEAN_bit                           (1 << 17)
+
+
+
+/*
+ * PM4
+ */
+#define        PACKET_TYPE0    0
+#define        PACKET_TYPE1    1
+#define        PACKET_TYPE2    2
+#define        PACKET_TYPE3    3
+
+#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
+#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
+#define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2)
+#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
+#define PACKET0(reg, n)        ((PACKET_TYPE0 << 30) |                         \
+                        (((reg) >> 2) & 0xFFFF) |                      \
+                        ((n) & 0x3FFF) << 16)
+#define PACKET3(op, n) ((PACKET_TYPE3 << 30) |                         \
+                        (((op) & 0xFF) << 8) |                         \
+                        ((n) & 0x3FFF) << 16)
+
+/* Packet 3 types */
+#define        PACKET3_NOP                                     0x10
+#define        PACKET3_INDIRECT_BUFFER_END                     0x17
+#define        PACKET3_SET_PREDICATION                         0x20
+#define        PACKET3_REG_RMW                                 0x21
+#define        PACKET3_COND_EXEC                               0x22
+#define        PACKET3_PRED_EXEC                               0x23
+#define        PACKET3_START_3D_CMDBUF                         0x24
+#define        PACKET3_DRAW_INDEX_2                            0x27
+#define        PACKET3_CONTEXT_CONTROL                         0x28
+#define        PACKET3_DRAW_INDEX_IMMD_BE                      0x29
+#define        PACKET3_INDEX_TYPE                              0x2A
+#define        PACKET3_DRAW_INDEX                              0x2B
+#define        PACKET3_DRAW_INDEX_AUTO                         0x2D
+#define        PACKET3_DRAW_INDEX_IMMD                         0x2E
+#define        PACKET3_NUM_INSTANCES                           0x2F
+#define        PACKET3_STRMOUT_BUFFER_UPDATE                   0x34
+#define        PACKET3_INDIRECT_BUFFER_MP                      0x38
+#define        PACKET3_MEM_SEMAPHORE                           0x39
+#define        PACKET3_MPEG_INDEX                              0x3A
+#define        PACKET3_WAIT_REG_MEM                            0x3C
+#define        PACKET3_MEM_WRITE                               0x3D
+#define        PACKET3_INDIRECT_BUFFER                         0x32
+#define        PACKET3_CP_INTERRUPT                            0x40
+#define        PACKET3_SURFACE_SYNC                            0x43
+#              define PACKET3_CB0_DEST_BASE_ENA    (1 << 6)
+#              define PACKET3_TC_ACTION_ENA        (1 << 23)
+#              define PACKET3_VC_ACTION_ENA        (1 << 24)
+#              define PACKET3_CB_ACTION_ENA        (1 << 25)
+#              define PACKET3_DB_ACTION_ENA        (1 << 26)
+#              define PACKET3_SH_ACTION_ENA        (1 << 27)
+#              define PACKET3_SMX_ACTION_ENA       (1 << 28)
+#define        PACKET3_ME_INITIALIZE                           0x44
+#define                PACKET3_ME_INITIALIZE_DEVICE_ID(x) ((x) << 16)
+#define        PACKET3_COND_WRITE                              0x45
+#define        PACKET3_EVENT_WRITE                             0x46
+#define        PACKET3_EVENT_WRITE_EOP                         0x47
+#define        PACKET3_ONE_REG_WRITE                           0x57
+#define        PACKET3_SET_CONFIG_REG                          0x68
+#define                PACKET3_SET_CONFIG_REG_OFFSET                   0x00008000
+#define                PACKET3_SET_CONFIG_REG_END                      0x0000ac00
+#define        PACKET3_SET_CONTEXT_REG                         0x69
+#define                PACKET3_SET_CONTEXT_REG_OFFSET                  0x00028000
+#define                PACKET3_SET_CONTEXT_REG_END                     0x00029000
+#define        PACKET3_SET_ALU_CONST                           0x6A
+#define                PACKET3_SET_ALU_CONST_OFFSET                    0x00030000
+#define                PACKET3_SET_ALU_CONST_END                       0x00032000
+#define        PACKET3_SET_BOOL_CONST                          0x6B
+#define                PACKET3_SET_BOOL_CONST_OFFSET                   0x0003e380
+#define                PACKET3_SET_BOOL_CONST_END                      0x00040000
+#define        PACKET3_SET_LOOP_CONST                          0x6C
+#define                PACKET3_SET_LOOP_CONST_OFFSET                   0x0003e200
+#define                PACKET3_SET_LOOP_CONST_END                      0x0003e380
+#define        PACKET3_SET_RESOURCE                            0x6D
+#define                PACKET3_SET_RESOURCE_OFFSET                     0x00038000
+#define                PACKET3_SET_RESOURCE_END                        0x0003c000
+#define        PACKET3_SET_SAMPLER                             0x6E
+#define                PACKET3_SET_SAMPLER_OFFSET                      0x0003c000
+#define                PACKET3_SET_SAMPLER_END                         0x0003cff0
+#define        PACKET3_SET_CTL_CONST                           0x6F
+#define                PACKET3_SET_CTL_CONST_OFFSET                    0x0003cff0
+#define                PACKET3_SET_CTL_CONST_END                       0x0003e200
+#define        PACKET3_SURFACE_BASE_UPDATE                     0x73
+
+
+#define        R_008020_GRBM_SOFT_RESET                0x8020
+#define                S_008020_SOFT_RESET_CP(x)               (((x) & 1) << 0)
+#define                S_008020_SOFT_RESET_CB(x)               (((x) & 1) << 1)
+#define                S_008020_SOFT_RESET_CR(x)               (((x) & 1) << 2)
+#define                S_008020_SOFT_RESET_DB(x)               (((x) & 1) << 3)
+#define                S_008020_SOFT_RESET_PA(x)               (((x) & 1) << 5)
+#define                S_008020_SOFT_RESET_SC(x)               (((x) & 1) << 6)
+#define                S_008020_SOFT_RESET_SMX(x)              (((x) & 1) << 7)
+#define                S_008020_SOFT_RESET_SPI(x)              (((x) & 1) << 8)
+#define                S_008020_SOFT_RESET_SH(x)               (((x) & 1) << 9)
+#define                S_008020_SOFT_RESET_SX(x)               (((x) & 1) << 10)
+#define                S_008020_SOFT_RESET_TC(x)               (((x) & 1) << 11)
+#define                S_008020_SOFT_RESET_TA(x)               (((x) & 1) << 12)
+#define                S_008020_SOFT_RESET_VC(x)               (((x) & 1) << 13)
+#define                S_008020_SOFT_RESET_VGT(x)              (((x) & 1) << 14)
+#define        R_008010_GRBM_STATUS                    0x8010
+#define                S_008010_CMDFIFO_AVAIL(x)               (((x) & 0x1F) << 0)
+#define                S_008010_CP_RQ_PENDING(x)               (((x) & 1) << 6)
+#define                S_008010_CF_RQ_PENDING(x)               (((x) & 1) << 7)
+#define                S_008010_PF_RQ_PENDING(x)               (((x) & 1) << 8)
+#define                S_008010_GRBM_EE_BUSY(x)                (((x) & 1) << 10)
+#define                S_008010_VC_BUSY(x)                     (((x) & 1) << 11)
+#define                S_008010_DB03_CLEAN(x)                  (((x) & 1) << 12)
+#define                S_008010_CB03_CLEAN(x)                  (((x) & 1) << 13)
+#define                S_008010_VGT_BUSY_NO_DMA(x)             (((x) & 1) << 16)
+#define                S_008010_VGT_BUSY(x)                    (((x) & 1) << 17)
+#define                S_008010_TA03_BUSY(x)                   (((x) & 1) << 18)
+#define                S_008010_TC_BUSY(x)                     (((x) & 1) << 19)
+#define                S_008010_SX_BUSY(x)                     (((x) & 1) << 20)
+#define                S_008010_SH_BUSY(x)                     (((x) & 1) << 21)
+#define                S_008010_SPI03_BUSY(x)                  (((x) & 1) << 22)
+#define                S_008010_SMX_BUSY(x)                    (((x) & 1) << 23)
+#define                S_008010_SC_BUSY(x)                     (((x) & 1) << 24)
+#define                S_008010_PA_BUSY(x)                     (((x) & 1) << 25)
+#define                S_008010_DB03_BUSY(x)                   (((x) & 1) << 26)
+#define                S_008010_CR_BUSY(x)                     (((x) & 1) << 27)
+#define                S_008010_CP_COHERENCY_BUSY(x)           (((x) & 1) << 28)
+#define                S_008010_CP_BUSY(x)                     (((x) & 1) << 29)
+#define                S_008010_CB03_BUSY(x)                   (((x) & 1) << 30)
+#define                S_008010_GUI_ACTIVE(x)                  (((x) & 1) << 31)
+#define                G_008010_CMDFIFO_AVAIL(x)               (((x) >> 0) & 0x1F)
+#define                G_008010_CP_RQ_PENDING(x)               (((x) >> 6) & 1)
+#define                G_008010_CF_RQ_PENDING(x)               (((x) >> 7) & 1)
+#define                G_008010_PF_RQ_PENDING(x)               (((x) >> 8) & 1)
+#define                G_008010_GRBM_EE_BUSY(x)                (((x) >> 10) & 1)
+#define                G_008010_VC_BUSY(x)                     (((x) >> 11) & 1)
+#define                G_008010_DB03_CLEAN(x)                  (((x) >> 12) & 1)
+#define                G_008010_CB03_CLEAN(x)                  (((x) >> 13) & 1)
+#define                G_008010_VGT_BUSY_NO_DMA(x)             (((x) >> 16) & 1)
+#define                G_008010_VGT_BUSY(x)                    (((x) >> 17) & 1)
+#define                G_008010_TA03_BUSY(x)                   (((x) >> 18) & 1)
+#define                G_008010_TC_BUSY(x)                     (((x) >> 19) & 1)
+#define                G_008010_SX_BUSY(x)                     (((x) >> 20) & 1)
+#define                G_008010_SH_BUSY(x)                     (((x) >> 21) & 1)
+#define                G_008010_SPI03_BUSY(x)                  (((x) >> 22) & 1)
+#define                G_008010_SMX_BUSY(x)                    (((x) >> 23) & 1)
+#define                G_008010_SC_BUSY(x)                     (((x) >> 24) & 1)
+#define                G_008010_PA_BUSY(x)                     (((x) >> 25) & 1)
+#define                G_008010_DB03_BUSY(x)                   (((x) >> 26) & 1)
+#define                G_008010_CR_BUSY(x)                     (((x) >> 27) & 1)
+#define                G_008010_CP_COHERENCY_BUSY(x)           (((x) >> 28) & 1)
+#define                G_008010_CP_BUSY(x)                     (((x) >> 29) & 1)
+#define                G_008010_CB03_BUSY(x)                   (((x) >> 30) & 1)
+#define                G_008010_GUI_ACTIVE(x)                  (((x) >> 31) & 1)
+#define        R_008014_GRBM_STATUS2                   0x8014
+#define                S_008014_CR_CLEAN(x)                    (((x) & 1) << 0)
+#define                S_008014_SMX_CLEAN(x)                   (((x) & 1) << 1)
+#define                S_008014_SPI0_BUSY(x)                   (((x) & 1) << 8)
+#define                S_008014_SPI1_BUSY(x)                   (((x) & 1) << 9)
+#define                S_008014_SPI2_BUSY(x)                   (((x) & 1) << 10)
+#define                S_008014_SPI3_BUSY(x)                   (((x) & 1) << 11)
+#define                S_008014_TA0_BUSY(x)                    (((x) & 1) << 12)
+#define                S_008014_TA1_BUSY(x)                    (((x) & 1) << 13)
+#define                S_008014_TA2_BUSY(x)                    (((x) & 1) << 14)
+#define                S_008014_TA3_BUSY(x)                    (((x) & 1) << 15)
+#define                S_008014_DB0_BUSY(x)                    (((x) & 1) << 16)
+#define                S_008014_DB1_BUSY(x)                    (((x) & 1) << 17)
+#define                S_008014_DB2_BUSY(x)                    (((x) & 1) << 18)
+#define                S_008014_DB3_BUSY(x)                    (((x) & 1) << 19)
+#define                S_008014_CB0_BUSY(x)                    (((x) & 1) << 20)
+#define                S_008014_CB1_BUSY(x)                    (((x) & 1) << 21)
+#define                S_008014_CB2_BUSY(x)                    (((x) & 1) << 22)
+#define                S_008014_CB3_BUSY(x)                    (((x) & 1) << 23)
+#define                G_008014_CR_CLEAN(x)                    (((x) >> 0) & 1)
+#define                G_008014_SMX_CLEAN(x)                   (((x) >> 1) & 1)
+#define                G_008014_SPI0_BUSY(x)                   (((x) >> 8) & 1)
+#define                G_008014_SPI1_BUSY(x)                   (((x) >> 9) & 1)
+#define                G_008014_SPI2_BUSY(x)                   (((x) >> 10) & 1)
+#define                G_008014_SPI3_BUSY(x)                   (((x) >> 11) & 1)
+#define                G_008014_TA0_BUSY(x)                    (((x) >> 12) & 1)
+#define                G_008014_TA1_BUSY(x)                    (((x) >> 13) & 1)
+#define                G_008014_TA2_BUSY(x)                    (((x) >> 14) & 1)
+#define                G_008014_TA3_BUSY(x)                    (((x) >> 15) & 1)
+#define                G_008014_DB0_BUSY(x)                    (((x) >> 16) & 1)
+#define                G_008014_DB1_BUSY(x)                    (((x) >> 17) & 1)
+#define                G_008014_DB2_BUSY(x)                    (((x) >> 18) & 1)
+#define                G_008014_DB3_BUSY(x)                    (((x) >> 19) & 1)
+#define                G_008014_CB0_BUSY(x)                    (((x) >> 20) & 1)
+#define                G_008014_CB1_BUSY(x)                    (((x) >> 21) & 1)
+#define                G_008014_CB2_BUSY(x)                    (((x) >> 22) & 1)
+#define                G_008014_CB3_BUSY(x)                    (((x) >> 23) & 1)
+#define        R_000E50_SRBM_STATUS                            0x0E50
+#define                G_000E50_RLC_RQ_PENDING(x)              (((x) >> 3) & 1)
+#define                G_000E50_RCU_RQ_PENDING(x)              (((x) >> 4) & 1)
+#define                G_000E50_GRBM_RQ_PENDING(x)             (((x) >> 5) & 1)
+#define                G_000E50_HI_RQ_PENDING(x)               (((x) >> 6) & 1)
+#define                G_000E50_IO_EXTERN_SIGNAL(x)            (((x) >> 7) & 1)
+#define                G_000E50_VMC_BUSY(x)                    (((x) >> 8) & 1)
+#define                G_000E50_MCB_BUSY(x)                    (((x) >> 9) & 1)
+#define                G_000E50_MCDZ_BUSY(x)                   (((x) >> 10) & 1)
+#define                G_000E50_MCDY_BUSY(x)                   (((x) >> 11) & 1)
+#define                G_000E50_MCDX_BUSY(x)                   (((x) >> 12) & 1)
+#define                G_000E50_MCDW_BUSY(x)                   (((x) >> 13) & 1)
+#define                G_000E50_SEM_BUSY(x)                    (((x) >> 14) & 1)
+#define                G_000E50_RLC_BUSY(x)                    (((x) >> 15) & 1)
+#define        R_000E60_SRBM_SOFT_RESET                        0x0E60
+#define                S_000E60_SOFT_RESET_BIF(x)              (((x) & 1) << 1)
+#define                S_000E60_SOFT_RESET_CG(x)               (((x) & 1) << 2)
+#define                S_000E60_SOFT_RESET_CMC(x)              (((x) & 1) << 3)
+#define                S_000E60_SOFT_RESET_CSC(x)              (((x) & 1) << 4)
+#define                S_000E60_SOFT_RESET_DC(x)               (((x) & 1) << 5)
+#define                S_000E60_SOFT_RESET_GRBM(x)             (((x) & 1) << 8)
+#define                S_000E60_SOFT_RESET_HDP(x)              (((x) & 1) << 9)
+#define                S_000E60_SOFT_RESET_IH(x)               (((x) & 1) << 10)
+#define                S_000E60_SOFT_RESET_MC(x)               (((x) & 1) << 11)
+#define                S_000E60_SOFT_RESET_RLC(x)              (((x) & 1) << 13)
+#define                S_000E60_SOFT_RESET_ROM(x)              (((x) & 1) << 14)
+#define                S_000E60_SOFT_RESET_SEM(x)              (((x) & 1) << 15)
+#define                S_000E60_SOFT_RESET_TSC(x)              (((x) & 1) << 16)
+#define                S_000E60_SOFT_RESET_VMC(x)              (((x) & 1) << 17)
+
+#endif
index b519fb2..c839b60 100644 (file)
@@ -51,7 +51,6 @@
 
 #include "radeon_mode.h"
 #include "radeon_reg.h"
-#include "r300.h"
 
 /*
  * Modules parameters.
@@ -66,6 +65,7 @@ extern int radeon_gart_size;
 extern int radeon_benchmarking;
 extern int radeon_testing;
 extern int radeon_connector_table;
+extern int radeon_tv;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -75,6 +75,7 @@ extern int radeon_connector_table;
 #define RADEON_IB_POOL_SIZE            16
 #define RADEON_DEBUGFS_MAX_NUM_FILES   32
 #define RADEONFB_CONN_LIMIT            4
+#define RADEON_BIOS_NUM_SCRATCH                8
 
 enum radeon_family {
        CHIP_R100,
@@ -107,14 +108,15 @@ enum radeon_family {
        CHIP_R600,
        CHIP_RV610,
        CHIP_RV630,
+       CHIP_RV670,
        CHIP_RV620,
        CHIP_RV635,
-       CHIP_RV670,
        CHIP_RS780,
+       CHIP_RS880,
        CHIP_RV770,
        CHIP_RV730,
        CHIP_RV710,
-       CHIP_RS880,
+       CHIP_RV740,
        CHIP_LAST,
 };
 
@@ -151,10 +153,21 @@ struct radeon_device;
  */
 bool radeon_get_bios(struct radeon_device *rdev);
 
+
 /*
- * Clocks
+ * Dummy page
  */
+struct radeon_dummy_page {
+       struct page     *page;
+       dma_addr_t      addr;
+};
+int radeon_dummy_page_init(struct radeon_device *rdev);
+void radeon_dummy_page_fini(struct radeon_device *rdev);
+
 
+/*
+ * Clocks
+ */
 struct radeon_clock {
        struct radeon_pll p1pll;
        struct radeon_pll p2pll;
@@ -165,6 +178,7 @@ struct radeon_clock {
        uint32_t default_sclk;
 };
 
+
 /*
  * Fences.
  */
@@ -331,14 +345,18 @@ struct radeon_mc {
        resource_size_t         aper_size;
        resource_size_t         aper_base;
        resource_size_t         agp_base;
-       unsigned                gtt_location;
-       unsigned                gtt_size;
-       unsigned                vram_location;
        /* for some chips with <= 32MB we need to lie
         * about vram size near mc fb location */
-       unsigned                mc_vram_size;
+       u64                     mc_vram_size;
+       u64                     gtt_location;
+       u64                     gtt_size;
+       u64                     gtt_start;
+       u64                     gtt_end;
+       u64                     vram_location;
+       u64                     vram_start;
+       u64                     vram_end;
        unsigned                vram_width;
-       unsigned                real_vram_size;
+       u64                     real_vram_size;
        int                     vram_mtrr;
        bool                    vram_is_ddr;
 };
@@ -385,6 +403,10 @@ struct radeon_ib {
        uint32_t                length_dw;
 };
 
+/*
+ * locking -
+ * mutex protects scheduled_ibs, ready, alloc_bm
+ */
 struct radeon_ib_pool {
        struct mutex            mutex;
        struct radeon_object    *robj;
@@ -410,6 +432,16 @@ struct radeon_cp {
        bool                    ready;
 };
 
+struct r600_blit {
+       struct radeon_object    *shader_obj;
+       u64 shader_gpu_addr;
+       u32 vs_offset, ps_offset;
+       u32 state_offset;
+       u32 state_len;
+       u32 vb_used, vb_total;
+       struct radeon_ib *vb_ib;
+};
+
 int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib);
 void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib);
 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib);
@@ -462,6 +494,7 @@ struct radeon_cs_parser {
        int                     chunk_relocs_idx;
        struct radeon_ib        *ib;
        void                    *track;
+       unsigned                family;
 };
 
 struct radeon_cs_packet {
@@ -558,13 +591,19 @@ int r100_debugfs_cp_init(struct radeon_device *rdev);
  */
 struct radeon_asic {
        int (*init)(struct radeon_device *rdev);
+       void (*fini)(struct radeon_device *rdev);
+       int (*resume)(struct radeon_device *rdev);
+       int (*suspend)(struct radeon_device *rdev);
        void (*errata)(struct radeon_device *rdev);
        void (*vram_info)(struct radeon_device *rdev);
+       void (*vga_set_state)(struct radeon_device *rdev, bool state);
        int (*gpu_reset)(struct radeon_device *rdev);
        int (*mc_init)(struct radeon_device *rdev);
        void (*mc_fini)(struct radeon_device *rdev);
        int (*wb_init)(struct radeon_device *rdev);
        void (*wb_fini)(struct radeon_device *rdev);
+       int (*gart_init)(struct radeon_device *rdev);
+       void (*gart_fini)(struct radeon_device *rdev);
        int (*gart_enable)(struct radeon_device *rdev);
        void (*gart_disable)(struct radeon_device *rdev);
        void (*gart_tlb_flush)(struct radeon_device *rdev);
@@ -572,7 +611,11 @@ struct radeon_asic {
        int (*cp_init)(struct radeon_device *rdev, unsigned ring_size);
        void (*cp_fini)(struct radeon_device *rdev);
        void (*cp_disable)(struct radeon_device *rdev);
+       void (*cp_commit)(struct radeon_device *rdev);
        void (*ring_start)(struct radeon_device *rdev);
+       int (*ring_test)(struct radeon_device *rdev);
+       void (*ring_ib_execute)(struct radeon_device *rdev, struct radeon_ib *ib);
+       int (*ib_test)(struct radeon_device *rdev);
        int (*irq_set)(struct radeon_device *rdev);
        int (*irq_process)(struct radeon_device *rdev);
        u32 (*get_vblank_counter)(struct radeon_device *rdev, int crtc);
@@ -604,8 +647,60 @@ struct radeon_asic {
        void (*bandwidth_update)(struct radeon_device *rdev);
 };
 
+/*
+ * Asic structures
+ */
+struct r100_asic {
+       const unsigned  *reg_safe_bm;
+       unsigned        reg_safe_bm_size;
+};
+
+struct r300_asic {
+       const unsigned  *reg_safe_bm;
+       unsigned        reg_safe_bm_size;
+};
+
+struct r600_asic {
+       unsigned max_pipes;
+       unsigned max_tile_pipes;
+       unsigned max_simds;
+       unsigned max_backends;
+       unsigned max_gprs;
+       unsigned max_threads;
+       unsigned max_stack_entries;
+       unsigned max_hw_contexts;
+       unsigned max_gs_threads;
+       unsigned sx_max_export_size;
+       unsigned sx_max_export_pos_size;
+       unsigned sx_max_export_smx_size;
+       unsigned sq_num_cf_insts;
+};
+
+struct rv770_asic {
+       unsigned max_pipes;
+       unsigned max_tile_pipes;
+       unsigned max_simds;
+       unsigned max_backends;
+       unsigned max_gprs;
+       unsigned max_threads;
+       unsigned max_stack_entries;
+       unsigned max_hw_contexts;
+       unsigned max_gs_threads;
+       unsigned sx_max_export_size;
+       unsigned sx_max_export_pos_size;
+       unsigned sx_max_export_smx_size;
+       unsigned sq_num_cf_insts;
+       unsigned sx_num_of_sets;
+       unsigned sc_prim_fifo_size;
+       unsigned sc_hiz_tile_fifo_size;
+       unsigned sc_earlyz_tile_fifo_fize;
+};
+
 union radeon_asic_config {
        struct r300_asic        r300;
+       struct r100_asic        r100;
+       struct r600_asic        r600;
+       struct rv770_asic       rv770;
 };
 
 
@@ -646,6 +741,7 @@ typedef uint32_t (*radeon_rreg_t)(struct radeon_device*, uint32_t);
 typedef void (*radeon_wreg_t)(struct radeon_device*, uint32_t, uint32_t);
 
 struct radeon_device {
+       struct device                   *dev;
        struct drm_device               *ddev;
        struct pci_dev                  *pdev;
        /* ASIC */
@@ -689,13 +785,20 @@ struct radeon_device {
        struct radeon_asic              *asic;
        struct radeon_gem               gem;
        struct radeon_pm                pm;
+       uint32_t                        bios_scratch[RADEON_BIOS_NUM_SCRATCH];
        struct mutex                    cs_mutex;
        struct radeon_wb                wb;
+       struct radeon_dummy_page        dummy_page;
        bool                            gpu_lockup;
        bool                            shutdown;
        bool                            suspend;
        bool                            need_dma32;
+       bool                            new_init_path;
+       bool                            accel_working;
        struct radeon_surface_reg surface_regs[RADEON_GEM_MAX_SURFACES];
+       const struct firmware *me_fw;   /* all family ME firmware */
+       const struct firmware *pfp_fw;  /* r6/700 PFP firmware */
+       struct r600_blit r600_blit;
 };
 
 int radeon_device_init(struct radeon_device *rdev,
@@ -705,6 +808,13 @@ int radeon_device_init(struct radeon_device *rdev,
 void radeon_device_fini(struct radeon_device *rdev);
 int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
 
+/* r600 blit */
+int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes);
+void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence);
+void r600_kms_blit_copy(struct radeon_device *rdev,
+                       u64 src_gpu_addr, u64 dst_gpu_addr,
+                       int size_bytes);
+
 static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
 {
        if (reg < 0x10000)
@@ -732,6 +842,7 @@ static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32
 #define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
 #define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
 #define RREG32(reg) r100_mm_rreg(rdev, (reg))
+#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg)))
 #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
 #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
 #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
@@ -755,6 +866,7 @@ static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32
                tmp_ |= ((val) & ~(mask));                      \
                WREG32_PLL(reg, tmp_);                          \
        } while (0)
+#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", r100_mm_rreg((rdev), (reg)))
 
 /*
  * Indirect registers accessor
@@ -819,51 +931,6 @@ void radeon_atombios_fini(struct radeon_device *rdev);
 /*
  * RING helpers.
  */
-#define CP_PACKET0                     0x00000000
-#define                PACKET0_BASE_INDEX_SHIFT        0
-#define                PACKET0_BASE_INDEX_MASK         (0x1ffff << 0)
-#define                PACKET0_COUNT_SHIFT             16
-#define                PACKET0_COUNT_MASK              (0x3fff << 16)
-#define CP_PACKET1                     0x40000000
-#define CP_PACKET2                     0x80000000
-#define                PACKET2_PAD_SHIFT               0
-#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
-#define CP_PACKET3                     0xC0000000
-#define                PACKET3_IT_OPCODE_SHIFT         8
-#define                PACKET3_IT_OPCODE_MASK          (0xff << 8)
-#define                PACKET3_COUNT_SHIFT             16
-#define                PACKET3_COUNT_MASK              (0x3fff << 16)
-/* PACKET3 op code */
-#define                PACKET3_NOP                     0x10
-#define                PACKET3_3D_DRAW_VBUF            0x28
-#define                PACKET3_3D_DRAW_IMMD            0x29
-#define                PACKET3_3D_DRAW_INDX            0x2A
-#define                PACKET3_3D_LOAD_VBPNTR          0x2F
-#define                PACKET3_INDX_BUFFER             0x33
-#define                PACKET3_3D_DRAW_VBUF_2          0x34
-#define                PACKET3_3D_DRAW_IMMD_2          0x35
-#define                PACKET3_3D_DRAW_INDX_2          0x36
-#define                PACKET3_BITBLT_MULTI            0x9B
-
-#define PACKET0(reg, n)        (CP_PACKET0 |                                   \
-                        REG_SET(PACKET0_BASE_INDEX, (reg) >> 2) |      \
-                        REG_SET(PACKET0_COUNT, (n)))
-#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
-#define PACKET3(op, n) (CP_PACKET3 |                                   \
-                        REG_SET(PACKET3_IT_OPCODE, (op)) |             \
-                        REG_SET(PACKET3_COUNT, (n)))
-
-#define        PACKET_TYPE0    0
-#define        PACKET_TYPE1    1
-#define        PACKET_TYPE2    2
-#define        PACKET_TYPE3    3
-
-#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
-#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
-#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
-#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
-#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
-
 static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 {
 #if DRM_DEBUG_CODE
@@ -882,14 +949,20 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
  * ASICs macro.
  */
 #define radeon_init(rdev) (rdev)->asic->init((rdev))
+#define radeon_fini(rdev) (rdev)->asic->fini((rdev))
+#define radeon_resume(rdev) (rdev)->asic->resume((rdev))
+#define radeon_suspend(rdev) (rdev)->asic->suspend((rdev))
 #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
 #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
 #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
 #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
 #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
 #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
 #define radeon_wb_init(rdev) (rdev)->asic->wb_init((rdev))
 #define radeon_wb_fini(rdev) (rdev)->asic->wb_fini((rdev))
+#define radeon_gpu_gart_init(rdev) (rdev)->asic->gart_init((rdev))
+#define radeon_gpu_gart_fini(rdev) (rdev)->asic->gart_fini((rdev))
 #define radeon_gart_enable(rdev) (rdev)->asic->gart_enable((rdev))
 #define radeon_gart_disable(rdev) (rdev)->asic->gart_disable((rdev))
 #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev))
@@ -897,7 +970,11 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 #define radeon_cp_init(rdev,rsize) (rdev)->asic->cp_init((rdev), (rsize))
 #define radeon_cp_fini(rdev) (rdev)->asic->cp_fini((rdev))
 #define radeon_cp_disable(rdev) (rdev)->asic->cp_disable((rdev))
+#define radeon_cp_commit(rdev) (rdev)->asic->cp_commit((rdev))
 #define radeon_ring_start(rdev) (rdev)->asic->ring_start((rdev))
+#define radeon_ring_test(rdev) (rdev)->asic->ring_test((rdev))
+#define radeon_ring_ib_execute(rdev, ib) (rdev)->asic->ring_ib_execute((rdev), (ib))
+#define radeon_ib_test(rdev) (rdev)->asic->ib_test((rdev))
 #define radeon_irq_set(rdev) (rdev)->asic->irq_set((rdev))
 #define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev))
 #define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->get_vblank_counter((rdev), (crtc))
@@ -913,4 +990,88 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 #define radeon_clear_surface_reg(rdev, r) ((rdev)->asic->clear_surface_reg((rdev), (r)))
 #define radeon_bandwidth_update(rdev) (rdev)->asic->bandwidth_update((rdev))
 
+/* Common functions */
+extern int radeon_gart_table_vram_pin(struct radeon_device *rdev);
+extern int radeon_modeset_init(struct radeon_device *rdev);
+extern void radeon_modeset_fini(struct radeon_device *rdev);
+extern bool radeon_card_posted(struct radeon_device *rdev);
+extern int radeon_clocks_init(struct radeon_device *rdev);
+extern void radeon_clocks_fini(struct radeon_device *rdev);
+extern void radeon_scratch_init(struct radeon_device *rdev);
+extern void radeon_surface_init(struct radeon_device *rdev);
+extern int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data);
+
+/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
+struct r100_mc_save {
+       u32     GENMO_WT;
+       u32     CRTC_EXT_CNTL;
+       u32     CRTC_GEN_CNTL;
+       u32     CRTC2_GEN_CNTL;
+       u32     CUR_OFFSET;
+       u32     CUR2_OFFSET;
+};
+extern void r100_cp_disable(struct radeon_device *rdev);
+extern int r100_cp_init(struct radeon_device *rdev, unsigned ring_size);
+extern void r100_cp_fini(struct radeon_device *rdev);
+extern void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
+extern int r100_pci_gart_init(struct radeon_device *rdev);
+extern void r100_pci_gart_fini(struct radeon_device *rdev);
+extern int r100_pci_gart_enable(struct radeon_device *rdev);
+extern void r100_pci_gart_disable(struct radeon_device *rdev);
+extern int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
+extern int r100_debugfs_mc_info_init(struct radeon_device *rdev);
+extern int r100_gui_wait_for_idle(struct radeon_device *rdev);
+extern void r100_ib_fini(struct radeon_device *rdev);
+extern int r100_ib_init(struct radeon_device *rdev);
+extern void r100_irq_disable(struct radeon_device *rdev);
+extern int r100_irq_set(struct radeon_device *rdev);
+extern void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save);
+extern void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save);
+extern void r100_vram_init_sizes(struct radeon_device *rdev);
+extern void r100_wb_disable(struct radeon_device *rdev);
+extern void r100_wb_fini(struct radeon_device *rdev);
+extern int r100_wb_init(struct radeon_device *rdev);
+
+/* r300,r350,rv350,rv370,rv380 */
+extern void r300_set_reg_safe(struct radeon_device *rdev);
+extern void r300_mc_program(struct radeon_device *rdev);
+extern void r300_vram_info(struct radeon_device *rdev);
+extern int rv370_pcie_gart_init(struct radeon_device *rdev);
+extern void rv370_pcie_gart_fini(struct radeon_device *rdev);
+extern int rv370_pcie_gart_enable(struct radeon_device *rdev);
+extern void rv370_pcie_gart_disable(struct radeon_device *rdev);
+
+/* r420,r423,rv410 */
+extern u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg);
+extern void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v);
+extern int r420_debugfs_pipes_info_init(struct radeon_device *rdev);
+
+/* rv515 */
+extern void rv515_bandwidth_avivo_update(struct radeon_device *rdev);
+
+/* rs690, rs740 */
+extern void rs690_line_buffer_adjust(struct radeon_device *rdev,
+                                       struct drm_display_mode *mode1,
+                                       struct drm_display_mode *mode2);
+
+/* r600, rv610, rv630, rv620, rv635, rv670, rs780, rs880 */
+extern bool r600_card_posted(struct radeon_device *rdev);
+extern void r600_cp_stop(struct radeon_device *rdev);
+extern void r600_ring_init(struct radeon_device *rdev, unsigned ring_size);
+extern int r600_cp_resume(struct radeon_device *rdev);
+extern int r600_count_pipe_bits(uint32_t val);
+extern int r600_gart_clear_page(struct radeon_device *rdev, int i);
+extern int r600_mc_wait_for_idle(struct radeon_device *rdev);
+extern int r600_pcie_gart_init(struct radeon_device *rdev);
+extern void r600_pcie_gart_tlb_flush(struct radeon_device *rdev);
+extern int r600_ib_test(struct radeon_device *rdev);
+extern int r600_ring_test(struct radeon_device *rdev);
+extern int r600_wb_init(struct radeon_device *rdev);
+extern void r600_wb_fini(struct radeon_device *rdev);
+extern void r600_scratch_init(struct radeon_device *rdev);
+extern int r600_blit_init(struct radeon_device *rdev);
+extern void r600_blit_fini(struct radeon_device *rdev);
+extern int r600_cp_init_microcode(struct radeon_device *rdev);
+extern int r600_gpu_reset(struct radeon_device *rdev);
+
 #endif
index 93d8f88..8968f78 100644 (file)
@@ -42,23 +42,28 @@ void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable);
  * r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280
  */
 int r100_init(struct radeon_device *rdev);
+int r200_init(struct radeon_device *rdev);
 uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
 void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
 void r100_errata(struct radeon_device *rdev);
 void r100_vram_info(struct radeon_device *rdev);
+void r100_vga_set_state(struct radeon_device *rdev, bool state);
 int r100_gpu_reset(struct radeon_device *rdev);
 int r100_mc_init(struct radeon_device *rdev);
 void r100_mc_fini(struct radeon_device *rdev);
 u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);
 int r100_wb_init(struct radeon_device *rdev);
 void r100_wb_fini(struct radeon_device *rdev);
-int r100_gart_enable(struct radeon_device *rdev);
+int r100_pci_gart_init(struct radeon_device *rdev);
+void r100_pci_gart_fini(struct radeon_device *rdev);
+int r100_pci_gart_enable(struct radeon_device *rdev);
 void r100_pci_gart_disable(struct radeon_device *rdev);
 void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
 int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
 int r100_cp_init(struct radeon_device *rdev, unsigned ring_size);
 void r100_cp_fini(struct radeon_device *rdev);
 void r100_cp_disable(struct radeon_device *rdev);
+void r100_cp_commit(struct radeon_device *rdev);
 void r100_ring_start(struct radeon_device *rdev);
 int r100_irq_set(struct radeon_device *rdev);
 int r100_irq_process(struct radeon_device *rdev);
@@ -77,24 +82,34 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg,
                         uint32_t offset, uint32_t obj_size);
 int r100_clear_surface_reg(struct radeon_device *rdev, int reg);
 void r100_bandwidth_update(struct radeon_device *rdev);
+void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
+int r100_ib_test(struct radeon_device *rdev);
+int r100_ring_test(struct radeon_device *rdev);
 
 static struct radeon_asic r100_asic = {
        .init = &r100_init,
        .errata = &r100_errata,
        .vram_info = &r100_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r100_gpu_reset,
        .mc_init = &r100_mc_init,
        .mc_fini = &r100_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
-       .gart_enable = &r100_gart_enable,
+       .gart_init = &r100_pci_gart_init,
+       .gart_fini = &r100_pci_gart_fini,
+       .gart_enable = &r100_pci_gart_enable,
        .gart_disable = &r100_pci_gart_disable,
        .gart_tlb_flush = &r100_pci_gart_tlb_flush,
        .gart_set_page = &r100_pci_gart_set_page,
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r100_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &r100_irq_set,
        .irq_process = &r100_irq_process,
        .get_vblank_counter = &r100_get_vblank_counter,
@@ -126,7 +141,9 @@ void r300_ring_start(struct radeon_device *rdev);
 void r300_fence_ring_emit(struct radeon_device *rdev,
                          struct radeon_fence *fence);
 int r300_cs_parse(struct radeon_cs_parser *p);
-int r300_gart_enable(struct radeon_device *rdev);
+int rv370_pcie_gart_init(struct radeon_device *rdev);
+void rv370_pcie_gart_fini(struct radeon_device *rdev);
+int rv370_pcie_gart_enable(struct radeon_device *rdev);
 void rv370_pcie_gart_disable(struct radeon_device *rdev);
 void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev);
 int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
@@ -143,19 +160,26 @@ static struct radeon_asic r300_asic = {
        .init = &r300_init,
        .errata = &r300_errata,
        .vram_info = &r300_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r300_gpu_reset,
        .mc_init = &r300_mc_init,
        .mc_fini = &r300_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
-       .gart_enable = &r300_gart_enable,
+       .gart_init = &r100_pci_gart_init,
+       .gart_fini = &r100_pci_gart_fini,
+       .gart_enable = &r100_pci_gart_enable,
        .gart_disable = &r100_pci_gart_disable,
        .gart_tlb_flush = &r100_pci_gart_tlb_flush,
        .gart_set_page = &r100_pci_gart_set_page,
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r300_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &r100_irq_set,
        .irq_process = &r100_irq_process,
        .get_vblank_counter = &r100_get_vblank_counter,
@@ -176,27 +200,35 @@ static struct radeon_asic r300_asic = {
 /*
  * r420,r423,rv410
  */
-void r420_errata(struct radeon_device *rdev);
-void r420_vram_info(struct radeon_device *rdev);
-int r420_mc_init(struct radeon_device *rdev);
-void r420_mc_fini(struct radeon_device *rdev);
+extern int r420_init(struct radeon_device *rdev);
+extern void r420_fini(struct radeon_device *rdev);
+extern int r420_suspend(struct radeon_device *rdev);
+extern int r420_resume(struct radeon_device *rdev);
 static struct radeon_asic r420_asic = {
-       .init = &r300_init,
-       .errata = &r420_errata,
-       .vram_info = &r420_vram_info,
+       .init = &r420_init,
+       .fini = &r420_fini,
+       .suspend = &r420_suspend,
+       .resume = &r420_resume,
+       .errata = NULL,
+       .vram_info = NULL,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r300_gpu_reset,
-       .mc_init = &r420_mc_init,
-       .mc_fini = &r420_mc_fini,
-       .wb_init = &r100_wb_init,
-       .wb_fini = &r100_wb_fini,
-       .gart_enable = &r300_gart_enable,
-       .gart_disable = &rv370_pcie_gart_disable,
+       .mc_init = NULL,
+       .mc_fini = NULL,
+       .wb_init = NULL,
+       .wb_fini = NULL,
+       .gart_enable = NULL,
+       .gart_disable = NULL,
        .gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
        .gart_set_page = &rv370_pcie_gart_set_page,
-       .cp_init = &r100_cp_init,
-       .cp_fini = &r100_cp_fini,
-       .cp_disable = &r100_cp_disable,
+       .cp_init = NULL,
+       .cp_fini = NULL,
+       .cp_disable = NULL,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r300_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = NULL,
        .irq_set = &r100_irq_set,
        .irq_process = &r100_irq_process,
        .get_vblank_counter = &r100_get_vblank_counter,
@@ -222,6 +254,8 @@ void rs400_errata(struct radeon_device *rdev);
 void rs400_vram_info(struct radeon_device *rdev);
 int rs400_mc_init(struct radeon_device *rdev);
 void rs400_mc_fini(struct radeon_device *rdev);
+int rs400_gart_init(struct radeon_device *rdev);
+void rs400_gart_fini(struct radeon_device *rdev);
 int rs400_gart_enable(struct radeon_device *rdev);
 void rs400_gart_disable(struct radeon_device *rdev);
 void rs400_gart_tlb_flush(struct radeon_device *rdev);
@@ -232,11 +266,14 @@ static struct radeon_asic rs400_asic = {
        .init = &r300_init,
        .errata = &rs400_errata,
        .vram_info = &rs400_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r300_gpu_reset,
        .mc_init = &rs400_mc_init,
        .mc_fini = &rs400_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
+       .gart_init = &rs400_gart_init,
+       .gart_fini = &rs400_gart_fini,
        .gart_enable = &rs400_gart_enable,
        .gart_disable = &rs400_gart_disable,
        .gart_tlb_flush = &rs400_gart_tlb_flush,
@@ -244,7 +281,11 @@ static struct radeon_asic rs400_asic = {
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r300_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &r100_irq_set,
        .irq_process = &r100_irq_process,
        .get_vblank_counter = &r100_get_vblank_counter,
@@ -266,7 +307,7 @@ static struct radeon_asic rs400_asic = {
 /*
  * rs600.
  */
-int rs600_init(struct radeon_device *dev);
+int rs600_init(struct radeon_device *rdev);
 void rs600_errata(struct radeon_device *rdev);
 void rs600_vram_info(struct radeon_device *rdev);
 int rs600_mc_init(struct radeon_device *rdev);
@@ -274,6 +315,8 @@ void rs600_mc_fini(struct radeon_device *rdev);
 int rs600_irq_set(struct radeon_device *rdev);
 int rs600_irq_process(struct radeon_device *rdev);
 u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc);
+int rs600_gart_init(struct radeon_device *rdev);
+void rs600_gart_fini(struct radeon_device *rdev);
 int rs600_gart_enable(struct radeon_device *rdev);
 void rs600_gart_disable(struct radeon_device *rdev);
 void rs600_gart_tlb_flush(struct radeon_device *rdev);
@@ -285,11 +328,14 @@ static struct radeon_asic rs600_asic = {
        .init = &rs600_init,
        .errata = &rs600_errata,
        .vram_info = &rs600_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r300_gpu_reset,
        .mc_init = &rs600_mc_init,
        .mc_fini = &rs600_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
+       .gart_init = &rs600_gart_init,
+       .gart_fini = &rs600_gart_fini,
        .gart_enable = &rs600_gart_enable,
        .gart_disable = &rs600_gart_disable,
        .gart_tlb_flush = &rs600_gart_tlb_flush,
@@ -297,7 +343,11 @@ static struct radeon_asic rs600_asic = {
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r300_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &rs600_irq_set,
        .irq_process = &rs600_irq_process,
        .get_vblank_counter = &rs600_get_vblank_counter,
@@ -328,11 +378,14 @@ static struct radeon_asic rs690_asic = {
        .init = &rs600_init,
        .errata = &rs690_errata,
        .vram_info = &rs690_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &r300_gpu_reset,
        .mc_init = &rs690_mc_init,
        .mc_fini = &rs690_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
+       .gart_init = &rs400_gart_init,
+       .gart_fini = &rs400_gart_fini,
        .gart_enable = &rs400_gart_enable,
        .gart_disable = &rs400_gart_disable,
        .gart_tlb_flush = &rs400_gart_tlb_flush,
@@ -340,7 +393,11 @@ static struct radeon_asic rs690_asic = {
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &r300_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &rs600_irq_set,
        .irq_process = &rs600_irq_process,
        .get_vblank_counter = &rs600_get_vblank_counter,
@@ -378,19 +435,26 @@ static struct radeon_asic rv515_asic = {
        .init = &rv515_init,
        .errata = &rv515_errata,
        .vram_info = &rv515_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &rv515_gpu_reset,
        .mc_init = &rv515_mc_init,
        .mc_fini = &rv515_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
-       .gart_enable = &r300_gart_enable,
+       .gart_init = &rv370_pcie_gart_init,
+       .gart_fini = &rv370_pcie_gart_fini,
+       .gart_enable = &rv370_pcie_gart_enable,
        .gart_disable = &rv370_pcie_gart_disable,
        .gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
        .gart_set_page = &rv370_pcie_gart_set_page,
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &rv515_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &rs600_irq_set,
        .irq_process = &rs600_irq_process,
        .get_vblank_counter = &rs600_get_vblank_counter,
@@ -421,19 +485,26 @@ static struct radeon_asic r520_asic = {
        .init = &rv515_init,
        .errata = &r520_errata,
        .vram_info = &r520_vram_info,
+       .vga_set_state = &r100_vga_set_state,
        .gpu_reset = &rv515_gpu_reset,
        .mc_init = &r520_mc_init,
        .mc_fini = &r520_mc_fini,
        .wb_init = &r100_wb_init,
        .wb_fini = &r100_wb_fini,
-       .gart_enable = &r300_gart_enable,
+       .gart_init = &rv370_pcie_gart_init,
+       .gart_fini = &rv370_pcie_gart_fini,
+       .gart_enable = &rv370_pcie_gart_enable,
        .gart_disable = &rv370_pcie_gart_disable,
        .gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
        .gart_set_page = &rv370_pcie_gart_set_page,
        .cp_init = &r100_cp_init,
        .cp_fini = &r100_cp_fini,
        .cp_disable = &r100_cp_disable,
+       .cp_commit = &r100_cp_commit,
        .ring_start = &rv515_ring_start,
+       .ring_test = &r100_ring_test,
+       .ring_ib_execute = &r100_ring_ib_execute,
+       .ib_test = &r100_ib_test,
        .irq_set = &rs600_irq_set,
        .irq_process = &rs600_irq_process,
        .get_vblank_counter = &rs600_get_vblank_counter,
@@ -452,9 +523,130 @@ static struct radeon_asic r520_asic = {
 };
 
 /*
- * r600,rv610,rv630,rv620,rv635,rv670,rs780,rv770,rv730,rv710
+ * r600,rv610,rv630,rv620,rv635,rv670,rs780,rs880
  */
+int r600_init(struct radeon_device *rdev);
+void r600_fini(struct radeon_device *rdev);
+int r600_suspend(struct radeon_device *rdev);
+int r600_resume(struct radeon_device *rdev);
+void r600_vga_set_state(struct radeon_device *rdev, bool state);
+int r600_wb_init(struct radeon_device *rdev);
+void r600_wb_fini(struct radeon_device *rdev);
+void r600_cp_commit(struct radeon_device *rdev);
+void r600_pcie_gart_tlb_flush(struct radeon_device *rdev);
 uint32_t r600_pciep_rreg(struct radeon_device *rdev, uint32_t reg);
 void r600_pciep_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
+int r600_cs_parse(struct radeon_cs_parser *p);
+void r600_fence_ring_emit(struct radeon_device *rdev,
+                         struct radeon_fence *fence);
+int r600_copy_dma(struct radeon_device *rdev,
+                 uint64_t src_offset,
+                 uint64_t dst_offset,
+                 unsigned num_pages,
+                 struct radeon_fence *fence);
+int r600_irq_process(struct radeon_device *rdev);
+int r600_irq_set(struct radeon_device *rdev);
+int r600_gpu_reset(struct radeon_device *rdev);
+int r600_set_surface_reg(struct radeon_device *rdev, int reg,
+                        uint32_t tiling_flags, uint32_t pitch,
+                        uint32_t offset, uint32_t obj_size);
+int r600_clear_surface_reg(struct radeon_device *rdev, int reg);
+void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
+int r600_ib_test(struct radeon_device *rdev);
+int r600_ring_test(struct radeon_device *rdev);
+int r600_copy_blit(struct radeon_device *rdev,
+                  uint64_t src_offset, uint64_t dst_offset,
+                  unsigned num_pages, struct radeon_fence *fence);
+
+static struct radeon_asic r600_asic = {
+       .errata = NULL,
+       .init = &r600_init,
+       .fini = &r600_fini,
+       .suspend = &r600_suspend,
+       .resume = &r600_resume,
+       .cp_commit = &r600_cp_commit,
+       .vram_info = NULL,
+       .vga_set_state = &r600_vga_set_state,
+       .gpu_reset = &r600_gpu_reset,
+       .mc_init = NULL,
+       .mc_fini = NULL,
+       .wb_init = &r600_wb_init,
+       .wb_fini = &r600_wb_fini,
+       .gart_enable = NULL,
+       .gart_disable = NULL,
+       .gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+       .gart_set_page = &rs600_gart_set_page,
+       .cp_init = NULL,
+       .cp_fini = NULL,
+       .cp_disable = NULL,
+       .ring_start = NULL,
+       .ring_test = &r600_ring_test,
+       .ring_ib_execute = &r600_ring_ib_execute,
+       .ib_test = &r600_ib_test,
+       .irq_set = &r600_irq_set,
+       .irq_process = &r600_irq_process,
+       .fence_ring_emit = &r600_fence_ring_emit,
+       .cs_parse = &r600_cs_parse,
+       .copy_blit = &r600_copy_blit,
+       .copy_dma = &r600_copy_blit,
+       .copy = &r600_copy_blit,
+       .set_engine_clock = &radeon_atom_set_engine_clock,
+       .set_memory_clock = &radeon_atom_set_memory_clock,
+       .set_pcie_lanes = NULL,
+       .set_clock_gating = &radeon_atom_set_clock_gating,
+       .set_surface_reg = r600_set_surface_reg,
+       .clear_surface_reg = r600_clear_surface_reg,
+       .bandwidth_update = &r520_bandwidth_update,
+};
+
+/*
+ * rv770,rv730,rv710,rv740
+ */
+int rv770_init(struct radeon_device *rdev);
+void rv770_fini(struct radeon_device *rdev);
+int rv770_suspend(struct radeon_device *rdev);
+int rv770_resume(struct radeon_device *rdev);
+int rv770_gpu_reset(struct radeon_device *rdev);
+
+static struct radeon_asic rv770_asic = {
+       .errata = NULL,
+       .init = &rv770_init,
+       .fini = &rv770_fini,
+       .suspend = &rv770_suspend,
+       .resume = &rv770_resume,
+       .cp_commit = &r600_cp_commit,
+       .vram_info = NULL,
+       .gpu_reset = &rv770_gpu_reset,
+       .vga_set_state = &r600_vga_set_state,
+       .mc_init = NULL,
+       .mc_fini = NULL,
+       .wb_init = &r600_wb_init,
+       .wb_fini = &r600_wb_fini,
+       .gart_enable = NULL,
+       .gart_disable = NULL,
+       .gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+       .gart_set_page = &rs600_gart_set_page,
+       .cp_init = NULL,
+       .cp_fini = NULL,
+       .cp_disable = NULL,
+       .ring_start = NULL,
+       .ring_test = &r600_ring_test,
+       .ring_ib_execute = &r600_ring_ib_execute,
+       .ib_test = &r600_ib_test,
+       .irq_set = &r600_irq_set,
+       .irq_process = &r600_irq_process,
+       .fence_ring_emit = &r600_fence_ring_emit,
+       .cs_parse = &r600_cs_parse,
+       .copy_blit = &r600_copy_blit,
+       .copy_dma = &r600_copy_blit,
+       .copy = &r600_copy_blit,
+       .set_engine_clock = &radeon_atom_set_engine_clock,
+       .set_memory_clock = &radeon_atom_set_memory_clock,
+       .set_pcie_lanes = NULL,
+       .set_clock_gating = &radeon_atom_set_clock_gating,
+       .set_surface_reg = r600_set_surface_reg,
+       .clear_surface_reg = r600_clear_surface_reg,
+       .bandwidth_update = &r520_bandwidth_update,
+};
 
 #endif
index fcfe5c0..7437421 100644 (file)
@@ -104,7 +104,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                                     uint32_t supported_device,
                                     int *connector_type,
                                     struct radeon_i2c_bus_rec *i2c_bus,
-                                    uint8_t *line_mux)
+                                    uint16_t *line_mux)
 {
 
        /* Asus M2A-VM HDMI board lists the DVI port as HDMI */
@@ -143,20 +143,31 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                        return false;
        }
 
-       /* some BIOSes seem to report DAC on HDMI - they hurt me with their lies */
-       if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
-           (*connector_type == DRM_MODE_CONNECTOR_HDMIB)) {
-               if (supported_device & (ATOM_DEVICE_CRT_SUPPORT)) {
-                       return false;
-               }
-       }
-
        /* ASUS HD 3600 XT board lists the DVI port as HDMI */
        if ((dev->pdev->device == 0x9598) &&
            (dev->pdev->subsystem_vendor == 0x1043) &&
            (dev->pdev->subsystem_device == 0x01da)) {
-               if (*connector_type == DRM_MODE_CONNECTOR_HDMIB) {
-                       *connector_type = DRM_MODE_CONNECTOR_DVID;
+               if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+                       *connector_type = DRM_MODE_CONNECTOR_DVII;
+               }
+       }
+
+       /* ASUS HD 3450 board lists the DVI port as HDMI */
+       if ((dev->pdev->device == 0x95C5) &&
+           (dev->pdev->subsystem_vendor == 0x1043) &&
+           (dev->pdev->subsystem_device == 0x01e2)) {
+               if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+                       *connector_type = DRM_MODE_CONNECTOR_DVII;
+               }
+       }
+
+       /* some BIOSes seem to report DAC on HDMI - usually this is a board with
+        * HDMI + VGA reporting as HDMI
+        */
+       if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+               if (supported_device & (ATOM_DEVICE_CRT_SUPPORT)) {
+                       *connector_type = DRM_MODE_CONNECTOR_VGA;
+                       *line_mux = 0;
                }
        }
 
@@ -192,11 +203,11 @@ const int object_connector_convert[] = {
        DRM_MODE_CONNECTOR_Composite,
        DRM_MODE_CONNECTOR_SVIDEO,
        DRM_MODE_CONNECTOR_Unknown,
+       DRM_MODE_CONNECTOR_Unknown,
        DRM_MODE_CONNECTOR_9PinDIN,
        DRM_MODE_CONNECTOR_Unknown,
        DRM_MODE_CONNECTOR_HDMIA,
        DRM_MODE_CONNECTOR_HDMIB,
-       DRM_MODE_CONNECTOR_HDMIB,
        DRM_MODE_CONNECTOR_LVDS,
        DRM_MODE_CONNECTOR_9PinDIN,
        DRM_MODE_CONNECTOR_Unknown,
@@ -218,7 +229,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
        ATOM_OBJECT_HEADER *obj_header;
        int i, j, path_size, device_support;
        int connector_type;
-       uint16_t igp_lane_info;
+       uint16_t igp_lane_info, conn_id;
        bool linkb;
        struct radeon_i2c_bus_rec ddc_bus;
 
@@ -370,10 +381,6 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
                                                       && record->
                                                       ucRecordType <=
                                                       ATOM_MAX_OBJECT_RECORD_NUMBER) {
-                                                       DRM_ERROR
-                                                           ("record type %d\n",
-                                                            record->
-                                                            ucRecordType);
                                                        switch (record->
                                                                ucRecordType) {
                                                        case ATOM_I2C_RECORD_TYPE:
@@ -409,9 +416,15 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
                        else
                                ddc_bus = radeon_lookup_gpio(dev, line_mux);
 
+                       conn_id = le16_to_cpu(path->usConnObjectId);
+
+                       if (!radeon_atom_apply_quirks
+                           (dev, le16_to_cpu(path->usDeviceTag), &connector_type,
+                            &ddc_bus, &conn_id))
+                               continue;
+
                        radeon_add_atom_connector(dev,
-                                                 le16_to_cpu(path->
-                                                             usConnObjectId),
+                                                 conn_id,
                                                  le16_to_cpu(path->
                                                              usDeviceTag),
                                                  connector_type, &ddc_bus,
@@ -427,7 +440,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
 
 struct bios_connector {
        bool valid;
-       uint8_t line_mux;
+       uint16_t line_mux;
        uint16_t devices;
        int connector_type;
        struct radeon_i2c_bus_rec ddc_bus;
@@ -471,11 +484,6 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct
                        continue;
                }
 
-               if (i == ATOM_DEVICE_TV1_INDEX) {
-                       DRM_DEBUG("Skipping TV Out\n");
-                       continue;
-               }
-
                bios_connectors[i].connector_type =
                    supported_devices_connector_convert[ci.sucConnectorInfo.
                                                        sbfAccess.
@@ -711,9 +719,8 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
        return false;
 }
 
-struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
-                                                             radeon_encoder
-                                                             *encoder)
+bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
+                                  struct radeon_encoder_int_tmds *tmds)
 {
        struct drm_device *dev = encoder->base.dev;
        struct radeon_device *rdev = dev->dev_private;
@@ -724,7 +731,6 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
        uint8_t frev, crev;
        uint16_t maxfreq;
        int i;
-       struct radeon_encoder_int_tmds *tmds = NULL;
 
        atom_parse_data_header(mode_info->atom_context, index, NULL, &frev,
                               &crev, &data_offset);
@@ -734,12 +740,6 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
                                       data_offset);
 
        if (tmds_info) {
-               tmds =
-                   kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-               if (!tmds)
-                       return NULL;
-
                maxfreq = le16_to_cpu(tmds_info->usMaxFrequency);
                for (i = 0; i < 4; i++) {
                        tmds->tmds_pll[i].freq =
@@ -765,8 +765,9 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
                                break;
                        }
                }
+               return true;
        }
-       return tmds;
+       return false;
 }
 
 union lvds_info {
@@ -858,6 +859,72 @@ radeon_atombios_get_primary_dac_info(struct radeon_encoder *encoder)
        return p_dac;
 }
 
+bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
+                               SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing,
+                               int32_t *pixel_clock)
+{
+       struct radeon_mode_info *mode_info = &rdev->mode_info;
+       ATOM_ANALOG_TV_INFO *tv_info;
+       ATOM_ANALOG_TV_INFO_V1_2 *tv_info_v1_2;
+       ATOM_DTD_FORMAT *dtd_timings;
+       int data_index = GetIndexIntoMasterTable(DATA, AnalogTV_Info);
+       u8 frev, crev;
+       uint16_t data_offset;
+
+       atom_parse_data_header(mode_info->atom_context, data_index, NULL, &frev, &crev, &data_offset);
+
+       switch (crev) {
+       case 1:
+               tv_info = (ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset);
+               if (index > MAX_SUPPORTED_TV_TIMING)
+                       return false;
+
+               crtc_timing->usH_Total = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total);
+               crtc_timing->usH_Disp = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Disp);
+               crtc_timing->usH_SyncStart = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_SyncStart);
+               crtc_timing->usH_SyncWidth = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_SyncWidth);
+
+               crtc_timing->usV_Total = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_Total);
+               crtc_timing->usV_Disp = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_Disp);
+               crtc_timing->usV_SyncStart = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_SyncStart);
+               crtc_timing->usV_SyncWidth = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_SyncWidth);
+
+               crtc_timing->susModeMiscInfo = tv_info->aModeTimings[index].susModeMiscInfo;
+
+               crtc_timing->ucOverscanRight = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanRight);
+               crtc_timing->ucOverscanLeft = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanLeft);
+               crtc_timing->ucOverscanBottom = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanBottom);
+               crtc_timing->ucOverscanTop = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanTop);
+               *pixel_clock = le16_to_cpu(tv_info->aModeTimings[index].usPixelClock) * 10;
+
+               if (index == 1) {
+                       /* PAL timings appear to have wrong values for totals */
+                       crtc_timing->usH_Total -= 1;
+                       crtc_timing->usV_Total -= 1;
+               }
+               break;
+       case 2:
+               tv_info_v1_2 = (ATOM_ANALOG_TV_INFO_V1_2 *)(mode_info->atom_context->bios + data_offset);
+               if (index > MAX_SUPPORTED_TV_TIMING_V1_2)
+                       return false;
+
+               dtd_timings = &tv_info_v1_2->aModeTimings[index];
+               crtc_timing->usH_Total = le16_to_cpu(dtd_timings->usHActive) + le16_to_cpu(dtd_timings->usHBlanking_Time);
+               crtc_timing->usH_Disp = le16_to_cpu(dtd_timings->usHActive);
+               crtc_timing->usH_SyncStart = le16_to_cpu(dtd_timings->usHActive) + le16_to_cpu(dtd_timings->usHSyncOffset);
+               crtc_timing->usH_SyncWidth = le16_to_cpu(dtd_timings->usHSyncWidth);
+               crtc_timing->usV_Total = le16_to_cpu(dtd_timings->usVActive) + le16_to_cpu(dtd_timings->usVBlanking_Time);
+               crtc_timing->usV_Disp = le16_to_cpu(dtd_timings->usVActive);
+               crtc_timing->usV_SyncStart = le16_to_cpu(dtd_timings->usVActive) + le16_to_cpu(dtd_timings->usVSyncOffset);
+               crtc_timing->usV_SyncWidth = le16_to_cpu(dtd_timings->usVSyncWidth);
+
+               crtc_timing->susModeMiscInfo.usAccess = le16_to_cpu(dtd_timings->susModeMiscInfo.usAccess);
+               *pixel_clock = le16_to_cpu(dtd_timings->usPixClk) * 10;
+               break;
+       }
+       return true;
+}
+
 struct radeon_encoder_tv_dac *
 radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder)
 {
@@ -948,10 +1015,10 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)
        uint32_t bios_2_scratch, bios_6_scratch;
 
        if (rdev->family >= CHIP_R600) {
-               bios_2_scratch = RREG32(R600_BIOS_0_SCRATCH);
+               bios_2_scratch = RREG32(R600_BIOS_2_SCRATCH);
                bios_6_scratch = RREG32(R600_BIOS_6_SCRATCH);
        } else {
-               bios_2_scratch = RREG32(RADEON_BIOS_0_SCRATCH);
+               bios_2_scratch = RREG32(RADEON_BIOS_2_SCRATCH);
                bios_6_scratch = RREG32(RADEON_BIOS_6_SCRATCH);
        }
 
@@ -971,6 +1038,34 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)
 
 }
 
+void radeon_save_bios_scratch_regs(struct radeon_device *rdev)
+{
+       uint32_t scratch_reg;
+       int i;
+
+       if (rdev->family >= CHIP_R600)
+               scratch_reg = R600_BIOS_0_SCRATCH;
+       else
+               scratch_reg = RADEON_BIOS_0_SCRATCH;
+
+       for (i = 0; i < RADEON_BIOS_NUM_SCRATCH; i++)
+               rdev->bios_scratch[i] = RREG32(scratch_reg + (i * 4));
+}
+
+void radeon_restore_bios_scratch_regs(struct radeon_device *rdev)
+{
+       uint32_t scratch_reg;
+       int i;
+
+       if (rdev->family >= CHIP_R600)
+               scratch_reg = R600_BIOS_0_SCRATCH;
+       else
+               scratch_reg = RADEON_BIOS_0_SCRATCH;
+
+       for (i = 0; i < RADEON_BIOS_NUM_SCRATCH; i++)
+               WREG32(scratch_reg + (i * 4), rdev->bios_scratch[i]);
+}
+
 void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock)
 {
        struct drm_device *dev = encoder->dev;
index a37cbce..152eef1 100644 (file)
@@ -102,10 +102,12 @@ void radeon_get_clock_info(struct drm_device *dev)
                        p1pll->reference_div = 12;
                if (p2pll->reference_div < 2)
                        p2pll->reference_div = 12;
-               if (spll->reference_div < 2)
-                       spll->reference_div =
-                           RREG32_PLL(RADEON_M_SPLL_REF_FB_DIV) &
-                           RADEON_M_SPLL_REF_DIV_MASK;
+               if (rdev->family < CHIP_RS600) {
+                       if (spll->reference_div < 2)
+                               spll->reference_div =
+                                       RREG32_PLL(RADEON_M_SPLL_REF_FB_DIV) &
+                                       RADEON_M_SPLL_REF_DIV_MASK;
+               }
                if (mpll->reference_div < 2)
                        mpll->reference_div = spll->reference_div;
        } else {
index 2a027e0..748265a 100644 (file)
@@ -863,8 +863,10 @@ struct radeon_encoder_lvds *radeon_combios_get_lvds_info(struct radeon_encoder
        int tmp, i;
        struct radeon_encoder_lvds *lvds = NULL;
 
-       if (rdev->bios == NULL)
-               return radeon_legacy_get_lvds_info_from_regs(rdev);
+       if (rdev->bios == NULL) {
+               lvds = radeon_legacy_get_lvds_info_from_regs(rdev);
+               goto out;
+       }
 
        lcd_info = combios_get_table_offset(dev, COMBIOS_LCD_INFO_TABLE);
 
@@ -965,11 +967,13 @@ struct radeon_encoder_lvds *radeon_combios_get_lvds_info(struct radeon_encoder
                                lvds->native_mode.flags = 0;
                        }
                }
-               encoder->native_mode = lvds->native_mode;
        } else {
                DRM_INFO("No panel info found in BIOS\n");
-               return radeon_legacy_get_lvds_info_from_regs(rdev);
+               lvds = radeon_legacy_get_lvds_info_from_regs(rdev);
        }
+out:
+       if (lvds)
+               encoder->native_mode = lvds->native_mode;
        return lvds;
 }
 
@@ -994,48 +998,37 @@ static const struct radeon_tmds_pll default_tmds_pll[CHIP_LAST][4] = {
        {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},      /* CHIP_RS480 */
 };
 
-static struct radeon_encoder_int_tmds
-    *radeon_legacy_get_tmds_info_from_table(struct radeon_device *rdev)
+bool radeon_legacy_get_tmds_info_from_table(struct radeon_encoder *encoder,
+                                           struct radeon_encoder_int_tmds *tmds)
 {
+       struct drm_device *dev = encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
        int i;
-       struct radeon_encoder_int_tmds *tmds = NULL;
-
-       tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-       if (!tmds)
-               return NULL;
 
        for (i = 0; i < 4; i++) {
                tmds->tmds_pll[i].value =
-                   default_tmds_pll[rdev->family][i].value;
+                       default_tmds_pll[rdev->family][i].value;
                tmds->tmds_pll[i].freq = default_tmds_pll[rdev->family][i].freq;
        }
 
-       return tmds;
+       return true;
 }
 
-struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct
-                                                            radeon_encoder
-                                                            *encoder)
+bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
+                                             struct radeon_encoder_int_tmds *tmds)
 {
        struct drm_device *dev = encoder->base.dev;
        struct radeon_device *rdev = dev->dev_private;
        uint16_t tmds_info;
        int i, n;
        uint8_t ver;
-       struct radeon_encoder_int_tmds *tmds = NULL;
 
        if (rdev->bios == NULL)
-               return radeon_legacy_get_tmds_info_from_table(rdev);
+               return false;
 
        tmds_info = combios_get_table_offset(dev, COMBIOS_DFP_INFO_TABLE);
 
        if (tmds_info) {
-               tmds =
-                   kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-               if (!tmds)
-                       return NULL;
 
                ver = RBIOS8(tmds_info);
                DRM_INFO("DFP table revision: %d\n", ver);
@@ -1073,6 +1066,23 @@ struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct
                }
        } else
                DRM_INFO("No TMDS info found in BIOS\n");
+       return true;
+}
+
+struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
+{
+       struct radeon_encoder_int_tmds *tmds = NULL;
+       bool ret;
+
+       tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
+
+       if (!tmds)
+               return NULL;
+
+       ret = radeon_legacy_get_tmds_info_from_combios(encoder, tmds);
+       if (ret == false)
+               radeon_legacy_get_tmds_info_from_table(encoder, tmds);
+
        return tmds;
 }
 
index 70ede6a..af1d551 100644 (file)
@@ -28,6 +28,7 @@
 #include "drm_crtc_helper.h"
 #include "radeon_drm.h"
 #include "radeon.h"
+#include "atom.h"
 
 extern void
 radeon_combios_connected_scratch_regs(struct drm_connector *connector,
@@ -38,6 +39,15 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
                                       struct drm_encoder *encoder,
                                       bool connected);
 
+static void radeon_property_change_mode(struct drm_encoder *encoder)
+{
+       struct drm_crtc *crtc = encoder->crtc;
+
+       if (crtc && crtc->enabled) {
+               drm_crtc_helper_set_mode(crtc, &crtc->mode,
+                                        crtc->x, crtc->y, crtc->fb);
+       }
+}
 static void
 radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_connector_status status)
 {
@@ -77,6 +87,27 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
        }
 }
 
+struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type)
+{
+       struct drm_mode_object *obj;
+       struct drm_encoder *encoder;
+       int i;
+
+       for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+               if (connector->encoder_ids[i] == 0)
+                       break;
+
+               obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
+               if (!obj)
+                       continue;
+
+               encoder = obj_to_encoder(obj);
+               if (encoder->encoder_type == encoder_type)
+                       return encoder;
+       }
+       return NULL;
+}
+
 struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
 {
        int enc_id = connector->encoder_ids[0];
@@ -94,6 +125,53 @@ struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
        return NULL;
 }
 
+/*
+ * radeon_connector_analog_encoder_conflict_solve
+ * - search for other connectors sharing this encoder
+ *   if priority is true, then set them disconnected if this is connected
+ *   if priority is false, set us disconnected if they are connected
+ */
+static enum drm_connector_status
+radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector,
+                                              struct drm_encoder *encoder,
+                                              enum drm_connector_status current_status,
+                                              bool priority)
+{
+       struct drm_device *dev = connector->dev;
+       struct drm_connector *conflict;
+       int i;
+
+       list_for_each_entry(conflict, &dev->mode_config.connector_list, head) {
+               if (conflict == connector)
+                       continue;
+
+               for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+                       if (conflict->encoder_ids[i] == 0)
+                               break;
+
+                       /* if the IDs match */
+                       if (conflict->encoder_ids[i] == encoder->base.id) {
+                               if (conflict->status != connector_status_connected)
+                                       continue;
+
+                               if (priority == true) {
+                                       DRM_INFO("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict));
+                                       DRM_INFO("in favor of %s\n", drm_get_connector_name(connector));
+                                       conflict->status = connector_status_disconnected;
+                                       radeon_connector_update_scratch_regs(conflict, connector_status_disconnected);
+                               } else {
+                                       DRM_INFO("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector));
+                                       DRM_INFO("in favor of %s\n", drm_get_connector_name(conflict));
+                                       current_status = connector_status_disconnected;
+                               }
+                               break;
+                       }
+               }
+       }
+       return current_status;
+
+}
+
 static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
@@ -126,12 +204,171 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
        return mode;
 }
 
+static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct drm_display_mode *mode = NULL;
+       struct radeon_native_mode *native_mode = &radeon_encoder->native_mode;
+       int i;
+       struct mode_size {
+               int w;
+               int h;
+       } common_modes[17] = {
+               { 640,  480},
+               { 720,  480},
+               { 800,  600},
+               { 848,  480},
+               {1024,  768},
+               {1152,  768},
+               {1280,  720},
+               {1280,  800},
+               {1280,  854},
+               {1280,  960},
+               {1280, 1024},
+               {1440,  900},
+               {1400, 1050},
+               {1680, 1050},
+               {1600, 1200},
+               {1920, 1080},
+               {1920, 1200}
+       };
+
+       for (i = 0; i < 17; i++) {
+               if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
+                       if (common_modes[i].w > native_mode->panel_xres ||
+                           common_modes[i].h > native_mode->panel_yres ||
+                           (common_modes[i].w == native_mode->panel_xres &&
+                            common_modes[i].h == native_mode->panel_yres))
+                               continue;
+               }
+               if (common_modes[i].w < 320 || common_modes[i].h < 200)
+                       continue;
+
+               mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false);
+               drm_mode_probed_add(connector, mode);
+       }
+}
+
 int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property,
                                  uint64_t val)
 {
+       struct drm_device *dev = connector->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct drm_encoder *encoder;
+       struct radeon_encoder *radeon_encoder;
+
+       if (property == rdev->mode_info.coherent_mode_property) {
+               struct radeon_encoder_atom_dig *dig;
+
+               /* need to find digital encoder on connector */
+               encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+               if (!encoder)
+                       return 0;
+
+               radeon_encoder = to_radeon_encoder(encoder);
+
+               if (!radeon_encoder->enc_priv)
+                       return 0;
+
+               dig = radeon_encoder->enc_priv;
+               dig->coherent_mode = val ? true : false;
+               radeon_property_change_mode(&radeon_encoder->base);
+       }
+
+       if (property == rdev->mode_info.tv_std_property) {
+               encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TVDAC);
+               if (!encoder) {
+                       encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_DAC);
+               }
+
+               if (!encoder)
+                       return 0;
+
+               radeon_encoder = to_radeon_encoder(encoder);
+               if (!radeon_encoder->enc_priv)
+                       return 0;
+               if (rdev->is_atom_bios) {
+                       struct radeon_encoder_atom_dac *dac_int;
+                       dac_int = radeon_encoder->enc_priv;
+                       dac_int->tv_std = val;
+               } else {
+                       struct radeon_encoder_tv_dac *dac_int;
+                       dac_int = radeon_encoder->enc_priv;
+                       dac_int->tv_std = val;
+               }
+               radeon_property_change_mode(&radeon_encoder->base);
+       }
+
+       if (property == rdev->mode_info.load_detect_property) {
+               struct radeon_connector *radeon_connector =
+                       to_radeon_connector(connector);
+
+               if (val == 0)
+                       radeon_connector->dac_load_detect = false;
+               else
+                       radeon_connector->dac_load_detect = true;
+       }
+
+       if (property == rdev->mode_info.tmds_pll_property) {
+               struct radeon_encoder_int_tmds *tmds = NULL;
+               bool ret = false;
+               /* need to find digital encoder on connector */
+               encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+               if (!encoder)
+                       return 0;
+
+               radeon_encoder = to_radeon_encoder(encoder);
+
+               tmds = radeon_encoder->enc_priv;
+               if (!tmds)
+                       return 0;
+
+               if (val == 0) {
+                       if (rdev->is_atom_bios)
+                               ret = radeon_atombios_get_tmds_info(radeon_encoder, tmds);
+                       else
+                               ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds);
+               }
+               if (val == 1 || ret == false) {
+                       radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds);
+               }
+               radeon_property_change_mode(&radeon_encoder->base);
+       }
+
        return 0;
 }
 
+static void radeon_fixup_lvds_native_mode(struct drm_encoder *encoder,
+                                         struct drm_connector *connector)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_native_mode *native_mode = &radeon_encoder->native_mode;
+
+       /* Try to get native mode details from EDID if necessary */
+       if (!native_mode->dotclock) {
+               struct drm_display_mode *t, *mode;
+
+               list_for_each_entry_safe(mode, t, &connector->probed_modes, head) {
+                       if (mode->hdisplay == native_mode->panel_xres &&
+                           mode->vdisplay == native_mode->panel_yres) {
+                               native_mode->hblank = mode->htotal - mode->hdisplay;
+                               native_mode->hoverplus = mode->hsync_start - mode->hdisplay;
+                               native_mode->hsync_width = mode->hsync_end - mode->hsync_start;
+                               native_mode->vblank = mode->vtotal - mode->vdisplay;
+                               native_mode->voverplus = mode->vsync_start - mode->vdisplay;
+                               native_mode->vsync_width = mode->vsync_end - mode->vsync_start;
+                               native_mode->dotclock = mode->clock;
+                               DRM_INFO("Determined LVDS native mode details from EDID\n");
+                               break;
+                       }
+               }
+       }
+       if (!native_mode->dotclock) {
+               DRM_INFO("No LVDS native mode details, disabling RMX\n");
+               radeon_encoder->rmx_type = RMX_OFF;
+       }
+}
 
 static int radeon_lvds_get_modes(struct drm_connector *connector)
 {
@@ -143,6 +380,12 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
        if (radeon_connector->ddc_bus) {
                ret = radeon_ddc_get_modes(radeon_connector);
                if (ret > 0) {
+                       encoder = radeon_best_single_encoder(connector);
+                       if (encoder) {
+                               radeon_fixup_lvds_native_mode(encoder, connector);
+                               /* add scaled modes */
+                               radeon_add_common_modes(encoder, connector);
+                       }
                        return ret;
                }
        }
@@ -156,7 +399,10 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
        if (mode) {
                ret = 1;
                drm_mode_probed_add(connector, mode);
+               /* add scaled modes */
+               radeon_add_common_modes(encoder, connector);
        }
+
        return ret;
 }
 
@@ -186,6 +432,42 @@ static void radeon_connector_destroy(struct drm_connector *connector)
        kfree(connector);
 }
 
+static int radeon_lvds_set_property(struct drm_connector *connector,
+                                   struct drm_property *property,
+                                   uint64_t value)
+{
+       struct drm_device *dev = connector->dev;
+       struct radeon_encoder *radeon_encoder;
+       enum radeon_rmx_type rmx_type;
+
+       DRM_DEBUG("\n");
+       if (property != dev->mode_config.scaling_mode_property)
+               return 0;
+
+       if (connector->encoder)
+               radeon_encoder = to_radeon_encoder(connector->encoder);
+       else {
+               struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;
+               radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector));
+       }
+
+       switch (value) {
+       case DRM_MODE_SCALE_NONE: rmx_type = RMX_OFF; break;
+       case DRM_MODE_SCALE_CENTER: rmx_type = RMX_CENTER; break;
+       case DRM_MODE_SCALE_ASPECT: rmx_type = RMX_ASPECT; break;
+       default:
+       case DRM_MODE_SCALE_FULLSCREEN: rmx_type = RMX_FULL; break;
+       }
+       if (radeon_encoder->rmx_type == rmx_type)
+               return 0;
+
+       radeon_encoder->rmx_type = rmx_type;
+
+       radeon_property_change_mode(&radeon_encoder->base);
+       return 0;
+}
+
+
 struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = {
        .get_modes = radeon_lvds_get_modes,
        .mode_valid = radeon_lvds_mode_valid,
@@ -197,7 +479,7 @@ struct drm_connector_funcs radeon_lvds_connector_funcs = {
        .detect = radeon_lvds_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
        .destroy = radeon_connector_destroy,
-       .set_property = radeon_connector_set_property,
+       .set_property = radeon_lvds_set_property,
 };
 
 static int radeon_vga_get_modes(struct drm_connector *connector)
@@ -213,7 +495,6 @@ static int radeon_vga_get_modes(struct drm_connector *connector)
 static int radeon_vga_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
-
        return MODE_OK;
 }
 
@@ -225,22 +506,24 @@ static enum drm_connector_status radeon_vga_detect(struct drm_connector *connect
        bool dret;
        enum drm_connector_status ret = connector_status_disconnected;
 
+       encoder = radeon_best_single_encoder(connector);
+       if (!encoder)
+               ret = connector_status_disconnected;
+
        radeon_i2c_do_lock(radeon_connector, 1);
        dret = radeon_ddc_probe(radeon_connector);
        radeon_i2c_do_lock(radeon_connector, 0);
        if (dret)
                ret = connector_status_connected;
        else {
-               /* if EDID fails to a load detect */
-               encoder = radeon_best_single_encoder(connector);
-               if (!encoder)
-                       ret = connector_status_disconnected;
-               else {
+               if (radeon_connector->dac_load_detect) {
                        encoder_funcs = encoder->helper_private;
                        ret = encoder_funcs->detect(encoder, connector);
                }
        }
 
+       if (ret == connector_status_connected)
+               ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true);
        radeon_connector_update_scratch_regs(connector, ret);
        return ret;
 }
@@ -259,21 +542,97 @@ struct drm_connector_funcs radeon_vga_connector_funcs = {
        .set_property = radeon_connector_set_property,
 };
 
+static int radeon_tv_get_modes(struct drm_connector *connector)
+{
+       struct drm_device *dev = connector->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct drm_display_mode *tv_mode;
+       struct drm_encoder *encoder;
+
+       encoder = radeon_best_single_encoder(connector);
+       if (!encoder)
+               return 0;
+
+       /* avivo chips can scale any mode */
+       if (rdev->family >= CHIP_RS600)
+               /* add scaled modes */
+               radeon_add_common_modes(encoder, connector);
+       else {
+               /* only 800x600 is supported right now on pre-avivo chips */
+               tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false);
+               tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+               drm_mode_probed_add(connector, tv_mode);
+       }
+       return 1;
+}
+
+static int radeon_tv_mode_valid(struct drm_connector *connector,
+                               struct drm_display_mode *mode)
+{
+       return MODE_OK;
+}
+
+static enum drm_connector_status radeon_tv_detect(struct drm_connector *connector)
+{
+       struct drm_encoder *encoder;
+       struct drm_encoder_helper_funcs *encoder_funcs;
+       struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+       enum drm_connector_status ret = connector_status_disconnected;
+
+       if (!radeon_connector->dac_load_detect)
+               return ret;
+
+       encoder = radeon_best_single_encoder(connector);
+       if (!encoder)
+               ret = connector_status_disconnected;
+       else {
+               encoder_funcs = encoder->helper_private;
+               ret = encoder_funcs->detect(encoder, connector);
+       }
+       if (ret == connector_status_connected)
+               ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false);
+       radeon_connector_update_scratch_regs(connector, ret);
+       return ret;
+}
+
+struct drm_connector_helper_funcs radeon_tv_connector_helper_funcs = {
+       .get_modes = radeon_tv_get_modes,
+       .mode_valid = radeon_tv_mode_valid,
+       .best_encoder = radeon_best_single_encoder,
+};
+
+struct drm_connector_funcs radeon_tv_connector_funcs = {
+       .dpms = drm_helper_connector_dpms,
+       .detect = radeon_tv_detect,
+       .fill_modes = drm_helper_probe_single_connector_modes,
+       .destroy = radeon_connector_destroy,
+       .set_property = radeon_connector_set_property,
+};
+
 static int radeon_dvi_get_modes(struct drm_connector *connector)
 {
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
        int ret;
 
        ret = radeon_ddc_get_modes(radeon_connector);
-       /* reset scratch regs here since radeon_dvi_detect doesn't check digital bit */
-       radeon_connector_update_scratch_regs(connector, connector_status_connected);
        return ret;
 }
 
+/*
+ * DVI is complicated
+ * Do a DDC probe, if DDC probe passes, get the full EDID so
+ * we can do analog/digital monitor detection at this point.
+ * If the monitor is an analog monitor or we got no DDC,
+ * we need to find the DAC encoder object for this connector.
+ * If we got no DDC, we do load detection on the DAC encoder object.
+ * If we got analog DDC or load detection passes on the DAC encoder
+ * we have to check if this analog encoder is shared with anyone else (TV)
+ * if its shared we have to set the other connector to disconnected.
+ */
 static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connector)
 {
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
-       struct drm_encoder *encoder;
+       struct drm_encoder *encoder = NULL;
        struct drm_encoder_helper_funcs *encoder_funcs;
        struct drm_mode_object *obj;
        int i;
@@ -283,9 +642,29 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect
        radeon_i2c_do_lock(radeon_connector, 1);
        dret = radeon_ddc_probe(radeon_connector);
        radeon_i2c_do_lock(radeon_connector, 0);
-       if (dret)
-               ret = connector_status_connected;
-       else {
+       if (dret) {
+               radeon_i2c_do_lock(radeon_connector, 1);
+               radeon_connector->edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
+               radeon_i2c_do_lock(radeon_connector, 0);
+
+               if (!radeon_connector->edid) {
+                       DRM_ERROR("DDC responded but not EDID found for %s\n",
+                                 drm_get_connector_name(connector));
+               } else {
+                       radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);
+
+                       /* if this isn't a digital monitor
+                          then we need to make sure we don't have any
+                          TV conflicts */
+                       ret = connector_status_connected;
+               }
+       }
+
+       if ((ret == connector_status_connected) && (radeon_connector->use_digital == true))
+               goto out;
+
+       /* find analog encoder */
+       if (radeon_connector->dac_load_detect) {
                for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
                        if (connector->encoder_ids[i] == 0)
                                break;
@@ -300,15 +679,23 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect
 
                        encoder_funcs = encoder->helper_private;
                        if (encoder_funcs->detect) {
-                               ret = encoder_funcs->detect(encoder, connector);
-                               if (ret == connector_status_connected) {
-                                       radeon_connector->use_digital = 0;
-                                       break;
+                               if (ret != connector_status_connected) {
+                                       ret = encoder_funcs->detect(encoder, connector);
+                                       if (ret == connector_status_connected) {
+                                               radeon_connector->use_digital = false;
+                                       }
                                }
+                               break;
                        }
                }
        }
 
+       if ((ret == connector_status_connected) && (radeon_connector->use_digital == false) &&
+           encoder) {
+               ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true);
+       }
+
+out:
        /* updated in get modes as well since we need to know if it's analog or digital */
        radeon_connector_update_scratch_regs(connector, ret);
        return ret;
@@ -332,7 +719,7 @@ struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
 
                encoder = obj_to_encoder(obj);
 
-               if (radeon_connector->use_digital) {
+               if (radeon_connector->use_digital == true) {
                        if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)
                                return encoder;
                } else {
@@ -379,16 +766,14 @@ radeon_add_atom_connector(struct drm_device *dev,
                          bool linkb,
                          uint32_t igp_lane_info)
 {
+       struct radeon_device *rdev = dev->dev_private;
        struct drm_connector *connector;
        struct radeon_connector *radeon_connector;
        struct radeon_connector_atom_dig *radeon_dig_connector;
        uint32_t subpixel_order = SubPixelNone;
 
        /* fixme - tv/cv/din */
-       if ((connector_type == DRM_MODE_CONNECTOR_Unknown) ||
-           (connector_type == DRM_MODE_CONNECTOR_SVIDEO) ||
-           (connector_type == DRM_MODE_CONNECTOR_Composite) ||
-           (connector_type == DRM_MODE_CONNECTOR_9PinDIN))
+       if (connector_type == DRM_MODE_CONNECTOR_Unknown)
                return;
 
        /* see if we already added it */
@@ -417,6 +802,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_DVIA:
                drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -426,6 +814,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_DVII:
        case DRM_MODE_CONNECTOR_DVID:
@@ -443,6 +834,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                                goto failed;
                }
                subpixel_order = SubPixelHorizontalRGB;
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.coherent_mode_property,
+                                             1);
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_HDMIA:
        case DRM_MODE_CONNECTOR_HDMIB:
@@ -459,6 +856,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.coherent_mode_property,
+                                             1);
                subpixel_order = SubPixelHorizontalRGB;
                break;
        case DRM_MODE_CONNECTOR_DisplayPort:
@@ -480,6 +880,13 @@ radeon_add_atom_connector(struct drm_device *dev,
        case DRM_MODE_CONNECTOR_SVIDEO:
        case DRM_MODE_CONNECTOR_Composite:
        case DRM_MODE_CONNECTOR_9PinDIN:
+               if (radeon_tv == 1) {
+                       drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
+                       drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
+               }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_LVDS:
                radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);
@@ -495,6 +902,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_mode_create_scaling_mode_property(dev);
+               drm_connector_attach_property(&radeon_connector->base,
+                                             dev->mode_config.scaling_mode_property,
+                                             DRM_MODE_SCALE_FULLSCREEN);
                subpixel_order = SubPixelHorizontalRGB;
                break;
        }
@@ -517,15 +928,13 @@ radeon_add_legacy_connector(struct drm_device *dev,
                            int connector_type,
                            struct radeon_i2c_bus_rec *i2c_bus)
 {
+       struct radeon_device *rdev = dev->dev_private;
        struct drm_connector *connector;
        struct radeon_connector *radeon_connector;
        uint32_t subpixel_order = SubPixelNone;
 
        /* fixme - tv/cv/din */
-       if ((connector_type == DRM_MODE_CONNECTOR_Unknown) ||
-           (connector_type == DRM_MODE_CONNECTOR_SVIDEO) ||
-           (connector_type == DRM_MODE_CONNECTOR_Composite) ||
-           (connector_type == DRM_MODE_CONNECTOR_9PinDIN))
+       if (connector_type == DRM_MODE_CONNECTOR_Unknown)
                return;
 
        /* see if we already added it */
@@ -554,6 +963,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_DVIA:
                drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -563,6 +975,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             rdev->mode_info.load_detect_property,
+                                             1);
                break;
        case DRM_MODE_CONNECTOR_DVII:
        case DRM_MODE_CONNECTOR_DVID:
@@ -572,12 +987,22 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI");
                        if (!radeon_connector->ddc_bus)
                                goto failed;
+                       drm_connector_attach_property(&radeon_connector->base,
+                                                     rdev->mode_info.load_detect_property,
+                                                     1);
                }
                subpixel_order = SubPixelHorizontalRGB;
                break;
        case DRM_MODE_CONNECTOR_SVIDEO:
        case DRM_MODE_CONNECTOR_Composite:
        case DRM_MODE_CONNECTOR_9PinDIN:
+               if (radeon_tv == 1) {
+                       drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
+                       drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
+                       drm_connector_attach_property(&radeon_connector->base,
+                                                     rdev->mode_info.load_detect_property,
+                                                     1);
+               }
                break;
        case DRM_MODE_CONNECTOR_LVDS:
                drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
@@ -587,6 +1012,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                goto failed;
                }
+               drm_connector_attach_property(&radeon_connector->base,
+                                             dev->mode_config.scaling_mode_property,
+                                             DRM_MODE_SCALE_FULLSCREEN);
                subpixel_order = SubPixelHorizontalRGB;
                break;
        }
index 7a52c46..4f7afc7 100644 (file)
 #include "radeon_drv.h"
 #include "r300_reg.h"
 
-#include "radeon_microcode.h"
-
 #define RADEON_FIFO_DEBUG      0
 
+/* Firmware Names */
+#define FIRMWARE_R100          "radeon/R100_cp.bin"
+#define FIRMWARE_R200          "radeon/R200_cp.bin"
+#define FIRMWARE_R300          "radeon/R300_cp.bin"
+#define FIRMWARE_R420          "radeon/R420_cp.bin"
+#define FIRMWARE_RS690         "radeon/RS690_cp.bin"
+#define FIRMWARE_RS600         "radeon/RS600_cp.bin"
+#define FIRMWARE_R520          "radeon/R520_cp.bin"
+
+MODULE_FIRMWARE(FIRMWARE_R100);
+MODULE_FIRMWARE(FIRMWARE_R200);
+MODULE_FIRMWARE(FIRMWARE_R300);
+MODULE_FIRMWARE(FIRMWARE_R420);
+MODULE_FIRMWARE(FIRMWARE_RS690);
+MODULE_FIRMWARE(FIRMWARE_RS600);
+MODULE_FIRMWARE(FIRMWARE_R520);
+
 static int radeon_do_cleanup_cp(struct drm_device * dev);
 static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
 
@@ -460,37 +475,34 @@ static void radeon_init_pipes(drm_radeon_private_t *dev_priv)
  */
 
 /* Load the microcode for the CP */
-static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)
+static int radeon_cp_init_microcode(drm_radeon_private_t *dev_priv)
 {
-       int i;
+       struct platform_device *pdev;
+       const char *fw_name = NULL;
+       int err;
+
        DRM_DEBUG("\n");
 
-       radeon_do_wait_for_idle(dev_priv);
+       pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0);
+       err = IS_ERR(pdev);
+       if (err) {
+               printk(KERN_ERR "radeon_cp: Failed to register firmware\n");
+               return -EINVAL;
+       }
 
-       RADEON_WRITE(RADEON_CP_ME_RAM_ADDR, 0);
        if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R100) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV100) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV200) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS100) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS200)) {
                DRM_INFO("Loading R100 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    R100_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    R100_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R100;
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R200) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV250) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV280) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS300)) {
                DRM_INFO("Loading R200 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    R200_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    R200_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R200;
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV350) ||
@@ -498,39 +510,19 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) {
                DRM_INFO("Loading R300 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    R300_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    R300_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R300;
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R420) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R423) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV410)) {
                DRM_INFO("Loading R400 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    R420_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    R420_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_R420;
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS740)) {
                DRM_INFO("Loading RS690/RS740 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    RS690_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    RS690_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_RS690;
        } else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS600) {
                DRM_INFO("Loading RS600 Microcode\n");
-               for (i = 0; i < 256; i++) {
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    RS600_cp_microcode[i][1]);
-                       RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    RS600_cp_microcode[i][0]);
-               }
+               fw_name = FIRMWARE_RS600;
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R520) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV530) ||
@@ -538,11 +530,41 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV560) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV570)) {
                DRM_INFO("Loading R500 Microcode\n");
-               for (i = 0; i < 256; i++) {
+               fw_name = FIRMWARE_R520;
+       }
+
+       err = request_firmware(&dev_priv->me_fw, fw_name, &pdev->dev);
+       platform_device_unregister(pdev);
+       if (err) {
+               printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n",
+                      fw_name);
+       } else if (dev_priv->me_fw->size % 8) {
+               printk(KERN_ERR
+                      "radeon_cp: Bogus length %zu in firmware \"%s\"\n",
+                      dev_priv->me_fw->size, fw_name);
+               err = -EINVAL;
+               release_firmware(dev_priv->me_fw);
+               dev_priv->me_fw = NULL;
+       }
+       return err;
+}
+
+static void radeon_cp_load_microcode(drm_radeon_private_t *dev_priv)
+{
+       const __be32 *fw_data;
+       int i, size;
+
+       radeon_do_wait_for_idle(dev_priv);
+
+       if (dev_priv->me_fw) {
+               size = dev_priv->me_fw->size / 4;
+               fw_data = (const __be32 *)&dev_priv->me_fw->data[0];
+               RADEON_WRITE(RADEON_CP_ME_RAM_ADDR, 0);
+               for (i = 0; i < size; i += 2) {
                        RADEON_WRITE(RADEON_CP_ME_RAM_DATAH,
-                                    R520_cp_microcode[i][1]);
+                                    be32_to_cpup(&fw_data[i]));
                        RADEON_WRITE(RADEON_CP_ME_RAM_DATAL,
-                                    R520_cp_microcode[i][0]);
+                                    be32_to_cpup(&fw_data[i + 1]));
                }
        }
 }
@@ -594,6 +616,18 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv)
 
        dev_priv->cp_running = 1;
 
+       /* on r420, any DMA from CP to system memory while 2D is active
+        * can cause a hang.  workaround is to queue a CP RESYNC token
+        */
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R420) {
+               BEGIN_RING(3);
+               OUT_RING(CP_PACKET0(R300_CP_RESYNC_ADDR, 1));
+               OUT_RING(5); /* scratch reg 5 */
+               OUT_RING(0xdeadbeef);
+               ADVANCE_RING();
+               COMMIT_RING();
+       }
+
        BEGIN_RING(8);
        /* isync can only be written through cp on r5xx write it here */
        OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));
@@ -631,8 +665,19 @@ static void radeon_do_cp_reset(drm_radeon_private_t * dev_priv)
  */
 static void radeon_do_cp_stop(drm_radeon_private_t * dev_priv)
 {
+       RING_LOCALS;
        DRM_DEBUG("\n");
 
+       /* finish the pending CP_RESYNC token */
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R420) {
+               BEGIN_RING(2);
+               OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+               OUT_RING(R300_RB3D_DC_FINISH);
+               ADVANCE_RING();
+               COMMIT_RING();
+               radeon_do_wait_for_idle(dev_priv);
+       }
+
        RADEON_WRITE(RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIDIS_INDDIS);
 
        dev_priv->cp_running = 0;
@@ -1495,6 +1540,14 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
                radeon_set_pcigart(dev_priv, 1);
        }
 
+       if (!dev_priv->me_fw) {
+               int err = radeon_cp_init_microcode(dev_priv);
+               if (err) {
+                       DRM_ERROR("Failed to load firmware!\n");
+                       radeon_do_cleanup_cp(dev);
+                       return err;
+               }
+       }
        radeon_cp_load_microcode(dev_priv);
        radeon_cp_init_ring_buffer(dev, dev_priv, file_priv);
 
@@ -1764,6 +1817,14 @@ void radeon_do_release(struct drm_device * dev)
                        r600_do_cleanup_cp(dev);
                else
                        radeon_do_cleanup_cp(dev);
+               if (dev_priv->me_fw) {
+                       release_firmware(dev_priv->me_fw);
+                       dev_priv->me_fw = NULL;
+               }
+               if (dev_priv->pfp_fw) {
+                       release_firmware(dev_priv->pfp_fw);
+                       dev_priv->pfp_fw = NULL;
+               }
        }
 }
 
index a169067..12f5990 100644 (file)
@@ -145,7 +145,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
                cdata = (uint32_t *)(unsigned long)user_chunk.chunk_data;
 
                size = p->chunks[i].length_dw * sizeof(uint32_t);
-               p->chunks[i].kdata = kzalloc(size, GFP_KERNEL);
+               p->chunks[i].kdata = kmalloc(size, GFP_KERNEL);
                if (p->chunks[i].kdata == NULL) {
                        return -ENOMEM;
                }
@@ -185,6 +185,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error)
                        mutex_unlock(&parser->rdev->ddev->struct_mutex);
                }
        }
+       kfree(parser->track);
        kfree(parser->relocs);
        kfree(parser->relocs_ptr);
        for (i = 0; i < parser->nchunks; i++) {
index 7693f7c..daf5db7 100644 (file)
@@ -29,6 +29,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/radeon_drm.h>
+#include <linux/vgaarb.h>
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "radeon_asic.h"
@@ -37,7 +38,7 @@
 /*
  * Clear GPU surface registers.
  */
-static void radeon_surface_init(struct radeon_device *rdev)
+void radeon_surface_init(struct radeon_device *rdev)
 {
        /* FIXME: check this out */
        if (rdev->family < CHIP_R600) {
@@ -56,7 +57,7 @@ static void radeon_surface_init(struct radeon_device *rdev)
 /*
  * GPU scratch registers helpers function.
  */
-static void radeon_scratch_init(struct radeon_device *rdev)
+void radeon_scratch_init(struct radeon_device *rdev)
 {
        int i;
 
@@ -156,16 +157,18 @@ int radeon_mc_setup(struct radeon_device *rdev)
                tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
                rdev->mc.gtt_location = tmp;
        }
-       DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
+       rdev->mc.vram_start = rdev->mc.vram_location;
+       rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1;
+       rdev->mc.gtt_start = rdev->mc.gtt_location;
+       rdev->mc.gtt_end = rdev->mc.gtt_location + rdev->mc.gtt_size - 1;
+       DRM_INFO("radeon: VRAM %uM\n", (unsigned)(rdev->mc.mc_vram_size >> 20));
        DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
-                rdev->mc.vram_location,
-                rdev->mc.vram_location + rdev->mc.mc_vram_size - 1);
-       if (rdev->mc.real_vram_size != rdev->mc.mc_vram_size)
-               DRM_INFO("radeon: VRAM less than aperture workaround enabled\n");
-       DRM_INFO("radeon: GTT %uM\n", rdev->mc.gtt_size >> 20);
+                (unsigned)rdev->mc.vram_location,
+                (unsigned)(rdev->mc.vram_location + rdev->mc.mc_vram_size - 1));
+       DRM_INFO("radeon: GTT %uM\n", (unsigned)(rdev->mc.gtt_size >> 20));
        DRM_INFO("radeon: GTT from 0x%08X to 0x%08X\n",
-                rdev->mc.gtt_location,
-                rdev->mc.gtt_location + rdev->mc.gtt_size - 1);
+                (unsigned)rdev->mc.gtt_location,
+                (unsigned)(rdev->mc.gtt_location + rdev->mc.gtt_size - 1));
        return 0;
 }
 
@@ -173,7 +176,7 @@ int radeon_mc_setup(struct radeon_device *rdev)
 /*
  * GPU helpers function.
  */
-static bool radeon_card_posted(struct radeon_device *rdev)
+bool radeon_card_posted(struct radeon_device *rdev)
 {
        uint32_t reg;
 
@@ -205,6 +208,31 @@ static bool radeon_card_posted(struct radeon_device *rdev)
 
 }
 
+int radeon_dummy_page_init(struct radeon_device *rdev)
+{
+       rdev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);
+       if (rdev->dummy_page.page == NULL)
+               return -ENOMEM;
+       rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
+                                       0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+       if (!rdev->dummy_page.addr) {
+               __free_page(rdev->dummy_page.page);
+               rdev->dummy_page.page = NULL;
+               return -ENOMEM;
+       }
+       return 0;
+}
+
+void radeon_dummy_page_fini(struct radeon_device *rdev)
+{
+       if (rdev->dummy_page.page == NULL)
+               return;
+       pci_unmap_page(rdev->pdev, rdev->dummy_page.addr,
+                       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+       __free_page(rdev->dummy_page.page);
+       rdev->dummy_page.page = NULL;
+}
+
 
 /*
  * Registers accessors functions.
@@ -243,6 +271,10 @@ void radeon_register_accessor_init(struct radeon_device *rdev)
                rdev->pll_rreg = &r100_pll_rreg;
                rdev->pll_wreg = &r100_pll_wreg;
        }
+       if (rdev->family >= CHIP_R420) {
+               rdev->mc_rreg = &r420_mc_rreg;
+               rdev->mc_wreg = &r420_mc_wreg;
+       }
        if (rdev->family >= CHIP_RV515) {
                rdev->mc_rreg = &rv515_mc_rreg;
                rdev->mc_wreg = &rv515_mc_wreg;
@@ -289,6 +321,14 @@ int radeon_asic_init(struct radeon_device *rdev)
        case CHIP_RV350:
        case CHIP_RV380:
                rdev->asic = &r300_asic;
+               if (rdev->flags & RADEON_IS_PCIE) {
+                       rdev->asic->gart_init = &rv370_pcie_gart_init;
+                       rdev->asic->gart_fini = &rv370_pcie_gart_fini;
+                       rdev->asic->gart_enable = &rv370_pcie_gart_enable;
+                       rdev->asic->gart_disable = &rv370_pcie_gart_disable;
+                       rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+                       rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
+               }
                break;
        case CHIP_R420:
        case CHIP_R423:
@@ -323,9 +363,15 @@ int radeon_asic_init(struct radeon_device *rdev)
        case CHIP_RV635:
        case CHIP_RV670:
        case CHIP_RS780:
+       case CHIP_RS880:
+               rdev->asic = &r600_asic;
+               break;
        case CHIP_RV770:
        case CHIP_RV730:
        case CHIP_RV710:
+       case CHIP_RV740:
+               rdev->asic = &rv770_asic;
+               break;
        default:
                /* FIXME: not supported yet */
                return -EINVAL;
@@ -341,7 +387,6 @@ int radeon_clocks_init(struct radeon_device *rdev)
 {
        int r;
 
-       radeon_get_clock_info(rdev->ddev);
        r = radeon_static_clocks_init(rdev->ddev);
        if (r) {
                return r;
@@ -436,10 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
 {
 }
 
-int radeon_modeset_init(struct radeon_device *rdev);
-void radeon_modeset_fini(struct radeon_device *rdev);
-
+/* if we get transitioned to only one device, tak VGA back */
+static unsigned int radeon_vga_set_decode(void *cookie, bool state)
+{
+       struct radeon_device *rdev = cookie;
 
+       radeon_vga_set_state(rdev, state);
+       if (state)
+               return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+                      VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+       else
+               return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+}
 /*
  * Radeon device.
  */
@@ -448,11 +501,12 @@ int radeon_device_init(struct radeon_device *rdev,
                       struct pci_dev *pdev,
                       uint32_t flags)
 {
-       int r, ret;
+       int r;
        int dma_bits;
 
        DRM_INFO("radeon: Initializing kernel modesetting.\n");
        rdev->shutdown = false;
+       rdev->dev = &pdev->dev;
        rdev->ddev = ddev;
        rdev->pdev = pdev;
        rdev->flags = flags;
@@ -461,37 +515,47 @@ int radeon_device_init(struct radeon_device *rdev,
        rdev->usec_timeout = RADEON_MAX_USEC_TIMEOUT;
        rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
        rdev->gpu_lockup = false;
+       rdev->accel_working = false;
        /* mutex initialization are all done here so we
         * can recall function without having locking issues */
        mutex_init(&rdev->cs_mutex);
        mutex_init(&rdev->ib_pool.mutex);
        mutex_init(&rdev->cp.mutex);
        rwlock_init(&rdev->fence_drv.lock);
+       INIT_LIST_HEAD(&rdev->gem.objects);
+
+       /* Set asic functions */
+       r = radeon_asic_init(rdev);
+       if (r) {
+               return r;
+       }
 
        if (radeon_agpmode == -1) {
                rdev->flags &= ~RADEON_IS_AGP;
-               if (rdev->family > CHIP_RV515 ||
+               if (rdev->family >= CHIP_RV515 ||
                    rdev->family == CHIP_RV380 ||
                    rdev->family == CHIP_RV410 ||
                    rdev->family == CHIP_R423) {
                        DRM_INFO("Forcing AGP to PCIE mode\n");
                        rdev->flags |= RADEON_IS_PCIE;
+                       rdev->asic->gart_init = &rv370_pcie_gart_init;
+                       rdev->asic->gart_fini = &rv370_pcie_gart_fini;
+                       rdev->asic->gart_enable = &rv370_pcie_gart_enable;
+                       rdev->asic->gart_disable = &rv370_pcie_gart_disable;
+                       rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+                       rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
                } else {
                        DRM_INFO("Forcing AGP to PCI mode\n");
                        rdev->flags |= RADEON_IS_PCI;
+                       rdev->asic->gart_init = &r100_pci_gart_init;
+                       rdev->asic->gart_fini = &r100_pci_gart_fini;
+                       rdev->asic->gart_enable = &r100_pci_gart_enable;
+                       rdev->asic->gart_disable = &r100_pci_gart_disable;
+                       rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+                       rdev->asic->gart_set_page = &r100_pci_gart_set_page;
                }
        }
 
-       /* Set asic functions */
-       r = radeon_asic_init(rdev);
-       if (r) {
-               return r;
-       }
-       r = radeon_init(rdev);
-       if (r) {
-               return r;
-       }
-
        /* set DMA mask + need_dma32 flags.
         * PCIE - can handle 40-bits.
         * IGP - can handle 40-bits (in theory)
@@ -521,156 +585,150 @@ int radeon_device_init(struct radeon_device *rdev,
        DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
        DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
 
-       /* Setup errata flags */
-       radeon_errata(rdev);
-       /* Initialize scratch registers */
-       radeon_scratch_init(rdev);
-       /* Initialize surface registers */
-       radeon_surface_init(rdev);
-
-       /* TODO: disable VGA need to use VGA request */
-       /* BIOS*/
-       if (!radeon_get_bios(rdev)) {
-               if (ASIC_IS_AVIVO(rdev))
-                       return -EINVAL;
-       }
-       if (rdev->is_atom_bios) {
-               r = radeon_atombios_init(rdev);
-               if (r) {
-                       return r;
-               }
-       } else {
-               r = radeon_combios_init(rdev);
-               if (r) {
-                       return r;
-               }
-       }
-       /* Reset gpu before posting otherwise ATOM will enter infinite loop */
-       if (radeon_gpu_reset(rdev)) {
-               /* FIXME: what do we want to do here ? */
-       }
-       /* check if cards are posted or not */
-       if (!radeon_card_posted(rdev) && rdev->bios) {
-               DRM_INFO("GPU not posted. posting now...\n");
-               if (rdev->is_atom_bios) {
-                       atom_asic_init(rdev->mode_info.atom_context);
-               } else {
-                       radeon_combios_asic_init(rdev->ddev);
-               }
-       }
-       /* Initialize clocks */
-       r = radeon_clocks_init(rdev);
-       if (r) {
-               return r;
-       }
-       /* Get vram informations */
-       radeon_vram_info(rdev);
-
-       /* Add an MTRR for the VRAM */
-       rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
-                                     MTRR_TYPE_WRCOMB, 1);
-       DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
-                rdev->mc.real_vram_size >> 20,
-                (unsigned)rdev->mc.aper_size >> 20);
-       DRM_INFO("RAM width %dbits %cDR\n",
-                rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
-       /* Initialize memory controller (also test AGP) */
-       r = radeon_mc_init(rdev);
-       if (r) {
-               return r;
-       }
-       /* Fence driver */
-       r = radeon_fence_driver_init(rdev);
-       if (r) {
-               return r;
-       }
-       r = radeon_irq_kms_init(rdev);
+       rdev->new_init_path = false;
+       r = radeon_init(rdev);
        if (r) {
                return r;
        }
-       /* Memory manager */
-       r = radeon_object_init(rdev);
+
+       /* if we have > 1 VGA cards, then disable the radeon VGA resources */
+       r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
        if (r) {
-               return r;
-       }
-       /* Initialize GART (initialize after TTM so we can allocate
-        * memory through TTM but finalize after TTM) */
-       r = radeon_gart_enable(rdev);
-       if (!r) {
-               r = radeon_gem_init(rdev);
+               return -EINVAL;
        }
 
-       /* 1M ring buffer */
-       if (!r) {
-               r = radeon_cp_init(rdev, 1024 * 1024);
-       }
-       if (!r) {
-               r = radeon_wb_init(rdev);
+       if (!rdev->new_init_path) {
+               /* Setup errata flags */
+               radeon_errata(rdev);
+               /* Initialize scratch registers */
+               radeon_scratch_init(rdev);
+               /* Initialize surface registers */
+               radeon_surface_init(rdev);
+
+               /* BIOS*/
+               if (!radeon_get_bios(rdev)) {
+                       if (ASIC_IS_AVIVO(rdev))
+                               return -EINVAL;
+               }
+               if (rdev->is_atom_bios) {
+                       r = radeon_atombios_init(rdev);
+                       if (r) {
+                               return r;
+                       }
+               } else {
+                       r = radeon_combios_init(rdev);
+                       if (r) {
+                               return r;
+                       }
+               }
+               /* Reset gpu before posting otherwise ATOM will enter infinite loop */
+               if (radeon_gpu_reset(rdev)) {
+                       /* FIXME: what do we want to do here ? */
+               }
+               /* check if cards are posted or not */
+               if (!radeon_card_posted(rdev) && rdev->bios) {
+                       DRM_INFO("GPU not posted. posting now...\n");
+                       if (rdev->is_atom_bios) {
+                               atom_asic_init(rdev->mode_info.atom_context);
+                       } else {
+                               radeon_combios_asic_init(rdev->ddev);
+                       }
+               }
+               /* Get clock & vram information */
+               radeon_get_clock_info(rdev->ddev);
+               radeon_vram_info(rdev);
+               /* Initialize clocks */
+               r = radeon_clocks_init(rdev);
                if (r) {
-                       DRM_ERROR("radeon: failled initializing WB (%d).\n", r);
                        return r;
                }
-       }
-       if (!r) {
-               r = radeon_ib_pool_init(rdev);
+
+               /* Initialize memory controller (also test AGP) */
+               r = radeon_mc_init(rdev);
                if (r) {
-                       DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
                        return r;
                }
-       }
-       if (!r) {
-               r = radeon_ib_test(rdev);
+               /* Fence driver */
+               r = radeon_fence_driver_init(rdev);
                if (r) {
-                       DRM_ERROR("radeon: failled testing IB (%d).\n", r);
                        return r;
                }
+               r = radeon_irq_kms_init(rdev);
+               if (r) {
+                       return r;
+               }
+               /* Memory manager */
+               r = radeon_object_init(rdev);
+               if (r) {
+                       return r;
+               }
+               r = radeon_gpu_gart_init(rdev);
+               if (r)
+                       return r;
+               /* Initialize GART (initialize after TTM so we can allocate
+                * memory through TTM but finalize after TTM) */
+               r = radeon_gart_enable(rdev);
+               if (r)
+                       return 0;
+                       r = radeon_gem_init(rdev);
+               if (r)
+                       return 0;
+
+               /* 1M ring buffer */
+               r = radeon_cp_init(rdev, 1024 * 1024);
+               if (r)
+                       return 0;
+               r = radeon_wb_init(rdev);
+               if (r)
+                       DRM_ERROR("radeon: failled initializing WB (%d).\n", r);
+               r = radeon_ib_pool_init(rdev);
+               if (r)
+                       return 0;
+               r = radeon_ib_test(rdev);
+               if (r)
+                       return 0;
+               rdev->accel_working = true;
        }
-       ret = r;
-       r = radeon_modeset_init(rdev);
-       if (r) {
-               return r;
-       }
-       if (!ret) {
-               DRM_INFO("radeon: kernel modesetting successfully initialized.\n");
-       }
+       DRM_INFO("radeon: kernel modesetting successfully initialized.\n");
        if (radeon_testing) {
                radeon_test_moves(rdev);
        }
        if (radeon_benchmarking) {
                radeon_benchmark(rdev);
        }
-       return ret;
+       return 0;
 }
 
 void radeon_device_fini(struct radeon_device *rdev)
 {
-       if (rdev == NULL || rdev->rmmio == NULL) {
-               return;
-       }
        DRM_INFO("radeon: finishing device.\n");
        rdev->shutdown = true;
        /* Order matter so becarefull if you rearrange anythings */
-       radeon_modeset_fini(rdev);
-       radeon_ib_pool_fini(rdev);
-       radeon_cp_fini(rdev);
-       radeon_wb_fini(rdev);
-       radeon_gem_fini(rdev);
-       radeon_object_fini(rdev);
-       /* mc_fini must be after object_fini */
-       radeon_mc_fini(rdev);
+       if (!rdev->new_init_path) {
+               radeon_ib_pool_fini(rdev);
+               radeon_cp_fini(rdev);
+               radeon_wb_fini(rdev);
+               radeon_gpu_gart_fini(rdev);
+               radeon_gem_fini(rdev);
+               radeon_mc_fini(rdev);
 #if __OS_HAS_AGP
-       radeon_agp_fini(rdev);
+               radeon_agp_fini(rdev);
 #endif
-       radeon_irq_kms_fini(rdev);
-       radeon_fence_driver_fini(rdev);
-       radeon_clocks_fini(rdev);
-       if (rdev->is_atom_bios) {
-               radeon_atombios_fini(rdev);
+               radeon_irq_kms_fini(rdev);
+               vga_client_register(rdev->pdev, NULL, NULL, NULL);
+               radeon_fence_driver_fini(rdev);
+               radeon_clocks_fini(rdev);
+               radeon_object_fini(rdev);
+               if (rdev->is_atom_bios) {
+                       radeon_atombios_fini(rdev);
+               } else {
+                       radeon_combios_fini(rdev);
+               }
+               kfree(rdev->bios);
+               rdev->bios = NULL;
        } else {
-               radeon_combios_fini(rdev);
+               radeon_fini(rdev);
        }
-       kfree(rdev->bios);
-       rdev->bios = NULL;
        iounmap(rdev->rmmio);
        rdev->rmmio = NULL;
 }
@@ -708,15 +766,19 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
        /* wait for gpu to finish processing current batch */
        radeon_fence_wait_last(rdev);
 
-       radeon_cp_disable(rdev);
-       radeon_gart_disable(rdev);
+       radeon_save_bios_scratch_regs(rdev);
 
+       if (!rdev->new_init_path) {
+               radeon_cp_disable(rdev);
+               radeon_gart_disable(rdev);
+               rdev->irq.sw_int = false;
+               radeon_irq_set(rdev);
+       } else {
+               radeon_suspend(rdev);
+       }
        /* evict remaining vram memory */
        radeon_object_evict_vram(rdev);
 
-       rdev->irq.sw_int = false;
-       radeon_irq_set(rdev);
-
        pci_save_state(dev->pdev);
        if (state.event == PM_EVENT_SUSPEND) {
                /* Shut down the device */
@@ -743,38 +805,43 @@ int radeon_resume_kms(struct drm_device *dev)
        }
        pci_set_master(dev->pdev);
        /* Reset gpu before posting otherwise ATOM will enter infinite loop */
-       if (radeon_gpu_reset(rdev)) {
-               /* FIXME: what do we want to do here ? */
-       }
-       /* post card */
-       if (rdev->is_atom_bios) {
-               atom_asic_init(rdev->mode_info.atom_context);
+       if (!rdev->new_init_path) {
+               if (radeon_gpu_reset(rdev)) {
+                       /* FIXME: what do we want to do here ? */
+               }
+               /* post card */
+               if (rdev->is_atom_bios) {
+                       atom_asic_init(rdev->mode_info.atom_context);
+               } else {
+                       radeon_combios_asic_init(rdev->ddev);
+               }
+               /* Initialize clocks */
+               r = radeon_clocks_init(rdev);
+               if (r) {
+                       release_console_sem();
+                       return r;
+               }
+               /* Enable IRQ */
+               rdev->irq.sw_int = true;
+               radeon_irq_set(rdev);
+               /* Initialize GPU Memory Controller */
+               r = radeon_mc_init(rdev);
+               if (r) {
+                       goto out;
+               }
+               r = radeon_gart_enable(rdev);
+               if (r) {
+                       goto out;
+               }
+               r = radeon_cp_init(rdev, rdev->cp.ring_size);
+               if (r) {
+                       goto out;
+               }
        } else {
-               radeon_combios_asic_init(rdev->ddev);
-       }
-       /* Initialize clocks */
-       r = radeon_clocks_init(rdev);
-       if (r) {
-               release_console_sem();
-               return r;
-       }
-       /* Enable IRQ */
-       rdev->irq.sw_int = true;
-       radeon_irq_set(rdev);
-       /* Initialize GPU Memory Controller */
-       r = radeon_mc_init(rdev);
-       if (r) {
-               goto out;
-       }
-       r = radeon_gart_enable(rdev);
-       if (r) {
-               goto out;
-       }
-       r = radeon_cp_init(rdev, rdev->cp.ring_size);
-       if (r) {
-               goto out;
+               radeon_resume(rdev);
        }
 out:
+       radeon_restore_bios_scratch_regs(rdev);
        fb_set_suspend(rdev->fbdev_info, 0);
        release_console_sem();
 
index a8fa1bb..5d8141b 100644 (file)
@@ -158,9 +158,6 @@ static void radeon_crtc_destroy(struct drm_crtc *crtc)
 {
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
 
-       if (radeon_crtc->mode_set.mode) {
-               drm_mode_destroy(crtc->dev, radeon_crtc->mode_set.mode);
-       }
        drm_crtc_cleanup(crtc);
        kfree(radeon_crtc);
 }
@@ -189,9 +186,11 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
        radeon_crtc->crtc_id = index;
        rdev->mode_info.crtcs[index] = radeon_crtc;
 
+#if 0
        radeon_crtc->mode_set.crtc = &radeon_crtc->base;
        radeon_crtc->mode_set.connectors = (struct drm_connector **)(radeon_crtc + 1);
        radeon_crtc->mode_set.num_connectors = 0;
+#endif
 
        for (i = 0; i < 256; i++) {
                radeon_crtc->lut_r[i] = i << 2;
@@ -313,7 +312,7 @@ static void radeon_print_display_setup(struct drm_device *dev)
        }
 }
 
-bool radeon_setup_enc_conn(struct drm_device *dev)
+static bool radeon_setup_enc_conn(struct drm_device *dev)
 {
        struct radeon_device *rdev = dev->dev_private;
        struct drm_connector *drm_connector;
@@ -347,9 +346,13 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
 
        if (!radeon_connector->ddc_bus)
                return -1;
-       radeon_i2c_do_lock(radeon_connector, 1);
-       edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
-       radeon_i2c_do_lock(radeon_connector, 0);
+       if (!radeon_connector->edid) {
+               radeon_i2c_do_lock(radeon_connector, 1);
+               edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
+               radeon_i2c_do_lock(radeon_connector, 0);
+       } else
+               edid = radeon_connector->edid;
+
        if (edid) {
                /* update digital bits here */
                if (edid->input & DRM_EDID_INPUT_DIGITAL)
@@ -362,7 +365,7 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
                return ret;
        }
        drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
-       return -1;
+       return 0;
 }
 
 static int radeon_ddc_dump(struct drm_connector *connector)
@@ -620,6 +623,83 @@ static const struct drm_mode_config_funcs radeon_mode_funcs = {
        .fb_changed = radeonfb_probe,
 };
 
+struct drm_prop_enum_list {
+       int type;
+       char *name;
+};
+
+static struct drm_prop_enum_list radeon_tmds_pll_enum_list[] =
+{      { 0, "driver" },
+       { 1, "bios" },
+};
+
+static struct drm_prop_enum_list radeon_tv_std_enum_list[] =
+{      { TV_STD_NTSC, "ntsc" },
+       { TV_STD_PAL, "pal" },
+       { TV_STD_PAL_M, "pal-m" },
+       { TV_STD_PAL_60, "pal-60" },
+       { TV_STD_NTSC_J, "ntsc-j" },
+       { TV_STD_SCART_PAL, "scart-pal" },
+       { TV_STD_PAL_CN, "pal-cn" },
+       { TV_STD_SECAM, "secam" },
+};
+
+int radeon_modeset_create_props(struct radeon_device *rdev)
+{
+       int i, sz;
+
+       if (rdev->is_atom_bios) {
+               rdev->mode_info.coherent_mode_property =
+                       drm_property_create(rdev->ddev,
+                                           DRM_MODE_PROP_RANGE,
+                                           "coherent", 2);
+               if (!rdev->mode_info.coherent_mode_property)
+                       return -ENOMEM;
+
+               rdev->mode_info.coherent_mode_property->values[0] = 0;
+               rdev->mode_info.coherent_mode_property->values[0] = 1;
+       }
+
+       if (!ASIC_IS_AVIVO(rdev)) {
+               sz = ARRAY_SIZE(radeon_tmds_pll_enum_list);
+               rdev->mode_info.tmds_pll_property =
+                       drm_property_create(rdev->ddev,
+                                           DRM_MODE_PROP_ENUM,
+                                           "tmds_pll", sz);
+               for (i = 0; i < sz; i++) {
+                       drm_property_add_enum(rdev->mode_info.tmds_pll_property,
+                                             i,
+                                             radeon_tmds_pll_enum_list[i].type,
+                                             radeon_tmds_pll_enum_list[i].name);
+               }
+       }
+
+       rdev->mode_info.load_detect_property =
+               drm_property_create(rdev->ddev,
+                                   DRM_MODE_PROP_RANGE,
+                                   "load detection", 2);
+       if (!rdev->mode_info.load_detect_property)
+               return -ENOMEM;
+       rdev->mode_info.load_detect_property->values[0] = 0;
+       rdev->mode_info.load_detect_property->values[0] = 1;
+
+       drm_mode_create_scaling_mode_property(rdev->ddev);
+
+       sz = ARRAY_SIZE(radeon_tv_std_enum_list);
+       rdev->mode_info.tv_std_property =
+               drm_property_create(rdev->ddev,
+                                   DRM_MODE_PROP_ENUM,
+                                   "tv standard", sz);
+       for (i = 0; i < sz; i++) {
+               drm_property_add_enum(rdev->mode_info.tv_std_property,
+                                     i,
+                                     radeon_tv_std_enum_list[i].type,
+                                     radeon_tv_std_enum_list[i].name);
+       }
+
+       return 0;
+}
+
 int radeon_modeset_init(struct radeon_device *rdev)
 {
        int num_crtc = 2, i;
@@ -640,6 +720,10 @@ int radeon_modeset_init(struct radeon_device *rdev)
 
        rdev->ddev->mode_config.fb_base = rdev->mc.aper_base;
 
+       ret = radeon_modeset_create_props(rdev);
+       if (ret) {
+               return ret;
+       }
        /* allocate crtcs - TODO single crtc */
        for (i = 0; i < num_crtc; i++) {
                radeon_crtc_init(rdev->ddev, i);
@@ -678,7 +762,6 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
                        continue;
                if (first) {
                        radeon_crtc->rmx_type = radeon_encoder->rmx_type;
-                       radeon_crtc->devices = radeon_encoder->devices;
                        memcpy(&radeon_crtc->native_mode,
                                &radeon_encoder->native_mode,
                                sizeof(struct radeon_native_mode));
index 0bd5879..50fce49 100644 (file)
@@ -38,7 +38,6 @@
 #include <linux/console.h>
 
 
-#if defined(CONFIG_DRM_RADEON_KMS)
 /*
  * KMS wrapper.
  */
@@ -77,11 +76,9 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
 int radeon_debugfs_init(struct drm_minor *minor);
 void radeon_debugfs_cleanup(struct drm_minor *minor);
 #endif
-#endif
 
 
 int radeon_no_wb;
-#if defined(CONFIG_DRM_RADEON_KMS)
 int radeon_modeset = -1;
 int radeon_dynclks = -1;
 int radeon_r4xx_atom = 0;
@@ -91,12 +88,11 @@ int radeon_gart_size = 512; /* default gart size */
 int radeon_benchmarking = 0;
 int radeon_testing = 0;
 int radeon_connector_table = 0;
-#endif
+int radeon_tv = 1;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
 
-#if defined(CONFIG_DRM_RADEON_KMS)
 MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
 module_param_named(modeset, radeon_modeset, int, 0400);
 
@@ -123,7 +119,9 @@ module_param_named(test, radeon_testing, int, 0444);
 
 MODULE_PARM_DESC(connector_table, "Force connector table");
 module_param_named(connector_table, radeon_connector_table, int, 0444);
-#endif
+
+MODULE_PARM_DESC(tv, "TV enable (0 = disable)");
+module_param_named(tv, radeon_tv, int, 0444);
 
 static int radeon_suspend(struct drm_device *dev, pm_message_t state)
 {
@@ -215,7 +213,6 @@ static struct drm_driver driver_old = {
        .patchlevel = DRIVER_PATCHLEVEL,
 };
 
-#if defined(CONFIG_DRM_RADEON_KMS)
 static struct drm_driver kms_driver;
 
 static int __devinit
@@ -289,7 +286,7 @@ static struct drm_driver kms_driver = {
                 .poll = drm_poll,
                 .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
-                .compat_ioctl = NULL,
+                .compat_ioctl = radeon_kms_compat_ioctl,
 #endif
        },
 
@@ -309,7 +306,6 @@ static struct drm_driver kms_driver = {
        .minor = KMS_DRIVER_MINOR,
        .patchlevel = KMS_DRIVER_PATCHLEVEL,
 };
-#endif
 
 static struct drm_driver *driver;
 
@@ -317,7 +313,6 @@ static int __init radeon_init(void)
 {
        driver = &driver_old;
        driver->num_ioctls = radeon_max_ioctl;
-#if defined(CONFIG_DRM_RADEON_KMS)
 #ifdef CONFIG_VGA_CONSOLE
        if (vgacon_text_force() && radeon_modeset == -1) {
                DRM_INFO("VGACON disable radeon kernel modesetting.\n");
@@ -328,8 +323,13 @@ static int __init radeon_init(void)
 #endif
        /* if enabled by default */
        if (radeon_modeset == -1) {
-               DRM_INFO("radeon default to kernel modesetting.\n");
+#ifdef CONFIG_DRM_RADEON_KMS
+               DRM_INFO("radeon defaulting to kernel modesetting.\n");
                radeon_modeset = 1;
+#else
+               DRM_INFO("radeon defaulting to userspace modesetting.\n");
+               radeon_modeset = 0;
+#endif
        }
        if (radeon_modeset == 1) {
                DRM_INFO("radeon kernel modesetting enabled.\n");
@@ -339,7 +339,6 @@ static int __init radeon_init(void)
        }
        /* if the vga console setting is enabled still
         * let modprobe override it */
-#endif
        return drm_init(driver);
 }
 
index 6fa32da..cb0cfe4 100644 (file)
@@ -31,6 +31,9 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
+#include <linux/firmware.h>
+#include <linux/platform_device.h>
+
 /* General customization:
  */
 
@@ -353,6 +356,14 @@ typedef struct drm_radeon_private {
        int r700_sc_hiz_tile_fifo_size;
        int r700_sc_earlyz_tile_fifo_fize;
 
+       struct mutex cs_mutex;
+       u32 cs_id_scnt;
+       u32 cs_id_wcnt;
+       /* r6xx/r7xx drm blit vertex buffer */
+       struct drm_buf *blit_vb;
+
+       /* firmware */
+       const struct firmware *me_fw, *pfp_fw;
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {
@@ -391,6 +402,9 @@ static __inline__ int radeon_check_offset(drm_radeon_private_t *dev_priv,
                (off >= gart_start && off <= gart_end));
 }
 
+/* radeon_state.c */
+extern void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master *master, struct drm_buf *buf);
+
                                /* radeon_cp.c */
 extern int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int radeon_cp_start(struct drm_device *dev, void *data, struct drm_file *file_priv);
@@ -457,6 +471,8 @@ extern int radeon_driver_open(struct drm_device *dev,
                              struct drm_file *file_priv);
 extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
                                unsigned long arg);
+extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd,
+                                   unsigned long arg);
 
 extern int radeon_master_create(struct drm_device *dev, struct drm_master *master);
 extern void radeon_master_destroy(struct drm_device *dev, struct drm_master *master);
@@ -482,6 +498,22 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev,
                                     struct drm_buf *buf, int start, int end);
 extern int r600_page_table_init(struct drm_device *dev);
 extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info);
+extern int r600_cs_legacy_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv);
+extern void r600_cp_dispatch_swap(struct drm_device *dev, struct drm_file *file_priv);
+extern int r600_cp_dispatch_texture(struct drm_device *dev,
+                                   struct drm_file *file_priv,
+                                   drm_radeon_texture_t *tex,
+                                   drm_radeon_tex_image_t *image);
+/* r600_blit.c */
+extern int r600_prepare_blit_copy(struct drm_device *dev, struct drm_file *file_priv);
+extern void r600_done_blit_copy(struct drm_device *dev);
+extern void r600_blit_copy(struct drm_device *dev,
+                          uint64_t src_gpu_addr, uint64_t dst_gpu_addr,
+                          int size_bytes);
+extern void r600_blit_swap(struct drm_device *dev,
+                          uint64_t src_gpu_addr, uint64_t dst_gpu_addr,
+                          int sx, int sy, int dx, int dy,
+                          int w, int h, int src_pitch, int dst_pitch, int cpp);
 
 /* Flags for stats.boxes
  */
@@ -1067,6 +1099,9 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #      define RADEON_CSQ_PRIBM_INDBM           (4 << 28)
 #      define RADEON_CSQ_PRIPIO_INDPIO         (15 << 28)
 
+#define R300_CP_RESYNC_ADDR            0x0778
+#define R300_CP_RESYNC_DATA            0x077c
+
 #define RADEON_AIC_CNTL                        0x01d0
 #      define RADEON_PCIGART_TRANSLATE_EN      (1 << 0)
 #      define RS400_MSI_REARM                  (1 << 3)
@@ -1109,13 +1144,71 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #      define RADEON_CNTL_BITBLT_MULTI         0x00009B00
 #      define RADEON_CNTL_SET_SCISSORS         0xC0001E00
 
-#      define R600_IT_INDIRECT_BUFFER          0x00003200
-#      define R600_IT_ME_INITIALIZE            0x00004400
+#       define R600_IT_INDIRECT_BUFFER_END      0x00001700
+#       define R600_IT_SET_PREDICATION          0x00002000
+#       define R600_IT_REG_RMW                  0x00002100
+#       define R600_IT_COND_EXEC                0x00002200
+#       define R600_IT_PRED_EXEC                0x00002300
+#       define R600_IT_START_3D_CMDBUF          0x00002400
+#       define R600_IT_DRAW_INDEX_2             0x00002700
+#       define R600_IT_CONTEXT_CONTROL          0x00002800
+#       define R600_IT_DRAW_INDEX_IMMD_BE       0x00002900
+#       define R600_IT_INDEX_TYPE               0x00002A00
+#       define R600_IT_DRAW_INDEX               0x00002B00
+#       define R600_IT_DRAW_INDEX_AUTO          0x00002D00
+#       define R600_IT_DRAW_INDEX_IMMD          0x00002E00
+#       define R600_IT_NUM_INSTANCES            0x00002F00
+#       define R600_IT_STRMOUT_BUFFER_UPDATE    0x00003400
+#       define R600_IT_INDIRECT_BUFFER_MP       0x00003800
+#       define R600_IT_MEM_SEMAPHORE            0x00003900
+#       define R600_IT_MPEG_INDEX               0x00003A00
+#       define R600_IT_WAIT_REG_MEM             0x00003C00
+#       define R600_IT_MEM_WRITE                0x00003D00
+#       define R600_IT_INDIRECT_BUFFER          0x00003200
+#       define R600_IT_CP_INTERRUPT             0x00004000
+#       define R600_IT_SURFACE_SYNC             0x00004300
+#              define R600_CB0_DEST_BASE_ENA    (1 << 6)
+#              define R600_TC_ACTION_ENA        (1 << 23)
+#              define R600_VC_ACTION_ENA        (1 << 24)
+#              define R600_CB_ACTION_ENA        (1 << 25)
+#              define R600_DB_ACTION_ENA        (1 << 26)
+#              define R600_SH_ACTION_ENA        (1 << 27)
+#              define R600_SMX_ACTION_ENA       (1 << 28)
+#       define R600_IT_ME_INITIALIZE            0x00004400
 #             define R600_ME_INITIALIZE_DEVICE_ID(x) ((x) << 16)
-#      define R600_IT_EVENT_WRITE              0x00004600
-#      define R600_IT_SET_CONFIG_REG           0x00006800
-#      define R600_SET_CONFIG_REG_OFFSET       0x00008000
-#      define R600_SET_CONFIG_REG_END          0x0000ac00
+#       define R600_IT_COND_WRITE               0x00004500
+#       define R600_IT_EVENT_WRITE              0x00004600
+#       define R600_IT_EVENT_WRITE_EOP          0x00004700
+#       define R600_IT_ONE_REG_WRITE            0x00005700
+#       define R600_IT_SET_CONFIG_REG           0x00006800
+#              define R600_SET_CONFIG_REG_OFFSET 0x00008000
+#              define R600_SET_CONFIG_REG_END   0x0000ac00
+#       define R600_IT_SET_CONTEXT_REG          0x00006900
+#              define R600_SET_CONTEXT_REG_OFFSET 0x00028000
+#              define R600_SET_CONTEXT_REG_END  0x00029000
+#       define R600_IT_SET_ALU_CONST            0x00006A00
+#              define R600_SET_ALU_CONST_OFFSET 0x00030000
+#              define R600_SET_ALU_CONST_END    0x00032000
+#       define R600_IT_SET_BOOL_CONST           0x00006B00
+#              define R600_SET_BOOL_CONST_OFFSET 0x0003e380
+#              define R600_SET_BOOL_CONST_END   0x00040000
+#       define R600_IT_SET_LOOP_CONST           0x00006C00
+#              define R600_SET_LOOP_CONST_OFFSET 0x0003e200
+#              define R600_SET_LOOP_CONST_END   0x0003e380
+#       define R600_IT_SET_RESOURCE             0x00006D00
+#              define R600_SET_RESOURCE_OFFSET  0x00038000
+#              define R600_SET_RESOURCE_END     0x0003c000
+#              define R600_SQ_TEX_VTX_INVALID_TEXTURE  0x0
+#              define R600_SQ_TEX_VTX_INVALID_BUFFER   0x1
+#              define R600_SQ_TEX_VTX_VALID_TEXTURE    0x2
+#              define R600_SQ_TEX_VTX_VALID_BUFFER     0x3
+#       define R600_IT_SET_SAMPLER              0x00006E00
+#              define R600_SET_SAMPLER_OFFSET   0x0003c000
+#              define R600_SET_SAMPLER_END      0x0003cff0
+#       define R600_IT_SET_CTL_CONST            0x00006F00
+#              define R600_SET_CTL_CONST_OFFSET 0x0003cff0
+#              define R600_SET_CTL_CONST_END    0x0003e200
+#       define R600_IT_SURFACE_BASE_UPDATE      0x00007300
 
 #define RADEON_CP_PACKET_MASK          0xC0000000
 #define RADEON_CP_PACKET_COUNT_MASK    0x3fff0000
@@ -1593,6 +1686,52 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define R600_CB_COLOR7_BASE                                    0x2805c
 #define R600_CB_COLOR7_FRAG                                    0x280fc
 
+#define R600_CB_COLOR0_SIZE                                    0x28060
+#define R600_CB_COLOR0_VIEW                                    0x28080
+#define R600_CB_COLOR0_INFO                                    0x280a0
+#define R600_CB_COLOR0_TILE                                    0x280c0
+#define R600_CB_COLOR0_FRAG                                    0x280e0
+#define R600_CB_COLOR0_MASK                                    0x28100
+
+#define AVIVO_D1MODE_VLINE_START_END                           0x6538
+#define AVIVO_D2MODE_VLINE_START_END                           0x6d38
+#define R600_CP_COHER_BASE                                     0x85f8
+#define R600_DB_DEPTH_BASE                                     0x2800c
+#define R600_SQ_PGM_START_FS                                   0x28894
+#define R600_SQ_PGM_START_ES                                   0x28880
+#define R600_SQ_PGM_START_VS                                   0x28858
+#define R600_SQ_PGM_RESOURCES_VS                               0x28868
+#define R600_SQ_PGM_CF_OFFSET_VS                               0x288d0
+#define R600_SQ_PGM_START_GS                                   0x2886c
+#define R600_SQ_PGM_START_PS                                   0x28840
+#define R600_SQ_PGM_RESOURCES_PS                               0x28850
+#define R600_SQ_PGM_EXPORTS_PS                                 0x28854
+#define R600_SQ_PGM_CF_OFFSET_PS                               0x288cc
+#define R600_VGT_DMA_BASE                                      0x287e8
+#define R600_VGT_DMA_BASE_HI                                   0x287e4
+#define R600_VGT_STRMOUT_BASE_OFFSET_0                         0x28b10
+#define R600_VGT_STRMOUT_BASE_OFFSET_1                         0x28b14
+#define R600_VGT_STRMOUT_BASE_OFFSET_2                         0x28b18
+#define R600_VGT_STRMOUT_BASE_OFFSET_3                         0x28b1c
+#define R600_VGT_STRMOUT_BASE_OFFSET_HI_0                      0x28b44
+#define R600_VGT_STRMOUT_BASE_OFFSET_HI_1                      0x28b48
+#define R600_VGT_STRMOUT_BASE_OFFSET_HI_2                      0x28b4c
+#define R600_VGT_STRMOUT_BASE_OFFSET_HI_3                      0x28b50
+#define R600_VGT_STRMOUT_BUFFER_BASE_0                         0x28ad8
+#define R600_VGT_STRMOUT_BUFFER_BASE_1                         0x28ae8
+#define R600_VGT_STRMOUT_BUFFER_BASE_2                         0x28af8
+#define R600_VGT_STRMOUT_BUFFER_BASE_3                         0x28b08
+#define R600_VGT_STRMOUT_BUFFER_OFFSET_0                       0x28adc
+#define R600_VGT_STRMOUT_BUFFER_OFFSET_1                       0x28aec
+#define R600_VGT_STRMOUT_BUFFER_OFFSET_2                       0x28afc
+#define R600_VGT_STRMOUT_BUFFER_OFFSET_3                       0x28b0c
+
+#define R600_VGT_PRIMITIVE_TYPE                                0x8958
+
+#define R600_PA_SC_SCREEN_SCISSOR_TL                           0x28030
+#define R600_PA_SC_GENERIC_SCISSOR_TL                          0x28240
+#define R600_PA_SC_WINDOW_SCISSOR_TL                           0x28204
+
 #define R600_TC_CNTL                                           0x9608
 #       define R600_TC_L2_SIZE(x)                              ((x) << 5)
 #       define R600_L2_DISABLE_LATE_HIT                        (1 << 9)
index 0a92706..6216467 100644 (file)
@@ -126,6 +126,23 @@ radeon_link_encoder_connector(struct drm_device *dev)
        }
 }
 
+void radeon_encoder_set_active_device(struct drm_encoder *encoder)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct drm_connector *connector;
+
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               if (connector->encoder == encoder) {
+                       struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+                       radeon_encoder->active_device = radeon_encoder->devices & radeon_connector->devices;
+                       DRM_DEBUG("setting active device to %08x from %08x %08x for encoder %d\n",
+                                 radeon_encoder->active_device, radeon_encoder->devices,
+                                 radeon_connector->devices, encoder->encoder_type);
+               }
+       }
+}
+
 static struct drm_connector *
 radeon_get_connector_for_encoder(struct drm_encoder *encoder)
 {
@@ -224,9 +241,12 @@ atombios_dac_setup(struct drm_encoder *encoder, int action)
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        DAC_ENCODER_CONTROL_PS_ALLOCATION args;
        int index = 0, num = 0;
-       /* fixme - fill in enc_priv for atom dac */
+       struct radeon_encoder_atom_dac *dac_info = radeon_encoder->enc_priv;
        enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+       if (dac_info->tv_std)
+               tv_std = dac_info->tv_std;
+
        memset(&args, 0, sizeof(args));
 
        switch (radeon_encoder->encoder_id) {
@@ -244,9 +264,9 @@ atombios_dac_setup(struct drm_encoder *encoder, int action)
 
        args.ucAction = action;
 
-       if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
+       if (radeon_encoder->active_device & (ATOM_DEVICE_CRT_SUPPORT))
                args.ucDacStandard = ATOM_DAC1_PS2;
-       else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+       else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                args.ucDacStandard = ATOM_DAC1_CV;
        else {
                switch (tv_std) {
@@ -279,16 +299,19 @@ atombios_tv_setup(struct drm_encoder *encoder, int action)
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        TV_ENCODER_CONTROL_PS_ALLOCATION args;
        int index = 0;
-       /* fixme - fill in enc_priv for atom dac */
+       struct radeon_encoder_atom_dac *dac_info = radeon_encoder->enc_priv;
        enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+       if (dac_info->tv_std)
+               tv_std = dac_info->tv_std;
+
        memset(&args, 0, sizeof(args));
 
        index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl);
 
        args.sTVEncoder.ucAction = action;
 
-       if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+       if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                args.sTVEncoder.ucTvStandard = ATOM_TV_CV;
        else {
                switch (tv_std) {
@@ -520,6 +543,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
 
        switch (connector->connector_type) {
        case DRM_MODE_CONNECTOR_DVII:
+       case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
                if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr))
                        return ATOM_ENCODER_MODE_HDMI;
                else if (radeon_connector->use_digital)
@@ -529,7 +553,6 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                break;
        case DRM_MODE_CONNECTOR_DVID:
        case DRM_MODE_CONNECTOR_HDMIA:
-       case DRM_MODE_CONNECTOR_HDMIB:
        default:
                if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr))
                        return ATOM_ENCODER_MODE_HDMI;
@@ -825,10 +848,10 @@ atombios_yuv_setup(struct drm_encoder *encoder, bool enable)
 
        /* XXX: fix up scratch reg handling */
        temp = RREG32(reg);
-       if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+       if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                WREG32(reg, (ATOM_S3_TV1_ACTIVE |
                             (radeon_crtc->crtc_id << 18)));
-       else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+       else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                WREG32(reg, (ATOM_S3_CV_ACTIVE | (radeon_crtc->crtc_id << 24)));
        else
                WREG32(reg, 0);
@@ -851,9 +874,19 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
        DISPLAY_DEVICE_OUTPUT_CONTROL_PS_ALLOCATION args;
        int index = 0;
        bool is_dig = false;
+       int devices;
 
        memset(&args, 0, sizeof(args));
 
+       /* on DPMS off we have no idea if active device is meaningful */
+       if (mode != DRM_MODE_DPMS_ON && !radeon_encoder->active_device)
+               devices = radeon_encoder->devices;
+       else
+               devices = radeon_encoder->active_device;
+
+       DRM_DEBUG("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",
+                 radeon_encoder->encoder_id, mode, radeon_encoder->devices,
+                 radeon_encoder->active_device);
        switch (radeon_encoder->encoder_id) {
        case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -881,18 +914,18 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
                break;
        case ENCODER_OBJECT_ID_INTERNAL_DAC1:
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
-               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+               if (devices & (ATOM_DEVICE_TV_SUPPORT))
                        index = GetIndexIntoMasterTable(COMMAND, TV1OutputControl);
-               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+               else if (devices & (ATOM_DEVICE_CV_SUPPORT))
                        index = GetIndexIntoMasterTable(COMMAND, CV1OutputControl);
                else
                        index = GetIndexIntoMasterTable(COMMAND, DAC1OutputControl);
                break;
        case ENCODER_OBJECT_ID_INTERNAL_DAC2:
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+               if (devices & (ATOM_DEVICE_TV_SUPPORT))
                        index = GetIndexIntoMasterTable(COMMAND, TV1OutputControl);
-               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+               else if (devices & (ATOM_DEVICE_CV_SUPPORT))
                        index = GetIndexIntoMasterTable(COMMAND, CV1OutputControl);
                else
                        index = GetIndexIntoMasterTable(COMMAND, DAC2OutputControl);
@@ -979,18 +1012,18 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
                                break;
                        case ENCODER_OBJECT_ID_INTERNAL_DAC1:
                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
-                               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+                               if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                        args.v1.ucDevice = ATOM_DEVICE_TV1_INDEX;
-                               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+                               else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                                        args.v1.ucDevice = ATOM_DEVICE_CV_INDEX;
                                else
                                        args.v1.ucDevice = ATOM_DEVICE_CRT1_INDEX;
                                break;
                        case ENCODER_OBJECT_ID_INTERNAL_DAC2:
                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-                               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+                               if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                        args.v1.ucDevice = ATOM_DEVICE_TV1_INDEX;
-                               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+                               else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                                        args.v1.ucDevice = ATOM_DEVICE_CV_INDEX;
                                else
                                        args.v1.ucDevice = ATOM_DEVICE_CRT2_INDEX;
@@ -1019,17 +1052,17 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
                                args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
                                break;
                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
-                               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+                               if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                        args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-                               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+                               else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                                        args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
                                else
                                        args.v2.ucEncoderID = ASIC_INT_DAC1_ENCODER_ID;
                                break;
                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-                               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+                               if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                        args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-                               else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+                               else if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
                                        args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
                                else
                                        args.v2.ucEncoderID = ASIC_INT_DAC2_ENCODER_ID;
@@ -1097,7 +1130,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
        atombios_set_encoder_crtc_source(encoder);
 
        if (ASIC_IS_AVIVO(rdev)) {
-               if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT))
+               if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT))
                        atombios_yuv_setup(encoder, true);
                else
                        atombios_yuv_setup(encoder, false);
@@ -1135,7 +1168,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
        case ENCODER_OBJECT_ID_INTERNAL_DAC2:
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
                atombios_dac_setup(encoder, ATOM_ENABLE);
-               if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
+               if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
                        atombios_tv_setup(encoder, ATOM_ENABLE);
                break;
        }
@@ -1143,11 +1176,12 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 }
 
 static bool
-atombios_dac_load_detect(struct drm_encoder *encoder)
+atombios_dac_load_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 {
        struct drm_device *dev = encoder->dev;
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 
        if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT |
                                       ATOM_DEVICE_CV_SUPPORT |
@@ -1168,15 +1202,15 @@ atombios_dac_load_detect(struct drm_encoder *encoder)
                else
                        args.sDacload.ucDacType = ATOM_DAC_B;
 
-               if (radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT)
+               if (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT)
                        args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT1_SUPPORT);
-               else if (radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT)
+               else if (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT)
                        args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT2_SUPPORT);
-               else if (radeon_encoder->devices & ATOM_DEVICE_CV_SUPPORT) {
+               else if (radeon_connector->devices & ATOM_DEVICE_CV_SUPPORT) {
                        args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT);
                        if (crev >= 3)
                                args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
-               } else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) {
+               } else if (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT) {
                        args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT);
                        if (crev >= 3)
                                args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
@@ -1195,9 +1229,10 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec
        struct drm_device *dev = encoder->dev;
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_connector *radeon_connector = to_radeon_connector(connector);
        uint32_t bios_0_scratch;
 
-       if (!atombios_dac_load_detect(encoder)) {
+       if (!atombios_dac_load_detect(encoder, connector)) {
                DRM_DEBUG("detect returned false \n");
                return connector_status_unknown;
        }
@@ -1207,17 +1242,20 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec
        else
                bios_0_scratch = RREG32(RADEON_BIOS_0_SCRATCH);
 
-       DRM_DEBUG("Bios 0 scratch %x\n", bios_0_scratch);
-       if (radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT) {
+       DRM_DEBUG("Bios 0 scratch %x %08x\n", bios_0_scratch, radeon_encoder->devices);
+       if (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT) {
                if (bios_0_scratch & ATOM_S0_CRT1_MASK)
                        return connector_status_connected;
-       } else if (radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT) {
+       }
+       if (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT) {
                if (bios_0_scratch & ATOM_S0_CRT2_MASK)
                        return connector_status_connected;
-       } else if (radeon_encoder->devices & ATOM_DEVICE_CV_SUPPORT) {
+       }
+       if (radeon_connector->devices & ATOM_DEVICE_CV_SUPPORT) {
                if (bios_0_scratch & (ATOM_S0_CV_MASK|ATOM_S0_CV_MASK_A))
                        return connector_status_connected;
-       } else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) {
+       }
+       if (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT) {
                if (bios_0_scratch & (ATOM_S0_TV1_COMPOSITE | ATOM_S0_TV1_COMPOSITE_A))
                        return connector_status_connected; /* CTV */
                else if (bios_0_scratch & (ATOM_S0_TV1_SVIDEO | ATOM_S0_TV1_SVIDEO_A))
@@ -1230,6 +1268,8 @@ static void radeon_atom_encoder_prepare(struct drm_encoder *encoder)
 {
        radeon_atom_output_lock(encoder, true);
        radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_atom_encoder_commit(struct drm_encoder *encoder)
@@ -1238,12 +1278,20 @@ static void radeon_atom_encoder_commit(struct drm_encoder *encoder)
        radeon_atom_output_lock(encoder, false);
 }
 
+static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder->active_device = 0;
+}
+
 static const struct drm_encoder_helper_funcs radeon_atom_dig_helper_funcs = {
        .dpms = radeon_atom_encoder_dpms,
        .mode_fixup = radeon_atom_mode_fixup,
        .prepare = radeon_atom_encoder_prepare,
        .mode_set = radeon_atom_encoder_mode_set,
        .commit = radeon_atom_encoder_commit,
+       .disable = radeon_atom_encoder_disable,
        /* no detect for TMDS/LVDS yet */
 };
 
@@ -1268,6 +1316,18 @@ static const struct drm_encoder_funcs radeon_atom_enc_funcs = {
        .destroy = radeon_enc_destroy,
 };
 
+struct radeon_encoder_atom_dac *
+radeon_atombios_set_dac_info(struct radeon_encoder *radeon_encoder)
+{
+       struct radeon_encoder_atom_dac *dac = kzalloc(sizeof(struct radeon_encoder_atom_dac), GFP_KERNEL);
+
+       if (!dac)
+               return NULL;
+
+       dac->tv_std = TV_STD_NTSC;
+       return dac;
+}
+
 struct radeon_encoder_atom_dig *
 radeon_atombios_set_dig_info(struct radeon_encoder *radeon_encoder)
 {
@@ -1336,6 +1396,7 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
                drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TVDAC);
+               radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder);
                drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs);
                break;
        case ENCODER_OBJECT_ID_INTERNAL_DVO1:
@@ -1345,8 +1406,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
-               drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
-               radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
+               if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
+                       radeon_encoder->rmx_type = RMX_FULL;
+                       drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);
+                       radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
+               } else {
+                       drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
+                       radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
+               }
                drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
                break;
        }
index ec383ed..944e4fa 100644 (file)
      */
 
 #include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
 #include <linux/fb.h>
-#include <linux/init.h>
 
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
 #include "radeon.h"
 
+#include "drm_fb_helper.h"
+
 struct radeon_fb_device {
-       struct radeon_device            *rdev;
-       struct drm_display_mode         *mode;
+       struct drm_fb_helper helper;
        struct radeon_framebuffer       *rfb;
-       int                             crtc_count;
-       /* crtc currently bound to this */
-       uint32_t                        crtc_ids[2];
+       struct radeon_device            *rdev;
 };
 
-static int radeonfb_setcolreg(unsigned regno,
-                             unsigned red,
-                             unsigned green,
-                             unsigned blue,
-                             unsigned transp,
-                             struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-               struct drm_mode_set *modeset = &radeon_crtc->mode_set;
-               struct drm_framebuffer *fb = modeset->fb;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-               if (regno > 255) {
-                       return 1;
-               }
-               if (fb->depth == 8) {
-                       radeon_crtc_fb_gamma_set(crtc, red, green, blue, regno);
-                       return 0;
-               }
-
-               if (regno < 16) {
-                       switch (fb->depth) {
-                       case 15:
-                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
-                                       ((green & 0xf800) >>  6) |
-                                       ((blue & 0xf800) >> 11);
-                               break;
-                       case 16:
-                               fb->pseudo_palette[regno] = (red & 0xf800) |
-                                       ((green & 0xfc00) >>  5) |
-                                       ((blue  & 0xf800) >> 11);
-                               break;
-                       case 24:
-                       case 32:
-                               fb->pseudo_palette[regno] =
-                                       (((red >> 8) & 0xff) << info->var.red.offset) |
-                                       (((green >> 8) & 0xff) << info->var.green.offset) |
-                                       (((blue >> 8) & 0xff) << info->var.blue.offset);
-                               break;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int radeonfb_check_var(struct fb_var_screeninfo *var,
-                             struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct radeon_framebuffer *rfb = rfbdev->rfb;
-       struct drm_framebuffer *fb = &rfb->base;
-       int depth;
-
-       if (var->pixclock == -1 || !var->pixclock) {
-               return -EINVAL;
-       }
-       /* Need to resize the fb object !!! */
-       if (var->xres > fb->width || var->yres > fb->height) {
-               DRM_ERROR("Requested width/height is greater than current fb "
-                          "object %dx%d > %dx%d\n", var->xres, var->yres,
-                          fb->width, fb->height);
-               DRM_ERROR("Need resizing code.\n");
-               return -EINVAL;
-       }
-
-       switch (var->bits_per_pixel) {
-       case 16:
-               depth = (var->green.length == 6) ? 16 : 15;
-               break;
-       case 32:
-               depth = (var->transp.length > 0) ? 32 : 24;
-               break;
-       default:
-               depth = var->bits_per_pixel;
-               break;
-       }
-
-       switch (depth) {
-       case 8:
-               var->red.offset = 0;
-               var->green.offset = 0;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-#ifdef __LITTLE_ENDIAN
-       case 15:
-               var->red.offset = 10;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 5;
-               var->blue.length = 5;
-               var->transp.length = 1;
-               var->transp.offset = 15;
-               break;
-       case 16:
-               var->red.offset = 11;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 6;
-               var->blue.length = 5;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 24:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 24;
-               break;
-#else
-       case 24:
-               var->red.offset = 8;
-               var->green.offset = 16;
-               var->blue.offset = 24;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 8;
-               var->green.offset = 16;
-               var->blue.offset = 24;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 0;
-               break;
-#endif
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-/* this will let fbcon do the mode init */
-static int radeonfb_set_par(struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct fb_var_screeninfo *var = &info->var;
-       struct drm_crtc *crtc;
-       int ret;
-       int i;
-
-       if (var->pixclock != -1) {
-               DRM_ERROR("PIXEL CLCOK SET\n");
-               return -EINVAL;
-       }
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-               if (crtc->fb == radeon_crtc->mode_set.fb) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(&radeon_crtc->mode_set);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (ret) {
-                               return ret;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int radeonfb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_mode_set *modeset;
-       struct drm_crtc *crtc;
-       struct radeon_crtc *radeon_crtc;
-       int ret = 0;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-
-               radeon_crtc = to_radeon_crtc(crtc);
-               modeset = &radeon_crtc->mode_set;
-
-               modeset->x = var->xoffset;
-               modeset->y = var->yoffset;
-
-               if (modeset->num_connectors) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(modeset);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (!ret) {
-                               info->var.xoffset = var->xoffset;
-                               info->var.yoffset = var->yoffset;
-                       }
-               }
-       }
-       return ret;
-}
-
-static void radeonfb_on(struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               mutex_lock(&dev->mode_config.mutex);
-               crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-               mutex_unlock(&dev->mode_config.mutex);
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-
-                               encoder_funcs = encoder->helper_private;
-                               mutex_lock(&dev->mode_config.mutex);
-                               encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-                               mutex_unlock(&dev->mode_config.mutex);
-                       }
-               }
-       }
-}
-
-static void radeonfb_off(struct fb_info *info, int dpms_mode)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-
-                               encoder_funcs = encoder->helper_private;
-                               mutex_lock(&dev->mode_config.mutex);
-                               encoder_funcs->dpms(encoder, dpms_mode);
-                               mutex_unlock(&dev->mode_config.mutex);
-                       }
-               }
-               if (dpms_mode == DRM_MODE_DPMS_OFF) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       crtc_funcs->dpms(crtc, dpms_mode);
-                       mutex_unlock(&dev->mode_config.mutex);
-               }
-       }
-}
-
-int radeonfb_blank(int blank, struct fb_info *info)
-{
-       switch (blank) {
-       case FB_BLANK_UNBLANK:
-               radeonfb_on(info);
-               break;
-       case FB_BLANK_NORMAL:
-               radeonfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_HSYNC_SUSPEND:
-               radeonfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-               radeonfb_off(info, DRM_MODE_DPMS_SUSPEND);
-               break;
-       case FB_BLANK_POWERDOWN:
-               radeonfb_off(info, DRM_MODE_DPMS_OFF);
-               break;
-       }
-       return 0;
-}
-
 static struct fb_ops radeonfb_ops = {
        .owner = THIS_MODULE,
-       .fb_check_var = radeonfb_check_var,
-       .fb_set_par = radeonfb_set_par,
-       .fb_setcolreg = radeonfb_setcolreg,
+       .fb_check_var = drm_fb_helper_check_var,
+       .fb_set_par = drm_fb_helper_set_par,
+       .fb_setcolreg = drm_fb_helper_setcolreg,
        .fb_fillrect = cfb_fillrect,
        .fb_copyarea = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_pan_display = radeonfb_pan_display,
-       .fb_blank = radeonfb_blank,
+       .fb_pan_display = drm_fb_helper_pan_display,
+       .fb_blank = drm_fb_helper_blank,
 };
 
 /**
@@ -456,21 +97,6 @@ int radeonfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(radeonfb_resize);
 
-static struct drm_mode_set panic_mode;
-
-int radeonfb_panic(struct notifier_block *n, unsigned long ununsed,
-                 void *panic_str)
-{
-       DRM_ERROR("panic occurred, switching back to text console\n");
-       drm_crtc_helper_set_config(&panic_mode);
-       return 0;
-}
-EXPORT_SYMBOL(radeonfb_panic);
-
-static struct notifier_block paniced = {
-       .notifier_call = radeonfb_panic,
-};
-
 static int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
 {
        int aligned = width;
@@ -495,11 +121,16 @@ static int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bo
        return aligned;
 }
 
-int radeonfb_create(struct radeon_device *rdev,
+static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
+       .gamma_set = radeon_crtc_fb_gamma_set,
+};
+
+int radeonfb_create(struct drm_device *dev,
                    uint32_t fb_width, uint32_t fb_height,
                    uint32_t surface_width, uint32_t surface_height,
-                   struct radeon_framebuffer **rfb_p)
+                   struct drm_framebuffer **fb_p)
 {
+       struct radeon_device *rdev = dev->dev_private;
        struct fb_info *info;
        struct radeon_fb_device *rfbdev;
        struct drm_framebuffer *fb = NULL;
@@ -513,6 +144,7 @@ int radeonfb_create(struct radeon_device *rdev,
        void *fbptr = NULL;
        unsigned long tmp;
        bool fb_tiled = false; /* useful for testing */
+       u32 tiling_flags = 0;
 
        mode_cmd.width = surface_width;
        mode_cmd.height = surface_height;
@@ -537,7 +169,22 @@ int radeonfb_create(struct radeon_device *rdev,
        robj = gobj->driver_private;
 
        if (fb_tiled)
-               radeon_object_set_tiling_flags(robj, RADEON_TILING_MACRO|RADEON_TILING_SURFACE, mode_cmd.pitch);
+               tiling_flags = RADEON_TILING_MACRO;
+
+#ifdef __BIG_ENDIAN
+       switch (mode_cmd.bpp) {
+       case 32:
+               tiling_flags |= RADEON_TILING_SWAP_32BIT;
+               break;
+       case 16:
+               tiling_flags |= RADEON_TILING_SWAP_16BIT;
+       default:
+               break;
+       }
+#endif
+
+       if (tiling_flags)
+               radeon_object_set_tiling_flags(robj, tiling_flags | RADEON_TILING_SURFACE, mode_cmd.pitch);
        mutex_lock(&rdev->ddev->struct_mutex);
        fb = radeon_framebuffer_create(rdev->ddev, &mode_cmd, gobj);
        if (fb == NULL) {
@@ -554,8 +201,8 @@ int radeonfb_create(struct radeon_device *rdev,
 
        list_add(&fb->filp_head, &rdev->ddev->mode_config.fb_kernel_list);
 
+       *fb_p = fb;
        rfb = to_radeon_framebuffer(fb);
-       *rfb_p = rfb;
        rdev->fbdev_rfb = rfb;
        rdev->fbdev_robj = robj;
 
@@ -564,7 +211,15 @@ int radeonfb_create(struct radeon_device *rdev,
                ret = -ENOMEM;
                goto out_unref;
        }
+
+       rdev->fbdev_info = info;
        rfbdev = info->par;
+       rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+       rfbdev->helper.dev = dev;
+       ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, 2,
+                                           RADEONFB_CONN_LIMIT);
+       if (ret)
+               goto out_unref;
 
        if (fb_tiled)
                radeon_object_check_tiling(robj, 0, 0);
@@ -577,33 +232,19 @@ int radeonfb_create(struct radeon_device *rdev,
        memset_io(fbptr, 0, aligned_size);
 
        strcpy(info->fix.id, "radeondrmfb");
-       info->fix.type = FB_TYPE_PACKED_PIXELS;
-       info->fix.visual = FB_VISUAL_TRUECOLOR;
-       info->fix.type_aux = 0;
-       info->fix.xpanstep = 1; /* doing it in hw */
-       info->fix.ypanstep = 1; /* doing it in hw */
-       info->fix.ywrapstep = 0;
-       info->fix.accel = FB_ACCEL_NONE;
-       info->fix.type_aux = 0;
+
+       drm_fb_helper_fill_fix(info, fb->pitch);
+
        info->flags = FBINFO_DEFAULT;
        info->fbops = &radeonfb_ops;
-       info->fix.line_length = fb->pitch;
+
        tmp = fb_gpuaddr - rdev->mc.vram_location;
        info->fix.smem_start = rdev->mc.aper_base + tmp;
        info->fix.smem_len = size;
        info->screen_base = fbptr;
        info->screen_size = size;
-       info->pseudo_palette = fb->pseudo_palette;
-       info->var.xres_virtual = fb->width;
-       info->var.yres_virtual = fb->height;
-       info->var.bits_per_pixel = fb->bits_per_pixel;
-       info->var.xoffset = 0;
-       info->var.yoffset = 0;
-       info->var.activate = FB_ACTIVATE_NOW;
-       info->var.height = -1;
-       info->var.width = -1;
-       info->var.xres = fb_width;
-       info->var.yres = fb_height;
+
+       drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
 
        /* setup aperture base/size for vesafb takeover */
        info->aperture_base = rdev->ddev->mode_config.fb_base;
@@ -626,83 +267,6 @@ int radeonfb_create(struct radeon_device *rdev,
        DRM_INFO("fb depth is %d\n", fb->depth);
        DRM_INFO("   pitch is %d\n", fb->pitch);
 
-       switch (fb->depth) {
-       case 8:
-               info->var.red.offset = 0;
-               info->var.green.offset = 0;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8; /* 8bit DAC */
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-#ifdef __LITTLE_ENDIAN
-       case 15:
-               info->var.red.offset = 10;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 5;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 15;
-               info->var.transp.length = 1;
-               break;
-       case 16:
-               info->var.red.offset = 11;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 6;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 0;
-               break;
-       case 24:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 32:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 24;
-               info->var.transp.length = 8;
-               break;
-#else
-       case 24:
-               info->var.red.offset = 8;
-               info->var.green.offset = 16;
-               info->var.blue.offset = 24;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 32:
-               info->var.red.offset = 8;
-               info->var.green.offset = 16;
-               info->var.blue.offset = 24;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 8;
-               break;
-       default:
-#endif
-               break;
-       }
-
        fb->fbdev = info;
        rfbdev->rfb = rfb;
        rfbdev->rdev = rdev;
@@ -726,145 +290,10 @@ out:
        return ret;
 }
 
-static int radeonfb_single_fb_probe(struct radeon_device *rdev)
-{
-       struct drm_crtc *crtc;
-       struct drm_connector *connector;
-       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
-       unsigned int surface_width = 0, surface_height = 0;
-       int new_fb = 0;
-       int crtc_count = 0;
-       int ret, i, conn_count = 0;
-       struct radeon_framebuffer *rfb;
-       struct fb_info *info;
-       struct radeon_fb_device *rfbdev;
-       struct drm_mode_set *modeset = NULL;
-
-       /* first up get a count of crtcs now in use and new min/maxes width/heights */
-       list_for_each_entry(crtc, &rdev->ddev->mode_config.crtc_list, head) {
-               if (drm_helper_crtc_in_use(crtc)) {
-                       if (crtc->desired_mode) {
-                               if (crtc->desired_mode->hdisplay < fb_width)
-                                       fb_width = crtc->desired_mode->hdisplay;
-
-                               if (crtc->desired_mode->vdisplay < fb_height)
-                                       fb_height = crtc->desired_mode->vdisplay;
-
-                               if (crtc->desired_mode->hdisplay > surface_width)
-                                       surface_width = crtc->desired_mode->hdisplay;
-
-                               if (crtc->desired_mode->vdisplay > surface_height)
-                                       surface_height = crtc->desired_mode->vdisplay;
-                       }
-                       crtc_count++;
-               }
-       }
-
-       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
-               /* hmm everyone went away - assume VGA cable just fell out
-                  and will come back later. */
-               return 0;
-       }
-
-       /* do we have an fb already? */
-       if (list_empty(&rdev->ddev->mode_config.fb_kernel_list)) {
-               /* create an fb if we don't have one */
-               ret = radeonfb_create(rdev, fb_width, fb_height, surface_width, surface_height, &rfb);
-               if (ret) {
-                       return -EINVAL;
-               }
-               new_fb = 1;
-       } else {
-               struct drm_framebuffer *fb;
-               fb = list_first_entry(&rdev->ddev->mode_config.fb_kernel_list, struct drm_framebuffer, filp_head);
-               rfb = to_radeon_framebuffer(fb);
-
-               /* if someone hotplugs something bigger than we have already allocated, we are pwned.
-                  As really we can't resize an fbdev that is in the wild currently due to fbdev
-                  not really being designed for the lower layers moving stuff around under it.
-                  - so in the grand style of things - punt. */
-               if ((fb->width < surface_width) || (fb->height < surface_height)) {
-                       DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
-                       return -EINVAL;
-               }
-       }
-
-       info = rfb->base.fbdev;
-       rdev->fbdev_info = info;
-       rfbdev = info->par;
-
-       crtc_count = 0;
-       /* okay we need to setup new connector sets in the crtcs */
-       list_for_each_entry(crtc, &rdev->ddev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-               modeset = &radeon_crtc->mode_set;
-               modeset->fb = &rfb->base;
-               conn_count = 0;
-               list_for_each_entry(connector, &rdev->ddev->mode_config.connector_list, head) {
-                       if (connector->encoder)
-                               if (connector->encoder->crtc == modeset->crtc) {
-                                       modeset->connectors[conn_count] = connector;
-                                       conn_count++;
-                                       if (conn_count > RADEONFB_CONN_LIMIT)
-                                               BUG();
-                               }
-               }
-
-               for (i = conn_count; i < RADEONFB_CONN_LIMIT; i++)
-                       modeset->connectors[i] = NULL;
-
-
-               rfbdev->crtc_ids[crtc_count++] = crtc->base.id;
-
-               modeset->num_connectors = conn_count;
-               if (modeset->crtc->desired_mode) {
-                       if (modeset->mode) {
-                               drm_mode_destroy(rdev->ddev, modeset->mode);
-                       }
-                       modeset->mode = drm_mode_duplicate(rdev->ddev,
-                                                          modeset->crtc->desired_mode);
-               }
-       }
-       rfbdev->crtc_count = crtc_count;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else {
-               radeonfb_set_par(info);
-       }
-       printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       panic_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       printk(KERN_INFO "registered panic notifier\n");
-
-       return 0;
-}
-
 int radeonfb_probe(struct drm_device *dev)
 {
        int ret;
-
-       /* something has changed in the lower levels of hell - deal with it
-          here */
-
-       /* two modes : a) 1 fb to rule all crtcs.
-                      b) one fb per crtc.
-          two actions 1) new connected device
-                      2) device removed.
-          case a/1 : if the fb surface isn't big enough - resize the surface fb.
-                     if the fb size isn't big enough - resize fb into surface.
-                     if everything big enough configure the new crtc/etc.
-          case a/2 : undo the configuration
-                     possibly resize down the fb to fit the new configuration.
-           case b/1 : see if it is on a new crtc - setup a new fb and add it.
-          case b/2 : teardown the new fb.
-       */
-       ret = radeonfb_single_fb_probe(dev->dev_private);
+       ret = drm_fb_helper_single_fb_probe(dev, &radeonfb_create);
        return ret;
 }
 EXPORT_SYMBOL(radeonfb_probe);
@@ -880,16 +309,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
        }
        info = fb->fbdev;
        if (info) {
+               struct radeon_fb_device *rfbdev = info->par;
                robj = rfb->obj->driver_private;
                unregister_framebuffer(info);
                radeon_object_kunmap(robj);
                radeon_object_unpin(robj);
+               drm_fb_helper_free(&rfbdev->helper);
                framebuffer_release(info);
        }
 
        printk(KERN_INFO "unregistered panic notifier\n");
-       atomic_notifier_chain_unregister(&panic_notifier_list, &paniced);
-       memset(&panic_mode, 0, sizeof(struct drm_mode_set));
+
        return 0;
 }
 EXPORT_SYMBOL(radeonfb_remove);
index b4e48dd..3beb26d 100644 (file)
@@ -53,9 +53,9 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
                 * away
                 */
                WREG32(rdev->fence_drv.scratch_reg, fence->seq);
-       } else {
+       } else
                radeon_fence_ring_emit(rdev, fence);
-       }
+
        fence->emited = true;
        fence->timeout = jiffies + ((2000 * HZ) / 1000);
        list_del(&fence->list);
@@ -168,7 +168,38 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
        return signaled;
 }
 
-int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+int r600_fence_wait(struct radeon_fence *fence,  bool intr, bool lazy)
+{
+       struct radeon_device *rdev;
+       int ret = 0;
+
+       rdev = fence->rdev;
+
+       __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
+
+       while (1) {
+               if (radeon_fence_signaled(fence))
+                       break;
+
+               if (time_after_eq(jiffies, fence->timeout)) {
+                       ret = -EBUSY;
+                       break;
+               }
+
+               if (lazy)
+                       schedule_timeout(1);
+
+               if (intr && signal_pending(current)) {
+                       ret = -ERESTARTSYS;
+                       break;
+               }
+       }
+       __set_current_state(TASK_RUNNING);
+       return ret;
+}
+
+
+int radeon_fence_wait(struct radeon_fence *fence, bool intr)
 {
        struct radeon_device *rdev;
        unsigned long cur_jiffies;
@@ -176,7 +207,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
        bool expired = false;
        int r;
 
-
        if (fence == NULL) {
                WARN(1, "Querying an invalid fence : %p !\n", fence);
                return 0;
@@ -185,13 +215,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
        if (radeon_fence_signaled(fence)) {
                return 0;
        }
+
+       if (rdev->family >= CHIP_R600) {
+               r = r600_fence_wait(fence, intr, 0);
+               if (r == -ERESTARTSYS)
+                       return -EBUSY;
+               return r;
+       }
+
 retry:
        cur_jiffies = jiffies;
        timeout = HZ / 100;
        if (time_after(fence->timeout, cur_jiffies)) {
                timeout = fence->timeout - cur_jiffies;
        }
-       if (interruptible) {
+
+       if (intr) {
                r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
                                radeon_fence_signaled(fence), timeout);
                if (unlikely(r == -ERESTARTSYS)) {
index 2977539..a931af0 100644 (file)
@@ -75,7 +75,6 @@ void radeon_gart_table_ram_free(struct radeon_device *rdev)
 
 int radeon_gart_table_vram_alloc(struct radeon_device *rdev)
 {
-       uint64_t gpu_addr;
        int r;
 
        if (rdev->gart.table.vram.robj == NULL) {
@@ -88,6 +87,14 @@ int radeon_gart_table_vram_alloc(struct radeon_device *rdev)
                        return r;
                }
        }
+       return 0;
+}
+
+int radeon_gart_table_vram_pin(struct radeon_device *rdev)
+{
+       uint64_t gpu_addr;
+       int r;
+
        r = radeon_object_pin(rdev->gart.table.vram.robj,
                              RADEON_GEM_DOMAIN_VRAM, &gpu_addr);
        if (r) {
index 56decda..a1bf11d 100644 (file)
@@ -422,3 +422,18 @@ long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
        return ret;
 }
+
+long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+       unsigned int nr = DRM_IOCTL_NR(cmd);
+       int ret;
+
+       if (nr < DRM_COMMAND_BASE)
+               return drm_compat_ioctl(filp, cmd, arg);
+
+       lock_kernel();          /* XXX for now */
+       ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
+       unlock_kernel();
+
+       return ret;
+}
index 9836c70..b79ecc4 100644 (file)
@@ -188,6 +188,9 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
        u32 stat;
        u32 r500_disp_int;
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return IRQ_NONE;
+
        /* Only consider the bits we're interested in - others could be used
         * outside the DRM
         */
@@ -286,6 +289,9 @@ int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_pr
        drm_radeon_irq_emit_t *emit = data;
        int result;
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return -EINVAL;
+
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
        if (!dev_priv) {
@@ -315,6 +321,9 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr
                return -EINVAL;
        }
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return -EINVAL;
+
        return radeon_wait_irq(dev, irqwait->irq_seq);
 }
 
@@ -326,6 +335,9 @@ void radeon_driver_irq_preinstall(struct drm_device * dev)
            (drm_radeon_private_t *) dev->dev_private;
        u32 dummy;
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return;
+
        /* Disable *all* interrupts */
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
                RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
@@ -345,6 +357,9 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
 
        dev->max_vblank_count = 0x001fffff;
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return 0;
+
        radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
 
        return 0;
@@ -357,6 +372,9 @@ void radeon_driver_irq_uninstall(struct drm_device * dev)
        if (!dev_priv)
                return;
 
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               return;
+
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
                RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
        /* Disable *all* interrupts */
index 9805e4b..1841145 100644 (file)
@@ -28,7 +28,6 @@
 #include "drmP.h"
 #include "radeon_drm.h"
 #include "radeon_reg.h"
-#include "radeon_microcode.h"
 #include "radeon.h"
 #include "atom.h"
 
index dce09ad..709bd89 100644 (file)
@@ -54,12 +54,23 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
                flags |= RADEON_IS_PCI;
        }
 
+       /* radeon_device_init should report only fatal error
+        * like memory allocation failure or iomapping failure,
+        * or memory manager initialization failure, it must
+        * properly initialize the GPU MC controller and permit
+        * VRAM allocation
+        */
        r = radeon_device_init(rdev, dev, dev->pdev, flags);
        if (r) {
-               DRM_ERROR("Failed to initialize radeon, disabling IOCTL\n");
-               radeon_device_fini(rdev);
-               kfree(rdev);
-               dev->dev_private = NULL;
+               DRM_ERROR("Fatal error while trying to initialize radeon.\n");
+               return r;
+       }
+       /* Again modeset_init should fail only on fatal error
+        * otherwise it should provide enough functionalities
+        * for shadowfb to run
+        */
+       r = radeon_modeset_init(rdev);
+       if (r) {
                return r;
        }
        return 0;
@@ -69,6 +80,9 @@ int radeon_driver_unload_kms(struct drm_device *dev)
 {
        struct radeon_device *rdev = dev->dev_private;
 
+       if (rdev == NULL)
+               return 0;
+       radeon_modeset_fini(rdev);
        radeon_device_fini(rdev);
        kfree(rdev);
        dev->dev_private = NULL;
@@ -98,6 +112,9 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
        case RADEON_INFO_NUM_Z_PIPES:
                value = rdev->num_z_pipes;
                break;
+       case RADEON_INFO_ACCEL_WORKING:
+               value = rdev->accel_working;
+               break;
        default:
                DRM_DEBUG("Invalid request %d\n", info->request);
                return -EINVAL;
index 0da72f1..2b997a1 100644 (file)
@@ -28,6 +28,7 @@
 #include <drm/radeon_drm.h>
 #include "radeon_fixed.h"
 #include "radeon.h"
+#include "atom.h"
 
 static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
                                       struct drm_display_mode *mode,
@@ -340,6 +341,9 @@ void radeon_legacy_atom_set_surface(struct drm_crtc *crtc)
        uint32_t crtc_pitch;
 
        switch (crtc->fb->bits_per_pixel) {
+       case 8:
+               format = 2;
+               break;
        case 15:      /*  555 */
                format = 3;
                break;
@@ -400,11 +404,33 @@ int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        uint32_t crtc_offset, crtc_offset_cntl, crtc_tile_x0_y0 = 0;
        uint32_t crtc_pitch, pitch_pixels;
        uint32_t tiling_flags;
+       int format;
+       uint32_t gen_cntl_reg, gen_cntl_val;
 
        DRM_DEBUG("\n");
 
        radeon_fb = to_radeon_framebuffer(crtc->fb);
 
+       switch (crtc->fb->bits_per_pixel) {
+       case 8:
+               format = 2;
+               break;
+       case 15:      /*  555 */
+               format = 3;
+               break;
+       case 16:      /*  565 */
+               format = 4;
+               break;
+       case 24:      /*  RGB */
+               format = 5;
+               break;
+       case 32:      /* xRGB */
+               format = 6;
+               break;
+       default:
+               return false;
+       }
+
        obj = radeon_fb->obj;
        if (radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &base)) {
                return -EINVAL;
@@ -457,6 +483,9 @@ int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        } else {
                int offset = y * pitch_pixels + x;
                switch (crtc->fb->bits_per_pixel) {
+               case 8:
+                       offset *= 1;
+                       break;
                case 15:
                case 16:
                        offset *= 2;
@@ -475,6 +504,16 @@ int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
 
        base &= ~7;
 
+       if (radeon_crtc->crtc_id == 1)
+               gen_cntl_reg = RADEON_CRTC2_GEN_CNTL;
+       else
+               gen_cntl_reg = RADEON_CRTC_GEN_CNTL;
+
+       gen_cntl_val = RREG32(gen_cntl_reg);
+       gen_cntl_val &= ~(0xf << 8);
+       gen_cntl_val |= (format << 8);
+       WREG32(gen_cntl_reg, gen_cntl_val);
+
        crtc_offset = (u32)base;
 
        WREG32(RADEON_DISPLAY_BASE_ADDR + radeon_crtc->crtc_offset, radeon_crtc->legacy_display_base_addr);
@@ -501,6 +540,7 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
        struct drm_device *dev = crtc->dev;
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+       struct drm_encoder *encoder;
        int format;
        int hsync_start;
        int hsync_wid;
@@ -509,10 +549,24 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
        uint32_t crtc_h_sync_strt_wid;
        uint32_t crtc_v_total_disp;
        uint32_t crtc_v_sync_strt_wid;
+       bool is_tv = false;
 
        DRM_DEBUG("\n");
+       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+               if (encoder->crtc == crtc) {
+                       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+                       if (radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT) {
+                               is_tv = true;
+                               DRM_INFO("crtc %d is connected to a TV\n", radeon_crtc->crtc_id);
+                               break;
+                       }
+               }
+       }
 
        switch (crtc->fb->bits_per_pixel) {
+       case 8:
+               format = 2;
+               break;
        case 15:      /*  555 */
                format = 3;
                break;
@@ -642,6 +696,11 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
                WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl);
        }
 
+       if (is_tv)
+               radeon_legacy_tv_adjust_crtc_reg(encoder, &crtc_h_total_disp,
+                                                &crtc_h_sync_strt_wid, &crtc_v_total_disp,
+                                                &crtc_v_sync_strt_wid);
+
        WREG32(RADEON_CRTC_H_TOTAL_DISP + radeon_crtc->crtc_offset, crtc_h_total_disp);
        WREG32(RADEON_CRTC_H_SYNC_STRT_WID + radeon_crtc->crtc_offset, crtc_h_sync_strt_wid);
        WREG32(RADEON_CRTC_V_TOTAL_DISP + radeon_crtc->crtc_offset, crtc_v_total_disp);
@@ -668,7 +727,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
        uint32_t pll_ref_div = 0;
        uint32_t pll_fb_post_div = 0;
        uint32_t htotal_cntl = 0;
-
+       bool is_tv = false;
        struct radeon_pll *pll;
 
        struct {
@@ -703,6 +762,13 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                if (encoder->crtc == crtc) {
+                       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+
+                       if (radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT) {
+                               is_tv = true;
+                               break;
+                       }
+
                        if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
                                pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
                        if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) {
@@ -766,6 +832,12 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                                          ~(RADEON_PIX2CLK_SRC_SEL_MASK)) |
                                         RADEON_PIX2CLK_SRC_SEL_P2PLLCLK);
 
+               if (is_tv) {
+                       radeon_legacy_tv_adjust_pll2(encoder, &htotal_cntl,
+                                                    &pll_ref_div, &pll_fb_post_div,
+                                                    &pixclks_cntl);
+               }
+
                WREG32_PLL_P(RADEON_PIXCLKS_CNTL,
                             RADEON_PIX2CLK_SRC_SEL_CPUCLK,
                             ~(RADEON_PIX2CLK_SRC_SEL_MASK));
@@ -820,6 +892,15 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 
                WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
        } else {
+               uint32_t pixclks_cntl;
+
+
+               if (is_tv) {
+                       pixclks_cntl = RREG32_PLL(RADEON_PIXCLKS_CNTL);
+                       radeon_legacy_tv_adjust_pll1(encoder, &htotal_cntl, &pll_ref_div,
+                                                    &pll_fb_post_div, &pixclks_cntl);
+               }
+
                if (rdev->flags & RADEON_IS_MOBILITY) {
                        /* A temporal workaround for the occational blanking on certain laptop panels.
                           This appears to related to the PLL divider registers (fail to lock?).
@@ -914,6 +995,8 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                             RADEON_VCLK_SRC_SEL_PPLLCLK,
                             ~(RADEON_VCLK_SRC_SEL_MASK));
 
+               if (is_tv)
+                       WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
        }
 }
 
index 9322675..b1547f7 100644 (file)
 #include "radeon.h"
 #include "atom.h"
 
+static void radeon_legacy_encoder_disable(struct drm_encoder *encoder)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct drm_encoder_helper_funcs *encoder_funcs;
+
+       encoder_funcs = encoder->helper_private;
+       encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder->active_device = 0;
+}
 
 static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
 {
@@ -98,6 +107,8 @@ static void radeon_legacy_lvds_prepare(struct drm_encoder *encoder)
        else
                radeon_combios_output_lock(encoder, true);
        radeon_legacy_lvds_dpms(encoder, DRM_MODE_DPMS_OFF);
+
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_legacy_lvds_commit(struct drm_encoder *encoder)
@@ -195,6 +206,7 @@ static const struct drm_encoder_helper_funcs radeon_legacy_lvds_helper_funcs = {
        .prepare = radeon_legacy_lvds_prepare,
        .mode_set = radeon_legacy_lvds_mode_set,
        .commit = radeon_legacy_lvds_commit,
+       .disable = radeon_legacy_encoder_disable,
 };
 
 
@@ -260,6 +272,7 @@ static void radeon_legacy_primary_dac_prepare(struct drm_encoder *encoder)
        else
                radeon_combios_output_lock(encoder, true);
        radeon_legacy_primary_dac_dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_legacy_primary_dac_commit(struct drm_encoder *encoder)
@@ -402,6 +415,7 @@ static const struct drm_encoder_helper_funcs radeon_legacy_primary_dac_helper_fu
        .mode_set = radeon_legacy_primary_dac_mode_set,
        .commit = radeon_legacy_primary_dac_commit,
        .detect = radeon_legacy_primary_dac_detect,
+       .disable = radeon_legacy_encoder_disable,
 };
 
 
@@ -454,6 +468,7 @@ static void radeon_legacy_tmds_int_prepare(struct drm_encoder *encoder)
        else
                radeon_combios_output_lock(encoder, true);
        radeon_legacy_tmds_int_dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_legacy_tmds_int_commit(struct drm_encoder *encoder)
@@ -566,6 +581,7 @@ static const struct drm_encoder_helper_funcs radeon_legacy_tmds_int_helper_funcs
        .prepare = radeon_legacy_tmds_int_prepare,
        .mode_set = radeon_legacy_tmds_int_mode_set,
        .commit = radeon_legacy_tmds_int_commit,
+       .disable = radeon_legacy_encoder_disable,
 };
 
 
@@ -620,6 +636,7 @@ static void radeon_legacy_tmds_ext_prepare(struct drm_encoder *encoder)
        else
                radeon_combios_output_lock(encoder, true);
        radeon_legacy_tmds_ext_dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_legacy_tmds_ext_commit(struct drm_encoder *encoder)
@@ -706,6 +723,7 @@ static const struct drm_encoder_helper_funcs radeon_legacy_tmds_ext_helper_funcs
        .prepare = radeon_legacy_tmds_ext_prepare,
        .mode_set = radeon_legacy_tmds_ext_mode_set,
        .commit = radeon_legacy_tmds_ext_commit,
+       .disable = radeon_legacy_encoder_disable,
 };
 
 
@@ -727,17 +745,21 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
 {
        struct drm_device *dev = encoder->dev;
        struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        uint32_t fp2_gen_cntl = 0, crtc2_gen_cntl = 0, tv_dac_cntl = 0;
-       /* uint32_t tv_master_cntl = 0; */
-
+       uint32_t tv_master_cntl = 0;
+       bool is_tv;
        DRM_DEBUG("\n");
 
+       is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
+
        if (rdev->family == CHIP_R200)
                fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
        else {
-               crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL);
-               /*  FIXME TV */
-               /* tv_master_cntl = RREG32(RADEON_TV_MASTER_CNTL); */
+               if (is_tv)
+                       tv_master_cntl = RREG32(RADEON_TV_MASTER_CNTL);
+               else
+                       crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL);
                tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL);
        }
 
@@ -746,20 +768,23 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
                if (rdev->family == CHIP_R200) {
                        fp2_gen_cntl |= (RADEON_FP2_ON | RADEON_FP2_DVO_EN);
                } else {
-                       crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON;
-                       /* tv_master_cntl |= RADEON_TV_ON; */
+                       if (is_tv)
+                               tv_master_cntl |= RADEON_TV_ON;
+                       else
+                               crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON;
+
                        if (rdev->family == CHIP_R420 ||
-                                       rdev->family == CHIP_R423 ||
-                                       rdev->family == CHIP_RV410)
+                           rdev->family == CHIP_R423 ||
+                           rdev->family == CHIP_RV410)
                                tv_dac_cntl &= ~(R420_TV_DAC_RDACPD |
-                                               R420_TV_DAC_GDACPD |
-                                               R420_TV_DAC_BDACPD |
-                                               RADEON_TV_DAC_BGSLEEP);
+                                                R420_TV_DAC_GDACPD |
+                                                R420_TV_DAC_BDACPD |
+                                                RADEON_TV_DAC_BGSLEEP);
                        else
                                tv_dac_cntl &= ~(RADEON_TV_DAC_RDACPD |
-                                               RADEON_TV_DAC_GDACPD |
-                                               RADEON_TV_DAC_BDACPD |
-                                               RADEON_TV_DAC_BGSLEEP);
+                                                RADEON_TV_DAC_GDACPD |
+                                                RADEON_TV_DAC_BDACPD |
+                                                RADEON_TV_DAC_BGSLEEP);
                }
                break;
        case DRM_MODE_DPMS_STANDBY:
@@ -768,8 +793,11 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
                if (rdev->family == CHIP_R200)
                        fp2_gen_cntl &= ~(RADEON_FP2_ON | RADEON_FP2_DVO_EN);
                else {
-                       crtc2_gen_cntl &= ~RADEON_CRTC2_CRT2_ON;
-                       /* tv_master_cntl &= ~RADEON_TV_ON; */
+                       if (is_tv)
+                               tv_master_cntl &= ~RADEON_TV_ON;
+                       else
+                               crtc2_gen_cntl &= ~RADEON_CRTC2_CRT2_ON;
+
                        if (rdev->family == CHIP_R420 ||
                                        rdev->family == CHIP_R423 ||
                                        rdev->family == CHIP_RV410)
@@ -789,8 +817,10 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
        if (rdev->family == CHIP_R200) {
                WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
        } else {
-               WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);
-               /* WREG32(RADEON_TV_MASTER_CNTL, tv_master_cntl); */
+               if (is_tv)
+                       WREG32(RADEON_TV_MASTER_CNTL, tv_master_cntl);
+               else
+                       WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);
                WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
        }
 
@@ -809,6 +839,7 @@ static void radeon_legacy_tv_dac_prepare(struct drm_encoder *encoder)
        else
                radeon_combios_output_lock(encoder, true);
        radeon_legacy_tv_dac_dpms(encoder, DRM_MODE_DPMS_OFF);
+       radeon_encoder_set_active_device(encoder);
 }
 
 static void radeon_legacy_tv_dac_commit(struct drm_encoder *encoder)
@@ -831,11 +862,15 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
        uint32_t tv_dac_cntl, gpiopad_a = 0, dac2_cntl, disp_output_cntl = 0;
-       uint32_t disp_hw_debug = 0, fp2_gen_cntl = 0;
+       uint32_t disp_hw_debug = 0, fp2_gen_cntl = 0, disp_tv_out_cntl = 0;
+       bool is_tv = false;
 
        DRM_DEBUG("\n");
 
+       is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
+
        if (rdev->family != CHIP_R200) {
                tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL);
                if (rdev->family == CHIP_R420 ||
@@ -858,7 +893,7 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
                }
 
                /*  FIXME TV */
-               if (radeon_encoder->enc_priv) {
+               if (tv_dac) {
                        struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
                        tv_dac_cntl |= (RADEON_TV_DAC_NBLANK |
                                        RADEON_TV_DAC_NHOLD |
@@ -875,44 +910,93 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
        if (ASIC_IS_R300(rdev)) {
                gpiopad_a = RREG32(RADEON_GPIOPAD_A) | 1;
                disp_output_cntl = RREG32(RADEON_DISP_OUTPUT_CNTL);
-       } else if (rdev->family == CHIP_R200)
-               fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
+       }
+
+       if (rdev->family == CHIP_R200 || ASIC_IS_R300(rdev))
+               disp_tv_out_cntl = RREG32(RADEON_DISP_TV_OUT_CNTL);
        else
                disp_hw_debug = RREG32(RADEON_DISP_HW_DEBUG);
 
-       dac2_cntl = RREG32(RADEON_DAC_CNTL2) | RADEON_DAC2_DAC2_CLK_SEL;
+       if (rdev->family == CHIP_R200)
+               fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
 
-       if (radeon_crtc->crtc_id == 0) {
-               if (ASIC_IS_R300(rdev)) {
-                       disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
-                       disp_output_cntl |= RADEON_DISP_TVDAC_SOURCE_CRTC;
-               } else if (rdev->family == CHIP_R200) {
-                       fp2_gen_cntl &= ~(R200_FP2_SOURCE_SEL_MASK |
-                                         RADEON_FP2_DVO_RATE_SEL_SDR);
-               } else
-                       disp_hw_debug |= RADEON_CRT2_DISP1_SEL;
+       if (is_tv) {
+               uint32_t dac_cntl;
+
+               dac_cntl = RREG32(RADEON_DAC_CNTL);
+               dac_cntl &= ~RADEON_DAC_TVO_EN;
+               WREG32(RADEON_DAC_CNTL, dac_cntl);
+
+               if (ASIC_IS_R300(rdev))
+                       gpiopad_a = RREG32(RADEON_GPIOPAD_A) & ~1;
+
+               dac2_cntl = RREG32(RADEON_DAC_CNTL2) & ~RADEON_DAC2_DAC2_CLK_SEL;
+               if (radeon_crtc->crtc_id == 0) {
+                       if (ASIC_IS_R300(rdev)) {
+                               disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
+                               disp_output_cntl |= (RADEON_DISP_TVDAC_SOURCE_CRTC |
+                                                    RADEON_DISP_TV_SOURCE_CRTC);
+                       }
+                       if (rdev->family >= CHIP_R200) {
+                               disp_tv_out_cntl &= ~RADEON_DISP_TV_PATH_SRC_CRTC2;
+                       } else {
+                               disp_hw_debug |= RADEON_CRT2_DISP1_SEL;
+                       }
+               } else {
+                       if (ASIC_IS_R300(rdev)) {
+                               disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
+                               disp_output_cntl |= RADEON_DISP_TV_SOURCE_CRTC;
+                       }
+                       if (rdev->family >= CHIP_R200) {
+                               disp_tv_out_cntl |= RADEON_DISP_TV_PATH_SRC_CRTC2;
+                       } else {
+                               disp_hw_debug &= ~RADEON_CRT2_DISP1_SEL;
+                       }
+               }
+               WREG32(RADEON_DAC_CNTL2, dac2_cntl);
        } else {
-               if (ASIC_IS_R300(rdev)) {
-                       disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
-                       disp_output_cntl |= RADEON_DISP_TVDAC_SOURCE_CRTC2;
-               } else if (rdev->family == CHIP_R200) {
-                       fp2_gen_cntl &= ~(R200_FP2_SOURCE_SEL_MASK |
-                                         RADEON_FP2_DVO_RATE_SEL_SDR);
-                       fp2_gen_cntl |= R200_FP2_SOURCE_SEL_CRTC2;
-               } else
-                       disp_hw_debug &= ~RADEON_CRT2_DISP1_SEL;
-       }
 
-       WREG32(RADEON_DAC_CNTL2, dac2_cntl);
+               dac2_cntl = RREG32(RADEON_DAC_CNTL2) | RADEON_DAC2_DAC2_CLK_SEL;
+
+               if (radeon_crtc->crtc_id == 0) {
+                       if (ASIC_IS_R300(rdev)) {
+                               disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
+                               disp_output_cntl |= RADEON_DISP_TVDAC_SOURCE_CRTC;
+                       } else if (rdev->family == CHIP_R200) {
+                               fp2_gen_cntl &= ~(R200_FP2_SOURCE_SEL_MASK |
+                                                 RADEON_FP2_DVO_RATE_SEL_SDR);
+                       } else
+                               disp_hw_debug |= RADEON_CRT2_DISP1_SEL;
+               } else {
+                       if (ASIC_IS_R300(rdev)) {
+                               disp_output_cntl &= ~RADEON_DISP_TVDAC_SOURCE_MASK;
+                               disp_output_cntl |= RADEON_DISP_TVDAC_SOURCE_CRTC2;
+                       } else if (rdev->family == CHIP_R200) {
+                               fp2_gen_cntl &= ~(R200_FP2_SOURCE_SEL_MASK |
+                                                 RADEON_FP2_DVO_RATE_SEL_SDR);
+                               fp2_gen_cntl |= R200_FP2_SOURCE_SEL_CRTC2;
+                       } else
+                               disp_hw_debug &= ~RADEON_CRT2_DISP1_SEL;
+               }
+               WREG32(RADEON_DAC_CNTL2, dac2_cntl);
+       }
 
        if (ASIC_IS_R300(rdev)) {
                WREG32_P(RADEON_GPIOPAD_A, gpiopad_a, ~1);
-               WREG32(RADEON_DISP_TV_OUT_CNTL, disp_output_cntl);
-       } else if (rdev->family == CHIP_R200)
-               WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
+               WREG32(RADEON_DISP_OUTPUT_CNTL, disp_output_cntl);
+       }
+
+       if (rdev->family >= CHIP_R200)
+               WREG32(RADEON_DISP_TV_OUT_CNTL, disp_tv_out_cntl);
        else
                WREG32(RADEON_DISP_HW_DEBUG, disp_hw_debug);
 
+       if (rdev->family == CHIP_R200)
+               WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
+
+       if (is_tv)
+               radeon_legacy_tv_mode_set(encoder, mode, adjusted_mode);
+
        if (rdev->is_atom_bios)
                radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
        else
@@ -920,6 +1004,141 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
 
 }
 
+static bool r300_legacy_tv_detect(struct drm_encoder *encoder,
+                                 struct drm_connector *connector)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t crtc2_gen_cntl, tv_dac_cntl, dac_cntl2, dac_ext_cntl;
+       uint32_t disp_output_cntl, gpiopad_a, tmp;
+       bool found = false;
+
+       /* save regs needed */
+       gpiopad_a = RREG32(RADEON_GPIOPAD_A);
+       dac_cntl2 = RREG32(RADEON_DAC_CNTL2);
+       crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL);
+       dac_ext_cntl = RREG32(RADEON_DAC_EXT_CNTL);
+       tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL);
+       disp_output_cntl = RREG32(RADEON_DISP_OUTPUT_CNTL);
+
+       WREG32_P(RADEON_GPIOPAD_A, 0, ~1);
+
+       WREG32(RADEON_DAC_CNTL2, RADEON_DAC2_DAC2_CLK_SEL);
+
+       WREG32(RADEON_CRTC2_GEN_CNTL,
+              RADEON_CRTC2_CRT2_ON | RADEON_CRTC2_VSYNC_TRISTAT);
+
+       tmp = disp_output_cntl & ~RADEON_DISP_TVDAC_SOURCE_MASK;
+       tmp |= RADEON_DISP_TVDAC_SOURCE_CRTC2;
+       WREG32(RADEON_DISP_OUTPUT_CNTL, tmp);
+
+       WREG32(RADEON_DAC_EXT_CNTL,
+              RADEON_DAC2_FORCE_BLANK_OFF_EN |
+              RADEON_DAC2_FORCE_DATA_EN |
+              RADEON_DAC_FORCE_DATA_SEL_RGB |
+              (0xec << RADEON_DAC_FORCE_DATA_SHIFT));
+
+       WREG32(RADEON_TV_DAC_CNTL,
+              RADEON_TV_DAC_STD_NTSC |
+              (8 << RADEON_TV_DAC_BGADJ_SHIFT) |
+              (6 << RADEON_TV_DAC_DACADJ_SHIFT));
+
+       RREG32(RADEON_TV_DAC_CNTL);
+       mdelay(4);
+
+       WREG32(RADEON_TV_DAC_CNTL,
+              RADEON_TV_DAC_NBLANK |
+              RADEON_TV_DAC_NHOLD |
+              RADEON_TV_MONITOR_DETECT_EN |
+              RADEON_TV_DAC_STD_NTSC |
+              (8 << RADEON_TV_DAC_BGADJ_SHIFT) |
+              (6 << RADEON_TV_DAC_DACADJ_SHIFT));
+
+       RREG32(RADEON_TV_DAC_CNTL);
+       mdelay(6);
+
+       tmp = RREG32(RADEON_TV_DAC_CNTL);
+       if ((tmp & RADEON_TV_DAC_GDACDET) != 0) {
+               found = true;
+               DRM_DEBUG("S-video TV connection detected\n");
+       } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
+               found = true;
+               DRM_DEBUG("Composite TV connection detected\n");
+       }
+
+       WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
+       WREG32(RADEON_DAC_EXT_CNTL, dac_ext_cntl);
+       WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);
+       WREG32(RADEON_DISP_OUTPUT_CNTL, disp_output_cntl);
+       WREG32(RADEON_DAC_CNTL2, dac_cntl2);
+       WREG32_P(RADEON_GPIOPAD_A, gpiopad_a, ~1);
+       return found;
+}
+
+static bool radeon_legacy_tv_detect(struct drm_encoder *encoder,
+                                   struct drm_connector *connector)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t tv_dac_cntl, dac_cntl2;
+       uint32_t config_cntl, tv_pre_dac_mux_cntl, tv_master_cntl, tmp;
+       bool found = false;
+
+       if (ASIC_IS_R300(rdev))
+               return r300_legacy_tv_detect(encoder, connector);
+
+       dac_cntl2 = RREG32(RADEON_DAC_CNTL2);
+       tv_master_cntl = RREG32(RADEON_TV_MASTER_CNTL);
+       tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL);
+       config_cntl = RREG32(RADEON_CONFIG_CNTL);
+       tv_pre_dac_mux_cntl = RREG32(RADEON_TV_PRE_DAC_MUX_CNTL);
+
+       tmp = dac_cntl2 & ~RADEON_DAC2_DAC2_CLK_SEL;
+       WREG32(RADEON_DAC_CNTL2, tmp);
+
+       tmp = tv_master_cntl | RADEON_TV_ON;
+       tmp &= ~(RADEON_TV_ASYNC_RST |
+                RADEON_RESTART_PHASE_FIX |
+                RADEON_CRT_FIFO_CE_EN |
+                RADEON_TV_FIFO_CE_EN |
+                RADEON_RE_SYNC_NOW_SEL_MASK);
+       tmp |= RADEON_TV_FIFO_ASYNC_RST | RADEON_CRT_ASYNC_RST;
+       WREG32(RADEON_TV_MASTER_CNTL, tmp);
+
+       tmp = RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD |
+               RADEON_TV_MONITOR_DETECT_EN | RADEON_TV_DAC_STD_NTSC |
+               (8 << RADEON_TV_DAC_BGADJ_SHIFT);
+
+       if (config_cntl & RADEON_CFG_ATI_REV_ID_MASK)
+               tmp |= (4 << RADEON_TV_DAC_DACADJ_SHIFT);
+       else
+               tmp |= (8 << RADEON_TV_DAC_DACADJ_SHIFT);
+       WREG32(RADEON_TV_DAC_CNTL, tmp);
+
+       tmp = RADEON_C_GRN_EN | RADEON_CMP_BLU_EN |
+               RADEON_RED_MX_FORCE_DAC_DATA |
+               RADEON_GRN_MX_FORCE_DAC_DATA |
+               RADEON_BLU_MX_FORCE_DAC_DATA |
+               (0x109 << RADEON_TV_FORCE_DAC_DATA_SHIFT);
+       WREG32(RADEON_TV_PRE_DAC_MUX_CNTL, tmp);
+
+       mdelay(3);
+       tmp = RREG32(RADEON_TV_DAC_CNTL);
+       if (tmp & RADEON_TV_DAC_GDACDET) {
+               found = true;
+               DRM_DEBUG("S-video TV connection detected\n");
+       } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
+               found = true;
+               DRM_DEBUG("Composite TV connection detected\n");
+       }
+
+       WREG32(RADEON_TV_PRE_DAC_MUX_CNTL, tv_pre_dac_mux_cntl);
+       WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
+       WREG32(RADEON_TV_MASTER_CNTL, tv_master_cntl);
+       WREG32(RADEON_DAC_CNTL2, dac_cntl2);
+       return found;
+}
+
 static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder *encoder,
                                                             struct drm_connector *connector)
 {
@@ -928,9 +1147,29 @@ static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder
        uint32_t crtc2_gen_cntl, tv_dac_cntl, dac_cntl2, dac_ext_cntl;
        uint32_t disp_hw_debug, disp_output_cntl, gpiopad_a, pixclks_cntl, tmp;
        enum drm_connector_status found = connector_status_disconnected;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
        bool color = true;
 
-       /*  FIXME tv */
+       if (connector->connector_type == DRM_MODE_CONNECTOR_SVIDEO ||
+           connector->connector_type == DRM_MODE_CONNECTOR_Composite ||
+           connector->connector_type == DRM_MODE_CONNECTOR_9PinDIN) {
+               bool tv_detect;
+
+               if (radeon_encoder->active_device && !(radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT))
+                       return connector_status_disconnected;
+
+               tv_detect = radeon_legacy_tv_detect(encoder, connector);
+               if (tv_detect && tv_dac)
+                       found = connector_status_connected;
+               return found;
+       }
+
+       /* don't probe if the encoder is being used for something else not CRT related */
+       if (radeon_encoder->active_device && !(radeon_encoder->active_device & ATOM_DEVICE_CRT_SUPPORT)) {
+               DRM_INFO("not detecting due to %08x\n", radeon_encoder->active_device);
+               return connector_status_disconnected;
+       }
 
        /* save the regs we need */
        pixclks_cntl = RREG32_PLL(RADEON_PIXCLKS_CNTL);
@@ -1013,8 +1252,7 @@ static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder
        }
        WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
 
-       /* return found; */
-       return connector_status_disconnected;
+       return found;
 
 }
 
@@ -1025,6 +1263,7 @@ static const struct drm_encoder_helper_funcs radeon_legacy_tv_dac_helper_funcs =
        .mode_set = radeon_legacy_tv_dac_mode_set,
        .commit = radeon_legacy_tv_dac_commit,
        .detect = radeon_legacy_tv_dac_detect,
+       .disable = radeon_legacy_encoder_disable,
 };
 
 
@@ -1032,6 +1271,30 @@ static const struct drm_encoder_funcs radeon_legacy_tv_dac_enc_funcs = {
        .destroy = radeon_enc_destroy,
 };
 
+
+static struct radeon_encoder_int_tmds *radeon_legacy_get_tmds_info(struct radeon_encoder *encoder)
+{
+       struct drm_device *dev = encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder_int_tmds *tmds = NULL;
+       bool ret;
+
+       tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
+
+       if (!tmds)
+               return NULL;
+
+       if (rdev->is_atom_bios)
+               ret = radeon_atombios_get_tmds_info(encoder, tmds);
+       else
+               ret = radeon_legacy_get_tmds_info_from_combios(encoder, tmds);
+
+       if (ret == false)
+               radeon_legacy_get_tmds_info_from_table(encoder, tmds);
+
+       return tmds;
+}
+
 void
 radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t supported_device)
 {
@@ -1078,10 +1341,7 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t
        case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
                drm_encoder_init(dev, encoder, &radeon_legacy_tmds_int_enc_funcs, DRM_MODE_ENCODER_TMDS);
                drm_encoder_helper_add(encoder, &radeon_legacy_tmds_int_helper_funcs);
-               if (rdev->is_atom_bios)
-                       radeon_encoder->enc_priv = radeon_atombios_get_tmds_info(radeon_encoder);
-               else
-                       radeon_encoder->enc_priv = radeon_combios_get_tmds_info(radeon_encoder);
+               radeon_encoder->enc_priv = radeon_legacy_get_tmds_info(radeon_encoder);
                break;
        case ENCODER_OBJECT_ID_INTERNAL_DAC1:
                drm_encoder_init(dev, encoder, &radeon_legacy_primary_dac_enc_funcs, DRM_MODE_ENCODER_DAC);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
new file mode 100644 (file)
index 0000000..3a12bb0
--- /dev/null
@@ -0,0 +1,904 @@
+#include "drmP.h"
+#include "drm_crtc_helper.h"
+#include "radeon.h"
+
+/*
+ * Integrated TV out support based on the GATOS code by
+ * Federico Ulivi <fulivi@lycos.com>
+ */
+
+
+/*
+ * Limits of h/v positions (hPos & vPos)
+ */
+#define MAX_H_POSITION 5 /* Range: [-5..5], negative is on the left, 0 is default, positive is on the right */
+#define MAX_V_POSITION 5 /* Range: [-5..5], negative is up, 0 is default, positive is down */
+
+/*
+ * Unit for hPos (in TV clock periods)
+ */
+#define H_POS_UNIT 10
+
+/*
+ * Indexes in h. code timing table for horizontal line position adjustment
+ */
+#define H_TABLE_POS1 6
+#define H_TABLE_POS2 8
+
+/*
+ * Limits of hor. size (hSize)
+ */
+#define MAX_H_SIZE 5 /* Range: [-5..5], negative is smaller, positive is larger */
+
+/* tv standard constants */
+#define NTSC_TV_CLOCK_T 233
+#define NTSC_TV_VFTOTAL 1
+#define NTSC_TV_LINES_PER_FRAME 525
+#define NTSC_TV_ZERO_H_SIZE 479166
+#define NTSC_TV_H_SIZE_UNIT 9478
+
+#define PAL_TV_CLOCK_T 188
+#define PAL_TV_VFTOTAL 3
+#define PAL_TV_LINES_PER_FRAME 625
+#define PAL_TV_ZERO_H_SIZE 473200
+#define PAL_TV_H_SIZE_UNIT 9360
+
+/* tv pll setting for 27 mhz ref clk */
+#define NTSC_TV_PLL_M_27 22
+#define NTSC_TV_PLL_N_27 175
+#define NTSC_TV_PLL_P_27 5
+
+#define PAL_TV_PLL_M_27 113
+#define PAL_TV_PLL_N_27 668
+#define PAL_TV_PLL_P_27 3
+
+/* tv pll setting for 14 mhz ref clk */
+#define NTSC_TV_PLL_M_14 33
+#define NTSC_TV_PLL_N_14 693
+#define NTSC_TV_PLL_P_14 7
+
+#define VERT_LEAD_IN_LINES 2
+#define FRAC_BITS 0xe
+#define FRAC_MASK 0x3fff
+
+struct radeon_tv_mode_constants {
+       uint16_t hor_resolution;
+       uint16_t ver_resolution;
+       enum radeon_tv_std standard;
+       uint16_t hor_total;
+       uint16_t ver_total;
+       uint16_t hor_start;
+       uint16_t hor_syncstart;
+       uint16_t ver_syncstart;
+       unsigned def_restart;
+       uint16_t crtcPLL_N;
+       uint8_t  crtcPLL_M;
+       uint8_t  crtcPLL_post_div;
+       unsigned pix_to_tv;
+};
+
+static const uint16_t hor_timing_NTSC[] = {
+       0x0007,
+       0x003f,
+       0x0263,
+       0x0a24,
+       0x2a6b,
+       0x0a36,
+       0x126d, /* H_TABLE_POS1 */
+       0x1bfe,
+       0x1a8f, /* H_TABLE_POS2 */
+       0x1ec7,
+       0x3863,
+       0x1bfe,
+       0x1bfe,
+       0x1a2a,
+       0x1e95,
+       0x0e31,
+       0x201b,
+       0
+};
+
+static const uint16_t vert_timing_NTSC[] = {
+       0x2001,
+       0x200d,
+       0x1006,
+       0x0c06,
+       0x1006,
+       0x1818,
+       0x21e3,
+       0x1006,
+       0x0c06,
+       0x1006,
+       0x1817,
+       0x21d4,
+       0x0002,
+       0
+};
+
+static const uint16_t hor_timing_PAL[] = {
+       0x0007,
+       0x0058,
+       0x027c,
+       0x0a31,
+       0x2a77,
+       0x0a95,
+       0x124f, /* H_TABLE_POS1 */
+       0x1bfe,
+       0x1b22, /* H_TABLE_POS2 */
+       0x1ef9,
+       0x387c,
+       0x1bfe,
+       0x1bfe,
+       0x1b31,
+       0x1eb5,
+       0x0e43,
+       0x201b,
+       0
+};
+
+static const uint16_t vert_timing_PAL[] =      {
+       0x2001,
+       0x200c,
+       0x1005,
+       0x0c05,
+       0x1005,
+       0x1401,
+       0x1821,
+       0x2240,
+       0x1005,
+       0x0c05,
+       0x1005,
+       0x1401,
+       0x1822,
+       0x2230,
+       0x0002,
+       0
+};
+
+/**********************************************************************
+ *
+ * availableModes
+ *
+ * Table of all allowed modes for tv output
+ *
+ **********************************************************************/
+static const struct radeon_tv_mode_constants available_tv_modes[] = {
+       {   /* NTSC timing for 27 Mhz ref clk */
+               800,                /* horResolution */
+               600,                /* verResolution */
+               TV_STD_NTSC,        /* standard */
+               990,                /* horTotal */
+               740,                /* verTotal */
+               813,                /* horStart */
+               824,                /* horSyncStart */
+               632,                /* verSyncStart */
+               625592,             /* defRestart */
+               592,                /* crtcPLL_N */
+               91,                 /* crtcPLL_M */
+               4,                  /* crtcPLL_postDiv */
+               1022,               /* pixToTV */
+       },
+       {   /* PAL timing for 27 Mhz ref clk */
+               800,               /* horResolution */
+               600,               /* verResolution */
+               TV_STD_PAL,        /* standard */
+               1144,              /* horTotal */
+               706,               /* verTotal */
+               812,               /* horStart */
+               824,               /* horSyncStart */
+               669,               /* verSyncStart */
+               696700,            /* defRestart */
+               1382,              /* crtcPLL_N */
+               231,               /* crtcPLL_M */
+               4,                 /* crtcPLL_postDiv */
+               759,               /* pixToTV */
+       },
+       {   /* NTSC timing for 14 Mhz ref clk */
+               800,                /* horResolution */
+               600,                /* verResolution */
+               TV_STD_NTSC,        /* standard */
+               1018,               /* horTotal */
+               727,                /* verTotal */
+               813,                /* horStart */
+               840,                /* horSyncStart */
+               633,                /* verSyncStart */
+               630627,             /* defRestart */
+               347,                /* crtcPLL_N */
+               14,                 /* crtcPLL_M */
+                       8,                  /* crtcPLL_postDiv */
+               1022,               /* pixToTV */
+       },
+};
+
+#define N_AVAILABLE_MODES ARRAY_SIZE(available_tv_modes)
+
+static const struct radeon_tv_mode_constants *radeon_legacy_tv_get_std_mode(struct radeon_encoder *radeon_encoder,
+                                                                           uint16_t *pll_ref_freq)
+{
+       struct drm_device *dev = radeon_encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_crtc *radeon_crtc;
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
+       const struct radeon_tv_mode_constants *const_ptr;
+       struct radeon_pll *pll;
+
+       radeon_crtc = to_radeon_crtc(radeon_encoder->base.crtc);
+       if (radeon_crtc->crtc_id == 1)
+               pll = &rdev->clock.p2pll;
+       else
+               pll = &rdev->clock.p1pll;
+
+       if (pll_ref_freq)
+               *pll_ref_freq = pll->reference_freq;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M) {
+               if (pll->reference_freq == 2700)
+                       const_ptr = &available_tv_modes[0];
+               else
+                       const_ptr = &available_tv_modes[2];
+       } else {
+               if (pll->reference_freq == 2700)
+                       const_ptr = &available_tv_modes[1];
+               else
+                       const_ptr = &available_tv_modes[1]; /* FIX ME */
+       }
+       return const_ptr;
+}
+
+static long YCOEF_value[5] = { 2, 2, 0, 4, 0 };
+static long YCOEF_EN_value[5] = { 1, 1, 0, 1, 0 };
+static long SLOPE_value[5] = { 1, 2, 2, 4, 8 };
+static long SLOPE_limit[5] = { 6, 5, 4, 3, 2 };
+
+static void radeon_wait_pll_lock(struct drm_encoder *encoder, unsigned n_tests,
+                                unsigned n_wait_loops, unsigned cnt_threshold)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t save_pll_test;
+       unsigned int i, j;
+
+       WREG32(RADEON_TEST_DEBUG_MUX, (RREG32(RADEON_TEST_DEBUG_MUX) & 0xffff60ff) | 0x100);
+       save_pll_test = RREG32_PLL(RADEON_PLL_TEST_CNTL);
+       WREG32_PLL(RADEON_PLL_TEST_CNTL, save_pll_test & ~RADEON_PLL_MASK_READ_B);
+
+       WREG8(RADEON_CLOCK_CNTL_INDEX, RADEON_PLL_TEST_CNTL);
+       for (i = 0; i < n_tests; i++) {
+               WREG8(RADEON_CLOCK_CNTL_DATA + 3, 0);
+               for (j = 0; j < n_wait_loops; j++)
+                       if (RREG8(RADEON_CLOCK_CNTL_DATA + 3) >= cnt_threshold)
+                               break;
+       }
+       WREG32_PLL(RADEON_PLL_TEST_CNTL, save_pll_test);
+       WREG32(RADEON_TEST_DEBUG_MUX, RREG32(RADEON_TEST_DEBUG_MUX) & 0xffffe0ff);
+}
+
+
+static void radeon_legacy_tv_write_fifo(struct radeon_encoder *radeon_encoder,
+                                       uint16_t addr, uint32_t value)
+{
+       struct drm_device *dev = radeon_encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t tmp;
+       int i = 0;
+
+       WREG32(RADEON_TV_HOST_WRITE_DATA, value);
+
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, addr);
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, addr | RADEON_HOST_FIFO_WT);
+
+       do {
+               tmp = RREG32(RADEON_TV_HOST_RD_WT_CNTL);
+               if ((tmp & RADEON_HOST_FIFO_WT_ACK) == 0)
+                       break;
+               i++;
+       } while (i < 10000);
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, 0);
+}
+
+#if 0 /* included for completeness */
+static uint32_t radeon_legacy_tv_read_fifo(struct radeon_encoder *radeon_encoder, uint16_t addr)
+{
+       struct drm_device *dev = radeon_encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       uint32_t tmp;
+       int i = 0;
+
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, addr);
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, addr | RADEON_HOST_FIFO_RD);
+
+       do {
+               tmp = RREG32(RADEON_TV_HOST_RD_WT_CNTL);
+               if ((tmp & RADEON_HOST_FIFO_RD_ACK) == 0)
+                       break;
+               i++;
+       } while (i < 10000);
+       WREG32(RADEON_TV_HOST_RD_WT_CNTL, 0);
+       return RREG32(RADEON_TV_HOST_READ_DATA);
+}
+#endif
+
+static uint16_t radeon_get_htiming_tables_addr(uint32_t tv_uv_adr)
+{
+       uint16_t h_table;
+
+       switch ((tv_uv_adr & RADEON_HCODE_TABLE_SEL_MASK) >> RADEON_HCODE_TABLE_SEL_SHIFT) {
+       case 0:
+               h_table = RADEON_TV_MAX_FIFO_ADDR_INTERNAL;
+               break;
+       case 1:
+               h_table = ((tv_uv_adr & RADEON_TABLE1_BOT_ADR_MASK) >> RADEON_TABLE1_BOT_ADR_SHIFT) * 2;
+               break;
+       case 2:
+               h_table = ((tv_uv_adr & RADEON_TABLE3_TOP_ADR_MASK) >> RADEON_TABLE3_TOP_ADR_SHIFT) * 2;
+               break;
+       default:
+               h_table = 0;
+               break;
+       }
+       return h_table;
+}
+
+static uint16_t radeon_get_vtiming_tables_addr(uint32_t tv_uv_adr)
+{
+       uint16_t v_table;
+
+       switch ((tv_uv_adr & RADEON_VCODE_TABLE_SEL_MASK) >> RADEON_VCODE_TABLE_SEL_SHIFT) {
+       case 0:
+               v_table = ((tv_uv_adr & RADEON_MAX_UV_ADR_MASK) >> RADEON_MAX_UV_ADR_SHIFT) * 2 + 1;
+               break;
+       case 1:
+               v_table = ((tv_uv_adr & RADEON_TABLE1_BOT_ADR_MASK) >> RADEON_TABLE1_BOT_ADR_SHIFT) * 2 + 1;
+               break;
+       case 2:
+               v_table = ((tv_uv_adr & RADEON_TABLE3_TOP_ADR_MASK) >> RADEON_TABLE3_TOP_ADR_SHIFT) * 2 + 1;
+               break;
+       default:
+               v_table = 0;
+               break;
+       }
+       return v_table;
+}
+
+static void radeon_restore_tv_timing_tables(struct radeon_encoder *radeon_encoder)
+{
+       struct drm_device *dev = radeon_encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
+       uint16_t h_table, v_table;
+       uint32_t tmp;
+       int i;
+
+       WREG32(RADEON_TV_UV_ADR, tv_dac->tv.tv_uv_adr);
+       h_table = radeon_get_htiming_tables_addr(tv_dac->tv.tv_uv_adr);
+       v_table = radeon_get_vtiming_tables_addr(tv_dac->tv.tv_uv_adr);
+
+       for (i = 0; i < MAX_H_CODE_TIMING_LEN; i += 2, h_table--) {
+               tmp = ((uint32_t)tv_dac->tv.h_code_timing[i] << 14) | ((uint32_t)tv_dac->tv.h_code_timing[i+1]);
+               radeon_legacy_tv_write_fifo(radeon_encoder, h_table, tmp);
+               if (tv_dac->tv.h_code_timing[i] == 0 || tv_dac->tv.h_code_timing[i + 1] == 0)
+                       break;
+       }
+       for (i = 0; i < MAX_V_CODE_TIMING_LEN; i += 2, v_table++) {
+               tmp = ((uint32_t)tv_dac->tv.v_code_timing[i+1] << 14) | ((uint32_t)tv_dac->tv.v_code_timing[i]);
+               radeon_legacy_tv_write_fifo(radeon_encoder, v_table, tmp);
+               if (tv_dac->tv.v_code_timing[i] == 0 || tv_dac->tv.v_code_timing[i + 1] == 0)
+                       break;
+       }
+}
+
+static void radeon_legacy_write_tv_restarts(struct radeon_encoder *radeon_encoder)
+{
+       struct drm_device *dev = radeon_encoder->base.dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
+       WREG32(RADEON_TV_FRESTART, tv_dac->tv.frestart);
+       WREG32(RADEON_TV_HRESTART, tv_dac->tv.hrestart);
+       WREG32(RADEON_TV_VRESTART, tv_dac->tv.vrestart);
+}
+
+static bool radeon_legacy_tv_init_restarts(struct drm_encoder *encoder)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
+       struct radeon_crtc *radeon_crtc;
+       int restart;
+       unsigned int h_total, v_total, f_total;
+       int v_offset, h_offset;
+       u16 p1, p2, h_inc;
+       bool h_changed;
+       const struct radeon_tv_mode_constants *const_ptr;
+       struct radeon_pll *pll;
+
+       radeon_crtc = to_radeon_crtc(radeon_encoder->base.crtc);
+       if (radeon_crtc->crtc_id == 1)
+               pll = &rdev->clock.p2pll;
+       else
+               pll = &rdev->clock.p1pll;
+
+       const_ptr = radeon_legacy_tv_get_std_mode(radeon_encoder, NULL);
+       if (!const_ptr)
+               return false;
+
+       h_total = const_ptr->hor_total;
+       v_total = const_ptr->ver_total;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60)
+               f_total = NTSC_TV_VFTOTAL + 1;
+       else
+               f_total = PAL_TV_VFTOTAL + 1;
+
+       /* adjust positions 1&2 in hor. cod timing table */
+       h_offset = tv_dac->h_pos * H_POS_UNIT;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M) {
+               h_offset -= 50;
+               p1 = hor_timing_NTSC[H_TABLE_POS1];
+               p2 = hor_timing_NTSC[H_TABLE_POS2];
+       } else {
+               p1 = hor_timing_PAL[H_TABLE_POS1];
+               p2 = hor_timing_PAL[H_TABLE_POS2];
+       }
+
+       p1 = (u16)((int)p1 + h_offset);
+       p2 = (u16)((int)p2 - h_offset);
+
+       h_changed = (p1 != tv_dac->tv.h_code_timing[H_TABLE_POS1] ||
+                    p2 != tv_dac->tv.h_code_timing[H_TABLE_POS2]);
+
+       tv_dac->tv.h_code_timing[H_TABLE_POS1] = p1;
+       tv_dac->tv.h_code_timing[H_TABLE_POS2] = p2;
+
+       /* Convert hOffset from n. of TV clock periods to n. of CRTC clock periods (CRTC pixels) */
+       h_offset = (h_offset * (int)(const_ptr->pix_to_tv)) / 1000;
+
+       /* adjust restart */
+       restart = const_ptr->def_restart;
+
+       /*
+        * convert v_pos TV lines to n. of CRTC pixels
+        */
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60)
+               v_offset = ((int)(v_total * h_total) * 2 * tv_dac->v_pos) / (int)(NTSC_TV_LINES_PER_FRAME);
+       else
+               v_offset = ((int)(v_total * h_total) * 2 * tv_dac->v_pos) / (int)(PAL_TV_LINES_PER_FRAME);
+
+       restart -= v_offset + h_offset;
+
+       DRM_DEBUG("compute_restarts: def = %u h = %d v = %d, p1 = %04x, p2 = %04x, restart = %d\n",
+                 const_ptr->def_restart, tv_dac->h_pos, tv_dac->v_pos, p1, p2, restart);
+
+       tv_dac->tv.hrestart = restart % h_total;
+       restart /= h_total;
+       tv_dac->tv.vrestart = restart % v_total;
+       restart /= v_total;
+       tv_dac->tv.frestart = restart % f_total;
+
+       DRM_DEBUG("compute_restart: F/H/V=%u,%u,%u\n",
+                 (unsigned)tv_dac->tv.frestart,
+                 (unsigned)tv_dac->tv.vrestart,
+                 (unsigned)tv_dac->tv.hrestart);
+
+       /* compute h_inc from hsize */
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M)
+               h_inc = (u16)((int)(const_ptr->hor_resolution * 4096 * NTSC_TV_CLOCK_T) /
+                             (tv_dac->h_size * (int)(NTSC_TV_H_SIZE_UNIT) + (int)(NTSC_TV_ZERO_H_SIZE)));
+       else
+               h_inc = (u16)((int)(const_ptr->hor_resolution * 4096 * PAL_TV_CLOCK_T) /
+                             (tv_dac->h_size * (int)(PAL_TV_H_SIZE_UNIT) + (int)(PAL_TV_ZERO_H_SIZE)));
+
+       tv_dac->tv.timing_cntl = (tv_dac->tv.timing_cntl & ~RADEON_H_INC_MASK) |
+               ((u32)h_inc << RADEON_H_INC_SHIFT);
+
+       DRM_DEBUG("compute_restart: h_size = %d h_inc = %d\n", tv_dac->h_size, h_inc);
+
+       return h_changed;
+}
+
+void radeon_legacy_tv_mode_set(struct drm_encoder *encoder,
+                              struct drm_display_mode *mode,
+                              struct drm_display_mode *adjusted_mode)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv;
+       const struct radeon_tv_mode_constants *const_ptr;
+       struct radeon_crtc *radeon_crtc;
+       int i;
+       uint16_t pll_ref_freq;
+       uint32_t vert_space, flicker_removal, tmp;
+       uint32_t tv_master_cntl, tv_rgb_cntl, tv_dac_cntl;
+       uint32_t tv_modulator_cntl1, tv_modulator_cntl2;
+       uint32_t tv_vscaler_cntl1, tv_vscaler_cntl2;
+       uint32_t tv_pll_cntl, tv_pll_cntl1, tv_ftotal;
+       uint32_t tv_y_fall_cntl, tv_y_rise_cntl, tv_y_saw_tooth_cntl;
+       uint32_t m, n, p;
+       const uint16_t *hor_timing;
+       const uint16_t *vert_timing;
+
+       const_ptr = radeon_legacy_tv_get_std_mode(radeon_encoder, &pll_ref_freq);
+       if (!const_ptr)
+               return;
+
+       radeon_crtc = to_radeon_crtc(encoder->crtc);
+
+       tv_master_cntl = (RADEON_VIN_ASYNC_RST |
+                         RADEON_CRT_FIFO_CE_EN |
+                         RADEON_TV_FIFO_CE_EN |
+                         RADEON_TV_ON);
+
+       if (!ASIC_IS_R300(rdev))
+               tv_master_cntl |= RADEON_TVCLK_ALWAYS_ONb;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J)
+               tv_master_cntl |= RADEON_RESTART_PHASE_FIX;
+
+       tv_modulator_cntl1 = (RADEON_SLEW_RATE_LIMIT |
+                             RADEON_SYNC_TIP_LEVEL |
+                             RADEON_YFLT_EN |
+                             RADEON_UVFLT_EN |
+                             (6 << RADEON_CY_FILT_BLEND_SHIFT));
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J) {
+               tv_modulator_cntl1 |= (0x46 << RADEON_SET_UP_LEVEL_SHIFT) |
+                       (0x3b << RADEON_BLANK_LEVEL_SHIFT);
+               tv_modulator_cntl2 = (-111 & RADEON_TV_U_BURST_LEVEL_MASK) |
+                       ((0 & RADEON_TV_V_BURST_LEVEL_MASK) << RADEON_TV_V_BURST_LEVEL_SHIFT);
+       } else if (tv_dac->tv_std == TV_STD_SCART_PAL) {
+               tv_modulator_cntl1 |= RADEON_ALT_PHASE_EN;
+               tv_modulator_cntl2 = (0 & RADEON_TV_U_BURST_LEVEL_MASK) |
+                       ((0 & RADEON_TV_V_BURST_LEVEL_MASK) << RADEON_TV_V_BURST_LEVEL_SHIFT);
+       } else {
+               tv_modulator_cntl1 |= RADEON_ALT_PHASE_EN |
+                       (0x3b << RADEON_SET_UP_LEVEL_SHIFT) |
+                       (0x3b << RADEON_BLANK_LEVEL_SHIFT);
+               tv_modulator_cntl2 = (-78 & RADEON_TV_U_BURST_LEVEL_MASK) |
+                       ((62 & RADEON_TV_V_BURST_LEVEL_MASK) << RADEON_TV_V_BURST_LEVEL_SHIFT);
+       }
+
+
+       tv_rgb_cntl = (RADEON_RGB_DITHER_EN
+                      | RADEON_TVOUT_SCALE_EN
+                      | (0x0b << RADEON_UVRAM_READ_MARGIN_SHIFT)
+                      | (0x07 << RADEON_FIFORAM_FFMACRO_READ_MARGIN_SHIFT)
+                      | RADEON_RGB_ATTEN_SEL(0x3)
+                      | RADEON_RGB_ATTEN_VAL(0xc));
+
+       if (radeon_crtc->crtc_id == 1)
+               tv_rgb_cntl |= RADEON_RGB_SRC_SEL_CRTC2;
+       else {
+               if (radeon_crtc->rmx_type != RMX_OFF)
+                       tv_rgb_cntl |= RADEON_RGB_SRC_SEL_RMX;
+               else
+                       tv_rgb_cntl |= RADEON_RGB_SRC_SEL_CRTC1;
+       }
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60)
+               vert_space = const_ptr->ver_total * 2 * 10000 / NTSC_TV_LINES_PER_FRAME;
+       else
+               vert_space = const_ptr->ver_total * 2 * 10000 / PAL_TV_LINES_PER_FRAME;
+
+       tmp = RREG32(RADEON_TV_VSCALER_CNTL1);
+       tmp &= 0xe3ff0000;
+       tmp |= (vert_space * (1 << FRAC_BITS) / 10000);
+       tv_vscaler_cntl1 = tmp;
+
+       if (pll_ref_freq == 2700)
+               tv_vscaler_cntl1 |= RADEON_RESTART_FIELD;
+
+       if (const_ptr->hor_resolution == 1024)
+               tv_vscaler_cntl1 |= (4 << RADEON_Y_DEL_W_SIG_SHIFT);
+       else
+               tv_vscaler_cntl1 |= (2 << RADEON_Y_DEL_W_SIG_SHIFT);
+
+       /* scale up for int divide */
+       tmp = const_ptr->ver_total * 2 * 1000;
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60) {
+               tmp /= NTSC_TV_LINES_PER_FRAME;
+       } else {
+               tmp /= PAL_TV_LINES_PER_FRAME;
+       }
+       flicker_removal = (tmp + 500) / 1000;
+
+       if (flicker_removal < 3)
+               flicker_removal = 3;
+       for (i = 0; i < 6; ++i) {
+               if (flicker_removal == SLOPE_limit[i])
+                       break;
+       }
+
+       tv_y_saw_tooth_cntl = (vert_space * SLOPE_value[i] * (1 << (FRAC_BITS - 1)) +
+                               5001) / 10000 / 8 | ((SLOPE_value[i] *
+                               (1 << (FRAC_BITS - 1)) / 8) << 16);
+       tv_y_fall_cntl =
+               (YCOEF_EN_value[i] << 17) | ((YCOEF_value[i] * (1 << 8) / 8) << 24) |
+               RADEON_Y_FALL_PING_PONG | (272 * SLOPE_value[i] / 8) * (1 << (FRAC_BITS - 1)) /
+               1024;
+       tv_y_rise_cntl = RADEON_Y_RISE_PING_PONG|
+               (flicker_removal * 1024 - 272) * SLOPE_value[i] / 8 * (1 << (FRAC_BITS - 1)) / 1024;
+
+       tv_vscaler_cntl2 = RREG32(RADEON_TV_VSCALER_CNTL2) & 0x00fffff0;
+       tv_vscaler_cntl2 |= (0x10 << 24) |
+               RADEON_DITHER_MODE |
+               RADEON_Y_OUTPUT_DITHER_EN |
+               RADEON_UV_OUTPUT_DITHER_EN |
+               RADEON_UV_TO_BUF_DITHER_EN;
+
+       tmp = (tv_vscaler_cntl1 >> RADEON_UV_INC_SHIFT) & RADEON_UV_INC_MASK;
+       tmp = ((16384 * 256 * 10) / tmp + 5) / 10;
+       tmp = (tmp << RADEON_UV_OUTPUT_POST_SCALE_SHIFT) | 0x000b0000;
+       tv_dac->tv.timing_cntl = tmp;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60)
+               tv_dac_cntl = tv_dac->ntsc_tvdac_adj;
+       else
+               tv_dac_cntl = tv_dac->pal_tvdac_adj;
+
+       tv_dac_cntl |= RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J)
+               tv_dac_cntl |= RADEON_TV_DAC_STD_NTSC;
+       else
+               tv_dac_cntl |= RADEON_TV_DAC_STD_PAL;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J) {
+               if (pll_ref_freq == 2700) {
+                       m = NTSC_TV_PLL_M_27;
+                       n = NTSC_TV_PLL_N_27;
+                       p = NTSC_TV_PLL_P_27;
+               } else {
+                       m = NTSC_TV_PLL_M_14;
+                       n = NTSC_TV_PLL_N_14;
+                       p = NTSC_TV_PLL_P_14;
+               }
+       } else {
+               if (pll_ref_freq == 2700) {
+                       m = PAL_TV_PLL_M_27;
+                       n = PAL_TV_PLL_N_27;
+                       p = PAL_TV_PLL_P_27;
+               } else {
+                       m = PAL_TV_PLL_M_27;
+                       n = PAL_TV_PLL_N_27;
+                       p = PAL_TV_PLL_P_27;
+               }
+       }
+
+       tv_pll_cntl = (m & RADEON_TV_M0LO_MASK) |
+               (((m >> 8) & RADEON_TV_M0HI_MASK) << RADEON_TV_M0HI_SHIFT) |
+               ((n & RADEON_TV_N0LO_MASK) << RADEON_TV_N0LO_SHIFT) |
+               (((n >> 9) & RADEON_TV_N0HI_MASK) << RADEON_TV_N0HI_SHIFT) |
+               ((p & RADEON_TV_P_MASK) << RADEON_TV_P_SHIFT);
+
+       tv_pll_cntl1 = (((4 & RADEON_TVPCP_MASK) << RADEON_TVPCP_SHIFT) |
+                       ((4 & RADEON_TVPVG_MASK) << RADEON_TVPVG_SHIFT) |
+                       ((1 & RADEON_TVPDC_MASK) << RADEON_TVPDC_SHIFT) |
+                       RADEON_TVCLK_SRC_SEL_TVPLL |
+                       RADEON_TVPLL_TEST_DIS);
+
+       tv_dac->tv.tv_uv_adr = 0xc8;
+
+       if (tv_dac->tv_std == TV_STD_NTSC ||
+           tv_dac->tv_std == TV_STD_NTSC_J ||
+           tv_dac->tv_std == TV_STD_PAL_M ||
+           tv_dac->tv_std == TV_STD_PAL_60) {
+               tv_ftotal = NTSC_TV_VFTOTAL;
+               hor_timing = hor_timing_NTSC;
+               vert_timing = vert_timing_NTSC;
+       } else {
+               hor_timing = hor_timing_PAL;
+               vert_timing = vert_timing_PAL;
+               tv_ftotal = PAL_TV_VFTOTAL;
+       }
+
+       for (i = 0; i < MAX_H_CODE_TIMING_LEN; i++) {
+               if ((tv_dac->tv.h_code_timing[i] = hor_timing[i]) == 0)
+                       break;
+       }
+
+       for (i = 0; i < MAX_V_CODE_TIMING_LEN; i++) {
+               if ((tv_dac->tv.v_code_timing[i] = vert_timing[i]) == 0)
+                       break;
+       }
+
+       radeon_legacy_tv_init_restarts(encoder);
+
+       /* play with DAC_CNTL */
+       /* play with GPIOPAD_A */
+       /* DISP_OUTPUT_CNTL */
+       /* use reference freq */
+
+       /* program the TV registers */
+       WREG32(RADEON_TV_MASTER_CNTL, (tv_master_cntl | RADEON_TV_ASYNC_RST |
+                                      RADEON_CRT_ASYNC_RST | RADEON_TV_FIFO_ASYNC_RST));
+
+       tmp = RREG32(RADEON_TV_DAC_CNTL);
+       tmp &= ~RADEON_TV_DAC_NBLANK;
+       tmp |= RADEON_TV_DAC_BGSLEEP |
+               RADEON_TV_DAC_RDACPD |
+               RADEON_TV_DAC_GDACPD |
+               RADEON_TV_DAC_BDACPD;
+       WREG32(RADEON_TV_DAC_CNTL, tmp);
+
+       /* TV PLL */
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, 0, ~RADEON_TVCLK_SRC_SEL_TVPLL);
+       WREG32_PLL(RADEON_TV_PLL_CNTL, tv_pll_cntl);
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, RADEON_TVPLL_RESET, ~RADEON_TVPLL_RESET);
+
+       radeon_wait_pll_lock(encoder, 200, 800, 135);
+
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, 0, ~RADEON_TVPLL_RESET);
+
+       radeon_wait_pll_lock(encoder, 300, 160, 27);
+       radeon_wait_pll_lock(encoder, 200, 800, 135);
+
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, 0, ~0xf);
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, RADEON_TVCLK_SRC_SEL_TVPLL, ~RADEON_TVCLK_SRC_SEL_TVPLL);
+
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, (1 << RADEON_TVPDC_SHIFT), ~RADEON_TVPDC_MASK);
+       WREG32_PLL_P(RADEON_TV_PLL_CNTL1, 0, ~RADEON_TVPLL_SLEEP);
+
+       /* TV HV */
+       WREG32(RADEON_TV_RGB_CNTL, tv_rgb_cntl);
+       WREG32(RADEON_TV_HTOTAL, const_ptr->hor_total - 1);
+       WREG32(RADEON_TV_HDISP, const_ptr->hor_resolution - 1);
+       WREG32(RADEON_TV_HSTART, const_ptr->hor_start);
+
+       WREG32(RADEON_TV_VTOTAL, const_ptr->ver_total - 1);
+       WREG32(RADEON_TV_VDISP, const_ptr->ver_resolution - 1);
+       WREG32(RADEON_TV_FTOTAL, tv_ftotal);
+       WREG32(RADEON_TV_VSCALER_CNTL1, tv_vscaler_cntl1);
+       WREG32(RADEON_TV_VSCALER_CNTL2, tv_vscaler_cntl2);
+
+       WREG32(RADEON_TV_Y_FALL_CNTL, tv_y_fall_cntl);
+       WREG32(RADEON_TV_Y_RISE_CNTL, tv_y_rise_cntl);
+       WREG32(RADEON_TV_Y_SAW_TOOTH_CNTL, tv_y_saw_tooth_cntl);
+
+       WREG32(RADEON_TV_MASTER_CNTL, (tv_master_cntl | RADEON_TV_ASYNC_RST |
+                                      RADEON_CRT_ASYNC_RST));
+
+       /* TV restarts */
+       radeon_legacy_write_tv_restarts(radeon_encoder);
+
+       /* tv timings */
+       radeon_restore_tv_timing_tables(radeon_encoder);
+
+       WREG32(RADEON_TV_MASTER_CNTL, (tv_master_cntl | RADEON_TV_ASYNC_RST));
+
+       /* tv std */
+       WREG32(RADEON_TV_SYNC_CNTL, (RADEON_SYNC_PUB | RADEON_TV_SYNC_IO_DRIVE));
+       WREG32(RADEON_TV_TIMING_CNTL, tv_dac->tv.timing_cntl);
+       WREG32(RADEON_TV_MODULATOR_CNTL1, tv_modulator_cntl1);
+       WREG32(RADEON_TV_MODULATOR_CNTL2, tv_modulator_cntl2);
+       WREG32(RADEON_TV_PRE_DAC_MUX_CNTL, (RADEON_Y_RED_EN |
+                                           RADEON_C_GRN_EN |
+                                           RADEON_CMP_BLU_EN |
+                                           RADEON_DAC_DITHER_EN));
+
+       WREG32(RADEON_TV_CRC_CNTL, 0);
+
+       WREG32(RADEON_TV_MASTER_CNTL, tv_master_cntl);
+
+       WREG32(RADEON_TV_GAIN_LIMIT_SETTINGS, ((0x17f << RADEON_UV_GAIN_LIMIT_SHIFT) |
+                                              (0x5ff << RADEON_Y_GAIN_LIMIT_SHIFT)));
+       WREG32(RADEON_TV_LINEAR_GAIN_SETTINGS, ((0x100 << RADEON_UV_GAIN_SHIFT) |
+                                               (0x100 << RADEON_Y_GAIN_SHIFT)));
+
+       WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
+
+}
+
+void radeon_legacy_tv_adjust_crtc_reg(struct drm_encoder *encoder,
+                                     uint32_t *h_total_disp, uint32_t *h_sync_strt_wid,
+                                     uint32_t *v_total_disp, uint32_t *v_sync_strt_wid)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       const struct radeon_tv_mode_constants *const_ptr;
+       uint32_t tmp;
+
+       const_ptr = radeon_legacy_tv_get_std_mode(radeon_encoder, NULL);
+       if (!const_ptr)
+               return;
+
+       *h_total_disp = (((const_ptr->hor_resolution / 8) - 1) << RADEON_CRTC_H_DISP_SHIFT) |
+               (((const_ptr->hor_total / 8) - 1) << RADEON_CRTC_H_TOTAL_SHIFT);
+
+       tmp = *h_sync_strt_wid;
+       tmp &= ~(RADEON_CRTC_H_SYNC_STRT_PIX | RADEON_CRTC_H_SYNC_STRT_CHAR);
+       tmp |= (((const_ptr->hor_syncstart / 8) - 1) << RADEON_CRTC_H_SYNC_STRT_CHAR_SHIFT) |
+               (const_ptr->hor_syncstart & 7);
+       *h_sync_strt_wid = tmp;
+
+       *v_total_disp = ((const_ptr->ver_resolution - 1) << RADEON_CRTC_V_DISP_SHIFT) |
+               ((const_ptr->ver_total - 1) << RADEON_CRTC_V_TOTAL_SHIFT);
+
+       tmp = *v_sync_strt_wid;
+       tmp &= ~RADEON_CRTC_V_SYNC_STRT;
+       tmp |= ((const_ptr->ver_syncstart - 1) << RADEON_CRTC_V_SYNC_STRT_SHIFT);
+       *v_sync_strt_wid = tmp;
+}
+
+static inline int get_post_div(int value)
+{
+       int post_div;
+       switch (value) {
+       case 1: post_div = 0; break;
+       case 2: post_div = 1; break;
+       case 3: post_div = 4; break;
+       case 4: post_div = 2; break;
+       case 6: post_div = 6; break;
+       case 8: post_div = 3; break;
+       case 12: post_div = 7; break;
+       case 16:
+       default: post_div = 5; break;
+       }
+       return post_div;
+}
+
+void radeon_legacy_tv_adjust_pll1(struct drm_encoder *encoder,
+                                 uint32_t *htotal_cntl, uint32_t *ppll_ref_div,
+                                 uint32_t *ppll_div_3, uint32_t *pixclks_cntl)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       const struct radeon_tv_mode_constants *const_ptr;
+
+       const_ptr = radeon_legacy_tv_get_std_mode(radeon_encoder, NULL);
+       if (!const_ptr)
+               return;
+
+       *htotal_cntl = (const_ptr->hor_total & 0x7) | RADEON_HTOT_CNTL_VGA_EN;
+
+       *ppll_ref_div = const_ptr->crtcPLL_M;
+
+       *ppll_div_3 = (const_ptr->crtcPLL_N & 0x7ff) | (get_post_div(const_ptr->crtcPLL_post_div) << 16);
+       *pixclks_cntl &= ~(RADEON_PIX2CLK_SRC_SEL_MASK | RADEON_PIXCLK_TV_SRC_SEL);
+       *pixclks_cntl |= RADEON_PIX2CLK_SRC_SEL_P2PLLCLK;
+}
+
+void radeon_legacy_tv_adjust_pll2(struct drm_encoder *encoder,
+                                 uint32_t *htotal2_cntl, uint32_t *p2pll_ref_div,
+                                 uint32_t *p2pll_div_0, uint32_t *pixclks_cntl)
+{
+       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+       const struct radeon_tv_mode_constants *const_ptr;
+
+       const_ptr = radeon_legacy_tv_get_std_mode(radeon_encoder, NULL);
+       if (!const_ptr)
+               return;
+
+       *htotal2_cntl = (const_ptr->hor_total & 0x7);
+
+       *p2pll_ref_div = const_ptr->crtcPLL_M;
+
+       *p2pll_div_0 = (const_ptr->crtcPLL_N & 0x7ff) | (get_post_div(const_ptr->crtcPLL_post_div) << 16);
+       *pixclks_cntl &= ~RADEON_PIX2CLK_SRC_SEL_MASK;
+       *pixclks_cntl |= RADEON_PIX2CLK_SRC_SEL_P2PLLCLK | RADEON_PIXCLK_TV_SRC_SEL;
+}
+
diff --git a/drivers/gpu/drm/radeon/radeon_microcode.h b/drivers/gpu/drm/radeon/radeon_microcode.h
deleted file mode 100644 (file)
index a348c9e..0000000
+++ /dev/null
@@ -1,1844 +0,0 @@
-/*
- * Copyright 2007 Advanced Micro Devices, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef RADEON_MICROCODE_H
-#define RADEON_MICROCODE_H
-
-/* production radeon ucode r1xx-r6xx */
-static const u32 R100_cp_microcode[][2] = {
-    { 0x21007000, 0000000000 },
-    { 0x20007000, 0000000000 },
-    { 0x000000b4, 0x00000004 },
-    { 0x000000b8, 0x00000004 },
-    { 0x6f5b4d4c, 0000000000 },
-    { 0x4c4c427f, 0000000000 },
-    { 0x5b568a92, 0000000000 },
-    { 0x4ca09c6d, 0000000000 },
-    { 0xad4c4c4c, 0000000000 },
-    { 0x4ce1af3d, 0000000000 },
-    { 0xd8afafaf, 0000000000 },
-    { 0xd64c4cdc, 0000000000 },
-    { 0x4cd10d10, 0000000000 },
-    { 0x000f0000, 0x00000016 },
-    { 0x362f242d, 0000000000 },
-    { 0x00000012, 0x00000004 },
-    { 0x000f0000, 0x00000016 },
-    { 0x362f282d, 0000000000 },
-    { 0x000380e7, 0x00000002 },
-    { 0x04002c97, 0x00000002 },
-    { 0x000f0001, 0x00000016 },
-    { 0x333a3730, 0000000000 },
-    { 0x000077ef, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x00000021, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00061000, 0x00000002 },
-    { 0x00000021, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00061000, 0x00000002 },
-    { 0x00000021, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00000017, 0x00000004 },
-    { 0x0003802b, 0x00000002 },
-    { 0x040067e0, 0x00000002 },
-    { 0x00000017, 0x00000004 },
-    { 0x000077e0, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x000037e1, 0x00000002 },
-    { 0x040067e1, 0x00000006 },
-    { 0x000077e0, 0x00000002 },
-    { 0x000077e1, 0x00000002 },
-    { 0x000077e1, 0x00000006 },
-    { 0xffffffff, 0000000000 },
-    { 0x10000000, 0000000000 },
-    { 0x0003802b, 0x00000002 },
-    { 0x040067e0, 0x00000006 },
-    { 0x00007675, 0x00000002 },
-    { 0x00007676, 0x00000002 },
-    { 0x00007677, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0003802c, 0x00000002 },
-    { 0x04002676, 0x00000002 },
-    { 0x00007677, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0000002f, 0x00000018 },
-    { 0x0000002f, 0x00000018 },
-    { 0000000000, 0x00000006 },
-    { 0x00000030, 0x00000018 },
-    { 0x00000030, 0x00000018 },
-    { 0000000000, 0x00000006 },
-    { 0x01605000, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x00098000, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x64c0603e, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00080000, 0x00000016 },
-    { 0000000000, 0000000000 },
-    { 0x0400251d, 0x00000002 },
-    { 0x00007580, 0x00000002 },
-    { 0x00067581, 0x00000002 },
-    { 0x04002580, 0x00000002 },
-    { 0x00067581, 0x00000002 },
-    { 0x00000049, 0x00000004 },
-    { 0x00005000, 0000000000 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x0000750e, 0x00000002 },
-    { 0x00019000, 0x00000002 },
-    { 0x00011055, 0x00000014 },
-    { 0x00000055, 0x00000012 },
-    { 0x0400250f, 0x00000002 },
-    { 0x0000504f, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00007565, 0x00000002 },
-    { 0x00007566, 0x00000002 },
-    { 0x00000058, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x01e655b4, 0x00000002 },
-    { 0x4401b0e4, 0x00000002 },
-    { 0x01c110e4, 0x00000002 },
-    { 0x26667066, 0x00000018 },
-    { 0x040c2565, 0x00000002 },
-    { 0x00000066, 0x00000018 },
-    { 0x04002564, 0x00000002 },
-    { 0x00007566, 0x00000002 },
-    { 0x0000005d, 0x00000004 },
-    { 0x00401069, 0x00000008 },
-    { 0x00101000, 0x00000002 },
-    { 0x000d80ff, 0x00000002 },
-    { 0x0080006c, 0x00000008 },
-    { 0x000f9000, 0x00000002 },
-    { 0x000e00ff, 0x00000002 },
-    { 0000000000, 0x00000006 },
-    { 0x0000008f, 0x00000018 },
-    { 0x0000005b, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00007576, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x00009000, 0x00000002 },
-    { 0x00041000, 0x00000002 },
-    { 0x0c00350e, 0x00000002 },
-    { 0x00049000, 0x00000002 },
-    { 0x00051000, 0x00000002 },
-    { 0x01e785f8, 0x00000002 },
-    { 0x00200000, 0x00000002 },
-    { 0x0060007e, 0x0000000c },
-    { 0x00007563, 0x00000002 },
-    { 0x006075f0, 0x00000021 },
-    { 0x20007073, 0x00000004 },
-    { 0x00005073, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00007576, 0x00000002 },
-    { 0x00007577, 0x00000002 },
-    { 0x0000750e, 0x00000002 },
-    { 0x0000750f, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00600083, 0x0000000c },
-    { 0x006075f0, 0x00000021 },
-    { 0x000075f8, 0x00000002 },
-    { 0x00000083, 0x00000004 },
-    { 0x000a750e, 0x00000002 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x0020750f, 0x00000002 },
-    { 0x00600086, 0x00000004 },
-    { 0x00007570, 0x00000002 },
-    { 0x00007571, 0x00000002 },
-    { 0x00007572, 0x00000006 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00005000, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00007568, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x00000095, 0x0000000c },
-    { 0x00058000, 0x00000002 },
-    { 0x0c607562, 0x00000002 },
-    { 0x00000097, 0x00000004 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x00600096, 0x00000004 },
-    { 0x400070e5, 0000000000 },
-    { 0x000380e6, 0x00000002 },
-    { 0x040025c5, 0x00000002 },
-    { 0x000380e5, 0x00000002 },
-    { 0x000000a8, 0x0000001c },
-    { 0x000650aa, 0x00000018 },
-    { 0x040025bb, 0x00000002 },
-    { 0x000610ab, 0x00000018 },
-    { 0x040075bc, 0000000000 },
-    { 0x000075bb, 0x00000002 },
-    { 0x000075bc, 0000000000 },
-    { 0x00090000, 0x00000006 },
-    { 0x00090000, 0x00000002 },
-    { 0x000d8002, 0x00000006 },
-    { 0x00007832, 0x00000002 },
-    { 0x00005000, 0x00000002 },
-    { 0x000380e7, 0x00000002 },
-    { 0x04002c97, 0x00000002 },
-    { 0x00007820, 0x00000002 },
-    { 0x00007821, 0x00000002 },
-    { 0x00007800, 0000000000 },
-    { 0x01200000, 0x00000002 },
-    { 0x20077000, 0x00000002 },
-    { 0x01200000, 0x00000002 },
-    { 0x20007000, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x0120751b, 0x00000002 },
-    { 0x8040750a, 0x00000002 },
-    { 0x8040750b, 0x00000002 },
-    { 0x00110000, 0x00000002 },
-    { 0x000380e5, 0x00000002 },
-    { 0x000000c6, 0x0000001c },
-    { 0x000610ab, 0x00000018 },
-    { 0x844075bd, 0x00000002 },
-    { 0x000610aa, 0x00000018 },
-    { 0x840075bb, 0x00000002 },
-    { 0x000610ab, 0x00000018 },
-    { 0x844075bc, 0x00000002 },
-    { 0x000000c9, 0x00000004 },
-    { 0x804075bd, 0x00000002 },
-    { 0x800075bb, 0x00000002 },
-    { 0x804075bc, 0x00000002 },
-    { 0x00108000, 0x00000002 },
-    { 0x01400000, 0x00000002 },
-    { 0x006000cd, 0x0000000c },
-    { 0x20c07000, 0x00000020 },
-    { 0x000000cf, 0x00000012 },
-    { 0x00800000, 0x00000006 },
-    { 0x0080751d, 0x00000006 },
-    { 0000000000, 0000000000 },
-    { 0x0000775c, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00661000, 0x00000002 },
-    { 0x0460275d, 0x00000020 },
-    { 0x00004000, 0000000000 },
-    { 0x01e00830, 0x00000002 },
-    { 0x21007000, 0000000000 },
-    { 0x6464614d, 0000000000 },
-    { 0x69687420, 0000000000 },
-    { 0x00000073, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x00005000, 0x00000002 },
-    { 0x000380d0, 0x00000002 },
-    { 0x040025e0, 0x00000002 },
-    { 0x000075e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000380e0, 0x00000002 },
-    { 0x04002394, 0x00000002 },
-    { 0x00005000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x00000008, 0000000000 },
-    { 0x00000004, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 R200_cp_microcode[][2] = {
-    { 0x21007000, 0000000000 },
-    { 0x20007000, 0000000000 },
-    { 0x000000bf, 0x00000004 },
-    { 0x000000c3, 0x00000004 },
-    { 0x7a685e5d, 0000000000 },
-    { 0x5d5d5588, 0000000000 },
-    { 0x68659197, 0000000000 },
-    { 0x5da19f78, 0000000000 },
-    { 0x5d5d5d5d, 0000000000 },
-    { 0x5dee5d50, 0000000000 },
-    { 0xf2acacac, 0000000000 },
-    { 0xe75df9e9, 0000000000 },
-    { 0xb1dd0e11, 0000000000 },
-    { 0xe2afafaf, 0000000000 },
-    { 0x000f0000, 0x00000016 },
-    { 0x452f232d, 0000000000 },
-    { 0x00000013, 0x00000004 },
-    { 0x000f0000, 0x00000016 },
-    { 0x452f272d, 0000000000 },
-    { 0x000f0001, 0x00000016 },
-    { 0x3e4d4a37, 0000000000 },
-    { 0x000077ef, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x00000020, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00061000, 0x00000002 },
-    { 0x00000020, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00061000, 0x00000002 },
-    { 0x00000020, 0x0000001a },
-    { 0x00004000, 0x0000001e },
-    { 0x00000016, 0x00000004 },
-    { 0x0003802a, 0x00000002 },
-    { 0x040067e0, 0x00000002 },
-    { 0x00000016, 0x00000004 },
-    { 0x000077e0, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x000037e1, 0x00000002 },
-    { 0x040067e1, 0x00000006 },
-    { 0x000077e0, 0x00000002 },
-    { 0x000077e1, 0x00000002 },
-    { 0x000077e1, 0x00000006 },
-    { 0xffffffff, 0000000000 },
-    { 0x10000000, 0000000000 },
-    { 0x07f007f0, 0000000000 },
-    { 0x0003802a, 0x00000002 },
-    { 0x040067e0, 0x00000006 },
-    { 0x0003802c, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002743, 0x00000002 },
-    { 0x00007675, 0x00000002 },
-    { 0x00007676, 0x00000002 },
-    { 0x00007677, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0003802c, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002743, 0x00000002 },
-    { 0x00007676, 0x00000002 },
-    { 0x00007677, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0003802b, 0x00000002 },
-    { 0x04002676, 0x00000002 },
-    { 0x00007677, 0x00000002 },
-    { 0x0003802c, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002743, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0003802c, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002741, 0x00000002 },
-    { 0x04002743, 0x00000002 },
-    { 0x00007678, 0x00000006 },
-    { 0x0000002f, 0x00000018 },
-    { 0x0000002f, 0x00000018 },
-    { 0000000000, 0x00000006 },
-    { 0x00000037, 0x00000018 },
-    { 0x00000037, 0x00000018 },
-    { 0000000000, 0x00000006 },
-    { 0x01605000, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x00098000, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x64c06051, 0x00000004 },
-    { 0x00080000, 0x00000016 },
-    { 0000000000, 0000000000 },
-    { 0x0400251d, 0x00000002 },
-    { 0x00007580, 0x00000002 },
-    { 0x00067581, 0x00000002 },
-    { 0x04002580, 0x00000002 },
-    { 0x00067581, 0x00000002 },
-    { 0x0000005a, 0x00000004 },
-    { 0x00005000, 0000000000 },
-    { 0x00061000, 0x00000002 },
-    { 0x0000750e, 0x00000002 },
-    { 0x00019000, 0x00000002 },
-    { 0x00011064, 0x00000014 },
-    { 0x00000064, 0x00000012 },
-    { 0x0400250f, 0x00000002 },
-    { 0x0000505e, 0x00000004 },
-    { 0x00007565, 0x00000002 },
-    { 0x00007566, 0x00000002 },
-    { 0x00000065, 0x00000004 },
-    { 0x01e655b4, 0x00000002 },
-    { 0x4401b0f0, 0x00000002 },
-    { 0x01c110f0, 0x00000002 },
-    { 0x26667071, 0x00000018 },
-    { 0x040c2565, 0x00000002 },
-    { 0x00000071, 0x00000018 },
-    { 0x04002564, 0x00000002 },
-    { 0x00007566, 0x00000002 },
-    { 0x00000068, 0x00000004 },
-    { 0x00401074, 0x00000008 },
-    { 0x00101000, 0x00000002 },
-    { 0x000d80ff, 0x00000002 },
-    { 0x00800077, 0x00000008 },
-    { 0x000f9000, 0x00000002 },
-    { 0x000e00ff, 0x00000002 },
-    { 0000000000, 0x00000006 },
-    { 0x00000094, 0x00000018 },
-    { 0x00000068, 0x00000004 },
-    { 0x00007576, 0x00000002 },
-    { 0x00065000, 0x00000002 },
-    { 0x00009000, 0x00000002 },
-    { 0x00041000, 0x00000002 },
-    { 0x0c00350e, 0x00000002 },
-    { 0x00049000, 0x00000002 },
-    { 0x00051000, 0x00000002 },
-    { 0x01e785f8, 0x00000002 },
-    { 0x00200000, 0x00000002 },
-    { 0x00600087, 0x0000000c },
-    { 0x00007563, 0x00000002 },
-    { 0x006075f0, 0x00000021 },
-    { 0x2000707c, 0x00000004 },
-    { 0x0000507c, 0x00000004 },
-    { 0x00007576, 0x00000002 },
-    { 0x00007577, 0x00000002 },
-    { 0x0000750e, 0x00000002 },
-    { 0x0000750f, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x0060008a, 0x0000000c },
-    { 0x006075f0, 0x00000021 },
-    { 0x000075f8, 0x00000002 },
-    { 0x0000008a, 0x00000004 },
-    { 0x000a750e, 0x00000002 },
-    { 0x0020750f, 0x00000002 },
-    { 0x0060008d, 0x00000004 },
-    { 0x00007570, 0x00000002 },
-    { 0x00007571, 0x00000002 },
-    { 0x00007572, 0x00000006 },
-    { 0x00005000, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00007568, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x00000098, 0x0000000c },
-    { 0x00058000, 0x00000002 },
-    { 0x0c607562, 0x00000002 },
-    { 0x0000009a, 0x00000004 },
-    { 0x00600099, 0x00000004 },
-    { 0x400070f1, 0000000000 },
-    { 0x000380f1, 0x00000002 },
-    { 0x000000a7, 0x0000001c },
-    { 0x000650a9, 0x00000018 },
-    { 0x040025bb, 0x00000002 },
-    { 0x000610aa, 0x00000018 },
-    { 0x040075bc, 0000000000 },
-    { 0x000075bb, 0x00000002 },
-    { 0x000075bc, 0000000000 },
-    { 0x00090000, 0x00000006 },
-    { 0x00090000, 0x00000002 },
-    { 0x000d8002, 0x00000006 },
-    { 0x00005000, 0x00000002 },
-    { 0x00007821, 0x00000002 },
-    { 0x00007800, 0000000000 },
-    { 0x00007821, 0x00000002 },
-    { 0x00007800, 0000000000 },
-    { 0x01665000, 0x00000002 },
-    { 0x000a0000, 0x00000002 },
-    { 0x000671cc, 0x00000002 },
-    { 0x0286f1cd, 0x00000002 },
-    { 0x000000b7, 0x00000010 },
-    { 0x21007000, 0000000000 },
-    { 0x000000be, 0x0000001c },
-    { 0x00065000, 0x00000002 },
-    { 0x000a0000, 0x00000002 },
-    { 0x00061000, 0x00000002 },
-    { 0x000b0000, 0x00000002 },
-    { 0x38067000, 0x00000002 },
-    { 0x000a00ba, 0x00000004 },
-    { 0x20007000, 0000000000 },
-    { 0x01200000, 0x00000002 },
-    { 0x20077000, 0x00000002 },
-    { 0x01200000, 0x00000002 },
-    { 0x20007000, 0000000000 },
-    { 0x00061000, 0x00000002 },
-    { 0x0120751b, 0x00000002 },
-    { 0x8040750a, 0x00000002 },
-    { 0x8040750b, 0x00000002 },
-    { 0x00110000, 0x00000002 },
-    { 0x000380f1, 0x00000002 },
-    { 0x000000d1, 0x0000001c },
-    { 0x000610aa, 0x00000018 },
-    { 0x844075bd, 0x00000002 },
-    { 0x000610a9, 0x00000018 },
-    { 0x840075bb, 0x00000002 },
-    { 0x000610aa, 0x00000018 },
-    { 0x844075bc, 0x00000002 },
-    { 0x000000d4, 0x00000004 },
-    { 0x804075bd, 0x00000002 },
-    { 0x800075bb, 0x00000002 },
-    { 0x804075bc, 0x00000002 },
-    { 0x00108000, 0x00000002 },
-    { 0x01400000, 0x00000002 },
-    { 0x006000d8, 0x0000000c },
-    { 0x20c07000, 0x00000020 },
-    { 0x000000da, 0x00000012 },
-    { 0x00800000, 0x00000006 },
-    { 0x0080751d, 0x00000006 },
-    { 0x000025bb, 0x00000002 },
-    { 0x000040d4, 0x00000004 },
-    { 0x0000775c, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00661000, 0x00000002 },
-    { 0x0460275d, 0x00000020 },
-    { 0x00004000, 0000000000 },
-    { 0x00007999, 0x00000002 },
-    { 0x00a05000, 0x00000002 },
-    { 0x00661000, 0x00000002 },
-    { 0x0460299b, 0x00000020 },
-    { 0x00004000, 0000000000 },
-    { 0x01e00830, 0x00000002 },
-    { 0x21007000, 0000000000 },
-    { 0x00005000, 0x00000002 },
-    { 0x00038056, 0x00000002 },
-    { 0x040025e0, 0x00000002 },
-    { 0x000075e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000380ed, 0x00000002 },
-    { 0x04007394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000078c4, 0x00000002 },
-    { 0x000078c5, 0x00000002 },
-    { 0x000078c6, 0x00000002 },
-    { 0x00007924, 0x00000002 },
-    { 0x00007925, 0x00000002 },
-    { 0x00007926, 0x00000002 },
-    { 0x000000f2, 0x00000004 },
-    { 0x00007924, 0x00000002 },
-    { 0x00007925, 0x00000002 },
-    { 0x00007926, 0x00000002 },
-    { 0x000000f9, 0x00000004 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 R300_cp_microcode[][2] = {
-    { 0x4200e000, 0000000000 },
-    { 0x4000e000, 0000000000 },
-    { 0x000000ae, 0x00000008 },
-    { 0x000000b2, 0x00000008 },
-    { 0x67554b4a, 0000000000 },
-    { 0x4a4a4475, 0000000000 },
-    { 0x55527d83, 0000000000 },
-    { 0x4a8c8b65, 0000000000 },
-    { 0x4aef4af6, 0000000000 },
-    { 0x4ae14a4a, 0000000000 },
-    { 0xe4979797, 0000000000 },
-    { 0xdb4aebdd, 0000000000 },
-    { 0x9ccc4a4a, 0000000000 },
-    { 0xd1989898, 0000000000 },
-    { 0x4a0f9ad6, 0000000000 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000d0012, 0x00000038 },
-    { 0x0000e8b4, 0x00000004 },
-    { 0x000d0014, 0x00000038 },
-    { 0x0000e8b6, 0x00000004 },
-    { 0x000d0016, 0x00000038 },
-    { 0x0000e854, 0x00000004 },
-    { 0x000d0018, 0x00000038 },
-    { 0x0000e855, 0x00000004 },
-    { 0x000d001a, 0x00000038 },
-    { 0x0000e856, 0x00000004 },
-    { 0x000d001c, 0x00000038 },
-    { 0x0000e857, 0x00000004 },
-    { 0x000d001e, 0x00000038 },
-    { 0x0000e824, 0x00000004 },
-    { 0x000d0020, 0x00000038 },
-    { 0x0000e825, 0x00000004 },
-    { 0x000d0022, 0x00000038 },
-    { 0x0000e830, 0x00000004 },
-    { 0x000d0024, 0x00000038 },
-    { 0x0000f0c0, 0x00000004 },
-    { 0x000d0026, 0x00000038 },
-    { 0x0000f0c1, 0x00000004 },
-    { 0x000d0028, 0x00000038 },
-    { 0x0000f041, 0x00000004 },
-    { 0x000d002a, 0x00000038 },
-    { 0x0000f184, 0x00000004 },
-    { 0x000d002c, 0x00000038 },
-    { 0x0000f185, 0x00000004 },
-    { 0x000d002e, 0x00000038 },
-    { 0x0000f186, 0x00000004 },
-    { 0x000d0030, 0x00000038 },
-    { 0x0000f187, 0x00000004 },
-    { 0x000d0032, 0x00000038 },
-    { 0x0000f180, 0x00000004 },
-    { 0x000d0034, 0x00000038 },
-    { 0x0000f393, 0x00000004 },
-    { 0x000d0036, 0x00000038 },
-    { 0x0000f38a, 0x00000004 },
-    { 0x000d0038, 0x00000038 },
-    { 0x0000f38e, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000043, 0x00000018 },
-    { 0x00cce800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x0000003a, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x2000451d, 0x00000004 },
-    { 0x0000e580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x08004580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x00000047, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x00032000, 0x00000004 },
-    { 0x00022051, 0x00000028 },
-    { 0x00000051, 0x00000024 },
-    { 0x0800450f, 0x00000004 },
-    { 0x0000a04b, 0x00000008 },
-    { 0x0000e565, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000052, 0x00000008 },
-    { 0x03cca5b4, 0x00000004 },
-    { 0x05432000, 0x00000004 },
-    { 0x00022000, 0x00000004 },
-    { 0x4ccce05e, 0x00000030 },
-    { 0x08274565, 0x00000004 },
-    { 0x0000005e, 0x00000030 },
-    { 0x08004564, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000055, 0x00000008 },
-    { 0x00802061, 0x00000010 },
-    { 0x00202000, 0x00000004 },
-    { 0x001b00ff, 0x00000004 },
-    { 0x01000064, 0x00000010 },
-    { 0x001f2000, 0x00000004 },
-    { 0x001c00ff, 0x00000004 },
-    { 0000000000, 0x0000000c },
-    { 0x00000080, 0x00000030 },
-    { 0x00000055, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00012000, 0x00000004 },
-    { 0x00082000, 0x00000004 },
-    { 0x1800650e, 0x00000004 },
-    { 0x00092000, 0x00000004 },
-    { 0x000a2000, 0x00000004 },
-    { 0x000f0000, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x00000074, 0x00000018 },
-    { 0x0000e563, 0x00000004 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000069, 0x00000008 },
-    { 0x0000a069, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x0000e577, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x0000e50f, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000077, 0x00000018 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000077, 0x00000008 },
-    { 0x0014e50e, 0x00000004 },
-    { 0x0040e50f, 0x00000004 },
-    { 0x00c0007a, 0x00000008 },
-    { 0x0000e570, 0x00000004 },
-    { 0x0000e571, 0x00000004 },
-    { 0x0000e572, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x0000e568, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00000084, 0x00000018 },
-    { 0x000b0000, 0x00000004 },
-    { 0x18c0e562, 0x00000004 },
-    { 0x00000086, 0x00000008 },
-    { 0x00c00085, 0x00000008 },
-    { 0x000700e3, 0x00000004 },
-    { 0x00000092, 0x00000038 },
-    { 0x000ca094, 0x00000030 },
-    { 0x080045bb, 0x00000004 },
-    { 0x000c2095, 0x00000030 },
-    { 0x0800e5bc, 0000000000 },
-    { 0x0000e5bb, 0x00000004 },
-    { 0x0000e5bc, 0000000000 },
-    { 0x00120000, 0x0000000c },
-    { 0x00120000, 0x00000004 },
-    { 0x001b0002, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e800, 0000000000 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e82e, 0000000000 },
-    { 0x02cca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000ce1cc, 0x00000004 },
-    { 0x050de1cd, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x000000a4, 0x00000018 },
-    { 0x00c0a000, 0x00000004 },
-    { 0x000000a1, 0x00000008 },
-    { 0x000000a6, 0x00000020 },
-    { 0x4200e000, 0000000000 },
-    { 0x000000ad, 0x00000038 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00160000, 0x00000004 },
-    { 0x700ce000, 0x00000004 },
-    { 0x001400a9, 0x00000008 },
-    { 0x4000e000, 0000000000 },
-    { 0x02400000, 0x00000004 },
-    { 0x400ee000, 0x00000004 },
-    { 0x02400000, 0x00000004 },
-    { 0x4000e000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0240e51b, 0x00000004 },
-    { 0x0080e50a, 0x00000005 },
-    { 0x0080e50b, 0x00000005 },
-    { 0x00220000, 0x00000004 },
-    { 0x000700e3, 0x00000004 },
-    { 0x000000c0, 0x00000038 },
-    { 0x000c2095, 0x00000030 },
-    { 0x0880e5bd, 0x00000005 },
-    { 0x000c2094, 0x00000030 },
-    { 0x0800e5bb, 0x00000005 },
-    { 0x000c2095, 0x00000030 },
-    { 0x0880e5bc, 0x00000005 },
-    { 0x000000c3, 0x00000008 },
-    { 0x0080e5bd, 0x00000005 },
-    { 0x0000e5bb, 0x00000005 },
-    { 0x0080e5bc, 0x00000005 },
-    { 0x00210000, 0x00000004 },
-    { 0x02800000, 0x00000004 },
-    { 0x00c000c7, 0x00000018 },
-    { 0x4180e000, 0x00000040 },
-    { 0x000000c9, 0x00000024 },
-    { 0x01000000, 0x0000000c },
-    { 0x0100e51d, 0x0000000c },
-    { 0x000045bb, 0x00000004 },
-    { 0x000080c3, 0x00000008 },
-    { 0x0000f3ce, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053cf, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f3d2, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053d3, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f39d, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c0539e, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x03c00830, 0x00000004 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x200045e0, 0x00000004 },
-    { 0x0000e5e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000700e0, 0x00000004 },
-    { 0x0800e394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x0000e8c4, 0x00000004 },
-    { 0x0000e8c5, 0x00000004 },
-    { 0x0000e8c6, 0x00000004 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000e4, 0x00000008 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000eb, 0x00000008 },
-    { 0x02c02000, 0x00000004 },
-    { 0x00060000, 0x00000004 },
-    { 0x000000f3, 0x00000034 },
-    { 0x000000f0, 0x00000008 },
-    { 0x00008000, 0x00000004 },
-    { 0xc000e000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x001d0018, 0x00000004 },
-    { 0x001a0001, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0x0500a04a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 R420_cp_microcode[][2] = {
-    { 0x4200e000, 0000000000 },
-    { 0x4000e000, 0000000000 },
-    { 0x00000099, 0x00000008 },
-    { 0x0000009d, 0x00000008 },
-    { 0x4a554b4a, 0000000000 },
-    { 0x4a4a4467, 0000000000 },
-    { 0x55526f75, 0000000000 },
-    { 0x4a7e7d65, 0000000000 },
-    { 0xd9d3dff6, 0000000000 },
-    { 0x4ac54a4a, 0000000000 },
-    { 0xc8828282, 0000000000 },
-    { 0xbf4acfc1, 0000000000 },
-    { 0x87b04a4a, 0000000000 },
-    { 0xb5838383, 0000000000 },
-    { 0x4a0f85ba, 0000000000 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000d0012, 0x00000038 },
-    { 0x0000e8b4, 0x00000004 },
-    { 0x000d0014, 0x00000038 },
-    { 0x0000e8b6, 0x00000004 },
-    { 0x000d0016, 0x00000038 },
-    { 0x0000e854, 0x00000004 },
-    { 0x000d0018, 0x00000038 },
-    { 0x0000e855, 0x00000004 },
-    { 0x000d001a, 0x00000038 },
-    { 0x0000e856, 0x00000004 },
-    { 0x000d001c, 0x00000038 },
-    { 0x0000e857, 0x00000004 },
-    { 0x000d001e, 0x00000038 },
-    { 0x0000e824, 0x00000004 },
-    { 0x000d0020, 0x00000038 },
-    { 0x0000e825, 0x00000004 },
-    { 0x000d0022, 0x00000038 },
-    { 0x0000e830, 0x00000004 },
-    { 0x000d0024, 0x00000038 },
-    { 0x0000f0c0, 0x00000004 },
-    { 0x000d0026, 0x00000038 },
-    { 0x0000f0c1, 0x00000004 },
-    { 0x000d0028, 0x00000038 },
-    { 0x0000f041, 0x00000004 },
-    { 0x000d002a, 0x00000038 },
-    { 0x0000f184, 0x00000004 },
-    { 0x000d002c, 0x00000038 },
-    { 0x0000f185, 0x00000004 },
-    { 0x000d002e, 0x00000038 },
-    { 0x0000f186, 0x00000004 },
-    { 0x000d0030, 0x00000038 },
-    { 0x0000f187, 0x00000004 },
-    { 0x000d0032, 0x00000038 },
-    { 0x0000f180, 0x00000004 },
-    { 0x000d0034, 0x00000038 },
-    { 0x0000f393, 0x00000004 },
-    { 0x000d0036, 0x00000038 },
-    { 0x0000f38a, 0x00000004 },
-    { 0x000d0038, 0x00000038 },
-    { 0x0000f38e, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000043, 0x00000018 },
-    { 0x00cce800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x0000003a, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x2000451d, 0x00000004 },
-    { 0x0000e580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x08004580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x00000047, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x00032000, 0x00000004 },
-    { 0x00022051, 0x00000028 },
-    { 0x00000051, 0x00000024 },
-    { 0x0800450f, 0x00000004 },
-    { 0x0000a04b, 0x00000008 },
-    { 0x0000e565, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000052, 0x00000008 },
-    { 0x03cca5b4, 0x00000004 },
-    { 0x05432000, 0x00000004 },
-    { 0x00022000, 0x00000004 },
-    { 0x4ccce05e, 0x00000030 },
-    { 0x08274565, 0x00000004 },
-    { 0x0000005e, 0x00000030 },
-    { 0x08004564, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000055, 0x00000008 },
-    { 0x00802061, 0x00000010 },
-    { 0x00202000, 0x00000004 },
-    { 0x001b00ff, 0x00000004 },
-    { 0x01000064, 0x00000010 },
-    { 0x001f2000, 0x00000004 },
-    { 0x001c00ff, 0x00000004 },
-    { 0000000000, 0x0000000c },
-    { 0x00000072, 0x00000030 },
-    { 0x00000055, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x0000e577, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x0000e50f, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000069, 0x00000018 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000069, 0x00000008 },
-    { 0x0014e50e, 0x00000004 },
-    { 0x0040e50f, 0x00000004 },
-    { 0x00c0006c, 0x00000008 },
-    { 0x0000e570, 0x00000004 },
-    { 0x0000e571, 0x00000004 },
-    { 0x0000e572, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x0000e568, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00000076, 0x00000018 },
-    { 0x000b0000, 0x00000004 },
-    { 0x18c0e562, 0x00000004 },
-    { 0x00000078, 0x00000008 },
-    { 0x00c00077, 0x00000008 },
-    { 0x000700c7, 0x00000004 },
-    { 0x00000080, 0x00000038 },
-    { 0x0000e5bb, 0x00000004 },
-    { 0x0000e5bc, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e800, 0000000000 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e82e, 0000000000 },
-    { 0x02cca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000ce1cc, 0x00000004 },
-    { 0x050de1cd, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x0000008f, 0x00000018 },
-    { 0x00c0a000, 0x00000004 },
-    { 0x0000008c, 0x00000008 },
-    { 0x00000091, 0x00000020 },
-    { 0x4200e000, 0000000000 },
-    { 0x00000098, 0x00000038 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00160000, 0x00000004 },
-    { 0x700ce000, 0x00000004 },
-    { 0x00140094, 0x00000008 },
-    { 0x4000e000, 0000000000 },
-    { 0x02400000, 0x00000004 },
-    { 0x400ee000, 0x00000004 },
-    { 0x02400000, 0x00000004 },
-    { 0x4000e000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0240e51b, 0x00000004 },
-    { 0x0080e50a, 0x00000005 },
-    { 0x0080e50b, 0x00000005 },
-    { 0x00220000, 0x00000004 },
-    { 0x000700c7, 0x00000004 },
-    { 0x000000a4, 0x00000038 },
-    { 0x0080e5bd, 0x00000005 },
-    { 0x0000e5bb, 0x00000005 },
-    { 0x0080e5bc, 0x00000005 },
-    { 0x00210000, 0x00000004 },
-    { 0x02800000, 0x00000004 },
-    { 0x00c000ab, 0x00000018 },
-    { 0x4180e000, 0x00000040 },
-    { 0x000000ad, 0x00000024 },
-    { 0x01000000, 0x0000000c },
-    { 0x0100e51d, 0x0000000c },
-    { 0x000045bb, 0x00000004 },
-    { 0x000080a7, 0x00000008 },
-    { 0x0000f3ce, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053cf, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f3d2, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053d3, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f39d, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c0539e, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x03c00830, 0x00000004 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x200045e0, 0x00000004 },
-    { 0x0000e5e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000700c4, 0x00000004 },
-    { 0x0800e394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x0000e8c4, 0x00000004 },
-    { 0x0000e8c5, 0x00000004 },
-    { 0x0000e8c6, 0x00000004 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000c8, 0x00000008 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000cf, 0x00000008 },
-    { 0x02c02000, 0x00000004 },
-    { 0x00060000, 0x00000004 },
-    { 0x000000d7, 0x00000034 },
-    { 0x000000d4, 0x00000008 },
-    { 0x00008000, 0x00000004 },
-    { 0xc000e000, 0000000000 },
-    { 0x0000e1cc, 0x00000004 },
-    { 0x0500e1cd, 0x00000004 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000000de, 0x00000034 },
-    { 0x000000da, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x0019e1cc, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x0500a000, 0x00000004 },
-    { 0x080041cd, 0x00000004 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x001d0018, 0x00000004 },
-    { 0x001a0001, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0x0500a04a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 RS600_cp_microcode[][2] = {
-    { 0x4200e000, 0000000000 },
-    { 0x4000e000, 0000000000 },
-    { 0x000000a0, 0x00000008 },
-    { 0x000000a4, 0x00000008 },
-    { 0x4a554b4a, 0000000000 },
-    { 0x4a4a4467, 0000000000 },
-    { 0x55526f75, 0000000000 },
-    { 0x4a7e7d65, 0000000000 },
-    { 0x4ae74af6, 0000000000 },
-    { 0x4ad34a4a, 0000000000 },
-    { 0xd6898989, 0000000000 },
-    { 0xcd4addcf, 0000000000 },
-    { 0x8ebe4ae2, 0000000000 },
-    { 0xc38a8a8a, 0000000000 },
-    { 0x4a0f8cc8, 0000000000 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000d0012, 0x00000038 },
-    { 0x0000e8b4, 0x00000004 },
-    { 0x000d0014, 0x00000038 },
-    { 0x0000e8b6, 0x00000004 },
-    { 0x000d0016, 0x00000038 },
-    { 0x0000e854, 0x00000004 },
-    { 0x000d0018, 0x00000038 },
-    { 0x0000e855, 0x00000004 },
-    { 0x000d001a, 0x00000038 },
-    { 0x0000e856, 0x00000004 },
-    { 0x000d001c, 0x00000038 },
-    { 0x0000e857, 0x00000004 },
-    { 0x000d001e, 0x00000038 },
-    { 0x0000e824, 0x00000004 },
-    { 0x000d0020, 0x00000038 },
-    { 0x0000e825, 0x00000004 },
-    { 0x000d0022, 0x00000038 },
-    { 0x0000e830, 0x00000004 },
-    { 0x000d0024, 0x00000038 },
-    { 0x0000f0c0, 0x00000004 },
-    { 0x000d0026, 0x00000038 },
-    { 0x0000f0c1, 0x00000004 },
-    { 0x000d0028, 0x00000038 },
-    { 0x0000f041, 0x00000004 },
-    { 0x000d002a, 0x00000038 },
-    { 0x0000f184, 0x00000004 },
-    { 0x000d002c, 0x00000038 },
-    { 0x0000f185, 0x00000004 },
-    { 0x000d002e, 0x00000038 },
-    { 0x0000f186, 0x00000004 },
-    { 0x000d0030, 0x00000038 },
-    { 0x0000f187, 0x00000004 },
-    { 0x000d0032, 0x00000038 },
-    { 0x0000f180, 0x00000004 },
-    { 0x000d0034, 0x00000038 },
-    { 0x0000f393, 0x00000004 },
-    { 0x000d0036, 0x00000038 },
-    { 0x0000f38a, 0x00000004 },
-    { 0x000d0038, 0x00000038 },
-    { 0x0000f38e, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000043, 0x00000018 },
-    { 0x00cce800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x0000003a, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x2000451d, 0x00000004 },
-    { 0x0000e580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x08004580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x00000047, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x00032000, 0x00000004 },
-    { 0x00022051, 0x00000028 },
-    { 0x00000051, 0x00000024 },
-    { 0x0800450f, 0x00000004 },
-    { 0x0000a04b, 0x00000008 },
-    { 0x0000e565, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000052, 0x00000008 },
-    { 0x03cca5b4, 0x00000004 },
-    { 0x05432000, 0x00000004 },
-    { 0x00022000, 0x00000004 },
-    { 0x4ccce05e, 0x00000030 },
-    { 0x08274565, 0x00000004 },
-    { 0x0000005e, 0x00000030 },
-    { 0x08004564, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000055, 0x00000008 },
-    { 0x00802061, 0x00000010 },
-    { 0x00202000, 0x00000004 },
-    { 0x001b00ff, 0x00000004 },
-    { 0x01000064, 0x00000010 },
-    { 0x001f2000, 0x00000004 },
-    { 0x001c00ff, 0x00000004 },
-    { 0000000000, 0x0000000c },
-    { 0x00000072, 0x00000030 },
-    { 0x00000055, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x0000e577, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x0000e50f, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000069, 0x00000018 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000069, 0x00000008 },
-    { 0x0014e50e, 0x00000004 },
-    { 0x0040e50f, 0x00000004 },
-    { 0x00c0006c, 0x00000008 },
-    { 0x0000e570, 0x00000004 },
-    { 0x0000e571, 0x00000004 },
-    { 0x0000e572, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x0000e568, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00000076, 0x00000018 },
-    { 0x000b0000, 0x00000004 },
-    { 0x18c0e562, 0x00000004 },
-    { 0x00000078, 0x00000008 },
-    { 0x00c00077, 0x00000008 },
-    { 0x000700d5, 0x00000004 },
-    { 0x00000084, 0x00000038 },
-    { 0x000ca086, 0x00000030 },
-    { 0x080045bb, 0x00000004 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0800e5bc, 0000000000 },
-    { 0x0000e5bb, 0x00000004 },
-    { 0x0000e5bc, 0000000000 },
-    { 0x00120000, 0x0000000c },
-    { 0x00120000, 0x00000004 },
-    { 0x001b0002, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e800, 0000000000 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e82e, 0000000000 },
-    { 0x02cca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000ce1cc, 0x00000004 },
-    { 0x050de1cd, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x00000096, 0x00000018 },
-    { 0x00c0a000, 0x00000004 },
-    { 0x00000093, 0x00000008 },
-    { 0x00000098, 0x00000020 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000009f, 0x00000038 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00160000, 0x00000004 },
-    { 0x700ce000, 0x00000004 },
-    { 0x0014009b, 0x00000008 },
-    { 0x4000e000, 0000000000 },
-    { 0x02400000, 0x00000004 },
-    { 0x400ee000, 0x00000004 },
-    { 0x02400000, 0x00000004 },
-    { 0x4000e000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0240e51b, 0x00000004 },
-    { 0x0080e50a, 0x00000005 },
-    { 0x0080e50b, 0x00000005 },
-    { 0x00220000, 0x00000004 },
-    { 0x000700d5, 0x00000004 },
-    { 0x000000b2, 0x00000038 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0880e5bd, 0x00000005 },
-    { 0x000c2086, 0x00000030 },
-    { 0x0800e5bb, 0x00000005 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0880e5bc, 0x00000005 },
-    { 0x000000b5, 0x00000008 },
-    { 0x0080e5bd, 0x00000005 },
-    { 0x0000e5bb, 0x00000005 },
-    { 0x0080e5bc, 0x00000005 },
-    { 0x00210000, 0x00000004 },
-    { 0x02800000, 0x00000004 },
-    { 0x00c000b9, 0x00000018 },
-    { 0x4180e000, 0x00000040 },
-    { 0x000000bb, 0x00000024 },
-    { 0x01000000, 0x0000000c },
-    { 0x0100e51d, 0x0000000c },
-    { 0x000045bb, 0x00000004 },
-    { 0x000080b5, 0x00000008 },
-    { 0x0000f3ce, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053cf, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f3d2, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053d3, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f39d, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c0539e, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x03c00830, 0x00000004 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x200045e0, 0x00000004 },
-    { 0x0000e5e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000700d2, 0x00000004 },
-    { 0x0800e394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x0000e8c4, 0x00000004 },
-    { 0x0000e8c5, 0x00000004 },
-    { 0x0000e8c6, 0x00000004 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000d6, 0x00000008 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000dd, 0x00000008 },
-    { 0x00e00116, 0000000000 },
-    { 0x000700e1, 0x00000004 },
-    { 0x0800401c, 0x00000004 },
-    { 0x200050e7, 0x00000004 },
-    { 0x0000e01d, 0x00000004 },
-    { 0x000000e4, 0x00000008 },
-    { 0x02c02000, 0x00000004 },
-    { 0x00060000, 0x00000004 },
-    { 0x000000eb, 0x00000034 },
-    { 0x000000e8, 0x00000008 },
-    { 0x00008000, 0x00000004 },
-    { 0xc000e000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x001d0018, 0x00000004 },
-    { 0x001a0001, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0x0500a04a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 RS690_cp_microcode[][2] = {
-    { 0x000000dd, 0x00000008 },
-    { 0x000000df, 0x00000008 },
-    { 0x000000a0, 0x00000008 },
-    { 0x000000a4, 0x00000008 },
-    { 0x4a554b4a, 0000000000 },
-    { 0x4a4a4467, 0000000000 },
-    { 0x55526f75, 0000000000 },
-    { 0x4a7e7d65, 0000000000 },
-    { 0x4ad74af6, 0000000000 },
-    { 0x4ac94a4a, 0000000000 },
-    { 0xcc898989, 0000000000 },
-    { 0xc34ad3c5, 0000000000 },
-    { 0x8e4a4a4a, 0000000000 },
-    { 0x4a8a8a8a, 0000000000 },
-    { 0x4a0f8c4a, 0000000000 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000d0012, 0x00000038 },
-    { 0x0000e8b4, 0x00000004 },
-    { 0x000d0014, 0x00000038 },
-    { 0x0000e8b6, 0x00000004 },
-    { 0x000d0016, 0x00000038 },
-    { 0x0000e854, 0x00000004 },
-    { 0x000d0018, 0x00000038 },
-    { 0x0000e855, 0x00000004 },
-    { 0x000d001a, 0x00000038 },
-    { 0x0000e856, 0x00000004 },
-    { 0x000d001c, 0x00000038 },
-    { 0x0000e857, 0x00000004 },
-    { 0x000d001e, 0x00000038 },
-    { 0x0000e824, 0x00000004 },
-    { 0x000d0020, 0x00000038 },
-    { 0x0000e825, 0x00000004 },
-    { 0x000d0022, 0x00000038 },
-    { 0x0000e830, 0x00000004 },
-    { 0x000d0024, 0x00000038 },
-    { 0x0000f0c0, 0x00000004 },
-    { 0x000d0026, 0x00000038 },
-    { 0x0000f0c1, 0x00000004 },
-    { 0x000d0028, 0x00000038 },
-    { 0x0000f041, 0x00000004 },
-    { 0x000d002a, 0x00000038 },
-    { 0x0000f184, 0x00000004 },
-    { 0x000d002c, 0x00000038 },
-    { 0x0000f185, 0x00000004 },
-    { 0x000d002e, 0x00000038 },
-    { 0x0000f186, 0x00000004 },
-    { 0x000d0030, 0x00000038 },
-    { 0x0000f187, 0x00000004 },
-    { 0x000d0032, 0x00000038 },
-    { 0x0000f180, 0x00000004 },
-    { 0x000d0034, 0x00000038 },
-    { 0x0000f393, 0x00000004 },
-    { 0x000d0036, 0x00000038 },
-    { 0x0000f38a, 0x00000004 },
-    { 0x000d0038, 0x00000038 },
-    { 0x0000f38e, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000043, 0x00000018 },
-    { 0x00cce800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x0000003a, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x2000451d, 0x00000004 },
-    { 0x0000e580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x08004580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x00000047, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x00032000, 0x00000004 },
-    { 0x00022051, 0x00000028 },
-    { 0x00000051, 0x00000024 },
-    { 0x0800450f, 0x00000004 },
-    { 0x0000a04b, 0x00000008 },
-    { 0x0000e565, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000052, 0x00000008 },
-    { 0x03cca5b4, 0x00000004 },
-    { 0x05432000, 0x00000004 },
-    { 0x00022000, 0x00000004 },
-    { 0x4ccce05e, 0x00000030 },
-    { 0x08274565, 0x00000004 },
-    { 0x0000005e, 0x00000030 },
-    { 0x08004564, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000055, 0x00000008 },
-    { 0x00802061, 0x00000010 },
-    { 0x00202000, 0x00000004 },
-    { 0x001b00ff, 0x00000004 },
-    { 0x01000064, 0x00000010 },
-    { 0x001f2000, 0x00000004 },
-    { 0x001c00ff, 0x00000004 },
-    { 0000000000, 0x0000000c },
-    { 0x00000072, 0x00000030 },
-    { 0x00000055, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x0000e577, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x0000e50f, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000069, 0x00000018 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000069, 0x00000008 },
-    { 0x0014e50e, 0x00000004 },
-    { 0x0040e50f, 0x00000004 },
-    { 0x00c0006c, 0x00000008 },
-    { 0x0000e570, 0x00000004 },
-    { 0x0000e571, 0x00000004 },
-    { 0x0000e572, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x0000e568, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00000076, 0x00000018 },
-    { 0x000b0000, 0x00000004 },
-    { 0x18c0e562, 0x00000004 },
-    { 0x00000078, 0x00000008 },
-    { 0x00c00077, 0x00000008 },
-    { 0x000700cb, 0x00000004 },
-    { 0x00000084, 0x00000038 },
-    { 0x000ca086, 0x00000030 },
-    { 0x080045bb, 0x00000004 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0800e5bc, 0000000000 },
-    { 0x0000e5bb, 0x00000004 },
-    { 0x0000e5bc, 0000000000 },
-    { 0x00120000, 0x0000000c },
-    { 0x00120000, 0x00000004 },
-    { 0x001b0002, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e800, 0000000000 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e82e, 0000000000 },
-    { 0x02cca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000ce1cc, 0x00000004 },
-    { 0x050de1cd, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x00000096, 0x00000018 },
-    { 0x00c0a000, 0x00000004 },
-    { 0x00000093, 0x00000008 },
-    { 0x00000098, 0x00000020 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000009f, 0x00000038 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00160000, 0x00000004 },
-    { 0x700ce000, 0x00000004 },
-    { 0x0014009b, 0x00000008 },
-    { 0x4000e000, 0000000000 },
-    { 0x02400000, 0x00000004 },
-    { 0x400ee000, 0x00000004 },
-    { 0x02400000, 0x00000004 },
-    { 0x4000e000, 0000000000 },
-    { 0x00100000, 0x0000002c },
-    { 0x00004000, 0000000000 },
-    { 0x080045c8, 0x00000004 },
-    { 0x00240005, 0x00000004 },
-    { 0x08004d0b, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0240e51b, 0x00000004 },
-    { 0x0080e50a, 0x00000005 },
-    { 0x0080e50b, 0x00000005 },
-    { 0x00220000, 0x00000004 },
-    { 0x000700cb, 0x00000004 },
-    { 0x000000b7, 0x00000038 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0880e5bd, 0x00000005 },
-    { 0x000c2086, 0x00000030 },
-    { 0x0800e5bb, 0x00000005 },
-    { 0x000c2087, 0x00000030 },
-    { 0x0880e5bc, 0x00000005 },
-    { 0x000000ba, 0x00000008 },
-    { 0x0080e5bd, 0x00000005 },
-    { 0x0000e5bb, 0x00000005 },
-    { 0x0080e5bc, 0x00000005 },
-    { 0x00210000, 0x00000004 },
-    { 0x02800000, 0x00000004 },
-    { 0x00c000be, 0x00000018 },
-    { 0x4180e000, 0x00000040 },
-    { 0x000000c0, 0x00000024 },
-    { 0x01000000, 0x0000000c },
-    { 0x0100e51d, 0x0000000c },
-    { 0x000045bb, 0x00000004 },
-    { 0x000080ba, 0x00000008 },
-    { 0x03c00830, 0x00000004 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x200045e0, 0x00000004 },
-    { 0x0000e5e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000700c8, 0x00000004 },
-    { 0x0800e394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x0000e8c4, 0x00000004 },
-    { 0x0000e8c5, 0x00000004 },
-    { 0x0000e8c6, 0x00000004 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000cc, 0x00000008 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000d3, 0x00000008 },
-    { 0x02c02000, 0x00000004 },
-    { 0x00060000, 0x00000004 },
-    { 0x000000db, 0x00000034 },
-    { 0x000000d8, 0x00000008 },
-    { 0x00008000, 0x00000004 },
-    { 0xc000e000, 0000000000 },
-    { 0x000000e1, 0x00000030 },
-    { 0x4200e000, 0000000000 },
-    { 0x000000e1, 0x00000030 },
-    { 0x4000e000, 0000000000 },
-    { 0x0025001b, 0x00000004 },
-    { 0x00230000, 0x00000004 },
-    { 0x00250005, 0x00000004 },
-    { 0x000000e6, 0x00000034 },
-    { 0000000000, 0x0000000c },
-    { 0x00244000, 0x00000004 },
-    { 0x080045c8, 0x00000004 },
-    { 0x00240005, 0x00000004 },
-    { 0x08004d0b, 0x0000000c },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x001d0018, 0x00000004 },
-    { 0x001a0001, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0x0500a04a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-static const u32 R520_cp_microcode[][2] = {
-    { 0x4200e000, 0000000000 },
-    { 0x4000e000, 0000000000 },
-    { 0x00000099, 0x00000008 },
-    { 0x0000009d, 0x00000008 },
-    { 0x4a554b4a, 0000000000 },
-    { 0x4a4a4467, 0000000000 },
-    { 0x55526f75, 0000000000 },
-    { 0x4a7e7d65, 0000000000 },
-    { 0xe0dae6f6, 0000000000 },
-    { 0x4ac54a4a, 0000000000 },
-    { 0xc8828282, 0000000000 },
-    { 0xbf4acfc1, 0000000000 },
-    { 0x87b04ad5, 0000000000 },
-    { 0xb5838383, 0000000000 },
-    { 0x4a0f85ba, 0000000000 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000d0012, 0x00000038 },
-    { 0x0000e8b4, 0x00000004 },
-    { 0x000d0014, 0x00000038 },
-    { 0x0000e8b6, 0x00000004 },
-    { 0x000d0016, 0x00000038 },
-    { 0x0000e854, 0x00000004 },
-    { 0x000d0018, 0x00000038 },
-    { 0x0000e855, 0x00000004 },
-    { 0x000d001a, 0x00000038 },
-    { 0x0000e856, 0x00000004 },
-    { 0x000d001c, 0x00000038 },
-    { 0x0000e857, 0x00000004 },
-    { 0x000d001e, 0x00000038 },
-    { 0x0000e824, 0x00000004 },
-    { 0x000d0020, 0x00000038 },
-    { 0x0000e825, 0x00000004 },
-    { 0x000d0022, 0x00000038 },
-    { 0x0000e830, 0x00000004 },
-    { 0x000d0024, 0x00000038 },
-    { 0x0000f0c0, 0x00000004 },
-    { 0x000d0026, 0x00000038 },
-    { 0x0000f0c1, 0x00000004 },
-    { 0x000d0028, 0x00000038 },
-    { 0x0000e000, 0x00000004 },
-    { 0x000d002a, 0x00000038 },
-    { 0x0000e000, 0x00000004 },
-    { 0x000d002c, 0x00000038 },
-    { 0x0000e000, 0x00000004 },
-    { 0x000d002e, 0x00000038 },
-    { 0x0000e000, 0x00000004 },
-    { 0x000d0030, 0x00000038 },
-    { 0x0000e000, 0x00000004 },
-    { 0x000d0032, 0x00000038 },
-    { 0x0000f180, 0x00000004 },
-    { 0x000d0034, 0x00000038 },
-    { 0x0000f393, 0x00000004 },
-    { 0x000d0036, 0x00000038 },
-    { 0x0000f38a, 0x00000004 },
-    { 0x000d0038, 0x00000038 },
-    { 0x0000f38e, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000043, 0x00000018 },
-    { 0x00cce800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x08004800, 0x00000004 },
-    { 0x0000003a, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x2000451d, 0x00000004 },
-    { 0x0000e580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x08004580, 0x00000004 },
-    { 0x000ce581, 0x00000004 },
-    { 0x00000047, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x00032000, 0x00000004 },
-    { 0x00022051, 0x00000028 },
-    { 0x00000051, 0x00000024 },
-    { 0x0800450f, 0x00000004 },
-    { 0x0000a04b, 0x00000008 },
-    { 0x0000e565, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000052, 0x00000008 },
-    { 0x03cca5b4, 0x00000004 },
-    { 0x05432000, 0x00000004 },
-    { 0x00022000, 0x00000004 },
-    { 0x4ccce05e, 0x00000030 },
-    { 0x08274565, 0x00000004 },
-    { 0x0000005e, 0x00000030 },
-    { 0x08004564, 0x00000004 },
-    { 0x0000e566, 0x00000004 },
-    { 0x00000055, 0x00000008 },
-    { 0x00802061, 0x00000010 },
-    { 0x00202000, 0x00000004 },
-    { 0x001b00ff, 0x00000004 },
-    { 0x01000064, 0x00000010 },
-    { 0x001f2000, 0x00000004 },
-    { 0x001c00ff, 0x00000004 },
-    { 0000000000, 0x0000000c },
-    { 0x00000072, 0x00000030 },
-    { 0x00000055, 0x00000008 },
-    { 0x0000e576, 0x00000004 },
-    { 0x0000e577, 0x00000004 },
-    { 0x0000e50e, 0x00000004 },
-    { 0x0000e50f, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00000069, 0x00000018 },
-    { 0x00c0e5f9, 0x000000c2 },
-    { 0x00000069, 0x00000008 },
-    { 0x0014e50e, 0x00000004 },
-    { 0x0040e50f, 0x00000004 },
-    { 0x00c0006c, 0x00000008 },
-    { 0x0000e570, 0x00000004 },
-    { 0x0000e571, 0x00000004 },
-    { 0x0000e572, 0x0000000c },
-    { 0x0000a000, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x0000e568, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00000076, 0x00000018 },
-    { 0x000b0000, 0x00000004 },
-    { 0x18c0e562, 0x00000004 },
-    { 0x00000078, 0x00000008 },
-    { 0x00c00077, 0x00000008 },
-    { 0x000700c7, 0x00000004 },
-    { 0x00000080, 0x00000038 },
-    { 0x0000e5bb, 0x00000004 },
-    { 0x0000e5bc, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e800, 0000000000 },
-    { 0x0000e821, 0x00000004 },
-    { 0x0000e82e, 0000000000 },
-    { 0x02cca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000ce1cc, 0x00000004 },
-    { 0x050de1cd, 0x00000004 },
-    { 0x00400000, 0x00000004 },
-    { 0x0000008f, 0x00000018 },
-    { 0x00c0a000, 0x00000004 },
-    { 0x0000008c, 0x00000008 },
-    { 0x00000091, 0x00000020 },
-    { 0x4200e000, 0000000000 },
-    { 0x00000098, 0x00000038 },
-    { 0x000ca000, 0x00000004 },
-    { 0x00140000, 0x00000004 },
-    { 0x000c2000, 0x00000004 },
-    { 0x00160000, 0x00000004 },
-    { 0x700ce000, 0x00000004 },
-    { 0x00140094, 0x00000008 },
-    { 0x4000e000, 0000000000 },
-    { 0x02400000, 0x00000004 },
-    { 0x400ee000, 0x00000004 },
-    { 0x02400000, 0x00000004 },
-    { 0x4000e000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x0240e51b, 0x00000004 },
-    { 0x0080e50a, 0x00000005 },
-    { 0x0080e50b, 0x00000005 },
-    { 0x00220000, 0x00000004 },
-    { 0x000700c7, 0x00000004 },
-    { 0x000000a4, 0x00000038 },
-    { 0x0080e5bd, 0x00000005 },
-    { 0x0000e5bb, 0x00000005 },
-    { 0x0080e5bc, 0x00000005 },
-    { 0x00210000, 0x00000004 },
-    { 0x02800000, 0x00000004 },
-    { 0x00c000ab, 0x00000018 },
-    { 0x4180e000, 0x00000040 },
-    { 0x000000ad, 0x00000024 },
-    { 0x01000000, 0x0000000c },
-    { 0x0100e51d, 0x0000000c },
-    { 0x000045bb, 0x00000004 },
-    { 0x000080a7, 0x00000008 },
-    { 0x0000f3ce, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053cf, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f3d2, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c053d3, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x0000f39d, 0x00000004 },
-    { 0x0140a000, 0x00000004 },
-    { 0x00cc2000, 0x00000004 },
-    { 0x08c0539e, 0x00000040 },
-    { 0x00008000, 0000000000 },
-    { 0x03c00830, 0x00000004 },
-    { 0x4200e000, 0000000000 },
-    { 0x0000a000, 0x00000004 },
-    { 0x200045e0, 0x00000004 },
-    { 0x0000e5e1, 0000000000 },
-    { 0x00000001, 0000000000 },
-    { 0x000700c4, 0x00000004 },
-    { 0x0800e394, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x0000e8c4, 0x00000004 },
-    { 0x0000e8c5, 0x00000004 },
-    { 0x0000e8c6, 0x00000004 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000c8, 0x00000008 },
-    { 0x0000e928, 0x00000004 },
-    { 0x0000e929, 0x00000004 },
-    { 0x0000e92a, 0x00000004 },
-    { 0x000000cf, 0x00000008 },
-    { 0xdeadbeef, 0000000000 },
-    { 0x00000116, 0000000000 },
-    { 0x000700d3, 0x00000004 },
-    { 0x080050e7, 0x00000004 },
-    { 0x000700d4, 0x00000004 },
-    { 0x0800401c, 0x00000004 },
-    { 0x0000e01d, 0000000000 },
-    { 0x02c02000, 0x00000004 },
-    { 0x00060000, 0x00000004 },
-    { 0x000000de, 0x00000034 },
-    { 0x000000db, 0x00000008 },
-    { 0x00008000, 0x00000004 },
-    { 0xc000e000, 0000000000 },
-    { 0x0000e1cc, 0x00000004 },
-    { 0x0500e1cd, 0x00000004 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000000e5, 0x00000034 },
-    { 0x000000e1, 0x00000008 },
-    { 0x0000a000, 0000000000 },
-    { 0x0019e1cc, 0x00000004 },
-    { 0x001b0001, 0x00000004 },
-    { 0x0500a000, 0x00000004 },
-    { 0x080041cd, 0x00000004 },
-    { 0x000ca000, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0x000c2000, 0x00000004 },
-    { 0x001d0018, 0x00000004 },
-    { 0x001a0001, 0x00000004 },
-    { 0x000000fb, 0x00000034 },
-    { 0x0000004a, 0x00000008 },
-    { 0x0500a04a, 0x00000008 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-    { 0000000000, 0000000000 },
-};
-
-
-#endif
index 3b09a1f..570a587 100644 (file)
@@ -175,6 +175,15 @@ struct radeon_mode_info {
        enum radeon_connector_table connector_table;
        bool mode_config_initialized;
        struct radeon_crtc *crtcs[2];
+       /* DVI-I properties */
+       struct drm_property *coherent_mode_property;
+       /* DAC enable load detect */
+       struct drm_property *load_detect_property;
+       /* TV standard load detect */
+       struct drm_property *tv_std_property;
+       /* legacy TMDS PLL detect */
+       struct drm_property *tmds_pll_property;
+
 };
 
 struct radeon_native_mode {
@@ -188,6 +197,21 @@ struct radeon_native_mode {
        uint32_t flags;
 };
 
+#define MAX_H_CODE_TIMING_LEN 32
+#define MAX_V_CODE_TIMING_LEN 32
+
+/* need to store these as reading
+   back code tables is excessive */
+struct radeon_tv_regs {
+       uint32_t tv_uv_adr;
+       uint32_t timing_cntl;
+       uint32_t hrestart;
+       uint32_t vrestart;
+       uint32_t frestart;
+       uint16_t h_code_timing[MAX_H_CODE_TIMING_LEN];
+       uint16_t v_code_timing[MAX_V_CODE_TIMING_LEN];
+};
+
 struct radeon_crtc {
        struct drm_crtc base;
        int crtc_id;
@@ -195,8 +219,6 @@ struct radeon_crtc {
        bool enabled;
        bool can_tile;
        uint32_t crtc_offset;
-       struct radeon_framebuffer *fbdev_fb;
-       struct drm_mode_set mode_set;
        struct drm_gem_object *cursor_bo;
        uint64_t cursor_addr;
        int cursor_width;
@@ -204,7 +226,6 @@ struct radeon_crtc {
        uint32_t legacy_display_base_addr;
        uint32_t legacy_cursor_offset;
        enum radeon_rmx_type rmx_type;
-       uint32_t devices;
        fixed20_12 vsc;
        fixed20_12 hsc;
        struct radeon_native_mode native_mode;
@@ -236,7 +257,13 @@ struct radeon_encoder_tv_dac {
        uint32_t ntsc_tvdac_adj;
        uint32_t pal_tvdac_adj;
 
+       int               h_pos;
+       int               v_pos;
+       int               h_size;
+       int               supported_tv_stds;
+       bool              tv_on;
        enum radeon_tv_std tv_std;
+       struct radeon_tv_regs tv;
 };
 
 struct radeon_encoder_int_tmds {
@@ -255,10 +282,15 @@ struct radeon_encoder_atom_dig {
        struct radeon_native_mode native_mode;
 };
 
+struct radeon_encoder_atom_dac {
+       enum radeon_tv_std tv_std;
+};
+
 struct radeon_encoder {
        struct drm_encoder base;
        uint32_t encoder_id;
        uint32_t devices;
+       uint32_t active_device;
        uint32_t flags;
        uint32_t pixel_clock;
        enum radeon_rmx_type rmx_type;
@@ -276,8 +308,12 @@ struct radeon_connector {
        uint32_t connector_id;
        uint32_t devices;
        struct radeon_i2c_chan *ddc_bus;
-       int use_digital;
+       bool use_digital;
+       /* we need to mind the EDID between detect
+          and get modes due to analog/digital/tvencoder */
+       struct edid *edid;
        void *con_priv;
+       bool dac_load_detect;
 };
 
 struct radeon_framebuffer {
@@ -310,6 +346,7 @@ struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, i
 struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index);
 extern void atombios_external_tmds_setup(struct drm_encoder *encoder, int action);
 extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
+extern void radeon_encoder_set_active_device(struct drm_encoder *encoder);
 
 extern void radeon_crtc_load_lut(struct drm_crtc *crtc);
 extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
@@ -337,16 +374,18 @@ extern bool radeon_atom_get_clock_info(struct drm_device *dev);
 extern bool radeon_combios_get_clock_info(struct drm_device *dev);
 extern struct radeon_encoder_atom_dig *
 radeon_atombios_get_lvds_info(struct radeon_encoder *encoder);
-extern struct radeon_encoder_int_tmds *
-radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
+bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
+                                  struct radeon_encoder_int_tmds *tmds);
+bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
+                                          struct radeon_encoder_int_tmds *tmds);
+bool radeon_legacy_get_tmds_info_from_table(struct radeon_encoder *encoder,
+                                           struct radeon_encoder_int_tmds *tmds);
 extern struct radeon_encoder_primary_dac *
 radeon_atombios_get_primary_dac_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_tv_dac *
 radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_lvds *
 radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
-extern struct radeon_encoder_int_tmds *
-radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
 extern void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_tv_dac *
 radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);
@@ -356,6 +395,8 @@ extern void radeon_combios_output_lock(struct drm_encoder *encoder, bool lock);
 extern void radeon_combios_initialize_bios_scratch_regs(struct drm_device *dev);
 extern void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock);
 extern void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev);
+extern void radeon_save_bios_scratch_regs(struct radeon_device *rdev);
+extern void radeon_restore_bios_scratch_regs(struct radeon_device *rdev);
 extern void
 radeon_atombios_encoder_crtc_scratch_regs(struct drm_encoder *encoder, int crtc);
 extern void
@@ -396,6 +437,19 @@ extern int radeon_static_clocks_init(struct drm_device *dev);
 bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
                                        struct drm_display_mode *mode,
                                        struct drm_display_mode *adjusted_mode);
-void atom_rv515_force_tv_scaler(struct radeon_device *rdev);
-
+void atom_rv515_force_tv_scaler(struct radeon_device *rdev, struct radeon_crtc *radeon_crtc);
+
+/* legacy tv */
+void radeon_legacy_tv_adjust_crtc_reg(struct drm_encoder *encoder,
+                                     uint32_t *h_total_disp, uint32_t *h_sync_strt_wid,
+                                     uint32_t *v_total_disp, uint32_t *v_sync_strt_wid);
+void radeon_legacy_tv_adjust_pll1(struct drm_encoder *encoder,
+                                 uint32_t *htotal_cntl, uint32_t *ppll_ref_div,
+                                 uint32_t *ppll_div_3, uint32_t *pixclks_cntl);
+void radeon_legacy_tv_adjust_pll2(struct drm_encoder *encoder,
+                                 uint32_t *htotal2_cntl, uint32_t *p2pll_ref_div,
+                                 uint32_t *p2pll_div_0, uint32_t *pixclks_cntl);
+void radeon_legacy_tv_mode_set(struct drm_encoder *encoder,
+                              struct drm_display_mode *mode,
+                              struct drm_display_mode *adjusted_mode);
 #endif
index b85fb83..73af463 100644 (file)
@@ -188,6 +188,7 @@ int radeon_object_kmap(struct radeon_object *robj, void **ptr)
        if (ptr) {
                *ptr = robj->kptr;
        }
+       radeon_object_check_tiling(robj, 0, 0);
        return 0;
 }
 
@@ -200,6 +201,7 @@ void radeon_object_kunmap(struct radeon_object *robj)
        }
        robj->kptr = NULL;
        spin_unlock(&robj->tobj.lock);
+       radeon_object_check_tiling(robj, 0, 0);
        ttm_bo_kunmap(&robj->kmap);
 }
 
@@ -369,6 +371,14 @@ void radeon_object_force_delete(struct radeon_device *rdev)
 
 int radeon_object_init(struct radeon_device *rdev)
 {
+       /* Add an MTRR for the VRAM */
+       rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
+                       MTRR_TYPE_WRCOMB, 1);
+       DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",
+               rdev->mc.mc_vram_size >> 20,
+               (unsigned long long)rdev->mc.aper_size >> 20);
+       DRM_INFO("RAM width %dbits %cDR\n",
+                       rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
        return radeon_ttm_init(rdev);
 }
 
index 473e477..10e8af6 100644 (file)
@@ -37,6 +37,7 @@
  * TTM.
  */
 struct radeon_mman {
+       struct ttm_bo_global_ref        bo_global_ref;
        struct ttm_global_reference     mem_global_ref;
        bool                            mem_global_referenced;
        struct ttm_bo_device            bdev;
index 4df43f6..21da871 100644 (file)
 #       define RADEON_TXFORMAT_DXT1               (12 <<  0)
 #       define RADEON_TXFORMAT_DXT23              (14 <<  0)
 #       define RADEON_TXFORMAT_DXT45              (15 <<  0)
+#      define RADEON_TXFORMAT_SHADOW16           (16 <<  0)
+#      define RADEON_TXFORMAT_SHADOW32           (17 <<  0)
+#       define RADEON_TXFORMAT_DUDV88             (18 <<  0)
+#       define RADEON_TXFORMAT_LDUDV655           (19 <<  0)
+#       define RADEON_TXFORMAT_LDUDUV8888         (20 <<  0)
 #       define RADEON_TXFORMAT_FORMAT_MASK        (31 <<  0)
 #       define RADEON_TXFORMAT_FORMAT_SHIFT       0
 #       define RADEON_TXFORMAT_APPLE_YUV_MODE     (1  <<  5)
 #       define RADEON_ROP_ENABLE               (1  <<  6)
 #       define RADEON_STENCIL_ENABLE           (1  <<  7)
 #       define RADEON_Z_ENABLE                 (1  <<  8)
-#       define RADEON_DEPTH_XZ_OFFEST_ENABLE   (1  <<  9)
+#       define RADEON_DEPTHXY_OFFSET_ENABLE    (1  <<  9)
 #       define RADEON_RB3D_COLOR_FORMAT_SHIFT  10
 
 #       define RADEON_COLOR_FORMAT_ARGB1555    3
 #       define R200_TXFORMAT_DXT1              (12 << 0)
 #       define R200_TXFORMAT_DXT23             (14 << 0)
 #       define R200_TXFORMAT_DXT45             (15 << 0)
+#       define R200_TXFORMAT_DVDU88            (18 << 0)
+#       define R200_TXFORMAT_LDVDU655          (19 << 0)
+#       define R200_TXFORMAT_LDVDU8888         (20 << 0)
+#       define R200_TXFORMAT_GR1616            (21 << 0)
 #       define R200_TXFORMAT_ABGR8888          (22 << 0)
+#       define R200_TXFORMAT_BGR111110         (23 << 0)
 #       define R200_TXFORMAT_FORMAT_MASK       (31 <<  0)
 #       define R200_TXFORMAT_FORMAT_SHIFT      0
 #       define R200_TXFORMAT_ALPHA_IN_MAP      (1 << 6)
 #define R200_PP_TXPITCH_4                      0x2c90 /* NPOT only */
 #define R200_PP_TXPITCH_5                      0x2cb0 /* NPOT only */
 
+#define R200_PP_CUBIC_FACES_0                  0x2c18
+#define R200_PP_CUBIC_FACES_1                  0x2c38
+#define R200_PP_CUBIC_FACES_2                  0x2c58
+#define R200_PP_CUBIC_FACES_3                  0x2c78
+#define R200_PP_CUBIC_FACES_4                  0x2c98
+#define R200_PP_CUBIC_FACES_5                  0x2cb8
+
 #define R200_PP_TXOFFSET_0                     0x2d00
 #       define R200_TXO_ENDIAN_NO_SWAP         (0 << 0)
 #       define R200_TXO_ENDIAN_BYTE_SWAP       (1 << 0)
 #       define R200_TXO_MICRO_TILE             (1 << 3)
 #       define R200_TXO_OFFSET_MASK            0xffffffe0
 #       define R200_TXO_OFFSET_SHIFT           5
+#define R200_PP_CUBIC_OFFSET_F1_0         0x2d04
+#define R200_PP_CUBIC_OFFSET_F2_0         0x2d08
+#define R200_PP_CUBIC_OFFSET_F3_0         0x2d0c
+#define R200_PP_CUBIC_OFFSET_F4_0         0x2d10
+#define R200_PP_CUBIC_OFFSET_F5_0         0x2d14
+
 #define R200_PP_TXOFFSET_1                     0x2d18
+#define R200_PP_CUBIC_OFFSET_F1_1         0x2d1c
+#define R200_PP_CUBIC_OFFSET_F2_1         0x2d20
+#define R200_PP_CUBIC_OFFSET_F3_1         0x2d24
+#define R200_PP_CUBIC_OFFSET_F4_1         0x2d28
+#define R200_PP_CUBIC_OFFSET_F5_1         0x2d2c
+
 #define R200_PP_TXOFFSET_2                     0x2d30
+#define R200_PP_CUBIC_OFFSET_F1_2         0x2d34
+#define R200_PP_CUBIC_OFFSET_F2_2         0x2d38
+#define R200_PP_CUBIC_OFFSET_F3_2         0x2d3c
+#define R200_PP_CUBIC_OFFSET_F4_2         0x2d40
+#define R200_PP_CUBIC_OFFSET_F5_2         0x2d44
+
 #define R200_PP_TXOFFSET_3                     0x2d48
+#define R200_PP_CUBIC_OFFSET_F1_3         0x2d4c
+#define R200_PP_CUBIC_OFFSET_F2_3         0x2d50
+#define R200_PP_CUBIC_OFFSET_F3_3         0x2d54
+#define R200_PP_CUBIC_OFFSET_F4_3         0x2d58
+#define R200_PP_CUBIC_OFFSET_F5_3         0x2d5c
 #define R200_PP_TXOFFSET_4                     0x2d60
+#define R200_PP_CUBIC_OFFSET_F1_4         0x2d64
+#define R200_PP_CUBIC_OFFSET_F2_4         0x2d68
+#define R200_PP_CUBIC_OFFSET_F3_4         0x2d6c
+#define R200_PP_CUBIC_OFFSET_F4_4         0x2d70
+#define R200_PP_CUBIC_OFFSET_F5_4         0x2d74
 #define R200_PP_TXOFFSET_5                     0x2d78
+#define R200_PP_CUBIC_OFFSET_F1_5         0x2d7c
+#define R200_PP_CUBIC_OFFSET_F2_5         0x2d80
+#define R200_PP_CUBIC_OFFSET_F3_5         0x2d84
+#define R200_PP_CUBIC_OFFSET_F4_5         0x2d88
+#define R200_PP_CUBIC_OFFSET_F5_5         0x2d8c
 
 #define R200_PP_TFACTOR_0                      0x2ee0
 #define R200_PP_TFACTOR_1                      0x2ee4
 #       define R200_FORCE_INORDER_PROC         (1<<31)
 #define R200_PP_CNTL_X                         0x2cc4
 #define R200_PP_TXMULTI_CTL_0                  0x2c1c
+#define R200_PP_TXMULTI_CTL_1                  0x2c3c
+#define R200_PP_TXMULTI_CTL_2                  0x2c5c
+#define R200_PP_TXMULTI_CTL_3                  0x2c7c
+#define R200_PP_TXMULTI_CTL_4                  0x2c9c
+#define R200_PP_TXMULTI_CTL_5                  0x2cbc
 #define R200_SE_VTX_STATE_CNTL                 0x2180
 #       define R200_UPDATE_USER_COLOR_0_ENA_MASK (1<<16)
 
 #define RADEON_CP_RB_WPTR                   0x0714
 #define RADEON_CP_RB_RPTR_WR                0x071c
 
+#define RADEON_SCRATCH_UMSK                0x0770
+#define RADEON_SCRATCH_ADDR                0x0774
+
+#define R600_CP_RB_BASE                     0xc100
+#define R600_CP_RB_CNTL                     0xc104
+#       define R600_RB_BUFSZ(x)             ((x) << 0)
+#       define R600_RB_BLKSZ(x)             ((x) << 8)
+#       define R600_RB_NO_UPDATE            (1 << 27)
+#       define R600_RB_RPTR_WR_ENA          (1 << 31)
+#define R600_CP_RB_RPTR_WR                  0xc108
+#define R600_CP_RB_RPTR_ADDR                0xc10c
+#define R600_CP_RB_RPTR_ADDR_HI             0xc110
+#define R600_CP_RB_WPTR                     0xc114
+#define R600_CP_RB_WPTR_ADDR                0xc118
+#define R600_CP_RB_WPTR_ADDR_HI             0xc11c
+#define R600_CP_RB_RPTR                     0x8700
+#define R600_CP_RB_WPTR_DELAY               0x8704
+
 #define RADEON_CP_IB_BASE                   0x0738
 #define RADEON_CP_IB_BUFSZ                  0x073c
 
 #       define RADEON_RGB_CONVERT_BY_PASS        (1 << 10)
 #       define RADEON_UVRAM_READ_MARGIN_SHIFT    16
 #       define RADEON_FIFORAM_FFMACRO_READ_MARGIN_SHIFT          20
-#      define RADEON_TVOUT_SCALE_EN              (1 << 26)
+#       define RADEON_RGB_ATTEN_SEL(x)            ((x) << 24)
+#       define RADEON_TVOUT_SCALE_EN              (1 << 26)
+#       define RADEON_RGB_ATTEN_VAL(x)            ((x) << 28)
 #define RADEON_TV_SYNC_CNTL                          0x0808
 #       define RADEON_SYNC_OE                     (1 <<  0)
 #       define RADEON_SYNC_OUT                    (1 <<  1)
index 60d1593..747b4bf 100644 (file)
@@ -56,10 +56,12 @@ int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib)
                set_bit(i, rdev->ib_pool.alloc_bm);
                rdev->ib_pool.ibs[i].length_dw = 0;
                *ib = &rdev->ib_pool.ibs[i];
+               mutex_unlock(&rdev->ib_pool.mutex);
                goto out;
        }
        if (list_empty(&rdev->ib_pool.scheduled_ibs)) {
                /* we go do nothings here */
+               mutex_unlock(&rdev->ib_pool.mutex);
                DRM_ERROR("all IB allocated none scheduled.\n");
                r = -EINVAL;
                goto out;
@@ -69,10 +71,13 @@ int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib)
                         struct radeon_ib, list);
        if (nib->fence == NULL) {
                /* we go do nothings here */
+               mutex_unlock(&rdev->ib_pool.mutex);
                DRM_ERROR("IB %lu scheduled without a fence.\n", nib->idx);
                r = -EINVAL;
                goto out;
        }
+       mutex_unlock(&rdev->ib_pool.mutex);
+
        r = radeon_fence_wait(nib->fence, false);
        if (r) {
                DRM_ERROR("radeon: IB(%lu:0x%016lX:%u)\n", nib->idx,
@@ -81,12 +86,17 @@ int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib)
                goto out;
        }
        radeon_fence_unref(&nib->fence);
+
        nib->length_dw = 0;
+
+       /* scheduled list is accessed here */
+       mutex_lock(&rdev->ib_pool.mutex);
        list_del(&nib->list);
        INIT_LIST_HEAD(&nib->list);
+       mutex_unlock(&rdev->ib_pool.mutex);
+
        *ib = nib;
 out:
-       mutex_unlock(&rdev->ib_pool.mutex);
        if (r) {
                radeon_fence_unref(&fence);
        } else {
@@ -111,47 +121,36 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib)
        }
        list_del(&tmp->list);
        INIT_LIST_HEAD(&tmp->list);
-       if (tmp->fence) {
+       if (tmp->fence)
                radeon_fence_unref(&tmp->fence);
-       }
+
        tmp->length_dw = 0;
        clear_bit(tmp->idx, rdev->ib_pool.alloc_bm);
        mutex_unlock(&rdev->ib_pool.mutex);
 }
 
-static void radeon_ib_align(struct radeon_device *rdev, struct radeon_ib *ib)
-{
-       while ((ib->length_dw & rdev->cp.align_mask)) {
-               ib->ptr[ib->length_dw++] = PACKET2(0);
-       }
-}
-
 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)
 {
        int r = 0;
 
-       mutex_lock(&rdev->ib_pool.mutex);
-       radeon_ib_align(rdev, ib);
        if (!ib->length_dw || !rdev->cp.ready) {
                /* TODO: Nothings in the ib we should report. */
-               mutex_unlock(&rdev->ib_pool.mutex);
                DRM_ERROR("radeon: couldn't schedule IB(%lu).\n", ib->idx);
                return -EINVAL;
        }
+
        /* 64 dwords should be enough for fence too */
        r = radeon_ring_lock(rdev, 64);
        if (r) {
                DRM_ERROR("radeon: scheduling IB failled (%d).\n", r);
-               mutex_unlock(&rdev->ib_pool.mutex);
                return r;
        }
-       radeon_ring_write(rdev, PACKET0(RADEON_CP_IB_BASE, 1));
-       radeon_ring_write(rdev, ib->gpu_addr);
-       radeon_ring_write(rdev, ib->length_dw);
+       radeon_ring_ib_execute(rdev, ib);
        radeon_fence_emit(rdev, ib->fence);
-       radeon_ring_unlock_commit(rdev);
+       mutex_lock(&rdev->ib_pool.mutex);
        list_add_tail(&ib->list, &rdev->ib_pool.scheduled_ibs);
        mutex_unlock(&rdev->ib_pool.mutex);
+       radeon_ring_unlock_commit(rdev);
        return 0;
 }
 
@@ -162,6 +161,8 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
        int i;
        int r = 0;
 
+       if (rdev->ib_pool.robj)
+               return 0;
        /* Allocate 1M object buffer */
        INIT_LIST_HEAD(&rdev->ib_pool.scheduled_ibs);
        r = radeon_object_create(rdev, NULL,  RADEON_IB_POOL_SIZE*64*1024,
@@ -215,69 +216,16 @@ void radeon_ib_pool_fini(struct radeon_device *rdev)
        mutex_unlock(&rdev->ib_pool.mutex);
 }
 
-int radeon_ib_test(struct radeon_device *rdev)
-{
-       struct radeon_ib *ib;
-       uint32_t scratch;
-       uint32_t tmp = 0;
-       unsigned i;
-       int r;
-
-       r = radeon_scratch_get(rdev, &scratch);
-       if (r) {
-               DRM_ERROR("radeon: failed to get scratch reg (%d).\n", r);
-               return r;
-       }
-       WREG32(scratch, 0xCAFEDEAD);
-       r = radeon_ib_get(rdev, &ib);
-       if (r) {
-               return r;
-       }
-       ib->ptr[0] = PACKET0(scratch, 0);
-       ib->ptr[1] = 0xDEADBEEF;
-       ib->ptr[2] = PACKET2(0);
-       ib->ptr[3] = PACKET2(0);
-       ib->ptr[4] = PACKET2(0);
-       ib->ptr[5] = PACKET2(0);
-       ib->ptr[6] = PACKET2(0);
-       ib->ptr[7] = PACKET2(0);
-       ib->length_dw = 8;
-       r = radeon_ib_schedule(rdev, ib);
-       if (r) {
-               radeon_scratch_free(rdev, scratch);
-               radeon_ib_free(rdev, &ib);
-               return r;
-       }
-       r = radeon_fence_wait(ib->fence, false);
-       if (r) {
-               return r;
-       }
-       for (i = 0; i < rdev->usec_timeout; i++) {
-               tmp = RREG32(scratch);
-               if (tmp == 0xDEADBEEF) {
-                       break;
-               }
-               DRM_UDELAY(1);
-       }
-       if (i < rdev->usec_timeout) {
-               DRM_INFO("ib test succeeded in %u usecs\n", i);
-       } else {
-               DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
-                         scratch, tmp);
-               r = -EINVAL;
-       }
-       radeon_scratch_free(rdev, scratch);
-       radeon_ib_free(rdev, &ib);
-       return r;
-}
-
 
 /*
  * Ring.
  */
 void radeon_ring_free_size(struct radeon_device *rdev)
 {
-       rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
+       if (rdev->family >= CHIP_R600)
+               rdev->cp.rptr = RREG32(R600_CP_RB_RPTR);
+       else
+               rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
        /* This works because ring_size is a power of 2 */
        rdev->cp.ring_free_dw = (rdev->cp.rptr + (rdev->cp.ring_size / 4));
        rdev->cp.ring_free_dw -= rdev->cp.wptr;
@@ -320,11 +268,10 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev)
        count_dw_pad = (rdev->cp.align_mask + 1) -
                       (rdev->cp.wptr & rdev->cp.align_mask);
        for (i = 0; i < count_dw_pad; i++) {
-               radeon_ring_write(rdev, PACKET2(0));
+               radeon_ring_write(rdev, 2 << 30);
        }
        DRM_MEMORYBARRIER();
-       WREG32(RADEON_CP_RB_WPTR, rdev->cp.wptr);
-       (void)RREG32(RADEON_CP_RB_WPTR);
+       radeon_cp_commit(rdev);
        mutex_unlock(&rdev->cp.mutex);
 }
 
@@ -334,46 +281,6 @@ void radeon_ring_unlock_undo(struct radeon_device *rdev)
        mutex_unlock(&rdev->cp.mutex);
 }
 
-int radeon_ring_test(struct radeon_device *rdev)
-{
-       uint32_t scratch;
-       uint32_t tmp = 0;
-       unsigned i;
-       int r;
-
-       r = radeon_scratch_get(rdev, &scratch);
-       if (r) {
-               DRM_ERROR("radeon: cp failed to get scratch reg (%d).\n", r);
-               return r;
-       }
-       WREG32(scratch, 0xCAFEDEAD);
-       r = radeon_ring_lock(rdev, 2);
-       if (r) {
-               DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);
-               radeon_scratch_free(rdev, scratch);
-               return r;
-       }
-       radeon_ring_write(rdev, PACKET0(scratch, 0));
-       radeon_ring_write(rdev, 0xDEADBEEF);
-       radeon_ring_unlock_commit(rdev);
-       for (i = 0; i < rdev->usec_timeout; i++) {
-               tmp = RREG32(scratch);
-               if (tmp == 0xDEADBEEF) {
-                       break;
-               }
-               DRM_UDELAY(1);
-       }
-       if (i < rdev->usec_timeout) {
-               DRM_INFO("ring test succeeded in %d usecs\n", i);
-       } else {
-               DRM_ERROR("radeon: ring test failed (sracth(0x%04X)=0x%08X)\n",
-                         scratch, tmp);
-               r = -EINVAL;
-       }
-       radeon_scratch_free(rdev, scratch);
-       return r;
-}
-
 int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size)
 {
        int r;
diff --git a/drivers/gpu/drm/radeon/radeon_share.h b/drivers/gpu/drm/radeon/radeon_share.h
deleted file mode 100644 (file)
index 63a7735..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- * Copyright 2008 Red Hat Inc.
- * Copyright 2009 Jerome Glisse.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Dave Airlie
- *          Alex Deucher
- *          Jerome Glisse
- */
-#ifndef __RADEON_SHARE_H__
-#define __RADEON_SHARE_H__
-
-void r100_vram_init_sizes(struct radeon_device *rdev);
-
-void rs690_line_buffer_adjust(struct radeon_device *rdev,
-                             struct drm_display_mode *mode1,
-                             struct drm_display_mode *mode2);
-
-void rv515_bandwidth_avivo_update(struct radeon_device *rdev);
-
-#endif
index 2882f40..38537d9 100644 (file)
@@ -1546,7 +1546,7 @@ static void radeon_cp_dispatch_vertex(struct drm_device * dev,
        } while (i < nbox);
 }
 
-static void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master *master, struct drm_buf *buf)
+void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master *master, struct drm_buf *buf)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
        struct drm_radeon_master_private *master_priv = master->driver_priv;
@@ -2213,7 +2213,10 @@ static int radeon_cp_swap(struct drm_device *dev, void *data, struct drm_file *f
        if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
                sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
 
-       radeon_cp_dispatch_swap(dev, file_priv->master);
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               r600_cp_dispatch_swap(dev, file_priv);
+       else
+               radeon_cp_dispatch_swap(dev, file_priv->master);
        sarea_priv->ctx_owner = 0;
 
        COMMIT_RING();
@@ -2412,7 +2415,10 @@ static int radeon_cp_texture(struct drm_device *dev, void *data, struct drm_file
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
        VB_AGE_TEST_WITH_RETURN(dev_priv);
 
-       ret = radeon_cp_dispatch_texture(dev, file_priv, tex, &image);
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+               ret = r600_cp_dispatch_texture(dev, file_priv, tex, &image);
+       else
+               ret = radeon_cp_dispatch_texture(dev, file_priv, tex, &image);
 
        return ret;
 }
@@ -2495,8 +2501,9 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil
                radeon_cp_dispatch_indirect(dev, buf, indirect->start, indirect->end);
        }
 
-       if (indirect->discard)
+       if (indirect->discard) {
                radeon_cp_discard_buffer(dev, file_priv->master, buf);
+       }
 
        COMMIT_RING();
        return 0;
@@ -3027,7 +3034,10 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
                value = GET_SCRATCH(dev_priv, 2);
                break;
        case RADEON_PARAM_IRQ_NR:
-               value = drm_dev_to_irq(dev);
+               if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+                       value = 0;
+               else
+                       value = drm_dev_to_irq(dev);
                break;
        case RADEON_PARAM_GART_BASE:
                value = dev_priv->gart_vm_start;
@@ -3227,7 +3237,8 @@ struct drm_ioctl_desc radeon_ioctls[] = {
        DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
-       DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH)
+       DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH),
+       DRM_IOCTL_DEF(DRM_RADEON_CS, r600_cs_legacy_ioctl, DRM_AUTH)
 };
 
 int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);
index 15c3531..acd889c 100644 (file)
 #include <ttm/ttm_module.h>
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
+#include <linux/seq_file.h>
 #include "radeon_reg.h"
 #include "radeon.h"
 
 #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
 
+static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
+
 static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 {
        struct radeon_mman *mman;
@@ -77,9 +80,25 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
        global_ref->release = &radeon_ttm_mem_global_release;
        r = ttm_global_item_ref(global_ref);
        if (r != 0) {
-               DRM_ERROR("Failed referencing a global TTM memory object.\n");
+               DRM_ERROR("Failed setting up TTM memory accounting "
+                         "subsystem.\n");
+               return r;
+       }
+
+       rdev->mman.bo_global_ref.mem_glob =
+               rdev->mman.mem_global_ref.object;
+       global_ref = &rdev->mman.bo_global_ref.ref;
+       global_ref->global_type = TTM_GLOBAL_TTM_BO;
+       global_ref->size = sizeof(struct ttm_bo_global);
+       global_ref->init = &ttm_bo_global_init;
+       global_ref->release = &ttm_bo_global_release;
+       r = ttm_global_item_ref(global_ref);
+       if (r != 0) {
+               DRM_ERROR("Failed setting up TTM BO subsystem.\n");
+               ttm_global_item_unref(&rdev->mman.mem_global_ref);
                return r;
        }
+
        rdev->mman.mem_global_referenced = true;
        return 0;
 }
@@ -87,6 +106,7 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
 static void radeon_ttm_global_fini(struct radeon_device *rdev)
 {
        if (rdev->mman.mem_global_referenced) {
+               ttm_global_item_unref(&rdev->mman.bo_global_ref.ref);
                ttm_global_item_unref(&rdev->mman.mem_global_ref);
                rdev->mman.mem_global_referenced = false;
        }
@@ -286,9 +306,11 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
        r = ttm_bo_move_ttm(bo, true, no_wait, new_mem);
 out_cleanup:
        if (tmp_mem.mm_node) {
-               spin_lock(&rdev->mman.bdev.lru_lock);
+               struct ttm_bo_global *glob = rdev->mman.bdev.glob;
+
+               spin_lock(&glob->lru_lock);
                drm_mm_put_block(tmp_mem.mm_node);
-               spin_unlock(&rdev->mman.bdev.lru_lock);
+               spin_unlock(&glob->lru_lock);
                return r;
        }
        return r;
@@ -323,9 +345,11 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
        }
 out_cleanup:
        if (tmp_mem.mm_node) {
-               spin_lock(&rdev->mman.bdev.lru_lock);
+               struct ttm_bo_global *glob = rdev->mman.bdev.glob;
+
+               spin_lock(&glob->lru_lock);
                drm_mm_put_block(tmp_mem.mm_node);
-               spin_unlock(&rdev->mman.bdev.lru_lock);
+               spin_unlock(&glob->lru_lock);
                return r;
        }
        return r;
@@ -352,9 +376,8 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
                radeon_move_null(bo, new_mem);
                return 0;
        }
-       if (!rdev->cp.ready) {
+       if (!rdev->cp.ready || rdev->asic->copy == NULL) {
                /* use memcpy */
-               DRM_ERROR("CP is not ready use memcpy.\n");
                goto memcpy;
        }
 
@@ -446,7 +469,7 @@ int radeon_ttm_init(struct radeon_device *rdev)
        }
        /* No others user of address space so set it to 0 */
        r = ttm_bo_device_init(&rdev->mman.bdev,
-                              rdev->mman.mem_global_ref.object,
+                              rdev->mman.bo_global_ref.ref.object,
                               &radeon_bo_driver, DRM_FILE_PAGE_OFFSET,
                               rdev->need_dma32);
        if (r) {
@@ -471,7 +494,7 @@ int radeon_ttm_init(struct radeon_device *rdev)
                return r;
        }
        DRM_INFO("radeon: %uM of VRAM memory ready\n",
-                rdev->mc.real_vram_size / (1024 * 1024));
+                (unsigned)rdev->mc.real_vram_size / (1024 * 1024));
        r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT, 0,
                           ((rdev->mc.gtt_size) >> PAGE_SHIFT));
        if (r) {
@@ -479,10 +502,16 @@ int radeon_ttm_init(struct radeon_device *rdev)
                return r;
        }
        DRM_INFO("radeon: %uM of GTT memory ready.\n",
-                rdev->mc.gtt_size / (1024 * 1024));
+                (unsigned)(rdev->mc.gtt_size / (1024 * 1024)));
        if (unlikely(rdev->mman.bdev.dev_mapping == NULL)) {
                rdev->mman.bdev.dev_mapping = rdev->ddev->dev_mapping;
        }
+
+       r = radeon_ttm_debugfs_init(rdev);
+       if (r) {
+               DRM_ERROR("Failed to init debugfs\n");
+               return r;
+       }
        return 0;
 }
 
@@ -657,3 +686,50 @@ struct ttm_backend *radeon_ttm_backend_create(struct radeon_device *rdev)
        gtt->bound = false;
        return &gtt->backend;
 }
+
+#define RADEON_DEBUGFS_MEM_TYPES 2
+
+static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES];
+static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES][32];
+
+#if defined(CONFIG_DEBUG_FS)
+static int radeon_mm_dump_table(struct seq_file *m, void *data)
+{
+       struct drm_info_node *node = (struct drm_info_node *)m->private;
+       struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
+       struct drm_device *dev = node->minor->dev;
+       struct radeon_device *rdev = dev->dev_private;
+       int ret;
+       struct ttm_bo_global *glob = rdev->mman.bdev.glob;
+
+       spin_lock(&glob->lru_lock);
+       ret = drm_mm_dump_table(m, mm);
+       spin_unlock(&glob->lru_lock);
+       return ret;
+}
+#endif
+
+static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
+{
+       unsigned i;
+
+#if defined(CONFIG_DEBUG_FS)
+       for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
+               if (i == 0)
+                       sprintf(radeon_mem_types_names[i], "radeon_vram_mm");
+               else
+                       sprintf(radeon_mem_types_names[i], "radeon_gtt_mm");
+               radeon_mem_types_list[i].name = radeon_mem_types_names[i];
+               radeon_mem_types_list[i].show = &radeon_mm_dump_table;
+               radeon_mem_types_list[i].driver_features = 0;
+               if (i == 0)
+                       radeon_mem_types_list[i].data = &rdev->mman.bdev.man[TTM_PL_VRAM].manager;
+               else
+                       radeon_mem_types_list[i].data = &rdev->mman.bdev.man[TTM_PL_TT].manager;
+
+       }
+       return radeon_debugfs_add_files(rdev, radeon_mem_types_list, RADEON_DEBUGFS_MEM_TYPES);
+
+#endif
+       return 0;
+}
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r100 b/drivers/gpu/drm/radeon/reg_srcs/r100
new file mode 100644 (file)
index 0000000..f7ee062
--- /dev/null
@@ -0,0 +1,105 @@
+r100 0x3294
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1810 FOG_3D_TABLE_START
+0x1814 FOG_3D_TABLE_END
+0x1a14 FOG_TABLE_INDEX
+0x1a18 FOG_TABLE_DATA
+0x1c14 PP_MISC
+0x1c18 PP_FOG_COLOR
+0x1c1c RE_SOLID_COLOR
+0x1c20 RB3D_BLENDCNTL
+0x1c4c SE_CNTL
+0x1c50 SE_COORD_FMT
+0x1c60 PP_TXCBLEND_0
+0x1c64 PP_TXABLEND_0
+0x1c68 PP_TFACTOR_0
+0x1c78 PP_TXCBLEND_1
+0x1c7c PP_TXABLEND_1
+0x1c80 PP_TFACTOR_1
+0x1c90 PP_TXCBLEND_2
+0x1c94 PP_TXABLEND_2
+0x1c98 PP_TFACTOR_2
+0x1cc8 RE_STIPPLE_ADDR
+0x1ccc RE_STIPPLE_DATA
+0x1cd0 RE_LINE_PATTERN
+0x1cd4 RE_LINE_STATE
+0x1d40 PP_BORDER_COLOR0
+0x1d44 PP_BORDER_COLOR1
+0x1d48 PP_BORDER_COLOR2
+0x1d7c RB3D_STENCILREFMASK
+0x1d80 RB3D_ROPCNTL
+0x1d84 RB3D_PLANEMASK
+0x1d98 VAP_VPORT_XSCALE
+0x1d9C VAP_VPORT_XOFFSET
+0x1da0 VAP_VPORT_YSCALE
+0x1da4 VAP_VPORT_YOFFSET
+0x1da8 VAP_VPORT_ZSCALE
+0x1dac VAP_VPORT_ZOFFSET
+0x1db0 SE_ZBIAS_FACTOR
+0x1db4 SE_ZBIAS_CONSTANT
+0x1db8 SE_LINE_WIDTH
+0x2140 SE_CNTL_STATUS
+0x2200 SE_TCL_VECTOR_INDX_REG
+0x2204 SE_TCL_VECTOR_DATA_REG
+0x2208 SE_TCL_SCALAR_INDX_REG
+0x220c SE_TCL_SCALAR_DATA_REG
+0x2210 SE_TCL_MATERIAL_EMISSIVE_RED
+0x2214 SE_TCL_MATERIAL_EMISSIVE_GREEN
+0x2218 SE_TCL_MATERIAL_EMISSIVE_BLUE
+0x221c SE_TCL_MATERIAL_EMISSIVE_ALPHA
+0x2220 SE_TCL_MATERIAL_AMBIENT_RED
+0x2224 SE_TCL_MATERIAL_AMBIENT_GREEN
+0x2228 SE_TCL_MATERIAL_AMBIENT_BLUE
+0x222c SE_TCL_MATERIAL_AMBIENT_ALPHA
+0x2230 SE_TCL_MATERIAL_DIFFUSE_RED
+0x2234 SE_TCL_MATERIAL_DIFFUSE_GREEN
+0x2238 SE_TCL_MATERIAL_DIFFUSE_BLUE
+0x223c SE_TCL_MATERIAL_DIFFUSE_ALPHA
+0x2240 SE_TCL_MATERIAL_SPECULAR_RED
+0x2244 SE_TCL_MATERIAL_SPECULAR_GREEN
+0x2248 SE_TCL_MATERIAL_SPECULAR_BLUE
+0x224c SE_TCL_MATERIAL_SPECULAR_ALPHA
+0x2250 SE_TCL_SHININESS
+0x2254 SE_TCL_OUTPUT_VTX_FMT
+0x2258 SE_TCL_OUTPUT_VTX_SEL
+0x225c SE_TCL_MATRIX_SELECT_0
+0x2260 SE_TCL_MATRIX_SELECT_1
+0x2264 SE_TCL_UCP_VERT_BLEND_CNTL
+0x2268 SE_TCL_TEXTURE_PROC_CTL
+0x226c SE_TCL_LIGHT_MODEL_CTL
+0x2270 SE_TCL_PER_LIGHT_CTL_0
+0x2274 SE_TCL_PER_LIGHT_CTL_1
+0x2278 SE_TCL_PER_LIGHT_CTL_2
+0x227c SE_TCL_PER_LIGHT_CTL_3
+0x2284 SE_TCL_STATE_FLUSH
+0x26c0 RE_TOP_LEFT
+0x26c4 RE_MISC
+0x3290 RB3D_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r200 b/drivers/gpu/drm/radeon/reg_srcs/r200
new file mode 100644 (file)
index 0000000..6021c88
--- /dev/null
@@ -0,0 +1,184 @@
+r200 0x3294
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1c14 PP_MISC
+0x1c18 PP_FOG_COLOR
+0x1c1c RE_SOLID_COLOR
+0x1c20 RB3D_BLENDCNTL
+0x1c4c SE_CNTL
+0x1c50 RE_CNTL
+0x1cc8 RE_STIPPLE_ADDR
+0x1ccc RE_STIPPLE_DATA
+0x1cd0 RE_LINE_PATTERN
+0x1cd4 RE_LINE_STATE
+0x1cd8 RE_SCISSOR_TL_0
+0x1cdc RE_SCISSOR_BR_0
+0x1ce0 RE_SCISSOR_TL_1
+0x1ce4 RE_SCISSOR_BR_1
+0x1ce8 RE_SCISSOR_TL_2
+0x1cec RE_SCISSOR_BR_2
+0x1d60 RB3D_DEPTHXY_OFFSET
+0x1d7c RB3D_STENCILREFMASK
+0x1d80 RB3D_ROPCNTL
+0x1d84 RB3D_PLANEMASK
+0x1d98 VAP_VPORT_XSCALE
+0x1d9c VAP_VPORT_XOFFSET
+0x1da0 VAP_VPORT_YSCALE
+0x1da4 VAP_VPORT_YOFFSET
+0x1da8 VAP_VPORT_ZSCALE
+0x1dac VAP_VPORT_ZOFFSET
+0x1db0 SE_ZBIAS_FACTOR
+0x1db4 SE_ZBIAS_CONSTANT
+0x1db8 SE_LINE_WIDTH
+0x2080 SE_VAP_CNTL
+0x2090 SE_TCL_OUTPUT_VTX_FMT_0
+0x2094 SE_TCL_OUTPUT_VTX_FMT_1
+0x20b0 SE_VTE_CNTL
+0x2140 SE_CNTL_STATUS
+0x2180 SE_VTX_STATE_CNTL
+0x2200 SE_TCL_VECTOR_INDX_REG
+0x2204 SE_TCL_VECTOR_DATA_REG
+0x2208 SE_TCL_SCALAR_INDX_REG
+0x220c SE_TCL_SCALAR_DATA_REG
+0x2230 SE_TCL_MATRIX_SEL_0
+0x2234 SE_TCL_MATRIX_SEL_1
+0x2238 SE_TCL_MATRIX_SEL_2
+0x223c SE_TCL_MATRIX_SEL_3
+0x2240 SE_TCL_MATRIX_SEL_4
+0x2250 SE_TCL_OUTPUT_VTX_COMP_SEL
+0x2254 SE_TCL_INPUT_VTX_VECTOR_ADDR_0
+0x2258 SE_TCL_INPUT_VTX_VECTOR_ADDR_1
+0x225c SE_TCL_INPUT_VTX_VECTOR_ADDR_2
+0x2260 SE_TCL_INPUT_VTX_VECTOR_ADDR_3
+0x2268 SE_TCL_LIGHT_MODEL_CTL_0
+0x226c SE_TCL_LIGHT_MODEL_CTL_1
+0x2270 SE_TCL_PER_LIGHT_CTL_0
+0x2274 SE_TCL_PER_LIGHT_CTL_1
+0x2278 SE_TCL_PER_LIGHT_CTL_2
+0x227c SE_TCL_PER_LIGHT_CTL_3
+0x2284 VAP_PVS_STATE_FLUSH_REG
+0x22a8 SE_TCL_TEX_PROC_CTL_2
+0x22ac SE_TCL_TEX_PROC_CTL_3
+0x22b0 SE_TCL_TEX_PROC_CTL_0
+0x22b4 SE_TCL_TEX_PROC_CTL_1
+0x22b8 SE_TCL_TEX_CYL_WRAP_CTL
+0x22c0 SE_TCL_UCP_VERT_BLEND_CNTL
+0x22c4 SE_TCL_POINT_SPRITE_CNTL
+0x2648 RE_POINTSIZE
+0x26c0 RE_TOP_LEFT
+0x26c4 RE_MISC
+0x26f0 RE_AUX_SCISSOR_CNTL
+0x2c14 PP_BORDER_COLOR_0
+0x2c34 PP_BORDER_COLOR_1
+0x2c54 PP_BORDER_COLOR_2
+0x2c74 PP_BORDER_COLOR_3
+0x2c94 PP_BORDER_COLOR_4
+0x2cb4 PP_BORDER_COLOR_5
+0x2cc4 PP_CNTL_X
+0x2cf8 PP_TRI_PERF
+0x2cfc PP_PERF_CNTL
+0x2d9c PP_TAM_DEBUG3
+0x2ee0 PP_TFACTOR_0
+0x2ee4 PP_TFACTOR_1
+0x2ee8 PP_TFACTOR_2
+0x2eec PP_TFACTOR_3
+0x2ef0 PP_TFACTOR_4
+0x2ef4 PP_TFACTOR_5
+0x2ef8 PP_TFACTOR_6
+0x2efc PP_TFACTOR_7
+0x2f00 PP_TXCBLEND_0
+0x2f04 PP_TXCBLEND2_0
+0x2f08 PP_TXABLEND_0
+0x2f0c PP_TXABLEND2_0
+0x2f10 PP_TXCBLEND_1
+0x2f14 PP_TXCBLEND2_1
+0x2f18 PP_TXABLEND_1
+0x2f1c PP_TXABLEND2_1
+0x2f20 PP_TXCBLEND_2
+0x2f24 PP_TXCBLEND2_2
+0x2f28 PP_TXABLEND_2
+0x2f2c PP_TXABLEND2_2
+0x2f30 PP_TXCBLEND_3
+0x2f34 PP_TXCBLEND2_3
+0x2f38 PP_TXABLEND_3
+0x2f3c PP_TXABLEND2_3
+0x2f40 PP_TXCBLEND_4
+0x2f44 PP_TXCBLEND2_4
+0x2f48 PP_TXABLEND_4
+0x2f4c PP_TXABLEND2_4
+0x2f50 PP_TXCBLEND_5
+0x2f54 PP_TXCBLEND2_5
+0x2f58 PP_TXABLEND_5
+0x2f5c PP_TXABLEND2_5
+0x2f60 PP_TXCBLEND_6
+0x2f64 PP_TXCBLEND2_6
+0x2f68 PP_TXABLEND_6
+0x2f6c PP_TXABLEND2_6
+0x2f70 PP_TXCBLEND_7
+0x2f74 PP_TXCBLEND2_7
+0x2f78 PP_TXABLEND_7
+0x2f7c PP_TXABLEND2_7
+0x2f80 PP_TXCBLEND_8
+0x2f84 PP_TXCBLEND2_8
+0x2f88 PP_TXABLEND_8
+0x2f8c PP_TXABLEND2_8
+0x2f90 PP_TXCBLEND_9
+0x2f94 PP_TXCBLEND2_9
+0x2f98 PP_TXABLEND_9
+0x2f9c PP_TXABLEND2_9
+0x2fa0 PP_TXCBLEND_10
+0x2fa4 PP_TXCBLEND2_10
+0x2fa8 PP_TXABLEND_10
+0x2fac PP_TXABLEND2_10
+0x2fb0 PP_TXCBLEND_11
+0x2fb4 PP_TXCBLEND2_11
+0x2fb8 PP_TXABLEND_11
+0x2fbc PP_TXABLEND2_11
+0x2fc0 PP_TXCBLEND_12
+0x2fc4 PP_TXCBLEND2_12
+0x2fc8 PP_TXABLEND_12
+0x2fcc PP_TXABLEND2_12
+0x2fd0 PP_TXCBLEND_13
+0x2fd4 PP_TXCBLEND2_13
+0x2fd8 PP_TXABLEND_13
+0x2fdc PP_TXABLEND2_13
+0x2fe0 PP_TXCBLEND_14
+0x2fe4 PP_TXCBLEND2_14
+0x2fe8 PP_TXABLEND_14
+0x2fec PP_TXABLEND2_14
+0x2ff0 PP_TXCBLEND_15
+0x2ff4 PP_TXCBLEND2_15
+0x2ff8 PP_TXABLEND_15
+0x2ffc PP_TXABLEND2_15
+0x3218 RB3D_BLENCOLOR
+0x321c RB3D_ABLENDCNTL
+0x3220 RB3D_CBLENDCNTL
+0x3290 RB3D_ZPASS_DATA
+
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r300 b/drivers/gpu/drm/radeon/reg_srcs/r300
new file mode 100644 (file)
index 0000000..19c4663
--- /dev/null
@@ -0,0 +1,729 @@
+r300 0x4f60
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1D98 VAP_VPORT_XSCALE
+0x1D9C VAP_VPORT_XOFFSET
+0x1DA0 VAP_VPORT_YSCALE
+0x1DA4 VAP_VPORT_YOFFSET
+0x1DA8 VAP_VPORT_ZSCALE
+0x1DAC VAP_VPORT_ZOFFSET
+0x2080 VAP_CNTL
+0x2090 VAP_OUT_VTX_FMT_0
+0x2094 VAP_OUT_VTX_FMT_1
+0x20B0 VAP_VTE_CNTL
+0x2138 VAP_VF_MIN_VTX_INDX
+0x2140 VAP_CNTL_STATUS
+0x2150 VAP_PROG_STREAM_CNTL_0
+0x2154 VAP_PROG_STREAM_CNTL_1
+0x2158 VAP_PROG_STREAM_CNTL_2
+0x215C VAP_PROG_STREAM_CNTL_3
+0x2160 VAP_PROG_STREAM_CNTL_4
+0x2164 VAP_PROG_STREAM_CNTL_5
+0x2168 VAP_PROG_STREAM_CNTL_6
+0x216C VAP_PROG_STREAM_CNTL_7
+0x2180 VAP_VTX_STATE_CNTL
+0x2184 VAP_VSM_VTX_ASSM
+0x2188 VAP_VTX_STATE_IND_REG_0
+0x218C VAP_VTX_STATE_IND_REG_1
+0x2190 VAP_VTX_STATE_IND_REG_2
+0x2194 VAP_VTX_STATE_IND_REG_3
+0x2198 VAP_VTX_STATE_IND_REG_4
+0x219C VAP_VTX_STATE_IND_REG_5
+0x21A0 VAP_VTX_STATE_IND_REG_6
+0x21A4 VAP_VTX_STATE_IND_REG_7
+0x21A8 VAP_VTX_STATE_IND_REG_8
+0x21AC VAP_VTX_STATE_IND_REG_9
+0x21B0 VAP_VTX_STATE_IND_REG_10
+0x21B4 VAP_VTX_STATE_IND_REG_11
+0x21B8 VAP_VTX_STATE_IND_REG_12
+0x21BC VAP_VTX_STATE_IND_REG_13
+0x21C0 VAP_VTX_STATE_IND_REG_14
+0x21C4 VAP_VTX_STATE_IND_REG_15
+0x21DC VAP_PSC_SGN_NORM_CNTL
+0x21E0 VAP_PROG_STREAM_CNTL_EXT_0
+0x21E4 VAP_PROG_STREAM_CNTL_EXT_1
+0x21E8 VAP_PROG_STREAM_CNTL_EXT_2
+0x21EC VAP_PROG_STREAM_CNTL_EXT_3
+0x21F0 VAP_PROG_STREAM_CNTL_EXT_4
+0x21F4 VAP_PROG_STREAM_CNTL_EXT_5
+0x21F8 VAP_PROG_STREAM_CNTL_EXT_6
+0x21FC VAP_PROG_STREAM_CNTL_EXT_7
+0x2200 VAP_PVS_VECTOR_INDX_REG
+0x2204 VAP_PVS_VECTOR_DATA_REG
+0x2208 VAP_PVS_VECTOR_DATA_REG_128
+0x221C VAP_CLIP_CNTL
+0x2220 VAP_GB_VERT_CLIP_ADJ
+0x2224 VAP_GB_VERT_DISC_ADJ
+0x2228 VAP_GB_HORZ_CLIP_ADJ
+0x222C VAP_GB_HORZ_DISC_ADJ
+0x2230 VAP_PVS_FLOW_CNTL_ADDRS_0
+0x2234 VAP_PVS_FLOW_CNTL_ADDRS_1
+0x2238 VAP_PVS_FLOW_CNTL_ADDRS_2
+0x223C VAP_PVS_FLOW_CNTL_ADDRS_3
+0x2240 VAP_PVS_FLOW_CNTL_ADDRS_4
+0x2244 VAP_PVS_FLOW_CNTL_ADDRS_5
+0x2248 VAP_PVS_FLOW_CNTL_ADDRS_6
+0x224C VAP_PVS_FLOW_CNTL_ADDRS_7
+0x2250 VAP_PVS_FLOW_CNTL_ADDRS_8
+0x2254 VAP_PVS_FLOW_CNTL_ADDRS_9
+0x2258 VAP_PVS_FLOW_CNTL_ADDRS_10
+0x225C VAP_PVS_FLOW_CNTL_ADDRS_11
+0x2260 VAP_PVS_FLOW_CNTL_ADDRS_12
+0x2264 VAP_PVS_FLOW_CNTL_ADDRS_13
+0x2268 VAP_PVS_FLOW_CNTL_ADDRS_14
+0x226C VAP_PVS_FLOW_CNTL_ADDRS_15
+0x2284 VAP_PVS_STATE_FLUSH_REG
+0x2288 VAP_PVS_VTX_TIMEOUT_REG
+0x2290 VAP_PVS_FLOW_CNTL_LOOP_INDEX_0
+0x2294 VAP_PVS_FLOW_CNTL_LOOP_INDEX_1
+0x2298 VAP_PVS_FLOW_CNTL_LOOP_INDEX_2
+0x229C VAP_PVS_FLOW_CNTL_LOOP_INDEX_3
+0x22A0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_4
+0x22A4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_5
+0x22A8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_6
+0x22AC VAP_PVS_FLOW_CNTL_LOOP_INDEX_7
+0x22B0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_8
+0x22B4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_9
+0x22B8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_10
+0x22BC VAP_PVS_FLOW_CNTL_LOOP_INDEX_11
+0x22C0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_12
+0x22C4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_13
+0x22C8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_14
+0x22CC VAP_PVS_FLOW_CNTL_LOOP_INDEX_15
+0x22D0 VAP_PVS_CODE_CNTL_0
+0x22D4 VAP_PVS_CONST_CNTL
+0x22D8 VAP_PVS_CODE_CNTL_1
+0x22DC VAP_PVS_FLOW_CNTL_OPC
+0x342C RB2D_DSTCACHE_CTLSTAT
+0x4000 GB_VAP_RASTER_VTX_FMT_0
+0x4004 GB_VAP_RASTER_VTX_FMT_1
+0x4008 GB_ENABLE
+0x401C GB_SELECT
+0x4020 GB_AA_CONFIG
+0x4024 GB_FIFO_SIZE
+0x4100 TX_INVALTAGS
+0x4200 GA_POINT_S0
+0x4204 GA_POINT_T0
+0x4208 GA_POINT_S1
+0x420C GA_POINT_T1
+0x4214 GA_TRIANGLE_STIPPLE
+0x421C GA_POINT_SIZE
+0x4230 GA_POINT_MINMAX
+0x4234 GA_LINE_CNTL
+0x4238 GA_LINE_STIPPLE_CONFIG
+0x4260 GA_LINE_STIPPLE_VALUE
+0x4264 GA_LINE_S0
+0x4268 GA_LINE_S1
+0x4278 GA_COLOR_CONTROL
+0x427C GA_SOLID_RG
+0x4280 GA_SOLID_BA
+0x4288 GA_POLY_MODE
+0x428C GA_ROUND_MODE
+0x4290 GA_OFFSET
+0x4294 GA_FOG_SCALE
+0x4298 GA_FOG_OFFSET
+0x42A0 SU_TEX_WRAP
+0x42A4 SU_POLY_OFFSET_FRONT_SCALE
+0x42A8 SU_POLY_OFFSET_FRONT_OFFSET
+0x42AC SU_POLY_OFFSET_BACK_SCALE
+0x42B0 SU_POLY_OFFSET_BACK_OFFSET
+0x42B4 SU_POLY_OFFSET_ENABLE
+0x42B8 SU_CULL_MODE
+0x42C0 SU_DEPTH_SCALE
+0x42C4 SU_DEPTH_OFFSET
+0x42C8 SU_REG_DEST
+0x4300 RS_COUNT
+0x4304 RS_INST_COUNT
+0x4310 RS_IP_0
+0x4314 RS_IP_1
+0x4318 RS_IP_2
+0x431C RS_IP_3
+0x4320 RS_IP_4
+0x4324 RS_IP_5
+0x4328 RS_IP_6
+0x432C RS_IP_7
+0x4330 RS_INST_0
+0x4334 RS_INST_1
+0x4338 RS_INST_2
+0x433C RS_INST_3
+0x4340 RS_INST_4
+0x4344 RS_INST_5
+0x4348 RS_INST_6
+0x434C RS_INST_7
+0x4350 RS_INST_8
+0x4354 RS_INST_9
+0x4358 RS_INST_10
+0x435C RS_INST_11
+0x4360 RS_INST_12
+0x4364 RS_INST_13
+0x4368 RS_INST_14
+0x436C RS_INST_15
+0x43A4 SC_HYPERZ_EN
+0x43A8 SC_EDGERULE
+0x43B0 SC_CLIP_0_A
+0x43B4 SC_CLIP_0_B
+0x43B8 SC_CLIP_1_A
+0x43BC SC_CLIP_1_B
+0x43C0 SC_CLIP_2_A
+0x43C4 SC_CLIP_2_B
+0x43C8 SC_CLIP_3_A
+0x43CC SC_CLIP_3_B
+0x43D0 SC_CLIP_RULE
+0x43E0 SC_SCISSOR0
+0x43E8 SC_SCREENDOOR
+0x4440 TX_FILTER1_0
+0x4444 TX_FILTER1_1
+0x4448 TX_FILTER1_2
+0x444C TX_FILTER1_3
+0x4450 TX_FILTER1_4
+0x4454 TX_FILTER1_5
+0x4458 TX_FILTER1_6
+0x445C TX_FILTER1_7
+0x4460 TX_FILTER1_8
+0x4464 TX_FILTER1_9
+0x4468 TX_FILTER1_10
+0x446C TX_FILTER1_11
+0x4470 TX_FILTER1_12
+0x4474 TX_FILTER1_13
+0x4478 TX_FILTER1_14
+0x447C TX_FILTER1_15
+0x4580 TX_CHROMA_KEY_0
+0x4584 TX_CHROMA_KEY_1
+0x4588 TX_CHROMA_KEY_2
+0x458C TX_CHROMA_KEY_3
+0x4590 TX_CHROMA_KEY_4
+0x4594 TX_CHROMA_KEY_5
+0x4598 TX_CHROMA_KEY_6
+0x459C TX_CHROMA_KEY_7
+0x45A0 TX_CHROMA_KEY_8
+0x45A4 TX_CHROMA_KEY_9
+0x45A8 TX_CHROMA_KEY_10
+0x45AC TX_CHROMA_KEY_11
+0x45B0 TX_CHROMA_KEY_12
+0x45B4 TX_CHROMA_KEY_13
+0x45B8 TX_CHROMA_KEY_14
+0x45BC TX_CHROMA_KEY_15
+0x45C0 TX_BORDER_COLOR_0
+0x45C4 TX_BORDER_COLOR_1
+0x45C8 TX_BORDER_COLOR_2
+0x45CC TX_BORDER_COLOR_3
+0x45D0 TX_BORDER_COLOR_4
+0x45D4 TX_BORDER_COLOR_5
+0x45D8 TX_BORDER_COLOR_6
+0x45DC TX_BORDER_COLOR_7
+0x45E0 TX_BORDER_COLOR_8
+0x45E4 TX_BORDER_COLOR_9
+0x45E8 TX_BORDER_COLOR_10
+0x45EC TX_BORDER_COLOR_11
+0x45F0 TX_BORDER_COLOR_12
+0x45F4 TX_BORDER_COLOR_13
+0x45F8 TX_BORDER_COLOR_14
+0x45FC TX_BORDER_COLOR_15
+0x4600 US_CONFIG
+0x4604 US_PIXSIZE
+0x4608 US_CODE_OFFSET
+0x460C US_RESET
+0x4610 US_CODE_ADDR_0
+0x4614 US_CODE_ADDR_1
+0x4618 US_CODE_ADDR_2
+0x461C US_CODE_ADDR_3
+0x4620 US_TEX_INST_0
+0x4624 US_TEX_INST_1
+0x4628 US_TEX_INST_2
+0x462C US_TEX_INST_3
+0x4630 US_TEX_INST_4
+0x4634 US_TEX_INST_5
+0x4638 US_TEX_INST_6
+0x463C US_TEX_INST_7
+0x4640 US_TEX_INST_8
+0x4644 US_TEX_INST_9
+0x4648 US_TEX_INST_10
+0x464C US_TEX_INST_11
+0x4650 US_TEX_INST_12
+0x4654 US_TEX_INST_13
+0x4658 US_TEX_INST_14
+0x465C US_TEX_INST_15
+0x4660 US_TEX_INST_16
+0x4664 US_TEX_INST_17
+0x4668 US_TEX_INST_18
+0x466C US_TEX_INST_19
+0x4670 US_TEX_INST_20
+0x4674 US_TEX_INST_21
+0x4678 US_TEX_INST_22
+0x467C US_TEX_INST_23
+0x4680 US_TEX_INST_24
+0x4684 US_TEX_INST_25
+0x4688 US_TEX_INST_26
+0x468C US_TEX_INST_27
+0x4690 US_TEX_INST_28
+0x4694 US_TEX_INST_29
+0x4698 US_TEX_INST_30
+0x469C US_TEX_INST_31
+0x46A4 US_OUT_FMT_0
+0x46A8 US_OUT_FMT_1
+0x46AC US_OUT_FMT_2
+0x46B0 US_OUT_FMT_3
+0x46B4 US_W_FMT
+0x46C0 US_ALU_RGB_ADDR_0
+0x46C4 US_ALU_RGB_ADDR_1
+0x46C8 US_ALU_RGB_ADDR_2
+0x46CC US_ALU_RGB_ADDR_3
+0x46D0 US_ALU_RGB_ADDR_4
+0x46D4 US_ALU_RGB_ADDR_5
+0x46D8 US_ALU_RGB_ADDR_6
+0x46DC US_ALU_RGB_ADDR_7
+0x46E0 US_ALU_RGB_ADDR_8
+0x46E4 US_ALU_RGB_ADDR_9
+0x46E8 US_ALU_RGB_ADDR_10
+0x46EC US_ALU_RGB_ADDR_11
+0x46F0 US_ALU_RGB_ADDR_12
+0x46F4 US_ALU_RGB_ADDR_13
+0x46F8 US_ALU_RGB_ADDR_14
+0x46FC US_ALU_RGB_ADDR_15
+0x4700 US_ALU_RGB_ADDR_16
+0x4704 US_ALU_RGB_ADDR_17
+0x4708 US_ALU_RGB_ADDR_18
+0x470C US_ALU_RGB_ADDR_19
+0x4710 US_ALU_RGB_ADDR_20
+0x4714 US_ALU_RGB_ADDR_21
+0x4718 US_ALU_RGB_ADDR_22
+0x471C US_ALU_RGB_ADDR_23
+0x4720 US_ALU_RGB_ADDR_24
+0x4724 US_ALU_RGB_ADDR_25
+0x4728 US_ALU_RGB_ADDR_26
+0x472C US_ALU_RGB_ADDR_27
+0x4730 US_ALU_RGB_ADDR_28
+0x4734 US_ALU_RGB_ADDR_29
+0x4738 US_ALU_RGB_ADDR_30
+0x473C US_ALU_RGB_ADDR_31
+0x4740 US_ALU_RGB_ADDR_32
+0x4744 US_ALU_RGB_ADDR_33
+0x4748 US_ALU_RGB_ADDR_34
+0x474C US_ALU_RGB_ADDR_35
+0x4750 US_ALU_RGB_ADDR_36
+0x4754 US_ALU_RGB_ADDR_37
+0x4758 US_ALU_RGB_ADDR_38
+0x475C US_ALU_RGB_ADDR_39
+0x4760 US_ALU_RGB_ADDR_40
+0x4764 US_ALU_RGB_ADDR_41
+0x4768 US_ALU_RGB_ADDR_42
+0x476C US_ALU_RGB_ADDR_43
+0x4770 US_ALU_RGB_ADDR_44
+0x4774 US_ALU_RGB_ADDR_45
+0x4778 US_ALU_RGB_ADDR_46
+0x477C US_ALU_RGB_ADDR_47
+0x4780 US_ALU_RGB_ADDR_48
+0x4784 US_ALU_RGB_ADDR_49
+0x4788 US_ALU_RGB_ADDR_50
+0x478C US_ALU_RGB_ADDR_51
+0x4790 US_ALU_RGB_ADDR_52
+0x4794 US_ALU_RGB_ADDR_53
+0x4798 US_ALU_RGB_ADDR_54
+0x479C US_ALU_RGB_ADDR_55
+0x47A0 US_ALU_RGB_ADDR_56
+0x47A4 US_ALU_RGB_ADDR_57
+0x47A8 US_ALU_RGB_ADDR_58
+0x47AC US_ALU_RGB_ADDR_59
+0x47B0 US_ALU_RGB_ADDR_60
+0x47B4 US_ALU_RGB_ADDR_61
+0x47B8 US_ALU_RGB_ADDR_62
+0x47BC US_ALU_RGB_ADDR_63
+0x47C0 US_ALU_ALPHA_ADDR_0
+0x47C4 US_ALU_ALPHA_ADDR_1
+0x47C8 US_ALU_ALPHA_ADDR_2
+0x47CC US_ALU_ALPHA_ADDR_3
+0x47D0 US_ALU_ALPHA_ADDR_4
+0x47D4 US_ALU_ALPHA_ADDR_5
+0x47D8 US_ALU_ALPHA_ADDR_6
+0x47DC US_ALU_ALPHA_ADDR_7
+0x47E0 US_ALU_ALPHA_ADDR_8
+0x47E4 US_ALU_ALPHA_ADDR_9
+0x47E8 US_ALU_ALPHA_ADDR_10
+0x47EC US_ALU_ALPHA_ADDR_11
+0x47F0 US_ALU_ALPHA_ADDR_12
+0x47F4 US_ALU_ALPHA_ADDR_13
+0x47F8 US_ALU_ALPHA_ADDR_14
+0x47FC US_ALU_ALPHA_ADDR_15
+0x4800 US_ALU_ALPHA_ADDR_16
+0x4804 US_ALU_ALPHA_ADDR_17
+0x4808 US_ALU_ALPHA_ADDR_18
+0x480C US_ALU_ALPHA_ADDR_19
+0x4810 US_ALU_ALPHA_ADDR_20
+0x4814 US_ALU_ALPHA_ADDR_21
+0x4818 US_ALU_ALPHA_ADDR_22
+0x481C US_ALU_ALPHA_ADDR_23
+0x4820 US_ALU_ALPHA_ADDR_24
+0x4824 US_ALU_ALPHA_ADDR_25
+0x4828 US_ALU_ALPHA_ADDR_26
+0x482C US_ALU_ALPHA_ADDR_27
+0x4830 US_ALU_ALPHA_ADDR_28
+0x4834 US_ALU_ALPHA_ADDR_29
+0x4838 US_ALU_ALPHA_ADDR_30
+0x483C US_ALU_ALPHA_ADDR_31
+0x4840 US_ALU_ALPHA_ADDR_32
+0x4844 US_ALU_ALPHA_ADDR_33
+0x4848 US_ALU_ALPHA_ADDR_34
+0x484C US_ALU_ALPHA_ADDR_35
+0x4850 US_ALU_ALPHA_ADDR_36
+0x4854 US_ALU_ALPHA_ADDR_37
+0x4858 US_ALU_ALPHA_ADDR_38
+0x485C US_ALU_ALPHA_ADDR_39
+0x4860 US_ALU_ALPHA_ADDR_40
+0x4864 US_ALU_ALPHA_ADDR_41
+0x4868 US_ALU_ALPHA_ADDR_42
+0x486C US_ALU_ALPHA_ADDR_43
+0x4870 US_ALU_ALPHA_ADDR_44
+0x4874 US_ALU_ALPHA_ADDR_45
+0x4878 US_ALU_ALPHA_ADDR_46
+0x487C US_ALU_ALPHA_ADDR_47
+0x4880 US_ALU_ALPHA_ADDR_48
+0x4884 US_ALU_ALPHA_ADDR_49
+0x4888 US_ALU_ALPHA_ADDR_50
+0x488C US_ALU_ALPHA_ADDR_51
+0x4890 US_ALU_ALPHA_ADDR_52
+0x4894 US_ALU_ALPHA_ADDR_53
+0x4898 US_ALU_ALPHA_ADDR_54
+0x489C US_ALU_ALPHA_ADDR_55
+0x48A0 US_ALU_ALPHA_ADDR_56
+0x48A4 US_ALU_ALPHA_ADDR_57
+0x48A8 US_ALU_ALPHA_ADDR_58
+0x48AC US_ALU_ALPHA_ADDR_59
+0x48B0 US_ALU_ALPHA_ADDR_60
+0x48B4 US_ALU_ALPHA_ADDR_61
+0x48B8 US_ALU_ALPHA_ADDR_62
+0x48BC US_ALU_ALPHA_ADDR_63
+0x48C0 US_ALU_RGB_INST_0
+0x48C4 US_ALU_RGB_INST_1
+0x48C8 US_ALU_RGB_INST_2
+0x48CC US_ALU_RGB_INST_3
+0x48D0 US_ALU_RGB_INST_4
+0x48D4 US_ALU_RGB_INST_5
+0x48D8 US_ALU_RGB_INST_6
+0x48DC US_ALU_RGB_INST_7
+0x48E0 US_ALU_RGB_INST_8
+0x48E4 US_ALU_RGB_INST_9
+0x48E8 US_ALU_RGB_INST_10
+0x48EC US_ALU_RGB_INST_11
+0x48F0 US_ALU_RGB_INST_12
+0x48F4 US_ALU_RGB_INST_13
+0x48F8 US_ALU_RGB_INST_14
+0x48FC US_ALU_RGB_INST_15
+0x4900 US_ALU_RGB_INST_16
+0x4904 US_ALU_RGB_INST_17
+0x4908 US_ALU_RGB_INST_18
+0x490C US_ALU_RGB_INST_19
+0x4910 US_ALU_RGB_INST_20
+0x4914 US_ALU_RGB_INST_21
+0x4918 US_ALU_RGB_INST_22
+0x491C US_ALU_RGB_INST_23
+0x4920 US_ALU_RGB_INST_24
+0x4924 US_ALU_RGB_INST_25
+0x4928 US_ALU_RGB_INST_26
+0x492C US_ALU_RGB_INST_27
+0x4930 US_ALU_RGB_INST_28
+0x4934 US_ALU_RGB_INST_29
+0x4938 US_ALU_RGB_INST_30
+0x493C US_ALU_RGB_INST_31
+0x4940 US_ALU_RGB_INST_32
+0x4944 US_ALU_RGB_INST_33
+0x4948 US_ALU_RGB_INST_34
+0x494C US_ALU_RGB_INST_35
+0x4950 US_ALU_RGB_INST_36
+0x4954 US_ALU_RGB_INST_37
+0x4958 US_ALU_RGB_INST_38
+0x495C US_ALU_RGB_INST_39
+0x4960 US_ALU_RGB_INST_40
+0x4964 US_ALU_RGB_INST_41
+0x4968 US_ALU_RGB_INST_42
+0x496C US_ALU_RGB_INST_43
+0x4970 US_ALU_RGB_INST_44
+0x4974 US_ALU_RGB_INST_45
+0x4978 US_ALU_RGB_INST_46
+0x497C US_ALU_RGB_INST_47
+0x4980 US_ALU_RGB_INST_48
+0x4984 US_ALU_RGB_INST_49
+0x4988 US_ALU_RGB_INST_50
+0x498C US_ALU_RGB_INST_51
+0x4990 US_ALU_RGB_INST_52
+0x4994 US_ALU_RGB_INST_53
+0x4998 US_ALU_RGB_INST_54
+0x499C US_ALU_RGB_INST_55
+0x49A0 US_ALU_RGB_INST_56
+0x49A4 US_ALU_RGB_INST_57
+0x49A8 US_ALU_RGB_INST_58
+0x49AC US_ALU_RGB_INST_59
+0x49B0 US_ALU_RGB_INST_60
+0x49B4 US_ALU_RGB_INST_61
+0x49B8 US_ALU_RGB_INST_62
+0x49BC US_ALU_RGB_INST_63
+0x49C0 US_ALU_ALPHA_INST_0
+0x49C4 US_ALU_ALPHA_INST_1
+0x49C8 US_ALU_ALPHA_INST_2
+0x49CC US_ALU_ALPHA_INST_3
+0x49D0 US_ALU_ALPHA_INST_4
+0x49D4 US_ALU_ALPHA_INST_5
+0x49D8 US_ALU_ALPHA_INST_6
+0x49DC US_ALU_ALPHA_INST_7
+0x49E0 US_ALU_ALPHA_INST_8
+0x49E4 US_ALU_ALPHA_INST_9
+0x49E8 US_ALU_ALPHA_INST_10
+0x49EC US_ALU_ALPHA_INST_11
+0x49F0 US_ALU_ALPHA_INST_12
+0x49F4 US_ALU_ALPHA_INST_13
+0x49F8 US_ALU_ALPHA_INST_14
+0x49FC US_ALU_ALPHA_INST_15
+0x4A00 US_ALU_ALPHA_INST_16
+0x4A04 US_ALU_ALPHA_INST_17
+0x4A08 US_ALU_ALPHA_INST_18
+0x4A0C US_ALU_ALPHA_INST_19
+0x4A10 US_ALU_ALPHA_INST_20
+0x4A14 US_ALU_ALPHA_INST_21
+0x4A18 US_ALU_ALPHA_INST_22
+0x4A1C US_ALU_ALPHA_INST_23
+0x4A20 US_ALU_ALPHA_INST_24
+0x4A24 US_ALU_ALPHA_INST_25
+0x4A28 US_ALU_ALPHA_INST_26
+0x4A2C US_ALU_ALPHA_INST_27
+0x4A30 US_ALU_ALPHA_INST_28
+0x4A34 US_ALU_ALPHA_INST_29
+0x4A38 US_ALU_ALPHA_INST_30
+0x4A3C US_ALU_ALPHA_INST_31
+0x4A40 US_ALU_ALPHA_INST_32
+0x4A44 US_ALU_ALPHA_INST_33
+0x4A48 US_ALU_ALPHA_INST_34
+0x4A4C US_ALU_ALPHA_INST_35
+0x4A50 US_ALU_ALPHA_INST_36
+0x4A54 US_ALU_ALPHA_INST_37
+0x4A58 US_ALU_ALPHA_INST_38
+0x4A5C US_ALU_ALPHA_INST_39
+0x4A60 US_ALU_ALPHA_INST_40
+0x4A64 US_ALU_ALPHA_INST_41
+0x4A68 US_ALU_ALPHA_INST_42
+0x4A6C US_ALU_ALPHA_INST_43
+0x4A70 US_ALU_ALPHA_INST_44
+0x4A74 US_ALU_ALPHA_INST_45
+0x4A78 US_ALU_ALPHA_INST_46
+0x4A7C US_ALU_ALPHA_INST_47
+0x4A80 US_ALU_ALPHA_INST_48
+0x4A84 US_ALU_ALPHA_INST_49
+0x4A88 US_ALU_ALPHA_INST_50
+0x4A8C US_ALU_ALPHA_INST_51
+0x4A90 US_ALU_ALPHA_INST_52
+0x4A94 US_ALU_ALPHA_INST_53
+0x4A98 US_ALU_ALPHA_INST_54
+0x4A9C US_ALU_ALPHA_INST_55
+0x4AA0 US_ALU_ALPHA_INST_56
+0x4AA4 US_ALU_ALPHA_INST_57
+0x4AA8 US_ALU_ALPHA_INST_58
+0x4AAC US_ALU_ALPHA_INST_59
+0x4AB0 US_ALU_ALPHA_INST_60
+0x4AB4 US_ALU_ALPHA_INST_61
+0x4AB8 US_ALU_ALPHA_INST_62
+0x4ABC US_ALU_ALPHA_INST_63
+0x4BC0 FG_FOG_BLEND
+0x4BC4 FG_FOG_FACTOR
+0x4BC8 FG_FOG_COLOR_R
+0x4BCC FG_FOG_COLOR_G
+0x4BD0 FG_FOG_COLOR_B
+0x4BD4 FG_ALPHA_FUNC
+0x4BD8 FG_DEPTH_SRC
+0x4C00 US_ALU_CONST_R_0
+0x4C04 US_ALU_CONST_G_0
+0x4C08 US_ALU_CONST_B_0
+0x4C0C US_ALU_CONST_A_0
+0x4C10 US_ALU_CONST_R_1
+0x4C14 US_ALU_CONST_G_1
+0x4C18 US_ALU_CONST_B_1
+0x4C1C US_ALU_CONST_A_1
+0x4C20 US_ALU_CONST_R_2
+0x4C24 US_ALU_CONST_G_2
+0x4C28 US_ALU_CONST_B_2
+0x4C2C US_ALU_CONST_A_2
+0x4C30 US_ALU_CONST_R_3
+0x4C34 US_ALU_CONST_G_3
+0x4C38 US_ALU_CONST_B_3
+0x4C3C US_ALU_CONST_A_3
+0x4C40 US_ALU_CONST_R_4
+0x4C44 US_ALU_CONST_G_4
+0x4C48 US_ALU_CONST_B_4
+0x4C4C US_ALU_CONST_A_4
+0x4C50 US_ALU_CONST_R_5
+0x4C54 US_ALU_CONST_G_5
+0x4C58 US_ALU_CONST_B_5
+0x4C5C US_ALU_CONST_A_5
+0x4C60 US_ALU_CONST_R_6
+0x4C64 US_ALU_CONST_G_6
+0x4C68 US_ALU_CONST_B_6
+0x4C6C US_ALU_CONST_A_6
+0x4C70 US_ALU_CONST_R_7
+0x4C74 US_ALU_CONST_G_7
+0x4C78 US_ALU_CONST_B_7
+0x4C7C US_ALU_CONST_A_7
+0x4C80 US_ALU_CONST_R_8
+0x4C84 US_ALU_CONST_G_8
+0x4C88 US_ALU_CONST_B_8
+0x4C8C US_ALU_CONST_A_8
+0x4C90 US_ALU_CONST_R_9
+0x4C94 US_ALU_CONST_G_9
+0x4C98 US_ALU_CONST_B_9
+0x4C9C US_ALU_CONST_A_9
+0x4CA0 US_ALU_CONST_R_10
+0x4CA4 US_ALU_CONST_G_10
+0x4CA8 US_ALU_CONST_B_10
+0x4CAC US_ALU_CONST_A_10
+0x4CB0 US_ALU_CONST_R_11
+0x4CB4 US_ALU_CONST_G_11
+0x4CB8 US_ALU_CONST_B_11
+0x4CBC US_ALU_CONST_A_11
+0x4CC0 US_ALU_CONST_R_12
+0x4CC4 US_ALU_CONST_G_12
+0x4CC8 US_ALU_CONST_B_12
+0x4CCC US_ALU_CONST_A_12
+0x4CD0 US_ALU_CONST_R_13
+0x4CD4 US_ALU_CONST_G_13
+0x4CD8 US_ALU_CONST_B_13
+0x4CDC US_ALU_CONST_A_13
+0x4CE0 US_ALU_CONST_R_14
+0x4CE4 US_ALU_CONST_G_14
+0x4CE8 US_ALU_CONST_B_14
+0x4CEC US_ALU_CONST_A_14
+0x4CF0 US_ALU_CONST_R_15
+0x4CF4 US_ALU_CONST_G_15
+0x4CF8 US_ALU_CONST_B_15
+0x4CFC US_ALU_CONST_A_15
+0x4D00 US_ALU_CONST_R_16
+0x4D04 US_ALU_CONST_G_16
+0x4D08 US_ALU_CONST_B_16
+0x4D0C US_ALU_CONST_A_16
+0x4D10 US_ALU_CONST_R_17
+0x4D14 US_ALU_CONST_G_17
+0x4D18 US_ALU_CONST_B_17
+0x4D1C US_ALU_CONST_A_17
+0x4D20 US_ALU_CONST_R_18
+0x4D24 US_ALU_CONST_G_18
+0x4D28 US_ALU_CONST_B_18
+0x4D2C US_ALU_CONST_A_18
+0x4D30 US_ALU_CONST_R_19
+0x4D34 US_ALU_CONST_G_19
+0x4D38 US_ALU_CONST_B_19
+0x4D3C US_ALU_CONST_A_19
+0x4D40 US_ALU_CONST_R_20
+0x4D44 US_ALU_CONST_G_20
+0x4D48 US_ALU_CONST_B_20
+0x4D4C US_ALU_CONST_A_20
+0x4D50 US_ALU_CONST_R_21
+0x4D54 US_ALU_CONST_G_21
+0x4D58 US_ALU_CONST_B_21
+0x4D5C US_ALU_CONST_A_21
+0x4D60 US_ALU_CONST_R_22
+0x4D64 US_ALU_CONST_G_22
+0x4D68 US_ALU_CONST_B_22
+0x4D6C US_ALU_CONST_A_22
+0x4D70 US_ALU_CONST_R_23
+0x4D74 US_ALU_CONST_G_23
+0x4D78 US_ALU_CONST_B_23
+0x4D7C US_ALU_CONST_A_23
+0x4D80 US_ALU_CONST_R_24
+0x4D84 US_ALU_CONST_G_24
+0x4D88 US_ALU_CONST_B_24
+0x4D8C US_ALU_CONST_A_24
+0x4D90 US_ALU_CONST_R_25
+0x4D94 US_ALU_CONST_G_25
+0x4D98 US_ALU_CONST_B_25
+0x4D9C US_ALU_CONST_A_25
+0x4DA0 US_ALU_CONST_R_26
+0x4DA4 US_ALU_CONST_G_26
+0x4DA8 US_ALU_CONST_B_26
+0x4DAC US_ALU_CONST_A_26
+0x4DB0 US_ALU_CONST_R_27
+0x4DB4 US_ALU_CONST_G_27
+0x4DB8 US_ALU_CONST_B_27
+0x4DBC US_ALU_CONST_A_27
+0x4DC0 US_ALU_CONST_R_28
+0x4DC4 US_ALU_CONST_G_28
+0x4DC8 US_ALU_CONST_B_28
+0x4DCC US_ALU_CONST_A_28
+0x4DD0 US_ALU_CONST_R_29
+0x4DD4 US_ALU_CONST_G_29
+0x4DD8 US_ALU_CONST_B_29
+0x4DDC US_ALU_CONST_A_29
+0x4DE0 US_ALU_CONST_R_30
+0x4DE4 US_ALU_CONST_G_30
+0x4DE8 US_ALU_CONST_B_30
+0x4DEC US_ALU_CONST_A_30
+0x4DF0 US_ALU_CONST_R_31
+0x4DF4 US_ALU_CONST_G_31
+0x4DF8 US_ALU_CONST_B_31
+0x4DFC US_ALU_CONST_A_31
+0x4E04 RB3D_BLENDCNTL_R3
+0x4E08 RB3D_ABLENDCNTL_R3
+0x4E0C RB3D_COLOR_CHANNEL_MASK
+0x4E10 RB3D_CONSTANT_COLOR
+0x4E14 RB3D_COLOR_CLEAR_VALUE
+0x4E18 RB3D_ROPCNTL_R3
+0x4E1C RB3D_CLRCMP_FLIPE_R3
+0x4E20 RB3D_CLRCMP_CLR_R3
+0x4E24 RB3D_CLRCMP_MSK_R3
+0x4E48 RB3D_DEBUG_CTL
+0x4E4C RB3D_DSTCACHE_CTLSTAT_R3
+0x4E50 RB3D_DITHER_CTL
+0x4E54 RB3D_CMASK_OFFSET0
+0x4E58 RB3D_CMASK_OFFSET1
+0x4E5C RB3D_CMASK_OFFSET2
+0x4E60 RB3D_CMASK_OFFSET3
+0x4E64 RB3D_CMASK_PITCH0
+0x4E68 RB3D_CMASK_PITCH1
+0x4E6C RB3D_CMASK_PITCH2
+0x4E70 RB3D_CMASK_PITCH3
+0x4E74 RB3D_CMASK_WRINDEX
+0x4E78 RB3D_CMASK_DWORD
+0x4E7C RB3D_CMASK_RDINDEX
+0x4E80 RB3D_AARESOLVE_OFFSET
+0x4E84 RB3D_AARESOLVE_PITCH
+0x4E88 RB3D_AARESOLVE_CTL
+0x4EA0 RB3D_DISCARD_SRC_PIXEL_LTE_THRESHOLD
+0x4EA4 RB3D_DISCARD_SRC_PIXEL_GTE_THRESHOLD
+0x4F04 ZB_ZSTENCILCNTL
+0x4F08 ZB_STENCILREFMASK
+0x4F14 ZB_ZTOP
+0x4F18 ZB_ZCACHE_CTLSTAT
+0x4F1C ZB_BW_CNTL
+0x4F28 ZB_DEPTHCLEARVALUE
+0x4F30 ZB_ZMASK_OFFSET
+0x4F34 ZB_ZMASK_PITCH
+0x4F38 ZB_ZMASK_WRINDEX
+0x4F3C ZB_ZMASK_DWORD
+0x4F40 ZB_ZMASK_RDINDEX
+0x4F44 ZB_HIZ_OFFSET
+0x4F48 ZB_HIZ_WRINDEX
+0x4F4C ZB_HIZ_DWORD
+0x4F50 ZB_HIZ_RDINDEX
+0x4F54 ZB_HIZ_PITCH
+0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rn50 b/drivers/gpu/drm/radeon/reg_srcs/rn50
new file mode 100644 (file)
index 0000000..2687b63
--- /dev/null
@@ -0,0 +1,30 @@
+rn50 0x3294
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rs600 b/drivers/gpu/drm/radeon/reg_srcs/rs600
new file mode 100644 (file)
index 0000000..8e3c0b8
--- /dev/null
@@ -0,0 +1,729 @@
+rs600 0x6d40
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1D98 VAP_VPORT_XSCALE
+0x1D9C VAP_VPORT_XOFFSET
+0x1DA0 VAP_VPORT_YSCALE
+0x1DA4 VAP_VPORT_YOFFSET
+0x1DA8 VAP_VPORT_ZSCALE
+0x1DAC VAP_VPORT_ZOFFSET
+0x2080 VAP_CNTL
+0x2090 VAP_OUT_VTX_FMT_0
+0x2094 VAP_OUT_VTX_FMT_1
+0x20B0 VAP_VTE_CNTL
+0x2138 VAP_VF_MIN_VTX_INDX
+0x2140 VAP_CNTL_STATUS
+0x2150 VAP_PROG_STREAM_CNTL_0
+0x2154 VAP_PROG_STREAM_CNTL_1
+0x2158 VAP_PROG_STREAM_CNTL_2
+0x215C VAP_PROG_STREAM_CNTL_3
+0x2160 VAP_PROG_STREAM_CNTL_4
+0x2164 VAP_PROG_STREAM_CNTL_5
+0x2168 VAP_PROG_STREAM_CNTL_6
+0x216C VAP_PROG_STREAM_CNTL_7
+0x2180 VAP_VTX_STATE_CNTL
+0x2184 VAP_VSM_VTX_ASSM
+0x2188 VAP_VTX_STATE_IND_REG_0
+0x218C VAP_VTX_STATE_IND_REG_1
+0x2190 VAP_VTX_STATE_IND_REG_2
+0x2194 VAP_VTX_STATE_IND_REG_3
+0x2198 VAP_VTX_STATE_IND_REG_4
+0x219C VAP_VTX_STATE_IND_REG_5
+0x21A0 VAP_VTX_STATE_IND_REG_6
+0x21A4 VAP_VTX_STATE_IND_REG_7
+0x21A8 VAP_VTX_STATE_IND_REG_8
+0x21AC VAP_VTX_STATE_IND_REG_9
+0x21B0 VAP_VTX_STATE_IND_REG_10
+0x21B4 VAP_VTX_STATE_IND_REG_11
+0x21B8 VAP_VTX_STATE_IND_REG_12
+0x21BC VAP_VTX_STATE_IND_REG_13
+0x21C0 VAP_VTX_STATE_IND_REG_14
+0x21C4 VAP_VTX_STATE_IND_REG_15
+0x21DC VAP_PSC_SGN_NORM_CNTL
+0x21E0 VAP_PROG_STREAM_CNTL_EXT_0
+0x21E4 VAP_PROG_STREAM_CNTL_EXT_1
+0x21E8 VAP_PROG_STREAM_CNTL_EXT_2
+0x21EC VAP_PROG_STREAM_CNTL_EXT_3
+0x21F0 VAP_PROG_STREAM_CNTL_EXT_4
+0x21F4 VAP_PROG_STREAM_CNTL_EXT_5
+0x21F8 VAP_PROG_STREAM_CNTL_EXT_6
+0x21FC VAP_PROG_STREAM_CNTL_EXT_7
+0x2200 VAP_PVS_VECTOR_INDX_REG
+0x2204 VAP_PVS_VECTOR_DATA_REG
+0x2208 VAP_PVS_VECTOR_DATA_REG_128
+0x221C VAP_CLIP_CNTL
+0x2220 VAP_GB_VERT_CLIP_ADJ
+0x2224 VAP_GB_VERT_DISC_ADJ
+0x2228 VAP_GB_HORZ_CLIP_ADJ
+0x222C VAP_GB_HORZ_DISC_ADJ
+0x2230 VAP_PVS_FLOW_CNTL_ADDRS_0
+0x2234 VAP_PVS_FLOW_CNTL_ADDRS_1
+0x2238 VAP_PVS_FLOW_CNTL_ADDRS_2
+0x223C VAP_PVS_FLOW_CNTL_ADDRS_3
+0x2240 VAP_PVS_FLOW_CNTL_ADDRS_4
+0x2244 VAP_PVS_FLOW_CNTL_ADDRS_5
+0x2248 VAP_PVS_FLOW_CNTL_ADDRS_6
+0x224C VAP_PVS_FLOW_CNTL_ADDRS_7
+0x2250 VAP_PVS_FLOW_CNTL_ADDRS_8
+0x2254 VAP_PVS_FLOW_CNTL_ADDRS_9
+0x2258 VAP_PVS_FLOW_CNTL_ADDRS_10
+0x225C VAP_PVS_FLOW_CNTL_ADDRS_11
+0x2260 VAP_PVS_FLOW_CNTL_ADDRS_12
+0x2264 VAP_PVS_FLOW_CNTL_ADDRS_13
+0x2268 VAP_PVS_FLOW_CNTL_ADDRS_14
+0x226C VAP_PVS_FLOW_CNTL_ADDRS_15
+0x2284 VAP_PVS_STATE_FLUSH_REG
+0x2288 VAP_PVS_VTX_TIMEOUT_REG
+0x2290 VAP_PVS_FLOW_CNTL_LOOP_INDEX_0
+0x2294 VAP_PVS_FLOW_CNTL_LOOP_INDEX_1
+0x2298 VAP_PVS_FLOW_CNTL_LOOP_INDEX_2
+0x229C VAP_PVS_FLOW_CNTL_LOOP_INDEX_3
+0x22A0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_4
+0x22A4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_5
+0x22A8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_6
+0x22AC VAP_PVS_FLOW_CNTL_LOOP_INDEX_7
+0x22B0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_8
+0x22B4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_9
+0x22B8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_10
+0x22BC VAP_PVS_FLOW_CNTL_LOOP_INDEX_11
+0x22C0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_12
+0x22C4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_13
+0x22C8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_14
+0x22CC VAP_PVS_FLOW_CNTL_LOOP_INDEX_15
+0x22D0 VAP_PVS_CODE_CNTL_0
+0x22D4 VAP_PVS_CONST_CNTL
+0x22D8 VAP_PVS_CODE_CNTL_1
+0x22DC VAP_PVS_FLOW_CNTL_OPC
+0x342C RB2D_DSTCACHE_CTLSTAT
+0x4000 GB_VAP_RASTER_VTX_FMT_0
+0x4004 GB_VAP_RASTER_VTX_FMT_1
+0x4008 GB_ENABLE
+0x401C GB_SELECT
+0x4020 GB_AA_CONFIG
+0x4024 GB_FIFO_SIZE
+0x4100 TX_INVALTAGS
+0x4200 GA_POINT_S0
+0x4204 GA_POINT_T0
+0x4208 GA_POINT_S1
+0x420C GA_POINT_T1
+0x4214 GA_TRIANGLE_STIPPLE
+0x421C GA_POINT_SIZE
+0x4230 GA_POINT_MINMAX
+0x4234 GA_LINE_CNTL
+0x4238 GA_LINE_STIPPLE_CONFIG
+0x4260 GA_LINE_STIPPLE_VALUE
+0x4264 GA_LINE_S0
+0x4268 GA_LINE_S1
+0x4278 GA_COLOR_CONTROL
+0x427C GA_SOLID_RG
+0x4280 GA_SOLID_BA
+0x4288 GA_POLY_MODE
+0x428C GA_ROUND_MODE
+0x4290 GA_OFFSET
+0x4294 GA_FOG_SCALE
+0x4298 GA_FOG_OFFSET
+0x42A0 SU_TEX_WRAP
+0x42A4 SU_POLY_OFFSET_FRONT_SCALE
+0x42A8 SU_POLY_OFFSET_FRONT_OFFSET
+0x42AC SU_POLY_OFFSET_BACK_SCALE
+0x42B0 SU_POLY_OFFSET_BACK_OFFSET 
+0x42B4 SU_POLY_OFFSET_ENABLE
+0x42B8 SU_CULL_MODE
+0x42C0 SU_DEPTH_SCALE
+0x42C4 SU_DEPTH_OFFSET
+0x42C8 SU_REG_DEST
+0x4300 RS_COUNT
+0x4304 RS_INST_COUNT
+0x4310 RS_IP_0
+0x4314 RS_IP_1
+0x4318 RS_IP_2
+0x431C RS_IP_3
+0x4320 RS_IP_4
+0x4324 RS_IP_5
+0x4328 RS_IP_6
+0x432C RS_IP_7
+0x4330 RS_INST_0
+0x4334 RS_INST_1
+0x4338 RS_INST_2
+0x433C RS_INST_3
+0x4340 RS_INST_4
+0x4344 RS_INST_5
+0x4348 RS_INST_6
+0x434C RS_INST_7
+0x4350 RS_INST_8
+0x4354 RS_INST_9
+0x4358 RS_INST_10
+0x435C RS_INST_11
+0x4360 RS_INST_12
+0x4364 RS_INST_13
+0x4368 RS_INST_14
+0x436C RS_INST_15
+0x43A4 SC_HYPERZ_EN
+0x43A8 SC_EDGERULE
+0x43B0 SC_CLIP_0_A
+0x43B4 SC_CLIP_0_B
+0x43B8 SC_CLIP_1_A
+0x43BC SC_CLIP_1_B
+0x43C0 SC_CLIP_2_A
+0x43C4 SC_CLIP_2_B
+0x43C8 SC_CLIP_3_A
+0x43CC SC_CLIP_3_B
+0x43D0 SC_CLIP_RULE
+0x43E0 SC_SCISSOR0
+0x43E8 SC_SCREENDOOR
+0x4440 TX_FILTER1_0
+0x4444 TX_FILTER1_1
+0x4448 TX_FILTER1_2
+0x444C TX_FILTER1_3
+0x4450 TX_FILTER1_4
+0x4454 TX_FILTER1_5
+0x4458 TX_FILTER1_6
+0x445C TX_FILTER1_7
+0x4460 TX_FILTER1_8
+0x4464 TX_FILTER1_9
+0x4468 TX_FILTER1_10
+0x446C TX_FILTER1_11
+0x4470 TX_FILTER1_12
+0x4474 TX_FILTER1_13
+0x4478 TX_FILTER1_14
+0x447C TX_FILTER1_15
+0x4580 TX_CHROMA_KEY_0
+0x4584 TX_CHROMA_KEY_1
+0x4588 TX_CHROMA_KEY_2
+0x458C TX_CHROMA_KEY_3
+0x4590 TX_CHROMA_KEY_4
+0x4594 TX_CHROMA_KEY_5
+0x4598 TX_CHROMA_KEY_6
+0x459C TX_CHROMA_KEY_7
+0x45A0 TX_CHROMA_KEY_8
+0x45A4 TX_CHROMA_KEY_9
+0x45A8 TX_CHROMA_KEY_10
+0x45AC TX_CHROMA_KEY_11
+0x45B0 TX_CHROMA_KEY_12
+0x45B4 TX_CHROMA_KEY_13
+0x45B8 TX_CHROMA_KEY_14
+0x45BC TX_CHROMA_KEY_15
+0x45C0 TX_BORDER_COLOR_0
+0x45C4 TX_BORDER_COLOR_1
+0x45C8 TX_BORDER_COLOR_2
+0x45CC TX_BORDER_COLOR_3
+0x45D0 TX_BORDER_COLOR_4
+0x45D4 TX_BORDER_COLOR_5
+0x45D8 TX_BORDER_COLOR_6
+0x45DC TX_BORDER_COLOR_7
+0x45E0 TX_BORDER_COLOR_8
+0x45E4 TX_BORDER_COLOR_9
+0x45E8 TX_BORDER_COLOR_10
+0x45EC TX_BORDER_COLOR_11
+0x45F0 TX_BORDER_COLOR_12
+0x45F4 TX_BORDER_COLOR_13
+0x45F8 TX_BORDER_COLOR_14
+0x45FC TX_BORDER_COLOR_15
+0x4600 US_CONFIG
+0x4604 US_PIXSIZE
+0x4608 US_CODE_OFFSET
+0x460C US_RESET
+0x4610 US_CODE_ADDR_0
+0x4614 US_CODE_ADDR_1
+0x4618 US_CODE_ADDR_2
+0x461C US_CODE_ADDR_3
+0x4620 US_TEX_INST_0
+0x4624 US_TEX_INST_1
+0x4628 US_TEX_INST_2
+0x462C US_TEX_INST_3
+0x4630 US_TEX_INST_4
+0x4634 US_TEX_INST_5
+0x4638 US_TEX_INST_6
+0x463C US_TEX_INST_7
+0x4640 US_TEX_INST_8
+0x4644 US_TEX_INST_9
+0x4648 US_TEX_INST_10
+0x464C US_TEX_INST_11
+0x4650 US_TEX_INST_12
+0x4654 US_TEX_INST_13
+0x4658 US_TEX_INST_14
+0x465C US_TEX_INST_15
+0x4660 US_TEX_INST_16
+0x4664 US_TEX_INST_17
+0x4668 US_TEX_INST_18
+0x466C US_TEX_INST_19
+0x4670 US_TEX_INST_20
+0x4674 US_TEX_INST_21
+0x4678 US_TEX_INST_22
+0x467C US_TEX_INST_23
+0x4680 US_TEX_INST_24
+0x4684 US_TEX_INST_25
+0x4688 US_TEX_INST_26
+0x468C US_TEX_INST_27
+0x4690 US_TEX_INST_28
+0x4694 US_TEX_INST_29
+0x4698 US_TEX_INST_30
+0x469C US_TEX_INST_31
+0x46A4 US_OUT_FMT_0
+0x46A8 US_OUT_FMT_1
+0x46AC US_OUT_FMT_2
+0x46B0 US_OUT_FMT_3
+0x46B4 US_W_FMT
+0x46C0 US_ALU_RGB_ADDR_0
+0x46C4 US_ALU_RGB_ADDR_1
+0x46C8 US_ALU_RGB_ADDR_2
+0x46CC US_ALU_RGB_ADDR_3
+0x46D0 US_ALU_RGB_ADDR_4
+0x46D4 US_ALU_RGB_ADDR_5
+0x46D8 US_ALU_RGB_ADDR_6
+0x46DC US_ALU_RGB_ADDR_7
+0x46E0 US_ALU_RGB_ADDR_8
+0x46E4 US_ALU_RGB_ADDR_9
+0x46E8 US_ALU_RGB_ADDR_10
+0x46EC US_ALU_RGB_ADDR_11
+0x46F0 US_ALU_RGB_ADDR_12
+0x46F4 US_ALU_RGB_ADDR_13
+0x46F8 US_ALU_RGB_ADDR_14
+0x46FC US_ALU_RGB_ADDR_15
+0x4700 US_ALU_RGB_ADDR_16
+0x4704 US_ALU_RGB_ADDR_17
+0x4708 US_ALU_RGB_ADDR_18
+0x470C US_ALU_RGB_ADDR_19
+0x4710 US_ALU_RGB_ADDR_20
+0x4714 US_ALU_RGB_ADDR_21
+0x4718 US_ALU_RGB_ADDR_22
+0x471C US_ALU_RGB_ADDR_23
+0x4720 US_ALU_RGB_ADDR_24
+0x4724 US_ALU_RGB_ADDR_25
+0x4728 US_ALU_RGB_ADDR_26
+0x472C US_ALU_RGB_ADDR_27
+0x4730 US_ALU_RGB_ADDR_28
+0x4734 US_ALU_RGB_ADDR_29
+0x4738 US_ALU_RGB_ADDR_30
+0x473C US_ALU_RGB_ADDR_31
+0x4740 US_ALU_RGB_ADDR_32
+0x4744 US_ALU_RGB_ADDR_33
+0x4748 US_ALU_RGB_ADDR_34
+0x474C US_ALU_RGB_ADDR_35
+0x4750 US_ALU_RGB_ADDR_36
+0x4754 US_ALU_RGB_ADDR_37
+0x4758 US_ALU_RGB_ADDR_38
+0x475C US_ALU_RGB_ADDR_39
+0x4760 US_ALU_RGB_ADDR_40
+0x4764 US_ALU_RGB_ADDR_41
+0x4768 US_ALU_RGB_ADDR_42
+0x476C US_ALU_RGB_ADDR_43
+0x4770 US_ALU_RGB_ADDR_44
+0x4774 US_ALU_RGB_ADDR_45
+0x4778 US_ALU_RGB_ADDR_46
+0x477C US_ALU_RGB_ADDR_47
+0x4780 US_ALU_RGB_ADDR_48
+0x4784 US_ALU_RGB_ADDR_49
+0x4788 US_ALU_RGB_ADDR_50
+0x478C US_ALU_RGB_ADDR_51
+0x4790 US_ALU_RGB_ADDR_52
+0x4794 US_ALU_RGB_ADDR_53
+0x4798 US_ALU_RGB_ADDR_54
+0x479C US_ALU_RGB_ADDR_55
+0x47A0 US_ALU_RGB_ADDR_56
+0x47A4 US_ALU_RGB_ADDR_57
+0x47A8 US_ALU_RGB_ADDR_58
+0x47AC US_ALU_RGB_ADDR_59
+0x47B0 US_ALU_RGB_ADDR_60
+0x47B4 US_ALU_RGB_ADDR_61
+0x47B8 US_ALU_RGB_ADDR_62
+0x47BC US_ALU_RGB_ADDR_63
+0x47C0 US_ALU_ALPHA_ADDR_0
+0x47C4 US_ALU_ALPHA_ADDR_1
+0x47C8 US_ALU_ALPHA_ADDR_2
+0x47CC US_ALU_ALPHA_ADDR_3
+0x47D0 US_ALU_ALPHA_ADDR_4
+0x47D4 US_ALU_ALPHA_ADDR_5
+0x47D8 US_ALU_ALPHA_ADDR_6
+0x47DC US_ALU_ALPHA_ADDR_7
+0x47E0 US_ALU_ALPHA_ADDR_8
+0x47E4 US_ALU_ALPHA_ADDR_9
+0x47E8 US_ALU_ALPHA_ADDR_10
+0x47EC US_ALU_ALPHA_ADDR_11
+0x47F0 US_ALU_ALPHA_ADDR_12
+0x47F4 US_ALU_ALPHA_ADDR_13
+0x47F8 US_ALU_ALPHA_ADDR_14
+0x47FC US_ALU_ALPHA_ADDR_15
+0x4800 US_ALU_ALPHA_ADDR_16
+0x4804 US_ALU_ALPHA_ADDR_17
+0x4808 US_ALU_ALPHA_ADDR_18
+0x480C US_ALU_ALPHA_ADDR_19
+0x4810 US_ALU_ALPHA_ADDR_20
+0x4814 US_ALU_ALPHA_ADDR_21
+0x4818 US_ALU_ALPHA_ADDR_22
+0x481C US_ALU_ALPHA_ADDR_23
+0x4820 US_ALU_ALPHA_ADDR_24
+0x4824 US_ALU_ALPHA_ADDR_25
+0x4828 US_ALU_ALPHA_ADDR_26
+0x482C US_ALU_ALPHA_ADDR_27
+0x4830 US_ALU_ALPHA_ADDR_28
+0x4834 US_ALU_ALPHA_ADDR_29
+0x4838 US_ALU_ALPHA_ADDR_30
+0x483C US_ALU_ALPHA_ADDR_31
+0x4840 US_ALU_ALPHA_ADDR_32
+0x4844 US_ALU_ALPHA_ADDR_33
+0x4848 US_ALU_ALPHA_ADDR_34
+0x484C US_ALU_ALPHA_ADDR_35
+0x4850 US_ALU_ALPHA_ADDR_36
+0x4854 US_ALU_ALPHA_ADDR_37
+0x4858 US_ALU_ALPHA_ADDR_38
+0x485C US_ALU_ALPHA_ADDR_39
+0x4860 US_ALU_ALPHA_ADDR_40
+0x4864 US_ALU_ALPHA_ADDR_41
+0x4868 US_ALU_ALPHA_ADDR_42
+0x486C US_ALU_ALPHA_ADDR_43
+0x4870 US_ALU_ALPHA_ADDR_44
+0x4874 US_ALU_ALPHA_ADDR_45
+0x4878 US_ALU_ALPHA_ADDR_46
+0x487C US_ALU_ALPHA_ADDR_47
+0x4880 US_ALU_ALPHA_ADDR_48
+0x4884 US_ALU_ALPHA_ADDR_49
+0x4888 US_ALU_ALPHA_ADDR_50
+0x488C US_ALU_ALPHA_ADDR_51
+0x4890 US_ALU_ALPHA_ADDR_52
+0x4894 US_ALU_ALPHA_ADDR_53
+0x4898 US_ALU_ALPHA_ADDR_54
+0x489C US_ALU_ALPHA_ADDR_55
+0x48A0 US_ALU_ALPHA_ADDR_56
+0x48A4 US_ALU_ALPHA_ADDR_57
+0x48A8 US_ALU_ALPHA_ADDR_58
+0x48AC US_ALU_ALPHA_ADDR_59
+0x48B0 US_ALU_ALPHA_ADDR_60
+0x48B4 US_ALU_ALPHA_ADDR_61
+0x48B8 US_ALU_ALPHA_ADDR_62
+0x48BC US_ALU_ALPHA_ADDR_63
+0x48C0 US_ALU_RGB_INST_0
+0x48C4 US_ALU_RGB_INST_1
+0x48C8 US_ALU_RGB_INST_2
+0x48CC US_ALU_RGB_INST_3
+0x48D0 US_ALU_RGB_INST_4
+0x48D4 US_ALU_RGB_INST_5
+0x48D8 US_ALU_RGB_INST_6
+0x48DC US_ALU_RGB_INST_7
+0x48E0 US_ALU_RGB_INST_8
+0x48E4 US_ALU_RGB_INST_9
+0x48E8 US_ALU_RGB_INST_10
+0x48EC US_ALU_RGB_INST_11
+0x48F0 US_ALU_RGB_INST_12
+0x48F4 US_ALU_RGB_INST_13
+0x48F8 US_ALU_RGB_INST_14
+0x48FC US_ALU_RGB_INST_15
+0x4900 US_ALU_RGB_INST_16
+0x4904 US_ALU_RGB_INST_17
+0x4908 US_ALU_RGB_INST_18
+0x490C US_ALU_RGB_INST_19
+0x4910 US_ALU_RGB_INST_20
+0x4914 US_ALU_RGB_INST_21
+0x4918 US_ALU_RGB_INST_22
+0x491C US_ALU_RGB_INST_23
+0x4920 US_ALU_RGB_INST_24
+0x4924 US_ALU_RGB_INST_25
+0x4928 US_ALU_RGB_INST_26
+0x492C US_ALU_RGB_INST_27
+0x4930 US_ALU_RGB_INST_28
+0x4934 US_ALU_RGB_INST_29
+0x4938 US_ALU_RGB_INST_30
+0x493C US_ALU_RGB_INST_31
+0x4940 US_ALU_RGB_INST_32
+0x4944 US_ALU_RGB_INST_33
+0x4948 US_ALU_RGB_INST_34
+0x494C US_ALU_RGB_INST_35
+0x4950 US_ALU_RGB_INST_36
+0x4954 US_ALU_RGB_INST_37
+0x4958 US_ALU_RGB_INST_38
+0x495C US_ALU_RGB_INST_39
+0x4960 US_ALU_RGB_INST_40
+0x4964 US_ALU_RGB_INST_41
+0x4968 US_ALU_RGB_INST_42
+0x496C US_ALU_RGB_INST_43
+0x4970 US_ALU_RGB_INST_44
+0x4974 US_ALU_RGB_INST_45
+0x4978 US_ALU_RGB_INST_46
+0x497C US_ALU_RGB_INST_47
+0x4980 US_ALU_RGB_INST_48
+0x4984 US_ALU_RGB_INST_49
+0x4988 US_ALU_RGB_INST_50
+0x498C US_ALU_RGB_INST_51
+0x4990 US_ALU_RGB_INST_52
+0x4994 US_ALU_RGB_INST_53
+0x4998 US_ALU_RGB_INST_54
+0x499C US_ALU_RGB_INST_55
+0x49A0 US_ALU_RGB_INST_56
+0x49A4 US_ALU_RGB_INST_57
+0x49A8 US_ALU_RGB_INST_58
+0x49AC US_ALU_RGB_INST_59
+0x49B0 US_ALU_RGB_INST_60
+0x49B4 US_ALU_RGB_INST_61
+0x49B8 US_ALU_RGB_INST_62
+0x49BC US_ALU_RGB_INST_63
+0x49C0 US_ALU_ALPHA_INST_0
+0x49C4 US_ALU_ALPHA_INST_1
+0x49C8 US_ALU_ALPHA_INST_2
+0x49CC US_ALU_ALPHA_INST_3
+0x49D0 US_ALU_ALPHA_INST_4
+0x49D4 US_ALU_ALPHA_INST_5
+0x49D8 US_ALU_ALPHA_INST_6
+0x49DC US_ALU_ALPHA_INST_7
+0x49E0 US_ALU_ALPHA_INST_8
+0x49E4 US_ALU_ALPHA_INST_9
+0x49E8 US_ALU_ALPHA_INST_10
+0x49EC US_ALU_ALPHA_INST_11
+0x49F0 US_ALU_ALPHA_INST_12
+0x49F4 US_ALU_ALPHA_INST_13
+0x49F8 US_ALU_ALPHA_INST_14
+0x49FC US_ALU_ALPHA_INST_15
+0x4A00 US_ALU_ALPHA_INST_16
+0x4A04 US_ALU_ALPHA_INST_17
+0x4A08 US_ALU_ALPHA_INST_18
+0x4A0C US_ALU_ALPHA_INST_19
+0x4A10 US_ALU_ALPHA_INST_20
+0x4A14 US_ALU_ALPHA_INST_21
+0x4A18 US_ALU_ALPHA_INST_22
+0x4A1C US_ALU_ALPHA_INST_23
+0x4A20 US_ALU_ALPHA_INST_24
+0x4A24 US_ALU_ALPHA_INST_25
+0x4A28 US_ALU_ALPHA_INST_26
+0x4A2C US_ALU_ALPHA_INST_27
+0x4A30 US_ALU_ALPHA_INST_28
+0x4A34 US_ALU_ALPHA_INST_29
+0x4A38 US_ALU_ALPHA_INST_30
+0x4A3C US_ALU_ALPHA_INST_31
+0x4A40 US_ALU_ALPHA_INST_32
+0x4A44 US_ALU_ALPHA_INST_33
+0x4A48 US_ALU_ALPHA_INST_34
+0x4A4C US_ALU_ALPHA_INST_35
+0x4A50 US_ALU_ALPHA_INST_36
+0x4A54 US_ALU_ALPHA_INST_37
+0x4A58 US_ALU_ALPHA_INST_38
+0x4A5C US_ALU_ALPHA_INST_39
+0x4A60 US_ALU_ALPHA_INST_40
+0x4A64 US_ALU_ALPHA_INST_41
+0x4A68 US_ALU_ALPHA_INST_42
+0x4A6C US_ALU_ALPHA_INST_43
+0x4A70 US_ALU_ALPHA_INST_44
+0x4A74 US_ALU_ALPHA_INST_45
+0x4A78 US_ALU_ALPHA_INST_46
+0x4A7C US_ALU_ALPHA_INST_47
+0x4A80 US_ALU_ALPHA_INST_48
+0x4A84 US_ALU_ALPHA_INST_49
+0x4A88 US_ALU_ALPHA_INST_50
+0x4A8C US_ALU_ALPHA_INST_51
+0x4A90 US_ALU_ALPHA_INST_52
+0x4A94 US_ALU_ALPHA_INST_53
+0x4A98 US_ALU_ALPHA_INST_54
+0x4A9C US_ALU_ALPHA_INST_55
+0x4AA0 US_ALU_ALPHA_INST_56
+0x4AA4 US_ALU_ALPHA_INST_57
+0x4AA8 US_ALU_ALPHA_INST_58
+0x4AAC US_ALU_ALPHA_INST_59
+0x4AB0 US_ALU_ALPHA_INST_60
+0x4AB4 US_ALU_ALPHA_INST_61
+0x4AB8 US_ALU_ALPHA_INST_62
+0x4ABC US_ALU_ALPHA_INST_63
+0x4BC0 FG_FOG_BLEND
+0x4BC4 FG_FOG_FACTOR
+0x4BC8 FG_FOG_COLOR_R
+0x4BCC FG_FOG_COLOR_G
+0x4BD0 FG_FOG_COLOR_B
+0x4BD4 FG_ALPHA_FUNC
+0x4BD8 FG_DEPTH_SRC
+0x4C00 US_ALU_CONST_R_0
+0x4C04 US_ALU_CONST_G_0
+0x4C08 US_ALU_CONST_B_0
+0x4C0C US_ALU_CONST_A_0
+0x4C10 US_ALU_CONST_R_1
+0x4C14 US_ALU_CONST_G_1
+0x4C18 US_ALU_CONST_B_1
+0x4C1C US_ALU_CONST_A_1
+0x4C20 US_ALU_CONST_R_2
+0x4C24 US_ALU_CONST_G_2
+0x4C28 US_ALU_CONST_B_2
+0x4C2C US_ALU_CONST_A_2
+0x4C30 US_ALU_CONST_R_3
+0x4C34 US_ALU_CONST_G_3
+0x4C38 US_ALU_CONST_B_3
+0x4C3C US_ALU_CONST_A_3
+0x4C40 US_ALU_CONST_R_4
+0x4C44 US_ALU_CONST_G_4
+0x4C48 US_ALU_CONST_B_4
+0x4C4C US_ALU_CONST_A_4
+0x4C50 US_ALU_CONST_R_5
+0x4C54 US_ALU_CONST_G_5
+0x4C58 US_ALU_CONST_B_5
+0x4C5C US_ALU_CONST_A_5
+0x4C60 US_ALU_CONST_R_6
+0x4C64 US_ALU_CONST_G_6
+0x4C68 US_ALU_CONST_B_6
+0x4C6C US_ALU_CONST_A_6
+0x4C70 US_ALU_CONST_R_7
+0x4C74 US_ALU_CONST_G_7
+0x4C78 US_ALU_CONST_B_7
+0x4C7C US_ALU_CONST_A_7
+0x4C80 US_ALU_CONST_R_8
+0x4C84 US_ALU_CONST_G_8
+0x4C88 US_ALU_CONST_B_8
+0x4C8C US_ALU_CONST_A_8
+0x4C90 US_ALU_CONST_R_9
+0x4C94 US_ALU_CONST_G_9
+0x4C98 US_ALU_CONST_B_9
+0x4C9C US_ALU_CONST_A_9
+0x4CA0 US_ALU_CONST_R_10
+0x4CA4 US_ALU_CONST_G_10
+0x4CA8 US_ALU_CONST_B_10
+0x4CAC US_ALU_CONST_A_10
+0x4CB0 US_ALU_CONST_R_11
+0x4CB4 US_ALU_CONST_G_11
+0x4CB8 US_ALU_CONST_B_11
+0x4CBC US_ALU_CONST_A_11
+0x4CC0 US_ALU_CONST_R_12
+0x4CC4 US_ALU_CONST_G_12
+0x4CC8 US_ALU_CONST_B_12
+0x4CCC US_ALU_CONST_A_12
+0x4CD0 US_ALU_CONST_R_13
+0x4CD4 US_ALU_CONST_G_13
+0x4CD8 US_ALU_CONST_B_13
+0x4CDC US_ALU_CONST_A_13
+0x4CE0 US_ALU_CONST_R_14
+0x4CE4 US_ALU_CONST_G_14
+0x4CE8 US_ALU_CONST_B_14
+0x4CEC US_ALU_CONST_A_14
+0x4CF0 US_ALU_CONST_R_15
+0x4CF4 US_ALU_CONST_G_15
+0x4CF8 US_ALU_CONST_B_15
+0x4CFC US_ALU_CONST_A_15
+0x4D00 US_ALU_CONST_R_16
+0x4D04 US_ALU_CONST_G_16
+0x4D08 US_ALU_CONST_B_16
+0x4D0C US_ALU_CONST_A_16
+0x4D10 US_ALU_CONST_R_17
+0x4D14 US_ALU_CONST_G_17
+0x4D18 US_ALU_CONST_B_17
+0x4D1C US_ALU_CONST_A_17
+0x4D20 US_ALU_CONST_R_18
+0x4D24 US_ALU_CONST_G_18
+0x4D28 US_ALU_CONST_B_18
+0x4D2C US_ALU_CONST_A_18
+0x4D30 US_ALU_CONST_R_19
+0x4D34 US_ALU_CONST_G_19
+0x4D38 US_ALU_CONST_B_19
+0x4D3C US_ALU_CONST_A_19
+0x4D40 US_ALU_CONST_R_20
+0x4D44 US_ALU_CONST_G_20
+0x4D48 US_ALU_CONST_B_20
+0x4D4C US_ALU_CONST_A_20
+0x4D50 US_ALU_CONST_R_21
+0x4D54 US_ALU_CONST_G_21
+0x4D58 US_ALU_CONST_B_21
+0x4D5C US_ALU_CONST_A_21
+0x4D60 US_ALU_CONST_R_22
+0x4D64 US_ALU_CONST_G_22
+0x4D68 US_ALU_CONST_B_22
+0x4D6C US_ALU_CONST_A_22
+0x4D70 US_ALU_CONST_R_23
+0x4D74 US_ALU_CONST_G_23
+0x4D78 US_ALU_CONST_B_23
+0x4D7C US_ALU_CONST_A_23
+0x4D80 US_ALU_CONST_R_24
+0x4D84 US_ALU_CONST_G_24
+0x4D88 US_ALU_CONST_B_24
+0x4D8C US_ALU_CONST_A_24
+0x4D90 US_ALU_CONST_R_25
+0x4D94 US_ALU_CONST_G_25
+0x4D98 US_ALU_CONST_B_25
+0x4D9C US_ALU_CONST_A_25
+0x4DA0 US_ALU_CONST_R_26
+0x4DA4 US_ALU_CONST_G_26
+0x4DA8 US_ALU_CONST_B_26
+0x4DAC US_ALU_CONST_A_26
+0x4DB0 US_ALU_CONST_R_27
+0x4DB4 US_ALU_CONST_G_27
+0x4DB8 US_ALU_CONST_B_27
+0x4DBC US_ALU_CONST_A_27
+0x4DC0 US_ALU_CONST_R_28
+0x4DC4 US_ALU_CONST_G_28
+0x4DC8 US_ALU_CONST_B_28
+0x4DCC US_ALU_CONST_A_28
+0x4DD0 US_ALU_CONST_R_29
+0x4DD4 US_ALU_CONST_G_29
+0x4DD8 US_ALU_CONST_B_29
+0x4DDC US_ALU_CONST_A_29
+0x4DE0 US_ALU_CONST_R_30
+0x4DE4 US_ALU_CONST_G_30
+0x4DE8 US_ALU_CONST_B_30
+0x4DEC US_ALU_CONST_A_30
+0x4DF0 US_ALU_CONST_R_31
+0x4DF4 US_ALU_CONST_G_31
+0x4DF8 US_ALU_CONST_B_31
+0x4DFC US_ALU_CONST_A_31
+0x4E04 RB3D_BLENDCNTL_R3
+0x4E08 RB3D_ABLENDCNTL_R3
+0x4E0C RB3D_COLOR_CHANNEL_MASK
+0x4E10 RB3D_CONSTANT_COLOR
+0x4E14 RB3D_COLOR_CLEAR_VALUE
+0x4E18 RB3D_ROPCNTL_R3
+0x4E1C RB3D_CLRCMP_FLIPE_R3
+0x4E20 RB3D_CLRCMP_CLR_R3
+0x4E24 RB3D_CLRCMP_MSK_R3
+0x4E48 RB3D_DEBUG_CTL
+0x4E4C RB3D_DSTCACHE_CTLSTAT_R3
+0x4E50 RB3D_DITHER_CTL
+0x4E54 RB3D_CMASK_OFFSET0
+0x4E58 RB3D_CMASK_OFFSET1
+0x4E5C RB3D_CMASK_OFFSET2
+0x4E60 RB3D_CMASK_OFFSET3
+0x4E64 RB3D_CMASK_PITCH0
+0x4E68 RB3D_CMASK_PITCH1
+0x4E6C RB3D_CMASK_PITCH2
+0x4E70 RB3D_CMASK_PITCH3
+0x4E74 RB3D_CMASK_WRINDEX
+0x4E78 RB3D_CMASK_DWORD
+0x4E7C RB3D_CMASK_RDINDEX
+0x4E80 RB3D_AARESOLVE_OFFSET
+0x4E84 RB3D_AARESOLVE_PITCH
+0x4E88 RB3D_AARESOLVE_CTL
+0x4EA0 RB3D_DISCARD_SRC_PIXEL_LTE_THRESHOLD
+0x4EA4 RB3D_DISCARD_SRC_PIXEL_GTE_THRESHOLD
+0x4F04 ZB_ZSTENCILCNTL
+0x4F08 ZB_STENCILREFMASK
+0x4F14 ZB_ZTOP
+0x4F18 ZB_ZCACHE_CTLSTAT
+0x4F1C ZB_BW_CNTL
+0x4F28 ZB_DEPTHCLEARVALUE
+0x4F30 ZB_ZMASK_OFFSET
+0x4F34 ZB_ZMASK_PITCH
+0x4F38 ZB_ZMASK_WRINDEX
+0x4F3C ZB_ZMASK_DWORD
+0x4F40 ZB_ZMASK_RDINDEX
+0x4F44 ZB_HIZ_OFFSET
+0x4F48 ZB_HIZ_WRINDEX
+0x4F4C ZB_HIZ_DWORD
+0x4F50 ZB_HIZ_RDINDEX
+0x4F54 ZB_HIZ_PITCH
+0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515
new file mode 100644 (file)
index 0000000..0102a0d
--- /dev/null
@@ -0,0 +1,486 @@
+rv515 0x6d40
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1D98 VAP_VPORT_XSCALE
+0x1D9C VAP_VPORT_XOFFSET
+0x1DA0 VAP_VPORT_YSCALE
+0x1DA4 VAP_VPORT_YOFFSET
+0x1DA8 VAP_VPORT_ZSCALE
+0x1DAC VAP_VPORT_ZOFFSET
+0x2080 VAP_CNTL
+0x2090 VAP_OUT_VTX_FMT_0
+0x2094 VAP_OUT_VTX_FMT_1
+0x20B0 VAP_VTE_CNTL
+0x2138 VAP_VF_MIN_VTX_INDX
+0x2140 VAP_CNTL_STATUS
+0x2150 VAP_PROG_STREAM_CNTL_0
+0x2154 VAP_PROG_STREAM_CNTL_1
+0x2158 VAP_PROG_STREAM_CNTL_2
+0x215C VAP_PROG_STREAM_CNTL_3
+0x2160 VAP_PROG_STREAM_CNTL_4
+0x2164 VAP_PROG_STREAM_CNTL_5
+0x2168 VAP_PROG_STREAM_CNTL_6
+0x216C VAP_PROG_STREAM_CNTL_7
+0x2180 VAP_VTX_STATE_CNTL
+0x2184 VAP_VSM_VTX_ASSM
+0x2188 VAP_VTX_STATE_IND_REG_0
+0x218C VAP_VTX_STATE_IND_REG_1
+0x2190 VAP_VTX_STATE_IND_REG_2
+0x2194 VAP_VTX_STATE_IND_REG_3
+0x2198 VAP_VTX_STATE_IND_REG_4
+0x219C VAP_VTX_STATE_IND_REG_5
+0x21A0 VAP_VTX_STATE_IND_REG_6
+0x21A4 VAP_VTX_STATE_IND_REG_7
+0x21A8 VAP_VTX_STATE_IND_REG_8
+0x21AC VAP_VTX_STATE_IND_REG_9
+0x21B0 VAP_VTX_STATE_IND_REG_10
+0x21B4 VAP_VTX_STATE_IND_REG_11
+0x21B8 VAP_VTX_STATE_IND_REG_12
+0x21BC VAP_VTX_STATE_IND_REG_13
+0x21C0 VAP_VTX_STATE_IND_REG_14
+0x21C4 VAP_VTX_STATE_IND_REG_15
+0x21DC VAP_PSC_SGN_NORM_CNTL
+0x21E0 VAP_PROG_STREAM_CNTL_EXT_0
+0x21E4 VAP_PROG_STREAM_CNTL_EXT_1
+0x21E8 VAP_PROG_STREAM_CNTL_EXT_2
+0x21EC VAP_PROG_STREAM_CNTL_EXT_3
+0x21F0 VAP_PROG_STREAM_CNTL_EXT_4
+0x21F4 VAP_PROG_STREAM_CNTL_EXT_5
+0x21F8 VAP_PROG_STREAM_CNTL_EXT_6
+0x21FC VAP_PROG_STREAM_CNTL_EXT_7
+0x2200 VAP_PVS_VECTOR_INDX_REG
+0x2204 VAP_PVS_VECTOR_DATA_REG
+0x2208 VAP_PVS_VECTOR_DATA_REG_128
+0x2218 VAP_TEX_TO_COLOR_CNTL
+0x221C VAP_CLIP_CNTL
+0x2220 VAP_GB_VERT_CLIP_ADJ
+0x2224 VAP_GB_VERT_DISC_ADJ
+0x2228 VAP_GB_HORZ_CLIP_ADJ
+0x222C VAP_GB_HORZ_DISC_ADJ
+0x2230 VAP_PVS_FLOW_CNTL_ADDRS_0
+0x2234 VAP_PVS_FLOW_CNTL_ADDRS_1
+0x2238 VAP_PVS_FLOW_CNTL_ADDRS_2
+0x223C VAP_PVS_FLOW_CNTL_ADDRS_3
+0x2240 VAP_PVS_FLOW_CNTL_ADDRS_4
+0x2244 VAP_PVS_FLOW_CNTL_ADDRS_5
+0x2248 VAP_PVS_FLOW_CNTL_ADDRS_6
+0x224C VAP_PVS_FLOW_CNTL_ADDRS_7
+0x2250 VAP_PVS_FLOW_CNTL_ADDRS_8
+0x2254 VAP_PVS_FLOW_CNTL_ADDRS_9
+0x2258 VAP_PVS_FLOW_CNTL_ADDRS_10
+0x225C VAP_PVS_FLOW_CNTL_ADDRS_11
+0x2260 VAP_PVS_FLOW_CNTL_ADDRS_12
+0x2264 VAP_PVS_FLOW_CNTL_ADDRS_13
+0x2268 VAP_PVS_FLOW_CNTL_ADDRS_14
+0x226C VAP_PVS_FLOW_CNTL_ADDRS_15
+0x2284 VAP_PVS_STATE_FLUSH_REG
+0x2288 VAP_PVS_VTX_TIMEOUT_REG
+0x2290 VAP_PVS_FLOW_CNTL_LOOP_INDEX_0
+0x2294 VAP_PVS_FLOW_CNTL_LOOP_INDEX_1
+0x2298 VAP_PVS_FLOW_CNTL_LOOP_INDEX_2
+0x229C VAP_PVS_FLOW_CNTL_LOOP_INDEX_3
+0x22A0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_4
+0x22A4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_5
+0x22A8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_6
+0x22AC VAP_PVS_FLOW_CNTL_LOOP_INDEX_7
+0x22B0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_8
+0x22B4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_9
+0x22B8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_10
+0x22BC VAP_PVS_FLOW_CNTL_LOOP_INDEX_11
+0x22C0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_12
+0x22C4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_13
+0x22C8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_14
+0x22CC VAP_PVS_FLOW_CNTL_LOOP_INDEX_15
+0x22D0 VAP_PVS_CODE_CNTL_0
+0x22D4 VAP_PVS_CONST_CNTL
+0x22D8 VAP_PVS_CODE_CNTL_1
+0x22DC VAP_PVS_FLOW_CNTL_OPC
+0x2500 VAP_PVS_FLOW_CNTL_ADDRS_LW_0
+0x2504 VAP_PVS_FLOW_CNTL_ADDRS_UW_0
+0x2508 VAP_PVS_FLOW_CNTL_ADDRS_LW_1
+0x250C VAP_PVS_FLOW_CNTL_ADDRS_UW_1
+0x2510 VAP_PVS_FLOW_CNTL_ADDRS_LW_2
+0x2514 VAP_PVS_FLOW_CNTL_ADDRS_UW_2
+0x2518 VAP_PVS_FLOW_CNTL_ADDRS_LW_3
+0x251C VAP_PVS_FLOW_CNTL_ADDRS_UW_3
+0x2520 VAP_PVS_FLOW_CNTL_ADDRS_LW_4
+0x2524 VAP_PVS_FLOW_CNTL_ADDRS_UW_4
+0x2528 VAP_PVS_FLOW_CNTL_ADDRS_LW_5
+0x252C VAP_PVS_FLOW_CNTL_ADDRS_UW_5
+0x2530 VAP_PVS_FLOW_CNTL_ADDRS_LW_6
+0x2534 VAP_PVS_FLOW_CNTL_ADDRS_UW_6
+0x2538 VAP_PVS_FLOW_CNTL_ADDRS_LW_7
+0x253C VAP_PVS_FLOW_CNTL_ADDRS_UW_7
+0x2540 VAP_PVS_FLOW_CNTL_ADDRS_LW_8
+0x2544 VAP_PVS_FLOW_CNTL_ADDRS_UW_8
+0x2548 VAP_PVS_FLOW_CNTL_ADDRS_LW_9
+0x254C VAP_PVS_FLOW_CNTL_ADDRS_UW_9
+0x2550 VAP_PVS_FLOW_CNTL_ADDRS_LW_10
+0x2554 VAP_PVS_FLOW_CNTL_ADDRS_UW_10
+0x2558 VAP_PVS_FLOW_CNTL_ADDRS_LW_11
+0x255C VAP_PVS_FLOW_CNTL_ADDRS_UW_11
+0x2560 VAP_PVS_FLOW_CNTL_ADDRS_LW_12
+0x2564 VAP_PVS_FLOW_CNTL_ADDRS_UW_12
+0x2568 VAP_PVS_FLOW_CNTL_ADDRS_LW_13
+0x256C VAP_PVS_FLOW_CNTL_ADDRS_UW_13
+0x2570 VAP_PVS_FLOW_CNTL_ADDRS_LW_14
+0x2574 VAP_PVS_FLOW_CNTL_ADDRS_UW_14
+0x2578 VAP_PVS_FLOW_CNTL_ADDRS_LW_15
+0x257C VAP_PVS_FLOW_CNTL_ADDRS_UW_15
+0x342C RB2D_DSTCACHE_CTLSTAT
+0x4000 GB_VAP_RASTER_VTX_FMT_0
+0x4004 GB_VAP_RASTER_VTX_FMT_1
+0x4008 GB_ENABLE
+0x401C GB_SELECT
+0x4020 GB_AA_CONFIG
+0x4024 GB_FIFO_SIZE
+0x4100 TX_INVALTAGS
+0x4200 GA_POINT_S0
+0x4204 GA_POINT_T0
+0x4208 GA_POINT_S1
+0x420C GA_POINT_T1
+0x4214 GA_TRIANGLE_STIPPLE
+0x421C GA_POINT_SIZE
+0x4230 GA_POINT_MINMAX
+0x4234 GA_LINE_CNTL
+0x4238 GA_LINE_STIPPLE_CONFIG
+0x4260 GA_LINE_STIPPLE_VALUE
+0x4264 GA_LINE_S0
+0x4268 GA_LINE_S1
+0x4278 GA_COLOR_CONTROL
+0x427C GA_SOLID_RG
+0x4280 GA_SOLID_BA
+0x4288 GA_POLY_MODE
+0x428C GA_ROUND_MODE
+0x4290 GA_OFFSET
+0x4294 GA_FOG_SCALE
+0x4298 GA_FOG_OFFSET
+0x42A0 SU_TEX_WRAP
+0x42A4 SU_POLY_OFFSET_FRONT_SCALE
+0x42A8 SU_POLY_OFFSET_FRONT_OFFSET
+0x42AC SU_POLY_OFFSET_BACK_SCALE
+0x42B0 SU_POLY_OFFSET_BACK_OFFSET
+0x42B4 SU_POLY_OFFSET_ENABLE
+0x42B8 SU_CULL_MODE
+0x42C0 SU_DEPTH_SCALE
+0x42C4 SU_DEPTH_OFFSET
+0x42C8 SU_REG_DEST
+0x4300 RS_COUNT
+0x4304 RS_INST_COUNT
+0x4074 RS_IP_0
+0x4078 RS_IP_1
+0x407C RS_IP_2
+0x4080 RS_IP_3
+0x4084 RS_IP_4
+0x4088 RS_IP_5
+0x408C RS_IP_6
+0x4090 RS_IP_7
+0x4094 RS_IP_8
+0x4098 RS_IP_9
+0x409C RS_IP_10
+0x40A0 RS_IP_11
+0x40A4 RS_IP_12
+0x40A8 RS_IP_13
+0x40AC RS_IP_14
+0x40B0 RS_IP_15
+0x4320 RS_INST_0
+0x4324 RS_INST_1
+0x4328 RS_INST_2
+0x432C RS_INST_3
+0x4330 RS_INST_4
+0x4334 RS_INST_5
+0x4338 RS_INST_6
+0x433C RS_INST_7
+0x4340 RS_INST_8
+0x4344 RS_INST_9
+0x4348 RS_INST_10
+0x434C RS_INST_11
+0x4350 RS_INST_12
+0x4354 RS_INST_13
+0x4358 RS_INST_14
+0x435C RS_INST_15
+0x43A4 SC_HYPERZ_EN
+0x43A8 SC_EDGERULE
+0x43B0 SC_CLIP_0_A
+0x43B4 SC_CLIP_0_B
+0x43B8 SC_CLIP_1_A
+0x43BC SC_CLIP_1_B
+0x43C0 SC_CLIP_2_A
+0x43C4 SC_CLIP_2_B
+0x43C8 SC_CLIP_3_A
+0x43CC SC_CLIP_3_B
+0x43D0 SC_CLIP_RULE
+0x43E0 SC_SCISSOR0
+0x43E8 SC_SCREENDOOR
+0x4440 TX_FILTER1_0
+0x4444 TX_FILTER1_1
+0x4448 TX_FILTER1_2
+0x444C TX_FILTER1_3
+0x4450 TX_FILTER1_4
+0x4454 TX_FILTER1_5
+0x4458 TX_FILTER1_6
+0x445C TX_FILTER1_7
+0x4460 TX_FILTER1_8
+0x4464 TX_FILTER1_9
+0x4468 TX_FILTER1_10
+0x446C TX_FILTER1_11
+0x4470 TX_FILTER1_12
+0x4474 TX_FILTER1_13
+0x4478 TX_FILTER1_14
+0x447C TX_FILTER1_15
+0x4580 TX_CHROMA_KEY_0
+0x4584 TX_CHROMA_KEY_1
+0x4588 TX_CHROMA_KEY_2
+0x458C TX_CHROMA_KEY_3
+0x4590 TX_CHROMA_KEY_4
+0x4594 TX_CHROMA_KEY_5
+0x4598 TX_CHROMA_KEY_6
+0x459C TX_CHROMA_KEY_7
+0x45A0 TX_CHROMA_KEY_8
+0x45A4 TX_CHROMA_KEY_9
+0x45A8 TX_CHROMA_KEY_10
+0x45AC TX_CHROMA_KEY_11
+0x45B0 TX_CHROMA_KEY_12
+0x45B4 TX_CHROMA_KEY_13
+0x45B8 TX_CHROMA_KEY_14
+0x45BC TX_CHROMA_KEY_15
+0x45C0 TX_BORDER_COLOR_0
+0x45C4 TX_BORDER_COLOR_1
+0x45C8 TX_BORDER_COLOR_2
+0x45CC TX_BORDER_COLOR_3
+0x45D0 TX_BORDER_COLOR_4
+0x45D4 TX_BORDER_COLOR_5
+0x45D8 TX_BORDER_COLOR_6
+0x45DC TX_BORDER_COLOR_7
+0x45E0 TX_BORDER_COLOR_8
+0x45E4 TX_BORDER_COLOR_9
+0x45E8 TX_BORDER_COLOR_10
+0x45EC TX_BORDER_COLOR_11
+0x45F0 TX_BORDER_COLOR_12
+0x45F4 TX_BORDER_COLOR_13
+0x45F8 TX_BORDER_COLOR_14
+0x45FC TX_BORDER_COLOR_15
+0x4250 GA_US_VECTOR_INDEX
+0x4254 GA_US_VECTOR_DATA
+0x4600 US_CONFIG
+0x4604 US_PIXSIZE
+0x4620 US_FC_BOOL_CONST
+0x4624 US_FC_CTRL
+0x4630 US_CODE_ADDR
+0x4634 US_CODE_RANGE
+0x4638 US_CODE_OFFSET
+0x46A4 US_OUT_FMT_0
+0x46A8 US_OUT_FMT_1
+0x46AC US_OUT_FMT_2
+0x46B0 US_OUT_FMT_3
+0x46B4 US_W_FMT
+0x4BC0 FG_FOG_BLEND
+0x4BC4 FG_FOG_FACTOR
+0x4BC8 FG_FOG_COLOR_R
+0x4BCC FG_FOG_COLOR_G
+0x4BD0 FG_FOG_COLOR_B
+0x4BD4 FG_ALPHA_FUNC
+0x4BD8 FG_DEPTH_SRC
+0x4C00 US_ALU_CONST_R_0
+0x4C04 US_ALU_CONST_G_0
+0x4C08 US_ALU_CONST_B_0
+0x4C0C US_ALU_CONST_A_0
+0x4C10 US_ALU_CONST_R_1
+0x4C14 US_ALU_CONST_G_1
+0x4C18 US_ALU_CONST_B_1
+0x4C1C US_ALU_CONST_A_1
+0x4C20 US_ALU_CONST_R_2
+0x4C24 US_ALU_CONST_G_2
+0x4C28 US_ALU_CONST_B_2
+0x4C2C US_ALU_CONST_A_2
+0x4C30 US_ALU_CONST_R_3
+0x4C34 US_ALU_CONST_G_3
+0x4C38 US_ALU_CONST_B_3
+0x4C3C US_ALU_CONST_A_3
+0x4C40 US_ALU_CONST_R_4
+0x4C44 US_ALU_CONST_G_4
+0x4C48 US_ALU_CONST_B_4
+0x4C4C US_ALU_CONST_A_4
+0x4C50 US_ALU_CONST_R_5
+0x4C54 US_ALU_CONST_G_5
+0x4C58 US_ALU_CONST_B_5
+0x4C5C US_ALU_CONST_A_5
+0x4C60 US_ALU_CONST_R_6
+0x4C64 US_ALU_CONST_G_6
+0x4C68 US_ALU_CONST_B_6
+0x4C6C US_ALU_CONST_A_6
+0x4C70 US_ALU_CONST_R_7
+0x4C74 US_ALU_CONST_G_7
+0x4C78 US_ALU_CONST_B_7
+0x4C7C US_ALU_CONST_A_7
+0x4C80 US_ALU_CONST_R_8
+0x4C84 US_ALU_CONST_G_8
+0x4C88 US_ALU_CONST_B_8
+0x4C8C US_ALU_CONST_A_8
+0x4C90 US_ALU_CONST_R_9
+0x4C94 US_ALU_CONST_G_9
+0x4C98 US_ALU_CONST_B_9
+0x4C9C US_ALU_CONST_A_9
+0x4CA0 US_ALU_CONST_R_10
+0x4CA4 US_ALU_CONST_G_10
+0x4CA8 US_ALU_CONST_B_10
+0x4CAC US_ALU_CONST_A_10
+0x4CB0 US_ALU_CONST_R_11
+0x4CB4 US_ALU_CONST_G_11
+0x4CB8 US_ALU_CONST_B_11
+0x4CBC US_ALU_CONST_A_11
+0x4CC0 US_ALU_CONST_R_12
+0x4CC4 US_ALU_CONST_G_12
+0x4CC8 US_ALU_CONST_B_12
+0x4CCC US_ALU_CONST_A_12
+0x4CD0 US_ALU_CONST_R_13
+0x4CD4 US_ALU_CONST_G_13
+0x4CD8 US_ALU_CONST_B_13
+0x4CDC US_ALU_CONST_A_13
+0x4CE0 US_ALU_CONST_R_14
+0x4CE4 US_ALU_CONST_G_14
+0x4CE8 US_ALU_CONST_B_14
+0x4CEC US_ALU_CONST_A_14
+0x4CF0 US_ALU_CONST_R_15
+0x4CF4 US_ALU_CONST_G_15
+0x4CF8 US_ALU_CONST_B_15
+0x4CFC US_ALU_CONST_A_15
+0x4D00 US_ALU_CONST_R_16
+0x4D04 US_ALU_CONST_G_16
+0x4D08 US_ALU_CONST_B_16
+0x4D0C US_ALU_CONST_A_16
+0x4D10 US_ALU_CONST_R_17
+0x4D14 US_ALU_CONST_G_17
+0x4D18 US_ALU_CONST_B_17
+0x4D1C US_ALU_CONST_A_17
+0x4D20 US_ALU_CONST_R_18
+0x4D24 US_ALU_CONST_G_18
+0x4D28 US_ALU_CONST_B_18
+0x4D2C US_ALU_CONST_A_18
+0x4D30 US_ALU_CONST_R_19
+0x4D34 US_ALU_CONST_G_19
+0x4D38 US_ALU_CONST_B_19
+0x4D3C US_ALU_CONST_A_19
+0x4D40 US_ALU_CONST_R_20
+0x4D44 US_ALU_CONST_G_20
+0x4D48 US_ALU_CONST_B_20
+0x4D4C US_ALU_CONST_A_20
+0x4D50 US_ALU_CONST_R_21
+0x4D54 US_ALU_CONST_G_21
+0x4D58 US_ALU_CONST_B_21
+0x4D5C US_ALU_CONST_A_21
+0x4D60 US_ALU_CONST_R_22
+0x4D64 US_ALU_CONST_G_22
+0x4D68 US_ALU_CONST_B_22
+0x4D6C US_ALU_CONST_A_22
+0x4D70 US_ALU_CONST_R_23
+0x4D74 US_ALU_CONST_G_23
+0x4D78 US_ALU_CONST_B_23
+0x4D7C US_ALU_CONST_A_23
+0x4D80 US_ALU_CONST_R_24
+0x4D84 US_ALU_CONST_G_24
+0x4D88 US_ALU_CONST_B_24
+0x4D8C US_ALU_CONST_A_24
+0x4D90 US_ALU_CONST_R_25
+0x4D94 US_ALU_CONST_G_25
+0x4D98 US_ALU_CONST_B_25
+0x4D9C US_ALU_CONST_A_25
+0x4DA0 US_ALU_CONST_R_26
+0x4DA4 US_ALU_CONST_G_26
+0x4DA8 US_ALU_CONST_B_26
+0x4DAC US_ALU_CONST_A_26
+0x4DB0 US_ALU_CONST_R_27
+0x4DB4 US_ALU_CONST_G_27
+0x4DB8 US_ALU_CONST_B_27
+0x4DBC US_ALU_CONST_A_27
+0x4DC0 US_ALU_CONST_R_28
+0x4DC4 US_ALU_CONST_G_28
+0x4DC8 US_ALU_CONST_B_28
+0x4DCC US_ALU_CONST_A_28
+0x4DD0 US_ALU_CONST_R_29
+0x4DD4 US_ALU_CONST_G_29
+0x4DD8 US_ALU_CONST_B_29
+0x4DDC US_ALU_CONST_A_29
+0x4DE0 US_ALU_CONST_R_30
+0x4DE4 US_ALU_CONST_G_30
+0x4DE8 US_ALU_CONST_B_30
+0x4DEC US_ALU_CONST_A_30
+0x4DF0 US_ALU_CONST_R_31
+0x4DF4 US_ALU_CONST_G_31
+0x4DF8 US_ALU_CONST_B_31
+0x4DFC US_ALU_CONST_A_31
+0x4E04 RB3D_BLENDCNTL_R3
+0x4E08 RB3D_ABLENDCNTL_R3
+0x4E0C RB3D_COLOR_CHANNEL_MASK
+0x4E10 RB3D_CONSTANT_COLOR
+0x4E14 RB3D_COLOR_CLEAR_VALUE
+0x4E18 RB3D_ROPCNTL_R3
+0x4E1C RB3D_CLRCMP_FLIPE_R3
+0x4E20 RB3D_CLRCMP_CLR_R3
+0x4E24 RB3D_CLRCMP_MSK_R3
+0x4E48 RB3D_DEBUG_CTL
+0x4E4C RB3D_DSTCACHE_CTLSTAT_R3
+0x4E50 RB3D_DITHER_CTL
+0x4E54 RB3D_CMASK_OFFSET0
+0x4E58 RB3D_CMASK_OFFSET1
+0x4E5C RB3D_CMASK_OFFSET2
+0x4E60 RB3D_CMASK_OFFSET3
+0x4E64 RB3D_CMASK_PITCH0
+0x4E68 RB3D_CMASK_PITCH1
+0x4E6C RB3D_CMASK_PITCH2
+0x4E70 RB3D_CMASK_PITCH3
+0x4E74 RB3D_CMASK_WRINDEX
+0x4E78 RB3D_CMASK_DWORD
+0x4E7C RB3D_CMASK_RDINDEX
+0x4E80 RB3D_AARESOLVE_OFFSET
+0x4E84 RB3D_AARESOLVE_PITCH
+0x4E88 RB3D_AARESOLVE_CTL
+0x4EA0 RB3D_DISCARD_SRC_PIXEL_LTE_THRESHOLD
+0x4EA4 RB3D_DISCARD_SRC_PIXEL_GTE_THRESHOLD
+0x4EF8 RB3D_CONSTANT_COLOR_AR
+0x4EFC RB3D_CONSTANT_COLOR_GB
+0x4F04 ZB_ZSTENCILCNTL
+0x4F08 ZB_STENCILREFMASK
+0x4F14 ZB_ZTOP
+0x4F18 ZB_ZCACHE_CTLSTAT
+0x4F1C ZB_BW_CNTL
+0x4F28 ZB_DEPTHCLEARVALUE
+0x4F30 ZB_ZMASK_OFFSET
+0x4F34 ZB_ZMASK_PITCH
+0x4F38 ZB_ZMASK_WRINDEX
+0x4F3C ZB_ZMASK_DWORD
+0x4F40 ZB_ZMASK_RDINDEX
+0x4F44 ZB_HIZ_OFFSET
+0x4F48 ZB_HIZ_WRINDEX
+0x4F4C ZB_HIZ_DWORD
+0x4F50 ZB_HIZ_RDINDEX
+0x4F54 ZB_HIZ_PITCH
+0x4F58 ZB_ZPASS_DATA
+0x4FD4 ZB_STENCILREFMASK_BF
index b29affd..a3fbdad 100644 (file)
@@ -29,7 +29,6 @@
 #include <drm/drmP.h>
 #include "radeon_reg.h"
 #include "radeon.h"
-#include "radeon_share.h"
 
 /* rs400,rs480 depends on : */
 void r100_hdp_reset(struct radeon_device *rdev);
@@ -63,7 +62,7 @@ void rs400_gart_adjust_size(struct radeon_device *rdev)
                break;
        default:
                DRM_ERROR("Unable to use IGP GART size %uM\n",
-                         rdev->mc.gtt_size >> 20);
+                         (unsigned)(rdev->mc.gtt_size >> 20));
                DRM_ERROR("Valid GART size for IGP are 32M,64M,128M,256M,512M,1G,2G\n");
                DRM_ERROR("Forcing to 32M GART size\n");
                rdev->mc.gtt_size = 32 * 1024 * 1024;
@@ -93,20 +92,41 @@ void rs400_gart_tlb_flush(struct radeon_device *rdev)
        WREG32_MC(RS480_GART_CACHE_CNTRL, 0);
 }
 
-int rs400_gart_enable(struct radeon_device *rdev)
+int rs400_gart_init(struct radeon_device *rdev)
 {
-       uint32_t size_reg;
-       uint32_t tmp;
        int r;
 
+       if (rdev->gart.table.ram.ptr) {
+               WARN(1, "RS400 GART already initialized.\n");
+               return 0;
+       }
+       /* Check gart size */
+       switch(rdev->mc.gtt_size / (1024 * 1024)) {
+       case 32:
+       case 64:
+       case 128:
+       case 256:
+       case 512:
+       case 1024:
+       case 2048:
+               break;
+       default:
+               return -EINVAL;
+       }
        /* Initialize common gart structure */
        r = radeon_gart_init(rdev);
-       if (r) {
+       if (r)
                return r;
-       }
-       if (rs400_debugfs_pcie_gart_info_init(rdev)) {
+       if (rs400_debugfs_pcie_gart_info_init(rdev))
                DRM_ERROR("Failed to register debugfs file for RS400 GART !\n");
-       }
+       rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
+       return radeon_gart_table_ram_alloc(rdev);
+}
+
+int rs400_gart_enable(struct radeon_device *rdev)
+{
+       uint32_t size_reg;
+       uint32_t tmp;
 
        tmp = RREG32_MC(RS690_AIC_CTRL_SCRATCH);
        tmp |= RS690_DIS_OUT_OF_PCI_GART_ACCESS;
@@ -137,13 +157,6 @@ int rs400_gart_enable(struct radeon_device *rdev)
        default:
                return -EINVAL;
        }
-       if (rdev->gart.table.ram.ptr == NULL) {
-               rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
-               r = radeon_gart_table_ram_alloc(rdev);
-               if (r) {
-                       return r;
-               }
-       }
        /* It should be fine to program it to max value */
        if (rdev->family == CHIP_RS690 || (rdev->family == CHIP_RS740)) {
                WREG32_MC(RS690_MCCFG_AGP_BASE, 0xFFFFFFFF);
@@ -202,6 +215,13 @@ void rs400_gart_disable(struct radeon_device *rdev)
        WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, 0);
 }
 
+void rs400_gart_fini(struct radeon_device *rdev)
+{
+       rs400_gart_disable(rdev);
+       radeon_gart_table_ram_free(rdev);
+       radeon_gart_fini(rdev);
+}
+
 int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 {
        uint32_t entry;
@@ -256,14 +276,12 @@ int rs400_mc_init(struct radeon_device *rdev)
        (void)RREG32(RADEON_HOST_PATH_CNTL);
        WREG32(RADEON_HOST_PATH_CNTL, tmp);
        (void)RREG32(RADEON_HOST_PATH_CNTL);
+
        return 0;
 }
 
 void rs400_mc_fini(struct radeon_device *rdev)
 {
-       rs400_gart_disable(rdev);
-       radeon_gart_table_ram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
index 02fd11a..0e791e2 100644 (file)
@@ -28,6 +28,9 @@
 #include "drmP.h"
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "avivod.h"
+
+#include "rs600_reg_safe.h"
 
 /* rs600 depends on : */
 void r100_hdp_reset(struct radeon_device *rdev);
@@ -66,22 +69,35 @@ void rs600_gart_tlb_flush(struct radeon_device *rdev)
        tmp = RREG32_MC(RS600_MC_PT0_CNTL);
 }
 
-int rs600_gart_enable(struct radeon_device *rdev)
+int rs600_gart_init(struct radeon_device *rdev)
 {
-       uint32_t tmp;
-       int i;
        int r;
 
+       if (rdev->gart.table.vram.robj) {
+               WARN(1, "RS600 GART already initialized.\n");
+               return 0;
+       }
        /* Initialize common gart structure */
        r = radeon_gart_init(rdev);
        if (r) {
                return r;
        }
        rdev->gart.table_size = rdev->gart.num_gpu_pages * 8;
-       r = radeon_gart_table_vram_alloc(rdev);
-       if (r) {
-               return r;
+       return radeon_gart_table_vram_alloc(rdev);
+}
+
+int rs600_gart_enable(struct radeon_device *rdev)
+{
+       uint32_t tmp;
+       int r, i;
+
+       if (rdev->gart.table.vram.robj == NULL) {
+               dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
+               return -EINVAL;
        }
+       r = radeon_gart_table_vram_pin(rdev);
+       if (r)
+               return r;
        /* FIXME: setup default page */
        WREG32_MC(RS600_MC_PT0_CNTL,
                 (RS600_EFFECTIVE_L2_CACHE_SIZE(6) |
@@ -136,8 +152,17 @@ void rs600_gart_disable(struct radeon_device *rdev)
        tmp = RREG32_MC(RS600_MC_CNTL1);
        tmp &= ~RS600_ENABLE_PAGE_TABLES;
        WREG32_MC(RS600_MC_CNTL1, tmp);
-       radeon_object_kunmap(rdev->gart.table.vram.robj);
-       radeon_object_unpin(rdev->gart.table.vram.robj);
+       if (rdev->gart.table.vram.robj) {
+               radeon_object_kunmap(rdev->gart.table.vram.robj);
+               radeon_object_unpin(rdev->gart.table.vram.robj);
+       }
+}
+
+void rs600_gart_fini(struct radeon_device *rdev)
+{
+       rs600_gart_disable(rdev);
+       radeon_gart_table_vram_free(rdev);
+       radeon_gart_fini(rdev);
 }
 
 #define R600_PTE_VALID     (1 << 0)
@@ -173,6 +198,8 @@ void rs600_mc_disable_clients(struct radeon_device *rdev)
                       "programming pipes. Bad things might happen.\n");
        }
 
+       radeon_avivo_vga_render_disable(rdev);
+
        tmp = RREG32(AVIVO_D1VGA_CONTROL);
        WREG32(AVIVO_D1VGA_CONTROL, tmp & ~AVIVO_DVGA_CONTROL_MODE_ENABLE);
        tmp = RREG32(AVIVO_D2VGA_CONTROL);
@@ -233,9 +260,6 @@ int rs600_mc_init(struct radeon_device *rdev)
 
 void rs600_mc_fini(struct radeon_device *rdev)
 {
-       rs600_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
@@ -251,11 +275,9 @@ int rs600_irq_set(struct radeon_device *rdev)
                tmp |= RADEON_SW_INT_ENABLE;
        }
        if (rdev->irq.crtc_vblank_int[0]) {
-               tmp |= AVIVO_DISPLAY_INT_STATUS;
                mode_int |= AVIVO_D1MODE_INT_MASK;
        }
        if (rdev->irq.crtc_vblank_int[1]) {
-               tmp |= AVIVO_DISPLAY_INT_STATUS;
                mode_int |= AVIVO_D2MODE_INT_MASK;
        }
        WREG32(RADEON_GEN_INT_CNTL, tmp);
@@ -410,64 +432,6 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
        WREG32(RS600_MC_DATA, v);
 }
 
-static const unsigned rs600_reg_safe_bm[219] = {
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-       0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-       0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-       0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
-       0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-       0x00000000, 0x0000C100, 0x00000000, 0x00000000,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x0003FC01, 0xFFFFFCF8, 0xFF800B19, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-};
-
 int rs600_init(struct radeon_device *rdev)
 {
        rdev->config.r300.reg_safe_bm = rs600_reg_safe_bm;
index 8798825..0f585ca 100644 (file)
@@ -94,9 +94,6 @@ int rs690_mc_init(struct radeon_device *rdev)
 
 void rs690_mc_fini(struct radeon_device *rdev)
 {
-       rs400_gart_disable(rdev);
-       radeon_gart_table_ram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
@@ -652,4 +649,3 @@ void rs690_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
        WREG32(RS690_MC_DATA, v);
        WREG32(RS690_MC_INDEX, RS690_MC_INDEX_WR_ACK);
 }
-
diff --git a/drivers/gpu/drm/radeon/rs780.c b/drivers/gpu/drm/radeon/rs780.c
deleted file mode 100644 (file)
index 0affcff..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- * Copyright 2008 Red Hat Inc.
- * Copyright 2009 Jerome Glisse.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Dave Airlie
- *          Alex Deucher
- *          Jerome Glisse
- */
-#include "drmP.h"
-#include "radeon_reg.h"
-#include "radeon.h"
-
-/* rs780  depends on : */
-void rs600_mc_disable_clients(struct radeon_device *rdev);
-
-/* This files gather functions specifics to:
- * rs780
- *
- * Some of these functions might be used by newer ASICs.
- */
-int rs780_mc_wait_for_idle(struct radeon_device *rdev);
-void rs780_gpu_init(struct radeon_device *rdev);
-
-
-/*
- * MC
- */
-int rs780_mc_init(struct radeon_device *rdev)
-{
-       rs780_gpu_init(rdev);
-       /* FIXME: implement */
-
-       rs600_mc_disable_clients(rdev);
-       if (rs780_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
-       }
-       return 0;
-}
-
-void rs780_mc_fini(struct radeon_device *rdev)
-{
-       /* FIXME: implement */
-}
-
-
-/*
- * Global GPU functions
- */
-void rs780_errata(struct radeon_device *rdev)
-{
-       rdev->pll_errata = 0;
-}
-
-int rs780_mc_wait_for_idle(struct radeon_device *rdev)
-{
-       /* FIXME: implement */
-       return 0;
-}
-
-void rs780_gpu_init(struct radeon_device *rdev)
-{
-       /* FIXME: implement */
-}
-
-
-/*
- * VRAM info
- */
-void rs780_vram_get_type(struct radeon_device *rdev)
-{
-       /* FIXME: implement */
-}
-
-void rs780_vram_info(struct radeon_device *rdev)
-{
-       rs780_vram_get_type(rdev);
-
-       /* FIXME: implement */
-       /* Could aper size report 0 ? */
-       rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
-       rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
-}
index 0566fb6..fd79974 100644 (file)
  */
 #include <linux/seq_file.h>
 #include "drmP.h"
-#include "rv515r.h"
+#include "rv515d.h"
 #include "radeon.h"
-#include "radeon_share.h"
 
+#include "rv515_reg_safe.h"
 /* rv515 depends on : */
 void r100_hdp_reset(struct radeon_device *rdev);
 int r100_cp_reset(struct radeon_device *rdev);
 int r100_rb2d_reset(struct radeon_device *rdev);
 int r100_gui_wait_for_idle(struct radeon_device *rdev);
 int r100_cp_init(struct radeon_device *rdev, unsigned ring_size);
-int rv370_pcie_gart_enable(struct radeon_device *rdev);
-void rv370_pcie_gart_disable(struct radeon_device *rdev);
 void r420_pipes_init(struct radeon_device *rdev);
 void rs600_mc_disable_clients(struct radeon_device *rdev);
 void rs600_disable_vga(struct radeon_device *rdev);
@@ -126,9 +124,6 @@ int rv515_mc_init(struct radeon_device *rdev)
 
 void rv515_mc_fini(struct radeon_device *rdev)
 {
-       rv370_pcie_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
 
@@ -464,301 +459,244 @@ int rv515_debugfs_ga_info_init(struct radeon_device *rdev)
 #endif
 }
 
-
 /*
  * Asic initialization
  */
-static const unsigned r500_reg_safe_bm[219] = {
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-       0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-       0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x1FFFFC78, 0xFFFFE000, 0xFFFFFFFE, 0xFFFFFFFF,
-       0x38CF8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF,
-       0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-       0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-};
-
 int rv515_init(struct radeon_device *rdev)
 {
-       rdev->config.r300.reg_safe_bm = r500_reg_safe_bm;
-       rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(r500_reg_safe_bm);
+       rdev->config.r300.reg_safe_bm = rv515_reg_safe_bm;
+       rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rv515_reg_safe_bm);
        return 0;
 }
 
-void atom_rv515_force_tv_scaler(struct radeon_device *rdev)
+void atom_rv515_force_tv_scaler(struct radeon_device *rdev, struct radeon_crtc *crtc)
 {
-
-       WREG32(0x659C, 0x0);
-       WREG32(0x6594, 0x705);
-       WREG32(0x65A4, 0x10001);
-       WREG32(0x65D8, 0x0);
-       WREG32(0x65B0, 0x0);
-       WREG32(0x65C0, 0x0);
-       WREG32(0x65D4, 0x0);
-       WREG32(0x6578, 0x0);
-       WREG32(0x657C, 0x841880A8);
-       WREG32(0x6578, 0x1);
-       WREG32(0x657C, 0x84208680);
-       WREG32(0x6578, 0x2);
-       WREG32(0x657C, 0xBFF880B0);
-       WREG32(0x6578, 0x100);
-       WREG32(0x657C, 0x83D88088);
-       WREG32(0x6578, 0x101);
-       WREG32(0x657C, 0x84608680);
-       WREG32(0x6578, 0x102);
-       WREG32(0x657C, 0xBFF080D0);
-       WREG32(0x6578, 0x200);
-       WREG32(0x657C, 0x83988068);
-       WREG32(0x6578, 0x201);
-       WREG32(0x657C, 0x84A08680);
-       WREG32(0x6578, 0x202);
-       WREG32(0x657C, 0xBFF080F8);
-       WREG32(0x6578, 0x300);
-       WREG32(0x657C, 0x83588058);
-       WREG32(0x6578, 0x301);
-       WREG32(0x657C, 0x84E08660);
-       WREG32(0x6578, 0x302);
-       WREG32(0x657C, 0xBFF88120);
-       WREG32(0x6578, 0x400);
-       WREG32(0x657C, 0x83188040);
-       WREG32(0x6578, 0x401);
-       WREG32(0x657C, 0x85008660);
-       WREG32(0x6578, 0x402);
-       WREG32(0x657C, 0xBFF88150);
-       WREG32(0x6578, 0x500);
-       WREG32(0x657C, 0x82D88030);
-       WREG32(0x6578, 0x501);
-       WREG32(0x657C, 0x85408640);
-       WREG32(0x6578, 0x502);
-       WREG32(0x657C, 0xBFF88180);
-       WREG32(0x6578, 0x600);
-       WREG32(0x657C, 0x82A08018);
-       WREG32(0x6578, 0x601);
-       WREG32(0x657C, 0x85808620);
-       WREG32(0x6578, 0x602);
-       WREG32(0x657C, 0xBFF081B8);
-       WREG32(0x6578, 0x700);
-       WREG32(0x657C, 0x82608010);
-       WREG32(0x6578, 0x701);
-       WREG32(0x657C, 0x85A08600);
-       WREG32(0x6578, 0x702);
-       WREG32(0x657C, 0x800081F0);
-       WREG32(0x6578, 0x800);
-       WREG32(0x657C, 0x8228BFF8);
-       WREG32(0x6578, 0x801);
-       WREG32(0x657C, 0x85E085E0);
-       WREG32(0x6578, 0x802);
-       WREG32(0x657C, 0xBFF88228);
-       WREG32(0x6578, 0x10000);
-       WREG32(0x657C, 0x82A8BF00);
-       WREG32(0x6578, 0x10001);
-       WREG32(0x657C, 0x82A08CC0);
-       WREG32(0x6578, 0x10002);
-       WREG32(0x657C, 0x8008BEF8);
-       WREG32(0x6578, 0x10100);
-       WREG32(0x657C, 0x81F0BF28);
-       WREG32(0x6578, 0x10101);
-       WREG32(0x657C, 0x83608CA0);
-       WREG32(0x6578, 0x10102);
-       WREG32(0x657C, 0x8018BED0);
-       WREG32(0x6578, 0x10200);
-       WREG32(0x657C, 0x8148BF38);
-       WREG32(0x6578, 0x10201);
-       WREG32(0x657C, 0x84408C80);
-       WREG32(0x6578, 0x10202);
-       WREG32(0x657C, 0x8008BEB8);
-       WREG32(0x6578, 0x10300);
-       WREG32(0x657C, 0x80B0BF78);
-       WREG32(0x6578, 0x10301);
-       WREG32(0x657C, 0x85008C20);
-       WREG32(0x6578, 0x10302);
-       WREG32(0x657C, 0x8020BEA0);
-       WREG32(0x6578, 0x10400);
-       WREG32(0x657C, 0x8028BF90);
-       WREG32(0x6578, 0x10401);
-       WREG32(0x657C, 0x85E08BC0);
-       WREG32(0x6578, 0x10402);
-       WREG32(0x657C, 0x8018BE90);
-       WREG32(0x6578, 0x10500);
-       WREG32(0x657C, 0xBFB8BFB0);
-       WREG32(0x6578, 0x10501);
-       WREG32(0x657C, 0x86C08B40);
-       WREG32(0x6578, 0x10502);
-       WREG32(0x657C, 0x8010BE90);
-       WREG32(0x6578, 0x10600);
-       WREG32(0x657C, 0xBF58BFC8);
-       WREG32(0x6578, 0x10601);
-       WREG32(0x657C, 0x87A08AA0);
-       WREG32(0x6578, 0x10602);
-       WREG32(0x657C, 0x8010BE98);
-       WREG32(0x6578, 0x10700);
-       WREG32(0x657C, 0xBF10BFF0);
-       WREG32(0x6578, 0x10701);
-       WREG32(0x657C, 0x886089E0);
-       WREG32(0x6578, 0x10702);
-       WREG32(0x657C, 0x8018BEB0);
-       WREG32(0x6578, 0x10800);
-       WREG32(0x657C, 0xBED8BFE8);
-       WREG32(0x6578, 0x10801);
-       WREG32(0x657C, 0x89408940);
-       WREG32(0x6578, 0x10802);
-       WREG32(0x657C, 0xBFE8BED8);
-       WREG32(0x6578, 0x20000);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20001);
-       WREG32(0x657C, 0x90008000);
-       WREG32(0x6578, 0x20002);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20003);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20100);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20101);
-       WREG32(0x657C, 0x8FE0BF70);
-       WREG32(0x6578, 0x20102);
-       WREG32(0x657C, 0xBFE880C0);
-       WREG32(0x6578, 0x20103);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20200);
-       WREG32(0x657C, 0x8018BFF8);
-       WREG32(0x6578, 0x20201);
-       WREG32(0x657C, 0x8F80BF08);
-       WREG32(0x6578, 0x20202);
-       WREG32(0x657C, 0xBFD081A0);
-       WREG32(0x6578, 0x20203);
-       WREG32(0x657C, 0xBFF88000);
-       WREG32(0x6578, 0x20300);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20301);
-       WREG32(0x657C, 0x8EE0BEC0);
-       WREG32(0x6578, 0x20302);
-       WREG32(0x657C, 0xBFB082A0);
-       WREG32(0x6578, 0x20303);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20400);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20401);
-       WREG32(0x657C, 0x8E00BEA0);
-       WREG32(0x6578, 0x20402);
-       WREG32(0x657C, 0xBF8883C0);
-       WREG32(0x6578, 0x20403);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20500);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20501);
-       WREG32(0x657C, 0x8D00BE90);
-       WREG32(0x6578, 0x20502);
-       WREG32(0x657C, 0xBF588500);
-       WREG32(0x6578, 0x20503);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20600);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20601);
-       WREG32(0x657C, 0x8BC0BE98);
-       WREG32(0x6578, 0x20602);
-       WREG32(0x657C, 0xBF308660);
-       WREG32(0x6578, 0x20603);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20700);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20701);
-       WREG32(0x657C, 0x8A80BEB0);
-       WREG32(0x6578, 0x20702);
-       WREG32(0x657C, 0xBF0087C0);
-       WREG32(0x6578, 0x20703);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20800);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20801);
-       WREG32(0x657C, 0x8920BED0);
-       WREG32(0x6578, 0x20802);
-       WREG32(0x657C, 0xBED08920);
-       WREG32(0x6578, 0x20803);
-       WREG32(0x657C, 0x80008010);
-       WREG32(0x6578, 0x30000);
-       WREG32(0x657C, 0x90008000);
-       WREG32(0x6578, 0x30001);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x30100);
-       WREG32(0x657C, 0x8FE0BF90);
-       WREG32(0x6578, 0x30101);
-       WREG32(0x657C, 0xBFF880A0);
-       WREG32(0x6578, 0x30200);
-       WREG32(0x657C, 0x8F60BF40);
-       WREG32(0x6578, 0x30201);
-       WREG32(0x657C, 0xBFE88180);
-       WREG32(0x6578, 0x30300);
-       WREG32(0x657C, 0x8EC0BF00);
-       WREG32(0x6578, 0x30301);
-       WREG32(0x657C, 0xBFC88280);
-       WREG32(0x6578, 0x30400);
-       WREG32(0x657C, 0x8DE0BEE0);
-       WREG32(0x6578, 0x30401);
-       WREG32(0x657C, 0xBFA083A0);
-       WREG32(0x6578, 0x30500);
-       WREG32(0x657C, 0x8CE0BED0);
-       WREG32(0x6578, 0x30501);
-       WREG32(0x657C, 0xBF7884E0);
-       WREG32(0x6578, 0x30600);
-       WREG32(0x657C, 0x8BA0BED8);
-       WREG32(0x6578, 0x30601);
-       WREG32(0x657C, 0xBF508640);
-       WREG32(0x6578, 0x30700);
-       WREG32(0x657C, 0x8A60BEE8);
-       WREG32(0x6578, 0x30701);
-       WREG32(0x657C, 0xBF2087A0);
-       WREG32(0x6578, 0x30800);
-       WREG32(0x657C, 0x8900BF00);
-       WREG32(0x6578, 0x30801);
-       WREG32(0x657C, 0xBF008900);
+       int index_reg = 0x6578 + crtc->crtc_offset;
+       int data_reg = 0x657c + crtc->crtc_offset;
+
+       WREG32(0x659C + crtc->crtc_offset, 0x0);
+       WREG32(0x6594 + crtc->crtc_offset, 0x705);
+       WREG32(0x65A4 + crtc->crtc_offset, 0x10001);
+       WREG32(0x65D8 + crtc->crtc_offset, 0x0);
+       WREG32(0x65B0 + crtc->crtc_offset, 0x0);
+       WREG32(0x65C0 + crtc->crtc_offset, 0x0);
+       WREG32(0x65D4 + crtc->crtc_offset, 0x0);
+       WREG32(index_reg, 0x0);
+       WREG32(data_reg, 0x841880A8);
+       WREG32(index_reg, 0x1);
+       WREG32(data_reg, 0x84208680);
+       WREG32(index_reg, 0x2);
+       WREG32(data_reg, 0xBFF880B0);
+       WREG32(index_reg, 0x100);
+       WREG32(data_reg, 0x83D88088);
+       WREG32(index_reg, 0x101);
+       WREG32(data_reg, 0x84608680);
+       WREG32(index_reg, 0x102);
+       WREG32(data_reg, 0xBFF080D0);
+       WREG32(index_reg, 0x200);
+       WREG32(data_reg, 0x83988068);
+       WREG32(index_reg, 0x201);
+       WREG32(data_reg, 0x84A08680);
+       WREG32(index_reg, 0x202);
+       WREG32(data_reg, 0xBFF080F8);
+       WREG32(index_reg, 0x300);
+       WREG32(data_reg, 0x83588058);
+       WREG32(index_reg, 0x301);
+       WREG32(data_reg, 0x84E08660);
+       WREG32(index_reg, 0x302);
+       WREG32(data_reg, 0xBFF88120);
+       WREG32(index_reg, 0x400);
+       WREG32(data_reg, 0x83188040);
+       WREG32(index_reg, 0x401);
+       WREG32(data_reg, 0x85008660);
+       WREG32(index_reg, 0x402);
+       WREG32(data_reg, 0xBFF88150);
+       WREG32(index_reg, 0x500);
+       WREG32(data_reg, 0x82D88030);
+       WREG32(index_reg, 0x501);
+       WREG32(data_reg, 0x85408640);
+       WREG32(index_reg, 0x502);
+       WREG32(data_reg, 0xBFF88180);
+       WREG32(index_reg, 0x600);
+       WREG32(data_reg, 0x82A08018);
+       WREG32(index_reg, 0x601);
+       WREG32(data_reg, 0x85808620);
+       WREG32(index_reg, 0x602);
+       WREG32(data_reg, 0xBFF081B8);
+       WREG32(index_reg, 0x700);
+       WREG32(data_reg, 0x82608010);
+       WREG32(index_reg, 0x701);
+       WREG32(data_reg, 0x85A08600);
+       WREG32(index_reg, 0x702);
+       WREG32(data_reg, 0x800081F0);
+       WREG32(index_reg, 0x800);
+       WREG32(data_reg, 0x8228BFF8);
+       WREG32(index_reg, 0x801);
+       WREG32(data_reg, 0x85E085E0);
+       WREG32(index_reg, 0x802);
+       WREG32(data_reg, 0xBFF88228);
+       WREG32(index_reg, 0x10000);
+       WREG32(data_reg, 0x82A8BF00);
+       WREG32(index_reg, 0x10001);
+       WREG32(data_reg, 0x82A08CC0);
+       WREG32(index_reg, 0x10002);
+       WREG32(data_reg, 0x8008BEF8);
+       WREG32(index_reg, 0x10100);
+       WREG32(data_reg, 0x81F0BF28);
+       WREG32(index_reg, 0x10101);
+       WREG32(data_reg, 0x83608CA0);
+       WREG32(index_reg, 0x10102);
+       WREG32(data_reg, 0x8018BED0);
+       WREG32(index_reg, 0x10200);
+       WREG32(data_reg, 0x8148BF38);
+       WREG32(index_reg, 0x10201);
+       WREG32(data_reg, 0x84408C80);
+       WREG32(index_reg, 0x10202);
+       WREG32(data_reg, 0x8008BEB8);
+       WREG32(index_reg, 0x10300);
+       WREG32(data_reg, 0x80B0BF78);
+       WREG32(index_reg, 0x10301);
+       WREG32(data_reg, 0x85008C20);
+       WREG32(index_reg, 0x10302);
+       WREG32(data_reg, 0x8020BEA0);
+       WREG32(index_reg, 0x10400);
+       WREG32(data_reg, 0x8028BF90);
+       WREG32(index_reg, 0x10401);
+       WREG32(data_reg, 0x85E08BC0);
+       WREG32(index_reg, 0x10402);
+       WREG32(data_reg, 0x8018BE90);
+       WREG32(index_reg, 0x10500);
+       WREG32(data_reg, 0xBFB8BFB0);
+       WREG32(index_reg, 0x10501);
+       WREG32(data_reg, 0x86C08B40);
+       WREG32(index_reg, 0x10502);
+       WREG32(data_reg, 0x8010BE90);
+       WREG32(index_reg, 0x10600);
+       WREG32(data_reg, 0xBF58BFC8);
+       WREG32(index_reg, 0x10601);
+       WREG32(data_reg, 0x87A08AA0);
+       WREG32(index_reg, 0x10602);
+       WREG32(data_reg, 0x8010BE98);
+       WREG32(index_reg, 0x10700);
+       WREG32(data_reg, 0xBF10BFF0);
+       WREG32(index_reg, 0x10701);
+       WREG32(data_reg, 0x886089E0);
+       WREG32(index_reg, 0x10702);
+       WREG32(data_reg, 0x8018BEB0);
+       WREG32(index_reg, 0x10800);
+       WREG32(data_reg, 0xBED8BFE8);
+       WREG32(index_reg, 0x10801);
+       WREG32(data_reg, 0x89408940);
+       WREG32(index_reg, 0x10802);
+       WREG32(data_reg, 0xBFE8BED8);
+       WREG32(index_reg, 0x20000);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20001);
+       WREG32(data_reg, 0x90008000);
+       WREG32(index_reg, 0x20002);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20003);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20100);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20101);
+       WREG32(data_reg, 0x8FE0BF70);
+       WREG32(index_reg, 0x20102);
+       WREG32(data_reg, 0xBFE880C0);
+       WREG32(index_reg, 0x20103);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20200);
+       WREG32(data_reg, 0x8018BFF8);
+       WREG32(index_reg, 0x20201);
+       WREG32(data_reg, 0x8F80BF08);
+       WREG32(index_reg, 0x20202);
+       WREG32(data_reg, 0xBFD081A0);
+       WREG32(index_reg, 0x20203);
+       WREG32(data_reg, 0xBFF88000);
+       WREG32(index_reg, 0x20300);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20301);
+       WREG32(data_reg, 0x8EE0BEC0);
+       WREG32(index_reg, 0x20302);
+       WREG32(data_reg, 0xBFB082A0);
+       WREG32(index_reg, 0x20303);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20400);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20401);
+       WREG32(data_reg, 0x8E00BEA0);
+       WREG32(index_reg, 0x20402);
+       WREG32(data_reg, 0xBF8883C0);
+       WREG32(index_reg, 0x20403);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20500);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20501);
+       WREG32(data_reg, 0x8D00BE90);
+       WREG32(index_reg, 0x20502);
+       WREG32(data_reg, 0xBF588500);
+       WREG32(index_reg, 0x20503);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20600);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20601);
+       WREG32(data_reg, 0x8BC0BE98);
+       WREG32(index_reg, 0x20602);
+       WREG32(data_reg, 0xBF308660);
+       WREG32(index_reg, 0x20603);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20700);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20701);
+       WREG32(data_reg, 0x8A80BEB0);
+       WREG32(index_reg, 0x20702);
+       WREG32(data_reg, 0xBF0087C0);
+       WREG32(index_reg, 0x20703);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20800);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20801);
+       WREG32(data_reg, 0x8920BED0);
+       WREG32(index_reg, 0x20802);
+       WREG32(data_reg, 0xBED08920);
+       WREG32(index_reg, 0x20803);
+       WREG32(data_reg, 0x80008010);
+       WREG32(index_reg, 0x30000);
+       WREG32(data_reg, 0x90008000);
+       WREG32(index_reg, 0x30001);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x30100);
+       WREG32(data_reg, 0x8FE0BF90);
+       WREG32(index_reg, 0x30101);
+       WREG32(data_reg, 0xBFF880A0);
+       WREG32(index_reg, 0x30200);
+       WREG32(data_reg, 0x8F60BF40);
+       WREG32(index_reg, 0x30201);
+       WREG32(data_reg, 0xBFE88180);
+       WREG32(index_reg, 0x30300);
+       WREG32(data_reg, 0x8EC0BF00);
+       WREG32(index_reg, 0x30301);
+       WREG32(data_reg, 0xBFC88280);
+       WREG32(index_reg, 0x30400);
+       WREG32(data_reg, 0x8DE0BEE0);
+       WREG32(index_reg, 0x30401);
+       WREG32(data_reg, 0xBFA083A0);
+       WREG32(index_reg, 0x30500);
+       WREG32(data_reg, 0x8CE0BED0);
+       WREG32(index_reg, 0x30501);
+       WREG32(data_reg, 0xBF7884E0);
+       WREG32(index_reg, 0x30600);
+       WREG32(data_reg, 0x8BA0BED8);
+       WREG32(index_reg, 0x30601);
+       WREG32(data_reg, 0xBF508640);
+       WREG32(index_reg, 0x30700);
+       WREG32(data_reg, 0x8A60BEE8);
+       WREG32(index_reg, 0x30701);
+       WREG32(data_reg, 0xBF2087A0);
+       WREG32(index_reg, 0x30800);
+       WREG32(data_reg, 0x8900BF00);
+       WREG32(index_reg, 0x30801);
+       WREG32(data_reg, 0xBF008900);
 }
 
 struct rv515_watermark {
diff --git a/drivers/gpu/drm/radeon/rv515d.h b/drivers/gpu/drm/radeon/rv515d.h
new file mode 100644 (file)
index 0000000..a65e17e
--- /dev/null
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef __RV515D_H__
+#define __RV515D_H__
+
+/*
+ * RV515 registers
+ */
+#define PCIE_INDEX                     0x0030
+#define PCIE_DATA                      0x0034
+#define        MC_IND_INDEX                    0x0070
+#define                MC_IND_WR_EN                            (1 << 24)
+#define        MC_IND_DATA                     0x0074
+#define        RBBM_SOFT_RESET                 0x00F0
+#define        CONFIG_MEMSIZE                  0x00F8
+#define HDP_FB_LOCATION                        0x0134
+#define        CP_CSQ_CNTL                     0x0740
+#define        CP_CSQ_MODE                     0x0744
+#define        CP_CSQ_ADDR                     0x07F0
+#define        CP_CSQ_DATA                     0x07F4
+#define        CP_CSQ_STAT                     0x07F8
+#define        CP_CSQ2_STAT                    0x07FC
+#define        RBBM_STATUS                     0x0E40
+#define        DST_PIPE_CONFIG                 0x170C
+#define        WAIT_UNTIL                      0x1720
+#define                WAIT_2D_IDLE                            (1 << 14)
+#define                WAIT_3D_IDLE                            (1 << 15)
+#define                WAIT_2D_IDLECLEAN                       (1 << 16)
+#define                WAIT_3D_IDLECLEAN                       (1 << 17)
+#define        ISYNC_CNTL                      0x1724
+#define                ISYNC_ANY2D_IDLE3D                      (1 << 0)
+#define                ISYNC_ANY3D_IDLE2D                      (1 << 1)
+#define                ISYNC_TRIG2D_IDLE3D                     (1 << 2)
+#define                ISYNC_TRIG3D_IDLE2D                     (1 << 3)
+#define                ISYNC_WAIT_IDLEGUI                      (1 << 4)
+#define                ISYNC_CPSCRATCH_IDLEGUI                 (1 << 5)
+#define        VAP_INDEX_OFFSET                0x208C
+#define        VAP_PVS_STATE_FLUSH_REG         0x2284
+#define        GB_ENABLE                       0x4008
+#define        GB_MSPOS0                       0x4010
+#define                MS_X0_SHIFT                             0
+#define                MS_Y0_SHIFT                             4
+#define                MS_X1_SHIFT                             8
+#define                MS_Y1_SHIFT                             12
+#define                MS_X2_SHIFT                             16
+#define                MS_Y2_SHIFT                             20
+#define                MSBD0_Y_SHIFT                           24
+#define                MSBD0_X_SHIFT                           28
+#define        GB_MSPOS1                       0x4014
+#define                MS_X3_SHIFT                             0
+#define                MS_Y3_SHIFT                             4
+#define                MS_X4_SHIFT                             8
+#define                MS_Y4_SHIFT                             12
+#define                MS_X5_SHIFT                             16
+#define                MS_Y5_SHIFT                             20
+#define                MSBD1_SHIFT                             24
+#define GB_TILE_CONFIG                 0x4018
+#define                ENABLE_TILING                           (1 << 0)
+#define                PIPE_COUNT_MASK                         0x0000000E
+#define                PIPE_COUNT_SHIFT                        1
+#define                TILE_SIZE_8                             (0 << 4)
+#define                TILE_SIZE_16                            (1 << 4)
+#define                TILE_SIZE_32                            (2 << 4)
+#define                SUBPIXEL_1_12                           (0 << 16)
+#define                SUBPIXEL_1_16                           (1 << 16)
+#define        GB_SELECT                       0x401C
+#define        GB_AA_CONFIG                    0x4020
+#define        GB_PIPE_SELECT                  0x402C
+#define        GA_ENHANCE                      0x4274
+#define                GA_DEADLOCK_CNTL                        (1 << 0)
+#define                GA_FASTSYNC_CNTL                        (1 << 1)
+#define        GA_POLY_MODE                    0x4288
+#define                FRONT_PTYPE_POINT                       (0 << 4)
+#define                FRONT_PTYPE_LINE                        (1 << 4)
+#define                FRONT_PTYPE_TRIANGE                     (2 << 4)
+#define                BACK_PTYPE_POINT                        (0 << 7)
+#define                BACK_PTYPE_LINE                         (1 << 7)
+#define                BACK_PTYPE_TRIANGE                      (2 << 7)
+#define        GA_ROUND_MODE                   0x428C
+#define                GEOMETRY_ROUND_TRUNC                    (0 << 0)
+#define                GEOMETRY_ROUND_NEAREST                  (1 << 0)
+#define                COLOR_ROUND_TRUNC                       (0 << 2)
+#define                COLOR_ROUND_NEAREST                     (1 << 2)
+#define        SU_REG_DEST                     0x42C8
+#define        RB3D_DSTCACHE_CTLSTAT           0x4E4C
+#define                RB3D_DC_FLUSH                           (2 << 0)
+#define                RB3D_DC_FREE                            (2 << 2)
+#define                RB3D_DC_FINISH                          (1 << 4)
+#define ZB_ZCACHE_CTLSTAT              0x4F18
+#define                ZC_FLUSH                                (1 << 0)
+#define                ZC_FREE                                 (1 << 1)
+#define DC_LB_MEMORY_SPLIT             0x6520
+#define                DC_LB_MEMORY_SPLIT_MASK                 0x00000003
+#define                DC_LB_MEMORY_SPLIT_SHIFT                0
+#define                DC_LB_MEMORY_SPLIT_D1HALF_D2HALF        0
+#define                DC_LB_MEMORY_SPLIT_D1_3Q_D2_1Q          1
+#define                DC_LB_MEMORY_SPLIT_D1_ONLY              2
+#define                DC_LB_MEMORY_SPLIT_D1_1Q_D2_3Q          3
+#define                DC_LB_MEMORY_SPLIT_SHIFT_MODE           (1 << 2)
+#define                DC_LB_DISP1_END_ADR_SHIFT               4
+#define                DC_LB_DISP1_END_ADR_MASK                0x00007FF0
+#define D1MODE_PRIORITY_A_CNT          0x6548
+#define                MODE_PRIORITY_MARK_MASK                 0x00007FFF
+#define                MODE_PRIORITY_OFF                       (1 << 16)
+#define                MODE_PRIORITY_ALWAYS_ON                 (1 << 20)
+#define                MODE_PRIORITY_FORCE_MASK                (1 << 24)
+#define D1MODE_PRIORITY_B_CNT          0x654C
+#define LB_MAX_REQ_OUTSTANDING         0x6D58
+#define                LB_D1_MAX_REQ_OUTSTANDING_MASK          0x0000000F
+#define                LB_D1_MAX_REQ_OUTSTANDING_SHIFT         0
+#define                LB_D2_MAX_REQ_OUTSTANDING_MASK          0x000F0000
+#define                LB_D2_MAX_REQ_OUTSTANDING_SHIFT         16
+#define D2MODE_PRIORITY_A_CNT          0x6D48
+#define D2MODE_PRIORITY_B_CNT          0x6D4C
+
+/* ix[MC] registers */
+#define MC_FB_LOCATION                 0x01
+#define                MC_FB_START_MASK                        0x0000FFFF
+#define                MC_FB_START_SHIFT                       0
+#define                MC_FB_TOP_MASK                          0xFFFF0000
+#define                MC_FB_TOP_SHIFT                         16
+#define MC_AGP_LOCATION                        0x02
+#define                MC_AGP_START_MASK                       0x0000FFFF
+#define                MC_AGP_START_SHIFT                      0
+#define                MC_AGP_TOP_MASK                         0xFFFF0000
+#define                MC_AGP_TOP_SHIFT                        16
+#define MC_AGP_BASE                    0x03
+#define MC_AGP_BASE_2                  0x04
+#define        MC_CNTL                         0x5
+#define                MEM_NUM_CHANNELS_MASK                   0x00000003
+#define        MC_STATUS                       0x08
+#define                MC_STATUS_IDLE                          (1 << 4)
+#define        MC_MISC_LAT_TIMER               0x09
+#define                MC_CPR_INIT_LAT_MASK                    0x0000000F
+#define                MC_VF_INIT_LAT_MASK                     0x000000F0
+#define                MC_DISP0R_INIT_LAT_MASK                 0x00000F00
+#define                MC_DISP0R_INIT_LAT_SHIFT                8
+#define                MC_DISP1R_INIT_LAT_MASK                 0x0000F000
+#define                MC_DISP1R_INIT_LAT_SHIFT                12
+#define                MC_FIXED_INIT_LAT_MASK                  0x000F0000
+#define                MC_E2R_INIT_LAT_MASK                    0x00F00000
+#define                SAME_PAGE_PRIO_MASK                     0x0F000000
+#define                MC_GLOBW_INIT_LAT_MASK                  0xF0000000
+
+
+/*
+ * PM4 packet
+ */
+#define CP_PACKET0                     0x00000000
+#define                PACKET0_BASE_INDEX_SHIFT        0
+#define                PACKET0_BASE_INDEX_MASK         (0x1ffff << 0)
+#define                PACKET0_COUNT_SHIFT             16
+#define                PACKET0_COUNT_MASK              (0x3fff << 16)
+#define CP_PACKET1                     0x40000000
+#define CP_PACKET2                     0x80000000
+#define                PACKET2_PAD_SHIFT               0
+#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
+#define CP_PACKET3                     0xC0000000
+#define                PACKET3_IT_OPCODE_SHIFT         8
+#define                PACKET3_IT_OPCODE_MASK          (0xff << 8)
+#define                PACKET3_COUNT_SHIFT             16
+#define                PACKET3_COUNT_MASK              (0x3fff << 16)
+/* PACKET3 op code */
+#define                PACKET3_NOP                     0x10
+#define                PACKET3_3D_DRAW_VBUF            0x28
+#define                PACKET3_3D_DRAW_IMMD            0x29
+#define                PACKET3_3D_DRAW_INDX            0x2A
+#define                PACKET3_3D_LOAD_VBPNTR          0x2F
+#define                PACKET3_INDX_BUFFER             0x33
+#define                PACKET3_3D_DRAW_VBUF_2          0x34
+#define                PACKET3_3D_DRAW_IMMD_2          0x35
+#define                PACKET3_3D_DRAW_INDX_2          0x36
+#define                PACKET3_BITBLT_MULTI            0x9B
+
+#define PACKET0(reg, n)        (CP_PACKET0 |                                   \
+                        REG_SET(PACKET0_BASE_INDEX, (reg) >> 2) |      \
+                        REG_SET(PACKET0_COUNT, (n)))
+#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
+#define PACKET3(op, n) (CP_PACKET3 |                                   \
+                        REG_SET(PACKET3_IT_OPCODE, (op)) |             \
+                        REG_SET(PACKET3_COUNT, (n)))
+
+#define        PACKET_TYPE0    0
+#define        PACKET_TYPE1    1
+#define        PACKET_TYPE2    2
+#define        PACKET_TYPE3    3
+
+#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
+#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
+#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
+#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
+#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
+
+#endif
+
diff --git a/drivers/gpu/drm/radeon/rv515r.h b/drivers/gpu/drm/radeon/rv515r.h
deleted file mode 100644 (file)
index f3cf840..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- * Copyright 2008 Red Hat Inc.
- * Copyright 2009 Jerome Glisse.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Dave Airlie
- *          Alex Deucher
- *          Jerome Glisse
- */
-#ifndef RV515R_H
-#define RV515R_H
-
-/* RV515 registers */
-#define PCIE_INDEX                     0x0030
-#define PCIE_DATA                      0x0034
-#define        MC_IND_INDEX                    0x0070
-#define                MC_IND_WR_EN                            (1 << 24)
-#define        MC_IND_DATA                     0x0074
-#define        RBBM_SOFT_RESET                 0x00F0
-#define        CONFIG_MEMSIZE                  0x00F8
-#define HDP_FB_LOCATION                        0x0134
-#define        CP_CSQ_CNTL                     0x0740
-#define        CP_CSQ_MODE                     0x0744
-#define        CP_CSQ_ADDR                     0x07F0
-#define        CP_CSQ_DATA                     0x07F4
-#define        CP_CSQ_STAT                     0x07F8
-#define        CP_CSQ2_STAT                    0x07FC
-#define        RBBM_STATUS                     0x0E40
-#define        DST_PIPE_CONFIG                 0x170C
-#define        WAIT_UNTIL                      0x1720
-#define                WAIT_2D_IDLE                            (1 << 14)
-#define                WAIT_3D_IDLE                            (1 << 15)
-#define                WAIT_2D_IDLECLEAN                       (1 << 16)
-#define                WAIT_3D_IDLECLEAN                       (1 << 17)
-#define        ISYNC_CNTL                      0x1724
-#define                ISYNC_ANY2D_IDLE3D                      (1 << 0)
-#define                ISYNC_ANY3D_IDLE2D                      (1 << 1)
-#define                ISYNC_TRIG2D_IDLE3D                     (1 << 2)
-#define                ISYNC_TRIG3D_IDLE2D                     (1 << 3)
-#define                ISYNC_WAIT_IDLEGUI                      (1 << 4)
-#define                ISYNC_CPSCRATCH_IDLEGUI                 (1 << 5)
-#define        VAP_INDEX_OFFSET                0x208C
-#define        VAP_PVS_STATE_FLUSH_REG         0x2284
-#define        GB_ENABLE                       0x4008
-#define        GB_MSPOS0                       0x4010
-#define                MS_X0_SHIFT                             0
-#define                MS_Y0_SHIFT                             4
-#define                MS_X1_SHIFT                             8
-#define                MS_Y1_SHIFT                             12
-#define                MS_X2_SHIFT                             16
-#define                MS_Y2_SHIFT                             20
-#define                MSBD0_Y_SHIFT                           24
-#define                MSBD0_X_SHIFT                           28
-#define        GB_MSPOS1                       0x4014
-#define                MS_X3_SHIFT                             0
-#define                MS_Y3_SHIFT                             4
-#define                MS_X4_SHIFT                             8
-#define                MS_Y4_SHIFT                             12
-#define                MS_X5_SHIFT                             16
-#define                MS_Y5_SHIFT                             20
-#define                MSBD1_SHIFT                             24
-#define GB_TILE_CONFIG                 0x4018
-#define                ENABLE_TILING                           (1 << 0)
-#define                PIPE_COUNT_MASK                         0x0000000E
-#define                PIPE_COUNT_SHIFT                        1
-#define                TILE_SIZE_8                             (0 << 4)
-#define                TILE_SIZE_16                            (1 << 4)
-#define                TILE_SIZE_32                            (2 << 4)
-#define                SUBPIXEL_1_12                           (0 << 16)
-#define                SUBPIXEL_1_16                           (1 << 16)
-#define        GB_SELECT                       0x401C
-#define        GB_AA_CONFIG                    0x4020
-#define        GB_PIPE_SELECT                  0x402C
-#define        GA_ENHANCE                      0x4274
-#define                GA_DEADLOCK_CNTL                        (1 << 0)
-#define                GA_FASTSYNC_CNTL                        (1 << 1)
-#define        GA_POLY_MODE                    0x4288
-#define                FRONT_PTYPE_POINT                       (0 << 4)
-#define                FRONT_PTYPE_LINE                        (1 << 4)
-#define                FRONT_PTYPE_TRIANGE                     (2 << 4)
-#define                BACK_PTYPE_POINT                        (0 << 7)
-#define                BACK_PTYPE_LINE                         (1 << 7)
-#define                BACK_PTYPE_TRIANGE                      (2 << 7)
-#define        GA_ROUND_MODE                   0x428C
-#define                GEOMETRY_ROUND_TRUNC                    (0 << 0)
-#define                GEOMETRY_ROUND_NEAREST                  (1 << 0)
-#define                COLOR_ROUND_TRUNC                       (0 << 2)
-#define                COLOR_ROUND_NEAREST                     (1 << 2)
-#define        SU_REG_DEST                     0x42C8
-#define        RB3D_DSTCACHE_CTLSTAT           0x4E4C
-#define                RB3D_DC_FLUSH                           (2 << 0)
-#define                RB3D_DC_FREE                            (2 << 2)
-#define                RB3D_DC_FINISH                          (1 << 4)
-#define ZB_ZCACHE_CTLSTAT              0x4F18
-#define                ZC_FLUSH                                (1 << 0)
-#define                ZC_FREE                                 (1 << 1)
-#define DC_LB_MEMORY_SPLIT             0x6520
-#define                DC_LB_MEMORY_SPLIT_MASK                 0x00000003
-#define                DC_LB_MEMORY_SPLIT_SHIFT                0
-#define                DC_LB_MEMORY_SPLIT_D1HALF_D2HALF        0
-#define                DC_LB_MEMORY_SPLIT_D1_3Q_D2_1Q          1
-#define                DC_LB_MEMORY_SPLIT_D1_ONLY              2
-#define                DC_LB_MEMORY_SPLIT_D1_1Q_D2_3Q          3
-#define                DC_LB_MEMORY_SPLIT_SHIFT_MODE           (1 << 2)
-#define                DC_LB_DISP1_END_ADR_SHIFT               4
-#define                DC_LB_DISP1_END_ADR_MASK                0x00007FF0
-#define D1MODE_PRIORITY_A_CNT          0x6548
-#define                MODE_PRIORITY_MARK_MASK                 0x00007FFF
-#define                MODE_PRIORITY_OFF                       (1 << 16)
-#define                MODE_PRIORITY_ALWAYS_ON                 (1 << 20)
-#define                MODE_PRIORITY_FORCE_MASK                (1 << 24)
-#define D1MODE_PRIORITY_B_CNT          0x654C
-#define LB_MAX_REQ_OUTSTANDING         0x6D58
-#define                LB_D1_MAX_REQ_OUTSTANDING_MASK          0x0000000F
-#define                LB_D1_MAX_REQ_OUTSTANDING_SHIFT         0
-#define                LB_D2_MAX_REQ_OUTSTANDING_MASK          0x000F0000
-#define                LB_D2_MAX_REQ_OUTSTANDING_SHIFT         16
-#define D2MODE_PRIORITY_A_CNT          0x6D48
-#define D2MODE_PRIORITY_B_CNT          0x6D4C
-
-/* ix[MC] registers */
-#define MC_FB_LOCATION                 0x01
-#define                MC_FB_START_MASK                        0x0000FFFF
-#define                MC_FB_START_SHIFT                       0
-#define                MC_FB_TOP_MASK                          0xFFFF0000
-#define                MC_FB_TOP_SHIFT                         16
-#define MC_AGP_LOCATION                        0x02
-#define                MC_AGP_START_MASK                       0x0000FFFF
-#define                MC_AGP_START_SHIFT                      0
-#define                MC_AGP_TOP_MASK                         0xFFFF0000
-#define                MC_AGP_TOP_SHIFT                        16
-#define MC_AGP_BASE                    0x03
-#define MC_AGP_BASE_2                  0x04
-#define        MC_CNTL                         0x5
-#define                MEM_NUM_CHANNELS_MASK                   0x00000003
-#define        MC_STATUS                       0x08
-#define                MC_STATUS_IDLE                          (1 << 4)
-#define        MC_MISC_LAT_TIMER               0x09
-#define                MC_CPR_INIT_LAT_MASK                    0x0000000F
-#define                MC_VF_INIT_LAT_MASK                     0x000000F0
-#define                MC_DISP0R_INIT_LAT_MASK                 0x00000F00
-#define                MC_DISP0R_INIT_LAT_SHIFT                8
-#define                MC_DISP1R_INIT_LAT_MASK                 0x0000F000
-#define                MC_DISP1R_INIT_LAT_SHIFT                12
-#define                MC_FIXED_INIT_LAT_MASK                  0x000F0000
-#define                MC_E2R_INIT_LAT_MASK                    0x00F00000
-#define                SAME_PAGE_PRIO_MASK                     0x0F000000
-#define                MC_GLOBW_INIT_LAT_MASK                  0xF0000000
-
-
-#endif
-
index 21d8ffd..b574c73 100644 (file)
  *          Alex Deucher
  *          Jerome Glisse
  */
+#include <linux/firmware.h>
+#include <linux/platform_device.h>
 #include "drmP.h"
-#include "radeon_reg.h"
 #include "radeon.h"
+#include "radeon_drm.h"
+#include "rv770d.h"
+#include "avivod.h"
+#include "atom.h"
 
-/* rv770,rv730,rv710  depends on : */
-void rs600_mc_disable_clients(struct radeon_device *rdev);
+#define R700_PFP_UCODE_SIZE 848
+#define R700_PM4_UCODE_SIZE 1360
 
-/* This files gather functions specifics to:
- * rv770,rv730,rv710
- *
- * Some of these functions might be used by newer ASICs.
- */
-int rv770_mc_wait_for_idle(struct radeon_device *rdev);
-void rv770_gpu_init(struct radeon_device *rdev);
+static void rv770_gpu_init(struct radeon_device *rdev);
+void rv770_fini(struct radeon_device *rdev);
 
 
 /*
- * MC
+ * GART
  */
-int rv770_mc_init(struct radeon_device *rdev)
+int rv770_pcie_gart_enable(struct radeon_device *rdev)
 {
-       uint32_t tmp;
+       u32 tmp;
+       int r, i;
 
-       rv770_gpu_init(rdev);
+       if (rdev->gart.table.vram.robj == NULL) {
+               dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
+               return -EINVAL;
+       }
+       r = radeon_gart_table_vram_pin(rdev);
+       if (r)
+               return r;
+       /* Setup L2 cache */
+       WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |
+                               ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE |
+                               EFFECTIVE_L2_QUEUE_SIZE(7));
+       WREG32(VM_L2_CNTL2, 0);
+       WREG32(VM_L2_CNTL3, BANK_SELECT(0) | CACHE_UPDATE_MODE(2));
+       /* Setup TLB control */
+       tmp = ENABLE_L1_TLB | ENABLE_L1_FRAGMENT_PROCESSING |
+               SYSTEM_ACCESS_MODE_NOT_IN_SYS |
+               SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU |
+               EFFECTIVE_L1_TLB_SIZE(5) | EFFECTIVE_L1_QUEUE_SIZE(5);
+       WREG32(MC_VM_MD_L1_TLB0_CNTL, tmp);
+       WREG32(MC_VM_MD_L1_TLB1_CNTL, tmp);
+       WREG32(MC_VM_MD_L1_TLB2_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB0_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end - 1) >> 12);
+       WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
+       WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
+                               RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
+       WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
+                       (u32)(rdev->dummy_page.addr >> 12));
+       for (i = 1; i < 7; i++)
+               WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
 
-       /* setup the gart before changing location so we can ask to
-        * discard unmapped mc request
-        */
-       /* FIXME: disable out of gart access */
-       tmp = rdev->mc.gtt_location / 4096;
-       tmp = REG_SET(R700_LOGICAL_PAGE_NUMBER, tmp);
-       WREG32(R700_MC_VM_SYSTEM_APERTURE_LOW_ADDR, tmp);
-       tmp = (rdev->mc.gtt_location + rdev->mc.gtt_size) / 4096;
-       tmp = REG_SET(R700_LOGICAL_PAGE_NUMBER, tmp);
-       WREG32(R700_MC_VM_SYSTEM_APERTURE_HIGH_ADDR, tmp);
-
-       rs600_mc_disable_clients(rdev);
-       if (rv770_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
-       }
-
-       tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1;
-       tmp = REG_SET(R700_MC_FB_TOP, tmp >> 24);
-       tmp |= REG_SET(R700_MC_FB_BASE, rdev->mc.vram_location >> 24);
-       WREG32(R700_MC_VM_FB_LOCATION, tmp);
-       tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1;
-       tmp = REG_SET(R700_MC_AGP_TOP, tmp >> 22);
-       WREG32(R700_MC_VM_AGP_TOP, tmp);
-       tmp = REG_SET(R700_MC_AGP_BOT, rdev->mc.gtt_location >> 22);
-       WREG32(R700_MC_VM_AGP_BOT, tmp);
+       r600_pcie_gart_tlb_flush(rdev);
+       rdev->gart.ready = true;
        return 0;
 }
 
-void rv770_mc_fini(struct radeon_device *rdev)
+void rv770_pcie_gart_disable(struct radeon_device *rdev)
+{
+       u32 tmp;
+       int i;
+
+       /* Disable all tables */
+       for (i = 0; i < 7; i++)
+               WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
+
+       /* Setup L2 cache */
+       WREG32(VM_L2_CNTL, ENABLE_L2_FRAGMENT_PROCESSING |
+                               EFFECTIVE_L2_QUEUE_SIZE(7));
+       WREG32(VM_L2_CNTL2, 0);
+       WREG32(VM_L2_CNTL3, BANK_SELECT(0) | CACHE_UPDATE_MODE(2));
+       /* Setup TLB control */
+       tmp = EFFECTIVE_L1_TLB_SIZE(5) | EFFECTIVE_L1_QUEUE_SIZE(5);
+       WREG32(MC_VM_MD_L1_TLB0_CNTL, tmp);
+       WREG32(MC_VM_MD_L1_TLB1_CNTL, tmp);
+       WREG32(MC_VM_MD_L1_TLB2_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB0_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
+       WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
+       if (rdev->gart.table.vram.robj) {
+               radeon_object_kunmap(rdev->gart.table.vram.robj);
+               radeon_object_unpin(rdev->gart.table.vram.robj);
+       }
+}
+
+void rv770_pcie_gart_fini(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
+       rv770_pcie_gart_disable(rdev);
+       radeon_gart_table_vram_free(rdev);
+       radeon_gart_fini(rdev);
 }
 
 
 /*
- * Global GPU functions
+ * MC
  */
-void rv770_errata(struct radeon_device *rdev)
+static void rv770_mc_resume(struct radeon_device *rdev)
 {
-       rdev->pll_errata = 0;
+       u32 d1vga_control, d2vga_control;
+       u32 vga_render_control, vga_hdp_control;
+       u32 d1crtc_control, d2crtc_control;
+       u32 new_d1grph_primary, new_d1grph_secondary;
+       u32 new_d2grph_primary, new_d2grph_secondary;
+       u64 old_vram_start;
+       u32 tmp;
+       int i, j;
+
+       /* Initialize HDP */
+       for (i = 0, j = 0; i < 32; i++, j += 0x18) {
+               WREG32((0x2c14 + j), 0x00000000);
+               WREG32((0x2c18 + j), 0x00000000);
+               WREG32((0x2c1c + j), 0x00000000);
+               WREG32((0x2c20 + j), 0x00000000);
+               WREG32((0x2c24 + j), 0x00000000);
+       }
+       WREG32(HDP_REG_COHERENCY_FLUSH_CNTL, 0);
+
+       d1vga_control = RREG32(D1VGA_CONTROL);
+       d2vga_control = RREG32(D2VGA_CONTROL);
+       vga_render_control = RREG32(VGA_RENDER_CONTROL);
+       vga_hdp_control = RREG32(VGA_HDP_CONTROL);
+       d1crtc_control = RREG32(D1CRTC_CONTROL);
+       d2crtc_control = RREG32(D2CRTC_CONTROL);
+       old_vram_start = (u64)(RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
+       new_d1grph_primary = RREG32(D1GRPH_PRIMARY_SURFACE_ADDRESS);
+       new_d1grph_secondary = RREG32(D1GRPH_SECONDARY_SURFACE_ADDRESS);
+       new_d1grph_primary += rdev->mc.vram_start - old_vram_start;
+       new_d1grph_secondary += rdev->mc.vram_start - old_vram_start;
+       new_d2grph_primary = RREG32(D2GRPH_PRIMARY_SURFACE_ADDRESS);
+       new_d2grph_secondary = RREG32(D2GRPH_SECONDARY_SURFACE_ADDRESS);
+       new_d2grph_primary += rdev->mc.vram_start - old_vram_start;
+       new_d2grph_secondary += rdev->mc.vram_start - old_vram_start;
+
+       /* Stop all video */
+       WREG32(D1VGA_CONTROL, 0);
+       WREG32(D2VGA_CONTROL, 0);
+       WREG32(VGA_RENDER_CONTROL, 0);
+       WREG32(D1CRTC_UPDATE_LOCK, 1);
+       WREG32(D2CRTC_UPDATE_LOCK, 1);
+       WREG32(D1CRTC_CONTROL, 0);
+       WREG32(D2CRTC_CONTROL, 0);
+       WREG32(D1CRTC_UPDATE_LOCK, 0);
+       WREG32(D2CRTC_UPDATE_LOCK, 0);
+
+       mdelay(1);
+       if (r600_mc_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "[drm] MC not idle !\n");
+       }
+
+       /* Lockout access through VGA aperture*/
+       WREG32(VGA_HDP_CONTROL, VGA_MEMORY_DISABLE);
+
+       /* Update configuration */
+       WREG32(MC_VM_SYSTEM_APERTURE_LOW_ADDR, rdev->mc.vram_start >> 12);
+       WREG32(MC_VM_SYSTEM_APERTURE_HIGH_ADDR, (rdev->mc.vram_end - 1) >> 12);
+       WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0);
+       tmp = (((rdev->mc.vram_end - 1) >> 24) & 0xFFFF) << 16;
+       tmp |= ((rdev->mc.vram_start >> 24) & 0xFFFF);
+       WREG32(MC_VM_FB_LOCATION, tmp);
+       WREG32(HDP_NONSURFACE_BASE, (rdev->mc.vram_start >> 8));
+       WREG32(HDP_NONSURFACE_INFO, (2 << 7));
+       WREG32(HDP_NONSURFACE_SIZE, (rdev->mc.mc_vram_size - 1) | 0x3FF);
+       if (rdev->flags & RADEON_IS_AGP) {
+               WREG32(MC_VM_AGP_TOP, (rdev->mc.gtt_end - 1) >> 16);
+               WREG32(MC_VM_AGP_BOT, rdev->mc.gtt_start >> 16);
+               WREG32(MC_VM_AGP_BASE, rdev->mc.agp_base >> 22);
+       } else {
+               WREG32(MC_VM_AGP_BASE, 0);
+               WREG32(MC_VM_AGP_TOP, 0x0FFFFFFF);
+               WREG32(MC_VM_AGP_BOT, 0x0FFFFFFF);
+       }
+       WREG32(D1GRPH_PRIMARY_SURFACE_ADDRESS, new_d1grph_primary);
+       WREG32(D1GRPH_SECONDARY_SURFACE_ADDRESS, new_d1grph_secondary);
+       WREG32(D2GRPH_PRIMARY_SURFACE_ADDRESS, new_d2grph_primary);
+       WREG32(D2GRPH_SECONDARY_SURFACE_ADDRESS, new_d2grph_secondary);
+       WREG32(VGA_MEMORY_BASE_ADDRESS, rdev->mc.vram_start);
+
+       /* Unlock host access */
+       WREG32(VGA_HDP_CONTROL, vga_hdp_control);
+
+       mdelay(1);
+       if (r600_mc_wait_for_idle(rdev)) {
+               printk(KERN_WARNING "[drm] MC not idle !\n");
+       }
+
+       /* Restore video state */
+       WREG32(D1CRTC_UPDATE_LOCK, 1);
+       WREG32(D2CRTC_UPDATE_LOCK, 1);
+       WREG32(D1CRTC_CONTROL, d1crtc_control);
+       WREG32(D2CRTC_CONTROL, d2crtc_control);
+       WREG32(D1CRTC_UPDATE_LOCK, 0);
+       WREG32(D2CRTC_UPDATE_LOCK, 0);
+       WREG32(D1VGA_CONTROL, d1vga_control);
+       WREG32(D2VGA_CONTROL, d2vga_control);
+       WREG32(VGA_RENDER_CONTROL, vga_render_control);
+
+       /* we need to own VRAM, so turn off the VGA renderer here
+        * to stop it overwriting our objects */
+       radeon_avivo_vga_render_disable(rdev);
 }
 
-int rv770_mc_wait_for_idle(struct radeon_device *rdev)
+
+/*
+ * CP.
+ */
+void r700_cp_stop(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
-       return 0;
+       WREG32(CP_ME_CNTL, (CP_ME_HALT | CP_PFP_HALT));
 }
 
-void rv770_gpu_init(struct radeon_device *rdev)
+
+static int rv770_cp_load_microcode(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
+       const __be32 *fw_data;
+       int i;
+
+       if (!rdev->me_fw || !rdev->pfp_fw)
+               return -EINVAL;
+
+       r700_cp_stop(rdev);
+       WREG32(CP_RB_CNTL, RB_NO_UPDATE | (15 << 8) | (3 << 0));
+
+       /* Reset cp */
+       WREG32(GRBM_SOFT_RESET, SOFT_RESET_CP);
+       RREG32(GRBM_SOFT_RESET);
+       mdelay(15);
+       WREG32(GRBM_SOFT_RESET, 0);
+
+       fw_data = (const __be32 *)rdev->pfp_fw->data;
+       WREG32(CP_PFP_UCODE_ADDR, 0);
+       for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
+               WREG32(CP_PFP_UCODE_DATA, be32_to_cpup(fw_data++));
+       WREG32(CP_PFP_UCODE_ADDR, 0);
+
+       fw_data = (const __be32 *)rdev->me_fw->data;
+       WREG32(CP_ME_RAM_WADDR, 0);
+       for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
+               WREG32(CP_ME_RAM_DATA, be32_to_cpup(fw_data++));
+
+       WREG32(CP_PFP_UCODE_ADDR, 0);
+       WREG32(CP_ME_RAM_WADDR, 0);
+       WREG32(CP_ME_RAM_RADDR, 0);
+       return 0;
 }
 
 
 /*
- * VRAM info
+ * Core functions
  */
-void rv770_vram_get_type(struct radeon_device *rdev)
+static u32 r700_get_tile_pipe_to_backend_map(u32 num_tile_pipes,
+                                               u32 num_backends,
+                                               u32 backend_disable_mask)
+{
+       u32 backend_map = 0;
+       u32 enabled_backends_mask;
+       u32 enabled_backends_count;
+       u32 cur_pipe;
+       u32 swizzle_pipe[R7XX_MAX_PIPES];
+       u32 cur_backend;
+       u32 i;
+
+       if (num_tile_pipes > R7XX_MAX_PIPES)
+               num_tile_pipes = R7XX_MAX_PIPES;
+       if (num_tile_pipes < 1)
+               num_tile_pipes = 1;
+       if (num_backends > R7XX_MAX_BACKENDS)
+               num_backends = R7XX_MAX_BACKENDS;
+       if (num_backends < 1)
+               num_backends = 1;
+
+       enabled_backends_mask = 0;
+       enabled_backends_count = 0;
+       for (i = 0; i < R7XX_MAX_BACKENDS; ++i) {
+               if (((backend_disable_mask >> i) & 1) == 0) {
+                       enabled_backends_mask |= (1 << i);
+                       ++enabled_backends_count;
+               }
+               if (enabled_backends_count == num_backends)
+                       break;
+       }
+
+       if (enabled_backends_count == 0) {
+               enabled_backends_mask = 1;
+               enabled_backends_count = 1;
+       }
+
+       if (enabled_backends_count != num_backends)
+               num_backends = enabled_backends_count;
+
+       memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * R7XX_MAX_PIPES);
+       switch (num_tile_pipes) {
+       case 1:
+               swizzle_pipe[0] = 0;
+               break;
+       case 2:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 1;
+               break;
+       case 3:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 1;
+               break;
+       case 4:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 3;
+               swizzle_pipe[3] = 1;
+               break;
+       case 5:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 1;
+               swizzle_pipe[4] = 3;
+               break;
+       case 6:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 5;
+               swizzle_pipe[4] = 3;
+               swizzle_pipe[5] = 1;
+               break;
+       case 7:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 6;
+               swizzle_pipe[4] = 3;
+               swizzle_pipe[5] = 1;
+               swizzle_pipe[6] = 5;
+               break;
+       case 8:
+               swizzle_pipe[0] = 0;
+               swizzle_pipe[1] = 2;
+               swizzle_pipe[2] = 4;
+               swizzle_pipe[3] = 6;
+               swizzle_pipe[4] = 3;
+               swizzle_pipe[5] = 1;
+               swizzle_pipe[6] = 7;
+               swizzle_pipe[7] = 5;
+               break;
+       }
+
+       cur_backend = 0;
+       for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
+               while (((1 << cur_backend) & enabled_backends_mask) == 0)
+                       cur_backend = (cur_backend + 1) % R7XX_MAX_BACKENDS;
+
+               backend_map |= (u32)(((cur_backend & 3) << (swizzle_pipe[cur_pipe] * 2)));
+
+               cur_backend = (cur_backend + 1) % R7XX_MAX_BACKENDS;
+       }
+
+       return backend_map;
+}
+
+static void rv770_gpu_init(struct radeon_device *rdev)
 {
-       /* FIXME: implement */
+       int i, j, num_qd_pipes;
+       u32 sx_debug_1;
+       u32 smx_dc_ctl0;
+       u32 num_gs_verts_per_thread;
+       u32 vgt_gs_per_es;
+       u32 gs_prim_buffer_depth = 0;
+       u32 sq_ms_fifo_sizes;
+       u32 sq_config;
+       u32 sq_thread_resource_mgmt;
+       u32 hdp_host_path_cntl;
+       u32 sq_dyn_gpr_size_simd_ab_0;
+       u32 backend_map;
+       u32 gb_tiling_config = 0;
+       u32 cc_rb_backend_disable = 0;
+       u32 cc_gc_shader_pipe_config = 0;
+       u32 mc_arb_ramcfg;
+       u32 db_debug4;
+
+       /* setup chip specs */
+       switch (rdev->family) {
+       case CHIP_RV770:
+               rdev->config.rv770.max_pipes = 4;
+               rdev->config.rv770.max_tile_pipes = 8;
+               rdev->config.rv770.max_simds = 10;
+               rdev->config.rv770.max_backends = 4;
+               rdev->config.rv770.max_gprs = 256;
+               rdev->config.rv770.max_threads = 248;
+               rdev->config.rv770.max_stack_entries = 512;
+               rdev->config.rv770.max_hw_contexts = 8;
+               rdev->config.rv770.max_gs_threads = 16 * 2;
+               rdev->config.rv770.sx_max_export_size = 128;
+               rdev->config.rv770.sx_max_export_pos_size = 16;
+               rdev->config.rv770.sx_max_export_smx_size = 112;
+               rdev->config.rv770.sq_num_cf_insts = 2;
+
+               rdev->config.rv770.sx_num_of_sets = 7;
+               rdev->config.rv770.sc_prim_fifo_size = 0xF9;
+               rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30;
+               rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130;
+               break;
+       case CHIP_RV730:
+               rdev->config.rv770.max_pipes = 2;
+               rdev->config.rv770.max_tile_pipes = 4;
+               rdev->config.rv770.max_simds = 8;
+               rdev->config.rv770.max_backends = 2;
+               rdev->config.rv770.max_gprs = 128;
+               rdev->config.rv770.max_threads = 248;
+               rdev->config.rv770.max_stack_entries = 256;
+               rdev->config.rv770.max_hw_contexts = 8;
+               rdev->config.rv770.max_gs_threads = 16 * 2;
+               rdev->config.rv770.sx_max_export_size = 256;
+               rdev->config.rv770.sx_max_export_pos_size = 32;
+               rdev->config.rv770.sx_max_export_smx_size = 224;
+               rdev->config.rv770.sq_num_cf_insts = 2;
+
+               rdev->config.rv770.sx_num_of_sets = 7;
+               rdev->config.rv770.sc_prim_fifo_size = 0xf9;
+               rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30;
+               rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130;
+               if (rdev->config.rv770.sx_max_export_pos_size > 16) {
+                       rdev->config.rv770.sx_max_export_pos_size -= 16;
+                       rdev->config.rv770.sx_max_export_smx_size += 16;
+               }
+               break;
+       case CHIP_RV710:
+               rdev->config.rv770.max_pipes = 2;
+               rdev->config.rv770.max_tile_pipes = 2;
+               rdev->config.rv770.max_simds = 2;
+               rdev->config.rv770.max_backends = 1;
+               rdev->config.rv770.max_gprs = 256;
+               rdev->config.rv770.max_threads = 192;
+               rdev->config.rv770.max_stack_entries = 256;
+               rdev->config.rv770.max_hw_contexts = 4;
+               rdev->config.rv770.max_gs_threads = 8 * 2;
+               rdev->config.rv770.sx_max_export_size = 128;
+               rdev->config.rv770.sx_max_export_pos_size = 16;
+               rdev->config.rv770.sx_max_export_smx_size = 112;
+               rdev->config.rv770.sq_num_cf_insts = 1;
+
+               rdev->config.rv770.sx_num_of_sets = 7;
+               rdev->config.rv770.sc_prim_fifo_size = 0x40;
+               rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30;
+               rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130;
+               break;
+       case CHIP_RV740:
+               rdev->config.rv770.max_pipes = 4;
+               rdev->config.rv770.max_tile_pipes = 4;
+               rdev->config.rv770.max_simds = 8;
+               rdev->config.rv770.max_backends = 4;
+               rdev->config.rv770.max_gprs = 256;
+               rdev->config.rv770.max_threads = 248;
+               rdev->config.rv770.max_stack_entries = 512;
+               rdev->config.rv770.max_hw_contexts = 8;
+               rdev->config.rv770.max_gs_threads = 16 * 2;
+               rdev->config.rv770.sx_max_export_size = 256;
+               rdev->config.rv770.sx_max_export_pos_size = 32;
+               rdev->config.rv770.sx_max_export_smx_size = 224;
+               rdev->config.rv770.sq_num_cf_insts = 2;
+
+               rdev->config.rv770.sx_num_of_sets = 7;
+               rdev->config.rv770.sc_prim_fifo_size = 0x100;
+               rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30;
+               rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130;
+
+               if (rdev->config.rv770.sx_max_export_pos_size > 16) {
+                       rdev->config.rv770.sx_max_export_pos_size -= 16;
+                       rdev->config.rv770.sx_max_export_smx_size += 16;
+               }
+               break;
+       default:
+               break;
+       }
+
+       /* Initialize HDP */
+       j = 0;
+       for (i = 0; i < 32; i++) {
+               WREG32((0x2c14 + j), 0x00000000);
+               WREG32((0x2c18 + j), 0x00000000);
+               WREG32((0x2c1c + j), 0x00000000);
+               WREG32((0x2c20 + j), 0x00000000);
+               WREG32((0x2c24 + j), 0x00000000);
+               j += 0x18;
+       }
+
+       WREG32(GRBM_CNTL, GRBM_READ_TIMEOUT(0xff));
+
+       /* setup tiling, simd, pipe config */
+       mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
+
+       switch (rdev->config.rv770.max_tile_pipes) {
+       case 1:
+               gb_tiling_config |= PIPE_TILING(0);
+               break;
+       case 2:
+               gb_tiling_config |= PIPE_TILING(1);
+               break;
+       case 4:
+               gb_tiling_config |= PIPE_TILING(2);
+               break;
+       case 8:
+               gb_tiling_config |= PIPE_TILING(3);
+               break;
+       default:
+               break;
+       }
+
+       if (rdev->family == CHIP_RV770)
+               gb_tiling_config |= BANK_TILING(1);
+       else
+               gb_tiling_config |= BANK_TILING((mc_arb_ramcfg & NOOFBANK_SHIFT) >> NOOFBANK_MASK);
+
+       gb_tiling_config |= GROUP_SIZE(0);
+
+       if (((mc_arb_ramcfg & NOOFROWS_MASK) & NOOFROWS_SHIFT) > 3) {
+               gb_tiling_config |= ROW_TILING(3);
+               gb_tiling_config |= SAMPLE_SPLIT(3);
+       } else {
+               gb_tiling_config |=
+                       ROW_TILING(((mc_arb_ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT));
+               gb_tiling_config |=
+                       SAMPLE_SPLIT(((mc_arb_ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT));
+       }
+
+       gb_tiling_config |= BANK_SWAPS(1);
+
+       backend_map = r700_get_tile_pipe_to_backend_map(rdev->config.rv770.max_tile_pipes,
+                                                       rdev->config.rv770.max_backends,
+                                                       (0xff << rdev->config.rv770.max_backends) & 0xff);
+       gb_tiling_config |= BACKEND_MAP(backend_map);
+
+       cc_gc_shader_pipe_config =
+               INACTIVE_QD_PIPES((R7XX_MAX_PIPES_MASK << rdev->config.rv770.max_pipes) & R7XX_MAX_PIPES_MASK);
+       cc_gc_shader_pipe_config |=
+               INACTIVE_SIMDS((R7XX_MAX_SIMDS_MASK << rdev->config.rv770.max_simds) & R7XX_MAX_SIMDS_MASK);
+
+       cc_rb_backend_disable =
+               BACKEND_DISABLE((R7XX_MAX_BACKENDS_MASK << rdev->config.rv770.max_backends) & R7XX_MAX_BACKENDS_MASK);
+
+       WREG32(GB_TILING_CONFIG, gb_tiling_config);
+       WREG32(DCP_TILING_CONFIG, (gb_tiling_config & 0xffff));
+       WREG32(HDP_TILING_CONFIG, (gb_tiling_config & 0xffff));
+
+       WREG32(CC_RB_BACKEND_DISABLE,      cc_rb_backend_disable);
+       WREG32(CC_GC_SHADER_PIPE_CONFIG,   cc_gc_shader_pipe_config);
+       WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
+
+       WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
+       WREG32(CGTS_SYS_TCC_DISABLE, 0);
+       WREG32(CGTS_TCC_DISABLE, 0);
+       WREG32(CGTS_USER_SYS_TCC_DISABLE, 0);
+       WREG32(CGTS_USER_TCC_DISABLE, 0);
+
+       num_qd_pipes =
+               R7XX_MAX_BACKENDS - r600_count_pipe_bits(cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK);
+       WREG32(VGT_OUT_DEALLOC_CNTL, (num_qd_pipes * 4) & DEALLOC_DIST_MASK);
+       WREG32(VGT_VERTEX_REUSE_BLOCK_CNTL, ((num_qd_pipes * 4) - 2) & VTX_REUSE_DEPTH_MASK);
+
+       /* set HW defaults for 3D engine */
+       WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) |
+                                               ROQ_IB2_START(0x2b)));
+
+       WREG32(CP_MEQ_THRESHOLDS, STQ_SPLIT(0x30));
+
+       WREG32(TA_CNTL_AUX, (DISABLE_CUBE_ANISO |
+                                       SYNC_GRADIENT |
+                                       SYNC_WALKER |
+                                       SYNC_ALIGNER));
+
+       sx_debug_1 = RREG32(SX_DEBUG_1);
+       sx_debug_1 |= ENABLE_NEW_SMX_ADDRESS;
+       WREG32(SX_DEBUG_1, sx_debug_1);
+
+       smx_dc_ctl0 = RREG32(SMX_DC_CTL0);
+       smx_dc_ctl0 &= ~CACHE_DEPTH(0x1ff);
+       smx_dc_ctl0 |= CACHE_DEPTH((rdev->config.rv770.sx_num_of_sets * 64) - 1);
+       WREG32(SMX_DC_CTL0, smx_dc_ctl0);
+
+       WREG32(SMX_EVENT_CTL, (ES_FLUSH_CTL(4) |
+                                         GS_FLUSH_CTL(4) |
+                                         ACK_FLUSH_CTL(3) |
+                                         SYNC_FLUSH_CTL));
+
+       if (rdev->family == CHIP_RV770)
+               WREG32(DB_DEBUG3, DB_CLK_OFF_DELAY(0x1f));
+       else {
+               db_debug4 = RREG32(DB_DEBUG4);
+               db_debug4 |= DISABLE_TILE_COVERED_FOR_PS_ITER;
+               WREG32(DB_DEBUG4, db_debug4);
+       }
+
+       WREG32(SX_EXPORT_BUFFER_SIZES, (COLOR_BUFFER_SIZE((rdev->config.rv770.sx_max_export_size / 4) - 1) |
+                                                  POSITION_BUFFER_SIZE((rdev->config.rv770.sx_max_export_pos_size / 4) - 1) |
+                                                  SMX_BUFFER_SIZE((rdev->config.rv770.sx_max_export_smx_size / 4) - 1)));
+
+       WREG32(PA_SC_FIFO_SIZE, (SC_PRIM_FIFO_SIZE(rdev->config.rv770.sc_prim_fifo_size) |
+                                                SC_HIZ_TILE_FIFO_SIZE(rdev->config.rv770.sc_hiz_tile_fifo_size) |
+                                                SC_EARLYZ_TILE_FIFO_SIZE(rdev->config.rv770.sc_earlyz_tile_fifo_fize)));
+
+       WREG32(PA_SC_MULTI_CHIP_CNTL, 0);
+
+       WREG32(VGT_NUM_INSTANCES, 1);
+
+       WREG32(SPI_CONFIG_CNTL, GPR_WRITE_PRIORITY(0));
+
+       WREG32(SPI_CONFIG_CNTL_1, VTX_DONE_DELAY(4));
+
+       WREG32(CP_PERFMON_CNTL, 0);
+
+       sq_ms_fifo_sizes = (CACHE_FIFO_SIZE(16 * rdev->config.rv770.sq_num_cf_insts) |
+                           DONE_FIFO_HIWATER(0xe0) |
+                           ALU_UPDATE_FIFO_HIWATER(0x8));
+       switch (rdev->family) {
+       case CHIP_RV770:
+               sq_ms_fifo_sizes |= FETCH_FIFO_HIWATER(0x1);
+               break;
+       case CHIP_RV730:
+       case CHIP_RV710:
+       case CHIP_RV740:
+       default:
+               sq_ms_fifo_sizes |= FETCH_FIFO_HIWATER(0x4);
+               break;
+       }
+       WREG32(SQ_MS_FIFO_SIZES, sq_ms_fifo_sizes);
+
+       /* SQ_CONFIG, SQ_GPR_RESOURCE_MGMT, SQ_THREAD_RESOURCE_MGMT, SQ_STACK_RESOURCE_MGMT
+        * should be adjusted as needed by the 2D/3D drivers.  This just sets default values
+        */
+       sq_config = RREG32(SQ_CONFIG);
+       sq_config &= ~(PS_PRIO(3) |
+                      VS_PRIO(3) |
+                      GS_PRIO(3) |
+                      ES_PRIO(3));
+       sq_config |= (DX9_CONSTS |
+                     VC_ENABLE |
+                     EXPORT_SRC_C |
+                     PS_PRIO(0) |
+                     VS_PRIO(1) |
+                     GS_PRIO(2) |
+                     ES_PRIO(3));
+       if (rdev->family == CHIP_RV710)
+               /* no vertex cache */
+               sq_config &= ~VC_ENABLE;
+
+       WREG32(SQ_CONFIG, sq_config);
+
+       WREG32(SQ_GPR_RESOURCE_MGMT_1,  (NUM_PS_GPRS((rdev->config.rv770.max_gprs * 24)/64) |
+                                        NUM_VS_GPRS((rdev->config.rv770.max_gprs * 24)/64) |
+                                        NUM_CLAUSE_TEMP_GPRS(((rdev->config.rv770.max_gprs * 24)/64)/2)));
+
+       WREG32(SQ_GPR_RESOURCE_MGMT_2,  (NUM_GS_GPRS((rdev->config.rv770.max_gprs * 7)/64) |
+                                        NUM_ES_GPRS((rdev->config.rv770.max_gprs * 7)/64)));
+
+       sq_thread_resource_mgmt = (NUM_PS_THREADS((rdev->config.rv770.max_threads * 4)/8) |
+                                  NUM_VS_THREADS((rdev->config.rv770.max_threads * 2)/8) |
+                                  NUM_ES_THREADS((rdev->config.rv770.max_threads * 1)/8));
+       if (((rdev->config.rv770.max_threads * 1) / 8) > rdev->config.rv770.max_gs_threads)
+               sq_thread_resource_mgmt |= NUM_GS_THREADS(rdev->config.rv770.max_gs_threads);
+       else
+               sq_thread_resource_mgmt |= NUM_GS_THREADS((rdev->config.rv770.max_gs_threads * 1)/8);
+       WREG32(SQ_THREAD_RESOURCE_MGMT, sq_thread_resource_mgmt);
+
+       WREG32(SQ_STACK_RESOURCE_MGMT_1, (NUM_PS_STACK_ENTRIES((rdev->config.rv770.max_stack_entries * 1)/4) |
+                                                    NUM_VS_STACK_ENTRIES((rdev->config.rv770.max_stack_entries * 1)/4)));
+
+       WREG32(SQ_STACK_RESOURCE_MGMT_2, (NUM_GS_STACK_ENTRIES((rdev->config.rv770.max_stack_entries * 1)/4) |
+                                                    NUM_ES_STACK_ENTRIES((rdev->config.rv770.max_stack_entries * 1)/4)));
+
+       sq_dyn_gpr_size_simd_ab_0 = (SIMDA_RING0((rdev->config.rv770.max_gprs * 38)/64) |
+                                    SIMDA_RING1((rdev->config.rv770.max_gprs * 38)/64) |
+                                    SIMDB_RING0((rdev->config.rv770.max_gprs * 38)/64) |
+                                    SIMDB_RING1((rdev->config.rv770.max_gprs * 38)/64));
+
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_0, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_1, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_2, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_3, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_4, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_5, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_6, sq_dyn_gpr_size_simd_ab_0);
+       WREG32(SQ_DYN_GPR_SIZE_SIMD_AB_7, sq_dyn_gpr_size_simd_ab_0);
+
+       WREG32(PA_SC_FORCE_EOV_MAX_CNTS, (FORCE_EOV_MAX_CLK_CNT(4095) |
+                                         FORCE_EOV_MAX_REZ_CNT(255)));
+
+       if (rdev->family == CHIP_RV710)
+               WREG32(VGT_CACHE_INVALIDATION, (CACHE_INVALIDATION(TC_ONLY) |
+                                               AUTO_INVLD_EN(ES_AND_GS_AUTO)));
+       else
+               WREG32(VGT_CACHE_INVALIDATION, (CACHE_INVALIDATION(VC_AND_TC) |
+                                               AUTO_INVLD_EN(ES_AND_GS_AUTO)));
+
+       switch (rdev->family) {
+       case CHIP_RV770:
+       case CHIP_RV730:
+       case CHIP_RV740:
+               gs_prim_buffer_depth = 384;
+               break;
+       case CHIP_RV710:
+               gs_prim_buffer_depth = 128;
+               break;
+       default:
+               break;
+       }
+
+       num_gs_verts_per_thread = rdev->config.rv770.max_pipes * 16;
+       vgt_gs_per_es = gs_prim_buffer_depth + num_gs_verts_per_thread;
+       /* Max value for this is 256 */
+       if (vgt_gs_per_es > 256)
+               vgt_gs_per_es = 256;
+
+       WREG32(VGT_ES_PER_GS, 128);
+       WREG32(VGT_GS_PER_ES, vgt_gs_per_es);
+       WREG32(VGT_GS_PER_VS, 2);
+
+       /* more default values. 2D/3D driver should adjust as needed */
+       WREG32(VGT_GS_VERTEX_REUSE, 16);
+       WREG32(PA_SC_LINE_STIPPLE_STATE, 0);
+       WREG32(VGT_STRMOUT_EN, 0);
+       WREG32(SX_MISC, 0);
+       WREG32(PA_SC_MODE_CNTL, 0);
+       WREG32(PA_SC_EDGERULE, 0xaaaaaaaa);
+       WREG32(PA_SC_AA_CONFIG, 0);
+       WREG32(PA_SC_CLIPRECT_RULE, 0xffff);
+       WREG32(PA_SC_LINE_STIPPLE, 0);
+       WREG32(SPI_INPUT_Z, 0);
+       WREG32(SPI_PS_IN_CONTROL_0, NUM_INTERP(2));
+       WREG32(CB_COLOR7_FRAG, 0);
+
+       /* clear render buffer base addresses */
+       WREG32(CB_COLOR0_BASE, 0);
+       WREG32(CB_COLOR1_BASE, 0);
+       WREG32(CB_COLOR2_BASE, 0);
+       WREG32(CB_COLOR3_BASE, 0);
+       WREG32(CB_COLOR4_BASE, 0);
+       WREG32(CB_COLOR5_BASE, 0);
+       WREG32(CB_COLOR6_BASE, 0);
+       WREG32(CB_COLOR7_BASE, 0);
+
+       WREG32(TCP_CNTL, 0);
+
+       hdp_host_path_cntl = RREG32(HDP_HOST_PATH_CNTL);
+       WREG32(HDP_HOST_PATH_CNTL, hdp_host_path_cntl);
+
+       WREG32(PA_SC_MULTI_CHIP_CNTL, 0);
+
+       WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
+                                         NUM_CLIP_SEQ(3)));
+
 }
 
-void rv770_vram_info(struct radeon_device *rdev)
+int rv770_mc_init(struct radeon_device *rdev)
 {
-       rv770_vram_get_type(rdev);
+       fixed20_12 a;
+       u32 tmp;
+       int r;
 
-       /* FIXME: implement */
+       /* Get VRAM informations */
+       /* FIXME: Don't know how to determine vram width, need to check
+        * vram_width usage
+        */
+       rdev->mc.vram_width = 128;
+       rdev->mc.vram_is_ddr = true;
        /* Could aper size report 0 ? */
        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+       /* Setup GPU memory space */
+       rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
+       rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
+       if (rdev->flags & RADEON_IS_AGP) {
+               r = radeon_agp_init(rdev);
+               if (r)
+                       return r;
+               /* gtt_size is setup by radeon_agp_init */
+               rdev->mc.gtt_location = rdev->mc.agp_base;
+               tmp = 0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size;
+               /* Try to put vram before or after AGP because we
+                * we want SYSTEM_APERTURE to cover both VRAM and
+                * AGP so that GPU can catch out of VRAM/AGP access
+                */
+               if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) {
+                       /* Enought place before */
+                       rdev->mc.vram_location = rdev->mc.gtt_location -
+                                                       rdev->mc.mc_vram_size;
+               } else if (tmp > rdev->mc.mc_vram_size) {
+                       /* Enought place after */
+                       rdev->mc.vram_location = rdev->mc.gtt_location +
+                                                       rdev->mc.gtt_size;
+               } else {
+                       /* Try to setup VRAM then AGP might not
+                        * not work on some card
+                        */
+                       rdev->mc.vram_location = 0x00000000UL;
+                       rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+               }
+       } else {
+               rdev->mc.vram_location = 0x00000000UL;
+               rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+               rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+       }
+       rdev->mc.vram_start = rdev->mc.vram_location;
+       rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size;
+       rdev->mc.gtt_start = rdev->mc.gtt_location;
+       rdev->mc.gtt_end = rdev->mc.gtt_location + rdev->mc.gtt_size;
+       /* FIXME: we should enforce default clock in case GPU is not in
+        * default setup
+        */
+       a.full = rfixed_const(100);
+       rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
+       rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
+       return 0;
+}
+int rv770_gpu_reset(struct radeon_device *rdev)
+{
+       /* FIXME: implement any rv770 specific bits */
+       return r600_gpu_reset(rdev);
+}
+
+static int rv770_startup(struct radeon_device *rdev)
+{
+       int r;
+
+       radeon_gpu_reset(rdev);
+       rv770_mc_resume(rdev);
+       r = rv770_pcie_gart_enable(rdev);
+       if (r)
+               return r;
+       rv770_gpu_init(rdev);
+
+       r = radeon_object_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
+                             &rdev->r600_blit.shader_gpu_addr);
+       if (r) {
+               DRM_ERROR("failed to pin blit object %d\n", r);
+               return r;
+       }
+
+       r = radeon_ring_init(rdev, rdev->cp.ring_size);
+       if (r)
+               return r;
+       r = rv770_cp_load_microcode(rdev);
+       if (r)
+               return r;
+       r = r600_cp_resume(rdev);
+       if (r)
+               return r;
+       r = r600_wb_init(rdev);
+       if (r)
+               return r;
+       return 0;
+}
+
+int rv770_resume(struct radeon_device *rdev)
+{
+       int r;
+
+       if (radeon_gpu_reset(rdev)) {
+               /* FIXME: what do we want to do here ? */
+       }
+       /* post card */
+       if (rdev->is_atom_bios) {
+               atom_asic_init(rdev->mode_info.atom_context);
+       } else {
+               radeon_combios_asic_init(rdev->ddev);
+       }
+       /* Initialize clocks */
+       r = radeon_clocks_init(rdev);
+       if (r) {
+               return r;
+       }
+
+       r = rv770_startup(rdev);
+       if (r) {
+               DRM_ERROR("r600 startup failed on resume\n");
+               return r;
+       }
+
+       r = radeon_ib_test(rdev);
+       if (r) {
+               DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+               return r;
+       }
+       return r;
+
+}
+
+int rv770_suspend(struct radeon_device *rdev)
+{
+       /* FIXME: we should wait for ring to be empty */
+       r700_cp_stop(rdev);
+       rdev->cp.ready = false;
+       rv770_pcie_gart_disable(rdev);
+
+       /* unpin shaders bo */
+        radeon_object_unpin(rdev->r600_blit.shader_obj);
+       return 0;
+}
+
+/* Plan is to move initialization in that function and use
+ * helper function so that radeon_device_init pretty much
+ * do nothing more than calling asic specific function. This
+ * should also allow to remove a bunch of callback function
+ * like vram_info.
+ */
+int rv770_init(struct radeon_device *rdev)
+{
+       int r;
+
+       rdev->new_init_path = true;
+       r = radeon_dummy_page_init(rdev);
+       if (r)
+               return r;
+       /* This don't do much */
+       r = radeon_gem_init(rdev);
+       if (r)
+               return r;
+       /* Read BIOS */
+       if (!radeon_get_bios(rdev)) {
+               if (ASIC_IS_AVIVO(rdev))
+                       return -EINVAL;
+       }
+       /* Must be an ATOMBIOS */
+       if (!rdev->is_atom_bios)
+               return -EINVAL;
+       r = radeon_atombios_init(rdev);
+       if (r)
+               return r;
+       /* Post card if necessary */
+       if (!r600_card_posted(rdev) && rdev->bios) {
+               DRM_INFO("GPU not posted. posting now...\n");
+               atom_asic_init(rdev->mode_info.atom_context);
+       }
+       /* Initialize scratch registers */
+       r600_scratch_init(rdev);
+       /* Initialize surface registers */
+       radeon_surface_init(rdev);
+       radeon_get_clock_info(rdev->ddev);
+       r = radeon_clocks_init(rdev);
+       if (r)
+               return r;
+       /* Fence driver */
+       r = radeon_fence_driver_init(rdev);
+       if (r)
+               return r;
+       r = rv770_mc_init(rdev);
+       if (r) {
+               if (rdev->flags & RADEON_IS_AGP) {
+                       /* Retry with disabling AGP */
+                       rv770_fini(rdev);
+                       rdev->flags &= ~RADEON_IS_AGP;
+                       return rv770_init(rdev);
+               }
+               return r;
+       }
+       /* Memory manager */
+       r = radeon_object_init(rdev);
+       if (r)
+               return r;
+       rdev->cp.ring_obj = NULL;
+       r600_ring_init(rdev, 1024 * 1024);
+
+       if (!rdev->me_fw || !rdev->pfp_fw) {
+               r = r600_cp_init_microcode(rdev);
+               if (r) {
+                       DRM_ERROR("Failed to load firmware!\n");
+                       return r;
+               }
+       }
+
+       r = r600_pcie_gart_init(rdev);
+       if (r)
+               return r;
+
+       rdev->accel_working = true;
+       r = r600_blit_init(rdev);
+       if (r) {
+               DRM_ERROR("radeon: failled blitter (%d).\n", r);
+               rdev->accel_working = false;
+       }
+
+       r = rv770_startup(rdev);
+       if (r) {
+               if (rdev->flags & RADEON_IS_AGP) {
+                       /* Retry with disabling AGP */
+                       rv770_fini(rdev);
+                       rdev->flags &= ~RADEON_IS_AGP;
+                       return rv770_init(rdev);
+               }
+               rdev->accel_working = false;
+       }
+       if (rdev->accel_working) {
+               r = radeon_ib_pool_init(rdev);
+               if (r) {
+                       DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
+                       rdev->accel_working = false;
+               }
+               r = radeon_ib_test(rdev);
+               if (r) {
+                       DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+                       rdev->accel_working = false;
+               }
+       }
+       return 0;
+}
+
+void rv770_fini(struct radeon_device *rdev)
+{
+       rv770_suspend(rdev);
+
+       r600_blit_fini(rdev);
+       radeon_ring_fini(rdev);
+       rv770_pcie_gart_fini(rdev);
+       radeon_gem_fini(rdev);
+       radeon_fence_driver_fini(rdev);
+       radeon_clocks_fini(rdev);
+#if __OS_HAS_AGP
+       if (rdev->flags & RADEON_IS_AGP)
+               radeon_agp_fini(rdev);
+#endif
+       radeon_object_fini(rdev);
+       if (rdev->is_atom_bios) {
+               radeon_atombios_fini(rdev);
+       } else {
+               radeon_combios_fini(rdev);
+       }
+       kfree(rdev->bios);
+       rdev->bios = NULL;
+       radeon_dummy_page_fini(rdev);
 }
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
new file mode 100644 (file)
index 0000000..4b9c3d6
--- /dev/null
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef RV770_H
+#define RV770_H
+
+#define R7XX_MAX_SH_GPRS           256
+#define R7XX_MAX_TEMP_GPRS         16
+#define R7XX_MAX_SH_THREADS        256
+#define R7XX_MAX_SH_STACK_ENTRIES  4096
+#define R7XX_MAX_BACKENDS          8
+#define R7XX_MAX_BACKENDS_MASK     0xff
+#define R7XX_MAX_SIMDS             16
+#define R7XX_MAX_SIMDS_MASK        0xffff
+#define R7XX_MAX_PIPES             8
+#define R7XX_MAX_PIPES_MASK        0xff
+
+/* Registers */
+#define        CB_COLOR0_BASE                                  0x28040
+#define        CB_COLOR1_BASE                                  0x28044
+#define        CB_COLOR2_BASE                                  0x28048
+#define        CB_COLOR3_BASE                                  0x2804C
+#define        CB_COLOR4_BASE                                  0x28050
+#define        CB_COLOR5_BASE                                  0x28054
+#define        CB_COLOR6_BASE                                  0x28058
+#define        CB_COLOR7_BASE                                  0x2805C
+#define        CB_COLOR7_FRAG                                  0x280FC
+
+#define        CC_GC_SHADER_PIPE_CONFIG                        0x8950
+#define        CC_RB_BACKEND_DISABLE                           0x98F4
+#define                BACKEND_DISABLE(x)                              ((x) << 16)
+#define        CC_SYS_RB_BACKEND_DISABLE                       0x3F88
+
+#define        CGTS_SYS_TCC_DISABLE                            0x3F90
+#define        CGTS_TCC_DISABLE                                0x9148
+#define        CGTS_USER_SYS_TCC_DISABLE                       0x3F94
+#define        CGTS_USER_TCC_DISABLE                           0x914C
+
+#define        CONFIG_MEMSIZE                                  0x5428
+
+#define        CP_ME_CNTL                                      0x86D8
+#define                CP_ME_HALT                                      (1<<28)
+#define                CP_PFP_HALT                                     (1<<26)
+#define        CP_ME_RAM_DATA                                  0xC160
+#define        CP_ME_RAM_RADDR                                 0xC158
+#define        CP_ME_RAM_WADDR                                 0xC15C
+#define CP_MEQ_THRESHOLDS                              0x8764
+#define                STQ_SPLIT(x)                                    ((x) << 0)
+#define        CP_PERFMON_CNTL                                 0x87FC
+#define        CP_PFP_UCODE_ADDR                               0xC150
+#define        CP_PFP_UCODE_DATA                               0xC154
+#define        CP_QUEUE_THRESHOLDS                             0x8760
+#define                ROQ_IB1_START(x)                                ((x) << 0)
+#define                ROQ_IB2_START(x)                                ((x) << 8)
+#define        CP_RB_CNTL                                      0xC104
+#define                RB_BUFSZ(x)                                     ((x)<<0)
+#define                RB_BLKSZ(x)                                     ((x)<<8)
+#define                RB_NO_UPDATE                                    (1<<27)
+#define                RB_RPTR_WR_ENA                                  (1<<31)
+#define                BUF_SWAP_32BIT                                  (2 << 16)
+#define        CP_RB_RPTR                                      0x8700
+#define        CP_RB_RPTR_ADDR                                 0xC10C
+#define        CP_RB_RPTR_ADDR_HI                              0xC110
+#define        CP_RB_RPTR_WR                                   0xC108
+#define        CP_RB_WPTR                                      0xC114
+#define        CP_RB_WPTR_ADDR                                 0xC118
+#define        CP_RB_WPTR_ADDR_HI                              0xC11C
+#define        CP_RB_WPTR_DELAY                                0x8704
+#define        CP_SEM_WAIT_TIMER                               0x85BC
+
+#define        DB_DEBUG3                                       0x98B0
+#define                DB_CLK_OFF_DELAY(x)                             ((x) << 11)
+#define DB_DEBUG4                                      0x9B8C
+#define                DISABLE_TILE_COVERED_FOR_PS_ITER                (1 << 6)
+
+#define        DCP_TILING_CONFIG                               0x6CA0
+#define                PIPE_TILING(x)                                  ((x) << 1)
+#define        BANK_TILING(x)                                  ((x) << 4)
+#define                GROUP_SIZE(x)                                   ((x) << 6)
+#define                ROW_TILING(x)                                   ((x) << 8)
+#define                BANK_SWAPS(x)                                   ((x) << 11)
+#define                SAMPLE_SPLIT(x)                                 ((x) << 14)
+#define                BACKEND_MAP(x)                                  ((x) << 16)
+
+#define GB_TILING_CONFIG                               0x98F0
+
+#define        GC_USER_SHADER_PIPE_CONFIG                      0x8954
+#define                INACTIVE_QD_PIPES(x)                            ((x) << 8)
+#define                INACTIVE_QD_PIPES_MASK                          0x0000FF00
+#define                INACTIVE_SIMDS(x)                               ((x) << 16)
+#define                INACTIVE_SIMDS_MASK                             0x00FF0000
+
+#define        GRBM_CNTL                                       0x8000
+#define                GRBM_READ_TIMEOUT(x)                            ((x) << 0)
+#define        GRBM_SOFT_RESET                                 0x8020
+#define                SOFT_RESET_CP                                   (1<<0)
+#define        GRBM_STATUS                                     0x8010
+#define                CMDFIFO_AVAIL_MASK                              0x0000000F
+#define                GUI_ACTIVE                                      (1<<31)
+#define        GRBM_STATUS2                                    0x8014
+
+#define        HDP_HOST_PATH_CNTL                              0x2C00
+#define        HDP_NONSURFACE_BASE                             0x2C04
+#define        HDP_NONSURFACE_INFO                             0x2C08
+#define        HDP_NONSURFACE_SIZE                             0x2C0C
+#define HDP_REG_COHERENCY_FLUSH_CNTL                   0x54A0
+#define        HDP_TILING_CONFIG                               0x2F3C
+
+#define        MC_ARB_RAMCFG                                   0x2760
+#define                NOOFBANK_SHIFT                                  0
+#define                NOOFBANK_MASK                                   0x00000003
+#define                NOOFRANK_SHIFT                                  2
+#define                NOOFRANK_MASK                                   0x00000004
+#define                NOOFROWS_SHIFT                                  3
+#define                NOOFROWS_MASK                                   0x00000038
+#define                NOOFCOLS_SHIFT                                  6
+#define                NOOFCOLS_MASK                                   0x000000C0
+#define                CHANSIZE_SHIFT                                  8
+#define                CHANSIZE_MASK                                   0x00000100
+#define                BURSTLENGTH_SHIFT                               9
+#define                BURSTLENGTH_MASK                                0x00000200
+#define        MC_VM_AGP_TOP                                   0x2028
+#define        MC_VM_AGP_BOT                                   0x202C
+#define        MC_VM_AGP_BASE                                  0x2030
+#define        MC_VM_FB_LOCATION                               0x2024
+#define        MC_VM_MB_L1_TLB0_CNTL                           0x2234
+#define        MC_VM_MB_L1_TLB1_CNTL                           0x2238
+#define        MC_VM_MB_L1_TLB2_CNTL                           0x223C
+#define        MC_VM_MB_L1_TLB3_CNTL                           0x2240
+#define                ENABLE_L1_TLB                                   (1 << 0)
+#define                ENABLE_L1_FRAGMENT_PROCESSING                   (1 << 1)
+#define                SYSTEM_ACCESS_MODE_PA_ONLY                      (0 << 3)
+#define                SYSTEM_ACCESS_MODE_USE_SYS_MAP                  (1 << 3)
+#define                SYSTEM_ACCESS_MODE_IN_SYS                       (2 << 3)
+#define                SYSTEM_ACCESS_MODE_NOT_IN_SYS                   (3 << 3)
+#define                SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU       (0 << 5)
+#define                EFFECTIVE_L1_TLB_SIZE(x)                        ((x)<<15)
+#define                EFFECTIVE_L1_QUEUE_SIZE(x)                      ((x)<<18)
+#define        MC_VM_MD_L1_TLB0_CNTL                           0x2654
+#define        MC_VM_MD_L1_TLB1_CNTL                           0x2658
+#define        MC_VM_MD_L1_TLB2_CNTL                           0x265C
+#define        MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR              0x203C
+#define        MC_VM_SYSTEM_APERTURE_HIGH_ADDR                 0x2038
+#define        MC_VM_SYSTEM_APERTURE_LOW_ADDR                  0x2034
+
+#define        PA_CL_ENHANCE                                   0x8A14
+#define                CLIP_VTX_REORDER_ENA                            (1 << 0)
+#define                NUM_CLIP_SEQ(x)                                 ((x) << 1)
+#define PA_SC_AA_CONFIG                                        0x28C04
+#define PA_SC_CLIPRECT_RULE                            0x2820C
+#define        PA_SC_EDGERULE                                  0x28230
+#define        PA_SC_FIFO_SIZE                                 0x8BCC
+#define                SC_PRIM_FIFO_SIZE(x)                            ((x) << 0)
+#define                SC_HIZ_TILE_FIFO_SIZE(x)                        ((x) << 12)
+#define        PA_SC_FORCE_EOV_MAX_CNTS                        0x8B24
+#define                FORCE_EOV_MAX_CLK_CNT(x)                        ((x)<<0)
+#define                FORCE_EOV_MAX_REZ_CNT(x)                        ((x)<<16)
+#define PA_SC_LINE_STIPPLE                             0x28A0C
+#define        PA_SC_LINE_STIPPLE_STATE                        0x8B10
+#define PA_SC_MODE_CNTL                                        0x28A4C
+#define        PA_SC_MULTI_CHIP_CNTL                           0x8B20
+#define                SC_EARLYZ_TILE_FIFO_SIZE(x)                     ((x) << 20)
+
+#define        SCRATCH_REG0                                    0x8500
+#define        SCRATCH_REG1                                    0x8504
+#define        SCRATCH_REG2                                    0x8508
+#define        SCRATCH_REG3                                    0x850C
+#define        SCRATCH_REG4                                    0x8510
+#define        SCRATCH_REG5                                    0x8514
+#define        SCRATCH_REG6                                    0x8518
+#define        SCRATCH_REG7                                    0x851C
+#define        SCRATCH_UMSK                                    0x8540
+#define        SCRATCH_ADDR                                    0x8544
+
+#define        SMX_DC_CTL0                                     0xA020
+#define                USE_HASH_FUNCTION                               (1 << 0)
+#define                CACHE_DEPTH(x)                                  ((x) << 1)
+#define                FLUSH_ALL_ON_EVENT                              (1 << 10)
+#define                STALL_ON_EVENT                                  (1 << 11)
+#define        SMX_EVENT_CTL                                   0xA02C
+#define                ES_FLUSH_CTL(x)                                 ((x) << 0)
+#define                GS_FLUSH_CTL(x)                                 ((x) << 3)
+#define                ACK_FLUSH_CTL(x)                                ((x) << 6)
+#define                SYNC_FLUSH_CTL                                  (1 << 8)
+
+#define        SPI_CONFIG_CNTL                                 0x9100
+#define                GPR_WRITE_PRIORITY(x)                           ((x) << 0)
+#define                DISABLE_INTERP_1                                (1 << 5)
+#define        SPI_CONFIG_CNTL_1                               0x913C
+#define                VTX_DONE_DELAY(x)                               ((x) << 0)
+#define                INTERP_ONE_PRIM_PER_ROW                         (1 << 4)
+#define        SPI_INPUT_Z                                     0x286D8
+#define        SPI_PS_IN_CONTROL_0                             0x286CC
+#define                NUM_INTERP(x)                                   ((x)<<0)
+#define                POSITION_ENA                                    (1<<8)
+#define                POSITION_CENTROID                               (1<<9)
+#define                POSITION_ADDR(x)                                ((x)<<10)
+#define                PARAM_GEN(x)                                    ((x)<<15)
+#define                PARAM_GEN_ADDR(x)                               ((x)<<19)
+#define                BARYC_SAMPLE_CNTL(x)                            ((x)<<26)
+#define                PERSP_GRADIENT_ENA                              (1<<28)
+#define                LINEAR_GRADIENT_ENA                             (1<<29)
+#define                POSITION_SAMPLE                                 (1<<30)
+#define                BARYC_AT_SAMPLE_ENA                             (1<<31)
+
+#define        SQ_CONFIG                                       0x8C00
+#define                VC_ENABLE                                       (1 << 0)
+#define                EXPORT_SRC_C                                    (1 << 1)
+#define                DX9_CONSTS                                      (1 << 2)
+#define                ALU_INST_PREFER_VECTOR                          (1 << 3)
+#define                DX10_CLAMP                                      (1 << 4)
+#define                CLAUSE_SEQ_PRIO(x)                              ((x) << 8)
+#define                PS_PRIO(x)                                      ((x) << 24)
+#define                VS_PRIO(x)                                      ((x) << 26)
+#define                GS_PRIO(x)                                      ((x) << 28)
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_0                       0x8DB0
+#define                SIMDA_RING0(x)                                  ((x)<<0)
+#define                SIMDA_RING1(x)                                  ((x)<<8)
+#define                SIMDB_RING0(x)                                  ((x)<<16)
+#define                SIMDB_RING1(x)                                  ((x)<<24)
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_1                       0x8DB4
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_2                       0x8DB8
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_3                       0x8DBC
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_4                       0x8DC0
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_5                       0x8DC4
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_6                       0x8DC8
+#define        SQ_DYN_GPR_SIZE_SIMD_AB_7                       0x8DCC
+#define                ES_PRIO(x)                                      ((x) << 30)
+#define        SQ_GPR_RESOURCE_MGMT_1                          0x8C04
+#define                NUM_PS_GPRS(x)                                  ((x) << 0)
+#define                NUM_VS_GPRS(x)                                  ((x) << 16)
+#define                DYN_GPR_ENABLE                                  (1 << 27)
+#define                NUM_CLAUSE_TEMP_GPRS(x)                         ((x) << 28)
+#define        SQ_GPR_RESOURCE_MGMT_2                          0x8C08
+#define                NUM_GS_GPRS(x)                                  ((x) << 0)
+#define                NUM_ES_GPRS(x)                                  ((x) << 16)
+#define        SQ_MS_FIFO_SIZES                                0x8CF0
+#define                CACHE_FIFO_SIZE(x)                              ((x) << 0)
+#define                FETCH_FIFO_HIWATER(x)                           ((x) << 8)
+#define                DONE_FIFO_HIWATER(x)                            ((x) << 16)
+#define                ALU_UPDATE_FIFO_HIWATER(x)                      ((x) << 24)
+#define        SQ_STACK_RESOURCE_MGMT_1                        0x8C10
+#define                NUM_PS_STACK_ENTRIES(x)                         ((x) << 0)
+#define                NUM_VS_STACK_ENTRIES(x)                         ((x) << 16)
+#define        SQ_STACK_RESOURCE_MGMT_2                        0x8C14
+#define                NUM_GS_STACK_ENTRIES(x)                         ((x) << 0)
+#define                NUM_ES_STACK_ENTRIES(x)                         ((x) << 16)
+#define        SQ_THREAD_RESOURCE_MGMT                         0x8C0C
+#define                NUM_PS_THREADS(x)                               ((x) << 0)
+#define                NUM_VS_THREADS(x)                               ((x) << 8)
+#define                NUM_GS_THREADS(x)                               ((x) << 16)
+#define                NUM_ES_THREADS(x)                               ((x) << 24)
+
+#define        SX_DEBUG_1                                      0x9058
+#define                ENABLE_NEW_SMX_ADDRESS                          (1 << 16)
+#define        SX_EXPORT_BUFFER_SIZES                          0x900C
+#define                COLOR_BUFFER_SIZE(x)                            ((x) << 0)
+#define                POSITION_BUFFER_SIZE(x)                         ((x) << 8)
+#define                SMX_BUFFER_SIZE(x)                              ((x) << 16)
+#define        SX_MISC                                         0x28350
+
+#define        TA_CNTL_AUX                                     0x9508
+#define                DISABLE_CUBE_WRAP                               (1 << 0)
+#define                DISABLE_CUBE_ANISO                              (1 << 1)
+#define                SYNC_GRADIENT                                   (1 << 24)
+#define                SYNC_WALKER                                     (1 << 25)
+#define                SYNC_ALIGNER                                    (1 << 26)
+#define                BILINEAR_PRECISION_6_BIT                        (0 << 31)
+#define                BILINEAR_PRECISION_8_BIT                        (1 << 31)
+
+#define        TCP_CNTL                                        0x9610
+
+#define        VGT_CACHE_INVALIDATION                          0x88C4
+#define                CACHE_INVALIDATION(x)                           ((x)<<0)
+#define                        VC_ONLY                                         0
+#define                        TC_ONLY                                         1
+#define                        VC_AND_TC                                       2
+#define                AUTO_INVLD_EN(x)                                ((x) << 6)
+#define                        NO_AUTO                                         0
+#define                        ES_AUTO                                         1
+#define                        GS_AUTO                                         2
+#define                        ES_AND_GS_AUTO                                  3
+#define        VGT_ES_PER_GS                                   0x88CC
+#define        VGT_GS_PER_ES                                   0x88C8
+#define        VGT_GS_PER_VS                                   0x88E8
+#define        VGT_GS_VERTEX_REUSE                             0x88D4
+#define        VGT_NUM_INSTANCES                               0x8974
+#define        VGT_OUT_DEALLOC_CNTL                            0x28C5C
+#define                DEALLOC_DIST_MASK                               0x0000007F
+#define        VGT_STRMOUT_EN                                  0x28AB0
+#define        VGT_VERTEX_REUSE_BLOCK_CNTL                     0x28C58
+#define                VTX_REUSE_DEPTH_MASK                            0x000000FF
+
+#define VM_CONTEXT0_CNTL                               0x1410
+#define                ENABLE_CONTEXT                                  (1 << 0)
+#define                PAGE_TABLE_DEPTH(x)                             (((x) & 3) << 1)
+#define                RANGE_PROTECTION_FAULT_ENABLE_DEFAULT           (1 << 4)
+#define        VM_CONTEXT0_PAGE_TABLE_BASE_ADDR                0x153C
+#define        VM_CONTEXT0_PAGE_TABLE_END_ADDR                 0x157C
+#define        VM_CONTEXT0_PAGE_TABLE_START_ADDR               0x155C
+#define VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR      0x1518
+#define VM_L2_CNTL                                     0x1400
+#define                ENABLE_L2_CACHE                                 (1 << 0)
+#define                ENABLE_L2_FRAGMENT_PROCESSING                   (1 << 1)
+#define                ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE         (1 << 9)
+#define                EFFECTIVE_L2_QUEUE_SIZE(x)                      (((x) & 7) << 14)
+#define VM_L2_CNTL2                                    0x1404
+#define                INVALIDATE_ALL_L1_TLBS                          (1 << 0)
+#define                INVALIDATE_L2_CACHE                             (1 << 1)
+#define VM_L2_CNTL3                                    0x1408
+#define                BANK_SELECT(x)                                  ((x) << 0)
+#define                CACHE_UPDATE_MODE(x)                            ((x) << 6)
+#define        VM_L2_STATUS                                    0x140C
+#define                L2_BUSY                                         (1 << 0)
+
+#define        WAIT_UNTIL                                      0x8040
+
+#endif
index c2b0d71..87c0625 100644 (file)
 
 static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
 static int ttm_bo_swapout(struct ttm_mem_shrink *shrink);
+static void ttm_bo_global_kobj_release(struct kobject *kobj);
+
+static struct attribute ttm_bo_count = {
+       .name = "bo_count",
+       .mode = S_IRUGO
+};
+
+static ssize_t ttm_bo_global_show(struct kobject *kobj,
+                                 struct attribute *attr,
+                                 char *buffer)
+{
+       struct ttm_bo_global *glob =
+               container_of(kobj, struct ttm_bo_global, kobj);
+
+       return snprintf(buffer, PAGE_SIZE, "%lu\n",
+                       (unsigned long) atomic_read(&glob->bo_count));
+}
+
+static struct attribute *ttm_bo_global_attrs[] = {
+       &ttm_bo_count,
+       NULL
+};
+
+static struct sysfs_ops ttm_bo_global_ops = {
+       .show = &ttm_bo_global_show
+};
+
+static struct kobj_type ttm_bo_glob_kobj_type  = {
+       .release = &ttm_bo_global_kobj_release,
+       .sysfs_ops = &ttm_bo_global_ops,
+       .default_attrs = ttm_bo_global_attrs
+};
+
 
 static inline uint32_t ttm_bo_type_flags(unsigned type)
 {
@@ -66,10 +99,11 @@ static void ttm_bo_release_list(struct kref *list_kref)
 
        if (bo->ttm)
                ttm_tt_destroy(bo->ttm);
+       atomic_dec(&bo->glob->bo_count);
        if (bo->destroy)
                bo->destroy(bo);
        else {
-               ttm_mem_global_free(bdev->mem_glob, bo->acc_size, false);
+               ttm_mem_global_free(bdev->glob->mem_glob, bo->acc_size);
                kfree(bo);
        }
 }
@@ -106,7 +140,7 @@ static void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
                kref_get(&bo->list_kref);
 
                if (bo->ttm != NULL) {
-                       list_add_tail(&bo->swap, &bdev->swap_lru);
+                       list_add_tail(&bo->swap, &bo->glob->swap_lru);
                        kref_get(&bo->list_kref);
                }
        }
@@ -141,7 +175,7 @@ int ttm_bo_reserve_locked(struct ttm_buffer_object *bo,
                          bool interruptible,
                          bool no_wait, bool use_sequence, uint32_t sequence)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        int ret;
 
        while (unlikely(atomic_cmpxchg(&bo->reserved, 0, 1) != 0)) {
@@ -153,9 +187,9 @@ int ttm_bo_reserve_locked(struct ttm_buffer_object *bo,
                if (no_wait)
                        return -EBUSY;
 
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                ret = ttm_bo_wait_unreserved(bo, interruptible);
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
 
                if (unlikely(ret))
                        return ret;
@@ -181,16 +215,16 @@ int ttm_bo_reserve(struct ttm_buffer_object *bo,
                   bool interruptible,
                   bool no_wait, bool use_sequence, uint32_t sequence)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        int put_count = 0;
        int ret;
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        ret = ttm_bo_reserve_locked(bo, interruptible, no_wait, use_sequence,
                                    sequence);
        if (likely(ret == 0))
                put_count = ttm_bo_del_from_lru(bo);
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 
        while (put_count--)
                kref_put(&bo->list_kref, ttm_bo_ref_bug);
@@ -200,13 +234,13 @@ int ttm_bo_reserve(struct ttm_buffer_object *bo,
 
 void ttm_bo_unreserve(struct ttm_buffer_object *bo)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        ttm_bo_add_to_lru(bo);
        atomic_set(&bo->reserved, 0);
        wake_up_all(&bo->event_queue);
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 }
 EXPORT_SYMBOL(ttm_bo_unreserve);
 
@@ -217,6 +251,7 @@ EXPORT_SYMBOL(ttm_bo_unreserve);
 static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
 {
        struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        int ret = 0;
        uint32_t page_flags = 0;
 
@@ -232,14 +267,14 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
                        page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC;
        case ttm_bo_type_kernel:
                bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT,
-                                       page_flags, bdev->dummy_read_page);
+                                       page_flags, glob->dummy_read_page);
                if (unlikely(bo->ttm == NULL))
                        ret = -ENOMEM;
                break;
        case ttm_bo_type_user:
                bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT,
                                        page_flags | TTM_PAGE_FLAG_USER,
-                                       bdev->dummy_read_page);
+                                       glob->dummy_read_page);
                if (unlikely(bo->ttm == NULL))
                        ret = -ENOMEM;
                break;
@@ -360,6 +395,7 @@ out_err:
 static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
 {
        struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        struct ttm_bo_driver *driver = bdev->driver;
        int ret;
 
@@ -371,7 +407,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
 
                spin_unlock(&bo->lock);
 
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
                ret = ttm_bo_reserve_locked(bo, false, false, false, 0);
                BUG_ON(ret);
                if (bo->ttm)
@@ -386,7 +422,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
                        bo->mem.mm_node = NULL;
                }
                put_count = ttm_bo_del_from_lru(bo);
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
 
                atomic_set(&bo->reserved, 0);
 
@@ -396,14 +432,14 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
                return 0;
        }
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        if (list_empty(&bo->ddestroy)) {
                void *sync_obj = bo->sync_obj;
                void *sync_obj_arg = bo->sync_obj_arg;
 
                kref_get(&bo->list_kref);
                list_add_tail(&bo->ddestroy, &bdev->ddestroy);
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                spin_unlock(&bo->lock);
 
                if (sync_obj)
@@ -413,7 +449,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
                ret = 0;
 
        } else {
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                spin_unlock(&bo->lock);
                ret = -EBUSY;
        }
@@ -428,11 +464,12 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
 
 static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
 {
+       struct ttm_bo_global *glob = bdev->glob;
        struct ttm_buffer_object *entry, *nentry;
        struct list_head *list, *next;
        int ret;
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        list_for_each_safe(list, next, &bdev->ddestroy) {
                entry = list_entry(list, struct ttm_buffer_object, ddestroy);
                nentry = NULL;
@@ -449,16 +486,16 @@ static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
                }
                kref_get(&entry->list_kref);
 
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                ret = ttm_bo_cleanup_refs(entry, remove_all);
                kref_put(&entry->list_kref, ttm_bo_release_list);
 
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
                if (nentry) {
                        bool next_onlist = !list_empty(next);
-                       spin_unlock(&bdev->lru_lock);
+                       spin_unlock(&glob->lru_lock);
                        kref_put(&nentry->list_kref, ttm_bo_release_list);
-                       spin_lock(&bdev->lru_lock);
+                       spin_lock(&glob->lru_lock);
                        /*
                         * Someone might have raced us and removed the
                         * next entry from the list. We don't bother restarting
@@ -472,7 +509,7 @@ static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
                        break;
        }
        ret = !list_empty(&bdev->ddestroy);
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 
        return ret;
 }
@@ -522,6 +559,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, unsigned mem_type,
 {
        int ret = 0;
        struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        struct ttm_mem_reg evict_mem;
        uint32_t proposed_placement;
 
@@ -570,12 +608,12 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, unsigned mem_type,
                goto out;
        }
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        if (evict_mem.mm_node) {
                drm_mm_put_block(evict_mem.mm_node);
                evict_mem.mm_node = NULL;
        }
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
        bo->evicted = true;
 out:
        return ret;
@@ -590,6 +628,7 @@ static int ttm_bo_mem_force_space(struct ttm_bo_device *bdev,
                                  uint32_t mem_type,
                                  bool interruptible, bool no_wait)
 {
+       struct ttm_bo_global *glob = bdev->glob;
        struct drm_mm_node *node;
        struct ttm_buffer_object *entry;
        struct ttm_mem_type_manager *man = &bdev->man[mem_type];
@@ -603,7 +642,7 @@ retry_pre_get:
        if (unlikely(ret != 0))
                return ret;
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        do {
                node = drm_mm_search_free(&man->manager, num_pages,
                                          mem->page_alignment, 1);
@@ -624,7 +663,7 @@ retry_pre_get:
                if (likely(ret == 0))
                        put_count = ttm_bo_del_from_lru(entry);
 
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
 
                if (unlikely(ret != 0))
                        return ret;
@@ -640,21 +679,21 @@ retry_pre_get:
                if (ret)
                        return ret;
 
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
        } while (1);
 
        if (!node) {
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                return -ENOMEM;
        }
 
        node = drm_mm_get_block_atomic(node, num_pages, mem->page_alignment);
        if (unlikely(!node)) {
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                goto retry_pre_get;
        }
 
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
        mem->mm_node = node;
        mem->mem_type = mem_type;
        return 0;
@@ -723,6 +762,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                     bool interruptible, bool no_wait)
 {
        struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        struct ttm_mem_type_manager *man;
 
        uint32_t num_prios = bdev->driver->num_mem_type_prio;
@@ -762,20 +802,20 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                                if (unlikely(ret))
                                        return ret;
 
-                               spin_lock(&bdev->lru_lock);
+                               spin_lock(&glob->lru_lock);
                                node = drm_mm_search_free(&man->manager,
                                                          mem->num_pages,
                                                          mem->page_alignment,
                                                          1);
                                if (unlikely(!node)) {
-                                       spin_unlock(&bdev->lru_lock);
+                                       spin_unlock(&glob->lru_lock);
                                        break;
                                }
                                node = drm_mm_get_block_atomic(node,
                                                               mem->num_pages,
                                                               mem->
                                                               page_alignment);
-                               spin_unlock(&bdev->lru_lock);
+                               spin_unlock(&glob->lru_lock);
                        } while (!node);
                }
                if (node)
@@ -848,7 +888,7 @@ int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
                       uint32_t proposed_placement,
                       bool interruptible, bool no_wait)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_bo_global *glob = bo->glob;
        int ret = 0;
        struct ttm_mem_reg mem;
 
@@ -884,9 +924,9 @@ int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
 
 out_unlock:
        if (ret && mem.mm_node) {
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
                drm_mm_put_block(mem.mm_node);
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
        }
        return ret;
 }
@@ -1022,6 +1062,7 @@ int ttm_buffer_object_init(struct ttm_bo_device *bdev,
        INIT_LIST_HEAD(&bo->ddestroy);
        INIT_LIST_HEAD(&bo->swap);
        bo->bdev = bdev;
+       bo->glob = bdev->glob;
        bo->type = type;
        bo->num_pages = num_pages;
        bo->mem.mem_type = TTM_PL_SYSTEM;
@@ -1034,6 +1075,7 @@ int ttm_buffer_object_init(struct ttm_bo_device *bdev,
        bo->seq_valid = false;
        bo->persistant_swap_storage = persistant_swap_storage;
        bo->acc_size = acc_size;
+       atomic_inc(&bo->glob->bo_count);
 
        ret = ttm_bo_check_placement(bo, flags, 0ULL);
        if (unlikely(ret != 0))
@@ -1072,13 +1114,13 @@ out_err:
 }
 EXPORT_SYMBOL(ttm_buffer_object_init);
 
-static inline size_t ttm_bo_size(struct ttm_bo_device *bdev,
+static inline size_t ttm_bo_size(struct ttm_bo_global *glob,
                                 unsigned long num_pages)
 {
        size_t page_array_size = (num_pages * sizeof(void *) + PAGE_SIZE - 1) &
            PAGE_MASK;
 
-       return bdev->ttm_bo_size + 2 * page_array_size;
+       return glob->ttm_bo_size + 2 * page_array_size;
 }
 
 int ttm_buffer_object_create(struct ttm_bo_device *bdev,
@@ -1093,18 +1135,18 @@ int ttm_buffer_object_create(struct ttm_bo_device *bdev,
 {
        struct ttm_buffer_object *bo;
        int ret;
-       struct ttm_mem_global *mem_glob = bdev->mem_glob;
+       struct ttm_mem_global *mem_glob = bdev->glob->mem_glob;
 
        size_t acc_size =
-           ttm_bo_size(bdev, (size + PAGE_SIZE - 1) >> PAGE_SHIFT);
-       ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false, false);
+           ttm_bo_size(bdev->glob, (size + PAGE_SIZE - 1) >> PAGE_SHIFT);
+       ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);
        if (unlikely(ret != 0))
                return ret;
 
        bo = kzalloc(sizeof(*bo), GFP_KERNEL);
 
        if (unlikely(bo == NULL)) {
-               ttm_mem_global_free(mem_glob, acc_size, false);
+               ttm_mem_global_free(mem_glob, acc_size);
                return -ENOMEM;
        }
 
@@ -1150,6 +1192,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
                                   struct list_head *head,
                                   unsigned mem_type, bool allow_errors)
 {
+       struct ttm_bo_global *glob = bdev->glob;
        struct ttm_buffer_object *entry;
        int ret;
        int put_count;
@@ -1158,30 +1201,31 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
         * Can't use standard list traversal since we're unlocking.
         */
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
 
        while (!list_empty(head)) {
                entry = list_first_entry(head, struct ttm_buffer_object, lru);
                kref_get(&entry->list_kref);
                ret = ttm_bo_reserve_locked(entry, false, false, false, 0);
                put_count = ttm_bo_del_from_lru(entry);
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
                while (put_count--)
                        kref_put(&entry->list_kref, ttm_bo_ref_bug);
                BUG_ON(ret);
                ret = ttm_bo_leave_list(entry, mem_type, allow_errors);
                ttm_bo_unreserve(entry);
                kref_put(&entry->list_kref, ttm_bo_release_list);
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
        }
 
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 
        return 0;
 }
 
 int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
+       struct ttm_bo_global *glob = bdev->glob;
        struct ttm_mem_type_manager *man;
        int ret = -EINVAL;
 
@@ -1204,13 +1248,13 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
        if (mem_type > 0) {
                ttm_bo_force_list_clean(bdev, &man->lru, mem_type, false);
 
-               spin_lock(&bdev->lru_lock);
+               spin_lock(&glob->lru_lock);
                if (drm_mm_clean(&man->manager))
                        drm_mm_takedown(&man->manager);
                else
                        ret = -EBUSY;
 
-               spin_unlock(&bdev->lru_lock);
+               spin_unlock(&glob->lru_lock);
        }
 
        return ret;
@@ -1284,11 +1328,82 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
 }
 EXPORT_SYMBOL(ttm_bo_init_mm);
 
+static void ttm_bo_global_kobj_release(struct kobject *kobj)
+{
+       struct ttm_bo_global *glob =
+               container_of(kobj, struct ttm_bo_global, kobj);
+
+       ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink);
+       __free_page(glob->dummy_read_page);
+       kfree(glob);
+}
+
+void ttm_bo_global_release(struct ttm_global_reference *ref)
+{
+       struct ttm_bo_global *glob = ref->object;
+
+       kobject_del(&glob->kobj);
+       kobject_put(&glob->kobj);
+}
+EXPORT_SYMBOL(ttm_bo_global_release);
+
+int ttm_bo_global_init(struct ttm_global_reference *ref)
+{
+       struct ttm_bo_global_ref *bo_ref =
+               container_of(ref, struct ttm_bo_global_ref, ref);
+       struct ttm_bo_global *glob = ref->object;
+       int ret;
+
+       mutex_init(&glob->device_list_mutex);
+       spin_lock_init(&glob->lru_lock);
+       glob->mem_glob = bo_ref->mem_glob;
+       glob->dummy_read_page = alloc_page(__GFP_ZERO | GFP_DMA32);
+
+       if (unlikely(glob->dummy_read_page == NULL)) {
+               ret = -ENOMEM;
+               goto out_no_drp;
+       }
+
+       INIT_LIST_HEAD(&glob->swap_lru);
+       INIT_LIST_HEAD(&glob->device_list);
+
+       ttm_mem_init_shrink(&glob->shrink, ttm_bo_swapout);
+       ret = ttm_mem_register_shrink(glob->mem_glob, &glob->shrink);
+       if (unlikely(ret != 0)) {
+               printk(KERN_ERR TTM_PFX
+                      "Could not register buffer object swapout.\n");
+               goto out_no_shrink;
+       }
+
+       glob->ttm_bo_extra_size =
+               ttm_round_pot(sizeof(struct ttm_tt)) +
+               ttm_round_pot(sizeof(struct ttm_backend));
+
+       glob->ttm_bo_size = glob->ttm_bo_extra_size +
+               ttm_round_pot(sizeof(struct ttm_buffer_object));
+
+       atomic_set(&glob->bo_count, 0);
+
+       kobject_init(&glob->kobj, &ttm_bo_glob_kobj_type);
+       ret = kobject_add(&glob->kobj, ttm_get_kobj(), "buffer_objects");
+       if (unlikely(ret != 0))
+               kobject_put(&glob->kobj);
+       return ret;
+out_no_shrink:
+       __free_page(glob->dummy_read_page);
+out_no_drp:
+       kfree(glob);
+       return ret;
+}
+EXPORT_SYMBOL(ttm_bo_global_init);
+
+
 int ttm_bo_device_release(struct ttm_bo_device *bdev)
 {
        int ret = 0;
        unsigned i = TTM_NUM_MEM_TYPES;
        struct ttm_mem_type_manager *man;
+       struct ttm_bo_global *glob = bdev->glob;
 
        while (i--) {
                man = &bdev->man[i];
@@ -1304,100 +1419,74 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
                }
        }
 
+       mutex_lock(&glob->device_list_mutex);
+       list_del(&bdev->device_list);
+       mutex_unlock(&glob->device_list_mutex);
+
        if (!cancel_delayed_work(&bdev->wq))
                flush_scheduled_work();
 
        while (ttm_bo_delayed_delete(bdev, true))
                ;
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        if (list_empty(&bdev->ddestroy))
                TTM_DEBUG("Delayed destroy list was clean\n");
 
        if (list_empty(&bdev->man[0].lru))
                TTM_DEBUG("Swap list was clean\n");
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 
-       ttm_mem_unregister_shrink(bdev->mem_glob, &bdev->shrink);
        BUG_ON(!drm_mm_clean(&bdev->addr_space_mm));
        write_lock(&bdev->vm_lock);
        drm_mm_takedown(&bdev->addr_space_mm);
        write_unlock(&bdev->vm_lock);
 
-       __free_page(bdev->dummy_read_page);
        return ret;
 }
 EXPORT_SYMBOL(ttm_bo_device_release);
 
-/*
- * This function is intended to be called on drm driver load.
- * If you decide to call it from firstopen, you must protect the call
- * from a potentially racing ttm_bo_driver_finish in lastclose.
- * (This may happen on X server restart).
- */
-
 int ttm_bo_device_init(struct ttm_bo_device *bdev,
-                      struct ttm_mem_global *mem_glob,
-                      struct ttm_bo_driver *driver, uint64_t file_page_offset,
+                      struct ttm_bo_global *glob,
+                      struct ttm_bo_driver *driver,
+                      uint64_t file_page_offset,
                       bool need_dma32)
 {
        int ret = -EINVAL;
 
-       bdev->dummy_read_page = NULL;
        rwlock_init(&bdev->vm_lock);
-       spin_lock_init(&bdev->lru_lock);
-
        bdev->driver = driver;
-       bdev->mem_glob = mem_glob;
 
        memset(bdev->man, 0, sizeof(bdev->man));
 
-       bdev->dummy_read_page = alloc_page(__GFP_ZERO | GFP_DMA32);
-       if (unlikely(bdev->dummy_read_page == NULL)) {
-               ret = -ENOMEM;
-               goto out_err0;
-       }
-
        /*
         * Initialize the system memory buffer type.
         * Other types need to be driver / IOCTL initialized.
         */
        ret = ttm_bo_init_mm(bdev, TTM_PL_SYSTEM, 0, 0);
        if (unlikely(ret != 0))
-               goto out_err1;
+               goto out_no_sys;
 
        bdev->addr_space_rb = RB_ROOT;
        ret = drm_mm_init(&bdev->addr_space_mm, file_page_offset, 0x10000000);
        if (unlikely(ret != 0))
-               goto out_err2;
+               goto out_no_addr_mm;
 
        INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
        bdev->nice_mode = true;
        INIT_LIST_HEAD(&bdev->ddestroy);
-       INIT_LIST_HEAD(&bdev->swap_lru);
        bdev->dev_mapping = NULL;
+       bdev->glob = glob;
        bdev->need_dma32 = need_dma32;
-       ttm_mem_init_shrink(&bdev->shrink, ttm_bo_swapout);
-       ret = ttm_mem_register_shrink(mem_glob, &bdev->shrink);
-       if (unlikely(ret != 0)) {
-               printk(KERN_ERR TTM_PFX
-                      "Could not register buffer object swapout.\n");
-               goto out_err2;
-       }
 
-       bdev->ttm_bo_extra_size =
-               ttm_round_pot(sizeof(struct ttm_tt)) +
-               ttm_round_pot(sizeof(struct ttm_backend));
-
-       bdev->ttm_bo_size = bdev->ttm_bo_extra_size +
-               ttm_round_pot(sizeof(struct ttm_buffer_object));
+       mutex_lock(&glob->device_list_mutex);
+       list_add_tail(&bdev->device_list, &glob->device_list);
+       mutex_unlock(&glob->device_list_mutex);
 
        return 0;
-out_err2:
+out_no_addr_mm:
        ttm_bo_clean_mm(bdev, 0);
-out_err1:
-       __free_page(bdev->dummy_read_page);
-out_err0:
+out_no_sys:
        return ret;
 }
 EXPORT_SYMBOL(ttm_bo_device_init);
@@ -1647,21 +1736,21 @@ void ttm_bo_synccpu_write_release(struct ttm_buffer_object *bo)
 
 static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
 {
-       struct ttm_bo_device *bdev =
-           container_of(shrink, struct ttm_bo_device, shrink);
+       struct ttm_bo_global *glob =
+           container_of(shrink, struct ttm_bo_global, shrink);
        struct ttm_buffer_object *bo;
        int ret = -EBUSY;
        int put_count;
        uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM);
 
-       spin_lock(&bdev->lru_lock);
+       spin_lock(&glob->lru_lock);
        while (ret == -EBUSY) {
-               if (unlikely(list_empty(&bdev->swap_lru))) {
-                       spin_unlock(&bdev->lru_lock);
+               if (unlikely(list_empty(&glob->swap_lru))) {
+                       spin_unlock(&glob->lru_lock);
                        return -EBUSY;
                }
 
-               bo = list_first_entry(&bdev->swap_lru,
+               bo = list_first_entry(&glob->swap_lru,
                                      struct ttm_buffer_object, swap);
                kref_get(&bo->list_kref);
 
@@ -1673,16 +1762,16 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
 
                ret = ttm_bo_reserve_locked(bo, false, true, false, 0);
                if (unlikely(ret == -EBUSY)) {
-                       spin_unlock(&bdev->lru_lock);
+                       spin_unlock(&glob->lru_lock);
                        ttm_bo_wait_unreserved(bo, false);
                        kref_put(&bo->list_kref, ttm_bo_release_list);
-                       spin_lock(&bdev->lru_lock);
+                       spin_lock(&glob->lru_lock);
                }
        }
 
        BUG_ON(ret != 0);
        put_count = ttm_bo_del_from_lru(bo);
-       spin_unlock(&bdev->lru_lock);
+       spin_unlock(&glob->lru_lock);
 
        while (put_count--)
                kref_put(&bo->list_kref, ttm_bo_ref_bug);
@@ -1736,6 +1825,6 @@ out:
 
 void ttm_bo_swapout_all(struct ttm_bo_device *bdev)
 {
-       while (ttm_bo_swapout(&bdev->shrink) == 0)
+       while (ttm_bo_swapout(&bdev->glob->shrink) == 0)
                ;
 }
index ad4ada0..c70927e 100644 (file)
@@ -41,9 +41,9 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo)
        struct ttm_mem_reg *old_mem = &bo->mem;
 
        if (old_mem->mm_node) {
-               spin_lock(&bo->bdev->lru_lock);
+               spin_lock(&bo->glob->lru_lock);
                drm_mm_put_block(old_mem->mm_node);
-               spin_unlock(&bo->bdev->lru_lock);
+               spin_unlock(&bo->glob->lru_lock);
        }
        old_mem->mm_node = NULL;
 }
index 0b14eb1..541744d 100644 (file)
@@ -71,7 +71,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
 
        mutex_lock(&item->mutex);
        if (item->refcount == 0) {
-               item->object = kmalloc(ref->size, GFP_KERNEL);
+               item->object = kzalloc(ref->size, GFP_KERNEL);
                if (unlikely(item->object == NULL)) {
                        ret = -ENOMEM;
                        goto out_err;
@@ -89,7 +89,6 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
        mutex_unlock(&item->mutex);
        return 0;
 out_err:
-       kfree(item->object);
        mutex_unlock(&item->mutex);
        item->object = NULL;
        return ret;
@@ -105,7 +104,6 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
        BUG_ON(ref->object != item->object);
        if (--item->refcount == 0) {
                ref->release(ref);
-               kfree(item->object);
                item->object = NULL;
        }
        mutex_unlock(&item->mutex);
index 87323d4..072c281 100644 (file)
  **************************************************************************/
 
 #include "ttm/ttm_memory.h"
+#include "ttm/ttm_module.h"
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 
-#define TTM_PFX "[TTM] "
 #define TTM_MEMORY_ALLOC_RETRIES 4
 
+struct ttm_mem_zone {
+       struct kobject kobj;
+       struct ttm_mem_global *glob;
+       const char *name;
+       uint64_t zone_mem;
+       uint64_t emer_mem;
+       uint64_t max_mem;
+       uint64_t swap_limit;
+       uint64_t used_mem;
+};
+
+static struct attribute ttm_mem_sys = {
+       .name = "zone_memory",
+       .mode = S_IRUGO
+};
+static struct attribute ttm_mem_emer = {
+       .name = "emergency_memory",
+       .mode = S_IRUGO | S_IWUSR
+};
+static struct attribute ttm_mem_max = {
+       .name = "available_memory",
+       .mode = S_IRUGO | S_IWUSR
+};
+static struct attribute ttm_mem_swap = {
+       .name = "swap_limit",
+       .mode = S_IRUGO | S_IWUSR
+};
+static struct attribute ttm_mem_used = {
+       .name = "used_memory",
+       .mode = S_IRUGO
+};
+
+static void ttm_mem_zone_kobj_release(struct kobject *kobj)
+{
+       struct ttm_mem_zone *zone =
+               container_of(kobj, struct ttm_mem_zone, kobj);
+
+       printk(KERN_INFO TTM_PFX
+              "Zone %7s: Used memory at exit: %llu kiB.\n",
+              zone->name, (unsigned long long) zone->used_mem >> 10);
+       kfree(zone);
+}
+
+static ssize_t ttm_mem_zone_show(struct kobject *kobj,
+                                struct attribute *attr,
+                                char *buffer)
+{
+       struct ttm_mem_zone *zone =
+               container_of(kobj, struct ttm_mem_zone, kobj);
+       uint64_t val = 0;
+
+       spin_lock(&zone->glob->lock);
+       if (attr == &ttm_mem_sys)
+               val = zone->zone_mem;
+       else if (attr == &ttm_mem_emer)
+               val = zone->emer_mem;
+       else if (attr == &ttm_mem_max)
+               val = zone->max_mem;
+       else if (attr == &ttm_mem_swap)
+               val = zone->swap_limit;
+       else if (attr == &ttm_mem_used)
+               val = zone->used_mem;
+       spin_unlock(&zone->glob->lock);
+
+       return snprintf(buffer, PAGE_SIZE, "%llu\n",
+                       (unsigned long long) val >> 10);
+}
+
+static void ttm_check_swapping(struct ttm_mem_global *glob);
+
+static ssize_t ttm_mem_zone_store(struct kobject *kobj,
+                                 struct attribute *attr,
+                                 const char *buffer,
+                                 size_t size)
+{
+       struct ttm_mem_zone *zone =
+               container_of(kobj, struct ttm_mem_zone, kobj);
+       int chars;
+       unsigned long val;
+       uint64_t val64;
+
+       chars = sscanf(buffer, "%lu", &val);
+       if (chars == 0)
+               return size;
+
+       val64 = val;
+       val64 <<= 10;
+
+       spin_lock(&zone->glob->lock);
+       if (val64 > zone->zone_mem)
+               val64 = zone->zone_mem;
+       if (attr == &ttm_mem_emer) {
+               zone->emer_mem = val64;
+               if (zone->max_mem > val64)
+                       zone->max_mem = val64;
+       } else if (attr == &ttm_mem_max) {
+               zone->max_mem = val64;
+               if (zone->emer_mem < val64)
+                       zone->emer_mem = val64;
+       } else if (attr == &ttm_mem_swap)
+               zone->swap_limit = val64;
+       spin_unlock(&zone->glob->lock);
+
+       ttm_check_swapping(zone->glob);
+
+       return size;
+}
+
+static struct attribute *ttm_mem_zone_attrs[] = {
+       &ttm_mem_sys,
+       &ttm_mem_emer,
+       &ttm_mem_max,
+       &ttm_mem_swap,
+       &ttm_mem_used,
+       NULL
+};
+
+static struct sysfs_ops ttm_mem_zone_ops = {
+       .show = &ttm_mem_zone_show,
+       .store = &ttm_mem_zone_store
+};
+
+static struct kobj_type ttm_mem_zone_kobj_type = {
+       .release = &ttm_mem_zone_kobj_release,
+       .sysfs_ops = &ttm_mem_zone_ops,
+       .default_attrs = ttm_mem_zone_attrs,
+};
+
+static void ttm_mem_global_kobj_release(struct kobject *kobj)
+{
+       struct ttm_mem_global *glob =
+               container_of(kobj, struct ttm_mem_global, kobj);
+
+       kfree(glob);
+}
+
+static struct kobj_type ttm_mem_glob_kobj_type = {
+       .release = &ttm_mem_global_kobj_release,
+};
+
+static bool ttm_zones_above_swap_target(struct ttm_mem_global *glob,
+                                       bool from_wq, uint64_t extra)
+{
+       unsigned int i;
+       struct ttm_mem_zone *zone;
+       uint64_t target;
+
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+
+               if (from_wq)
+                       target = zone->swap_limit;
+               else if (capable(CAP_SYS_ADMIN))
+                       target = zone->emer_mem;
+               else
+                       target = zone->max_mem;
+
+               target = (extra > target) ? 0ULL : target;
+
+               if (zone->used_mem > target)
+                       return true;
+       }
+       return false;
+}
+
 /**
  * At this point we only support a single shrink callback.
  * Extend this if needed, perhaps using a linked list of callbacks.
  * many threads may try to swap out at any given time.
  */
 
-static void ttm_shrink(struct ttm_mem_global *glob, bool from_workqueue,
+static void ttm_shrink(struct ttm_mem_global *glob, bool from_wq,
                       uint64_t extra)
 {
        int ret;
        struct ttm_mem_shrink *shrink;
-       uint64_t target;
-       uint64_t total_target;
 
        spin_lock(&glob->lock);
        if (glob->shrink == NULL)
                goto out;
 
-       if (from_workqueue) {
-               target = glob->swap_limit;
-               total_target = glob->total_memory_swap_limit;
-       } else if (capable(CAP_SYS_ADMIN)) {
-               total_target = glob->emer_total_memory;
-               target = glob->emer_memory;
-       } else {
-               total_target = glob->max_total_memory;
-               target = glob->max_memory;
-       }
-
-       total_target = (extra >= total_target) ? 0 : total_target - extra;
-       target = (extra >= target) ? 0 : target - extra;
-
-       while (glob->used_memory > target ||
-              glob->used_total_memory > total_target) {
+       while (ttm_zones_above_swap_target(glob, from_wq, extra)) {
                shrink = glob->shrink;
                spin_unlock(&glob->lock);
                ret = shrink->do_shrink(shrink);
@@ -81,6 +229,8 @@ out:
        spin_unlock(&glob->lock);
 }
 
+
+
 static void ttm_shrink_work(struct work_struct *work)
 {
        struct ttm_mem_global *glob =
@@ -89,63 +239,198 @@ static void ttm_shrink_work(struct work_struct *work)
        ttm_shrink(glob, true, 0ULL);
 }
 
+static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
+                                   const struct sysinfo *si)
+{
+       struct ttm_mem_zone *zone = kzalloc(sizeof(*zone), GFP_KERNEL);
+       uint64_t mem;
+       int ret;
+
+       if (unlikely(!zone))
+               return -ENOMEM;
+
+       mem = si->totalram - si->totalhigh;
+       mem *= si->mem_unit;
+
+       zone->name = "kernel";
+       zone->zone_mem = mem;
+       zone->max_mem = mem >> 1;
+       zone->emer_mem = (mem >> 1) + (mem >> 2);
+       zone->swap_limit = zone->max_mem - (mem >> 3);
+       zone->used_mem = 0;
+       zone->glob = glob;
+       glob->zone_kernel = zone;
+       kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type);
+       ret = kobject_add(&zone->kobj, &glob->kobj, zone->name);
+       if (unlikely(ret != 0)) {
+               kobject_put(&zone->kobj);
+               return ret;
+       }
+       glob->zones[glob->num_zones++] = zone;
+       return 0;
+}
+
+#ifdef CONFIG_HIGHMEM
+static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob,
+                                    const struct sysinfo *si)
+{
+       struct ttm_mem_zone *zone = kzalloc(sizeof(*zone), GFP_KERNEL);
+       uint64_t mem;
+       int ret;
+
+       if (unlikely(!zone))
+               return -ENOMEM;
+
+       if (si->totalhigh == 0)
+               return 0;
+
+       mem = si->totalram;
+       mem *= si->mem_unit;
+
+       zone->name = "highmem";
+       zone->zone_mem = mem;
+       zone->max_mem = mem >> 1;
+       zone->emer_mem = (mem >> 1) + (mem >> 2);
+       zone->swap_limit = zone->max_mem - (mem >> 3);
+       zone->used_mem = 0;
+       zone->glob = glob;
+       glob->zone_highmem = zone;
+       kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type);
+       ret = kobject_add(&zone->kobj, &glob->kobj, zone->name);
+       if (unlikely(ret != 0)) {
+               kobject_put(&zone->kobj);
+               return ret;
+       }
+       glob->zones[glob->num_zones++] = zone;
+       return 0;
+}
+#else
+static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
+                                  const struct sysinfo *si)
+{
+       struct ttm_mem_zone *zone = kzalloc(sizeof(*zone), GFP_KERNEL);
+       uint64_t mem;
+       int ret;
+
+       if (unlikely(!zone))
+               return -ENOMEM;
+
+       mem = si->totalram;
+       mem *= si->mem_unit;
+
+       /**
+        * No special dma32 zone needed.
+        */
+
+       if (mem <= ((uint64_t) 1ULL << 32))
+               return 0;
+
+       /*
+        * Limit max dma32 memory to 4GB for now
+        * until we can figure out how big this
+        * zone really is.
+        */
+
+       mem = ((uint64_t) 1ULL << 32);
+       zone->name = "dma32";
+       zone->zone_mem = mem;
+       zone->max_mem = mem >> 1;
+       zone->emer_mem = (mem >> 1) + (mem >> 2);
+       zone->swap_limit = zone->max_mem - (mem >> 3);
+       zone->used_mem = 0;
+       zone->glob = glob;
+       glob->zone_dma32 = zone;
+       kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type);
+       ret = kobject_add(&zone->kobj, &glob->kobj, zone->name);
+       if (unlikely(ret != 0)) {
+               kobject_put(&zone->kobj);
+               return ret;
+       }
+       glob->zones[glob->num_zones++] = zone;
+       return 0;
+}
+#endif
+
 int ttm_mem_global_init(struct ttm_mem_global *glob)
 {
        struct sysinfo si;
-       uint64_t mem;
+       int ret;
+       int i;
+       struct ttm_mem_zone *zone;
 
        spin_lock_init(&glob->lock);
        glob->swap_queue = create_singlethread_workqueue("ttm_swap");
        INIT_WORK(&glob->work, ttm_shrink_work);
        init_waitqueue_head(&glob->queue);
+       kobject_init(&glob->kobj, &ttm_mem_glob_kobj_type);
+       ret = kobject_add(&glob->kobj,
+                         ttm_get_kobj(),
+                         "memory_accounting");
+       if (unlikely(ret != 0)) {
+               kobject_put(&glob->kobj);
+               return ret;
+       }
 
        si_meminfo(&si);
 
-       mem = si.totalram - si.totalhigh;
-       mem *= si.mem_unit;
-
-       glob->max_memory = mem >> 1;
-       glob->emer_memory = (mem >> 1) + (mem >> 2);
-       glob->swap_limit = glob->max_memory - (mem >> 3);
-       glob->used_memory = 0;
-       glob->used_total_memory = 0;
-       glob->shrink = NULL;
-
-       mem = si.totalram;
-       mem *= si.mem_unit;
-
-       glob->max_total_memory = mem >> 1;
-       glob->emer_total_memory = (mem >> 1) + (mem >> 2);
-
-       glob->total_memory_swap_limit = glob->max_total_memory - (mem >> 3);
-
-       printk(KERN_INFO TTM_PFX "TTM available graphics memory: %llu MiB\n",
-              glob->max_total_memory >> 20);
-       printk(KERN_INFO TTM_PFX "TTM available object memory: %llu MiB\n",
-              glob->max_memory >> 20);
-
+       ret = ttm_mem_init_kernel_zone(glob, &si);
+       if (unlikely(ret != 0))
+               goto out_no_zone;
+#ifdef CONFIG_HIGHMEM
+       ret = ttm_mem_init_highmem_zone(glob, &si);
+       if (unlikely(ret != 0))
+               goto out_no_zone;
+#else
+       ret = ttm_mem_init_dma32_zone(glob, &si);
+       if (unlikely(ret != 0))
+               goto out_no_zone;
+#endif
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+               printk(KERN_INFO TTM_PFX
+                      "Zone %7s: Available graphics memory: %llu kiB.\n",
+                      zone->name, (unsigned long long) zone->max_mem >> 10);
+       }
        return 0;
+out_no_zone:
+       ttm_mem_global_release(glob);
+       return ret;
 }
 EXPORT_SYMBOL(ttm_mem_global_init);
 
 void ttm_mem_global_release(struct ttm_mem_global *glob)
 {
-       printk(KERN_INFO TTM_PFX "Used total memory is %llu bytes.\n",
-              (unsigned long long)glob->used_total_memory);
+       unsigned int i;
+       struct ttm_mem_zone *zone;
+
        flush_workqueue(glob->swap_queue);
        destroy_workqueue(glob->swap_queue);
        glob->swap_queue = NULL;
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+               kobject_del(&zone->kobj);
+               kobject_put(&zone->kobj);
+       }
+       kobject_del(&glob->kobj);
+       kobject_put(&glob->kobj);
 }
 EXPORT_SYMBOL(ttm_mem_global_release);
 
-static inline void ttm_check_swapping(struct ttm_mem_global *glob)
+static void ttm_check_swapping(struct ttm_mem_global *glob)
 {
-       bool needs_swapping;
+       bool needs_swapping = false;
+       unsigned int i;
+       struct ttm_mem_zone *zone;
 
        spin_lock(&glob->lock);
-       needs_swapping = (glob->used_memory > glob->swap_limit ||
-                         glob->used_total_memory >
-                         glob->total_memory_swap_limit);
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+               if (zone->used_mem > zone->swap_limit) {
+                       needs_swapping = true;
+                       break;
+               }
+       }
+
        spin_unlock(&glob->lock);
 
        if (unlikely(needs_swapping))
@@ -153,44 +438,60 @@ static inline void ttm_check_swapping(struct ttm_mem_global *glob)
 
 }
 
-void ttm_mem_global_free(struct ttm_mem_global *glob,
-                        uint64_t amount, bool himem)
+static void ttm_mem_global_free_zone(struct ttm_mem_global *glob,
+                                    struct ttm_mem_zone *single_zone,
+                                    uint64_t amount)
 {
+       unsigned int i;
+       struct ttm_mem_zone *zone;
+
        spin_lock(&glob->lock);
-       glob->used_total_memory -= amount;
-       if (!himem)
-               glob->used_memory -= amount;
-       wake_up_all(&glob->queue);
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+               if (single_zone && zone != single_zone)
+                       continue;
+               zone->used_mem -= amount;
+       }
        spin_unlock(&glob->lock);
 }
 
+void ttm_mem_global_free(struct ttm_mem_global *glob,
+                        uint64_t amount)
+{
+       return ttm_mem_global_free_zone(glob, NULL, amount);
+}
+
 static int ttm_mem_global_reserve(struct ttm_mem_global *glob,
-                                 uint64_t amount, bool himem, bool reserve)
+                                 struct ttm_mem_zone *single_zone,
+                                 uint64_t amount, bool reserve)
 {
        uint64_t limit;
-       uint64_t lomem_limit;
        int ret = -ENOMEM;
+       unsigned int i;
+       struct ttm_mem_zone *zone;
 
        spin_lock(&glob->lock);
+       for (i = 0; i < glob->num_zones; ++i) {
+               zone = glob->zones[i];
+               if (single_zone && zone != single_zone)
+                       continue;
 
-       if (capable(CAP_SYS_ADMIN)) {
-               limit = glob->emer_total_memory;
-               lomem_limit = glob->emer_memory;
-       } else {
-               limit = glob->max_total_memory;
-               lomem_limit = glob->max_memory;
-       }
+               limit = (capable(CAP_SYS_ADMIN)) ?
+                       zone->emer_mem : zone->max_mem;
 
-       if (unlikely(glob->used_total_memory + amount > limit))
-               goto out_unlock;
-       if (unlikely(!himem && glob->used_memory + amount > lomem_limit))
-               goto out_unlock;
+               if (zone->used_mem > limit)
+                       goto out_unlock;
+       }
 
        if (reserve) {
-               glob->used_total_memory += amount;
-               if (!himem)
-                       glob->used_memory += amount;
+               for (i = 0; i < glob->num_zones; ++i) {
+                       zone = glob->zones[i];
+                       if (single_zone && zone != single_zone)
+                               continue;
+                       zone->used_mem += amount;
+               }
        }
+
        ret = 0;
 out_unlock:
        spin_unlock(&glob->lock);
@@ -199,12 +500,17 @@ out_unlock:
        return ret;
 }
 
-int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-                        bool no_wait, bool interruptible, bool himem)
+
+static int ttm_mem_global_alloc_zone(struct ttm_mem_global *glob,
+                                    struct ttm_mem_zone *single_zone,
+                                    uint64_t memory,
+                                    bool no_wait, bool interruptible)
 {
        int count = TTM_MEMORY_ALLOC_RETRIES;
 
-       while (unlikely(ttm_mem_global_reserve(glob, memory, himem, true)
+       while (unlikely(ttm_mem_global_reserve(glob,
+                                              single_zone,
+                                              memory, true)
                        != 0)) {
                if (no_wait)
                        return -ENOMEM;
@@ -216,6 +522,56 @@ int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
        return 0;
 }
 
+int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
+                        bool no_wait, bool interruptible)
+{
+       /**
+        * Normal allocations of kernel memory are registered in
+        * all zones.
+        */
+
+       return ttm_mem_global_alloc_zone(glob, NULL, memory, no_wait,
+                                        interruptible);
+}
+
+int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+                             struct page *page,
+                             bool no_wait, bool interruptible)
+{
+
+       struct ttm_mem_zone *zone = NULL;
+
+       /**
+        * Page allocations may be registed in a single zone
+        * only if highmem or !dma32.
+        */
+
+#ifdef CONFIG_HIGHMEM
+       if (PageHighMem(page) && glob->zone_highmem != NULL)
+               zone = glob->zone_highmem;
+#else
+       if (glob->zone_dma32 && page_to_pfn(page) > 0x00100000UL)
+               zone = glob->zone_kernel;
+#endif
+       return ttm_mem_global_alloc_zone(glob, zone, PAGE_SIZE, no_wait,
+                                        interruptible);
+}
+
+void ttm_mem_global_free_page(struct ttm_mem_global *glob, struct page *page)
+{
+       struct ttm_mem_zone *zone = NULL;
+
+#ifdef CONFIG_HIGHMEM
+       if (PageHighMem(page) && glob->zone_highmem != NULL)
+               zone = glob->zone_highmem;
+#else
+       if (glob->zone_dma32 && page_to_pfn(page) > 0x00100000UL)
+               zone = glob->zone_kernel;
+#endif
+       ttm_mem_global_free_zone(glob, zone, PAGE_SIZE);
+}
+
+
 size_t ttm_round_pot(size_t size)
 {
        if ((size & (size - 1)) == 0)
index 59ce819..9a6edbf 100644 (file)
  *         Jerome Glisse
  */
 #include <linux/module.h>
-#include <ttm/ttm_module.h>
+#include <linux/device.h>
+#include <linux/sched.h>
+#include "ttm/ttm_module.h"
+#include "drm_sysfs.h"
+
+static DECLARE_WAIT_QUEUE_HEAD(exit_q);
+atomic_t device_released;
+
+static struct device_type ttm_drm_class_type = {
+       .name = "ttm",
+       /**
+        * Add pm ops here.
+        */
+};
+
+static void ttm_drm_class_device_release(struct device *dev)
+{
+       atomic_set(&device_released, 1);
+       wake_up_all(&exit_q);
+}
+
+static struct device ttm_drm_class_device = {
+       .type = &ttm_drm_class_type,
+       .release = &ttm_drm_class_device_release
+};
+
+struct kobject *ttm_get_kobj(void)
+{
+       struct kobject *kobj = &ttm_drm_class_device.kobj;
+       BUG_ON(kobj == NULL);
+       return kobj;
+}
 
 static int __init ttm_init(void)
 {
+       int ret;
+
+       ret = dev_set_name(&ttm_drm_class_device, "ttm");
+       if (unlikely(ret != 0))
+               return ret;
+
        ttm_global_init();
+
+       atomic_set(&device_released, 0);
+       ret = drm_class_device_register(&ttm_drm_class_device);
+       if (unlikely(ret != 0))
+               goto out_no_dev_reg;
+
        return 0;
+out_no_dev_reg:
+       atomic_set(&device_released, 1);
+       wake_up_all(&exit_q);
+       ttm_global_release();
+       return ret;
 }
 
 static void __exit ttm_exit(void)
 {
+       drm_class_device_unregister(&ttm_drm_class_device);
+
+       /**
+        * Refuse to unload until the TTM device is released.
+        * Not sure this is 100% needed.
+        */
+
+       wait_event(exit_q, atomic_read(&device_released) == 1);
        ttm_global_release();
 }
 
index b8b6c4a..a55ee1a 100644 (file)
 #include <linux/pagemap.h>
 #include <linux/file.h>
 #include <linux/swap.h>
+#include "drm_cache.h"
 #include "ttm/ttm_module.h"
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_placement.h"
 
 static int ttm_tt_swapin(struct ttm_tt *ttm);
 
-#if defined(CONFIG_X86)
-static void ttm_tt_clflush_page(struct page *page)
-{
-       uint8_t *page_virtual;
-       unsigned int i;
-
-       if (unlikely(page == NULL))
-               return;
-
-       page_virtual = kmap_atomic(page, KM_USER0);
-
-       for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
-               clflush(page_virtual + i);
-
-       kunmap_atomic(page_virtual, KM_USER0);
-}
-
-static void ttm_tt_cache_flush_clflush(struct page *pages[],
-                                      unsigned long num_pages)
-{
-       unsigned long i;
-
-       mb();
-       for (i = 0; i < num_pages; ++i)
-               ttm_tt_clflush_page(*pages++);
-       mb();
-}
-#elif !defined(__powerpc__)
-static void ttm_tt_ipi_handler(void *null)
-{
-       ;
-}
-#endif
-
-void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages)
-{
-
-#if defined(CONFIG_X86)
-       if (cpu_has_clflush) {
-               ttm_tt_cache_flush_clflush(pages, num_pages);
-               return;
-       }
-#elif defined(__powerpc__)
-       unsigned long i;
-
-       for (i = 0; i < num_pages; ++i) {
-               struct page *page = pages[i];
-               void *page_virtual;
-
-               if (unlikely(page == NULL))
-                       continue;
-
-               page_virtual = kmap_atomic(page, KM_USER0);
-               flush_dcache_range((unsigned long) page_virtual,
-                                  (unsigned long) page_virtual + PAGE_SIZE);
-               kunmap_atomic(page_virtual, KM_USER0);
-       }
-#else
-       if (on_each_cpu(ttm_tt_ipi_handler, NULL, 1) != 0)
-               printk(KERN_ERR TTM_PFX
-                      "Timed out waiting for drm cache flush.\n");
-#endif
-}
-
 /**
  * Allocates storage for pointers to the pages that back the ttm.
  *
@@ -179,7 +116,7 @@ static void ttm_tt_free_user_pages(struct ttm_tt *ttm)
                        set_page_dirty_lock(page);
 
                ttm->pages[i] = NULL;
-               ttm_mem_global_free(ttm->bdev->mem_glob, PAGE_SIZE, false);
+               ttm_mem_global_free(ttm->glob->mem_glob, PAGE_SIZE);
                put_page(page);
        }
        ttm->state = tt_unpopulated;
@@ -190,8 +127,7 @@ static void ttm_tt_free_user_pages(struct ttm_tt *ttm)
 static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index)
 {
        struct page *p;
-       struct ttm_bo_device *bdev = ttm->bdev;
-       struct ttm_mem_global *mem_glob = bdev->mem_glob;
+       struct ttm_mem_global *mem_glob = ttm->glob->mem_glob;
        int ret;
 
        while (NULL == (p = ttm->pages[index])) {
@@ -200,21 +136,14 @@ static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index)
                if (!p)
                        return NULL;
 
-               if (PageHighMem(p)) {
-                       ret =
-                           ttm_mem_global_alloc(mem_glob, PAGE_SIZE,
-                                                false, false, true);
-                       if (unlikely(ret != 0))
-                               goto out_err;
+               ret = ttm_mem_global_alloc_page(mem_glob, p, false, false);
+               if (unlikely(ret != 0))
+                       goto out_err;
+
+               if (PageHighMem(p))
                        ttm->pages[--ttm->first_himem_page] = p;
-               } else {
-                       ret =
-                           ttm_mem_global_alloc(mem_glob, PAGE_SIZE,
-                                                false, false, false);
-                       if (unlikely(ret != 0))
-                               goto out_err;
+               else
                        ttm->pages[++ttm->last_lomem_page] = p;
-               }
        }
        return p;
 out_err:
@@ -310,7 +239,7 @@ static int ttm_tt_set_caching(struct ttm_tt *ttm,
        }
 
        if (ttm->caching_state == tt_cached)
-               ttm_tt_cache_flush(ttm->pages, ttm->num_pages);
+               drm_clflush_pages(ttm->pages, ttm->num_pages);
 
        for (i = 0; i < ttm->num_pages; ++i) {
                cur_page = ttm->pages[i];
@@ -368,8 +297,8 @@ static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)
                                printk(KERN_ERR TTM_PFX
                                       "Erroneous page count. "
                                       "Leaking pages.\n");
-                       ttm_mem_global_free(ttm->bdev->mem_glob, PAGE_SIZE,
-                                           PageHighMem(cur_page));
+                       ttm_mem_global_free_page(ttm->glob->mem_glob,
+                                                cur_page);
                        __free_page(cur_page);
                }
        }
@@ -414,7 +343,7 @@ int ttm_tt_set_user(struct ttm_tt *ttm,
        struct mm_struct *mm = tsk->mm;
        int ret;
        int write = (ttm->page_flags & TTM_PAGE_FLAG_WRITE) != 0;
-       struct ttm_mem_global *mem_glob = ttm->bdev->mem_glob;
+       struct ttm_mem_global *mem_glob = ttm->glob->mem_glob;
 
        BUG_ON(num_pages != ttm->num_pages);
        BUG_ON((ttm->page_flags & TTM_PAGE_FLAG_USER) == 0);
@@ -424,7 +353,7 @@ int ttm_tt_set_user(struct ttm_tt *ttm,
         */
 
        ret = ttm_mem_global_alloc(mem_glob, num_pages * PAGE_SIZE,
-                                  false, false, false);
+                                  false, false);
        if (unlikely(ret != 0))
                return ret;
 
@@ -435,7 +364,7 @@ int ttm_tt_set_user(struct ttm_tt *ttm,
 
        if (ret != num_pages && write) {
                ttm_tt_free_user_pages(ttm);
-               ttm_mem_global_free(mem_glob, num_pages * PAGE_SIZE, false);
+               ttm_mem_global_free(mem_glob, num_pages * PAGE_SIZE);
                return -ENOMEM;
        }
 
@@ -459,8 +388,7 @@ struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
        if (!ttm)
                return NULL;
 
-       ttm->bdev = bdev;
-
+       ttm->glob = bdev->glob;
        ttm->num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
        ttm->first_himem_page = ttm->num_pages;
        ttm->last_lomem_page = -1;
index 111afbe..24d90ea 100644 (file)
@@ -204,13 +204,6 @@ config HID_NTRIG
        ---help---
        Support for N-Trig touch screen.
 
-config HID_PANTHERLORD
-       tristate "Pantherlord devices support" if EMBEDDED
-       depends on USB_HID
-       default !EMBEDDED
-       ---help---
-       Support for PantherLord/GreenAsia based device support.
-
 config HID_PANTHERLORD
        tristate "Pantherlord support" if EMBEDDED
        depends on USB_HID
index 342b7d3..be34d32 100644 (file)
@@ -1089,8 +1089,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                return -1;
        }
 
-       buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE,
-                       interrupt ? GFP_ATOMIC : GFP_KERNEL);
+       buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);
 
        if (!buf) {
                report = hid_get_report(report_enum, data);
@@ -1238,6 +1237,17 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
 }
 EXPORT_SYMBOL_GPL(hid_connect);
 
+void hid_disconnect(struct hid_device *hdev)
+{
+       if (hdev->claimed & HID_CLAIMED_INPUT)
+               hidinput_disconnect(hdev);
+       if (hdev->claimed & HID_CLAIMED_HIDDEV)
+               hdev->hiddev_disconnect(hdev);
+       if (hdev->claimed & HID_CLAIMED_HIDRAW)
+               hidraw_disconnect(hdev);
+}
+EXPORT_SYMBOL_GPL(hid_disconnect);
+
 /* a list of devices for which there is a specialized driver on HID bus */
 static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
index 1b0e07a..03bd703 100644 (file)
@@ -1041,13 +1041,6 @@ static void usbhid_stop(struct hid_device *hid)
 
        hid_cancel_delayed_stuff(usbhid);
 
-       if (hid->claimed & HID_CLAIMED_INPUT)
-               hidinput_disconnect(hid);
-       if (hid->claimed & HID_CLAIMED_HIDDEV)
-               hiddev_disconnect(hid);
-       if (hid->claimed & HID_CLAIMED_HIDRAW)
-               hidraw_disconnect(hid);
-
        hid->claimed = 0;
 
        usb_free_urb(usbhid->urbin);
@@ -1085,7 +1078,7 @@ static struct hid_ll_driver usb_hid_driver = {
        .hidinput_input_event = usb_hidinput_input_event,
 };
 
-static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
+static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
        struct usb_host_interface *interface = intf->cur_altsetting;
        struct usb_device *dev = interface_to_usbdev(intf);
@@ -1117,6 +1110,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
        hid->ff_init = hid_pidff_init;
 #ifdef CONFIG_USB_HIDDEV
        hid->hiddev_connect = hiddev_connect;
+       hid->hiddev_disconnect = hiddev_disconnect;
        hid->hiddev_hid_event = hiddev_hid_event;
        hid->hiddev_report_event = hiddev_report_event;
 #endif
@@ -1177,7 +1171,7 @@ err:
        return ret;
 }
 
-static void hid_disconnect(struct usb_interface *intf)
+static void usbhid_disconnect(struct usb_interface *intf)
 {
        struct hid_device *hid = usb_get_intfdata(intf);
        struct usbhid_device *usbhid;
@@ -1359,8 +1353,8 @@ MODULE_DEVICE_TABLE (usb, hid_usb_ids);
 
 static struct usb_driver hid_driver = {
        .name =         "usbhid",
-       .probe =        hid_probe,
-       .disconnect =   hid_disconnect,
+       .probe =        usbhid_probe,
+       .disconnect =   usbhid_disconnect,
 #ifdef CONFIG_PM
        .suspend =      hid_suspend,
        .resume =       hid_resume,
index 4d1dc0c..8b6ee24 100644 (file)
@@ -852,14 +852,14 @@ static const struct file_operations hiddev_fops = {
 #endif
 };
 
-static char *hiddev_nodename(struct device *dev)
+static char *hiddev_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
 
 static struct usb_class_driver hiddev_class = {
        .name =         "hiddev%d",
-       .nodename =     hiddev_nodename,
+       .devnode =      hiddev_devnode,
        .fops =         &hiddev_fops,
        .minor_base =   HIDDEV_MINOR_BASE,
 };
index 242294d..5e9e095 100644 (file)
@@ -43,6 +43,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/mutex.h>
+#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #define DRVNAME                "adcxx"
@@ -157,8 +158,9 @@ static struct sensor_device_attribute ad_input[] = {
 
 /*----------------------------------------------------------------------*/
 
-static int __devinit adcxx_probe(struct spi_device *spi, int channels)
+static int __devinit adcxx_probe(struct spi_device *spi)
 {
+       int channels = spi_get_device_id(spi)->driver_data;
        struct adcxx *adc;
        int status;
        int i;
@@ -204,26 +206,6 @@ out_err:
        return status;
 }
 
-static int __devinit adcxx1s_probe(struct spi_device *spi)
-{
-       return adcxx_probe(spi, 1);
-}
-
-static int __devinit adcxx2s_probe(struct spi_device *spi)
-{
-       return adcxx_probe(spi, 2);
-}
-
-static int __devinit adcxx4s_probe(struct spi_device *spi)
-{
-       return adcxx_probe(spi, 4);
-}
-
-static int __devinit adcxx8s_probe(struct spi_device *spi)
-{
-       return adcxx_probe(spi, 8);
-}
-
 static int __devexit adcxx_remove(struct spi_device *spi)
 {
        struct adcxx *adc = dev_get_drvdata(&spi->dev);
@@ -241,79 +223,33 @@ static int __devexit adcxx_remove(struct spi_device *spi)
        return 0;
 }
 
-static struct spi_driver adcxx1s_driver = {
-       .driver = {
-               .name   = "adcxx1s",
-               .owner  = THIS_MODULE,
-       },
-       .probe  = adcxx1s_probe,
-       .remove = __devexit_p(adcxx_remove),
+static const struct spi_device_id adcxx_ids[] = {
+       { "adcxx1s", 1 },
+       { "adcxx2s", 2 },
+       { "adcxx4s", 4 },
+       { "adcxx8s", 8 },
+       { },
 };
+MODULE_DEVICE_TABLE(spi, adcxx_ids);
 
-static struct spi_driver adcxx2s_driver = {
+static struct spi_driver adcxx_driver = {
        .driver = {
-               .name   = "adcxx2s",
+               .name   = "adcxx",
                .owner  = THIS_MODULE,
        },
-       .probe  = adcxx2s_probe,
-       .remove = __devexit_p(adcxx_remove),
-};
-
-static struct spi_driver adcxx4s_driver = {
-       .driver = {
-               .name   = "adcxx4s",
-               .owner  = THIS_MODULE,
-       },
-       .probe  = adcxx4s_probe,
-       .remove = __devexit_p(adcxx_remove),
-};
-
-static struct spi_driver adcxx8s_driver = {
-       .driver = {
-               .name   = "adcxx8s",
-               .owner  = THIS_MODULE,
-       },
-       .probe  = adcxx8s_probe,
+       .id_table = adcxx_ids,
+       .probe  = adcxx_probe,
        .remove = __devexit_p(adcxx_remove),
 };
 
 static int __init init_adcxx(void)
 {
-       int status;
-       status = spi_register_driver(&adcxx1s_driver);
-       if (status)
-               goto reg_1_failed;
-
-       status = spi_register_driver(&adcxx2s_driver);
-       if (status)
-               goto reg_2_failed;
-
-       status = spi_register_driver(&adcxx4s_driver);
-       if (status)
-               goto reg_4_failed;
-
-       status = spi_register_driver(&adcxx8s_driver);
-       if (status)
-               goto reg_8_failed;
-
-       return status;
-
-reg_8_failed:
-       spi_unregister_driver(&adcxx4s_driver);
-reg_4_failed:
-       spi_unregister_driver(&adcxx2s_driver);
-reg_2_failed:
-       spi_unregister_driver(&adcxx1s_driver);
-reg_1_failed:
-       return status;
+       return spi_register_driver(&adcxx_driver);
 }
 
 static void __exit exit_adcxx(void)
 {
-       spi_unregister_driver(&adcxx1s_driver);
-       spi_unregister_driver(&adcxx2s_driver);
-       spi_unregister_driver(&adcxx4s_driver);
-       spi_unregister_driver(&adcxx8s_driver);
+       spi_unregister_driver(&adcxx_driver);
 }
 
 module_init(init_adcxx);
@@ -322,8 +258,3 @@ module_exit(exit_adcxx);
 MODULE_AUTHOR("Marc Pignat");
 MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver");
 MODULE_LICENSE("GPL");
-
-MODULE_ALIAS("adcxx1s");
-MODULE_ALIAS("adcxx2s");
-MODULE_ALIAS("adcxx4s");
-MODULE_ALIAS("adcxx8s");
index b11e06f..afc5943 100644 (file)
@@ -83,16 +83,14 @@ struct adm1021_data {
 
        struct mutex update_lock;
        char valid;             /* !=0 if following fields are valid */
+       char low_power;         /* !=0 if device in low power mode */
        unsigned long last_updated;     /* In jiffies */
 
-       s8 temp_max[2];         /* Register values */
-       s8 temp_min[2];
-       s8 temp[2];
+       int temp_max[2];                /* Register values */
+       int temp_min[2];
+       int temp[2];
        u8 alarms;
        /* Special values for ADM1023 only */
-       u8 remote_temp_prec;
-       u8 remote_temp_os_prec;
-       u8 remote_temp_hyst_prec;
        u8 remote_temp_offset;
        u8 remote_temp_offset_prec;
 };
@@ -141,7 +139,7 @@ static ssize_t show_temp(struct device *dev,
        int index = to_sensor_dev_attr(devattr)->index;
        struct adm1021_data *data = adm1021_update_device(dev);
 
-       return sprintf(buf, "%d\n", 1000 * data->temp[index]);
+       return sprintf(buf, "%d\n", data->temp[index]);
 }
 
 static ssize_t show_temp_max(struct device *dev,
@@ -150,7 +148,7 @@ static ssize_t show_temp_max(struct device *dev,
        int index = to_sensor_dev_attr(devattr)->index;
        struct adm1021_data *data = adm1021_update_device(dev);
 
-       return sprintf(buf, "%d\n", 1000 * data->temp_max[index]);
+       return sprintf(buf, "%d\n", data->temp_max[index]);
 }
 
 static ssize_t show_temp_min(struct device *dev,
@@ -159,7 +157,7 @@ static ssize_t show_temp_min(struct device *dev,
        int index = to_sensor_dev_attr(devattr)->index;
        struct adm1021_data *data = adm1021_update_device(dev);
 
-       return sprintf(buf, "%d\n", 1000 * data->temp_min[index]);
+       return sprintf(buf, "%d\n", data->temp_min[index]);
 }
 
 static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
@@ -216,6 +214,35 @@ static ssize_t set_temp_min(struct device *dev,
        return count;
 }
 
+static ssize_t show_low_power(struct device *dev,
+                             struct device_attribute *devattr, char *buf)
+{
+       struct adm1021_data *data = adm1021_update_device(dev);
+       return sprintf(buf, "%d\n", data->low_power);
+}
+
+static ssize_t set_low_power(struct device *dev,
+                            struct device_attribute *devattr,
+                            const char *buf, size_t count)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct adm1021_data *data = i2c_get_clientdata(client);
+       int low_power = simple_strtol(buf, NULL, 10) != 0;
+
+       mutex_lock(&data->update_lock);
+       if (low_power != data->low_power) {
+               int config = i2c_smbus_read_byte_data(
+                       client, ADM1021_REG_CONFIG_R);
+               data->low_power = low_power;
+               i2c_smbus_write_byte_data(client, ADM1021_REG_CONFIG_W,
+                       (config & 0xBF) | (low_power << 6));
+       }
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max,
                          set_temp_max, 0);
@@ -233,6 +260,7 @@ static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
 static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static DEVICE_ATTR(low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power);
 
 static struct attribute *adm1021_attributes[] = {
        &sensor_dev_attr_temp1_max.dev_attr.attr,
@@ -247,6 +275,7 @@ static struct attribute *adm1021_attributes[] = {
        &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp2_fault.dev_attr.attr,
        &dev_attr_alarms.attr,
+       &dev_attr_low_power.attr,
        NULL
 };
 
@@ -412,25 +441,27 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                dev_dbg(&client->dev, "Starting adm1021 update\n");
 
                for (i = 0; i < 2; i++) {
-                       data->temp[i] = i2c_smbus_read_byte_data(client,
-                                               ADM1021_REG_TEMP(i));
-                       data->temp_max[i] = i2c_smbus_read_byte_data(client,
-                                               ADM1021_REG_TOS_R(i));
-                       data->temp_min[i] = i2c_smbus_read_byte_data(client,
-                                               ADM1021_REG_THYST_R(i));
+                       data->temp[i] = 1000 *
+                               (s8) i2c_smbus_read_byte_data(
+                                       client, ADM1021_REG_TEMP(i));
+                       data->temp_max[i] = 1000 *
+                               (s8) i2c_smbus_read_byte_data(
+                                       client, ADM1021_REG_TOS_R(i));
+                       data->temp_min[i] = 1000 *
+                               (s8) i2c_smbus_read_byte_data(
+                                       client, ADM1021_REG_THYST_R(i));
                }
                data->alarms = i2c_smbus_read_byte_data(client,
                                                ADM1021_REG_STATUS) & 0x7c;
                if (data->type == adm1023) {
-                       data->remote_temp_prec =
-                               i2c_smbus_read_byte_data(client,
-                                               ADM1023_REG_REM_TEMP_PREC);
-                       data->remote_temp_os_prec =
-                               i2c_smbus_read_byte_data(client,
-                                               ADM1023_REG_REM_TOS_PREC);
-                       data->remote_temp_hyst_prec =
-                               i2c_smbus_read_byte_data(client,
-                                               ADM1023_REG_REM_THYST_PREC);
+                       /* The ADM1023 provides 3 extra bits of precision for
+                        * the remote sensor in extra registers. */
+                       data->temp[1] += 125 * (i2c_smbus_read_byte_data(
+                               client, ADM1023_REG_REM_TEMP_PREC) >> 5);
+                       data->temp_max[1] += 125 * (i2c_smbus_read_byte_data(
+                               client, ADM1023_REG_REM_TOS_PREC) >> 5);
+                       data->temp_min[1] += 125 * (i2c_smbus_read_byte_data(
+                               client, ADM1023_REG_REM_THYST_PREC) >> 5);
                        data->remote_temp_offset =
                                i2c_smbus_read_byte_data(client,
                                                ADM1023_REG_REM_OFFSET);
index 753b348..7ea6a8f 100644 (file)
@@ -178,6 +178,8 @@ static const int debug;
 static struct platform_device *pdev;
 static s16 rest_x;
 static s16 rest_y;
+static u8 backlight_state[2];
+
 static struct device *hwmon_dev;
 static struct input_polled_dev *applesmc_idev;
 
@@ -497,17 +499,36 @@ static int applesmc_probe(struct platform_device *dev)
        return 0;
 }
 
-static int applesmc_resume(struct platform_device *dev)
+/* Synchronize device with memorized backlight state */
+static int applesmc_pm_resume(struct device *dev)
 {
-       return applesmc_device_init();
+       mutex_lock(&applesmc_lock);
+       if (applesmc_light)
+               applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
+       mutex_unlock(&applesmc_lock);
+       return 0;
 }
 
+/* Reinitialize device on resume from hibernation */
+static int applesmc_pm_restore(struct device *dev)
+{
+       int ret = applesmc_device_init();
+       if (ret)
+               return ret;
+       return applesmc_pm_resume(dev);
+}
+
+static struct dev_pm_ops applesmc_pm_ops = {
+       .resume = applesmc_pm_resume,
+       .restore = applesmc_pm_restore,
+};
+
 static struct platform_driver applesmc_driver = {
        .probe = applesmc_probe,
-       .resume = applesmc_resume,
        .driver = {
                .name = "applesmc",
                .owner = THIS_MODULE,
+               .pm = &applesmc_pm_ops,
        },
 };
 
@@ -804,17 +825,10 @@ static ssize_t applesmc_calibrate_store(struct device *dev,
        return count;
 }
 
-/* Store the next backlight value to be written by the work */
-static unsigned int backlight_value;
-
 static void applesmc_backlight_set(struct work_struct *work)
 {
-       u8 buffer[2];
-
        mutex_lock(&applesmc_lock);
-       buffer[0] = backlight_value;
-       buffer[1] = 0x00;
-       applesmc_write_key(BACKLIGHT_KEY, buffer, 2);
+       applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
        mutex_unlock(&applesmc_lock);
 }
 static DECLARE_WORK(backlight_work, &applesmc_backlight_set);
@@ -824,7 +838,7 @@ static void applesmc_brightness_set(struct led_classdev *led_cdev,
 {
        int ret;
 
-       backlight_value = value;
+       backlight_state[0] = value;
        ret = queue_work(applesmc_led_wq, &backlight_work);
 
        if (debug && (!ret))
index 93c1722..972cf4b 100644 (file)
@@ -185,7 +185,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
                }
        }
 
-       if (ismobile) {
+       if (ismobile || c->x86_model == 0x1c) {
 
                err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
                if (err) {
@@ -417,7 +417,7 @@ static int __init coretemp_init(void)
                if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
                    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
                        (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
-                       (c->x86_model == 0x1A))) {
+                       (c->x86_model == 0x1A) || (c->x86_model == 0x1c))) {
 
                        /* supported CPU not found, but report the unknown
                           family 6 CPU */
index 9814d51..2c2cb1e 100644 (file)
@@ -1134,7 +1134,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
                res = PWM_FREQ_FROM_REG(data->pwm_freq[ix]);
                break;
        case SYS_PWM_ENABLE:
-               if (ix > 3) {
+               if (ix >= 3) {
                        res = 1; /* pwm[5-6] hard-wired to manual mode */
                } else {
                        res = PWM_EN_FROM_REG(data->pwm_config[ix]);
index 271338b..cf5afb9 100644 (file)
@@ -454,6 +454,15 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
                                        (p->click_thresh_y << 4));
                }
 
+               if (p->wakeup_flags && (dev->whoami == LIS_SINGLE_ID)) {
+                       dev->write(dev, FF_WU_CFG_1, p->wakeup_flags);
+                       dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
+                       /* default to 2.5ms for now */
+                       dev->write(dev, FF_WU_DURATION_1, 1);
+                       /* enable high pass filter for both free-fall units */
+                       dev->write(dev, CTRL_REG2, HP_FF_WU1 | HP_FF_WU2);
+               }
+
                if (p->irq_cfg)
                        dev->write(dev, CTRL_REG3, p->irq_cfg);
        }
index e320e2f..3e1ff46 100644 (file)
@@ -58,15 +58,17 @@ enum lis3_reg {
        OUTZ_L          = 0x2C,
        OUTZ_H          = 0x2D,
        OUTZ            = 0x2D,
-       FF_WU_CFG       = 0x30,
-       FF_WU_SRC       = 0x31,
-       FF_WU_ACK       = 0x32,
-       FF_WU_THS_L     = 0x34,
-       FF_WU_THS_H     = 0x35,
-       FF_WU_DURATION  = 0x36,
 };
 
 enum lis302d_reg {
+       FF_WU_CFG_1     = 0x30,
+       FF_WU_SRC_1     = 0x31,
+       FF_WU_THS_1     = 0x32,
+       FF_WU_DURATION_1 = 0x33,
+       FF_WU_CFG_2     = 0x34,
+       FF_WU_SRC_2     = 0x35,
+       FF_WU_THS_2     = 0x36,
+       FF_WU_DURATION_2 = 0x37,
        CLICK_CFG       = 0x38,
        CLICK_SRC       = 0x39,
        CLICK_THSY_X    = 0x3B,
@@ -77,6 +79,12 @@ enum lis302d_reg {
 };
 
 enum lis3lv02d_reg {
+       FF_WU_CFG       = 0x30,
+       FF_WU_SRC       = 0x31,
+       FF_WU_ACK       = 0x32,
+       FF_WU_THS_L     = 0x34,
+       FF_WU_THS_H     = 0x35,
+       FF_WU_DURATION  = 0x36,
        DD_CFG          = 0x38,
        DD_SRC          = 0x39,
        DD_ACK          = 0x3A,
@@ -107,6 +115,10 @@ enum lis3lv02d_ctrl2 {
        CTRL2_FS        = 0x80, /* Full Scale selection */
 };
 
+enum lis302d_ctrl2 {
+       HP_FF_WU2       = 0x08,
+       HP_FF_WU1       = 0x04,
+};
 
 enum lis3lv02d_ctrl3 {
        CTRL3_CFS0      = 0x01,
index 3827ff0..ecd7395 100644 (file)
@@ -66,17 +66,16 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       lis3_dev.bus_priv = spi;
-       lis3_dev.init = lis3_spi_init;
-       lis3_dev.read = lis3_spi_read;
-       lis3_dev.write = lis3_spi_write;
-       lis3_dev.irq = spi->irq;
-       lis3_dev.ac = lis3lv02d_axis_normal;
-       lis3_dev.pdata = spi->dev.platform_data;
+       lis3_dev.bus_priv       = spi;
+       lis3_dev.init           = lis3_spi_init;
+       lis3_dev.read           = lis3_spi_read;
+       lis3_dev.write          = lis3_spi_write;
+       lis3_dev.irq            = spi->irq;
+       lis3_dev.ac             = lis3lv02d_axis_normal;
+       lis3_dev.pdata          = spi->dev.platform_data;
        spi_set_drvdata(spi, &lis3_dev);
 
-       ret = lis3lv02d_init_device(&lis3_dev);
-       return ret;
+       return lis3lv02d_init_device(&lis3_dev);
 }
 
 static int __devexit lis302dl_spi_remove(struct spi_device *spi)
@@ -87,6 +86,32 @@ static int __devexit lis302dl_spi_remove(struct spi_device *spi)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int lis3lv02d_spi_suspend(struct spi_device *spi, pm_message_t mesg)
+{
+       struct lis3lv02d *lis3 = spi_get_drvdata(spi);
+
+       if (!lis3->pdata->wakeup_flags)
+               lis3lv02d_poweroff(&lis3_dev);
+
+       return 0;
+}
+
+static int lis3lv02d_spi_resume(struct spi_device *spi)
+{
+       struct lis3lv02d *lis3 = spi_get_drvdata(spi);
+
+       if (!lis3->pdata->wakeup_flags)
+               lis3lv02d_poweron(lis3);
+
+       return 0;
+}
+
+#else
+#define lis3lv02d_spi_suspend  NULL
+#define lis3lv02d_spi_resume   NULL
+#endif
+
 static struct spi_driver lis302dl_spi_driver = {
        .driver  = {
                .name   = DRV_NAME,
@@ -94,6 +119,8 @@ static struct spi_driver lis302dl_spi_driver = {
        },
        .probe  = lis302dl_spi_probe,
        .remove = __devexit_p(lis302dl_spi_remove),
+       .suspend = lis3lv02d_spi_suspend,
+       .resume  = lis3lv02d_spi_resume,
 };
 
 static int __init lis302dl_init(void)
@@ -112,4 +139,4 @@ module_exit(lis302dl_exit);
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
 MODULE_DESCRIPTION("lis3lv02d SPI glue layer");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("spi:" DRV_NAME);
index ae6204f..ab8a5d3 100644 (file)
@@ -32,6 +32,7 @@
 #include <linux/sysfs.h>
 #include <linux/hwmon.h>
 #include <linux/mutex.h>
+#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 
@@ -130,11 +131,20 @@ static DEVICE_ATTR(name, S_IRUGO, lm70_show_name, NULL);
 
 /*----------------------------------------------------------------------*/
 
-static int __devinit common_probe(struct spi_device *spi, int chip)
+static int __devinit lm70_probe(struct spi_device *spi)
 {
+       int chip = spi_get_device_id(spi)->driver_data;
        struct lm70 *p_lm70;
        int status;
 
+       /* signaling is SPI_MODE_0 for both LM70 and TMP121 */
+       if (spi->mode & (SPI_CPOL | SPI_CPHA))
+               return -EINVAL;
+
+       /* 3-wire link (shared SI/SO) for LM70 */
+       if (chip == LM70_CHIP_LM70 && !(spi->mode & SPI_3WIRE))
+               return -EINVAL;
+
        /* NOTE:  we assume 8-bit words, and convert to 16 bits manually */
 
        p_lm70 = kzalloc(sizeof *p_lm70, GFP_KERNEL);
@@ -170,24 +180,6 @@ out_dev_reg_failed:
        return status;
 }
 
-static int __devinit lm70_probe(struct spi_device *spi)
-{
-       /* signaling is SPI_MODE_0 on a 3-wire link (shared SI/SO) */
-       if ((spi->mode & (SPI_CPOL | SPI_CPHA)) || !(spi->mode & SPI_3WIRE))
-               return -EINVAL;
-
-       return common_probe(spi, LM70_CHIP_LM70);
-}
-
-static int __devinit tmp121_probe(struct spi_device *spi)
-{
-       /* signaling is SPI_MODE_0 with only MISO connected */
-       if (spi->mode & (SPI_CPOL | SPI_CPHA))
-               return -EINVAL;
-
-       return common_probe(spi, LM70_CHIP_TMP121);
-}
-
 static int __devexit lm70_remove(struct spi_device *spi)
 {
        struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
@@ -201,41 +193,32 @@ static int __devexit lm70_remove(struct spi_device *spi)
        return 0;
 }
 
-static struct spi_driver tmp121_driver = {
-       .driver = {
-               .name   = "tmp121",
-               .owner  = THIS_MODULE,
-       },
-       .probe  = tmp121_probe,
-       .remove = __devexit_p(lm70_remove),
+
+static const struct spi_device_id lm70_ids[] = {
+       { "lm70",   LM70_CHIP_LM70 },
+       { "tmp121", LM70_CHIP_TMP121 },
+       { },
 };
+MODULE_DEVICE_TABLE(spi, lm70_ids);
 
 static struct spi_driver lm70_driver = {
        .driver = {
                .name   = "lm70",
                .owner  = THIS_MODULE,
        },
+       .id_table = lm70_ids,
        .probe  = lm70_probe,
        .remove = __devexit_p(lm70_remove),
 };
 
 static int __init init_lm70(void)
 {
-       int ret = spi_register_driver(&lm70_driver);
-       if (ret)
-               return ret;
-
-       ret = spi_register_driver(&tmp121_driver);
-       if (ret)
-               spi_unregister_driver(&lm70_driver);
-
-       return ret;
+       return spi_register_driver(&lm70_driver);
 }
 
 static void __exit cleanup_lm70(void)
 {
        spi_unregister_driver(&lm70_driver);
-       spi_unregister_driver(&tmp121_driver);
 }
 
 module_init(init_lm70);
index bfaa665..9ac4972 100644 (file)
@@ -242,3 +242,4 @@ module_exit(max1111_exit);
 MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
 MODULE_DESCRIPTION("MAX1111 ADC Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:max1111");
index 6290a25..303c026 100644 (file)
@@ -562,7 +562,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
        ret = sysfs_create_group(&pdev->dev.kobj, &sht15_attr_group);
        if (ret) {
                dev_err(&pdev->dev, "sysfs create failed");
-               goto err_free_data;
+               goto err_release_gpio_data;
        }
 
        ret = request_irq(gpio_to_irq(data->pdata->gpio_data),
@@ -581,10 +581,12 @@ static int __devinit sht15_probe(struct platform_device *pdev)
        data->hwmon_dev = hwmon_device_register(data->dev);
        if (IS_ERR(data->hwmon_dev)) {
                ret = PTR_ERR(data->hwmon_dev);
-               goto err_release_gpio_data;
+               goto err_release_irq;
        }
        return 0;
 
+err_release_irq:
+       free_irq(gpio_to_irq(data->pdata->gpio_data), data);
 err_release_gpio_data:
        gpio_free(data->pdata->gpio_data);
 err_release_gpio_sck:
index 711ca08..d7ece13 100644 (file)
@@ -27,6 +27,14 @@ config I2C_BOARDINFO
        boolean
        default y
 
+config I2C_COMPAT
+       boolean "Enable compatibility bits for old user-space"
+       default y
+       help
+         Say Y here if you intend to run lm-sensors 3.1.1 or older, or any
+         other user-space package which expects i2c adapters to be class
+         devices. If you don't know, say Y.
+
 config I2C_CHARDEV
        tristate "I2C device interface"
        help
index 8206442..6bedd2f 100644 (file)
@@ -113,7 +113,7 @@ config I2C_ISCH
          will be called i2c-isch.
 
 config I2C_PIIX4
-       tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
+       tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
        depends on PCI
        help
          If you say yes to this option, support will be included for the Intel
@@ -128,6 +128,7 @@ config I2C_PIIX4
            ATI SB600
            ATI SB700
            ATI SB800
+           AMD SB900
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
@@ -231,6 +232,22 @@ config I2C_VIAPRO
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.
 
+if ACPI
+
+comment "ACPI drivers"
+
+config I2C_SCMI
+       tristate "SMBus Control Method Interface"
+       help
+         This driver supports the SMBus Control Method Interface. It needs the
+         BIOS to declare ACPI control methods as described in the SMBus Control
+         Method Interface specification.
+
+         To compile this driver as a module, choose M here:
+         the module will be called i2c-scmi.
+
+endif # ACPI
+
 comment "Mac SMBus host controller drivers"
        depends on PPC_CHRP || PPC_PMAC
 
index e654263..ff937ac 100644 (file)
@@ -2,6 +2,9 @@
 # Makefile for the i2c bus drivers.
 #
 
+# ACPI drivers
+obj-$(CONFIG_I2C_SCMI)         += i2c-scmi.o
+
 # PC SMBus host controller drivers
 obj-$(CONFIG_I2C_ALI1535)      += i2c-ali1535.o
 obj-$(CONFIG_I2C_ALI1563)      += i2c-ali1563.o
index 0b486a6..4afba3e 100644 (file)
@@ -609,13 +609,12 @@ static int __init i2c_adap_imx_init(void)
 {
        return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);
 }
+subsys_initcall(i2c_adap_imx_init);
 
 static void __exit i2c_adap_imx_exit(void)
 {
        platform_driver_unregister(&i2c_imx_driver);
 }
-
-module_init(i2c_adap_imx_init);
 module_exit(i2c_adap_imx_exit);
 
 MODULE_LICENSE("GPL");
index c3869d9..bbab0e1 100644 (file)
@@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
        }
 }
 
-static int
+static irqreturn_t
 mv64xxx_i2c_intr(int irq, void *dev_id)
 {
        struct mv64xxx_i2c_data *drv_data = dev_id;
        unsigned long   flags;
        u32             status;
-       int             rc = IRQ_NONE;
+       irqreturn_t     rc = IRQ_NONE;
 
        spin_lock_irqsave(&drv_data->lock, flags);
        while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &
index 0249a7d..a782c7a 100644 (file)
@@ -22,6 +22,7 @@
        Intel PIIX4, 440MX
        Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100
        ATI IXP200, IXP300, IXP400, SB600, SB700, SB800
+       AMD SB900
        SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -479,6 +480,7 @@ static struct pci_device_id piix4_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS) },
        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },
        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SB900_SMBUS) },
        { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
                     PCI_DEVICE_ID_SERVERWORKS_OSB4) },
        { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
@@ -499,9 +501,10 @@ static int __devinit piix4_probe(struct pci_dev *dev,
 {
        int retval;
 
-       if ((dev->vendor == PCI_VENDOR_ID_ATI) &&
-           (dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS) &&
-           (dev->revision >= 0x40))
+       if ((dev->vendor == PCI_VENDOR_ID_ATI &&
+            dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS &&
+            dev->revision >= 0x40) ||
+           dev->vendor == PCI_VENDOR_ID_AMD)
                /* base address location etc changed in SB800 */
                retval = piix4_setup_sb800(dev, id);
        else
index ec15cff..6ff6c20 100644 (file)
@@ -586,7 +586,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
        alg_data->mif.timer.data = (unsigned long)i2c_pnx->adapter;
 
        /* Register I/O resource */
-       if (!request_region(alg_data->base, I2C_PNX_REGION_SIZE, pdev->name)) {
+       if (!request_mem_region(alg_data->base, I2C_PNX_REGION_SIZE,
+                               pdev->name)) {
                dev_err(&pdev->dev,
                       "I/O region 0x%08x for I2C already in use.\n",
                       alg_data->base);
@@ -650,7 +651,7 @@ out_clock:
 out_unmap:
        iounmap((void *)alg_data->ioaddr);
 out_release:
-       release_region(alg_data->base, I2C_PNX_REGION_SIZE);
+       release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
 out_drvdata:
        platform_set_drvdata(pdev, NULL);
 out:
@@ -667,7 +668,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
        i2c_del_adapter(adap);
        i2c_pnx->set_clock_stop(pdev);
        iounmap((void *)alg_data->ioaddr);
-       release_region(alg_data->base, I2C_PNX_REGION_SIZE);
+       release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
        platform_set_drvdata(pdev, NULL);
 
        return 0;
diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
new file mode 100644 (file)
index 0000000..276a046
--- /dev/null
@@ -0,0 +1,430 @@
+/*
+ * SMBus driver for ACPI SMBus CMI
+ *
+ * Copyright (C) 2009 Crane Cai <crane.cai@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/acpi.h>
+
+#define ACPI_SMBUS_HC_CLASS            "smbus"
+#define ACPI_SMBUS_HC_DEVICE_NAME      "cmi"
+
+ACPI_MODULE_NAME("smbus_cmi");
+
+struct smbus_methods_t {
+       char *mt_info;
+       char *mt_sbr;
+       char *mt_sbw;
+};
+
+struct acpi_smbus_cmi {
+       acpi_handle handle;
+       struct i2c_adapter adapter;
+       u8 cap_info:1;
+       u8 cap_read:1;
+       u8 cap_write:1;
+};
+
+static const struct smbus_methods_t smbus_methods = {
+       .mt_info = "_SBI",
+       .mt_sbr  = "_SBR",
+       .mt_sbw  = "_SBW",
+};
+
+static const struct acpi_device_id acpi_smbus_cmi_ids[] = {
+       {"SMBUS01", 0},
+       {"", 0}
+};
+
+#define ACPI_SMBUS_STATUS_OK                   0x00
+#define ACPI_SMBUS_STATUS_FAIL                 0x07
+#define ACPI_SMBUS_STATUS_DNAK                 0x10
+#define ACPI_SMBUS_STATUS_DERR                 0x11
+#define ACPI_SMBUS_STATUS_CMD_DENY             0x12
+#define ACPI_SMBUS_STATUS_UNKNOWN              0x13
+#define ACPI_SMBUS_STATUS_ACC_DENY             0x17
+#define ACPI_SMBUS_STATUS_TIMEOUT              0x18
+#define ACPI_SMBUS_STATUS_NOTSUP               0x19
+#define ACPI_SMBUS_STATUS_BUSY                 0x1a
+#define ACPI_SMBUS_STATUS_PEC                  0x1f
+
+#define ACPI_SMBUS_PRTCL_WRITE                 0x00
+#define ACPI_SMBUS_PRTCL_READ                  0x01
+#define ACPI_SMBUS_PRTCL_QUICK                 0x02
+#define ACPI_SMBUS_PRTCL_BYTE                  0x04
+#define ACPI_SMBUS_PRTCL_BYTE_DATA             0x06
+#define ACPI_SMBUS_PRTCL_WORD_DATA             0x08
+#define ACPI_SMBUS_PRTCL_BLOCK_DATA            0x0a
+
+
+static int
+acpi_smbus_cmi_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
+                  char read_write, u8 command, int size,
+                  union i2c_smbus_data *data)
+{
+       int result = 0;
+       struct acpi_smbus_cmi *smbus_cmi = adap->algo_data;
+       unsigned char protocol;
+       acpi_status status = 0;
+       struct acpi_object_list input;
+       union acpi_object mt_params[5];
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *obj;
+       union acpi_object *pkg;
+       char *method;
+       int len = 0;
+
+       dev_dbg(&adap->dev, "access size: %d %s\n", size,
+               (read_write) ? "READ" : "WRITE");
+       switch (size) {
+       case I2C_SMBUS_QUICK:
+               protocol = ACPI_SMBUS_PRTCL_QUICK;
+               command = 0;
+               if (read_write == I2C_SMBUS_WRITE) {
+                       mt_params[3].type = ACPI_TYPE_INTEGER;
+                       mt_params[3].integer.value = 0;
+                       mt_params[4].type = ACPI_TYPE_INTEGER;
+                       mt_params[4].integer.value = 0;
+               }
+               break;
+
+       case I2C_SMBUS_BYTE:
+               protocol = ACPI_SMBUS_PRTCL_BYTE;
+               if (read_write == I2C_SMBUS_WRITE) {
+                       mt_params[3].type = ACPI_TYPE_INTEGER;
+                       mt_params[3].integer.value = 0;
+                       mt_params[4].type = ACPI_TYPE_INTEGER;
+                       mt_params[4].integer.value = 0;
+               } else {
+                       command = 0;
+               }
+               break;
+
+       case I2C_SMBUS_BYTE_DATA:
+               protocol = ACPI_SMBUS_PRTCL_BYTE_DATA;
+               if (read_write == I2C_SMBUS_WRITE) {
+                       mt_params[3].type = ACPI_TYPE_INTEGER;
+                       mt_params[3].integer.value = 1;
+                       mt_params[4].type = ACPI_TYPE_INTEGER;
+                       mt_params[4].integer.value = data->byte;
+               }
+               break;
+
+       case I2C_SMBUS_WORD_DATA:
+               protocol = ACPI_SMBUS_PRTCL_WORD_DATA;
+               if (read_write == I2C_SMBUS_WRITE) {
+                       mt_params[3].type = ACPI_TYPE_INTEGER;
+                       mt_params[3].integer.value = 2;
+                       mt_params[4].type = ACPI_TYPE_INTEGER;
+                       mt_params[4].integer.value = data->word;
+               }
+               break;
+
+       case I2C_SMBUS_BLOCK_DATA:
+               protocol = ACPI_SMBUS_PRTCL_BLOCK_DATA;
+               if (read_write == I2C_SMBUS_WRITE) {
+                       len = data->block[0];
+                       if (len == 0 || len > I2C_SMBUS_BLOCK_MAX)
+                               return -EINVAL;
+                       mt_params[3].type = ACPI_TYPE_INTEGER;
+                       mt_params[3].integer.value = len;
+                       mt_params[4].type = ACPI_TYPE_BUFFER;
+                       mt_params[4].buffer.pointer = data->block + 1;
+               }
+               break;
+
+       default:
+               dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+               return -EOPNOTSUPP;
+       }
+
+       if (read_write == I2C_SMBUS_READ) {
+               protocol |= ACPI_SMBUS_PRTCL_READ;
+               method = smbus_methods.mt_sbr;
+               input.count = 3;
+       } else {
+               protocol |= ACPI_SMBUS_PRTCL_WRITE;
+               method = smbus_methods.mt_sbw;
+               input.count = 5;
+       }
+
+       input.pointer = mt_params;
+       mt_params[0].type = ACPI_TYPE_INTEGER;
+       mt_params[0].integer.value = protocol;
+       mt_params[1].type = ACPI_TYPE_INTEGER;
+       mt_params[1].integer.value = addr;
+       mt_params[2].type = ACPI_TYPE_INTEGER;
+       mt_params[2].integer.value = command;
+
+       status = acpi_evaluate_object(smbus_cmi->handle, method, &input,
+                                     &buffer);
+       if (ACPI_FAILURE(status)) {
+               ACPI_ERROR((AE_INFO, "Evaluating %s: %i", method, status));
+               return -EIO;
+       }
+
+       pkg = buffer.pointer;
+       if (pkg && pkg->type == ACPI_TYPE_PACKAGE)
+               obj = pkg->package.elements;
+       else {
+               ACPI_ERROR((AE_INFO, "Invalid argument type"));
+               result = -EIO;
+               goto out;
+       }
+       if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) {
+               ACPI_ERROR((AE_INFO, "Invalid argument type"));
+               result = -EIO;
+               goto out;
+       }
+
+       result = obj->integer.value;
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s return status: %i\n",
+                         method, result));
+
+       switch (result) {
+       case ACPI_SMBUS_STATUS_OK:
+               result = 0;
+               break;
+       case ACPI_SMBUS_STATUS_BUSY:
+               result = -EBUSY;
+               goto out;
+       case ACPI_SMBUS_STATUS_TIMEOUT:
+               result = -ETIMEDOUT;
+               goto out;
+       case ACPI_SMBUS_STATUS_DNAK:
+               result = -ENXIO;
+               goto out;
+       default:
+               result = -EIO;
+               goto out;
+       }
+
+       if (read_write == I2C_SMBUS_WRITE || size == I2C_SMBUS_QUICK)
+               goto out;
+
+       obj = pkg->package.elements + 1;
+       if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) {
+               ACPI_ERROR((AE_INFO, "Invalid argument type"));
+               result = -EIO;
+               goto out;
+       }
+
+       len = obj->integer.value;
+       obj = pkg->package.elements + 2;
+       switch (size) {
+       case I2C_SMBUS_BYTE:
+       case I2C_SMBUS_BYTE_DATA:
+       case I2C_SMBUS_WORD_DATA:
+               if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) {
+                       ACPI_ERROR((AE_INFO, "Invalid argument type"));
+                       result = -EIO;
+                       goto out;
+               }
+               if (len == 2)
+                       data->word = obj->integer.value;
+               else
+                       data->byte = obj->integer.value;
+               break;
+       case I2C_SMBUS_BLOCK_DATA:
+               if (obj == NULL || obj->type != ACPI_TYPE_BUFFER) {
+                       ACPI_ERROR((AE_INFO, "Invalid argument type"));
+                       result = -EIO;
+                       goto out;
+               }
+               if (len == 0 || len > I2C_SMBUS_BLOCK_MAX)
+                       return -EPROTO;
+               data->block[0] = len;
+               memcpy(data->block + 1, obj->buffer.pointer, len);
+               break;
+       }
+
+out:
+       kfree(buffer.pointer);
+       dev_dbg(&adap->dev, "Transaction status: %i\n", result);
+       return result;
+}
+
+static u32 acpi_smbus_cmi_func(struct i2c_adapter *adapter)
+{
+       struct acpi_smbus_cmi *smbus_cmi = adapter->algo_data;
+       u32 ret;
+
+       ret = smbus_cmi->cap_read | smbus_cmi->cap_write ?
+               I2C_FUNC_SMBUS_QUICK : 0;
+
+       ret |= smbus_cmi->cap_read ?
+               (I2C_FUNC_SMBUS_READ_BYTE |
+               I2C_FUNC_SMBUS_READ_BYTE_DATA |
+               I2C_FUNC_SMBUS_READ_WORD_DATA |
+               I2C_FUNC_SMBUS_READ_BLOCK_DATA) : 0;
+
+       ret |= smbus_cmi->cap_write ?
+               (I2C_FUNC_SMBUS_WRITE_BYTE |
+               I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
+               I2C_FUNC_SMBUS_WRITE_WORD_DATA |
+               I2C_FUNC_SMBUS_WRITE_BLOCK_DATA) : 0;
+
+       return ret;
+}
+
+static const struct i2c_algorithm acpi_smbus_cmi_algorithm = {
+       .smbus_xfer = acpi_smbus_cmi_access,
+       .functionality = acpi_smbus_cmi_func,
+};
+
+
+static int acpi_smbus_cmi_add_cap(struct acpi_smbus_cmi *smbus_cmi,
+                                 const char *name)
+{
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *obj;
+       acpi_status status;
+
+       if (!strcmp(name, smbus_methods.mt_info)) {
+               status = acpi_evaluate_object(smbus_cmi->handle,
+                                       smbus_methods.mt_info,
+                                       NULL, &buffer);
+               if (ACPI_FAILURE(status)) {
+                       ACPI_ERROR((AE_INFO, "Evaluating %s: %i",
+                                  smbus_methods.mt_info, status));
+                       return -EIO;
+               }
+
+               obj = buffer.pointer;
+               if (obj && obj->type == ACPI_TYPE_PACKAGE)
+                       obj = obj->package.elements;
+               else {
+                       ACPI_ERROR((AE_INFO, "Invalid argument type"));
+                       kfree(buffer.pointer);
+                       return -EIO;
+               }
+
+               if (obj->type != ACPI_TYPE_INTEGER) {
+                       ACPI_ERROR((AE_INFO, "Invalid argument type"));
+                       kfree(buffer.pointer);
+                       return -EIO;
+               } else
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SMBus CMI Version %x"
+                                         "\n", (int)obj->integer.value));
+
+               kfree(buffer.pointer);
+               smbus_cmi->cap_info = 1;
+       } else if (!strcmp(name, smbus_methods.mt_sbr))
+               smbus_cmi->cap_read = 1;
+       else if (!strcmp(name, smbus_methods.mt_sbw))
+               smbus_cmi->cap_write = 1;
+       else
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Unsupported CMI method: %s\n",
+                                name));
+
+       return 0;
+}
+
+static acpi_status acpi_smbus_cmi_query_methods(acpi_handle handle, u32 level,
+                       void *context, void **return_value)
+{
+       char node_name[5];
+       struct acpi_buffer buffer = { sizeof(node_name), node_name };
+       struct acpi_smbus_cmi *smbus_cmi = context;
+       acpi_status status;
+
+       status = acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
+
+       if (ACPI_SUCCESS(status))
+               acpi_smbus_cmi_add_cap(smbus_cmi, node_name);
+
+       return AE_OK;
+}
+
+static int acpi_smbus_cmi_add(struct acpi_device *device)
+{
+       struct acpi_smbus_cmi *smbus_cmi;
+
+       smbus_cmi = kzalloc(sizeof(struct acpi_smbus_cmi), GFP_KERNEL);
+       if (!smbus_cmi)
+               return -ENOMEM;
+
+       smbus_cmi->handle = device->handle;
+       strcpy(acpi_device_name(device), ACPI_SMBUS_HC_DEVICE_NAME);
+       strcpy(acpi_device_class(device), ACPI_SMBUS_HC_CLASS);
+       device->driver_data = smbus_cmi;
+       smbus_cmi->cap_info = 0;
+       smbus_cmi->cap_read = 0;
+       smbus_cmi->cap_write = 0;
+
+       acpi_walk_namespace(ACPI_TYPE_METHOD, smbus_cmi->handle, 1,
+                           acpi_smbus_cmi_query_methods, smbus_cmi, NULL);
+
+       if (smbus_cmi->cap_info == 0)
+               goto err;
+
+       snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name),
+               "SMBus CMI adapter %s (%s)",
+               acpi_device_name(device),
+               acpi_device_uid(device));
+       smbus_cmi->adapter.owner = THIS_MODULE;
+       smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm;
+       smbus_cmi->adapter.algo_data = smbus_cmi;
+       smbus_cmi->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+       smbus_cmi->adapter.dev.parent = &device->dev;
+
+       if (i2c_add_adapter(&smbus_cmi->adapter)) {
+               dev_err(&device->dev, "Couldn't register adapter!\n");
+               goto err;
+       }
+
+       return 0;
+
+err:
+       kfree(smbus_cmi);
+       device->driver_data = NULL;
+       return -EIO;
+}
+
+static int acpi_smbus_cmi_remove(struct acpi_device *device, int type)
+{
+       struct acpi_smbus_cmi *smbus_cmi = acpi_driver_data(device);
+
+       i2c_del_adapter(&smbus_cmi->adapter);
+       kfree(smbus_cmi);
+       device->driver_data = NULL;
+
+       return 0;
+}
+
+static struct acpi_driver acpi_smbus_cmi_driver = {
+       .name = ACPI_SMBUS_HC_DEVICE_NAME,
+       .class = ACPI_SMBUS_HC_CLASS,
+       .ids = acpi_smbus_cmi_ids,
+       .ops = {
+               .add = acpi_smbus_cmi_add,
+               .remove = acpi_smbus_cmi_remove,
+       },
+};
+
+static int __init acpi_smbus_cmi_init(void)
+{
+       return acpi_bus_register_driver(&acpi_smbus_cmi_driver);
+}
+
+static void __exit acpi_smbus_cmi_exit(void)
+{
+       acpi_bus_unregister_driver(&acpi_smbus_cmi_driver);
+}
+
+module_init(acpi_smbus_cmi_init);
+module_exit(acpi_smbus_cmi_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Crane Cai <crane.cai@amd.com>");
+MODULE_DESCRIPTION("ACPI SMBus CMI driver");
index 224aa12..dd39c1e 100644 (file)
 
 #define TAOS_STATE_INIT                0
 #define TAOS_STATE_IDLE                1
-#define TAOS_STATE_SEND                2
+#define TAOS_STATE_EOFF                2
 #define TAOS_STATE_RECV                3
 
 #define TAOS_CMD_RESET         0x12
+#define TAOS_CMD_ECHO_ON       '+'
+#define TAOS_CMD_ECHO_OFF      '-'
 
 static DECLARE_WAIT_QUEUE_HEAD(wq);
 
@@ -102,17 +104,9 @@ static int taos_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
 
        /* Send the transaction to the TAOS EVM */
        dev_dbg(&adapter->dev, "Command buffer: %s\n", taos->buffer);
-       taos->pos = 0;
-       taos->state = TAOS_STATE_SEND;
-       serio_write(serio, taos->buffer[0]);
-       wait_event_interruptible_timeout(wq, taos->state == TAOS_STATE_IDLE,
-                                        msecs_to_jiffies(250));
-       if (taos->state != TAOS_STATE_IDLE) {
-               dev_err(&adapter->dev, "Transaction failed "
-                       "(state=%d, pos=%d)\n", taos->state, taos->pos);
-               taos->addr = 0;
-               return -EIO;
-       }
+       for (p = taos->buffer; *p; p++)
+               serio_write(serio, *p);
+
        taos->addr = addr;
 
        /* Start the transaction and read the answer */
@@ -122,7 +116,7 @@ static int taos_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
        wait_event_interruptible_timeout(wq, taos->state == TAOS_STATE_IDLE,
                                         msecs_to_jiffies(150));
        if (taos->state != TAOS_STATE_IDLE
-        || taos->pos != 6) {
+        || taos->pos != 5) {
                dev_err(&adapter->dev, "Transaction timeout (pos=%d)\n",
                        taos->pos);
                return -EIO;
@@ -130,7 +124,7 @@ static int taos_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
        dev_dbg(&adapter->dev, "Answer buffer: %s\n", taos->buffer);
 
        /* Interpret the returned string */
-       p = taos->buffer + 2;
+       p = taos->buffer + 1;
        p[3] = '\0';
        if (!strcmp(p, "NAK"))
                return -ENODEV;
@@ -173,13 +167,9 @@ static irqreturn_t taos_interrupt(struct serio *serio, unsigned char data,
                        wake_up_interruptible(&wq);
                }
                break;
-       case TAOS_STATE_SEND:
-               if (taos->buffer[++taos->pos])
-                       serio_write(serio, taos->buffer[taos->pos]);
-               else {
-                       taos->state = TAOS_STATE_IDLE;
-                       wake_up_interruptible(&wq);
-               }
+       case TAOS_STATE_EOFF:
+               taos->state = TAOS_STATE_IDLE;
+               wake_up_interruptible(&wq);
                break;
        case TAOS_STATE_RECV:
                taos->buffer[taos->pos++] = data;
@@ -257,6 +247,19 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv)
        }
        strlcpy(adapter->name, name, sizeof(adapter->name));
 
+       /* Turn echo off for better performance */
+       taos->state = TAOS_STATE_EOFF;
+       serio_write(serio, TAOS_CMD_ECHO_OFF);
+
+       wait_event_interruptible_timeout(wq, taos->state == TAOS_STATE_IDLE,
+                                        msecs_to_jiffies(250));
+       if (taos->state != TAOS_STATE_IDLE) {
+               err = -ENODEV;
+               dev_err(&adapter->dev, "Echo off failed "
+                       "(state=%d)\n", taos->state);
+               goto exit_close;
+       }
+
        err = i2c_add_adapter(adapter);
        if (err)
                goto exit_close;
index 648ecc6..cf994bd 100644 (file)
@@ -217,8 +217,10 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
        return;
 
  error:
-       dev_err(&iface->adapter.dev, "%s in state %s\n", errmsg,
-               scx200_acb_state_name[iface->state]);
+       dev_err(&iface->adapter.dev,
+               "%s in state %s (addr=0x%02x, len=%d, status=0x%02x)\n", errmsg,
+               scx200_acb_state_name[iface->state], iface->address_byte,
+               iface->len, status);
 
        iface->state = state_idle;
        iface->result = -EIO;
index 02d746c..f9618f4 100644 (file)
@@ -16,54 +16,6 @@ config DS1682
          This driver can also be built as a module.  If so, the module
          will be called ds1682.
 
-config SENSORS_PCF8574
-       tristate "Philips PCF8574 and PCF8574A (DEPRECATED)"
-       depends on EXPERIMENTAL && GPIO_PCF857X = "n"
-       default n
-       help
-         If you say yes here you get support for Philips PCF8574 and 
-         PCF8574A chips. These chips are 8-bit I/O expanders for the I2C bus.
-
-         This driver can also be built as a module.  If so, the module
-         will be called pcf8574.
-
-         This driver is deprecated and will be dropped soon. Use
-         drivers/gpio/pcf857x.c instead.
-
-         These devices are hard to detect and rarely found on mainstream
-         hardware.  If unsure, say N.
-
-config PCF8575
-       tristate "Philips PCF8575 (DEPRECATED)"
-       default n
-       depends on GPIO_PCF857X = "n"
-       help
-         If you say yes here you get support for Philips PCF8575 chip.
-         This chip is a 16-bit I/O expander for the I2C bus.  Several other
-         chip manufacturers sell equivalent chips, e.g. Texas Instruments.
-
-         This driver can also be built as a module.  If so, the module
-         will be called pcf8575.
-
-         This driver is deprecated and will be dropped soon. Use
-         drivers/gpio/pcf857x.c instead.
-
-         This device is hard to detect and is rarely found on mainstream
-         hardware.  If unsure, say N.
-
-config SENSORS_PCA9539
-       tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)"
-       depends on EXPERIMENTAL && GPIO_PCA953X = "n"
-       help
-         If you say yes here you get support for the Philips PCA9539
-         16-bit I/O port.
-
-         This driver can also be built as a module.  If so, the module
-         will be called pca9539.
-
-         This driver is deprecated and will be dropped soon. Use
-         drivers/gpio/pca953x.c instead.
-
 config SENSORS_TSL2550
        tristate "Taos TSL2550 ambient light sensor"
        depends on EXPERIMENTAL
index f4680d1..749cf36 100644 (file)
@@ -11,9 +11,6 @@
 #
 
 obj-$(CONFIG_DS1682)           += ds1682.o
-obj-$(CONFIG_SENSORS_PCA9539)  += pca9539.o
-obj-$(CONFIG_SENSORS_PCF8574)  += pcf8574.o
-obj-$(CONFIG_PCF8575)          += pcf8575.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
deleted file mode 100644 (file)
index 270de4e..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-    pca9539.c - 16-bit I/O port with interrupt and reset
-
-    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; version 2 of the License.
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/hwmon-sysfs.h>
-
-/* Addresses to scan: none, device is not autodetected */
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(pca9539);
-
-enum pca9539_cmd
-{
-       PCA9539_INPUT_0         = 0,
-       PCA9539_INPUT_1         = 1,
-       PCA9539_OUTPUT_0        = 2,
-       PCA9539_OUTPUT_1        = 3,
-       PCA9539_INVERT_0        = 4,
-       PCA9539_INVERT_1        = 5,
-       PCA9539_DIRECTION_0     = 6,
-       PCA9539_DIRECTION_1     = 7,
-};
-
-/* following are the sysfs callback functions */
-static ssize_t pca9539_show(struct device *dev, struct device_attribute *attr,
-                           char *buf)
-{
-       struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
-       struct i2c_client *client = to_i2c_client(dev);
-       return sprintf(buf, "%d\n", i2c_smbus_read_byte_data(client,
-                                                            psa->index));
-}
-
-static ssize_t pca9539_store(struct device *dev, struct device_attribute *attr,
-                            const char *buf, size_t count)
-{
-       struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
-       struct i2c_client *client = to_i2c_client(dev);
-       unsigned long val = simple_strtoul(buf, NULL, 0);
-       if (val > 0xff)
-               return -EINVAL;
-       i2c_smbus_write_byte_data(client, psa->index, val);
-       return count;
-}
-
-/* Define the device attributes */
-
-#define PCA9539_ENTRY_RO(name, cmd_idx) \
-       static SENSOR_DEVICE_ATTR(name, S_IRUGO, pca9539_show, NULL, cmd_idx)
-
-#define PCA9539_ENTRY_RW(name, cmd_idx) \
-       static SENSOR_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, pca9539_show, \
-                                 pca9539_store, cmd_idx)
-
-PCA9539_ENTRY_RO(input0, PCA9539_INPUT_0);
-PCA9539_ENTRY_RO(input1, PCA9539_INPUT_1);
-PCA9539_ENTRY_RW(output0, PCA9539_OUTPUT_0);
-PCA9539_ENTRY_RW(output1, PCA9539_OUTPUT_1);
-PCA9539_ENTRY_RW(invert0, PCA9539_INVERT_0);
-PCA9539_ENTRY_RW(invert1, PCA9539_INVERT_1);
-PCA9539_ENTRY_RW(direction0, PCA9539_DIRECTION_0);
-PCA9539_ENTRY_RW(direction1, PCA9539_DIRECTION_1);
-
-static struct attribute *pca9539_attributes[] = {
-       &sensor_dev_attr_input0.dev_attr.attr,
-       &sensor_dev_attr_input1.dev_attr.attr,
-       &sensor_dev_attr_output0.dev_attr.attr,
-       &sensor_dev_attr_output1.dev_attr.attr,
-       &sensor_dev_attr_invert0.dev_attr.attr,
-       &sensor_dev_attr_invert1.dev_attr.attr,
-       &sensor_dev_attr_direction0.dev_attr.attr,
-       &sensor_dev_attr_direction1.dev_attr.attr,
-       NULL
-};
-
-static struct attribute_group pca9539_defattr_group = {
-       .attrs = pca9539_attributes,
-};
-
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int pca9539_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info)
-{
-       struct i2c_adapter *adapter = client->adapter;
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               return -ENODEV;
-
-       strlcpy(info->type, "pca9539", I2C_NAME_SIZE);
-
-       return 0;
-}
-
-static int pca9539_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-       /* Register sysfs hooks */
-       return sysfs_create_group(&client->dev.kobj,
-                                 &pca9539_defattr_group);
-}
-
-static int pca9539_remove(struct i2c_client *client)
-{
-       sysfs_remove_group(&client->dev.kobj, &pca9539_defattr_group);
-       return 0;
-}
-
-static const struct i2c_device_id pca9539_id[] = {
-       { "pca9539", 0 },
-       { }
-};
-
-static struct i2c_driver pca9539_driver = {
-       .driver = {
-               .name   = "pca9539",
-       },
-       .probe          = pca9539_probe,
-       .remove         = pca9539_remove,
-       .id_table       = pca9539_id,
-
-       .detect         = pca9539_detect,
-       .address_data   = &addr_data,
-};
-
-static int __init pca9539_init(void)
-{
-       return i2c_add_driver(&pca9539_driver);
-}
-
-static void __exit pca9539_exit(void)
-{
-       i2c_del_driver(&pca9539_driver);
-}
-
-MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
-MODULE_DESCRIPTION("PCA9539 driver");
-MODULE_LICENSE("GPL");
-
-module_init(pca9539_init);
-module_exit(pca9539_exit);
-
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
deleted file mode 100644 (file)
index 6ec3098..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>, 
-                        Philip Edelbrock <phil@netroedge.com>,
-                        Dan Eaton <dan.eaton@rocketlogix.com>
-    Ported to Linux 2.6 by Aurelien Jarno <aurel32@debian.org> with 
-    the help of Jean Delvare <khali@linux-fr.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* A few notes about the PCF8574:
-
-* The PCF8574 is an 8-bit I/O expander for the I2C bus produced by
-  Philips Semiconductors.  It is designed to provide a byte I2C
-  interface to up to 8 separate devices.
-  
-* The PCF8574 appears as a very simple SMBus device which can be
-  read from or written to with SMBUS byte read/write accesses.
-
-  --Dan
-
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-
-/* Addresses to scan: none, device can't be detected */
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);
-
-/* Each client has this additional data */
-struct pcf8574_data {
-       int write;                      /* Remember last written value */
-};
-
-static void pcf8574_init_client(struct i2c_client *client);
-
-/* following are the sysfs callback functions */
-static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       return sprintf(buf, "%u\n", i2c_smbus_read_byte(client));
-}
-
-static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
-
-static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev));
-
-       if (data->write < 0)
-               return data->write;
-
-       return sprintf(buf, "%d\n", data->write);
-}
-
-static ssize_t set_write(struct device *dev, struct device_attribute *attr, const char *buf,
-                        size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf8574_data *data = i2c_get_clientdata(client);
-       unsigned long val = simple_strtoul(buf, NULL, 10);
-
-       if (val > 0xff)
-               return -EINVAL;
-
-       data->write = val;
-       i2c_smbus_write_byte(client, data->write);
-       return count;
-}
-
-static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
-
-static struct attribute *pcf8574_attributes[] = {
-       &dev_attr_read.attr,
-       &dev_attr_write.attr,
-       NULL
-};
-
-static const struct attribute_group pcf8574_attr_group = {
-       .attrs = pcf8574_attributes,
-};
-
-/*
- * Real code
- */
-
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int pcf8574_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info)
-{
-       struct i2c_adapter *adapter = client->adapter;
-       const char *client_name;
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
-               return -ENODEV;
-
-       /* Now, we would do the remaining detection. But the PCF8574 is plainly
-          impossible to detect! Stupid chip. */
-
-       /* Determine the chip type */
-       if (kind <= 0) {
-               if (client->addr >= 0x38 && client->addr <= 0x3f)
-                       kind = pcf8574a;
-               else
-                       kind = pcf8574;
-       }
-
-       if (kind == pcf8574a)
-               client_name = "pcf8574a";
-       else
-               client_name = "pcf8574";
-       strlcpy(info->type, client_name, I2C_NAME_SIZE);
-
-       return 0;
-}
-
-static int pcf8574_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-       struct pcf8574_data *data;
-       int err;
-
-       data = kzalloc(sizeof(struct pcf8574_data), GFP_KERNEL);
-       if (!data) {
-               err = -ENOMEM;
-               goto exit;
-       }
-
-       i2c_set_clientdata(client, data);
-
-       /* Initialize the PCF8574 chip */
-       pcf8574_init_client(client);
-
-       /* Register sysfs hooks */
-       err = sysfs_create_group(&client->dev.kobj, &pcf8574_attr_group);
-       if (err)
-               goto exit_free;
-       return 0;
-
-      exit_free:
-       kfree(data);
-      exit:
-       return err;
-}
-
-static int pcf8574_remove(struct i2c_client *client)
-{
-       sysfs_remove_group(&client->dev.kobj, &pcf8574_attr_group);
-       kfree(i2c_get_clientdata(client));
-       return 0;
-}
-
-/* Called when we have found a new PCF8574. */
-static void pcf8574_init_client(struct i2c_client *client)
-{
-       struct pcf8574_data *data = i2c_get_clientdata(client);
-       data->write = -EAGAIN;
-}
-
-static const struct i2c_device_id pcf8574_id[] = {
-       { "pcf8574", 0 },
-       { "pcf8574a", 0 },
-       { }
-};
-
-static struct i2c_driver pcf8574_driver = {
-       .driver = {
-               .name   = "pcf8574",
-       },
-       .probe          = pcf8574_probe,
-       .remove         = pcf8574_remove,
-       .id_table       = pcf8574_id,
-
-       .detect         = pcf8574_detect,
-       .address_data   = &addr_data,
-};
-
-static int __init pcf8574_init(void)
-{
-       return i2c_add_driver(&pcf8574_driver);
-}
-
-static void __exit pcf8574_exit(void)
-{
-       i2c_del_driver(&pcf8574_driver);
-}
-
-
-MODULE_AUTHOR
-    ("Frodo Looijaard <frodol@dds.nl>, "
-     "Philip Edelbrock <phil@netroedge.com>, "
-     "Dan Eaton <dan.eaton@rocketlogix.com> "
-     "and Aurelien Jarno <aurelien@aurel32.net>");
-MODULE_DESCRIPTION("PCF8574 driver");
-MODULE_LICENSE("GPL");
-
-module_init(pcf8574_init);
-module_exit(pcf8574_exit);
diff --git a/drivers/i2c/chips/pcf8575.c b/drivers/i2c/chips/pcf8575.c
deleted file mode 100644 (file)
index 07fd7cb..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-  pcf8575.c
-
-  About the PCF8575 chip: the PCF8575 is a 16-bit I/O expander for the I2C bus
-  produced by a.o. Philips Semiconductors.
-
-  Copyright (C) 2006 Michael Hennerich, Analog Devices Inc.
-  <hennerich@blackfin.uclinux.org>
-  Based on pcf8574.c.
-
-  Copyright (c) 2007 Bart Van Assche <bart.vanassche@gmail.com>.
-  Ported this driver from ucLinux to the mainstream Linux kernel.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/i2c.h>
-#include <linux/slab.h>  /* kzalloc() */
-#include <linux/sysfs.h> /* sysfs_create_group() */
-
-/* Addresses to scan: none, device can't be detected */
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD;
-
-
-/* Each client has this additional data */
-struct pcf8575_data {
-       int write;              /* last written value, or error code */
-};
-
-/* following are the sysfs callback functions */
-static ssize_t show_read(struct device *dev, struct device_attribute *attr,
-                        char *buf)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       u16 val;
-       u8 iopin_state[2];
-
-       i2c_master_recv(client, iopin_state, 2);
-
-       val = iopin_state[0];
-       val |= iopin_state[1] << 8;
-
-       return sprintf(buf, "%u\n", val);
-}
-
-static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
-
-static ssize_t show_write(struct device *dev, struct device_attribute *attr,
-                         char *buf)
-{
-       struct pcf8575_data *data = dev_get_drvdata(dev);
-       if (data->write < 0)
-               return data->write;
-       return sprintf(buf, "%d\n", data->write);
-}
-
-static ssize_t set_write(struct device *dev, struct device_attribute *attr,
-                        const char *buf, size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf8575_data *data = i2c_get_clientdata(client);
-       unsigned long val = simple_strtoul(buf, NULL, 10);
-       u8 iopin_state[2];
-
-       if (val > 0xffff)
-               return -EINVAL;
-
-       data->write = val;
-
-       iopin_state[0] = val & 0xFF;
-       iopin_state[1] = val >> 8;
-
-       i2c_master_send(client, iopin_state, 2);
-
-       return count;
-}
-
-static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
-
-static struct attribute *pcf8575_attributes[] = {
-       &dev_attr_read.attr,
-       &dev_attr_write.attr,
-       NULL
-};
-
-static const struct attribute_group pcf8575_attr_group = {
-       .attrs = pcf8575_attributes,
-};
-
-/*
- * Real code
- */
-
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int pcf8575_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info)
-{
-       struct i2c_adapter *adapter = client->adapter;
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
-               return -ENODEV;
-
-       /* This is the place to detect whether the chip at the specified
-          address really is a PCF8575 chip. However, there is no method known
-          to detect whether an I2C chip is a PCF8575 or any other I2C chip. */
-
-       strlcpy(info->type, "pcf8575", I2C_NAME_SIZE);
-
-       return 0;
-}
-
-static int pcf8575_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-       struct pcf8575_data *data;
-       int err;
-
-       data = kzalloc(sizeof(struct pcf8575_data), GFP_KERNEL);
-       if (!data) {
-               err = -ENOMEM;
-               goto exit;
-       }
-
-       i2c_set_clientdata(client, data);
-       data->write = -EAGAIN;
-
-       /* Register sysfs hooks */
-       err = sysfs_create_group(&client->dev.kobj, &pcf8575_attr_group);
-       if (err)
-               goto exit_free;
-
-       return 0;
-
-exit_free:
-       kfree(data);
-exit:
-       return err;
-}
-
-static int pcf8575_remove(struct i2c_client *client)
-{
-       sysfs_remove_group(&client->dev.kobj, &pcf8575_attr_group);
-       kfree(i2c_get_clientdata(client));
-       return 0;
-}
-
-static const struct i2c_device_id pcf8575_id[] = {
-       { "pcf8575", 0 },
-       { }
-};
-
-static struct i2c_driver pcf8575_driver = {
-       .driver = {
-               .owner  = THIS_MODULE,
-               .name   = "pcf8575",
-       },
-       .probe          = pcf8575_probe,
-       .remove         = pcf8575_remove,
-       .id_table       = pcf8575_id,
-
-       .detect         = pcf8575_detect,
-       .address_data   = &addr_data,
-};
-
-static int __init pcf8575_init(void)
-{
-       return i2c_add_driver(&pcf8575_driver);
-}
-
-static void __exit pcf8575_exit(void)
-{
-       i2c_del_driver(&pcf8575_driver);
-}
-
-MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>, "
-             "Bart Van Assche <bart.vanassche@gmail.com>");
-MODULE_DESCRIPTION("pcf8575 driver");
-MODULE_LICENSE("GPL");
-
-module_init(pcf8575_init);
-module_exit(pcf8575_exit);
index b96f302..aa96bd2 100644 (file)
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
-#include <linux/delay.h>
 
 #define TSL2550_DRV_NAME       "tsl2550"
-#define DRIVER_VERSION         "1.1.2"
+#define DRIVER_VERSION         "1.2"
 
 /*
  * Defines
@@ -96,32 +95,13 @@ static int tsl2550_set_power_state(struct i2c_client *client, int state)
 
 static int tsl2550_get_adc_value(struct i2c_client *client, u8 cmd)
 {
-       unsigned long end;
-       int loop = 0, ret = 0;
+       int ret;
 
-       /*
-        * Read ADC channel waiting at most 400ms (see data sheet for further
-        * info).
-        * To avoid long busy wait we spin for few milliseconds then
-        * start sleeping.
-        */
-       end = jiffies + msecs_to_jiffies(400);
-       while (time_before(jiffies, end)) {
-               i2c_smbus_write_byte(client, cmd);
-
-               if (loop++ < 5)
-                       mdelay(1);
-               else
-                       msleep(1);
-
-               ret = i2c_smbus_read_byte(client);
-               if (ret < 0)
-                       return ret;
-               else if (ret & 0x0080)
-                       break;
-       }
+       ret = i2c_smbus_read_byte_data(client, cmd);
+       if (ret < 0)
+               return ret;
        if (!(ret & 0x80))
-               return -EIO;
+               return -EAGAIN;
        return ret & 0x7f;      /* remove the "valid" bit */
 }
 
@@ -285,8 +265,6 @@ static ssize_t __tsl2550_show_lux(struct i2c_client *client, char *buf)
                return ret;
        ch0 = ret;
 
-       mdelay(1);
-
        ret = tsl2550_get_adc_value(client, TSL2550_READ_ADC1);
        if (ret < 0)
                return ret;
@@ -345,11 +323,10 @@ static int tsl2550_init_client(struct i2c_client *client)
         * Probe the chip. To do so we try to power up the device and then to
         * read back the 0x03 code
         */
-       err = i2c_smbus_write_byte(client, TSL2550_POWER_UP);
+       err = i2c_smbus_read_byte_data(client, TSL2550_POWER_UP);
        if (err < 0)
                return err;
-       mdelay(1);
-       if (i2c_smbus_read_byte(client) != TSL2550_POWER_UP)
+       if (err != TSL2550_POWER_UP)
                return -ENODEV;
        data->power_state = 1;
 
@@ -374,7 +351,8 @@ static int __devinit tsl2550_probe(struct i2c_client *client,
        struct tsl2550_data *data;
        int *opmode, err = 0;
 
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE)) {
+       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE
+                                           | I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
                err = -EIO;
                goto exit;
        }
index 0e45c29..8d80fce 100644 (file)
@@ -46,6 +46,7 @@ static DEFINE_MUTEX(core_lock);
 static DEFINE_IDR(i2c_adapter_idr);
 static LIST_HEAD(userspace_devices);
 
+static struct device_type i2c_client_type;
 static int i2c_check_addr(struct i2c_adapter *adapter, int addr);
 static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
 
@@ -64,9 +65,13 @@ static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
 
 static int i2c_device_match(struct device *dev, struct device_driver *drv)
 {
-       struct i2c_client       *client = to_i2c_client(dev);
-       struct i2c_driver       *driver = to_i2c_driver(drv);
+       struct i2c_client       *client = i2c_verify_client(dev);
+       struct i2c_driver       *driver;
+
+       if (!client)
+               return 0;
 
+       driver = to_i2c_driver(drv);
        /* match on an id table if there is one */
        if (driver->id_table)
                return i2c_match_id(driver->id_table, client) != NULL;
@@ -94,10 +99,14 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 
 static int i2c_device_probe(struct device *dev)
 {
-       struct i2c_client       *client = to_i2c_client(dev);
-       struct i2c_driver       *driver = to_i2c_driver(dev->driver);
+       struct i2c_client       *client = i2c_verify_client(dev);
+       struct i2c_driver       *driver;
        int status;
 
+       if (!client)
+               return 0;
+
+       driver = to_i2c_driver(dev->driver);
        if (!driver->probe || !driver->id_table)
                return -ENODEV;
        client->driver = driver;
@@ -114,11 +123,11 @@ static int i2c_device_probe(struct device *dev)
 
 static int i2c_device_remove(struct device *dev)
 {
-       struct i2c_client       *client = to_i2c_client(dev);
+       struct i2c_client       *client = i2c_verify_client(dev);
        struct i2c_driver       *driver;
        int                     status;
 
-       if (!dev->driver)
+       if (!client || !dev->driver)
                return 0;
 
        driver = to_i2c_driver(dev->driver);
@@ -136,37 +145,40 @@ static int i2c_device_remove(struct device *dev)
 
 static void i2c_device_shutdown(struct device *dev)
 {
+       struct i2c_client *client = i2c_verify_client(dev);
        struct i2c_driver *driver;
 
-       if (!dev->driver)
+       if (!client || !dev->driver)
                return;
        driver = to_i2c_driver(dev->driver);
        if (driver->shutdown)
-               driver->shutdown(to_i2c_client(dev));
+               driver->shutdown(client);
 }
 
 static int i2c_device_suspend(struct device *dev, pm_message_t mesg)
 {
+       struct i2c_client *client = i2c_verify_client(dev);
        struct i2c_driver *driver;
 
-       if (!dev->driver)
+       if (!client || !dev->driver)
                return 0;
        driver = to_i2c_driver(dev->driver);
        if (!driver->suspend)
                return 0;
-       return driver->suspend(to_i2c_client(dev), mesg);
+       return driver->suspend(client, mesg);
 }
 
 static int i2c_device_resume(struct device *dev)
 {
+       struct i2c_client *client = i2c_verify_client(dev);
        struct i2c_driver *driver;
 
-       if (!dev->driver)
+       if (!client || !dev->driver)
                return 0;
        driver = to_i2c_driver(dev->driver);
        if (!driver->resume)
                return 0;
-       return driver->resume(to_i2c_client(dev));
+       return driver->resume(client);
 }
 
 static void i2c_client_dev_release(struct device *dev)
@@ -175,10 +187,10 @@ static void i2c_client_dev_release(struct device *dev)
 }
 
 static ssize_t
-show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
+show_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       return sprintf(buf, "%s\n", client->name);
+       return sprintf(buf, "%s\n", dev->type == &i2c_client_type ?
+                      to_i2c_client(dev)->name : to_i2c_adapter(dev)->name);
 }
 
 static ssize_t
@@ -188,18 +200,28 @@ show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
        return sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
 }
 
-static struct device_attribute i2c_dev_attrs[] = {
-       __ATTR(name, S_IRUGO, show_client_name, NULL),
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
+
+static struct attribute *i2c_dev_attrs[] = {
+       &dev_attr_name.attr,
        /* modalias helps coldplug:  modprobe $(cat .../modalias) */
-       __ATTR(modalias, S_IRUGO, show_modalias, NULL),
-       { },
+       &dev_attr_modalias.attr,
+       NULL
+};
+
+static struct attribute_group i2c_dev_attr_group = {
+       .attrs          = i2c_dev_attrs,
+};
+
+static const struct attribute_group *i2c_dev_attr_groups[] = {
+       &i2c_dev_attr_group,
+       NULL
 };
 
 struct bus_type i2c_bus_type = {
        .name           = "i2c",
-       .dev_attrs      = i2c_dev_attrs,
        .match          = i2c_device_match,
-       .uevent         = i2c_device_uevent,
        .probe          = i2c_device_probe,
        .remove         = i2c_device_remove,
        .shutdown       = i2c_device_shutdown,
@@ -208,6 +230,12 @@ struct bus_type i2c_bus_type = {
 };
 EXPORT_SYMBOL_GPL(i2c_bus_type);
 
+static struct device_type i2c_client_type = {
+       .groups         = i2c_dev_attr_groups,
+       .uevent         = i2c_device_uevent,
+       .release        = i2c_client_dev_release,
+};
+
 
 /**
  * i2c_verify_client - return parameter as i2c_client, or NULL
@@ -220,7 +248,7 @@ EXPORT_SYMBOL_GPL(i2c_bus_type);
  */
 struct i2c_client *i2c_verify_client(struct device *dev)
 {
-       return (dev->bus == &i2c_bus_type)
+       return (dev->type == &i2c_client_type)
                        ? to_i2c_client(dev)
                        : NULL;
 }
@@ -273,7 +301,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
 
        client->dev.parent = &client->adapter->dev;
        client->dev.bus = &i2c_bus_type;
-       client->dev.release = i2c_client_dev_release;
+       client->dev.type = &i2c_client_type;
 
        dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
                     client->addr);
@@ -368,13 +396,6 @@ static void i2c_adapter_dev_release(struct device *dev)
        complete(&adap->dev_released);
 }
 
-static ssize_t
-show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct i2c_adapter *adap = to_i2c_adapter(dev);
-       return sprintf(buf, "%s\n", adap->name);
-}
-
 /*
  * Let users instantiate I2C devices through sysfs. This can be used when
  * platform initialization code doesn't contain the proper data for
@@ -493,19 +514,34 @@ i2c_sysfs_delete_device(struct device *dev, struct device_attribute *attr,
        return res;
 }
 
-static struct device_attribute i2c_adapter_attrs[] = {
-       __ATTR(name, S_IRUGO, show_adapter_name, NULL),
-       __ATTR(new_device, S_IWUSR, NULL, i2c_sysfs_new_device),
-       __ATTR(delete_device, S_IWUSR, NULL, i2c_sysfs_delete_device),
-       { },
+static DEVICE_ATTR(new_device, S_IWUSR, NULL, i2c_sysfs_new_device);
+static DEVICE_ATTR(delete_device, S_IWUSR, NULL, i2c_sysfs_delete_device);
+
+static struct attribute *i2c_adapter_attrs[] = {
+       &dev_attr_name.attr,
+       &dev_attr_new_device.attr,
+       &dev_attr_delete_device.attr,
+       NULL
 };
 
-static struct class i2c_adapter_class = {
-       .owner                  = THIS_MODULE,
-       .name                   = "i2c-adapter",
-       .dev_attrs              = i2c_adapter_attrs,
+static struct attribute_group i2c_adapter_attr_group = {
+       .attrs          = i2c_adapter_attrs,
 };
 
+static const struct attribute_group *i2c_adapter_attr_groups[] = {
+       &i2c_adapter_attr_group,
+       NULL
+};
+
+static struct device_type i2c_adapter_type = {
+       .groups         = i2c_adapter_attr_groups,
+       .release        = i2c_adapter_dev_release,
+};
+
+#ifdef CONFIG_I2C_COMPAT
+static struct class_compat *i2c_adapter_compat_class;
+#endif
+
 static void i2c_scan_static_board_info(struct i2c_adapter *adapter)
 {
        struct i2c_devinfo      *devinfo;
@@ -555,14 +591,22 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                adap->timeout = HZ;
 
        dev_set_name(&adap->dev, "i2c-%d", adap->nr);
-       adap->dev.release = &i2c_adapter_dev_release;
-       adap->dev.class = &i2c_adapter_class;
+       adap->dev.bus = &i2c_bus_type;
+       adap->dev.type = &i2c_adapter_type;
        res = device_register(&adap->dev);
        if (res)
                goto out_list;
 
        dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
 
+#ifdef CONFIG_I2C_COMPAT
+       res = class_compat_create_link(i2c_adapter_compat_class, &adap->dev,
+                                      adap->dev.parent);
+       if (res)
+               dev_warn(&adap->dev,
+                        "Failed to create compatibility class link\n");
+#endif
+
        /* create pre-declared device nodes */
        if (adap->nr < __i2c_first_dynamic_bus_num)
                i2c_scan_static_board_info(adap);
@@ -741,6 +785,11 @@ int i2c_del_adapter(struct i2c_adapter *adap)
           checking the returned value. */
        res = device_for_each_child(&adap->dev, NULL, __unregister_client);
 
+#ifdef CONFIG_I2C_COMPAT
+       class_compat_remove_link(i2c_adapter_compat_class, &adap->dev,
+                                adap->dev.parent);
+#endif
+
        /* clean up the sysfs representation */
        init_completion(&adap->dev_released);
        device_unregister(&adap->dev);
@@ -768,9 +817,13 @@ EXPORT_SYMBOL(i2c_del_adapter);
 
 static int __attach_adapter(struct device *dev, void *data)
 {
-       struct i2c_adapter *adapter = to_i2c_adapter(dev);
+       struct i2c_adapter *adapter;
        struct i2c_driver *driver = data;
 
+       if (dev->type != &i2c_adapter_type)
+               return 0;
+       adapter = to_i2c_adapter(dev);
+
        i2c_detect(adapter, driver);
 
        /* Legacy drivers scan i2c busses directly */
@@ -809,8 +862,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
        INIT_LIST_HEAD(&driver->clients);
        /* Walk the adapters that are already present */
        mutex_lock(&core_lock);
-       class_for_each_device(&i2c_adapter_class, NULL, driver,
-                             __attach_adapter);
+       bus_for_each_dev(&i2c_bus_type, NULL, driver, __attach_adapter);
        mutex_unlock(&core_lock);
 
        return 0;
@@ -819,10 +871,14 @@ EXPORT_SYMBOL(i2c_register_driver);
 
 static int __detach_adapter(struct device *dev, void *data)
 {
-       struct i2c_adapter *adapter = to_i2c_adapter(dev);
+       struct i2c_adapter *adapter;
        struct i2c_driver *driver = data;
        struct i2c_client *client, *_n;
 
+       if (dev->type != &i2c_adapter_type)
+               return 0;
+       adapter = to_i2c_adapter(dev);
+
        /* Remove the devices we created ourselves as the result of hardware
         * probing (using a driver's detect method) */
        list_for_each_entry_safe(client, _n, &driver->clients, detected) {
@@ -850,8 +906,7 @@ static int __detach_adapter(struct device *dev, void *data)
 void i2c_del_driver(struct i2c_driver *driver)
 {
        mutex_lock(&core_lock);
-       class_for_each_device(&i2c_adapter_class, NULL, driver,
-                             __detach_adapter);
+       bus_for_each_dev(&i2c_bus_type, NULL, driver, __detach_adapter);
        mutex_unlock(&core_lock);
 
        driver_unregister(&driver->driver);
@@ -940,17 +995,23 @@ static int __init i2c_init(void)
        retval = bus_register(&i2c_bus_type);
        if (retval)
                return retval;
-       retval = class_register(&i2c_adapter_class);
-       if (retval)
+#ifdef CONFIG_I2C_COMPAT
+       i2c_adapter_compat_class = class_compat_register("i2c-adapter");
+       if (!i2c_adapter_compat_class) {
+               retval = -ENOMEM;
                goto bus_err;
+       }
+#endif
        retval = i2c_add_driver(&dummy_driver);
        if (retval)
                goto class_err;
        return 0;
 
 class_err:
-       class_unregister(&i2c_adapter_class);
+#ifdef CONFIG_I2C_COMPAT
+       class_compat_unregister(i2c_adapter_compat_class);
 bus_err:
+#endif
        bus_unregister(&i2c_bus_type);
        return retval;
 }
@@ -958,7 +1019,9 @@ bus_err:
 static void __exit i2c_exit(void)
 {
        i2c_del_driver(&dummy_driver);
-       class_unregister(&i2c_adapter_class);
+#ifdef CONFIG_I2C_COMPAT
+       class_compat_unregister(i2c_adapter_compat_class);
+#endif
        bus_unregister(&i2c_bus_type);
 }
 
index c509c99..c0cf45a 100644 (file)
@@ -114,8 +114,6 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle,
        unsigned int bus, devnum, func;
        acpi_integer addr;
        acpi_handle dev_handle;
-       struct acpi_buffer buffer = {.length = ACPI_ALLOCATE_BUFFER,
-                                       .pointer = NULL};
        acpi_status status;
        struct acpi_device_info *dinfo = NULL;
        int ret = -ENODEV;
@@ -134,12 +132,11 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle,
                goto err;
        }
 
-       status = acpi_get_object_info(dev_handle, &buffer);
+       status = acpi_get_object_info(dev_handle, &dinfo);
        if (ACPI_FAILURE(status)) {
                DEBPRINT("get_object_info for device failed\n");
                goto err;
        }
-       dinfo = buffer.pointer;
        if (dinfo && (dinfo->valid & ACPI_VALID_ADR) &&
            dinfo->address == addr) {
                *pcidevfn = addr;
index b79ca41..64207df 100644 (file)
@@ -1686,7 +1686,7 @@ static int idecd_revalidate_disk(struct gendisk *disk)
        return  0;
 }
 
-static struct block_device_operations idecd_ops = {
+static const struct block_device_operations idecd_ops = {
        .owner                  = THIS_MODULE,
        .open                   = idecd_open,
        .release                = idecd_release,
index 2141190..7532414 100644 (file)
@@ -321,7 +321,7 @@ static int ide_gd_ioctl(struct block_device *bdev, fmode_t mode,
        return drive->disk_ops->ioctl(drive, bdev, mode, cmd, arg);
 }
 
-static struct block_device_operations ide_gd_ops = {
+static const struct block_device_operations ide_gd_ops = {
        .owner                  = THIS_MODULE,
        .open                   = ide_gd_open,
        .release                = ide_gd_release,
index 8de442c..63c53d6 100644 (file)
@@ -1212,7 +1212,7 @@ static int ide_find_port_slot(const struct ide_port_info *d)
 {
        int idx = -ENOENT;
        u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1;
-       u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;;
+       u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;
 
        /*
         * Claim an unassigned slot.
index 9d6f62b..58fc920 100644 (file)
@@ -1913,7 +1913,7 @@ static int idetape_ioctl(struct block_device *bdev, fmode_t mode,
        return err;
 }
 
-static struct block_device_operations idetape_block_ops = {
+static const struct block_device_operations idetape_block_ops = {
        .owner          = THIS_MODULE,
        .open           = idetape_open,
        .release        = idetape_release,
index 0608d41..60f936e 100644 (file)
@@ -170,9 +170,9 @@ static int __init umc8672_init(void)
                goto out;
 
        if (umc8672_probe() == 0)
-               return 0;;
+               return 0;
 out:
-       return -ENODEV;;
+       return -ENODEV;
 }
 
 module_init(umc8672_init);
index 7663a2a..7550a53 100644 (file)
@@ -2463,7 +2463,7 @@ int ehca_create_busmap(void)
        int ret;
 
        ehca_mr_len = 0;
-       ret = walk_memory_resource(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
+       ret = walk_system_ram_range(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
                                   ehca_create_busmap_callback);
        return ret;
 }
index 02831ad..4bd39c8 100644 (file)
@@ -809,7 +809,7 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd)
  * errors.  We only bother to do this at load time, because it's OK if
  * it happened before we were loaded (first time after boot/reset),
  * but any time after that, it's fatal anyway.  Also need to not check
- * for for upper byte errors if we are in 8 bit mode, so figure out
+ * for upper byte errors if we are in 8 bit mode, so figure out
  * our width.  For now, at least, also complain if it's 8 bit.
  */
 static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev,
index 851791d..556539d 100644 (file)
@@ -1265,14 +1265,14 @@ static struct device_type input_dev_type = {
        .uevent         = input_dev_uevent,
 };
 
-static char *input_nodename(struct device *dev)
+static char *input_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev));
 }
 
 struct class input_class = {
        .name           = "input",
-       .nodename       = input_nodename,
+       .devnode        = input_devnode,
 };
 EXPORT_SYMBOL_GPL(input_class);
 
index c9523e4..adb09e2 100644 (file)
@@ -229,7 +229,7 @@ struct atkbd {
 };
 
 /*
- * System-specific ketymap fixup routine
+ * System-specific keymap fixup routine
  */
 static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);
 static void *atkbd_platform_fixup_data;
index 1a50be3..76d6751 100644 (file)
@@ -222,6 +222,22 @@ config INPUT_SGI_BTNS
          To compile this driver as a module, choose M here: the
          module will be called sgi_btns.
 
+config INPUT_WINBOND_CIR
+       tristate "Winbond IR remote control"
+       depends on X86 && PNP
+       select LEDS_CLASS
+       select BITREVERSE
+       help
+         Say Y here if you want to use the IR remote functionality found
+         in some Winbond SuperI/O chips. Currently only the WPCD376I
+         chip is supported (included in some Intel Media series motherboards).
+
+         IR Receive and wake-on-IR from suspend and power-off is currently
+         supported.
+
+         To compile this driver as a module, choose M here: the module will be
+         called winbond_cir.
+
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on (GSC || HP300) && SERIO
index bf4db62..a8b8485 100644 (file)
@@ -26,6 +26,7 @@ obj-$(CONFIG_INPUT_SGI_BTNS)          += sgi_btns.o
 obj-$(CONFIG_INPUT_SPARCSPKR)          += sparcspkr.o
 obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)  += twl4030-pwrbutton.o
 obj-$(CONFIG_INPUT_UINPUT)             += uinput.o
+obj-$(CONFIG_INPUT_WINBOND_CIR)                += winbond-cir.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)       += wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)          += wm831x-on.o
 obj-$(CONFIG_INPUT_YEALINK)            += yealink.o
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c
new file mode 100644 (file)
index 0000000..33309fe
--- /dev/null
@@ -0,0 +1,1614 @@
+/*
+ *  winbond-cir.c - Driver for the Consumer IR functionality of Winbond
+ *                  SuperI/O chips.
+ *
+ *  Currently supports the Winbond WPCD376i chip (PNP id WEC1022), but
+ *  could probably support others (Winbond WEC102X, NatSemi, etc)
+ *  with minor modifications.
+ *
+ *  Original Author: David Härdeman <david@hardeman.nu>
+ *     Copyright (C) 2009 David Härdeman <david@hardeman.nu>
+ *
+ *  Dedicated to Matilda, my newborn daughter, without whose loving attention
+ *  this driver would have been finished in half the time and with a fraction
+ *  of the bugs.
+ *
+ *  Written using:
+ *    o Winbond WPCD376I datasheet helpfully provided by Jesse Barnes at Intel
+ *    o NatSemi PC87338/PC97338 datasheet (for the serial port stuff)
+ *    o DSDT dumps
+ *
+ *  Supported features:
+ *    o RC6
+ *    o Wake-On-CIR functionality
+ *
+ *  To do:
+ *    o Test NEC and RC5
+ *
+ *  Left as an exercise for the reader:
+ *    o Learning (I have neither the hardware, nor the need)
+ *    o IR Transmit (ibid)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/pnp.h>
+#include <linux/interrupt.h>
+#include <linux/timer.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/pci_ids.h>
+#include <linux/io.h>
+#include <linux/bitrev.h>
+#include <linux/bitops.h>
+
+#define DRVNAME "winbond-cir"
+
+/* CEIR Wake-Up Registers, relative to data->wbase                      */
+#define WBCIR_REG_WCEIR_CTL    0x03 /* CEIR Receiver Control           */
+#define WBCIR_REG_WCEIR_STS    0x04 /* CEIR Receiver Status            */
+#define WBCIR_REG_WCEIR_EV_EN  0x05 /* CEIR Receiver Event Enable      */
+#define WBCIR_REG_WCEIR_CNTL   0x06 /* CEIR Receiver Counter Low       */
+#define WBCIR_REG_WCEIR_CNTH   0x07 /* CEIR Receiver Counter High      */
+#define WBCIR_REG_WCEIR_INDEX  0x08 /* CEIR Receiver Index             */
+#define WBCIR_REG_WCEIR_DATA   0x09 /* CEIR Receiver Data              */
+#define WBCIR_REG_WCEIR_CSL    0x0A /* CEIR Re. Compare Strlen         */
+#define WBCIR_REG_WCEIR_CFG1   0x0B /* CEIR Re. Configuration 1        */
+#define WBCIR_REG_WCEIR_CFG2   0x0C /* CEIR Re. Configuration 2        */
+
+/* CEIR Enhanced Functionality Registers, relative to data->ebase       */
+#define WBCIR_REG_ECEIR_CTS    0x00 /* Enhanced IR Control Status      */
+#define WBCIR_REG_ECEIR_CCTL   0x01 /* Infrared Counter Control        */
+#define WBCIR_REG_ECEIR_CNT_LO 0x02 /* Infrared Counter LSB            */
+#define WBCIR_REG_ECEIR_CNT_HI 0x03 /* Infrared Counter MSB            */
+#define WBCIR_REG_ECEIR_IREM   0x04 /* Infrared Emitter Status         */
+
+/* SP3 Banked Registers, relative to data->sbase                        */
+#define WBCIR_REG_SP3_BSR      0x03 /* Bank Select, all banks          */
+                                     /* Bank 0                         */
+#define WBCIR_REG_SP3_RXDATA   0x00 /* FIFO RX data (r)                */
+#define WBCIR_REG_SP3_TXDATA   0x00 /* FIFO TX data (w)                */
+#define WBCIR_REG_SP3_IER      0x01 /* Interrupt Enable                */
+#define WBCIR_REG_SP3_EIR      0x02 /* Event Identification (r)        */
+#define WBCIR_REG_SP3_FCR      0x02 /* FIFO Control (w)                */
+#define WBCIR_REG_SP3_MCR      0x04 /* Mode Control                    */
+#define WBCIR_REG_SP3_LSR      0x05 /* Link Status                     */
+#define WBCIR_REG_SP3_MSR      0x06 /* Modem Status                    */
+#define WBCIR_REG_SP3_ASCR     0x07 /* Aux Status and Control          */
+                                     /* Bank 2                         */
+#define WBCIR_REG_SP3_BGDL     0x00 /* Baud Divisor LSB                */
+#define WBCIR_REG_SP3_BGDH     0x01 /* Baud Divisor MSB                */
+#define WBCIR_REG_SP3_EXCR1    0x02 /* Extended Control 1              */
+#define WBCIR_REG_SP3_EXCR2    0x04 /* Extended Control 2              */
+#define WBCIR_REG_SP3_TXFLV    0x06 /* TX FIFO Level                   */
+#define WBCIR_REG_SP3_RXFLV    0x07 /* RX FIFO Level                   */
+                                     /* Bank 3                         */
+#define WBCIR_REG_SP3_MRID     0x00 /* Module Identification           */
+#define WBCIR_REG_SP3_SH_LCR   0x01 /* LCR Shadow                      */
+#define WBCIR_REG_SP3_SH_FCR   0x02 /* FCR Shadow                      */
+                                     /* Bank 4                         */
+#define WBCIR_REG_SP3_IRCR1    0x02 /* Infrared Control 1              */
+                                     /* Bank 5                         */
+#define WBCIR_REG_SP3_IRCR2    0x04 /* Infrared Control 2              */
+                                     /* Bank 6                         */
+#define WBCIR_REG_SP3_IRCR3    0x00 /* Infrared Control 3              */
+#define WBCIR_REG_SP3_SIR_PW   0x02 /* SIR Pulse Width         */
+                                     /* Bank 7                         */
+#define WBCIR_REG_SP3_IRRXDC   0x00 /* IR RX Demod Control             */
+#define WBCIR_REG_SP3_IRTXMC   0x01 /* IR TX Mod Control               */
+#define WBCIR_REG_SP3_RCCFG    0x02 /* CEIR Config                     */
+#define WBCIR_REG_SP3_IRCFG1   0x04 /* Infrared Config 1               */
+#define WBCIR_REG_SP3_IRCFG4   0x07 /* Infrared Config 4               */
+
+/*
+ * Magic values follow
+ */
+
+/* No interrupts for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_NONE         0x00
+/* RX data bit for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_RX           0x01
+/* Over/Under-flow bit for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_ERR          0x04
+/* Led enable/disable bit for WBCIR_REG_ECEIR_CTS */
+#define WBCIR_LED_ENABLE       0x80
+/* RX data available bit for WBCIR_REG_SP3_LSR */
+#define WBCIR_RX_AVAIL         0x01
+/* RX disable bit for WBCIR_REG_SP3_ASCR */
+#define WBCIR_RX_DISABLE       0x20
+/* Extended mode enable bit for WBCIR_REG_SP3_EXCR1 */
+#define WBCIR_EXT_ENABLE       0x01
+/* Select compare register in WBCIR_REG_WCEIR_INDEX (bits 5 & 6) */
+#define WBCIR_REGSEL_COMPARE   0x10
+/* Select mask register in WBCIR_REG_WCEIR_INDEX (bits 5 & 6) */
+#define WBCIR_REGSEL_MASK      0x20
+/* Starting address of selected register in WBCIR_REG_WCEIR_INDEX */
+#define WBCIR_REG_ADDR0                0x00
+
+/* Valid banks for the SP3 UART */
+enum wbcir_bank {
+       WBCIR_BANK_0          = 0x00,
+       WBCIR_BANK_1          = 0x80,
+       WBCIR_BANK_2          = 0xE0,
+       WBCIR_BANK_3          = 0xE4,
+       WBCIR_BANK_4          = 0xE8,
+       WBCIR_BANK_5          = 0xEC,
+       WBCIR_BANK_6          = 0xF0,
+       WBCIR_BANK_7          = 0xF4,
+};
+
+/* Supported IR Protocols */
+enum wbcir_protocol {
+       IR_PROTOCOL_RC5          = 0x0,
+       IR_PROTOCOL_NEC          = 0x1,
+       IR_PROTOCOL_RC6          = 0x2,
+};
+
+/* Misc */
+#define WBCIR_NAME     "Winbond CIR"
+#define WBCIR_ID_FAMILY          0xF1 /* Family ID for the WPCD376I    */
+#define        WBCIR_ID_CHIP            0x04 /* Chip ID for the WPCD376I       */
+#define IR_KEYPRESS_TIMEOUT       250 /* FIXME: should be per-protocol? */
+#define INVALID_SCANCODE   0x7FFFFFFF /* Invalid with all protos       */
+#define WAKEUP_IOMEM_LEN         0x10 /* Wake-Up I/O Reg Len           */
+#define EHFUNC_IOMEM_LEN         0x10 /* Enhanced Func I/O Reg Len     */
+#define SP_IOMEM_LEN             0x08 /* Serial Port 3 (IR) Reg Len    */
+#define WBCIR_MAX_IDLE_BYTES       10
+
+static DEFINE_SPINLOCK(wbcir_lock);
+static DEFINE_RWLOCK(keytable_lock);
+
+struct wbcir_key {
+       u32 scancode;
+       unsigned int keycode;
+};
+
+struct wbcir_keyentry {
+       struct wbcir_key key;
+       struct list_head list;
+};
+
+static struct wbcir_key rc6_def_keymap[] = {
+       { 0x800F0400, KEY_NUMERIC_0             },
+       { 0x800F0401, KEY_NUMERIC_1             },
+       { 0x800F0402, KEY_NUMERIC_2             },
+       { 0x800F0403, KEY_NUMERIC_3             },
+       { 0x800F0404, KEY_NUMERIC_4             },
+       { 0x800F0405, KEY_NUMERIC_5             },
+       { 0x800F0406, KEY_NUMERIC_6             },
+       { 0x800F0407, KEY_NUMERIC_7             },
+       { 0x800F0408, KEY_NUMERIC_8             },
+       { 0x800F0409, KEY_NUMERIC_9             },
+       { 0x800F041D, KEY_NUMERIC_STAR          },
+       { 0x800F041C, KEY_NUMERIC_POUND         },
+       { 0x800F0410, KEY_VOLUMEUP              },
+       { 0x800F0411, KEY_VOLUMEDOWN            },
+       { 0x800F0412, KEY_CHANNELUP             },
+       { 0x800F0413, KEY_CHANNELDOWN           },
+       { 0x800F040E, KEY_MUTE                  },
+       { 0x800F040D, KEY_VENDOR                }, /* Vista Logo Key */
+       { 0x800F041E, KEY_UP                    },
+       { 0x800F041F, KEY_DOWN                  },
+       { 0x800F0420, KEY_LEFT                  },
+       { 0x800F0421, KEY_RIGHT                 },
+       { 0x800F0422, KEY_OK                    },
+       { 0x800F0423, KEY_ESC                   },
+       { 0x800F040F, KEY_INFO                  },
+       { 0x800F040A, KEY_CLEAR                 },
+       { 0x800F040B, KEY_ENTER                 },
+       { 0x800F045B, KEY_RED                   },
+       { 0x800F045C, KEY_GREEN                 },
+       { 0x800F045D, KEY_YELLOW                },
+       { 0x800F045E, KEY_BLUE                  },
+       { 0x800F045A, KEY_TEXT                  },
+       { 0x800F0427, KEY_SWITCHVIDEOMODE       },
+       { 0x800F040C, KEY_POWER                 },
+       { 0x800F0450, KEY_RADIO                 },
+       { 0x800F0448, KEY_PVR                   },
+       { 0x800F0447, KEY_AUDIO                 },
+       { 0x800F0426, KEY_EPG                   },
+       { 0x800F0449, KEY_CAMERA                },
+       { 0x800F0425, KEY_TV                    },
+       { 0x800F044A, KEY_VIDEO                 },
+       { 0x800F0424, KEY_DVD                   },
+       { 0x800F0416, KEY_PLAY                  },
+       { 0x800F0418, KEY_PAUSE                 },
+       { 0x800F0419, KEY_STOP                  },
+       { 0x800F0414, KEY_FASTFORWARD           },
+       { 0x800F041A, KEY_NEXT                  },
+       { 0x800F041B, KEY_PREVIOUS              },
+       { 0x800F0415, KEY_REWIND                },
+       { 0x800F0417, KEY_RECORD                },
+};
+
+/* Registers and other state is protected by wbcir_lock */
+struct wbcir_data {
+       unsigned long wbase;        /* Wake-Up Baseaddr         */
+       unsigned long ebase;        /* Enhanced Func. Baseaddr  */
+       unsigned long sbase;        /* Serial Port Baseaddr     */
+       unsigned int  irq;          /* Serial Port IRQ          */
+
+       struct input_dev *input_dev;
+       struct timer_list timer_keyup;
+       struct led_trigger *rxtrigger;
+       struct led_trigger *txtrigger;
+       struct led_classdev led;
+
+       u32 last_scancode;
+       unsigned int last_keycode;
+       u8 last_toggle;
+       u8 keypressed;
+       unsigned long keyup_jiffies;
+       unsigned int idle_count;
+
+       /* RX irdata and parsing state */
+       unsigned long irdata[30];
+       unsigned int irdata_count;
+       unsigned int irdata_idle;
+       unsigned int irdata_off;
+       unsigned int irdata_error;
+
+       /* Protected by keytable_lock */
+       struct list_head keytable;
+};
+
+static enum wbcir_protocol protocol = IR_PROTOCOL_RC6;
+module_param(protocol, uint, 0444);
+MODULE_PARM_DESC(protocol, "IR protocol to use "
+                "(0 = RC5, 1 = NEC, 2 = RC6A, default)");
+
+static int invert; /* default = 0 */
+module_param(invert, bool, 0444);
+MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");
+
+static unsigned int wake_sc = 0x800F040C;
+module_param(wake_sc, uint, 0644);
+MODULE_PARM_DESC(wake_sc, "Scancode of the power-on IR command");
+
+static unsigned int wake_rc6mode = 6;
+module_param(wake_rc6mode, uint, 0644);
+MODULE_PARM_DESC(wake_rc6mode, "RC6 mode for the power-on command "
+                "(0 = 0, 6 = 6A, default)");
+
+
+
+/*****************************************************************************
+ *
+ * UTILITY FUNCTIONS
+ *
+ *****************************************************************************/
+
+/* Caller needs to hold wbcir_lock */
+static void
+wbcir_set_bits(unsigned long addr, u8 bits, u8 mask)
+{
+       u8 val;
+
+       val = inb(addr);
+       val = ((val & ~mask) | (bits & mask));
+       outb(val, addr);
+}
+
+/* Selects the register bank for the serial port */
+static inline void
+wbcir_select_bank(struct wbcir_data *data, enum wbcir_bank bank)
+{
+       outb(bank, data->sbase + WBCIR_REG_SP3_BSR);
+}
+
+static enum led_brightness
+wbcir_led_brightness_get(struct led_classdev *led_cdev)
+{
+       struct wbcir_data *data = container_of(led_cdev,
+                                              struct wbcir_data,
+                                              led);
+
+       if (inb(data->ebase + WBCIR_REG_ECEIR_CTS) & WBCIR_LED_ENABLE)
+               return LED_FULL;
+       else
+               return LED_OFF;
+}
+
+static void
+wbcir_led_brightness_set(struct led_classdev *led_cdev,
+                           enum led_brightness brightness)
+{
+       struct wbcir_data *data = container_of(led_cdev,
+                                              struct wbcir_data,
+                                              led);
+
+       wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CTS,
+                      brightness == LED_OFF ? 0x00 : WBCIR_LED_ENABLE,
+                      WBCIR_LED_ENABLE);
+}
+
+/* Manchester encodes bits to RC6 message cells (see wbcir_parse_rc6) */
+static u8
+wbcir_to_rc6cells(u8 val)
+{
+       u8 coded = 0x00;
+       int i;
+
+       val &= 0x0F;
+       for (i = 0; i < 4; i++) {
+               if (val & 0x01)
+                       coded |= 0x02 << (i * 2);
+               else
+                       coded |= 0x01 << (i * 2);
+               val >>= 1;
+       }
+
+       return coded;
+}
+
+
+
+/*****************************************************************************
+ *
+ * INPUT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static unsigned int
+wbcir_do_getkeycode(struct wbcir_data *data, u32 scancode)
+{
+       struct wbcir_keyentry *keyentry;
+       unsigned int keycode = KEY_RESERVED;
+       unsigned long flags;
+
+       read_lock_irqsave(&keytable_lock, flags);
+
+       list_for_each_entry(keyentry, &data->keytable, list) {
+               if (keyentry->key.scancode == scancode) {
+                       keycode = keyentry->key.keycode;
+                       break;
+               }
+       }
+
+       read_unlock_irqrestore(&keytable_lock, flags);
+       return keycode;
+}
+
+static int
+wbcir_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+       struct wbcir_data *data = input_get_drvdata(dev);
+
+       *keycode = (int)wbcir_do_getkeycode(data, (u32)scancode);
+       return 0;
+}
+
+static int
+wbcir_setkeycode(struct input_dev *dev, int sscancode, int keycode)
+{
+       struct wbcir_data *data = input_get_drvdata(dev);
+       struct wbcir_keyentry *keyentry;
+       struct wbcir_keyentry *new_keyentry;
+       unsigned long flags;
+       unsigned int old_keycode = KEY_RESERVED;
+       u32 scancode = (u32)sscancode;
+
+       if (keycode < 0 || keycode > KEY_MAX)
+               return -EINVAL;
+
+       new_keyentry = kmalloc(sizeof(*new_keyentry), GFP_KERNEL);
+       if (!new_keyentry)
+               return -ENOMEM;
+
+       write_lock_irqsave(&keytable_lock, flags);
+
+       list_for_each_entry(keyentry, &data->keytable, list) {
+               if (keyentry->key.scancode != scancode)
+                       continue;
+
+               old_keycode = keyentry->key.keycode;
+               keyentry->key.keycode = keycode;
+
+               if (keyentry->key.keycode == KEY_RESERVED) {
+                       list_del(&keyentry->list);
+                       kfree(keyentry);
+               }
+
+               break;
+       }
+
+       set_bit(keycode, dev->keybit);
+
+       if (old_keycode == KEY_RESERVED) {
+               new_keyentry->key.scancode = scancode;
+               new_keyentry->key.keycode = keycode;
+               list_add(&new_keyentry->list, &data->keytable);
+       } else {
+               kfree(new_keyentry);
+               clear_bit(old_keycode, dev->keybit);
+               list_for_each_entry(keyentry, &data->keytable, list) {
+                       if (keyentry->key.keycode == old_keycode) {
+                               set_bit(old_keycode, dev->keybit);
+                               break;
+                       }
+               }
+       }
+
+       write_unlock_irqrestore(&keytable_lock, flags);
+       return 0;
+}
+
+/*
+ * Timer function to report keyup event some time after keydown is
+ * reported by the ISR.
+ */
+static void
+wbcir_keyup(unsigned long cookie)
+{
+       struct wbcir_data *data = (struct wbcir_data *)cookie;
+       unsigned long flags;
+
+       /*
+        * data->keyup_jiffies is used to prevent a race condition if a
+        * hardware interrupt occurs at this point and the keyup timer
+        * event is moved further into the future as a result.
+        *
+        * The timer will then be reactivated and this function called
+        * again in the future. We need to exit gracefully in that case
+        * to allow the input subsystem to do its auto-repeat magic or
+        * a keyup event might follow immediately after the keydown.
+        */
+
+       spin_lock_irqsave(&wbcir_lock, flags);
+
+       if (time_is_after_eq_jiffies(data->keyup_jiffies) && data->keypressed) {
+               data->keypressed = 0;
+               led_trigger_event(data->rxtrigger, LED_OFF);
+               input_report_key(data->input_dev, data->last_keycode, 0);
+               input_sync(data->input_dev);
+       }
+
+       spin_unlock_irqrestore(&wbcir_lock, flags);
+}
+
+static void
+wbcir_keydown(struct wbcir_data *data, u32 scancode, u8 toggle)
+{
+       unsigned int keycode;
+
+       /* Repeat? */
+       if (data->last_scancode == scancode &&
+           data->last_toggle == toggle &&
+           data->keypressed)
+               goto set_timer;
+       data->last_scancode = scancode;
+
+       /* Do we need to release an old keypress? */
+       if (data->keypressed) {
+               input_report_key(data->input_dev, data->last_keycode, 0);
+               input_sync(data->input_dev);
+               data->keypressed = 0;
+       }
+
+       /* Report scancode */
+       input_event(data->input_dev, EV_MSC, MSC_SCAN, (int)scancode);
+
+       /* Do we know this scancode? */
+       keycode = wbcir_do_getkeycode(data, scancode);
+       if (keycode == KEY_RESERVED)
+               goto set_timer;
+
+       /* Register a keypress */
+       input_report_key(data->input_dev, keycode, 1);
+       data->keypressed = 1;
+       data->last_keycode = keycode;
+       data->last_toggle = toggle;
+
+set_timer:
+       input_sync(data->input_dev);
+       led_trigger_event(data->rxtrigger,
+                         data->keypressed ? LED_FULL : LED_OFF);
+       data->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
+       mod_timer(&data->timer_keyup, data->keyup_jiffies);
+}
+
+
+
+/*****************************************************************************
+ *
+ * IR PARSING FUNCTIONS
+ *
+ *****************************************************************************/
+
+/* Resets all irdata */
+static void
+wbcir_reset_irdata(struct wbcir_data *data)
+{
+       memset(data->irdata, 0, sizeof(data->irdata));
+       data->irdata_count = 0;
+       data->irdata_off = 0;
+       data->irdata_error = 0;
+}
+
+/* Adds one bit of irdata */
+static void
+add_irdata_bit(struct wbcir_data *data, int set)
+{
+       if (data->irdata_count >= sizeof(data->irdata) * 8) {
+               data->irdata_error = 1;
+               return;
+       }
+
+       if (set)
+               __set_bit(data->irdata_count, data->irdata);
+       data->irdata_count++;
+}
+
+/* Gets count bits of irdata */
+static u16
+get_bits(struct wbcir_data *data, int count)
+{
+       u16 val = 0x0;
+
+       if (data->irdata_count - data->irdata_off < count) {
+               data->irdata_error = 1;
+               return 0x0;
+       }
+
+       while (count > 0) {
+               val <<= 1;
+               if (test_bit(data->irdata_off, data->irdata))
+                       val |= 0x1;
+               count--;
+               data->irdata_off++;
+       }
+
+       return val;
+}
+
+/* Reads 16 cells and converts them to a byte */
+static u8
+wbcir_rc6cells_to_byte(struct wbcir_data *data)
+{
+       u16 raw = get_bits(data, 16);
+       u8 val = 0x00;
+       int bit;
+
+       for (bit = 0; bit < 8; bit++) {
+               switch (raw & 0x03) {
+               case 0x01:
+                       break;
+               case 0x02:
+                       val |= (0x01 << bit);
+                       break;
+               default:
+                       data->irdata_error = 1;
+                       break;
+               }
+               raw >>= 2;
+       }
+
+       return val;
+}
+
+/* Decodes a number of bits from raw RC5 data */
+static u8
+wbcir_get_rc5bits(struct wbcir_data *data, unsigned int count)
+{
+       u16 raw = get_bits(data, count * 2);
+       u8 val = 0x00;
+       int bit;
+
+       for (bit = 0; bit < count; bit++) {
+               switch (raw & 0x03) {
+               case 0x01:
+                       val |= (0x01 << bit);
+                       break;
+               case 0x02:
+                       break;
+               default:
+                       data->irdata_error = 1;
+                       break;
+               }
+               raw >>= 2;
+       }
+
+       return val;
+}
+
+static void
+wbcir_parse_rc6(struct device *dev, struct wbcir_data *data)
+{
+       /*
+        * Normal bits are manchester coded as follows:
+        * cell0 + cell1 = logic "0"
+        * cell1 + cell0 = logic "1"
+        *
+        * The IR pulse has the following components:
+        *
+        * Leader               - 6 * cell1 - discarded
+        * Gap                  - 2 * cell0 - discarded
+        * Start bit            - Normal Coding - always "1"
+        * Mode Bit 2 - 0       - Normal Coding
+        * Toggle bit           - Normal Coding with double bit time,
+        *                        e.g. cell0 + cell0 + cell1 + cell1
+        *                        means logic "0".
+        *
+        * The rest depends on the mode, the following modes are known:
+        *
+        * MODE 0:
+        *  Address Bit 7 - 0   - Normal Coding
+        *  Command Bit 7 - 0   - Normal Coding
+        *
+        * MODE 6:
+        *  The above Toggle Bit is used as a submode bit, 0 = A, 1 = B.
+        *  Submode B is for pointing devices, only remotes using submode A
+        *  are supported.
+        *
+        *  Customer range bit  - 0 => Customer = 7 bits, 0...127
+        *                        1 => Customer = 15 bits, 32768...65535
+        *  Customer Bits       - Normal Coding
+        *
+        *  Customer codes are allocated by Philips. The rest of the bits
+        *  are customer dependent. The following is commonly used (and the
+        *  only supported config):
+        *
+        *  Toggle Bit          - Normal Coding
+        *  Address Bit 6 - 0   - Normal Coding
+        *  Command Bit 7 - 0   - Normal Coding
+        *
+        * All modes are followed by at least 6 * cell0.
+        *
+        * MODE 0 msglen:
+        *  1 * 2 (start bit) + 3 * 2 (mode) + 2 * 2 (toggle) +
+        *  8 * 2 (address) + 8 * 2 (command) =
+        *  44 cells
+        *
+        * MODE 6A msglen:
+        *  1 * 2 (start bit) + 3 * 2 (mode) + 2 * 2 (submode) +
+        *  1 * 2 (customer range bit) + 7/15 * 2 (customer bits) +
+        *  1 * 2 (toggle bit) + 7 * 2 (address) + 8 * 2 (command) =
+        *  60 - 76 cells
+        */
+       u8 mode;
+       u8 toggle;
+       u16 customer = 0x0;
+       u8 address;
+       u8 command;
+       u32 scancode;
+
+       /* Leader mark */
+       while (get_bits(data, 1) && !data->irdata_error)
+               /* Do nothing */;
+
+       /* Leader space */
+       if (get_bits(data, 1)) {
+               dev_dbg(dev, "RC6 - Invalid leader space\n");
+               return;
+       }
+
+       /* Start bit */
+       if (get_bits(data, 2) != 0x02) {
+               dev_dbg(dev, "RC6 - Invalid start bit\n");
+               return;
+       }
+
+       /* Mode */
+       mode = get_bits(data, 6);
+       switch (mode) {
+       case 0x15: /* 010101 = b000 */
+               mode = 0;
+               break;
+       case 0x29: /* 101001 = b110 */
+               mode = 6;
+               break;
+       default:
+               dev_dbg(dev, "RC6 - Invalid mode\n");
+               return;
+       }
+
+       /* Toggle bit / Submode bit */
+       toggle = get_bits(data, 4);
+       switch (toggle) {
+       case 0x03:
+               toggle = 0;
+               break;
+       case 0x0C:
+               toggle = 1;
+               break;
+       default:
+               dev_dbg(dev, "RC6 - Toggle bit error\n");
+               break;
+       }
+
+       /* Customer */
+       if (mode == 6) {
+               if (toggle != 0) {
+                       dev_dbg(dev, "RC6B - Not Supported\n");
+                       return;
+               }
+
+               customer = wbcir_rc6cells_to_byte(data);
+
+               if (customer & 0x80) {
+                       /* 15 bit customer value */
+                       customer <<= 8;
+                       customer |= wbcir_rc6cells_to_byte(data);
+               }
+       }
+
+       /* Address */
+       address = wbcir_rc6cells_to_byte(data);
+       if (mode == 6) {
+               toggle = address >> 7;
+               address &= 0x7F;
+       }
+
+       /* Command */
+       command = wbcir_rc6cells_to_byte(data);
+
+       /* Create scancode */
+       scancode =  command;
+       scancode |= address << 8;
+       scancode |= customer << 16;
+
+       /* Last sanity check */
+       if (data->irdata_error) {
+               dev_dbg(dev, "RC6 - Cell error(s)\n");
+               return;
+       }
+
+       dev_info(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
+               "toggle %u mode %u scan 0x%08X\n",
+               address,
+               command,
+               customer,
+               (unsigned int)toggle,
+               (unsigned int)mode,
+               scancode);
+
+       wbcir_keydown(data, scancode, toggle);
+}
+
+static void
+wbcir_parse_rc5(struct device *dev, struct wbcir_data *data)
+{
+       /*
+        * Bits are manchester coded as follows:
+        * cell1 + cell0 = logic "0"
+        * cell0 + cell1 = logic "1"
+        * (i.e. the reverse of RC6)
+        *
+        * Start bit 1          - "1" - discarded
+        * Start bit 2          - Must be inverted to get command bit 6
+        * Toggle bit
+        * Address Bit 4 - 0
+        * Command Bit 5 - 0
+        */
+       u8 toggle;
+       u8 address;
+       u8 command;
+       u32 scancode;
+
+       /* Start bit 1 */
+       if (!get_bits(data, 1)) {
+               dev_dbg(dev, "RC5 - Invalid start bit\n");
+               return;
+       }
+
+       /* Start bit 2 */
+       if (!wbcir_get_rc5bits(data, 1))
+               command = 0x40;
+       else
+               command = 0x00;
+
+       toggle   = wbcir_get_rc5bits(data, 1);
+       address  = wbcir_get_rc5bits(data, 5);
+       command |= wbcir_get_rc5bits(data, 6);
+       scancode = address << 7 | command;
+
+       /* Last sanity check */
+       if (data->irdata_error) {
+               dev_dbg(dev, "RC5 - Invalid message\n");
+               return;
+       }
+
+       dev_dbg(dev, "IR-RC5 ad %u cm %u t %u s %u\n",
+               (unsigned int)address,
+               (unsigned int)command,
+               (unsigned int)toggle,
+               (unsigned int)scancode);
+
+       wbcir_keydown(data, scancode, toggle);
+}
+
+static void
+wbcir_parse_nec(struct device *dev, struct wbcir_data *data)
+{
+       /*
+        * Each bit represents 560 us.
+        *
+        * Leader               - 9 ms burst
+        * Gap                  - 4.5 ms silence
+        * Address1 bit 0 - 7   - Address 1
+        * Address2 bit 0 - 7   - Address 2
+        * Command1 bit 0 - 7   - Command 1
+        * Command2 bit 0 - 7   - Command 2
+        *
+        * Note the bit order!
+        *
+        * With the old NEC protocol, Address2 was the inverse of Address1
+        * and Command2 was the inverse of Command1 and were used as
+        * an error check.
+        *
+        * With NEC extended, Address1 is the LSB of the Address and
+        * Address2 is the MSB, Command parsing remains unchanged.
+        *
+        * A repeat message is coded as:
+        * Leader               - 9 ms burst
+        * Gap                  - 2.25 ms silence
+        * Repeat               - 560 us active
+        */
+       u8 address1;
+       u8 address2;
+       u8 command1;
+       u8 command2;
+       u16 address;
+       u32 scancode;
+
+       /* Leader mark */
+       while (get_bits(data, 1) && !data->irdata_error)
+               /* Do nothing */;
+
+       /* Leader space */
+       if (get_bits(data, 4)) {
+               dev_dbg(dev, "NEC - Invalid leader space\n");
+               return;
+       }
+
+       /* Repeat? */
+       if (get_bits(data, 1)) {
+               if (!data->keypressed) {
+                       dev_dbg(dev, "NEC - Stray repeat message\n");
+                       return;
+               }
+
+               dev_dbg(dev, "IR-NEC repeat s %u\n",
+                       (unsigned int)data->last_scancode);
+
+               wbcir_keydown(data, data->last_scancode, data->last_toggle);
+               return;
+       }
+
+       /* Remaining leader space */
+       if (get_bits(data, 3)) {
+               dev_dbg(dev, "NEC - Invalid leader space\n");
+               return;
+       }
+
+       address1  = bitrev8(get_bits(data, 8));
+       address2  = bitrev8(get_bits(data, 8));
+       command1  = bitrev8(get_bits(data, 8));
+       command2  = bitrev8(get_bits(data, 8));
+
+       /* Sanity check */
+       if (data->irdata_error) {
+               dev_dbg(dev, "NEC - Invalid message\n");
+               return;
+       }
+
+       /* Check command validity */
+       if (command1 != ~command2) {
+               dev_dbg(dev, "NEC - Command bytes mismatch\n");
+               return;
+       }
+
+       /* Check for extended NEC protocol */
+       address = address1;
+       if (address1 != ~address2)
+               address |= address2 << 8;
+
+       scancode = address << 8 | command1;
+
+       dev_dbg(dev, "IR-NEC ad %u cm %u s %u\n",
+               (unsigned int)address,
+               (unsigned int)command1,
+               (unsigned int)scancode);
+
+       wbcir_keydown(data, scancode, !data->last_toggle);
+}
+
+
+
+/*****************************************************************************
+ *
+ * INTERRUPT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static irqreturn_t
+wbcir_irq_handler(int irqno, void *cookie)
+{
+       struct pnp_dev *device = cookie;
+       struct wbcir_data *data = pnp_get_drvdata(device);
+       struct device *dev = &device->dev;
+       u8 status;
+       unsigned long flags;
+       u8 irdata[8];
+       int i;
+       unsigned int hw;
+
+       spin_lock_irqsave(&wbcir_lock, flags);
+
+       wbcir_select_bank(data, WBCIR_BANK_0);
+
+       status = inb(data->sbase + WBCIR_REG_SP3_EIR);
+
+       if (!(status & (WBCIR_IRQ_RX | WBCIR_IRQ_ERR))) {
+               spin_unlock_irqrestore(&wbcir_lock, flags);
+               return IRQ_NONE;
+       }
+
+       if (status & WBCIR_IRQ_ERR)
+               data->irdata_error = 1;
+
+       if (!(status & WBCIR_IRQ_RX))
+               goto out;
+
+       /* Since RXHDLEV is set, at least 8 bytes are in the FIFO */
+       insb(data->sbase + WBCIR_REG_SP3_RXDATA, &irdata[0], 8);
+
+       for (i = 0; i < sizeof(irdata); i++) {
+               hw = hweight8(irdata[i]);
+               if (hw > 4)
+                       add_irdata_bit(data, 0);
+               else
+                       add_irdata_bit(data, 1);
+
+               if (hw == 8)
+                       data->idle_count++;
+               else
+                       data->idle_count = 0;
+       }
+
+       if (data->idle_count > WBCIR_MAX_IDLE_BYTES) {
+               /* Set RXINACTIVE... */
+               outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
+
+               /* ...and drain the FIFO */
+               while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL)
+                       inb(data->sbase + WBCIR_REG_SP3_RXDATA);
+
+               dev_dbg(dev, "IRDATA:\n");
+               for (i = 0; i < data->irdata_count; i += BITS_PER_LONG)
+                       dev_dbg(dev, "0x%08lX\n", data->irdata[i/BITS_PER_LONG]);
+
+               switch (protocol) {
+               case IR_PROTOCOL_RC5:
+                       wbcir_parse_rc5(dev, data);
+                       break;
+               case IR_PROTOCOL_RC6:
+                       wbcir_parse_rc6(dev, data);
+                       break;
+               case IR_PROTOCOL_NEC:
+                       wbcir_parse_nec(dev, data);
+                       break;
+               }
+
+               wbcir_reset_irdata(data);
+               data->idle_count = 0;
+       }
+
+out:
+       spin_unlock_irqrestore(&wbcir_lock, flags);
+       return IRQ_HANDLED;
+}
+
+
+
+/*****************************************************************************
+ *
+ * SUSPEND/RESUME FUNCTIONS
+ *
+ *****************************************************************************/
+
+static void
+wbcir_shutdown(struct pnp_dev *device)
+{
+       struct device *dev = &device->dev;
+       struct wbcir_data *data = pnp_get_drvdata(device);
+       int do_wake = 1;
+       u8 match[11];
+       u8 mask[11];
+       u8 rc6_csl = 0;
+       int i;
+
+       memset(match, 0, sizeof(match));
+       memset(mask, 0, sizeof(mask));
+
+       if (wake_sc == INVALID_SCANCODE || !device_may_wakeup(dev)) {
+               do_wake = 0;
+               goto finish;
+       }
+
+       switch (protocol) {
+       case IR_PROTOCOL_RC5:
+               if (wake_sc > 0xFFF) {
+                       do_wake = 0;
+                       dev_err(dev, "RC5 - Invalid wake scancode\n");
+                       break;
+               }
+
+               /* Mask = 13 bits, ex toggle */
+               mask[0] = 0xFF;
+               mask[1] = 0x17;
+
+               match[0]  = (wake_sc & 0x003F);      /* 6 command bits */
+               match[0] |= (wake_sc & 0x0180) >> 1; /* 2 address bits */
+               match[1]  = (wake_sc & 0x0E00) >> 9; /* 3 address bits */
+               if (!(wake_sc & 0x0040))             /* 2nd start bit  */
+                       match[1] |= 0x10;
+
+               break;
+
+       case IR_PROTOCOL_NEC:
+               if (wake_sc > 0xFFFFFF) {
+                       do_wake = 0;
+                       dev_err(dev, "NEC - Invalid wake scancode\n");
+                       break;
+               }
+
+               mask[0] = mask[1] = mask[2] = mask[3] = 0xFF;
+
+               match[1] = bitrev8((wake_sc & 0xFF));
+               match[0] = ~match[1];
+
+               match[3] = bitrev8((wake_sc & 0xFF00) >> 8);
+               if (wake_sc > 0xFFFF)
+                       match[2] = bitrev8((wake_sc & 0xFF0000) >> 16);
+               else
+                       match[2] = ~match[3];
+
+               break;
+
+       case IR_PROTOCOL_RC6:
+
+               if (wake_rc6mode == 0) {
+                       if (wake_sc > 0xFFFF) {
+                               do_wake = 0;
+                               dev_err(dev, "RC6 - Invalid wake scancode\n");
+                               break;
+                       }
+
+                       /* Command */
+                       match[0] = wbcir_to_rc6cells(wake_sc >>  0);
+                       mask[0]  = 0xFF;
+                       match[1] = wbcir_to_rc6cells(wake_sc >>  4);
+                       mask[1]  = 0xFF;
+
+                       /* Address */
+                       match[2] = wbcir_to_rc6cells(wake_sc >>  8);
+                       mask[2]  = 0xFF;
+                       match[3] = wbcir_to_rc6cells(wake_sc >> 12);
+                       mask[3]  = 0xFF;
+
+                       /* Header */
+                       match[4] = 0x50; /* mode1 = mode0 = 0, ignore toggle */
+                       mask[4]  = 0xF0;
+                       match[5] = 0x09; /* start bit = 1, mode2 = 0 */
+                       mask[5]  = 0x0F;
+
+                       rc6_csl = 44;
+
+               } else if (wake_rc6mode == 6) {
+                       i = 0;
+
+                       /* Command */
+                       match[i]  = wbcir_to_rc6cells(wake_sc >>  0);
+                       mask[i++] = 0xFF;
+                       match[i]  = wbcir_to_rc6cells(wake_sc >>  4);
+                       mask[i++] = 0xFF;
+
+                       /* Address + Toggle */
+                       match[i]  = wbcir_to_rc6cells(wake_sc >>  8);
+                       mask[i++] = 0xFF;
+                       match[i]  = wbcir_to_rc6cells(wake_sc >> 12);
+                       mask[i++] = 0x3F;
+
+                       /* Customer bits 7 - 0 */
+                       match[i]  = wbcir_to_rc6cells(wake_sc >> 16);
+                       mask[i++] = 0xFF;
+                       match[i]  = wbcir_to_rc6cells(wake_sc >> 20);
+                       mask[i++] = 0xFF;
+
+                       if (wake_sc & 0x80000000) {
+                               /* Customer range bit and bits 15 - 8 */
+                               match[i]  = wbcir_to_rc6cells(wake_sc >> 24);
+                               mask[i++] = 0xFF;
+                               match[i]  = wbcir_to_rc6cells(wake_sc >> 28);
+                               mask[i++] = 0xFF;
+                               rc6_csl = 76;
+                       } else if (wake_sc <= 0x007FFFFF) {
+                               rc6_csl = 60;
+                       } else {
+                               do_wake = 0;
+                               dev_err(dev, "RC6 - Invalid wake scancode\n");
+                               break;
+                       }
+
+                       /* Header */
+                       match[i]  = 0x93; /* mode1 = mode0 = 1, submode = 0 */
+                       mask[i++] = 0xFF;
+                       match[i]  = 0x0A; /* start bit = 1, mode2 = 1 */
+                       mask[i++] = 0x0F;
+
+               } else {
+                       do_wake = 0;
+                       dev_err(dev, "RC6 - Invalid wake mode\n");
+               }
+
+               break;
+
+       default:
+               do_wake = 0;
+               break;
+       }
+
+finish:
+       if (do_wake) {
+               /* Set compare and compare mask */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_INDEX,
+                              WBCIR_REGSEL_COMPARE | WBCIR_REG_ADDR0,
+                              0x3F);
+               outsb(data->wbase + WBCIR_REG_WCEIR_DATA, match, 11);
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_INDEX,
+                              WBCIR_REGSEL_MASK | WBCIR_REG_ADDR0,
+                              0x3F);
+               outsb(data->wbase + WBCIR_REG_WCEIR_DATA, mask, 11);
+
+               /* RC6 Compare String Len */
+               outb(rc6_csl, data->wbase + WBCIR_REG_WCEIR_CSL);
+
+               /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+               /* Clear BUFF_EN, Clear END_EN, Set MATCH_EN */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x01, 0x07);
+
+               /* Set CEIR_EN */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x01, 0x01);
+
+       } else {
+               /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+               /* Clear CEIR_EN */
+               wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+       }
+
+       /* Disable interrupts */
+       outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+}
+
+static int
+wbcir_suspend(struct pnp_dev *device, pm_message_t state)
+{
+       wbcir_shutdown(device);
+       return 0;
+}
+
+static int
+wbcir_resume(struct pnp_dev *device)
+{
+       struct wbcir_data *data = pnp_get_drvdata(device);
+
+       /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+       /* Clear CEIR_EN */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+
+       /* Enable interrupts */
+       wbcir_reset_irdata(data);
+       outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+
+       return 0;
+}
+
+
+
+/*****************************************************************************
+ *
+ * SETUP/INIT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static void
+wbcir_cfg_ceir(struct wbcir_data *data)
+{
+       u8 tmp;
+
+       /* Set PROT_SEL, RX_INV, Clear CEIR_EN (needed for the led) */
+       tmp = protocol << 4;
+       if (invert)
+               tmp |= 0x08;
+       outb(tmp, data->wbase + WBCIR_REG_WCEIR_CTL);
+
+       /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+       /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+       /* Set RC5 cell time to correspond to 36 kHz */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CFG1, 0x4A, 0x7F);
+
+       /* Set IRTX_INV */
+       if (invert)
+               outb(0x04, data->ebase + WBCIR_REG_ECEIR_CCTL);
+       else
+               outb(0x00, data->ebase + WBCIR_REG_ECEIR_CCTL);
+
+       /*
+        * Clear IR LED, set SP3 clock to 24Mhz
+        * set SP3_IRRX_SW to binary 01, helpfully not documented
+        */
+       outb(0x10, data->ebase + WBCIR_REG_ECEIR_CTS);
+}
+
+static int __devinit
+wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
+{
+       struct device *dev = &device->dev;
+       struct wbcir_data *data;
+       int err;
+
+       if (!(pnp_port_len(device, 0) == EHFUNC_IOMEM_LEN &&
+             pnp_port_len(device, 1) == WAKEUP_IOMEM_LEN &&
+             pnp_port_len(device, 2) == SP_IOMEM_LEN)) {
+               dev_err(dev, "Invalid resources\n");
+               return -ENODEV;
+       }
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data) {
+               err = -ENOMEM;
+               goto exit;
+       }
+
+       pnp_set_drvdata(device, data);
+
+       data->ebase = pnp_port_start(device, 0);
+       data->wbase = pnp_port_start(device, 1);
+       data->sbase = pnp_port_start(device, 2);
+       data->irq = pnp_irq(device, 0);
+
+       if (data->wbase == 0 || data->ebase == 0 ||
+           data->sbase == 0 || data->irq == 0) {
+               err = -ENODEV;
+               dev_err(dev, "Invalid resources\n");
+               goto exit_free_data;
+       }
+
+       dev_dbg(&device->dev, "Found device "
+               "(w: 0x%lX, e: 0x%lX, s: 0x%lX, i: %u)\n",
+               data->wbase, data->ebase, data->sbase, data->irq);
+
+       if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
+               dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                       data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
+               err = -EBUSY;
+               goto exit_free_data;
+       }
+
+       if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
+               dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                       data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
+               err = -EBUSY;
+               goto exit_release_wbase;
+       }
+
+       if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
+               dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                       data->sbase, data->sbase + SP_IOMEM_LEN - 1);
+               err = -EBUSY;
+               goto exit_release_ebase;
+       }
+
+       err = request_irq(data->irq, wbcir_irq_handler,
+                         IRQF_DISABLED, DRVNAME, device);
+       if (err) {
+               dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
+               err = -EBUSY;
+               goto exit_release_sbase;
+       }
+
+       led_trigger_register_simple("cir-tx", &data->txtrigger);
+       if (!data->txtrigger) {
+               err = -ENOMEM;
+               goto exit_free_irq;
+       }
+
+       led_trigger_register_simple("cir-rx", &data->rxtrigger);
+       if (!data->rxtrigger) {
+               err = -ENOMEM;
+               goto exit_unregister_txtrigger;
+       }
+
+       data->led.name = "cir::activity";
+       data->led.default_trigger = "cir-rx";
+       data->led.brightness_set = wbcir_led_brightness_set;
+       data->led.brightness_get = wbcir_led_brightness_get;
+       err = led_classdev_register(&device->dev, &data->led);
+       if (err)
+               goto exit_unregister_rxtrigger;
+
+       data->input_dev = input_allocate_device();
+       if (!data->input_dev) {
+               err = -ENOMEM;
+               goto exit_unregister_led;
+       }
+
+       data->input_dev->evbit[0] = BIT(EV_KEY);
+       data->input_dev->name = WBCIR_NAME;
+       data->input_dev->phys = "wbcir/cir0";
+       data->input_dev->id.bustype = BUS_HOST;
+       data->input_dev->id.vendor  = PCI_VENDOR_ID_WINBOND;
+       data->input_dev->id.product = WBCIR_ID_FAMILY;
+       data->input_dev->id.version = WBCIR_ID_CHIP;
+       data->input_dev->getkeycode = wbcir_getkeycode;
+       data->input_dev->setkeycode = wbcir_setkeycode;
+       input_set_capability(data->input_dev, EV_MSC, MSC_SCAN);
+       input_set_drvdata(data->input_dev, data);
+
+       err = input_register_device(data->input_dev);
+       if (err)
+               goto exit_free_input;
+
+       data->last_scancode = INVALID_SCANCODE;
+       INIT_LIST_HEAD(&data->keytable);
+       setup_timer(&data->timer_keyup, wbcir_keyup, (unsigned long)data);
+
+       /* Load default keymaps */
+       if (protocol == IR_PROTOCOL_RC6) {
+               int i;
+               for (i = 0; i < ARRAY_SIZE(rc6_def_keymap); i++) {
+                       err = wbcir_setkeycode(data->input_dev,
+                                              (int)rc6_def_keymap[i].scancode,
+                                              (int)rc6_def_keymap[i].keycode);
+                       if (err)
+                               goto exit_unregister_keys;
+               }
+       }
+
+       device_init_wakeup(&device->dev, 1);
+
+       wbcir_cfg_ceir(data);
+
+       /* Disable interrupts */
+       wbcir_select_bank(data, WBCIR_BANK_0);
+       outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
+       /* Enable extended mode */
+       wbcir_select_bank(data, WBCIR_BANK_2);
+       outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
+
+       /*
+        * Configure baud generator, IR data will be sampled at
+        * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
+        *
+        * The ECIR registers include a flag to change the
+        * 24Mhz clock freq to 48Mhz.
+        *
+        * It's not documented in the specs, but fifo levels
+        * other than 16 seems to be unsupported.
+        */
+
+       /* prescaler 1.0, tx/rx fifo lvl 16 */
+       outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
+
+       /* Set baud divisor to generate one byte per bit/cell */
+       switch (protocol) {
+       case IR_PROTOCOL_RC5:
+               outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
+               break;
+       case IR_PROTOCOL_RC6:
+               outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
+               break;
+       case IR_PROTOCOL_NEC:
+               outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
+               break;
+       }
+       outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
+
+       /* Set CEIR mode */
+       wbcir_select_bank(data, WBCIR_BANK_0);
+       outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
+       inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
+       inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
+
+       /* Disable RX demod, run-length encoding/decoding, set freq span */
+       wbcir_select_bank(data, WBCIR_BANK_7);
+       outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
+
+       /* Disable timer */
+       wbcir_select_bank(data, WBCIR_BANK_4);
+       outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
+
+       /* Enable MSR interrupt, Clear AUX_IRX */
+       wbcir_select_bank(data, WBCIR_BANK_5);
+       outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
+
+       /* Disable CRC */
+       wbcir_select_bank(data, WBCIR_BANK_6);
+       outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
+
+       /* Set RX/TX (de)modulation freq, not really used */
+       wbcir_select_bank(data, WBCIR_BANK_7);
+       outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
+       outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
+
+       /* Set invert and pin direction */
+       if (invert)
+               outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
+       else
+               outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
+
+       /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
+       wbcir_select_bank(data, WBCIR_BANK_0);
+       outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
+
+       /* Clear AUX status bits */
+       outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
+
+       /* Enable interrupts */
+       outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+
+       return 0;
+
+exit_unregister_keys:
+       if (!list_empty(&data->keytable)) {
+               struct wbcir_keyentry *key;
+               struct wbcir_keyentry *keytmp;
+
+               list_for_each_entry_safe(key, keytmp, &data->keytable, list) {
+                       list_del(&key->list);
+                       kfree(key);
+               }
+       }
+       input_unregister_device(data->input_dev);
+       /* Can't call input_free_device on an unregistered device */
+       data->input_dev = NULL;
+exit_free_input:
+       input_free_device(data->input_dev);
+exit_unregister_led:
+       led_classdev_unregister(&data->led);
+exit_unregister_rxtrigger:
+       led_trigger_unregister_simple(data->rxtrigger);
+exit_unregister_txtrigger:
+       led_trigger_unregister_simple(data->txtrigger);
+exit_free_irq:
+       free_irq(data->irq, device);
+exit_release_sbase:
+       release_region(data->sbase, SP_IOMEM_LEN);
+exit_release_ebase:
+       release_region(data->ebase, EHFUNC_IOMEM_LEN);
+exit_release_wbase:
+       release_region(data->wbase, WAKEUP_IOMEM_LEN);
+exit_free_data:
+       kfree(data);
+       pnp_set_drvdata(device, NULL);
+exit:
+       return err;
+}
+
+static void __devexit
+wbcir_remove(struct pnp_dev *device)
+{
+       struct wbcir_data *data = pnp_get_drvdata(device);
+       struct wbcir_keyentry *key;
+       struct wbcir_keyentry *keytmp;
+
+       /* Disable interrupts */
+       wbcir_select_bank(data, WBCIR_BANK_0);
+       outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
+       del_timer_sync(&data->timer_keyup);
+
+       free_irq(data->irq, device);
+
+       /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+       /* Clear CEIR_EN */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+
+       /* Clear BUFF_EN, END_EN, MATCH_EN */
+       wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+       /* This will generate a keyup event if necessary */
+       input_unregister_device(data->input_dev);
+
+       led_trigger_unregister_simple(data->rxtrigger);
+       led_trigger_unregister_simple(data->txtrigger);
+       led_classdev_unregister(&data->led);
+
+       /* This is ok since &data->led isn't actually used */
+       wbcir_led_brightness_set(&data->led, LED_OFF);
+
+       release_region(data->wbase, WAKEUP_IOMEM_LEN);
+       release_region(data->ebase, EHFUNC_IOMEM_LEN);
+       release_region(data->sbase, SP_IOMEM_LEN);
+
+       list_for_each_entry_safe(key, keytmp, &data->keytable, list) {
+               list_del(&key->list);
+               kfree(key);
+       }
+
+       kfree(data);
+
+       pnp_set_drvdata(device, NULL);
+}
+
+static const struct pnp_device_id wbcir_ids[] = {
+       { "WEC1022", 0 },
+       { "", 0 }
+};
+MODULE_DEVICE_TABLE(pnp, wbcir_ids);
+
+static struct pnp_driver wbcir_driver = {
+       .name     = WBCIR_NAME,
+       .id_table = wbcir_ids,
+       .probe    = wbcir_probe,
+       .remove   = __devexit_p(wbcir_remove),
+       .suspend  = wbcir_suspend,
+       .resume   = wbcir_resume,
+       .shutdown = wbcir_shutdown
+};
+
+static int __init
+wbcir_init(void)
+{
+       int ret;
+
+       switch (protocol) {
+       case IR_PROTOCOL_RC5:
+       case IR_PROTOCOL_NEC:
+       case IR_PROTOCOL_RC6:
+               break;
+       default:
+               printk(KERN_ERR DRVNAME ": Invalid protocol argument\n");
+               return -EINVAL;
+       }
+
+       ret = pnp_register_driver(&wbcir_driver);
+       if (ret)
+               printk(KERN_ERR DRVNAME ": Unable to register driver\n");
+
+       return ret;
+}
+
+static void __exit
+wbcir_exit(void)
+{
+       pnp_unregister_driver(&wbcir_driver);
+}
+
+MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
+MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
+MODULE_LICENSE("GPL");
+
+module_init(wbcir_init);
+module_exit(wbcir_exit);
+
+
index ecaeb7e..eb83939 100644 (file)
@@ -842,3 +842,4 @@ module_exit(ad7877_exit);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("AD7877 touchscreen Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ad7877");
index 5d8a703..19b4db7 100644 (file)
@@ -779,3 +779,4 @@ module_exit(ad7879_exit);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("AD7879(-1) touchscreen Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ad7879");
index ba9d38c..09c8109 100644 (file)
@@ -1256,3 +1256,4 @@ module_exit(ads7846_exit);
 
 MODULE_DESCRIPTION("ADS7846 TouchScreen Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ads7846");
index bff72d8..9f8f67b 100644 (file)
@@ -89,7 +89,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
        return 0;
 }
 
-static struct super_operations capifs_sops =
+static const struct super_operations capifs_sops =
 {
        .statfs         = simple_statfs,
        .remount_fs     = capifs_remount,
index 16f2e46..26626ee 100644 (file)
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void)
        if (!g_debbuf->buf) {
                kfree(g_cmsg);
                kfree(g_debbuf);
-               return -ENOMEM;;
+               return -ENOMEM;
        }
        g_debbuf->size = CDEBUG_GSIZE;
        g_debbuf->buf[0] = 0;
index 50ed778..09d4db7 100644 (file)
@@ -89,14 +89,14 @@ static int contrstats_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations seq_controller_ops = {
+static const struct seq_operations seq_controller_ops = {
        .start  = controller_start,
        .next   = controller_next,
        .stop   = controller_stop,
        .show   = controller_show,
 };
 
-static struct seq_operations seq_contrstats_ops = {
+static const struct seq_operations seq_contrstats_ops = {
        .start  = controller_start,
        .next   = controller_next,
        .stop   = controller_stop,
@@ -194,14 +194,14 @@ applstats_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations seq_applications_ops = {
+static const struct seq_operations seq_applications_ops = {
        .start  = applications_start,
        .next   = applications_next,
        .stop   = applications_stop,
        .show   = applications_show,
 };
 
-static struct seq_operations seq_applstats_ops = {
+static const struct seq_operations seq_applstats_ops = {
        .start  = applications_start,
        .next   = applications_next,
        .stop   = applications_stop,
@@ -264,7 +264,7 @@ static int capi_driver_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations seq_capi_driver_ops = {
+static const struct seq_operations seq_capi_driver_ops = {
        .start  = capi_driver_start,
        .next   = capi_driver_next,
        .stop   = capi_driver_stop,
index 8ff7e35..f33ac27 100644 (file)
@@ -408,33 +408,28 @@ static int if_write_room(struct tty_struct *tty)
        return retval;
 }
 
-/* FIXME: This function does not have error returns */
-
 static int if_chars_in_buffer(struct tty_struct *tty)
 {
        struct cardstate *cs;
-       int retval = -ENODEV;
+       int retval = 0;
 
        cs = (struct cardstate *) tty->driver_data;
        if (!cs) {
                pr_err("%s: no cardstate\n", __func__);
-               return -ENODEV;
+               return 0;
        }
 
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-       if (mutex_lock_interruptible(&cs->mutex))
-               return -ERESTARTSYS; // FIXME -EINTR?
+       mutex_lock(&cs->mutex);
 
-       if (!cs->connected) {
+       if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");
-               retval = -ENODEV;
-       } else if (!cs->open_count)
+       else if (!cs->open_count)
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-       else if (cs->mstate != MS_LOCKED) {
+       else if (cs->mstate != MS_LOCKED)
                dev_warn(cs->dev, "can't write to unlocked device\n");
-               retval = -EBUSY;
-       } else
+       else
                retval = cs->ops->chars_in_buffer(cs);
 
        mutex_unlock(&cs->mutex);
index 7188c59..adb1e8c 100644 (file)
@@ -761,7 +761,7 @@ isdn_getnum(char **p)
  * Be aware that this is not an atomic operation when sleep != 0, even though 
  * interrupts are turned off! Well, like that we are currently only called
  * on behalf of a read system call on raw device files (which are documented
- * to be dangerous and for for debugging purpose only). The inode semaphore
+ * to be dangerous and for debugging purpose only). The inode semaphore
  * takes care that this is not called for the same minor device number while
  * we are sleeping, but access is not serialized against simultaneous read()
  * from the corresponding ttyI device. Can other ugly events, like changes
@@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que
  * Be aware that this is not an atomic operation when sleep != 0, even though
  * interrupts are turned off! Well, like that we are currently only called
  * on behalf of a read system call on raw device files (which are documented
- * to be dangerous and for for debugging purpose only). The inode semaphore
+ * to be dangerous and for debugging purpose only). The inode semaphore
  * takes care that this is not called for the same minor device number while
  * we are sleeping, but access is not serialized against simultaneous read()
  * from the corresponding ttyI device. Can other ugly events, like changes
index 098d9aa..2913d76 100644 (file)
@@ -148,3 +148,4 @@ module_exit(dac124s085_leds_exit);
 MODULE_AUTHOR("Guennadi Liakhovetski <lg@denx.de>");
 MODULE_DESCRIPTION("DAC124S085 LED driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:dac124s085");
index 1e2cb84..8744d24 100644 (file)
@@ -67,12 +67,11 @@ static __init int map_switcher(void)
         * so we make sure they're zeroed.
         */
        for (i = 0; i < TOTAL_SWITCHER_PAGES; i++) {
-               unsigned long addr = get_zeroed_page(GFP_KERNEL);
-               if (!addr) {
+               switcher_page[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
+               if (!switcher_page[i]) {
                        err = -ENOMEM;
                        goto free_some_pages;
                }
-               switcher_page[i] = virt_to_page(addr);
        }
 
        /*
index a8d0aee..cf94326 100644 (file)
@@ -380,7 +380,7 @@ bool demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
                 * And we copy the flags to the shadow PMD entry.  The page
                 * number in the shadow PMD is the page we just allocated.
                 */
-               native_set_pmd(spmd, __pmd(__pa(ptepage) | pmd_flags(gpmd)));
+               set_pmd(spmd, __pmd(__pa(ptepage) | pmd_flags(gpmd)));
        }
 
        /*
@@ -447,7 +447,7 @@ bool demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
                 * we will come back here when a write does actually occur, so
                 * we can update the Guest's _PAGE_DIRTY flag.
                 */
-               native_set_pte(spte, gpte_to_spte(cpu, pte_wrprotect(gpte), 0));
+               set_pte(spte, gpte_to_spte(cpu, pte_wrprotect(gpte), 0));
 
        /*
         * Finally, we write the Guest PTE entry back: we've set the
@@ -528,7 +528,7 @@ static void release_pmd(pmd_t *spmd)
                /* Now we can free the page of PTEs */
                free_page((long)ptepage);
                /* And zero out the PMD entry so we never release it twice. */
-               native_set_pmd(spmd, __pmd(0));
+               set_pmd(spmd, __pmd(0));
        }
 }
 
@@ -833,15 +833,15 @@ static void do_set_pte(struct lg_cpu *cpu, int idx,
                         */
                        if (pte_flags(gpte) & (_PAGE_DIRTY | _PAGE_ACCESSED)) {
                                check_gpte(cpu, gpte);
-                               native_set_pte(spte,
-                                               gpte_to_spte(cpu, gpte,
+                               set_pte(spte,
+                                       gpte_to_spte(cpu, gpte,
                                                pte_flags(gpte) & _PAGE_DIRTY));
                        } else {
                                /*
                                 * Otherwise kill it and we can demand_page()
                                 * it in later.
                                 */
-                               native_set_pte(spte, __pte(0));
+                               set_pte(spte, __pte(0));
                        }
 #ifdef CONFIG_X86_PAE
                }
@@ -894,7 +894,7 @@ void guest_set_pte(struct lg_cpu *cpu,
  * tells us they've changed.  When the Guest tries to use the new entry it will
  * fault and demand_page() will fix it up.
  *
- * So with that in mind here's our code to to update a (top-level) PGD entry:
+ * So with that in mind here's our code to update a (top-level) PGD entry:
  */
 void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx)
 {
@@ -983,25 +983,22 @@ static unsigned long setup_pagetables(struct lguest *lg,
         */
        for (i = j = 0; i < mapped_pages && j < PTRS_PER_PMD;
             i += PTRS_PER_PTE, j++) {
-               /* FIXME: native_set_pmd is overkill here. */
-               native_set_pmd(&pmd, __pmd(((unsigned long)(linear + i)
-               - mem_base) | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER));
+               pmd = pfn_pmd(((unsigned long)&linear[i] - mem_base)/PAGE_SIZE,
+                             __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));
 
                if (copy_to_user(&pmds[j], &pmd, sizeof(pmd)) != 0)
                        return -EFAULT;
        }
 
        /* One PGD entry, pointing to that PMD page. */
-       set_pgd(&pgd, __pgd(((u32)pmds - mem_base) | _PAGE_PRESENT));
+       pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT);
        /* Copy it in as the first PGD entry (ie. addresses 0-1G). */
        if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0)
                return -EFAULT;
        /*
-        * And the third PGD entry (ie. addresses 3G-4G).
-        *
-        * FIXME: This assumes that PAGE_OFFSET for the Guest is 0xC0000000.
+        * And the other PGD entry to make the linear mapping at PAGE_OFFSET
         */
-       if (copy_to_user(&pgdir[3], &pgd, sizeof(pgd)) != 0)
+       if (copy_to_user(&pgdir[KERNEL_PGD_BOUNDARY], &pgd, sizeof(pgd)))
                return -EFAULT;
 #else
        /*
@@ -1141,15 +1138,13 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
 {
        pte_t *switcher_pte_page = __get_cpu_var(switcher_pte_pages);
        pte_t regs_pte;
-       unsigned long pfn;
 
 #ifdef CONFIG_X86_PAE
        pmd_t switcher_pmd;
        pmd_t *pmd_table;
 
-       /* FIXME: native_set_pmd is overkill here. */
-       native_set_pmd(&switcher_pmd, pfn_pmd(__pa(switcher_pte_page) >>
-                      PAGE_SHIFT, PAGE_KERNEL_EXEC));
+       switcher_pmd = pfn_pmd(__pa(switcher_pte_page) >> PAGE_SHIFT,
+                              PAGE_KERNEL_EXEC);
 
        /* Figure out where the pmd page is, by reading the PGD, and converting
         * it to a virtual address. */
@@ -1157,7 +1152,7 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
                        pgdirs[cpu->cpu_pgd].pgdir[SWITCHER_PGD_INDEX])
                                                                << PAGE_SHIFT);
        /* Now write it into the shadow page table. */
-       native_set_pmd(&pmd_table[SWITCHER_PMD_INDEX], switcher_pmd);
+       set_pmd(&pmd_table[SWITCHER_PMD_INDEX], switcher_pmd);
 #else
        pgd_t switcher_pgd;
 
@@ -1179,10 +1174,8 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
         * page is already mapped there, we don't have to copy them out
         * again.
         */
-       pfn = __pa(cpu->regs_page) >> PAGE_SHIFT;
-       native_set_pte(&regs_pte, pfn_pte(pfn, PAGE_KERNEL));
-       native_set_pte(&switcher_pte_page[pte_index((unsigned long)pages)],
-                       regs_pte);
+       regs_pte = pfn_pte(__pa(cpu->regs_page) >> PAGE_SHIFT, PAGE_KERNEL);
+       set_pte(&switcher_pte_page[pte_index((unsigned long)pages)], regs_pte);
 }
 /*:*/
 
@@ -1209,7 +1202,7 @@ static __init void populate_switcher_pte_page(unsigned int cpu,
 
        /* The first entries are easy: they map the Switcher code. */
        for (i = 0; i < pages; i++) {
-               native_set_pte(&pte[i], mk_pte(switcher_page[i],
+               set_pte(&pte[i], mk_pte(switcher_page[i],
                                __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED)));
        }
 
@@ -1217,14 +1210,14 @@ static __init void populate_switcher_pte_page(unsigned int cpu,
        i = pages + cpu*2;
 
        /* First page (Guest registers) is writable from the Guest */
-       native_set_pte(&pte[i], pfn_pte(page_to_pfn(switcher_page[i]),
+       set_pte(&pte[i], pfn_pte(page_to_pfn(switcher_page[i]),
                         __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_RW)));
 
        /*
         * The second page contains the "struct lguest_ro_state", and is
         * read-only.
         */
-       native_set_pte(&pte[i+1], pfn_pte(page_to_pfn(switcher_page[i+1]),
+       set_pte(&pte[i+1], pfn_pte(page_to_pfn(switcher_page[i+1]),
                           __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED)));
 }
 
index a98ab72..93fb320 100644 (file)
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
                if (cpu > 1)
                        continue;
-               rcpu = &rm->cpu[cpu];;
+               rcpu = &rm->cpu[cpu];
                rcpu->prev_idle = get_cpu_idle_time(cpu);
                rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
                schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
index 7f77f18..a679429 100644 (file)
@@ -1532,7 +1532,7 @@ static const struct file_operations _ctl_fops = {
 static struct miscdevice _dm_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DM_NAME,
-       .devnode        = "mapper/control",
+       .nodename       = "mapper/control",
        .fops           = &_ctl_fops
 };
 
index eee28fa..376f1ab 100644 (file)
@@ -1716,7 +1716,7 @@ out:
        return r;
 }
 
-static struct block_device_operations dm_blk_dops;
+static const struct block_device_operations dm_blk_dops;
 
 static void dm_wq_work(struct work_struct *work);
 
@@ -2663,7 +2663,7 @@ void dm_free_md_mempools(struct dm_md_mempools *pools)
        kfree(pools);
 }
 
-static struct block_device_operations dm_blk_dops = {
+static const struct block_device_operations dm_blk_dops = {
        .open = dm_blk_open,
        .release = dm_blk_close,
        .ioctl = dm_blk_ioctl,
index 9dd8720..6aa497e 100644 (file)
@@ -138,7 +138,7 @@ static ctl_table raid_root_table[] = {
        { .ctl_name = 0 }
 };
 
-static struct block_device_operations md_fops;
+static const struct block_device_operations md_fops;
 
 static int start_readonly;
 
@@ -5556,7 +5556,7 @@ static int md_revalidate(struct gendisk *disk)
        mddev->changed = 0;
        return 0;
 }
-static struct block_device_operations md_fops =
+static const struct block_device_operations md_fops =
 {
        .owner          = THIS_MODULE,
        .open           = md_open,
index f8fc188..f55d2ff 100644 (file)
@@ -201,7 +201,7 @@ struct mddev_s
         * INTR:     resync needs to be aborted for some reason
         * DONE:     thread is done and is waiting to be reaped
         * REQUEST:  user-space has requested a sync (used with SYNC)
-        * CHECK:    user-space request for for check-only, no repair
+        * CHECK:    user-space request for check-only, no repair
         * RESHAPE:  A reshape is happening
         *
         * If neither SYNC or RESHAPE are set, then it is a recovery.
index 89e7681..d2d3fd5 100644 (file)
@@ -150,6 +150,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
        }
 
        mp_bh = mempool_alloc(conf->pool, GFP_NOIO);
+       memset(mp_bh, 0, sizeof(*mp_bh));
 
        mp_bh->master_bio = bio;
        mp_bh->mddev = mddev;
@@ -493,7 +494,7 @@ static int multipath_run (mddev_t *mddev)
        }
        mddev->degraded = conf->raid_disks - conf->working_disks;
 
-       conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
+       conf->pool = mempool_create_kmalloc_pool(NR_RESERVED_BUFS,
                                                 sizeof(struct multipath_bh));
        if (conf->pool == NULL) {
                printk(KERN_ERR 
index fc76c30..155c93e 100644 (file)
@@ -210,7 +210,8 @@ int tda18271_write_regs(struct dvb_frontend *fe, int idx, int len)
        tda18271_i2c_gate_ctrl(fe, 0);
 
        if (ret != 1)
-               tda_err("ERROR: i2c_transfer returned: %d\n", ret);
+               tda_err("ERROR: idx = 0x%x, len = %d, "
+                       "i2c_transfer returned: %d\n", idx, len, ret);
 
        return (ret == 1 ? 0 : ret);
 }
index bc4b004..6459511 100644 (file)
@@ -36,6 +36,27 @@ static LIST_HEAD(hybrid_tuner_instance_list);
 
 /*---------------------------------------------------------------------*/
 
+static int tda18271_toggle_output(struct dvb_frontend *fe, int standby)
+{
+       struct tda18271_priv *priv = fe->tuner_priv;
+
+       int ret = tda18271_set_standby_mode(fe, standby ? 1 : 0,
+                       priv->output_opt & TDA18271_OUTPUT_LT_OFF ? 1 : 0,
+                       priv->output_opt & TDA18271_OUTPUT_XT_OFF ? 1 : 0);
+
+       if (tda_fail(ret))
+               goto fail;
+
+       tda_dbg("%s mode: xtal oscillator %s, slave tuner loop thru %s\n",
+               standby ? "standby" : "active",
+               priv->output_opt & TDA18271_OUTPUT_XT_OFF ? "off" : "on",
+               priv->output_opt & TDA18271_OUTPUT_LT_OFF ? "off" : "on");
+fail:
+       return ret;
+}
+
+/*---------------------------------------------------------------------*/
+
 static inline int charge_pump_source(struct dvb_frontend *fe, int force)
 {
        struct tda18271_priv *priv = fe->tuner_priv;
@@ -271,7 +292,7 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
        tda18271_lookup_map(fe, RF_CAL_DC_OVER_DT, &freq, &dc_over_dt);
 
        /* calculate temperature compensation */
-       rfcal_comp = dc_over_dt * (tm_current - priv->tm_rfcal);
+       rfcal_comp = dc_over_dt * (tm_current - priv->tm_rfcal) / 1000;
 
        regs[R_EB14] = approx + rfcal_comp;
        ret = tda18271_write_regs(fe, R_EB14, 1);
@@ -800,7 +821,7 @@ static int tda18271_init(struct dvb_frontend *fe)
 
        mutex_lock(&priv->lock);
 
-       /* power up */
+       /* full power up */
        ret = tda18271_set_standby_mode(fe, 0, 0, 0);
        if (tda_fail(ret))
                goto fail;
@@ -818,6 +839,21 @@ fail:
        return ret;
 }
 
+static int tda18271_sleep(struct dvb_frontend *fe)
+{
+       struct tda18271_priv *priv = fe->tuner_priv;
+       int ret;
+
+       mutex_lock(&priv->lock);
+
+       /* enter standby mode, with required output features enabled */
+       ret = tda18271_toggle_output(fe, 1);
+
+       mutex_unlock(&priv->lock);
+
+       return ret;
+}
+
 /* ------------------------------------------------------------------ */
 
 static int tda18271_agc(struct dvb_frontend *fe)
@@ -827,8 +863,9 @@ static int tda18271_agc(struct dvb_frontend *fe)
 
        switch (priv->config) {
        case 0:
-               /* no LNA */
-               tda_dbg("no agc configuration provided\n");
+               /* no external agc configuration required */
+               if (tda18271_debug & DBG_ADV)
+                       tda_dbg("no agc configuration provided\n");
                break;
        case 3:
                /* switch with GPIO of saa713x */
@@ -1010,22 +1047,6 @@ fail:
        return ret;
 }
 
-static int tda18271_sleep(struct dvb_frontend *fe)
-{
-       struct tda18271_priv *priv = fe->tuner_priv;
-       int ret;
-
-       mutex_lock(&priv->lock);
-
-       /* standby mode w/ slave tuner output
-        * & loop thru & xtal oscillator on */
-       ret = tda18271_set_standby_mode(fe, 1, 0, 0);
-
-       mutex_unlock(&priv->lock);
-
-       return ret;
-}
-
 static int tda18271_release(struct dvb_frontend *fe)
 {
        struct tda18271_priv *priv = fe->tuner_priv;
@@ -1199,6 +1220,9 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
                priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
                priv->config = (cfg) ? cfg->config : 0;
+               priv->small_i2c = (cfg) ? cfg->small_i2c : 0;
+               priv->output_opt = (cfg) ?
+                       cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
 
                /* tda18271_cal_on_startup == -1 when cal
                 * module option is unset */
@@ -1216,9 +1240,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 
                fe->tuner_priv = priv;
 
-               if (cfg)
-                       priv->small_i2c = cfg->small_i2c;
-
                if (tda_fail(tda18271_get_id(fe)))
                        goto fail;
 
@@ -1238,9 +1259,19 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                /* existing tuner instance */
                fe->tuner_priv = priv;
 
-               /* allow dvb driver to override i2c gate setting */
-               if ((cfg) && (cfg->gate != TDA18271_GATE_ANALOG))
-                       priv->gate = cfg->gate;
+               /* allow dvb driver to override configuration settings */
+               if (cfg) {
+                       if (cfg->gate != TDA18271_GATE_ANALOG)
+                               priv->gate = cfg->gate;
+                       if (cfg->role)
+                               priv->role = cfg->role;
+                       if (cfg->config)
+                               priv->config = cfg->config;
+                       if (cfg->small_i2c)
+                               priv->small_i2c = cfg->small_i2c;
+                       if (cfg->output_opt)
+                               priv->output_opt = cfg->output_opt;
+               }
                break;
        }
 
index ab14ceb..e21fdef 100644 (file)
@@ -962,10 +962,9 @@ struct tda18271_cid_target_map {
 static struct tda18271_cid_target_map tda18271_cid_target[] = {
        { .rfmax =  46000, .target = 0x04, .limit =  1800 },
        { .rfmax =  52200, .target = 0x0a, .limit =  1500 },
-       { .rfmax =  79100, .target = 0x01, .limit =  4000 },
+       { .rfmax =  70100, .target = 0x01, .limit =  4000 },
        { .rfmax = 136800, .target = 0x18, .limit =  4000 },
        { .rfmax = 156700, .target = 0x18, .limit =  4000 },
-       { .rfmax = 156700, .target = 0x18, .limit =  4000 },
        { .rfmax = 186250, .target = 0x0a, .limit =  4000 },
        { .rfmax = 230000, .target = 0x0a, .limit =  4000 },
        { .rfmax = 345000, .target = 0x18, .limit =  4000 },
index e6a80ad..2bee229 100644 (file)
@@ -108,6 +108,7 @@ struct tda18271_priv {
        enum tda18271_role role;
        enum tda18271_i2c_gate gate;
        enum tda18271_ver id;
+       enum tda18271_output_options output_opt;
 
        unsigned int config; /* interface to saa713x / tda829x */
        unsigned int tm_rfcal;
index 71bac95..323f291 100644 (file)
@@ -67,6 +67,17 @@ enum tda18271_i2c_gate {
        TDA18271_GATE_DIGITAL,
 };
 
+enum tda18271_output_options {
+       /* slave tuner output & loop thru & xtal oscillator always on */
+       TDA18271_OUTPUT_LT_XT_ON = 0,
+
+       /* slave tuner output loop thru off */
+       TDA18271_OUTPUT_LT_OFF = 1,
+
+       /* xtal oscillator off */
+       TDA18271_OUTPUT_XT_OFF = 2,
+};
+
 struct tda18271_config {
        /* override default if freq / std settings (optional) */
        struct tda18271_std_map *std_map;
@@ -77,6 +88,9 @@ struct tda18271_config {
        /* use i2c gate provided by analog or digital demod */
        enum tda18271_i2c_gate gate;
 
+       /* output options that can be disabled */
+       enum tda18271_output_options output_opt;
+
        /* force rf tracking filter calibration on startup */
        unsigned int rf_cal_on_startup:1;
 
index 5c6ef1e..2b876f3 100644 (file)
@@ -1320,6 +1320,23 @@ static struct tuner_params tuner_partsnic_pti_5nf05_params[] = {
        },
 };
 
+/* --------- TUNER_PHILIPS_CU1216L - DVB-C NIM ------------------------- */
+
+static struct tuner_range tuner_cu1216l_ranges[] = {
+       { 16 * 160.25 /*MHz*/, 0xce, 0x01 },
+       { 16 * 444.25 /*MHz*/, 0xce, 0x02 },
+       { 16 * 999.99        , 0xce, 0x04 },
+};
+
+static struct tuner_params tuner_philips_cu1216l_params[] = {
+       {
+               .type   = TUNER_PARAM_TYPE_DIGITAL,
+               .ranges = tuner_cu1216l_ranges,
+               .count  = ARRAY_SIZE(tuner_cu1216l_ranges),
+               .iffreq = 16 * 36.125, /*MHz*/
+       },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1778,6 +1795,16 @@ struct tunertype tuners[] = {
                .params = tuner_partsnic_pti_5nf05_params,
                .count  = ARRAY_SIZE(tuner_partsnic_pti_5nf05_params),
        },
+       [TUNER_PHILIPS_CU1216L] = {
+               .name = "Philips CU1216L",
+               .params = tuner_philips_cu1216l_params,
+               .count  = ARRAY_SIZE(tuner_philips_cu1216l_params),
+               .stepsize = 62500,
+       },
+       [TUNER_NXP_TDA18271] = {
+               .name   = "NXP TDA18271",
+               /* see tda18271-fe.c for details */
+       },
 };
 EXPORT_SYMBOL(tuners);
 
index 1d0e4b1..35d0817 100644 (file)
@@ -68,6 +68,10 @@ comment "Supported FireWire (IEEE 1394) Adapters"
        depends on DVB_CORE && IEEE1394
 source "drivers/media/dvb/firewire/Kconfig"
 
+comment "Supported Earthsoft PT1 Adapters"
+       depends on DVB_CORE && PCI && I2C
+source "drivers/media/dvb/pt1/Kconfig"
+
 comment "Supported DVB Frontends"
        depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
index 6092a5b..16d262d 100644 (file)
@@ -2,6 +2,6 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/
+obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ pt1/
 
 obj-$(CONFIG_DVB_FIREDTV)      += firewire/
index d13ebcb..ddf639e 100644 (file)
@@ -850,6 +850,49 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
        return 0;
 }
 
+static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
+{
+       int i;
+
+       memset(&(fe->dtv_property_cache), 0,
+                       sizeof(struct dtv_frontend_properties));
+
+       fe->dtv_property_cache.state = DTV_CLEAR;
+       fe->dtv_property_cache.delivery_system = SYS_UNDEFINED;
+       fe->dtv_property_cache.inversion = INVERSION_AUTO;
+       fe->dtv_property_cache.fec_inner = FEC_AUTO;
+       fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_AUTO;
+       fe->dtv_property_cache.bandwidth_hz = BANDWIDTH_AUTO;
+       fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_AUTO;
+       fe->dtv_property_cache.hierarchy = HIERARCHY_AUTO;
+       fe->dtv_property_cache.symbol_rate = QAM_AUTO;
+       fe->dtv_property_cache.code_rate_HP = FEC_AUTO;
+       fe->dtv_property_cache.code_rate_LP = FEC_AUTO;
+
+       fe->dtv_property_cache.isdbt_partial_reception = -1;
+       fe->dtv_property_cache.isdbt_sb_mode = -1;
+       fe->dtv_property_cache.isdbt_sb_subchannel = -1;
+       fe->dtv_property_cache.isdbt_sb_segment_idx = -1;
+       fe->dtv_property_cache.isdbt_sb_segment_count = -1;
+       fe->dtv_property_cache.isdbt_layer_enabled = 0x7;
+       for (i = 0; i < 3; i++) {
+               fe->dtv_property_cache.layer[i].fec = FEC_AUTO;
+               fe->dtv_property_cache.layer[i].modulation = QAM_AUTO;
+               fe->dtv_property_cache.layer[i].interleaving = -1;
+               fe->dtv_property_cache.layer[i].segment_count = -1;
+       }
+
+       return 0;
+}
+
+#define _DTV_CMD(n, s, b) \
+[n] = { \
+       .name = #n, \
+       .cmd  = n, \
+       .set  = s,\
+       .buffer = b \
+}
+
 static struct dtv_cmds_h dtv_cmds[] = {
        [DTV_TUNE] = {
                .name   = "DTV_TUNE",
@@ -949,6 +992,47 @@ static struct dtv_cmds_h dtv_cmds[] = {
                .cmd    = DTV_TRANSMISSION_MODE,
                .set    = 1,
        },
+
+       _DTV_CMD(DTV_ISDBT_PARTIAL_RECEPTION, 1, 0),
+       _DTV_CMD(DTV_ISDBT_SOUND_BROADCASTING, 1, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SUBCHANNEL_ID, 1, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SEGMENT_IDX, 1, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SEGMENT_COUNT, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYER_ENABLED, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_FEC, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_MODULATION, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_SEGMENT_COUNT, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_TIME_INTERLEAVING, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_FEC, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_MODULATION, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_SEGMENT_COUNT, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_TIME_INTERLEAVING, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_FEC, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_MODULATION, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 1, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 1, 0),
+
+       _DTV_CMD(DTV_ISDBT_PARTIAL_RECEPTION, 0, 0),
+       _DTV_CMD(DTV_ISDBT_SOUND_BROADCASTING, 0, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SUBCHANNEL_ID, 0, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SEGMENT_IDX, 0, 0),
+       _DTV_CMD(DTV_ISDBT_SB_SEGMENT_COUNT, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYER_ENABLED, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_FEC, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_MODULATION, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_SEGMENT_COUNT, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERA_TIME_INTERLEAVING, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_FEC, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_MODULATION, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_SEGMENT_COUNT, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERB_TIME_INTERLEAVING, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_FEC, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_MODULATION, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 0, 0),
+       _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 0, 0),
+
+       _DTV_CMD(DTV_ISDBS_TS_ID, 1, 0),
+
        /* Get */
        [DTV_DISEQC_SLAVE_REPLY] = {
                .name   = "DTV_DISEQC_SLAVE_REPLY",
@@ -956,6 +1040,7 @@ static struct dtv_cmds_h dtv_cmds[] = {
                .set    = 0,
                .buffer = 1,
        },
+
        [DTV_API_VERSION] = {
                .name   = "DTV_API_VERSION",
                .cmd    = DTV_API_VERSION,
@@ -1165,14 +1250,21 @@ static void dtv_property_adv_params_sync(struct dvb_frontend *fe)
        if(c->delivery_system == SYS_ISDBT) {
                /* Fake out a generic DVB-T request so we pass validation in the ioctl */
                p->frequency = c->frequency;
-               p->inversion = INVERSION_AUTO;
+               p->inversion = c->inversion;
                p->u.ofdm.constellation = QAM_AUTO;
                p->u.ofdm.code_rate_HP = FEC_AUTO;
                p->u.ofdm.code_rate_LP = FEC_AUTO;
-               p->u.ofdm.bandwidth = BANDWIDTH_AUTO;
                p->u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
                p->u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
                p->u.ofdm.hierarchy_information = HIERARCHY_AUTO;
+               if (c->bandwidth_hz == 8000000)
+                       p->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+               else if (c->bandwidth_hz == 7000000)
+                       p->u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+               else if (c->bandwidth_hz == 6000000)
+                       p->u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+               else
+                       p->u.ofdm.bandwidth = BANDWIDTH_AUTO;
        }
 }
 
@@ -1274,6 +1366,65 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
        case DTV_HIERARCHY:
                tvp->u.data = fe->dtv_property_cache.hierarchy;
                break;
+
+       /* ISDB-T Support here */
+       case DTV_ISDBT_PARTIAL_RECEPTION:
+               tvp->u.data = fe->dtv_property_cache.isdbt_partial_reception;
+               break;
+       case DTV_ISDBT_SOUND_BROADCASTING:
+               tvp->u.data = fe->dtv_property_cache.isdbt_sb_mode;
+               break;
+       case DTV_ISDBT_SB_SUBCHANNEL_ID:
+               tvp->u.data = fe->dtv_property_cache.isdbt_sb_subchannel;
+               break;
+       case DTV_ISDBT_SB_SEGMENT_IDX:
+               tvp->u.data = fe->dtv_property_cache.isdbt_sb_segment_idx;
+               break;
+       case DTV_ISDBT_SB_SEGMENT_COUNT:
+               tvp->u.data = fe->dtv_property_cache.isdbt_sb_segment_count;
+               break;
+       case DTV_ISDBT_LAYER_ENABLED:
+               tvp->u.data = fe->dtv_property_cache.isdbt_layer_enabled;
+               break;
+       case DTV_ISDBT_LAYERA_FEC:
+               tvp->u.data = fe->dtv_property_cache.layer[0].fec;
+               break;
+       case DTV_ISDBT_LAYERA_MODULATION:
+               tvp->u.data = fe->dtv_property_cache.layer[0].modulation;
+               break;
+       case DTV_ISDBT_LAYERA_SEGMENT_COUNT:
+               tvp->u.data = fe->dtv_property_cache.layer[0].segment_count;
+               break;
+       case DTV_ISDBT_LAYERA_TIME_INTERLEAVING:
+               tvp->u.data = fe->dtv_property_cache.layer[0].interleaving;
+               break;
+       case DTV_ISDBT_LAYERB_FEC:
+               tvp->u.data = fe->dtv_property_cache.layer[1].fec;
+               break;
+       case DTV_ISDBT_LAYERB_MODULATION:
+               tvp->u.data = fe->dtv_property_cache.layer[1].modulation;
+               break;
+       case DTV_ISDBT_LAYERB_SEGMENT_COUNT:
+               tvp->u.data = fe->dtv_property_cache.layer[1].segment_count;
+               break;
+       case DTV_ISDBT_LAYERB_TIME_INTERLEAVING:
+               tvp->u.data = fe->dtv_property_cache.layer[1].interleaving;
+               break;
+       case DTV_ISDBT_LAYERC_FEC:
+               tvp->u.data = fe->dtv_property_cache.layer[2].fec;
+               break;
+       case DTV_ISDBT_LAYERC_MODULATION:
+               tvp->u.data = fe->dtv_property_cache.layer[2].modulation;
+               break;
+       case DTV_ISDBT_LAYERC_SEGMENT_COUNT:
+               tvp->u.data = fe->dtv_property_cache.layer[2].segment_count;
+               break;
+       case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
+               tvp->u.data = fe->dtv_property_cache.layer[2].interleaving;
+               break;
+       case DTV_ISDBS_TS_ID:
+               tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
+               break;
        default:
                r = -1;
        }
@@ -1302,10 +1453,8 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
                /* Reset a cache of data specific to the frontend here. This does
                 * not effect hardware.
                 */
+               dvb_frontend_clear_cache(fe);
                dprintk("%s() Flushing property cache\n", __func__);
-               memset(&fe->dtv_property_cache, 0, sizeof(struct dtv_frontend_properties));
-               fe->dtv_property_cache.state = tvp->cmd;
-               fe->dtv_property_cache.delivery_system = SYS_UNDEFINED;
                break;
        case DTV_TUNE:
                /* interpret the cache of data, build either a traditional frontend
@@ -1371,6 +1520,65 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
        case DTV_HIERARCHY:
                fe->dtv_property_cache.hierarchy = tvp->u.data;
                break;
+
+       /* ISDB-T Support here */
+       case DTV_ISDBT_PARTIAL_RECEPTION:
+               fe->dtv_property_cache.isdbt_partial_reception = tvp->u.data;
+               break;
+       case DTV_ISDBT_SOUND_BROADCASTING:
+               fe->dtv_property_cache.isdbt_sb_mode = tvp->u.data;
+               break;
+       case DTV_ISDBT_SB_SUBCHANNEL_ID:
+               fe->dtv_property_cache.isdbt_sb_subchannel = tvp->u.data;
+               break;
+       case DTV_ISDBT_SB_SEGMENT_IDX:
+               fe->dtv_property_cache.isdbt_sb_segment_idx = tvp->u.data;
+               break;
+       case DTV_ISDBT_SB_SEGMENT_COUNT:
+               fe->dtv_property_cache.isdbt_sb_segment_count = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYER_ENABLED:
+               fe->dtv_property_cache.isdbt_layer_enabled = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERA_FEC:
+               fe->dtv_property_cache.layer[0].fec = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERA_MODULATION:
+               fe->dtv_property_cache.layer[0].modulation = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERA_SEGMENT_COUNT:
+               fe->dtv_property_cache.layer[0].segment_count = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERA_TIME_INTERLEAVING:
+               fe->dtv_property_cache.layer[0].interleaving = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERB_FEC:
+               fe->dtv_property_cache.layer[1].fec = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERB_MODULATION:
+               fe->dtv_property_cache.layer[1].modulation = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERB_SEGMENT_COUNT:
+               fe->dtv_property_cache.layer[1].segment_count = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERB_TIME_INTERLEAVING:
+               fe->dtv_property_cache.layer[1].interleaving = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERC_FEC:
+               fe->dtv_property_cache.layer[2].fec = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERC_MODULATION:
+               fe->dtv_property_cache.layer[2].modulation = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERC_SEGMENT_COUNT:
+               fe->dtv_property_cache.layer[2].segment_count = tvp->u.data;
+               break;
+       case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
+               fe->dtv_property_cache.layer[2].interleaving = tvp->u.data;
+               break;
+       case DTV_ISDBS_TS_ID:
+               fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
+               break;
        default:
                r = -1;
        }
index e176da4..810f07d 100644 (file)
@@ -341,6 +341,23 @@ struct dtv_frontend_properties {
        fe_rolloff_t            rolloff;
 
        fe_delivery_system_t    delivery_system;
+
+       /* ISDB-T specifics */
+       u8                      isdbt_partial_reception;
+       u8                      isdbt_sb_mode;
+       u8                      isdbt_sb_subchannel;
+       u32                     isdbt_sb_segment_idx;
+       u32                     isdbt_sb_segment_count;
+       u8                      isdbt_layer_enabled;
+       struct {
+           u8                  segment_count;
+           fe_code_rate_t      fec;
+           fe_modulation_t     modulation;
+           u8                  interleaving;
+       } layer[3];
+
+       /* ISDB-T specifics */
+       u32                     isdbs_ts_id;
 };
 
 struct dvb_frontend {
index 479dd05..94159b9 100644 (file)
@@ -447,7 +447,7 @@ static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env)
        return 0;
 }
 
-static char *dvb_nodename(struct device *dev)
+static char *dvb_devnode(struct device *dev, mode_t *mode)
 {
        struct dvb_device *dvbdev = dev_get_drvdata(dev);
 
@@ -478,7 +478,7 @@ static int __init init_dvbdev(void)
                goto error;
        }
        dvb_class->dev_uevent = dvb_uevent;
-       dvb_class->nodename = dvb_nodename;
+       dvb_class->devnode = dvb_devnode;
        return 0;
 
 error:
index 8b8bc04..0e4b97f 100644 (file)
@@ -71,6 +71,7 @@ config DVB_USB_DIB0700
        depends on DVB_USB
        select DVB_DIB7000P if !DVB_FE_CUSTOMISE
        select DVB_DIB7000M if !DVB_FE_CUSTOMISE
+       select DVB_DIB8000 if !DVB_FE_CUSTOMISE
        select DVB_DIB3000MC if !DVB_FE_CUSTOMISE
        select DVB_S5H1411 if !DVB_FE_CUSTOMISE
        select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
@@ -87,7 +88,7 @@ config DVB_USB_DIB0700
          Avermedia and other big and small companies.
 
          For an up-to-date list of devices supported by this driver, have a look
-         on the Linux-DVB Wiki at www.linuxtv.org.
+         on the LinuxTV Wiki at www.linuxtv.org.
 
          Say Y if you own such a device and want to use it. You should build it as
          a module.
@@ -315,3 +316,9 @@ config DVB_USB_CE6230
        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
        help
          Say Y here to support the Intel CE6230 DVB-T USB2.0 receiver
+
+config DVB_USB_FRIIO
+       tristate "Friio ISDB-T USB2.0 Receiver support"
+       depends on DVB_USB
+       help
+         Say Y here to support the Japanese DTV receiver Friio.
index f92734e..85b83a4 100644 (file)
@@ -79,6 +79,9 @@ obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o
 dvb-usb-ce6230-objs = ce6230.o
 obj-$(CONFIG_DVB_USB_CE6230) += dvb-usb-ce6230.o
 
+dvb-usb-friio-objs = friio.o friio-fe.o
+obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 # due to tuner-xc3028
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
index 99cdd0d..cf042b3 100644 (file)
@@ -61,10 +61,13 @@ static struct af9013_config af9015_af9013_config[] = {
 
 static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
 {
+#define BUF_LEN 63
+#define REQ_HDR_LEN 8 /* send header size */
+#define ACK_HDR_LEN 2 /* rece header size */
        int act_len, ret;
-       u8 buf[64];
+       u8 buf[BUF_LEN];
        u8 write = 1;
-       u8 msg_len = 8;
+       u8 msg_len = REQ_HDR_LEN;
        static u8 seq; /* packet sequence number */
 
        if (mutex_lock_interruptible(&af9015_usb_mutex) < 0)
@@ -94,7 +97,7 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
                break;
        case WRITE_MEMORY:
                if (((req->addr & 0xff00) == 0xff00) ||
-                   ((req->addr & 0xae00) == 0xae00))
+                   ((req->addr & 0xff00) == 0xae00))
                        buf[0] = WRITE_VIRTUAL_MEMORY;
        case WRITE_VIRTUAL_MEMORY:
        case COPY_FIRMWARE:
@@ -107,17 +110,26 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
                goto error_unlock;
        }
 
+       /* buffer overflow check */
+       if ((write && (req->data_len > BUF_LEN - REQ_HDR_LEN)) ||
+               (!write && (req->data_len > BUF_LEN - ACK_HDR_LEN))) {
+               err("too much data; cmd:%d len:%d", req->cmd, req->data_len);
+               ret = -EINVAL;
+               goto error_unlock;
+       }
+
        /* write requested */
        if (write) {
-               memcpy(&buf[8], req->data, req->data_len);
+               memcpy(&buf[REQ_HDR_LEN], req->data, req->data_len);
                msg_len += req->data_len;
        }
+
        deb_xfer(">>> ");
        debug_dump(buf, msg_len, deb_xfer);
 
        /* send req */
        ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), buf, msg_len,
-       &act_len, AF9015_USB_TIMEOUT);
+               &act_len, AF9015_USB_TIMEOUT);
        if (ret)
                err("bulk message failed:%d (%d/%d)", ret, msg_len, act_len);
        else
@@ -130,10 +142,14 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
        if (req->cmd == DOWNLOAD_FIRMWARE || req->cmd == RECONNECT_USB)
                goto exit_unlock;
 
-       /* receive ack and data if read req */
-       msg_len = 1 + 1 + req->data_len;  /* seq + status + data len */
+       /* write receives seq + status = 2 bytes
+          read receives seq + status + data = 2 + N bytes */
+       msg_len = ACK_HDR_LEN;
+       if (!write)
+               msg_len += req->data_len;
+
        ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, 0x81), buf, msg_len,
-                          &act_len, AF9015_USB_TIMEOUT);
+               &act_len, AF9015_USB_TIMEOUT);
        if (ret) {
                err("recv bulk message failed:%d", ret);
                ret = -1;
@@ -159,7 +175,7 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
 
        /* read request, copy returned data to return buf */
        if (!write)
-               memcpy(req->data, &buf[2], req->data_len);
+               memcpy(req->data, &buf[ACK_HDR_LEN], req->data_len);
 
 error_unlock:
 exit_unlock:
@@ -369,12 +385,14 @@ static int af9015_init_endpoint(struct dvb_usb_device *d)
        u8  packet_size;
        deb_info("%s: USB speed:%d\n", __func__, d->udev->speed);
 
+       /* Windows driver uses packet count 21 for USB1.1 and 348 for USB2.0.
+          We use smaller - about 1/4 from the original, 5 and 87. */
 #define TS_PACKET_SIZE            188
 
-#define TS_USB20_PACKET_COUNT     348
+#define TS_USB20_PACKET_COUNT      87
 #define TS_USB20_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB20_PACKET_COUNT)
 
-#define TS_USB11_PACKET_COUNT      21
+#define TS_USB11_PACKET_COUNT       5
 #define TS_USB11_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB11_PACKET_COUNT)
 
 #define TS_USB20_MAX_PACKET_SIZE  512
@@ -868,13 +886,13 @@ static int af9015_read_config(struct usb_device *udev)
                /* USB1.1 set smaller buffersize and disable 2nd adapter */
                if (udev->speed == USB_SPEED_FULL) {
                        af9015_properties[i].adapter[0].stream.u.bulk.buffersize
-                               = TS_USB11_MAX_PACKET_SIZE;
+                               = TS_USB11_FRAME_SIZE;
                        /* disable 2nd adapter because we don't have
                           PID-filters */
                        af9015_config.dual_mode = 0;
                } else {
                        af9015_properties[i].adapter[0].stream.u.bulk.buffersize
-                               = TS_USB20_MAX_PACKET_SIZE;
+                               = TS_USB20_FRAME_SIZE;
                }
        }
 
@@ -1310,7 +1328,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                        .u = {
                                                .bulk = {
                                                        .buffersize =
-                                               TS_USB20_MAX_PACKET_SIZE,
+                                               TS_USB20_FRAME_SIZE,
                                                }
                                        }
                                },
@@ -1416,7 +1434,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                        .u = {
                                                .bulk = {
                                                        .buffersize =
-                                               TS_USB20_MAX_PACKET_SIZE,
+                                               TS_USB20_FRAME_SIZE,
                                                }
                                        }
                                },
@@ -1522,7 +1540,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                        .u = {
                                                .bulk = {
                                                        .buffersize =
-                                               TS_USB20_MAX_PACKET_SIZE,
+                                               TS_USB20_FRAME_SIZE,
                                                }
                                        }
                                },
index 7381aff..2ae7f64 100644 (file)
@@ -203,11 +203,11 @@ static struct i2c_algorithm anysee_i2c_algo = {
 
 static int anysee_mt352_demod_init(struct dvb_frontend *fe)
 {
-       static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };
-       static u8 reset []         = { RESET,      0x80 };
-       static u8 adc_ctl_1_cfg [] = { ADC_CTL_1,  0x40 };
-       static u8 agc_cfg []       = { AGC_TARGET, 0x28, 0x20 };
-       static u8 gpp_ctl_cfg []   = { GPP_CTL,    0x33 };
+       static u8 clock_config[]   = { CLOCK_CTL,  0x38, 0x28 };
+       static u8 reset[]          = { RESET,      0x80 };
+       static u8 adc_ctl_1_cfg[]  = { ADC_CTL_1,  0x40 };
+       static u8 agc_cfg[]        = { AGC_TARGET, 0x28, 0x20 };
+       static u8 gpp_ctl_cfg[]    = { GPP_CTL,    0x33 };
        static u8 capt_range_cfg[] = { CAPT_RANGE, 0x32 };
 
        mt352_write(fe, clock_config,   sizeof(clock_config));
@@ -485,7 +485,7 @@ static int anysee_probe(struct usb_interface *intf,
        return ret;
 }
 
-static struct usb_device_id anysee_table [] = {
+static struct usb_device_id anysee_table[] = {
        { USB_DEVICE(USB_VID_CYPRESS, USB_PID_ANYSEE) },
        { USB_DEVICE(USB_VID_AMT,     USB_PID_ANYSEE) },
        { }             /* Terminating entry */
@@ -511,7 +511,7 @@ static struct dvb_usb_device_properties anysee_properties = {
                                .endpoint = 0x82,
                                .u = {
                                        .bulk = {
-                                               .buffersize = 512,
+                                               .buffersize = (16*512),
                                        }
                                }
                        },
index 52badc0..0737c63 100644 (file)
@@ -274,7 +274,7 @@ static struct dvb_usb_device_properties ce6230_properties = {
                                .endpoint = 0x82,
                                .u = {
                                        .bulk = {
-                                               .buffersize = 512,
+                                               .buffersize = (16*512),
                                        }
                                }
                        },
index d1d6f44..0b2812a 100644 (file)
@@ -4,13 +4,14 @@
  *     under the terms of the GNU General Public License as published by the Free
  *     Software Foundation, version 2.
  *
- *  Copyright (C) 2005-7 DiBcom, SA
+ *  Copyright (C) 2005-9 DiBcom, SA et al
  */
 #include "dib0700.h"
 
 #include "dib3000mc.h"
 #include "dib7000m.h"
 #include "dib7000p.h"
+#include "dib8000.h"
 #include "mt2060.h"
 #include "mt2266.h"
 #include "tuner-xc2028.h"
@@ -1098,11 +1099,13 @@ static struct dibx000_agc_config dib7070_agc_config = {
 
 static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff)
 {
+       deb_info("reset: %d", onoff);
        return dib7000p_set_gpio(fe, 8, 0, !onoff);
 }
 
 static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff)
 {
+       deb_info("sleep: %d", onoff);
        return dib7000p_set_gpio(fe, 9, 0, onoff);
 }
 
@@ -1112,16 +1115,26 @@ static struct dib0070_config dib7070p_dib0070_config[2] = {
                .reset = dib7070_tuner_reset,
                .sleep = dib7070_tuner_sleep,
                .clock_khz = 12000,
-               .clock_pad_drive = 4
+               .clock_pad_drive = 4,
+               .charge_pump = 2,
        }, {
                .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
                .reset = dib7070_tuner_reset,
                .sleep = dib7070_tuner_sleep,
                .clock_khz = 12000,
-
+               .charge_pump = 2,
        }
 };
 
+static struct dib0070_config dib7770p_dib0070_config = {
+        .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
+        .reset = dib7070_tuner_reset,
+        .sleep = dib7070_tuner_sleep,
+        .clock_khz = 12000,
+        .clock_pad_drive = 0,
+        .flip_chip = 1,
+};
+
 static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
 {
        struct dvb_usb_adapter *adap = fe->dvb->priv;
@@ -1139,6 +1152,45 @@ static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_fronte
        return state->set_param_save(fe, fep);
 }
 
+static int dib7770_set_param_override(struct dvb_frontend *fe,
+               struct dvb_frontend_parameters *fep)
+{
+        struct dvb_usb_adapter *adap = fe->dvb->priv;
+        struct dib0700_adapter_state *state = adap->priv;
+
+        u16 offset;
+        u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+        switch (band) {
+        case BAND_VHF:
+                 dib7000p_set_gpio(fe, 0, 0, 1);
+                 offset = 850;
+                 break;
+        case BAND_UHF:
+        default:
+                 dib7000p_set_gpio(fe, 0, 0, 0);
+                 offset = 250;
+                 break;
+        }
+        deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe));
+        dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
+        return state->set_param_save(fe, fep);
+}
+
+static int dib7770p_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_adapter_state *st = adap->priv;
+        struct i2c_adapter *tun_i2c = dib7000p_get_i2c_master(adap->fe,
+                        DIBX000_I2C_INTERFACE_TUNER, 1);
+
+        if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
+                                &dib7770p_dib0070_config) == NULL)
+                return -ENODEV;
+
+        st->set_param_save = adap->fe->ops.tuner_ops.set_params;
+        adap->fe->ops.tuner_ops.set_params = dib7770_set_param_override;
+        return 0;
+}
+
 static int dib7070p_tuner_attach(struct dvb_usb_adapter *adap)
 {
        struct dib0700_adapter_state *st = adap->priv;
@@ -1217,6 +1269,306 @@ static int stk7070p_frontend_attach(struct dvb_usb_adapter *adap)
        return adap->fe == NULL ? -ENODEV : 0;
 }
 
+/* DIB807x generic */
+static struct dibx000_agc_config dib807x_agc_config[2] = {
+       {
+               BAND_VHF,
+               /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0,
+                * P_agc_freq_pwm_div=1, P_agc_inv_pwm1=0,
+                * P_agc_inv_pwm2=0,P_agc_inh_dc_rv_est=0,
+                * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5,
+                * P_agc_write=0 */
+               (0 << 15) | (0 << 14) | (7 << 11) | (0 << 10) | (0 << 9) |
+                       (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) |
+                       (0 << 0), /* setup*/
+
+               600, /* inv_gain*/
+               10,  /* time_stabiliz*/
+
+               0,  /* alpha_level*/
+               118,  /* thlock*/
+
+               0,     /* wbd_inv*/
+               3530,  /* wbd_ref*/
+               1,     /* wbd_sel*/
+               5,     /* wbd_alpha*/
+
+               65535,  /* agc1_max*/
+               0,  /* agc1_min*/
+
+               65535,  /* agc2_max*/
+               0,      /* agc2_min*/
+
+               0,      /* agc1_pt1*/
+               40,     /* agc1_pt2*/
+               183,    /* agc1_pt3*/
+               206,    /* agc1_slope1*/
+               255,    /* agc1_slope2*/
+               72,     /* agc2_pt1*/
+               152,    /* agc2_pt2*/
+               88,     /* agc2_slope1*/
+               90,     /* agc2_slope2*/
+
+               17,  /* alpha_mant*/
+               27,  /* alpha_exp*/
+               23,  /* beta_mant*/
+               51,  /* beta_exp*/
+
+               0,  /* perform_agc_softsplit*/
+       }, {
+               BAND_UHF,
+               /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0,
+                * P_agc_freq_pwm_div=1, P_agc_inv_pwm1=0,
+                * P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
+                * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5,
+                * P_agc_write=0 */
+               (0 << 15) | (0 << 14) | (1 << 11) | (0 << 10) | (0 << 9) |
+                       (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) |
+                       (0 << 0), /* setup */
+
+               600, /* inv_gain*/
+               10,  /* time_stabiliz*/
+
+               0,  /* alpha_level*/
+               118,  /* thlock*/
+
+               0,     /* wbd_inv*/
+               3530,  /* wbd_ref*/
+               1,     /* wbd_sel*/
+               5,     /* wbd_alpha*/
+
+               65535,  /* agc1_max*/
+               0,  /* agc1_min*/
+
+               65535,  /* agc2_max*/
+               0,      /* agc2_min*/
+
+               0,      /* agc1_pt1*/
+               40,     /* agc1_pt2*/
+               183,    /* agc1_pt3*/
+               206,    /* agc1_slope1*/
+               255,    /* agc1_slope2*/
+               72,     /* agc2_pt1*/
+               152,    /* agc2_pt2*/
+               88,     /* agc2_slope1*/
+               90,     /* agc2_slope2*/
+
+               17,  /* alpha_mant*/
+               27,  /* alpha_exp*/
+               23,  /* beta_mant*/
+               51,  /* beta_exp*/
+
+               0,  /* perform_agc_softsplit*/
+       }
+};
+
+static struct dibx000_bandwidth_config dib807x_bw_config_12_mhz = {
+       60000, 15000, /* internal, sampling*/
+       1, 20, 3, 1, 0, /* pll_cfg: prediv, ratio, range, reset, bypass*/
+       0, 0, 1, 1, 2, /* misc: refdiv, bypclk_div, IO_CLK_en_core,
+                         ADClkSrc, modulo */
+       (3 << 14) | (1 << 12) | (599 << 0), /* sad_cfg: refsel, sel, freq_15k*/
+       (0 << 25) | 0, /* ifreq = 0.000000 MHz*/
+       18179755, /* timf*/
+       12000000, /* xtal_hz*/
+};
+
+static struct dib8000_config dib807x_dib8000_config[2] = {
+       {
+               .output_mpeg2_in_188_bytes = 1,
+
+               .agc_config_count = 2,
+               .agc = dib807x_agc_config,
+               .pll = &dib807x_bw_config_12_mhz,
+               .tuner_is_baseband = 1,
+
+               .gpio_dir = DIB8000_GPIO_DEFAULT_DIRECTIONS,
+               .gpio_val = DIB8000_GPIO_DEFAULT_VALUES,
+               .gpio_pwm_pos = DIB8000_GPIO_DEFAULT_PWM_POS,
+
+               .hostbus_diversity = 1,
+               .div_cfg = 1,
+               .agc_control = &dib0070_ctrl_agc_filter,
+               .output_mode = OUTMODE_MPEG2_FIFO,
+               .drives = 0x2d98,
+       }, {
+               .output_mpeg2_in_188_bytes = 1,
+
+               .agc_config_count = 2,
+               .agc = dib807x_agc_config,
+               .pll = &dib807x_bw_config_12_mhz,
+               .tuner_is_baseband = 1,
+
+               .gpio_dir = DIB8000_GPIO_DEFAULT_DIRECTIONS,
+               .gpio_val = DIB8000_GPIO_DEFAULT_VALUES,
+               .gpio_pwm_pos = DIB8000_GPIO_DEFAULT_PWM_POS,
+
+               .hostbus_diversity = 1,
+               .agc_control = &dib0070_ctrl_agc_filter,
+               .output_mode = OUTMODE_MPEG2_FIFO,
+               .drives = 0x2d98,
+       }
+};
+
+static int dib807x_tuner_reset(struct dvb_frontend *fe, int onoff)
+{
+       return dib8000_set_gpio(fe, 5, 0, !onoff);
+}
+
+static int dib807x_tuner_sleep(struct dvb_frontend *fe, int onoff)
+{
+       return dib8000_set_gpio(fe, 0, 0, onoff);
+}
+
+static const struct dib0070_wbd_gain_cfg dib8070_wbd_gain_cfg[] = {
+    { 240,      7},
+    { 0xffff,   6},
+};
+
+static struct dib0070_config dib807x_dib0070_config[2] = {
+       {
+               .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
+               .reset = dib807x_tuner_reset,
+               .sleep = dib807x_tuner_sleep,
+               .clock_khz = 12000,
+               .clock_pad_drive = 4,
+               .vga_filter = 1,
+               .force_crystal_mode = 1,
+               .enable_third_order_filter = 1,
+               .charge_pump = 0,
+               .wbd_gain = dib8070_wbd_gain_cfg,
+               .osc_buffer_state = 0,
+               .freq_offset_khz_uhf = -100,
+               .freq_offset_khz_vhf = -100,
+       }, {
+               .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
+               .reset = dib807x_tuner_reset,
+               .sleep = dib807x_tuner_sleep,
+               .clock_khz = 12000,
+               .clock_pad_drive = 2,
+               .vga_filter = 1,
+               .force_crystal_mode = 1,
+               .enable_third_order_filter = 1,
+               .charge_pump = 0,
+               .wbd_gain = dib8070_wbd_gain_cfg,
+               .osc_buffer_state = 0,
+               .freq_offset_khz_uhf = -25,
+               .freq_offset_khz_vhf = -25,
+       }
+};
+
+static int dib807x_set_param_override(struct dvb_frontend *fe,
+               struct dvb_frontend_parameters *fep)
+{
+       struct dvb_usb_adapter *adap = fe->dvb->priv;
+       struct dib0700_adapter_state *state = adap->priv;
+
+       u16 offset = dib0070_wbd_offset(fe);
+       u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+       switch (band) {
+       case BAND_VHF:
+               offset += 750;
+               break;
+       case BAND_UHF:  /* fall-thru wanted */
+       default:
+               offset += 250; break;
+       }
+       deb_info("WBD for DiB8000: %d\n", offset);
+       dib8000_set_wbd_ref(fe, offset);
+
+       return state->set_param_save(fe, fep);
+}
+
+static int dib807x_tuner_attach(struct dvb_usb_adapter *adap)
+{
+       struct dib0700_adapter_state *st = adap->priv;
+       struct i2c_adapter *tun_i2c = dib8000_get_i2c_master(adap->fe,
+                       DIBX000_I2C_INTERFACE_TUNER, 1);
+
+       if (adap->id == 0) {
+               if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
+                               &dib807x_dib0070_config[0]) == NULL)
+                       return -ENODEV;
+       } else {
+               if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
+                               &dib807x_dib0070_config[1]) == NULL)
+                       return -ENODEV;
+       }
+
+       st->set_param_save = adap->fe->ops.tuner_ops.set_params;
+       adap->fe->ops.tuner_ops.set_params = dib807x_set_param_override;
+       return 0;
+}
+
+
+/* STK807x */
+static int stk807x_frontend_attach(struct dvb_usb_adapter *adap)
+{
+       dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
+       msleep(10);
+       dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
+       dib0700_set_gpio(adap->dev, GPIO4, GPIO_OUT, 1);
+       dib0700_set_gpio(adap->dev, GPIO7, GPIO_OUT, 1);
+
+       dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
+
+       dib0700_ctrl_clock(adap->dev, 72, 1);
+
+       msleep(10);
+       dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
+       msleep(10);
+       dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
+
+       dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
+                               0x80);
+
+       adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,
+                             &dib807x_dib8000_config[0]);
+
+       return adap->fe == NULL ?  -ENODEV : 0;
+}
+
+/* STK807xPVR */
+static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap)
+{
+       dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 0);
+       msleep(30);
+       dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
+       msleep(500);
+       dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
+       dib0700_set_gpio(adap->dev, GPIO4, GPIO_OUT, 1);
+       dib0700_set_gpio(adap->dev, GPIO7, GPIO_OUT, 1);
+
+       dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
+
+       dib0700_ctrl_clock(adap->dev, 72, 1);
+
+       msleep(10);
+       dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
+       msleep(10);
+       dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
+
+       /* initialize IC 0 */
+       dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x12, 0x80);
+
+       adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,
+                             &dib807x_dib8000_config[0]);
+
+       return adap->fe == NULL ? -ENODEV : 0;
+}
+
+static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)
+{
+       /* initialize IC 1 */
+       dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x22, 0x82);
+
+       adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x82,
+                             &dib807x_dib8000_config[1]);
+
+       return adap->fe == NULL ? -ENODEV : 0;
+}
+
+
 /* STK7070PD */
 static struct dib7000p_config stk7070pd_dib7000p_config[2] = {
        {
@@ -1500,7 +1852,15 @@ struct usb_device_id dib0700_usb_id_table[] = {
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T3) },
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T5) },
        { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D) },
-       { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D_2) },
+/* 55 */{ USB_DEVICE(USB_VID_YUAN,     USB_PID_YUAN_STK7700D_2) },
+       { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV73A) },
+       { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV73ESE) },
+       { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV282E) },
+       { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7770P) },
+/* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) },
+       { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XPVR) },
+       { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XP) },
+       { USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
        { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1565,7 +1925,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { NULL },
                        },
                        {   "Leadtek Winfast DTV Dongle (STK7700P based)",
-                               { &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] },
+                               { &dib0700_usb_id_table[8] },
                                { NULL },
                        },
                        {   "AVerMedia AVerTV DVB-T Express",
@@ -1762,6 +2122,41 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
                .rc_query         = dib0700_rc_query
 
+       }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+
+               .num_adapters = 1,
+               .adapter = {
+                       {
+                               .frontend_attach  = stk7070p_frontend_attach,
+                               .tuner_attach     = dib7070p_tuner_attach,
+
+                               DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                               .size_of_priv     = sizeof(struct dib0700_adapter_state),
+                       },
+               },
+
+               .num_device_descs = 3,
+               .devices = {
+                       {   "Pinnacle PCTV 73A",
+                               { &dib0700_usb_id_table[56], NULL },
+                               { NULL },
+                       },
+                       {   "Pinnacle PCTV 73e SE",
+                               { &dib0700_usb_id_table[57], NULL },
+                               { NULL },
+                       },
+                       {   "Pinnacle PCTV 282e",
+                               { &dib0700_usb_id_table[58], NULL },
+                               { NULL },
+                       },
+               },
+
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_key_map       = dib0700_rc_keys,
+               .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+               .rc_query         = dib0700_rc_query
+
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
                .num_adapters = 2,
@@ -1927,6 +2322,102 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { NULL },
                        },
                },
+       }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+
+               .num_adapters = 1,
+               .adapter = {
+                       {
+                               .frontend_attach  = stk7070p_frontend_attach,
+                               .tuner_attach     = dib7770p_tuner_attach,
+
+                               DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                               .size_of_priv =
+                                       sizeof(struct dib0700_adapter_state),
+                       },
+               },
+
+               .num_device_descs = 2,
+               .devices = {
+                       {   "DiBcom STK7770P reference design",
+                               { &dib0700_usb_id_table[59], NULL },
+                               { NULL },
+                       },
+                       {   "Terratec Cinergy T USB XXS (HD)",
+                               { &dib0700_usb_id_table[34], &dib0700_usb_id_table[60] },
+                               { NULL },
+                       },
+               },
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_key_map       = dib0700_rc_keys,
+               .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+               .rc_query         = dib0700_rc_query
+       }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+               .num_adapters = 1,
+               .adapter = {
+                       {
+                               .frontend_attach  = stk807x_frontend_attach,
+                               .tuner_attach     = dib807x_tuner_attach,
+
+                               DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                               .size_of_priv =
+                                       sizeof(struct dib0700_adapter_state),
+                       },
+               },
+
+               .num_device_descs = 2,
+               .devices = {
+                       {   "DiBcom STK807xP reference design",
+                               { &dib0700_usb_id_table[62], NULL },
+                               { NULL },
+                       },
+                       {   "Prolink Pixelview SBTVD",
+                               { &dib0700_usb_id_table[63], NULL },
+                               { NULL },
+                       },
+               },
+
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_key_map       = dib0700_rc_keys,
+               .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+               .rc_query         = dib0700_rc_query
+
+       }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+               .num_adapters = 2,
+               .adapter = {
+                       {
+                               .frontend_attach  = stk807xpvr_frontend_attach0,
+                               .tuner_attach     = dib807x_tuner_attach,
+
+                               DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                               .size_of_priv =
+                                       sizeof(struct dib0700_adapter_state),
+                       },
+                       {
+                               .frontend_attach  = stk807xpvr_frontend_attach1,
+                               .tuner_attach     = dib807x_tuner_attach,
+
+                               DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+
+                               .size_of_priv =
+                                       sizeof(struct dib0700_adapter_state),
+                       },
+               },
+
+               .num_device_descs = 1,
+               .devices = {
+                       {   "DiBcom STK807xPVR reference design",
+                               { &dib0700_usb_id_table[61], NULL },
+                               { NULL },
+                       },
+               },
+
+               .rc_interval      = DEFAULT_RC_INTERVAL,
+               .rc_key_map       = dib0700_rc_keys,
+               .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+               .rc_query         = dib0700_rc_query
        },
 };
 
index 185a506..a548c14 100644 (file)
@@ -46,6 +46,7 @@
 #define USB_VID_MSI_2                          0x1462
 #define USB_VID_OPERA1                         0x695c
 #define USB_VID_PINNACLE                       0x2304
+#define USB_VID_PIXELVIEW                      0x1554
 #define USB_VID_TECHNOTREND                    0x0b48
 #define USB_VID_TERRATEC                       0x0ccd
 #define USB_VID_TELESTAR                       0x10b9
@@ -59,6 +60,7 @@
 #define USB_VID_YUAN                           0x1164
 #define USB_VID_XTENSIONS                      0x1ae7
 #define USB_VID_HUMAX_COEX                     0x10b9
+#define USB_VID_774                            0x7a69
 
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                      0xa333
 #define USB_PID_DIBCOM_STK7700_U7000                   0x7001
 #define USB_PID_DIBCOM_STK7070P                                0x1ebc
 #define USB_PID_DIBCOM_STK7070PD                       0x1ebe
+#define USB_PID_DIBCOM_STK807XP                                0x1f90
+#define USB_PID_DIBCOM_STK807XPVR                      0x1f98
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD                        0x2131
+#define USB_PID_DIBCOM_STK7770P                                0x1e80
 #define USB_PID_DPOSH_M9206_COLD                       0x9206
 #define USB_PID_DPOSH_M9206_WARM                       0xa090
 #define USB_PID_UNIWILL_STK7700P                       0x6003
 #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS            0x0060
 #define USB_PID_TERRATEC_CINERGY_T_EXPRESS             0x0062
 #define USB_PID_TERRATEC_CINERGY_T_XXS                 0x0078
+#define USB_PID_TERRATEC_CINERGY_T_XXS_2               0x00ab
 #define USB_PID_TERRATEC_T3                            0x10a0
 #define USB_PID_TERRATEC_T5                            0x10a1
 #define USB_PID_PINNACLE_EXPRESSCARD_320CX             0x022e
 #define USB_PID_PINNACLE_PCTV73E                       0x0237
 #define USB_PID_PINNACLE_PCTV801E                      0x023a
 #define USB_PID_PINNACLE_PCTV801E_SE                   0x023b
+#define USB_PID_PINNACLE_PCTV73A                       0x0243
+#define USB_PID_PINNACLE_PCTV73ESE                     0x0245
+#define USB_PID_PINNACLE_PCTV282E                      0x0248
+#define USB_PID_PIXELVIEW_SBTVD                                0x5010
 #define USB_PID_PCTV_200E                              0x020e
 #define USB_PID_PCTV_400E                              0x020f
 #define USB_PID_PCTV_450E                              0x0222
 #define USB_PID_ELGATO_EYETV_DTT_Dlx                   0x0020
 #define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD                0x5000
 #define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM                0x5001
+#define USB_PID_FRIIO_WHITE                            0x0001
 
 #endif
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c
new file mode 100644 (file)
index 0000000..c4dfe25
--- /dev/null
@@ -0,0 +1,483 @@
+/* DVB USB compliant Linux driver for the Friio USB2.0 ISDB-T receiver.
+ *
+ * Copyright (C) 2009 Akihiro Tsukada <tskd2@yahoo.co.jp>
+ *
+ * This module is based off the the gl861 and vp702x modules.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
+#include "friio.h"
+
+struct jdvbt90502_state {
+       struct i2c_adapter *i2c;
+       struct dvb_frontend frontend;
+       struct jdvbt90502_config config;
+};
+
+/* NOTE: TC90502 has 16bit register-address? */
+/* register 0x0100 is used for reading PLL status, so reg is u16 here */
+static int jdvbt90502_reg_read(struct jdvbt90502_state *state,
+                              const u16 reg, u8 *buf, const size_t count)
+{
+       int ret;
+       u8 wbuf[3];
+       struct i2c_msg msg[2];
+
+       wbuf[0] = reg & 0xFF;
+       wbuf[1] = 0;
+       wbuf[2] = reg >> 8;
+
+       msg[0].addr = state->config.demod_address;
+       msg[0].flags = 0;
+       msg[0].buf = wbuf;
+       msg[0].len = sizeof(wbuf);
+
+       msg[1].addr = msg[0].addr;
+       msg[1].flags = I2C_M_RD;
+       msg[1].buf = buf;
+       msg[1].len = count;
+
+       ret = i2c_transfer(state->i2c, msg, 2);
+       if (ret != 2) {
+               deb_fe(" reg read failed.\n");
+               return -EREMOTEIO;
+       }
+       return 0;
+}
+
+/* currently 16bit register-address is not used, so reg is u8 here */
+static int jdvbt90502_single_reg_write(struct jdvbt90502_state *state,
+                                      const u8 reg, const u8 val)
+{
+       struct i2c_msg msg;
+       u8 wbuf[2];
+
+       wbuf[0] = reg;
+       wbuf[1] = val;
+
+       msg.addr = state->config.demod_address;
+       msg.flags = 0;
+       msg.buf = wbuf;
+       msg.len = sizeof(wbuf);
+
+       if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+               deb_fe(" reg write failed.");
+               return -EREMOTEIO;
+       }
+       return 0;
+}
+
+static int _jdvbt90502_write(struct dvb_frontend *fe, u8 *buf, int len)
+{
+       struct jdvbt90502_state *state = fe->demodulator_priv;
+       int err, i;
+       for (i = 0; i < len - 1; i++) {
+               err = jdvbt90502_single_reg_write(state,
+                                                 buf[0] + i, buf[i + 1]);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
+/* read pll status byte via the demodulator's I2C register */
+/* note: Win box reads it by 8B block at the I2C addr 0x30 from reg:0x80 */
+static int jdvbt90502_pll_read(struct jdvbt90502_state *state, u8 *result)
+{
+       int ret;
+
+       /* +1 for reading */
+       u8 pll_addr_byte = (state->config.pll_address << 1) + 1;
+
+       *result = 0;
+
+       ret = jdvbt90502_single_reg_write(state, JDVBT90502_2ND_I2C_REG,
+                                         pll_addr_byte);
+       if (ret)
+               goto error;
+
+       ret = jdvbt90502_reg_read(state, 0x0100, result, 1);
+       if (ret)
+               goto error;
+
+       deb_fe("PLL read val:%02x\n", *result);
+       return 0;
+
+error:
+       deb_fe("%s:ret == %d\n", __func__, ret);
+       return -EREMOTEIO;
+}
+
+
+/* set pll frequency via the demodulator's I2C register */
+static int jdvbt90502_pll_set_freq(struct jdvbt90502_state *state, u32 freq)
+{
+       int ret;
+       int retry;
+       u8 res1;
+       u8 res2[9];
+
+       u8 pll_freq_cmd[PLL_CMD_LEN];
+       u8 pll_agc_cmd[PLL_CMD_LEN];
+       struct i2c_msg msg[2];
+       u32 f;
+
+       deb_fe("%s: freq=%d, step=%d\n", __func__, freq,
+              state->frontend.ops.info.frequency_stepsize);
+       /* freq -> oscilator frequency conversion. */
+       /* freq: 473,000,000 + n*6,000,000 (no 1/7MHz shift to center freq) */
+       /* add 400[1/7 MHZ] = 57.142857MHz.   57MHz for the IF,  */
+       /*                                   1/7MHz for center freq shift */
+       f = freq / state->frontend.ops.info.frequency_stepsize;
+       f += 400;
+       pll_freq_cmd[DEMOD_REDIRECT_REG] = JDVBT90502_2ND_I2C_REG; /* 0xFE */
+       pll_freq_cmd[ADDRESS_BYTE] = state->config.pll_address << 1;
+       pll_freq_cmd[DIVIDER_BYTE1] = (f >> 8) & 0x7F;
+       pll_freq_cmd[DIVIDER_BYTE2] = f & 0xFF;
+       pll_freq_cmd[CONTROL_BYTE] = 0xB2; /* ref.divider:28, 4MHz/28=1/7MHz */
+       pll_freq_cmd[BANDSWITCH_BYTE] = 0x08;   /* UHF band */
+
+       msg[0].addr = state->config.demod_address;
+       msg[0].flags = 0;
+       msg[0].buf = pll_freq_cmd;
+       msg[0].len = sizeof(pll_freq_cmd);
+
+       ret = i2c_transfer(state->i2c, &msg[0], 1);
+       if (ret != 1)
+               goto error;
+
+       udelay(50);
+
+       pll_agc_cmd[DEMOD_REDIRECT_REG] = pll_freq_cmd[DEMOD_REDIRECT_REG];
+       pll_agc_cmd[ADDRESS_BYTE] = pll_freq_cmd[ADDRESS_BYTE];
+       pll_agc_cmd[DIVIDER_BYTE1] = pll_freq_cmd[DIVIDER_BYTE1];
+       pll_agc_cmd[DIVIDER_BYTE2] = pll_freq_cmd[DIVIDER_BYTE2];
+       pll_agc_cmd[CONTROL_BYTE] = 0x9A; /*  AGC_CTRL instead of BANDSWITCH */
+       pll_agc_cmd[AGC_CTRL_BYTE] = 0x50;
+       /* AGC Time Constant 2s, AGC take-over point:103dBuV(lowest) */
+
+       msg[1].addr = msg[0].addr;
+       msg[1].flags = 0;
+       msg[1].buf = pll_agc_cmd;
+       msg[1].len = sizeof(pll_agc_cmd);
+
+       ret = i2c_transfer(state->i2c, &msg[1], 1);
+       if (ret != 1)
+               goto error;
+
+       /* I don't know what these cmds are for,  */
+       /* but the USB log on a windows box contains them */
+       ret = jdvbt90502_single_reg_write(state, 0x01, 0x40);
+       ret |= jdvbt90502_single_reg_write(state, 0x01, 0x00);
+       if (ret)
+               goto error;
+       udelay(100);
+
+       /* wait for the demod to be ready? */
+#define RETRY_COUNT 5
+       for (retry = 0; retry < RETRY_COUNT; retry++) {
+               ret = jdvbt90502_reg_read(state, 0x0096, &res1, 1);
+               if (ret)
+                       goto error;
+               /* if (res1 != 0x00) goto error; */
+               ret = jdvbt90502_reg_read(state, 0x00B0, res2, sizeof(res2));
+               if (ret)
+                       goto error;
+               if (res2[0] >= 0xA7)
+                       break;
+               msleep(100);
+       }
+       if (retry >= RETRY_COUNT) {
+               deb_fe("%s: FE does not get ready after freq setting.\n",
+                      __func__);
+               return -EREMOTEIO;
+       }
+
+       return 0;
+error:
+       deb_fe("%s:ret == %d\n", __func__, ret);
+       return -EREMOTEIO;
+}
+
+static int jdvbt90502_read_status(struct dvb_frontend *fe, fe_status_t *state)
+{
+       u8 result;
+       int ret;
+
+       *state = FE_HAS_SIGNAL;
+
+       ret = jdvbt90502_pll_read(fe->demodulator_priv, &result);
+       if (ret) {
+               deb_fe("%s:ret == %d\n", __func__, ret);
+               return -EREMOTEIO;
+       }
+
+       *state = FE_HAS_SIGNAL
+               | FE_HAS_CARRIER
+               | FE_HAS_VITERBI
+               | FE_HAS_SYNC;
+
+       if (result & PLL_STATUS_LOCKED)
+               *state |= FE_HAS_LOCK;
+
+       return 0;
+}
+
+static int jdvbt90502_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+       *ber = 0;
+       return 0;
+}
+
+static int jdvbt90502_read_signal_strength(struct dvb_frontend *fe,
+                                          u16 *strength)
+{
+       int ret;
+       u8 rbuf[37];
+
+       *strength = 0;
+
+       /* status register (incl. signal strength) : 0x89  */
+       /* TODO: read just the necessary registers [0x8B..0x8D]? */
+       ret = jdvbt90502_reg_read(fe->demodulator_priv, 0x0089,
+                                 rbuf, sizeof(rbuf));
+
+       if (ret) {
+               deb_fe("%s:ret == %d\n", __func__, ret);
+               return -EREMOTEIO;
+       }
+
+       /* signal_strength: rbuf[2-4] (24bit BE), use lower 16bit for now. */
+       *strength = (rbuf[3] << 8) + rbuf[4];
+       if (rbuf[2])
+               *strength = 0xffff;
+
+       return 0;
+}
+
+static int jdvbt90502_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+       *snr = 0x0101;
+       return 0;
+}
+
+static int jdvbt90502_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+       *ucblocks = 0;
+       return 0;
+}
+
+static int jdvbt90502_get_tune_settings(struct dvb_frontend *fe,
+                                       struct dvb_frontend_tune_settings *fs)
+{
+       fs->min_delay_ms = 500;
+       fs->step_size = 0;
+       fs->max_drift = 0;
+
+       return 0;
+}
+
+static int jdvbt90502_get_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *p)
+{
+       p->inversion = INVERSION_AUTO;
+       p->u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+       p->u.ofdm.code_rate_HP = FEC_AUTO;
+       p->u.ofdm.code_rate_LP = FEC_AUTO;
+       p->u.ofdm.constellation = QAM_64;
+       p->u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
+       p->u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
+       p->u.ofdm.hierarchy_information = HIERARCHY_AUTO;
+       return 0;
+}
+
+static int jdvbt90502_set_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *p)
+{
+       /**
+        * NOTE: ignore all the paramters except frequency.
+        *       others should be fixed to the proper value for ISDB-T,
+        *       but don't check here.
+        */
+
+       struct jdvbt90502_state *state = fe->demodulator_priv;
+       int ret;
+
+       deb_fe("%s: Freq:%d\n", __func__, p->frequency);
+
+       ret = jdvbt90502_pll_set_freq(state, p->frequency);
+       if (ret) {
+               deb_fe("%s:ret == %d\n", __func__, ret);
+               return -EREMOTEIO;
+       }
+
+       return 0;
+}
+
+static int jdvbt90502_sleep(struct dvb_frontend *fe)
+{
+       deb_fe("%s called.\n", __func__);
+       return 0;
+}
+
+
+/**
+ * (reg, val) commad list to initialize this module.
+ *  captured on a Windows box.
+ */
+static u8 init_code[][2] = {
+       {0x01, 0x40},
+       {0x04, 0x38},
+       {0x05, 0x40},
+       {0x07, 0x40},
+       {0x0F, 0x4F},
+       {0x11, 0x21},
+       {0x12, 0x0B},
+       {0x13, 0x2F},
+       {0x14, 0x31},
+       {0x16, 0x02},
+       {0x21, 0xC4},
+       {0x22, 0x20},
+       {0x2C, 0x79},
+       {0x2D, 0x34},
+       {0x2F, 0x00},
+       {0x30, 0x28},
+       {0x31, 0x31},
+       {0x32, 0xDF},
+       {0x38, 0x01},
+       {0x39, 0x78},
+       {0x3B, 0x33},
+       {0x3C, 0x33},
+       {0x48, 0x90},
+       {0x51, 0x68},
+       {0x5E, 0x38},
+       {0x71, 0x00},
+       {0x72, 0x08},
+       {0x77, 0x00},
+       {0xC0, 0x21},
+       {0xC1, 0x10},
+       {0xE4, 0x1A},
+       {0xEA, 0x1F},
+       {0x77, 0x00},
+       {0x71, 0x00},
+       {0x71, 0x00},
+       {0x76, 0x0C},
+};
+
+const static int init_code_len = sizeof(init_code) / sizeof(u8[2]);
+
+static int jdvbt90502_init(struct dvb_frontend *fe)
+{
+       int i = -1;
+       int ret;
+       struct i2c_msg msg;
+
+       struct jdvbt90502_state *state = fe->demodulator_priv;
+
+       deb_fe("%s called.\n", __func__);
+
+       msg.addr = state->config.demod_address;
+       msg.flags = 0;
+       msg.len = 2;
+       for (i = 0; i < init_code_len; i++) {
+               msg.buf = init_code[i];
+               ret = i2c_transfer(state->i2c, &msg, 1);
+               if (ret != 1)
+                       goto error;
+       }
+       msleep(100);
+
+       return 0;
+
+error:
+       deb_fe("%s: init_code[%d] failed. ret==%d\n", __func__, i, ret);
+       return -EREMOTEIO;
+}
+
+
+static void jdvbt90502_release(struct dvb_frontend *fe)
+{
+       struct jdvbt90502_state *state = fe->demodulator_priv;
+       kfree(state);
+}
+
+
+static struct dvb_frontend_ops jdvbt90502_ops;
+
+struct dvb_frontend *jdvbt90502_attach(struct dvb_usb_device *d)
+{
+       struct jdvbt90502_state *state = NULL;
+
+       deb_info("%s called.\n", __func__);
+
+       /* allocate memory for the internal state */
+       state = kzalloc(sizeof(struct jdvbt90502_state), GFP_KERNEL);
+       if (state == NULL)
+               goto error;
+
+       /* setup the state */
+       state->i2c = &d->i2c_adap;
+       memcpy(&state->config, &friio_fe_config, sizeof(friio_fe_config));
+
+       /* create dvb_frontend */
+       memcpy(&state->frontend.ops, &jdvbt90502_ops,
+              sizeof(jdvbt90502_ops));
+       state->frontend.demodulator_priv = state;
+
+       if (jdvbt90502_init(&state->frontend) < 0)
+               goto error;
+
+       return &state->frontend;
+
+error:
+       kfree(state);
+       return NULL;
+}
+
+static struct dvb_frontend_ops jdvbt90502_ops = {
+
+       .info = {
+               .name                   = "Comtech JDVBT90502 ISDB-T",
+               .type                   = FE_OFDM,
+               .frequency_min          = 473000000, /* UHF 13ch, center */
+               .frequency_max          = 767142857, /* UHF 62ch, center */
+               .frequency_stepsize     = JDVBT90502_PLL_CLK /
+                                                       JDVBT90502_PLL_DIVIDER,
+               .frequency_tolerance    = 0,
+
+               /* NOTE: this driver ignores all parameters but frequency. */
+               .caps = FE_CAN_INVERSION_AUTO |
+                       FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                       FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                       FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+                       FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                       FE_CAN_TRANSMISSION_MODE_AUTO |
+                       FE_CAN_GUARD_INTERVAL_AUTO |
+                       FE_CAN_HIERARCHY_AUTO,
+       },
+
+       .release = jdvbt90502_release,
+
+       .init = jdvbt90502_init,
+       .sleep = jdvbt90502_sleep,
+       .write = _jdvbt90502_write,
+
+       .set_frontend = jdvbt90502_set_frontend,
+       .get_frontend = jdvbt90502_get_frontend,
+       .get_tune_settings = jdvbt90502_get_tune_settings,
+
+       .read_status = jdvbt90502_read_status,
+       .read_ber = jdvbt90502_read_ber,
+       .read_signal_strength = jdvbt90502_read_signal_strength,
+       .read_snr = jdvbt90502_read_snr,
+       .read_ucblocks = jdvbt90502_read_ucblocks,
+};
diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/dvb/dvb-usb/friio.c
new file mode 100644 (file)
index 0000000..14a65b4
--- /dev/null
@@ -0,0 +1,525 @@
+/* DVB USB compliant Linux driver for the Friio USB2.0 ISDB-T receiver.
+ *
+ * Copyright (C) 2009 Akihiro Tsukada <tskd2@yahoo.co.jp>
+ *
+ * This module is based off the the gl861 and vp702x modules.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "friio.h"
+
+/* debug */
+int dvb_usb_friio_debug;
+module_param_named(debug, dvb_usb_friio_debug, int, 0644);
+MODULE_PARM_DESC(debug,
+                "set debugging level (1=info,2=xfer,4=rc,8=fe (or-able))."
+                DVB_USB_DEBUG_STATUS);
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+/**
+ * Indirect I2C access to the PLL via FE.
+ * whole I2C protocol data to the PLL is sent via the FE's I2C register.
+ * This is done by a control msg to the FE with the I2C data accompanied, and
+ * a specific USB request number is assigned for that purpose.
+ *
+ * this func sends wbuf[1..] to the I2C register wbuf[0] at addr (= at FE).
+ * TODO: refoctored, smarter i2c functions.
+ */
+static int gl861_i2c_ctrlmsg_data(struct dvb_usb_device *d, u8 addr,
+                                 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+       u16 index = wbuf[0];    /* must be JDVBT90502_2ND_I2C_REG(=0xFE) */
+       u16 value = addr << (8 + 1);
+       int wo = (rbuf == NULL || rlen == 0);   /* write only */
+       u8 req, type;
+
+       deb_xfer("write to PLL:0x%02x via FE reg:0x%02x, len:%d\n",
+                wbuf[1], wbuf[0], wlen - 1);
+
+       if (wo && wlen >= 2) {
+               req = GL861_REQ_I2C_DATA_CTRL_WRITE;
+               type = GL861_WRITE;
+               udelay(20);
+               return usb_control_msg(d->udev, usb_sndctrlpipe(d->udev, 0),
+                                      req, type, value, index,
+                                      &wbuf[1], wlen - 1, 2000);
+       }
+
+       deb_xfer("not supported ctrl-msg, aborting.");
+       return -EINVAL;
+}
+
+/* normal I2C access (without extra data arguments).
+ * write to the register wbuf[0] at I2C address addr with the value wbuf[1],
+ *  or read from the register wbuf[0].
+ * register address can be 16bit (wbuf[2]<<8 | wbuf[0]) if wlen==3
+ */
+static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                        u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+       u16 index;
+       u16 value = addr << (8 + 1);
+       int wo = (rbuf == NULL || rlen == 0);   /* write-only */
+       u8 req, type;
+       unsigned int pipe;
+
+       /* special case for the indirect I2C access to the PLL via FE, */
+       if (addr == friio_fe_config.demod_address &&
+           wbuf[0] == JDVBT90502_2ND_I2C_REG)
+               return gl861_i2c_ctrlmsg_data(d, addr, wbuf, wlen, rbuf, rlen);
+
+       if (wo) {
+               req = GL861_REQ_I2C_WRITE;
+               type = GL861_WRITE;
+               pipe = usb_sndctrlpipe(d->udev, 0);
+       } else {                /* rw */
+               req = GL861_REQ_I2C_READ;
+               type = GL861_READ;
+               pipe = usb_rcvctrlpipe(d->udev, 0);
+       }
+
+       switch (wlen) {
+       case 1:
+               index = wbuf[0];
+               break;
+       case 2:
+               index = wbuf[0];
+               value = value + wbuf[1];
+               break;
+       case 3:
+               /* special case for 16bit register-address */
+               index = (wbuf[2] << 8) | wbuf[0];
+               value = value + wbuf[1];
+               break;
+       default:
+               deb_xfer("wlen = %x, aborting.", wlen);
+               return -EINVAL;
+       }
+       msleep(1);
+       return usb_control_msg(d->udev, pipe, req, type,
+                              value, index, rbuf, rlen, 2000);
+}
+
+/* I2C */
+static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                         int num)
+{
+       struct dvb_usb_device *d = i2c_get_adapdata(adap);
+       int i;
+
+
+       if (num > 2)
+               return -EINVAL;
+
+       if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+               return -EAGAIN;
+
+       for (i = 0; i < num; i++) {
+               /* write/read request */
+               if (i + 1 < num && (msg[i + 1].flags & I2C_M_RD)) {
+                       if (gl861_i2c_msg(d, msg[i].addr,
+                                         msg[i].buf, msg[i].len,
+                                         msg[i + 1].buf, msg[i + 1].len) < 0)
+                               break;
+                       i++;
+               } else
+                       if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                         msg[i].len, NULL, 0) < 0)
+                               break;
+       }
+
+       mutex_unlock(&d->i2c_mutex);
+       return i;
+}
+
+static u32 gl861_i2c_func(struct i2c_adapter *adapter)
+{
+       return I2C_FUNC_I2C;
+}
+
+
+static int friio_ext_ctl(struct dvb_usb_adapter *adap,
+                        u32 sat_color, int lnb_on)
+{
+       int i;
+       int ret;
+       struct i2c_msg msg;
+       u8 buf[2];
+       u32 mask;
+       u8 lnb = (lnb_on) ? FRIIO_CTL_LNB : 0;
+
+       msg.addr = 0x00;
+       msg.flags = 0;
+       msg.len = 2;
+       msg.buf = buf;
+
+       buf[0] = 0x00;
+
+       /* send 2bit header (&B10) */
+       buf[1] = lnb | FRIIO_CTL_LED | FRIIO_CTL_STROBE;
+       ret = gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+       buf[1] |= FRIIO_CTL_CLK;
+       ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+
+       buf[1] = lnb | FRIIO_CTL_STROBE;
+       ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+       buf[1] |= FRIIO_CTL_CLK;
+       ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+
+       /* send 32bit(satur, R, G, B) data in serial */
+       mask = 1 << 31;
+       for (i = 0; i < 32; i++) {
+               buf[1] = lnb | FRIIO_CTL_STROBE;
+               if (sat_color & mask)
+                       buf[1] |= FRIIO_CTL_LED;
+               ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+               buf[1] |= FRIIO_CTL_CLK;
+               ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+               mask >>= 1;
+       }
+
+       /* set the strobe off */
+       buf[1] = lnb;
+       ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+       buf[1] |= FRIIO_CTL_CLK;
+       ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
+
+       return (ret == 70);
+}
+
+
+static int friio_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
+
+/* TODO: move these init cmds to the FE's init routine? */
+static u8 streaming_init_cmds[][2] = {
+       {0x33, 0x08},
+       {0x37, 0x40},
+       {0x3A, 0x1F},
+       {0x3B, 0xFF},
+       {0x3C, 0x1F},
+       {0x3D, 0xFF},
+       {0x38, 0x00},
+       {0x35, 0x00},
+       {0x39, 0x00},
+       {0x36, 0x00},
+};
+static int cmdlen = sizeof(streaming_init_cmds) / 2;
+
+/*
+ * Command sequence in this init function is a replay
+ *  of the captured USB commands from the Windows proprietary driver.
+ */
+static int friio_initialize(struct dvb_usb_device *d)
+{
+       int ret;
+       int i;
+       int retry = 0;
+       u8 rbuf[2];
+       u8 wbuf[3];
+
+       deb_info("%s called.\n", __func__);
+
+       /* use gl861_i2c_msg instead of gl861_i2c_xfer(), */
+       /* because the i2c device is not set up yet. */
+       wbuf[0] = 0x11;
+       wbuf[1] = 0x02;
+       ret = gl861_i2c_msg(d, 0x00, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+       msleep(2);
+
+       wbuf[0] = 0x11;
+       wbuf[1] = 0x00;
+       ret = gl861_i2c_msg(d, 0x00, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+       msleep(1);
+
+       /* following msgs should be in the FE's init code? */
+       /* cmd sequence to identify the device type? (friio black/white) */
+       wbuf[0] = 0x03;
+       wbuf[1] = 0x80;
+       /* can't use gl861_i2c_cmd, as the register-addr is 16bit(0x0100) */
+       ret = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev, 0),
+                             GL861_REQ_I2C_DATA_CTRL_WRITE, GL861_WRITE,
+                             0x1200, 0x0100, wbuf, 2, 2000);
+       if (ret < 0)
+               goto error;
+
+       msleep(2);
+       wbuf[0] = 0x00;
+       wbuf[2] = 0x01;         /* reg.0x0100 */
+       wbuf[1] = 0x00;
+       ret = gl861_i2c_msg(d, 0x12 >> 1, wbuf, 3, rbuf, 2);
+       /* my Friio White returns 0xffff. */
+       if (ret < 0 || rbuf[0] != 0xff || rbuf[1] != 0xff)
+               goto error;
+
+       msleep(2);
+       wbuf[0] = 0x03;
+       wbuf[1] = 0x80;
+       ret = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev, 0),
+                             GL861_REQ_I2C_DATA_CTRL_WRITE, GL861_WRITE,
+                             0x9000, 0x0100, wbuf, 2, 2000);
+       if (ret < 0)
+               goto error;
+
+       msleep(2);
+       wbuf[0] = 0x00;
+       wbuf[2] = 0x01;         /* reg.0x0100 */
+       wbuf[1] = 0x00;
+       ret = gl861_i2c_msg(d, 0x90 >> 1, wbuf, 3, rbuf, 2);
+       /* my Friio White returns 0xffff again. */
+       if (ret < 0 || rbuf[0] != 0xff || rbuf[1] != 0xff)
+               goto error;
+
+       msleep(1);
+
+restart:
+       /* ============ start DEMOD init cmds ================== */
+       /* read PLL status to clear the POR bit */
+       wbuf[0] = JDVBT90502_2ND_I2C_REG;
+       wbuf[1] = (FRIIO_PLL_ADDR << 1) + 1;    /* +1 for reading */
+       ret = gl861_i2c_msg(d, FRIIO_DEMOD_ADDR, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+
+       msleep(5);
+       /* note: DEMODULATOR has 16bit register-address. */
+       wbuf[0] = 0x00;
+       wbuf[2] = 0x01;         /* reg addr: 0x0100 */
+       wbuf[1] = 0x00;         /* val: not used */
+       ret = gl861_i2c_msg(d, FRIIO_DEMOD_ADDR, wbuf, 3, rbuf, 1);
+       if (ret < 0)
+               goto error;
+/*
+       msleep(1);
+       wbuf[0] = 0x80;
+       wbuf[1] = 0x00;
+       ret = gl861_i2c_msg(d, FRIIO_DEMOD_ADDR, wbuf, 2, rbuf, 1);
+       if (ret < 0)
+               goto error;
+ */
+       if (rbuf[0] & 0x80) {   /* still in PowerOnReset state? */
+               if (++retry > 3) {
+                       deb_info("failed to get the correct"
+                                " FE demod status:0x%02x\n", rbuf[0]);
+                       goto error;
+               }
+               msleep(100);
+               goto restart;
+       }
+
+       /* TODO: check return value in rbuf */
+       /* =========== end DEMOD init cmds ===================== */
+       msleep(1);
+
+       wbuf[0] = 0x30;
+       wbuf[1] = 0x04;
+       ret = gl861_i2c_msg(d, 0x00, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+
+       msleep(2);
+       /* following 2 cmds unnecessary? */
+       wbuf[0] = 0x00;
+       wbuf[1] = 0x01;
+       ret = gl861_i2c_msg(d, 0x00, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+
+       wbuf[0] = 0x06;
+       wbuf[1] = 0x0F;
+       ret = gl861_i2c_msg(d, 0x00, wbuf, 2, NULL, 0);
+       if (ret < 0)
+               goto error;
+
+       /* some streaming ctl cmds (maybe) */
+       msleep(10);
+       for (i = 0; i < cmdlen; i++) {
+               ret = gl861_i2c_msg(d, 0x00, streaming_init_cmds[i], 2,
+                                   NULL, 0);
+               if (ret < 0)
+                       goto error;
+               msleep(1);
+       }
+       msleep(20);
+
+       /* change the LED color etc. */
+       ret = friio_streaming_ctrl(&d->adapter[0], 0);
+       if (ret < 0)
+               goto error;
+
+       return 0;
+
+error:
+       deb_info("%s:ret == %d\n", __func__, ret);
+       return -EIO;
+}
+
+/* Callbacks for DVB USB */
+
+static int friio_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+       int ret;
+
+       deb_info("%s called.(%d)\n", __func__, onoff);
+
+       /* set the LED color and saturation (and LNB on) */
+       if (onoff)
+               ret = friio_ext_ctl(adap, 0x6400ff64, 1);
+       else
+               ret = friio_ext_ctl(adap, 0x96ff00ff, 1);
+
+       if (ret != 1) {
+               deb_info("%s failed to send cmdx. ret==%d\n", __func__, ret);
+               return -EREMOTEIO;
+       }
+       return 0;
+}
+
+static int friio_frontend_attach(struct dvb_usb_adapter *adap)
+{
+       if (friio_initialize(adap->dev) < 0)
+               return -EIO;
+
+       adap->fe = jdvbt90502_attach(adap->dev);
+       if (adap->fe == NULL)
+               return -EIO;
+
+       return 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties friio_properties;
+
+static int friio_probe(struct usb_interface *intf,
+                      const struct usb_device_id *id)
+{
+       struct dvb_usb_device *d;
+       struct usb_host_interface *alt;
+       int ret;
+
+       if (intf->num_altsetting < GL861_ALTSETTING_COUNT)
+               return -ENODEV;
+
+       alt = usb_altnum_to_altsetting(intf, FRIIO_BULK_ALTSETTING);
+       if (alt == NULL) {
+               deb_rc("not alt found!\n");
+               return -ENODEV;
+       }
+       ret = usb_set_interface(interface_to_usbdev(intf),
+                               alt->desc.bInterfaceNumber,
+                               alt->desc.bAlternateSetting);
+       if (ret != 0) {
+               deb_rc("failed to set alt-setting!\n");
+               return ret;
+       }
+
+       ret = dvb_usb_device_init(intf, &friio_properties,
+                                 THIS_MODULE, &d, adapter_nr);
+       if (ret == 0)
+               friio_streaming_ctrl(&d->adapter[0], 1);
+
+       return ret;
+}
+
+
+struct jdvbt90502_config friio_fe_config = {
+       .demod_address = FRIIO_DEMOD_ADDR,
+       .pll_address = FRIIO_PLL_ADDR,
+};
+
+static struct i2c_algorithm gl861_i2c_algo = {
+       .master_xfer   = gl861_i2c_xfer,
+       .functionality = gl861_i2c_func,
+};
+
+static struct usb_device_id friio_table[] = {
+       { USB_DEVICE(USB_VID_774, USB_PID_FRIIO_WHITE) },
+       { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, friio_table);
+
+
+static struct dvb_usb_device_properties friio_properties = {
+       .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+       .usb_ctrl = DEVICE_SPECIFIC,
+
+       .size_of_priv = 0,
+
+       .num_adapters = 1,
+       .adapter = {
+               /* caps:0 =>  no pid filter, 188B TS packet */
+               /* GL861 has a HW pid filter, but no info available. */
+               {
+                       .caps  = 0,
+
+                       .frontend_attach  = friio_frontend_attach,
+                       .streaming_ctrl = friio_streaming_ctrl,
+
+                       .stream = {
+                               .type = USB_BULK,
+                               /* count <= MAX_NO_URBS_FOR_DATA_STREAM(10) */
+                               .count = 8,
+                               .endpoint = 0x01,
+                               .u = {
+                                       /* GL861 has 6KB buf inside */
+                                       .bulk = {
+                                               .buffersize = 16384,
+                                       }
+                               }
+                       },
+               }
+       },
+       .i2c_algo = &gl861_i2c_algo,
+
+       .num_device_descs = 1,
+       .devices = {
+               {
+                       .name = "774 Friio ISDB-T USB2.0",
+                       .cold_ids = { NULL },
+                       .warm_ids = { &friio_table[0], NULL },
+               },
+       }
+};
+
+static struct usb_driver friio_driver = {
+       .name           = "dvb_usb_friio",
+       .probe          = friio_probe,
+       .disconnect     = dvb_usb_device_exit,
+       .id_table       = friio_table,
+};
+
+
+/* module stuff */
+static int __init friio_module_init(void)
+{
+       int ret;
+
+       ret = usb_register(&friio_driver);
+       if (ret)
+               err("usb_register failed. Error number %d", ret);
+
+       return ret;
+}
+
+
+static void __exit friio_module_exit(void)
+{
+       /* deregister this driver from the USB subsystem */
+       usb_deregister(&friio_driver);
+}
+
+module_init(friio_module_init);
+module_exit(friio_module_exit);
+
+MODULE_AUTHOR("Akihiro Tsukada <tskd2@yahoo.co.jp>");
+MODULE_DESCRIPTION("Driver for Friio ISDB-T USB2.0 Receiver");
+MODULE_VERSION("0.2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/friio.h b/drivers/media/dvb/dvb-usb/friio.h
new file mode 100644 (file)
index 0000000..af8d55e
--- /dev/null
@@ -0,0 +1,99 @@
+/* DVB USB compliant Linux driver for the Friio USB2.0 ISDB-T receiver.
+ *
+ * Copyright (C) 2009 Akihiro Tsukada <tskd2@yahoo.co.jp>
+ *
+ * This module is based off the the gl861 and vp702x modules.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#ifndef _DVB_USB_FRIIO_H_
+#define _DVB_USB_FRIIO_H_
+
+/**
+ *      Friio Components
+ *       USB hub:                                AU4254
+ *         USB controller(+ TS dmx & streaming): GL861
+ *         Frontend:                             comtech JDVBT-90502
+ *             (tuner PLL:                       tua6034, I2C addr:(0xC0 >> 1))
+ *             (OFDM demodulator:                TC90502, I2C addr:(0x30 >> 1))
+ *         LED x3 (+LNB) controll:               PIC 16F676
+ *         EEPROM:                               24C08
+ *
+ *        (USB smart card reader:                AU9522)
+ *
+ */
+
+#define DVB_USB_LOG_PREFIX "friio"
+#include "dvb-usb.h"
+
+extern int dvb_usb_friio_debug;
+#define deb_info(args...) dprintk(dvb_usb_friio_debug, 0x01, args)
+#define deb_xfer(args...) dprintk(dvb_usb_friio_debug, 0x02, args)
+#define deb_rc(args...)   dprintk(dvb_usb_friio_debug, 0x04, args)
+#define deb_fe(args...)   dprintk(dvb_usb_friio_debug, 0x08, args)
+
+/* Vendor requests */
+#define GL861_WRITE            0x40
+#define GL861_READ             0xc0
+
+/* command bytes */
+#define GL861_REQ_I2C_WRITE    0x01
+#define GL861_REQ_I2C_READ     0x02
+/* For control msg with data argument */
+/* Used for accessing the PLL on the secondary I2C bus of FE via GL861 */
+#define GL861_REQ_I2C_DATA_CTRL_WRITE  0x03
+
+#define GL861_ALTSETTING_COUNT 2
+#define FRIIO_BULK_ALTSETTING  0
+#define FRIIO_ISOC_ALTSETTING  1
+
+/* LED & LNB control via PIC. */
+/* basically, it's serial control with clock and strobe. */
+/* write the below 4bit control data to the reg 0x00 at the I2C addr 0x00 */
+/* when controlling the LEDs, 32bit(saturation, R, G, B) is sent on the bit3*/
+#define FRIIO_CTL_LNB (1 << 0)
+#define FRIIO_CTL_STROBE (1 << 1)
+#define FRIIO_CTL_CLK (1 << 2)
+#define FRIIO_CTL_LED (1 << 3)
+
+/* Front End related */
+
+#define FRIIO_DEMOD_ADDR  (0x30 >> 1)
+#define FRIIO_PLL_ADDR  (0xC0 >> 1)
+
+#define JDVBT90502_PLL_CLK     4000000
+#define JDVBT90502_PLL_DIVIDER 28
+
+#define JDVBT90502_2ND_I2C_REG 0xFE
+
+/* byte index for pll i2c command data structure*/
+/* see datasheet for tua6034 */
+#define DEMOD_REDIRECT_REG 0
+#define ADDRESS_BYTE       1
+#define DIVIDER_BYTE1      2
+#define DIVIDER_BYTE2      3
+#define CONTROL_BYTE       4
+#define BANDSWITCH_BYTE    5
+#define AGC_CTRL_BYTE      5
+#define PLL_CMD_LEN        6
+
+/* bit masks for PLL STATUS response */
+#define PLL_STATUS_POR_MODE   0x80 /* 1: Power on Reset (test) Mode */
+#define PLL_STATUS_LOCKED     0x40 /* 1: locked */
+#define PLL_STATUS_AGC_ACTIVE 0x08 /* 1:active */
+#define PLL_STATUS_TESTMODE   0x07 /* digital output level (5 level) */
+  /* 0.15Vcc step   0x00: < 0.15Vcc, ..., 0x04: >= 0.6Vcc (<= 1Vcc) */
+
+
+struct jdvbt90502_config {
+       u8 demod_address; /* i2c addr for demodulator IC */
+       u8 pll_address;   /* PLL addr on the secondary i2c*/
+};
+extern struct jdvbt90502_config friio_fe_config;
+
+extern struct dvb_frontend *jdvbt90502_attach(struct dvb_usb_device *d);
+#endif
index aec7a19..ef9b7be 100644 (file)
@@ -337,6 +337,8 @@ static int m920x_firmware_download(struct usb_device *udev, const struct firmwar
        int i, pass, ret = 0;
 
        buff = kmalloc(65536, GFP_KERNEL);
+       if (buff == NULL)
+               return -ENOMEM;
 
        if ((ret = m920x_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
                goto done;
index b794e86..d7c4837 100644 (file)
@@ -484,6 +484,14 @@ config DVB_S921
          AN ISDB-T DQPSK, QPSK, 16QAM and 64QAM 1seg tuner module.
          Say Y when you want to support this frontend.
 
+config DVB_DIB8000
+       tristate "DiBcom 8000MB/MC"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A driver for DiBcom's DiB8000 ISDB-T/ISDB-Tsb demodulator.
+         Say Y when you want to support this frontend.
+
 comment "Digital terrestrial only tuners/PLL"
        depends on DVB_CORE
 
index 3b49d37..3523767 100644 (file)
@@ -23,6 +23,7 @@ obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o
 obj-$(CONFIG_DVB_DIB3000MC) += dib3000mc.o dibx000_common.o
 obj-$(CONFIG_DVB_DIB7000M) += dib7000m.o dibx000_common.o
 obj-$(CONFIG_DVB_DIB7000P) += dib7000p.o dibx000_common.o
+obj-$(CONFIG_DVB_DIB8000) += dib8000.o dibx000_common.o
 obj-$(CONFIG_DVB_MT312) += mt312.o
 obj-$(CONFIG_DVB_VES1820) += ves1820.o
 obj-$(CONFIG_DVB_VES1X93) += ves1x93.o
index 9e9a755..74981ee 100644 (file)
@@ -792,6 +792,11 @@ static int au8522_probe(struct i2c_client *client,
        }
 
        demod_config = kzalloc(sizeof(struct au8522_config), GFP_KERNEL);
+       if (demod_config == NULL) {
+               if (instance == 1)
+                       kfree(state);
+               return -ENOMEM;
+       }
        demod_config->demod_address = 0x8e >> 1;
 
        state->config = demod_config;
index da92cbe..2be17b9 100644 (file)
@@ -1,12 +1,29 @@
 /*
  * Linux-DVB Driver for DiBcom's DiB0070 base-band RF Tuner.
  *
- * Copyright (C) 2005-7 DiBcom (http://www.dibcom.fr/)
+ * Copyright (C) 2005-9 DiBcom (http://www.dibcom.fr/)
  *
  * This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation, version 2.
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * This code is more or less generated from another driver, please
+ * excuse some codingstyle oddities.
+ *
  */
+
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 
@@ -19,27 +36,65 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
 
-#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB0070: "); printk(args); printk("\n"); } } while (0)
+#define dprintk(args...) do { \
+       if (debug) { \
+               printk(KERN_DEBUG "DiB0070: "); \
+               printk(args); \
+               printk("\n"); \
+       } \
+} while (0)
 
 #define DIB0070_P1D  0x00
 #define DIB0070_P1F  0x01
 #define DIB0070_P1G  0x03
 #define DIB0070S_P1A 0x02
 
+enum frontend_tune_state {
+       CT_TUNER_START = 10,
+       CT_TUNER_STEP_0,
+       CT_TUNER_STEP_1,
+       CT_TUNER_STEP_2,
+       CT_TUNER_STEP_3,
+       CT_TUNER_STEP_4,
+       CT_TUNER_STEP_5,
+       CT_TUNER_STEP_6,
+       CT_TUNER_STEP_7,
+       CT_TUNER_STOP,
+};
+
+#define FE_CALLBACK_TIME_NEVER 0xffffffff
+
 struct dib0070_state {
        struct i2c_adapter *i2c;
        struct dvb_frontend *fe;
        const struct dib0070_config *cfg;
        u16 wbd_ff_offset;
        u8 revision;
+
+       enum frontend_tune_state tune_state;
+       u32 current_rf;
+
+       /* for the captrim binary search */
+       s8 step;
+       u16 adc_diff;
+
+       s8 captrim;
+       s8 fcaptrim;
+       u16 lo4;
+
+       const struct dib0070_tuning *current_tune_table_index;
+       const struct dib0070_lna_match *lna_match;
+
+       u8 wbd_gain_current;
+       u16 wbd_offset_3_3[2];
 };
 
 static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
 {
        u8 b[2];
        struct i2c_msg msg[2] = {
-               { .addr = state->cfg->i2c_address, .flags = 0,        .buf = &reg, .len = 1 },
-               { .addr = state->cfg->i2c_address, .flags = I2C_M_RD, .buf = b,  .len = 2 },
+               {.addr = state->cfg->i2c_address,.flags = 0,.buf = &reg,.len = 1},
+               {.addr = state->cfg->i2c_address,.flags = I2C_M_RD,.buf = b,.len = 2},
        };
        if (i2c_transfer(state->i2c, msg, 2) != 2) {
                printk(KERN_WARNING "DiB0070 I2C read failed\n");
@@ -51,7 +106,7 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
 static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
 {
        u8 b[3] = { reg, val >> 8, val & 0xff };
-       struct i2c_msg msg = { .addr = state->cfg->i2c_address, .flags = 0, .buf = b, .len = 3 };
+       struct i2c_msg msg = {.addr = state->cfg->i2c_address,.flags = 0,.buf = b,.len = 3 };
        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
                printk(KERN_WARNING "DiB0070 I2C write failed\n");
                return -EREMOTEIO;
@@ -59,55 +114,71 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
        return 0;
 }
 
-#define HARD_RESET(state) do { if (state->cfg->reset) { state->cfg->reset(state->fe,1); msleep(10); state->cfg->reset(state->fe,0); msleep(10); } } while (0)
+#define HARD_RESET(state) do { \
+    state->cfg->sleep(state->fe, 0); \
+    if (state->cfg->reset) { \
+       state->cfg->reset(state->fe,1); msleep(10); \
+       state->cfg->reset(state->fe,0); msleep(10); \
+    } \
+} while (0)
 
 static int dib0070_set_bandwidth(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
 {
-       struct dib0070_state *st = fe->tuner_priv;
-       u16 tmp = 0;
-       tmp = dib0070_read_reg(st, 0x02) & 0x3fff;
+       struct dib0070_state *state = fe->tuner_priv;
+       u16 tmp = dib0070_read_reg(state, 0x02) & 0x3fff;
+
+       if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 7000)
+               tmp |= (0 << 14);
+       else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 6000)
+               tmp |= (1 << 14);
+       else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 5000)
+               tmp |= (2 << 14);
+       else
+               tmp |= (3 << 14);
 
-    switch(BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth)) {
-               case  8000:
-                       tmp |= (0 << 14);
-                       break;
-               case  7000:
-                       tmp |= (1 << 14);
-                       break;
-       case  6000:
-                       tmp |= (2 << 14);
-                       break;
-       case 5000:
-               default:
-                       tmp |= (3 << 14);
-                       break;
+       dib0070_write_reg(state, 0x02, tmp);
+
+       /* sharpen the BB filter in ISDB-T to have higher immunity to adjacent channels */
+       if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT) {
+               u16 value = dib0070_read_reg(state, 0x17);
+
+               dib0070_write_reg(state, 0x17, value & 0xfffc);
+               tmp = dib0070_read_reg(state, 0x01) & 0x01ff;
+               dib0070_write_reg(state, 0x01, tmp | (60 << 9));
+
+               dib0070_write_reg(state, 0x17, value);
        }
-       dib0070_write_reg(st, 0x02, tmp);
        return 0;
 }
 
-static void dib0070_captrim(struct dib0070_state *st, u16 LO4)
+static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state *tune_state)
 {
-       int8_t captrim, fcaptrim, step_sign, step;
-       u16 adc, adc_diff = 3000;
+       int8_t step_sign;
+       u16 adc;
+       int ret = 0;
 
+       if (*tune_state == CT_TUNER_STEP_0) {
 
+               dib0070_write_reg(state, 0x0f, 0xed10);
+               dib0070_write_reg(state, 0x17, 0x0034);
 
-       dib0070_write_reg(st, 0x0f, 0xed10);
-       dib0070_write_reg(st, 0x17,    0x0034);
+               dib0070_write_reg(state, 0x18, 0x0032);
+               state->step = state->captrim = state->fcaptrim = 64;
+               state->adc_diff = 3000;
+               ret = 20;
 
-       dib0070_write_reg(st, 0x18, 0x0032);
-       msleep(2);
+               *tune_state = CT_TUNER_STEP_1;
+       } else if (*tune_state == CT_TUNER_STEP_1) {
+               state->step /= 2;
+               dib0070_write_reg(state, 0x14, state->lo4 | state->captrim);
+               ret = 15;
 
-       step = captrim = fcaptrim = 64;
+               *tune_state = CT_TUNER_STEP_2;
+       } else if (*tune_state == CT_TUNER_STEP_2) {
 
-       do {
-               step /= 2;
-               dib0070_write_reg(st, 0x14, LO4 | captrim);
-               msleep(1);
-               adc = dib0070_read_reg(st, 0x19);
+               adc = dib0070_read_reg(state, 0x19);
 
-               dprintk( "CAPTRIM=%hd; ADC = %hd (ADC) & %dmV", captrim, adc, (u32) adc*(u32)1800/(u32)1024);
+               dprintk("CAPTRIM=%hd; ADC = %hd (ADC) & %dmV", state->captrim, adc, (u32) adc * (u32) 1800 / (u32) 1024);
 
                if (adc >= 400) {
                        adc -= 400;
@@ -117,379 +188,430 @@ static void dib0070_captrim(struct dib0070_state *st, u16 LO4)
                        step_sign = 1;
                }
 
-               if (adc < adc_diff) {
-                       dprintk( "CAPTRIM=%hd is closer to target (%hd/%hd)", captrim, adc, adc_diff);
-                       adc_diff = adc;
-                       fcaptrim = captrim;
+               if (adc < state->adc_diff) {
+                       dprintk("CAPTRIM=%hd is closer to target (%hd/%hd)", state->captrim, adc, state->adc_diff);
+                       state->adc_diff = adc;
+                       state->fcaptrim = state->captrim;
 
+               }
+               state->captrim += (step_sign * state->step);
 
+               if (state->step >= 1)
+                       *tune_state = CT_TUNER_STEP_1;
+               else
+                       *tune_state = CT_TUNER_STEP_3;
 
-               }
-               captrim += (step_sign * step);
-       } while (step >= 1);
+       } else if (*tune_state == CT_TUNER_STEP_3) {
+               dib0070_write_reg(state, 0x14, state->lo4 | state->fcaptrim);
+               dib0070_write_reg(state, 0x18, 0x07ff);
+               *tune_state = CT_TUNER_STEP_4;
+       }
 
-       dib0070_write_reg(st, 0x14, LO4 | fcaptrim);
-       dib0070_write_reg(st, 0x18, 0x07ff);
+       return ret;
 }
 
-#define LPF    100                       // define for the loop filter 100kHz by default 16-07-06
-#define LO4_SET_VCO_HFDIV(l, v, h)   l |= ((v) << 11) | ((h) << 7)
-#define LO4_SET_SD(l, s)             l |= ((s) << 14) | ((s) << 12)
-#define LO4_SET_CTRIM(l, c)          l |=  (c) << 10
-static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
+static int dib0070_set_ctrl_lo5(struct dvb_frontend *fe, u8 vco_bias_trim, u8 hf_div_trim, u8 cp_current, u8 third_order_filt)
 {
-       struct dib0070_state *st = fe->tuner_priv;
-       u32 freq = ch->frequency/1000 + (BAND_OF_FREQUENCY(ch->frequency/1000) == BAND_VHF ? st->cfg->freq_offset_khz_vhf : st->cfg->freq_offset_khz_uhf);
-
-       u8 band = BAND_OF_FREQUENCY(freq), c;
+       struct dib0070_state *state = fe->tuner_priv;
+       u16 lo5 = (third_order_filt << 14) | (0 << 13) | (1 << 12) | (3 << 9) | (cp_current << 6) | (hf_div_trim << 3) | (vco_bias_trim << 0);
+       dprintk("CTRL_LO5: 0x%x", lo5);
+       return dib0070_write_reg(state, 0x15, lo5);
+}
 
-       /*******************VCO***********************************/
-       u16 lo4 = 0;
+void dib0070_ctrl_agc_filter(struct dvb_frontend *fe, u8 open)
+{
+       struct dib0070_state *state = fe->tuner_priv;
 
-       u8 REFDIV, PRESC = 2;
-       u32 FBDiv, Rest, FREF, VCOF_kHz;
-       u16 Num, Den;
-       /*******************FrontEnd******************************/
-       u16 value = 0;
+       if (open) {
+               dib0070_write_reg(state, 0x1b, 0xff00);
+               dib0070_write_reg(state, 0x1a, 0x0000);
+       } else {
+               dib0070_write_reg(state, 0x1b, 0x4112);
+               if (state->cfg->vga_filter != 0) {
+                       dib0070_write_reg(state, 0x1a, state->cfg->vga_filter);
+                       dprintk("vga filter register is set to %x", state->cfg->vga_filter);
+               } else
+                       dib0070_write_reg(state, 0x1a, 0x0009);
+       }
+}
 
-       dprintk( "Tuning for Band: %hd (%d kHz)", band, freq);
+EXPORT_SYMBOL(dib0070_ctrl_agc_filter);
+struct dib0070_tuning {
+       u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
+       u8 switch_trim;
+       u8 vco_band;
+       u8 hfdiv;
+       u8 vco_multi;
+       u8 presc;
+       u8 wbdmux;
+       u16 tuner_enable;
+};
 
+struct dib0070_lna_match {
+       u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
+       u8 lna_band;
+};
 
-       dib0070_write_reg(st, 0x17, 0x30);
+static const struct dib0070_tuning dib0070s_tuning_table[] = {
+       {570000, 2, 1, 3, 6, 6, 2, 0x4000 | 0x0800},    /* UHF */
+       {700000, 2, 0, 2, 4, 2, 2, 0x4000 | 0x0800},
+       {863999, 2, 1, 2, 4, 2, 2, 0x4000 | 0x0800},
+       {1500000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},   /* LBAND */
+       {1600000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},
+       {2000000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},
+       {0xffffffff, 0, 0, 8, 1, 2, 1, 0x8000 | 0x1000},        /* SBAND */
+};
 
-       dib0070_set_bandwidth(fe, ch);  /* c is used as HF */
-       switch (st->revision) {
-               case DIB0070S_P1A:
-                       switch (band) {
-                               case BAND_LBAND:
-                                       LO4_SET_VCO_HFDIV(lo4, 1, 1);
-                                       c = 2;
-                                       break;
-                               case BAND_SBAND:
-                                       LO4_SET_VCO_HFDIV(lo4, 0, 0);
-                                       LO4_SET_CTRIM(lo4, 1);
-                                       c = 1;
-                                       break;
-                               case BAND_UHF:
-                               default:
-                                       if (freq < 570000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 3);
-                                               PRESC = 6; c = 6;
-                                       } else if (freq < 680000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 0, 2);
-                                               c = 4;
-                                       } else {
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 2);
-                                               c = 4;
-                                       }
-                                       break;
-                       } break;
-
-               case DIB0070_P1G:
-               case DIB0070_P1F:
-               default:
-                       switch (band) {
-                               case BAND_FM:
-                                               LO4_SET_VCO_HFDIV(lo4, 0, 7);
-                                               c = 24;
-                                       break;
-                               case BAND_LBAND:
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 0);
-                                               c = 2;
-                                       break;
-                               case BAND_VHF:
-                                       if (freq < 180000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 0, 3);
-                                               c = 16;
-                                       } else if (freq < 190000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 3);
-                                               c = 16;
-                                       } else {
-                                               LO4_SET_VCO_HFDIV(lo4, 0, 6);
-                                               c = 12;
-                                       }
-                                       break;
-
-                               case BAND_UHF:
-                               default:
-                                       if (freq < 570000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 5);
-                                               c = 6;
-                                       } else if (freq < 700000) {
-                                               LO4_SET_VCO_HFDIV(lo4, 0, 1);
-                                               c = 4;
-                                       } else {
-                                               LO4_SET_VCO_HFDIV(lo4, 1, 1);
-                                               c = 4;
-                                       }
-                                       break;
-                       }
-               break;
-       }
+static const struct dib0070_tuning dib0070_tuning_table[] = {
+       {115000, 1, 0, 7, 24, 2, 1, 0x8000 | 0x1000},   /* FM below 92MHz cannot be tuned */
+       {179500, 1, 0, 3, 16, 2, 1, 0x8000 | 0x1000},   /* VHF */
+       {189999, 1, 1, 3, 16, 2, 1, 0x8000 | 0x1000},
+       {250000, 1, 0, 6, 12, 2, 1, 0x8000 | 0x1000},
+       {569999, 2, 1, 5, 6, 2, 2, 0x4000 | 0x0800},    /* UHF */
+       {699999, 2, 0, 1, 4, 2, 2, 0x4000 | 0x0800},
+       {863999, 2, 1, 1, 4, 2, 2, 0x4000 | 0x0800},
+       {0xffffffff, 0, 1, 0, 2, 2, 4, 0x2000 | 0x0400},        /* LBAND or everything higher than UHF */
+};
 
-       dprintk( "HFDIV code: %hd", (lo4 >> 7) & 0xf);
-       dprintk( "VCO = %hd", (lo4 >> 11) & 0x3);
+static const struct dib0070_lna_match dib0070_lna_flip_chip[] = {
+       {180000, 0},            /* VHF */
+       {188000, 1},
+       {196400, 2},
+       {250000, 3},
+       {550000, 0},            /* UHF */
+       {590000, 1},
+       {666000, 3},
+       {864000, 5},
+       {1500000, 0},           /* LBAND or everything higher than UHF */
+       {1600000, 1},
+       {2000000, 3},
+       {0xffffffff, 7},
+};
 
+static const struct dib0070_lna_match dib0070_lna[] = {
+       {180000, 0},            /* VHF */
+       {188000, 1},
+       {196400, 2},
+       {250000, 3},
+       {550000, 2},            /* UHF */
+       {650000, 3},
+       {750000, 5},
+       {850000, 6},
+       {864000, 7},
+       {1500000, 0},           /* LBAND or everything higher than UHF */
+       {1600000, 1},
+       {2000000, 3},
+       {0xffffffff, 7},
+};
 
-       VCOF_kHz = (c * freq) * 2;
-       dprintk( "VCOF in kHz: %d ((%hd*%d) << 1))",VCOF_kHz, c, freq);
+#define LPF    100             // define for the loop filter 100kHz by default 16-07-06
+static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
+{
+       struct dib0070_state *state = fe->tuner_priv;
 
-       switch (band) {
-               case BAND_VHF:
-                       REFDIV = (u8) ((st->cfg->clock_khz + 9999) / 10000);
-                       break;
-               case BAND_FM:
-                       REFDIV = (u8) ((st->cfg->clock_khz) / 1000);
-                       break;
-               default:
-                       REFDIV = (u8) ( st->cfg->clock_khz  / 10000);
-                       break;
-       }
-       FREF = st->cfg->clock_khz / REFDIV;
+       const struct dib0070_tuning *tune;
+       const struct dib0070_lna_match *lna_match;
 
-       dprintk( "REFDIV: %hd, FREF: %d", REFDIV, FREF);
+       enum frontend_tune_state *tune_state = &state->tune_state;
+       int ret = 10;           /* 1ms is the default delay most of the time */
 
+       u8 band = (u8) BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency / 1000);
+       u32 freq = fe->dtv_property_cache.frequency / 1000 + (band == BAND_VHF ? state->cfg->freq_offset_khz_vhf : state->cfg->freq_offset_khz_uhf);
 
+#ifdef CONFIG_SYS_ISDBT
+       if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT && state->fe->dtv_property_cache.isdbt_sb_mode == 1)
+               if (((state->fe->dtv_property_cache.isdbt_sb_segment_count % 2)
+                    && (state->fe->dtv_property_cache.isdbt_sb_segment_idx == ((state->fe->dtv_property_cache.isdbt_sb_segment_count / 2) + 1)))
+                   || (((state->fe->dtv_property_cache.isdbt_sb_segment_count % 2) == 0)
+                       && (state->fe->dtv_property_cache.isdbt_sb_segment_idx == (state->fe->dtv_property_cache.isdbt_sb_segment_count / 2)))
+                   || (((state->fe->dtv_property_cache.isdbt_sb_segment_count % 2) == 0)
+                       && (state->fe->dtv_property_cache.isdbt_sb_segment_idx == ((state->fe->dtv_property_cache.isdbt_sb_segment_count / 2) + 1))))
+                       freq += 850;
+#endif
+       if (state->current_rf != freq) {
 
-       switch (st->revision) {
+               switch (state->revision) {
                case DIB0070S_P1A:
-                       FBDiv = (VCOF_kHz / PRESC / FREF);
-                       Rest  = (VCOF_kHz / PRESC) - FBDiv * FREF;
+                       tune = dib0070s_tuning_table;
+                       lna_match = dib0070_lna;
                        break;
-
-               case DIB0070_P1G:
-               case DIB0070_P1F:
                default:
-                       FBDiv = (freq / (FREF / 2));
-                       Rest  = 2 * freq - FBDiv * FREF;
+                       tune = dib0070_tuning_table;
+                       if (state->cfg->flip_chip)
+                               lna_match = dib0070_lna_flip_chip;
+                       else
+                               lna_match = dib0070_lna;
                        break;
-       }
-
-
-            if (Rest < LPF)              Rest = 0;
-       else if (Rest < 2 * LPF)          Rest = 2 * LPF;
-       else if (Rest > (FREF - LPF))   { Rest = 0 ; FBDiv += 1; }
-       else if (Rest > (FREF - 2 * LPF)) Rest = FREF - 2 * LPF;
-       Rest = (Rest * 6528) / (FREF / 10);
-       dprintk( "FBDIV: %d, Rest: %d", FBDiv, Rest);
-
-       Num = 0;
-       Den = 1;
+               }
+               while (freq > tune->max_freq)   /* find the right one */
+                       tune++;
+               while (freq > lna_match->max_freq)      /* find the right one */
+                       lna_match++;
 
-       if (Rest > 0) {
-               LO4_SET_SD(lo4, 1);
-               Den = 255;
-               Num = (u16)Rest;
+               state->current_tune_table_index = tune;
+               state->lna_match = lna_match;
        }
-       dprintk( "Num: %hd, Den: %hd, SD: %hd",Num, Den, (lo4 >> 12) & 0x1);
 
+       if (*tune_state == CT_TUNER_START) {
+               dprintk("Tuning for Band: %hd (%d kHz)", band, freq);
+               if (state->current_rf != freq) {
+                       u8 REFDIV;
+                       u32 FBDiv, Rest, FREF, VCOF_kHz;
+                       u8 Den;
 
+                       state->current_rf = freq;
+                       state->lo4 = (state->current_tune_table_index->vco_band << 11) | (state->current_tune_table_index->hfdiv << 7);
 
-       dib0070_write_reg(st, 0x11, (u16)FBDiv);
+                       dib0070_write_reg(state, 0x17, 0x30);
 
+                       VCOF_kHz = state->current_tune_table_index->vco_multi * freq * 2;
 
-       dib0070_write_reg(st, 0x12, (Den << 8) | REFDIV);
-
+                       switch (band) {
+                       case BAND_VHF:
+                               REFDIV = (u8) ((state->cfg->clock_khz + 9999) / 10000);
+                               break;
+                       case BAND_FM:
+                               REFDIV = (u8) ((state->cfg->clock_khz) / 1000);
+                               break;
+                       default:
+                               REFDIV = (u8) (state->cfg->clock_khz / 10000);
+                               break;
+                       }
+                       FREF = state->cfg->clock_khz / REFDIV;
+
+                       switch (state->revision) {
+                       case DIB0070S_P1A:
+                               FBDiv = (VCOF_kHz / state->current_tune_table_index->presc / FREF);
+                               Rest = (VCOF_kHz / state->current_tune_table_index->presc) - FBDiv * FREF;
+                               break;
+
+                       case DIB0070_P1G:
+                       case DIB0070_P1F:
+                       default:
+                               FBDiv = (freq / (FREF / 2));
+                               Rest = 2 * freq - FBDiv * FREF;
+                               break;
+                       }
 
-       dib0070_write_reg(st, 0x13, Num);
+                       if (Rest < LPF)
+                               Rest = 0;
+                       else if (Rest < 2 * LPF)
+                               Rest = 2 * LPF;
+                       else if (Rest > (FREF - LPF)) {
+                               Rest = 0;
+                               FBDiv += 1;
+                       } else if (Rest > (FREF - 2 * LPF))
+                               Rest = FREF - 2 * LPF;
+                       Rest = (Rest * 6528) / (FREF / 10);
+
+                       Den = 1;
+                       if (Rest > 0) {
+                               state->lo4 |= (1 << 14) | (1 << 12);
+                               Den = 255;
+                       }
 
+                       dib0070_write_reg(state, 0x11, (u16) FBDiv);
+                       dib0070_write_reg(state, 0x12, (Den << 8) | REFDIV);
+                       dib0070_write_reg(state, 0x13, (u16) Rest);
 
-       value = 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001;
+                       if (state->revision == DIB0070S_P1A) {
 
-       switch (band) {
-               case BAND_UHF:   value |= 0x4000 | 0x0800; break;
-               case BAND_LBAND: value |= 0x2000 | 0x0400; break;
-               default:         value |= 0x8000 | 0x1000; break;
-       }
-       dib0070_write_reg(st, 0x20, value);
+                               if (band == BAND_SBAND) {
+                                       dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
+                                       dib0070_write_reg(state, 0x1d, 0xFFFF);
+                               } else
+                                       dib0070_set_ctrl_lo5(fe, 5, 4, 3, 1);
+                       }
 
-       dib0070_captrim(st, lo4);
-       if (st->revision == DIB0070S_P1A) {
-               if (band == BAND_SBAND)
-                       dib0070_write_reg(st, 0x15, 0x16e2);
-               else
-                       dib0070_write_reg(st, 0x15, 0x56e5);
-       }
+                       dib0070_write_reg(state, 0x20,
+                                         0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001 | state->current_tune_table_index->tuner_enable);
 
+                       dprintk("REFDIV: %hd, FREF: %d", REFDIV, FREF);
+                       dprintk("FBDIV: %d, Rest: %d", FBDiv, Rest);
+                       dprintk("Num: %hd, Den: %hd, SD: %hd", (u16) Rest, Den, (state->lo4 >> 12) & 0x1);
+                       dprintk("HFDIV code: %hd", state->current_tune_table_index->hfdiv);
+                       dprintk("VCO = %hd", state->current_tune_table_index->vco_band);
+                       dprintk("VCOF: ((%hd*%d) << 1))", state->current_tune_table_index->vco_multi, freq);
 
+                       *tune_state = CT_TUNER_STEP_0;
+               } else {        /* we are already tuned to this frequency - the configuration is correct  */
+                       ret = 50;       /* wakeup time */
+                       *tune_state = CT_TUNER_STEP_5;
+               }
+       } else if ((*tune_state > CT_TUNER_START) && (*tune_state < CT_TUNER_STEP_4)) {
+
+               ret = dib0070_captrim(state, tune_state);
+
+       } else if (*tune_state == CT_TUNER_STEP_4) {
+               const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
+               if (tmp != NULL) {
+                       while (freq / 1000 > tmp->freq) /* find the right one */
+                               tmp++;
+                       dib0070_write_reg(state, 0x0f,
+                                         (0 << 15) | (1 << 14) | (3 << 12) | (tmp->wbd_gain_val << 9) | (0 << 8) | (1 << 7) | (state->
+                                                                                                                               current_tune_table_index->
+                                                                                                                               wbdmux << 0));
+                       state->wbd_gain_current = tmp->wbd_gain_val;
+               } else {
+                       dib0070_write_reg(state, 0x0f,
+                                         (0 << 15) | (1 << 14) | (3 << 12) | (6 << 9) | (0 << 8) | (1 << 7) | (state->current_tune_table_index->
+                                                                                                               wbdmux << 0));
+                       state->wbd_gain_current = 6;
+               }
 
-       switch (band) {
-               case BAND_UHF:   value = 0x7c82; break;
-               case BAND_LBAND: value = 0x7c84; break;
-               default:         value = 0x7c81; break;
-       }
-       dib0070_write_reg(st, 0x0f, value);
-       dib0070_write_reg(st, 0x06, 0x3fff);
-
-       /* Front End */
-       /* c == TUNE, value = SWITCH */
-       c = 0;
-       value = 0;
-       switch (band) {
-               case BAND_FM:
-                       c = 0; value = 1;
-               break;
-
-               case BAND_VHF:
-                       if (freq <= 180000) c = 0;
-                       else if (freq <= 188200) c = 1;
-                       else if (freq <= 196400) c = 2;
-                       else c = 3;
-                       value = 1;
-               break;
-
-               case BAND_LBAND:
-                       if (freq <= 1500000) c = 0;
-                       else if (freq <= 1600000) c = 1;
-                       else c = 3;
-               break;
-
-               case BAND_SBAND:
-                       c = 7;
-                       dib0070_write_reg(st, 0x1d,0xFFFF);
-               break;
-
-               case BAND_UHF:
-               default:
-                       if (st->cfg->flip_chip) {
-                               if (freq <= 550000) c = 0;
-                               else if (freq <= 590000) c = 1;
-                               else if (freq <= 666000) c = 3;
-                               else c = 5;
-                       } else {
-                               if (freq <= 550000) c = 2;
-                               else if (freq <= 650000) c = 3;
-                               else if (freq <= 750000) c = 5;
-                               else if (freq <= 850000) c = 6;
-                               else c = 7;
-                       }
-                       value = 2;
-               break;
+               dib0070_write_reg(state, 0x06, 0x3fff);
+               dib0070_write_reg(state, 0x07,
+                                 (state->current_tune_table_index->switch_trim << 11) | (7 << 8) | (state->lna_match->lna_band << 3) | (3 << 0));
+               dib0070_write_reg(state, 0x08, (state->lna_match->lna_band << 10) | (3 << 7) | (127));
+               dib0070_write_reg(state, 0x0d, 0x0d80);
+
+               dib0070_write_reg(state, 0x18, 0x07ff);
+               dib0070_write_reg(state, 0x17, 0x0033);
+
+               *tune_state = CT_TUNER_STEP_5;
+       } else if (*tune_state == CT_TUNER_STEP_5) {
+               dib0070_set_bandwidth(fe, ch);
+               *tune_state = CT_TUNER_STOP;
+       } else {
+               ret = FE_CALLBACK_TIME_NEVER;   /* tuner finished, time to call again infinite */
        }
+       return ret;
+}
 
-       /* default: LNA_MATCH=7, BIAS=3 */
-       dib0070_write_reg(st, 0x07, (value << 11) | (7 << 8) | (c << 3) | (3 << 0));
-       dib0070_write_reg(st, 0x08, (c << 10) | (3 << 7) | (127));
-       dib0070_write_reg(st, 0x0d, 0x0d80);
+static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+{
+       struct dib0070_state *state = fe->tuner_priv;
+       uint32_t ret;
 
+       state->tune_state = CT_TUNER_START;
 
-       dib0070_write_reg(st, 0x18,   0x07ff);
-       dib0070_write_reg(st, 0x17, 0x0033);
+       do {
+               ret = dib0070_tune_digital(fe, p);
+               if (ret != FE_CALLBACK_TIME_NEVER)
+                       msleep(ret / 10);
+               else
+                       break;
+       } while (state->tune_state != CT_TUNER_STOP);
 
        return 0;
 }
 
 static int dib0070_wakeup(struct dvb_frontend *fe)
 {
-       struct dib0070_state *st = fe->tuner_priv;
-       if (st->cfg->sleep)
-               st->cfg->sleep(fe, 0);
+       struct dib0070_state *state = fe->tuner_priv;
+       if (state->cfg->sleep)
+               state->cfg->sleep(fe, 0);
        return 0;
 }
 
 static int dib0070_sleep(struct dvb_frontend *fe)
 {
-       struct dib0070_state *st = fe->tuner_priv;
-       if (st->cfg->sleep)
-               st->cfg->sleep(fe, 1);
+       struct dib0070_state *state = fe->tuner_priv;
+       if (state->cfg->sleep)
+               state->cfg->sleep(fe, 1);
        return 0;
 }
 
-static u16 dib0070_p1f_defaults[] =
-
-{
+static const u16 dib0070_p1f_defaults[] = {
        7, 0x02,
-               0x0008,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0002,
-               0x0100,
+       0x0008,
+       0x0000,
+       0x0000,
+       0x0000,
+       0x0000,
+       0x0002,
+       0x0100,
 
        3, 0x0d,
-               0x0d80,
-               0x0001,
-               0x0000,
+       0x0d80,
+       0x0001,
+       0x0000,
 
        4, 0x11,
-               0x0000,
-               0x0103,
-               0x0000,
-               0x0000,
+       0x0000,
+       0x0103,
+       0x0000,
+       0x0000,
 
        3, 0x16,
-               0x0004 | 0x0040,
-               0x0030,
-               0x07ff,
+       0x0004 | 0x0040,
+       0x0030,
+       0x07ff,
 
        6, 0x1b,
-               0x4112,
-               0xff00,
-               0xc07f,
-               0x0000,
-               0x0180,
-               0x4000 | 0x0800 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001,
+       0x4112,
+       0xff00,
+       0xc07f,
+       0x0000,
+       0x0180,
+       0x4000 | 0x0800 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001,
 
        0,
 };
 
-static void dib0070_wbd_calibration(struct dvb_frontend *fe)
+static u16 dib0070_read_wbd_offset(struct dib0070_state *state, u8 gain)
 {
-       u16 wbd_offs;
-       struct dib0070_state *state = fe->tuner_priv;
-
-       if (state->cfg->sleep)
-               state->cfg->sleep(fe, 0);
+       u16 tuner_en = dib0070_read_reg(state, 0x20);
+       u16 offset;
 
-       dib0070_write_reg(state, 0x0f, 0x6d81);
-       dib0070_write_reg(state, 0x20, 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001);
+       dib0070_write_reg(state, 0x18, 0x07ff);
+       dib0070_write_reg(state, 0x20, 0x0800 | 0x4000 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001);
+       dib0070_write_reg(state, 0x0f, (1 << 14) | (2 << 12) | (gain << 9) | (1 << 8) | (1 << 7) | (0 << 0));
        msleep(9);
-       wbd_offs = dib0070_read_reg(state, 0x19);
-       dib0070_write_reg(state, 0x20, 0);
-       state->wbd_ff_offset = ((wbd_offs * 8 * 18 / 33 + 1) / 2);
-       dprintk( "WBDStart = %d (Vargen) - FF = %hd", (u32) wbd_offs * 1800/1024, state->wbd_ff_offset);
-
-       if (state->cfg->sleep)
-               state->cfg->sleep(fe, 1);
-
+       offset = dib0070_read_reg(state, 0x19);
+       dib0070_write_reg(state, 0x20, tuner_en);
+       return offset;
 }
 
-u16 dib0070_wbd_offset(struct dvb_frontend *fe)
+static void dib0070_wbd_offset_calibration(struct dib0070_state *state)
 {
-       struct dib0070_state *st = fe->tuner_priv;
-       return st->wbd_ff_offset;
+       u8 gain;
+       for (gain = 6; gain < 8; gain++) {
+               state->wbd_offset_3_3[gain - 6] = ((dib0070_read_wbd_offset(state, gain) * 8 * 18 / 33 + 1) / 2);
+               dprintk("Gain: %d, WBDOffset (3.3V) = %hd", gain, state->wbd_offset_3_3[gain - 6]);
+       }
 }
 
-EXPORT_SYMBOL(dib0070_wbd_offset);
-static int dib0070_set_ctrl_lo5(struct dvb_frontend *fe, u8 vco_bias_trim, u8 hf_div_trim, u8 cp_current, u8 third_order_filt)
+u16 dib0070_wbd_offset(struct dvb_frontend *fe)
 {
        struct dib0070_state *state = fe->tuner_priv;
-    u16 lo5 = (third_order_filt << 14) | (0 << 13) | (1 << 12) | (3 << 9) | (cp_current << 6) | (hf_div_trim << 3) | (vco_bias_trim << 0);
-       dprintk( "CTRL_LO5: 0x%x", lo5);
-       return dib0070_write_reg(state, 0x15, lo5);
+       const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
+       u32 freq = fe->dtv_property_cache.frequency / 1000;
+
+       if (tmp != NULL) {
+               while (freq / 1000 > tmp->freq) /* find the right one */
+                       tmp++;
+               state->wbd_gain_current = tmp->wbd_gain_val;
+       } else
+               state->wbd_gain_current = 6;
+
+       return state->wbd_offset_3_3[state->wbd_gain_current - 6];
 }
 
+EXPORT_SYMBOL(dib0070_wbd_offset);
+
 #define pgm_read_word(w) (*w)
-static int dib0070_reset(struct dib0070_state *state)
+static int dib0070_reset(struct dvb_frontend *fe)
 {
+       struct dib0070_state *state = fe->tuner_priv;
        u16 l, r, *n;
 
        HARD_RESET(state);
 
-
 #ifndef FORCE_SBAND_TUNER
        if ((dib0070_read_reg(state, 0x22) >> 9) & 0x1)
                state->revision = (dib0070_read_reg(state, 0x1f) >> 8) & 0xff;
        else
+#else
+#warning forcing SBAND
 #endif
-               state->revision = DIB0070S_P1A;
+       state->revision = DIB0070S_P1A;
 
        /* P1F or not */
-       dprintk( "Revision: %x", state->revision);
+       dprintk("Revision: %x", state->revision);
 
        if (state->revision == DIB0070_P1D) {
-               dprintk( "Error: this driver is not to be used meant for P1D or earlier");
+               dprintk("Error: this driver is not to be used meant for P1D or earlier");
                return -EINVAL;
        }
 
@@ -498,7 +620,7 @@ static int dib0070_reset(struct dib0070_state *state)
        while (l) {
                r = pgm_read_word(n++);
                do {
-                       dib0070_write_reg(state, (u8)r, pgm_read_word(n++));
+                       dib0070_write_reg(state, (u8) r, pgm_read_word(n++));
                        r++;
                } while (--l);
                l = pgm_read_word(n++);
@@ -514,24 +636,25 @@ static int dib0070_reset(struct dib0070_state *state)
        r |= state->cfg->osc_buffer_state << 3;
 
        dib0070_write_reg(state, 0x10, r);
-       dib0070_write_reg(state, 0x1f, (1 << 8) | ((state->cfg->clock_pad_drive & 0xf) << 4));
+       dib0070_write_reg(state, 0x1f, (1 << 8) | ((state->cfg->clock_pad_drive & 0xf) << 5));
 
        if (state->cfg->invert_iq) {
                r = dib0070_read_reg(state, 0x02) & 0xffdf;
                dib0070_write_reg(state, 0x02, r | (1 << 5));
        }
 
-
        if (state->revision == DIB0070S_P1A)
-               dib0070_set_ctrl_lo5(state->fe, 4, 7, 3, 1);
+               dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
        else
-               dib0070_set_ctrl_lo5(state->fe, 4, 4, 2, 0);
+               dib0070_set_ctrl_lo5(fe, 5, 4, state->cfg->charge_pump, state->cfg->enable_third_order_filter);
 
        dib0070_write_reg(state, 0x01, (54 << 9) | 0xc8);
+
+       dib0070_wbd_offset_calibration(state);
+
        return 0;
 }
 
-
 static int dib0070_release(struct dvb_frontend *fe)
 {
        kfree(fe->tuner_priv);
@@ -539,23 +662,24 @@ static int dib0070_release(struct dvb_frontend *fe)
        return 0;
 }
 
-static struct dvb_tuner_ops dib0070_ops = {
+static const struct dvb_tuner_ops dib0070_ops = {
        .info = {
-               .name           = "DiBcom DiB0070",
-               .frequency_min  =  45000000,
-               .frequency_max  = 860000000,
-               .frequency_step =      1000,
-       },
-       .release       = dib0070_release,
-
-       .init          = dib0070_wakeup,
-       .sleep         = dib0070_sleep,
-       .set_params    = dib0070_tune_digital,
-//     .get_frequency = dib0070_get_frequency,
-//     .get_bandwidth = dib0070_get_bandwidth
+                .name = "DiBcom DiB0070",
+                .frequency_min = 45000000,
+                .frequency_max = 860000000,
+                .frequency_step = 1000,
+                },
+       .release = dib0070_release,
+
+       .init = dib0070_wakeup,
+       .sleep = dib0070_sleep,
+       .set_params = dib0070_tune,
+
+//      .get_frequency = dib0070_get_frequency,
+//      .get_bandwidth = dib0070_get_bandwidth
 };
 
-struct dvb_frontend * dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg)
+struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg)
 {
        struct dib0070_state *state = kzalloc(sizeof(struct dib0070_state), GFP_KERNEL);
        if (state == NULL)
@@ -563,25 +687,24 @@ struct dvb_frontend * dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter
 
        state->cfg = cfg;
        state->i2c = i2c;
-       state->fe  = fe;
+       state->fe = fe;
        fe->tuner_priv = state;
 
-       if (dib0070_reset(state) != 0)
+       if (dib0070_reset(fe) != 0)
                goto free_mem;
 
-       dib0070_wbd_calibration(fe);
-
        printk(KERN_INFO "DiB0070: successfully identified\n");
        memcpy(&fe->ops.tuner_ops, &dib0070_ops, sizeof(struct dvb_tuner_ops));
 
        fe->tuner_priv = state;
        return fe;
 
-free_mem:
+ free_mem:
        kfree(state);
        fe->tuner_priv = NULL;
        return NULL;
 }
+
 EXPORT_SYMBOL(dib0070_attach);
 
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
index 9670f5d..8a2e1e7 100644 (file)
@@ -15,6 +15,11 @@ struct i2c_adapter;
 
 #define DEFAULT_DIB0070_I2C_ADDRESS 0x60
 
+struct dib0070_wbd_gain_cfg {
+       u16 freq;
+       u16 wbd_gain_val;
+};
+
 struct dib0070_config {
        u8 i2c_address;
 
@@ -26,26 +31,28 @@ struct dib0070_config {
        int freq_offset_khz_uhf;
        int freq_offset_khz_vhf;
 
-       u8 osc_buffer_state; /* 0= normal, 1= tri-state */
-       u32  clock_khz;
-       u8 clock_pad_drive; /* (Drive + 1) * 2mA */
+       u8 osc_buffer_state;    /* 0= normal, 1= tri-state */
+       u32 clock_khz;
+       u8 clock_pad_drive;     /* (Drive + 1) * 2mA */
 
-       u8 invert_iq; /* invert Q - in case I or Q is inverted on the board */
+       u8 invert_iq;           /* invert Q - in case I or Q is inverted on the board */
 
-       u8 force_crystal_mode; /* if == 0 -> decision is made in the driver default: <24 -> 2, >=24 -> 1 */
+       u8 force_crystal_mode;  /* if == 0 -> decision is made in the driver default: <24 -> 2, >=24 -> 1 */
 
        u8 flip_chip;
+       u8 enable_third_order_filter;
+       u8 charge_pump;
+
+       const struct dib0070_wbd_gain_cfg *wbd_gain;
+
+       u8 vga_filter;
 };
 
 #if defined(CONFIG_DVB_TUNER_DIB0070) || (defined(CONFIG_DVB_TUNER_DIB0070_MODULE) && defined(MODULE))
-extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,
-                                          struct i2c_adapter *i2c,
-                                          struct dib0070_config *cfg);
+extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg);
 extern u16 dib0070_wbd_offset(struct dvb_frontend *);
 #else
-static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,
-                                                 struct i2c_adapter *i2c,
-                                                 struct dib0070_config *cfg)
+static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
@@ -57,5 +64,6 @@ static inline u16 dib0070_wbd_offset(struct dvb_frontend *fe)
        return -ENODEV;
 }
 #endif
+extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, u8 open);
 
 #endif
index fc96fbf..55ef6ee 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 
+#include "dvb_math.h"
 #include "dvb_frontend.h"
 
 #include "dib7000p.h"
@@ -1217,7 +1218,37 @@ static int dib7000p_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
 
 static int dib7000p_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
-       *snr = 0x0000;
+       struct dib7000p_state *state = fe->demodulator_priv;
+       u16 val;
+       s32 signal_mant, signal_exp, noise_mant, noise_exp;
+       u32 result = 0;
+
+       val = dib7000p_read_word(state, 479);
+       noise_mant = (val >> 4) & 0xff;
+       noise_exp = ((val & 0xf) << 2);
+       val = dib7000p_read_word(state, 480);
+       noise_exp += ((val >> 14) & 0x3);
+       if ((noise_exp & 0x20) != 0)
+               noise_exp -= 0x40;
+
+       signal_mant = (val >> 6) & 0xFF;
+       signal_exp  = (val & 0x3F);
+       if ((signal_exp & 0x20) != 0)
+               signal_exp -= 0x40;
+
+       if (signal_mant != 0)
+               result = intlog10(2) * 10 * signal_exp + 10 *
+                       intlog10(signal_mant);
+       else
+               result = intlog10(2) * 10 * signal_exp - 100;
+
+       if (noise_mant != 0)
+               result -= intlog10(2) * 10 * noise_exp + 10 *
+                       intlog10(noise_mant);
+       else
+               result -= intlog10(2) * 10 * noise_exp - 100;
+
+       *snr = result / ((1 << 24) / 10);
        return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
new file mode 100644 (file)
index 0000000..852c790
--- /dev/null
@@ -0,0 +1,2277 @@
+/*
+ * Linux-DVB Driver for DiBcom's DiB8000 chip (ISDB-T).
+ *
+ * Copyright (C) 2009 DiBcom (http://www.dibcom.fr/)
+ *
+ * This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, version 2.
+ */
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include "dvb_math.h"
+
+#include "dvb_frontend.h"
+
+#include "dib8000.h"
+
+#define LAYER_ALL -1
+#define LAYER_A   1
+#define LAYER_B   2
+#define LAYER_C   3
+
+#define FE_CALLBACK_TIME_NEVER 0xffffffff
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
+
+#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB8000: "); printk(args); printk("\n"); } } while (0)
+
+enum frontend_tune_state {
+       CT_AGC_START = 20,
+       CT_AGC_STEP_0,
+       CT_AGC_STEP_1,
+       CT_AGC_STEP_2,
+       CT_AGC_STEP_3,
+       CT_AGC_STEP_4,
+       CT_AGC_STOP,
+
+       CT_DEMOD_START = 30,
+};
+
+#define FE_STATUS_TUNE_FAILED 0
+
+struct i2c_device {
+       struct i2c_adapter *adap;
+       u8 addr;
+};
+
+struct dib8000_state {
+       struct dvb_frontend fe;
+       struct dib8000_config cfg;
+
+       struct i2c_device i2c;
+
+       struct dibx000_i2c_master i2c_master;
+
+       u16 wbd_ref;
+
+       u8 current_band;
+       u32 current_bandwidth;
+       struct dibx000_agc_config *current_agc;
+       u32 timf;
+       u32 timf_default;
+
+       u8 div_force_off:1;
+       u8 div_state:1;
+       u16 div_sync_wait;
+
+       u8 agc_state;
+       u8 differential_constellation;
+       u8 diversity_onoff;
+
+       s16 ber_monitored_layer;
+       u16 gpio_dir;
+       u16 gpio_val;
+
+       u16 revision;
+       u8 isdbt_cfg_loaded;
+       enum frontend_tune_state tune_state;
+       u32 status;
+};
+
+enum dib8000_power_mode {
+       DIB8000M_POWER_ALL = 0,
+       DIB8000M_POWER_INTERFACE_ONLY,
+};
+
+static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg)
+{
+       u8 wb[2] = { reg >> 8, reg & 0xff };
+       u8 rb[2];
+       struct i2c_msg msg[2] = {
+               {.addr = i2c->addr >> 1,.flags = 0,.buf = wb,.len = 2},
+               {.addr = i2c->addr >> 1,.flags = I2C_M_RD,.buf = rb,.len = 2},
+       };
+
+       if (i2c_transfer(i2c->adap, msg, 2) != 2)
+               dprintk("i2c read error on %d", reg);
+
+       return (rb[0] << 8) | rb[1];
+}
+
+static u16 dib8000_read_word(struct dib8000_state *state, u16 reg)
+{
+       return dib8000_i2c_read16(&state->i2c, reg);
+}
+
+static u32 dib8000_read32(struct dib8000_state *state, u16 reg)
+{
+       u16 rw[2];
+
+       rw[0] = dib8000_read_word(state, reg + 0);
+       rw[1] = dib8000_read_word(state, reg + 1);
+
+       return ((rw[0] << 16) | (rw[1]));
+}
+
+static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val)
+{
+       u8 b[4] = {
+               (reg >> 8) & 0xff, reg & 0xff,
+               (val >> 8) & 0xff, val & 0xff,
+       };
+       struct i2c_msg msg = {
+               .addr = i2c->addr >> 1,.flags = 0,.buf = b,.len = 4
+       };
+       return i2c_transfer(i2c->adap, &msg, 1) != 1 ? -EREMOTEIO : 0;
+}
+
+static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
+{
+       return dib8000_i2c_write16(&state->i2c, reg, val);
+}
+
+const int16_t coeff_2k_sb_1seg_dqpsk[8] = {
+       (769 << 5) | 0x0a, (745 << 5) | 0x03, (595 << 5) | 0x0d, (769 << 5) | 0x0a, (920 << 5) | 0x09, (784 << 5) | 0x02, (519 << 5) | 0x0c,
+           (920 << 5) | 0x09
+};
+
+const int16_t coeff_2k_sb_1seg[8] = {
+       (692 << 5) | 0x0b, (683 << 5) | 0x01, (519 << 5) | 0x09, (692 << 5) | 0x0b, 0 | 0x1f, 0 | 0x1f, 0 | 0x1f, 0 | 0x1f
+};
+
+const int16_t coeff_2k_sb_3seg_0dqpsk_1dqpsk[8] = {
+       (832 << 5) | 0x10, (912 << 5) | 0x05, (900 << 5) | 0x12, (832 << 5) | 0x10, (-931 << 5) | 0x0f, (912 << 5) | 0x04, (807 << 5) | 0x11,
+           (-931 << 5) | 0x0f
+};
+
+const int16_t coeff_2k_sb_3seg_0dqpsk[8] = {
+       (622 << 5) | 0x0c, (941 << 5) | 0x04, (796 << 5) | 0x10, (622 << 5) | 0x0c, (982 << 5) | 0x0c, (519 << 5) | 0x02, (572 << 5) | 0x0e,
+           (982 << 5) | 0x0c
+};
+
+const int16_t coeff_2k_sb_3seg_1dqpsk[8] = {
+       (699 << 5) | 0x14, (607 << 5) | 0x04, (944 << 5) | 0x13, (699 << 5) | 0x14, (-720 << 5) | 0x0d, (640 << 5) | 0x03, (866 << 5) | 0x12,
+           (-720 << 5) | 0x0d
+};
+
+const int16_t coeff_2k_sb_3seg[8] = {
+       (664 << 5) | 0x0c, (925 << 5) | 0x03, (937 << 5) | 0x10, (664 << 5) | 0x0c, (-610 << 5) | 0x0a, (697 << 5) | 0x01, (836 << 5) | 0x0e,
+           (-610 << 5) | 0x0a
+};
+
+const int16_t coeff_4k_sb_1seg_dqpsk[8] = {
+       (-955 << 5) | 0x0e, (687 << 5) | 0x04, (818 << 5) | 0x10, (-955 << 5) | 0x0e, (-922 << 5) | 0x0d, (750 << 5) | 0x03, (665 << 5) | 0x0f,
+           (-922 << 5) | 0x0d
+};
+
+const int16_t coeff_4k_sb_1seg[8] = {
+       (638 << 5) | 0x0d, (683 << 5) | 0x02, (638 << 5) | 0x0d, (638 << 5) | 0x0d, (-655 << 5) | 0x0a, (517 << 5) | 0x00, (698 << 5) | 0x0d,
+           (-655 << 5) | 0x0a
+};
+
+const int16_t coeff_4k_sb_3seg_0dqpsk_1dqpsk[8] = {
+       (-707 << 5) | 0x14, (910 << 5) | 0x06, (889 << 5) | 0x16, (-707 << 5) | 0x14, (-958 << 5) | 0x13, (993 << 5) | 0x05, (523 << 5) | 0x14,
+           (-958 << 5) | 0x13
+};
+
+const int16_t coeff_4k_sb_3seg_0dqpsk[8] = {
+       (-723 << 5) | 0x13, (910 << 5) | 0x05, (777 << 5) | 0x14, (-723 << 5) | 0x13, (-568 << 5) | 0x0f, (547 << 5) | 0x03, (696 << 5) | 0x12,
+           (-568 << 5) | 0x0f
+};
+
+const int16_t coeff_4k_sb_3seg_1dqpsk[8] = {
+       (-940 << 5) | 0x15, (607 << 5) | 0x05, (915 << 5) | 0x16, (-940 << 5) | 0x15, (-848 << 5) | 0x13, (683 << 5) | 0x04, (543 << 5) | 0x14,
+           (-848 << 5) | 0x13
+};
+
+const int16_t coeff_4k_sb_3seg[8] = {
+       (612 << 5) | 0x12, (910 << 5) | 0x04, (864 << 5) | 0x14, (612 << 5) | 0x12, (-869 << 5) | 0x13, (683 << 5) | 0x02, (869 << 5) | 0x12,
+           (-869 << 5) | 0x13
+};
+
+const int16_t coeff_8k_sb_1seg_dqpsk[8] = {
+       (-835 << 5) | 0x12, (684 << 5) | 0x05, (735 << 5) | 0x14, (-835 << 5) | 0x12, (-598 << 5) | 0x10, (781 << 5) | 0x04, (739 << 5) | 0x13,
+           (-598 << 5) | 0x10
+};
+
+const int16_t coeff_8k_sb_1seg[8] = {
+       (673 << 5) | 0x0f, (683 << 5) | 0x03, (808 << 5) | 0x12, (673 << 5) | 0x0f, (585 << 5) | 0x0f, (512 << 5) | 0x01, (780 << 5) | 0x0f,
+           (585 << 5) | 0x0f
+};
+
+const int16_t coeff_8k_sb_3seg_0dqpsk_1dqpsk[8] = {
+       (863 << 5) | 0x17, (930 << 5) | 0x07, (878 << 5) | 0x19, (863 << 5) | 0x17, (0 << 5) | 0x14, (521 << 5) | 0x05, (980 << 5) | 0x18,
+           (0 << 5) | 0x14
+};
+
+const int16_t coeff_8k_sb_3seg_0dqpsk[8] = {
+       (-924 << 5) | 0x17, (910 << 5) | 0x06, (774 << 5) | 0x17, (-924 << 5) | 0x17, (-877 << 5) | 0x15, (565 << 5) | 0x04, (553 << 5) | 0x15,
+           (-877 << 5) | 0x15
+};
+
+const int16_t coeff_8k_sb_3seg_1dqpsk[8] = {
+       (-921 << 5) | 0x19, (607 << 5) | 0x06, (881 << 5) | 0x19, (-921 << 5) | 0x19, (-921 << 5) | 0x14, (713 << 5) | 0x05, (1018 << 5) | 0x18,
+           (-921 << 5) | 0x14
+};
+
+const int16_t coeff_8k_sb_3seg[8] = {
+       (514 << 5) | 0x14, (910 << 5) | 0x05, (861 << 5) | 0x17, (514 << 5) | 0x14, (690 << 5) | 0x14, (683 << 5) | 0x03, (662 << 5) | 0x15,
+           (690 << 5) | 0x14
+};
+
+const int16_t ana_fe_coeff_3seg[24] = {
+       81, 80, 78, 74, 68, 61, 54, 45, 37, 28, 19, 11, 4, 1022, 1017, 1013, 1010, 1008, 1008, 1008, 1008, 1010, 1014, 1017
+};
+
+const int16_t ana_fe_coeff_1seg[24] = {
+       249, 226, 164, 82, 5, 981, 970, 988, 1018, 20, 31, 26, 8, 1012, 1000, 1018, 1012, 8, 15, 14, 9, 3, 1017, 1003
+};
+
+const int16_t ana_fe_coeff_13seg[24] = {
+       396, 305, 105, -51, -77, -12, 41, 31, -11, -30, -11, 14, 15, -2, -13, -7, 5, 8, 1, -6, -7, -3, 0, 1
+};
+
+static u16 fft_to_mode(struct dib8000_state *state)
+{
+       u16 mode;
+       switch (state->fe.dtv_property_cache.transmission_mode) {
+       case TRANSMISSION_MODE_2K:
+               mode = 1;
+               break;
+       case TRANSMISSION_MODE_4K:
+               mode = 2;
+               break;
+       default:
+       case TRANSMISSION_MODE_AUTO:
+       case TRANSMISSION_MODE_8K:
+               mode = 3;
+               break;
+       }
+       return mode;
+}
+
+static void dib8000_set_acquisition_mode(struct dib8000_state *state)
+{
+       u16 nud = dib8000_read_word(state, 298);
+       nud |= (1 << 3) | (1 << 0);
+       dprintk("acquisition mode activated");
+       dib8000_write_word(state, 298, nud);
+}
+
+static int dib8000_set_output_mode(struct dib8000_state *state, int mode)
+{
+       u16 outreg, fifo_threshold, smo_mode, sram = 0x0205;    /* by default SDRAM deintlv is enabled */
+
+       outreg = 0;
+       fifo_threshold = 1792;
+       smo_mode = (dib8000_read_word(state, 299) & 0x0050) | (1 << 1);
+
+       dprintk("-I-  Setting output mode for demod %p to %d", &state->fe, mode);
+
+       switch (mode) {
+       case OUTMODE_MPEG2_PAR_GATED_CLK:       // STBs with parallel gated clock
+               outreg = (1 << 10);     /* 0x0400 */
+               break;
+       case OUTMODE_MPEG2_PAR_CONT_CLK:        // STBs with parallel continues clock
+               outreg = (1 << 10) | (1 << 6);  /* 0x0440 */
+               break;
+       case OUTMODE_MPEG2_SERIAL:      // STBs with serial input
+               outreg = (1 << 10) | (2 << 6) | (0 << 1);       /* 0x0482 */
+               break;
+       case OUTMODE_DIVERSITY:
+               if (state->cfg.hostbus_diversity) {
+                       outreg = (1 << 10) | (4 << 6);  /* 0x0500 */
+                       sram &= 0xfdff;
+               } else
+                       sram |= 0x0c00;
+               break;
+       case OUTMODE_MPEG2_FIFO:        // e.g. USB feeding
+               smo_mode |= (3 << 1);
+               fifo_threshold = 512;
+               outreg = (1 << 10) | (5 << 6);
+               break;
+       case OUTMODE_HIGH_Z:    // disable
+               outreg = 0;
+               break;
+
+       case OUTMODE_ANALOG_ADC:
+               outreg = (1 << 10) | (3 << 6);
+               dib8000_set_acquisition_mode(state);
+               break;
+
+       default:
+               dprintk("Unhandled output_mode passed to be set for demod %p", &state->fe);
+               return -EINVAL;
+       }
+
+       if (state->cfg.output_mpeg2_in_188_bytes)
+               smo_mode |= (1 << 5);
+
+       dib8000_write_word(state, 299, smo_mode);
+       dib8000_write_word(state, 300, fifo_threshold); /* synchronous fread */
+       dib8000_write_word(state, 1286, outreg);
+       dib8000_write_word(state, 1291, sram);
+
+       return 0;
+}
+
+static int dib8000_set_diversity_in(struct dvb_frontend *fe, int onoff)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 sync_wait = dib8000_read_word(state, 273) & 0xfff0;
+
+       if (!state->differential_constellation) {
+               dib8000_write_word(state, 272, 1 << 9); //dvsy_off_lmod4 = 1
+               dib8000_write_word(state, 273, sync_wait | (1 << 2) | 2);       // sync_enable = 1; comb_mode = 2
+       } else {
+               dib8000_write_word(state, 272, 0);      //dvsy_off_lmod4 = 0
+               dib8000_write_word(state, 273, sync_wait);      // sync_enable = 0; comb_mode = 0
+       }
+       state->diversity_onoff = onoff;
+
+       switch (onoff) {
+       case 0:         /* only use the internal way - not the diversity input */
+               dib8000_write_word(state, 270, 1);
+               dib8000_write_word(state, 271, 0);
+               break;
+       case 1:         /* both ways */
+               dib8000_write_word(state, 270, 6);
+               dib8000_write_word(state, 271, 6);
+               break;
+       case 2:         /* only the diversity input */
+               dib8000_write_word(state, 270, 0);
+               dib8000_write_word(state, 271, 1);
+               break;
+       }
+       return 0;
+}
+
+static void dib8000_set_power_mode(struct dib8000_state *state, enum dib8000_power_mode mode)
+{
+       /* by default everything is going to be powered off */
+       u16 reg_774 = 0x3fff, reg_775 = 0xffff, reg_776 = 0xffff,
+           reg_900 = (dib8000_read_word(state, 900) & 0xfffc) | 0x3, reg_1280 = (dib8000_read_word(state, 1280) & 0x00ff) | 0xff00;
+
+       /* now, depending on the requested mode, we power on */
+       switch (mode) {
+               /* power up everything in the demod */
+       case DIB8000M_POWER_ALL:
+               reg_774 = 0x0000;
+               reg_775 = 0x0000;
+               reg_776 = 0x0000;
+               reg_900 &= 0xfffc;
+               reg_1280 &= 0x00ff;
+               break;
+       case DIB8000M_POWER_INTERFACE_ONLY:
+               reg_1280 &= 0x00ff;
+               break;
+       }
+
+       dprintk("powermode : 774 : %x ; 775 : %x; 776 : %x ; 900 : %x; 1280 : %x", reg_774, reg_775, reg_776, reg_900, reg_1280);
+       dib8000_write_word(state, 774, reg_774);
+       dib8000_write_word(state, 775, reg_775);
+       dib8000_write_word(state, 776, reg_776);
+       dib8000_write_word(state, 900, reg_900);
+       dib8000_write_word(state, 1280, reg_1280);
+}
+
+static int dib8000_set_adc_state(struct dib8000_state *state, enum dibx000_adc_states no)
+{
+       int ret = 0;
+       u16 reg_907 = dib8000_read_word(state, 907), reg_908 = dib8000_read_word(state, 908);
+
+       switch (no) {
+       case DIBX000_SLOW_ADC_ON:
+               reg_908 |= (1 << 1) | (1 << 0);
+               ret |= dib8000_write_word(state, 908, reg_908);
+               reg_908 &= ~(1 << 1);
+               break;
+
+       case DIBX000_SLOW_ADC_OFF:
+               reg_908 |= (1 << 1) | (1 << 0);
+               break;
+
+       case DIBX000_ADC_ON:
+               reg_907 &= 0x0fff;
+               reg_908 &= 0x0003;
+               break;
+
+       case DIBX000_ADC_OFF:   // leave the VBG voltage on
+               reg_907 |= (1 << 14) | (1 << 13) | (1 << 12);
+               reg_908 |= (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2);
+               break;
+
+       case DIBX000_VBG_ENABLE:
+               reg_907 &= ~(1 << 15);
+               break;
+
+       case DIBX000_VBG_DISABLE:
+               reg_907 |= (1 << 15);
+               break;
+
+       default:
+               break;
+       }
+
+       ret |= dib8000_write_word(state, 907, reg_907);
+       ret |= dib8000_write_word(state, 908, reg_908);
+
+       return ret;
+}
+
+static int dib8000_set_bandwidth(struct dib8000_state *state, u32 bw)
+{
+       u32 timf;
+
+       if (bw == 0)
+               bw = 6000;
+
+       if (state->timf == 0) {
+               dprintk("using default timf");
+               timf = state->timf_default;
+       } else {
+               dprintk("using updated timf");
+               timf = state->timf;
+       }
+
+       dib8000_write_word(state, 29, (u16) ((timf >> 16) & 0xffff));
+       dib8000_write_word(state, 30, (u16) ((timf) & 0xffff));
+
+       return 0;
+}
+
+static int dib8000_sad_calib(struct dib8000_state *state)
+{
+/* internal */
+       dib8000_write_word(state, 923, (0 << 1) | (0 << 0));
+       dib8000_write_word(state, 924, 776);    // 0.625*3.3 / 4096
+
+       /* do the calibration */
+       dib8000_write_word(state, 923, (1 << 0));
+       dib8000_write_word(state, 923, (0 << 0));
+
+       msleep(1);
+       return 0;
+}
+
+int dib8000_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       if (value > 4095)
+               value = 4095;
+       state->wbd_ref = value;
+       return dib8000_write_word(state, 106, value);
+}
+
+EXPORT_SYMBOL(dib8000_set_wbd_ref);
+static void dib8000_reset_pll_common(struct dib8000_state *state, const struct dibx000_bandwidth_config *bw)
+{
+       dprintk("ifreq: %d %x, inversion: %d", bw->ifreq, bw->ifreq, bw->ifreq >> 25);
+       dib8000_write_word(state, 23, (u16) (((bw->internal * 1000) >> 16) & 0xffff));  /* P_sec_len */
+       dib8000_write_word(state, 24, (u16) ((bw->internal * 1000) & 0xffff));
+       dib8000_write_word(state, 27, (u16) ((bw->ifreq >> 16) & 0x01ff));
+       dib8000_write_word(state, 28, (u16) (bw->ifreq & 0xffff));
+       dib8000_write_word(state, 26, (u16) ((bw->ifreq >> 25) & 0x0003));
+
+       dib8000_write_word(state, 922, bw->sad_cfg);
+}
+
+static void dib8000_reset_pll(struct dib8000_state *state)
+{
+       const struct dibx000_bandwidth_config *pll = state->cfg.pll;
+       u16 clk_cfg1;
+
+       // clk_cfg0
+       dib8000_write_word(state, 901, (pll->pll_prediv << 8) | (pll->pll_ratio << 0));
+
+       // clk_cfg1
+       clk_cfg1 = (1 << 10) | (0 << 9) | (pll->IO_CLK_en_core << 8) |
+           (pll->bypclk_div << 5) | (pll->enable_refdiv << 4) | (1 << 3) | (pll->pll_range << 1) | (pll->pll_reset << 0);
+
+       dib8000_write_word(state, 902, clk_cfg1);
+       clk_cfg1 = (clk_cfg1 & 0xfff7) | (pll->pll_bypass << 3);
+       dib8000_write_word(state, 902, clk_cfg1);
+
+       dprintk("clk_cfg1: 0x%04x", clk_cfg1);  /* 0x507 1 0 1 000 0 0 11 1 */
+
+       /* smpl_cfg: P_refclksel=2, P_ensmplsel=1 nodivsmpl=1 */
+       if (state->cfg.pll->ADClkSrc == 0)
+               dib8000_write_word(state, 904, (0 << 15) | (0 << 12) | (0 << 10) | (pll->modulo << 8) | (pll->ADClkSrc << 7) | (0 << 1));
+       else if (state->cfg.refclksel != 0)
+               dib8000_write_word(state, 904,
+                                  (0 << 15) | (1 << 12) | ((state->cfg.refclksel & 0x3) << 10) | (pll->modulo << 8) | (pll->
+                                                                                                                       ADClkSrc << 7) | (0 << 1));
+       else
+               dib8000_write_word(state, 904, (0 << 15) | (1 << 12) | (3 << 10) | (pll->modulo << 8) | (pll->ADClkSrc << 7) | (0 << 1));
+
+       dib8000_reset_pll_common(state, pll);
+}
+
+static int dib8000_reset_gpio(struct dib8000_state *st)
+{
+       /* reset the GPIOs */
+       dib8000_write_word(st, 1029, st->cfg.gpio_dir);
+       dib8000_write_word(st, 1030, st->cfg.gpio_val);
+
+       /* TODO 782 is P_gpio_od */
+
+       dib8000_write_word(st, 1032, st->cfg.gpio_pwm_pos);
+
+       dib8000_write_word(st, 1037, st->cfg.pwm_freq_div);
+       return 0;
+}
+
+static int dib8000_cfg_gpio(struct dib8000_state *st, u8 num, u8 dir, u8 val)
+{
+       st->cfg.gpio_dir = dib8000_read_word(st, 1029);
+       st->cfg.gpio_dir &= ~(1 << num);        /* reset the direction bit */
+       st->cfg.gpio_dir |= (dir & 0x1) << num; /* set the new direction */
+       dib8000_write_word(st, 1029, st->cfg.gpio_dir);
+
+       st->cfg.gpio_val = dib8000_read_word(st, 1030);
+       st->cfg.gpio_val &= ~(1 << num);        /* reset the direction bit */
+       st->cfg.gpio_val |= (val & 0x01) << num;        /* set the new value */
+       dib8000_write_word(st, 1030, st->cfg.gpio_val);
+
+       dprintk("gpio dir: %x: gpio val: %x", st->cfg.gpio_dir, st->cfg.gpio_val);
+
+       return 0;
+}
+
+int dib8000_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       return dib8000_cfg_gpio(state, num, dir, val);
+}
+
+EXPORT_SYMBOL(dib8000_set_gpio);
+static const u16 dib8000_defaults[] = {
+       /* auto search configuration - lock0 by default waiting
+        * for cpil_lock; lock1 cpil_lock; lock2 tmcc_sync_lock */
+       3, 7,
+       0x0004,
+       0x0400,
+       0x0814,
+
+       12, 11,
+       0x001b,
+       0x7740,
+       0x005b,
+       0x8d80,
+       0x01c9,
+       0xc380,
+       0x0000,
+       0x0080,
+       0x0000,
+       0x0090,
+       0x0001,
+       0xd4c0,
+
+       /*1, 32,
+          0x6680 // P_corm_thres Lock algorithms configuration */
+
+       11, 80,                 /* set ADC level to -16 */
+       (1 << 13) - 825 - 117,
+       (1 << 13) - 837 - 117,
+       (1 << 13) - 811 - 117,
+       (1 << 13) - 766 - 117,
+       (1 << 13) - 737 - 117,
+       (1 << 13) - 693 - 117,
+       (1 << 13) - 648 - 117,
+       (1 << 13) - 619 - 117,
+       (1 << 13) - 575 - 117,
+       (1 << 13) - 531 - 117,
+       (1 << 13) - 501 - 117,
+
+       4, 108,
+       0,
+       0,
+       0,
+       0,
+
+       1, 175,
+       0x0410,
+       1, 179,
+       8192,                   // P_fft_nb_to_cut
+
+       6, 181,
+       0x2800,                 // P_coff_corthres_ ( 2k 4k 8k ) 0x2800
+       0x2800,
+       0x2800,
+       0x2800,                 // P_coff_cpilthres_ ( 2k 4k 8k ) 0x2800
+       0x2800,
+       0x2800,
+
+       2, 193,
+       0x0666,                 // P_pha3_thres
+       0x0000,                 // P_cti_use_cpe, P_cti_use_prog
+
+       2, 205,
+       0x200f,                 // P_cspu_regul, P_cspu_win_cut
+       0x000f,                 // P_des_shift_work
+
+       5, 215,
+       0x023d,                 // P_adp_regul_cnt
+       0x00a4,                 // P_adp_noise_cnt
+       0x00a4,                 // P_adp_regul_ext
+       0x7ff0,                 // P_adp_noise_ext
+       0x3ccc,                 // P_adp_fil
+
+       1, 230,
+       0x0000,                 // P_2d_byp_ti_num
+
+       1, 263,
+       0x800,                  //P_equal_thres_wgn
+
+       1, 268,
+       (2 << 9) | 39,          // P_equal_ctrl_synchro, P_equal_speedmode
+
+       1, 270,
+       0x0001,                 // P_div_lock0_wait
+       1, 285,
+       0x0020,                 //p_fec_
+       1, 299,
+       0x0062,                 // P_smo_mode, P_smo_rs_discard, P_smo_fifo_flush, P_smo_pid_parse, P_smo_error_discard
+
+       1, 338,
+       (1 << 12) |             // P_ctrl_corm_thres4pre_freq_inh=1
+           (1 << 10) |         // P_ctrl_pre_freq_mode_sat=1
+           (0 << 9) |          // P_ctrl_pre_freq_inh=0
+           (3 << 5) |          // P_ctrl_pre_freq_step=3
+           (1 << 0),           // P_pre_freq_win_len=1
+
+       1, 903,
+       (0 << 4) | 2,           // P_divclksel=0 P_divbitsel=2 (was clk=3,bit=1 for MPW)
+
+       0,
+};
+
+static u16 dib8000_identify(struct i2c_device *client)
+{
+       u16 value;
+
+       //because of glitches sometimes
+       value = dib8000_i2c_read16(client, 896);
+
+       if ((value = dib8000_i2c_read16(client, 896)) != 0x01b3) {
+               dprintk("wrong Vendor ID (read=0x%x)", value);
+               return 0;
+       }
+
+       value = dib8000_i2c_read16(client, 897);
+       if (value != 0x8000 && value != 0x8001 && value != 0x8002) {
+               dprintk("wrong Device ID (%x)", value);
+               return 0;
+       }
+
+       switch (value) {
+       case 0x8000:
+               dprintk("found DiB8000A");
+               break;
+       case 0x8001:
+               dprintk("found DiB8000B");
+               break;
+       case 0x8002:
+               dprintk("found DiB8000C");
+               break;
+       }
+       return value;
+}
+
+static int dib8000_reset(struct dvb_frontend *fe)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+
+       dib8000_write_word(state, 1287, 0x0003);        /* sram lead in, rdy */
+
+       if ((state->revision = dib8000_identify(&state->i2c)) == 0)
+               return -EINVAL;
+
+       if (state->revision == 0x8000)
+               dprintk("error : dib8000 MA not supported");
+
+       dibx000_reset_i2c_master(&state->i2c_master);
+
+       dib8000_set_power_mode(state, DIB8000M_POWER_ALL);
+
+       /* always leave the VBG voltage on - it consumes almost nothing but takes a long time to start */
+       dib8000_set_adc_state(state, DIBX000_VBG_ENABLE);
+
+       /* restart all parts */
+       dib8000_write_word(state, 770, 0xffff);
+       dib8000_write_word(state, 771, 0xffff);
+       dib8000_write_word(state, 772, 0xfffc);
+       dib8000_write_word(state, 898, 0x000c); // sad
+       dib8000_write_word(state, 1280, 0x004d);
+       dib8000_write_word(state, 1281, 0x000c);
+
+       dib8000_write_word(state, 770, 0x0000);
+       dib8000_write_word(state, 771, 0x0000);
+       dib8000_write_word(state, 772, 0x0000);
+       dib8000_write_word(state, 898, 0x0004); // sad
+       dib8000_write_word(state, 1280, 0x0000);
+       dib8000_write_word(state, 1281, 0x0000);
+
+       /* drives */
+       if (state->cfg.drives)
+               dib8000_write_word(state, 906, state->cfg.drives);
+       else {
+               dprintk("using standard PAD-drive-settings, please adjust settings in config-struct to be optimal.");
+               dib8000_write_word(state, 906, 0x2d98); // min drive SDRAM - not optimal - adjust
+       }
+
+       dib8000_reset_pll(state);
+
+       if (dib8000_reset_gpio(state) != 0)
+               dprintk("GPIO reset was not successful.");
+
+       if (dib8000_set_output_mode(state, OUTMODE_HIGH_Z) != 0)
+               dprintk("OUTPUT_MODE could not be resetted.");
+
+       state->current_agc = NULL;
+
+       // P_iqc_alpha_pha, P_iqc_alpha_amp, P_iqc_dcc_alpha, ...
+       /* P_iqc_ca2 = 0; P_iqc_impnc_on = 0; P_iqc_mode = 0; */
+       if (state->cfg.pll->ifreq == 0)
+               dib8000_write_word(state, 40, 0x0755);  /* P_iqc_corr_inh = 0 enable IQcorr block */
+       else
+               dib8000_write_word(state, 40, 0x1f55);  /* P_iqc_corr_inh = 1 disable IQcorr block */
+
+       {
+               u16 l = 0, r;
+               const u16 *n;
+               n = dib8000_defaults;
+               l = *n++;
+               while (l) {
+                       r = *n++;
+                       do {
+                               dib8000_write_word(state, r, *n++);
+                               r++;
+                       } while (--l);
+                       l = *n++;
+               }
+       }
+       state->isdbt_cfg_loaded = 0;
+
+       //div_cfg override for special configs
+       if (state->cfg.div_cfg != 0)
+               dib8000_write_word(state, 903, state->cfg.div_cfg);
+
+       /* unforce divstr regardless whether i2c enumeration was done or not */
+       dib8000_write_word(state, 1285, dib8000_read_word(state, 1285) & ~(1 << 1));
+
+       dib8000_set_bandwidth(state, 6000);
+
+       dib8000_set_adc_state(state, DIBX000_SLOW_ADC_ON);
+       dib8000_sad_calib(state);
+       dib8000_set_adc_state(state, DIBX000_SLOW_ADC_OFF);
+
+       dib8000_set_power_mode(state, DIB8000M_POWER_INTERFACE_ONLY);
+
+       return 0;
+}
+
+static void dib8000_restart_agc(struct dib8000_state *state)
+{
+       // P_restart_iqc & P_restart_agc
+       dib8000_write_word(state, 770, 0x0a00);
+       dib8000_write_word(state, 770, 0x0000);
+}
+
+static int dib8000_update_lna(struct dib8000_state *state)
+{
+       u16 dyn_gain;
+
+       if (state->cfg.update_lna) {
+               // read dyn_gain here (because it is demod-dependent and not tuner)
+               dyn_gain = dib8000_read_word(state, 390);
+
+               if (state->cfg.update_lna(&state->fe, dyn_gain)) {      // LNA has changed
+                       dib8000_restart_agc(state);
+                       return 1;
+               }
+       }
+       return 0;
+}
+
+static int dib8000_set_agc_config(struct dib8000_state *state, u8 band)
+{
+       struct dibx000_agc_config *agc = NULL;
+       int i;
+       if (state->current_band == band && state->current_agc != NULL)
+               return 0;
+       state->current_band = band;
+
+       for (i = 0; i < state->cfg.agc_config_count; i++)
+               if (state->cfg.agc[i].band_caps & band) {
+                       agc = &state->cfg.agc[i];
+                       break;
+               }
+
+       if (agc == NULL) {
+               dprintk("no valid AGC configuration found for band 0x%02x", band);
+               return -EINVAL;
+       }
+
+       state->current_agc = agc;
+
+       /* AGC */
+       dib8000_write_word(state, 76, agc->setup);
+       dib8000_write_word(state, 77, agc->inv_gain);
+       dib8000_write_word(state, 78, agc->time_stabiliz);
+       dib8000_write_word(state, 101, (agc->alpha_level << 12) | agc->thlock);
+
+       // Demod AGC loop configuration
+       dib8000_write_word(state, 102, (agc->alpha_mant << 5) | agc->alpha_exp);
+       dib8000_write_word(state, 103, (agc->beta_mant << 6) | agc->beta_exp);
+
+       dprintk("WBD: ref: %d, sel: %d, active: %d, alpha: %d",
+               state->wbd_ref != 0 ? state->wbd_ref : agc->wbd_ref, agc->wbd_sel, !agc->perform_agc_softsplit, agc->wbd_sel);
+
+       /* AGC continued */
+       if (state->wbd_ref != 0)
+               dib8000_write_word(state, 106, state->wbd_ref);
+       else                    // use default
+               dib8000_write_word(state, 106, agc->wbd_ref);
+       dib8000_write_word(state, 107, (agc->wbd_alpha << 9) | (agc->perform_agc_softsplit << 8));
+       dib8000_write_word(state, 108, agc->agc1_max);
+       dib8000_write_word(state, 109, agc->agc1_min);
+       dib8000_write_word(state, 110, agc->agc2_max);
+       dib8000_write_word(state, 111, agc->agc2_min);
+       dib8000_write_word(state, 112, (agc->agc1_pt1 << 8) | agc->agc1_pt2);
+       dib8000_write_word(state, 113, (agc->agc1_slope1 << 8) | agc->agc1_slope2);
+       dib8000_write_word(state, 114, (agc->agc2_pt1 << 8) | agc->agc2_pt2);
+       dib8000_write_word(state, 115, (agc->agc2_slope1 << 8) | agc->agc2_slope2);
+
+       dib8000_write_word(state, 75, agc->agc1_pt3);
+       dib8000_write_word(state, 923, (dib8000_read_word(state, 923) & 0xffe3) | (agc->wbd_inv << 4) | (agc->wbd_sel << 2));   /*LB : 929 -> 923 */
+
+       return 0;
+}
+
+static int dib8000_agc_soft_split(struct dib8000_state *state)
+{
+       u16 agc, split_offset;
+
+       if (!state->current_agc || !state->current_agc->perform_agc_softsplit || state->current_agc->split.max == 0)
+               return FE_CALLBACK_TIME_NEVER;
+
+       // n_agc_global
+       agc = dib8000_read_word(state, 390);
+
+       if (agc > state->current_agc->split.min_thres)
+               split_offset = state->current_agc->split.min;
+       else if (agc < state->current_agc->split.max_thres)
+               split_offset = state->current_agc->split.max;
+       else
+               split_offset = state->current_agc->split.max *
+                   (agc - state->current_agc->split.min_thres) / (state->current_agc->split.max_thres - state->current_agc->split.min_thres);
+
+       dprintk("AGC split_offset: %d", split_offset);
+
+       // P_agc_force_split and P_agc_split_offset
+       dib8000_write_word(state, 107, (dib8000_read_word(state, 107) & 0xff00) | split_offset);
+       return 5000;
+}
+
+static int dib8000_agc_startup(struct dvb_frontend *fe)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       enum frontend_tune_state *tune_state = &state->tune_state;
+
+       int ret = 0;
+
+       switch (*tune_state) {
+       case CT_AGC_START:
+               // set power-up level: interf+analog+AGC
+
+               dib8000_set_adc_state(state, DIBX000_ADC_ON);
+
+               if (dib8000_set_agc_config(state, (unsigned char)(BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency / 1000))) != 0) {
+                       *tune_state = CT_AGC_STOP;
+                       state->status = FE_STATUS_TUNE_FAILED;
+                       break;
+               }
+
+               ret = 70;
+               *tune_state = CT_AGC_STEP_0;
+               break;
+
+       case CT_AGC_STEP_0:
+               //AGC initialization
+               if (state->cfg.agc_control)
+                       state->cfg.agc_control(&state->fe, 1);
+
+               dib8000_restart_agc(state);
+
+               // wait AGC rough lock time
+               ret = 50;
+               *tune_state = CT_AGC_STEP_1;
+               break;
+
+       case CT_AGC_STEP_1:
+               // wait AGC accurate lock time
+               ret = 70;
+
+               if (dib8000_update_lna(state))
+                       // wait only AGC rough lock time
+                       ret = 50;
+               else
+                       *tune_state = CT_AGC_STEP_2;
+               break;
+
+       case CT_AGC_STEP_2:
+               dib8000_agc_soft_split(state);
+
+               if (state->cfg.agc_control)
+                       state->cfg.agc_control(&state->fe, 0);
+
+               *tune_state = CT_AGC_STOP;
+               break;
+       default:
+               ret = dib8000_agc_soft_split(state);
+               break;
+       }
+       return ret;
+
+}
+
+static void dib8000_update_timf(struct dib8000_state *state)
+{
+       u32 timf = state->timf = dib8000_read32(state, 435);
+
+       dib8000_write_word(state, 29, (u16) (timf >> 16));
+       dib8000_write_word(state, 30, (u16) (timf & 0xffff));
+       dprintk("Updated timing frequency: %d (default: %d)", state->timf, state->timf_default);
+}
+
+static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8 autosearching)
+{
+       u16 mode, max_constellation, seg_diff_mask = 0, nbseg_diff = 0;
+       u8 guard, crate, constellation, timeI;
+       u8 permu_seg[] = { 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12 };
+       u16 i, coeff[4], P_cfr_left_edge = 0, P_cfr_right_edge = 0, seg_mask13 = 0x1fff;        // All 13 segments enabled
+       const s16 *ncoeff, *ana_fe;
+       u16 tmcc_pow = 0;
+       u16 coff_pow = 0x2800;
+       u16 init_prbs = 0xfff;
+       u16 ana_gain = 0;
+       u16 adc_target_16dB[11] = {
+               (1 << 13) - 825 - 117,
+               (1 << 13) - 837 - 117,
+               (1 << 13) - 811 - 117,
+               (1 << 13) - 766 - 117,
+               (1 << 13) - 737 - 117,
+               (1 << 13) - 693 - 117,
+               (1 << 13) - 648 - 117,
+               (1 << 13) - 619 - 117,
+               (1 << 13) - 575 - 117,
+               (1 << 13) - 531 - 117,
+               (1 << 13) - 501 - 117
+       };
+
+       if (state->ber_monitored_layer != LAYER_ALL)
+               dib8000_write_word(state, 285, (dib8000_read_word(state, 285) & 0x60) | state->ber_monitored_layer);
+       else
+               dib8000_write_word(state, 285, dib8000_read_word(state, 285) & 0x60);
+
+       i = dib8000_read_word(state, 26) & 1;   // P_dds_invspec
+       dib8000_write_word(state, 26, state->fe.dtv_property_cache.inversion ^ i);
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode) {
+               //compute new dds_freq for the seg and adjust prbs
+               int seg_offset =
+                   state->fe.dtv_property_cache.isdbt_sb_segment_idx - (state->fe.dtv_property_cache.isdbt_sb_segment_count / 2) -
+                   (state->fe.dtv_property_cache.isdbt_sb_segment_count % 2);
+               int clk = state->cfg.pll->internal;
+               u32 segtodds = ((u32) (430 << 23) / clk) << 3;  // segtodds = SegBW / Fclk * pow(2,26)
+               int dds_offset = seg_offset * segtodds;
+               int new_dds, sub_channel;
+               if ((state->fe.dtv_property_cache.isdbt_sb_segment_count % 2) == 0)     // if even
+                       dds_offset -= (int)(segtodds / 2);
+
+               if (state->cfg.pll->ifreq == 0) {
+                       if ((state->fe.dtv_property_cache.inversion ^ i) == 0) {
+                               dib8000_write_word(state, 26, dib8000_read_word(state, 26) | 1);
+                               new_dds = dds_offset;
+                       } else
+                               new_dds = dds_offset;
+
+                       // We shift tuning frequency if the wanted segment is :
+                       //  - the segment of center frequency with an odd total number of segments
+                       //  - the segment to the left of center frequency with an even total number of segments
+                       //  - the segment to the right of center frequency with an even total number of segments
+                       if ((state->fe.dtv_property_cache.delivery_system == SYS_ISDBT) && (state->fe.dtv_property_cache.isdbt_sb_mode == 1)
+                           &&
+                           (((state->fe.dtv_property_cache.isdbt_sb_segment_count % 2)
+                             && (state->fe.dtv_property_cache.isdbt_sb_segment_idx ==
+                                 ((state->fe.dtv_property_cache.isdbt_sb_segment_count / 2) + 1)))
+                            || (((state->fe.dtv_property_cache.isdbt_sb_segment_count % 2) == 0)
+                                && (state->fe.dtv_property_cache.isdbt_sb_segment_idx == (state->fe.dtv_property_cache.isdbt_sb_segment_count / 2)))
+                            || (((state->fe.dtv_property_cache.isdbt_sb_segment_count % 2) == 0)
+                                && (state->fe.dtv_property_cache.isdbt_sb_segment_idx ==
+                                    ((state->fe.dtv_property_cache.isdbt_sb_segment_count / 2) + 1)))
+                           )) {
+                               new_dds -= ((u32) (850 << 22) / clk) << 4;      // new_dds = 850 (freq shift in KHz) / Fclk * pow(2,26)
+                       }
+               } else {
+                       if ((state->fe.dtv_property_cache.inversion ^ i) == 0)
+                               new_dds = state->cfg.pll->ifreq - dds_offset;
+                       else
+                               new_dds = state->cfg.pll->ifreq + dds_offset;
+               }
+               dib8000_write_word(state, 27, (u16) ((new_dds >> 16) & 0x01ff));
+               dib8000_write_word(state, 28, (u16) (new_dds & 0xffff));
+               if (state->fe.dtv_property_cache.isdbt_sb_segment_count % 2)    // if odd
+                       sub_channel = ((state->fe.dtv_property_cache.isdbt_sb_subchannel + (3 * seg_offset) + 1) % 41) / 3;
+               else            // if even
+                       sub_channel = ((state->fe.dtv_property_cache.isdbt_sb_subchannel + (3 * seg_offset)) % 41) / 3;
+               sub_channel -= 6;
+
+               if (state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_2K
+                   || state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_4K) {
+                       dib8000_write_word(state, 219, dib8000_read_word(state, 219) | 0x1);    //adp_pass =1
+                       dib8000_write_word(state, 190, dib8000_read_word(state, 190) | (0x1 << 14));    //pha3_force_pha_shift = 1
+               } else {
+                       dib8000_write_word(state, 219, dib8000_read_word(state, 219) & 0xfffe); //adp_pass =0
+                       dib8000_write_word(state, 190, dib8000_read_word(state, 190) & 0xbfff); //pha3_force_pha_shift = 0
+               }
+
+               switch (state->fe.dtv_property_cache.transmission_mode) {
+               case TRANSMISSION_MODE_2K:
+                       switch (sub_channel) {
+                       case -6:
+                               init_prbs = 0x0;
+                               break;  // 41, 0, 1
+                       case -5:
+                               init_prbs = 0x423;
+                               break;  // 02~04
+                       case -4:
+                               init_prbs = 0x9;
+                               break;  // 05~07
+                       case -3:
+                               init_prbs = 0x5C7;
+                               break;  // 08~10
+                       case -2:
+                               init_prbs = 0x7A6;
+                               break;  // 11~13
+                       case -1:
+                               init_prbs = 0x3D8;
+                               break;  // 14~16
+                       case 0:
+                               init_prbs = 0x527;
+                               break;  // 17~19
+                       case 1:
+                               init_prbs = 0x7FF;
+                               break;  // 20~22
+                       case 2:
+                               init_prbs = 0x79B;
+                               break;  // 23~25
+                       case 3:
+                               init_prbs = 0x3D6;
+                               break;  // 26~28
+                       case 4:
+                               init_prbs = 0x3A2;
+                               break;  // 29~31
+                       case 5:
+                               init_prbs = 0x53B;
+                               break;  // 32~34
+                       case 6:
+                               init_prbs = 0x2F4;
+                               break;  // 35~37
+                       default:
+                       case 7:
+                               init_prbs = 0x213;
+                               break;  // 38~40
+                       }
+                       break;
+
+               case TRANSMISSION_MODE_4K:
+                       switch (sub_channel) {
+                       case -6:
+                               init_prbs = 0x0;
+                               break;  // 41, 0, 1
+                       case -5:
+                               init_prbs = 0x208;
+                               break;  // 02~04
+                       case -4:
+                               init_prbs = 0xC3;
+                               break;  // 05~07
+                       case -3:
+                               init_prbs = 0x7B9;
+                               break;  // 08~10
+                       case -2:
+                               init_prbs = 0x423;
+                               break;  // 11~13
+                       case -1:
+                               init_prbs = 0x5C7;
+                               break;  // 14~16
+                       case 0:
+                               init_prbs = 0x3D8;
+                               break;  // 17~19
+                       case 1:
+                               init_prbs = 0x7FF;
+                               break;  // 20~22
+                       case 2:
+                               init_prbs = 0x3D6;
+                               break;  // 23~25
+                       case 3:
+                               init_prbs = 0x53B;
+                               break;  // 26~28
+                       case 4:
+                               init_prbs = 0x213;
+                               break;  // 29~31
+                       case 5:
+                               init_prbs = 0x29;
+                               break;  // 32~34
+                       case 6:
+                               init_prbs = 0xD0;
+                               break;  // 35~37
+                       default:
+                       case 7:
+                               init_prbs = 0x48E;
+                               break;  // 38~40
+                       }
+                       break;
+
+               default:
+               case TRANSMISSION_MODE_8K:
+                       switch (sub_channel) {
+                       case -6:
+                               init_prbs = 0x0;
+                               break;  // 41, 0, 1
+                       case -5:
+                               init_prbs = 0x740;
+                               break;  // 02~04
+                       case -4:
+                               init_prbs = 0x069;
+                               break;  // 05~07
+                       case -3:
+                               init_prbs = 0x7DD;
+                               break;  // 08~10
+                       case -2:
+                               init_prbs = 0x208;
+                               break;  // 11~13
+                       case -1:
+                               init_prbs = 0x7B9;
+                               break;  // 14~16
+                       case 0:
+                               init_prbs = 0x5C7;
+                               break;  // 17~19
+                       case 1:
+                               init_prbs = 0x7FF;
+                               break;  // 20~22
+                       case 2:
+                               init_prbs = 0x53B;
+                               break;  // 23~25
+                       case 3:
+                               init_prbs = 0x29;
+                               break;  // 26~28
+                       case 4:
+                               init_prbs = 0x48E;
+                               break;  // 29~31
+                       case 5:
+                               init_prbs = 0x4C4;
+                               break;  // 32~34
+                       case 6:
+                               init_prbs = 0x367;
+                               break;  // 33~37
+                       default:
+                       case 7:
+                               init_prbs = 0x684;
+                               break;  // 38~40
+                       }
+                       break;
+               }
+       } else {                // if not state->fe.dtv_property_cache.isdbt_sb_mode
+               dib8000_write_word(state, 27, (u16) ((state->cfg.pll->ifreq >> 16) & 0x01ff));
+               dib8000_write_word(state, 28, (u16) (state->cfg.pll->ifreq & 0xffff));
+               dib8000_write_word(state, 26, (u16) ((state->cfg.pll->ifreq >> 25) & 0x0003));
+       }
+       /*P_mode == ?? */
+       dib8000_write_word(state, 10, (seq << 4));
+       //  dib8000_write_word(state, 287, (dib8000_read_word(state, 287) & 0xe000) | 0x1000);
+
+       switch (state->fe.dtv_property_cache.guard_interval) {
+       case GUARD_INTERVAL_1_32:
+               guard = 0;
+               break;
+       case GUARD_INTERVAL_1_16:
+               guard = 1;
+               break;
+       case GUARD_INTERVAL_1_8:
+               guard = 2;
+               break;
+       case GUARD_INTERVAL_1_4:
+       default:
+               guard = 3;
+               break;
+       }
+
+       dib8000_write_word(state, 1, (init_prbs << 2) | (guard & 0x3)); // ADDR 1
+
+       max_constellation = DQPSK;
+       for (i = 0; i < 3; i++) {
+               switch (state->fe.dtv_property_cache.layer[i].modulation) {
+               case DQPSK:
+                       constellation = 0;
+                       break;
+               case QPSK:
+                       constellation = 1;
+                       break;
+               case QAM_16:
+                       constellation = 2;
+                       break;
+               case QAM_64:
+               default:
+                       constellation = 3;
+                       break;
+               }
+
+               switch (state->fe.dtv_property_cache.layer[i].fec) {
+               case FEC_1_2:
+                       crate = 1;
+                       break;
+               case FEC_2_3:
+                       crate = 2;
+                       break;
+               case FEC_3_4:
+                       crate = 3;
+                       break;
+               case FEC_5_6:
+                       crate = 5;
+                       break;
+               case FEC_7_8:
+               default:
+                       crate = 7;
+                       break;
+               }
+
+               if ((state->fe.dtv_property_cache.layer[i].interleaving > 0) &&
+                   ((state->fe.dtv_property_cache.layer[i].interleaving <= 3) ||
+                    (state->fe.dtv_property_cache.layer[i].interleaving == 4 && state->fe.dtv_property_cache.isdbt_sb_mode == 1))
+                   )
+                       timeI = state->fe.dtv_property_cache.layer[i].interleaving;
+               else
+                       timeI = 0;
+               dib8000_write_word(state, 2 + i, (constellation << 10) | ((state->fe.dtv_property_cache.layer[i].segment_count & 0xf) << 6) |
+                                  (crate << 3) | timeI);
+               if (state->fe.dtv_property_cache.layer[i].segment_count > 0) {
+                       switch (max_constellation) {
+                       case DQPSK:
+                       case QPSK:
+                               if (state->fe.dtv_property_cache.layer[i].modulation == QAM_16 ||
+                                   state->fe.dtv_property_cache.layer[i].modulation == QAM_64)
+                                       max_constellation = state->fe.dtv_property_cache.layer[i].modulation;
+                               break;
+                       case QAM_16:
+                               if (state->fe.dtv_property_cache.layer[i].modulation == QAM_64)
+                                       max_constellation = state->fe.dtv_property_cache.layer[i].modulation;
+                               break;
+                       }
+               }
+       }
+
+       mode = fft_to_mode(state);
+
+       //dib8000_write_word(state, 5, 13); /*p_last_seg = 13*/
+
+       dib8000_write_word(state, 274, (dib8000_read_word(state, 274) & 0xffcf) |
+                          ((state->fe.dtv_property_cache.isdbt_partial_reception & 1) << 5) | ((state->fe.dtv_property_cache.
+                                                                                                isdbt_sb_mode & 1) << 4));
+
+       dprintk("mode = %d ; guard = %d", mode, state->fe.dtv_property_cache.guard_interval);
+
+       /* signal optimization parameter */
+
+       if (state->fe.dtv_property_cache.isdbt_partial_reception) {
+               seg_diff_mask = (state->fe.dtv_property_cache.layer[0].modulation == DQPSK) << permu_seg[0];
+               for (i = 1; i < 3; i++)
+                       nbseg_diff +=
+                           (state->fe.dtv_property_cache.layer[i].modulation == DQPSK) * state->fe.dtv_property_cache.layer[i].segment_count;
+               for (i = 0; i < nbseg_diff; i++)
+                       seg_diff_mask |= 1 << permu_seg[i + 1];
+       } else {
+               for (i = 0; i < 3; i++)
+                       nbseg_diff +=
+                           (state->fe.dtv_property_cache.layer[i].modulation == DQPSK) * state->fe.dtv_property_cache.layer[i].segment_count;
+               for (i = 0; i < nbseg_diff; i++)
+                       seg_diff_mask |= 1 << permu_seg[i];
+       }
+       dprintk("nbseg_diff = %X (%d)", seg_diff_mask, seg_diff_mask);
+
+       state->differential_constellation = (seg_diff_mask != 0);
+       dib8000_set_diversity_in(&state->fe, state->diversity_onoff);
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {  // ISDB-Tsb
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 1)  // 3-segments
+                       seg_mask13 = 0x00E0;
+               else            // 1-segment
+                       seg_mask13 = 0x0040;
+       } else
+               seg_mask13 = 0x1fff;
+
+       // WRITE: Mode & Diff mask
+       dib8000_write_word(state, 0, (mode << 13) | seg_diff_mask);
+
+       if ((seg_diff_mask) || (state->fe.dtv_property_cache.isdbt_sb_mode))
+               dib8000_write_word(state, 268, (dib8000_read_word(state, 268) & 0xF9FF) | 0x0200);
+       else
+               dib8000_write_word(state, 268, (2 << 9) | 39);  //init value
+
+       // ---- SMALL ----
+       // P_small_seg_diff
+       dib8000_write_word(state, 352, seg_diff_mask);  // ADDR 352
+
+       dib8000_write_word(state, 353, seg_mask13);     // ADDR 353
+
+/*     // P_small_narrow_band=0, P_small_last_seg=13, P_small_offset_num_car=5 */
+       // dib8000_write_word(state, 351, (state->fe.dtv_property_cache.isdbt_sb_mode << 8) | (13 << 4) | 5 );
+
+       // ---- SMALL ----
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {
+               switch (state->fe.dtv_property_cache.transmission_mode) {
+               case TRANSMISSION_MODE_2K:
+                       if (state->fe.dtv_property_cache.isdbt_partial_reception == 0) {        // 1-seg
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK)  // DQPSK
+                                       ncoeff = coeff_2k_sb_1seg_dqpsk;
+                               else    // QPSK or QAM
+                                       ncoeff = coeff_2k_sb_1seg;
+                       } else {        // 3-segments
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK) {        // DQPSK on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK)  // DQPSK on external segments
+                                               ncoeff = coeff_2k_sb_3seg_0dqpsk_1dqpsk;
+                                       else    // QPSK or QAM on external segments
+                                               ncoeff = coeff_2k_sb_3seg_0dqpsk;
+                               } else {        // QPSK or QAM on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK)  // DQPSK on external segments
+                                               ncoeff = coeff_2k_sb_3seg_1dqpsk;
+                                       else    // QPSK or QAM on external segments
+                                               ncoeff = coeff_2k_sb_3seg;
+                               }
+                       }
+                       break;
+
+               case TRANSMISSION_MODE_4K:
+                       if (state->fe.dtv_property_cache.isdbt_partial_reception == 0) {        // 1-seg
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK)  // DQPSK
+                                       ncoeff = coeff_4k_sb_1seg_dqpsk;
+                               else    // QPSK or QAM
+                                       ncoeff = coeff_4k_sb_1seg;
+                       } else {        // 3-segments
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK) {        // DQPSK on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK) {        // DQPSK on external segments
+                                               ncoeff = coeff_4k_sb_3seg_0dqpsk_1dqpsk;
+                                       } else {        // QPSK or QAM on external segments
+                                               ncoeff = coeff_4k_sb_3seg_0dqpsk;
+                                       }
+                               } else {        // QPSK or QAM on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK) {        // DQPSK on external segments
+                                               ncoeff = coeff_4k_sb_3seg_1dqpsk;
+                                       } else  // QPSK or QAM on external segments
+                                               ncoeff = coeff_4k_sb_3seg;
+                               }
+                       }
+                       break;
+
+               case TRANSMISSION_MODE_AUTO:
+               case TRANSMISSION_MODE_8K:
+               default:
+                       if (state->fe.dtv_property_cache.isdbt_partial_reception == 0) {        // 1-seg
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK)  // DQPSK
+                                       ncoeff = coeff_8k_sb_1seg_dqpsk;
+                               else    // QPSK or QAM
+                                       ncoeff = coeff_8k_sb_1seg;
+                       } else {        // 3-segments
+                               if (state->fe.dtv_property_cache.layer[0].modulation == DQPSK) {        // DQPSK on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK) {        // DQPSK on external segments
+                                               ncoeff = coeff_8k_sb_3seg_0dqpsk_1dqpsk;
+                                       } else {        // QPSK or QAM on external segments
+                                               ncoeff = coeff_8k_sb_3seg_0dqpsk;
+                                       }
+                               } else {        // QPSK or QAM on central segment
+                                       if (state->fe.dtv_property_cache.layer[1].modulation == DQPSK) {        // DQPSK on external segments
+                                               ncoeff = coeff_8k_sb_3seg_1dqpsk;
+                                       } else  // QPSK or QAM on external segments
+                                               ncoeff = coeff_8k_sb_3seg;
+                               }
+                       }
+                       break;
+               }
+       }
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1)
+               for (i = 0; i < 8; i++)
+                       dib8000_write_word(state, 343 + i, ncoeff[i]);
+
+       // P_small_coef_ext_enable=ISDB-Tsb, P_small_narrow_band=ISDB-Tsb, P_small_last_seg=13, P_small_offset_num_car=5
+       dib8000_write_word(state, 351,
+                          (state->fe.dtv_property_cache.isdbt_sb_mode << 9) | (state->fe.dtv_property_cache.isdbt_sb_mode << 8) | (13 << 4) | 5);
+
+       // ---- COFF ----
+       // Carloff, the most robust
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {  // Sound Broadcasting mode - use both TMCC and AC pilots
+
+               // P_coff_cpil_alpha=4, P_coff_inh=0, P_coff_cpil_winlen=64
+               // P_coff_narrow_band=1, P_coff_square_val=1, P_coff_one_seg=~partial_rcpt, P_coff_use_tmcc=1, P_coff_use_ac=1
+               dib8000_write_word(state, 187,
+                                  (4 << 12) | (0 << 11) | (63 << 5) | (0x3 << 3) | ((~state->fe.dtv_property_cache.isdbt_partial_reception & 1) << 2)
+                                  | 0x3);
+
+/*             // P_small_coef_ext_enable = 1 */
+/*             dib8000_write_word(state, 351, dib8000_read_word(state, 351) | 0x200); */
+
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 0) {        // Sound Broadcasting mode 1 seg
+
+                       // P_coff_winlen=63, P_coff_thres_lock=15, P_coff_one_seg_width= (P_mode == 3) , P_coff_one_seg_sym= (P_mode-1)
+                       if (mode == 3)
+                               dib8000_write_word(state, 180, 0x1fcf | ((mode - 1) << 14));
+                       else
+                               dib8000_write_word(state, 180, 0x0fcf | ((mode - 1) << 14));
+                       // P_ctrl_corm_thres4pre_freq_inh=1,P_ctrl_pre_freq_mode_sat=1,
+                       // P_ctrl_pre_freq_inh=0, P_ctrl_pre_freq_step = 5, P_pre_freq_win_len=4
+                       dib8000_write_word(state, 338, (1 << 12) | (1 << 10) | (0 << 9) | (5 << 5) | 4);
+                       // P_ctrl_pre_freq_win_len=16, P_ctrl_pre_freq_thres_lockin=8
+                       dib8000_write_word(state, 340, (16 << 6) | (8 << 0));
+                       // P_ctrl_pre_freq_thres_lockout=6, P_small_use_tmcc/ac/cp=1
+                       dib8000_write_word(state, 341, (6 << 3) | (1 << 2) | (1 << 1) | (1 << 0));
+
+                       // P_coff_corthres_8k, 4k, 2k and P_coff_cpilthres_8k, 4k, 2k
+                       dib8000_write_word(state, 181, 300);
+                       dib8000_write_word(state, 182, 150);
+                       dib8000_write_word(state, 183, 80);
+                       dib8000_write_word(state, 184, 300);
+                       dib8000_write_word(state, 185, 150);
+                       dib8000_write_word(state, 186, 80);
+               } else {        // Sound Broadcasting mode 3 seg
+                       // P_coff_one_seg_sym= 1, P_coff_one_seg_width= 1, P_coff_winlen=63, P_coff_thres_lock=15
+                       /*                 if (mode == 3) */
+                       /*                     dib8000_write_word(state, 180, 0x2fca | ((0) << 14)); */
+                       /*                 else */
+                       /*                     dib8000_write_word(state, 180, 0x2fca | ((1) << 14)); */
+                       dib8000_write_word(state, 180, 0x1fcf | (1 << 14));
+
+                       // P_ctrl_corm_thres4pre_freq_inh = 1, P_ctrl_pre_freq_mode_sat=1,
+                       // P_ctrl_pre_freq_inh=0, P_ctrl_pre_freq_step = 4, P_pre_freq_win_len=4
+                       dib8000_write_word(state, 338, (1 << 12) | (1 << 10) | (0 << 9) | (4 << 5) | 4);
+                       // P_ctrl_pre_freq_win_len=16, P_ctrl_pre_freq_thres_lockin=8
+                       dib8000_write_word(state, 340, (16 << 6) | (8 << 0));
+                       //P_ctrl_pre_freq_thres_lockout=6, P_small_use_tmcc/ac/cp=1
+                       dib8000_write_word(state, 341, (6 << 3) | (1 << 2) | (1 << 1) | (1 << 0));
+
+                       // P_coff_corthres_8k, 4k, 2k and P_coff_cpilthres_8k, 4k, 2k
+                       dib8000_write_word(state, 181, 350);
+                       dib8000_write_word(state, 182, 300);
+                       dib8000_write_word(state, 183, 250);
+                       dib8000_write_word(state, 184, 350);
+                       dib8000_write_word(state, 185, 300);
+                       dib8000_write_word(state, 186, 250);
+               }
+
+       } else if (state->isdbt_cfg_loaded == 0) {      // if not Sound Broadcasting mode : put default values for 13 segments
+               dib8000_write_word(state, 180, (16 << 6) | 9);
+               dib8000_write_word(state, 187, (4 << 12) | (8 << 5) | 0x2);
+               coff_pow = 0x2800;
+               for (i = 0; i < 6; i++)
+                       dib8000_write_word(state, 181 + i, coff_pow);
+
+               // P_ctrl_corm_thres4pre_freq_inh=1, P_ctrl_pre_freq_mode_sat=1,
+               // P_ctrl_pre_freq_mode_sat=1, P_ctrl_pre_freq_inh=0, P_ctrl_pre_freq_step = 3, P_pre_freq_win_len=1
+               dib8000_write_word(state, 338, (1 << 12) | (1 << 10) | (0 << 9) | (3 << 5) | 1);
+
+               // P_ctrl_pre_freq_win_len=8, P_ctrl_pre_freq_thres_lockin=6
+               dib8000_write_word(state, 340, (8 << 6) | (6 << 0));
+               // P_ctrl_pre_freq_thres_lockout=4, P_small_use_tmcc/ac/cp=1
+               dib8000_write_word(state, 341, (4 << 3) | (1 << 2) | (1 << 1) | (1 << 0));
+       }
+       // ---- FFT ----
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1 && state->fe.dtv_property_cache.isdbt_partial_reception == 0)       // 1-seg
+               dib8000_write_word(state, 178, 64);     // P_fft_powrange=64
+       else
+               dib8000_write_word(state, 178, 32);     // P_fft_powrange=32
+
+       /* make the cpil_coff_lock more robust but slower p_coff_winlen
+        * 6bits; p_coff_thres_lock 6bits (for coff lock if needed)
+        */
+       /* if ( ( nbseg_diff>0)&&(nbseg_diff<13))
+          dib8000_write_word(state, 187, (dib8000_read_word(state, 187) & 0xfffb) | (1 << 3)); */
+
+       dib8000_write_word(state, 189, ~seg_mask13 | seg_diff_mask);    /* P_lmod4_seg_inh       */
+       dib8000_write_word(state, 192, ~seg_mask13 | seg_diff_mask);    /* P_pha3_seg_inh        */
+       dib8000_write_word(state, 225, ~seg_mask13 | seg_diff_mask);    /* P_tac_seg_inh         */
+       if ((!state->fe.dtv_property_cache.isdbt_sb_mode) && (state->cfg.pll->ifreq == 0))
+               dib8000_write_word(state, 266, ~seg_mask13 | seg_diff_mask | 0x40);     /* P_equal_noise_seg_inh */
+       else
+               dib8000_write_word(state, 266, ~seg_mask13 | seg_diff_mask);    /* P_equal_noise_seg_inh */
+       dib8000_write_word(state, 287, ~seg_mask13 | 0x1000);   /* P_tmcc_seg_inh        */
+       //dib8000_write_word(state, 288, ~seg_mask13 | seg_diff_mask); /* P_tmcc_seg_eq_inh */
+       if (!autosearching)
+               dib8000_write_word(state, 288, (~seg_mask13 | seg_diff_mask) & 0x1fff); /* P_tmcc_seg_eq_inh */
+       else
+               dib8000_write_word(state, 288, 0x1fff); //disable equalisation of the tmcc when autosearch to be able to find the DQPSK channels.
+       dprintk("287 = %X (%d)", ~seg_mask13 | 0x1000, ~seg_mask13 | 0x1000);
+
+       dib8000_write_word(state, 211, seg_mask13 & (~seg_diff_mask));  /* P_des_seg_enabled     */
+
+       /* offset loop parameters */
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 0)  // Sound Broadcasting mode 1 seg
+                       /* P_timf_alpha = (11-P_mode), P_corm_alpha=6, P_corm_thres=0x80 */
+                       dib8000_write_word(state, 32, ((11 - mode) << 12) | (6 << 8) | 0x40);
+
+               else            // Sound Broadcasting mode 3 seg
+                       /* P_timf_alpha = (10-P_mode), P_corm_alpha=6, P_corm_thres=0x80 */
+                       dib8000_write_word(state, 32, ((10 - mode) << 12) | (6 << 8) | 0x60);
+       } else
+               // TODO in 13 seg, timf_alpha can always be the same or not ?
+               /* P_timf_alpha = (9-P_mode, P_corm_alpha=6, P_corm_thres=0x80 */
+               dib8000_write_word(state, 32, ((9 - mode) << 12) | (6 << 8) | 0x80);
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 0)  // Sound Broadcasting mode 1 seg
+                       /* P_ctrl_pha_off_max=3   P_ctrl_sfreq_inh =0  P_ctrl_sfreq_step = (11-P_mode)  */
+                       dib8000_write_word(state, 37, (3 << 5) | (0 << 4) | (10 - mode));
+
+               else            // Sound Broadcasting mode 3 seg
+                       /* P_ctrl_pha_off_max=3   P_ctrl_sfreq_inh =0  P_ctrl_sfreq_step = (10-P_mode)  */
+                       dib8000_write_word(state, 37, (3 << 5) | (0 << 4) | (9 - mode));
+       } else
+               /* P_ctrl_pha_off_max=3   P_ctrl_sfreq_inh =0  P_ctrl_sfreq_step = 9  */
+               dib8000_write_word(state, 37, (3 << 5) | (0 << 4) | (8 - mode));
+
+       /* P_dvsy_sync_wait - reuse mode */
+       switch (state->fe.dtv_property_cache.transmission_mode) {
+       case TRANSMISSION_MODE_8K:
+               mode = 256;
+               break;
+       case TRANSMISSION_MODE_4K:
+               mode = 128;
+               break;
+       default:
+       case TRANSMISSION_MODE_2K:
+               mode = 64;
+               break;
+       }
+       if (state->cfg.diversity_delay == 0)
+               mode = (mode * (1 << (guard)) * 3) / 2 + 48;    // add 50% SFN margin + compensate for one DVSY-fifo
+       else
+               mode = (mode * (1 << (guard)) * 3) / 2 + state->cfg.diversity_delay;    // add 50% SFN margin + compensate for DVSY-fifo
+       mode <<= 4;
+       dib8000_write_word(state, 273, (dib8000_read_word(state, 273) & 0x000f) | mode);
+
+       /* channel estimation fine configuration */
+       switch (max_constellation) {
+       case QAM_64:
+               ana_gain = 0x7; // -1 : avoid def_est saturation when ADC target is -16dB
+               coeff[0] = 0x0148;      /* P_adp_regul_cnt 0.04 */
+               coeff[1] = 0xfff0;      /* P_adp_noise_cnt -0.002 */
+               coeff[2] = 0x00a4;      /* P_adp_regul_ext 0.02 */
+               coeff[3] = 0xfff8;      /* P_adp_noise_ext -0.001 */
+               //if (!state->cfg.hostbus_diversity) //if diversity, we should prehaps use the configuration of the max_constallation -1
+               break;
+       case QAM_16:
+               ana_gain = 0x7; // -1 : avoid def_est saturation when ADC target is -16dB
+               coeff[0] = 0x023d;      /* P_adp_regul_cnt 0.07 */
+               coeff[1] = 0xffdf;      /* P_adp_noise_cnt -0.004 */
+               coeff[2] = 0x00a4;      /* P_adp_regul_ext 0.02 */
+               coeff[3] = 0xfff0;      /* P_adp_noise_ext -0.002 */
+               //if (!((state->cfg.hostbus_diversity) && (max_constellation == QAM_16)))
+               break;
+       default:
+               ana_gain = 0;   // 0 : goes along with ADC target at -22dB to keep good mobile performance and lock at sensitivity level
+               coeff[0] = 0x099a;      /* P_adp_regul_cnt 0.3 */
+               coeff[1] = 0xffae;      /* P_adp_noise_cnt -0.01 */
+               coeff[2] = 0x0333;      /* P_adp_regul_ext 0.1 */
+               coeff[3] = 0xfff8;      /* P_adp_noise_ext -0.002 */
+               break;
+       }
+       for (mode = 0; mode < 4; mode++)
+               dib8000_write_word(state, 215 + mode, coeff[mode]);
+
+       // update ana_gain depending on max constellation
+       dib8000_write_word(state, 116, ana_gain);
+       // update ADC target depending on ana_gain
+       if (ana_gain) {         // set -16dB ADC target for ana_gain=-1
+               for (i = 0; i < 10; i++)
+                       dib8000_write_word(state, 80 + i, adc_target_16dB[i]);
+       } else {                // set -22dB ADC target for ana_gain=0
+               for (i = 0; i < 10; i++)
+                       dib8000_write_word(state, 80 + i, adc_target_16dB[i] - 355);
+       }
+
+       // ---- ANA_FE ----
+       if (state->fe.dtv_property_cache.isdbt_sb_mode) {
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 1)  // 3-segments
+                       ana_fe = ana_fe_coeff_3seg;
+               else            // 1-segment
+                       ana_fe = ana_fe_coeff_1seg;
+       } else
+               ana_fe = ana_fe_coeff_13seg;
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1 || state->isdbt_cfg_loaded == 0)
+               for (mode = 0; mode < 24; mode++)
+                       dib8000_write_word(state, 117 + mode, ana_fe[mode]);
+
+       // ---- CHAN_BLK ----
+       for (i = 0; i < 13; i++) {
+               if ((((~seg_diff_mask) >> i) & 1) == 1) {
+                       P_cfr_left_edge += (1 << i) * ((i == 0) || ((((seg_mask13 & (~seg_diff_mask)) >> (i - 1)) & 1) == 0));
+                       P_cfr_right_edge += (1 << i) * ((i == 12) || ((((seg_mask13 & (~seg_diff_mask)) >> (i + 1)) & 1) == 0));
+               }
+       }
+       dib8000_write_word(state, 222, P_cfr_left_edge);        // P_cfr_left_edge
+       dib8000_write_word(state, 223, P_cfr_right_edge);       // P_cfr_right_edge
+       // "P_cspu_left_edge"  not used => do not care
+       // "P_cspu_right_edge" not used => do not care
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {  // ISDB-Tsb
+               dib8000_write_word(state, 228, 1);      // P_2d_mode_byp=1
+               dib8000_write_word(state, 205, dib8000_read_word(state, 205) & 0xfff0); // P_cspu_win_cut = 0
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 0   // 1-segment
+                   && state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_2K) {
+                       //dib8000_write_word(state, 219, dib8000_read_word(state, 219) & 0xfffe); // P_adp_pass = 0
+                       dib8000_write_word(state, 265, 15);     // P_equal_noise_sel = 15
+               }
+       } else if (state->isdbt_cfg_loaded == 0) {
+               dib8000_write_word(state, 228, 0);      // default value
+               dib8000_write_word(state, 265, 31);     // default value
+               dib8000_write_word(state, 205, 0x200f); // init value
+       }
+       // ---- TMCC ----
+       for (i = 0; i < 3; i++)
+               tmcc_pow +=
+                   (((state->fe.dtv_property_cache.layer[i].modulation == DQPSK) * 4 + 1) * state->fe.dtv_property_cache.layer[i].segment_count);
+       // Quantif of "P_tmcc_dec_thres_?k" is (0, 5+mode, 9);
+       // Threshold is set at 1/4 of max power.
+       tmcc_pow *= (1 << (9 - 2));
+
+       dib8000_write_word(state, 290, tmcc_pow);       // P_tmcc_dec_thres_2k
+       dib8000_write_word(state, 291, tmcc_pow);       // P_tmcc_dec_thres_4k
+       dib8000_write_word(state, 292, tmcc_pow);       // P_tmcc_dec_thres_8k
+       //dib8000_write_word(state, 287, (1 << 13) | 0x1000 );
+       // ---- PHA3 ----
+
+       if (state->isdbt_cfg_loaded == 0)
+               dib8000_write_word(state, 250, 3285);   /*p_2d_hspeed_thr0 */
+
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1)
+               state->isdbt_cfg_loaded = 0;
+       else
+               state->isdbt_cfg_loaded = 1;
+
+}
+
+static int dib8000_autosearch_start(struct dvb_frontend *fe)
+{
+       u8 factor;
+       u32 value;
+       struct dib8000_state *state = fe->demodulator_priv;
+
+       int slist = 0;
+
+       state->fe.dtv_property_cache.inversion = 0;
+       if (!state->fe.dtv_property_cache.isdbt_sb_mode)
+               state->fe.dtv_property_cache.layer[0].segment_count = 13;
+       state->fe.dtv_property_cache.layer[0].modulation = QAM_64;
+       state->fe.dtv_property_cache.layer[0].fec = FEC_2_3;
+       state->fe.dtv_property_cache.layer[0].interleaving = 0;
+
+       //choose the right list, in sb, always do everything
+       if (state->fe.dtv_property_cache.isdbt_sb_mode) {
+               state->fe.dtv_property_cache.transmission_mode = TRANSMISSION_MODE_8K;
+               state->fe.dtv_property_cache.guard_interval = GUARD_INTERVAL_1_8;
+               slist = 7;
+               dib8000_write_word(state, 0, (dib8000_read_word(state, 0) & 0x9fff) | (1 << 13));
+       } else {
+               if (state->fe.dtv_property_cache.guard_interval == GUARD_INTERVAL_AUTO) {
+                       if (state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO) {
+                               slist = 7;
+                               dib8000_write_word(state, 0, (dib8000_read_word(state, 0) & 0x9fff) | (1 << 13));       // P_mode = 1 to have autosearch start ok with mode2
+                       } else
+                               slist = 3;
+               } else {
+                       if (state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO) {
+                               slist = 2;
+                               dib8000_write_word(state, 0, (dib8000_read_word(state, 0) & 0x9fff) | (1 << 13));       // P_mode = 1
+                       } else
+                               slist = 0;
+               }
+
+               if (state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO)
+                       state->fe.dtv_property_cache.transmission_mode = TRANSMISSION_MODE_8K;
+               if (state->fe.dtv_property_cache.guard_interval == GUARD_INTERVAL_AUTO)
+                       state->fe.dtv_property_cache.guard_interval = GUARD_INTERVAL_1_8;
+
+               dprintk("using list for autosearch : %d", slist);
+               dib8000_set_channel(state, (unsigned char)slist, 1);
+               //dib8000_write_word(state, 0, (dib8000_read_word(state, 0) & 0x9fff) | (1 << 13));  // P_mode = 1
+
+               factor = 1;
+
+               //set lock_mask values
+               dib8000_write_word(state, 6, 0x4);
+               dib8000_write_word(state, 7, 0x8);
+               dib8000_write_word(state, 8, 0x1000);
+
+               //set lock_mask wait time values
+               value = 50 * state->cfg.pll->internal * factor;
+               dib8000_write_word(state, 11, (u16) ((value >> 16) & 0xffff));  // lock0 wait time
+               dib8000_write_word(state, 12, (u16) (value & 0xffff));  // lock0 wait time
+               value = 100 * state->cfg.pll->internal * factor;
+               dib8000_write_word(state, 13, (u16) ((value >> 16) & 0xffff));  // lock1 wait time
+               dib8000_write_word(state, 14, (u16) (value & 0xffff));  // lock1 wait time
+               value = 1000 * state->cfg.pll->internal * factor;
+               dib8000_write_word(state, 15, (u16) ((value >> 16) & 0xffff));  // lock2 wait time
+               dib8000_write_word(state, 16, (u16) (value & 0xffff));  // lock2 wait time
+
+               value = dib8000_read_word(state, 0);
+               dib8000_write_word(state, 0, (u16) ((1 << 15) | value));
+               dib8000_read_word(state, 1284); // reset the INT. n_irq_pending
+               dib8000_write_word(state, 0, (u16) value);
+
+       }
+
+       return 0;
+}
+
+static int dib8000_autosearch_irq(struct dvb_frontend *fe)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 irq_pending = dib8000_read_word(state, 1284);
+
+       if (irq_pending & 0x1) {        // failed
+               dprintk("dib8000_autosearch_irq failed");
+               return 1;
+       }
+
+       if (irq_pending & 0x2) {        // succeeded
+               dprintk("dib8000_autosearch_irq succeeded");
+               return 2;
+       }
+
+       return 0;               // still pending
+}
+
+static int dib8000_tune(struct dvb_frontend *fe)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       int ret = 0;
+       u16 value, mode = fft_to_mode(state);
+
+       // we are already tuned - just resuming from suspend
+       if (state == NULL)
+               return -EINVAL;
+
+       dib8000_set_bandwidth(state, state->fe.dtv_property_cache.bandwidth_hz / 1000);
+       dib8000_set_channel(state, 0, 0);
+
+       // restart demod
+       ret |= dib8000_write_word(state, 770, 0x4000);
+       ret |= dib8000_write_word(state, 770, 0x0000);
+       msleep(45);
+
+       /* P_ctrl_inh_cor=0, P_ctrl_alpha_cor=4, P_ctrl_inh_isi=0, P_ctrl_alpha_isi=3 */
+       /*  ret |= dib8000_write_word(state, 29, (0 << 9) | (4 << 5) | (0 << 4) | (3 << 0) );  workaround inh_isi stays at 1 */
+
+       // never achieved a lock before - wait for timfreq to update
+       if (state->timf == 0) {
+               if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {
+                       if (state->fe.dtv_property_cache.isdbt_partial_reception == 0)  // Sound Broadcasting mode 1 seg
+                               msleep(300);
+                       else    // Sound Broadcasting mode 3 seg
+                               msleep(500);
+               } else          // 13 seg
+                       msleep(200);
+       }
+       //dump_reg(state);
+       if (state->fe.dtv_property_cache.isdbt_sb_mode == 1) {
+               if (state->fe.dtv_property_cache.isdbt_partial_reception == 0) {        // Sound Broadcasting mode 1 seg
+
+                       /* P_timf_alpha = (13-P_mode) , P_corm_alpha=6, P_corm_thres=0x40  alpha to check on board */
+                       dib8000_write_word(state, 32, ((13 - mode) << 12) | (6 << 8) | 0x40);
+                       //dib8000_write_word(state, 32, (8 << 12) | (6 << 8) | 0x80);
+
+                       /*  P_ctrl_sfreq_step= (12-P_mode)   P_ctrl_sfreq_inh =0     P_ctrl_pha_off_max  */
+                       ret |= dib8000_write_word(state, 37, (12 - mode) | ((5 + mode) << 5));
+
+               } else {        // Sound Broadcasting mode 3 seg
+
+                       /* P_timf_alpha = (12-P_mode) , P_corm_alpha=6, P_corm_thres=0x60  alpha to check on board */
+                       dib8000_write_word(state, 32, ((12 - mode) << 12) | (6 << 8) | 0x60);
+
+                       ret |= dib8000_write_word(state, 37, (11 - mode) | ((5 + mode) << 5));
+               }
+
+       } else {                // 13 seg
+               /* P_timf_alpha = 8 , P_corm_alpha=6, P_corm_thres=0x80  alpha to check on board */
+               dib8000_write_word(state, 32, ((11 - mode) << 12) | (6 << 8) | 0x80);
+
+               ret |= dib8000_write_word(state, 37, (10 - mode) | ((5 + mode) << 5));
+
+       }
+
+       // we achieved a coff_cpil_lock - it's time to update the timf
+       if ((dib8000_read_word(state, 568) >> 11) & 0x1)
+               dib8000_update_timf(state);
+
+       //now that tune is finished, lock0 should lock on fec_mpeg to output this lock on MP_LOCK. It's changed in autosearch start
+       dib8000_write_word(state, 6, 0x200);
+
+       if (state->revision == 0x8002) {
+               value = dib8000_read_word(state, 903);
+               dib8000_write_word(state, 903, value & ~(1 << 3));
+               msleep(1);
+               dib8000_write_word(state, 903, value | (1 << 3));
+       }
+
+       return ret;
+}
+
+static int dib8000_wakeup(struct dvb_frontend *fe)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+
+       dib8000_set_power_mode(state, DIB8000M_POWER_ALL);
+       dib8000_set_adc_state(state, DIBX000_ADC_ON);
+       if (dib8000_set_adc_state(state, DIBX000_SLOW_ADC_ON) != 0)
+               dprintk("could not start Slow ADC");
+
+       return 0;
+}
+
+static int dib8000_sleep(struct dvb_frontend *fe)
+{
+       struct dib8000_state *st = fe->demodulator_priv;
+       if (1) {
+               dib8000_set_output_mode(st, OUTMODE_HIGH_Z);
+               dib8000_set_power_mode(st, DIB8000M_POWER_INTERFACE_ONLY);
+               return dib8000_set_adc_state(st, DIBX000_SLOW_ADC_OFF) | dib8000_set_adc_state(st, DIBX000_ADC_OFF);
+       } else {
+
+               return 0;
+       }
+}
+
+static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 i, val = 0;
+
+       fe->dtv_property_cache.bandwidth_hz = 6000000;
+
+       fe->dtv_property_cache.isdbt_sb_mode = dib8000_read_word(state, 508) & 0x1;
+
+       val = dib8000_read_word(state, 570);
+       fe->dtv_property_cache.inversion = (val & 0x40) >> 6;
+       switch ((val & 0x30) >> 4) {
+       case 1:
+               fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_2K;
+               break;
+       case 3:
+       default:
+               fe->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_8K;
+               break;
+       }
+
+       switch (val & 0x3) {
+       case 0:
+               fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_32;
+               dprintk("dib8000_get_frontend GI = 1/32 ");
+               break;
+       case 1:
+               fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_16;
+               dprintk("dib8000_get_frontend GI = 1/16 ");
+               break;
+       case 2:
+               dprintk("dib8000_get_frontend GI = 1/8 ");
+               fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_8;
+               break;
+       case 3:
+               dprintk("dib8000_get_frontend GI = 1/4 ");
+               fe->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_4;
+               break;
+       }
+
+       val = dib8000_read_word(state, 505);
+       fe->dtv_property_cache.isdbt_partial_reception = val & 1;
+       dprintk("dib8000_get_frontend : partial_reception = %d ", fe->dtv_property_cache.isdbt_partial_reception);
+
+       for (i = 0; i < 3; i++) {
+               val = dib8000_read_word(state, 493 + i);
+               fe->dtv_property_cache.layer[i].segment_count = val & 0x0F;
+               dprintk("dib8000_get_frontend : Layer %d segments = %d ", i, fe->dtv_property_cache.layer[i].segment_count);
+
+               val = dib8000_read_word(state, 499 + i);
+               fe->dtv_property_cache.layer[i].interleaving = val & 0x3;
+               dprintk("dib8000_get_frontend : Layer %d time_intlv = %d ", i, fe->dtv_property_cache.layer[i].interleaving);
+
+               val = dib8000_read_word(state, 481 + i);
+               switch (val & 0x7) {
+               case 1:
+                       fe->dtv_property_cache.layer[i].fec = FEC_1_2;
+                       dprintk("dib8000_get_frontend : Layer %d Code Rate = 1/2 ", i);
+                       break;
+               case 2:
+                       fe->dtv_property_cache.layer[i].fec = FEC_2_3;
+                       dprintk("dib8000_get_frontend : Layer %d Code Rate = 2/3 ", i);
+                       break;
+               case 3:
+                       fe->dtv_property_cache.layer[i].fec = FEC_3_4;
+                       dprintk("dib8000_get_frontend : Layer %d Code Rate = 3/4 ", i);
+                       break;
+               case 5:
+                       fe->dtv_property_cache.layer[i].fec = FEC_5_6;
+                       dprintk("dib8000_get_frontend : Layer %d Code Rate = 5/6 ", i);
+                       break;
+               default:
+                       fe->dtv_property_cache.layer[i].fec = FEC_7_8;
+                       dprintk("dib8000_get_frontend : Layer %d Code Rate = 7/8 ", i);
+                       break;
+               }
+
+               val = dib8000_read_word(state, 487 + i);
+               switch (val & 0x3) {
+               case 0:
+                       dprintk("dib8000_get_frontend : Layer %d DQPSK ", i);
+                       fe->dtv_property_cache.layer[i].modulation = DQPSK;
+                       break;
+               case 1:
+                       fe->dtv_property_cache.layer[i].modulation = QPSK;
+                       dprintk("dib8000_get_frontend : Layer %d QPSK ", i);
+                       break;
+               case 2:
+                       fe->dtv_property_cache.layer[i].modulation = QAM_16;
+                       dprintk("dib8000_get_frontend : Layer %d QAM16 ", i);
+                       break;
+               case 3:
+               default:
+                       dprintk("dib8000_get_frontend : Layer %d QAM64 ", i);
+                       fe->dtv_property_cache.layer[i].modulation = QAM_64;
+                       break;
+               }
+       }
+       return 0;
+}
+
+static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       int time, ret;
+
+       dib8000_set_output_mode(state, OUTMODE_HIGH_Z);
+
+       if (fe->ops.tuner_ops.set_params)
+               fe->ops.tuner_ops.set_params(fe, fep);
+
+       /* start up the AGC */
+       state->tune_state = CT_AGC_START;
+       do {
+               time = dib8000_agc_startup(fe);
+               if (time != FE_CALLBACK_TIME_NEVER)
+                       msleep(time / 10);
+               else
+                       break;
+       } while (state->tune_state != CT_AGC_STOP);
+
+       if (state->fe.dtv_property_cache.frequency == 0) {
+               dprintk("dib8000: must at least specify frequency ");
+               return 0;
+       }
+
+       if (state->fe.dtv_property_cache.bandwidth_hz == 0) {
+               dprintk("dib8000: no bandwidth specified, set to default ");
+               state->fe.dtv_property_cache.bandwidth_hz = 6000000;
+       }
+
+       state->tune_state = CT_DEMOD_START;
+
+       if ((state->fe.dtv_property_cache.delivery_system != SYS_ISDBT) ||
+           (state->fe.dtv_property_cache.inversion == INVERSION_AUTO) ||
+           (state->fe.dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO) ||
+           (state->fe.dtv_property_cache.guard_interval == GUARD_INTERVAL_AUTO) ||
+           (((state->fe.dtv_property_cache.isdbt_layer_enabled & (1 << 0)) != 0) &&
+            (state->fe.dtv_property_cache.layer[0].segment_count != 0xff) &&
+            (state->fe.dtv_property_cache.layer[0].segment_count != 0) &&
+            ((state->fe.dtv_property_cache.layer[0].modulation == QAM_AUTO) ||
+             (state->fe.dtv_property_cache.layer[0].fec == FEC_AUTO))) ||
+           (((state->fe.dtv_property_cache.isdbt_layer_enabled & (1 << 1)) != 0) &&
+            (state->fe.dtv_property_cache.layer[1].segment_count != 0xff) &&
+            (state->fe.dtv_property_cache.layer[1].segment_count != 0) &&
+            ((state->fe.dtv_property_cache.layer[1].modulation == QAM_AUTO) ||
+             (state->fe.dtv_property_cache.layer[1].fec == FEC_AUTO))) ||
+           (((state->fe.dtv_property_cache.isdbt_layer_enabled & (1 << 2)) != 0) &&
+            (state->fe.dtv_property_cache.layer[2].segment_count != 0xff) &&
+            (state->fe.dtv_property_cache.layer[2].segment_count != 0) &&
+            ((state->fe.dtv_property_cache.layer[2].modulation == QAM_AUTO) ||
+             (state->fe.dtv_property_cache.layer[2].fec == FEC_AUTO))) ||
+           (((state->fe.dtv_property_cache.layer[0].segment_count == 0) ||
+             ((state->fe.dtv_property_cache.isdbt_layer_enabled & (1 << 0)) == 0)) &&
+            ((state->fe.dtv_property_cache.layer[1].segment_count == 0) ||
+             ((state->fe.dtv_property_cache.isdbt_layer_enabled & (2 << 0)) == 0)) &&
+            ((state->fe.dtv_property_cache.layer[2].segment_count == 0) || ((state->fe.dtv_property_cache.isdbt_layer_enabled & (3 << 0)) == 0)))) {
+               int i = 800, found;
+
+               dib8000_set_bandwidth(state, fe->dtv_property_cache.bandwidth_hz / 1000);
+               dib8000_autosearch_start(fe);
+               do {
+                       msleep(10);
+                       found = dib8000_autosearch_irq(fe);
+               } while (found == 0 && i--);
+
+               dprintk("Frequency %d Hz, autosearch returns: %d", fep->frequency, found);
+
+               if (found == 0 || found == 1)
+                       return 0;       // no channel found
+
+               dib8000_get_frontend(fe, fep);
+       }
+
+       ret = dib8000_tune(fe);
+
+       /* make this a config parameter */
+       dib8000_set_output_mode(state, state->cfg.output_mode);
+
+       return ret;
+}
+
+static int dib8000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 lock = dib8000_read_word(state, 568);
+
+       *stat = 0;
+
+       if ((lock >> 14) & 1)   // AGC
+               *stat |= FE_HAS_SIGNAL;
+
+       if ((lock >> 8) & 1)    // Equal
+               *stat |= FE_HAS_CARRIER;
+
+       if ((lock >> 3) & 1)    // TMCC_SYNC
+               *stat |= FE_HAS_SYNC;
+
+       if ((lock >> 5) & 7)    // FEC MPEG
+               *stat |= FE_HAS_LOCK;
+
+       lock = dib8000_read_word(state, 554);   // Viterbi Layer A
+       if (lock & 0x01)
+               *stat |= FE_HAS_VITERBI;
+
+       lock = dib8000_read_word(state, 555);   // Viterbi Layer B
+       if (lock & 0x01)
+               *stat |= FE_HAS_VITERBI;
+
+       lock = dib8000_read_word(state, 556);   // Viterbi Layer C
+       if (lock & 0x01)
+               *stat |= FE_HAS_VITERBI;
+
+       return 0;
+}
+
+static int dib8000_read_ber(struct dvb_frontend *fe, u32 * ber)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       *ber = (dib8000_read_word(state, 560) << 16) | dib8000_read_word(state, 561);   // 13 segments
+       return 0;
+}
+
+static int dib8000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       *unc = dib8000_read_word(state, 565);   // packet error on 13 seg
+       return 0;
+}
+
+static int dib8000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 val = dib8000_read_word(state, 390);
+       *strength = 65535 - val;
+       return 0;
+}
+
+static int dib8000_read_snr(struct dvb_frontend *fe, u16 * snr)
+{
+       struct dib8000_state *state = fe->demodulator_priv;
+       u16 val;
+       s32 signal_mant, signal_exp, noise_mant, noise_exp;
+       u32 result = 0;
+
+       val = dib8000_read_word(state, 542);
+       noise_mant = (val >> 6) & 0xff;
+       noise_exp = (val & 0x3f);
+
+       val = dib8000_read_word(state, 543);
+       signal_mant = (val >> 6) & 0xff;
+       signal_exp = (val & 0x3f);
+
+       if ((noise_exp & 0x20) != 0)
+               noise_exp -= 0x40;
+       if ((signal_exp & 0x20) != 0)
+               signal_exp -= 0x40;
+
+       if (signal_mant != 0)
+               result = intlog10(2) * 10 * signal_exp + 10 * intlog10(signal_mant);
+       else
+               result = intlog10(2) * 10 * signal_exp - 100;
+       if (noise_mant != 0)
+               result -= intlog10(2) * 10 * noise_exp + 10 * intlog10(noise_mant);
+       else
+               result -= intlog10(2) * 10 * noise_exp - 100;
+
+       *snr = result / (1 << 24);
+       return 0;
+}
+
+int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)
+{
+       int k = 0;
+       u8 new_addr = 0;
+       struct i2c_device client = {.adap = host };
+
+       for (k = no_of_demods - 1; k >= 0; k--) {
+               /* designated i2c address */
+               new_addr = first_addr + (k << 1);
+
+               client.addr = new_addr;
+               dib8000_i2c_write16(&client, 1287, 0x0003);     /* sram lead in, rdy */
+               if (dib8000_identify(&client) == 0) {
+                       dib8000_i2c_write16(&client, 1287, 0x0003);     /* sram lead in, rdy */
+                       client.addr = default_addr;
+                       if (dib8000_identify(&client) == 0) {
+                               dprintk("#%d: not identified", k);
+                               return -EINVAL;
+                       }
+               }
+
+               /* start diversity to pull_down div_str - just for i2c-enumeration */
+               dib8000_i2c_write16(&client, 1286, (1 << 10) | (4 << 6));
+
+               /* set new i2c address and force divstart */
+               dib8000_i2c_write16(&client, 1285, (new_addr << 2) | 0x2);
+               client.addr = new_addr;
+               dib8000_identify(&client);
+
+               dprintk("IC %d initialized (to i2c_address 0x%x)", k, new_addr);
+       }
+
+       for (k = 0; k < no_of_demods; k++) {
+               new_addr = first_addr | (k << 1);
+               client.addr = new_addr;
+
+               // unforce divstr
+               dib8000_i2c_write16(&client, 1285, new_addr << 2);
+
+               /* deactivate div - it was just for i2c-enumeration */
+               dib8000_i2c_write16(&client, 1286, 0);
+       }
+
+       return 0;
+}
+
+EXPORT_SYMBOL(dib8000_i2c_enumeration);
+static int dib8000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune)
+{
+       tune->min_delay_ms = 1000;
+       tune->step_size = 0;
+       tune->max_drift = 0;
+       return 0;
+}
+
+static void dib8000_release(struct dvb_frontend *fe)
+{
+       struct dib8000_state *st = fe->demodulator_priv;
+       dibx000_exit_i2c_master(&st->i2c_master);
+       kfree(st);
+}
+
+struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *fe, enum dibx000_i2c_interface intf, int gating)
+{
+       struct dib8000_state *st = fe->demodulator_priv;
+       return dibx000_get_i2c_adapter(&st->i2c_master, intf, gating);
+}
+
+EXPORT_SYMBOL(dib8000_get_i2c_master);
+
+static const struct dvb_frontend_ops dib8000_ops = {
+       .info = {
+                .name = "DiBcom 8000 ISDB-T",
+                .type = FE_OFDM,
+                .frequency_min = 44250000,
+                .frequency_max = 867250000,
+                .frequency_stepsize = 62500,
+                .caps = FE_CAN_INVERSION_AUTO |
+                FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_RECOVER | FE_CAN_HIERARCHY_AUTO,
+                },
+
+       .release = dib8000_release,
+
+       .init = dib8000_wakeup,
+       .sleep = dib8000_sleep,
+
+       .set_frontend = dib8000_set_frontend,
+       .get_tune_settings = dib8000_fe_get_tune_settings,
+       .get_frontend = dib8000_get_frontend,
+
+       .read_status = dib8000_read_status,
+       .read_ber = dib8000_read_ber,
+       .read_signal_strength = dib8000_read_signal_strength,
+       .read_snr = dib8000_read_snr,
+       .read_ucblocks = dib8000_read_unc_blocks,
+};
+
+struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg)
+{
+       struct dvb_frontend *fe;
+       struct dib8000_state *state;
+
+       dprintk("dib8000_attach");
+
+       state = kzalloc(sizeof(struct dib8000_state), GFP_KERNEL);
+       if (state == NULL)
+               return NULL;
+
+       memcpy(&state->cfg, cfg, sizeof(struct dib8000_config));
+       state->i2c.adap = i2c_adap;
+       state->i2c.addr = i2c_addr;
+       state->gpio_val = cfg->gpio_val;
+       state->gpio_dir = cfg->gpio_dir;
+
+       /* Ensure the output mode remains at the previous default if it's
+        * not specifically set by the caller.
+        */
+       if ((state->cfg.output_mode != OUTMODE_MPEG2_SERIAL) && (state->cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK))
+               state->cfg.output_mode = OUTMODE_MPEG2_FIFO;
+
+       fe = &state->fe;
+       fe->demodulator_priv = state;
+       memcpy(&state->fe.ops, &dib8000_ops, sizeof(struct dvb_frontend_ops));
+
+       state->timf_default = cfg->pll->timf;
+
+       if (dib8000_identify(&state->i2c) == 0)
+               goto error;
+
+       dibx000_init_i2c_master(&state->i2c_master, DIB8000, state->i2c.adap, state->i2c.addr);
+
+       dib8000_reset(fe);
+
+       dib8000_write_word(state, 285, (dib8000_read_word(state, 285) & ~0x60) | (3 << 5));     /* ber_rs_len = 3 */
+
+       return fe;
+
+ error:
+       kfree(state);
+       return NULL;
+}
+
+EXPORT_SYMBOL(dib8000_attach);
+
+MODULE_AUTHOR("Olivier Grenie <Olivier.Grenie@dibcom.fr, " "Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_DESCRIPTION("Driver for the DiBcom 8000 ISDB-T demodulator");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb/frontends/dib8000.h
new file mode 100644 (file)
index 0000000..a86de34
--- /dev/null
@@ -0,0 +1,79 @@
+#ifndef DIB8000_H
+#define DIB8000_H
+
+#include "dibx000_common.h"
+
+struct dib8000_config {
+       u8 output_mpeg2_in_188_bytes;
+       u8 hostbus_diversity;
+       u8 tuner_is_baseband;
+       int (*update_lna) (struct dvb_frontend *, u16 agc_global);
+
+       u8 agc_config_count;
+       struct dibx000_agc_config *agc;
+       struct dibx000_bandwidth_config *pll;
+
+#define DIB8000_GPIO_DEFAULT_DIRECTIONS 0xffff
+       u16 gpio_dir;
+#define DIB8000_GPIO_DEFAULT_VALUES     0x0000
+       u16 gpio_val;
+#define DIB8000_GPIO_PWM_POS0(v)        ((v & 0xf) << 12)
+#define DIB8000_GPIO_PWM_POS1(v)        ((v & 0xf) << 8 )
+#define DIB8000_GPIO_PWM_POS2(v)        ((v & 0xf) << 4 )
+#define DIB8000_GPIO_PWM_POS3(v)         (v & 0xf)
+#define DIB8000_GPIO_DEFAULT_PWM_POS    0xffff
+       u16 gpio_pwm_pos;
+       u16 pwm_freq_div;
+
+       void (*agc_control) (struct dvb_frontend *, u8 before);
+
+       u16 drives;
+       u16 diversity_delay;
+       u8 div_cfg;
+       u8 output_mode;
+       u8 refclksel;
+};
+
+#define DEFAULT_DIB8000_I2C_ADDRESS 18
+
+#if defined(CONFIG_DVB_DIB8000) || (defined(CONFIG_DVB_DIB8000_MODULE) && defined(MODULE))
+extern struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
+extern struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);
+
+extern int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr);
+
+extern int dib8000_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
+extern int dib8000_set_wbd_ref(struct dvb_frontend *, u16 value);
+#else
+static inline struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return NULL;
+}
+
+static inline struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *fe, enum dibx000_i2c_interface i, int x)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return NULL;
+}
+
+int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return -ENODEV;
+}
+
+int dib8000_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return -ENODEV;
+}
+
+int dib8000_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return -ENODEV;
+}
+#endif
+
+#endif
index 315e09e..4efca30 100644 (file)
@@ -15,29 +15,31 @@ static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
                (val >> 8) & 0xff, val & 0xff,
        };
        struct i2c_msg msg = {
-               .addr = mst->i2c_addr, .flags = 0, .buf = b, .len = 4
+               .addr = mst->i2c_addr,.flags = 0,.buf = b,.len = 4
        };
        return i2c_transfer(mst->i2c_adap, &msg, 1) != 1 ? -EREMOTEIO : 0;
 }
 
 
-static int dibx000_i2c_select_interface(struct dibx000_i2c_master *mst, enum dibx000_i2c_interface intf)
+static int dibx000_i2c_select_interface(struct dibx000_i2c_master *mst,
+                                       enum dibx000_i2c_interface intf)
 {
        if (mst->device_rev > DIB3000MC && mst->selected_interface != intf) {
-               dprintk("selecting interface: %d\n",intf);
+               dprintk("selecting interface: %d\n", intf);
                mst->selected_interface = intf;
                return dibx000_write_word(mst, mst->base_reg + 4, intf);
        }
        return 0;
 }
 
-static int dibx000_i2c_gate_ctrl(struct dibx000_i2c_master *mst, u8 tx[4], u8 addr, int onoff)
+static int dibx000_i2c_gate_ctrl(struct dibx000_i2c_master *mst, u8 tx[4],
+                                u8 addr, int onoff)
 {
        u16 val;
 
 
        if (onoff)
-               val = addr << 8; // bit 7 = use master or not, if 0, the gate is open
+               val = addr << 8;        // bit 7 = use master or not, if 0, the gate is open
        else
                val = 1 << 7;
 
@@ -45,7 +47,7 @@ static int dibx000_i2c_gate_ctrl(struct dibx000_i2c_master *mst, u8 tx[4], u8 ad
                val <<= 1;
 
        tx[0] = (((mst->base_reg + 1) >> 8) & 0xff);
-       tx[1] = ( (mst->base_reg + 1)       & 0xff);
+       tx[1] = ((mst->base_reg + 1) & 0xff);
        tx[2] = val >> 8;
        tx[3] = val & 0xff;
 
@@ -57,59 +59,78 @@ static u32 dibx000_i2c_func(struct i2c_adapter *adapter)
        return I2C_FUNC_I2C;
 }
 
-static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
+static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
+                                       struct i2c_msg msg[], int num)
 {
        struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap);
        struct i2c_msg m[2 + num];
        u8 tx_open[4], tx_close[4];
 
-       memset(m,0, sizeof(struct i2c_msg) * (2 + num));
+       memset(m, 0, sizeof(struct i2c_msg) * (2 + num));
 
        dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER);
 
-       dibx000_i2c_gate_ctrl(mst, tx_open,  msg[0].addr, 1);
+       dibx000_i2c_gate_ctrl(mst, tx_open, msg[0].addr, 1);
        m[0].addr = mst->i2c_addr;
-       m[0].buf  = tx_open;
-       m[0].len  = 4;
+       m[0].buf = tx_open;
+       m[0].len = 4;
 
        memcpy(&m[1], msg, sizeof(struct i2c_msg) * num);
 
        dibx000_i2c_gate_ctrl(mst, tx_close, 0, 0);
-       m[num+1].addr = mst->i2c_addr;
-       m[num+1].buf  = tx_close;
-       m[num+1].len  = 4;
+       m[num + 1].addr = mst->i2c_addr;
+       m[num + 1].buf = tx_close;
+       m[num + 1].len = 4;
 
-       return i2c_transfer(mst->i2c_adap, m, 2+num) == 2 + num ? num : -EIO;
+       return i2c_transfer(mst->i2c_adap, m, 2 + num) == 2 + num ? num : -EIO;
 }
 
 static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = {
-       .master_xfer   = dibx000_i2c_gated_tuner_xfer,
+       .master_xfer = dibx000_i2c_gated_tuner_xfer,
        .functionality = dibx000_i2c_func,
 };
 
-struct i2c_adapter * dibx000_get_i2c_adapter(struct dibx000_i2c_master *mst, enum dibx000_i2c_interface intf, int gating)
+struct i2c_adapter *dibx000_get_i2c_adapter(struct dibx000_i2c_master *mst,
+                                           enum dibx000_i2c_interface intf,
+                                           int gating)
 {
        struct i2c_adapter *i2c = NULL;
 
        switch (intf) {
-               case DIBX000_I2C_INTERFACE_TUNER:
-                       if (gating)
-                               i2c = &mst->gated_tuner_i2c_adap;
-                       break;
-               default:
-                       printk(KERN_ERR "DiBX000: incorrect I2C interface selected\n");
-                       break;
+       case DIBX000_I2C_INTERFACE_TUNER:
+               if (gating)
+                       i2c = &mst->gated_tuner_i2c_adap;
+               break;
+       default:
+               printk(KERN_ERR "DiBX000: incorrect I2C interface selected\n");
+               break;
        }
 
        return i2c;
 }
+
 EXPORT_SYMBOL(dibx000_get_i2c_adapter);
 
-static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *algo, const char *name, struct dibx000_i2c_master *mst)
+void dibx000_reset_i2c_master(struct dibx000_i2c_master *mst)
+{
+       /* initialize the i2c-master by closing the gate */
+       u8 tx[4];
+       struct i2c_msg m = {.addr = mst->i2c_addr,.buf = tx,.len = 4 };
+
+       dibx000_i2c_gate_ctrl(mst, tx, 0, 0);
+       i2c_transfer(mst->i2c_adap, &m, 1);
+       mst->selected_interface = 0xff; // the first time force a select of the I2C
+       dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER);
+}
+
+EXPORT_SYMBOL(dibx000_reset_i2c_master);
+
+static int i2c_adapter_init(struct i2c_adapter *i2c_adap,
+                           struct i2c_algorithm *algo, const char *name,
+                           struct dibx000_i2c_master *mst)
 {
        strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
-       i2c_adap->class     = I2C_CLASS_TV_DIGITAL,
-       i2c_adap->algo      = algo;
+       i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo;
        i2c_adap->algo_data = NULL;
        i2c_set_adapdata(i2c_adap, mst);
        if (i2c_add_adapter(i2c_adap) < 0)
@@ -117,34 +138,40 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *
        return 0;
 }
 
-int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, struct i2c_adapter *i2c_adap, u8 i2c_addr)
+int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev,
+                           struct i2c_adapter *i2c_adap, u8 i2c_addr)
 {
        u8 tx[4];
-       struct i2c_msg m = { .addr = i2c_addr >> 1, .buf = tx, .len = 4 };
+       struct i2c_msg m = {.addr = i2c_addr >> 1,.buf = tx,.len = 4 };
 
        mst->device_rev = device_rev;
-       mst->i2c_adap   = i2c_adap;
-       mst->i2c_addr   = i2c_addr >> 1;
+       mst->i2c_adap = i2c_adap;
+       mst->i2c_addr = i2c_addr >> 1;
 
-       if (device_rev == DIB7000P)
+       if (device_rev == DIB7000P || device_rev == DIB8000)
                mst->base_reg = 1024;
        else
                mst->base_reg = 768;
 
-    if (i2c_adapter_init(&mst->gated_tuner_i2c_adap, &dibx000_i2c_gated_tuner_algo, "DiBX000 tuner I2C bus", mst) != 0)
-               printk(KERN_ERR "DiBX000: could not initialize the tuner i2c_adapter\n");
+       if (i2c_adapter_init
+           (&mst->gated_tuner_i2c_adap, &dibx000_i2c_gated_tuner_algo,
+            "DiBX000 tuner I2C bus", mst) != 0)
+               printk(KERN_ERR
+                      "DiBX000: could not initialize the tuner i2c_adapter\n");
 
        /* initialize the i2c-master by closing the gate */
        dibx000_i2c_gate_ctrl(mst, tx, 0, 0);
 
        return i2c_transfer(i2c_adap, &m, 1) == 1;
 }
+
 EXPORT_SYMBOL(dibx000_init_i2c_master);
 
 void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst)
 {
        i2c_del_adapter(&mst->gated_tuner_i2c_adap);
 }
+
 EXPORT_SYMBOL(dibx000_exit_i2c_master);
 
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
index 84e4d53..5be10ec 100644 (file)
@@ -2,7 +2,7 @@
 #define DIBX000_COMMON_H
 
 enum dibx000_i2c_interface {
-       DIBX000_I2C_INTERFACE_TUNER    = 0,
+       DIBX000_I2C_INTERFACE_TUNER = 0,
        DIBX000_I2C_INTERFACE_GPIO_1_2 = 1,
        DIBX000_I2C_INTERFACE_GPIO_3_4 = 2
 };
@@ -12,22 +12,29 @@ struct dibx000_i2c_master {
 #define DIB7000   2
 #define DIB7000P  11
 #define DIB7000MC 12
+#define DIB8000   13
        u16 device_rev;
 
        enum dibx000_i2c_interface selected_interface;
 
-//     struct i2c_adapter  tuner_i2c_adap;
-       struct i2c_adapter  gated_tuner_i2c_adap;
+//      struct i2c_adapter  tuner_i2c_adap;
+       struct i2c_adapter gated_tuner_i2c_adap;
 
        struct i2c_adapter *i2c_adap;
-       u8                  i2c_addr;
+       u8 i2c_addr;
 
        u16 base_reg;
 };
 
-extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, struct i2c_adapter *i2c_adap, u8 i2c_addr);
-extern struct i2c_adapter * dibx000_get_i2c_adapter(struct dibx000_i2c_master *mst, enum dibx000_i2c_interface intf, int gating);
+extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst,
+                                  u16 device_rev, struct i2c_adapter *i2c_adap,
+                                  u8 i2c_addr);
+extern struct i2c_adapter *dibx000_get_i2c_adapter(struct dibx000_i2c_master
+                                                  *mst,
+                                                  enum dibx000_i2c_interface
+                                                  intf, int gating);
 extern void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst);
+extern void dibx000_reset_i2c_master(struct dibx000_i2c_master *mst);
 
 #define BAND_LBAND 0x01
 #define BAND_UHF   0x02
@@ -41,18 +48,18 @@ extern void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst);
                                                                        (freq_kHz) <= 2000000 ? BAND_LBAND : BAND_SBAND )
 
 struct dibx000_agc_config {
-       /* defines the capabilities of this AGC-setting - using the BAND_-defines*/
-       u8  band_caps;
+       /* defines the capabilities of this AGC-setting - using the BAND_-defines */
+       u8 band_caps;
 
        u16 setup;
 
        u16 inv_gain;
        u16 time_stabiliz;
 
-       u8  alpha_level;
+       u8 alpha_level;
        u16 thlock;
 
-       u8  wbd_inv;
+       u8 wbd_inv;
        u16 wbd_ref;
        u8 wbd_sel;
        u8 wbd_alpha;
@@ -92,8 +99,8 @@ struct dibx000_agc_config {
 };
 
 struct dibx000_bandwidth_config {
-       u32   internal;
-       u32   sampling;
+       u32 internal;
+       u32 sampling;
 
        u8 pll_prediv;
        u8 pll_ratio;
index eb72a98..e334b5d 100644 (file)
@@ -363,6 +363,8 @@ struct dvb_frontend* lgdt3304_attach(const struct lgdt3304_config *config,
 
        struct lgdt3304_state *state;
        state = kzalloc(sizeof(struct lgdt3304_state), GFP_KERNEL);
+       if (state == NULL)
+               return NULL;
        state->addr = config->i2c_address;
        state->i2c = i2c;
 
index 3f5a0e1..3156b64 100644 (file)
@@ -169,6 +169,8 @@ struct dvb_frontend* s921_attach(const struct s921_config *config,
 
        struct s921_state *state;
        state = kzalloc(sizeof(struct s921_state), GFP_KERNEL);
+       if (state == NULL)
+               return NULL;
 
        state->addr = config->i2c_address;
        state->i2c = i2c;
diff --git a/drivers/media/dvb/pt1/Kconfig b/drivers/media/dvb/pt1/Kconfig
new file mode 100644 (file)
index 0000000..24501d5
--- /dev/null
@@ -0,0 +1,12 @@
+config DVB_PT1
+       tristate "PT1 cards"
+       depends on DVB_CORE && PCI && I2C
+       help
+         Support for Earthsoft PT1 PCI cards.
+
+         Since these cards have no MPEG decoder onboard, they transmit
+         only compressed MPEG data over the PCI bus, so you need
+         an external software decoder to watch TV on your computer.
+
+         Say Y or M if you own such a device and want to use it.
+
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/dvb/pt1/Makefile
new file mode 100644 (file)
index 0000000..a66da17
--- /dev/null
@@ -0,0 +1,5 @@
+earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o
+
+obj-$(CONFIG_DVB_PT1) += earth-pt1.o
+
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c
new file mode 100644 (file)
index 0000000..81e623a
--- /dev/null
@@ -0,0 +1,1057 @@
+/*
+ * driver for Earthsoft PT1
+ *
+ * Copyright (C) 2009 HIRANO Takahito <hiranotaka@zng.info>
+ *
+ * based on pt1dvr - http://pt1dvr.sourceforge.jp/
+ *     by Tomoaki Ishikawa <tomy@users.sourceforge.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/vmalloc.h>
+#include <linux/pci.h>
+#include <linux/kthread.h>
+#include <linux/freezer.h>
+
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dmxdev.h"
+#include "dvb_net.h"
+#include "dvb_frontend.h"
+
+#include "va1j5jf8007t.h"
+#include "va1j5jf8007s.h"
+
+#define DRIVER_NAME "earth-pt1"
+
+#define PT1_PAGE_SHIFT 12
+#define PT1_PAGE_SIZE (1 << PT1_PAGE_SHIFT)
+#define PT1_NR_UPACKETS 1024
+#define PT1_NR_BUFS 511
+
+struct pt1_buffer_page {
+       __le32 upackets[PT1_NR_UPACKETS];
+};
+
+struct pt1_table_page {
+       __le32 next_pfn;
+       __le32 buf_pfns[PT1_NR_BUFS];
+};
+
+struct pt1_buffer {
+       struct pt1_buffer_page *page;
+       dma_addr_t addr;
+};
+
+struct pt1_table {
+       struct pt1_table_page *page;
+       dma_addr_t addr;
+       struct pt1_buffer bufs[PT1_NR_BUFS];
+};
+
+#define PT1_NR_ADAPS 4
+
+struct pt1_adapter;
+
+struct pt1 {
+       struct pci_dev *pdev;
+       void __iomem *regs;
+       struct i2c_adapter i2c_adap;
+       int i2c_running;
+       struct pt1_adapter *adaps[PT1_NR_ADAPS];
+       struct pt1_table *tables;
+       struct task_struct *kthread;
+};
+
+struct pt1_adapter {
+       struct pt1 *pt1;
+       int index;
+
+       u8 *buf;
+       int upacket_count;
+       int packet_count;
+
+       struct dvb_adapter adap;
+       struct dvb_demux demux;
+       int users;
+       struct dmxdev dmxdev;
+       struct dvb_net net;
+       struct dvb_frontend *fe;
+       int (*orig_set_voltage)(struct dvb_frontend *fe,
+                               fe_sec_voltage_t voltage);
+};
+
+#define pt1_printk(level, pt1, format, arg...) \
+       dev_printk(level, &(pt1)->pdev->dev, format, ##arg)
+
+static void pt1_write_reg(struct pt1 *pt1, int reg, u32 data)
+{
+       writel(data, pt1->regs + reg * 4);
+}
+
+static u32 pt1_read_reg(struct pt1 *pt1, int reg)
+{
+       return readl(pt1->regs + reg * 4);
+}
+
+static int pt1_nr_tables = 64;
+module_param_named(nr_tables, pt1_nr_tables, int, 0);
+
+static void pt1_increment_table_count(struct pt1 *pt1)
+{
+       pt1_write_reg(pt1, 0, 0x00000020);
+}
+
+static void pt1_init_table_count(struct pt1 *pt1)
+{
+       pt1_write_reg(pt1, 0, 0x00000010);
+}
+
+static void pt1_register_tables(struct pt1 *pt1, u32 first_pfn)
+{
+       pt1_write_reg(pt1, 5, first_pfn);
+       pt1_write_reg(pt1, 0, 0x0c000040);
+}
+
+static void pt1_unregister_tables(struct pt1 *pt1)
+{
+       pt1_write_reg(pt1, 0, 0x08080000);
+}
+
+static int pt1_sync(struct pt1 *pt1)
+{
+       int i;
+       for (i = 0; i < 57; i++) {
+               if (pt1_read_reg(pt1, 0) & 0x20000000)
+                       return 0;
+               pt1_write_reg(pt1, 0, 0x00000008);
+       }
+       pt1_printk(KERN_ERR, pt1, "could not sync\n");
+       return -EIO;
+}
+
+static u64 pt1_identify(struct pt1 *pt1)
+{
+       int i;
+       u64 id;
+       id = 0;
+       for (i = 0; i < 57; i++) {
+               id |= (u64)(pt1_read_reg(pt1, 0) >> 30 & 1) << i;
+               pt1_write_reg(pt1, 0, 0x00000008);
+       }
+       return id;
+}
+
+static int pt1_unlock(struct pt1 *pt1)
+{
+       int i;
+       pt1_write_reg(pt1, 0, 0x00000008);
+       for (i = 0; i < 3; i++) {
+               if (pt1_read_reg(pt1, 0) & 0x80000000)
+                       return 0;
+               schedule_timeout_uninterruptible((HZ + 999) / 1000);
+       }
+       pt1_printk(KERN_ERR, pt1, "could not unlock\n");
+       return -EIO;
+}
+
+static int pt1_reset_pci(struct pt1 *pt1)
+{
+       int i;
+       pt1_write_reg(pt1, 0, 0x01010000);
+       pt1_write_reg(pt1, 0, 0x01000000);
+       for (i = 0; i < 10; i++) {
+               if (pt1_read_reg(pt1, 0) & 0x00000001)
+                       return 0;
+               schedule_timeout_uninterruptible((HZ + 999) / 1000);
+       }
+       pt1_printk(KERN_ERR, pt1, "could not reset PCI\n");
+       return -EIO;
+}
+
+static int pt1_reset_ram(struct pt1 *pt1)
+{
+       int i;
+       pt1_write_reg(pt1, 0, 0x02020000);
+       pt1_write_reg(pt1, 0, 0x02000000);
+       for (i = 0; i < 10; i++) {
+               if (pt1_read_reg(pt1, 0) & 0x00000002)
+                       return 0;
+               schedule_timeout_uninterruptible((HZ + 999) / 1000);
+       }
+       pt1_printk(KERN_ERR, pt1, "could not reset RAM\n");
+       return -EIO;
+}
+
+static int pt1_do_enable_ram(struct pt1 *pt1)
+{
+       int i, j;
+       u32 status;
+       status = pt1_read_reg(pt1, 0) & 0x00000004;
+       pt1_write_reg(pt1, 0, 0x00000002);
+       for (i = 0; i < 10; i++) {
+               for (j = 0; j < 1024; j++) {
+                       if ((pt1_read_reg(pt1, 0) & 0x00000004) != status)
+                               return 0;
+               }
+               schedule_timeout_uninterruptible((HZ + 999) / 1000);
+       }
+       pt1_printk(KERN_ERR, pt1, "could not enable RAM\n");
+       return -EIO;
+}
+
+static int pt1_enable_ram(struct pt1 *pt1)
+{
+       int i, ret;
+       schedule_timeout_uninterruptible((HZ + 999) / 1000);
+       for (i = 0; i < 10; i++) {
+               ret = pt1_do_enable_ram(pt1);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+
+static void pt1_disable_ram(struct pt1 *pt1)
+{
+       pt1_write_reg(pt1, 0, 0x0b0b0000);
+}
+
+static void pt1_set_stream(struct pt1 *pt1, int index, int enabled)
+{
+       pt1_write_reg(pt1, 2, 1 << (index + 8) | enabled << index);
+}
+
+static void pt1_init_streams(struct pt1 *pt1)
+{
+       int i;
+       for (i = 0; i < PT1_NR_ADAPS; i++)
+               pt1_set_stream(pt1, i, 0);
+}
+
+static int pt1_filter(struct pt1 *pt1, struct pt1_buffer_page *page)
+{
+       u32 upacket;
+       int i;
+       int index;
+       struct pt1_adapter *adap;
+       int offset;
+       u8 *buf;
+
+       if (!page->upackets[PT1_NR_UPACKETS - 1])
+               return 0;
+
+       for (i = 0; i < PT1_NR_UPACKETS; i++) {
+               upacket = le32_to_cpu(page->upackets[i]);
+               index = (upacket >> 29) - 1;
+               if (index < 0 || index >=  PT1_NR_ADAPS)
+                       continue;
+
+               adap = pt1->adaps[index];
+               if (upacket >> 25 & 1)
+                       adap->upacket_count = 0;
+               else if (!adap->upacket_count)
+                       continue;
+
+               buf = adap->buf;
+               offset = adap->packet_count * 188 + adap->upacket_count * 3;
+               buf[offset] = upacket >> 16;
+               buf[offset + 1] = upacket >> 8;
+               if (adap->upacket_count != 62)
+                       buf[offset + 2] = upacket;
+
+               if (++adap->upacket_count >= 63) {
+                       adap->upacket_count = 0;
+                       if (++adap->packet_count >= 21) {
+                               dvb_dmx_swfilter_packets(&adap->demux, buf, 21);
+                               adap->packet_count = 0;
+                       }
+               }
+       }
+
+       page->upackets[PT1_NR_UPACKETS - 1] = 0;
+       return 1;
+}
+
+static int pt1_thread(void *data)
+{
+       struct pt1 *pt1;
+       int table_index;
+       int buf_index;
+       struct pt1_buffer_page *page;
+
+       pt1 = data;
+       set_freezable();
+
+       table_index = 0;
+       buf_index = 0;
+
+       while (!kthread_should_stop()) {
+               try_to_freeze();
+
+               page = pt1->tables[table_index].bufs[buf_index].page;
+               if (!pt1_filter(pt1, page)) {
+                       schedule_timeout_interruptible((HZ + 999) / 1000);
+                       continue;
+               }
+
+               if (++buf_index >= PT1_NR_BUFS) {
+                       pt1_increment_table_count(pt1);
+                       buf_index = 0;
+                       if (++table_index >= pt1_nr_tables)
+                               table_index = 0;
+               }
+       }
+
+       return 0;
+}
+
+static void pt1_free_page(struct pt1 *pt1, void *page, dma_addr_t addr)
+{
+       dma_free_coherent(&pt1->pdev->dev, PT1_PAGE_SIZE, page, addr);
+}
+
+static void *pt1_alloc_page(struct pt1 *pt1, dma_addr_t *addrp, u32 *pfnp)
+{
+       void *page;
+       dma_addr_t addr;
+
+       page = dma_alloc_coherent(&pt1->pdev->dev, PT1_PAGE_SIZE, &addr,
+                                 GFP_KERNEL);
+       if (page == NULL)
+               return NULL;
+
+       BUG_ON(addr & (PT1_PAGE_SIZE - 1));
+       BUG_ON(addr >> PT1_PAGE_SHIFT >> 31 >> 1);
+
+       *addrp = addr;
+       *pfnp = addr >> PT1_PAGE_SHIFT;
+       return page;
+}
+
+static void pt1_cleanup_buffer(struct pt1 *pt1, struct pt1_buffer *buf)
+{
+       pt1_free_page(pt1, buf->page, buf->addr);
+}
+
+static int
+pt1_init_buffer(struct pt1 *pt1, struct pt1_buffer *buf,  u32 *pfnp)
+{
+       struct pt1_buffer_page *page;
+       dma_addr_t addr;
+
+       page = pt1_alloc_page(pt1, &addr, pfnp);
+       if (page == NULL)
+               return -ENOMEM;
+
+       page->upackets[PT1_NR_UPACKETS - 1] = 0;
+
+       buf->page = page;
+       buf->addr = addr;
+       return 0;
+}
+
+static void pt1_cleanup_table(struct pt1 *pt1, struct pt1_table *table)
+{
+       int i;
+
+       for (i = 0; i < PT1_NR_BUFS; i++)
+               pt1_cleanup_buffer(pt1, &table->bufs[i]);
+
+       pt1_free_page(pt1, table->page, table->addr);
+}
+
+static int
+pt1_init_table(struct pt1 *pt1, struct pt1_table *table, u32 *pfnp)
+{
+       struct pt1_table_page *page;
+       dma_addr_t addr;
+       int i, ret;
+       u32 buf_pfn;
+
+       page = pt1_alloc_page(pt1, &addr, pfnp);
+       if (page == NULL)
+               return -ENOMEM;
+
+       for (i = 0; i < PT1_NR_BUFS; i++) {
+               ret = pt1_init_buffer(pt1, &table->bufs[i], &buf_pfn);
+               if (ret < 0)
+                       goto err;
+
+               page->buf_pfns[i] = cpu_to_le32(buf_pfn);
+       }
+
+       pt1_increment_table_count(pt1);
+       table->page = page;
+       table->addr = addr;
+       return 0;
+
+err:
+       while (i--)
+               pt1_cleanup_buffer(pt1, &table->bufs[i]);
+
+       pt1_free_page(pt1, page, addr);
+       return ret;
+}
+
+static void pt1_cleanup_tables(struct pt1 *pt1)
+{
+       struct pt1_table *tables;
+       int i;
+
+       tables = pt1->tables;
+       pt1_unregister_tables(pt1);
+
+       for (i = 0; i < pt1_nr_tables; i++)
+               pt1_cleanup_table(pt1, &tables[i]);
+
+       vfree(tables);
+}
+
+static int pt1_init_tables(struct pt1 *pt1)
+{
+       struct pt1_table *tables;
+       int i, ret;
+       u32 first_pfn, pfn;
+
+       tables = vmalloc(sizeof(struct pt1_table) * pt1_nr_tables);
+       if (tables == NULL)
+               return -ENOMEM;
+
+       pt1_init_table_count(pt1);
+
+       i = 0;
+       if (pt1_nr_tables) {
+               ret = pt1_init_table(pt1, &tables[0], &first_pfn);
+               if (ret)
+                       goto err;
+               i++;
+       }
+
+       while (i < pt1_nr_tables) {
+               ret = pt1_init_table(pt1, &tables[i], &pfn);
+               if (ret)
+                       goto err;
+               tables[i - 1].page->next_pfn = cpu_to_le32(pfn);
+               i++;
+       }
+
+       tables[pt1_nr_tables - 1].page->next_pfn = cpu_to_le32(first_pfn);
+
+       pt1_register_tables(pt1, first_pfn);
+       pt1->tables = tables;
+       return 0;
+
+err:
+       while (i--)
+               pt1_cleanup_table(pt1, &tables[i]);
+
+       vfree(tables);
+       return ret;
+}
+
+static int pt1_start_feed(struct dvb_demux_feed *feed)
+{
+       struct pt1_adapter *adap;
+       adap = container_of(feed->demux, struct pt1_adapter, demux);
+       if (!adap->users++)
+               pt1_set_stream(adap->pt1, adap->index, 1);
+       return 0;
+}
+
+static int pt1_stop_feed(struct dvb_demux_feed *feed)
+{
+       struct pt1_adapter *adap;
+       adap = container_of(feed->demux, struct pt1_adapter, demux);
+       if (!--adap->users)
+               pt1_set_stream(adap->pt1, adap->index, 0);
+       return 0;
+}
+
+static void
+pt1_set_power(struct pt1 *pt1, int power, int lnb, int reset)
+{
+       pt1_write_reg(pt1, 1, power | lnb << 1 | !reset << 3);
+}
+
+static int pt1_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+       struct pt1_adapter *adap;
+       int lnb;
+
+       adap = container_of(fe->dvb, struct pt1_adapter, adap);
+
+       switch (voltage) {
+       case SEC_VOLTAGE_13: /* actually 11V */
+               lnb = 2;
+               break;
+       case SEC_VOLTAGE_18: /* actually 15V */
+               lnb = 3;
+               break;
+       case SEC_VOLTAGE_OFF:
+               lnb = 0;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       pt1_set_power(adap->pt1, 1, lnb, 0);
+
+       if (adap->orig_set_voltage)
+               return adap->orig_set_voltage(fe, voltage);
+       else
+               return 0;
+}
+
+static void pt1_free_adapter(struct pt1_adapter *adap)
+{
+       dvb_unregister_frontend(adap->fe);
+       dvb_net_release(&adap->net);
+       adap->demux.dmx.close(&adap->demux.dmx);
+       dvb_dmxdev_release(&adap->dmxdev);
+       dvb_dmx_release(&adap->demux);
+       dvb_unregister_adapter(&adap->adap);
+       free_page((unsigned long)adap->buf);
+       kfree(adap);
+}
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static struct pt1_adapter *
+pt1_alloc_adapter(struct pt1 *pt1, struct dvb_frontend *fe)
+{
+       struct pt1_adapter *adap;
+       void *buf;
+       struct dvb_adapter *dvb_adap;
+       struct dvb_demux *demux;
+       struct dmxdev *dmxdev;
+       int ret;
+
+       adap = kzalloc(sizeof(struct pt1_adapter), GFP_KERNEL);
+       if (!adap) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       adap->pt1 = pt1;
+
+       adap->orig_set_voltage = fe->ops.set_voltage;
+       fe->ops.set_voltage = pt1_set_voltage;
+
+       buf = (u8 *)__get_free_page(GFP_KERNEL);
+       if (!buf) {
+               ret = -ENOMEM;
+               goto err_kfree;
+       }
+
+       adap->buf = buf;
+       adap->upacket_count = 0;
+       adap->packet_count = 0;
+
+       dvb_adap = &adap->adap;
+       dvb_adap->priv = adap;
+       ret = dvb_register_adapter(dvb_adap, DRIVER_NAME, THIS_MODULE,
+                                  &pt1->pdev->dev, adapter_nr);
+       if (ret < 0)
+               goto err_free_page;
+
+       demux = &adap->demux;
+       demux->dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
+       demux->priv = adap;
+       demux->feednum = 256;
+       demux->filternum = 256;
+       demux->start_feed = pt1_start_feed;
+       demux->stop_feed = pt1_stop_feed;
+       demux->write_to_decoder = NULL;
+       ret = dvb_dmx_init(demux);
+       if (ret < 0)
+               goto err_unregister_adapter;
+
+       dmxdev = &adap->dmxdev;
+       dmxdev->filternum = 256;
+       dmxdev->demux = &demux->dmx;
+       dmxdev->capabilities = 0;
+       ret = dvb_dmxdev_init(dmxdev, dvb_adap);
+       if (ret < 0)
+               goto err_dmx_release;
+
+       dvb_net_init(dvb_adap, &adap->net, &demux->dmx);
+
+       ret = dvb_register_frontend(dvb_adap, fe);
+       if (ret < 0)
+               goto err_net_release;
+       adap->fe = fe;
+
+       return adap;
+
+err_net_release:
+       dvb_net_release(&adap->net);
+       adap->demux.dmx.close(&adap->demux.dmx);
+       dvb_dmxdev_release(&adap->dmxdev);
+err_dmx_release:
+       dvb_dmx_release(demux);
+err_unregister_adapter:
+       dvb_unregister_adapter(dvb_adap);
+err_free_page:
+       free_page((unsigned long)buf);
+err_kfree:
+       kfree(adap);
+err:
+       return ERR_PTR(ret);
+}
+
+static void pt1_cleanup_adapters(struct pt1 *pt1)
+{
+       int i;
+       for (i = 0; i < PT1_NR_ADAPS; i++)
+               pt1_free_adapter(pt1->adaps[i]);
+}
+
+struct pt1_config {
+       struct va1j5jf8007s_config va1j5jf8007s_config;
+       struct va1j5jf8007t_config va1j5jf8007t_config;
+};
+
+static const struct pt1_config pt1_configs[2] = {
+       {
+               { .demod_address = 0x1b },
+               { .demod_address = 0x1a },
+       }, {
+               { .demod_address = 0x19 },
+               { .demod_address = 0x18 },
+       },
+};
+
+static int pt1_init_adapters(struct pt1 *pt1)
+{
+       int i, j;
+       struct i2c_adapter *i2c_adap;
+       const struct pt1_config *config;
+       struct dvb_frontend *fe[4];
+       struct pt1_adapter *adap;
+       int ret;
+
+       i = 0;
+       j = 0;
+
+       i2c_adap = &pt1->i2c_adap;
+       do {
+               config = &pt1_configs[i / 2];
+
+               fe[i] = va1j5jf8007s_attach(&config->va1j5jf8007s_config,
+                                           i2c_adap);
+               if (!fe[i]) {
+                       ret = -ENODEV; /* This does not sound nice... */
+                       goto err;
+               }
+               i++;
+
+               fe[i] = va1j5jf8007t_attach(&config->va1j5jf8007t_config,
+                                           i2c_adap);
+               if (!fe[i]) {
+                       ret = -ENODEV;
+                       goto err;
+               }
+               i++;
+
+               ret = va1j5jf8007s_prepare(fe[i - 2]);
+               if (ret < 0)
+                       goto err;
+
+               ret = va1j5jf8007t_prepare(fe[i - 1]);
+               if (ret < 0)
+                       goto err;
+
+       } while (i < 4);
+
+       do {
+               adap = pt1_alloc_adapter(pt1, fe[j]);
+               if (IS_ERR(adap))
+                       goto err;
+               adap->index = j;
+               pt1->adaps[j] = adap;
+       } while (++j < 4);
+
+       return 0;
+
+err:
+       while (i-- > j)
+               fe[i]->ops.release(fe[i]);
+
+       while (j--)
+               pt1_free_adapter(pt1->adaps[j]);
+
+       return ret;
+}
+
+static void pt1_i2c_emit(struct pt1 *pt1, int addr, int busy, int read_enable,
+                        int clock, int data, int next_addr)
+{
+       pt1_write_reg(pt1, 4, addr << 18 | busy << 13 | read_enable << 12 |
+                     !clock << 11 | !data << 10 | next_addr);
+}
+
+static void pt1_i2c_write_bit(struct pt1 *pt1, int addr, int *addrp, int data)
+{
+       pt1_i2c_emit(pt1, addr,     1, 0, 0, data, addr + 1);
+       pt1_i2c_emit(pt1, addr + 1, 1, 0, 1, data, addr + 2);
+       pt1_i2c_emit(pt1, addr + 2, 1, 0, 0, data, addr + 3);
+       *addrp = addr + 3;
+}
+
+static void pt1_i2c_read_bit(struct pt1 *pt1, int addr, int *addrp)
+{
+       pt1_i2c_emit(pt1, addr,     1, 0, 0, 1, addr + 1);
+       pt1_i2c_emit(pt1, addr + 1, 1, 0, 1, 1, addr + 2);
+       pt1_i2c_emit(pt1, addr + 2, 1, 1, 1, 1, addr + 3);
+       pt1_i2c_emit(pt1, addr + 3, 1, 0, 0, 1, addr + 4);
+       *addrp = addr + 4;
+}
+
+static void pt1_i2c_write_byte(struct pt1 *pt1, int addr, int *addrp, int data)
+{
+       int i;
+       for (i = 0; i < 8; i++)
+               pt1_i2c_write_bit(pt1, addr, &addr, data >> (7 - i) & 1);
+       pt1_i2c_write_bit(pt1, addr, &addr, 1);
+       *addrp = addr;
+}
+
+static void pt1_i2c_read_byte(struct pt1 *pt1, int addr, int *addrp, int last)
+{
+       int i;
+       for (i = 0; i < 8; i++)
+               pt1_i2c_read_bit(pt1, addr, &addr);
+       pt1_i2c_write_bit(pt1, addr, &addr, last);
+       *addrp = addr;
+}
+
+static void pt1_i2c_prepare(struct pt1 *pt1, int addr, int *addrp)
+{
+       pt1_i2c_emit(pt1, addr,     1, 0, 1, 1, addr + 1);
+       pt1_i2c_emit(pt1, addr + 1, 1, 0, 1, 0, addr + 2);
+       pt1_i2c_emit(pt1, addr + 2, 1, 0, 0, 0, addr + 3);
+       *addrp = addr + 3;
+}
+
+static void
+pt1_i2c_write_msg(struct pt1 *pt1, int addr, int *addrp, struct i2c_msg *msg)
+{
+       int i;
+       pt1_i2c_prepare(pt1, addr, &addr);
+       pt1_i2c_write_byte(pt1, addr, &addr, msg->addr << 1);
+       for (i = 0; i < msg->len; i++)
+               pt1_i2c_write_byte(pt1, addr, &addr, msg->buf[i]);
+       *addrp = addr;
+}
+
+static void
+pt1_i2c_read_msg(struct pt1 *pt1, int addr, int *addrp, struct i2c_msg *msg)
+{
+       int i;
+       pt1_i2c_prepare(pt1, addr, &addr);
+       pt1_i2c_write_byte(pt1, addr, &addr, msg->addr << 1 | 1);
+       for (i = 0; i < msg->len; i++)
+               pt1_i2c_read_byte(pt1, addr, &addr, i == msg->len - 1);
+       *addrp = addr;
+}
+
+static int pt1_i2c_end(struct pt1 *pt1, int addr)
+{
+       pt1_i2c_emit(pt1, addr,     1, 0, 0, 0, addr + 1);
+       pt1_i2c_emit(pt1, addr + 1, 1, 0, 1, 0, addr + 2);
+       pt1_i2c_emit(pt1, addr + 2, 1, 0, 1, 1, 0);
+
+       pt1_write_reg(pt1, 0, 0x00000004);
+       do {
+               if (signal_pending(current))
+                       return -EINTR;
+               schedule_timeout_interruptible((HZ + 999) / 1000);
+       } while (pt1_read_reg(pt1, 0) & 0x00000080);
+       return 0;
+}
+
+static void pt1_i2c_begin(struct pt1 *pt1, int *addrp)
+{
+       int addr;
+       addr = 0;
+
+       pt1_i2c_emit(pt1, addr,     0, 0, 1, 1, addr /* itself */);
+       addr = addr + 1;
+
+       if (!pt1->i2c_running) {
+               pt1_i2c_emit(pt1, addr,     1, 0, 1, 1, addr + 1);
+               pt1_i2c_emit(pt1, addr + 1, 1, 0, 1, 0, addr + 2);
+               addr = addr + 2;
+               pt1->i2c_running = 1;
+       }
+       *addrp = addr;
+}
+
+static int pt1_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+{
+       struct pt1 *pt1;
+       int i;
+       struct i2c_msg *msg, *next_msg;
+       int addr, ret;
+       u16 len;
+       u32 word;
+
+       pt1 = i2c_get_adapdata(adap);
+
+       for (i = 0; i < num; i++) {
+               msg = &msgs[i];
+               if (msg->flags & I2C_M_RD)
+                       return -ENOTSUPP;
+
+               if (i + 1 < num)
+                       next_msg = &msgs[i + 1];
+               else
+                       next_msg = NULL;
+
+               if (next_msg && next_msg->flags & I2C_M_RD) {
+                       i++;
+
+                       len = next_msg->len;
+                       if (len > 4)
+                               return -ENOTSUPP;
+
+                       pt1_i2c_begin(pt1, &addr);
+                       pt1_i2c_write_msg(pt1, addr, &addr, msg);
+                       pt1_i2c_read_msg(pt1, addr, &addr, next_msg);
+                       ret = pt1_i2c_end(pt1, addr);
+                       if (ret < 0)
+                               return ret;
+
+                       word = pt1_read_reg(pt1, 2);
+                       while (len--) {
+                               next_msg->buf[len] = word;
+                               word >>= 8;
+                       }
+               } else {
+                       pt1_i2c_begin(pt1, &addr);
+                       pt1_i2c_write_msg(pt1, addr, &addr, msg);
+                       ret = pt1_i2c_end(pt1, addr);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
+       return num;
+}
+
+static u32 pt1_i2c_func(struct i2c_adapter *adap)
+{
+       return I2C_FUNC_I2C;
+}
+
+static const struct i2c_algorithm pt1_i2c_algo = {
+       .master_xfer = pt1_i2c_xfer,
+       .functionality = pt1_i2c_func,
+};
+
+static void pt1_i2c_wait(struct pt1 *pt1)
+{
+       int i;
+       for (i = 0; i < 128; i++)
+               pt1_i2c_emit(pt1, 0, 0, 0, 1, 1, 0);
+}
+
+static void pt1_i2c_init(struct pt1 *pt1)
+{
+       int i;
+       for (i = 0; i < 1024; i++)
+               pt1_i2c_emit(pt1, i, 0, 0, 1, 1, 0);
+}
+
+static void __devexit pt1_remove(struct pci_dev *pdev)
+{
+       struct pt1 *pt1;
+       void __iomem *regs;
+
+       pt1 = pci_get_drvdata(pdev);
+       regs = pt1->regs;
+
+       kthread_stop(pt1->kthread);
+       pt1_cleanup_tables(pt1);
+       pt1_cleanup_adapters(pt1);
+       pt1_disable_ram(pt1);
+       pt1_set_power(pt1, 0, 0, 1);
+       i2c_del_adapter(&pt1->i2c_adap);
+       pci_set_drvdata(pdev, NULL);
+       kfree(pt1);
+       pci_iounmap(pdev, regs);
+       pci_release_regions(pdev);
+       pci_disable_device(pdev);
+}
+
+static int __devinit
+pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+       int ret;
+       void __iomem *regs;
+       struct pt1 *pt1;
+       struct i2c_adapter *i2c_adap;
+       struct task_struct *kthread;
+
+       ret = pci_enable_device(pdev);
+       if (ret < 0)
+               goto err;
+
+       ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+       if (ret < 0)
+               goto err_pci_disable_device;
+
+       pci_set_master(pdev);
+
+       ret = pci_request_regions(pdev, DRIVER_NAME);
+       if (ret < 0)
+               goto err_pci_disable_device;
+
+       regs = pci_iomap(pdev, 0, 0);
+       if (!regs) {
+               ret = -EIO;
+               goto err_pci_release_regions;
+       }
+
+       pt1 = kzalloc(sizeof(struct pt1), GFP_KERNEL);
+       if (!pt1) {
+               ret = -ENOMEM;
+               goto err_pci_iounmap;
+       }
+
+       pt1->pdev = pdev;
+       pt1->regs = regs;
+       pci_set_drvdata(pdev, pt1);
+
+       i2c_adap = &pt1->i2c_adap;
+       i2c_adap->class = I2C_CLASS_TV_DIGITAL;
+       i2c_adap->algo = &pt1_i2c_algo;
+       i2c_adap->algo_data = NULL;
+       i2c_adap->dev.parent = &pdev->dev;
+       i2c_set_adapdata(i2c_adap, pt1);
+       ret = i2c_add_adapter(i2c_adap);
+       if (ret < 0)
+               goto err_kfree;
+
+       pt1_set_power(pt1, 0, 0, 1);
+
+       pt1_i2c_init(pt1);
+       pt1_i2c_wait(pt1);
+
+       ret = pt1_sync(pt1);
+       if (ret < 0)
+               goto err_i2c_del_adapter;
+
+       pt1_identify(pt1);
+
+       ret = pt1_unlock(pt1);
+       if (ret < 0)
+               goto err_i2c_del_adapter;
+
+       ret = pt1_reset_pci(pt1);
+       if (ret < 0)
+               goto err_i2c_del_adapter;
+
+       ret = pt1_reset_ram(pt1);
+       if (ret < 0)
+               goto err_i2c_del_adapter;
+
+       ret = pt1_enable_ram(pt1);
+       if (ret < 0)
+               goto err_i2c_del_adapter;
+
+       pt1_init_streams(pt1);
+
+       pt1_set_power(pt1, 1, 0, 1);
+       schedule_timeout_uninterruptible((HZ + 49) / 50);
+
+       pt1_set_power(pt1, 1, 0, 0);
+       schedule_timeout_uninterruptible((HZ + 999) / 1000);
+
+       ret = pt1_init_adapters(pt1);
+       if (ret < 0)
+               goto err_pt1_disable_ram;
+
+       ret = pt1_init_tables(pt1);
+       if (ret < 0)
+               goto err_pt1_cleanup_adapters;
+
+       kthread = kthread_run(pt1_thread, pt1, "pt1");
+       if (IS_ERR(kthread)) {
+               ret = PTR_ERR(kthread);
+               goto err_pt1_cleanup_tables;
+       }
+
+       pt1->kthread = kthread;
+       return 0;
+
+err_pt1_cleanup_tables:
+       pt1_cleanup_tables(pt1);
+err_pt1_cleanup_adapters:
+       pt1_cleanup_adapters(pt1);
+err_pt1_disable_ram:
+       pt1_disable_ram(pt1);
+       pt1_set_power(pt1, 0, 0, 1);
+err_i2c_del_adapter:
+       i2c_del_adapter(i2c_adap);
+err_kfree:
+       pci_set_drvdata(pdev, NULL);
+       kfree(pt1);
+err_pci_iounmap:
+       pci_iounmap(pdev, regs);
+err_pci_release_regions:
+       pci_release_regions(pdev);
+err_pci_disable_device:
+       pci_disable_device(pdev);
+err:
+       return ret;
+
+}
+
+static struct pci_device_id pt1_id_table[] = {
+       { PCI_DEVICE(0x10ee, 0x211a) },
+       { },
+};
+MODULE_DEVICE_TABLE(pci, pt1_id_table);
+
+static struct pci_driver pt1_driver = {
+       .name           = DRIVER_NAME,
+       .probe          = pt1_probe,
+       .remove         = __devexit_p(pt1_remove),
+       .id_table       = pt1_id_table,
+};
+
+
+static int __init pt1_init(void)
+{
+       return pci_register_driver(&pt1_driver);
+}
+
+
+static void __exit pt1_cleanup(void)
+{
+       pci_unregister_driver(&pt1_driver);
+}
+
+module_init(pt1_init);
+module_exit(pt1_cleanup);
+
+MODULE_AUTHOR("Takahito HIRANO <hiranotaka@zng.info>");
+MODULE_DESCRIPTION("Earthsoft PT1 Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.c b/drivers/media/dvb/pt1/va1j5jf8007s.c
new file mode 100644 (file)
index 0000000..2db940f
--- /dev/null
@@ -0,0 +1,658 @@
+/*
+ * ISDB-S driver for VA1J5JF8007
+ *
+ * Copyright (C) 2009 HIRANO Takahito <hiranotaka@zng.info>
+ *
+ * based on pt1dvr - http://pt1dvr.sourceforge.jp/
+ *     by Tomoaki Ishikawa <tomy@users.sourceforge.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+#include "va1j5jf8007s.h"
+
+enum va1j5jf8007s_tune_state {
+       VA1J5JF8007S_IDLE,
+       VA1J5JF8007S_SET_FREQUENCY_1,
+       VA1J5JF8007S_SET_FREQUENCY_2,
+       VA1J5JF8007S_SET_FREQUENCY_3,
+       VA1J5JF8007S_CHECK_FREQUENCY,
+       VA1J5JF8007S_SET_MODULATION,
+       VA1J5JF8007S_CHECK_MODULATION,
+       VA1J5JF8007S_SET_TS_ID,
+       VA1J5JF8007S_CHECK_TS_ID,
+       VA1J5JF8007S_TRACK,
+};
+
+struct va1j5jf8007s_state {
+       const struct va1j5jf8007s_config *config;
+       struct i2c_adapter *adap;
+       struct dvb_frontend fe;
+       enum va1j5jf8007s_tune_state tune_state;
+};
+
+static int va1j5jf8007s_get_frontend_algo(struct dvb_frontend *fe)
+{
+       return DVBFE_ALGO_HW;
+}
+
+static int
+va1j5jf8007s_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+       struct va1j5jf8007s_state *state;
+
+       state = fe->demodulator_priv;
+
+       switch (state->tune_state) {
+       case VA1J5JF8007S_IDLE:
+       case VA1J5JF8007S_SET_FREQUENCY_1:
+       case VA1J5JF8007S_SET_FREQUENCY_2:
+       case VA1J5JF8007S_SET_FREQUENCY_3:
+       case VA1J5JF8007S_CHECK_FREQUENCY:
+               *status = 0;
+               return 0;
+
+
+       case VA1J5JF8007S_SET_MODULATION:
+       case VA1J5JF8007S_CHECK_MODULATION:
+               *status |= FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007S_SET_TS_ID:
+       case VA1J5JF8007S_CHECK_TS_ID:
+               *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
+               return 0;
+
+       case VA1J5JF8007S_TRACK:
+               *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
+               return 0;
+       }
+
+       BUG();
+}
+
+struct va1j5jf8007s_cb_map {
+       u32 frequency;
+       u8 cb;
+};
+
+static const struct va1j5jf8007s_cb_map va1j5jf8007s_cb_maps[] = {
+       {  986000, 0xb2 },
+       { 1072000, 0xd2 },
+       { 1154000, 0xe2 },
+       { 1291000, 0x20 },
+       { 1447000, 0x40 },
+       { 1615000, 0x60 },
+       { 1791000, 0x80 },
+       { 1972000, 0xa0 },
+};
+
+static u8 va1j5jf8007s_lookup_cb(u32 frequency)
+{
+       int i;
+       const struct va1j5jf8007s_cb_map *map;
+
+       for (i = 0; i < ARRAY_SIZE(va1j5jf8007s_cb_maps); i++) {
+               map = &va1j5jf8007s_cb_maps[i];
+               if (frequency < map->frequency)
+                       return map->cb;
+       }
+       return 0xc0;
+}
+
+static int va1j5jf8007s_set_frequency_1(struct va1j5jf8007s_state *state)
+{
+       u32 frequency;
+       u16 word;
+       u8 buf[6];
+       struct i2c_msg msg;
+
+       frequency = state->fe.dtv_property_cache.frequency;
+
+       word = (frequency + 500) / 1000;
+       if (frequency < 1072000)
+               word = (word << 1 & ~0x1f) | (word & 0x0f);
+
+       buf[0] = 0xfe;
+       buf[1] = 0xc0;
+       buf[2] = 0x40 | word >> 8;
+       buf[3] = word;
+       buf[4] = 0xe0;
+       buf[5] = va1j5jf8007s_lookup_cb(frequency);
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007s_set_frequency_2(struct va1j5jf8007s_state *state)
+{
+       u8 buf[3];
+       struct i2c_msg msg;
+
+       buf[0] = 0xfe;
+       buf[1] = 0xc0;
+       buf[2] = 0xe4;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007s_set_frequency_3(struct va1j5jf8007s_state *state)
+{
+       u32 frequency;
+       u8 buf[4];
+       struct i2c_msg msg;
+
+       frequency = state->fe.dtv_property_cache.frequency;
+
+       buf[0] = 0xfe;
+       buf[1] = 0xc0;
+       buf[2] = 0xf4;
+       buf[3] = va1j5jf8007s_lookup_cb(frequency) | 0x4;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int
+va1j5jf8007s_check_frequency(struct va1j5jf8007s_state *state, int *lock)
+{
+       u8 addr;
+       u8 write_buf[2], read_buf[1];
+       struct i2c_msg msgs[2];
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0xfe;
+       write_buf[1] = 0xc1;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       *lock = read_buf[0] & 0x40;
+       return 0;
+}
+
+static int va1j5jf8007s_set_modulation(struct va1j5jf8007s_state *state)
+{
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       buf[0] = 0x03;
+       buf[1] = 0x01;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int
+va1j5jf8007s_check_modulation(struct va1j5jf8007s_state *state, int *lock)
+{
+       u8 addr;
+       u8 write_buf[1], read_buf[1];
+       struct i2c_msg msgs[2];
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0xc3;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       *lock = !(read_buf[0] & 0x10);
+       return 0;
+}
+
+static int
+va1j5jf8007s_set_ts_id(struct va1j5jf8007s_state *state)
+{
+       u32 ts_id;
+       u8 buf[3];
+       struct i2c_msg msg;
+
+       ts_id = state->fe.dtv_property_cache.isdbs_ts_id;
+       if (!ts_id)
+               return 0;
+
+       buf[0] = 0x8f;
+       buf[1] = ts_id >> 8;
+       buf[2] = ts_id;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int
+va1j5jf8007s_check_ts_id(struct va1j5jf8007s_state *state, int *lock)
+{
+       u8 addr;
+       u8 write_buf[1], read_buf[2];
+       struct i2c_msg msgs[2];
+       u32 ts_id;
+
+       ts_id = state->fe.dtv_property_cache.isdbs_ts_id;
+       if (!ts_id) {
+               *lock = 1;
+               return 0;
+       }
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0xe6;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       *lock = (read_buf[0] << 8 | read_buf[1]) == ts_id;
+       return 0;
+}
+
+static int
+va1j5jf8007s_tune(struct dvb_frontend *fe,
+                 struct dvb_frontend_parameters *params,
+                 unsigned int mode_flags,  unsigned int *delay,
+                 fe_status_t *status)
+{
+       struct va1j5jf8007s_state *state;
+       int ret;
+       int lock;
+
+       state = fe->demodulator_priv;
+
+       if (params != NULL)
+               state->tune_state = VA1J5JF8007S_SET_FREQUENCY_1;
+
+       switch (state->tune_state) {
+       case VA1J5JF8007S_IDLE:
+               *delay = 3 * HZ;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007S_SET_FREQUENCY_1:
+               ret = va1j5jf8007s_set_frequency_1(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007S_SET_FREQUENCY_2;
+               *delay = 0;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007S_SET_FREQUENCY_2:
+               ret = va1j5jf8007s_set_frequency_2(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007S_SET_FREQUENCY_3;
+               *delay = (HZ + 99) / 100;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007S_SET_FREQUENCY_3:
+               ret = va1j5jf8007s_set_frequency_3(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007S_CHECK_FREQUENCY;
+               *delay = 0;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007S_CHECK_FREQUENCY:
+               ret = va1j5jf8007s_check_frequency(state, &lock);
+               if (ret < 0)
+                       return ret;
+
+               if (!lock)  {
+                       *delay = (HZ + 999) / 1000;
+                       *status = 0;
+                       return 0;
+               }
+
+               state->tune_state = VA1J5JF8007S_SET_MODULATION;
+               *delay = 0;
+               *status = FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007S_SET_MODULATION:
+               ret = va1j5jf8007s_set_modulation(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007S_CHECK_MODULATION;
+               *delay = 0;
+               *status = FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007S_CHECK_MODULATION:
+               ret = va1j5jf8007s_check_modulation(state, &lock);
+               if (ret < 0)
+                       return ret;
+
+               if (!lock)  {
+                       *delay = (HZ + 49) / 50;
+                       *status = FE_HAS_SIGNAL;
+                       return 0;
+               }
+
+               state->tune_state = VA1J5JF8007S_SET_TS_ID;
+               *delay = 0;
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER;
+               return 0;
+
+       case VA1J5JF8007S_SET_TS_ID:
+               ret = va1j5jf8007s_set_ts_id(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007S_CHECK_TS_ID;
+               return 0;
+
+       case VA1J5JF8007S_CHECK_TS_ID:
+               ret = va1j5jf8007s_check_ts_id(state, &lock);
+               if (ret < 0)
+                       return ret;
+
+               if (!lock)  {
+                       *delay = (HZ + 99) / 100;
+                       *status = FE_HAS_SIGNAL | FE_HAS_CARRIER;
+                       return 0;
+               }
+
+               state->tune_state = VA1J5JF8007S_TRACK;
+               /* fall through */
+
+       case VA1J5JF8007S_TRACK:
+               *delay = 3 * HZ;
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
+               return 0;
+       }
+
+       BUG();
+}
+
+static int va1j5jf8007s_init_frequency(struct va1j5jf8007s_state *state)
+{
+       u8 buf[4];
+       struct i2c_msg msg;
+
+       buf[0] = 0xfe;
+       buf[1] = 0xc0;
+       buf[2] = 0xf0;
+       buf[3] = 0x04;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007s_set_sleep(struct va1j5jf8007s_state *state, int sleep)
+{
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       buf[0] = 0x17;
+       buf[1] = sleep ? 0x01 : 0x00;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007s_sleep(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007s_state *state;
+       int ret;
+
+       state = fe->demodulator_priv;
+
+       ret = va1j5jf8007s_init_frequency(state);
+       if (ret < 0)
+               return ret;
+
+       return va1j5jf8007s_set_sleep(state, 1);
+}
+
+static int va1j5jf8007s_init(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007s_state *state;
+
+       state = fe->demodulator_priv;
+       state->tune_state = VA1J5JF8007S_IDLE;
+
+       return va1j5jf8007s_set_sleep(state, 0);
+}
+
+static void va1j5jf8007s_release(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007s_state *state;
+       state = fe->demodulator_priv;
+       kfree(state);
+}
+
+static struct dvb_frontend_ops va1j5jf8007s_ops = {
+       .info = {
+               .name = "VA1J5JF8007 ISDB-S",
+               .type = FE_QPSK,
+               .frequency_min = 950000,
+               .frequency_max = 2150000,
+               .frequency_stepsize = 1000,
+               .caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_AUTO |
+                       FE_CAN_QAM_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO |
+                       FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO,
+       },
+
+       .get_frontend_algo = va1j5jf8007s_get_frontend_algo,
+       .read_status = va1j5jf8007s_read_status,
+       .tune = va1j5jf8007s_tune,
+       .sleep = va1j5jf8007s_sleep,
+       .init = va1j5jf8007s_init,
+       .release = va1j5jf8007s_release,
+};
+
+static int va1j5jf8007s_prepare_1(struct va1j5jf8007s_state *state)
+{
+       u8 addr;
+       u8 write_buf[1], read_buf[1];
+       struct i2c_msg msgs[2];
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0x07;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       if (read_buf[0] != 0x41)
+               return -EIO;
+
+       return 0;
+}
+
+static const u8 va1j5jf8007s_prepare_bufs[][2] = {
+       {0x04, 0x02}, {0x0d, 0x55}, {0x11, 0x40}, {0x13, 0x80}, {0x17, 0x01},
+       {0x1c, 0x0a}, {0x1d, 0xaa}, {0x1e, 0x20}, {0x1f, 0x88}, {0x51, 0xb0},
+       {0x52, 0x89}, {0x53, 0xb3}, {0x5a, 0x2d}, {0x5b, 0xd3}, {0x85, 0x69},
+       {0x87, 0x04}, {0x8e, 0x02}, {0xa3, 0xf7}, {0xa5, 0xc0},
+};
+
+static int va1j5jf8007s_prepare_2(struct va1j5jf8007s_state *state)
+{
+       u8 addr;
+       u8 buf[2];
+       struct i2c_msg msg;
+       int i;
+
+       addr = state->config->demod_address;
+
+       msg.addr = addr;
+       msg.flags = 0;
+       msg.len = 2;
+       msg.buf = buf;
+       for (i = 0; i < ARRAY_SIZE(va1j5jf8007s_prepare_bufs); i++) {
+               memcpy(buf, va1j5jf8007s_prepare_bufs[i], sizeof(buf));
+               if (i2c_transfer(state->adap, &msg, 1) != 1)
+                       return -EREMOTEIO;
+       }
+
+       return 0;
+}
+
+/* must be called after va1j5jf8007t_attach */
+int va1j5jf8007s_prepare(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007s_state *state;
+       int ret;
+
+       state = fe->demodulator_priv;
+
+       ret = va1j5jf8007s_prepare_1(state);
+       if (ret < 0)
+               return ret;
+
+       ret = va1j5jf8007s_prepare_2(state);
+       if (ret < 0)
+               return ret;
+
+       return va1j5jf8007s_init_frequency(state);
+}
+
+struct dvb_frontend *
+va1j5jf8007s_attach(const struct va1j5jf8007s_config *config,
+                   struct i2c_adapter *adap)
+{
+       struct va1j5jf8007s_state *state;
+       struct dvb_frontend *fe;
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       state = kzalloc(sizeof(struct va1j5jf8007s_state), GFP_KERNEL);
+       if (!state)
+               return NULL;
+
+       state->config = config;
+       state->adap = adap;
+
+       fe = &state->fe;
+       memcpy(&fe->ops, &va1j5jf8007s_ops, sizeof(struct dvb_frontend_ops));
+       fe->demodulator_priv = state;
+
+       buf[0] = 0x01;
+       buf[1] = 0x80;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1) {
+               kfree(state);
+               return NULL;
+       }
+
+       return fe;
+}
diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.h b/drivers/media/dvb/pt1/va1j5jf8007s.h
new file mode 100644 (file)
index 0000000..aa228a8
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * ISDB-S driver for VA1J5JF8007
+ *
+ * Copyright (C) 2009 HIRANO Takahito <hiranotaka@zng.info>
+ *
+ * based on pt1dvr - http://pt1dvr.sourceforge.jp/
+ *     by Tomoaki Ishikawa <tomy@users.sourceforge.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef VA1J5JF8007S_H
+#define VA1J5JF8007S_H
+
+struct va1j5jf8007s_config {
+       u8 demod_address;
+};
+
+struct i2c_adapter;
+
+struct dvb_frontend *
+va1j5jf8007s_attach(const struct va1j5jf8007s_config *config,
+                   struct i2c_adapter *adap);
+
+/* must be called after va1j5jf8007t_attach */
+int va1j5jf8007s_prepare(struct dvb_frontend *fe);
+
+#endif
diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.c b/drivers/media/dvb/pt1/va1j5jf8007t.c
new file mode 100644 (file)
index 0000000..71117f4
--- /dev/null
@@ -0,0 +1,468 @@
+/*
+ * ISDB-T driver for VA1J5JF8007
+ *
+ * Copyright (C) 2009 HIRANO Takahito <hiranotaka@zng.info>
+ *
+ * based on pt1dvr - http://pt1dvr.sourceforge.jp/
+ *     by Tomoaki Ishikawa <tomy@users.sourceforge.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+#include "dvb_math.h"
+#include "va1j5jf8007t.h"
+
+enum va1j5jf8007t_tune_state {
+       VA1J5JF8007T_IDLE,
+       VA1J5JF8007T_SET_FREQUENCY,
+       VA1J5JF8007T_CHECK_FREQUENCY,
+       VA1J5JF8007T_SET_MODULATION,
+       VA1J5JF8007T_CHECK_MODULATION,
+       VA1J5JF8007T_TRACK,
+       VA1J5JF8007T_ABORT,
+};
+
+struct va1j5jf8007t_state {
+       const struct va1j5jf8007t_config *config;
+       struct i2c_adapter *adap;
+       struct dvb_frontend fe;
+       enum va1j5jf8007t_tune_state tune_state;
+};
+
+static int va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
+{
+       return DVBFE_ALGO_HW;
+}
+
+static int
+va1j5jf8007t_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+       struct va1j5jf8007t_state *state;
+
+       state = fe->demodulator_priv;
+
+       switch (state->tune_state) {
+       case VA1J5JF8007T_IDLE:
+       case VA1J5JF8007T_SET_FREQUENCY:
+       case VA1J5JF8007T_CHECK_FREQUENCY:
+               *status = 0;
+               return 0;
+
+
+       case VA1J5JF8007T_SET_MODULATION:
+       case VA1J5JF8007T_CHECK_MODULATION:
+       case VA1J5JF8007T_ABORT:
+               *status |= FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007T_TRACK:
+               *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
+               return 0;
+       }
+
+       BUG();
+}
+
+struct va1j5jf8007t_cb_map {
+       u32 frequency;
+       u8 cb;
+};
+
+static const struct va1j5jf8007t_cb_map va1j5jf8007t_cb_maps[] = {
+       {  90000000, 0x80 },
+       { 140000000, 0x81 },
+       { 170000000, 0xa1 },
+       { 220000000, 0x62 },
+       { 330000000, 0xa2 },
+       { 402000000, 0xe2 },
+       { 450000000, 0x64 },
+       { 550000000, 0x84 },
+       { 600000000, 0xa4 },
+       { 700000000, 0xc4 },
+};
+
+static u8 va1j5jf8007t_lookup_cb(u32 frequency)
+{
+       int i;
+       const struct va1j5jf8007t_cb_map *map;
+
+       for (i = 0; i < ARRAY_SIZE(va1j5jf8007t_cb_maps); i++) {
+               map = &va1j5jf8007t_cb_maps[i];
+               if (frequency < map->frequency)
+                       return map->cb;
+       }
+       return 0xe4;
+}
+
+static int va1j5jf8007t_set_frequency(struct va1j5jf8007t_state *state)
+{
+       u32 frequency;
+       u16 word;
+       u8 buf[6];
+       struct i2c_msg msg;
+
+       frequency = state->fe.dtv_property_cache.frequency;
+
+       word = (frequency + 71428) / 142857 + 399;
+       buf[0] = 0xfe;
+       buf[1] = 0xc2;
+       buf[2] = word >> 8;
+       buf[3] = word;
+       buf[4] = 0x80;
+       buf[5] = va1j5jf8007t_lookup_cb(frequency);
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int
+va1j5jf8007t_check_frequency(struct va1j5jf8007t_state *state, int *lock)
+{
+       u8 addr;
+       u8 write_buf[2], read_buf[1];
+       struct i2c_msg msgs[2];
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0xfe;
+       write_buf[1] = 0xc3;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       *lock = read_buf[0] & 0x40;
+       return 0;
+}
+
+static int va1j5jf8007t_set_modulation(struct va1j5jf8007t_state *state)
+{
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       buf[0] = 0x01;
+       buf[1] = 0x40;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007t_check_modulation(struct va1j5jf8007t_state *state,
+                                        int *lock, int *retry)
+{
+       u8 addr;
+       u8 write_buf[1], read_buf[1];
+       struct i2c_msg msgs[2];
+
+       addr = state->config->demod_address;
+
+       write_buf[0] = 0x80;
+
+       msgs[0].addr = addr;
+       msgs[0].flags = 0;
+       msgs[0].len = sizeof(write_buf);
+       msgs[0].buf = write_buf;
+
+       msgs[1].addr = addr;
+       msgs[1].flags = I2C_M_RD;
+       msgs[1].len = sizeof(read_buf);
+       msgs[1].buf = read_buf;
+
+       if (i2c_transfer(state->adap, msgs, 2) != 2)
+               return -EREMOTEIO;
+
+       *lock = !(read_buf[0] & 0x10);
+       *retry = read_buf[0] & 0x80;
+       return 0;
+}
+
+static int
+va1j5jf8007t_tune(struct dvb_frontend *fe,
+                 struct dvb_frontend_parameters *params,
+                 unsigned int mode_flags,  unsigned int *delay,
+                 fe_status_t *status)
+{
+       struct va1j5jf8007t_state *state;
+       int ret;
+       int lock, retry;
+
+       state = fe->demodulator_priv;
+
+       if (params != NULL)
+               state->tune_state = VA1J5JF8007T_SET_FREQUENCY;
+
+       switch (state->tune_state) {
+       case VA1J5JF8007T_IDLE:
+               *delay = 3 * HZ;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007T_SET_FREQUENCY:
+               ret = va1j5jf8007t_set_frequency(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007T_CHECK_FREQUENCY;
+               *delay = 0;
+               *status = 0;
+               return 0;
+
+       case VA1J5JF8007T_CHECK_FREQUENCY:
+               ret = va1j5jf8007t_check_frequency(state, &lock);
+               if (ret < 0)
+                       return ret;
+
+               if (!lock)  {
+                       *delay = (HZ + 999) / 1000;
+                       *status = 0;
+                       return 0;
+               }
+
+               state->tune_state = VA1J5JF8007T_SET_MODULATION;
+               *delay = 0;
+               *status = FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007T_SET_MODULATION:
+               ret = va1j5jf8007t_set_modulation(state);
+               if (ret < 0)
+                       return ret;
+
+               state->tune_state = VA1J5JF8007T_CHECK_MODULATION;
+               *delay = 0;
+               *status = FE_HAS_SIGNAL;
+               return 0;
+
+       case VA1J5JF8007T_CHECK_MODULATION:
+               ret = va1j5jf8007t_check_modulation(state, &lock, &retry);
+               if (ret < 0)
+                       return ret;
+
+               if (!lock)  {
+                       if (!retry)  {
+                               state->tune_state = VA1J5JF8007T_ABORT;
+                               *delay = 3 * HZ;
+                               *status = FE_HAS_SIGNAL;
+                               return 0;
+                       }
+                       *delay = (HZ + 999) / 1000;
+                       *status = FE_HAS_SIGNAL;
+                       return 0;
+               }
+
+               state->tune_state = VA1J5JF8007T_TRACK;
+               /* fall through */
+
+       case VA1J5JF8007T_TRACK:
+               *delay = 3 * HZ;
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_LOCK;
+               return 0;
+
+       case VA1J5JF8007T_ABORT:
+               *delay = 3 * HZ;
+               *status = FE_HAS_SIGNAL;
+               return 0;
+       }
+
+       BUG();
+}
+
+static int va1j5jf8007t_init_frequency(struct va1j5jf8007t_state *state)
+{
+       u8 buf[7];
+       struct i2c_msg msg;
+
+       buf[0] = 0xfe;
+       buf[1] = 0xc2;
+       buf[2] = 0x01;
+       buf[3] = 0x8f;
+       buf[4] = 0xc1;
+       buf[5] = 0x80;
+       buf[6] = 0x80;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007t_set_sleep(struct va1j5jf8007t_state *state, int sleep)
+{
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       buf[0] = 0x03;
+       buf[1] = sleep ? 0x90 : 0x80;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1)
+               return -EREMOTEIO;
+
+       return 0;
+}
+
+static int va1j5jf8007t_sleep(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007t_state *state;
+       int ret;
+
+       state = fe->demodulator_priv;
+
+       ret = va1j5jf8007t_init_frequency(state);
+       if (ret < 0)
+               return ret;
+
+       return va1j5jf8007t_set_sleep(state, 1);
+}
+
+static int va1j5jf8007t_init(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007t_state *state;
+
+       state = fe->demodulator_priv;
+       state->tune_state = VA1J5JF8007T_IDLE;
+
+       return va1j5jf8007t_set_sleep(state, 0);
+}
+
+static void va1j5jf8007t_release(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007t_state *state;
+       state = fe->demodulator_priv;
+       kfree(state);
+}
+
+static struct dvb_frontend_ops va1j5jf8007t_ops = {
+       .info = {
+               .name = "VA1J5JF8007 ISDB-T",
+               .type = FE_OFDM,
+               .frequency_min = 90000000,
+               .frequency_max = 770000000,
+               .frequency_stepsize = 142857,
+               .caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_AUTO |
+                       FE_CAN_QAM_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO |
+                       FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO,
+       },
+
+       .get_frontend_algo = va1j5jf8007t_get_frontend_algo,
+       .read_status = va1j5jf8007t_read_status,
+       .tune = va1j5jf8007t_tune,
+       .sleep = va1j5jf8007t_sleep,
+       .init = va1j5jf8007t_init,
+       .release = va1j5jf8007t_release,
+};
+
+static const u8 va1j5jf8007t_prepare_bufs[][2] = {
+       {0x03, 0x90}, {0x14, 0x8f}, {0x1c, 0x2a}, {0x1d, 0xa8}, {0x1e, 0xa2},
+       {0x22, 0x83}, {0x31, 0x0d}, {0x32, 0xe0}, {0x39, 0xd3}, {0x3a, 0x00},
+       {0x5c, 0x40}, {0x5f, 0x80}, {0x75, 0x02}, {0x76, 0x4e}, {0x77, 0x03},
+       {0xef, 0x01}
+};
+
+int va1j5jf8007t_prepare(struct dvb_frontend *fe)
+{
+       struct va1j5jf8007t_state *state;
+       u8 buf[2];
+       struct i2c_msg msg;
+       int i;
+
+       state = fe->demodulator_priv;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       for (i = 0; i < ARRAY_SIZE(va1j5jf8007t_prepare_bufs); i++) {
+               memcpy(buf, va1j5jf8007t_prepare_bufs[i], sizeof(buf));
+               if (i2c_transfer(state->adap, &msg, 1) != 1)
+                       return -EREMOTEIO;
+       }
+
+       return va1j5jf8007t_init_frequency(state);
+}
+
+struct dvb_frontend *
+va1j5jf8007t_attach(const struct va1j5jf8007t_config *config,
+                   struct i2c_adapter *adap)
+{
+       struct va1j5jf8007t_state *state;
+       struct dvb_frontend *fe;
+       u8 buf[2];
+       struct i2c_msg msg;
+
+       state = kzalloc(sizeof(struct va1j5jf8007t_state), GFP_KERNEL);
+       if (!state)
+               return NULL;
+
+       state->config = config;
+       state->adap = adap;
+
+       fe = &state->fe;
+       memcpy(&fe->ops, &va1j5jf8007t_ops, sizeof(struct dvb_frontend_ops));
+       fe->demodulator_priv = state;
+
+       buf[0] = 0x01;
+       buf[1] = 0x80;
+
+       msg.addr = state->config->demod_address;
+       msg.flags = 0;
+       msg.len = sizeof(buf);
+       msg.buf = buf;
+
+       if (i2c_transfer(state->adap, &msg, 1) != 1) {
+               kfree(state);
+               return NULL;
+       }
+
+       return fe;
+}
diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.h b/drivers/media/dvb/pt1/va1j5jf8007t.h
new file mode 100644 (file)
index 0000000..ed49906
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * ISDB-T driver for VA1J5JF8007
+ *
+ * Copyright (C) 2009 HIRANO Takahito <hiranotaka@zng.info>
+ *
+ * based on pt1dvr - http://pt1dvr.sourceforge.jp/
+ *     by Tomoaki Ishikawa <tomy@users.sourceforge.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef VA1J5JF8007T_H
+#define VA1J5JF8007T_H
+
+struct va1j5jf8007t_config {
+       u8 demod_address;
+};
+
+struct i2c_adapter;
+
+struct dvb_frontend *
+va1j5jf8007t_attach(const struct va1j5jf8007t_config *config,
+                   struct i2c_adapter *adap);
+
+/* must be called after va1j5jf8007s_attach */
+int va1j5jf8007t_prepare(struct dvb_frontend *fe);
+
+#endif
index bd9ab9d..fa6a623 100644 (file)
@@ -1367,7 +1367,7 @@ int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level)
                                            &msg, sizeof(msg));
 }
 
-/* new GPIO managment implementation */
+/* new GPIO management implementation */
 static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum,
                u32 *pGroupNum, u32 *pGroupCfg) {
 
index f1108c6..eec18aa 100644 (file)
@@ -657,12 +657,12 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
 extern void smscore_putbuffer(struct smscore_device_t *coredev,
                              struct smscore_buffer_t *cb);
 
-/* old GPIO managment */
+/* old GPIO management */
 int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
                           struct smscore_config_gpio *pinconfig);
 int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level);
 
-/* new GPIO managment */
+/* new GPIO management */
 extern int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
                struct smscore_gpio_config *pGpioConfig);
 extern int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum,
index 25a36ad..a87a477 100644 (file)
@@ -346,7 +346,7 @@ config RADIO_SI4713
        ---help---
          Say Y here if you want support to Si4713 FM Radio Transmitter.
          This device can transmit audio through FM. It can transmit
-         EDS and EBDS signals as well. This module is the v4l2 radio
+         RDS and RBDS signals as well. This module is the v4l2 radio
          interface for the i2c driver of this device.
 
          To compile this driver as a module, choose M here: the
index 575bf9d..a123908 100644 (file)
@@ -46,7 +46,7 @@
  * Version 0.11:       Converted to v4l2_device.
  *
  * Many things to do:
- *     - Correct power managment of device (suspend & resume)
+ *     - Correct power management of device (suspend & resume)
  *     - Add code for scanning and smooth tuning
  *     - Add code for sensitivity value
  *     - Correct mistakes
index 65c14b7..170bbe5 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
index 1d75852..e6186b3 100644 (file)
@@ -265,6 +265,15 @@ config VIDEO_SAA6588
 
 comment "Video decoders"
 
+config VIDEO_ADV7180
+       tristate "Analog Devices ADV7180 decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Analog Devices ADV7180 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adv7180.
+
 config VIDEO_BT819
        tristate "BT819A VideoStream decoder"
        depends on VIDEO_V4L2 && I2C
@@ -493,6 +502,39 @@ config VIDEO_UPD64083
 
 endmenu # encoder / decoder chips
 
+config DISPLAY_DAVINCI_DM646X_EVM
+       tristate "DM646x EVM Video Display"
+       depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+       select VIDEOBUF_DMA_CONTIG
+       select VIDEO_DAVINCI_VPIF
+       select VIDEO_ADV7343
+       select VIDEO_THS7303
+       help
+         Support for DM6467 based display device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vpif_display.
+
+config CAPTURE_DAVINCI_DM646X_EVM
+       tristate "DM646x EVM Video Capture"
+       depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+       select VIDEOBUF_DMA_CONTIG
+       select VIDEO_DAVINCI_VPIF
+       help
+         Support for DM6467 based capture device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vpif_capture.
+
+config VIDEO_DAVINCI_VPIF
+       tristate "DaVinci VPIF Driver"
+       depends on DISPLAY_DAVINCI_DM646X_EVM
+       help
+         Support for DaVinci VPIF Driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vpif.
+
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
@@ -505,6 +547,55 @@ config VIDEO_VIVI
          Say Y here if you want to test video apps or debug V4L devices.
          In doubt, say N.
 
+config VIDEO_VPSS_SYSTEM
+       tristate "VPSS System module driver"
+       depends on ARCH_DAVINCI
+       help
+         Support for vpss system module for video driver
+       default y
+
+config VIDEO_VPFE_CAPTURE
+       tristate "VPFE Video Capture Driver"
+       depends on VIDEO_V4L2 && ARCH_DAVINCI
+       select VIDEOBUF_DMA_CONTIG
+       help
+         Support for DMXXXX VPFE based frame grabber. This is the
+         common V4L2 module for following DMXXX SoCs from Texas
+         Instruments:- DM6446 & DM355.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vpfe-capture.
+
+config VIDEO_DM6446_CCDC
+       tristate "DM6446 CCDC HW module"
+       depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
+       select VIDEO_VPSS_SYSTEM
+       default y
+       help
+          Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
+          with decoder modules such as TVP5146 over BT656 or
+          sensor module such as MT9T001 over a raw interface. This
+          module configures the interface and CCDC/ISIF to do
+          video frame capture from slave decoders.
+
+          To compile this driver as a module, choose M here: the
+          module will be called vpfe.
+
+config VIDEO_DM355_CCDC
+       tristate "DM355 CCDC HW module"
+       depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
+       select VIDEO_VPSS_SYSTEM
+       default y
+       help
+          Enables DM355 CCD hw module. DM355 CCDC hw interfaces
+          with decoder modules such as TVP5146 over BT656 or
+          sensor module such as MT9T001 over a raw interface. This
+          module configures the interface and CCDC/ISIF to do
+          video frame capture from a slave decoders
+
+          To compile this driver as a module, choose M here: the
+          module will be called vpfe.
+
 source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_PMS
@@ -690,6 +781,8 @@ source "drivers/media/video/ivtv/Kconfig"
 
 source "drivers/media/video/cx18/Kconfig"
 
+source "drivers/media/video/saa7164/Kconfig"
+
 config VIDEO_M32R_AR
        tristate "AR devices"
        depends on M32R && VIDEO_V4L1
index 9f2e321..e541932 100644 (file)
@@ -45,6 +45,7 @@ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
 obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
 obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
 obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
+obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
 obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
 obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
 obj-$(CONFIG_VIDEO_BT819) += bt819.o
@@ -154,12 +155,17 @@ obj-$(CONFIG_VIDEO_MX3)                   += mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)             += pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)      += sh_mobile_ceu_camera.o
 
+obj-$(CONFIG_ARCH_DAVINCI)             += davinci/
+
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
 
 obj-$(CONFIG_USB_VIDEO_CLASS)  += uvc/
+obj-$(CONFIG_VIDEO_SAA7164)     += saa7164/
 
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 
+obj-$(CONFIG_ARCH_DAVINCI)     += davinci/
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c
new file mode 100644 (file)
index 0000000..1b3cbd0
--- /dev/null
@@ -0,0 +1,202 @@
+/*
+ * adv7180.c Analog Devices ADV7180 video decoder driver
+ * Copyright (c) 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <media/v4l2-ioctl.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-chip-ident.h>
+
+#define DRIVER_NAME "adv7180"
+
+#define ADV7180_INPUT_CONTROL_REG      0x00
+#define ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM      0x00
+#define ADV7180_AUTODETECT_ENABLE_REG  0x07
+#define ADV7180_AUTODETECT_DEFAULT     0x7f
+
+
+#define ADV7180_STATUS1_REG 0x10
+#define ADV7180_STATUS1_AUTOD_MASK 0x70
+#define ADV7180_STATUS1_AUTOD_NTSM_M_J 0x00
+#define ADV7180_STATUS1_AUTOD_NTSC_4_43 0x10
+#define ADV7180_STATUS1_AUTOD_PAL_M    0x20
+#define ADV7180_STATUS1_AUTOD_PAL_60   0x30
+#define ADV7180_STATUS1_AUTOD_PAL_B_G  0x40
+#define ADV7180_STATUS1_AUTOD_SECAM    0x50
+#define ADV7180_STATUS1_AUTOD_PAL_COMB 0x60
+#define ADV7180_STATUS1_AUTOD_SECAM_525        0x70
+
+#define ADV7180_IDENT_REG 0x11
+#define ADV7180_ID_7180 0x18
+
+
+struct adv7180_state {
+       struct v4l2_subdev sd;
+};
+
+static v4l2_std_id determine_norm(struct i2c_client *client)
+{
+       u8 status1 = i2c_smbus_read_byte_data(client, ADV7180_STATUS1_REG);
+
+       switch (status1 & ADV7180_STATUS1_AUTOD_MASK) {
+       case ADV7180_STATUS1_AUTOD_NTSM_M_J:
+               return V4L2_STD_NTSC_M_JP;
+       case ADV7180_STATUS1_AUTOD_NTSC_4_43:
+               return V4L2_STD_NTSC_443;
+       case ADV7180_STATUS1_AUTOD_PAL_M:
+               return V4L2_STD_PAL_M;
+       case ADV7180_STATUS1_AUTOD_PAL_60:
+               return V4L2_STD_PAL_60;
+       case ADV7180_STATUS1_AUTOD_PAL_B_G:
+               return V4L2_STD_PAL;
+       case ADV7180_STATUS1_AUTOD_SECAM:
+               return V4L2_STD_SECAM;
+       case ADV7180_STATUS1_AUTOD_PAL_COMB:
+               return V4L2_STD_PAL_Nc | V4L2_STD_PAL_N;
+       case ADV7180_STATUS1_AUTOD_SECAM_525:
+               return V4L2_STD_SECAM;
+       default:
+               return V4L2_STD_UNKNOWN;
+       }
+}
+
+static inline struct adv7180_state *to_state(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct adv7180_state, sd);
+}
+
+static int adv7180_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
+       *std = determine_norm(client);
+       return 0;
+}
+
+static int adv7180_g_chip_ident(struct v4l2_subdev *sd,
+       struct v4l2_dbg_chip_ident *chip)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
+       return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7180, 0);
+}
+
+static const struct v4l2_subdev_video_ops adv7180_video_ops = {
+       .querystd = adv7180_querystd,
+};
+
+static const struct v4l2_subdev_core_ops adv7180_core_ops = {
+       .g_chip_ident = adv7180_g_chip_ident,
+};
+
+static const struct v4l2_subdev_ops adv7180_ops = {
+       .core = &adv7180_core_ops,
+       .video = &adv7180_video_ops,
+};
+
+/*
+ * Generic i2c probe
+ * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
+ */
+
+static int adv7180_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
+{
+       struct adv7180_state *state;
+       struct v4l2_subdev *sd;
+       int ret;
+
+       /* Check if the adapter supports the needed features */
+       if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+               return -EIO;
+
+       v4l_info(client, "chip found @ 0x%02x (%s)\n",
+                       client->addr << 1, client->adapter->name);
+
+       state = kzalloc(sizeof(struct adv7180_state), GFP_KERNEL);
+       if (state == NULL)
+               return -ENOMEM;
+       sd = &state->sd;
+       v4l2_i2c_subdev_init(sd, client, &adv7180_ops);
+
+       /* Initialize adv7180 */
+       /* enable autodetection */
+       ret = i2c_smbus_write_byte_data(client, ADV7180_INPUT_CONTROL_REG,
+               ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM);
+       if (ret > 0)
+               ret = i2c_smbus_write_byte_data(client,
+                       ADV7180_AUTODETECT_ENABLE_REG,
+                       ADV7180_AUTODETECT_DEFAULT);
+       if (ret < 0) {
+               printk(KERN_ERR DRIVER_NAME
+                       ": Failed to communicate to chip: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int adv7180_remove(struct i2c_client *client)
+{
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+
+       v4l2_device_unregister_subdev(sd);
+       kfree(to_state(sd));
+       return 0;
+}
+
+static const struct i2c_device_id adv7180_id[] = {
+       {DRIVER_NAME, 0},
+       {},
+};
+
+MODULE_DEVICE_TABLE(i2c, adv7180_id);
+
+static struct i2c_driver adv7180_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = DRIVER_NAME,
+       },
+       .probe          = adv7180_probe,
+       .remove         = adv7180_remove,
+       .id_table       = adv7180_id,
+};
+
+static __init int adv7180_init(void)
+{
+       return i2c_add_driver(&adv7180_driver);
+}
+
+static __exit void adv7180_exit(void)
+{
+       i2c_del_driver(&adv7180_driver);
+}
+
+module_init(adv7180_init);
+module_exit(adv7180_exit);
+
+MODULE_DESCRIPTION("Analog Devices ADV7180 video decoder driver");
+MODULE_AUTHOR("Mocean Laboratories");
+MODULE_LICENSE("GPL v2");
+
index 30f5caf..df26f2f 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/videodev2.h>
 #include <linux/uaccess.h>
-#include <linux/version.h>
 
 #include <media/adv7343.h>
 #include <media/v4l2-device.h>
index 830c4a9..57dd919 100644 (file)
@@ -212,7 +212,7 @@ void au0828_card_setup(struct au0828_dev *dev)
                   be abstracted out if we ever need to support a different
                   demod) */
                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                               "au8522", "au8522", 0x8e >> 1);
+                               "au8522", "au8522", 0x8e >> 1, NULL);
                if (sd == NULL)
                        printk(KERN_ERR "analog subdev registration failed\n");
        }
@@ -221,7 +221,7 @@ void au0828_card_setup(struct au0828_dev *dev)
        if (dev->board.tuner_type != TUNER_ABSENT) {
                /* Load the tuner module, which does the attach */
                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                               "tuner", "tuner", dev->board.tuner_addr);
+                               "tuner", "tuner", dev->board.tuner_addr, NULL);
                if (sd == NULL)
                        printk(KERN_ERR "tuner subdev registration fail\n");
 
index b42251f..12279f6 100644 (file)
@@ -3524,8 +3524,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                };
                struct v4l2_subdev *sd;
 
-               sd = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-                       &btv->c.i2c_adap, "saa6588", "saa6588", addrs);
+               sd = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+                       &btv->c.i2c_adap, "saa6588", "saa6588", 0, addrs);
                btv->has_saa6588 = (sd != NULL);
        }
 
@@ -3549,8 +3549,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                        I2C_CLIENT_END
                };
 
-               btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-                       &btv->c.i2c_adap, "msp3400", "msp3400", addrs);
+               btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+                       &btv->c.i2c_adap, "msp3400", "msp3400", 0, addrs);
                if (btv->sd_msp34xx)
                        return;
                goto no_audio;
@@ -3563,16 +3563,16 @@ void __devinit bttv_init_card2(struct bttv *btv)
                        I2C_CLIENT_END
                };
 
-               if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-                               &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
+               if (v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+                               &btv->c.i2c_adap, "tda7432", "tda7432", 0, addrs))
                        return;
                goto no_audio;
        }
 
        case 3: {
                /* The user specified that we should probe for tvaudio */
-               btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-                       &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs());
+               btv->sd_tvaudio = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+                       &btv->c.i2c_adap, "tvaudio", "tvaudio", 0, tvaudio_addrs());
                if (btv->sd_tvaudio)
                        return;
                goto no_audio;
@@ -3591,13 +3591,13 @@ void __devinit bttv_init_card2(struct bttv *btv)
           it really is a msp3400, so it will return NULL when the device
           found is really something else (e.g. a tea6300). */
        if (!bttv_tvcards[btv->c.type].no_msp34xx) {
-               btv->sd_msp34xx = v4l2_i2c_new_probed_subdev_addr(&btv->c.v4l2_dev,
+               btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                        &btv->c.i2c_adap, "msp3400", "msp3400",
-                       I2C_ADDR_MSP3400 >> 1);
+                       0, I2C_ADDRS(I2C_ADDR_MSP3400 >> 1));
        } else if (bttv_tvcards[btv->c.type].msp34xx_alt) {
-               btv->sd_msp34xx = v4l2_i2c_new_probed_subdev_addr(&btv->c.v4l2_dev,
+               btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                        &btv->c.i2c_adap, "msp3400", "msp3400",
-                       I2C_ADDR_MSP3400_ALT >> 1);
+                       0, I2C_ADDRS(I2C_ADDR_MSP3400_ALT >> 1));
        }
 
        /* If we found a msp34xx, then we're done. */
@@ -3611,14 +3611,14 @@ void __devinit bttv_init_card2(struct bttv *btv)
                        I2C_CLIENT_END
                };
 
-               if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-                               &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
+               if (v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+                               &btv->c.i2c_adap, "tda7432", "tda7432", 0, addrs))
                        return;
        }
 
        /* Now see if we can find one of the tvaudio devices. */
-       btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
-               &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs());
+       btv->sd_tvaudio = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
+               &btv->c.i2c_adap, "tvaudio", "tvaudio", 0, tvaudio_addrs());
        if (btv->sd_tvaudio)
                return;
 
@@ -3641,15 +3641,15 @@ void __devinit bttv_init_tuner(struct bttv *btv)
 
                /* Load tuner module before issuing tuner config call! */
                if (bttv_tvcards[btv->c.type].has_radio)
-                       v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                       v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                                &btv->c.i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_RADIO));
-               v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                               0, v4l2_i2c_tuner_addrs(ADDRS_RADIO));
+               v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                                &btv->c.i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
-               v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                               0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+               v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                                &btv->c.i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
+                               0, v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
 
                tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                tun_setup.type = btv->tuner_type;
index 9c149a7..657c481 100644 (file)
@@ -1955,7 +1955,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
 
        cam->sensor_addr = 0x42;
        cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter,
-                       "ov7670", "ov7670", cam->sensor_addr);
+                       "ov7670", "ov7670", cam->sensor_addr, NULL);
        if (cam->sensor == NULL) {
                ret = -ENODEV;
                goto out_smbus;
index dd0224f..6dd51e2 100644 (file)
@@ -231,7 +231,7 @@ MODULE_PARM_DESC(enc_pcm_bufs,
                 "Number of encoder PCM buffers\n"
                 "\t\t\tDefault is computed from other enc_pcm_* parameters");
 
-MODULE_PARM_DESC(cx18_first_minor, "Set kernel number assigned to first card");
+MODULE_PARM_DESC(cx18_first_minor, "Set device node number assigned to first card");
 
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_DESCRIPTION("CX23418 driver");
index da395fe..2477461 100644 (file)
@@ -116,7 +116,7 @@ static int cx18_i2c_new_ir(struct i2c_adapter *adap, u32 hw, const char *type,
        /* Our default information for ir-kbd-i2c.c to use */
        switch (hw) {
        case CX18_HW_Z8F0811_IR_RX_HAUP:
-               info.platform_data = &z8f0811_ir_init_data;
+               info.platform_data = (void *) &z8f0811_ir_init_data;
                break;
        default:
                break;
@@ -139,16 +139,16 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
 
        if (hw == CX18_HW_TUNER) {
                /* special tuner group handling */
-               sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
-                               adap, mod, type, cx->card_i2c->radio);
+               sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
+                               adap, mod, type, 0, cx->card_i2c->radio);
                if (sd != NULL)
                        sd->grp_id = hw;
-               sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
-                               adap, mod, type, cx->card_i2c->demod);
+               sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
+                               adap, mod, type, 0, cx->card_i2c->demod);
                if (sd != NULL)
                        sd->grp_id = hw;
-               sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
-                               adap, mod, type, cx->card_i2c->tv);
+               sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
+                               adap, mod, type, 0, cx->card_i2c->tv);
                if (sd != NULL)
                        sd->grp_id = hw;
                return sd != NULL ? 0 : -1;
@@ -162,7 +162,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
                return -1;
 
        /* It's an I2C device other than an analog tuner or IR chip */
-       sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx]);
+       sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx], NULL);
        if (sd != NULL)
                sd->grp_id = hw;
        return sd != NULL ? 0 : -1;
index 54d248e..7df513a 100644 (file)
@@ -245,9 +245,9 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
        video_set_drvdata(s->video_dev, s);
 
        /* Register device. First try the desired minor, then any free one. */
-       ret = video_register_device(s->video_dev, vfl_type, num);
+       ret = video_register_device_no_warn(s->video_dev, vfl_type, num);
        if (ret < 0) {
-               CX18_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+               CX18_ERR("Couldn't register v4l2 device for %s (device node number %d)\n",
                        s->name, num);
                video_device_release(s->video_dev);
                s->video_dev = NULL;
index 63d2239..319c459 100644 (file)
@@ -313,7 +313,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
        if (dev->board.decoder == CX231XX_AVDECODER) {
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                        &dev->i2c_bus[0].i2c_adap,
-                                       "cx25840", "cx25840", 0x88 >> 1);
+                                       "cx25840", "cx25840", 0x88 >> 1, NULL);
                if (dev->sd_cx25840 == NULL)
                        cx231xx_info("cx25840 subdev registration failure\n");
                cx25840_call(dev, core, load_fw);
@@ -323,7 +323,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
        if (dev->board.tuner_type != TUNER_ABSENT) {
                dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[1].i2c_adap,
-                               "tuner", "tuner", 0xc2 >> 1);
+                               "tuner", "tuner", 0xc2 >> 1, NULL);
                if (dev->sd_tuner == NULL)
                        cx231xx_info("tuner subdev registration failure\n");
 
index 0316257..c04222f 100644 (file)
@@ -75,7 +75,6 @@ struct netup_ci_state {
        void *priv;
 };
 
-struct mutex gpio_mutex;/* Two CiMax's uses same GPIO lines */
 
 int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
                                                u8 *buf, int len)
@@ -183,10 +182,11 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
        if (ret != 0)
                return ret;
 
-       mutex_lock(&gpio_mutex);
+       mutex_lock(&dev->gpio_lock);
 
        /* write addr */
        cx_write(MC417_OEN, NETUP_EN_ALL);
+       msleep(2);
        cx_write(MC417_RWD, NETUP_CTRL_OFF |
                                NETUP_ADLO | (0xff & addr));
        cx_clear(MC417_RWD, NETUP_ADLO);
@@ -194,9 +194,10 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
                                NETUP_ADHI | (0xff & (addr >> 8)));
        cx_clear(MC417_RWD, NETUP_ADHI);
 
-       if (read) /* data in */
+       if (read) /* data in */
                cx_write(MC417_OEN, NETUP_EN_ALL | NETUP_DATA);
-       else /* data out */
+               msleep(2);
+       } else /* data out */
                cx_write(MC417_RWD, NETUP_CTRL_OFF | data);
 
        /* choose chip */
@@ -206,7 +207,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
        cx_clear(MC417_RWD, (read) ? NETUP_RD : NETUP_WR);
        mem = netup_ci_get_mem(dev);
 
-       mutex_unlock(&gpio_mutex);
+       mutex_unlock(&dev->gpio_lock);
 
        if (!read)
                if (mem < 0)
@@ -403,7 +404,6 @@ int netup_ci_init(struct cx23885_tsport *port)
        switch (port->nr) {
        case 1:
                state->ci_i2c_addr = 0x40;
-               mutex_init(&gpio_mutex);
                break;
        case 2:
                state->ci_i2c_addr = 0x41;
index 3143d85..bfdf79f 100644 (file)
@@ -210,6 +210,10 @@ struct cx23885_board cx23885_boards[] = {
                .portb          = CX23885_MPEG_ENCODER,
                .portc          = CX23885_MPEG_DVB,
        },
+       [CX23885_BOARD_COMPRO_VIDEOMATE_E800] = {
+               .name           = "Compro VideoMate E800",
+               .portc          = CX23885_MPEG_DVB,
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -341,6 +345,10 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x0070,
                .subdevice = 0x8541,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1850,
+       }, {
+               .subvendor = 0x1858,
+               .subdevice = 0xe800,
+               .card      = CX23885_BOARD_COMPRO_VIDEOMATE_E800,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -536,6 +544,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
        case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
+       case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
                /* Tuner Reset Command */
                bitmask = 0x04;
                break;
@@ -687,6 +696,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                break;
        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
+       case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
                /* GPIO-2  xc3028 tuner reset */
 
                /* The following GPIO's are on the internal AVCore (cx25840) */
@@ -911,6 +921,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1255:
        case CX23885_BOARD_HAUPPAUGE_HVR1210:
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
+       case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -927,9 +938,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
        case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
+       case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[2].i2c_adap,
-                               "cx25840", "cx25840", 0x88 >> 1);
+                               "cx25840", "cx25840", 0x88 >> 1, NULL);
                v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
                break;
        }
index 40d438d..c31284b 100644 (file)
@@ -758,6 +758,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
        int i;
 
        mutex_init(&dev->lock);
+       mutex_init(&dev->gpio_lock);
 
        atomic_inc(&dev->refcount);
 
index 022fad7..45e13ee 100644 (file)
@@ -255,15 +255,18 @@ static struct tda18271_std_map hauppauge_hvr1200_tda18271_std_map = {
 static struct tda18271_config hauppauge_tda18271_config = {
        .std_map = &hauppauge_tda18271_std_map,
        .gate    = TDA18271_GATE_ANALOG,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static struct tda18271_config hauppauge_hvr1200_tuner_config = {
        .std_map = &hauppauge_hvr1200_tda18271_std_map,
        .gate    = TDA18271_GATE_ANALOG,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static struct tda18271_config hauppauge_hvr1210_tuner_config = {
        .gate    = TDA18271_GATE_DIGITAL,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static struct tda18271_std_map hauppauge_hvr127x_std_map = {
@@ -275,6 +278,7 @@ static struct tda18271_std_map hauppauge_hvr127x_std_map = {
 
 static struct tda18271_config hauppauge_hvr127x_config = {
        .std_map = &hauppauge_hvr127x_std_map,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static struct lgdt3305_config hauppauge_lgdt3305_config = {
@@ -743,6 +747,7 @@ static int dvb_register(struct cx23885_tsport *port)
        }
        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
+       case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
                i2c_bus = &dev->i2c_bus[0];
 
                fe0->dvb.frontend = dvb_attach(zl10353_attach,
index 5d60933..654cc25 100644 (file)
@@ -1521,11 +1521,11 @@ int cx23885_video_register(struct cx23885_dev *dev)
                if (dev->tuner_addr)
                        sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[1].i2c_adap,
-                               "tuner", "tuner", dev->tuner_addr);
+                               "tuner", "tuner", dev->tuner_addr, NULL);
                else
-                       sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                       sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[1].i2c_adap,
-                               "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV));
+                               "tuner", "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_TV));
                if (sd) {
                        struct tuner_setup tun_setup;
 
index 86f2694..cc7a165 100644 (file)
@@ -78,6 +78,7 @@
 #define CX23885_BOARD_MYGICA_X8506             22
 #define CX23885_BOARD_MAGICPRO_PROHDTVE2       23
 #define CX23885_BOARD_HAUPPAUGE_HVR1850        24
+#define CX23885_BOARD_COMPRO_VIDEOMATE_E800    25
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
@@ -325,6 +326,7 @@ struct cx23885_dev {
 
        int                        nr;
        struct mutex               lock;
+       struct mutex               gpio_lock;
 
        /* board details */
        unsigned int               board;
index 042bbbb..98a48f5 100644 (file)
@@ -97,11 +97,11 @@ void netup_get_card_info(struct i2c_adapter *i2c_adap,
 {
        int i, j;
 
-       cinfo->rev =  netup_eeprom_read(i2c_adap, 13);
+       cinfo->rev =  netup_eeprom_read(i2c_adap, 63);
 
-       for (i = 0, j = 0; i < 6; i++, j++)
+       for (i = 64, j = 0; i < 70; i++, j++)
                cinfo->port[0].mac[j] =  netup_eeprom_read(i2c_adap, i);
 
-       for (i = 6, j = 0; i < 12; i++, j++)
+       for (i = 70, j = 0; i < 76; i++, j++)
                cinfo->port[1].mac[j] =  netup_eeprom_read(i2c_adap, i);
 };
index 356d689..fbdc1cd 100644 (file)
@@ -1371,7 +1371,7 @@ static struct cx8802_driver cx8802_blackbird_driver = {
        .advise_release = cx8802_blackbird_advise_release,
 };
 
-static int blackbird_init(void)
+static int __init blackbird_init(void)
 {
        printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
@@ -1384,7 +1384,7 @@ static int blackbird_init(void)
        return cx8802_register_driver(&cx8802_blackbird_driver);
 }
 
-static void blackbird_fini(void)
+static void __exit blackbird_fini(void)
 {
        cx8802_unregister_driver(&cx8802_blackbird_driver);
 }
index e5f07fb..33be636 100644 (file)
@@ -3439,20 +3439,20 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
                   The radio_type is sometimes missing, or set to UNSET but
                   later code configures a tea5767.
                 */
-               v4l2_i2c_new_probed_subdev(&core->v4l2_dev, &core->i2c_adap,
+               v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
                                "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_RADIO));
+                               0, v4l2_i2c_tuner_addrs(ADDRS_RADIO));
                if (has_demod)
-                       v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                       v4l2_i2c_new_subdev(&core->v4l2_dev,
                                &core->i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                               0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                if (core->board.tuner_addr == ADDR_UNSET) {
-                       v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                       v4l2_i2c_new_subdev(&core->v4l2_dev,
                                &core->i2c_adap, "tuner", "tuner",
-                               has_demod ? tv_addrs + 4 : tv_addrs);
+                               0, has_demod ? tv_addrs + 4 : tv_addrs);
                } else {
                        v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
-                               "tuner", "tuner", core->board.tuner_addr);
+                               "tuner", "tuner", core->board.tuner_addr, NULL);
                }
        }
 
index 6e5d142..518bcfe 100644 (file)
@@ -1350,7 +1350,7 @@ static struct cx8802_driver cx8802_dvb_driver = {
        .advise_release = cx8802_dvb_advise_release,
 };
 
-static int dvb_init(void)
+static int __init dvb_init(void)
 {
        printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
@@ -1363,7 +1363,7 @@ static int dvb_init(void)
        return cx8802_register_driver(&cx8802_dvb_driver);
 }
 
-static void dvb_fini(void)
+static void __exit dvb_fini(void)
 {
        cx8802_unregister_driver(&cx8802_dvb_driver);
 }
index 7172dcf..de9ff0f 100644 (file)
@@ -870,7 +870,7 @@ static struct pci_driver cx8802_pci_driver = {
        .remove   = __devexit_p(cx8802_remove),
 };
 
-static int cx8802_init(void)
+static int __init cx8802_init(void)
 {
        printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
@@ -883,7 +883,7 @@ static int cx8802_init(void)
        return pci_register_driver(&cx8802_pci_driver);
 }
 
-static void cx8802_fini(void)
+static void __exit cx8802_fini(void)
 {
        pci_unregister_driver(&cx8802_pci_driver);
 }
index 2bb54c3..57e6b12 100644 (file)
@@ -1881,14 +1881,14 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
        if (core->board.audio_chip == V4L2_IDENT_WM8775)
                v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
-                               "wm8775", "wm8775", 0x36 >> 1);
+                               "wm8775", "wm8775", 0x36 >> 1, NULL);
 
        if (core->board.audio_chip == V4L2_IDENT_TVAUDIO) {
                /* This probes for a tda9874 as is used on some
                   Pixelview Ultra boards. */
-               v4l2_i2c_new_probed_subdev_addr(&core->v4l2_dev,
+               v4l2_i2c_new_subdev(&core->v4l2_dev,
                                &core->i2c_adap,
-                               "tvaudio", "tvaudio", 0xb0 >> 1);
+                               "tvaudio", "tvaudio", 0, I2C_ADDRS(0xb0 >> 1));
        }
 
        switch (core->boardnr) {
@@ -2113,7 +2113,7 @@ static struct pci_driver cx8800_pci_driver = {
 #endif
 };
 
-static int cx8800_init(void)
+static int __init cx8800_init(void)
 {
        printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
@@ -2126,7 +2126,7 @@ static int cx8800_init(void)
        return pci_register_driver(&cx8800_pci_driver);
 }
 
-static void cx8800_fini(void)
+static void __exit cx8800_fini(void)
 {
        pci_unregister_driver(&cx8800_pci_driver);
 }
index 0664d11..ee43876 100644 (file)
@@ -748,14 +748,14 @@ static const struct file_operations dabusb_fops =
        .release =      dabusb_release,
 };
 
-static char *dabusb_nodename(struct device *dev)
+static char *dabusb_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
 
 static struct usb_class_driver dabusb_class = {
        .name =         "dabusb%d",
-       .nodename =     dabusb_nodename,
+       .devnode =      dabusb_devnode,
        .fops =         &dabusb_fops,
        .minor_base =   DABUSB_MINOR,
 };
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
new file mode 100644 (file)
index 0000000..1a8b8f3
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Makefile for the davinci video device drivers.
+#
+
+# VPIF
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
+
+#DM646x EVM Display driver
+obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o
+#DM646x EVM Capture driver
+obj-$(CONFIG_CAPTURE_DAVINCI_DM646X_EVM) += vpif_capture.o
+
+# Capture: DM6446 and DM355
+obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
+obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o
+obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o
+obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o
diff --git a/drivers/media/video/davinci/ccdc_hw_device.h b/drivers/media/video/davinci/ccdc_hw_device.h
new file mode 100644 (file)
index 0000000..86b9b35
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * ccdc device API
+ */
+#ifndef _CCDC_HW_DEVICE_H
+#define _CCDC_HW_DEVICE_H
+
+#ifdef __KERNEL__
+#include <linux/videodev2.h>
+#include <linux/device.h>
+#include <media/davinci/vpfe_types.h>
+#include <media/davinci/ccdc_types.h>
+
+/*
+ * ccdc hw operations
+ */
+struct ccdc_hw_ops {
+       /* Pointer to initialize function to initialize ccdc device */
+       int (*open) (struct device *dev);
+       /* Pointer to deinitialize function */
+       int (*close) (struct device *dev);
+       /* set ccdc base address */
+       void (*set_ccdc_base)(void *base, int size);
+       /* Pointer to function to enable or disable ccdc */
+       void (*enable) (int en);
+       /* reset sbl. only for 6446 */
+       void (*reset) (void);
+       /* enable output to sdram */
+       void (*enable_out_to_sdram) (int en);
+       /* Pointer to function to set hw parameters */
+       int (*set_hw_if_params) (struct vpfe_hw_if_param *param);
+       /* get interface parameters */
+       int (*get_hw_if_params) (struct vpfe_hw_if_param *param);
+       /*
+        * Pointer to function to set parameters. Used
+        * for implementing VPFE_S_CCDC_PARAMS
+        */
+       int (*set_params) (void *params);
+       /*
+        * Pointer to function to get parameter. Used
+        * for implementing VPFE_G_CCDC_PARAMS
+        */
+       int (*get_params) (void *params);
+       /* Pointer to function to configure ccdc */
+       int (*configure) (void);
+
+       /* Pointer to function to set buffer type */
+       int (*set_buftype) (enum ccdc_buftype buf_type);
+       /* Pointer to function to get buffer type */
+       enum ccdc_buftype (*get_buftype) (void);
+       /* Pointer to function to set frame format */
+       int (*set_frame_format) (enum ccdc_frmfmt frm_fmt);
+       /* Pointer to function to get frame format */
+       enum ccdc_frmfmt (*get_frame_format) (void);
+       /* enumerate hw pix formats */
+       int (*enum_pix)(u32 *hw_pix, int i);
+       /* Pointer to function to set buffer type */
+       u32 (*get_pixel_format) (void);
+       /* Pointer to function to get pixel format. */
+       int (*set_pixel_format) (u32 pixfmt);
+       /* Pointer to function to set image window */
+       int (*set_image_window) (struct v4l2_rect *win);
+       /* Pointer to function to set image window */
+       void (*get_image_window) (struct v4l2_rect *win);
+       /* Pointer to function to get line length */
+       unsigned int (*get_line_length) (void);
+
+       /* Query CCDC control IDs */
+       int (*queryctrl)(struct v4l2_queryctrl *qctrl);
+       /* Set CCDC control */
+       int (*set_control)(struct v4l2_control *ctrl);
+       /* Get CCDC control */
+       int (*get_control)(struct v4l2_control *ctrl);
+
+       /* Pointer to function to set frame buffer address */
+       void (*setfbaddr) (unsigned long addr);
+       /* Pointer to function to get field id */
+       int (*getfid) (void);
+};
+
+struct ccdc_hw_device {
+       /* ccdc device name */
+       char name[32];
+       /* module owner */
+       struct module *owner;
+       /* hw ops */
+       struct ccdc_hw_ops hw_ops;
+};
+
+/* Used by CCDC module to register & unregister with vpfe capture driver */
+int vpfe_register_ccdc_device(struct ccdc_hw_device *dev);
+void vpfe_unregister_ccdc_device(struct ccdc_hw_device *dev);
+
+#endif
+#endif
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
new file mode 100644 (file)
index 0000000..4629cab
--- /dev/null
@@ -0,0 +1,978 @@
+/*
+ * Copyright (C) 2005-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * CCDC hardware module for DM355
+ * ------------------------------
+ *
+ * This module is for configuring DM355 CCD controller of VPFE to capture
+ * Raw yuv or Bayer RGB data from a decoder. CCDC has several modules
+ * such as Defect Pixel Correction, Color Space Conversion etc to
+ * pre-process the Bayer RGB data, before writing it to SDRAM. This
+ * module also allows application to configure individual
+ * module parameters through VPFE_CMD_S_CCDC_RAW_PARAMS IOCTL.
+ * To do so, application include dm355_ccdc.h and vpfe_capture.h header
+ * files. The setparams() API is called by vpfe_capture driver
+ * to configure module parameters
+ *
+ * TODO: 1) Raw bayer parameter settings and bayer capture
+ *      2) Split module parameter structure to module specific ioctl structs
+ *      3) add support for lense shading correction
+ *      4) investigate if enum used for user space type definition
+ *         to be replaced by #defines or integer
+ */
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/videodev2.h>
+#include <media/davinci/dm355_ccdc.h>
+#include <media/davinci/vpss.h>
+#include "dm355_ccdc_regs.h"
+#include "ccdc_hw_device.h"
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("CCDC Driver for DM355");
+MODULE_AUTHOR("Texas Instruments");
+
+static struct device *dev;
+
+/* Object for CCDC raw mode */
+static struct ccdc_params_raw ccdc_hw_params_raw = {
+       .pix_fmt = CCDC_PIXFMT_RAW,
+       .frm_fmt = CCDC_FRMFMT_PROGRESSIVE,
+       .win = CCDC_WIN_VGA,
+       .fid_pol = VPFE_PINPOL_POSITIVE,
+       .vd_pol = VPFE_PINPOL_POSITIVE,
+       .hd_pol = VPFE_PINPOL_POSITIVE,
+       .gain = {
+               .r_ye = 256,
+               .gb_g = 256,
+               .gr_cy = 256,
+               .b_mg = 256
+       },
+       .config_params = {
+               .datasft = 2,
+               .data_sz = CCDC_DATA_10BITS,
+               .mfilt1 = CCDC_NO_MEDIAN_FILTER1,
+               .mfilt2 = CCDC_NO_MEDIAN_FILTER2,
+               .alaw = {
+                       .gama_wd = 2,
+               },
+               .blk_clamp = {
+                       .sample_pixel = 1,
+                       .dc_sub = 25
+               },
+               .col_pat_field0 = {
+                       .olop = CCDC_GREEN_BLUE,
+                       .olep = CCDC_BLUE,
+                       .elop = CCDC_RED,
+                       .elep = CCDC_GREEN_RED
+               },
+               .col_pat_field1 = {
+                       .olop = CCDC_GREEN_BLUE,
+                       .olep = CCDC_BLUE,
+                       .elop = CCDC_RED,
+                       .elep = CCDC_GREEN_RED
+               },
+       },
+};
+
+
+/* Object for CCDC ycbcr mode */
+static struct ccdc_params_ycbcr ccdc_hw_params_ycbcr = {
+       .win = CCDC_WIN_PAL,
+       .pix_fmt = CCDC_PIXFMT_YCBCR_8BIT,
+       .frm_fmt = CCDC_FRMFMT_INTERLACED,
+       .fid_pol = VPFE_PINPOL_POSITIVE,
+       .vd_pol = VPFE_PINPOL_POSITIVE,
+       .hd_pol = VPFE_PINPOL_POSITIVE,
+       .bt656_enable = 1,
+       .pix_order = CCDC_PIXORDER_CBYCRY,
+       .buf_type = CCDC_BUFTYPE_FLD_INTERLEAVED
+};
+
+static enum vpfe_hw_if_type ccdc_if_type;
+static void *__iomem ccdc_base_addr;
+static int ccdc_addr_size;
+
+/* Raw Bayer formats */
+static u32 ccdc_raw_bayer_pix_formats[] =
+               {V4L2_PIX_FMT_SBGGR8, V4L2_PIX_FMT_SBGGR16};
+
+/* Raw YUV formats */
+static u32 ccdc_raw_yuv_pix_formats[] =
+               {V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_YUYV};
+
+/* register access routines */
+static inline u32 regr(u32 offset)
+{
+       return __raw_readl(ccdc_base_addr + offset);
+}
+
+static inline void regw(u32 val, u32 offset)
+{
+       __raw_writel(val, ccdc_base_addr + offset);
+}
+
+static void ccdc_set_ccdc_base(void *addr, int size)
+{
+       ccdc_base_addr = addr;
+       ccdc_addr_size = size;
+}
+
+static void ccdc_enable(int en)
+{
+       unsigned int temp;
+       temp = regr(SYNCEN);
+       temp &= (~CCDC_SYNCEN_VDHDEN_MASK);
+       temp |= (en & CCDC_SYNCEN_VDHDEN_MASK);
+       regw(temp, SYNCEN);
+}
+
+static void ccdc_enable_output_to_sdram(int en)
+{
+       unsigned int temp;
+       temp = regr(SYNCEN);
+       temp &= (~(CCDC_SYNCEN_WEN_MASK));
+       temp |= ((en << CCDC_SYNCEN_WEN_SHIFT) & CCDC_SYNCEN_WEN_MASK);
+       regw(temp, SYNCEN);
+}
+
+static void ccdc_config_gain_offset(void)
+{
+       /* configure gain */
+       regw(ccdc_hw_params_raw.gain.r_ye, RYEGAIN);
+       regw(ccdc_hw_params_raw.gain.gr_cy, GRCYGAIN);
+       regw(ccdc_hw_params_raw.gain.gb_g, GBGGAIN);
+       regw(ccdc_hw_params_raw.gain.b_mg, BMGGAIN);
+       /* configure offset */
+       regw(ccdc_hw_params_raw.ccdc_offset, OFFSET);
+}
+
+/*
+ * ccdc_restore_defaults()
+ * This function restore power on defaults in the ccdc registers
+ */
+static int ccdc_restore_defaults(void)
+{
+       int i;
+
+       dev_dbg(dev, "\nstarting ccdc_restore_defaults...");
+       /* set all registers to zero */
+       for (i = 0; i <= CCDC_REG_LAST; i += 4)
+               regw(0, i);
+
+       /* now override the values with power on defaults in registers */
+       regw(MODESET_DEFAULT, MODESET);
+       /* no culling support */
+       regw(CULH_DEFAULT, CULH);
+       regw(CULV_DEFAULT, CULV);
+       /* Set default Gain and Offset */
+       ccdc_hw_params_raw.gain.r_ye = GAIN_DEFAULT;
+       ccdc_hw_params_raw.gain.gb_g = GAIN_DEFAULT;
+       ccdc_hw_params_raw.gain.gr_cy = GAIN_DEFAULT;
+       ccdc_hw_params_raw.gain.b_mg = GAIN_DEFAULT;
+       ccdc_config_gain_offset();
+       regw(OUTCLIP_DEFAULT, OUTCLIP);
+       regw(LSCCFG2_DEFAULT, LSCCFG2);
+       /* select ccdc input */
+       if (vpss_select_ccdc_source(VPSS_CCDCIN)) {
+               dev_dbg(dev, "\ncouldn't select ccdc input source");
+               return -EFAULT;
+       }
+       /* select ccdc clock */
+       if (vpss_enable_clock(VPSS_CCDC_CLOCK, 1) < 0) {
+               dev_dbg(dev, "\ncouldn't enable ccdc clock");
+               return -EFAULT;
+       }
+       dev_dbg(dev, "\nEnd of ccdc_restore_defaults...");
+       return 0;
+}
+
+static int ccdc_open(struct device *device)
+{
+       dev = device;
+       return ccdc_restore_defaults();
+}
+
+static int ccdc_close(struct device *device)
+{
+       /* disable clock */
+       vpss_enable_clock(VPSS_CCDC_CLOCK, 0);
+       /* do nothing for now */
+       return 0;
+}
+/*
+ * ccdc_setwin()
+ * This function will configure the window size to
+ * be capture in CCDC reg.
+ */
+static void ccdc_setwin(struct v4l2_rect *image_win,
+                       enum ccdc_frmfmt frm_fmt, int ppc)
+{
+       int horz_start, horz_nr_pixels;
+       int vert_start, vert_nr_lines;
+       int mid_img = 0;
+
+       dev_dbg(dev, "\nStarting ccdc_setwin...");
+
+       /*
+        * ppc - per pixel count. indicates how many pixels per cell
+        * output to SDRAM. example, for ycbcr, it is one y and one c, so 2.
+        * raw capture this is 1
+        */
+       horz_start = image_win->left << (ppc - 1);
+       horz_nr_pixels = ((image_win->width) << (ppc - 1)) - 1;
+
+       /* Writing the horizontal info into the registers */
+       regw(horz_start, SPH);
+       regw(horz_nr_pixels, NPH);
+       vert_start = image_win->top;
+
+       if (frm_fmt == CCDC_FRMFMT_INTERLACED) {
+               vert_nr_lines = (image_win->height >> 1) - 1;
+               vert_start >>= 1;
+               /* Since first line doesn't have any data */
+               vert_start += 1;
+               /* configure VDINT0 and VDINT1 */
+               regw(vert_start, VDINT0);
+       } else {
+               /* Since first line doesn't have any data */
+               vert_start += 1;
+               vert_nr_lines = image_win->height - 1;
+               /* configure VDINT0 and VDINT1 */
+               mid_img = vert_start + (image_win->height / 2);
+               regw(vert_start, VDINT0);
+               regw(mid_img, VDINT1);
+       }
+       regw(vert_start & CCDC_START_VER_ONE_MASK, SLV0);
+       regw(vert_start & CCDC_START_VER_TWO_MASK, SLV1);
+       regw(vert_nr_lines & CCDC_NUM_LINES_VER, NLV);
+       dev_dbg(dev, "\nEnd of ccdc_setwin...");
+}
+
+static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
+{
+       if (ccdcparam->datasft < CCDC_DATA_NO_SHIFT ||
+           ccdcparam->datasft > CCDC_DATA_SHIFT_6BIT) {
+               dev_dbg(dev, "Invalid value of data shift\n");
+               return -EINVAL;
+       }
+
+       if (ccdcparam->mfilt1 < CCDC_NO_MEDIAN_FILTER1 ||
+           ccdcparam->mfilt1 > CCDC_MEDIAN_FILTER1) {
+               dev_dbg(dev, "Invalid value of median filter1\n");
+               return -EINVAL;
+       }
+
+       if (ccdcparam->mfilt2 < CCDC_NO_MEDIAN_FILTER2 ||
+           ccdcparam->mfilt2 > CCDC_MEDIAN_FILTER2) {
+               dev_dbg(dev, "Invalid value of median filter2\n");
+               return -EINVAL;
+       }
+
+       if ((ccdcparam->med_filt_thres < 0) ||
+          (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) {
+               dev_dbg(dev, "Invalid value of median filter thresold\n");
+               return -EINVAL;
+       }
+
+       if (ccdcparam->data_sz < CCDC_DATA_16BITS ||
+           ccdcparam->data_sz > CCDC_DATA_8BITS) {
+               dev_dbg(dev, "Invalid value of data size\n");
+               return -EINVAL;
+       }
+
+       if (ccdcparam->alaw.enable) {
+               if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 ||
+                   ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) {
+                       dev_dbg(dev, "Invalid value of ALAW\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (ccdcparam->blk_clamp.b_clamp_enable) {
+               if (ccdcparam->blk_clamp.sample_pixel < CCDC_SAMPLE_1PIXELS ||
+                   ccdcparam->blk_clamp.sample_pixel > CCDC_SAMPLE_16PIXELS) {
+                       dev_dbg(dev, "Invalid value of sample pixel\n");
+                       return -EINVAL;
+               }
+               if (ccdcparam->blk_clamp.sample_ln < CCDC_SAMPLE_1LINES ||
+                   ccdcparam->blk_clamp.sample_ln > CCDC_SAMPLE_16LINES) {
+                       dev_dbg(dev, "Invalid value of sample lines\n");
+                       return -EINVAL;
+               }
+       }
+       return 0;
+}
+
+/* Parameter operations */
+static int ccdc_set_params(void __user *params)
+{
+       struct ccdc_config_params_raw ccdc_raw_params;
+       int x;
+
+       /* only raw module parameters can be set through the IOCTL */
+       if (ccdc_if_type != VPFE_RAW_BAYER)
+               return -EINVAL;
+
+       x = copy_from_user(&ccdc_raw_params, params, sizeof(ccdc_raw_params));
+       if (x) {
+               dev_dbg(dev, "ccdc_set_params: error in copying ccdc"
+                       "params, %d\n", x);
+               return -EFAULT;
+       }
+
+       if (!validate_ccdc_param(&ccdc_raw_params)) {
+               memcpy(&ccdc_hw_params_raw.config_params,
+                       &ccdc_raw_params,
+                       sizeof(ccdc_raw_params));
+               return 0;
+       }
+       return -EINVAL;
+}
+
+/* This function will configure CCDC for YCbCr video capture */
+static void ccdc_config_ycbcr(void)
+{
+       struct ccdc_params_ycbcr *params = &ccdc_hw_params_ycbcr;
+       u32 temp;
+
+       /* first set the CCDC power on defaults values in all registers */
+       dev_dbg(dev, "\nStarting ccdc_config_ycbcr...");
+       ccdc_restore_defaults();
+
+       /* configure pixel format & video frame format */
+       temp = (((params->pix_fmt & CCDC_INPUT_MODE_MASK) <<
+               CCDC_INPUT_MODE_SHIFT) |
+               ((params->frm_fmt & CCDC_FRM_FMT_MASK) <<
+               CCDC_FRM_FMT_SHIFT));
+
+       /* setup BT.656 sync mode */
+       if (params->bt656_enable) {
+               regw(CCDC_REC656IF_BT656_EN, REC656IF);
+               /*
+                * configure the FID, VD, HD pin polarity fld,hd pol positive,
+                * vd negative, 8-bit pack mode
+                */
+               temp |= CCDC_VD_POL_NEGATIVE;
+       } else {                /* y/c external sync mode */
+               temp |= (((params->fid_pol & CCDC_FID_POL_MASK) <<
+                       CCDC_FID_POL_SHIFT) |
+                       ((params->hd_pol & CCDC_HD_POL_MASK) <<
+                       CCDC_HD_POL_SHIFT) |
+                       ((params->vd_pol & CCDC_VD_POL_MASK) <<
+                       CCDC_VD_POL_SHIFT));
+       }
+
+       /* pack the data to 8-bit */
+       temp |= CCDC_DATA_PACK_ENABLE;
+
+       regw(temp, MODESET);
+
+       /* configure video window */
+       ccdc_setwin(&params->win, params->frm_fmt, 2);
+
+       /* configure the order of y cb cr in SD-RAM */
+       temp = (params->pix_order << CCDC_Y8POS_SHIFT);
+       temp |= CCDC_LATCH_ON_VSYNC_DISABLE | CCDC_CCDCFG_FIDMD_NO_LATCH_VSYNC;
+       regw(temp, CCDCFG);
+
+       /*
+        * configure the horizontal line offset. This is done by rounding up
+        * width to a multiple of 16 pixels and multiply by two to account for
+        * y:cb:cr 4:2:2 data
+        */
+       regw(((params->win.width * 2 + 31) >> 5), HSIZE);
+
+       /* configure the memory line offset */
+       if (params->buf_type == CCDC_BUFTYPE_FLD_INTERLEAVED) {
+               /* two fields are interleaved in memory */
+               regw(CCDC_SDOFST_FIELD_INTERLEAVED, SDOFST);
+       }
+
+       dev_dbg(dev, "\nEnd of ccdc_config_ycbcr...\n");
+}
+
+/*
+ * ccdc_config_black_clamp()
+ * configure parameters for Optical Black Clamp
+ */
+static void ccdc_config_black_clamp(struct ccdc_black_clamp *bclamp)
+{
+       u32 val;
+
+       if (!bclamp->b_clamp_enable) {
+               /* configure DCSub */
+               regw(bclamp->dc_sub & CCDC_BLK_DC_SUB_MASK, DCSUB);
+               regw(0x0000, CLAMP);
+               return;
+       }
+       /* Enable the Black clamping, set sample lines and pixels */
+       val = (bclamp->start_pixel & CCDC_BLK_ST_PXL_MASK) |
+             ((bclamp->sample_pixel & CCDC_BLK_SAMPLE_LN_MASK) <<
+               CCDC_BLK_SAMPLE_LN_SHIFT) | CCDC_BLK_CLAMP_ENABLE;
+       regw(val, CLAMP);
+
+       /* If Black clamping is enable then make dcsub 0 */
+       val = (bclamp->sample_ln & CCDC_NUM_LINE_CALC_MASK)
+                       << CCDC_NUM_LINE_CALC_SHIFT;
+       regw(val, DCSUB);
+}
+
+/*
+ * ccdc_config_black_compense()
+ * configure parameters for Black Compensation
+ */
+static void ccdc_config_black_compense(struct ccdc_black_compensation *bcomp)
+{
+       u32 val;
+
+       val = (bcomp->b & CCDC_BLK_COMP_MASK) |
+               ((bcomp->gb & CCDC_BLK_COMP_MASK) <<
+               CCDC_BLK_COMP_GB_COMP_SHIFT);
+       regw(val, BLKCMP1);
+
+       val = ((bcomp->gr & CCDC_BLK_COMP_MASK) <<
+               CCDC_BLK_COMP_GR_COMP_SHIFT) |
+               ((bcomp->r & CCDC_BLK_COMP_MASK) <<
+               CCDC_BLK_COMP_R_COMP_SHIFT);
+       regw(val, BLKCMP0);
+}
+
+/*
+ * ccdc_write_dfc_entry()
+ * write an entry in the dfc table.
+ */
+int ccdc_write_dfc_entry(int index, struct ccdc_vertical_dft *dfc)
+{
+/* TODO This is to be re-visited and adjusted */
+#define DFC_WRITE_WAIT_COUNT   1000
+       u32 val, count = DFC_WRITE_WAIT_COUNT;
+
+       regw(dfc->dft_corr_vert[index], DFCMEM0);
+       regw(dfc->dft_corr_horz[index], DFCMEM1);
+       regw(dfc->dft_corr_sub1[index], DFCMEM2);
+       regw(dfc->dft_corr_sub2[index], DFCMEM3);
+       regw(dfc->dft_corr_sub3[index], DFCMEM4);
+       /* set WR bit to write */
+       val = regr(DFCMEMCTL) | CCDC_DFCMEMCTL_DFCMWR_MASK;
+       regw(val, DFCMEMCTL);
+
+       /*
+        * Assume, it is very short. If we get an error, we need to
+        * adjust this value
+        */
+       while (regr(DFCMEMCTL) & CCDC_DFCMEMCTL_DFCMWR_MASK)
+               count--;
+       /*
+        * TODO We expect the count to be non-zero to be successful. Adjust
+        * the count if write requires more time
+        */
+
+       if (count) {
+               dev_err(dev, "defect table write timeout !!!\n");
+               return -1;
+       }
+       return 0;
+}
+
+/*
+ * ccdc_config_vdfc()
+ * configure parameters for Vertical Defect Correction
+ */
+static int ccdc_config_vdfc(struct ccdc_vertical_dft *dfc)
+{
+       u32 val;
+       int i;
+
+       /* Configure General Defect Correction. The table used is from IPIPE */
+       val = dfc->gen_dft_en & CCDC_DFCCTL_GDFCEN_MASK;
+
+       /* Configure Vertical Defect Correction if needed */
+       if (!dfc->ver_dft_en) {
+               /* Enable only General Defect Correction */
+               regw(val, DFCCTL);
+               return 0;
+       }
+
+       if (dfc->table_size > CCDC_DFT_TABLE_SIZE)
+               return -EINVAL;
+
+       val |= CCDC_DFCCTL_VDFC_DISABLE;
+       val |= (dfc->dft_corr_ctl.vdfcsl & CCDC_DFCCTL_VDFCSL_MASK) <<
+               CCDC_DFCCTL_VDFCSL_SHIFT;
+       val |= (dfc->dft_corr_ctl.vdfcuda & CCDC_DFCCTL_VDFCUDA_MASK) <<
+               CCDC_DFCCTL_VDFCUDA_SHIFT;
+       val |= (dfc->dft_corr_ctl.vdflsft & CCDC_DFCCTL_VDFLSFT_MASK) <<
+               CCDC_DFCCTL_VDFLSFT_SHIFT;
+       regw(val , DFCCTL);
+
+       /* clear address ptr to offset 0 */
+       val = CCDC_DFCMEMCTL_DFCMARST_MASK << CCDC_DFCMEMCTL_DFCMARST_SHIFT;
+
+       /* write defect table entries */
+       for (i = 0; i < dfc->table_size; i++) {
+               /* increment address for non zero index */
+               if (i != 0)
+                       val = CCDC_DFCMEMCTL_INC_ADDR;
+               regw(val, DFCMEMCTL);
+               if (ccdc_write_dfc_entry(i, dfc) < 0)
+                       return -EFAULT;
+       }
+
+       /* update saturation level and enable dfc */
+       regw(dfc->saturation_ctl & CCDC_VDC_DFCVSAT_MASK, DFCVSAT);
+       val = regr(DFCCTL) | (CCDC_DFCCTL_VDFCEN_MASK <<
+                       CCDC_DFCCTL_VDFCEN_SHIFT);
+       regw(val, DFCCTL);
+       return 0;
+}
+
+/*
+ * ccdc_config_csc()
+ * configure parameters for color space conversion
+ * Each register CSCM0-7 has two values in S8Q5 format.
+ */
+static void ccdc_config_csc(struct ccdc_csc *csc)
+{
+       u32 val1, val2;
+       int i;
+
+       if (!csc->enable)
+               return;
+
+       /* Enable the CSC sub-module */
+       regw(CCDC_CSC_ENABLE, CSCCTL);
+
+       /* Converting the co-eff as per the format of the register */
+       for (i = 0; i < CCDC_CSC_COEFF_TABLE_SIZE; i++) {
+               if ((i % 2) == 0) {
+                       /* CSCM - LSB */
+                       val1 = (csc->coeff[i].integer &
+                               CCDC_CSC_COEF_INTEG_MASK)
+                               << CCDC_CSC_COEF_INTEG_SHIFT;
+                       /*
+                        * convert decimal part to binary. Use 2 decimal
+                        * precision, user values range from .00 - 0.99
+                        */
+                       val1 |= (((csc->coeff[i].decimal &
+                               CCDC_CSC_COEF_DECIMAL_MASK) *
+                               CCDC_CSC_DEC_MAX) / 100);
+               } else {
+
+                       /* CSCM - MSB */
+                       val2 = (csc->coeff[i].integer &
+                               CCDC_CSC_COEF_INTEG_MASK)
+                               << CCDC_CSC_COEF_INTEG_SHIFT;
+                       val2 |= (((csc->coeff[i].decimal &
+                                CCDC_CSC_COEF_DECIMAL_MASK) *
+                                CCDC_CSC_DEC_MAX) / 100);
+                       val2 <<= CCDC_CSCM_MSB_SHIFT;
+                       val2 |= val1;
+                       regw(val2, (CSCM0 + ((i - 1) << 1)));
+               }
+       }
+}
+
+/*
+ * ccdc_config_color_patterns()
+ * configure parameters for color patterns
+ */
+static void ccdc_config_color_patterns(struct ccdc_col_pat *pat0,
+                                      struct ccdc_col_pat *pat1)
+{
+       u32 val;
+
+       val = (pat0->olop | (pat0->olep << 2) | (pat0->elop << 4) |
+               (pat0->elep << 6) | (pat1->olop << 8) | (pat1->olep << 10) |
+               (pat1->elop << 12) | (pat1->elep << 14));
+       regw(val, COLPTN);
+}
+
+/* This function will configure CCDC for Raw mode image capture */
+static int ccdc_config_raw(void)
+{
+       struct ccdc_params_raw *params = &ccdc_hw_params_raw;
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int val;
+
+       dev_dbg(dev, "\nStarting ccdc_config_raw...");
+
+       /* restore power on defaults to register */
+       ccdc_restore_defaults();
+
+       /* CCDCFG register:
+        * set CCD Not to swap input since input is RAW data
+        * set FID detection function to Latch at V-Sync
+        * set WENLOG - ccdc valid area to AND
+        * set TRGSEL to WENBIT
+        * set EXTRG to DISABLE
+        * disable latching function on VSYNC - shadowed registers
+        */
+       regw(CCDC_YCINSWP_RAW | CCDC_CCDCFG_FIDMD_LATCH_VSYNC |
+            CCDC_CCDCFG_WENLOG_AND | CCDC_CCDCFG_TRGSEL_WEN |
+            CCDC_CCDCFG_EXTRG_DISABLE | CCDC_LATCH_ON_VSYNC_DISABLE, CCDCFG);
+
+       /*
+        * Set VDHD direction to input,  input type to raw input
+        * normal data polarity, do not use external WEN
+        */
+       val = (CCDC_VDHDOUT_INPUT | CCDC_RAW_IP_MODE | CCDC_DATAPOL_NORMAL |
+               CCDC_EXWEN_DISABLE);
+
+       /*
+        * Configure the vertical sync polarity (MODESET.VDPOL), horizontal
+        * sync polarity (MODESET.HDPOL), field id polarity (MODESET.FLDPOL),
+        * frame format(progressive or interlace), & pixel format (Input mode)
+        */
+       val |= (((params->vd_pol & CCDC_VD_POL_MASK) << CCDC_VD_POL_SHIFT) |
+               ((params->hd_pol & CCDC_HD_POL_MASK) << CCDC_HD_POL_SHIFT) |
+               ((params->fid_pol & CCDC_FID_POL_MASK) << CCDC_FID_POL_SHIFT) |
+               ((params->frm_fmt & CCDC_FRM_FMT_MASK) << CCDC_FRM_FMT_SHIFT) |
+               ((params->pix_fmt & CCDC_PIX_FMT_MASK) << CCDC_PIX_FMT_SHIFT));
+
+       /* set pack for alaw compression */
+       if ((config_params->data_sz == CCDC_DATA_8BITS) ||
+            config_params->alaw.enable)
+               val |= CCDC_DATA_PACK_ENABLE;
+
+       /* Configure for LPF */
+       if (config_params->lpf_enable)
+               val |= (config_params->lpf_enable & CCDC_LPF_MASK) <<
+                       CCDC_LPF_SHIFT;
+
+       /* Configure the data shift */
+       val |= (config_params->datasft & CCDC_DATASFT_MASK) <<
+               CCDC_DATASFT_SHIFT;
+       regw(val , MODESET);
+       dev_dbg(dev, "\nWriting 0x%x to MODESET...\n", val);
+
+       /* Configure the Median Filter threshold */
+       regw((config_params->med_filt_thres) & CCDC_MED_FILT_THRESH, MEDFILT);
+
+       /* Configure GAMMAWD register. defaur 11-2, and Mosaic cfa pattern */
+       val = CCDC_GAMMA_BITS_11_2 << CCDC_GAMMAWD_INPUT_SHIFT |
+               CCDC_CFA_MOSAIC;
+
+       /* Enable and configure aLaw register if needed */
+       if (config_params->alaw.enable) {
+               val |= (CCDC_ALAW_ENABLE |
+                       ((config_params->alaw.gama_wd &
+                       CCDC_ALAW_GAMA_WD_MASK) <<
+                       CCDC_GAMMAWD_INPUT_SHIFT));
+       }
+
+       /* Configure Median filter1 & filter2 */
+       val |= ((config_params->mfilt1 << CCDC_MFILT1_SHIFT) |
+               (config_params->mfilt2 << CCDC_MFILT2_SHIFT));
+
+       regw(val, GAMMAWD);
+       dev_dbg(dev, "\nWriting 0x%x to GAMMAWD...\n", val);
+
+       /* configure video window */
+       ccdc_setwin(&params->win, params->frm_fmt, 1);
+
+       /* Optical Clamp Averaging */
+       ccdc_config_black_clamp(&config_params->blk_clamp);
+
+       /* Black level compensation */
+       ccdc_config_black_compense(&config_params->blk_comp);
+
+       /* Vertical Defect Correction if needed */
+       if (ccdc_config_vdfc(&config_params->vertical_dft) < 0)
+               return -EFAULT;
+
+       /* color space conversion */
+       ccdc_config_csc(&config_params->csc);
+
+       /* color pattern */
+       ccdc_config_color_patterns(&config_params->col_pat_field0,
+                                  &config_params->col_pat_field1);
+
+       /* Configure the Gain  & offset control */
+       ccdc_config_gain_offset();
+
+       dev_dbg(dev, "\nWriting %x to COLPTN...\n", val);
+
+       /* Configure DATAOFST  register */
+       val = (config_params->data_offset.horz_offset & CCDC_DATAOFST_MASK) <<
+               CCDC_DATAOFST_H_SHIFT;
+       val |= (config_params->data_offset.vert_offset & CCDC_DATAOFST_MASK) <<
+               CCDC_DATAOFST_V_SHIFT;
+       regw(val, DATAOFST);
+
+       /* configuring HSIZE register */
+       val = (params->horz_flip_enable & CCDC_HSIZE_FLIP_MASK) <<
+               CCDC_HSIZE_FLIP_SHIFT;
+
+       /* If pack 8 is enable then 1 pixel will take 1 byte */
+       if ((config_params->data_sz == CCDC_DATA_8BITS) ||
+            config_params->alaw.enable) {
+               val |= (((params->win.width) + 31) >> 5) &
+                       CCDC_HSIZE_VAL_MASK;
+
+               /* adjust to multiple of 32 */
+               dev_dbg(dev, "\nWriting 0x%x to HSIZE...\n",
+                      (((params->win.width) + 31) >> 5) &
+                       CCDC_HSIZE_VAL_MASK);
+       } else {
+               /* else one pixel will take 2 byte */
+               val |= (((params->win.width * 2) + 31) >> 5) &
+                       CCDC_HSIZE_VAL_MASK;
+
+               dev_dbg(dev, "\nWriting 0x%x to HSIZE...\n",
+                      (((params->win.width * 2) + 31) >> 5) &
+                       CCDC_HSIZE_VAL_MASK);
+       }
+       regw(val, HSIZE);
+
+       /* Configure SDOFST register */
+       if (params->frm_fmt == CCDC_FRMFMT_INTERLACED) {
+               if (params->image_invert_enable) {
+                       /* For interlace inverse mode */
+                       regw(CCDC_SDOFST_INTERLACE_INVERSE, SDOFST);
+                       dev_dbg(dev, "\nWriting %x to SDOFST...\n",
+                               CCDC_SDOFST_INTERLACE_INVERSE);
+               } else {
+                       /* For interlace non inverse mode */
+                       regw(CCDC_SDOFST_INTERLACE_NORMAL, SDOFST);
+                       dev_dbg(dev, "\nWriting %x to SDOFST...\n",
+                               CCDC_SDOFST_INTERLACE_NORMAL);
+               }
+       } else if (params->frm_fmt == CCDC_FRMFMT_PROGRESSIVE) {
+               if (params->image_invert_enable) {
+                       /* For progessive inverse mode */
+                       regw(CCDC_SDOFST_PROGRESSIVE_INVERSE, SDOFST);
+                       dev_dbg(dev, "\nWriting %x to SDOFST...\n",
+                               CCDC_SDOFST_PROGRESSIVE_INVERSE);
+               } else {
+                       /* For progessive non inverse mode */
+                       regw(CCDC_SDOFST_PROGRESSIVE_NORMAL, SDOFST);
+                       dev_dbg(dev, "\nWriting %x to SDOFST...\n",
+                               CCDC_SDOFST_PROGRESSIVE_NORMAL);
+               }
+       }
+       dev_dbg(dev, "\nend of ccdc_config_raw...");
+       return 0;
+}
+
+static int ccdc_configure(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               return ccdc_config_raw();
+       else
+               ccdc_config_ycbcr();
+       return 0;
+}
+
+static int ccdc_set_buftype(enum ccdc_buftype buf_type)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.buf_type = buf_type;
+       else
+               ccdc_hw_params_ycbcr.buf_type = buf_type;
+       return 0;
+}
+static enum ccdc_buftype ccdc_get_buftype(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               return ccdc_hw_params_raw.buf_type;
+       return ccdc_hw_params_ycbcr.buf_type;
+}
+
+static int ccdc_enum_pix(u32 *pix, int i)
+{
+       int ret = -EINVAL;
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               if (i < ARRAY_SIZE(ccdc_raw_bayer_pix_formats)) {
+                       *pix = ccdc_raw_bayer_pix_formats[i];
+                       ret = 0;
+               }
+       } else {
+               if (i < ARRAY_SIZE(ccdc_raw_yuv_pix_formats)) {
+                       *pix = ccdc_raw_yuv_pix_formats[i];
+                       ret = 0;
+               }
+       }
+       return ret;
+}
+
+static int ccdc_set_pixel_format(u32 pixfmt)
+{
+       struct ccdc_a_law *alaw =
+               &ccdc_hw_params_raw.config_params.alaw;
+
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               ccdc_hw_params_raw.pix_fmt = CCDC_PIXFMT_RAW;
+               if (pixfmt == V4L2_PIX_FMT_SBGGR8)
+                       alaw->enable = 1;
+               else if (pixfmt != V4L2_PIX_FMT_SBGGR16)
+                       return -EINVAL;
+       } else {
+               if (pixfmt == V4L2_PIX_FMT_YUYV)
+                       ccdc_hw_params_ycbcr.pix_order = CCDC_PIXORDER_YCBYCR;
+               else if (pixfmt == V4L2_PIX_FMT_UYVY)
+                       ccdc_hw_params_ycbcr.pix_order = CCDC_PIXORDER_CBYCRY;
+               else
+                       return -EINVAL;
+       }
+       return 0;
+}
+static u32 ccdc_get_pixel_format(void)
+{
+       struct ccdc_a_law *alaw =
+               &ccdc_hw_params_raw.config_params.alaw;
+       u32 pixfmt;
+
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               if (alaw->enable)
+                       pixfmt = V4L2_PIX_FMT_SBGGR8;
+               else
+                       pixfmt = V4L2_PIX_FMT_SBGGR16;
+       else {
+               if (ccdc_hw_params_ycbcr.pix_order == CCDC_PIXORDER_YCBYCR)
+                       pixfmt = V4L2_PIX_FMT_YUYV;
+               else
+                       pixfmt = V4L2_PIX_FMT_UYVY;
+       }
+       return pixfmt;
+}
+static int ccdc_set_image_window(struct v4l2_rect *win)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.win = *win;
+       else
+               ccdc_hw_params_ycbcr.win = *win;
+       return 0;
+}
+
+static void ccdc_get_image_window(struct v4l2_rect *win)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               *win = ccdc_hw_params_raw.win;
+       else
+               *win = ccdc_hw_params_ycbcr.win;
+}
+
+static unsigned int ccdc_get_line_length(void)
+{
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int len;
+
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               if ((config_params->alaw.enable) ||
+                   (config_params->data_sz == CCDC_DATA_8BITS))
+                       len = ccdc_hw_params_raw.win.width;
+               else
+                       len = ccdc_hw_params_raw.win.width * 2;
+       } else
+               len = ccdc_hw_params_ycbcr.win.width * 2;
+       return ALIGN(len, 32);
+}
+
+static int ccdc_set_frame_format(enum ccdc_frmfmt frm_fmt)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.frm_fmt = frm_fmt;
+       else
+               ccdc_hw_params_ycbcr.frm_fmt = frm_fmt;
+       return 0;
+}
+
+static enum ccdc_frmfmt ccdc_get_frame_format(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               return ccdc_hw_params_raw.frm_fmt;
+       else
+               return ccdc_hw_params_ycbcr.frm_fmt;
+}
+
+static int ccdc_getfid(void)
+{
+       return  (regr(MODESET) >> 15) & 1;
+}
+
+/* misc operations */
+static inline void ccdc_setfbaddr(unsigned long addr)
+{
+       regw((addr >> 21) & 0x007f, STADRH);
+       regw((addr >> 5) & 0x0ffff, STADRL);
+}
+
+static int ccdc_set_hw_if_params(struct vpfe_hw_if_param *params)
+{
+       ccdc_if_type = params->if_type;
+
+       switch (params->if_type) {
+       case VPFE_BT656:
+       case VPFE_YCBCR_SYNC_16:
+       case VPFE_YCBCR_SYNC_8:
+               ccdc_hw_params_ycbcr.vd_pol = params->vdpol;
+               ccdc_hw_params_ycbcr.hd_pol = params->hdpol;
+               break;
+       default:
+               /* TODO add support for raw bayer here */
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static struct ccdc_hw_device ccdc_hw_dev = {
+       .name = "DM355 CCDC",
+       .owner = THIS_MODULE,
+       .hw_ops = {
+               .open = ccdc_open,
+               .close = ccdc_close,
+               .set_ccdc_base = ccdc_set_ccdc_base,
+               .enable = ccdc_enable,
+               .enable_out_to_sdram = ccdc_enable_output_to_sdram,
+               .set_hw_if_params = ccdc_set_hw_if_params,
+               .set_params = ccdc_set_params,
+               .configure = ccdc_configure,
+               .set_buftype = ccdc_set_buftype,
+               .get_buftype = ccdc_get_buftype,
+               .enum_pix = ccdc_enum_pix,
+               .set_pixel_format = ccdc_set_pixel_format,
+               .get_pixel_format = ccdc_get_pixel_format,
+               .set_frame_format = ccdc_set_frame_format,
+               .get_frame_format = ccdc_get_frame_format,
+               .set_image_window = ccdc_set_image_window,
+               .get_image_window = ccdc_get_image_window,
+               .get_line_length = ccdc_get_line_length,
+               .setfbaddr = ccdc_setfbaddr,
+               .getfid = ccdc_getfid,
+       },
+};
+
+static int dm355_ccdc_init(void)
+{
+       printk(KERN_NOTICE "dm355_ccdc_init\n");
+       if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
+               return -1;
+       printk(KERN_NOTICE "%s is registered with vpfe.\n",
+               ccdc_hw_dev.name);
+       return 0;
+}
+
+static void dm355_ccdc_exit(void)
+{
+       vpfe_unregister_ccdc_device(&ccdc_hw_dev);
+}
+
+module_init(dm355_ccdc_init);
+module_exit(dm355_ccdc_exit);
diff --git a/drivers/media/video/davinci/dm355_ccdc_regs.h b/drivers/media/video/davinci/dm355_ccdc_regs.h
new file mode 100644 (file)
index 0000000..d6d2ef0
--- /dev/null
@@ -0,0 +1,310 @@
+/*
+ * Copyright (C) 2005-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _DM355_CCDC_REGS_H
+#define _DM355_CCDC_REGS_H
+
+/**************************************************************************\
+* Register OFFSET Definitions
+\**************************************************************************/
+#define SYNCEN                         0x00
+#define MODESET                                0x04
+#define HDWIDTH                                0x08
+#define VDWIDTH                                0x0c
+#define PPLN                           0x10
+#define LPFR                           0x14
+#define SPH                            0x18
+#define NPH                            0x1c
+#define SLV0                           0x20
+#define SLV1                           0x24
+#define NLV                            0x28
+#define CULH                           0x2c
+#define CULV                           0x30
+#define HSIZE                          0x34
+#define SDOFST                         0x38
+#define STADRH                         0x3c
+#define STADRL                         0x40
+#define CLAMP                          0x44
+#define DCSUB                          0x48
+#define COLPTN                         0x4c
+#define BLKCMP0                                0x50
+#define BLKCMP1                                0x54
+#define MEDFILT                                0x58
+#define RYEGAIN                                0x5c
+#define GRCYGAIN                       0x60
+#define GBGGAIN                                0x64
+#define BMGGAIN                                0x68
+#define OFFSET                         0x6c
+#define OUTCLIP                                0x70
+#define VDINT0                         0x74
+#define VDINT1                         0x78
+#define RSV0                           0x7c
+#define GAMMAWD                                0x80
+#define REC656IF                       0x84
+#define CCDCFG                         0x88
+#define FMTCFG                         0x8c
+#define FMTPLEN                                0x90
+#define FMTSPH                         0x94
+#define FMTLNH                         0x98
+#define FMTSLV                         0x9c
+#define FMTLNV                         0xa0
+#define FMTRLEN                                0xa4
+#define FMTHCNT                                0xa8
+#define FMT_ADDR_PTR_B                 0xac
+#define FMT_ADDR_PTR(i)                        (FMT_ADDR_PTR_B + (i * 4))
+#define FMTPGM_VF0                     0xcc
+#define FMTPGM_VF1                     0xd0
+#define FMTPGM_AP0                     0xd4
+#define FMTPGM_AP1                     0xd8
+#define FMTPGM_AP2                     0xdc
+#define FMTPGM_AP3                      0xe0
+#define FMTPGM_AP4                      0xe4
+#define FMTPGM_AP5                      0xe8
+#define FMTPGM_AP6                      0xec
+#define FMTPGM_AP7                      0xf0
+#define LSCCFG1                         0xf4
+#define LSCCFG2                         0xf8
+#define LSCH0                           0xfc
+#define LSCV0                           0x100
+#define LSCKH                           0x104
+#define LSCKV                           0x108
+#define LSCMEMCTL                       0x10c
+#define LSCMEMD                         0x110
+#define LSCMEMQ                         0x114
+#define DFCCTL                          0x118
+#define DFCVSAT                         0x11c
+#define DFCMEMCTL                       0x120
+#define DFCMEM0                         0x124
+#define DFCMEM1                         0x128
+#define DFCMEM2                         0x12c
+#define DFCMEM3                         0x130
+#define DFCMEM4                         0x134
+#define CSCCTL                          0x138
+#define CSCM0                           0x13c
+#define CSCM1                           0x140
+#define CSCM2                           0x144
+#define CSCM3                           0x148
+#define CSCM4                           0x14c
+#define CSCM5                           0x150
+#define CSCM6                           0x154
+#define CSCM7                           0x158
+#define DATAOFST                       0x15c
+#define CCDC_REG_LAST                  DATAOFST
+/**************************************************************
+*      Define for various register bit mask and shifts for CCDC
+*
+**************************************************************/
+#define CCDC_RAW_IP_MODE                       0
+#define CCDC_VDHDOUT_INPUT                     0
+#define CCDC_YCINSWP_RAW                       (0 << 4)
+#define CCDC_EXWEN_DISABLE                     0
+#define CCDC_DATAPOL_NORMAL                    0
+#define CCDC_CCDCFG_FIDMD_LATCH_VSYNC          0
+#define CCDC_CCDCFG_FIDMD_NO_LATCH_VSYNC       (1 << 6)
+#define CCDC_CCDCFG_WENLOG_AND                 0
+#define CCDC_CCDCFG_TRGSEL_WEN                 0
+#define CCDC_CCDCFG_EXTRG_DISABLE              0
+#define CCDC_CFA_MOSAIC                                0
+#define CCDC_Y8POS_SHIFT                       11
+
+#define CCDC_VDC_DFCVSAT_MASK                  0x3fff
+#define CCDC_DATAOFST_MASK                     0x0ff
+#define CCDC_DATAOFST_H_SHIFT                  0
+#define CCDC_DATAOFST_V_SHIFT                  8
+#define CCDC_GAMMAWD_CFA_MASK                  1
+#define CCDC_GAMMAWD_CFA_SHIFT                 5
+#define CCDC_GAMMAWD_INPUT_SHIFT               2
+#define CCDC_FID_POL_MASK                      1
+#define CCDC_FID_POL_SHIFT                     4
+#define CCDC_HD_POL_MASK                       1
+#define CCDC_HD_POL_SHIFT                      3
+#define CCDC_VD_POL_MASK                       1
+#define CCDC_VD_POL_SHIFT                      2
+#define CCDC_VD_POL_NEGATIVE                   (1 << 2)
+#define CCDC_FRM_FMT_MASK                      1
+#define CCDC_FRM_FMT_SHIFT                     7
+#define CCDC_DATA_SZ_MASK                      7
+#define CCDC_DATA_SZ_SHIFT                     8
+#define CCDC_VDHDOUT_MASK                      1
+#define CCDC_VDHDOUT_SHIFT                     0
+#define CCDC_EXWEN_MASK                                1
+#define CCDC_EXWEN_SHIFT                       5
+#define CCDC_INPUT_MODE_MASK                   3
+#define CCDC_INPUT_MODE_SHIFT                  12
+#define CCDC_PIX_FMT_MASK                      3
+#define CCDC_PIX_FMT_SHIFT                     12
+#define CCDC_DATAPOL_MASK                      1
+#define CCDC_DATAPOL_SHIFT                     6
+#define CCDC_WEN_ENABLE                                (1 << 1)
+#define CCDC_VDHDEN_ENABLE                     (1 << 16)
+#define CCDC_LPF_ENABLE                                (1 << 14)
+#define CCDC_ALAW_ENABLE                       1
+#define CCDC_ALAW_GAMA_WD_MASK                 7
+#define CCDC_REC656IF_BT656_EN                 3
+
+#define CCDC_FMTCFG_FMTMODE_MASK               3
+#define CCDC_FMTCFG_FMTMODE_SHIFT              1
+#define CCDC_FMTCFG_LNUM_MASK                  3
+#define CCDC_FMTCFG_LNUM_SHIFT                 4
+#define CCDC_FMTCFG_ADDRINC_MASK               7
+#define CCDC_FMTCFG_ADDRINC_SHIFT              8
+
+#define CCDC_CCDCFG_FIDMD_SHIFT                        6
+#define        CCDC_CCDCFG_WENLOG_SHIFT                8
+#define CCDC_CCDCFG_TRGSEL_SHIFT               9
+#define CCDC_CCDCFG_EXTRG_SHIFT                        10
+#define CCDC_CCDCFG_MSBINVI_SHIFT              13
+
+#define CCDC_HSIZE_FLIP_SHIFT                  12
+#define CCDC_HSIZE_FLIP_MASK                   1
+#define CCDC_HSIZE_VAL_MASK                    0xFFF
+#define CCDC_SDOFST_FIELD_INTERLEAVED          0x249
+#define CCDC_SDOFST_INTERLACE_INVERSE          0x4B6D
+#define CCDC_SDOFST_INTERLACE_NORMAL           0x0B6D
+#define CCDC_SDOFST_PROGRESSIVE_INVERSE                0x4000
+#define CCDC_SDOFST_PROGRESSIVE_NORMAL         0
+#define CCDC_START_PX_HOR_MASK                 0x7FFF
+#define CCDC_NUM_PX_HOR_MASK                   0x7FFF
+#define CCDC_START_VER_ONE_MASK                        0x7FFF
+#define CCDC_START_VER_TWO_MASK                        0x7FFF
+#define CCDC_NUM_LINES_VER                     0x7FFF
+
+#define CCDC_BLK_CLAMP_ENABLE                  (1 << 15)
+#define CCDC_BLK_SGAIN_MASK                    0x1F
+#define CCDC_BLK_ST_PXL_MASK                   0x1FFF
+#define CCDC_BLK_SAMPLE_LN_MASK                        3
+#define CCDC_BLK_SAMPLE_LN_SHIFT               13
+
+#define CCDC_NUM_LINE_CALC_MASK                        3
+#define CCDC_NUM_LINE_CALC_SHIFT               14
+
+#define CCDC_BLK_DC_SUB_MASK                   0x3FFF
+#define CCDC_BLK_COMP_MASK                     0xFF
+#define CCDC_BLK_COMP_GB_COMP_SHIFT            8
+#define CCDC_BLK_COMP_GR_COMP_SHIFT            0
+#define CCDC_BLK_COMP_R_COMP_SHIFT             8
+#define CCDC_LATCH_ON_VSYNC_DISABLE            (1 << 15)
+#define CCDC_LATCH_ON_VSYNC_ENABLE             (0 << 15)
+#define CCDC_FPC_ENABLE                                (1 << 15)
+#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
+#define CCDC_DATA_PACK_ENABLE                  (1 << 11)
+#define CCDC_FMT_HORZ_FMTLNH_MASK              0x1FFF
+#define CCDC_FMT_HORZ_FMTSPH_MASK              0x1FFF
+#define CCDC_FMT_HORZ_FMTSPH_SHIFT             16
+#define CCDC_FMT_VERT_FMTLNV_MASK              0x1FFF
+#define CCDC_FMT_VERT_FMTSLV_MASK              0x1FFF
+#define CCDC_FMT_VERT_FMTSLV_SHIFT             16
+#define CCDC_VP_OUT_VERT_NUM_MASK              0x3FFF
+#define CCDC_VP_OUT_VERT_NUM_SHIFT             17
+#define CCDC_VP_OUT_HORZ_NUM_MASK              0x1FFF
+#define CCDC_VP_OUT_HORZ_NUM_SHIFT             4
+#define CCDC_VP_OUT_HORZ_ST_MASK               0xF
+
+#define CCDC_CSC_COEF_INTEG_MASK               7
+#define CCDC_CSC_COEF_DECIMAL_MASK             0x1f
+#define CCDC_CSC_COEF_INTEG_SHIFT              5
+#define CCDC_CSCM_MSB_SHIFT                    8
+#define CCDC_CSC_ENABLE                                1
+#define CCDC_CSC_DEC_MAX                       32
+
+#define CCDC_MFILT1_SHIFT                      10
+#define CCDC_MFILT2_SHIFT                      8
+#define CCDC_MED_FILT_THRESH                   0x3FFF
+#define CCDC_LPF_MASK                          1
+#define CCDC_LPF_SHIFT                         14
+#define CCDC_OFFSET_MASK                       0x3FF
+#define CCDC_DATASFT_MASK                      7
+#define CCDC_DATASFT_SHIFT                     8
+
+#define CCDC_DF_ENABLE                         1
+
+#define CCDC_FMTPLEN_P0_MASK                   0xF
+#define CCDC_FMTPLEN_P1_MASK                   0xF
+#define CCDC_FMTPLEN_P2_MASK                   7
+#define CCDC_FMTPLEN_P3_MASK                   7
+#define CCDC_FMTPLEN_P0_SHIFT                  0
+#define CCDC_FMTPLEN_P1_SHIFT                  4
+#define CCDC_FMTPLEN_P2_SHIFT                  8
+#define CCDC_FMTPLEN_P3_SHIFT                  12
+
+#define CCDC_FMTSPH_MASK                       0x1FFF
+#define CCDC_FMTLNH_MASK                       0x1FFF
+#define CCDC_FMTSLV_MASK                       0x1FFF
+#define CCDC_FMTLNV_MASK                       0x7FFF
+#define CCDC_FMTRLEN_MASK                      0x1FFF
+#define CCDC_FMTHCNT_MASK                      0x1FFF
+
+#define CCDC_ADP_INIT_MASK                     0x1FFF
+#define CCDC_ADP_LINE_SHIFT                    13
+#define CCDC_ADP_LINE_MASK                     3
+#define CCDC_FMTPGN_APTR_MASK                  7
+
+#define CCDC_DFCCTL_GDFCEN_MASK                        1
+#define CCDC_DFCCTL_VDFCEN_MASK                        1
+#define CCDC_DFCCTL_VDFC_DISABLE               (0 << 4)
+#define CCDC_DFCCTL_VDFCEN_SHIFT               4
+#define CCDC_DFCCTL_VDFCSL_MASK                        3
+#define CCDC_DFCCTL_VDFCSL_SHIFT               5
+#define CCDC_DFCCTL_VDFCUDA_MASK               1
+#define CCDC_DFCCTL_VDFCUDA_SHIFT              7
+#define CCDC_DFCCTL_VDFLSFT_MASK               3
+#define CCDC_DFCCTL_VDFLSFT_SHIFT              8
+#define CCDC_DFCMEMCTL_DFCMARST_MASK           1
+#define CCDC_DFCMEMCTL_DFCMARST_SHIFT          2
+#define CCDC_DFCMEMCTL_DFCMWR_MASK             1
+#define CCDC_DFCMEMCTL_DFCMWR_SHIFT            0
+#define CCDC_DFCMEMCTL_INC_ADDR                        (0 << 2)
+
+#define CCDC_LSCCFG_GFTSF_MASK                 7
+#define CCDC_LSCCFG_GFTSF_SHIFT                        1
+#define CCDC_LSCCFG_GFTINV_MASK                        0xf
+#define CCDC_LSCCFG_GFTINV_SHIFT               4
+#define CCDC_LSC_GFTABLE_SEL_MASK              3
+#define CCDC_LSC_GFTABLE_EPEL_SHIFT            8
+#define CCDC_LSC_GFTABLE_OPEL_SHIFT            10
+#define CCDC_LSC_GFTABLE_EPOL_SHIFT            12
+#define CCDC_LSC_GFTABLE_OPOL_SHIFT            14
+#define CCDC_LSC_GFMODE_MASK                   3
+#define CCDC_LSC_GFMODE_SHIFT                  4
+#define CCDC_LSC_DISABLE                       0
+#define CCDC_LSC_ENABLE                                1
+#define CCDC_LSC_TABLE1_SLC                    0
+#define CCDC_LSC_TABLE2_SLC                    1
+#define CCDC_LSC_TABLE3_SLC                    2
+#define CCDC_LSC_MEMADDR_RESET                 (1 << 2)
+#define CCDC_LSC_MEMADDR_INCR                  (0 << 2)
+#define CCDC_LSC_FRAC_MASK_T1                  0xFF
+#define CCDC_LSC_INT_MASK                      3
+#define CCDC_LSC_FRAC_MASK                     0x3FFF
+#define CCDC_LSC_CENTRE_MASK                   0x3FFF
+#define CCDC_LSC_COEF_MASK                     0xff
+#define CCDC_LSC_COEFL_SHIFT                   0
+#define CCDC_LSC_COEFU_SHIFT                   8
+#define CCDC_GAIN_MASK                         0x7FF
+#define CCDC_SYNCEN_VDHDEN_MASK                        (1 << 0)
+#define CCDC_SYNCEN_WEN_MASK                   (1 << 1)
+#define CCDC_SYNCEN_WEN_SHIFT                  1
+
+/* Power on Defaults in hardware */
+#define MODESET_DEFAULT                                0x200
+#define CULH_DEFAULT                           0xFFFF
+#define CULV_DEFAULT                           0xFF
+#define GAIN_DEFAULT                           256
+#define OUTCLIP_DEFAULT                                0x3FFF
+#define LSCCFG2_DEFAULT                                0xE
+
+#endif
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
new file mode 100644 (file)
index 0000000..2f19a91
--- /dev/null
@@ -0,0 +1,878 @@
+/*
+ * Copyright (C) 2006-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * CCDC hardware module for DM6446
+ * ------------------------------
+ *
+ * This module is for configuring CCD controller of DM6446 VPFE to capture
+ * Raw yuv or Bayer RGB data from a decoder. CCDC has several modules
+ * such as Defect Pixel Correction, Color Space Conversion etc to
+ * pre-process the Raw Bayer RGB data, before writing it to SDRAM. This
+ * module also allows application to configure individual
+ * module parameters through VPFE_CMD_S_CCDC_RAW_PARAMS IOCTL.
+ * To do so, application includes dm644x_ccdc.h and vpfe_capture.h header
+ * files.  The setparams() API is called by vpfe_capture driver
+ * to configure module parameters. This file is named DM644x so that other
+ * variants such DM6443 may be supported using the same module.
+ *
+ * TODO: Test Raw bayer parameter settings and bayer capture
+ *      Split module parameter structure to module specific ioctl structs
+ *      investigate if enum used for user space type definition
+ *      to be replaced by #defines or integer
+ */
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/videodev2.h>
+#include <media/davinci/dm644x_ccdc.h>
+#include <media/davinci/vpss.h>
+#include "dm644x_ccdc_regs.h"
+#include "ccdc_hw_device.h"
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("CCDC Driver for DM6446");
+MODULE_AUTHOR("Texas Instruments");
+
+static struct device *dev;
+
+/* Object for CCDC raw mode */
+static struct ccdc_params_raw ccdc_hw_params_raw = {
+       .pix_fmt = CCDC_PIXFMT_RAW,
+       .frm_fmt = CCDC_FRMFMT_PROGRESSIVE,
+       .win = CCDC_WIN_VGA,
+       .fid_pol = VPFE_PINPOL_POSITIVE,
+       .vd_pol = VPFE_PINPOL_POSITIVE,
+       .hd_pol = VPFE_PINPOL_POSITIVE,
+       .config_params = {
+               .data_sz = CCDC_DATA_10BITS,
+       },
+};
+
+/* Object for CCDC ycbcr mode */
+static struct ccdc_params_ycbcr ccdc_hw_params_ycbcr = {
+       .pix_fmt = CCDC_PIXFMT_YCBCR_8BIT,
+       .frm_fmt = CCDC_FRMFMT_INTERLACED,
+       .win = CCDC_WIN_PAL,
+       .fid_pol = VPFE_PINPOL_POSITIVE,
+       .vd_pol = VPFE_PINPOL_POSITIVE,
+       .hd_pol = VPFE_PINPOL_POSITIVE,
+       .bt656_enable = 1,
+       .pix_order = CCDC_PIXORDER_CBYCRY,
+       .buf_type = CCDC_BUFTYPE_FLD_INTERLEAVED
+};
+
+#define CCDC_MAX_RAW_YUV_FORMATS       2
+
+/* Raw Bayer formats */
+static u32 ccdc_raw_bayer_pix_formats[] =
+       {V4L2_PIX_FMT_SBGGR8, V4L2_PIX_FMT_SBGGR16};
+
+/* Raw YUV formats */
+static u32 ccdc_raw_yuv_pix_formats[] =
+       {V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_YUYV};
+
+static void *__iomem ccdc_base_addr;
+static int ccdc_addr_size;
+static enum vpfe_hw_if_type ccdc_if_type;
+
+/* register access routines */
+static inline u32 regr(u32 offset)
+{
+       return __raw_readl(ccdc_base_addr + offset);
+}
+
+static inline void regw(u32 val, u32 offset)
+{
+       __raw_writel(val, ccdc_base_addr + offset);
+}
+
+static void ccdc_set_ccdc_base(void *addr, int size)
+{
+       ccdc_base_addr = addr;
+       ccdc_addr_size = size;
+}
+
+static void ccdc_enable(int flag)
+{
+       regw(flag, CCDC_PCR);
+}
+
+static void ccdc_enable_vport(int flag)
+{
+       if (flag)
+               /* enable video port */
+               regw(CCDC_ENABLE_VIDEO_PORT, CCDC_FMTCFG);
+       else
+               regw(CCDC_DISABLE_VIDEO_PORT, CCDC_FMTCFG);
+}
+
+/*
+ * ccdc_setwin()
+ * This function will configure the window size
+ * to be capture in CCDC reg
+ */
+void ccdc_setwin(struct v4l2_rect *image_win,
+               enum ccdc_frmfmt frm_fmt,
+               int ppc)
+{
+       int horz_start, horz_nr_pixels;
+       int vert_start, vert_nr_lines;
+       int val = 0, mid_img = 0;
+
+       dev_dbg(dev, "\nStarting ccdc_setwin...");
+       /*
+        * ppc - per pixel count. indicates how many pixels per cell
+        * output to SDRAM. example, for ycbcr, it is one y and one c, so 2.
+        * raw capture this is 1
+        */
+       horz_start = image_win->left << (ppc - 1);
+       horz_nr_pixels = (image_win->width << (ppc - 1)) - 1;
+       regw((horz_start << CCDC_HORZ_INFO_SPH_SHIFT) | horz_nr_pixels,
+            CCDC_HORZ_INFO);
+
+       vert_start = image_win->top;
+
+       if (frm_fmt == CCDC_FRMFMT_INTERLACED) {
+               vert_nr_lines = (image_win->height >> 1) - 1;
+               vert_start >>= 1;
+               /* Since first line doesn't have any data */
+               vert_start += 1;
+               /* configure VDINT0 */
+               val = (vert_start << CCDC_VDINT_VDINT0_SHIFT);
+               regw(val, CCDC_VDINT);
+
+       } else {
+               /* Since first line doesn't have any data */
+               vert_start += 1;
+               vert_nr_lines = image_win->height - 1;
+               /*
+                * configure VDINT0 and VDINT1. VDINT1 will be at half
+                * of image height
+                */
+               mid_img = vert_start + (image_win->height / 2);
+               val = (vert_start << CCDC_VDINT_VDINT0_SHIFT) |
+                   (mid_img & CCDC_VDINT_VDINT1_MASK);
+               regw(val, CCDC_VDINT);
+
+       }
+       regw((vert_start << CCDC_VERT_START_SLV0_SHIFT) | vert_start,
+            CCDC_VERT_START);
+       regw(vert_nr_lines, CCDC_VERT_LINES);
+       dev_dbg(dev, "\nEnd of ccdc_setwin...");
+}
+
+static void ccdc_readregs(void)
+{
+       unsigned int val = 0;
+
+       val = regr(CCDC_ALAW);
+       dev_notice(dev, "\nReading 0x%x to ALAW...\n", val);
+       val = regr(CCDC_CLAMP);
+       dev_notice(dev, "\nReading 0x%x to CLAMP...\n", val);
+       val = regr(CCDC_DCSUB);
+       dev_notice(dev, "\nReading 0x%x to DCSUB...\n", val);
+       val = regr(CCDC_BLKCMP);
+       dev_notice(dev, "\nReading 0x%x to BLKCMP...\n", val);
+       val = regr(CCDC_FPC_ADDR);
+       dev_notice(dev, "\nReading 0x%x to FPC_ADDR...\n", val);
+       val = regr(CCDC_FPC);
+       dev_notice(dev, "\nReading 0x%x to FPC...\n", val);
+       val = regr(CCDC_FMTCFG);
+       dev_notice(dev, "\nReading 0x%x to FMTCFG...\n", val);
+       val = regr(CCDC_COLPTN);
+       dev_notice(dev, "\nReading 0x%x to COLPTN...\n", val);
+       val = regr(CCDC_FMT_HORZ);
+       dev_notice(dev, "\nReading 0x%x to FMT_HORZ...\n", val);
+       val = regr(CCDC_FMT_VERT);
+       dev_notice(dev, "\nReading 0x%x to FMT_VERT...\n", val);
+       val = regr(CCDC_HSIZE_OFF);
+       dev_notice(dev, "\nReading 0x%x to HSIZE_OFF...\n", val);
+       val = regr(CCDC_SDOFST);
+       dev_notice(dev, "\nReading 0x%x to SDOFST...\n", val);
+       val = regr(CCDC_VP_OUT);
+       dev_notice(dev, "\nReading 0x%x to VP_OUT...\n", val);
+       val = regr(CCDC_SYN_MODE);
+       dev_notice(dev, "\nReading 0x%x to SYN_MODE...\n", val);
+       val = regr(CCDC_HORZ_INFO);
+       dev_notice(dev, "\nReading 0x%x to HORZ_INFO...\n", val);
+       val = regr(CCDC_VERT_START);
+       dev_notice(dev, "\nReading 0x%x to VERT_START...\n", val);
+       val = regr(CCDC_VERT_LINES);
+       dev_notice(dev, "\nReading 0x%x to VERT_LINES...\n", val);
+}
+
+static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
+{
+       if (ccdcparam->alaw.enable) {
+               if ((ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) ||
+                   (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_15_6) ||
+                   (ccdcparam->alaw.gama_wd < ccdcparam->data_sz)) {
+                       dev_dbg(dev, "\nInvalid data line select");
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params)
+{
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int *fpc_virtaddr = NULL;
+       unsigned int *fpc_physaddr = NULL;
+
+       memcpy(config_params, raw_params, sizeof(*raw_params));
+       /*
+        * allocate memory for fault pixel table and copy the user
+        * values to the table
+        */
+       if (!config_params->fault_pxl.enable)
+               return 0;
+
+       fpc_physaddr = (unsigned int *)config_params->fault_pxl.fpc_table_addr;
+       fpc_virtaddr = (unsigned int *)phys_to_virt(
+                               (unsigned long)fpc_physaddr);
+       /*
+        * Allocate memory for FPC table if current
+        * FPC table buffer is not big enough to
+        * accomodate FPC Number requested
+        */
+       if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) {
+               if (fpc_physaddr != NULL) {
+                       free_pages((unsigned long)fpc_physaddr,
+                                  get_order
+                                  (config_params->fault_pxl.fp_num *
+                                  FP_NUM_BYTES));
+               }
+
+               /* Allocate memory for FPC table */
+               fpc_virtaddr =
+                       (unsigned int *)__get_free_pages(GFP_KERNEL | GFP_DMA,
+                                                        get_order(raw_params->
+                                                        fault_pxl.fp_num *
+                                                        FP_NUM_BYTES));
+
+               if (fpc_virtaddr == NULL) {
+                       dev_dbg(dev,
+                               "\nUnable to allocate memory for FPC");
+                       return -EFAULT;
+               }
+               fpc_physaddr =
+                   (unsigned int *)virt_to_phys((void *)fpc_virtaddr);
+       }
+
+       /* Copy number of fault pixels and FPC table */
+       config_params->fault_pxl.fp_num = raw_params->fault_pxl.fp_num;
+       if (copy_from_user(fpc_virtaddr,
+                       (void __user *)raw_params->fault_pxl.fpc_table_addr,
+                       config_params->fault_pxl.fp_num * FP_NUM_BYTES)) {
+               dev_dbg(dev, "\n copy_from_user failed");
+               return -EFAULT;
+       }
+       config_params->fault_pxl.fpc_table_addr = (unsigned int)fpc_physaddr;
+       return 0;
+}
+
+static int ccdc_close(struct device *dev)
+{
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int *fpc_physaddr = NULL, *fpc_virtaddr = NULL;
+
+       fpc_physaddr = (unsigned int *)config_params->fault_pxl.fpc_table_addr;
+
+       if (fpc_physaddr != NULL) {
+               fpc_virtaddr = (unsigned int *)
+                   phys_to_virt((unsigned long)fpc_physaddr);
+               free_pages((unsigned long)fpc_virtaddr,
+                          get_order(config_params->fault_pxl.fp_num *
+                          FP_NUM_BYTES));
+       }
+       return 0;
+}
+
+/*
+ * ccdc_restore_defaults()
+ * This function will write defaults to all CCDC registers
+ */
+static void ccdc_restore_defaults(void)
+{
+       int i;
+
+       /* disable CCDC */
+       ccdc_enable(0);
+       /* set all registers to default value */
+       for (i = 4; i <= 0x94; i += 4)
+               regw(0,  i);
+       regw(CCDC_NO_CULLING, CCDC_CULLING);
+       regw(CCDC_GAMMA_BITS_11_2, CCDC_ALAW);
+}
+
+static int ccdc_open(struct device *device)
+{
+       dev = device;
+       ccdc_restore_defaults();
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_enable_vport(1);
+       return 0;
+}
+
+static void ccdc_sbl_reset(void)
+{
+       vpss_clear_wbl_overflow(VPSS_PCR_CCDC_WBL_O);
+}
+
+/* Parameter operations */
+static int ccdc_set_params(void __user *params)
+{
+       struct ccdc_config_params_raw ccdc_raw_params;
+       int x;
+
+       if (ccdc_if_type != VPFE_RAW_BAYER)
+               return -EINVAL;
+
+       x = copy_from_user(&ccdc_raw_params, params, sizeof(ccdc_raw_params));
+       if (x) {
+               dev_dbg(dev, "ccdc_set_params: error in copying"
+                          "ccdc params, %d\n", x);
+               return -EFAULT;
+       }
+
+       if (!validate_ccdc_param(&ccdc_raw_params)) {
+               if (!ccdc_update_raw_params(&ccdc_raw_params))
+                       return 0;
+       }
+       return -EINVAL;
+}
+
+/*
+ * ccdc_config_ycbcr()
+ * This function will configure CCDC for YCbCr video capture
+ */
+void ccdc_config_ycbcr(void)
+{
+       struct ccdc_params_ycbcr *params = &ccdc_hw_params_ycbcr;
+       u32 syn_mode;
+
+       dev_dbg(dev, "\nStarting ccdc_config_ycbcr...");
+       /*
+        * first restore the CCDC registers to default values
+        * This is important since we assume default values to be set in
+        * a lot of registers that we didn't touch
+        */
+       ccdc_restore_defaults();
+
+       /*
+        * configure pixel format, frame format, configure video frame
+        * format, enable output to SDRAM, enable internal timing generator
+        * and 8bit pack mode
+        */
+       syn_mode = (((params->pix_fmt & CCDC_SYN_MODE_INPMOD_MASK) <<
+                   CCDC_SYN_MODE_INPMOD_SHIFT) |
+                   ((params->frm_fmt & CCDC_SYN_FLDMODE_MASK) <<
+                   CCDC_SYN_FLDMODE_SHIFT) | CCDC_VDHDEN_ENABLE |
+                   CCDC_WEN_ENABLE | CCDC_DATA_PACK_ENABLE);
+
+       /* setup BT.656 sync mode */
+       if (params->bt656_enable) {
+               regw(CCDC_REC656IF_BT656_EN, CCDC_REC656IF);
+
+               /*
+                * configure the FID, VD, HD pin polarity,
+                * fld,hd pol positive, vd negative, 8-bit data
+                */
+               syn_mode |= CCDC_SYN_MODE_VD_POL_NEGATIVE | CCDC_SYN_MODE_8BITS;
+       } else {
+               /* y/c external sync mode */
+               syn_mode |= (((params->fid_pol & CCDC_FID_POL_MASK) <<
+                            CCDC_FID_POL_SHIFT) |
+                            ((params->hd_pol & CCDC_HD_POL_MASK) <<
+                            CCDC_HD_POL_SHIFT) |
+                            ((params->vd_pol & CCDC_VD_POL_MASK) <<
+                            CCDC_VD_POL_SHIFT));
+       }
+       regw(syn_mode, CCDC_SYN_MODE);
+
+       /* configure video window */
+       ccdc_setwin(&params->win, params->frm_fmt, 2);
+
+       /*
+        * configure the order of y cb cr in SDRAM, and disable latch
+        * internal register on vsync
+        */
+       regw((params->pix_order << CCDC_CCDCFG_Y8POS_SHIFT) |
+                CCDC_LATCH_ON_VSYNC_DISABLE, CCDC_CCDCFG);
+
+       /*
+        * configure the horizontal line offset. This should be a
+        * on 32 byte bondary. So clear LSB 5 bits
+        */
+       regw(((params->win.width * 2  + 31) & ~0x1f), CCDC_HSIZE_OFF);
+
+       /* configure the memory line offset */
+       if (params->buf_type == CCDC_BUFTYPE_FLD_INTERLEAVED)
+               /* two fields are interleaved in memory */
+               regw(CCDC_SDOFST_FIELD_INTERLEAVED, CCDC_SDOFST);
+
+       ccdc_sbl_reset();
+       dev_dbg(dev, "\nEnd of ccdc_config_ycbcr...\n");
+       ccdc_readregs();
+}
+
+static void ccdc_config_black_clamp(struct ccdc_black_clamp *bclamp)
+{
+       u32 val;
+
+       if (!bclamp->enable) {
+               /* configure DCSub */
+               val = (bclamp->dc_sub) & CCDC_BLK_DC_SUB_MASK;
+               regw(val, CCDC_DCSUB);
+               dev_dbg(dev, "\nWriting 0x%x to DCSUB...\n", val);
+               regw(CCDC_CLAMP_DEFAULT_VAL, CCDC_CLAMP);
+               dev_dbg(dev, "\nWriting 0x0000 to CLAMP...\n");
+               return;
+       }
+       /*
+        * Configure gain,  Start pixel, No of line to be avg,
+        * No of pixel/line to be avg, & Enable the Black clamping
+        */
+       val = ((bclamp->sgain & CCDC_BLK_SGAIN_MASK) |
+              ((bclamp->start_pixel & CCDC_BLK_ST_PXL_MASK) <<
+               CCDC_BLK_ST_PXL_SHIFT) |
+              ((bclamp->sample_ln & CCDC_BLK_SAMPLE_LINE_MASK) <<
+               CCDC_BLK_SAMPLE_LINE_SHIFT) |
+              ((bclamp->sample_pixel & CCDC_BLK_SAMPLE_LN_MASK) <<
+               CCDC_BLK_SAMPLE_LN_SHIFT) | CCDC_BLK_CLAMP_ENABLE);
+       regw(val, CCDC_CLAMP);
+       dev_dbg(dev, "\nWriting 0x%x to CLAMP...\n", val);
+       /* If Black clamping is enable then make dcsub 0 */
+       regw(CCDC_DCSUB_DEFAULT_VAL, CCDC_DCSUB);
+       dev_dbg(dev, "\nWriting 0x00000000 to DCSUB...\n");
+}
+
+static void ccdc_config_black_compense(struct ccdc_black_compensation *bcomp)
+{
+       u32 val;
+
+       val = ((bcomp->b & CCDC_BLK_COMP_MASK) |
+             ((bcomp->gb & CCDC_BLK_COMP_MASK) <<
+              CCDC_BLK_COMP_GB_COMP_SHIFT) |
+             ((bcomp->gr & CCDC_BLK_COMP_MASK) <<
+              CCDC_BLK_COMP_GR_COMP_SHIFT) |
+             ((bcomp->r & CCDC_BLK_COMP_MASK) <<
+              CCDC_BLK_COMP_R_COMP_SHIFT));
+       regw(val, CCDC_BLKCMP);
+}
+
+static void ccdc_config_fpc(struct ccdc_fault_pixel *fpc)
+{
+       u32 val;
+
+       /* Initially disable FPC */
+       val = CCDC_FPC_DISABLE;
+       regw(val, CCDC_FPC);
+
+       if (!fpc->enable)
+               return;
+
+       /* Configure Fault pixel if needed */
+       regw(fpc->fpc_table_addr, CCDC_FPC_ADDR);
+       dev_dbg(dev, "\nWriting 0x%x to FPC_ADDR...\n",
+                      (fpc->fpc_table_addr));
+       /* Write the FPC params with FPC disable */
+       val = fpc->fp_num & CCDC_FPC_FPC_NUM_MASK;
+       regw(val, CCDC_FPC);
+
+       dev_dbg(dev, "\nWriting 0x%x to FPC...\n", val);
+       /* read the FPC register */
+       val = regr(CCDC_FPC) | CCDC_FPC_ENABLE;
+       regw(val, CCDC_FPC);
+       dev_dbg(dev, "\nWriting 0x%x to FPC...\n", val);
+}
+
+/*
+ * ccdc_config_raw()
+ * This function will configure CCDC for Raw capture mode
+ */
+void ccdc_config_raw(void)
+{
+       struct ccdc_params_raw *params = &ccdc_hw_params_raw;
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int syn_mode = 0;
+       unsigned int val;
+
+       dev_dbg(dev, "\nStarting ccdc_config_raw...");
+
+       /*      Reset CCDC */
+       ccdc_restore_defaults();
+
+       /* Disable latching function registers on VSYNC  */
+       regw(CCDC_LATCH_ON_VSYNC_DISABLE, CCDC_CCDCFG);
+
+       /*
+        * Configure the vertical sync polarity(SYN_MODE.VDPOL),
+        * horizontal sync polarity (SYN_MODE.HDPOL), frame id polarity
+        * (SYN_MODE.FLDPOL), frame format(progressive or interlace),
+        * data size(SYNMODE.DATSIZ), &pixel format (Input mode), output
+        * SDRAM, enable internal timing generator
+        */
+       syn_mode =
+               (((params->vd_pol & CCDC_VD_POL_MASK) << CCDC_VD_POL_SHIFT) |
+               ((params->hd_pol & CCDC_HD_POL_MASK) << CCDC_HD_POL_SHIFT) |
+               ((params->fid_pol & CCDC_FID_POL_MASK) << CCDC_FID_POL_SHIFT) |
+               ((params->frm_fmt & CCDC_FRM_FMT_MASK) << CCDC_FRM_FMT_SHIFT) |
+               ((config_params->data_sz & CCDC_DATA_SZ_MASK) <<
+               CCDC_DATA_SZ_SHIFT) |
+               ((params->pix_fmt & CCDC_PIX_FMT_MASK) << CCDC_PIX_FMT_SHIFT) |
+               CCDC_WEN_ENABLE | CCDC_VDHDEN_ENABLE);
+
+       /* Enable and configure aLaw register if needed */
+       if (config_params->alaw.enable) {
+               val = ((config_params->alaw.gama_wd &
+                     CCDC_ALAW_GAMA_WD_MASK) | CCDC_ALAW_ENABLE);
+               regw(val, CCDC_ALAW);
+               dev_dbg(dev, "\nWriting 0x%x to ALAW...\n", val);
+       }
+
+       /* Configure video window */
+       ccdc_setwin(&params->win, params->frm_fmt, CCDC_PPC_RAW);
+
+       /* Configure Black Clamp */
+       ccdc_config_black_clamp(&config_params->blk_clamp);
+
+       /* Configure Black level compensation */
+       ccdc_config_black_compense(&config_params->blk_comp);
+
+       /* Configure Fault Pixel Correction */
+       ccdc_config_fpc(&config_params->fault_pxl);
+
+       /* If data size is 8 bit then pack the data */
+       if ((config_params->data_sz == CCDC_DATA_8BITS) ||
+            config_params->alaw.enable)
+               syn_mode |= CCDC_DATA_PACK_ENABLE;
+
+#ifdef CONFIG_DM644X_VIDEO_PORT_ENABLE
+       /* enable video port */
+       val = CCDC_ENABLE_VIDEO_PORT;
+#else
+       /* disable video port */
+       val = CCDC_DISABLE_VIDEO_PORT;
+#endif
+
+       if (config_params->data_sz == CCDC_DATA_8BITS)
+               val |= (CCDC_DATA_10BITS & CCDC_FMTCFG_VPIN_MASK)
+                   << CCDC_FMTCFG_VPIN_SHIFT;
+       else
+               val |= (config_params->data_sz & CCDC_FMTCFG_VPIN_MASK)
+                   << CCDC_FMTCFG_VPIN_SHIFT;
+       /* Write value in FMTCFG */
+       regw(val, CCDC_FMTCFG);
+
+       dev_dbg(dev, "\nWriting 0x%x to FMTCFG...\n", val);
+       /* Configure the color pattern according to mt9t001 sensor */
+       regw(CCDC_COLPTN_VAL, CCDC_COLPTN);
+
+       dev_dbg(dev, "\nWriting 0xBB11BB11 to COLPTN...\n");
+       /*
+        * Configure Data formatter(Video port) pixel selection
+        * (FMT_HORZ, FMT_VERT)
+        */
+       val = ((params->win.left & CCDC_FMT_HORZ_FMTSPH_MASK) <<
+             CCDC_FMT_HORZ_FMTSPH_SHIFT) |
+             (params->win.width & CCDC_FMT_HORZ_FMTLNH_MASK);
+       regw(val, CCDC_FMT_HORZ);
+
+       dev_dbg(dev, "\nWriting 0x%x to FMT_HORZ...\n", val);
+       val = (params->win.top & CCDC_FMT_VERT_FMTSLV_MASK)
+           << CCDC_FMT_VERT_FMTSLV_SHIFT;
+       if (params->frm_fmt == CCDC_FRMFMT_PROGRESSIVE)
+               val |= (params->win.height) & CCDC_FMT_VERT_FMTLNV_MASK;
+       else
+               val |= (params->win.height >> 1) & CCDC_FMT_VERT_FMTLNV_MASK;
+
+       dev_dbg(dev, "\nparams->win.height  0x%x ...\n",
+              params->win.height);
+       regw(val, CCDC_FMT_VERT);
+
+       dev_dbg(dev, "\nWriting 0x%x to FMT_VERT...\n", val);
+
+       dev_dbg(dev, "\nbelow regw(val, FMT_VERT)...");
+
+       /*
+        * Configure Horizontal offset register. If pack 8 is enabled then
+        * 1 pixel will take 1 byte
+        */
+       if ((config_params->data_sz == CCDC_DATA_8BITS) ||
+           config_params->alaw.enable)
+               regw((params->win.width + CCDC_32BYTE_ALIGN_VAL) &
+                   CCDC_HSIZE_OFF_MASK, CCDC_HSIZE_OFF);
+       else
+               /* else one pixel will take 2 byte */
+               regw(((params->win.width * CCDC_TWO_BYTES_PER_PIXEL) +
+                   CCDC_32BYTE_ALIGN_VAL) & CCDC_HSIZE_OFF_MASK,
+                   CCDC_HSIZE_OFF);
+
+       /* Set value for SDOFST */
+       if (params->frm_fmt == CCDC_FRMFMT_INTERLACED) {
+               if (params->image_invert_enable) {
+                       /* For intelace inverse mode */
+                       regw(CCDC_INTERLACED_IMAGE_INVERT, CCDC_SDOFST);
+                       dev_dbg(dev, "\nWriting 0x4B6D to SDOFST...\n");
+               }
+
+               else {
+                       /* For intelace non inverse mode */
+                       regw(CCDC_INTERLACED_NO_IMAGE_INVERT, CCDC_SDOFST);
+                       dev_dbg(dev, "\nWriting 0x0249 to SDOFST...\n");
+               }
+       } else if (params->frm_fmt == CCDC_FRMFMT_PROGRESSIVE) {
+               regw(CCDC_PROGRESSIVE_NO_IMAGE_INVERT, CCDC_SDOFST);
+               dev_dbg(dev, "\nWriting 0x0000 to SDOFST...\n");
+       }
+
+       /*
+        * Configure video port pixel selection (VPOUT)
+        * Here -1 is to make the height value less than FMT_VERT.FMTLNV
+        */
+       if (params->frm_fmt == CCDC_FRMFMT_PROGRESSIVE)
+               val = (((params->win.height - 1) & CCDC_VP_OUT_VERT_NUM_MASK))
+                   << CCDC_VP_OUT_VERT_NUM_SHIFT;
+       else
+               val =
+                   ((((params->win.height >> CCDC_INTERLACED_HEIGHT_SHIFT) -
+                    1) & CCDC_VP_OUT_VERT_NUM_MASK)) <<
+                   CCDC_VP_OUT_VERT_NUM_SHIFT;
+
+       val |= ((((params->win.width))) & CCDC_VP_OUT_HORZ_NUM_MASK)
+           << CCDC_VP_OUT_HORZ_NUM_SHIFT;
+       val |= (params->win.left) & CCDC_VP_OUT_HORZ_ST_MASK;
+       regw(val, CCDC_VP_OUT);
+
+       dev_dbg(dev, "\nWriting 0x%x to VP_OUT...\n", val);
+       regw(syn_mode, CCDC_SYN_MODE);
+       dev_dbg(dev, "\nWriting 0x%x to SYN_MODE...\n", syn_mode);
+
+       ccdc_sbl_reset();
+       dev_dbg(dev, "\nend of ccdc_config_raw...");
+       ccdc_readregs();
+}
+
+static int ccdc_configure(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_config_raw();
+       else
+               ccdc_config_ycbcr();
+       return 0;
+}
+
+static int ccdc_set_buftype(enum ccdc_buftype buf_type)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.buf_type = buf_type;
+       else
+               ccdc_hw_params_ycbcr.buf_type = buf_type;
+       return 0;
+}
+
+static enum ccdc_buftype ccdc_get_buftype(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               return ccdc_hw_params_raw.buf_type;
+       return ccdc_hw_params_ycbcr.buf_type;
+}
+
+static int ccdc_enum_pix(u32 *pix, int i)
+{
+       int ret = -EINVAL;
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               if (i < ARRAY_SIZE(ccdc_raw_bayer_pix_formats)) {
+                       *pix = ccdc_raw_bayer_pix_formats[i];
+                       ret = 0;
+               }
+       } else {
+               if (i < ARRAY_SIZE(ccdc_raw_yuv_pix_formats)) {
+                       *pix = ccdc_raw_yuv_pix_formats[i];
+                       ret = 0;
+               }
+       }
+       return ret;
+}
+
+static int ccdc_set_pixel_format(u32 pixfmt)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               ccdc_hw_params_raw.pix_fmt = CCDC_PIXFMT_RAW;
+               if (pixfmt == V4L2_PIX_FMT_SBGGR8)
+                       ccdc_hw_params_raw.config_params.alaw.enable = 1;
+               else if (pixfmt != V4L2_PIX_FMT_SBGGR16)
+                       return -EINVAL;
+       } else {
+               if (pixfmt == V4L2_PIX_FMT_YUYV)
+                       ccdc_hw_params_ycbcr.pix_order = CCDC_PIXORDER_YCBYCR;
+               else if (pixfmt == V4L2_PIX_FMT_UYVY)
+                       ccdc_hw_params_ycbcr.pix_order = CCDC_PIXORDER_CBYCRY;
+               else
+                       return -EINVAL;
+       }
+       return 0;
+}
+
+static u32 ccdc_get_pixel_format(void)
+{
+       struct ccdc_a_law *alaw =
+               &ccdc_hw_params_raw.config_params.alaw;
+       u32 pixfmt;
+
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               if (alaw->enable)
+                       pixfmt = V4L2_PIX_FMT_SBGGR8;
+               else
+                       pixfmt = V4L2_PIX_FMT_SBGGR16;
+       else {
+               if (ccdc_hw_params_ycbcr.pix_order == CCDC_PIXORDER_YCBYCR)
+                       pixfmt = V4L2_PIX_FMT_YUYV;
+               else
+                       pixfmt = V4L2_PIX_FMT_UYVY;
+       }
+       return pixfmt;
+}
+
+static int ccdc_set_image_window(struct v4l2_rect *win)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.win = *win;
+       else
+               ccdc_hw_params_ycbcr.win = *win;
+       return 0;
+}
+
+static void ccdc_get_image_window(struct v4l2_rect *win)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               *win = ccdc_hw_params_raw.win;
+       else
+               *win = ccdc_hw_params_ycbcr.win;
+}
+
+static unsigned int ccdc_get_line_length(void)
+{
+       struct ccdc_config_params_raw *config_params =
+               &ccdc_hw_params_raw.config_params;
+       unsigned int len;
+
+       if (ccdc_if_type == VPFE_RAW_BAYER) {
+               if ((config_params->alaw.enable) ||
+                   (config_params->data_sz == CCDC_DATA_8BITS))
+                       len = ccdc_hw_params_raw.win.width;
+               else
+                       len = ccdc_hw_params_raw.win.width * 2;
+       } else
+               len = ccdc_hw_params_ycbcr.win.width * 2;
+       return ALIGN(len, 32);
+}
+
+static int ccdc_set_frame_format(enum ccdc_frmfmt frm_fmt)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               ccdc_hw_params_raw.frm_fmt = frm_fmt;
+       else
+               ccdc_hw_params_ycbcr.frm_fmt = frm_fmt;
+       return 0;
+}
+
+static enum ccdc_frmfmt ccdc_get_frame_format(void)
+{
+       if (ccdc_if_type == VPFE_RAW_BAYER)
+               return ccdc_hw_params_raw.frm_fmt;
+       else
+               return ccdc_hw_params_ycbcr.frm_fmt;
+}
+
+static int ccdc_getfid(void)
+{
+       return (regr(CCDC_SYN_MODE) >> 15) & 1;
+}
+
+/* misc operations */
+static inline void ccdc_setfbaddr(unsigned long addr)
+{
+       regw(addr & 0xffffffe0, CCDC_SDR_ADDR);
+}
+
+static int ccdc_set_hw_if_params(struct vpfe_hw_if_param *params)
+{
+       ccdc_if_type = params->if_type;
+
+       switch (params->if_type) {
+       case VPFE_BT656:
+       case VPFE_YCBCR_SYNC_16:
+       case VPFE_YCBCR_SYNC_8:
+               ccdc_hw_params_ycbcr.vd_pol = params->vdpol;
+               ccdc_hw_params_ycbcr.hd_pol = params->hdpol;
+               break;
+       default:
+               /* TODO add support for raw bayer here */
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static struct ccdc_hw_device ccdc_hw_dev = {
+       .name = "DM6446 CCDC",
+       .owner = THIS_MODULE,
+       .hw_ops = {
+               .open = ccdc_open,
+               .close = ccdc_close,
+               .set_ccdc_base = ccdc_set_ccdc_base,
+               .reset = ccdc_sbl_reset,
+               .enable = ccdc_enable,
+               .set_hw_if_params = ccdc_set_hw_if_params,
+               .set_params = ccdc_set_params,
+               .configure = ccdc_configure,
+               .set_buftype = ccdc_set_buftype,
+               .get_buftype = ccdc_get_buftype,
+               .enum_pix = ccdc_enum_pix,
+               .set_pixel_format = ccdc_set_pixel_format,
+               .get_pixel_format = ccdc_get_pixel_format,
+               .set_frame_format = ccdc_set_frame_format,
+               .get_frame_format = ccdc_get_frame_format,
+               .set_image_window = ccdc_set_image_window,
+               .get_image_window = ccdc_get_image_window,
+               .get_line_length = ccdc_get_line_length,
+               .setfbaddr = ccdc_setfbaddr,
+               .getfid = ccdc_getfid,
+       },
+};
+
+static int dm644x_ccdc_init(void)
+{
+       printk(KERN_NOTICE "dm644x_ccdc_init\n");
+       if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
+               return -1;
+       printk(KERN_NOTICE "%s is registered with vpfe.\n",
+               ccdc_hw_dev.name);
+       return 0;
+}
+
+static void dm644x_ccdc_exit(void)
+{
+       vpfe_unregister_ccdc_device(&ccdc_hw_dev);
+}
+
+module_init(dm644x_ccdc_init);
+module_exit(dm644x_ccdc_exit);
diff --git a/drivers/media/video/davinci/dm644x_ccdc_regs.h b/drivers/media/video/davinci/dm644x_ccdc_regs.h
new file mode 100644 (file)
index 0000000..6e5d053
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2006-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _DM644X_CCDC_REGS_H
+#define _DM644X_CCDC_REGS_H
+
+/**************************************************************************\
+* Register OFFSET Definitions
+\**************************************************************************/
+#define CCDC_PID                               0x0
+#define CCDC_PCR                               0x4
+#define CCDC_SYN_MODE                          0x8
+#define CCDC_HD_VD_WID                         0xc
+#define CCDC_PIX_LINES                         0x10
+#define CCDC_HORZ_INFO                         0x14
+#define CCDC_VERT_START                                0x18
+#define CCDC_VERT_LINES                                0x1c
+#define CCDC_CULLING                           0x20
+#define CCDC_HSIZE_OFF                         0x24
+#define CCDC_SDOFST                            0x28
+#define CCDC_SDR_ADDR                          0x2c
+#define CCDC_CLAMP                             0x30
+#define CCDC_DCSUB                             0x34
+#define CCDC_COLPTN                            0x38
+#define CCDC_BLKCMP                            0x3c
+#define CCDC_FPC                               0x40
+#define CCDC_FPC_ADDR                          0x44
+#define CCDC_VDINT                             0x48
+#define CCDC_ALAW                              0x4c
+#define CCDC_REC656IF                          0x50
+#define CCDC_CCDCFG                            0x54
+#define CCDC_FMTCFG                            0x58
+#define CCDC_FMT_HORZ                          0x5c
+#define CCDC_FMT_VERT                          0x60
+#define CCDC_FMT_ADDR0                         0x64
+#define CCDC_FMT_ADDR1                         0x68
+#define CCDC_FMT_ADDR2                         0x6c
+#define CCDC_FMT_ADDR3                         0x70
+#define CCDC_FMT_ADDR4                         0x74
+#define CCDC_FMT_ADDR5                         0x78
+#define CCDC_FMT_ADDR6                         0x7c
+#define CCDC_FMT_ADDR7                         0x80
+#define CCDC_PRGEVEN_0                         0x84
+#define CCDC_PRGEVEN_1                         0x88
+#define CCDC_PRGODD_0                          0x8c
+#define CCDC_PRGODD_1                          0x90
+#define CCDC_VP_OUT                            0x94
+
+
+/***************************************************************
+*      Define for various register bit mask and shifts for CCDC
+****************************************************************/
+#define CCDC_FID_POL_MASK                      1
+#define CCDC_FID_POL_SHIFT                     4
+#define CCDC_HD_POL_MASK                       1
+#define CCDC_HD_POL_SHIFT                      3
+#define CCDC_VD_POL_MASK                       1
+#define CCDC_VD_POL_SHIFT                      2
+#define CCDC_HSIZE_OFF_MASK                    0xffffffe0
+#define CCDC_32BYTE_ALIGN_VAL                  31
+#define CCDC_FRM_FMT_MASK                      0x1
+#define CCDC_FRM_FMT_SHIFT                     7
+#define CCDC_DATA_SZ_MASK                      7
+#define CCDC_DATA_SZ_SHIFT                     8
+#define CCDC_PIX_FMT_MASK                      3
+#define CCDC_PIX_FMT_SHIFT                     12
+#define CCDC_VP2SDR_DISABLE                    0xFFFBFFFF
+#define CCDC_WEN_ENABLE                                (1 << 17)
+#define CCDC_SDR2RSZ_DISABLE                   0xFFF7FFFF
+#define CCDC_VDHDEN_ENABLE                     (1 << 16)
+#define CCDC_LPF_ENABLE                                (1 << 14)
+#define CCDC_ALAW_ENABLE                       (1 << 3)
+#define CCDC_ALAW_GAMA_WD_MASK                 7
+#define CCDC_BLK_CLAMP_ENABLE                  (1 << 31)
+#define CCDC_BLK_SGAIN_MASK                    0x1F
+#define CCDC_BLK_ST_PXL_MASK                   0x7FFF
+#define CCDC_BLK_ST_PXL_SHIFT                  10
+#define CCDC_BLK_SAMPLE_LN_MASK                        7
+#define CCDC_BLK_SAMPLE_LN_SHIFT               28
+#define CCDC_BLK_SAMPLE_LINE_MASK              7
+#define CCDC_BLK_SAMPLE_LINE_SHIFT             25
+#define CCDC_BLK_DC_SUB_MASK                   0x03FFF
+#define CCDC_BLK_COMP_MASK                     0xFF
+#define CCDC_BLK_COMP_GB_COMP_SHIFT            8
+#define CCDC_BLK_COMP_GR_COMP_SHIFT            16
+#define CCDC_BLK_COMP_R_COMP_SHIFT             24
+#define CCDC_LATCH_ON_VSYNC_DISABLE            (1 << 15)
+#define CCDC_FPC_ENABLE                                (1 << 15)
+#define CCDC_FPC_DISABLE                       0
+#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
+#define CCDC_DATA_PACK_ENABLE                  (1 << 11)
+#define CCDC_FMTCFG_VPIN_MASK                  7
+#define CCDC_FMTCFG_VPIN_SHIFT                 12
+#define CCDC_FMT_HORZ_FMTLNH_MASK              0x1FFF
+#define CCDC_FMT_HORZ_FMTSPH_MASK              0x1FFF
+#define CCDC_FMT_HORZ_FMTSPH_SHIFT             16
+#define CCDC_FMT_VERT_FMTLNV_MASK              0x1FFF
+#define CCDC_FMT_VERT_FMTSLV_MASK              0x1FFF
+#define CCDC_FMT_VERT_FMTSLV_SHIFT             16
+#define CCDC_VP_OUT_VERT_NUM_MASK              0x3FFF
+#define CCDC_VP_OUT_VERT_NUM_SHIFT             17
+#define CCDC_VP_OUT_HORZ_NUM_MASK              0x1FFF
+#define CCDC_VP_OUT_HORZ_NUM_SHIFT             4
+#define CCDC_VP_OUT_HORZ_ST_MASK               0xF
+#define CCDC_HORZ_INFO_SPH_SHIFT               16
+#define CCDC_VERT_START_SLV0_SHIFT             16
+#define CCDC_VDINT_VDINT0_SHIFT                        16
+#define CCDC_VDINT_VDINT1_MASK                 0xFFFF
+#define CCDC_PPC_RAW                           1
+#define CCDC_DCSUB_DEFAULT_VAL                 0
+#define CCDC_CLAMP_DEFAULT_VAL                 0
+#define CCDC_ENABLE_VIDEO_PORT                 0x8000
+#define CCDC_DISABLE_VIDEO_PORT                        0
+#define CCDC_COLPTN_VAL                                0xBB11BB11
+#define CCDC_TWO_BYTES_PER_PIXEL               2
+#define CCDC_INTERLACED_IMAGE_INVERT           0x4B6D
+#define CCDC_INTERLACED_NO_IMAGE_INVERT                0x0249
+#define CCDC_PROGRESSIVE_IMAGE_INVERT          0x4000
+#define CCDC_PROGRESSIVE_NO_IMAGE_INVERT       0
+#define CCDC_INTERLACED_HEIGHT_SHIFT           1
+#define CCDC_SYN_MODE_INPMOD_SHIFT             12
+#define CCDC_SYN_MODE_INPMOD_MASK              3
+#define CCDC_SYN_MODE_8BITS                    (7 << 8)
+#define CCDC_SYN_FLDMODE_MASK                  1
+#define CCDC_SYN_FLDMODE_SHIFT                 7
+#define CCDC_REC656IF_BT656_EN                 3
+#define CCDC_SYN_MODE_VD_POL_NEGATIVE          (1 << 2)
+#define CCDC_CCDCFG_Y8POS_SHIFT                        11
+#define CCDC_SDOFST_FIELD_INTERLEAVED          0x249
+#define CCDC_NO_CULLING                                0xffff00ff
+#endif
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
new file mode 100644 (file)
index 0000000..402ce43
--- /dev/null
@@ -0,0 +1,2124 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * Driver name : VPFE Capture driver
+ *    VPFE Capture driver allows applications to capture and stream video
+ *    frames on DaVinci SoCs (DM6446, DM355 etc) from a YUV source such as
+ *    TVP5146 or  Raw Bayer RGB image data from an image sensor
+ *    such as Microns' MT9T001, MT9T031 etc.
+ *
+ *    These SoCs have, in common, a Video Processing Subsystem (VPSS) that
+ *    consists of a Video Processing Front End (VPFE) for capturing
+ *    video/raw image data and Video Processing Back End (VPBE) for displaying
+ *    YUV data through an in-built analog encoder or Digital LCD port. This
+ *    driver is for capture through VPFE. A typical EVM using these SoCs have
+ *    following high level configuration.
+ *
+ *
+ *    decoder(TVP5146/         YUV/
+ *          MT9T001)   -->  Raw Bayer RGB ---> MUX -> VPFE (CCDC/ISIF)
+ *                             data input              |      |
+ *                                                     V      |
+ *                                                   SDRAM    |
+ *                                                            V
+ *                                                        Image Processor
+ *                                                            |
+ *                                                            V
+ *                                                          SDRAM
+ *    The data flow happens from a decoder connected to the VPFE over a
+ *    YUV embedded (BT.656/BT.1120) or separate sync or raw bayer rgb interface
+ *    and to the input of VPFE through an optional MUX (if more inputs are
+ *    to be interfaced on the EVM). The input data is first passed through
+ *    CCDC (CCD Controller, a.k.a Image Sensor Interface, ISIF). The CCDC
+ *    does very little or no processing on YUV data and does pre-process Raw
+ *    Bayer RGB data through modules such as Defect Pixel Correction (DFC)
+ *    Color Space Conversion (CSC), data gain/offset etc. After this, data
+ *    can be written to SDRAM or can be connected to the image processing
+ *    block such as IPIPE (on DM355 only).
+ *
+ *    Features supported
+ *             - MMAP IO
+ *             - Capture using TVP5146 over BT.656
+ *             - support for interfacing decoders using sub device model
+ *             - Work with DM355 or DM6446 CCDC to do Raw Bayer RGB/YUV
+ *               data capture to SDRAM.
+ *    TODO list
+ *             - Support multiple REQBUF after open
+ *             - Support for de-allocating buffers through REQBUF
+ *             - Support for Raw Bayer RGB capture
+ *             - Support for chaining Image Processor
+ *             - Support for static allocation of buffers
+ *             - Support for USERPTR IO
+ *             - Support for STREAMON before QBUF
+ *             - Support for control ioctls
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/version.h>
+#include <media/v4l2-common.h>
+#include <linux/io.h>
+#include <media/davinci/vpfe_capture.h>
+#include "ccdc_hw_device.h"
+
+static int debug;
+static u32 numbuffers = 3;
+static u32 bufsize = (720 * 576 * 2);
+
+module_param(numbuffers, uint, S_IRUGO);
+module_param(bufsize, uint, S_IRUGO);
+module_param(debug, int, 0644);
+
+MODULE_PARM_DESC(numbuffers, "buffer count (default:3)");
+MODULE_PARM_DESC(bufsize, "buffer size in bytes (default:720 x 576 x 2)");
+MODULE_PARM_DESC(debug, "Debug level 0-1");
+
+MODULE_DESCRIPTION("VPFE Video for Linux Capture Driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Texas Instruments");
+
+/* standard information */
+struct vpfe_standard {
+       v4l2_std_id std_id;
+       unsigned int width;
+       unsigned int height;
+       struct v4l2_fract pixelaspect;
+       /* 0 - progressive, 1 - interlaced */
+       int frame_format;
+};
+
+/* ccdc configuration */
+struct ccdc_config {
+       /* This make sure vpfe is probed and ready to go */
+       int vpfe_probed;
+       /* name of ccdc device */
+       char name[32];
+       /* for storing mem maps for CCDC */
+       int ccdc_addr_size;
+       void *__iomem ccdc_addr;
+};
+
+/* data structures */
+static struct vpfe_config_params config_params = {
+       .min_numbuffers = 3,
+       .numbuffers = 3,
+       .min_bufsize = 720 * 480 * 2,
+       .device_bufsize = 720 * 576 * 2,
+};
+
+/* ccdc device registered */
+static struct ccdc_hw_device *ccdc_dev;
+/* lock for accessing ccdc information */
+static DEFINE_MUTEX(ccdc_lock);
+/* ccdc configuration */
+static struct ccdc_config *ccdc_cfg;
+
+const struct vpfe_standard vpfe_standards[] = {
+       {V4L2_STD_525_60, 720, 480, {11, 10}, 1},
+       {V4L2_STD_625_50, 720, 576, {54, 59}, 1},
+};
+
+/* Used when raw Bayer image from ccdc is directly captured to SDRAM */
+static const struct vpfe_pixel_format vpfe_pix_fmts[] = {
+       {
+               .fmtdesc = {
+                       .index = 0,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "Bayer GrRBGb 8bit A-Law compr.",
+                       .pixelformat = V4L2_PIX_FMT_SBGGR8,
+               },
+               .bpp = 1,
+       },
+       {
+               .fmtdesc = {
+                       .index = 1,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "Bayer GrRBGb - 16bit",
+                       .pixelformat = V4L2_PIX_FMT_SBGGR16,
+               },
+               .bpp = 2,
+       },
+       {
+               .fmtdesc = {
+                       .index = 2,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "Bayer GrRBGb 8bit DPCM compr.",
+                       .pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,
+               },
+               .bpp = 1,
+       },
+       {
+               .fmtdesc = {
+                       .index = 3,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "YCbCr 4:2:2 Interleaved UYVY",
+                       .pixelformat = V4L2_PIX_FMT_UYVY,
+               },
+               .bpp = 2,
+       },
+       {
+               .fmtdesc = {
+                       .index = 4,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "YCbCr 4:2:2 Interleaved YUYV",
+                       .pixelformat = V4L2_PIX_FMT_YUYV,
+               },
+               .bpp = 2,
+       },
+       {
+               .fmtdesc = {
+                       .index = 5,
+                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                       .description = "Y/CbCr 4:2:0 - Semi planar",
+                       .pixelformat = V4L2_PIX_FMT_NV12,
+               },
+               .bpp = 1,
+       },
+};
+
+/*
+ * vpfe_lookup_pix_format()
+ * lookup an entry in the vpfe pix format table based on pix_format
+ */
+static const struct vpfe_pixel_format *vpfe_lookup_pix_format(u32 pix_format)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(vpfe_pix_fmts); i++) {
+               if (pix_format == vpfe_pix_fmts[i].fmtdesc.pixelformat)
+                       return &vpfe_pix_fmts[i];
+       }
+       return NULL;
+}
+
+/*
+ * vpfe_register_ccdc_device. CCDC module calls this to
+ * register with vpfe capture
+ */
+int vpfe_register_ccdc_device(struct ccdc_hw_device *dev)
+{
+       int ret = 0;
+       printk(KERN_NOTICE "vpfe_register_ccdc_device: %s\n", dev->name);
+
+       BUG_ON(!dev->hw_ops.open);
+       BUG_ON(!dev->hw_ops.enable);
+       BUG_ON(!dev->hw_ops.set_hw_if_params);
+       BUG_ON(!dev->hw_ops.configure);
+       BUG_ON(!dev->hw_ops.set_buftype);
+       BUG_ON(!dev->hw_ops.get_buftype);
+       BUG_ON(!dev->hw_ops.enum_pix);
+       BUG_ON(!dev->hw_ops.set_frame_format);
+       BUG_ON(!dev->hw_ops.get_frame_format);
+       BUG_ON(!dev->hw_ops.get_pixel_format);
+       BUG_ON(!dev->hw_ops.set_pixel_format);
+       BUG_ON(!dev->hw_ops.set_params);
+       BUG_ON(!dev->hw_ops.set_image_window);
+       BUG_ON(!dev->hw_ops.get_image_window);
+       BUG_ON(!dev->hw_ops.get_line_length);
+       BUG_ON(!dev->hw_ops.setfbaddr);
+       BUG_ON(!dev->hw_ops.getfid);
+
+       mutex_lock(&ccdc_lock);
+       if (NULL == ccdc_cfg) {
+               /*
+                * TODO. Will this ever happen? if so, we need to fix it.
+                * Proabably we need to add the request to a linked list and
+                * walk through it during vpfe probe
+                */
+               printk(KERN_ERR "vpfe capture not initialized\n");
+               ret = -1;
+               goto unlock;
+       }
+
+       if (strcmp(dev->name, ccdc_cfg->name)) {
+               /* ignore this ccdc */
+               ret = -1;
+               goto unlock;
+       }
+
+       if (ccdc_dev) {
+               printk(KERN_ERR "ccdc already registered\n");
+               ret = -1;
+               goto unlock;
+       }
+
+       ccdc_dev = dev;
+       dev->hw_ops.set_ccdc_base(ccdc_cfg->ccdc_addr,
+                                 ccdc_cfg->ccdc_addr_size);
+unlock:
+       mutex_unlock(&ccdc_lock);
+       return ret;
+}
+EXPORT_SYMBOL(vpfe_register_ccdc_device);
+
+/*
+ * vpfe_unregister_ccdc_device. CCDC module calls this to
+ * unregister with vpfe capture
+ */
+void vpfe_unregister_ccdc_device(struct ccdc_hw_device *dev)
+{
+       if (NULL == dev) {
+               printk(KERN_ERR "invalid ccdc device ptr\n");
+               return;
+       }
+
+       printk(KERN_NOTICE "vpfe_unregister_ccdc_device, dev->name = %s\n",
+               dev->name);
+
+       if (strcmp(dev->name, ccdc_cfg->name)) {
+               /* ignore this ccdc */
+               return;
+       }
+
+       mutex_lock(&ccdc_lock);
+       ccdc_dev = NULL;
+       mutex_unlock(&ccdc_lock);
+       return;
+}
+EXPORT_SYMBOL(vpfe_unregister_ccdc_device);
+
+/*
+ * vpfe_get_ccdc_image_format - Get image parameters based on CCDC settings
+ */
+static int vpfe_get_ccdc_image_format(struct vpfe_device *vpfe_dev,
+                                struct v4l2_format *f)
+{
+       struct v4l2_rect image_win;
+       enum ccdc_buftype buf_type;
+       enum ccdc_frmfmt frm_fmt;
+
+       memset(f, 0, sizeof(*f));
+       f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+       ccdc_dev->hw_ops.get_image_window(&image_win);
+       f->fmt.pix.width = image_win.width;
+       f->fmt.pix.height = image_win.height;
+       f->fmt.pix.bytesperline = ccdc_dev->hw_ops.get_line_length();
+       f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
+                               f->fmt.pix.height;
+       buf_type = ccdc_dev->hw_ops.get_buftype();
+       f->fmt.pix.pixelformat = ccdc_dev->hw_ops.get_pixel_format();
+       frm_fmt = ccdc_dev->hw_ops.get_frame_format();
+       if (frm_fmt == CCDC_FRMFMT_PROGRESSIVE)
+               f->fmt.pix.field = V4L2_FIELD_NONE;
+       else if (frm_fmt == CCDC_FRMFMT_INTERLACED) {
+               if (buf_type == CCDC_BUFTYPE_FLD_INTERLEAVED)
+                       f->fmt.pix.field = V4L2_FIELD_INTERLACED;
+               else if (buf_type == CCDC_BUFTYPE_FLD_SEPARATED)
+                       f->fmt.pix.field = V4L2_FIELD_SEQ_TB;
+               else {
+                       v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf_type\n");
+                       return -EINVAL;
+               }
+       } else {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid frm_fmt\n");
+               return -EINVAL;
+       }
+       return 0;
+}
+
+/*
+ * vpfe_config_ccdc_image_format()
+ * For a pix format, configure ccdc to setup the capture
+ */
+static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe_dev)
+{
+       enum ccdc_frmfmt frm_fmt = CCDC_FRMFMT_INTERLACED;
+       int ret = 0;
+
+       if (ccdc_dev->hw_ops.set_pixel_format(
+                       vpfe_dev->fmt.fmt.pix.pixelformat) < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "couldn't set pix format in ccdc\n");
+               return -EINVAL;
+       }
+       /* configure the image window */
+       ccdc_dev->hw_ops.set_image_window(&vpfe_dev->crop);
+
+       switch (vpfe_dev->fmt.fmt.pix.field) {
+       case V4L2_FIELD_INTERLACED:
+               /* do nothing, since it is default */
+               ret = ccdc_dev->hw_ops.set_buftype(
+                               CCDC_BUFTYPE_FLD_INTERLEAVED);
+               break;
+       case V4L2_FIELD_NONE:
+               frm_fmt = CCDC_FRMFMT_PROGRESSIVE;
+               /* buffer type only applicable for interlaced scan */
+               break;
+       case V4L2_FIELD_SEQ_TB:
+               ret = ccdc_dev->hw_ops.set_buftype(
+                               CCDC_BUFTYPE_FLD_SEPARATED);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* set the frame format */
+       if (!ret)
+               ret = ccdc_dev->hw_ops.set_frame_format(frm_fmt);
+       return ret;
+}
+/*
+ * vpfe_config_image_format()
+ * For a given standard, this functions sets up the default
+ * pix format & crop values in the vpfe device and ccdc.  It first
+ * starts with defaults based values from the standard table.
+ * It then checks if sub device support g_fmt and then override the
+ * values based on that.Sets crop values to match with scan resolution
+ * starting at 0,0. It calls vpfe_config_ccdc_image_format() set the
+ * values in ccdc
+ */
+static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
+                                   const v4l2_std_id *std_id)
+{
+       struct vpfe_subdev_info *sdinfo = vpfe_dev->current_subdev;
+       int i, ret = 0;
+
+       for (i = 0; i < ARRAY_SIZE(vpfe_standards); i++) {
+               if (vpfe_standards[i].std_id & *std_id) {
+                       vpfe_dev->std_info.active_pixels =
+                                       vpfe_standards[i].width;
+                       vpfe_dev->std_info.active_lines =
+                                       vpfe_standards[i].height;
+                       vpfe_dev->std_info.frame_format =
+                                       vpfe_standards[i].frame_format;
+                       vpfe_dev->std_index = i;
+                       break;
+               }
+       }
+
+       if (i ==  ARRAY_SIZE(vpfe_standards)) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "standard not supported\n");
+               return -EINVAL;
+       }
+
+       vpfe_dev->crop.top = 0;
+       vpfe_dev->crop.left = 0;
+       vpfe_dev->crop.width = vpfe_dev->std_info.active_pixels;
+       vpfe_dev->crop.height = vpfe_dev->std_info.active_lines;
+       vpfe_dev->fmt.fmt.pix.width = vpfe_dev->crop.width;
+       vpfe_dev->fmt.fmt.pix.height = vpfe_dev->crop.height;
+
+       /* first field and frame format based on standard frame format */
+       if (vpfe_dev->std_info.frame_format) {
+               vpfe_dev->fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
+               /* assume V4L2_PIX_FMT_UYVY as default */
+               vpfe_dev->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_UYVY;
+       } else {
+               vpfe_dev->fmt.fmt.pix.field = V4L2_FIELD_NONE;
+               /* assume V4L2_PIX_FMT_SBGGR8 */
+               vpfe_dev->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
+       }
+
+       /* if sub device supports g_fmt, override the defaults */
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev,
+                       sdinfo->grp_id, video, g_fmt, &vpfe_dev->fmt);
+
+       if (ret && ret != -ENOIOCTLCMD) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "error in getting g_fmt from sub device\n");
+               return ret;
+       }
+
+       /* Sets the values in CCDC */
+       ret = vpfe_config_ccdc_image_format(vpfe_dev);
+       if (ret)
+               return ret;
+
+       /* Update the values of sizeimage and bytesperline */
+       if (!ret) {
+               vpfe_dev->fmt.fmt.pix.bytesperline =
+                       ccdc_dev->hw_ops.get_line_length();
+               vpfe_dev->fmt.fmt.pix.sizeimage =
+                       vpfe_dev->fmt.fmt.pix.bytesperline *
+                       vpfe_dev->fmt.fmt.pix.height;
+       }
+       return ret;
+}
+
+static int vpfe_initialize_device(struct vpfe_device *vpfe_dev)
+{
+       int ret = 0;
+
+       /* set first input of current subdevice as the current input */
+       vpfe_dev->current_input = 0;
+
+       /* set default standard */
+       vpfe_dev->std_index = 0;
+
+       /* Configure the default format information */
+       ret = vpfe_config_image_format(vpfe_dev,
+                               &vpfe_standards[vpfe_dev->std_index].std_id);
+       if (ret)
+               return ret;
+
+       /* now open the ccdc device to initialize it */
+       mutex_lock(&ccdc_lock);
+       if (NULL == ccdc_dev) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "ccdc device not registered\n");
+               ret = -ENODEV;
+               goto unlock;
+       }
+
+       if (!try_module_get(ccdc_dev->owner)) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Couldn't lock ccdc module\n");
+               ret = -ENODEV;
+               goto unlock;
+       }
+       ret = ccdc_dev->hw_ops.open(vpfe_dev->pdev);
+       if (!ret)
+               vpfe_dev->initialized = 1;
+unlock:
+       mutex_unlock(&ccdc_lock);
+       return ret;
+}
+
+/*
+ * vpfe_open : It creates object of file handle structure and
+ * stores it in private_data  member of filepointer
+ */
+static int vpfe_open(struct file *file)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_open\n");
+
+       if (!vpfe_dev->cfg->num_subdevs) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "No decoder registered\n");
+               return -ENODEV;
+       }
+
+       /* Allocate memory for the file handle object */
+       fh = kmalloc(sizeof(struct vpfe_fh), GFP_KERNEL);
+       if (NULL == fh) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "unable to allocate memory for file handle object\n");
+               return -ENOMEM;
+       }
+       /* store pointer to fh in private_data member of file */
+       file->private_data = fh;
+       fh->vpfe_dev = vpfe_dev;
+       mutex_lock(&vpfe_dev->lock);
+       /* If decoder is not initialized. initialize it */
+       if (!vpfe_dev->initialized) {
+               if (vpfe_initialize_device(vpfe_dev)) {
+                       mutex_unlock(&vpfe_dev->lock);
+                       return -ENODEV;
+               }
+       }
+       /* Increment device usrs counter */
+       vpfe_dev->usrs++;
+       /* Set io_allowed member to false */
+       fh->io_allowed = 0;
+       /* Initialize priority of this instance to default priority */
+       fh->prio = V4L2_PRIORITY_UNSET;
+       v4l2_prio_open(&vpfe_dev->prio, &fh->prio);
+       mutex_unlock(&vpfe_dev->lock);
+       return 0;
+}
+
+static void vpfe_schedule_next_buffer(struct vpfe_device *vpfe_dev)
+{
+       unsigned long addr;
+
+       vpfe_dev->next_frm = list_entry(vpfe_dev->dma_queue.next,
+                                       struct videobuf_buffer, queue);
+       list_del(&vpfe_dev->next_frm->queue);
+       vpfe_dev->next_frm->state = VIDEOBUF_ACTIVE;
+       addr = videobuf_to_dma_contig(vpfe_dev->next_frm);
+       ccdc_dev->hw_ops.setfbaddr(addr);
+}
+
+static void vpfe_process_buffer_complete(struct vpfe_device *vpfe_dev)
+{
+       struct timeval timevalue;
+
+       do_gettimeofday(&timevalue);
+       vpfe_dev->cur_frm->ts = timevalue;
+       vpfe_dev->cur_frm->state = VIDEOBUF_DONE;
+       vpfe_dev->cur_frm->size = vpfe_dev->fmt.fmt.pix.sizeimage;
+       wake_up_interruptible(&vpfe_dev->cur_frm->done);
+       vpfe_dev->cur_frm = vpfe_dev->next_frm;
+}
+
+/* ISR for VINT0*/
+static irqreturn_t vpfe_isr(int irq, void *dev_id)
+{
+       struct vpfe_device *vpfe_dev = dev_id;
+       enum v4l2_field field;
+       unsigned long addr;
+       int fid;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "\nStarting vpfe_isr...\n");
+       field = vpfe_dev->fmt.fmt.pix.field;
+
+       /* if streaming not started, don't do anything */
+       if (!vpfe_dev->started)
+               return IRQ_HANDLED;
+
+       /* only for 6446 this will be applicable */
+       if (NULL != ccdc_dev->hw_ops.reset)
+               ccdc_dev->hw_ops.reset();
+
+       if (field == V4L2_FIELD_NONE) {
+               /* handle progressive frame capture */
+               v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
+                       "frame format is progressive...\n");
+               if (vpfe_dev->cur_frm != vpfe_dev->next_frm)
+                       vpfe_process_buffer_complete(vpfe_dev);
+               return IRQ_HANDLED;
+       }
+
+       /* interlaced or TB capture check which field we are in hardware */
+       fid = ccdc_dev->hw_ops.getfid();
+
+       /* switch the software maintained field id */
+       vpfe_dev->field_id ^= 1;
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "field id = %x:%x.\n",
+               fid, vpfe_dev->field_id);
+       if (fid == vpfe_dev->field_id) {
+               /* we are in-sync here,continue */
+               if (fid == 0) {
+                       /*
+                        * One frame is just being captured. If the next frame
+                        * is available, release the current frame and move on
+                        */
+                       if (vpfe_dev->cur_frm != vpfe_dev->next_frm)
+                               vpfe_process_buffer_complete(vpfe_dev);
+                       /*
+                        * based on whether the two fields are stored
+                        * interleavely or separately in memory, reconfigure
+                        * the CCDC memory address
+                        */
+                       if (field == V4L2_FIELD_SEQ_TB) {
+                               addr =
+                                 videobuf_to_dma_contig(vpfe_dev->cur_frm);
+                               addr += vpfe_dev->field_off;
+                               ccdc_dev->hw_ops.setfbaddr(addr);
+                       }
+                       return IRQ_HANDLED;
+               }
+               /*
+                * if one field is just being captured configure
+                * the next frame get the next frame from the empty
+                * queue if no frame is available hold on to the
+                * current buffer
+                */
+               spin_lock(&vpfe_dev->dma_queue_lock);
+               if (!list_empty(&vpfe_dev->dma_queue) &&
+                   vpfe_dev->cur_frm == vpfe_dev->next_frm)
+                       vpfe_schedule_next_buffer(vpfe_dev);
+               spin_unlock(&vpfe_dev->dma_queue_lock);
+       } else if (fid == 0) {
+               /*
+                * out of sync. Recover from any hardware out-of-sync.
+                * May loose one frame
+                */
+               vpfe_dev->field_id = fid;
+       }
+       return IRQ_HANDLED;
+}
+
+/* vdint1_isr - isr handler for VINT1 interrupt */
+static irqreturn_t vdint1_isr(int irq, void *dev_id)
+{
+       struct vpfe_device *vpfe_dev = dev_id;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "\nInside vdint1_isr...\n");
+
+       /* if streaming not started, don't do anything */
+       if (!vpfe_dev->started)
+               return IRQ_HANDLED;
+
+       spin_lock(&vpfe_dev->dma_queue_lock);
+       if ((vpfe_dev->fmt.fmt.pix.field == V4L2_FIELD_NONE) &&
+           !list_empty(&vpfe_dev->dma_queue) &&
+           vpfe_dev->cur_frm == vpfe_dev->next_frm)
+               vpfe_schedule_next_buffer(vpfe_dev);
+       spin_unlock(&vpfe_dev->dma_queue_lock);
+       return IRQ_HANDLED;
+}
+
+static void vpfe_detach_irq(struct vpfe_device *vpfe_dev)
+{
+       enum ccdc_frmfmt frame_format;
+
+       frame_format = ccdc_dev->hw_ops.get_frame_format();
+       if (frame_format == CCDC_FRMFMT_PROGRESSIVE)
+               free_irq(IRQ_VDINT1, vpfe_dev);
+}
+
+static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)
+{
+       enum ccdc_frmfmt frame_format;
+
+       frame_format = ccdc_dev->hw_ops.get_frame_format();
+       if (frame_format == CCDC_FRMFMT_PROGRESSIVE) {
+               return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr,
+                                   IRQF_DISABLED, "vpfe_capture1",
+                                   vpfe_dev);
+       }
+       return 0;
+}
+
+/* vpfe_stop_ccdc_capture: stop streaming in ccdc/isif */
+static void vpfe_stop_ccdc_capture(struct vpfe_device *vpfe_dev)
+{
+       vpfe_dev->started = 0;
+       ccdc_dev->hw_ops.enable(0);
+       if (ccdc_dev->hw_ops.enable_out_to_sdram)
+               ccdc_dev->hw_ops.enable_out_to_sdram(0);
+}
+
+/*
+ * vpfe_release : This function deletes buffer queue, frees the
+ * buffers and the vpfe file  handle
+ */
+static int vpfe_release(struct file *file)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh = file->private_data;
+       struct vpfe_subdev_info *sdinfo;
+       int ret;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_release\n");
+
+       /* Get the device lock */
+       mutex_lock(&vpfe_dev->lock);
+       /* if this instance is doing IO */
+       if (fh->io_allowed) {
+               if (vpfe_dev->started) {
+                       sdinfo = vpfe_dev->current_subdev;
+                       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev,
+                                                        sdinfo->grp_id,
+                                                        video, s_stream, 0);
+                       if (ret && (ret != -ENOIOCTLCMD))
+                               v4l2_err(&vpfe_dev->v4l2_dev,
+                               "stream off failed in subdev\n");
+                       vpfe_stop_ccdc_capture(vpfe_dev);
+                       vpfe_detach_irq(vpfe_dev);
+                       videobuf_streamoff(&vpfe_dev->buffer_queue);
+               }
+               vpfe_dev->io_usrs = 0;
+               vpfe_dev->numbuffers = config_params.numbuffers;
+       }
+
+       /* Decrement device usrs counter */
+       vpfe_dev->usrs--;
+       /* Close the priority */
+       v4l2_prio_close(&vpfe_dev->prio, &fh->prio);
+       /* If this is the last file handle */
+       if (!vpfe_dev->usrs) {
+               vpfe_dev->initialized = 0;
+               if (ccdc_dev->hw_ops.close)
+                       ccdc_dev->hw_ops.close(vpfe_dev->pdev);
+               module_put(ccdc_dev->owner);
+       }
+       mutex_unlock(&vpfe_dev->lock);
+       file->private_data = NULL;
+       /* Free memory allocated to file handle object */
+       kfree(fh);
+       return 0;
+}
+
+/*
+ * vpfe_mmap : It is used to map kernel space buffers
+ * into user spaces
+ */
+static int vpfe_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       /* Get the device object and file handle object */
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_mmap\n");
+
+       return videobuf_mmap_mapper(&vpfe_dev->buffer_queue, vma);
+}
+
+/*
+ * vpfe_poll: It is used for select/poll system call
+ */
+static unsigned int vpfe_poll(struct file *file, poll_table *wait)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_poll\n");
+
+       if (vpfe_dev->started)
+               return videobuf_poll_stream(file,
+                                           &vpfe_dev->buffer_queue, wait);
+       return 0;
+}
+
+/* vpfe capture driver file operations */
+static const struct v4l2_file_operations vpfe_fops = {
+       .owner = THIS_MODULE,
+       .open = vpfe_open,
+       .release = vpfe_release,
+       .unlocked_ioctl = video_ioctl2,
+       .mmap = vpfe_mmap,
+       .poll = vpfe_poll
+};
+
+/*
+ * vpfe_check_format()
+ * This function adjust the input pixel format as per hardware
+ * capabilities and update the same in pixfmt.
+ * Following algorithm used :-
+ *
+ *     If given pixformat is not in the vpfe list of pix formats or not
+ *     supported by the hardware, current value of pixformat in the device
+ *     is used
+ *     If given field is not supported, then current field is used. If field
+ *     is different from current, then it is matched with that from sub device.
+ *     Minimum height is 2 lines for interlaced or tb field and 1 line for
+ *     progressive. Maximum height is clamped to active active lines of scan
+ *     Minimum width is 32 bytes in memory and width is clamped to active
+ *     pixels of scan.
+ *     bytesperline is a multiple of 32.
+ */
+static const struct vpfe_pixel_format *
+       vpfe_check_format(struct vpfe_device *vpfe_dev,
+                         struct v4l2_pix_format *pixfmt)
+{
+       u32 min_height = 1, min_width = 32, max_width, max_height;
+       const struct vpfe_pixel_format *vpfe_pix_fmt;
+       u32 pix;
+       int temp, found;
+
+       vpfe_pix_fmt = vpfe_lookup_pix_format(pixfmt->pixelformat);
+       if (NULL == vpfe_pix_fmt) {
+               /*
+                * use current pixel format in the vpfe device. We
+                * will find this pix format in the table
+                */
+               pixfmt->pixelformat = vpfe_dev->fmt.fmt.pix.pixelformat;
+               vpfe_pix_fmt = vpfe_lookup_pix_format(pixfmt->pixelformat);
+       }
+
+       /* check if hw supports it */
+       temp = 0;
+       found = 0;
+       while (ccdc_dev->hw_ops.enum_pix(&pix, temp) >= 0) {
+               if (vpfe_pix_fmt->fmtdesc.pixelformat == pix) {
+                       found = 1;
+                       break;
+               }
+               temp++;
+       }
+
+       if (!found) {
+               /* use current pixel format */
+               pixfmt->pixelformat = vpfe_dev->fmt.fmt.pix.pixelformat;
+               /*
+                * Since this is currently used in the vpfe device, we
+                * will find this pix format in the table
+                */
+               vpfe_pix_fmt = vpfe_lookup_pix_format(pixfmt->pixelformat);
+       }
+
+       /* check what field format is supported */
+       if (pixfmt->field == V4L2_FIELD_ANY) {
+               /* if field is any, use current value as default */
+               pixfmt->field = vpfe_dev->fmt.fmt.pix.field;
+       }
+
+       /*
+        * if field is not same as current field in the vpfe device
+        * try matching the field with the sub device field
+        */
+       if (vpfe_dev->fmt.fmt.pix.field != pixfmt->field) {
+               /*
+                * If field value is not in the supported fields, use current
+                * field used in the device as default
+                */
+               switch (pixfmt->field) {
+               case V4L2_FIELD_INTERLACED:
+               case V4L2_FIELD_SEQ_TB:
+                       /* if sub device is supporting progressive, use that */
+                       if (!vpfe_dev->std_info.frame_format)
+                               pixfmt->field = V4L2_FIELD_NONE;
+                       break;
+               case V4L2_FIELD_NONE:
+                       if (vpfe_dev->std_info.frame_format)
+                               pixfmt->field = V4L2_FIELD_INTERLACED;
+                       break;
+
+               default:
+                       /* use current field as default */
+                       pixfmt->field = vpfe_dev->fmt.fmt.pix.field;
+                       break;
+               }
+       }
+
+       /* Now adjust image resolutions supported */
+       if (pixfmt->field == V4L2_FIELD_INTERLACED ||
+           pixfmt->field == V4L2_FIELD_SEQ_TB)
+               min_height = 2;
+
+       max_width = vpfe_dev->std_info.active_pixels;
+       max_height = vpfe_dev->std_info.active_lines;
+       min_width /= vpfe_pix_fmt->bpp;
+
+       v4l2_info(&vpfe_dev->v4l2_dev, "width = %d, height = %d, bpp = %d\n",
+                 pixfmt->width, pixfmt->height, vpfe_pix_fmt->bpp);
+
+       pixfmt->width = clamp((pixfmt->width), min_width, max_width);
+       pixfmt->height = clamp((pixfmt->height), min_height, max_height);
+
+       /* If interlaced, adjust height to be a multiple of 2 */
+       if (pixfmt->field == V4L2_FIELD_INTERLACED)
+               pixfmt->height &= (~1);
+       /*
+        * recalculate bytesperline and sizeimage since width
+        * and height might have changed
+        */
+       pixfmt->bytesperline = (((pixfmt->width * vpfe_pix_fmt->bpp) + 31)
+                               & ~31);
+       if (pixfmt->pixelformat == V4L2_PIX_FMT_NV12)
+               pixfmt->sizeimage =
+                       pixfmt->bytesperline * pixfmt->height +
+                       ((pixfmt->bytesperline * pixfmt->height) >> 1);
+       else
+               pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;
+
+       v4l2_info(&vpfe_dev->v4l2_dev, "adjusted width = %d, height ="
+                " %d, bpp = %d, bytesperline = %d, sizeimage = %d\n",
+                pixfmt->width, pixfmt->height, vpfe_pix_fmt->bpp,
+                pixfmt->bytesperline, pixfmt->sizeimage);
+       return vpfe_pix_fmt;
+}
+
+static int vpfe_querycap(struct file *file, void  *priv,
+                              struct v4l2_capability *cap)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querycap\n");
+
+       cap->version = VPFE_CAPTURE_VERSION_CODE;
+       cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+       strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver));
+       strlcpy(cap->bus_info, "VPFE", sizeof(cap->bus_info));
+       strlcpy(cap->card, vpfe_dev->cfg->card_name, sizeof(cap->card));
+       return 0;
+}
+
+static int vpfe_g_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_g_fmt_vid_cap\n");
+       /* Fill in the information about format */
+       *fmt = vpfe_dev->fmt;
+       return ret;
+}
+
+static int vpfe_enum_fmt_vid_cap(struct file *file, void  *priv,
+                                  struct v4l2_fmtdesc *fmt)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       const struct vpfe_pixel_format *pix_fmt;
+       int temp_index;
+       u32 pix;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_enum_fmt_vid_cap\n");
+
+       if (ccdc_dev->hw_ops.enum_pix(&pix, fmt->index) < 0)
+               return -EINVAL;
+
+       /* Fill in the information about format */
+       pix_fmt = vpfe_lookup_pix_format(pix);
+       if (NULL != pix_fmt) {
+               temp_index = fmt->index;
+               *fmt = pix_fmt->fmtdesc;
+               fmt->index = temp_index;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+static int vpfe_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       const struct vpfe_pixel_format *pix_fmts;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_fmt_vid_cap\n");
+
+       /* If streaming is started, return error */
+       if (vpfe_dev->started) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Streaming is started\n");
+               return -EBUSY;
+       }
+
+       /* Check for valid frame format */
+       pix_fmts = vpfe_check_format(vpfe_dev, &fmt->fmt.pix);
+
+       if (NULL == pix_fmts)
+               return -EINVAL;
+
+       /* store the pixel format in the device  object */
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       /* First detach any IRQ if currently attached */
+       vpfe_detach_irq(vpfe_dev);
+       vpfe_dev->fmt = *fmt;
+       /* set image capture parameters in the ccdc */
+       ret = vpfe_config_ccdc_image_format(vpfe_dev);
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_try_fmt_vid_cap(struct file *file, void *priv,
+                                 struct v4l2_format *f)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       const struct vpfe_pixel_format *pix_fmts;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_try_fmt_vid_cap\n");
+
+       pix_fmts = vpfe_check_format(vpfe_dev, &f->fmt.pix);
+       if (NULL == pix_fmts)
+               return -EINVAL;
+       return 0;
+}
+
+/*
+ * vpfe_get_subdev_input_index - Get subdev index and subdev input index for a
+ * given app input index
+ */
+static int vpfe_get_subdev_input_index(struct vpfe_device *vpfe_dev,
+                                       int *subdev_index,
+                                       int *subdev_input_index,
+                                       int app_input_index)
+{
+       struct vpfe_config *cfg = vpfe_dev->cfg;
+       struct vpfe_subdev_info *sdinfo;
+       int i, j = 0;
+
+       for (i = 0; i < cfg->num_subdevs; i++) {
+               sdinfo = &cfg->sub_devs[i];
+               if (app_input_index < (j + sdinfo->num_inputs)) {
+                       *subdev_index = i;
+                       *subdev_input_index = app_input_index - j;
+                       return 0;
+               }
+               j += sdinfo->num_inputs;
+       }
+       return -EINVAL;
+}
+
+/*
+ * vpfe_get_app_input - Get app input index for a given subdev input index
+ * driver stores the input index of the current sub device and translate it
+ * when application request the current input
+ */
+static int vpfe_get_app_input_index(struct vpfe_device *vpfe_dev,
+                                   int *app_input_index)
+{
+       struct vpfe_config *cfg = vpfe_dev->cfg;
+       struct vpfe_subdev_info *sdinfo;
+       int i, j = 0;
+
+       for (i = 0; i < cfg->num_subdevs; i++) {
+               sdinfo = &cfg->sub_devs[i];
+               if (!strcmp(sdinfo->name, vpfe_dev->current_subdev->name)) {
+                       if (vpfe_dev->current_input >= sdinfo->num_inputs)
+                               return -1;
+                       *app_input_index = j + vpfe_dev->current_input;
+                       return 0;
+               }
+               j += sdinfo->num_inputs;
+       }
+       return -EINVAL;
+}
+
+static int vpfe_enum_input(struct file *file, void *priv,
+                                struct v4l2_input *inp)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_subdev_info *sdinfo;
+       int subdev, index ;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_enum_input\n");
+
+       if (vpfe_get_subdev_input_index(vpfe_dev,
+                                       &subdev,
+                                       &index,
+                                       inp->index) < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "input information not found"
+                        " for the subdev\n");
+               return -EINVAL;
+       }
+       sdinfo = &vpfe_dev->cfg->sub_devs[subdev];
+       memcpy(inp, &sdinfo->inputs[index], sizeof(struct v4l2_input));
+       return 0;
+}
+
+static int vpfe_g_input(struct file *file, void *priv, unsigned int *index)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_g_input\n");
+
+       return vpfe_get_app_input_index(vpfe_dev, index);
+}
+
+
+static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_subdev_info *sdinfo;
+       int subdev_index, inp_index;
+       struct vpfe_route *route;
+       u32 input = 0, output = 0;
+       int ret = -EINVAL;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_input\n");
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       /*
+        * If streaming is started return device busy
+        * error
+        */
+       if (vpfe_dev->started) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Streaming is on\n");
+               ret = -EBUSY;
+               goto unlock_out;
+       }
+
+       if (vpfe_get_subdev_input_index(vpfe_dev,
+                                       &subdev_index,
+                                       &inp_index,
+                                       index) < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n");
+               goto unlock_out;
+       }
+
+       sdinfo = &vpfe_dev->cfg->sub_devs[subdev_index];
+       route = &sdinfo->routes[inp_index];
+       if (route && sdinfo->can_route) {
+               input = route->input;
+               output = route->output;
+       }
+
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                        video, s_routing, input, output, 0);
+
+       if (ret) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "vpfe_doioctl:error in setting input in decoder\n");
+               ret = -EINVAL;
+               goto unlock_out;
+       }
+       vpfe_dev->current_subdev = sdinfo;
+       vpfe_dev->current_input = index;
+       vpfe_dev->std_index = 0;
+
+       /* set the bus/interface parameter for the sub device in ccdc */
+       ret = ccdc_dev->hw_ops.set_hw_if_params(&sdinfo->ccdc_if_params);
+       if (ret)
+               goto unlock_out;
+
+       /* set the default image parameters in the device */
+       ret = vpfe_config_image_format(vpfe_dev,
+                               &vpfe_standards[vpfe_dev->std_index].std_id);
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_querystd(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_subdev_info *sdinfo;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querystd\n");
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       sdinfo = vpfe_dev->current_subdev;
+       if (ret)
+               return ret;
+       /* Call querystd function of decoder device */
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                        video, querystd, std_id);
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_subdev_info *sdinfo;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_std\n");
+
+       /* Call decoder driver function to set the standard */
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       sdinfo = vpfe_dev->current_subdev;
+       /* If streaming is started, return device busy error */
+       if (vpfe_dev->started) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "streaming is started\n");
+               ret = -EBUSY;
+               goto unlock_out;
+       }
+
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                        core, s_std, *std_id);
+       if (ret < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n");
+               goto unlock_out;
+       }
+       ret = vpfe_config_image_format(vpfe_dev, std_id);
+
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_g_std(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_g_std\n");
+
+       *std_id = vpfe_standards[vpfe_dev->std_index].std_id;
+       return 0;
+}
+/*
+ *  Videobuf operations
+ */
+static int vpfe_videobuf_setup(struct videobuf_queue *vq,
+                               unsigned int *count,
+                               unsigned int *size)
+{
+       struct vpfe_fh *fh = vq->priv_data;
+       struct vpfe_device *vpfe_dev = fh->vpfe_dev;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_setup\n");
+       *size = config_params.device_bufsize;
+
+       if (*count < config_params.min_numbuffers)
+               *count = config_params.min_numbuffers;
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
+               "count=%d, size=%d\n", *count, *size);
+       return 0;
+}
+
+static int vpfe_videobuf_prepare(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb,
+                               enum v4l2_field field)
+{
+       struct vpfe_fh *fh = vq->priv_data;
+       struct vpfe_device *vpfe_dev = fh->vpfe_dev;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_prepare\n");
+
+       /* If buffer is not initialized, initialize it */
+       if (VIDEOBUF_NEEDS_INIT == vb->state) {
+               vb->width = vpfe_dev->fmt.fmt.pix.width;
+               vb->height = vpfe_dev->fmt.fmt.pix.height;
+               vb->size = vpfe_dev->fmt.fmt.pix.sizeimage;
+               vb->field = field;
+       }
+       vb->state = VIDEOBUF_PREPARED;
+       return 0;
+}
+
+static void vpfe_videobuf_queue(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb)
+{
+       /* Get the file handle object and device object */
+       struct vpfe_fh *fh = vq->priv_data;
+       struct vpfe_device *vpfe_dev = fh->vpfe_dev;
+       unsigned long flags;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_queue\n");
+
+       /* add the buffer to the DMA queue */
+       spin_lock_irqsave(&vpfe_dev->dma_queue_lock, flags);
+       list_add_tail(&vb->queue, &vpfe_dev->dma_queue);
+       spin_unlock_irqrestore(&vpfe_dev->dma_queue_lock, flags);
+
+       /* Change state of the buffer */
+       vb->state = VIDEOBUF_QUEUED;
+}
+
+static void vpfe_videobuf_release(struct videobuf_queue *vq,
+                                 struct videobuf_buffer *vb)
+{
+       struct vpfe_fh *fh = vq->priv_data;
+       struct vpfe_device *vpfe_dev = fh->vpfe_dev;
+       unsigned long flags;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_videobuf_release\n");
+
+       /*
+        * We need to flush the buffer from the dma queue since
+        * they are de-allocated
+        */
+       spin_lock_irqsave(&vpfe_dev->dma_queue_lock, flags);
+       INIT_LIST_HEAD(&vpfe_dev->dma_queue);
+       spin_unlock_irqrestore(&vpfe_dev->dma_queue_lock, flags);
+       videobuf_dma_contig_free(vq, vb);
+       vb->state = VIDEOBUF_NEEDS_INIT;
+}
+
+static struct videobuf_queue_ops vpfe_videobuf_qops = {
+       .buf_setup      = vpfe_videobuf_setup,
+       .buf_prepare    = vpfe_videobuf_prepare,
+       .buf_queue      = vpfe_videobuf_queue,
+       .buf_release    = vpfe_videobuf_release,
+};
+
+/*
+ * vpfe_reqbufs. currently support REQBUF only once opening
+ * the device.
+ */
+static int vpfe_reqbufs(struct file *file, void *priv,
+                       struct v4l2_requestbuffers *req_buf)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh = file->private_data;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_reqbufs\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != req_buf->type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buffer type\n");
+               return -EINVAL;
+       }
+
+       if (V4L2_MEMORY_USERPTR == req_buf->memory) {
+               /* we don't support user ptr IO */
+               v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_reqbufs:"
+                        " USERPTR IO not supported\n");
+               return  -EINVAL;
+       }
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       if (vpfe_dev->io_usrs != 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Only one IO user allowed\n");
+               ret = -EBUSY;
+               goto unlock_out;
+       }
+
+       vpfe_dev->memory = req_buf->memory;
+       videobuf_queue_dma_contig_init(&vpfe_dev->buffer_queue,
+                               &vpfe_videobuf_qops,
+                               NULL,
+                               &vpfe_dev->irqlock,
+                               req_buf->type,
+                               vpfe_dev->fmt.fmt.pix.field,
+                               sizeof(struct videobuf_buffer),
+                               fh);
+
+       fh->io_allowed = 1;
+       vpfe_dev->io_usrs = 1;
+       INIT_LIST_HEAD(&vpfe_dev->dma_queue);
+       ret = videobuf_reqbufs(&vpfe_dev->buffer_queue, req_buf);
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_querybuf(struct file *file, void *priv,
+                        struct v4l2_buffer *buf)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querybuf\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
+               return  -EINVAL;
+       }
+
+       if (vpfe_dev->memory != V4L2_MEMORY_MMAP) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid memory\n");
+               return -EINVAL;
+       }
+       /* Call videobuf_querybuf to get information */
+       return videobuf_querybuf(&vpfe_dev->buffer_queue, buf);
+}
+
+static int vpfe_qbuf(struct file *file, void *priv,
+                    struct v4l2_buffer *p)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh = file->private_data;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_qbuf\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != p->type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
+               return -EINVAL;
+       }
+
+       /*
+        * If this file handle is not allowed to do IO,
+        * return error
+        */
+       if (!fh->io_allowed) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "fh->io_allowed\n");
+               return -EACCES;
+       }
+       return videobuf_qbuf(&vpfe_dev->buffer_queue, p);
+}
+
+static int vpfe_dqbuf(struct file *file, void *priv,
+                     struct v4l2_buffer *buf)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_dqbuf\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
+               return -EINVAL;
+       }
+       return videobuf_dqbuf(&vpfe_dev->buffer_queue,
+                                     buf, file->f_flags & O_NONBLOCK);
+}
+
+/*
+ * vpfe_calculate_offsets : This function calculates buffers offset
+ * for top and bottom field
+ */
+static void vpfe_calculate_offsets(struct vpfe_device *vpfe_dev)
+{
+       struct v4l2_rect image_win;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_calculate_offsets\n");
+
+       ccdc_dev->hw_ops.get_image_window(&image_win);
+       vpfe_dev->field_off = image_win.height * image_win.width;
+}
+
+/* vpfe_start_ccdc_capture: start streaming in ccdc/isif */
+static void vpfe_start_ccdc_capture(struct vpfe_device *vpfe_dev)
+{
+       ccdc_dev->hw_ops.enable(1);
+       if (ccdc_dev->hw_ops.enable_out_to_sdram)
+               ccdc_dev->hw_ops.enable_out_to_sdram(1);
+       vpfe_dev->started = 1;
+}
+
+/*
+ * vpfe_streamon. Assume the DMA queue is not empty.
+ * application is expected to call QBUF before calling
+ * this ioctl. If not, driver returns error
+ */
+static int vpfe_streamon(struct file *file, void *priv,
+                        enum v4l2_buf_type buf_type)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh = file->private_data;
+       struct vpfe_subdev_info *sdinfo;
+       unsigned long addr;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_streamon\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf_type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
+               return -EINVAL;
+       }
+
+       /* If file handle is not allowed IO, return error */
+       if (!fh->io_allowed) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "fh->io_allowed\n");
+               return -EACCES;
+       }
+
+       sdinfo = vpfe_dev->current_subdev;
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                       video, s_stream, 1);
+
+       if (ret && (ret != -ENOIOCTLCMD)) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "stream on failed in subdev\n");
+               return -EINVAL;
+       }
+
+       /* If buffer queue is empty, return error */
+       if (list_empty(&vpfe_dev->buffer_queue.stream)) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "buffer queue is empty\n");
+               return -EIO;
+       }
+
+       /* Call videobuf_streamon to start streaming * in videobuf */
+       ret = videobuf_streamon(&vpfe_dev->buffer_queue);
+       if (ret)
+               return ret;
+
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               goto streamoff;
+       /* Get the next frame from the buffer queue */
+       vpfe_dev->next_frm = list_entry(vpfe_dev->dma_queue.next,
+                                       struct videobuf_buffer, queue);
+       vpfe_dev->cur_frm = vpfe_dev->next_frm;
+       /* Remove buffer from the buffer queue */
+       list_del(&vpfe_dev->cur_frm->queue);
+       /* Mark state of the current frame to active */
+       vpfe_dev->cur_frm->state = VIDEOBUF_ACTIVE;
+       /* Initialize field_id and started member */
+       vpfe_dev->field_id = 0;
+       addr = videobuf_to_dma_contig(vpfe_dev->cur_frm);
+
+       /* Calculate field offset */
+       vpfe_calculate_offsets(vpfe_dev);
+
+       if (vpfe_attach_irq(vpfe_dev) < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                        "Error in attaching interrupt handle\n");
+               ret = -EFAULT;
+               goto unlock_out;
+       }
+       if (ccdc_dev->hw_ops.configure() < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                        "Error in configuring ccdc\n");
+               ret = -EINVAL;
+               goto unlock_out;
+       }
+       ccdc_dev->hw_ops.setfbaddr((unsigned long)(addr));
+       vpfe_start_ccdc_capture(vpfe_dev);
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+streamoff:
+       ret = videobuf_streamoff(&vpfe_dev->buffer_queue);
+       return ret;
+}
+
+static int vpfe_streamoff(struct file *file, void *priv,
+                         enum v4l2_buf_type buf_type)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       struct vpfe_fh *fh = file->private_data;
+       struct vpfe_subdev_info *sdinfo;
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_streamoff\n");
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf_type) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
+               return -EINVAL;
+       }
+
+       /* If io is allowed for this file handle, return error */
+       if (!fh->io_allowed) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "fh->io_allowed\n");
+               return -EACCES;
+       }
+
+       /* If streaming is not started, return error */
+       if (!vpfe_dev->started) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "device started\n");
+               return -EINVAL;
+       }
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       vpfe_stop_ccdc_capture(vpfe_dev);
+       vpfe_detach_irq(vpfe_dev);
+
+       sdinfo = vpfe_dev->current_subdev;
+       ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                       video, s_stream, 0);
+
+       if (ret && (ret != -ENOIOCTLCMD))
+               v4l2_err(&vpfe_dev->v4l2_dev, "stream off failed in subdev\n");
+       ret = videobuf_streamoff(&vpfe_dev->buffer_queue);
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+static int vpfe_cropcap(struct file *file, void *priv,
+                             struct v4l2_cropcap *crop)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_cropcap\n");
+
+       if (vpfe_dev->std_index > ARRAY_SIZE(vpfe_standards))
+               return -EINVAL;
+
+       memset(crop, 0, sizeof(struct v4l2_cropcap));
+       crop->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       crop->bounds.width = crop->defrect.width =
+               vpfe_standards[vpfe_dev->std_index].width;
+       crop->bounds.height = crop->defrect.height =
+               vpfe_standards[vpfe_dev->std_index].height;
+       crop->pixelaspect = vpfe_standards[vpfe_dev->std_index].pixelaspect;
+       return 0;
+}
+
+static int vpfe_g_crop(struct file *file, void *priv,
+                            struct v4l2_crop *crop)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_g_crop\n");
+
+       crop->c = vpfe_dev->crop;
+       return 0;
+}
+
+static int vpfe_s_crop(struct file *file, void *priv,
+                            struct v4l2_crop *crop)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_crop\n");
+
+       if (vpfe_dev->started) {
+               /* make sure streaming is not started */
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "Cannot change crop when streaming is ON\n");
+               return -EBUSY;
+       }
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       if (crop->c.top < 0 || crop->c.left < 0) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "doesn't support negative values for top & left\n");
+               ret = -EINVAL;
+               goto unlock_out;
+       }
+
+       /* adjust the width to 16 pixel boundry */
+       crop->c.width = ((crop->c.width + 15) & ~0xf);
+
+       /* make sure parameters are valid */
+       if ((crop->c.left + crop->c.width >
+               vpfe_dev->std_info.active_pixels) ||
+           (crop->c.top + crop->c.height >
+               vpfe_dev->std_info.active_lines)) {
+               v4l2_err(&vpfe_dev->v4l2_dev, "Error in S_CROP params\n");
+               ret = -EINVAL;
+               goto unlock_out;
+       }
+       ccdc_dev->hw_ops.set_image_window(&crop->c);
+       vpfe_dev->fmt.fmt.pix.width = crop->c.width;
+       vpfe_dev->fmt.fmt.pix.height = crop->c.height;
+       vpfe_dev->fmt.fmt.pix.bytesperline =
+               ccdc_dev->hw_ops.get_line_length();
+       vpfe_dev->fmt.fmt.pix.sizeimage =
+               vpfe_dev->fmt.fmt.pix.bytesperline *
+               vpfe_dev->fmt.fmt.pix.height;
+       vpfe_dev->crop = crop->c;
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+
+static long vpfe_param_handler(struct file *file, void *priv,
+               int cmd, void *param)
+{
+       struct vpfe_device *vpfe_dev = video_drvdata(file);
+       int ret = 0;
+
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_param_handler\n");
+
+       if (vpfe_dev->started) {
+               /* only allowed if streaming is not started */
+               v4l2_err(&vpfe_dev->v4l2_dev, "device already started\n");
+               return -EBUSY;
+       }
+
+       ret = mutex_lock_interruptible(&vpfe_dev->lock);
+       if (ret)
+               return ret;
+
+       switch (cmd) {
+       case VPFE_CMD_S_CCDC_RAW_PARAMS:
+               v4l2_warn(&vpfe_dev->v4l2_dev,
+                         "VPFE_CMD_S_CCDC_RAW_PARAMS: experimental ioctl\n");
+               ret = ccdc_dev->hw_ops.set_params(param);
+               if (ret) {
+                       v4l2_err(&vpfe_dev->v4l2_dev,
+                               "Error in setting parameters in CCDC\n");
+                       goto unlock_out;
+               }
+               if (vpfe_get_ccdc_image_format(vpfe_dev, &vpfe_dev->fmt) < 0) {
+                       v4l2_err(&vpfe_dev->v4l2_dev,
+                               "Invalid image format at CCDC\n");
+                       goto unlock_out;
+               }
+               break;
+       default:
+               ret = -EINVAL;
+       }
+unlock_out:
+       mutex_unlock(&vpfe_dev->lock);
+       return ret;
+}
+
+
+/* vpfe capture ioctl operations */
+static const struct v4l2_ioctl_ops vpfe_ioctl_ops = {
+       .vidioc_querycap         = vpfe_querycap,
+       .vidioc_g_fmt_vid_cap    = vpfe_g_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_cap = vpfe_enum_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap    = vpfe_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap  = vpfe_try_fmt_vid_cap,
+       .vidioc_enum_input       = vpfe_enum_input,
+       .vidioc_g_input          = vpfe_g_input,
+       .vidioc_s_input          = vpfe_s_input,
+       .vidioc_querystd         = vpfe_querystd,
+       .vidioc_s_std            = vpfe_s_std,
+       .vidioc_g_std            = vpfe_g_std,
+       .vidioc_reqbufs          = vpfe_reqbufs,
+       .vidioc_querybuf         = vpfe_querybuf,
+       .vidioc_qbuf             = vpfe_qbuf,
+       .vidioc_dqbuf            = vpfe_dqbuf,
+       .vidioc_streamon         = vpfe_streamon,
+       .vidioc_streamoff        = vpfe_streamoff,
+       .vidioc_cropcap          = vpfe_cropcap,
+       .vidioc_g_crop           = vpfe_g_crop,
+       .vidioc_s_crop           = vpfe_s_crop,
+       .vidioc_default          = vpfe_param_handler,
+};
+
+static struct vpfe_device *vpfe_initialize(void)
+{
+       struct vpfe_device *vpfe_dev;
+
+       /* Default number of buffers should be 3 */
+       if ((numbuffers > 0) &&
+           (numbuffers < config_params.min_numbuffers))
+               numbuffers = config_params.min_numbuffers;
+
+       /*
+        * Set buffer size to min buffers size if invalid buffer size is
+        * given
+        */
+       if (bufsize < config_params.min_bufsize)
+               bufsize = config_params.min_bufsize;
+
+       config_params.numbuffers = numbuffers;
+
+       if (numbuffers)
+               config_params.device_bufsize = bufsize;
+
+       /* Allocate memory for device objects */
+       vpfe_dev = kzalloc(sizeof(*vpfe_dev), GFP_KERNEL);
+
+       return vpfe_dev;
+}
+
+static void vpfe_disable_clock(struct vpfe_device *vpfe_dev)
+{
+       struct vpfe_config *vpfe_cfg = vpfe_dev->cfg;
+
+       clk_disable(vpfe_cfg->vpssclk);
+       clk_put(vpfe_cfg->vpssclk);
+       clk_disable(vpfe_cfg->slaveclk);
+       clk_put(vpfe_cfg->slaveclk);
+       v4l2_info(vpfe_dev->pdev->driver,
+                "vpfe vpss master & slave clocks disabled\n");
+}
+
+static int vpfe_enable_clock(struct vpfe_device *vpfe_dev)
+{
+       struct vpfe_config *vpfe_cfg = vpfe_dev->cfg;
+       int ret = -ENOENT;
+
+       vpfe_cfg->vpssclk = clk_get(vpfe_dev->pdev, "vpss_master");
+       if (NULL == vpfe_cfg->vpssclk) {
+               v4l2_err(vpfe_dev->pdev->driver, "No clock defined for"
+                        "vpss_master\n");
+               return ret;
+       }
+
+       if (clk_enable(vpfe_cfg->vpssclk)) {
+               v4l2_err(vpfe_dev->pdev->driver,
+                       "vpfe vpss master clock not enabled\n");
+               goto out;
+       }
+       v4l2_info(vpfe_dev->pdev->driver,
+                "vpfe vpss master clock enabled\n");
+
+       vpfe_cfg->slaveclk = clk_get(vpfe_dev->pdev, "vpss_slave");
+       if (NULL == vpfe_cfg->slaveclk) {
+               v4l2_err(vpfe_dev->pdev->driver,
+                       "No clock defined for vpss slave\n");
+               goto out;
+       }
+
+       if (clk_enable(vpfe_cfg->slaveclk)) {
+               v4l2_err(vpfe_dev->pdev->driver,
+                        "vpfe vpss slave clock not enabled\n");
+               goto out;
+       }
+       v4l2_info(vpfe_dev->pdev->driver, "vpfe vpss slave clock enabled\n");
+       return 0;
+out:
+       if (vpfe_cfg->vpssclk)
+               clk_put(vpfe_cfg->vpssclk);
+       if (vpfe_cfg->slaveclk)
+               clk_put(vpfe_cfg->slaveclk);
+
+       return -1;
+}
+
+/*
+ * vpfe_probe : This function creates device entries by register
+ * itself to the V4L2 driver and initializes fields of each
+ * device objects
+ */
+static __init int vpfe_probe(struct platform_device *pdev)
+{
+       struct vpfe_subdev_info *sdinfo;
+       struct vpfe_config *vpfe_cfg;
+       struct resource *res1;
+       struct vpfe_device *vpfe_dev;
+       struct i2c_adapter *i2c_adap;
+       struct video_device *vfd;
+       int ret = -ENOMEM, i, j;
+       int num_subdevs = 0;
+
+       /* Get the pointer to the device object */
+       vpfe_dev = vpfe_initialize();
+
+       if (!vpfe_dev) {
+               v4l2_err(pdev->dev.driver,
+                       "Failed to allocate memory for vpfe_dev\n");
+               return ret;
+       }
+
+       vpfe_dev->pdev = &pdev->dev;
+
+       if (NULL == pdev->dev.platform_data) {
+               v4l2_err(pdev->dev.driver, "Unable to get vpfe config\n");
+               ret = -ENOENT;
+               goto probe_free_dev_mem;
+       }
+
+       vpfe_cfg = pdev->dev.platform_data;
+       vpfe_dev->cfg = vpfe_cfg;
+       if (NULL == vpfe_cfg->ccdc ||
+           NULL == vpfe_cfg->card_name ||
+           NULL == vpfe_cfg->sub_devs) {
+               v4l2_err(pdev->dev.driver, "null ptr in vpfe_cfg\n");
+               ret = -ENOENT;
+               goto probe_free_dev_mem;
+       }
+
+       /* enable vpss clocks */
+       ret = vpfe_enable_clock(vpfe_dev);
+       if (ret)
+               goto probe_free_dev_mem;
+
+       mutex_lock(&ccdc_lock);
+       /* Allocate memory for ccdc configuration */
+       ccdc_cfg = kmalloc(sizeof(struct ccdc_config), GFP_KERNEL);
+       if (NULL == ccdc_cfg) {
+               v4l2_err(pdev->dev.driver,
+                        "Memory allocation failed for ccdc_cfg\n");
+               goto probe_disable_clock;
+       }
+
+       strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32);
+       /* Get VINT0 irq resource */
+       res1 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!res1) {
+               v4l2_err(pdev->dev.driver,
+                        "Unable to get interrupt for VINT0\n");
+               ret = -ENOENT;
+               goto probe_disable_clock;
+       }
+       vpfe_dev->ccdc_irq0 = res1->start;
+
+       /* Get VINT1 irq resource */
+       res1 = platform_get_resource(pdev,
+                               IORESOURCE_IRQ, 1);
+       if (!res1) {
+               v4l2_err(pdev->dev.driver,
+                        "Unable to get interrupt for VINT1\n");
+               ret = -ENOENT;
+               goto probe_disable_clock;
+       }
+       vpfe_dev->ccdc_irq1 = res1->start;
+
+       /* Get address base of CCDC */
+       res1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res1) {
+               v4l2_err(pdev->dev.driver,
+                       "Unable to get register address map\n");
+               ret = -ENOENT;
+               goto probe_disable_clock;
+       }
+
+       ccdc_cfg->ccdc_addr_size = res1->end - res1->start + 1;
+       if (!request_mem_region(res1->start, ccdc_cfg->ccdc_addr_size,
+                               pdev->dev.driver->name)) {
+               v4l2_err(pdev->dev.driver,
+                       "Failed request_mem_region for ccdc base\n");
+               ret = -ENXIO;
+               goto probe_disable_clock;
+       }
+       ccdc_cfg->ccdc_addr = ioremap_nocache(res1->start,
+                                            ccdc_cfg->ccdc_addr_size);
+       if (!ccdc_cfg->ccdc_addr) {
+               v4l2_err(pdev->dev.driver, "Unable to ioremap ccdc addr\n");
+               ret = -ENXIO;
+               goto probe_out_release_mem1;
+       }
+
+       ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, IRQF_DISABLED,
+                         "vpfe_capture0", vpfe_dev);
+
+       if (0 != ret) {
+               v4l2_err(pdev->dev.driver, "Unable to request interrupt\n");
+               goto probe_out_unmap1;
+       }
+
+       /* Allocate memory for video device */
+       vfd = video_device_alloc();
+       if (NULL == vfd) {
+               ret = -ENOMEM;
+               v4l2_err(pdev->dev.driver,
+                       "Unable to alloc video device\n");
+               goto probe_out_release_irq;
+       }
+
+       /* Initialize field of video device */
+       vfd->release            = video_device_release;
+       vfd->fops               = &vpfe_fops;
+       vfd->ioctl_ops          = &vpfe_ioctl_ops;
+       vfd->minor              = -1;
+       vfd->tvnorms            = 0;
+       vfd->current_norm       = V4L2_STD_PAL;
+       vfd->v4l2_dev           = &vpfe_dev->v4l2_dev;
+       snprintf(vfd->name, sizeof(vfd->name),
+                "%s_V%d.%d.%d",
+                CAPTURE_DRV_NAME,
+                (VPFE_CAPTURE_VERSION_CODE >> 16) & 0xff,
+                (VPFE_CAPTURE_VERSION_CODE >> 8) & 0xff,
+                (VPFE_CAPTURE_VERSION_CODE) & 0xff);
+       /* Set video_dev to the video device */
+       vpfe_dev->video_dev     = vfd;
+
+       ret = v4l2_device_register(&pdev->dev, &vpfe_dev->v4l2_dev);
+       if (ret) {
+               v4l2_err(pdev->dev.driver,
+                       "Unable to register v4l2 device.\n");
+               goto probe_out_video_release;
+       }
+       v4l2_info(&vpfe_dev->v4l2_dev, "v4l2 device registered\n");
+       spin_lock_init(&vpfe_dev->irqlock);
+       spin_lock_init(&vpfe_dev->dma_queue_lock);
+       mutex_init(&vpfe_dev->lock);
+
+       /* Initialize field of the device objects */
+       vpfe_dev->numbuffers = config_params.numbuffers;
+
+       /* Initialize prio member of device object */
+       v4l2_prio_init(&vpfe_dev->prio);
+       /* register video device */
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
+               "trying to register vpfe device.\n");
+       v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
+               "video_dev=%x\n", (int)&vpfe_dev->video_dev);
+       vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       ret = video_register_device(vpfe_dev->video_dev,
+                                   VFL_TYPE_GRABBER, -1);
+
+       if (ret) {
+               v4l2_err(pdev->dev.driver,
+                       "Unable to register video device.\n");
+               goto probe_out_v4l2_unregister;
+       }
+
+       v4l2_info(&vpfe_dev->v4l2_dev, "video device registered\n");
+       /* set the driver data in platform device */
+       platform_set_drvdata(pdev, vpfe_dev);
+       /* set driver private data */
+       video_set_drvdata(vpfe_dev->video_dev, vpfe_dev);
+       i2c_adap = i2c_get_adapter(1);
+       vpfe_cfg = pdev->dev.platform_data;
+       num_subdevs = vpfe_cfg->num_subdevs;
+       vpfe_dev->sd = kmalloc(sizeof(struct v4l2_subdev *) * num_subdevs,
+                               GFP_KERNEL);
+       if (NULL == vpfe_dev->sd) {
+               v4l2_err(&vpfe_dev->v4l2_dev,
+                       "unable to allocate memory for subdevice pointers\n");
+               ret = -ENOMEM;
+               goto probe_out_video_unregister;
+       }
+
+       for (i = 0; i < num_subdevs; i++) {
+               struct v4l2_input *inps;
+
+               sdinfo = &vpfe_cfg->sub_devs[i];
+
+               /* Load up the subdevice */
+               vpfe_dev->sd[i] =
+                       v4l2_i2c_new_subdev_board(&vpfe_dev->v4l2_dev,
+                                                 i2c_adap,
+                                                 sdinfo->name,
+                                                 &sdinfo->board_info,
+                                                 NULL);
+               if (vpfe_dev->sd[i]) {
+                       v4l2_info(&vpfe_dev->v4l2_dev,
+                                 "v4l2 sub device %s registered\n",
+                                 sdinfo->name);
+                       vpfe_dev->sd[i]->grp_id = sdinfo->grp_id;
+                       /* update tvnorms from the sub devices */
+                       for (j = 0; j < sdinfo->num_inputs; j++) {
+                               inps = &sdinfo->inputs[j];
+                               vfd->tvnorms |= inps->std;
+                       }
+               } else {
+                       v4l2_info(&vpfe_dev->v4l2_dev,
+                                 "v4l2 sub device %s register fails\n",
+                                 sdinfo->name);
+                       goto probe_sd_out;
+               }
+       }
+
+       /* set first sub device as current one */
+       vpfe_dev->current_subdev = &vpfe_cfg->sub_devs[0];
+
+       /* We have at least one sub device to work with */
+       mutex_unlock(&ccdc_lock);
+       return 0;
+
+probe_sd_out:
+       kfree(vpfe_dev->sd);
+probe_out_video_unregister:
+       video_unregister_device(vpfe_dev->video_dev);
+probe_out_v4l2_unregister:
+       v4l2_device_unregister(&vpfe_dev->v4l2_dev);
+probe_out_video_release:
+       if (vpfe_dev->video_dev->minor == -1)
+               video_device_release(vpfe_dev->video_dev);
+probe_out_release_irq:
+       free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
+probe_out_unmap1:
+       iounmap(ccdc_cfg->ccdc_addr);
+probe_out_release_mem1:
+       release_mem_region(res1->start, res1->end - res1->start + 1);
+probe_disable_clock:
+       vpfe_disable_clock(vpfe_dev);
+       mutex_unlock(&ccdc_lock);
+       kfree(ccdc_cfg);
+probe_free_dev_mem:
+       kfree(vpfe_dev);
+       return ret;
+}
+
+/*
+ * vpfe_remove : It un-register device from V4L2 driver
+ */
+static int vpfe_remove(struct platform_device *pdev)
+{
+       struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev);
+       struct resource *res;
+
+       v4l2_info(pdev->dev.driver, "vpfe_remove\n");
+
+       free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
+       kfree(vpfe_dev->sd);
+       v4l2_device_unregister(&vpfe_dev->v4l2_dev);
+       video_unregister_device(vpfe_dev->video_dev);
+       mutex_lock(&ccdc_lock);
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       release_mem_region(res->start, res->end - res->start + 1);
+       iounmap(ccdc_cfg->ccdc_addr);
+       mutex_unlock(&ccdc_lock);
+       vpfe_disable_clock(vpfe_dev);
+       kfree(vpfe_dev);
+       kfree(ccdc_cfg);
+       return 0;
+}
+
+static int
+vpfe_suspend(struct device *dev)
+{
+       /* add suspend code here later */
+       return -1;
+}
+
+static int
+vpfe_resume(struct device *dev)
+{
+       /* add resume code here later */
+       return -1;
+}
+
+static struct dev_pm_ops vpfe_dev_pm_ops = {
+       .suspend = vpfe_suspend,
+       .resume = vpfe_resume,
+};
+
+static struct platform_driver vpfe_driver = {
+       .driver = {
+               .name = CAPTURE_DRV_NAME,
+               .owner = THIS_MODULE,
+               .pm = &vpfe_dev_pm_ops,
+       },
+       .probe = vpfe_probe,
+       .remove = __devexit_p(vpfe_remove),
+};
+
+static __init int vpfe_init(void)
+{
+       printk(KERN_NOTICE "vpfe_init\n");
+       /* Register driver to the kernel */
+       return platform_driver_register(&vpfe_driver);
+}
+
+/*
+ * vpfe_cleanup : This function un-registers device driver
+ */
+static void vpfe_cleanup(void)
+{
+       platform_driver_unregister(&vpfe_driver);
+}
+
+module_init(vpfe_init);
+module_exit(vpfe_cleanup);
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
new file mode 100644 (file)
index 0000000..3b8eac3
--- /dev/null
@@ -0,0 +1,296 @@
+/*
+ * vpif - DM646x Video Port Interface driver
+ * VPIF is a receiver and transmitter for video data. It has two channels(0, 1)
+ * that receiveing video byte stream and two channels(2, 3) for video output.
+ * The hardware supports SDTV, HDTV formats, raw data capture.
+ * Currently, the driver supports NTSC and PAL standards.
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <mach/hardware.h>
+
+#include "vpif.h"
+
+MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver");
+MODULE_LICENSE("GPL");
+
+#define VPIF_CH0_MAX_MODES     (22)
+#define VPIF_CH1_MAX_MODES     (02)
+#define VPIF_CH2_MAX_MODES     (15)
+#define VPIF_CH3_MAX_MODES     (02)
+
+static resource_size_t res_len;
+static struct resource *res;
+spinlock_t vpif_lock;
+
+void __iomem *vpif_base;
+
+static inline void vpif_wr_bit(u32 reg, u32 bit, u32 val)
+{
+       if (val)
+               vpif_set_bit(reg, bit);
+       else
+               vpif_clr_bit(reg, bit);
+}
+
+/* This structure is used to keep track of VPIF size register's offsets */
+struct vpif_registers {
+       u32 h_cfg, v_cfg_00, v_cfg_01, v_cfg_02, v_cfg, ch_ctrl;
+       u32 line_offset, vanc0_strt, vanc0_size, vanc1_strt;
+       u32 vanc1_size, width_mask, len_mask;
+       u8 max_modes;
+};
+
+static const struct vpif_registers vpifregs[VPIF_NUM_CHANNELS] = {
+       /* Channel0 */
+       {
+               VPIF_CH0_H_CFG, VPIF_CH0_V_CFG_00, VPIF_CH0_V_CFG_01,
+               VPIF_CH0_V_CFG_02, VPIF_CH0_V_CFG_03, VPIF_CH0_CTRL,
+               VPIF_CH0_IMG_ADD_OFST, 0, 0, 0, 0, 0x1FFF, 0xFFF,
+               VPIF_CH0_MAX_MODES,
+       },
+       /* Channel1 */
+       {
+               VPIF_CH1_H_CFG, VPIF_CH1_V_CFG_00, VPIF_CH1_V_CFG_01,
+               VPIF_CH1_V_CFG_02, VPIF_CH1_V_CFG_03, VPIF_CH1_CTRL,
+               VPIF_CH1_IMG_ADD_OFST, 0, 0, 0, 0, 0x1FFF, 0xFFF,
+               VPIF_CH1_MAX_MODES,
+       },
+       /* Channel2 */
+       {
+               VPIF_CH2_H_CFG, VPIF_CH2_V_CFG_00, VPIF_CH2_V_CFG_01,
+               VPIF_CH2_V_CFG_02, VPIF_CH2_V_CFG_03, VPIF_CH2_CTRL,
+               VPIF_CH2_IMG_ADD_OFST, VPIF_CH2_VANC0_STRT, VPIF_CH2_VANC0_SIZE,
+               VPIF_CH2_VANC1_STRT, VPIF_CH2_VANC1_SIZE, 0x7FF, 0x7FF,
+               VPIF_CH2_MAX_MODES
+       },
+       /* Channel3 */
+       {
+               VPIF_CH3_H_CFG, VPIF_CH3_V_CFG_00, VPIF_CH3_V_CFG_01,
+               VPIF_CH3_V_CFG_02, VPIF_CH3_V_CFG_03, VPIF_CH3_CTRL,
+               VPIF_CH3_IMG_ADD_OFST, VPIF_CH3_VANC0_STRT, VPIF_CH3_VANC0_SIZE,
+               VPIF_CH3_VANC1_STRT, VPIF_CH3_VANC1_SIZE, 0x7FF, 0x7FF,
+               VPIF_CH3_MAX_MODES
+       },
+};
+
+/* vpif_set_mode_info:
+ * This function is used to set horizontal and vertical config parameters
+ * As per the standard in the channel, configure the values of L1, L3,
+ * L5, L7  L9, L11 in VPIF Register , also write width and height
+ */
+static void vpif_set_mode_info(const struct vpif_channel_config_params *config,
+                               u8 channel_id, u8 config_channel_id)
+{
+       u32 value;
+
+       value = (config->eav2sav & vpifregs[config_channel_id].width_mask);
+       value <<= VPIF_CH_LEN_SHIFT;
+       value |= (config->sav2eav & vpifregs[config_channel_id].width_mask);
+       regw(value, vpifregs[channel_id].h_cfg);
+
+       value = (config->l1 & vpifregs[config_channel_id].len_mask);
+       value <<= VPIF_CH_LEN_SHIFT;
+       value |= (config->l3 & vpifregs[config_channel_id].len_mask);
+       regw(value, vpifregs[channel_id].v_cfg_00);
+
+       value = (config->l5 & vpifregs[config_channel_id].len_mask);
+       value <<= VPIF_CH_LEN_SHIFT;
+       value |= (config->l7 & vpifregs[config_channel_id].len_mask);
+       regw(value, vpifregs[channel_id].v_cfg_01);
+
+       value = (config->l9 & vpifregs[config_channel_id].len_mask);
+       value <<= VPIF_CH_LEN_SHIFT;
+       value |= (config->l11 & vpifregs[config_channel_id].len_mask);
+       regw(value, vpifregs[channel_id].v_cfg_02);
+
+       value = (config->vsize & vpifregs[config_channel_id].len_mask);
+       regw(value, vpifregs[channel_id].v_cfg);
+}
+
+/* config_vpif_params
+ * Function to set the parameters of a channel
+ * Mainly modifies the channel ciontrol register
+ * It sets frame format, yc mux mode
+ */
+static void config_vpif_params(struct vpif_params *vpifparams,
+                               u8 channel_id, u8 found)
+{
+       const struct vpif_channel_config_params *config = &vpifparams->std_info;
+       u32 value, ch_nip, reg;
+       u8 start, end;
+       int i;
+
+       start = channel_id;
+       end = channel_id + found;
+
+       for (i = start; i < end; i++) {
+               reg = vpifregs[i].ch_ctrl;
+               if (channel_id < 2)
+                       ch_nip = VPIF_CAPTURE_CH_NIP;
+               else
+                       ch_nip = VPIF_DISPLAY_CH_NIP;
+
+               vpif_wr_bit(reg, ch_nip, config->frm_fmt);
+               vpif_wr_bit(reg, VPIF_CH_YC_MUX_BIT, config->ycmux_mode);
+               vpif_wr_bit(reg, VPIF_CH_INPUT_FIELD_FRAME_BIT,
+                                       vpifparams->video_params.storage_mode);
+
+               /* Set raster scanning SDR Format */
+               vpif_clr_bit(reg, VPIF_CH_SDR_FMT_BIT);
+               vpif_wr_bit(reg, VPIF_CH_DATA_MODE_BIT, config->capture_format);
+
+               if (channel_id > 1)     /* Set the Pixel enable bit */
+                       vpif_set_bit(reg, VPIF_DISPLAY_PIX_EN_BIT);
+               else if (config->capture_format) {
+                       /* Set the polarity of various pins */
+                       vpif_wr_bit(reg, VPIF_CH_FID_POLARITY_BIT,
+                                       vpifparams->iface.fid_pol);
+                       vpif_wr_bit(reg, VPIF_CH_V_VALID_POLARITY_BIT,
+                                       vpifparams->iface.vd_pol);
+                       vpif_wr_bit(reg, VPIF_CH_H_VALID_POLARITY_BIT,
+                                       vpifparams->iface.hd_pol);
+
+                       value = regr(reg);
+                       /* Set data width */
+                       value &= ((~(unsigned int)(0x3)) <<
+                                       VPIF_CH_DATA_WIDTH_BIT);
+                       value |= ((vpifparams->params.data_sz) <<
+                                                    VPIF_CH_DATA_WIDTH_BIT);
+                       regw(value, reg);
+               }
+
+               /* Write the pitch in the driver */
+               regw((vpifparams->video_params.hpitch),
+                                               vpifregs[i].line_offset);
+       }
+}
+
+/* vpif_set_video_params
+ * This function is used to set video parameters in VPIF register
+ */
+int vpif_set_video_params(struct vpif_params *vpifparams, u8 channel_id)
+{
+       const struct vpif_channel_config_params *config = &vpifparams->std_info;
+       int found = 1;
+
+       vpif_set_mode_info(config, channel_id, channel_id);
+       if (!config->ycmux_mode) {
+               /* YC are on separate channels (HDTV formats) */
+               vpif_set_mode_info(config, channel_id + 1, channel_id);
+               found = 2;
+       }
+
+       config_vpif_params(vpifparams, channel_id, found);
+
+       regw(0x80, VPIF_REQ_SIZE);
+       regw(0x01, VPIF_EMULATION_CTRL);
+
+       return found;
+}
+EXPORT_SYMBOL(vpif_set_video_params);
+
+void vpif_set_vbi_display_params(struct vpif_vbi_params *vbiparams,
+                               u8 channel_id)
+{
+       u32 value;
+
+       value = 0x3F8 & (vbiparams->hstart0);
+       value |= 0x3FFFFFF & ((vbiparams->vstart0) << 16);
+       regw(value, vpifregs[channel_id].vanc0_strt);
+
+       value = 0x3F8 & (vbiparams->hstart1);
+       value |= 0x3FFFFFF & ((vbiparams->vstart1) << 16);
+       regw(value, vpifregs[channel_id].vanc1_strt);
+
+       value = 0x3F8 & (vbiparams->hsize0);
+       value |= 0x3FFFFFF & ((vbiparams->vsize0) << 16);
+       regw(value, vpifregs[channel_id].vanc0_size);
+
+       value = 0x3F8 & (vbiparams->hsize1);
+       value |= 0x3FFFFFF & ((vbiparams->vsize1) << 16);
+       regw(value, vpifregs[channel_id].vanc1_size);
+
+}
+EXPORT_SYMBOL(vpif_set_vbi_display_params);
+
+int vpif_channel_getfid(u8 channel_id)
+{
+       return (regr(vpifregs[channel_id].ch_ctrl) & VPIF_CH_FID_MASK)
+                                       >> VPIF_CH_FID_SHIFT;
+}
+EXPORT_SYMBOL(vpif_channel_getfid);
+
+static int __init vpif_probe(struct platform_device *pdev)
+{
+       int status = 0;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENOENT;
+
+       res_len = res->end - res->start + 1;
+
+       res = request_mem_region(res->start, res_len, res->name);
+       if (!res)
+               return -EBUSY;
+
+       vpif_base = ioremap(res->start, res_len);
+       if (!vpif_base) {
+               status = -EBUSY;
+               goto fail;
+       }
+
+       spin_lock_init(&vpif_lock);
+       dev_info(&pdev->dev, "vpif probe success\n");
+       return 0;
+
+fail:
+       release_mem_region(res->start, res_len);
+       return status;
+}
+
+static int vpif_remove(struct platform_device *pdev)
+{
+       iounmap(vpif_base);
+       release_mem_region(res->start, res_len);
+       return 0;
+}
+
+static struct platform_driver vpif_driver = {
+       .driver = {
+               .name   = "vpif",
+               .owner = THIS_MODULE,
+       },
+       .remove = __devexit_p(vpif_remove),
+       .probe = vpif_probe,
+};
+
+static void vpif_exit(void)
+{
+       platform_driver_unregister(&vpif_driver);
+}
+
+static int __init vpif_init(void)
+{
+       return platform_driver_register(&vpif_driver);
+}
+subsys_initcall(vpif_init);
+module_exit(vpif_exit);
+
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
new file mode 100644 (file)
index 0000000..188841b
--- /dev/null
@@ -0,0 +1,642 @@
+/*
+ * VPIF header file
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef VPIF_H
+#define VPIF_H
+
+#include <linux/io.h>
+#include <linux/videodev2.h>
+#include <mach/hardware.h>
+#include <mach/dm646x.h>
+
+/* Maximum channel allowed */
+#define VPIF_NUM_CHANNELS              (4)
+#define VPIF_CAPTURE_NUM_CHANNELS      (2)
+#define VPIF_DISPLAY_NUM_CHANNELS      (2)
+
+/* Macros to read/write registers */
+extern void __iomem *vpif_base;
+extern spinlock_t vpif_lock;
+
+#define regr(reg)               readl((reg) + vpif_base)
+#define regw(value, reg)        writel(value, (reg + vpif_base))
+
+/* Register Addresss Offsets */
+#define VPIF_PID                       (0x0000)
+#define VPIF_CH0_CTRL                  (0x0004)
+#define VPIF_CH1_CTRL                  (0x0008)
+#define VPIF_CH2_CTRL                  (0x000C)
+#define VPIF_CH3_CTRL                  (0x0010)
+
+#define VPIF_INTEN                     (0x0020)
+#define VPIF_INTEN_SET                 (0x0024)
+#define VPIF_INTEN_CLR                 (0x0028)
+#define VPIF_STATUS                    (0x002C)
+#define VPIF_STATUS_CLR                        (0x0030)
+#define VPIF_EMULATION_CTRL            (0x0034)
+#define VPIF_REQ_SIZE                  (0x0038)
+
+#define VPIF_CH0_TOP_STRT_ADD_LUMA     (0x0040)
+#define VPIF_CH0_BTM_STRT_ADD_LUMA     (0x0044)
+#define VPIF_CH0_TOP_STRT_ADD_CHROMA   (0x0048)
+#define VPIF_CH0_BTM_STRT_ADD_CHROMA   (0x004c)
+#define VPIF_CH0_TOP_STRT_ADD_HANC     (0x0050)
+#define VPIF_CH0_BTM_STRT_ADD_HANC     (0x0054)
+#define VPIF_CH0_TOP_STRT_ADD_VANC     (0x0058)
+#define VPIF_CH0_BTM_STRT_ADD_VANC     (0x005c)
+#define VPIF_CH0_SP_CFG                        (0x0060)
+#define VPIF_CH0_IMG_ADD_OFST          (0x0064)
+#define VPIF_CH0_HANC_ADD_OFST         (0x0068)
+#define VPIF_CH0_H_CFG                 (0x006c)
+#define VPIF_CH0_V_CFG_00              (0x0070)
+#define VPIF_CH0_V_CFG_01              (0x0074)
+#define VPIF_CH0_V_CFG_02              (0x0078)
+#define VPIF_CH0_V_CFG_03              (0x007c)
+
+#define VPIF_CH1_TOP_STRT_ADD_LUMA     (0x0080)
+#define VPIF_CH1_BTM_STRT_ADD_LUMA     (0x0084)
+#define VPIF_CH1_TOP_STRT_ADD_CHROMA   (0x0088)
+#define VPIF_CH1_BTM_STRT_ADD_CHROMA   (0x008c)
+#define VPIF_CH1_TOP_STRT_ADD_HANC     (0x0090)
+#define VPIF_CH1_BTM_STRT_ADD_HANC     (0x0094)
+#define VPIF_CH1_TOP_STRT_ADD_VANC     (0x0098)
+#define VPIF_CH1_BTM_STRT_ADD_VANC     (0x009c)
+#define VPIF_CH1_SP_CFG                        (0x00a0)
+#define VPIF_CH1_IMG_ADD_OFST          (0x00a4)
+#define VPIF_CH1_HANC_ADD_OFST         (0x00a8)
+#define VPIF_CH1_H_CFG                 (0x00ac)
+#define VPIF_CH1_V_CFG_00              (0x00b0)
+#define VPIF_CH1_V_CFG_01              (0x00b4)
+#define VPIF_CH1_V_CFG_02              (0x00b8)
+#define VPIF_CH1_V_CFG_03              (0x00bc)
+
+#define VPIF_CH2_TOP_STRT_ADD_LUMA     (0x00c0)
+#define VPIF_CH2_BTM_STRT_ADD_LUMA     (0x00c4)
+#define VPIF_CH2_TOP_STRT_ADD_CHROMA   (0x00c8)
+#define VPIF_CH2_BTM_STRT_ADD_CHROMA   (0x00cc)
+#define VPIF_CH2_TOP_STRT_ADD_HANC     (0x00d0)
+#define VPIF_CH2_BTM_STRT_ADD_HANC     (0x00d4)
+#define VPIF_CH2_TOP_STRT_ADD_VANC     (0x00d8)
+#define VPIF_CH2_BTM_STRT_ADD_VANC     (0x00dc)
+#define VPIF_CH2_SP_CFG                        (0x00e0)
+#define VPIF_CH2_IMG_ADD_OFST          (0x00e4)
+#define VPIF_CH2_HANC_ADD_OFST         (0x00e8)
+#define VPIF_CH2_H_CFG                 (0x00ec)
+#define VPIF_CH2_V_CFG_00              (0x00f0)
+#define VPIF_CH2_V_CFG_01              (0x00f4)
+#define VPIF_CH2_V_CFG_02              (0x00f8)
+#define VPIF_CH2_V_CFG_03              (0x00fc)
+#define VPIF_CH2_HANC0_STRT            (0x0100)
+#define VPIF_CH2_HANC0_SIZE            (0x0104)
+#define VPIF_CH2_HANC1_STRT            (0x0108)
+#define VPIF_CH2_HANC1_SIZE            (0x010c)
+#define VPIF_CH2_VANC0_STRT            (0x0110)
+#define VPIF_CH2_VANC0_SIZE            (0x0114)
+#define VPIF_CH2_VANC1_STRT            (0x0118)
+#define VPIF_CH2_VANC1_SIZE            (0x011c)
+
+#define VPIF_CH3_TOP_STRT_ADD_LUMA     (0x0140)
+#define VPIF_CH3_BTM_STRT_ADD_LUMA     (0x0144)
+#define VPIF_CH3_TOP_STRT_ADD_CHROMA   (0x0148)
+#define VPIF_CH3_BTM_STRT_ADD_CHROMA   (0x014c)
+#define VPIF_CH3_TOP_STRT_ADD_HANC     (0x0150)
+#define VPIF_CH3_BTM_STRT_ADD_HANC     (0x0154)
+#define VPIF_CH3_TOP_STRT_ADD_VANC     (0x0158)
+#define VPIF_CH3_BTM_STRT_ADD_VANC     (0x015c)
+#define VPIF_CH3_SP_CFG                        (0x0160)
+#define VPIF_CH3_IMG_ADD_OFST          (0x0164)
+#define VPIF_CH3_HANC_ADD_OFST         (0x0168)
+#define VPIF_CH3_H_CFG                 (0x016c)
+#define VPIF_CH3_V_CFG_00              (0x0170)
+#define VPIF_CH3_V_CFG_01              (0x0174)
+#define VPIF_CH3_V_CFG_02              (0x0178)
+#define VPIF_CH3_V_CFG_03              (0x017c)
+#define VPIF_CH3_HANC0_STRT            (0x0180)
+#define VPIF_CH3_HANC0_SIZE            (0x0184)
+#define VPIF_CH3_HANC1_STRT            (0x0188)
+#define VPIF_CH3_HANC1_SIZE            (0x018c)
+#define VPIF_CH3_VANC0_STRT            (0x0190)
+#define VPIF_CH3_VANC0_SIZE            (0x0194)
+#define VPIF_CH3_VANC1_STRT            (0x0198)
+#define VPIF_CH3_VANC1_SIZE            (0x019c)
+
+#define VPIF_IODFT_CTRL                        (0x01c0)
+
+/* Functions for bit Manipulation */
+static inline void vpif_set_bit(u32 reg, u32 bit)
+{
+       regw((regr(reg)) | (0x01 << bit), reg);
+}
+
+static inline void vpif_clr_bit(u32 reg, u32 bit)
+{
+       regw(((regr(reg)) & ~(0x01 << bit)), reg);
+}
+
+/* Macro for Generating mask */
+#ifdef GENERATE_MASK
+#undef GENERATE_MASK
+#endif
+
+#define GENERATE_MASK(bits, pos) \
+               ((((0xFFFFFFFF) << (32 - bits)) >> (32 - bits)) << pos)
+
+/* Bit positions in the channel control registers */
+#define VPIF_CH_DATA_MODE_BIT  (2)
+#define VPIF_CH_YC_MUX_BIT     (3)
+#define VPIF_CH_SDR_FMT_BIT    (4)
+#define VPIF_CH_HANC_EN_BIT    (8)
+#define VPIF_CH_VANC_EN_BIT    (9)
+
+#define VPIF_CAPTURE_CH_NIP    (10)
+#define VPIF_DISPLAY_CH_NIP    (11)
+
+#define VPIF_DISPLAY_PIX_EN_BIT        (10)
+
+#define VPIF_CH_INPUT_FIELD_FRAME_BIT  (12)
+
+#define VPIF_CH_FID_POLARITY_BIT       (15)
+#define VPIF_CH_V_VALID_POLARITY_BIT   (14)
+#define VPIF_CH_H_VALID_POLARITY_BIT   (13)
+#define VPIF_CH_DATA_WIDTH_BIT         (28)
+
+#define VPIF_CH_CLK_EDGE_CTRL_BIT      (31)
+
+/* Mask various length */
+#define VPIF_CH_EAVSAV_MASK    GENERATE_MASK(13, 0)
+#define VPIF_CH_LEN_MASK       GENERATE_MASK(12, 0)
+#define VPIF_CH_WIDTH_MASK     GENERATE_MASK(13, 0)
+#define VPIF_CH_LEN_SHIFT      (16)
+
+/* VPIF masks for registers */
+#define VPIF_REQ_SIZE_MASK     (0x1ff)
+
+/* bit posotion of interrupt vpif_ch_intr register */
+#define VPIF_INTEN_FRAME_CH0   (0x00000001)
+#define VPIF_INTEN_FRAME_CH1   (0x00000002)
+#define VPIF_INTEN_FRAME_CH2   (0x00000004)
+#define VPIF_INTEN_FRAME_CH3   (0x00000008)
+
+/* bit position of clock and channel enable in vpif_chn_ctrl register */
+
+#define VPIF_CH0_CLK_EN                (0x00000002)
+#define VPIF_CH0_EN            (0x00000001)
+#define VPIF_CH1_CLK_EN                (0x00000002)
+#define VPIF_CH1_EN            (0x00000001)
+#define VPIF_CH2_CLK_EN                (0x00000002)
+#define VPIF_CH2_EN            (0x00000001)
+#define VPIF_CH3_CLK_EN                (0x00000002)
+#define VPIF_CH3_EN            (0x00000001)
+#define VPIF_CH_CLK_EN         (0x00000002)
+#define VPIF_CH_EN             (0x00000001)
+
+#define VPIF_INT_TOP   (0x00)
+#define VPIF_INT_BOTTOM        (0x01)
+#define VPIF_INT_BOTH  (0x02)
+
+#define VPIF_CH0_INT_CTRL_SHIFT        (6)
+#define VPIF_CH1_INT_CTRL_SHIFT        (6)
+#define VPIF_CH2_INT_CTRL_SHIFT        (6)
+#define VPIF_CH3_INT_CTRL_SHIFT        (6)
+#define VPIF_CH_INT_CTRL_SHIFT (6)
+
+/* enabled interrupt on both the fields on vpid_ch0_ctrl register */
+#define channel0_intr_assert() (regw((regr(VPIF_CH0_CTRL)|\
+       (VPIF_INT_BOTH << VPIF_CH0_INT_CTRL_SHIFT)), VPIF_CH0_CTRL))
+
+/* enabled interrupt on both the fields on vpid_ch1_ctrl register */
+#define channel1_intr_assert() (regw((regr(VPIF_CH1_CTRL)|\
+       (VPIF_INT_BOTH << VPIF_CH1_INT_CTRL_SHIFT)), VPIF_CH1_CTRL))
+
+/* enabled interrupt on both the fields on vpid_ch0_ctrl register */
+#define channel2_intr_assert()         (regw((regr(VPIF_CH2_CTRL)|\
+       (VPIF_INT_BOTH << VPIF_CH2_INT_CTRL_SHIFT)), VPIF_CH2_CTRL))
+
+/* enabled interrupt on both the fields on vpid_ch1_ctrl register */
+#define channel3_intr_assert()         (regw((regr(VPIF_CH3_CTRL)|\
+       (VPIF_INT_BOTH << VPIF_CH3_INT_CTRL_SHIFT)), VPIF_CH3_CTRL))
+
+#define VPIF_CH_FID_MASK       (0x20)
+#define VPIF_CH_FID_SHIFT      (5)
+
+#define VPIF_NTSC_VBI_START_FIELD0     (1)
+#define VPIF_NTSC_VBI_START_FIELD1     (263)
+#define VPIF_PAL_VBI_START_FIELD0      (624)
+#define VPIF_PAL_VBI_START_FIELD1      (311)
+
+#define VPIF_NTSC_HBI_START_FIELD0     (1)
+#define VPIF_NTSC_HBI_START_FIELD1     (263)
+#define VPIF_PAL_HBI_START_FIELD0      (624)
+#define VPIF_PAL_HBI_START_FIELD1      (311)
+
+#define VPIF_NTSC_VBI_COUNT_FIELD0     (20)
+#define VPIF_NTSC_VBI_COUNT_FIELD1     (19)
+#define VPIF_PAL_VBI_COUNT_FIELD0      (24)
+#define VPIF_PAL_VBI_COUNT_FIELD1      (25)
+
+#define VPIF_NTSC_HBI_COUNT_FIELD0     (263)
+#define VPIF_NTSC_HBI_COUNT_FIELD1     (262)
+#define VPIF_PAL_HBI_COUNT_FIELD0      (312)
+#define VPIF_PAL_HBI_COUNT_FIELD1      (313)
+
+#define VPIF_NTSC_VBI_SAMPLES_PER_LINE (720)
+#define VPIF_PAL_VBI_SAMPLES_PER_LINE  (720)
+#define VPIF_NTSC_HBI_SAMPLES_PER_LINE (268)
+#define VPIF_PAL_HBI_SAMPLES_PER_LINE  (280)
+
+#define VPIF_CH_VANC_EN                        (0x20)
+#define VPIF_DMA_REQ_SIZE              (0x080)
+#define VPIF_EMULATION_DISABLE         (0x01)
+
+extern u8 irq_vpif_capture_channel[VPIF_NUM_CHANNELS];
+
+/* inline function to enable/disable channel0 */
+static inline void enable_channel0(int enable)
+{
+       if (enable)
+               regw((regr(VPIF_CH0_CTRL) | (VPIF_CH0_EN)), VPIF_CH0_CTRL);
+       else
+               regw((regr(VPIF_CH0_CTRL) & (~VPIF_CH0_EN)), VPIF_CH0_CTRL);
+}
+
+/* inline function to enable/disable channel1 */
+static inline void enable_channel1(int enable)
+{
+       if (enable)
+               regw((regr(VPIF_CH1_CTRL) | (VPIF_CH1_EN)), VPIF_CH1_CTRL);
+       else
+               regw((regr(VPIF_CH1_CTRL) & (~VPIF_CH1_EN)), VPIF_CH1_CTRL);
+}
+
+/* inline function to enable interrupt for channel0 */
+static inline void channel0_intr_enable(int enable)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&vpif_lock, flags);
+
+       if (enable) {
+               regw((regr(VPIF_INTEN) | 0x10), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | 0x10), VPIF_INTEN_SET);
+
+               regw((regr(VPIF_INTEN) | VPIF_INTEN_FRAME_CH0), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH0),
+                                                       VPIF_INTEN_SET);
+       } else {
+               regw((regr(VPIF_INTEN) & (~VPIF_INTEN_FRAME_CH0)), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH0),
+                                                       VPIF_INTEN_SET);
+       }
+       spin_unlock_irqrestore(&vpif_lock, flags);
+}
+
+/* inline function to enable interrupt for channel1 */
+static inline void channel1_intr_enable(int enable)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&vpif_lock, flags);
+
+       if (enable) {
+               regw((regr(VPIF_INTEN) | 0x10), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | 0x10), VPIF_INTEN_SET);
+
+               regw((regr(VPIF_INTEN) | VPIF_INTEN_FRAME_CH1), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH1),
+                                                       VPIF_INTEN_SET);
+       } else {
+               regw((regr(VPIF_INTEN) & (~VPIF_INTEN_FRAME_CH1)), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH1),
+                                                       VPIF_INTEN_SET);
+       }
+       spin_unlock_irqrestore(&vpif_lock, flags);
+}
+
+/* inline function to set buffer addresses in case of Y/C non mux mode */
+static inline void ch0_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
+                                                unsigned long btm_strt_luma,
+                                                unsigned long top_strt_chroma,
+                                                unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH1_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH1_BTM_STRT_ADD_CHROMA);
+}
+
+/* inline function to set buffer addresses in VPIF registers for video data */
+static inline void ch0_set_videobuf_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH0_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH0_BTM_STRT_ADD_CHROMA);
+}
+
+static inline void ch1_set_videobuf_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+
+       regw(top_strt_luma, VPIF_CH1_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH1_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH1_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH1_BTM_STRT_ADD_CHROMA);
+}
+
+static inline void ch0_set_vbi_addr(unsigned long top_vbi,
+       unsigned long btm_vbi, unsigned long a, unsigned long b)
+{
+       regw(top_vbi, VPIF_CH0_TOP_STRT_ADD_VANC);
+       regw(btm_vbi, VPIF_CH0_BTM_STRT_ADD_VANC);
+}
+
+static inline void ch0_set_hbi_addr(unsigned long top_vbi,
+       unsigned long btm_vbi, unsigned long a, unsigned long b)
+{
+       regw(top_vbi, VPIF_CH0_TOP_STRT_ADD_HANC);
+       regw(btm_vbi, VPIF_CH0_BTM_STRT_ADD_HANC);
+}
+
+static inline void ch1_set_vbi_addr(unsigned long top_vbi,
+       unsigned long btm_vbi, unsigned long a, unsigned long b)
+{
+       regw(top_vbi, VPIF_CH1_TOP_STRT_ADD_VANC);
+       regw(btm_vbi, VPIF_CH1_BTM_STRT_ADD_VANC);
+}
+
+static inline void ch1_set_hbi_addr(unsigned long top_vbi,
+       unsigned long btm_vbi, unsigned long a, unsigned long b)
+{
+       regw(top_vbi, VPIF_CH1_TOP_STRT_ADD_HANC);
+       regw(btm_vbi, VPIF_CH1_BTM_STRT_ADD_HANC);
+}
+
+/* Inline function to enable raw vbi in the given channel */
+static inline void disable_raw_feature(u8 channel_id, u8 index)
+{
+       u32 ctrl_reg;
+       if (0 == channel_id)
+               ctrl_reg = VPIF_CH0_CTRL;
+       else
+               ctrl_reg = VPIF_CH1_CTRL;
+
+       if (1 == index)
+               vpif_clr_bit(ctrl_reg, VPIF_CH_VANC_EN_BIT);
+       else
+               vpif_clr_bit(ctrl_reg, VPIF_CH_HANC_EN_BIT);
+}
+
+static inline void enable_raw_feature(u8 channel_id, u8 index)
+{
+       u32 ctrl_reg;
+       if (0 == channel_id)
+               ctrl_reg = VPIF_CH0_CTRL;
+       else
+               ctrl_reg = VPIF_CH1_CTRL;
+
+       if (1 == index)
+               vpif_set_bit(ctrl_reg, VPIF_CH_VANC_EN_BIT);
+       else
+               vpif_set_bit(ctrl_reg, VPIF_CH_HANC_EN_BIT);
+}
+
+/* inline function to enable/disable channel2 */
+static inline void enable_channel2(int enable)
+{
+       if (enable) {
+               regw((regr(VPIF_CH2_CTRL) | (VPIF_CH2_CLK_EN)), VPIF_CH2_CTRL);
+               regw((regr(VPIF_CH2_CTRL) | (VPIF_CH2_EN)), VPIF_CH2_CTRL);
+       } else {
+               regw((regr(VPIF_CH2_CTRL) & (~VPIF_CH2_CLK_EN)), VPIF_CH2_CTRL);
+               regw((regr(VPIF_CH2_CTRL) & (~VPIF_CH2_EN)), VPIF_CH2_CTRL);
+       }
+}
+
+/* inline function to enable/disable channel3 */
+static inline void enable_channel3(int enable)
+{
+       if (enable) {
+               regw((regr(VPIF_CH3_CTRL) | (VPIF_CH3_CLK_EN)), VPIF_CH3_CTRL);
+               regw((regr(VPIF_CH3_CTRL) | (VPIF_CH3_EN)), VPIF_CH3_CTRL);
+       } else {
+               regw((regr(VPIF_CH3_CTRL) & (~VPIF_CH3_CLK_EN)), VPIF_CH3_CTRL);
+               regw((regr(VPIF_CH3_CTRL) & (~VPIF_CH3_EN)), VPIF_CH3_CTRL);
+       }
+}
+
+/* inline function to enable interrupt for channel2 */
+static inline void channel2_intr_enable(int enable)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&vpif_lock, flags);
+
+       if (enable) {
+               regw((regr(VPIF_INTEN) | 0x10), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | 0x10), VPIF_INTEN_SET);
+               regw((regr(VPIF_INTEN) | VPIF_INTEN_FRAME_CH2), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH2),
+                                                       VPIF_INTEN_SET);
+       } else {
+               regw((regr(VPIF_INTEN) & (~VPIF_INTEN_FRAME_CH2)), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH2),
+                                                       VPIF_INTEN_SET);
+       }
+       spin_unlock_irqrestore(&vpif_lock, flags);
+}
+
+/* inline function to enable interrupt for channel3 */
+static inline void channel3_intr_enable(int enable)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&vpif_lock, flags);
+
+       if (enable) {
+               regw((regr(VPIF_INTEN) | 0x10), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | 0x10), VPIF_INTEN_SET);
+
+               regw((regr(VPIF_INTEN) | VPIF_INTEN_FRAME_CH3), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH3),
+                                                       VPIF_INTEN_SET);
+       } else {
+               regw((regr(VPIF_INTEN) & (~VPIF_INTEN_FRAME_CH3)), VPIF_INTEN);
+               regw((regr(VPIF_INTEN_SET) | VPIF_INTEN_FRAME_CH3),
+                                                       VPIF_INTEN_SET);
+       }
+       spin_unlock_irqrestore(&vpif_lock, flags);
+}
+
+/* inline function to enable raw vbi data for channel2 */
+static inline void channel2_raw_enable(int enable, u8 index)
+{
+       u32 mask;
+
+       if (1 == index)
+               mask = VPIF_CH_VANC_EN_BIT;
+       else
+               mask = VPIF_CH_HANC_EN_BIT;
+
+       if (enable)
+               vpif_set_bit(VPIF_CH2_CTRL, mask);
+       else
+               vpif_clr_bit(VPIF_CH2_CTRL, mask);
+}
+
+/* inline function to enable raw vbi data for channel3*/
+static inline void channel3_raw_enable(int enable, u8 index)
+{
+       u32 mask;
+
+       if (1 == index)
+               mask = VPIF_CH_VANC_EN_BIT;
+       else
+               mask = VPIF_CH_HANC_EN_BIT;
+
+       if (enable)
+               vpif_set_bit(VPIF_CH3_CTRL, mask);
+       else
+               vpif_clr_bit(VPIF_CH3_CTRL, mask);
+}
+
+/* inline function to set buffer addresses in case of Y/C non mux mode */
+static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
+                                                unsigned long btm_strt_luma,
+                                                unsigned long top_strt_chroma,
+                                                unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH3_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH3_BTM_STRT_ADD_CHROMA);
+}
+
+/* inline function to set buffer addresses in VPIF registers for video data */
+static inline void ch2_set_videobuf_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH2_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH2_BTM_STRT_ADD_CHROMA);
+}
+
+static inline void ch3_set_videobuf_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_LUMA);
+       regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_LUMA);
+       regw(top_strt_chroma, VPIF_CH3_TOP_STRT_ADD_CHROMA);
+       regw(btm_strt_chroma, VPIF_CH3_BTM_STRT_ADD_CHROMA);
+}
+
+/* inline function to set buffer addresses in VPIF registers for vbi data */
+static inline void ch2_set_vbi_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_VANC);
+       regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_VANC);
+}
+
+static inline void ch3_set_vbi_addr(unsigned long top_strt_luma,
+                                        unsigned long btm_strt_luma,
+                                        unsigned long top_strt_chroma,
+                                        unsigned long btm_strt_chroma)
+{
+       regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_VANC);
+       regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_VANC);
+}
+
+#define VPIF_MAX_NAME  (30)
+
+/* This structure will store size parameters as per the mode selected by user */
+struct vpif_channel_config_params {
+       char name[VPIF_MAX_NAME];       /* Name of the mode */
+       u16 width;                      /* Indicates width of the image */
+       u16 height;                     /* Indicates height of the image */
+       u8 fps;
+       u8 frm_fmt;                     /* Indicates whether this is interlaced
+                                        * or progressive format */
+       u8 ycmux_mode;                  /* Indicates whether this mode requires
+                                        * single or two channels */
+       u16 eav2sav;                    /* length of sav 2 eav */
+       u16 sav2eav;                    /* length of sav 2 eav */
+       u16 l1, l3, l5, l7, l9, l11;    /* Other parameter configurations */
+       u16 vsize;                      /* Vertical size of the image */
+       u8 capture_format;              /* Indicates whether capture format
+                                        * is in BT or in CCD/CMOS */
+       u8  vbi_supported;              /* Indicates whether this mode
+                                        * supports capturing vbi or not */
+       u8 hd_sd;
+       v4l2_std_id stdid;
+};
+
+struct vpif_video_params;
+struct vpif_params;
+struct vpif_vbi_params;
+
+int vpif_set_video_params(struct vpif_params *vpifparams, u8 channel_id);
+void vpif_set_vbi_display_params(struct vpif_vbi_params *vbiparams,
+                                                       u8 channel_id);
+int vpif_channel_getfid(u8 channel_id);
+
+enum data_size {
+       _8BITS = 0,
+       _10BITS,
+       _12BITS,
+};
+
+/* Structure for vpif parameters for raw vbi data */
+struct vpif_vbi_params {
+       __u32 hstart0;  /* Horizontal start of raw vbi data for first field */
+       __u32 vstart0;  /* Vertical start of raw vbi data for first field */
+       __u32 hsize0;   /* Horizontal size of raw vbi data for first field */
+       __u32 vsize0;   /* Vertical size of raw vbi data for first field */
+       __u32 hstart1;  /* Horizontal start of raw vbi data for second field */
+       __u32 vstart1;  /* Vertical start of raw vbi data for second field */
+       __u32 hsize1;   /* Horizontal size of raw vbi data for second field */
+       __u32 vsize1;   /* Vertical size of raw vbi data for second field */
+};
+
+/* structure for vpif parameters */
+struct vpif_video_params {
+       __u8 storage_mode;      /* Indicates field or frame mode */
+       unsigned long hpitch;
+       v4l2_std_id stdid;
+};
+
+struct vpif_params {
+       struct vpif_interface iface;
+       struct vpif_video_params video_params;
+       struct vpif_channel_config_params std_info;
+       union param {
+               struct vpif_vbi_params  vbi_params;
+               enum data_size data_sz;
+       } params;
+};
+
+#endif                         /* End of #ifndef VPIF_H */
+
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
new file mode 100644 (file)
index 0000000..d947ee5
--- /dev/null
@@ -0,0 +1,2168 @@
+/*
+ * Copyright (C) 2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * TODO : add support for VBI & HBI data service
+ *       add static buffer allocation
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/videodev2.h>
+#include <linux/wait.h>
+#include <linux/time.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/version.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+
+#include "vpif_capture.h"
+#include "vpif.h"
+
+MODULE_DESCRIPTION("TI DaVinci VPIF Capture driver");
+MODULE_LICENSE("GPL");
+
+#define vpif_err(fmt, arg...)  v4l2_err(&vpif_obj.v4l2_dev, fmt, ## arg)
+#define vpif_dbg(level, debug, fmt, arg...)    \
+               v4l2_dbg(level, debug, &vpif_obj.v4l2_dev, fmt, ## arg)
+
+static int debug = 1;
+static u32 ch0_numbuffers = 3;
+static u32 ch1_numbuffers = 3;
+static u32 ch0_bufsize = 1920 * 1080 * 2;
+static u32 ch1_bufsize = 720 * 576 * 2;
+
+module_param(debug, int, 0644);
+module_param(ch0_numbuffers, uint, S_IRUGO);
+module_param(ch1_numbuffers, uint, S_IRUGO);
+module_param(ch0_bufsize, uint, S_IRUGO);
+module_param(ch1_bufsize, uint, S_IRUGO);
+
+MODULE_PARM_DESC(debug, "Debug level 0-1");
+MODULE_PARM_DESC(ch2_numbuffers, "Channel0 buffer count (default:3)");
+MODULE_PARM_DESC(ch3_numbuffers, "Channel1 buffer count (default:3)");
+MODULE_PARM_DESC(ch2_bufsize, "Channel0 buffer size (default:1920 x 1080 x 2)");
+MODULE_PARM_DESC(ch3_bufsize, "Channel1 buffer size (default:720 x 576 x 2)");
+
+static struct vpif_config_params config_params = {
+       .min_numbuffers = 3,
+       .numbuffers[0] = 3,
+       .numbuffers[1] = 3,
+       .min_bufsize[0] = 720 * 480 * 2,
+       .min_bufsize[1] = 720 * 480 * 2,
+       .channel_bufsize[0] = 1920 * 1080 * 2,
+       .channel_bufsize[1] = 720 * 576 * 2,
+};
+
+/* global variables */
+static struct vpif_device vpif_obj = { {NULL} };
+static struct device *vpif_dev;
+
+/**
+ * ch_params: video standard configuration parameters for vpif
+ */
+static const struct vpif_channel_config_params ch_params[] = {
+       {
+               "NTSC_M", 720, 480, 30, 0, 1, 268, 1440, 1, 23, 263, 266,
+               286, 525, 525, 0, 1, 0, V4L2_STD_525_60,
+       },
+       {
+               "PAL_BDGHIK", 720, 576, 25, 0, 1, 280, 1440, 1, 23, 311, 313,
+               336, 624, 625, 0, 1, 0, V4L2_STD_625_50,
+       },
+};
+
+/**
+ * vpif_uservirt_to_phys : translate user/virtual address to phy address
+ * @virtp: user/virtual address
+ *
+ * This inline function is used to convert user space virtual address to
+ * physical address.
+ */
+static inline u32 vpif_uservirt_to_phys(u32 virtp)
+{
+       unsigned long physp = 0;
+       struct mm_struct *mm = current->mm;
+       struct vm_area_struct *vma;
+
+       vma = find_vma(mm, virtp);
+
+       /* For kernel direct-mapped memory, take the easy way */
+       if (virtp >= PAGE_OFFSET)
+               physp = virt_to_phys((void *)virtp);
+       else if (vma && (vma->vm_flags & VM_IO) && (vma->vm_pgoff))
+               /**
+                * this will catch, kernel-allocated, mmaped-to-usermode
+                * addresses
+                */
+               physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
+       else {
+               /* otherwise, use get_user_pages() for general userland pages */
+               int res, nr_pages = 1;
+                       struct page *pages;
+
+               down_read(&current->mm->mmap_sem);
+
+               res = get_user_pages(current, current->mm,
+                                    virtp, nr_pages, 1, 0, &pages, NULL);
+               up_read(&current->mm->mmap_sem);
+
+               if (res == nr_pages)
+                       physp = __pa(page_address(&pages[0]) +
+                                    (virtp & ~PAGE_MASK));
+               else {
+                       vpif_err("get_user_pages failed\n");
+                       return 0;
+               }
+       }
+       return physp;
+}
+
+/**
+ * buffer_prepare :  callback function for buffer prepare
+ * @q : buffer queue ptr
+ * @vb: ptr to video buffer
+ * @field: field info
+ *
+ * This is the callback function for buffer prepare when videobuf_qbuf()
+ * function is called. The buffer is prepared and user space virtual address
+ * or user address is converted into  physical address
+ */
+static int vpif_buffer_prepare(struct videobuf_queue *q,
+                              struct videobuf_buffer *vb,
+                              enum v4l2_field field)
+{
+       /* Get the file handle object and channel object */
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+       unsigned long addr;
+
+
+       vpif_dbg(2, debug, "vpif_buffer_prepare\n");
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       /* If buffer is not initialized, initialize it */
+       if (VIDEOBUF_NEEDS_INIT == vb->state) {
+               vb->width = common->width;
+               vb->height = common->height;
+               vb->size = vb->width * vb->height;
+               vb->field = field;
+       }
+       vb->state = VIDEOBUF_PREPARED;
+       /**
+        * if user pointer memory mechanism is used, get the physical
+        * address of the buffer
+        */
+       if (V4L2_MEMORY_USERPTR == common->memory) {
+               if (0 == vb->baddr) {
+                       vpif_dbg(1, debug, "buffer address is 0\n");
+                       return -EINVAL;
+
+               }
+               vb->boff = vpif_uservirt_to_phys(vb->baddr);
+               if (!IS_ALIGNED(vb->boff, 8))
+                       goto exit;
+       }
+
+       addr = vb->boff;
+       if (q->streaming) {
+               if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
+                   !IS_ALIGNED((addr + common->ybtm_off), 8) ||
+                   !IS_ALIGNED((addr + common->ctop_off), 8) ||
+                   !IS_ALIGNED((addr + common->cbtm_off), 8))
+                       goto exit;
+       }
+       return 0;
+exit:
+       vpif_dbg(1, debug, "buffer_prepare:offset is not aligned to 8 bytes\n");
+       return -EINVAL;
+}
+
+/**
+ * vpif_buffer_setup : Callback function for buffer setup.
+ * @q: buffer queue ptr
+ * @count: number of buffers
+ * @size: size of the buffer
+ *
+ * This callback function is called when reqbuf() is called to adjust
+ * the buffer count and buffer size
+ */
+static int vpif_buffer_setup(struct videobuf_queue *q, unsigned int *count,
+                            unsigned int *size)
+{
+       /* Get the file handle object and channel object */
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       vpif_dbg(2, debug, "vpif_buffer_setup\n");
+
+       /* If memory type is not mmap, return */
+       if (V4L2_MEMORY_MMAP != common->memory)
+               return 0;
+
+       /* Calculate the size of the buffer */
+       *size = config_params.channel_bufsize[ch->channel_id];
+
+       if (*count < config_params.min_numbuffers)
+               *count = config_params.min_numbuffers;
+       return 0;
+}
+
+/**
+ * vpif_buffer_queue : Callback function to add buffer to DMA queue
+ * @q: ptr to videobuf_queue
+ * @vb: ptr to videobuf_buffer
+ */
+static void vpif_buffer_queue(struct videobuf_queue *q,
+                             struct videobuf_buffer *vb)
+{
+       /* Get the file handle object and channel object */
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       vpif_dbg(2, debug, "vpif_buffer_queue\n");
+
+       /* add the buffer to the DMA queue */
+       list_add_tail(&vb->queue, &common->dma_queue);
+       /* Change state of the buffer */
+       vb->state = VIDEOBUF_QUEUED;
+}
+
+/**
+ * vpif_buffer_release : Callback function to free buffer
+ * @q: buffer queue ptr
+ * @vb: ptr to video buffer
+ *
+ * This function is called from the videobuf layer to free memory
+ * allocated to  the buffers
+ */
+static void vpif_buffer_release(struct videobuf_queue *q,
+                               struct videobuf_buffer *vb)
+{
+       /* Get the file handle object and channel object */
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       videobuf_dma_contig_free(q, vb);
+       vb->state = VIDEOBUF_NEEDS_INIT;
+}
+
+static struct videobuf_queue_ops video_qops = {
+       .buf_setup = vpif_buffer_setup,
+       .buf_prepare = vpif_buffer_prepare,
+       .buf_queue = vpif_buffer_queue,
+       .buf_release = vpif_buffer_release,
+};
+
+static u8 channel_first_int[VPIF_NUMBER_OF_OBJECTS][2] =
+       { {1, 1} };
+
+/**
+ * vpif_process_buffer_complete: process a completed buffer
+ * @common: ptr to common channel object
+ *
+ * This function time stamp the buffer and mark it as DONE. It also
+ * wake up any process waiting on the QUEUE and set the next buffer
+ * as current
+ */
+static void vpif_process_buffer_complete(struct common_obj *common)
+{
+       do_gettimeofday(&common->cur_frm->ts);
+       common->cur_frm->state = VIDEOBUF_DONE;
+       wake_up_interruptible(&common->cur_frm->done);
+       /* Make curFrm pointing to nextFrm */
+       common->cur_frm = common->next_frm;
+}
+
+/**
+ * vpif_schedule_next_buffer: set next buffer address for capture
+ * @common : ptr to common channel object
+ *
+ * This function will get next buffer from the dma queue and
+ * set the buffer address in the vpif register for capture.
+ * the buffer is marked active
+ */
+static void vpif_schedule_next_buffer(struct common_obj *common)
+{
+       unsigned long addr = 0;
+
+       common->next_frm = list_entry(common->dma_queue.next,
+                                    struct videobuf_buffer, queue);
+       /* Remove that buffer from the buffer queue */
+       list_del(&common->next_frm->queue);
+       common->next_frm->state = VIDEOBUF_ACTIVE;
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               addr = common->next_frm->boff;
+       else
+               addr = videobuf_to_dma_contig(common->next_frm);
+
+       /* Set top and bottom field addresses in VPIF registers */
+       common->set_addr(addr + common->ytop_off,
+                        addr + common->ybtm_off,
+                        addr + common->ctop_off,
+                        addr + common->cbtm_off);
+}
+
+/**
+ * vpif_channel_isr : ISR handler for vpif capture
+ * @irq: irq number
+ * @dev_id: dev_id ptr
+ *
+ * It changes status of the captured buffer, takes next buffer from the queue
+ * and sets its address in VPIF  registers
+ */
+static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
+{
+       struct vpif_device *dev = &vpif_obj;
+       struct common_obj *common;
+       struct channel_obj *ch;
+       enum v4l2_field field;
+       int channel_id = 0;
+       int fid = -1, i;
+
+       channel_id = *(int *)(dev_id);
+       ch = dev->dev[channel_id];
+
+       field = ch->common[VPIF_VIDEO_INDEX].fmt.fmt.pix.field;
+
+       for (i = 0; i < VPIF_NUMBER_OF_OBJECTS; i++) {
+               common = &ch->common[i];
+               /* skip If streaming is not started in this channel */
+               if (0 == common->started)
+                       continue;
+
+               /* Check the field format */
+               if (1 == ch->vpifparams.std_info.frm_fmt) {
+                       /* Progressive mode */
+                       if (list_empty(&common->dma_queue))
+                               continue;
+
+                       if (!channel_first_int[i][channel_id])
+                               vpif_process_buffer_complete(common);
+
+                       channel_first_int[i][channel_id] = 0;
+
+                       vpif_schedule_next_buffer(common);
+
+
+                       channel_first_int[i][channel_id] = 0;
+               } else {
+                       /**
+                        * Interlaced mode. If it is first interrupt, ignore
+                        * it
+                        */
+                       if (channel_first_int[i][channel_id]) {
+                               channel_first_int[i][channel_id] = 0;
+                               continue;
+                       }
+                       if (0 == i) {
+                               ch->field_id ^= 1;
+                               /* Get field id from VPIF registers */
+                               fid = vpif_channel_getfid(ch->channel_id);
+                               if (fid != ch->field_id) {
+                                       /**
+                                        * If field id does not match stored
+                                        * field id, make them in sync
+                                        */
+                                       if (0 == fid)
+                                               ch->field_id = fid;
+                                       return IRQ_HANDLED;
+                               }
+                       }
+                       /* device field id and local field id are in sync */
+                       if (0 == fid) {
+                               /* this is even field */
+                               if (common->cur_frm == common->next_frm)
+                                       continue;
+
+                               /* mark the current buffer as done */
+                               vpif_process_buffer_complete(common);
+                       } else if (1 == fid) {
+                               /* odd field */
+                               if (list_empty(&common->dma_queue) ||
+                                   (common->cur_frm != common->next_frm))
+                                       continue;
+
+                               vpif_schedule_next_buffer(common);
+                       }
+               }
+       }
+       return IRQ_HANDLED;
+}
+
+/**
+ * vpif_update_std_info() - update standard related info
+ * @ch: ptr to channel object
+ *
+ * For a given standard selected by application, update values
+ * in the device data structures
+ */
+static int vpif_update_std_info(struct channel_obj *ch)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct vpif_params *vpifparams = &ch->vpifparams;
+       const struct vpif_channel_config_params *config;
+       struct vpif_channel_config_params *std_info;
+       struct video_obj *vid_ch = &ch->video;
+       int index;
+
+       vpif_dbg(2, debug, "vpif_update_std_info\n");
+
+       std_info = &vpifparams->std_info;
+
+       for (index = 0; index < ARRAY_SIZE(ch_params); index++) {
+               config = &ch_params[index];
+               if (config->stdid & vid_ch->stdid) {
+                       memcpy(std_info, config, sizeof(*config));
+                       break;
+               }
+       }
+
+       /* standard not found */
+       if (index == ARRAY_SIZE(ch_params))
+               return -EINVAL;
+
+       common->fmt.fmt.pix.width = std_info->width;
+       common->width = std_info->width;
+       common->fmt.fmt.pix.height = std_info->height;
+       common->height = std_info->height;
+       common->fmt.fmt.pix.bytesperline = std_info->width;
+       vpifparams->video_params.hpitch = std_info->width;
+       vpifparams->video_params.storage_mode = std_info->frm_fmt;
+       return 0;
+}
+
+/**
+ * vpif_calculate_offsets : This function calculates buffers offsets
+ * @ch : ptr to channel object
+ *
+ * This function calculates buffer offsets for Y and C in the top and
+ * bottom field
+ */
+static void vpif_calculate_offsets(struct channel_obj *ch)
+{
+       unsigned int hpitch, vpitch, sizeimage;
+       struct video_obj *vid_ch = &(ch->video);
+       struct vpif_params *vpifparams = &ch->vpifparams;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       enum v4l2_field field = common->fmt.fmt.pix.field;
+
+       vpif_dbg(2, debug, "vpif_calculate_offsets\n");
+
+       if (V4L2_FIELD_ANY == field) {
+               if (vpifparams->std_info.frm_fmt)
+                       vid_ch->buf_field = V4L2_FIELD_NONE;
+               else
+                       vid_ch->buf_field = V4L2_FIELD_INTERLACED;
+       } else
+               vid_ch->buf_field = common->fmt.fmt.pix.field;
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               sizeimage = common->fmt.fmt.pix.sizeimage;
+       else
+               sizeimage = config_params.channel_bufsize[ch->channel_id];
+
+       hpitch = common->fmt.fmt.pix.bytesperline;
+       vpitch = sizeimage / (hpitch * 2);
+
+       if ((V4L2_FIELD_NONE == vid_ch->buf_field) ||
+           (V4L2_FIELD_INTERLACED == vid_ch->buf_field)) {
+               /* Calculate offsets for Y top, Y Bottom, C top and C Bottom */
+               common->ytop_off = 0;
+               common->ybtm_off = hpitch;
+               common->ctop_off = sizeimage / 2;
+               common->cbtm_off = sizeimage / 2 + hpitch;
+       } else if (V4L2_FIELD_SEQ_TB == vid_ch->buf_field) {
+               /* Calculate offsets for Y top, Y Bottom, C top and C Bottom */
+               common->ytop_off = 0;
+               common->ybtm_off = sizeimage / 4;
+               common->ctop_off = sizeimage / 2;
+               common->cbtm_off = common->ctop_off + sizeimage / 4;
+       } else if (V4L2_FIELD_SEQ_BT == vid_ch->buf_field) {
+               /* Calculate offsets for Y top, Y Bottom, C top and C Bottom */
+               common->ybtm_off = 0;
+               common->ytop_off = sizeimage / 4;
+               common->cbtm_off = sizeimage / 2;
+               common->ctop_off = common->cbtm_off + sizeimage / 4;
+       }
+       if ((V4L2_FIELD_NONE == vid_ch->buf_field) ||
+           (V4L2_FIELD_INTERLACED == vid_ch->buf_field))
+               vpifparams->video_params.storage_mode = 1;
+       else
+               vpifparams->video_params.storage_mode = 0;
+
+       if (1 == vpifparams->std_info.frm_fmt)
+               vpifparams->video_params.hpitch =
+                   common->fmt.fmt.pix.bytesperline;
+       else {
+               if ((field == V4L2_FIELD_ANY)
+                   || (field == V4L2_FIELD_INTERLACED))
+                       vpifparams->video_params.hpitch =
+                           common->fmt.fmt.pix.bytesperline * 2;
+               else
+                       vpifparams->video_params.hpitch =
+                           common->fmt.fmt.pix.bytesperline;
+       }
+
+       ch->vpifparams.video_params.stdid = vpifparams->std_info.stdid;
+}
+
+/**
+ * vpif_config_format: configure default frame format in the device
+ * ch : ptr to channel object
+ */
+static void vpif_config_format(struct channel_obj *ch)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       vpif_dbg(2, debug, "vpif_config_format\n");
+
+       common->fmt.fmt.pix.field = V4L2_FIELD_ANY;
+       if (config_params.numbuffers[ch->channel_id] == 0)
+               common->memory = V4L2_MEMORY_USERPTR;
+       else
+               common->memory = V4L2_MEMORY_MMAP;
+
+       common->fmt.fmt.pix.sizeimage
+           = config_params.channel_bufsize[ch->channel_id];
+
+       if (ch->vpifparams.iface.if_type == VPIF_IF_RAW_BAYER)
+               common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
+       else
+               common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;
+       common->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+}
+
+/**
+ * vpif_get_default_field() - Get default field type based on interface
+ * @vpif_params - ptr to vpif params
+ */
+static inline enum v4l2_field vpif_get_default_field(
+                               struct vpif_interface *iface)
+{
+       return (iface->if_type == VPIF_IF_RAW_BAYER) ? V4L2_FIELD_NONE :
+                                               V4L2_FIELD_INTERLACED;
+}
+
+/**
+ * vpif_check_format()  - check given pixel format for compatibility
+ * @ch - channel  ptr
+ * @pixfmt - Given pixel format
+ * @update - update the values as per hardware requirement
+ *
+ * Check the application pixel format for S_FMT and update the input
+ * values as per hardware limits for TRY_FMT. The default pixel and
+ * field format is selected based on interface type.
+ */
+static int vpif_check_format(struct channel_obj *ch,
+                            struct v4l2_pix_format *pixfmt,
+                            int update)
+{
+       struct common_obj *common = &(ch->common[VPIF_VIDEO_INDEX]);
+       struct vpif_params *vpif_params = &ch->vpifparams;
+       enum v4l2_field field = pixfmt->field;
+       u32 sizeimage, hpitch, vpitch;
+       int ret = -EINVAL;
+
+       vpif_dbg(2, debug, "vpif_check_format\n");
+       /**
+        * first check for the pixel format. If if_type is Raw bayer,
+        * only V4L2_PIX_FMT_SBGGR8 format is supported. Otherwise only
+        * V4L2_PIX_FMT_YUV422P is supported
+        */
+       if (vpif_params->iface.if_type == VPIF_IF_RAW_BAYER) {
+               if (pixfmt->pixelformat != V4L2_PIX_FMT_SBGGR8) {
+                       if (!update) {
+                               vpif_dbg(2, debug, "invalid pix format\n");
+                               goto exit;
+                       }
+                       pixfmt->pixelformat = V4L2_PIX_FMT_SBGGR8;
+               }
+       } else {
+               if (pixfmt->pixelformat != V4L2_PIX_FMT_YUV422P) {
+                       if (!update) {
+                               vpif_dbg(2, debug, "invalid pixel format\n");
+                               goto exit;
+                       }
+                       pixfmt->pixelformat = V4L2_PIX_FMT_YUV422P;
+               }
+       }
+
+       if (!(VPIF_VALID_FIELD(field))) {
+               if (!update) {
+                       vpif_dbg(2, debug, "invalid field format\n");
+                       goto exit;
+               }
+               /**
+                * By default use FIELD_NONE for RAW Bayer capture
+                * and FIELD_INTERLACED for other interfaces
+                */
+               field = vpif_get_default_field(&vpif_params->iface);
+       } else if (field == V4L2_FIELD_ANY)
+               /* unsupported field. Use default */
+               field = vpif_get_default_field(&vpif_params->iface);
+
+       /* validate the hpitch */
+       hpitch = pixfmt->bytesperline;
+       if (hpitch < vpif_params->std_info.width) {
+               if (!update) {
+                       vpif_dbg(2, debug, "invalid hpitch\n");
+                       goto exit;
+               }
+               hpitch = vpif_params->std_info.width;
+       }
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               sizeimage = pixfmt->sizeimage;
+       else
+               sizeimage = config_params.channel_bufsize[ch->channel_id];
+
+       vpitch = sizeimage / (hpitch * 2);
+
+       /* validate the vpitch */
+       if (vpitch < vpif_params->std_info.height) {
+               if (!update) {
+                       vpif_dbg(2, debug, "Invalid vpitch\n");
+                       goto exit;
+               }
+               vpitch = vpif_params->std_info.height;
+       }
+
+       /* Check for 8 byte alignment */
+       if (!ALIGN(hpitch, 8)) {
+               if (!update) {
+                       vpif_dbg(2, debug, "invalid pitch alignment\n");
+                       goto exit;
+               }
+               /* adjust to next 8 byte boundary */
+               hpitch = (((hpitch + 7) / 8) * 8);
+       }
+       /* if update is set, modify the bytesperline and sizeimage */
+       if (update) {
+               pixfmt->bytesperline = hpitch;
+               pixfmt->sizeimage = hpitch * vpitch * 2;
+       }
+       /**
+        * Image width and height is always based on current standard width and
+        * height
+        */
+       pixfmt->width = common->fmt.fmt.pix.width;
+       pixfmt->height = common->fmt.fmt.pix.height;
+       return 0;
+exit:
+       return ret;
+}
+
+/**
+ * vpif_config_addr() - function to configure buffer address in vpif
+ * @ch - channel ptr
+ * @muxmode - channel mux mode
+ */
+static void vpif_config_addr(struct channel_obj *ch, int muxmode)
+{
+       struct common_obj *common;
+
+       vpif_dbg(2, debug, "vpif_config_addr\n");
+
+       common = &(ch->common[VPIF_VIDEO_INDEX]);
+
+       if (VPIF_CHANNEL1_VIDEO == ch->channel_id)
+               common->set_addr = ch1_set_videobuf_addr;
+       else if (2 == muxmode)
+               common->set_addr = ch0_set_videobuf_addr_yc_nmux;
+       else
+               common->set_addr = ch0_set_videobuf_addr;
+}
+
+/**
+ * vpfe_mmap : It is used to map kernel space buffers into user spaces
+ * @filep: file pointer
+ * @vma: ptr to vm_area_struct
+ */
+static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
+{
+       /* Get the channel object and file handle object */
+       struct vpif_fh *fh = filep->private_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &(ch->common[VPIF_VIDEO_INDEX]);
+
+       vpif_dbg(2, debug, "vpif_mmap\n");
+
+       return videobuf_mmap_mapper(&common->buffer_queue, vma);
+}
+
+/**
+ * vpif_poll: It is used for select/poll system call
+ * @filep: file pointer
+ * @wait: poll table to wait
+ */
+static unsigned int vpif_poll(struct file *filep, poll_table * wait)
+{
+       int err = 0;
+       struct vpif_fh *fh = filep->private_data;
+       struct channel_obj *channel = fh->channel;
+       struct common_obj *common = &(channel->common[VPIF_VIDEO_INDEX]);
+
+       vpif_dbg(2, debug, "vpif_poll\n");
+
+       if (common->started)
+               err = videobuf_poll_stream(filep, &common->buffer_queue, wait);
+
+       return 0;
+}
+
+/**
+ * vpif_open : vpif open handler
+ * @filep: file ptr
+ *
+ * It creates object of file handle structure and stores it in private_data
+ * member of filepointer
+ */
+static int vpif_open(struct file *filep)
+{
+       struct vpif_capture_config *config = vpif_dev->platform_data;
+       struct video_device *vdev = video_devdata(filep);
+       struct common_obj *common;
+       struct video_obj *vid_ch;
+       struct channel_obj *ch;
+       struct vpif_fh *fh;
+       int i, ret = 0;
+
+       vpif_dbg(2, debug, "vpif_open\n");
+
+       ch = video_get_drvdata(vdev);
+
+       vid_ch = &ch->video;
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (NULL == ch->curr_subdev_info) {
+               /**
+                * search through the sub device to see a registered
+                * sub device and make it as current sub device
+                */
+               for (i = 0; i < config->subdev_count; i++) {
+                       if (vpif_obj.sd[i]) {
+                               /* the sub device is registered */
+                               ch->curr_subdev_info = &config->subdev_info[i];
+                               /* make first input as the current input */
+                               vid_ch->input_idx = 0;
+                               break;
+                       }
+               }
+               if (i == config->subdev_count) {
+                       vpif_err("No sub device registered\n");
+                       ret = -ENOENT;
+                       goto exit;
+               }
+       }
+
+       /* Allocate memory for the file handle object */
+       fh = kmalloc(sizeof(struct vpif_fh), GFP_KERNEL);
+       if (NULL == fh) {
+               vpif_err("unable to allocate memory for file handle object\n");
+               ret = -ENOMEM;
+               goto exit;
+       }
+
+       /* store pointer to fh in private_data member of filep */
+       filep->private_data = fh;
+       fh->channel = ch;
+       fh->initialized = 0;
+       /* If decoder is not initialized. initialize it */
+       if (!ch->initialized) {
+               fh->initialized = 1;
+               ch->initialized = 1;
+               memset(&(ch->vpifparams), 0, sizeof(struct vpif_params));
+       }
+       /* Increment channel usrs counter */
+       ch->usrs++;
+       /* Set io_allowed member to false */
+       fh->io_allowed[VPIF_VIDEO_INDEX] = 0;
+       /* Initialize priority of this instance to default priority */
+       fh->prio = V4L2_PRIORITY_UNSET;
+       v4l2_prio_open(&ch->prio, &fh->prio);
+exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+/**
+ * vpif_release : function to clean up file close
+ * @filep: file pointer
+ *
+ * This function deletes buffer queue, frees the buffers and the vpfe file
+ * handle
+ */
+static int vpif_release(struct file *filep)
+{
+       struct vpif_fh *fh = filep->private_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+
+       vpif_dbg(2, debug, "vpif_release\n");
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* if this instance is doing IO */
+       if (fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               /* Reset io_usrs member of channel object */
+               common->io_usrs = 0;
+               /* Disable channel as per its device type and channel id */
+               if (VPIF_CHANNEL0_VIDEO == ch->channel_id) {
+                       enable_channel0(0);
+                       channel0_intr_enable(0);
+               }
+               if ((VPIF_CHANNEL1_VIDEO == ch->channel_id) ||
+                   (2 == common->started)) {
+                       enable_channel1(0);
+                       channel1_intr_enable(0);
+               }
+               common->started = 0;
+               /* Free buffers allocated */
+               videobuf_queue_cancel(&common->buffer_queue);
+               videobuf_mmap_free(&common->buffer_queue);
+       }
+
+       /* Decrement channel usrs counter */
+       ch->usrs--;
+
+       /* unlock mutex on channel object */
+       mutex_unlock(&common->lock);
+
+       /* Close the priority */
+       v4l2_prio_close(&ch->prio, &fh->prio);
+
+       if (fh->initialized)
+               ch->initialized = 0;
+
+       filep->private_data = NULL;
+       kfree(fh);
+       return 0;
+}
+
+/**
+ * vpif_reqbufs() - request buffer handler
+ * @file: file ptr
+ * @priv: file handle
+ * @reqbuf: request buffer structure ptr
+ */
+static int vpif_reqbufs(struct file *file, void *priv,
+                       struct v4l2_requestbuffers *reqbuf)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+       u8 index = 0;
+       int ret = 0;
+
+       vpif_dbg(2, debug, "vpif_reqbufs\n");
+
+       /**
+        * This file handle has not initialized the channel,
+        * It is not allowed to do settings
+        */
+       if ((VPIF_CHANNEL0_VIDEO == ch->channel_id)
+           || (VPIF_CHANNEL1_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_dbg(1, debug, "Channel Busy\n");
+                       return -EBUSY;
+               }
+       }
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != reqbuf->type)
+               return -EINVAL;
+
+       index = VPIF_VIDEO_INDEX;
+
+       common = &ch->common[index];
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (0 != common->io_usrs) {
+               ret = -EBUSY;
+               goto reqbuf_exit;
+       }
+
+       /* Initialize videobuf queue as per the buffer type */
+       videobuf_queue_dma_contig_init(&common->buffer_queue,
+                                           &video_qops, NULL,
+                                           &common->irqlock,
+                                           reqbuf->type,
+                                           common->fmt.fmt.pix.field,
+                                           sizeof(struct videobuf_buffer), fh);
+
+       /* Set io allowed member of file handle to TRUE */
+       fh->io_allowed[index] = 1;
+       /* Increment io usrs member of channel object to 1 */
+       common->io_usrs = 1;
+       /* Store type of memory requested in channel object */
+       common->memory = reqbuf->memory;
+       INIT_LIST_HEAD(&common->dma_queue);
+
+       /* Allocate buffers */
+       ret = videobuf_reqbufs(&common->buffer_queue, reqbuf);
+
+reqbuf_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+/**
+ * vpif_querybuf() - query buffer handler
+ * @file: file ptr
+ * @priv: file handle
+ * @buf: v4l2 buffer structure ptr
+ */
+static int vpif_querybuf(struct file *file, void *priv,
+                               struct v4l2_buffer *buf)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       vpif_dbg(2, debug, "vpif_querybuf\n");
+
+       if (common->fmt.type != buf->type)
+               return -EINVAL;
+
+       if (common->memory != V4L2_MEMORY_MMAP) {
+               vpif_dbg(1, debug, "Invalid memory\n");
+               return -EINVAL;
+       }
+
+       return videobuf_querybuf(&common->buffer_queue, buf);
+}
+
+/**
+ * vpif_qbuf() - query buffer handler
+ * @file: file ptr
+ * @priv: file handle
+ * @buf: v4l2 buffer structure ptr
+ */
+static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct v4l2_buffer tbuf = *buf;
+       struct videobuf_buffer *buf1;
+       unsigned long addr = 0;
+       unsigned long flags;
+       int ret = 0;
+
+       vpif_dbg(2, debug, "vpif_qbuf\n");
+
+       if (common->fmt.type != tbuf.type) {
+               vpif_err("invalid buffer type\n");
+               return -EINVAL;
+       }
+
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_err("fh io not allowed \n");
+               return -EACCES;
+       }
+
+       if (!(list_empty(&common->dma_queue)) ||
+           (common->cur_frm != common->next_frm) ||
+           !common->started ||
+           (common->started && (0 == ch->field_id)))
+               return videobuf_qbuf(&common->buffer_queue, buf);
+
+       /* bufferqueue is empty store buffer address in VPIF registers */
+       mutex_lock(&common->buffer_queue.vb_lock);
+       buf1 = common->buffer_queue.bufs[tbuf.index];
+
+       if ((buf1->state == VIDEOBUF_QUEUED) ||
+           (buf1->state == VIDEOBUF_ACTIVE)) {
+               vpif_err("invalid state\n");
+               goto qbuf_exit;
+       }
+
+       switch (buf1->memory) {
+       case V4L2_MEMORY_MMAP:
+               if (buf1->baddr == 0)
+                       goto qbuf_exit;
+               break;
+
+       case V4L2_MEMORY_USERPTR:
+               if (tbuf.length < buf1->bsize)
+                       goto qbuf_exit;
+
+               if ((VIDEOBUF_NEEDS_INIT != buf1->state)
+                           && (buf1->baddr != tbuf.m.userptr))
+                       vpif_buffer_release(&common->buffer_queue, buf1);
+                       buf1->baddr = tbuf.m.userptr;
+               break;
+
+       default:
+               goto qbuf_exit;
+       }
+
+       local_irq_save(flags);
+       ret = vpif_buffer_prepare(&common->buffer_queue, buf1,
+                                       common->buffer_queue.field);
+       if (ret < 0) {
+               local_irq_restore(flags);
+               goto qbuf_exit;
+       }
+
+       buf1->state = VIDEOBUF_ACTIVE;
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               addr = buf1->boff;
+       else
+               addr = videobuf_to_dma_contig(buf1);
+
+       common->next_frm = buf1;
+       common->set_addr(addr + common->ytop_off,
+                        addr + common->ybtm_off,
+                        addr + common->ctop_off,
+                        addr + common->cbtm_off);
+
+       local_irq_restore(flags);
+       list_add_tail(&buf1->stream, &common->buffer_queue.stream);
+       mutex_unlock(&common->buffer_queue.vb_lock);
+       return 0;
+
+qbuf_exit:
+       mutex_unlock(&common->buffer_queue.vb_lock);
+       return -EINVAL;
+}
+
+/**
+ * vpif_dqbuf() - query buffer handler
+ * @file: file ptr
+ * @priv: file handle
+ * @buf: v4l2 buffer structure ptr
+ */
+static int vpif_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       vpif_dbg(2, debug, "vpif_dqbuf\n");
+
+       return videobuf_dqbuf(&common->buffer_queue, buf,
+                                       file->f_flags & O_NONBLOCK);
+}
+
+/**
+ * vpif_streamon() - streamon handler
+ * @file: file ptr
+ * @priv: file handle
+ * @buftype: v4l2 buffer type
+ */
+static int vpif_streamon(struct file *file, void *priv,
+                               enum v4l2_buf_type buftype)
+{
+
+       struct vpif_capture_config *config = vpif_dev->platform_data;
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct channel_obj *oth_ch = vpif_obj.dev[!ch->channel_id];
+       struct vpif_params *vpif;
+       unsigned long addr = 0;
+       int ret = 0;
+
+       vpif_dbg(2, debug, "vpif_streamon\n");
+
+       vpif = &ch->vpifparams;
+
+       if (buftype != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               vpif_dbg(1, debug, "buffer type not supported\n");
+               return -EINVAL;
+       }
+
+       /* If file handle is not allowed IO, return error */
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_dbg(1, debug, "io not allowed\n");
+               return -EACCES;
+       }
+
+       /* If Streaming is already started, return error */
+       if (common->started) {
+               vpif_dbg(1, debug, "channel->started\n");
+               return -EBUSY;
+       }
+
+       if ((ch->channel_id == VPIF_CHANNEL0_VIDEO &&
+           oth_ch->common[VPIF_VIDEO_INDEX].started &&
+           vpif->std_info.ycmux_mode == 0) ||
+          ((ch->channel_id == VPIF_CHANNEL1_VIDEO) &&
+           (2 == oth_ch->common[VPIF_VIDEO_INDEX].started))) {
+               vpif_dbg(1, debug, "other channel is being used\n");
+               return -EBUSY;
+       }
+
+       ret = vpif_check_format(ch, &common->fmt.fmt.pix, 0);
+       if (ret)
+               return ret;
+
+       /* Enable streamon on the sub device */
+       ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,
+                               s_stream, 1);
+
+       if (ret && (ret != -ENOIOCTLCMD)) {
+               vpif_dbg(1, debug, "stream on failed in subdev\n");
+               return ret;
+       }
+
+       /* Call videobuf_streamon to start streaming in videobuf */
+       ret = videobuf_streamon(&common->buffer_queue);
+       if (ret) {
+               vpif_dbg(1, debug, "videobuf_streamon\n");
+               return ret;
+       }
+
+       if (mutex_lock_interruptible(&common->lock)) {
+               ret = -ERESTARTSYS;
+               goto streamoff_exit;
+       }
+
+       /* If buffer queue is empty, return error */
+       if (list_empty(&common->dma_queue)) {
+               vpif_dbg(1, debug, "buffer queue is empty\n");
+               ret = -EIO;
+               goto exit;
+       }
+
+       /* Get the next frame from the buffer queue */
+       common->cur_frm = list_entry(common->dma_queue.next,
+                                   struct videobuf_buffer, queue);
+       common->next_frm = common->cur_frm;
+
+       /* Remove buffer from the buffer queue */
+       list_del(&common->cur_frm->queue);
+       /* Mark state of the current frame to active */
+       common->cur_frm->state = VIDEOBUF_ACTIVE;
+       /* Initialize field_id and started member */
+       ch->field_id = 0;
+       common->started = 1;
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               addr = common->cur_frm->boff;
+       else
+               addr = videobuf_to_dma_contig(common->cur_frm);
+
+       /* Calculate the offset for Y and C data in the buffer */
+       vpif_calculate_offsets(ch);
+
+       if ((vpif->std_info.frm_fmt &&
+           ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE) &&
+            (common->fmt.fmt.pix.field != V4L2_FIELD_ANY))) ||
+           (!vpif->std_info.frm_fmt &&
+            (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
+               vpif_dbg(1, debug, "conflict in field format and std format\n");
+               ret = -EINVAL;
+               goto exit;
+       }
+
+       /* configure 1 or 2 channel mode */
+       ret = config->setup_input_channel_mode(vpif->std_info.ycmux_mode);
+
+       if (ret < 0) {
+               vpif_dbg(1, debug, "can't set vpif channel mode\n");
+               goto exit;
+       }
+
+       /* Call vpif_set_params function to set the parameters and addresses */
+       ret = vpif_set_video_params(vpif, ch->channel_id);
+
+       if (ret < 0) {
+               vpif_dbg(1, debug, "can't set video params\n");
+               goto exit;
+       }
+
+       common->started = ret;
+       vpif_config_addr(ch, ret);
+
+       common->set_addr(addr + common->ytop_off,
+                        addr + common->ybtm_off,
+                        addr + common->ctop_off,
+                        addr + common->cbtm_off);
+
+       /**
+        * Set interrupt for both the fields in VPIF Register enable channel in
+        * VPIF register
+        */
+       if ((VPIF_CHANNEL0_VIDEO == ch->channel_id)) {
+               channel0_intr_assert();
+               channel0_intr_enable(1);
+               enable_channel0(1);
+       }
+       if ((VPIF_CHANNEL1_VIDEO == ch->channel_id) ||
+           (common->started == 2)) {
+               channel1_intr_assert();
+               channel1_intr_enable(1);
+               enable_channel1(1);
+       }
+       channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
+       mutex_unlock(&common->lock);
+       return ret;
+
+exit:
+       mutex_unlock(&common->lock);
+streamoff_exit:
+       ret = videobuf_streamoff(&common->buffer_queue);
+       return ret;
+}
+
+/**
+ * vpif_streamoff() - streamoff handler
+ * @file: file ptr
+ * @priv: file handle
+ * @buftype: v4l2 buffer type
+ */
+static int vpif_streamoff(struct file *file, void *priv,
+                               enum v4l2_buf_type buftype)
+{
+
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret;
+
+       vpif_dbg(2, debug, "vpif_streamoff\n");
+
+       if (buftype != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               vpif_dbg(1, debug, "buffer type not supported\n");
+               return -EINVAL;
+       }
+
+       /* If io is allowed for this file handle, return error */
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_dbg(1, debug, "io not allowed\n");
+               return -EACCES;
+       }
+
+       /* If streaming is not started, return error */
+       if (!common->started) {
+               vpif_dbg(1, debug, "channel->started\n");
+               return -EINVAL;
+       }
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* disable channel */
+       if (VPIF_CHANNEL0_VIDEO == ch->channel_id) {
+               enable_channel0(0);
+               channel0_intr_enable(0);
+       } else {
+               enable_channel1(0);
+               channel1_intr_enable(0);
+       }
+
+       common->started = 0;
+
+       ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,
+                               s_stream, 0);
+
+       if (ret && (ret != -ENOIOCTLCMD))
+               vpif_dbg(1, debug, "stream off failed in subdev\n");
+
+       mutex_unlock(&common->lock);
+
+       return videobuf_streamoff(&common->buffer_queue);
+}
+
+/**
+ * vpif_map_sub_device_to_input() - Maps sub device to input
+ * @ch - ptr to channel
+ * @config - ptr to capture configuration
+ * @input_index - Given input index from application
+ * @sub_device_index - index into sd table
+ *
+ * lookup the sub device information for a given input index.
+ * we report all the inputs to application. inputs table also
+ * has sub device name for the each input
+ */
+static struct vpif_subdev_info *vpif_map_sub_device_to_input(
+                               struct channel_obj *ch,
+                               struct vpif_capture_config *vpif_cfg,
+                               int input_index,
+                               int *sub_device_index)
+{
+       struct vpif_capture_chan_config *chan_cfg;
+       struct vpif_subdev_info *subdev_info = NULL;
+       const char *subdev_name = NULL;
+       int i;
+
+       vpif_dbg(2, debug, "vpif_map_sub_device_to_input\n");
+
+       chan_cfg = &vpif_cfg->chan_config[ch->channel_id];
+
+       /**
+        * search through the inputs to find the sub device supporting
+        * the input
+        */
+       for (i = 0; i < chan_cfg->input_count; i++) {
+               /* For each sub device, loop through input */
+               if (i == input_index) {
+                       subdev_name = chan_cfg->inputs[i].subdev_name;
+                       break;
+               }
+       }
+
+       /* if reached maximum. return null */
+       if (i == chan_cfg->input_count || (NULL == subdev_name))
+               return subdev_info;
+
+       /* loop through the sub device list to get the sub device info */
+       for (i = 0; i < vpif_cfg->subdev_count; i++) {
+               subdev_info = &vpif_cfg->subdev_info[i];
+               if (!strcmp(subdev_info->name, subdev_name))
+                       break;
+       }
+
+       if (i == vpif_cfg->subdev_count)
+               return subdev_info;
+
+       /* check if the sub device is registered */
+       if (NULL == vpif_obj.sd[i])
+               return NULL;
+
+       *sub_device_index = i;
+       return subdev_info;
+}
+
+/**
+ * vpif_querystd() - querystd handler
+ * @file: file ptr
+ * @priv: file handle
+ * @std_id: ptr to std id
+ *
+ * This function is called to detect standard at the selected input
+ */
+static int vpif_querystd(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret = 0;
+
+       vpif_dbg(2, debug, "vpif_querystd\n");
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* Call querystd function of decoder device */
+       ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,
+                               querystd, std_id);
+       if (ret < 0)
+               vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
+
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+/**
+ * vpif_g_std() - get STD handler
+ * @file: file ptr
+ * @priv: file handle
+ * @std_id: ptr to std id
+ */
+static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       vpif_dbg(2, debug, "vpif_g_std\n");
+
+       *std = ch->video.stdid;
+       return 0;
+}
+
+/**
+ * vpif_s_std() - set STD handler
+ * @file: file ptr
+ * @priv: file handle
+ * @std_id: ptr to std id
+ */
+static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret = 0;
+
+       vpif_dbg(2, debug, "vpif_s_std\n");
+
+       if (common->started) {
+               vpif_err("streaming in progress\n");
+               return -EBUSY;
+       }
+
+       if ((VPIF_CHANNEL0_VIDEO == ch->channel_id) ||
+           (VPIF_CHANNEL1_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_dbg(1, debug, "Channel Busy\n");
+                       return -EBUSY;
+               }
+       }
+
+       ret = v4l2_prio_check(&ch->prio, &fh->prio);
+       if (0 != ret)
+               return ret;
+
+       fh->initialized = 1;
+
+       /* Call encoder subdevice function to set the standard */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       ch->video.stdid = *std_id;
+
+       /* Get the information about the standard */
+       if (vpif_update_std_info(ch)) {
+               ret = -EINVAL;
+               vpif_err("Error getting the standard info\n");
+               goto s_std_exit;
+       }
+
+       /* Configure the default format information */
+       vpif_config_format(ch);
+
+       /* set standard in the sub device */
+       ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,
+                               s_std, *std_id);
+       if (ret < 0)
+               vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
+
+s_std_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+/**
+ * vpif_enum_input() - ENUMINPUT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @input: ptr to input structure
+ */
+static int vpif_enum_input(struct file *file, void *priv,
+                               struct v4l2_input *input)
+{
+
+       struct vpif_capture_config *config = vpif_dev->platform_data;
+       struct vpif_capture_chan_config *chan_cfg;
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       chan_cfg = &config->chan_config[ch->channel_id];
+
+       if (input->index >= chan_cfg->input_count) {
+               vpif_dbg(1, debug, "Invalid input index\n");
+               return -EINVAL;
+       }
+
+       memcpy(input, &chan_cfg->inputs[input->index].input,
+               sizeof(*input));
+       return 0;
+}
+
+/**
+ * vpif_g_input() - Get INPUT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @index: ptr to input index
+ */
+static int vpif_g_input(struct file *file, void *priv, unsigned int *index)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct video_obj *vid_ch = &ch->video;
+
+       *index = vid_ch->input_idx;
+
+       return 0;
+}
+
+/**
+ * vpif_s_input() - Set INPUT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @index: input index
+ */
+static int vpif_s_input(struct file *file, void *priv, unsigned int index)
+{
+       struct vpif_capture_config *config = vpif_dev->platform_data;
+       struct vpif_capture_chan_config *chan_cfg;
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct video_obj *vid_ch = &ch->video;
+       struct vpif_subdev_info *subdev_info;
+       int ret = 0, sd_index = 0;
+       u32 input = 0, output = 0;
+
+       chan_cfg = &config->chan_config[ch->channel_id];
+
+       if (common->started) {
+               vpif_err("Streaming in progress\n");
+               return -EBUSY;
+       }
+
+       if ((VPIF_CHANNEL0_VIDEO == ch->channel_id) ||
+           (VPIF_CHANNEL1_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_dbg(1, debug, "Channel Busy\n");
+                       return -EBUSY;
+               }
+       }
+
+       ret = v4l2_prio_check(&ch->prio, &fh->prio);
+       if (0 != ret)
+               return ret;
+
+       fh->initialized = 1;
+       subdev_info = vpif_map_sub_device_to_input(ch, config, index,
+                                                  &sd_index);
+       if (NULL == subdev_info) {
+               vpif_dbg(1, debug,
+                       "couldn't lookup sub device for the input index\n");
+               return -EINVAL;
+       }
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* first setup input path from sub device to vpif */
+       if (config->setup_input_path) {
+               ret = config->setup_input_path(ch->channel_id,
+                                              subdev_info->name);
+               if (ret < 0) {
+                       vpif_dbg(1, debug, "couldn't setup input path for the"
+                               " sub device %s, for input index %d\n",
+                               subdev_info->name, index);
+                       goto exit;
+               }
+       }
+
+       if (subdev_info->can_route) {
+               input = subdev_info->input;
+               output = subdev_info->output;
+               ret = v4l2_subdev_call(vpif_obj.sd[sd_index], video, s_routing,
+                                       input, output, 0);
+               if (ret < 0) {
+                       vpif_dbg(1, debug, "Failed to set input\n");
+                       goto exit;
+               }
+       }
+       vid_ch->input_idx = index;
+       ch->curr_subdev_info = subdev_info;
+       ch->curr_sd_index = sd_index;
+       /* copy interface parameters to vpif */
+       ch->vpifparams.iface = subdev_info->vpif_if;
+
+       /* update tvnorms from the sub device input info */
+       ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;
+
+exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+/**
+ * vpif_enum_fmt_vid_cap() - ENUM_FMT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @index: input index
+ */
+static int vpif_enum_fmt_vid_cap(struct file *file, void  *priv,
+                                       struct v4l2_fmtdesc *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       if (fmt->index != 0) {
+               vpif_dbg(1, debug, "Invalid format index\n");
+               return -EINVAL;
+       }
+
+       /* Fill in the information about format */
+       if (ch->vpifparams.iface.if_type == VPIF_IF_RAW_BAYER) {
+               fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               strcpy(fmt->description, "Raw Mode -Bayer Pattern GrRBGb");
+               fmt->pixelformat = V4L2_PIX_FMT_SBGGR8;
+       } else {
+               fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               strcpy(fmt->description, "YCbCr4:2:2 YC Planar");
+               fmt->pixelformat = V4L2_PIX_FMT_YUV422P;
+       }
+       return 0;
+}
+
+/**
+ * vpif_try_fmt_vid_cap() - TRY_FMT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @fmt: ptr to v4l2 format structure
+ */
+static int vpif_try_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
+
+       return vpif_check_format(ch, pixfmt, 1);
+}
+
+
+/**
+ * vpif_g_fmt_vid_cap() - Set INPUT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @fmt: ptr to v4l2 format structure
+ */
+static int vpif_g_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       /* Check the validity of the buffer type */
+       if (common->fmt.type != fmt->type)
+               return -EINVAL;
+
+       /* Fill in the information about format */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       *fmt = common->fmt;
+       mutex_unlock(&common->lock);
+       return 0;
+}
+
+/**
+ * vpif_s_fmt_vid_cap() - Set FMT handler
+ * @file: file ptr
+ * @priv: file handle
+ * @fmt: ptr to v4l2 format structure
+ */
+static int vpif_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct v4l2_pix_format *pixfmt;
+       int ret = 0;
+
+       vpif_dbg(2, debug, "VIDIOC_S_FMT\n");
+
+       /* If streaming is started, return error */
+       if (common->started) {
+               vpif_dbg(1, debug, "Streaming is started\n");
+               return -EBUSY;
+       }
+
+       if ((VPIF_CHANNEL0_VIDEO == ch->channel_id) ||
+           (VPIF_CHANNEL1_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_dbg(1, debug, "Channel Busy\n");
+                       return -EBUSY;
+               }
+       }
+
+       ret = v4l2_prio_check(&ch->prio, &fh->prio);
+       if (0 != ret)
+               return ret;
+
+       fh->initialized = 1;
+
+       pixfmt = &fmt->fmt.pix;
+       /* Check for valid field format */
+       ret = vpif_check_format(ch, pixfmt, 0);
+
+       if (ret)
+               return ret;
+       /* store the format in the channel object */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       common->fmt = *fmt;
+       mutex_unlock(&common->lock);
+
+       return 0;
+}
+
+/**
+ * vpif_querycap() - QUERYCAP handler
+ * @file: file ptr
+ * @priv: file handle
+ * @cap: ptr to v4l2_capability structure
+ */
+static int vpif_querycap(struct file *file, void  *priv,
+                               struct v4l2_capability *cap)
+{
+       struct vpif_capture_config *config = vpif_dev->platform_data;
+
+       cap->version = VPIF_CAPTURE_VERSION_CODE;
+       cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+       strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));
+       strlcpy(cap->bus_info, "DM646x Platform", sizeof(cap->bus_info));
+       strlcpy(cap->card, config->card_name, sizeof(cap->card));
+
+       return 0;
+}
+
+/**
+ * vpif_g_priority() - get priority handler
+ * @file: file ptr
+ * @priv: file handle
+ * @prio: ptr to v4l2_priority structure
+ */
+static int vpif_g_priority(struct file *file, void *priv,
+                          enum v4l2_priority *prio)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       *prio = v4l2_prio_max(&ch->prio);
+
+       return 0;
+}
+
+/**
+ * vpif_s_priority() - set priority handler
+ * @file: file ptr
+ * @priv: file handle
+ * @prio: ptr to v4l2_priority structure
+ */
+static int vpif_s_priority(struct file *file, void *priv, enum v4l2_priority p)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       return v4l2_prio_change(&ch->prio, &fh->prio, p);
+}
+
+/**
+ * vpif_cropcap() - cropcap handler
+ * @file: file ptr
+ * @priv: file handle
+ * @crop: ptr to v4l2_cropcap structure
+ */
+static int vpif_cropcap(struct file *file, void *priv,
+                       struct v4l2_cropcap *crop)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != crop->type)
+               return -EINVAL;
+
+       crop->bounds.left = 0;
+       crop->bounds.top = 0;
+       crop->bounds.height = common->height;
+       crop->bounds.width = common->width;
+       crop->defrect = crop->bounds;
+       return 0;
+}
+
+/* vpif capture ioctl operations */
+static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
+       .vidioc_querycap                = vpif_querycap,
+       .vidioc_g_priority              = vpif_g_priority,
+       .vidioc_s_priority              = vpif_s_priority,
+       .vidioc_enum_fmt_vid_cap        = vpif_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap           = vpif_g_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap           = vpif_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap         = vpif_try_fmt_vid_cap,
+       .vidioc_enum_input              = vpif_enum_input,
+       .vidioc_s_input                 = vpif_s_input,
+       .vidioc_g_input                 = vpif_g_input,
+       .vidioc_reqbufs                 = vpif_reqbufs,
+       .vidioc_querybuf                = vpif_querybuf,
+       .vidioc_querystd                = vpif_querystd,
+       .vidioc_s_std                   = vpif_s_std,
+       .vidioc_g_std                   = vpif_g_std,
+       .vidioc_qbuf                    = vpif_qbuf,
+       .vidioc_dqbuf                   = vpif_dqbuf,
+       .vidioc_streamon                = vpif_streamon,
+       .vidioc_streamoff               = vpif_streamoff,
+       .vidioc_cropcap                 = vpif_cropcap,
+};
+
+/* vpif file operations */
+static struct v4l2_file_operations vpif_fops = {
+       .owner = THIS_MODULE,
+       .open = vpif_open,
+       .release = vpif_release,
+       .ioctl = video_ioctl2,
+       .mmap = vpif_mmap,
+       .poll = vpif_poll
+};
+
+/* vpif video template */
+static struct video_device vpif_video_template = {
+       .name           = "vpif",
+       .fops           = &vpif_fops,
+       .minor          = -1,
+       .ioctl_ops      = &vpif_ioctl_ops,
+};
+
+/**
+ * initialize_vpif() - Initialize vpif data structures
+ *
+ * Allocate memory for data structures and initialize them
+ */
+static int initialize_vpif(void)
+{
+       int err = 0, i, j;
+       int free_channel_objects_index;
+
+       /* Default number of buffers should be 3 */
+       if ((ch0_numbuffers > 0) &&
+           (ch0_numbuffers < config_params.min_numbuffers))
+               ch0_numbuffers = config_params.min_numbuffers;
+       if ((ch1_numbuffers > 0) &&
+           (ch1_numbuffers < config_params.min_numbuffers))
+               ch1_numbuffers = config_params.min_numbuffers;
+
+       /* Set buffer size to min buffers size if it is invalid */
+       if (ch0_bufsize < config_params.min_bufsize[VPIF_CHANNEL0_VIDEO])
+               ch0_bufsize =
+                   config_params.min_bufsize[VPIF_CHANNEL0_VIDEO];
+       if (ch1_bufsize < config_params.min_bufsize[VPIF_CHANNEL1_VIDEO])
+               ch1_bufsize =
+                   config_params.min_bufsize[VPIF_CHANNEL1_VIDEO];
+
+       config_params.numbuffers[VPIF_CHANNEL0_VIDEO] = ch0_numbuffers;
+       config_params.numbuffers[VPIF_CHANNEL1_VIDEO] = ch1_numbuffers;
+       if (ch0_numbuffers) {
+               config_params.channel_bufsize[VPIF_CHANNEL0_VIDEO]
+                   = ch0_bufsize;
+       }
+       if (ch1_numbuffers) {
+               config_params.channel_bufsize[VPIF_CHANNEL1_VIDEO]
+                   = ch1_bufsize;
+       }
+
+       /* Allocate memory for six channel objects */
+       for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
+               vpif_obj.dev[i] =
+                   kzalloc(sizeof(*vpif_obj.dev[i]), GFP_KERNEL);
+               /* If memory allocation fails, return error */
+               if (!vpif_obj.dev[i]) {
+                       free_channel_objects_index = i;
+                       err = -ENOMEM;
+                       goto vpif_init_free_channel_objects;
+               }
+       }
+       return 0;
+
+vpif_init_free_channel_objects:
+       for (j = 0; j < free_channel_objects_index; j++)
+               kfree(vpif_obj.dev[j]);
+       return err;
+}
+
+/**
+ * vpif_probe : This function probes the vpif capture driver
+ * @pdev: platform device pointer
+ *
+ * This creates device entries by register itself to the V4L2 driver and
+ * initializes fields of each channel objects
+ */
+static __init int vpif_probe(struct platform_device *pdev)
+{
+       struct vpif_subdev_info *subdevdata;
+       struct vpif_capture_config *config;
+       int i, j, k, m, q, err;
+       struct i2c_adapter *i2c_adap;
+       struct channel_obj *ch;
+       struct common_obj *common;
+       struct video_device *vfd;
+       struct resource *res;
+       int subdev_count;
+
+       vpif_dev = &pdev->dev;
+
+       err = initialize_vpif();
+       if (err) {
+               v4l2_err(vpif_dev->driver, "Error initializing vpif\n");
+               return err;
+       }
+
+       k = 0;
+       while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
+               for (i = res->start; i <= res->end; i++) {
+                       if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+                                       "DM646x_Capture",
+                               (void *)(&vpif_obj.dev[k]->channel_id))) {
+                               err = -EBUSY;
+                               i--;
+                               goto vpif_int_err;
+                       }
+               }
+               k++;
+       }
+
+       for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
+               /* Get the pointer to the channel object */
+               ch = vpif_obj.dev[i];
+               /* Allocate memory for video device */
+               vfd = video_device_alloc();
+               if (NULL == vfd) {
+                       for (j = 0; j < i; j++) {
+                               ch = vpif_obj.dev[j];
+                               video_device_release(ch->video_dev);
+                       }
+                       err = -ENOMEM;
+                       goto vpif_dev_alloc_err;
+               }
+
+               /* Initialize field of video device */
+               *vfd = vpif_video_template;
+               vfd->v4l2_dev = &vpif_obj.v4l2_dev;
+               vfd->release = video_device_release;
+               snprintf(vfd->name, sizeof(vfd->name),
+                        "DM646x_VPIFCapture_DRIVER_V%d.%d.%d",
+                        (VPIF_CAPTURE_VERSION_CODE >> 16) & 0xff,
+                        (VPIF_CAPTURE_VERSION_CODE >> 8) & 0xff,
+                        (VPIF_CAPTURE_VERSION_CODE) & 0xff);
+               /* Set video_dev to the video device */
+               ch->video_dev = vfd;
+       }
+
+       for (j = 0; j < VPIF_CAPTURE_MAX_DEVICES; j++) {
+               ch = vpif_obj.dev[j];
+               ch->channel_id = j;
+               common = &(ch->common[VPIF_VIDEO_INDEX]);
+               spin_lock_init(&common->irqlock);
+               mutex_init(&common->lock);
+               /* Initialize prio member of channel object */
+               v4l2_prio_init(&ch->prio);
+               err = video_register_device(ch->video_dev,
+                                           VFL_TYPE_GRABBER, (j ? 1 : 0));
+               if (err)
+                       goto probe_out;
+
+               video_set_drvdata(ch->video_dev, ch);
+
+       }
+
+       i2c_adap = i2c_get_adapter(1);
+       config = pdev->dev.platform_data;
+
+       subdev_count = config->subdev_count;
+       vpif_obj.sd = kmalloc(sizeof(struct v4l2_subdev *) * subdev_count,
+                               GFP_KERNEL);
+       if (vpif_obj.sd == NULL) {
+               vpif_err("unable to allocate memory for subdevice pointers\n");
+               err = -ENOMEM;
+               goto probe_out;
+       }
+
+       err = v4l2_device_register(vpif_dev, &vpif_obj.v4l2_dev);
+       if (err) {
+               v4l2_err(vpif_dev->driver, "Error registering v4l2 device\n");
+               goto probe_subdev_out;
+       }
+
+       for (i = 0; i < subdev_count; i++) {
+               subdevdata = &config->subdev_info[i];
+               vpif_obj.sd[i] =
+                       v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,
+                                                 i2c_adap,
+                                                 subdevdata->name,
+                                                 &subdevdata->board_info,
+                                                 NULL);
+
+               if (!vpif_obj.sd[i]) {
+                       vpif_err("Error registering v4l2 subdevice\n");
+                       goto probe_subdev_out;
+               }
+               v4l2_info(&vpif_obj.v4l2_dev, "registered sub device %s\n",
+                         subdevdata->name);
+
+               if (vpif_obj.sd[i])
+                       vpif_obj.sd[i]->grp_id = 1 << i;
+       }
+       v4l2_info(&vpif_obj.v4l2_dev, "DM646x VPIF Capture driver"
+                 " initialized\n");
+
+       return 0;
+
+probe_subdev_out:
+       /* free sub devices memory */
+       kfree(vpif_obj.sd);
+
+       j = VPIF_CAPTURE_MAX_DEVICES;
+probe_out:
+       v4l2_device_unregister(&vpif_obj.v4l2_dev);
+       for (k = 0; k < j; k++) {
+               /* Get the pointer to the channel object */
+               ch = vpif_obj.dev[k];
+               /* Unregister video device */
+               video_unregister_device(ch->video_dev);
+       }
+
+vpif_dev_alloc_err:
+       k = VPIF_CAPTURE_MAX_DEVICES-1;
+       res = platform_get_resource(pdev, IORESOURCE_IRQ, k);
+       i = res->end;
+
+vpif_int_err:
+       for (q = k; q >= 0; q--) {
+               for (m = i; m >= (int)res->start; m--)
+                       free_irq(m, (void *)(&vpif_obj.dev[q]->channel_id));
+
+               res = platform_get_resource(pdev, IORESOURCE_IRQ, q-1);
+               if (res)
+                       i = res->end;
+       }
+       return err;
+}
+
+/**
+ * vpif_remove() - driver remove handler
+ * @device: ptr to platform device structure
+ *
+ * The vidoe device is unregistered
+ */
+static int vpif_remove(struct platform_device *device)
+{
+       int i;
+       struct channel_obj *ch;
+
+       v4l2_device_unregister(&vpif_obj.v4l2_dev);
+
+       /* un-register device */
+       for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
+               /* Get the pointer to the channel object */
+               ch = vpif_obj.dev[i];
+               /* Unregister video device */
+               video_unregister_device(ch->video_dev);
+       }
+       return 0;
+}
+
+/**
+ * vpif_suspend: vpif device suspend
+ *
+ * TODO: Add suspend code here
+ */
+static int
+vpif_suspend(struct device *dev)
+{
+       return -1;
+}
+
+/**
+ * vpif_resume: vpif device suspend
+ *
+ * TODO: Add resume code here
+ */
+static int
+vpif_resume(struct device *dev)
+{
+       return -1;
+}
+
+static struct dev_pm_ops vpif_dev_pm_ops = {
+       .suspend = vpif_suspend,
+       .resume = vpif_resume,
+};
+
+static struct platform_driver vpif_driver = {
+       .driver = {
+               .name   = "vpif_capture",
+               .owner  = THIS_MODULE,
+               .pm = &vpif_dev_pm_ops,
+       },
+       .probe = vpif_probe,
+       .remove = vpif_remove,
+};
+
+/**
+ * vpif_init: initialize the vpif driver
+ *
+ * This function registers device and driver to the kernel, requests irq
+ * handler and allocates memory
+ * for channel objects
+ */
+static __init int vpif_init(void)
+{
+       return platform_driver_register(&vpif_driver);
+}
+
+/**
+ * vpif_cleanup : This function clean up the vpif capture resources
+ *
+ * This will un-registers device and driver to the kernel, frees
+ * requested irq handler and de-allocates memory allocated for channel
+ * objects.
+ */
+static void vpif_cleanup(void)
+{
+       struct platform_device *pdev;
+       struct resource *res;
+       int irq_num;
+       int i = 0;
+
+       pdev = container_of(vpif_dev, struct platform_device, dev);
+       while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
+               for (irq_num = res->start; irq_num <= res->end; irq_num++)
+                       free_irq(irq_num,
+                                (void *)(&vpif_obj.dev[i]->channel_id));
+               i++;
+       }
+
+       platform_driver_unregister(&vpif_driver);
+
+       kfree(vpif_obj.sd);
+       for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++)
+               kfree(vpif_obj.dev[i]);
+}
+
+/* Function for module initialization and cleanup */
+module_init(vpif_init);
+module_exit(vpif_cleanup);
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
new file mode 100644 (file)
index 0000000..4e12ec8
--- /dev/null
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef VPIF_CAPTURE_H
+#define VPIF_CAPTURE_H
+
+#ifdef __KERNEL__
+
+/* Header files */
+#include <linux/videodev2.h>
+#include <linux/version.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
+#include <media/videobuf-core.h>
+#include <media/videobuf-dma-contig.h>
+#include <mach/dm646x.h>
+
+#include "vpif.h"
+
+/* Macros */
+#define VPIF_MAJOR_RELEASE             0
+#define VPIF_MINOR_RELEASE             0
+#define VPIF_BUILD                     1
+#define VPIF_CAPTURE_VERSION_CODE      ((VPIF_MAJOR_RELEASE << 16) | \
+       (VPIF_MINOR_RELEASE << 8) | VPIF_BUILD)
+
+#define VPIF_VALID_FIELD(field)                (((V4L2_FIELD_ANY == field) || \
+       (V4L2_FIELD_NONE == field)) || \
+       (((V4L2_FIELD_INTERLACED == field) || \
+       (V4L2_FIELD_SEQ_TB == field)) || \
+       (V4L2_FIELD_SEQ_BT == field)))
+
+#define VPIF_CAPTURE_MAX_DEVICES       2
+#define VPIF_VIDEO_INDEX               0
+#define VPIF_NUMBER_OF_OBJECTS         1
+
+/* Enumerated data type to give id to each device per channel */
+enum vpif_channel_id {
+       VPIF_CHANNEL0_VIDEO = 0,
+       VPIF_CHANNEL1_VIDEO,
+};
+
+struct video_obj {
+       enum v4l2_field buf_field;
+       /* Currently selected or default standard */
+       v4l2_std_id stdid;
+       /* This is to track the last input that is passed to application */
+       u32 input_idx;
+};
+
+struct common_obj {
+       /* Pointer pointing to current v4l2_buffer */
+       struct videobuf_buffer *cur_frm;
+       /* Pointer pointing to current v4l2_buffer */
+       struct videobuf_buffer *next_frm;
+       /*
+        * This field keeps track of type of buffer exchange mechanism
+        * user has selected
+        */
+       enum v4l2_memory memory;
+       /* Used to store pixel format */
+       struct v4l2_format fmt;
+       /* Buffer queue used in video-buf */
+       struct videobuf_queue buffer_queue;
+       /* Queue of filled frames */
+       struct list_head dma_queue;
+       /* Used in video-buf */
+       spinlock_t irqlock;
+       /* lock used to access this structure */
+       struct mutex lock;
+       /* number of users performing IO */
+       u32 io_usrs;
+       /* Indicates whether streaming started */
+       u8 started;
+       /* Function pointer to set the addresses */
+       void (*set_addr) (unsigned long, unsigned long, unsigned long,
+                         unsigned long);
+       /* offset where Y top starts from the starting of the buffer */
+       u32 ytop_off;
+       /* offset where Y bottom starts from the starting of the buffer */
+       u32 ybtm_off;
+       /* offset where C top starts from the starting of the buffer */
+       u32 ctop_off;
+       /* offset where C bottom starts from the starting of the buffer */
+       u32 cbtm_off;
+       /* Indicates width of the image data */
+       u32 width;
+       /* Indicates height of the image data */
+       u32 height;
+};
+
+struct channel_obj {
+       /* Identifies video device for this channel */
+       struct video_device *video_dev;
+       /* Used to keep track of state of the priority */
+       struct v4l2_prio_state prio;
+       /* number of open instances of the channel */
+       int usrs;
+       /* Indicates id of the field which is being displayed */
+       u32 field_id;
+       /* flag to indicate whether decoder is initialized */
+       u8 initialized;
+       /* Identifies channel */
+       enum vpif_channel_id channel_id;
+       /* index into sd table */
+       int curr_sd_index;
+       /* ptr to current sub device information */
+       struct vpif_subdev_info *curr_subdev_info;
+       /* vpif configuration params */
+       struct vpif_params vpifparams;
+       /* common object array */
+       struct common_obj common[VPIF_NUMBER_OF_OBJECTS];
+       /* video object */
+       struct video_obj video;
+};
+
+/* File handle structure */
+struct vpif_fh {
+       /* pointer to channel object for opened device */
+       struct channel_obj *channel;
+       /* Indicates whether this file handle is doing IO */
+       u8 io_allowed[VPIF_NUMBER_OF_OBJECTS];
+       /* Used to keep track priority of this instance */
+       enum v4l2_priority prio;
+       /* Used to indicate channel is initialize or not */
+       u8 initialized;
+};
+
+struct vpif_device {
+       struct v4l2_device v4l2_dev;
+       struct channel_obj *dev[VPIF_CAPTURE_NUM_CHANNELS];
+       struct v4l2_subdev **sd;
+};
+
+struct vpif_config_params {
+       u8 min_numbuffers;
+       u8 numbuffers[VPIF_CAPTURE_NUM_CHANNELS];
+       s8 device_type;
+       u32 min_bufsize[VPIF_CAPTURE_NUM_CHANNELS];
+       u32 channel_bufsize[VPIF_CAPTURE_NUM_CHANNELS];
+       u8 default_device[VPIF_CAPTURE_NUM_CHANNELS];
+       u8 max_device_type;
+};
+/* Struct which keeps track of the line numbers for the sliced vbi service */
+struct vpif_service_line {
+       u16 service_id;
+       u16 service_line[2];
+};
+#endif                         /* End of __KERNEL__ */
+#endif                         /* VPIF_CAPTURE_H */
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
new file mode 100644 (file)
index 0000000..c015da8
--- /dev/null
@@ -0,0 +1,1656 @@
+/*
+ * vpif-display - VPIF display driver
+ * Display driver for TI DaVinci VPIF
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/videodev2.h>
+#include <linux/wait.h>
+#include <linux/time.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/version.h>
+
+#include <asm/irq.h>
+#include <asm/page.h>
+
+#include <media/adv7343.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+
+#include <mach/dm646x.h>
+
+#include "vpif_display.h"
+#include "vpif.h"
+
+MODULE_DESCRIPTION("TI DaVinci VPIF Display driver");
+MODULE_LICENSE("GPL");
+
+#define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)
+
+#define vpif_err(fmt, arg...)  v4l2_err(&vpif_obj.v4l2_dev, fmt, ## arg)
+#define vpif_dbg(level, debug, fmt, arg...)    \
+               v4l2_dbg(level, debug, &vpif_obj.v4l2_dev, fmt, ## arg)
+
+static int debug = 1;
+static u32 ch2_numbuffers = 3;
+static u32 ch3_numbuffers = 3;
+static u32 ch2_bufsize = 1920 * 1080 * 2;
+static u32 ch3_bufsize = 720 * 576 * 2;
+
+module_param(debug, int, 0644);
+module_param(ch2_numbuffers, uint, S_IRUGO);
+module_param(ch3_numbuffers, uint, S_IRUGO);
+module_param(ch2_bufsize, uint, S_IRUGO);
+module_param(ch3_bufsize, uint, S_IRUGO);
+
+MODULE_PARM_DESC(debug, "Debug level 0-1");
+MODULE_PARM_DESC(ch2_numbuffers, "Channel2 buffer count (default:3)");
+MODULE_PARM_DESC(ch3_numbuffers, "Channel3 buffer count (default:3)");
+MODULE_PARM_DESC(ch2_bufsize, "Channel2 buffer size (default:1920 x 1080 x 2)");
+MODULE_PARM_DESC(ch3_bufsize, "Channel3 buffer size (default:720 x 576 x 2)");
+
+static struct vpif_config_params config_params = {
+       .min_numbuffers         = 3,
+       .numbuffers[0]          = 3,
+       .numbuffers[1]          = 3,
+       .min_bufsize[0]         = 720 * 480 * 2,
+       .min_bufsize[1]         = 720 * 480 * 2,
+       .channel_bufsize[0]     = 1920 * 1080 * 2,
+       .channel_bufsize[1]     = 720 * 576 * 2,
+};
+
+static struct vpif_device vpif_obj = { {NULL} };
+static struct device *vpif_dev;
+
+static const struct vpif_channel_config_params ch_params[] = {
+       {
+               "NTSC", 720, 480, 30, 0, 1, 268, 1440, 1, 23, 263, 266,
+               286, 525, 525, 0, 1, 0, V4L2_STD_525_60,
+       },
+       {
+               "PAL", 720, 576, 25, 0, 1, 280, 1440, 1, 23, 311, 313,
+               336, 624, 625, 0, 1, 0, V4L2_STD_625_50,
+       },
+};
+
+/*
+ * vpif_uservirt_to_phys: This function is used to convert user
+ * space virtual address to physical address.
+ */
+static u32 vpif_uservirt_to_phys(u32 virtp)
+{
+       struct mm_struct *mm = current->mm;
+       unsigned long physp = 0;
+       struct vm_area_struct *vma;
+
+       vma = find_vma(mm, virtp);
+
+       /* For kernel direct-mapped memory, take the easy way */
+       if (virtp >= PAGE_OFFSET) {
+               physp = virt_to_phys((void *)virtp);
+       } else if (vma && (vma->vm_flags & VM_IO) && (vma->vm_pgoff)) {
+               /* this will catch, kernel-allocated, mmaped-to-usermode addr */
+               physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
+       } else {
+               /* otherwise, use get_user_pages() for general userland pages */
+               int res, nr_pages = 1;
+               struct page *pages;
+               down_read(&current->mm->mmap_sem);
+
+               res = get_user_pages(current, current->mm,
+                                    virtp, nr_pages, 1, 0, &pages, NULL);
+               up_read(&current->mm->mmap_sem);
+
+               if (res == nr_pages) {
+                       physp = __pa(page_address(&pages[0]) +
+                                                       (virtp & ~PAGE_MASK));
+               } else {
+                       vpif_err("get_user_pages failed\n");
+                       return 0;
+               }
+       }
+
+       return physp;
+}
+
+/*
+ * buffer_prepare: This is the callback function called from videobuf_qbuf()
+ * function the buffer is prepared and user space virtual address is converted
+ * into physical address
+ */
+static int vpif_buffer_prepare(struct videobuf_queue *q,
+                              struct videobuf_buffer *vb,
+                              enum v4l2_field field)
+{
+       struct vpif_fh *fh = q->priv_data;
+       struct common_obj *common;
+       unsigned long addr;
+
+       common = &fh->channel->common[VPIF_VIDEO_INDEX];
+       if (VIDEOBUF_NEEDS_INIT == vb->state) {
+               vb->width       = common->width;
+               vb->height      = common->height;
+               vb->size        = vb->width * vb->height;
+               vb->field       = field;
+       }
+       vb->state = VIDEOBUF_PREPARED;
+
+       /* if user pointer memory mechanism is used, get the physical
+        * address of the buffer */
+       if (V4L2_MEMORY_USERPTR == common->memory) {
+               if (!vb->baddr) {
+                       vpif_err("buffer_address is 0\n");
+                       return -EINVAL;
+               }
+
+               vb->boff = vpif_uservirt_to_phys(vb->baddr);
+               if (!ISALIGNED(vb->boff))
+                       goto buf_align_exit;
+       }
+
+       addr = vb->boff;
+       if (q->streaming && (V4L2_BUF_TYPE_SLICED_VBI_OUTPUT != q->type)) {
+               if (!ISALIGNED(addr + common->ytop_off) ||
+                   !ISALIGNED(addr + common->ybtm_off) ||
+                   !ISALIGNED(addr + common->ctop_off) ||
+                   !ISALIGNED(addr + common->cbtm_off))
+                       goto buf_align_exit;
+       }
+       return 0;
+
+buf_align_exit:
+       vpif_err("buffer offset not aligned to 8 bytes\n");
+       return -EINVAL;
+}
+
+/*
+ * vpif_buffer_setup: This function allocates memory for the buffers
+ */
+static int vpif_buffer_setup(struct videobuf_queue *q, unsigned int *count,
+                               unsigned int *size)
+{
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (V4L2_MEMORY_MMAP != common->memory)
+               return 0;
+
+       *size = config_params.channel_bufsize[ch->channel_id];
+       if (*count < config_params.min_numbuffers)
+               *count = config_params.min_numbuffers;
+
+       return 0;
+}
+
+/*
+ * vpif_buffer_queue: This function adds the buffer to DMA queue
+ */
+static void vpif_buffer_queue(struct videobuf_queue *q,
+                             struct videobuf_buffer *vb)
+{
+       struct vpif_fh *fh = q->priv_data;
+       struct common_obj *common;
+
+       common = &fh->channel->common[VPIF_VIDEO_INDEX];
+
+       /* add the buffer to the DMA queue */
+       list_add_tail(&vb->queue, &common->dma_queue);
+       vb->state = VIDEOBUF_QUEUED;
+}
+
+/*
+ * vpif_buffer_release: This function is called from the videobuf layer to
+ * free memory allocated to the buffers
+ */
+static void vpif_buffer_release(struct videobuf_queue *q,
+                               struct videobuf_buffer *vb)
+{
+       struct vpif_fh *fh = q->priv_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+       unsigned int buf_size = 0;
+
+       common = &ch->common[VPIF_VIDEO_INDEX];
+
+       videobuf_dma_contig_free(q, vb);
+       vb->state = VIDEOBUF_NEEDS_INIT;
+
+       if (V4L2_MEMORY_MMAP != common->memory)
+               return;
+
+       buf_size = config_params.channel_bufsize[ch->channel_id];
+}
+
+static struct videobuf_queue_ops video_qops = {
+       .buf_setup      = vpif_buffer_setup,
+       .buf_prepare    = vpif_buffer_prepare,
+       .buf_queue      = vpif_buffer_queue,
+       .buf_release    = vpif_buffer_release,
+};
+static u8 channel_first_int[VPIF_NUMOBJECTS][2] = { {1, 1} };
+
+static void process_progressive_mode(struct common_obj *common)
+{
+       unsigned long addr = 0;
+
+       /* Get the next buffer from buffer queue */
+       common->next_frm = list_entry(common->dma_queue.next,
+                               struct videobuf_buffer, queue);
+       /* Remove that buffer from the buffer queue */
+       list_del(&common->next_frm->queue);
+       /* Mark status of the buffer as active */
+       common->next_frm->state = VIDEOBUF_ACTIVE;
+
+       /* Set top and bottom field addrs in VPIF registers */
+       addr = videobuf_to_dma_contig(common->next_frm);
+       common->set_addr(addr + common->ytop_off,
+                                addr + common->ybtm_off,
+                                addr + common->ctop_off,
+                                addr + common->cbtm_off);
+}
+
+static void process_interlaced_mode(int fid, struct common_obj *common)
+{
+       /* device field id and local field id are in sync */
+       /* If this is even field */
+       if (0 == fid) {
+               if (common->cur_frm == common->next_frm)
+                       return;
+
+               /* one frame is displayed If next frame is
+                *  available, release cur_frm and move on */
+               /* Copy frame display time */
+               do_gettimeofday(&common->cur_frm->ts);
+               /* Change status of the cur_frm */
+               common->cur_frm->state = VIDEOBUF_DONE;
+               /* unlock semaphore on cur_frm */
+               wake_up_interruptible(&common->cur_frm->done);
+               /* Make cur_frm pointing to next_frm */
+               common->cur_frm = common->next_frm;
+
+       } else if (1 == fid) {  /* odd field */
+               if (list_empty(&common->dma_queue)
+                   || (common->cur_frm != common->next_frm)) {
+                       return;
+               }
+               /* one field is displayed configure the next
+                * frame if it is available else hold on current
+                * frame */
+               /* Get next from the buffer queue */
+               process_progressive_mode(common);
+
+       }
+}
+
+/*
+ * vpif_channel_isr: It changes status of the displayed buffer, takes next
+ * buffer from the queue and sets its address in VPIF registers
+ */
+static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
+{
+       struct vpif_device *dev = &vpif_obj;
+       struct channel_obj *ch;
+       struct common_obj *common;
+       enum v4l2_field field;
+       int fid = -1, i;
+       int channel_id = 0;
+
+       channel_id = *(int *)(dev_id);
+       ch = dev->dev[channel_id];
+       field = ch->common[VPIF_VIDEO_INDEX].fmt.fmt.pix.field;
+       for (i = 0; i < VPIF_NUMOBJECTS; i++) {
+               common = &ch->common[i];
+               /* If streaming is started in this channel */
+               if (0 == common->started)
+                       continue;
+
+               if (1 == ch->vpifparams.std_info.frm_fmt) {
+                       if (list_empty(&common->dma_queue))
+                               continue;
+
+                       /* Progressive mode */
+                       if (!channel_first_int[i][channel_id]) {
+                               /* Mark status of the cur_frm to
+                                * done and unlock semaphore on it */
+                               do_gettimeofday(&common->cur_frm->ts);
+                               common->cur_frm->state = VIDEOBUF_DONE;
+                               wake_up_interruptible(&common->cur_frm->done);
+                               /* Make cur_frm pointing to next_frm */
+                               common->cur_frm = common->next_frm;
+                       }
+
+                       channel_first_int[i][channel_id] = 0;
+                       process_progressive_mode(common);
+               } else {
+                       /* Interlaced mode */
+                       /* If it is first interrupt, ignore it */
+
+                       if (channel_first_int[i][channel_id]) {
+                               channel_first_int[i][channel_id] = 0;
+                               continue;
+                       }
+
+                       if (0 == i) {
+                               ch->field_id ^= 1;
+                               /* Get field id from VPIF registers */
+                               fid = vpif_channel_getfid(ch->channel_id + 2);
+                               /* If fid does not match with stored field id */
+                               if (fid != ch->field_id) {
+                                       /* Make them in sync */
+                                       if (0 == fid)
+                                               ch->field_id = fid;
+
+                                       return IRQ_HANDLED;
+                               }
+                       }
+                       process_interlaced_mode(fid, common);
+               }
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int vpif_get_std_info(struct channel_obj *ch)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct video_obj *vid_ch = &ch->video;
+       struct vpif_params *vpifparams = &ch->vpifparams;
+       struct vpif_channel_config_params *std_info = &vpifparams->std_info;
+       const struct vpif_channel_config_params *config;
+
+       int index;
+
+       std_info->stdid = vid_ch->stdid;
+       if (!std_info)
+               return -1;
+
+       for (index = 0; index < ARRAY_SIZE(ch_params); index++) {
+               config = &ch_params[index];
+               if (config->stdid & std_info->stdid) {
+                       memcpy(std_info, config, sizeof(*config));
+                       break;
+               }
+       }
+
+       if (index == ARRAY_SIZE(ch_params))
+               return -1;
+
+       common->fmt.fmt.pix.width = std_info->width;
+       common->fmt.fmt.pix.height = std_info->height;
+       vpif_dbg(1, debug, "Pixel details: Width = %d,Height = %d\n",
+                       common->fmt.fmt.pix.width, common->fmt.fmt.pix.height);
+
+       /* Set height and width paramateres */
+       ch->common[VPIF_VIDEO_INDEX].height = std_info->height;
+       ch->common[VPIF_VIDEO_INDEX].width = std_info->width;
+
+       return 0;
+}
+
+/*
+ * vpif_calculate_offsets: This function calculates buffers offset for Y and C
+ * in the top and bottom field
+ */
+static void vpif_calculate_offsets(struct channel_obj *ch)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct vpif_params *vpifparams = &ch->vpifparams;
+       enum v4l2_field field = common->fmt.fmt.pix.field;
+       struct video_obj *vid_ch = &ch->video;
+       unsigned int hpitch, vpitch, sizeimage;
+
+       if (V4L2_FIELD_ANY == common->fmt.fmt.pix.field) {
+               if (ch->vpifparams.std_info.frm_fmt)
+                       vid_ch->buf_field = V4L2_FIELD_NONE;
+               else
+                       vid_ch->buf_field = V4L2_FIELD_INTERLACED;
+       } else {
+               vid_ch->buf_field = common->fmt.fmt.pix.field;
+       }
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               sizeimage = common->fmt.fmt.pix.sizeimage;
+       else
+               sizeimage = config_params.channel_bufsize[ch->channel_id];
+
+       hpitch = common->fmt.fmt.pix.bytesperline;
+       vpitch = sizeimage / (hpitch * 2);
+       if ((V4L2_FIELD_NONE == vid_ch->buf_field) ||
+           (V4L2_FIELD_INTERLACED == vid_ch->buf_field)) {
+               common->ytop_off = 0;
+               common->ybtm_off = hpitch;
+               common->ctop_off = sizeimage / 2;
+               common->cbtm_off = sizeimage / 2 + hpitch;
+       } else if (V4L2_FIELD_SEQ_TB == vid_ch->buf_field) {
+               common->ytop_off = 0;
+               common->ybtm_off = sizeimage / 4;
+               common->ctop_off = sizeimage / 2;
+               common->cbtm_off = common->ctop_off + sizeimage / 4;
+       } else if (V4L2_FIELD_SEQ_BT == vid_ch->buf_field) {
+               common->ybtm_off = 0;
+               common->ytop_off = sizeimage / 4;
+               common->cbtm_off = sizeimage / 2;
+               common->ctop_off = common->cbtm_off + sizeimage / 4;
+       }
+
+       if ((V4L2_FIELD_NONE == vid_ch->buf_field) ||
+           (V4L2_FIELD_INTERLACED == vid_ch->buf_field)) {
+               vpifparams->video_params.storage_mode = 1;
+       } else {
+               vpifparams->video_params.storage_mode = 0;
+       }
+
+       if (ch->vpifparams.std_info.frm_fmt == 1) {
+               vpifparams->video_params.hpitch =
+                   common->fmt.fmt.pix.bytesperline;
+       } else {
+               if ((field == V4L2_FIELD_ANY) ||
+                       (field == V4L2_FIELD_INTERLACED))
+                       vpifparams->video_params.hpitch =
+                           common->fmt.fmt.pix.bytesperline * 2;
+               else
+                       vpifparams->video_params.hpitch =
+                           common->fmt.fmt.pix.bytesperline;
+       }
+
+       ch->vpifparams.video_params.stdid = ch->vpifparams.std_info.stdid;
+}
+
+static void vpif_config_format(struct channel_obj *ch)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       common->fmt.fmt.pix.field = V4L2_FIELD_ANY;
+       if (config_params.numbuffers[ch->channel_id] == 0)
+               common->memory = V4L2_MEMORY_USERPTR;
+       else
+               common->memory = V4L2_MEMORY_MMAP;
+
+       common->fmt.fmt.pix.sizeimage =
+                       config_params.channel_bufsize[ch->channel_id];
+       common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;
+       common->fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+}
+
+static int vpif_check_format(struct channel_obj *ch,
+                            struct v4l2_pix_format *pixfmt)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       enum v4l2_field field = pixfmt->field;
+       u32 sizeimage, hpitch, vpitch;
+
+       if (pixfmt->pixelformat != V4L2_PIX_FMT_YUV422P)
+               goto invalid_fmt_exit;
+
+       if (!(VPIF_VALID_FIELD(field)))
+               goto invalid_fmt_exit;
+
+       if (pixfmt->bytesperline <= 0)
+               goto invalid_pitch_exit;
+
+       if (V4L2_MEMORY_USERPTR == common->memory)
+               sizeimage = pixfmt->sizeimage;
+       else
+               sizeimage = config_params.channel_bufsize[ch->channel_id];
+
+       if (vpif_get_std_info(ch)) {
+               vpif_err("Error getting the standard info\n");
+               return -EINVAL;
+       }
+
+       hpitch = pixfmt->bytesperline;
+       vpitch = sizeimage / (hpitch * 2);
+
+       /* Check for valid value of pitch */
+       if ((hpitch < ch->vpifparams.std_info.width) ||
+           (vpitch < ch->vpifparams.std_info.height))
+               goto invalid_pitch_exit;
+
+       /* Check for 8 byte alignment */
+       if (!ISALIGNED(hpitch)) {
+               vpif_err("invalid pitch alignment\n");
+               return -EINVAL;
+       }
+       pixfmt->width = common->fmt.fmt.pix.width;
+       pixfmt->height = common->fmt.fmt.pix.height;
+
+       return 0;
+
+invalid_fmt_exit:
+       vpif_err("invalid field format\n");
+       return -EINVAL;
+
+invalid_pitch_exit:
+       vpif_err("invalid pitch\n");
+       return -EINVAL;
+}
+
+static void vpif_config_addr(struct channel_obj *ch, int muxmode)
+{
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (VPIF_CHANNEL3_VIDEO == ch->channel_id) {
+               common->set_addr = ch3_set_videobuf_addr;
+       } else {
+               if (2 == muxmode)
+                       common->set_addr = ch2_set_videobuf_addr_yc_nmux;
+               else
+                       common->set_addr = ch2_set_videobuf_addr;
+       }
+}
+
+/*
+ * vpif_mmap: It is used to map kernel space buffers into user spaces
+ */
+static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
+{
+       struct vpif_fh *fh = filep->private_data;
+       struct common_obj *common = &fh->channel->common[VPIF_VIDEO_INDEX];
+
+       return videobuf_mmap_mapper(&common->buffer_queue, vma);
+}
+
+/*
+ * vpif_poll: It is used for select/poll system call
+ */
+static unsigned int vpif_poll(struct file *filep, poll_table *wait)
+{
+       struct vpif_fh *fh = filep->private_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (common->started)
+               return videobuf_poll_stream(filep, &common->buffer_queue, wait);
+
+       return 0;
+}
+
+/*
+ * vpif_open: It creates object of file handle structure and stores it in
+ * private_data member of filepointer
+ */
+static int vpif_open(struct file *filep)
+{
+       struct video_device *vdev = video_devdata(filep);
+       struct channel_obj *ch = NULL;
+       struct vpif_fh *fh = NULL;
+
+       ch = video_get_drvdata(vdev);
+       /* Allocate memory for the file handle object */
+       fh = kmalloc(sizeof(struct vpif_fh), GFP_KERNEL);
+       if (fh == NULL) {
+               vpif_err("unable to allocate memory for file handle object\n");
+               return -ENOMEM;
+       }
+
+       /* store pointer to fh in private_data member of filep */
+       filep->private_data = fh;
+       fh->channel = ch;
+       fh->initialized = 0;
+       if (!ch->initialized) {
+               fh->initialized = 1;
+               ch->initialized = 1;
+               memset(&ch->vpifparams, 0, sizeof(ch->vpifparams));
+       }
+
+       /* Increment channel usrs counter */
+       atomic_inc(&ch->usrs);
+       /* Set io_allowed[VPIF_VIDEO_INDEX] member to false */
+       fh->io_allowed[VPIF_VIDEO_INDEX] = 0;
+       /* Initialize priority of this instance to default priority */
+       fh->prio = V4L2_PRIORITY_UNSET;
+       v4l2_prio_open(&ch->prio, &fh->prio);
+
+       return 0;
+}
+
+/*
+ * vpif_release: This function deletes buffer queue, frees the buffers and
+ * the vpif file handle
+ */
+static int vpif_release(struct file *filep)
+{
+       struct vpif_fh *fh = filep->private_data;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* if this instance is doing IO */
+       if (fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               /* Reset io_usrs member of channel object */
+               common->io_usrs = 0;
+               /* Disable channel */
+               if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
+                       enable_channel2(0);
+                       channel2_intr_enable(0);
+               }
+               if ((VPIF_CHANNEL3_VIDEO == ch->channel_id) ||
+                   (2 == common->started)) {
+                       enable_channel3(0);
+                       channel3_intr_enable(0);
+               }
+               common->started = 0;
+               /* Free buffers allocated */
+               videobuf_queue_cancel(&common->buffer_queue);
+               videobuf_mmap_free(&common->buffer_queue);
+               common->numbuffers =
+                   config_params.numbuffers[ch->channel_id];
+       }
+
+       mutex_unlock(&common->lock);
+
+       /* Decrement channel usrs counter */
+       atomic_dec(&ch->usrs);
+       /* If this file handle has initialize encoder device, reset it */
+       if (fh->initialized)
+               ch->initialized = 0;
+
+       /* Close the priority */
+       v4l2_prio_close(&ch->prio, &fh->prio);
+       filep->private_data = NULL;
+       fh->initialized = 0;
+       kfree(fh);
+
+       return 0;
+}
+
+/* functions implementing ioctls */
+
+static int vpif_querycap(struct file *file, void  *priv,
+                               struct v4l2_capability *cap)
+{
+       struct vpif_display_config *config = vpif_dev->platform_data;
+
+       cap->version = VPIF_DISPLAY_VERSION_CODE;
+       cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+       strlcpy(cap->driver, "vpif display", sizeof(cap->driver));
+       strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info));
+       strlcpy(cap->card, config->card_name, sizeof(cap->card));
+
+       return 0;
+}
+
+static int vpif_enum_fmt_vid_out(struct file *file, void  *priv,
+                                       struct v4l2_fmtdesc *fmt)
+{
+       if (fmt->index != 0) {
+               vpif_err("Invalid format index\n");
+               return -EINVAL;
+       }
+
+       /* Fill in the information about format */
+       fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+       strcpy(fmt->description, "YCbCr4:2:2 YC Planar");
+       fmt->pixelformat = V4L2_PIX_FMT_YUV422P;
+
+       return 0;
+}
+
+static int vpif_g_fmt_vid_out(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       /* Check the validity of the buffer type */
+       if (common->fmt.type != fmt->type)
+               return -EINVAL;
+
+       /* Fill in the information about format */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (vpif_get_std_info(ch)) {
+               vpif_err("Error getting the standard info\n");
+               return -EINVAL;
+       }
+
+       *fmt = common->fmt;
+       mutex_unlock(&common->lock);
+       return 0;
+}
+
+static int vpif_s_fmt_vid_out(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct v4l2_pix_format *pixfmt;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret = 0;
+
+       if ((VPIF_CHANNEL2_VIDEO == ch->channel_id)
+           || (VPIF_CHANNEL3_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_dbg(1, debug, "Channel Busy\n");
+                       return -EBUSY;
+               }
+
+               /* Check for the priority */
+               ret = v4l2_prio_check(&ch->prio, &fh->prio);
+               if (0 != ret)
+                       return ret;
+               fh->initialized = 1;
+       }
+
+       if (common->started) {
+               vpif_dbg(1, debug, "Streaming in progress\n");
+               return -EBUSY;
+       }
+
+       pixfmt = &fmt->fmt.pix;
+       /* Check for valid field format */
+       ret = vpif_check_format(ch, pixfmt);
+       if (ret)
+               return ret;
+
+       /* store the pix format in the channel object */
+       common->fmt.fmt.pix = *pixfmt;
+       /* store the format in the channel object */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       common->fmt = *fmt;
+       mutex_unlock(&common->lock);
+
+       return 0;
+}
+
+static int vpif_try_fmt_vid_out(struct file *file, void *priv,
+                               struct v4l2_format *fmt)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
+       int ret = 0;
+
+       ret = vpif_check_format(ch, pixfmt);
+       if (ret) {
+               *pixfmt = common->fmt.fmt.pix;
+               pixfmt->sizeimage = pixfmt->width * pixfmt->height * 2;
+       }
+
+       return ret;
+}
+
+static int vpif_reqbufs(struct file *file, void *priv,
+                       struct v4l2_requestbuffers *reqbuf)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common;
+       enum v4l2_field field;
+       u8 index = 0;
+       int ret = 0;
+
+       /* This file handle has not initialized the channel,
+          It is not allowed to do settings */
+       if ((VPIF_CHANNEL2_VIDEO == ch->channel_id)
+           || (VPIF_CHANNEL3_VIDEO == ch->channel_id)) {
+               if (!fh->initialized) {
+                       vpif_err("Channel Busy\n");
+                       return -EBUSY;
+               }
+       }
+
+       if (V4L2_BUF_TYPE_VIDEO_OUTPUT != reqbuf->type)
+               return -EINVAL;
+
+       index = VPIF_VIDEO_INDEX;
+
+       common = &ch->common[index];
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (common->fmt.type != reqbuf->type) {
+               ret = -EINVAL;
+               goto reqbuf_exit;
+       }
+
+       if (0 != common->io_usrs) {
+               ret = -EBUSY;
+               goto reqbuf_exit;
+       }
+
+       if (reqbuf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               if (common->fmt.fmt.pix.field == V4L2_FIELD_ANY)
+                       field = V4L2_FIELD_INTERLACED;
+               else
+                       field = common->fmt.fmt.pix.field;
+       } else {
+               field = V4L2_VBI_INTERLACED;
+       }
+
+       /* Initialize videobuf queue as per the buffer type */
+       videobuf_queue_dma_contig_init(&common->buffer_queue,
+                                           &video_qops, NULL,
+                                           &common->irqlock,
+                                           reqbuf->type, field,
+                                           sizeof(struct videobuf_buffer), fh);
+
+       /* Set io allowed member of file handle to TRUE */
+       fh->io_allowed[index] = 1;
+       /* Increment io usrs member of channel object to 1 */
+       common->io_usrs = 1;
+       /* Store type of memory requested in channel object */
+       common->memory = reqbuf->memory;
+       INIT_LIST_HEAD(&common->dma_queue);
+
+       /* Allocate buffers */
+       ret = videobuf_reqbufs(&common->buffer_queue, reqbuf);
+
+reqbuf_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+static int vpif_querybuf(struct file *file, void *priv,
+                               struct v4l2_buffer *tbuf)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (common->fmt.type != tbuf->type)
+               return -EINVAL;
+
+       return videobuf_querybuf(&common->buffer_queue, tbuf);
+}
+
+static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct v4l2_buffer tbuf = *buf;
+       struct videobuf_buffer *buf1;
+       unsigned long addr = 0;
+       unsigned long flags;
+       int ret = 0;
+
+       if (common->fmt.type != tbuf.type)
+               return -EINVAL;
+
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_err("fh->io_allowed\n");
+               return -EACCES;
+       }
+
+       if (!(list_empty(&common->dma_queue)) ||
+           (common->cur_frm != common->next_frm) ||
+           !(common->started) ||
+           (common->started && (0 == ch->field_id)))
+               return videobuf_qbuf(&common->buffer_queue, buf);
+
+       /* bufferqueue is empty store buffer address in VPIF registers */
+       mutex_lock(&common->buffer_queue.vb_lock);
+       buf1 = common->buffer_queue.bufs[tbuf.index];
+       if (buf1->memory != tbuf.memory) {
+               vpif_err("invalid buffer type\n");
+               goto qbuf_exit;
+       }
+
+       if ((buf1->state == VIDEOBUF_QUEUED) ||
+           (buf1->state == VIDEOBUF_ACTIVE)) {
+               vpif_err("invalid state\n");
+               goto qbuf_exit;
+       }
+
+       switch (buf1->memory) {
+       case V4L2_MEMORY_MMAP:
+               if (buf1->baddr == 0)
+                       goto qbuf_exit;
+               break;
+
+       case V4L2_MEMORY_USERPTR:
+               if (tbuf.length < buf1->bsize)
+                       goto qbuf_exit;
+
+               if ((VIDEOBUF_NEEDS_INIT != buf1->state)
+                           && (buf1->baddr != tbuf.m.userptr))
+                       vpif_buffer_release(&common->buffer_queue, buf1);
+                       buf1->baddr = tbuf.m.userptr;
+               break;
+
+       default:
+               goto qbuf_exit;
+       }
+
+       local_irq_save(flags);
+       ret = vpif_buffer_prepare(&common->buffer_queue, buf1,
+                                       common->buffer_queue.field);
+       if (ret < 0) {
+               local_irq_restore(flags);
+               goto qbuf_exit;
+       }
+
+       buf1->state = VIDEOBUF_ACTIVE;
+       addr = buf1->boff;
+       common->next_frm = buf1;
+       if (tbuf.type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
+               common->set_addr((addr + common->ytop_off),
+                                (addr + common->ybtm_off),
+                                (addr + common->ctop_off),
+                                (addr + common->cbtm_off));
+       }
+
+       local_irq_restore(flags);
+       list_add_tail(&buf1->stream, &common->buffer_queue.stream);
+       mutex_unlock(&common->buffer_queue.vb_lock);
+       return 0;
+
+qbuf_exit:
+       mutex_unlock(&common->buffer_queue.vb_lock);
+       return -EINVAL;
+}
+
+static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret = 0;
+
+       if (!(*std_id & DM646X_V4L2_STD))
+               return -EINVAL;
+
+       if (common->started) {
+               vpif_err("streaming in progress\n");
+               return -EBUSY;
+       }
+
+       /* Call encoder subdevice function to set the standard */
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       ch->video.stdid = *std_id;
+       /* Get the information about the standard */
+       if (vpif_get_std_info(ch)) {
+               vpif_err("Error getting the standard info\n");
+               return -EINVAL;
+       }
+
+       if ((ch->vpifparams.std_info.width *
+               ch->vpifparams.std_info.height * 2) >
+               config_params.channel_bufsize[ch->channel_id]) {
+               vpif_err("invalid std for this size\n");
+               ret = -EINVAL;
+               goto s_std_exit;
+       }
+
+       common->fmt.fmt.pix.bytesperline = common->fmt.fmt.pix.width;
+       /* Configure the default format information */
+       vpif_config_format(ch);
+
+       ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video,
+                                               s_std_output, *std_id);
+       if (ret < 0) {
+               vpif_err("Failed to set output standard\n");
+               goto s_std_exit;
+       }
+
+       ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, core,
+                                                       s_std, *std_id);
+       if (ret < 0)
+               vpif_err("Failed to set standard for sub devices\n");
+
+s_std_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       *std = ch->video.stdid;
+       return 0;
+}
+
+static int vpif_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       return videobuf_dqbuf(&common->buffer_queue, p,
+                                       (file->f_flags & O_NONBLOCK));
+}
+
+static int vpif_streamon(struct file *file, void *priv,
+                               enum v4l2_buf_type buftype)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       struct channel_obj *oth_ch = vpif_obj.dev[!ch->channel_id];
+       struct vpif_params *vpif = &ch->vpifparams;
+       struct vpif_display_config *vpif_config_data =
+                                       vpif_dev->platform_data;
+       unsigned long addr = 0;
+       int ret = 0;
+
+       if (buftype != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               vpif_err("buffer type not supported\n");
+               return -EINVAL;
+       }
+
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_err("fh->io_allowed\n");
+               return -EACCES;
+       }
+
+       /* If Streaming is already started, return error */
+       if (common->started) {
+               vpif_err("channel->started\n");
+               return -EBUSY;
+       }
+
+       if ((ch->channel_id == VPIF_CHANNEL2_VIDEO
+               && oth_ch->common[VPIF_VIDEO_INDEX].started &&
+               ch->vpifparams.std_info.ycmux_mode == 0)
+               || ((ch->channel_id == VPIF_CHANNEL3_VIDEO)
+               && (2 == oth_ch->common[VPIF_VIDEO_INDEX].started))) {
+               vpif_err("other channel is using\n");
+               return -EBUSY;
+       }
+
+       ret = vpif_check_format(ch, &common->fmt.fmt.pix);
+       if (ret < 0)
+               return ret;
+
+       /* Call videobuf_streamon to start streaming  in videobuf */
+       ret = videobuf_streamon(&common->buffer_queue);
+       if (ret < 0) {
+               vpif_err("videobuf_streamon\n");
+               return ret;
+       }
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       /* If buffer queue is empty, return error */
+       if (list_empty(&common->dma_queue)) {
+               vpif_err("buffer queue is empty\n");
+               ret = -EIO;
+               goto streamon_exit;
+       }
+
+       /* Get the next frame from the buffer queue */
+       common->next_frm = common->cur_frm =
+                           list_entry(common->dma_queue.next,
+                                      struct videobuf_buffer, queue);
+
+       list_del(&common->cur_frm->queue);
+       /* Mark state of the current frame to active */
+       common->cur_frm->state = VIDEOBUF_ACTIVE;
+
+       /* Initialize field_id and started member */
+       ch->field_id = 0;
+       common->started = 1;
+       if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               addr = common->cur_frm->boff;
+               /* Calculate the offset for Y and C data  in the buffer */
+               vpif_calculate_offsets(ch);
+
+               if ((ch->vpifparams.std_info.frm_fmt &&
+                       ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE)
+                       && (common->fmt.fmt.pix.field != V4L2_FIELD_ANY)))
+                       || (!ch->vpifparams.std_info.frm_fmt
+                       && (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
+                       vpif_err("conflict in field format and std format\n");
+                       ret = -EINVAL;
+                       goto streamon_exit;
+               }
+
+               /* clock settings */
+               ret =
+                vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
+                                               ch->vpifparams.std_info.hd_sd);
+               if (ret < 0) {
+                       vpif_err("can't set clock\n");
+                       goto streamon_exit;
+               }
+
+               /* set the parameters and addresses */
+               ret = vpif_set_video_params(vpif, ch->channel_id + 2);
+               if (ret < 0)
+                       goto streamon_exit;
+
+               common->started = ret;
+               vpif_config_addr(ch, ret);
+               common->set_addr((addr + common->ytop_off),
+                                (addr + common->ybtm_off),
+                                (addr + common->ctop_off),
+                                (addr + common->cbtm_off));
+
+               /* Set interrupt for both the fields in VPIF
+                  Register enable channel in VPIF register */
+               if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
+                       channel2_intr_assert();
+                       channel2_intr_enable(1);
+                       enable_channel2(1);
+               }
+
+               if ((VPIF_CHANNEL3_VIDEO == ch->channel_id)
+                       || (common->started == 2)) {
+                       channel3_intr_assert();
+                       channel3_intr_enable(1);
+                       enable_channel3(1);
+               }
+               channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
+       }
+
+streamon_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+static int vpif_streamoff(struct file *file, void *priv,
+                               enum v4l2_buf_type buftype)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+
+       if (buftype != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               vpif_err("buffer type not supported\n");
+               return -EINVAL;
+       }
+
+       if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
+               vpif_err("fh->io_allowed\n");
+               return -EACCES;
+       }
+
+       if (!common->started) {
+               vpif_err("channel->started\n");
+               return -EINVAL;
+       }
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               /* disable channel */
+               if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
+                       enable_channel2(0);
+                       channel2_intr_enable(0);
+               }
+               if ((VPIF_CHANNEL3_VIDEO == ch->channel_id) ||
+                                       (2 == common->started)) {
+                       enable_channel3(0);
+                       channel3_intr_enable(0);
+               }
+       }
+
+       common->started = 0;
+       mutex_unlock(&common->lock);
+
+       return videobuf_streamoff(&common->buffer_queue);
+}
+
+static int vpif_cropcap(struct file *file, void *priv,
+                       struct v4l2_cropcap *crop)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       if (V4L2_BUF_TYPE_VIDEO_OUTPUT != crop->type)
+               return -EINVAL;
+
+       crop->bounds.left = crop->bounds.top = 0;
+       crop->defrect.left = crop->defrect.top = 0;
+       crop->defrect.height = crop->bounds.height = common->height;
+       crop->defrect.width = crop->bounds.width = common->width;
+
+       return 0;
+}
+
+static int vpif_enum_output(struct file *file, void *fh,
+                               struct v4l2_output *output)
+{
+
+       struct vpif_display_config *config = vpif_dev->platform_data;
+
+       if (output->index >= config->output_count) {
+               vpif_dbg(1, debug, "Invalid output index\n");
+               return -EINVAL;
+       }
+
+       strcpy(output->name, config->output[output->index]);
+       output->type = V4L2_OUTPUT_TYPE_ANALOG;
+       output->std = DM646X_V4L2_STD;
+
+       return 0;
+}
+
+static int vpif_s_output(struct file *file, void *priv, unsigned int i)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct video_obj *vid_ch = &ch->video;
+       struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+       int ret = 0;
+
+       if (mutex_lock_interruptible(&common->lock))
+               return -ERESTARTSYS;
+
+       if (common->started) {
+               vpif_err("Streaming in progress\n");
+               ret = -EBUSY;
+               goto s_output_exit;
+       }
+
+       ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video,
+                                                       s_routing, 0, i, 0);
+
+       if (ret < 0)
+               vpif_err("Failed to set output standard\n");
+
+       vid_ch->output_id = i;
+
+s_output_exit:
+       mutex_unlock(&common->lock);
+       return ret;
+}
+
+static int vpif_g_output(struct file *file, void *priv, unsigned int *i)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+       struct video_obj *vid_ch = &ch->video;
+
+       *i = vid_ch->output_id;
+
+       return 0;
+}
+
+static int vpif_g_priority(struct file *file, void *priv, enum v4l2_priority *p)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       *p = v4l2_prio_max(&ch->prio);
+
+       return 0;
+}
+
+static int vpif_s_priority(struct file *file, void *priv, enum v4l2_priority p)
+{
+       struct vpif_fh *fh = priv;
+       struct channel_obj *ch = fh->channel;
+
+       return v4l2_prio_change(&ch->prio, &fh->prio, p);
+}
+
+/* vpif display ioctl operations */
+static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
+       .vidioc_querycap                = vpif_querycap,
+       .vidioc_g_priority              = vpif_g_priority,
+       .vidioc_s_priority              = vpif_s_priority,
+       .vidioc_enum_fmt_vid_out        = vpif_enum_fmt_vid_out,
+       .vidioc_g_fmt_vid_out           = vpif_g_fmt_vid_out,
+       .vidioc_s_fmt_vid_out           = vpif_s_fmt_vid_out,
+       .vidioc_try_fmt_vid_out         = vpif_try_fmt_vid_out,
+       .vidioc_reqbufs                 = vpif_reqbufs,
+       .vidioc_querybuf                = vpif_querybuf,
+       .vidioc_qbuf                    = vpif_qbuf,
+       .vidioc_dqbuf                   = vpif_dqbuf,
+       .vidioc_streamon                = vpif_streamon,
+       .vidioc_streamoff               = vpif_streamoff,
+       .vidioc_s_std                   = vpif_s_std,
+       .vidioc_g_std                   = vpif_g_std,
+       .vidioc_enum_output             = vpif_enum_output,
+       .vidioc_s_output                = vpif_s_output,
+       .vidioc_g_output                = vpif_g_output,
+       .vidioc_cropcap                 = vpif_cropcap,
+};
+
+static const struct v4l2_file_operations vpif_fops = {
+       .owner          = THIS_MODULE,
+       .open           = vpif_open,
+       .release        = vpif_release,
+       .ioctl          = video_ioctl2,
+       .mmap           = vpif_mmap,
+       .poll           = vpif_poll
+};
+
+static struct video_device vpif_video_template = {
+       .name           = "vpif",
+       .fops           = &vpif_fops,
+       .minor          = -1,
+       .ioctl_ops      = &vpif_ioctl_ops,
+       .tvnorms        = DM646X_V4L2_STD,
+       .current_norm   = V4L2_STD_625_50,
+
+};
+
+/*Configure the channels, buffer sizei, request irq */
+static int initialize_vpif(void)
+{
+       int free_channel_objects_index;
+       int free_buffer_channel_index;
+       int free_buffer_index;
+       int err = 0, i, j;
+
+       /* Default number of buffers should be 3 */
+       if ((ch2_numbuffers > 0) &&
+           (ch2_numbuffers < config_params.min_numbuffers))
+               ch2_numbuffers = config_params.min_numbuffers;
+       if ((ch3_numbuffers > 0) &&
+           (ch3_numbuffers < config_params.min_numbuffers))
+               ch3_numbuffers = config_params.min_numbuffers;
+
+       /* Set buffer size to min buffers size if invalid buffer size is
+        * given */
+       if (ch2_bufsize < config_params.min_bufsize[VPIF_CHANNEL2_VIDEO])
+               ch2_bufsize =
+                   config_params.min_bufsize[VPIF_CHANNEL2_VIDEO];
+       if (ch3_bufsize < config_params.min_bufsize[VPIF_CHANNEL3_VIDEO])
+               ch3_bufsize =
+                   config_params.min_bufsize[VPIF_CHANNEL3_VIDEO];
+
+       config_params.numbuffers[VPIF_CHANNEL2_VIDEO] = ch2_numbuffers;
+
+       if (ch2_numbuffers) {
+               config_params.channel_bufsize[VPIF_CHANNEL2_VIDEO] =
+                                                       ch2_bufsize;
+       }
+       config_params.numbuffers[VPIF_CHANNEL3_VIDEO] = ch3_numbuffers;
+
+       if (ch3_numbuffers) {
+               config_params.channel_bufsize[VPIF_CHANNEL3_VIDEO] =
+                                                       ch3_bufsize;
+       }
+
+       /* Allocate memory for six channel objects */
+       for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
+               vpif_obj.dev[i] =
+                   kmalloc(sizeof(struct channel_obj), GFP_KERNEL);
+               /* If memory allocation fails, return error */
+               if (!vpif_obj.dev[i]) {
+                       free_channel_objects_index = i;
+                       err = -ENOMEM;
+                       goto vpif_init_free_channel_objects;
+               }
+       }
+
+       free_channel_objects_index = VPIF_DISPLAY_MAX_DEVICES;
+       free_buffer_channel_index = VPIF_DISPLAY_NUM_CHANNELS;
+       free_buffer_index = config_params.numbuffers[i - 1];
+
+       return 0;
+
+vpif_init_free_channel_objects:
+       for (j = 0; j < free_channel_objects_index; j++)
+               kfree(vpif_obj.dev[j]);
+       return err;
+}
+
+/*
+ * vpif_probe: This function creates device entries by register itself to the
+ * V4L2 driver and initializes fields of each channel objects
+ */
+static __init int vpif_probe(struct platform_device *pdev)
+{
+       struct vpif_subdev_info *subdevdata;
+       struct vpif_display_config *config;
+       int i, j = 0, k, q, m, err = 0;
+       struct i2c_adapter *i2c_adap;
+       struct vpif_config *config;
+       struct common_obj *common;
+       struct channel_obj *ch;
+       struct video_device *vfd;
+       struct resource *res;
+       int subdev_count;
+
+       vpif_dev = &pdev->dev;
+
+       err = initialize_vpif();
+
+       if (err) {
+               v4l2_err(vpif_dev->driver, "Error initializing vpif\n");
+               return err;
+       }
+
+       err = v4l2_device_register(vpif_dev, &vpif_obj.v4l2_dev);
+       if (err) {
+               v4l2_err(vpif_dev->driver, "Error registering v4l2 device\n");
+               return err;
+       }
+
+       k = 0;
+       while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
+               for (i = res->start; i <= res->end; i++) {
+                       if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+                                       "DM646x_Display",
+                               (void *)(&vpif_obj.dev[k]->channel_id))) {
+                               err = -EBUSY;
+                               goto vpif_int_err;
+                       }
+               }
+               k++;
+       }
+
+       for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
+
+               /* Get the pointer to the channel object */
+               ch = vpif_obj.dev[i];
+
+               /* Allocate memory for video device */
+               vfd = video_device_alloc();
+               if (vfd == NULL) {
+                       for (j = 0; j < i; j++) {
+                               ch = vpif_obj.dev[j];
+                               video_device_release(ch->video_dev);
+                       }
+                       err = -ENOMEM;
+                       goto vpif_int_err;
+               }
+
+               /* Initialize field of video device */
+               *vfd = vpif_video_template;
+               vfd->v4l2_dev = &vpif_obj.v4l2_dev;
+               vfd->release = video_device_release;
+               snprintf(vfd->name, sizeof(vfd->name),
+                        "DM646x_VPIFDisplay_DRIVER_V%d.%d.%d",
+                        (VPIF_DISPLAY_VERSION_CODE >> 16) & 0xff,
+                        (VPIF_DISPLAY_VERSION_CODE >> 8) & 0xff,
+                        (VPIF_DISPLAY_VERSION_CODE) & 0xff);
+
+               /* Set video_dev to the video device */
+               ch->video_dev = vfd;
+       }
+
+       for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {
+               ch = vpif_obj.dev[j];
+               /* Initialize field of the channel objects */
+               atomic_set(&ch->usrs, 0);
+               for (k = 0; k < VPIF_NUMOBJECTS; k++) {
+                       ch->common[k].numbuffers = 0;
+                       common = &ch->common[k];
+                       common->io_usrs = 0;
+                       common->started = 0;
+                       spin_lock_init(&common->irqlock);
+                       mutex_init(&common->lock);
+                       common->numbuffers = 0;
+                       common->set_addr = NULL;
+                       common->ytop_off = common->ybtm_off = 0;
+                       common->ctop_off = common->cbtm_off = 0;
+                       common->cur_frm = common->next_frm = NULL;
+                       memset(&common->fmt, 0, sizeof(common->fmt));
+                       common->numbuffers = config_params.numbuffers[k];
+
+               }
+               ch->initialized = 0;
+               ch->channel_id = j;
+               if (j < 2)
+                       ch->common[VPIF_VIDEO_INDEX].numbuffers =
+                           config_params.numbuffers[ch->channel_id];
+               else
+                       ch->common[VPIF_VIDEO_INDEX].numbuffers = 0;
+
+               memset(&ch->vpifparams, 0, sizeof(ch->vpifparams));
+
+               /* Initialize prio member of channel object */
+               v4l2_prio_init(&ch->prio);
+               ch->common[VPIF_VIDEO_INDEX].fmt.type =
+                                               V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+               /* register video device */
+               vpif_dbg(1, debug, "channel=%x,channel->video_dev=%x\n",
+                               (int)ch, (int)&ch->video_dev);
+
+               err = video_register_device(ch->video_dev,
+                                         VFL_TYPE_GRABBER, (j ? 3 : 2));
+               if (err < 0)
+                       goto probe_out;
+
+               video_set_drvdata(ch->video_dev, ch);
+       }
+
+       i2c_adap = i2c_get_adapter(1);
+       config = pdev->dev.platform_data;
+       subdev_count = config->subdev_count;
+       subdevdata = config->subdevinfo;
+       vpif_obj.sd = kmalloc(sizeof(struct v4l2_subdev *) * subdev_count,
+                                                               GFP_KERNEL);
+       if (vpif_obj.sd == NULL) {
+               vpif_err("unable to allocate memory for subdevice pointers\n");
+               err = -ENOMEM;
+               goto probe_out;
+       }
+
+       for (i = 0; i < subdev_count; i++) {
+               vpif_obj.sd[i] = v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,
+                                               i2c_adap, subdevdata[i].name,
+                                               &subdevdata[i].board_info,
+                                               NULL);
+               if (!vpif_obj.sd[i]) {
+                       vpif_err("Error registering v4l2 subdevice\n");
+                       goto probe_subdev_out;
+               }
+
+               if (vpif_obj.sd[i])
+                       vpif_obj.sd[i]->grp_id = 1 << i;
+       }
+
+       return 0;
+
+probe_subdev_out:
+       kfree(vpif_obj.sd);
+probe_out:
+       for (k = 0; k < j; k++) {
+               ch = vpif_obj.dev[k];
+               video_unregister_device(ch->video_dev);
+               video_device_release(ch->video_dev);
+               ch->video_dev = NULL;
+       }
+vpif_int_err:
+       v4l2_device_unregister(&vpif_obj.v4l2_dev);
+       vpif_err("VPIF IRQ request failed\n");
+       for (q = k; k >= 0; k--) {
+               for (m = i; m >= res->start; m--)
+                       free_irq(m, (void *)(&vpif_obj.dev[k]->channel_id));
+               res = platform_get_resource(pdev, IORESOURCE_IRQ, k-1);
+               m = res->end;
+       }
+
+       return err;
+}
+
+/*
+ * vpif_remove: It un-register channels from V4L2 driver
+ */
+static int vpif_remove(struct platform_device *device)
+{
+       struct channel_obj *ch;
+       int i;
+
+       v4l2_device_unregister(&vpif_obj.v4l2_dev);
+
+       /* un-register device */
+       for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
+               /* Get the pointer to the channel object */
+               ch = vpif_obj.dev[i];
+               /* Unregister video device */
+               video_unregister_device(ch->video_dev);
+
+               ch->video_dev = NULL;
+       }
+
+       return 0;
+}
+
+static struct platform_driver vpif_driver = {
+       .driver = {
+                       .name   = "vpif_display",
+                       .owner  = THIS_MODULE,
+       },
+       .probe  = vpif_probe,
+       .remove = vpif_remove,
+};
+
+static __init int vpif_init(void)
+{
+       return platform_driver_register(&vpif_driver);
+}
+
+/*
+ * vpif_cleanup: This function un-registers device and driver to the kernel,
+ * frees requested irq handler and de-allocates memory allocated for channel
+ * objects.
+ */
+static void vpif_cleanup(void)
+{
+       struct platform_device *pdev;
+       struct resource *res;
+       int irq_num;
+       int i = 0;
+
+       pdev = container_of(vpif_dev, struct platform_device, dev);
+
+       while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
+               for (irq_num = res->start; irq_num <= res->end; irq_num++)
+                       free_irq(irq_num,
+                                (void *)(&vpif_obj.dev[i]->channel_id));
+               i++;
+       }
+
+       platform_driver_unregister(&vpif_driver);
+       kfree(vpif_obj.sd);
+       for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++)
+               kfree(vpif_obj.dev[i]);
+}
+
+module_init(vpif_init);
+module_exit(vpif_cleanup);
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
new file mode 100644 (file)
index 0000000..a2a7cd1
--- /dev/null
@@ -0,0 +1,175 @@
+/*
+ * DM646x display header file
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef DAVINCIHD_DISPLAY_H
+#define DAVINCIHD_DISPLAY_H
+
+/* Header files */
+#include <linux/videodev2.h>
+#include <linux/version.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
+#include <media/videobuf-core.h>
+#include <media/videobuf-dma-contig.h>
+
+#include "vpif.h"
+
+/* Macros */
+#define VPIF_MAJOR_RELEASE     (0)
+#define VPIF_MINOR_RELEASE     (0)
+#define VPIF_BUILD             (1)
+
+#define VPIF_DISPLAY_VERSION_CODE \
+       ((VPIF_MAJOR_RELEASE << 16) | (VPIF_MINOR_RELEASE << 8) | VPIF_BUILD)
+
+#define VPIF_VALID_FIELD(field) \
+       (((V4L2_FIELD_ANY == field) || (V4L2_FIELD_NONE == field)) || \
+       (((V4L2_FIELD_INTERLACED == field) || (V4L2_FIELD_SEQ_TB == field)) || \
+       (V4L2_FIELD_SEQ_BT == field)))
+
+#define VPIF_DISPLAY_MAX_DEVICES       (2)
+#define VPIF_SLICED_BUF_SIZE           (256)
+#define VPIF_SLICED_MAX_SERVICES       (3)
+#define VPIF_VIDEO_INDEX               (0)
+#define VPIF_VBI_INDEX                 (1)
+#define VPIF_HBI_INDEX                 (2)
+
+/* Setting it to 1 as HBI/VBI support yet to be added , else 3*/
+#define VPIF_NUMOBJECTS        (1)
+
+/* Macros */
+#define ISALIGNED(a)    (0 == ((a) & 7))
+
+/* enumerated data types */
+/* Enumerated data type to give id to each device per channel */
+enum vpif_channel_id {
+       VPIF_CHANNEL2_VIDEO = 0,        /* Channel2 Video */
+       VPIF_CHANNEL3_VIDEO,            /* Channel3 Video */
+};
+
+/* structures */
+
+struct video_obj {
+       enum v4l2_field buf_field;
+       u32 latest_only;                /* indicate whether to return
+                                        * most recent displayed frame only */
+       v4l2_std_id stdid;              /* Currently selected or default
+                                        * standard */
+       u32 output_id;                  /* Current output id */
+};
+
+struct vbi_obj {
+       int num_services;
+       struct vpif_vbi_params vbiparams;       /* vpif parameters for the raw
+                                                * vbi data */
+};
+
+struct common_obj {
+       /* Buffer specific parameters */
+       u8 *fbuffers[VIDEO_MAX_FRAME];          /* List of buffer pointers for
+                                                * storing frames */
+       u32 numbuffers;                         /* number of buffers */
+       struct videobuf_buffer *cur_frm;        /* Pointer pointing to current
+                                                * videobuf_buffer */
+       struct videobuf_buffer *next_frm;       /* Pointer pointing to next
+                                                * videobuf_buffer */
+       enum v4l2_memory memory;                /* This field keeps track of
+                                                * type of buffer exchange
+                                                * method user has selected */
+       struct v4l2_format fmt;                 /* Used to store the format */
+       struct videobuf_queue buffer_queue;     /* Buffer queue used in
+                                                * video-buf */
+       struct list_head dma_queue;             /* Queue of filled frames */
+       spinlock_t irqlock;                     /* Used in video-buf */
+
+       /* channel specific parameters */
+       struct mutex lock;                      /* lock used to access this
+                                                * structure */
+       u32 io_usrs;                            /* number of users performing
+                                                * IO */
+       u8 started;                             /* Indicates whether streaming
+                                                * started */
+       u32 ytop_off;                           /* offset of Y top from the
+                                                * starting of the buffer */
+       u32 ybtm_off;                           /* offset of Y bottom from the
+                                                * starting of the buffer */
+       u32 ctop_off;                           /* offset of C top from the
+                                                * starting of the buffer */
+       u32 cbtm_off;                           /* offset of C bottom from the
+                                                * starting of the buffer */
+       /* Function pointer to set the addresses */
+       void (*set_addr) (unsigned long, unsigned long,
+                               unsigned long, unsigned long);
+       u32 height;
+       u32 width;
+};
+
+struct channel_obj {
+       /* V4l2 specific parameters */
+       struct video_device *video_dev; /* Identifies video device for
+                                        * this channel */
+       struct v4l2_prio_state prio;    /* Used to keep track of state of
+                                        * the priority */
+       atomic_t usrs;                  /* number of open instances of
+                                        * the channel */
+       u32 field_id;                   /* Indicates id of the field
+                                        * which is being displayed */
+       u8 initialized;                 /* flag to indicate whether
+                                        * encoder is initialized */
+
+       enum vpif_channel_id channel_id;/* Identifies channel */
+       struct vpif_params vpifparams;
+       struct common_obj common[VPIF_NUMOBJECTS];
+       struct video_obj video;
+       struct vbi_obj vbi;
+};
+
+/* File handle structure */
+struct vpif_fh {
+       struct channel_obj *channel;    /* pointer to channel object for
+                                        * opened device */
+       u8 io_allowed[VPIF_NUMOBJECTS]; /* Indicates whether this file handle
+                                        * is doing IO */
+       enum v4l2_priority prio;        /* Used to keep track priority of
+                                        * this instance */
+       u8 initialized;                 /* Used to keep track of whether this
+                                        * file handle has initialized
+                                        * channel or not */
+};
+
+/* vpif device structure */
+struct vpif_device {
+       struct v4l2_device v4l2_dev;
+       struct channel_obj *dev[VPIF_DISPLAY_NUM_CHANNELS];
+       struct v4l2_subdev **sd;
+
+};
+
+struct vpif_config_params {
+       u32 min_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
+       u32 channel_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
+       u8 numbuffers[VPIF_DISPLAY_NUM_CHANNELS];
+       u8 min_numbuffers;
+};
+
+/* Struct which keeps track of the line numbers for the sliced vbi service */
+struct vpif_service_line {
+       u16 service_id;
+       u16 service_line[2];
+       u16 enc_service_id;
+       u8 bytestowrite;
+};
+
+#endif                         /* DAVINCIHD_DISPLAY_H */
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c
new file mode 100644 (file)
index 0000000..6d709ca
--- /dev/null
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2009 Texas Instruments.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * common vpss driver for all video drivers.
+ */
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/compiler.h>
+#include <linux/io.h>
+#include <mach/hardware.h>
+#include <media/davinci/vpss.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("VPSS Driver");
+MODULE_AUTHOR("Texas Instruments");
+
+/* DM644x defines */
+#define DM644X_SBL_PCR_VPSS            (4)
+
+/* vpss BL register offsets */
+#define DM355_VPSSBL_CCDCMUX           0x1c
+/* vpss CLK register offsets */
+#define DM355_VPSSCLK_CLKCTRL          0x04
+/* masks and shifts */
+#define VPSS_HSSISEL_SHIFT             4
+
+/*
+ * vpss operations. Depends on platform. Not all functions are available
+ * on all platforms. The api, first check if a functio is available before
+ * invoking it. In the probe, the function ptrs are intialized based on
+ * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc.
+ */
+struct vpss_hw_ops {
+       /* enable clock */
+       int (*enable_clock)(enum vpss_clock_sel clock_sel, int en);
+       /* select input to ccdc */
+       void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel);
+       /* clear wbl overlflow bit */
+       int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel);
+};
+
+/* vpss configuration */
+struct vpss_oper_config {
+       __iomem void *vpss_bl_regs_base;
+       __iomem void *vpss_regs_base;
+       struct resource         *r1;
+       resource_size_t         len1;
+       struct resource         *r2;
+       resource_size_t         len2;
+       char vpss_name[32];
+       spinlock_t vpss_lock;
+       struct vpss_hw_ops hw_ops;
+};
+
+static struct vpss_oper_config oper_cfg;
+
+/* register access routines */
+static inline u32 bl_regr(u32 offset)
+{
+       return __raw_readl(oper_cfg.vpss_bl_regs_base + offset);
+}
+
+static inline void bl_regw(u32 val, u32 offset)
+{
+       __raw_writel(val, oper_cfg.vpss_bl_regs_base + offset);
+}
+
+static inline u32 vpss_regr(u32 offset)
+{
+       return __raw_readl(oper_cfg.vpss_regs_base + offset);
+}
+
+static inline void vpss_regw(u32 val, u32 offset)
+{
+       __raw_writel(val, oper_cfg.vpss_regs_base + offset);
+}
+
+static void dm355_select_ccdc_source(enum vpss_ccdc_source_sel src_sel)
+{
+       bl_regw(src_sel << VPSS_HSSISEL_SHIFT, DM355_VPSSBL_CCDCMUX);
+}
+
+int vpss_select_ccdc_source(enum vpss_ccdc_source_sel src_sel)
+{
+       if (!oper_cfg.hw_ops.select_ccdc_source)
+               return -1;
+
+       dm355_select_ccdc_source(src_sel);
+       return 0;
+}
+EXPORT_SYMBOL(vpss_select_ccdc_source);
+
+static int dm644x_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel)
+{
+       u32 mask = 1, val;
+
+       if (wbl_sel < VPSS_PCR_AEW_WBL_0 ||
+           wbl_sel > VPSS_PCR_CCDC_WBL_O)
+               return -1;
+
+       /* writing a 0 clear the overflow */
+       mask = ~(mask << wbl_sel);
+       val = bl_regr(DM644X_SBL_PCR_VPSS) & mask;
+       bl_regw(val, DM644X_SBL_PCR_VPSS);
+       return 0;
+}
+
+int vpss_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel)
+{
+       if (!oper_cfg.hw_ops.clear_wbl_overflow)
+               return -1;
+
+       return oper_cfg.hw_ops.clear_wbl_overflow(wbl_sel);
+}
+EXPORT_SYMBOL(vpss_clear_wbl_overflow);
+
+/*
+ *  dm355_enable_clock - Enable VPSS Clock
+ *  @clock_sel: CLock to be enabled/disabled
+ *  @en: enable/disable flag
+ *
+ *  This is called to enable or disable a vpss clock
+ */
+static int dm355_enable_clock(enum vpss_clock_sel clock_sel, int en)
+{
+       unsigned long flags;
+       u32 utemp, mask = 0x1, shift = 0;
+
+       switch (clock_sel) {
+       case VPSS_VPBE_CLOCK:
+               /* nothing since lsb */
+               break;
+       case VPSS_VENC_CLOCK_SEL:
+               shift = 2;
+               break;
+       case VPSS_CFALD_CLOCK:
+               shift = 3;
+               break;
+       case VPSS_H3A_CLOCK:
+               shift = 4;
+               break;
+       case VPSS_IPIPE_CLOCK:
+               shift = 5;
+               break;
+       case VPSS_CCDC_CLOCK:
+               shift = 6;
+               break;
+       default:
+               printk(KERN_ERR "dm355_enable_clock:"
+                               " Invalid selector: %d\n", clock_sel);
+               return -1;
+       }
+
+       spin_lock_irqsave(&oper_cfg.vpss_lock, flags);
+       utemp = vpss_regr(DM355_VPSSCLK_CLKCTRL);
+       if (!en)
+               utemp &= ~(mask << shift);
+       else
+               utemp |= (mask << shift);
+
+       vpss_regw(utemp, DM355_VPSSCLK_CLKCTRL);
+       spin_unlock_irqrestore(&oper_cfg.vpss_lock, flags);
+       return 0;
+}
+
+int vpss_enable_clock(enum vpss_clock_sel clock_sel, int en)
+{
+       if (!oper_cfg.hw_ops.enable_clock)
+               return -1;
+
+       return oper_cfg.hw_ops.enable_clock(clock_sel, en);
+}
+EXPORT_SYMBOL(vpss_enable_clock);
+
+static int __init vpss_probe(struct platform_device *pdev)
+{
+       int status, dm355 = 0;
+
+       if (!pdev->dev.platform_data) {
+               dev_err(&pdev->dev, "no platform data\n");
+               return -ENOENT;
+       }
+       strcpy(oper_cfg.vpss_name, pdev->dev.platform_data);
+
+       if (!strcmp(oper_cfg.vpss_name, "dm355_vpss"))
+               dm355 = 1;
+       else if (strcmp(oper_cfg.vpss_name, "dm644x_vpss")) {
+               dev_err(&pdev->dev, "vpss driver not supported on"
+                       " this platform\n");
+               return -ENODEV;
+       }
+
+       dev_info(&pdev->dev, "%s vpss probed\n", oper_cfg.vpss_name);
+       oper_cfg.r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!oper_cfg.r1)
+               return -ENOENT;
+
+       oper_cfg.len1 = oper_cfg.r1->end - oper_cfg.r1->start + 1;
+
+       oper_cfg.r1 = request_mem_region(oper_cfg.r1->start, oper_cfg.len1,
+                                        oper_cfg.r1->name);
+       if (!oper_cfg.r1)
+               return -EBUSY;
+
+       oper_cfg.vpss_bl_regs_base = ioremap(oper_cfg.r1->start, oper_cfg.len1);
+       if (!oper_cfg.vpss_bl_regs_base) {
+               status = -EBUSY;
+               goto fail1;
+       }
+
+       if (dm355) {
+               oper_cfg.r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+               if (!oper_cfg.r2) {
+                       status = -ENOENT;
+                       goto fail2;
+               }
+               oper_cfg.len2 = oper_cfg.r2->end - oper_cfg.r2->start + 1;
+               oper_cfg.r2 = request_mem_region(oper_cfg.r2->start,
+                                                oper_cfg.len2,
+                                                oper_cfg.r2->name);
+               if (!oper_cfg.r2) {
+                       status = -EBUSY;
+                       goto fail2;
+               }
+
+               oper_cfg.vpss_regs_base = ioremap(oper_cfg.r2->start,
+                                                 oper_cfg.len2);
+               if (!oper_cfg.vpss_regs_base) {
+                       status = -EBUSY;
+                       goto fail3;
+               }
+       }
+
+       if (dm355) {
+               oper_cfg.hw_ops.enable_clock = dm355_enable_clock;
+               oper_cfg.hw_ops.select_ccdc_source = dm355_select_ccdc_source;
+       } else
+               oper_cfg.hw_ops.clear_wbl_overflow = dm644x_clear_wbl_overflow;
+
+       spin_lock_init(&oper_cfg.vpss_lock);
+       dev_info(&pdev->dev, "%s vpss probe success\n", oper_cfg.vpss_name);
+       return 0;
+
+fail3:
+       release_mem_region(oper_cfg.r2->start, oper_cfg.len2);
+fail2:
+       iounmap(oper_cfg.vpss_bl_regs_base);
+fail1:
+       release_mem_region(oper_cfg.r1->start, oper_cfg.len1);
+       return status;
+}
+
+static int vpss_remove(struct platform_device *pdev)
+{
+       iounmap(oper_cfg.vpss_bl_regs_base);
+       release_mem_region(oper_cfg.r1->start, oper_cfg.len1);
+       if (!strcmp(oper_cfg.vpss_name, "dm355_vpss")) {
+               iounmap(oper_cfg.vpss_regs_base);
+               release_mem_region(oper_cfg.r2->start, oper_cfg.len2);
+       }
+       return 0;
+}
+
+static struct platform_driver vpss_driver = {
+       .driver = {
+               .name   = "vpss",
+               .owner = THIS_MODULE,
+       },
+       .remove = __devexit_p(vpss_remove),
+       .probe = vpss_probe,
+};
+
+static void vpss_exit(void)
+{
+       platform_driver_unregister(&vpss_driver);
+}
+
+static int __init vpss_init(void)
+{
+       return platform_driver_register(&vpss_driver);
+}
+subsys_initcall(vpss_init);
+module_exit(vpss_exit);
index 6524b49..c7be0e0 100644 (file)
@@ -36,6 +36,7 @@ config VIDEO_EM28XX_DVB
        depends on VIDEO_EM28XX && DVB_CORE
        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select VIDEOBUF_DVB
        ---help---
          This adds support for DVB cards based on the
index 8137a8c..d0f093d 100644 (file)
@@ -1,5 +1,5 @@
 em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
-                  em28xx-input.o
+                  em28xx-input.o em28xx-vbi.o
 
 em28xx-alsa-objs := em28xx-audio.o
 
index 7e3c782..bdb249b 100644 (file)
@@ -170,6 +170,19 @@ static struct em28xx_reg_seq pinnacle_hybrid_pro_digital[] = {
        {       -1,             -1,     -1,             -1},
 };
 
+/* eb1a:2868 Reddo DVB-C USB TV Box
+   GPIO4 - CU1216L NIM
+   Other GPIOs seems to be don't care. */
+static struct em28xx_reg_seq reddo_dvb_c_usb_box[] = {
+       {EM28XX_R08_GPIO,       0xfe,   0xff,           10},
+       {EM28XX_R08_GPIO,       0xde,   0xff,           10},
+       {EM28XX_R08_GPIO,       0xfe,   0xff,           10},
+       {EM28XX_R08_GPIO,       0xff,   0xff,           10},
+       {EM28XX_R08_GPIO,       0x7f,   0xff,           10},
+       {EM28XX_R08_GPIO,       0x6f,   0xff,           10},
+       {EM28XX_R08_GPIO,       0xff,   0xff,           10},
+       {-1,                    -1,     -1,             -1},
+};
 
 /* Callback for the most boards */
 static struct em28xx_reg_seq default_tuner_gpio[] = {
@@ -1566,6 +1579,14 @@ struct em28xx_board em28xx_boards[] = {
                        .gpio     = evga_indtube_analog,
                } },
        },
+       /* eb1a:2868 Empia EM2870 + Philips CU1216L NIM (Philips TDA10023 +
+          Infineon TUA6034) */
+       [EM2870_BOARD_REDDO_DVB_C_USB_BOX] = {
+               .name          = "Reddo DVB-C USB TV Box",
+               .tuner_type    = TUNER_ABSENT,
+               .has_dvb       = 1,
+               .dvb_gpio      = reddo_dvb_c_usb_box,
+       },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -1593,6 +1614,8 @@ struct usb_device_id em28xx_id_table[] = {
                        .driver_info = EM2820_BOARD_UNKNOWN },
        { USB_DEVICE(0xeb1a, 0x2883),
                        .driver_info = EM2820_BOARD_UNKNOWN },
+       { USB_DEVICE(0xeb1a, 0x2868),
+                       .driver_info = EM2820_BOARD_UNKNOWN },
        { USB_DEVICE(0xeb1a, 0xe300),
                        .driver_info = EM2861_BOARD_KWORLD_PVRTV_300U },
        { USB_DEVICE(0xeb1a, 0xe303),
@@ -1696,6 +1719,7 @@ static struct em28xx_hash_table em28xx_eeprom_hash[] = {
        {0x166a0441, EM2880_BOARD_EMPIRE_DUAL_TV, TUNER_XC2028},
        {0xcee44a99, EM2882_BOARD_EVGA_INDTUBE, TUNER_XC2028},
        {0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
+       {0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */
@@ -2348,55 +2372,55 @@ void em28xx_card_setup(struct em28xx *dev)
 
        /* request some modules */
        if (dev->board.has_msp34xx)
-               v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                       "msp3400", "msp3400", msp3400_addrs);
+               v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                       "msp3400", "msp3400", 0, msp3400_addrs);
 
        if (dev->board.decoder == EM28XX_SAA711X)
-               v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                       "saa7115", "saa7115_auto", saa711x_addrs);
+               v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                       "saa7115", "saa7115_auto", 0, saa711x_addrs);
 
        if (dev->board.decoder == EM28XX_TVP5150)
-               v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                       "tvp5150", "tvp5150", tvp5150_addrs);
+               v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                       "tvp5150", "tvp5150", 0, tvp5150_addrs);
 
        if (dev->em28xx_sensor == EM28XX_MT9V011) {
                struct v4l2_subdev *sd;
 
-               sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
-                        &dev->i2c_adap, "mt9v011", "mt9v011", mt9v011_addrs);
+               sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                        &dev->i2c_adap, "mt9v011", "mt9v011", 0, mt9v011_addrs);
                v4l2_subdev_call(sd, core, s_config, 0, &dev->sensor_xtal);
        }
 
 
        if (dev->board.adecoder == EM28XX_TVAUDIO)
                v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                       "tvaudio", "tvaudio", dev->board.tvaudio_addr);
+                       "tvaudio", "tvaudio", dev->board.tvaudio_addr, NULL);
 
        if (dev->board.tuner_type != TUNER_ABSENT) {
                int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
 
                if (dev->board.radio.type)
                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                               "tuner", "tuner", dev->board.radio_addr);
+                               "tuner", "tuner", dev->board.radio_addr, NULL);
 
                if (has_demod)
-                       v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                       v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                               0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                if (dev->tuner_addr == 0) {
                        enum v4l2_i2c_tuner_type type =
                                has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
                        struct v4l2_subdev *sd;
 
-                       sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                       sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(type));
+                               0, v4l2_i2c_tuner_addrs(type));
 
                        if (sd)
                                dev->tuner_addr = v4l2_i2c_subdev_addr(sd);
                } else {
                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-                               "tuner", "tuner", dev->tuner_addr);
+                               "tuner", "tuner", dev->tuner_addr, NULL);
                }
        }
 
@@ -2570,7 +2594,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         * Default format, used for tvp5150 or saa711x output formats
         */
        dev->vinmode = 0x10;
-       dev->vinctl  = 0x11;
+       dev->vinctl  = EM28XX_VINCTRL_INTERLACED |
+                      EM28XX_VINCTRL_CCIR656_ENABLE;
 
        /* Do board specific init and eeprom reading */
        em28xx_card_setup(dev);
@@ -2589,6 +2614,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
        /* init video dma queues */
        INIT_LIST_HEAD(&dev->vidq.active);
        INIT_LIST_HEAD(&dev->vidq.queued);
+       INIT_LIST_HEAD(&dev->vbiq.active);
+       INIT_LIST_HEAD(&dev->vbiq.queued);
 
 
        if (dev->board.has_msp34xx) {
index 98e140b..a88257a 100644 (file)
@@ -54,6 +54,10 @@ static int alt = EM28XX_PINOUT;
 module_param(alt, int, 0644);
 MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
 
+static unsigned int disable_vbi;
+module_param(disable_vbi, int, 0644);
+MODULE_PARM_DESC(disable_vbi, "disable vbi support");
+
 /* FIXME */
 #define em28xx_isocdbg(fmt, arg...) do {\
        if (core_debug) \
@@ -648,9 +652,24 @@ int em28xx_capture_start(struct em28xx *dev, int start)
        return rc;
 }
 
+int em28xx_vbi_supported(struct em28xx *dev)
+{
+       /* Modprobe option to manually disable */
+       if (disable_vbi == 1)
+               return 0;
+
+       if (dev->chip_id == CHIP_ID_EM2860 ||
+           dev->chip_id == CHIP_ID_EM2883)
+               return 1;
+
+       /* Version of em28xx that does not support VBI */
+       return 0;
+}
+
 int em28xx_set_outfmt(struct em28xx *dev)
 {
        int ret;
+       u8 vinctrl;
 
        ret = em28xx_write_reg_bits(dev, EM28XX_R27_OUTFMT,
                                dev->format->reg | 0x20, 0xff);
@@ -661,7 +680,16 @@ int em28xx_set_outfmt(struct em28xx *dev)
        if (ret < 0)
                return ret;
 
-       return em28xx_write_reg(dev, EM28XX_R11_VINCTRL, dev->vinctl);
+       vinctrl = dev->vinctl;
+       if (em28xx_vbi_supported(dev) == 1) {
+               vinctrl |= EM28XX_VINCTRL_VBI_RAW;
+               em28xx_write_reg(dev, EM28XX_R34_VBI_START_H, 0x00);
+               em28xx_write_reg(dev, EM28XX_R35_VBI_START_V, 0x09);
+               em28xx_write_reg(dev, EM28XX_R36_VBI_WIDTH, 0xb4);
+               em28xx_write_reg(dev, EM28XX_R37_VBI_HEIGHT, 0x0c);
+       }
+
+       return em28xx_write_reg(dev, EM28XX_R11_VINCTRL, vinctrl);
 }
 
 static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,
@@ -732,7 +760,14 @@ int em28xx_resolution_set(struct em28xx *dev)
 
 
        em28xx_accumulator_set(dev, 1, (width - 4) >> 2, 1, (height - 4) >> 2);
-       em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2);
+
+       /* If we don't set the start position to 4 in VBI mode, we end up
+          with line 21 being YUYV encoded instead of being in 8-bit
+          greyscale */
+       if (em28xx_vbi_supported(dev) == 1)
+               em28xx_capture_area_set(dev, 0, 4, width >> 2, height >> 2);
+       else
+               em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2);
 
        return em28xx_scaler_set(dev, dev->hscale, dev->vscale);
 }
@@ -844,8 +879,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
  */
 static void em28xx_irq_callback(struct urb *urb)
 {
-       struct em28xx_dmaqueue  *dma_q = urb->context;
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
+       struct em28xx *dev = urb->context;
        int rc, i;
 
        switch (urb->status) {
@@ -930,6 +964,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,
                     int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
 {
        struct em28xx_dmaqueue *dma_q = &dev->vidq;
+       struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
        int i;
        int sb_size, pipe;
        struct urb *urb;
@@ -959,7 +994,8 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,
        }
 
        dev->isoc_ctl.max_pkt_size = max_pkt_size;
-       dev->isoc_ctl.buf = NULL;
+       dev->isoc_ctl.vid_buf = NULL;
+       dev->isoc_ctl.vbi_buf = NULL;
 
        sb_size = max_packets * dev->isoc_ctl.max_pkt_size;
 
@@ -994,7 +1030,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,
 
                usb_fill_int_urb(urb, dev->udev, pipe,
                                 dev->isoc_ctl.transfer_buffer[i], sb_size,
-                                em28xx_irq_callback, dma_q, 1);
+                                em28xx_irq_callback, dev, 1);
 
                urb->number_of_packets = max_packets;
                urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
@@ -1009,6 +1045,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,
        }
 
        init_waitqueue_head(&dma_q->wq);
+       init_waitqueue_head(&vbi_dma_q->wq);
 
        em28xx_capture_start(dev, 1);
 
@@ -1094,7 +1131,7 @@ struct em28xx *em28xx_get_device(int minor,
        list_for_each_entry(h, &em28xx_devlist, devlist) {
                if (h->vdev->minor == minor)
                        dev = h;
-               if (h->vbi_dev->minor == minor) {
+               if (h->vbi_dev && h->vbi_dev->minor == minor) {
                        dev = h;
                        *fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
                }
index d603575..db74946 100644 (file)
@@ -33,6 +33,7 @@
 #include "s5h1409.h"
 #include "mt352.h"
 #include "mt352_priv.h" /* FIXME */
+#include "tda1002x.h"
 
 MODULE_DESCRIPTION("driver for em28xx based DVB cards");
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
@@ -295,6 +296,11 @@ static struct mt352_config terratec_xs_mt352_cfg = {
        .demod_init = mt352_terratec_xs_init,
 };
 
+static struct tda10023_config em28xx_tda10023_config = {
+       .demod_address = 0x0c,
+       .invert = 1,
+};
+
 /* ------------------------------------------------------------------ */
 
 static int attach_xc3028(u8 addr, struct em28xx *dev)
@@ -549,6 +555,19 @@ static int dvb_init(struct em28xx *dev)
                }
                break;
 #endif
+       case EM2870_BOARD_REDDO_DVB_C_USB_BOX:
+               /* Philips CU1216L NIM (Philips TDA10023 + Infineon TUA6034) */
+               dvb->frontend = dvb_attach(tda10023_attach,
+                       &em28xx_tda10023_config,
+                       &dev->i2c_adap, 0x48);
+               if (dvb->frontend) {
+                       if (!dvb_attach(simple_tuner_attach, dvb->frontend,
+                               &dev->i2c_adap, 0x60, TUNER_PHILIPS_CU1216L)) {
+                               result = -EINVAL;
+                               goto out_free;
+                       }
+               }
+               break;
        default:
                printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                " isn't supported yet\n",
index 6bf84bd..ed12e7f 100644 (file)
 #define EM28XX_XCLK_FREQUENCY_24MHZ    0x0b
 
 #define EM28XX_R10_VINMODE     0x10
+
 #define EM28XX_R11_VINCTRL     0x11
+
+/* em28xx Video Input Control Register 0x11 */
+#define EM28XX_VINCTRL_VBI_SLICED      0x80
+#define EM28XX_VINCTRL_VBI_RAW         0x40
+#define EM28XX_VINCTRL_VOUT_MODE_IN    0x20 /* HREF,VREF,VACT in output */
+#define EM28XX_VINCTRL_CCIR656_ENABLE  0x10
+#define EM28XX_VINCTRL_VBI_16BIT_RAW   0x08 /* otherwise 8-bit raw */
+#define EM28XX_VINCTRL_FID_ON_HREF     0x04
+#define EM28XX_VINCTRL_DUAL_EDGE_STROBE        0x02
+#define EM28XX_VINCTRL_INTERLACED      0x01
+
 #define EM28XX_R12_VINENABLE   0x12    /* */
 
 #define EM28XX_R14_GAMMA       0x14
 #define EM28XX_R31_HSCALEHIGH  0x31
 #define EM28XX_R32_VSCALELOW   0x32
 #define EM28XX_R33_VSCALEHIGH  0x33
+#define EM28XX_R34_VBI_START_H 0x34
+#define EM28XX_R35_VBI_START_V 0x35
+#define EM28XX_R36_VBI_WIDTH   0x36
+#define EM28XX_R37_VBI_HEIGHT  0x37
 
 #define EM28XX_R40_AC97LSB     0x40
 #define EM28XX_R41_AC97MSB     0x41
diff --git a/drivers/media/video/em28xx/em28xx-vbi.c b/drivers/media/video/em28xx/em28xx-vbi.c
new file mode 100644 (file)
index 0000000..94943e5
--- /dev/null
@@ -0,0 +1,142 @@
+/*
+   em28xx-vbi.c - VBI driver for em28xx
+
+   Copyright (C) 2009 Devin Heitmueller <dheitmueller@kernellabs.com>
+
+   This work was sponsored by EyeMagnet Limited.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+
+#include "em28xx.h"
+
+static unsigned int vbibufs = 5;
+module_param(vbibufs, int, 0644);
+MODULE_PARM_DESC(vbibufs, "number of vbi buffers, range 2-32");
+
+static unsigned int vbi_debug;
+module_param(vbi_debug, int, 0644);
+MODULE_PARM_DESC(vbi_debug, "enable debug messages [vbi]");
+
+#define dprintk(level, fmt, arg...)    if (vbi_debug >= level) \
+       printk(KERN_DEBUG "%s: " fmt, dev->core->name , ## arg)
+
+/* ------------------------------------------------------------------ */
+
+static void
+free_buffer(struct videobuf_queue *vq, struct em28xx_buffer *buf)
+{
+       struct em28xx_fh     *fh  = vq->priv_data;
+       struct em28xx        *dev = fh->dev;
+       unsigned long flags = 0;
+       if (in_interrupt())
+               BUG();
+
+       /* We used to wait for the buffer to finish here, but this didn't work
+          because, as we were keeping the state as VIDEOBUF_QUEUED,
+          videobuf_queue_cancel marked it as finished for us.
+          (Also, it could wedge forever if the hardware was misconfigured.)
+
+          This should be safe; by the time we get here, the buffer isn't
+          queued anymore. If we ever start marking the buffers as
+          VIDEOBUF_ACTIVE, it won't be, though.
+       */
+       spin_lock_irqsave(&dev->slock, flags);
+       if (dev->isoc_ctl.vbi_buf == buf)
+               dev->isoc_ctl.vbi_buf = NULL;
+       spin_unlock_irqrestore(&dev->slock, flags);
+
+       videobuf_vmalloc_free(&buf->vb);
+       buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int
+vbi_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
+{
+       *size = 720 * 12 * 2;
+       if (0 == *count)
+               *count = vbibufs;
+       if (*count < 2)
+               *count = 2;
+       if (*count > 32)
+               *count = 32;
+       return 0;
+}
+
+static int
+vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
+           enum v4l2_field field)
+{
+       struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+       int                  rc = 0;
+       unsigned int size;
+
+       size = 720 * 12 * 2;
+
+       buf->vb.size = size;
+
+       if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
+               return -EINVAL;
+
+       buf->vb.width  = 720;
+       buf->vb.height = 12;
+       buf->vb.field  = field;
+
+       if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+               rc = videobuf_iolock(q, &buf->vb, NULL);
+               if (rc < 0)
+                       goto fail;
+       }
+
+       buf->vb.state = VIDEOBUF_PREPARED;
+       return 0;
+
+fail:
+       free_buffer(q, buf);
+       return rc;
+}
+
+static void
+vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct em28xx_buffer    *buf     = container_of(vb,
+                                                       struct em28xx_buffer,
+                                                       vb);
+       struct em28xx_fh        *fh      = vq->priv_data;
+       struct em28xx           *dev     = fh->dev;
+       struct em28xx_dmaqueue  *vbiq    = &dev->vbiq;
+
+       buf->vb.state = VIDEOBUF_QUEUED;
+       list_add_tail(&buf->vb.queue, &vbiq->active);
+}
+
+static void vbi_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+{
+       struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+       free_buffer(q, buf);
+}
+
+struct videobuf_queue_ops em28xx_vbi_qops = {
+       .buf_setup    = vbi_setup,
+       .buf_prepare  = vbi_prepare,
+       .buf_queue    = vbi_queue,
+       .buf_release  = vbi_release,
+};
index a6bdbc2..3a1dfb7 100644 (file)
@@ -163,7 +163,24 @@ static inline void buffer_filled(struct em28xx *dev,
        buf->vb.field_count++;
        do_gettimeofday(&buf->vb.ts);
 
-       dev->isoc_ctl.buf = NULL;
+       dev->isoc_ctl.vid_buf = NULL;
+
+       list_del(&buf->vb.queue);
+       wake_up(&buf->vb.done);
+}
+
+static inline void vbi_buffer_filled(struct em28xx *dev,
+                                    struct em28xx_dmaqueue *dma_q,
+                                    struct em28xx_buffer *buf)
+{
+       /* Advice that buffer was filled */
+       em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
+
+       buf->vb.state = VIDEOBUF_DONE;
+       buf->vb.field_count++;
+       do_gettimeofday(&buf->vb.ts);
+
+       dev->isoc_ctl.vbi_buf = NULL;
 
        list_del(&buf->vb.queue);
        wake_up(&buf->vb.done);
@@ -239,7 +256,8 @@ static void em28xx_copy_video(struct em28xx *dev,
 
                if ((char *)startwrite + lencopy > (char *)outp +
                    buf->vb.size) {
-                       em28xx_isocdbg("Overflow of %zi bytes past buffer end (2)\n",
+                       em28xx_isocdbg("Overflow of %zi bytes past buffer end"
+                                      "(2)\n",
                                       ((char *)startwrite + lencopy) -
                                       ((char *)outp + buf->vb.size));
                        lencopy = remain = (char *)outp + buf->vb.size -
@@ -256,6 +274,63 @@ static void em28xx_copy_video(struct em28xx *dev,
        dma_q->pos += len;
 }
 
+static void em28xx_copy_vbi(struct em28xx *dev,
+                             struct em28xx_dmaqueue  *dma_q,
+                             struct em28xx_buffer *buf,
+                             unsigned char *p,
+                             unsigned char *outp, unsigned long len)
+{
+       void *startwrite, *startread;
+       int  offset;
+       int bytesperline = 720;
+
+       if (dev == NULL) {
+               em28xx_isocdbg("dev is null\n");
+               return;
+       }
+
+       if (dma_q == NULL) {
+               em28xx_isocdbg("dma_q is null\n");
+               return;
+       }
+       if (buf == NULL) {
+               return;
+       }
+       if (p == NULL) {
+               em28xx_isocdbg("p is null\n");
+               return;
+       }
+       if (outp == NULL) {
+               em28xx_isocdbg("outp is null\n");
+               return;
+       }
+
+       if (dma_q->pos + len > buf->vb.size)
+               len = buf->vb.size - dma_q->pos;
+
+       if ((p[0] == 0x33 && p[1] == 0x95) ||
+           (p[0] == 0x88 && p[1] == 0x88)) {
+               /* Header field, advance past it */
+               p += 4;
+       } else {
+               len += 4;
+       }
+
+       startread = p;
+
+       startwrite = outp + dma_q->pos;
+       offset = dma_q->pos;
+
+       /* Make sure the bottom field populates the second half of the frame */
+       if (buf->top_field == 0) {
+               startwrite += bytesperline * 0x0c;
+               offset += bytesperline * 0x0c;
+       }
+
+       memcpy(startwrite, startread, len);
+       dma_q->pos += len;
+}
+
 static inline void print_err_status(struct em28xx *dev,
                                     int packet, int status)
 {
@@ -306,7 +381,7 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
 
        if (list_empty(&dma_q->active)) {
                em28xx_isocdbg("No active queue to serve\n");
-               dev->isoc_ctl.buf = NULL;
+               dev->isoc_ctl.vid_buf = NULL;
                *buf = NULL;
                return;
        }
@@ -318,7 +393,34 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
        outp = videobuf_to_vmalloc(&(*buf)->vb);
        memset(outp, 0, (*buf)->vb.size);
 
-       dev->isoc_ctl.buf = *buf;
+       dev->isoc_ctl.vid_buf = *buf;
+
+       return;
+}
+
+/*
+ * video-buf generic routine to get the next available VBI buffer
+ */
+static inline void vbi_get_next_buf(struct em28xx_dmaqueue *dma_q,
+                                   struct em28xx_buffer **buf)
+{
+       struct em28xx *dev = container_of(dma_q, struct em28xx, vbiq);
+       char *outp;
+
+       if (list_empty(&dma_q->active)) {
+               em28xx_isocdbg("No active queue to serve\n");
+               dev->isoc_ctl.vbi_buf = NULL;
+               *buf = NULL;
+               return;
+       }
+
+       /* Get the next buffer */
+       *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
+       /* Cleans up buffer - Usefull for testing for frame/URB loss */
+       outp = videobuf_to_vmalloc(&(*buf)->vb);
+       memset(outp, 0x00, (*buf)->vb.size);
+
+       dev->isoc_ctl.vbi_buf = *buf;
 
        return;
 }
@@ -329,7 +431,7 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
 static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
 {
        struct em28xx_buffer    *buf;
-       struct em28xx_dmaqueue  *dma_q = urb->context;
+       struct em28xx_dmaqueue  *dma_q = &dev->vidq;
        unsigned char *outp = NULL;
        int i, len = 0, rc = 1;
        unsigned char *p;
@@ -346,7 +448,7 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
                        return 0;
        }
 
-       buf = dev->isoc_ctl.buf;
+       buf = dev->isoc_ctl.vid_buf;
        if (buf != NULL)
                outp = videobuf_to_vmalloc(&buf->vb);
 
@@ -410,6 +512,153 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
        return rc;
 }
 
+/* Version of isoc handler that takes into account a mixture of video and
+   VBI data */
+static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
+{
+       struct em28xx_buffer    *buf, *vbi_buf;
+       struct em28xx_dmaqueue  *dma_q = &dev->vidq;
+       struct em28xx_dmaqueue  *vbi_dma_q = &dev->vbiq;
+       unsigned char *outp = NULL;
+       unsigned char *vbioutp = NULL;
+       int i, len = 0, rc = 1;
+       unsigned char *p;
+       int vbi_size;
+
+       if (!dev)
+               return 0;
+
+       if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+               return 0;
+
+       if (urb->status < 0) {
+               print_err_status(dev, -1, urb->status);
+               if (urb->status == -ENOENT)
+                       return 0;
+       }
+
+       buf = dev->isoc_ctl.vid_buf;
+       if (buf != NULL)
+               outp = videobuf_to_vmalloc(&buf->vb);
+
+       vbi_buf = dev->isoc_ctl.vbi_buf;
+       if (vbi_buf != NULL)
+               vbioutp = videobuf_to_vmalloc(&vbi_buf->vb);
+
+       for (i = 0; i < urb->number_of_packets; i++) {
+               int status = urb->iso_frame_desc[i].status;
+
+               if (status < 0) {
+                       print_err_status(dev, i, status);
+                       if (urb->iso_frame_desc[i].status != -EPROTO)
+                               continue;
+               }
+
+               len = urb->iso_frame_desc[i].actual_length - 4;
+
+               if (urb->iso_frame_desc[i].actual_length <= 0) {
+                       /* em28xx_isocdbg("packet %d is empty",i); - spammy */
+                       continue;
+               }
+               if (urb->iso_frame_desc[i].actual_length >
+                                               dev->max_pkt_size) {
+                       em28xx_isocdbg("packet bigger than packet size");
+                       continue;
+               }
+
+               p = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+
+               /* capture type 0 = vbi start
+                  capture type 1 = video start
+                  capture type 2 = video in progress */
+               if (p[0] == 0x33 && p[1] == 0x95) {
+                       dev->capture_type = 0;
+                       dev->vbi_read = 0;
+                       em28xx_isocdbg("VBI START HEADER!!!\n");
+                       dev->cur_field = p[2];
+               }
+
+               /* FIXME: get rid of hard-coded value */
+               vbi_size = 720 * 0x0c;
+
+               if (dev->capture_type == 0) {
+                       if (dev->vbi_read >= vbi_size) {
+                               /* We've already read all the VBI data, so
+                                  treat the rest as video */
+                               em28xx_isocdbg("dev->vbi_read > vbi_size\n");
+                       } else if ((dev->vbi_read + len) < vbi_size) {
+                               /* This entire frame is VBI data */
+                               if (dev->vbi_read == 0 &&
+                                   (!(dev->cur_field & 1))) {
+                                       /* Brand new frame */
+                                       if (vbi_buf != NULL)
+                                               vbi_buffer_filled(dev,
+                                                                 vbi_dma_q,
+                                                                 vbi_buf);
+                                       vbi_get_next_buf(vbi_dma_q, &vbi_buf);
+                                       if (vbi_buf == NULL)
+                                               vbioutp = NULL;
+                                       else
+                                               vbioutp = videobuf_to_vmalloc(
+                                                       &vbi_buf->vb);
+                               }
+
+                               if (dev->vbi_read == 0) {
+                                       vbi_dma_q->pos = 0;
+                                       if (vbi_buf != NULL) {
+                                               if (dev->cur_field & 1)
+                                                       vbi_buf->top_field = 0;
+                                               else
+                                                       vbi_buf->top_field = 1;
+                                       }
+                               }
+
+                               dev->vbi_read += len;
+                               em28xx_copy_vbi(dev, vbi_dma_q, vbi_buf, p,
+                                               vbioutp, len);
+                       } else {
+                               /* Some of this frame is VBI data and some is
+                                  video data */
+                               int vbi_data_len = vbi_size - dev->vbi_read;
+                               dev->vbi_read += vbi_data_len;
+                               em28xx_copy_vbi(dev, vbi_dma_q, vbi_buf, p,
+                                               vbioutp, vbi_data_len);
+                               dev->capture_type = 1;
+                               p += vbi_data_len;
+                               len -= vbi_data_len;
+                       }
+               }
+
+               if (dev->capture_type == 1) {
+                       dev->capture_type = 2;
+                       em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
+                                      len, (p[2] & 1) ? "odd" : "even");
+
+                       if (dev->progressive || !(dev->cur_field & 1)) {
+                               if (buf != NULL)
+                                       buffer_filled(dev, dma_q, buf);
+                               get_next_buf(dma_q, &buf);
+                               if (buf == NULL)
+                                       outp = NULL;
+                               else
+                                       outp = videobuf_to_vmalloc(&buf->vb);
+                       }
+                       if (buf != NULL) {
+                               if (dev->cur_field & 1)
+                                       buf->top_field = 0;
+                               else
+                                       buf->top_field = 1;
+                       }
+
+                       dma_q->pos = 0;
+               }
+               if (buf != NULL && dev->capture_type == 2)
+                       em28xx_copy_video(dev, dma_q, buf, p, outp, len);
+       }
+       return rc;
+}
+
+
 /* ------------------------------------------------------------------
        Videobuf operations
    ------------------------------------------------------------------*/
@@ -421,7 +670,8 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
        struct em28xx        *dev = fh->dev;
        struct v4l2_frequency f;
 
-       *size = (fh->dev->width * fh->dev->height * dev->format->depth + 7) >> 3;
+       *size = (fh->dev->width * fh->dev->height * dev->format->depth + 7)
+               >> 3;
 
        if (0 == *count)
                *count = EM28XX_DEF_BUF;
@@ -458,8 +708,8 @@ static void free_buffer(struct videobuf_queue *vq, struct em28xx_buffer *buf)
           VIDEOBUF_ACTIVE, it won't be, though.
        */
        spin_lock_irqsave(&dev->slock, flags);
-       if (dev->isoc_ctl.buf == buf)
-               dev->isoc_ctl.buf = NULL;
+       if (dev->isoc_ctl.vid_buf == buf)
+               dev->isoc_ctl.vid_buf = NULL;
        spin_unlock_irqrestore(&dev->slock, flags);
 
        videobuf_vmalloc_free(&buf->vb);
@@ -475,7 +725,8 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
        struct em28xx        *dev = fh->dev;
        int                  rc = 0, urb_init = 0;
 
-       buf->vb.size = (fh->dev->width * fh->dev->height * dev->format->depth + 7) >> 3;
+       buf->vb.size = (fh->dev->width * fh->dev->height * dev->format->depth
+                       + 7) >> 3;
 
        if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
                return -EINVAL;
@@ -494,9 +745,16 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                urb_init = 1;
 
        if (urb_init) {
-               rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
-                                     EM28XX_NUM_BUFS, dev->max_pkt_size,
-                                     em28xx_isoc_copy);
+               if (em28xx_vbi_supported(dev) == 1)
+                       rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                                             EM28XX_NUM_BUFS,
+                                             dev->max_pkt_size,
+                                             em28xx_isoc_copy_vbi);
+               else
+                       rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                                             EM28XX_NUM_BUFS,
+                                             dev->max_pkt_size,
+                                             em28xx_isoc_copy);
                if (rc < 0)
                        goto fail;
        }
@@ -578,34 +836,63 @@ static void video_mux(struct em28xx *dev, int index)
 }
 
 /* Usage lock check functions */
-static int res_get(struct em28xx_fh *fh)
+static int res_get(struct em28xx_fh *fh, unsigned int bit)
 {
        struct em28xx    *dev = fh->dev;
-       int              rc   = 0;
 
-       /* This instance already has stream_on */
-       if (fh->stream_on)
-               return rc;
+       if (fh->resources & bit)
+               /* have it already allocated */
+               return 1;
 
-       if (dev->stream_on)
-               return -EBUSY;
+       /* is it free? */
+       mutex_lock(&dev->lock);
+       if (dev->resources & bit) {
+               /* no, someone else uses it */
+               mutex_unlock(&dev->lock);
+               return 0;
+       }
+       /* it's free, grab it */
+       fh->resources  |= bit;
+       dev->resources |= bit;
+       em28xx_videodbg("res: get %d\n", bit);
+       mutex_unlock(&dev->lock);
+       return 1;
+}
 
-       dev->stream_on = 1;
-       fh->stream_on  = 1;
-       return rc;
+static int res_check(struct em28xx_fh *fh, unsigned int bit)
+{
+       return fh->resources & bit;
 }
 
-static int res_check(struct em28xx_fh *fh)
+static int res_locked(struct em28xx *dev, unsigned int bit)
 {
-       return fh->stream_on;
+       return dev->resources & bit;
 }
 
-static void res_free(struct em28xx_fh *fh)
+static void res_free(struct em28xx_fh *fh, unsigned int bits)
 {
        struct em28xx    *dev = fh->dev;
 
-       fh->stream_on = 0;
-       dev->stream_on = 0;
+       BUG_ON((fh->resources & bits) != bits);
+
+       mutex_lock(&dev->lock);
+       fh->resources  &= ~bits;
+       dev->resources &= ~bits;
+       em28xx_videodbg("res: put %d\n", bits);
+       mutex_unlock(&dev->lock);
+}
+
+static int get_ressource(struct em28xx_fh *fh)
+{
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               return EM28XX_RESOURCE_VIDEO;
+       case V4L2_BUF_TYPE_VBI_CAPTURE:
+               return EM28XX_RESOURCE_VBI;
+       default:
+               BUG();
+               return 0;
+       }
 }
 
 /*
@@ -782,7 +1069,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
        } else {
                /* width must even because of the YUYV format
                   height must be even because of interlacing */
-               v4l_bound_align_image(&width, 48, maxw, 1, &height, 32, maxh, 1, 0);
+               v4l_bound_align_image(&width, 48, maxw, 1, &height, 32, maxh,
+                                     1, 0);
        }
 
        get_scale(dev, width, height, &hscale, &vscale);
@@ -848,12 +1136,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                goto out;
        }
 
-       if (dev->stream_on && !fh->stream_on) {
-               em28xx_errdev("%s device in use by another fh\n", __func__);
-               rc = -EBUSY;
-               goto out;
-       }
-
        rc = em28xx_set_video_format(dev, f->fmt.pix.pixelformat,
                                f->fmt.pix.width, f->fmt.pix.height);
 
@@ -862,6 +1144,21 @@ out:
        return rc;
 }
 
+static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+       int                rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       *norm = dev->norm;
+
+       return 0;
+}
+
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
 {
        struct em28xx_fh   *fh  = priv;
@@ -1413,20 +1710,25 @@ static int vidioc_streamon(struct file *file, void *priv,
 {
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
-       int                   rc;
+       int                   rc = -EINVAL;
 
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
 
+       if (unlikely(type != fh->type))
+               return -EINVAL;
 
-       mutex_lock(&dev->lock);
-       rc = res_get(fh);
+       em28xx_videodbg("vidioc_streamon fh=%p t=%d fh->res=%d dev->res=%d\n",
+                       fh, type, fh->resources, dev->resources);
 
-       if (likely(rc >= 0))
-               rc = videobuf_streamon(&fh->vb_vidq);
+       if (unlikely(!res_get(fh, get_ressource(fh))))
+               return -EBUSY;
 
-       mutex_unlock(&dev->lock);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               rc = videobuf_streamon(&fh->vb_vidq);
+       else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)
+               rc = videobuf_streamon(&fh->vb_vbiq);
 
        return rc;
 }
@@ -1442,17 +1744,22 @@ static int vidioc_streamoff(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           fh->type != V4L2_BUF_TYPE_VBI_CAPTURE)
                return -EINVAL;
        if (type != fh->type)
                return -EINVAL;
 
-       mutex_lock(&dev->lock);
+       em28xx_videodbg("vidioc_streamoff fh=%p t=%d fh->res=%d dev->res=%d\n",
+                       fh, type, fh->resources, dev->resources);
 
-       videobuf_streamoff(&fh->vb_vidq);
-       res_free(fh);
-
-       mutex_unlock(&dev->lock);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               videobuf_streamoff(&fh->vb_vidq);
+               res_free(fh, EM28XX_RESOURCE_VIDEO);
+       } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+               videobuf_streamoff(&fh->vb_vbiq);
+               res_free(fh, EM28XX_RESOURCE_VBI);
+       }
 
        return 0;
 }
@@ -1474,6 +1781,9 @@ static int vidioc_querycap(struct file *file, void  *priv,
                        V4L2_CAP_VIDEO_CAPTURE |
                        V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
 
+       if (dev->vbi_dev)
+               cap->capabilities |= V4L2_CAP_VBI_CAPTURE;
+
        if (dev->audio_mode.has_audio)
                cap->capabilities |= V4L2_CAP_AUDIO;
 
@@ -1541,6 +1851,45 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
        return 0;
 }
 
+/* RAW VBI ioctls */
+
+static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
+                               struct v4l2_format *format)
+{
+       format->fmt.vbi.samples_per_line = 720;
+       format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
+       format->fmt.vbi.offset = 0;
+       format->fmt.vbi.flags = 0;
+
+       /* Varies by video standard (NTSC, PAL, etc.) */
+       /* FIXME: hard-coded for NTSC support */
+       format->fmt.vbi.sampling_rate = 6750000 * 4 / 2; /* FIXME: ??? */
+       format->fmt.vbi.count[0] = 12;
+       format->fmt.vbi.count[1] = 12;
+       format->fmt.vbi.start[0] = 10;
+       format->fmt.vbi.start[1] = 273;
+
+       return 0;
+}
+
+static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
+                               struct v4l2_format *format)
+{
+       format->fmt.vbi.samples_per_line = 720;
+       format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
+       format->fmt.vbi.offset = 0;
+       format->fmt.vbi.flags = 0;
+
+       /* Varies by video standard (NTSC, PAL, etc.) */
+       /* FIXME: hard-coded for NTSC support */
+       format->fmt.vbi.sampling_rate = 6750000 * 4 / 2; /* FIXME: ??? */
+       format->fmt.vbi.count[0] = 12;
+       format->fmt.vbi.count[1] = 12;
+       format->fmt.vbi.start[0] = 10;
+       format->fmt.vbi.start[1] = 273;
+
+       return 0;
+}
 
 static int vidioc_reqbufs(struct file *file, void *priv,
                          struct v4l2_requestbuffers *rb)
@@ -1553,7 +1902,10 @@ static int vidioc_reqbufs(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       return videobuf_reqbufs(&fh->vb_vidq, rb);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return videobuf_reqbufs(&fh->vb_vidq, rb);
+       else
+               return videobuf_reqbufs(&fh->vb_vbiq, rb);
 }
 
 static int vidioc_querybuf(struct file *file, void *priv,
@@ -1567,7 +1919,18 @@ static int vidioc_querybuf(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       return videobuf_querybuf(&fh->vb_vidq, b);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return videobuf_querybuf(&fh->vb_vidq, b);
+       else {
+               /* FIXME: I'm not sure yet whether this is a bug in zvbi or
+                  the videobuf framework, but we probably shouldn't be
+                  returning a buffer larger than that which was asked for.
+                  At a minimum, it causes a crash in zvbi since it does
+                  a memcpy based on the source buffer length */
+               int result = videobuf_querybuf(&fh->vb_vbiq, b);
+               b->length = 17280;
+               return result;
+       }
 }
 
 static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
@@ -1580,7 +1943,10 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
        if (rc < 0)
                return rc;
 
-       return videobuf_qbuf(&fh->vb_vidq, b);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return videobuf_qbuf(&fh->vb_vidq, b);
+       else
+               return videobuf_qbuf(&fh->vb_vbiq, b);
 }
 
 static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
@@ -1593,7 +1959,12 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
        if (rc < 0)
                return rc;
 
-       return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags & O_NONBLOCK);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags &
+                                     O_NONBLOCK);
+       else
+               return videobuf_dqbuf(&fh->vb_vbiq, b, file->f_flags &
+                                     O_NONBLOCK);
 }
 
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
@@ -1601,7 +1972,10 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
 {
        struct em28xx_fh  *fh = priv;
 
-       return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);
+       else
+               return videobuf_cgmbuf(&fh->vb_vbiq, mbuf, 8);
 }
 #endif
 
@@ -1766,8 +2140,15 @@ static int em28xx_v4l2_open(struct file *filp)
                field = V4L2_FIELD_INTERLACED;
 
        videobuf_queue_vmalloc_init(&fh->vb_vidq, &em28xx_video_qops,
-                       NULL, &dev->slock, fh->type, field,
-                       sizeof(struct em28xx_buffer), fh);
+                                   NULL, &dev->slock,
+                                   V4L2_BUF_TYPE_VIDEO_CAPTURE, field,
+                                   sizeof(struct em28xx_buffer), fh);
+
+       videobuf_queue_vmalloc_init(&fh->vb_vbiq, &em28xx_vbi_qops,
+                                   NULL, &dev->slock,
+                                   V4L2_BUF_TYPE_VBI_CAPTURE,
+                                   V4L2_FIELD_SEQ_TB,
+                                   sizeof(struct em28xx_buffer), fh);
 
        mutex_unlock(&dev->lock);
 
@@ -1824,20 +2205,21 @@ static int em28xx_v4l2_close(struct file *filp)
 
        em28xx_videodbg("users=%d\n", dev->users);
 
+       if (res_check(fh, EM28XX_RESOURCE_VIDEO)) {
+               videobuf_stop(&fh->vb_vidq);
+               res_free(fh, EM28XX_RESOURCE_VIDEO);
+       }
 
-       mutex_lock(&dev->lock);
-       if (res_check(fh))
-               res_free(fh);
+       if (res_check(fh, EM28XX_RESOURCE_VBI)) {
+               videobuf_stop(&fh->vb_vbiq);
+               res_free(fh, EM28XX_RESOURCE_VBI);
+       }
 
        if (dev->users == 1) {
-               videobuf_stop(&fh->vb_vidq);
-               videobuf_mmap_free(&fh->vb_vidq);
-
                /* the device is already disconnect,
                   free the remaining resources */
                if (dev->state & DEV_DISCONNECTED) {
                        em28xx_release_resources(dev);
-                       mutex_unlock(&dev->lock);
                        kfree(dev);
                        return 0;
                }
@@ -1858,10 +2240,12 @@ static int em28xx_v4l2_close(struct file *filp)
                                        "0 (error=%i)\n", errCode);
                }
        }
+
+       videobuf_mmap_free(&fh->vb_vidq);
+       videobuf_mmap_free(&fh->vb_vbiq);
        kfree(fh);
        dev->users--;
        wake_up_interruptible_nr(&dev->open, 1);
-       mutex_unlock(&dev->lock);
        return 0;
 }
 
@@ -1886,16 +2270,22 @@ em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
         */
 
        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               mutex_lock(&dev->lock);
-               rc = res_get(fh);
-               mutex_unlock(&dev->lock);
-
-               if (unlikely(rc < 0))
-                       return rc;
+               if (res_locked(dev, EM28XX_RESOURCE_VIDEO))
+                       return -EBUSY;
 
                return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
                                        filp->f_flags & O_NONBLOCK);
        }
+
+
+       if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+               if (!res_get(fh, EM28XX_RESOURCE_VBI))
+                       return -EBUSY;
+
+               return videobuf_read_stream(&fh->vb_vbiq, buf, count, pos, 0,
+                                       filp->f_flags & O_NONBLOCK);
+       }
+
        return 0;
 }
 
@@ -1913,17 +2303,17 @@ static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table *wait)
        if (rc < 0)
                return rc;
 
-       mutex_lock(&dev->lock);
-       rc = res_get(fh);
-       mutex_unlock(&dev->lock);
-
-       if (unlikely(rc < 0))
-               return POLLERR;
-
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               if (!res_get(fh, EM28XX_RESOURCE_VIDEO))
+                       return POLLERR;
+               return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
+       } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+               if (!res_get(fh, EM28XX_RESOURCE_VBI))
+                       return POLLERR;
+               return videobuf_poll_stream(filp, &fh->vb_vbiq, wait);
+       } else {
                return POLLERR;
-
-       return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
+       }
 }
 
 /*
@@ -1939,14 +2329,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
        if (rc < 0)
                return rc;
 
-       mutex_lock(&dev->lock);
-       rc = res_get(fh);
-       mutex_unlock(&dev->lock);
-
-       if (unlikely(rc < 0))
-               return rc;
-
-       rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
+       else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)
+               rc = videobuf_mmap_mapper(&fh->vb_vbiq, vma);
 
        em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n",
                (unsigned long)vma->vm_start,
@@ -1972,6 +2358,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
        .vidioc_g_fmt_vid_cap       = vidioc_g_fmt_vid_cap,
        .vidioc_try_fmt_vid_cap     = vidioc_try_fmt_vid_cap,
        .vidioc_s_fmt_vid_cap       = vidioc_s_fmt_vid_cap,
+       .vidioc_g_fmt_vbi_cap       = vidioc_g_fmt_vbi_cap,
+       .vidioc_s_fmt_vbi_cap       = vidioc_s_fmt_vbi_cap,
        .vidioc_g_audio             = vidioc_g_audio,
        .vidioc_s_audio             = vidioc_s_audio,
        .vidioc_cropcap             = vidioc_cropcap,
@@ -1984,6 +2372,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
        .vidioc_querybuf            = vidioc_querybuf,
        .vidioc_qbuf                = vidioc_qbuf,
        .vidioc_dqbuf               = vidioc_dqbuf,
+       .vidioc_g_std               = vidioc_g_std,
        .vidioc_s_std               = vidioc_s_std,
        .vidioc_g_parm              = vidioc_g_parm,
        .vidioc_s_parm              = vidioc_s_parm,
@@ -2105,13 +2494,10 @@ int em28xx_register_analog_devices(struct em28xx *dev)
        dev->mute = 1;
        dev->volume = 0x1f;
 
-       /* enable vbi capturing */
-
 /*     em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */
        val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK);
        em28xx_write_reg(dev, EM28XX_R0F_XCLK,
                         (EM28XX_XCLK_AUDIO_UNMUTE | val));
-       em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51);
 
        em28xx_set_outfmt(dev);
        em28xx_colorlevels_set_default(dev);
@@ -2134,14 +2520,17 @@ int em28xx_register_analog_devices(struct em28xx *dev)
        }
 
        /* Allocate and fill vbi video_device struct */
-       dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
+       if (em28xx_vbi_supported(dev) == 1) {
+               dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
+                                               "vbi");
 
-       /* register v4l2 vbi video_device */
-       ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
-                                       vbi_nr[dev->devno]);
-       if (ret < 0) {
-               em28xx_errdev("unable to register vbi device\n");
-               return ret;
+               /* register v4l2 vbi video_device */
+               ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
+                                           vbi_nr[dev->devno]);
+               if (ret < 0) {
+                       em28xx_errdev("unable to register vbi device\n");
+                       return ret;
+               }
        }
 
        if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
@@ -2161,8 +2550,12 @@ int em28xx_register_analog_devices(struct em28xx *dev)
                            dev->radio_dev->num);
        }
 
-       em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                               dev->vdev->num, dev->vbi_dev->num);
+       em28xx_info("V4L2 video device registered as /dev/video%d\n",
+                               dev->vdev->num);
+
+       if (dev->vbi_dev)
+               em28xx_info("V4L2 VBI device registered as /dev/vbi%d\n",
+                           dev->vbi_dev->num);
 
        return 0;
 }
index 0f2ba9a..0a73e8b 100644 (file)
 #define EM2882_BOARD_EVGA_INDTUBE                70
 #define EM2820_BOARD_SILVERCREST_WEBCAM           71
 #define EM2861_BOARD_GADMEI_UTV330PLUS           72
+#define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -214,7 +215,8 @@ struct em28xx_usb_isoc_ctl {
        int                             tmp_buf_len;
 
                /* Stores already requested buffers */
-       struct em28xx_buffer            *buf;
+       struct em28xx_buffer            *vid_buf;
+       struct em28xx_buffer            *vbi_buf;
 
                /* Stores the number of received fields */
        int                             nfields;
@@ -443,6 +445,10 @@ enum em28xx_dev_state {
 #define EM28XX_AUDIO   0x10
 #define EM28XX_DVB     0x20
 
+/* em28xx resource types (used for res_get/res_lock etc */
+#define EM28XX_RESOURCE_VIDEO 0x01
+#define EM28XX_RESOURCE_VBI   0x02
+
 struct em28xx_audio {
        char name[50];
        char *transfer_buffer[EM28XX_AUDIO_BUFS];
@@ -463,10 +469,11 @@ struct em28xx;
 
 struct em28xx_fh {
        struct em28xx *dev;
-       unsigned int  stream_on:1;      /* Locks streams */
        int           radio;
+       unsigned int  resources;
 
        struct videobuf_queue        vb_vidq;
+       struct videobuf_queue        vb_vbiq;
 
        enum v4l2_buf_type           type;
 };
@@ -493,7 +500,6 @@ struct em28xx {
        /* Vinmode/Vinctl used at the driver */
        int vinmode, vinctl;
 
-       unsigned int stream_on:1;       /* Locks streams */
        unsigned int has_audio_class:1;
        unsigned int has_alsa_audio:1;
 
@@ -544,6 +550,12 @@ struct em28xx {
        enum em28xx_dev_state state;
        enum em28xx_io_method io;
 
+       /* vbi related state tracking */
+       int capture_type;
+       int vbi_read;
+       unsigned char cur_field;
+
+
        struct work_struct         request_module_wk;
 
        /* locks */
@@ -555,10 +567,14 @@ struct em28xx {
        struct video_device *vbi_dev;
        struct video_device *radio_dev;
 
+       /* resources in use */
+       unsigned int resources;
+
        unsigned char eedata[256];
 
        /* Isoc control struct */
        struct em28xx_dmaqueue vidq;
+       struct em28xx_dmaqueue vbiq;
        struct em28xx_usb_isoc_ctl isoc_ctl;
        spinlock_t slock;
 
@@ -639,6 +655,7 @@ int em28xx_audio_setup(struct em28xx *dev);
 
 int em28xx_colorlevels_set_default(struct em28xx *dev);
 int em28xx_capture_start(struct em28xx *dev, int start);
+int em28xx_vbi_supported(struct em28xx *dev);
 int em28xx_set_outfmt(struct em28xx *dev);
 int em28xx_resolution_set(struct em28xx *dev);
 int em28xx_set_alternate(struct em28xx *dev);
@@ -686,6 +703,9 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev);
 int em28xx_ir_init(struct em28xx *dev);
 int em28xx_ir_fini(struct em28xx *dev);
 
+/* Provided by em28xx-vbi.c */
+extern struct videobuf_queue_ops em28xx_vbi_qops;
+
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
index d1c1e45..74092f4 100644 (file)
@@ -1379,8 +1379,10 @@ et61x251_read(struct file* filp, char __user * buf,
                            (!list_empty(&cam->outqueue)) ||
                            (cam->state & DEV_DISCONNECTED) ||
                            (cam->state & DEV_MISCONFIGURED),
-                           cam->module_param.frame_timeout *
-                           1000 * msecs_to_jiffies(1) );
+                           msecs_to_jiffies(
+                               cam->module_param.frame_timeout * 1000
+                           )
+                         );
                if (timeout < 0) {
                        mutex_unlock(&cam->fileop_mutex);
                        return timeout;
index 8897283..fe2e490 100644 (file)
@@ -19,6 +19,7 @@ if USB_GSPCA && VIDEO_V4L2
 
 source "drivers/media/video/gspca/m5602/Kconfig"
 source "drivers/media/video/gspca/stv06xx/Kconfig"
+source "drivers/media/video/gspca/gl860/Kconfig"
 
 config USB_GSPCA_CONEX
        tristate "Conexant Camera Driver"
index 035616b..b742081 100644 (file)
@@ -58,3 +58,4 @@ gspca_zc3xx-objs    := zc3xx.o
 
 obj-$(CONFIG_USB_M5602)   += m5602/
 obj-$(CONFIG_USB_STV06XX) += stv06xx/
+obj-$(CONFIG_USB_GL860)   += gl860/
diff --git a/drivers/media/video/gspca/gl860/Kconfig b/drivers/media/video/gspca/gl860/Kconfig
new file mode 100644 (file)
index 0000000..22772f5
--- /dev/null
@@ -0,0 +1,8 @@
+config USB_GL860
+       tristate "GL860 USB Camera Driver"
+       depends on VIDEO_V4L2 && USB_GSPCA
+       help
+         Say Y here if you want support for cameras based on the GL860 chip.
+
+         To compile this driver as a module, choose M here: the
+         module will be called gspca_gl860.
diff --git a/drivers/media/video/gspca/gl860/Makefile b/drivers/media/video/gspca/gl860/Makefile
new file mode 100644 (file)
index 0000000..13c9403
--- /dev/null
@@ -0,0 +1,10 @@
+obj-$(CONFIG_USB_GL860) += gspca_gl860.o
+
+gspca_gl860-objs := gl860.o \
+                   gl860-mi1320.o \
+                   gl860-ov2640.o \
+                   gl860-ov9655.o \
+                   gl860-mi2020.o
+
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
+
diff --git a/drivers/media/video/gspca/gl860/gl860-mi1320.c b/drivers/media/video/gspca/gl860/gl860-mi1320.c
new file mode 100644 (file)
index 0000000..39f6261
--- /dev/null
@@ -0,0 +1,537 @@
+/* @file gl860-mi1320.c
+ * @author Olivier LORIN from my logs
+ * @date 2009-08-27
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Sensor : MI1320 */
+
+#include "gl860.h"
+
+static struct validx tbl_common[] = {
+       {0xba00, 0x00f0}, {0xba00, 0x00f1}, {0xba51, 0x0066}, {0xba02, 0x00f1},
+       {0xba05, 0x0067}, {0xba05, 0x00f1}, {0xbaa0, 0x0065}, {0xba00, 0x00f1},
+       {0xffff, 0xffff},
+       {0xba00, 0x00f0}, {0xba02, 0x00f1}, {0xbafa, 0x0028}, {0xba02, 0x00f1},
+       {0xba00, 0x00f0}, {0xba01, 0x00f1}, {0xbaf0, 0x0006}, {0xba0e, 0x00f1},
+       {0xba70, 0x0006}, {0xba0e, 0x00f1},
+       {0xffff, 0xffff},
+       {0xba74, 0x0006}, {0xba0e, 0x00f1},
+       {0xffff, 0xffff},
+       {0x0061, 0x0000}, {0x0068, 0x000d},
+};
+
+static struct validx tbl_init_at_startup[] = {
+       {0x0000, 0x0000}, {0x0010, 0x0010},
+       {35, 0xffff},
+       {0x0008, 0x00c0}, {0x0001, 0x00c1}, {0x0001, 0x00c2}, {0x0020, 0x0006},
+       {0x006a, 0x000d},
+};
+
+static struct validx tbl_sensor_settings_common[] = {
+       {0x0010, 0x0010}, {0x0003, 0x00c1}, {0x0042, 0x00c2}, {0x0040, 0x0000},
+       {0x006a, 0x0007}, {0x006a, 0x000d}, {0x0063, 0x0006},
+};
+static struct validx tbl_sensor_settings_1280[] = {
+       {0xba00, 0x00f0}, {0xba00, 0x00f1}, {0xba5a, 0x0066}, {0xba02, 0x00f1},
+       {0xba05, 0x0067}, {0xba05, 0x00f1}, {0xba20, 0x0065}, {0xba00, 0x00f1},
+};
+static struct validx tbl_sensor_settings_800[] = {
+       {0xba00, 0x00f0}, {0xba00, 0x00f1}, {0xba5a, 0x0066}, {0xba02, 0x00f1},
+       {0xba05, 0x0067}, {0xba05, 0x00f1}, {0xba20, 0x0065}, {0xba00, 0x00f1},
+};
+static struct validx tbl_sensor_settings_640[] = {
+       {0xba00, 0x00f0}, {0xba00, 0x00f1}, {0xbaa0, 0x0065}, {0xba00, 0x00f1},
+       {0xba51, 0x0066}, {0xba02, 0x00f1}, {0xba05, 0x0067}, {0xba05, 0x00f1},
+       {0xba20, 0x0065}, {0xba00, 0x00f1},
+};
+static struct validx tbl_post_unset_alt[] = {
+       {0xba00, 0x00f0}, {0xba00, 0x00f1}, {0xbaa0, 0x0065}, {0xba00, 0x00f1},
+       {0x0061, 0x0000}, {0x0068, 0x000d},
+};
+
+static u8 *tbl_1280[] = {
+       "\x0d\x80\xf1\x08\x03\x04\xf1\x00" "\x04\x05\xf1\x02\x05\x00\xf1\xf1"
+       "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08"
+       "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00"
+       "\xa9\x04\xf1\x00\xa1\x05\xf1\x00" "\xa4\x04\xf1\x00\xae\x0a\xf1\x08"
+       ,
+       "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47"
+       "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c"
+       "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01"
+       ,
+       "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1"
+};
+
+static u8 *tbl_800[] = {
+       "\x0d\x80\xf1\x08\x03\x03\xf1\xc0" "\x04\x05\xf1\x02\x05\x00\xf1\xf1"
+       "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08"
+       "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00"
+       "\xa9\x03\xf1\xc0\xa1\x03\xf1\x20" "\xa4\x02\xf1\x5a\xae\x0a\xf1\x08"
+       ,
+       "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47"
+       "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c"
+       "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01"
+       ,
+       "\xd3\x02\xd4\x18\xd5\x21\xd0\x02" "\xd1\x10\xd2\x59"
+};
+
+static u8 *tbl_640[] = {
+       "\x0d\x80\xf1\x08\x03\x04\xf1\x04" "\x04\x05\xf1\x02\x07\x01\xf1\x7c"
+       "\x08\x00\xf1\x0e\x21\x80\xf1\x00" "\x0d\x00\xf1\x08\xf0\x00\xf1\x01"
+       "\x34\x10\xf1\x10\x3a\x43\xf1\x00" "\xa6\x05\xf1\x02\xa9\x04\xf1\x04"
+       "\xa7\x02\xf1\x81\xaa\x01\xf1\xe2" "\xae\x0c\xf1\x09"
+       ,
+       "\xf0\x00\xf1\x02\x39\x03\xf1\xfc" "\x3b\x04\xf1\x04\x57\x01\xf1\xb6"
+       "\x58\x02\xf1\x0d\x5c\x1f\xf1\x19" "\x5d\x24\xf1\x1e\x64\x5e\xf1\x1c"
+       "\xd2\x00\xf1\x00\xcb\x00\xf1\x01"
+       ,
+       "\xd3\x02\xd4\x10\xd5\x81\xd0\x02" "\xd1\x08\xd2\xe1"
+};
+
+static s32 tbl_sat[] = {0x25, 0x1d, 0x15, 0x0d, 0x05, 0x4d, 0x55, 0x5d, 0x2d};
+static s32 tbl_bright[] = {0, 8, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70};
+static s32 tbl_backlight[] = {0x0e, 0x06, 0x02};
+
+static s32 tbl_cntr1[] = {
+       0x90, 0x98, 0xa0, 0xa8, 0xb0, 0xb8, 0xc0, 0xc8, 0xd0, 0xe0, 0xf0};
+static s32 tbl_cntr2[] = {
+       0x70, 0x68, 0x60, 0x58, 0x50, 0x48, 0x40, 0x38, 0x30, 0x20, 0x10};
+
+static u8 dat_wbalNL[] =
+       "\xf0\x00\xf1\x01\x05\x00\xf1\x06" "\x3b\x04\xf1\x2a\x47\x10\xf1\x10"
+       "\x9d\x3c\xf1\xae\xaf\x10\xf1\x00" "\xf0\x00\xf1\x02\x2f\x91\xf1\x20"
+       "\x9c\x91\xf1\x20\x37\x03\xf1\x00" "\x9d\xc5\xf1\x0f\xf0\x00\xf1\x00";
+
+static u8 dat_wbalLL[] =
+       "\xf0\x00\xf1\x01\x05\x00\xf1\x0c" "\x3b\x04\xf1\x2a\x47\x40\xf1\x40"
+       "\x9d\x20\xf1\xae\xaf\x10\xf1\x00" "\xf0\x00\xf1\x02\x2f\xd1\xf1\x00"
+       "\x9c\xd1\xf1\x00\x37\x03\xf1\x00" "\x9d\xc5\xf1\x3f\xf0\x00\xf1\x00";
+
+static u8 dat_wbalBL[] =
+       "\xf0\x00\xf1\x01\x05\x00\xf1\x06" "\x47\x10\xf1\x30\x9d\x3c\xf1\xae"
+       "\xaf\x10\xf1\x00\xf0\x00\xf1\x02" "\x2f\x91\xf1\x20\x9c\x91\xf1\x20"
+       "\x37\x03\xf1\x00\x9d\xc5\xf1\x2f" "\xf0\x00\xf1\x00";
+
+static u8 dat_hvflip1[] = {0xf0, 0x00, 0xf1, 0x00};
+
+static u8 s000[] =
+       "\x00\x01\x07\x6a\x06\x63\x0d\x6a" "\xc0\x00\x10\x10\xc1\x03\xc2\x42"
+       "\xd8\x04\x58\x00\x04\x02";
+static u8 s001[] =
+       "\x0d\x00\xf1\x0b\x0d\x00\xf1\x08" "\x35\x00\xf1\x22\x68\x00\xf1\x5d"
+       "\xf0\x00\xf1\x01\x06\x70\xf1\x0e" "\xf0\x00\xf1\x02\xdd\x18\xf1\xe0";
+static u8 s002[] =
+       "\x05\x01\xf1\x84\x06\x00\xf1\x44" "\x07\x00\xf1\xbe\x08\x00\xf1\x1e"
+       "\x20\x01\xf1\x03\x21\x84\xf1\x00" "\x22\x0d\xf1\x0f\x24\x80\xf1\x00"
+       "\x34\x18\xf1\x2d\x35\x00\xf1\x22" "\x43\x83\xf1\x83\x59\x00\xf1\xff";
+static u8 s003[] =
+       "\xf0\x00\xf1\x02\x39\x06\xf1\x8c" "\x3a\x06\xf1\x8c\x3b\x03\xf1\xda"
+       "\x3c\x05\xf1\x30\x57\x01\xf1\x0c" "\x58\x01\xf1\x42\x59\x01\xf1\x0c"
+       "\x5a\x01\xf1\x42\x5c\x13\xf1\x0e" "\x5d\x17\xf1\x12\x64\x1e\xf1\x1c";
+static u8 s004[] =
+       "\xf0\x00\xf1\x02\x24\x5f\xf1\x20" "\x28\xea\xf1\x02\x5f\x41\xf1\x43";
+static u8 s005[] =
+       "\x02\x00\xf1\xee\x03\x29\xf1\x1a" "\x04\x02\xf1\xa4\x09\x00\xf1\x68"
+       "\x0a\x00\xf1\x2a\x0b\x00\xf1\x04" "\x0c\x00\xf1\x93\x0d\x00\xf1\x82"
+       "\x0e\x00\xf1\x40\x0f\x00\xf1\x5f" "\x10\x00\xf1\x4e\x11\x00\xf1\x5b";
+static u8 s006[] =
+       "\x15\x00\xf1\xc9\x16\x00\xf1\x5e" "\x17\x00\xf1\x9d\x18\x00\xf1\x06"
+       "\x19\x00\xf1\x89\x1a\x00\xf1\x12" "\x1b\x00\xf1\xa1\x1c\x00\xf1\xe4"
+       "\x1d\x00\xf1\x7a\x1e\x00\xf1\x64" "\xf6\x00\xf1\x5f";
+static u8 s007[] =
+       "\xf0\x00\xf1\x01\x53\x09\xf1\x03" "\x54\x3d\xf1\x1c\x55\x99\xf1\x72"
+       "\x56\xc1\xf1\xb1\x57\xd8\xf1\xce" "\x58\xe0\xf1\x00\xdc\x0a\xf1\x03"
+       "\xdd\x45\xf1\x20\xde\xae\xf1\x82" "\xdf\xdc\xf1\xc9\xe0\xf6\xf1\xea"
+       "\xe1\xff\xf1\x00";
+static u8 s008[] =
+       "\xf0\x00\xf1\x01\x80\x00\xf1\x06" "\x81\xf6\xf1\x08\x82\xfb\xf1\xf7"
+       "\x83\x00\xf1\xfe\xb6\x07\xf1\x03" "\xb7\x18\xf1\x0c\x84\xfb\xf1\x06"
+       "\x85\xfb\xf1\xf9\x86\x00\xf1\xff" "\xb8\x07\xf1\x04\xb9\x16\xf1\x0a";
+static u8 s009[] =
+       "\x87\xfa\xf1\x05\x88\xfc\xf1\xf9" "\x89\x00\xf1\xff\xba\x06\xf1\x03"
+       "\xbb\x17\xf1\x09\x8a\xe8\xf1\x14" "\x8b\xf7\xf1\xf0\x8c\xfd\xf1\xfa"
+       "\x8d\x00\xf1\x00\xbc\x05\xf1\x01" "\xbd\x0c\xf1\x08\xbe\x00\xf1\x14";
+static u8 s010[] =
+       "\x8e\xea\xf1\x13\x8f\xf7\xf1\xf2" "\x90\xfd\xf1\xfa\x91\x00\xf1\x00"
+       "\xbf\x05\xf1\x01\xc0\x0a\xf1\x08" "\xc1\x00\xf1\x0c\x92\xed\xf1\x0f"
+       "\x93\xf9\xf1\xf4\x94\xfe\xf1\xfb" "\x95\x00\xf1\x00\xc2\x04\xf1\x01"
+       "\xc3\x0a\xf1\x07\xc4\x00\xf1\x10";
+static u8 s011[] =
+       "\xf0\x00\xf1\x01\x05\x00\xf1\x06" "\x25\x00\xf1\x55\x34\x10\xf1\x10"
+       "\x35\xf0\xf1\x10\x3a\x02\xf1\x03" "\x3b\x04\xf1\x2a\x9b\x43\xf1\x00"
+       "\xa4\x03\xf1\xc0\xa7\x02\xf1\x81";
+
+static int  mi1320_init_at_startup(struct gspca_dev *gspca_dev);
+static int  mi1320_configure_alt(struct gspca_dev *gspca_dev);
+static int  mi1320_init_pre_alt(struct gspca_dev *gspca_dev);
+static int  mi1320_init_post_alt(struct gspca_dev *gspca_dev);
+static void mi1320_post_unset_alt(struct gspca_dev *gspca_dev);
+static int  mi1320_sensor_settings(struct gspca_dev *gspca_dev);
+static int  mi1320_camera_settings(struct gspca_dev *gspca_dev);
+/*==========================================================================*/
+
+void mi1320_init_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vcur.backlight  =  0;
+       sd->vcur.brightness =  0;
+       sd->vcur.sharpness  =  6;
+       sd->vcur.contrast   = 10;
+       sd->vcur.gamma      = 20;
+       sd->vcur.hue        =  0;
+       sd->vcur.saturation =  6;
+       sd->vcur.whitebal   =  0;
+       sd->vcur.mirror     = 0;
+       sd->vcur.flip       = 0;
+       sd->vcur.AC50Hz     = 1;
+
+       sd->vmax.backlight  =  2;
+       sd->vmax.brightness =  8;
+       sd->vmax.sharpness  =  7;
+       sd->vmax.contrast   =  0; /* 10 but not working with tihs driver */
+       sd->vmax.gamma      = 40;
+       sd->vmax.hue        =  5 + 1;
+       sd->vmax.saturation =  8;
+       sd->vmax.whitebal   =  2;
+       sd->vmax.mirror     = 1;
+       sd->vmax.flip       = 1;
+       sd->vmax.AC50Hz     = 1;
+
+       sd->dev_camera_settings = mi1320_camera_settings;
+       sd->dev_init_at_startup = mi1320_init_at_startup;
+       sd->dev_configure_alt   = mi1320_configure_alt;
+       sd->dev_init_pre_alt    = mi1320_init_pre_alt;
+       sd->dev_post_unset_alt  = mi1320_post_unset_alt;
+}
+
+/*==========================================================================*/
+
+static void common(struct gspca_dev *gspca_dev)
+{
+       s32 n; /* reserved for FETCH macros */
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 22, s000);
+       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x0000, 0, NULL);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 32, s001);
+       n = fetch_validx(gspca_dev, tbl_common, ARRAY_SIZE(tbl_common));
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 48, s002);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 48, s003);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 16, s004);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 48, s005);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 44, s006);
+       keep_on_fetching_validx(gspca_dev, tbl_common,
+                                       ARRAY_SIZE(tbl_common), n);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 52, s007);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 48, s008);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 48, s009);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 56, s010);
+       keep_on_fetching_validx(gspca_dev, tbl_common,
+                                       ARRAY_SIZE(tbl_common), n);
+       ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 40, s011);
+       keep_on_fetching_validx(gspca_dev, tbl_common,
+                                       ARRAY_SIZE(tbl_common), n);
+}
+
+static int mi1320_init_at_startup(struct gspca_dev *gspca_dev)
+{
+       fetch_validx(gspca_dev, tbl_init_at_startup,
+                               ARRAY_SIZE(tbl_init_at_startup));
+
+       common(gspca_dev);
+
+/*     ctrl_out(gspca_dev, 0x40, 11, 0x0000, 0x0000, 0, NULL); */
+
+       return 0;
+}
+
+static int mi1320_init_pre_alt(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->mirrorMask = 0;
+
+       sd->vold.backlight  = -1;
+       sd->vold.brightness = -1;
+       sd->vold.sharpness  = -1;
+       sd->vold.contrast   = -1;
+       sd->vold.saturation = -1;
+       sd->vold.gamma    = -1;
+       sd->vold.hue      = -1;
+       sd->vold.whitebal = -1;
+       sd->vold.mirror   = -1;
+       sd->vold.flip     = -1;
+       sd->vold.AC50Hz   = -1;
+
+       common(gspca_dev);
+
+       mi1320_sensor_settings(gspca_dev);
+
+       mi1320_init_post_alt(gspca_dev);
+
+       return 0;
+}
+
+static int mi1320_init_post_alt(struct gspca_dev *gspca_dev)
+{
+       mi1320_camera_settings(gspca_dev);
+
+       return 0;
+}
+
+static int mi1320_sensor_settings(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       ctrl_out(gspca_dev, 0x40, 5, 0x0001, 0x0000, 0, NULL);
+
+       fetch_validx(gspca_dev, tbl_sensor_settings_common,
+                               ARRAY_SIZE(tbl_sensor_settings_common));
+
+       switch (reso) {
+       case IMAGE_1280:
+               fetch_validx(gspca_dev, tbl_sensor_settings_1280,
+                                       ARRAY_SIZE(tbl_sensor_settings_1280));
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 64, tbl_1280[0]);
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 40, tbl_1280[1]);
+               ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, tbl_1280[2]);
+               break;
+
+       case IMAGE_800:
+               fetch_validx(gspca_dev, tbl_sensor_settings_800,
+                                       ARRAY_SIZE(tbl_sensor_settings_800));
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 64, tbl_800[0]);
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 40, tbl_800[1]);
+               ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, tbl_800[2]);
+               break;
+
+       default:
+               fetch_validx(gspca_dev, tbl_sensor_settings_640,
+                                       ARRAY_SIZE(tbl_sensor_settings_640));
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 60, tbl_640[0]);
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 40, tbl_640[1]);
+               ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, tbl_640[2]);
+               break;
+       }
+       return 0;
+}
+
+static int mi1320_configure_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       switch (reso) {
+       case IMAGE_640:
+               gspca_dev->alt = 3 + 1;
+               break;
+
+       case IMAGE_800:
+       case IMAGE_1280:
+               gspca_dev->alt = 1 + 1;
+               break;
+       }
+       return 0;
+}
+
+int mi1320_camera_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       s32 backlight = sd->vcur.backlight;
+       s32 bright = sd->vcur.brightness;
+       s32 sharp  = sd->vcur.sharpness;
+       s32 cntr   = sd->vcur.contrast;
+       s32 gam    = sd->vcur.gamma;
+       s32 hue    = sd->vcur.hue;
+       s32 sat    = sd->vcur.saturation;
+       s32 wbal   = sd->vcur.whitebal;
+       s32 mirror = (((sd->vcur.mirror > 0) ^ sd->mirrorMask) > 0);
+       s32 flip   = (((sd->vcur.flip   > 0) ^ sd->mirrorMask) > 0);
+       s32 freq   = (sd->vcur.AC50Hz > 0);
+       s32 i;
+
+       if (freq != sd->vold.AC50Hz) {
+               sd->vold.AC50Hz = freq;
+
+               freq = 2 * (freq == 0);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba02, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00       , 0x005b, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01 + freq, 0x00f1, 0, NULL);
+       }
+
+       if (wbal != sd->vold.whitebal) {
+               sd->vold.whitebal = wbal;
+               if (wbal < 0 || wbal > sd->vmax.whitebal)
+                       wbal = 0;
+
+               for (i = 0; i < 2; i++) {
+                       if (wbal == 0) { /* Normal light */
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0010, 0x0010, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0003, 0x00c1, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0042, 0x00c2, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 3,
+                                               0xba00, 0x0200, 48, dat_wbalNL);
+                       }
+
+                       if (wbal == 1) { /* Low light */
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0010, 0x0010, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0004, 0x00c1, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0043, 0x00c2, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 3,
+                                               0xba00, 0x0200, 48, dat_wbalLL);
+                       }
+
+                       if (wbal == 2) { /* Back light */
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0010, 0x0010, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0003, 0x00c1, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 1,
+                                               0x0042, 0x00c2, 0, NULL);
+                               ctrl_out(gspca_dev, 0x40, 3,
+                                               0xba00, 0x0200, 44, dat_wbalBL);
+                       }
+               }
+       }
+
+       if (bright != sd->vold.brightness) {
+               sd->vold.brightness = bright;
+               if (bright < 0 || bright > sd->vmax.brightness)
+                       bright = 0;
+
+               bright = tbl_bright[bright];
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + bright, 0x0034, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + bright, 0x00f1, 0, NULL);
+       }
+
+       if (sat != sd->vold.saturation) {
+               sd->vold.saturation = sat;
+               if (sat < 0 || sat > sd->vmax.saturation)
+                       sat = 0;
+
+               sat = tbl_sat[sat];
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00      , 0x0025, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + sat, 0x00f1, 0, NULL);
+       }
+
+       if (sharp != sd->vold.sharpness) {
+               sd->vold.sharpness = sharp;
+               if (sharp < 0 || sharp > sd->vmax.sharpness)
+                       sharp = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00        , 0x0005, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + sharp, 0x00f1, 0, NULL);
+       }
+
+       if (hue != sd->vold.hue) {
+               /* 0=normal  1=NB  2="sepia"  3=negative  4=other  5=other2 */
+               if (hue < 0 || hue > sd->vmax.hue)
+                       hue = 0;
+               if (hue == sd->vmax.hue)
+                       sd->swapRB = 1;
+               else
+                       sd->swapRB = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba70, 0x00e2, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + hue * (hue < 6), 0x00f1,
+                                                       0, NULL);
+       }
+
+       if (backlight != sd->vold.backlight) {
+               sd->vold.backlight = backlight;
+               if (backlight < 0 || backlight > sd->vmax.backlight)
+                       backlight = 0;
+
+               backlight = tbl_backlight[backlight];
+               for (i = 0; i < 2; i++) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0xba74, 0x0006, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0xba80 + backlight, 0x00f1,
+                                                               0, NULL);
+               }
+       }
+
+       if (hue != sd->vold.hue) {
+               sd->vold.hue = hue;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba70, 0x00e2, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + hue * (hue < 6), 0x00f1,
+                                                       0, NULL);
+       }
+
+       if (mirror != sd->vold.mirror || flip != sd->vold.flip) {
+               u8 dat_hvflip2[4] = {0x20, 0x01, 0xf1, 0x00};
+               sd->vold.mirror = mirror;
+               sd->vold.flip = flip;
+
+               dat_hvflip2[3] = flip + 2 * mirror;
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 4, dat_hvflip1);
+               ctrl_out(gspca_dev, 0x40, 3, 0xba00, 0x0200, 4, dat_hvflip2);
+       }
+
+       if (gam != sd->vold.gamma) {
+               sd->vold.gamma = gam;
+               if (gam < 0 || gam > sd->vmax.gamma)
+                       gam = 0;
+
+               gam = 2 * gam;
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba04      , 0x003b, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba02 + gam, 0x00f1, 0, NULL);
+       }
+
+       if (cntr != sd->vold.contrast) {
+               sd->vold.contrast = cntr;
+               if (cntr < 0 || cntr > sd->vmax.contrast)
+                       cntr = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00, 0x00f0, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba01, 0x00f1, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + tbl_cntr1[cntr], 0x0035,
+                                                       0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0xba00 + tbl_cntr2[cntr], 0x00f1,
+                                                       0, NULL);
+       }
+
+       return 0;
+}
+
+static void mi1320_post_unset_alt(struct gspca_dev *gspca_dev)
+{
+       ctrl_out(gspca_dev, 0x40, 5, 0x0000, 0x0000, 0, NULL);
+
+       fetch_validx(gspca_dev, tbl_post_unset_alt,
+                               ARRAY_SIZE(tbl_post_unset_alt));
+}
diff --git a/drivers/media/video/gspca/gl860/gl860-mi2020.c b/drivers/media/video/gspca/gl860/gl860-mi2020.c
new file mode 100644 (file)
index 0000000..ffb09fe
--- /dev/null
@@ -0,0 +1,937 @@
+/* @file gl860-mi2020.c
+ * @author Olivier LORIN, from Ice/Soro2005's logs(A), Fret_saw/Hulkie's
+ * logs(B) and Tricid"s logs(C). With the help of Kytrix/BUGabundo/Blazercist.
+ * @date 2009-08-27
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Sensor : MI2020 */
+
+#include "gl860.h"
+
+static u8 dat_bright1[] = {0x8c, 0xa2, 0x06};
+static u8 dat_bright3[] = {0x8c, 0xa1, 0x02};
+static u8 dat_bright4[] = {0x90, 0x00, 0x0f};
+static u8 dat_bright5[] = {0x8c, 0xa1, 0x03};
+static u8 dat_bright6[] = {0x90, 0x00, 0x05};
+
+static u8 dat_dummy1[] = {0x90, 0x00, 0x06};
+/*static u8 dummy2[] = {0x8c, 0xa1, 0x02};*/
+/*static u8 dummy3[] = {0x90, 0x00, 0x1f};*/
+
+static u8 dat_hvflip1[] = {0x8c, 0x27, 0x19};
+static u8 dat_hvflip3[] = {0x8c, 0x27, 0x3b};
+static u8 dat_hvflip5[] = {0x8c, 0xa1, 0x03};
+static u8 dat_hvflip6[] = {0x90, 0x00, 0x06};
+
+static u8 dat_freq1[] = { 0x8c, 0xa4, 0x04 };
+
+static u8 dat_multi5[] = { 0x8c, 0xa1, 0x03 };
+static u8 dat_multi6[] = { 0x90, 0x00, 0x05 };
+
+static struct validx tbl_common_a[] = {
+       {0x0000, 0x0000},
+       {1, 0xffff}, /* msleep(35); */
+       {0x006a, 0x0007}, {0x0063, 0x0006}, {0x006a, 0x000d}, {0x0000, 0x00c0},
+       {0x0010, 0x0010}, {0x0003, 0x00c1}, {0x0042, 0x00c2}, {0x0004, 0x00d8},
+       {0x0000, 0x0058}, {0x0002, 0x0004}, {0x0041, 0x0000},
+};
+
+static struct validx tbl_common_b[] = {
+       {0x006a, 0x0007},
+       {35, 0xffff},
+       {0x00ef, 0x0006},
+       {35, 0xffff},
+       {0x006a, 0x000d},
+       {35, 0xffff},
+       {0x0000, 0x00c0}, {0x0010, 0x0010}, {0x0003, 0x00c1}, {0x0042, 0x00c2},
+       {0x0004, 0x00d8}, {0x0000, 0x0058}, {0x0041, 0x0000},
+};
+
+static struct idxdata tbl_common_c[] = {
+       {0x32, "\x02\x00\x08"}, {0x33, "\xf4\x03\x1d"},
+       {6, "\xff\xff\xff"}, /* 12 */
+       {0x34, "\x1e\x8f\x09"}, {0x34, "\x1c\x01\x28"}, {0x34, "\x1e\x8f\x09"},
+       {2, "\xff\xff\xff"}, /* - */
+       {0x34, "\x1e\x8f\x09"}, {0x32, "\x14\x06\xe6"}, {0x33, "\x8c\x22\x23"},
+       {0x33, "\x90\x00\x00"}, {0x33, "\x8c\xa2\x0f"}, {0x33, "\x90\x00\x0d"},
+       {0x33, "\x8c\xa2\x10"}, {0x33, "\x90\x00\x0b"}, {0x33, "\x8c\xa2\x11"},
+       {0x33, "\x90\x00\x07"}, {0x33, "\xf4\x03\x1d"}, {0x35, "\xa2\x00\xe2"},
+       {0x33, "\x8c\xab\x05"}, {0x33, "\x90\x00\x01"}, {0x32, "\x6e\x00\x86"},
+       {0x32, "\x70\x0f\xaa"}, {0x32, "\x72\x0f\xe4"}, {0x33, "\x8c\xa3\x4a"},
+       {0x33, "\x90\x00\x5a"}, {0x33, "\x8c\xa3\x4b"}, {0x33, "\x90\x00\xa6"},
+       {0x33, "\x8c\xa3\x61"}, {0x33, "\x90\x00\xc8"}, {0x33, "\x8c\xa3\x62"},
+       {0x33, "\x90\x00\xe1"}, {0x34, "\xce\x01\xa8"}, {0x34, "\xd0\x66\x33"},
+       {0x34, "\xd2\x31\x9a"}, {0x34, "\xd4\x94\x63"}, {0x34, "\xd6\x4b\x25"},
+       {0x34, "\xd8\x26\x70"}, {0x34, "\xda\x72\x4c"}, {0x34, "\xdc\xff\x04"},
+       {0x34, "\xde\x01\x5b"}, {0x34, "\xe6\x01\x13"}, {0x34, "\xee\x0b\xf0"},
+       {0x34, "\xf6\x0b\xa4"}, {0x35, "\x00\xf6\xe7"}, {0x35, "\x08\x0d\xfd"},
+       {0x35, "\x10\x25\x63"}, {0x35, "\x18\x35\x6c"}, {0x35, "\x20\x42\x7e"},
+       {0x35, "\x28\x19\x44"}, {0x35, "\x30\x39\xd4"}, {0x35, "\x38\xf5\xa8"},
+       {0x35, "\x4c\x07\x90"}, {0x35, "\x44\x07\xb8"}, {0x35, "\x5c\x06\x88"},
+       {0x35, "\x54\x07\xff"}, {0x34, "\xe0\x01\x52"}, {0x34, "\xe8\x00\xcc"},
+       {0x34, "\xf0\x0d\x83"}, {0x34, "\xf8\x0c\xb3"}, {0x35, "\x02\xfe\xba"},
+       {0x35, "\x0a\x04\xe0"}, {0x35, "\x12\x1c\x63"}, {0x35, "\x1a\x2b\x5a"},
+       {0x35, "\x22\x32\x5e"}, {0x35, "\x2a\x0d\x28"}, {0x35, "\x32\x2c\x02"},
+       {0x35, "\x3a\xf4\xfa"}, {0x35, "\x4e\x07\xef"}, {0x35, "\x46\x07\x88"},
+       {0x35, "\x5e\x07\xc1"}, {0x35, "\x56\x04\x64"}, {0x34, "\xe4\x01\x15"},
+       {0x34, "\xec\x00\x82"}, {0x34, "\xf4\x0c\xce"}, {0x34, "\xfc\x0c\xba"},
+       {0x35, "\x06\x1f\x02"}, {0x35, "\x0e\x02\xe3"}, {0x35, "\x16\x1a\x50"},
+       {0x35, "\x1e\x24\x39"}, {0x35, "\x26\x23\x4c"}, {0x35, "\x2e\xf9\x1b"},
+       {0x35, "\x36\x23\x19"}, {0x35, "\x3e\x12\x08"}, {0x35, "\x52\x07\x22"},
+       {0x35, "\x4a\x03\xd3"}, {0x35, "\x62\x06\x54"}, {0x35, "\x5a\x04\x5d"},
+       {0x34, "\xe2\x01\x04"}, {0x34, "\xea\x00\xa0"}, {0x34, "\xf2\x0c\xbc"},
+       {0x34, "\xfa\x0c\x5b"}, {0x35, "\x04\x17\xf2"}, {0x35, "\x0c\x02\x08"},
+       {0x35, "\x14\x28\x43"}, {0x35, "\x1c\x28\x62"}, {0x35, "\x24\x2b\x60"},
+       {0x35, "\x2c\x07\x33"}, {0x35, "\x34\x1f\xb0"}, {0x35, "\x3c\xed\xcd"},
+       {0x35, "\x50\x00\x06"}, {0x35, "\x48\x07\xff"}, {0x35, "\x60\x05\x89"},
+       {0x35, "\x58\x07\xff"}, {0x35, "\x40\x00\xa0"}, {0x35, "\x42\x00\x00"},
+       {0x32, "\x10\x01\xfc"}, {0x33, "\x8c\xa1\x18"}, {0x33, "\x90\x00\x3c"},
+       {1, "\xff\xff\xff"},
+       {0x33, "\x78\x00\x00"},
+       {1, "\xff\xff\xff"},
+       {0x35, "\xb8\x1f\x20"}, {0x33, "\x8c\xa2\x06"}, {0x33, "\x90\x00\x10"},
+       {0x33, "\x8c\xa2\x07"}, {0x33, "\x90\x00\x08"}, {0x33, "\x8c\xa2\x42"},
+       {0x33, "\x90\x00\x0b"}, {0x33, "\x8c\xa2\x4a"}, {0x33, "\x90\x00\x8c"},
+       {0x35, "\xba\xfa\x08"}, {0x33, "\x8c\xa2\x02"}, {0x33, "\x90\x00\x22"},
+       {0x33, "\x8c\xa2\x03"}, {0x33, "\x90\x00\xbb"},
+};
+
+static struct idxdata tbl_common_d[] = {
+       {0x33, "\x8c\x22\x2e"}, {0x33, "\x90\x00\xa0"}, {0x33, "\x8c\xa4\x08"},
+       {0x33, "\x90\x00\x1f"}, {0x33, "\x8c\xa4\x09"}, {0x33, "\x90\x00\x21"},
+       {0x33, "\x8c\xa4\x0a"}, {0x33, "\x90\x00\x25"}, {0x33, "\x8c\xa4\x0b"},
+       {0x33, "\x90\x00\x27"}, {0x33, "\x8c\x24\x11"}, {0x33, "\x90\x00\xa0"},
+       {0x33, "\x8c\x24\x13"}, {0x33, "\x90\x00\xc0"}, {0x33, "\x8c\x24\x15"},
+       {0x33, "\x90\x00\xa0"}, {0x33, "\x8c\x24\x17"}, {0x33, "\x90\x00\xc0"},
+};
+
+static struct idxdata tbl_common_e[] = {
+       {0x33, "\x8c\xa4\x04"}, {0x33, "\x90\x00\x80"}, {0x33, "\x8c\xa7\x9d"},
+       {0x33, "\x90\x00\x00"}, {0x33, "\x8c\xa7\x9e"}, {0x33, "\x90\x00\x00"},
+       {0x33, "\x8c\xa2\x0c"}, {0x33, "\x90\x00\x17"}, {0x33, "\x8c\xa2\x15"},
+       {0x33, "\x90\x00\x04"}, {0x33, "\x8c\xa2\x14"}, {0x33, "\x90\x00\x20"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x17"},
+       /* msleep(53); */
+       {0x33, "\x90\x21\x11"}, {0x33, "\x8c\x27\x1b"}, {0x33, "\x90\x02\x4f"},
+       {0x33, "\x8c\x27\x25"}, {0x33, "\x90\x06\x0f"}, {0x33, "\x8c\x27\x39"},
+       {0x33, "\x90\x21\x11"}, {0x33, "\x8c\x27\x3d"}, {0x33, "\x90\x01\x20"},
+       {0x33, "\x8c\x27\x47"}, {0x33, "\x90\x09\x4c"}, {0x33, "\x8c\x27\x03"},
+       {0x33, "\x90\x02\x84"}, {0x33, "\x8c\x27\x05"}, {0x33, "\x90\x01\xe2"},
+       {0x33, "\x8c\x27\x07"}, {0x33, "\x90\x06\x40"}, {0x33, "\x8c\x27\x09"},
+       {0x33, "\x90\x04\xb0"}, {0x33, "\x8c\x27\x0d"}, {0x33, "\x90\x00\x00"},
+       {0x33, "\x8c\x27\x0f"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x11"},
+       {0x33, "\x90\x04\xbd"}, {0x33, "\x8c\x27\x13"}, {0x33, "\x90\x06\x4d"},
+       {0x33, "\x8c\x27\x15"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x17"},
+       {0x33, "\x90\x21\x11"}, {0x33, "\x8c\x27\x19"}, {0x33, "\x90\x04\x6c"},
+       {0x33, "\x8c\x27\x1b"}, {0x33, "\x90\x02\x4f"}, {0x33, "\x8c\x27\x1d"},
+       {0x33, "\x90\x01\x02"}, {0x33, "\x8c\x27\x1f"}, {0x33, "\x90\x02\x79"},
+       {0x33, "\x8c\x27\x21"}, {0x33, "\x90\x01\x55"}, {0x33, "\x8c\x27\x23"},
+       {0x33, "\x90\x02\x85"}, {0x33, "\x8c\x27\x25"}, {0x33, "\x90\x06\x0f"},
+       {0x33, "\x8c\x27\x27"}, {0x33, "\x90\x20\x20"}, {0x33, "\x8c\x27\x29"},
+       {0x33, "\x90\x20\x20"}, {0x33, "\x8c\x27\x2b"}, {0x33, "\x90\x10\x20"},
+       {0x33, "\x8c\x27\x2d"}, {0x33, "\x90\x20\x07"}, {0x33, "\x8c\x27\x2f"},
+       {0x33, "\x90\x00\x04"}, {0x33, "\x8c\x27\x31"}, {0x33, "\x90\x00\x04"},
+       {0x33, "\x8c\x27\x33"}, {0x33, "\x90\x04\xbb"}, {0x33, "\x8c\x27\x35"},
+       {0x33, "\x90\x06\x4b"}, {0x33, "\x8c\x27\x37"}, {0x33, "\x90\x00\x00"},
+       {0x33, "\x8c\x27\x39"}, {0x33, "\x90\x21\x11"}, {0x33, "\x8c\x27\x3b"},
+       {0x33, "\x90\x00\x24"}, {0x33, "\x8c\x27\x3d"}, {0x33, "\x90\x01\x20"},
+       {0x33, "\x8c\x27\x41"}, {0x33, "\x90\x01\x69"}, {0x33, "\x8c\x27\x45"},
+       {0x33, "\x90\x04\xed"}, {0x33, "\x8c\x27\x47"}, {0x33, "\x90\x09\x4c"},
+       {0x33, "\x8c\x27\x51"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x53"},
+       {0x33, "\x90\x03\x20"}, {0x33, "\x8c\x27\x55"}, {0x33, "\x90\x00\x00"},
+       {0x33, "\x8c\x27\x57"}, {0x33, "\x90\x02\x58"}, {0x33, "\x8c\x27\x5f"},
+       {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x61"}, {0x33, "\x90\x06\x40"},
+       {0x33, "\x8c\x27\x63"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x65"},
+       {0x33, "\x90\x04\xb0"}, {0x33, "\x8c\x22\x2e"}, {0x33, "\x90\x00\xa1"},
+       {0x33, "\x8c\xa4\x08"}, {0x33, "\x90\x00\x1f"}, {0x33, "\x8c\xa4\x09"},
+       {0x33, "\x90\x00\x21"}, {0x33, "\x8c\xa4\x0a"}, {0x33, "\x90\x00\x25"},
+       {0x33, "\x8c\xa4\x0b"}, {0x33, "\x90\x00\x27"}, {0x33, "\x8c\x24\x11"},
+       {0x33, "\x90\x00\xa1"}, {0x33, "\x8c\x24\x13"}, {0x33, "\x90\x00\xc1"},
+       {0x33, "\x8c\x24\x15"},
+};
+
+static struct validx tbl_init_at_startup[] = {
+       {0x0000, 0x0000},
+       {53, 0xffff},
+       {0x0010, 0x0010},
+       {53, 0xffff},
+       {0x0008, 0x00c0},
+       {53, 0xffff},
+       {0x0001, 0x00c1},
+       {53, 0xffff},
+       {0x0001, 0x00c2},
+       {53, 0xffff},
+       {0x0020, 0x0006},
+       {53, 0xffff},
+       {0x006a, 0x000d},
+       {53, 0xffff},
+};
+
+static struct idxdata tbl_init_post_alt_low_a[] = {
+       {0x33, "\x8c\x27\x15"}, {0x33, "\x90\x00\x25"}, {0x33, "\x8c\x22\x2e"},
+       {0x33, "\x90\x00\x81"}, {0x33, "\x8c\xa4\x08"}, {0x33, "\x90\x00\x17"},
+       {0x33, "\x8c\xa4\x09"}, {0x33, "\x90\x00\x1a"}, {0x33, "\x8c\xa4\x0a"},
+       {0x33, "\x90\x00\x1d"}, {0x33, "\x8c\xa4\x0b"}, {0x33, "\x90\x00\x20"},
+       {0x33, "\x8c\x24\x11"}, {0x33, "\x90\x00\x81"}, {0x33, "\x8c\x24\x13"},
+       {0x33, "\x90\x00\x9b"},
+};
+
+static struct idxdata tbl_init_post_alt_low_b[] = {
+       {0x33, "\x8c\x27\x03"}, {0x33, "\x90\x03\x24"}, {0x33, "\x8c\x27\x05"},
+       {0x33, "\x90\x02\x58"}, {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"},
+       {2, "\xff\xff\xff"},
+};
+
+static struct idxdata tbl_init_post_alt_low_c[] = {
+       {0x34, "\x1e\x8f\x09"}, {0x34, "\x1c\x01\x28"}, {0x34, "\x1e\x8f\x09"},
+       {2, "\xff\xff\xff"},
+       {0x34, "\x1e\x8f\x09"}, {0x32, "\x14\x06\xe6"}, {0x33, "\x8c\xa1\x20"},
+       {0x33, "\x90\x00\x00"}, {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x01"},
+       {0x33, "\x2e\x01\x00"}, {0x34, "\x04\x00\x2a"}, {0x33, "\x8c\xa7\x02"},
+       {0x33, "\x90\x00\x00"}, {0x33, "\x8c\x27\x95"}, {0x33, "\x90\x01\x00"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x20"}, {0x33, "\x90\x00\x72"}, {0x33, "\x8c\xa1\x03"},
+       {0x33, "\x90\x00\x02"}, {0x33, "\x8c\xa7\x02"}, {0x33, "\x90\x00\x01"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x20"}, {0x33, "\x90\x00\x00"}, {0x33, "\x8c\xa1\x03"},
+       {0x33, "\x90\x00\x01"}, {0x33, "\x8c\xa7\x02"}, {0x33, "\x90\x00\x00"},
+       {2, "\xff\xff\xff"}, /* - * */
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"},
+       {1, "\xff\xff\xff"},
+};
+
+static struct idxdata tbl_init_post_alt_low_d[] = {
+       {0x32, "\x10\x01\xf8"}, {0x34, "\xce\x01\xa8"}, {0x34, "\xd0\x66\x33"},
+       {0x34, "\xd2\x31\x9a"}, {0x34, "\xd4\x94\x63"}, {0x34, "\xd6\x4b\x25"},
+       {0x34, "\xd8\x26\x70"}, {0x34, "\xda\x72\x4c"}, {0x34, "\xdc\xff\x04"},
+       {0x34, "\xde\x01\x5b"}, {0x34, "\xe6\x01\x13"}, {0x34, "\xee\x0b\xf0"},
+       {0x34, "\xf6\x0b\xa4"}, {0x35, "\x00\xf6\xe7"}, {0x35, "\x08\x0d\xfd"},
+       {0x35, "\x10\x25\x63"}, {0x35, "\x18\x35\x6c"}, {0x35, "\x20\x42\x7e"},
+       {0x35, "\x28\x19\x44"}, {0x35, "\x30\x39\xd4"}, {0x35, "\x38\xf5\xa8"},
+       {0x35, "\x4c\x07\x90"}, {0x35, "\x44\x07\xb8"}, {0x35, "\x5c\x06\x88"},
+       {0x35, "\x54\x07\xff"}, {0x34, "\xe0\x01\x52"}, {0x34, "\xe8\x00\xcc"},
+       {0x34, "\xf0\x0d\x83"}, {0x34, "\xf8\x0c\xb3"}, {0x35, "\x02\xfe\xba"},
+       {0x35, "\x0a\x04\xe0"}, {0x35, "\x12\x1c\x63"}, {0x35, "\x1a\x2b\x5a"},
+       {0x35, "\x22\x32\x5e"}, {0x35, "\x2a\x0d\x28"}, {0x35, "\x32\x2c\x02"},
+       {0x35, "\x3a\xf4\xfa"}, {0x35, "\x4e\x07\xef"}, {0x35, "\x46\x07\x88"},
+       {0x35, "\x5e\x07\xc1"}, {0x35, "\x56\x04\x64"}, {0x34, "\xe4\x01\x15"},
+       {0x34, "\xec\x00\x82"}, {0x34, "\xf4\x0c\xce"}, {0x34, "\xfc\x0c\xba"},
+       {0x35, "\x06\x1f\x02"}, {0x35, "\x0e\x02\xe3"}, {0x35, "\x16\x1a\x50"},
+       {0x35, "\x1e\x24\x39"}, {0x35, "\x26\x23\x4c"}, {0x35, "\x2e\xf9\x1b"},
+       {0x35, "\x36\x23\x19"}, {0x35, "\x3e\x12\x08"}, {0x35, "\x52\x07\x22"},
+       {0x35, "\x4a\x03\xd3"}, {0x35, "\x62\x06\x54"}, {0x35, "\x5a\x04\x5d"},
+       {0x34, "\xe2\x01\x04"}, {0x34, "\xea\x00\xa0"}, {0x34, "\xf2\x0c\xbc"},
+       {0x34, "\xfa\x0c\x5b"}, {0x35, "\x04\x17\xf2"}, {0x35, "\x0c\x02\x08"},
+       {0x35, "\x14\x28\x43"}, {0x35, "\x1c\x28\x62"}, {0x35, "\x24\x2b\x60"},
+       {0x35, "\x2c\x07\x33"}, {0x35, "\x34\x1f\xb0"}, {0x35, "\x3c\xed\xcd"},
+       {0x35, "\x50\x00\x06"}, {0x35, "\x48\x07\xff"}, {0x35, "\x60\x05\x89"},
+       {0x35, "\x58\x07\xff"}, {0x35, "\x40\x00\xa0"}, {0x35, "\x42\x00\x00"},
+       {0x32, "\x10\x01\xfc"}, {0x33, "\x8c\xa1\x18"},
+       /* Flip/Mirror h/v=1 */
+       {0x33, "\x90\x00\x3c"}, {0x33, "\x8c\x27\x19"}, {0x33, "\x90\x04\x6c"},
+       {0x33, "\x8c\x27\x3b"}, {0x33, "\x90\x00\x24"}, {0x33, "\x8c\xa1\x03"},
+       {0x33, "\x90\x00\x06"},
+       {130, "\xff\xff\xff"},
+       {0x33, "\x90\x00\x06"}, {0x33, "\x90\x00\x06"}, {0x33, "\x90\x00\x06"},
+       {0x33, "\x90\x00\x06"}, {0x33, "\x90\x00\x06"}, {0x33, "\x90\x00\x06"},
+       {100, "\xff\xff\xff"},
+       /* ?? */
+       {0x33, "\x8c\xa1\x02"}, {0x33, "\x90\x00\x1f"}, {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x1f"}, {0x33, "\x8c\xa1\x02"}, {0x33, "\x90\x00\x1f"},
+       {0x33, "\x8c\xa1\x02"}, {0x33, "\x90\x00\x1f"},
+       /* Brigthness=70 */
+       {0x33, "\x8c\xa2\x06"}, {0x33, "\x90\x00\x46"}, {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x0f"}, {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       /* Sharpness=20 */
+       {0x32, "\x6c\x14\x08"},
+};
+
+static struct idxdata tbl_init_post_alt_big_a[] = {
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"},
+       {2, "\xff\xff\xff"},
+       {0x34, "\x1e\x8f\x09"}, {0x34, "\x1c\x01\x28"}, {0x34, "\x1e\x8f\x09"},
+       {0x34, "\x1e\x8f\x09"}, {0x32, "\x14\x06\xe6"}, {0x33, "\x8c\xa1\x03"},
+       {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x05"},
+       {2, "\xff\xff\xff"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x06"}, {0x33, "\x8c\xa1\x20"},
+       {0x33, "\x90\x00\x72"}, {0x33, "\x8c\xa1\x30"}, {0x33, "\x90\x00\x03"},
+       {0x33, "\x8c\xa1\x31"}, {0x33, "\x90\x00\x02"}, {0x33, "\x8c\xa1\x32"},
+       {0x33, "\x90\x00\x03"}, {0x33, "\x8c\xa1\x34"}, {0x33, "\x90\x00\x03"},
+       {0x33, "\x8c\xa1\x03"}, {0x33, "\x90\x00\x02"}, {0x33, "\x2e\x01\x00"},
+       {0x34, "\x04\x00\x2a"}, {0x33, "\x8c\xa7\x02"}, {0x33, "\x90\x00\x01"},
+};
+
+static struct idxdata tbl_init_post_alt_big_b[] = {
+       {0x32, "\x10\x01\xf8"}, {0x34, "\xce\x01\xa8"}, {0x34, "\xd0\x66\x33"},
+       {0x34, "\xd2\x31\x9a"}, {0x34, "\xd4\x94\x63"}, {0x34, "\xd6\x4b\x25"},
+       {0x34, "\xd8\x26\x70"}, {0x34, "\xda\x72\x4c"}, {0x34, "\xdc\xff\x04"},
+       {0x34, "\xde\x01\x5b"}, {0x34, "\xe6\x01\x13"}, {0x34, "\xee\x0b\xf0"},
+       {0x34, "\xf6\x0b\xa4"}, {0x35, "\x00\xf6\xe7"}, {0x35, "\x08\x0d\xfd"},
+       {0x35, "\x10\x25\x63"}, {0x35, "\x18\x35\x6c"}, {0x35, "\x20\x42\x7e"},
+       {0x35, "\x28\x19\x44"}, {0x35, "\x30\x39\xd4"}, {0x35, "\x38\xf5\xa8"},
+       {0x35, "\x4c\x07\x90"}, {0x35, "\x44\x07\xb8"}, {0x35, "\x5c\x06\x88"},
+       {0x35, "\x54\x07\xff"}, {0x34, "\xe0\x01\x52"}, {0x34, "\xe8\x00\xcc"},
+       {0x34, "\xf0\x0d\x83"}, {0x34, "\xf8\x0c\xb3"}, {0x35, "\x02\xfe\xba"},
+       {0x35, "\x0a\x04\xe0"}, {0x35, "\x12\x1c\x63"}, {0x35, "\x1a\x2b\x5a"},
+       {0x35, "\x22\x32\x5e"}, {0x35, "\x2a\x0d\x28"}, {0x35, "\x32\x2c\x02"},
+       {0x35, "\x3a\xf4\xfa"}, {0x35, "\x4e\x07\xef"}, {0x35, "\x46\x07\x88"},
+       {0x35, "\x5e\x07\xc1"}, {0x35, "\x56\x04\x64"}, {0x34, "\xe4\x01\x15"},
+       {0x34, "\xec\x00\x82"}, {0x34, "\xf4\x0c\xce"}, {0x34, "\xfc\x0c\xba"},
+       {0x35, "\x06\x1f\x02"}, {0x35, "\x0e\x02\xe3"}, {0x35, "\x16\x1a\x50"},
+       {0x35, "\x1e\x24\x39"}, {0x35, "\x26\x23\x4c"}, {0x35, "\x2e\xf9\x1b"},
+       {0x35, "\x36\x23\x19"}, {0x35, "\x3e\x12\x08"}, {0x35, "\x52\x07\x22"},
+       {0x35, "\x4a\x03\xd3"}, {0x35, "\x62\x06\x54"}, {0x35, "\x5a\x04\x5d"},
+       {0x34, "\xe2\x01\x04"}, {0x34, "\xea\x00\xa0"}, {0x34, "\xf2\x0c\xbc"},
+       {0x34, "\xfa\x0c\x5b"}, {0x35, "\x04\x17\xf2"}, {0x35, "\x0c\x02\x08"},
+       {0x35, "\x14\x28\x43"}, {0x35, "\x1c\x28\x62"}, {0x35, "\x24\x2b\x60"},
+       {0x35, "\x2c\x07\x33"}, {0x35, "\x34\x1f\xb0"}, {0x35, "\x3c\xed\xcd"},
+       {0x35, "\x50\x00\x06"}, {0x35, "\x48\x07\xff"}, {0x35, "\x60\x05\x89"},
+       {0x35, "\x58\x07\xff"}, {0x35, "\x40\x00\xa0"}, {0x35, "\x42\x00\x00"},
+       {0x32, "\x10\x01\xfc"}, {0x33, "\x8c\xa1\x18"}, {0x33, "\x90\x00\x3c"},
+};
+
+static struct idxdata tbl_init_post_alt_big_c[] = {
+       {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x1f"},
+       {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x1f"},
+       {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x1f"},
+       {0x33, "\x8c\xa1\x02"},
+       {0x33, "\x90\x00\x1f"},
+};
+
+static u8 *dat_640  = "\xd0\x02\xd1\x08\xd2\xe1\xd3\x02\xd4\x10\xd5\x81";
+static u8 *dat_800  = "\xd0\x02\xd1\x10\xd2\x57\xd3\x02\xd4\x18\xd5\x21";
+static u8 *dat_1280 = "\xd0\x02\xd1\x20\xd2\x01\xd3\x02\xd4\x28\xd5\x01";
+static u8 *dat_1600 = "\xd0\x02\xd1\x20\xd2\xaf\xd3\x02\xd4\x30\xd5\x41";
+
+static int  mi2020_init_at_startup(struct gspca_dev *gspca_dev);
+static int  mi2020_configure_alt(struct gspca_dev *gspca_dev);
+static int  mi2020_init_pre_alt(struct gspca_dev *gspca_dev);
+static int  mi2020_init_post_alt(struct gspca_dev *gspca_dev);
+static void mi2020_post_unset_alt(struct gspca_dev *gspca_dev);
+static int  mi2020_camera_settings(struct gspca_dev *gspca_dev);
+/*==========================================================================*/
+
+void mi2020_init_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vcur.backlight  =  0;
+       sd->vcur.brightness = 70;
+       sd->vcur.sharpness  = 20;
+       sd->vcur.contrast   =  0;
+       sd->vcur.gamma      =  0;
+       sd->vcur.hue        =  0;
+       sd->vcur.saturation = 60;
+       sd->vcur.whitebal   = 50;
+       sd->vcur.mirror = 0;
+       sd->vcur.flip   = 0;
+       sd->vcur.AC50Hz = 1;
+
+       sd->vmax.backlight  =  64;
+       sd->vmax.brightness = 128;
+       sd->vmax.sharpness  =  40;
+       sd->vmax.contrast   =   3;
+       sd->vmax.gamma      =   2;
+       sd->vmax.hue        =   0 + 1; /* 200 */
+       sd->vmax.saturation =   0;     /* 100 */
+       sd->vmax.whitebal   =   0;     /* 100 */
+       sd->vmax.mirror = 1;
+       sd->vmax.flip   = 1;
+       sd->vmax.AC50Hz = 1;
+       if (_MI2020b_) {
+               sd->vmax.contrast  = 0;
+               sd->vmax.gamma     = 0;
+               sd->vmax.backlight = 0;
+       }
+
+       sd->dev_camera_settings = mi2020_camera_settings;
+       sd->dev_init_at_startup = mi2020_init_at_startup;
+       sd->dev_configure_alt   = mi2020_configure_alt;
+       sd->dev_init_pre_alt    = mi2020_init_pre_alt;
+       sd->dev_post_unset_alt  = mi2020_post_unset_alt;
+}
+
+/*==========================================================================*/
+
+static void common(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       if (_MI2020b_) {
+               fetch_validx(gspca_dev, tbl_common_a, ARRAY_SIZE(tbl_common_a));
+       } else {
+               if (_MI2020_)
+                       ctrl_out(gspca_dev, 0x40,  1, 0x0008, 0x0004,  0, NULL);
+               else
+                       ctrl_out(gspca_dev, 0x40,  1, 0x0002, 0x0004,  0, NULL);
+               msleep(35);
+               fetch_validx(gspca_dev, tbl_common_b, ARRAY_SIZE(tbl_common_b));
+       }
+       ctrl_out(gspca_dev, 0x40,  3, 0x7a00, 0x0033,  3, "\x86\x25\x01");
+       ctrl_out(gspca_dev, 0x40,  3, 0x7a00, 0x0033,  3, "\x86\x25\x00");
+       msleep(2); /* - * */
+       ctrl_out(gspca_dev, 0x40,  3, 0x7a00, 0x0030,  3, "\x1a\x0a\xcc");
+       if (reso == IMAGE_1600)
+               msleep(2); /* 1600 */
+       fetch_idxdata(gspca_dev, tbl_common_c, ARRAY_SIZE(tbl_common_c));
+
+       if (_MI2020b_ || _MI2020_)
+               fetch_idxdata(gspca_dev, tbl_common_d,
+                               ARRAY_SIZE(tbl_common_d));
+
+       fetch_idxdata(gspca_dev, tbl_common_e, ARRAY_SIZE(tbl_common_e));
+       if (_MI2020b_ || _MI2020_) {
+               /* Different from fret */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x78");
+               /* Same as fret */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\x24\x17");
+               /* Different from fret */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x90");
+       } else {
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x6a");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\x24\x17");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x80");
+       }
+       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x05");
+       msleep(2);
+       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+       if (reso == IMAGE_1600)
+               msleep(14); /* 1600 */
+       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x06");
+       msleep(2);
+}
+
+static int mi2020_init_at_startup(struct gspca_dev *gspca_dev)
+{
+       u8 c;
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0004, 1, &c);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0004, 1, &c);
+
+       fetch_validx(gspca_dev, tbl_init_at_startup,
+                       ARRAY_SIZE(tbl_init_at_startup));
+
+       common(gspca_dev);
+
+       return 0;
+}
+
+static int mi2020_init_pre_alt(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->mirrorMask = 0;
+
+       sd->vold.backlight  = -1;
+       sd->vold.brightness = -1;
+       sd->vold.sharpness  = -1;
+       sd->vold.contrast   = -1;
+       sd->vold.gamma  = -1;
+       sd->vold.hue    = -1;
+       sd->vold.mirror = -1;
+       sd->vold.flip   = -1;
+       sd->vold.AC50Hz = -1;
+
+       mi2020_init_post_alt(gspca_dev);
+
+       return 0;
+}
+
+static int mi2020_init_post_alt(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       s32 backlight = sd->vcur.backlight;
+       s32 mirror = (((sd->vcur.mirror > 0) ^ sd->mirrorMask) > 0);
+       s32 flip   = (((sd->vcur.flip   > 0) ^ sd->mirrorMask) > 0);
+       s32 freq   = (sd->vcur.AC50Hz  > 0);
+
+       u8 dat_freq2[] = {0x90, 0x00, 0x80};
+       u8 dat_multi1[] = {0x8c, 0xa7, 0x00};
+       u8 dat_multi2[] = {0x90, 0x00, 0x00};
+       u8 dat_multi3[] = {0x8c, 0xa7, 0x00};
+       u8 dat_multi4[] = {0x90, 0x00, 0x00};
+       u8 dat_hvflip2[] = {0x90, 0x04, 0x6c};
+       u8 dat_hvflip4[] = {0x90, 0x00, 0x24};
+       u8 c;
+
+       sd->nbIm = -1;
+
+       dat_freq2[2] = freq ? 0xc0 : 0x80;
+       dat_multi1[2] = 0x9d;
+       dat_multi3[2] = dat_multi1[2] + 1;
+       dat_multi4[2] = dat_multi2[2] = backlight;
+       dat_hvflip2[2] = 0x6c + 2 * (1 - flip) + (1 - mirror);
+       dat_hvflip4[2] = 0x24 + 2 * (1 - flip) + (1 - mirror);
+
+       msleep(200);
+
+       ctrl_out(gspca_dev, 0x40, 5, 0x0001, 0x0000, 0, NULL);
+       msleep(3); /* 35 * */
+
+       common(gspca_dev);
+
+       ctrl_out(gspca_dev, 0x40,  1, 0x0041, 0x0000,  0, NULL);
+       msleep(70);
+
+       if (_MI2020b_)
+               ctrl_out(gspca_dev, 0x40,  1, 0x0040, 0x0000,  0, NULL);
+
+       ctrl_out(gspca_dev, 0x40,  1, 0x0010, 0x0010,  0, NULL);
+       ctrl_out(gspca_dev, 0x40,  1, 0x0003, 0x00c1,  0, NULL);
+       ctrl_out(gspca_dev, 0x40,  1, 0x0042, 0x00c2,  0, NULL);
+       ctrl_out(gspca_dev, 0x40,  1, 0x006a, 0x000d,  0, NULL);
+
+       switch (reso) {
+       case IMAGE_640:
+       case IMAGE_800:
+               if (reso != IMAGE_800)
+                       ctrl_out(gspca_dev, 0x40,  3, 0x0000, 0x0200,
+                               12, dat_640);
+               else
+                       ctrl_out(gspca_dev, 0x40,  3, 0x0000, 0x0200,
+                               12, dat_800);
+
+               if (_MI2020c_)
+                       fetch_idxdata(gspca_dev, tbl_init_post_alt_low_a,
+                                       ARRAY_SIZE(tbl_init_post_alt_low_a));
+
+               if (reso == IMAGE_800)
+                       fetch_idxdata(gspca_dev, tbl_init_post_alt_low_b,
+                                       ARRAY_SIZE(tbl_init_post_alt_low_b));
+
+               fetch_idxdata(gspca_dev, tbl_init_post_alt_low_c,
+                               ARRAY_SIZE(tbl_init_post_alt_low_c));
+
+               if (_MI2020b_) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0010, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x00c1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x00c2, 0, NULL);
+                       msleep(150);
+               } else if (_MI2020c_) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0010, 0x0010, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x00c1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x00c2, 0, NULL);
+                       msleep(120);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0040, 0x0000, 0, NULL);
+                       msleep(30);
+               } else if (_MI2020_) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0010, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x00c1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x00c2, 0, NULL);
+                       msleep(120);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0040, 0x0000, 0, NULL);
+                       msleep(30);
+               }
+
+               /* AC power frequency */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq2);
+               msleep(20);
+               /* backlight */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi4);
+               /* at init time but not after */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa2\x0c");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x17");
+               /* finish the backlight */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi6);
+               msleep(5);/* " */
+
+               if (_MI2020c_) {
+                       fetch_idxdata(gspca_dev, tbl_init_post_alt_low_d,
+                                       ARRAY_SIZE(tbl_init_post_alt_low_d));
+               } else {
+                       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, &c);
+                       msleep(14); /* 0xd8 */
+
+                       /* flip/mirror */
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip1);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip2);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip3);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip4);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_hvflip6);
+                       msleep(21);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       msleep(5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       msleep(5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       msleep(5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       msleep(5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       msleep(5);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, dat_dummy1);
+                       /* end of flip/mirror main part */
+                       msleep(246); /* 146 */
+
+                       sd->nbIm = 0;
+               }
+               break;
+
+       case IMAGE_1280:
+       case IMAGE_1600:
+               if (reso == IMAGE_1280) {
+                       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                                       12, dat_1280);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x8c\x27\x07");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x90\x05\x04");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x8c\x27\x09");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x90\x04\x02");
+               } else {
+                       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                                       12, dat_1600);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x8c\x27\x07");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x90\x06\x40");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x8c\x27\x09");
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033,
+                                       3, "\x90\x04\xb0");
+               }
+
+               fetch_idxdata(gspca_dev, tbl_init_post_alt_big_a,
+                               ARRAY_SIZE(tbl_init_post_alt_big_a));
+
+               if (reso == IMAGE_1600)
+                       msleep(13); /* 1600 */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\x27\x97");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x01\x00");
+               msleep(53);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x20");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x00");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x01");
+               if (reso == IMAGE_1600)
+                       msleep(13); /* 1600 */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa7\x02");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x00");
+               msleep(53);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x20");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x72");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x02");
+               if (reso == IMAGE_1600)
+                       msleep(13); /* 1600 */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa7\x02");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x01");
+               msleep(53);
+
+               if (_MI2020b_) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0010, 0, NULL);
+                       if (reso == IMAGE_1600)
+                               msleep(500); /* 1600 */
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x00c1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x00c2, 0, NULL);
+                       msleep(1850);
+               } else if (_MI2020c_ || _MI2020_) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0010, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x00c1, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x00c2, 0, NULL);
+                       msleep(1850);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0040, 0x0000, 0, NULL);
+                       msleep(30);
+               }
+
+               /* AC power frequency */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq2);
+               msleep(20);
+               /* backlight */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi4);
+               /* at init time but not after */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa2\x0c");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x17");
+               /* finish the backlight */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi6);
+               msleep(6); /* " */
+
+               ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, &c);
+               msleep(14);
+
+               if (_MI2020c_)
+                       fetch_idxdata(gspca_dev, tbl_init_post_alt_big_b,
+                                       ARRAY_SIZE(tbl_init_post_alt_big_b));
+
+               /* flip/mirror */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip6);
+               /* end of flip/mirror main part */
+               msleep(16);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x01");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x20");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x00");
+               if (reso == IMAGE_1600)
+                       msleep(25); /* 1600 */
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa7\x02");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x00");
+               msleep(103);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x03");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x02");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa1\x20");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x72");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x8c\xa7\x02");
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, "\x90\x00\x01");
+               sd->nbIm = 0;
+
+               if (_MI2020c_)
+                       fetch_idxdata(gspca_dev, tbl_init_post_alt_big_c,
+                                       ARRAY_SIZE(tbl_init_post_alt_big_c));
+       }
+
+       sd->vold.mirror    = mirror;
+       sd->vold.flip      = flip;
+       sd->vold.AC50Hz    = freq;
+       sd->vold.backlight = backlight;
+
+       mi2020_camera_settings(gspca_dev);
+
+       return 0;
+}
+
+static int mi2020_configure_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       switch (reso) {
+       case IMAGE_640:
+               gspca_dev->alt = 3 + 1;
+               break;
+
+       case IMAGE_800:
+       case IMAGE_1280:
+       case IMAGE_1600:
+               gspca_dev->alt = 1 + 1;
+               break;
+       }
+       return 0;
+}
+
+int mi2020_camera_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       s32 backlight = sd->vcur.backlight;
+       s32 bright =  sd->vcur.brightness;
+       s32 sharp  =  sd->vcur.sharpness;
+       s32 cntr   =  sd->vcur.contrast;
+       s32 gam    =  sd->vcur.gamma;
+       s32 hue    = (sd->vcur.hue > 0);
+       s32 mirror = (((sd->vcur.mirror > 0) ^ sd->mirrorMask) > 0);
+       s32 flip   = (((sd->vcur.flip   > 0) ^ sd->mirrorMask) > 0);
+       s32 freq   = (sd->vcur.AC50Hz > 0);
+
+       u8 dat_sharp[] = {0x6c, 0x00, 0x08};
+       u8 dat_bright2[] = {0x90, 0x00, 0x00};
+       u8 dat_freq2[] = {0x90, 0x00, 0x80};
+       u8 dat_multi1[] = {0x8c, 0xa7, 0x00};
+       u8 dat_multi2[] = {0x90, 0x00, 0x00};
+       u8 dat_multi3[] = {0x8c, 0xa7, 0x00};
+       u8 dat_multi4[] = {0x90, 0x00, 0x00};
+       u8 dat_hvflip2[] = {0x90, 0x04, 0x6c};
+       u8 dat_hvflip4[] = {0x90, 0x00, 0x24};
+
+       /* Less than 4 images received -> too early to set the settings */
+       if (sd->nbIm < 4) {
+               sd->waitSet = 1;
+               return 0;
+       }
+       sd->waitSet = 0;
+
+       if (freq != sd->vold.AC50Hz) {
+               sd->vold.AC50Hz = freq;
+
+               dat_freq2[2] = freq ? 0xc0 : 0x80;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_freq2);
+               msleep(20);
+       }
+
+       if (mirror != sd->vold.mirror || flip != sd->vold.flip) {
+               sd->vold.mirror = mirror;
+               sd->vold.flip   = flip;
+
+               dat_hvflip2[2] = 0x6c + 2 * (1 - flip) + (1 - mirror);
+               dat_hvflip4[2] = 0x24 + 2 * (1 - flip) + (1 - mirror);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_hvflip6);
+               msleep(130);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_dummy1);
+               msleep(6);
+
+               /* Sometimes present, sometimes not, useful? */
+               /* ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy2);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy3);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy2);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy3);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy2);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy3);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy2);
+                * ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dummy3);*/
+       }
+
+       if (backlight != sd->vold.backlight) {
+               sd->vold.backlight = backlight;
+               if (backlight < 0 || backlight > sd->vmax.backlight)
+                       backlight = 0;
+
+               dat_multi1[2] = 0x9d;
+               dat_multi3[2] = dat_multi1[2] + 1;
+               dat_multi4[2] = dat_multi2[2] = backlight;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi6);
+       }
+
+       if (gam != sd->vold.gamma) {
+               sd->vold.gamma = gam;
+               if (gam < 0 || gam > sd->vmax.gamma)
+                       gam = 0;
+
+               dat_multi1[2] = 0x6d;
+               dat_multi3[2] = dat_multi1[2] + 1;
+               dat_multi4[2] = dat_multi2[2] = 0x40 + gam;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi6);
+       }
+
+       if (cntr != sd->vold.contrast) {
+               sd->vold.contrast = cntr;
+               if (cntr < 0 || cntr > sd->vmax.contrast)
+                       cntr = 0;
+
+               dat_multi1[2] = 0x6d;
+               dat_multi3[2] = dat_multi1[2] + 1;
+               dat_multi4[2] = dat_multi2[2] = 0x12 + 16 * cntr;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_multi6);
+       }
+
+       if (bright != sd->vold.brightness) {
+               sd->vold.brightness = bright;
+               if (bright < 0 || bright > sd->vmax.brightness)
+                       bright = 0;
+
+               dat_bright2[2] = bright;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright1);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright2);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright3);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright4);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright5);
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0033, 3, dat_bright6);
+       }
+
+       if (sharp != sd->vold.sharpness) {
+               sd->vold.sharpness = sharp;
+               if (sharp < 0 || sharp > sd->vmax.sharpness)
+                       sharp = 0;
+
+               dat_sharp[1] = sharp;
+               ctrl_out(gspca_dev, 0x40, 3, 0x7a00, 0x0032, 3, dat_sharp);
+       }
+
+       if (hue != sd->vold.hue) {
+               sd->swapRB = hue;
+               sd->vold.hue = hue;
+       }
+
+       return 0;
+}
+
+static void mi2020_post_unset_alt(struct gspca_dev *gspca_dev)
+{
+       ctrl_out(gspca_dev, 0x40, 5, 0x0000, 0x0000, 0, NULL);
+       msleep(20);
+       if (_MI2020c_ || _MI2020_)
+               ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x0000, 0, NULL);
+       else
+               ctrl_out(gspca_dev, 0x40, 1, 0x0041, 0x0000, 0, NULL);
+}
diff --git a/drivers/media/video/gspca/gl860/gl860-ov2640.c b/drivers/media/video/gspca/gl860/gl860-ov2640.c
new file mode 100644 (file)
index 0000000..14b9c37
--- /dev/null
@@ -0,0 +1,505 @@
+/* @file gl860-ov2640.c
+ * @author Olivier LORIN, from Malmostoso's logs
+ * @date 2009-08-27
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Sensor : OV2640 */
+
+#include "gl860.h"
+
+static u8 dat_init1[] = "\x00\x41\x07\x6a\x06\x61\x0d\x6a" "\x10\x10\xc1\x01";
+static u8 dat_init2[] = {0x61}; /* expected */
+static u8 dat_init3[] = {0x51}; /* expected */
+
+static u8 dat_post[] =
+       "\x00\x41\x07\x6a\x06\xef\x0d\x6a" "\x10\x10\xc1\x01";
+
+static u8 dat_640[]  = "\xd0\x01\xd1\x08\xd2\xe0\xd3\x02\xd4\x10\xd5\x81";
+static u8 dat_800[]  = "\xd0\x01\xd1\x10\xd2\x58\xd3\x02\xd4\x18\xd5\x21";
+static u8 dat_1280[] = "\xd0\x01\xd1\x18\xd2\xc0\xd3\x02\xd4\x28\xd5\x01";
+static u8 dat_1600[] = "\xd0\x01\xd1\x20\xd2\xb0\xd3\x02\xd4\x30\xd5\x41";
+
+static u8 c50[] = {0x50}; /* expected */
+static u8 c28[] = {0x28}; /* expected */
+static u8 ca8[] = {0xa8}; /* expected */
+
+static struct validx tbl_init_at_startup[] = {
+       {0x0000, 0x0000}, {0x0010, 0x0010}, {0x0008, 0x00c0}, {0x0001, 0x00c1},
+       {0x0001, 0x00c2}, {0x0020, 0x0006}, {0x006a, 0x000d},
+       {0x0050, 0x0000}, {0x0041, 0x0000}, {0x006a, 0x0007}, {0x0061, 0x0006},
+       {0x006a, 0x000d}, {0x0000, 0x00c0}, {0x0010, 0x0010}, {0x0001, 0x00c1},
+       {0x0041, 0x00c2}, {0x0004, 0x00d8}, {0x0012, 0x0004}, {0x0000, 0x0058},
+       {0x0041, 0x0000}, {0x0061, 0x0000},
+};
+
+static struct validx tbl_common[] = {
+       {0x6000, 0x00ff}, {0x60ff, 0x002c}, {0x60df, 0x002e}, {0x6001, 0x00ff},
+       {0x6080, 0x0012}, {0x6000, 0x0000}, {0x6000, 0x0045}, {0x6000, 0x0010},
+       {0x6035, 0x003c}, {0x6000, 0x0011}, {0x6028, 0x0004}, {0x60e5, 0x0013},
+       {0x6088, 0x0014}, {0x600c, 0x002c}, {0x6078, 0x0033}, {0x60f7, 0x003b},
+       {0x6000, 0x003e}, {0x6011, 0x0043}, {0x6010, 0x0016}, {0x6082, 0x0039},
+       {0x6088, 0x0035}, {0x600a, 0x0022}, {0x6040, 0x0037}, {0x6000, 0x0023},
+       {0x60a0, 0x0034}, {0x601a, 0x0036}, {0x6002, 0x0006}, {0x60c0, 0x0007},
+       {0x60b7, 0x000d}, {0x6001, 0x000e}, {0x6000, 0x004c}, {0x6081, 0x004a},
+       {0x6099, 0x0021}, {0x6002, 0x0009}, {0x603e, 0x0024}, {0x6034, 0x0025},
+       {0x6081, 0x0026}, {0x6000, 0x0000}, {0x6000, 0x0045}, {0x6000, 0x0010},
+       {0x6000, 0x005c}, {0x6000, 0x0063}, {0x6000, 0x007c}, {0x6070, 0x0061},
+       {0x6080, 0x0062}, {0x6080, 0x0020}, {0x6030, 0x0028}, {0x6000, 0x006c},
+       {0x6000, 0x006e}, {0x6002, 0x0070}, {0x6094, 0x0071}, {0x60c1, 0x0073},
+       {0x6034, 0x003d}, {0x6057, 0x005a}, {0x60bb, 0x004f}, {0x609c, 0x0050},
+       {0x6080, 0x006d}, {0x6002, 0x0039}, {0x6033, 0x003a}, {0x60f1, 0x003b},
+       {0x6031, 0x003c}, {0x6000, 0x00ff}, {0x6014, 0x00e0}, {0x60ff, 0x0076},
+       {0x60a0, 0x0033}, {0x6020, 0x0042}, {0x6018, 0x0043}, {0x6000, 0x004c},
+       {0x60d0, 0x0087}, {0x600f, 0x0088}, {0x6003, 0x00d7}, {0x6010, 0x00d9},
+       {0x6005, 0x00da}, {0x6082, 0x00d3}, {0x60c0, 0x00f9}, {0x6006, 0x0044},
+       {0x6007, 0x00d1}, {0x6002, 0x00d2}, {0x6000, 0x00d2}, {0x6011, 0x00d8},
+       {0x6008, 0x00c8}, {0x6080, 0x00c9}, {0x6008, 0x007c}, {0x6020, 0x007d},
+       {0x6020, 0x007d}, {0x6000, 0x0090}, {0x600e, 0x0091}, {0x601a, 0x0091},
+       {0x6031, 0x0091}, {0x605a, 0x0091}, {0x6069, 0x0091}, {0x6075, 0x0091},
+       {0x607e, 0x0091}, {0x6088, 0x0091}, {0x608f, 0x0091}, {0x6096, 0x0091},
+       {0x60a3, 0x0091}, {0x60af, 0x0091}, {0x60c4, 0x0091}, {0x60d7, 0x0091},
+       {0x60e8, 0x0091}, {0x6020, 0x0091}, {0x6000, 0x0092}, {0x6006, 0x0093},
+       {0x60e3, 0x0093}, {0x6005, 0x0093}, {0x6005, 0x0093}, {0x6000, 0x0093},
+       {0x6004, 0x0093}, {0x6000, 0x0093}, {0x6000, 0x0093}, {0x6000, 0x0093},
+       {0x6000, 0x0093}, {0x6000, 0x0093}, {0x6000, 0x0093}, {0x6000, 0x0093},
+       {0x6000, 0x0096}, {0x6008, 0x0097}, {0x6019, 0x0097}, {0x6002, 0x0097},
+       {0x600c, 0x0097}, {0x6024, 0x0097}, {0x6030, 0x0097}, {0x6028, 0x0097},
+       {0x6026, 0x0097}, {0x6002, 0x0097}, {0x6098, 0x0097}, {0x6080, 0x0097},
+       {0x6000, 0x0097}, {0x6000, 0x0097}, {0x60ed, 0x00c3}, {0x609a, 0x00c4},
+       {0x6000, 0x00a4}, {0x6011, 0x00c5}, {0x6051, 0x00c6}, {0x6010, 0x00c7},
+       {0x6066, 0x00b6}, {0x60a5, 0x00b8}, {0x6064, 0x00b7}, {0x607c, 0x00b9},
+       {0x60af, 0x00b3}, {0x6097, 0x00b4}, {0x60ff, 0x00b5}, {0x60c5, 0x00b0},
+       {0x6094, 0x00b1}, {0x600f, 0x00b2}, {0x605c, 0x00c4}, {0x6000, 0x00a8},
+       {0x60c8, 0x00c0}, {0x6096, 0x00c1}, {0x601d, 0x0086}, {0x6000, 0x0050},
+       {0x6090, 0x0051}, {0x6018, 0x0052}, {0x6000, 0x0053}, {0x6000, 0x0054},
+       {0x6088, 0x0055}, {0x6000, 0x0057}, {0x6090, 0x005a}, {0x6018, 0x005b},
+       {0x6005, 0x005c}, {0x60ed, 0x00c3}, {0x6000, 0x007f}, {0x6005, 0x00da},
+       {0x601f, 0x00e5}, {0x6067, 0x00e1}, {0x6000, 0x00e0}, {0x60ff, 0x00dd},
+       {0x6000, 0x0005}, {0x6001, 0x00ff}, {0x6000, 0x0000}, {0x6000, 0x0045},
+       {0x6000, 0x0010},
+};
+
+static struct validx tbl_sensor_settings_common_a[] = {
+       {0x0041, 0x0000}, {0x006a, 0x0007}, {0x00ef, 0x0006}, {0x006a, 0x000d},
+       {0x0000, 0x00c0}, {0x0010, 0x0010}, {0x0001, 0x00c1}, {0x0041, 0x00c2},
+       {0x0004, 0x00d8}, {0x0012, 0x0004}, {0x0000, 0x0058}, {0x0041, 0x0000},
+       {50, 0xffff},
+       {0x0061, 0x0000},
+       {0xffff, 0xffff},
+       {0x6000, 0x00ff}, {0x6000, 0x007c}, {0x6007, 0x007d},
+       {30, 0xffff},
+       {0x0040, 0x0000},
+};
+
+static struct validx tbl_sensor_settings_common_b[] = {
+       {0x6001, 0x00ff}, {0x6038, 0x000c},
+       {10, 0xffff},
+       {0x6000, 0x0011},
+       /* backlight=31/64 */
+       {0x6001, 0x00ff}, {0x603e, 0x0024}, {0x6034, 0x0025},
+       /* bright=0/256 */
+       {0x6000, 0x00ff}, {0x6009, 0x007c}, {0x6000, 0x007d},
+       /* wbal=64/128 */
+       {0x6000, 0x00ff}, {0x6003, 0x007c}, {0x6040, 0x007d},
+       /* cntr=0/256 */
+       {0x6000, 0x00ff}, {0x6007, 0x007c}, {0x6000, 0x007d},
+       /* sat=128/256 */
+       {0x6000, 0x00ff}, {0x6001, 0x007c}, {0x6080, 0x007d},
+       /* sharpness=0/32 */
+       {0x6000, 0x00ff}, {0x6001, 0x0092}, {0x60c0, 0x0093},
+       /* hue=0/256 */
+       {0x6000, 0x00ff}, {0x6002, 0x007c}, {0x6000, 0x007d},
+       /* gam=32/64 */
+       {0x6000, 0x00ff}, {0x6008, 0x007c}, {0x6020, 0x007d},
+       /* image right up */
+       {0xffff, 0xffff},
+       {15, 0xffff},
+       {0x6001, 0x00ff}, {0x6000, 0x8004},
+       {0xffff, 0xffff},
+       {0x60a8, 0x0004},
+       {15, 0xffff},
+       {0x6001, 0x00ff}, {0x6000, 0x8004},
+       {0xffff, 0xffff},
+       {0x60f8, 0x0004},
+       /* image right up */
+       {0xffff, 0xffff},
+       /* backlight=31/64 */
+       {0x6001, 0x00ff}, {0x603e, 0x0024}, {0x6034, 0x0025},
+};
+
+static struct validx tbl_640[] = {
+       {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0}, {0x6067, 0x00e1},
+       {0x6004, 0x00da}, {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0},
+       {0x6001, 0x00ff}, {0x6000, 0x0012}, {0x6000, 0x0011}, {0x6011, 0x0017},
+       {0x6075, 0x0018}, {0x6001, 0x0019}, {0x6097, 0x001a}, {0x6036, 0x0032},
+       {0x60bb, 0x004f}, {0x6057, 0x005a}, {0x609c, 0x0050}, {0x6080, 0x006d},
+       {0x6092, 0x0026}, {0x60ff, 0x0020}, {0x6000, 0x0027}, {0x6000, 0x00ff},
+       {0x60c8, 0x00c0}, {0x6096, 0x00c1}, {0x6000, 0x008c}, {0x603d, 0x0086},
+       {0x6089, 0x0050}, {0x6090, 0x0051}, {0x602c, 0x0052}, {0x6000, 0x0053},
+       {0x6000, 0x0054}, {0x6088, 0x0055}, {0x6000, 0x0057}, {0x60a0, 0x005a},
+       {0x6078, 0x005b}, {0x6000, 0x005c}, {0x6004, 0x00d3}, {0x6000, 0x00e0},
+       {0x60ff, 0x00dd}, {0x60a1, 0x005a},
+};
+
+static struct validx tbl_800[] = {
+       {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0}, {0x6067, 0x00e1},
+       {0x6004, 0x00da}, {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0},
+       {0x6001, 0x00ff}, {0x6040, 0x0012}, {0x6000, 0x0011}, {0x6011, 0x0017},
+       {0x6043, 0x0018}, {0x6000, 0x0019}, {0x604b, 0x001a}, {0x6009, 0x0032},
+       {0x60ca, 0x004f}, {0x60a8, 0x0050}, {0x6000, 0x006d}, {0x6038, 0x003d},
+       {0x60c8, 0x0035}, {0x6000, 0x0022}, {0x6092, 0x0026}, {0x60ff, 0x0020},
+       {0x6000, 0x0027}, {0x6000, 0x00ff}, {0x6064, 0x00c0}, {0x604b, 0x00c1},
+       {0x6000, 0x008c}, {0x601d, 0x0086}, {0x6082, 0x00d3}, {0x6000, 0x00e0},
+       {0x60ff, 0x00dd}, {0x6020, 0x008c}, {0x6001, 0x00ff}, {0x6044, 0x0018},
+};
+
+static struct validx tbl_big_a[] = {
+       {0x0002, 0x00c1}, {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0},
+       {0x6001, 0x00ff}, {0x6000, 0x0012}, {0x6000, 0x0000}, {0x6000, 0x0045},
+       {0x6000, 0x0010}, {0x6000, 0x0011}, {0x6011, 0x0017}, {0x6075, 0x0018},
+       {0x6001, 0x0019}, {0x6097, 0x001a}, {0x6036, 0x0032}, {0x60bb, 0x004f},
+       {0x609c, 0x0050}, {0x6057, 0x005a}, {0x6080, 0x006d}, {0x6043, 0x000f},
+       {0x608f, 0x0003}, {0x6005, 0x007c}, {0x6081, 0x0026}, {0x6000, 0x00ff},
+       {0x60c8, 0x00c0}, {0x6096, 0x00c1}, {0x6000, 0x008c},
+};
+
+static struct validx tbl_big_b[] = {
+       {0x603d, 0x0086}, {0x6000, 0x0050}, {0x6090, 0x0051}, {0x602c, 0x0052},
+       {0x6000, 0x0053}, {0x6000, 0x0054}, {0x6088, 0x0055}, {0x6000, 0x0057},
+       {0x6040, 0x005a}, {0x60f0, 0x005b}, {0x6001, 0x005c}, {0x6082, 0x00d3},
+       {0x6000, 0x008e},
+};
+
+static struct validx tbl_big_c[] = {
+       {0x6004, 0x00da}, {0x6000, 0x00e0}, {0x6067, 0x00e1}, {0x60ff, 0x00dd},
+       {0x6001, 0x00ff}, {0x6000, 0x00ff}, {0x60f1, 0x00dd}, {0x6004, 0x00e0},
+       {0x6001, 0x00ff}, {0x6000, 0x0011}, {0x6000, 0x00ff}, {0x6010, 0x00c7},
+       {0x6000, 0x0092}, {0x6006, 0x0093}, {0x60e3, 0x0093}, {0x6005, 0x0093},
+       {0x6005, 0x0093}, {0x60ed, 0x00c3}, {0x6000, 0x00a4}, {0x60d0, 0x0087},
+       {0x6003, 0x0096}, {0x600c, 0x0097}, {0x6024, 0x0097}, {0x6030, 0x0097},
+       {0x6028, 0x0097}, {0x6026, 0x0097}, {0x6002, 0x0097}, {0x6001, 0x00ff},
+       {0x6043, 0x000f}, {0x608f, 0x0003}, {0x6000, 0x002d}, {0x6000, 0x002e},
+       {0x600a, 0x0022}, {0x6002, 0x0070}, {0x6008, 0x0014}, {0x6048, 0x0014},
+       {0x6000, 0x00ff}, {0x6000, 0x00e0}, {0x60ff, 0x00dd},
+};
+
+static struct validx tbl_post_unset_alt[] = {
+       {0x006a, 0x000d}, {0x6001, 0x00ff}, {0x6081, 0x0026}, {0x6000, 0x0000},
+       {0x6000, 0x0045}, {0x6000, 0x0010}, {0x6068, 0x000d},
+       {50, 0xffff},
+       {0x0021, 0x0000},
+};
+
+static int  ov2640_init_at_startup(struct gspca_dev *gspca_dev);
+static int  ov2640_configure_alt(struct gspca_dev *gspca_dev);
+static int  ov2640_init_pre_alt(struct gspca_dev *gspca_dev);
+static int  ov2640_init_post_alt(struct gspca_dev *gspca_dev);
+static void ov2640_post_unset_alt(struct gspca_dev *gspca_dev);
+static int  ov2640_camera_settings(struct gspca_dev *gspca_dev);
+/*==========================================================================*/
+
+void ov2640_init_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vcur.backlight  =  32;
+       sd->vcur.brightness =   0;
+       sd->vcur.sharpness  =   6;
+       sd->vcur.contrast   =   0;
+       sd->vcur.gamma      =  32;
+       sd->vcur.hue        =   0;
+       sd->vcur.saturation = 128;
+       sd->vcur.whitebal   =  64;
+
+       sd->vmax.backlight  =  64;
+       sd->vmax.brightness = 255;
+       sd->vmax.sharpness  =  31;
+       sd->vmax.contrast   = 255;
+       sd->vmax.gamma      =  64;
+       sd->vmax.hue        = 255 + 1;
+       sd->vmax.saturation = 255;
+       sd->vmax.whitebal   = 128;
+       sd->vmax.mirror     = 0;
+       sd->vmax.flip       = 0;
+       sd->vmax.AC50Hz     = 0;
+
+       sd->dev_camera_settings = ov2640_camera_settings;
+       sd->dev_init_at_startup = ov2640_init_at_startup;
+       sd->dev_configure_alt   = ov2640_configure_alt;
+       sd->dev_init_pre_alt    = ov2640_init_pre_alt;
+       sd->dev_post_unset_alt  = ov2640_post_unset_alt;
+}
+
+/*==========================================================================*/
+
+static void common(struct gspca_dev *gspca_dev)
+{
+       fetch_validx(gspca_dev, tbl_common, ARRAY_SIZE(tbl_common));
+}
+
+static int ov2640_init_at_startup(struct gspca_dev *gspca_dev)
+{
+       fetch_validx(gspca_dev, tbl_init_at_startup,
+                       ARRAY_SIZE(tbl_init_at_startup));
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, dat_init1);
+
+       common(gspca_dev);
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0006, 1, dat_init2);
+
+       ctrl_out(gspca_dev, 0x40, 1, 0x00ef, 0x0006, 0, NULL);
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, dat_init3);
+
+       ctrl_out(gspca_dev, 0x40, 1, 0x0051, 0x0000, 0, NULL);
+/*     ctrl_out(gspca_dev, 0x40, 11, 0x0000, 0x0000, 0, NULL); */
+
+       return 0;
+}
+
+static int ov2640_init_pre_alt(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vold.backlight  = -1;
+       sd->vold.brightness = -1;
+       sd->vold.sharpness  = -1;
+       sd->vold.contrast   = -1;
+       sd->vold.saturation = -1;
+       sd->vold.gamma    = -1;
+       sd->vold.hue      = -1;
+       sd->vold.whitebal = -1;
+
+       ov2640_init_post_alt(gspca_dev);
+
+       return 0;
+}
+
+static int ov2640_init_post_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+       s32 n; /* reserved for FETCH macros */
+
+       ctrl_out(gspca_dev, 0x40, 5, 0x0001, 0x0000, 0, NULL);
+
+       n = fetch_validx(gspca_dev, tbl_sensor_settings_common_a,
+                       ARRAY_SIZE(tbl_sensor_settings_common_a));
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, dat_post);
+       common(gspca_dev);
+       keep_on_fetching_validx(gspca_dev, tbl_sensor_settings_common_a,
+                               ARRAY_SIZE(tbl_sensor_settings_common_a), n);
+
+       switch (reso) {
+       case IMAGE_640:
+               n = fetch_validx(gspca_dev, tbl_640, ARRAY_SIZE(tbl_640));
+               ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, dat_640);
+               break;
+
+       case IMAGE_800:
+               n = fetch_validx(gspca_dev, tbl_800, ARRAY_SIZE(tbl_800));
+               ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 12, dat_800);
+               break;
+
+       case IMAGE_1600:
+       case IMAGE_1280:
+               n = fetch_validx(gspca_dev, tbl_big_a, ARRAY_SIZE(tbl_big_a));
+
+               if (reso == IMAGE_1280) {
+                       n = fetch_validx(gspca_dev, tbl_big_b,
+                                       ARRAY_SIZE(tbl_big_b));
+               } else {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x601d, 0x0086, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6001, 0x00d7, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6082, 0x00d3, 0, NULL);
+               }
+
+               n = fetch_validx(gspca_dev, tbl_big_c, ARRAY_SIZE(tbl_big_c));
+
+               if (reso == IMAGE_1280) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6001, 0x00ff, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                                       12, dat_1280);
+               } else {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6020, 0x008c, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6001, 0x00ff, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x6076, 0x0018, 0, NULL);
+                       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                                       12, dat_1600);
+               }
+               break;
+       }
+
+       n = fetch_validx(gspca_dev, tbl_sensor_settings_common_b,
+                       ARRAY_SIZE(tbl_sensor_settings_common_b));
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, c50);
+       keep_on_fetching_validx(gspca_dev, tbl_sensor_settings_common_b,
+                               ARRAY_SIZE(tbl_sensor_settings_common_b), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x8004, 1, c28);
+       keep_on_fetching_validx(gspca_dev, tbl_sensor_settings_common_b,
+                               ARRAY_SIZE(tbl_sensor_settings_common_b), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x8004, 1, ca8);
+       keep_on_fetching_validx(gspca_dev, tbl_sensor_settings_common_b,
+                               ARRAY_SIZE(tbl_sensor_settings_common_b), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, c50);
+       keep_on_fetching_validx(gspca_dev, tbl_sensor_settings_common_b,
+                               ARRAY_SIZE(tbl_sensor_settings_common_b), n);
+
+       ov2640_camera_settings(gspca_dev);
+
+       return 0;
+}
+
+static int ov2640_configure_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       switch (reso) {
+       case IMAGE_640:
+               gspca_dev->alt = 3 + 1;
+               break;
+
+       case IMAGE_800:
+       case IMAGE_1280:
+       case IMAGE_1600:
+               gspca_dev->alt = 1 + 1;
+               break;
+       }
+       return 0;
+}
+
+static int ov2640_camera_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       s32 backlight = sd->vcur.backlight;
+       s32 bright = sd->vcur.brightness;
+       s32 sharp  = sd->vcur.sharpness;
+       s32 gam    = sd->vcur.gamma;
+       s32 cntr   = sd->vcur.contrast;
+       s32 sat    = sd->vcur.saturation;
+       s32 hue    = sd->vcur.hue;
+       s32 wbal   = sd->vcur.whitebal;
+
+       if (backlight != sd->vold.backlight) {
+               if (backlight < 0 || backlight > sd->vmax.backlight)
+                       backlight = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6001                 , 0x00ff,
+                               0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x601f + backlight     , 0x0024,
+                               0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x601f + backlight - 10, 0x0025,
+                               0, NULL);
+               /* No sd->vold.backlight=backlight; (to be done again later) */
+       }
+
+       if (bright != sd->vold.brightness) {
+               sd->vold.brightness = bright;
+               if (bright < 0 || bright > sd->vmax.brightness)
+                       bright = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000         , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6009         , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + bright, 0x007d, 0, NULL);
+       }
+
+       if (wbal != sd->vold.whitebal) {
+               sd->vold.whitebal = wbal;
+               if (wbal < 0 || wbal > sd->vmax.whitebal)
+                       wbal = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000       , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6003       , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + wbal, 0x007d, 0, NULL);
+       }
+
+       if (cntr != sd->vold.contrast) {
+               sd->vold.contrast = cntr;
+               if (cntr < 0 || cntr > sd->vmax.contrast)
+                       cntr = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000       , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6007       , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + cntr, 0x007d, 0, NULL);
+       }
+
+       if (sat != sd->vold.saturation) {
+               sd->vold.saturation = sat;
+               if (sat < 0 || sat > sd->vmax.saturation)
+                       sat = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000      , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6001      , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + sat, 0x007d, 0, NULL);
+       }
+
+       if (sharp != sd->vold.sharpness) {
+               sd->vold.sharpness = sharp;
+               if (sharp < 0 || sharp > sd->vmax.sharpness)
+                       sharp = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000        , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6001        , 0x0092, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x60c0 + sharp, 0x0093, 0, NULL);
+       }
+
+       if (hue != sd->vold.hue) {
+               sd->vold.hue = hue;
+               if (hue < 0 || hue > sd->vmax.hue)
+                       hue = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000     , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6002     , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + hue * (hue < 255), 0x007d,
+                               0, NULL);
+               if (hue >= sd->vmax.hue)
+                       sd->swapRB = 1;
+               else
+                       sd->swapRB = 0;
+       }
+
+       if (gam != sd->vold.gamma) {
+               sd->vold.gamma = gam;
+               if (gam < 0 || gam > sd->vmax.gamma)
+                       gam = 0;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000      , 0x00ff, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6008      , 0x007c, 0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x6000 + gam, 0x007d, 0, NULL);
+       }
+
+       if (backlight != sd->vold.backlight) {
+               sd->vold.backlight = backlight;
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x6001                 , 0x00ff,
+                               0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x601f + backlight     , 0x0024,
+                               0, NULL);
+               ctrl_out(gspca_dev, 0x40, 1, 0x601f + backlight - 10, 0x0025,
+                               0, NULL);
+       }
+
+       return 0;
+}
+
+static void ov2640_post_unset_alt(struct gspca_dev *gspca_dev)
+{
+       ctrl_out(gspca_dev, 0x40, 5, 0x0000, 0x0000, 0, NULL);
+       msleep(20);
+       fetch_validx(gspca_dev, tbl_post_unset_alt,
+                       ARRAY_SIZE(tbl_post_unset_alt));
+}
diff --git a/drivers/media/video/gspca/gl860/gl860-ov9655.c b/drivers/media/video/gspca/gl860/gl860-ov9655.c
new file mode 100644 (file)
index 0000000..eda3346
--- /dev/null
@@ -0,0 +1,337 @@
+/* @file gl860-ov9655.c
+ * @author Olivier LORIN, from logs done by Simon (Sur3) and Almighurt
+ * on dsd's weblog
+ * @date 2009-08-27
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Sensor : OV9655 */
+
+#include "gl860.h"
+
+static struct validx tbl_init_at_startup[] = {
+       {0x0000, 0x0000}, {0x0010, 0x0010}, {0x0008, 0x00c0}, {0x0001, 0x00c1},
+       {0x0001, 0x00c2}, {0x0020, 0x0006}, {0x006a, 0x000d},
+
+       {0x0040, 0x0000},
+};
+
+static struct validx tbl_commmon[] = {
+       {0x0041, 0x0000}, {0x006a, 0x0007}, {0x0063, 0x0006}, {0x006a, 0x000d},
+       {0x0000, 0x00c0}, {0x0010, 0x0010}, {0x0001, 0x00c1}, {0x0041, 0x00c2},
+       {0x0004, 0x00d8}, {0x0012, 0x0004}, {0x0000, 0x0058}, {0x0040, 0x0000},
+       {0x00f3, 0x0006}, {0x0058, 0x0000}, {0x0048, 0x0000}, {0x0061, 0x0000},
+};
+
+static s32 tbl_length[] = {12, 56, 52, 54, 56, 42, 32, 12};
+
+static u8 *tbl_640[] = {
+       "\x00\x40\x07\x6a\x06\xf3\x0d\x6a" "\x10\x10\xc1\x01"
+       ,
+       "\x12\x80\x00\x00\x01\x98\x02\x80" "\x03\x12\x04\x03\x0b\x57\x0e\x61"
+       "\x0f\x42\x11\x01\x12\x60\x13\x00" "\x14\x3a\x16\x24\x17\x14\x18\x00"
+       "\x19\x01\x1a\x3d\x1e\x04\x24\x3c" "\x25\x36\x26\x72\x27\x08\x28\x08"
+       "\x29\x15\x2a\x00\x2b\x00\x2c\x08"
+       ,
+       "\x32\xff\x33\x00\x34\x3d\x35\x00" "\x36\xfa\x38\x72\x39\x57\x3a\x00"
+       "\x3b\x0c\x3d\x99\x3e\x0c\x3f\xc1" "\x40\xc0\x41\x00\x42\xc0\x43\x0a"
+       "\x44\xf0\x45\x46\x46\x62\x47\x2a" "\x48\x3c\x4a\xee\x4b\xe7\x4c\xe7"
+       "\x4d\xe7\x4e\xe7"
+       ,
+       "\x4f\x98\x50\x98\x51\x00\x52\x28" "\x53\x70\x54\x98\x58\x1a\x59\x85"
+       "\x5a\xa9\x5b\x64\x5c\x84\x5d\x53" "\x5e\x0e\x5f\xf0\x60\xf0\x61\xf0"
+       "\x62\x00\x63\x00\x64\x02\x65\x20" "\x66\x00\x69\x0a\x6b\x5a\x6c\x04"
+       "\x6d\x55\x6e\x00\x6f\x9d"
+       ,
+       "\x70\x15\x71\x78\x72\x00\x73\x00" "\x74\x3a\x75\x35\x76\x01\x77\x02"
+       "\x7a\x24\x7b\x04\x7c\x07\x7d\x10" "\x7e\x28\x7f\x36\x80\x44\x81\x52"
+       "\x82\x60\x83\x6c\x84\x78\x85\x8c" "\x86\x9e\x87\xbb\x88\xd2\x89\xe5"
+       "\x8a\x23\x8c\x8d\x90\x7c\x91\x7b"
+       ,
+       "\x9d\x02\x9e\x02\x9f\x74\xa0\x73" "\xa1\x40\xa4\x50\xa5\x68\xa6\x70"
+       "\xa8\xc1\xa9\xef\xaa\x92\xab\x04" "\xac\x80\xad\x80\xae\x80\xaf\x80"
+       "\xb2\xf2\xb3\x20\xb4\x20\xb5\x00" "\xb6\xaf"
+       ,
+       "\xbb\xae\xbc\x4f\xbd\x4e\xbe\x6a" "\xbf\x68\xc0\xaa\xc1\xc0\xc2\x01"
+       "\xc3\x4e\xc6\x85\xc7\x81\xc9\xe0" "\xca\xe8\xcb\xf0\xcc\xd8\xcd\x93"
+       ,
+       "\xd0\x01\xd1\x08\xd2\xe0\xd3\x01" "\xd4\x10\xd5\x80"
+};
+
+static u8 *tbl_800[] = {
+       "\x00\x40\x07\x6a\x06\xf3\x0d\x6a" "\x10\x10\xc1\x01"
+       ,
+       "\x12\x80\x00\x00\x01\x98\x02\x80" "\x03\x12\x04\x01\x0b\x57\x0e\x61"
+       "\x0f\x42\x11\x00\x12\x00\x13\x00" "\x14\x3a\x16\x24\x17\x1b\x18\xbb"
+       "\x19\x01\x1a\x81\x1e\x04\x24\x3c" "\x25\x36\x26\x72\x27\x08\x28\x08"
+       "\x29\x15\x2a\x00\x2b\x00\x2c\x08"
+       ,
+       "\x32\xa4\x33\x00\x34\x3d\x35\x00" "\x36\xf8\x38\x72\x39\x57\x3a\x00"
+       "\x3b\x0c\x3d\x99\x3e\x0c\x3f\xc2" "\x40\xc0\x41\x00\x42\xc0\x43\x0a"
+       "\x44\xf0\x45\x46\x46\x62\x47\x2a" "\x48\x3c\x4a\xec\x4b\xe8\x4c\xe8"
+       "\x4d\xe8\x4e\xe8"
+       ,
+       "\x4f\x98\x50\x98\x51\x00\x52\x28" "\x53\x70\x54\x98\x58\x1a\x59\x85"
+       "\x5a\xa9\x5b\x64\x5c\x84\x5d\x53" "\x5e\x0e\x5f\xf0\x60\xf0\x61\xf0"
+       "\x62\x00\x63\x00\x64\x02\x65\x20" "\x66\x00\x69\x02\x6b\x5a\x6c\x04"
+       "\x6d\x55\x6e\x00\x6f\x9d"
+       ,
+       "\x70\x08\x71\x78\x72\x00\x73\x01" "\x74\x3a\x75\x35\x76\x01\x77\x02"
+       "\x7a\x24\x7b\x04\x7c\x07\x7d\x10" "\x7e\x28\x7f\x36\x80\x44\x81\x52"
+       "\x82\x60\x83\x6c\x84\x78\x85\x8c" "\x86\x9e\x87\xbb\x88\xd2\x89\xe5"
+       "\x8a\x23\x8c\x0d\x90\x90\x91\x90"
+       ,
+       "\x9d\x02\x9e\x02\x9f\x94\xa0\x94" "\xa1\x01\xa4\x50\xa5\x68\xa6\x70"
+       "\xa8\xc1\xa9\xef\xaa\x92\xab\x04" "\xac\x80\xad\x80\xae\x80\xaf\x80"
+       "\xb2\xf2\xb3\x20\xb4\x20\xb5\x00" "\xb6\xaf"
+       ,
+       "\xbb\xae\xbc\x38\xbd\x39\xbe\x01" "\xbf\x01\xc0\xe2\xc1\xc0\xc2\x01"
+       "\xc3\x4e\xc6\x85\xc7\x81\xc9\xe0" "\xca\xe8\xcb\xf0\xcc\xd8\xcd\x93"
+       ,
+       "\xd0\x21\xd1\x18\xd2\xe0\xd3\x01" "\xd4\x28\xd5\x00"
+};
+
+static u8 c04[] = {0x04};
+static u8 dat_post_1[] = "\x04\x00\x10\x20\xa1\x00\x00\x02";
+static u8 dat_post_2[] = "\x10\x10\xc1\x02";
+static u8 dat_post_3[] = "\x04\x00\x10\x7c\xa1\x00\x00\x04";
+static u8 dat_post_4[] = "\x10\x02\xc1\x06";
+static u8 dat_post_5[] = "\x04\x00\x10\x7b\xa1\x00\x00\x08";
+static u8 dat_post_6[] = "\x10\x10\xc1\x05";
+static u8 dat_post_7[] = "\x04\x00\x10\x7c\xa1\x00\x00\x08";
+static u8 dat_post_8[] = "\x04\x00\x10\x7c\xa1\x00\x00\x09";
+
+static struct validx tbl_init_post_alt[] = {
+       {0x6032, 0x00ff}, {0x6032, 0x00ff}, {0x6032, 0x00ff}, {0x603c, 0x00ff},
+       {0x6003, 0x00ff}, {0x6032, 0x00ff}, {0x6032, 0x00ff}, {0x6001, 0x00ff},
+       {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6012, 0x0003}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6012, 0x0003},
+       {0xffff, 0xffff},
+       {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6012, 0x0003}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6012, 0x0003},
+       {0xffff, 0xffff},
+       {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6000, 0x801e},
+       {0xffff, 0xffff},
+       {0x6004, 0x001e}, {0x6012, 0x0003},
+};
+
+static int  ov9655_init_at_startup(struct gspca_dev *gspca_dev);
+static int  ov9655_configure_alt(struct gspca_dev *gspca_dev);
+static int  ov9655_init_pre_alt(struct gspca_dev *gspca_dev);
+static int  ov9655_init_post_alt(struct gspca_dev *gspca_dev);
+static void ov9655_post_unset_alt(struct gspca_dev *gspca_dev);
+static int  ov9655_camera_settings(struct gspca_dev *gspca_dev);
+/*==========================================================================*/
+
+void ov9655_init_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vcur.backlight  =   0;
+       sd->vcur.brightness = 128;
+       sd->vcur.sharpness  =   0;
+       sd->vcur.contrast   =   0;
+       sd->vcur.gamma      =   0;
+       sd->vcur.hue        =   0;
+       sd->vcur.saturation =   0;
+       sd->vcur.whitebal   =   0;
+
+       sd->vmax.backlight  =   0;
+       sd->vmax.brightness = 255;
+       sd->vmax.sharpness  =   0;
+       sd->vmax.contrast   =   0;
+       sd->vmax.gamma      =   0;
+       sd->vmax.hue        =   0 + 1;
+       sd->vmax.saturation =   0;
+       sd->vmax.whitebal   =   0;
+       sd->vmax.mirror     = 0;
+       sd->vmax.flip       = 0;
+       sd->vmax.AC50Hz     = 0;
+
+       sd->dev_camera_settings = ov9655_camera_settings;
+       sd->dev_init_at_startup = ov9655_init_at_startup;
+       sd->dev_configure_alt   = ov9655_configure_alt;
+       sd->dev_init_pre_alt    = ov9655_init_pre_alt;
+       sd->dev_post_unset_alt  = ov9655_post_unset_alt;
+}
+
+/*==========================================================================*/
+
+static int ov9655_init_at_startup(struct gspca_dev *gspca_dev)
+{
+       fetch_validx(gspca_dev, tbl_init_at_startup,
+                       ARRAY_SIZE(tbl_init_at_startup));
+       fetch_validx(gspca_dev, tbl_commmon, ARRAY_SIZE(tbl_commmon));
+/*     ctrl_out(gspca_dev, 0x40, 11, 0x0000, 0x0000, 0, NULL);*/
+
+       return 0;
+}
+
+static int ov9655_init_pre_alt(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->vold.brightness = -1;
+       sd->vold.hue = -1;
+
+       fetch_validx(gspca_dev, tbl_commmon, ARRAY_SIZE(tbl_commmon));
+
+       ov9655_init_post_alt(gspca_dev);
+
+       return 0;
+}
+
+static int ov9655_init_post_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+       s32 n; /* reserved for FETCH macros */
+       s32 i;
+       u8 **tbl;
+
+       ctrl_out(gspca_dev, 0x40, 5, 0x0001, 0x0000, 0, NULL);
+
+       tbl = (reso == IMAGE_640) ? tbl_640 : tbl_800;
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                       tbl_length[0], tbl[0]);
+       for (i = 1; i < 7; i++)
+               ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200,
+                               tbl_length[i], tbl[i]);
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200,
+                       tbl_length[7], tbl[7]);
+
+       n = fetch_validx(gspca_dev, tbl_init_post_alt,
+                       ARRAY_SIZE(tbl_init_post_alt));
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_1);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_1);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+       ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x801e, 1, c04);
+       keep_on_fetching_validx(gspca_dev, tbl_init_post_alt,
+                                       ARRAY_SIZE(tbl_init_post_alt), n);
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_1);
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 4, dat_post_2);
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_3);
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 4, dat_post_4);
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_5);
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, 4, dat_post_6);
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_7);
+
+       ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_post_8);
+
+       ov9655_camera_settings(gspca_dev);
+
+       return 0;
+}
+
+static int ov9655_configure_alt(struct gspca_dev *gspca_dev)
+{
+       s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;
+
+       switch (reso) {
+       case IMAGE_640:
+               gspca_dev->alt = 1 + 1;
+               break;
+
+       default:
+               gspca_dev->alt = 1 + 1;
+               break;
+       }
+       return 0;
+}
+
+static int ov9655_camera_settings(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       u8 dat_bright[] = "\x04\x00\x10\x7c\xa1\x00\x00\x70";
+
+       s32 bright = sd->vcur.brightness;
+       s32 hue    = sd->vcur.hue;
+
+       if (bright != sd->vold.brightness) {
+               sd->vold.brightness = bright;
+               if (bright < 0 || bright > sd->vmax.brightness)
+                       bright = 0;
+
+               dat_bright[3] = bright;
+               ctrl_out(gspca_dev, 0x40, 3, 0x6000, 0x0200, 8, dat_bright);
+       }
+
+       if (hue != sd->vold.hue) {
+               sd->vold.hue = hue;
+               sd->swapRB = (hue != 0);
+       }
+
+       return 0;
+}
+
+static void ov9655_post_unset_alt(struct gspca_dev *gspca_dev)
+{
+       ctrl_out(gspca_dev, 0x40, 5, 0x0000, 0x0000, 0, NULL);
+       ctrl_out(gspca_dev, 0x40, 1, 0x0061, 0x0000, 0, NULL);
+}
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
new file mode 100644 (file)
index 0000000..6ef59ac
--- /dev/null
@@ -0,0 +1,785 @@
+/* @file gl860.c
+ * @date 2009-08-27
+ *
+ * Genesys Logic webcam with gl860 subdrivers
+ *
+ * Driver by Olivier Lorin <o.lorin@laposte.net>
+ * GSPCA by Jean-Francois Moine <http://moinejf.free.fr>
+ * Thanks BUGabundo and Malmostoso for your amazing help!
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "gspca.h"
+#include "gl860.h"
+
+MODULE_AUTHOR("Olivier Lorin <lorin@laposte.net>");
+MODULE_DESCRIPTION("GSPCA/Genesys Logic GL860 USB Camera Driver");
+MODULE_LICENSE("GPL");
+
+/*======================== static function declarations ====================*/
+
+static void (*dev_init_settings)(struct gspca_dev *gspca_dev);
+
+static int  sd_config(struct gspca_dev *gspca_dev,
+                       const struct usb_device_id *id);
+static int  sd_init(struct gspca_dev *gspca_dev);
+static int  sd_isoc_init(struct gspca_dev *gspca_dev);
+static int  sd_start(struct gspca_dev *gspca_dev);
+static void sd_stop0(struct gspca_dev *gspca_dev);
+static void sd_pkt_scan(struct gspca_dev *gspca_dev,
+                       struct gspca_frame *frame, u8 *data, s32 len);
+static void sd_callback(struct gspca_dev *gspca_dev);
+
+static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
+                               s32 vendor_id, s32 product_id);
+
+/*============================ driver options ==============================*/
+
+static s32 AC50Hz = 0xff;
+module_param(AC50Hz, int, 0644);
+MODULE_PARM_DESC(AC50Hz, " Does AC power frequency is 50Hz? (0/1)");
+
+static char sensor[7];
+module_param_string(sensor, sensor, sizeof(sensor), 0644);
+MODULE_PARM_DESC(sensor,
+               " Driver sensor ('MI1320'/'MI2020'/'OV9655'/'OV2640'/'')");
+
+/*============================ webcam controls =============================*/
+
+/* Functions to get and set a control value */
+#define SD_SETGET(thename) \
+static int sd_set_##thename(struct gspca_dev *gspca_dev, s32 val)\
+{\
+       struct sd *sd = (struct sd *) gspca_dev;\
+\
+       sd->vcur.thename = val;\
+       if (gspca_dev->streaming)\
+               sd->dev_camera_settings(gspca_dev);\
+       return 0;\
+} \
+static int sd_get_##thename(struct gspca_dev *gspca_dev, s32 *val)\
+{\
+       struct sd *sd = (struct sd *) gspca_dev;\
+\
+       *val = sd->vcur.thename;\
+       return 0;\
+}
+
+SD_SETGET(mirror)
+SD_SETGET(flip)
+SD_SETGET(AC50Hz)
+SD_SETGET(backlight)
+SD_SETGET(brightness)
+SD_SETGET(gamma)
+SD_SETGET(hue)
+SD_SETGET(saturation)
+SD_SETGET(sharpness)
+SD_SETGET(whitebal)
+SD_SETGET(contrast)
+
+#define GL860_NCTRLS 11
+
+/* control table */
+static struct ctrl sd_ctrls_mi1320[GL860_NCTRLS];
+static struct ctrl sd_ctrls_mi2020[GL860_NCTRLS];
+static struct ctrl sd_ctrls_mi2020b[GL860_NCTRLS];
+static struct ctrl sd_ctrls_ov2640[GL860_NCTRLS];
+static struct ctrl sd_ctrls_ov9655[GL860_NCTRLS];
+
+#define SET_MY_CTRL(theid, \
+       thetype, thelabel, thename) \
+       if (sd->vmax.thename != 0) {\
+               sd_ctrls[nCtrls].qctrl.id   = theid;\
+               sd_ctrls[nCtrls].qctrl.type = thetype;\
+               strcpy(sd_ctrls[nCtrls].qctrl.name, thelabel);\
+               sd_ctrls[nCtrls].qctrl.minimum = 0;\
+               sd_ctrls[nCtrls].qctrl.maximum = sd->vmax.thename;\
+               sd_ctrls[nCtrls].qctrl.default_value = sd->vcur.thename;\
+               sd_ctrls[nCtrls].qctrl.step = \
+                       (sd->vmax.thename < 16) ? 1 : sd->vmax.thename/16;\
+               sd_ctrls[nCtrls].set = sd_set_##thename;\
+               sd_ctrls[nCtrls].get = sd_get_##thename;\
+               nCtrls++;\
+       }
+
+static int gl860_build_control_table(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       struct ctrl *sd_ctrls;
+       int nCtrls = 0;
+
+       if (_MI1320_)
+               sd_ctrls = sd_ctrls_mi1320;
+       else if (_MI2020_)
+               sd_ctrls = sd_ctrls_mi2020;
+       else if (_MI2020b_)
+               sd_ctrls = sd_ctrls_mi2020b;
+       else if (_OV2640_)
+               sd_ctrls = sd_ctrls_ov2640;
+       else if (_OV9655_)
+               sd_ctrls = sd_ctrls_ov9655;
+       else
+               return 0;
+
+       memset(sd_ctrls, 0, GL860_NCTRLS * sizeof(struct ctrl));
+
+       SET_MY_CTRL(V4L2_CID_BRIGHTNESS,
+               V4L2_CTRL_TYPE_INTEGER, "Brightness", brightness)
+       SET_MY_CTRL(V4L2_CID_SHARPNESS,
+               V4L2_CTRL_TYPE_INTEGER, "Sharpness", sharpness)
+       SET_MY_CTRL(V4L2_CID_CONTRAST,
+               V4L2_CTRL_TYPE_INTEGER, "Contrast", contrast)
+       SET_MY_CTRL(V4L2_CID_GAMMA,
+               V4L2_CTRL_TYPE_INTEGER, "Gamma", gamma)
+       SET_MY_CTRL(V4L2_CID_HUE,
+               V4L2_CTRL_TYPE_INTEGER, "Palette", hue)
+       SET_MY_CTRL(V4L2_CID_SATURATION,
+               V4L2_CTRL_TYPE_INTEGER, "Saturation", saturation)
+       SET_MY_CTRL(V4L2_CID_WHITE_BALANCE_TEMPERATURE,
+               V4L2_CTRL_TYPE_INTEGER, "White Bal.", whitebal)
+       SET_MY_CTRL(V4L2_CID_BACKLIGHT_COMPENSATION,
+               V4L2_CTRL_TYPE_INTEGER, "Backlight" , backlight)
+
+       SET_MY_CTRL(V4L2_CID_HFLIP,
+               V4L2_CTRL_TYPE_BOOLEAN, "Mirror", mirror)
+       SET_MY_CTRL(V4L2_CID_VFLIP,
+               V4L2_CTRL_TYPE_BOOLEAN, "Flip", flip)
+       SET_MY_CTRL(V4L2_CID_POWER_LINE_FREQUENCY,
+               V4L2_CTRL_TYPE_BOOLEAN, "50Hz", AC50Hz)
+
+       return nCtrls;
+}
+
+/*==================== sud-driver structure initialisation =================*/
+
+static struct sd_desc sd_desc_mi1320 = {
+       .name        = MODULE_NAME,
+       .ctrls       = sd_ctrls_mi1320,
+       .nctrls      = GL860_NCTRLS,
+       .config      = sd_config,
+       .init        = sd_init,
+       .isoc_init   = sd_isoc_init,
+       .start       = sd_start,
+       .stop0       = sd_stop0,
+       .pkt_scan    = sd_pkt_scan,
+       .dq_callback = sd_callback,
+};
+
+static struct sd_desc sd_desc_mi2020 = {
+       .name        = MODULE_NAME,
+       .ctrls       = sd_ctrls_mi2020,
+       .nctrls      = GL860_NCTRLS,
+       .config      = sd_config,
+       .init        = sd_init,
+       .isoc_init   = sd_isoc_init,
+       .start       = sd_start,
+       .stop0       = sd_stop0,
+       .pkt_scan    = sd_pkt_scan,
+       .dq_callback = sd_callback,
+};
+
+static struct sd_desc sd_desc_mi2020b = {
+       .name        = MODULE_NAME,
+       .ctrls       = sd_ctrls_mi2020b,
+       .nctrls      = GL860_NCTRLS,
+       .config      = sd_config,
+       .init        = sd_init,
+       .isoc_init   = sd_isoc_init,
+       .start       = sd_start,
+       .stop0       = sd_stop0,
+       .pkt_scan    = sd_pkt_scan,
+       .dq_callback = sd_callback,
+};
+
+static struct sd_desc sd_desc_ov2640 = {
+       .name        = MODULE_NAME,
+       .ctrls       = sd_ctrls_ov2640,
+       .nctrls      = GL860_NCTRLS,
+       .config      = sd_config,
+       .init        = sd_init,
+       .isoc_init   = sd_isoc_init,
+       .start       = sd_start,
+       .stop0       = sd_stop0,
+       .pkt_scan    = sd_pkt_scan,
+       .dq_callback = sd_callback,
+};
+
+static struct sd_desc sd_desc_ov9655 = {
+       .name        = MODULE_NAME,
+       .ctrls       = sd_ctrls_ov9655,
+       .nctrls      = GL860_NCTRLS,
+       .config      = sd_config,
+       .init        = sd_init,
+       .isoc_init   = sd_isoc_init,
+       .start       = sd_start,
+       .stop0       = sd_stop0,
+       .pkt_scan    = sd_pkt_scan,
+       .dq_callback = sd_callback,
+};
+
+/*=========================== sub-driver image sizes =======================*/
+
+static struct v4l2_pix_format mi2020_mode[] = {
+       { 640,  480, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       },
+       { 800,  600, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 800,
+               .sizeimage = 800 * 600,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1
+       },
+       {1280, 1024, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 1024,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 2
+       },
+       {1600, 1200, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1600,
+               .sizeimage = 1600 * 1200,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 3
+       },
+};
+
+static struct v4l2_pix_format ov2640_mode[] = {
+       { 640,  480, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       },
+       { 800,  600, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 800,
+               .sizeimage = 800 * 600,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1
+       },
+       {1280,  960, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 960,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 2
+       },
+       {1600, 1200, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1600,
+               .sizeimage = 1600 * 1200,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 3
+       },
+};
+
+static struct v4l2_pix_format mi1320_mode[] = {
+       { 640,  480, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       },
+       { 800,  600, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 800,
+               .sizeimage = 800 * 600,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1
+       },
+       {1280,  960, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 960,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 2
+       },
+};
+
+static struct v4l2_pix_format ov9655_mode[] = {
+       { 640,  480, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       },
+       {1280,  960, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 960,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1
+       },
+};
+
+/*========================= sud-driver functions ===========================*/
+
+/* This function is called at probe time */
+static int sd_config(struct gspca_dev *gspca_dev,
+                       const struct usb_device_id *id)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       struct cam *cam;
+       s32 vendor_id, product_id;
+
+       /* Get USB VendorID and ProductID */
+       vendor_id  = le16_to_cpu(id->idVendor);
+       product_id = le16_to_cpu(id->idProduct);
+
+       sd->nbRightUp = 1;
+       sd->nbIm = -1;
+
+       sd->sensor = 0xff;
+       if (strcmp(sensor, "MI1320") == 0)
+               sd->sensor = ID_MI1320;
+       else if (strcmp(sensor, "OV2640") == 0)
+               sd->sensor = ID_OV2640;
+       else if (strcmp(sensor, "OV9655") == 0)
+               sd->sensor = ID_OV9655;
+       else if (strcmp(sensor, "MI2020") == 0)
+               sd->sensor = ID_MI2020;
+       else if (strcmp(sensor, "MI2020b") == 0)
+               sd->sensor = ID_MI2020b;
+
+       /* Get sensor and set the suitable init/start/../stop functions */
+       if (gl860_guess_sensor(gspca_dev, vendor_id, product_id) == -1)
+               return -1;
+
+       cam = &gspca_dev->cam;
+       gspca_dev->nbalt = 4;
+
+       switch (sd->sensor) {
+       case ID_MI1320:
+               gspca_dev->sd_desc = &sd_desc_mi1320;
+               cam->cam_mode = mi1320_mode;
+               cam->nmodes = ARRAY_SIZE(mi1320_mode);
+               dev_init_settings   = mi1320_init_settings;
+               break;
+
+       case ID_MI2020:
+               gspca_dev->sd_desc = &sd_desc_mi2020;
+               cam->cam_mode = mi2020_mode;
+               cam->nmodes = ARRAY_SIZE(mi2020_mode);
+               dev_init_settings   = mi2020_init_settings;
+               break;
+
+       case ID_MI2020b:
+               gspca_dev->sd_desc = &sd_desc_mi2020b;
+               cam->cam_mode = mi2020_mode;
+               cam->nmodes = ARRAY_SIZE(mi2020_mode);
+               dev_init_settings   = mi2020_init_settings;
+               break;
+
+       case ID_OV2640:
+               gspca_dev->sd_desc = &sd_desc_ov2640;
+               cam->cam_mode = ov2640_mode;
+               cam->nmodes = ARRAY_SIZE(ov2640_mode);
+               dev_init_settings   = ov2640_init_settings;
+               break;
+
+       case ID_OV9655:
+               gspca_dev->sd_desc = &sd_desc_ov9655;
+               cam->cam_mode = ov9655_mode;
+               cam->nmodes = ARRAY_SIZE(ov9655_mode);
+               dev_init_settings   = ov9655_init_settings;
+               break;
+       }
+
+       dev_init_settings(gspca_dev);
+       if (AC50Hz != 0xff)
+               ((struct sd *) gspca_dev)->vcur.AC50Hz = AC50Hz;
+       gl860_build_control_table(gspca_dev);
+
+       return 0;
+}
+
+/* This function is called at probe time after sd_config */
+static int sd_init(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       return sd->dev_init_at_startup(gspca_dev);
+}
+
+/* This function is called before to choose the alt setting */
+static int sd_isoc_init(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       return sd->dev_configure_alt(gspca_dev);
+}
+
+/* This function is called to start the webcam */
+static int sd_start(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       return sd->dev_init_pre_alt(gspca_dev);
+}
+
+/* This function is called to stop the webcam */
+static void sd_stop0(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       return sd->dev_post_unset_alt(gspca_dev);
+}
+
+/* This function is called when an image is being received */
+static void sd_pkt_scan(struct gspca_dev *gspca_dev,
+                       struct gspca_frame *frame, u8 *data, s32 len)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       static s32 nSkipped;
+
+       s32 mode = (s32) gspca_dev->curr_mode;
+       s32 nToSkip =
+               sd->swapRB * (gspca_dev->cam.cam_mode[mode].bytesperline + 1);
+
+       /* Test only against 0202h, so endianess does not matter */
+       switch (*(s16 *) data) {
+       case 0x0202:            /* End of frame, start a new one */
+               frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, data, 0);
+               nSkipped = 0;
+               if (sd->nbIm >= 0 && sd->nbIm < 10)
+                       sd->nbIm++;
+               gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, 0);
+               break;
+
+       default:
+               data += 2;
+               len  -= 2;
+               if (nSkipped + len <= nToSkip)
+                       nSkipped += len;
+               else {
+                       if (nSkipped < nToSkip && nSkipped + len > nToSkip) {
+                               data += nToSkip - nSkipped;
+                               len  -= nToSkip - nSkipped;
+                               nSkipped = nToSkip + 1;
+                       }
+                       gspca_frame_add(gspca_dev,
+                               INTER_PACKET, frame, data, len);
+               }
+               break;
+       }
+}
+
+/* This function is called when an image has been read */
+/* This function is used to monitor webcam orientation */
+static void sd_callback(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       if (!_OV9655_) {
+               u8 state;
+               u8 upsideDown;
+
+               /* Probe sensor orientation */
+               ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0000, 1, (void *)&state);
+
+               /* C8/40 means upside-down (looking backwards) */
+               /* D8/50 means right-up (looking onwards) */
+               upsideDown = (state == 0xc8 || state == 0x40);
+
+               if (upsideDown && sd->nbRightUp > -4) {
+                       if (sd->nbRightUp > 0)
+                               sd->nbRightUp = 0;
+                       if (sd->nbRightUp == -3) {
+                               sd->mirrorMask = 1;
+                               sd->waitSet = 1;
+                       }
+                       sd->nbRightUp--;
+               }
+               if (!upsideDown && sd->nbRightUp < 4) {
+                       if (sd->nbRightUp  < 0)
+                               sd->nbRightUp = 0;
+                       if (sd->nbRightUp == 3) {
+                               sd->mirrorMask = 0;
+                               sd->waitSet = 1;
+                       }
+                       sd->nbRightUp++;
+               }
+       }
+
+       if (sd->waitSet)
+               sd->dev_camera_settings(gspca_dev);
+}
+
+/*=================== USB driver structure initialisation ==================*/
+
+static const __devinitdata struct usb_device_id device_table[] = {
+       {USB_DEVICE(0x05e3, 0x0503)},
+       {USB_DEVICE(0x05e3, 0xf191)},
+       {}
+};
+
+MODULE_DEVICE_TABLE(usb, device_table);
+
+static int sd_probe(struct usb_interface *intf,
+                               const struct usb_device_id *id)
+{
+       struct gspca_dev *gspca_dev;
+       s32 ret;
+
+       ret = gspca_dev_probe(intf, id,
+                       &sd_desc_mi1320, sizeof(struct sd), THIS_MODULE);
+
+       if (ret >= 0) {
+               gspca_dev = usb_get_intfdata(intf);
+
+               PDEBUG(D_PROBE,
+                       "Camera is now controlling video device /dev/video%d",
+                       gspca_dev->vdev.minor);
+       }
+
+       return ret;
+}
+
+static void sd_disconnect(struct usb_interface *intf)
+{
+       gspca_disconnect(intf);
+}
+
+static struct usb_driver sd_driver = {
+       .name       = MODULE_NAME,
+       .id_table   = device_table,
+       .probe      = sd_probe,
+       .disconnect = sd_disconnect,
+#ifdef CONFIG_PM
+       .suspend    = gspca_suspend,
+       .resume     = gspca_resume,
+#endif
+};
+
+/*====================== Init and Exit module functions ====================*/
+
+static int __init sd_mod_init(void)
+{
+       PDEBUG(D_PROBE, "driver startup - version %s", DRIVER_VERSION);
+
+       if (usb_register(&sd_driver) < 0)
+               return -1;
+       PDEBUG(D_PROBE, "driver registered");
+
+       return 0;
+}
+
+static void __exit sd_mod_exit(void)
+{
+       usb_deregister(&sd_driver);
+       PDEBUG(D_PROBE, "driver deregistered");
+}
+
+module_init(sd_mod_init);
+module_exit(sd_mod_exit);
+
+/*==========================================================================*/
+
+int gl860_RTx(struct gspca_dev *gspca_dev,
+               unsigned char pref, u32 req, u16 val, u16 index,
+               s32 len, void *pdata)
+{
+       struct usb_device *udev = gspca_dev->dev;
+       s32 r = 0;
+
+       if (pref == 0x40) { /* Send */
+               if (len > 0) {
+                       memcpy(gspca_dev->usb_buf, pdata, len);
+                       r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                                       req, pref, val, index,
+                                       gspca_dev->usb_buf,
+                                       len, 400 + 200 * (len > 1));
+               } else {
+                       r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                                       req, pref, val, index, NULL, len, 400);
+               }
+       } else { /* Receive */
+               if (len > 0) {
+                       r = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                       req, pref, val, index,
+                                       gspca_dev->usb_buf,
+                                       len, 400 + 200 * (len > 1));
+                       memcpy(pdata, gspca_dev->usb_buf, len);
+               } else {
+                       r = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                       req, pref, val, index, NULL, len, 400);
+               }
+       }
+
+       if (r < 0)
+               PDEBUG(D_ERR,
+                       "ctrl transfer failed %4d "
+                       "[p%02x r%d v%04x i%04x len%d]",
+                       r, pref, req, val, index, len);
+       else if (len > 1 && r < len)
+               PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len);
+
+       if ((_MI2020_ || _MI2020b_ || _MI2020c_) && (val || index))
+               msleep(1);
+       if (_OV2640_)
+               msleep(1);
+
+       return r;
+}
+
+int fetch_validx(struct gspca_dev *gspca_dev, struct validx *tbl, int len)
+{
+       int n;
+
+       for (n = 0; n < len; n++) {
+               if (tbl[n].idx != 0xffff)
+                       ctrl_out(gspca_dev, 0x40, 1, tbl[n].val,
+                                       tbl[n].idx, 0, NULL);
+               else if (tbl[n].val == 0xffff)
+                       break;
+               else
+                       msleep(tbl[n].val);
+       }
+       return n;
+}
+
+int keep_on_fetching_validx(struct gspca_dev *gspca_dev, struct validx *tbl,
+                               int len, int n)
+{
+       while (++n < len) {
+               if (tbl[n].idx != 0xffff)
+                       ctrl_out(gspca_dev, 0x40, 1, tbl[n].val, tbl[n].idx,
+                                       0, NULL);
+               else if (tbl[n].val == 0xffff)
+                       break;
+               else
+                       msleep(tbl[n].val);
+       }
+       return n;
+}
+
+void fetch_idxdata(struct gspca_dev *gspca_dev, struct idxdata *tbl, int len)
+{
+       int n;
+
+       for (n = 0; n < len; n++) {
+               if (memcmp(tbl[n].data, "\xff\xff\xff", 3) != 0)
+                       ctrl_out(gspca_dev, 0x40, 3, 0x7a00, tbl[n].idx,
+                                       3, tbl[n].data);
+               else
+                       msleep(tbl[n].idx);
+       }
+}
+
+static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
+                               s32 vendor_id, s32 product_id)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       u8 probe, nb26, nb96, nOV, ntry;
+
+       if (product_id == 0xf191)
+               sd->sensor = ID_MI1320;
+
+       if (sd->sensor == 0xff) {
+               ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0004, 1, &probe);
+               ctrl_in(gspca_dev, 0xc0, 2, 0x0000, 0x0004, 1, &probe);
+
+               ctrl_out(gspca_dev, 0x40, 1, 0x0000, 0x0000, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x0010, 0x0010, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x0008, 0x00c0, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x00c1, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x0001, 0x00c2, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x0020, 0x0006, 0, NULL);
+               msleep(3);
+               ctrl_out(gspca_dev, 0x40, 1, 0x006a, 0x000d, 0, NULL);
+               msleep(56);
+
+               nOV = 0;
+               for (ntry = 0; ntry < 4; ntry++) {
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0040, 0x0000, 0, NULL);
+                       msleep(3);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x0063, 0x0006, 0, NULL);
+                       msleep(3);
+                       ctrl_out(gspca_dev, 0x40, 1, 0x7a00, 0x8030, 0, NULL);
+                       msleep(10);
+                       ctrl_in(gspca_dev, 0xc0, 2, 0x7a00, 0x8030, 1, &probe);
+                       PDEBUG(D_PROBE, "1st probe=%02x", probe);
+                       if (probe == 0xff)
+                               nOV++;
+               }
+
+               if (nOV) {
+                       PDEBUG(D_PROBE, "0xff -> sensor OVXXXX");
+                       PDEBUG(D_PROBE, "Probing for sensor OV2640 or OV9655");
+
+                       nb26 = nb96 = 0;
+                       for (ntry = 0; ntry < 4; ntry++) {
+                               ctrl_out(gspca_dev, 0x40, 1, 0x0040, 0x0000,
+                                               0, NULL);
+                               msleep(3);
+                               ctrl_out(gspca_dev, 0x40, 1, 0x6000, 0x800a,
+                                               0, NULL);
+                               msleep(10);
+                               /* Wait for 26(OV2640) or 96(OV9655) */
+                               ctrl_in(gspca_dev, 0xc0, 2, 0x6000, 0x800a,
+                                               1, &probe);
+
+                               PDEBUG(D_PROBE, "2nd probe=%02x", probe);
+                               if (probe == 0x00)
+                                       nb26++;
+                               if (probe == 0x26 || probe == 0x40) {
+                                       sd->sensor = ID_OV2640;
+                                       nb26 += 4;
+                                       break;
+                               }
+                               if (probe == 0x96 || probe == 0x55) {
+                                       sd->sensor = ID_OV9655;
+                                       nb96 += 4;
+                                       break;
+                               }
+                               if (probe == 0xff)
+                                       nb96++;
+                               msleep(3);
+                       }
+                       if (nb26 < 4 && nb96 < 4) {
+                               PDEBUG(D_PROBE, "No relevant answer ");
+                               PDEBUG(D_PROBE, "* 1.3Mpixels -> use OV9655");
+                               PDEBUG(D_PROBE, "* 2.0Mpixels -> use OV2640");
+                               PDEBUG(D_PROBE,
+                                       "To force a sensor, add that line to "
+                                       "/etc/modprobe.d/options.conf:");
+                               PDEBUG(D_PROBE, "options gspca_gl860 "
+                                       "sensor=\"OV2640\" or \"OV9655\"");
+                               return -1;
+                       }
+               } else { /* probe = 0 */
+                       PDEBUG(D_PROBE, "No 0xff -> sensor MI2020");
+                       sd->sensor = ID_MI2020;
+               }
+       }
+
+       if (_MI1320_) {
+               PDEBUG(D_PROBE, "05e3:f191 sensor MI1320 (1.3M)");
+       } else if (_MI2020_) {
+               PDEBUG(D_PROBE, "05e3:0503 sensor MI2020 (2.0M)");
+       } else if (_MI2020b_) {
+               PDEBUG(D_PROBE, "05e3:0503 sensor MI2020 alt. driver (2.0M)");
+       } else if (_OV9655_) {
+               PDEBUG(D_PROBE, "05e3:0503 sensor OV9655 (1.3M)");
+       } else if (_OV2640_) {
+               PDEBUG(D_PROBE, "05e3:0503 sensor OV2640 (2.0M)");
+       } else {
+               PDEBUG(D_PROBE, "***** Unknown sensor *****");
+               return -1;
+       }
+
+       return 0;
+}
diff --git a/drivers/media/video/gspca/gl860/gl860.h b/drivers/media/video/gspca/gl860/gl860.h
new file mode 100644 (file)
index 0000000..cef4e24
--- /dev/null
@@ -0,0 +1,108 @@
+/* @file gl860.h
+ * @author Olivier LORIN, tiré du pilote Syntek par Nicolas VIVIEN
+ * @date 2009-08-27
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef GL860_DEV_H
+#define GL860_DEV_H
+#include <linux/version.h>
+
+#include "gspca.h"
+
+#define MODULE_NAME "gspca_gl860"
+#define DRIVER_VERSION "0.9d10"
+
+#define ctrl_in  gl860_RTx
+#define ctrl_out gl860_RTx
+
+#define ID_MI1320   1
+#define ID_OV2640   2
+#define ID_OV9655   4
+#define ID_MI2020   8
+#define ID_MI2020b 16
+
+#define _MI1320_  (((struct sd *) gspca_dev)->sensor == ID_MI1320)
+#define _MI2020_  (((struct sd *) gspca_dev)->sensor == ID_MI2020)
+#define _MI2020b_ (((struct sd *) gspca_dev)->sensor == ID_MI2020b)
+#define _MI2020c_ 0
+#define _OV2640_  (((struct sd *) gspca_dev)->sensor == ID_OV2640)
+#define _OV9655_  (((struct sd *) gspca_dev)->sensor == ID_OV9655)
+
+#define IMAGE_640   0
+#define IMAGE_800   1
+#define IMAGE_1280  2
+#define IMAGE_1600 3
+
+struct sd_gl860 {
+       u16 backlight;
+       u16 brightness;
+       u16 sharpness;
+       u16 contrast;
+       u16 gamma;
+       u16 hue;
+       u16 saturation;
+       u16 whitebal;
+       u8  mirror;
+       u8  flip;
+       u8  AC50Hz;
+};
+
+/* Specific webcam descriptor */
+struct sd {
+       struct gspca_dev gspca_dev;     /* !! must be the first item */
+
+       struct sd_gl860 vcur;
+       struct sd_gl860 vold;
+       struct sd_gl860 vmax;
+
+       int  (*dev_configure_alt)  (struct gspca_dev *);
+       int  (*dev_init_at_startup)(struct gspca_dev *);
+       int  (*dev_init_pre_alt)   (struct gspca_dev *);
+       void (*dev_post_unset_alt) (struct gspca_dev *);
+       int  (*dev_camera_settings)(struct gspca_dev *);
+
+       u8   swapRB;
+       u8  mirrorMask;
+       u8  sensor;
+       s32 nbIm;
+       s32 nbRightUp;
+       u8   waitSet;
+};
+
+struct validx {
+       u16 val;
+       u16 idx;
+};
+
+struct idxdata {
+       u8 idx;
+       u8 data[3];
+};
+
+int fetch_validx(struct gspca_dev *gspca_dev, struct validx *tbl, int len);
+int keep_on_fetching_validx(struct gspca_dev *gspca_dev, struct validx *tbl,
+                               int len, int n);
+void fetch_idxdata(struct gspca_dev *gspca_dev, struct idxdata *tbl, int len);
+
+int gl860_RTx(struct gspca_dev *gspca_dev,
+                       unsigned char pref, u32 req, u16 val, u16 index,
+                       s32 len, void *pdata);
+
+void mi1320_init_settings(struct gspca_dev *);
+void ov2640_init_settings(struct gspca_dev *);
+void ov9655_init_settings(struct gspca_dev *);
+void mi2020_init_settings(struct gspca_dev *);
+
+#endif
index dbfa3ed..a11c97e 100644 (file)
@@ -312,6 +312,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
        /* create the JPEG header */
        dev->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL);
+       if (dev->jpeg_hdr == NULL)
+               return -ENOMEM;
        jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                        0x21);          /* JPEG 422 */
        jpeg_set_qual(dev->jpeg_hdr, dev->quality);
index 8a5bba1..7f1e541 100644 (file)
@@ -56,7 +56,7 @@ int m5602_read_bridge(struct sd *sd, const u8 address, u8 *i2c_data)
        return (err < 0) ? err : 0;
 }
 
-/* Writes a byte to to the m5602 */
+/* Writes a byte to the m5602 */
 int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data)
 {
        int err;
index 7aafeb7..2a28b74 100644 (file)
 
 static int ov7660_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
 static int ov7660_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int ov7660_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val);
+static int ov7660_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val);
+static int ov7660_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);
+static int ov7660_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int ov7660_get_auto_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+static int ov7660_set_auto_exposure(struct gspca_dev *gspca_dev, __s32 val);
+static int ov7660_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int ov7660_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+static int ov7660_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int ov7660_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
 
 const static struct ctrl ov7660_ctrls[] = {
 #define GAIN_IDX 1
@@ -37,6 +49,79 @@ const static struct ctrl ov7660_ctrls[] = {
                .set = ov7660_set_gain,
                .get = ov7660_get_gain
        },
+#define BLUE_BALANCE_IDX 2
+#define RED_BALANCE_IDX 3
+#define AUTO_WHITE_BALANCE_IDX 4
+       {
+               {
+                       .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto white balance",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 1
+               },
+               .set = ov7660_set_auto_white_balance,
+               .get = ov7660_get_auto_white_balance
+       },
+#define AUTO_GAIN_CTRL_IDX 5
+       {
+               {
+                       .id             = V4L2_CID_AUTOGAIN,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto gain control",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 1
+               },
+               .set = ov7660_set_auto_gain,
+               .get = ov7660_get_auto_gain
+       },
+#define AUTO_EXPOSURE_IDX 6
+       {
+               {
+                       .id             = V4L2_CID_EXPOSURE_AUTO,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto exposure",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 1
+               },
+               .set = ov7660_set_auto_exposure,
+               .get = ov7660_get_auto_exposure
+       },
+#define HFLIP_IDX 7
+       {
+               {
+                       .id             = V4L2_CID_HFLIP,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "horizontal flip",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0
+               },
+               .set = ov7660_set_hflip,
+               .get = ov7660_get_hflip
+       },
+#define VFLIP_IDX 8
+       {
+               {
+                       .id             = V4L2_CID_VFLIP,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "vertical flip",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0
+               },
+               .set = ov7660_set_vflip,
+               .get = ov7660_get_vflip
+       },
+
 };
 
 static struct v4l2_pix_format ov7660_modes[] = {
@@ -137,7 +222,7 @@ int ov7660_init(struct sd *sd)
                } else {
                        data[0] = init_ov7660[i][2];
                        err = m5602_write_sensor(sd,
-                                       init_ov7660[i][1], data, 1);
+                               init_ov7660[i][1], data, 1);
                }
        }
 
@@ -148,6 +233,28 @@ int ov7660_init(struct sd *sd)
        if (err < 0)
                return err;
 
+       err = ov7660_set_auto_white_balance(&sd->gspca_dev,
+               sensor_settings[AUTO_WHITE_BALANCE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = ov7660_set_auto_gain(&sd->gspca_dev,
+               sensor_settings[AUTO_GAIN_CTRL_IDX]);
+       if (err < 0)
+               return err;
+
+       err = ov7660_set_auto_exposure(&sd->gspca_dev,
+               sensor_settings[AUTO_EXPOSURE_IDX]);
+       if (err < 0)
+               return err;
+       err = ov7660_set_hflip(&sd->gspca_dev,
+               sensor_settings[HFLIP_IDX]);
+       if (err < 0)
+               return err;
+
+       err = ov7660_set_vflip(&sd->gspca_dev,
+               sensor_settings[VFLIP_IDX]);
+
        return err;
 }
 
@@ -194,6 +301,159 @@ static int ov7660_set_gain(struct gspca_dev *gspca_dev, __s32 val)
        return err;
 }
 
+
+static int ov7660_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_WHITE_BALANCE_IDX];
+       return 0;
+}
+
+static int ov7660_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set auto white balance to %d", val);
+
+       sensor_settings[AUTO_WHITE_BALANCE_IDX] = val;
+       err = m5602_read_sensor(sd, OV7660_COM8, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       i2c_data = ((i2c_data & 0xfd) | ((val & 0x01) << 1));
+       err = m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
+
+       return err;
+}
+
+static int ov7660_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_GAIN_CTRL_IDX];
+       PDEBUG(D_V4L2, "Read auto gain control %d", *val);
+       return 0;
+}
+
+static int ov7660_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set auto gain control to %d", val);
+
+       sensor_settings[AUTO_GAIN_CTRL_IDX] = val;
+       err = m5602_read_sensor(sd, OV7660_COM8, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       i2c_data = ((i2c_data & 0xfb) | ((val & 0x01) << 2));
+
+       return m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
+}
+
+static int ov7660_get_auto_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_EXPOSURE_IDX];
+       PDEBUG(D_V4L2, "Read auto exposure control %d", *val);
+       return 0;
+}
+
+static int ov7660_set_auto_exposure(struct gspca_dev *gspca_dev,
+                                   __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set auto exposure control to %d", val);
+
+       sensor_settings[AUTO_EXPOSURE_IDX] = val;
+       err = m5602_read_sensor(sd, OV7660_COM8, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       i2c_data = ((i2c_data & 0xfe) | ((val & 0x01) << 0));
+
+       return m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
+}
+
+static int ov7660_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[HFLIP_IDX];
+       PDEBUG(D_V4L2, "Read horizontal flip %d", *val);
+       return 0;
+}
+
+static int ov7660_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set horizontal flip to %d", val);
+
+       sensor_settings[HFLIP_IDX] = val;
+
+       i2c_data = ((val & 0x01) << 5) |
+               (sensor_settings[VFLIP_IDX] << 4);
+
+       err = m5602_write_sensor(sd, OV7660_MVFP, &i2c_data, 1);
+
+       return err;
+}
+
+static int ov7660_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[VFLIP_IDX];
+       PDEBUG(D_V4L2, "Read vertical flip %d", *val);
+
+       return 0;
+}
+
+static int ov7660_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set vertical flip to %d", val);
+       sensor_settings[VFLIP_IDX] = val;
+
+       i2c_data = ((val & 0x01) << 4) | (sensor_settings[VFLIP_IDX] << 5);
+       err = m5602_write_sensor(sd, OV7660_MVFP, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       /* When vflip is toggled we need to readjust the bridge hsync/vsync */
+       if (gspca_dev->streaming)
+               err = ov7660_start(sd);
+
+       return err;
+}
+
 static void ov7660_dump_registers(struct sd *sd)
 {
        int address;
index 3f2c169..f5588eb 100644 (file)
 #define OV7660_RBIAS           0x2c
 #define OV7660_HREF            0x32
 #define OV7660_ADC             0x37
-#define OV7660_OFON            0x39
-#define OV7660_TSLB            0x3a
-#define OV7660_COM12           0x3c
-#define OV7660_COM13           0x3d
+#define OV7660_OFON            0x39
+#define OV7660_TSLB            0x3a
+#define OV7660_COM12           0x3c
+#define OV7660_COM13           0x3d
 #define OV7660_LCC1            0x62
 #define OV7660_LCC2            0x63
 #define OV7660_LCC3            0x64
 #define OV7660_LCC4            0x65
 #define OV7660_LCC5            0x66
-#define OV7660_HV              0x69
-#define OV7660_RSVDA1          0xa1
+#define OV7660_HV              0x69
+#define OV7660_RSVDA1          0xa1
 
 #define OV7660_DEFAULT_GAIN            0x0e
-#define OV7660_DEFAULT_RED_GAIN        0x80
+#define OV7660_DEFAULT_RED_GAIN                0x80
 #define OV7660_DEFAULT_BLUE_GAIN       0x80
 #define OV7660_DEFAULT_SATURATION      0x00
-#define OV7660_DEFAULT_EXPOSURE        0x20
+#define OV7660_DEFAULT_EXPOSURE                0x20
 
 /* Kernel module parameters */
 extern int force_sensor;
@@ -149,45 +149,8 @@ static const unsigned char init_ov7660[][4] =
        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
-       {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
-       {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
-       {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
-       {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
-
-       {SENSOR, OV7660_OFON, 0x0c},
-       {SENSOR, OV7660_COM2, 0x11},
-       {SENSOR, OV7660_COM7, 0x05},
-
        {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
-       {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
-       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
-       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
-       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
-       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
-       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
-       {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
-       {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
-       {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
-       {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
-       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
-
-       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x02},
-       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
-
-       {SENSOR, OV7660_AECH, OV7660_DEFAULT_EXPOSURE},
-       {SENSOR, OV7660_COM1, 0x00},
-
        {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
-       {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
-       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
-       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
-       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
-
        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
@@ -196,11 +159,8 @@ static const unsigned char init_ov7660[][4] =
        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
-
        {SENSOR, OV7660_COM7, 0x80},
        {SENSOR, OV7660_CLKRC, 0x80},
-       {SENSOR, OV7660_BLUE_GAIN, 0x80},
-       {SENSOR, OV7660_RED_GAIN, 0x80},
        {SENSOR, OV7660_COM9, 0x4c},
        {SENSOR, OV7660_OFON, 0x43},
        {SENSOR, OV7660_COM12, 0x28},
@@ -212,17 +172,17 @@ static const unsigned char init_ov7660[][4] =
        {SENSOR, OV7660_PSHFT, 0x0b},
        {SENSOR, OV7660_VSTART, 0x01},
        {SENSOR, OV7660_VSTOP, 0x7a},
-       {SENSOR, OV7660_VREF, 0x00},
+       {SENSOR, OV7660_VSTOP, 0x00},
        {SENSOR, OV7660_COM7, 0x05},
-       {SENSOR, OV7660_COM6, 0x4b},
-       {SENSOR, OV7660_BBIAS, 0x98},
-       {SENSOR, OV7660_GbBIAS, 0x98},
-       {SENSOR, OV7660_RSVD29, 0x98},
-       {SENSOR, OV7660_RBIAS, 0x98},
+       {SENSOR, OV7660_COM6, 0x42},
+       {SENSOR, OV7660_BBIAS, 0x94},
+       {SENSOR, OV7660_GbBIAS, 0x94},
+       {SENSOR, OV7660_RSVD29, 0x94},
+       {SENSOR, OV7660_RBIAS, 0x94},
        {SENSOR, OV7660_COM1, 0x00},
        {SENSOR, OV7660_AECH, 0x00},
        {SENSOR, OV7660_AECHH, 0x00},
-       {SENSOR, OV7660_ADC, 0x04},
+       {SENSOR, OV7660_ADC, 0x05},
        {SENSOR, OV7660_COM13, 0x00},
        {SENSOR, OV7660_RSVDA1, 0x23},
        {SENSOR, OV7660_TSLB, 0x0d},
@@ -233,6 +193,47 @@ static const unsigned char init_ov7660[][4] =
        {SENSOR, OV7660_LCC4, 0x40},
        {SENSOR, OV7660_LCC5, 0x01},
 
+       {SENSOR, OV7660_AECH, 0x20},
+       {SENSOR, OV7660_COM1, 0x00},
+       {SENSOR, OV7660_OFON, 0x0c},
+       {SENSOR, OV7660_COM2, 0x11},
+       {SENSOR, OV7660_COM7, 0x05},
+       {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
+       {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
+       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+       {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+       {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+       {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+       {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
+       {SENSOR, OV7660_AECH, 0x5f},
+       {SENSOR, OV7660_COM1, 0x03},
+       {SENSOR, OV7660_OFON, 0x0c},
+       {SENSOR, OV7660_COM2, 0x11},
+       {SENSOR, OV7660_COM7, 0x05},
+       {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
+       {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
+       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+       {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+       {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+       {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+       {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+       {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
+
        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
@@ -245,35 +246,18 @@ static const unsigned char init_ov7660[][4] =
        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
-       {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0}, /* 480 */
+       {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
        {BRIDGE, M5602_XB_SIG_INI, 0x00},
        {BRIDGE, M5602_XB_SIG_INI, 0x02},
-       {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-       {BRIDGE, M5602_XB_VSYNC_PARA, 0x27}, /* 39 */
-       {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
-       {BRIDGE, M5602_XB_VSYNC_PARA, 0xa7}, /* 679 */
+       {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+       {BRIDGE, M5602_XB_HSYNC_PARA, 0x27},
+       {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+       {BRIDGE, M5602_XB_HSYNC_PARA, 0xa7},
        {BRIDGE, M5602_XB_SIG_INI, 0x00},
-
        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
-
-       {SENSOR, OV7660_AECH, 0x20},
-       {SENSOR, OV7660_COM1, 0x00},
-       {SENSOR, OV7660_OFON, 0x0c},
-       {SENSOR, OV7660_COM2, 0x11},
-       {SENSOR, OV7660_COM7, 0x05},
-       {SENSOR, OV7660_BLUE_GAIN, 0x80},
-       {SENSOR, OV7660_RED_GAIN, 0x80},
-
-       {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
-       {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
-       {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
-       {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
-       {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
-       {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}
 };
 
 #endif
index 0163903..59400e8 100644 (file)
@@ -46,6 +46,12 @@ static
                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
                }
+       }, {
+               .ident = "Fujitsu-Siemens Amilo Pa 2548",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 2548")
+               }
        }, {
                .ident = "MSI GX700",
                .matches = {
@@ -53,6 +59,13 @@ static
                        DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
                        DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
                }
+       }, {
+               .ident = "MSI GX700",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+                       DMI_MATCH(DMI_BIOS_DATE, "07/19/2007")
+               }
        }, {
                .ident = "MSI GX700/GX705/EX700",
                .matches = {
index 7af511b..65489d6 100644 (file)
@@ -50,7 +50,6 @@ int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
                              0x04, 0x40, address, 0, buf, len,
                              STV06XX_URB_MSG_TIMEOUT);
 
-
        PDEBUG(D_CONF, "Written 0x%x to address 0x%x, status: %d",
               i2c_data, address, err);
 
@@ -69,7 +68,7 @@ int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data)
 
        *i2c_data = buf[0];
 
-       PDEBUG(D_CONF, "Read 0x%x from address 0x%x, status %d",
+       PDEBUG(D_CONF, "Reading 0x%x from address 0x%x, status %d",
               *i2c_data, address, err);
 
        return (err < 0) ? err : 0;
@@ -111,14 +110,14 @@ int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len)
        struct usb_device *udev = sd->gspca_dev.dev;
        __u8 *buf = sd->gspca_dev.usb_buf;
 
-       PDEBUG(D_USBO, "I2C: Command buffer contains %d entries", len);
+       PDEBUG(D_CONF, "I2C: Command buffer contains %d entries", len);
        for (i = 0; i < len;) {
                /* Build the command buffer */
                memset(buf, 0, I2C_BUFFER_LENGTH);
                for (j = 0; j < I2C_MAX_BYTES && i < len; j++, i++) {
                        buf[j] = data[2*i];
                        buf[0x10 + j] = data[2*i+1];
-                       PDEBUG(D_USBO, "I2C: Writing 0x%02x to reg 0x%02x",
+                       PDEBUG(D_CONF, "I2C: Writing 0x%02x to reg 0x%02x",
                        data[2*i+1], data[2*i]);
                }
                buf[0x20] = sd->sensor->i2c_addr;
@@ -128,8 +127,8 @@ int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len)
                                      0x04, 0x40, 0x0400, 0, buf,
                                      I2C_BUFFER_LENGTH,
                                      STV06XX_URB_MSG_TIMEOUT);
-                                     if (err < 0)
-                                       return err;
+               if (err < 0)
+                       return err;
        }
        return stv06xx_write_sensor_finish(sd);
 }
@@ -140,7 +139,7 @@ int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len)
        struct usb_device *udev = sd->gspca_dev.dev;
        __u8 *buf = sd->gspca_dev.usb_buf;
 
-       PDEBUG(D_USBO, "I2C: Command buffer contains %d entries", len);
+       PDEBUG(D_CONF, "I2C: Command buffer contains %d entries", len);
 
        for (i = 0; i < len;) {
                /* Build the command buffer */
@@ -149,7 +148,7 @@ int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len)
                        buf[j] = data[2*i];
                        buf[0x10 + j * 2] = data[2*i+1];
                        buf[0x10 + j * 2 + 1] = data[2*i+1] >> 8;
-                       PDEBUG(D_USBO, "I2C: Writing 0x%04x to reg 0x%02x",
+                       PDEBUG(D_CONF, "I2C: Writing 0x%04x to reg 0x%02x",
                                data[2*i+1], data[2*i]);
                }
                buf[0x20] = sd->sensor->i2c_addr;
@@ -189,7 +188,7 @@ int stv06xx_read_sensor(struct sd *sd, const u8 address, u16 *value)
                              0x04, 0x40, 0x1400, 0, buf, I2C_BUFFER_LENGTH,
                              STV06XX_URB_MSG_TIMEOUT);
        if (err < 0) {
-               PDEBUG(D_ERR, "I2C Read: error writing address: %d", err);
+               PDEBUG(D_ERR, "I2C: Read error writing address: %d", err);
                return err;
        }
 
@@ -201,7 +200,7 @@ int stv06xx_read_sensor(struct sd *sd, const u8 address, u16 *value)
        else
                *value = buf[0];
 
-       PDEBUG(D_USBO, "I2C: Read 0x%x from address 0x%x, status: %d",
+       PDEBUG(D_CONF, "I2C: Read 0x%x from address 0x%x, status: %d",
               *value, address, err);
 
        return (err < 0) ? err : 0;
index e5024c8..706e08d 100644 (file)
@@ -37,7 +37,7 @@ static const struct ctrl hdcs1x00_ctrl[] = {
                        .type           = V4L2_CTRL_TYPE_INTEGER,
                        .name           = "exposure",
                        .minimum        = 0x00,
-                       .maximum        = 0xffff,
+                       .maximum        = 0xff,
                        .step           = 0x1,
                        .default_value  = HDCS_DEFAULT_EXPOSURE,
                        .flags          = V4L2_CTRL_FLAG_SLIDER
@@ -74,7 +74,35 @@ static struct v4l2_pix_format hdcs1x00_mode[] = {
        }
 };
 
-static const struct ctrl hdcs1020_ctrl[] = {};
+static const struct ctrl hdcs1020_ctrl[] = {
+       {
+               {
+                       .id             = V4L2_CID_EXPOSURE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "exposure",
+                       .minimum        = 0x00,
+                       .maximum        = 0xffff,
+                       .step           = 0x1,
+                       .default_value  = HDCS_DEFAULT_EXPOSURE,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = hdcs_set_exposure,
+               .get = hdcs_get_exposure
+       }, {
+               {
+                       .id             = V4L2_CID_GAIN,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "gain",
+                       .minimum        = 0x00,
+                       .maximum        = 0xff,
+                       .step           = 0x1,
+                       .default_value  = HDCS_DEFAULT_GAIN,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = hdcs_set_gain,
+               .get = hdcs_get_gain
+       }
+};
 
 static struct v4l2_pix_format hdcs1020_mode[] = {
        {
@@ -120,6 +148,7 @@ struct hdcs {
        } exp;
 
        int psmp;
+       u8 exp_cache, gain_cache;
 };
 
 static int hdcs_reg_write_seq(struct sd *sd, u8 reg, u8 *vals, u8 len)
@@ -205,34 +234,8 @@ static int hdcs_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
        struct sd *sd = (struct sd *) gspca_dev;
        struct hdcs *hdcs = sd->sensor_priv;
 
-       /* Column time period */
-       int ct;
-       /* Column processing period */
-       int cp;
-       /* Row processing period */
-       int rp;
-       int cycles;
-       int err;
-       int rowexp;
-       u16 data[2];
-
-       err = stv06xx_read_sensor(sd, HDCS_ROWEXPL, &data[0]);
-       if (err < 0)
-               return err;
-
-       err = stv06xx_read_sensor(sd, HDCS_ROWEXPH, &data[1]);
-       if (err < 0)
-               return err;
-
-       rowexp = (data[1] << 8) | data[0];
-
-       ct = hdcs->exp.cto + hdcs->psmp + (HDCS_ADC_START_SIG_DUR + 2);
-       cp = hdcs->exp.cto + (hdcs->w * ct / 2);
-       rp = hdcs->exp.rs + cp;
+       *val = hdcs->exp_cache;
 
-       cycles = rp * rowexp;
-       *val = cycles / HDCS_CLK_FREQ_MHZ;
-       PDEBUG(D_V4L2, "Read exposure %d", *val);
        return 0;
 }
 
@@ -252,9 +255,12 @@ static int hdcs_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
           within the column processing period */
        int mnct;
        int cycles, err;
-       u8 exp[4];
+       u8 exp[14];
 
-       cycles = val * HDCS_CLK_FREQ_MHZ;
+       val &= 0xff;
+       hdcs->exp_cache = val;
+
+       cycles = val * HDCS_CLK_FREQ_MHZ * 257;
 
        ct = hdcs->exp.cto + hdcs->psmp + (HDCS_ADC_START_SIG_DUR + 2);
        cp = hdcs->exp.cto + (hdcs->w * ct / 2);
@@ -288,73 +294,79 @@ static int hdcs_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
                srowexp = max_srowexp;
 
        if (IS_1020(sd)) {
-               exp[0] = rowexp & 0xff;
-               exp[1] = rowexp >> 8;
-               exp[2] = (srowexp >> 2) & 0xff;
-               /* this clears exposure error flag */
-               exp[3] = 0x1;
-               err = hdcs_reg_write_seq(sd, HDCS_ROWEXPL, exp, 4);
+               exp[0] = HDCS20_CONTROL;
+               exp[1] = 0x00;          /* Stop streaming */
+               exp[2] = HDCS_ROWEXPL;
+               exp[3] = rowexp & 0xff;
+               exp[4] = HDCS_ROWEXPH;
+               exp[5] = rowexp >> 8;
+               exp[6] = HDCS20_SROWEXP;
+               exp[7] = (srowexp >> 2) & 0xff;
+               exp[8] = HDCS20_ERROR;
+               exp[9] = 0x10;          /* Clear exposure error flag*/
+               exp[10] = HDCS20_CONTROL;
+               exp[11] = 0x04;         /* Restart streaming */
+               err = stv06xx_write_sensor_bytes(sd, exp, 6);
        } else {
-               exp[0] = rowexp & 0xff;
-               exp[1] = rowexp >> 8;
-               exp[2] = srowexp & 0xff;
-               exp[3] = srowexp >> 8;
-               err = hdcs_reg_write_seq(sd, HDCS_ROWEXPL, exp, 4);
+               exp[0] = HDCS00_CONTROL;
+               exp[1] = 0x00;         /* Stop streaming */
+               exp[2] = HDCS_ROWEXPL;
+               exp[3] = rowexp & 0xff;
+               exp[4] = HDCS_ROWEXPH;
+               exp[5] = rowexp >> 8;
+               exp[6] = HDCS00_SROWEXPL;
+               exp[7] = srowexp & 0xff;
+               exp[8] = HDCS00_SROWEXPH;
+               exp[9] = srowexp >> 8;
+               exp[10] = HDCS_STATUS;
+               exp[11] = 0x10;         /* Clear exposure error flag*/
+               exp[12] = HDCS00_CONTROL;
+               exp[13] = 0x04;         /* Restart streaming */
+               err = stv06xx_write_sensor_bytes(sd, exp, 7);
                if (err < 0)
                        return err;
-
-               /* clear exposure error flag */
-               err = stv06xx_write_sensor(sd,
-                    HDCS_STATUS, BIT(4));
        }
        PDEBUG(D_V4L2, "Writing exposure %d, rowexp %d, srowexp %d",
               val, rowexp, srowexp);
        return err;
 }
 
-static int hdcs_set_gains(struct sd *sd, u8 r, u8 g, u8 b)
+static int hdcs_set_gains(struct sd *sd, u8 g)
 {
+       struct hdcs *hdcs = sd->sensor_priv;
+       int err;
        u8 gains[4];
 
+       hdcs->gain_cache = g;
+
        /* the voltage gain Av = (1 + 19 * val / 127) * (1 + bit7) */
-       if (r > 127)
-               r = 0x80 | (r / 2);
        if (g > 127)
                g = 0x80 | (g / 2);
-       if (b > 127)
-               b = 0x80 | (b / 2);
 
        gains[0] = g;
-       gains[1] = r;
-       gains[2] = b;
+       gains[1] = g;
+       gains[2] = g;
        gains[3] = g;
 
-       return hdcs_reg_write_seq(sd, HDCS_ERECPGA, gains, 4);
+       err = hdcs_reg_write_seq(sd, HDCS_ERECPGA, gains, 4);
+               return err;
 }
 
 static int hdcs_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       int err;
-       u16 data;
-
-       err = stv06xx_read_sensor(sd, HDCS_ERECPGA, &data);
+       struct hdcs *hdcs = sd->sensor_priv;
 
-       /* Bit 7 doubles the gain */
-       if (data & 0x80)
-               *val = (data & 0x7f) * 2;
-       else
-               *val = data;
+       *val = hdcs->gain_cache;
 
-       PDEBUG(D_V4L2, "Read gain %d", *val);
-       return err;
+       return 0;
 }
 
 static int hdcs_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 {
        PDEBUG(D_V4L2, "Writing gain %d", val);
        return hdcs_set_gains((struct sd *) gspca_dev,
-                              val & 0xff, val & 0xff, val & 0xff);
+                              val & 0xff);
 }
 
 static int hdcs_set_size(struct sd *sd,
@@ -572,16 +584,15 @@ static int hdcs_init(struct sd *sd)
        if (err < 0)
                return err;
 
-       err = hdcs_set_gains(sd, HDCS_DEFAULT_GAIN, HDCS_DEFAULT_GAIN,
-                            HDCS_DEFAULT_GAIN);
+       err = hdcs_set_gains(sd, HDCS_DEFAULT_GAIN);
        if (err < 0)
                return err;
 
-       err = hdcs_set_exposure(&sd->gspca_dev, HDCS_DEFAULT_EXPOSURE);
+       err = hdcs_set_size(sd, hdcs->array.width, hdcs->array.height);
        if (err < 0)
                return err;
 
-       err = hdcs_set_size(sd, hdcs->array.width, hdcs->array.height);
+       err = hdcs_set_exposure(&sd->gspca_dev, HDCS_DEFAULT_EXPOSURE);
        return err;
 }
 
index 412f06c..37b31c9 100644 (file)
 #define HDCS_RUN_ENABLE                (1 << 2)
 #define HDCS_SLEEP_MODE                (1 << 1)
 
-#define HDCS_DEFAULT_EXPOSURE  5000
+#define HDCS_DEFAULT_EXPOSURE  48
 #define HDCS_DEFAULT_GAIN      128
 
 static int hdcs_probe_1x00(struct sd *sd);
index 87cb5b9..c11f06e 100644 (file)
@@ -166,7 +166,7 @@ static int st6422_init(struct sd *sd)
 /* 10 compressed? */
 
                { 0x1439, 0x00 },
-/* antiflimmer??  0xa2 ger perfekt bild mot monitor */
+/* anti-noise?  0xa2 gives a perfect image */
 
                { 0x143b, 0x05 },
                { 0x143c, 0x00 },       /* 0x00-0x01 - ??? */
@@ -197,15 +197,14 @@ static int st6422_init(struct sd *sd)
                { 0x1500, 0x50 },       /* 0x00 - 0xFF  0x80 == compr ? */
 
                { 0x1501, 0xaf },
-/* high val-> ljus area blir morkare. */
-/* low val -> ljus area blir ljusare. */
+/* high val-> light area gets darker */
+/* low val -> light area gets lighter */
                { 0x1502, 0xc2 },
-/* high val-> ljus area blir morkare. */
-/* low val -> ljus area blir ljusare. */
+/* high val-> light area gets darker */
+/* low val -> light area gets lighter */
                { 0x1503, 0x45 },
-/* high val-> ljus area blir morkare. */
-/* low val -> ljus area blir ljusare. */
-
+/* high val-> light area gets darker */
+/* low val -> light area gets lighter */
                { 0x1505, 0x02 },
 /* 2  : 324x248  80352 bytes */
 /* 7  : 248x162  40176 bytes */
index 619250e..589042f 100644 (file)
@@ -2946,7 +2946,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
                        reg_w(gspca_dev->dev, 0x89, 0x058c, 0x0000);
                        break;
                default:
-                       reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+                       if (!(sd->flags & FL_SAMSUNG))
+                               reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
                        break;
                }
                msleep(100);
@@ -2964,7 +2965,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 
        if (sd->sensor == SENSOR_MI1310_SOC)
                reg_w(dev, 0x89, 0x058c, 0x00ff);
-       else
+       else if (!(sd->flags & FL_SAMSUNG))
                reg_w(dev, 0x89, 0xffff, 0xffff);
        reg_w(dev, 0xa0, 0x01, 0xb301);
        reg_w(dev, 0xa0, 0x09, 0xb003);
@@ -2981,7 +2982,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 /*fixme: is this useful?*/
        if (sd->sensor == SENSOR_MI1310_SOC)
                reg_w(dev, 0x89, 0x058c, 0x00ff);
-       else
+       else if (!(sd->flags & FL_SAMSUNG))
                reg_w(dev, 0x89, 0xffff, 0xffff);
 }
 
index 63ea0fb..463ec34 100644 (file)
@@ -246,7 +246,7 @@ MODULE_PARM_DESC(newi2c,
                 "\t\t\t-1 is autodetect, 0 is off, 1 is on\n"
                 "\t\t\tDefault is autodetect");
 
-MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card");
+MODULE_PARM_DESC(ivtv_first_minor, "Set device node number assigned to first card");
 
 MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");
 MODULE_DESCRIPTION("CX23415/CX23416 driver");
index 8f15a31..b9c71e6 100644 (file)
@@ -161,19 +161,19 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                return -1;
        if (hw == IVTV_HW_TUNER) {
                /* special tuner handling */
-               sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
                                adap, mod, type,
-                               itv->card_i2c->radio);
+                               0, itv->card_i2c->radio);
                if (sd)
                        sd->grp_id = 1 << idx;
-               sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
                                adap, mod, type,
-                               itv->card_i2c->demod);
+                               0, itv->card_i2c->demod);
                if (sd)
                        sd->grp_id = 1 << idx;
-               sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
                                adap, mod, type,
-                               itv->card_i2c->tv);
+                               0, itv->card_i2c->tv);
                if (sd)
                        sd->grp_id = 1 << idx;
                return sd ? 0 : -1;
@@ -181,11 +181,11 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
        if (!hw_addrs[idx])
                return -1;
        if (hw == IVTV_HW_UPD64031A || hw == IVTV_HW_UPD6408X) {
-               sd = v4l2_i2c_new_probed_subdev_addr(&itv->v4l2_dev,
-                               adap, mod, type, hw_addrs[idx]);
+               sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
+                               adap, mod, type, 0, I2C_ADDRS(hw_addrs[idx]));
        } else {
                sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
-                               adap, mod, type, hw_addrs[idx]);
+                               adap, mod, type, hw_addrs[idx], NULL);
        }
        if (sd)
                sd->grp_id = 1 << idx;
index 15da017..67699e3 100644 (file)
@@ -261,8 +261,8 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
        video_set_drvdata(s->vdev, s);
 
        /* Register device. First try the desired minor, then any free one. */
-       if (video_register_device(s->vdev, vfl_type, num)) {
-               IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+       if (video_register_device_no_warn(s->vdev, vfl_type, num)) {
+               IVTV_ERR("Couldn't register v4l2 device for %s (device node number %d)\n",
                                s->name, num);
                video_device_release(s->vdev);
                s->vdev = NULL;
index 4d794b4..45388d2 100644 (file)
 #include <linux/i2c.h>
 #include <linux/log2.h>
 
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
 /* mt9m001 i2c address 0x5d
- * The platform has to define i2c_board_info
- * and call i2c_register_board_info() */
+ * The platform has to define ctruct i2c_board_info objects and link to them
+ * from struct soc_camera_link */
 
 /* mt9m001 selected register addresses */
 #define MT9M001_CHIP_VERSION           0x00
 #define MT9M001_GLOBAL_GAIN            0x35
 #define MT9M001_CHIP_ENABLE            0xF1
 
+#define MT9M001_MAX_WIDTH              1280
+#define MT9M001_MAX_HEIGHT             1024
+#define MT9M001_MIN_WIDTH              48
+#define MT9M001_MIN_HEIGHT             32
+#define MT9M001_COLUMN_SKIP            20
+#define MT9M001_ROW_SKIP               12
+
 static const struct soc_camera_data_format mt9m001_colour_formats[] = {
        /* Order important: first natively supported,
         * second supported with a GPIO extender */
@@ -69,12 +76,20 @@ static const struct soc_camera_data_format mt9m001_monochrome_formats[] = {
 };
 
 struct mt9m001 {
-       struct i2c_client *client;
-       struct soc_camera_device icd;
+       struct v4l2_subdev subdev;
+       struct v4l2_rect rect;  /* Sensor window */
+       __u32 fourcc;
        int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+       unsigned int gain;
+       unsigned int exposure;
        unsigned char autoexposure;
 };
 
+static struct mt9m001 *to_mt9m001(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct mt9m001, subdev);
+}
+
 static int reg_read(struct i2c_client *client, const u8 reg)
 {
        s32 data = i2c_smbus_read_word_data(client, reg);
@@ -109,35 +124,20 @@ static int reg_clear(struct i2c_client *client, const u8 reg,
        return reg_write(client, reg, ret & ~data);
 }
 
-static int mt9m001_init(struct soc_camera_device *icd)
+static int mt9m001_init(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct soc_camera_link *icl = client->dev.platform_data;
        int ret;
 
-       dev_dbg(icd->vdev->parent, "%s\n", __func__);
+       dev_dbg(&client->dev, "%s\n", __func__);
 
-       if (icl->power) {
-               ret = icl->power(&client->dev, 1);
-               if (ret < 0) {
-                       dev_err(icd->vdev->parent,
-                               "Platform failed to power-on the camera.\n");
-                       return ret;
-               }
-       }
-
-       /* The camera could have been already on, we reset it additionally */
-       if (icl->reset)
-               ret = icl->reset(&client->dev);
-       else
-               ret = -ENODEV;
+       /*
+        * We don't know, whether platform provides reset, issue a soft reset
+        * too. This returns all registers to their default values.
+        */
+       ret = reg_write(client, MT9M001_RESET, 1);
+       if (!ret)
+               ret = reg_write(client, MT9M001_RESET, 0);
 
-       if (ret < 0) {
-               /* Either no platform reset, or platform reset failed */
-               ret = reg_write(client, MT9M001_RESET, 1);
-               if (!ret)
-                       ret = reg_write(client, MT9M001_RESET, 0);
-       }
        /* Disable chip, synchronous option update */
        if (!ret)
                ret = reg_write(client, MT9M001_OUTPUT_CONTROL, 0);
@@ -145,36 +145,12 @@ static int mt9m001_init(struct soc_camera_device *icd)
        return ret;
 }
 
-static int mt9m001_release(struct soc_camera_device *icd)
+static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct soc_camera_link *icl = client->dev.platform_data;
-
-       /* Disable the chip */
-       reg_write(client, MT9M001_OUTPUT_CONTROL, 0);
-
-       if (icl->power)
-               icl->power(&client->dev, 0);
-
-       return 0;
-}
+       struct i2c_client *client = sd->priv;
 
-static int mt9m001_start_capture(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
-
-       /* Switch to master "normal" mode */
-       if (reg_write(client, MT9M001_OUTPUT_CONTROL, 2) < 0)
-               return -EIO;
-       return 0;
-}
-
-static int mt9m001_stop_capture(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
-
-       /* Stop sensor readout */
-       if (reg_write(client, MT9M001_OUTPUT_CONTROL, 0) < 0)
+       /* Switch to master "normal" mode or stop sensor readout */
+       if (reg_write(client, MT9M001_OUTPUT_CONTROL, enable ? 2 : 0) < 0)
                return -EIO;
        return 0;
 }
@@ -182,8 +158,7 @@ static int mt9m001_stop_capture(struct soc_camera_device *icd)
 static int mt9m001_set_bus_param(struct soc_camera_device *icd,
                                 unsigned long flags)
 {
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-       struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned long width_flag = flags & SOCAM_DATAWIDTH_MASK;
 
        /* Only one width bit may be set */
@@ -205,8 +180,7 @@ static int mt9m001_set_bus_param(struct soc_camera_device *icd,
 
 static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
 {
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-       struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        /* MT9M001 has all capture_format parameters fixed */
        unsigned long flags = SOCAM_PCLK_SAMPLE_FALLING |
                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
@@ -220,13 +194,35 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
        return soc_camera_apply_sensor_flags(icl, flags);
 }
 
-static int mt9m001_set_crop(struct soc_camera_device *icd,
-                           struct v4l2_rect *rect)
+static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct v4l2_rect rect = a->c;
+       struct soc_camera_device *icd = client->dev.platform_data;
        int ret;
        const u16 hblank = 9, vblank = 25;
+       unsigned int total_h;
+
+       if (mt9m001->fourcc == V4L2_PIX_FMT_SBGGR8 ||
+           mt9m001->fourcc == V4L2_PIX_FMT_SBGGR16)
+               /*
+                * Bayer format - even number of rows for simplicity,
+                * but let the user play with the top row.
+                */
+               rect.height = ALIGN(rect.height, 2);
+
+       /* Datasheet requirement: see register description */
+       rect.width = ALIGN(rect.width, 2);
+       rect.left = ALIGN(rect.left, 2);
+
+       soc_camera_limit_side(&rect.left, &rect.width,
+                    MT9M001_COLUMN_SKIP, MT9M001_MIN_WIDTH, MT9M001_MAX_WIDTH);
+
+       soc_camera_limit_side(&rect.top, &rect.height,
+                    MT9M001_ROW_SKIP, MT9M001_MIN_HEIGHT, MT9M001_MAX_HEIGHT);
+
+       total_h = rect.height + icd->y_skip_top + vblank;
 
        /* Blanking and start values - default... */
        ret = reg_write(client, MT9M001_HORIZONTAL_BLANKING, hblank);
@@ -236,66 +232,126 @@ static int mt9m001_set_crop(struct soc_camera_device *icd,
        /* The caller provides a supported format, as verified per
         * call to icd->try_fmt() */
        if (!ret)
-               ret = reg_write(client, MT9M001_COLUMN_START, rect->left);
+               ret = reg_write(client, MT9M001_COLUMN_START, rect.left);
        if (!ret)
-               ret = reg_write(client, MT9M001_ROW_START, rect->top);
+               ret = reg_write(client, MT9M001_ROW_START, rect.top);
        if (!ret)
-               ret = reg_write(client, MT9M001_WINDOW_WIDTH, rect->width - 1);
+               ret = reg_write(client, MT9M001_WINDOW_WIDTH, rect.width - 1);
        if (!ret)
                ret = reg_write(client, MT9M001_WINDOW_HEIGHT,
-                               rect->height + icd->y_skip_top - 1);
+                               rect.height + icd->y_skip_top - 1);
        if (!ret && mt9m001->autoexposure) {
-               ret = reg_write(client, MT9M001_SHUTTER_WIDTH,
-                               rect->height + icd->y_skip_top + vblank);
+               ret = reg_write(client, MT9M001_SHUTTER_WIDTH, total_h);
                if (!ret) {
                        const struct v4l2_queryctrl *qctrl =
                                soc_camera_find_qctrl(icd->ops,
                                                      V4L2_CID_EXPOSURE);
-                       icd->exposure = (524 + (rect->height + icd->y_skip_top +
-                                               vblank - 1) *
-                                        (qctrl->maximum - qctrl->minimum)) /
+                       mt9m001->exposure = (524 + (total_h - 1) *
+                                (qctrl->maximum - qctrl->minimum)) /
                                1048 + qctrl->minimum;
                }
        }
 
+       if (!ret)
+               mt9m001->rect = rect;
+
        return ret;
 }
 
-static int mt9m001_set_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9m001_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+
+       a->c    = mt9m001->rect;
+       a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       return 0;
+}
+
+static int mt9m001_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+       a->bounds.left                  = MT9M001_COLUMN_SKIP;
+       a->bounds.top                   = MT9M001_ROW_SKIP;
+       a->bounds.width                 = MT9M001_MAX_WIDTH;
+       a->bounds.height                = MT9M001_MAX_HEIGHT;
+       a->defrect                      = a->bounds;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
+
+       return 0;
+}
+
+static int mt9m001_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
-               .width  = f->fmt.pix.width,
-               .height = f->fmt.pix.height,
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+
+       pix->width              = mt9m001->rect.width;
+       pix->height             = mt9m001->rect.height;
+       pix->pixelformat        = mt9m001->fourcc;
+       pix->field              = V4L2_FIELD_NONE;
+       pix->colorspace         = V4L2_COLORSPACE_SRGB;
+
+       return 0;
+}
+
+static int mt9m001_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+       struct v4l2_crop a = {
+               .c = {
+                       .left   = mt9m001->rect.left,
+                       .top    = mt9m001->rect.top,
+                       .width  = pix->width,
+                       .height = pix->height,
+               },
        };
+       int ret;
 
        /* No support for scaling so far, just crop. TODO: use skipping */
-       return mt9m001_set_crop(icd, &rect);
+       ret = mt9m001_s_crop(sd, &a);
+       if (!ret) {
+               pix->width = mt9m001->rect.width;
+               pix->height = mt9m001->rect.height;
+               mt9m001->fourcc = pix->pixelformat;
+       }
+
+       return ret;
 }
 
-static int mt9m001_try_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9m001_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
+       struct i2c_client *client = sd->priv;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-       v4l_bound_align_image(&pix->width, 48, 1280, 1,
-                             &pix->height, 32 + icd->y_skip_top,
-                             1024 + icd->y_skip_top, 0, 0);
+       v4l_bound_align_image(&pix->width, MT9M001_MIN_WIDTH,
+               MT9M001_MAX_WIDTH, 1,
+               &pix->height, MT9M001_MIN_HEIGHT + icd->y_skip_top,
+               MT9M001_MAX_HEIGHT + icd->y_skip_top, 0, 0);
+
+       if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
+           pix->pixelformat == V4L2_PIX_FMT_SBGGR16)
+               pix->height = ALIGN(pix->height - 1, 2);
 
        return 0;
 }
 
-static int mt9m001_get_chip_id(struct soc_camera_device *icd,
-                              struct v4l2_dbg_chip_ident *id)
+static int mt9m001_g_chip_ident(struct v4l2_subdev *sd,
+                               struct v4l2_dbg_chip_ident *id)
 {
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
 
        if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
                return -EINVAL;
 
-       if (id->match.addr != mt9m001->client->addr)
+       if (id->match.addr != client->addr)
                return -ENODEV;
 
        id->ident       = mt9m001->model;
@@ -305,10 +361,10 @@ static int mt9m001_get_chip_id(struct soc_camera_device *icd,
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int mt9m001_get_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9m001_g_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -325,10 +381,10 @@ static int mt9m001_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9m001_set_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9m001_s_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -381,39 +437,17 @@ static const struct v4l2_queryctrl mt9m001_controls[] = {
        }
 };
 
-static int mt9m001_video_probe(struct soc_camera_device *);
-static void mt9m001_video_remove(struct soc_camera_device *);
-static int mt9m001_get_control(struct soc_camera_device *, struct v4l2_control *);
-static int mt9m001_set_control(struct soc_camera_device *, struct v4l2_control *);
-
 static struct soc_camera_ops mt9m001_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = mt9m001_video_probe,
-       .remove                 = mt9m001_video_remove,
-       .init                   = mt9m001_init,
-       .release                = mt9m001_release,
-       .start_capture          = mt9m001_start_capture,
-       .stop_capture           = mt9m001_stop_capture,
-       .set_crop               = mt9m001_set_crop,
-       .set_fmt                = mt9m001_set_fmt,
-       .try_fmt                = mt9m001_try_fmt,
        .set_bus_param          = mt9m001_set_bus_param,
        .query_bus_param        = mt9m001_query_bus_param,
        .controls               = mt9m001_controls,
        .num_controls           = ARRAY_SIZE(mt9m001_controls),
-       .get_control            = mt9m001_get_control,
-       .set_control            = mt9m001_set_control,
-       .get_chip_id            = mt9m001_get_chip_id,
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = mt9m001_get_register,
-       .set_register           = mt9m001_set_register,
-#endif
 };
 
-static int mt9m001_get_control(struct soc_camera_device *icd, struct v4l2_control *ctrl)
+static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
        int data;
 
        switch (ctrl->id) {
@@ -426,14 +460,21 @@ static int mt9m001_get_control(struct soc_camera_device *icd, struct v4l2_contro
        case V4L2_CID_EXPOSURE_AUTO:
                ctrl->value = mt9m001->autoexposure;
                break;
+       case V4L2_CID_GAIN:
+               ctrl->value = mt9m001->gain;
+               break;
+       case V4L2_CID_EXPOSURE:
+               ctrl->value = mt9m001->exposure;
+               break;
        }
        return 0;
 }
 
-static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_control *ctrl)
+static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
        const struct v4l2_queryctrl *qctrl;
        int data;
 
@@ -460,7 +501,7 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
                        unsigned long range = qctrl->default_value - qctrl->minimum;
                        data = ((ctrl->value - qctrl->minimum) * 8 + range / 2) / range;
 
-                       dev_dbg(&icd->dev, "Setting gain %d\n", data);
+                       dev_dbg(&client->dev, "Setting gain %d\n", data);
                        data = reg_write(client, MT9M001_GLOBAL_GAIN, data);
                        if (data < 0)
                                return -EIO;
@@ -478,7 +519,7 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
                        else
                                data = ((gain - 64) * 7 + 28) / 56 + 96;
 
-                       dev_dbg(&icd->dev, "Setting gain from %d to %d\n",
+                       dev_dbg(&client->dev, "Setting gain from %d to %d\n",
                                 reg_read(client, MT9M001_GLOBAL_GAIN), data);
                        data = reg_write(client, MT9M001_GLOBAL_GAIN, data);
                        if (data < 0)
@@ -486,7 +527,7 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
                }
 
                /* Success */
-               icd->gain = ctrl->value;
+               mt9m001->gain = ctrl->value;
                break;
        case V4L2_CID_EXPOSURE:
                /* mt9m001 has maximum == default */
@@ -497,23 +538,27 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
                        unsigned long shutter = ((ctrl->value - qctrl->minimum) * 1048 +
                                                 range / 2) / range + 1;
 
-                       dev_dbg(&icd->dev, "Setting shutter width from %d to %lu\n",
-                                reg_read(client, MT9M001_SHUTTER_WIDTH), shutter);
+                       dev_dbg(&client->dev,
+                               "Setting shutter width from %d to %lu\n",
+                               reg_read(client, MT9M001_SHUTTER_WIDTH),
+                               shutter);
                        if (reg_write(client, MT9M001_SHUTTER_WIDTH, shutter) < 0)
                                return -EIO;
-                       icd->exposure = ctrl->value;
+                       mt9m001->exposure = ctrl->value;
                        mt9m001->autoexposure = 0;
                }
                break;
        case V4L2_CID_EXPOSURE_AUTO:
                if (ctrl->value) {
                        const u16 vblank = 25;
-                       if (reg_write(client, MT9M001_SHUTTER_WIDTH, icd->height +
-                                     icd->y_skip_top + vblank) < 0)
+                       unsigned int total_h = mt9m001->rect.height +
+                               icd->y_skip_top + vblank;
+                       if (reg_write(client, MT9M001_SHUTTER_WIDTH,
+                                     total_h) < 0)
                                return -EIO;
                        qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_EXPOSURE);
-                       icd->exposure = (524 + (icd->height + icd->y_skip_top + vblank - 1) *
-                                        (qctrl->maximum - qctrl->minimum)) /
+                       mt9m001->exposure = (524 + (total_h - 1) *
+                                (qctrl->maximum - qctrl->minimum)) /
                                1048 + qctrl->minimum;
                        mt9m001->autoexposure = 1;
                } else
@@ -525,14 +570,14 @@ static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_contro
 
 /* Interface active, can use i2c. If it fails, it can indeed mean, that
  * this wasn't our capture interface, so, we wait for the right one */
-static int mt9m001_video_probe(struct soc_camera_device *icd)
+static int mt9m001_video_probe(struct soc_camera_device *icd,
+                              struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        s32 data;
-       int ret;
        unsigned long flags;
+       int ret;
 
        /* We must have a parent by now. And it cannot be a wrong one.
         * So this entire test is completely redundant. */
@@ -542,7 +587,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
 
        /* Enable the chip */
        data = reg_write(client, MT9M001_CHIP_ENABLE, 1);
-       dev_dbg(&icd->dev, "write: %d\n", data);
+       dev_dbg(&client->dev, "write: %d\n", data);
 
        /* Read out the chip version register */
        data = reg_read(client, MT9M001_CHIP_VERSION);
@@ -559,10 +604,9 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
                icd->formats = mt9m001_monochrome_formats;
                break;
        default:
-               ret = -ENODEV;
-               dev_err(&icd->dev,
+               dev_err(&client->dev,
                        "No MT9M001 chip detected, register read %x\n", data);
-               goto ei2c;
+               return -ENODEV;
        }
 
        icd->num_formats = 0;
@@ -585,42 +629,72 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
        if (flags & SOCAM_DATAWIDTH_8)
                icd->num_formats++;
 
-       dev_info(&icd->dev, "Detected a MT9M001 chip ID %x (%s)\n", data,
+       mt9m001->fourcc = icd->formats->fourcc;
+
+       dev_info(&client->dev, "Detected a MT9M001 chip ID %x (%s)\n", data,
                 data == 0x8431 ? "C12STM" : "C12ST");
 
-       /* Now that we know the model, we can start video */
-       ret = soc_camera_video_start(icd);
-       if (ret)
-               goto eisis;
+       ret = mt9m001_init(client);
+       if (ret < 0)
+               dev_err(&client->dev, "Failed to initialise the camera\n");
 
-       return 0;
+       /* mt9m001_init() has reset the chip, returning registers to defaults */
+       mt9m001->gain = 64;
+       mt9m001->exposure = 255;
 
-eisis:
-ei2c:
        return ret;
 }
 
 static void mt9m001_video_remove(struct soc_camera_device *icd)
 {
-       struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-       struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
 
-       dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m001->client->addr,
+       dev_dbg(&icd->dev, "Video removed: %p, %p\n",
                icd->dev.parent, icd->vdev);
-       soc_camera_video_stop(icd);
        if (icl->free_bus)
                icl->free_bus(icl);
 }
 
+static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
+       .g_ctrl         = mt9m001_g_ctrl,
+       .s_ctrl         = mt9m001_s_ctrl,
+       .g_chip_ident   = mt9m001_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .g_register     = mt9m001_g_register,
+       .s_register     = mt9m001_s_register,
+#endif
+};
+
+static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
+       .s_stream       = mt9m001_s_stream,
+       .s_fmt          = mt9m001_s_fmt,
+       .g_fmt          = mt9m001_g_fmt,
+       .try_fmt        = mt9m001_try_fmt,
+       .s_crop         = mt9m001_s_crop,
+       .g_crop         = mt9m001_g_crop,
+       .cropcap        = mt9m001_cropcap,
+};
+
+static struct v4l2_subdev_ops mt9m001_subdev_ops = {
+       .core   = &mt9m001_subdev_core_ops,
+       .video  = &mt9m001_subdev_video_ops,
+};
+
 static int mt9m001_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9m001 *mt9m001;
-       struct soc_camera_device *icd;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct soc_camera_link *icl;
        int ret;
 
+       if (!icd) {
+               dev_err(&client->dev, "MT9M001: missing soc-camera data!\n");
+               return -EINVAL;
+       }
+
+       icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9M001 driver needs platform data\n");
                return -EINVAL;
@@ -636,43 +710,40 @@ static int mt9m001_probe(struct i2c_client *client,
        if (!mt9m001)
                return -ENOMEM;
 
-       mt9m001->client = client;
-       i2c_set_clientdata(client, mt9m001);
+       v4l2_i2c_subdev_init(&mt9m001->subdev, client, &mt9m001_subdev_ops);
 
        /* Second stage probe - when a capture adapter is there */
-       icd = &mt9m001->icd;
-       icd->ops        = &mt9m001_ops;
-       icd->control    = &client->dev;
-       icd->x_min      = 20;
-       icd->y_min      = 12;
-       icd->x_current  = 20;
-       icd->y_current  = 12;
-       icd->width_min  = 48;
-       icd->width_max  = 1280;
-       icd->height_min = 32;
-       icd->height_max = 1024;
-       icd->y_skip_top = 1;
-       icd->iface      = icl->bus_id;
+       icd->ops                = &mt9m001_ops;
+       icd->y_skip_top         = 0;
+
+       mt9m001->rect.left      = MT9M001_COLUMN_SKIP;
+       mt9m001->rect.top       = MT9M001_ROW_SKIP;
+       mt9m001->rect.width     = MT9M001_MAX_WIDTH;
+       mt9m001->rect.height    = MT9M001_MAX_HEIGHT;
+
        /* Simulated autoexposure. If enabled, we calculate shutter width
         * ourselves in the driver based on vertical blanking and frame width */
        mt9m001->autoexposure = 1;
 
-       ret = soc_camera_device_register(icd);
-       if (ret)
-               goto eisdr;
-
-       return 0;
+       ret = mt9m001_video_probe(icd, client);
+       if (ret) {
+               icd->ops = NULL;
+               i2c_set_clientdata(client, NULL);
+               kfree(mt9m001);
+       }
 
-eisdr:
-       kfree(mt9m001);
        return ret;
 }
 
 static int mt9m001_remove(struct i2c_client *client)
 {
-       struct mt9m001 *mt9m001 = i2c_get_clientdata(client);
+       struct mt9m001 *mt9m001 = to_mt9m001(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
 
-       soc_camera_device_unregister(&mt9m001->icd);
+       icd->ops = NULL;
+       mt9m001_video_remove(icd);
+       i2c_set_clientdata(client, NULL);
+       client->driver = NULL;
        kfree(mt9m001);
 
        return 0;
index fc5e2de..90da699 100644 (file)
@@ -148,12 +148,12 @@ enum mt9m111_context {
 };
 
 struct mt9m111 {
-       struct i2c_client *client;
-       struct soc_camera_device icd;
+       struct v4l2_subdev subdev;
        int model;      /* V4L2_IDENT_MT9M11x* codes from v4l2-chip-ident.h */
        enum mt9m111_context context;
        struct v4l2_rect rect;
        u32 pixfmt;
+       unsigned int gain;
        unsigned char autoexposure;
        unsigned char datawidth;
        unsigned int powered:1;
@@ -166,6 +166,11 @@ struct mt9m111 {
        unsigned int autowhitebalance:1;
 };
 
+static struct mt9m111 *to_mt9m111(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct mt9m111, subdev);
+}
+
 static int reg_page_map_set(struct i2c_client *client, const u16 reg)
 {
        int ret;
@@ -190,7 +195,7 @@ static int mt9m111_reg_read(struct i2c_client *client, const u16 reg)
 
        ret = reg_page_map_set(client, reg);
        if (!ret)
-               ret = swab16(i2c_smbus_read_word_data(client, (reg & 0xff)));
+               ret = swab16(i2c_smbus_read_word_data(client, reg & 0xff));
 
        dev_dbg(&client->dev, "read  reg.%03x -> %04x\n", reg, ret);
        return ret;
@@ -203,7 +208,7 @@ static int mt9m111_reg_write(struct i2c_client *client, const u16 reg,
 
        ret = reg_page_map_set(client, reg);
        if (!ret)
-               ret = i2c_smbus_write_word_data(client, (reg & 0xff),
+               ret = i2c_smbus_write_word_data(client, reg & 0xff,
                                                swab16(data));
        dev_dbg(&client->dev, "write reg.%03x = %04x -> %d\n", reg, data, ret);
        return ret;
@@ -229,10 +234,9 @@ static int mt9m111_reg_clear(struct i2c_client *client, const u16 reg,
        return mt9m111_reg_write(client, reg, ret & ~data);
 }
 
-static int mt9m111_set_context(struct soc_camera_device *icd,
+static int mt9m111_set_context(struct i2c_client *client,
                               enum mt9m111_context ctxt)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
        int valB = MT9M111_CTXT_CTRL_RESTART | MT9M111_CTXT_CTRL_DEFECTCOR_B
                | MT9M111_CTXT_CTRL_RESIZE_B | MT9M111_CTXT_CTRL_CTRL2_B
                | MT9M111_CTXT_CTRL_GAMMA_B | MT9M111_CTXT_CTRL_READ_MODE_B
@@ -246,17 +250,16 @@ static int mt9m111_set_context(struct soc_camera_device *icd,
                return reg_write(CONTEXT_CONTROL, valA);
 }
 
-static int mt9m111_setup_rect(struct soc_camera_device *icd,
+static int mt9m111_setup_rect(struct i2c_client *client,
                              struct v4l2_rect *rect)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret, is_raw_format;
        int width = rect->width;
        int height = rect->height;
 
-       if ((mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8)
-           || (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16))
+       if (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8 ||
+           mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16)
                is_raw_format = 1;
        else
                is_raw_format = 0;
@@ -292,9 +295,8 @@ static int mt9m111_setup_rect(struct soc_camera_device *icd,
        return ret;
 }
 
-static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)
+static int mt9m111_setup_pixfmt(struct i2c_client *client, u16 outfmt)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
        int ret;
 
        ret = reg_write(OUTPUT_FORMAT_CTRL2_A, outfmt);
@@ -303,19 +305,19 @@ static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)
        return ret;
 }
 
-static int mt9m111_setfmt_bayer8(struct soc_camera_device *icd)
+static int mt9m111_setfmt_bayer8(struct i2c_client *client)
 {
-       return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_PROCESSED_BAYER);
+       return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_PROCESSED_BAYER);
 }
 
-static int mt9m111_setfmt_bayer10(struct soc_camera_device *icd)
+static int mt9m111_setfmt_bayer10(struct i2c_client *client)
 {
-       return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_BYPASS_IFP);
+       return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_BYPASS_IFP);
 }
 
-static int mt9m111_setfmt_rgb565(struct soc_camera_device *icd)
+static int mt9m111_setfmt_rgb565(struct i2c_client *client)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int val = 0;
 
        if (mt9m111->swap_rgb_red_blue)
@@ -324,12 +326,12 @@ static int mt9m111_setfmt_rgb565(struct soc_camera_device *icd)
                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;
 
-       return mt9m111_setup_pixfmt(icd, val);
+       return mt9m111_setup_pixfmt(client, val);
 }
 
-static int mt9m111_setfmt_rgb555(struct soc_camera_device *icd)
+static int mt9m111_setfmt_rgb555(struct i2c_client *client)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int val = 0;
 
        if (mt9m111->swap_rgb_red_blue)
@@ -338,12 +340,12 @@ static int mt9m111_setfmt_rgb555(struct soc_camera_device *icd)
                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;
 
-       return mt9m111_setup_pixfmt(icd, val);
+       return mt9m111_setup_pixfmt(client, val);
 }
 
-static int mt9m111_setfmt_yuv(struct soc_camera_device *icd)
+static int mt9m111_setfmt_yuv(struct i2c_client *client)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int val = 0;
 
        if (mt9m111->swap_yuv_cb_cr)
@@ -351,52 +353,22 @@ static int mt9m111_setfmt_yuv(struct soc_camera_device *icd)
        if (mt9m111->swap_yuv_y_chromas)
                val |= MT9M111_OUTFMT_SWAP_YCbCr_C_Y;
 
-       return mt9m111_setup_pixfmt(icd, val);
+       return mt9m111_setup_pixfmt(client, val);
 }
 
-static int mt9m111_enable(struct soc_camera_device *icd)
+static int mt9m111_enable(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
-       if (icl->power) {
-               ret = icl->power(&client->dev, 1);
-               if (ret < 0) {
-                       dev_err(icd->vdev->parent,
-                               "Platform failed to power-on the camera.\n");
-                       return ret;
-               }
-       }
-
        ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);
        if (!ret)
                mt9m111->powered = 1;
        return ret;
 }
 
-static int mt9m111_disable(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
-       int ret;
-
-       ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);
-       if (!ret)
-               mt9m111->powered = 0;
-
-       if (icl->power)
-               icl->power(&client->dev, 0);
-
-       return ret;
-}
-
-static int mt9m111_reset(struct soc_camera_device *icd)
+static int mt9m111_reset(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct soc_camera_link *icl = client->dev.platform_data;
        int ret;
 
        ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);
@@ -406,26 +378,12 @@ static int mt9m111_reset(struct soc_camera_device *icd)
                ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE
                                | MT9M111_RESET_RESET_SOC);
 
-       if (icl->reset)
-               icl->reset(&client->dev);
-
        return ret;
 }
 
-static int mt9m111_start_capture(struct soc_camera_device *icd)
-{
-       return 0;
-}
-
-static int mt9m111_stop_capture(struct soc_camera_device *icd)
-{
-       return 0;
-}
-
 static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
                SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
@@ -438,62 +396,126 @@ static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)
        return 0;
 }
 
-static int mt9m111_set_crop(struct soc_camera_device *icd,
-                           struct v4l2_rect *rect)
+static int mt9m111_make_rect(struct i2c_client *client,
+                            struct v4l2_rect *rect)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+
+       if (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8 ||
+           mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16) {
+               /* Bayer format - even size lengths */
+               rect->width     = ALIGN(rect->width, 2);
+               rect->height    = ALIGN(rect->height, 2);
+               /* Let the user play with the starting pixel */
+       }
+
+       /* FIXME: the datasheet doesn't specify minimum sizes */
+       soc_camera_limit_side(&rect->left, &rect->width,
+                    MT9M111_MIN_DARK_COLS, 2, MT9M111_MAX_WIDTH);
+
+       soc_camera_limit_side(&rect->top, &rect->height,
+                    MT9M111_MIN_DARK_ROWS, 2, MT9M111_MAX_HEIGHT);
+
+       return mt9m111_setup_rect(client, rect);
+}
+
+static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+       struct v4l2_rect rect = a->c;
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
-       dev_dbg(&icd->dev, "%s left=%d, top=%d, width=%d, height=%d\n",
-               __func__, rect->left, rect->top, rect->width,
-               rect->height);
+       dev_dbg(&client->dev, "%s left=%d, top=%d, width=%d, height=%d\n",
+               __func__, rect.left, rect.top, rect.width, rect.height);
 
-       ret = mt9m111_setup_rect(icd, rect);
+       ret = mt9m111_make_rect(client, &rect);
        if (!ret)
-               mt9m111->rect = *rect;
+               mt9m111->rect = rect;
        return ret;
 }
 
-static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
+static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+
+       a->c    = mt9m111->rect;
+       a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       return 0;
+}
+
+static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+       a->bounds.left                  = MT9M111_MIN_DARK_COLS;
+       a->bounds.top                   = MT9M111_MIN_DARK_ROWS;
+       a->bounds.width                 = MT9M111_MAX_WIDTH;
+       a->bounds.height                = MT9M111_MAX_HEIGHT;
+       a->defrect                      = a->bounds;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
+
+       return 0;
+}
+
+static int mt9m111_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+
+       pix->width              = mt9m111->rect.width;
+       pix->height             = mt9m111->rect.height;
+       pix->pixelformat        = mt9m111->pixfmt;
+       pix->field              = V4L2_FIELD_NONE;
+       pix->colorspace         = V4L2_COLORSPACE_SRGB;
+
+       return 0;
+}
+
+static int mt9m111_set_pixfmt(struct i2c_client *client, u32 pixfmt)
+{
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
        switch (pixfmt) {
        case V4L2_PIX_FMT_SBGGR8:
-               ret = mt9m111_setfmt_bayer8(icd);
+               ret = mt9m111_setfmt_bayer8(client);
                break;
        case V4L2_PIX_FMT_SBGGR16:
-               ret = mt9m111_setfmt_bayer10(icd);
+               ret = mt9m111_setfmt_bayer10(client);
                break;
        case V4L2_PIX_FMT_RGB555:
-               ret = mt9m111_setfmt_rgb555(icd);
+               ret = mt9m111_setfmt_rgb555(client);
                break;
        case V4L2_PIX_FMT_RGB565:
-               ret = mt9m111_setfmt_rgb565(icd);
+               ret = mt9m111_setfmt_rgb565(client);
                break;
        case V4L2_PIX_FMT_UYVY:
                mt9m111->swap_yuv_y_chromas = 0;
                mt9m111->swap_yuv_cb_cr = 0;
-               ret = mt9m111_setfmt_yuv(icd);
+               ret = mt9m111_setfmt_yuv(client);
                break;
        case V4L2_PIX_FMT_VYUY:
                mt9m111->swap_yuv_y_chromas = 0;
                mt9m111->swap_yuv_cb_cr = 1;
-               ret = mt9m111_setfmt_yuv(icd);
+               ret = mt9m111_setfmt_yuv(client);
                break;
        case V4L2_PIX_FMT_YUYV:
                mt9m111->swap_yuv_y_chromas = 1;
                mt9m111->swap_yuv_cb_cr = 0;
-               ret = mt9m111_setfmt_yuv(icd);
+               ret = mt9m111_setfmt_yuv(client);
                break;
        case V4L2_PIX_FMT_YVYU:
                mt9m111->swap_yuv_y_chromas = 1;
                mt9m111->swap_yuv_cb_cr = 1;
-               ret = mt9m111_setfmt_yuv(icd);
+               ret = mt9m111_setfmt_yuv(client);
                break;
        default:
-               dev_err(&icd->dev, "Pixel format not handled : %x\n", pixfmt);
+               dev_err(&client->dev, "Pixel format not handled : %x\n",
+                       pixfmt);
                ret = -EINVAL;
        }
 
@@ -503,10 +525,10 @@ static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
        return ret;
 }
 
-static int mt9m111_set_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9m111_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        struct v4l2_pix_format *pix = &f->fmt.pix;
        struct v4l2_rect rect = {
                .left   = mt9m111->rect.left,
@@ -516,40 +538,56 @@ static int mt9m111_set_fmt(struct soc_camera_device *icd,
        };
        int ret;
 
-       dev_dbg(&icd->dev, "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n",
-               __func__, pix->pixelformat, rect.left, rect.top, rect.width,
-               rect.height);
+       dev_dbg(&client->dev,
+               "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n", __func__,
+               pix->pixelformat, rect.left, rect.top, rect.width, rect.height);
 
-       ret = mt9m111_setup_rect(icd, &rect);
+       ret = mt9m111_make_rect(client, &rect);
        if (!ret)
-               ret = mt9m111_set_pixfmt(icd, pix->pixelformat);
+               ret = mt9m111_set_pixfmt(client, pix->pixelformat);
        if (!ret)
                mt9m111->rect = rect;
        return ret;
 }
 
-static int mt9m111_try_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9m111_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
        struct v4l2_pix_format *pix = &f->fmt.pix;
+       bool bayer = pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
+               pix->pixelformat == V4L2_PIX_FMT_SBGGR16;
+
+       /*
+        * With Bayer format enforce even side lengths, but let the user play
+        * with the starting pixel
+        */
 
        if (pix->height > MT9M111_MAX_HEIGHT)
                pix->height = MT9M111_MAX_HEIGHT;
+       else if (pix->height < 2)
+               pix->height = 2;
+       else if (bayer)
+               pix->height = ALIGN(pix->height, 2);
+
        if (pix->width > MT9M111_MAX_WIDTH)
                pix->width = MT9M111_MAX_WIDTH;
+       else if (pix->width < 2)
+               pix->width = 2;
+       else if (bayer)
+               pix->width = ALIGN(pix->width, 2);
 
        return 0;
 }
 
-static int mt9m111_get_chip_id(struct soc_camera_device *icd,
-                              struct v4l2_dbg_chip_ident *id)
+static int mt9m111_g_chip_ident(struct v4l2_subdev *sd,
+                               struct v4l2_dbg_chip_ident *id)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
 
        if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
                return -EINVAL;
 
-       if (id->match.addr != mt9m111->client->addr)
+       if (id->match.addr != client->addr)
                return -ENODEV;
 
        id->ident       = mt9m111->model;
@@ -559,11 +597,11 @@ static int mt9m111_get_chip_id(struct soc_camera_device *icd,
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int mt9m111_get_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9m111_g_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
+       struct i2c_client *client = sd->priv;
        int val;
-       struct i2c_client *client = to_i2c_client(icd->control);
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
                return -EINVAL;
@@ -580,10 +618,10 @@ static int mt9m111_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9m111_set_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9m111_s_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
                return -EINVAL;
@@ -635,45 +673,21 @@ static const struct v4l2_queryctrl mt9m111_controls[] = {
        }
 };
 
-static int mt9m111_video_probe(struct soc_camera_device *);
-static void mt9m111_video_remove(struct soc_camera_device *);
-static int mt9m111_get_control(struct soc_camera_device *,
-                              struct v4l2_control *);
-static int mt9m111_set_control(struct soc_camera_device *,
-                              struct v4l2_control *);
 static int mt9m111_resume(struct soc_camera_device *icd);
-static int mt9m111_init(struct soc_camera_device *icd);
-static int mt9m111_release(struct soc_camera_device *icd);
+static int mt9m111_suspend(struct soc_camera_device *icd, pm_message_t state);
 
 static struct soc_camera_ops mt9m111_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = mt9m111_video_probe,
-       .remove                 = mt9m111_video_remove,
-       .init                   = mt9m111_init,
+       .suspend                = mt9m111_suspend,
        .resume                 = mt9m111_resume,
-       .release                = mt9m111_release,
-       .start_capture          = mt9m111_start_capture,
-       .stop_capture           = mt9m111_stop_capture,
-       .set_crop               = mt9m111_set_crop,
-       .set_fmt                = mt9m111_set_fmt,
-       .try_fmt                = mt9m111_try_fmt,
        .query_bus_param        = mt9m111_query_bus_param,
        .set_bus_param          = mt9m111_set_bus_param,
        .controls               = mt9m111_controls,
        .num_controls           = ARRAY_SIZE(mt9m111_controls),
-       .get_control            = mt9m111_get_control,
-       .set_control            = mt9m111_set_control,
-       .get_chip_id            = mt9m111_get_chip_id,
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = mt9m111_get_register,
-       .set_register           = mt9m111_set_register,
-#endif
 };
 
-static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)
+static int mt9m111_set_flip(struct i2c_client *client, int flip, int mask)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
        if (mt9m111->context == HIGHPOWER) {
@@ -691,9 +705,8 @@ static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)
        return ret;
 }
 
-static int mt9m111_get_global_gain(struct soc_camera_device *icd)
+static int mt9m111_get_global_gain(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
        int data;
 
        data = reg_read(GLOBAL_GAIN);
@@ -703,15 +716,15 @@ static int mt9m111_get_global_gain(struct soc_camera_device *icd)
        return data;
 }
 
-static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
+static int mt9m111_set_global_gain(struct i2c_client *client, int gain)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        u16 val;
 
        if (gain > 63 * 2 * 2)
                return -EINVAL;
 
-       icd->gain = gain;
+       mt9m111->gain = gain;
        if ((gain >= 64 * 2) && (gain < 63 * 2 * 2))
                val = (1 << 10) | (1 << 9) | (gain / 4);
        else if ((gain >= 64) && (gain < 64 * 2))
@@ -722,10 +735,9 @@ static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
        return reg_write(GLOBAL_GAIN, val);
 }
 
-static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)
+static int mt9m111_set_autoexposure(struct i2c_client *client, int on)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
        if (on)
@@ -739,10 +751,9 @@ static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)
        return ret;
 }
 
-static int mt9m111_set_autowhitebalance(struct soc_camera_device *icd, int on)
+static int mt9m111_set_autowhitebalance(struct i2c_client *client, int on)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
        if (on)
@@ -756,11 +767,10 @@ static int mt9m111_set_autowhitebalance(struct soc_camera_device *icd, int on)
        return ret;
 }
 
-static int mt9m111_get_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl)
+static int mt9m111_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int data;
 
        switch (ctrl->id) {
@@ -785,7 +795,7 @@ static int mt9m111_get_control(struct soc_camera_device *icd,
                ctrl->value = !!(data & MT9M111_RMB_MIRROR_COLS);
                break;
        case V4L2_CID_GAIN:
-               data = mt9m111_get_global_gain(icd);
+               data = mt9m111_get_global_gain(client);
                if (data < 0)
                        return data;
                ctrl->value = data;
@@ -800,37 +810,36 @@ static int mt9m111_get_control(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9m111_set_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl)
+static int mt9m111_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        const struct v4l2_queryctrl *qctrl;
        int ret;
 
        qctrl = soc_camera_find_qctrl(&mt9m111_ops, ctrl->id);
-
        if (!qctrl)
                return -EINVAL;
 
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
                mt9m111->vflip = ctrl->value;
-               ret = mt9m111_set_flip(icd, ctrl->value,
+               ret = mt9m111_set_flip(client, ctrl->value,
                                        MT9M111_RMB_MIRROR_ROWS);
                break;
        case V4L2_CID_HFLIP:
                mt9m111->hflip = ctrl->value;
-               ret = mt9m111_set_flip(icd, ctrl->value,
+               ret = mt9m111_set_flip(client, ctrl->value,
                                        MT9M111_RMB_MIRROR_COLS);
                break;
        case V4L2_CID_GAIN:
-               ret = mt9m111_set_global_gain(icd, ctrl->value);
+               ret = mt9m111_set_global_gain(client, ctrl->value);
                break;
        case V4L2_CID_EXPOSURE_AUTO:
-               ret =  mt9m111_set_autoexposure(icd, ctrl->value);
+               ret =  mt9m111_set_autoexposure(client, ctrl->value);
                break;
        case V4L2_CID_AUTO_WHITE_BALANCE:
-               ret =  mt9m111_set_autowhitebalance(icd, ctrl->value);
+               ret =  mt9m111_set_autowhitebalance(client, ctrl->value);
                break;
        default:
                ret = -EINVAL;
@@ -839,62 +848,62 @@ static int mt9m111_set_control(struct soc_camera_device *icd,
        return ret;
 }
 
-static int mt9m111_restore_state(struct soc_camera_device *icd)
+static int mt9m111_suspend(struct soc_camera_device *icd, pm_message_t state)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-
-       mt9m111_set_context(icd, mt9m111->context);
-       mt9m111_set_pixfmt(icd, mt9m111->pixfmt);
-       mt9m111_setup_rect(icd, &mt9m111->rect);
-       mt9m111_set_flip(icd, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
-       mt9m111_set_flip(icd, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
-       mt9m111_set_global_gain(icd, icd->gain);
-       mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
-       mt9m111_set_autowhitebalance(icd, mt9m111->autowhitebalance);
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+
+       mt9m111->gain = mt9m111_get_global_gain(client);
+
+       return 0;
+}
+
+static int mt9m111_restore_state(struct i2c_client *client)
+{
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+
+       mt9m111_set_context(client, mt9m111->context);
+       mt9m111_set_pixfmt(client, mt9m111->pixfmt);
+       mt9m111_setup_rect(client, &mt9m111->rect);
+       mt9m111_set_flip(client, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
+       mt9m111_set_flip(client, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
+       mt9m111_set_global_gain(client, mt9m111->gain);
+       mt9m111_set_autoexposure(client, mt9m111->autoexposure);
+       mt9m111_set_autowhitebalance(client, mt9m111->autowhitebalance);
        return 0;
 }
 
 static int mt9m111_resume(struct soc_camera_device *icd)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret = 0;
 
        if (mt9m111->powered) {
-               ret = mt9m111_enable(icd);
+               ret = mt9m111_enable(client);
                if (!ret)
-                       ret = mt9m111_reset(icd);
+                       ret = mt9m111_reset(client);
                if (!ret)
-                       ret = mt9m111_restore_state(icd);
+                       ret = mt9m111_restore_state(client);
        }
        return ret;
 }
 
-static int mt9m111_init(struct soc_camera_device *icd)
+static int mt9m111_init(struct i2c_client *client)
 {
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        int ret;
 
        mt9m111->context = HIGHPOWER;
-       ret = mt9m111_enable(icd);
+       ret = mt9m111_enable(client);
        if (!ret)
-               ret = mt9m111_reset(icd);
+               ret = mt9m111_reset(client);
        if (!ret)
-               ret = mt9m111_set_context(icd, mt9m111->context);
+               ret = mt9m111_set_context(client, mt9m111->context);
        if (!ret)
-               ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+               ret = mt9m111_set_autoexposure(client, mt9m111->autoexposure);
        if (ret)
-               dev_err(&icd->dev, "mt9m11x init failed: %d\n", ret);
-       return ret;
-}
-
-static int mt9m111_release(struct soc_camera_device *icd)
-{
-       int ret;
-
-       ret = mt9m111_disable(icd);
-       if (ret < 0)
-               dev_err(&icd->dev, "mt9m11x release failed: %d\n", ret);
-
+               dev_err(&client->dev, "mt9m11x init failed: %d\n", ret);
        return ret;
 }
 
@@ -902,10 +911,10 @@ static int mt9m111_release(struct soc_camera_device *icd)
  * Interface active, can use i2c. If it fails, it can indeed mean, that
  * this wasn't our capture interface, so, we wait for the right one
  */
-static int mt9m111_video_probe(struct soc_camera_device *icd)
+static int mt9m111_video_probe(struct soc_camera_device *icd,
+                              struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
        s32 data;
        int ret;
 
@@ -917,10 +926,13 @@ static int mt9m111_video_probe(struct soc_camera_device *icd)
            to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
                return -ENODEV;
 
-       ret = mt9m111_enable(icd);
-       if (ret)
-               goto ei2c;
-       ret = mt9m111_reset(icd);
+       mt9m111->autoexposure = 1;
+       mt9m111->autowhitebalance = 1;
+
+       mt9m111->swap_rgb_even_odd = 1;
+       mt9m111->swap_rgb_red_blue = 1;
+
+       ret = mt9m111_init(client);
        if (ret)
                goto ei2c;
 
@@ -935,7 +947,7 @@ static int mt9m111_video_probe(struct soc_camera_device *icd)
                break;
        default:
                ret = -ENODEV;
-               dev_err(&icd->dev,
+               dev_err(&client->dev,
                        "No MT9M11x chip detected, register read %x\n", data);
                goto ei2c;
        }
@@ -943,42 +955,51 @@ static int mt9m111_video_probe(struct soc_camera_device *icd)
        icd->formats = mt9m111_colour_formats;
        icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats);
 
-       dev_info(&icd->dev, "Detected a MT9M11x chip ID %x\n", data);
+       dev_info(&client->dev, "Detected a MT9M11x chip ID %x\n", data);
 
-       ret = soc_camera_video_start(icd);
-       if (ret)
-               goto eisis;
-
-       mt9m111->autoexposure = 1;
-       mt9m111->autowhitebalance = 1;
-
-       mt9m111->swap_rgb_even_odd = 1;
-       mt9m111->swap_rgb_red_blue = 1;
-
-       return 0;
-eisis:
 ei2c:
        return ret;
 }
 
-static void mt9m111_video_remove(struct soc_camera_device *icd)
-{
-       struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
+       .g_ctrl         = mt9m111_g_ctrl,
+       .s_ctrl         = mt9m111_s_ctrl,
+       .g_chip_ident   = mt9m111_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .g_register     = mt9m111_g_register,
+       .s_register     = mt9m111_s_register,
+#endif
+};
 
-       dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m111->client->addr,
-               mt9m111->icd.dev.parent, mt9m111->icd.vdev);
-       soc_camera_video_stop(&mt9m111->icd);
-}
+static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
+       .s_fmt          = mt9m111_s_fmt,
+       .g_fmt          = mt9m111_g_fmt,
+       .try_fmt        = mt9m111_try_fmt,
+       .s_crop         = mt9m111_s_crop,
+       .g_crop         = mt9m111_g_crop,
+       .cropcap        = mt9m111_cropcap,
+};
+
+static struct v4l2_subdev_ops mt9m111_subdev_ops = {
+       .core   = &mt9m111_subdev_core_ops,
+       .video  = &mt9m111_subdev_video_ops,
+};
 
 static int mt9m111_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9m111 *mt9m111;
-       struct soc_camera_device *icd;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct soc_camera_link *icl;
        int ret;
 
+       if (!icd) {
+               dev_err(&client->dev, "MT9M11x: missing soc-camera data!\n");
+               return -EINVAL;
+       }
+
+       icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9M11x driver needs platform data\n");
                return -EINVAL;
@@ -994,38 +1015,35 @@ static int mt9m111_probe(struct i2c_client *client,
        if (!mt9m111)
                return -ENOMEM;
 
-       mt9m111->client = client;
-       i2c_set_clientdata(client, mt9m111);
+       v4l2_i2c_subdev_init(&mt9m111->subdev, client, &mt9m111_subdev_ops);
 
        /* Second stage probe - when a capture adapter is there */
-       icd             = &mt9m111->icd;
-       icd->ops        = &mt9m111_ops;
-       icd->control    = &client->dev;
-       icd->x_min      = MT9M111_MIN_DARK_COLS;
-       icd->y_min      = MT9M111_MIN_DARK_ROWS;
-       icd->x_current  = icd->x_min;
-       icd->y_current  = icd->y_min;
-       icd->width_min  = MT9M111_MIN_DARK_ROWS;
-       icd->width_max  = MT9M111_MAX_WIDTH;
-       icd->height_min = MT9M111_MIN_DARK_COLS;
-       icd->height_max = MT9M111_MAX_HEIGHT;
-       icd->y_skip_top = 0;
-       icd->iface      = icl->bus_id;
-
-       ret = soc_camera_device_register(icd);
-       if (ret)
-               goto eisdr;
-       return 0;
+       icd->ops                = &mt9m111_ops;
+       icd->y_skip_top         = 0;
+
+       mt9m111->rect.left      = MT9M111_MIN_DARK_COLS;
+       mt9m111->rect.top       = MT9M111_MIN_DARK_ROWS;
+       mt9m111->rect.width     = MT9M111_MAX_WIDTH;
+       mt9m111->rect.height    = MT9M111_MAX_HEIGHT;
+
+       ret = mt9m111_video_probe(icd, client);
+       if (ret) {
+               icd->ops = NULL;
+               i2c_set_clientdata(client, NULL);
+               kfree(mt9m111);
+       }
 
-eisdr:
-       kfree(mt9m111);
        return ret;
 }
 
 static int mt9m111_remove(struct i2c_client *client)
 {
-       struct mt9m111 *mt9m111 = i2c_get_clientdata(client);
-       soc_camera_device_unregister(&mt9m111->icd);
+       struct mt9m111 *mt9m111 = to_mt9m111(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
+
+       icd->ops = NULL;
+       i2c_set_clientdata(client, NULL);
+       client->driver = NULL;
        kfree(mt9m111);
 
        return 0;
index 4207fb3..6966f64 100644 (file)
 #include <linux/i2c.h>
 #include <linux/log2.h>
 
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
 /* mt9t031 i2c address 0x5d
- * The platform has to define i2c_board_info
- * and call i2c_register_board_info() */
+ * The platform has to define i2c_board_info and link to it from
+ * struct soc_camera_link */
 
 /* mt9t031 selected register addresses */
 #define MT9T031_CHIP_VERSION           0x00
@@ -47,7 +47,7 @@
 #define MT9T031_MAX_HEIGHT             1536
 #define MT9T031_MAX_WIDTH              2048
 #define MT9T031_MIN_HEIGHT             2
-#define MT9T031_MIN_WIDTH              2
+#define MT9T031_MIN_WIDTH              18
 #define MT9T031_HORIZONTAL_BLANK       142
 #define MT9T031_VERTICAL_BLANK         25
 #define MT9T031_COLUMN_SKIP            32
@@ -68,14 +68,21 @@ static const struct soc_camera_data_format mt9t031_colour_formats[] = {
 };
 
 struct mt9t031 {
-       struct i2c_client *client;
-       struct soc_camera_device icd;
+       struct v4l2_subdev subdev;
+       struct v4l2_rect rect;  /* Sensor window */
        int model;      /* V4L2_IDENT_MT9T031* codes from v4l2-chip-ident.h */
-       unsigned char autoexposure;
        u16 xskip;
        u16 yskip;
+       unsigned int gain;
+       unsigned int exposure;
+       unsigned char autoexposure;
 };
 
+static struct mt9t031 *to_mt9t031(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct mt9t031, subdev);
+}
+
 static int reg_read(struct i2c_client *client, const u8 reg)
 {
        s32 data = i2c_smbus_read_word_data(client, reg);
@@ -136,21 +143,10 @@ static int get_shutter(struct i2c_client *client, u32 *data)
        return ret < 0 ? ret : 0;
 }
 
-static int mt9t031_init(struct soc_camera_device *icd)
+static int mt9t031_idle(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct soc_camera_link *icl = client->dev.platform_data;
        int ret;
 
-       if (icl->power) {
-               ret = icl->power(&client->dev, 1);
-               if (ret < 0) {
-                       dev_err(icd->vdev->parent,
-                               "Platform failed to power-on the camera.\n");
-                       return ret;
-               }
-       }
-
        /* Disable chip output, synchronous option update */
        ret = reg_write(client, MT9T031_RESET, 1);
        if (ret >= 0)
@@ -158,50 +154,39 @@ static int mt9t031_init(struct soc_camera_device *icd)
        if (ret >= 0)
                ret = reg_clear(client, MT9T031_OUTPUT_CONTROL, 2);
 
-       if (ret < 0 && icl->power)
-               icl->power(&client->dev, 0);
-
        return ret >= 0 ? 0 : -EIO;
 }
 
-static int mt9t031_release(struct soc_camera_device *icd)
+static int mt9t031_disable(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct soc_camera_link *icl = client->dev.platform_data;
-
        /* Disable the chip */
        reg_clear(client, MT9T031_OUTPUT_CONTROL, 2);
 
-       if (icl->power)
-               icl->power(&client->dev, 0);
-
        return 0;
 }
 
-static int mt9t031_start_capture(struct soc_camera_device *icd)
+static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-
-       /* Switch to master "normal" mode */
-       if (reg_set(client, MT9T031_OUTPUT_CONTROL, 2) < 0)
-               return -EIO;
-       return 0;
-}
+       struct i2c_client *client = sd->priv;
+       int ret;
 
-static int mt9t031_stop_capture(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
+       if (enable)
+               /* Switch to master "normal" mode */
+               ret = reg_set(client, MT9T031_OUTPUT_CONTROL, 2);
+       else
+               /* Stop sensor readout */
+               ret = reg_clear(client, MT9T031_OUTPUT_CONTROL, 2);
 
-       /* Stop sensor readout */
-       if (reg_clear(client, MT9T031_OUTPUT_CONTROL, 2) < 0)
+       if (ret < 0)
                return -EIO;
+
        return 0;
 }
 
 static int mt9t031_set_bus_param(struct soc_camera_device *icd,
                                 unsigned long flags)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
 
        /* The caller should have queried our parameters, check anyway */
        if (flags & ~MT9T031_BUS_PARAM)
@@ -217,69 +202,73 @@ static int mt9t031_set_bus_param(struct soc_camera_device *icd,
 
 static unsigned long mt9t031_query_bus_param(struct soc_camera_device *icd)
 {
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
-       struct soc_camera_link *icl = mt9t031->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
 
        return soc_camera_apply_sensor_flags(icl, MT9T031_BUS_PARAM);
 }
 
-/* Round up minima and round down maxima */
-static void recalculate_limits(struct soc_camera_device *icd,
-                              u16 xskip, u16 yskip)
+/* target must be _even_ */
+static u16 mt9t031_skip(s32 *source, s32 target, s32 max)
 {
-       icd->x_min = (MT9T031_COLUMN_SKIP + xskip - 1) / xskip;
-       icd->y_min = (MT9T031_ROW_SKIP + yskip - 1) / yskip;
-       icd->width_min = (MT9T031_MIN_WIDTH + xskip - 1) / xskip;
-       icd->height_min = (MT9T031_MIN_HEIGHT + yskip - 1) / yskip;
-       icd->width_max = MT9T031_MAX_WIDTH / xskip;
-       icd->height_max = MT9T031_MAX_HEIGHT / yskip;
+       unsigned int skip;
+
+       if (*source < target + target / 2) {
+               *source = target;
+               return 1;
+       }
+
+       skip = min(max, *source + target / 2) / target;
+       if (skip > 8)
+               skip = 8;
+       *source = target * skip;
+
+       return skip;
 }
 
+/* rect is the sensor rectangle, the caller guarantees parameter validity */
 static int mt9t031_set_params(struct soc_camera_device *icd,
                              struct v4l2_rect *rect, u16 xskip, u16 yskip)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
        int ret;
-       u16 xbin, ybin, width, height, left, top;
+       u16 xbin, ybin;
        const u16 hblank = MT9T031_HORIZONTAL_BLANK,
                vblank = MT9T031_VERTICAL_BLANK;
 
-       /* Make sure we don't exceed sensor limits */
-       if (rect->left + rect->width > icd->width_max)
-               rect->left = (icd->width_max - rect->width) / 2 + icd->x_min;
-
-       if (rect->top + rect->height > icd->height_max)
-               rect->top = (icd->height_max - rect->height) / 2 + icd->y_min;
-
-       width = rect->width * xskip;
-       height = rect->height * yskip;
-       left = rect->left * xskip;
-       top = rect->top * yskip;
-
        xbin = min(xskip, (u16)3);
        ybin = min(yskip, (u16)3);
 
-       dev_dbg(&icd->dev, "xskip %u, width %u/%u, yskip %u, height %u/%u\n",
-               xskip, width, rect->width, yskip, height, rect->height);
-
-       /* Could just do roundup(rect->left, [xy]bin * 2); but this is cheaper */
+       /*
+        * Could just do roundup(rect->left, [xy]bin * 2); but this is cheaper.
+        * There is always a valid suitably aligned value. The worst case is
+        * xbin = 3, width = 2048. Then we will start at 36, the last read out
+        * pixel will be 2083, which is < 2085 - first black pixel.
+        *
+        * MT9T031 datasheet imposes window left border alignment, depending on
+        * the selected xskip. Failing to conform to this requirement produces
+        * dark horizontal stripes in the image. However, even obeying to this
+        * requirement doesn't eliminate the stripes in all configurations. They
+        * appear "locally reproducibly," but can differ between tests under
+        * different lighting conditions.
+        */
        switch (xbin) {
-       case 2:
-               left = (left + 3) & ~3;
+       case 1:
+               rect->left &= ~1;
                break;
-       case 3:
-               left = roundup(left, 6);
-       }
-
-       switch (ybin) {
        case 2:
-               top = (top + 3) & ~3;
+               rect->left &= ~3;
                break;
        case 3:
-               top = roundup(top, 6);
+               rect->left = rect->left > roundup(MT9T031_COLUMN_SKIP, 6) ?
+                       (rect->left / 6) * 6 : roundup(MT9T031_COLUMN_SKIP, 6);
        }
 
+       rect->top &= ~1;
+
+       dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n",
+               xskip, yskip, rect->width, rect->height, rect->left, rect->top);
+
        /* Disable register update, reconfigure atomically */
        ret = reg_set(client, MT9T031_OUTPUT_CONTROL, 1);
        if (ret < 0)
@@ -299,29 +288,30 @@ static int mt9t031_set_params(struct soc_camera_device *icd,
                        ret = reg_write(client, MT9T031_ROW_ADDRESS_MODE,
                                        ((ybin - 1) << 4) | (yskip - 1));
        }
-       dev_dbg(&icd->dev, "new physical left %u, top %u\n", left, top);
+       dev_dbg(&client->dev, "new physical left %u, top %u\n",
+               rect->left, rect->top);
 
        /* The caller provides a supported format, as guaranteed by
         * icd->try_fmt_cap(), soc_camera_s_crop() and soc_camera_cropcap() */
        if (ret >= 0)
-               ret = reg_write(client, MT9T031_COLUMN_START, left);
+               ret = reg_write(client, MT9T031_COLUMN_START, rect->left);
        if (ret >= 0)
-               ret = reg_write(client, MT9T031_ROW_START, top);
+               ret = reg_write(client, MT9T031_ROW_START, rect->top);
        if (ret >= 0)
-               ret = reg_write(client, MT9T031_WINDOW_WIDTH, width - 1);
+               ret = reg_write(client, MT9T031_WINDOW_WIDTH, rect->width - 1);
        if (ret >= 0)
                ret = reg_write(client, MT9T031_WINDOW_HEIGHT,
-                               height + icd->y_skip_top - 1);
+                               rect->height + icd->y_skip_top - 1);
        if (ret >= 0 && mt9t031->autoexposure) {
-               ret = set_shutter(client, height + icd->y_skip_top + vblank);
+               unsigned int total_h = rect->height + icd->y_skip_top + vblank;
+               ret = set_shutter(client, total_h);
                if (ret >= 0) {
                        const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
                        const struct v4l2_queryctrl *qctrl =
                                soc_camera_find_qctrl(icd->ops,
                                                      V4L2_CID_EXPOSURE);
-                       icd->exposure = (shutter_max / 2 + (height +
-                                        icd->y_skip_top + vblank - 1) *
-                                        (qctrl->maximum - qctrl->minimum)) /
+                       mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
+                                (qctrl->maximum - qctrl->minimum)) /
                                shutter_max + qctrl->minimum;
                }
        }
@@ -330,58 +320,99 @@ static int mt9t031_set_params(struct soc_camera_device *icd,
        if (ret >= 0)
                ret = reg_clear(client, MT9T031_OUTPUT_CONTROL, 1);
 
+       if (ret >= 0) {
+               mt9t031->rect = *rect;
+               mt9t031->xskip = xskip;
+               mt9t031->yskip = yskip;
+       }
+
        return ret < 0 ? ret : 0;
 }
 
-static int mt9t031_set_crop(struct soc_camera_device *icd,
-                           struct v4l2_rect *rect)
+static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct v4l2_rect rect = a->c;
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
+
+       rect.width = ALIGN(rect.width, 2);
+       rect.height = ALIGN(rect.height, 2);
+
+       soc_camera_limit_side(&rect.left, &rect.width,
+                    MT9T031_COLUMN_SKIP, MT9T031_MIN_WIDTH, MT9T031_MAX_WIDTH);
+
+       soc_camera_limit_side(&rect.top, &rect.height,
+                    MT9T031_ROW_SKIP, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT);
 
-       /* CROP - no change in scaling, or in limits */
-       return mt9t031_set_params(icd, rect, mt9t031->xskip, mt9t031->yskip);
+       return mt9t031_set_params(icd, &rect, mt9t031->xskip, mt9t031->yskip);
 }
 
-static int mt9t031_set_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9t031_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
-       int ret;
-       u16 xskip, yskip;
-       struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
-               .width  = f->fmt.pix.width,
-               .height = f->fmt.pix.height,
-       };
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
 
-       /*
-        * try_fmt has put rectangle within limits.
-        * S_FMT - use binning and skipping for scaling, recalculate
-        * limits, used for cropping
-        */
-       /* Is this more optimal than just a division? */
-       for (xskip = 8; xskip > 1; xskip--)
-               if (rect.width * xskip <= MT9T031_MAX_WIDTH)
-                       break;
+       a->c    = mt9t031->rect;
+       a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-       for (yskip = 8; yskip > 1; yskip--)
-               if (rect.height * yskip <= MT9T031_MAX_HEIGHT)
-                       break;
+       return 0;
+}
 
-       recalculate_limits(icd, xskip, yskip);
+static int mt9t031_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+       a->bounds.left                  = MT9T031_COLUMN_SKIP;
+       a->bounds.top                   = MT9T031_ROW_SKIP;
+       a->bounds.width                 = MT9T031_MAX_WIDTH;
+       a->bounds.height                = MT9T031_MAX_HEIGHT;
+       a->defrect                      = a->bounds;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
 
-       ret = mt9t031_set_params(icd, &rect, xskip, yskip);
-       if (!ret) {
-               mt9t031->xskip = xskip;
-               mt9t031->yskip = yskip;
-       }
+       return 0;
+}
 
-       return ret;
+static int mt9t031_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+
+       pix->width              = mt9t031->rect.width / mt9t031->xskip;
+       pix->height             = mt9t031->rect.height / mt9t031->yskip;
+       pix->pixelformat        = V4L2_PIX_FMT_SGRBG10;
+       pix->field              = V4L2_FIELD_NONE;
+       pix->colorspace         = V4L2_COLORSPACE_SRGB;
+
+       return 0;
+}
+
+static int mt9t031_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+       u16 xskip, yskip;
+       struct v4l2_rect rect = mt9t031->rect;
+
+       /*
+        * try_fmt has put width and height within limits.
+        * S_FMT: use binning and skipping for scaling
+        */
+       xskip = mt9t031_skip(&rect.width, pix->width, MT9T031_MAX_WIDTH);
+       yskip = mt9t031_skip(&rect.height, pix->height, MT9T031_MAX_HEIGHT);
+
+       /* mt9t031_set_params() doesn't change width and height */
+       return mt9t031_set_params(icd, &rect, xskip, yskip);
 }
 
-static int mt9t031_try_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+/*
+ * If a user window larger than sensor window is requested, we'll increase the
+ * sensor window.
+ */
+static int mt9t031_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
        struct v4l2_pix_format *pix = &f->fmt.pix;
 
@@ -392,15 +423,16 @@ static int mt9t031_try_fmt(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9t031_get_chip_id(struct soc_camera_device *icd,
-                              struct v4l2_dbg_chip_ident *id)
+static int mt9t031_g_chip_ident(struct v4l2_subdev *sd,
+                               struct v4l2_dbg_chip_ident *id)
 {
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
 
        if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
                return -EINVAL;
 
-       if (id->match.addr != mt9t031->client->addr)
+       if (id->match.addr != client->addr)
                return -ENODEV;
 
        id->ident       = mt9t031->model;
@@ -410,10 +442,10 @@ static int mt9t031_get_chip_id(struct soc_camera_device *icd,
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int mt9t031_get_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9t031_g_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -429,10 +461,10 @@ static int mt9t031_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9t031_set_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9t031_s_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -493,39 +525,17 @@ static const struct v4l2_queryctrl mt9t031_controls[] = {
        }
 };
 
-static int mt9t031_video_probe(struct soc_camera_device *);
-static void mt9t031_video_remove(struct soc_camera_device *);
-static int mt9t031_get_control(struct soc_camera_device *, struct v4l2_control *);
-static int mt9t031_set_control(struct soc_camera_device *, struct v4l2_control *);
-
 static struct soc_camera_ops mt9t031_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = mt9t031_video_probe,
-       .remove                 = mt9t031_video_remove,
-       .init                   = mt9t031_init,
-       .release                = mt9t031_release,
-       .start_capture          = mt9t031_start_capture,
-       .stop_capture           = mt9t031_stop_capture,
-       .set_crop               = mt9t031_set_crop,
-       .set_fmt                = mt9t031_set_fmt,
-       .try_fmt                = mt9t031_try_fmt,
        .set_bus_param          = mt9t031_set_bus_param,
        .query_bus_param        = mt9t031_query_bus_param,
        .controls               = mt9t031_controls,
        .num_controls           = ARRAY_SIZE(mt9t031_controls),
-       .get_control            = mt9t031_get_control,
-       .set_control            = mt9t031_set_control,
-       .get_chip_id            = mt9t031_get_chip_id,
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = mt9t031_get_register,
-       .set_register           = mt9t031_set_register,
-#endif
 };
 
-static int mt9t031_get_control(struct soc_camera_device *icd, struct v4l2_control *ctrl)
+static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
        int data;
 
        switch (ctrl->id) {
@@ -544,14 +554,21 @@ static int mt9t031_get_control(struct soc_camera_device *icd, struct v4l2_contro
        case V4L2_CID_EXPOSURE_AUTO:
                ctrl->value = mt9t031->autoexposure;
                break;
+       case V4L2_CID_GAIN:
+               ctrl->value = mt9t031->gain;
+               break;
+       case V4L2_CID_EXPOSURE:
+               ctrl->value = mt9t031->exposure;
+               break;
        }
        return 0;
 }
 
-static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_control *ctrl)
+static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
        const struct v4l2_queryctrl *qctrl;
        int data;
 
@@ -586,7 +603,7 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
                        unsigned long range = qctrl->default_value - qctrl->minimum;
                        data = ((ctrl->value - qctrl->minimum) * 8 + range / 2) / range;
 
-                       dev_dbg(&icd->dev, "Setting gain %d\n", data);
+                       dev_dbg(&client->dev, "Setting gain %d\n", data);
                        data = reg_write(client, MT9T031_GLOBAL_GAIN, data);
                        if (data < 0)
                                return -EIO;
@@ -606,7 +623,7 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
                                /* calculated gain 65..1024 -> (1..120) << 8 + 0x60 */
                                data = (((gain - 64 + 7) * 32) & 0xff00) | 0x60;
 
-                       dev_dbg(&icd->dev, "Setting gain from 0x%x to 0x%x\n",
+                       dev_dbg(&client->dev, "Set gain from 0x%x to 0x%x\n",
                                reg_read(client, MT9T031_GLOBAL_GAIN), data);
                        data = reg_write(client, MT9T031_GLOBAL_GAIN, data);
                        if (data < 0)
@@ -614,7 +631,7 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
                }
 
                /* Success */
-               icd->gain = ctrl->value;
+               mt9t031->gain = ctrl->value;
                break;
        case V4L2_CID_EXPOSURE:
                /* mt9t031 has maximum == default */
@@ -627,11 +644,11 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
                        u32 old;
 
                        get_shutter(client, &old);
-                       dev_dbg(&icd->dev, "Setting shutter width from %u to %u\n",
+                       dev_dbg(&client->dev, "Set shutter from %u to %u\n",
                                old, shutter);
                        if (set_shutter(client, shutter) < 0)
                                return -EIO;
-                       icd->exposure = ctrl->value;
+                       mt9t031->exposure = ctrl->value;
                        mt9t031->autoexposure = 0;
                }
                break;
@@ -639,13 +656,14 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
                if (ctrl->value) {
                        const u16 vblank = MT9T031_VERTICAL_BLANK;
                        const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
-                       if (set_shutter(client, icd->height +
-                                       icd->y_skip_top + vblank) < 0)
+                       unsigned int total_h = mt9t031->rect.height +
+                               icd->y_skip_top + vblank;
+
+                       if (set_shutter(client, total_h) < 0)
                                return -EIO;
                        qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_EXPOSURE);
-                       icd->exposure = (shutter_max / 2 + (icd->height +
-                                        icd->y_skip_top + vblank - 1) *
-                                        (qctrl->maximum - qctrl->minimum)) /
+                       mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
+                                (qctrl->maximum - qctrl->minimum)) /
                                shutter_max + qctrl->minimum;
                        mt9t031->autoexposure = 1;
                } else
@@ -657,22 +675,16 @@ static int mt9t031_set_control(struct soc_camera_device *icd, struct v4l2_contro
 
 /* Interface active, can use i2c. If it fails, it can indeed mean, that
  * this wasn't our capture interface, so, we wait for the right one */
-static int mt9t031_video_probe(struct soc_camera_device *icd)
+static int mt9t031_video_probe(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+       struct soc_camera_device *icd = client->dev.platform_data;
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
        s32 data;
        int ret;
 
-       /* We must have a parent by now. And it cannot be a wrong one.
-        * So this entire test is completely redundant. */
-       if (!icd->dev.parent ||
-           to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
-               return -ENODEV;
-
        /* Enable the chip */
        data = reg_write(client, MT9T031_CHIP_ENABLE, 1);
-       dev_dbg(&icd->dev, "write: %d\n", data);
+       dev_dbg(&client->dev, "write: %d\n", data);
 
        /* Read out the chip version register */
        data = reg_read(client, MT9T031_CHIP_VERSION);
@@ -684,44 +696,64 @@ static int mt9t031_video_probe(struct soc_camera_device *icd)
                icd->num_formats = ARRAY_SIZE(mt9t031_colour_formats);
                break;
        default:
-               ret = -ENODEV;
-               dev_err(&icd->dev,
+               dev_err(&client->dev,
                        "No MT9T031 chip detected, register read %x\n", data);
-               goto ei2c;
+               return -ENODEV;
        }
 
-       dev_info(&icd->dev, "Detected a MT9T031 chip ID %x\n", data);
+       dev_info(&client->dev, "Detected a MT9T031 chip ID %x\n", data);
 
-       /* Now that we know the model, we can start video */
-       ret = soc_camera_video_start(icd);
-       if (ret)
-               goto evstart;
+       ret = mt9t031_idle(client);
+       if (ret < 0)
+               dev_err(&client->dev, "Failed to initialise the camera\n");
 
-       return 0;
+       /* mt9t031_idle() has reset the chip to default. */
+       mt9t031->exposure = 255;
+       mt9t031->gain = 64;
 
-evstart:
-ei2c:
        return ret;
 }
 
-static void mt9t031_video_remove(struct soc_camera_device *icd)
-{
-       struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
+       .g_ctrl         = mt9t031_g_ctrl,
+       .s_ctrl         = mt9t031_s_ctrl,
+       .g_chip_ident   = mt9t031_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .g_register     = mt9t031_g_register,
+       .s_register     = mt9t031_s_register,
+#endif
+};
 
-       dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9t031->client->addr,
-               icd->dev.parent, icd->vdev);
-       soc_camera_video_stop(icd);
-}
+static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
+       .s_stream       = mt9t031_s_stream,
+       .s_fmt          = mt9t031_s_fmt,
+       .g_fmt          = mt9t031_g_fmt,
+       .try_fmt        = mt9t031_try_fmt,
+       .s_crop         = mt9t031_s_crop,
+       .g_crop         = mt9t031_g_crop,
+       .cropcap        = mt9t031_cropcap,
+};
+
+static struct v4l2_subdev_ops mt9t031_subdev_ops = {
+       .core   = &mt9t031_subdev_core_ops,
+       .video  = &mt9t031_subdev_video_ops,
+};
 
 static int mt9t031_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9t031 *mt9t031;
-       struct soc_camera_device *icd;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct soc_camera_link *icl;
        int ret;
 
+       if (!icd) {
+               dev_err(&client->dev, "MT9T031: missing soc-camera data!\n");
+               return -EINVAL;
+       }
+
+       icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9T031 driver needs platform data\n");
                return -EINVAL;
@@ -737,23 +769,17 @@ static int mt9t031_probe(struct i2c_client *client,
        if (!mt9t031)
                return -ENOMEM;
 
-       mt9t031->client = client;
-       i2c_set_clientdata(client, mt9t031);
+       v4l2_i2c_subdev_init(&mt9t031->subdev, client, &mt9t031_subdev_ops);
 
        /* Second stage probe - when a capture adapter is there */
-       icd = &mt9t031->icd;
-       icd->ops        = &mt9t031_ops;
-       icd->control    = &client->dev;
-       icd->x_min      = MT9T031_COLUMN_SKIP;
-       icd->y_min      = MT9T031_ROW_SKIP;
-       icd->x_current  = icd->x_min;
-       icd->y_current  = icd->y_min;
-       icd->width_min  = MT9T031_MIN_WIDTH;
-       icd->width_max  = MT9T031_MAX_WIDTH;
-       icd->height_min = MT9T031_MIN_HEIGHT;
-       icd->height_max = MT9T031_MAX_HEIGHT;
-       icd->y_skip_top = 0;
-       icd->iface      = icl->bus_id;
+       icd->ops                = &mt9t031_ops;
+       icd->y_skip_top         = 0;
+
+       mt9t031->rect.left      = MT9T031_COLUMN_SKIP;
+       mt9t031->rect.top       = MT9T031_ROW_SKIP;
+       mt9t031->rect.width     = MT9T031_MAX_WIDTH;
+       mt9t031->rect.height    = MT9T031_MAX_HEIGHT;
+
        /* Simulated autoexposure. If enabled, we calculate shutter width
         * ourselves in the driver based on vertical blanking and frame width */
        mt9t031->autoexposure = 1;
@@ -761,24 +787,29 @@ static int mt9t031_probe(struct i2c_client *client,
        mt9t031->xskip = 1;
        mt9t031->yskip = 1;
 
-       ret = soc_camera_device_register(icd);
-       if (ret)
-               goto eisdr;
+       mt9t031_idle(client);
 
-       return 0;
+       ret = mt9t031_video_probe(client);
+
+       mt9t031_disable(client);
+
+       if (ret) {
+               icd->ops = NULL;
+               i2c_set_clientdata(client, NULL);
+               kfree(mt9t031);
+       }
 
-eisdr:
-       i2c_set_clientdata(client, NULL);
-       kfree(mt9t031);
        return ret;
 }
 
 static int mt9t031_remove(struct i2c_client *client)
 {
-       struct mt9t031 *mt9t031 = i2c_get_clientdata(client);
+       struct mt9t031 *mt9t031 = to_mt9t031(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
 
-       soc_camera_device_unregister(&mt9t031->icd);
+       icd->ops = NULL;
        i2c_set_clientdata(client, NULL);
+       client->driver = NULL;
        kfree(mt9t031);
 
        return 0;
index dbdcc86..995607f 100644 (file)
 #include <linux/delay.h>
 #include <linux/log2.h>
 
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
 /* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
- * The platform has to define i2c_board_info
- * and call i2c_register_board_info() */
+ * The platform has to define ctruct i2c_board_info objects and link to them
+ * from struct soc_camera_link */
 
 static char *sensor_type;
 module_param(sensor_type, charp, S_IRUGO);
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 #define MT9V022_PIXEL_OPERATION_MODE   0x0f
 #define MT9V022_LED_OUT_CONTROL                0x1b
 #define MT9V022_ADC_MODE_CONTROL       0x1c
-#define MT9V022_ANALOG_GAIN            0x34
+#define MT9V022_ANALOG_GAIN            0x35
 #define MT9V022_BLACK_LEVEL_CALIB_CTRL 0x47
 #define MT9V022_PIXCLK_FV_LV           0x74
 #define MT9V022_DIGITAL_TEST_PATTERN   0x7f
@@ -55,6 +55,13 @@ MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 /* Progressive scan, master, defaults */
 #define MT9V022_CHIP_CONTROL_DEFAULT   0x188
 
+#define MT9V022_MAX_WIDTH              752
+#define MT9V022_MAX_HEIGHT             480
+#define MT9V022_MIN_WIDTH              48
+#define MT9V022_MIN_HEIGHT             32
+#define MT9V022_COLUMN_SKIP            1
+#define MT9V022_ROW_SKIP               4
+
 static const struct soc_camera_data_format mt9v022_colour_formats[] = {
        /* Order important: first natively supported,
         * second supported with a GPIO extender */
@@ -85,12 +92,18 @@ static const struct soc_camera_data_format mt9v022_monochrome_formats[] = {
 };
 
 struct mt9v022 {
-       struct i2c_client *client;
-       struct soc_camera_device icd;
+       struct v4l2_subdev subdev;
+       struct v4l2_rect rect;  /* Sensor window */
+       __u32 fourcc;
        int model;      /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
        u16 chip_control;
 };
 
+static struct mt9v022 *to_mt9v022(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct mt9v022, subdev);
+}
+
 static int reg_read(struct i2c_client *client, const u8 reg)
 {
        s32 data = i2c_smbus_read_word_data(client, reg);
@@ -125,29 +138,11 @@ static int reg_clear(struct i2c_client *client, const u8 reg,
        return reg_write(client, reg, ret & ~data);
 }
 
-static int mt9v022_init(struct soc_camera_device *icd)
+static int mt9v022_init(struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
        int ret;
 
-       if (icl->power) {
-               ret = icl->power(&client->dev, 1);
-               if (ret < 0) {
-                       dev_err(icd->vdev->parent,
-                               "Platform failed to power-on the camera.\n");
-                       return ret;
-               }
-       }
-
-       /*
-        * The camera could have been already on, we hard-reset it additionally,
-        * if available. Soft reset is done in video_probe().
-        */
-       if (icl->reset)
-               icl->reset(&client->dev);
-
        /* Almost the default mode: master, parallel, simultaneous, and an
         * undocumented bit 0x200, which is present in table 7, but not in 8,
         * plus snapshot mode to disable scan for now */
@@ -160,6 +155,10 @@ static int mt9v022_init(struct soc_camera_device *icd)
        if (!ret)
                /* AEC, AGC on */
                ret = reg_set(client, MT9V022_AEC_AGC_ENABLE, 0x3);
+       if (!ret)
+               ret = reg_write(client, MT9V022_ANALOG_GAIN, 16);
+       if (!ret)
+               ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH, 480);
        if (!ret)
                ret = reg_write(client, MT9V022_MAX_TOTAL_SHUTTER_WIDTH, 480);
        if (!ret)
@@ -171,37 +170,19 @@ static int mt9v022_init(struct soc_camera_device *icd)
        return ret;
 }
 
-static int mt9v022_release(struct soc_camera_device *icd)
+static int mt9v022_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
-
-       if (icl->power)
-               icl->power(&mt9v022->client->dev, 0);
-
-       return 0;
-}
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
 
-static int mt9v022_start_capture(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       /* Switch to master "normal" mode */
-       mt9v022->chip_control &= ~0x10;
-       if (reg_write(client, MT9V022_CHIP_CONTROL,
-                     mt9v022->chip_control) < 0)
-               return -EIO;
-       return 0;
-}
+       if (enable)
+               /* Switch to master "normal" mode */
+               mt9v022->chip_control &= ~0x10;
+       else
+               /* Switch to snapshot mode */
+               mt9v022->chip_control |= 0x10;
 
-static int mt9v022_stop_capture(struct soc_camera_device *icd)
-{
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       /* Switch to snapshot mode */
-       mt9v022->chip_control |= 0x10;
-       if (reg_write(client, MT9V022_CHIP_CONTROL,
-                     mt9v022->chip_control) < 0)
+       if (reg_write(client, MT9V022_CHIP_CONTROL, mt9v022->chip_control) < 0)
                return -EIO;
        return 0;
 }
@@ -209,9 +190,9 @@ static int mt9v022_stop_capture(struct soc_camera_device *icd)
 static int mt9v022_set_bus_param(struct soc_camera_device *icd,
                                 unsigned long flags)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned int width_flag = flags & SOCAM_DATAWIDTH_MASK;
        int ret;
        u16 pixclk = 0;
@@ -255,7 +236,7 @@ static int mt9v022_set_bus_param(struct soc_camera_device *icd,
        if (ret < 0)
                return ret;
 
-       dev_dbg(&icd->dev, "Calculated pixclk 0x%x, chip control 0x%x\n",
+       dev_dbg(&client->dev, "Calculated pixclk 0x%x, chip control 0x%x\n",
                pixclk, mt9v022->chip_control);
 
        return 0;
@@ -263,8 +244,7 @@ static int mt9v022_set_bus_param(struct soc_camera_device *icd,
 
 static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
 {
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned int width_flag;
 
        if (icl->query_bus_param)
@@ -280,60 +260,121 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
                width_flag;
 }
 
-static int mt9v022_set_crop(struct soc_camera_device *icd,
-                           struct v4l2_rect *rect)
+static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+       struct v4l2_rect rect = a->c;
+       struct soc_camera_device *icd = client->dev.platform_data;
        int ret;
 
+       /* Bayer format - even size lengths */
+       if (mt9v022->fourcc == V4L2_PIX_FMT_SBGGR8 ||
+           mt9v022->fourcc == V4L2_PIX_FMT_SBGGR16) {
+               rect.width      = ALIGN(rect.width, 2);
+               rect.height     = ALIGN(rect.height, 2);
+               /* Let the user play with the starting pixel */
+       }
+
+       soc_camera_limit_side(&rect.left, &rect.width,
+                    MT9V022_COLUMN_SKIP, MT9V022_MIN_WIDTH, MT9V022_MAX_WIDTH);
+
+       soc_camera_limit_side(&rect.top, &rect.height,
+                    MT9V022_ROW_SKIP, MT9V022_MIN_HEIGHT, MT9V022_MAX_HEIGHT);
+
        /* Like in example app. Contradicts the datasheet though */
        ret = reg_read(client, MT9V022_AEC_AGC_ENABLE);
        if (ret >= 0) {
                if (ret & 1) /* Autoexposure */
                        ret = reg_write(client, MT9V022_MAX_TOTAL_SHUTTER_WIDTH,
-                                       rect->height + icd->y_skip_top + 43);
+                                       rect.height + icd->y_skip_top + 43);
                else
                        ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,
-                                       rect->height + icd->y_skip_top + 43);
+                                       rect.height + icd->y_skip_top + 43);
        }
        /* Setup frame format: defaults apart from width and height */
        if (!ret)
-               ret = reg_write(client, MT9V022_COLUMN_START, rect->left);
+               ret = reg_write(client, MT9V022_COLUMN_START, rect.left);
        if (!ret)
-               ret = reg_write(client, MT9V022_ROW_START, rect->top);
+               ret = reg_write(client, MT9V022_ROW_START, rect.top);
        if (!ret)
                /* Default 94, Phytec driver says:
                 * "width + horizontal blank >= 660" */
                ret = reg_write(client, MT9V022_HORIZONTAL_BLANKING,
-                               rect->width > 660 - 43 ? 43 :
-                               660 - rect->width);
+                               rect.width > 660 - 43 ? 43 :
+                               660 - rect.width);
        if (!ret)
                ret = reg_write(client, MT9V022_VERTICAL_BLANKING, 45);
        if (!ret)
-               ret = reg_write(client, MT9V022_WINDOW_WIDTH, rect->width);
+               ret = reg_write(client, MT9V022_WINDOW_WIDTH, rect.width);
        if (!ret)
                ret = reg_write(client, MT9V022_WINDOW_HEIGHT,
-                               rect->height + icd->y_skip_top);
+                               rect.height + icd->y_skip_top);
 
        if (ret < 0)
                return ret;
 
-       dev_dbg(&icd->dev, "Frame %ux%u pixel\n", rect->width, rect->height);
+       dev_dbg(&client->dev, "Frame %ux%u pixel\n", rect.width, rect.height);
+
+       mt9v022->rect = rect;
+
+       return 0;
+}
+
+static int mt9v022_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+
+       a->c    = mt9v022->rect;
+       a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
        return 0;
 }
 
-static int mt9v022_set_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9v022_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 {
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+       a->bounds.left                  = MT9V022_COLUMN_SKIP;
+       a->bounds.top                   = MT9V022_ROW_SKIP;
+       a->bounds.width                 = MT9V022_MAX_WIDTH;
+       a->bounds.height                = MT9V022_MAX_HEIGHT;
+       a->defrect                      = a->bounds;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
+
+       return 0;
+}
+
+static int mt9v022_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
        struct v4l2_pix_format *pix = &f->fmt.pix;
-       struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
-               .width  = pix->width,
-               .height = pix->height,
+
+       pix->width              = mt9v022->rect.width;
+       pix->height             = mt9v022->rect.height;
+       pix->pixelformat        = mt9v022->fourcc;
+       pix->field              = V4L2_FIELD_NONE;
+       pix->colorspace         = V4L2_COLORSPACE_SRGB;
+
+       return 0;
+}
+
+static int mt9v022_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+       struct v4l2_crop a = {
+               .c = {
+                       .left   = mt9v022->rect.left,
+                       .top    = mt9v022->rect.top,
+                       .width  = pix->width,
+                       .height = pix->height,
+               },
        };
+       int ret;
 
        /* The caller provides a supported format, as verified per call to
         * icd->try_fmt(), datawidth is from our supported format list */
@@ -356,30 +397,42 @@ static int mt9v022_set_fmt(struct soc_camera_device *icd,
        }
 
        /* No support for scaling on this camera, just crop. */
-       return mt9v022_set_crop(icd, &rect);
+       ret = mt9v022_s_crop(sd, &a);
+       if (!ret) {
+               pix->width = mt9v022->rect.width;
+               pix->height = mt9v022->rect.height;
+               mt9v022->fourcc = pix->pixelformat;
+       }
+
+       return ret;
 }
 
-static int mt9v022_try_fmt(struct soc_camera_device *icd,
-                          struct v4l2_format *f)
+static int mt9v022_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
+       struct i2c_client *client = sd->priv;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct v4l2_pix_format *pix = &f->fmt.pix;
+       int align = pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
+               pix->pixelformat == V4L2_PIX_FMT_SBGGR16;
 
-       v4l_bound_align_image(&pix->width, 48, 752, 2 /* ? */,
-                             &pix->height, 32 + icd->y_skip_top,
-                             480 + icd->y_skip_top, 0, 0);
+       v4l_bound_align_image(&pix->width, MT9V022_MIN_WIDTH,
+               MT9V022_MAX_WIDTH, align,
+               &pix->height, MT9V022_MIN_HEIGHT + icd->y_skip_top,
+               MT9V022_MAX_HEIGHT + icd->y_skip_top, align, 0);
 
        return 0;
 }
 
-static int mt9v022_get_chip_id(struct soc_camera_device *icd,
-                              struct v4l2_dbg_chip_ident *id)
+static int mt9v022_g_chip_ident(struct v4l2_subdev *sd,
+                               struct v4l2_dbg_chip_ident *id)
 {
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+       struct i2c_client *client = sd->priv;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
 
        if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
                return -EINVAL;
 
-       if (id->match.addr != mt9v022->client->addr)
+       if (id->match.addr != client->addr)
                return -ENODEV;
 
        id->ident       = mt9v022->model;
@@ -389,10 +442,10 @@ static int mt9v022_get_chip_id(struct soc_camera_device *icd,
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int mt9v022_get_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9v022_g_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -409,10 +462,10 @@ static int mt9v022_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int mt9v022_set_register(struct soc_camera_device *icd,
-                               struct v4l2_dbg_register *reg)
+static int mt9v022_s_register(struct v4l2_subdev *sd,
+                             struct v4l2_dbg_register *reg)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
 
        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                return -EINVAL;
@@ -481,41 +534,22 @@ static const struct v4l2_queryctrl mt9v022_controls[] = {
        }
 };
 
-static int mt9v022_video_probe(struct soc_camera_device *);
-static void mt9v022_video_remove(struct soc_camera_device *);
-static int mt9v022_get_control(struct soc_camera_device *, struct v4l2_control *);
-static int mt9v022_set_control(struct soc_camera_device *, struct v4l2_control *);
-
 static struct soc_camera_ops mt9v022_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = mt9v022_video_probe,
-       .remove                 = mt9v022_video_remove,
-       .init                   = mt9v022_init,
-       .release                = mt9v022_release,
-       .start_capture          = mt9v022_start_capture,
-       .stop_capture           = mt9v022_stop_capture,
-       .set_crop               = mt9v022_set_crop,
-       .set_fmt                = mt9v022_set_fmt,
-       .try_fmt                = mt9v022_try_fmt,
        .set_bus_param          = mt9v022_set_bus_param,
        .query_bus_param        = mt9v022_query_bus_param,
        .controls               = mt9v022_controls,
        .num_controls           = ARRAY_SIZE(mt9v022_controls),
-       .get_control            = mt9v022_get_control,
-       .set_control            = mt9v022_set_control,
-       .get_chip_id            = mt9v022_get_chip_id,
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = mt9v022_get_register,
-       .set_register           = mt9v022_set_register,
-#endif
 };
 
-static int mt9v022_get_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl)
+static int mt9v022_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
+       const struct v4l2_queryctrl *qctrl;
+       unsigned long range;
        int data;
 
+       qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id);
+
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
                data = reg_read(client, MT9V022_READ_MODE);
@@ -540,20 +574,36 @@ static int mt9v022_get_control(struct soc_camera_device *icd,
                if (data < 0)
                        return -EIO;
                ctrl->value = !!(data & 0x2);
+               break;
+       case V4L2_CID_GAIN:
+               data = reg_read(client, MT9V022_ANALOG_GAIN);
+               if (data < 0)
+                       return -EIO;
+
+               range = qctrl->maximum - qctrl->minimum;
+               ctrl->value = ((data - 16) * range + 24) / 48 + qctrl->minimum;
+
+               break;
+       case V4L2_CID_EXPOSURE:
+               data = reg_read(client, MT9V022_TOTAL_SHUTTER_WIDTH);
+               if (data < 0)
+                       return -EIO;
+
+               range = qctrl->maximum - qctrl->minimum;
+               ctrl->value = ((data - 1) * range + 239) / 479 + qctrl->minimum;
+
                break;
        }
        return 0;
 }
 
-static int mt9v022_set_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl)
+static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
        int data;
-       struct i2c_client *client = to_i2c_client(icd->control);
+       struct i2c_client *client = sd->priv;
        const struct v4l2_queryctrl *qctrl;
 
        qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id);
-
        if (!qctrl)
                return -EINVAL;
 
@@ -580,12 +630,9 @@ static int mt9v022_set_control(struct soc_camera_device *icd,
                        return -EINVAL;
                else {
                        unsigned long range = qctrl->maximum - qctrl->minimum;
-                       /* Datasheet says 16 to 64. autogain only works properly
-                        * after setting gain to maximum 14. Larger values
-                        * produce "white fly" noise effect. On the whole,
-                        * manually setting analog gain does no good. */
+                       /* Valid values 16 to 64, 32 to 64 must be even. */
                        unsigned long gain = ((ctrl->value - qctrl->minimum) *
-                                             10 + range / 2) / range + 4;
+                                             48 + range / 2) / range + 16;
                        if (gain >= 32)
                                gain &= ~1;
                        /* The user wants to set gain manually, hope, she
@@ -594,11 +641,10 @@ static int mt9v022_set_control(struct soc_camera_device *icd,
                        if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x2) < 0)
                                return -EIO;
 
-                       dev_info(&icd->dev, "Setting gain from %d to %lu\n",
-                                reg_read(client, MT9V022_ANALOG_GAIN), gain);
+                       dev_dbg(&client->dev, "Setting gain from %d to %lu\n",
+                               reg_read(client, MT9V022_ANALOG_GAIN), gain);
                        if (reg_write(client, MT9V022_ANALOG_GAIN, gain) < 0)
                                return -EIO;
-                       icd->gain = ctrl->value;
                }
                break;
        case V4L2_CID_EXPOSURE:
@@ -615,13 +661,12 @@ static int mt9v022_set_control(struct soc_camera_device *icd,
                        if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x1) < 0)
                                return -EIO;
 
-                       dev_dbg(&icd->dev, "Shutter width from %d to %lu\n",
+                       dev_dbg(&client->dev, "Shutter width from %d to %lu\n",
                                reg_read(client, MT9V022_TOTAL_SHUTTER_WIDTH),
                                shutter);
                        if (reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,
                                      shutter) < 0)
                                return -EIO;
-                       icd->exposure = ctrl->value;
                }
                break;
        case V4L2_CID_AUTOGAIN:
@@ -646,11 +691,11 @@ static int mt9v022_set_control(struct soc_camera_device *icd,
 
 /* Interface active, can use i2c. If it fails, it can indeed mean, that
  * this wasn't our capture interface, so, we wait for the right one */
-static int mt9v022_video_probe(struct soc_camera_device *icd)
+static int mt9v022_video_probe(struct soc_camera_device *icd,
+                              struct i2c_client *client)
 {
-       struct i2c_client *client = to_i2c_client(icd->control);
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        s32 data;
        int ret;
        unsigned long flags;
@@ -665,7 +710,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
        /* must be 0x1311 or 0x1313 */
        if (data != 0x1311 && data != 0x1313) {
                ret = -ENODEV;
-               dev_info(&icd->dev, "No MT9V022 detected, ID register 0x%x\n",
+               dev_info(&client->dev, "No MT9V022 found, ID register 0x%x\n",
                         data);
                goto ei2c;
        }
@@ -677,7 +722,9 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
        /* 15 clock cycles */
        udelay(200);
        if (reg_read(client, MT9V022_RESET)) {
-               dev_err(&icd->dev, "Resetting MT9V022 failed!\n");
+               dev_err(&client->dev, "Resetting MT9V022 failed!\n");
+               if (ret > 0)
+                       ret = -EIO;
                goto ei2c;
        }
 
@@ -694,7 +741,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
        }
 
        if (ret < 0)
-               goto eisis;
+               goto ei2c;
 
        icd->num_formats = 0;
 
@@ -716,42 +763,70 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
        if (flags & SOCAM_DATAWIDTH_8)
                icd->num_formats++;
 
-       ret = soc_camera_video_start(icd);
-       if (ret < 0)
-               goto eisis;
+       mt9v022->fourcc = icd->formats->fourcc;
 
-       dev_info(&icd->dev, "Detected a MT9V022 chip ID %x, %s sensor\n",
+       dev_info(&client->dev, "Detected a MT9V022 chip ID %x, %s sensor\n",
                 data, mt9v022->model == V4L2_IDENT_MT9V022IX7ATM ?
                 "monochrome" : "colour");
 
-       return 0;
+       ret = mt9v022_init(client);
+       if (ret < 0)
+               dev_err(&client->dev, "Failed to initialise the camera\n");
 
-eisis:
 ei2c:
        return ret;
 }
 
 static void mt9v022_video_remove(struct soc_camera_device *icd)
 {
-       struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
-       struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
 
-       dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9v022->client->addr,
+       dev_dbg(&icd->dev, "Video removed: %p, %p\n",
                icd->dev.parent, icd->vdev);
-       soc_camera_video_stop(icd);
        if (icl->free_bus)
                icl->free_bus(icl);
 }
 
+static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
+       .g_ctrl         = mt9v022_g_ctrl,
+       .s_ctrl         = mt9v022_s_ctrl,
+       .g_chip_ident   = mt9v022_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .g_register     = mt9v022_g_register,
+       .s_register     = mt9v022_s_register,
+#endif
+};
+
+static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
+       .s_stream       = mt9v022_s_stream,
+       .s_fmt          = mt9v022_s_fmt,
+       .g_fmt          = mt9v022_g_fmt,
+       .try_fmt        = mt9v022_try_fmt,
+       .s_crop         = mt9v022_s_crop,
+       .g_crop         = mt9v022_g_crop,
+       .cropcap        = mt9v022_cropcap,
+};
+
+static struct v4l2_subdev_ops mt9v022_subdev_ops = {
+       .core   = &mt9v022_subdev_core_ops,
+       .video  = &mt9v022_subdev_video_ops,
+};
+
 static int mt9v022_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9v022 *mt9v022;
-       struct soc_camera_device *icd;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-       struct soc_camera_link *icl = client->dev.platform_data;
+       struct soc_camera_link *icl;
        int ret;
 
+       if (!icd) {
+               dev_err(&client->dev, "MT9V022: missing soc-camera data!\n");
+               return -EINVAL;
+       }
+
+       icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9V022 driver needs platform data\n");
                return -EINVAL;
@@ -767,40 +842,41 @@ static int mt9v022_probe(struct i2c_client *client,
        if (!mt9v022)
                return -ENOMEM;
 
+       v4l2_i2c_subdev_init(&mt9v022->subdev, client, &mt9v022_subdev_ops);
+
        mt9v022->chip_control = MT9V022_CHIP_CONTROL_DEFAULT;
-       mt9v022->client = client;
-       i2c_set_clientdata(client, mt9v022);
-
-       icd = &mt9v022->icd;
-       icd->ops        = &mt9v022_ops;
-       icd->control    = &client->dev;
-       icd->x_min      = 1;
-       icd->y_min      = 4;
-       icd->x_current  = 1;
-       icd->y_current  = 4;
-       icd->width_min  = 48;
-       icd->width_max  = 752;
-       icd->height_min = 32;
-       icd->height_max = 480;
-       icd->y_skip_top = 1;
-       icd->iface      = icl->bus_id;
-
-       ret = soc_camera_device_register(icd);
-       if (ret)
-               goto eisdr;
 
-       return 0;
+       icd->ops                = &mt9v022_ops;
+       /*
+        * MT9V022 _really_ corrupts the first read out line.
+        * TODO: verify on i.MX31
+        */
+       icd->y_skip_top         = 1;
+
+       mt9v022->rect.left      = MT9V022_COLUMN_SKIP;
+       mt9v022->rect.top       = MT9V022_ROW_SKIP;
+       mt9v022->rect.width     = MT9V022_MAX_WIDTH;
+       mt9v022->rect.height    = MT9V022_MAX_HEIGHT;
+
+       ret = mt9v022_video_probe(icd, client);
+       if (ret) {
+               icd->ops = NULL;
+               i2c_set_clientdata(client, NULL);
+               kfree(mt9v022);
+       }
 
-eisdr:
-       kfree(mt9v022);
        return ret;
 }
 
 static int mt9v022_remove(struct i2c_client *client)
 {
-       struct mt9v022 *mt9v022 = i2c_get_clientdata(client);
+       struct mt9v022 *mt9v022 = to_mt9v022(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
 
-       soc_camera_device_unregister(&mt9v022->icd);
+       icd->ops = NULL;
+       mt9v022_video_remove(icd);
+       i2c_set_clientdata(client, NULL);
+       client->driver = NULL;
        kfree(mt9v022);
 
        return 0;
index 736c31d..5f37952 100644 (file)
@@ -126,7 +126,7 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
 {
        struct soc_camera_device *icd = vq->priv_data;
 
-       *size = icd->width * icd->height *
+       *size = icd->user_width * icd->user_height *
                ((icd->current_fmt->depth + 7) >> 3);
 
        if (!*count)
@@ -135,7 +135,7 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
        while (*size * *count > MAX_VIDEO_MEM * 1024 * 1024)
                (*count)--;
 
-       dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
+       dev_dbg(icd->dev.parent, "count=%d, size=%d\n", *count, *size);
 
        return 0;
 }
@@ -147,7 +147,7 @@ static void free_buffer(struct videobuf_queue *vq, struct mx1_buffer *buf)
 
        BUG_ON(in_interrupt());
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* This waits until this buffer is out of danger, i.e., until it is no
@@ -165,7 +165,7 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
        int ret;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* Added list head initialization on alloc */
@@ -178,12 +178,12 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
        buf->inwork = 1;
 
        if (buf->fmt    != icd->current_fmt ||
-           vb->width   != icd->width ||
-           vb->height  != icd->height ||
+           vb->width   != icd->user_width ||
+           vb->height  != icd->user_height ||
            vb->field   != field) {
                buf->fmt        = icd->current_fmt;
-               vb->width       = icd->width;
-               vb->height      = icd->height;
+               vb->width       = icd->user_width;
+               vb->height      = icd->user_height;
                vb->field       = field;
                vb->state       = VIDEOBUF_NEEDS_INIT;
        }
@@ -216,10 +216,11 @@ out:
 static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)
 {
        struct videobuf_buffer *vbuf = &pcdev->active->vb;
+       struct device *dev = pcdev->icd->dev.parent;
        int ret;
 
        if (unlikely(!pcdev->active)) {
-               dev_err(pcdev->soc_host.dev, "DMA End IRQ with no active buffer\n");
+               dev_err(dev, "DMA End IRQ with no active buffer\n");
                return -EFAULT;
        }
 
@@ -229,7 +230,7 @@ static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)
                vbuf->size, pcdev->res->start +
                CSIRXR, DMA_MODE_READ);
        if (unlikely(ret))
-               dev_err(pcdev->soc_host.dev, "Failed to setup DMA sg list\n");
+               dev_err(dev, "Failed to setup DMA sg list\n");
 
        return ret;
 }
@@ -243,7 +244,7 @@ static void mx1_videobuf_queue(struct videobuf_queue *vq,
        struct mx1_camera_dev *pcdev = ici->priv;
        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        list_add_tail(&vb->queue, &pcdev->capture);
@@ -270,22 +271,23 @@ static void mx1_videobuf_release(struct videobuf_queue *vq,
        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
 #ifdef DEBUG
        struct soc_camera_device *icd = vq->priv_data;
+       struct device *dev = icd->dev.parent;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        switch (vb->state) {
        case VIDEOBUF_ACTIVE:
-               dev_dbg(&icd->dev, "%s (active)\n", __func__);
+               dev_dbg(dev, "%s (active)\n", __func__);
                break;
        case VIDEOBUF_QUEUED:
-               dev_dbg(&icd->dev, "%s (queued)\n", __func__);
+               dev_dbg(dev, "%s (queued)\n", __func__);
                break;
        case VIDEOBUF_PREPARED:
-               dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
+               dev_dbg(dev, "%s (prepared)\n", __func__);
                break;
        default:
-               dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
+               dev_dbg(dev, "%s (unknown)\n", __func__);
                break;
        }
 #endif
@@ -325,6 +327,7 @@ static void mx1_camera_wakeup(struct mx1_camera_dev *pcdev,
 static void mx1_camera_dma_irq(int channel, void *data)
 {
        struct mx1_camera_dev *pcdev = data;
+       struct device *dev = pcdev->icd->dev.parent;
        struct mx1_buffer *buf;
        struct videobuf_buffer *vb;
        unsigned long flags;
@@ -334,14 +337,14 @@ static void mx1_camera_dma_irq(int channel, void *data)
        imx_dma_disable(channel);
 
        if (unlikely(!pcdev->active)) {
-               dev_err(pcdev->soc_host.dev, "DMA End IRQ with no active buffer\n");
+               dev_err(dev, "DMA End IRQ with no active buffer\n");
                goto out;
        }
 
        vb = &pcdev->active->vb;
        buf = container_of(vb, struct mx1_buffer, vb);
        WARN_ON(buf->inwork || list_empty(&vb->queue));
-       dev_dbg(pcdev->soc_host.dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        mx1_camera_wakeup(pcdev, vb, buf);
@@ -362,7 +365,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q,
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct mx1_camera_dev *pcdev = ici->priv;
 
-       videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, ici->dev,
+       videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->dev.parent,
                                        &pcdev->lock,
                                        V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                        V4L2_FIELD_NONE,
@@ -381,8 +384,9 @@ static int mclk_get_divisor(struct mx1_camera_dev *pcdev)
         * they get a nice Oops */
        div = (lcdclk + 2 * mclk - 1) / (2 * mclk) - 1;
 
-       dev_dbg(pcdev->soc_host.dev, "System clock %lukHz, target freq %dkHz, "
-               "divisor %lu\n", lcdclk / 1000, mclk / 1000, div);
+       dev_dbg(pcdev->icd->dev.parent,
+               "System clock %lukHz, target freq %dkHz, divisor %lu\n",
+               lcdclk / 1000, mclk / 1000, div);
 
        return div;
 }
@@ -391,7 +395,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
 {
        unsigned int csicr1 = CSICR1_EN;
 
-       dev_dbg(pcdev->soc_host.dev, "Activate device\n");
+       dev_dbg(pcdev->icd->dev.parent, "Activate device\n");
 
        clk_enable(pcdev->clk);
 
@@ -407,7 +411,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
 
 static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
 {
-       dev_dbg(pcdev->soc_host.dev, "Deactivate device\n");
+       dev_dbg(pcdev->icd->dev.parent, "Deactivate device\n");
 
        /* Disable all CSI interface */
        __raw_writel(0x00, pcdev->base + CSICR1);
@@ -428,14 +432,12 @@ static int mx1_camera_add_device(struct soc_camera_device *icd)
                goto ebusy;
        }
 
-       dev_info(&icd->dev, "MX1 Camera driver attached to camera %d\n",
+       dev_info(icd->dev.parent, "MX1 Camera driver attached to camera %d\n",
                 icd->devnum);
 
        mx1_camera_activate(pcdev);
-       ret = icd->ops->init(icd);
 
-       if (!ret)
-               pcdev->icd = icd;
+       pcdev->icd = icd;
 
 ebusy:
        return ret;
@@ -456,20 +458,20 @@ static void mx1_camera_remove_device(struct soc_camera_device *icd)
        /* Stop DMA engine */
        imx_dma_disable(pcdev->dma_chan);
 
-       dev_info(&icd->dev, "MX1 Camera driver detached from camera %d\n",
+       dev_info(icd->dev.parent, "MX1 Camera driver detached from camera %d\n",
                 icd->devnum);
 
-       icd->ops->release(icd);
-
        mx1_camera_deactivate(pcdev);
 
        pcdev->icd = NULL;
 }
 
 static int mx1_camera_set_crop(struct soc_camera_device *icd,
-                              struct v4l2_rect *rect)
+                              struct v4l2_crop *a)
 {
-       return icd->ops->set_crop(icd, rect);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+
+       return v4l2_subdev_call(sd, video, s_crop, a);
 }
 
 static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
@@ -539,18 +541,19 @@ static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 static int mx1_camera_set_fmt(struct soc_camera_device *icd,
                              struct v4l2_format *f)
 {
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        const struct soc_camera_format_xlate *xlate;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        int ret;
 
        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pix->pixelformat);
+               dev_warn(icd->dev.parent, "Format %x not found\n",
+                        pix->pixelformat);
                return -EINVAL;
        }
 
-       ret = icd->ops->set_fmt(icd, f);
+       ret = v4l2_subdev_call(sd, video, s_fmt, f);
        if (!ret) {
                icd->buswidth = xlate->buswidth;
                icd->current_fmt = xlate->host_fmt;
@@ -562,10 +565,11 @@ static int mx1_camera_set_fmt(struct soc_camera_device *icd,
 static int mx1_camera_try_fmt(struct soc_camera_device *icd,
                              struct v4l2_format *f)
 {
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        /* TODO: limit to mx1 hardware capabilities */
 
        /* limit to sensor capabilities */
-       return icd->ops->try_fmt(icd, f);
+       return v4l2_subdev_call(sd, video, try_fmt, f);
 }
 
 static int mx1_camera_reqbufs(struct soc_camera_file *icf,
@@ -737,7 +741,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
        pcdev->soc_host.drv_name        = DRIVER_NAME;
        pcdev->soc_host.ops             = &mx1_soc_camera_host_ops;
        pcdev->soc_host.priv            = pcdev;
-       pcdev->soc_host.dev             = &pdev->dev;
+       pcdev->soc_host.v4l2_dev.dev    = &pdev->dev;
        pcdev->soc_host.nr              = pdev->id;
        err = soc_camera_host_register(&pcdev->soc_host);
        if (err)
index 9770cb7..dff2e5e 100644 (file)
@@ -178,7 +178,7 @@ static void free_buffer(struct videobuf_queue *vq, struct mx3_camera_buffer *buf
 
        BUG_ON(in_interrupt());
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /*
@@ -220,7 +220,7 @@ static int mx3_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
        if (!mx3_cam->idmac_channel[0])
                return -EINVAL;
 
-       *size = icd->width * icd->height * bpp;
+       *size = icd->user_width * icd->user_height * bpp;
 
        if (!*count)
                *count = 32;
@@ -241,7 +241,7 @@ static int mx3_videobuf_prepare(struct videobuf_queue *vq,
        struct mx3_camera_buffer *buf =
                container_of(vb, struct mx3_camera_buffer, vb);
        /* current_fmt _must_ always be set */
-       size_t new_size = icd->width * icd->height *
+       size_t new_size = icd->user_width * icd->user_height *
                ((icd->current_fmt->depth + 7) >> 3);
        int ret;
 
@@ -251,12 +251,12 @@ static int mx3_videobuf_prepare(struct videobuf_queue *vq,
         */
 
        if (buf->fmt    != icd->current_fmt ||
-           vb->width   != icd->width ||
-           vb->height  != icd->height ||
+           vb->width   != icd->user_width ||
+           vb->height  != icd->user_height ||
            vb->field   != field) {
                buf->fmt        = icd->current_fmt;
-               vb->width       = icd->width;
-               vb->height      = icd->height;
+               vb->width       = icd->user_width;
+               vb->height      = icd->user_height;
                vb->field       = field;
                if (vb->state != VIDEOBUF_NEEDS_INIT)
                        free_buffer(vq, buf);
@@ -354,9 +354,9 @@ static void mx3_videobuf_queue(struct videobuf_queue *vq,
 
        /* This is the configuration of one sg-element */
        video->out_pixel_fmt    = fourcc_to_ipu_pix(data_fmt->fourcc);
-       video->out_width        = icd->width;
-       video->out_height       = icd->height;
-       video->out_stride       = icd->width;
+       video->out_width        = icd->user_width;
+       video->out_height       = icd->user_height;
+       video->out_stride       = icd->user_width;
 
 #ifdef DEBUG
        /* helps to see what DMA actually has written */
@@ -375,7 +375,8 @@ static void mx3_videobuf_queue(struct videobuf_queue *vq,
        spin_unlock_irq(&mx3_cam->lock);
 
        cookie = txd->tx_submit(txd);
-       dev_dbg(&icd->dev, "Submitted cookie %d DMA 0x%08x\n", cookie, sg_dma_address(&buf->sg));
+       dev_dbg(icd->dev.parent, "Submitted cookie %d DMA 0x%08x\n",
+               cookie, sg_dma_address(&buf->sg));
 
        spin_lock_irq(&mx3_cam->lock);
 
@@ -402,9 +403,10 @@ static void mx3_videobuf_release(struct videobuf_queue *vq,
                container_of(vb, struct mx3_camera_buffer, vb);
        unsigned long flags;
 
-       dev_dbg(&icd->dev, "Release%s DMA 0x%08x (state %d), queue %sempty\n",
+       dev_dbg(icd->dev.parent,
+               "Release%s DMA 0x%08x (state %d), queue %sempty\n",
                mx3_cam->active == buf ? " active" : "", sg_dma_address(&buf->sg),
-                vb->state, list_empty(&vb->queue) ? "" : "not ");
+               vb->state, list_empty(&vb->queue) ? "" : "not ");
        spin_lock_irqsave(&mx3_cam->lock, flags);
        if ((vb->state == VIDEOBUF_ACTIVE || vb->state == VIDEOBUF_QUEUED) &&
            !list_empty(&vb->queue)) {
@@ -431,7 +433,7 @@ static void mx3_camera_init_videobuf(struct videobuf_queue *q,
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
 
-       videobuf_queue_dma_contig_init(q, &mx3_videobuf_ops, ici->dev,
+       videobuf_queue_dma_contig_init(q, &mx3_videobuf_ops, icd->dev.parent,
                                       &mx3_cam->lock,
                                       V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                       V4L2_FIELD_NONE,
@@ -484,7 +486,7 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam,
 
        clk_enable(mx3_cam->clk);
        rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);
-       dev_dbg(&icd->dev, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
+       dev_dbg(icd->dev.parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
        if (rate)
                clk_set_rate(mx3_cam->clk, rate);
 }
@@ -494,29 +496,18 @@ static int mx3_camera_add_device(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-       int ret;
 
-       if (mx3_cam->icd) {
-               ret = -EBUSY;
-               goto ebusy;
-       }
+       if (mx3_cam->icd)
+               return -EBUSY;
 
        mx3_camera_activate(mx3_cam, icd);
-       ret = icd->ops->init(icd);
-       if (ret < 0) {
-               clk_disable(mx3_cam->clk);
-               goto einit;
-       }
 
        mx3_cam->icd = icd;
 
-einit:
-ebusy:
-       if (!ret)
-               dev_info(&icd->dev, "MX3 Camera driver attached to camera %d\n",
-                        icd->devnum);
+       dev_info(icd->dev.parent, "MX3 Camera driver attached to camera %d\n",
+                icd->devnum);
 
-       return ret;
+       return 0;
 }
 
 /* Called with .video_lock held */
@@ -533,13 +524,11 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
                *ichan = NULL;
        }
 
-       icd->ops->release(icd);
-
        clk_disable(mx3_cam->clk);
 
        mx3_cam->icd = NULL;
 
-       dev_info(&icd->dev, "MX3 Camera driver detached from camera %d\n",
+       dev_info(icd->dev.parent, "MX3 Camera driver detached from camera %d\n",
                 icd->devnum);
 }
 
@@ -551,7 +540,8 @@ static bool channel_change_requested(struct soc_camera_device *icd,
        struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
 
        /* Do buffers have to be re-allocated or channel re-configured? */
-       return ichan && rect->width * rect->height > icd->width * icd->height;
+       return ichan && rect->width * rect->height >
+               icd->user_width * icd->user_height;
 }
 
 static int test_platform_param(struct mx3_camera_dev *mx3_cam,
@@ -599,8 +589,8 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
                *flags |= SOCAM_DATAWIDTH_4;
                break;
        default:
-               dev_info(mx3_cam->soc_host.dev, "Unsupported bus width %d\n",
-                        buswidth);
+               dev_warn(mx3_cam->soc_host.v4l2_dev.dev,
+                        "Unsupported bus width %d\n", buswidth);
                return -EINVAL;
        }
 
@@ -615,7 +605,7 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
        unsigned long bus_flags, camera_flags;
        int ret = test_platform_param(mx3_cam, depth, &bus_flags);
 
-       dev_dbg(ici->dev, "requested bus width %d bit: %d\n", depth, ret);
+       dev_dbg(icd->dev.parent, "request bus width %d bit: %d\n", depth, ret);
 
        if (ret < 0)
                return ret;
@@ -624,7 +614,8 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
 
        ret = soc_camera_bus_param_compatible(camera_flags, bus_flags);
        if (ret < 0)
-               dev_warn(&icd->dev, "Flags incompatible: camera %lx, host %lx\n",
+               dev_warn(icd->dev.parent,
+                        "Flags incompatible: camera %lx, host %lx\n",
                         camera_flags, bus_flags);
 
        return ret;
@@ -638,7 +629,7 @@ static bool chan_filter(struct dma_chan *chan, void *arg)
        if (!rq)
                return false;
 
-       pdata = rq->mx3_cam->soc_host.dev->platform_data;
+       pdata = rq->mx3_cam->soc_host.v4l2_dev.dev->platform_data;
 
        return rq->id == chan->chan_id &&
                pdata->dma_dev == chan->device->dev;
@@ -698,7 +689,8 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = buswidth;
                        xlate++;
-                       dev_dbg(ici->dev, "Providing format %s using %s\n",
+                       dev_dbg(icd->dev.parent,
+                               "Providing format %s using %s\n",
                                mx3_camera_formats[0].name,
                                icd->formats[idx].name);
                }
@@ -710,7 +702,8 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = buswidth;
                        xlate++;
-                       dev_dbg(ici->dev, "Providing format %s using %s\n",
+                       dev_dbg(icd->dev.parent,
+                               "Providing format %s using %s\n",
                                mx3_camera_formats[0].name,
                                icd->formats[idx].name);
                }
@@ -723,7 +716,7 @@ passthrough:
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = buswidth;
                        xlate++;
-                       dev_dbg(ici->dev,
+                       dev_dbg(icd->dev.parent,
                                "Providing format %s in pass-through mode\n",
                                icd->formats[idx].name);
                }
@@ -733,13 +726,13 @@ passthrough:
 }
 
 static void configure_geometry(struct mx3_camera_dev *mx3_cam,
-                              struct v4l2_rect *rect)
+                              unsigned int width, unsigned int height)
 {
        u32 ctrl, width_field, height_field;
 
        /* Setup frame size - this cannot be changed on-the-fly... */
-       width_field = rect->width - 1;
-       height_field = rect->height - 1;
+       width_field = width - 1;
+       height_field = height - 1;
        csi_reg_write(mx3_cam, width_field | (height_field << 16), CSI_SENS_FRM_SIZE);
 
        csi_reg_write(mx3_cam, width_field << 16, CSI_FLASH_STROBE_1);
@@ -751,11 +744,6 @@ static void configure_geometry(struct mx3_camera_dev *mx3_cam,
        ctrl = csi_reg_read(mx3_cam, CSI_OUT_FRM_CTRL) & 0xffff0000;
        /* Sensor does the cropping */
        csi_reg_write(mx3_cam, ctrl | 0 | (0 << 8), CSI_OUT_FRM_CTRL);
-
-       /*
-        * No need to free resources here if we fail, we'll see if we need to
-        * do this next time we are called
-        */
 }
 
 static int acquire_dma_channel(struct mx3_camera_dev *mx3_cam)
@@ -792,25 +780,74 @@ static int acquire_dma_channel(struct mx3_camera_dev *mx3_cam)
        return 0;
 }
 
+/*
+ * FIXME: learn to use stride != width, then we can keep stride properly aligned
+ * and support arbitrary (even) widths.
+ */
+static inline void stride_align(__s32 *width)
+{
+       if (((*width + 7) &  ~7) < 4096)
+               *width = (*width + 7) &  ~7;
+       else
+               *width = *width &  ~7;
+}
+
+/*
+ * As long as we don't implement host-side cropping and scaling, we can use
+ * default g_crop and cropcap from soc_camera.c
+ */
 static int mx3_camera_set_crop(struct soc_camera_device *icd,
-                              struct v4l2_rect *rect)
+                              struct v4l2_crop *a)
 {
+       struct v4l2_rect *rect = &a->c;
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct v4l2_format f = {.type = V4L2_BUF_TYPE_VIDEO_CAPTURE};
+       struct v4l2_pix_format *pix = &f.fmt.pix;
+       int ret;
 
-       /*
-        * We now know pixel formats and can decide upon DMA-channel(s)
-        * So far only direct camera-to-memory is supported
-        */
-       if (channel_change_requested(icd, rect)) {
-               int ret = acquire_dma_channel(mx3_cam);
+       soc_camera_limit_side(&rect->left, &rect->width, 0, 2, 4096);
+       soc_camera_limit_side(&rect->top, &rect->height, 0, 2, 4096);
+
+       ret = v4l2_subdev_call(sd, video, s_crop, a);
+       if (ret < 0)
+               return ret;
+
+       /* The capture device might have changed its output  */
+       ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+       if (ret < 0)
+               return ret;
+
+       if (pix->width & 7) {
+               /* Ouch! We can only handle 8-byte aligned width... */
+               stride_align(&pix->width);
+               ret = v4l2_subdev_call(sd, video, s_fmt, &f);
                if (ret < 0)
                        return ret;
        }
 
-       configure_geometry(mx3_cam, rect);
+       if (pix->width != icd->user_width || pix->height != icd->user_height) {
+               /*
+                * We now know pixel formats and can decide upon DMA-channel(s)
+                * So far only direct camera-to-memory is supported
+                */
+               if (channel_change_requested(icd, rect)) {
+                       int ret = acquire_dma_channel(mx3_cam);
+                       if (ret < 0)
+                               return ret;
+               }
+
+               configure_geometry(mx3_cam, pix->width, pix->height);
+       }
+
+       dev_dbg(icd->dev.parent, "Sensor cropped %dx%d\n",
+               pix->width, pix->height);
 
-       return icd->ops->set_crop(icd, rect);
+       icd->user_width = pix->width;
+       icd->user_height = pix->height;
+
+       return ret;
 }
 
 static int mx3_camera_set_fmt(struct soc_camera_device *icd,
@@ -818,22 +855,21 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        const struct soc_camera_format_xlate *xlate;
        struct v4l2_pix_format *pix = &f->fmt.pix;
-       struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
-               .width  = pix->width,
-               .height = pix->height,
-       };
        int ret;
 
        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pix->pixelformat);
+               dev_warn(icd->dev.parent, "Format %x not found\n",
+                        pix->pixelformat);
                return -EINVAL;
        }
 
+       stride_align(&pix->width);
+       dev_dbg(icd->dev.parent, "Set format %dx%d\n", pix->width, pix->height);
+
        ret = acquire_dma_channel(mx3_cam);
        if (ret < 0)
                return ret;
@@ -844,21 +880,23 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
         * mxc_v4l2_s_fmt()
         */
 
-       configure_geometry(mx3_cam, &rect);
+       configure_geometry(mx3_cam, pix->width, pix->height);
 
-       ret = icd->ops->set_fmt(icd, f);
+       ret = v4l2_subdev_call(sd, video, s_fmt, f);
        if (!ret) {
                icd->buswidth = xlate->buswidth;
                icd->current_fmt = xlate->host_fmt;
        }
 
+       dev_dbg(icd->dev.parent, "Sensor set %dx%d\n", pix->width, pix->height);
+
        return ret;
 }
 
 static int mx3_camera_try_fmt(struct soc_camera_device *icd,
                              struct v4l2_format *f)
 {
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        const struct soc_camera_format_xlate *xlate;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        __u32 pixfmt = pix->pixelformat;
@@ -867,7 +905,7 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
 
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (pixfmt && !xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+               dev_warn(icd->dev.parent, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
 
@@ -884,7 +922,7 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
        /* camera has to see its format, but the user the original one */
        pix->pixelformat = xlate->cam_fmt->fourcc;
        /* limit to sensor capabilities */
-       ret = icd->ops->try_fmt(icd, f);
+       ret = v4l2_subdev_call(sd, video, try_fmt, f);
        pix->pixelformat = xlate->host_fmt->fourcc;
 
        field = pix->field;
@@ -892,7 +930,7 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
        if (field == V4L2_FIELD_ANY) {
                pix->field = V4L2_FIELD_NONE;
        } else if (field != V4L2_FIELD_NONE) {
-               dev_err(&icd->dev, "Field type %d unsupported.\n", field);
+               dev_err(icd->dev.parent, "Field type %d unsupported.\n", field);
                return -EINVAL;
        }
 
@@ -931,14 +969,15 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        u32 dw, sens_conf;
        int ret = test_platform_param(mx3_cam, icd->buswidth, &bus_flags);
        const struct soc_camera_format_xlate *xlate;
+       struct device *dev = icd->dev.parent;
 
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+               dev_warn(dev, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
 
-       dev_dbg(ici->dev, "requested bus width %d bit: %d\n",
+       dev_dbg(dev, "requested bus width %d bit: %d\n",
                icd->buswidth, ret);
 
        if (ret < 0)
@@ -947,9 +986,10 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        camera_flags = icd->ops->query_bus_param(icd);
 
        common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+       dev_dbg(dev, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n",
+               camera_flags, bus_flags, common_flags);
        if (!common_flags) {
-               dev_dbg(ici->dev, "no common flags: camera %lx, host %lx\n",
-                       camera_flags, bus_flags);
+               dev_dbg(dev, "no common flags");
                return -EINVAL;
        }
 
@@ -1002,8 +1042,11 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
                        SOCAM_DATAWIDTH_4;
 
        ret = icd->ops->set_bus_param(icd, common_flags);
-       if (ret < 0)
+       if (ret < 0) {
+               dev_dbg(dev, "camera set_bus_param(%lx) returned %d\n",
+                       common_flags, ret);
                return ret;
+       }
 
        /*
         * So far only gated clock mode is supported. Add a line
@@ -1055,7 +1098,7 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 
        csi_reg_write(mx3_cam, sens_conf | dw, CSI_SENS_CONF);
 
-       dev_dbg(ici->dev, "Set SENS_CONF to %x\n", sens_conf | dw);
+       dev_dbg(dev, "Set SENS_CONF to %x\n", sens_conf | dw);
 
        return 0;
 }
@@ -1127,8 +1170,9 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&mx3_cam->capture);
        spin_lock_init(&mx3_cam->lock);
 
-       base = ioremap(res->start, res->end - res->start + 1);
+       base = ioremap(res->start, resource_size(res));
        if (!base) {
+               pr_err("Couldn't map %x@%x\n", resource_size(res), res->start);
                err = -ENOMEM;
                goto eioremap;
        }
@@ -1139,7 +1183,7 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
        soc_host->drv_name      = MX3_CAM_DRV_NAME;
        soc_host->ops           = &mx3_soc_camera_host_ops;
        soc_host->priv          = mx3_cam;
-       soc_host->dev           = &pdev->dev;
+       soc_host->v4l2_dev.dev  = &pdev->dev;
        soc_host->nr            = pdev->id;
 
        err = soc_camera_host_register(soc_host);
@@ -1215,3 +1259,4 @@ module_exit(mx3_camera_exit);
 MODULE_DESCRIPTION("i.MX3x SoC Camera Host driver");
 MODULE_AUTHOR("Guennadi Liakhovetski <lg@denx.de>");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" MX3_CAM_DRV_NAME);
index 35890e8..3454070 100644 (file)
@@ -186,19 +186,19 @@ static int mxb_probe(struct saa7146_dev *dev)
        }
 
        mxb->saa7111a = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "saa7115", "saa7111", I2C_SAA7111A);
+                       "saa7115", "saa7111", I2C_SAA7111A, NULL);
        mxb->tea6420_1 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "tea6420", "tea6420", I2C_TEA6420_1);
+                       "tea6420", "tea6420", I2C_TEA6420_1, NULL);
        mxb->tea6420_2 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "tea6420", "tea6420", I2C_TEA6420_2);
+                       "tea6420", "tea6420", I2C_TEA6420_2, NULL);
        mxb->tea6415c = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "tea6415c", "tea6415c", I2C_TEA6415C);
+                       "tea6415c", "tea6415c", I2C_TEA6415C, NULL);
        mxb->tda9840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "tda9840", "tda9840", I2C_TDA9840);
+                       "tda9840", "tda9840", I2C_TDA9840, NULL);
        mxb->tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "tuner", "tuner", I2C_TUNER);
+                       "tuner", "tuner", I2C_TUNER, NULL);
        if (v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
-                       "saa5246a", "saa5246a", I2C_SAA5246A)) {
+                       "saa5246a", "saa5246a", I2C_SAA5246A, NULL)) {
                printk(KERN_INFO "mxb: found teletext decoder\n");
        }
 
index 0bce255..eccb40a 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
 #include <media/ov772x.h>
 
@@ -382,11 +382,10 @@ struct regval_list {
 };
 
 struct ov772x_color_format {
-       char                     *name;
-       __u32                     fourcc;
-       u8                        dsp3;
-       u8                        com3;
-       u8                        com7;
+       const struct soc_camera_data_format *format;
+       u8 dsp3;
+       u8 com3;
+       u8 com7;
 };
 
 struct ov772x_win_size {
@@ -398,14 +397,15 @@ struct ov772x_win_size {
 };
 
 struct ov772x_priv {
+       struct v4l2_subdev                subdev;
        struct ov772x_camera_info        *info;
-       struct i2c_client                *client;
-       struct soc_camera_device          icd;
        const struct ov772x_color_format *fmt;
        const struct ov772x_win_size     *win;
        int                               model;
-       unsigned int                      flag_vflip:1;
-       unsigned int                      flag_hflip:1;
+       unsigned short                    flag_vflip:1;
+       unsigned short                    flag_hflip:1;
+       /* band_filter = COM8[5] ? 256 - BDBASE : 0 */
+       unsigned short                    band_filter;
 };
 
 #define ENDMARKER { 0xff, 0xff }
@@ -481,43 +481,43 @@ static const struct soc_camera_data_format ov772x_fmt_lists[] = {
  */
 static const struct ov772x_color_format ov772x_cfmts[] = {
        {
-               SETFOURCC(YUYV),
+               .format = &ov772x_fmt_lists[0],
                .dsp3   = 0x0,
                .com3   = SWAP_YUV,
                .com7   = OFMT_YUV,
        },
        {
-               SETFOURCC(YVYU),
+               .format = &ov772x_fmt_lists[1],
                .dsp3   = UV_ON,
                .com3   = SWAP_YUV,
                .com7   = OFMT_YUV,
        },
        {
-               SETFOURCC(UYVY),
+               .format = &ov772x_fmt_lists[2],
                .dsp3   = 0x0,
                .com3   = 0x0,
                .com7   = OFMT_YUV,
        },
        {
-               SETFOURCC(RGB555),
+               .format = &ov772x_fmt_lists[3],
                .dsp3   = 0x0,
                .com3   = SWAP_RGB,
                .com7   = FMT_RGB555 | OFMT_RGB,
        },
        {
-               SETFOURCC(RGB555X),
+               .format = &ov772x_fmt_lists[4],
                .dsp3   = 0x0,
                .com3   = 0x0,
                .com7   = FMT_RGB555 | OFMT_RGB,
        },
        {
-               SETFOURCC(RGB565),
+               .format = &ov772x_fmt_lists[5],
                .dsp3   = 0x0,
                .com3   = SWAP_RGB,
                .com7   = FMT_RGB565 | OFMT_RGB,
        },
        {
-               SETFOURCC(RGB565X),
+               .format = &ov772x_fmt_lists[6],
                .dsp3   = 0x0,
                .com3   = 0x0,
                .com7   = FMT_RGB565 | OFMT_RGB,
@@ -570,6 +570,15 @@ static const struct v4l2_queryctrl ov772x_controls[] = {
                .step           = 1,
                .default_value  = 0,
        },
+       {
+               .id             = V4L2_CID_BAND_STOP_FILTER,
+               .type           = V4L2_CTRL_TYPE_INTEGER,
+               .name           = "Band-stop filter",
+               .minimum        = 0,
+               .maximum        = 256,
+               .step           = 1,
+               .default_value  = 0,
+       },
 };
 
 
@@ -577,6 +586,12 @@ static const struct v4l2_queryctrl ov772x_controls[] = {
  * general function
  */
 
+static struct ov772x_priv *to_ov772x(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct ov772x_priv,
+                           subdev);
+}
+
 static int ov772x_write_array(struct i2c_client        *client,
                              const struct regval_list *vals)
 {
@@ -617,58 +632,29 @@ static int ov772x_reset(struct i2c_client *client)
  * soc_camera_ops function
  */
 
-static int ov772x_init(struct soc_camera_device *icd)
+static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-       int ret = 0;
+       struct i2c_client *client = sd->priv;
+       struct ov772x_priv *priv = to_ov772x(client);
 
-       if (priv->info->link.power) {
-               ret = priv->info->link.power(&priv->client->dev, 1);
-               if (ret < 0)
-                       return ret;
+       if (!enable) {
+               ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, SOFT_SLEEP_MODE);
+               return 0;
        }
 
-       if (priv->info->link.reset)
-               ret = priv->info->link.reset(&priv->client->dev);
-
-       return ret;
-}
-
-static int ov772x_release(struct soc_camera_device *icd)
-{
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-       int ret = 0;
-
-       if (priv->info->link.power)
-               ret = priv->info->link.power(&priv->client->dev, 0);
-
-       return ret;
-}
-
-static int ov772x_start_capture(struct soc_camera_device *icd)
-{
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-
        if (!priv->win || !priv->fmt) {
-               dev_err(&icd->dev, "norm or win select error\n");
+               dev_err(&client->dev, "norm or win select error\n");
                return -EPERM;
        }
 
-       ov772x_mask_set(priv->client, COM2, SOFT_SLEEP_MODE, 0);
+       ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, 0);
 
-       dev_dbg(&icd->dev,
-                "format %s, win %s\n", priv->fmt->name, priv->win->name);
+       dev_dbg(&client->dev, "format %s, win %s\n",
+               priv->fmt->format->name, priv->win->name);
 
        return 0;
 }
 
-static int ov772x_stop_capture(struct soc_camera_device *icd)
-{
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-       ov772x_mask_set(priv->client, COM2, SOFT_SLEEP_MODE, SOFT_SLEEP_MODE);
-       return 0;
-}
-
 static int ov772x_set_bus_param(struct soc_camera_device *icd,
                                unsigned long             flags)
 {
@@ -677,8 +663,9 @@ static int ov772x_set_bus_param(struct soc_camera_device *icd,
 
 static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-       struct soc_camera_link *icl = &priv->info->link;
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct ov772x_priv *priv = i2c_get_clientdata(client);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
                SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
@@ -686,10 +673,10 @@ static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
        return soc_camera_apply_sensor_flags(icl, flags);
 }
 
-static int ov772x_get_control(struct soc_camera_device *icd,
-                             struct v4l2_control *ctrl)
+static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct i2c_client *client = sd->priv;
+       struct ov772x_priv *priv = to_ov772x(client);
 
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
@@ -698,14 +685,17 @@ static int ov772x_get_control(struct soc_camera_device *icd,
        case V4L2_CID_HFLIP:
                ctrl->value = priv->flag_hflip;
                break;
+       case V4L2_CID_BAND_STOP_FILTER:
+               ctrl->value = priv->band_filter;
+               break;
        }
        return 0;
 }
 
-static int ov772x_set_control(struct soc_camera_device *icd,
-                             struct v4l2_control *ctrl)
+static int ov772x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct i2c_client *client = sd->priv;
+       struct ov772x_priv *priv = to_ov772x(client);
        int ret = 0;
        u8 val;
 
@@ -715,24 +705,48 @@ static int ov772x_set_control(struct soc_camera_device *icd,
                priv->flag_vflip = ctrl->value;
                if (priv->info->flags & OV772X_FLAG_VFLIP)
                        val ^= VFLIP_IMG;
-               ret = ov772x_mask_set(priv->client, COM3, VFLIP_IMG, val);
+               ret = ov772x_mask_set(client, COM3, VFLIP_IMG, val);
                break;
        case V4L2_CID_HFLIP:
                val = ctrl->value ? HFLIP_IMG : 0x00;
                priv->flag_hflip = ctrl->value;
                if (priv->info->flags & OV772X_FLAG_HFLIP)
                        val ^= HFLIP_IMG;
-               ret = ov772x_mask_set(priv->client, COM3, HFLIP_IMG, val);
+               ret = ov772x_mask_set(client, COM3, HFLIP_IMG, val);
+               break;
+       case V4L2_CID_BAND_STOP_FILTER:
+               if ((unsigned)ctrl->value > 256)
+                       ctrl->value = 256;
+               if (ctrl->value == priv->band_filter)
+                       break;
+               if (!ctrl->value) {
+                       /* Switch the filter off, it is on now */
+                       ret = ov772x_mask_set(client, BDBASE, 0xff, 0xff);
+                       if (!ret)
+                               ret = ov772x_mask_set(client, COM8,
+                                                     BNDF_ON_OFF, 0);
+               } else {
+                       /* Switch the filter on, set AEC low limit */
+                       val = 256 - ctrl->value;
+                       ret = ov772x_mask_set(client, COM8,
+                                             BNDF_ON_OFF, BNDF_ON_OFF);
+                       if (!ret)
+                               ret = ov772x_mask_set(client, BDBASE,
+                                                     0xff, val);
+               }
+               if (!ret)
+                       priv->band_filter = ctrl->value;
                break;
        }
 
        return ret;
 }
 
-static int ov772x_get_chip_id(struct soc_camera_device *icd,
-                             struct v4l2_dbg_chip_ident   *id)
+static int ov772x_g_chip_ident(struct v4l2_subdev *sd,
+                              struct v4l2_dbg_chip_ident *id)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct i2c_client *client = sd->priv;
+       struct ov772x_priv *priv = to_ov772x(client);
 
        id->ident    = priv->model;
        id->revision = 0;
@@ -741,17 +755,17 @@ static int ov772x_get_chip_id(struct soc_camera_device *icd,
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int ov772x_get_register(struct soc_camera_device *icd,
-                              struct v4l2_dbg_register *reg)
+static int ov772x_g_register(struct v4l2_subdev *sd,
+                            struct v4l2_dbg_register *reg)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-       int                 ret;
+       struct i2c_client *client = sd->priv;
+       int ret;
 
        reg->size = 1;
        if (reg->reg > 0xff)
                return -EINVAL;
 
-       ret = i2c_smbus_read_byte_data(priv->client, reg->reg);
+       ret = i2c_smbus_read_byte_data(client, reg->reg);
        if (ret < 0)
                return ret;
 
@@ -760,21 +774,20 @@ static int ov772x_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int ov772x_set_register(struct soc_camera_device *icd,
-                              struct v4l2_dbg_register *reg)
+static int ov772x_s_register(struct v4l2_subdev *sd,
+                            struct v4l2_dbg_register *reg)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct i2c_client *client = sd->priv;
 
        if (reg->reg > 0xff ||
            reg->val > 0xff)
                return -EINVAL;
 
-       return i2c_smbus_write_byte_data(priv->client, reg->reg, reg->val);
+       return i2c_smbus_write_byte_data(client, reg->reg, reg->val);
 }
 #endif
 
-static const struct ov772x_win_size*
-ov772x_select_win(u32 width, u32 height)
+static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
 {
        __u32 diff;
        const struct ov772x_win_size *win;
@@ -793,9 +806,10 @@ ov772x_select_win(u32 width, u32 height)
        return win;
 }
 
-static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
-                            u32 pixfmt)
+static int ov772x_set_params(struct i2c_client *client,
+                            u32 *width, u32 *height, u32 pixfmt)
 {
+       struct ov772x_priv *priv = to_ov772x(client);
        int ret = -EINVAL;
        u8  val;
        int i;
@@ -805,7 +819,7 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
         */
        priv->fmt = NULL;
        for (i = 0; i < ARRAY_SIZE(ov772x_cfmts); i++) {
-               if (pixfmt == ov772x_cfmts[i].fourcc) {
+               if (pixfmt == ov772x_cfmts[i].format->fourcc) {
                        priv->fmt = ov772x_cfmts + i;
                        break;
                }
@@ -816,12 +830,12 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
        /*
         * select win
         */
-       priv->win = ov772x_select_win(width, height);
+       priv->win = ov772x_select_win(*width, *height);
 
        /*
         * reset hardware
         */
-       ov772x_reset(priv->client);
+       ov772x_reset(client);
 
        /*
         * Edge Ctrl
@@ -835,17 +849,17 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
                 * Remove it when manual mode.
                 */
 
-               ret = ov772x_mask_set(priv->client, DSPAUTO, EDGE_ACTRL, 0x00);
+               ret = ov772x_mask_set(client, DSPAUTO, EDGE_ACTRL, 0x00);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
 
-               ret = ov772x_mask_set(priv->client,
+               ret = ov772x_mask_set(client,
                                      EDGE_TRSHLD, EDGE_THRESHOLD_MASK,
                                      priv->info->edgectrl.threshold);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
 
-               ret = ov772x_mask_set(priv->client,
+               ret = ov772x_mask_set(client,
                                      EDGE_STRNGT, EDGE_STRENGTH_MASK,
                                      priv->info->edgectrl.strength);
                if (ret < 0)
@@ -857,13 +871,13 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
                 *
                 * set upper and lower limit
                 */
-               ret = ov772x_mask_set(priv->client,
+               ret = ov772x_mask_set(client,
                                      EDGE_UPPER, EDGE_UPPER_MASK,
                                      priv->info->edgectrl.upper);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
 
-               ret = ov772x_mask_set(priv->client,
+               ret = ov772x_mask_set(client,
                                      EDGE_LOWER, EDGE_LOWER_MASK,
                                      priv->info->edgectrl.lower);
                if (ret < 0)
@@ -873,7 +887,7 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
        /*
         * set size format
         */
-       ret = ov772x_write_array(priv->client, priv->win->regs);
+       ret = ov772x_write_array(client, priv->win->regs);
        if (ret < 0)
                goto ov772x_set_fmt_error;
 
@@ -882,7 +896,7 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
         */
        val = priv->fmt->dsp3;
        if (val) {
-               ret = ov772x_mask_set(priv->client,
+               ret = ov772x_mask_set(client,
                                      DSP_CTRL3, UV_MASK, val);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
@@ -901,7 +915,7 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
        if (priv->flag_hflip)
                val ^= HFLIP_IMG;
 
-       ret = ov772x_mask_set(priv->client,
+       ret = ov772x_mask_set(client,
                              COM3, SWAP_MASK | IMG_MASK, val);
        if (ret < 0)
                goto ov772x_set_fmt_error;
@@ -910,47 +924,99 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
         * set COM7
         */
        val = priv->win->com7_bit | priv->fmt->com7;
-       ret = ov772x_mask_set(priv->client,
+       ret = ov772x_mask_set(client,
                              COM7, (SLCT_MASK | FMT_MASK | OFMT_MASK),
                              val);
        if (ret < 0)
                goto ov772x_set_fmt_error;
 
+       /*
+        * set COM8
+        */
+       if (priv->band_filter) {
+               ret = ov772x_mask_set(client, COM8, BNDF_ON_OFF, 1);
+               if (!ret)
+                       ret = ov772x_mask_set(client, BDBASE,
+                                             0xff, 256 - priv->band_filter);
+               if (ret < 0)
+                       goto ov772x_set_fmt_error;
+       }
+
+       *width = priv->win->width;
+       *height = priv->win->height;
+
        return ret;
 
 ov772x_set_fmt_error:
 
-       ov772x_reset(priv->client);
+       ov772x_reset(client);
        priv->win = NULL;
        priv->fmt = NULL;
 
        return ret;
 }
 
-static int ov772x_set_crop(struct soc_camera_device *icd,
-                          struct v4l2_rect *rect)
+static int ov772x_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       a->c.left       = 0;
+       a->c.top        = 0;
+       a->c.width      = VGA_WIDTH;
+       a->c.height     = VGA_HEIGHT;
+       a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-       if (!priv->fmt)
-               return -EINVAL;
+       return 0;
+}
 
-       return ov772x_set_params(priv, rect->width, rect->height,
-                                priv->fmt->fourcc);
+static int ov772x_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+       a->bounds.left                  = 0;
+       a->bounds.top                   = 0;
+       a->bounds.width                 = VGA_WIDTH;
+       a->bounds.height                = VGA_HEIGHT;
+       a->defrect                      = a->bounds;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
+
+       return 0;
 }
 
-static int ov772x_set_fmt(struct soc_camera_device *icd,
-                         struct v4l2_format *f)
+static int ov772x_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct ov772x_priv *priv = to_ov772x(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+
+       if (!priv->win || !priv->fmt) {
+               u32 width = VGA_WIDTH, height = VGA_HEIGHT;
+               int ret = ov772x_set_params(client, &width, &height,
+                                           V4L2_PIX_FMT_YUYV);
+               if (ret < 0)
+                       return ret;
+       }
+
+       f->type                 = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       pix->width              = priv->win->width;
+       pix->height             = priv->win->height;
+       pix->pixelformat        = priv->fmt->format->fourcc;
+       pix->colorspace         = priv->fmt->format->colorspace;
+       pix->field              = V4L2_FIELD_NONE;
+
+       return 0;
+}
+
+static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct i2c_client *client = sd->priv;
        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-       return ov772x_set_params(priv, pix->width, pix->height,
+       return ov772x_set_params(client, &pix->width, &pix->height,
                                 pix->pixelformat);
 }
 
-static int ov772x_try_fmt(struct soc_camera_device *icd,
-                         struct v4l2_format       *f)
+static int ov772x_try_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_format *f)
 {
        struct v4l2_pix_format *pix = &f->fmt.pix;
        const struct ov772x_win_size *win;
@@ -967,9 +1033,10 @@ static int ov772x_try_fmt(struct soc_camera_device *icd,
        return 0;
 }
 
-static int ov772x_video_probe(struct soc_camera_device *icd)
+static int ov772x_video_probe(struct soc_camera_device *icd,
+                             struct i2c_client *client)
 {
-       struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
+       struct ov772x_priv *priv = to_ov772x(client);
        u8                  pid, ver;
        const char         *devname;
 
@@ -986,7 +1053,7 @@ static int ov772x_video_probe(struct soc_camera_device *icd)
         */
        if (SOCAM_DATAWIDTH_10 != priv->info->buswidth &&
            SOCAM_DATAWIDTH_8  != priv->info->buswidth) {
-               dev_err(&icd->dev, "bus width error\n");
+               dev_err(&client->dev, "bus width error\n");
                return -ENODEV;
        }
 
@@ -996,8 +1063,8 @@ static int ov772x_video_probe(struct soc_camera_device *icd)
        /*
         * check and show product ID and manufacturer ID
         */
-       pid = i2c_smbus_read_byte_data(priv->client, PID);
-       ver = i2c_smbus_read_byte_data(priv->client, VER);
+       pid = i2c_smbus_read_byte_data(client, PID);
+       ver = i2c_smbus_read_byte_data(client, VER);
 
        switch (VERSION(pid, ver)) {
        case OV7720:
@@ -1009,69 +1076,77 @@ static int ov772x_video_probe(struct soc_camera_device *icd)
                priv->model = V4L2_IDENT_OV7725;
                break;
        default:
-               dev_err(&icd->dev,
+               dev_err(&client->dev,
                        "Product ID error %x:%x\n", pid, ver);
                return -ENODEV;
        }
 
-       dev_info(&icd->dev,
+       dev_info(&client->dev,
                 "%s Product ID %0x:%0x Manufacturer ID %x:%x\n",
                 devname,
                 pid,
                 ver,
-                i2c_smbus_read_byte_data(priv->client, MIDH),
-                i2c_smbus_read_byte_data(priv->client, MIDL));
-
-       return soc_camera_video_start(icd);
-}
+                i2c_smbus_read_byte_data(client, MIDH),
+                i2c_smbus_read_byte_data(client, MIDL));
 
-static void ov772x_video_remove(struct soc_camera_device *icd)
-{
-       soc_camera_video_stop(icd);
+       return 0;
 }
 
 static struct soc_camera_ops ov772x_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = ov772x_video_probe,
-       .remove                 = ov772x_video_remove,
-       .init                   = ov772x_init,
-       .release                = ov772x_release,
-       .start_capture          = ov772x_start_capture,
-       .stop_capture           = ov772x_stop_capture,
-       .set_crop               = ov772x_set_crop,
-       .set_fmt                = ov772x_set_fmt,
-       .try_fmt                = ov772x_try_fmt,
        .set_bus_param          = ov772x_set_bus_param,
        .query_bus_param        = ov772x_query_bus_param,
        .controls               = ov772x_controls,
        .num_controls           = ARRAY_SIZE(ov772x_controls),
-       .get_control            = ov772x_get_control,
-       .set_control            = ov772x_set_control,
-       .get_chip_id            = ov772x_get_chip_id,
+};
+
+static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
+       .g_ctrl         = ov772x_g_ctrl,
+       .s_ctrl         = ov772x_s_ctrl,
+       .g_chip_ident   = ov772x_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = ov772x_get_register,
-       .set_register           = ov772x_set_register,
+       .g_register     = ov772x_g_register,
+       .s_register     = ov772x_s_register,
 #endif
 };
 
+static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
+       .s_stream       = ov772x_s_stream,
+       .g_fmt          = ov772x_g_fmt,
+       .s_fmt          = ov772x_s_fmt,
+       .try_fmt        = ov772x_try_fmt,
+       .cropcap        = ov772x_cropcap,
+       .g_crop         = ov772x_g_crop,
+};
+
+static struct v4l2_subdev_ops ov772x_subdev_ops = {
+       .core   = &ov772x_subdev_core_ops,
+       .video  = &ov772x_subdev_video_ops,
+};
+
 /*
  * i2c_driver function
  */
 
 static int ov772x_probe(struct i2c_client *client,
-                        const struct i2c_device_id *did)
+                       const struct i2c_device_id *did)
 {
        struct ov772x_priv        *priv;
        struct ov772x_camera_info *info;
-       struct soc_camera_device  *icd;
+       struct soc_camera_device  *icd = client->dev.platform_data;
        struct i2c_adapter        *adapter = to_i2c_adapter(client->dev.parent);
+       struct soc_camera_link    *icl;
        int                        ret;
 
-       if (!client->dev.platform_data)
+       if (!icd) {
+               dev_err(&client->dev, "OV772X: missing soc-camera data!\n");
                return -EINVAL;
+       }
 
-       info = container_of(client->dev.platform_data,
-                           struct ov772x_camera_info, link);
+       icl = to_soc_camera_link(icd);
+       if (!icl)
+               return -EINVAL;
+
+       info = container_of(icl, struct ov772x_camera_info, link);
 
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                dev_err(&adapter->dev,
@@ -1084,20 +1159,15 @@ static int ov772x_probe(struct i2c_client *client,
        if (!priv)
                return -ENOMEM;
 
-       priv->info   = info;
-       priv->client = client;
-       i2c_set_clientdata(client, priv);
+       priv->info = info;
 
-       icd             = &priv->icd;
-       icd->ops        = &ov772x_ops;
-       icd->control    = &client->dev;
-       icd->width_max  = MAX_WIDTH;
-       icd->height_max = MAX_HEIGHT;
-       icd->iface      = priv->info->link.bus_id;
+       v4l2_i2c_subdev_init(&priv->subdev, client, &ov772x_subdev_ops);
 
-       ret = soc_camera_device_register(icd);
+       icd->ops                = &ov772x_ops;
 
+       ret = ov772x_video_probe(icd, client);
        if (ret) {
+               icd->ops = NULL;
                i2c_set_clientdata(client, NULL);
                kfree(priv);
        }
@@ -1107,9 +1177,10 @@ static int ov772x_probe(struct i2c_client *client,
 
 static int ov772x_remove(struct i2c_client *client)
 {
-       struct ov772x_priv *priv = i2c_get_clientdata(client);
+       struct ov772x_priv *priv = to_ov772x(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
 
-       soc_camera_device_unregister(&priv->icd);
+       icd->ops = NULL;
        i2c_set_clientdata(client, NULL);
        kfree(priv);
        return 0;
index 336a20e..e4d7c13 100644 (file)
@@ -298,6 +298,7 @@ static struct tda829x_config tda829x_no_probe = {
 
 static struct tda18271_config hauppauge_tda18271_dvb_config = {
        .gate    = TDA18271_GATE_ANALOG,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static int pvr2_tda10048_attach(struct pvr2_dvb_adapter *adap)
@@ -393,6 +394,7 @@ static struct tda18271_std_map hauppauge_tda18271_std_map = {
 static struct tda18271_config hauppauge_tda18271_config = {
        .std_map = &hauppauge_tda18271_std_map,
        .gate    = TDA18271_GATE_ANALOG,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static int pvr2_s5h1409_attach(struct pvr2_dvb_adapter *adap)
index cbc3887..13639b3 100644 (file)
@@ -2063,8 +2063,8 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                return -EINVAL;
        }
 
-       /* Note how the 2nd and 3rd arguments are the same for both
-        * v4l2_i2c_new_subdev() and v4l2_i2c_new_probed_subdev().  Why?
+       /* Note how the 2nd and 3rd arguments are the same for
+        * v4l2_i2c_new_subdev().  Why?
         * Well the 2nd argument is the module name to load, while the 3rd
         * argument is documented in the framework as being the "chipid" -
         * and every other place where I can find examples of this, the
@@ -2077,15 +2077,15 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                           mid, i2caddr[0]);
                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                         fname, fname,
-                                        i2caddr[0]);
+                                        i2caddr[0], NULL);
        } else {
                pvr2_trace(PVR2_TRACE_INIT,
                           "Module ID %u:"
                           " Setting up with address probe list",
                           mid);
-               sd = v4l2_i2c_new_probed_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
+               sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                                fname, fname,
-                                               i2caddr);
+                                               0, i2caddr);
        }
 
        if (!sd) {
index 016bb45..6952e96 100644 (file)
@@ -225,6 +225,10 @@ struct pxa_camera_dev {
        u32                     save_cicr[5];
 };
 
+struct pxa_cam {
+       unsigned long flags;
+};
+
 static const char *pxa_cam_driver_description = "PXA_Camera";
 
 static unsigned int vid_limit = 16;    /* Video memory limit, in Mb */
@@ -237,9 +241,9 @@ static int pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
 {
        struct soc_camera_device *icd = vq->priv_data;
 
-       dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
+       dev_dbg(icd->dev.parent, "count=%d, size=%d\n", *count, *size);
 
-       *size = roundup(icd->width * icd->height *
+       *size = roundup(icd->user_width * icd->user_height *
                        ((icd->current_fmt->depth + 7) >> 3), 8);
 
        if (0 == *count)
@@ -259,7 +263,7 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
 
        BUG_ON(in_interrupt());
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                &buf->vb, buf->vb.baddr, buf->vb.bsize);
 
        /* This waits until this buffer is out of danger, i.e., until it is no
@@ -270,7 +274,8 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
 
        for (i = 0; i < ARRAY_SIZE(buf->dmas); i++) {
                if (buf->dmas[i].sg_cpu)
-                       dma_free_coherent(ici->dev, buf->dmas[i].sg_size,
+                       dma_free_coherent(ici->v4l2_dev.dev,
+                                         buf->dmas[i].sg_size,
                                          buf->dmas[i].sg_cpu,
                                          buf->dmas[i].sg_dma);
                buf->dmas[i].sg_cpu = NULL;
@@ -325,19 +330,20 @@ static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev,
                                struct scatterlist **sg_first, int *sg_first_ofs)
 {
        struct pxa_cam_dma *pxa_dma = &buf->dmas[channel];
+       struct device *dev = pcdev->soc_host.v4l2_dev.dev;
        struct scatterlist *sg;
        int i, offset, sglen;
        int dma_len = 0, xfer_len = 0;
 
        if (pxa_dma->sg_cpu)
-               dma_free_coherent(pcdev->soc_host.dev, pxa_dma->sg_size,
+               dma_free_coherent(dev, pxa_dma->sg_size,
                                  pxa_dma->sg_cpu, pxa_dma->sg_dma);
 
        sglen = calculate_dma_sglen(*sg_first, dma->sglen,
                                    *sg_first_ofs, size);
 
        pxa_dma->sg_size = (sglen + 1) * sizeof(struct pxa_dma_desc);
-       pxa_dma->sg_cpu = dma_alloc_coherent(pcdev->soc_host.dev, pxa_dma->sg_size,
+       pxa_dma->sg_cpu = dma_alloc_coherent(dev, pxa_dma->sg_size,
                                             &pxa_dma->sg_dma, GFP_KERNEL);
        if (!pxa_dma->sg_cpu)
                return -ENOMEM;
@@ -345,7 +351,7 @@ static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev,
        pxa_dma->sglen = sglen;
        offset = *sg_first_ofs;
 
-       dev_dbg(pcdev->soc_host.dev, "DMA: sg_first=%p, sglen=%d, ofs=%d, dma.desc=%x\n",
+       dev_dbg(dev, "DMA: sg_first=%p, sglen=%d, ofs=%d, dma.desc=%x\n",
                *sg_first, sglen, *sg_first_ofs, pxa_dma->sg_dma);
 
 
@@ -368,7 +374,7 @@ static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev,
                pxa_dma->sg_cpu[i].ddadr =
                        pxa_dma->sg_dma + (i + 1) * sizeof(struct pxa_dma_desc);
 
-               dev_vdbg(pcdev->soc_host.dev, "DMA: desc.%08x->@phys=0x%08x, len=%d\n",
+               dev_vdbg(dev, "DMA: desc.%08x->@phys=0x%08x, len=%d\n",
                         pxa_dma->sg_dma + i * sizeof(struct pxa_dma_desc),
                         sg_dma_address(sg) + offset, xfer_len);
                offset = 0;
@@ -418,11 +424,12 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
        struct soc_camera_device *icd = vq->priv_data;
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct pxa_camera_dev *pcdev = ici->priv;
+       struct device *dev = pcdev->soc_host.v4l2_dev.dev;
        struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
        int ret;
        int size_y, size_u = 0, size_v = 0;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* Added list head initialization on alloc */
@@ -441,12 +448,12 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
        buf->inwork = 1;
 
        if (buf->fmt    != icd->current_fmt ||
-           vb->width   != icd->width ||
-           vb->height  != icd->height ||
+           vb->width   != icd->user_width ||
+           vb->height  != icd->user_height ||
            vb->field   != field) {
                buf->fmt        = icd->current_fmt;
-               vb->width       = icd->width;
-               vb->height      = icd->height;
+               vb->width       = icd->user_width;
+               vb->height      = icd->user_height;
                vb->field       = field;
                vb->state       = VIDEOBUF_NEEDS_INIT;
        }
@@ -480,8 +487,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
                ret = pxa_init_dma_channel(pcdev, buf, dma, 0, CIBR0, size_y,
                                           &sg, &next_ofs);
                if (ret) {
-                       dev_err(pcdev->soc_host.dev,
-                               "DMA initialization for Y/RGB failed\n");
+                       dev_err(dev, "DMA initialization for Y/RGB failed\n");
                        goto fail;
                }
 
@@ -490,8 +496,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
                        ret = pxa_init_dma_channel(pcdev, buf, dma, 1, CIBR1,
                                                   size_u, &sg, &next_ofs);
                if (ret) {
-                       dev_err(pcdev->soc_host.dev,
-                               "DMA initialization for U failed\n");
+                       dev_err(dev, "DMA initialization for U failed\n");
                        goto fail_u;
                }
 
@@ -500,8 +505,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
                        ret = pxa_init_dma_channel(pcdev, buf, dma, 2, CIBR2,
                                                   size_v, &sg, &next_ofs);
                if (ret) {
-                       dev_err(pcdev->soc_host.dev,
-                               "DMA initialization for V failed\n");
+                       dev_err(dev, "DMA initialization for V failed\n");
                        goto fail_v;
                }
 
@@ -514,10 +518,10 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
        return 0;
 
 fail_v:
-       dma_free_coherent(pcdev->soc_host.dev, buf->dmas[1].sg_size,
+       dma_free_coherent(dev, buf->dmas[1].sg_size,
                          buf->dmas[1].sg_cpu, buf->dmas[1].sg_dma);
 fail_u:
-       dma_free_coherent(pcdev->soc_host.dev, buf->dmas[0].sg_size,
+       dma_free_coherent(dev, buf->dmas[0].sg_size,
                          buf->dmas[0].sg_cpu, buf->dmas[0].sg_dma);
 fail:
        free_buffer(vq, buf);
@@ -541,7 +545,8 @@ static void pxa_dma_start_channels(struct pxa_camera_dev *pcdev)
        active = pcdev->active;
 
        for (i = 0; i < pcdev->channels; i++) {
-               dev_dbg(pcdev->soc_host.dev, "%s (channel=%d) ddadr=%08x\n", __func__,
+               dev_dbg(pcdev->soc_host.v4l2_dev.dev,
+                       "%s (channel=%d) ddadr=%08x\n", __func__,
                        i, active->dmas[i].sg_dma);
                DDADR(pcdev->dma_chans[i]) = active->dmas[i].sg_dma;
                DCSR(pcdev->dma_chans[i]) = DCSR_RUN;
@@ -553,7 +558,8 @@ static void pxa_dma_stop_channels(struct pxa_camera_dev *pcdev)
        int i;
 
        for (i = 0; i < pcdev->channels; i++) {
-               dev_dbg(pcdev->soc_host.dev, "%s (channel=%d)\n", __func__, i);
+               dev_dbg(pcdev->soc_host.v4l2_dev.dev,
+                       "%s (channel=%d)\n", __func__, i);
                DCSR(pcdev->dma_chans[i]) = 0;
        }
 }
@@ -589,7 +595,7 @@ static void pxa_camera_start_capture(struct pxa_camera_dev *pcdev)
 {
        unsigned long cicr0, cifr;
 
-       dev_dbg(pcdev->soc_host.dev, "%s\n", __func__);
+       dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s\n", __func__);
        /* Reset the FIFOs */
        cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
        __raw_writel(cifr, pcdev->base + CIFR);
@@ -609,7 +615,7 @@ static void pxa_camera_stop_capture(struct pxa_camera_dev *pcdev)
        __raw_writel(cicr0, pcdev->base + CICR0);
 
        pcdev->active = NULL;
-       dev_dbg(pcdev->soc_host.dev, "%s\n", __func__);
+       dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s\n", __func__);
 }
 
 /* Called under spinlock_irqsave(&pcdev->lock, ...) */
@@ -621,8 +627,8 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq,
        struct pxa_camera_dev *pcdev = ici->priv;
        struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d active=%p\n", __func__,
-               vb, vb->baddr, vb->bsize, pcdev->active);
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d active=%p\n",
+               __func__, vb, vb->baddr, vb->bsize, pcdev->active);
 
        list_add_tail(&vb->queue, &pcdev->capture);
 
@@ -639,22 +645,23 @@ static void pxa_videobuf_release(struct videobuf_queue *vq,
        struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
 #ifdef DEBUG
        struct soc_camera_device *icd = vq->priv_data;
+       struct device *dev = icd->dev.parent;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+       dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        switch (vb->state) {
        case VIDEOBUF_ACTIVE:
-               dev_dbg(&icd->dev, "%s (active)\n", __func__);
+               dev_dbg(dev, "%s (active)\n", __func__);
                break;
        case VIDEOBUF_QUEUED:
-               dev_dbg(&icd->dev, "%s (queued)\n", __func__);
+               dev_dbg(dev, "%s (queued)\n", __func__);
                break;
        case VIDEOBUF_PREPARED:
-               dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
+               dev_dbg(dev, "%s (prepared)\n", __func__);
                break;
        default:
-               dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
+               dev_dbg(dev, "%s (unknown)\n", __func__);
                break;
        }
 #endif
@@ -674,7 +681,8 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
        do_gettimeofday(&vb->ts);
        vb->field_count++;
        wake_up(&vb->done);
-       dev_dbg(pcdev->soc_host.dev, "%s dequeud buffer (vb=0x%p)\n", __func__, vb);
+       dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s dequeud buffer (vb=0x%p)\n",
+               __func__, vb);
 
        if (list_empty(&pcdev->capture)) {
                pxa_camera_stop_capture(pcdev);
@@ -710,7 +718,8 @@ static void pxa_camera_check_link_miss(struct pxa_camera_dev *pcdev)
        for (i = 0; i < pcdev->channels; i++)
                if (DDADR(pcdev->dma_chans[i]) != DDADR_STOP)
                        is_dma_stopped = 0;
-       dev_dbg(pcdev->soc_host.dev, "%s : top queued buffer=%p, dma_stopped=%d\n",
+       dev_dbg(pcdev->soc_host.v4l2_dev.dev,
+               "%s : top queued buffer=%p, dma_stopped=%d\n",
                __func__, pcdev->active, is_dma_stopped);
        if (pcdev->active && is_dma_stopped)
                pxa_camera_start_capture(pcdev);
@@ -719,6 +728,7 @@ static void pxa_camera_check_link_miss(struct pxa_camera_dev *pcdev)
 static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
                               enum pxa_camera_active_dma act_dma)
 {
+       struct device *dev = pcdev->soc_host.v4l2_dev.dev;
        struct pxa_buffer *buf;
        unsigned long flags;
        u32 status, camera_status, overrun;
@@ -735,13 +745,13 @@ static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
                overrun |= CISR_IFO_1 | CISR_IFO_2;
 
        if (status & DCSR_BUSERR) {
-               dev_err(pcdev->soc_host.dev, "DMA Bus Error IRQ!\n");
+               dev_err(dev, "DMA Bus Error IRQ!\n");
                goto out;
        }
 
        if (!(status & (DCSR_ENDINTR | DCSR_STARTINTR))) {
-               dev_err(pcdev->soc_host.dev, "Unknown DMA IRQ source, "
-                       "status: 0x%08x\n", status);
+               dev_err(dev, "Unknown DMA IRQ source, status: 0x%08x\n",
+                       status);
                goto out;
        }
 
@@ -764,7 +774,7 @@ static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
        buf = container_of(vb, struct pxa_buffer, vb);
        WARN_ON(buf->inwork || list_empty(&vb->queue));
 
-       dev_dbg(pcdev->soc_host.dev, "%s channel=%d %s%s(vb=0x%p) dma.desc=%x\n",
+       dev_dbg(dev, "%s channel=%d %s%s(vb=0x%p) dma.desc=%x\n",
                __func__, channel, status & DCSR_STARTINTR ? "SOF " : "",
                status & DCSR_ENDINTR ? "EOF " : "", vb, DDADR(channel));
 
@@ -775,7 +785,7 @@ static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
                 */
                if (camera_status & overrun &&
                    !list_is_last(pcdev->capture.next, &pcdev->capture)) {
-                       dev_dbg(pcdev->soc_host.dev, "FIFO overrun! CISR: %x\n",
+                       dev_dbg(dev, "FIFO overrun! CISR: %x\n",
                                camera_status);
                        pxa_camera_stop_capture(pcdev);
                        pxa_camera_start_capture(pcdev);
@@ -830,9 +840,11 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q,
                                sizeof(struct pxa_buffer), icd);
 }
 
-static u32 mclk_get_divisor(struct pxa_camera_dev *pcdev)
+static u32 mclk_get_divisor(struct platform_device *pdev,
+                           struct pxa_camera_dev *pcdev)
 {
        unsigned long mclk = pcdev->mclk;
+       struct device *dev = &pdev->dev;
        u32 div;
        unsigned long lcdclk;
 
@@ -842,7 +854,7 @@ static u32 mclk_get_divisor(struct pxa_camera_dev *pcdev)
        /* mclk <= ciclk / 4 (27.4.2) */
        if (mclk > lcdclk / 4) {
                mclk = lcdclk / 4;
-               dev_warn(pcdev->soc_host.dev, "Limiting master clock to %lu\n", mclk);
+               dev_warn(dev, "Limiting master clock to %lu\n", mclk);
        }
 
        /* We verify mclk != 0, so if anyone breaks it, here comes their Oops */
@@ -852,8 +864,8 @@ static u32 mclk_get_divisor(struct pxa_camera_dev *pcdev)
        if (pcdev->platform_flags & PXA_CAMERA_MCLK_EN)
                pcdev->mclk = lcdclk / (2 * (div + 1));
 
-       dev_dbg(pcdev->soc_host.dev, "LCD clock %luHz, target freq %luHz, "
-               "divisor %u\n", lcdclk, mclk, div);
+       dev_dbg(dev, "LCD clock %luHz, target freq %luHz, divisor %u\n",
+               lcdclk, mclk, div);
 
        return div;
 }
@@ -870,14 +882,15 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev,
 static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 {
        struct pxacamera_platform_data *pdata = pcdev->pdata;
+       struct device *dev = pcdev->soc_host.v4l2_dev.dev;
        u32 cicr4 = 0;
 
-       dev_dbg(pcdev->soc_host.dev, "Registered platform device at %p data %p\n",
+       dev_dbg(dev, "Registered platform device at %p data %p\n",
                pcdev, pdata);
 
        if (pdata && pdata->init) {
-               dev_dbg(pcdev->soc_host.dev, "%s: Init gpios\n", __func__);
-               pdata->init(pcdev->soc_host.dev);
+               dev_dbg(dev, "%s: Init gpios\n", __func__);
+               pdata->init(dev);
        }
 
        /* disable all interrupts */
@@ -919,7 +932,8 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)
        struct videobuf_buffer *vb;
 
        status = __raw_readl(pcdev->base + CISR);
-       dev_dbg(pcdev->soc_host.dev, "Camera interrupt status 0x%lx\n", status);
+       dev_dbg(pcdev->soc_host.v4l2_dev.dev,
+               "Camera interrupt status 0x%lx\n", status);
 
        if (!status)
                return IRQ_NONE;
@@ -951,24 +965,18 @@ static int pxa_camera_add_device(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct pxa_camera_dev *pcdev = ici->priv;
-       int ret;
 
-       if (pcdev->icd) {
-               ret = -EBUSY;
-               goto ebusy;
-       }
-
-       dev_info(&icd->dev, "PXA Camera driver attached to camera %d\n",
-                icd->devnum);
+       if (pcdev->icd)
+               return -EBUSY;
 
        pxa_camera_activate(pcdev);
-       ret = icd->ops->init(icd);
 
-       if (!ret)
-               pcdev->icd = icd;
+       pcdev->icd = icd;
 
-ebusy:
-       return ret;
+       dev_info(icd->dev.parent, "PXA Camera driver attached to camera %d\n",
+                icd->devnum);
+
+       return 0;
 }
 
 /* Called with .video_lock held */
@@ -979,7 +987,7 @@ static void pxa_camera_remove_device(struct soc_camera_device *icd)
 
        BUG_ON(icd != pcdev->icd);
 
-       dev_info(&icd->dev, "PXA Camera driver detached from camera %d\n",
+       dev_info(icd->dev.parent, "PXA Camera driver detached from camera %d\n",
                 icd->devnum);
 
        /* disable capture, disable interrupts */
@@ -990,8 +998,6 @@ static void pxa_camera_remove_device(struct soc_camera_device *icd)
        DCSR(pcdev->dma_chans[1]) = 0;
        DCSR(pcdev->dma_chans[2]) = 0;
 
-       icd->ops->release(icd);
-
        pxa_camera_deactivate(pcdev);
 
        pcdev->icd = NULL;
@@ -1039,57 +1045,17 @@ static int test_platform_param(struct pxa_camera_dev *pcdev,
        return 0;
 }
 
-static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
+static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
+                                 unsigned long flags, __u32 pixfmt)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct pxa_camera_dev *pcdev = ici->priv;
-       unsigned long dw, bpp, bus_flags, camera_flags, common_flags;
+       unsigned long dw, bpp;
        u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0;
-       int ret = test_platform_param(pcdev, icd->buswidth, &bus_flags);
-
-       if (ret < 0)
-               return ret;
-
-       camera_flags = icd->ops->query_bus_param(icd);
-
-       common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
-       if (!common_flags)
-               return -EINVAL;
-
-       pcdev->channels = 1;
-
-       /* Make choises, based on platform preferences */
-       if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
-           (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
-               if (pcdev->platform_flags & PXA_CAMERA_HSP)
-                       common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
-               else
-                       common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
-       }
-
-       if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
-           (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
-               if (pcdev->platform_flags & PXA_CAMERA_VSP)
-                       common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
-               else
-                       common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
-       }
-
-       if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
-           (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
-               if (pcdev->platform_flags & PXA_CAMERA_PCP)
-                       common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
-               else
-                       common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
-       }
-
-       ret = icd->ops->set_bus_param(icd, common_flags);
-       if (ret < 0)
-               return ret;
 
        /* Datawidth is now guaranteed to be equal to one of the three values.
         * We fix bit-per-pixel equal to data-width... */
-       switch (common_flags & SOCAM_DATAWIDTH_MASK) {
+       switch (flags & SOCAM_DATAWIDTH_MASK) {
        case SOCAM_DATAWIDTH_10:
                dw = 4;
                bpp = 0x40;
@@ -1110,18 +1076,18 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
                cicr4 |= CICR4_PCLK_EN;
        if (pcdev->platform_flags & PXA_CAMERA_MCLK_EN)
                cicr4 |= CICR4_MCLK_EN;
-       if (common_flags & SOCAM_PCLK_SAMPLE_FALLING)
+       if (flags & SOCAM_PCLK_SAMPLE_FALLING)
                cicr4 |= CICR4_PCP;
-       if (common_flags & SOCAM_HSYNC_ACTIVE_LOW)
+       if (flags & SOCAM_HSYNC_ACTIVE_LOW)
                cicr4 |= CICR4_HSP;
-       if (common_flags & SOCAM_VSYNC_ACTIVE_LOW)
+       if (flags & SOCAM_VSYNC_ACTIVE_LOW)
                cicr4 |= CICR4_VSP;
 
        cicr0 = __raw_readl(pcdev->base + CICR0);
        if (cicr0 & CICR0_ENB)
                __raw_writel(cicr0 & ~CICR0_ENB, pcdev->base + CICR0);
 
-       cicr1 = CICR1_PPL_VAL(icd->width - 1) | bpp | dw;
+       cicr1 = CICR1_PPL_VAL(icd->user_width - 1) | bpp | dw;
 
        switch (pixfmt) {
        case V4L2_PIX_FMT_YUV422P:
@@ -1150,7 +1116,7 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        }
 
        cicr2 = 0;
-       cicr3 = CICR3_LPF_VAL(icd->height - 1) |
+       cicr3 = CICR3_LPF_VAL(icd->user_height - 1) |
                CICR3_BFW_VAL(min((unsigned short)255, icd->y_skip_top));
        cicr4 |= pcdev->mclk_divisor;
 
@@ -1164,6 +1130,59 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
                CICR0_SIM_MP : (CICR0_SL_CAP_EN | CICR0_SIM_SP));
        cicr0 |= CICR0_DMAEN | CICR0_IRQ_MASK;
        __raw_writel(cicr0, pcdev->base + CICR0);
+}
+
+static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
+{
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct pxa_camera_dev *pcdev = ici->priv;
+       unsigned long bus_flags, camera_flags, common_flags;
+       int ret = test_platform_param(pcdev, icd->buswidth, &bus_flags);
+       struct pxa_cam *cam = icd->host_priv;
+
+       if (ret < 0)
+               return ret;
+
+       camera_flags = icd->ops->query_bus_param(icd);
+
+       common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+       if (!common_flags)
+               return -EINVAL;
+
+       pcdev->channels = 1;
+
+       /* Make choises, based on platform preferences */
+       if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+           (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+               if (pcdev->platform_flags & PXA_CAMERA_HSP)
+                       common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+               else
+                       common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+       }
+
+       if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+           (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+               if (pcdev->platform_flags & PXA_CAMERA_VSP)
+                       common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+               else
+                       common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+       }
+
+       if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+           (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+               if (pcdev->platform_flags & PXA_CAMERA_PCP)
+                       common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+               else
+                       common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+       }
+
+       cam->flags = common_flags;
+
+       ret = icd->ops->set_bus_param(icd, common_flags);
+       if (ret < 0)
+               return ret;
+
+       pxa_camera_setup_cicr(icd, common_flags, pixfmt);
 
        return 0;
 }
@@ -1227,8 +1246,9 @@ static int required_buswidth(const struct soc_camera_data_format *fmt)
 static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                                  struct soc_camera_format_xlate *xlate)
 {
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct device *dev = icd->dev.parent;
        int formats = 0, buswidth, ret;
+       struct pxa_cam *cam;
 
        buswidth = required_buswidth(icd->formats + idx);
 
@@ -1239,6 +1259,16 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
        if (ret < 0)
                return 0;
 
+       if (!icd->host_priv) {
+               cam = kzalloc(sizeof(*cam), GFP_KERNEL);
+               if (!cam)
+                       return -ENOMEM;
+
+               icd->host_priv = cam;
+       } else {
+               cam = icd->host_priv;
+       }
+
        switch (icd->formats[idx].fourcc) {
        case V4L2_PIX_FMT_UYVY:
                formats++;
@@ -1247,7 +1277,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = buswidth;
                        xlate++;
-                       dev_dbg(ici->dev, "Providing format %s using %s\n",
+                       dev_dbg(dev, "Providing format %s using %s\n",
                                pxa_camera_formats[0].name,
                                icd->formats[idx].name);
                }
@@ -1262,7 +1292,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = buswidth;
                        xlate++;
-                       dev_dbg(ici->dev, "Providing format %s packed\n",
+                       dev_dbg(dev, "Providing format %s packed\n",
                                icd->formats[idx].name);
                }
                break;
@@ -1274,7 +1304,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = icd->formats[idx].depth;
                        xlate++;
-                       dev_dbg(ici->dev,
+                       dev_dbg(dev,
                                "Providing format %s in pass-through mode\n",
                                icd->formats[idx].name);
                }
@@ -1283,31 +1313,80 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
        return formats;
 }
 
+static void pxa_camera_put_formats(struct soc_camera_device *icd)
+{
+       kfree(icd->host_priv);
+       icd->host_priv = NULL;
+}
+
+static int pxa_camera_check_frame(struct v4l2_pix_format *pix)
+{
+       /* limit to pxa hardware capabilities */
+       return pix->height < 32 || pix->height > 2048 || pix->width < 48 ||
+               pix->width > 2048 || (pix->width & 0x01);
+}
+
 static int pxa_camera_set_crop(struct soc_camera_device *icd,
-                              struct v4l2_rect *rect)
+                              struct v4l2_crop *a)
 {
+       struct v4l2_rect *rect = &a->c;
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct pxa_camera_dev *pcdev = ici->priv;
+       struct device *dev = icd->dev.parent;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_sense sense = {
                .master_clock = pcdev->mclk,
                .pixel_clock_max = pcdev->ciclk / 4,
        };
+       struct v4l2_format f;
+       struct v4l2_pix_format *pix = &f.fmt.pix, pix_tmp;
+       struct pxa_cam *cam = icd->host_priv;
        int ret;
 
        /* If PCLK is used to latch data from the sensor, check sense */
        if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
                icd->sense = &sense;
 
-       ret = icd->ops->set_crop(icd, rect);
+       ret = v4l2_subdev_call(sd, video, s_crop, a);
 
        icd->sense = NULL;
 
        if (ret < 0) {
-               dev_warn(ici->dev, "Failed to crop to %ux%u@%u:%u\n",
+               dev_warn(dev, "Failed to crop to %ux%u@%u:%u\n",
                         rect->width, rect->height, rect->left, rect->top);
-       } else if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
+               return ret;
+       }
+
+       f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+       if (ret < 0)
+               return ret;
+
+       pix_tmp = *pix;
+       if (pxa_camera_check_frame(pix)) {
+               /*
+                * Camera cropping produced a frame beyond our capabilities.
+                * FIXME: just extract a subframe, that we can process.
+                */
+               v4l_bound_align_image(&pix->width, 48, 2048, 1,
+                       &pix->height, 32, 2048, 0,
+                       icd->current_fmt->fourcc == V4L2_PIX_FMT_YUV422P ?
+                               4 : 0);
+               ret = v4l2_subdev_call(sd, video, s_fmt, &f);
+               if (ret < 0)
+                       return ret;
+
+               if (pxa_camera_check_frame(pix)) {
+                       dev_warn(icd->dev.parent,
+                                "Inconsistent state. Use S_FMT to repair\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
                if (sense.pixel_clock > sense.pixel_clock_max) {
-                       dev_err(ici->dev,
+                       dev_err(dev,
                                "pixel clock %lu set by the camera too high!",
                                sense.pixel_clock);
                        return -EIO;
@@ -1315,6 +1394,11 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
                recalculate_fifo_timeout(pcdev, sense.pixel_clock);
        }
 
+       icd->user_width = pix->width;
+       icd->user_height = pix->height;
+
+       pxa_camera_setup_cicr(icd, cam->flags, icd->current_fmt->fourcc);
+
        return ret;
 }
 
@@ -1323,6 +1407,8 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct pxa_camera_dev *pcdev = ici->priv;
+       struct device *dev = icd->dev.parent;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        const struct soc_camera_data_format *cam_fmt = NULL;
        const struct soc_camera_format_xlate *xlate = NULL;
        struct soc_camera_sense sense = {
@@ -1335,7 +1421,7 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
 
        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pix->pixelformat);
+               dev_warn(dev, "Format %x not found\n", pix->pixelformat);
                return -EINVAL;
        }
 
@@ -1346,16 +1432,21 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
                icd->sense = &sense;
 
        cam_f.fmt.pix.pixelformat = cam_fmt->fourcc;
-       ret = icd->ops->set_fmt(icd, &cam_f);
+       ret = v4l2_subdev_call(sd, video, s_fmt, f);
 
        icd->sense = NULL;
 
        if (ret < 0) {
-               dev_warn(ici->dev, "Failed to configure for format %x\n",
+               dev_warn(dev, "Failed to configure for format %x\n",
                         pix->pixelformat);
+       } else if (pxa_camera_check_frame(pix)) {
+               dev_warn(dev,
+                        "Camera driver produced an unsupported frame %dx%d\n",
+                        pix->width, pix->height);
+               ret = -EINVAL;
        } else if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
                if (sense.pixel_clock > sense.pixel_clock_max) {
-                       dev_err(ici->dev,
+                       dev_err(dev,
                                "pixel clock %lu set by the camera too high!",
                                sense.pixel_clock);
                        return -EIO;
@@ -1375,6 +1466,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
                              struct v4l2_format *f)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        const struct soc_camera_format_xlate *xlate;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        __u32 pixfmt = pix->pixelformat;
@@ -1383,7 +1475,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
 
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+               dev_warn(ici->v4l2_dev.dev, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
 
@@ -1395,7 +1487,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
         */
        v4l_bound_align_image(&pix->width, 48, 2048, 1,
                              &pix->height, 32, 2048, 0,
-                             xlate->host_fmt->fourcc == V4L2_PIX_FMT_YUV422P ? 4 : 0);
+                             pixfmt == V4L2_PIX_FMT_YUV422P ? 4 : 0);
 
        pix->bytesperline = pix->width *
                DIV_ROUND_UP(xlate->host_fmt->depth, 8);
@@ -1404,15 +1496,15 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
        /* camera has to see its format, but the user the original one */
        pix->pixelformat = xlate->cam_fmt->fourcc;
        /* limit to sensor capabilities */
-       ret = icd->ops->try_fmt(icd, f);
-       pix->pixelformat = xlate->host_fmt->fourcc;
+       ret = v4l2_subdev_call(sd, video, try_fmt, f);
+       pix->pixelformat = pixfmt;
 
        field = pix->field;
 
        if (field == V4L2_FIELD_ANY) {
                pix->field = V4L2_FIELD_NONE;
        } else if (field != V4L2_FIELD_NONE) {
-               dev_err(&icd->dev, "Field type %d unsupported.\n", field);
+               dev_err(icd->dev.parent, "Field type %d unsupported.\n", field);
                return -EINVAL;
        }
 
@@ -1518,6 +1610,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
        .resume         = pxa_camera_resume,
        .set_crop       = pxa_camera_set_crop,
        .get_formats    = pxa_camera_get_formats,
+       .put_formats    = pxa_camera_put_formats,
        .set_fmt        = pxa_camera_set_fmt,
        .try_fmt        = pxa_camera_try_fmt,
        .init_videobuf  = pxa_camera_init_videobuf,
@@ -1575,8 +1668,7 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev)
                pcdev->mclk = 20000000;
        }
 
-       pcdev->soc_host.dev = &pdev->dev;
-       pcdev->mclk_divisor = mclk_get_divisor(pcdev);
+       pcdev->mclk_divisor = mclk_get_divisor(pdev, pcdev);
 
        INIT_LIST_HEAD(&pcdev->capture);
        spin_lock_init(&pcdev->lock);
@@ -1641,6 +1733,7 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev)
        pcdev->soc_host.drv_name        = PXA_CAM_DRV_NAME;
        pcdev->soc_host.ops             = &pxa_soc_camera_host_ops;
        pcdev->soc_host.priv            = pcdev;
+       pcdev->soc_host.v4l2_dev.dev    = &pdev->dev;
        pcdev->soc_host.nr              = pdev->id;
 
        err = soc_camera_host_register(&pcdev->soc_host);
@@ -1722,3 +1815,4 @@ module_exit(pxa_camera_exit);
 MODULE_DESCRIPTION("PXA27x SoC Camera Host driver");
 MODULE_AUTHOR("Guennadi Liakhovetski <kernel@pengutronix.de>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" PXA_CAM_DRV_NAME);
index 1b29487..71145bf 100644 (file)
@@ -4164,7 +4164,7 @@ struct saa7134_board saa7134_boards[] = {
                /*Dmitry Belimov <d.belimov@gmail.com> */
                .name           = "Beholder BeholdTV 505 RDS",
                .audio_clock    = 0x00200000,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4229,7 +4229,7 @@ struct saa7134_board saa7134_boards[] = {
                /*Dmitry Belimov <d.belimov@gmail.com> */
                .name           = "Beholder BeholdTV 507 RDS",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4380,7 +4380,7 @@ struct saa7134_board saa7134_boards[] = {
                /* Andrey Melnikoff <temnota@kmv.ru> */
                .name           = "Beholder BeholdTV 607 FM",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4408,7 +4408,7 @@ struct saa7134_board saa7134_boards[] = {
                /* Andrey Melnikoff <temnota@kmv.ru> */
                .name           = "Beholder BeholdTV 609 FM",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4494,7 +4494,7 @@ struct saa7134_board saa7134_boards[] = {
                /* Andrey Melnikoff <temnota@kmv.ru> */
                .name           = "Beholder BeholdTV 607 RDS",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4523,7 +4523,7 @@ struct saa7134_board saa7134_boards[] = {
                /* Andrey Melnikoff <temnota@kmv.ru> */
                .name           = "Beholder BeholdTV 609 RDS",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -4630,7 +4630,7 @@ struct saa7134_board saa7134_boards[] = {
                /* Alexey Osipov <lion-simba@pridelands.ru> */
                .name           = "Beholder BeholdTV M6 Extra",
                .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
+               .tuner_type     = TUNER_PHILIPS_FM1216MK5,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
@@ -5257,6 +5257,27 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = TV,
                },
        },
+       [SAA7134_BOARD_ZOLID_HYBRID_PCI] = {
+               .name           = "Zolid Hybrid TV Tuner PCI",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_TDA8290,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tuner_config   = 0,
+               .mpeg           = SAA7134_MPEG_DVB,
+               .ts_type        = SAA7134_MPEG_TS_PARALLEL,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = TV,
+                       .tv   = 1,
+               } },
+               .radio = {      /* untested */
+                       .name = name_radio,
+                       .amux = TV,
+               },
+       },
 
 };
 
@@ -6389,6 +6410,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x19d1, /* RoverMedia */
                .subdevice    = 0x0138, /* LifeView FlyTV Prime30 OEM */
                .driver_data  = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM,
+       }, {
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = PCI_VENDOR_ID_PHILIPS,
+               .subdevice    = 0x2004,
+               .driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
        }, {
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7208,22 +7235,22 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                if (dev->radio_type != UNSET)
                        v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               dev->radio_addr);
+                               dev->radio_addr, NULL);
                if (has_demod)
-                       v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                       v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                               0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                if (dev->tuner_addr == ADDR_UNSET) {
                        enum v4l2_i2c_tuner_type type =
                                has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-                       v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                       v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               v4l2_i2c_tuner_addrs(type));
+                               0, v4l2_i2c_tuner_addrs(type));
                } else {
                        v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "tuner", "tuner",
-                               dev->tuner_addr);
+                               dev->tuner_addr, NULL);
                }
        }
 
index cb78c95..f87757f 100644 (file)
@@ -1000,7 +1000,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                struct v4l2_subdev *sd =
                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
                                "saa6752hs", "saa6752hs",
-                               saa7134_boards[dev->board].empress_addr);
+                               saa7134_boards[dev->board].empress_addr, NULL);
 
                if (sd)
                        sd->grp_id = GRP_EMPRESS;
@@ -1009,9 +1009,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        if (saa7134_boards[dev->board].rds_addr) {
                struct v4l2_subdev *sd;
 
-               sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_adap, "saa6588", "saa6588",
-                               saa7134_boards[dev->board].rds_addr);
+                               0, I2C_ADDRS(saa7134_boards[dev->board].rds_addr));
                if (sd) {
                        printk(KERN_INFO "%s: found RDS decoder\n", dev->name);
                        dev->has_rds = 1;
index ebde21d..a26e997 100644 (file)
@@ -1007,12 +1007,29 @@ static struct tda18271_config hcw_tda18271_config = {
        .std_map = &hauppauge_tda18271_std_map,
        .gate    = TDA18271_GATE_ANALOG,
        .config  = 3,
+       .output_opt = TDA18271_OUTPUT_LT_OFF,
 };
 
 static struct tda829x_config tda829x_no_probe = {
        .probe_tuner = TDA829X_DONT_PROBE,
 };
 
+static struct tda10048_config zolid_tda10048_config = {
+       .demod_address    = 0x10 >> 1,
+       .output_mode      = TDA10048_PARALLEL_OUTPUT,
+       .fwbulkwritelen   = TDA10048_BULKWRITE_200,
+       .inversion        = TDA10048_INVERSION_ON,
+       .dtv6_if_freq_khz = TDA10048_IF_3300,
+       .dtv7_if_freq_khz = TDA10048_IF_3500,
+       .dtv8_if_freq_khz = TDA10048_IF_4000,
+       .clk_freq_khz     = TDA10048_CLK_16000,
+       .disable_gate_access = 1,
+};
+
+static struct tda18271_config zolid_tda18271_config = {
+       .gate    = TDA18271_GATE_ANALOG,
+};
+
 /* ==================================================================
  * Core code
  */
@@ -1487,6 +1504,19 @@ static int dvb_init(struct saa7134_dev *dev)
                                wprintk("%s: No zl10039 found!\n",
                                        __func__);
 
+               break;
+       case SAA7134_BOARD_ZOLID_HYBRID_PCI:
+               fe0->dvb.frontend = dvb_attach(tda10048_attach,
+                                              &zolid_tda10048_config,
+                                              &dev->i2c_adap);
+               if (fe0->dvb.frontend != NULL) {
+                       dvb_attach(tda829x_attach, fe0->dvb.frontend,
+                                  &dev->i2c_adap, 0x4b,
+                                  &tda829x_no_probe);
+                       dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                                  0x60, &dev->i2c_adap,
+                                  &zolid_tda18271_config);
+               }
                break;
        default:
                wprintk("Huh? unknown DVB card?\n");
index e1e83c7..a0e8c62 100644 (file)
@@ -251,6 +251,10 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        if (data[10] != 0x6b && data[11] != 0x86 && disable_other_ir)
                return 0;
 
+       /* Wrong data decode fix */
+       if (data[9] != (unsigned char)(~data[8]))
+               return 0;
+
        *ir_key = data[9];
        *ir_raw = data[9];
 
index d18bb96..6ee3e9b 100644 (file)
@@ -296,6 +296,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_AVERMEDIA_STUDIO_505  170
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
+#define SAA7134_BOARD_ZOLID_HYBRID_PCI         173
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
diff --git a/drivers/media/video/saa7164/Kconfig b/drivers/media/video/saa7164/Kconfig
new file mode 100644 (file)
index 0000000..3532637
--- /dev/null
@@ -0,0 +1,18 @@
+config VIDEO_SAA7164
+       tristate "NXP SAA7164 support"
+       depends on DVB_CORE && PCI && I2C
+       select I2C_ALGOBIT
+       select FW_LOADER
+       select VIDEO_TUNER
+       select VIDEO_TVEEPROM
+       select VIDEOBUF_DVB
+       select DVB_TDA10048 if !DVB_FE_CUSTOMISE
+       select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
+       ---help---
+         This is a video4linux driver for NXP SAA7164 based
+         TV cards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called saa7164
+
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile
new file mode 100644 (file)
index 0000000..4b329fd
--- /dev/null
@@ -0,0 +1,12 @@
+saa7164-objs   := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
+                       saa7164-fw.o saa7164-bus.o saa7164-cmd.o saa7164-api.o \
+                       saa7164-buffer.o
+
+obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
+
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
new file mode 100644 (file)
index 0000000..bb6df1b
--- /dev/null
@@ -0,0 +1,600 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/wait.h>
+
+#include "saa7164.h"
+
+int saa7164_api_transition_port(struct saa7164_tsport *port, u8 mode)
+{
+       int ret;
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.unitid, SET_CUR,
+               SAA_STATE_CONTROL, sizeof(mode), &mode);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version)
+{
+       int ret;
+
+       ret = saa7164_cmd_send(dev, 0, GET_CUR,
+               GET_FW_VERSION_CONTROL, sizeof(u32), version);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen)
+{
+       u8 reg[] = { 0x0f, 0x00 };
+
+       if (buflen < 128)
+               return -ENOMEM;
+
+       /* Assumption: Hauppauge eeprom is at 0xa0 on on bus 0 */
+       /* TODO: Pull the details from the boards struct */
+       return saa7164_api_i2c_read(&dev->i2c_bus[0], 0xa0 >> 1, sizeof(reg),
+               &reg[0], 128, buf);
+}
+
+
+int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev,
+       struct saa7164_tsport *port,
+       tmComResTSFormatDescrHeader_t *tsfmt)
+{
+       dprintk(DBGLVL_API, "    bFormatIndex = 0x%x\n", tsfmt->bFormatIndex);
+       dprintk(DBGLVL_API, "    bDataOffset  = 0x%x\n", tsfmt->bDataOffset);
+       dprintk(DBGLVL_API, "    bPacketLength= 0x%x\n", tsfmt->bPacketLength);
+       dprintk(DBGLVL_API, "    bStrideLength= 0x%x\n", tsfmt->bStrideLength);
+       dprintk(DBGLVL_API, "    bguid        = (....)\n");
+
+       /* Cache the hardware configuration in the port */
+
+       port->bufcounter = port->hwcfg.BARLocation;
+       port->pitch = port->hwcfg.BARLocation + (2 * sizeof(u32));
+       port->bufsize = port->hwcfg.BARLocation + (3 * sizeof(u32));
+       port->bufoffset = port->hwcfg.BARLocation + (4 * sizeof(u32));
+       port->bufptr32l = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount) + sizeof(u32);
+       port->bufptr32h = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount);
+       port->bufptr64 = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount);
+       dprintk(DBGLVL_API, "   = port->hwcfg.BARLocation = 0x%x\n",
+               port->hwcfg.BARLocation);
+
+       dprintk(DBGLVL_API, "   = VS_FORMAT_MPEGTS (becomes dev->ts[%d])\n",
+               port->nr);
+
+       return 0;
+}
+
+int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
+{
+       struct saa7164_tsport *port = 0;
+       u32 idx, next_offset;
+       int i;
+       tmComResDescrHeader_t *hdr, *t;
+       tmComResExtDevDescrHeader_t *exthdr;
+       tmComResPathDescrHeader_t *pathhdr;
+       tmComResAntTermDescrHeader_t *anttermhdr;
+       tmComResTunerDescrHeader_t *tunerunithdr;
+       tmComResDMATermDescrHeader_t *vcoutputtermhdr;
+       tmComResTSFormatDescrHeader_t *tsfmt;
+       u32 currpath = 0;
+
+       dprintk(DBGLVL_API,
+               "%s(?,?,%d) sizeof(tmComResDescrHeader_t) = %d bytes\n",
+               __func__, len, (u32)sizeof(tmComResDescrHeader_t));
+
+       for (idx = 0; idx < (len - sizeof(tmComResDescrHeader_t)); ) {
+
+               hdr = (tmComResDescrHeader_t *)(buf + idx);
+
+               if (hdr->type != CS_INTERFACE)
+                       return SAA_ERR_NOT_SUPPORTED;
+
+               dprintk(DBGLVL_API, "@ 0x%x = \n", idx);
+               switch (hdr->subtype) {
+               case GENERAL_REQUEST:
+                       dprintk(DBGLVL_API, " GENERAL_REQUEST\n");
+                       break;
+               case VC_TUNER_PATH:
+                       dprintk(DBGLVL_API, " VC_TUNER_PATH\n");
+                       pathhdr = (tmComResPathDescrHeader_t *)(buf + idx);
+                       dprintk(DBGLVL_API, "  pathid = 0x%x\n",
+                               pathhdr->pathid);
+                       currpath = pathhdr->pathid;
+                       break;
+               case VC_INPUT_TERMINAL:
+                       dprintk(DBGLVL_API, " VC_INPUT_TERMINAL\n");
+                       anttermhdr =
+                               (tmComResAntTermDescrHeader_t *)(buf + idx);
+                       dprintk(DBGLVL_API, "  terminalid   = 0x%x\n",
+                               anttermhdr->terminalid);
+                       dprintk(DBGLVL_API, "  terminaltype = 0x%x\n",
+                               anttermhdr->terminaltype);
+                       switch (anttermhdr->terminaltype) {
+                       case ITT_ANTENNA:
+                               dprintk(DBGLVL_API, "   = ITT_ANTENNA\n");
+                               break;
+                       case LINE_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = LINE_CONNECTOR\n");
+                               break;
+                       case SPDIF_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = SPDIF_CONNECTOR\n");
+                               break;
+                       case COMPOSITE_CONNECTOR:
+                               dprintk(DBGLVL_API,
+                                       "   = COMPOSITE_CONNECTOR\n");
+                               break;
+                       case SVIDEO_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = SVIDEO_CONNECTOR\n");
+                               break;
+                       case COMPONENT_CONNECTOR:
+                               dprintk(DBGLVL_API,
+                                       "   = COMPONENT_CONNECTOR\n");
+                               break;
+                       case STANDARD_DMA:
+                               dprintk(DBGLVL_API, "   = STANDARD_DMA\n");
+                               break;
+                       default:
+                               dprintk(DBGLVL_API, "   = undefined (0x%x)\n",
+                                       anttermhdr->terminaltype);
+                       }
+                       dprintk(DBGLVL_API, "  assocterminal= 0x%x\n",
+                               anttermhdr->assocterminal);
+                       dprintk(DBGLVL_API, "  iterminal    = 0x%x\n",
+                               anttermhdr->iterminal);
+                       dprintk(DBGLVL_API, "  controlsize  = 0x%x\n",
+                               anttermhdr->controlsize);
+                       break;
+               case VC_OUTPUT_TERMINAL:
+                       dprintk(DBGLVL_API, " VC_OUTPUT_TERMINAL\n");
+                       vcoutputtermhdr =
+                               (tmComResDMATermDescrHeader_t *)(buf + idx);
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               vcoutputtermhdr->unitid);
+                       dprintk(DBGLVL_API, "  terminaltype = 0x%x\n",
+                               vcoutputtermhdr->terminaltype);
+                       switch (vcoutputtermhdr->terminaltype) {
+                       case ITT_ANTENNA:
+                               dprintk(DBGLVL_API, "   = ITT_ANTENNA\n");
+                               break;
+                       case LINE_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = LINE_CONNECTOR\n");
+                               break;
+                       case SPDIF_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = SPDIF_CONNECTOR\n");
+                               break;
+                       case COMPOSITE_CONNECTOR:
+                               dprintk(DBGLVL_API,
+                                       "   = COMPOSITE_CONNECTOR\n");
+                               break;
+                       case SVIDEO_CONNECTOR:
+                               dprintk(DBGLVL_API, "   = SVIDEO_CONNECTOR\n");
+                               break;
+                       case COMPONENT_CONNECTOR:
+                               dprintk(DBGLVL_API,
+                                       "   = COMPONENT_CONNECTOR\n");
+                               break;
+                       case STANDARD_DMA:
+                               dprintk(DBGLVL_API, "   = STANDARD_DMA\n");
+                               break;
+                       default:
+                               dprintk(DBGLVL_API, "   = undefined (0x%x)\n",
+                                       vcoutputtermhdr->terminaltype);
+                       }
+                       dprintk(DBGLVL_API, "  assocterminal= 0x%x\n",
+                               vcoutputtermhdr->assocterminal);
+                       dprintk(DBGLVL_API, "  sourceid     = 0x%x\n",
+                               vcoutputtermhdr->sourceid);
+                       dprintk(DBGLVL_API, "  iterminal    = 0x%x\n",
+                               vcoutputtermhdr->iterminal);
+                       dprintk(DBGLVL_API, "  BARLocation  = 0x%x\n",
+                               vcoutputtermhdr->BARLocation);
+                       dprintk(DBGLVL_API, "  flags        = 0x%x\n",
+                               vcoutputtermhdr->flags);
+                       dprintk(DBGLVL_API, "  interruptid  = 0x%x\n",
+                               vcoutputtermhdr->interruptid);
+                       dprintk(DBGLVL_API, "  buffercount  = 0x%x\n",
+                               vcoutputtermhdr->buffercount);
+                       dprintk(DBGLVL_API, "  metadatasize = 0x%x\n",
+                               vcoutputtermhdr->metadatasize);
+                       dprintk(DBGLVL_API, "  controlsize  = 0x%x\n",
+                               vcoutputtermhdr->controlsize);
+                       dprintk(DBGLVL_API, "  numformats   = 0x%x\n",
+                               vcoutputtermhdr->numformats);
+
+                       t = (tmComResDescrHeader_t *)
+                               ((tmComResDMATermDescrHeader_t *)(buf + idx));
+                       next_offset = idx + (vcoutputtermhdr->len);
+                       for (i = 0; i < vcoutputtermhdr->numformats; i++) {
+                               t = (tmComResDescrHeader_t *)
+                                       (buf + next_offset);
+                               switch (t->subtype) {
+                               case VS_FORMAT_MPEG2TS:
+                                       tsfmt =
+                                       (tmComResTSFormatDescrHeader_t *)t;
+                                       if (currpath == 1)
+                                               port = &dev->ts1;
+                                       else
+                                               port = &dev->ts2;
+                                       memcpy(&port->hwcfg, vcoutputtermhdr,
+                                               sizeof(*vcoutputtermhdr));
+                                       saa7164_api_configure_port_mpeg2ts(dev,
+                                               port, tsfmt);
+                                       break;
+                               case VS_FORMAT_MPEG2PS:
+                                       dprintk(DBGLVL_API,
+                                               "   = VS_FORMAT_MPEG2PS\n");
+                                       break;
+                               case VS_FORMAT_VBI:
+                                       dprintk(DBGLVL_API,
+                                               "   = VS_FORMAT_VBI\n");
+                                       break;
+                               case VS_FORMAT_RDS:
+                                       dprintk(DBGLVL_API,
+                                               "   = VS_FORMAT_RDS\n");
+                                       break;
+                               case VS_FORMAT_UNCOMPRESSED:
+                                       dprintk(DBGLVL_API,
+                                       "   = VS_FORMAT_UNCOMPRESSED\n");
+                                       break;
+                               case VS_FORMAT_TYPE:
+                                       dprintk(DBGLVL_API,
+                                               "   = VS_FORMAT_TYPE\n");
+                                       break;
+                               default:
+                                       dprintk(DBGLVL_API,
+                                               "   = undefined (0x%x)\n",
+                                               t->subtype);
+                               }
+                               next_offset += t->len;
+                       }
+
+                       break;
+               case TUNER_UNIT:
+                       dprintk(DBGLVL_API, " TUNER_UNIT\n");
+                       tunerunithdr =
+                               (tmComResTunerDescrHeader_t *)(buf + idx);
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               tunerunithdr->unitid);
+                       dprintk(DBGLVL_API, "  sourceid = 0x%x\n",
+                               tunerunithdr->sourceid);
+                       dprintk(DBGLVL_API, "  iunit = 0x%x\n",
+                               tunerunithdr->iunit);
+                       dprintk(DBGLVL_API, "  tuningstandards = 0x%x\n",
+                               tunerunithdr->tuningstandards);
+                       dprintk(DBGLVL_API, "  controlsize = 0x%x\n",
+                               tunerunithdr->controlsize);
+                       dprintk(DBGLVL_API, "  controls = 0x%x\n",
+                               tunerunithdr->controls);
+                       break;
+               case VC_SELECTOR_UNIT:
+                       dprintk(DBGLVL_API, " VC_SELECTOR_UNIT\n");
+                       break;
+               case VC_PROCESSING_UNIT:
+                       dprintk(DBGLVL_API, " VC_PROCESSING_UNIT\n");
+                       break;
+               case FEATURE_UNIT:
+                       dprintk(DBGLVL_API, " FEATURE_UNIT\n");
+                       break;
+               case ENCODER_UNIT:
+                       dprintk(DBGLVL_API, " ENCODER_UNIT\n");
+                       break;
+               case EXTENSION_UNIT:
+                       dprintk(DBGLVL_API, " EXTENSION_UNIT\n");
+                       exthdr = (tmComResExtDevDescrHeader_t *)(buf + idx);
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               exthdr->unitid);
+                       dprintk(DBGLVL_API, "  deviceid = 0x%x\n",
+                               exthdr->deviceid);
+                       dprintk(DBGLVL_API, "  devicetype = 0x%x\n",
+                               exthdr->devicetype);
+                       if (exthdr->devicetype & 0x1)
+                               dprintk(DBGLVL_API, "   = Decoder Device\n");
+                       if (exthdr->devicetype & 0x2)
+                               dprintk(DBGLVL_API, "   = GPIO Source\n");
+                       if (exthdr->devicetype & 0x4)
+                               dprintk(DBGLVL_API, "   = Video Decoder\n");
+                       if (exthdr->devicetype & 0x8)
+                               dprintk(DBGLVL_API, "   = Audio Decoder\n");
+                       if (exthdr->devicetype & 0x20)
+                               dprintk(DBGLVL_API, "   = Crossbar\n");
+                       if (exthdr->devicetype & 0x40)
+                               dprintk(DBGLVL_API, "   = Tuner\n");
+                       if (exthdr->devicetype & 0x80)
+                               dprintk(DBGLVL_API, "   = IF PLL\n");
+                       if (exthdr->devicetype & 0x100)
+                               dprintk(DBGLVL_API, "   = Demodulator\n");
+                       if (exthdr->devicetype & 0x200)
+                               dprintk(DBGLVL_API, "   = RDS Decoder\n");
+                       if (exthdr->devicetype & 0x400)
+                               dprintk(DBGLVL_API, "   = Encoder\n");
+                       if (exthdr->devicetype & 0x800)
+                               dprintk(DBGLVL_API, "   = IR Decoder\n");
+                       if (exthdr->devicetype & 0x1000)
+                               dprintk(DBGLVL_API, "   = EEPROM\n");
+                       if (exthdr->devicetype & 0x2000)
+                               dprintk(DBGLVL_API,
+                                       "   = VBI Decoder\n");
+                       if (exthdr->devicetype & 0x10000)
+                               dprintk(DBGLVL_API,
+                                       "   = Streaming Device\n");
+                       if (exthdr->devicetype & 0x20000)
+                               dprintk(DBGLVL_API,
+                                       "   = DRM Device\n");
+                       if (exthdr->devicetype & 0x40000000)
+                               dprintk(DBGLVL_API,
+                                       "   = Generic Device\n");
+                       if (exthdr->devicetype & 0x80000000)
+                               dprintk(DBGLVL_API,
+                                       "   = Config Space Device\n");
+                       dprintk(DBGLVL_API, "  numgpiopins = 0x%x\n",
+                               exthdr->numgpiopins);
+                       dprintk(DBGLVL_API, "  numgpiogroups = 0x%x\n",
+                               exthdr->numgpiogroups);
+                       dprintk(DBGLVL_API, "  controlsize = 0x%x\n",
+                               exthdr->controlsize);
+                       break;
+               case PVC_INFRARED_UNIT:
+                       dprintk(DBGLVL_API, " PVC_INFRARED_UNIT\n");
+                       break;
+               case DRM_UNIT:
+                       dprintk(DBGLVL_API, " DRM_UNIT\n");
+                       break;
+               default:
+                       dprintk(DBGLVL_API, "default %d\n", hdr->subtype);
+               }
+
+               dprintk(DBGLVL_API, " 1.%x\n", hdr->len);
+               dprintk(DBGLVL_API, " 2.%x\n", hdr->type);
+               dprintk(DBGLVL_API, " 3.%x\n", hdr->subtype);
+               dprintk(DBGLVL_API, " 4.%x\n", hdr->unitid);
+
+               idx += hdr->len;
+       }
+
+       return 0;
+}
+
+int saa7164_api_enum_subdevs(struct saa7164_dev *dev)
+{
+       int ret;
+       u32 buflen = 0;
+       u8 *buf;
+
+       dprintk(DBGLVL_API, "%s()\n", __func__);
+
+       /* Get the total descriptor length */
+       ret = saa7164_cmd_send(dev, 0, GET_LEN,
+               GET_DESCRIPTORS_CONTROL, sizeof(buflen), &buflen);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       dprintk(DBGLVL_API, "%s() total descriptor size = %d bytes.\n",
+               __func__, buflen);
+
+       /* Allocate enough storage for all of the descs */
+       buf = kzalloc(buflen, GFP_KERNEL);
+       if (buf == NULL)
+               return SAA_ERR_NO_RESOURCES;
+
+       /* Retrieve them */
+       ret = saa7164_cmd_send(dev, 0, GET_CUR,
+               GET_DESCRIPTORS_CONTROL, buflen, buf);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+               goto out;
+       }
+
+       if (debug & DBGLVL_API)
+               saa7164_dumphex16(dev, buf, (buflen/16)*16);
+
+       saa7164_api_dump_subdevs(dev, buf, buflen);
+
+out:
+       kfree(buf);
+       return ret;
+}
+
+int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
+       u32 datalen, u8 *data)
+{
+       struct saa7164_dev *dev = bus->dev;
+       u16 len = 0;
+       int unitid;
+       u32 regval;
+       u8 buf[256];
+       int ret;
+
+       dprintk(DBGLVL_API, "%s()\n", __func__);
+
+       if (reglen > 4)
+               return -EIO;
+
+       if (reglen == 1)
+               regval = *(reg);
+       else
+       if (reglen == 2)
+               regval = ((*(reg) << 8) || *(reg+1));
+       else
+       if (reglen == 3)
+               regval = ((*(reg) << 16) | (*(reg+1) << 8) | *(reg+2));
+       else
+       if (reglen == 4)
+               regval = ((*(reg) << 24) | (*(reg+1) << 16) |
+                       (*(reg+2) << 8) | *(reg+3));
+
+       /* Prepare the send buffer */
+       /* Bytes 00-03 source register length
+        *       04-07 source bytes to read
+        *       08... register address
+        */
+       memset(buf, 0, sizeof(buf));
+       memcpy((buf + 2 * sizeof(u32) + 0), reg, reglen);
+       *((u32 *)(buf + 0 * sizeof(u32))) = reglen;
+       *((u32 *)(buf + 1 * sizeof(u32))) = datalen;
+
+       unitid = saa7164_i2caddr_to_unitid(bus, addr);
+       if (unitid < 0) {
+               printk(KERN_ERR
+                       "%s() error, cannot translate regaddr 0x%x to unitid\n",
+                       __func__, addr);
+               return -EIO;
+       }
+
+       ret = saa7164_cmd_send(bus->dev, unitid, GET_LEN,
+               EXU_REGISTER_ACCESS_CONTROL, sizeof(len), &len);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() error, ret(1) = 0x%x\n", __func__, ret);
+               return -EIO;
+       }
+
+       dprintk(DBGLVL_API, "%s() len = %d bytes\n", __func__, len);
+
+       if (debug & DBGLVL_I2C)
+               saa7164_dumphex16(dev, buf, 2 * 16);
+
+       ret = saa7164_cmd_send(bus->dev, unitid, GET_CUR,
+               EXU_REGISTER_ACCESS_CONTROL, len, &buf);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret);
+       else {
+               if (debug & DBGLVL_I2C)
+                       saa7164_dumphex16(dev, buf, sizeof(buf));
+               memcpy(data, (buf + 2 * sizeof(u32) + reglen), datalen);
+       }
+
+       return ret == SAA_OK ? 0 : -EIO;
+}
+
+/* For a given 8 bit i2c address device, write the buffer */
+int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen,
+       u8 *data)
+{
+       struct saa7164_dev *dev = bus->dev;
+       u16 len = 0;
+       int unitid;
+       int reglen;
+       u8 buf[256];
+       int ret;
+
+       dprintk(DBGLVL_API, "%s()\n", __func__);
+
+       if ((datalen == 0) || (datalen > 232))
+               return -EIO;
+
+       memset(buf, 0, sizeof(buf));
+
+       unitid = saa7164_i2caddr_to_unitid(bus, addr);
+       if (unitid < 0) {
+               printk(KERN_ERR
+                       "%s() error, cannot translate regaddr 0x%x to unitid\n",
+                       __func__, addr);
+               return -EIO;
+       }
+
+       reglen = saa7164_i2caddr_to_reglen(bus, addr);
+       if (unitid < 0) {
+               printk(KERN_ERR
+                       "%s() error, cannot translate regaddr to reglen\n",
+                       __func__);
+               return -EIO;
+       }
+
+       ret = saa7164_cmd_send(bus->dev, unitid, GET_LEN,
+               EXU_REGISTER_ACCESS_CONTROL, sizeof(len), &len);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() error, ret(1) = 0x%x\n", __func__, ret);
+               return -EIO;
+       }
+
+       dprintk(DBGLVL_API, "%s() len = %d bytes\n", __func__, len);
+
+       /* Prepare the send buffer */
+       /* Bytes 00-03 dest register length
+        *       04-07 dest bytes to write
+        *       08... register address
+        */
+       *((u32 *)(buf + 0 * sizeof(u32))) = reglen;
+       *((u32 *)(buf + 1 * sizeof(u32))) = datalen - reglen;
+       memcpy((buf + 2 * sizeof(u32)), data, datalen);
+
+       if (debug & DBGLVL_I2C)
+               saa7164_dumphex16(dev, buf, sizeof(buf));
+
+       ret = saa7164_cmd_send(bus->dev, unitid, SET_CUR,
+               EXU_REGISTER_ACCESS_CONTROL, len, &buf);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret);
+
+       return ret == SAA_OK ? 0 : -EIO;
+}
+
+
+int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid,
+       u8 pin, u8 state)
+{
+       int ret;
+       tmComResGPIO_t t;
+
+       dprintk(DBGLVL_API, "%s(0x%x, %d, %d)\n",
+               __func__, unitid, pin, state);
+
+       if ((pin > 7) || (state > 2))
+               return SAA_ERR_BAD_PARAMETER;
+
+       t.pin = pin;
+       t.state = state;
+
+       ret = saa7164_cmd_send(dev, unitid, SET_CUR,
+               EXU_GPIO_CONTROL, sizeof(t), &t);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n",
+                       __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_set_gpiobit(struct saa7164_dev *dev, u8 unitid,
+       u8 pin)
+{
+       return saa7164_api_modify_gpio(dev, unitid, pin, 1);
+}
+
+int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid,
+       u8 pin)
+{
+       return saa7164_api_modify_gpio(dev, unitid, pin, 0);
+}
+
+
+
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c
new file mode 100644 (file)
index 0000000..9ca5c83
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "saa7164.h"
+
+/* The PCI address space for buffer handling looks like this:
+
+ +-u32 wide-------------+
+ |                      +
+ +-u64 wide------------------------------------+
+ +                                             +
+ +----------------------+
+ | CurrentBufferPtr     + Pointer to current PCI buffer >-+
+ +----------------------+                                 |
+ | Unused               +                                 |
+ +----------------------+                                 |
+ | Pitch                + = 188 (bytes)                   |
+ +----------------------+                                 |
+ | PCI buffer size      + = pitch * number of lines (312) |
+ +----------------------+                                 |
+ |0| Buf0 Write Offset  +                                 |
+ +----------------------+                                 v
+ |1| Buf1 Write Offset  +                                 |
+ +----------------------+                                 |
+ |2| Buf2 Write Offset  +                                 |
+ +----------------------+                                 |
+ |3| Buf3 Write Offset  +                                 |
+ +----------------------+                                 |
+ ... More write offsets                                   |
+ +---------------------------------------------+          |
+ +0| set of ptrs to PCI pagetables             +          |
+ +---------------------------------------------+          |
+ +1| set of ptrs to PCI pagetables             + <--------+
+ +---------------------------------------------+
+ +2| set of ptrs to PCI pagetables             +
+ +---------------------------------------------+
+ +3| set of ptrs to PCI pagetables             + >--+
+ +---------------------------------------------+    |
+ ... More buffer pointers                           |  +----------------+
+                                                   +->| pt[0] TS data  |
+                                                   |  +----------------+
+                                                   |
+                                                   |  +----------------+
+                                                   +->| pt[1] TS data  |
+                                                   |  +----------------+
+                                                   | etc
+ */
+
+/* Allocate a new buffer structure and associated PCI space in bytes.
+ * len must be a multiple of sizeof(u64)
+ */
+struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port,
+       u32 len)
+{
+       struct saa7164_buffer *buf = 0;
+       struct saa7164_dev *dev = port->dev;
+       int i;
+
+       if ((len == 0) || (len >= 65536) || (len % sizeof(u64))) {
+               log_warn("%s() SAA_ERR_BAD_PARAMETER\n", __func__);
+               goto ret;
+       }
+
+       buf = kzalloc(sizeof(struct saa7164_buffer), GFP_KERNEL);
+       if (buf == NULL) {
+               log_warn("%s() SAA_ERR_NO_RESOURCES\n", __func__);
+               goto ret;
+       }
+
+       buf->port = port;
+       buf->flags = SAA7164_BUFFER_FREE;
+       /* TODO: arg len is being ignored */
+       buf->pci_size = SAA7164_PT_ENTRIES * 0x1000;
+       buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000;
+
+       /* Allocate contiguous memory */
+       buf->cpu = pci_alloc_consistent(port->dev->pci, buf->pci_size,
+               &buf->dma);
+       if (!buf->cpu)
+               goto fail1;
+
+       buf->pt_cpu = pci_alloc_consistent(port->dev->pci, buf->pt_size,
+               &buf->pt_dma);
+       if (!buf->pt_cpu)
+               goto fail2;
+
+       /* init the buffers to a known pattern, easier during debugging */
+       memset(buf->cpu, 0xff, buf->pci_size);
+       memset(buf->pt_cpu, 0xff, buf->pt_size);
+
+       dprintk(DBGLVL_BUF, "%s()   allocated buffer @ 0x%p\n", __func__, buf);
+       dprintk(DBGLVL_BUF, "  pci_cpu @ 0x%p    dma @ 0x%08lx len = 0x%x\n",
+               buf->cpu, (long)buf->dma, buf->pci_size);
+       dprintk(DBGLVL_BUF, "   pt_cpu @ 0x%p pt_dma @ 0x%08lx len = 0x%x\n",
+               buf->pt_cpu, (long)buf->pt_dma, buf->pt_size);
+
+       /* Format the Page Table Entries to point into the data buffer */
+       for (i = 0 ; i < SAA7164_PT_ENTRIES; i++) {
+
+               *(buf->pt_cpu + i) = buf->dma + (i * 0x1000); /* TODO */
+
+       }
+
+       goto ret;
+
+fail2:
+       pci_free_consistent(port->dev->pci, buf->pci_size, buf->cpu, buf->dma);
+fail1:
+       kfree(buf);
+
+       buf = 0;
+ret:
+       return buf;
+}
+
+int saa7164_buffer_dealloc(struct saa7164_tsport *port,
+       struct saa7164_buffer *buf)
+{
+       struct saa7164_dev *dev = port->dev;
+
+       if ((buf == 0) || (port == 0))
+               return SAA_ERR_BAD_PARAMETER;
+
+       dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n", __func__, buf);
+
+       if (buf->flags != SAA7164_BUFFER_FREE)
+               log_warn(" freeing a non-free buffer\n");
+
+       pci_free_consistent(port->dev->pci, buf->pci_size, buf->cpu, buf->dma);
+       pci_free_consistent(port->dev->pci, buf->pt_size, buf->pt_cpu,
+               buf->pt_dma);
+
+       kfree(buf);
+
+       return SAA_OK;
+}
+
diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c
new file mode 100644 (file)
index 0000000..83a0464
--- /dev/null
@@ -0,0 +1,448 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "saa7164.h"
+
+/* The message bus to/from the firmware is a ring buffer in PCI address
+ * space. Establish the defaults.
+ */
+int saa7164_bus_setup(struct saa7164_dev *dev)
+{
+       tmComResBusInfo_t *b    = &dev->bus;
+
+       mutex_init(&b->lock);
+
+       b->Type                 = TYPE_BUS_PCIe;
+       b->m_wMaxReqSize        = SAA_DEVICE_MAXREQUESTSIZE;
+
+       b->m_pdwSetRing         = (u8 *)(dev->bmmio +
+               ((u32)dev->busdesc.CommandRing));
+
+       b->m_dwSizeSetRing      = SAA_DEVICE_BUFFERBLOCKSIZE;
+
+       b->m_pdwGetRing         = (u8 *)(dev->bmmio +
+               ((u32)dev->busdesc.ResponseRing));
+
+       b->m_dwSizeGetRing      = SAA_DEVICE_BUFFERBLOCKSIZE;
+
+       b->m_pdwSetWritePos     = (u32 *)((u8 *)(dev->bmmio +
+               ((u32)dev->intfdesc.BARLocation) + (2 * sizeof(u64))));
+
+       b->m_pdwSetReadPos      = (u32 *)((u8 *)b->m_pdwSetWritePos +
+               1 * sizeof(u32));
+
+       b->m_pdwGetWritePos     = (u32 *)((u8 *)b->m_pdwSetWritePos +
+               2 * sizeof(u32));
+
+       b->m_pdwGetReadPos      = (u32 *)((u8 *)b->m_pdwSetWritePos +
+               3 * sizeof(u32));
+
+       return 0;
+}
+
+void saa7164_bus_dump(struct saa7164_dev *dev)
+{
+       tmComResBusInfo_t *b = &dev->bus;
+
+       dprintk(DBGLVL_BUS, "Dumping the bus structure:\n");
+       dprintk(DBGLVL_BUS, " .type             = %d\n", b->Type);
+       dprintk(DBGLVL_BUS, " .dev->bmmio       = 0x%p\n", dev->bmmio);
+       dprintk(DBGLVL_BUS, " .m_wMaxReqSize    = 0x%x\n", b->m_wMaxReqSize);
+       dprintk(DBGLVL_BUS, " .m_pdwSetRing     = 0x%p\n", b->m_pdwSetRing);
+       dprintk(DBGLVL_BUS, " .m_dwSizeSetRing  = 0x%x\n", b->m_dwSizeSetRing);
+       dprintk(DBGLVL_BUS, " .m_pdwGetRing     = 0x%p\n", b->m_pdwGetRing);
+       dprintk(DBGLVL_BUS, " .m_dwSizeGetRing  = 0x%x\n", b->m_dwSizeGetRing);
+
+       dprintk(DBGLVL_BUS, " .m_pdwSetWritePos = 0x%p (0x%08x)\n",
+               b->m_pdwSetWritePos, *b->m_pdwSetWritePos);
+
+       dprintk(DBGLVL_BUS, " .m_pdwSetReadPos  = 0x%p (0x%08x)\n",
+               b->m_pdwSetReadPos, *b->m_pdwSetReadPos);
+
+       dprintk(DBGLVL_BUS, " .m_pdwGetWritePos = 0x%p (0x%08x)\n",
+               b->m_pdwGetWritePos, *b->m_pdwGetWritePos);
+
+       dprintk(DBGLVL_BUS, " .m_pdwGetReadPos  = 0x%p (0x%08x)\n",
+               b->m_pdwGetReadPos, *b->m_pdwGetReadPos);
+}
+
+void saa7164_bus_dumpmsg(struct saa7164_dev *dev, tmComResInfo_t* m, void *buf)
+{
+       dprintk(DBGLVL_BUS, "Dumping msg structure:\n");
+       dprintk(DBGLVL_BUS, " .id               = %d\n",   m->id);
+       dprintk(DBGLVL_BUS, " .flags            = 0x%x\n", m->flags);
+       dprintk(DBGLVL_BUS, " .size             = 0x%x\n", m->size);
+       dprintk(DBGLVL_BUS, " .command          = 0x%x\n", m->command);
+       dprintk(DBGLVL_BUS, " .controlselector  = 0x%x\n", m->controlselector);
+       dprintk(DBGLVL_BUS, " .seqno            = %d\n",   m->seqno);
+       if (buf)
+               dprintk(DBGLVL_BUS, " .buffer (ignored)\n");
+}
+
+/*
+ * Places a command or a response on the bus. The implementation does not
+ * know if it is a command or a response it just places the data on the
+ * bus depending on the bus information given in the tmComResBusInfo_t
+ * structure. If the command or response does not fit into the bus ring
+ * buffer it will be refused.
+ *
+ * Return Value:
+ *  SAA_OK     The function executed successfully.
+ *  < 0        One or more members are not initialized.
+ */
+int saa7164_bus_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf)
+{
+       tmComResBusInfo_t *bus = &dev->bus;
+       u32 bytes_to_write, read_distance, timeout, curr_srp, curr_swp;
+       u32 new_swp, space_rem;
+       int ret = SAA_ERR_BAD_PARAMETER;
+
+       if (!msg) {
+               printk(KERN_ERR "%s() !msg\n", __func__);
+               return SAA_ERR_BAD_PARAMETER;
+       }
+
+       dprintk(DBGLVL_BUS, "%s()\n", __func__);
+
+       msg->size = cpu_to_le16(msg->size);
+       msg->command = cpu_to_le16(msg->command);
+       msg->controlselector = cpu_to_le16(msg->controlselector);
+
+       if (msg->size > dev->bus.m_wMaxReqSize) {
+               printk(KERN_ERR "%s() Exceeded dev->bus.m_wMaxReqSize\n",
+                       __func__);
+               return SAA_ERR_BAD_PARAMETER;
+       }
+
+       if ((msg->size > 0) && (buf == 0)) {
+               printk(KERN_ERR "%s() Missing message buffer\n", __func__);
+               return SAA_ERR_BAD_PARAMETER;
+       }
+
+       /* Lock the bus from any other access */
+       mutex_lock(&bus->lock);
+
+       bytes_to_write = sizeof(*msg) + msg->size;
+       read_distance = 0;
+       timeout = SAA_BUS_TIMEOUT;
+       curr_srp = le32_to_cpu(*bus->m_pdwSetReadPos);
+       curr_swp = le32_to_cpu(*bus->m_pdwSetWritePos);
+
+       /* Deal with ring wrapping issues */
+       if (curr_srp > curr_swp)
+               /* The ring has not wrapped yet */
+               read_distance = curr_srp - curr_swp;
+       else
+               /* Deal with the wrapped ring */
+               read_distance = (curr_srp + bus->m_dwSizeSetRing) - curr_swp;
+
+       dprintk(DBGLVL_BUS, "%s() bytes_to_write = %d\n", __func__,
+               bytes_to_write);
+
+       dprintk(DBGLVL_BUS, "%s() read_distance = %d\n", __func__,
+               read_distance);
+
+       dprintk(DBGLVL_BUS, "%s() curr_srp = %x\n", __func__, curr_srp);
+       dprintk(DBGLVL_BUS, "%s() curr_swp = %x\n", __func__, curr_swp);
+
+       /* Process the msg and write the content onto the bus */
+       while (bytes_to_write >= read_distance) {
+
+               if (timeout-- == 0) {
+                       printk(KERN_ERR "%s() bus timeout\n", __func__);
+                       ret = SAA_ERR_NO_RESOURCES;
+                       goto out;
+               }
+
+               /* TODO: Review this delay, efficient? */
+               /* Wait, allowing the hardware fetch time */
+               mdelay(1);
+
+               /* Check the space usage again */
+               curr_srp = le32_to_cpu(*bus->m_pdwSetReadPos);
+
+               /* Deal with ring wrapping issues */
+               if (curr_srp > curr_swp)
+                       /* Read didn't wrap around the buffer */
+                       read_distance = curr_srp - curr_swp;
+               else
+                       /* Deal with the wrapped ring */
+                       read_distance = (curr_srp + bus->m_dwSizeSetRing) -
+                               curr_swp;
+
+       }
+
+       /* Calculate the new write position */
+       new_swp = curr_swp + bytes_to_write;
+
+       dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
+       dprintk(DBGLVL_BUS, "%s() bus->m_dwSizeSetRing = %x\n", __func__,
+               bus->m_dwSizeSetRing);
+
+       /* Mental Note: line 462 tmmhComResBusPCIe.cpp */
+
+       /* Check if we're going to wrap again */
+       if (new_swp > bus->m_dwSizeSetRing) {
+
+               /* Ring wraps */
+               new_swp -= bus->m_dwSizeSetRing;
+
+               space_rem = bus->m_dwSizeSetRing - curr_swp;
+
+               dprintk(DBGLVL_BUS, "%s() space_rem = %x\n", __func__,
+                       space_rem);
+
+               dprintk(DBGLVL_BUS, "%s() sizeof(*msg) = %d\n", __func__,
+                       (u32)sizeof(*msg));
+
+               if (space_rem < sizeof(*msg)) {
+                       dprintk(DBGLVL_BUS, "%s() tr4\n", __func__);
+
+                       /* Split the msg into pieces as the ring wraps */
+                       memcpy(bus->m_pdwSetRing + curr_swp, msg, space_rem);
+                       memcpy(bus->m_pdwSetRing, (u8 *)msg + space_rem,
+                               sizeof(*msg) - space_rem);
+
+                       memcpy(bus->m_pdwSetRing + sizeof(*msg) - space_rem,
+                               buf, msg->size);
+
+               } else if (space_rem == sizeof(*msg)) {
+                       dprintk(DBGLVL_BUS, "%s() tr5\n", __func__);
+
+                       /* Additional data at the beginning of the ring */
+                       memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+                       memcpy(bus->m_pdwSetRing, buf, msg->size);
+
+               } else {
+                       /* Additional data wraps around the ring */
+                       memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+                       if (msg->size > 0) {
+                               memcpy(bus->m_pdwSetRing + curr_swp +
+                                       sizeof(*msg), buf, space_rem -
+                                       sizeof(*msg));
+                               memcpy(bus->m_pdwSetRing, (u8 *)buf +
+                                       space_rem - sizeof(*msg),
+                                       bytes_to_write - space_rem);
+                       }
+
+               }
+
+       } /* (new_swp > bus->m_dwSizeSetRing) */
+       else {
+               dprintk(DBGLVL_BUS, "%s() tr6\n", __func__);
+
+               /* The ring buffer doesn't wrap, two simple copies */
+               memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+               memcpy(bus->m_pdwSetRing + curr_swp + sizeof(*msg), buf,
+                       msg->size);
+       }
+
+       dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
+
+       /* TODO: Convert all of the direct PCI writes into
+        * saa7164_writel/b calls for consistency.
+        */
+
+       /* Update the bus write position */
+       *bus->m_pdwSetWritePos = cpu_to_le32(new_swp);
+       ret = SAA_OK;
+
+out:
+       mutex_unlock(&bus->lock);
+       return ret;
+}
+
+/*
+ * Receive a command or a response from the bus. The implementation does not
+ * know if it is a command or a response it simply dequeues the data,
+ * depending on the bus information given in the tmComResBusInfo_t structure.
+ *
+ * Return Value:
+ *  0          The function executed successfully.
+ *  < 0        One or more members are not initialized.
+ */
+int saa7164_bus_get(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf,
+       int peekonly)
+{
+       tmComResBusInfo_t *bus = &dev->bus;
+       u32 bytes_to_read, write_distance, curr_grp, curr_gwp,
+               new_grp, buf_size, space_rem;
+       tmComResInfo_t msg_tmp;
+       int ret = SAA_ERR_BAD_PARAMETER;
+
+       if (msg == 0)
+               return ret;
+
+       if (msg->size > dev->bus.m_wMaxReqSize) {
+               printk(KERN_ERR "%s() Exceeded dev->bus.m_wMaxReqSize\n",
+                       __func__);
+               return ret;
+       }
+
+       if ((peekonly == 0) && (msg->size > 0) && (buf == 0)) {
+               printk(KERN_ERR
+                       "%s() Missing msg buf, size should be %d bytes\n",
+                       __func__, msg->size);
+               return ret;
+       }
+
+       mutex_lock(&bus->lock);
+
+       /* Peek the bus to see if a msg exists, if it's not what we're expecting
+        * then return cleanly else read the message from the bus.
+        */
+       curr_gwp = le32_to_cpu(*bus->m_pdwGetWritePos);
+       curr_grp = le32_to_cpu(*bus->m_pdwGetReadPos);
+
+       if (curr_gwp == curr_grp) {
+               dprintk(DBGLVL_BUS, "%s() No message on the bus\n", __func__);
+               ret = SAA_ERR_EMPTY;
+               goto out;
+       }
+
+       bytes_to_read = sizeof(*msg);
+
+       /* Calculate write distance to current read position */
+       write_distance = 0;
+       if (curr_gwp >= curr_grp)
+               /* Write doesn't wrap around the ring */
+               write_distance = curr_gwp - curr_grp;
+       else
+               /* Write wraps around the ring */
+               write_distance = curr_gwp + bus->m_dwSizeGetRing - curr_grp;
+
+       if (bytes_to_read > write_distance) {
+               printk(KERN_ERR "%s() No message/response found\n", __func__);
+               ret = SAA_ERR_INVALID_COMMAND;
+               goto out;
+       }
+
+       /* Calculate the new read position */
+       new_grp = curr_grp + bytes_to_read;
+       if (new_grp > bus->m_dwSizeGetRing) {
+
+               /* Ring wraps */
+               new_grp -= bus->m_dwSizeGetRing;
+               space_rem = bus->m_dwSizeGetRing - curr_grp;
+
+               memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, space_rem);
+               memcpy((u8 *)&msg_tmp + space_rem, bus->m_pdwGetRing,
+                       bytes_to_read - space_rem);
+
+       } else {
+               /* No wrapping */
+               memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, bytes_to_read);
+       }
+
+       /* No need to update the read positions, because this was a peek */
+       /* If the caller specifically want to peek, return */
+       if (peekonly) {
+               memcpy(msg, &msg_tmp, sizeof(*msg));
+               goto peekout;
+       }
+
+       /* Check if the command/response matches what is expected */
+       if ((msg_tmp.id != msg->id) || (msg_tmp.command != msg->command) ||
+               (msg_tmp.controlselector != msg->controlselector) ||
+               (msg_tmp.seqno != msg->seqno) || (msg_tmp.size != msg->size)) {
+
+               printk(KERN_ERR "%s() Unexpected msg miss-match\n", __func__);
+               saa7164_bus_dumpmsg(dev, msg, buf);
+               saa7164_bus_dumpmsg(dev, &msg_tmp, 0);
+               ret = SAA_ERR_INVALID_COMMAND;
+               goto out;
+       }
+
+       /* Get the actual command and response from the bus */
+       buf_size = msg->size;
+
+       bytes_to_read = sizeof(*msg) + msg->size;
+       /* Calculate write distance to current read position */
+       write_distance = 0;
+       if (curr_gwp >= curr_grp)
+               /* Write doesn't wrap around the ring */
+               write_distance = curr_gwp - curr_grp;
+       else
+               /* Write wraps around the ring */
+               write_distance = curr_gwp + bus->m_dwSizeGetRing - curr_grp;
+
+       if (bytes_to_read > write_distance) {
+               printk(KERN_ERR "%s() Invalid bus state, missing msg "
+                       "or mangled ring, faulty H/W / bad code?\n", __func__);
+               ret = SAA_ERR_INVALID_COMMAND;
+               goto out;
+       }
+
+       /* Calculate the new read position */
+       new_grp = curr_grp + bytes_to_read;
+       if (new_grp > bus->m_dwSizeGetRing) {
+
+               /* Ring wraps */
+               new_grp -= bus->m_dwSizeGetRing;
+               space_rem = bus->m_dwSizeGetRing - curr_grp;
+
+               if (space_rem < sizeof(*msg)) {
+                       /* msg wraps around the ring */
+                       memcpy(msg, bus->m_pdwGetRing + curr_grp, space_rem);
+                       memcpy((u8 *)msg + space_rem, bus->m_pdwGetRing,
+                               sizeof(*msg) - space_rem);
+                       if (buf)
+                               memcpy(buf, bus->m_pdwGetRing + sizeof(*msg) -
+                                       space_rem, buf_size);
+
+               } else if (space_rem == sizeof(*msg)) {
+                       memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+                       if (buf)
+                               memcpy(buf, bus->m_pdwGetRing, buf_size);
+               } else {
+                       /* Additional data wraps around the ring */
+                       memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+                       if (buf) {
+                               memcpy(buf, bus->m_pdwGetRing + curr_grp +
+                                       sizeof(*msg), space_rem - sizeof(*msg));
+                               memcpy(buf + space_rem - sizeof(*msg),
+                                       bus->m_pdwGetRing, bytes_to_read -
+                                       space_rem);
+                       }
+
+               }
+
+       } else {
+               /* No wrapping */
+               memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+               if (buf)
+                       memcpy(buf, bus->m_pdwGetRing + curr_grp + sizeof(*msg),
+                               buf_size);
+       }
+
+       /* Update the read positions, adjusting the ring */
+       *bus->m_pdwGetReadPos = cpu_to_le32(new_grp);
+
+peekout:
+       msg->size = le16_to_cpu(msg->size);
+       msg->command = le16_to_cpu(msg->command);
+       msg->controlselector = le16_to_cpu(msg->controlselector);
+       ret = SAA_OK;
+out:
+       mutex_unlock(&bus->lock);
+       return ret;
+}
+
diff --git a/drivers/media/video/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c
new file mode 100644 (file)
index 0000000..a3c2994
--- /dev/null
@@ -0,0 +1,624 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+
+#include "saa7164.h"
+
+/* The Bridge API needs to understand register widths (in bytes) for the
+ * attached I2C devices, so we can simplify the virtual i2c mechansms
+ * and keep the -i2c.c implementation clean.
+ */
+#define REGLEN_8bit    1
+#define REGLEN_16bit   2
+
+struct saa7164_board saa7164_boards[] = {
+       [SAA7164_BOARD_UNKNOWN] = {
+               /* Bridge will not load any firmware, without knowing
+                * the rev this would be fatal. */
+               .name           = "Unknown",
+       },
+       [SAA7164_BOARD_UNKNOWN_REV2] = {
+               /* Bridge will load the v2 f/w and dump descriptors */
+               /* Required during new board bringup */
+               .name           = "Generic Rev2",
+               .chiprev        = SAA7164_CHIP_REV2,
+       },
+       [SAA7164_BOARD_UNKNOWN_REV3] = {
+               /* Bridge will load the v2 f/w and dump descriptors */
+               /* Required during new board bringup */
+               .name           = "Generic Rev3",
+               .chiprev        = SAA7164_CHIP_REV3,
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2200] = {
+               .name           = "Hauppauge WinTV-HVR2200",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV3,
+               .unit           = {{
+                       .id             = 0x1d,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1b,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1e,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x10 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1f,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x12 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2200_2] = {
+               .name           = "Hauppauge WinTV-HVR2200",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV2,
+               .unit           = {{
+                       .id             = 0x06,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x05,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x10 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1e,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1f,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x12 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2200_3] = {
+               .name           = "Hauppauge WinTV-HVR2200",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV2,
+               .unit           = {{
+                       .id             = 0x1d,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x05,
+                       .type           = SAA7164_UNIT_ANALOG_DEMODULATOR,
+                       .name           = "TDA8290-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x84 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1b,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1c,
+                       .type           = SAA7164_UNIT_ANALOG_DEMODULATOR,
+                       .name           = "TDA8290-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x84 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1e,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x10 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1f,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "TDA10048-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x12 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2250] = {
+               .name           = "Hauppauge WinTV-HVR2250",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV3,
+               .unit           = {{
+                       .id             = 0x22,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x07,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x08,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x1e,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x20,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x23,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2250_2] = {
+               .name           = "Hauppauge WinTV-HVR2250",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV3,
+               .unit           = {{
+                       .id             = 0x28,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x07,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x08,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x24,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x26,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x29,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+       [SAA7164_BOARD_HAUPPAUGE_HVR2250_3] = {
+               .name           = "Hauppauge WinTV-HVR2250",
+               .porta          = SAA7164_MPEG_DVB,
+               .portb          = SAA7164_MPEG_DVB,
+               .chiprev        = SAA7164_CHIP_REV3,
+               .unit           = {{
+                       .id             = 0x26,
+                       .type           = SAA7164_UNIT_EEPROM,
+                       .name           = "4K EEPROM",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_0,
+                       .i2c_bus_addr   = 0xa0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x04,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-1",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x07,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x08,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-1 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_1,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x22,
+                       .type           = SAA7164_UNIT_TUNER,
+                       .name           = "TDA18271-2",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0xc0 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x24,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (TOP)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x32 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               }, {
+                       .id             = 0x27,
+                       .type           = SAA7164_UNIT_DIGITAL_DEMODULATOR,
+                       .name           = "CX24228/S5H1411-2 (QAM)",
+                       .i2c_bus_nr     = SAA7164_I2C_BUS_2,
+                       .i2c_bus_addr   = 0x34 >> 1,
+                       .i2c_reg_len    = REGLEN_8bit,
+               } },
+       },
+};
+const unsigned int saa7164_bcount = ARRAY_SIZE(saa7164_boards);
+
+/* ------------------------------------------------------------------ */
+/* PCI subsystem IDs                                                  */
+
+struct saa7164_subid saa7164_subids[] = {
+       {
+               .subvendor = 0x0070,
+               .subdevice = 0x8880,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2250,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8810,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2250,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8980,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2200,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8900,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2200_2,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8901,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2200_3,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x88A1,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2250_3,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8891,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2250_2,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8851,
+               .card      = SAA7164_BOARD_HAUPPAUGE_HVR2250_2,
+       },
+};
+const unsigned int saa7164_idcount = ARRAY_SIZE(saa7164_subids);
+
+void saa7164_card_list(struct saa7164_dev *dev)
+{
+       int i;
+
+       if (0 == dev->pci->subsystem_vendor &&
+           0 == dev->pci->subsystem_device) {
+               printk(KERN_ERR
+                       "%s: Board has no valid PCIe Subsystem ID and can't\n"
+                       "%s: be autodetected. Pass card=<n> insmod option to\n"
+                       "%s: workaround that. Send complaints to the vendor\n"
+                       "%s: of the TV card. Best regards,\n"
+                       "%s:         -- tux\n",
+                       dev->name, dev->name, dev->name, dev->name, dev->name);
+       } else {
+               printk(KERN_ERR
+                       "%s: Your board isn't known (yet) to the driver.\n"
+                       "%s: Try to pick one of the existing card configs via\n"
+                       "%s: card=<n> insmod option.  Updating to the latest\n"
+                       "%s: version might help as well.\n",
+                       dev->name, dev->name, dev->name, dev->name);
+       }
+
+       printk(KERN_ERR "%s: Here are valid choices for the card=<n> insmod "
+               "option:\n", dev->name);
+
+       for (i = 0; i < saa7164_bcount; i++)
+               printk(KERN_ERR "%s:    card=%d -> %s\n",
+                      dev->name, i, saa7164_boards[i].name);
+}
+
+/* TODO: clean this define up into the -cards.c structs */
+#define PCIEBRIDGE_UNITID 2
+
+void saa7164_gpio_setup(struct saa7164_dev *dev)
+{
+
+
+       switch (dev->board) {
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
+               /*
+               GPIO 2: s5h1411 / tda10048-1 demod reset
+               GPIO 3: s5h1411 / tda10048-2 demod reset
+               GPIO 7: IRBlaster Zilog reset
+                */
+
+               /* Reset parts by going in and out of reset */
+               saa7164_api_clear_gpiobit(dev, PCIEBRIDGE_UNITID, 2);
+               saa7164_api_clear_gpiobit(dev, PCIEBRIDGE_UNITID, 3);
+
+               msleep(10);
+
+               saa7164_api_set_gpiobit(dev, PCIEBRIDGE_UNITID, 2);
+               saa7164_api_set_gpiobit(dev, PCIEBRIDGE_UNITID, 3);
+               break;
+       }
+
+}
+
+static void hauppauge_eeprom(struct saa7164_dev *dev, u8 *eeprom_data)
+{
+       struct tveeprom tv;
+
+       /* TODO: Assumption: eeprom on bus 0 */
+       tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv,
+               eeprom_data);
+
+       /* Make sure we support the board model */
+       switch (tv.model) {
+       case 88001:
+               /* Development board - Limit circulation */
+               /* WinTV-HVR2250 (PCIe, Retail, full-height bracket)
+                * ATSC/QAM (TDA18271/S5H1411) and basic analog, no IR, FM */
+       case 88021:
+               /* WinTV-HVR2250 (PCIe, Retail, full-height bracket)
+                * ATSC/QAM (TDA18271/S5H1411) and basic analog, MCE CIR, FM */
+               break;
+       case 88041:
+               /* WinTV-HVR2250 (PCIe, Retail, full-height bracket)
+                * ATSC/QAM (TDA18271/S5H1411) and basic analog, no IR, FM */
+               break;
+       case 88061:
+               /* WinTV-HVR2250 (PCIe, Retail, full-height bracket)
+                * ATSC/QAM (TDA18271/S5H1411) and basic analog, FM */
+               break;
+       case 89519:
+       case 89609:
+               /* WinTV-HVR2200 (PCIe, Retail, full-height)
+                * DVB-T (TDA18271/TDA10048) and basic analog, no IR */
+               break;
+       case 89619:
+               /* WinTV-HVR2200 (PCIe, Retail, half-height)
+                * DVB-T (TDA18271/TDA10048) and basic analog, no IR */
+               break;
+       default:
+               printk(KERN_ERR "%s: Warning: Unknown Hauppauge model #%d\n",
+                       dev->name, tv.model);
+               break;
+       }
+
+       printk(KERN_INFO "%s: Hauppauge eeprom: model=%d\n", dev->name,
+               tv.model);
+}
+
+void saa7164_card_setup(struct saa7164_dev *dev)
+{
+       static u8 eeprom[256];
+
+       if (dev->i2c_bus[0].i2c_rc == 0) {
+               if (saa7164_api_read_eeprom(dev, &eeprom[0],
+                       sizeof(eeprom)) < 0)
+                       return;
+       }
+
+       switch (dev->board) {
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
+               hauppauge_eeprom(dev, &eeprom[0]);
+               break;
+       }
+}
+
+/* With most other drivers, the kernel expects to communicate with subdrivers
+ * through i2c. This bridge does not allow that, it does not expose any direct
+ * access to I2C. Instead we have to communicate through the device f/w for
+ * register access to 'processing units'. Each unit has a unique
+ * id, regardless of how the physical implementation occurs across
+ * the three physical i2c busses. The being said if we want leverge of
+ * the existing kernel drivers for tuners and demods we have to 'speak i2c',
+ * to this bridge implements 3 virtual i2c buses. This is a helper function
+ * for those.
+ *
+ * Description: Translate the kernels notion of an i2c address and bus into
+ * the appropriate unitid.
+ */
+int saa7164_i2caddr_to_unitid(struct saa7164_i2c *bus, int addr)
+{
+       /* For a given bus and i2c device address, return the saa7164 unique
+        * unitid. < 0 on error */
+
+       struct saa7164_dev *dev = bus->dev;
+       struct saa7164_unit *unit;
+       int i;
+
+       for (i = 0; i < SAA7164_MAX_UNITS; i++) {
+               unit = &saa7164_boards[dev->board].unit[i];
+
+               if (unit->type == SAA7164_UNIT_UNDEFINED)
+                       continue;
+               if ((bus->nr == unit->i2c_bus_nr) &&
+                       (addr == unit->i2c_bus_addr))
+                       return unit->id;
+       }
+
+       return -1;
+}
+
+/* The 7164 API needs to know the i2c register length in advance.
+ * this is a helper function. Based on a specific chip addr and bus return the
+ * reg length.
+ */
+int saa7164_i2caddr_to_reglen(struct saa7164_i2c *bus, int addr)
+{
+       /* For a given bus and i2c device address, return the
+        * saa7164 registry address width. < 0 on error
+        */
+
+       struct saa7164_dev *dev = bus->dev;
+       struct saa7164_unit *unit;
+       int i;
+
+       for (i = 0; i < SAA7164_MAX_UNITS; i++) {
+               unit = &saa7164_boards[dev->board].unit[i];
+
+               if (unit->type == SAA7164_UNIT_UNDEFINED)
+                       continue;
+
+               if ((bus->nr == unit->i2c_bus_nr) &&
+                       (addr == unit->i2c_bus_addr))
+                       return unit->i2c_reg_len;
+       }
+
+       return -1;
+}
+/* TODO: implement a 'findeeprom' functio like the above and fix any other
+ * eeprom related todo's in -api.c.
+ */
+
+/* Translate a unitid into a x readable device name, for display purposes.  */
+char *saa7164_unitid_name(struct saa7164_dev *dev, u8 unitid)
+{
+       char *undefed = "UNDEFINED";
+       char *bridge = "BRIDGE";
+       struct saa7164_unit *unit;
+       int i;
+
+       if (unitid == 0)
+               return bridge;
+
+       for (i = 0; i < SAA7164_MAX_UNITS; i++) {
+               unit = &saa7164_boards[dev->board].unit[i];
+
+               if (unit->type == SAA7164_UNIT_UNDEFINED)
+                       continue;
+
+               if (unitid == unit->id)
+                               return unit->name;
+       }
+
+       return undefed;
+}
+
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
new file mode 100644 (file)
index 0000000..e097f1a
--- /dev/null
@@ -0,0 +1,572 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/wait.h>
+
+#include "saa7164.h"
+
+int saa7164_cmd_alloc_seqno(struct saa7164_dev *dev)
+{
+       int i, ret = -1;
+
+       mutex_lock(&dev->lock);
+       for (i = 0; i < SAA_CMD_MAX_MSG_UNITS; i++) {
+               if (dev->cmds[i].inuse == 0) {
+                       dev->cmds[i].inuse = 1;
+                       dev->cmds[i].signalled = 0;
+                       dev->cmds[i].timeout = 0;
+                       ret = dev->cmds[i].seqno;
+                       break;
+               }
+       }
+       mutex_unlock(&dev->lock);
+
+       return ret;
+}
+
+void saa7164_cmd_free_seqno(struct saa7164_dev *dev, u8 seqno)
+{
+       mutex_lock(&dev->lock);
+       if ((dev->cmds[seqno].inuse == 1) &&
+               (dev->cmds[seqno].seqno == seqno)) {
+               dev->cmds[seqno].inuse = 0;
+               dev->cmds[seqno].signalled = 0;
+               dev->cmds[seqno].timeout = 0;
+       }
+       mutex_unlock(&dev->lock);
+}
+
+void saa7164_cmd_timeout_seqno(struct saa7164_dev *dev, u8 seqno)
+{
+       mutex_lock(&dev->lock);
+       if ((dev->cmds[seqno].inuse == 1) &&
+               (dev->cmds[seqno].seqno == seqno)) {
+               dev->cmds[seqno].timeout = 1;
+       }
+       mutex_unlock(&dev->lock);
+}
+
+u32 saa7164_cmd_timeout_get(struct saa7164_dev *dev, u8 seqno)
+{
+       int ret = 0;
+
+       mutex_lock(&dev->lock);
+       if ((dev->cmds[seqno].inuse == 1) &&
+               (dev->cmds[seqno].seqno == seqno)) {
+               ret = dev->cmds[seqno].timeout;
+       }
+       mutex_unlock(&dev->lock);
+
+       return ret;
+}
+
+/* Commands to the f/w get marshelled to/from this code then onto the PCI
+ * -bus/c running buffer. */
+int saa7164_irq_dequeue(struct saa7164_dev *dev)
+{
+       int ret = SAA_OK;
+       u32 timeout;
+       wait_queue_head_t *q = 0;
+       dprintk(DBGLVL_CMD, "%s()\n", __func__);
+
+       /* While any outstand message on the bus exists... */
+       do {
+
+               /* Peek the msg bus */
+               tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
+               ret = saa7164_bus_get(dev, &tRsp, NULL, 1);
+               if (ret != SAA_OK)
+                       break;
+
+               q = &dev->cmds[tRsp.seqno].wait;
+               timeout = saa7164_cmd_timeout_get(dev, tRsp.seqno);
+               dprintk(DBGLVL_CMD, "%s() timeout = %d\n", __func__, timeout);
+               if (!timeout) {
+                       dprintk(DBGLVL_CMD,
+                               "%s() signalled seqno(%d) (for dequeue)\n",
+                               __func__, tRsp.seqno);
+                       dev->cmds[tRsp.seqno].signalled = 1;
+                       wake_up(q);
+               } else {
+                       printk(KERN_ERR
+                               "%s() found timed out command on the bus\n",
+                                       __func__);
+               }
+       } while (0);
+
+       return ret;
+}
+
+/* Commands to the f/w get marshelled to/from this code then onto the PCI
+ * -bus/c running buffer. */
+int saa7164_cmd_dequeue(struct saa7164_dev *dev)
+{
+       int loop = 1;
+       int ret;
+       u32 timeout;
+       wait_queue_head_t *q = 0;
+       u8 tmp[512];
+       dprintk(DBGLVL_CMD, "%s()\n", __func__);
+
+       while (loop) {
+
+               tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
+               ret = saa7164_bus_get(dev, &tRsp, NULL, 1);
+               if (ret == SAA_ERR_EMPTY)
+                       return SAA_OK;
+
+               if (ret != SAA_OK)
+                       return ret;
+
+               q = &dev->cmds[tRsp.seqno].wait;
+               timeout = saa7164_cmd_timeout_get(dev, tRsp.seqno);
+               dprintk(DBGLVL_CMD, "%s() timeout = %d\n", __func__, timeout);
+               if (timeout) {
+                       printk(KERN_ERR "found timed out command on the bus\n");
+
+                       /* Clean the bus */
+                       ret = saa7164_bus_get(dev, &tRsp, &tmp, 0);
+                       printk(KERN_ERR "ret = %x\n", ret);
+                       if (ret == SAA_ERR_EMPTY)
+                               /* Someone else already fetched the response */
+                               return SAA_OK;
+
+                       if (ret != SAA_OK)
+                               return ret;
+
+                       if (tRsp.flags & PVC_CMDFLAG_CONTINUE)
+                               printk(KERN_ERR "split response\n");
+                       else
+                               saa7164_cmd_free_seqno(dev, tRsp.seqno);
+
+                       printk(KERN_ERR " timeout continue\n");
+                       continue;
+               }
+
+               dprintk(DBGLVL_CMD, "%s() signalled seqno(%d) (for dequeue)\n",
+                       __func__, tRsp.seqno);
+               dev->cmds[tRsp.seqno].signalled = 1;
+               wake_up(q);
+               return SAA_OK;
+       }
+
+       return SAA_OK;
+}
+
+int saa7164_cmd_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf)
+{
+       tmComResBusInfo_t *bus = &dev->bus;
+       u8 cmd_sent;
+       u16 size, idx;
+       u32 cmds;
+       void *tmp;
+       int ret = -1;
+
+       if (!msg) {
+               printk(KERN_ERR "%s() !msg\n", __func__);
+               return SAA_ERR_BAD_PARAMETER;
+       }
+
+       mutex_lock(&dev->cmds[msg->id].lock);
+
+       size = msg->size;
+       idx = 0;
+       cmds = size / bus->m_wMaxReqSize;
+       if (size % bus->m_wMaxReqSize == 0)
+               cmds -= 1;
+
+       cmd_sent = 0;
+
+       /* Split the request into smaller chunks */
+       for (idx = 0; idx < cmds; idx++) {
+
+               msg->flags |= SAA_CMDFLAG_CONTINUE;
+               msg->size = bus->m_wMaxReqSize;
+               tmp = buf + idx * bus->m_wMaxReqSize;
+
+               ret = saa7164_bus_set(dev, msg, tmp);
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "%s() set failed %d\n", __func__, ret);
+
+                       if (cmd_sent) {
+                               ret = SAA_ERR_BUSY;
+                               goto out;
+                       }
+                       ret = SAA_ERR_OVERFLOW;
+                       goto out;
+               }
+               cmd_sent = 1;
+       }
+
+       /* If not the last command... */
+       if (idx != 0)
+               msg->flags &= ~SAA_CMDFLAG_CONTINUE;
+
+       msg->size = size - idx * bus->m_wMaxReqSize;
+
+       ret = saa7164_bus_set(dev, msg, buf + idx * bus->m_wMaxReqSize);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() set last failed %d\n", __func__, ret);
+
+               if (cmd_sent) {
+                       ret = SAA_ERR_BUSY;
+                       goto out;
+               }
+               ret = SAA_ERR_OVERFLOW;
+               goto out;
+       }
+       ret = SAA_OK;
+
+out:
+       mutex_unlock(&dev->cmds[msg->id].lock);
+       return ret;
+}
+
+/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if
+ * the event never occured, or SAA_OK if it was signaled during the wait.
+ */
+int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
+{
+       wait_queue_head_t *q = 0;
+       int ret = SAA_BUS_TIMEOUT;
+       unsigned long stamp;
+       int r;
+
+       if (debug >= 4)
+               saa7164_bus_dump(dev);
+
+       dprintk(DBGLVL_CMD, "%s(seqno=%d)\n", __func__, seqno);
+
+       mutex_lock(&dev->lock);
+       if ((dev->cmds[seqno].inuse == 1) &&
+               (dev->cmds[seqno].seqno == seqno)) {
+               q = &dev->cmds[seqno].wait;
+       }
+       mutex_unlock(&dev->lock);
+
+       if (q) {
+               /* If we haven't been signalled we need to wait */
+               if (dev->cmds[seqno].signalled == 0) {
+                       stamp = jiffies;
+                       dprintk(DBGLVL_CMD,
+                               "%s(seqno=%d) Waiting (signalled=%d)\n",
+                               __func__, seqno, dev->cmds[seqno].signalled);
+
+                       /* Wait for signalled to be flagged or timeout */
+                       /* In a highly stressed system this can easily extend
+                        * into multiple seconds before the deferred worker
+                        * is scheduled, and we're woken up via signal.
+                        * We typically are signalled in < 50ms but it can
+                        * take MUCH longer.
+                        */
+                       wait_event_timeout(*q, dev->cmds[seqno].signalled, (HZ * waitsecs));
+                       r = time_before(jiffies, stamp + (HZ * waitsecs));
+                       if (r)
+                               ret = SAA_OK;
+                       else
+                               saa7164_cmd_timeout_seqno(dev, seqno);
+
+                       dprintk(DBGLVL_CMD, "%s(seqno=%d) Waiting res = %d "
+                               "(signalled=%d)\n", __func__, seqno, r,
+                               dev->cmds[seqno].signalled);
+               } else
+                       ret = SAA_OK;
+       } else
+               printk(KERN_ERR "%s(seqno=%d) seqno is invalid\n",
+                       __func__, seqno);
+
+       return ret;
+}
+
+void saa7164_cmd_signal(struct saa7164_dev *dev, u8 seqno)
+{
+       int i;
+       dprintk(DBGLVL_CMD, "%s()\n", __func__);
+
+       mutex_lock(&dev->lock);
+       for (i = 0; i < SAA_CMD_MAX_MSG_UNITS; i++) {
+               if (dev->cmds[i].inuse == 1) {
+                       dprintk(DBGLVL_CMD,
+                               "seqno %d inuse, sig = %d, t/out = %d\n",
+                               dev->cmds[i].seqno,
+                               dev->cmds[i].signalled,
+                               dev->cmds[i].timeout);
+               }
+       }
+
+       for (i = 0; i < SAA_CMD_MAX_MSG_UNITS; i++) {
+               if ((dev->cmds[i].inuse == 1) && ((i == 0) ||
+                       (dev->cmds[i].signalled) || (dev->cmds[i].timeout))) {
+                       dprintk(DBGLVL_CMD, "%s(seqno=%d) calling wake_up\n",
+                               __func__, i);
+                       dev->cmds[i].signalled = 1;
+                       wake_up(&dev->cmds[i].wait);
+               }
+       }
+       mutex_unlock(&dev->lock);
+}
+
+int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, tmComResCmd_t command,
+       u16 controlselector, u16 size, void *buf)
+{
+       tmComResInfo_t command_t, *pcommand_t;
+       tmComResInfo_t response_t, *presponse_t;
+       u8 errdata[256];
+       u16 resp_dsize;
+       u16 data_recd;
+       u32 loop;
+       int ret;
+       int safety = 0;
+
+       dprintk(DBGLVL_CMD, "%s(unitid = %s (%d) , command = 0x%x, "
+               "sel = 0x%x)\n", __func__, saa7164_unitid_name(dev, id), id,
+               command, controlselector);
+
+       if ((size == 0) || (buf == 0)) {
+               printk(KERN_ERR "%s() Invalid param\n", __func__);
+               return SAA_ERR_BAD_PARAMETER;
+       }
+
+       /* Prepare some basic command/response structures */
+       memset(&command_t, 0, sizeof(command_t));
+       memset(&response_t, 0, sizeof(&response_t));
+       pcommand_t = &command_t;
+       presponse_t = &response_t;
+       command_t.id = id;
+       command_t.command = command;
+       command_t.controlselector = controlselector;
+       command_t.size = size;
+
+       /* Allocate a unique sequence number */
+       ret = saa7164_cmd_alloc_seqno(dev);
+       if (ret < 0) {
+               printk(KERN_ERR "%s() No free sequences\n", __func__);
+               ret = SAA_ERR_NO_RESOURCES;
+               goto out;
+       }
+
+       command_t.seqno = (u8)ret;
+
+       /* Send Command */
+       resp_dsize = size;
+       pcommand_t->size = size;
+
+       dprintk(DBGLVL_CMD, "%s() pcommand_t.seqno = %d\n",
+               __func__, pcommand_t->seqno);
+
+       dprintk(DBGLVL_CMD, "%s() pcommand_t.size = %d\n",
+               __func__, pcommand_t->size);
+
+       ret = saa7164_cmd_set(dev, pcommand_t, buf);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() set command failed %d\n", __func__, ret);
+
+               if (ret != SAA_ERR_BUSY)
+                       saa7164_cmd_free_seqno(dev, pcommand_t->seqno);
+               else
+                       /* Flag a timeout, because at least one
+                        * command was sent */
+                       saa7164_cmd_timeout_seqno(dev, pcommand_t->seqno);
+
+               goto out;
+       }
+
+       /* With split responses we have to collect the msgs piece by piece */
+       data_recd = 0;
+       loop = 1;
+       while (loop) {
+               dprintk(DBGLVL_CMD, "%s() loop\n", __func__);
+
+               ret = saa7164_cmd_wait(dev, pcommand_t->seqno);
+               dprintk(DBGLVL_CMD, "%s() loop ret = %d\n", __func__, ret);
+
+               /* if power is down and this is not a power command ... */
+
+               if (ret == SAA_BUS_TIMEOUT) {
+                       printk(KERN_ERR "Event timed out\n");
+                       saa7164_cmd_timeout_seqno(dev, pcommand_t->seqno);
+                       return ret;
+               }
+
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "spurious error\n");
+                       return ret;
+               }
+
+               /* Peek response */
+               ret = saa7164_bus_get(dev, presponse_t, NULL, 1);
+               if (ret == SAA_ERR_EMPTY) {
+                       dprintk(4, "%s() SAA_ERR_EMPTY\n", __func__);
+                       continue;
+               }
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "peek failed\n");
+                       return ret;
+               }
+
+               dprintk(DBGLVL_CMD, "%s() presponse_t->seqno = %d\n",
+                       __func__, presponse_t->seqno);
+
+               dprintk(DBGLVL_CMD, "%s() presponse_t->flags = 0x%x\n",
+                       __func__, presponse_t->flags);
+
+               dprintk(DBGLVL_CMD, "%s() presponse_t->size = %d\n",
+                       __func__, presponse_t->size);
+
+               /* Check if the response was for our command */
+               if (presponse_t->seqno != pcommand_t->seqno) {
+
+                       dprintk(DBGLVL_CMD,
+                               "wrong event: seqno = %d, "
+                               "expected seqno = %d, "
+                               "will dequeue regardless\n",
+                               presponse_t->seqno, pcommand_t->seqno);
+
+                       ret = saa7164_cmd_dequeue(dev);
+                       if (ret != SAA_OK) {
+                               printk(KERN_ERR "dequeue failed, ret = %d\n",
+                                       ret);
+                               if (safety++ > 16) {
+                                       printk(KERN_ERR
+                                       "dequeue exceeded, safety exit\n");
+                                       return SAA_ERR_BUSY;
+                               }
+                       }
+
+                       continue;
+               }
+
+               if ((presponse_t->flags & PVC_RESPONSEFLAG_ERROR) != 0) {
+
+                       memset(&errdata[0], 0, sizeof(errdata));
+
+                       ret = saa7164_bus_get(dev, presponse_t, &errdata[0], 0);
+                       if (ret != SAA_OK) {
+                               printk(KERN_ERR "get error(2)\n");
+                               return ret;
+                       }
+
+                       saa7164_cmd_free_seqno(dev, pcommand_t->seqno);
+
+                       dprintk(DBGLVL_CMD, "%s() errdata %02x%02x%02x%02x\n",
+                               __func__, errdata[0], errdata[1], errdata[2],
+                               errdata[3]);
+
+                       /* Map error codes */
+                       dprintk(DBGLVL_CMD, "%s() cmd, error code  = 0x%x\n",
+                               __func__, errdata[0]);
+
+                       switch (errdata[0]) {
+                       case PVC_ERRORCODE_INVALID_COMMAND:
+                               dprintk(DBGLVL_CMD, "%s() INVALID_COMMAND\n",
+                                       __func__);
+                               ret = SAA_ERR_INVALID_COMMAND;
+                               break;
+                       case PVC_ERRORCODE_INVALID_DATA:
+                               dprintk(DBGLVL_CMD, "%s() INVALID_DATA\n",
+                                       __func__);
+                               ret = SAA_ERR_BAD_PARAMETER;
+                               break;
+                       case PVC_ERRORCODE_TIMEOUT:
+                               dprintk(DBGLVL_CMD, "%s() TIMEOUT\n", __func__);
+                               ret = SAA_ERR_TIMEOUT;
+                               break;
+                       case PVC_ERRORCODE_NAK:
+                               dprintk(DBGLVL_CMD, "%s() NAK\n", __func__);
+                               ret = SAA_ERR_NULL_PACKET;
+                               break;
+                       case PVC_ERRORCODE_UNKNOWN:
+                       case PVC_ERRORCODE_INVALID_CONTROL:
+                               dprintk(DBGLVL_CMD,
+                                       "%s() UNKNOWN OR INVALID CONTROL\n",
+                                       __func__);
+                       default:
+                               dprintk(DBGLVL_CMD, "%s() UNKNOWN\n", __func__);
+                               ret = SAA_ERR_NOT_SUPPORTED;
+                       }
+
+                       /* See of other commands are on the bus */
+                       if (saa7164_cmd_dequeue(dev) != SAA_OK)
+                               printk(KERN_ERR "dequeue(2) failed\n");
+
+                       return ret;
+               }
+
+               /* If response is invalid */
+               if ((presponse_t->id != pcommand_t->id) ||
+                       (presponse_t->command != pcommand_t->command) ||
+                       (presponse_t->controlselector !=
+                               pcommand_t->controlselector) ||
+                       (((resp_dsize - data_recd) != presponse_t->size) &&
+                               !(presponse_t->flags & PVC_CMDFLAG_CONTINUE)) ||
+                       ((resp_dsize - data_recd) < presponse_t->size)) {
+
+                       /* Invalid */
+                       dprintk(DBGLVL_CMD, "%s() Invalid\n", __func__);
+                       ret = saa7164_bus_get(dev, presponse_t, 0, 0);
+                       if (ret != SAA_OK) {
+                               printk(KERN_ERR "get failed\n");
+                               return ret;
+                       }
+
+                       /* See of other commands are on the bus */
+                       if (saa7164_cmd_dequeue(dev) != SAA_OK)
+                               printk(KERN_ERR "dequeue(3) failed\n");
+                       continue;
+               }
+
+               /* OK, now we're actually getting out correct response */
+               ret = saa7164_bus_get(dev, presponse_t, buf + data_recd, 0);
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "get failed\n");
+                       return ret;
+               }
+
+               data_recd = presponse_t->size + data_recd;
+               if (resp_dsize == data_recd) {
+                       dprintk(DBGLVL_CMD, "%s() Resp recd\n", __func__);
+                       break;
+               }
+
+               /* See of other commands are on the bus */
+               if (saa7164_cmd_dequeue(dev) != SAA_OK)
+                       printk(KERN_ERR "dequeue(3) failed\n");
+
+               continue;
+
+       } /* (loop) */
+
+       /* Release the sequence number allocation */
+       saa7164_cmd_free_seqno(dev, pcommand_t->seqno);
+
+       /* if powerdown signal all pending commands */
+
+       dprintk(DBGLVL_CMD, "%s() Calling dequeue then exit\n", __func__);
+
+       /* See of other commands are on the bus */
+       if (saa7164_cmd_dequeue(dev) != SAA_OK)
+               printk(KERN_ERR "dequeue(4) failed\n");
+
+       ret = SAA_OK;
+out:
+       return ret;
+}
+
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
new file mode 100644 (file)
index 0000000..f0dbead
--- /dev/null
@@ -0,0 +1,740 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kmod.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <asm/div64.h>
+
+#include "saa7164.h"
+
+MODULE_DESCRIPTION("Driver for NXP SAA7164 based TV cards");
+MODULE_AUTHOR("Steven Toth <stoth@kernellabs.com>");
+MODULE_LICENSE("GPL");
+
+/*
+  1 Basic
+  2
+  4 i2c
+  8 api
+ 16 cmd
+ 32 bus
+ */
+
+unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug messages");
+
+unsigned int waitsecs = 10;
+module_param(waitsecs, int, 0644);
+MODULE_PARM_DESC(debug, "timeout on firmware messages");
+
+static unsigned int card[]  = {[0 ... (SAA7164_MAXBOARDS - 1)] = UNSET };
+module_param_array(card,  int, NULL, 0444);
+MODULE_PARM_DESC(card, "card type");
+
+static unsigned int saa7164_devcount;
+
+static DEFINE_MUTEX(devlist);
+LIST_HEAD(saa7164_devlist);
+
+#define INT_SIZE 16
+
+static void saa7164_work_cmdhandler(struct work_struct *w)
+{
+       struct saa7164_dev *dev = container_of(w, struct saa7164_dev, workcmd);
+
+       /* Wake up any complete commands */
+       saa7164_irq_dequeue(dev);
+}
+
+static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
+{
+       struct saa7164_tsport *port = buf->port;
+
+       /* Feed the transport payload into the kernel demux */
+       dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu,
+               SAA7164_TS_NUMBER_OF_LINES);
+
+}
+
+static irqreturn_t saa7164_irq_ts(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct list_head *c, *n;
+       int wp, i = 0, rp;
+
+       /* Find the current write point from the hardware */
+       wp = saa7164_readl(port->bufcounter);
+       if (wp > (port->hwcfg.buffercount - 1))
+               BUG();
+
+       /* Find the previous buffer to the current write point */
+       if (wp == 0)
+               rp = 7;
+       else
+               rp = wp - 1;
+
+       /* Lookup the WP in the buffer list */
+       /* TODO: turn this into a worker thread */
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               buf = list_entry(c, struct saa7164_buffer, list);
+               if (i++ > port->hwcfg.buffercount)
+                       BUG();
+
+               if (buf->nr == rp) {
+                       /* Found the buffer, deal with it */
+                       dprintk(DBGLVL_IRQ, "%s() wp: %d processing: %d\n",
+                               __func__, wp, rp);
+                       saa7164_buffer_deliver(buf);
+                       break;
+               }
+
+       }
+       return 0;
+}
+
+/* Primary IRQ handler and dispatch mechanism */
+static irqreturn_t saa7164_irq(int irq, void *dev_id)
+{
+       struct saa7164_dev *dev = dev_id;
+       u32 intid, intstat[INT_SIZE/4];
+       int i, handled = 0, bit;
+
+       if (dev == 0) {
+               printk(KERN_ERR "%s() No device specified\n", __func__);
+               handled = 0;
+               goto out;
+       }
+
+       /* Check that the hardware is accessable. If the status bytes are
+        * 0xFF then the device is not accessable, the the IRQ belongs
+        * to another driver.
+        * 4 x u32 interrupt registers.
+        */
+       for (i = 0; i < INT_SIZE/4; i++) {
+
+               /* TODO: Convert into saa7164_readl() */
+               /* Read the 4 hardware interrupt registers */
+               intstat[i] = saa7164_readl(dev->int_status + (i * 4));
+
+               if (intstat[i])
+                       handled = 1;
+       }
+       if (handled == 0)
+               goto out;
+
+       /* For each of the HW interrupt registers */
+       for (i = 0; i < INT_SIZE/4; i++) {
+
+               if (intstat[i]) {
+                       /* Each function of the board has it's own interruptid.
+                        * Find the function that triggered then call
+                        * it's handler.
+                        */
+                       for (bit = 0; bit < 32; bit++) {
+
+                               if (((intstat[i] >> bit) & 0x00000001) == 0)
+                                       continue;
+
+                               /* Calculate the interrupt id (0x00 to 0x7f) */
+
+                               intid = (i * 32) + bit;
+                               if (intid == dev->intfdesc.bInterruptId) {
+                                       /* A response to an cmd/api call */
+                                       schedule_work(&dev->workcmd);
+                               } else if (intid ==
+                                       dev->ts1.hwcfg.interruptid) {
+
+                                       /* Transport path 1 */
+                                       saa7164_irq_ts(&dev->ts1);
+
+                               } else if (intid ==
+                                       dev->ts2.hwcfg.interruptid) {
+
+                                       /* Transport path 2 */
+                                       saa7164_irq_ts(&dev->ts2);
+
+                               } else {
+                                       /* Find the function */
+                                       dprintk(DBGLVL_IRQ,
+                                               "%s() unhandled interrupt "
+                                               "reg 0x%x bit 0x%x "
+                                               "intid = 0x%x\n",
+                                               __func__, i, bit, intid);
+                               }
+                       }
+
+                       /* Ack it */
+                       saa7164_writel(dev->int_ack + (i * 4), intstat[i]);
+
+               }
+       }
+out:
+       return IRQ_RETVAL(handled);
+}
+
+void saa7164_getfirmwarestatus(struct saa7164_dev *dev)
+{
+       struct saa7164_fw_status *s = &dev->fw_status;
+
+       dev->fw_status.status = saa7164_readl(SAA_DEVICE_SYSINIT_STATUS);
+       dev->fw_status.mode = saa7164_readl(SAA_DEVICE_SYSINIT_MODE);
+       dev->fw_status.spec = saa7164_readl(SAA_DEVICE_SYSINIT_SPEC);
+       dev->fw_status.inst = saa7164_readl(SAA_DEVICE_SYSINIT_INST);
+       dev->fw_status.cpuload = saa7164_readl(SAA_DEVICE_SYSINIT_CPULOAD);
+       dev->fw_status.remainheap =
+               saa7164_readl(SAA_DEVICE_SYSINIT_REMAINHEAP);
+
+       dprintk(1, "Firmware status:\n");
+       dprintk(1, " .status     = 0x%08x\n", s->status);
+       dprintk(1, " .mode       = 0x%08x\n", s->mode);
+       dprintk(1, " .spec       = 0x%08x\n", s->spec);
+       dprintk(1, " .inst       = 0x%08x\n", s->inst);
+       dprintk(1, " .cpuload    = 0x%08x\n", s->cpuload);
+       dprintk(1, " .remainheap = 0x%08x\n", s->remainheap);
+}
+
+u32 saa7164_getcurrentfirmwareversion(struct saa7164_dev *dev)
+{
+       u32 reg;
+
+       reg = saa7164_readl(SAA_DEVICE_VERSION);
+       dprintk(1, "Device running firmware version %d.%d.%d.%d (0x%x)\n",
+               (reg & 0x0000fc00) >> 10,
+               (reg & 0x000003e0) >> 5,
+               (reg & 0x0000001f),
+               (reg & 0xffff0000) >> 16,
+               reg);
+
+       return reg;
+}
+
+/* TODO: Debugging func, remove */
+void saa7164_dumphex16(struct saa7164_dev *dev, u8 *buf, int len)
+{
+       int i;
+
+       printk(KERN_INFO "--------------------> "
+               "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n");
+
+       for (i = 0; i < len; i += 16)
+               printk(KERN_INFO "         [0x%08x] "
+                       "%02x %02x %02x %02x %02x %02x %02x %02x "
+                       "%02x %02x %02x %02x %02x %02x %02x %02x\n", i,
+               *(buf+i+0), *(buf+i+1), *(buf+i+2), *(buf+i+3),
+               *(buf+i+4), *(buf+i+5), *(buf+i+6), *(buf+i+7),
+               *(buf+i+8), *(buf+i+9), *(buf+i+10), *(buf+i+11),
+               *(buf+i+12), *(buf+i+13), *(buf+i+14), *(buf+i+15));
+}
+
+/* TODO: Debugging func, remove */
+void saa7164_dumpregs(struct saa7164_dev *dev, u32 addr)
+{
+       int i;
+
+       dprintk(1, "--------------------> "
+               "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n");
+
+       for (i = 0; i < 0x100; i += 16)
+               dprintk(1, "region0[0x%08x] = "
+                       "%02x %02x %02x %02x %02x %02x %02x %02x"
+                       " %02x %02x %02x %02x %02x %02x %02x %02x\n", i,
+                       (u8)saa7164_readb(addr + i + 0),
+                       (u8)saa7164_readb(addr + i + 1),
+                       (u8)saa7164_readb(addr + i + 2),
+                       (u8)saa7164_readb(addr + i + 3),
+                       (u8)saa7164_readb(addr + i + 4),
+                       (u8)saa7164_readb(addr + i + 5),
+                       (u8)saa7164_readb(addr + i + 6),
+                       (u8)saa7164_readb(addr + i + 7),
+                       (u8)saa7164_readb(addr + i + 8),
+                       (u8)saa7164_readb(addr + i + 9),
+                       (u8)saa7164_readb(addr + i + 10),
+                       (u8)saa7164_readb(addr + i + 11),
+                       (u8)saa7164_readb(addr + i + 12),
+                       (u8)saa7164_readb(addr + i + 13),
+                       (u8)saa7164_readb(addr + i + 14),
+                       (u8)saa7164_readb(addr + i + 15)
+                       );
+}
+
+static void saa7164_dump_hwdesc(struct saa7164_dev *dev)
+{
+       dprintk(1, "@0x%p hwdesc sizeof(tmComResHWDescr_t) = %d bytes\n",
+               &dev->hwdesc, (u32)sizeof(tmComResHWDescr_t));
+
+       dprintk(1, " .bLength = 0x%x\n", dev->hwdesc.bLength);
+       dprintk(1, " .bDescriptorType = 0x%x\n", dev->hwdesc.bDescriptorType);
+       dprintk(1, " .bDescriptorSubtype = 0x%x\n",
+               dev->hwdesc.bDescriptorSubtype);
+
+       dprintk(1, " .bcdSpecVersion = 0x%x\n", dev->hwdesc.bcdSpecVersion);
+       dprintk(1, " .dwClockFrequency = 0x%x\n", dev->hwdesc.dwClockFrequency);
+       dprintk(1, " .dwClockUpdateRes = 0x%x\n", dev->hwdesc.dwClockUpdateRes);
+       dprintk(1, " .bCapabilities = 0x%x\n", dev->hwdesc.bCapabilities);
+       dprintk(1, " .dwDeviceRegistersLocation = 0x%x\n",
+               dev->hwdesc.dwDeviceRegistersLocation);
+
+       dprintk(1, " .dwHostMemoryRegion = 0x%x\n",
+               dev->hwdesc.dwHostMemoryRegion);
+
+       dprintk(1, " .dwHostMemoryRegionSize = 0x%x\n",
+               dev->hwdesc.dwHostMemoryRegionSize);
+
+       dprintk(1, " .dwHostHibernatMemRegion = 0x%x\n",
+               dev->hwdesc.dwHostHibernatMemRegion);
+
+       dprintk(1, " .dwHostHibernatMemRegionSize = 0x%x\n",
+               dev->hwdesc.dwHostHibernatMemRegionSize);
+}
+
+static void saa7164_dump_intfdesc(struct saa7164_dev *dev)
+{
+       dprintk(1, "@0x%p intfdesc "
+               "sizeof(tmComResInterfaceDescr_t) = %d bytes\n",
+               &dev->intfdesc, (u32)sizeof(tmComResInterfaceDescr_t));
+
+       dprintk(1, " .bLength = 0x%x\n", dev->intfdesc.bLength);
+       dprintk(1, " .bDescriptorType = 0x%x\n", dev->intfdesc.bDescriptorType);
+       dprintk(1, " .bDescriptorSubtype = 0x%x\n",
+               dev->intfdesc.bDescriptorSubtype);
+
+       dprintk(1, " .bFlags = 0x%x\n", dev->intfdesc.bFlags);
+       dprintk(1, " .bInterfaceType = 0x%x\n", dev->intfdesc.bInterfaceType);
+       dprintk(1, " .bInterfaceId = 0x%x\n", dev->intfdesc.bInterfaceId);
+       dprintk(1, " .bBaseInterface = 0x%x\n", dev->intfdesc.bBaseInterface);
+       dprintk(1, " .bInterruptId = 0x%x\n", dev->intfdesc.bInterruptId);
+       dprintk(1, " .bDebugInterruptId = 0x%x\n",
+               dev->intfdesc.bDebugInterruptId);
+
+       dprintk(1, " .BARLocation = 0x%x\n", dev->intfdesc.BARLocation);
+}
+
+static void saa7164_dump_busdesc(struct saa7164_dev *dev)
+{
+       dprintk(1, "@0x%p busdesc sizeof(tmComResBusDescr_t) = %d bytes\n",
+               &dev->busdesc, (u32)sizeof(tmComResBusDescr_t));
+
+       dprintk(1, " .CommandRing   = 0x%016Lx\n", dev->busdesc.CommandRing);
+       dprintk(1, " .ResponseRing  = 0x%016Lx\n", dev->busdesc.ResponseRing);
+       dprintk(1, " .CommandWrite  = 0x%x\n", dev->busdesc.CommandWrite);
+       dprintk(1, " .CommandRead   = 0x%x\n", dev->busdesc.CommandRead);
+       dprintk(1, " .ResponseWrite = 0x%x\n", dev->busdesc.ResponseWrite);
+       dprintk(1, " .ResponseRead  = 0x%x\n", dev->busdesc.ResponseRead);
+}
+
+/* Much of the hardware configuration and PCI registers are configured
+ * dynamically depending on firmware. We have to cache some initial
+ * structures then use these to locate other important structures
+ * from PCI space.
+ */
+static void saa7164_get_descriptors(struct saa7164_dev *dev)
+{
+       memcpy(&dev->hwdesc, dev->bmmio, sizeof(tmComResHWDescr_t));
+       memcpy(&dev->intfdesc, dev->bmmio + sizeof(tmComResHWDescr_t),
+               sizeof(tmComResInterfaceDescr_t));
+       memcpy(&dev->busdesc, dev->bmmio + dev->intfdesc.BARLocation,
+               sizeof(tmComResBusDescr_t));
+
+       if (dev->hwdesc.bLength != sizeof(tmComResHWDescr_t)) {
+               printk(KERN_ERR "Structure tmComResHWDescr_t is mangled\n");
+               printk(KERN_ERR "Need %x got %d\n", dev->hwdesc.bLength,
+                       (u32)sizeof(tmComResHWDescr_t));
+       } else
+               saa7164_dump_hwdesc(dev);
+
+       if (dev->intfdesc.bLength != sizeof(tmComResInterfaceDescr_t)) {
+               printk(KERN_ERR "struct tmComResInterfaceDescr_t is mangled\n");
+               printk(KERN_ERR "Need %x got %d\n", dev->intfdesc.bLength,
+                       (u32)sizeof(tmComResInterfaceDescr_t));
+       } else
+               saa7164_dump_intfdesc(dev);
+
+       saa7164_dump_busdesc(dev);
+}
+
+static int saa7164_pci_quirks(struct saa7164_dev *dev)
+{
+       return 0;
+}
+
+static int get_resources(struct saa7164_dev *dev)
+{
+       if (request_mem_region(pci_resource_start(dev->pci, 0),
+               pci_resource_len(dev->pci, 0), dev->name)) {
+
+               if (request_mem_region(pci_resource_start(dev->pci, 2),
+                       pci_resource_len(dev->pci, 2), dev->name))
+                       return 0;
+       }
+
+       printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx or 0x%llx\n",
+               dev->name,
+               (u64)pci_resource_start(dev->pci, 0),
+               (u64)pci_resource_start(dev->pci, 2));
+
+       return -EBUSY;
+}
+
+static int saa7164_dev_setup(struct saa7164_dev *dev)
+{
+       int i;
+
+       mutex_init(&dev->lock);
+       atomic_inc(&dev->refcount);
+       dev->nr = saa7164_devcount++;
+
+       sprintf(dev->name, "saa7164[%d]", dev->nr);
+
+       mutex_lock(&devlist);
+       list_add_tail(&dev->devlist, &saa7164_devlist);
+       mutex_unlock(&devlist);
+
+       /* board config */
+       dev->board = UNSET;
+       if (card[dev->nr] < saa7164_bcount)
+               dev->board = card[dev->nr];
+
+       for (i = 0; UNSET == dev->board  &&  i < saa7164_idcount; i++)
+               if (dev->pci->subsystem_vendor == saa7164_subids[i].subvendor &&
+                       dev->pci->subsystem_device ==
+                               saa7164_subids[i].subdevice)
+                               dev->board = saa7164_subids[i].card;
+
+       if (UNSET == dev->board) {
+               dev->board = SAA7164_BOARD_UNKNOWN;
+               saa7164_card_list(dev);
+       }
+
+       dev->pci_bus  = dev->pci->bus->number;
+       dev->pci_slot = PCI_SLOT(dev->pci->devfn);
+
+       /* I2C Defaults / setup */
+       dev->i2c_bus[0].dev = dev;
+       dev->i2c_bus[0].nr = 0;
+       dev->i2c_bus[1].dev = dev;
+       dev->i2c_bus[1].nr = 1;
+       dev->i2c_bus[2].dev = dev;
+       dev->i2c_bus[2].nr = 2;
+
+       /* Transport port A Defaults / setup */
+       dev->ts1.dev = dev;
+       dev->ts1.nr = 0;
+       mutex_init(&dev->ts1.dvb.lock);
+       INIT_LIST_HEAD(&dev->ts1.dmaqueue.list);
+       INIT_LIST_HEAD(&dev->ts1.dummy_dmaqueue.list);
+       mutex_init(&dev->ts1.dmaqueue_lock);
+       mutex_init(&dev->ts1.dummy_dmaqueue_lock);
+
+       /* Transport port B Defaults / setup */
+       dev->ts2.dev = dev;
+       dev->ts2.nr = 1;
+       mutex_init(&dev->ts2.dvb.lock);
+       INIT_LIST_HEAD(&dev->ts2.dmaqueue.list);
+       INIT_LIST_HEAD(&dev->ts2.dummy_dmaqueue.list);
+       mutex_init(&dev->ts2.dmaqueue_lock);
+       mutex_init(&dev->ts2.dummy_dmaqueue_lock);
+
+       if (get_resources(dev) < 0) {
+               printk(KERN_ERR "CORE %s No more PCIe resources for "
+                      "subsystem: %04x:%04x\n",
+                      dev->name, dev->pci->subsystem_vendor,
+                      dev->pci->subsystem_device);
+
+               saa7164_devcount--;
+               return -ENODEV;
+       }
+
+       /* PCI/e allocations */
+       dev->lmmio = ioremap(pci_resource_start(dev->pci, 0),
+                            pci_resource_len(dev->pci, 0));
+
+       dev->lmmio2 = ioremap(pci_resource_start(dev->pci, 2),
+                            pci_resource_len(dev->pci, 2));
+
+       dev->bmmio = (u8 __iomem *)dev->lmmio;
+       dev->bmmio2 = (u8 __iomem *)dev->lmmio2;
+
+       /* Inerrupt and ack register locations offset of bmmio */
+       dev->int_status = 0x183000 + 0xf80;
+       dev->int_ack = 0x183000 + 0xf90;
+
+       printk(KERN_INFO
+               "CORE %s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+              dev->name, dev->pci->subsystem_vendor,
+              dev->pci->subsystem_device, saa7164_boards[dev->board].name,
+              dev->board, card[dev->nr] == dev->board ?
+              "insmod option" : "autodetected");
+
+       saa7164_pci_quirks(dev);
+
+       return 0;
+}
+
+static void saa7164_dev_unregister(struct saa7164_dev *dev)
+{
+       dprintk(1, "%s()\n", __func__);
+
+       release_mem_region(pci_resource_start(dev->pci, 0),
+               pci_resource_len(dev->pci, 0));
+
+       release_mem_region(pci_resource_start(dev->pci, 2),
+               pci_resource_len(dev->pci, 2));
+
+       if (!atomic_dec_and_test(&dev->refcount))
+               return;
+
+       iounmap(dev->lmmio);
+       iounmap(dev->lmmio2);
+
+       return;
+}
+
+static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
+                                    const struct pci_device_id *pci_id)
+{
+       struct saa7164_dev *dev;
+       int err, i;
+       u32 version;
+
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (NULL == dev)
+               return -ENOMEM;
+
+       /* pci init */
+       dev->pci = pci_dev;
+       if (pci_enable_device(pci_dev)) {
+               err = -EIO;
+               goto fail_free;
+       }
+
+       if (saa7164_dev_setup(dev) < 0) {
+               err = -EINVAL;
+               goto fail_free;
+       }
+
+       /* print pci info */
+       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
+       printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
+              "latency: %d, mmio: 0x%llx\n", dev->name,
+              pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
+              dev->pci_lat,
+               (unsigned long long)pci_resource_start(pci_dev, 0));
+
+       pci_set_master(pci_dev);
+       /* TODO */
+       if (!pci_dma_supported(pci_dev, 0xffffffff)) {
+               printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
+               err = -EIO;
+               goto fail_irq;
+       }
+
+       err = request_irq(pci_dev->irq, saa7164_irq,
+               IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+       if (err < 0) {
+               printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
+                       pci_dev->irq);
+               err = -EIO;
+               goto fail_irq;
+       }
+
+       pci_set_drvdata(pci_dev, dev);
+
+       /* Init the internal command list */
+       for (i = 0; i < SAA_CMD_MAX_MSG_UNITS; i++) {
+               dev->cmds[i].seqno = i;
+               dev->cmds[i].inuse = 0;
+               mutex_init(&dev->cmds[i].lock);
+               init_waitqueue_head(&dev->cmds[i].wait);
+       }
+
+       /* We need a deferred interrupt handler for cmd handling */
+       INIT_WORK(&dev->workcmd, saa7164_work_cmdhandler);
+
+       /* Only load the firmware if we know the board */
+       if (dev->board != SAA7164_BOARD_UNKNOWN) {
+
+               err = saa7164_downloadfirmware(dev);
+               if (err < 0) {
+                       printk(KERN_ERR
+                               "Failed to boot firmware, no features "
+                               "registered\n");
+                       goto fail_fw;
+               }
+
+               saa7164_get_descriptors(dev);
+               saa7164_dumpregs(dev, 0);
+               saa7164_getcurrentfirmwareversion(dev);
+               saa7164_getfirmwarestatus(dev);
+               err = saa7164_bus_setup(dev);
+               if (err < 0)
+                       printk(KERN_ERR
+                               "Failed to setup the bus, will continue\n");
+               saa7164_bus_dump(dev);
+
+               /* Ping the running firmware via the command bus and get the
+                * firmware version, this checks the bus is running OK.
+                */
+               version = 0;
+               if (saa7164_api_get_fw_version(dev, &version) == SAA_OK)
+                       dprintk(1, "Bus is operating correctly using "
+                               "version %d.%d.%d.%d (0x%x)\n",
+                               (version & 0x0000fc00) >> 10,
+                               (version & 0x000003e0) >> 5,
+                               (version & 0x0000001f),
+                               (version & 0xffff0000) >> 16,
+                               version);
+               else
+                       printk(KERN_ERR
+                               "Failed to communicate with the firmware\n");
+
+               /* Bring up the I2C buses */
+               saa7164_i2c_register(&dev->i2c_bus[0]);
+               saa7164_i2c_register(&dev->i2c_bus[1]);
+               saa7164_i2c_register(&dev->i2c_bus[2]);
+               saa7164_gpio_setup(dev);
+               saa7164_card_setup(dev);
+
+
+               /* Parse the dynamic device configuration, find various
+                * media endpoints (MPEG, WMV, PS, TS) and cache their
+                * configuration details into the driver, so we can
+                * reference them later during simething_register() func,
+                * interrupt handlers, deferred work handlers etc.
+                */
+               saa7164_api_enum_subdevs(dev);
+
+               /* Begin to create the video sub-systems and register funcs */
+               if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) {
+                       if (saa7164_dvb_register(&dev->ts1) < 0) {
+                               printk(KERN_ERR "%s() Failed to register "
+                                       "dvb adapters on porta\n",
+                                       __func__);
+                       }
+               }
+
+               if (saa7164_boards[dev->board].portb == SAA7164_MPEG_DVB) {
+                       if (saa7164_dvb_register(&dev->ts2) < 0) {
+                               printk(KERN_ERR"%s() Failed to register "
+                                       "dvb adapters on portb\n",
+                                       __func__);
+                       }
+               }
+
+       } /* != BOARD_UNKNOWN */
+       else
+               printk(KERN_ERR "%s() Unsupported board detected, "
+                       "registering without firmware\n", __func__);
+
+       dprintk(1, "%s() parameter debug = %d\n", __func__, debug);
+       dprintk(1, "%s() parameter waitsecs = %d\n", __func__, waitsecs);
+
+fail_fw:
+       return 0;
+
+fail_irq:
+       saa7164_dev_unregister(dev);
+fail_free:
+       kfree(dev);
+       return err;
+}
+
+static void saa7164_shutdown(struct saa7164_dev *dev)
+{
+       dprintk(1, "%s()\n", __func__);
+}
+
+static void __devexit saa7164_finidev(struct pci_dev *pci_dev)
+{
+       struct saa7164_dev *dev = pci_get_drvdata(pci_dev);
+
+       saa7164_shutdown(dev);
+
+       if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB)
+               saa7164_dvb_unregister(&dev->ts1);
+
+       if (saa7164_boards[dev->board].portb == SAA7164_MPEG_DVB)
+               saa7164_dvb_unregister(&dev->ts2);
+
+       saa7164_i2c_unregister(&dev->i2c_bus[0]);
+       saa7164_i2c_unregister(&dev->i2c_bus[1]);
+       saa7164_i2c_unregister(&dev->i2c_bus[2]);
+
+       pci_disable_device(pci_dev);
+
+       /* unregister stuff */
+       free_irq(pci_dev->irq, dev);
+       pci_set_drvdata(pci_dev, NULL);
+
+       mutex_lock(&devlist);
+       list_del(&dev->devlist);
+       mutex_unlock(&devlist);
+
+       saa7164_dev_unregister(dev);
+       kfree(dev);
+}
+
+static struct pci_device_id saa7164_pci_tbl[] = {
+       {
+               /* SAA7164 */
+               .vendor       = 0x1131,
+               .device       = 0x7164,
+               .subvendor    = PCI_ANY_ID,
+               .subdevice    = PCI_ANY_ID,
+       }, {
+               /* --- end of list --- */
+       }
+};
+MODULE_DEVICE_TABLE(pci, saa7164_pci_tbl);
+
+static struct pci_driver saa7164_pci_driver = {
+       .name     = "saa7164",
+       .id_table = saa7164_pci_tbl,
+       .probe    = saa7164_initdev,
+       .remove   = __devexit_p(saa7164_finidev),
+       /* TODO */
+       .suspend  = NULL,
+       .resume   = NULL,
+};
+
+static int saa7164_init(void)
+{
+       printk(KERN_INFO "saa7164 driver loaded\n");
+       return pci_register_driver(&saa7164_pci_driver);
+}
+
+static void saa7164_fini(void)
+{
+       pci_unregister_driver(&saa7164_pci_driver);
+}
+
+module_init(saa7164_init);
+module_exit(saa7164_fini);
+
diff --git a/drivers/media/video/saa7164/saa7164-dvb.c b/drivers/media/video/saa7164/saa7164-dvb.c
new file mode 100644 (file)
index 0000000..6a2d847
--- /dev/null
@@ -0,0 +1,602 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "saa7164.h"
+
+#include "tda10048.h"
+#include "tda18271.h"
+#include "s5h1411.h"
+
+#define DRIVER_NAME "saa7164"
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+/* addr is in the card struct, get it from there */
+static struct tda10048_config hauppauge_hvr2200_1_config = {
+       .demod_address    = 0x10 >> 1,
+       .output_mode      = TDA10048_SERIAL_OUTPUT,
+       .fwbulkwritelen   = TDA10048_BULKWRITE_200,
+       .inversion        = TDA10048_INVERSION_ON,
+       .dtv6_if_freq_khz = TDA10048_IF_3300,
+       .dtv7_if_freq_khz = TDA10048_IF_3500,
+       .dtv8_if_freq_khz = TDA10048_IF_4000,
+       .clk_freq_khz     = TDA10048_CLK_16000,
+};
+static struct tda10048_config hauppauge_hvr2200_2_config = {
+       .demod_address    = 0x12 >> 1,
+       .output_mode      = TDA10048_SERIAL_OUTPUT,
+       .fwbulkwritelen   = TDA10048_BULKWRITE_200,
+       .inversion        = TDA10048_INVERSION_ON,
+       .dtv6_if_freq_khz = TDA10048_IF_3300,
+       .dtv7_if_freq_khz = TDA10048_IF_3500,
+       .dtv8_if_freq_khz = TDA10048_IF_4000,
+       .clk_freq_khz     = TDA10048_CLK_16000,
+};
+
+static struct tda18271_std_map hauppauge_tda18271_std_map = {
+       .atsc_6   = { .if_freq = 3250, .agc_mode = 3, .std = 3,
+                     .if_lvl = 6, .rfagc_top = 0x37 },
+       .qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 0,
+                     .if_lvl = 6, .rfagc_top = 0x37 },
+};
+
+static struct tda18271_config hauppauge_hvr22x0_tuner_config = {
+       .std_map        = &hauppauge_tda18271_std_map,
+       .gate           = TDA18271_GATE_ANALOG,
+       .role           = TDA18271_MASTER,
+};
+
+static struct tda18271_config hauppauge_hvr22x0s_tuner_config = {
+       .std_map        = &hauppauge_tda18271_std_map,
+       .gate           = TDA18271_GATE_ANALOG,
+       .role           = TDA18271_SLAVE,
+       .rf_cal_on_startup = 1
+};
+
+static struct s5h1411_config hauppauge_s5h1411_config = {
+       .output_mode   = S5H1411_SERIAL_OUTPUT,
+       .gpio          = S5H1411_GPIO_ON,
+       .qam_if        = S5H1411_IF_4000,
+       .vsb_if        = S5H1411_IF_3250,
+       .inversion     = S5H1411_INVERSION_ON,
+       .status_mode   = S5H1411_DEMODLOCKING,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+};
+
+static int saa7164_dvb_stop_tsport(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() stop transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_DVB, "%s()    Stopped\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+static int saa7164_dvb_acquire_tsport(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() acquire transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_DVB, "%s() Acquired\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+static int saa7164_dvb_pause_tsport(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_PAUSE);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() pause transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_DVB, "%s()   Paused\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+/* Firmware is very windows centric, meaning you have to transition
+ * the part through AVStream / KS Windows stages, forwards or backwards.
+ * States are: stopped, acquired (h/w), paused, started.
+ */
+static int saa7164_dvb_stop_streaming(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       ret = saa7164_dvb_pause_tsport(port);
+       ret = saa7164_dvb_acquire_tsport(port);
+       ret = saa7164_dvb_stop_tsport(port);
+
+       return ret;
+}
+
+static int saa7164_dvb_cfg_tsport(struct saa7164_tsport *port)
+{
+       tmHWStreamParameters_t *params = &port->hw_streamingparams;
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct list_head *c, *n;
+       int i = 0;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       saa7164_writel(port->pitch, params->pitch);
+       saa7164_writel(port->bufsize, params->pitch * params->numberoflines);
+
+       dprintk(DBGLVL_DVB, " configured:\n");
+       dprintk(DBGLVL_DVB, "   lmmio       0x%p\n", dev->lmmio);
+       dprintk(DBGLVL_DVB, "   bufcounter  0x%x = 0x%x\n", port->bufcounter,
+               saa7164_readl(port->bufcounter));
+
+       dprintk(DBGLVL_DVB, "   pitch       0x%x = %d\n", port->pitch,
+               saa7164_readl(port->pitch));
+
+       dprintk(DBGLVL_DVB, "   bufsize     0x%x = %d\n", port->bufsize,
+               saa7164_readl(port->bufsize));
+
+       dprintk(DBGLVL_DVB, "   buffercount = %d\n", port->hwcfg.buffercount);
+       dprintk(DBGLVL_DVB, "   bufoffset = 0x%x\n", port->bufoffset);
+       dprintk(DBGLVL_DVB, "   bufptr32h = 0x%x\n", port->bufptr32h);
+       dprintk(DBGLVL_DVB, "   bufptr32l = 0x%x\n", port->bufptr32l);
+
+       /* Poke the buffers and offsets into PCI space */
+       mutex_lock(&port->dmaqueue_lock);
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               buf = list_entry(c, struct saa7164_buffer, list);
+
+               /* TODO: Review this in light of 32v64 assignments */
+               saa7164_writel(port->bufoffset + (sizeof(u32) * i), 0);
+               saa7164_writel(port->bufptr32h + ((sizeof(u32) * 2) * i),
+                       buf->pt_dma);
+               saa7164_writel(port->bufptr32l + ((sizeof(u32) * 2) * i), 0);
+
+               dprintk(DBGLVL_DVB,
+                       "   buf[%d] offset 0x%llx (0x%x) "
+                       "buf 0x%llx/%llx (0x%x/%x)\n",
+                       i,
+                       (u64)port->bufoffset + (i * sizeof(u32)),
+                       saa7164_readl(port->bufoffset + (sizeof(u32) * i)),
+                       (u64)port->bufptr32h + ((sizeof(u32) * 2) * i),
+                       (u64)port->bufptr32l + ((sizeof(u32) * 2) * i),
+                       saa7164_readl(port->bufptr32h + ((sizeof(u32) * i)
+                               * 2)),
+                       saa7164_readl(port->bufptr32l + ((sizeof(u32) * i)
+                               * 2)));
+
+               if (i++ > port->hwcfg.buffercount)
+                       BUG();
+
+       }
+       mutex_unlock(&port->dmaqueue_lock);
+
+       return 0;
+}
+
+static int saa7164_dvb_start_tsport(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret = 0, result;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       saa7164_dvb_cfg_tsport(port);
+
+       /* Acquire the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() acquire transition failed, res = 0x%x\n",
+                       __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() acquire/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+               ret = -EIO;
+               goto out;
+       } else
+               dprintk(DBGLVL_DVB, "%s()   Acquired\n", __func__);
+
+       /* Pause the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_PAUSE);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() pause transition failed, res = 0x%x\n",
+                               __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() pause/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+
+               ret = -EIO;
+               goto out;
+       } else
+               dprintk(DBGLVL_DVB, "%s()   Paused\n", __func__);
+
+       /* Start the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_RUN);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() run transition failed, result = 0x%x\n",
+                               __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() run/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+
+               ret = -EIO;
+       } else
+               dprintk(DBGLVL_DVB, "%s()   Running\n", __func__);
+
+out:
+       return ret;
+}
+
+static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed)
+{
+       struct dvb_demux *demux = feed->demux;
+       struct saa7164_tsport *port = (struct saa7164_tsport *) demux->priv;
+       struct saa7164_dvb *dvb = &port->dvb;
+       struct saa7164_dev *dev = port->dev;
+       int ret = 0;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       if (!demux->dmx.frontend)
+               return -EINVAL;
+
+       if (dvb) {
+               mutex_lock(&dvb->lock);
+               if (dvb->feeding++ == 0) {
+                       /* Start transport */
+                       ret = saa7164_dvb_start_tsport(port);
+               }
+               mutex_unlock(&dvb->lock);
+               dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
+                       __func__, port->nr, dvb->feeding);
+       }
+
+       return ret;
+}
+
+static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed)
+{
+       struct dvb_demux *demux = feed->demux;
+       struct saa7164_tsport *port = (struct saa7164_tsport *) demux->priv;
+       struct saa7164_dvb *dvb = &port->dvb;
+       struct saa7164_dev *dev = port->dev;
+       int ret = 0;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       if (dvb) {
+               mutex_lock(&dvb->lock);
+               if (--dvb->feeding == 0) {
+                       /* Stop transport */
+                       ret = saa7164_dvb_stop_streaming(port);
+               }
+               mutex_unlock(&dvb->lock);
+               dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
+                       __func__, port->nr, dvb->feeding);
+       }
+
+       return ret;
+}
+
+static int dvb_register(struct saa7164_tsport *port)
+{
+       struct saa7164_dvb *dvb = &port->dvb;
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       int result, i;
+
+       dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
+
+       /* Sanity check that the PCI configuration space is active */
+       if (port->hwcfg.BARLocation == 0) {
+               result = -ENOMEM;
+               printk(KERN_ERR "%s: dvb_register_adapter failed "
+                      "(errno = %d), NO PCI configuration\n",
+                       DRIVER_NAME, result);
+               goto fail_adapter;
+       }
+
+       /* Init and establish defaults */
+       port->hw_streamingparams.bitspersample = 8;
+       port->hw_streamingparams.samplesperline = 188;
+       port->hw_streamingparams.numberoflines =
+               (SAA7164_TS_NUMBER_OF_LINES * 188) / 188;
+
+       port->hw_streamingparams.pitch = 188;
+       port->hw_streamingparams.linethreshold = 0;
+       port->hw_streamingparams.pagetablelistvirt = 0;
+       port->hw_streamingparams.pagetablelistphys = 0;
+       port->hw_streamingparams.numpagetables = 2 +
+               ((SAA7164_TS_NUMBER_OF_LINES * 188) / PAGE_SIZE);
+
+       port->hw_streamingparams.numpagetableentries = port->hwcfg.buffercount;
+
+       /* Allocate the PCI resources */
+       for (i = 0; i < port->hwcfg.buffercount; i++) {
+               buf = saa7164_buffer_alloc(port,
+                       port->hw_streamingparams.numberoflines *
+                       port->hw_streamingparams.pitch);
+
+               if (!buf) {
+                       result = -ENOMEM;
+                       printk(KERN_ERR "%s: dvb_register_adapter failed "
+                              "(errno = %d), unable to allocate buffers\n",
+                               DRIVER_NAME, result);
+                       goto fail_adapter;
+               }
+               buf->nr = i;
+
+               mutex_lock(&port->dmaqueue_lock);
+               list_add_tail(&buf->list, &port->dmaqueue.list);
+               mutex_unlock(&port->dmaqueue_lock);
+       }
+
+       /* register adapter */
+       result = dvb_register_adapter(&dvb->adapter, DRIVER_NAME, THIS_MODULE,
+                       &dev->pci->dev, adapter_nr);
+       if (result < 0) {
+               printk(KERN_ERR "%s: dvb_register_adapter failed "
+                      "(errno = %d)\n", DRIVER_NAME, result);
+               goto fail_adapter;
+       }
+       dvb->adapter.priv = port;
+
+       /* register frontend */
+       result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
+       if (result < 0) {
+               printk(KERN_ERR "%s: dvb_register_frontend failed "
+                      "(errno = %d)\n", DRIVER_NAME, result);
+               goto fail_frontend;
+       }
+
+       /* register demux stuff */
+       dvb->demux.dmx.capabilities =
+               DMX_TS_FILTERING | DMX_SECTION_FILTERING |
+               DMX_MEMORY_BASED_FILTERING;
+       dvb->demux.priv       = port;
+       dvb->demux.filternum  = 256;
+       dvb->demux.feednum    = 256;
+       dvb->demux.start_feed = saa7164_dvb_start_feed;
+       dvb->demux.stop_feed  = saa7164_dvb_stop_feed;
+       result = dvb_dmx_init(&dvb->demux);
+       if (result < 0) {
+               printk(KERN_ERR "%s: dvb_dmx_init failed (errno = %d)\n",
+                      DRIVER_NAME, result);
+               goto fail_dmx;
+       }
+
+       dvb->dmxdev.filternum    = 256;
+       dvb->dmxdev.demux        = &dvb->demux.dmx;
+       dvb->dmxdev.capabilities = 0;
+       result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
+       if (result < 0) {
+               printk(KERN_ERR "%s: dvb_dmxdev_init failed (errno = %d)\n",
+                      DRIVER_NAME, result);
+               goto fail_dmxdev;
+       }
+
+       dvb->fe_hw.source = DMX_FRONTEND_0;
+       result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+       if (result < 0) {
+               printk(KERN_ERR "%s: add_frontend failed "
+                      "(DMX_FRONTEND_0, errno = %d)\n", DRIVER_NAME, result);
+               goto fail_fe_hw;
+       }
+
+       dvb->fe_mem.source = DMX_MEMORY_FE;
+       result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+       if (result < 0) {
+               printk(KERN_ERR "%s: add_frontend failed "
+                      "(DMX_MEMORY_FE, errno = %d)\n", DRIVER_NAME, result);
+               goto fail_fe_mem;
+       }
+
+       result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+       if (result < 0) {
+               printk(KERN_ERR "%s: connect_frontend failed (errno = %d)\n",
+                      DRIVER_NAME, result);
+               goto fail_fe_conn;
+       }
+
+       /* register network adapter */
+       dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
+       return 0;
+
+fail_fe_conn:
+       dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+fail_fe_mem:
+       dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+fail_fe_hw:
+       dvb_dmxdev_release(&dvb->dmxdev);
+fail_dmxdev:
+       dvb_dmx_release(&dvb->demux);
+fail_dmx:
+       dvb_unregister_frontend(dvb->frontend);
+fail_frontend:
+       dvb_frontend_detach(dvb->frontend);
+       dvb_unregister_adapter(&dvb->adapter);
+fail_adapter:
+       return result;
+}
+
+int saa7164_dvb_unregister(struct saa7164_tsport *port)
+{
+       struct saa7164_dvb *dvb = &port->dvb;
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *b;
+       struct list_head *c, *n;
+
+       dprintk(DBGLVL_DVB, "%s()\n", __func__);
+
+       /* Remove any allocated buffers */
+       mutex_lock(&port->dmaqueue_lock);
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               b = list_entry(c, struct saa7164_buffer, list);
+               list_del(c);
+               saa7164_buffer_dealloc(port, b);
+       }
+       mutex_unlock(&port->dmaqueue_lock);
+
+       if (dvb->frontend == NULL)
+               return 0;
+
+       dvb_net_release(&dvb->net);
+       dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+       dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+       dvb_dmxdev_release(&dvb->dmxdev);
+       dvb_dmx_release(&dvb->demux);
+       dvb_unregister_frontend(dvb->frontend);
+       dvb_frontend_detach(dvb->frontend);
+       dvb_unregister_adapter(&dvb->adapter);
+       return 0;
+}
+
+/* All the DVB attach calls go here, this function get's modified
+ * for each new card.
+ */
+int saa7164_dvb_register(struct saa7164_tsport *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_dvb *dvb = &port->dvb;
+       struct saa7164_i2c *i2c_bus = NULL;
+       int ret;
+
+       dprintk(DBGLVL_DVB, "%s()\n", __func__);
+
+       /* init frontend */
+       switch (dev->board) {
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
+               i2c_bus = &dev->i2c_bus[port->nr + 1];
+               switch (port->nr) {
+               case 0:
+                       port->dvb.frontend = dvb_attach(tda10048_attach,
+                               &hauppauge_hvr2200_1_config,
+                               &i2c_bus->i2c_adap);
+
+                       if (port->dvb.frontend != NULL) {
+                               /* TODO: addr is in the card struct */
+                               dvb_attach(tda18271_attach, port->dvb.frontend,
+                                       0xc0 >> 1, &i2c_bus->i2c_adap,
+                                       &hauppauge_hvr22x0_tuner_config);
+                       }
+
+                       break;
+               case 1:
+                       port->dvb.frontend = dvb_attach(tda10048_attach,
+                               &hauppauge_hvr2200_2_config,
+                               &i2c_bus->i2c_adap);
+
+                       if (port->dvb.frontend != NULL) {
+                               /* TODO: addr is in the card struct */
+                               dvb_attach(tda18271_attach, port->dvb.frontend,
+                                       0xc0 >> 1, &i2c_bus->i2c_adap,
+                                       &hauppauge_hvr22x0s_tuner_config);
+                       }
+
+                       break;
+               }
+               break;
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
+       case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
+               i2c_bus = &dev->i2c_bus[port->nr + 1];
+
+               port->dvb.frontend = dvb_attach(s5h1411_attach,
+                       &hauppauge_s5h1411_config,
+                       &i2c_bus->i2c_adap);
+
+               if (port->dvb.frontend != NULL) {
+                       if (port->nr == 0) {
+                               /* Master TDA18271 */
+                               /* TODO: addr is in the card struct */
+                               dvb_attach(tda18271_attach, port->dvb.frontend,
+                                       0xc0 >> 1, &i2c_bus->i2c_adap,
+                                       &hauppauge_hvr22x0_tuner_config);
+                       } else {
+                               /* Slave TDA18271 */
+                               dvb_attach(tda18271_attach, port->dvb.frontend,
+                                       0xc0 >> 1, &i2c_bus->i2c_adap,
+                                       &hauppauge_hvr22x0s_tuner_config);
+                       }
+               }
+
+               break;
+       default:
+               printk(KERN_ERR "%s: The frontend isn't supported\n",
+                      dev->name);
+               break;
+       }
+       if (NULL == dvb->frontend) {
+               printk(KERN_ERR "%s() Frontend initialization failed\n",
+                      __func__);
+               return -1;
+       }
+
+       /* Put the analog decoder in standby to keep it quiet */
+
+       /* register everything */
+       ret = dvb_register(port);
+       if (ret < 0) {
+               if (dvb->frontend->ops.release)
+                       dvb->frontend->ops.release(dvb->frontend);
+               return ret;
+       }
+
+       return 0;
+}
+
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
new file mode 100644 (file)
index 0000000..ee0af35
--- /dev/null
@@ -0,0 +1,613 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/firmware.h>
+
+#include "saa7164.h"
+
+#define SAA7164_REV2_FIRMWARE          "v4l-saa7164-1.0.2.fw"
+#define SAA7164_REV2_FIRMWARE_SIZE     3978608
+
+#define SAA7164_REV3_FIRMWARE          "v4l-saa7164-1.0.3.fw"
+#define SAA7164_REV3_FIRMWARE_SIZE     3978608
+
+struct fw_header {
+       u32     firmwaresize;
+       u32     bslsize;
+       u32     reserved;
+       u32     version;
+};
+
+int saa7164_dl_wait_ack(struct saa7164_dev *dev, u32 reg)
+{
+       u32 timeout = SAA_DEVICE_TIMEOUT;
+       while ((saa7164_readl(reg) & 0x01) == 0) {
+               timeout -= 10;
+               if (timeout == 0) {
+                       printk(KERN_ERR "%s() timeout (no d/l ack)\n",
+                               __func__);
+                       return -EBUSY;
+               }
+               msleep(100);
+       }
+
+       return 0;
+}
+
+int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg)
+{
+       u32 timeout = SAA_DEVICE_TIMEOUT;
+       while (saa7164_readl(reg) & 0x01) {
+               timeout -= 10;
+               if (timeout == 0) {
+                       printk(KERN_ERR "%s() timeout (no d/l clr)\n",
+                               __func__);
+                       return -EBUSY;
+               }
+               msleep(100);
+       }
+
+       return 0;
+}
+
+/* TODO: move dlflags into dev-> and change to write/readl/b */
+/* TODO: Excessive levels of debug */
+int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
+       u32 dlflags, u8 *dst, u32 dstsize)
+{
+       u32 reg, timeout, offset;
+       u8 *srcbuf = NULL;
+       int ret;
+
+       u32 dlflag = dlflags;
+       u32 dlflag_ack = dlflag + 4;
+       u32 drflag = dlflag_ack + 4;
+       u32 drflag_ack = drflag + 4;
+       u32 bleflag = drflag_ack + 4;
+
+       dprintk(DBGLVL_FW,
+               "%s(image=%p, size=%d, flags=0x%x, dst=%p, dstsize=0x%x)\n",
+               __func__, src, srcsize, dlflags, dst, dstsize);
+
+       if ((src == 0) || (dst == 0)) {
+               ret = -EIO;
+               goto out;
+       }
+
+       srcbuf = kzalloc(4 * 1048576, GFP_KERNEL);
+       if (NULL == srcbuf) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       if (srcsize > (4*1048576)) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       memcpy(srcbuf, src, srcsize);
+
+       dprintk(DBGLVL_FW, "%s() dlflag = 0x%x\n", __func__, dlflag);
+       dprintk(DBGLVL_FW, "%s() dlflag_ack = 0x%x\n", __func__, dlflag_ack);
+       dprintk(DBGLVL_FW, "%s() drflag = 0x%x\n", __func__, drflag);
+       dprintk(DBGLVL_FW, "%s() drflag_ack = 0x%x\n", __func__, drflag_ack);
+       dprintk(DBGLVL_FW, "%s() bleflag = 0x%x\n", __func__, bleflag);
+
+       reg = saa7164_readl(dlflag);
+       dprintk(DBGLVL_FW, "%s() dlflag (0x%x)= 0x%x\n", __func__, dlflag, reg);
+       if (reg == 1)
+               dprintk(DBGLVL_FW,
+                       "%s() Download flag already set, please reboot\n",
+                       __func__);
+
+       /* Indicate download start */
+       saa7164_writel(dlflag, 1);
+       ret = saa7164_dl_wait_ack(dev, dlflag_ack);
+       if (ret < 0)
+               goto out;
+
+       /* Ack download start, then wait for wait */
+       saa7164_writel(dlflag, 0);
+       ret = saa7164_dl_wait_clr(dev, dlflag_ack);
+       if (ret < 0)
+               goto out;
+
+       /* Deal with the raw firmware, in the appropriate chunk size */
+       for (offset = 0; srcsize > dstsize;
+               srcsize -= dstsize, offset += dstsize) {
+
+               dprintk(DBGLVL_FW, "%s() memcpy %d\n", __func__, dstsize);
+               memcpy(dst, srcbuf + offset, dstsize);
+
+               /* Flag the data as ready */
+               saa7164_writel(drflag, 1);
+               ret = saa7164_dl_wait_ack(dev, drflag_ack);
+               if (ret < 0)
+                       goto out;
+
+               /* Wait for indication data was received */
+               saa7164_writel(drflag, 0);
+               ret = saa7164_dl_wait_clr(dev, drflag_ack);
+               if (ret < 0)
+                       goto out;
+
+       }
+
+       dprintk(DBGLVL_FW, "%s() memcpy(l) %d\n", __func__, dstsize);
+       /* Write last block to the device */
+       memcpy(dst, srcbuf+offset, srcsize);
+
+       /* Flag the data as ready */
+       saa7164_writel(drflag, 1);
+       ret = saa7164_dl_wait_ack(dev, drflag_ack);
+       if (ret < 0)
+               goto out;
+
+       saa7164_writel(drflag, 0);
+       timeout = 0;
+       while (saa7164_readl(bleflag) != SAA_DEVICE_IMAGE_BOOTING) {
+               if (saa7164_readl(bleflag) & SAA_DEVICE_IMAGE_CORRUPT) {
+                       printk(KERN_ERR "%s() image corrupt\n", __func__);
+                       ret = -EBUSY;
+                       goto out;
+               }
+
+               if (saa7164_readl(bleflag) & SAA_DEVICE_MEMORY_CORRUPT) {
+                       printk(KERN_ERR "%s() device memory corrupt\n",
+                               __func__);
+                       ret = -EBUSY;
+                       goto out;
+               }
+
+               msleep(10);
+               if (timeout++ > 60)
+                       break;
+       }
+
+       printk(KERN_INFO "%s() Image downloaded, booting...\n", __func__);
+
+       ret = saa7164_dl_wait_clr(dev, drflag_ack);
+       if (ret < 0)
+               goto out;
+
+       printk(KERN_INFO "%s() Image booted successfully.\n", __func__);
+       ret = 0;
+
+out:
+       kfree(srcbuf);
+       return ret;
+}
+
+/* TODO: Excessive debug */
+/* Load the firmware. Optionally it can be in ROM or newer versions
+ * can be on disk, saving the expense of the ROM hardware. */
+int saa7164_downloadfirmware(struct saa7164_dev *dev)
+{
+       /* u32 second_timeout = 60 * SAA_DEVICE_TIMEOUT; */
+       u32 tmp, filesize, version, err_flags, first_timeout, fwlength;
+       u32 second_timeout, updatebootloader = 1, bootloadersize = 0;
+       const struct firmware *fw = NULL;
+       struct fw_header *hdr, *boothdr = NULL, *fwhdr;
+       u32 bootloaderversion = 0, fwloadersize;
+       u8 *bootloaderoffset = NULL, *fwloaderoffset;
+       char *fwname;
+       int ret;
+
+       dprintk(DBGLVL_FW, "%s()\n", __func__);
+
+       if (saa7164_boards[dev->board].chiprev == SAA7164_CHIP_REV2) {
+               fwname = SAA7164_REV2_FIRMWARE;
+               fwlength = SAA7164_REV2_FIRMWARE_SIZE;
+       } else {
+               fwname = SAA7164_REV3_FIRMWARE;
+               fwlength = SAA7164_REV3_FIRMWARE_SIZE;
+       }
+
+       version = saa7164_getcurrentfirmwareversion(dev);
+
+       if (version == 0x00) {
+
+               second_timeout = 100;
+               first_timeout = 100;
+               err_flags = saa7164_readl(SAA_BOOTLOADERERROR_FLAGS);
+               dprintk(DBGLVL_FW, "%s() err_flags = %x\n",
+                       __func__, err_flags);
+
+               while (err_flags != SAA_DEVICE_IMAGE_BOOTING) {
+                       dprintk(DBGLVL_FW, "%s() err_flags = %x\n",
+                               __func__, err_flags);
+                       msleep(10);
+
+                       if (err_flags & SAA_DEVICE_IMAGE_CORRUPT) {
+                               printk(KERN_ERR "%s() firmware corrupt\n",
+                                       __func__);
+                               break;
+                       }
+                       if (err_flags & SAA_DEVICE_MEMORY_CORRUPT) {
+                               printk(KERN_ERR "%s() device memory corrupt\n",
+                                       __func__);
+                               break;
+                       }
+                       if (err_flags & SAA_DEVICE_NO_IMAGE) {
+                               printk(KERN_ERR "%s() no first image\n",
+                               __func__);
+                               break;
+                       }
+                       if (err_flags & SAA_DEVICE_IMAGE_SEARCHING) {
+                               first_timeout -= 10;
+                               if (first_timeout == 0) {
+                                       printk(KERN_ERR
+                                               "%s() no first image\n",
+                                               __func__);
+                                       break;
+                               }
+                       } else if (err_flags & SAA_DEVICE_IMAGE_LOADING) {
+                               second_timeout -= 10;
+                               if (second_timeout == 0) {
+                                       printk(KERN_ERR
+                                       "%s() FW load time exceeded\n",
+                                               __func__);
+                                       break;
+                               }
+                       } else {
+                               second_timeout -= 10;
+                               if (second_timeout == 0) {
+                                       printk(KERN_ERR
+                                       "%s() Unknown bootloader flags 0x%x\n",
+                                               __func__, err_flags);
+                                       break;
+                               }
+                       }
+
+                       err_flags = saa7164_readl(SAA_BOOTLOADERERROR_FLAGS);
+               } /* While != Booting */
+
+               if (err_flags == SAA_DEVICE_IMAGE_BOOTING) {
+                       dprintk(DBGLVL_FW, "%s() Loader 1 has loaded.\n",
+                               __func__);
+                       first_timeout = SAA_DEVICE_TIMEOUT;
+                       second_timeout = 60 * SAA_DEVICE_TIMEOUT;
+                       second_timeout = 100;
+
+                       err_flags = saa7164_readl(SAA_SECONDSTAGEERROR_FLAGS);
+                       dprintk(DBGLVL_FW, "%s() err_flags2 = %x\n",
+                               __func__, err_flags);
+                       while (err_flags != SAA_DEVICE_IMAGE_BOOTING) {
+                               dprintk(DBGLVL_FW, "%s() err_flags2 = %x\n",
+                                       __func__, err_flags);
+                               msleep(10);
+
+                               if (err_flags & SAA_DEVICE_IMAGE_CORRUPT) {
+                                       printk(KERN_ERR
+                                               "%s() firmware corrupt\n",
+                                               __func__);
+                                       break;
+                               }
+                               if (err_flags & SAA_DEVICE_MEMORY_CORRUPT) {
+                                       printk(KERN_ERR
+                                               "%s() device memory corrupt\n",
+                                               __func__);
+                                       break;
+                               }
+                               if (err_flags & SAA_DEVICE_NO_IMAGE) {
+                                       printk(KERN_ERR "%s() no first image\n",
+                                               __func__);
+                                       break;
+                               }
+                               if (err_flags & SAA_DEVICE_IMAGE_SEARCHING) {
+                                       first_timeout -= 10;
+                                       if (first_timeout == 0) {
+                                               printk(KERN_ERR
+                                               "%s() no second image\n",
+                                                       __func__);
+                                               break;
+                                       }
+                               } else if (err_flags &
+                                       SAA_DEVICE_IMAGE_LOADING) {
+                                       second_timeout -= 10;
+                                       if (second_timeout == 0) {
+                                               printk(KERN_ERR
+                                               "%s() FW load time exceeded\n",
+                                                       __func__);
+                                               break;
+                                       }
+                               } else {
+                                       second_timeout -= 10;
+                                       if (second_timeout == 0) {
+                                               printk(KERN_ERR
+                                       "%s() Unknown bootloader flags 0x%x\n",
+                                                       __func__, err_flags);
+                                               break;
+                                       }
+                               }
+
+                               err_flags =
+                               saa7164_readl(SAA_SECONDSTAGEERROR_FLAGS);
+                       } /* err_flags != SAA_DEVICE_IMAGE_BOOTING */
+
+                       dprintk(DBGLVL_FW, "%s() Loader flags 1:0x%x 2:0x%x.\n",
+                               __func__,
+                               saa7164_readl(SAA_BOOTLOADERERROR_FLAGS),
+                               saa7164_readl(SAA_SECONDSTAGEERROR_FLAGS));
+
+               } /* err_flags == SAA_DEVICE_IMAGE_BOOTING */
+
+               /* It's possible for both firmwares to have booted,
+                * but that doesn't mean they've finished booting yet.
+                */
+               if ((saa7164_readl(SAA_BOOTLOADERERROR_FLAGS) ==
+                       SAA_DEVICE_IMAGE_BOOTING) &&
+                       (saa7164_readl(SAA_SECONDSTAGEERROR_FLAGS) ==
+                       SAA_DEVICE_IMAGE_BOOTING)) {
+
+
+                       dprintk(DBGLVL_FW, "%s() Loader 2 has loaded.\n",
+                               __func__);
+
+                       first_timeout = SAA_DEVICE_TIMEOUT;
+                       while (first_timeout) {
+                               msleep(10);
+
+                               version =
+                                       saa7164_getcurrentfirmwareversion(dev);
+                               if (version) {
+                                       dprintk(DBGLVL_FW,
+                                       "%s() All f/w loaded successfully\n",
+                                               __func__);
+                                       break;
+                               } else {
+                                       first_timeout -= 10;
+                                       if (first_timeout == 0) {
+                                               printk(KERN_ERR
+                                               "%s() FW did not boot\n",
+                                                       __func__);
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               version = saa7164_getcurrentfirmwareversion(dev);
+       } /* version == 0 */
+
+       /* Has the firmware really booted? */
+       if ((saa7164_readl(SAA_BOOTLOADERERROR_FLAGS) ==
+               SAA_DEVICE_IMAGE_BOOTING) &&
+               (saa7164_readl(SAA_SECONDSTAGEERROR_FLAGS) ==
+               SAA_DEVICE_IMAGE_BOOTING) && (version == 0)) {
+
+               printk(KERN_ERR
+                       "%s() The firmware hung, probably bad firmware\n",
+                       __func__);
+
+               /* Tell the second stage loader we have a deadlock */
+               saa7164_writel(SAA_DEVICE_DEADLOCK_DETECTED_OFFSET,
+                       SAA_DEVICE_DEADLOCK_DETECTED);
+
+               saa7164_getfirmwarestatus(dev);
+
+               return -ENOMEM;
+       }
+
+       dprintk(DBGLVL_FW, "Device has Firmware Version %d.%d.%d.%d\n",
+               (version & 0x0000fc00) >> 10,
+               (version & 0x000003e0) >> 5,
+               (version & 0x0000001f),
+               (version & 0xffff0000) >> 16);
+
+       /* Load the firmwware from the disk if required */
+       if (version == 0) {
+
+               printk(KERN_INFO "%s() Waiting for firmware upload (%s)\n",
+                       __func__, fwname);
+
+               ret = request_firmware(&fw, fwname, &dev->pci->dev);
+               if (ret) {
+                       printk(KERN_ERR "%s() Upload failed. "
+                               "(file not found?)\n", __func__);
+                       return -ENOMEM;
+               }
+
+               printk(KERN_INFO "%s() firmware read %Zu bytes.\n",
+                       __func__, fw->size);
+
+               if (fw->size != fwlength) {
+                       printk(KERN_ERR "xc5000: firmware incorrect size\n");
+                       ret = -ENOMEM;
+                       goto out;
+               }
+
+               printk(KERN_INFO "%s() firmware loaded.\n", __func__);
+
+               hdr = (struct fw_header *)fw->data;
+               printk(KERN_INFO "Firmware file header part 1:\n");
+               printk(KERN_INFO " .FirmwareSize = 0x%x\n", hdr->firmwaresize);
+               printk(KERN_INFO " .BSLSize = 0x%x\n", hdr->bslsize);
+               printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved);
+               printk(KERN_INFO " .Version = 0x%x\n", hdr->version);
+
+               /* Retreive bootloader if reqd */
+               if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0))
+                       /* Second bootloader in the firmware file */
+                       filesize = hdr->reserved * 16;
+               else
+                       filesize = (hdr->firmwaresize + hdr->bslsize) *
+                               16 + sizeof(struct fw_header);
+
+               printk(KERN_INFO "%s() SecBootLoader.FileSize = %d\n",
+                       __func__, filesize);
+
+               /* Get bootloader (if reqd) and firmware header */
+               if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) {
+                       /* Second boot loader is required */
+
+                       /* Get the loader header */
+                       boothdr = (struct fw_header *)(fw->data +
+                               sizeof(struct fw_header));
+
+                       bootloaderversion =
+                               saa7164_readl(SAA_DEVICE_2ND_VERSION);
+                       dprintk(DBGLVL_FW, "Onboard BootLoader:\n");
+                       dprintk(DBGLVL_FW, "->Flag 0x%x\n",
+                               saa7164_readl(SAA_BOOTLOADERERROR_FLAGS));
+                       dprintk(DBGLVL_FW, "->Ack 0x%x\n",
+                               saa7164_readl(SAA_DATAREADY_FLAG_ACK));
+                       dprintk(DBGLVL_FW, "->FW Version 0x%x\n", version);
+                       dprintk(DBGLVL_FW, "->Loader Version 0x%x\n",
+                               bootloaderversion);
+
+                       if ((saa7164_readl(SAA_BOOTLOADERERROR_FLAGS) ==
+                               0x03) && (saa7164_readl(SAA_DATAREADY_FLAG_ACK)
+                               == 0x00) && (version == 0x00)) {
+
+                               dprintk(DBGLVL_FW, "BootLoader version in  "
+                                       "rom %d.%d.%d.%d\n",
+                                       (bootloaderversion & 0x0000fc00) >> 10,
+                                       (bootloaderversion & 0x000003e0) >> 5,
+                                       (bootloaderversion & 0x0000001f),
+                                       (bootloaderversion & 0xffff0000) >> 16
+                                       );
+                               dprintk(DBGLVL_FW, "BootLoader version "
+                                       "in file %d.%d.%d.%d\n",
+                                       (boothdr->version & 0x0000fc00) >> 10,
+                                       (boothdr->version & 0x000003e0) >> 5,
+                                       (boothdr->version & 0x0000001f),
+                                       (boothdr->version & 0xffff0000) >> 16
+                                       );
+
+                               if (bootloaderversion == boothdr->version)
+                                       updatebootloader = 0;
+                       }
+
+                       /* Calculate offset to firmware header */
+                       tmp = (boothdr->firmwaresize + boothdr->bslsize) * 16 +
+                               (sizeof(struct fw_header) +
+                               sizeof(struct fw_header));
+
+                       fwhdr = (struct fw_header *)(fw->data+tmp);
+               } else {
+                       /* No second boot loader */
+                       fwhdr = hdr;
+               }
+
+               dprintk(DBGLVL_FW, "Firmware version in file %d.%d.%d.%d\n",
+                       (fwhdr->version & 0x0000fc00) >> 10,
+                       (fwhdr->version & 0x000003e0) >> 5,
+                       (fwhdr->version & 0x0000001f),
+                       (fwhdr->version & 0xffff0000) >> 16
+                       );
+
+               if (version == fwhdr->version) {
+                       /* No download, firmware already on board */
+                       ret = 0;
+                       goto out;
+               }
+
+               if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) {
+                       if (updatebootloader) {
+                               /* Get ready to upload the bootloader */
+                               bootloadersize = (boothdr->firmwaresize +
+                                       boothdr->bslsize) * 16 +
+                                       sizeof(struct fw_header);
+
+                               bootloaderoffset = (u8 *)(fw->data +
+                                       sizeof(struct fw_header));
+
+                               dprintk(DBGLVL_FW, "bootloader d/l starts.\n");
+                               printk(KERN_INFO "%s() FirmwareSize = 0x%x\n",
+                                       __func__, boothdr->firmwaresize);
+                               printk(KERN_INFO "%s() BSLSize = 0x%x\n",
+                                       __func__, boothdr->bslsize);
+                               printk(KERN_INFO "%s() Reserved = 0x%x\n",
+                                       __func__, boothdr->reserved);
+                               printk(KERN_INFO "%s() Version = 0x%x\n",
+                                       __func__, boothdr->version);
+                               ret = saa7164_downloadimage(
+                                       dev,
+                                       bootloaderoffset,
+                                       bootloadersize,
+                                       SAA_DOWNLOAD_FLAGS,
+                                       dev->bmmio + SAA_DEVICE_DOWNLOAD_OFFSET,
+                                       SAA_DEVICE_BUFFERBLOCKSIZE);
+                               if (ret < 0) {
+                                       printk(KERN_ERR
+                                               "bootloader d/l has failed\n");
+                                       goto out;
+                               }
+                               dprintk(DBGLVL_FW,
+                                       "bootloader download complete.\n");
+
+                       }
+
+                       printk(KERN_ERR "starting firmware download(2)\n");
+                       bootloadersize = (boothdr->firmwaresize +
+                               boothdr->bslsize) * 16 +
+                               sizeof(struct fw_header);
+
+                       bootloaderoffset =
+                               (u8 *)(fw->data + sizeof(struct fw_header));
+
+                       fwloaderoffset = bootloaderoffset + bootloadersize;
+
+                       /* TODO: fix this bounds overrun here with old f/ws */
+                       fwloadersize = (fwhdr->firmwaresize + fwhdr->bslsize) *
+                               16 + sizeof(struct fw_header);
+
+                       ret = saa7164_downloadimage(
+                               dev,
+                               fwloaderoffset,
+                               fwloadersize,
+                               SAA_DEVICE_2ND_DOWNLOADFLAG_OFFSET,
+                               dev->bmmio + SAA_DEVICE_2ND_DOWNLOAD_OFFSET,
+                               SAA_DEVICE_2ND_BUFFERBLOCKSIZE);
+                       if (ret < 0) {
+                               printk(KERN_ERR "firmware download failed\n");
+                               goto out;
+                       }
+                       printk(KERN_ERR "firmware download complete.\n");
+
+               } else {
+
+                       /* No bootloader update reqd, download firmware only */
+                       printk(KERN_ERR "starting firmware download(3)\n");
+
+                       ret = saa7164_downloadimage(
+                               dev,
+                               (u8 *)fw->data,
+                               fw->size,
+                               SAA_DOWNLOAD_FLAGS,
+                               dev->bmmio + SAA_DEVICE_DOWNLOAD_OFFSET,
+                               SAA_DEVICE_BUFFERBLOCKSIZE);
+                       if (ret < 0) {
+                               printk(KERN_ERR "firmware download failed\n");
+                               goto out;
+                       }
+                       printk(KERN_ERR "firmware download complete.\n");
+               }
+       }
+
+       ret = 0;
+
+out:
+       if (fw)
+               release_firmware(fw);
+
+       return ret;
+}
diff --git a/drivers/media/video/saa7164/saa7164-i2c.c b/drivers/media/video/saa7164/saa7164-i2c.c
new file mode 100644 (file)
index 0000000..e1ae9b0
--- /dev/null
@@ -0,0 +1,141 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+
+#include "saa7164.h"
+
+static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
+{
+       struct saa7164_i2c *bus = i2c_adap->algo_data;
+       struct saa7164_dev *dev = bus->dev;
+       int i, retval = 0;
+
+       dprintk(DBGLVL_I2C, "%s(num = %d)\n", __func__, num);
+
+       for (i = 0 ; i < num; i++) {
+               dprintk(DBGLVL_I2C, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
+                       __func__, num, msgs[i].addr, msgs[i].len);
+               if (msgs[i].flags & I2C_M_RD) {
+                       /* Unsupported - Yet*/
+                       printk(KERN_ERR "%s() Unsupported - Yet\n", __func__);
+                       continue;
+               } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) &&
+                          msgs[i].addr == msgs[i + 1].addr) {
+                       /* write then read from same address */
+
+                       retval = saa7164_api_i2c_read(bus, msgs[i].addr,
+                               msgs[i].len, msgs[i].buf,
+                               msgs[i+1].len, msgs[i+1].buf
+                               );
+
+                       i++;
+
+                       if (retval < 0)
+                               goto err;
+               } else {
+                       /* write */
+                       retval = saa7164_api_i2c_write(bus, msgs[i].addr,
+                               msgs[i].len, msgs[i].buf);
+               }
+               if (retval < 0)
+                       goto err;
+       }
+       return num;
+
+ err:
+       return retval;
+}
+
+void saa7164_call_i2c_clients(struct saa7164_i2c *bus, unsigned int cmd,
+       void *arg)
+{
+       if (bus->i2c_rc != 0)
+               return;
+
+       i2c_clients_command(&bus->i2c_adap, cmd, arg);
+}
+
+static u32 saa7164_functionality(struct i2c_adapter *adap)
+{
+       return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm saa7164_i2c_algo_template = {
+       .master_xfer    = i2c_xfer,
+       .functionality  = saa7164_functionality,
+};
+
+/* ----------------------------------------------------------------------- */
+
+static struct i2c_adapter saa7164_i2c_adap_template = {
+       .name              = "saa7164",
+       .owner             = THIS_MODULE,
+       .algo              = &saa7164_i2c_algo_template,
+};
+
+static struct i2c_client saa7164_i2c_client_template = {
+       .name   = "saa7164 internal",
+};
+
+int saa7164_i2c_register(struct saa7164_i2c *bus)
+{
+       struct saa7164_dev *dev = bus->dev;
+
+       dprintk(DBGLVL_I2C, "%s(bus = %d)\n", __func__, bus->nr);
+
+       memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template,
+              sizeof(bus->i2c_adap));
+
+       memcpy(&bus->i2c_algo, &saa7164_i2c_algo_template,
+              sizeof(bus->i2c_algo));
+
+       memcpy(&bus->i2c_client, &saa7164_i2c_client_template,
+              sizeof(bus->i2c_client));
+
+       bus->i2c_adap.dev.parent = &dev->pci->dev;
+
+       strlcpy(bus->i2c_adap.name, bus->dev->name,
+               sizeof(bus->i2c_adap.name));
+
+       bus->i2c_algo.data = bus;
+       bus->i2c_adap.algo_data = bus;
+       i2c_set_adapdata(&bus->i2c_adap, bus);
+       i2c_add_adapter(&bus->i2c_adap);
+
+       bus->i2c_client.adapter = &bus->i2c_adap;
+
+       if (0 != bus->i2c_rc)
+               printk(KERN_ERR "%s: i2c bus %d register FAILED\n",
+                       dev->name, bus->nr);
+
+       return bus->i2c_rc;
+}
+
+int saa7164_i2c_unregister(struct saa7164_i2c *bus)
+{
+       i2c_del_adapter(&bus->i2c_adap);
+       return 0;
+}
diff --git a/drivers/media/video/saa7164/saa7164-reg.h b/drivers/media/video/saa7164/saa7164-reg.h
new file mode 100644 (file)
index 0000000..06be4c1
--- /dev/null
@@ -0,0 +1,166 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* TODO: Retest the driver with errors expressed as negatives */
+
+/* Result codes */
+#define SAA_OK                         0
+#define SAA_ERR_BAD_PARAMETER          0x09
+#define SAA_ERR_NO_RESOURCES           0x0c
+#define SAA_ERR_NOT_SUPPORTED          0x13
+#define SAA_ERR_BUSY                   0x15
+#define SAA_ERR_READ                   0x17
+#define SAA_ERR_TIMEOUT                        0x1f
+#define SAA_ERR_OVERFLOW               0x20
+#define SAA_ERR_EMPTY                  0x22
+#define SAA_ERR_NOT_STARTED            0x23
+#define SAA_ERR_ALREADY_STARTED                0x24
+#define SAA_ERR_NOT_STOPPED            0x25
+#define SAA_ERR_ALREADY_STOPPED                0x26
+#define SAA_ERR_INVALID_COMMAND                0x3e
+#define SAA_ERR_NULL_PACKET            0x59
+
+/* Errors and flags from the silicon */
+#define PVC_ERRORCODE_UNKNOWN          0x00
+#define PVC_ERRORCODE_INVALID_COMMAND  0x01
+#define PVC_ERRORCODE_INVALID_CONTROL  0x02
+#define PVC_ERRORCODE_INVALID_DATA     0x03
+#define PVC_ERRORCODE_TIMEOUT          0x04
+#define PVC_ERRORCODE_NAK              0x05
+#define PVC_RESPONSEFLAG_ERROR         0x01
+#define PVC_RESPONSEFLAG_OVERFLOW      0x02
+#define PVC_RESPONSEFLAG_RESET         0x04
+#define PVC_RESPONSEFLAG_INTERFACE     0x08
+#define PVC_RESPONSEFLAG_CONTINUED     0x10
+#define PVC_CMDFLAG_INTERRUPT          0x02
+#define PVC_CMDFLAG_INTERFACE          0x04
+#define PVC_CMDFLAG_SERIALIZE          0x08
+#define PVC_CMDFLAG_CONTINUE           0x10
+
+/* Silicon Commands */
+#define GET_DESCRIPTORS_CONTROL                0x01
+#define GET_STRING_CONTROL             0x03
+#define GET_LANGUAGE_CONTROL           0x05
+#define SET_POWER_CONTROL              0x07
+#define GET_FW_VERSION_CONTROL         0x09
+#define SET_DEBUG_LEVEL_CONTROL                0x0B
+#define GET_DEBUG_DATA_CONTROL         0x0C
+#define GET_PRODUCTION_INFO_CONTROL    0x0D
+
+/* cmd defines */
+#define SAA_CMDFLAG_CONTINUE           0x10
+#define SAA_CMD_MAX_MSG_UNITS          256
+
+/* Some defines */
+#define SAA_BUS_TIMEOUT                        50
+#define SAA_DEVICE_TIMEOUT             5000
+#define SAA_DEVICE_MAXREQUESTSIZE      256
+
+/* Register addresses */
+#define SAA_DEVICE_VERSION             0x30
+#define SAA_DOWNLOAD_FLAGS             0x34
+#define SAA_DOWNLOAD_FLAG              0x34
+#define SAA_DOWNLOAD_FLAG_ACK          0x38
+#define SAA_DATAREADY_FLAG             0x3C
+#define SAA_DATAREADY_FLAG_ACK         0x40
+
+/* Boot loader register and bit definitions */
+#define SAA_BOOTLOADERERROR_FLAGS      0x44
+#define SAA_DEVICE_IMAGE_SEARCHING     0x01
+#define SAA_DEVICE_IMAGE_LOADING       0x02
+#define SAA_DEVICE_IMAGE_BOOTING       0x03
+#define SAA_DEVICE_IMAGE_CORRUPT       0x04
+#define SAA_DEVICE_MEMORY_CORRUPT      0x08
+#define SAA_DEVICE_NO_IMAGE            0x10
+
+/* Register addresses */
+#define SAA_DEVICE_2ND_VERSION                 0x50
+#define SAA_DEVICE_2ND_DOWNLOADFLAG_OFFSET     0x54
+
+/* Register addresses */
+#define SAA_SECONDSTAGEERROR_FLAGS             0x64
+
+/* Bootloader regs and flags */
+#define SAA_DEVICE_DEADLOCK_DETECTED_OFFSET    0x6C
+#define SAA_DEVICE_DEADLOCK_DETECTED           0xDEADDEAD
+
+/* Basic firmware status registers */
+#define SAA_DEVICE_SYSINIT_STATUS_OFFSET       0x70
+#define SAA_DEVICE_SYSINIT_STATUS              0x70
+#define SAA_DEVICE_SYSINIT_MODE                        0x74
+#define SAA_DEVICE_SYSINIT_SPEC                        0x78
+#define SAA_DEVICE_SYSINIT_INST                        0x7C
+#define SAA_DEVICE_SYSINIT_CPULOAD             0x80
+#define SAA_DEVICE_SYSINIT_REMAINHEAP          0x84
+
+#define SAA_DEVICE_DOWNLOAD_OFFSET             0x1000
+#define SAA_DEVICE_BUFFERBLOCKSIZE             0x1000
+
+#define SAA_DEVICE_2ND_BUFFERBLOCKSIZE         0x100000
+#define SAA_DEVICE_2ND_DOWNLOAD_OFFSET         0x200000
+
+/* Descriptors */
+#define CS_INTERFACE   0x24
+
+/* Descriptor subtypes */
+#define VC_INPUT_TERMINAL              0x02
+#define VC_OUTPUT_TERMINAL             0x03
+#define VC_SELECTOR_UNIT               0x04
+#define VC_PROCESSING_UNIT             0x05
+#define FEATURE_UNIT                   0x06
+#define TUNER_UNIT                     0x09
+#define ENCODER_UNIT                   0x0A
+#define EXTENSION_UNIT                 0x0B
+#define VC_TUNER_PATH                  0xF0
+#define PVC_HARDWARE_DESCRIPTOR                0xF1
+#define PVC_INTERFACE_DESCRIPTOR       0xF2
+#define PVC_INFRARED_UNIT              0xF3
+#define DRM_UNIT                       0xF4
+#define GENERAL_REQUEST                        0xF5
+
+/* Format Types */
+#define VS_FORMAT_TYPE         0x02
+#define VS_FORMAT_TYPE_I       0x01
+#define VS_FORMAT_UNCOMPRESSED 0x04
+#define VS_FRAME_UNCOMPRESSED  0x05
+#define VS_FORMAT_MPEG2PS      0x09
+#define VS_FORMAT_MPEG2TS      0x0A
+#define VS_FORMAT_MPEG4SL      0x0B
+#define VS_FORMAT_WM9          0x0C
+#define VS_FORMAT_DIVX         0x0D
+#define VS_FORMAT_VBI          0x0E
+#define VS_FORMAT_RDS          0x0F
+
+/* Device extension commands */
+#define EXU_REGISTER_ACCESS_CONTROL    0x00
+#define EXU_GPIO_CONTROL               0x01
+#define EXU_GPIO_GROUP_CONTROL         0x02
+#define EXU_INTERRUPT_CONTROL          0x03
+
+/* State Transition and args */
+#define SAA_STATE_CONTROL      0x03
+#define SAA_DMASTATE_STOP      0x00
+#define SAA_DMASTATE_ACQUIRE   0x01
+#define SAA_DMASTATE_PAUSE     0x02
+#define SAA_DMASTATE_RUN       0x03
+
+/* Hardware registers */
+
diff --git a/drivers/media/video/saa7164/saa7164-types.h b/drivers/media/video/saa7164/saa7164-types.h
new file mode 100644 (file)
index 0000000..99093f2
--- /dev/null
@@ -0,0 +1,287 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* TODO: Cleanup and shorten the namespace */
+
+/* Some structues are passed directly to/from the firmware and
+ * have strict alignment requirements. This is one of them.
+ */
+typedef struct {
+       u8      bLength;
+       u8      bDescriptorType;
+       u8      bDescriptorSubtype;
+       u16     bcdSpecVersion;
+       u32     dwClockFrequency;
+       u32     dwClockUpdateRes;
+       u8      bCapabilities;
+       u32     dwDeviceRegistersLocation;
+       u32     dwHostMemoryRegion;
+       u32     dwHostMemoryRegionSize;
+       u32     dwHostHibernatMemRegion;
+       u32     dwHostHibernatMemRegionSize;
+} __attribute__((packed)) tmComResHWDescr_t;
+
+/* This is DWORD aligned on windows but I can't find the right
+ * gcc syntax to match the binary data from the device.
+ * I've manually padded with Reserved[3] bytes to match the hardware,
+ * but this could break if GCC decies to pack in a different way.
+ */
+typedef struct {
+       u8      bLength;
+       u8      bDescriptorType;
+       u8      bDescriptorSubtype;
+       u8      bFlags;
+       u8      bInterfaceType;
+       u8      bInterfaceId;
+       u8      bBaseInterface;
+       u8      bInterruptId;
+       u8      bDebugInterruptId;
+       u8      BARLocation;
+       u8      Reserved[3];
+} tmComResInterfaceDescr_t;
+
+typedef struct {
+       u64     CommandRing;
+       u64     ResponseRing;
+       u32     CommandWrite;
+       u32     CommandRead;
+       u32     ResponseWrite;
+       u32     ResponseRead;
+} tmComResBusDescr_t;
+
+typedef enum {
+       NONE            = 0,
+       TYPE_BUS_PCI    = 1,
+       TYPE_BUS_PCIe   = 2,
+       TYPE_BUS_USB    = 3,
+       TYPE_BUS_I2C    = 4
+} tmBusType_t;
+
+typedef struct {
+       tmBusType_t Type;
+       u16     m_wMaxReqSize;
+       u8      *m_pdwSetRing;
+       u32     m_dwSizeSetRing;
+       u8      *m_pdwGetRing;
+       u32     m_dwSizeGetRing;
+       u32     *m_pdwSetWritePos;
+       u32     *m_pdwSetReadPos;
+       u32     *m_pdwGetWritePos;
+       u32     *m_pdwGetReadPos;
+
+       /* All access is protected */
+       struct mutex lock;
+
+} tmComResBusInfo_t;
+
+typedef struct {
+       u8      id;
+       u8      flags;
+       u16     size;
+       u32     command;
+       u16     controlselector;
+       u8      seqno;
+} __attribute__((packed)) tmComResInfo_t;
+
+typedef enum {
+       SET_CUR  = 0x01,
+       GET_CUR  = 0x81,
+       GET_MIN  = 0x82,
+       GET_MAX  = 0x83,
+       GET_RES  = 0x84,
+       GET_LEN  = 0x85,
+       GET_INFO = 0x86,
+       GET_DEF  = 0x87
+} tmComResCmd_t;
+
+struct cmd {
+       u8 seqno;
+       u32 inuse;
+       u32 timeout;
+       u32 signalled;
+       struct mutex lock;
+       wait_queue_head_t wait;
+};
+
+typedef struct {
+       u32     pathid;
+       u32     size;
+       void    *descriptor;
+} tmDescriptor_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      unitid;
+} __attribute__((packed)) tmComResDescrHeader_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      unitid;
+       u32     devicetype;
+       u16     deviceid;
+       u32     numgpiopins;
+       u8      numgpiogroups;
+       u8      controlsize;
+} __attribute__((packed)) tmComResExtDevDescrHeader_t;
+
+typedef struct {
+       u32     pin;
+       u8      state;
+} __attribute__((packed)) tmComResGPIO_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      pathid;
+} __attribute__((packed)) tmComResPathDescrHeader_t;
+
+/* terminaltype */
+typedef enum {
+       ITT_ANTENNA              = 0x0203,
+       LINE_CONNECTOR           = 0x0603,
+       SPDIF_CONNECTOR          = 0x0605,
+       COMPOSITE_CONNECTOR      = 0x0401,
+       SVIDEO_CONNECTOR         = 0x0402,
+       COMPONENT_CONNECTOR      = 0x0403,
+       STANDARD_DMA             = 0xF101
+} tmComResTermType_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      terminalid;
+       u16     terminaltype;
+       u8      assocterminal;
+       u8      iterminal;
+       u8      controlsize;
+} __attribute__((packed)) tmComResAntTermDescrHeader_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      unitid;
+       u8      sourceid;
+       u8      iunit;
+       u32     tuningstandards;
+       u8      controlsize;
+       u32     controls;
+} __attribute__((packed)) tmComResTunerDescrHeader_t;
+
+typedef enum {
+       /* the buffer does not contain any valid data */
+       TM_BUFFER_FLAG_EMPTY,
+
+       /* the buffer is filled with valid data */
+       TM_BUFFER_FLAG_DONE,
+
+       /* the buffer is the dummy buffer - TODO??? */
+       TM_BUFFER_FLAG_DUMMY_BUFFER
+} tmBufferFlag_t;
+
+typedef struct {
+       u64             *pagetablevirt;
+       u64             pagetablephys;
+       u16             offset;
+       u8              *context;
+       u64             timestamp;
+       tmBufferFlag_t  BufferFlag_t;
+       u32             lostbuffers;
+       u32             validbuffers;
+       u64             *dummypagevirt;
+       u64             dummypagephys;
+       u64             *addressvirt;
+} tmBuffer_t;
+
+typedef struct {
+       u32     bitspersample;
+       u32     samplesperline;
+       u32     numberoflines;
+       u32     pitch;
+       u32     linethreshold;
+       u64     **pagetablelistvirt;
+       u64     *pagetablelistphys;
+       u32     numpagetables;
+       u32     numpagetableentries;
+} tmHWStreamParameters_t;
+
+typedef struct {
+       tmHWStreamParameters_t          HWStreamParameters_t;
+       u64                             qwDummyPageTablePhys;
+       u64                             *pDummyPageTableVirt;
+} tmStreamParameters_t;
+
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtyle;
+       u8      unitid;
+       u16     terminaltype;
+       u8      assocterminal;
+       u8      sourceid;
+       u8      iterminal;
+       u32     BARLocation;
+       u8      flags;
+       u8      interruptid;
+       u8      buffercount;
+       u8      metadatasize;
+       u8      numformats;
+       u8      controlsize;
+} __attribute__((packed)) tmComResDMATermDescrHeader_t;
+
+/*
+ *
+ * Description:
+ *  This is the transport stream format header.
+ *
+ * Settings:
+ *  bLength                 - The size of this descriptor in bytes.
+ *  bDescriptorType         - CS_INTERFACE.
+ *  bDescriptorSubtype      - VS_FORMAT_MPEG2TS descriptor subtype.
+ *  bFormatIndex            - A non-zero constant that uniquely identifies the
+ *                            format.
+ *  bDataOffset             - Offset to TSP packet within MPEG-2 TS transport
+ *                            stride, in bytes.
+ *  bPacketLength           - Length of TSP packet, in bytes (typically 188).
+ *  bStrideLength           - Length of MPEG-2 TS transport stride.
+ *  guidStrideFormat        - A Globally Unique Identifier indicating the
+ *                            format of the stride data (if any). Set to zeros
+ *                            if there is no Stride Data, or if the Stride
+ *                            Data is to be ignored by the application.
+ *
+ */
+typedef struct {
+       u8      len;
+       u8      type;
+       u8      subtype;
+       u8      bFormatIndex;
+       u8      bDataOffset;
+       u8      bPacketLength;
+       u8      bStrideLength;
+       u8      guidStrideFormat[16];
+} __attribute__((packed)) tmComResTSFormatDescrHeader_t;
+
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
new file mode 100644 (file)
index 0000000..6753008
--- /dev/null
@@ -0,0 +1,400 @@
+/*
+ *  Driver for the NXP SAA7164 PCIe bridge
+ *
+ *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+       Driver architecture
+       *******************
+
+       saa7164_core.c/buffer.c/cards.c/i2c.c/dvb.c
+               |       : Standard Linux driver framework for creating
+               |       : exposing and managing interfaces to the rest
+               |       : of the kernel or userland. Also uses _fw.c to load
+               |       : firmware direct into the PCIe bus, bypassing layers.
+               V
+       saa7164_api..() : Translate kernel specific functions/features
+               |       : into command buffers.
+               V
+       saa7164_cmd..() : Manages the flow of command packets on/off,
+               |       : the bus. Deal with bus errors, timeouts etc.
+               V
+       saa7164_bus..() : Manage a read/write memory ring buffer in the
+               |       : PCIe Address space.
+               |
+               |               saa7164_fw...() : Load any frimware
+               |                       |       : direct into the device
+               V                       V
+       <- ----------------- PCIe address space -------------------- ->
+*/
+
+#include <linux/pci.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/kdev_t.h>
+
+#include <media/tuner.h>
+#include <media/tveeprom.h>
+#include <media/videobuf-dma-sg.h>
+#include <media/videobuf-dvb.h>
+
+#include "saa7164-reg.h"
+#include "saa7164-types.h"
+
+#include <linux/version.h>
+#include <linux/mutex.h>
+
+#define SAA7164_MAXBOARDS 8
+
+#define UNSET (-1U)
+#define SAA7164_BOARD_NOAUTO                   UNSET
+#define SAA7164_BOARD_UNKNOWN                  0
+#define SAA7164_BOARD_UNKNOWN_REV2             1
+#define SAA7164_BOARD_UNKNOWN_REV3             2
+#define SAA7164_BOARD_HAUPPAUGE_HVR2250                3
+#define SAA7164_BOARD_HAUPPAUGE_HVR2200                4
+#define SAA7164_BOARD_HAUPPAUGE_HVR2200_2      5
+#define SAA7164_BOARD_HAUPPAUGE_HVR2200_3      6
+#define SAA7164_BOARD_HAUPPAUGE_HVR2250_2      7
+#define SAA7164_BOARD_HAUPPAUGE_HVR2250_3      8
+
+#define SAA7164_MAX_UNITS              8
+#define SAA7164_TS_NUMBER_OF_LINES     312
+#define SAA7164_PT_ENTRIES             16 /* (312 * 188) / 4096 */
+
+#define DBGLVL_FW    4
+#define DBGLVL_DVB   8
+#define DBGLVL_I2C  16
+#define DBGLVL_API  32
+#define DBGLVL_CMD  64
+#define DBGLVL_BUS 128
+#define DBGLVL_IRQ 256
+#define DBGLVL_BUF 512
+
+enum port_t {
+       SAA7164_MPEG_UNDEFINED = 0,
+       SAA7164_MPEG_DVB,
+};
+
+enum saa7164_i2c_bus_nr {
+       SAA7164_I2C_BUS_0 = 0,
+       SAA7164_I2C_BUS_1,
+       SAA7164_I2C_BUS_2,
+};
+
+enum saa7164_buffer_flags {
+       SAA7164_BUFFER_UNDEFINED = 0,
+       SAA7164_BUFFER_FREE,
+       SAA7164_BUFFER_BUSY,
+       SAA7164_BUFFER_FULL
+};
+
+enum saa7164_unit_type {
+       SAA7164_UNIT_UNDEFINED = 0,
+       SAA7164_UNIT_DIGITAL_DEMODULATOR,
+       SAA7164_UNIT_ANALOG_DEMODULATOR,
+       SAA7164_UNIT_TUNER,
+       SAA7164_UNIT_EEPROM,
+       SAA7164_UNIT_ZILOG_IRBLASTER,
+       SAA7164_UNIT_ENCODER,
+};
+
+/* The PCIe bridge doesn't grant direct access to i2c.
+ * Instead, you address i2c devices using a uniqely
+ * allocated 'unitid' value via a messaging API. This
+ * is a problem. The kernel and existing demod/tuner
+ * drivers expect to talk 'i2c', so we have to maintain
+ * a translation layer, and a series of functions to
+ * convert i2c bus + device address into a unit id.
+ */
+struct saa7164_unit {
+       enum saa7164_unit_type type;
+       u8      id;
+       char    *name;
+       enum saa7164_i2c_bus_nr i2c_bus_nr;
+       u8      i2c_bus_addr;
+       u8      i2c_reg_len;
+};
+
+struct saa7164_board {
+       char    *name;
+       enum port_t porta, portb;
+       enum {
+               SAA7164_CHIP_UNDEFINED = 0,
+               SAA7164_CHIP_REV2,
+               SAA7164_CHIP_REV3,
+       } chiprev;
+       struct  saa7164_unit unit[SAA7164_MAX_UNITS];
+};
+
+struct saa7164_subid {
+       u16     subvendor;
+       u16     subdevice;
+       u32     card;
+};
+
+struct saa7164_fw_status {
+
+       /* RISC Core details */
+       u32     status;
+       u32     mode;
+       u32     spec;
+       u32     inst;
+       u32     cpuload;
+       u32     remainheap;
+
+       /* Firmware version */
+       u32     version;
+       u32     major;
+       u32     sub;
+       u32     rel;
+       u32     buildnr;
+};
+
+struct saa7164_dvb {
+       struct mutex lock;
+       struct dvb_adapter adapter;
+       struct dvb_frontend *frontend;
+       struct dvb_demux demux;
+       struct dmxdev dmxdev;
+       struct dmx_frontend fe_hw;
+       struct dmx_frontend fe_mem;
+       struct dvb_net net;
+       int feeding;
+};
+
+struct saa7164_i2c {
+       struct saa7164_dev              *dev;
+
+       enum saa7164_i2c_bus_nr         nr;
+
+       /* I2C I/O */
+       struct i2c_adapter              i2c_adap;
+       struct i2c_algo_bit_data        i2c_algo;
+       struct i2c_client               i2c_client;
+       u32                             i2c_rc;
+};
+
+struct saa7164_tsport;
+
+struct saa7164_buffer {
+       struct list_head list;
+
+       u32 nr;
+
+       struct saa7164_tsport *port;
+
+       /* Hardware Specific */
+       /* PCI Memory allocations */
+       enum saa7164_buffer_flags flags; /* Free, Busy, Full */
+
+       /* A block of page align PCI memory */
+       u32 pci_size;   /* PCI allocation size in bytes */
+       u64 *cpu;       /* Virtual address */
+       dma_addr_t dma; /* Physical address */
+
+       /* A page table that splits the block into a number of entries */
+       u32 pt_size;            /* PCI allocation size in bytes */
+       u64 *pt_cpu;            /* Virtual address */
+       dma_addr_t pt_dma;      /* Physical address */
+};
+
+struct saa7164_tsport {
+
+       struct saa7164_dev *dev;
+       int nr;
+       enum port_t type;
+
+       struct saa7164_dvb dvb;
+
+       /* HW related stream parameters */
+       tmHWStreamParameters_t hw_streamingparams;
+
+       /* DMA configuration values, is seeded during initialization */
+       tmComResDMATermDescrHeader_t hwcfg;
+
+       /* hardware specific registers */
+       u32 bufcounter;
+       u32 pitch;
+       u32 bufsize;
+       u32 bufoffset;
+       u32 bufptr32l;
+       u32 bufptr32h;
+       u64 bufptr64;
+
+       u32 numpte;     /* Number of entries in array, only valid in head */
+       struct mutex dmaqueue_lock;
+       struct mutex dummy_dmaqueue_lock;
+       struct saa7164_buffer dmaqueue;
+       struct saa7164_buffer dummy_dmaqueue;
+
+};
+
+struct saa7164_dev {
+       struct list_head        devlist;
+       atomic_t                refcount;
+
+       /* pci stuff */
+       struct pci_dev  *pci;
+       unsigned char   pci_rev, pci_lat;
+       int             pci_bus, pci_slot;
+       u32             __iomem *lmmio;
+       u8              __iomem *bmmio;
+       u32             __iomem *lmmio2;
+       u8              __iomem *bmmio2;
+       int             pci_irqmask;
+
+       /* board details */
+       int     nr;
+       int     hwrevision;
+       u32     board;
+       char    name[32];
+
+       /* firmware status */
+       struct saa7164_fw_status        fw_status;
+
+       tmComResHWDescr_t               hwdesc;
+       tmComResInterfaceDescr_t        intfdesc;
+       tmComResBusDescr_t              busdesc;
+
+       tmComResBusInfo_t               bus;
+
+       /* Interrupt status and ack registers */
+       u32 int_status;
+       u32 int_ack;
+
+       struct cmd                      cmds[SAA_CMD_MAX_MSG_UNITS];
+       struct mutex                    lock;
+
+       /* I2c related */
+       struct saa7164_i2c i2c_bus[3];
+
+       /* Transport related */
+       struct saa7164_tsport ts1, ts2;
+
+       /* Deferred command/api interrupts handling */
+       struct work_struct workcmd;
+
+};
+
+extern struct list_head saa7164_devlist;
+extern unsigned int waitsecs;
+
+/* ----------------------------------------------------------- */
+/* saa7164-core.c                                              */
+void saa7164_dumpregs(struct saa7164_dev *dev, u32 addr);
+void saa7164_dumphex16(struct saa7164_dev *dev, u8 *buf, int len);
+void saa7164_getfirmwarestatus(struct saa7164_dev *dev);
+u32 saa7164_getcurrentfirmwareversion(struct saa7164_dev *dev);
+
+/* ----------------------------------------------------------- */
+/* saa7164-fw.c                                                */
+int saa7164_downloadfirmware(struct saa7164_dev *dev);
+
+/* ----------------------------------------------------------- */
+/* saa7164-i2c.c                                               */
+extern int saa7164_i2c_register(struct saa7164_i2c *bus);
+extern int saa7164_i2c_unregister(struct saa7164_i2c *bus);
+extern void saa7164_call_i2c_clients(struct saa7164_i2c *bus,
+       unsigned int cmd, void *arg);
+
+/* ----------------------------------------------------------- */
+/* saa7164-bus.c                                               */
+int saa7164_bus_setup(struct saa7164_dev *dev);
+void saa7164_bus_dump(struct saa7164_dev *dev);
+int saa7164_bus_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf);
+int saa7164_bus_get(struct saa7164_dev *dev, tmComResInfo_t* msg,
+       void *buf, int peekonly);
+
+/* ----------------------------------------------------------- */
+/* saa7164-cmd.c                                               */
+int saa7164_cmd_send(struct saa7164_dev *dev,
+       u8 id, tmComResCmd_t command, u16 controlselector,
+       u16 size, void *buf);
+void saa7164_cmd_signal(struct saa7164_dev *dev, u8 seqno);
+int saa7164_irq_dequeue(struct saa7164_dev *dev);
+
+/* ----------------------------------------------------------- */
+/* saa7164-api.c                                               */
+int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version);
+int saa7164_api_enum_subdevs(struct saa7164_dev *dev);
+int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
+       u32 datalen, u8 *data);
+int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr,
+       u32 datalen, u8 *data);
+int saa7164_api_dif_write(struct saa7164_i2c *bus, u8 addr,
+       u32 datalen, u8 *data);
+int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen);
+int saa7164_api_set_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
+int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
+int saa7164_api_transition_port(struct saa7164_tsport *port, u8 mode);
+
+/* ----------------------------------------------------------- */
+/* saa7164-cards.c                                             */
+extern struct saa7164_board saa7164_boards[];
+extern const unsigned int saa7164_bcount;
+
+extern struct saa7164_subid saa7164_subids[];
+extern const unsigned int saa7164_idcount;
+
+extern void saa7164_card_list(struct saa7164_dev *dev);
+extern void saa7164_gpio_setup(struct saa7164_dev *dev);
+extern void saa7164_card_setup(struct saa7164_dev *dev);
+
+extern int saa7164_i2caddr_to_reglen(struct saa7164_i2c *bus, int addr);
+extern int saa7164_i2caddr_to_unitid(struct saa7164_i2c *bus, int addr);
+extern char *saa7164_unitid_name(struct saa7164_dev *dev, u8 unitid);
+
+/* ----------------------------------------------------------- */
+/* saa7164-dvb.c                                               */
+extern int saa7164_dvb_register(struct saa7164_tsport *port);
+extern int saa7164_dvb_unregister(struct saa7164_tsport *port);
+
+/* ----------------------------------------------------------- */
+/* saa7164-buffer.c                                            */
+extern struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port,
+       u32 len);
+extern int saa7164_buffer_dealloc(struct saa7164_tsport *port,
+       struct saa7164_buffer *buf);
+
+/* ----------------------------------------------------------- */
+
+extern unsigned int debug;
+#define dprintk(level, fmt, arg...)\
+       do { if (debug & level)\
+               printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg);\
+       } while (0)
+
+#define log_warn(fmt, arg...)\
+       do { \
+               printk(KERN_WARNING "%s: " fmt, dev->name, ## arg);\
+       } while (0)
+
+#define log_err(fmt, arg...)\
+       do { \
+               printk(KERN_ERROR "%s: " fmt, dev->name, ## arg);\
+       } while (0)
+
+#define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2))
+#define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2))
+
+
+#define saa7164_readb(reg)             readl(dev->bmmio + (reg))
+#define saa7164_writeb(reg, value)     writel((value), dev->bmmio + (reg))
+
index 61c47b8..5ab7c5a 100644 (file)
 #define CDBYR2 0x98 /* Capture data bottom-field address Y register 2 */
 #define CDBCR2 0x9c /* Capture data bottom-field address C register 2 */
 
+#undef DEBUG_GEOMETRY
+#ifdef DEBUG_GEOMETRY
+#define dev_geo        dev_info
+#else
+#define dev_geo        dev_dbg
+#endif
+
 /* per video frame buffer */
 struct sh_mobile_ceu_buffer {
        struct videobuf_buffer vb; /* v4l buffer must be first */
@@ -92,10 +99,21 @@ struct sh_mobile_ceu_dev {
        spinlock_t lock;
        struct list_head capture;
        struct videobuf_buffer *active;
-       int is_interlaced;
 
        struct sh_mobile_ceu_info *pdata;
 
+       u32 cflcr;
+
+       unsigned int is_interlaced:1;
+       unsigned int image_mode:1;
+       unsigned int is_16bit:1;
+};
+
+struct sh_mobile_ceu_cam {
+       struct v4l2_rect ceu_rect;
+       unsigned int cam_width;
+       unsigned int cam_height;
+       const struct soc_camera_data_format *extra_fmt;
        const struct soc_camera_data_format *camera_fmt;
 };
 
@@ -146,7 +164,8 @@ static int sh_mobile_ceu_videobuf_setup(struct videobuf_queue *vq,
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
        int bytes_per_pixel = (icd->current_fmt->depth + 7) >> 3;
 
-       *size = PAGE_ALIGN(icd->width * icd->height * bytes_per_pixel);
+       *size = PAGE_ALIGN(icd->user_width * icd->user_height *
+                          bytes_per_pixel);
 
        if (0 == *count)
                *count = 2;
@@ -156,7 +175,7 @@ static int sh_mobile_ceu_videobuf_setup(struct videobuf_queue *vq,
                        (*count)--;
        }
 
-       dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
+       dev_dbg(icd->dev.parent, "count=%d, size=%d\n", *count, *size);
 
        return 0;
 }
@@ -165,8 +184,9 @@ static void free_buffer(struct videobuf_queue *vq,
                        struct sh_mobile_ceu_buffer *buf)
 {
        struct soc_camera_device *icd = vq->priv_data;
+       struct device *dev = icd->dev.parent;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
+       dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
                &buf->vb, buf->vb.baddr, buf->vb.bsize);
 
        if (in_interrupt())
@@ -174,7 +194,7 @@ static void free_buffer(struct videobuf_queue *vq,
 
        videobuf_waiton(&buf->vb, 0, 0);
        videobuf_dma_contig_free(vq, &buf->vb);
-       dev_dbg(&icd->dev, "%s freed\n", __func__);
+       dev_dbg(dev, "%s freed\n", __func__);
        buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
@@ -205,7 +225,7 @@ static void sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
        phys_addr_top = videobuf_to_dma_contig(pcdev->active);
        ceu_write(pcdev, CDAYR, phys_addr_top);
        if (pcdev->is_interlaced) {
-               phys_addr_bottom = phys_addr_top + icd->width;
+               phys_addr_bottom = phys_addr_top + icd->user_width;
                ceu_write(pcdev, CDBYR, phys_addr_bottom);
        }
 
@@ -214,10 +234,12 @@ static void sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
        case V4L2_PIX_FMT_NV21:
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
-               phys_addr_top += icd->width * icd->height;
+               phys_addr_top += icd->user_width *
+                       icd->user_height;
                ceu_write(pcdev, CDACR, phys_addr_top);
                if (pcdev->is_interlaced) {
-                       phys_addr_bottom = phys_addr_top + icd->width;
+                       phys_addr_bottom = phys_addr_top +
+                               icd->user_width;
                        ceu_write(pcdev, CDBCR, phys_addr_bottom);
                }
        }
@@ -236,7 +258,7 @@ static int sh_mobile_ceu_videobuf_prepare(struct videobuf_queue *vq,
 
        buf = container_of(vb, struct sh_mobile_ceu_buffer, vb);
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* Added list head initialization on alloc */
@@ -251,12 +273,12 @@ static int sh_mobile_ceu_videobuf_prepare(struct videobuf_queue *vq,
        BUG_ON(NULL == icd->current_fmt);
 
        if (buf->fmt    != icd->current_fmt ||
-           vb->width   != icd->width ||
-           vb->height  != icd->height ||
+           vb->width   != icd->user_width ||
+           vb->height  != icd->user_height ||
            vb->field   != field) {
                buf->fmt        = icd->current_fmt;
-               vb->width       = icd->width;
-               vb->height      = icd->height;
+               vb->width       = icd->user_width;
+               vb->height      = icd->user_height;
                vb->field       = field;
                vb->state       = VIDEOBUF_NEEDS_INIT;
        }
@@ -289,7 +311,7 @@ static void sh_mobile_ceu_videobuf_queue(struct videobuf_queue *vq,
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
+       dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        vb->state = VIDEOBUF_QUEUED;
@@ -304,6 +326,27 @@ static void sh_mobile_ceu_videobuf_queue(struct videobuf_queue *vq,
 static void sh_mobile_ceu_videobuf_release(struct videobuf_queue *vq,
                                           struct videobuf_buffer *vb)
 {
+       struct soc_camera_device *icd = vq->priv_data;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct sh_mobile_ceu_dev *pcdev = ici->priv;
+       unsigned long flags;
+
+       spin_lock_irqsave(&pcdev->lock, flags);
+
+       if (pcdev->active == vb) {
+               /* disable capture (release DMA buffer), reset */
+               ceu_write(pcdev, CAPSR, 1 << 16);
+               pcdev->active = NULL;
+       }
+
+       if ((vb->state == VIDEOBUF_ACTIVE || vb->state == VIDEOBUF_QUEUED) &&
+           !list_empty(&vb->queue)) {
+               vb->state = VIDEOBUF_ERROR;
+               list_del_init(&vb->queue);
+       }
+
+       spin_unlock_irqrestore(&pcdev->lock, flags);
+
        free_buffer(vq, container_of(vb, struct sh_mobile_ceu_buffer, vb));
 }
 
@@ -323,6 +366,10 @@ static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
        spin_lock_irqsave(&pcdev->lock, flags);
 
        vb = pcdev->active;
+       if (!vb)
+               /* Stale interrupt from a released buffer */
+               goto out;
+
        list_del_init(&vb->queue);
 
        if (!list_empty(&pcdev->capture))
@@ -337,6 +384,8 @@ static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
        do_gettimeofday(&vb->ts);
        vb->field_count++;
        wake_up(&vb->done);
+
+out:
        spin_unlock_irqrestore(&pcdev->lock, flags);
 
        return IRQ_HANDLED;
@@ -347,28 +396,23 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-       int ret = -EBUSY;
 
        if (pcdev->icd)
-               goto err;
+               return -EBUSY;
 
-       dev_info(&icd->dev,
+       dev_info(icd->dev.parent,
                 "SuperH Mobile CEU driver attached to camera %d\n",
                 icd->devnum);
 
-       ret = icd->ops->init(icd);
-       if (ret)
-               goto err;
-
-       pm_runtime_get_sync(ici->dev);
+       clk_enable(pcdev->clk);
 
        ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
        while (ceu_read(pcdev, CSTSR) & 1)
                msleep(1);
 
        pcdev->icd = icd;
-err:
-       return ret;
+
+       return 0;
 }
 
 /* Called with .video_lock held */
@@ -394,25 +438,151 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
        }
        spin_unlock_irqrestore(&pcdev->lock, flags);
 
-       pm_runtime_put_sync(ici->dev);
+       clk_disable(pcdev->clk);
 
-       icd->ops->release(icd);
-
-       dev_info(&icd->dev,
+       dev_info(icd->dev.parent,
                 "SuperH Mobile CEU driver detached from camera %d\n",
                 icd->devnum);
 
        pcdev->icd = NULL;
 }
 
+/*
+ * See chapter 29.4.12 "Capture Filter Control Register (CFLCR)"
+ * in SH7722 Hardware Manual
+ */
+static unsigned int size_dst(unsigned int src, unsigned int scale)
+{
+       unsigned int mant_pre = scale >> 12;
+       if (!src || !scale)
+               return src;
+       return ((mant_pre + 2 * (src - 1)) / (2 * mant_pre) - 1) *
+               mant_pre * 4096 / scale + 1;
+}
+
+static u16 calc_scale(unsigned int src, unsigned int *dst)
+{
+       u16 scale;
+
+       if (src == *dst)
+               return 0;
+
+       scale = (src * 4096 / *dst) & ~7;
+
+       while (scale > 4096 && size_dst(src, scale) < *dst)
+               scale -= 8;
+
+       *dst = size_dst(src, scale);
+
+       return scale;
+}
+
+/* rect is guaranteed to not exceed the scaled camera rectangle */
+static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd,
+                                  unsigned int out_width,
+                                  unsigned int out_height)
+{
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct v4l2_rect *rect = &cam->ceu_rect;
+       struct sh_mobile_ceu_dev *pcdev = ici->priv;
+       unsigned int height, width, cdwdr_width, in_width, in_height;
+       unsigned int left_offset, top_offset;
+       u32 camor;
+
+       dev_dbg(icd->dev.parent, "Crop %ux%u@%u:%u\n",
+               rect->width, rect->height, rect->left, rect->top);
+
+       left_offset     = rect->left;
+       top_offset      = rect->top;
+
+       if (pcdev->image_mode) {
+               in_width = rect->width;
+               if (!pcdev->is_16bit) {
+                       in_width *= 2;
+                       left_offset *= 2;
+               }
+               width = cdwdr_width = out_width;
+       } else {
+               unsigned int w_factor = (icd->current_fmt->depth + 7) >> 3;
+
+               width = out_width * w_factor / 2;
+
+               if (!pcdev->is_16bit)
+                       w_factor *= 2;
+
+               in_width = rect->width * w_factor / 2;
+               left_offset = left_offset * w_factor / 2;
+
+               cdwdr_width = width * 2;
+       }
+
+       height = out_height;
+       in_height = rect->height;
+       if (pcdev->is_interlaced) {
+               height /= 2;
+               in_height /= 2;
+               top_offset /= 2;
+               cdwdr_width *= 2;
+       }
+
+       /* Set CAMOR, CAPWR, CFSZR, take care of CDWDR */
+       camor = left_offset | (top_offset << 16);
+
+       dev_geo(icd->dev.parent,
+               "CAMOR 0x%x, CAPWR 0x%x, CFSZR 0x%x, CDWDR 0x%x\n", camor,
+               (in_height << 16) | in_width, (height << 16) | width,
+               cdwdr_width);
+
+       ceu_write(pcdev, CAMOR, camor);
+       ceu_write(pcdev, CAPWR, (in_height << 16) | in_width);
+       ceu_write(pcdev, CFSZR, (height << 16) | width);
+       ceu_write(pcdev, CDWDR, cdwdr_width);
+}
+
+static u32 capture_save_reset(struct sh_mobile_ceu_dev *pcdev)
+{
+       u32 capsr = ceu_read(pcdev, CAPSR);
+       ceu_write(pcdev, CAPSR, 1 << 16); /* reset, stop capture */
+       return capsr;
+}
+
+static void capture_restore(struct sh_mobile_ceu_dev *pcdev, u32 capsr)
+{
+       unsigned long timeout = jiffies + 10 * HZ;
+
+       /*
+        * Wait until the end of the current frame. It can take a long time,
+        * but if it has been aborted by a CAPSR reset, it shoule exit sooner.
+        */
+       while ((ceu_read(pcdev, CSTSR) & 1) && time_before(jiffies, timeout))
+               msleep(1);
+
+       if (time_after(jiffies, timeout)) {
+               dev_err(pcdev->ici.v4l2_dev.dev,
+                       "Timeout waiting for frame end! Interface problem?\n");
+               return;
+       }
+
+       /* Wait until reset clears, this shall not hang... */
+       while (ceu_read(pcdev, CAPSR) & (1 << 16))
+               udelay(10);
+
+       /* Anything to restore? */
+       if (capsr & ~(1 << 16))
+               ceu_write(pcdev, CAPSR, capsr);
+}
+
 static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
                                       __u32 pixfmt)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-       int ret, buswidth, width, height, cfszr_width, cdwdr_width;
+       int ret;
        unsigned long camera_flags, common_flags, value;
-       int yuv_mode, yuv_lineskip;
+       int yuv_lineskip;
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       u32 capsr = capture_save_reset(pcdev);
 
        camera_flags = icd->ops->query_bus_param(icd);
        common_flags = soc_camera_bus_param_compatible(camera_flags,
@@ -426,10 +596,10 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
 
        switch (common_flags & SOCAM_DATAWIDTH_MASK) {
        case SOCAM_DATAWIDTH_8:
-               buswidth = 8;
+               pcdev->is_16bit = 0;
                break;
        case SOCAM_DATAWIDTH_16:
-               buswidth = 16;
+               pcdev->is_16bit = 1;
                break;
        default:
                return -EINVAL;
@@ -439,7 +609,7 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
        ceu_write(pcdev, CRCMPR, 0);
 
        value = 0x00000010; /* data fetch by default */
-       yuv_mode = yuv_lineskip = 0;
+       yuv_lineskip = 0;
 
        switch (icd->current_fmt->fourcc) {
        case V4L2_PIX_FMT_NV12:
@@ -448,8 +618,7 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
                /* fall-through */
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
-               yuv_mode = 1;
-               switch (pcdev->camera_fmt->fourcc) {
+               switch (cam->camera_fmt->fourcc) {
                case V4L2_PIX_FMT_UYVY:
                        value = 0x00000000; /* Cb0, Y0, Cr0, Y1 */
                        break;
@@ -473,36 +642,16 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
 
        value |= common_flags & SOCAM_VSYNC_ACTIVE_LOW ? 1 << 1 : 0;
        value |= common_flags & SOCAM_HSYNC_ACTIVE_LOW ? 1 << 0 : 0;
-       value |= buswidth == 16 ? 1 << 12 : 0;
+       value |= pcdev->is_16bit ? 1 << 12 : 0;
        ceu_write(pcdev, CAMCR, value);
 
        ceu_write(pcdev, CAPCR, 0x00300000);
        ceu_write(pcdev, CAIFR, pcdev->is_interlaced ? 0x101 : 0);
 
+       sh_mobile_ceu_set_rect(icd, icd->user_width, icd->user_height);
        mdelay(1);
 
-       if (yuv_mode) {
-               width = icd->width * 2;
-               width = buswidth == 16 ? width / 2 : width;
-               cfszr_width = cdwdr_width = icd->width;
-       } else {
-               width = icd->width * ((icd->current_fmt->depth + 7) >> 3);
-               width = buswidth == 16 ? width / 2 : width;
-               cfszr_width = buswidth == 8 ? width / 2 : width;
-               cdwdr_width = buswidth == 16 ? width * 2 : width;
-       }
-
-       height = icd->height;
-       if (pcdev->is_interlaced) {
-               height /= 2;
-               cdwdr_width *= 2;
-       }
-
-       ceu_write(pcdev, CAMOR, 0);
-       ceu_write(pcdev, CAPWR, (height << 16) | width);
-       ceu_write(pcdev, CFLCR, 0); /* no scaling */
-       ceu_write(pcdev, CFSZR, (height << 16) | cfszr_width);
-       ceu_write(pcdev, CLFCR, 0); /* no lowpass filter */
+       ceu_write(pcdev, CFLCR, pcdev->cflcr);
 
        /* A few words about byte order (observed in Big Endian mode)
         *
@@ -521,10 +670,15 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
                value &= ~0x00000010; /* convert 4:2:2 -> 4:2:0 */
 
        ceu_write(pcdev, CDOCR, value);
-
-       ceu_write(pcdev, CDWDR, cdwdr_width);
        ceu_write(pcdev, CFWCR, 0); /* keep "datafetch firewall" disabled */
 
+       dev_dbg(icd->dev.parent, "S_FMT successful for %c%c%c%c %ux%u\n",
+               pixfmt & 0xff, (pixfmt >> 8) & 0xff,
+               (pixfmt >> 16) & 0xff, (pixfmt >> 24) & 0xff,
+               icd->user_width, icd->user_height);
+
+       capture_restore(pcdev, capsr);
+
        /* not in bundle mode: skip CBDSR, CDAYR2, CDACR2, CDBYR2, CDBCR2 */
        return 0;
 }
@@ -574,24 +728,35 @@ static const struct soc_camera_data_format sh_mobile_ceu_formats[] = {
 static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
                                     struct soc_camera_format_xlate *xlate)
 {
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct device *dev = icd->dev.parent;
        int ret, k, n;
        int formats = 0;
+       struct sh_mobile_ceu_cam *cam;
 
        ret = sh_mobile_ceu_try_bus_param(icd);
        if (ret < 0)
                return 0;
 
+       if (!icd->host_priv) {
+               cam = kzalloc(sizeof(*cam), GFP_KERNEL);
+               if (!cam)
+                       return -ENOMEM;
+
+               icd->host_priv = cam;
+       } else {
+               cam = icd->host_priv;
+       }
+
        /* Beginning of a pass */
        if (!idx)
-               icd->host_priv = NULL;
+               cam->extra_fmt = NULL;
 
        switch (icd->formats[idx].fourcc) {
        case V4L2_PIX_FMT_UYVY:
        case V4L2_PIX_FMT_VYUY:
        case V4L2_PIX_FMT_YUYV:
        case V4L2_PIX_FMT_YVYU:
-               if (icd->host_priv)
+               if (cam->extra_fmt)
                        goto add_single_format;
 
                /*
@@ -603,7 +768,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
                 * the host_priv pointer and check whether the format you're
                 * going to add now is already there.
                 */
-               icd->host_priv = (void *)sh_mobile_ceu_formats;
+               cam->extra_fmt = (void *)sh_mobile_ceu_formats;
 
                n = ARRAY_SIZE(sh_mobile_ceu_formats);
                formats += n;
@@ -612,7 +777,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = icd->formats[idx].depth;
                        xlate++;
-                       dev_dbg(ici->dev, "Providing format %s using %s\n",
+                       dev_dbg(dev, "Providing format %s using %s\n",
                                sh_mobile_ceu_formats[k].name,
                                icd->formats[idx].name);
                }
@@ -625,7 +790,7 @@ add_single_format:
                        xlate->cam_fmt = icd->formats + idx;
                        xlate->buswidth = icd->formats[idx].depth;
                        xlate++;
-                       dev_dbg(ici->dev,
+                       dev_dbg(dev,
                                "Providing format %s in pass-through mode\n",
                                icd->formats[idx].name);
                }
@@ -634,82 +799,714 @@ add_single_format:
        return formats;
 }
 
+static void sh_mobile_ceu_put_formats(struct soc_camera_device *icd)
+{
+       kfree(icd->host_priv);
+       icd->host_priv = NULL;
+}
+
+/* Check if any dimension of r1 is smaller than respective one of r2 */
+static bool is_smaller(struct v4l2_rect *r1, struct v4l2_rect *r2)
+{
+       return r1->width < r2->width || r1->height < r2->height;
+}
+
+/* Check if r1 fails to cover r2 */
+static bool is_inside(struct v4l2_rect *r1, struct v4l2_rect *r2)
+{
+       return r1->left > r2->left || r1->top > r2->top ||
+               r1->left + r1->width < r2->left + r2->width ||
+               r1->top + r1->height < r2->top + r2->height;
+}
+
+static unsigned int scale_down(unsigned int size, unsigned int scale)
+{
+       return (size * 4096 + scale / 2) / scale;
+}
+
+static unsigned int scale_up(unsigned int size, unsigned int scale)
+{
+       return (size * scale + 2048) / 4096;
+}
+
+static unsigned int calc_generic_scale(unsigned int input, unsigned int output)
+{
+       return (input * 4096 + output / 2) / output;
+}
+
+static int client_g_rect(struct v4l2_subdev *sd, struct v4l2_rect *rect)
+{
+       struct v4l2_crop crop;
+       struct v4l2_cropcap cap;
+       int ret;
+
+       crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = v4l2_subdev_call(sd, video, g_crop, &crop);
+       if (!ret) {
+               *rect = crop.c;
+               return ret;
+       }
+
+       /* Camera driver doesn't support .g_crop(), assume default rectangle */
+       cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = v4l2_subdev_call(sd, video, cropcap, &cap);
+       if (ret < 0)
+               return ret;
+
+       *rect = cap.defrect;
+
+       return ret;
+}
+
+/*
+ * The common for both scaling and cropping iterative approach is:
+ * 1. try if the client can produce exactly what requested by the user
+ * 2. if (1) failed, try to double the client image until we get one big enough
+ * 3. if (2) failed, try to request the maximum image
+ */
+static int client_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *crop,
+                        struct v4l2_crop *cam_crop)
+{
+       struct v4l2_rect *rect = &crop->c, *cam_rect = &cam_crop->c;
+       struct device *dev = sd->v4l2_dev->dev;
+       struct v4l2_cropcap cap;
+       int ret;
+       unsigned int width, height;
+
+       v4l2_subdev_call(sd, video, s_crop, crop);
+       ret = client_g_rect(sd, cam_rect);
+       if (ret < 0)
+               return ret;
+
+       /*
+        * Now cam_crop contains the current camera input rectangle, and it must
+        * be within camera cropcap bounds
+        */
+       if (!memcmp(rect, cam_rect, sizeof(*rect))) {
+               /* Even if camera S_CROP failed, but camera rectangle matches */
+               dev_dbg(dev, "Camera S_CROP successful for %ux%u@%u:%u\n",
+                       rect->width, rect->height, rect->left, rect->top);
+               return 0;
+       }
+
+       /* Try to fix cropping, that camera hasn't managed to set */
+       dev_geo(dev, "Fix camera S_CROP for %ux%u@%u:%u to %ux%u@%u:%u\n",
+               cam_rect->width, cam_rect->height,
+               cam_rect->left, cam_rect->top,
+               rect->width, rect->height, rect->left, rect->top);
+
+       /* We need sensor maximum rectangle */
+       ret = v4l2_subdev_call(sd, video, cropcap, &cap);
+       if (ret < 0)
+               return ret;
+
+       soc_camera_limit_side(&rect->left, &rect->width, cap.bounds.left, 2,
+                             cap.bounds.width);
+       soc_camera_limit_side(&rect->top, &rect->height, cap.bounds.top, 4,
+                             cap.bounds.height);
+
+       /*
+        * Popular special case - some cameras can only handle fixed sizes like
+        * QVGA, VGA,... Take care to avoid infinite loop.
+        */
+       width = max(cam_rect->width, 2);
+       height = max(cam_rect->height, 2);
+
+       while (!ret && (is_smaller(cam_rect, rect) ||
+                       is_inside(cam_rect, rect)) &&
+              (cap.bounds.width > width || cap.bounds.height > height)) {
+
+               width *= 2;
+               height *= 2;
+
+               cam_rect->width = width;
+               cam_rect->height = height;
+
+               /*
+                * We do not know what capabilities the camera has to set up
+                * left and top borders. We could try to be smarter in iterating
+                * them, e.g., if camera current left is to the right of the
+                * target left, set it to the middle point between the current
+                * left and minimum left. But that would add too much
+                * complexity: we would have to iterate each border separately.
+                */
+               if (cam_rect->left > rect->left)
+                       cam_rect->left = cap.bounds.left;
+
+               if (cam_rect->left + cam_rect->width < rect->left + rect->width)
+                       cam_rect->width = rect->left + rect->width -
+                               cam_rect->left;
+
+               if (cam_rect->top > rect->top)
+                       cam_rect->top = cap.bounds.top;
+
+               if (cam_rect->top + cam_rect->height < rect->top + rect->height)
+                       cam_rect->height = rect->top + rect->height -
+                               cam_rect->top;
+
+               v4l2_subdev_call(sd, video, s_crop, cam_crop);
+               ret = client_g_rect(sd, cam_rect);
+               dev_geo(dev, "Camera S_CROP %d for %ux%u@%u:%u\n", ret,
+                       cam_rect->width, cam_rect->height,
+                       cam_rect->left, cam_rect->top);
+       }
+
+       /* S_CROP must not modify the rectangle */
+       if (is_smaller(cam_rect, rect) || is_inside(cam_rect, rect)) {
+               /*
+                * The camera failed to configure a suitable cropping,
+                * we cannot use the current rectangle, set to max
+                */
+               *cam_rect = cap.bounds;
+               v4l2_subdev_call(sd, video, s_crop, cam_crop);
+               ret = client_g_rect(sd, cam_rect);
+               dev_geo(dev, "Camera S_CROP %d for max %ux%u@%u:%u\n", ret,
+                       cam_rect->width, cam_rect->height,
+                       cam_rect->left, cam_rect->top);
+       }
+
+       return ret;
+}
+
+static int get_camera_scales(struct v4l2_subdev *sd, struct v4l2_rect *rect,
+                            unsigned int *scale_h, unsigned int *scale_v)
+{
+       struct v4l2_format f;
+       int ret;
+
+       f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+       if (ret < 0)
+               return ret;
+
+       *scale_h = calc_generic_scale(rect->width, f.fmt.pix.width);
+       *scale_v = calc_generic_scale(rect->height, f.fmt.pix.height);
+
+       return 0;
+}
+
+static int get_camera_subwin(struct soc_camera_device *icd,
+                            struct v4l2_rect *cam_subrect,
+                            unsigned int cam_hscale, unsigned int cam_vscale)
+{
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct v4l2_rect *ceu_rect = &cam->ceu_rect;
+
+       if (!ceu_rect->width) {
+               struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+               struct device *dev = icd->dev.parent;
+               struct v4l2_format f;
+               struct v4l2_pix_format *pix = &f.fmt.pix;
+               int ret;
+               /* First time */
+
+               f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+               ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+               if (ret < 0)
+                       return ret;
+
+               dev_geo(dev, "camera fmt %ux%u\n", pix->width, pix->height);
+
+               if (pix->width > 2560) {
+                       ceu_rect->width  = 2560;
+                       ceu_rect->left   = (pix->width - 2560) / 2;
+               } else {
+                       ceu_rect->width  = pix->width;
+                       ceu_rect->left   = 0;
+               }
+
+               if (pix->height > 1920) {
+                       ceu_rect->height = 1920;
+                       ceu_rect->top    = (pix->height - 1920) / 2;
+               } else {
+                       ceu_rect->height = pix->height;
+                       ceu_rect->top    = 0;
+               }
+
+               dev_geo(dev, "initialised CEU rect %ux%u@%u:%u\n",
+                       ceu_rect->width, ceu_rect->height,
+                       ceu_rect->left, ceu_rect->top);
+       }
+
+       cam_subrect->width      = scale_up(ceu_rect->width, cam_hscale);
+       cam_subrect->left       = scale_up(ceu_rect->left, cam_hscale);
+       cam_subrect->height     = scale_up(ceu_rect->height, cam_vscale);
+       cam_subrect->top        = scale_up(ceu_rect->top, cam_vscale);
+
+       return 0;
+}
+
+static int client_s_fmt(struct soc_camera_device *icd, struct v4l2_format *f,
+                       bool ceu_can_scale)
+{
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct device *dev = icd->dev.parent;
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+       unsigned int width = pix->width, height = pix->height, tmp_w, tmp_h;
+       unsigned int max_width, max_height;
+       struct v4l2_cropcap cap;
+       int ret;
+
+       cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = v4l2_subdev_call(sd, video, cropcap, &cap);
+       if (ret < 0)
+               return ret;
+
+       max_width = min(cap.bounds.width, 2560);
+       max_height = min(cap.bounds.height, 1920);
+
+       ret = v4l2_subdev_call(sd, video, s_fmt, f);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "camera scaled to %ux%u\n", pix->width, pix->height);
+
+       if ((width == pix->width && height == pix->height) || !ceu_can_scale)
+               return 0;
+
+       /* Camera set a format, but geometry is not precise, try to improve */
+       tmp_w = pix->width;
+       tmp_h = pix->height;
+
+       /* width <= max_width && height <= max_height - guaranteed by try_fmt */
+       while ((width > tmp_w || height > tmp_h) &&
+              tmp_w < max_width && tmp_h < max_height) {
+               tmp_w = min(2 * tmp_w, max_width);
+               tmp_h = min(2 * tmp_h, max_height);
+               pix->width = tmp_w;
+               pix->height = tmp_h;
+               ret = v4l2_subdev_call(sd, video, s_fmt, f);
+               dev_geo(dev, "Camera scaled to %ux%u\n",
+                       pix->width, pix->height);
+               if (ret < 0) {
+                       /* This shouldn't happen */
+                       dev_err(dev, "Client failed to set format: %d\n", ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * @rect       - camera cropped rectangle
+ * @sub_rect   - CEU cropped rectangle, mapped back to camera input area
+ * @ceu_rect   - on output calculated CEU crop rectangle
+ */
+static int client_scale(struct soc_camera_device *icd, struct v4l2_rect *rect,
+                       struct v4l2_rect *sub_rect, struct v4l2_rect *ceu_rect,
+                       struct v4l2_format *f, bool ceu_can_scale)
+{
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct device *dev = icd->dev.parent;
+       struct v4l2_format f_tmp = *f;
+       struct v4l2_pix_format *pix_tmp = &f_tmp.fmt.pix;
+       unsigned int scale_h, scale_v;
+       int ret;
+
+       /* 5. Apply iterative camera S_FMT for camera user window. */
+       ret = client_s_fmt(icd, &f_tmp, ceu_can_scale);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "5: camera scaled to %ux%u\n",
+               pix_tmp->width, pix_tmp->height);
+
+       /* 6. Retrieve camera output window (g_fmt) */
+
+       /* unneeded - it is already in "f_tmp" */
+
+       /* 7. Calculate new camera scales. */
+       ret = get_camera_scales(sd, rect, &scale_h, &scale_v);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "7: camera scales %u:%u\n", scale_h, scale_v);
+
+       cam->cam_width          = pix_tmp->width;
+       cam->cam_height         = pix_tmp->height;
+       f->fmt.pix.width        = pix_tmp->width;
+       f->fmt.pix.height       = pix_tmp->height;
+
+       /*
+        * 8. Calculate new CEU crop - apply camera scales to previously
+        *    calculated "effective" crop.
+        */
+       ceu_rect->left = scale_down(sub_rect->left, scale_h);
+       ceu_rect->width = scale_down(sub_rect->width, scale_h);
+       ceu_rect->top = scale_down(sub_rect->top, scale_v);
+       ceu_rect->height = scale_down(sub_rect->height, scale_v);
+
+       dev_geo(dev, "8: new CEU rect %ux%u@%u:%u\n",
+               ceu_rect->width, ceu_rect->height,
+               ceu_rect->left, ceu_rect->top);
+
+       return 0;
+}
+
+/* Get combined scales */
+static int get_scales(struct soc_camera_device *icd,
+                     unsigned int *scale_h, unsigned int *scale_v)
+{
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct v4l2_crop cam_crop;
+       unsigned int width_in, height_in;
+       int ret;
+
+       cam_crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = client_g_rect(sd, &cam_crop.c);
+       if (ret < 0)
+               return ret;
+
+       ret = get_camera_scales(sd, &cam_crop.c, scale_h, scale_v);
+       if (ret < 0)
+               return ret;
+
+       width_in = scale_up(cam->ceu_rect.width, *scale_h);
+       height_in = scale_up(cam->ceu_rect.height, *scale_v);
+
+       *scale_h = calc_generic_scale(cam->ceu_rect.width, icd->user_width);
+       *scale_v = calc_generic_scale(cam->ceu_rect.height, icd->user_height);
+
+       return 0;
+}
+
+/*
+ * CEU can scale and crop, but we don't want to waste bandwidth and kill the
+ * framerate by always requesting the maximum image from the client. See
+ * Documentation/video4linux/sh_mobile_camera_ceu.txt for a description of
+ * scaling and cropping algorithms and for the meaning of referenced here steps.
+ */
 static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
-                                 struct v4l2_rect *rect)
+                                 struct v4l2_crop *a)
 {
-       return icd->ops->set_crop(icd, rect);
+       struct v4l2_rect *rect = &a->c;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct sh_mobile_ceu_dev *pcdev = ici->priv;
+       struct v4l2_crop cam_crop;
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct v4l2_rect *cam_rect = &cam_crop.c, *ceu_rect = &cam->ceu_rect;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct device *dev = icd->dev.parent;
+       struct v4l2_format f;
+       struct v4l2_pix_format *pix = &f.fmt.pix;
+       unsigned int scale_comb_h, scale_comb_v, scale_ceu_h, scale_ceu_v,
+               out_width, out_height;
+       u32 capsr, cflcr;
+       int ret;
+
+       /* 1. Calculate current combined scales. */
+       ret = get_scales(icd, &scale_comb_h, &scale_comb_v);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "1: combined scales %u:%u\n", scale_comb_h, scale_comb_v);
+
+       /* 2. Apply iterative camera S_CROP for new input window. */
+       ret = client_s_crop(sd, a, &cam_crop);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "2: camera cropped to %ux%u@%u:%u\n",
+               cam_rect->width, cam_rect->height,
+               cam_rect->left, cam_rect->top);
+
+       /* On success cam_crop contains current camera crop */
+
+       /*
+        * 3. If old combined scales applied to new crop produce an impossible
+        *    user window, adjust scales to produce nearest possible window.
+        */
+       out_width       = scale_down(rect->width, scale_comb_h);
+       out_height      = scale_down(rect->height, scale_comb_v);
+
+       if (out_width > 2560)
+               out_width = 2560;
+       else if (out_width < 2)
+               out_width = 2;
+
+       if (out_height > 1920)
+               out_height = 1920;
+       else if (out_height < 4)
+               out_height = 4;
+
+       dev_geo(dev, "3: Adjusted output %ux%u\n", out_width, out_height);
+
+       /* 4. Use G_CROP to retrieve actual input window: already in cam_crop */
+
+       /*
+        * 5. Using actual input window and calculated combined scales calculate
+        *    camera target output window.
+        */
+       pix->width              = scale_down(cam_rect->width, scale_comb_h);
+       pix->height             = scale_down(cam_rect->height, scale_comb_v);
+
+       dev_geo(dev, "5: camera target %ux%u\n", pix->width, pix->height);
+
+       /* 6. - 9. */
+       pix->pixelformat        = cam->camera_fmt->fourcc;
+       pix->colorspace         = cam->camera_fmt->colorspace;
+
+       capsr = capture_save_reset(pcdev);
+       dev_dbg(dev, "CAPSR 0x%x, CFLCR 0x%x\n", capsr, pcdev->cflcr);
+
+       /* Make relative to camera rectangle */
+       rect->left              -= cam_rect->left;
+       rect->top               -= cam_rect->top;
+
+       f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       ret = client_scale(icd, cam_rect, rect, ceu_rect, &f,
+                          pcdev->image_mode && !pcdev->is_interlaced);
+
+       dev_geo(dev, "6-9: %d\n", ret);
+
+       /* 10. Use CEU cropping to crop to the new window. */
+       sh_mobile_ceu_set_rect(icd, out_width, out_height);
+
+       dev_geo(dev, "10: CEU cropped to %ux%u@%u:%u\n",
+               ceu_rect->width, ceu_rect->height,
+               ceu_rect->left, ceu_rect->top);
+
+       /*
+        * 11. Calculate CEU scales from camera scales from results of (10) and
+        *     user window from (3)
+        */
+       scale_ceu_h = calc_scale(ceu_rect->width, &out_width);
+       scale_ceu_v = calc_scale(ceu_rect->height, &out_height);
+
+       dev_geo(dev, "11: CEU scales %u:%u\n", scale_ceu_h, scale_ceu_v);
+
+       /* 12. Apply CEU scales. */
+       cflcr = scale_ceu_h | (scale_ceu_v << 16);
+       if (cflcr != pcdev->cflcr) {
+               pcdev->cflcr = cflcr;
+               ceu_write(pcdev, CFLCR, cflcr);
+       }
+
+       /* Restore capture */
+       if (pcdev->active)
+               capsr |= 1;
+       capture_restore(pcdev, capsr);
+
+       icd->user_width = out_width;
+       icd->user_height = out_height;
+
+       /* Even if only camera cropping succeeded */
+       return ret;
 }
 
+/* Similar to set_crop multistage iterative algorithm */
 static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
                                 struct v4l2_format *f)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-       __u32 pixfmt = f->fmt.pix.pixelformat;
-       const struct soc_camera_format_xlate *xlate;
+       struct sh_mobile_ceu_cam *cam = icd->host_priv;
+       struct v4l2_pix_format *pix = &f->fmt.pix;
        struct v4l2_format cam_f = *f;
+       struct v4l2_pix_format *cam_pix = &cam_f.fmt.pix;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       struct device *dev = icd->dev.parent;
+       __u32 pixfmt = pix->pixelformat;
+       const struct soc_camera_format_xlate *xlate;
+       struct v4l2_crop cam_crop;
+       struct v4l2_rect *cam_rect = &cam_crop.c, cam_subrect, ceu_rect;
+       unsigned int scale_cam_h, scale_cam_v;
+       u16 scale_v, scale_h;
        int ret;
+       bool is_interlaced, image_mode;
+
+       switch (pix->field) {
+       case V4L2_FIELD_INTERLACED:
+               is_interlaced = true;
+               break;
+       case V4L2_FIELD_ANY:
+       default:
+               pix->field = V4L2_FIELD_NONE;
+               /* fall-through */
+       case V4L2_FIELD_NONE:
+               is_interlaced = false;
+               break;
+       }
 
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+               dev_warn(dev, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
 
-       cam_f.fmt.pix.pixelformat = xlate->cam_fmt->fourcc;
-       ret = icd->ops->set_fmt(icd, &cam_f);
+       /* 1. Calculate current camera scales. */
+       cam_crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-       if (!ret) {
-               icd->buswidth = xlate->buswidth;
-               icd->current_fmt = xlate->host_fmt;
-               pcdev->camera_fmt = xlate->cam_fmt;
+       ret = client_g_rect(sd, cam_rect);
+       if (ret < 0)
+               return ret;
+
+       ret = get_camera_scales(sd, cam_rect, &scale_cam_h, &scale_cam_v);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "1: camera scales %u:%u\n", scale_cam_h, scale_cam_v);
+
+       /*
+        * 2. Calculate "effective" input crop (sensor subwindow) - CEU crop
+        *    scaled back at current camera scales onto input window.
+        */
+       ret = get_camera_subwin(icd, &cam_subrect, scale_cam_h, scale_cam_v);
+       if (ret < 0)
+               return ret;
+
+       dev_geo(dev, "2: subwin %ux%u@%u:%u\n",
+               cam_subrect.width, cam_subrect.height,
+               cam_subrect.left, cam_subrect.top);
+
+       /*
+        * 3. Calculate new combined scales from "effective" input window to
+        *    requested user window.
+        */
+       scale_h = calc_generic_scale(cam_subrect.width, pix->width);
+       scale_v = calc_generic_scale(cam_subrect.height, pix->height);
+
+       dev_geo(dev, "3: scales %u:%u\n", scale_h, scale_v);
+
+       /*
+        * 4. Calculate camera output window by applying combined scales to real
+        *    input window.
+        */
+       cam_pix->width = scale_down(cam_rect->width, scale_h);
+       cam_pix->height = scale_down(cam_rect->height, scale_v);
+       cam_pix->pixelformat = xlate->cam_fmt->fourcc;
+
+       switch (pixfmt) {
+       case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_NV16:
+       case V4L2_PIX_FMT_NV61:
+               image_mode = true;
+               break;
+       default:
+               image_mode = false;
        }
 
-       return ret;
+       dev_geo(dev, "4: camera output %ux%u\n",
+               cam_pix->width, cam_pix->height);
+
+       /* 5. - 9. */
+       ret = client_scale(icd, cam_rect, &cam_subrect, &ceu_rect, &cam_f,
+                          image_mode && !is_interlaced);
+
+       dev_geo(dev, "5-9: client scale %d\n", ret);
+
+       /* Done with the camera. Now see if we can improve the result */
+
+       dev_dbg(dev, "Camera %d fmt %ux%u, requested %ux%u\n",
+               ret, cam_pix->width, cam_pix->height, pix->width, pix->height);
+       if (ret < 0)
+               return ret;
+
+       /* 10. Use CEU scaling to scale to the requested user window. */
+
+       /* We cannot scale up */
+       if (pix->width > cam_pix->width)
+               pix->width = cam_pix->width;
+       if (pix->width > ceu_rect.width)
+               pix->width = ceu_rect.width;
+
+       if (pix->height > cam_pix->height)
+               pix->height = cam_pix->height;
+       if (pix->height > ceu_rect.height)
+               pix->height = ceu_rect.height;
+
+       /* Let's rock: scale pix->{width x height} down to width x height */
+       scale_h = calc_scale(ceu_rect.width, &pix->width);
+       scale_v = calc_scale(ceu_rect.height, &pix->height);
+
+       dev_geo(dev, "10: W: %u : 0x%x = %u, H: %u : 0x%x = %u\n",
+               ceu_rect.width, scale_h, pix->width,
+               ceu_rect.height, scale_v, pix->height);
+
+       pcdev->cflcr = scale_h | (scale_v << 16);
+
+       icd->buswidth = xlate->buswidth;
+       icd->current_fmt = xlate->host_fmt;
+       cam->camera_fmt = xlate->cam_fmt;
+       cam->ceu_rect = ceu_rect;
+
+       pcdev->is_interlaced = is_interlaced;
+       pcdev->image_mode = image_mode;
+
+       return 0;
 }
 
 static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
                                 struct v4l2_format *f)
 {
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-       struct sh_mobile_ceu_dev *pcdev = ici->priv;
        const struct soc_camera_format_xlate *xlate;
-       __u32 pixfmt = f->fmt.pix.pixelformat;
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       __u32 pixfmt = pix->pixelformat;
+       int width, height;
        int ret;
 
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (!xlate) {
-               dev_warn(ici->dev, "Format %x not found\n", pixfmt);
+               dev_warn(icd->dev.parent, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
 
        /* FIXME: calculate using depth and bus width */
 
-       v4l_bound_align_image(&f->fmt.pix.width, 2, 2560, 1,
-                             &f->fmt.pix.height, 4, 1920, 2, 0);
+       v4l_bound_align_image(&pix->width, 2, 2560, 1,
+                             &pix->height, 4, 1920, 2, 0);
+
+       width = pix->width;
+       height = pix->height;
 
-       f->fmt.pix.bytesperline = f->fmt.pix.width *
+       pix->bytesperline = pix->width *
                DIV_ROUND_UP(xlate->host_fmt->depth, 8);
-       f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
+       pix->sizeimage = pix->height * pix->bytesperline;
+
+       pix->pixelformat = xlate->cam_fmt->fourcc;
 
        /* limit to sensor capabilities */
-       ret = icd->ops->try_fmt(icd, f);
+       ret = v4l2_subdev_call(sd, video, try_fmt, f);
+       pix->pixelformat = pixfmt;
        if (ret < 0)
                return ret;
 
-       switch (f->fmt.pix.field) {
-       case V4L2_FIELD_INTERLACED:
-               pcdev->is_interlaced = 1;
-               break;
-       case V4L2_FIELD_ANY:
-               f->fmt.pix.field = V4L2_FIELD_NONE;
-               /* fall-through */
-       case V4L2_FIELD_NONE:
-               pcdev->is_interlaced = 0;
-               break;
-       default:
-               ret = -EINVAL;
-               break;
+       switch (pixfmt) {
+       case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_NV16:
+       case V4L2_PIX_FMT_NV61:
+               /* FIXME: check against rect_max after converting soc-camera */
+               /* We can scale precisely, need a bigger image from camera */
+               if (pix->width < width || pix->height < height) {
+                       int tmp_w = pix->width, tmp_h = pix->height;
+                       pix->width = 2560;
+                       pix->height = 1920;
+                       ret = v4l2_subdev_call(sd, video, try_fmt, f);
+                       if (ret < 0) {
+                               /* Shouldn't actually happen... */
+                               dev_err(icd->dev.parent,
+                                       "FIXME: try_fmt() returned %d\n", ret);
+                               pix->width = tmp_w;
+                               pix->height = tmp_h;
+                       }
+               }
+               if (pix->width > width)
+                       pix->width = width;
+               if (pix->height > height)
+                       pix->height = height;
        }
 
        return ret;
@@ -769,7 +1566,7 @@ static void sh_mobile_ceu_init_videobuf(struct videobuf_queue *q,
 
        videobuf_queue_dma_contig_init(q,
                                       &sh_mobile_ceu_videobuf_ops,
-                                      ici->dev, &pcdev->lock,
+                                      icd->dev.parent, &pcdev->lock,
                                       V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                       pcdev->is_interlaced ?
                                       V4L2_FIELD_INTERLACED : V4L2_FIELD_NONE,
@@ -777,22 +1574,76 @@ static void sh_mobile_ceu_init_videobuf(struct videobuf_queue *q,
                                       icd);
 }
 
+static int sh_mobile_ceu_get_ctrl(struct soc_camera_device *icd,
+                                 struct v4l2_control *ctrl)
+{
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct sh_mobile_ceu_dev *pcdev = ici->priv;
+       u32 val;
+
+       switch (ctrl->id) {
+       case V4L2_CID_SHARPNESS:
+               val = ceu_read(pcdev, CLFCR);
+               ctrl->value = val ^ 1;
+               return 0;
+       }
+       return -ENOIOCTLCMD;
+}
+
+static int sh_mobile_ceu_set_ctrl(struct soc_camera_device *icd,
+                                 struct v4l2_control *ctrl)
+{
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct sh_mobile_ceu_dev *pcdev = ici->priv;
+
+       switch (ctrl->id) {
+       case V4L2_CID_SHARPNESS:
+               switch (icd->current_fmt->fourcc) {
+               case V4L2_PIX_FMT_NV12:
+               case V4L2_PIX_FMT_NV21:
+               case V4L2_PIX_FMT_NV16:
+               case V4L2_PIX_FMT_NV61:
+                       ceu_write(pcdev, CLFCR, !ctrl->value);
+                       return 0;
+               }
+               return -EINVAL;
+       }
+       return -ENOIOCTLCMD;
+}
+
+static const struct v4l2_queryctrl sh_mobile_ceu_controls[] = {
+       {
+               .id             = V4L2_CID_SHARPNESS,
+               .type           = V4L2_CTRL_TYPE_BOOLEAN,
+               .name           = "Low-pass filter",
+               .minimum        = 0,
+               .maximum        = 1,
+               .step           = 1,
+               .default_value  = 0,
+       },
+};
+
 static struct soc_camera_host_ops sh_mobile_ceu_host_ops = {
        .owner          = THIS_MODULE,
        .add            = sh_mobile_ceu_add_device,
        .remove         = sh_mobile_ceu_remove_device,
        .get_formats    = sh_mobile_ceu_get_formats,
+       .put_formats    = sh_mobile_ceu_put_formats,
        .set_crop       = sh_mobile_ceu_set_crop,
        .set_fmt        = sh_mobile_ceu_set_fmt,
        .try_fmt        = sh_mobile_ceu_try_fmt,
+       .set_ctrl       = sh_mobile_ceu_set_ctrl,
+       .get_ctrl       = sh_mobile_ceu_get_ctrl,
        .reqbufs        = sh_mobile_ceu_reqbufs,
        .poll           = sh_mobile_ceu_poll,
        .querycap       = sh_mobile_ceu_querycap,
        .set_bus_param  = sh_mobile_ceu_set_bus_param,
        .init_videobuf  = sh_mobile_ceu_init_videobuf,
+       .controls       = sh_mobile_ceu_controls,
+       .num_controls   = ARRAY_SIZE(sh_mobile_ceu_controls),
 };
 
-static int sh_mobile_ceu_probe(struct platform_device *pdev)
+static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev)
 {
        struct sh_mobile_ceu_dev *pcdev;
        struct resource *res;
@@ -865,7 +1716,7 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
        pm_runtime_resume(&pdev->dev);
 
        pcdev->ici.priv = pcdev;
-       pcdev->ici.dev = &pdev->dev;
+       pcdev->ici.v4l2_dev.dev = &pdev->dev;
        pcdev->ici.nr = pdev->id;
        pcdev->ici.drv_name = dev_name(&pdev->dev);
        pcdev->ici.ops = &sh_mobile_ceu_host_ops;
@@ -889,7 +1740,7 @@ exit:
        return err;
 }
 
-static int sh_mobile_ceu_remove(struct platform_device *pdev)
+static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev)
 {
        struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
        struct sh_mobile_ceu_dev *pcdev = container_of(soc_host,
@@ -927,7 +1778,7 @@ static struct platform_driver sh_mobile_ceu_driver = {
                .pm     = &sh_mobile_ceu_dev_pm_ops,
        },
        .probe          = sh_mobile_ceu_probe,
-       .remove         = sh_mobile_ceu_remove,
+       .remove         = __exit_p(sh_mobile_ceu_remove),
 };
 
 static int __init sh_mobile_ceu_init(void)
@@ -946,3 +1797,4 @@ module_exit(sh_mobile_ceu_exit);
 MODULE_DESCRIPTION("SuperH Mobile CEU driver");
 MODULE_AUTHOR("Magnus Damm");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sh_mobile_ceu");
index 23edfdc..9d84c94 100644 (file)
@@ -1954,8 +1954,10 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                                    (!list_empty(&cam->outqueue)) ||
                                    (cam->state & DEV_DISCONNECTED) ||
                                    (cam->state & DEV_MISCONFIGURED),
-                                   cam->module_param.frame_timeout *
-                                   1000 * msecs_to_jiffies(1) );
+                                   msecs_to_jiffies(
+                                       cam->module_param.frame_timeout * 1000
+                                   )
+                                 );
                        if (timeout < 0) {
                                mutex_unlock(&cam->fileop_mutex);
                                return timeout;
index 9f5ae81..59aa7a3 100644 (file)
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/list.h>
-#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/vmalloc.h>
 
 #include <media/soc_camera.h>
 #include <media/v4l2-common.h>
-#include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-dev.h>
 #include <media/videobuf-core.h>
 
 /* Default to VGA resolution */
@@ -38,7 +38,7 @@
 
 static LIST_HEAD(hosts);
 static LIST_HEAD(devices);
-static DEFINE_MUTEX(list_lock);
+static DEFINE_MUTEX(list_lock);                /* Protects the list of hosts */
 
 const struct soc_camera_data_format *soc_camera_format_by_fourcc(
        struct soc_camera_device *icd, unsigned int fourcc)
@@ -152,12 +152,9 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
-       int ret = 0;
-
-       if (icd->ops->set_std)
-               ret = icd->ops->set_std(icd, a);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
 
-       return ret;
+       return v4l2_subdev_call(sd, core, s_std, *a);
 }
 
 static int soc_camera_reqbufs(struct file *file, void *priv,
@@ -170,8 +167,6 @@ static int soc_camera_reqbufs(struct file *file, void *priv,
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s: %d\n", __func__, p->memory);
-
        ret = videobuf_reqbufs(&icf->vb_vidq, p);
        if (ret < 0)
                return ret;
@@ -209,10 +204,11 @@ static int soc_camera_dqbuf(struct file *file, void *priv,
        return videobuf_dqbuf(&icf->vb_vidq, p, file->f_flags & O_NONBLOCK);
 }
 
+/* Always entered with .video_lock held */
 static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-       int i, fmts = 0;
+       int i, fmts = 0, ret;
 
        if (!ici->ops->get_formats)
                /*
@@ -225,8 +221,12 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
                 * First pass - only count formats this host-sensor
                 * configuration can provide
                 */
-               for (i = 0; i < icd->num_formats; i++)
-                       fmts += ici->ops->get_formats(icd, i, NULL);
+               for (i = 0; i < icd->num_formats; i++) {
+                       ret = ici->ops->get_formats(icd, i, NULL);
+                       if (ret < 0)
+                               return ret;
+                       fmts += ret;
+               }
 
        if (!fmts)
                return -ENXIO;
@@ -248,20 +248,39 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
                        icd->user_formats[i].cam_fmt = icd->formats + i;
                        icd->user_formats[i].buswidth = icd->formats[i].depth;
                } else {
-                       fmts += ici->ops->get_formats(icd, i,
-                                                     &icd->user_formats[fmts]);
+                       ret = ici->ops->get_formats(icd, i,
+                                                   &icd->user_formats[fmts]);
+                       if (ret < 0)
+                               goto egfmt;
+                       fmts += ret;
                }
 
        icd->current_fmt = icd->user_formats[0].host_fmt;
 
        return 0;
+
+egfmt:
+       icd->num_user_formats = 0;
+       vfree(icd->user_formats);
+       return ret;
 }
 
+/* Always entered with .video_lock held */
 static void soc_camera_free_user_formats(struct soc_camera_device *icd)
 {
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+
+       if (ici->ops->put_formats)
+               ici->ops->put_formats(icd);
+       icd->current_fmt = NULL;
+       icd->num_user_formats = 0;
        vfree(icd->user_formats);
+       icd->user_formats = NULL;
 }
 
+#define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \
+       ((x) >> 24) & 0xff
+
 /* Called with .vb_lock held */
 static int soc_camera_set_fmt(struct soc_camera_file *icf,
                              struct v4l2_format *f)
@@ -271,6 +290,9 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
        struct v4l2_pix_format *pix = &f->fmt.pix;
        int ret;
 
+       dev_dbg(&icd->dev, "S_FMT(%c%c%c%c, %ux%u)\n",
+               pixfmtstr(pix->pixelformat), pix->width, pix->height);
+
        /* We always call try_fmt() before set_fmt() or set_crop() */
        ret = ici->ops->try_fmt(icd, f);
        if (ret < 0)
@@ -281,13 +303,13 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
                return ret;
        } else if (!icd->current_fmt ||
                   icd->current_fmt->fourcc != pix->pixelformat) {
-               dev_err(ici->dev,
+               dev_err(&icd->dev,
                        "Host driver hasn't set up current format correctly!\n");
                return -EINVAL;
        }
 
-       icd->width              = pix->width;
-       icd->height             = pix->height;
+       icd->user_width         = pix->width;
+       icd->user_height        = pix->height;
        icf->vb_vidq.field      =
                icd->field      = pix->field;
 
@@ -296,7 +318,7 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
                         f->type);
 
        dev_dbg(&icd->dev, "set width: %d height: %d\n",
-               icd->width, icd->height);
+               icd->user_width, icd->user_height);
 
        /* set physical bus parameters */
        return ici->ops->set_bus_param(icd, pix->pixelformat);
@@ -304,30 +326,24 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
 
 static int soc_camera_open(struct file *file)
 {
-       struct video_device *vdev;
-       struct soc_camera_device *icd;
+       struct video_device *vdev = video_devdata(file);
+       struct soc_camera_device *icd = container_of(vdev->parent,
+                                                    struct soc_camera_device,
+                                                    dev);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        struct soc_camera_host *ici;
        struct soc_camera_file *icf;
        int ret;
 
-       icf = vmalloc(sizeof(*icf));
-       if (!icf)
-               return -ENOMEM;
-
-       /*
-        * It is safe to dereference these pointers now as long as a user has
-        * the video device open - we are protected by the held cdev reference.
-        */
+       if (!icd->ops)
+               /* No device driver attached */
+               return -ENODEV;
 
-       vdev = video_devdata(file);
-       icd = container_of(vdev->parent, struct soc_camera_device, dev);
        ici = to_soc_camera_host(icd->dev.parent);
 
-       if (!try_module_get(icd->ops->owner)) {
-               dev_err(&icd->dev, "Couldn't lock sensor driver.\n");
-               ret = -EINVAL;
-               goto emgd;
-       }
+       icf = vmalloc(sizeof(*icf));
+       if (!icf)
+               return -ENOMEM;
 
        if (!try_module_get(ici->ops->owner)) {
                dev_err(&icd->dev, "Couldn't lock capture bus driver.\n");
@@ -335,7 +351,10 @@ static int soc_camera_open(struct file *file)
                goto emgi;
        }
 
-       /* Protect against icd->remove() until we module_get() both drivers. */
+       /*
+        * Protect against icd->ops->remove() until we module_get() both
+        * drivers.
+        */
        mutex_lock(&icd->video_lock);
 
        icf->icd = icd;
@@ -347,14 +366,24 @@ static int soc_camera_open(struct file *file)
                struct v4l2_format f = {
                        .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
                        .fmt.pix = {
-                               .width          = icd->width,
-                               .height         = icd->height,
+                               .width          = icd->user_width,
+                               .height         = icd->user_height,
                                .field          = icd->field,
                                .pixelformat    = icd->current_fmt->fourcc,
                                .colorspace     = icd->current_fmt->colorspace,
                        },
                };
 
+               if (icl->power) {
+                       ret = icl->power(icd->pdev, 1);
+                       if (ret < 0)
+                               goto epower;
+               }
+
+               /* The camera could have been already on, try to reset */
+               if (icl->reset)
+                       icl->reset(icd->pdev);
+
                ret = ici->ops->add(icd);
                if (ret < 0) {
                        dev_err(&icd->dev, "Couldn't activate the camera: %d\n", ret);
@@ -367,28 +396,29 @@ static int soc_camera_open(struct file *file)
                        goto esfmt;
        }
 
-       mutex_unlock(&icd->video_lock);
-
        file->private_data = icf;
        dev_dbg(&icd->dev, "camera device open\n");
 
        ici->ops->init_videobuf(&icf->vb_vidq, icd);
 
+       mutex_unlock(&icd->video_lock);
+
        return 0;
 
        /*
-        * First three errors are entered with the .video_lock held
+        * First five errors are entered with the .video_lock held
         * and use_count == 1
         */
 esfmt:
        ici->ops->remove(icd);
 eiciadd:
+       if (icl->power)
+               icl->power(icd->pdev, 0);
+epower:
        icd->use_count--;
        mutex_unlock(&icd->video_lock);
        module_put(ici->ops->owner);
 emgi:
-       module_put(icd->ops->owner);
-emgd:
        vfree(icf);
        return ret;
 }
@@ -398,21 +428,24 @@ static int soc_camera_close(struct file *file)
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-       struct video_device *vdev = icd->vdev;
 
        mutex_lock(&icd->video_lock);
        icd->use_count--;
-       if (!icd->use_count)
+       if (!icd->use_count) {
+               struct soc_camera_link *icl = to_soc_camera_link(icd);
+
                ici->ops->remove(icd);
+               if (icl->power)
+                       icl->power(icd->pdev, 0);
+       }
 
        mutex_unlock(&icd->video_lock);
 
-       module_put(icd->ops->owner);
        module_put(ici->ops->owner);
 
        vfree(icf);
 
-       dev_dbg(vdev->parent, "camera device close\n");
+       dev_dbg(&icd->dev, "camera device close\n");
 
        return 0;
 }
@@ -422,10 +455,9 @@ static ssize_t soc_camera_read(struct file *file, char __user *buf,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
-       struct video_device *vdev = icd->vdev;
        int err = -EINVAL;
 
-       dev_err(vdev->parent, "camera device read not implemented\n");
+       dev_err(&icd->dev, "camera device read not implemented\n");
 
        return err;
 }
@@ -483,8 +515,8 @@ static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv,
 
        mutex_lock(&icf->vb_vidq.vb_lock);
 
-       if (videobuf_queue_is_busy(&icf->vb_vidq)) {
-               dev_err(&icd->dev, "S_FMT denied: queue busy\n");
+       if (icf->vb_vidq.bufs[0]) {
+               dev_err(&icd->dev, "S_FMT denied: queue initialised\n");
                ret = -EBUSY;
                goto unlock;
        }
@@ -525,8 +557,8 @@ static int soc_camera_g_fmt_vid_cap(struct file *file, void *priv,
 
        WARN_ON(priv != file->private_data);
 
-       pix->width              = icd->width;
-       pix->height             = icd->height;
+       pix->width              = icd->user_width;
+       pix->height             = icd->user_height;
        pix->field              = icf->vb_vidq.field;
        pix->pixelformat        = icd->current_fmt->fourcc;
        pix->bytesperline       = pix->width *
@@ -555,18 +587,17 @@ static int soc_camera_streamon(struct file *file, void *priv,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        int ret;
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s\n", __func__);
-
        if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
        mutex_lock(&icd->video_lock);
 
-       icd->ops->start_capture(icd);
+       v4l2_subdev_call(sd, video, s_stream, 1);
 
        /* This calls buf_queue from host driver's videobuf_queue_ops */
        ret = videobuf_streamon(&icf->vb_vidq);
@@ -581,11 +612,10 @@ static int soc_camera_streamoff(struct file *file, void *priv,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s\n", __func__);
-
        if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
@@ -595,7 +625,7 @@ static int soc_camera_streamoff(struct file *file, void *priv,
         * remaining buffers. When the last buffer is freed, stop capture */
        videobuf_streamoff(&icf->vb_vidq);
 
-       icd->ops->stop_capture(icd);
+       v4l2_subdev_call(sd, video, s_stream, 0);
 
        mutex_unlock(&icd->video_lock);
 
@@ -607,6 +637,7 @@ static int soc_camera_queryctrl(struct file *file, void *priv,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
        int i;
 
        WARN_ON(priv != file->private_data);
@@ -614,6 +645,15 @@ static int soc_camera_queryctrl(struct file *file, void *priv,
        if (!qc->id)
                return -EINVAL;
 
+       /* First check host controls */
+       for (i = 0; i < ici->ops->num_controls; i++)
+               if (qc->id == ici->ops->controls[i].id) {
+                       memcpy(qc, &(ici->ops->controls[i]),
+                               sizeof(*qc));
+                       return 0;
+               }
+
+       /* Then device controls */
        for (i = 0; i < icd->ops->num_controls; i++)
                if (qc->id == icd->ops->controls[i].id) {
                        memcpy(qc, &(icd->ops->controls[i]),
@@ -629,25 +669,19 @@ static int soc_camera_g_ctrl(struct file *file, void *priv,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       int ret;
 
        WARN_ON(priv != file->private_data);
 
-       switch (ctrl->id) {
-       case V4L2_CID_GAIN:
-               if (icd->gain == (unsigned short)~0)
-                       return -EINVAL;
-               ctrl->value = icd->gain;
-               return 0;
-       case V4L2_CID_EXPOSURE:
-               if (icd->exposure == (unsigned short)~0)
-                       return -EINVAL;
-               ctrl->value = icd->exposure;
-               return 0;
+       if (ici->ops->get_ctrl) {
+               ret = ici->ops->get_ctrl(icd, ctrl);
+               if (ret != -ENOIOCTLCMD)
+                       return ret;
        }
 
-       if (icd->ops->get_control)
-               return icd->ops->get_control(icd, ctrl);
-       return -EINVAL;
+       return v4l2_subdev_call(sd, core, g_ctrl, ctrl);
 }
 
 static int soc_camera_s_ctrl(struct file *file, void *priv,
@@ -655,12 +689,19 @@ static int soc_camera_s_ctrl(struct file *file, void *priv,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       int ret;
 
        WARN_ON(priv != file->private_data);
 
-       if (icd->ops->set_control)
-               return icd->ops->set_control(icd, ctrl);
-       return -EINVAL;
+       if (ici->ops->set_ctrl) {
+               ret = ici->ops->set_ctrl(icd, ctrl);
+               if (ret != -ENOIOCTLCMD)
+                       return ret;
+       }
+
+       return v4l2_subdev_call(sd, core, s_ctrl, ctrl);
 }
 
 static int soc_camera_cropcap(struct file *file, void *fh,
@@ -668,20 +709,9 @@ static int soc_camera_cropcap(struct file *file, void *fh,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
 
-       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       a->bounds.left                  = icd->x_min;
-       a->bounds.top                   = icd->y_min;
-       a->bounds.width                 = icd->width_max;
-       a->bounds.height                = icd->height_max;
-       a->defrect.left                 = icd->x_min;
-       a->defrect.top                  = icd->y_min;
-       a->defrect.width                = DEFAULT_WIDTH;
-       a->defrect.height               = DEFAULT_HEIGHT;
-       a->pixelaspect.numerator        = 1;
-       a->pixelaspect.denominator      = 1;
-
-       return 0;
+       return ici->ops->cropcap(icd, a);
 }
 
 static int soc_camera_g_crop(struct file *file, void *fh,
@@ -689,36 +719,53 @@ static int soc_camera_g_crop(struct file *file, void *fh,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       int ret;
 
-       a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       a->c.left       = icd->x_current;
-       a->c.top        = icd->y_current;
-       a->c.width      = icd->width;
-       a->c.height     = icd->height;
+       mutex_lock(&icf->vb_vidq.vb_lock);
+       ret = ici->ops->get_crop(icd, a);
+       mutex_unlock(&icf->vb_vidq.vb_lock);
 
-       return 0;
+       return ret;
 }
 
+/*
+ * According to the V4L2 API, drivers shall not update the struct v4l2_crop
+ * argument with the actual geometry, instead, the user shall use G_CROP to
+ * retrieve it. However, we expect camera host and client drivers to update
+ * the argument, which we then use internally, but do not return to the user.
+ */
 static int soc_camera_s_crop(struct file *file, void *fh,
                             struct v4l2_crop *a)
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct v4l2_rect *rect = &a->c;
+       struct v4l2_crop current_crop;
        int ret;
 
        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
+       dev_dbg(&icd->dev, "S_CROP(%ux%u@%u:%u)\n",
+               rect->width, rect->height, rect->left, rect->top);
+
        /* Cropping is allowed during a running capture, guard consistency */
        mutex_lock(&icf->vb_vidq.vb_lock);
 
-       ret = ici->ops->set_crop(icd, &a->c);
-       if (!ret) {
-               icd->width      = a->c.width;
-               icd->height     = a->c.height;
-               icd->x_current  = a->c.left;
-               icd->y_current  = a->c.top;
+       /* If get_crop fails, we'll let host and / or client drivers decide */
+       ret = ici->ops->get_crop(icd, &current_crop);
+
+       /* Prohibit window size change with initialised buffers */
+       if (icf->vb_vidq.bufs[0] && !ret &&
+           (a->c.width != current_crop.c.width ||
+            a->c.height != current_crop.c.height)) {
+               dev_err(&icd->dev,
+                       "S_CROP denied: queue initialised and sizes differ\n");
+               ret = -EBUSY;
+       } else {
+               ret = ici->ops->set_crop(icd, a);
        }
 
        mutex_unlock(&icf->vb_vidq.vb_lock);
@@ -731,11 +778,9 @@ static int soc_camera_g_chip_ident(struct file *file, void *fh,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
 
-       if (!icd->ops->get_chip_id)
-               return -EINVAL;
-
-       return icd->ops->get_chip_id(icd, id);
+       return v4l2_subdev_call(sd, core, g_chip_ident, id);
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -744,11 +789,9 @@ static int soc_camera_g_register(struct file *file, void *fh,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
 
-       if (!icd->ops->get_register)
-               return -EINVAL;
-
-       return icd->ops->get_register(icd, reg);
+       return v4l2_subdev_call(sd, core, g_register, reg);
 }
 
 static int soc_camera_s_register(struct file *file, void *fh,
@@ -756,37 +799,12 @@ static int soc_camera_s_register(struct file *file, void *fh,
 {
        struct soc_camera_file *icf = file->private_data;
        struct soc_camera_device *icd = icf->icd;
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
 
-       if (!icd->ops->set_register)
-               return -EINVAL;
-
-       return icd->ops->set_register(icd, reg);
+       return v4l2_subdev_call(sd, core, s_register, reg);
 }
 #endif
 
-static int device_register_link(struct soc_camera_device *icd)
-{
-       int ret = dev_set_name(&icd->dev, "%u-%u", icd->iface, icd->devnum);
-
-       if (!ret)
-               ret = device_register(&icd->dev);
-
-       if (ret < 0) {
-               /* Prevent calling device_unregister() */
-               icd->dev.parent = NULL;
-               dev_err(&icd->dev, "Cannot register device: %d\n", ret);
-       /* Even if probe() was unsuccessful for all registered drivers,
-        * device_register() returns 0, and we add the link, just to
-        * document this camera's control device */
-       } else if (icd->control)
-               /* Have to sysfs_remove_link() before device_unregister()? */
-               if (sysfs_create_link(&icd->dev.kobj, &icd->control->kobj,
-                                     "control"))
-                       dev_warn(&icd->dev,
-                                "Failed creating the control symlink\n");
-       return ret;
-}
-
 /* So far this function cannot fail */
 static void scan_add_host(struct soc_camera_host *ici)
 {
@@ -796,106 +814,193 @@ static void scan_add_host(struct soc_camera_host *ici)
 
        list_for_each_entry(icd, &devices, list) {
                if (icd->iface == ici->nr) {
-                       icd->dev.parent = ici->dev;
-                       device_register_link(icd);
+                       int ret;
+                       icd->dev.parent = ici->v4l2_dev.dev;
+                       dev_set_name(&icd->dev, "%u-%u", icd->iface,
+                                    icd->devnum);
+                       ret = device_register(&icd->dev);
+                       if (ret < 0) {
+                               icd->dev.parent = NULL;
+                               dev_err(&icd->dev,
+                                       "Cannot register device: %d\n", ret);
+                       }
                }
        }
 
        mutex_unlock(&list_lock);
 }
 
-/* return: 0 if no match found or a match found and
- * device_register() successful, error code otherwise */
-static int scan_add_device(struct soc_camera_device *icd)
+#ifdef CONFIG_I2C_BOARDINFO
+static int soc_camera_init_i2c(struct soc_camera_device *icd,
+                              struct soc_camera_link *icl)
 {
-       struct soc_camera_host *ici;
-       int ret = 0;
+       struct i2c_client *client;
+       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct i2c_adapter *adap = i2c_get_adapter(icl->i2c_adapter_id);
+       struct v4l2_subdev *subdev;
+       int ret;
 
-       mutex_lock(&list_lock);
+       if (!adap) {
+               ret = -ENODEV;
+               dev_err(&icd->dev, "Cannot get I2C adapter #%d. No driver?\n",
+                       icl->i2c_adapter_id);
+               goto ei2cga;
+       }
 
-       list_add_tail(&icd->list, &devices);
+       icl->board_info->platform_data = icd;
 
-       /* Watch out for class_for_each_device / class_find_device API by
-        * Dave Young <hidave.darkstar@gmail.com> */
-       list_for_each_entry(ici, &hosts, list) {
-               if (icd->iface == ici->nr) {
-                       ret = 1;
-                       icd->dev.parent = ici->dev;
-                       break;
-               }
+       subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap,
+                               icl->module_name, icl->board_info, NULL);
+       if (!subdev) {
+               ret = -ENOMEM;
+               goto ei2cnd;
        }
 
-       mutex_unlock(&list_lock);
+       client = subdev->priv;
 
-       if (ret)
-               ret = device_register_link(icd);
+       /* Use to_i2c_client(dev) to recover the i2c client */
+       dev_set_drvdata(&icd->dev, &client->dev);
 
+       return 0;
+ei2cnd:
+       i2c_put_adapter(adap);
+ei2cga:
        return ret;
 }
 
+static void soc_camera_free_i2c(struct soc_camera_device *icd)
+{
+       struct i2c_client *client =
+               to_i2c_client(to_soc_camera_control(icd));
+       dev_set_drvdata(&icd->dev, NULL);
+       v4l2_device_unregister_subdev(i2c_get_clientdata(client));
+       i2c_unregister_device(client);
+       i2c_put_adapter(client->adapter);
+}
+#else
+#define soc_camera_init_i2c(icd, icl)  (-ENODEV)
+#define soc_camera_free_i2c(icd)       do {} while (0)
+#endif
+
+static int soc_camera_video_start(struct soc_camera_device *icd);
+static int video_dev_create(struct soc_camera_device *icd);
+/* Called during host-driver probe */
 static int soc_camera_probe(struct device *dev)
 {
        struct soc_camera_device *icd = to_soc_camera_dev(dev);
-       struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+       struct soc_camera_host *ici = to_soc_camera_host(dev->parent);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
+       struct device *control = NULL;
+       struct v4l2_subdev *sd;
+       struct v4l2_format f = {.type = V4L2_BUF_TYPE_VIDEO_CAPTURE};
        int ret;
 
-       /*
-        * Possible race scenario:
-        * modprobe <camera-host-driver> triggers __func__
-        * at this moment respective <camera-sensor-driver> gets rmmod'ed
-        * to protect take module references.
-        */
+       dev_info(dev, "Probing %s\n", dev_name(dev));
 
-       if (!try_module_get(icd->ops->owner)) {
-               dev_err(&icd->dev, "Couldn't lock sensor driver.\n");
-               ret = -EINVAL;
-               goto emgd;
+       if (icl->power) {
+               ret = icl->power(icd->pdev, 1);
+               if (ret < 0) {
+                       dev_err(dev,
+                               "Platform failed to power-on the camera.\n");
+                       goto epower;
+               }
        }
 
-       if (!try_module_get(ici->ops->owner)) {
-               dev_err(&icd->dev, "Couldn't lock capture bus driver.\n");
+       /* The camera could have been already on, try to reset */
+       if (icl->reset)
+               icl->reset(icd->pdev);
+
+       ret = ici->ops->add(icd);
+       if (ret < 0)
+               goto eadd;
+
+       /* Must have icd->vdev before registering the device */
+       ret = video_dev_create(icd);
+       if (ret < 0)
+               goto evdc;
+
+       /* Non-i2c cameras, e.g., soc_camera_platform, have no board_info */
+       if (icl->board_info) {
+               ret = soc_camera_init_i2c(icd, icl);
+               if (ret < 0)
+                       goto eadddev;
+       } else if (!icl->add_device || !icl->del_device) {
                ret = -EINVAL;
-               goto emgi;
+               goto eadddev;
+       } else {
+               if (icl->module_name)
+                       ret = request_module(icl->module_name);
+
+               ret = icl->add_device(icl, &icd->dev);
+               if (ret < 0)
+                       goto eadddev;
+
+               /*
+                * FIXME: this is racy, have to use driver-binding notification,
+                * when it is available
+                */
+               control = to_soc_camera_control(icd);
+               if (!control || !control->driver || !dev_get_drvdata(control) ||
+                   !try_module_get(control->driver->owner)) {
+                       icl->del_device(icl);
+                       goto enodrv;
+               }
        }
 
+       /* At this point client .probe() should have run already */
+       ret = soc_camera_init_user_formats(icd);
+       if (ret < 0)
+               goto eiufmt;
+
+       icd->field = V4L2_FIELD_ANY;
+
+       /* ..._video_start() will create a device node, so we have to protect */
        mutex_lock(&icd->video_lock);
 
-       /* We only call ->add() here to activate and probe the camera.
-        * We shall ->remove() and deactivate it immediately afterwards. */
-       ret = ici->ops->add(icd);
+       ret = soc_camera_video_start(icd);
        if (ret < 0)
-               goto eiadd;
+               goto evidstart;
+
+       /* Try to improve our guess of a reasonable window format */
+       sd = soc_camera_to_subdev(icd);
+       if (!v4l2_subdev_call(sd, video, g_fmt, &f)) {
+               icd->user_width         = f.fmt.pix.width;
+               icd->user_height        = f.fmt.pix.height;
+       }
 
-       ret = icd->ops->probe(icd);
-       if (ret >= 0) {
-               const struct v4l2_queryctrl *qctrl;
+       /* Do we have to sysfs_remove_link() before device_unregister()? */
+       if (sysfs_create_link(&icd->dev.kobj, &to_soc_camera_control(icd)->kobj,
+                             "control"))
+               dev_warn(&icd->dev, "Failed creating the control symlink\n");
 
-               qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_GAIN);
-               icd->gain = qctrl ? qctrl->default_value : (unsigned short)~0;
-               qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_EXPOSURE);
-               icd->exposure = qctrl ? qctrl->default_value :
-                       (unsigned short)~0;
+       ici->ops->remove(icd);
 
-               ret = soc_camera_init_user_formats(icd);
-               if (ret < 0) {
-                       if (icd->ops->remove)
-                               icd->ops->remove(icd);
-                       goto eiufmt;
-               }
+       if (icl->power)
+               icl->power(icd->pdev, 0);
 
-               icd->height     = DEFAULT_HEIGHT;
-               icd->width      = DEFAULT_WIDTH;
-               icd->field      = V4L2_FIELD_ANY;
-       }
+       mutex_unlock(&icd->video_lock);
 
+       return 0;
+
+evidstart:
+       mutex_unlock(&icd->video_lock);
+       soc_camera_free_user_formats(icd);
 eiufmt:
+       if (icl->board_info) {
+               soc_camera_free_i2c(icd);
+       } else {
+               icl->del_device(icl);
+               module_put(control->driver->owner);
+       }
+enodrv:
+eadddev:
+       video_device_release(icd->vdev);
+evdc:
        ici->ops->remove(icd);
-eiadd:
-       mutex_unlock(&icd->video_lock);
-       module_put(ici->ops->owner);
-emgi:
-       module_put(icd->ops->owner);
-emgd:
+eadd:
+       if (icl->power)
+               icl->power(icd->pdev, 0);
+epower:
        return ret;
 }
 
@@ -904,12 +1009,28 @@ emgd:
 static int soc_camera_remove(struct device *dev)
 {
        struct soc_camera_device *icd = to_soc_camera_dev(dev);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
+       struct video_device *vdev = icd->vdev;
 
-       mutex_lock(&icd->video_lock);
-       if (icd->ops->remove)
-               icd->ops->remove(icd);
-       mutex_unlock(&icd->video_lock);
+       BUG_ON(!dev->parent);
 
+       if (vdev) {
+               mutex_lock(&icd->video_lock);
+               video_unregister_device(vdev);
+               icd->vdev = NULL;
+               mutex_unlock(&icd->video_lock);
+       }
+
+       if (icl->board_info) {
+               soc_camera_free_i2c(icd);
+       } else {
+               struct device_driver *drv = to_soc_camera_control(icd) ?
+                       to_soc_camera_control(icd)->driver : NULL;
+               if (drv) {
+                       icl->del_device(icl);
+                       module_put(drv->owner);
+               }
+       }
        soc_camera_free_user_formats(icd);
 
        return 0;
@@ -957,14 +1078,33 @@ static void dummy_release(struct device *dev)
 {
 }
 
+static int default_cropcap(struct soc_camera_device *icd,
+                          struct v4l2_cropcap *a)
+{
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       return v4l2_subdev_call(sd, video, cropcap, a);
+}
+
+static int default_g_crop(struct soc_camera_device *icd, struct v4l2_crop *a)
+{
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       return v4l2_subdev_call(sd, video, g_crop, a);
+}
+
+static int default_s_crop(struct soc_camera_device *icd, struct v4l2_crop *a)
+{
+       struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+       return v4l2_subdev_call(sd, video, s_crop, a);
+}
+
 int soc_camera_host_register(struct soc_camera_host *ici)
 {
        struct soc_camera_host *ix;
+       int ret;
 
        if (!ici || !ici->ops ||
            !ici->ops->try_fmt ||
            !ici->ops->set_fmt ||
-           !ici->ops->set_crop ||
            !ici->ops->set_bus_param ||
            !ici->ops->querycap ||
            !ici->ops->init_videobuf ||
@@ -972,18 +1112,27 @@ int soc_camera_host_register(struct soc_camera_host *ici)
            !ici->ops->add ||
            !ici->ops->remove ||
            !ici->ops->poll ||
-           !ici->dev)
+           !ici->v4l2_dev.dev)
                return -EINVAL;
 
+       if (!ici->ops->set_crop)
+               ici->ops->set_crop = default_s_crop;
+       if (!ici->ops->get_crop)
+               ici->ops->get_crop = default_g_crop;
+       if (!ici->ops->cropcap)
+               ici->ops->cropcap = default_cropcap;
+
        mutex_lock(&list_lock);
        list_for_each_entry(ix, &hosts, list) {
                if (ix->nr == ici->nr) {
-                       mutex_unlock(&list_lock);
-                       return -EBUSY;
+                       ret = -EBUSY;
+                       goto edevreg;
                }
        }
 
-       dev_set_drvdata(ici->dev, ici);
+       ret = v4l2_device_register(ici->v4l2_dev.dev, &ici->v4l2_dev);
+       if (ret < 0)
+               goto edevreg;
 
        list_add_tail(&ici->list, &hosts);
        mutex_unlock(&list_lock);
@@ -991,6 +1140,10 @@ int soc_camera_host_register(struct soc_camera_host *ici)
        scan_add_host(ici);
 
        return 0;
+
+edevreg:
+       mutex_unlock(&list_lock);
+       return ret;
 }
 EXPORT_SYMBOL(soc_camera_host_register);
 
@@ -1004,42 +1157,34 @@ void soc_camera_host_unregister(struct soc_camera_host *ici)
        list_del(&ici->list);
 
        list_for_each_entry(icd, &devices, list) {
-               if (icd->dev.parent == ici->dev) {
+               if (icd->iface == ici->nr) {
+                       /* The bus->remove will be called */
                        device_unregister(&icd->dev);
                        /* Not before device_unregister(), .remove
                         * needs parent to call ici->ops->remove() */
                        icd->dev.parent = NULL;
+
+                       /* If the host module is loaded again, device_register()
+                        * would complain "already initialised" */
                        memset(&icd->dev.kobj, 0, sizeof(icd->dev.kobj));
                }
        }
 
        mutex_unlock(&list_lock);
 
-       dev_set_drvdata(ici->dev, NULL);
+       v4l2_device_unregister(&ici->v4l2_dev);
 }
 EXPORT_SYMBOL(soc_camera_host_unregister);
 
 /* Image capture device */
-int soc_camera_device_register(struct soc_camera_device *icd)
+static int soc_camera_device_register(struct soc_camera_device *icd)
 {
        struct soc_camera_device *ix;
        int num = -1, i;
 
-       if (!icd || !icd->ops ||
-           !icd->ops->probe ||
-           !icd->ops->init ||
-           !icd->ops->release ||
-           !icd->ops->start_capture ||
-           !icd->ops->stop_capture ||
-           !icd->ops->set_crop ||
-           !icd->ops->set_fmt ||
-           !icd->ops->try_fmt ||
-           !icd->ops->query_bus_param ||
-           !icd->ops->set_bus_param)
-               return -EINVAL;
-
        for (i = 0; i < 256 && num < 0; i++) {
                num = i;
+               /* Check if this index is available on this interface */
                list_for_each_entry(ix, &devices, list) {
                        if (ix->iface == icd->iface && ix->devnum == i) {
                                num = -1;
@@ -1061,21 +1206,15 @@ int soc_camera_device_register(struct soc_camera_device *icd)
        icd->host_priv          = NULL;
        mutex_init(&icd->video_lock);
 
-       return scan_add_device(icd);
+       list_add_tail(&icd->list, &devices);
+
+       return 0;
 }
-EXPORT_SYMBOL(soc_camera_device_register);
 
-void soc_camera_device_unregister(struct soc_camera_device *icd)
+static void soc_camera_device_unregister(struct soc_camera_device *icd)
 {
-       mutex_lock(&list_lock);
        list_del(&icd->list);
-
-       /* The bus->remove will be eventually called */
-       if (icd->dev.parent)
-               device_unregister(&icd->dev);
-       mutex_unlock(&list_lock);
 }
-EXPORT_SYMBOL(soc_camera_device_unregister);
 
 static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {
        .vidioc_querycap         = soc_camera_querycap,
@@ -1106,23 +1245,13 @@ static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {
 #endif
 };
 
-/*
- * Usually called from the struct soc_camera_ops .probe() method, i.e., from
- * soc_camera_probe() above with .video_lock held
- */
-int soc_camera_video_start(struct soc_camera_device *icd)
+static int video_dev_create(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-       int err = -ENOMEM;
-       struct video_device *vdev;
+       struct video_device *vdev = video_device_alloc();
 
-       if (!icd->dev.parent)
-               return -ENODEV;
-
-       vdev = video_device_alloc();
        if (!vdev)
-               goto evidallocd;
-       dev_dbg(ici->dev, "Allocated video_device %p\n", vdev);
+               return -ENOMEM;
 
        strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name));
 
@@ -1132,87 +1261,93 @@ int soc_camera_video_start(struct soc_camera_device *icd)
        vdev->ioctl_ops         = &soc_camera_ioctl_ops;
        vdev->release           = video_device_release;
        vdev->minor             = -1;
-       vdev->tvnorms           = V4L2_STD_UNKNOWN,
+       vdev->tvnorms           = V4L2_STD_UNKNOWN;
 
-       err = video_register_device(vdev, VFL_TYPE_GRABBER, vdev->minor);
-       if (err < 0) {
-               dev_err(vdev->parent, "video_register_device failed\n");
-               goto evidregd;
-       }
        icd->vdev = vdev;
 
        return 0;
-
-evidregd:
-       video_device_release(vdev);
-evidallocd:
-       return err;
 }
-EXPORT_SYMBOL(soc_camera_video_start);
 
-/* Called from client .remove() methods with .video_lock held */
-void soc_camera_video_stop(struct soc_camera_device *icd)
+/*
+ * Called from soc_camera_probe() above (with .video_lock held???)
+ */
+static int soc_camera_video_start(struct soc_camera_device *icd)
 {
-       struct video_device *vdev = icd->vdev;
+       int ret;
 
-       dev_dbg(&icd->dev, "%s\n", __func__);
+       if (!icd->dev.parent)
+               return -ENODEV;
 
-       if (!icd->dev.parent || !vdev)
-               return;
+       if (!icd->ops ||
+           !icd->ops->query_bus_param ||
+           !icd->ops->set_bus_param)
+               return -EINVAL;
+
+       ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER,
+                                   icd->vdev->minor);
+       if (ret < 0) {
+               dev_err(&icd->dev, "video_register_device failed: %d\n", ret);
+               return ret;
+       }
 
-       video_unregister_device(vdev);
-       icd->vdev = NULL;
+       return 0;
 }
-EXPORT_SYMBOL(soc_camera_video_stop);
 
 static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev)
 {
        struct soc_camera_link *icl = pdev->dev.platform_data;
-       struct i2c_adapter *adap;
-       struct i2c_client *client;
+       struct soc_camera_device *icd;
+       int ret;
 
        if (!icl)
                return -EINVAL;
 
-       adap = i2c_get_adapter(icl->i2c_adapter_id);
-       if (!adap) {
-               dev_warn(&pdev->dev, "Cannot get adapter #%d. No driver?\n",
-                        icl->i2c_adapter_id);
-               /* -ENODEV and -ENXIO do not produce an error on probe()... */
-               return -ENOENT;
-       }
-
-       icl->board_info->platform_data = icl;
-       client = i2c_new_device(adap, icl->board_info);
-       if (!client) {
-               i2c_put_adapter(adap);
+       icd = kzalloc(sizeof(*icd), GFP_KERNEL);
+       if (!icd)
                return -ENOMEM;
-       }
 
-       platform_set_drvdata(pdev, client);
+       icd->iface = icl->bus_id;
+       icd->pdev = &pdev->dev;
+       platform_set_drvdata(pdev, icd);
+       icd->dev.platform_data = icl;
+
+       ret = soc_camera_device_register(icd);
+       if (ret < 0)
+               goto escdevreg;
+
+       icd->user_width         = DEFAULT_WIDTH;
+       icd->user_height        = DEFAULT_HEIGHT;
 
        return 0;
+
+escdevreg:
+       kfree(icd);
+
+       return ret;
 }
 
+/* Only called on rmmod for each platform device, since they are not
+ * hot-pluggable. Now we know, that all our users - hosts and devices have
+ * been unloaded already */
 static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
 {
-       struct i2c_client *client = platform_get_drvdata(pdev);
+       struct soc_camera_device *icd = platform_get_drvdata(pdev);
 
-       if (!client)
-               return -ENODEV;
+       if (!icd)
+               return -EINVAL;
 
-       i2c_unregister_device(client);
-       i2c_put_adapter(client->adapter);
+       soc_camera_device_unregister(icd);
+
+       kfree(icd);
 
        return 0;
 }
 
 static struct platform_driver __refdata soc_camera_pdrv = {
-       .probe  = soc_camera_pdrv_probe,
-       .remove = __devexit_p(soc_camera_pdrv_remove),
-       .driver = {
-               .name = "soc-camera-pdrv",
-               .owner = THIS_MODULE,
+       .remove  = __devexit_p(soc_camera_pdrv_remove),
+       .driver  = {
+               .name   = "soc-camera-pdrv",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -1225,7 +1360,7 @@ static int __init soc_camera_init(void)
        if (ret)
                goto edrvr;
 
-       ret = platform_driver_register(&soc_camera_pdrv);
+       ret = platform_driver_probe(&soc_camera_pdrv, soc_camera_pdrv_probe);
        if (ret)
                goto epdr;
 
index c486763..b6a575c 100644 (file)
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
 #include <media/soc_camera_platform.h>
 
 struct soc_camera_platform_priv {
-       struct soc_camera_platform_info *info;
-       struct soc_camera_device icd;
+       struct v4l2_subdev subdev;
        struct soc_camera_data_format format;
 };
 
-static struct soc_camera_platform_info *
-soc_camera_platform_get_info(struct soc_camera_device *icd)
+static struct soc_camera_platform_priv *get_priv(struct platform_device *pdev)
 {
-       struct soc_camera_platform_priv *priv;
-       priv = container_of(icd, struct soc_camera_platform_priv, icd);
-       return priv->info;
-}
-
-static int soc_camera_platform_init(struct soc_camera_device *icd)
-{
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
-
-       if (p->power)
-               p->power(1);
-
-       return 0;
-}
-
-static int soc_camera_platform_release(struct soc_camera_device *icd)
-{
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
-
-       if (p->power)
-               p->power(0);
-
-       return 0;
+       struct v4l2_subdev *subdev = platform_get_drvdata(pdev);
+       return container_of(subdev, struct soc_camera_platform_priv, subdev);
 }
 
-static int soc_camera_platform_start_capture(struct soc_camera_device *icd)
+static struct soc_camera_platform_info *get_info(struct soc_camera_device *icd)
 {
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
-       return p->set_capture(p, 1);
+       struct platform_device *pdev =
+               to_platform_device(to_soc_camera_control(icd));
+       return pdev->dev.platform_data;
 }
 
-static int soc_camera_platform_stop_capture(struct soc_camera_device *icd)
+static int soc_camera_platform_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
-       return p->set_capture(p, 0);
+       struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
+       return p->set_capture(p, enable);
 }
 
 static int soc_camera_platform_set_bus_param(struct soc_camera_device *icd,
@@ -75,26 +53,14 @@ static int soc_camera_platform_set_bus_param(struct soc_camera_device *icd,
 static unsigned long
 soc_camera_platform_query_bus_param(struct soc_camera_device *icd)
 {
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
+       struct soc_camera_platform_info *p = get_info(icd);
        return p->bus_param;
 }
 
-static int soc_camera_platform_set_crop(struct soc_camera_device *icd,
-                                       struct v4l2_rect *rect)
-{
-       return 0;
-}
-
-static int soc_camera_platform_set_fmt(struct soc_camera_device *icd,
+static int soc_camera_platform_try_fmt(struct v4l2_subdev *sd,
                                       struct v4l2_format *f)
 {
-       return 0;
-}
-
-static int soc_camera_platform_try_fmt(struct soc_camera_device *icd,
-                                      struct v4l2_format *f)
-{
-       struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd);
+       struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
        struct v4l2_pix_format *pix = &f->fmt.pix;
 
        pix->width = p->format.width;
@@ -102,82 +68,99 @@ static int soc_camera_platform_try_fmt(struct soc_camera_device *icd,
        return 0;
 }
 
-static int soc_camera_platform_video_probe(struct soc_camera_device *icd)
+static void soc_camera_platform_video_probe(struct soc_camera_device *icd,
+                                           struct platform_device *pdev)
 {
-       struct soc_camera_platform_priv *priv;
-       priv = container_of(icd, struct soc_camera_platform_priv, icd);
+       struct soc_camera_platform_priv *priv = get_priv(pdev);
+       struct soc_camera_platform_info *p = pdev->dev.platform_data;
 
-       priv->format.name = priv->info->format_name;
-       priv->format.depth = priv->info->format_depth;
-       priv->format.fourcc = priv->info->format.pixelformat;
-       priv->format.colorspace = priv->info->format.colorspace;
+       priv->format.name = p->format_name;
+       priv->format.depth = p->format_depth;
+       priv->format.fourcc = p->format.pixelformat;
+       priv->format.colorspace = p->format.colorspace;
 
        icd->formats = &priv->format;
        icd->num_formats = 1;
-
-       return soc_camera_video_start(icd);
 }
 
-static void soc_camera_platform_video_remove(struct soc_camera_device *icd)
-{
-       soc_camera_video_stop(icd);
-}
+static struct v4l2_subdev_core_ops platform_subdev_core_ops;
+
+static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
+       .s_stream       = soc_camera_platform_s_stream,
+       .try_fmt        = soc_camera_platform_try_fmt,
+};
+
+static struct v4l2_subdev_ops platform_subdev_ops = {
+       .core   = &platform_subdev_core_ops,
+       .video  = &platform_subdev_video_ops,
+};
 
 static struct soc_camera_ops soc_camera_platform_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = soc_camera_platform_video_probe,
-       .remove                 = soc_camera_platform_video_remove,
-       .init                   = soc_camera_platform_init,
-       .release                = soc_camera_platform_release,
-       .start_capture          = soc_camera_platform_start_capture,
-       .stop_capture           = soc_camera_platform_stop_capture,
-       .set_crop               = soc_camera_platform_set_crop,
-       .set_fmt                = soc_camera_platform_set_fmt,
-       .try_fmt                = soc_camera_platform_try_fmt,
        .set_bus_param          = soc_camera_platform_set_bus_param,
        .query_bus_param        = soc_camera_platform_query_bus_param,
 };
 
 static int soc_camera_platform_probe(struct platform_device *pdev)
 {
+       struct soc_camera_host *ici;
        struct soc_camera_platform_priv *priv;
-       struct soc_camera_platform_info *p;
+       struct soc_camera_platform_info *p = pdev->dev.platform_data;
        struct soc_camera_device *icd;
        int ret;
 
-       p = pdev->dev.platform_data;
        if (!p)
                return -EINVAL;
 
+       if (!p->dev) {
+               dev_err(&pdev->dev,
+                       "Platform has not set soc_camera_device pointer!\n");
+               return -EINVAL;
+       }
+
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
-       priv->info = p;
-       platform_set_drvdata(pdev, priv);
+       icd = to_soc_camera_dev(p->dev);
+
+       /* soc-camera convention: control's drvdata points to the subdev */
+       platform_set_drvdata(pdev, &priv->subdev);
+       /* Set the control device reference */
+       dev_set_drvdata(&icd->dev, &pdev->dev);
+
+       icd->y_skip_top         = 0;
+       icd->ops                = &soc_camera_platform_ops;
+
+       ici = to_soc_camera_host(icd->dev.parent);
 
-       icd = &priv->icd;
-       icd->ops        = &soc_camera_platform_ops;
-       icd->control    = &pdev->dev;
-       icd->width_min  = 0;
-       icd->width_max  = priv->info->format.width;
-       icd->height_min = 0;
-       icd->height_max = priv->info->format.height;
-       icd->y_skip_top = 0;
-       icd->iface      = priv->info->iface;
+       soc_camera_platform_video_probe(icd, pdev);
 
-       ret = soc_camera_device_register(icd);
+       v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
+       v4l2_set_subdevdata(&priv->subdev, p);
+       strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);
+
+       ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);
        if (ret)
-               kfree(priv);
+               goto evdrs;
+
+       return ret;
 
+evdrs:
+       icd->ops = NULL;
+       platform_set_drvdata(pdev, NULL);
+       kfree(priv);
        return ret;
 }
 
 static int soc_camera_platform_remove(struct platform_device *pdev)
 {
-       struct soc_camera_platform_priv *priv = platform_get_drvdata(pdev);
+       struct soc_camera_platform_priv *priv = get_priv(pdev);
+       struct soc_camera_platform_info *p = pdev->dev.platform_data;
+       struct soc_camera_device *icd = to_soc_camera_dev(p->dev);
 
-       soc_camera_device_unregister(&priv->icd);
+       v4l2_device_unregister_subdev(&priv->subdev);
+       icd->ops = NULL;
+       platform_set_drvdata(pdev, NULL);
        kfree(priv);
        return 0;
 }
@@ -185,6 +168,7 @@ static int soc_camera_platform_remove(struct platform_device *pdev)
 static struct platform_driver soc_camera_platform_driver = {
        .driver         = {
                .name   = "soc_camera_platform",
+               .owner  = THIS_MODULE,
        },
        .probe          = soc_camera_platform_probe,
        .remove         = soc_camera_platform_remove,
@@ -206,3 +190,4 @@ module_exit(soc_camera_platform_module_exit);
 MODULE_DESCRIPTION("SoC Camera Platform driver");
 MODULE_AUTHOR("Magnus Damm");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:soc_camera_platform");
index 2816f18..aba92e2 100644 (file)
@@ -29,6 +29,7 @@
 #include "tuner-simple.h"
 #include "tda9887.h"
 #include "xc5000.h"
+#include "tda18271.h"
 
 #define UNSET (-1U)
 
@@ -420,6 +421,17 @@ static void set_type(struct i2c_client *c, unsigned int type,
                        goto attach_failed;
                break;
        }
+       case TUNER_NXP_TDA18271:
+       {
+               struct tda18271_config cfg = {
+                       .config = t->config,
+               };
+
+               if (!dvb_attach(tda18271_attach, &t->fe, t->i2c->addr,
+                               t->i2c->adapter, &cfg))
+                       goto attach_failed;
+               break;
+       }
        default:
                if (!dvb_attach(simple_tuner_attach, &t->fe,
                                t->i2c->adapter, t->i2c->addr, t->type))
index 3750f7f..2443726 100644 (file)
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-int-device.h>
+
+#include <media/v4l2-device.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
 #include <media/tvp514x.h>
 
 #include "tvp514x_regs.h"
@@ -49,29 +52,17 @@ static int debug;
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-#define dump_reg(client, reg, val)                             \
-       do {                                                    \
-               val = tvp514x_read_reg(client, reg);            \
-               v4l_info(client, "Reg(0x%.2X): 0x%.2X\n", reg, val); \
-       } while (0)
+MODULE_AUTHOR("Texas Instruments");
+MODULE_DESCRIPTION("TVP514X linux decoder driver");
+MODULE_LICENSE("GPL");
 
-/**
- * enum tvp514x_std - enum for supported standards
- */
+/* enum tvp514x_std - enum for supported standards */
 enum tvp514x_std {
        STD_NTSC_MJ = 0,
        STD_PAL_BDGHIN,
        STD_INVALID
 };
 
-/**
- * enum tvp514x_state - enum for different decoder states
- */
-enum tvp514x_state {
-       STATE_NOT_DETECTED,
-       STATE_DETECTED
-};
-
 /**
  * struct tvp514x_std_info - Structure to store standard informations
  * @width: Line width in pixels
@@ -89,33 +80,27 @@ struct tvp514x_std_info {
 static struct tvp514x_reg tvp514x_reg_list_default[0x40];
 /**
  * struct tvp514x_decoder - TVP5146/47 decoder object
- * @v4l2_int_device: Slave handle
- * @tvp514x_slave: Slave pointer which is used by @v4l2_int_device
+ * @sd: Subdevice Slave handle
  * @tvp514x_regs: copy of hw's regs with preset values.
  * @pdata: Board specific
- * @client: I2C client data
- * @id: Entry from I2C table
  * @ver: Chip version
- * @state: TVP5146/47 decoder state - detected or not-detected
+ * @streaming: TVP5146/47 decoder streaming - enabled or disabled.
  * @pix: Current pixel format
  * @num_fmts: Number of formats
  * @fmt_list: Format list
  * @current_std: Current standard
  * @num_stds: Number of standards
  * @std_list: Standards list
- * @route: input and output routing at chip level
+ * @input: Input routing at chip level
+ * @output: Output routing at chip level
  */
 struct tvp514x_decoder {
-       struct v4l2_int_device v4l2_int_device;
-       struct v4l2_int_slave tvp514x_slave;
+       struct v4l2_subdev sd;
        struct tvp514x_reg tvp514x_regs[ARRAY_SIZE(tvp514x_reg_list_default)];
        const struct tvp514x_platform_data *pdata;
-       struct i2c_client *client;
-
-       struct i2c_device_id *id;
 
        int ver;
-       enum tvp514x_state state;
+       int streaming;
 
        struct v4l2_pix_format pix;
        int num_fmts;
@@ -124,15 +109,18 @@ struct tvp514x_decoder {
        enum tvp514x_std current_std;
        int num_stds;
        struct tvp514x_std_info *std_list;
-
-       struct v4l2_routing route;
+       /* Input and Output Routing parameters */
+       u32 input;
+       u32 output;
 };
 
 /* TVP514x default register values */
 static struct tvp514x_reg tvp514x_reg_list_default[] = {
-       {TOK_WRITE, REG_INPUT_SEL, 0x05},       /* Composite selected */
+       /* Composite selected */
+       {TOK_WRITE, REG_INPUT_SEL, 0x05},
        {TOK_WRITE, REG_AFE_GAIN_CTRL, 0x0F},
-       {TOK_WRITE, REG_VIDEO_STD, 0x00},       /* Auto mode */
+       /* Auto mode */
+       {TOK_WRITE, REG_VIDEO_STD, 0x00},
        {TOK_WRITE, REG_OPERATION_MODE, 0x00},
        {TOK_SKIP, REG_AUTOSWITCH_MASK, 0x3F},
        {TOK_WRITE, REG_COLOR_KILLER, 0x10},
@@ -145,53 +133,74 @@ static struct tvp514x_reg tvp514x_reg_list_default[] = {
        {TOK_WRITE, REG_HUE, 0x00},
        {TOK_WRITE, REG_CHROMA_CONTROL1, 0x00},
        {TOK_WRITE, REG_CHROMA_CONTROL2, 0x0E},
-       {TOK_SKIP, 0x0F, 0x00}, /* Reserved */
+       /* Reserved */
+       {TOK_SKIP, 0x0F, 0x00},
        {TOK_WRITE, REG_COMP_PR_SATURATION, 0x80},
        {TOK_WRITE, REG_COMP_Y_CONTRAST, 0x80},
        {TOK_WRITE, REG_COMP_PB_SATURATION, 0x80},
-       {TOK_SKIP, 0x13, 0x00}, /* Reserved */
+       /* Reserved */
+       {TOK_SKIP, 0x13, 0x00},
        {TOK_WRITE, REG_COMP_Y_BRIGHTNESS, 0x80},
-       {TOK_SKIP, 0x15, 0x00}, /* Reserved */
-       {TOK_SKIP, REG_AVID_START_PIXEL_LSB, 0x55},     /* NTSC timing */
+       /* Reserved */
+       {TOK_SKIP, 0x15, 0x00},
+       /* NTSC timing */
+       {TOK_SKIP, REG_AVID_START_PIXEL_LSB, 0x55},
        {TOK_SKIP, REG_AVID_START_PIXEL_MSB, 0x00},
        {TOK_SKIP, REG_AVID_STOP_PIXEL_LSB, 0x25},
        {TOK_SKIP, REG_AVID_STOP_PIXEL_MSB, 0x03},
-       {TOK_SKIP, REG_HSYNC_START_PIXEL_LSB, 0x00},    /* NTSC timing */
+       /* NTSC timing */
+       {TOK_SKIP, REG_HSYNC_START_PIXEL_LSB, 0x00},
        {TOK_SKIP, REG_HSYNC_START_PIXEL_MSB, 0x00},
        {TOK_SKIP, REG_HSYNC_STOP_PIXEL_LSB, 0x40},
        {TOK_SKIP, REG_HSYNC_STOP_PIXEL_MSB, 0x00},
-       {TOK_SKIP, REG_VSYNC_START_LINE_LSB, 0x04},     /* NTSC timing */
+       /* NTSC timing */
+       {TOK_SKIP, REG_VSYNC_START_LINE_LSB, 0x04},
        {TOK_SKIP, REG_VSYNC_START_LINE_MSB, 0x00},
        {TOK_SKIP, REG_VSYNC_STOP_LINE_LSB, 0x07},
        {TOK_SKIP, REG_VSYNC_STOP_LINE_MSB, 0x00},
-       {TOK_SKIP, REG_VBLK_START_LINE_LSB, 0x01},      /* NTSC timing */
+       /* NTSC timing */
+       {TOK_SKIP, REG_VBLK_START_LINE_LSB, 0x01},
        {TOK_SKIP, REG_VBLK_START_LINE_MSB, 0x00},
        {TOK_SKIP, REG_VBLK_STOP_LINE_LSB, 0x15},
        {TOK_SKIP, REG_VBLK_STOP_LINE_MSB, 0x00},
-       {TOK_SKIP, 0x26, 0x00}, /* Reserved */
-       {TOK_SKIP, 0x27, 0x00}, /* Reserved */
+       /* Reserved */
+       {TOK_SKIP, 0x26, 0x00},
+       /* Reserved */
+       {TOK_SKIP, 0x27, 0x00},
        {TOK_SKIP, REG_FAST_SWTICH_CONTROL, 0xCC},
-       {TOK_SKIP, 0x29, 0x00}, /* Reserved */
+       /* Reserved */
+       {TOK_SKIP, 0x29, 0x00},
        {TOK_SKIP, REG_FAST_SWTICH_SCART_DELAY, 0x00},
-       {TOK_SKIP, 0x2B, 0x00}, /* Reserved */
+       /* Reserved */
+       {TOK_SKIP, 0x2B, 0x00},
        {TOK_SKIP, REG_SCART_DELAY, 0x00},
        {TOK_SKIP, REG_CTI_DELAY, 0x00},
        {TOK_SKIP, REG_CTI_CONTROL, 0x00},
-       {TOK_SKIP, 0x2F, 0x00}, /* Reserved */
-       {TOK_SKIP, 0x30, 0x00}, /* Reserved */
-       {TOK_SKIP, 0x31, 0x00}, /* Reserved */
-       {TOK_WRITE, REG_SYNC_CONTROL, 0x00},    /* HS, VS active high */
-       {TOK_WRITE, REG_OUTPUT_FORMATTER1, 0x00},       /* 10-bit BT.656 */
-       {TOK_WRITE, REG_OUTPUT_FORMATTER2, 0x11},       /* Enable clk & data */
-       {TOK_WRITE, REG_OUTPUT_FORMATTER3, 0xEE},       /* Enable AVID & FLD */
-       {TOK_WRITE, REG_OUTPUT_FORMATTER4, 0xAF},       /* Enable VS & HS */
+       /* Reserved */
+       {TOK_SKIP, 0x2F, 0x00},
+       /* Reserved */
+       {TOK_SKIP, 0x30, 0x00},
+       /* Reserved */
+       {TOK_SKIP, 0x31, 0x00},
+       /* HS, VS active high */
+       {TOK_WRITE, REG_SYNC_CONTROL, 0x00},
+       /* 10-bit BT.656 */
+       {TOK_WRITE, REG_OUTPUT_FORMATTER1, 0x00},
+       /* Enable clk & data */
+       {TOK_WRITE, REG_OUTPUT_FORMATTER2, 0x11},
+       /* Enable AVID & FLD */
+       {TOK_WRITE, REG_OUTPUT_FORMATTER3, 0xEE},
+       /* Enable VS & HS */
+       {TOK_WRITE, REG_OUTPUT_FORMATTER4, 0xAF},
        {TOK_WRITE, REG_OUTPUT_FORMATTER5, 0xFF},
        {TOK_WRITE, REG_OUTPUT_FORMATTER6, 0xFF},
-       {TOK_WRITE, REG_CLEAR_LOST_LOCK, 0x01}, /* Clear status */
+       /* Clear status */
+       {TOK_WRITE, REG_CLEAR_LOST_LOCK, 0x01},
        {TOK_TERM, 0, 0},
 };
 
-/* List of image formats supported by TVP5146/47 decoder
+/**
+ * List of image formats supported by TVP5146/47 decoder
  * Currently we are using 8 bit mode only, but can be
  * extended to 10/20 bit mode.
  */
@@ -205,7 +214,7 @@ static const struct v4l2_fmtdesc tvp514x_fmt_list[] = {
        },
 };
 
-/*
+/**
  * Supported standards -
  *
  * Currently supports two standards only, need to add support for rest of the
@@ -240,35 +249,32 @@ static struct tvp514x_std_info tvp514x_std_list[] = {
        },
        /* Standard: need to add for additional standard */
 };
-/*
- * Control structure for Auto Gain
- *     This is temporary data, will get replaced once
- *     v4l2_ctrl_query_fill supports it.
- */
-static const struct v4l2_queryctrl tvp514x_autogain_ctrl = {
-       .id = V4L2_CID_AUTOGAIN,
-       .name = "Gain, Automatic",
-       .type = V4L2_CTRL_TYPE_BOOLEAN,
-       .minimum = 0,
-       .maximum = 1,
-       .step = 1,
-       .default_value = 1,
-};
 
-/*
- * Read a value from a register in an TVP5146/47 decoder device.
+
+static inline struct tvp514x_decoder *to_decoder(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct tvp514x_decoder, sd);
+}
+
+
+/**
+ * tvp514x_read_reg() - Read a value from a register in an TVP5146/47.
+ * @sd: ptr to v4l2_subdev struct
+ * @reg: TVP5146/47 register address
+ *
  * Returns value read if successful, or non-zero (-1) otherwise.
  */
-static int tvp514x_read_reg(struct i2c_client *client, u8 reg)
+static int tvp514x_read_reg(struct v4l2_subdev *sd, u8 reg)
 {
-       int err;
-       int retry = 0;
+       int err, retry = 0;
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
 read_again:
 
        err = i2c_smbus_read_byte_data(client, reg);
        if (err == -1) {
                if (retry <= I2C_RETRY_COUNT) {
-                       v4l_warn(client, "Read: retry ... %d\n", retry);
+                       v4l2_warn(sd, "Read: retry ... %d\n", retry);
                        retry++;
                        msleep_interruptible(10);
                        goto read_again;
@@ -278,20 +284,39 @@ read_again:
        return err;
 }
 
-/*
+/**
+ * dump_reg() - dump the register content of TVP5146/47.
+ * @sd: ptr to v4l2_subdev struct
+ * @reg: TVP5146/47 register address
+ */
+static void dump_reg(struct v4l2_subdev *sd, u8 reg)
+{
+       u32 val;
+
+       val = tvp514x_read_reg(sd, reg);
+       v4l2_info(sd, "Reg(0x%.2X): 0x%.2X\n", reg, val);
+}
+
+/**
+ * tvp514x_write_reg() - Write a value to a register in TVP5146/47
+ * @sd: ptr to v4l2_subdev struct
+ * @reg: TVP5146/47 register address
+ * @val: value to be written to the register
+ *
  * Write a value to a register in an TVP5146/47 decoder device.
  * Returns zero if successful, or non-zero otherwise.
  */
-static int tvp514x_write_reg(struct i2c_client *client, u8 reg, u8 val)
+static int tvp514x_write_reg(struct v4l2_subdev *sd, u8 reg, u8 val)
 {
-       int err;
-       int retry = 0;
+       int err, retry = 0;
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
 write_again:
 
        err = i2c_smbus_write_byte_data(client, reg, val);
        if (err) {
                if (retry <= I2C_RETRY_COUNT) {
-                       v4l_warn(client, "Write: retry ... %d\n", retry);
+                       v4l2_warn(sd, "Write: retry ... %d\n", retry);
                        retry++;
                        msleep_interruptible(10);
                        goto write_again;
@@ -301,17 +326,19 @@ write_again:
        return err;
 }
 
-/*
- * tvp514x_write_regs : Initializes a list of TVP5146/47 registers
+/**
+ * tvp514x_write_regs() : Initializes a list of TVP5146/47 registers
+ * @sd: ptr to v4l2_subdev struct
+ * @reglist: list of TVP5146/47 registers and values
+ *
+ * Initializes a list of TVP5146/47 registers:-
  *             if token is TOK_TERM, then entire write operation terminates
  *             if token is TOK_DELAY, then a delay of 'val' msec is introduced
  *             if token is TOK_SKIP, then the register write is skipped
  *             if token is TOK_WRITE, then the register write is performed
- *
- * reglist - list of registers to be written
  * Returns zero if successful, or non-zero otherwise.
  */
-static int tvp514x_write_regs(struct i2c_client *client,
+static int tvp514x_write_regs(struct v4l2_subdev *sd,
                              const struct tvp514x_reg reglist[])
 {
        int err;
@@ -326,31 +353,33 @@ static int tvp514x_write_regs(struct i2c_client *client,
                if (next->token == TOK_SKIP)
                        continue;
 
-               err = tvp514x_write_reg(client, next->reg, (u8) next->val);
+               err = tvp514x_write_reg(sd, next->reg, (u8) next->val);
                if (err) {
-                       v4l_err(client, "Write failed. Err[%d]\n", err);
+                       v4l2_err(sd, "Write failed. Err[%d]\n", err);
                        return err;
                }
        }
        return 0;
 }
 
-/*
- * tvp514x_get_current_std:
- * Returns the current standard detected by TVP5146/47
+/**
+ * tvp514x_get_current_std() : Get the current standard detected by TVP5146/47
+ * @sd: ptr to v4l2_subdev struct
+ *
+ * Get current standard detected by TVP5146/47, STD_INVALID if there is no
+ * standard detected.
  */
-static enum tvp514x_std tvp514x_get_current_std(struct tvp514x_decoder
-                                               *decoder)
+static enum tvp514x_std tvp514x_get_current_std(struct v4l2_subdev *sd)
 {
        u8 std, std_status;
 
-       std = tvp514x_read_reg(decoder->client, REG_VIDEO_STD);
-       if ((std & VIDEO_STD_MASK) == VIDEO_STD_AUTO_SWITCH_BIT) {
+       std = tvp514x_read_reg(sd, REG_VIDEO_STD);
+       if ((std & VIDEO_STD_MASK) == VIDEO_STD_AUTO_SWITCH_BIT)
                /* use the standard status register */
-               std_status = tvp514x_read_reg(decoder->client,
-                               REG_VIDEO_STD_STATUS);
-       } else
-               std_status = std;       /* use the standard register itself */
+               std_status = tvp514x_read_reg(sd, REG_VIDEO_STD_STATUS);
+       else
+               /* use the standard register itself */
+               std_status = std;
 
        switch (std_status & VIDEO_STD_MASK) {
        case VIDEO_STD_NTSC_MJ_BIT:
@@ -366,94 +395,99 @@ static enum tvp514x_std tvp514x_get_current_std(struct tvp514x_decoder
        return STD_INVALID;
 }
 
-/*
- * TVP5146/47 register dump function
- */
-static void tvp514x_reg_dump(struct tvp514x_decoder *decoder)
+/* TVP5146/47 register dump function */
+static void tvp514x_reg_dump(struct v4l2_subdev *sd)
 {
-       u8 value;
-
-       dump_reg(decoder->client, REG_INPUT_SEL, value);
-       dump_reg(decoder->client, REG_AFE_GAIN_CTRL, value);
-       dump_reg(decoder->client, REG_VIDEO_STD, value);
-       dump_reg(decoder->client, REG_OPERATION_MODE, value);
-       dump_reg(decoder->client, REG_COLOR_KILLER, value);
-       dump_reg(decoder->client, REG_LUMA_CONTROL1, value);
-       dump_reg(decoder->client, REG_LUMA_CONTROL2, value);
-       dump_reg(decoder->client, REG_LUMA_CONTROL3, value);
-       dump_reg(decoder->client, REG_BRIGHTNESS, value);
-       dump_reg(decoder->client, REG_CONTRAST, value);
-       dump_reg(decoder->client, REG_SATURATION, value);
-       dump_reg(decoder->client, REG_HUE, value);
-       dump_reg(decoder->client, REG_CHROMA_CONTROL1, value);
-       dump_reg(decoder->client, REG_CHROMA_CONTROL2, value);
-       dump_reg(decoder->client, REG_COMP_PR_SATURATION, value);
-       dump_reg(decoder->client, REG_COMP_Y_CONTRAST, value);
-       dump_reg(decoder->client, REG_COMP_PB_SATURATION, value);
-       dump_reg(decoder->client, REG_COMP_Y_BRIGHTNESS, value);
-       dump_reg(decoder->client, REG_AVID_START_PIXEL_LSB, value);
-       dump_reg(decoder->client, REG_AVID_START_PIXEL_MSB, value);
-       dump_reg(decoder->client, REG_AVID_STOP_PIXEL_LSB, value);
-       dump_reg(decoder->client, REG_AVID_STOP_PIXEL_MSB, value);
-       dump_reg(decoder->client, REG_HSYNC_START_PIXEL_LSB, value);
-       dump_reg(decoder->client, REG_HSYNC_START_PIXEL_MSB, value);
-       dump_reg(decoder->client, REG_HSYNC_STOP_PIXEL_LSB, value);
-       dump_reg(decoder->client, REG_HSYNC_STOP_PIXEL_MSB, value);
-       dump_reg(decoder->client, REG_VSYNC_START_LINE_LSB, value);
-       dump_reg(decoder->client, REG_VSYNC_START_LINE_MSB, value);
-       dump_reg(decoder->client, REG_VSYNC_STOP_LINE_LSB, value);
-       dump_reg(decoder->client, REG_VSYNC_STOP_LINE_MSB, value);
-       dump_reg(decoder->client, REG_VBLK_START_LINE_LSB, value);
-       dump_reg(decoder->client, REG_VBLK_START_LINE_MSB, value);
-       dump_reg(decoder->client, REG_VBLK_STOP_LINE_LSB, value);
-       dump_reg(decoder->client, REG_VBLK_STOP_LINE_MSB, value);
-       dump_reg(decoder->client, REG_SYNC_CONTROL, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER1, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER2, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER3, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER4, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER5, value);
-       dump_reg(decoder->client, REG_OUTPUT_FORMATTER6, value);
-       dump_reg(decoder->client, REG_CLEAR_LOST_LOCK, value);
+       dump_reg(sd, REG_INPUT_SEL);
+       dump_reg(sd, REG_AFE_GAIN_CTRL);
+       dump_reg(sd, REG_VIDEO_STD);
+       dump_reg(sd, REG_OPERATION_MODE);
+       dump_reg(sd, REG_COLOR_KILLER);
+       dump_reg(sd, REG_LUMA_CONTROL1);
+       dump_reg(sd, REG_LUMA_CONTROL2);
+       dump_reg(sd, REG_LUMA_CONTROL3);
+       dump_reg(sd, REG_BRIGHTNESS);
+       dump_reg(sd, REG_CONTRAST);
+       dump_reg(sd, REG_SATURATION);
+       dump_reg(sd, REG_HUE);
+       dump_reg(sd, REG_CHROMA_CONTROL1);
+       dump_reg(sd, REG_CHROMA_CONTROL2);
+       dump_reg(sd, REG_COMP_PR_SATURATION);
+       dump_reg(sd, REG_COMP_Y_CONTRAST);
+       dump_reg(sd, REG_COMP_PB_SATURATION);
+       dump_reg(sd, REG_COMP_Y_BRIGHTNESS);
+       dump_reg(sd, REG_AVID_START_PIXEL_LSB);
+       dump_reg(sd, REG_AVID_START_PIXEL_MSB);
+       dump_reg(sd, REG_AVID_STOP_PIXEL_LSB);
+       dump_reg(sd, REG_AVID_STOP_PIXEL_MSB);
+       dump_reg(sd, REG_HSYNC_START_PIXEL_LSB);
+       dump_reg(sd, REG_HSYNC_START_PIXEL_MSB);
+       dump_reg(sd, REG_HSYNC_STOP_PIXEL_LSB);
+       dump_reg(sd, REG_HSYNC_STOP_PIXEL_MSB);
+       dump_reg(sd, REG_VSYNC_START_LINE_LSB);
+       dump_reg(sd, REG_VSYNC_START_LINE_MSB);
+       dump_reg(sd, REG_VSYNC_STOP_LINE_LSB);
+       dump_reg(sd, REG_VSYNC_STOP_LINE_MSB);
+       dump_reg(sd, REG_VBLK_START_LINE_LSB);
+       dump_reg(sd, REG_VBLK_START_LINE_MSB);
+       dump_reg(sd, REG_VBLK_STOP_LINE_LSB);
+       dump_reg(sd, REG_VBLK_STOP_LINE_MSB);
+       dump_reg(sd, REG_SYNC_CONTROL);
+       dump_reg(sd, REG_OUTPUT_FORMATTER1);
+       dump_reg(sd, REG_OUTPUT_FORMATTER2);
+       dump_reg(sd, REG_OUTPUT_FORMATTER3);
+       dump_reg(sd, REG_OUTPUT_FORMATTER4);
+       dump_reg(sd, REG_OUTPUT_FORMATTER5);
+       dump_reg(sd, REG_OUTPUT_FORMATTER6);
+       dump_reg(sd, REG_CLEAR_LOST_LOCK);
 }
 
-/*
- * Configure the TVP5146/47 with the current register settings
+/**
+ * tvp514x_configure() - Configure the TVP5146/47 registers
+ * @sd: ptr to v4l2_subdev struct
+ * @decoder: ptr to tvp514x_decoder structure
+ *
  * Returns zero if successful, or non-zero otherwise.
  */
-static int tvp514x_configure(struct tvp514x_decoder *decoder)
+static int tvp514x_configure(struct v4l2_subdev *sd,
+               struct tvp514x_decoder *decoder)
 {
        int err;
 
        /* common register initialization */
        err =
-           tvp514x_write_regs(decoder->client, decoder->tvp514x_regs);
+           tvp514x_write_regs(sd, decoder->tvp514x_regs);
        if (err)
                return err;
 
        if (debug)
-               tvp514x_reg_dump(decoder);
+               tvp514x_reg_dump(sd);
 
        return 0;
 }
 
-/*
- * Detect if an tvp514x is present, and if so which revision.
+/**
+ * tvp514x_detect() - Detect if an tvp514x is present, and if so which revision.
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @decoder: pointer to tvp514x_decoder structure
+ *
  * A device is considered to be detected if the chip ID (LSB and MSB)
  * registers match the expected values.
  * Any value of the rom version register is accepted.
  * Returns ENODEV error number if no device is detected, or zero
  * if a device is detected.
  */
-static int tvp514x_detect(struct tvp514x_decoder *decoder)
+static int tvp514x_detect(struct v4l2_subdev *sd,
+               struct tvp514x_decoder *decoder)
 {
        u8 chip_id_msb, chip_id_lsb, rom_ver;
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-       chip_id_msb = tvp514x_read_reg(decoder->client, REG_CHIP_ID_MSB);
-       chip_id_lsb = tvp514x_read_reg(decoder->client, REG_CHIP_ID_LSB);
-       rom_ver = tvp514x_read_reg(decoder->client, REG_ROM_VERSION);
+       chip_id_msb = tvp514x_read_reg(sd, REG_CHIP_ID_MSB);
+       chip_id_lsb = tvp514x_read_reg(sd, REG_CHIP_ID_LSB);
+       rom_ver = tvp514x_read_reg(sd, REG_ROM_VERSION);
 
-       v4l_dbg(1, debug, decoder->client,
+       v4l2_dbg(1, debug, sd,
                 "chip id detected msb:0x%x lsb:0x%x rom version:0x%x\n",
                 chip_id_msb, chip_id_lsb, rom_ver);
        if ((chip_id_msb != TVP514X_CHIP_ID_MSB)
@@ -462,38 +496,30 @@ static int tvp514x_detect(struct tvp514x_decoder *decoder)
                /* We didn't read the values we expected, so this must not be
                 * an TVP5146/47.
                 */
-               v4l_err(decoder->client,
-                       "chip id mismatch msb:0x%x lsb:0x%x\n",
-                       chip_id_msb, chip_id_lsb);
+               v4l2_err(sd, "chip id mismatch msb:0x%x lsb:0x%x\n",
+                               chip_id_msb, chip_id_lsb);
                return -ENODEV;
        }
 
        decoder->ver = rom_ver;
-       decoder->state = STATE_DETECTED;
 
-       v4l_info(decoder->client,
-                       "%s found at 0x%x (%s)\n", decoder->client->name,
-                       decoder->client->addr << 1,
-                       decoder->client->adapter->name);
+       v4l2_info(sd, "%s (Version - 0x%.2x) found at 0x%x (%s)\n",
+                       client->name, decoder->ver,
+                       client->addr << 1, client->adapter->name);
        return 0;
 }
 
-/*
- * Following are decoder interface functions implemented by
- * TVP5146/47 decoder driver.
- */
-
 /**
- * ioctl_querystd - V4L2 decoder interface handler for VIDIOC_QUERYSTD ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_querystd() - V4L2 decoder interface handler for querystd
+ * @sd: pointer to standard V4L2 sub-device structure
  * @std_id: standard V4L2 std_id ioctl enum
  *
  * Returns the current standard detected by TVP5146/47. If no active input is
  * detected, returns -EINVAL
  */
-static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id)
+static int tvp514x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        enum tvp514x_std current_std;
        enum tvp514x_input input_sel;
        u8 sync_lock_status, lock_mask;
@@ -502,11 +528,11 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id)
                return -EINVAL;
 
        /* get the current standard */
-       current_std = tvp514x_get_current_std(decoder);
+       current_std = tvp514x_get_current_std(sd);
        if (current_std == STD_INVALID)
                return -EINVAL;
 
-       input_sel = decoder->route.input;
+       input_sel = decoder->input;
 
        switch (input_sel) {
        case INPUT_CVBS_VI1A:
@@ -544,42 +570,39 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id)
                return -EINVAL;
        }
        /* check whether signal is locked */
-       sync_lock_status = tvp514x_read_reg(decoder->client, REG_STATUS1);
+       sync_lock_status = tvp514x_read_reg(sd, REG_STATUS1);
        if (lock_mask != (sync_lock_status & lock_mask))
                return -EINVAL; /* No input detected */
 
        decoder->current_std = current_std;
        *std_id = decoder->std_list[current_std].standard.id;
 
-       v4l_dbg(1, debug, decoder->client, "Current STD: %s",
+       v4l2_dbg(1, debug, sd, "Current STD: %s",
                        decoder->std_list[current_std].standard.name);
        return 0;
 }
 
 /**
- * ioctl_s_std - V4L2 decoder interface handler for VIDIOC_S_STD ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_s_std() - V4L2 decoder interface handler for s_std
+ * @sd: pointer to standard V4L2 sub-device structure
  * @std_id: standard V4L2 v4l2_std_id ioctl enum
  *
  * If std_id is supported, sets the requested standard. Otherwise, returns
  * -EINVAL
  */
-static int ioctl_s_std(struct v4l2_int_device *s, v4l2_std_id *std_id)
+static int tvp514x_s_std(struct v4l2_subdev *sd, v4l2_std_id std_id)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        int err, i;
 
-       if (std_id == NULL)
-               return -EINVAL;
-
        for (i = 0; i < decoder->num_stds; i++)
-               if (*std_id & decoder->std_list[i].standard.id)
+               if (std_id & decoder->std_list[i].standard.id)
                        break;
 
        if ((i == decoder->num_stds) || (i == STD_INVALID))
                return -EINVAL;
 
-       err = tvp514x_write_reg(decoder->client, REG_VIDEO_STD,
+       err = tvp514x_write_reg(sd, REG_VIDEO_STD,
                                decoder->std_list[i].video_std);
        if (err)
                return err;
@@ -588,24 +611,26 @@ static int ioctl_s_std(struct v4l2_int_device *s, v4l2_std_id *std_id)
        decoder->tvp514x_regs[REG_VIDEO_STD].val =
                decoder->std_list[i].video_std;
 
-       v4l_dbg(1, debug, decoder->client, "Standard set to: %s",
+       v4l2_dbg(1, debug, sd, "Standard set to: %s",
                        decoder->std_list[i].standard.name);
        return 0;
 }
 
 /**
- * ioctl_s_routing - V4L2 decoder interface handler for VIDIOC_S_INPUT ioctl
- * @s: pointer to standard V4L2 device structure
- * @index: number of the input
+ * tvp514x_s_routing() - V4L2 decoder interface handler for s_routing
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @input: input selector for routing the signal
+ * @output: output selector for routing the signal
+ * @config: config value. Not used
  *
  * If index is valid, selects the requested input. Otherwise, returns -EINVAL if
  * the input is not supported or there is no active signal present in the
  * selected input.
  */
-static int ioctl_s_routing(struct v4l2_int_device *s,
-                               struct v4l2_routing *route)
+static int tvp514x_s_routing(struct v4l2_subdev *sd,
+                               u32 input, u32 output, u32 config)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        int err;
        enum tvp514x_input input_sel;
        enum tvp514x_output output_sel;
@@ -613,20 +638,21 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
        u8 sync_lock_status, lock_mask;
        int try_count = LOCK_RETRY_COUNT;
 
-       if ((!route) || (route->input >= INPUT_INVALID) ||
-                       (route->output >= OUTPUT_INVALID))
-               return -EINVAL; /* Index out of bound */
+       if ((input >= INPUT_INVALID) ||
+                       (output >= OUTPUT_INVALID))
+               /* Index out of bound */
+               return -EINVAL;
 
-       input_sel = route->input;
-       output_sel = route->output;
+       input_sel = input;
+       output_sel = output;
 
-       err = tvp514x_write_reg(decoder->client, REG_INPUT_SEL, input_sel);
+       err = tvp514x_write_reg(sd, REG_INPUT_SEL, input_sel);
        if (err)
                return err;
 
-       output_sel |= tvp514x_read_reg(decoder->client,
+       output_sel |= tvp514x_read_reg(sd,
                        REG_OUTPUT_FORMATTER1) & 0x7;
-       err = tvp514x_write_reg(decoder->client, REG_OUTPUT_FORMATTER1,
+       err = tvp514x_write_reg(sd, REG_OUTPUT_FORMATTER1,
                        output_sel);
        if (err)
                return err;
@@ -637,7 +663,7 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
        /* Clear status */
        msleep(LOCK_RETRY_DELAY);
        err =
-           tvp514x_write_reg(decoder->client, REG_CLEAR_LOST_LOCK, 0x01);
+           tvp514x_write_reg(sd, REG_CLEAR_LOST_LOCK, 0x01);
        if (err)
                return err;
 
@@ -672,7 +698,7 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
                lock_mask = STATUS_HORZ_SYNC_LOCK_BIT |
                        STATUS_VIRT_SYNC_LOCK_BIT;
                break;
-       /*Need to add other interfaces*/
+       /* Need to add other interfaces*/
        default:
                return -EINVAL;
        }
@@ -682,42 +708,41 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
                msleep(LOCK_RETRY_DELAY);
 
                /* get the current standard for future reference */
-               current_std = tvp514x_get_current_std(decoder);
+               current_std = tvp514x_get_current_std(sd);
                if (current_std == STD_INVALID)
                        continue;
 
-               sync_lock_status = tvp514x_read_reg(decoder->client,
+               sync_lock_status = tvp514x_read_reg(sd,
                                REG_STATUS1);
                if (lock_mask == (sync_lock_status & lock_mask))
-                       break;  /* Input detected */
+                       /* Input detected */
+                       break;
        }
 
        if ((current_std == STD_INVALID) || (try_count < 0))
                return -EINVAL;
 
        decoder->current_std = current_std;
-       decoder->route.input = route->input;
-       decoder->route.output = route->output;
+       decoder->input = input;
+       decoder->output = output;
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Input set to: %d, std : %d",
+       v4l2_dbg(1, debug, sd, "Input set to: %d, std : %d",
                        input_sel, current_std);
 
        return 0;
 }
 
 /**
- * ioctl_queryctrl - V4L2 decoder interface handler for VIDIOC_QUERYCTRL ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_queryctrl() - V4L2 decoder interface handler for queryctrl
+ * @sd: pointer to standard V4L2 sub-device structure
  * @qctrl: standard V4L2 v4l2_queryctrl structure
  *
  * If the requested control is supported, returns the control information.
  * Otherwise, returns -EINVAL if the control is not supported.
  */
 static int
-ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
+tvp514x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qctrl)
 {
-       struct tvp514x_decoder *decoder = s->priv;
        int err = -EINVAL;
 
        if (qctrl == NULL)
@@ -725,13 +750,13 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
 
        switch (qctrl->id) {
        case V4L2_CID_BRIGHTNESS:
-               /* Brightness supported is (0-255),
-                */
+               /* Brightness supported is (0-255), */
                err = v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 128);
                break;
        case V4L2_CID_CONTRAST:
        case V4L2_CID_SATURATION:
-               /* Saturation and Contrast supported is -
+               /**
+                * Saturation and Contrast supported is -
                 *      Contrast: 0 - 255 (Default - 128)
                 *      Saturation: 0 - 255 (Default - 128)
                 */
@@ -744,30 +769,27 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
                err = v4l2_ctrl_query_fill(qctrl, -180, 180, 180, 0);
                break;
        case V4L2_CID_AUTOGAIN:
-               /* Autogain is either 0 or 1*/
-               memcpy(qctrl, &tvp514x_autogain_ctrl,
-                               sizeof(struct v4l2_queryctrl));
-               err = 0;
+               /**
+                * Auto Gain supported is -
+                *      0 - 1 (Default - 1)
+                */
+               err = v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 1);
                break;
        default:
-               v4l_err(decoder->client,
-                       "invalid control id %d\n", qctrl->id);
+               v4l2_err(sd, "invalid control id %d\n", qctrl->id);
                return err;
        }
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Query Control: %s : Min - %d, Max - %d, Def - %d",
-                       qctrl->name,
-                       qctrl->minimum,
-                       qctrl->maximum,
+       v4l2_dbg(1, debug, sd, "Query Control:%s: Min - %d, Max - %d, Def - %d",
+                       qctrl->name, qctrl->minimum, qctrl->maximum,
                        qctrl->default_value);
 
        return err;
 }
 
 /**
- * ioctl_g_ctrl - V4L2 decoder interface handler for VIDIOC_G_CTRL ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_g_ctrl() - V4L2 decoder interface handler for g_ctrl
+ * @sd: pointer to standard V4L2 sub-device structure
  * @ctrl: pointer to v4l2_control structure
  *
  * If the requested control is supported, returns the control's current
@@ -775,9 +797,9 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
  * supported.
  */
 static int
-ioctl_g_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
+tvp514x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
 
        if (ctrl == NULL)
                return -EINVAL;
@@ -811,74 +833,70 @@ ioctl_g_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
 
                break;
        default:
-               v4l_err(decoder->client,
-                       "invalid control id %d\n", ctrl->id);
+               v4l2_err(sd, "invalid control id %d\n", ctrl->id);
                return -EINVAL;
        }
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Get Control: ID - %d - %d",
+       v4l2_dbg(1, debug, sd, "Get Control: ID - %d - %d",
                        ctrl->id, ctrl->value);
        return 0;
 }
 
 /**
- * ioctl_s_ctrl - V4L2 decoder interface handler for VIDIOC_S_CTRL ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_s_ctrl() - V4L2 decoder interface handler for s_ctrl
+ * @sd: pointer to standard V4L2 sub-device structure
  * @ctrl: pointer to v4l2_control structure
  *
  * If the requested control is supported, sets the control's current
  * value in HW. Otherwise, returns -EINVAL if the control is not supported.
  */
 static int
-ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
+tvp514x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        int err = -EINVAL, value;
 
        if (ctrl == NULL)
                return err;
 
-       value = (__s32) ctrl->value;
+       value = ctrl->value;
 
        switch (ctrl->id) {
        case V4L2_CID_BRIGHTNESS:
                if (ctrl->value < 0 || ctrl->value > 255) {
-                       v4l_err(decoder->client,
-                                       "invalid brightness setting %d\n",
+                       v4l2_err(sd, "invalid brightness setting %d\n",
                                        ctrl->value);
                        return -ERANGE;
                }
-               err = tvp514x_write_reg(decoder->client, REG_BRIGHTNESS,
+               err = tvp514x_write_reg(sd, REG_BRIGHTNESS,
                                value);
                if (err)
                        return err;
+
                decoder->tvp514x_regs[REG_BRIGHTNESS].val = value;
                break;
        case V4L2_CID_CONTRAST:
                if (ctrl->value < 0 || ctrl->value > 255) {
-                       v4l_err(decoder->client,
-                                       "invalid contrast setting %d\n",
+                       v4l2_err(sd, "invalid contrast setting %d\n",
                                        ctrl->value);
                        return -ERANGE;
                }
-               err = tvp514x_write_reg(decoder->client, REG_CONTRAST,
-                               value);
+               err = tvp514x_write_reg(sd, REG_CONTRAST, value);
                if (err)
                        return err;
+
                decoder->tvp514x_regs[REG_CONTRAST].val = value;
                break;
        case V4L2_CID_SATURATION:
                if (ctrl->value < 0 || ctrl->value > 255) {
-                       v4l_err(decoder->client,
-                                       "invalid saturation setting %d\n",
+                       v4l2_err(sd, "invalid saturation setting %d\n",
                                        ctrl->value);
                        return -ERANGE;
                }
-               err = tvp514x_write_reg(decoder->client, REG_SATURATION,
-                               value);
+               err = tvp514x_write_reg(sd, REG_SATURATION, value);
                if (err)
                        return err;
+
                decoder->tvp514x_regs[REG_SATURATION].val = value;
                break;
        case V4L2_CID_HUE:
@@ -889,15 +907,13 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
                else if (value == 0)
                        value = 0;
                else {
-                       v4l_err(decoder->client,
-                                       "invalid hue setting %d\n",
-                                       ctrl->value);
+                       v4l2_err(sd, "invalid hue setting %d\n", ctrl->value);
                        return -ERANGE;
                }
-               err = tvp514x_write_reg(decoder->client, REG_HUE,
-                               value);
+               err = tvp514x_write_reg(sd, REG_HUE, value);
                if (err)
                        return err;
+
                decoder->tvp514x_regs[REG_HUE].val = value;
                break;
        case V4L2_CID_AUTOGAIN:
@@ -906,41 +922,38 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
                else if (value == 0)
                        value = 0x0C;
                else {
-                       v4l_err(decoder->client,
-                                       "invalid auto gain setting %d\n",
+                       v4l2_err(sd, "invalid auto gain setting %d\n",
                                        ctrl->value);
                        return -ERANGE;
                }
-               err = tvp514x_write_reg(decoder->client, REG_AFE_GAIN_CTRL,
-                               value);
+               err = tvp514x_write_reg(sd, REG_AFE_GAIN_CTRL, value);
                if (err)
                        return err;
+
                decoder->tvp514x_regs[REG_AFE_GAIN_CTRL].val = value;
                break;
        default:
-               v4l_err(decoder->client,
-                       "invalid control id %d\n", ctrl->id);
+               v4l2_err(sd, "invalid control id %d\n", ctrl->id);
                return err;
        }
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Set Control: ID - %d - %d",
+       v4l2_dbg(1, debug, sd, "Set Control: ID - %d - %d",
                        ctrl->id, ctrl->value);
 
        return err;
 }
 
 /**
- * ioctl_enum_fmt_cap - Implement the CAPTURE buffer VIDIOC_ENUM_FMT ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_enum_fmt_cap() - V4L2 decoder interface handler for enum_fmt
+ * @sd: pointer to standard V4L2 sub-device structure
  * @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure
  *
  * Implement the VIDIOC_ENUM_FMT ioctl to enumerate supported formats
  */
 static int
-ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt)
+tvp514x_enum_fmt_cap(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmt)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        int index;
 
        if (fmt == NULL)
@@ -948,24 +961,25 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt)
 
        index = fmt->index;
        if ((index >= decoder->num_fmts) || (index < 0))
-               return -EINVAL; /* Index out of bound */
+               /* Index out of bound */
+               return -EINVAL;
 
        if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL; /* only capture is supported */
+               /* only capture is supported */
+               return -EINVAL;
 
        memcpy(fmt, &decoder->fmt_list[index],
                sizeof(struct v4l2_fmtdesc));
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Current FMT: index - %d (%s)",
+       v4l2_dbg(1, debug, sd, "Current FMT: index - %d (%s)",
                        decoder->fmt_list[index].index,
                        decoder->fmt_list[index].description);
        return 0;
 }
 
 /**
- * ioctl_try_fmt_cap - Implement the CAPTURE buffer VIDIOC_TRY_FMT ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_try_fmt_cap() - V4L2 decoder interface handler for try_fmt
+ * @sd: pointer to standard V4L2 sub-device structure
  * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure
  *
  * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This
@@ -973,9 +987,9 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt)
  * without actually making it take effect.
  */
 static int
-ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
+tvp514x_try_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        int ifmt;
        struct v4l2_pix_format *pix;
        enum tvp514x_std current_std;
@@ -984,12 +998,13 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
                return -EINVAL;
 
        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               /* only capture is supported */
                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
        pix = &f->fmt.pix;
 
        /* Calculate height and width based on current standard */
-       current_std = tvp514x_get_current_std(decoder);
+       current_std = tvp514x_get_current_std(sd);
        if (current_std == STD_INVALID)
                return -EINVAL;
 
@@ -1003,7 +1018,8 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
                        break;
        }
        if (ifmt == decoder->num_fmts)
-               ifmt = 0;       /* None of the format matched, select default */
+               /* None of the format matched, select default */
+               ifmt = 0;
        pix->pixelformat = decoder->fmt_list[ifmt].pixelformat;
 
        pix->field = V4L2_FIELD_INTERLACED;
@@ -1012,8 +1028,7 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
        pix->colorspace = V4L2_COLORSPACE_SMPTE170M;
        pix->priv = 0;
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Try FMT: pixelformat - %s, bytesperline - %d"
+       v4l2_dbg(1, debug, sd, "Try FMT: pixelformat - %s, bytesperline - %d"
                        "Width - %d, Height - %d",
                        decoder->fmt_list[ifmt].description, pix->bytesperline,
                        pix->width, pix->height);
@@ -1021,8 +1036,8 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
 }
 
 /**
- * ioctl_s_fmt_cap - V4L2 decoder interface handler for VIDIOC_S_FMT ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_s_fmt_cap() - V4L2 decoder interface handler for s_fmt
+ * @sd: pointer to standard V4L2 sub-device structure
  * @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure
  *
  * If the requested format is supported, configures the HW to use that
@@ -1030,9 +1045,9 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
  * correctly configured.
  */
 static int
-ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
+tvp514x_s_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        struct v4l2_pix_format *pix;
        int rval;
 
@@ -1040,10 +1055,11 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
                return -EINVAL;
 
        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL; /* only capture is supported */
+               /* only capture is supported */
+               return -EINVAL;
 
        pix = &f->fmt.pix;
-       rval = ioctl_try_fmt_cap(s, f);
+       rval = tvp514x_try_fmt_cap(sd, f);
        if (rval)
                return rval;
 
@@ -1053,28 +1069,28 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
 }
 
 /**
- * ioctl_g_fmt_cap - V4L2 decoder interface handler for ioctl_g_fmt_cap
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_g_fmt_cap() - V4L2 decoder interface handler for tvp514x_g_fmt_cap
+ * @sd: pointer to standard V4L2 sub-device structure
  * @f: pointer to standard V4L2 v4l2_format structure
  *
  * Returns the decoder's current pixel format in the v4l2_format
  * parameter.
  */
 static int
-ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
+tvp514x_g_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
 
        if (f == NULL)
                return -EINVAL;
 
        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL; /* only capture is supported */
+               /* only capture is supported */
+               return -EINVAL;
 
        f->fmt.pix = decoder->pix;
 
-       v4l_dbg(1, debug, decoder->client,
-                       "Current FMT: bytesperline - %d"
+       v4l2_dbg(1, debug, sd, "Current FMT: bytesperline - %d"
                        "Width - %d, Height - %d",
                        decoder->pix.bytesperline,
                        decoder->pix.width, decoder->pix.height);
@@ -1082,16 +1098,16 @@ ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
 }
 
 /**
- * ioctl_g_parm - V4L2 decoder interface handler for VIDIOC_G_PARM ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_g_parm() - V4L2 decoder interface handler for g_parm
+ * @sd: pointer to standard V4L2 sub-device structure
  * @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure
  *
  * Returns the decoder's video CAPTURE parameters.
  */
 static int
-ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
+tvp514x_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        struct v4l2_captureparm *cparm;
        enum tvp514x_std current_std;
 
@@ -1099,13 +1115,14 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
                return -EINVAL;
 
        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL; /* only capture is supported */
+               /* only capture is supported */
+               return -EINVAL;
 
        memset(a, 0, sizeof(*a));
        a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
        /* get the current standard */
-       current_std = tvp514x_get_current_std(decoder);
+       current_std = tvp514x_get_current_std(sd);
        if (current_std == STD_INVALID)
                return -EINVAL;
 
@@ -1120,17 +1137,17 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
 }
 
 /**
- * ioctl_s_parm - V4L2 decoder interface handler for VIDIOC_S_PARM ioctl
- * @s: pointer to standard V4L2 device structure
+ * tvp514x_s_parm() - V4L2 decoder interface handler for s_parm
+ * @sd: pointer to standard V4L2 sub-device structure
  * @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure
  *
  * Configures the decoder to use the input parameters, if possible. If
  * not possible, returns the appropriate error code.
  */
 static int
-ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
+tvp514x_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
 {
-       struct tvp514x_decoder *decoder = s->priv;
+       struct tvp514x_decoder *decoder = to_decoder(sd);
        struct v4l2_fract *timeperframe;
        enum tvp514x_std current_std;
 
@@ -1138,12 +1155,13 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
                return -EINVAL;
 
        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL; /* only capture is supported */
+               /* only capture is supported */
+               return -EINVAL;
 
        timeperframe = &a->parm.capture.timeperframe;
 
        /* get the current standard */
-       current_std = tvp514x_get_current_std(decoder);
+       current_std = tvp514x_get_current_std(sd);
        if (current_std == STD_INVALID)
                return -EINVAL;
 
@@ -1156,111 +1174,58 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
 }
 
 /**
- * ioctl_g_ifparm - V4L2 decoder interface handler for vidioc_int_g_ifparm_num
- * @s: pointer to standard V4L2 device structure
- * @p: pointer to standard V4L2 vidioc_int_g_ifparm_num ioctl structure
- *
- * Gets slave interface parameters.
- * Calculates the required xclk value to support the requested
- * clock parameters in p. This value is returned in the p
- * parameter.
- */
-static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
-{
-       struct tvp514x_decoder *decoder = s->priv;
-       int rval;
-
-       if (p == NULL)
-               return -EINVAL;
-
-       if (NULL == decoder->pdata->ifparm)
-               return -EINVAL;
-
-       rval = decoder->pdata->ifparm(p);
-       if (rval) {
-               v4l_err(decoder->client, "g_ifparm.Err[%d]\n", rval);
-               return rval;
-       }
-
-       p->u.bt656.clock_curr = TVP514X_XCLK_BT656;
-
-       return 0;
-}
-
-/**
- * ioctl_g_priv - V4L2 decoder interface handler for vidioc_int_g_priv_num
- * @s: pointer to standard V4L2 device structure
- * @p: void pointer to hold decoder's private data address
- *
- * Returns device's (decoder's) private data area address in p parameter
- */
-static int ioctl_g_priv(struct v4l2_int_device *s, void *p)
-{
-       struct tvp514x_decoder *decoder = s->priv;
-
-       if (NULL == decoder->pdata->priv_data_set)
-               return -EINVAL;
-
-       return decoder->pdata->priv_data_set(p);
-}
-
-/**
- * ioctl_s_power - V4L2 decoder interface handler for vidioc_int_s_power_num
- * @s: pointer to standard V4L2 device structure
- * @on: power state to which device is to be set
+ * tvp514x_s_stream() - V4L2 decoder i/f handler for s_stream
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @enable: streaming enable or disable
  *
- * Sets devices power state to requrested state, if possible.
+ * Sets streaming to enable or disable, if possible.
  */
-static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
+static int tvp514x_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct tvp514x_decoder *decoder = s->priv;
        int err = 0;
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       struct tvp514x_decoder *decoder = to_decoder(sd);
 
-       switch (on) {
-       case V4L2_POWER_OFF:
-               /* Power Down Sequence */
-               err =
-                   tvp514x_write_reg(decoder->client, REG_OPERATION_MODE,
-                                       0x01);
-               /* Disable mux for TVP5146/47 decoder data path */
-               if (decoder->pdata->power_set)
-                       err |= decoder->pdata->power_set(on);
-               decoder->state = STATE_NOT_DETECTED;
-               break;
+       if (decoder->streaming == enable)
+               return 0;
 
-       case V4L2_POWER_STANDBY:
-               if (decoder->pdata->power_set)
-                       err = decoder->pdata->power_set(on);
+       switch (enable) {
+       case 0:
+       {
+               /* Power Down Sequence */
+               err = tvp514x_write_reg(sd, REG_OPERATION_MODE, 0x01);
+               if (err) {
+                       v4l2_err(sd, "Unable to turn off decoder\n");
+                       return err;
+               }
+               decoder->streaming = enable;
                break;
+       }
+       case 1:
+       {
+               struct tvp514x_reg *int_seq = (struct tvp514x_reg *)
+                               client->driver->id_table->driver_data;
 
-       case V4L2_POWER_ON:
-               /* Enable mux for TVP5146/47 decoder data path */
-               if ((decoder->pdata->power_set) &&
-                               (decoder->state == STATE_NOT_DETECTED)) {
-                       int i;
-                       struct tvp514x_init_seq *int_seq =
-                               (struct tvp514x_init_seq *)
-                               decoder->id->driver_data;
-
-                       err = decoder->pdata->power_set(on);
-
-                       /* Power Up Sequence */
-                       for (i = 0; i < int_seq->no_regs; i++) {
-                               err |= tvp514x_write_reg(decoder->client,
-                                               int_seq->init_reg_seq[i].reg,
-                                               int_seq->init_reg_seq[i].val);
-                       }
-                       /* Detect the sensor is not already detected */
-                       err |= tvp514x_detect(decoder);
-                       if (err) {
-                               v4l_err(decoder->client,
-                                               "Unable to detect decoder\n");
-                               return err;
-                       }
+               /* Power Up Sequence */
+               err = tvp514x_write_regs(sd, int_seq);
+               if (err) {
+                       v4l2_err(sd, "Unable to turn on decoder\n");
+                       return err;
                }
-               err |= tvp514x_configure(decoder);
+               /* Detect if not already detected */
+               err = tvp514x_detect(sd, decoder);
+               if (err) {
+                       v4l2_err(sd, "Unable to detect decoder\n");
+                       return err;
+               }
+               err = tvp514x_configure(sd, decoder);
+               if (err) {
+                       v4l2_err(sd, "Unable to configure decoder\n");
+                       return err;
+               }
+               decoder->streaming = enable;
                break;
-
+       }
        default:
                err = -ENODEV;
                break;
@@ -1269,93 +1234,38 @@ static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
        return err;
 }
 
-/**
- * ioctl_init - V4L2 decoder interface handler for VIDIOC_INT_INIT
- * @s: pointer to standard V4L2 device structure
- *
- * Initialize the decoder device (calls tvp514x_configure())
- */
-static int ioctl_init(struct v4l2_int_device *s)
-{
-       struct tvp514x_decoder *decoder = s->priv;
-
-       /* Set default standard to auto */
-       decoder->tvp514x_regs[REG_VIDEO_STD].val =
-           VIDEO_STD_AUTO_SWITCH_BIT;
-
-       return tvp514x_configure(decoder);
-}
-
-/**
- * ioctl_dev_exit - V4L2 decoder interface handler for vidioc_int_dev_exit_num
- * @s: pointer to standard V4L2 device structure
- *
- * Delinitialise the dev. at slave detach. The complement of ioctl_dev_init.
- */
-static int ioctl_dev_exit(struct v4l2_int_device *s)
-{
-       return 0;
-}
-
-/**
- * ioctl_dev_init - V4L2 decoder interface handler for vidioc_int_dev_init_num
- * @s: pointer to standard V4L2 device structure
- *
- * Initialise the device when slave attaches to the master. Returns 0 if
- * TVP5146/47 device could be found, otherwise returns appropriate error.
- */
-static int ioctl_dev_init(struct v4l2_int_device *s)
-{
-       struct tvp514x_decoder *decoder = s->priv;
-       int err;
-
-       err = tvp514x_detect(decoder);
-       if (err < 0) {
-               v4l_err(decoder->client,
-                       "Unable to detect decoder\n");
-               return err;
-       }
-
-       v4l_info(decoder->client,
-                "chip version 0x%.2x detected\n", decoder->ver);
+static const struct v4l2_subdev_core_ops tvp514x_core_ops = {
+       .queryctrl = tvp514x_queryctrl,
+       .g_ctrl = tvp514x_g_ctrl,
+       .s_ctrl = tvp514x_s_ctrl,
+       .s_std = tvp514x_s_std,
+};
 
-       return 0;
-}
+static const struct v4l2_subdev_video_ops tvp514x_video_ops = {
+       .s_routing = tvp514x_s_routing,
+       .querystd = tvp514x_querystd,
+       .enum_fmt = tvp514x_enum_fmt_cap,
+       .g_fmt = tvp514x_g_fmt_cap,
+       .try_fmt = tvp514x_try_fmt_cap,
+       .s_fmt = tvp514x_s_fmt_cap,
+       .g_parm = tvp514x_g_parm,
+       .s_parm = tvp514x_s_parm,
+       .s_stream = tvp514x_s_stream,
+};
 
-static struct v4l2_int_ioctl_desc tvp514x_ioctl_desc[] = {
-       {vidioc_int_dev_init_num, (v4l2_int_ioctl_func*) ioctl_dev_init},
-       {vidioc_int_dev_exit_num, (v4l2_int_ioctl_func*) ioctl_dev_exit},
-       {vidioc_int_s_power_num, (v4l2_int_ioctl_func*) ioctl_s_power},
-       {vidioc_int_g_priv_num, (v4l2_int_ioctl_func*) ioctl_g_priv},
-       {vidioc_int_g_ifparm_num, (v4l2_int_ioctl_func*) ioctl_g_ifparm},
-       {vidioc_int_init_num, (v4l2_int_ioctl_func*) ioctl_init},
-       {vidioc_int_enum_fmt_cap_num,
-        (v4l2_int_ioctl_func *) ioctl_enum_fmt_cap},
-       {vidioc_int_try_fmt_cap_num,
-        (v4l2_int_ioctl_func *) ioctl_try_fmt_cap},
-       {vidioc_int_g_fmt_cap_num,
-        (v4l2_int_ioctl_func *) ioctl_g_fmt_cap},
-       {vidioc_int_s_fmt_cap_num,
-        (v4l2_int_ioctl_func *) ioctl_s_fmt_cap},
-       {vidioc_int_g_parm_num, (v4l2_int_ioctl_func *) ioctl_g_parm},
-       {vidioc_int_s_parm_num, (v4l2_int_ioctl_func *) ioctl_s_parm},
-       {vidioc_int_queryctrl_num,
-        (v4l2_int_ioctl_func *) ioctl_queryctrl},
-       {vidioc_int_g_ctrl_num, (v4l2_int_ioctl_func *) ioctl_g_ctrl},
-       {vidioc_int_s_ctrl_num, (v4l2_int_ioctl_func *) ioctl_s_ctrl},
-       {vidioc_int_querystd_num, (v4l2_int_ioctl_func *) ioctl_querystd},
-       {vidioc_int_s_std_num, (v4l2_int_ioctl_func *) ioctl_s_std},
-       {vidioc_int_s_video_routing_num,
-               (v4l2_int_ioctl_func *) ioctl_s_routing},
+static const struct v4l2_subdev_ops tvp514x_ops = {
+       .core = &tvp514x_core_ops,
+       .video = &tvp514x_video_ops,
 };
 
 static struct tvp514x_decoder tvp514x_dev = {
-       .state = STATE_NOT_DETECTED,
+       .streaming = 0,
 
        .fmt_list = tvp514x_fmt_list,
        .num_fmts = ARRAY_SIZE(tvp514x_fmt_list),
 
-       .pix = {                /* Default to NTSC 8-bit YUV 422 */
+       .pix = {
+               /* Default to NTSC 8-bit YUV 422 */
                .width = NTSC_NUM_ACTIVE_PIXELS,
                .height = NTSC_NUM_ACTIVE_LINES,
                .pixelformat = V4L2_PIX_FMT_UYVY,
@@ -1369,20 +1279,13 @@ static struct tvp514x_decoder tvp514x_dev = {
        .current_std = STD_NTSC_MJ,
        .std_list = tvp514x_std_list,
        .num_stds = ARRAY_SIZE(tvp514x_std_list),
-       .v4l2_int_device = {
-               .module = THIS_MODULE,
-               .name = TVP514X_MODULE_NAME,
-               .type = v4l2_int_type_slave,
-       },
-       .tvp514x_slave = {
-               .ioctls = tvp514x_ioctl_desc,
-               .num_ioctls = ARRAY_SIZE(tvp514x_ioctl_desc),
-       },
+
 };
 
 /**
- * tvp514x_probe - decoder driver i2c probe handler
+ * tvp514x_probe() - decoder driver i2c probe handler
  * @client: i2c driver client device structure
+ * @id: i2c driver id table
  *
  * Register decoder as an i2c client device and V4L2
  * device.
@@ -1391,88 +1294,71 @@ static int
 tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        struct tvp514x_decoder *decoder;
-       int err;
+       struct v4l2_subdev *sd;
 
        /* Check if the adapter supports the needed features */
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
 
+       if (!client->dev.platform_data) {
+               v4l2_err(client, "No platform data!!\n");
+               return -ENODEV;
+       }
+
        decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
        if (!decoder)
                return -ENOMEM;
 
-       if (!client->dev.platform_data) {
-               v4l_err(client, "No platform data!!\n");
-               err = -ENODEV;
-               goto out_free;
-       }
-
+       /* Initialize the tvp514x_decoder with default configuration */
        *decoder = tvp514x_dev;
-       decoder->v4l2_int_device.priv = decoder;
-       decoder->pdata = client->dev.platform_data;
-       decoder->v4l2_int_device.u.slave = &decoder->tvp514x_slave;
+       /* Copy default register configuration */
        memcpy(decoder->tvp514x_regs, tvp514x_reg_list_default,
                        sizeof(tvp514x_reg_list_default));
-       /*
+
+       /* Copy board specific information here */
+       decoder->pdata = client->dev.platform_data;
+
+       /**
         * Fetch platform specific data, and configure the
         * tvp514x_reg_list[] accordingly. Since this is one
         * time configuration, no need to preserve.
         */
        decoder->tvp514x_regs[REG_OUTPUT_FORMATTER2].val |=
-                       (decoder->pdata->clk_polarity << 1);
+               (decoder->pdata->clk_polarity << 1);
        decoder->tvp514x_regs[REG_SYNC_CONTROL].val |=
-                       ((decoder->pdata->hs_polarity << 2) |
-                       (decoder->pdata->vs_polarity << 3));
-       /*
-        * Save the id data, required for power up sequence
-        */
-       decoder->id = (struct i2c_device_id *)id;
-       /* Attach to Master */
-       strcpy(decoder->v4l2_int_device.u.slave->attach_to,
-                       decoder->pdata->master);
-       decoder->client = client;
-       i2c_set_clientdata(client, decoder);
+               ((decoder->pdata->hs_polarity << 2) |
+                (decoder->pdata->vs_polarity << 3));
+       /* Set default standard to auto */
+       decoder->tvp514x_regs[REG_VIDEO_STD].val =
+               VIDEO_STD_AUTO_SWITCH_BIT;
 
        /* Register with V4L2 layer as slave device */
-       err = v4l2_int_device_register(&decoder->v4l2_int_device);
-       if (err) {
-               i2c_set_clientdata(client, NULL);
-               v4l_err(client,
-                       "Unable to register to v4l2. Err[%d]\n", err);
-               goto out_free;
-
-       } else
-               v4l_info(client, "Registered to v4l2 master %s!!\n",
-                               decoder->pdata->master);
+       sd = &decoder->sd;
+       v4l2_i2c_subdev_init(sd, client, &tvp514x_ops);
+
+       v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
+
        return 0;
 
-out_free:
-       kfree(decoder);
-       return err;
 }
 
 /**
- * tvp514x_remove - decoder driver i2c remove handler
+ * tvp514x_remove() - decoder driver i2c remove handler
  * @client: i2c driver client device structure
  *
  * Unregister decoder as an i2c client device and V4L2
  * device. Complement of tvp514x_probe().
  */
-static int __exit tvp514x_remove(struct i2c_client *client)
+static int tvp514x_remove(struct i2c_client *client)
 {
-       struct tvp514x_decoder *decoder = i2c_get_clientdata(client);
-
-       if (!client->adapter)
-               return -ENODEV; /* our client isn't attached */
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+       struct tvp514x_decoder *decoder = to_decoder(sd);
 
-       v4l2_int_device_unregister(&decoder->v4l2_int_device);
-       i2c_set_clientdata(client, NULL);
+       v4l2_device_unregister_subdev(sd);
        kfree(decoder);
        return 0;
 }
-/*
- * TVP5146 Init/Power on Sequence
- */
+/* TVP5146 Init/Power on Sequence */
 static const struct tvp514x_reg tvp5146_init_reg_seq[] = {
        {TOK_WRITE, REG_VBUS_ADDRESS_ACCESS1, 0x02},
        {TOK_WRITE, REG_VBUS_ADDRESS_ACCESS2, 0x00},
@@ -1485,14 +1371,10 @@ static const struct tvp514x_reg tvp5146_init_reg_seq[] = {
        {TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00},
        {TOK_WRITE, REG_OPERATION_MODE, 0x01},
        {TOK_WRITE, REG_OPERATION_MODE, 0x00},
+       {TOK_TERM, 0, 0},
 };
-static const struct tvp514x_init_seq tvp5146_init = {
-       .no_regs = ARRAY_SIZE(tvp5146_init_reg_seq),
-       .init_reg_seq = tvp5146_init_reg_seq,
-};
-/*
- * TVP5147 Init/Power on Sequence
- */
+
+/* TVP5147 Init/Power on Sequence */
 static const struct tvp514x_reg tvp5147_init_reg_seq[] =       {
        {TOK_WRITE, REG_VBUS_ADDRESS_ACCESS1, 0x02},
        {TOK_WRITE, REG_VBUS_ADDRESS_ACCESS2, 0x00},
@@ -1512,71 +1394,51 @@ static const struct tvp514x_reg tvp5147_init_reg_seq[] =        {
        {TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00},
        {TOK_WRITE, REG_OPERATION_MODE, 0x01},
        {TOK_WRITE, REG_OPERATION_MODE, 0x00},
+       {TOK_TERM, 0, 0},
 };
-static const struct tvp514x_init_seq tvp5147_init = {
-       .no_regs = ARRAY_SIZE(tvp5147_init_reg_seq),
-       .init_reg_seq = tvp5147_init_reg_seq,
-};
-/*
- * TVP5146M2/TVP5147M1 Init/Power on Sequence
- */
+
+/* TVP5146M2/TVP5147M1 Init/Power on Sequence */
 static const struct tvp514x_reg tvp514xm_init_reg_seq[] = {
        {TOK_WRITE, REG_OPERATION_MODE, 0x01},
        {TOK_WRITE, REG_OPERATION_MODE, 0x00},
+       {TOK_TERM, 0, 0},
 };
-static const struct tvp514x_init_seq tvp514xm_init = {
-       .no_regs = ARRAY_SIZE(tvp514xm_init_reg_seq),
-       .init_reg_seq = tvp514xm_init_reg_seq,
-};
-/*
+
+/**
  * I2C Device Table -
  *
  * name - Name of the actual device/chip.
  * driver_data - Driver data
  */
 static const struct i2c_device_id tvp514x_id[] = {
-       {"tvp5146", (unsigned long)&tvp5146_init},
-       {"tvp5146m2", (unsigned long)&tvp514xm_init},
-       {"tvp5147", (unsigned long)&tvp5147_init},
-       {"tvp5147m1", (unsigned long)&tvp514xm_init},
+       {"tvp5146", (unsigned long)tvp5146_init_reg_seq},
+       {"tvp5146m2", (unsigned long)tvp514xm_init_reg_seq},
+       {"tvp5147", (unsigned long)tvp5147_init_reg_seq},
+       {"tvp5147m1", (unsigned long)tvp514xm_init_reg_seq},
        {},
 };
 
 MODULE_DEVICE_TABLE(i2c, tvp514x_id);
 
-static struct i2c_driver tvp514x_i2c_driver = {
+static struct i2c_driver tvp514x_driver = {
        .driver = {
-                  .name = TVP514X_MODULE_NAME,
-                  .owner = THIS_MODULE,
-                  },
+               .owner = THIS_MODULE,
+               .name = TVP514X_MODULE_NAME,
+       },
        .probe = tvp514x_probe,
-       .remove = __exit_p(tvp514x_remove),
+       .remove = tvp514x_remove,
        .id_table = tvp514x_id,
 };
 
-/**
- * tvp514x_init
- *
- * Module init function
- */
 static int __init tvp514x_init(void)
 {
-       return i2c_add_driver(&tvp514x_i2c_driver);
+       return i2c_add_driver(&tvp514x_driver);
 }
 
-/**
- * tvp514x_cleanup
- *
- * Module exit function
- */
-static void __exit tvp514x_cleanup(void)
+static void __exit tvp514x_exit(void)
 {
-       i2c_del_driver(&tvp514x_i2c_driver);
+       i2c_del_driver(&tvp514x_driver);
 }
 
 module_init(tvp514x_init);
-module_exit(tvp514x_cleanup);
-
-MODULE_AUTHOR("Texas Instruments");
-MODULE_DESCRIPTION("TVP514X linux decoder driver");
-MODULE_LICENSE("GPL");
+module_exit(tvp514x_exit);
index 351620a..18f29ad 100644 (file)
@@ -284,14 +284,4 @@ struct tvp514x_reg {
        u32 val;
 };
 
-/**
- * struct tvp514x_init_seq - Structure for TVP5146/47/46M2/47M1 power up
- *             Sequence.
- * @ no_regs - Number of registers to write for power up sequence.
- * @ init_reg_seq - Array of registers and respective value to write.
- */
-struct tvp514x_init_seq {
-       unsigned int no_regs;
-       const struct tvp514x_reg *init_reg_seq;
-};
 #endif                         /* ifndef _TVP514X_REGS_H */
index aa5065e..269ab04 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/delay.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
 #include <media/tw9910.h>
 
@@ -223,9 +223,8 @@ struct tw9910_hsync_ctrl {
 };
 
 struct tw9910_priv {
+       struct v4l2_subdev                subdev;
        struct tw9910_video_info       *info;
-       struct i2c_client              *client;
-       struct soc_camera_device        icd;
        const struct tw9910_scale_ctrl *scale;
 };
 
@@ -356,6 +355,12 @@ static const struct tw9910_hsync_ctrl tw9910_hsync_ctrl = {
 /*
  * general function
  */
+static struct tw9910_priv *to_tw9910(const struct i2c_client *client)
+{
+       return container_of(i2c_get_clientdata(client), struct tw9910_priv,
+                           subdev);
+}
+
 static int tw9910_set_scale(struct i2c_client *client,
                            const struct tw9910_scale_ctrl *scale)
 {
@@ -509,44 +514,20 @@ tw9910_select_norm(struct soc_camera_device *icd, u32 width, u32 height)
 /*
  * soc_camera_ops function
  */
-static int tw9910_init(struct soc_camera_device *icd)
-{
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
-       int ret = 0;
-
-       if (priv->info->link.power) {
-               ret = priv->info->link.power(&priv->client->dev, 1);
-               if (ret < 0)
-                       return ret;
-       }
-
-       if (priv->info->link.reset)
-               ret = priv->info->link.reset(&priv->client->dev);
-
-       return ret;
-}
-
-static int tw9910_release(struct soc_camera_device *icd)
+static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
-       int ret = 0;
-
-       if (priv->info->link.power)
-               ret = priv->info->link.power(&priv->client->dev, 0);
-
-       return ret;
-}
+       struct i2c_client *client = sd->priv;
+       struct tw9910_priv *priv = to_tw9910(client);
 
-static int tw9910_start_capture(struct soc_camera_device *icd)
-{
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
+       if (!enable)
+               return 0;
 
        if (!priv->scale) {
-               dev_err(&icd->dev, "norm select error\n");
+               dev_err(&client->dev, "norm select error\n");
                return -EPERM;
        }
 
-       dev_dbg(&icd->dev, "%s %dx%d\n",
+       dev_dbg(&client->dev, "%s %dx%d\n",
                 priv->scale->name,
                 priv->scale->width,
                 priv->scale->height);
@@ -554,11 +535,6 @@ static int tw9910_start_capture(struct soc_camera_device *icd)
        return 0;
 }
 
-static int tw9910_stop_capture(struct soc_camera_device *icd)
-{
-       return 0;
-}
-
 static int tw9910_set_bus_param(struct soc_camera_device *icd,
                                unsigned long flags)
 {
@@ -567,8 +543,9 @@ static int tw9910_set_bus_param(struct soc_camera_device *icd,
 
 static unsigned long tw9910_query_bus_param(struct soc_camera_device *icd)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
-       struct soc_camera_link *icl = priv->client->dev.platform_data;
+       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+       struct tw9910_priv *priv = to_tw9910(client);
+       struct soc_camera_link *icl = to_soc_camera_link(icd);
        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
                SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
@@ -576,21 +553,11 @@ static unsigned long tw9910_query_bus_param(struct soc_camera_device *icd)
        return soc_camera_apply_sensor_flags(icl, flags);
 }
 
-static int tw9910_get_chip_id(struct soc_camera_device *icd,
-                             struct v4l2_dbg_chip_ident *id)
-{
-       id->ident = V4L2_IDENT_TW9910;
-       id->revision = 0;
-
-       return 0;
-}
-
-static int tw9910_set_std(struct soc_camera_device *icd,
-                         v4l2_std_id *a)
+static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 {
        int ret = -EINVAL;
 
-       if (*a & (V4L2_STD_NTSC | V4L2_STD_PAL))
+       if (norm & (V4L2_STD_NTSC | V4L2_STD_PAL))
                ret = 0;
 
        return ret;
@@ -606,17 +573,26 @@ static int tw9910_enum_input(struct soc_camera_device *icd,
        return 0;
 }
 
+static int tw9910_g_chip_ident(struct v4l2_subdev *sd,
+                              struct v4l2_dbg_chip_ident *id)
+{
+       id->ident = V4L2_IDENT_TW9910;
+       id->revision = 0;
+
+       return 0;
+}
+
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static int tw9910_get_register(struct soc_camera_device *icd,
-                              struct v4l2_dbg_register *reg)
+static int tw9910_g_register(struct v4l2_subdev *sd,
+                            struct v4l2_dbg_register *reg)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
+       struct i2c_client *client = sd->priv;
        int ret;
 
        if (reg->reg > 0xff)
                return -EINVAL;
 
-       ret = i2c_smbus_read_byte_data(priv->client, reg->reg);
+       ret = i2c_smbus_read_byte_data(client, reg->reg);
        if (ret < 0)
                return ret;
 
@@ -628,23 +604,25 @@ static int tw9910_get_register(struct soc_camera_device *icd,
        return 0;
 }
 
-static int tw9910_set_register(struct soc_camera_device *icd,
-                              struct v4l2_dbg_register *reg)
+static int tw9910_s_register(struct v4l2_subdev *sd,
+                            struct v4l2_dbg_register *reg)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
+       struct i2c_client *client = sd->priv;
 
        if (reg->reg > 0xff ||
            reg->val > 0xff)
                return -EINVAL;
 
-       return i2c_smbus_write_byte_data(priv->client, reg->reg, reg->val);
+       return i2c_smbus_write_byte_data(client, reg->reg, reg->val);
 }
 #endif
 
-static int tw9910_set_crop(struct soc_camera_device *icd,
-                          struct v4l2_rect *rect)
+static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
+       struct v4l2_rect *rect = &a->c;
+       struct i2c_client *client = sd->priv;
+       struct tw9910_priv *priv = to_tw9910(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
        int                 ret  = -EINVAL;
        u8                  val;
 
@@ -658,8 +636,8 @@ static int tw9910_set_crop(struct soc_camera_device *icd,
        /*
         * reset hardware
         */
-       tw9910_reset(priv->client);
-       ret = tw9910_write_array(priv->client, tw9910_default_regs);
+       tw9910_reset(client);
+       ret = tw9910_write_array(client, tw9910_default_regs);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
@@ -670,7 +648,7 @@ static int tw9910_set_crop(struct soc_camera_device *icd,
        if (SOCAM_DATAWIDTH_16 == priv->info->buswidth)
                val = LEN;
 
-       ret = tw9910_mask_set(priv->client, OPFORM, LEN, val);
+       ret = tw9910_mask_set(client, OPFORM, LEN, val);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
@@ -698,52 +676,139 @@ static int tw9910_set_crop(struct soc_camera_device *icd,
                val = 0;
        }
 
-       ret = tw9910_mask_set(priv->client, VBICNTL, RTSEL_MASK, val);
+       ret = tw9910_mask_set(client, VBICNTL, RTSEL_MASK, val);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
        /*
         * set scale
         */
-       ret = tw9910_set_scale(priv->client, priv->scale);
+       ret = tw9910_set_scale(client, priv->scale);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
        /*
         * set cropping
         */
-       ret = tw9910_set_cropping(priv->client, &tw9910_cropping_ctrl);
+       ret = tw9910_set_cropping(client, &tw9910_cropping_ctrl);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
        /*
         * set hsync
         */
-       ret = tw9910_set_hsync(priv->client, &tw9910_hsync_ctrl);
+       ret = tw9910_set_hsync(client, &tw9910_hsync_ctrl);
        if (ret < 0)
                goto tw9910_set_fmt_error;
 
+       rect->width = priv->scale->width;
+       rect->height = priv->scale->height;
+       rect->left = 0;
+       rect->top = 0;
+
        return ret;
 
 tw9910_set_fmt_error:
 
-       tw9910_reset(priv->client);
+       tw9910_reset(client);
        priv->scale = NULL;
 
        return ret;
 }
 
-static int tw9910_set_fmt(struct soc_camera_device *icd,
-                         struct v4l2_format *f)
+static int tw9910_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+       struct i2c_client *client = sd->priv;
+       struct tw9910_priv *priv = to_tw9910(client);
+
+       if (!priv->scale) {
+               int ret;
+               struct v4l2_crop crop = {
+                       .c = {
+                               .left   = 0,
+                               .top    = 0,
+                               .width  = 640,
+                               .height = 480,
+                       },
+               };
+               ret = tw9910_s_crop(sd, &crop);
+               if (ret < 0)
+                       return ret;
+       }
+
+       a->c.left       = 0;
+       a->c.top        = 0;
+       a->c.width      = priv->scale->width;
+       a->c.height     = priv->scale->height;
+       a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       return 0;
+}
+
+static int tw9910_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 {
+       a->bounds.left                  = 0;
+       a->bounds.top                   = 0;
+       a->bounds.width                 = 768;
+       a->bounds.height                = 576;
+       a->defrect.left                 = 0;
+       a->defrect.top                  = 0;
+       a->defrect.width                = 640;
+       a->defrect.height               = 480;
+       a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       a->pixelaspect.numerator        = 1;
+       a->pixelaspect.denominator      = 1;
+
+       return 0;
+}
+
+static int tw9910_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct tw9910_priv *priv = to_tw9910(client);
+       struct v4l2_pix_format *pix = &f->fmt.pix;
+
+       if (!priv->scale) {
+               int ret;
+               struct v4l2_crop crop = {
+                       .c = {
+                               .left   = 0,
+                               .top    = 0,
+                               .width  = 640,
+                               .height = 480,
+                       },
+               };
+               ret = tw9910_s_crop(sd, &crop);
+               if (ret < 0)
+                       return ret;
+       }
+
+       f->type                 = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+       pix->width              = priv->scale->width;
+       pix->height             = priv->scale->height;
+       pix->pixelformat        = V4L2_PIX_FMT_VYUY;
+       pix->colorspace         = V4L2_COLORSPACE_SMPTE170M;
+       pix->field              = V4L2_FIELD_INTERLACED;
+
+       return 0;
+}
+
+static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+{
+       struct i2c_client *client = sd->priv;
+       struct tw9910_priv *priv = to_tw9910(client);
        struct v4l2_pix_format *pix = &f->fmt.pix;
-       struct v4l2_rect rect = {
-               .left   = icd->x_current,
-               .top    = icd->y_current,
-               .width  = pix->width,
-               .height = pix->height,
+       /* See tw9910_s_crop() - no proper cropping support */
+       struct v4l2_crop a = {
+               .c = {
+                       .left   = 0,
+                       .top    = 0,
+                       .width  = pix->width,
+                       .height = pix->height,
+               },
        };
-       int i;
+       int i, ret;
 
        /*
         * check color format
@@ -755,19 +820,25 @@ static int tw9910_set_fmt(struct soc_camera_device *icd,
        if (i == ARRAY_SIZE(tw9910_color_fmt))
                return -EINVAL;
 
-       return tw9910_set_crop(icd, &rect);
+       ret = tw9910_s_crop(sd, &a);
+       if (!ret) {
+               pix->width = priv->scale->width;
+               pix->height = priv->scale->height;
+       }
+       return ret;
 }
 
-static int tw9910_try_fmt(struct soc_camera_device *icd,
-                         struct v4l2_format *f)
+static int tw9910_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 {
+       struct i2c_client *client = sd->priv;
+       struct soc_camera_device *icd = client->dev.platform_data;
        struct v4l2_pix_format *pix = &f->fmt.pix;
        const struct tw9910_scale_ctrl *scale;
 
        if (V4L2_FIELD_ANY == pix->field) {
                pix->field = V4L2_FIELD_INTERLACED;
        } else if (V4L2_FIELD_INTERLACED != pix->field) {
-               dev_err(&icd->dev, "Field type invalid.\n");
+               dev_err(&client->dev, "Field type invalid.\n");
                return -EINVAL;
        }
 
@@ -784,11 +855,11 @@ static int tw9910_try_fmt(struct soc_camera_device *icd,
        return 0;
 }
 
-static int tw9910_video_probe(struct soc_camera_device *icd)
+static int tw9910_video_probe(struct soc_camera_device *icd,
+                             struct i2c_client *client)
 {
-       struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
+       struct tw9910_priv *priv = to_tw9910(client);
        s32 val;
-       int ret;
 
        /*
         * We must have a parent by now. And it cannot be a wrong one.
@@ -803,7 +874,7 @@ static int tw9910_video_probe(struct soc_camera_device *icd)
         */
        if (SOCAM_DATAWIDTH_16 != priv->info->buswidth &&
            SOCAM_DATAWIDTH_8  != priv->info->buswidth) {
-               dev_err(&icd->dev, "bus width error\n");
+               dev_err(&client->dev, "bus width error\n");
                return -ENODEV;
        }
 
@@ -813,54 +884,54 @@ static int tw9910_video_probe(struct soc_camera_device *icd)
        /*
         * check and show Product ID
         */
-       val = i2c_smbus_read_byte_data(priv->client, ID);
+       val = i2c_smbus_read_byte_data(client, ID);
+
        if (0x0B != GET_ID(val) ||
            0x00 != GET_ReV(val)) {
-               dev_err(&icd->dev,
+               dev_err(&client->dev,
                        "Product ID error %x:%x\n", GET_ID(val), GET_ReV(val));
                return -ENODEV;
        }
 
-       dev_info(&icd->dev,
+       dev_info(&client->dev,
                 "tw9910 Product ID %0x:%0x\n", GET_ID(val), GET_ReV(val));
 
-       ret = soc_camera_video_start(icd);
-       if (ret < 0)
-               return ret;
-
        icd->vdev->tvnorms      = V4L2_STD_NTSC | V4L2_STD_PAL;
        icd->vdev->current_norm = V4L2_STD_NTSC;
 
-       return ret;
-}
-
-static void tw9910_video_remove(struct soc_camera_device *icd)
-{
-       soc_camera_video_stop(icd);
+       return 0;
 }
 
 static struct soc_camera_ops tw9910_ops = {
-       .owner                  = THIS_MODULE,
-       .probe                  = tw9910_video_probe,
-       .remove                 = tw9910_video_remove,
-       .init                   = tw9910_init,
-       .release                = tw9910_release,
-       .start_capture          = tw9910_start_capture,
-       .stop_capture           = tw9910_stop_capture,
-       .set_crop               = tw9910_set_crop,
-       .set_fmt                = tw9910_set_fmt,
-       .try_fmt                = tw9910_try_fmt,
        .set_bus_param          = tw9910_set_bus_param,
        .query_bus_param        = tw9910_query_bus_param,
-       .get_chip_id            = tw9910_get_chip_id,
-       .set_std                = tw9910_set_std,
        .enum_input             = tw9910_enum_input,
+};
+
+static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
+       .g_chip_ident   = tw9910_g_chip_ident,
+       .s_std          = tw9910_s_std,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-       .get_register           = tw9910_get_register,
-       .set_register           = tw9910_set_register,
+       .g_register     = tw9910_g_register,
+       .s_register     = tw9910_s_register,
 #endif
 };
 
+static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
+       .s_stream       = tw9910_s_stream,
+       .g_fmt          = tw9910_g_fmt,
+       .s_fmt          = tw9910_s_fmt,
+       .try_fmt        = tw9910_try_fmt,
+       .cropcap        = tw9910_cropcap,
+       .g_crop         = tw9910_g_crop,
+       .s_crop         = tw9910_s_crop,
+};
+
+static struct v4l2_subdev_ops tw9910_subdev_ops = {
+       .core   = &tw9910_subdev_core_ops,
+       .video  = &tw9910_subdev_video_ops,
+};
+
 /*
  * i2c_driver function
  */
@@ -871,18 +942,24 @@ static int tw9910_probe(struct i2c_client *client,
 {
        struct tw9910_priv             *priv;
        struct tw9910_video_info       *info;
-       struct soc_camera_device       *icd;
-       const struct tw9910_scale_ctrl *scale;
-       int                             i, ret;
+       struct soc_camera_device       *icd = client->dev.platform_data;
+       struct i2c_adapter             *adapter =
+               to_i2c_adapter(client->dev.parent);
+       struct soc_camera_link         *icl;
+       int                             ret;
+
+       if (!icd) {
+               dev_err(&client->dev, "TW9910: missing soc-camera data!\n");
+               return -EINVAL;
+       }
 
-       if (!client->dev.platform_data)
+       icl = to_soc_camera_link(icd);
+       if (!icl)
                return -EINVAL;
 
-       info = container_of(client->dev.platform_data,
-                           struct tw9910_video_info, link);
+       info = container_of(icl, struct tw9910_video_info, link);
 
-       if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent),
-                                    I2C_FUNC_SMBUS_BYTE_DATA)) {
+       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                dev_err(&client->dev,
                        "I2C-Adapter doesn't support "
                        "I2C_FUNC_SMBUS_BYTE_DATA\n");
@@ -894,40 +971,15 @@ static int tw9910_probe(struct i2c_client *client,
                return -ENOMEM;
 
        priv->info   = info;
-       priv->client = client;
-       i2c_set_clientdata(client, priv);
 
-       icd          = &priv->icd;
+       v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
+
        icd->ops     = &tw9910_ops;
-       icd->control = &client->dev;
        icd->iface   = info->link.bus_id;
 
-       /*
-        * set width and height
-        */
-       icd->width_max  = tw9910_ntsc_scales[0].width; /* set default */
-       icd->width_min  = tw9910_ntsc_scales[0].width;
-       icd->height_max = tw9910_ntsc_scales[0].height;
-       icd->height_min = tw9910_ntsc_scales[0].height;
-
-       scale = tw9910_ntsc_scales;
-       for (i = 0; i < ARRAY_SIZE(tw9910_ntsc_scales); i++) {
-               icd->width_max  = max(scale[i].width,  icd->width_max);
-               icd->width_min  = min(scale[i].width,  icd->width_min);
-               icd->height_max = max(scale[i].height, icd->height_max);
-               icd->height_min = min(scale[i].height, icd->height_min);
-       }
-       scale = tw9910_pal_scales;
-       for (i = 0; i < ARRAY_SIZE(tw9910_pal_scales); i++) {
-               icd->width_max  = max(scale[i].width,  icd->width_max);
-               icd->width_min  = min(scale[i].width,  icd->width_min);
-               icd->height_max = max(scale[i].height, icd->height_max);
-               icd->height_min = min(scale[i].height, icd->height_min);
-       }
-
-       ret = soc_camera_device_register(icd);
-
+       ret = tw9910_video_probe(icd, client);
        if (ret) {
+               icd->ops = NULL;
                i2c_set_clientdata(client, NULL);
                kfree(priv);
        }
@@ -937,9 +989,10 @@ static int tw9910_probe(struct i2c_client *client,
 
 static int tw9910_remove(struct i2c_client *client)
 {
-       struct tw9910_priv *priv = i2c_get_clientdata(client);
+       struct tw9910_priv *priv = to_tw9910(client);
+       struct soc_camera_device *icd = client->dev.platform_data;
 
-       soc_camera_device_unregister(&priv->icd);
+       icd->ops = NULL;
        i2c_set_clientdata(client, NULL);
        kfree(priv);
        return 0;
index 1fe5bef..f97fd06 100644 (file)
@@ -246,9 +246,9 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
        switch (usbvision_device_data[usbvision->DevModel].Codec) {
        case CODEC_SAA7113:
        case CODEC_SAA7111:
-               v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+               v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
                                &usbvision->i2c_adap, "saa7115",
-                               "saa7115_auto", saa711x_addrs);
+                               "saa7115_auto", 0, saa711x_addrs);
                break;
        }
        if (usbvision_device_data[usbvision->DevModel].Tuner == 1) {
@@ -256,16 +256,16 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
                enum v4l2_i2c_tuner_type type;
                struct tuner_setup tun_setup;
 
-               sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
                                &usbvision->i2c_adap, "tuner",
-                               "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                               "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                /* depending on whether we found a demod or not, select
                   the tuner type. */
                type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-               sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+               sd = v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
                                &usbvision->i2c_adap, "tuner",
-                               "tuner", v4l2_i2c_tuner_addrs(type));
+                               "tuner", 0, v4l2_i2c_tuner_addrs(type));
 
                if (usbvision->tuner_type != -1) {
                        tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
index 5b757f3..f960e8e 100644 (file)
@@ -124,13 +124,14 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
        int ret;
 
        size = stream->dev->uvc_version >= 0x0110 ? 34 : 26;
+       if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) &&
+                       query == UVC_GET_DEF)
+               return -EIO;
+
        data = kmalloc(size, GFP_KERNEL);
        if (data == NULL)
                return -ENOMEM;
 
-       if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF)
-               return -EIO;
-
        ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum,
                probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data,
                size, UVC_CTRL_STREAMING_TIMEOUT);
index 761fbd6..0c2105c 100644 (file)
@@ -564,10 +564,9 @@ static noinline long v4l1_compat_get_input_info(
                break;
        }
        chan->norm = 0;
-       err = drv(file, VIDIOC_G_STD, &sid);
-       if (err < 0)
-               dprintk("VIDIOCGCHAN / VIDIOC_G_STD: %ld\n", err);
-       if (err == 0) {
+       /* Note: G_STD might not be present for radio receivers,
+        * so we should ignore any errors. */
+       if (drv(file, VIDIOC_G_STD, &sid) == 0) {
                if (sid & V4L2_STD_PAL)
                        chan->norm = VIDEO_MODE_PAL;
                if (sid & V4L2_STD_NTSC)
@@ -776,10 +775,9 @@ static noinline long v4l1_compat_get_tuner(
                        tun->flags |= VIDEO_TUNER_SECAM;
        }
 
-       err = drv(file, VIDIOC_G_STD, &sid);
-       if (err < 0)
-               dprintk("VIDIOCGTUNER / VIDIOC_G_STD: %ld\n", err);
-       if (err == 0) {
+       /* Note: G_STD might not be present for radio receivers,
+        * so we should ignore any errors. */
+       if (drv(file, VIDIOC_G_STD, &sid) == 0) {
                if (sid & V4L2_STD_PAL)
                        tun->mode = VIDEO_MODE_PAL;
                if (sid & V4L2_STD_NTSC)
index 3a0c649..f5a93ae 100644 (file)
@@ -813,139 +813,6 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
 
 
 
-/* Load an i2c sub-device. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
-               struct i2c_adapter *adapter,
-               const char *module_name, const char *client_type, u8 addr)
-{
-       struct v4l2_subdev *sd = NULL;
-       struct i2c_client *client;
-       struct i2c_board_info info;
-
-       BUG_ON(!v4l2_dev);
-
-       if (module_name)
-               request_module(module_name);
-
-       /* Setup the i2c board info with the device type and
-          the device address. */
-       memset(&info, 0, sizeof(info));
-       strlcpy(info.type, client_type, sizeof(info.type));
-       info.addr = addr;
-
-       /* Create the i2c client */
-       client = i2c_new_device(adapter, &info);
-       /* Note: it is possible in the future that
-          c->driver is NULL if the driver is still being loaded.
-          We need better support from the kernel so that we
-          can easily wait for the load to finish. */
-       if (client == NULL || client->driver == NULL)
-               goto error;
-
-       /* Lock the module so we can safely get the v4l2_subdev pointer */
-       if (!try_module_get(client->driver->driver.owner))
-               goto error;
-       sd = i2c_get_clientdata(client);
-
-       /* Register with the v4l2_device which increases the module's
-          use count as well. */
-       if (v4l2_device_register_subdev(v4l2_dev, sd))
-               sd = NULL;
-       /* Decrease the module use count to match the first try_module_get. */
-       module_put(client->driver->driver.owner);
-
-       if (sd) {
-               /* We return errors from v4l2_subdev_call only if we have the
-                  callback as the .s_config is not mandatory */
-               int err = v4l2_subdev_call(sd, core, s_config, 0, NULL);
-
-               if (err && err != -ENOIOCTLCMD) {
-                       v4l2_device_unregister_subdev(sd);
-                       sd = NULL;
-               }
-       }
-
-error:
-       /* If we have a client but no subdev, then something went wrong and
-          we must unregister the client. */
-       if (client && sd == NULL)
-               i2c_unregister_device(client);
-       return sd;
-}
-EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
-
-/* Probe and load an i2c sub-device. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
-       struct i2c_adapter *adapter,
-       const char *module_name, const char *client_type,
-       const unsigned short *addrs)
-{
-       struct v4l2_subdev *sd = NULL;
-       struct i2c_client *client = NULL;
-       struct i2c_board_info info;
-
-       BUG_ON(!v4l2_dev);
-
-       if (module_name)
-               request_module(module_name);
-
-       /* Setup the i2c board info with the device type and
-          the device address. */
-       memset(&info, 0, sizeof(info));
-       strlcpy(info.type, client_type, sizeof(info.type));
-
-       /* Probe and create the i2c client */
-       client = i2c_new_probed_device(adapter, &info, addrs);
-       /* Note: it is possible in the future that
-          c->driver is NULL if the driver is still being loaded.
-          We need better support from the kernel so that we
-          can easily wait for the load to finish. */
-       if (client == NULL || client->driver == NULL)
-               goto error;
-
-       /* Lock the module so we can safely get the v4l2_subdev pointer */
-       if (!try_module_get(client->driver->driver.owner))
-               goto error;
-       sd = i2c_get_clientdata(client);
-
-       /* Register with the v4l2_device which increases the module's
-          use count as well. */
-       if (v4l2_device_register_subdev(v4l2_dev, sd))
-               sd = NULL;
-       /* Decrease the module use count to match the first try_module_get. */
-       module_put(client->driver->driver.owner);
-
-       if (sd) {
-               /* We return errors from v4l2_subdev_call only if we have the
-                  callback as the .s_config is not mandatory */
-               int err = v4l2_subdev_call(sd, core, s_config, 0, NULL);
-
-               if (err && err != -ENOIOCTLCMD) {
-                       v4l2_device_unregister_subdev(sd);
-                       sd = NULL;
-               }
-       }
-
-error:
-       /* If we have a client but no subdev, then something went wrong and
-          we must unregister the client. */
-       if (client && sd == NULL)
-               i2c_unregister_device(client);
-       return sd;
-}
-EXPORT_SYMBOL_GPL(v4l2_i2c_new_probed_subdev);
-
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
-               struct i2c_adapter *adapter,
-               const char *module_name, const char *client_type, u8 addr)
-{
-       unsigned short addrs[2] = { addr, I2C_CLIENT_END };
-
-       return v4l2_i2c_new_probed_subdev(v4l2_dev, adapter,
-                       module_name, client_type, addrs);
-}
-EXPORT_SYMBOL_GPL(v4l2_i2c_new_probed_subdev_addr);
-
 /* Load an i2c sub-device. */
 struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
                struct i2c_adapter *adapter, const char *module_name,
index a7f1b69..500cbe9 100644 (file)
@@ -66,7 +66,49 @@ static struct device_attribute video_device_attrs[] = {
  */
 static struct video_device *video_device[VIDEO_NUM_DEVICES];
 static DEFINE_MUTEX(videodev_lock);
-static DECLARE_BITMAP(video_nums[VFL_TYPE_MAX], VIDEO_NUM_DEVICES);
+static DECLARE_BITMAP(devnode_nums[VFL_TYPE_MAX], VIDEO_NUM_DEVICES);
+
+/* Device node utility functions */
+
+/* Note: these utility functions all assume that vfl_type is in the range
+   [0, VFL_TYPE_MAX-1]. */
+
+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
+/* Return the bitmap corresponding to vfl_type. */
+static inline unsigned long *devnode_bits(int vfl_type)
+{
+       /* Any types not assigned to fixed minor ranges must be mapped to
+          one single bitmap for the purposes of finding a free node number
+          since all those unassigned types use the same minor range. */
+       int idx = (vfl_type > VFL_TYPE_VTX) ? VFL_TYPE_MAX - 1 : vfl_type;
+
+       return devnode_nums[idx];
+}
+#else
+/* Return the bitmap corresponding to vfl_type. */
+static inline unsigned long *devnode_bits(int vfl_type)
+{
+       return devnode_nums[vfl_type];
+}
+#endif
+
+/* Mark device node number vdev->num as used */
+static inline void devnode_set(struct video_device *vdev)
+{
+       set_bit(vdev->num, devnode_bits(vdev->vfl_type));
+}
+
+/* Mark device node number vdev->num as unused */
+static inline void devnode_clear(struct video_device *vdev)
+{
+       clear_bit(vdev->num, devnode_bits(vdev->vfl_type));
+}
+
+/* Try to find a free device node number in the range [from, to> */
+static inline int devnode_find(struct video_device *vdev, int from, int to)
+{
+       return find_next_zero_bit(devnode_bits(vdev->vfl_type), to, from);
+}
 
 struct video_device *video_device_alloc(void)
 {
@@ -119,8 +161,8 @@ static void v4l2_device_release(struct device *cd)
           the release() callback. */
        vdev->cdev = NULL;
 
-       /* Mark minor as free */
-       clear_bit(vdev->num, video_nums[vdev->vfl_type]);
+       /* Mark device node number as free */
+       devnode_clear(vdev);
 
        mutex_unlock(&videodev_lock);
 
@@ -299,32 +341,28 @@ static const struct file_operations v4l2_fops = {
 };
 
 /**
- * get_index - assign stream number based on parent device
+ * get_index - assign stream index number based on parent device
  * @vdev: video_device to assign index number to, vdev->parent should be assigned
- * @num:  -1 if auto assign, requested number otherwise
  *
  * Note that when this is called the new device has not yet been registered
- * in the video_device array.
+ * in the video_device array, but it was able to obtain a minor number.
+ *
+ * This means that we can always obtain a free stream index number since
+ * the worst case scenario is that there are VIDEO_NUM_DEVICES - 1 slots in
+ * use of the video_device array.
  *
- * Returns -ENFILE if num is already in use, a free index number if
- * successful.
+ * Returns a free index number.
  */
-static int get_index(struct video_device *vdev, int num)
+static int get_index(struct video_device *vdev)
 {
        /* This can be static since this function is called with the global
           videodev_lock held. */
        static DECLARE_BITMAP(used, VIDEO_NUM_DEVICES);
        int i;
 
-       if (num >= VIDEO_NUM_DEVICES) {
-               printk(KERN_ERR "videodev: %s num is too large\n", __func__);
-               return -EINVAL;
-       }
-
-       /* Some drivers do not set the parent. In that case always return
-          num or 0. */
+       /* Some drivers do not set the parent. In that case always return 0. */
        if (vdev->parent == NULL)
-               return num >= 0 ? num : 0;
+               return 0;
 
        bitmap_zero(used, VIDEO_NUM_DEVICES);
 
@@ -335,35 +373,23 @@ static int get_index(struct video_device *vdev, int num)
                }
        }
 
-       if (num >= 0) {
-               if (test_bit(num, used))
-                       return -ENFILE;
-               return num;
-       }
-
-       i = find_first_zero_bit(used, VIDEO_NUM_DEVICES);
-       return i == VIDEO_NUM_DEVICES ? -ENFILE : i;
+       return find_first_zero_bit(used, VIDEO_NUM_DEVICES);
 }
 
-int video_register_device(struct video_device *vdev, int type, int nr)
-{
-       return video_register_device_index(vdev, type, nr, -1);
-}
-EXPORT_SYMBOL(video_register_device);
-
 /**
- *     video_register_device_index - register video4linux devices
+ *     video_register_device - register video4linux devices
  *     @vdev: video device structure we want to register
  *     @type: type of device to register
- *     @nr:   which device number (0 == /dev/video0, 1 == /dev/video1, ...
+ *     @nr:   which device node number (0 == /dev/video0, 1 == /dev/video1, ...
  *             -1 == first free)
- *     @index: stream number based on parent device;
- *             -1 if auto assign, requested number otherwise
+ *     @warn_if_nr_in_use: warn if the desired device node number
+ *            was already in use and another number was chosen instead.
  *
- *     The registration code assigns minor numbers based on the type
- *     requested. -ENFILE is returned in all the device slots for this
- *     category are full. If not then the minor field is set and the
- *     driver initialize function is called (if non %NULL).
+ *     The registration code assigns minor numbers and device node numbers
+ *     based on the requested type and registers the new device node with
+ *     the kernel.
+ *     An error is returned if no free minor or device node number could be
+ *     found, or if the registration of the device node failed.
  *
  *     Zero is returned on success.
  *
@@ -377,8 +403,8 @@ EXPORT_SYMBOL(video_register_device);
  *
  *     %VFL_TYPE_RADIO - A radio card
  */
-int video_register_device_index(struct video_device *vdev, int type, int nr,
-                                       int index)
+static int __video_register_device(struct video_device *vdev, int type, int nr,
+               int warn_if_nr_in_use)
 {
        int i = 0;
        int ret;
@@ -421,7 +447,7 @@ int video_register_device_index(struct video_device *vdev, int type, int nr,
        if (vdev->v4l2_dev && vdev->v4l2_dev->dev)
                vdev->parent = vdev->v4l2_dev->dev;
 
-       /* Part 2: find a free minor, kernel number and device index. */
+       /* Part 2: find a free minor, device node number and device index. */
 #ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
        /* Keep the ranges for the first four types for historical
         * reasons.
@@ -452,21 +478,22 @@ int video_register_device_index(struct video_device *vdev, int type, int nr,
        }
 #endif
 
-       /* Pick a minor number */
+       /* Pick a device node number */
        mutex_lock(&videodev_lock);
-       nr = find_next_zero_bit(video_nums[type], minor_cnt, nr == -1 ? 0 : nr);
+       nr = devnode_find(vdev, nr == -1 ? 0 : nr, minor_cnt);
        if (nr == minor_cnt)
-               nr = find_first_zero_bit(video_nums[type], minor_cnt);
+               nr = devnode_find(vdev, 0, minor_cnt);
        if (nr == minor_cnt) {
-               printk(KERN_ERR "could not get a free kernel number\n");
+               printk(KERN_ERR "could not get a free device node number\n");
                mutex_unlock(&videodev_lock);
                return -ENFILE;
        }
 #ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
-       /* 1-on-1 mapping of kernel number to minor number */
+       /* 1-on-1 mapping of device node number to minor number */
        i = nr;
 #else
-       /* The kernel number and minor numbers are independent */
+       /* The device node number and minor numbers are independent, so
+          we just find the first free minor number. */
        for (i = 0; i < VIDEO_NUM_DEVICES; i++)
                if (video_device[i] == NULL)
                        break;
@@ -478,17 +505,13 @@ int video_register_device_index(struct video_device *vdev, int type, int nr,
 #endif
        vdev->minor = i + minor_offset;
        vdev->num = nr;
-       set_bit(nr, video_nums[type]);
+       devnode_set(vdev);
+
        /* Should not happen since we thought this minor was free */
        WARN_ON(video_device[vdev->minor] != NULL);
-       ret = vdev->index = get_index(vdev, index);
+       vdev->index = get_index(vdev);
        mutex_unlock(&videodev_lock);
 
-       if (ret < 0) {
-               printk(KERN_ERR "%s: get_index failed\n", __func__);
-               goto cleanup;
-       }
-
        /* Part 3: Initialize the character device */
        vdev->cdev = cdev_alloc();
        if (vdev->cdev == NULL) {
@@ -517,7 +540,7 @@ int video_register_device_index(struct video_device *vdev, int type, int nr,
        vdev->dev.devt = MKDEV(VIDEO_MAJOR, vdev->minor);
        if (vdev->parent)
                vdev->dev.parent = vdev->parent;
-       dev_set_name(&vdev->dev, "%s%d", name_base, nr);
+       dev_set_name(&vdev->dev, "%s%d", name_base, vdev->num);
        ret = device_register(&vdev->dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: device_register failed\n", __func__);
@@ -527,6 +550,10 @@ int video_register_device_index(struct video_device *vdev, int type, int nr,
           reference to the device goes away. */
        vdev->dev.release = v4l2_device_release;
 
+       if (nr != -1 && nr != vdev->num && warn_if_nr_in_use)
+               printk(KERN_WARNING "%s: requested %s%d, got %s%d\n",
+                               __func__, name_base, nr, name_base, vdev->num);
+
        /* Part 5: Activate this minor. The char device can now be used. */
        mutex_lock(&videodev_lock);
        video_device[vdev->minor] = vdev;
@@ -537,13 +564,24 @@ cleanup:
        mutex_lock(&videodev_lock);
        if (vdev->cdev)
                cdev_del(vdev->cdev);
-       clear_bit(vdev->num, video_nums[type]);
+       devnode_clear(vdev);
        mutex_unlock(&videodev_lock);
        /* Mark this video device as never having been registered. */
        vdev->minor = -1;
        return ret;
 }
-EXPORT_SYMBOL(video_register_device_index);
+
+int video_register_device(struct video_device *vdev, int type, int nr)
+{
+       return __video_register_device(vdev, type, nr, 1);
+}
+EXPORT_SYMBOL(video_register_device);
+
+int video_register_device_no_warn(struct video_device *vdev, int type, int nr)
+{
+       return __video_register_device(vdev, type, nr, 0);
+}
+EXPORT_SYMBOL(video_register_device_no_warn);
 
 /**
  *     video_unregister_device - unregister a video4linux device
index f3b6e15..cd6a344 100644 (file)
@@ -4333,11 +4333,11 @@ static int __init vino_module_init(void)
        vino_init_stage++;
 
        vino_drvdata->decoder =
-               v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
-                       &vino_i2c_adapter, "saa7191", "saa7191", 0x45);
+               v4l2_i2c_new_subdev(&vino_drvdata->v4l2_dev, &vino_i2c_adapter,
+                              "saa7191", "saa7191", 0, I2C_ADDRS(0x45));
        vino_drvdata->camera =
-               v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
-                       &vino_i2c_adapter, "indycam", "indycam", 0x2b);
+               v4l2_i2c_new_subdev(&vino_drvdata->v4l2_dev, &vino_i2c_adapter,
+                              "indycam", "indycam", 0, I2C_ADDRS(0x2b));
 
        dprintk("init complete!\n");
 
index 602484d..37fcdc4 100644 (file)
@@ -3515,9 +3515,9 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
        w9968cf_turn_on_led(cam);
 
        w9968cf_i2c_init(cam);
-       cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->v4l2_dev,
+       cam->sensor_sd = v4l2_i2c_new_subdev(&cam->v4l2_dev,
                        &cam->i2c_adapter,
-                       "ovcamchip", "ovcamchip", addrs);
+                       "ovcamchip", "ovcamchip", 0, addrs);
 
        usb_set_intfdata(intf, cam);
        mutex_unlock(&cam->dev_mutex);
index 9697104..b3c6436 100644 (file)
@@ -819,8 +819,10 @@ zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                            (!list_empty(&cam->outqueue)) ||
                            (cam->state & DEV_DISCONNECTED) ||
                            (cam->state & DEV_MISCONFIGURED),
-                           cam->module_param.frame_timeout *
-                           1000 * msecs_to_jiffies(1) );
+                           msecs_to_jiffies(
+                               cam->module_param.frame_timeout * 1000
+                           )
+                         );
                if (timeout < 0) {
                        mutex_unlock(&cam->fileop_mutex);
                        return timeout;
index 0c4d9b1..be70574 100644 (file)
@@ -1357,15 +1357,15 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
                goto zr_free_irq;
        }
 
-       zr->decoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+       zr->decoder = v4l2_i2c_new_subdev(&zr->v4l2_dev,
                &zr->i2c_adapter, zr->card.mod_decoder, zr->card.i2c_decoder,
-               zr->card.addrs_decoder);
+               0, zr->card.addrs_decoder);
 
        if (zr->card.mod_encoder)
-               zr->encoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+               zr->encoder = v4l2_i2c_new_subdev(&zr->v4l2_dev,
                        &zr->i2c_adapter,
                        zr->card.mod_encoder, zr->card.i2c_encoder,
-                       zr->card.addrs_encoder);
+                       0, zr->card.addrs_encoder);
 
        dprintk(2,
                KERN_INFO "%s: Initializing videocodec bus...\n",
index 7847bbc..bd83fa0 100644 (file)
@@ -235,7 +235,7 @@ static int mspro_block_bd_getgeo(struct block_device *bdev,
        return 0;
 }
 
-static struct block_device_operations ms_block_bdops = {
+static const struct block_device_operations ms_block_bdops = {
        .open    = mspro_block_bd_open,
        .release = mspro_block_bd_release,
        .getgeo  = mspro_block_bd_getgeo,
index 76fa2ee..610e914 100644 (file)
@@ -6821,7 +6821,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh
        *size = y;
 }
 /**
- *     mpt_set_taskmgmt_in_progress_flag - set flags associated with task managment
+ *     mpt_set_taskmgmt_in_progress_flag - set flags associated with task management
  *     @ioc: Pointer to MPT_ADAPTER structure
  *
  *     Returns 0 for SUCCESS or -1 if FAILED.
@@ -6854,7 +6854,7 @@ mpt_set_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc)
 EXPORT_SYMBOL(mpt_set_taskmgmt_in_progress_flag);
 
 /**
- *     mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task managment
+ *     mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task management
  *     @ioc: Pointer to MPT_ADAPTER structure
  *
  **/
index 335d4c7..d505b68 100644 (file)
@@ -925,7 +925,7 @@ static void i2o_block_request_fn(struct request_queue *q)
 };
 
 /* I2O Block device operations definition */
-static struct block_device_operations i2o_block_fops = {
+static const struct block_device_operations i2o_block_fops = {
        .owner = THIS_MODULE,
        .open = i2o_block_open,
        .release = i2o_block_release,
index c533f86..5447da1 100644 (file)
@@ -647,7 +647,7 @@ struct ab3100_init_setting {
        u8 setting;
 };
 
-static const struct ab3100_init_setting __initdata
+static const struct ab3100_init_setting __initconst
 ab3100_init_settings[] = {
        {
                .abreg = AB3100_MCA,
index 016be49..8762889 100644 (file)
@@ -548,3 +548,4 @@ module_exit(ezx_pcap_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Daniel Ribeiro / Harald Welte");
 MODULE_DESCRIPTION("Motorola PCAP2 ASIC Driver");
+MODULE_ALIAS("spi:ezx-pcap");
index 78c2135..2afc080 100644 (file)
@@ -48,9 +48,11 @@ static int ucb1400_core_probe(struct device *dev)
        int err;
        struct ucb1400 *ucb;
        struct ucb1400_ts ucb_ts;
+       struct ucb1400_gpio ucb_gpio;
        struct snd_ac97 *ac97;
 
        memset(&ucb_ts, 0, sizeof(ucb_ts));
+       memset(&ucb_gpio, 0, sizeof(ucb_gpio));
 
        ucb = kzalloc(sizeof(struct ucb1400), GFP_KERNEL);
        if (!ucb) {
@@ -68,25 +70,44 @@ static int ucb1400_core_probe(struct device *dev)
                goto err0;
        }
 
+       /* GPIO */
+       ucb_gpio.ac97 = ac97;
+       ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
+       if (!ucb->ucb1400_gpio) {
+               err = -ENOMEM;
+               goto err0;
+       }
+       err = platform_device_add_data(ucb->ucb1400_gpio, &ucb_gpio,
+                                       sizeof(ucb_gpio));
+       if (err)
+               goto err1;
+       err = platform_device_add(ucb->ucb1400_gpio);
+       if (err)
+               goto err1;
+
        /* TOUCHSCREEN */
        ucb_ts.ac97 = ac97;
        ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);
        if (!ucb->ucb1400_ts) {
                err = -ENOMEM;
-               goto err0;
+               goto err2;
        }
        err = platform_device_add_data(ucb->ucb1400_ts, &ucb_ts,
                                        sizeof(ucb_ts));
        if (err)
-               goto err1;
+               goto err3;
        err = platform_device_add(ucb->ucb1400_ts);
        if (err)
-               goto err1;
+               goto err3;
 
        return 0;
 
-err1:
+err3:
        platform_device_put(ucb->ucb1400_ts);
+err2:
+       platform_device_unregister(ucb->ucb1400_gpio);
+err1:
+       platform_device_put(ucb->ucb1400_gpio);
 err0:
        kfree(ucb);
 err:
@@ -98,6 +119,8 @@ static int ucb1400_core_remove(struct device *dev)
        struct ucb1400 *ucb = dev_get_drvdata(dev);
 
        platform_device_unregister(ucb->ucb1400_ts);
+       platform_device_unregister(ucb->ucb1400_gpio);
+
        kfree(ucb);
        return 0;
 }
index 2e535a0..d902d81 100644 (file)
@@ -417,4 +417,4 @@ module_exit(at25_exit);
 MODULE_DESCRIPTION("Driver for most SPI EEPROMs");
 MODULE_AUTHOR("David Brownell");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("spi:at25");
index de966a6..aecf40e 100644 (file)
@@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct file_system_type *fst,
        return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);
 }
 
-static struct super_operations ibmasmfs_s_ops = {
+static const struct super_operations ibmasmfs_s_ops = {
        .statfs         = simple_statfs,
        .drop_inode     = generic_delete_inode,
 };
index 1bfe5d1..3648b23 100644 (file)
@@ -283,7 +283,7 @@ static int __init lkdtm_module_init(void)
 
        switch (cpoint) {
        case INT_HARDWARE_ENTRY:
-               lkdtm.kp.symbol_name = "__do_IRQ";
+               lkdtm.kp.symbol_name = "do_IRQ";
                lkdtm.entry = (kprobe_opcode_t*) jp_do_irq;
                break;
        case INT_HW_IRQ_EN:
index adc205c..85f0e8c 100644 (file)
@@ -130,7 +130,7 @@ mmc_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations mmc_bdops = {
+static const struct block_device_operations mmc_bdops = {
        .open                   = mmc_blk_open,
        .release                = mmc_blk_release,
        .getgeo                 = mmc_blk_getgeo,
index d84c880..7dab2e5 100644 (file)
@@ -343,6 +343,101 @@ unsigned int mmc_align_data_size(struct mmc_card *card, unsigned int sz)
 }
 EXPORT_SYMBOL(mmc_align_data_size);
 
+/**
+ *     mmc_host_enable - enable a host.
+ *     @host: mmc host to enable
+ *
+ *     Hosts that support power saving can use the 'enable' and 'disable'
+ *     methods to exit and enter power saving states. For more information
+ *     see comments for struct mmc_host_ops.
+ */
+int mmc_host_enable(struct mmc_host *host)
+{
+       if (!(host->caps & MMC_CAP_DISABLE))
+               return 0;
+
+       if (host->en_dis_recurs)
+               return 0;
+
+       if (host->nesting_cnt++)
+               return 0;
+
+       cancel_delayed_work_sync(&host->disable);
+
+       if (host->enabled)
+               return 0;
+
+       if (host->ops->enable) {
+               int err;
+
+               host->en_dis_recurs = 1;
+               err = host->ops->enable(host);
+               host->en_dis_recurs = 0;
+
+               if (err) {
+                       pr_debug("%s: enable error %d\n",
+                                mmc_hostname(host), err);
+                       return err;
+               }
+       }
+       host->enabled = 1;
+       return 0;
+}
+EXPORT_SYMBOL(mmc_host_enable);
+
+static int mmc_host_do_disable(struct mmc_host *host, int lazy)
+{
+       if (host->ops->disable) {
+               int err;
+
+               host->en_dis_recurs = 1;
+               err = host->ops->disable(host, lazy);
+               host->en_dis_recurs = 0;
+
+               if (err < 0) {
+                       pr_debug("%s: disable error %d\n",
+                                mmc_hostname(host), err);
+                       return err;
+               }
+               if (err > 0) {
+                       unsigned long delay = msecs_to_jiffies(err);
+
+                       mmc_schedule_delayed_work(&host->disable, delay);
+               }
+       }
+       host->enabled = 0;
+       return 0;
+}
+
+/**
+ *     mmc_host_disable - disable a host.
+ *     @host: mmc host to disable
+ *
+ *     Hosts that support power saving can use the 'enable' and 'disable'
+ *     methods to exit and enter power saving states. For more information
+ *     see comments for struct mmc_host_ops.
+ */
+int mmc_host_disable(struct mmc_host *host)
+{
+       int err;
+
+       if (!(host->caps & MMC_CAP_DISABLE))
+               return 0;
+
+       if (host->en_dis_recurs)
+               return 0;
+
+       if (--host->nesting_cnt)
+               return 0;
+
+       if (!host->enabled)
+               return 0;
+
+       err = mmc_host_do_disable(host, 0);
+       return err;
+}
+EXPORT_SYMBOL(mmc_host_disable);
+
 /**
  *     __mmc_claim_host - exclusively claim a host
  *     @host: mmc host to claim
@@ -366,24 +461,110 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
        while (1) {
                set_current_state(TASK_UNINTERRUPTIBLE);
                stop = abort ? atomic_read(abort) : 0;
-               if (stop || !host->claimed)
+               if (stop || !host->claimed || host->claimer == current)
                        break;
                spin_unlock_irqrestore(&host->lock, flags);
                schedule();
                spin_lock_irqsave(&host->lock, flags);
        }
        set_current_state(TASK_RUNNING);
-       if (!stop)
+       if (!stop) {
                host->claimed = 1;
-       else
+               host->claimer = current;
+               host->claim_cnt += 1;
+       } else
                wake_up(&host->wq);
        spin_unlock_irqrestore(&host->lock, flags);
        remove_wait_queue(&host->wq, &wait);
+       if (!stop)
+               mmc_host_enable(host);
        return stop;
 }
 
 EXPORT_SYMBOL(__mmc_claim_host);
 
+/**
+ *     mmc_try_claim_host - try exclusively to claim a host
+ *     @host: mmc host to claim
+ *
+ *     Returns %1 if the host is claimed, %0 otherwise.
+ */
+int mmc_try_claim_host(struct mmc_host *host)
+{
+       int claimed_host = 0;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->lock, flags);
+       if (!host->claimed || host->claimer == current) {
+               host->claimed = 1;
+               host->claimer = current;
+               host->claim_cnt += 1;
+               claimed_host = 1;
+       }
+       spin_unlock_irqrestore(&host->lock, flags);
+       return claimed_host;
+}
+EXPORT_SYMBOL(mmc_try_claim_host);
+
+static void mmc_do_release_host(struct mmc_host *host)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->lock, flags);
+       if (--host->claim_cnt) {
+               /* Release for nested claim */
+               spin_unlock_irqrestore(&host->lock, flags);
+       } else {
+               host->claimed = 0;
+               host->claimer = NULL;
+               spin_unlock_irqrestore(&host->lock, flags);
+               wake_up(&host->wq);
+       }
+}
+
+void mmc_host_deeper_disable(struct work_struct *work)
+{
+       struct mmc_host *host =
+               container_of(work, struct mmc_host, disable.work);
+
+       /* If the host is claimed then we do not want to disable it anymore */
+       if (!mmc_try_claim_host(host))
+               return;
+       mmc_host_do_disable(host, 1);
+       mmc_do_release_host(host);
+}
+
+/**
+ *     mmc_host_lazy_disable - lazily disable a host.
+ *     @host: mmc host to disable
+ *
+ *     Hosts that support power saving can use the 'enable' and 'disable'
+ *     methods to exit and enter power saving states. For more information
+ *     see comments for struct mmc_host_ops.
+ */
+int mmc_host_lazy_disable(struct mmc_host *host)
+{
+       if (!(host->caps & MMC_CAP_DISABLE))
+               return 0;
+
+       if (host->en_dis_recurs)
+               return 0;
+
+       if (--host->nesting_cnt)
+               return 0;
+
+       if (!host->enabled)
+               return 0;
+
+       if (host->disable_delay) {
+               mmc_schedule_delayed_work(&host->disable,
+                               msecs_to_jiffies(host->disable_delay));
+               return 0;
+       } else
+               return mmc_host_do_disable(host, 1);
+}
+EXPORT_SYMBOL(mmc_host_lazy_disable);
+
 /**
  *     mmc_release_host - release a host
  *     @host: mmc host to release
@@ -393,15 +574,11 @@ EXPORT_SYMBOL(__mmc_claim_host);
  */
 void mmc_release_host(struct mmc_host *host)
 {
-       unsigned long flags;
-
        WARN_ON(!host->claimed);
 
-       spin_lock_irqsave(&host->lock, flags);
-       host->claimed = 0;
-       spin_unlock_irqrestore(&host->lock, flags);
+       mmc_host_lazy_disable(host);
 
-       wake_up(&host->wq);
+       mmc_do_release_host(host);
 }
 
 EXPORT_SYMBOL(mmc_release_host);
@@ -687,7 +864,13 @@ void mmc_set_timing(struct mmc_host *host, unsigned int timing)
  */
 static void mmc_power_up(struct mmc_host *host)
 {
-       int bit = fls(host->ocr_avail) - 1;
+       int bit;
+
+       /* If ocr is set, we use it */
+       if (host->ocr)
+               bit = ffs(host->ocr) - 1;
+       else
+               bit = fls(host->ocr_avail) - 1;
 
        host->ios.vdd = bit;
        if (mmc_host_is_spi(host)) {
@@ -947,6 +1130,8 @@ void mmc_stop_host(struct mmc_host *host)
        spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
+       if (host->caps & MMC_CAP_DISABLE)
+               cancel_delayed_work(&host->disable);
        cancel_delayed_work(&host->detect);
        mmc_flush_scheduled_work();
 
@@ -958,6 +1143,8 @@ void mmc_stop_host(struct mmc_host *host)
                mmc_claim_host(host);
                mmc_detach_bus(host);
                mmc_release_host(host);
+               mmc_bus_put(host);
+               return;
        }
        mmc_bus_put(host);
 
@@ -966,6 +1153,80 @@ void mmc_stop_host(struct mmc_host *host)
        mmc_power_off(host);
 }
 
+void mmc_power_save_host(struct mmc_host *host)
+{
+       mmc_bus_get(host);
+
+       if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+               mmc_bus_put(host);
+               return;
+       }
+
+       if (host->bus_ops->power_save)
+               host->bus_ops->power_save(host);
+
+       mmc_bus_put(host);
+
+       mmc_power_off(host);
+}
+EXPORT_SYMBOL(mmc_power_save_host);
+
+void mmc_power_restore_host(struct mmc_host *host)
+{
+       mmc_bus_get(host);
+
+       if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+               mmc_bus_put(host);
+               return;
+       }
+
+       mmc_power_up(host);
+       host->bus_ops->power_restore(host);
+
+       mmc_bus_put(host);
+}
+EXPORT_SYMBOL(mmc_power_restore_host);
+
+int mmc_card_awake(struct mmc_host *host)
+{
+       int err = -ENOSYS;
+
+       mmc_bus_get(host);
+
+       if (host->bus_ops && !host->bus_dead && host->bus_ops->awake)
+               err = host->bus_ops->awake(host);
+
+       mmc_bus_put(host);
+
+       return err;
+}
+EXPORT_SYMBOL(mmc_card_awake);
+
+int mmc_card_sleep(struct mmc_host *host)
+{
+       int err = -ENOSYS;
+
+       mmc_bus_get(host);
+
+       if (host->bus_ops && !host->bus_dead && host->bus_ops->awake)
+               err = host->bus_ops->sleep(host);
+
+       mmc_bus_put(host);
+
+       return err;
+}
+EXPORT_SYMBOL(mmc_card_sleep);
+
+int mmc_card_can_sleep(struct mmc_host *host)
+{
+       struct mmc_card *card = host->card;
+
+       if (card && mmc_card_mmc(card) && card->ext_csd.rev >= 3)
+               return 1;
+       return 0;
+}
+EXPORT_SYMBOL(mmc_card_can_sleep);
+
 #ifdef CONFIG_PM
 
 /**
@@ -975,27 +1236,36 @@ void mmc_stop_host(struct mmc_host *host)
  */
 int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
 {
+       int err = 0;
+
+       if (host->caps & MMC_CAP_DISABLE)
+               cancel_delayed_work(&host->disable);
        cancel_delayed_work(&host->detect);
        mmc_flush_scheduled_work();
 
        mmc_bus_get(host);
        if (host->bus_ops && !host->bus_dead) {
                if (host->bus_ops->suspend)
-                       host->bus_ops->suspend(host);
-               if (!host->bus_ops->resume) {
+                       err = host->bus_ops->suspend(host);
+               if (err == -ENOSYS || !host->bus_ops->resume) {
+                       /*
+                        * We simply "remove" the card in this case.
+                        * It will be redetected on resume.
+                        */
                        if (host->bus_ops->remove)
                                host->bus_ops->remove(host);
-
                        mmc_claim_host(host);
                        mmc_detach_bus(host);
                        mmc_release_host(host);
+                       err = 0;
                }
        }
        mmc_bus_put(host);
 
-       mmc_power_off(host);
+       if (!err)
+               mmc_power_off(host);
 
-       return 0;
+       return err;
 }
 
 EXPORT_SYMBOL(mmc_suspend_host);
@@ -1006,12 +1276,26 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
+       int err = 0;
+
        mmc_bus_get(host);
        if (host->bus_ops && !host->bus_dead) {
                mmc_power_up(host);
                mmc_select_voltage(host, host->ocr);
                BUG_ON(!host->bus_ops->resume);
-               host->bus_ops->resume(host);
+               err = host->bus_ops->resume(host);
+               if (err) {
+                       printk(KERN_WARNING "%s: error %d during resume "
+                                           "(card was removed?)\n",
+                                           mmc_hostname(host), err);
+                       if (host->bus_ops->remove)
+                               host->bus_ops->remove(host);
+                       mmc_claim_host(host);
+                       mmc_detach_bus(host);
+                       mmc_release_host(host);
+                       /* no need to bother upper layers */
+                       err = 0;
+               }
        }
        mmc_bus_put(host);
 
@@ -1021,7 +1305,7 @@ int mmc_resume_host(struct mmc_host *host)
         */
        mmc_detect_change(host, 1);
 
-       return 0;
+       return err;
 }
 
 EXPORT_SYMBOL(mmc_resume_host);
index c819eff..67ae6ab 100644 (file)
 #define MMC_CMD_RETRIES        3
 
 struct mmc_bus_ops {
+       int (*awake)(struct mmc_host *);
+       int (*sleep)(struct mmc_host *);
        void (*remove)(struct mmc_host *);
        void (*detect)(struct mmc_host *);
-       void (*suspend)(struct mmc_host *);
-       void (*resume)(struct mmc_host *);
+       int (*suspend)(struct mmc_host *);
+       int (*resume)(struct mmc_host *);
+       void (*power_save)(struct mmc_host *);
+       void (*power_restore)(struct mmc_host *);
 };
 
 void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
index 5e945e6..a268d12 100644 (file)
@@ -83,6 +83,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
        spin_lock_init(&host->lock);
        init_waitqueue_head(&host->wq);
        INIT_DELAYED_WORK(&host->detect, mmc_rescan);
+       INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable);
 
        /*
         * By default, hosts do not support SGIO or large requests.
index c2dc3d2..8c87e11 100644 (file)
@@ -14,5 +14,7 @@
 int mmc_register_host_class(void);
 void mmc_unregister_host_class(void);
 
+void mmc_host_deeper_disable(struct work_struct *work);
+
 #endif
 
index 2fb9d5f..bfefce3 100644 (file)
@@ -160,7 +160,6 @@ static int mmc_read_ext_csd(struct mmc_card *card)
 {
        int err;
        u8 *ext_csd;
-       unsigned int ext_csd_struct;
 
        BUG_ON(!card);
 
@@ -180,11 +179,11 @@ static int mmc_read_ext_csd(struct mmc_card *card)
 
        err = mmc_send_ext_csd(card, ext_csd);
        if (err) {
-               /*
-                * We all hosts that cannot perform the command
-                * to fail more gracefully
-                */
-               if (err != -EINVAL)
+               /* If the host or the card can't do the switch,
+                * fail more gracefully. */
+               if ((err != -EINVAL)
+                && (err != -ENOSYS)
+                && (err != -EFAULT))
                        goto out;
 
                /*
@@ -207,16 +206,16 @@ static int mmc_read_ext_csd(struct mmc_card *card)
                goto out;
        }
 
-       ext_csd_struct = ext_csd[EXT_CSD_REV];
-       if (ext_csd_struct > 3) {
+       card->ext_csd.rev = ext_csd[EXT_CSD_REV];
+       if (card->ext_csd.rev > 3) {
                printk(KERN_ERR "%s: unrecognised EXT_CSD structure "
                        "version %d\n", mmc_hostname(card->host),
-                       ext_csd_struct);
+                       card->ext_csd.rev);
                err = -EINVAL;
                goto out;
        }
 
-       if (ext_csd_struct >= 2) {
+       if (card->ext_csd.rev >= 2) {
                card->ext_csd.sectors =
                        ext_csd[EXT_CSD_SEC_CNT + 0] << 0 |
                        ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
@@ -241,6 +240,15 @@ static int mmc_read_ext_csd(struct mmc_card *card)
                goto out;
        }
 
+       if (card->ext_csd.rev >= 3) {
+               u8 sa_shift = ext_csd[EXT_CSD_S_A_TIMEOUT];
+
+               /* Sleep / awake timeout in 100ns units */
+               if (sa_shift > 0 && sa_shift <= 0x17)
+                       card->ext_csd.sa_timeout =
+                                       1 << ext_csd[EXT_CSD_S_A_TIMEOUT];
+       }
+
 out:
        kfree(ext_csd);
 
@@ -408,12 +416,17 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                (host->caps & MMC_CAP_MMC_HIGHSPEED)) {
                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                        EXT_CSD_HS_TIMING, 1);
-               if (err)
+               if (err && err != -EBADMSG)
                        goto free_card;
 
-               mmc_card_set_highspeed(card);
-
-               mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
+               if (err) {
+                       printk(KERN_WARNING "%s: switch to highspeed failed\n",
+                              mmc_hostname(card->host));
+                       err = 0;
+               } else {
+                       mmc_card_set_highspeed(card);
+                       mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
+               }
        }
 
        /*
@@ -448,10 +461,17 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                 EXT_CSD_BUS_WIDTH, ext_csd_bit);
 
-               if (err)
+               if (err && err != -EBADMSG)
                        goto free_card;
 
-               mmc_set_bus_width(card->host, bus_width);
+               if (err) {
+                       printk(KERN_WARNING "%s: switch to bus width %d "
+                              "failed\n", mmc_hostname(card->host),
+                              1 << bus_width);
+                       err = 0;
+               } else {
+                       mmc_set_bus_width(card->host, bus_width);
+               }
        }
 
        if (!oldcard)
@@ -507,12 +527,10 @@ static void mmc_detect(struct mmc_host *host)
        }
 }
 
-#ifdef CONFIG_MMC_UNSAFE_RESUME
-
 /*
  * Suspend callback from host.
  */
-static void mmc_suspend(struct mmc_host *host)
+static int mmc_suspend(struct mmc_host *host)
 {
        BUG_ON(!host);
        BUG_ON(!host->card);
@@ -522,6 +540,8 @@ static void mmc_suspend(struct mmc_host *host)
                mmc_deselect_cards(host);
        host->card->state &= ~MMC_STATE_HIGHSPEED;
        mmc_release_host(host);
+
+       return 0;
 }
 
 /*
@@ -530,7 +550,7 @@ static void mmc_suspend(struct mmc_host *host)
  * This function tries to determine if the same card is still present
  * and, if so, restore all state to it.
  */
-static void mmc_resume(struct mmc_host *host)
+static int mmc_resume(struct mmc_host *host)
 {
        int err;
 
@@ -541,30 +561,99 @@ static void mmc_resume(struct mmc_host *host)
        err = mmc_init_card(host, host->ocr, host->card);
        mmc_release_host(host);
 
-       if (err) {
-               mmc_remove(host);
+       return err;
+}
 
-               mmc_claim_host(host);
-               mmc_detach_bus(host);
-               mmc_release_host(host);
+static void mmc_power_restore(struct mmc_host *host)
+{
+       host->card->state &= ~MMC_STATE_HIGHSPEED;
+       mmc_claim_host(host);
+       mmc_init_card(host, host->ocr, host->card);
+       mmc_release_host(host);
+}
+
+static int mmc_sleep(struct mmc_host *host)
+{
+       struct mmc_card *card = host->card;
+       int err = -ENOSYS;
+
+       if (card && card->ext_csd.rev >= 3) {
+               err = mmc_card_sleepawake(host, 1);
+               if (err < 0)
+                       pr_debug("%s: Error %d while putting card into sleep",
+                                mmc_hostname(host), err);
        }
 
+       return err;
 }
 
-#else
+static int mmc_awake(struct mmc_host *host)
+{
+       struct mmc_card *card = host->card;
+       int err = -ENOSYS;
+
+       if (card && card->ext_csd.rev >= 3) {
+               err = mmc_card_sleepawake(host, 0);
+               if (err < 0)
+                       pr_debug("%s: Error %d while awaking sleeping card",
+                                mmc_hostname(host), err);
+       }
+
+       return err;
+}
 
-#define mmc_suspend NULL
-#define mmc_resume NULL
+#ifdef CONFIG_MMC_UNSAFE_RESUME
 
-#endif
+static const struct mmc_bus_ops mmc_ops = {
+       .awake = mmc_awake,
+       .sleep = mmc_sleep,
+       .remove = mmc_remove,
+       .detect = mmc_detect,
+       .suspend = mmc_suspend,
+       .resume = mmc_resume,
+       .power_restore = mmc_power_restore,
+};
+
+static void mmc_attach_bus_ops(struct mmc_host *host)
+{
+       mmc_attach_bus(host, &mmc_ops);
+}
+
+#else
 
 static const struct mmc_bus_ops mmc_ops = {
+       .awake = mmc_awake,
+       .sleep = mmc_sleep,
+       .remove = mmc_remove,
+       .detect = mmc_detect,
+       .suspend = NULL,
+       .resume = NULL,
+       .power_restore = mmc_power_restore,
+};
+
+static const struct mmc_bus_ops mmc_ops_unsafe = {
+       .awake = mmc_awake,
+       .sleep = mmc_sleep,
        .remove = mmc_remove,
        .detect = mmc_detect,
        .suspend = mmc_suspend,
        .resume = mmc_resume,
+       .power_restore = mmc_power_restore,
 };
 
+static void mmc_attach_bus_ops(struct mmc_host *host)
+{
+       const struct mmc_bus_ops *bus_ops;
+
+       if (host->caps & MMC_CAP_NONREMOVABLE)
+               bus_ops = &mmc_ops_unsafe;
+       else
+               bus_ops = &mmc_ops;
+       mmc_attach_bus(host, bus_ops);
+}
+
+#endif
+
 /*
  * Starting point for MMC card init.
  */
@@ -575,7 +664,7 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
        BUG_ON(!host);
        WARN_ON(!host->claimed);
 
-       mmc_attach_bus(host, &mmc_ops);
+       mmc_attach_bus_ops(host);
 
        /*
         * We need to get OCR a different way for SPI.
index 34ce270..d2cb5c6 100644 (file)
@@ -57,6 +57,42 @@ int mmc_deselect_cards(struct mmc_host *host)
        return _mmc_select_card(host, NULL);
 }
 
+int mmc_card_sleepawake(struct mmc_host *host, int sleep)
+{
+       struct mmc_command cmd;
+       struct mmc_card *card = host->card;
+       int err;
+
+       if (sleep)
+               mmc_deselect_cards(host);
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = MMC_SLEEP_AWAKE;
+       cmd.arg = card->rca << 16;
+       if (sleep)
+               cmd.arg |= 1 << 15;
+
+       cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+       err = mmc_wait_for_cmd(host, &cmd, 0);
+       if (err)
+               return err;
+
+       /*
+        * If the host does not wait while the card signals busy, then we will
+        * will have to wait the sleep/awake timeout.  Note, we cannot use the
+        * SEND_STATUS command to poll the status because that command (and most
+        * others) is invalid while the card sleeps.
+        */
+       if (!(host->caps & MMC_CAP_WAIT_WHILE_BUSY))
+               mmc_delay(DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000));
+
+       if (!sleep)
+               err = mmc_select_card(card);
+
+       return err;
+}
+
 int mmc_go_idle(struct mmc_host *host)
 {
        int err;
@@ -354,6 +390,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
 {
        int err;
        struct mmc_command cmd;
+       u32 status;
 
        BUG_ON(!card);
        BUG_ON(!card->host);
@@ -371,6 +408,28 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
        if (err)
                return err;
 
+       /* Must check status to be sure of no errors */
+       do {
+               err = mmc_send_status(card, &status);
+               if (err)
+                       return err;
+               if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
+                       break;
+               if (mmc_host_is_spi(card->host))
+                       break;
+       } while (R1_CURRENT_STATE(status) == 7);
+
+       if (mmc_host_is_spi(card->host)) {
+               if (status & R1_SPI_ILLEGAL_COMMAND)
+                       return -EBADMSG;
+       } else {
+               if (status & 0xFDFFA000)
+                       printk(KERN_WARNING "%s: unexpected status %#x after "
+                              "switch", mmc_hostname(card->host), status);
+               if (status & R1_SWITCH_ERROR)
+                       return -EBADMSG;
+       }
+
        return 0;
 }
 
index 17854bf..653eb8e 100644 (file)
@@ -25,6 +25,7 @@ int mmc_send_status(struct mmc_card *card, u32 *status);
 int mmc_send_cid(struct mmc_host *host, u32 *cid);
 int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp);
 int mmc_spi_set_crc(struct mmc_host *host, int use_crc);
+int mmc_card_sleepawake(struct mmc_host *host, int sleep);
 
 #endif
 
index 7ad646f..10b2a4d 100644 (file)
@@ -210,11 +210,11 @@ static int mmc_read_switch(struct mmc_card *card)
 
        err = mmc_sd_switch(card, 0, 0, 1, status);
        if (err) {
-               /*
-                * We all hosts that cannot perform the command
-                * to fail more gracefully
-                */
-               if (err != -EINVAL)
+               /* If the host or the card can't do the switch,
+                * fail more gracefully. */
+               if ((err != -EINVAL)
+                && (err != -ENOSYS)
+                && (err != -EFAULT))
                        goto out;
 
                printk(KERN_WARNING "%s: problem reading switch "
@@ -561,12 +561,10 @@ static void mmc_sd_detect(struct mmc_host *host)
        }
 }
 
-#ifdef CONFIG_MMC_UNSAFE_RESUME
-
 /*
  * Suspend callback from host.
  */
-static void mmc_sd_suspend(struct mmc_host *host)
+static int mmc_sd_suspend(struct mmc_host *host)
 {
        BUG_ON(!host);
        BUG_ON(!host->card);
@@ -576,6 +574,8 @@ static void mmc_sd_suspend(struct mmc_host *host)
                mmc_deselect_cards(host);
        host->card->state &= ~MMC_STATE_HIGHSPEED;
        mmc_release_host(host);
+
+       return 0;
 }
 
 /*
@@ -584,7 +584,7 @@ static void mmc_sd_suspend(struct mmc_host *host)
  * This function tries to determine if the same card is still present
  * and, if so, restore all state to it.
  */
-static void mmc_sd_resume(struct mmc_host *host)
+static int mmc_sd_resume(struct mmc_host *host)
 {
        int err;
 
@@ -595,30 +595,63 @@ static void mmc_sd_resume(struct mmc_host *host)
        err = mmc_sd_init_card(host, host->ocr, host->card);
        mmc_release_host(host);
 
-       if (err) {
-               mmc_sd_remove(host);
-
-               mmc_claim_host(host);
-               mmc_detach_bus(host);
-               mmc_release_host(host);
-       }
+       return err;
+}
 
+static void mmc_sd_power_restore(struct mmc_host *host)
+{
+       host->card->state &= ~MMC_STATE_HIGHSPEED;
+       mmc_claim_host(host);
+       mmc_sd_init_card(host, host->ocr, host->card);
+       mmc_release_host(host);
 }
 
-#else
+#ifdef CONFIG_MMC_UNSAFE_RESUME
 
-#define mmc_sd_suspend NULL
-#define mmc_sd_resume NULL
+static const struct mmc_bus_ops mmc_sd_ops = {
+       .remove = mmc_sd_remove,
+       .detect = mmc_sd_detect,
+       .suspend = mmc_sd_suspend,
+       .resume = mmc_sd_resume,
+       .power_restore = mmc_sd_power_restore,
+};
 
-#endif
+static void mmc_sd_attach_bus_ops(struct mmc_host *host)
+{
+       mmc_attach_bus(host, &mmc_sd_ops);
+}
+
+#else
 
 static const struct mmc_bus_ops mmc_sd_ops = {
+       .remove = mmc_sd_remove,
+       .detect = mmc_sd_detect,
+       .suspend = NULL,
+       .resume = NULL,
+       .power_restore = mmc_sd_power_restore,
+};
+
+static const struct mmc_bus_ops mmc_sd_ops_unsafe = {
        .remove = mmc_sd_remove,
        .detect = mmc_sd_detect,
        .suspend = mmc_sd_suspend,
        .resume = mmc_sd_resume,
+       .power_restore = mmc_sd_power_restore,
 };
 
+static void mmc_sd_attach_bus_ops(struct mmc_host *host)
+{
+       const struct mmc_bus_ops *bus_ops;
+
+       if (host->caps & MMC_CAP_NONREMOVABLE)
+               bus_ops = &mmc_sd_ops_unsafe;
+       else
+               bus_ops = &mmc_sd_ops;
+       mmc_attach_bus(host, bus_ops);
+}
+
+#endif
+
 /*
  * Starting point for SD card init.
  */
@@ -629,7 +662,7 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
        BUG_ON(!host);
        WARN_ON(!host->claimed);
 
-       mmc_attach_bus(host, &mmc_sd_ops);
+       mmc_sd_attach_bus_ops(host);
 
        /*
         * We need to get OCR a different way for SPI.
index fb99ccf..cdb845b 100644 (file)
@@ -164,6 +164,29 @@ static int sdio_enable_wide(struct mmc_card *card)
        return 0;
 }
 
+/*
+ * If desired, disconnect the pull-up resistor on CD/DAT[3] (pin 1)
+ * of the card. This may be required on certain setups of boards,
+ * controllers and embedded sdio device which do not need the card's
+ * pull-up. As a result, card detection is disabled and power is saved.
+ */
+static int sdio_disable_cd(struct mmc_card *card)
+{
+       int ret;
+       u8 ctrl;
+
+       if (!card->cccr.disable_cd)
+               return 0;
+
+       ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_IF, 0, &ctrl);
+       if (ret)
+               return ret;
+
+       ctrl |= SDIO_BUS_CD_DISABLE;
+
+       return mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);
+}
+
 /*
  * Test if the card supports high-speed mode and, if so, switch to it.
  */
@@ -194,6 +217,135 @@ static int sdio_enable_hs(struct mmc_card *card)
        return 0;
 }
 
+/*
+ * Handle the detection and initialisation of a card.
+ *
+ * In the case of a resume, "oldcard" will contain the card
+ * we're trying to reinitialise.
+ */
+static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
+                             struct mmc_card *oldcard)
+{
+       struct mmc_card *card;
+       int err;
+
+       BUG_ON(!host);
+       WARN_ON(!host->claimed);
+
+       /*
+        * Inform the card of the voltage
+        */
+       err = mmc_send_io_op_cond(host, host->ocr, &ocr);
+       if (err)
+               goto err;
+
+       /*
+        * For SPI, enable CRC as appropriate.
+        */
+       if (mmc_host_is_spi(host)) {
+               err = mmc_spi_set_crc(host, use_spi_crc);
+               if (err)
+                       goto err;
+       }
+
+       /*
+        * Allocate card structure.
+        */
+       card = mmc_alloc_card(host, NULL);
+       if (IS_ERR(card)) {
+               err = PTR_ERR(card);
+               goto err;
+       }
+
+       card->type = MMC_TYPE_SDIO;
+
+       /*
+        * For native busses:  set card RCA and quit open drain mode.
+        */
+       if (!mmc_host_is_spi(host)) {
+               err = mmc_send_relative_addr(host, &card->rca);
+               if (err)
+                       goto remove;
+
+               mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+       }
+
+       /*
+        * Select card, as all following commands rely on that.
+        */
+       if (!mmc_host_is_spi(host)) {
+               err = mmc_select_card(card);
+               if (err)
+                       goto remove;
+       }
+
+       /*
+        * Read the common registers.
+        */
+       err = sdio_read_cccr(card);
+       if (err)
+               goto remove;
+
+       /*
+        * Read the common CIS tuples.
+        */
+       err = sdio_read_common_cis(card);
+       if (err)
+               goto remove;
+
+       if (oldcard) {
+               int same = (card->cis.vendor == oldcard->cis.vendor &&
+                           card->cis.device == oldcard->cis.device);
+               mmc_remove_card(card);
+               if (!same) {
+                       err = -ENOENT;
+                       goto err;
+               }
+               card = oldcard;
+               return 0;
+       }
+
+       /*
+        * Switch to high-speed (if supported).
+        */
+       err = sdio_enable_hs(card);
+       if (err)
+               goto remove;
+
+       /*
+        * Change to the card's maximum speed.
+        */
+       if (mmc_card_highspeed(card)) {
+               /*
+                * The SDIO specification doesn't mention how
+                * the CIS transfer speed register relates to
+                * high-speed, but it seems that 50 MHz is
+                * mandatory.
+                */
+               mmc_set_clock(host, 50000000);
+       } else {
+               mmc_set_clock(host, card->cis.max_dtr);
+       }
+
+       /*
+        * Switch to wider bus (if supported).
+        */
+       err = sdio_enable_wide(card);
+       if (err)
+               goto remove;
+
+       if (!oldcard)
+               host->card = card;
+       return 0;
+
+remove:
+       if (!oldcard)
+               mmc_remove_card(card);
+
+err:
+       return err;
+}
+
 /*
  * Host is being removed. Free up the current card.
  */
@@ -243,10 +395,77 @@ static void mmc_sdio_detect(struct mmc_host *host)
        }
 }
 
+/*
+ * SDIO suspend.  We need to suspend all functions separately.
+ * Therefore all registered functions must have drivers with suspend
+ * and resume methods.  Failing that we simply remove the whole card.
+ */
+static int mmc_sdio_suspend(struct mmc_host *host)
+{
+       int i, err = 0;
+
+       for (i = 0; i < host->card->sdio_funcs; i++) {
+               struct sdio_func *func = host->card->sdio_func[i];
+               if (func && sdio_func_present(func) && func->dev.driver) {
+                       const struct dev_pm_ops *pmops = func->dev.driver->pm;
+                       if (!pmops || !pmops->suspend || !pmops->resume) {
+                               /* force removal of entire card in that case */
+                               err = -ENOSYS;
+                       } else
+                               err = pmops->suspend(&func->dev);
+                       if (err)
+                               break;
+               }
+       }
+       while (err && --i >= 0) {
+               struct sdio_func *func = host->card->sdio_func[i];
+               if (func && sdio_func_present(func) && func->dev.driver) {
+                       const struct dev_pm_ops *pmops = func->dev.driver->pm;
+                       pmops->resume(&func->dev);
+               }
+       }
+
+       return err;
+}
+
+static int mmc_sdio_resume(struct mmc_host *host)
+{
+       int i, err;
+
+       BUG_ON(!host);
+       BUG_ON(!host->card);
+
+       /* Basic card reinitialization. */
+       mmc_claim_host(host);
+       err = mmc_sdio_init_card(host, host->ocr, host->card);
+       mmc_release_host(host);
+
+       /*
+        * If the card looked to be the same as before suspending, then
+        * we proceed to resume all card functions.  If one of them returns
+        * an error then we simply return that error to the core and the
+        * card will be redetected as new.  It is the responsibility of
+        * the function driver to perform further tests with the extra
+        * knowledge it has of the card to confirm the card is indeed the
+        * same as before suspending (same MAC address for network cards,
+        * etc.) and return an error otherwise.
+        */
+       for (i = 0; !err && i < host->card->sdio_funcs; i++) {
+               struct sdio_func *func = host->card->sdio_func[i];
+               if (func && sdio_func_present(func) && func->dev.driver) {
+                       const struct dev_pm_ops *pmops = func->dev.driver->pm;
+                       err = pmops->resume(&func->dev);
+               }
+       }
+
+       return err;
+}
 
 static const struct mmc_bus_ops mmc_sdio_ops = {
        .remove = mmc_sdio_remove,
        .detect = mmc_sdio_detect,
+       .suspend = mmc_sdio_suspend,
+       .resume = mmc_sdio_resume,
 };
 
 
@@ -275,13 +494,6 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
                ocr &= ~0x7F;
        }
 
-       if (ocr & MMC_VDD_165_195) {
-               printk(KERN_WARNING "%s: SDIO card claims to support the "
-                      "incompletely defined 'low voltage range'. This "
-                      "will be ignored.\n", mmc_hostname(host));
-               ocr &= ~MMC_VDD_165_195;
-       }
-
        host->ocr = mmc_select_voltage(host, ocr);
 
        /*
@@ -293,101 +505,23 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
        }
 
        /*
-        * Inform the card of the voltage
+        * Detect and init the card.
         */
-       err = mmc_send_io_op_cond(host, host->ocr, &ocr);
+       err = mmc_sdio_init_card(host, host->ocr, NULL);
        if (err)
                goto err;
-
-       /*
-        * For SPI, enable CRC as appropriate.
-        */
-       if (mmc_host_is_spi(host)) {
-               err = mmc_spi_set_crc(host, use_spi_crc);
-               if (err)
-                       goto err;
-       }
+       card = host->card;
 
        /*
         * The number of functions on the card is encoded inside
         * the ocr.
         */
-       funcs = (ocr & 0x70000000) >> 28;
-
-       /*
-        * Allocate card structure.
-        */
-       card = mmc_alloc_card(host, NULL);
-       if (IS_ERR(card)) {
-               err = PTR_ERR(card);
-               goto err;
-       }
-
-       card->type = MMC_TYPE_SDIO;
-       card->sdio_funcs = funcs;
-
-       host->card = card;
-
-       /*
-        * For native busses:  set card RCA and quit open drain mode.
-        */
-       if (!mmc_host_is_spi(host)) {
-               err = mmc_send_relative_addr(host, &card->rca);
-               if (err)
-                       goto remove;
-
-               mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
-       }
-
-       /*
-        * Select card, as all following commands rely on that.
-        */
-       if (!mmc_host_is_spi(host)) {
-               err = mmc_select_card(card);
-               if (err)
-                       goto remove;
-       }
+       card->sdio_funcs = funcs = (ocr & 0x70000000) >> 28;
 
        /*
-        * Read the common registers.
+        * If needed, disconnect card detection pull-up resistor.
         */
-       err = sdio_read_cccr(card);
-       if (err)
-               goto remove;
-
-       /*
-        * Read the common CIS tuples.
-        */
-       err = sdio_read_common_cis(card);
-       if (err)
-               goto remove;
-
-       /*
-        * Switch to high-speed (if supported).
-        */
-       err = sdio_enable_hs(card);
-       if (err)
-               goto remove;
-
-       /*
-        * Change to the card's maximum speed.
-        */
-       if (mmc_card_highspeed(card)) {
-               /*
-                * The SDIO specification doesn't mention how
-                * the CIS transfer speed register relates to
-                * high-speed, but it seems that 50 MHz is
-                * mandatory.
-                */
-               mmc_set_clock(host, 50000000);
-       } else {
-               mmc_set_clock(host, card->cis.max_dtr);
-       }
-
-       /*
-        * Switch to wider bus (if supported).
-        */
-       err = sdio_enable_wide(card);
+       err = sdio_disable_cd(card);
        if (err)
                goto remove;
 
index 46284b5..d37464e 100644 (file)
@@ -20,9 +20,6 @@
 #include "sdio_cis.h"
 #include "sdio_bus.h"
 
-#define dev_to_sdio_func(d)    container_of(d, struct sdio_func, dev)
-#define to_sdio_driver(d)      container_of(d, struct sdio_driver, drv)
-
 /* show configuration fields */
 #define sdio_config_attr(field, format_string)                         \
 static ssize_t                                                         \
index 963f293..6636354 100644 (file)
@@ -40,7 +40,7 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
                        nr_strings++;
        }
 
-       if (buf[i-1] != '\0') {
+       if (nr_strings < 4) {
                printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
                return 0;
        }
index f61fc2d..f9aa8a7 100644 (file)
@@ -624,7 +624,7 @@ void sdio_f0_writeb(struct sdio_func *func, unsigned char b, unsigned int addr,
 
        BUG_ON(!func);
 
-       if (addr < 0xF0 || addr > 0xFF) {
+       if ((addr < 0xF0 || addr > 0xFF) && (!mmc_card_lenient_fn0(func->card))) {
                if (err_ret)
                        *err_ret = -EINVAL;
                return;
index 891ef18..7cb057f 100644 (file)
@@ -132,11 +132,11 @@ config MMC_OMAP
 
 config MMC_OMAP_HS
        tristate "TI OMAP High Speed Multimedia Card Interface support"
-       depends on ARCH_OMAP2430 || ARCH_OMAP3
+       depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
        help
          This selects the TI OMAP High Speed Multimedia card Interface.
-         If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot,
-         say Y or M here.
+         If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
+         Multimedia Card slot, say Y or M here.
 
          If unsure, say N.
 
@@ -160,6 +160,12 @@ config MMC_AU1X
 
          If unsure, say N.
 
+choice
+       prompt "Atmel SD/MMC Driver"
+       default MMC_ATMELMCI if AVR32
+       help
+         Choose which driver to use for the Atmel MCI Silicon
+
 config MMC_AT91
        tristate "AT91 SD/MMC Card Interface support"
        depends on ARCH_AT91
@@ -170,17 +176,19 @@ config MMC_AT91
 
 config MMC_ATMELMCI
        tristate "Atmel Multimedia Card Interface support"
-       depends on AVR32
+       depends on AVR32 || ARCH_AT91
        help
          This selects the Atmel Multimedia Card Interface driver. If
-         you have an AT32 (AVR32) platform with a Multimedia Card
-         slot, say Y or M here.
+         you have an AT32 (AVR32) or AT91 platform with a Multimedia
+         Card slot, say Y or M here.
 
          If unsure, say N.
 
+endchoice
+
 config MMC_ATMELMCI_DMA
        bool "Atmel MCI DMA support (EXPERIMENTAL)"
-       depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL
+       depends on MMC_ATMELMCI && AVR32 && DMA_ENGINE && EXPERIMENTAL
        help
          Say Y here to have the Atmel MCI driver use a DMA engine to
          do data transfers and thus increase the throughput and
@@ -199,6 +207,13 @@ config MMC_IMX
 
          If unsure, say N.
 
+config MMC_MSM7X00A
+       tristate "Qualcomm MSM 7X00A SDCC Controller Support"
+       depends on MMC && ARCH_MSM
+       help
+         This provides support for the SD/MMC cell found in the
+          MSM 7X00A controllers from Qualcomm.
+
 config MMC_MXC
        tristate "Freescale i.MX2/3 Multimedia Card Interface support"
        depends on ARCH_MXC
index cf153f6..abcb040 100644 (file)
@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_OMAP_HS)     += omap_hsmmc.o
 obj-$(CONFIG_MMC_AT91)         += at91_mci.o
 obj-$(CONFIG_MMC_ATMELMCI)     += atmel-mci.o
 obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o
+obj-$(CONFIG_MMC_MSM7X00A)     += msm_sdcc.o
 obj-$(CONFIG_MMC_MVSDIO)       += mvsdio.o
 obj-$(CONFIG_MMC_SPI)          += mmc_spi.o
 ifeq ($(CONFIG_OF),y)
index 7b603e4..065fa81 100644 (file)
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 
+#include <mach/cpu.h>
 #include <mach/board.h>
 
 #include "atmel-mci-regs.h"
@@ -209,6 +210,18 @@ struct atmel_mci_slot {
 #define atmci_set_pending(host, event)                         \
        set_bit(event, &host->pending_events)
 
+/*
+ * Enable or disable features/registers based on
+ * whether the processor supports them
+ */
+static bool mci_has_rwproof(void)
+{
+       if (cpu_is_at91sam9261() || cpu_is_at91rm9200())
+               return false;
+       else
+               return true;
+}
+
 /*
  * The debugfs stuff below is mostly optimized away when
  * CONFIG_DEBUG_FS is not set.
@@ -276,8 +289,13 @@ static void atmci_show_status_reg(struct seq_file *s,
                [3]     = "BLKE",
                [4]     = "DTIP",
                [5]     = "NOTBUSY",
+               [6]     = "ENDRX",
+               [7]     = "ENDTX",
                [8]     = "SDIOIRQA",
                [9]     = "SDIOIRQB",
+               [12]    = "SDIOWAIT",
+               [14]    = "RXBUFF",
+               [15]    = "TXBUFE",
                [16]    = "RINDE",
                [17]    = "RDIRE",
                [18]    = "RCRCE",
@@ -285,6 +303,11 @@ static void atmci_show_status_reg(struct seq_file *s,
                [20]    = "RTOE",
                [21]    = "DCRCE",
                [22]    = "DTOE",
+               [23]    = "CSTOE",
+               [24]    = "BLKOVRE",
+               [25]    = "DMADONE",
+               [26]    = "FIFOEMPTY",
+               [27]    = "XFRDONE",
                [30]    = "OVRE",
                [31]    = "UNRE",
        };
@@ -849,13 +872,15 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                        clkdiv = 255;
                }
 
+               host->mode_reg = MCI_MR_CLKDIV(clkdiv);
+
                /*
                 * WRPROOF and RDPROOF prevent overruns/underruns by
                 * stopping the clock when the FIFO is full/empty.
                 * This state is not expected to last for long.
                 */
-               host->mode_reg = MCI_MR_CLKDIV(clkdiv) | MCI_MR_WRPROOF
-                                       | MCI_MR_RDPROOF;
+               if (mci_has_rwproof())
+                       host->mode_reg |= (MCI_MR_WRPROOF | MCI_MR_RDPROOF);
 
                if (list_empty(&host->queue))
                        mci_writel(host, MR, host->mode_reg);
@@ -1648,8 +1673,10 @@ static int __init atmci_probe(struct platform_device *pdev)
                        nr_slots++;
        }
 
-       if (!nr_slots)
+       if (!nr_slots) {
+               dev_err(&pdev->dev, "init failed: no slot defined\n");
                goto err_init_slot;
+       }
 
        dev_info(&pdev->dev,
                        "Atmel MCI controller at 0x%08lx irq %d, %u slots\n",
index a461017..d55fe4f 100644 (file)
@@ -1562,3 +1562,4 @@ MODULE_AUTHOR("Mike Lavender, David Brownell, "
                "Hans-Peter Nilsson, Jan Nikitenko");
 MODULE_DESCRIPTION("SPI SD/MMC host driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:mmc_spi");
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
new file mode 100644 (file)
index 0000000..dba4600
--- /dev/null
@@ -0,0 +1,1287 @@
+/*
+ *  linux/drivers/mmc/host/msm_sdcc.c - Qualcomm MSM 7X00A SDCC Driver
+ *
+ *  Copyright (C) 2007 Google Inc,
+ *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Based on mmci.c
+ *
+ * Author: San Mehat (san@android.com)
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/highmem.h>
+#include <linux/log2.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/clk.h>
+#include <linux/scatterlist.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/debugfs.h>
+#include <linux/io.h>
+#include <linux/memory.h>
+
+#include <asm/cacheflush.h>
+#include <asm/div64.h>
+#include <asm/sizes.h>
+
+#include <asm/mach/mmc.h>
+#include <mach/msm_iomap.h>
+#include <mach/dma.h>
+#include <mach/htc_pwrsink.h>
+
+#include "msm_sdcc.h"
+
+#define DRIVER_NAME "msm-sdcc"
+
+static unsigned int msmsdcc_fmin = 144000;
+static unsigned int msmsdcc_fmax = 50000000;
+static unsigned int msmsdcc_4bit = 1;
+static unsigned int msmsdcc_pwrsave = 1;
+static unsigned int msmsdcc_piopoll = 1;
+static unsigned int msmsdcc_sdioirq;
+
+#define PIO_SPINMAX 30
+#define CMD_SPINMAX 20
+
+static void
+msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd,
+                     u32 c);
+
+static void
+msmsdcc_request_end(struct msmsdcc_host *host, struct mmc_request *mrq)
+{
+       writel(0, host->base + MMCICOMMAND);
+
+       BUG_ON(host->curr.data);
+
+       host->curr.mrq = NULL;
+       host->curr.cmd = NULL;
+
+       if (mrq->data)
+               mrq->data->bytes_xfered = host->curr.data_xfered;
+       if (mrq->cmd->error == -ETIMEDOUT)
+               mdelay(5);
+
+       /*
+        * Need to drop the host lock here; mmc_request_done may call
+        * back into the driver...
+        */
+       spin_unlock(&host->lock);
+       mmc_request_done(host->mmc, mrq);
+       spin_lock(&host->lock);
+}
+
+static void
+msmsdcc_stop_data(struct msmsdcc_host *host)
+{
+       writel(0, host->base + MMCIDATACTRL);
+       host->curr.data = NULL;
+       host->curr.got_dataend = host->curr.got_datablkend = 0;
+}
+
+uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host)
+{
+       switch (host->pdev_id) {
+       case 1:
+               return MSM_SDC1_PHYS + MMCIFIFO;
+       case 2:
+               return MSM_SDC2_PHYS + MMCIFIFO;
+       case 3:
+               return MSM_SDC3_PHYS + MMCIFIFO;
+       case 4:
+               return MSM_SDC4_PHYS + MMCIFIFO;
+       }
+       BUG();
+       return 0;
+}
+
+static void
+msmsdcc_dma_complete_func(struct msm_dmov_cmd *cmd,
+                         unsigned int result,
+                         struct msm_dmov_errdata *err)
+{
+       struct msmsdcc_dma_data *dma_data =
+               container_of(cmd, struct msmsdcc_dma_data, hdr);
+       struct msmsdcc_host     *host = dma_data->host;
+       unsigned long           flags;
+       struct mmc_request      *mrq;
+
+       spin_lock_irqsave(&host->lock, flags);
+       mrq = host->curr.mrq;
+       BUG_ON(!mrq);
+
+       if (!(result & DMOV_RSLT_VALID)) {
+               pr_err("msmsdcc: Invalid DataMover result\n");
+               goto out;
+       }
+
+       if (result & DMOV_RSLT_DONE) {
+               host->curr.data_xfered = host->curr.xfer_size;
+       } else {
+               /* Error or flush  */
+               if (result & DMOV_RSLT_ERROR)
+                       pr_err("%s: DMA error (0x%.8x)\n",
+                              mmc_hostname(host->mmc), result);
+               if (result & DMOV_RSLT_FLUSH)
+                       pr_err("%s: DMA channel flushed (0x%.8x)\n",
+                              mmc_hostname(host->mmc), result);
+               if (err)
+                       pr_err("Flush data: %.8x %.8x %.8x %.8x %.8x %.8x\n",
+                              err->flush[0], err->flush[1], err->flush[2],
+                              err->flush[3], err->flush[4], err->flush[5]);
+               if (!mrq->data->error)
+                       mrq->data->error = -EIO;
+       }
+       host->dma.busy = 0;
+       dma_unmap_sg(mmc_dev(host->mmc), host->dma.sg, host->dma.num_ents,
+                    host->dma.dir);
+
+       if (host->curr.user_pages) {
+               struct scatterlist *sg = host->dma.sg;
+               int i;
+
+               for (i = 0; i < host->dma.num_ents; i++)
+                       flush_dcache_page(sg_page(sg++));
+       }
+
+       host->dma.sg = NULL;
+
+       if ((host->curr.got_dataend && host->curr.got_datablkend)
+            || mrq->data->error) {
+
+               /*
+                * If we've already gotten our DATAEND / DATABLKEND
+                * for this request, then complete it through here.
+                */
+               msmsdcc_stop_data(host);
+
+               if (!mrq->data->error)
+                       host->curr.data_xfered = host->curr.xfer_size;
+               if (!mrq->data->stop || mrq->cmd->error) {
+                       writel(0, host->base + MMCICOMMAND);
+                       host->curr.mrq = NULL;
+                       host->curr.cmd = NULL;
+                       mrq->data->bytes_xfered = host->curr.data_xfered;
+
+                       spin_unlock_irqrestore(&host->lock, flags);
+                       mmc_request_done(host->mmc, mrq);
+                       return;
+               } else
+                       msmsdcc_start_command(host, mrq->data->stop, 0);
+       }
+
+out:
+       spin_unlock_irqrestore(&host->lock, flags);
+       return;
+}
+
+static int validate_dma(struct msmsdcc_host *host, struct mmc_data *data)
+{
+       if (host->dma.channel == -1)
+               return -ENOENT;
+
+       if ((data->blksz * data->blocks) < MCI_FIFOSIZE)
+               return -EINVAL;
+       if ((data->blksz * data->blocks) % MCI_FIFOSIZE)
+               return -EINVAL;
+       return 0;
+}
+
+static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
+{
+       struct msmsdcc_nc_dmadata *nc;
+       dmov_box *box;
+       uint32_t rows;
+       uint32_t crci;
+       unsigned int n;
+       int i, rc;
+       struct scatterlist *sg = data->sg;
+
+       rc = validate_dma(host, data);
+       if (rc)
+               return rc;
+
+       host->dma.sg = data->sg;
+       host->dma.num_ents = data->sg_len;
+
+       nc = host->dma.nc;
+
+       switch (host->pdev_id) {
+       case 1:
+               crci = MSMSDCC_CRCI_SDC1;
+               break;
+       case 2:
+               crci = MSMSDCC_CRCI_SDC2;
+               break;
+       case 3:
+               crci = MSMSDCC_CRCI_SDC3;
+               break;
+       case 4:
+               crci = MSMSDCC_CRCI_SDC4;
+               break;
+       default:
+               host->dma.sg = NULL;
+               host->dma.num_ents = 0;
+               return -ENOENT;
+       }
+
+       if (data->flags & MMC_DATA_READ)
+               host->dma.dir = DMA_FROM_DEVICE;
+       else
+               host->dma.dir = DMA_TO_DEVICE;
+
+       host->curr.user_pages = 0;
+
+       n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
+                      host->dma.num_ents, host->dma.dir);
+
+       if (n != host->dma.num_ents) {
+               pr_err("%s: Unable to map in all sg elements\n",
+                      mmc_hostname(host->mmc));
+               host->dma.sg = NULL;
+               host->dma.num_ents = 0;
+               return -ENOMEM;
+       }
+
+       box = &nc->cmd[0];
+       for (i = 0; i < host->dma.num_ents; i++) {
+               box->cmd = CMD_MODE_BOX;
+
+               if (i == (host->dma.num_ents - 1))
+                       box->cmd |= CMD_LC;
+               rows = (sg_dma_len(sg) % MCI_FIFOSIZE) ?
+                       (sg_dma_len(sg) / MCI_FIFOSIZE) + 1 :
+                       (sg_dma_len(sg) / MCI_FIFOSIZE) ;
+
+               if (data->flags & MMC_DATA_READ) {
+                       box->src_row_addr = msmsdcc_fifo_addr(host);
+                       box->dst_row_addr = sg_dma_address(sg);
+
+                       box->src_dst_len = (MCI_FIFOSIZE << 16) |
+                                          (MCI_FIFOSIZE);
+                       box->row_offset = MCI_FIFOSIZE;
+
+                       box->num_rows = rows * ((1 << 16) + 1);
+                       box->cmd |= CMD_SRC_CRCI(crci);
+               } else {
+                       box->src_row_addr = sg_dma_address(sg);
+                       box->dst_row_addr = msmsdcc_fifo_addr(host);
+
+                       box->src_dst_len = (MCI_FIFOSIZE << 16) |
+                                          (MCI_FIFOSIZE);
+                       box->row_offset = (MCI_FIFOSIZE << 16);
+
+                       box->num_rows = rows * ((1 << 16) + 1);
+                       box->cmd |= CMD_DST_CRCI(crci);
+               }
+               box++;
+               sg++;
+       }
+
+       /* location of command block must be 64 bit aligned */
+       BUG_ON(host->dma.cmd_busaddr & 0x07);
+
+       nc->cmdptr = (host->dma.cmd_busaddr >> 3) | CMD_PTR_LP;
+       host->dma.hdr.cmdptr = DMOV_CMD_PTR_LIST |
+                              DMOV_CMD_ADDR(host->dma.cmdptr_busaddr);
+       host->dma.hdr.complete_func = msmsdcc_dma_complete_func;
+
+       return 0;
+}
+
+static void
+msmsdcc_start_data(struct msmsdcc_host *host, struct mmc_data *data)
+{
+       unsigned int datactrl, timeout;
+       unsigned long long clks;
+       void __iomem *base = host->base;
+       unsigned int pio_irqmask = 0;
+
+       host->curr.data = data;
+       host->curr.xfer_size = data->blksz * data->blocks;
+       host->curr.xfer_remain = host->curr.xfer_size;
+       host->curr.data_xfered = 0;
+       host->curr.got_dataend = 0;
+       host->curr.got_datablkend = 0;
+
+       memset(&host->pio, 0, sizeof(host->pio));
+
+       clks = (unsigned long long)data->timeout_ns * host->clk_rate;
+       do_div(clks, NSEC_PER_SEC);
+       timeout = data->timeout_clks + (unsigned int)clks;
+       writel(timeout, base + MMCIDATATIMER);
+
+       writel(host->curr.xfer_size, base + MMCIDATALENGTH);
+
+       datactrl = MCI_DPSM_ENABLE | (data->blksz << 4);
+
+       if (!msmsdcc_config_dma(host, data))
+               datactrl |= MCI_DPSM_DMAENABLE;
+       else {
+               host->pio.sg = data->sg;
+               host->pio.sg_len = data->sg_len;
+               host->pio.sg_off = 0;
+
+               if (data->flags & MMC_DATA_READ) {
+                       pio_irqmask = MCI_RXFIFOHALFFULLMASK;
+                       if (host->curr.xfer_remain < MCI_FIFOSIZE)
+                               pio_irqmask |= MCI_RXDATAAVLBLMASK;
+               } else
+                       pio_irqmask = MCI_TXFIFOHALFEMPTYMASK;
+       }
+
+       if (data->flags & MMC_DATA_READ)
+               datactrl |= MCI_DPSM_DIRECTION;
+
+       writel(pio_irqmask, base + MMCIMASK1);
+       writel(datactrl, base + MMCIDATACTRL);
+
+       if (datactrl & MCI_DPSM_DMAENABLE) {
+               host->dma.busy = 1;
+               msm_dmov_enqueue_cmd(host->dma.channel, &host->dma.hdr);
+       }
+}
+
+static void
+msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd, u32 c)
+{
+       void __iomem *base = host->base;
+
+       if (readl(base + MMCICOMMAND) & MCI_CPSM_ENABLE) {
+               writel(0, base + MMCICOMMAND);
+               udelay(2 + ((5 * 1000000) / host->clk_rate));
+       }
+
+       c |= cmd->opcode | MCI_CPSM_ENABLE;
+
+       if (cmd->flags & MMC_RSP_PRESENT) {
+               if (cmd->flags & MMC_RSP_136)
+                       c |= MCI_CPSM_LONGRSP;
+               c |= MCI_CPSM_RESPONSE;
+       }
+
+       if (cmd->opcode == 17 || cmd->opcode == 18 ||
+           cmd->opcode == 24 || cmd->opcode == 25 ||
+           cmd->opcode == 53)
+               c |= MCI_CSPM_DATCMD;
+
+       if (cmd == cmd->mrq->stop)
+               c |= MCI_CSPM_MCIABORT;
+
+       host->curr.cmd = cmd;
+
+       host->stats.cmds++;
+
+       writel(cmd->arg, base + MMCIARGUMENT);
+       writel(c, base + MMCICOMMAND);
+}
+
+static void
+msmsdcc_data_err(struct msmsdcc_host *host, struct mmc_data *data,
+                unsigned int status)
+{
+       if (status & MCI_DATACRCFAIL) {
+               pr_err("%s: Data CRC error\n", mmc_hostname(host->mmc));
+               pr_err("%s: opcode 0x%.8x\n", __func__,
+                      data->mrq->cmd->opcode);
+               pr_err("%s: blksz %d, blocks %d\n", __func__,
+                      data->blksz, data->blocks);
+               data->error = -EILSEQ;
+       } else if (status & MCI_DATATIMEOUT) {
+               pr_err("%s: Data timeout\n", mmc_hostname(host->mmc));
+               data->error = -ETIMEDOUT;
+       } else if (status & MCI_RXOVERRUN) {
+               pr_err("%s: RX overrun\n", mmc_hostname(host->mmc));
+               data->error = -EIO;
+       } else if (status & MCI_TXUNDERRUN) {
+               pr_err("%s: TX underrun\n", mmc_hostname(host->mmc));
+               data->error = -EIO;
+       } else {
+               pr_err("%s: Unknown error (0x%.8x)\n",
+                      mmc_hostname(host->mmc), status);
+               data->error = -EIO;
+       }
+}
+
+
+static int
+msmsdcc_pio_read(struct msmsdcc_host *host, char *buffer, unsigned int remain)
+{
+       void __iomem    *base = host->base;
+       uint32_t        *ptr = (uint32_t *) buffer;
+       int             count = 0;
+
+       while (readl(base + MMCISTATUS) & MCI_RXDATAAVLBL) {
+
+               *ptr = readl(base + MMCIFIFO + (count % MCI_FIFOSIZE));
+               ptr++;
+               count += sizeof(uint32_t);
+
+               remain -=  sizeof(uint32_t);
+               if (remain == 0)
+                       break;
+       }
+       return count;
+}
+
+static int
+msmsdcc_pio_write(struct msmsdcc_host *host, char *buffer,
+                 unsigned int remain, u32 status)
+{
+       void __iomem *base = host->base;
+       char *ptr = buffer;
+
+       do {
+               unsigned int count, maxcnt;
+
+               maxcnt = status & MCI_TXFIFOEMPTY ? MCI_FIFOSIZE :
+                                                   MCI_FIFOHALFSIZE;
+               count = min(remain, maxcnt);
+
+               writesl(base + MMCIFIFO, ptr, count >> 2);
+               ptr += count;
+               remain -= count;
+
+               if (remain == 0)
+                       break;
+
+               status = readl(base + MMCISTATUS);
+       } while (status & MCI_TXFIFOHALFEMPTY);
+
+       return ptr - buffer;
+}
+
+static int
+msmsdcc_spin_on_status(struct msmsdcc_host *host, uint32_t mask, int maxspin)
+{
+       while (maxspin) {
+               if ((readl(host->base + MMCISTATUS) & mask))
+                       return 0;
+               udelay(1);
+               --maxspin;
+       }
+       return -ETIMEDOUT;
+}
+
+static int
+msmsdcc_pio_irq(int irq, void *dev_id)
+{
+       struct msmsdcc_host     *host = dev_id;
+       void __iomem            *base = host->base;
+       uint32_t                status;
+
+       status = readl(base + MMCISTATUS);
+
+       do {
+               unsigned long flags;
+               unsigned int remain, len;
+               char *buffer;
+
+               if (!(status & (MCI_TXFIFOHALFEMPTY | MCI_RXDATAAVLBL))) {
+                       if (host->curr.xfer_remain == 0 || !msmsdcc_piopoll)
+                               break;
+
+                       if (msmsdcc_spin_on_status(host,
+                                                  (MCI_TXFIFOHALFEMPTY |
+                                                  MCI_RXDATAAVLBL),
+                                                  PIO_SPINMAX)) {
+                               break;
+                       }
+               }
+
+               /* Map the current scatter buffer */
+               local_irq_save(flags);
+               buffer = kmap_atomic(sg_page(host->pio.sg),
+                                    KM_BIO_SRC_IRQ) + host->pio.sg->offset;
+               buffer += host->pio.sg_off;
+               remain = host->pio.sg->length - host->pio.sg_off;
+               len = 0;
+               if (status & MCI_RXACTIVE)
+                       len = msmsdcc_pio_read(host, buffer, remain);
+               if (status & MCI_TXACTIVE)
+                       len = msmsdcc_pio_write(host, buffer, remain, status);
+
+               /* Unmap the buffer */
+               kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
+               local_irq_restore(flags);
+
+               host->pio.sg_off += len;
+               host->curr.xfer_remain -= len;
+               host->curr.data_xfered += len;
+               remain -= len;
+
+               if (remain == 0) {
+                       /* This sg page is full - do some housekeeping */
+                       if (status & MCI_RXACTIVE && host->curr.user_pages)
+                               flush_dcache_page(sg_page(host->pio.sg));
+
+                       if (!--host->pio.sg_len) {
+                               memset(&host->pio, 0, sizeof(host->pio));
+                               break;
+                       }
+
+                       /* Advance to next sg */
+                       host->pio.sg++;
+                       host->pio.sg_off = 0;
+               }
+
+               status = readl(base + MMCISTATUS);
+       } while (1);
+
+       if (status & MCI_RXACTIVE && host->curr.xfer_remain < MCI_FIFOSIZE)
+               writel(MCI_RXDATAAVLBLMASK, base + MMCIMASK1);
+
+       if (!host->curr.xfer_remain)
+               writel(0, base + MMCIMASK1);
+
+       return IRQ_HANDLED;
+}
+
+static void msmsdcc_do_cmdirq(struct msmsdcc_host *host, uint32_t status)
+{
+       struct mmc_command *cmd = host->curr.cmd;
+       void __iomem       *base = host->base;
+
+       host->curr.cmd = NULL;
+       cmd->resp[0] = readl(base + MMCIRESPONSE0);
+       cmd->resp[1] = readl(base + MMCIRESPONSE1);
+       cmd->resp[2] = readl(base + MMCIRESPONSE2);
+       cmd->resp[3] = readl(base + MMCIRESPONSE3);
+
+       del_timer(&host->command_timer);
+       if (status & MCI_CMDTIMEOUT) {
+               cmd->error = -ETIMEDOUT;
+       } else if (status & MCI_CMDCRCFAIL &&
+                  cmd->flags & MMC_RSP_CRC) {
+               pr_err("%s: Command CRC error\n", mmc_hostname(host->mmc));
+               cmd->error = -EILSEQ;
+       }
+
+       if (!cmd->data || cmd->error) {
+               if (host->curr.data && host->dma.sg)
+                       msm_dmov_stop_cmd(host->dma.channel,
+                                         &host->dma.hdr, 0);
+               else if (host->curr.data) { /* Non DMA */
+                       msmsdcc_stop_data(host);
+                       msmsdcc_request_end(host, cmd->mrq);
+               } else /* host->data == NULL */
+                       msmsdcc_request_end(host, cmd->mrq);
+       } else if (!(cmd->data->flags & MMC_DATA_READ))
+               msmsdcc_start_data(host, cmd->data);
+}
+
+static void
+msmsdcc_handle_irq_data(struct msmsdcc_host *host, u32 status,
+                       void __iomem *base)
+{
+       struct mmc_data *data = host->curr.data;
+
+       if (!data)
+               return;
+
+       /* Check for data errors */
+       if (status & (MCI_DATACRCFAIL | MCI_DATATIMEOUT |
+                     MCI_TXUNDERRUN | MCI_RXOVERRUN)) {
+               msmsdcc_data_err(host, data, status);
+               host->curr.data_xfered = 0;
+               if (host->dma.sg)
+                       msm_dmov_stop_cmd(host->dma.channel,
+                                         &host->dma.hdr, 0);
+               else {
+                       msmsdcc_stop_data(host);
+                       if (!data->stop)
+                               msmsdcc_request_end(host, data->mrq);
+                       else
+                               msmsdcc_start_command(host, data->stop, 0);
+               }
+       }
+
+       /* Check for data done */
+       if (!host->curr.got_dataend && (status & MCI_DATAEND))
+               host->curr.got_dataend = 1;
+
+       if (!host->curr.got_datablkend && (status & MCI_DATABLOCKEND))
+               host->curr.got_datablkend = 1;
+
+       /*
+        * If DMA is still in progress, we complete via the completion handler
+        */
+       if (host->curr.got_dataend && host->curr.got_datablkend &&
+           !host->dma.busy) {
+               /*
+                * There appears to be an issue in the controller where
+                * if you request a small block transfer (< fifo size),
+                * you may get your DATAEND/DATABLKEND irq without the
+                * PIO data irq.
+                *
+                * Check to see if there is still data to be read,
+                * and simulate a PIO irq.
+                */
+               if (readl(base + MMCISTATUS) & MCI_RXDATAAVLBL)
+                       msmsdcc_pio_irq(1, host);
+
+               msmsdcc_stop_data(host);
+               if (!data->error)
+                       host->curr.data_xfered = host->curr.xfer_size;
+
+               if (!data->stop)
+                       msmsdcc_request_end(host, data->mrq);
+               else
+                       msmsdcc_start_command(host, data->stop, 0);
+       }
+}
+
+static irqreturn_t
+msmsdcc_irq(int irq, void *dev_id)
+{
+       struct msmsdcc_host     *host = dev_id;
+       void __iomem            *base = host->base;
+       u32                     status;
+       int                     ret = 0;
+       int                     cardint = 0;
+
+       spin_lock(&host->lock);
+
+       do {
+               status = readl(base + MMCISTATUS);
+
+               status &= (readl(base + MMCIMASK0) | MCI_DATABLOCKENDMASK);
+               writel(status, base + MMCICLEAR);
+
+               msmsdcc_handle_irq_data(host, status, base);
+
+               if (status & (MCI_CMDSENT | MCI_CMDRESPEND | MCI_CMDCRCFAIL |
+                             MCI_CMDTIMEOUT) && host->curr.cmd) {
+                       msmsdcc_do_cmdirq(host, status);
+               }
+
+               if (status & MCI_SDIOINTOPER) {
+                       cardint = 1;
+                       status &= ~MCI_SDIOINTOPER;
+               }
+               ret = 1;
+       } while (status);
+
+       spin_unlock(&host->lock);
+
+       /*
+        * We have to delay handling the card interrupt as it calls
+        * back into the driver.
+        */
+       if (cardint)
+               mmc_signal_sdio_irq(host->mmc);
+
+       return IRQ_RETVAL(ret);
+}
+
+static void
+msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
+{
+       struct msmsdcc_host *host = mmc_priv(mmc);
+       unsigned long flags;
+
+       WARN_ON(host->curr.mrq != NULL);
+       WARN_ON(host->pwr == 0);
+
+       spin_lock_irqsave(&host->lock, flags);
+
+       host->stats.reqs++;
+
+       if (host->eject) {
+               if (mrq->data && !(mrq->data->flags & MMC_DATA_READ)) {
+                       mrq->cmd->error = 0;
+                       mrq->data->bytes_xfered = mrq->data->blksz *
+                                                 mrq->data->blocks;
+               } else
+                       mrq->cmd->error = -ENOMEDIUM;
+
+               spin_unlock_irqrestore(&host->lock, flags);
+               mmc_request_done(mmc, mrq);
+               return;
+       }
+
+       host->curr.mrq = mrq;
+
+       if (mrq->data && mrq->data->flags & MMC_DATA_READ)
+               msmsdcc_start_data(host, mrq->data);
+
+       msmsdcc_start_command(host, mrq->cmd, 0);
+
+       if (host->cmdpoll && !msmsdcc_spin_on_status(host,
+                               MCI_CMDRESPEND|MCI_CMDCRCFAIL|MCI_CMDTIMEOUT,
+                               CMD_SPINMAX)) {
+               uint32_t status = readl(host->base + MMCISTATUS);
+               msmsdcc_do_cmdirq(host, status);
+               writel(MCI_CMDRESPEND | MCI_CMDCRCFAIL | MCI_CMDTIMEOUT,
+                      host->base + MMCICLEAR);
+               host->stats.cmdpoll_hits++;
+       } else {
+               host->stats.cmdpoll_misses++;
+               mod_timer(&host->command_timer, jiffies + HZ);
+       }
+       spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static void
+msmsdcc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+       struct msmsdcc_host *host = mmc_priv(mmc);
+       u32 clk = 0, pwr = 0;
+       int rc;
+
+       if (ios->clock) {
+
+               if (!host->clks_on) {
+                       clk_enable(host->pclk);
+                       clk_enable(host->clk);
+                       host->clks_on = 1;
+               }
+               if (ios->clock != host->clk_rate) {
+                       rc = clk_set_rate(host->clk, ios->clock);
+                       if (rc < 0)
+                               pr_err("%s: Error setting clock rate (%d)\n",
+                                      mmc_hostname(host->mmc), rc);
+                       else
+                               host->clk_rate = ios->clock;
+               }
+               clk |= MCI_CLK_ENABLE;
+       }
+
+       if (ios->bus_width == MMC_BUS_WIDTH_4)
+               clk |= (2 << 10); /* Set WIDEBUS */
+
+       if (ios->clock > 400000 && msmsdcc_pwrsave)
+               clk |= (1 << 9); /* PWRSAVE */
+
+       clk |= (1 << 12); /* FLOW_ENA */
+       clk |= (1 << 15); /* feedback clock */
+
+       if (host->plat->translate_vdd)
+               pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd);
+
+       switch (ios->power_mode) {
+       case MMC_POWER_OFF:
+               htc_pwrsink_set(PWRSINK_SDCARD, 0);
+               break;
+       case MMC_POWER_UP:
+               pwr |= MCI_PWR_UP;
+               break;
+       case MMC_POWER_ON:
+               htc_pwrsink_set(PWRSINK_SDCARD, 100);
+               pwr |= MCI_PWR_ON;
+               break;
+       }
+
+       if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
+               pwr |= MCI_OD;
+
+       writel(clk, host->base + MMCICLOCK);
+
+       if (host->pwr != pwr) {
+               host->pwr = pwr;
+               writel(pwr, host->base + MMCIPOWER);
+       }
+
+       if (!(clk & MCI_CLK_ENABLE) && host->clks_on) {
+               clk_disable(host->clk);
+               clk_disable(host->pclk);
+               host->clks_on = 0;
+       }
+}
+
+static void msmsdcc_enable_sdio_irq(struct mmc_host *mmc, int enable)
+{
+       struct msmsdcc_host *host = mmc_priv(mmc);
+       unsigned long flags;
+       u32 status;
+
+       spin_lock_irqsave(&host->lock, flags);
+       if (msmsdcc_sdioirq == 1) {
+               status = readl(host->base + MMCIMASK0);
+               if (enable)
+                       status |= MCI_SDIOINTOPERMASK;
+               else
+                       status &= ~MCI_SDIOINTOPERMASK;
+               host->saved_irq0mask = status;
+               writel(status, host->base + MMCIMASK0);
+       }
+       spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static const struct mmc_host_ops msmsdcc_ops = {
+       .request        = msmsdcc_request,
+       .set_ios        = msmsdcc_set_ios,
+       .enable_sdio_irq = msmsdcc_enable_sdio_irq,
+};
+
+static void
+msmsdcc_check_status(unsigned long data)
+{
+       struct msmsdcc_host *host = (struct msmsdcc_host *)data;
+       unsigned int status;
+
+       if (!host->plat->status) {
+               mmc_detect_change(host->mmc, 0);
+               goto out;
+       }
+
+       status = host->plat->status(mmc_dev(host->mmc));
+       host->eject = !status;
+       if (status ^ host->oldstat) {
+               pr_info("%s: Slot status change detected (%d -> %d)\n",
+                       mmc_hostname(host->mmc), host->oldstat, status);
+               if (status)
+                       mmc_detect_change(host->mmc, (5 * HZ) / 2);
+               else
+                       mmc_detect_change(host->mmc, 0);
+       }
+
+       host->oldstat = status;
+
+out:
+       if (host->timer.function)
+               mod_timer(&host->timer, jiffies + HZ);
+}
+
+static irqreturn_t
+msmsdcc_platform_status_irq(int irq, void *dev_id)
+{
+       struct msmsdcc_host *host = dev_id;
+
+       printk(KERN_DEBUG "%s: %d\n", __func__, irq);
+       msmsdcc_check_status((unsigned long) host);
+       return IRQ_HANDLED;
+}
+
+static void
+msmsdcc_status_notify_cb(int card_present, void *dev_id)
+{
+       struct msmsdcc_host *host = dev_id;
+
+       printk(KERN_DEBUG "%s: card_present %d\n", mmc_hostname(host->mmc),
+              card_present);
+       msmsdcc_check_status((unsigned long) host);
+}
+
+/*
+ * called when a command expires.
+ * Dump some debugging, and then error
+ * out the transaction.
+ */
+static void
+msmsdcc_command_expired(unsigned long _data)
+{
+       struct msmsdcc_host     *host = (struct msmsdcc_host *) _data;
+       struct mmc_request      *mrq;
+       unsigned long           flags;
+
+       spin_lock_irqsave(&host->lock, flags);
+       mrq = host->curr.mrq;
+
+       if (!mrq) {
+               pr_info("%s: Command expiry misfire\n",
+                       mmc_hostname(host->mmc));
+               spin_unlock_irqrestore(&host->lock, flags);
+               return;
+       }
+
+       pr_err("%s: Command timeout (%p %p %p %p)\n",
+              mmc_hostname(host->mmc), mrq, mrq->cmd,
+              mrq->data, host->dma.sg);
+
+       mrq->cmd->error = -ETIMEDOUT;
+       msmsdcc_stop_data(host);
+
+       writel(0, host->base + MMCICOMMAND);
+
+       host->curr.mrq = NULL;
+       host->curr.cmd = NULL;
+
+       spin_unlock_irqrestore(&host->lock, flags);
+       mmc_request_done(host->mmc, mrq);
+}
+
+static int
+msmsdcc_init_dma(struct msmsdcc_host *host)
+{
+       memset(&host->dma, 0, sizeof(struct msmsdcc_dma_data));
+       host->dma.host = host;
+       host->dma.channel = -1;
+
+       if (!host->dmares)
+               return -ENODEV;
+
+       host->dma.nc = dma_alloc_coherent(NULL,
+                                         sizeof(struct msmsdcc_nc_dmadata),
+                                         &host->dma.nc_busaddr,
+                                         GFP_KERNEL);
+       if (host->dma.nc == NULL) {
+               pr_err("Unable to allocate DMA buffer\n");
+               return -ENOMEM;
+       }
+       memset(host->dma.nc, 0x00, sizeof(struct msmsdcc_nc_dmadata));
+       host->dma.cmd_busaddr = host->dma.nc_busaddr;
+       host->dma.cmdptr_busaddr = host->dma.nc_busaddr +
+                               offsetof(struct msmsdcc_nc_dmadata, cmdptr);
+       host->dma.channel = host->dmares->start;
+
+       return 0;
+}
+
+#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
+static void
+do_resume_work(struct work_struct *work)
+{
+       struct msmsdcc_host *host =
+               container_of(work, struct msmsdcc_host, resume_task);
+       struct mmc_host *mmc = host->mmc;
+
+       if (mmc) {
+               mmc_resume_host(mmc);
+               if (host->stat_irq)
+                       enable_irq(host->stat_irq);
+       }
+}
+#endif
+
+static int
+msmsdcc_probe(struct platform_device *pdev)
+{
+       struct mmc_platform_data *plat = pdev->dev.platform_data;
+       struct msmsdcc_host *host;
+       struct mmc_host *mmc;
+       struct resource *cmd_irqres = NULL;
+       struct resource *pio_irqres = NULL;
+       struct resource *stat_irqres = NULL;
+       struct resource *memres = NULL;
+       struct resource *dmares = NULL;
+       int ret;
+
+       /* must have platform data */
+       if (!plat) {
+               pr_err("%s: Platform data not available\n", __func__);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (pdev->id < 1 || pdev->id > 4)
+               return -EINVAL;
+
+       if (pdev->resource == NULL || pdev->num_resources < 2) {
+               pr_err("%s: Invalid resource\n", __func__);
+               return -ENXIO;
+       }
+
+       memres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+       cmd_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
+                                                 "cmd_irq");
+       pio_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
+                                                 "pio_irq");
+       stat_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
+                                                  "status_irq");
+
+       if (!cmd_irqres || !pio_irqres || !memres) {
+               pr_err("%s: Invalid resource\n", __func__);
+               return -ENXIO;
+       }
+
+       /*
+        * Setup our host structure
+        */
+
+       mmc = mmc_alloc_host(sizeof(struct msmsdcc_host), &pdev->dev);
+       if (!mmc) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       host = mmc_priv(mmc);
+       host->pdev_id = pdev->id;
+       host->plat = plat;
+       host->mmc = mmc;
+
+       host->cmdpoll = 1;
+
+       host->base = ioremap(memres->start, PAGE_SIZE);
+       if (!host->base) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       host->cmd_irqres = cmd_irqres;
+       host->pio_irqres = pio_irqres;
+       host->memres = memres;
+       host->dmares = dmares;
+       spin_lock_init(&host->lock);
+
+       /*
+        * Setup DMA
+        */
+       msmsdcc_init_dma(host);
+
+       /*
+        * Setup main peripheral bus clock
+        */
+       host->pclk = clk_get(&pdev->dev, "sdc_pclk");
+       if (IS_ERR(host->pclk)) {
+               ret = PTR_ERR(host->pclk);
+               goto host_free;
+       }
+
+       ret = clk_enable(host->pclk);
+       if (ret)
+               goto pclk_put;
+
+       host->pclk_rate = clk_get_rate(host->pclk);
+
+       /*
+        * Setup SDC MMC clock
+        */
+       host->clk = clk_get(&pdev->dev, "sdc_clk");
+       if (IS_ERR(host->clk)) {
+               ret = PTR_ERR(host->clk);
+               goto pclk_disable;
+       }
+
+       ret = clk_enable(host->clk);
+       if (ret)
+               goto clk_put;
+
+       ret = clk_set_rate(host->clk, msmsdcc_fmin);
+       if (ret) {
+               pr_err("%s: Clock rate set failed (%d)\n", __func__, ret);
+               goto clk_disable;
+       }
+
+       host->clk_rate = clk_get_rate(host->clk);
+
+       host->clks_on = 1;
+
+       /*
+        * Setup MMC host structure
+        */
+       mmc->ops = &msmsdcc_ops;
+       mmc->f_min = msmsdcc_fmin;
+       mmc->f_max = msmsdcc_fmax;
+       mmc->ocr_avail = plat->ocr_mask;
+
+       if (msmsdcc_4bit)
+               mmc->caps |= MMC_CAP_4_BIT_DATA;
+       if (msmsdcc_sdioirq)
+               mmc->caps |= MMC_CAP_SDIO_IRQ;
+       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
+
+       mmc->max_phys_segs = NR_SG;
+       mmc->max_hw_segs = NR_SG;
+       mmc->max_blk_size = 4096;       /* MCI_DATA_CTL BLOCKSIZE up to 4096 */
+       mmc->max_blk_count = 65536;
+
+       mmc->max_req_size = 33554432;   /* MCI_DATA_LENGTH is 25 bits */
+       mmc->max_seg_size = mmc->max_req_size;
+
+       writel(0, host->base + MMCIMASK0);
+       writel(0x5e007ff, host->base + MMCICLEAR); /* Add: 1 << 25 */
+
+       writel(MCI_IRQENABLE, host->base + MMCIMASK0);
+       host->saved_irq0mask = MCI_IRQENABLE;
+
+       /*
+        * Setup card detect change
+        */
+
+       memset(&host->timer, 0, sizeof(host->timer));
+
+       if (stat_irqres && !(stat_irqres->flags & IORESOURCE_DISABLED)) {
+               unsigned long irqflags = IRQF_SHARED |
+                       (stat_irqres->flags & IRQF_TRIGGER_MASK);
+
+               host->stat_irq = stat_irqres->start;
+               ret = request_irq(host->stat_irq,
+                                 msmsdcc_platform_status_irq,
+                                 irqflags,
+                                 DRIVER_NAME " (slot)",
+                                 host);
+               if (ret) {
+                       pr_err("%s: Unable to get slot IRQ %d (%d)\n",
+                              mmc_hostname(mmc), host->stat_irq, ret);
+                       goto clk_disable;
+               }
+       } else if (plat->register_status_notify) {
+               plat->register_status_notify(msmsdcc_status_notify_cb, host);
+       } else if (!plat->status)
+               pr_err("%s: No card detect facilities available\n",
+                      mmc_hostname(mmc));
+       else {
+               init_timer(&host->timer);
+               host->timer.data = (unsigned long)host;
+               host->timer.function = msmsdcc_check_status;
+               host->timer.expires = jiffies + HZ;
+               add_timer(&host->timer);
+       }
+
+       if (plat->status) {
+               host->oldstat = host->plat->status(mmc_dev(host->mmc));
+               host->eject = !host->oldstat;
+       }
+
+       /*
+        * Setup a command timer. We currently need this due to
+        * some 'strange' timeout / error handling situations.
+        */
+       init_timer(&host->command_timer);
+       host->command_timer.data = (unsigned long) host;
+       host->command_timer.function = msmsdcc_command_expired;
+
+       ret = request_irq(cmd_irqres->start, msmsdcc_irq, IRQF_SHARED,
+                         DRIVER_NAME " (cmd)", host);
+       if (ret)
+               goto stat_irq_free;
+
+       ret = request_irq(pio_irqres->start, msmsdcc_pio_irq, IRQF_SHARED,
+                         DRIVER_NAME " (pio)", host);
+       if (ret)
+               goto cmd_irq_free;
+
+       mmc_set_drvdata(pdev, mmc);
+       mmc_add_host(mmc);
+
+       pr_info("%s: Qualcomm MSM SDCC at 0x%016llx irq %d,%d dma %d\n",
+               mmc_hostname(mmc), (unsigned long long)memres->start,
+               (unsigned int) cmd_irqres->start,
+               (unsigned int) host->stat_irq, host->dma.channel);
+       pr_info("%s: 4 bit data mode %s\n", mmc_hostname(mmc),
+               (mmc->caps & MMC_CAP_4_BIT_DATA ? "enabled" : "disabled"));
+       pr_info("%s: MMC clock %u -> %u Hz, PCLK %u Hz\n",
+               mmc_hostname(mmc), msmsdcc_fmin, msmsdcc_fmax, host->pclk_rate);
+       pr_info("%s: Slot eject status = %d\n", mmc_hostname(mmc), host->eject);
+       pr_info("%s: Power save feature enable = %d\n",
+               mmc_hostname(mmc), msmsdcc_pwrsave);
+
+       if (host->dma.channel != -1) {
+               pr_info("%s: DM non-cached buffer at %p, dma_addr 0x%.8x\n",
+                       mmc_hostname(mmc), host->dma.nc, host->dma.nc_busaddr);
+               pr_info("%s: DM cmd busaddr 0x%.8x, cmdptr busaddr 0x%.8x\n",
+                       mmc_hostname(mmc), host->dma.cmd_busaddr,
+                       host->dma.cmdptr_busaddr);
+       } else
+               pr_info("%s: PIO transfer enabled\n", mmc_hostname(mmc));
+       if (host->timer.function)
+               pr_info("%s: Polling status mode enabled\n", mmc_hostname(mmc));
+
+       return 0;
+ cmd_irq_free:
+       free_irq(cmd_irqres->start, host);
+ stat_irq_free:
+       if (host->stat_irq)
+               free_irq(host->stat_irq, host);
+ clk_disable:
+       clk_disable(host->clk);
+ clk_put:
+       clk_put(host->clk);
+ pclk_disable:
+       clk_disable(host->pclk);
+ pclk_put:
+       clk_put(host->pclk);
+ host_free:
+       mmc_free_host(mmc);
+ out:
+       return ret;
+}
+
+static int
+msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
+{
+       struct mmc_host *mmc = mmc_get_drvdata(dev);
+       int rc = 0;
+
+       if (mmc) {
+               struct msmsdcc_host *host = mmc_priv(mmc);
+
+               if (host->stat_irq)
+                       disable_irq(host->stat_irq);
+
+               if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
+                       rc = mmc_suspend_host(mmc, state);
+               if (!rc) {
+                       writel(0, host->base + MMCIMASK0);
+
+                       if (host->clks_on) {
+                               clk_disable(host->clk);
+                               clk_disable(host->pclk);
+                               host->clks_on = 0;
+                       }
+               }
+       }
+       return rc;
+}
+
+static int
+msmsdcc_resume(struct platform_device *dev)
+{
+       struct mmc_host *mmc = mmc_get_drvdata(dev);
+       unsigned long flags;
+
+       if (mmc) {
+               struct msmsdcc_host *host = mmc_priv(mmc);
+
+               spin_lock_irqsave(&host->lock, flags);
+
+               if (!host->clks_on) {
+                       clk_enable(host->pclk);
+                       clk_enable(host->clk);
+                       host->clks_on = 1;
+               }
+
+               writel(host->saved_irq0mask, host->base + MMCIMASK0);
+
+               spin_unlock_irqrestore(&host->lock, flags);
+
+               if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
+                       mmc_resume_host(mmc);
+                       if (host->stat_irq)
+                               enable_irq(host->stat_irq);
+               else if (host->stat_irq)
+                       enable_irq(host->stat_irq);
+       }
+       return 0;
+}
+
+static struct platform_driver msmsdcc_driver = {
+       .probe          = msmsdcc_probe,
+       .suspend        = msmsdcc_suspend,
+       .resume         = msmsdcc_resume,
+       .driver         = {
+               .name   = "msm_sdcc",
+       },
+};
+
+static int __init msmsdcc_init(void)
+{
+       return platform_driver_register(&msmsdcc_driver);
+}
+
+static void __exit msmsdcc_exit(void)
+{
+       platform_driver_unregister(&msmsdcc_driver);
+}
+
+module_init(msmsdcc_init);
+module_exit(msmsdcc_exit);
+
+MODULE_DESCRIPTION("Qualcomm MSM 7X00A Multimedia Card Interface driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h
new file mode 100644 (file)
index 0000000..8c84484
--- /dev/null
@@ -0,0 +1,238 @@
+/*
+ *  linux/drivers/mmc/host/msmsdcc.h - QCT MSM7K SDC Controller
+ *
+ *  Copyright (C) 2008 Google, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * - Based on mmci.h
+ */
+
+#ifndef _MSM_SDCC_H
+#define _MSM_SDCC_H
+
+#define MSMSDCC_CRCI_SDC1      6
+#define MSMSDCC_CRCI_SDC2      7
+#define MSMSDCC_CRCI_SDC3      12
+#define MSMSDCC_CRCI_SDC4      13
+
+#define MMCIPOWER              0x000
+#define MCI_PWR_OFF            0x00
+#define MCI_PWR_UP             0x02
+#define MCI_PWR_ON             0x03
+#define MCI_OD                 (1 << 6)
+
+#define MMCICLOCK              0x004
+#define MCI_CLK_ENABLE         (1 << 8)
+#define MCI_CLK_PWRSAVE                (1 << 9)
+#define MCI_CLK_WIDEBUS                (1 << 10)
+#define MCI_CLK_FLOWENA                (1 << 12)
+#define MCI_CLK_INVERTOUT      (1 << 13)
+#define MCI_CLK_SELECTIN       (1 << 14)
+
+#define MMCIARGUMENT           0x008
+#define MMCICOMMAND            0x00c
+#define MCI_CPSM_RESPONSE      (1 << 6)
+#define MCI_CPSM_LONGRSP       (1 << 7)
+#define MCI_CPSM_INTERRUPT     (1 << 8)
+#define MCI_CPSM_PENDING       (1 << 9)
+#define MCI_CPSM_ENABLE                (1 << 10)
+#define MCI_CPSM_PROGENA       (1 << 11)
+#define MCI_CSPM_DATCMD                (1 << 12)
+#define MCI_CSPM_MCIABORT      (1 << 13)
+#define MCI_CSPM_CCSENABLE     (1 << 14)
+#define MCI_CSPM_CCSDISABLE    (1 << 15)
+
+
+#define MMCIRESPCMD            0x010
+#define MMCIRESPONSE0          0x014
+#define MMCIRESPONSE1          0x018
+#define MMCIRESPONSE2          0x01c
+#define MMCIRESPONSE3          0x020
+#define MMCIDATATIMER          0x024
+#define MMCIDATALENGTH         0x028
+
+#define MMCIDATACTRL           0x02c
+#define MCI_DPSM_ENABLE                (1 << 0)
+#define MCI_DPSM_DIRECTION     (1 << 1)
+#define MCI_DPSM_MODE          (1 << 2)
+#define MCI_DPSM_DMAENABLE     (1 << 3)
+
+#define MMCIDATACNT            0x030
+#define MMCISTATUS             0x034
+#define MCI_CMDCRCFAIL         (1 << 0)
+#define MCI_DATACRCFAIL                (1 << 1)
+#define MCI_CMDTIMEOUT         (1 << 2)
+#define MCI_DATATIMEOUT                (1 << 3)
+#define MCI_TXUNDERRUN         (1 << 4)
+#define MCI_RXOVERRUN          (1 << 5)
+#define MCI_CMDRESPEND         (1 << 6)
+#define MCI_CMDSENT            (1 << 7)
+#define MCI_DATAEND            (1 << 8)
+#define MCI_DATABLOCKEND       (1 << 10)
+#define MCI_CMDACTIVE          (1 << 11)
+#define MCI_TXACTIVE           (1 << 12)
+#define MCI_RXACTIVE           (1 << 13)
+#define MCI_TXFIFOHALFEMPTY    (1 << 14)
+#define MCI_RXFIFOHALFFULL     (1 << 15)
+#define MCI_TXFIFOFULL         (1 << 16)
+#define MCI_RXFIFOFULL         (1 << 17)
+#define MCI_TXFIFOEMPTY                (1 << 18)
+#define MCI_RXFIFOEMPTY                (1 << 19)
+#define MCI_TXDATAAVLBL                (1 << 20)
+#define MCI_RXDATAAVLBL                (1 << 21)
+#define MCI_SDIOINTR           (1 << 22)
+#define MCI_PROGDONE           (1 << 23)
+#define MCI_ATACMDCOMPL                (1 << 24)
+#define MCI_SDIOINTOPER                (1 << 25)
+#define MCI_CCSTIMEOUT         (1 << 26)
+
+#define MMCICLEAR              0x038
+#define MCI_CMDCRCFAILCLR      (1 << 0)
+#define MCI_DATACRCFAILCLR     (1 << 1)
+#define MCI_CMDTIMEOUTCLR      (1 << 2)
+#define MCI_DATATIMEOUTCLR     (1 << 3)
+#define MCI_TXUNDERRUNCLR      (1 << 4)
+#define MCI_RXOVERRUNCLR       (1 << 5)
+#define MCI_CMDRESPENDCLR      (1 << 6)
+#define MCI_CMDSENTCLR         (1 << 7)
+#define MCI_DATAENDCLR         (1 << 8)
+#define MCI_DATABLOCKENDCLR    (1 << 10)
+
+#define MMCIMASK0              0x03c
+#define MCI_CMDCRCFAILMASK     (1 << 0)
+#define MCI_DATACRCFAILMASK    (1 << 1)
+#define MCI_CMDTIMEOUTMASK     (1 << 2)
+#define MCI_DATATIMEOUTMASK    (1 << 3)
+#define MCI_TXUNDERRUNMASK     (1 << 4)
+#define MCI_RXOVERRUNMASK      (1 << 5)
+#define MCI_CMDRESPENDMASK     (1 << 6)
+#define MCI_CMDSENTMASK                (1 << 7)
+#define MCI_DATAENDMASK                (1 << 8)
+#define MCI_DATABLOCKENDMASK   (1 << 10)
+#define MCI_CMDACTIVEMASK      (1 << 11)
+#define MCI_TXACTIVEMASK       (1 << 12)
+#define MCI_RXACTIVEMASK       (1 << 13)
+#define MCI_TXFIFOHALFEMPTYMASK        (1 << 14)
+#define MCI_RXFIFOHALFFULLMASK (1 << 15)
+#define MCI_TXFIFOFULLMASK     (1 << 16)
+#define MCI_RXFIFOFULLMASK     (1 << 17)
+#define MCI_TXFIFOEMPTYMASK    (1 << 18)
+#define MCI_RXFIFOEMPTYMASK    (1 << 19)
+#define MCI_TXDATAAVLBLMASK    (1 << 20)
+#define MCI_RXDATAAVLBLMASK    (1 << 21)
+#define MCI_SDIOINTMASK                (1 << 22)
+#define MCI_PROGDONEMASK       (1 << 23)
+#define MCI_ATACMDCOMPLMASK    (1 << 24)
+#define MCI_SDIOINTOPERMASK    (1 << 25)
+#define MCI_CCSTIMEOUTMASK     (1 << 26)
+
+#define MMCIMASK1              0x040
+#define MMCIFIFOCNT            0x044
+#define MCICCSTIMER            0x058
+
+#define MMCIFIFO               0x080 /* to 0x0bc */
+
+#define MCI_IRQENABLE  \
+       (MCI_CMDCRCFAILMASK|MCI_DATACRCFAILMASK|MCI_CMDTIMEOUTMASK|     \
+       MCI_DATATIMEOUTMASK|MCI_TXUNDERRUNMASK|MCI_RXOVERRUNMASK|       \
+       MCI_CMDRESPENDMASK|MCI_CMDSENTMASK|MCI_DATAENDMASK)
+
+/*
+ * The size of the FIFO in bytes.
+ */
+#define MCI_FIFOSIZE   (16*4)
+
+#define MCI_FIFOHALFSIZE (MCI_FIFOSIZE / 2)
+
+#define NR_SG          32
+
+struct clk;
+
+struct msmsdcc_nc_dmadata {
+       dmov_box        cmd[NR_SG];
+       uint32_t        cmdptr;
+};
+
+struct msmsdcc_dma_data {
+       struct msmsdcc_nc_dmadata       *nc;
+       dma_addr_t                      nc_busaddr;
+       dma_addr_t                      cmd_busaddr;
+       dma_addr_t                      cmdptr_busaddr;
+
+       struct msm_dmov_cmd             hdr;
+       enum dma_data_direction         dir;
+
+       struct scatterlist              *sg;
+       int                             num_ents;
+
+       int                             channel;
+       struct msmsdcc_host             *host;
+       int                             busy; /* Set if DM is busy */
+};
+
+struct msmsdcc_pio_data {
+       struct scatterlist      *sg;
+       unsigned int            sg_len;
+       unsigned int            sg_off;
+};
+
+struct msmsdcc_curr_req {
+       struct mmc_request      *mrq;
+       struct mmc_command      *cmd;
+       struct mmc_data         *data;
+       unsigned int            xfer_size;      /* Total data size */
+       unsigned int            xfer_remain;    /* Bytes remaining to send */
+       unsigned int            data_xfered;    /* Bytes acked by BLKEND irq */
+       int                     got_dataend;
+       int                     got_datablkend;
+       int                     user_pages;
+};
+
+struct msmsdcc_stats {
+       unsigned int reqs;
+       unsigned int cmds;
+       unsigned int cmdpoll_hits;
+       unsigned int cmdpoll_misses;
+};
+
+struct msmsdcc_host {
+       struct resource         *cmd_irqres;
+       struct resource         *pio_irqres;
+       struct resource         *memres;
+       struct resource         *dmares;
+       void __iomem            *base;
+       int                     pdev_id;
+       unsigned int            stat_irq;
+
+       struct msmsdcc_curr_req curr;
+
+       struct mmc_host         *mmc;
+       struct clk              *clk;           /* main MMC bus clock */
+       struct clk              *pclk;          /* SDCC peripheral bus clock */
+       unsigned int            clks_on;        /* set if clocks are enabled */
+       struct timer_list       command_timer;
+
+       unsigned int            eject;          /* eject state */
+
+       spinlock_t              lock;
+
+       unsigned int            clk_rate;       /* Current clock rate */
+       unsigned int            pclk_rate;
+
+       u32                     pwr;
+       u32                     saved_irq0mask; /* MMCIMASK0 reg value */
+       struct mmc_platform_data *plat;
+
+       struct timer_list       timer;
+       unsigned int            oldstat;
+
+       struct msmsdcc_dma_data dma;
+       struct msmsdcc_pio_data pio;
+       int                     cmdpoll;
+       struct msmsdcc_stats    stats;
+};
+
+#endif
index bc14bb1..8867152 100644 (file)
@@ -512,7 +512,7 @@ static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat)
        }
 
        /* For the DMA case the DMA engine handles the data transfer
-        * automatically. For non DMA we have to to it ourselves.
+        * automatically. For non DMA we have to do it ourselves.
         * Don't do it in interrupt context though.
         */
        if (!mxcmci_use_dma(host) && host->data)
index 1cf9cfb..4487cc0 100644 (file)
@@ -17,6 +17,8 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
@@ -25,6 +27,7 @@
 #include <linux/timer.h>
 #include <linux/clk.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/core.h>
 #include <linux/io.h>
 #include <linux/semaphore.h>
 #include <mach/dma.h>
@@ -35,6 +38,7 @@
 
 /* OMAP HSMMC Host Controller Registers */
 #define OMAP_HSMMC_SYSCONFIG   0x0010
+#define OMAP_HSMMC_SYSSTATUS   0x0014
 #define OMAP_HSMMC_CON         0x002C
 #define OMAP_HSMMC_BLK         0x0104
 #define OMAP_HSMMC_ARG         0x0108
@@ -70,6 +74,8 @@
 #define DTO_MASK               0x000F0000
 #define DTO_SHIFT              16
 #define INT_EN_MASK            0x307F0033
+#define BWR_ENABLE             (1 << 4)
+#define BRR_ENABLE             (1 << 5)
 #define INIT_STREAM            (1 << 1)
 #define DP_SELECT              (1 << 21)
 #define DDIR                   (1 << 4)
@@ -92,6 +98,8 @@
 #define DUAL_VOLT_OCR_BIT      7
 #define SRC                    (1 << 25)
 #define SRD                    (1 << 26)
+#define SOFTRESET              (1 << 1)
+#define RESETDONE              (1 << 0)
 
 /*
  * FIXME: Most likely all the data using these _DEVID defines should come
 #define OMAP_MMC1_DEVID                0
 #define OMAP_MMC2_DEVID                1
 #define OMAP_MMC3_DEVID                2
+#define OMAP_MMC4_DEVID                3
+#define OMAP_MMC5_DEVID                4
 
 #define MMC_TIMEOUT_MS         20
 #define OMAP_MMC_MASTER_CLOCK  96000000
 #define DRIVER_NAME            "mmci-omap-hs"
 
+/* Timeouts for entering power saving states on inactivity, msec */
+#define OMAP_MMC_DISABLED_TIMEOUT      100
+#define OMAP_MMC_SLEEP_TIMEOUT         1000
+#define OMAP_MMC_OFF_TIMEOUT           8000
+
 /*
  * One controller can have multiple slots, like on some omap boards using
  * omap.c controller driver. Luckily this is not currently done on any known
 #define OMAP_HSMMC_WRITE(base, reg, val) \
        __raw_writel((val), (base) + OMAP_HSMMC_##reg)
 
-struct mmc_omap_host {
+struct omap_hsmmc_host {
        struct  device          *dev;
        struct  mmc_host        *mmc;
        struct  mmc_request     *mrq;
@@ -135,27 +150,35 @@ struct mmc_omap_host {
        struct  work_struct     mmc_carddetect_work;
        void    __iomem         *base;
        resource_size_t         mapbase;
+       spinlock_t              irq_lock; /* Prevent races with irq handler */
+       unsigned long           flags;
        unsigned int            id;
        unsigned int            dma_len;
        unsigned int            dma_sg_idx;
        unsigned char           bus_mode;
+       unsigned char           power_mode;
        u32                     *buffer;
        u32                     bytesleft;
        int                     suspended;
        int                     irq;
-       int                     carddetect;
        int                     use_dma, dma_ch;
        int                     dma_line_tx, dma_line_rx;
        int                     slot_id;
-       int                     dbclk_enabled;
+       int                     got_dbclk;
        int                     response_busy;
+       int                     context_loss;
+       int                     dpm_state;
+       int                     vdd;
+       int                     protect_card;
+       int                     reqs_blocked;
+
        struct  omap_mmc_platform_data  *pdata;
 };
 
 /*
  * Stop clock to the card
  */
-static void omap_mmc_stop_clock(struct mmc_omap_host *host)
+static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
 {
        OMAP_HSMMC_WRITE(host->base, SYSCTL,
                OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN);
@@ -163,15 +186,178 @@ static void omap_mmc_stop_clock(struct mmc_omap_host *host)
                dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n");
 }
 
+#ifdef CONFIG_PM
+
+/*
+ * Restore the MMC host context, if it was lost as result of a
+ * power state change.
+ */
+static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
+{
+       struct mmc_ios *ios = &host->mmc->ios;
+       struct omap_mmc_platform_data *pdata = host->pdata;
+       int context_loss = 0;
+       u32 hctl, capa, con;
+       u16 dsor = 0;
+       unsigned long timeout;
+
+       if (pdata->get_context_loss_count) {
+               context_loss = pdata->get_context_loss_count(host->dev);
+               if (context_loss < 0)
+                       return 1;
+       }
+
+       dev_dbg(mmc_dev(host->mmc), "context was %slost\n",
+               context_loss == host->context_loss ? "not " : "");
+       if (host->context_loss == context_loss)
+               return 1;
+
+       /* Wait for hardware reset */
+       timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS);
+       while ((OMAP_HSMMC_READ(host->base, SYSSTATUS) & RESETDONE) != RESETDONE
+               && time_before(jiffies, timeout))
+               ;
+
+       /* Do software reset */
+       OMAP_HSMMC_WRITE(host->base, SYSCONFIG, SOFTRESET);
+       timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS);
+       while ((OMAP_HSMMC_READ(host->base, SYSSTATUS) & RESETDONE) != RESETDONE
+               && time_before(jiffies, timeout))
+               ;
+
+       OMAP_HSMMC_WRITE(host->base, SYSCONFIG,
+                       OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE);
+
+       if (host->id == OMAP_MMC1_DEVID) {
+               if (host->power_mode != MMC_POWER_OFF &&
+                   (1 << ios->vdd) <= MMC_VDD_23_24)
+                       hctl = SDVS18;
+               else
+                       hctl = SDVS30;
+               capa = VS30 | VS18;
+       } else {
+               hctl = SDVS18;
+               capa = VS18;
+       }
+
+       OMAP_HSMMC_WRITE(host->base, HCTL,
+                       OMAP_HSMMC_READ(host->base, HCTL) | hctl);
+
+       OMAP_HSMMC_WRITE(host->base, CAPA,
+                       OMAP_HSMMC_READ(host->base, CAPA) | capa);
+
+       OMAP_HSMMC_WRITE(host->base, HCTL,
+                       OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
+
+       timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS);
+       while ((OMAP_HSMMC_READ(host->base, HCTL) & SDBP) != SDBP
+               && time_before(jiffies, timeout))
+               ;
+
+       OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+       OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK);
+       OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK);
+
+       /* Do not initialize card-specific things if the power is off */
+       if (host->power_mode == MMC_POWER_OFF)
+               goto out;
+
+       con = OMAP_HSMMC_READ(host->base, CON);
+       switch (ios->bus_width) {
+       case MMC_BUS_WIDTH_8:
+               OMAP_HSMMC_WRITE(host->base, CON, con | DW8);
+               break;
+       case MMC_BUS_WIDTH_4:
+               OMAP_HSMMC_WRITE(host->base, CON, con & ~DW8);
+               OMAP_HSMMC_WRITE(host->base, HCTL,
+                       OMAP_HSMMC_READ(host->base, HCTL) | FOUR_BIT);
+               break;
+       case MMC_BUS_WIDTH_1:
+               OMAP_HSMMC_WRITE(host->base, CON, con & ~DW8);
+               OMAP_HSMMC_WRITE(host->base, HCTL,
+                       OMAP_HSMMC_READ(host->base, HCTL) & ~FOUR_BIT);
+               break;
+       }
+
+       if (ios->clock) {
+               dsor = OMAP_MMC_MASTER_CLOCK / ios->clock;
+               if (dsor < 1)
+                       dsor = 1;
+
+               if (OMAP_MMC_MASTER_CLOCK / dsor > ios->clock)
+                       dsor++;
+
+               if (dsor > 250)
+                       dsor = 250;
+       }
+
+       OMAP_HSMMC_WRITE(host->base, SYSCTL,
+               OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN);
+       OMAP_HSMMC_WRITE(host->base, SYSCTL, (dsor << 6) | (DTO << 16));
+       OMAP_HSMMC_WRITE(host->base, SYSCTL,
+               OMAP_HSMMC_READ(host->base, SYSCTL) | ICE);
+
+       timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS);
+       while ((OMAP_HSMMC_READ(host->base, SYSCTL) & ICS) != ICS
+               && time_before(jiffies, timeout))
+               ;
+
+       OMAP_HSMMC_WRITE(host->base, SYSCTL,
+               OMAP_HSMMC_READ(host->base, SYSCTL) | CEN);
+
+       con = OMAP_HSMMC_READ(host->base, CON);
+       if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
+               OMAP_HSMMC_WRITE(host->base, CON, con | OD);
+       else
+               OMAP_HSMMC_WRITE(host->base, CON, con & ~OD);
+out:
+       host->context_loss = context_loss;
+
+       dev_dbg(mmc_dev(host->mmc), "context is restored\n");
+       return 0;
+}
+
+/*
+ * Save the MMC host context (store the number of power state changes so far).
+ */
+static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
+{
+       struct omap_mmc_platform_data *pdata = host->pdata;
+       int context_loss;
+
+       if (pdata->get_context_loss_count) {
+               context_loss = pdata->get_context_loss_count(host->dev);
+               if (context_loss < 0)
+                       return;
+               host->context_loss = context_loss;
+       }
+}
+
+#else
+
+static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
+{
+       return 0;
+}
+
+static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
+{
+}
+
+#endif
+
 /*
  * Send init stream sequence to card
  * before sending IDLE command
  */
-static void send_init_stream(struct mmc_omap_host *host)
+static void send_init_stream(struct omap_hsmmc_host *host)
 {
        int reg = 0;
        unsigned long timeout;
 
+       if (host->protect_card)
+               return;
+
        disable_irq(host->irq);
        OMAP_HSMMC_WRITE(host->base, CON,
                OMAP_HSMMC_READ(host->base, CON) | INIT_STREAM);
@@ -183,51 +369,53 @@ static void send_init_stream(struct mmc_omap_host *host)
 
        OMAP_HSMMC_WRITE(host->base, CON,
                OMAP_HSMMC_READ(host->base, CON) & ~INIT_STREAM);
+
+       OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+       OMAP_HSMMC_READ(host->base, STAT);
+
        enable_irq(host->irq);
 }
 
 static inline
-int mmc_omap_cover_is_closed(struct mmc_omap_host *host)
+int omap_hsmmc_cover_is_closed(struct omap_hsmmc_host *host)
 {
        int r = 1;
 
-       if (host->pdata->slots[host->slot_id].get_cover_state)
-               r = host->pdata->slots[host->slot_id].get_cover_state(host->dev,
-                       host->slot_id);
+       if (mmc_slot(host).get_cover_state)
+               r = mmc_slot(host).get_cover_state(host->dev, host->slot_id);
        return r;
 }
 
 static ssize_t
-mmc_omap_show_cover_switch(struct device *dev, struct device_attribute *attr,
+omap_hsmmc_show_cover_switch(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
        struct mmc_host *mmc = container_of(dev, struct mmc_host, class_dev);
-       struct mmc_omap_host *host = mmc_priv(mmc);
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
 
-       return sprintf(buf, "%s\n", mmc_omap_cover_is_closed(host) ? "closed" :
-                      "open");
+       return sprintf(buf, "%s\n",
+                       omap_hsmmc_cover_is_closed(host) ? "closed" : "open");
 }
 
-static DEVICE_ATTR(cover_switch, S_IRUGO, mmc_omap_show_cover_switch, NULL);
+static DEVICE_ATTR(cover_switch, S_IRUGO, omap_hsmmc_show_cover_switch, NULL);
 
 static ssize_t
-mmc_omap_show_slot_name(struct device *dev, struct device_attribute *attr,
+omap_hsmmc_show_slot_name(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
        struct mmc_host *mmc = container_of(dev, struct mmc_host, class_dev);
-       struct mmc_omap_host *host = mmc_priv(mmc);
-       struct omap_mmc_slot_data slot = host->pdata->slots[host->slot_id];
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
 
-       return sprintf(buf, "%s\n", slot.name);
+       return sprintf(buf, "%s\n", mmc_slot(host).name);
 }
 
-static DEVICE_ATTR(slot_name, S_IRUGO, mmc_omap_show_slot_name, NULL);
+static DEVICE_ATTR(slot_name, S_IRUGO, omap_hsmmc_show_slot_name, NULL);
 
 /*
  * Configure the response type and send the cmd.
  */
 static void
-mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd,
+omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd,
        struct mmc_data *data)
 {
        int cmdreg = 0, resptype = 0, cmdtype = 0;
@@ -241,7 +429,12 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd,
         */
        OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
        OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK);
-       OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK);
+
+       if (host->use_dma)
+               OMAP_HSMMC_WRITE(host->base, IE,
+                                INT_EN_MASK & ~(BRR_ENABLE | BWR_ENABLE));
+       else
+               OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK);
 
        host->response_busy = 0;
        if (cmd->flags & MMC_RSP_PRESENT) {
@@ -275,12 +468,20 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd,
        if (host->use_dma)
                cmdreg |= DMA_EN;
 
+       /*
+        * In an interrupt context (i.e. STOP command), the spinlock is unlocked
+        * by the interrupt handler, otherwise (i.e. for a new request) it is
+        * unlocked here.
+        */
+       if (!in_interrupt())
+               spin_unlock_irqrestore(&host->irq_lock, host->flags);
+
        OMAP_HSMMC_WRITE(host->base, ARG, cmd->arg);
        OMAP_HSMMC_WRITE(host->base, CMD, cmdreg);
 }
 
 static int
-mmc_omap_get_dma_dir(struct mmc_omap_host *host, struct mmc_data *data)
+omap_hsmmc_get_dma_dir(struct omap_hsmmc_host *host, struct mmc_data *data)
 {
        if (data->flags & MMC_DATA_WRITE)
                return DMA_TO_DEVICE;
@@ -292,11 +493,18 @@ mmc_omap_get_dma_dir(struct mmc_omap_host *host, struct mmc_data *data)
  * Notify the transfer complete to MMC core
  */
 static void
-mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
+omap_hsmmc_xfer_done(struct omap_hsmmc_host *host, struct mmc_data *data)
 {
        if (!data) {
                struct mmc_request *mrq = host->mrq;
 
+               /* TC before CC from CMD6 - don't know why, but it happens */
+               if (host->cmd && host->cmd->opcode == 6 &&
+                   host->response_busy) {
+                       host->response_busy = 0;
+                       return;
+               }
+
                host->mrq = NULL;
                mmc_request_done(host->mmc, mrq);
                return;
@@ -306,7 +514,7 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
 
        if (host->use_dma && host->dma_ch != -1)
                dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len,
-                       mmc_omap_get_dma_dir(host, data));
+                       omap_hsmmc_get_dma_dir(host, data));
 
        if (!data->error)
                data->bytes_xfered += data->blocks * (data->blksz);
@@ -318,14 +526,14 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
                mmc_request_done(host->mmc, data->mrq);
                return;
        }
-       mmc_omap_start_command(host, data->stop, NULL);
+       omap_hsmmc_start_command(host, data->stop, NULL);
 }
 
 /*
  * Notify the core about command completion
  */
 static void
-mmc_omap_cmd_done(struct mmc_omap_host *host, struct mmc_command *cmd)
+omap_hsmmc_cmd_done(struct omap_hsmmc_host *host, struct mmc_command *cmd)
 {
        host->cmd = NULL;
 
@@ -350,13 +558,13 @@ mmc_omap_cmd_done(struct mmc_omap_host *host, struct mmc_command *cmd)
 /*
  * DMA clean up for command errors
  */
-static void mmc_dma_cleanup(struct mmc_omap_host *host, int errno)
+static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
 {
        host->data->error = errno;
 
        if (host->use_dma && host->dma_ch != -1) {
                dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len,
-                       mmc_omap_get_dma_dir(host, host->data));
+                       omap_hsmmc_get_dma_dir(host, host->data));
                omap_free_dma(host->dma_ch);
                host->dma_ch = -1;
                up(&host->sem);
@@ -368,10 +576,10 @@ static void mmc_dma_cleanup(struct mmc_omap_host *host, int errno)
  * Readable error output
  */
 #ifdef CONFIG_MMC_DEBUG
-static void mmc_omap_report_irq(struct mmc_omap_host *host, u32 status)
+static void omap_hsmmc_report_irq(struct omap_hsmmc_host *host, u32 status)
 {
        /* --- means reserved bit without definition at documentation */
-       static const char *mmc_omap_status_bits[] = {
+       static const char *omap_hsmmc_status_bits[] = {
                "CC", "TC", "BGE", "---", "BWR", "BRR", "---", "---", "CIRQ",
                "OBI", "---", "---", "---", "---", "---", "ERRI", "CTO", "CCRC",
                "CEB", "CIE", "DTO", "DCRC", "DEB", "---", "ACE", "---",
@@ -384,9 +592,9 @@ static void mmc_omap_report_irq(struct mmc_omap_host *host, u32 status)
        len = sprintf(buf, "MMC IRQ 0x%x :", status);
        buf += len;
 
-       for (i = 0; i < ARRAY_SIZE(mmc_omap_status_bits); i++)
+       for (i = 0; i < ARRAY_SIZE(omap_hsmmc_status_bits); i++)
                if (status & (1 << i)) {
-                       len = sprintf(buf, " %s", mmc_omap_status_bits[i]);
+                       len = sprintf(buf, " %s", omap_hsmmc_status_bits[i]);
                        buf += len;
                }
 
@@ -401,8 +609,8 @@ static void mmc_omap_report_irq(struct mmc_omap_host *host, u32 status)
  *  SRC or SRD bit of SYSCTL register
  * Can be called from interrupt context
  */
-static inline void mmc_omap_reset_controller_fsm(struct mmc_omap_host *host,
-               unsigned long bit)
+static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host,
+                                                  unsigned long bit)
 {
        unsigned long i = 0;
        unsigned long limit = (loops_per_jiffy *
@@ -424,17 +632,20 @@ static inline void mmc_omap_reset_controller_fsm(struct mmc_omap_host *host,
 /*
  * MMC controller IRQ handler
  */
-static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
+static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
 {
-       struct mmc_omap_host *host = dev_id;
+       struct omap_hsmmc_host *host = dev_id;
        struct mmc_data *data;
        int end_cmd = 0, end_trans = 0, status;
 
+       spin_lock(&host->irq_lock);
+
        if (host->mrq == NULL) {
                OMAP_HSMMC_WRITE(host->base, STAT,
                        OMAP_HSMMC_READ(host->base, STAT));
                /* Flush posted write */
                OMAP_HSMMC_READ(host->base, STAT);
+               spin_unlock(&host->irq_lock);
                return IRQ_HANDLED;
        }
 
@@ -444,13 +655,14 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 
        if (status & ERR) {
 #ifdef CONFIG_MMC_DEBUG
-               mmc_omap_report_irq(host, status);
+               omap_hsmmc_report_irq(host, status);
 #endif
                if ((status & CMD_TIMEOUT) ||
                        (status & CMD_CRC)) {
                        if (host->cmd) {
                                if (status & CMD_TIMEOUT) {
-                                       mmc_omap_reset_controller_fsm(host, SRC);
+                                       omap_hsmmc_reset_controller_fsm(host,
+                                                                       SRC);
                                        host->cmd->error = -ETIMEDOUT;
                                } else {
                                        host->cmd->error = -EILSEQ;
@@ -459,9 +671,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
                        }
                        if (host->data || host->response_busy) {
                                if (host->data)
-                                       mmc_dma_cleanup(host, -ETIMEDOUT);
+                                       omap_hsmmc_dma_cleanup(host,
+                                                               -ETIMEDOUT);
                                host->response_busy = 0;
-                               mmc_omap_reset_controller_fsm(host, SRD);
+                               omap_hsmmc_reset_controller_fsm(host, SRD);
                        }
                }
                if ((status & DATA_TIMEOUT) ||
@@ -471,11 +684,11 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
                                                -ETIMEDOUT : -EILSEQ;
 
                                if (host->data)
-                                       mmc_dma_cleanup(host, err);
+                                       omap_hsmmc_dma_cleanup(host, err);
                                else
                                        host->mrq->cmd->error = err;
                                host->response_busy = 0;
-                               mmc_omap_reset_controller_fsm(host, SRD);
+                               omap_hsmmc_reset_controller_fsm(host, SRD);
                                end_trans = 1;
                        }
                }
@@ -494,14 +707,16 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
        OMAP_HSMMC_READ(host->base, STAT);
 
        if (end_cmd || ((status & CC) && host->cmd))
-               mmc_omap_cmd_done(host, host->cmd);
-       if (end_trans || (status & TC))
-               mmc_omap_xfer_done(host, data);
+               omap_hsmmc_cmd_done(host, host->cmd);
+       if ((end_trans || (status & TC)) && host->mrq)
+               omap_hsmmc_xfer_done(host, data);
+
+       spin_unlock(&host->irq_lock);
 
        return IRQ_HANDLED;
 }
 
-static void set_sd_bus_power(struct mmc_omap_host *host)
+static void set_sd_bus_power(struct omap_hsmmc_host *host)
 {
        unsigned long i;
 
@@ -521,7 +736,7 @@ static void set_sd_bus_power(struct mmc_omap_host *host)
  * The MMC2 transceiver controls are used instead of DAT4..DAT7.
  * Some chips, like eMMC ones, use internal transceivers.
  */
-static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
+static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
 {
        u32 reg_val = 0;
        int ret;
@@ -529,22 +744,24 @@ static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
        /* Disable the clocks */
        clk_disable(host->fclk);
        clk_disable(host->iclk);
-       clk_disable(host->dbclk);
+       if (host->got_dbclk)
+               clk_disable(host->dbclk);
 
        /* Turn the power off */
        ret = mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
-       if (ret != 0)
-               goto err;
 
        /* Turn the power ON with given VDD 1.8 or 3.0v */
-       ret = mmc_slot(host).set_power(host->dev, host->slot_id, 1, vdd);
+       if (!ret)
+               ret = mmc_slot(host).set_power(host->dev, host->slot_id, 1,
+                                              vdd);
+       clk_enable(host->iclk);
+       clk_enable(host->fclk);
+       if (host->got_dbclk)
+               clk_enable(host->dbclk);
+
        if (ret != 0)
                goto err;
 
-       clk_enable(host->fclk);
-       clk_enable(host->iclk);
-       clk_enable(host->dbclk);
-
        OMAP_HSMMC_WRITE(host->base, HCTL,
                OMAP_HSMMC_READ(host->base, HCTL) & SDVSCLR);
        reg_val = OMAP_HSMMC_READ(host->base, HCTL);
@@ -552,7 +769,7 @@ static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
        /*
         * If a MMC dual voltage card is detected, the set_ios fn calls
         * this fn with VDD bit set for 1.8V. Upon card removal from the
-        * slot, omap_mmc_set_ios sets the VDD back to 3V on MMC_POWER_OFF.
+        * slot, omap_hsmmc_set_ios sets the VDD back to 3V on MMC_POWER_OFF.
         *
         * Cope with a bit of slop in the range ... per data sheets:
         *  - "1.8V" for vdds_mmc1/vdds_mmc1a can be up to 2.45V max,
@@ -578,25 +795,59 @@ err:
        return ret;
 }
 
+/* Protect the card while the cover is open */
+static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
+{
+       if (!mmc_slot(host).get_cover_state)
+               return;
+
+       host->reqs_blocked = 0;
+       if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
+               if (host->protect_card) {
+                       printk(KERN_INFO "%s: cover is closed, "
+                                        "card is now accessible\n",
+                                        mmc_hostname(host->mmc));
+                       host->protect_card = 0;
+               }
+       } else {
+               if (!host->protect_card) {
+                       printk(KERN_INFO "%s: cover is open, "
+                                        "card is now inaccessible\n",
+                                        mmc_hostname(host->mmc));
+                       host->protect_card = 1;
+               }
+       }
+}
+
 /*
  * Work Item to notify the core about card insertion/removal
  */
-static void mmc_omap_detect(struct work_struct *work)
+static void omap_hsmmc_detect(struct work_struct *work)
 {
-       struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
-                                               mmc_carddetect_work);
+       struct omap_hsmmc_host *host =
+               container_of(work, struct omap_hsmmc_host, mmc_carddetect_work);
        struct omap_mmc_slot_data *slot = &mmc_slot(host);
+       int carddetect;
 
-       if (mmc_slot(host).card_detect)
-               host->carddetect = slot->card_detect(slot->card_detect_irq);
-       else
-               host->carddetect = -ENOSYS;
+       if (host->suspended)
+               return;
 
        sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");
-       if (host->carddetect) {
+
+       if (slot->card_detect)
+               carddetect = slot->card_detect(slot->card_detect_irq);
+       else {
+               omap_hsmmc_protect_card(host);
+               carddetect = -ENOSYS;
+       }
+
+       if (carddetect) {
                mmc_detect_change(host->mmc, (HZ * 200) / 1000);
        } else {
-               mmc_omap_reset_controller_fsm(host, SRD);
+               mmc_host_enable(host->mmc);
+               omap_hsmmc_reset_controller_fsm(host, SRD);
+               mmc_host_lazy_disable(host->mmc);
+
                mmc_detect_change(host->mmc, (HZ * 50) / 1000);
        }
 }
@@ -604,16 +855,18 @@ static void mmc_omap_detect(struct work_struct *work)
 /*
  * ISR for handling card insertion and removal
  */
-static irqreturn_t omap_mmc_cd_handler(int irq, void *dev_id)
+static irqreturn_t omap_hsmmc_cd_handler(int irq, void *dev_id)
 {
-       struct mmc_omap_host *host = (struct mmc_omap_host *)dev_id;
+       struct omap_hsmmc_host *host = (struct omap_hsmmc_host *)dev_id;
 
+       if (host->suspended)
+               return IRQ_HANDLED;
        schedule_work(&host->mmc_carddetect_work);
 
        return IRQ_HANDLED;
 }
 
-static int mmc_omap_get_dma_sync_dev(struct mmc_omap_host *host,
+static int omap_hsmmc_get_dma_sync_dev(struct omap_hsmmc_host *host,
                                     struct mmc_data *data)
 {
        int sync_dev;
@@ -625,7 +878,7 @@ static int mmc_omap_get_dma_sync_dev(struct mmc_omap_host *host,
        return sync_dev;
 }
 
-static void mmc_omap_config_dma_params(struct mmc_omap_host *host,
+static void omap_hsmmc_config_dma_params(struct omap_hsmmc_host *host,
                                       struct mmc_data *data,
                                       struct scatterlist *sgl)
 {
@@ -639,7 +892,7 @@ static void mmc_omap_config_dma_params(struct mmc_omap_host *host,
                        sg_dma_address(sgl), 0, 0);
        } else {
                omap_set_dma_src_params(dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
-                                       (host->mapbase + OMAP_HSMMC_DATA), 0, 0);
+                       (host->mapbase + OMAP_HSMMC_DATA), 0, 0);
                omap_set_dma_dest_params(dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
                        sg_dma_address(sgl), 0, 0);
        }
@@ -649,7 +902,7 @@ static void mmc_omap_config_dma_params(struct mmc_omap_host *host,
 
        omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S32,
                        blksz / 4, nblk, OMAP_DMA_SYNC_FRAME,
-                       mmc_omap_get_dma_sync_dev(host, data),
+                       omap_hsmmc_get_dma_sync_dev(host, data),
                        !(data->flags & MMC_DATA_WRITE));
 
        omap_start_dma(dma_ch);
@@ -658,9 +911,9 @@ static void mmc_omap_config_dma_params(struct mmc_omap_host *host,
 /*
  * DMA call back function
  */
-static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
+static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *data)
 {
-       struct mmc_omap_host *host = data;
+       struct omap_hsmmc_host *host = data;
 
        if (ch_status & OMAP2_DMA_MISALIGNED_ERR_IRQ)
                dev_dbg(mmc_dev(host->mmc), "MISALIGNED_ADRS_ERR\n");
@@ -671,7 +924,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
        host->dma_sg_idx++;
        if (host->dma_sg_idx < host->dma_len) {
                /* Fire up the next transfer. */
-               mmc_omap_config_dma_params(host, host->data,
+               omap_hsmmc_config_dma_params(host, host->data,
                                           host->data->sg + host->dma_sg_idx);
                return;
        }
@@ -688,14 +941,14 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
 /*
  * Routine to configure and start DMA for the MMC card
  */
-static int
-mmc_omap_start_dma_transfer(struct mmc_omap_host *host, struct mmc_request *req)
+static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host,
+                                       struct mmc_request *req)
 {
        int dma_ch = 0, ret = 0, err = 1, i;
        struct mmc_data *data = req->data;
 
        /* Sanity check: all the SG entries must be aligned by block size. */
-       for (i = 0; i < host->dma_len; i++) {
+       for (i = 0; i < data->sg_len; i++) {
                struct scatterlist *sgl;
 
                sgl = data->sg + i;
@@ -726,8 +979,8 @@ mmc_omap_start_dma_transfer(struct mmc_omap_host *host, struct mmc_request *req)
                        return err;
        }
 
-       ret = omap_request_dma(mmc_omap_get_dma_sync_dev(host, data), "MMC/SD",
-                              mmc_omap_dma_cb,host, &dma_ch);
+       ret = omap_request_dma(omap_hsmmc_get_dma_sync_dev(host, data),
+                              "MMC/SD", omap_hsmmc_dma_cb, host, &dma_ch);
        if (ret != 0) {
                dev_err(mmc_dev(host->mmc),
                        "%s: omap_request_dma() failed with %d\n",
@@ -736,17 +989,18 @@ mmc_omap_start_dma_transfer(struct mmc_omap_host *host, struct mmc_request *req)
        }
 
        host->dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg,
-                       data->sg_len, mmc_omap_get_dma_dir(host, data));
+                       data->sg_len, omap_hsmmc_get_dma_dir(host, data));
        host->dma_ch = dma_ch;
        host->dma_sg_idx = 0;
 
-       mmc_omap_config_dma_params(host, data, data->sg);
+       omap_hsmmc_config_dma_params(host, data, data->sg);
 
        return 0;
 }
 
-static void set_data_timeout(struct mmc_omap_host *host,
-                            struct mmc_request *req)
+static void set_data_timeout(struct omap_hsmmc_host *host,
+                            unsigned int timeout_ns,
+                            unsigned int timeout_clks)
 {
        unsigned int timeout, cycle_ns;
        uint32_t reg, clkd, dto = 0;
@@ -757,8 +1011,8 @@ static void set_data_timeout(struct mmc_omap_host *host,
                clkd = 1;
 
        cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd);
-       timeout = req->data->timeout_ns / cycle_ns;
-       timeout += req->data->timeout_clks;
+       timeout = timeout_ns / cycle_ns;
+       timeout += timeout_clks;
        if (timeout) {
                while ((timeout & 0x80000000) == 0) {
                        dto += 1;
@@ -785,22 +1039,28 @@ static void set_data_timeout(struct mmc_omap_host *host,
  * Configure block length for MMC/SD cards and initiate the transfer.
  */
 static int
-mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
+omap_hsmmc_prepare_data(struct omap_hsmmc_host *host, struct mmc_request *req)
 {
        int ret;
        host->data = req->data;
 
        if (req->data == NULL) {
                OMAP_HSMMC_WRITE(host->base, BLK, 0);
+               /*
+                * Set an arbitrary 100ms data timeout for commands with
+                * busy signal.
+                */
+               if (req->cmd->flags & MMC_RSP_BUSY)
+                       set_data_timeout(host, 100000000U, 0);
                return 0;
        }
 
        OMAP_HSMMC_WRITE(host->base, BLK, (req->data->blksz)
                                        | (req->data->blocks << 16));
-       set_data_timeout(host, req);
+       set_data_timeout(host, req->data->timeout_ns, req->data->timeout_clks);
 
        if (host->use_dma) {
-               ret = mmc_omap_start_dma_transfer(host, req);
+               ret = omap_hsmmc_start_dma_transfer(host, req);
                if (ret != 0) {
                        dev_dbg(mmc_dev(host->mmc), "MMC start dma failure\n");
                        return ret;
@@ -812,35 +1072,92 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
 /*
  * Request function. for read/write operation
  */
-static void omap_mmc_request(struct mmc_host *mmc, struct mmc_request *req)
+static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
 {
-       struct mmc_omap_host *host = mmc_priv(mmc);
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+       int err;
 
+       /*
+        * Prevent races with the interrupt handler because of unexpected
+        * interrupts, but not if we are already in interrupt context i.e.
+        * retries.
+        */
+       if (!in_interrupt()) {
+               spin_lock_irqsave(&host->irq_lock, host->flags);
+               /*
+                * Protect the card from I/O if there is a possibility
+                * it can be removed.
+                */
+               if (host->protect_card) {
+                       if (host->reqs_blocked < 3) {
+                               /*
+                                * Ensure the controller is left in a consistent
+                                * state by resetting the command and data state
+                                * machines.
+                                */
+                               omap_hsmmc_reset_controller_fsm(host, SRD);
+                               omap_hsmmc_reset_controller_fsm(host, SRC);
+                               host->reqs_blocked += 1;
+                       }
+                       req->cmd->error = -EBADF;
+                       if (req->data)
+                               req->data->error = -EBADF;
+                       spin_unlock_irqrestore(&host->irq_lock, host->flags);
+                       mmc_request_done(mmc, req);
+                       return;
+               } else if (host->reqs_blocked)
+                       host->reqs_blocked = 0;
+       }
        WARN_ON(host->mrq != NULL);
        host->mrq = req;
-       mmc_omap_prepare_data(host, req);
-       mmc_omap_start_command(host, req->cmd, req->data);
-}
+       err = omap_hsmmc_prepare_data(host, req);
+       if (err) {
+               req->cmd->error = err;
+               if (req->data)
+                       req->data->error = err;
+               host->mrq = NULL;
+               if (!in_interrupt())
+                       spin_unlock_irqrestore(&host->irq_lock, host->flags);
+               mmc_request_done(mmc, req);
+               return;
+       }
 
+       omap_hsmmc_start_command(host, req->cmd, req->data);
+}
 
 /* Routine to configure clock values. Exposed API to core */
-static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
-       struct mmc_omap_host *host = mmc_priv(mmc);
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
        u16 dsor = 0;
        unsigned long regval;
        unsigned long timeout;
        u32 con;
+       int do_send_init_stream = 0;
 
-       switch (ios->power_mode) {
-       case MMC_POWER_OFF:
-               mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
-               break;
-       case MMC_POWER_UP:
-               mmc_slot(host).set_power(host->dev, host->slot_id, 1, ios->vdd);
-               break;
+       mmc_host_enable(host->mmc);
+
+       if (ios->power_mode != host->power_mode) {
+               switch (ios->power_mode) {
+               case MMC_POWER_OFF:
+                       mmc_slot(host).set_power(host->dev, host->slot_id,
+                                                0, 0);
+                       host->vdd = 0;
+                       break;
+               case MMC_POWER_UP:
+                       mmc_slot(host).set_power(host->dev, host->slot_id,
+                                                1, ios->vdd);
+                       host->vdd = ios->vdd;
+                       break;
+               case MMC_POWER_ON:
+                       do_send_init_stream = 1;
+                       break;
+               }
+               host->power_mode = ios->power_mode;
        }
 
+       /* FIXME: set registers based only on changes to ios */
+
        con = OMAP_HSMMC_READ(host->base, CON);
        switch (mmc->ios.bus_width) {
        case MMC_BUS_WIDTH_8:
@@ -870,8 +1187,8 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                                 * MMC_POWER_UP upon recalculating the voltage.
                                 * vdd 1.8v.
                                 */
-                               if (omap_mmc_switch_opcond(host, ios->vdd) != 0)
-                                       dev_dbg(mmc_dev(host->mmc),
+                       if (omap_hsmmc_switch_opcond(host, ios->vdd) != 0)
+                               dev_dbg(mmc_dev(host->mmc),
                                                "Switch operation failed\n");
                }
        }
@@ -887,7 +1204,7 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                if (dsor > 250)
                        dsor = 250;
        }
-       omap_mmc_stop_clock(host);
+       omap_hsmmc_stop_clock(host);
        regval = OMAP_HSMMC_READ(host->base, SYSCTL);
        regval = regval & ~(CLKD_MASK);
        regval = regval | (dsor << 6) | (DTO << 16);
@@ -897,42 +1214,47 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
        /* Wait till the ICS bit is set */
        timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS);
-       while ((OMAP_HSMMC_READ(host->base, SYSCTL) & ICS) != 0x2
+       while ((OMAP_HSMMC_READ(host->base, SYSCTL) & ICS) != ICS
                && time_before(jiffies, timeout))
                msleep(1);
 
        OMAP_HSMMC_WRITE(host->base, SYSCTL,
                OMAP_HSMMC_READ(host->base, SYSCTL) | CEN);
 
-       if (ios->power_mode == MMC_POWER_ON)
+       if (do_send_init_stream)
                send_init_stream(host);
 
+       con = OMAP_HSMMC_READ(host->base, CON);
        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
-               OMAP_HSMMC_WRITE(host->base, CON,
-                               OMAP_HSMMC_READ(host->base, CON) | OD);
+               OMAP_HSMMC_WRITE(host->base, CON, con | OD);
+       else
+               OMAP_HSMMC_WRITE(host->base, CON, con & ~OD);
+
+       if (host->power_mode == MMC_POWER_OFF)
+               mmc_host_disable(host->mmc);
+       else
+               mmc_host_lazy_disable(host->mmc);
 }
 
 static int omap_hsmmc_get_cd(struct mmc_host *mmc)
 {
-       struct mmc_omap_host *host = mmc_priv(mmc);
-       struct omap_mmc_platform_data *pdata = host->pdata;
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
 
-       if (!pdata->slots[0].card_detect)
+       if (!mmc_slot(host).card_detect)
                return -ENOSYS;
-       return pdata->slots[0].card_detect(pdata->slots[0].card_detect_irq);
+       return mmc_slot(host).card_detect(mmc_slot(host).card_detect_irq);
 }
 
 static int omap_hsmmc_get_ro(struct mmc_host *mmc)
 {
-       struct mmc_omap_host *host = mmc_priv(mmc);
-       struct omap_mmc_platform_data *pdata = host->pdata;
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
 
-       if (!pdata->slots[0].get_ro)
+       if (!mmc_slot(host).get_ro)
                return -ENOSYS;
-       return pdata->slots[0].get_ro(host->dev, 0);
+       return mmc_slot(host).get_ro(host->dev, 0);
 }
 
-static void omap_hsmmc_init(struct mmc_omap_host *host)
+static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
 {
        u32 hctl, capa, value;
 
@@ -959,19 +1281,340 @@ static void omap_hsmmc_init(struct mmc_omap_host *host)
        set_sd_bus_power(host);
 }
 
-static struct mmc_host_ops mmc_omap_ops = {
-       .request = omap_mmc_request,
-       .set_ios = omap_mmc_set_ios,
+/*
+ * Dynamic power saving handling, FSM:
+ *   ENABLED -> DISABLED -> CARDSLEEP / REGSLEEP -> OFF
+ *     ^___________|          |                      |
+ *     |______________________|______________________|
+ *
+ * ENABLED:   mmc host is fully functional
+ * DISABLED:  fclk is off
+ * CARDSLEEP: fclk is off, card is asleep, voltage regulator is asleep
+ * REGSLEEP:  fclk is off, voltage regulator is asleep
+ * OFF:       fclk is off, voltage regulator is off
+ *
+ * Transition handlers return the timeout for the next state transition
+ * or negative error.
+ */
+
+enum {ENABLED = 0, DISABLED, CARDSLEEP, REGSLEEP, OFF};
+
+/* Handler for [ENABLED -> DISABLED] transition */
+static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host)
+{
+       omap_hsmmc_context_save(host);
+       clk_disable(host->fclk);
+       host->dpm_state = DISABLED;
+
+       dev_dbg(mmc_dev(host->mmc), "ENABLED -> DISABLED\n");
+
+       if (host->power_mode == MMC_POWER_OFF)
+               return 0;
+
+       return msecs_to_jiffies(OMAP_MMC_SLEEP_TIMEOUT);
+}
+
+/* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */
+static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host)
+{
+       int err, new_state;
+
+       if (!mmc_try_claim_host(host->mmc))
+               return 0;
+
+       clk_enable(host->fclk);
+       omap_hsmmc_context_restore(host);
+       if (mmc_card_can_sleep(host->mmc)) {
+               err = mmc_card_sleep(host->mmc);
+               if (err < 0) {
+                       clk_disable(host->fclk);
+                       mmc_release_host(host->mmc);
+                       return err;
+               }
+               new_state = CARDSLEEP;
+       } else {
+               new_state = REGSLEEP;
+       }
+       if (mmc_slot(host).set_sleep)
+               mmc_slot(host).set_sleep(host->dev, host->slot_id, 1, 0,
+                                        new_state == CARDSLEEP);
+       /* FIXME: turn off bus power and perhaps interrupts too */
+       clk_disable(host->fclk);
+       host->dpm_state = new_state;
+
+       mmc_release_host(host->mmc);
+
+       dev_dbg(mmc_dev(host->mmc), "DISABLED -> %s\n",
+               host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP");
+
+       if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) ||
+           mmc_slot(host).card_detect ||
+           (mmc_slot(host).get_cover_state &&
+            mmc_slot(host).get_cover_state(host->dev, host->slot_id)))
+               return msecs_to_jiffies(OMAP_MMC_OFF_TIMEOUT);
+
+       return 0;
+}
+
+/* Handler for [REGSLEEP / CARDSLEEP -> OFF] transition */
+static int omap_hsmmc_sleep_to_off(struct omap_hsmmc_host *host)
+{
+       if (!mmc_try_claim_host(host->mmc))
+               return 0;
+
+       if (!((host->mmc->caps & MMC_CAP_NONREMOVABLE) ||
+             mmc_slot(host).card_detect ||
+             (mmc_slot(host).get_cover_state &&
+              mmc_slot(host).get_cover_state(host->dev, host->slot_id)))) {
+               mmc_release_host(host->mmc);
+               return 0;
+       }
+
+       mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
+       host->vdd = 0;
+       host->power_mode = MMC_POWER_OFF;
+
+       dev_dbg(mmc_dev(host->mmc), "%s -> OFF\n",
+               host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP");
+
+       host->dpm_state = OFF;
+
+       mmc_release_host(host->mmc);
+
+       return 0;
+}
+
+/* Handler for [DISABLED -> ENABLED] transition */
+static int omap_hsmmc_disabled_to_enabled(struct omap_hsmmc_host *host)
+{
+       int err;
+
+       err = clk_enable(host->fclk);
+       if (err < 0)
+               return err;
+
+       omap_hsmmc_context_restore(host);
+       host->dpm_state = ENABLED;
+
+       dev_dbg(mmc_dev(host->mmc), "DISABLED -> ENABLED\n");
+
+       return 0;
+}
+
+/* Handler for [SLEEP -> ENABLED] transition */
+static int omap_hsmmc_sleep_to_enabled(struct omap_hsmmc_host *host)
+{
+       if (!mmc_try_claim_host(host->mmc))
+               return 0;
+
+       clk_enable(host->fclk);
+       omap_hsmmc_context_restore(host);
+       if (mmc_slot(host).set_sleep)
+               mmc_slot(host).set_sleep(host->dev, host->slot_id, 0,
+                        host->vdd, host->dpm_state == CARDSLEEP);
+       if (mmc_card_can_sleep(host->mmc))
+               mmc_card_awake(host->mmc);
+
+       dev_dbg(mmc_dev(host->mmc), "%s -> ENABLED\n",
+               host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP");
+
+       host->dpm_state = ENABLED;
+
+       mmc_release_host(host->mmc);
+
+       return 0;
+}
+
+/* Handler for [OFF -> ENABLED] transition */
+static int omap_hsmmc_off_to_enabled(struct omap_hsmmc_host *host)
+{
+       clk_enable(host->fclk);
+
+       omap_hsmmc_context_restore(host);
+       omap_hsmmc_conf_bus_power(host);
+       mmc_power_restore_host(host->mmc);
+
+       host->dpm_state = ENABLED;
+
+       dev_dbg(mmc_dev(host->mmc), "OFF -> ENABLED\n");
+
+       return 0;
+}
+
+/*
+ * Bring MMC host to ENABLED from any other PM state.
+ */
+static int omap_hsmmc_enable(struct mmc_host *mmc)
+{
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+
+       switch (host->dpm_state) {
+       case DISABLED:
+               return omap_hsmmc_disabled_to_enabled(host);
+       case CARDSLEEP:
+       case REGSLEEP:
+               return omap_hsmmc_sleep_to_enabled(host);
+       case OFF:
+               return omap_hsmmc_off_to_enabled(host);
+       default:
+               dev_dbg(mmc_dev(host->mmc), "UNKNOWN state\n");
+               return -EINVAL;
+       }
+}
+
+/*
+ * Bring MMC host in PM state (one level deeper).
+ */
+static int omap_hsmmc_disable(struct mmc_host *mmc, int lazy)
+{
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+
+       switch (host->dpm_state) {
+       case ENABLED: {
+               int delay;
+
+               delay = omap_hsmmc_enabled_to_disabled(host);
+               if (lazy || delay < 0)
+                       return delay;
+               return 0;
+       }
+       case DISABLED:
+               return omap_hsmmc_disabled_to_sleep(host);
+       case CARDSLEEP:
+       case REGSLEEP:
+               return omap_hsmmc_sleep_to_off(host);
+       default:
+               dev_dbg(mmc_dev(host->mmc), "UNKNOWN state\n");
+               return -EINVAL;
+       }
+}
+
+static int omap_hsmmc_enable_fclk(struct mmc_host *mmc)
+{
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+       int err;
+
+       err = clk_enable(host->fclk);
+       if (err)
+               return err;
+       dev_dbg(mmc_dev(host->mmc), "mmc_fclk: enabled\n");
+       omap_hsmmc_context_restore(host);
+       return 0;
+}
+
+static int omap_hsmmc_disable_fclk(struct mmc_host *mmc, int lazy)
+{
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+
+       omap_hsmmc_context_save(host);
+       clk_disable(host->fclk);
+       dev_dbg(mmc_dev(host->mmc), "mmc_fclk: disabled\n");
+       return 0;
+}
+
+static const struct mmc_host_ops omap_hsmmc_ops = {
+       .enable = omap_hsmmc_enable_fclk,
+       .disable = omap_hsmmc_disable_fclk,
+       .request = omap_hsmmc_request,
+       .set_ios = omap_hsmmc_set_ios,
        .get_cd = omap_hsmmc_get_cd,
        .get_ro = omap_hsmmc_get_ro,
        /* NYET -- enable_sdio_irq */
 };
 
-static int __init omap_mmc_probe(struct platform_device *pdev)
+static const struct mmc_host_ops omap_hsmmc_ps_ops = {
+       .enable = omap_hsmmc_enable,
+       .disable = omap_hsmmc_disable,
+       .request = omap_hsmmc_request,
+       .set_ios = omap_hsmmc_set_ios,
+       .get_cd = omap_hsmmc_get_cd,
+       .get_ro = omap_hsmmc_get_ro,
+       /* NYET -- enable_sdio_irq */
+};
+
+#ifdef CONFIG_DEBUG_FS
+
+static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
+{
+       struct mmc_host *mmc = s->private;
+       struct omap_hsmmc_host *host = mmc_priv(mmc);
+       int context_loss = 0;
+
+       if (host->pdata->get_context_loss_count)
+               context_loss = host->pdata->get_context_loss_count(host->dev);
+
+       seq_printf(s, "mmc%d:\n"
+                       " enabled:\t%d\n"
+                       " dpm_state:\t%d\n"
+                       " nesting_cnt:\t%d\n"
+                       " ctx_loss:\t%d:%d\n"
+                       "\nregs:\n",
+                       mmc->index, mmc->enabled ? 1 : 0,
+                       host->dpm_state, mmc->nesting_cnt,
+                       host->context_loss, context_loss);
+
+       if (host->suspended || host->dpm_state == OFF) {
+               seq_printf(s, "host suspended, can't read registers\n");
+               return 0;
+       }
+
+       if (clk_enable(host->fclk) != 0) {
+               seq_printf(s, "can't read the regs\n");
+               return 0;
+       }
+
+       seq_printf(s, "SYSCONFIG:\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, SYSCONFIG));
+       seq_printf(s, "CON:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, CON));
+       seq_printf(s, "HCTL:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, HCTL));
+       seq_printf(s, "SYSCTL:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, SYSCTL));
+       seq_printf(s, "IE:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, IE));
+       seq_printf(s, "ISE:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, ISE));
+       seq_printf(s, "CAPA:\t\t0x%08x\n",
+                       OMAP_HSMMC_READ(host->base, CAPA));
+
+       clk_disable(host->fclk);
+
+       return 0;
+}
+
+static int omap_hsmmc_regs_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, omap_hsmmc_regs_show, inode->i_private);
+}
+
+static const struct file_operations mmc_regs_fops = {
+       .open           = omap_hsmmc_regs_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static void omap_hsmmc_debugfs(struct mmc_host *mmc)
+{
+       if (mmc->debugfs_root)
+               debugfs_create_file("regs", S_IRUSR, mmc->debugfs_root,
+                       mmc, &mmc_regs_fops);
+}
+
+#else
+
+static void omap_hsmmc_debugfs(struct mmc_host *mmc)
+{
+}
+
+#endif
+
+static int __init omap_hsmmc_probe(struct platform_device *pdev)
 {
        struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
        struct mmc_host *mmc;
-       struct mmc_omap_host *host = NULL;
+       struct omap_hsmmc_host *host = NULL;
        struct resource *res;
        int ret = 0, irq;
 
@@ -995,7 +1638,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        if (res == NULL)
                return -EBUSY;
 
-       mmc = mmc_alloc_host(sizeof(struct mmc_omap_host), &pdev->dev);
+       mmc = mmc_alloc_host(sizeof(struct omap_hsmmc_host), &pdev->dev);
        if (!mmc) {
                ret = -ENOMEM;
                goto err;
@@ -1013,15 +1656,21 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        host->slot_id   = 0;
        host->mapbase   = res->start;
        host->base      = ioremap(host->mapbase, SZ_4K);
+       host->power_mode = -1;
 
        platform_set_drvdata(pdev, host);
-       INIT_WORK(&host->mmc_carddetect_work, mmc_omap_detect);
+       INIT_WORK(&host->mmc_carddetect_work, omap_hsmmc_detect);
+
+       if (mmc_slot(host).power_saving)
+               mmc->ops        = &omap_hsmmc_ps_ops;
+       else
+               mmc->ops        = &omap_hsmmc_ops;
 
-       mmc->ops        = &mmc_omap_ops;
        mmc->f_min      = 400000;
        mmc->f_max      = 52000000;
 
        sema_init(&host->sem, 1);
+       spin_lock_init(&host->irq_lock);
 
        host->iclk = clk_get(&pdev->dev, "ick");
        if (IS_ERR(host->iclk)) {
@@ -1037,31 +1686,42 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
                goto err1;
        }
 
-       if (clk_enable(host->fclk) != 0) {
+       omap_hsmmc_context_save(host);
+
+       mmc->caps |= MMC_CAP_DISABLE;
+       mmc_set_disable_delay(mmc, OMAP_MMC_DISABLED_TIMEOUT);
+       /* we start off in DISABLED state */
+       host->dpm_state = DISABLED;
+
+       if (mmc_host_enable(host->mmc) != 0) {
                clk_put(host->iclk);
                clk_put(host->fclk);
                goto err1;
        }
 
        if (clk_enable(host->iclk) != 0) {
-               clk_disable(host->fclk);
+               mmc_host_disable(host->mmc);
                clk_put(host->iclk);
                clk_put(host->fclk);
                goto err1;
        }
 
-       host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
-       /*
-        * MMC can still work without debounce clock.
-        */
-       if (IS_ERR(host->dbclk))
-               dev_warn(mmc_dev(host->mmc), "Failed to get debounce clock\n");
-       else
-               if (clk_enable(host->dbclk) != 0)
-                       dev_dbg(mmc_dev(host->mmc), "Enabling debounce"
-                                                       " clk failed\n");
+       if (cpu_is_omap2430()) {
+               host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
+               /*
+                * MMC can still work without debounce clock.
+                */
+               if (IS_ERR(host->dbclk))
+                       dev_warn(mmc_dev(host->mmc),
+                               "Failed to get debounce clock\n");
                else
-                       host->dbclk_enabled = 1;
+                       host->got_dbclk = 1;
+
+               if (host->got_dbclk)
+                       if (clk_enable(host->dbclk) != 0)
+                               dev_dbg(mmc_dev(host->mmc), "Enabling debounce"
+                                                       " clk failed\n");
+       }
 
        /* Since we do only SG emulation, we can have as many segs
         * as we want. */
@@ -1073,14 +1733,18 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
        mmc->max_seg_size = mmc->max_req_size;
 
-       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
+       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
+                    MMC_CAP_WAIT_WHILE_BUSY;
 
-       if (pdata->slots[host->slot_id].wires >= 8)
+       if (mmc_slot(host).wires >= 8)
                mmc->caps |= MMC_CAP_8_BIT_DATA;
-       else if (pdata->slots[host->slot_id].wires >= 4)
+       else if (mmc_slot(host).wires >= 4)
                mmc->caps |= MMC_CAP_4_BIT_DATA;
 
-       omap_hsmmc_init(host);
+       if (mmc_slot(host).nonremovable)
+               mmc->caps |= MMC_CAP_NONREMOVABLE;
+
+       omap_hsmmc_conf_bus_power(host);
 
        /* Select DMA lines */
        switch (host->id) {
@@ -1096,13 +1760,21 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
                host->dma_line_tx = OMAP34XX_DMA_MMC3_TX;
                host->dma_line_rx = OMAP34XX_DMA_MMC3_RX;
                break;
+       case OMAP_MMC4_DEVID:
+               host->dma_line_tx = OMAP44XX_DMA_MMC4_TX;
+               host->dma_line_rx = OMAP44XX_DMA_MMC4_RX;
+               break;
+       case OMAP_MMC5_DEVID:
+               host->dma_line_tx = OMAP44XX_DMA_MMC5_TX;
+               host->dma_line_rx = OMAP44XX_DMA_MMC5_RX;
+               break;
        default:
                dev_err(mmc_dev(host->mmc), "Invalid MMC id\n");
                goto err_irq;
        }
 
        /* Request IRQ for MMC operations */
-       ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED,
+       ret = request_irq(host->irq, omap_hsmmc_irq, IRQF_DISABLED,
                        mmc_hostname(mmc), host);
        if (ret) {
                dev_dbg(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
@@ -1112,7 +1784,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        /* initialize power supplies, gpios, etc */
        if (pdata->init != NULL) {
                if (pdata->init(&pdev->dev) != 0) {
-                       dev_dbg(mmc_dev(host->mmc), "late init error\n");
+                       dev_dbg(mmc_dev(host->mmc),
+                               "Unable to configure MMC IRQs\n");
                        goto err_irq_cd_init;
                }
        }
@@ -1121,7 +1794,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        /* Request IRQ for card detect */
        if ((mmc_slot(host).card_detect_irq)) {
                ret = request_irq(mmc_slot(host).card_detect_irq,
-                                 omap_mmc_cd_handler,
+                                 omap_hsmmc_cd_handler,
                                  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
                                          | IRQF_DISABLED,
                                  mmc_hostname(mmc), host);
@@ -1135,21 +1808,26 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
        OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK);
        OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK);
 
+       mmc_host_lazy_disable(host->mmc);
+
+       omap_hsmmc_protect_card(host);
+
        mmc_add_host(mmc);
 
-       if (host->pdata->slots[host->slot_id].name != NULL) {
+       if (mmc_slot(host).name != NULL) {
                ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
                if (ret < 0)
                        goto err_slot_name;
        }
-       if (mmc_slot(host).card_detect_irq &&
-           host->pdata->slots[host->slot_id].get_cover_state) {
+       if (mmc_slot(host).card_detect_irq && mmc_slot(host).get_cover_state) {
                ret = device_create_file(&mmc->class_dev,
                                        &dev_attr_cover_switch);
                if (ret < 0)
                        goto err_cover_switch;
        }
 
+       omap_hsmmc_debugfs(mmc);
+
        return 0;
 
 err_cover_switch:
@@ -1161,11 +1839,11 @@ err_irq_cd:
 err_irq_cd_init:
        free_irq(host->irq, host);
 err_irq:
-       clk_disable(host->fclk);
+       mmc_host_disable(host->mmc);
        clk_disable(host->iclk);
        clk_put(host->fclk);
        clk_put(host->iclk);
-       if (host->dbclk_enabled) {
+       if (host->got_dbclk) {
                clk_disable(host->dbclk);
                clk_put(host->dbclk);
        }
@@ -1180,12 +1858,13 @@ err:
        return ret;
 }
 
-static int omap_mmc_remove(struct platform_device *pdev)
+static int omap_hsmmc_remove(struct platform_device *pdev)
 {
-       struct mmc_omap_host *host = platform_get_drvdata(pdev);
+       struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
        struct resource *res;
 
        if (host) {
+               mmc_host_enable(host->mmc);
                mmc_remove_host(host->mmc);
                if (host->pdata->cleanup)
                        host->pdata->cleanup(&pdev->dev);
@@ -1194,11 +1873,11 @@ static int omap_mmc_remove(struct platform_device *pdev)
                        free_irq(mmc_slot(host).card_detect_irq, host);
                flush_scheduled_work();
 
-               clk_disable(host->fclk);
+               mmc_host_disable(host->mmc);
                clk_disable(host->iclk);
                clk_put(host->fclk);
                clk_put(host->iclk);
-               if (host->dbclk_enabled) {
+               if (host->got_dbclk) {
                        clk_disable(host->dbclk);
                        clk_put(host->dbclk);
                }
@@ -1216,36 +1895,51 @@ static int omap_mmc_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
+static int omap_hsmmc_suspend(struct platform_device *pdev, pm_message_t state)
 {
        int ret = 0;
-       struct mmc_omap_host *host = platform_get_drvdata(pdev);
+       struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
 
        if (host && host->suspended)
                return 0;
 
        if (host) {
+               host->suspended = 1;
+               if (host->pdata->suspend) {
+                       ret = host->pdata->suspend(&pdev->dev,
+                                                       host->slot_id);
+                       if (ret) {
+                               dev_dbg(mmc_dev(host->mmc),
+                                       "Unable to handle MMC board"
+                                       " level suspend\n");
+                               host->suspended = 0;
+                               return ret;
+                       }
+               }
+               cancel_work_sync(&host->mmc_carddetect_work);
+               mmc_host_enable(host->mmc);
                ret = mmc_suspend_host(host->mmc, state);
                if (ret == 0) {
-                       host->suspended = 1;
-
                        OMAP_HSMMC_WRITE(host->base, ISE, 0);
                        OMAP_HSMMC_WRITE(host->base, IE, 0);
 
-                       if (host->pdata->suspend) {
-                               ret = host->pdata->suspend(&pdev->dev,
-                                                               host->slot_id);
-                               if (ret)
-                                       dev_dbg(mmc_dev(host->mmc),
-                                               "Unable to handle MMC board"
-                                               " level suspend\n");
-                       }
 
                        OMAP_HSMMC_WRITE(host->base, HCTL,
-                                        OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
-                       clk_disable(host->fclk);
+                               OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
+                       mmc_host_disable(host->mmc);
                        clk_disable(host->iclk);
-                       clk_disable(host->dbclk);
+                       if (host->got_dbclk)
+                               clk_disable(host->dbclk);
+               } else {
+                       host->suspended = 0;
+                       if (host->pdata->resume) {
+                               ret = host->pdata->resume(&pdev->dev,
+                                                         host->slot_id);
+                               if (ret)
+                                       dev_dbg(mmc_dev(host->mmc),
+                                               "Unmask interrupt failed\n");
+                       }
+                       mmc_host_disable(host->mmc);
                }
 
        }
@@ -1253,32 +1947,28 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
 }
 
 /* Routine to resume the MMC device */
-static int omap_mmc_resume(struct platform_device *pdev)
+static int omap_hsmmc_resume(struct platform_device *pdev)
 {
        int ret = 0;
-       struct mmc_omap_host *host = platform_get_drvdata(pdev);
+       struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
 
        if (host && !host->suspended)
                return 0;
 
        if (host) {
-
-               ret = clk_enable(host->fclk);
+               ret = clk_enable(host->iclk);
                if (ret)
                        goto clk_en_err;
 
-               ret = clk_enable(host->iclk);
-               if (ret) {
-                       clk_disable(host->fclk);
-                       clk_put(host->fclk);
+               if (mmc_host_enable(host->mmc) != 0) {
+                       clk_disable(host->iclk);
                        goto clk_en_err;
                }
 
-               if (clk_enable(host->dbclk) != 0)
-                       dev_dbg(mmc_dev(host->mmc),
-                                       "Enabling debounce clk failed\n");
+               if (host->got_dbclk)
+                       clk_enable(host->dbclk);
 
-               omap_hsmmc_init(host);
+               omap_hsmmc_conf_bus_power(host);
 
                if (host->pdata->resume) {
                        ret = host->pdata->resume(&pdev->dev, host->slot_id);
@@ -1287,10 +1977,14 @@ static int omap_mmc_resume(struct platform_device *pdev)
                                        "Unmask interrupt failed\n");
                }
 
+               omap_hsmmc_protect_card(host);
+
                /* Notify the core to resume the host */
                ret = mmc_resume_host(host->mmc);
                if (ret == 0)
                        host->suspended = 0;
+
+               mmc_host_lazy_disable(host->mmc);
        }
 
        return ret;
@@ -1302,35 +1996,34 @@ clk_en_err:
 }
 
 #else
-#define omap_mmc_suspend       NULL
-#define omap_mmc_resume                NULL
+#define omap_hsmmc_suspend     NULL
+#define omap_hsmmc_resume              NULL
 #endif
 
-static struct platform_driver omap_mmc_driver = {
-       .probe          = omap_mmc_probe,
-       .remove         = omap_mmc_remove,
-       .suspend        = omap_mmc_suspend,
-       .resume         = omap_mmc_resume,
+static struct platform_driver omap_hsmmc_driver = {
+       .remove         = omap_hsmmc_remove,
+       .suspend        = omap_hsmmc_suspend,
+       .resume         = omap_hsmmc_resume,
        .driver         = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
        },
 };
 
-static int __init omap_mmc_init(void)
+static int __init omap_hsmmc_init(void)
 {
        /* Register the MMC driver */
-       return platform_driver_register(&omap_mmc_driver);
+       return platform_driver_register(&omap_hsmmc_driver);
 }
 
-static void __exit omap_mmc_cleanup(void)
+static void __exit omap_hsmmc_cleanup(void)
 {
        /* Unregister MMC driver */
-       platform_driver_unregister(&omap_mmc_driver);
+       platform_driver_unregister(&omap_hsmmc_driver);
 }
 
-module_init(omap_mmc_init);
-module_exit(omap_mmc_cleanup);
+module_init(omap_hsmmc_init);
+module_exit(omap_hsmmc_cleanup);
 
 MODULE_DESCRIPTION("OMAP High Speed Multimedia Card driver");
 MODULE_LICENSE("GPL");
index 1e8aa59..01ab916 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/mmc/host.h>
+#include <asm/machdep.h>
 #include "sdhci.h"
 
 struct sdhci_of_data {
@@ -48,6 +49,8 @@ struct sdhci_of_host {
 #define ESDHC_CLOCK_HCKEN      0x00000002
 #define ESDHC_CLOCK_IPGEN      0x00000001
 
+#define ESDHC_HOST_CONTROL_RES 0x05
+
 static u32 esdhc_readl(struct sdhci_host *host, int reg)
 {
        return in_be32(host->ioaddr + reg);
@@ -109,13 +112,17 @@ static void esdhc_writeb(struct sdhci_host *host, u8 val, int reg)
        int base = reg & ~0x3;
        int shift = (reg & 0x3) * 8;
 
+       /* Prevent SDHCI core from writing reserved bits (e.g. HISPD). */
+       if (reg == SDHCI_HOST_CONTROL)
+               val &= ~ESDHC_HOST_CONTROL_RES;
+
        clrsetbits_be32(host->ioaddr + base , 0xff << shift, val << shift);
 }
 
 static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
 {
-       int div;
        int pre_div = 2;
+       int div = 1;
 
        clrbits32(host->ioaddr + ESDHC_SYSTEM_CONTROL, ESDHC_CLOCK_IPGEN |
                  ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ESDHC_CLOCK_MASK);
@@ -123,19 +130,17 @@ static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
        if (clock == 0)
                goto out;
 
-       if (host->max_clk / 16 > clock) {
-               for (; pre_div < 256; pre_div *= 2) {
-                       if (host->max_clk / pre_div < clock * 16)
-                               break;
-               }
-       }
+       while (host->max_clk / pre_div / 16 > clock && pre_div < 256)
+               pre_div *= 2;
 
-       for (div = 1; div <= 16; div++) {
-               if (host->max_clk / (div * pre_div) <= clock)
-                       break;
-       }
+       while (host->max_clk / pre_div / div > clock && div < 16)
+               div++;
+
+       dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
+               clock, host->max_clk / pre_div / div);
 
        pre_div >>= 1;
+       div--;
 
        setbits32(host->ioaddr + ESDHC_SYSTEM_CONTROL, ESDHC_CLOCK_IPGEN |
                  ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN |
@@ -165,19 +170,12 @@ static unsigned int esdhc_get_min_clock(struct sdhci_host *host)
        return of_host->clock / 256 / 16;
 }
 
-static unsigned int esdhc_get_timeout_clock(struct sdhci_host *host)
-{
-       struct sdhci_of_host *of_host = sdhci_priv(host);
-
-       return of_host->clock / 1000;
-}
-
 static struct sdhci_of_data sdhci_esdhc = {
        .quirks = SDHCI_QUIRK_FORCE_BLK_SZ_2048 |
                  SDHCI_QUIRK_BROKEN_CARD_DETECTION |
-                 SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
                  SDHCI_QUIRK_NO_BUSY_IRQ |
                  SDHCI_QUIRK_NONSTANDARD_CLOCK |
+                 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
                  SDHCI_QUIRK_PIO_NEEDS_DELAY |
                  SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET |
                  SDHCI_QUIRK_NO_CARD_NO_RESET,
@@ -192,7 +190,6 @@ static struct sdhci_of_data sdhci_esdhc = {
                .enable_dma = esdhc_enable_dma,
                .get_max_clock = esdhc_get_max_clock,
                .get_min_clock = esdhc_get_min_clock,
-               .get_timeout_clock = esdhc_get_timeout_clock,
        },
 };
 
@@ -219,6 +216,15 @@ static int sdhci_of_resume(struct of_device *ofdev)
 
 #endif
 
+static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
+{
+       if (of_get_property(np, "sdhci,wp-inverted", NULL))
+               return true;
+
+       /* Old device trees don't have the wp-inverted property. */
+       return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
+}
+
 static int __devinit sdhci_of_probe(struct of_device *ofdev,
                                 const struct of_device_id *match)
 {
@@ -261,6 +267,9 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
        if (of_get_property(np, "sdhci,1-bit-only", NULL))
                host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
 
+       if (sdhci_of_wp_inverted(np))
+               host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT;
+
        clk = of_get_property(np, "clock-frequency", &size);
        if (clk && size == sizeof(*clk) && *clk)
                of_host->clock = *clk;
index 2f15cc1..e035664 100644 (file)
@@ -83,7 +83,8 @@ static int ricoh_probe(struct sdhci_pci_chip *chip)
        if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM)
                chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET;
 
-       if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)
+       if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG ||
+           chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY)
                chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET;
 
        return 0;
@@ -395,7 +396,7 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host)
 
        if (((pdev->class & 0xFFFF00) == (PCI_CLASS_SYSTEM_SDHCI << 8)) &&
                ((pdev->class & 0x0000FF) != PCI_SDHCI_IFDMA) &&
-               (host->flags & SDHCI_USE_DMA)) {
+               (host->flags & SDHCI_USE_SDMA)) {
                dev_warn(&pdev->dev, "Will use DMA mode even though HW "
                        "doesn't fully claim to support it.\n");
        }
index fc96f8c..c279fbc 100644 (file)
@@ -591,6 +591,9 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data)
        target_timeout = data->timeout_ns / 1000 +
                data->timeout_clks / host->clock;
 
+       if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
+               host->timeout_clk = host->clock / 1000;
+
        /*
         * Figure out needed cycles.
         * We do this in steps in order to fit inside a 32 bit int.
@@ -652,7 +655,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
        count = sdhci_calc_timeout(host, data);
        sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
 
-       if (host->flags & SDHCI_USE_DMA)
+       if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))
                host->flags |= SDHCI_REQ_USE_DMA;
 
        /*
@@ -991,8 +994,8 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
        clk |= SDHCI_CLOCK_INT_EN;
        sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
 
-       /* Wait max 10 ms */
-       timeout = 10;
+       /* Wait max 20 ms */
+       timeout = 20;
        while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
                & SDHCI_CLOCK_INT_STABLE)) {
                if (timeout == 0) {
@@ -1597,7 +1600,7 @@ int sdhci_resume_host(struct sdhci_host *host)
 {
        int ret;
 
-       if (host->flags & SDHCI_USE_DMA) {
+       if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
                if (host->ops->enable_dma)
                        host->ops->enable_dma(host);
        }
@@ -1678,23 +1681,20 @@ int sdhci_add_host(struct sdhci_host *host)
        caps = sdhci_readl(host, SDHCI_CAPABILITIES);
 
        if (host->quirks & SDHCI_QUIRK_FORCE_DMA)
-               host->flags |= SDHCI_USE_DMA;
-       else if (!(caps & SDHCI_CAN_DO_DMA))
-               DBG("Controller doesn't have DMA capability\n");
+               host->flags |= SDHCI_USE_SDMA;
+       else if (!(caps & SDHCI_CAN_DO_SDMA))
+               DBG("Controller doesn't have SDMA capability\n");
        else
-               host->flags |= SDHCI_USE_DMA;
+               host->flags |= SDHCI_USE_SDMA;
 
        if ((host->quirks & SDHCI_QUIRK_BROKEN_DMA) &&
-               (host->flags & SDHCI_USE_DMA)) {
+               (host->flags & SDHCI_USE_SDMA)) {
                DBG("Disabling DMA as it is marked broken\n");
-               host->flags &= ~SDHCI_USE_DMA;
+               host->flags &= ~SDHCI_USE_SDMA;
        }
 
-       if (host->flags & SDHCI_USE_DMA) {
-               if ((host->version >= SDHCI_SPEC_200) &&
-                               (caps & SDHCI_CAN_DO_ADMA2))
-                       host->flags |= SDHCI_USE_ADMA;
-       }
+       if ((host->version >= SDHCI_SPEC_200) && (caps & SDHCI_CAN_DO_ADMA2))
+               host->flags |= SDHCI_USE_ADMA;
 
        if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) &&
                (host->flags & SDHCI_USE_ADMA)) {
@@ -1702,13 +1702,14 @@ int sdhci_add_host(struct sdhci_host *host)
                host->flags &= ~SDHCI_USE_ADMA;
        }
 
-       if (host->flags & SDHCI_USE_DMA) {
+       if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
                if (host->ops->enable_dma) {
                        if (host->ops->enable_dma(host)) {
                                printk(KERN_WARNING "%s: No suitable DMA "
                                        "available. Falling back to PIO.\n",
                                        mmc_hostname(mmc));
-                               host->flags &= ~(SDHCI_USE_DMA | SDHCI_USE_ADMA);
+                               host->flags &=
+                                       ~(SDHCI_USE_SDMA | SDHCI_USE_ADMA);
                        }
                }
        }
@@ -1736,7 +1737,7 @@ int sdhci_add_host(struct sdhci_host *host)
         * mask, but PIO does not need the hw shim so we set a new
         * mask here in that case.
         */
-       if (!(host->flags & SDHCI_USE_DMA)) {
+       if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) {
                host->dma_mask = DMA_BIT_MASK(64);
                mmc_dev(host->mmc)->dma_mask = &host->dma_mask;
        }
@@ -1757,13 +1758,15 @@ int sdhci_add_host(struct sdhci_host *host)
        host->timeout_clk =
                (caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
        if (host->timeout_clk == 0) {
-               if (!host->ops->get_timeout_clock) {
+               if (host->ops->get_timeout_clock) {
+                       host->timeout_clk = host->ops->get_timeout_clock(host);
+               } else if (!(host->quirks &
+                               SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
                        printk(KERN_ERR
                               "%s: Hardware doesn't specify timeout clock "
                               "frequency.\n", mmc_hostname(mmc));
                        return -ENODEV;
                }
-               host->timeout_clk = host->ops->get_timeout_clock(host);
        }
        if (caps & SDHCI_TIMEOUT_CLK_UNIT)
                host->timeout_clk *= 1000;
@@ -1772,7 +1775,8 @@ int sdhci_add_host(struct sdhci_host *host)
         * Set host parameters.
         */
        mmc->ops = &sdhci_ops;
-       if (host->ops->get_min_clock)
+       if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK &&
+                       host->ops->set_clock && host->ops->get_min_clock)
                mmc->f_min = host->ops->get_min_clock(host);
        else
                mmc->f_min = host->max_clk / 256;
@@ -1810,7 +1814,7 @@ int sdhci_add_host(struct sdhci_host *host)
         */
        if (host->flags & SDHCI_USE_ADMA)
                mmc->max_hw_segs = 128;
-       else if (host->flags & SDHCI_USE_DMA)
+       else if (host->flags & SDHCI_USE_SDMA)
                mmc->max_hw_segs = 1;
        else /* PIO */
                mmc->max_hw_segs = 128;
@@ -1893,10 +1897,10 @@ int sdhci_add_host(struct sdhci_host *host)
 
        mmc_add_host(mmc);
 
-       printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s%s\n",
+       printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s\n",
                mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
-               (host->flags & SDHCI_USE_ADMA)?"A":"",
-               (host->flags & SDHCI_USE_DMA)?"DMA":"PIO");
+               (host->flags & SDHCI_USE_ADMA) ? "ADMA" :
+               (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO");
 
        sdhci_enable_card_detection(host);
 
index c77e9ff..ce5f1d7 100644 (file)
 #define  SDHCI_CAN_DO_ADMA2    0x00080000
 #define  SDHCI_CAN_DO_ADMA1    0x00100000
 #define  SDHCI_CAN_DO_HISPD    0x00200000
-#define  SDHCI_CAN_DO_DMA      0x00400000
+#define  SDHCI_CAN_DO_SDMA     0x00400000
 #define  SDHCI_CAN_VDD_330     0x01000000
 #define  SDHCI_CAN_VDD_300     0x02000000
 #define  SDHCI_CAN_VDD_180     0x04000000
@@ -232,6 +232,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK_FORCE_1_BIT_DATA                   (1<<22)
 /* Controller needs 10ms delay between applying power and clock */
 #define SDHCI_QUIRK_DELAY_AFTER_POWER                  (1<<23)
+/* Controller uses SDCLK instead of TMCLK for data timeouts */
+#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK            (1<<24)
 
        int                     irq;            /* Device IRQ */
        void __iomem *          ioaddr;         /* Mapped address */
@@ -250,7 +252,7 @@ struct sdhci_host {
        spinlock_t              lock;           /* Mutex */
 
        int                     flags;          /* Host attributes */
-#define SDHCI_USE_DMA          (1<<0)          /* Host is DMA capable */
+#define SDHCI_USE_SDMA         (1<<0)          /* Host is SDMA capable */
 #define SDHCI_USE_ADMA         (1<<1)          /* Host is ADMA capable */
 #define SDHCI_REQ_USE_DMA      (1<<2)          /* Use DMA for this req. */
 #define SDHCI_DEVICE_DEAD      (1<<3)          /* Device unresponsive */
index 10ed195..eb495d8 100644 (file)
@@ -776,13 +776,13 @@ static struct spi_driver m25p80_driver = {
 };
 
 
-static int m25p80_init(void)
+static int __init m25p80_init(void)
 {
        return spi_register_driver(&m25p80_driver);
 }
 
 
-static void m25p80_exit(void)
+static void __exit m25p80_exit(void)
 {
        spi_unregister_driver(&m25p80_driver);
 }
index 43976aa..211c27a 100644 (file)
@@ -966,3 +966,4 @@ module_exit(dataflash_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Andrew Victor, David Brownell");
 MODULE_DESCRIPTION("MTD DataFlash driver");
+MODULE_ALIAS("spi:mtd_dataflash");
index 00248e8..7d846e9 100644 (file)
@@ -303,7 +303,7 @@ __setup("slram=", mtd_slram_setup);
 
 #endif
 
-static int init_slram(void)
+static int __init init_slram(void)
 {
        char *devname;
        int i;
index a790c06..e56d6b4 100644 (file)
@@ -1099,7 +1099,7 @@ static struct mtd_blktrans_ops ftl_tr = {
        .owner          = THIS_MODULE,
 };
 
-static int init_ftl(void)
+static int __init init_ftl(void)
 {
        return register_mtd_blktrans(&ftl_tr);
 }
index d4fb9a3..1bdf0ee 100644 (file)
@@ -184,7 +184,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
        info->map.bankwidth = 1;
 
        /*
-        * map_priv_2 is used to store a ptr to to the bank_setup routine
+        * map_priv_2 is used to store a ptr to the bank_setup routine
         */
        info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
 
index 7baba40..0acbf4f 100644 (file)
@@ -210,7 +210,7 @@ static int blktrans_ioctl(struct block_device *bdev, fmode_t mode,
        }
 }
 
-static struct block_device_operations mtd_blktrans_ops = {
+static const struct block_device_operations mtd_blktrans_ops = {
        .owner          = THIS_MODULE,
        .open           = blktrans_open,
        .release        = blktrans_release,
index 29acd06..1b4690b 100644 (file)
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = {
        .resume = cafe_nand_resume,
 };
 
-static int cafe_nand_init(void)
+static int __init cafe_nand_init(void)
 {
        return pci_register_driver(&cafe_nand_pci_driver);
 }
 
-static void cafe_nand_exit(void)
+static void __exit cafe_nand_exit(void)
 {
        pci_unregister_driver(&cafe_nand_pci_driver);
 }
index 10081e6..826cacf 100644 (file)
@@ -147,7 +147,7 @@ static int cmx270_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int cmx270_init(void)
+static int __init cmx270_init(void)
 {
        struct nand_chip *this;
        const char *part_type;
@@ -261,7 +261,7 @@ module_init(cmx270_init);
 /*
  * Clean up routine
  */
-static void cmx270_cleanup(void)
+static void __exit cmx270_cleanup(void)
 {
        /* Release resources, unregister device */
        nand_release(cmx270_nand_mtd);
index 54b0186..4876977 100644 (file)
@@ -196,4 +196,36 @@ void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req)
        printk(KERN_DEBUG "\t1st 16 characters of name: %s\n", nm);
 }
 
+/**
+ * ubi_dbg_dump_flash - dump a region of flash.
+ * @ubi: UBI device description object
+ * @pnum: the physical eraseblock number to dump
+ * @offset: the starting offset within the physical eraseblock to dump
+ * @len: the length of the region to dump
+ */
+void ubi_dbg_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len)
+{
+       int err;
+       size_t read;
+       void *buf;
+       loff_t addr = (loff_t)pnum * ubi->peb_size + offset;
+
+       buf = vmalloc(len);
+       if (!buf)
+               return;
+       err = ubi->mtd->read(ubi->mtd, addr, len, &read, buf);
+       if (err && err != -EUCLEAN) {
+               ubi_err("error %d while reading %d bytes from PEB %d:%d, "
+                       "read %zd bytes", err, len, pnum, offset, read);
+               goto out;
+       }
+
+       dbg_msg("dumping %d bytes of data from PEB %d, offset %d",
+               len, pnum, offset);
+       print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, 1);
+out:
+       vfree(buf);
+       return;
+}
+
 #endif /* CONFIG_MTD_UBI_DEBUG */
index a4da7a0..f30bcb3 100644 (file)
@@ -55,6 +55,7 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);
 void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv);
 void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type);
 void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req);
+void ubi_dbg_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len);
 
 #ifdef CONFIG_MTD_UBI_DEBUG_MSG
 /* General debugging messages */
@@ -167,6 +168,7 @@ static inline int ubi_dbg_is_erase_failure(void)
 #define ubi_dbg_dump_sv(sv)              ({})
 #define ubi_dbg_dump_seb(seb, type)      ({})
 #define ubi_dbg_dump_mkvol_req(req)      ({})
+#define ubi_dbg_dump_flash(ubi, pnum, offset, len) ({})
 
 #define UBI_IO_DEBUG               0
 #define DBG_DISABLE_BGT            0
index e4d9ef0..9f87c99 100644 (file)
@@ -1065,7 +1065,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
        }
 
        /*
-        * Now we have got to calculate how much data we have to to copy. In
+        * Now we have got to calculate how much data we have to copy. In
         * case of a static volume it is fairly easy - the VID header contains
         * the data size. In case of a dynamic volume it is more difficult - we
         * have to read the contents, cut 0xFF bytes from the end and copy only
index 4cb6992..8aa51e7 100644 (file)
@@ -269,6 +269,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
                ubi_err("error %d while writing %d bytes to PEB %d:%d, written "
                        "%zd bytes", err, len, pnum, offset, written);
                ubi_dbg_dump_stack();
+               ubi_dbg_dump_flash(ubi, pnum, offset, len);
        } else
                ubi_assert(written == len);
 
@@ -475,30 +476,46 @@ out:
  */
 static int nor_erase_prepare(struct ubi_device *ubi, int pnum)
 {
-       int err;
+       int err, err1;
        size_t written;
        loff_t addr;
        uint32_t data = 0;
+       struct ubi_vid_hdr vid_hdr;
 
-       addr = (loff_t)pnum * ubi->peb_size;
+       addr = (loff_t)pnum * ubi->peb_size + ubi->vid_hdr_aloffset;
        err = ubi->mtd->write(ubi->mtd, addr, 4, &written, (void *)&data);
-       if (err) {
-               ubi_err("error %d while writing 4 bytes to PEB %d:%d, written "
-                       "%zd bytes", err, pnum, 0, written);
-               ubi_dbg_dump_stack();
-               return err;
+       if (!err) {
+               addr -= ubi->vid_hdr_aloffset;
+               err = ubi->mtd->write(ubi->mtd, addr, 4, &written,
+                                     (void *)&data);
+               if (!err)
+                       return 0;
        }
 
-       addr += ubi->vid_hdr_aloffset;
-       err = ubi->mtd->write(ubi->mtd, addr, 4, &written, (void *)&data);
-       if (err) {
-               ubi_err("error %d while writing 4 bytes to PEB %d:%d, written "
-                       "%zd bytes", err, pnum, ubi->vid_hdr_aloffset, written);
-               ubi_dbg_dump_stack();
-               return err;
-       }
+       /*
+        * We failed to write to the media. This was observed with Spansion
+        * S29GL512N NOR flash. Most probably the eraseblock erasure was
+        * interrupted at a very inappropriate moment, so it became unwritable.
+        * In this case we probably anyway have garbage in this PEB.
+        */
+       err1 = ubi_io_read_vid_hdr(ubi, pnum, &vid_hdr, 0);
+       if (err1 == UBI_IO_BAD_VID_HDR)
+               /*
+                * The VID header is corrupted, so we can safely erase this
+                * PEB and not afraid that it will be treated as a valid PEB in
+                * case of an unclean reboot.
+                */
+               return 0;
 
-       return 0;
+       /*
+        * The PEB contains a valid VID header, but we cannot invalidate it.
+        * Supposedly the flash media or the driver is screwed up, so return an
+        * error.
+        */
+       ubi_err("cannot invalidate PEB %d, write returned %d read returned %d",
+               pnum, err, err1);
+       ubi_dbg_dump_flash(ubi, pnum, 0, ubi->peb_size);
+       return -EIO;
 }
 
 /**
index b847745..e7161ad 100644 (file)
@@ -75,9 +75,10 @@ static int add_to_list(struct ubi_scan_info *si, int pnum, int ec,
                dbg_bld("add to free: PEB %d, EC %d", pnum, ec);
        else if (list == &si->erase)
                dbg_bld("add to erase: PEB %d, EC %d", pnum, ec);
-       else if (list == &si->corr)
+       else if (list == &si->corr) {
                dbg_bld("add to corrupted: PEB %d, EC %d", pnum, ec);
-       else if (list == &si->alien)
+               si->corr_count += 1;
+       } else if (list == &si->alien)
                dbg_bld("add to alien: PEB %d, EC %d", pnum, ec);
        else
                BUG();
@@ -864,7 +865,9 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
                }
        }
 
-       /* Both UBI headers seem to be fine */
+       if (ec_corr)
+               ubi_warn("valid VID header but corrupted EC header at PEB %d",
+                        pnum);
        err = ubi_scan_add_used(ubi, si, pnum, ec, vidh, bitflips);
        if (err)
                return err;
@@ -935,6 +938,19 @@ struct ubi_scan_info *ubi_scan(struct ubi_device *ubi)
        if (si->is_empty)
                ubi_msg("empty MTD device detected");
 
+       /*
+        * Few corrupted PEBs are not a problem and may be just a result of
+        * unclean reboots. However, many of them may indicate some problems
+        * with the flash HW or driver. Print a warning in this case.
+        */
+       if (si->corr_count >= 8 || si->corr_count >= ubi->peb_count / 4) {
+               ubi_warn("%d PEBs are corrupted", si->corr_count);
+               printk(KERN_WARNING "corrupted PEBs are:");
+               list_for_each_entry(seb, &si->corr, u.list)
+                       printk(KERN_CONT " %d", seb->pnum);
+               printk(KERN_CONT "\n");
+       }
+
        /*
         * In case of unknown erase counter we use the mean erase counter
         * value.
index 1017cf1..bab3169 100644 (file)
@@ -102,6 +102,7 @@ struct ubi_scan_volume {
  * @mean_ec: mean erase counter value
  * @ec_sum: a temporary variable used when calculating @mean_ec
  * @ec_count: a temporary variable used when calculating @mean_ec
+ * @corr_count: count of corrupted PEBs
  * @image_seq_set: indicates @ubi->image_seq is known
  *
  * This data structure contains the result of scanning and may be used by other
@@ -125,6 +126,7 @@ struct ubi_scan_info {
        int mean_ec;
        uint64_t ec_sum;
        int ec_count;
+       int corr_count;
        int image_seq_set;
 };
 
index 6a5fe96..1af0817 100644 (file)
@@ -570,7 +570,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol,
 
 /*
  * ubi_rb_for_each_entry - walk an RB-tree.
- * @rb: a pointer to type 'struct rb_node' to to use as a loop counter
+ * @rb: a pointer to type 'struct rb_node' to use as a loop counter
  * @pos: a pointer to RB-tree entry type to use as a loop counter
  * @root: RB-tree's root
  * @member: the name of the 'struct rb_node' within the RB-tree entry
@@ -579,7 +579,8 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol,
        for (rb = rb_first(root),                                            \
             pos = (rb ? container_of(rb, typeof(*pos), member) : NULL);     \
             rb;                                                             \
-            rb = rb_next(rb), pos = container_of(rb, typeof(*pos), member))
+            rb = rb_next(rb),                                               \
+            pos = (rb ? container_of(rb, typeof(*pos), member) : NULL))
 
 /**
  * ubi_zalloc_vid_hdr - allocate a volume identifier header object.
index 646dfc5..8ea9c75 100644 (file)
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum,
        BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
        skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
        netif_rx(skb);
 }
 
index 083e210..66bcbbb 100644 (file)
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum,
        BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
        skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
        netif_rx(skb);
 }
 
index 0695be1..aa76cba 100644 (file)
    The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] -
    header pointer. */
 #define TCM_REG_XX_TABLE                                        0x50240
-/* [RW 4] Load value for for cfc ac credit cnt. */
+/* [RW 4] Load value for cfc ac credit cnt. */
 #define TM_REG_CFC_AC_CRDCNT_VAL                                0x164208
 /* [RW 4] Load value for cfc cld credit cnt. */
 #define TM_REG_CFC_CLD_CRDCNT_VAL                               0x164210
index cea5cfe..c3fa31c 100644 (file)
@@ -1987,7 +1987,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                        // find new aggregator for the related port(s)
                        new_aggregator = __get_first_agg(port);
                        for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) {
-                               // if the new aggregator is empty, or it connected to to our port only
+                               // if the new aggregator is empty, or it is connected to our port only
                                if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) {
                                        break;
                                }
index cda6b39..45ac225 100644 (file)
@@ -3035,7 +3035,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw)
                 /* If TBI compatibility is was previously off, turn it on. For
                  * compatibility with a TBI link partner, we will store bad
                  * packets. Some frames have an additional byte on the end and
-                 * will look like CRC errors to to the hardware.
+                 * will look like CRC errors to the hardware.
                  */
                 if (!hw->tbi_compatibility_on) {
                     hw->tbi_compatibility_on = true;
index 3747457..bc7c5b7 100644 (file)
@@ -751,7 +751,7 @@ int ehea_create_busmap(void)
 
        mutex_lock(&ehea_busmap_mutex);
        ehea_mr_len = 0;
-       ret = walk_memory_resource(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
+       ret = walk_system_ram_range(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
                                   ehea_create_busmap_callback);
        mutex_unlock(&ehea_busmap_mutex);
        return ret;
index 117fc6c..66813c9 100644 (file)
@@ -1666,3 +1666,4 @@ MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>");
 MODULE_LICENSE("GPL");
 module_param_named(debug, debug.msg_enable, int, 0);
 MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., ffff=all)");
+MODULE_ALIAS("spi:" DRV_NAME);
index 2234118..6c144b5 100644 (file)
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
        rxtime  = get_ictt_value(priv->rxic);
        rxcount = get_icft_value(priv->rxic);
        txtime  = get_ictt_value(priv->txic);
-       txcount = get_icft_value(priv->txic);;
+       txcount = get_icft_value(priv->txic);
        cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime);
        cvals->rx_max_coalesced_frames = rxcount;
 
index 1d7d7fe..89c82c5 100644 (file)
@@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)
        if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
                dev->mdio_ph = 0;
        if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
-               dev->zmii_ph = 0;;
+               dev->zmii_ph = 0;
        if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0))
-               dev->zmii_port = 0xffffffff;;
+               dev->zmii_port = 0xffffffff;
        if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0))
-               dev->rgmii_ph = 0;;
+               dev->rgmii_ph = 0;
        if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0))
-               dev->rgmii_port = 0xffffffff;;
+               dev->rgmii_port = 0xffffffff;
        if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0))
                dev->fifo_entry_size = 16;
        if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0))
index d2639c4..5d6c153 100644 (file)
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
        /* VFs are limited to using the MTA hash table for their multicast
         * addresses */
        for (i = 0; i < n; i++)
-               vf_data->vf_mc_hashes[i] = hash_list[i];;
+               vf_data->vf_mc_hashes[i] = hash_list[i];
 
        /* Flush and reset the mta with the new values */
        igb_set_rx_mode(adapter->netdev);
index 547ac7c..2378358 100644 (file)
@@ -1321,3 +1321,4 @@ MODULE_LICENSE("GPL");
 
 module_param_named(message, msg_enable, int, 0);
 MODULE_PARM_DESC(message, "Message verbosity level (0=none, 31=all)");
+MODULE_ALIAS("spi:ks8851");
index da8d0a0..f2a197f 100644 (file)
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        dcrs = dcr_resource_start(np, 0);
        if (dcrs == 0) {
                dev_err(&op->dev, "could not get DMA register address\n");
-               goto nodev;;
+               goto nodev;
        }
        lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
        dev_dbg(&op->dev, "DCR base: %x\n", dcrs);
index fb65b42..1d0d4d9 100644 (file)
@@ -241,7 +241,7 @@ static int macb_mii_init(struct macb *bp)
        struct eth_platform_data *pdata;
        int err = -ENXIO, i;
 
-       /* Enable managment port */
+       /* Enable management port */
        macb_writel(bp, NCR, MACB_BIT(MPE));
 
        bp->mii_bus = mdiobus_alloc();
index bd0ac69..aad3b37 100644 (file)
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
        /* addr_len |!src_insert |pre-len |loopback */
        writeb(0x2e, &cfg_cmd->adr_len);
        writeb(0x00, &cfg_cmd->priority);
-       writeb(0x60, &cfg_cmd->ifs);;
+       writeb(0x60, &cfg_cmd->ifs);
        writeb(0x00, &cfg_cmd->time_low);
        writeb(0xf2, &cfg_cmd->time_high);
-       writeb(0x00, &cfg_cmd->promisc);;
+       writeb(0x00, &cfg_cmd->promisc);
        if (dev->flags & IFF_ALLMULTI) {
                int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
                if (num_addrs > len) {
index 76cc261..f9364d0 100644 (file)
@@ -5615,7 +5615,7 @@ static void niu_init_tx_mac(struct niu *np)
        /* The XMAC_MIN register only accepts values for TX min which
         * have the low 3 bits cleared.
         */
-       BUILD_BUG_ON(min & 0x7);
+       BUG_ON(min & 0x7);
 
        if (np->flags & NIU_FLAGS_XMAC)
                niu_init_tx_xmac(np, min, max);
index 2205292..7783c5d 100644 (file)
@@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
            FLAGS_LI;           /* Load irq delay values */
        if (rx_ring->lbq_len) {
                cqicb->flags |= FLAGS_LL;       /* Load lbq values */
-               tmp = (u64)rx_ring->lbq_base_dma;;
+               tmp = (u64)rx_ring->lbq_base_dma;
                base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect;
                page_entries = 0;
                do {
@@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
        }
        if (rx_ring->sbq_len) {
                cqicb->flags |= FLAGS_LS;       /* Load sbq values */
-               tmp = (u64)rx_ring->sbq_base_dma;;
+               tmp = (u64)rx_ring->sbq_base_dma;
                base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect;
                page_entries = 0;
                do {
index bc98e7f..ede937e 100644 (file)
@@ -72,7 +72,7 @@ static int rionet_check = 0;
 static int rionet_capable = 1;
 
 /*
- * This is a fast lookup table for for translating TX
+ * This is a fast lookup table for translating TX
  * Ethernet packets into a destination RIO device. It
  * could be made into a hash table to save memory depending
  * on system trade-offs.
index f1df2ec..e6b33ee 100644 (file)
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)
                        /*PC88b*/
                        if (!phy->cf_join) {
                                phy->cf_join = TRUE ;
-                               queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ;
+                               queue_event(smc,EVENT_CFM,CF_JOIN+np) ;
                        }
                        if (cmd == PC_JOIN)
                                GO_STATE(PC8_ACTIVE) ;
index 79e665e..a320fdb 100644 (file)
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                                mib_p->fddiPORTLerFlag ;
                        sp->p4050_pad = 0 ;
                        sp->p4050_cutoff =
-                               mib_p->fddiPORTLer_Cutoff ; ;
+                               mib_p->fddiPORTLer_Cutoff ;
                        sp->p4050_alarm =
-                               mib_p->fddiPORTLer_Alarm ; ;
+                               mib_p->fddiPORTLer_Alarm ;
                        sp->p4050_estimate =
                                mib_p->fddiPORTLer_Estimate ;
                        sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                        sp->p4051_porttype =
                                mib_p->fddiPORTMy_Type ;
                        sp->p4051_connectstate =
-                               mib_p->fddiPORTConnectState ; ;
+                               mib_p->fddiPORTConnectState ;
                        sp->p4051_pc_neighbor =
                                mib_p->fddiPORTNeighborType ;
                        sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                        struct smt_p_4053       *sp ;
                        sp = (struct smt_p_4053 *) to ;
                        sp->p4053_multiple =
-                               mib_p->fddiPORTMultiple_P ; ;
+                               mib_p->fddiPORTMultiple_P ;
                        sp->p4053_availablepaths =
                                mib_p->fddiPORTAvailablePaths ;
                        sp->p4053_currentpath =
index 62e852e..55bad40 100644 (file)
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)
        if (skge->wol & WAKE_MAGIC)
                ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
        else
-               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
        ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
        skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
index 4bb52e9..15140f9 100644 (file)
@@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
        if (sky2->wol & WAKE_MAGIC)
                ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
        else
-               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
        ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
        sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
index 26f6ee9..e17c535 100644 (file)
@@ -616,6 +616,14 @@ static void sl_uninit(struct net_device *dev)
        sl_free_bufs(sl);
 }
 
+/* Hook the destructor so we can free slip devices at the right point in time */
+static void sl_free_netdev(struct net_device *dev)
+{
+       int i = dev->base_addr;
+       free_netdev(dev);
+       slip_devs[i] = NULL;
+}
+
 static const struct net_device_ops sl_netdev_ops = {
        .ndo_init               = sl_init,
        .ndo_uninit             = sl_uninit,
@@ -634,7 +642,7 @@ static const struct net_device_ops sl_netdev_ops = {
 static void sl_setup(struct net_device *dev)
 {
        dev->netdev_ops         = &sl_netdev_ops;
-       dev->destructor         = free_netdev;
+       dev->destructor         = sl_free_netdev;
 
        dev->hard_header_len    = 0;
        dev->addr_len           = 0;
@@ -712,8 +720,6 @@ static void sl_sync(void)
 static struct slip *sl_alloc(dev_t line)
 {
        int i;
-       int sel = -1;
-       int score = -1;
        struct net_device *dev = NULL;
        struct slip       *sl;
 
@@ -724,55 +730,7 @@ static struct slip *sl_alloc(dev_t line)
                dev = slip_devs[i];
                if (dev == NULL)
                        break;
-
-               sl = netdev_priv(dev);
-               if (sl->leased) {
-                       if (sl->line != line)
-                               continue;
-                       if (sl->tty)
-                               return NULL;
-
-                       /* Clear ESCAPE & ERROR flags */
-                       sl->flags &= (1 << SLF_INUSE);
-                       return sl;
-               }
-
-               if (sl->tty)
-                       continue;
-
-               if (current->pid == sl->pid) {
-                       if (sl->line == line && score < 3) {
-                               sel = i;
-                               score = 3;
-                               continue;
-                       }
-                       if (score < 2) {
-                               sel = i;
-                               score = 2;
-                       }
-                       continue;
-               }
-               if (sl->line == line && score < 1) {
-                       sel = i;
-                       score = 1;
-                       continue;
-               }
-               if (score < 0) {
-                       sel = i;
-                       score = 0;
-               }
-       }
-
-       if (sel >= 0) {
-               i = sel;
-               dev = slip_devs[i];
-               if (score > 1) {
-                       sl = netdev_priv(dev);
-                       sl->flags &= (1 << SLF_INUSE);
-                       return sl;
-               }
        }
-
        /* Sorry, too many, all slots in use */
        if (i >= slip_maxdev)
                return NULL;
@@ -908,31 +866,14 @@ err_exit:
        return err;
 }
 
-/*
-
-  FIXME: 1,2 are fixed 3 was never true anyway.
-
-   Let me to blame a bit.
-   1. TTY module calls this funstion on soft interrupt.
-   2. TTY module calls this function WITH MASKED INTERRUPTS!
-   3. TTY module does not notify us about line discipline
-      shutdown,
-
-   Seems, now it is clean. The solution is to consider netdevice and
-   line discipline sides as two independent threads.
-
-   By-product (not desired): sl? does not feel hangups and remains open.
-   It is supposed, that user level program (dip, diald, slattach...)
-   will catch SIGHUP and make the rest of work.
-
-   I see no way to make more with current tty code. --ANK
- */
-
 /*
  * Close down a SLIP channel.
  * This means flushing out any pending queues, and then returning. This
  * call is serialized against other ldisc functions.
+ *
+ * We also use this method fo a hangup event
  */
+
 static void slip_close(struct tty_struct *tty)
 {
        struct slip *sl = tty->disc_data;
@@ -951,10 +892,16 @@ static void slip_close(struct tty_struct *tty)
        del_timer_sync(&sl->keepalive_timer);
        del_timer_sync(&sl->outfill_timer);
 #endif
-
-       /* Count references from TTY module */
+       /* Flush network side */
+       unregister_netdev(sl->dev);
+       /* This will complete via sl_free_netdev */
 }
 
+static int slip_hangup(struct tty_struct *tty)
+{
+       slip_close(tty);
+       return 0;
+}
  /************************************************************************
   *                    STANDARD SLIP ENCAPSULATION                      *
   ************************************************************************/
@@ -1311,6 +1258,7 @@ static struct tty_ldisc_ops sl_ldisc = {
        .name           = "slip",
        .open           = slip_open,
        .close          = slip_close,
+       .hangup         = slip_hangup,
        .ioctl          = slip_ioctl,
        .receive_buf    = slip_receive_buf,
        .write_wakeup   = slip_write_wakeup,
@@ -1384,6 +1332,8 @@ static void __exit slip_exit(void)
                }
        } while (busy && time_before(jiffies, timeout));
 
+       /* FIXME: hangup is async so we should wait when doing this second
+          phase */
 
        for (i = 0; i < slip_maxdev; i++) {
                dev = slip_devs[i];
index 3f5d288..d3ee199 100644 (file)
@@ -1370,7 +1370,7 @@ static const struct file_operations tun_fops = {
 static struct miscdevice tun_miscdev = {
        .minor = TUN_MINOR,
        .name = "tun",
-       .devnode = "net/tun",
+       .nodename = "net/tun",
        .fops = &tun_fops,
 };
 
index 45cebfb..2330065 100644 (file)
@@ -300,20 +300,23 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                                        return 0;
                        }
 
-                       crc = get_unaligned_le32(skb2->data
-                                       + len - ETH_FCS_LEN);
-                       skb_trim(skb2, len - ETH_FCS_LEN);
-
                        /*
                         * The bmCRC helps to denote when the CRC field in
                         * the Ethernet frame contains a calculated CRC:
                         *      bmCRC = 1       : CRC is calculated
                         *      bmCRC = 0       : CRC = 0xDEADBEEF
                         */
-                       if (header & BIT(14))
-                               crc2 = ~crc32_le(~0, skb2->data, skb2->len);
-                       else
+                       if (header & BIT(14)) {
+                               crc = get_unaligned_le32(skb2->data
+                                               + len - ETH_FCS_LEN);
+                               crc2 = ~crc32_le(~0, skb2->data, skb2->len
+                                               - ETH_FCS_LEN);
+                       } else {
+                               crc = get_unaligned_be32(skb2->data
+                                               + len - ETH_FCS_LEN);
                                crc2 = 0xdeadbeef;
+                       }
+                       skb_trim(skb2, len - ETH_FCS_LEN);
 
                        if (is_last)
                                return crc == crc2;
index 32266fb..5c498d2 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/ethtool.h>
 #include <linux/module.h>
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_net.h>
 #include <linux/scatterlist.h>
 #include <linux/if_vlan.h>
@@ -320,7 +321,7 @@ static bool try_fill_recv_maxbufs(struct virtnet_info *vi, gfp_t gfp)
                skb_queue_head(&vi->recv, skb);
 
                err = vi->rvq->vq_ops->add_buf(vi->rvq, sg, 0, num, skb);
-               if (err) {
+               if (err < 0) {
                        skb_unlink(skb, &vi->recv);
                        trim_pages(vi, skb);
                        kfree_skb(skb);
@@ -373,7 +374,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
                skb_queue_head(&vi->recv, skb);
 
                err = vi->rvq->vq_ops->add_buf(vi->rvq, sg, 0, 1, skb);
-               if (err) {
+               if (err < 0) {
                        skb_unlink(skb, &vi->recv);
                        kfree_skb(skb);
                        break;
@@ -527,7 +528,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
        num = skb_to_sgvec(skb, sg+1, 0, skb->len) + 1;
 
        err = vi->svq->vq_ops->add_buf(vi->svq, sg, num, 0, skb);
-       if (!err && !vi->free_in_tasklet)
+       if (err >= 0 && !vi->free_in_tasklet)
                mod_timer(&vi->xmit_free_timer, jiffies + (HZ/10));
 
        return err;
@@ -538,7 +539,7 @@ static void xmit_tasklet(unsigned long data)
        struct virtnet_info *vi = (void *)data;
 
        netif_tx_lock_bh(vi->dev);
-       if (vi->last_xmit_skb && xmit_skb(vi, vi->last_xmit_skb) == 0) {
+       if (vi->last_xmit_skb && xmit_skb(vi, vi->last_xmit_skb) >= 0) {
                vi->svq->vq_ops->kick(vi->svq);
                vi->last_xmit_skb = NULL;
        }
@@ -557,7 +558,7 @@ again:
 
        /* If we has a buffer left over from last time, send it now. */
        if (unlikely(vi->last_xmit_skb) &&
-           xmit_skb(vi, vi->last_xmit_skb) != 0)
+           xmit_skb(vi, vi->last_xmit_skb) < 0)
                goto stop_queue;
 
        vi->last_xmit_skb = NULL;
@@ -565,7 +566,7 @@ again:
        /* Put new one in send queue and do transmit */
        if (likely(skb)) {
                __skb_queue_head(&vi->send, skb);
-               if (xmit_skb(vi, skb) != 0) {
+               if (xmit_skb(vi, skb) < 0) {
                        vi->last_xmit_skb = skb;
                        skb = NULL;
                        goto stop_queue;
@@ -668,7 +669,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
                sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
        sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
 
-       BUG_ON(vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi));
+       BUG_ON(vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) < 0);
 
        vi->cvq->vq_ops->kick(vi->cvq);
 
index 62779a5..3e94f0c 100644 (file)
@@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get(
        rxd_info->l4_cksum_valid =
                (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0);
        rxd_info->l4_cksum =
-               (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);;
+               (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);
        rxd_info->frame =
                (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0);
        rxd_info->proto =
index b378037..068d7a9 100644 (file)
@@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)
        enum vxge_hw_status status;
        /* 0 - Tx, 1 - Rx  */
        int tim_msix_id[4];
-       int alarm_msix_id = 0, msix_intr_vect = 0;;
+       int alarm_msix_id = 0, msix_intr_vect = 0;
        vdev->intr_cnt = 0;
 
        /* allocate msix vectors */
index debad07..c63ea6a 100644 (file)
 #define AR5K_5414_CBCFG_BUF_DIS        0x10    /* Disable buffer */
 
 /*
- * PCI-E Power managment configuration
+ * PCI-E Power management configuration
  * and status register [5424+]
  */
 #define        AR5K_PCIE_PM_CTL                0x4068                  /* Register address */
index a3b36b3..cce1888 100644 (file)
@@ -3330,7 +3330,7 @@ static void atmel_smooth_qual(struct atmel_private *priv)
        priv->wstats.qual.updated &= ~IW_QUAL_QUAL_INVALID;
 }
 
-/* deals with incoming managment frames. */
+/* deals with incoming management frames. */
 static void atmel_management_frame(struct atmel_private *priv,
                                   struct ieee80211_hdr *header,
                                   u16 frame_len, u8 rssi)
index 446e327..cb8be8d 100644 (file)
@@ -1222,3 +1222,4 @@ MODULE_DESCRIPTION("Libertas SPI WLAN Driver");
 MODULE_AUTHOR("Andrey Yurovsky <andrey@cozybit.com>, "
              "Colin McCabe <colin@cozybit.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:libertas_spi");
index 05458d9..afd26bf 100644 (file)
@@ -731,3 +731,4 @@ module_exit(p54spi_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
+MODULE_ALIAS("spi:cx3110x");
index 5809ef5..1103256 100644 (file)
@@ -1426,3 +1426,4 @@ EXPORT_SYMBOL_GPL(wl1251_free_hw);
 MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
+MODULE_ALIAS("spi:wl12xx");
index 5e110a2..4e79a98 100644 (file)
@@ -368,7 +368,7 @@ error:
        return r;
 }
 
-/* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and
+/* MAC address: if custom mac addresses are to be used CR_MAC_ADDR_P1 and
  *              CR_MAC_ADDR_P2 must be overwritten
  */
 int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
index 69f85c0..ddf224d 100644 (file)
@@ -447,7 +447,6 @@ struct of_modalias_table {
 static struct of_modalias_table of_modalias_table[] = {
        { "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },
        { "mmc-spi-slot", "mmc_spi" },
-       { "stm,m25p40", "m25p80" },
 };
 
 /**
index b7e4cee..2766a6d 100644 (file)
@@ -35,7 +35,7 @@ static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode)
 }
 
 
-static struct super_operations s_ops = {
+static const struct super_operations s_ops = {
        .statfs         = simple_statfs,
        .drop_inode     = generic_delete_inode,
 };
index a45b0c0..a6b4a5a 100644 (file)
@@ -1266,7 +1266,7 @@ ccio_ioc_init(struct ioc *ioc)
        ** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
        */
 
-       iova_space_size = (u32) (num_physpages / count_parisc_driver(&ccio_driver));
+       iova_space_size = (u32) (totalram_pages / count_parisc_driver(&ccio_driver));
 
        /* limit IOVA space size to 1MB-1GB */
 
@@ -1305,7 +1305,7 @@ ccio_ioc_init(struct ioc *ioc)
 
        DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
                        __func__, ioc->ioc_regs,
-                       (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
+                       (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
                        iova_space_size>>20,
                        iov_order + PAGE_SHIFT);
 
index 123d8fe..57a6d19 100644 (file)
@@ -1390,7 +1390,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ** for DMA hints - ergo only 30 bits max.
        */
 
-       iova_space_size = (u32) (num_physpages/global_ioc_cnt);
+       iova_space_size = (u32) (totalram_pages/global_ioc_cnt);
 
        /* limit IOVA space size to 1MB-1GB */
        if (iova_space_size < (1 << (20 - PAGE_SHIFT))) {
@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
                        __func__,
                        ioc->ioc_hpa,
-                       (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
+                       (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
                        iova_space_size>>20,
                        iov_order + PAGE_SHIFT);
 
index 47aa593..5f6b915 100644 (file)
@@ -34,6 +34,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/tboot.h>
+#include <linux/dmi.h>
 
 #define PREFIX "DMAR: "
 
index 5befa7e..a9d926b 100644 (file)
@@ -398,23 +398,21 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
        acpi_handle *phandle = (acpi_handle *)context;
        acpi_status status; 
        struct acpi_device_info *info;
-       struct acpi_buffer info_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        int retval = 0;
 
-       status = acpi_get_object_info(handle, &info_buffer);
+       status = acpi_get_object_info(handle, &info);
        if (ACPI_FAILURE(status)) {
                err("%s:  Failed to get device information status=0x%x\n",
                        __func__, status);
                return retval;
        }
-       info = info_buffer.pointer;
-       info->hardware_id.value[sizeof(info->hardware_id.value) - 1] = '\0';
+       info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0';
 
        if (info->current_status && (info->valid & ACPI_VALID_HID) &&
-                       (!strcmp(info->hardware_id.value, IBM_HARDWARE_ID1) ||
-                        !strcmp(info->hardware_id.value, IBM_HARDWARE_ID2))) {
+                       (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
+                        !strcmp(info->hardware_id.string, IBM_HARDWARE_ID2))) {
                dbg("found hardware: %s, handle: %p\n",
-                       info->hardware_id.value, handle);
+                       info->hardware_id.string, handle);
                *phandle = handle;
                /* returning non-zero causes the search to stop
                 * and returns this value to the caller of 
index 7b424e0..32c4404 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
 #include <linux/pci.h>
+#include <linux/seq_file.h>
 #include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
@@ -105,37 +106,40 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info)
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *proc_pccard = NULL;
 
-static int proc_read_drivers_callback(struct device_driver *driver, void *d)
+static int proc_read_drivers_callback(struct device_driver *driver, void *_m)
 {
-       char **p = d;
+       struct seq_file *m = _m;
        struct pcmcia_driver *p_drv = container_of(driver,
                                                   struct pcmcia_driver, drv);
 
-       *p += sprintf(*p, "%-24.24s 1 %d\n", p_drv->drv.name,
+       seq_printf(m, "%-24.24s 1 %d\n", p_drv->drv.name,
 #ifdef CONFIG_MODULE_UNLOAD
                      (p_drv->owner) ? module_refcount(p_drv->owner) : 1
 #else
                      1
 #endif
        );
-       d = (void *) p;
-
        return 0;
 }
 
-static int proc_read_drivers(char *buf, char **start, off_t pos,
-                            int count, int *eof, void *data)
+static int pccard_drivers_proc_show(struct seq_file *m, void *v)
 {
-       char *p = buf;
-       int rc;
-
-       rc = bus_for_each_drv(&pcmcia_bus_type, NULL,
-                             (void *) &p, proc_read_drivers_callback);
-       if (rc < 0)
-               return rc;
+       return bus_for_each_drv(&pcmcia_bus_type, NULL,
+                               m, proc_read_drivers_callback);
+}
 
-       return (p - buf);
+static int pccard_drivers_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, pccard_drivers_proc_show, NULL);
 }
+
+static const struct file_operations pccard_drivers_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = pccard_drivers_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
 #endif
 
 
@@ -1011,7 +1015,7 @@ void __init pcmcia_setup_ioctl(void) {
 #ifdef CONFIG_PROC_FS
        proc_pccard = proc_mkdir("bus/pccard", NULL);
        if (proc_pccard)
-               create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL);
+               proc_create("drivers", 0, proc_pccard, &pccard_drivers_proc_fops);
 #endif
 }
 
index 57ca085..7eedb42 100644 (file)
 
 #include "sa1111_generic.h"
 
-#define SOCKET0_POWER   GPIO_GPIO0
-#define SOCKET0_3V      GPIO_GPIO2
-#define SOCKET1_POWER   (GPIO_GPIO1 | GPIO_GPIO3)
-#warning *** Does SOCKET1_3V actually do anything?
+/* Does SOCKET1_3V actually do anything? */
+#define SOCKET0_POWER  GPIO_GPIO0
+#define SOCKET0_3V     GPIO_GPIO2
+#define SOCKET1_POWER  (GPIO_GPIO1 | GPIO_GPIO3)
 #define SOCKET1_3V     GPIO_GPIO3
 
 static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-  /*
-   * What is all this crap for?
-   */
-  GRER |= 0x00000002;
-  /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
-  sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);
-  sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-  sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-
-  return sa1111_pcmcia_hw_init(skt);
+       unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
+
+       /*
+       * What is all this crap for?
+       */
+       GRER |= 0x00000002;
+       /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
+       sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);
+       sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);
+       sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);
+
+       return sa1111_pcmcia_hw_init(skt);
 }
 
 static int
 jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 {
-  unsigned int pa_dwr_mask, pa_dwr_set;
-  int ret;
-
-printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
-       skt->nr, state->Vcc, state->Vpp);
-
-  switch (skt->nr) {
-  case 0:
-    pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
-
-    switch (state->Vcc) {
-    default:
-    case 0:    pa_dwr_set = 0;                                 break;
-    case 33:   pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;        break;
-    case 50:   pa_dwr_set = SOCKET0_POWER;                     break;
-    }
-    break;
-
-  case 1:
-    pa_dwr_mask = SOCKET1_POWER;
-
-    switch (state->Vcc) {
-    default:
-    case 0:    pa_dwr_set = 0;                                 break;
-    case 33:   pa_dwr_set = SOCKET1_POWER;                     break;
-    case 50:   pa_dwr_set = SOCKET1_POWER;                     break;
-    }
-    break;
-
-  default:
-    return -1;
-  }
-
-  if (state->Vpp != state->Vcc && state->Vpp != 0) {
-    printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
-          __func__, state->Vpp);
-    return -1;
-  }
-
-  ret = sa1111_pcmcia_configure_socket(skt, state);
-  if (ret == 0) {
-    unsigned long flags;
-
-    local_irq_save(flags);
-    sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
-    local_irq_restore(flags);
-  }
-
-  return ret;
+       unsigned int pa_dwr_mask, pa_dwr_set;
+       int ret;
+
+       printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
+               skt->nr, state->Vcc, state->Vpp);
+
+       switch (skt->nr) {
+       case 0:
+               pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
+
+               switch (state->Vcc) {
+               default:
+               case  0:
+                       pa_dwr_set = 0;
+                       break;
+               case 33:
+                       pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
+                       break;
+               case 50:
+                       pa_dwr_set = SOCKET0_POWER;
+                       break;
+               }
+               break;
+
+       case 1:
+               pa_dwr_mask = SOCKET1_POWER;
+
+               switch (state->Vcc) {
+               default:
+               case 0:
+                       pa_dwr_set = 0;
+                       break;
+               case 33:
+                       pa_dwr_set = SOCKET1_POWER;
+                       break;
+               case 50:
+                       pa_dwr_set = SOCKET1_POWER;
+                       break;
+               }
+               break;
+
+       default:
+               return -1;
+       }
+
+       if (state->Vpp != state->Vcc && state->Vpp != 0) {
+               printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
+                       __func__, state->Vpp);
+               return -EPERM;
+       }
+
+       ret = sa1111_pcmcia_configure_socket(skt, state);
+       if (ret == 0) {
+               unsigned long flags;
+
+               local_irq_save(flags);
+               sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
+               local_irq_restore(flags);
+       }
+
+       return ret;
 }
 
 static struct pcmcia_low_level jornada720_pcmcia_ops = {
-  .owner               = THIS_MODULE,
-  .hw_init             = jornada720_pcmcia_hw_init,
-  .hw_shutdown         = sa1111_pcmcia_hw_shutdown,
-  .socket_state                = sa1111_pcmcia_socket_state,
-  .configure_socket    = jornada720_pcmcia_configure_socket,
-
-  .socket_init         = sa1111_pcmcia_socket_init,
-  .socket_suspend      = sa1111_pcmcia_socket_suspend,
+       .owner                  = THIS_MODULE,
+       .hw_init                = jornada720_pcmcia_hw_init,
+       .hw_shutdown            = sa1111_pcmcia_hw_shutdown,
+       .socket_state           = sa1111_pcmcia_socket_state,
+       .configure_socket       = jornada720_pcmcia_configure_socket,
+
+       .socket_init            = sa1111_pcmcia_socket_init,
+       .socket_suspend         = sa1111_pcmcia_socket_suspend,
 };
 
 int __devinit pcmcia_jornada720_init(struct device *dev)
index 737fe5d..b459e87 100644 (file)
@@ -717,7 +717,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
 /*
  * Close it down - release our resources and go home..
  */
-static void yenta_close(struct pci_dev *dev)
+static void __devexit yenta_close(struct pci_dev *dev)
 {
        struct yenta_socket *sock = pci_get_drvdata(dev);
 
index 77c6097..55ca39d 100644 (file)
@@ -99,6 +99,7 @@ config FUJITSU_LAPTOP
        depends on ACPI
        depends on INPUT
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on LEDS_CLASS || LEDS_CLASS=n
        ---help---
          This is a driver for laptops built by Fujitsu:
 
@@ -396,6 +397,15 @@ config ACPI_ASUS
          NOTE: This driver is deprecated and will probably be removed soon,
          use asus-laptop instead.
 
+config TOPSTAR_LAPTOP
+       tristate "Topstar Laptop Extras"
+       depends on ACPI
+       depends on INPUT
+       ---help---
+         This driver adds support for hotkeys found on Topstar laptops.
+
+         If you have a Topstar laptop, say Y or M here.
+
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on ACPI
index 641b8bf..d1c1621 100644 (file)
@@ -19,4 +19,5 @@ obj-$(CONFIG_PANASONIC_LAPTOP)        += panasonic-laptop.o
 obj-$(CONFIG_INTEL_MENLOW)     += intel_menlow.o
 obj-$(CONFIG_ACPI_WMI)         += wmi.o
 obj-$(CONFIG_ACPI_ASUS)                += asus_acpi.o
+obj-$(CONFIG_TOPSTAR_LAPTOP)   += topstar-laptop.o
 obj-$(CONFIG_ACPI_TOSHIBA)     += toshiba_acpi.o
index bdfee17..0a8f735 100644 (file)
@@ -52,7 +52,7 @@
  */
 #undef START_IN_KERNEL_MODE
 
-#define DRV_VER "0.5.13"
+#define DRV_VER "0.5.17"
 
 /*
  * According to the Atom N270 datasheet,
@@ -90,6 +90,7 @@ static unsigned int fanoff = 58;
 static unsigned int verbose;
 static unsigned int fanstate = ACERHDF_FAN_AUTO;
 static char force_bios[16];
+static char force_product[16];
 static unsigned int prev_interval;
 struct thermal_zone_device *thz_dev;
 struct thermal_cooling_device *cl_dev;
@@ -107,34 +108,62 @@ module_param(verbose, uint, 0600);
 MODULE_PARM_DESC(verbose, "Enable verbose dmesg output");
 module_param_string(force_bios, force_bios, 16, 0);
 MODULE_PARM_DESC(force_bios, "Force BIOS version and omit BIOS check");
+module_param_string(force_product, force_product, 16, 0);
+MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");
+
+/*
+ * cmd_off: to switch the fan completely off / to check if the fan is off
+ *     cmd_auto: to set the BIOS in control of the fan. The BIOS regulates then
+ *             the fan speed depending on the temperature
+ */
+struct fancmd {
+       u8 cmd_off;
+       u8 cmd_auto;
+};
 
 /* BIOS settings */
 struct bios_settings_t {
        const char *vendor;
+       const char *product;
        const char *version;
        unsigned char fanreg;
        unsigned char tempreg;
-       unsigned char fancmd[2]; /* fan off and auto commands */
+       struct fancmd cmd;
 };
 
 /* Register addresses and values for different BIOS versions */
 static const struct bios_settings_t bios_tbl[] = {
-       {"Acer", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },
-       {"Acer", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
-       {"Acer", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },
-       {"Acer", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },
-       {"Acer", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },
-       {"Acer", "v0.3308", 0x55, 0x58, {0x21, 0x00} },
-       {"Acer", "v0.3309", 0x55, 0x58, {0x21, 0x00} },
-       {"Acer", "v0.3310", 0x55, 0x58, {0x21, 0x00} },
-       {"Gateway", "v0.3103", 0x55, 0x58, {0x21, 0x00} },
-       {"Packard Bell", "v0.3105", 0x55, 0x58, {0x21, 0x00} },
-       {"", "", 0, 0, {0, 0} }
+       /* AOA110 */
+       {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },
+       {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
+       {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },
+       {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },
+       {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },
+       {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00} },
+       {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00} },
+       {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00} },
+       {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00} },
+       /* AOA150 */
+       {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },
+       {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
+       /* special BIOS / other */
+       {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x00} },
+       {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x00} },
+       {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00} },
+       {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x00} },
+       {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },
+       /* pewpew-terminator */
+       {"", "", "", 0, 0, {0, 0} }
 };
 
 static const struct bios_settings_t *bios_cfg __read_mostly;
 
-
 static int acerhdf_get_temp(int *temp)
 {
        u8 read_temp;
@@ -150,13 +179,14 @@ static int acerhdf_get_temp(int *temp)
 static int acerhdf_get_fanstate(int *state)
 {
        u8 fan;
-       bool tmp;
 
        if (ec_read(bios_cfg->fanreg, &fan))
                return -EINVAL;
 
-       tmp = (fan == bios_cfg->fancmd[ACERHDF_FAN_OFF]);
-       *state = tmp ? ACERHDF_FAN_OFF : ACERHDF_FAN_AUTO;
+       if (fan != bios_cfg->cmd.cmd_off)
+               *state = ACERHDF_FAN_AUTO;
+       else
+               *state = ACERHDF_FAN_OFF;
 
        return 0;
 }
@@ -175,7 +205,8 @@ static void acerhdf_change_fanstate(int state)
                state = ACERHDF_FAN_AUTO;
        }
 
-       cmd = bios_cfg->fancmd[state];
+       cmd = (state == ACERHDF_FAN_OFF) ? bios_cfg->cmd.cmd_off
+                                        : bios_cfg->cmd.cmd_auto;
        fanstate = state;
 
        ec_write(bios_cfg->fanreg, cmd);
@@ -408,7 +439,7 @@ struct thermal_cooling_device_ops acerhdf_cooling_ops = {
 };
 
 /* suspend / resume functionality */
-static int acerhdf_suspend(struct platform_device *dev, pm_message_t state)
+static int acerhdf_suspend(struct device *dev)
 {
        if (kernelmode)
                acerhdf_change_fanstate(ACERHDF_FAN_AUTO);
@@ -419,14 +450,6 @@ static int acerhdf_suspend(struct platform_device *dev, pm_message_t state)
        return 0;
 }
 
-static int acerhdf_resume(struct platform_device *device)
-{
-       if (verbose)
-               pr_notice("resuming\n");
-
-       return 0;
-}
-
 static int __devinit acerhdf_probe(struct platform_device *device)
 {
        return 0;
@@ -437,15 +460,19 @@ static int acerhdf_remove(struct platform_device *device)
        return 0;
 }
 
-struct platform_driver acerhdf_drv = {
+static struct dev_pm_ops acerhdf_pm_ops = {
+       .suspend = acerhdf_suspend,
+       .freeze  = acerhdf_suspend,
+};
+
+static struct platform_driver acerhdf_driver = {
        .driver = {
-               .name = "acerhdf",
+               .name  = "acerhdf",
                .owner = THIS_MODULE,
+               .pm    = &acerhdf_pm_ops,
        },
        .probe = acerhdf_probe,
        .remove = acerhdf_remove,
-       .suspend = acerhdf_suspend,
-       .resume = acerhdf_resume,
 };
 
 
@@ -454,32 +481,40 @@ static int acerhdf_check_hardware(void)
 {
        char const *vendor, *version, *product;
        int i;
+       unsigned long prod_len = 0;
 
        /* get BIOS data */
        vendor  = dmi_get_system_info(DMI_SYS_VENDOR);
        version = dmi_get_system_info(DMI_BIOS_VERSION);
        product = dmi_get_system_info(DMI_PRODUCT_NAME);
 
+
        pr_info("Acer Aspire One Fan driver, v.%s\n", DRV_VER);
 
-       if (!force_bios[0]) {
-               if (strncmp(product, "AO", 2)) {
-                       pr_err("no Aspire One hardware found\n");
-                       return -EINVAL;
-               }
-       } else {
-               pr_info("forcing BIOS version: %s\n", version);
+       if (force_bios[0]) {
                version = force_bios;
+               pr_info("forcing BIOS version: %s\n", version);
+               kernelmode = 0;
+       }
+
+       if (force_product[0]) {
+               product = force_product;
+               pr_info("forcing BIOS product: %s\n", product);
                kernelmode = 0;
        }
 
+       prod_len = strlen(product);
+
        if (verbose)
                pr_info("BIOS info: %s %s, product: %s\n",
                        vendor, version, product);
 
        /* search BIOS version and vendor in BIOS settings table */
        for (i = 0; bios_tbl[i].version[0]; i++) {
-               if (!strcmp(bios_tbl[i].vendor, vendor) &&
+               if (strlen(bios_tbl[i].product) >= prod_len &&
+                   !strncmp(bios_tbl[i].product, product,
+                          strlen(bios_tbl[i].product)) &&
+                   !strcmp(bios_tbl[i].vendor, vendor) &&
                    !strcmp(bios_tbl[i].version, version)) {
                        bios_cfg = &bios_tbl[i];
                        break;
@@ -487,8 +522,8 @@ static int acerhdf_check_hardware(void)
        }
 
        if (!bios_cfg) {
-               pr_err("unknown (unsupported) BIOS version %s/%s, "
-                       "please report, aborting!\n", vendor, version);
+               pr_err("unknown (unsupported) BIOS version %s/%s/%s, "
+                       "please report, aborting!\n", vendor, product, version);
                return -EINVAL;
        }
 
@@ -509,7 +544,7 @@ static int acerhdf_register_platform(void)
 {
        int err = 0;
 
-       err = platform_driver_register(&acerhdf_drv);
+       err = platform_driver_register(&acerhdf_driver);
        if (err)
                return err;
 
@@ -525,7 +560,7 @@ static void acerhdf_unregister_platform(void)
                return;
 
        platform_device_del(acerhdf_dev);
-       platform_driver_unregister(&acerhdf_drv);
+       platform_driver_unregister(&acerhdf_driver);
 }
 
 static int acerhdf_register_thermal(void)
index db657bb..b39d2bb 100644 (file)
  * Flags for hotk status
  * WL_ON and BT_ON are also used for wireless_status()
  */
-#define WL_ON       0x01       //internal Wifi
-#define BT_ON       0x02       //internal Bluetooth
-#define MLED_ON     0x04       //mail LED
-#define TLED_ON     0x08       //touchpad LED
-#define RLED_ON     0x10       //Record LED
-#define PLED_ON     0x20       //Phone LED
-#define GLED_ON     0x40       //Gaming LED
-#define LCD_ON      0x80       //LCD backlight
-#define GPS_ON      0x100      //GPS
+#define WL_ON       0x01       /* internal Wifi */
+#define BT_ON       0x02       /* internal Bluetooth */
+#define MLED_ON     0x04       /* mail LED */
+#define TLED_ON     0x08       /* touchpad LED */
+#define RLED_ON     0x10       /* Record LED */
+#define PLED_ON     0x20       /* Phone LED */
+#define GLED_ON     0x40       /* Gaming LED */
+#define LCD_ON      0x80       /* LCD backlight */
+#define GPS_ON      0x100      /* GPS */
+#define KEY_ON      0x200      /* Keyboard backlight */
 
 #define ASUS_LOG    ASUS_HOTK_FILE ": "
 #define ASUS_ERR    KERN_ERR    ASUS_LOG
@@ -98,7 +99,8 @@ MODULE_AUTHOR("Julien Lerouge, Karol Kozimor, Corentin Chary");
 MODULE_DESCRIPTION(ASUS_HOTK_NAME);
 MODULE_LICENSE("GPL");
 
-/* WAPF defines the behavior of the Fn+Fx wlan key
+/*
+ * WAPF defines the behavior of the Fn+Fx wlan key
  * The significance of values is yet to be found, but
  * most of the time:
  * 0x0 will do nothing
@@ -125,7 +127,8 @@ ASUS_HANDLE(gled_set, ASUS_HOTK_PREFIX "GLED");     /* G1, G2 (probably) */
 /* LEDD */
 ASUS_HANDLE(ledd_set, ASUS_HOTK_PREFIX "SLCM");
 
-/* Bluetooth and WLAN
+/*
+ * Bluetooth and WLAN
  * WLED and BLED are not handled like other XLED, because in some dsdt
  * they also control the WLAN/Bluetooth device.
  */
@@ -149,22 +152,32 @@ ASUS_HANDLE(lcd_switch, "\\_SB.PCI0.SBRG.EC0._Q10",       /* All new models */
 
 /* Display */
 ASUS_HANDLE(display_set, ASUS_HOTK_PREFIX "SDSP");
-ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD",   /*  A6B, A6K A6R A7D F3JM L4R M6R A3G
-                                                          M6A M6V VX-1 V6J V6V W3Z */
-           "\\_SB.PCI0.P0P2.VGA.GETD", /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V
-                                          S5A M5A z33A W1Jc W2V G1 */
-           "\\_SB.PCI0.P0P3.VGA.GETD", /* A6V A6Q */
-           "\\_SB.PCI0.P0PA.VGA.GETD", /* A6T, A6M */
-           "\\_SB.PCI0.PCI1.VGAC.NMAP",        /* L3C */
-           "\\_SB.PCI0.VGA.GETD",      /* Z96F */
-           "\\ACTD",           /* A2D */
-           "\\ADVG",           /* A4G Z71A W1N W5A W5F M2N M3N M5N M6N S1N S5N */
-           "\\DNXT",           /* P30 */
-           "\\INFB",           /* A2H D1 L2D L3D L3H L2E L5D L5C M1A M2E L4L W3V */
-           "\\SSTE");          /* A3F A6F A3N A3L M6N W3N W6A */
-
-ASUS_HANDLE(ls_switch, ASUS_HOTK_PREFIX "ALSC");       /* Z71A Z71V */
-ASUS_HANDLE(ls_level, ASUS_HOTK_PREFIX "ALSL");        /* Z71A Z71V */
+ASUS_HANDLE(display_get,
+           /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */
+           "\\_SB.PCI0.P0P1.VGA.GETD",
+           /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V G1 */
+           "\\_SB.PCI0.P0P2.VGA.GETD",
+           /* A6V A6Q */
+           "\\_SB.PCI0.P0P3.VGA.GETD",
+           /* A6T, A6M */
+           "\\_SB.PCI0.P0PA.VGA.GETD",
+           /* L3C */
+           "\\_SB.PCI0.PCI1.VGAC.NMAP",
+           /* Z96F */
+           "\\_SB.PCI0.VGA.GETD",
+           /* A2D */
+           "\\ACTD",
+           /* A4G Z71A W1N W5A W5F M2N M3N M5N M6N S1N S5N */
+           "\\ADVG",
+           /* P30 */
+           "\\DNXT",
+           /* A2H D1 L2D L3D L3H L2E L5D L5C M1A M2E L4L W3V */
+           "\\INFB",
+           /* A3F A6F A3N A3L M6N W3N W6A */
+           "\\SSTE");
+
+ASUS_HANDLE(ls_switch, ASUS_HOTK_PREFIX "ALSC"); /* Z71A Z71V */
+ASUS_HANDLE(ls_level, ASUS_HOTK_PREFIX "ALSL");         /* Z71A Z71V */
 
 /* GPS */
 /* R2H use different handle for GPS on/off */
@@ -172,19 +185,23 @@ ASUS_HANDLE(gps_on, ASUS_HOTK_PREFIX "SDON");     /* R2H */
 ASUS_HANDLE(gps_off, ASUS_HOTK_PREFIX "SDOF"); /* R2H */
 ASUS_HANDLE(gps_status, ASUS_HOTK_PREFIX "GPST");
 
+/* Keyboard light */
+ASUS_HANDLE(kled_set, ASUS_HOTK_PREFIX "SLKB");
+ASUS_HANDLE(kled_get, ASUS_HOTK_PREFIX "GLKB");
+
 /*
  * This is the main structure, we can use it to store anything interesting
  * about the hotk device
  */
 struct asus_hotk {
-       char *name;             //laptop name
-       struct acpi_device *device;     //the device we are in
-       acpi_handle handle;     //the handle of the hotk device
-       char status;            //status of the hotk, for LEDs, ...
-       u32 ledd_status;        //status of the LED display
-       u8 light_level;         //light sensor level
-       u8 light_switch;        //light sensor switch value
-       u16 event_count[128];   //count for each event TODO make this better
+       char *name;             /* laptop name */
+       struct acpi_device *device;     /* the device we are in */
+       acpi_handle handle;     /* the handle of the hotk device */
+       char status;            /* status of the hotk, for LEDs, ... */
+       u32 ledd_status;        /* status of the LED display */
+       u8 light_level;         /* light sensor level */
+       u8 light_switch;        /* light sensor switch value */
+       u16 event_count[128];   /* count for each event TODO make this better */
        struct input_dev *inputdev;
        u16 *keycode_map;
 };
@@ -237,28 +254,35 @@ static struct backlight_ops asusbl_ops = {
        .update_status = update_bl_status,
 };
 
-/* These functions actually update the LED's, and are called from a
+/*
+ * These functions actually update the LED's, and are called from a
  * workqueue. By doing this as separate work rather than when the LED
  * subsystem asks, we avoid messing with the Asus ACPI stuff during a
- * potentially bad time, such as a timer interrupt. */
+ * potentially bad time, such as a timer interrupt.
+ */
 static struct workqueue_struct *led_workqueue;
 
-#define ASUS_LED(object, ledname)                                      \
+#define ASUS_LED(object, ledname, max)                                 \
        static void object##_led_set(struct led_classdev *led_cdev,     \
                                     enum led_brightness value);        \
+       static enum led_brightness object##_led_get(                    \
+               struct led_classdev *led_cdev);                         \
        static void object##_led_update(struct work_struct *ignored);   \
        static int object##_led_wk;                                     \
        static DECLARE_WORK(object##_led_work, object##_led_update);    \
        static struct led_classdev object##_led = {                     \
                .name           = "asus::" ledname,                     \
                .brightness_set = object##_led_set,                     \
+               .brightness_get = object##_led_get,                     \
+               .max_brightness = max                                   \
        }
 
-ASUS_LED(mled, "mail");
-ASUS_LED(tled, "touchpad");
-ASUS_LED(rled, "record");
-ASUS_LED(pled, "phone");
-ASUS_LED(gled, "gaming");
+ASUS_LED(mled, "mail", 1);
+ASUS_LED(tled, "touchpad", 1);
+ASUS_LED(rled, "record", 1);
+ASUS_LED(pled, "phone", 1);
+ASUS_LED(gled, "gaming", 1);
+ASUS_LED(kled, "kbd_backlight", 3);
 
 struct key_entry {
        char type;
@@ -278,16 +302,23 @@ static struct key_entry asus_keymap[] = {
        {KE_KEY, 0x41, KEY_NEXTSONG},
        {KE_KEY, 0x43, KEY_STOPCD},
        {KE_KEY, 0x45, KEY_PLAYPAUSE},
+       {KE_KEY, 0x4c, KEY_MEDIA},
        {KE_KEY, 0x50, KEY_EMAIL},
        {KE_KEY, 0x51, KEY_WWW},
+       {KE_KEY, 0x55, KEY_CALC},
        {KE_KEY, 0x5C, KEY_SCREENLOCK},  /* Screenlock */
        {KE_KEY, 0x5D, KEY_WLAN},
+       {KE_KEY, 0x5E, KEY_WLAN},
+       {KE_KEY, 0x5F, KEY_WLAN},
+       {KE_KEY, 0x60, KEY_SWITCHVIDEOMODE},
        {KE_KEY, 0x61, KEY_SWITCHVIDEOMODE},
        {KE_KEY, 0x6B, BTN_TOUCH}, /* Lock Mouse */
        {KE_KEY, 0x82, KEY_CAMERA},
        {KE_KEY, 0x8A, KEY_PROG1},
        {KE_KEY, 0x95, KEY_MEDIA},
        {KE_KEY, 0x99, KEY_PHONE},
+       {KE_KEY, 0xc4, KEY_KBDILLUMUP},
+       {KE_KEY, 0xc5, KEY_KBDILLUMDOWN},
        {KE_END, 0},
 };
 
@@ -301,8 +332,8 @@ static struct key_entry asus_keymap[] = {
 static int write_acpi_int(acpi_handle handle, const char *method, int val,
                          struct acpi_buffer *output)
 {
-       struct acpi_object_list params; //list of input parameters (an int here)
-       union acpi_object in_obj;       //the only param we use
+       struct acpi_object_list params; /* list of input parameters (an int) */
+       union acpi_object in_obj;       /* the only param we use */
        acpi_status status;
 
        if (!handle)
@@ -399,6 +430,11 @@ static void write_status(acpi_handle handle, int out, int mask)
        {                                                               \
                int value = object##_led_wk;                            \
                write_status(object##_set_handle, value, (mask));       \
+       }                                                               \
+       static enum led_brightness object##_led_get(                    \
+               struct led_classdev *led_cdev)                          \
+       {                                                               \
+               return led_cdev->brightness;                            \
        }
 
 ASUS_LED_HANDLER(mled, MLED_ON);
@@ -407,6 +443,60 @@ ASUS_LED_HANDLER(rled, RLED_ON);
 ASUS_LED_HANDLER(tled, TLED_ON);
 ASUS_LED_HANDLER(gled, GLED_ON);
 
+/*
+ * Keyboard backlight
+ */
+static int get_kled_lvl(void)
+{
+       unsigned long long kblv;
+       struct acpi_object_list params;
+       union acpi_object in_obj;
+       acpi_status rv;
+
+       params.count = 1;
+       params.pointer = &in_obj;
+       in_obj.type = ACPI_TYPE_INTEGER;
+       in_obj.integer.value = 2;
+
+       rv = acpi_evaluate_integer(kled_get_handle, NULL, &params, &kblv);
+       if (ACPI_FAILURE(rv)) {
+               pr_warning("Error reading kled level\n");
+               return 0;
+       }
+       return kblv;
+}
+
+static int set_kled_lvl(int kblv)
+{
+       if (kblv > 0)
+               kblv = (1 << 7) | (kblv & 0x7F);
+       else
+               kblv = 0;
+
+       if (write_acpi_int(kled_set_handle, NULL, kblv, NULL)) {
+               pr_warning("Keyboard LED display write failed\n");
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static void kled_led_set(struct led_classdev *led_cdev,
+                        enum led_brightness value)
+{
+       kled_led_wk = value;
+       queue_work(led_workqueue, &kled_led_work);
+}
+
+static void kled_led_update(struct work_struct *ignored)
+{
+       set_kled_lvl(kled_led_wk);
+}
+
+static enum led_brightness kled_led_get(struct led_classdev *led_cdev)
+{
+       return get_kled_lvl();
+}
+
 static int get_lcd_state(void)
 {
        return read_status(LCD_ON);
@@ -498,7 +588,7 @@ static ssize_t show_infos(struct device *dev,
 {
        int len = 0;
        unsigned long long temp;
-       char buf[16];           //enough for all info
+       char buf[16];           /* enough for all info */
        acpi_status rv = AE_OK;
 
        /*
@@ -516,7 +606,17 @@ static ssize_t show_infos(struct device *dev,
         */
        rv = acpi_evaluate_integer(hotk->handle, "SFUN", NULL, &temp);
        if (!ACPI_FAILURE(rv))
-               len += sprintf(page + len, "SFUN value         : 0x%04x\n",
+               len += sprintf(page + len, "SFUN value         : %#x\n",
+                              (uint) temp);
+       /*
+        * The HWRS method return informations about the hardware.
+        * 0x80 bit is for WLAN, 0x100 for Bluetooth.
+        * The significance of others is yet to be found.
+        * If we don't find the method, we assume the device are present.
+        */
+       rv = acpi_evaluate_integer(hotk->handle, "HRWS", NULL, &temp);
+       if (!ACPI_FAILURE(rv))
+               len += sprintf(page + len, "HRWS value         : %#x\n",
                               (uint) temp);
        /*
         * Another value for userspace: the ASYM method returns 0x02 for
@@ -527,7 +627,7 @@ static ssize_t show_infos(struct device *dev,
         */
        rv = acpi_evaluate_integer(hotk->handle, "ASYM", NULL, &temp);
        if (!ACPI_FAILURE(rv))
-               len += sprintf(page + len, "ASYM value         : 0x%04x\n",
+               len += sprintf(page + len, "ASYM value         : %#x\n",
                               (uint) temp);
        if (asus_info) {
                snprintf(buf, 16, "%d", asus_info->length);
@@ -648,8 +748,10 @@ static int read_display(void)
        unsigned long long value = 0;
        acpi_status rv = AE_OK;
 
-       /* In most of the case, we know how to set the display, but sometime
-          we can't read it */
+       /*
+        * In most of the case, we know how to set the display, but sometime
+        * we can't read it
+        */
        if (display_get_handle) {
                rv = acpi_evaluate_integer(display_get_handle, NULL,
                                           NULL, &value);
@@ -1037,6 +1139,9 @@ static int asus_hotk_get_info(void)
 
        ASUS_HANDLE_INIT(ledd_set);
 
+       ASUS_HANDLE_INIT(kled_set);
+       ASUS_HANDLE_INIT(kled_get);
+
        /*
         * The HWRS method return informations about the hardware.
         * 0x80 bit is for WLAN, 0x100 for Bluetooth.
@@ -1063,8 +1168,10 @@ static int asus_hotk_get_info(void)
        ASUS_HANDLE_INIT(display_set);
        ASUS_HANDLE_INIT(display_get);
 
-       /* There is a lot of models with "ALSL", but a few get
-          a real light sens, so we need to check it. */
+       /*
+        * There is a lot of models with "ALSL", but a few get
+        * a real light sens, so we need to check it.
+        */
        if (!ASUS_HANDLE_INIT(ls_switch))
                ASUS_HANDLE_INIT(ls_level);
 
@@ -1168,6 +1275,10 @@ static int asus_hotk_add(struct acpi_device *device)
        /* LCD Backlight is on by default */
        write_status(NULL, 1, LCD_ON);
 
+       /* Keyboard Backlight is on by default */
+       if (kled_set_handle)
+               set_kled_lvl(1);
+
        /* LED display is off by default */
        hotk->ledd_status = 0xFFF;
 
@@ -1222,6 +1333,7 @@ static void asus_led_exit(void)
        ASUS_LED_UNREGISTER(pled);
        ASUS_LED_UNREGISTER(rled);
        ASUS_LED_UNREGISTER(gled);
+       ASUS_LED_UNREGISTER(kled);
 }
 
 static void asus_input_exit(void)
@@ -1301,13 +1413,20 @@ static int asus_led_init(struct device *dev)
        if (rv)
                goto out4;
 
+       if (kled_set_handle && kled_get_handle)
+               rv = ASUS_LED_REGISTER(kled, dev);
+       if (rv)
+               goto out5;
+
        led_workqueue = create_singlethread_workqueue("led_workqueue");
        if (!led_workqueue)
-               goto out5;
+               goto out6;
 
        return 0;
-out5:
+out6:
        rv = -ENOMEM;
+       ASUS_LED_UNREGISTER(kled);
+out5:
        ASUS_LED_UNREGISTER(gled);
 out4:
        ASUS_LED_UNREGISTER(pled);
index 222ffb8..da3c08b 100644 (file)
@@ -142,18 +142,28 @@ struct eeepc_hotk {
        struct rfkill *wlan_rfkill;
        struct rfkill *bluetooth_rfkill;
        struct rfkill *wwan3g_rfkill;
+       struct rfkill *wimax_rfkill;
        struct hotplug_slot *hotplug_slot;
-       struct work_struct hotplug_work;
+       struct mutex hotplug_lock;
 };
 
 /* The actual device the driver binds to */
 static struct eeepc_hotk *ehotk;
 
 /* Platform device/driver */
+static int eeepc_hotk_thaw(struct device *device);
+static int eeepc_hotk_restore(struct device *device);
+
+static struct dev_pm_ops eeepc_pm_ops = {
+       .thaw = eeepc_hotk_thaw,
+       .restore = eeepc_hotk_restore,
+};
+
 static struct platform_driver platform_driver = {
        .driver = {
                .name = EEEPC_HOTK_FILE,
                .owner = THIS_MODULE,
+               .pm = &eeepc_pm_ops,
        }
 };
 
@@ -192,7 +202,6 @@ static struct key_entry eeepc_keymap[] = {
  */
 static int eeepc_hotk_add(struct acpi_device *device);
 static int eeepc_hotk_remove(struct acpi_device *device, int type);
-static int eeepc_hotk_resume(struct acpi_device *device);
 static void eeepc_hotk_notify(struct acpi_device *device, u32 event);
 
 static const struct acpi_device_id eeepc_device_ids[] = {
@@ -209,7 +218,6 @@ static struct acpi_driver eeepc_hotk_driver = {
        .ops = {
                .add = eeepc_hotk_add,
                .remove = eeepc_hotk_remove,
-               .resume = eeepc_hotk_resume,
                .notify = eeepc_hotk_notify,
        },
 };
@@ -579,7 +587,6 @@ static void cmsg_quirks(void)
 
 static int eeepc_hotk_check(void)
 {
-       const struct key_entry *key;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        int result;
 
@@ -604,31 +611,6 @@ static int eeepc_hotk_check(void)
                        pr_info("Get control methods supported: 0x%x\n",
                                ehotk->cm_supported);
                }
-               ehotk->inputdev = input_allocate_device();
-               if (!ehotk->inputdev) {
-                       pr_info("Unable to allocate input device\n");
-                       return 0;
-               }
-               ehotk->inputdev->name = "Asus EeePC extra buttons";
-               ehotk->inputdev->phys = EEEPC_HOTK_FILE "/input0";
-               ehotk->inputdev->id.bustype = BUS_HOST;
-               ehotk->inputdev->getkeycode = eeepc_getkeycode;
-               ehotk->inputdev->setkeycode = eeepc_setkeycode;
-
-               for (key = eeepc_keymap; key->type != KE_END; key++) {
-                       switch (key->type) {
-                       case KE_KEY:
-                               set_bit(EV_KEY, ehotk->inputdev->evbit);
-                               set_bit(key->keycode, ehotk->inputdev->keybit);
-                               break;
-                       }
-               }
-               result = input_register_device(ehotk->inputdev);
-               if (result) {
-                       pr_info("Unable to register input device\n");
-                       input_free_device(ehotk->inputdev);
-                       return 0;
-               }
        } else {
                pr_err("Hotkey device not present, aborting\n");
                return -EINVAL;
@@ -661,40 +643,48 @@ static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
        return 0;
 }
 
-static void eeepc_hotplug_work(struct work_struct *work)
+static void eeepc_rfkill_hotplug(void)
 {
        struct pci_dev *dev;
-       struct pci_bus *bus = pci_find_bus(0, 1);
-       bool blocked;
+       struct pci_bus *bus;
+       bool blocked = eeepc_wlan_rfkill_blocked();
 
-       if (!bus) {
-               pr_warning("Unable to find PCI bus 1?\n");
-               return;
-       }
+       if (ehotk->wlan_rfkill)
+               rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
 
-       blocked = eeepc_wlan_rfkill_blocked();
-       if (!blocked) {
-               dev = pci_get_slot(bus, 0);
-               if (dev) {
-                       /* Device already present */
-                       pci_dev_put(dev);
-                       return;
-               }
-               dev = pci_scan_single_device(bus, 0);
-               if (dev) {
-                       pci_bus_assign_resources(bus);
-                       if (pci_bus_add_device(dev))
-                               pr_err("Unable to hotplug wifi\n");
+       mutex_lock(&ehotk->hotplug_lock);
+
+       if (ehotk->hotplug_slot) {
+               bus = pci_find_bus(0, 1);
+               if (!bus) {
+                       pr_warning("Unable to find PCI bus 1?\n");
+                       goto out_unlock;
                }
-       } else {
-               dev = pci_get_slot(bus, 0);
-               if (dev) {
-                       pci_remove_bus_device(dev);
-                       pci_dev_put(dev);
+
+               if (!blocked) {
+                       dev = pci_get_slot(bus, 0);
+                       if (dev) {
+                               /* Device already present */
+                               pci_dev_put(dev);
+                               goto out_unlock;
+                       }
+                       dev = pci_scan_single_device(bus, 0);
+                       if (dev) {
+                               pci_bus_assign_resources(bus);
+                               if (pci_bus_add_device(dev))
+                                       pr_err("Unable to hotplug wifi\n");
+                       }
+               } else {
+                       dev = pci_get_slot(bus, 0);
+                       if (dev) {
+                               pci_remove_bus_device(dev);
+                               pci_dev_put(dev);
+                       }
                }
        }
 
-       rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
+out_unlock:
+       mutex_unlock(&ehotk->hotplug_lock);
 }
 
 static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
@@ -702,7 +692,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
        if (event != ACPI_NOTIFY_BUS_CHECK)
                return;
 
-       schedule_work(&ehotk->hotplug_work);
+       eeepc_rfkill_hotplug();
 }
 
 static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
@@ -839,66 +829,38 @@ error_slot:
        return ret;
 }
 
-static int eeepc_hotk_add(struct acpi_device *device)
-{
-       int result;
-
-       if (!device)
-                return -EINVAL;
-       pr_notice(EEEPC_HOTK_NAME "\n");
-       ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
-       if (!ehotk)
-               return -ENOMEM;
-       ehotk->init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH;
-       ehotk->handle = device->handle;
-       strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
-       strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
-       device->driver_data = ehotk;
-       ehotk->device = device;
-       result = eeepc_hotk_check();
-       if (result)
-               goto ehotk_fail;
-
-       return 0;
-
- ehotk_fail:
-       kfree(ehotk);
-       ehotk = NULL;
-
-       return result;
-}
-
-static int eeepc_hotk_remove(struct acpi_device *device, int type)
-{
-       if (!device || !acpi_driver_data(device))
-                return -EINVAL;
-
-       kfree(ehotk);
-       return 0;
-}
-
-static int eeepc_hotk_resume(struct acpi_device *device)
+static int eeepc_hotk_thaw(struct device *device)
 {
        if (ehotk->wlan_rfkill) {
                bool wlan;
 
-               /* Workaround - it seems that _PTS disables the wireless
-                  without notification or changing the value read by WLAN.
-                  Normally this is fine because the correct value is restored
-                  from the non-volatile storage on resume, but we need to do
-                  it ourself if case suspend is aborted, or we lose wireless.
+               /*
+                * Work around bios bug - acpi _PTS turns off the wireless led
+                * during suspend.  Normally it restores it on resume, but
+                * we should kick it ourselves in case hibernation is aborted.
                 */
                wlan = get_acpi(CM_ASL_WLAN);
                set_acpi(CM_ASL_WLAN, wlan);
+       }
 
-               rfkill_set_sw_state(ehotk->wlan_rfkill, wlan != 1);
+       return 0;
+}
 
-               schedule_work(&ehotk->hotplug_work);
-       }
+static int eeepc_hotk_restore(struct device *device)
+{
+       /* Refresh both wlan rfkill state and pci hotplug */
+       if (ehotk->wlan_rfkill)
+               eeepc_rfkill_hotplug();
 
        if (ehotk->bluetooth_rfkill)
                rfkill_set_sw_state(ehotk->bluetooth_rfkill,
                                    get_acpi(CM_ASL_BLUETOOTH) != 1);
+       if (ehotk->wwan3g_rfkill)
+               rfkill_set_sw_state(ehotk->wwan3g_rfkill,
+                                   get_acpi(CM_ASL_3G) != 1);
+       if (ehotk->wimax_rfkill)
+               rfkill_set_sw_state(ehotk->wimax_rfkill,
+                                   get_acpi(CM_ASL_WIMAX) != 1);
 
        return 0;
 }
@@ -1019,16 +981,37 @@ static void eeepc_backlight_exit(void)
 
 static void eeepc_rfkill_exit(void)
 {
+       eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P5");
        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
-       if (ehotk->wlan_rfkill)
+       if (ehotk->wlan_rfkill) {
                rfkill_unregister(ehotk->wlan_rfkill);
-       if (ehotk->bluetooth_rfkill)
-               rfkill_unregister(ehotk->bluetooth_rfkill);
-       if (ehotk->wwan3g_rfkill)
-               rfkill_unregister(ehotk->wwan3g_rfkill);
+               rfkill_destroy(ehotk->wlan_rfkill);
+               ehotk->wlan_rfkill = NULL;
+       }
+       /*
+        * Refresh pci hotplug in case the rfkill state was changed after
+        * eeepc_unregister_rfkill_notifier()
+        */
+       eeepc_rfkill_hotplug();
        if (ehotk->hotplug_slot)
                pci_hp_deregister(ehotk->hotplug_slot);
+
+       if (ehotk->bluetooth_rfkill) {
+               rfkill_unregister(ehotk->bluetooth_rfkill);
+               rfkill_destroy(ehotk->bluetooth_rfkill);
+               ehotk->bluetooth_rfkill = NULL;
+       }
+       if (ehotk->wwan3g_rfkill) {
+               rfkill_unregister(ehotk->wwan3g_rfkill);
+               rfkill_destroy(ehotk->wwan3g_rfkill);
+               ehotk->wwan3g_rfkill = NULL;
+       }
+       if (ehotk->wimax_rfkill) {
+               rfkill_unregister(ehotk->wimax_rfkill);
+               rfkill_destroy(ehotk->wimax_rfkill);
+               ehotk->wimax_rfkill = NULL;
+       }
 }
 
 static void eeepc_input_exit(void)
@@ -1050,19 +1033,6 @@ static void eeepc_hwmon_exit(void)
        eeepc_hwmon_device = NULL;
 }
 
-static void __exit eeepc_laptop_exit(void)
-{
-       eeepc_backlight_exit();
-       eeepc_rfkill_exit();
-       eeepc_input_exit();
-       eeepc_hwmon_exit();
-       acpi_bus_unregister_driver(&eeepc_hotk_driver);
-       sysfs_remove_group(&platform_device->dev.kobj,
-                          &platform_attribute_group);
-       platform_device_unregister(platform_device);
-       platform_driver_unregister(&platform_driver);
-}
-
 static int eeepc_new_rfkill(struct rfkill **rfkill,
                            const char *name, struct device *dev,
                            enum rfkill_type type, int cm)
@@ -1094,10 +1064,7 @@ static int eeepc_rfkill_init(struct device *dev)
 {
        int result = 0;
 
-       INIT_WORK(&ehotk->hotplug_work, eeepc_hotplug_work);
-
-       eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
-       eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+       mutex_init(&ehotk->hotplug_lock);
 
        result = eeepc_new_rfkill(&ehotk->wlan_rfkill,
                                  "eeepc-wlan", dev,
@@ -1120,6 +1087,13 @@ static int eeepc_rfkill_init(struct device *dev)
        if (result && result != -ENODEV)
                goto exit;
 
+       result = eeepc_new_rfkill(&ehotk->wimax_rfkill,
+                                 "eeepc-wimax", dev,
+                                 RFKILL_TYPE_WIMAX, CM_ASL_WIMAX);
+
+       if (result && result != -ENODEV)
+               goto exit;
+
        result = eeepc_setup_pci_hotplug();
        /*
         * If we get -EBUSY then something else is handling the PCI hotplug -
@@ -1128,6 +1102,15 @@ static int eeepc_rfkill_init(struct device *dev)
        if (result == -EBUSY)
                result = 0;
 
+       eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P5");
+       eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+       eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+       /*
+        * Refresh pci hotplug in case the rfkill state was changed during
+        * setup.
+        */
+       eeepc_rfkill_hotplug();
+
 exit:
        if (result && result != -ENODEV)
                eeepc_rfkill_exit();
@@ -1172,21 +1155,61 @@ static int eeepc_hwmon_init(struct device *dev)
        return result;
 }
 
-static int __init eeepc_laptop_init(void)
+static int eeepc_input_init(struct device *dev)
 {
-       struct device *dev;
+       const struct key_entry *key;
        int result;
 
-       if (acpi_disabled)
-               return -ENODEV;
-       result = acpi_bus_register_driver(&eeepc_hotk_driver);
-       if (result < 0)
+       ehotk->inputdev = input_allocate_device();
+       if (!ehotk->inputdev) {
+               pr_info("Unable to allocate input device\n");
+               return -ENOMEM;
+       }
+       ehotk->inputdev->name = "Asus EeePC extra buttons";
+       ehotk->inputdev->dev.parent = dev;
+       ehotk->inputdev->phys = EEEPC_HOTK_FILE "/input0";
+       ehotk->inputdev->id.bustype = BUS_HOST;
+       ehotk->inputdev->getkeycode = eeepc_getkeycode;
+       ehotk->inputdev->setkeycode = eeepc_setkeycode;
+
+       for (key = eeepc_keymap; key->type != KE_END; key++) {
+               switch (key->type) {
+               case KE_KEY:
+                       set_bit(EV_KEY, ehotk->inputdev->evbit);
+                       set_bit(key->keycode, ehotk->inputdev->keybit);
+                       break;
+               }
+       }
+       result = input_register_device(ehotk->inputdev);
+       if (result) {
+               pr_info("Unable to register input device\n");
+               input_free_device(ehotk->inputdev);
                return result;
-       if (!ehotk) {
-               acpi_bus_unregister_driver(&eeepc_hotk_driver);
-               return -ENODEV;
        }
+       return 0;
+}
+
+static int eeepc_hotk_add(struct acpi_device *device)
+{
+       struct device *dev;
+       int result;
 
+       if (!device)
+               return -EINVAL;
+       pr_notice(EEEPC_HOTK_NAME "\n");
+       ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
+       if (!ehotk)
+               return -ENOMEM;
+       ehotk->init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH;
+       ehotk->handle = device->handle;
+       strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
+       strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
+       device->driver_data = ehotk;
+       ehotk->device = device;
+
+       result = eeepc_hotk_check();
+       if (result)
+               goto fail_platform_driver;
        eeepc_enable_camera();
 
        /* Register platform stuff */
@@ -1216,6 +1239,10 @@ static int __init eeepc_laptop_init(void)
                pr_info("Backlight controlled by ACPI video "
                        "driver\n");
 
+       result = eeepc_input_init(dev);
+       if (result)
+               goto fail_input;
+
        result = eeepc_hwmon_init(dev);
        if (result)
                goto fail_hwmon;
@@ -1225,9 +1252,12 @@ static int __init eeepc_laptop_init(void)
                goto fail_rfkill;
 
        return 0;
+
 fail_rfkill:
        eeepc_hwmon_exit();
 fail_hwmon:
+       eeepc_input_exit();
+fail_input:
        eeepc_backlight_exit();
 fail_backlight:
        sysfs_remove_group(&platform_device->dev.kobj,
@@ -1239,9 +1269,49 @@ fail_platform_device2:
 fail_platform_device1:
        platform_driver_unregister(&platform_driver);
 fail_platform_driver:
-       eeepc_input_exit();
+       kfree(ehotk);
+
        return result;
 }
 
+static int eeepc_hotk_remove(struct acpi_device *device, int type)
+{
+       if (!device || !acpi_driver_data(device))
+               return -EINVAL;
+
+       eeepc_backlight_exit();
+       eeepc_rfkill_exit();
+       eeepc_input_exit();
+       eeepc_hwmon_exit();
+       sysfs_remove_group(&platform_device->dev.kobj,
+                          &platform_attribute_group);
+       platform_device_unregister(platform_device);
+       platform_driver_unregister(&platform_driver);
+
+       kfree(ehotk);
+       return 0;
+}
+
+static int __init eeepc_laptop_init(void)
+{
+       int result;
+
+       if (acpi_disabled)
+               return -ENODEV;
+       result = acpi_bus_register_driver(&eeepc_hotk_driver);
+       if (result < 0)
+               return result;
+       if (!ehotk) {
+               acpi_bus_unregister_driver(&eeepc_hotk_driver);
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static void __exit eeepc_laptop_exit(void)
+{
+       acpi_bus_unregister_driver(&eeepc_hotk_driver);
+}
+
 module_init(eeepc_laptop_init);
 module_exit(eeepc_laptop_exit);
index eabddc9..f35aee5 100644 (file)
 #include <linux/kfifo.h>
 #include <linux/video_output.h>
 #include <linux/platform_device.h>
-#ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
 #include <linux/leds.h>
 #endif
 
-#define FUJITSU_DRIVER_VERSION "0.5.0"
+#define FUJITSU_DRIVER_VERSION "0.6.0"
 
 #define FUJITSU_LCD_N_LEVELS 8
 
@@ -96,7 +96,7 @@
 /* FUNC interface - responses */
 #define UNSUPPORTED_CMD 0x80000000
 
-#ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
 /* FUNC interface - LED control */
 #define FUNC_LED_OFF   0x1
 #define FUNC_LED_ON    0x30001
@@ -176,7 +176,7 @@ static struct fujitsu_hotkey_t *fujitsu_hotkey;
 
 static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event);
 
-#ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
 static enum led_brightness logolamp_get(struct led_classdev *cdev);
 static void logolamp_set(struct led_classdev *cdev,
                               enum led_brightness brightness);
@@ -257,7 +257,7 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
        return out_obj.integer.value;
 }
 
-#ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
 /* LED class callbacks */
 
 static void logolamp_set(struct led_classdev *cdev,
@@ -324,9 +324,6 @@ static int set_lcd_level(int level)
        if (level < 0 || level >= fujitsu->max_brightness)
                return -EINVAL;
 
-       if (!fujitsu)
-               return -EINVAL;
-
        status = acpi_get_handle(fujitsu->acpi_handle, "SBLL", &handle);
        if (ACPI_FAILURE(status)) {
                vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBLL not present\n");
@@ -355,9 +352,6 @@ static int set_lcd_level_alt(int level)
        if (level < 0 || level >= fujitsu->max_brightness)
                return -EINVAL;
 
-       if (!fujitsu)
-               return -EINVAL;
-
        status = acpi_get_handle(fujitsu->acpi_handle, "SBL2", &handle);
        if (ACPI_FAILURE(status)) {
                vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBL2 not present\n");
@@ -697,7 +691,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
        result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
        if (result) {
                printk(KERN_ERR "Error reading power state\n");
-               goto end;
+               goto err_unregister_input_dev;
        }
 
        printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
@@ -728,25 +722,22 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
        return result;
 
-end:
+err_unregister_input_dev:
+       input_unregister_device(input);
 err_free_input_dev:
        input_free_device(input);
 err_stop:
-
        return result;
 }
 
 static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 {
-       struct fujitsu_t *fujitsu = NULL;
+       struct fujitsu_t *fujitsu = acpi_driver_data(device);
+       struct input_dev *input = fujitsu->input;
 
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
+       input_unregister_device(input);
 
-       fujitsu = acpi_driver_data(device);
-
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
+       input_free_device(input);
 
        fujitsu->acpi_handle = NULL;
 
@@ -871,7 +862,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
        result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
        if (result) {
                printk(KERN_ERR "Error reading power state\n");
-               goto end;
+               goto err_unregister_input_dev;
        }
 
        printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
@@ -911,7 +902,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
        printk(KERN_INFO "fujitsu-laptop: BTNI: [0x%x]\n",
                call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0));
 
-       #ifdef CONFIG_LEDS_CLASS
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
        if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
                result = led_classdev_register(&fujitsu->pf_device->dev,
                                                &logolamp_led);
@@ -934,33 +925,41 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
                        "LED handler for keyboard lamps, error %i\n", result);
                }
        }
-       #endif
+#endif
 
        return result;
 
-end:
+err_unregister_input_dev:
+       input_unregister_device(input);
 err_free_input_dev:
        input_free_device(input);
 err_free_fifo:
        kfifo_free(fujitsu_hotkey->fifo);
 err_stop:
-
        return result;
 }
 
 static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
 {
-       struct fujitsu_hotkey_t *fujitsu_hotkey = NULL;
+       struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device);
+       struct input_dev *input = fujitsu_hotkey->input;
 
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
+#ifdef CONFIG_LEDS_CLASS
+       if (fujitsu_hotkey->logolamp_registered)
+               led_classdev_unregister(&logolamp_led);
 
-       fujitsu_hotkey = acpi_driver_data(device);
+       if (fujitsu_hotkey->kblamps_registered)
+               led_classdev_unregister(&kblamps_led);
+#endif
 
-       fujitsu_hotkey->acpi_handle = NULL;
+       input_unregister_device(input);
+
+       input_free_device(input);
 
        kfifo_free(fujitsu_hotkey->fifo);
 
+       fujitsu_hotkey->acpi_handle = NULL;
+
        return 0;
 }
 
@@ -1130,8 +1129,11 @@ static int __init fujitsu_init(void)
                fujitsu->bl_device =
                        backlight_device_register("fujitsu-laptop", NULL, NULL,
                                                  &fujitsubl_ops);
-               if (IS_ERR(fujitsu->bl_device))
-                       return PTR_ERR(fujitsu->bl_device);
+               if (IS_ERR(fujitsu->bl_device)) {
+                       ret = PTR_ERR(fujitsu->bl_device);
+                       fujitsu->bl_device = NULL;
+                       goto fail_sysfs_group;
+               }
                max_brightness = fujitsu->max_brightness;
                fujitsu->bl_device->props.max_brightness = max_brightness - 1;
                fujitsu->bl_device->props.brightness = fujitsu->brightness_level;
@@ -1171,32 +1173,22 @@ static int __init fujitsu_init(void)
        return 0;
 
 fail_hotkey1:
-
        kfree(fujitsu_hotkey);
-
 fail_hotkey:
-
        platform_driver_unregister(&fujitsupf_driver);
-
 fail_backlight:
-
        if (fujitsu->bl_device)
                backlight_device_unregister(fujitsu->bl_device);
-
+fail_sysfs_group:
+       sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
+                          &fujitsupf_attribute_group);
 fail_platform_device2:
-
        platform_device_del(fujitsu->pf_device);
-
 fail_platform_device1:
-
        platform_device_put(fujitsu->pf_device);
-
 fail_platform_driver:
-
        acpi_bus_unregister_driver(&acpi_fujitsu_driver);
-
 fail_acpi:
-
        kfree(fujitsu);
 
        return ret;
@@ -1204,28 +1196,23 @@ fail_acpi:
 
 static void __exit fujitsu_cleanup(void)
 {
-       #ifdef CONFIG_LEDS_CLASS
-       if (fujitsu_hotkey->logolamp_registered != 0)
-               led_classdev_unregister(&logolamp_led);
+       acpi_bus_unregister_driver(&acpi_fujitsu_hotkey_driver);
 
-       if (fujitsu_hotkey->kblamps_registered != 0)
-               led_classdev_unregister(&kblamps_led);
-       #endif
+       kfree(fujitsu_hotkey);
 
-       sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
-                          &fujitsupf_attribute_group);
-       platform_device_unregister(fujitsu->pf_device);
        platform_driver_unregister(&fujitsupf_driver);
+
        if (fujitsu->bl_device)
                backlight_device_unregister(fujitsu->bl_device);
 
-       acpi_bus_unregister_driver(&acpi_fujitsu_driver);
+       sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
+                          &fujitsupf_attribute_group);
 
-       kfree(fujitsu);
+       platform_device_unregister(fujitsu->pf_device);
 
-       acpi_bus_unregister_driver(&acpi_fujitsu_hotkey_driver);
+       acpi_bus_unregister_driver(&acpi_fujitsu_driver);
 
-       kfree(fujitsu_hotkey);
+       kfree(fujitsu);
 
        printk(KERN_INFO "fujitsu-laptop: driver unloaded.\n");
 }
index af04f5b..c284217 100644 (file)
@@ -507,7 +507,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
        }
        if (bluetooth_rfkill) {
                rfkill_unregister(bluetooth_rfkill);
-               rfkill_destroy(wifi_rfkill);
+               rfkill_destroy(bluetooth_rfkill);
        }
        if (wwan_rfkill) {
                rfkill_unregister(wwan_rfkill);
index dafaa4a..f9f68e0 100644 (file)
@@ -976,15 +976,12 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
                                      void *context, void **return_value)
 {
        struct acpi_device_info *info;
-       struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-
-       if (ACPI_SUCCESS(acpi_get_object_info(handle, &buffer))) {
-               info = buffer.pointer;
 
+       if (ACPI_SUCCESS(acpi_get_object_info(handle, &info))) {
                printk(KERN_WARNING DRV_PFX "method: name: %4.4s, args %X\n",
                        (char *)&info->name, info->param_count);
 
-               kfree(buffer.pointer);
+               kfree(info);
        }
 
        return AE_OK;
index e856008..f78d275 100644 (file)
@@ -1278,6 +1278,7 @@ static void tpacpi_destroy_rfkill(const enum tpacpi_rfk_id id)
        tp_rfk = tpacpi_rfkill_switches[id];
        if (tp_rfk) {
                rfkill_unregister(tp_rfk->rfkill);
+               rfkill_destroy(tp_rfk->rfkill);
                tpacpi_rfkill_switches[id] = NULL;
                kfree(tp_rfk);
        }
@@ -1601,6 +1602,196 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv)
 #endif
 }
 
+/*************************************************************************
+ * Firmware Data
+ */
+
+/*
+ * Table of recommended minimum BIOS versions
+ *
+ * Reasons for listing:
+ *    1. Stable BIOS, listed because the unknown ammount of
+ *       bugs and bad ACPI behaviour on older versions
+ *
+ *    2. BIOS or EC fw with known bugs that trigger on Linux
+ *
+ *    3. BIOS with known reduced functionality in older versions
+ *
+ *  We recommend the latest BIOS and EC version.
+ *  We only support the latest BIOS and EC fw version as a rule.
+ *
+ *  Sources: IBM ThinkPad Public Web Documents (update changelogs),
+ *  Information from users in ThinkWiki
+ *
+ *  WARNING: we use this table also to detect that the machine is
+ *  a ThinkPad in some cases, so don't remove entries lightly.
+ */
+
+#define TPV_Q(__v, __id1, __id2, __bv1, __bv2)         \
+       { .vendor       = (__v),                        \
+         .bios         = TPID(__id1, __id2),           \
+         .ec           = TPACPI_MATCH_ANY,             \
+         .quirks       = TPACPI_MATCH_ANY << 16        \
+                         | (__bv1) << 8 | (__bv2) }
+
+#define TPV_Q_X(__v, __bid1, __bid2, __bv1, __bv2,     \
+               __eid1, __eid2, __ev1, __ev2)           \
+       { .vendor       = (__v),                        \
+         .bios         = TPID(__bid1, __bid2),         \
+         .ec           = TPID(__eid1, __eid2),         \
+         .quirks       = (__ev1) << 24 | (__ev2) << 16 \
+                         | (__bv1) << 8 | (__bv2) }
+
+#define TPV_QI0(__id1, __id2, __bv1, __bv2) \
+       TPV_Q(PCI_VENDOR_ID_IBM, __id1, __id2, __bv1, __bv2)
+
+#define TPV_QI1(__id1, __id2, __bv1, __bv2, __ev1, __ev2) \
+       TPV_Q_X(PCI_VENDOR_ID_IBM, __id1, __id2,        \
+               __bv1, __bv2, __id1, __id2, __ev1, __ev2)
+
+#define TPV_QI2(__bid1, __bid2, __bv1, __bv2,          \
+               __eid1, __eid2, __ev1, __ev2)           \
+       TPV_Q_X(PCI_VENDOR_ID_IBM, __bid1, __bid2,      \
+               __bv1, __bv2, __eid1, __eid2, __ev1, __ev2)
+
+#define TPV_QL0(__id1, __id2, __bv1, __bv2) \
+       TPV_Q(PCI_VENDOR_ID_LENOVO, __id1, __id2, __bv1, __bv2)
+
+#define TPV_QL1(__id1, __id2, __bv1, __bv2, __ev1, __ev2) \
+       TPV_Q_X(PCI_VENDOR_ID_LENOVO, __id1, __id2,     \
+               __bv1, __bv2, __id1, __id2, __ev1, __ev2)
+
+#define TPV_QL2(__bid1, __bid2, __bv1, __bv2,          \
+               __eid1, __eid2, __ev1, __ev2)           \
+       TPV_Q_X(PCI_VENDOR_ID_LENOVO, __bid1, __bid2,   \
+               __bv1, __bv2, __eid1, __eid2, __ev1, __ev2)
+
+static const struct tpacpi_quirk tpacpi_bios_version_qtable[] __initconst = {
+       /*  Numeric models ------------------ */
+       /*      FW MODEL   BIOS VERS          */
+       TPV_QI0('I', 'M',  '6', '5'),            /* 570 */
+       TPV_QI0('I', 'U',  '2', '6'),            /* 570E */
+       TPV_QI0('I', 'B',  '5', '4'),            /* 600 */
+       TPV_QI0('I', 'H',  '4', '7'),            /* 600E */
+       TPV_QI0('I', 'N',  '3', '6'),            /* 600E */
+       TPV_QI0('I', 'T',  '5', '5'),            /* 600X */
+       TPV_QI0('I', 'D',  '4', '8'),            /* 770, 770E, 770ED */
+       TPV_QI0('I', 'I',  '4', '2'),            /* 770X */
+       TPV_QI0('I', 'O',  '2', '3'),            /* 770Z */
+
+       /* A-series ------------------------- */
+       /*      FW MODEL   BIOS VERS  EC VERS */
+       TPV_QI0('I', 'W',  '5', '9'),            /* A20m */
+       TPV_QI0('I', 'V',  '6', '9'),            /* A20p */
+       TPV_QI0('1', '0',  '2', '6'),            /* A21e, A22e */
+       TPV_QI0('K', 'U',  '3', '6'),            /* A21e */
+       TPV_QI0('K', 'X',  '3', '6'),            /* A21m, A22m */
+       TPV_QI0('K', 'Y',  '3', '8'),            /* A21p, A22p */
+       TPV_QI0('1', 'B',  '1', '7'),            /* A22e */
+       TPV_QI0('1', '3',  '2', '0'),            /* A22m */
+       TPV_QI0('1', 'E',  '7', '3'),            /* A30/p (0) */
+       TPV_QI1('1', 'G',  '4', '1',  '1', '7'), /* A31/p (0) */
+       TPV_QI1('1', 'N',  '1', '6',  '0', '7'), /* A31/p (0) */
+
+       /* G-series ------------------------- */
+       /*      FW MODEL   BIOS VERS          */
+       TPV_QI0('1', 'T',  'A', '6'),            /* G40 */
+       TPV_QI0('1', 'X',  '5', '7'),            /* G41 */
+
+       /* R-series, T-series --------------- */
+       /*      FW MODEL   BIOS VERS  EC VERS */
+       TPV_QI0('1', 'C',  'F', '0'),            /* R30 */
+       TPV_QI0('1', 'F',  'F', '1'),            /* R31 */
+       TPV_QI0('1', 'M',  '9', '7'),            /* R32 */
+       TPV_QI0('1', 'O',  '6', '1'),            /* R40 */
+       TPV_QI0('1', 'P',  '6', '5'),            /* R40 */
+       TPV_QI0('1', 'S',  '7', '0'),            /* R40e */
+       TPV_QI1('1', 'R',  'D', 'R',  '7', '1'), /* R50/p, R51,
+                                                   T40/p, T41/p, T42/p (1) */
+       TPV_QI1('1', 'V',  '7', '1',  '2', '8'), /* R50e, R51 (1) */
+       TPV_QI1('7', '8',  '7', '1',  '0', '6'), /* R51e (1) */
+       TPV_QI1('7', '6',  '6', '9',  '1', '6'), /* R52 (1) */
+       TPV_QI1('7', '0',  '6', '9',  '2', '8'), /* R52, T43 (1) */
+
+       TPV_QI0('I', 'Y',  '6', '1'),            /* T20 */
+       TPV_QI0('K', 'Z',  '3', '4'),            /* T21 */
+       TPV_QI0('1', '6',  '3', '2'),            /* T22 */
+       TPV_QI1('1', 'A',  '6', '4',  '2', '3'), /* T23 (0) */
+       TPV_QI1('1', 'I',  '7', '1',  '2', '0'), /* T30 (0) */
+       TPV_QI1('1', 'Y',  '6', '5',  '2', '9'), /* T43/p (1) */
+
+       TPV_QL1('7', '9',  'E', '3',  '5', '0'), /* T60/p */
+       TPV_QL1('7', 'C',  'D', '2',  '2', '2'), /* R60, R60i */
+       TPV_QL0('7', 'E',  'D', '0'),            /* R60e, R60i */
+
+       /*      BIOS FW    BIOS VERS  EC FW     EC VERS */
+       TPV_QI2('1', 'W',  '9', '0',  '1', 'V', '2', '8'), /* R50e (1) */
+       TPV_QL2('7', 'I',  '3', '4',  '7', '9', '5', '0'), /* T60/p wide */
+
+       /* X-series ------------------------- */
+       /*      FW MODEL   BIOS VERS  EC VERS */
+       TPV_QI0('I', 'Z',  '9', 'D'),            /* X20, X21 */
+       TPV_QI0('1', 'D',  '7', '0'),            /* X22, X23, X24 */
+       TPV_QI1('1', 'K',  '4', '8',  '1', '8'), /* X30 (0) */
+       TPV_QI1('1', 'Q',  '9', '7',  '2', '3'), /* X31, X32 (0) */
+       TPV_QI1('1', 'U',  'D', '3',  'B', '2'), /* X40 (0) */
+       TPV_QI1('7', '4',  '6', '4',  '2', '7'), /* X41 (0) */
+       TPV_QI1('7', '5',  '6', '0',  '2', '0'), /* X41t (0) */
+
+       TPV_QL0('7', 'B',  'D', '7'),            /* X60/s */
+       TPV_QL0('7', 'J',  '3', '0'),            /* X60t */
+
+       /* (0) - older versions lack DMI EC fw string and functionality */
+       /* (1) - older versions known to lack functionality */
+};
+
+#undef TPV_QL1
+#undef TPV_QL0
+#undef TPV_QI2
+#undef TPV_QI1
+#undef TPV_QI0
+#undef TPV_Q_X
+#undef TPV_Q
+
+static void __init tpacpi_check_outdated_fw(void)
+{
+       unsigned long fwvers;
+       u16 ec_version, bios_version;
+
+       fwvers = tpacpi_check_quirks(tpacpi_bios_version_qtable,
+                               ARRAY_SIZE(tpacpi_bios_version_qtable));
+
+       if (!fwvers)
+               return;
+
+       bios_version = fwvers & 0xffffU;
+       ec_version = (fwvers >> 16) & 0xffffU;
+
+       /* note that unknown versions are set to 0x0000 and we use that */
+       if ((bios_version > thinkpad_id.bios_release) ||
+           (ec_version > thinkpad_id.ec_release &&
+                               ec_version != TPACPI_MATCH_ANY)) {
+               /*
+                * The changelogs would let us track down the exact
+                * reason, but it is just too much of a pain to track
+                * it.  We only list BIOSes that are either really
+                * broken, or really stable to begin with, so it is
+                * best if the user upgrades the firmware anyway.
+                */
+               printk(TPACPI_WARN
+                       "WARNING: Outdated ThinkPad BIOS/EC firmware\n");
+               printk(TPACPI_WARN
+                       "WARNING: This firmware may be missing critical bug "
+                       "fixes and/or important features\n");
+       }
+}
+
+static bool __init tpacpi_is_fw_known(void)
+{
+       return tpacpi_check_quirks(tpacpi_bios_version_qtable,
+                       ARRAY_SIZE(tpacpi_bios_version_qtable)) != 0;
+}
+
 /****************************************************************************
  ****************************************************************************
  *
@@ -1634,6 +1825,7 @@ static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
                        (thinkpad_id.nummodel_str) ?
                                thinkpad_id.nummodel_str : "unknown");
 
+       tpacpi_check_outdated_fw();
        return 0;
 }
 
@@ -1731,16 +1923,42 @@ struct tp_nvram_state {
        u8 volume_level;
 };
 
+/* kthread for the hotkey poller */
 static struct task_struct *tpacpi_hotkey_task;
-static u32 hotkey_source_mask;         /* bit mask 0=ACPI,1=NVRAM */
-static int hotkey_poll_freq = 10;      /* Hz */
+
+/* Acquired while the poller kthread is running, use to sync start/stop */
 static struct mutex hotkey_thread_mutex;
+
+/*
+ * Acquire mutex to write poller control variables.
+ * Increment hotkey_config_change when changing them.
+ *
+ * See HOTKEY_CONFIG_CRITICAL_START/HOTKEY_CONFIG_CRITICAL_END
+ */
 static struct mutex hotkey_thread_data_mutex;
 static unsigned int hotkey_config_change;
 
+/*
+ * hotkey poller control variables
+ *
+ * Must be atomic or readers will also need to acquire mutex
+ */
+static u32 hotkey_source_mask;         /* bit mask 0=ACPI,1=NVRAM */
+static unsigned int hotkey_poll_freq = 10; /* Hz */
+
+#define HOTKEY_CONFIG_CRITICAL_START \
+       do { \
+               mutex_lock(&hotkey_thread_data_mutex); \
+               hotkey_config_change++; \
+       } while (0);
+#define HOTKEY_CONFIG_CRITICAL_END \
+       mutex_unlock(&hotkey_thread_data_mutex);
+
 #else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
 
 #define hotkey_source_mask 0U
+#define HOTKEY_CONFIG_CRITICAL_START
+#define HOTKEY_CONFIG_CRITICAL_END
 
 #endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
 
@@ -1765,19 +1983,6 @@ static u16 *hotkey_keycode_map;
 
 static struct attribute_set *hotkey_dev_attributes;
 
-#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
-#define HOTKEY_CONFIG_CRITICAL_START \
-       do { \
-               mutex_lock(&hotkey_thread_data_mutex); \
-               hotkey_config_change++; \
-       } while (0);
-#define HOTKEY_CONFIG_CRITICAL_END \
-       mutex_unlock(&hotkey_thread_data_mutex);
-#else
-#define HOTKEY_CONFIG_CRITICAL_START
-#define HOTKEY_CONFIG_CRITICAL_END
-#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
-
 /* HKEY.MHKG() return bits */
 #define TP_HOTKEY_TABLET_MASK (1 << 3)
 
@@ -1822,7 +2027,9 @@ static int hotkey_mask_get(void)
                if (!acpi_evalf(hkey_handle, &m, "DHKN", "d"))
                        return -EIO;
        }
+       HOTKEY_CONFIG_CRITICAL_START
        hotkey_mask = m | (hotkey_source_mask & hotkey_mask);
+       HOTKEY_CONFIG_CRITICAL_END
 
        return 0;
 }
@@ -2075,6 +2282,7 @@ static int hotkey_kthread(void *data)
        unsigned int si, so;
        unsigned long t;
        unsigned int change_detector, must_reset;
+       unsigned int poll_freq;
 
        mutex_lock(&hotkey_thread_mutex);
 
@@ -2091,12 +2299,17 @@ static int hotkey_kthread(void *data)
        mutex_lock(&hotkey_thread_data_mutex);
        change_detector = hotkey_config_change;
        mask = hotkey_source_mask & hotkey_mask;
+       poll_freq = hotkey_poll_freq;
        mutex_unlock(&hotkey_thread_data_mutex);
        hotkey_read_nvram(&s[so], mask);
 
-       while (!kthread_should_stop() && hotkey_poll_freq) {
-               if (t == 0)
-                       t = 1000/hotkey_poll_freq;
+       while (!kthread_should_stop()) {
+               if (t == 0) {
+                       if (likely(poll_freq))
+                               t = 1000/poll_freq;
+                       else
+                               t = 100;        /* should never happen... */
+               }
                t = msleep_interruptible(t);
                if (unlikely(kthread_should_stop()))
                        break;
@@ -2112,6 +2325,7 @@ static int hotkey_kthread(void *data)
                        change_detector = hotkey_config_change;
                }
                mask = hotkey_source_mask & hotkey_mask;
+               poll_freq = hotkey_poll_freq;
                mutex_unlock(&hotkey_thread_data_mutex);
 
                if (likely(mask)) {
@@ -2131,6 +2345,7 @@ exit:
        return 0;
 }
 
+/* call with hotkey_mutex held */
 static void hotkey_poll_stop_sync(void)
 {
        if (tpacpi_hotkey_task) {
@@ -2147,10 +2362,11 @@ static void hotkey_poll_stop_sync(void)
 }
 
 /* call with hotkey_mutex held */
-static void hotkey_poll_setup(int may_warn)
+static void hotkey_poll_setup(bool may_warn)
 {
-       if ((hotkey_source_mask & hotkey_mask) != 0 &&
-           hotkey_poll_freq > 0 &&
+       u32 hotkeys_to_poll = hotkey_source_mask & hotkey_mask;
+
+       if (hotkeys_to_poll != 0 && hotkey_poll_freq > 0 &&
            (tpacpi_inputdev->users > 0 || hotkey_report_mode < 2)) {
                if (!tpacpi_hotkey_task) {
                        tpacpi_hotkey_task = kthread_run(hotkey_kthread,
@@ -2164,26 +2380,37 @@ static void hotkey_poll_setup(int may_warn)
                }
        } else {
                hotkey_poll_stop_sync();
-               if (may_warn &&
-                   hotkey_source_mask != 0 && hotkey_poll_freq == 0) {
+               if (may_warn && hotkeys_to_poll != 0 &&
+                   hotkey_poll_freq == 0) {
                        printk(TPACPI_NOTICE
                                "hot keys 0x%08x require polling, "
                                "which is currently disabled\n",
-                               hotkey_source_mask);
+                               hotkeys_to_poll);
                }
        }
 }
 
-static void hotkey_poll_setup_safe(int may_warn)
+static void hotkey_poll_setup_safe(bool may_warn)
 {
        mutex_lock(&hotkey_mutex);
        hotkey_poll_setup(may_warn);
        mutex_unlock(&hotkey_mutex);
 }
 
+/* call with hotkey_mutex held */
+static void hotkey_poll_set_freq(unsigned int freq)
+{
+       if (!freq)
+               hotkey_poll_stop_sync();
+
+       HOTKEY_CONFIG_CRITICAL_START
+       hotkey_poll_freq = freq;
+       HOTKEY_CONFIG_CRITICAL_END
+}
+
 #else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
 
-static void hotkey_poll_setup_safe(int __unused)
+static void hotkey_poll_setup_safe(bool __unused)
 {
 }
 
@@ -2201,7 +2428,7 @@ static int hotkey_inputdev_open(struct input_dev *dev)
        case TPACPI_LIFE_EXITING:
                return -EBUSY;
        case TPACPI_LIFE_RUNNING:
-               hotkey_poll_setup_safe(0);
+               hotkey_poll_setup_safe(false);
                return 0;
        }
 
@@ -2214,7 +2441,7 @@ static void hotkey_inputdev_close(struct input_dev *dev)
 {
        /* disable hotkey polling when possible */
        if (tpacpi_lifecycle == TPACPI_LIFE_RUNNING)
-               hotkey_poll_setup_safe(0);
+               hotkey_poll_setup_safe(false);
 }
 
 /* sysfs hotkey enable ------------------------------------------------- */
@@ -2288,7 +2515,7 @@ static ssize_t hotkey_mask_store(struct device *dev,
        res = hotkey_mask_set(t);
 
 #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
-       hotkey_poll_setup(1);
+       hotkey_poll_setup(true);
 #endif
 
        mutex_unlock(&hotkey_mutex);
@@ -2318,6 +2545,8 @@ static ssize_t hotkey_bios_mask_show(struct device *dev,
                           struct device_attribute *attr,
                           char *buf)
 {
+       printk_deprecated_attribute("hotkey_bios_mask",
+                       "This attribute is useless.");
        return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_orig_mask);
 }
 
@@ -2377,7 +2606,8 @@ static ssize_t hotkey_source_mask_store(struct device *dev,
        hotkey_source_mask = t;
        HOTKEY_CONFIG_CRITICAL_END
 
-       hotkey_poll_setup(1);
+       hotkey_poll_setup(true);
+       hotkey_mask_set(hotkey_mask);
 
        mutex_unlock(&hotkey_mutex);
 
@@ -2410,9 +2640,9 @@ static ssize_t hotkey_poll_freq_store(struct device *dev,
        if (mutex_lock_killable(&hotkey_mutex))
                return -ERESTARTSYS;
 
-       hotkey_poll_freq = t;
+       hotkey_poll_set_freq(t);
+       hotkey_poll_setup(true);
 
-       hotkey_poll_setup(1);
        mutex_unlock(&hotkey_mutex);
 
        tpacpi_disclose_usertask("hotkey_poll_freq", "set to %lu\n", t);
@@ -2603,7 +2833,9 @@ static void tpacpi_send_radiosw_update(void)
 static void hotkey_exit(void)
 {
 #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
+       mutex_lock(&hotkey_mutex);
        hotkey_poll_stop_sync();
+       mutex_unlock(&hotkey_mutex);
 #endif
 
        if (hotkey_dev_attributes)
@@ -2623,6 +2855,15 @@ static void hotkey_exit(void)
        }
 }
 
+static void __init hotkey_unmap(const unsigned int scancode)
+{
+       if (hotkey_keycode_map[scancode] != KEY_RESERVED) {
+               clear_bit(hotkey_keycode_map[scancode],
+                         tpacpi_inputdev->keybit);
+               hotkey_keycode_map[scancode] = KEY_RESERVED;
+       }
+}
+
 static int __init hotkey_init(struct ibm_init_struct *iibm)
 {
        /* Requirements for changing the default keymaps:
@@ -2701,11 +2942,11 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                KEY_UNKNOWN,    /* 0x0D: FN+INSERT */
                KEY_UNKNOWN,    /* 0x0E: FN+DELETE */
 
-               /* These either have to go through ACPI video, or
-                * act like in the IBM ThinkPads, so don't ever
-                * enable them by default */
-               KEY_RESERVED,   /* 0x0F: FN+HOME (brightness up) */
-               KEY_RESERVED,   /* 0x10: FN+END (brightness down) */
+               /* These should be enabled --only-- when ACPI video
+                * is disabled (i.e. in "vendor" mode), and are handled
+                * in a special way by the init code */
+               KEY_BRIGHTNESSUP,       /* 0x0F: FN+HOME (brightness up) */
+               KEY_BRIGHTNESSDOWN,     /* 0x10: FN+END (brightness down) */
 
                KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
 
@@ -2831,19 +3072,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                        goto err_exit;
        }
 
-#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
-       if (tp_features.hotkey_mask) {
-               hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK
-                                       & ~hotkey_all_mask;
-       } else {
-               hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK;
-       }
-
-       vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
-                   "hotkey source mask 0x%08x, polling freq %d\n",
-                   hotkey_source_mask, hotkey_poll_freq);
-#endif
-
 #ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
        if (dbg_wlswemul) {
                tp_features.hotkey_wlsw = 1;
@@ -2944,17 +3172,31 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                       "Disabling thinkpad-acpi brightness events "
                       "by default...\n");
 
-               /* The hotkey_reserved_mask change below is not
-                * necessary while the keys are at KEY_RESERVED in the
-                * default map, but better safe than sorry, leave it
-                * here as a marker of what we have to do, especially
-                * when we finally become able to set this at runtime
-                * on response to X.org requests */
+               /* Disable brightness up/down on Lenovo thinkpads when
+                * ACPI is handling them, otherwise it is plain impossible
+                * for userspace to do something even remotely sane */
                hotkey_reserved_mask |=
                        (1 << TP_ACPI_HOTKEYSCAN_FNHOME)
                        | (1 << TP_ACPI_HOTKEYSCAN_FNEND);
+               hotkey_unmap(TP_ACPI_HOTKEYSCAN_FNHOME);
+               hotkey_unmap(TP_ACPI_HOTKEYSCAN_FNEND);
        }
 
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
+       if (tp_features.hotkey_mask) {
+               hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK
+                                       & ~hotkey_all_mask
+                                       & ~hotkey_reserved_mask;
+       } else {
+               hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK
+                                       & ~hotkey_reserved_mask;
+       }
+
+       vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
+                   "hotkey source mask 0x%08x, polling freq %u\n",
+                   hotkey_source_mask, hotkey_poll_freq);
+#endif
+
        dbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
                        "enabling firmware HKEY event interface...\n");
        res = hotkey_status_set(true);
@@ -2978,7 +3220,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
        tpacpi_inputdev->open = &hotkey_inputdev_open;
        tpacpi_inputdev->close = &hotkey_inputdev_close;
 
-       hotkey_poll_setup_safe(1);
+       hotkey_poll_setup_safe(true);
        tpacpi_send_radiosw_update();
        tpacpi_input_send_tabletsw();
 
@@ -3266,7 +3508,7 @@ static void hotkey_resume(void)
        hotkey_tablet_mode_notify_change();
        hotkey_wakeup_reason_notify_change();
        hotkey_wakeup_hotunplug_complete_notify_change();
-       hotkey_poll_setup_safe(0);
+       hotkey_poll_setup_safe(false);
 }
 
 /* procfs -------------------------------------------------------------- */
@@ -3338,7 +3580,8 @@ static int hotkey_write(char *buf)
                        hotkey_enabledisable_warn(0);
                        res = -EPERM;
                } else if (strlencmp(cmd, "reset") == 0) {
-                       mask = hotkey_orig_mask;
+                       mask = (hotkey_all_mask | hotkey_source_mask)
+                               & ~hotkey_reserved_mask;
                } else if (sscanf(cmd, "0x%x", &mask) == 1) {
                        /* mask set */
                } else if (sscanf(cmd, "%x", &mask) == 1) {
@@ -5655,16 +5898,16 @@ static const struct tpacpi_quirk brightness_quirk_table[] __initconst = {
        /* Models with ATI GPUs known to require ECNVRAM mode */
        TPACPI_Q_IBM('1', 'Y', TPACPI_BRGHT_Q_EC),      /* T43/p ATI */
 
-       /* Models with ATI GPUs (waiting confirmation) */
-       TPACPI_Q_IBM('1', 'R', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_EC),
+       /* Models with ATI GPUs that can use ECNVRAM */
+       TPACPI_Q_IBM('1', 'R', TPACPI_BRGHT_Q_EC),
        TPACPI_Q_IBM('1', 'Q', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_EC),
        TPACPI_Q_IBM('7', '6', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_EC),
        TPACPI_Q_IBM('7', '8', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_EC),
 
-       /* Models with Intel Extreme Graphics 2 (waiting confirmation) */
+       /* Models with Intel Extreme Graphics 2 */
+       TPACPI_Q_IBM('1', 'U', TPACPI_BRGHT_Q_NOEC),
        TPACPI_Q_IBM('1', 'V', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_NOEC),
        TPACPI_Q_IBM('1', 'W', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_NOEC),
-       TPACPI_Q_IBM('1', 'U', TPACPI_BRGHT_Q_ASK|TPACPI_BRGHT_Q_NOEC),
 
        /* Models with Intel GMA900 */
        TPACPI_Q_IBM('7', '0', TPACPI_BRGHT_Q_NOEC),    /* T43, R52 */
@@ -7524,9 +7767,11 @@ static int __init probe_for_thinkpad(void)
 
        /*
         * Non-ancient models have better DMI tagging, but very old models
-        * don't.
+        * don't.  tpacpi_is_fw_known() is a cheat to help in that case.
         */
-       is_thinkpad = (thinkpad_id.model_str != NULL);
+       is_thinkpad = (thinkpad_id.model_str != NULL) ||
+                     (thinkpad_id.ec_model != 0) ||
+                     tpacpi_is_fw_known();
 
        /* ec is required because many other handles are relative to it */
        TPACPI_ACPIHANDLE_INIT(ec);
@@ -7537,13 +7782,6 @@ static int __init probe_for_thinkpad(void)
                return -ENODEV;
        }
 
-       /*
-        * Risks a regression on very old machines, but reduces potential
-        * false positives a damn great deal
-        */
-       if (!is_thinkpad)
-               is_thinkpad = (thinkpad_id.vendor == PCI_VENDOR_ID_IBM);
-
        if (!is_thinkpad && !force_load)
                return -ENODEV;
 
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
new file mode 100644 (file)
index 0000000..02f3d4e
--- /dev/null
@@ -0,0 +1,265 @@
+/*
+ * ACPI driver for Topstar notebooks (hotkeys support only)
+ *
+ * Copyright (c) 2009 Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ *
+ * Implementation inspired by existing x86 platform drivers, in special
+ * asus/eepc/fujitsu-laptop, thanks to their authors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/input.h>
+
+#define ACPI_TOPSTAR_CLASS "topstar"
+
+struct topstar_hkey {
+       struct input_dev *inputdev;
+};
+
+struct tps_key_entry {
+       u8 code;
+       u16 keycode;
+};
+
+static struct tps_key_entry topstar_keymap[] = {
+       { 0x80, KEY_BRIGHTNESSUP },
+       { 0x81, KEY_BRIGHTNESSDOWN },
+       { 0x83, KEY_VOLUMEUP },
+       { 0x84, KEY_VOLUMEDOWN },
+       { 0x85, KEY_MUTE },
+       { 0x86, KEY_SWITCHVIDEOMODE },
+       { 0x87, KEY_F13 }, /* touchpad enable/disable key */
+       { 0x88, KEY_WLAN },
+       { 0x8a, KEY_WWW },
+       { 0x8b, KEY_MAIL },
+       { 0x8c, KEY_MEDIA },
+       { 0x96, KEY_F14 }, /* G key? */
+       { }
+};
+
+static struct tps_key_entry *tps_get_key_by_scancode(int code)
+{
+       struct tps_key_entry *key;
+
+       for (key = topstar_keymap; key->code; key++)
+               if (code == key->code)
+                       return key;
+
+       return NULL;
+}
+
+static struct tps_key_entry *tps_get_key_by_keycode(int code)
+{
+       struct tps_key_entry *key;
+
+       for (key = topstar_keymap; key->code; key++)
+               if (code == key->keycode)
+                       return key;
+
+       return NULL;
+}
+
+static void acpi_topstar_notify(struct acpi_device *device, u32 event)
+{
+       struct tps_key_entry *key;
+       static bool dup_evnt[2];
+       bool *dup;
+       struct topstar_hkey *hkey = acpi_driver_data(device);
+
+       /* 0x83 and 0x84 key events comes duplicated... */
+       if (event == 0x83 || event == 0x84) {
+               dup = &dup_evnt[event - 0x83];
+               if (*dup) {
+                       *dup = false;
+                       return;
+               }
+               *dup = true;
+       }
+
+       /*
+        * 'G key' generate two event codes, convert to only
+        * one event/key code for now (3G switch?)
+        */
+       if (event == 0x97)
+               event = 0x96;
+
+       key = tps_get_key_by_scancode(event);
+       if (key) {
+               input_report_key(hkey->inputdev, key->keycode, 1);
+               input_sync(hkey->inputdev);
+               input_report_key(hkey->inputdev, key->keycode, 0);
+               input_sync(hkey->inputdev);
+               return;
+       }
+
+       /* Known non hotkey events don't handled or that we don't care yet */
+       if (event == 0x8e || event == 0x8f || event == 0x90)
+               return;
+
+       pr_info("unknown event = 0x%02x\n", event);
+}
+
+static int acpi_topstar_fncx_switch(struct acpi_device *device, bool state)
+{
+       acpi_status status;
+       union acpi_object fncx_params[1] = {
+               { .type = ACPI_TYPE_INTEGER }
+       };
+       struct acpi_object_list fncx_arg_list = { 1, &fncx_params[0] };
+
+       fncx_params[0].integer.value = state ? 0x86 : 0x87;
+       status = acpi_evaluate_object(device->handle, "FNCX", &fncx_arg_list, NULL);
+       if (ACPI_FAILURE(status)) {
+               pr_err("Unable to switch FNCX notifications\n");
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static int topstar_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+       struct tps_key_entry *key = tps_get_key_by_scancode(scancode);
+
+       if (!key)
+               return -EINVAL;
+
+       *keycode = key->keycode;
+       return 0;
+}
+
+static int topstar_setkeycode(struct input_dev *dev, int scancode, int keycode)
+{
+       struct tps_key_entry *key;
+       int old_keycode;
+
+       if (keycode < 0 || keycode > KEY_MAX)
+               return -EINVAL;
+
+       key = tps_get_key_by_scancode(scancode);
+
+       if (!key)
+               return -EINVAL;
+
+       old_keycode = key->keycode;
+       key->keycode = keycode;
+       set_bit(keycode, dev->keybit);
+       if (!tps_get_key_by_keycode(old_keycode))
+               clear_bit(old_keycode, dev->keybit);
+       return 0;
+}
+
+static int acpi_topstar_init_hkey(struct topstar_hkey *hkey)
+{
+       struct tps_key_entry *key;
+
+       hkey->inputdev = input_allocate_device();
+       if (!hkey->inputdev) {
+               pr_err("Unable to allocate input device\n");
+               return -ENODEV;
+       }
+       hkey->inputdev->name = "Topstar Laptop extra buttons";
+       hkey->inputdev->phys = "topstar/input0";
+       hkey->inputdev->id.bustype = BUS_HOST;
+       hkey->inputdev->getkeycode = topstar_getkeycode;
+       hkey->inputdev->setkeycode = topstar_setkeycode;
+       for (key = topstar_keymap; key->code; key++) {
+               set_bit(EV_KEY, hkey->inputdev->evbit);
+               set_bit(key->keycode, hkey->inputdev->keybit);
+       }
+       if (input_register_device(hkey->inputdev)) {
+               pr_err("Unable to register input device\n");
+               input_free_device(hkey->inputdev);
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static int acpi_topstar_add(struct acpi_device *device)
+{
+       struct topstar_hkey *tps_hkey;
+
+       tps_hkey = kzalloc(sizeof(struct topstar_hkey), GFP_KERNEL);
+       if (!tps_hkey)
+               return -ENOMEM;
+
+       strcpy(acpi_device_name(device), "Topstar TPSACPI");
+       strcpy(acpi_device_class(device), ACPI_TOPSTAR_CLASS);
+
+       if (acpi_topstar_fncx_switch(device, true))
+               goto add_err;
+
+       if (acpi_topstar_init_hkey(tps_hkey))
+               goto add_err;
+
+       device->driver_data = tps_hkey;
+       return 0;
+
+add_err:
+       kfree(tps_hkey);
+       return -ENODEV;
+}
+
+static int acpi_topstar_remove(struct acpi_device *device, int type)
+{
+       struct topstar_hkey *tps_hkey = acpi_driver_data(device);
+
+       acpi_topstar_fncx_switch(device, false);
+
+       input_unregister_device(tps_hkey->inputdev);
+       kfree(tps_hkey);
+
+       return 0;
+}
+
+static const struct acpi_device_id topstar_device_ids[] = {
+       { "TPSACPI01", 0 },
+       { "", 0 },
+};
+MODULE_DEVICE_TABLE(acpi, topstar_device_ids);
+
+static struct acpi_driver acpi_topstar_driver = {
+       .name = "Topstar laptop ACPI driver",
+       .class = ACPI_TOPSTAR_CLASS,
+       .ids = topstar_device_ids,
+       .ops = {
+               .add = acpi_topstar_add,
+               .remove = acpi_topstar_remove,
+               .notify = acpi_topstar_notify,
+       },
+};
+
+static int __init topstar_laptop_init(void)
+{
+       int ret;
+
+       ret = acpi_bus_register_driver(&acpi_topstar_driver);
+       if (ret < 0)
+               return ret;
+
+       printk(KERN_INFO "Topstar Laptop ACPI extras driver loaded\n");
+
+       return 0;
+}
+
+static void __exit topstar_laptop_exit(void)
+{
+       acpi_bus_unregister_driver(&acpi_topstar_driver);
+}
+
+module_init(topstar_laptop_init);
+module_exit(topstar_laptop_exit);
+
+MODULE_AUTHOR("Herton Ronaldo Krzesinski");
+MODULE_DESCRIPTION("Topstar Laptop ACPI Extras driver");
+MODULE_LICENSE("GPL");
index 527ee76..cd11b11 100644 (file)
@@ -135,6 +135,15 @@ static int pnp_device_remove(struct device *dev)
        return 0;
 }
 
+static void pnp_device_shutdown(struct device *dev)
+{
+       struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+       struct pnp_driver *drv = pnp_dev->driver;
+
+       if (drv && drv->shutdown)
+               drv->shutdown(pnp_dev);
+}
+
 static int pnp_bus_match(struct device *dev, struct device_driver *drv)
 {
        struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -203,6 +212,7 @@ struct bus_type pnp_bus_type = {
        .match   = pnp_bus_match,
        .probe   = pnp_device_probe,
        .remove  = pnp_device_remove,
+       .shutdown = pnp_device_shutdown,
        .suspend = pnp_bus_suspend,
        .resume  = pnp_bus_resume,
        .dev_attrs = pnp_interface_attrs,
index 9496494..c07fdb9 100644 (file)
@@ -194,13 +194,13 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                pnpacpi_parse_resource_option_data(dev);
 
        if (device->flags.compatible_ids) {
-               struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
+               struct acpica_device_id_list *cid_list = device->pnp.cid_list;
                int i;
 
                for (i = 0; i < cid_list->count; i++) {
-                       if (!ispnpidacpi(cid_list->id[i].value))
+                       if (!ispnpidacpi(cid_list->ids[i].string))
                                continue;
-                       pnp_add_id(dev, cid_list->id[i].value);
+                       pnp_add_id(dev, cid_list->ids[i].string);
                }
        }
 
index 73771b0..3c20dae 100644 (file)
@@ -378,6 +378,15 @@ config RTC_DRV_DS3234
          This driver can also be built as a module. If so, the module
          will be called rtc-ds3234.
 
+config RTC_DRV_PCF2123
+       tristate "NXP PCF2123"
+       help
+         If you say yes here you get support for the NXP PCF2123
+         RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-pcf2123.
+
 endif # SPI_MASTER
 
 comment "Platform RTC drivers"
@@ -500,6 +509,17 @@ config RTC_DRV_M48T59
          This driver can also be built as a module, if so, the module
          will be called "rtc-m48t59".
 
+config RTC_MXC
+       tristate "Freescale MXC Real Time Clock"
+       depends on ARCH_MXC
+       depends on RTC_CLASS
+       help
+          If you say yes here you get support for the Freescale MXC
+          RTC module.
+
+          This driver can also be built as a module, if so, the module
+          will be called "rtc-mxc".
+
 config RTC_DRV_BQ4802
        tristate "TI BQ4802"
        help
@@ -778,4 +798,33 @@ config RTC_DRV_PS3
          This driver can also be built as a module. If so, the module
          will be called rtc-ps3.
 
+config RTC_DRV_COH901331
+       tristate "ST-Ericsson COH 901 331 RTC"
+       depends on ARCH_U300
+       help
+         If you say Y here you will get access to ST-Ericsson
+         COH 901 331 RTC clock found in some ST-Ericsson Mobile
+         Platforms.
+
+         This driver can also be built as a module. If so, the module
+         will be called "rtc-coh901331".
+
+
+config RTC_DRV_STMP
+       tristate "Freescale STMP3xxx RTC"
+       depends on ARCH_STMP3XXX
+       help
+         If you say yes here you will get support for the onboard
+         STMP3xxx RTC.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-stmp3xxx.
+
+config RTC_DRV_PCAP
+       tristate "PCAP RTC"
+       depends on EZX_PCAP
+       help
+         If you say Y here you will get support for the RTC found on
+         the PCAP2 ASIC used on some Motorola phones.
+
 endif # RTC_CLASS
index 5e152ff..aa3fbd5 100644 (file)
@@ -23,7 +23,9 @@ obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
 obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_AU1XXX)   += rtc-au1xxx.o
 obj-$(CONFIG_RTC_DRV_BFIN)     += rtc-bfin.o
+obj-$(CONFIG_RTC_DRV_BQ4802)   += rtc-bq4802.o
 obj-$(CONFIG_RTC_DRV_CMOS)     += rtc-cmos.o
+obj-$(CONFIG_RTC_DRV_COH901331)        += rtc-coh901331.o
 obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_DS1216)   += rtc-ds1216.o
 obj-$(CONFIG_RTC_DRV_DS1286)   += rtc-ds1286.o
@@ -40,24 +42,26 @@ obj-$(CONFIG_RTC_DRV_DS3234)        += rtc-ds3234.o
 obj-$(CONFIG_RTC_DRV_EFI)      += rtc-efi.o
 obj-$(CONFIG_RTC_DRV_EP93XX)   += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_FM3130)   += rtc-fm3130.o
+obj-$(CONFIG_RTC_DRV_GENERIC)  += rtc-generic.o
 obj-$(CONFIG_RTC_DRV_ISL1208)  += rtc-isl1208.o
 obj-$(CONFIG_RTC_DRV_M41T80)   += rtc-m41t80.o
 obj-$(CONFIG_RTC_DRV_M41T94)   += rtc-m41t94.o
 obj-$(CONFIG_RTC_DRV_M48T35)   += rtc-m48t35.o
 obj-$(CONFIG_RTC_DRV_M48T59)   += rtc-m48t59.o
 obj-$(CONFIG_RTC_DRV_M48T86)   += rtc-m48t86.o
-obj-$(CONFIG_RTC_DRV_BQ4802)   += rtc-bq4802.o
-obj-$(CONFIG_RTC_DRV_SUN4V)    += rtc-sun4v.o
-obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o
+obj-$(CONFIG_RTC_MXC)          += rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)  += rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX6902)  += rtc-max6902.o
 obj-$(CONFIG_RTC_DRV_MV)       += rtc-mv.o
 obj-$(CONFIG_RTC_DRV_OMAP)     += rtc-omap.o
+obj-$(CONFIG_RTC_DRV_PCAP)     += rtc-pcap.o
 obj-$(CONFIG_RTC_DRV_PCF8563)  += rtc-pcf8563.o
 obj-$(CONFIG_RTC_DRV_PCF8583)  += rtc-pcf8583.o
+obj-$(CONFIG_RTC_DRV_PCF2123)  += rtc-pcf2123.o
+obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
 obj-$(CONFIG_RTC_DRV_PL030)    += rtc-pl030.o
 obj-$(CONFIG_RTC_DRV_PL031)    += rtc-pl031.o
-obj-$(CONFIG_RTC_DRV_GENERIC)  += rtc-generic.o
+obj-$(CONFIG_RTC_DRV_PS3)      += rtc-ps3.o
 obj-$(CONFIG_RTC_DRV_PXA)      += rtc-pxa.o
 obj-$(CONFIG_RTC_DRV_R9701)    += rtc-r9701.o
 obj-$(CONFIG_RTC_DRV_RS5C313)  += rtc-rs5c313.o
@@ -69,7 +73,10 @@ obj-$(CONFIG_RTC_DRV_S35390A)        += rtc-s35390a.o
 obj-$(CONFIG_RTC_DRV_S3C)      += rtc-s3c.o
 obj-$(CONFIG_RTC_DRV_SA1100)   += rtc-sa1100.o
 obj-$(CONFIG_RTC_DRV_SH)       += rtc-sh.o
+obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o
 obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o
+obj-$(CONFIG_RTC_DRV_STMP)     += rtc-stmp3xxx.o
+obj-$(CONFIG_RTC_DRV_SUN4V)    += rtc-sun4v.o
 obj-$(CONFIG_RTC_DRV_TEST)     += rtc-test.o
 obj-$(CONFIG_RTC_DRV_TWL4030)  += rtc-twl4030.o
 obj-$(CONFIG_RTC_DRV_TX4939)   += rtc-tx4939.o
@@ -78,5 +85,3 @@ obj-$(CONFIG_RTC_DRV_VR41XX)  += rtc-vr41xx.o
 obj-$(CONFIG_RTC_DRV_WM831X)   += rtc-wm831x.o
 obj-$(CONFIG_RTC_DRV_WM8350)   += rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)    += rtc-x1205.o
-obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
-obj-$(CONFIG_RTC_DRV_PS3)      += rtc-ps3.o
index b5bf937..bc8bbca 100644 (file)
@@ -289,7 +289,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
                                        AT91_RTC_CALEV);
 
        ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
-                               IRQF_DISABLED | IRQF_SHARED,
+                               IRQF_SHARED,
                                "at91_rtc", pdev);
        if (ret) {
                printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n",
@@ -340,7 +340,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
 
 static u32 at91_rtc_imr;
 
-static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+static int at91_rtc_suspend(struct device *dev)
 {
        /* this IRQ is shared with DBGU and other hardware which isn't
         * necessarily doing PM like we are...
@@ -348,7 +348,7 @@ static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
        at91_rtc_imr = at91_sys_read(AT91_RTC_IMR)
                        & (AT91_RTC_ALARM|AT91_RTC_SECEV);
        if (at91_rtc_imr) {
-               if (device_may_wakeup(&pdev->dev))
+               if (device_may_wakeup(dev))
                        enable_irq_wake(AT91_ID_SYS);
                else
                        at91_sys_write(AT91_RTC_IDR, at91_rtc_imr);
@@ -356,28 +356,34 @@ static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
        return 0;
 }
 
-static int at91_rtc_resume(struct platform_device *pdev)
+static int at91_rtc_resume(struct device *dev)
 {
        if (at91_rtc_imr) {
-               if (device_may_wakeup(&pdev->dev))
+               if (device_may_wakeup(dev))
                        disable_irq_wake(AT91_ID_SYS);
                else
                        at91_sys_write(AT91_RTC_IER, at91_rtc_imr);
        }
        return 0;
 }
+
+static const struct dev_pm_ops at91_rtc_pm = {
+       .suspend =      at91_rtc_suspend,
+       .resume =       at91_rtc_resume,
+};
+
+#define at91_rtc_pm_ptr        &at91_rtc_pm
+
 #else
-#define at91_rtc_suspend NULL
-#define at91_rtc_resume  NULL
+#define at91_rtc_pm_ptr        NULL
 #endif
 
 static struct platform_driver at91_rtc_driver = {
        .remove         = __exit_p(at91_rtc_remove),
-       .suspend        = at91_rtc_suspend,
-       .resume         = at91_rtc_resume,
        .driver         = {
                .name   = "at91_rtc",
                .owner  = THIS_MODULE,
+               .pm     = at91_rtc_pm_ptr,
        },
 };
 
index a118eb0..b11485b 100644 (file)
@@ -383,7 +383,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
        }
 
        /* Grab the IRQ and init the hardware */
-       ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);
+       ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, 0, pdev->name, dev);
        if (unlikely(ret))
                goto err_reg;
        /* sometimes the bootloader touched things, but the write complete was not
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
new file mode 100644 (file)
index 0000000..7fe1fa2
--- /dev/null
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2007-2009 ST-Ericsson AB
+ * License terms: GNU General Public License (GPL) version 2
+ * Real Time Clock interface for ST-Ericsson AB COH 901 331 RTC.
+ * Author: Linus Walleij <linus.walleij@stericsson.com>
+ * Based on rtc-pl031.c by Deepak Saxena <dsaxena@plexity.net>
+ * Copyright 2006 (c) MontaVista Software, Inc.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+/*
+ * Registers in the COH 901 331
+ */
+/* Alarm value 32bit (R/W) */
+#define COH901331_ALARM                0x00U
+/* Used to set current time 32bit (R/W) */
+#define COH901331_SET_TIME     0x04U
+/* Indication if current time is valid 32bit (R/-) */
+#define COH901331_VALID                0x08U
+/* Read the current time 32bit (R/-) */
+#define COH901331_CUR_TIME     0x0cU
+/* Event register for the "alarm" interrupt */
+#define COH901331_IRQ_EVENT    0x10U
+/* Mask register for the "alarm" interrupt */
+#define COH901331_IRQ_MASK     0x14U
+/* Force register for the "alarm" interrupt */
+#define COH901331_IRQ_FORCE    0x18U
+
+/*
+ * Reference to RTC block clock
+ * Notice that the frequent clk_enable()/clk_disable() on this
+ * clock is mainly to be able to turn on/off other clocks in the
+ * hierarchy as needed, the RTC clock is always on anyway.
+ */
+struct coh901331_port {
+       struct rtc_device *rtc;
+       struct clk *clk;
+       u32 phybase;
+       u32 physize;
+       void __iomem *virtbase;
+       int irq;
+#ifdef CONFIG_PM
+       u32 irqmaskstore;
+#endif
+};
+
+static irqreturn_t coh901331_interrupt(int irq, void *data)
+{
+       struct coh901331_port *rtap = data;
+
+       clk_enable(rtap->clk);
+       /* Ack IRQ */
+       writel(1, rtap->virtbase + COH901331_IRQ_EVENT);
+       clk_disable(rtap->clk);
+       /* Set alarm flag */
+       rtc_update_irq(rtap->rtc, 1, RTC_AF);
+
+       return IRQ_HANDLED;
+}
+
+static int coh901331_read_time(struct device *dev, struct rtc_time *tm)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
+
+       clk_enable(rtap->clk);
+       /* Check if the time is valid */
+       if (readl(rtap->virtbase + COH901331_VALID)) {
+               rtc_time_to_tm(readl(rtap->virtbase + COH901331_CUR_TIME), tm);
+               clk_disable(rtap->clk);
+               return rtc_valid_tm(tm);
+       }
+       clk_disable(rtap->clk);
+       return -EINVAL;
+}
+
+static int coh901331_set_mmss(struct device *dev, unsigned long secs)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
+
+       clk_enable(rtap->clk);
+       writel(secs, rtap->virtbase + COH901331_SET_TIME);
+       clk_disable(rtap->clk);
+
+       return 0;
+}
+
+static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
+
+       clk_enable(rtap->clk);
+       rtc_time_to_tm(readl(rtap->virtbase + COH901331_ALARM), &alarm->time);
+       alarm->pending = readl(rtap->virtbase + COH901331_IRQ_EVENT) & 1U;
+       alarm->enabled = readl(rtap->virtbase + COH901331_IRQ_MASK) & 1U;
+       clk_disable(rtap->clk);
+
+       return 0;
+}
+
+static int coh901331_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
+       unsigned long time;
+
+       rtc_tm_to_time(&alarm->time, &time);
+       clk_enable(rtap->clk);
+       writel(time, rtap->virtbase + COH901331_ALARM);
+       writel(alarm->enabled, rtap->virtbase + COH901331_IRQ_MASK);
+       clk_disable(rtap->clk);
+
+       return 0;
+}
+
+static int coh901331_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(dev);
+
+       clk_enable(rtap->clk);
+       if (enabled)
+               writel(1, rtap->virtbase + COH901331_IRQ_MASK);
+       else
+               writel(0, rtap->virtbase + COH901331_IRQ_MASK);
+       clk_disable(rtap->clk);
+}
+
+static struct rtc_class_ops coh901331_ops = {
+       .read_time = coh901331_read_time,
+       .set_mmss = coh901331_set_mmss,
+       .read_alarm = coh901331_read_alarm,
+       .set_alarm = coh901331_set_alarm,
+       .alarm_irq_enable = coh901331_alarm_irq_enable,
+};
+
+static int __exit coh901331_remove(struct platform_device *pdev)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+
+       if (rtap) {
+               free_irq(rtap->irq, rtap);
+               rtc_device_unregister(rtap->rtc);
+               clk_put(rtap->clk);
+               iounmap(rtap->virtbase);
+               release_mem_region(rtap->phybase, rtap->physize);
+               platform_set_drvdata(pdev, NULL);
+               kfree(rtap);
+       }
+
+       return 0;
+}
+
+
+static int __init coh901331_probe(struct platform_device *pdev)
+{
+       int ret;
+       struct coh901331_port *rtap;
+       struct resource *res;
+
+       rtap = kzalloc(sizeof(struct coh901331_port), GFP_KERNEL);
+       if (!rtap)
+               return -ENOMEM;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               ret = -ENOENT;
+               goto out_no_resource;
+       }
+       rtap->phybase = res->start;
+       rtap->physize = resource_size(res);
+
+       if (request_mem_region(rtap->phybase, rtap->physize,
+                              "rtc-coh901331") == NULL) {
+               ret = -EBUSY;
+               goto out_no_memregion;
+       }
+
+       rtap->virtbase = ioremap(rtap->phybase, rtap->physize);
+       if (!rtap->virtbase) {
+               ret = -ENOMEM;
+               goto out_no_remap;
+       }
+
+       rtap->irq = platform_get_irq(pdev, 0);
+       if (request_irq(rtap->irq, coh901331_interrupt, IRQF_DISABLED,
+                       "RTC COH 901 331 Alarm", rtap)) {
+               ret = -EIO;
+               goto out_no_irq;
+       }
+
+       rtap->clk = clk_get(&pdev->dev, NULL);
+       if (IS_ERR(rtap->clk)) {
+               ret = PTR_ERR(rtap->clk);
+               dev_err(&pdev->dev, "could not get clock\n");
+               goto out_no_clk;
+       }
+
+       /* We enable/disable the clock only to assure it works */
+       ret = clk_enable(rtap->clk);
+       if (ret) {
+               dev_err(&pdev->dev, "could not enable clock\n");
+               goto out_no_clk_enable;
+       }
+       clk_disable(rtap->clk);
+
+       rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops,
+                                        THIS_MODULE);
+       if (IS_ERR(rtap->rtc)) {
+               ret = PTR_ERR(rtap->rtc);
+               goto out_no_rtc;
+       }
+
+       platform_set_drvdata(pdev, rtap);
+
+       return 0;
+
+ out_no_rtc:
+ out_no_clk_enable:
+       clk_put(rtap->clk);
+ out_no_clk:
+       free_irq(rtap->irq, rtap);
+ out_no_irq:
+       iounmap(rtap->virtbase);
+ out_no_remap:
+       platform_set_drvdata(pdev, NULL);
+ out_no_memregion:
+       release_mem_region(rtap->phybase, SZ_4K);
+ out_no_resource:
+       kfree(rtap);
+       return ret;
+}
+
+#ifdef CONFIG_PM
+static int coh901331_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+
+       /*
+        * If this RTC alarm will be used for waking the system up,
+        * don't disable it of course. Else we just disable the alarm
+        * and await suspension.
+        */
+       if (device_may_wakeup(&pdev->dev)) {
+               enable_irq_wake(rtap->irq);
+       } else {
+               clk_enable(rtap->clk);
+               rtap->irqmaskstore = readl(rtap->virtbase + COH901331_IRQ_MASK);
+               writel(0, rtap->virtbase + COH901331_IRQ_MASK);
+               clk_disable(rtap->clk);
+       }
+       return 0;
+}
+
+static int coh901331_resume(struct platform_device *pdev)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+
+       if (device_may_wakeup(&pdev->dev))
+               disable_irq_wake(rtap->irq);
+       else
+               clk_enable(rtap->clk);
+               writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK);
+               clk_disable(rtap->clk);
+       return 0;
+}
+#else
+#define coh901331_suspend NULL
+#define coh901331_resume NULL
+#endif
+
+static void coh901331_shutdown(struct platform_device *pdev)
+{
+       struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+
+       clk_enable(rtap->clk);
+       writel(0, rtap->virtbase + COH901331_IRQ_MASK);
+       clk_disable(rtap->clk);
+}
+
+static struct platform_driver coh901331_driver = {
+       .driver = {
+               .name = "rtc-coh901331",
+               .owner = THIS_MODULE,
+       },
+       .remove = __exit_p(coh901331_remove),
+       .suspend = coh901331_suspend,
+       .resume = coh901331_resume,
+       .shutdown = coh901331_shutdown,
+};
+
+static int __init coh901331_init(void)
+{
+       return platform_driver_probe(&coh901331_driver, coh901331_probe);
+}
+
+static void __exit coh901331_exit(void)
+{
+       platform_driver_unregister(&coh901331_driver);
+}
+
+module_init(coh901331_init);
+module_exit(coh901331_exit);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@stericsson.com>");
+MODULE_DESCRIPTION("ST-Ericsson AB COH 901 331 RTC Driver");
+MODULE_LICENSE("GPL");
index 8f410e5..2736b11 100644 (file)
@@ -841,3 +841,4 @@ module_exit(ds1305_exit);
 
 MODULE_DESCRIPTION("RTC driver for DS1305 and DS1306 chips");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:rtc-ds1305");
index 47a93c0..eb99ee4 100644 (file)
@@ -896,8 +896,7 @@ read_rtc:
        return 0;
 
 exit_irq:
-       if (ds1307->rtc)
-               rtc_device_unregister(ds1307->rtc);
+       rtc_device_unregister(ds1307->rtc);
 exit_free:
        kfree(ds1307);
        return err;
index e01b955..cdb7050 100644 (file)
@@ -189,3 +189,4 @@ module_exit(ds1390_exit);
 MODULE_DESCRIPTION("Dallas/Maxim DS1390/93/94 SPI RTC driver");
 MODULE_AUTHOR("Mark Jackson <mpfj@mimc.co.uk>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:rtc-ds1390");
index c51589e..a774ca3 100644 (file)
@@ -188,3 +188,4 @@ module_exit(ds3234_exit);
 MODULE_DESCRIPTION("DS3234 SPI RTC driver");
 MODULE_AUTHOR("Dennis Aberilla <denzzzhome@yahoo.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ds3234");
index 551332e..9da02d1 100644 (file)
@@ -128,12 +128,16 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL)
-               return -ENXIO;
+       if (res == NULL) {
+               err = -ENXIO;
+               goto fail_free;
+       }
 
        res = request_mem_region(res->start, resource_size(res), pdev->name);
-       if (res == NULL)
-               return -EBUSY;
+       if (res == NULL) {
+               err = -EBUSY;
+               goto fail_free;
+       }
 
        ep93xx_rtc->mmio_base = ioremap(res->start, resource_size(res));
        if (ep93xx_rtc->mmio_base == NULL) {
@@ -169,6 +173,8 @@ fail:
                pdev->dev.platform_data = NULL;
        }
        release_mem_region(res->start, resource_size(res));
+fail_free:
+       kfree(ep93xx_rtc);
        return err;
 }
 
index c3a18c5..c8c97a4 100644 (file)
@@ -171,3 +171,4 @@ module_exit(m41t94_exit);
 MODULE_AUTHOR("Kim B. Heino <Kim.Heino@bluegiga.com>");
 MODULE_DESCRIPTION("Driver for ST M41T94 SPI RTC");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:rtc-m41t94");
index 36a8ea9..657403e 100644 (file)
@@ -175,3 +175,4 @@ module_exit(max6902_exit);
 MODULE_DESCRIPTION ("max6902 spi RTC driver");
 MODULE_AUTHOR ("Raphael Assenat");
 MODULE_LICENSE ("GPL");
+MODULE_ALIAS("spi:rtc-max6902");
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
new file mode 100644 (file)
index 0000000..6bd5072
--- /dev/null
@@ -0,0 +1,507 @@
+/*
+ * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/io.h>
+#include <linux/rtc.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+#include <mach/hardware.h>
+
+#define RTC_INPUT_CLK_32768HZ  (0x00 << 5)
+#define RTC_INPUT_CLK_32000HZ  (0x01 << 5)
+#define RTC_INPUT_CLK_38400HZ  (0x02 << 5)
+
+#define RTC_SW_BIT      (1 << 0)
+#define RTC_ALM_BIT     (1 << 2)
+#define RTC_1HZ_BIT     (1 << 4)
+#define RTC_2HZ_BIT     (1 << 7)
+#define RTC_SAM0_BIT    (1 << 8)
+#define RTC_SAM1_BIT    (1 << 9)
+#define RTC_SAM2_BIT    (1 << 10)
+#define RTC_SAM3_BIT    (1 << 11)
+#define RTC_SAM4_BIT    (1 << 12)
+#define RTC_SAM5_BIT    (1 << 13)
+#define RTC_SAM6_BIT    (1 << 14)
+#define RTC_SAM7_BIT    (1 << 15)
+#define PIT_ALL_ON      (RTC_2HZ_BIT | RTC_SAM0_BIT | RTC_SAM1_BIT | \
+                        RTC_SAM2_BIT | RTC_SAM3_BIT | RTC_SAM4_BIT | \
+                        RTC_SAM5_BIT | RTC_SAM6_BIT | RTC_SAM7_BIT)
+
+#define RTC_ENABLE_BIT  (1 << 7)
+
+#define MAX_PIE_NUM     9
+#define MAX_PIE_FREQ    512
+static const u32 PIE_BIT_DEF[MAX_PIE_NUM][2] = {
+       { 2,            RTC_2HZ_BIT },
+       { 4,            RTC_SAM0_BIT },
+       { 8,            RTC_SAM1_BIT },
+       { 16,           RTC_SAM2_BIT },
+       { 32,           RTC_SAM3_BIT },
+       { 64,           RTC_SAM4_BIT },
+       { 128,          RTC_SAM5_BIT },
+       { 256,          RTC_SAM6_BIT },
+       { MAX_PIE_FREQ, RTC_SAM7_BIT },
+};
+
+/* Those are the bits from a classic RTC we want to mimic */
+#define RTC_IRQF       0x80    /* any of the following 3 is active */
+#define RTC_PF         0x40    /* Periodic interrupt */
+#define RTC_AF         0x20    /* Alarm interrupt */
+#define RTC_UF         0x10    /* Update interrupt for 1Hz RTC */
+
+#define MXC_RTC_TIME   0
+#define MXC_RTC_ALARM  1
+
+#define RTC_HOURMIN    0x00    /*  32bit rtc hour/min counter reg */
+#define RTC_SECOND     0x04    /*  32bit rtc seconds counter reg */
+#define RTC_ALRM_HM    0x08    /*  32bit rtc alarm hour/min reg */
+#define RTC_ALRM_SEC   0x0C    /*  32bit rtc alarm seconds reg */
+#define RTC_RTCCTL     0x10    /*  32bit rtc control reg */
+#define RTC_RTCISR     0x14    /*  32bit rtc interrupt status reg */
+#define RTC_RTCIENR    0x18    /*  32bit rtc interrupt enable reg */
+#define RTC_STPWCH     0x1C    /*  32bit rtc stopwatch min reg */
+#define RTC_DAYR       0x20    /*  32bit rtc days counter reg */
+#define RTC_DAYALARM   0x24    /*  32bit rtc day alarm reg */
+#define RTC_TEST1      0x28    /*  32bit rtc test reg 1 */
+#define RTC_TEST2      0x2C    /*  32bit rtc test reg 2 */
+#define RTC_TEST3      0x30    /*  32bit rtc test reg 3 */
+
+struct rtc_plat_data {
+       struct rtc_device *rtc;
+       void __iomem *ioaddr;
+       int irq;
+       struct clk *clk;
+       unsigned int irqen;
+       int alrm_sec;
+       int alrm_min;
+       int alrm_hour;
+       int alrm_mday;
+       struct timespec mxc_rtc_delta;
+       struct rtc_time g_rtc_alarm;
+};
+
+/*
+ * This function is used to obtain the RTC time or the alarm value in
+ * second.
+ */
+static u32 get_alarm_or_time(struct device *dev, int time_alarm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+       u32 day = 0, hr = 0, min = 0, sec = 0, hr_min = 0;
+
+       switch (time_alarm) {
+       case MXC_RTC_TIME:
+               day = readw(ioaddr + RTC_DAYR);
+               hr_min = readw(ioaddr + RTC_HOURMIN);
+               sec = readw(ioaddr + RTC_SECOND);
+               break;
+       case MXC_RTC_ALARM:
+               day = readw(ioaddr + RTC_DAYALARM);
+               hr_min = readw(ioaddr + RTC_ALRM_HM) & 0xffff;
+               sec = readw(ioaddr + RTC_ALRM_SEC);
+               break;
+       }
+
+       hr = hr_min >> 8;
+       min = hr_min & 0xff;
+
+       return (((day * 24 + hr) * 60) + min) * 60 + sec;
+}
+
+/*
+ * This function sets the RTC alarm value or the time value.
+ */
+static void set_alarm_or_time(struct device *dev, int time_alarm, u32 time)
+{
+       u32 day, hr, min, sec, temp;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+
+       day = time / 86400;
+       time -= day * 86400;
+
+       /* time is within a day now */
+       hr = time / 3600;
+       time -= hr * 3600;
+
+       /* time is within an hour now */
+       min = time / 60;
+       sec = time - min * 60;
+
+       temp = (hr << 8) + min;
+
+       switch (time_alarm) {
+       case MXC_RTC_TIME:
+               writew(day, ioaddr + RTC_DAYR);
+               writew(sec, ioaddr + RTC_SECOND);
+               writew(temp, ioaddr + RTC_HOURMIN);
+               break;
+       case MXC_RTC_ALARM:
+               writew(day, ioaddr + RTC_DAYALARM);
+               writew(sec, ioaddr + RTC_ALRM_SEC);
+               writew(temp, ioaddr + RTC_ALRM_HM);
+               break;
+       }
+}
+
+/*
+ * This function updates the RTC alarm registers and then clears all the
+ * interrupt status bits.
+ */
+static int rtc_update_alarm(struct device *dev, struct rtc_time *alrm)
+{
+       struct rtc_time alarm_tm, now_tm;
+       unsigned long now, time;
+       int ret;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+
+       now = get_alarm_or_time(dev, MXC_RTC_TIME);
+       rtc_time_to_tm(now, &now_tm);
+       alarm_tm.tm_year = now_tm.tm_year;
+       alarm_tm.tm_mon = now_tm.tm_mon;
+       alarm_tm.tm_mday = now_tm.tm_mday;
+       alarm_tm.tm_hour = alrm->tm_hour;
+       alarm_tm.tm_min = alrm->tm_min;
+       alarm_tm.tm_sec = alrm->tm_sec;
+       rtc_tm_to_time(&now_tm, &now);
+       rtc_tm_to_time(&alarm_tm, &time);
+
+       if (time < now) {
+               time += 60 * 60 * 24;
+               rtc_time_to_tm(time, &alarm_tm);
+       }
+
+       ret = rtc_tm_to_time(&alarm_tm, &time);
+
+       /* clear all the interrupt status bits */
+       writew(readw(ioaddr + RTC_RTCISR), ioaddr + RTC_RTCISR);
+       set_alarm_or_time(dev, MXC_RTC_ALARM, time);
+
+       return ret;
+}
+
+/* This function is the RTC interrupt service routine. */
+static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id)
+{
+       struct platform_device *pdev = dev_id;
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+       u32 status;
+       u32 events = 0;
+
+       spin_lock_irq(&pdata->rtc->irq_lock);
+       status = readw(ioaddr + RTC_RTCISR) & readw(ioaddr + RTC_RTCIENR);
+       /* clear interrupt sources */
+       writew(status, ioaddr + RTC_RTCISR);
+
+       /* clear alarm interrupt if it has occurred */
+       if (status & RTC_ALM_BIT)
+               status &= ~RTC_ALM_BIT;
+
+       /* update irq data & counter */
+       if (status & RTC_ALM_BIT)
+               events |= (RTC_AF | RTC_IRQF);
+
+       if (status & RTC_1HZ_BIT)
+               events |= (RTC_UF | RTC_IRQF);
+
+       if (status & PIT_ALL_ON)
+               events |= (RTC_PF | RTC_IRQF);
+
+       if ((status & RTC_ALM_BIT) && rtc_valid_tm(&pdata->g_rtc_alarm))
+               rtc_update_alarm(&pdev->dev, &pdata->g_rtc_alarm);
+
+       rtc_update_irq(pdata->rtc, 1, events);
+       spin_unlock_irq(&pdata->rtc->irq_lock);
+
+       return IRQ_HANDLED;
+}
+
+/*
+ * Clear all interrupts and release the IRQ
+ */
+static void mxc_rtc_release(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+
+       spin_lock_irq(&pdata->rtc->irq_lock);
+
+       /* Disable all rtc interrupts */
+       writew(0, ioaddr + RTC_RTCIENR);
+
+       /* Clear all interrupt status */
+       writew(0xffffffff, ioaddr + RTC_RTCISR);
+
+       spin_unlock_irq(&pdata->rtc->irq_lock);
+}
+
+static void mxc_rtc_irq_enable(struct device *dev, unsigned int bit,
+                               unsigned int enabled)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+       u32 reg;
+
+       spin_lock_irq(&pdata->rtc->irq_lock);
+       reg = readw(ioaddr + RTC_RTCIENR);
+
+       if (enabled)
+               reg |= bit;
+       else
+               reg &= ~bit;
+
+       writew(reg, ioaddr + RTC_RTCIENR);
+       spin_unlock_irq(&pdata->rtc->irq_lock);
+}
+
+static int mxc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+       mxc_rtc_irq_enable(dev, RTC_ALM_BIT, enabled);
+       return 0;
+}
+
+static int mxc_rtc_update_irq_enable(struct device *dev, unsigned int enabled)
+{
+       mxc_rtc_irq_enable(dev, RTC_1HZ_BIT, enabled);
+       return 0;
+}
+
+/*
+ * This function reads the current RTC time into tm in Gregorian date.
+ */
+static int mxc_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+       u32 val;
+
+       /* Avoid roll-over from reading the different registers */
+       do {
+               val = get_alarm_or_time(dev, MXC_RTC_TIME);
+       } while (val != get_alarm_or_time(dev, MXC_RTC_TIME));
+
+       rtc_time_to_tm(val, tm);
+
+       return 0;
+}
+
+/*
+ * This function sets the internal RTC time based on tm in Gregorian date.
+ */
+static int mxc_rtc_set_mmss(struct device *dev, unsigned long time)
+{
+       /* Avoid roll-over from reading the different registers */
+       do {
+               set_alarm_or_time(dev, MXC_RTC_TIME, time);
+       } while (time != get_alarm_or_time(dev, MXC_RTC_TIME));
+
+       return 0;
+}
+
+/*
+ * This function reads the current alarm value into the passed in 'alrm'
+ * argument. It updates the alrm's pending field value based on the whether
+ * an alarm interrupt occurs or not.
+ */
+static int mxc_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       void __iomem *ioaddr = pdata->ioaddr;
+
+       rtc_time_to_tm(get_alarm_or_time(dev, MXC_RTC_ALARM), &alrm->time);
+       alrm->pending = ((readw(ioaddr + RTC_RTCISR) & RTC_ALM_BIT)) ? 1 : 0;
+
+       return 0;
+}
+
+/*
+ * This function sets the RTC alarm based on passed in alrm.
+ */
+static int mxc_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+       int ret;
+
+       if (rtc_valid_tm(&alrm->time)) {
+               if (alrm->time.tm_sec > 59 ||
+                   alrm->time.tm_hour > 23 ||
+                   alrm->time.tm_min > 59)
+                       return -EINVAL;
+
+               ret = rtc_update_alarm(dev, &alrm->time);
+       } else {
+               ret = rtc_valid_tm(&alrm->time);
+               if (ret)
+                       return ret;
+
+               ret = rtc_update_alarm(dev, &alrm->time);
+       }
+
+       if (ret)
+               return ret;
+
+       memcpy(&pdata->g_rtc_alarm, &alrm->time, sizeof(struct rtc_time));
+       mxc_rtc_irq_enable(dev, RTC_ALM_BIT, alrm->enabled);
+
+       return 0;
+}
+
+/* RTC layer */
+static struct rtc_class_ops mxc_rtc_ops = {
+       .release                = mxc_rtc_release,
+       .read_time              = mxc_rtc_read_time,
+       .set_mmss               = mxc_rtc_set_mmss,
+       .read_alarm             = mxc_rtc_read_alarm,
+       .set_alarm              = mxc_rtc_set_alarm,
+       .alarm_irq_enable       = mxc_rtc_alarm_irq_enable,
+       .update_irq_enable      = mxc_rtc_update_irq_enable,
+};
+
+static int __init mxc_rtc_probe(struct platform_device *pdev)
+{
+       struct clk *clk;
+       struct resource *res;
+       struct rtc_device *rtc;
+       struct rtc_plat_data *pdata = NULL;
+       u32 reg;
+       int ret, rate;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENODEV;
+
+       pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return -ENOMEM;
+
+       pdata->ioaddr = ioremap(res->start, resource_size(res));
+
+       clk = clk_get(&pdev->dev, "ckil");
+       if (IS_ERR(clk))
+               return PTR_ERR(clk);
+
+       rate = clk_get_rate(clk);
+       clk_put(clk);
+
+       if (rate == 32768)
+               reg = RTC_INPUT_CLK_32768HZ;
+       else if (rate == 32000)
+               reg = RTC_INPUT_CLK_32000HZ;
+       else if (rate == 38400)
+               reg = RTC_INPUT_CLK_38400HZ;
+       else {
+               dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n",
+                       clk_get_rate(clk));
+               ret = -EINVAL;
+               goto exit_free_pdata;
+       }
+
+       reg |= RTC_ENABLE_BIT;
+       writew(reg, (pdata->ioaddr + RTC_RTCCTL));
+       if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
+               dev_err(&pdev->dev, "hardware module can't be enabled!\n");
+               ret = -EIO;
+               goto exit_free_pdata;
+       }
+
+       pdata->clk = clk_get(&pdev->dev, "rtc");
+       if (IS_ERR(pdata->clk)) {
+               dev_err(&pdev->dev, "unable to get clock!\n");
+               ret = PTR_ERR(pdata->clk);
+               goto exit_free_pdata;
+       }
+
+       clk_enable(pdata->clk);
+
+       rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops,
+                                 THIS_MODULE);
+       if (IS_ERR(rtc)) {
+               ret = PTR_ERR(rtc);
+               goto exit_put_clk;
+       }
+
+       pdata->rtc = rtc;
+       platform_set_drvdata(pdev, pdata);
+
+       /* Configure and enable the RTC */
+       pdata->irq = platform_get_irq(pdev, 0);
+
+       if (pdata->irq >= 0 &&
+           request_irq(pdata->irq, mxc_rtc_interrupt, IRQF_SHARED,
+                       pdev->name, pdev) < 0) {
+               dev_warn(&pdev->dev, "interrupt not available.\n");
+               pdata->irq = -1;
+       }
+
+       return 0;
+
+exit_put_clk:
+       clk_put(pdata->clk);
+
+exit_free_pdata:
+       kfree(pdata);
+
+       return ret;
+}
+
+static int __exit mxc_rtc_remove(struct platform_device *pdev)
+{
+       struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+
+       rtc_device_unregister(pdata->rtc);
+
+       if (pdata->irq >= 0)
+               free_irq(pdata->irq, pdev);
+
+       clk_disable(pdata->clk);
+       clk_put(pdata->clk);
+       kfree(pdata);
+       platform_set_drvdata(pdev, NULL);
+
+       return 0;
+}
+
+static struct platform_driver mxc_rtc_driver = {
+       .driver = {
+                  .name        = "mxc_rtc",
+                  .owner       = THIS_MODULE,
+       },
+       .remove         = __exit_p(mxc_rtc_remove),
+};
+
+static int __init mxc_rtc_init(void)
+{
+       return platform_driver_probe(&mxc_rtc_driver, mxc_rtc_probe);
+}
+
+static void __exit mxc_rtc_exit(void)
+{
+       platform_driver_unregister(&mxc_rtc_driver);
+}
+
+module_init(mxc_rtc_init);
+module_exit(mxc_rtc_exit);
+
+MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
+MODULE_DESCRIPTION("RTC driver for Freescale MXC");
+MODULE_LICENSE("GPL");
+
index bd1ce8e..0587d53 100644 (file)
@@ -430,7 +430,7 @@ fail:
 
 static int __exit omap_rtc_remove(struct platform_device *pdev)
 {
-       struct rtc_device       *rtc = platform_get_drvdata(pdev);;
+       struct rtc_device       *rtc = platform_get_drvdata(pdev);
 
        device_init_wakeup(&pdev->dev, 0);
 
diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c
new file mode 100644 (file)
index 0000000..a99c289
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ *  pcap rtc code for Motorola EZX phones
+ *
+ *  Copyright (c) 2008 guiming zhuo <gmzhuo@gmail.com>
+ *  Copyright (c) 2009 Daniel Ribeiro <drwyrm@gmail.com>
+ *
+ *  Based on Motorola's rtc.c Copyright (c) 2003-2005 Motorola
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mfd/ezx-pcap.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+struct pcap_rtc {
+       struct pcap_chip *pcap;
+       struct rtc_device *rtc;
+};
+
+static irqreturn_t pcap_rtc_irq(int irq, void *_pcap_rtc)
+{
+       struct pcap_rtc *pcap_rtc = _pcap_rtc;
+       unsigned long rtc_events;
+
+       if (irq == pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ))
+               rtc_events = RTC_IRQF | RTC_UF;
+       else if (irq == pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA))
+               rtc_events = RTC_IRQF | RTC_AF;
+       else
+               rtc_events = 0;
+
+       rtc_update_irq(pcap_rtc->rtc, 1, rtc_events);
+       return IRQ_HANDLED;
+}
+
+static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+       struct rtc_time *tm = &alrm->time;
+       unsigned long secs;
+       u32 tod;        /* time of day, seconds since midnight */
+       u32 days;       /* days since 1/1/1970 */
+
+       ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_TODA, &tod);
+       secs = tod & PCAP_RTC_TOD_MASK;
+
+       ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAYA, &days);
+       secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
+
+       rtc_time_to_tm(secs, tm);
+
+       return 0;
+}
+
+static int pcap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+       struct rtc_time *tm = &alrm->time;
+       unsigned long secs;
+       u32 tod, days;
+
+       rtc_tm_to_time(tm, &secs);
+
+       tod = secs % SEC_PER_DAY;
+       ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_TODA, tod);
+
+       days = secs / SEC_PER_DAY;
+       ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_DAYA, days);
+
+       return 0;
+}
+
+static int pcap_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+       unsigned long secs;
+       u32 tod, days;
+
+       ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_TOD, &tod);
+       secs = tod & PCAP_RTC_TOD_MASK;
+
+       ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAY, &days);
+       secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
+
+       rtc_time_to_tm(secs, tm);
+
+       return rtc_valid_tm(tm);
+}
+
+static int pcap_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+       u32 tod, days;
+
+       tod = secs % SEC_PER_DAY;
+       ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_TOD, tod);
+
+       days = secs / SEC_PER_DAY;
+       ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_DAY, days);
+
+       return 0;
+}
+
+static int pcap_rtc_irq_enable(struct device *dev, int pirq, unsigned int en)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+
+       if (en)
+               enable_irq(pcap_to_irq(pcap_rtc->pcap, pirq));
+       else
+               disable_irq(pcap_to_irq(pcap_rtc->pcap, pirq));
+
+       return 0;
+}
+
+static int pcap_rtc_alarm_irq_enable(struct device *dev, unsigned int en)
+{
+       return pcap_rtc_irq_enable(dev, PCAP_IRQ_TODA, en);
+}
+
+static int pcap_rtc_update_irq_enable(struct device *dev, unsigned int en)
+{
+       return pcap_rtc_irq_enable(dev, PCAP_IRQ_1HZ, en);
+}
+
+static const struct rtc_class_ops pcap_rtc_ops = {
+       .read_time = pcap_rtc_read_time,
+       .read_alarm = pcap_rtc_read_alarm,
+       .set_alarm = pcap_rtc_set_alarm,
+       .set_mmss = pcap_rtc_set_mmss,
+       .alarm_irq_enable = pcap_rtc_alarm_irq_enable,
+       .update_irq_enable = pcap_rtc_update_irq_enable,
+};
+
+static int __devinit pcap_rtc_probe(struct platform_device *pdev)
+{
+       struct pcap_rtc *pcap_rtc;
+       int timer_irq, alarm_irq;
+       int err = -ENOMEM;
+
+       pcap_rtc = kmalloc(sizeof(struct pcap_rtc), GFP_KERNEL);
+       if (!pcap_rtc)
+               return err;
+
+       pcap_rtc->pcap = dev_get_drvdata(pdev->dev.parent);
+
+       pcap_rtc->rtc = rtc_device_register("pcap", &pdev->dev,
+                                 &pcap_rtc_ops, THIS_MODULE);
+       if (IS_ERR(pcap_rtc->rtc)) {
+               err = PTR_ERR(pcap_rtc->rtc);
+               goto fail_rtc;
+       }
+
+       platform_set_drvdata(pdev, pcap_rtc);
+
+       timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);
+       alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
+
+       err = request_irq(timer_irq, pcap_rtc_irq, 0, "RTC Timer", pcap_rtc);
+       if (err)
+               goto fail_timer;
+
+       err = request_irq(alarm_irq, pcap_rtc_irq, 0, "RTC Alarm", pcap_rtc);
+       if (err)
+               goto fail_alarm;
+
+       return 0;
+fail_alarm:
+       free_irq(timer_irq, pcap_rtc);
+fail_timer:
+       rtc_device_unregister(pcap_rtc->rtc);
+fail_rtc:
+       kfree(pcap_rtc);
+       return err;
+}
+
+static int __devexit pcap_rtc_remove(struct platform_device *pdev)
+{
+       struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
+
+       free_irq(pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ), pcap_rtc);
+       free_irq(pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA), pcap_rtc);
+       rtc_device_unregister(pcap_rtc->rtc);
+       kfree(pcap_rtc);
+
+       return 0;
+}
+
+static struct platform_driver pcap_rtc_driver = {
+       .remove = __devexit_p(pcap_rtc_remove),
+       .driver = {
+               .name  = "pcap-rtc",
+               .owner = THIS_MODULE,
+       },
+};
+
+static int __init rtc_pcap_init(void)
+{
+       return platform_driver_probe(&pcap_rtc_driver, pcap_rtc_probe);
+}
+
+static void __exit rtc_pcap_exit(void)
+{
+       platform_driver_unregister(&pcap_rtc_driver);
+}
+
+module_init(rtc_pcap_init);
+module_exit(rtc_pcap_exit);
+
+MODULE_DESCRIPTION("Motorola pcap rtc driver");
+MODULE_AUTHOR("guiming zhuo <gmzhuo@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
new file mode 100644 (file)
index 0000000..e75df9d
--- /dev/null
@@ -0,0 +1,364 @@
+/*
+ * An SPI driver for the Philips PCF2123 RTC
+ * Copyright 2009 Cyber Switching, Inc.
+ *
+ * Author: Chris Verges <chrisv@cyberswitching.com>
+ * Maintainers: http://www.cyberswitching.com
+ *
+ * based on the RS5C348 driver in this same directory.
+ *
+ * Thanks to Christian Pellegrin <chripell@fsfe.org> for
+ * the sysfs contributions to this driver.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Please note that the CS is active high, so platform data
+ * should look something like:
+ *
+ * static struct spi_board_info ek_spi_devices[] = {
+ *     ...
+ *     {
+ *             .modalias               = "rtc-pcf2123",
+ *             .chip_select            = 1,
+ *             .controller_data        = (void *)AT91_PIN_PA10,
+ *             .max_speed_hz           = 1000 * 1000,
+ *             .mode                   = SPI_CS_HIGH,
+ *             .bus_num                = 0,
+ *     },
+ *     ...
+ *};
+ *
+ */
+
+#include <linux/bcd.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/rtc.h>
+#include <linux/spi/spi.h>
+
+#define DRV_VERSION "0.6"
+
+#define PCF2123_REG_CTRL1      (0x00)  /* Control Register 1 */
+#define PCF2123_REG_CTRL2      (0x01)  /* Control Register 2 */
+#define PCF2123_REG_SC         (0x02)  /* datetime */
+#define PCF2123_REG_MN         (0x03)
+#define PCF2123_REG_HR         (0x04)
+#define PCF2123_REG_DM         (0x05)
+#define PCF2123_REG_DW         (0x06)
+#define PCF2123_REG_MO         (0x07)
+#define PCF2123_REG_YR         (0x08)
+
+#define PCF2123_SUBADDR                (1 << 4)
+#define PCF2123_WRITE          ((0 << 7) | PCF2123_SUBADDR)
+#define PCF2123_READ           ((1 << 7) | PCF2123_SUBADDR)
+
+static struct spi_driver pcf2123_driver;
+
+struct pcf2123_sysfs_reg {
+       struct device_attribute attr;
+       char name[2];
+};
+
+struct pcf2123_plat_data {
+       struct rtc_device *rtc;
+       struct pcf2123_sysfs_reg regs[16];
+};
+
+/*
+ * Causes a 30 nanosecond delay to ensure that the PCF2123 chip select
+ * is released properly after an SPI write.  This function should be
+ * called after EVERY read/write call over SPI.
+ */
+static inline void pcf2123_delay_trec(void)
+{
+       ndelay(30);
+}
+
+static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
+                           char *buffer)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       struct pcf2123_sysfs_reg *r;
+       u8 txbuf[1], rxbuf[1];
+       unsigned long reg;
+       int ret;
+
+       r = container_of(attr, struct pcf2123_sysfs_reg, attr);
+
+       if (strict_strtoul(r->name, 16, &reg))
+               return -EINVAL;
+
+       txbuf[0] = PCF2123_READ | reg;
+       ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
+       if (ret < 0)
+               return -EIO;
+       pcf2123_delay_trec();
+       return sprintf(buffer, "0x%x\n", rxbuf[0]);
+}
+
+static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
+                            const char *buffer, size_t count) {
+       struct spi_device *spi = to_spi_device(dev);
+       struct pcf2123_sysfs_reg *r;
+       u8 txbuf[2];
+       unsigned long reg;
+       unsigned long val;
+
+       int ret;
+
+       r = container_of(attr, struct pcf2123_sysfs_reg, attr);
+
+       if (strict_strtoul(r->name, 16, &reg)
+               || strict_strtoul(buffer, 10, &val))
+               return -EINVAL;
+
+       txbuf[0] = PCF2123_WRITE | reg;
+       txbuf[1] = val;
+       ret = spi_write(spi, txbuf, sizeof(txbuf));
+       if (ret < 0)
+               return -EIO;
+       pcf2123_delay_trec();
+       return count;
+}
+
+static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       u8 txbuf[1], rxbuf[7];
+       int ret;
+
+       txbuf[0] = PCF2123_READ | PCF2123_REG_SC;
+       ret = spi_write_then_read(spi, txbuf, sizeof(txbuf),
+                       rxbuf, sizeof(rxbuf));
+       if (ret < 0)
+               return ret;
+       pcf2123_delay_trec();
+
+       tm->tm_sec = bcd2bin(rxbuf[0] & 0x7F);
+       tm->tm_min = bcd2bin(rxbuf[1] & 0x7F);
+       tm->tm_hour = bcd2bin(rxbuf[2] & 0x3F); /* rtc hr 0-23 */
+       tm->tm_mday = bcd2bin(rxbuf[3] & 0x3F);
+       tm->tm_wday = rxbuf[4] & 0x07;
+       tm->tm_mon = bcd2bin(rxbuf[5] & 0x1F) - 1; /* rtc mn 1-12 */
+       tm->tm_year = bcd2bin(rxbuf[6]);
+       if (tm->tm_year < 70)
+               tm->tm_year += 100;     /* assume we are in 1970...2069 */
+
+       dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                       "mday=%d, mon=%d, year=%d, wday=%d\n",
+                       __func__,
+                       tm->tm_sec, tm->tm_min, tm->tm_hour,
+                       tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+       /* the clock can give out invalid datetime, but we cannot return
+        * -EINVAL otherwise hwclock will refuse to set the time on bootup.
+        */
+       if (rtc_valid_tm(tm) < 0)
+               dev_err(dev, "retrieved date/time is not valid.\n");
+
+       return 0;
+}
+
+static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       u8 txbuf[8];
+       int ret;
+
+       dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                       "mday=%d, mon=%d, year=%d, wday=%d\n",
+                       __func__,
+                       tm->tm_sec, tm->tm_min, tm->tm_hour,
+                       tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+       /* Stop the counter first */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_CTRL1;
+       txbuf[1] = 0x20;
+       ret = spi_write(spi, txbuf, 2);
+       if (ret < 0)
+               return ret;
+       pcf2123_delay_trec();
+
+       /* Set the new time */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_SC;
+       txbuf[1] = bin2bcd(tm->tm_sec & 0x7F);
+       txbuf[2] = bin2bcd(tm->tm_min & 0x7F);
+       txbuf[3] = bin2bcd(tm->tm_hour & 0x3F);
+       txbuf[4] = bin2bcd(tm->tm_mday & 0x3F);
+       txbuf[5] = tm->tm_wday & 0x07;
+       txbuf[6] = bin2bcd((tm->tm_mon + 1) & 0x1F); /* rtc mn 1-12 */
+       txbuf[7] = bin2bcd(tm->tm_year < 100 ? tm->tm_year : tm->tm_year - 100);
+
+       ret = spi_write(spi, txbuf, sizeof(txbuf));
+       if (ret < 0)
+               return ret;
+       pcf2123_delay_trec();
+
+       /* Start the counter */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_CTRL1;
+       txbuf[1] = 0x00;
+       ret = spi_write(spi, txbuf, 2);
+       if (ret < 0)
+               return ret;
+       pcf2123_delay_trec();
+
+       return 0;
+}
+
+static const struct rtc_class_ops pcf2123_rtc_ops = {
+       .read_time      = pcf2123_rtc_read_time,
+       .set_time       = pcf2123_rtc_set_time,
+};
+
+static int __devinit pcf2123_probe(struct spi_device *spi)
+{
+       struct rtc_device *rtc;
+       struct pcf2123_plat_data *pdata;
+       u8 txbuf[2], rxbuf[2];
+       int ret, i;
+
+       pdata = kzalloc(sizeof(struct pcf2123_plat_data), GFP_KERNEL);
+       if (!pdata)
+               return -ENOMEM;
+       spi->dev.platform_data = pdata;
+
+       /* Send a software reset command */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_CTRL1;
+       txbuf[1] = 0x58;
+       dev_dbg(&spi->dev, "resetting RTC (0x%02X 0x%02X)\n",
+                       txbuf[0], txbuf[1]);
+       ret = spi_write(spi, txbuf, 2 * sizeof(u8));
+       if (ret < 0)
+               goto kfree_exit;
+       pcf2123_delay_trec();
+
+       /* Stop the counter */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_CTRL1;
+       txbuf[1] = 0x20;
+       dev_dbg(&spi->dev, "stopping RTC (0x%02X 0x%02X)\n",
+                       txbuf[0], txbuf[1]);
+       ret = spi_write(spi, txbuf, 2 * sizeof(u8));
+       if (ret < 0)
+               goto kfree_exit;
+       pcf2123_delay_trec();
+
+       /* See if the counter was actually stopped */
+       txbuf[0] = PCF2123_READ | PCF2123_REG_CTRL1;
+       dev_dbg(&spi->dev, "checking for presence of RTC (0x%02X)\n",
+                       txbuf[0]);
+       ret = spi_write_then_read(spi, txbuf, 1 * sizeof(u8),
+                                       rxbuf, 2 * sizeof(u8));
+       dev_dbg(&spi->dev, "received data from RTC (0x%02X 0x%02X)\n",
+                       rxbuf[0], rxbuf[1]);
+       if (ret < 0)
+               goto kfree_exit;
+       pcf2123_delay_trec();
+
+       if (!(rxbuf[0] & 0x20)) {
+               dev_err(&spi->dev, "chip not found\n");
+               goto kfree_exit;
+       }
+
+       dev_info(&spi->dev, "chip found, driver version " DRV_VERSION "\n");
+       dev_info(&spi->dev, "spiclk %u KHz.\n",
+                       (spi->max_speed_hz + 500) / 1000);
+
+       /* Start the counter */
+       txbuf[0] = PCF2123_WRITE | PCF2123_REG_CTRL1;
+       txbuf[1] = 0x00;
+       ret = spi_write(spi, txbuf, sizeof(txbuf));
+       if (ret < 0)
+               goto kfree_exit;
+       pcf2123_delay_trec();
+
+       /* Finalize the initialization */
+       rtc = rtc_device_register(pcf2123_driver.driver.name, &spi->dev,
+                       &pcf2123_rtc_ops, THIS_MODULE);
+
+       if (IS_ERR(rtc)) {
+               dev_err(&spi->dev, "failed to register.\n");
+               ret = PTR_ERR(rtc);
+               goto kfree_exit;
+       }
+
+       pdata->rtc = rtc;
+
+       for (i = 0; i < 16; i++) {
+               sprintf(pdata->regs[i].name, "%1x", i);
+               pdata->regs[i].attr.attr.mode = S_IRUGO | S_IWUSR;
+               pdata->regs[i].attr.attr.name = pdata->regs[i].name;
+               pdata->regs[i].attr.show = pcf2123_show;
+               pdata->regs[i].attr.store = pcf2123_store;
+               ret = device_create_file(&spi->dev, &pdata->regs[i].attr);
+               if (ret) {
+                       dev_err(&spi->dev, "Unable to create sysfs %s\n",
+                               pdata->regs[i].name);
+                       goto sysfs_exit;
+               }
+       }
+
+       return 0;
+
+sysfs_exit:
+       for (i--; i >= 0; i--)
+               device_remove_file(&spi->dev, &pdata->regs[i].attr);
+
+kfree_exit:
+       kfree(pdata);
+       spi->dev.platform_data = NULL;
+       return ret;
+}
+
+static int pcf2123_remove(struct spi_device *spi)
+{
+       struct pcf2123_plat_data *pdata = spi->dev.platform_data;
+       int i;
+
+       if (pdata) {
+               struct rtc_device *rtc = pdata->rtc;
+
+               if (rtc)
+                       rtc_device_unregister(rtc);
+               for (i = 0; i < 16; i++)
+                       if (pdata->regs[i].name[0])
+                               device_remove_file(&spi->dev,
+                                                  &pdata->regs[i].attr);
+               kfree(pdata);
+       }
+
+       return 0;
+}
+
+static struct spi_driver pcf2123_driver = {
+       .driver = {
+                       .name   = "rtc-pcf2123",
+                       .bus    = &spi_bus_type,
+                       .owner  = THIS_MODULE,
+       },
+       .probe  = pcf2123_probe,
+       .remove = __devexit_p(pcf2123_remove),
+};
+
+static int __init pcf2123_init(void)
+{
+       return spi_register_driver(&pcf2123_driver);
+}
+
+static void __exit pcf2123_exit(void)
+{
+       spi_unregister_driver(&pcf2123_driver);
+}
+
+MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>");
+MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(pcf2123_init);
+module_exit(pcf2123_exit);
index 42028f2..9beba49 100644 (file)
@@ -174,3 +174,4 @@ module_exit(r9701_exit);
 MODULE_DESCRIPTION("r9701 spi RTC driver");
 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:rtc-r9701");
index dd1e2bc..2099037 100644 (file)
@@ -251,3 +251,4 @@ MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("spi:rtc-rs5c348");
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
new file mode 100644 (file)
index 0000000..d7ce1a5
--- /dev/null
@@ -0,0 +1,304 @@
+/*
+ * Freescale STMP37XX/STMP378X Real Time Clock driver
+ *
+ * Copyright (c) 2007 Sigmatel, Inc.
+ * Peter Hartley, <peter.hartley@sigmatel.com>
+ *
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/rtc.h>
+
+#include <mach/platform.h>
+#include <mach/stmp3xxx.h>
+#include <mach/regs-rtc.h>
+
+struct stmp3xxx_rtc_data {
+       struct rtc_device *rtc;
+       unsigned irq_count;
+       void __iomem *io;
+       int irq_alarm, irq_1msec;
+};
+
+static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data)
+{
+       /*
+        * The datasheet doesn't say which way round the
+        * NEW_REGS/STALE_REGS bitfields go. In fact it's 0x1=P0,
+        * 0x2=P1, .., 0x20=P5, 0x40=ALARM, 0x80=SECONDS
+        */
+       while (__raw_readl(rtc_data->io + HW_RTC_STAT) &
+                       BF(0x80, RTC_STAT_STALE_REGS))
+               cpu_relax();
+}
+
+/* Time read/write */
+static int stmp3xxx_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+
+       stmp3xxx_wait_time(rtc_data);
+       rtc_time_to_tm(__raw_readl(rtc_data->io + HW_RTC_SECONDS), rtc_tm);
+       return 0;
+}
+
+static int stmp3xxx_rtc_set_mmss(struct device *dev, unsigned long t)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+
+       __raw_writel(t, rtc_data->io + HW_RTC_SECONDS);
+       stmp3xxx_wait_time(rtc_data);
+       return 0;
+}
+
+/* interrupt(s) handler */
+static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev_id);
+       u32 status;
+       u32 events = 0;
+
+       status = __raw_readl(rtc_data->io + HW_RTC_CTRL) &
+                       (BM_RTC_CTRL_ALARM_IRQ | BM_RTC_CTRL_ONEMSEC_IRQ);
+
+       if (status & BM_RTC_CTRL_ALARM_IRQ) {
+               stmp3xxx_clearl(BM_RTC_CTRL_ALARM_IRQ,
+                               rtc_data->io + HW_RTC_CTRL);
+               events |= RTC_AF | RTC_IRQF;
+       }
+
+       if (status & BM_RTC_CTRL_ONEMSEC_IRQ) {
+               stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ,
+                               rtc_data->io + HW_RTC_CTRL);
+               if (++rtc_data->irq_count % 1000 == 0) {
+                       events |= RTC_UF | RTC_IRQF;
+                       rtc_data->irq_count = 0;
+               }
+       }
+
+       if (events)
+               rtc_update_irq(rtc_data->rtc, 1, events);
+
+       return IRQ_HANDLED;
+}
+
+static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+       void __iomem *p = rtc_data->io + HW_RTC_PERSISTENT0,
+                    *ctl = rtc_data->io + HW_RTC_CTRL;
+
+       if (enabled) {
+               stmp3xxx_setl(BM_RTC_PERSISTENT0_ALARM_EN |
+                             BM_RTC_PERSISTENT0_ALARM_WAKE_EN, p);
+               stmp3xxx_setl(BM_RTC_CTRL_ALARM_IRQ_EN, ctl);
+       } else {
+               stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN |
+                             BM_RTC_PERSISTENT0_ALARM_WAKE_EN, p);
+               stmp3xxx_clearl(BM_RTC_CTRL_ALARM_IRQ_EN, ctl);
+       }
+       return 0;
+}
+
+static int stmp3xxx_update_irq_enable(struct device *dev, unsigned int enabled)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+
+       if (enabled)
+               stmp3xxx_setl(BM_RTC_CTRL_ONEMSEC_IRQ_EN,
+                               rtc_data->io + HW_RTC_CTRL);
+       else
+               stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN,
+                               rtc_data->io + HW_RTC_CTRL);
+       return 0;
+}
+
+static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+
+       rtc_time_to_tm(__raw_readl(rtc_data->io + HW_RTC_ALARM), &alm->time);
+       return 0;
+}
+
+static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+       unsigned long t;
+       struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
+
+       rtc_tm_to_time(&alm->time, &t);
+       __raw_writel(t, rtc_data->io + HW_RTC_ALARM);
+       return 0;
+}
+
+static struct rtc_class_ops stmp3xxx_rtc_ops = {
+       .alarm_irq_enable =
+                         stmp3xxx_alarm_irq_enable,
+       .update_irq_enable =
+                         stmp3xxx_update_irq_enable,
+       .read_time      = stmp3xxx_rtc_gettime,
+       .set_mmss       = stmp3xxx_rtc_set_mmss,
+       .read_alarm     = stmp3xxx_rtc_read_alarm,
+       .set_alarm      = stmp3xxx_rtc_set_alarm,
+};
+
+static int stmp3xxx_rtc_remove(struct platform_device *pdev)
+{
+       struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(pdev);
+
+       if (!rtc_data)
+               return 0;
+
+       stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN | BM_RTC_CTRL_ALARM_IRQ_EN,
+                       rtc_data->io + HW_RTC_CTRL);
+       free_irq(rtc_data->irq_alarm, &pdev->dev);
+       free_irq(rtc_data->irq_1msec, &pdev->dev);
+       rtc_device_unregister(rtc_data->rtc);
+       iounmap(rtc_data->io);
+       kfree(rtc_data);
+
+       return 0;
+}
+
+static int stmp3xxx_rtc_probe(struct platform_device *pdev)
+{
+       struct stmp3xxx_rtc_data *rtc_data;
+       struct resource *r;
+       int err;
+
+       rtc_data = kzalloc(sizeof *rtc_data, GFP_KERNEL);
+       if (!rtc_data)
+               return -ENOMEM;
+
+       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!r) {
+               dev_err(&pdev->dev, "failed to get resource\n");
+               err = -ENXIO;
+               goto out_free;
+       }
+
+       rtc_data->io = ioremap(r->start, resource_size(r));
+       if (!rtc_data->io) {
+               dev_err(&pdev->dev, "ioremap failed\n");
+               err = -EIO;
+               goto out_free;
+       }
+
+       rtc_data->irq_alarm = platform_get_irq(pdev, 0);
+       rtc_data->irq_1msec = platform_get_irq(pdev, 1);
+
+       if (!(__raw_readl(HW_RTC_STAT + rtc_data->io) &
+                       BM_RTC_STAT_RTC_PRESENT)) {
+               dev_err(&pdev->dev, "no device onboard\n");
+               err = -ENODEV;
+               goto out_remap;
+       }
+
+       stmp3xxx_reset_block(rtc_data->io, true);
+       stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN |
+                       BM_RTC_PERSISTENT0_ALARM_WAKE_EN |
+                       BM_RTC_PERSISTENT0_ALARM_WAKE,
+                       rtc_data->io + HW_RTC_PERSISTENT0);
+       rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                               &stmp3xxx_rtc_ops, THIS_MODULE);
+       if (IS_ERR(rtc_data->rtc)) {
+               err = PTR_ERR(rtc_data->rtc);
+               goto out_remap;
+       }
+
+       rtc_data->irq_count = 0;
+       err = request_irq(rtc_data->irq_alarm, stmp3xxx_rtc_interrupt,
+                       IRQF_DISABLED, "RTC alarm", &pdev->dev);
+       if (err) {
+               dev_err(&pdev->dev, "Cannot claim IRQ%d\n",
+                       rtc_data->irq_alarm);
+               goto out_irq_alarm;
+       }
+       err = request_irq(rtc_data->irq_1msec, stmp3xxx_rtc_interrupt,
+                       IRQF_DISABLED, "RTC tick", &pdev->dev);
+       if (err) {
+               dev_err(&pdev->dev, "Cannot claim IRQ%d\n",
+                       rtc_data->irq_1msec);
+               goto out_irq1;
+       }
+
+       platform_set_drvdata(pdev, rtc_data);
+
+       return 0;
+
+out_irq1:
+       free_irq(rtc_data->irq_alarm, &pdev->dev);
+out_irq_alarm:
+       stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN | BM_RTC_CTRL_ALARM_IRQ_EN,
+                       rtc_data->io + HW_RTC_CTRL);
+       rtc_device_unregister(rtc_data->rtc);
+out_remap:
+       iounmap(rtc_data->io);
+out_free:
+       kfree(rtc_data);
+       return err;
+}
+
+#ifdef CONFIG_PM
+static int stmp3xxx_rtc_suspend(struct platform_device *dev, pm_message_t state)
+{
+       return 0;
+}
+
+static int stmp3xxx_rtc_resume(struct platform_device *dev)
+{
+       struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev);
+
+       stmp3xxx_reset_block(rtc_data->io, true);
+       stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN |
+                       BM_RTC_PERSISTENT0_ALARM_WAKE_EN |
+                       BM_RTC_PERSISTENT0_ALARM_WAKE,
+                       rtc_data->io + HW_RTC_PERSISTENT0);
+       return 0;
+}
+#else
+#define stmp3xxx_rtc_suspend   NULL
+#define stmp3xxx_rtc_resume    NULL
+#endif
+
+static struct platform_driver stmp3xxx_rtcdrv = {
+       .probe          = stmp3xxx_rtc_probe,
+       .remove         = stmp3xxx_rtc_remove,
+       .suspend        = stmp3xxx_rtc_suspend,
+       .resume         = stmp3xxx_rtc_resume,
+       .driver         = {
+               .name   = "stmp3xxx-rtc",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init stmp3xxx_rtc_init(void)
+{
+       return platform_driver_register(&stmp3xxx_rtcdrv);
+}
+
+static void __exit stmp3xxx_rtc_exit(void)
+{
+       platform_driver_unregister(&stmp3xxx_rtcdrv);
+}
+
+module_init(stmp3xxx_rtc_init);
+module_exit(stmp3xxx_rtc_exit);
+
+MODULE_DESCRIPTION("STMP3xxx RTC Driver");
+MODULE_AUTHOR("dmitry pervushin <dpervushin@embeddedalley.com>");
+MODULE_LICENSE("GPL");
index 2531ce4..7dd23a6 100644 (file)
@@ -102,6 +102,19 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
        return n;
 }
 
+static ssize_t
+rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
+               char *buf)
+{
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
+       if (strcmp(dev_name(&to_rtc_device(dev)->dev),
+                  CONFIG_RTC_HCTOSYS_DEVICE) == 0)
+               return sprintf(buf, "1\n");
+       else
+#endif
+               return sprintf(buf, "0\n");
+}
+
 static struct device_attribute rtc_attrs[] = {
        __ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL),
        __ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL),
@@ -109,6 +122,7 @@ static struct device_attribute rtc_attrs[] = {
        __ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL),
        __ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq,
                        rtc_sysfs_set_max_user_freq),
+       __ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL),
        { },
 };
 
index e109da4..dad0449 100644 (file)
@@ -2146,7 +2146,7 @@ static int dasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-struct block_device_operations
+const struct block_device_operations
 dasd_device_operations = {
        .owner          = THIS_MODULE,
        .open           = dasd_open,
index a1ce573..bd9fe2e 100644 (file)
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device,
               sizeof(uid->serial) - 1);
        EBCASC(uid->serial, sizeof(uid->serial) - 1);
        uid->ssid = private->gneq->subsystemID;
-       uid->real_unit_addr = private->ned->unit_addr;;
+       uid->real_unit_addr = private->ned->unit_addr;
        if (private->sneq) {
                uid->type = private->sneq->sua_flags;
                if (uid->type == UA_BASE_PAV_ALIAS)
index 5e47a1e..8afd9fa 100644 (file)
@@ -540,7 +540,7 @@ dasd_check_blocksize(int bsize)
 extern debug_info_t *dasd_debug_area;
 extern struct dasd_profile_info_t dasd_global_profile;
 extern unsigned int dasd_profile_level;
-extern struct block_device_operations dasd_device_operations;
+extern const struct block_device_operations dasd_device_operations;
 
 extern struct kmem_cache *dasd_page_cache;
 
index d346176..f76f4bd 100644 (file)
@@ -34,7 +34,7 @@ static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
 static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0";
 
 static int dcssblk_major;
-static struct block_device_operations dcssblk_devops = {
+static const struct block_device_operations dcssblk_devops = {
        .owner          = THIS_MODULE,
        .open           = dcssblk_open,
        .release        = dcssblk_release,
index ee604e9..116d1b3 100644 (file)
@@ -244,7 +244,7 @@ static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        return 0;
 }
 
-static struct block_device_operations xpram_devops =
+static const struct block_device_operations xpram_devops =
 {
        .owner  = THIS_MODULE,
        .getgeo = xpram_getgeo,
index 4cb9e70..64f57ef 100644 (file)
@@ -50,7 +50,7 @@ static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int,
 static int tapeblock_medium_changed(struct gendisk *);
 static int tapeblock_revalidate_disk(struct gendisk *);
 
-static struct block_device_operations tapeblock_fops = {
+static const struct block_device_operations tapeblock_fops = {
        .owner           = THIS_MODULE,
        .open            = tapeblock_open,
        .release         = tapeblock_release,
index a4b2c57..c84eadd 100644 (file)
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,
        IUCV_DBF_TEXT(trace, 3, __func__);
 
         if (count >= IFNAMSIZ)
-                count = IFNAMSIZ - 1;;
+                count = IFNAMSIZ - 1;
 
        for (i = 0, p = buf; i < count && *p; i++, p++) {
                if (*p == '\n' || *p == ' ')
index 3ff726a..0e1a346 100644 (file)
@@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
        if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
                     !(status & ZFCP_STATUS_COMMON_RUNNING))) {
                zfcp_scsi_command_fail(scpnt, DID_ERROR);
-               return 0;;
+               return 0;
        }
 
        ret = zfcp_fsf_send_fcp_command_task(unit, scpnt);
index 6d46516..869a30b 100644 (file)
@@ -452,7 +452,7 @@ static const struct file_operations jsf_fops = {
 
 static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops };
 
-static struct block_device_operations jsfd_fops = {
+static const struct block_device_operations jsfd_fops = {
        .owner =        THIS_MODULE,
 };
 
index e6f2bb7..8dfb59d 100644 (file)
@@ -5223,7 +5223,7 @@ ahc_chip_init(struct ahc_softc *ahc)
 
        /*
         * Setup the allowed SCSI Sequences based on operational mode.
-        * If we are a target, we'll enalbe select in operations once
+        * If we are a target, we'll enable select in operations once
         * we've had a lun enabled.
         */
        scsiseq_template = ENSELO|ENAUTOATNO|ENAUTOATNP;
index 906cef5..41e1b0e 100644 (file)
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session,
        resp_hdr->opcode = login->op_code;
        resp_hdr->flags = login->response_flags;
        resp_hdr->max_version = login->version_max;
-       resp_hdr->active_version = login->version_active;;
+       resp_hdr->active_version = login->version_active;
        resp_hdr->hlength = 0;
 
        hton24(resp_hdr->dlength, login->data_length);
index 62a4c20..11ae5c9 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/ethtool.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
-#include <linux/netdevice.h>
 #include <linux/errno.h>
 #include <linux/bitops.h>
 #include <net/rtnetlink.h>
index 9928704..d9b0e9d 100644 (file)
@@ -73,7 +73,6 @@
 #include <linux/of.h>
 #include <asm/firmware.h>
 #include <asm/vio.h>
-#include <asm/firmware.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
index 9df7ed3..9a1bd95 100644 (file)
@@ -1207,7 +1207,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                vport->ct_flags &= ~FC_CT_RFF_ID;
                CtReq->CommandResponse.bits.CmdRsp =
                    be16_to_cpu(SLI_CTNS_RFF_ID);
-               CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);;
+               CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
                CtReq->un.rff.fbits = FC4_FEATURE_INIT;
                CtReq->un.rff.type_code = FC_FCP_DATA;
                cmpl = lpfc_cmpl_ct_cmd_rff_id;
index 7dc3d18..a39addc 100644 (file)
@@ -718,7 +718,7 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
  * megasas_build_ldio -        Prepares IOs to logical devices
  * @instance:          Adapter soft state
  * @scp:               SCSI command
- * @cmd:               Command to to be prepared
+ * @cmd:               Command to be prepared
  *
  * Frames (and accompanying SGLs) for regular SCSI IOs use this function.
  */
index 40e3caf..83c8b5e 100644 (file)
@@ -1422,7 +1422,7 @@ static void qla4xxx_slave_destroy(struct scsi_device *sdev)
 /**
  * qla4xxx_del_from_active_array - returns an active srb
  * @ha: Pointer to host adapter structure.
- * @index: index into to the active_array
+ * @index: index into the active_array
  *
  * This routine removes and returns the srb at the specified index
  **/
@@ -1500,7 +1500,7 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha)
 
 /**
  * qla4xxx_eh_wait_for_commands - wait for active cmds to finish.
- * @ha: pointer to to HBA
+ * @ha: pointer to HBA
  * @t: target id
  * @l: lun id
  *
index a89c421..8dd96dc 100644 (file)
@@ -956,7 +956,7 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
 }
 #endif
 
-static struct block_device_operations sd_fops = {
+static const struct block_device_operations sd_fops = {
        .owner                  = THIS_MODULE,
        .open                   = sd_open,
        .release                = sd_release,
index 4968c4c..848b594 100644 (file)
@@ -2233,7 +2233,7 @@ static struct file_operations dev_fops = {
        .open = sg_proc_open_dev,
        .release = seq_release,
 };
-static struct seq_operations dev_seq_ops = {
+static const struct seq_operations dev_seq_ops = {
        .start = dev_seq_start,
        .next  = dev_seq_next,
        .stop  = dev_seq_stop,
@@ -2246,7 +2246,7 @@ static struct file_operations devstrs_fops = {
        .open = sg_proc_open_devstrs,
        .release = seq_release,
 };
-static struct seq_operations devstrs_seq_ops = {
+static const struct seq_operations devstrs_seq_ops = {
        .start = dev_seq_start,
        .next  = dev_seq_next,
        .stop  = dev_seq_stop,
@@ -2259,7 +2259,7 @@ static struct file_operations debug_fops = {
        .open = sg_proc_open_debug,
        .release = seq_release,
 };
-static struct seq_operations debug_seq_ops = {
+static const struct seq_operations debug_seq_ops = {
        .start = dev_seq_start,
        .next  = dev_seq_next,
        .stop  = dev_seq_stop,
index cce0fe4..eb61f7a 100644 (file)
@@ -525,7 +525,7 @@ static int sr_block_media_changed(struct gendisk *disk)
        return cdrom_media_changed(&cd->cdi);
 }
 
-static struct block_device_operations sr_bdops =
+static const struct block_device_operations sr_bdops =
 {
        .owner          = THIS_MODULE,
        .open           = sr_block_open,
index cb6d85d..1e3d193 100644 (file)
@@ -86,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port)
 static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, flag, rxs, max_count = 256;
 
        status = *CSR_UARTFLG;
@@ -124,7 +124,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 static irqreturn_t serial21285_tx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        int count = 256;
 
        if (port->x_char) {
@@ -235,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
        quot = uart_get_divisor(port, baud);
 
-       if (port->info && port->info->port.tty) {
-               struct tty_struct *tty = port->info->port.tty;
+       if (port->state && port->state->port.tty) {
+               struct tty_struct *tty = port->state->port.tty;
                unsigned int b = port->uartclk / (16 * quot);
                tty_encode_baud_rate(tty, b, b);
        }
index fb867a9..2209620 100644 (file)
@@ -1382,7 +1382,7 @@ static void serial8250_enable_ms(struct uart_port *port)
 static void
 receive_chars(struct uart_8250_port *up, unsigned int *status)
 {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch, lsr = *status;
        int max_count = 256;
        char flag;
@@ -1457,7 +1457,7 @@ ignore_char:
 
 static void transmit_chars(struct uart_8250_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
 
        if (up->port.x_char) {
@@ -1500,7 +1500,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
        status |= up->msr_saved_flags;
        up->msr_saved_flags = 0;
        if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
-           up->port.info != NULL) {
+           up->port.state != NULL) {
                if (status & UART_MSR_TERI)
                        up->port.icount.rng++;
                if (status & UART_MSR_DDSR)
@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
                if (status & UART_MSR_DCTS)
                        uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
 
-               wake_up_interruptible(&up->port.info->delta_msr_wait);
+               wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
 
        return status;
@@ -1677,7 +1677,7 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
                INIT_LIST_HEAD(&up->list);
                i->head = &up->list;
                spin_unlock_irq(&i->lock);
-
+               irq_flags |= up->port.irqflags;
                ret = request_irq(up->port.irq, serial8250_interrupt,
                                  irq_flags, "serial", i);
                if (ret < 0)
@@ -1764,7 +1764,7 @@ static void serial8250_backup_timeout(unsigned long data)
        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
        spin_unlock_irqrestore(&up->port.lock, flags);
        if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
-           (!uart_circ_empty(&up->port.info->xmit) || up->port.x_char) &&
+           (!uart_circ_empty(&up->port.state->xmit) || up->port.x_char) &&
            (lsr & UART_LSR_THRE)) {
                iir &= ~(UART_IIR_ID | UART_IIR_NO_INT);
                iir |= UART_IIR_THRI;
@@ -2026,7 +2026,7 @@ static int serial8250_startup(struct uart_port *port)
                 * allow register changes to become visible.
                 */
                spin_lock_irqsave(&up->port.lock, flags);
-               if (up->port.flags & UPF_SHARE_IRQ)
+               if (up->port.irqflags & IRQF_SHARED)
                        disable_irq_nosync(up->port.irq);
 
                wait_for_xmitr(up, UART_LSR_THRE);
@@ -2039,7 +2039,7 @@ static int serial8250_startup(struct uart_port *port)
                iir = serial_in(up, UART_IIR);
                serial_out(up, UART_IER, 0);
 
-               if (up->port.flags & UPF_SHARE_IRQ)
+               if (up->port.irqflags & IRQF_SHARED)
                        enable_irq(up->port.irq);
                spin_unlock_irqrestore(&up->port.lock, flags);
 
@@ -2272,7 +2272,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
        /*
         * Ask the core to calculate the divisor for us.
         */
-       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+       baud = uart_get_baud_rate(port, termios, old,
+                                 port->uartclk / 16 / 0xffff,
+                                 port->uartclk / 16);
        quot = serial8250_get_divisor(port, baud);
 
        /*
@@ -2671,6 +2673,7 @@ static void __init serial8250_isa_init_ports(void)
             i++, up++) {
                up->port.iobase   = old_serial_port[i].port;
                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
+               up->port.irqflags = old_serial_port[i].irqflags;
                up->port.uartclk  = old_serial_port[i].baud_base * 16;
                up->port.flags    = old_serial_port[i].flags;
                up->port.hub6     = old_serial_port[i].hub6;
@@ -2679,7 +2682,7 @@ static void __init serial8250_isa_init_ports(void)
                up->port.regshift = old_serial_port[i].iomem_reg_shift;
                set_io_from_upio(&up->port);
                if (share_irqs)
-                       up->port.flags |= UPF_SHARE_IRQ;
+                       up->port.irqflags |= IRQF_SHARED;
        }
 }
 
@@ -2869,6 +2872,7 @@ int __init early_serial_setup(struct uart_port *port)
        p->iobase       = port->iobase;
        p->membase      = port->membase;
        p->irq          = port->irq;
+       p->irqflags     = port->irqflags;
        p->uartclk      = port->uartclk;
        p->fifosize     = port->fifosize;
        p->regshift     = port->regshift;
@@ -2942,6 +2946,7 @@ static int __devinit serial8250_probe(struct platform_device *dev)
                port.iobase             = p->iobase;
                port.membase            = p->membase;
                port.irq                = p->irq;
+               port.irqflags           = p->irqflags;
                port.uartclk            = p->uartclk;
                port.regshift           = p->regshift;
                port.iotype             = p->iotype;
@@ -2954,7 +2959,7 @@ static int __devinit serial8250_probe(struct platform_device *dev)
                port.serial_out         = p->serial_out;
                port.dev                = &dev->dev;
                if (share_irqs)
-                       port.flags |= UPF_SHARE_IRQ;
+                       port.irqflags |= IRQF_SHARED;
                ret = serial8250_register_port(&port);
                if (ret < 0) {
                        dev_err(&dev->dev, "unable to register port at index %d "
@@ -3096,6 +3101,7 @@ int serial8250_register_port(struct uart_port *port)
                uart->port.iobase       = port->iobase;
                uart->port.membase      = port->membase;
                uart->port.irq          = port->irq;
+               uart->port.irqflags     = port->irqflags;
                uart->port.uartclk      = port->uartclk;
                uart->port.fifosize     = port->fifosize;
                uart->port.regshift     = port->regshift;
index 5202603..6e19ea3 100644 (file)
@@ -25,6 +25,7 @@ struct old_serial_port {
        unsigned char io_type;
        unsigned char *iomem_base;
        unsigned short iomem_reg_shift;
+       unsigned long irqflags;
 };
 
 /*
index 58a4879..429a8ae 100644 (file)
@@ -117,7 +117,7 @@ static void pl010_enable_ms(struct uart_port *port)
 
 static void pl010_rx_chars(struct uart_amba_port *uap)
 {
-       struct tty_struct *tty = uap->port.info->port.tty;
+       struct tty_struct *tty = uap->port.state->port.tty;
        unsigned int status, ch, flag, rsr, max_count = 256;
 
        status = readb(uap->port.membase + UART01x_FR);
@@ -172,7 +172,7 @@ static void pl010_rx_chars(struct uart_amba_port *uap)
 
 static void pl010_tx_chars(struct uart_amba_port *uap)
 {
-       struct circ_buf *xmit = &uap->port.info->xmit;
+       struct circ_buf *xmit = &uap->port.state->xmit;
        int count;
 
        if (uap->port.x_char) {
@@ -225,7 +225,7 @@ static void pl010_modem_status(struct uart_amba_port *uap)
        if (delta & UART01x_FR_CTS)
                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
 
-       wake_up_interruptible(&uap->port.info->delta_msr_wait);
+       wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
 }
 
 static irqreturn_t pl010_int(int irq, void *dev_id)
index 72ba0c6..ef7adc8 100644 (file)
@@ -124,7 +124,7 @@ static void pl011_enable_ms(struct uart_port *port)
 
 static void pl011_rx_chars(struct uart_amba_port *uap)
 {
-       struct tty_struct *tty = uap->port.info->port.tty;
+       struct tty_struct *tty = uap->port.state->port.tty;
        unsigned int status, ch, flag, max_count = 256;
 
        status = readw(uap->port.membase + UART01x_FR);
@@ -175,7 +175,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
 
 static void pl011_tx_chars(struct uart_amba_port *uap)
 {
-       struct circ_buf *xmit = &uap->port.info->xmit;
+       struct circ_buf *xmit = &uap->port.state->xmit;
        int count;
 
        if (uap->port.x_char) {
@@ -226,7 +226,7 @@ static void pl011_modem_status(struct uart_amba_port *uap)
        if (delta & UART01x_FR_CTS)
                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
 
-       wake_up_interruptible(&uap->port.info->delta_msr_wait);
+       wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
 }
 
 static irqreturn_t pl011_int(int irq, void *dev_id)
index 607d43a..3551c5c 100644 (file)
@@ -427,7 +427,7 @@ static void atmel_rx_chars(struct uart_port *port)
  */
 static void atmel_tx_chars(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if (port->x_char && UART_GET_CSR(port) & ATMEL_US_TXRDY) {
                UART_PUT_CHAR(port, port->x_char);
@@ -560,7 +560,7 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
 static void atmel_tx_dma(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
        int count;
 
@@ -663,14 +663,14 @@ static void atmel_rx_from_ring(struct uart_port *port)
         * uart_start(), which takes the lock.
         */
        spin_unlock(&port->lock);
-       tty_flip_buffer_push(port->info->port.tty);
+       tty_flip_buffer_push(port->state->port.tty);
        spin_lock(&port->lock);
 }
 
 static void atmel_rx_from_dma(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        struct atmel_dma_buffer *pdc;
        int rx_idx = atmel_port->pdc_rx_idx;
        unsigned int head;
@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned long data)
                if (status_change & ATMEL_US_CTS)
                        uart_handle_cts_change(port, !(status & ATMEL_US_CTS));
 
-               wake_up_interruptible(&port->info->delta_msr_wait);
+               wake_up_interruptible(&port->state->port.delta_msr_wait);
 
                atmel_port->irq_status_prev = status;
        }
@@ -795,7 +795,7 @@ static void atmel_tasklet_func(unsigned long data)
 static int atmel_startup(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        int retval;
 
        /*
@@ -854,7 +854,7 @@ static int atmel_startup(struct uart_port *port)
        }
        if (atmel_use_dma_tx(port)) {
                struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-               struct circ_buf *xmit = &port->info->xmit;
+               struct circ_buf *xmit = &port->state->xmit;
 
                pdc->buf = xmit->buf;
                pdc->dma_addr = dma_map_single(port->dev,
index b4a7650..50abb7e 100644 (file)
 # undef CONFIG_EARLY_PRINTK
 #endif
 
+#ifdef CONFIG_SERIAL_BFIN_MODULE
+# undef CONFIG_EARLY_PRINTK
+#endif
+
 /* UART name and device definitions */
 #define BFIN_SERIAL_NAME       "ttyBF"
 #define BFIN_SERIAL_MAJOR      204
@@ -140,7 +144,7 @@ static void bfin_serial_stop_tx(struct uart_port *port)
 {
        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
 #ifdef CONFIG_SERIAL_BFIN_DMA
-       struct circ_buf *xmit = &uart->port.info->xmit;
+       struct circ_buf *xmit = &uart->port.state->xmit;
 #endif
 
        while (!(UART_GET_LSR(uart) & TEMT))
@@ -167,7 +171,7 @@ static void bfin_serial_stop_tx(struct uart_port *port)
 static void bfin_serial_start_tx(struct uart_port *port)
 {
        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-       struct tty_struct *tty = uart->port.info->port.tty;
+       struct tty_struct *tty = uart->port.state->port.tty;
 
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port) & TIOCM_CTS)) {
@@ -239,10 +243,10 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
                        return;
                }
 
-       if (!uart->port.info || !uart->port.info->port.tty)
+       if (!uart->port.state || !uart->port.state->port.tty)
                return;
 #endif
-       tty = uart->port.info->port.tty;
+       tty = uart->port.state->port.tty;
 
        if (ANOMALY_05000363) {
                /* The BF533 (and BF561) family of processors have a nice anomaly
@@ -327,7 +331,7 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 
 static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
 {
-       struct circ_buf *xmit = &uart->port.info->xmit;
+       struct circ_buf *xmit = &uart->port.state->xmit;
 
        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
 #ifdef CONFIG_BF54x
@@ -394,7 +398,7 @@ static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
 #ifdef CONFIG_SERIAL_BFIN_DMA
 static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 {
-       struct circ_buf *xmit = &uart->port.info->xmit;
+       struct circ_buf *xmit = &uart->port.state->xmit;
 
        uart->tx_done = 0;
 
@@ -432,7 +436,7 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 
 static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 {
-       struct tty_struct *tty = uart->port.info->port.tty;
+       struct tty_struct *tty = uart->port.state->port.tty;
        int i, flg, status;
 
        status = UART_GET_LSR(uart);
@@ -525,7 +529,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
 static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
 {
        struct bfin_serial_port *uart = dev_id;
-       struct circ_buf *xmit = &uart->port.info->xmit;
+       struct circ_buf *xmit = &uart->port.state->xmit;
 
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port)&TIOCM_CTS)) {
@@ -961,10 +965,10 @@ static void bfin_serial_set_ldisc(struct uart_port *port)
        int line = port->line;
        unsigned short val;
 
-       if (line >= port->info->port.tty->driver->num)
+       if (line >= port->state->port.tty->driver->num)
                return;
 
-       switch (port->info->port.tty->termios->c_line) {
+       switch (port->state->port.tty->termios->c_line) {
        case N_IRDA:
                val = UART_GET_GCTL(&bfin_serial_ports[line]);
                val |= (IREN | RPOLC);
index c108b1a..088bb35 100644 (file)
@@ -178,7 +178,7 @@ static int sport_uart_setup(struct sport_uart_port *up, int sclk, int baud_rate)
 static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id)
 {
        struct sport_uart_port *up = dev_id;
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch;
 
        do {
@@ -205,7 +205,7 @@ static irqreturn_t sport_uart_tx_irq(int irq, void *dev_id)
 static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
 {
        struct sport_uart_port *up = dev_id;
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned int stat = SPORT_GET_STAT(up);
 
        /* Overflow in RX FIFO */
@@ -290,7 +290,7 @@ fail1:
 
 static void sport_uart_tx_chars(struct sport_uart_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
 
        if (SPORT_GET_STAT(up) & TXF)
                return;
index 80e7642..b6acd19 100644 (file)
@@ -93,7 +93,7 @@ static void clps711xuart_enable_ms(struct uart_port *port)
 static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, flg;
 
        status = clps_readl(SYSFLG(port));
@@ -147,7 +147,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        int count;
 
        if (port->x_char) {
index f8df068..8d349b2 100644 (file)
@@ -244,7 +244,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
        int i;
        unsigned char ch;
        u8 *cp;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
        cbd_t __iomem *bdp;
        u16 status;
index 6042b87..57421d7 100644 (file)
@@ -197,7 +197,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
        while ((status = dz_in(dport, DZ_RBUF)) & DZ_DVAL) {
                dport = &mux->dport[LINE(status)];
                uport = &dport->port;
-               tty = uport->info->port.tty;    /* point to the proper dev */
+               tty = uport->state->port.tty;   /* point to the proper dev */
 
                ch = UCHAR(status);             /* grab the char */
                flag = TTY_NORMAL;
@@ -249,7 +249,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
        }
        for (i = 0; i < DZ_NB_PORT; i++)
                if (lines_rx[i])
-                       tty_flip_buffer_push(mux->dport[i].port.info->port.tty);
+                       tty_flip_buffer_push(mux->dport[i].port.state->port.tty);
 }
 
 /*
@@ -268,7 +268,7 @@ static inline void dz_transmit_chars(struct dz_mux *mux)
 
        status = dz_in(dport, DZ_CSR);
        dport = &mux->dport[LINE(status)];
-       xmit = &dport->port.info->xmit;
+       xmit = &dport->port.state->xmit;
 
        if (dport->port.x_char) {               /* XON/XOFF chars */
                dz_out(dport, DZ_TDR, dport->port.x_char);
index cd1b6a4..2d7feec 100644 (file)
@@ -617,7 +617,7 @@ static void shutdown(struct icom_port *icom_port)
         * disable break condition
         */
        cmdReg = readb(&icom_port->dram->CmdReg);
-       if ((cmdReg | CMD_SND_BREAK) == CMD_SND_BREAK) {
+       if (cmdReg & CMD_SND_BREAK) {
                writeb(cmdReg & ~CMD_SND_BREAK, &icom_port->dram->CmdReg);
        }
 }
@@ -627,7 +627,7 @@ static int icom_write(struct uart_port *port)
        unsigned long data_count;
        unsigned char cmdReg;
        unsigned long offset;
-       int temp_tail = port->info->xmit.tail;
+       int temp_tail = port->state->xmit.tail;
 
        trace(ICOM_PORT, "WRITE", 0);
 
@@ -638,11 +638,11 @@ static int icom_write(struct uart_port *port)
        }
 
        data_count = 0;
-       while ((port->info->xmit.head != temp_tail) &&
+       while ((port->state->xmit.head != temp_tail) &&
               (data_count <= XMIT_BUFF_SZ)) {
 
                ICOM_PORT->xmit_buf[data_count++] =
-                   port->info->xmit.buf[temp_tail];
+                   port->state->xmit.buf[temp_tail];
 
                temp_tail++;
                temp_tail &= (UART_XMIT_SIZE - 1);
@@ -694,8 +694,8 @@ static inline void check_modem_status(struct icom_port *icom_port)
                        uart_handle_cts_change(&icom_port->uart_port,
                                               delta_status & ICOM_CTS);
 
-               wake_up_interruptible(&icom_port->uart_port.info->
-                                     delta_msr_wait);
+               wake_up_interruptible(&icom_port->uart_port.state->
+                                     port.delta_msr_wait);
                old_status = status;
        }
        spin_unlock(&icom_port->uart_port.lock);
@@ -718,10 +718,10 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
                icom_port->uart_port.icount.tx += count;
 
                for (i=0; i<count &&
-                       !uart_circ_empty(&icom_port->uart_port.info->xmit); i++) {
+                       !uart_circ_empty(&icom_port->uart_port.state->xmit); i++) {
 
-                       icom_port->uart_port.info->xmit.tail++;
-                       icom_port->uart_port.info->xmit.tail &=
+                       icom_port->uart_port.state->xmit.tail++;
+                       icom_port->uart_port.state->xmit.tail &=
                                (UART_XMIT_SIZE - 1);
                }
 
@@ -735,7 +735,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 {
        short int count, rcv_buff;
-       struct tty_struct *tty = icom_port->uart_port.info->port.tty;
+       struct tty_struct *tty = icom_port->uart_port.state->port.tty;
        unsigned short int status;
        struct uart_icount *icount;
        unsigned long offset;
index 7485afd..18130f1 100644 (file)
@@ -224,7 +224,7 @@ static void imx_mctrl_check(struct imx_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
 
-       wake_up_interruptible(&sport->port.info->delta_msr_wait);
+       wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 
 /*
@@ -236,7 +236,7 @@ static void imx_timeout(unsigned long data)
        struct imx_port *sport = (struct imx_port *)data;
        unsigned long flags;
 
-       if (sport->port.info) {
+       if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                imx_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -323,7 +323,7 @@ static void imx_enable_ms(struct uart_port *port)
 
 static inline void imx_transmit_buffer(struct imx_port *sport)
 {
-       struct circ_buf *xmit = &sport->port.info->xmit;
+       struct circ_buf *xmit = &sport->port.state->xmit;
 
        while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
                /* send xmit->buf[xmit->tail]
@@ -388,7 +388,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
 
        writel(USR1_RTSD, sport->port.membase + USR1);
        uart_handle_cts_change(&sport->port, !!val);
-       wake_up_interruptible(&sport->port.info->delta_msr_wait);
+       wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 
        spin_unlock_irqrestore(&sport->port.lock, flags);
        return IRQ_HANDLED;
@@ -397,7 +397,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
 static irqreturn_t imx_txint(int irq, void *dev_id)
 {
        struct imx_port *sport = dev_id;
-       struct circ_buf *xmit = &sport->port.info->xmit;
+       struct circ_buf *xmit = &sport->port.state->xmit;
        unsigned long flags;
 
        spin_lock_irqsave(&sport->port.lock,flags);
@@ -427,7 +427,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 {
        struct imx_port *sport = dev_id;
        unsigned int rx,flg,ignored = 0;
-       struct tty_struct *tty = sport->port.info->port.tty;
+       struct tty_struct *tty = sport->port.state->port.tty;
        unsigned long flags, temp;
 
        spin_lock_irqsave(&sport->port.lock,flags);
@@ -900,11 +900,11 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
        rational_best_approximation(16 * div * baud, sport->port.uartclk,
                1 << 16, 1 << 16, &num, &denom);
 
-       if (port->info && port->info->port.tty) {
+       if (port->state && port->state->port.tty) {
                tdiv64 = sport->port.uartclk;
                tdiv64 *= num;
                do_div(tdiv64, denom * 16 * div);
-               tty_encode_baud_rate(sport->port.info->port.tty,
+               tty_encode_baud_rate(sport->port.state->port.tty,
                                (speed_t)tdiv64, (speed_t)tdiv64);
        }
 
index ae3699d..d8983dd 100644 (file)
@@ -897,25 +897,25 @@ static void transmit_chars(struct uart_port *the_port)
        char *start;
        struct tty_struct *tty;
        struct ioc3_port *port = get_ioc3_port(the_port);
-       struct uart_info *info;
+       struct uart_state *state;
 
        if (!the_port)
                return;
        if (!port)
                return;
 
-       info = the_port->info;
-       tty = info->port.tty;
+       state = the_port->state;
+       tty = state->port.tty;
 
-       if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
+       if (uart_circ_empty(&state->xmit) || uart_tx_stopped(the_port)) {
                /* Nothing to do or hw stopped */
                set_notification(port, N_ALL_OUTPUT, 0);
                return;
        }
 
-       head = info->xmit.head;
-       tail = info->xmit.tail;
-       start = (char *)&info->xmit.buf[tail];
+       head = state->xmit.head;
+       tail = state->xmit.tail;
+       start = (char *)&state->xmit.buf[tail];
 
        /* write out all the data or until the end of the buffer */
        xmit_count = (head < tail) ? (UART_XMIT_SIZE - tail) : (head - tail);
@@ -928,14 +928,14 @@ static void transmit_chars(struct uart_port *the_port)
                        /* advance the pointers */
                        tail += result;
                        tail &= UART_XMIT_SIZE - 1;
-                       info->xmit.tail = tail;
-                       start = (char *)&info->xmit.buf[tail];
+                       state->xmit.tail = tail;
+                       start = (char *)&state->xmit.buf[tail];
                }
        }
-       if (uart_circ_chars_pending(&info->xmit) < WAKEUP_CHARS)
+       if (uart_circ_chars_pending(&state->xmit) < WAKEUP_CHARS)
                uart_write_wakeup(the_port);
 
-       if (uart_circ_empty(&info->xmit)) {
+       if (uart_circ_empty(&state->xmit)) {
                set_notification(port, N_OUTPUT_LOWAT, 0);
        } else {
                set_notification(port, N_OUTPUT_LOWAT, 1);
@@ -956,7 +956,7 @@ ioc3_change_speed(struct uart_port *the_port,
        unsigned int cflag;
        int baud;
        int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
-       struct uart_info *info = the_port->info;
+       struct uart_state *state = the_port->state;
 
        cflag = new_termios->c_cflag;
 
@@ -997,14 +997,14 @@ ioc3_change_speed(struct uart_port *the_port,
 
        the_port->ignore_status_mask = N_ALL_INPUT;
 
-       info->port.tty->low_latency = 1;
+       state->port.tty->low_latency = 1;
 
-       if (I_IGNPAR(info->port.tty))
+       if (I_IGNPAR(state->port.tty))
                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                  | N_FRAMING_ERROR);
-       if (I_IGNBRK(info->port.tty)) {
+       if (I_IGNBRK(state->port.tty)) {
                the_port->ignore_status_mask &= ~N_BREAK;
-               if (I_IGNPAR(info->port.tty))
+               if (I_IGNPAR(state->port.tty))
                        the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
        }
        if (!(cflag & CREAD)) {
@@ -1286,8 +1286,8 @@ static inline int do_read(struct uart_port *the_port, char *buf, int len)
                                                uart_handle_dcd_change
                                                        (port->ip_port, 0);
                                                wake_up_interruptible
-                                                   (&the_port->info->
-                                                    delta_msr_wait);
+                                                   (&the_port->state->
+                                                    port.delta_msr_wait);
                                        }
 
                                        /* If we had any data to return, we
@@ -1392,21 +1392,21 @@ static int receive_chars(struct uart_port *the_port)
        struct tty_struct *tty;
        unsigned char ch[MAX_CHARS];
        int read_count = 0, read_room, flip = 0;
-       struct uart_info *info = the_port->info;
+       struct uart_state *state = the_port->state;
        struct ioc3_port *port = get_ioc3_port(the_port);
        unsigned long pflags;
 
        /* Make sure all the pointers are "good" ones */
-       if (!info)
+       if (!state)
                return 0;
-       if (!info->port.tty)
+       if (!state->port.tty)
                return 0;
 
        if (!(port->ip_flags & INPUT_ENABLE))
                return 0;
 
        spin_lock_irqsave(&the_port->lock, pflags);
-       tty = info->port.tty;
+       tty = state->port.tty;
 
        read_count = do_read(the_port, ch, MAX_CHARS);
        if (read_count > 0) {
@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
                                uart_handle_dcd_change(the_port,
                                                shadow & SHADOW_DCD);
                                wake_up_interruptible
-                                   (&the_port->info->delta_msr_wait);
+                                   (&the_port->state->port.delta_msr_wait);
                        } else if ((port->ip_notify & N_DDCD)
                                   && !(shadow & SHADOW_DCD)) {
                                /* Flag delta DCD/no DCD */
@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
                                uart_handle_cts_change(the_port, shadow
                                                & SHADOW_CTS);
                                wake_up_interruptible
-                                   (&the_port->info->delta_msr_wait);
+                                   (&the_port->state->port.delta_msr_wait);
                        }
                }
 
@@ -1721,14 +1721,14 @@ static void ic3_shutdown(struct uart_port *the_port)
 {
        unsigned long port_flags;
        struct ioc3_port *port;
-       struct uart_info *info;
+       struct uart_state *state;
 
        port = get_ioc3_port(the_port);
        if (!port)
                return;
 
-       info = the_port->info;
-       wake_up_interruptible(&info->delta_msr_wait);
+       state = the_port->state;
+       wake_up_interruptible(&state->port.delta_msr_wait);
 
        spin_lock_irqsave(&the_port->lock, port_flags);
        set_notification(port, N_ALL, 0);
index e5c58fe..2e02c30 100644 (file)
@@ -1627,25 +1627,25 @@ static void transmit_chars(struct uart_port *the_port)
        char *start;
        struct tty_struct *tty;
        struct ioc4_port *port = get_ioc4_port(the_port, 0);
-       struct uart_info *info;
+       struct uart_state *state;
 
        if (!the_port)
                return;
        if (!port)
                return;
 
-       info = the_port->info;
-       tty = info->port.tty;
+       state = the_port->state;
+       tty = state->port.tty;
 
-       if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
+       if (uart_circ_empty(&state->xmit) || uart_tx_stopped(the_port)) {
                /* Nothing to do or hw stopped */
                set_notification(port, N_ALL_OUTPUT, 0);
                return;
        }
 
-       head = info->xmit.head;
-       tail = info->xmit.tail;
-       start = (char *)&info->xmit.buf[tail];
+       head = state->xmit.head;
+       tail = state->xmit.tail;
+       start = (char *)&state->xmit.buf[tail];
 
        /* write out all the data or until the end of the buffer */
        xmit_count = (head < tail) ? (UART_XMIT_SIZE - tail) : (head - tail);
@@ -1658,14 +1658,14 @@ static void transmit_chars(struct uart_port *the_port)
                        /* advance the pointers */
                        tail += result;
                        tail &= UART_XMIT_SIZE - 1;
-                       info->xmit.tail = tail;
-                       start = (char *)&info->xmit.buf[tail];
+                       state->xmit.tail = tail;
+                       start = (char *)&state->xmit.buf[tail];
                }
        }
-       if (uart_circ_chars_pending(&info->xmit) < WAKEUP_CHARS)
+       if (uart_circ_chars_pending(&state->xmit) < WAKEUP_CHARS)
                uart_write_wakeup(the_port);
 
-       if (uart_circ_empty(&info->xmit)) {
+       if (uart_circ_empty(&state->xmit)) {
                set_notification(port, N_OUTPUT_LOWAT, 0);
        } else {
                set_notification(port, N_OUTPUT_LOWAT, 1);
@@ -1686,7 +1686,7 @@ ioc4_change_speed(struct uart_port *the_port,
        int baud, bits;
        unsigned cflag;
        int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
-       struct uart_info *info = the_port->info;
+       struct uart_state *state = the_port->state;
 
        cflag = new_termios->c_cflag;
 
@@ -1738,14 +1738,14 @@ ioc4_change_speed(struct uart_port *the_port,
 
        the_port->ignore_status_mask = N_ALL_INPUT;
 
-       info->port.tty->low_latency = 1;
+       state->port.tty->low_latency = 1;
 
-       if (I_IGNPAR(info->port.tty))
+       if (I_IGNPAR(state->port.tty))
                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                | N_FRAMING_ERROR);
-       if (I_IGNBRK(info->port.tty)) {
+       if (I_IGNBRK(state->port.tty)) {
                the_port->ignore_status_mask &= ~N_BREAK;
-               if (I_IGNPAR(info->port.tty))
+               if (I_IGNPAR(state->port.tty))
                        the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
        }
        if (!(cflag & CREAD)) {
@@ -1784,7 +1784,7 @@ ioc4_change_speed(struct uart_port *the_port,
 static inline int ic4_startup_local(struct uart_port *the_port)
 {
        struct ioc4_port *port;
-       struct uart_info *info;
+       struct uart_state *state;
 
        if (!the_port)
                return -1;
@@ -1793,7 +1793,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        if (!port)
                return -1;
 
-       info = the_port->info;
+       state = the_port->state;
 
        local_open(port);
 
@@ -1801,7 +1801,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        ioc4_set_proto(port, the_port->mapbase);
 
        /* set the speed of the serial port */
-       ioc4_change_speed(the_port, info->port.tty->termios,
+       ioc4_change_speed(the_port, state->port.tty->termios,
                          (struct ktermios *)0);
 
        return 0;
@@ -1882,7 +1882,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                                the_port = port->ip_port;
                                the_port->icount.dcd = 1;
                                wake_up_interruptible
-                                           (&the_port-> info->delta_msr_wait);
+                                           (&the_port->state->port.delta_msr_wait);
                        } else if ((port->ip_notify & N_DDCD)
                                        && !(shadow & IOC4_SHADOW_DCD)) {
                                /* Flag delta DCD/no DCD */
@@ -1904,7 +1904,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                                the_port->icount.cts =
                                        (shadow & IOC4_SHADOW_CTS) ? 1 : 0;
                                wake_up_interruptible
-                                       (&the_port->info->delta_msr_wait);
+                                       (&the_port->state->port.delta_msr_wait);
                        }
                }
 
@@ -2236,8 +2236,8 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
                                                   && port->ip_port) {
                                                the_port->icount.dcd = 0;
                                                wake_up_interruptible
-                                                   (&the_port->info->
-                                                       delta_msr_wait);
+                                                   (&the_port->state->
+                                                       port.delta_msr_wait);
                                        }
 
                                        /* If we had any data to return, we
@@ -2341,17 +2341,17 @@ static void receive_chars(struct uart_port *the_port)
        unsigned char ch[IOC4_MAX_CHARS];
        int read_count, request_count = IOC4_MAX_CHARS;
        struct uart_icount *icount;
-       struct uart_info *info = the_port->info;
+       struct uart_state *state = the_port->state;
        unsigned long pflags;
 
        /* Make sure all the pointers are "good" ones */
-       if (!info)
+       if (!state)
                return;
-       if (!info->port.tty)
+       if (!state->port.tty)
                return;
 
        spin_lock_irqsave(&the_port->lock, pflags);
-       tty = info->port.tty;
+       tty = state->port.tty;
 
        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS);
 
@@ -2430,19 +2430,19 @@ static void ic4_shutdown(struct uart_port *the_port)
 {
        unsigned long port_flags;
        struct ioc4_port *port;
-       struct uart_info *info;
+       struct uart_state *state;
 
        port = get_ioc4_port(the_port, 0);
        if (!port)
                return;
 
-       info = the_port->info;
+       state = the_port->state;
        port->ip_port = NULL;
 
-       wake_up_interruptible(&info->delta_msr_wait);
+       wake_up_interruptible(&state->port.delta_msr_wait);
 
-       if (info->port.tty)
-               set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+       if (state->port.tty)
+               set_bit(TTY_IO_ERROR, &state->port.tty->flags);
 
        spin_lock_irqsave(&the_port->lock, port_flags);
        set_notification(port, N_ALL, 0);
@@ -2538,7 +2538,7 @@ static int ic4_startup(struct uart_port *the_port)
        int retval;
        struct ioc4_port *port;
        struct ioc4_control *control;
-       struct uart_info *info;
+       struct uart_state *state;
        unsigned long port_flags;
 
        if (!the_port)
@@ -2546,7 +2546,7 @@ static int ic4_startup(struct uart_port *the_port)
        port = get_ioc4_port(the_port, 1);
        if (!port)
                return -ENODEV;
-       info = the_port->info;
+       state = the_port->state;
 
        control = port->ip_control;
        if (!control) {
index 0d9acbd..ebff4a1 100644 (file)
@@ -256,9 +256,9 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up
        unsigned int r1;
 
        tty = NULL;
-       if (up->port.info != NULL &&
-           up->port.info->port.tty != NULL)
-               tty = up->port.info->port.tty;
+       if (up->port.state != NULL &&
+           up->port.state->port.tty != NULL)
+               tty = up->port.state->port.tty;
 
        for (;;) {
                ch = readb(&channel->control);
@@ -354,7 +354,7 @@ static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
                        uart_handle_cts_change(&up->port,
                                               (status & CTS));
 
-               wake_up_interruptible(&up->port.info->delta_msr_wait);
+               wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
 
        up->prev_status = status;
@@ -404,9 +404,9 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
                return;
        }
 
-       if (up->port.info == NULL)
+       if (up->port.state == NULL)
                goto ack_tx_int;
-       xmit = &up->port.info->xmit;
+       xmit = &up->port.state->xmit;
        if (uart_circ_empty(xmit))
                goto ack_tx_int;
        if (uart_tx_stopped(&up->port))
@@ -607,7 +607,7 @@ static void ip22zilog_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-               struct circ_buf *xmit = &port->info->xmit;
+               struct circ_buf *xmit = &port->state->xmit;
 
                writeb(xmit->buf[xmit->tail], &channel->data);
                ZSDELAY();
index 9dadaa1..b4b124e 100644 (file)
@@ -989,7 +989,7 @@ static void neo_param(struct jsm_channel *ch)
                        {     50, B50     },
                };
 
-               cflag = C_BAUD(ch->uart_port.info->port.tty);
+               cflag = C_BAUD(ch->uart_port.state->port.tty);
                baud = 9600;
                for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
                        if (baud_rates[i].cflag == cflag) {
index 00f4577..7439c03 100644 (file)
@@ -147,7 +147,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch)
        struct ktermios *termios;
 
        spin_lock_irqsave(&port->lock, lock_flags);
-       termios = port->info->port.tty->termios;
+       termios = port->state->port.tty->termios;
        if (ch == termios->c_cc[VSTART])
                channel->ch_bd->bd_ops->send_start_character(channel);
 
@@ -245,7 +245,7 @@ static int jsm_tty_open(struct uart_port *port)
        channel->ch_cached_lsr = 0;
        channel->ch_stops_sent = 0;
 
-       termios = port->info->port.tty->termios;
+       termios = port->state->port.tty->termios;
        channel->ch_c_cflag     = termios->c_cflag;
        channel->ch_c_iflag     = termios->c_iflag;
        channel->ch_c_oflag     = termios->c_oflag;
@@ -278,7 +278,7 @@ static void jsm_tty_close(struct uart_port *port)
        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
 
        bd = channel->ch_bd;
-       ts = port->info->port.tty->termios;
+       ts = port->state->port.tty->termios;
 
        channel->ch_flags &= ~(CH_STOPI);
 
@@ -530,7 +530,7 @@ void jsm_input(struct jsm_channel *ch)
        if (!ch)
                return;
 
-       tp = ch->uart_port.info->port.tty;
+       tp = ch->uart_port.state->port.tty;
 
        bd = ch->ch_bd;
        if(!bd)
@@ -849,7 +849,7 @@ int jsm_tty_write(struct uart_port *port)
        u16 tail;
        u16 tmask;
        u32 remain;
-       int temp_tail = port->info->xmit.tail;
+       int temp_tail = port->state->xmit.tail;
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
        tmask = WQUEUEMASK;
@@ -865,10 +865,10 @@ int jsm_tty_write(struct uart_port *port)
        data_count = 0;
        if (bufcount >= remain) {
                bufcount -= remain;
-               while ((port->info->xmit.head != temp_tail) &&
+               while ((port->state->xmit.head != temp_tail) &&
                (data_count < remain)) {
                        channel->ch_wqueue[head++] =
-                       port->info->xmit.buf[temp_tail];
+                       port->state->xmit.buf[temp_tail];
 
                        temp_tail++;
                        temp_tail &= (UART_XMIT_SIZE - 1);
@@ -880,10 +880,10 @@ int jsm_tty_write(struct uart_port *port)
        data_count1 = 0;
        if (bufcount > 0) {
                remain = bufcount;
-               while ((port->info->xmit.head != temp_tail) &&
+               while ((port->state->xmit.head != temp_tail) &&
                        (data_count1 < remain)) {
                        channel->ch_wqueue[head++] =
-                               port->info->xmit.buf[temp_tail];
+                               port->state->xmit.buf[temp_tail];
 
                        temp_tail++;
                        temp_tail &= (UART_XMIT_SIZE - 1);
@@ -892,7 +892,7 @@ int jsm_tty_write(struct uart_port *port)
                }
        }
 
-       port->info->xmit.tail = temp_tail;
+       port->state->xmit.tail = temp_tail;
 
        data_count += data_count1;
        if (data_count) {
index 611c97a..bea5c21 100644 (file)
@@ -286,7 +286,7 @@ static void m32r_sio_start_tx(struct uart_port *port)
 {
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
        struct uart_sio_port *up = (struct uart_sio_port *)port;
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
 
        if (!(up->ier & UART_IER_THRI)) {
                up->ier |= UART_IER_THRI;
@@ -325,7 +325,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)
 
 static void receive_chars(struct uart_sio_port *up, int *status)
 {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch;
        unsigned char flag;
        int max_count = 256;
@@ -398,7 +398,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
 
 static void transmit_chars(struct uart_sio_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
 
        if (up->port.x_char) {
index 9fd33e5..3c30c56 100644 (file)
@@ -184,7 +184,7 @@ static void max3100_timeout(unsigned long data)
 {
        struct max3100_port *s = (struct max3100_port *)data;
 
-       if (s->port.info) {
+       if (s->port.state) {
                max3100_dowork(s);
                mod_timer(&s->timer, jiffies + s->poll_time);
        }
@@ -261,7 +261,7 @@ static void max3100_work(struct work_struct *w)
        int rxchars;
        u16 tx, rx;
        int conf, cconf, rts, crts;
-       struct circ_buf *xmit = &s->port.info->xmit;
+       struct circ_buf *xmit = &s->port.state->xmit;
 
        dev_dbg(&s->spi->dev, "%s\n", __func__);
 
@@ -307,8 +307,8 @@ static void max3100_work(struct work_struct *w)
                        }
                }
 
-               if (rxchars > 16 && s->port.info->port.tty != NULL) {
-                       tty_flip_buffer_push(s->port.info->port.tty);
+               if (rxchars > 16 && s->port.state->port.tty != NULL) {
+                       tty_flip_buffer_push(s->port.state->port.tty);
                        rxchars = 0;
                }
                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -320,8 +320,8 @@ static void max3100_work(struct work_struct *w)
                  (!uart_circ_empty(xmit) &&
                   !uart_tx_stopped(&s->port))));
 
-       if (rxchars > 0 && s->port.info->port.tty != NULL)
-               tty_flip_buffer_push(s->port.info->port.tty);
+       if (rxchars > 0 && s->port.state->port.tty != NULL)
+               tty_flip_buffer_push(s->port.state->port.tty);
 }
 
 static irqreturn_t max3100_irq(int irqno, void *dev_id)
@@ -429,7 +429,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
        int baud = 0;
        unsigned cflag;
        u32 param_new, param_mask, parity = 0;
-       struct tty_struct *tty = s->port.info->port.tty;
+       struct tty_struct *tty = s->port.state->port.tty;
 
        dev_dbg(&s->spi->dev, "%s\n", __func__);
        if (!tty)
@@ -529,7 +529,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
                        MAX3100_STATUS_OE;
 
        /* we are sending char from a workqueue so enable */
-       s->port.info->port.tty->low_latency = 1;
+       s->port.state->port.tty->low_latency = 1;
 
        if (s->poll_time > 0)
                del_timer_sync(&s->timer);
@@ -925,3 +925,4 @@ module_exit(max3100_exit);
 MODULE_DESCRIPTION("MAX3100 driver");
 MODULE_AUTHOR("Christian Pellegrin <chripell@evolware.org>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:max3100");
index 0eefb07..b443824 100644 (file)
@@ -323,7 +323,7 @@ static void mcf_rx_chars(struct mcf_uart *pp)
                uart_insert_char(port, status, MCFUART_USR_RXOVERRUN, ch, flag);
        }
 
-       tty_flip_buffer_push(port->info->port.tty);
+       tty_flip_buffer_push(port->state->port.tty);
 }
 
 /****************************************************************************/
@@ -331,7 +331,7 @@ static void mcf_rx_chars(struct mcf_uart *pp)
 static void mcf_tx_chars(struct mcf_uart *pp)
 {
        struct uart_port *port = &pp->port;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if (port->x_char) {
                /* Send special char - probably flow control */
index abbd146..d7bcd07 100644 (file)
@@ -745,7 +745,7 @@ static struct uart_ops mpc52xx_uart_ops = {
 static inline int
 mpc52xx_uart_int_rx_chars(struct uart_port *port)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned char ch, flag;
        unsigned short status;
 
@@ -812,7 +812,7 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
 static inline int
 mpc52xx_uart_int_tx_chars(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        /* Process out of band chars */
        if (port->x_char) {
index 61d3ade..b5496c2 100644 (file)
@@ -936,7 +936,7 @@ static int serial_polled;
 static int mpsc_rx_intr(struct mpsc_port_info *pi)
 {
        struct mpsc_rx_desc *rxre;
-       struct tty_struct *tty = pi->port.info->port.tty;
+       struct tty_struct *tty = pi->port.state->port.tty;
        u32     cmdstat, bytes_in, i;
        int     rc = 0;
        u8      *bp;
@@ -1109,7 +1109,7 @@ static void mpsc_setup_tx_desc(struct mpsc_port_info *pi, u32 count, u32 intr)
 
 static void mpsc_copy_tx_data(struct mpsc_port_info *pi)
 {
-       struct circ_buf *xmit = &pi->port.info->xmit;
+       struct circ_buf *xmit = &pi->port.state->xmit;
        u8 *bp;
        u32 i;
 
index f7c24ba..b05c5aa 100644 (file)
@@ -88,7 +88,7 @@ static void msm_enable_ms(struct uart_port *port)
 
 static void handle_rx(struct uart_port *port)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned int sr;
 
        /*
@@ -136,7 +136,7 @@ static void handle_rx(struct uart_port *port)
 
 static void handle_tx(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        struct msm_port *msm_port = UART_TO_MSM(port);
        int sent_tx;
 
@@ -169,7 +169,7 @@ static void handle_delta_cts(struct uart_port *port)
 {
        msm_write(port, UART_CR_CMD_RESET_CTS, UART_CR);
        port->icount.cts++;
-       wake_up_interruptible(&port->info->delta_msr_wait);
+       wake_up_interruptible(&port->state->port.delta_msr_wait);
 }
 
 static irqreturn_t msm_irq(int irq, void *dev_id)
index 953a5ff..7571aaa 100644 (file)
@@ -199,7 +199,7 @@ static void mux_break_ctl(struct uart_port *port, int break_state)
 static void mux_write(struct uart_port *port)
 {
        int count;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if(port->x_char) {
                UART_PUT_CHAR(port, port->x_char);
@@ -243,7 +243,7 @@ static void mux_write(struct uart_port *port)
 static void mux_read(struct uart_port *port)
 {
        int data;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        __u32 start_count = port->icount.rx;
 
        while(1) {
index 3e5dda8..7735c9f 100644 (file)
@@ -140,7 +140,7 @@ static void netx_enable_ms(struct uart_port *port)
 
 static inline void netx_transmit_buffer(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if (port->x_char) {
                writel(port->x_char, port->membase + UART_DR);
@@ -185,7 +185,7 @@ static unsigned int netx_tx_empty(struct uart_port *port)
 
 static void netx_txint(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
                netx_stop_tx(port);
@@ -201,7 +201,7 @@ static void netx_txint(struct uart_port *port)
 static void netx_rxint(struct uart_port *port)
 {
        unsigned char rx, flg, status;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
 
        while (!(readl(port->membase + UART_FR) & FR_RXFE)) {
                rx = readl(port->membase + UART_DR);
index 9e150b1..e1ab8ec 100644 (file)
@@ -126,7 +126,7 @@ static void nwpserial_config_port(struct uart_port *port, int flags)
 static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
 {
        struct nwpserial_port *up = dev_id;
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        irqreturn_t ret;
        unsigned int iir;
        unsigned char ch;
@@ -261,7 +261,7 @@ static void nwpserial_start_tx(struct uart_port *port)
        struct nwpserial_port *up;
        struct circ_buf *xmit;
        up = container_of(port, struct nwpserial_port, port);
-       xmit  = &up->port.info->xmit;
+       xmit  = &up->port.state->xmit;
 
        if (port->x_char) {
                nwpserial_putchar(up, up->port.x_char);
index 9c1243f..0700cd1 100644 (file)
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
        }
 
        /* Sanity check, make sure the old bug is no longer happening */
-       if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
+       if (uap->port.state == NULL || uap->port.state->port.tty == NULL) {
                WARN_ON(1);
                (void)read_zsdata(uap);
                return NULL;
        }
-       tty = uap->port.info->port.tty;
+       tty = uap->port.state->port.tty;
 
        while (1) {
                error = 0;
@@ -369,7 +369,7 @@ static void pmz_status_handle(struct uart_pmac_port *uap)
                        uart_handle_cts_change(&uap->port,
                                               !(status & CTS));
 
-               wake_up_interruptible(&uap->port.info->delta_msr_wait);
+               wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
        }
 
        if (status & BRK_ABRT)
@@ -420,9 +420,9 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                return;
        }
 
-       if (uap->port.info == NULL)
+       if (uap->port.state == NULL)
                goto ack_tx_int;
-       xmit = &uap->port.info->xmit;
+       xmit = &uap->port.state->xmit;
        if (uart_circ_empty(xmit)) {
                uart_write_wakeup(&uap->port);
                goto ack_tx_int;
@@ -655,7 +655,7 @@ static void pmz_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-               struct circ_buf *xmit = &port->info->xmit;
+               struct circ_buf *xmit = &port->state->xmit;
 
                write_zsdata(uap, xmit->buf[xmit->tail]);
                zssync(uap);
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
        state = pmz_uart_reg.state + uap->port.line;
 
        mutex_lock(&pmz_irq_mutex);
-       mutex_lock(&state->mutex);
+       mutex_lock(&state->port.mutex);
 
        spin_lock_irqsave(&uap->port.lock, flags);
 
@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
        /* Shut the chip down */
        pmz_set_scc_power(uap, 0);
 
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&state->port.mutex);
        mutex_unlock(&pmz_irq_mutex);
 
        pmz_debug("suspend, switching complete\n");
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
        state = pmz_uart_reg.state + uap->port.line;
 
        mutex_lock(&pmz_irq_mutex);
-       mutex_lock(&state->mutex);
+       mutex_lock(&state->port.mutex);
 
        spin_lock_irqsave(&uap->port.lock, flags);
        if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
        }
 
  bail:
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&state->port.mutex);
        mutex_unlock(&pmz_irq_mutex);
 
        /* Right now, we deal with delay by blocking here, I'll be
index 1bb8f1b..0aa75a9 100644 (file)
@@ -100,7 +100,7 @@ static void pnx8xxx_mctrl_check(struct pnx8xxx_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
 
-       wake_up_interruptible(&sport->port.info->delta_msr_wait);
+       wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 
 /*
@@ -112,7 +112,7 @@ static void pnx8xxx_timeout(unsigned long data)
        struct pnx8xxx_port *sport = (struct pnx8xxx_port *)data;
        unsigned long flags;
 
-       if (sport->port.info) {
+       if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                pnx8xxx_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -181,7 +181,7 @@ static void pnx8xxx_enable_ms(struct uart_port *port)
 
 static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
 {
-       struct tty_struct *tty = sport->port.info->port.tty;
+       struct tty_struct *tty = sport->port.state->port.tty;
        unsigned int status, ch, flg;
 
        status = FIFO_TO_SM(serial_in(sport, PNX8XXX_FIFO)) |
@@ -243,7 +243,7 @@ static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
 
 static void pnx8xxx_tx_chars(struct pnx8xxx_port *sport)
 {
-       struct circ_buf *xmit = &sport->port.info->xmit;
+       struct circ_buf *xmit = &sport->port.state->xmit;
 
        if (sport->port.x_char) {
                serial_out(sport, PNX8XXX_FIFO, sport->port.x_char);
index a48a8a1..6443b7f 100644 (file)
@@ -96,7 +96,7 @@ static void serial_pxa_stop_rx(struct uart_port *port)
 
 static inline void receive_chars(struct uart_pxa_port *up, int *status)
 {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch, flag;
        int max_count = 256;
 
@@ -161,7 +161,7 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status)
 
 static void transmit_chars(struct uart_pxa_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
 
        if (up->port.x_char) {
@@ -220,7 +220,7 @@ static inline void check_modem_status(struct uart_pxa_port *up)
        if (status & UART_MSR_DCTS)
                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
 
-       wake_up_interruptible(&up->port.info->delta_msr_wait);
+       wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 
 /*
index 94530f0..7f5e268 100644 (file)
@@ -117,7 +117,7 @@ static void sa1100_mctrl_check(struct sa1100_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
 
-       wake_up_interruptible(&sport->port.info->delta_msr_wait);
+       wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 
 /*
@@ -129,7 +129,7 @@ static void sa1100_timeout(unsigned long data)
        struct sa1100_port *sport = (struct sa1100_port *)data;
        unsigned long flags;
 
-       if (sport->port.info) {
+       if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                sa1100_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -189,7 +189,7 @@ static void sa1100_enable_ms(struct uart_port *port)
 static void
 sa1100_rx_chars(struct sa1100_port *sport)
 {
-       struct tty_struct *tty = sport->port.info->port.tty;
+       struct tty_struct *tty = sport->port.state->port.tty;
        unsigned int status, ch, flg;
 
        status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
@@ -239,7 +239,7 @@ sa1100_rx_chars(struct sa1100_port *sport)
 
 static void sa1100_tx_chars(struct sa1100_port *sport)
 {
-       struct circ_buf *xmit = &sport->port.info->xmit;
+       struct circ_buf *xmit = &sport->port.state->xmit;
 
        if (sport->port.x_char) {
                UART_PUT_CHAR(sport, sport->port.x_char);
index c8851a0..1523e8d 100644 (file)
@@ -196,7 +196,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
 {
        struct s3c24xx_uart_port *ourport = dev_id;
        struct uart_port *port = &ourport->port;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned int ufcon, ch, flag, ufstat, uerstat;
        int max_count = 64;
 
@@ -281,7 +281,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
 {
        struct s3c24xx_uart_port *ourport = id;
        struct uart_port *port = &ourport->port;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        int count = 256;
 
        if (port->x_char) {
@@ -992,10 +992,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
                struct ktermios *termios;
                struct tty_struct *tty;
 
-               if (uport->info == NULL)
+               if (uport->state == NULL)
                        goto exit;
 
-               tty = uport->info->port.tty;
+               tty = uport->state->port.tty;
 
                if (tty == NULL)
                        goto exit;
index 319e8b8..a2f2b32 100644 (file)
@@ -384,13 +384,13 @@ static void sbd_receive_chars(struct sbd_port *sport)
                uart_insert_char(uport, status, M_DUART_OVRUN_ERR, ch, flag);
        }
 
-       tty_flip_buffer_push(uport->info->port.tty);
+       tty_flip_buffer_push(uport->state->port.tty);
 }
 
 static void sbd_transmit_chars(struct sbd_port *sport)
 {
        struct uart_port *uport = &sport->port;
-       struct circ_buf *xmit = &sport->port.info->xmit;
+       struct circ_buf *xmit = &sport->port.state->xmit;
        unsigned int mask;
        int stop_tx;
 
@@ -440,7 +440,7 @@ static void sbd_status_handle(struct sbd_port *sport)
 
        if (delta & ((M_DUART_IN_PIN2_VAL | M_DUART_IN_PIN0_VAL) <<
                     S_DUART_IN_PIN_CHNG))
-               wake_up_interruptible(&uport->info->delta_msr_wait);
+               wake_up_interruptible(&uport->state->port.delta_msr_wait);
 }
 
 static irqreturn_t sbd_interrupt(int irq, void *dev_id)
index e0be11c..75038ad 100644 (file)
@@ -140,8 +140,8 @@ static struct tty_struct *receive_chars(struct uart_port *port)
        char flag;
        u8 status;
 
-       if (port->info != NULL)         /* Unopened serial console */
-               tty = port->info->port.tty;
+       if (port->state != NULL)                /* Unopened serial console */
+               tty = port->state->port.tty;
 
        while (limit-- > 0) {
                status = READ_SC_PORT(port, SR);
@@ -190,10 +190,10 @@ static void transmit_chars(struct uart_port *port)
 {
        struct circ_buf *xmit;
 
-       if (!port->info)
+       if (!port->state)
                return;
 
-       xmit = &port->info->xmit;
+       xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
                sc26xx_disable_irq(port, IMR_TXRDY);
                return;
@@ -316,7 +316,7 @@ static void sc26xx_stop_tx(struct uart_port *port)
 /* port->lock held by caller.  */
 static void sc26xx_start_tx(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        while (!uart_circ_empty(xmit)) {
                if (!(READ_SC_PORT(port, SR) & SR_TXRDY)) {
index b0bb29d..2514d00 100644 (file)
 #include <linux/console.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/serial_core.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/serial.h> /* for serial_state and serial_icounter_struct */
+#include <linux/serial_core.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 
@@ -52,8 +52,6 @@ static struct lock_class_key port_lock_key;
 
 #define HIGH_BITS_OFFSET       ((sizeof(long)-sizeof(int))*8)
 
-#define uart_users(state)      ((state)->count + (state)->info.port.blocked_open)
-
 #ifdef CONFIG_SERIAL_CORE_CONSOLE
 #define uart_console(port)     ((port)->cons && (port)->cons->index == (port)->line)
 #else
@@ -71,19 +69,19 @@ static void uart_change_pm(struct uart_state *state, int pm_state);
  */
 void uart_write_wakeup(struct uart_port *port)
 {
-       struct uart_info *info = port->info;
+       struct uart_state *state = port->state;
        /*
         * This means you called this function _after_ the port was
         * closed.  No cookie for you.
         */
-       BUG_ON(!info);
-       tasklet_schedule(&info->tlet);
+       BUG_ON(!state);
+       tasklet_schedule(&state->tlet);
 }
 
 static void uart_stop(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
        unsigned long flags;
 
        spin_lock_irqsave(&port->lock, flags);
@@ -94,9 +92,9 @@ static void uart_stop(struct tty_struct *tty)
 static void __uart_start(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
 
-       if (!uart_circ_empty(&state->info.xmit) && state->info.xmit.buf &&
+       if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
            !tty->stopped && !tty->hw_stopped)
                port->ops->start_tx(port);
 }
@@ -104,7 +102,7 @@ static void __uart_start(struct tty_struct *tty)
 static void uart_start(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
        unsigned long flags;
 
        spin_lock_irqsave(&port->lock, flags);
@@ -115,7 +113,7 @@ static void uart_start(struct tty_struct *tty)
 static void uart_tasklet_action(unsigned long data)
 {
        struct uart_state *state = (struct uart_state *)data;
-       tty_wakeup(state->info.port.tty);
+       tty_wakeup(state->port.tty);
 }
 
 static inline void
@@ -141,12 +139,12 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
  */
 static int uart_startup(struct uart_state *state, int init_hw)
 {
-       struct uart_info *info = &state->info;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        unsigned long page;
        int retval = 0;
 
-       if (info->flags & UIF_INITIALIZED)
+       if (port->flags & ASYNC_INITIALIZED)
                return 0;
 
        /*
@@ -154,26 +152,26 @@ static int uart_startup(struct uart_state *state, int init_hw)
         * once we have successfully opened the port.  Also set
         * up the tty->alt_speed kludge
         */
-       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+       set_bit(TTY_IO_ERROR, &port->tty->flags);
 
-       if (port->type == PORT_UNKNOWN)
+       if (uport->type == PORT_UNKNOWN)
                return 0;
 
        /*
         * Initialise and allocate the transmit and temporary
         * buffer.
         */
-       if (!info->xmit.buf) {
+       if (!state->xmit.buf) {
                /* This is protected by the per port mutex */
                page = get_zeroed_page(GFP_KERNEL);
                if (!page)
                        return -ENOMEM;
 
-               info->xmit.buf = (unsigned char *) page;
-               uart_circ_clear(&info->xmit);
+               state->xmit.buf = (unsigned char *) page;
+               uart_circ_clear(&state->xmit);
        }
 
-       retval = port->ops->startup(port);
+       retval = uport->ops->startup(uport);
        if (retval == 0) {
                if (init_hw) {
                        /*
@@ -185,20 +183,20 @@ static int uart_startup(struct uart_state *state, int init_hw)
                         * Setup the RTS and DTR signals once the
                         * port is open and ready to respond.
                         */
-                       if (info->port.tty->termios->c_cflag & CBAUD)
-                               uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);
+                       if (port->tty->termios->c_cflag & CBAUD)
+                               uart_set_mctrl(uport, TIOCM_RTS | TIOCM_DTR);
                }
 
-               if (info->flags & UIF_CTS_FLOW) {
-                       spin_lock_irq(&port->lock);
-                       if (!(port->ops->get_mctrl(port) & TIOCM_CTS))
-                               info->port.tty->hw_stopped = 1;
-                       spin_unlock_irq(&port->lock);
+               if (port->flags & ASYNC_CTS_FLOW) {
+                       spin_lock_irq(&uport->lock);
+                       if (!(uport->ops->get_mctrl(uport) & TIOCM_CTS))
+                               port->tty->hw_stopped = 1;
+                       spin_unlock_irq(&uport->lock);
                }
 
-               info->flags |= UIF_INITIALIZED;
+               set_bit(ASYNCB_INITIALIZED, &port->flags);
 
-               clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               clear_bit(TTY_IO_ERROR, &port->tty->flags);
        }
 
        if (retval && capable(CAP_SYS_ADMIN))
@@ -214,9 +212,9 @@ static int uart_startup(struct uart_state *state, int init_hw)
  */
 static void uart_shutdown(struct uart_state *state)
 {
-       struct uart_info *info = &state->info;
-       struct uart_port *port = state->port;
-       struct tty_struct *tty = info->port.tty;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
+       struct tty_struct *tty = port->tty;
 
        /*
         * Set the TTY IO error marker
@@ -224,14 +222,12 @@ static void uart_shutdown(struct uart_state *state)
        if (tty)
                set_bit(TTY_IO_ERROR, &tty->flags);
 
-       if (info->flags & UIF_INITIALIZED) {
-               info->flags &= ~UIF_INITIALIZED;
-
+       if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
                /*
                 * Turn off DTR and RTS early.
                 */
                if (!tty || (tty->termios->c_cflag & HUPCL))
-                       uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+                       uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 
                /*
                 * clear delta_msr_wait queue to avoid mem leaks: we may free
@@ -240,30 +236,30 @@ static void uart_shutdown(struct uart_state *state)
                 * any outstanding file descriptors should be pointing at
                 * hung_up_tty_fops now.
                 */
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&port->delta_msr_wait);
 
                /*
                 * Free the IRQ and disable the port.
                 */
-               port->ops->shutdown(port);
+               uport->ops->shutdown(uport);
 
                /*
                 * Ensure that the IRQ handler isn't running on another CPU.
                 */
-               synchronize_irq(port->irq);
+               synchronize_irq(uport->irq);
        }
 
        /*
         * kill off our tasklet
         */
-       tasklet_kill(&info->tlet);
+       tasklet_kill(&state->tlet);
 
        /*
         * Free the transmit buffer page.
         */
-       if (info->xmit.buf) {
-               free_page((unsigned long)info->xmit.buf);
-               info->xmit.buf = NULL;
+       if (state->xmit.buf) {
+               free_page((unsigned long)state->xmit.buf);
+               state->xmit.buf = NULL;
        }
 }
 
@@ -430,15 +426,16 @@ EXPORT_SYMBOL(uart_get_divisor);
 static void
 uart_change_speed(struct uart_state *state, struct ktermios *old_termios)
 {
-       struct tty_struct *tty = state->info.port.tty;
-       struct uart_port *port = state->port;
+       struct tty_port *port = &state->port;
+       struct tty_struct *tty = port->tty;
+       struct uart_port *uport = state->uart_port;
        struct ktermios *termios;
 
        /*
         * If we have no tty, termios, or the port does not exist,
         * then we can't set the parameters for this port.
         */
-       if (!tty || !tty->termios || port->type == PORT_UNKNOWN)
+       if (!tty || !tty->termios || uport->type == PORT_UNKNOWN)
                return;
 
        termios = tty->termios;
@@ -447,16 +444,16 @@ uart_change_speed(struct uart_state *state, struct ktermios *old_termios)
         * Set flags based on termios cflag
         */
        if (termios->c_cflag & CRTSCTS)
-               state->info.flags |= UIF_CTS_FLOW;
+               set_bit(ASYNCB_CTS_FLOW, &port->flags);
        else
-               state->info.flags &= ~UIF_CTS_FLOW;
+               clear_bit(ASYNCB_CTS_FLOW, &port->flags);
 
        if (termios->c_cflag & CLOCAL)
-               state->info.flags &= ~UIF_CHECK_CD;
+               clear_bit(ASYNCB_CHECK_CD, &port->flags);
        else
-               state->info.flags |= UIF_CHECK_CD;
+               set_bit(ASYNCB_CHECK_CD, &port->flags);
 
-       port->ops->set_termios(port, termios, old_termios);
+       uport->ops->set_termios(uport, termios, old_termios);
 }
 
 static inline int
@@ -482,7 +479,7 @@ static int uart_put_char(struct tty_struct *tty, unsigned char ch)
 {
        struct uart_state *state = tty->driver_data;
 
-       return __uart_put_char(state->port, &state->info.xmit, ch);
+       return __uart_put_char(state->uart_port, &state->xmit, ch);
 }
 
 static void uart_flush_chars(struct tty_struct *tty)
@@ -508,8 +505,8 @@ uart_write(struct tty_struct *tty, const unsigned char *buf, int count)
                return -EL3HLT;
        }
 
-       port = state->port;
-       circ = &state->info.xmit;
+       port = state->uart_port;
+       circ = &state->xmit;
 
        if (!circ->buf)
                return 0;
@@ -539,9 +536,9 @@ static int uart_write_room(struct tty_struct *tty)
        unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&state->port->lock, flags);
-       ret = uart_circ_chars_free(&state->info.xmit);
-       spin_unlock_irqrestore(&state->port->lock, flags);
+       spin_lock_irqsave(&state->uart_port->lock, flags);
+       ret = uart_circ_chars_free(&state->xmit);
+       spin_unlock_irqrestore(&state->uart_port->lock, flags);
        return ret;
 }
 
@@ -551,9 +548,9 @@ static int uart_chars_in_buffer(struct tty_struct *tty)
        unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&state->port->lock, flags);
-       ret = uart_circ_chars_pending(&state->info.xmit);
-       spin_unlock_irqrestore(&state->port->lock, flags);
+       spin_lock_irqsave(&state->uart_port->lock, flags);
+       ret = uart_circ_chars_pending(&state->xmit);
+       spin_unlock_irqrestore(&state->uart_port->lock, flags);
        return ret;
 }
 
@@ -572,11 +569,11 @@ static void uart_flush_buffer(struct tty_struct *tty)
                return;
        }
 
-       port = state->port;
+       port = state->uart_port;
        pr_debug("uart_flush_buffer(%d) called\n", tty->index);
 
        spin_lock_irqsave(&port->lock, flags);
-       uart_circ_clear(&state->info.xmit);
+       uart_circ_clear(&state->xmit);
        if (port->ops->flush_buffer)
                port->ops->flush_buffer(port);
        spin_unlock_irqrestore(&port->lock, flags);
@@ -590,7 +587,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
 static void uart_send_xchar(struct tty_struct *tty, char ch)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
        unsigned long flags;
 
        if (port->ops->send_xchar)
@@ -613,13 +610,13 @@ static void uart_throttle(struct tty_struct *tty)
                uart_send_xchar(tty, STOP_CHAR(tty));
 
        if (tty->termios->c_cflag & CRTSCTS)
-               uart_clear_mctrl(state->port, TIOCM_RTS);
+               uart_clear_mctrl(state->uart_port, TIOCM_RTS);
 }
 
 static void uart_unthrottle(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
 
        if (I_IXOFF(tty)) {
                if (port->x_char)
@@ -635,35 +632,36 @@ static void uart_unthrottle(struct tty_struct *tty)
 static int uart_get_info(struct uart_state *state,
                         struct serial_struct __user *retinfo)
 {
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        struct serial_struct tmp;
 
        memset(&tmp, 0, sizeof(tmp));
 
        /* Ensure the state we copy is consistent and no hardware changes
           occur as we go */
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
-       tmp.type            = port->type;
-       tmp.line            = port->line;
-       tmp.port            = port->iobase;
+       tmp.type            = uport->type;
+       tmp.line            = uport->line;
+       tmp.port            = uport->iobase;
        if (HIGH_BITS_OFFSET)
-               tmp.port_high = (long) port->iobase >> HIGH_BITS_OFFSET;
-       tmp.irq             = port->irq;
-       tmp.flags           = port->flags;
-       tmp.xmit_fifo_size  = port->fifosize;
-       tmp.baud_base       = port->uartclk / 16;
-       tmp.close_delay     = state->close_delay / 10;
-       tmp.closing_wait    = state->closing_wait == USF_CLOSING_WAIT_NONE ?
+               tmp.port_high = (long) uport->iobase >> HIGH_BITS_OFFSET;
+       tmp.irq             = uport->irq;
+       tmp.flags           = uport->flags;
+       tmp.xmit_fifo_size  = uport->fifosize;
+       tmp.baud_base       = uport->uartclk / 16;
+       tmp.close_delay     = port->close_delay / 10;
+       tmp.closing_wait    = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
                                ASYNC_CLOSING_WAIT_NONE :
-                               state->closing_wait / 10;
-       tmp.custom_divisor  = port->custom_divisor;
-       tmp.hub6            = port->hub6;
-       tmp.io_type         = port->iotype;
-       tmp.iomem_reg_shift = port->regshift;
-       tmp.iomem_base      = (void *)(unsigned long)port->mapbase;
+                               port->closing_wait / 10;
+       tmp.custom_divisor  = uport->custom_divisor;
+       tmp.hub6            = uport->hub6;
+       tmp.io_type         = uport->iotype;
+       tmp.iomem_reg_shift = uport->regshift;
+       tmp.iomem_base      = (void *)(unsigned long)uport->mapbase;
 
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 
        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
                return -EFAULT;
@@ -674,7 +672,8 @@ static int uart_set_info(struct uart_state *state,
                         struct serial_struct __user *newinfo)
 {
        struct serial_struct new_serial;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        unsigned long new_port;
        unsigned int change_irq, change_port, closing_wait;
        unsigned int old_custom_divisor, close_delay;
@@ -691,58 +690,58 @@ static int uart_set_info(struct uart_state *state,
        new_serial.irq = irq_canonicalize(new_serial.irq);
        close_delay = new_serial.close_delay * 10;
        closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
-                       USF_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
+                       ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
 
        /*
-        * This semaphore protects state->count.  It is also
+        * This semaphore protects port->count.  It is also
         * very useful to prevent opens.  Also, take the
         * port configuration semaphore to make sure that a
         * module insertion/removal doesn't change anything
         * under us.
         */
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
-       change_irq  = !(port->flags & UPF_FIXED_PORT)
-               && new_serial.irq != port->irq;
+       change_irq  = !(uport->flags & UPF_FIXED_PORT)
+               && new_serial.irq != uport->irq;
 
        /*
         * Since changing the 'type' of the port changes its resource
         * allocations, we should treat type changes the same as
         * IO port changes.
         */
-       change_port = !(port->flags & UPF_FIXED_PORT)
-               && (new_port != port->iobase ||
-                   (unsigned long)new_serial.iomem_base != port->mapbase ||
-                   new_serial.hub6 != port->hub6 ||
-                   new_serial.io_type != port->iotype ||
-                   new_serial.iomem_reg_shift != port->regshift ||
-                   new_serial.type != port->type);
-
-       old_flags = port->flags;
+       change_port = !(uport->flags & UPF_FIXED_PORT)
+               && (new_port != uport->iobase ||
+                   (unsigned long)new_serial.iomem_base != uport->mapbase ||
+                   new_serial.hub6 != uport->hub6 ||
+                   new_serial.io_type != uport->iotype ||
+                   new_serial.iomem_reg_shift != uport->regshift ||
+                   new_serial.type != uport->type);
+
+       old_flags = uport->flags;
        new_flags = new_serial.flags;
-       old_custom_divisor = port->custom_divisor;
+       old_custom_divisor = uport->custom_divisor;
 
        if (!capable(CAP_SYS_ADMIN)) {
                retval = -EPERM;
                if (change_irq || change_port ||
-                   (new_serial.baud_base != port->uartclk / 16) ||
-                   (close_delay != state->close_delay) ||
-                   (closing_wait != state->closing_wait) ||
+                   (new_serial.baud_base != uport->uartclk / 16) ||
+                   (close_delay != port->close_delay) ||
+                   (closing_wait != port->closing_wait) ||
                    (new_serial.xmit_fifo_size &&
-                    new_serial.xmit_fifo_size != port->fifosize) ||
+                    new_serial.xmit_fifo_size != uport->fifosize) ||
                    (((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
                        goto exit;
-               port->flags = ((port->flags & ~UPF_USR_MASK) |
+               uport->flags = ((uport->flags & ~UPF_USR_MASK) |
                               (new_flags & UPF_USR_MASK));
-               port->custom_divisor = new_serial.custom_divisor;
+               uport->custom_divisor = new_serial.custom_divisor;
                goto check_and_exit;
        }
 
        /*
         * Ask the low level driver to verify the settings.
         */
-       if (port->ops->verify_port)
-               retval = port->ops->verify_port(port, &new_serial);
+       if (uport->ops->verify_port)
+               retval = uport->ops->verify_port(uport, &new_serial);
 
        if ((new_serial.irq >= nr_irqs) || (new_serial.irq < 0) ||
            (new_serial.baud_base < 9600))
@@ -757,7 +756,7 @@ static int uart_set_info(struct uart_state *state,
                /*
                 * Make sure that we are the sole user of this port.
                 */
-               if (uart_users(state) > 1)
+               if (tty_port_users(port) > 1)
                        goto exit;
 
                /*
@@ -771,31 +770,31 @@ static int uart_set_info(struct uart_state *state,
                unsigned long old_iobase, old_mapbase;
                unsigned int old_type, old_iotype, old_hub6, old_shift;
 
-               old_iobase = port->iobase;
-               old_mapbase = port->mapbase;
-               old_type = port->type;
-               old_hub6 = port->hub6;
-               old_iotype = port->iotype;
-               old_shift = port->regshift;
+               old_iobase = uport->iobase;
+               old_mapbase = uport->mapbase;
+               old_type = uport->type;
+               old_hub6 = uport->hub6;
+               old_iotype = uport->iotype;
+               old_shift = uport->regshift;
 
                /*
                 * Free and release old regions
                 */
                if (old_type != PORT_UNKNOWN)
-                       port->ops->release_port(port);
+                       uport->ops->release_port(uport);
 
-               port->iobase = new_port;
-               port->type = new_serial.type;
-               port->hub6 = new_serial.hub6;
-               port->iotype = new_serial.io_type;
-               port->regshift = new_serial.iomem_reg_shift;
-               port->mapbase = (unsigned long)new_serial.iomem_base;
+               uport->iobase = new_port;
+               uport->type = new_serial.type;
+               uport->hub6 = new_serial.hub6;
+               uport->iotype = new_serial.io_type;
+               uport->regshift = new_serial.iomem_reg_shift;
+               uport->mapbase = (unsigned long)new_serial.iomem_base;
 
                /*
                 * Claim and map the new regions
                 */
-               if (port->type != PORT_UNKNOWN) {
-                       retval = port->ops->request_port(port);
+               if (uport->type != PORT_UNKNOWN) {
+                       retval = uport->ops->request_port(uport);
                } else {
                        /* Always success - Jean II */
                        retval = 0;
@@ -806,19 +805,19 @@ static int uart_set_info(struct uart_state *state,
                 * new port, try to restore the old settings.
                 */
                if (retval && old_type != PORT_UNKNOWN) {
-                       port->iobase = old_iobase;
-                       port->type = old_type;
-                       port->hub6 = old_hub6;
-                       port->iotype = old_iotype;
-                       port->regshift = old_shift;
-                       port->mapbase = old_mapbase;
-                       retval = port->ops->request_port(port);
+                       uport->iobase = old_iobase;
+                       uport->type = old_type;
+                       uport->hub6 = old_hub6;
+                       uport->iotype = old_iotype;
+                       uport->regshift = old_shift;
+                       uport->mapbase = old_mapbase;
+                       retval = uport->ops->request_port(uport);
                        /*
                         * If we failed to restore the old settings,
                         * we fail like this.
                         */
                        if (retval)
-                               port->type = PORT_UNKNOWN;
+                               uport->type = PORT_UNKNOWN;
 
                        /*
                         * We failed anyway.
@@ -830,45 +829,45 @@ static int uart_set_info(struct uart_state *state,
        }
 
        if (change_irq)
-               port->irq      = new_serial.irq;
-       if (!(port->flags & UPF_FIXED_PORT))
-               port->uartclk  = new_serial.baud_base * 16;
-       port->flags            = (port->flags & ~UPF_CHANGE_MASK) |
+               uport->irq      = new_serial.irq;
+       if (!(uport->flags & UPF_FIXED_PORT))
+               uport->uartclk  = new_serial.baud_base * 16;
+       uport->flags            = (uport->flags & ~UPF_CHANGE_MASK) |
                                 (new_flags & UPF_CHANGE_MASK);
-       port->custom_divisor   = new_serial.custom_divisor;
-       state->close_delay     = close_delay;
-       state->closing_wait    = closing_wait;
+       uport->custom_divisor   = new_serial.custom_divisor;
+       port->close_delay     = close_delay;
+       port->closing_wait    = closing_wait;
        if (new_serial.xmit_fifo_size)
-               port->fifosize = new_serial.xmit_fifo_size;
-       if (state->info.port.tty)
-               state->info.port.tty->low_latency =
-                       (port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+               uport->fifosize = new_serial.xmit_fifo_size;
+       if (port->tty)
+               port->tty->low_latency =
+                       (uport->flags & UPF_LOW_LATENCY) ? 1 : 0;
 
  check_and_exit:
        retval = 0;
-       if (port->type == PORT_UNKNOWN)
+       if (uport->type == PORT_UNKNOWN)
                goto exit;
-       if (state->info.flags & UIF_INITIALIZED) {
-               if (((old_flags ^ port->flags) & UPF_SPD_MASK) ||
-                   old_custom_divisor != port->custom_divisor) {
+       if (port->flags & ASYNC_INITIALIZED) {
+               if (((old_flags ^ uport->flags) & UPF_SPD_MASK) ||
+                   old_custom_divisor != uport->custom_divisor) {
                        /*
                         * If they're setting up a custom divisor or speed,
                         * instead of clearing it, then bitch about it. No
                         * need to rate-limit; it's CAP_SYS_ADMIN only.
                         */
-                       if (port->flags & UPF_SPD_MASK) {
+                       if (uport->flags & UPF_SPD_MASK) {
                                char buf[64];
                                printk(KERN_NOTICE
                                       "%s sets custom speed on %s. This "
                                       "is deprecated.\n", current->comm,
-                                      tty_name(state->info.port.tty, buf));
+                                      tty_name(port->tty, buf));
                        }
                        uart_change_speed(state, NULL);
                }
        } else
                retval = uart_startup(state, 1);
  exit:
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
        return retval;
 }
 
@@ -880,10 +879,11 @@ static int uart_set_info(struct uart_state *state,
 static int uart_get_lsr_info(struct uart_state *state,
                             unsigned int __user *value)
 {
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        unsigned int result;
 
-       result = port->ops->tx_empty(port);
+       result = uport->ops->tx_empty(uport);
 
        /*
         * If we're about to load something into the transmit
@@ -891,9 +891,9 @@ static int uart_get_lsr_info(struct uart_state *state,
         * avoid a race condition (depending on when the transmit
         * interrupt happens).
         */
-       if (port->x_char ||
-           ((uart_circ_chars_pending(&state->info.xmit) > 0) &&
-            !state->info.port.tty->stopped && !state->info.port.tty->hw_stopped))
+       if (uport->x_char ||
+           ((uart_circ_chars_pending(&state->xmit) > 0) &&
+            !port->tty->stopped && !port->tty->hw_stopped))
                result &= ~TIOCSER_TEMT;
 
        return put_user(result, value);
@@ -902,19 +902,20 @@ static int uart_get_lsr_info(struct uart_state *state,
 static int uart_tiocmget(struct tty_struct *tty, struct file *file)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct tty_port *port = &state->port;
+       struct uart_port *uport = state->uart_port;
        int result = -EIO;
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
        if ((!file || !tty_hung_up_p(file)) &&
            !(tty->flags & (1 << TTY_IO_ERROR))) {
-               result = port->mctrl;
+               result = uport->mctrl;
 
-               spin_lock_irq(&port->lock);
-               result |= port->ops->get_mctrl(port);
-               spin_unlock_irq(&port->lock);
+               spin_lock_irq(&uport->lock);
+               result |= uport->ops->get_mctrl(uport);
+               spin_unlock_irq(&uport->lock);
        }
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 
        return result;
 }
@@ -924,36 +925,39 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
              unsigned int set, unsigned int clear)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        int ret = -EIO;
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
        if ((!file || !tty_hung_up_p(file)) &&
            !(tty->flags & (1 << TTY_IO_ERROR))) {
-               uart_update_mctrl(port, set, clear);
+               uart_update_mctrl(uport, set, clear);
                ret = 0;
        }
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
        return ret;
 }
 
 static int uart_break_ctl(struct tty_struct *tty, int break_state)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct tty_port *port = &state->port;
+       struct uart_port *uport = state->uart_port;
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
-       if (port->type != PORT_UNKNOWN)
-               port->ops->break_ctl(port, break_state);
+       if (uport->type != PORT_UNKNOWN)
+               uport->ops->break_ctl(uport, break_state);
 
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
        return 0;
 }
 
 static int uart_do_autoconfig(struct uart_state *state)
 {
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        int flags, ret;
 
        if (!capable(CAP_SYS_ADMIN))
@@ -964,33 +968,33 @@ static int uart_do_autoconfig(struct uart_state *state)
         * changing, and hence any extra opens of the port while
         * we're auto-configuring.
         */
-       if (mutex_lock_interruptible(&state->mutex))
+       if (mutex_lock_interruptible(&port->mutex))
                return -ERESTARTSYS;
 
        ret = -EBUSY;
-       if (uart_users(state) == 1) {
+       if (tty_port_users(port) == 1) {
                uart_shutdown(state);
 
                /*
                 * If we already have a port type configured,
                 * we must release its resources.
                 */
-               if (port->type != PORT_UNKNOWN)
-                       port->ops->release_port(port);
+               if (uport->type != PORT_UNKNOWN)
+                       uport->ops->release_port(uport);
 
                flags = UART_CONFIG_TYPE;
-               if (port->flags & UPF_AUTO_IRQ)
+               if (uport->flags & UPF_AUTO_IRQ)
                        flags |= UART_CONFIG_IRQ;
 
                /*
                 * This will claim the ports resources if
                 * a port is found.
                 */
-               port->ops->config_port(port, flags);
+               uport->ops->config_port(uport, flags);
 
                ret = uart_startup(state, 1);
        }
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
        return ret;
 }
 
@@ -999,11 +1003,15 @@ static int uart_do_autoconfig(struct uart_state *state)
  * - mask passed in arg for lines of interest
  *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
  * Caller should use TIOCGICOUNT to see which one it was
+ *
+ * FIXME: This wants extracting into a common all driver implementation
+ * of TIOCMWAIT using tty_port.
  */
 static int
 uart_wait_modem_status(struct uart_state *state, unsigned long arg)
 {
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        DECLARE_WAITQUEUE(wait, current);
        struct uart_icount cprev, cnow;
        int ret;
@@ -1011,20 +1019,20 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
        /*
         * note the counters on entry
         */
-       spin_lock_irq(&port->lock);
-       memcpy(&cprev, &port->icount, sizeof(struct uart_icount));
+       spin_lock_irq(&uport->lock);
+       memcpy(&cprev, &uport->icount, sizeof(struct uart_icount));
 
        /*
         * Force modem status interrupts on
         */
-       port->ops->enable_ms(port);
-       spin_unlock_irq(&port->lock);
+       uport->ops->enable_ms(uport);
+       spin_unlock_irq(&uport->lock);
 
-       add_wait_queue(&state->info.delta_msr_wait, &wait);
+       add_wait_queue(&port->delta_msr_wait, &wait);
        for (;;) {
-               spin_lock_irq(&port->lock);
-               memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
-               spin_unlock_irq(&port->lock);
+               spin_lock_irq(&uport->lock);
+               memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
+               spin_unlock_irq(&uport->lock);
 
                set_current_state(TASK_INTERRUPTIBLE);
 
@@ -1048,7 +1056,7 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
        }
 
        current->state = TASK_RUNNING;
-       remove_wait_queue(&state->info.delta_msr_wait, &wait);
+       remove_wait_queue(&port->delta_msr_wait, &wait);
 
        return ret;
 }
@@ -1064,11 +1072,11 @@ static int uart_get_count(struct uart_state *state,
 {
        struct serial_icounter_struct icount;
        struct uart_icount cnow;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
 
-       spin_lock_irq(&port->lock);
-       memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
-       spin_unlock_irq(&port->lock);
+       spin_lock_irq(&uport->lock);
+       memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
+       spin_unlock_irq(&uport->lock);
 
        icount.cts         = cnow.cts;
        icount.dsr         = cnow.dsr;
@@ -1093,6 +1101,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
           unsigned long arg)
 {
        struct uart_state *state = tty->driver_data;
+       struct tty_port *port = &state->port;
        void __user *uarg = (void __user *)arg;
        int ret = -ENOIOCTLCMD;
 
@@ -1143,7 +1152,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
        if (ret != -ENOIOCTLCMD)
                goto out;
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
        if (tty_hung_up_p(filp)) {
                ret = -EIO;
@@ -1160,14 +1169,14 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
                break;
 
        default: {
-               struct uart_port *port = state->port;
-               if (port->ops->ioctl)
-                       ret = port->ops->ioctl(port, cmd, arg);
+               struct uart_port *uport = state->uart_port;
+               if (uport->ops->ioctl)
+                       ret = uport->ops->ioctl(uport, cmd, arg);
                break;
        }
        }
 out_up:
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 out:
        return ret;
 }
@@ -1175,10 +1184,10 @@ out:
 static void uart_set_ldisc(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
 
-       if (port->ops->set_ldisc)
-               port->ops->set_ldisc(port);
+       if (uport->ops->set_ldisc)
+               uport->ops->set_ldisc(uport);
 }
 
 static void uart_set_termios(struct tty_struct *tty,
@@ -1207,7 +1216,7 @@ static void uart_set_termios(struct tty_struct *tty,
 
        /* Handle transition to B0 status */
        if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))
-               uart_clear_mctrl(state->port, TIOCM_RTS | TIOCM_DTR);
+               uart_clear_mctrl(state->uart_port, TIOCM_RTS | TIOCM_DTR);
 
        /* Handle transition away from B0 status */
        if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
@@ -1215,25 +1224,25 @@ static void uart_set_termios(struct tty_struct *tty,
                if (!(cflag & CRTSCTS) ||
                    !test_bit(TTY_THROTTLED, &tty->flags))
                        mask |= TIOCM_RTS;
-               uart_set_mctrl(state->port, mask);
+               uart_set_mctrl(state->uart_port, mask);
        }
 
        /* Handle turning off CRTSCTS */
        if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
-               spin_lock_irqsave(&state->port->lock, flags);
+               spin_lock_irqsave(&state->uart_port->lock, flags);
                tty->hw_stopped = 0;
                __uart_start(tty);
-               spin_unlock_irqrestore(&state->port->lock, flags);
+               spin_unlock_irqrestore(&state->uart_port->lock, flags);
        }
 
        /* Handle turning on CRTSCTS */
        if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
-               spin_lock_irqsave(&state->port->lock, flags);
-               if (!(state->port->ops->get_mctrl(state->port) & TIOCM_CTS)) {
+               spin_lock_irqsave(&state->uart_port->lock, flags);
+               if (!(state->uart_port->ops->get_mctrl(state->uart_port) & TIOCM_CTS)) {
                        tty->hw_stopped = 1;
-                       state->port->ops->stop_tx(state->port);
+                       state->uart_port->ops->stop_tx(state->uart_port);
                }
-               spin_unlock_irqrestore(&state->port->lock, flags);
+               spin_unlock_irqrestore(&state->uart_port->lock, flags);
        }
 #if 0
        /*
@@ -1244,7 +1253,7 @@ static void uart_set_termios(struct tty_struct *tty,
         */
        if (!(old_termios->c_cflag & CLOCAL) &&
            (tty->termios->c_cflag & CLOCAL))
-               wake_up_interruptible(&info->port.open_wait);
+               wake_up_interruptible(&state->uart_port.open_wait);
 #endif
 }
 
@@ -1256,40 +1265,39 @@ static void uart_set_termios(struct tty_struct *tty,
 static void uart_close(struct tty_struct *tty, struct file *filp)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port;
+       struct tty_port *port;
+       struct uart_port *uport;
 
        BUG_ON(!kernel_locked());
 
-       if (!state || !state->port)
-               return;
+       uport = state->uart_port;
+       port = &state->port;
 
-       port = state->port;
+       pr_debug("uart_close(%d) called\n", uport->line);
 
-       pr_debug("uart_close(%d) called\n", port->line);
-
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
        if (tty_hung_up_p(filp))
                goto done;
 
-       if ((tty->count == 1) && (state->count != 1)) {
+       if ((tty->count == 1) && (port->count != 1)) {
                /*
                 * Uh, oh.  tty->count is 1, which means that the tty
-                * structure will be freed.  state->count should always
+                * structure will be freed.  port->count should always
                 * be one in these conditions.  If it's greater than
                 * one, we've got real problems, since it means the
                 * serial port won't be shutdown.
                 */
                printk(KERN_ERR "uart_close: bad serial port count; tty->count is 1, "
-                      "state->count is %d\n", state->count);
-               state->count = 1;
+                      "port->count is %d\n", port->count);
+               port->count = 1;
        }
-       if (--state->count < 0) {
+       if (--port->count < 0) {
                printk(KERN_ERR "uart_close: bad serial port count for %s: %d\n",
-                      tty->name, state->count);
-               state->count = 0;
+                      tty->name, port->count);
+               port->count = 0;
        }
-       if (state->count)
+       if (port->count)
                goto done;
 
        /*
@@ -1299,24 +1307,24 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         */
        tty->closing = 1;
 
-       if (state->closing_wait != USF_CLOSING_WAIT_NONE)
-               tty_wait_until_sent(tty, msecs_to_jiffies(state->closing_wait));
+       if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+               tty_wait_until_sent(tty, msecs_to_jiffies(port->closing_wait));
 
        /*
         * At this point, we stop accepting input.  To do this, we
         * disable the receive line status interrupts.
         */
-       if (state->info.flags & UIF_INITIALIZED) {
+       if (port->flags & ASYNC_INITIALIZED) {
                unsigned long flags;
                spin_lock_irqsave(&port->lock, flags);
-               port->ops->stop_rx(port);
+               uport->ops->stop_rx(uport);
                spin_unlock_irqrestore(&port->lock, flags);
                /*
                 * Before we drop DTR, make sure the UART transmitter
                 * has completely drained; this is especially
                 * important if there is a transmit FIFO!
                 */
-               uart_wait_until_sent(tty, port->timeout);
+               uart_wait_until_sent(tty, uport->timeout);
        }
 
        uart_shutdown(state);
@@ -1325,29 +1333,29 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
        tty_ldisc_flush(tty);
 
        tty->closing = 0;
-       state->info.port.tty = NULL;
+       tty_port_tty_set(port, NULL);
 
-       if (state->info.port.blocked_open) {
-               if (state->close_delay)
-                       msleep_interruptible(state->close_delay);
-       } else if (!uart_console(port)) {
+       if (port->blocked_open) {
+               if (port->close_delay)
+                       msleep_interruptible(port->close_delay);
+       } else if (!uart_console(uport)) {
                uart_change_pm(state, 3);
        }
 
        /*
         * Wake up anyone trying to open this port.
         */
-       state->info.flags &= ~UIF_NORMAL_ACTIVE;
-       wake_up_interruptible(&state->info.port.open_wait);
+       clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
+       wake_up_interruptible(&port->open_wait);
 
- done:
-       mutex_unlock(&state->mutex);
+done:
+       mutex_unlock(&port->mutex);
 }
 
 static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
        unsigned long char_time, expire;
 
        if (port->type == PORT_UNKNOWN || port->fifosize == 0)
@@ -1412,22 +1420,22 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
 static void uart_hangup(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-       struct uart_info *info = &state->info;
+       struct tty_port *port = &state->port;
 
        BUG_ON(!kernel_locked());
-       pr_debug("uart_hangup(%d)\n", state->port->line);
+       pr_debug("uart_hangup(%d)\n", state->uart_port->line);
 
-       mutex_lock(&state->mutex);
-       if (info->flags & UIF_NORMAL_ACTIVE) {
+       mutex_lock(&port->mutex);
+       if (port->flags & ASYNC_NORMAL_ACTIVE) {
                uart_flush_buffer(tty);
                uart_shutdown(state);
-               state->count = 0;
-               info->flags &= ~UIF_NORMAL_ACTIVE;
-               info->port.tty = NULL;
-               wake_up_interruptible(&info->port.open_wait);
-               wake_up_interruptible(&info->delta_msr_wait);
+               port->count = 0;
+               clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
+               tty_port_tty_set(port, NULL);
+               wake_up_interruptible(&port->open_wait);
+               wake_up_interruptible(&port->delta_msr_wait);
        }
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 }
 
 /*
@@ -1438,8 +1446,8 @@ static void uart_hangup(struct tty_struct *tty)
  */
 static void uart_update_termios(struct uart_state *state)
 {
-       struct tty_struct *tty = state->info.port.tty;
-       struct uart_port *port = state->port;
+       struct tty_struct *tty = state->port.tty;
+       struct uart_port *port = state->uart_port;
 
        if (uart_console(port) && port->cons->cflag) {
                tty->termios->c_cflag = port->cons->cflag;
@@ -1473,27 +1481,27 @@ static int
 uart_block_til_ready(struct file *filp, struct uart_state *state)
 {
        DECLARE_WAITQUEUE(wait, current);
-       struct uart_info *info = &state->info;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
+       struct tty_port *port = &state->port;
        unsigned int mctrl;
 
-       info->port.blocked_open++;
-       state->count--;
+       port->blocked_open++;
+       port->count--;
 
-       add_wait_queue(&info->port.open_wait, &wait);
+       add_wait_queue(&port->open_wait, &wait);
        while (1) {
                set_current_state(TASK_INTERRUPTIBLE);
 
                /*
                 * If we have been hung up, tell userspace/restart open.
                 */
-               if (tty_hung_up_p(filp) || info->port.tty == NULL)
+               if (tty_hung_up_p(filp) || port->tty == NULL)
                        break;
 
                /*
                 * If the port has been closed, tell userspace/restart open.
                 */
-               if (!(info->flags & UIF_INITIALIZED))
+               if (!(port->flags & ASYNC_INITIALIZED))
                        break;
 
                /*
@@ -1506,8 +1514,8 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                 * have set TTY_IO_ERROR for a non-existant port.
                 */
                if ((filp->f_flags & O_NONBLOCK) ||
-                   (info->port.tty->termios->c_cflag & CLOCAL) ||
-                   (info->port.tty->flags & (1 << TTY_IO_ERROR)))
+                   (port->tty->termios->c_cflag & CLOCAL) ||
+                   (port->tty->flags & (1 << TTY_IO_ERROR)))
                        break;
 
                /*
@@ -1515,37 +1523,37 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                 * not set RTS here - we want to make sure we catch
                 * the data from the modem.
                 */
-               if (info->port.tty->termios->c_cflag & CBAUD)
-                       uart_set_mctrl(port, TIOCM_DTR);
+               if (port->tty->termios->c_cflag & CBAUD)
+                       uart_set_mctrl(uport, TIOCM_DTR);
 
                /*
                 * and wait for the carrier to indicate that the
                 * modem is ready for us.
                 */
-               spin_lock_irq(&port->lock);
-               port->ops->enable_ms(port);
-               mctrl = port->ops->get_mctrl(port);
-               spin_unlock_irq(&port->lock);
+               spin_lock_irq(&uport->lock);
+               uport->ops->enable_ms(uport);
+               mctrl = uport->ops->get_mctrl(uport);
+               spin_unlock_irq(&uport->lock);
                if (mctrl & TIOCM_CAR)
                        break;
 
-               mutex_unlock(&state->mutex);
+               mutex_unlock(&port->mutex);
                schedule();
-               mutex_lock(&state->mutex);
+               mutex_lock(&port->mutex);
 
                if (signal_pending(current))
                        break;
        }
        set_current_state(TASK_RUNNING);
-       remove_wait_queue(&info->port.open_wait, &wait);
+       remove_wait_queue(&port->open_wait, &wait);
 
-       state->count++;
-       info->port.blocked_open--;
+       port->count++;
+       port->blocked_open--;
 
        if (signal_pending(current))
                return -ERESTARTSYS;
 
-       if (!info->port.tty || tty_hung_up_p(filp))
+       if (!port->tty || tty_hung_up_p(filp))
                return -EAGAIN;
 
        return 0;
@@ -1554,24 +1562,26 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
 static struct uart_state *uart_get(struct uart_driver *drv, int line)
 {
        struct uart_state *state;
+       struct tty_port *port;
        int ret = 0;
 
        state = drv->state + line;
-       if (mutex_lock_interruptible(&state->mutex)) {
+       port = &state->port;
+       if (mutex_lock_interruptible(&port->mutex)) {
                ret = -ERESTARTSYS;
                goto err;
        }
 
-       state->count++;
-       if (!state->port || state->port->flags & UPF_DEAD) {
+       port->count++;
+       if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
                ret = -ENXIO;
                goto err_unlock;
        }
        return state;
 
  err_unlock:
-       state->count--;
-       mutex_unlock(&state->mutex);
+       port->count--;
+       mutex_unlock(&port->mutex);
  err:
        return ERR_PTR(ret);
 }
@@ -1590,6 +1600,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
 {
        struct uart_driver *drv = (struct uart_driver *)tty->driver->driver_state;
        struct uart_state *state;
+       struct tty_port *port;
        int retval, line = tty->index;
 
        BUG_ON(!kernel_locked());
@@ -1606,16 +1617,18 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
 
        /*
         * We take the semaphore inside uart_get to guarantee that we won't
-        * be re-entered while allocating the info structure, or while we
+        * be re-entered while allocating the state structure, or while we
         * request any IRQs that the driver may need.  This also has the nice
         * side-effect that it delays the action of uart_hangup, so we can
-        * guarantee that info->port.tty will always contain something reasonable.
+        * guarantee that state->port.tty will always contain something
+        * reasonable.
         */
        state = uart_get(drv, line);
        if (IS_ERR(state)) {
                retval = PTR_ERR(state);
                goto fail;
        }
+       port = &state->port;
 
        /*
         * Once we set tty->driver_data here, we are guaranteed that
@@ -1623,25 +1636,25 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         * Any failures from here onwards should not touch the count.
         */
        tty->driver_data = state;
-       state->port->info = &state->info;
-       tty->low_latency = (state->port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+       state->uart_port->state = state;
+       tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
        tty->alt_speed = 0;
-       state->info.port.tty = tty;
+       tty_port_tty_set(port, tty);
 
        /*
         * If the port is in the middle of closing, bail out now.
         */
        if (tty_hung_up_p(filp)) {
                retval = -EAGAIN;
-               state->count--;
-               mutex_unlock(&state->mutex);
+               port->count--;
+               mutex_unlock(&port->mutex);
                goto fail;
        }
 
        /*
         * Make sure the device is in D0 state.
         */
-       if (state->count == 1)
+       if (port->count == 1)
                uart_change_pm(state, 0);
 
        /*
@@ -1654,18 +1667,18 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         */
        if (retval == 0)
                retval = uart_block_til_ready(filp, state);
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 
        /*
         * If this is the first open to succeed, adjust things to suit.
         */
-       if (retval == 0 && !(state->info.flags & UIF_NORMAL_ACTIVE)) {
-               state->info.flags |= UIF_NORMAL_ACTIVE;
+       if (retval == 0 && !(port->flags & ASYNC_NORMAL_ACTIVE)) {
+               set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
 
                uart_update_termios(state);
        }
 
- fail:
+fail:
        return retval;
 }
 
@@ -1687,57 +1700,58 @@ static const char *uart_type(struct uart_port *port)
 static void uart_line_info(struct seq_file *m, struct uart_driver *drv, int i)
 {
        struct uart_state *state = drv->state + i;
+       struct tty_port *port = &state->port;
        int pm_state;
-       struct uart_port *port = state->port;
+       struct uart_port *uport = state->uart_port;
        char stat_buf[32];
        unsigned int status;
        int mmio;
 
-       if (!port)
+       if (!uport)
                return;
 
-       mmio = port->iotype >= UPIO_MEM;
+       mmio = uport->iotype >= UPIO_MEM;
        seq_printf(m, "%d: uart:%s %s%08llX irq:%d",
-                       port->line, uart_type(port),
+                       uport->line, uart_type(uport),
                        mmio ? "mmio:0x" : "port:",
-                       mmio ? (unsigned long long)port->mapbase
-                            : (unsigned long long) port->iobase,
-                       port->irq);
+                       mmio ? (unsigned long long)uport->mapbase
+                            : (unsigned long long)uport->iobase,
+                       uport->irq);
 
-       if (port->type == PORT_UNKNOWN) {
+       if (uport->type == PORT_UNKNOWN) {
                seq_putc(m, '\n');
                return;
        }
 
        if (capable(CAP_SYS_ADMIN)) {
-               mutex_lock(&state->mutex);
+               mutex_lock(&port->mutex);
                pm_state = state->pm_state;
                if (pm_state)
                        uart_change_pm(state, 0);
-               spin_lock_irq(&port->lock);
-               status = port->ops->get_mctrl(port);
-               spin_unlock_irq(&port->lock);
+               spin_lock_irq(&uport->lock);
+               status = uport->ops->get_mctrl(uport);
+               spin_unlock_irq(&uport->lock);
                if (pm_state)
                        uart_change_pm(state, pm_state);
-               mutex_unlock(&state->mutex);
+               mutex_unlock(&port->mutex);
 
                seq_printf(m, " tx:%d rx:%d",
-                               port->icount.tx, port->icount.rx);
-               if (port->icount.frame)
+                               uport->icount.tx, uport->icount.rx);
+               if (uport->icount.frame)
                        seq_printf(m, " fe:%d",
-                               port->icount.frame);
-               if (port->icount.parity)
+                               uport->icount.frame);
+               if (uport->icount.parity)
                        seq_printf(m, " pe:%d",
-                               port->icount.parity);
-               if (port->icount.brk)
+                               uport->icount.parity);
+               if (uport->icount.brk)
                        seq_printf(m, " brk:%d",
-                               port->icount.brk);
-               if (port->icount.overrun)
+                               uport->icount.brk);
+               if (uport->icount.overrun)
                        seq_printf(m, " oe:%d",
-                               port->icount.overrun);
+                               uport->icount.overrun);
 
 #define INFOBIT(bit, str) \
-       if (port->mctrl & (bit)) \
+       if (uport->mctrl & (bit)) \
                strncat(stat_buf, (str), sizeof(stat_buf) - \
                        strlen(stat_buf) - 2)
 #define STATBIT(bit, str) \
@@ -1958,7 +1972,7 @@ EXPORT_SYMBOL_GPL(uart_set_options);
 
 static void uart_change_pm(struct uart_state *state, int pm_state)
 {
-       struct uart_port *port = state->port;
+       struct uart_port *port = state->uart_port;
 
        if (state->pm_state != pm_state) {
                if (port->ops->pm)
@@ -1982,132 +1996,138 @@ static int serial_match_port(struct device *dev, void *data)
        return dev->devt == devt; /* Actually, only one tty per port */
 }
 
-int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
+int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 {
-       struct uart_state *state = drv->state + port->line;
+       struct uart_state *state = drv->state + uport->line;
+       struct tty_port *port = &state->port;
        struct device *tty_dev;
-       struct uart_match match = {port, drv};
+       struct uart_match match = {uport, drv};
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
-       if (!console_suspend_enabled && uart_console(port)) {
+       if (!console_suspend_enabled && uart_console(uport)) {
                /* we're going to avoid suspending serial console */
-               mutex_unlock(&state->mutex);
+               mutex_unlock(&port->mutex);
                return 0;
        }
 
-       tty_dev = device_find_child(port->dev, &match, serial_match_port);
+       tty_dev = device_find_child(uport->dev, &match, serial_match_port);
        if (device_may_wakeup(tty_dev)) {
-               enable_irq_wake(port->irq);
+               enable_irq_wake(uport->irq);
                put_device(tty_dev);
-               mutex_unlock(&state->mutex);
+               mutex_unlock(&port->mutex);
                return 0;
        }
-       port->suspended = 1;
+       uport->suspended = 1;
 
-       if (state->info.flags & UIF_INITIALIZED) {
-               const struct uart_ops *ops = port->ops;
+       if (port->flags & ASYNC_INITIALIZED) {
+               const struct uart_ops *ops = uport->ops;
                int tries;
 
-               state->info.flags = (state->info.flags & ~UIF_INITIALIZED)
-                                    | UIF_SUSPENDED;
+               set_bit(ASYNCB_SUSPENDED, &port->flags);
+               clear_bit(ASYNCB_INITIALIZED, &port->flags);
 
-               spin_lock_irq(&port->lock);
-               ops->stop_tx(port);
-               ops->set_mctrl(port, 0);
-               ops->stop_rx(port);
-               spin_unlock_irq(&port->lock);
+               spin_lock_irq(&uport->lock);
+               ops->stop_tx(uport);
+               ops->set_mctrl(uport, 0);
+               ops->stop_rx(uport);
+               spin_unlock_irq(&uport->lock);
 
                /*
                 * Wait for the transmitter to empty.
                 */
-               for (tries = 3; !ops->tx_empty(port) && tries; tries--)
+               for (tries = 3; !ops->tx_empty(uport) && tries; tries--)
                        msleep(10);
                if (!tries)
                        printk(KERN_ERR "%s%s%s%d: Unable to drain "
                                        "transmitter\n",
-                              port->dev ? dev_name(port->dev) : "",
-                              port->dev ? ": " : "",
+                              uport->dev ? dev_name(uport->dev) : "",
+                              uport->dev ? ": " : "",
                               drv->dev_name,
-                              drv->tty_driver->name_base + port->line);
+                              drv->tty_driver->name_base + uport->line);
 
-               ops->shutdown(port);
+               ops->shutdown(uport);
        }
 
        /*
         * Disable the console device before suspending.
         */
-       if (uart_console(port))
-               console_stop(port->cons);
+       if (uart_console(uport))
+               console_stop(uport->cons);
 
        uart_change_pm(state, 3);
 
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 
        return 0;
 }
 
-int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
+int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 {
-       struct uart_state *state = drv->state + port->line;
+       struct uart_state *state = drv->state + uport->line;
+       struct tty_port *port = &state->port;
        struct device *tty_dev;
-       struct uart_match match = {port, drv};
+       struct uart_match match = {uport, drv};
+       struct ktermios termios;
 
-       mutex_lock(&state->mutex);
+       mutex_lock(&port->mutex);
 
-       if (!console_suspend_enabled && uart_console(port)) {
+       if (!console_suspend_enabled && uart_console(uport)) {
                /* no need to resume serial console, it wasn't suspended */
-               mutex_unlock(&state->mutex);
+               /*
+                * First try to use the console cflag setting.
+                */
+               memset(&termios, 0, sizeof(struct ktermios));
+               termios.c_cflag = uport->cons->cflag;
+               /*
+                * If that's unset, use the tty termios setting.
+                */
+               if (termios.c_cflag == 0)
+                       termios = *state->port.tty->termios;
+               else {
+                       termios.c_ispeed = termios.c_ospeed =
+                               tty_termios_input_baud_rate(&termios);
+                       termios.c_ispeed = termios.c_ospeed =
+                               tty_termios_baud_rate(&termios);
+               }
+               uport->ops->set_termios(uport, &termios, NULL);
+               mutex_unlock(&port->mutex);
                return 0;
        }
 
-       tty_dev = device_find_child(port->dev, &match, serial_match_port);
-       if (!port->suspended && device_may_wakeup(tty_dev)) {
-               disable_irq_wake(port->irq);
-               mutex_unlock(&state->mutex);
+       tty_dev = device_find_child(uport->dev, &match, serial_match_port);
+       if (!uport->suspended && device_may_wakeup(tty_dev)) {
+               disable_irq_wake(uport->irq);
+               mutex_unlock(&port->mutex);
                return 0;
        }
-       port->suspended = 0;
+       uport->suspended = 0;
 
        /*
         * Re-enable the console device after suspending.
         */
-       if (uart_console(port)) {
-               struct ktermios termios;
-
-               /*
-                * First try to use the console cflag setting.
-                */
-               memset(&termios, 0, sizeof(struct ktermios));
-               termios.c_cflag = port->cons->cflag;
-
-               /*
-                * If that's unset, use the tty termios setting.
-                */
-               if (state->info.port.tty && termios.c_cflag == 0)
-                       termios = *state->info.port.tty->termios;
-
+       if (uart_console(uport)) {
                uart_change_pm(state, 0);
-               port->ops->set_termios(port, &termios, NULL);
-               console_start(port->cons);
+               uport->ops->set_termios(uport, &termios, NULL);
+               console_start(uport->cons);
        }
 
-       if (state->info.flags & UIF_SUSPENDED) {
-               const struct uart_ops *ops = port->ops;
+       if (port->flags & ASYNC_SUSPENDED) {
+               const struct uart_ops *ops = uport->ops;
                int ret;
 
                uart_change_pm(state, 0);
-               spin_lock_irq(&port->lock);
-               ops->set_mctrl(port, 0);
-               spin_unlock_irq(&port->lock);
-               ret = ops->startup(port);
+               spin_lock_irq(&uport->lock);
+               ops->set_mctrl(uport, 0);
+               spin_unlock_irq(&uport->lock);
+               ret = ops->startup(uport);
                if (ret == 0) {
                        uart_change_speed(state, NULL);
-                       spin_lock_irq(&port->lock);
-                       ops->set_mctrl(port, port->mctrl);
-                       ops->start_tx(port);
-                       spin_unlock_irq(&port->lock);
-                       state->info.flags |= UIF_INITIALIZED;
+                       spin_lock_irq(&uport->lock);
+                       ops->set_mctrl(uport, uport->mctrl);
+                       ops->start_tx(uport);
+                       spin_unlock_irq(&uport->lock);
+                       set_bit(ASYNCB_INITIALIZED, &port->flags);
                } else {
                        /*
                         * Failed to resume - maybe hardware went away?
@@ -2117,10 +2137,10 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                        uart_shutdown(state);
                }
 
-               state->info.flags &= ~UIF_SUSPENDED;
+               clear_bit(ASYNCB_SUSPENDED, &port->flags);
        }
 
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
 
        return 0;
 }
@@ -2232,10 +2252,10 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
        int parity = 'n';
        int flow = 'n';
 
-       if (!state || !state->port)
+       if (!state || !state->uart_port)
                return -1;
 
-       port = state->port;
+       port = state->uart_port;
        if (!(port->ops->poll_get_char && port->ops->poll_put_char))
                return -1;
 
@@ -2253,10 +2273,10 @@ static int uart_poll_get_char(struct tty_driver *driver, int line)
        struct uart_state *state = drv->state + line;
        struct uart_port *port;
 
-       if (!state || !state->port)
+       if (!state || !state->uart_port)
                return -1;
 
-       port = state->port;
+       port = state->uart_port;
        return port->ops->poll_get_char(port);
 }
 
@@ -2266,10 +2286,10 @@ static void uart_poll_put_char(struct tty_driver *driver, int line, char ch)
        struct uart_state *state = drv->state + line;
        struct uart_port *port;
 
-       if (!state || !state->port)
+       if (!state || !state->uart_port)
                return;
 
-       port = state->port;
+       port = state->uart_port;
        port->ops->poll_put_char(port, ch);
 }
 #endif
@@ -2360,14 +2380,12 @@ int uart_register_driver(struct uart_driver *drv)
         */
        for (i = 0; i < drv->nr; i++) {
                struct uart_state *state = drv->state + i;
+               struct tty_port *port = &state->port;
 
-               state->close_delay     = 500;   /* .5 seconds */
-               state->closing_wait    = 30000; /* 30 seconds */
-               mutex_init(&state->mutex);
-
-               tty_port_init(&state->info.port);
-               init_waitqueue_head(&state->info.delta_msr_wait);
-               tasklet_init(&state->info.tlet, uart_tasklet_action,
+               tty_port_init(port);
+               port->close_delay     = 500;    /* .5 seconds */
+               port->closing_wait    = 30000;  /* 30 seconds */
+               tasklet_init(&state->tlet, uart_tasklet_action,
                             (unsigned long)state);
        }
 
@@ -2415,62 +2433,64 @@ struct tty_driver *uart_console_device(struct console *co, int *index)
  *     level uart drivers to expand uart_port, rather than having yet
  *     more levels of structures.
  */
-int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
+int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
 {
        struct uart_state *state;
+       struct tty_port *port;
        int ret = 0;
        struct device *tty_dev;
 
        BUG_ON(in_interrupt());
 
-       if (port->line >= drv->nr)
+       if (uport->line >= drv->nr)
                return -EINVAL;
 
-       state = drv->state + port->line;
+       state = drv->state + uport->line;
+       port = &state->port;
 
        mutex_lock(&port_mutex);
-       mutex_lock(&state->mutex);
-       if (state->port) {
+       mutex_lock(&port->mutex);
+       if (state->uart_port) {
                ret = -EINVAL;
                goto out;
        }
 
-       state->port = port;
+       state->uart_port = uport;
        state->pm_state = -1;
 
-       port->cons = drv->cons;
-       port->info = &state->info;
+       uport->cons = drv->cons;
+       uport->state = state;
 
        /*
         * If this port is a console, then the spinlock is already
         * initialised.
         */
-       if (!(uart_console(port) && (port->cons->flags & CON_ENABLED))) {
-               spin_lock_init(&port->lock);
-               lockdep_set_class(&port->lock, &port_lock_key);
+       if (!(uart_console(uport) && (uport->cons->flags & CON_ENABLED))) {
+               spin_lock_init(&uport->lock);
+               lockdep_set_class(&uport->lock, &port_lock_key);
        }
 
-       uart_configure_port(drv, state, port);
+       uart_configure_port(drv, state, uport);
 
        /*
         * Register the port whether it's detected or not.  This allows
         * setserial to be used to alter this ports parameters.
         */
-       tty_dev = tty_register_device(drv->tty_driver, port->line, port->dev);
+       tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
        if (likely(!IS_ERR(tty_dev))) {
                device_init_wakeup(tty_dev, 1);
                device_set_wakeup_enable(tty_dev, 0);
        } else
                printk(KERN_ERR "Cannot register tty device on line %d\n",
-                      port->line);
+                      uport->line);
 
        /*
         * Ensure UPF_DEAD is not set.
         */
-       port->flags &= ~UPF_DEAD;
+       uport->flags &= ~UPF_DEAD;
 
  out:
-       mutex_unlock(&state->mutex);
+       mutex_unlock(&port->mutex);
        mutex_unlock(&port_mutex);
 
        return ret;
@@ -2485,16 +2505,16 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
  *     core driver.  No further calls will be made to the low-level code
  *     for this port.
  */
-int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
+int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)
 {
-       struct uart_state *state = drv->state + port->line;
-       struct uart_info *info;
+       struct uart_state *state = drv->state + uport->line;
+       struct tty_port *port = &state->port;
 
        BUG_ON(in_interrupt());
 
-       if (state->port != port)
+       if (state->uart_port != uport)
                printk(KERN_ALERT "Removing wrong port: %p != %p\n",
-                       state->port, port);
+                       state->uart_port, uport);
 
        mutex_lock(&port_mutex);
 
@@ -2502,37 +2522,35 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
         * Mark the port "dead" - this prevents any opens from
         * succeeding while we shut down the port.
         */
-       mutex_lock(&state->mutex);
-       port->flags |= UPF_DEAD;
-       mutex_unlock(&state->mutex);
+       mutex_lock(&port->mutex);
+       uport->flags |= UPF_DEAD;
+       mutex_unlock(&port->mutex);
 
        /*
         * Remove the devices from the tty layer
         */
-       tty_unregister_device(drv->tty_driver, port->line);
+       tty_unregister_device(drv->tty_driver, uport->line);
 
-       info = &state->info;
-       if (info && info->port.tty)
-               tty_vhangup(info->port.tty);
+       if (port->tty)
+               tty_vhangup(port->tty);
 
        /*
         * Free the port IO and memory resources, if any.
         */
-       if (port->type != PORT_UNKNOWN)
-               port->ops->release_port(port);
+       if (uport->type != PORT_UNKNOWN)
+               uport->ops->release_port(uport);
 
        /*
         * Indicate that there isn't a port here anymore.
         */
-       port->type = PORT_UNKNOWN;
+       uport->type = PORT_UNKNOWN;
 
        /*
         * Kill the tasklet, and free resources.
         */
-       if (info)
-               tasklet_kill(&info->tlet);
+       tasklet_kill(&state->tlet);
 
-       state->port = NULL;
+       state->uart_port = NULL;
        mutex_unlock(&port_mutex);
 
        return 0;
index ed4648b..a3bb490 100644 (file)
@@ -884,6 +884,7 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
        PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
        PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
+       PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
index 52db5cc..2e71bbc 100644 (file)
@@ -154,7 +154,7 @@ static void ks8695uart_disable_ms(struct uart_port *port)
 static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, lsr, flg, max_count = 256;
 
        status = UART_GET_LSR(port);            /* clears pending LSR interrupts */
@@ -210,7 +210,7 @@ ignore_char:
 static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        unsigned int count;
 
        if (port->x_char) {
@@ -266,7 +266,7 @@ static irqreturn_t ks8695uart_modem_status(int irq, void *dev_id)
        if (status & URMS_URTERI)
                port->icount.rng++;
 
-       wake_up_interruptible(&port->info->delta_msr_wait);
+       wake_up_interruptible(&port->state->port.delta_msr_wait);
 
        return IRQ_HANDLED;
 }
index a7bf024..ea74470 100644 (file)
@@ -138,7 +138,7 @@ static void lh7a40xuart_enable_ms (struct uart_port* port)
 
 static void lh7a40xuart_rx_chars (struct uart_port* port)
 {
-       struct tty_struct* tty = port->info->port.tty;
+       struct tty_struct* tty = port->state->port.tty;
        int cbRxMax = 256;      /* (Gross) limit on receive */
        unsigned int data;      /* Received data and status */
        unsigned int flag;
@@ -184,7 +184,7 @@ static void lh7a40xuart_rx_chars (struct uart_port* port)
 
 static void lh7a40xuart_tx_chars (struct uart_port* port)
 {
-       struct circ_buf* xmit = &port->info->xmit;
+       struct circ_buf* xmit = &port->state->xmit;
        int cbTxMax = port->fifosize;
 
        if (port->x_char) {
@@ -241,7 +241,7 @@ static void lh7a40xuart_modem_status (struct uart_port* port)
        if (delta & CTS)
                uart_handle_cts_change (port, status & CTS);
 
-       wake_up_interruptible (&port->info->delta_msr_wait);
+       wake_up_interruptible (&port->state->port.delta_msr_wait);
 }
 
 static irqreturn_t lh7a40xuart_int (int irq, void* dev_id)
index 54dd16d..0f7cf4c 100644 (file)
@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port)
 static inline void
 receive_chars(struct uart_txx9_port *up, unsigned int *status)
 {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch;
        unsigned int disr = *status;
        int max_count = 256;
@@ -348,7 +348,7 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status)
 
 static inline void transmit_chars(struct uart_txx9_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
 
        if (up->port.x_char) {
index 32dc2fc..85119fb 100644 (file)
@@ -361,7 +361,7 @@ static inline int sci_rxroom(struct uart_port *port)
 
 static void sci_transmit_chars(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
        unsigned int stopped = uart_tx_stopped(port);
        unsigned short status;
        unsigned short ctrl;
@@ -426,7 +426,7 @@ static void sci_transmit_chars(struct uart_port *port)
 static inline void sci_receive_chars(struct uart_port *port)
 {
        struct sci_port *sci_port = to_sci_port(port);
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        int i, count, copied = 0;
        unsigned short status;
        unsigned char flag;
@@ -546,7 +546,7 @@ static inline int sci_handle_errors(struct uart_port *port)
 {
        int copied = 0;
        unsigned short status = sci_in(port, SCxSR);
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
 
        if (status & SCxSR_ORER(port)) {
                /* overrun error */
@@ -600,7 +600,7 @@ static inline int sci_handle_errors(struct uart_port *port)
 
 static inline int sci_handle_fifo_overrun(struct uart_port *port)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        int copied = 0;
 
        if (port->type != PORT_SCIF)
@@ -623,7 +623,7 @@ static inline int sci_handle_breaks(struct uart_port *port)
 {
        int copied = 0;
        unsigned short status = sci_in(port, SCxSR);
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        struct sci_port *s = to_sci_port(port);
 
        if (uart_handle_break(port))
index d5276c0..9794e0c 100644 (file)
@@ -469,9 +469,9 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
                return;
        }
 
-       if (port->sc_port.info) {
+       if (port->sc_port.state) {
                /* The serial_core stuffs are initilized, use them */
-               tty = port->sc_port.info->port.tty;
+               tty = port->sc_port.state->port.tty;
        }
        else {
                /* Not registered yet - can't pass to tty layer.  */
@@ -550,9 +550,9 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
 
        BUG_ON(!port->sc_is_asynch);
 
-       if (port->sc_port.info) {
+       if (port->sc_port.state) {
                /* We're initilized, using serial core infrastructure */
-               xmit = &port->sc_port.info->xmit;
+               xmit = &port->sc_port.state->xmit;
        } else {
                /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
                 * initilized yet.  Just return.  Writes are going through
@@ -927,7 +927,7 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
        /* We can't look at the xmit buffer if we're not registered with serial core
         *  yet.  So only do the fancy recovery after registering
         */
-       if (!port->sc_port.info) {
+       if (!port->sc_port.state) {
                /* Not yet registered with serial core - simple case */
                puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
                return;
@@ -936,8 +936,8 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
        /* somebody really wants this output, might be an
         * oops, kdb, panic, etc.  make sure they get it. */
        if (spin_is_locked(&port->sc_port.lock)) {
-               int lhead = port->sc_port.info->xmit.head;
-               int ltail = port->sc_port.info->xmit.tail;
+               int lhead = port->sc_port.state->xmit.head;
+               int ltail = port->sc_port.state->xmit.tail;
                int counter, got_lock = 0;
 
                /*
@@ -962,13 +962,13 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
                                break;
                        } else {
                                /* still locked */
-                               if ((lhead != port->sc_port.info->xmit.head)
+                               if ((lhead != port->sc_port.state->xmit.head)
                                    || (ltail !=
-                                       port->sc_port.info->xmit.tail)) {
+                                       port->sc_port.state->xmit.tail)) {
                                        lhead =
-                                               port->sc_port.info->xmit.head;
+                                               port->sc_port.state->xmit.head;
                                        ltail =
-                                               port->sc_port.info->xmit.tail;
+                                               port->sc_port.state->xmit.tail;
                                        counter = 0;
                                }
                        }
index 1df5325..d548652 100644 (file)
@@ -184,8 +184,8 @@ static struct tty_struct *receive_chars(struct uart_port *port)
 {
        struct tty_struct *tty = NULL;
 
-       if (port->info != NULL)         /* Unopened serial console */
-               tty = port->info->port.tty;
+       if (port->state != NULL)                /* Unopened serial console */
+               tty = port->state->port.tty;
 
        if (sunhv_ops->receive_chars(port, tty))
                sun_do_break();
@@ -197,10 +197,10 @@ static void transmit_chars(struct uart_port *port)
 {
        struct circ_buf *xmit;
 
-       if (!port->info)
+       if (!port->state)
                return;
 
-       xmit = &port->info->xmit;
+       xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port))
                return;
 
index 0355efe..d1ad341 100644 (file)
@@ -117,8 +117,8 @@ receive_chars(struct uart_sunsab_port *up,
        int count = 0;
        int i;
 
-       if (up->port.info != NULL)              /* Unopened serial console */
-               tty = up->port.info->port.tty;
+       if (up->port.state != NULL)             /* Unopened serial console */
+               tty = up->port.state->port.tty;
 
        /* Read number of BYTES (Character + Status) available. */
        if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
@@ -229,7 +229,7 @@ static void sunsab_tx_idle(struct uart_sunsab_port *);
 static void transmit_chars(struct uart_sunsab_port *up,
                           union sab82532_irq_status *stat)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int i;
 
        if (stat->sreg.isr1 & SAB82532_ISR1_ALLS) {
@@ -297,7 +297,7 @@ static void check_status(struct uart_sunsab_port *up,
                up->port.icount.dsr++;
        }
 
-       wake_up_interruptible(&up->port.info->delta_msr_wait);
+       wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 
 static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
@@ -429,7 +429,7 @@ static void sunsab_tx_idle(struct uart_sunsab_port *up)
 static void sunsab_start_tx(struct uart_port *port)
 {
        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int i;
 
        up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR);
index 47c6837..68d262b 100644 (file)
@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch, flag;
        int max_count = 256;
        int saw_console_brk = 0;
@@ -389,7 +389,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 
 static void transmit_chars(struct uart_sunsu_port *up)
 {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
 
        if (up->port.x_char) {
@@ -441,7 +441,7 @@ static void check_modem_status(struct uart_sunsu_port *up)
        if (status & UART_MSR_DCTS)
                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
 
-       wake_up_interruptible(&up->port.info->delta_msr_wait);
+       wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 
 static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id)
index e09d3ce..ef693ae 100644 (file)
@@ -328,9 +328,9 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
        unsigned char ch, r1, flag;
 
        tty = NULL;
-       if (up->port.info != NULL &&            /* Unopened serial console */
-           up->port.info->port.tty != NULL)    /* Keyboard || mouse */
-               tty = up->port.info->port.tty;
+       if (up->port.state != NULL &&           /* Unopened serial console */
+           up->port.state->port.tty != NULL)   /* Keyboard || mouse */
+               tty = up->port.state->port.tty;
 
        for (;;) {
 
@@ -451,7 +451,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
                        uart_handle_cts_change(&up->port,
                                               (status & CTS));
 
-               wake_up_interruptible(&up->port.info->delta_msr_wait);
+               wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
 
        up->prev_status = status;
@@ -501,9 +501,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
                return;
        }
 
-       if (up->port.info == NULL)
+       if (up->port.state == NULL)
                goto ack_tx_int;
-       xmit = &up->port.info->xmit;
+       xmit = &up->port.state->xmit;
        if (uart_circ_empty(xmit))
                goto ack_tx_int;
 
@@ -705,7 +705,7 @@ static void sunzilog_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-               struct circ_buf *xmit = &port->info->xmit;
+               struct circ_buf *xmit = &port->state->xmit;
 
                writeb(xmit->buf[xmit->tail], &channel->data);
                ZSDELAY();
index 063a313..34b31da 100644 (file)
@@ -77,7 +77,7 @@ static void timbuart_flush_buffer(struct uart_port *port)
 
 static void timbuart_rx_chars(struct uart_port *port)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
 
        while (ioread32(port->membase + TIMBUART_ISR) & RXDP) {
                u8 ch = ioread8(port->membase + TIMBUART_RXFIFO);
@@ -86,7 +86,7 @@ static void timbuart_rx_chars(struct uart_port *port)
        }
 
        spin_unlock(&port->lock);
-       tty_flip_buffer_push(port->info->port.tty);
+       tty_flip_buffer_push(port->state->port.tty);
        spin_lock(&port->lock);
 
        dev_dbg(port->dev, "%s - total read %d bytes\n",
@@ -95,7 +95,7 @@ static void timbuart_rx_chars(struct uart_port *port)
 
 static void timbuart_tx_chars(struct uart_port *port)
 {
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        while (!(ioread32(port->membase + TIMBUART_ISR) & TXBF) &&
                !uart_circ_empty(xmit)) {
@@ -118,7 +118,7 @@ static void timbuart_handle_tx_port(struct uart_port *port, u32 isr, u32 *ier)
 {
        struct timbuart_port *uart =
                container_of(port, struct timbuart_port, port);
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        if (uart_circ_empty(xmit) || uart_tx_stopped(port))
                return;
@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct uart_port *port, u32 isr, u32 *ier)
                iowrite32(CTS_DELTA, port->membase + TIMBUART_ISR);
                cts = timbuart_get_mctrl(port);
                uart_handle_cts_change(port, cts & TIOCM_CTS);
-               wake_up_interruptible(&port->info->delta_msr_wait);
+               wake_up_interruptible(&port->state->port.delta_msr_wait);
        }
 
        *ier |= CTS_DELTA;
index 3317148..377f271 100644 (file)
@@ -75,7 +75,7 @@ static struct uart_port ulite_ports[ULITE_NR_UARTS];
 
 static int ulite_receive(struct uart_port *port, int stat)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        unsigned char ch = 0;
        char flag = TTY_NORMAL;
 
@@ -125,7 +125,7 @@ static int ulite_receive(struct uart_port *port, int stat)
 
 static int ulite_transmit(struct uart_port *port, int stat)
 {
-       struct circ_buf *xmit  = &port->info->xmit;
+       struct circ_buf *xmit  = &port->state->xmit;
 
        if (stat & ULITE_STATUS_TXFULL)
                return 0;
@@ -154,17 +154,22 @@ static int ulite_transmit(struct uart_port *port, int stat)
 static irqreturn_t ulite_isr(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       int busy;
+       int busy, n = 0;
 
        do {
                int stat = readb(port->membase + ULITE_STATUS);
                busy  = ulite_receive(port, stat);
                busy |= ulite_transmit(port, stat);
+               n++;
        } while (busy);
 
-       tty_flip_buffer_push(port->info->port.tty);
-
-       return IRQ_HANDLED;
+       /* work done? */
+       if (n > 1) {
+               tty_flip_buffer_push(port->state->port.tty);
+               return IRQ_HANDLED;
+       } else {
+               return IRQ_NONE;
+       }
 }
 
 static unsigned int ulite_tx_empty(struct uart_port *port)
@@ -221,7 +226,7 @@ static int ulite_startup(struct uart_port *port)
        int ret;
 
        ret = request_irq(port->irq, ulite_isr,
-                         IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "uartlite", port);
+                         IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
        if (ret)
                return ret;
 
index e945e78..0c08f28 100644 (file)
@@ -327,7 +327,7 @@ static int qe_uart_tx_pump(struct uart_qe_port *qe_port)
        unsigned char *p;
        unsigned int count;
        struct uart_port *port = &qe_port->port;
-       struct circ_buf *xmit = &port->info->xmit;
+       struct circ_buf *xmit = &port->state->xmit;
 
        bdp = qe_port->rx_cur;
 
@@ -466,7 +466,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
        int i;
        unsigned char ch, *cp;
        struct uart_port *port = &qe_port->port;
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        struct qe_bd *bdp;
        u16 status;
        unsigned int flg;
index dac550e..3beb6ab 100644 (file)
@@ -318,7 +318,7 @@ static inline void receive_chars(struct uart_port *port, uint8_t *status)
        char flag;
        int max_count = RX_MAX_COUNT;
 
-       tty = port->info->port.tty;
+       tty = port->state->port.tty;
        lsr = *status;
 
        do {
@@ -386,7 +386,7 @@ static inline void check_modem_status(struct uart_port *port)
        if (msr & UART_MSR_DCTS)
                uart_handle_cts_change(port, msr & UART_MSR_CTS);
 
-       wake_up_interruptible(&port->info->delta_msr_wait);
+       wake_up_interruptible(&port->state->port.delta_msr_wait);
 }
 
 static inline void transmit_chars(struct uart_port *port)
@@ -394,7 +394,7 @@ static inline void transmit_chars(struct uart_port *port)
        struct circ_buf *xmit;
        int max_count = TX_MAX_COUNT;
 
-       xmit = &port->info->xmit;
+       xmit = &port->state->xmit;
 
        if (port->x_char) {
                siu_write(port, UART_TX, port->x_char);
index d8c2809..1a7fd3e 100644 (file)
@@ -602,12 +602,12 @@ static void zs_receive_chars(struct zs_port *zport)
                uart_insert_char(uport, status, Rx_OVR, ch, flag);
        }
 
-       tty_flip_buffer_push(uport->info->port.tty);
+       tty_flip_buffer_push(uport->state->port.tty);
 }
 
 static void zs_raw_transmit_chars(struct zs_port *zport)
 {
-       struct circ_buf *xmit = &zport->port.info->xmit;
+       struct circ_buf *xmit = &zport->port.state->xmit;
 
        /* XON/XOFF chars.  */
        if (zport->port.x_char) {
@@ -686,7 +686,7 @@ static void zs_status_handle(struct zs_port *zport, struct zs_port *zport_a)
                        uport->icount.rng++;
 
                if (delta)
-                       wake_up_interruptible(&uport->info->delta_msr_wait);
+                       wake_up_interruptible(&uport->state->port.delta_msr_wait);
 
                spin_lock(&scc->zlock);
        }
index 2c733c2..4b6f7cb 100644 (file)
@@ -117,10 +117,11 @@ config SPI_GPIO
          speed with a custom version of this driver; see the source code.
 
 config SPI_IMX
-       tristate "Freescale iMX SPI controller"
-       depends on ARCH_MX1 && EXPERIMENTAL
+       tristate "Freescale i.MX SPI controllers"
+       depends on ARCH_MXC
+       select SPI_BITBANG
        help
-         This enables using the Freescale iMX SPI controller in master
+         This enables using the Freescale i.MX SPI controllers in master
          mode.
 
 config SPI_LM70_LLP
@@ -173,11 +174,21 @@ config SPI_PL022
        tristate "ARM AMBA PL022 SSP controller (EXPERIMENTAL)"
        depends on ARM_AMBA && EXPERIMENTAL
        default y if MACH_U300
+       default y if ARCH_REALVIEW
+       default y if INTEGRATOR_IMPD1
+       default y if ARCH_VERSATILE
        help
          This selects the ARM(R) AMBA(R) PrimeCell PL022 SSP
          controller. If you have an embedded system with an AMBA(R)
          bus and a PL022 controller, say Y or M here.
 
+config SPI_PPC4xx
+       tristate "PPC4xx SPI Controller"
+       depends on PPC32 && 4xx && SPI_MASTER
+       select SPI_BITBANG
+       help
+         This selects a driver for the PPC4xx SPI Controller.
+
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
        depends on ARCH_PXA && EXPERIMENTAL
@@ -211,6 +222,12 @@ config SPI_SH_SCI
        help
          SPI driver for SuperH SCI blocks.
 
+config SPI_STMP3XXX
+       tristate "Freescale STMP37xx/378x SPI/SSP controller"
+       depends on ARCH_STMP3XXX && SPI_MASTER
+       help
+         SPI driver for Freescale STMP37xx/378x SoC SSP interface
+
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
        depends on GENERIC_GPIO && CPU_TX49XX
index 3de408d..6d7a3f8 100644 (file)
@@ -17,7 +17,7 @@ obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
 obj-$(CONFIG_SPI_AU1550)               += au1550_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)            += spi_butterfly.o
 obj-$(CONFIG_SPI_GPIO)                 += spi_gpio.o
-obj-$(CONFIG_SPI_IMX)                  += spi_imx.o
+obj-$(CONFIG_SPI_IMX)                  += mxc_spi.o
 obj-$(CONFIG_SPI_LM70_LLP)             += spi_lm70llp.o
 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o
 obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
@@ -26,11 +26,13 @@ obj-$(CONFIG_SPI_ORION)                     += orion_spi.o
 obj-$(CONFIG_SPI_PL022)                        += amba-pl022.o
 obj-$(CONFIG_SPI_MPC52xx_PSC)          += mpc52xx_psc_spi.o
 obj-$(CONFIG_SPI_MPC8xxx)              += spi_mpc8xxx.o
+obj-$(CONFIG_SPI_PPC4xx)               += spi_ppc4xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)              += spi_s3c24xx.o
 obj-$(CONFIG_SPI_TXX9)                 += spi_txx9.o
 obj-$(CONFIG_SPI_XILINX)               += xilinx_spi.o
 obj-$(CONFIG_SPI_SH_SCI)               += spi_sh_sci.o
+obj-$(CONFIG_SPI_STMP3XXX)             += spi_stmp.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
new file mode 100644 (file)
index 0000000..b144723
--- /dev/null
@@ -0,0 +1,685 @@
+/*
+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2008 Juergen Beisert
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301, USA.
+ */
+
+#include <linux/clk.h>
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/types.h>
+
+#include <mach/spi.h>
+
+#define DRIVER_NAME "spi_imx"
+
+#define MXC_CSPIRXDATA         0x00
+#define MXC_CSPITXDATA         0x04
+#define MXC_CSPICTRL           0x08
+#define MXC_CSPIINT            0x0c
+#define MXC_RESET              0x1c
+
+/* generic defines to abstract from the different register layouts */
+#define MXC_INT_RR     (1 << 0) /* Receive data ready interrupt */
+#define MXC_INT_TE     (1 << 1) /* Transmit FIFO empty interrupt */
+
+struct mxc_spi_config {
+       unsigned int speed_hz;
+       unsigned int bpw;
+       unsigned int mode;
+       int cs;
+};
+
+struct mxc_spi_data {
+       struct spi_bitbang bitbang;
+
+       struct completion xfer_done;
+       void *base;
+       int irq;
+       struct clk *clk;
+       unsigned long spi_clk;
+       int *chipselect;
+
+       unsigned int count;
+       void (*tx)(struct mxc_spi_data *);
+       void (*rx)(struct mxc_spi_data *);
+       void *rx_buf;
+       const void *tx_buf;
+       unsigned int txfifo; /* number of words pushed in tx FIFO */
+
+       /* SoC specific functions */
+       void (*intctrl)(struct mxc_spi_data *, int);
+       int (*config)(struct mxc_spi_data *, struct mxc_spi_config *);
+       void (*trigger)(struct mxc_spi_data *);
+       int (*rx_available)(struct mxc_spi_data *);
+};
+
+#define MXC_SPI_BUF_RX(type)                                           \
+static void mxc_spi_buf_rx_##type(struct mxc_spi_data *mxc_spi)                \
+{                                                                      \
+       unsigned int val = readl(mxc_spi->base + MXC_CSPIRXDATA);       \
+                                                                       \
+       if (mxc_spi->rx_buf) {                                          \
+               *(type *)mxc_spi->rx_buf = val;                         \
+               mxc_spi->rx_buf += sizeof(type);                        \
+       }                                                               \
+}
+
+#define MXC_SPI_BUF_TX(type)                                           \
+static void mxc_spi_buf_tx_##type(struct mxc_spi_data *mxc_spi)                \
+{                                                                      \
+       type val = 0;                                                   \
+                                                                       \
+       if (mxc_spi->tx_buf) {                                          \
+               val = *(type *)mxc_spi->tx_buf;                         \
+               mxc_spi->tx_buf += sizeof(type);                        \
+       }                                                               \
+                                                                       \
+       mxc_spi->count -= sizeof(type);                                 \
+                                                                       \
+       writel(val, mxc_spi->base + MXC_CSPITXDATA);                    \
+}
+
+MXC_SPI_BUF_RX(u8)
+MXC_SPI_BUF_TX(u8)
+MXC_SPI_BUF_RX(u16)
+MXC_SPI_BUF_TX(u16)
+MXC_SPI_BUF_RX(u32)
+MXC_SPI_BUF_TX(u32)
+
+/* First entry is reserved, second entry is valid only if SDHC_SPIEN is set
+ * (which is currently not the case in this driver)
+ */
+static int mxc_clkdivs[] = {0, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192,
+       256, 384, 512, 768, 1024};
+
+/* MX21, MX27 */
+static unsigned int mxc_spi_clkdiv_1(unsigned int fin,
+               unsigned int fspi)
+{
+       int i, max;
+
+       if (cpu_is_mx21())
+               max = 18;
+       else
+               max = 16;
+
+       for (i = 2; i < max; i++)
+               if (fspi * mxc_clkdivs[i] >= fin)
+                       return i;
+
+       return max;
+}
+
+/* MX1, MX31, MX35 */
+static unsigned int mxc_spi_clkdiv_2(unsigned int fin,
+               unsigned int fspi)
+{
+       int i, div = 4;
+
+       for (i = 0; i < 7; i++) {
+               if (fspi * div >= fin)
+                       return i;
+               div <<= 1;
+       }
+
+       return 7;
+}
+
+#define MX31_INTREG_TEEN       (1 << 0)
+#define MX31_INTREG_RREN       (1 << 3)
+
+#define MX31_CSPICTRL_ENABLE   (1 << 0)
+#define MX31_CSPICTRL_MASTER   (1 << 1)
+#define MX31_CSPICTRL_XCH      (1 << 2)
+#define MX31_CSPICTRL_POL      (1 << 4)
+#define MX31_CSPICTRL_PHA      (1 << 5)
+#define MX31_CSPICTRL_SSCTL    (1 << 6)
+#define MX31_CSPICTRL_SSPOL    (1 << 7)
+#define MX31_CSPICTRL_BC_SHIFT 8
+#define MX35_CSPICTRL_BL_SHIFT 20
+#define MX31_CSPICTRL_CS_SHIFT 24
+#define MX35_CSPICTRL_CS_SHIFT 12
+#define MX31_CSPICTRL_DR_SHIFT 16
+
+#define MX31_CSPISTATUS                0x14
+#define MX31_STATUS_RR         (1 << 3)
+
+/* These functions also work for the i.MX35, but be aware that
+ * the i.MX35 has a slightly different register layout for bits
+ * we do not use here.
+ */
+static void mx31_intctrl(struct mxc_spi_data *mxc_spi, int enable)
+{
+       unsigned int val = 0;
+
+       if (enable & MXC_INT_TE)
+               val |= MX31_INTREG_TEEN;
+       if (enable & MXC_INT_RR)
+               val |= MX31_INTREG_RREN;
+
+       writel(val, mxc_spi->base + MXC_CSPIINT);
+}
+
+static void mx31_trigger(struct mxc_spi_data *mxc_spi)
+{
+       unsigned int reg;
+
+       reg = readl(mxc_spi->base + MXC_CSPICTRL);
+       reg |= MX31_CSPICTRL_XCH;
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+}
+
+static int mx31_config(struct mxc_spi_data *mxc_spi,
+               struct mxc_spi_config *config)
+{
+       unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_MASTER;
+
+       reg |= mxc_spi_clkdiv_2(mxc_spi->spi_clk, config->speed_hz) <<
+               MX31_CSPICTRL_DR_SHIFT;
+
+       if (cpu_is_mx31())
+               reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT;
+       else if (cpu_is_mx35()) {
+               reg |= (config->bpw - 1) << MX35_CSPICTRL_BL_SHIFT;
+               reg |= MX31_CSPICTRL_SSCTL;
+       }
+
+       if (config->mode & SPI_CPHA)
+               reg |= MX31_CSPICTRL_PHA;
+       if (config->mode & SPI_CPOL)
+               reg |= MX31_CSPICTRL_POL;
+       if (config->mode & SPI_CS_HIGH)
+               reg |= MX31_CSPICTRL_SSPOL;
+       if (config->cs < 0) {
+               if (cpu_is_mx31())
+                       reg |= (config->cs + 32) << MX31_CSPICTRL_CS_SHIFT;
+               else if (cpu_is_mx35())
+                       reg |= (config->cs + 32) << MX35_CSPICTRL_CS_SHIFT;
+       }
+
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+
+       return 0;
+}
+
+static int mx31_rx_available(struct mxc_spi_data *mxc_spi)
+{
+       return readl(mxc_spi->base + MX31_CSPISTATUS) & MX31_STATUS_RR;
+}
+
+#define MX27_INTREG_RR         (1 << 4)
+#define MX27_INTREG_TEEN       (1 << 9)
+#define MX27_INTREG_RREN       (1 << 13)
+
+#define MX27_CSPICTRL_POL      (1 << 5)
+#define MX27_CSPICTRL_PHA      (1 << 6)
+#define MX27_CSPICTRL_SSPOL    (1 << 8)
+#define MX27_CSPICTRL_XCH      (1 << 9)
+#define MX27_CSPICTRL_ENABLE   (1 << 10)
+#define MX27_CSPICTRL_MASTER   (1 << 11)
+#define MX27_CSPICTRL_DR_SHIFT 14
+#define MX27_CSPICTRL_CS_SHIFT 19
+
+static void mx27_intctrl(struct mxc_spi_data *mxc_spi, int enable)
+{
+       unsigned int val = 0;
+
+       if (enable & MXC_INT_TE)
+               val |= MX27_INTREG_TEEN;
+       if (enable & MXC_INT_RR)
+               val |= MX27_INTREG_RREN;
+
+       writel(val, mxc_spi->base + MXC_CSPIINT);
+}
+
+static void mx27_trigger(struct mxc_spi_data *mxc_spi)
+{
+       unsigned int reg;
+
+       reg = readl(mxc_spi->base + MXC_CSPICTRL);
+       reg |= MX27_CSPICTRL_XCH;
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+}
+
+static int mx27_config(struct mxc_spi_data *mxc_spi,
+               struct mxc_spi_config *config)
+{
+       unsigned int reg = MX27_CSPICTRL_ENABLE | MX27_CSPICTRL_MASTER;
+
+       reg |= mxc_spi_clkdiv_1(mxc_spi->spi_clk, config->speed_hz) <<
+               MX27_CSPICTRL_DR_SHIFT;
+       reg |= config->bpw - 1;
+
+       if (config->mode & SPI_CPHA)
+               reg |= MX27_CSPICTRL_PHA;
+       if (config->mode & SPI_CPOL)
+               reg |= MX27_CSPICTRL_POL;
+       if (config->mode & SPI_CS_HIGH)
+               reg |= MX27_CSPICTRL_SSPOL;
+       if (config->cs < 0)
+               reg |= (config->cs + 32) << MX27_CSPICTRL_CS_SHIFT;
+
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+
+       return 0;
+}
+
+static int mx27_rx_available(struct mxc_spi_data *mxc_spi)
+{
+       return readl(mxc_spi->base + MXC_CSPIINT) & MX27_INTREG_RR;
+}
+
+#define MX1_INTREG_RR          (1 << 3)
+#define MX1_INTREG_TEEN                (1 << 8)
+#define MX1_INTREG_RREN                (1 << 11)
+
+#define MX1_CSPICTRL_POL       (1 << 4)
+#define MX1_CSPICTRL_PHA       (1 << 5)
+#define MX1_CSPICTRL_XCH       (1 << 8)
+#define MX1_CSPICTRL_ENABLE    (1 << 9)
+#define MX1_CSPICTRL_MASTER    (1 << 10)
+#define MX1_CSPICTRL_DR_SHIFT  13
+
+static void mx1_intctrl(struct mxc_spi_data *mxc_spi, int enable)
+{
+       unsigned int val = 0;
+
+       if (enable & MXC_INT_TE)
+               val |= MX1_INTREG_TEEN;
+       if (enable & MXC_INT_RR)
+               val |= MX1_INTREG_RREN;
+
+       writel(val, mxc_spi->base + MXC_CSPIINT);
+}
+
+static void mx1_trigger(struct mxc_spi_data *mxc_spi)
+{
+       unsigned int reg;
+
+       reg = readl(mxc_spi->base + MXC_CSPICTRL);
+       reg |= MX1_CSPICTRL_XCH;
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+}
+
+static int mx1_config(struct mxc_spi_data *mxc_spi,
+               struct mxc_spi_config *config)
+{
+       unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_MASTER;
+
+       reg |= mxc_spi_clkdiv_2(mxc_spi->spi_clk, config->speed_hz) <<
+               MX1_CSPICTRL_DR_SHIFT;
+       reg |= config->bpw - 1;
+
+       if (config->mode & SPI_CPHA)
+               reg |= MX1_CSPICTRL_PHA;
+       if (config->mode & SPI_CPOL)
+               reg |= MX1_CSPICTRL_POL;
+
+       writel(reg, mxc_spi->base + MXC_CSPICTRL);
+
+       return 0;
+}
+
+static int mx1_rx_available(struct mxc_spi_data *mxc_spi)
+{
+       return readl(mxc_spi->base + MXC_CSPIINT) & MX1_INTREG_RR;
+}
+
+static void mxc_spi_chipselect(struct spi_device *spi, int is_active)
+{
+       struct mxc_spi_data *mxc_spi = spi_master_get_devdata(spi->master);
+       unsigned int cs = 0;
+       int gpio = mxc_spi->chipselect[spi->chip_select];
+       struct mxc_spi_config config;
+
+       if (spi->mode & SPI_CS_HIGH)
+               cs = 1;
+
+       if (is_active == BITBANG_CS_INACTIVE) {
+               if (gpio >= 0)
+                       gpio_set_value(gpio, !cs);
+               return;
+       }
+
+       config.bpw = spi->bits_per_word;
+       config.speed_hz = spi->max_speed_hz;
+       config.mode = spi->mode;
+       config.cs = mxc_spi->chipselect[spi->chip_select];
+
+       mxc_spi->config(mxc_spi, &config);
+
+       /* Initialize the functions for transfer */
+       if (config.bpw <= 8) {
+               mxc_spi->rx = mxc_spi_buf_rx_u8;
+               mxc_spi->tx = mxc_spi_buf_tx_u8;
+       } else if (config.bpw <= 16) {
+               mxc_spi->rx = mxc_spi_buf_rx_u16;
+               mxc_spi->tx = mxc_spi_buf_tx_u16;
+       } else if (config.bpw <= 32) {
+               mxc_spi->rx = mxc_spi_buf_rx_u32;
+               mxc_spi->tx = mxc_spi_buf_tx_u32;
+       } else
+               BUG();
+
+       if (gpio >= 0)
+               gpio_set_value(gpio, cs);
+
+       return;
+}
+
+static void mxc_spi_push(struct mxc_spi_data *mxc_spi)
+{
+       while (mxc_spi->txfifo < 8) {
+               if (!mxc_spi->count)
+                       break;
+               mxc_spi->tx(mxc_spi);
+               mxc_spi->txfifo++;
+       }
+
+       mxc_spi->trigger(mxc_spi);
+}
+
+static irqreturn_t mxc_spi_isr(int irq, void *dev_id)
+{
+       struct mxc_spi_data *mxc_spi = dev_id;
+
+       while (mxc_spi->rx_available(mxc_spi)) {
+               mxc_spi->rx(mxc_spi);
+               mxc_spi->txfifo--;
+       }
+
+       if (mxc_spi->count) {
+               mxc_spi_push(mxc_spi);
+               return IRQ_HANDLED;
+       }
+
+       if (mxc_spi->txfifo) {
+               /* No data left to push, but still waiting for rx data,
+                * enable receive data available interrupt.
+                */
+               mxc_spi->intctrl(mxc_spi, MXC_INT_RR);
+               return IRQ_HANDLED;
+       }
+
+       mxc_spi->intctrl(mxc_spi, 0);
+       complete(&mxc_spi->xfer_done);
+
+       return IRQ_HANDLED;
+}
+
+static int mxc_spi_setupxfer(struct spi_device *spi,
+                                struct spi_transfer *t)
+{
+       struct mxc_spi_data *mxc_spi = spi_master_get_devdata(spi->master);
+       struct mxc_spi_config config;
+
+       config.bpw = t ? t->bits_per_word : spi->bits_per_word;
+       config.speed_hz  = t ? t->speed_hz : spi->max_speed_hz;
+       config.mode = spi->mode;
+
+       mxc_spi->config(mxc_spi, &config);
+
+       return 0;
+}
+
+static int mxc_spi_transfer(struct spi_device *spi,
+                               struct spi_transfer *transfer)
+{
+       struct mxc_spi_data *mxc_spi = spi_master_get_devdata(spi->master);
+
+       mxc_spi->tx_buf = transfer->tx_buf;
+       mxc_spi->rx_buf = transfer->rx_buf;
+       mxc_spi->count = transfer->len;
+       mxc_spi->txfifo = 0;
+
+       init_completion(&mxc_spi->xfer_done);
+
+       mxc_spi_push(mxc_spi);
+
+       mxc_spi->intctrl(mxc_spi, MXC_INT_TE);
+
+       wait_for_completion(&mxc_spi->xfer_done);
+
+       return transfer->len;
+}
+
+static int mxc_spi_setup(struct spi_device *spi)
+{
+       if (!spi->bits_per_word)
+               spi->bits_per_word = 8;
+
+       pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__,
+                spi->mode, spi->bits_per_word, spi->max_speed_hz);
+
+       mxc_spi_chipselect(spi, BITBANG_CS_INACTIVE);
+
+       return 0;
+}
+
+static void mxc_spi_cleanup(struct spi_device *spi)
+{
+}
+
+static int __init mxc_spi_probe(struct platform_device *pdev)
+{
+       struct spi_imx_master *mxc_platform_info;
+       struct spi_master *master;
+       struct mxc_spi_data *mxc_spi;
+       struct resource *res;
+       int i, ret;
+
+       mxc_platform_info = (struct spi_imx_master *)pdev->dev.platform_data;
+       if (!mxc_platform_info) {
+               dev_err(&pdev->dev, "can't get the platform data\n");
+               return -EINVAL;
+       }
+
+       master = spi_alloc_master(&pdev->dev, sizeof(struct mxc_spi_data));
+       if (!master)
+               return -ENOMEM;
+
+       platform_set_drvdata(pdev, master);
+
+       master->bus_num = pdev->id;
+       master->num_chipselect = mxc_platform_info->num_chipselect;
+
+       mxc_spi = spi_master_get_devdata(master);
+       mxc_spi->bitbang.master = spi_master_get(master);
+       mxc_spi->chipselect = mxc_platform_info->chipselect;
+
+       for (i = 0; i < master->num_chipselect; i++) {
+               if (mxc_spi->chipselect[i] < 0)
+                       continue;
+               ret = gpio_request(mxc_spi->chipselect[i], DRIVER_NAME);
+               if (ret) {
+                       i--;
+                       while (i > 0)
+                               if (mxc_spi->chipselect[i] >= 0)
+                                       gpio_free(mxc_spi->chipselect[i--]);
+                       dev_err(&pdev->dev, "can't get cs gpios");
+                       goto out_master_put;
+               }
+               gpio_direction_output(mxc_spi->chipselect[i], 1);
+       }
+
+       mxc_spi->bitbang.chipselect = mxc_spi_chipselect;
+       mxc_spi->bitbang.setup_transfer = mxc_spi_setupxfer;
+       mxc_spi->bitbang.txrx_bufs = mxc_spi_transfer;
+       mxc_spi->bitbang.master->setup = mxc_spi_setup;
+       mxc_spi->bitbang.master->cleanup = mxc_spi_cleanup;
+
+       init_completion(&mxc_spi->xfer_done);
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&pdev->dev, "can't get platform resource\n");
+               ret = -ENOMEM;
+               goto out_gpio_free;
+       }
+
+       if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
+               dev_err(&pdev->dev, "request_mem_region failed\n");
+               ret = -EBUSY;
+               goto out_gpio_free;
+       }
+
+       mxc_spi->base = ioremap(res->start, resource_size(res));
+       if (!mxc_spi->base) {
+               ret = -EINVAL;
+               goto out_release_mem;
+       }
+
+       mxc_spi->irq = platform_get_irq(pdev, 0);
+       if (!mxc_spi->irq) {
+               ret = -EINVAL;
+               goto out_iounmap;
+       }
+
+       ret = request_irq(mxc_spi->irq, mxc_spi_isr, 0, DRIVER_NAME, mxc_spi);
+       if (ret) {
+               dev_err(&pdev->dev, "can't get irq%d: %d\n", mxc_spi->irq, ret);
+               goto out_iounmap;
+       }
+
+       if (cpu_is_mx31() || cpu_is_mx35()) {
+               mxc_spi->intctrl = mx31_intctrl;
+               mxc_spi->config = mx31_config;
+               mxc_spi->trigger = mx31_trigger;
+               mxc_spi->rx_available = mx31_rx_available;
+       } else  if (cpu_is_mx27() || cpu_is_mx21()) {
+               mxc_spi->intctrl = mx27_intctrl;
+               mxc_spi->config = mx27_config;
+               mxc_spi->trigger = mx27_trigger;
+               mxc_spi->rx_available = mx27_rx_available;
+       } else if (cpu_is_mx1()) {
+               mxc_spi->intctrl = mx1_intctrl;
+               mxc_spi->config = mx1_config;
+               mxc_spi->trigger = mx1_trigger;
+               mxc_spi->rx_available = mx1_rx_available;
+       } else
+               BUG();
+
+       mxc_spi->clk = clk_get(&pdev->dev, NULL);
+       if (IS_ERR(mxc_spi->clk)) {
+               dev_err(&pdev->dev, "unable to get clock\n");
+               ret = PTR_ERR(mxc_spi->clk);
+               goto out_free_irq;
+       }
+
+       clk_enable(mxc_spi->clk);
+       mxc_spi->spi_clk = clk_get_rate(mxc_spi->clk);
+
+       if (!cpu_is_mx31() || !cpu_is_mx35())
+               writel(1, mxc_spi->base + MXC_RESET);
+
+       mxc_spi->intctrl(mxc_spi, 0);
+
+       ret = spi_bitbang_start(&mxc_spi->bitbang);
+       if (ret) {
+               dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
+               goto out_clk_put;
+       }
+
+       dev_info(&pdev->dev, "probed\n");
+
+       return ret;
+
+out_clk_put:
+       clk_disable(mxc_spi->clk);
+       clk_put(mxc_spi->clk);
+out_free_irq:
+       free_irq(mxc_spi->irq, mxc_spi);
+out_iounmap:
+       iounmap(mxc_spi->base);
+out_release_mem:
+       release_mem_region(res->start, resource_size(res));
+out_gpio_free:
+       for (i = 0; i < master->num_chipselect; i++)
+               if (mxc_spi->chipselect[i] >= 0)
+                       gpio_free(mxc_spi->chipselect[i]);
+out_master_put:
+       spi_master_put(master);
+       kfree(master);
+       platform_set_drvdata(pdev, NULL);
+       return ret;
+}
+
+static int __exit mxc_spi_remove(struct platform_device *pdev)
+{
+       struct spi_master *master = platform_get_drvdata(pdev);
+       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct mxc_spi_data *mxc_spi = spi_master_get_devdata(master);
+       int i;
+
+       spi_bitbang_stop(&mxc_spi->bitbang);
+
+       writel(0, mxc_spi->base + MXC_CSPICTRL);
+       clk_disable(mxc_spi->clk);
+       clk_put(mxc_spi->clk);
+       free_irq(mxc_spi->irq, mxc_spi);
+       iounmap(mxc_spi->base);
+
+       for (i = 0; i < master->num_chipselect; i++)
+               if (mxc_spi->chipselect[i] >= 0)
+                       gpio_free(mxc_spi->chipselect[i]);
+
+       spi_master_put(master);
+
+       release_mem_region(res->start, resource_size(res));
+
+       platform_set_drvdata(pdev, NULL);
+
+       return 0;
+}
+
+static struct platform_driver mxc_spi_driver = {
+       .driver = {
+                  .name = DRIVER_NAME,
+                  .owner = THIS_MODULE,
+                  },
+       .probe = mxc_spi_probe,
+       .remove = __exit_p(mxc_spi_remove),
+};
+
+static int __init mxc_spi_init(void)
+{
+       return platform_driver_register(&mxc_spi_driver);
+}
+
+static void __exit mxc_spi_exit(void)
+{
+       platform_driver_unregister(&mxc_spi_driver);
+}
+
+module_init(mxc_spi_init);
+module_exit(mxc_spi_exit);
+
+MODULE_DESCRIPTION("SPI Master Controller driver");
+MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+MODULE_LICENSE("GPL");
index 9b80ad3..ba1a872 100644 (file)
@@ -41,6 +41,9 @@
 
 #define OMAP2_MCSPI_MAX_FREQ           48000000
 
+/* OMAP2 has 3 SPI controllers, while OMAP3 has 4 */
+#define OMAP2_MCSPI_MAX_CTRL           4
+
 #define OMAP2_MCSPI_REVISION           0x00
 #define OMAP2_MCSPI_SYSCONFIG          0x10
 #define OMAP2_MCSPI_SYSSTATUS          0x14
 
 /* per-register bitmasks: */
 
-#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE        (2 << 3)
-#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP        (1 << 2)
-#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE (1 << 0)
-#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET        (1 << 1)
+#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE        BIT(4)
+#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP        BIT(2)
+#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE BIT(0)
+#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET        BIT(1)
 
-#define OMAP2_MCSPI_SYSSTATUS_RESETDONE        (1 << 0)
+#define OMAP2_MCSPI_SYSSTATUS_RESETDONE        BIT(0)
 
-#define OMAP2_MCSPI_MODULCTRL_SINGLE   (1 << 0)
-#define OMAP2_MCSPI_MODULCTRL_MS       (1 << 2)
-#define OMAP2_MCSPI_MODULCTRL_STEST    (1 << 3)
+#define OMAP2_MCSPI_MODULCTRL_SINGLE   BIT(0)
+#define OMAP2_MCSPI_MODULCTRL_MS       BIT(2)
+#define OMAP2_MCSPI_MODULCTRL_STEST    BIT(3)
 
-#define OMAP2_MCSPI_CHCONF_PHA         (1 << 0)
-#define OMAP2_MCSPI_CHCONF_POL         (1 << 1)
+#define OMAP2_MCSPI_CHCONF_PHA         BIT(0)
+#define OMAP2_MCSPI_CHCONF_POL         BIT(1)
 #define OMAP2_MCSPI_CHCONF_CLKD_MASK   (0x0f << 2)
-#define OMAP2_MCSPI_CHCONF_EPOL                (1 << 6)
+#define OMAP2_MCSPI_CHCONF_EPOL                BIT(6)
 #define OMAP2_MCSPI_CHCONF_WL_MASK     (0x1f << 7)
-#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY (0x01 << 12)
-#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY (0x02 << 12)
+#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY BIT(12)
+#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY BIT(13)
 #define OMAP2_MCSPI_CHCONF_TRM_MASK    (0x03 << 12)
-#define OMAP2_MCSPI_CHCONF_DMAW                (1 << 14)
-#define OMAP2_MCSPI_CHCONF_DMAR                (1 << 15)
-#define OMAP2_MCSPI_CHCONF_DPE0                (1 << 16)
-#define OMAP2_MCSPI_CHCONF_DPE1                (1 << 17)
-#define OMAP2_MCSPI_CHCONF_IS          (1 << 18)
-#define OMAP2_MCSPI_CHCONF_TURBO       (1 << 19)
-#define OMAP2_MCSPI_CHCONF_FORCE       (1 << 20)
+#define OMAP2_MCSPI_CHCONF_DMAW                BIT(14)
+#define OMAP2_MCSPI_CHCONF_DMAR                BIT(15)
+#define OMAP2_MCSPI_CHCONF_DPE0                BIT(16)
+#define OMAP2_MCSPI_CHCONF_DPE1                BIT(17)
+#define OMAP2_MCSPI_CHCONF_IS          BIT(18)
+#define OMAP2_MCSPI_CHCONF_TURBO       BIT(19)
+#define OMAP2_MCSPI_CHCONF_FORCE       BIT(20)
 
-#define OMAP2_MCSPI_CHSTAT_RXS         (1 << 0)
-#define OMAP2_MCSPI_CHSTAT_TXS         (1 << 1)
-#define OMAP2_MCSPI_CHSTAT_EOT         (1 << 2)
+#define OMAP2_MCSPI_CHSTAT_RXS         BIT(0)
+#define OMAP2_MCSPI_CHSTAT_TXS         BIT(1)
+#define OMAP2_MCSPI_CHSTAT_EOT         BIT(2)
 
-#define OMAP2_MCSPI_CHCTRL_EN          (1 << 0)
+#define OMAP2_MCSPI_CHCTRL_EN          BIT(0)
 
-#define OMAP2_MCSPI_WAKEUPENABLE_WKEN  (1 << 0)
+#define OMAP2_MCSPI_WAKEUPENABLE_WKEN  BIT(0)
 
 /* We have 2 DMA channels per CS, one for RX and one for TX */
 struct omap2_mcspi_dma {
@@ -131,8 +134,23 @@ struct omap2_mcspi_cs {
        void __iomem            *base;
        unsigned long           phys;
        int                     word_len;
+       struct list_head        node;
+       /* Context save and restore shadow register */
+       u32                     chconf0;
+};
+
+/* used for context save and restore, structure members to be updated whenever
+ * corresponding registers are modified.
+ */
+struct omap2_mcspi_regs {
+       u32 sysconfig;
+       u32 modulctrl;
+       u32 wakeupenable;
+       struct list_head cs;
 };
 
+static struct omap2_mcspi_regs omap2_mcspi_ctx[OMAP2_MCSPI_MAX_CTRL];
+
 static struct workqueue_struct *omap2_mcspi_wq;
 
 #define MOD_REG_BIT(val, mask, set) do { \
@@ -172,12 +190,27 @@ static inline u32 mcspi_read_cs_reg(const struct spi_device *spi, int idx)
        return __raw_readl(cs->base + idx);
 }
 
+static inline u32 mcspi_cached_chconf0(const struct spi_device *spi)
+{
+       struct omap2_mcspi_cs *cs = spi->controller_state;
+
+       return cs->chconf0;
+}
+
+static inline void mcspi_write_chconf0(const struct spi_device *spi, u32 val)
+{
+       struct omap2_mcspi_cs *cs = spi->controller_state;
+
+       cs->chconf0 = val;
+       mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val);
+}
+
 static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
                int is_read, int enable)
 {
        u32 l, rw;
 
-       l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+       l = mcspi_cached_chconf0(spi);
 
        if (is_read) /* 1 is read, 0 write */
                rw = OMAP2_MCSPI_CHCONF_DMAR;
@@ -185,7 +218,7 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
                rw = OMAP2_MCSPI_CHCONF_DMAW;
 
        MOD_REG_BIT(l, rw, enable);
-       mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+       mcspi_write_chconf0(spi, l);
 }
 
 static void omap2_mcspi_set_enable(const struct spi_device *spi, int enable)
@@ -200,9 +233,9 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
 {
        u32 l;
 
-       l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+       l = mcspi_cached_chconf0(spi);
        MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
-       mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+       mcspi_write_chconf0(spi, l);
 }
 
 static void omap2_mcspi_set_master_mode(struct spi_master *master)
@@ -217,6 +250,46 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
        MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
        MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
        mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);
+
+       omap2_mcspi_ctx[master->bus_num - 1].modulctrl = l;
+}
+
+static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
+{
+       struct spi_master *spi_cntrl;
+       struct omap2_mcspi_cs *cs;
+       spi_cntrl = mcspi->master;
+
+       /* McSPI: context restore */
+       mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_MODULCTRL,
+                       omap2_mcspi_ctx[spi_cntrl->bus_num - 1].modulctrl);
+
+       mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_SYSCONFIG,
+                       omap2_mcspi_ctx[spi_cntrl->bus_num - 1].sysconfig);
+
+       mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_WAKEUPENABLE,
+                       omap2_mcspi_ctx[spi_cntrl->bus_num - 1].wakeupenable);
+
+       list_for_each_entry(cs, &omap2_mcspi_ctx[spi_cntrl->bus_num - 1].cs,
+                       node)
+               __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+}
+static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
+{
+       clk_disable(mcspi->ick);
+       clk_disable(mcspi->fck);
+}
+
+static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
+{
+       if (clk_enable(mcspi->ick))
+               return -ENODEV;
+       if (clk_enable(mcspi->fck))
+               return -ENODEV;
+
+       omap2_mcspi_restore_ctx(mcspi);
+
+       return 0;
 }
 
 static unsigned
@@ -357,7 +430,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
        c = count;
        word_len = cs->word_len;
 
-       l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+       l = mcspi_cached_chconf0(spi);
        l &= ~OMAP2_MCSPI_CHCONF_TRM_MASK;
 
        /* We store the pre-calculated register addresses on stack to speed
@@ -397,8 +470,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 * more word i/o: switch to rx+tx
                                 */
                                if (c == 0 && tx == NULL)
-                                       mcspi_write_cs_reg(spi,
-                                                       OMAP2_MCSPI_CHCONF0, l);
+                                       mcspi_write_chconf0(spi, l);
                                *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                dev_dbg(&spi->dev, "read-%d %02x\n",
@@ -436,8 +508,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 * more word i/o: switch to rx+tx
                                 */
                                if (c == 0 && tx == NULL)
-                                       mcspi_write_cs_reg(spi,
-                                                       OMAP2_MCSPI_CHCONF0, l);
+                                       mcspi_write_chconf0(spi, l);
                                *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                dev_dbg(&spi->dev, "read-%d %04x\n",
@@ -475,8 +546,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 * more word i/o: switch to rx+tx
                                 */
                                if (c == 0 && tx == NULL)
-                                       mcspi_write_cs_reg(spi,
-                                                       OMAP2_MCSPI_CHCONF0, l);
+                                       mcspi_write_chconf0(spi, l);
                                *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                dev_dbg(&spi->dev, "read-%d %04x\n",
@@ -505,10 +575,12 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 {
        struct omap2_mcspi_cs *cs = spi->controller_state;
        struct omap2_mcspi *mcspi;
+       struct spi_master *spi_cntrl;
        u32 l = 0, div = 0;
        u8 word_len = spi->bits_per_word;
 
        mcspi = spi_master_get_devdata(spi->master);
+       spi_cntrl = mcspi->master;
 
        if (t != NULL && t->bits_per_word)
                word_len = t->bits_per_word;
@@ -522,7 +594,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
        } else
                div = 15;
 
-       l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+       l = mcspi_cached_chconf0(spi);
 
        /* standard 4-wire master mode:  SCK, MOSI/out, MISO/in, nCS
         * REVISIT: this controller could support SPI_3WIRE mode.
@@ -554,7 +626,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
        else
                l &= ~OMAP2_MCSPI_CHCONF_PHA;
 
-       mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+       mcspi_write_chconf0(spi, l);
 
        dev_dbg(&spi->dev, "setup: speed %d, sample %s edge, clk %s\n",
                        OMAP2_MCSPI_MAX_FREQ / (1 << div),
@@ -647,7 +719,11 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                        return -ENOMEM;
                cs->base = mcspi->base + spi->chip_select * 0x14;
                cs->phys = mcspi->phys + spi->chip_select * 0x14;
+               cs->chconf0 = 0;
                spi->controller_state = cs;
+               /* Link this to context save list */
+               list_add_tail(&cs->node,
+                       &omap2_mcspi_ctx[mcspi->master->bus_num - 1].cs);
        }
 
        if (mcspi_dma->dma_rx_channel == -1
@@ -657,11 +733,11 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                        return ret;
        }
 
-       clk_enable(mcspi->ick);
-       clk_enable(mcspi->fck);
+       if (omap2_mcspi_enable_clocks(mcspi))
+               return -ENODEV;
+
        ret = omap2_mcspi_setup_transfer(spi, NULL);
-       clk_disable(mcspi->fck);
-       clk_disable(mcspi->ick);
+       omap2_mcspi_disable_clocks(mcspi);
 
        return ret;
 }
@@ -670,10 +746,15 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
 {
        struct omap2_mcspi      *mcspi;
        struct omap2_mcspi_dma  *mcspi_dma;
+       struct omap2_mcspi_cs   *cs;
 
        mcspi = spi_master_get_devdata(spi->master);
        mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
+       /* Unlink controller state from context save list */
+       cs = spi->controller_state;
+       list_del(&cs->node);
+
        kfree(spi->controller_state);
 
        if (mcspi_dma->dma_rx_channel != -1) {
@@ -693,8 +774,8 @@ static void omap2_mcspi_work(struct work_struct *work)
        mcspi = container_of(work, struct omap2_mcspi, work);
        spin_lock_irq(&mcspi->lock);
 
-       clk_enable(mcspi->ick);
-       clk_enable(mcspi->fck);
+       if (omap2_mcspi_enable_clocks(mcspi))
+               goto out;
 
        /* We only enable one channel at a time -- the one whose message is
         * at the head of the queue -- although this controller would gladly
@@ -741,13 +822,13 @@ static void omap2_mcspi_work(struct work_struct *work)
                                cs_active = 1;
                        }
 
-                       chconf = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+                       chconf = mcspi_cached_chconf0(spi);
                        chconf &= ~OMAP2_MCSPI_CHCONF_TRM_MASK;
                        if (t->tx_buf == NULL)
                                chconf |= OMAP2_MCSPI_CHCONF_TRM_RX_ONLY;
                        else if (t->rx_buf == NULL)
                                chconf |= OMAP2_MCSPI_CHCONF_TRM_TX_ONLY;
-                       mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, chconf);
+                       mcspi_write_chconf0(spi, chconf);
 
                        if (t->len) {
                                unsigned        count;
@@ -796,9 +877,9 @@ static void omap2_mcspi_work(struct work_struct *work)
                spin_lock_irq(&mcspi->lock);
        }
 
-       clk_disable(mcspi->fck);
-       clk_disable(mcspi->ick);
+       omap2_mcspi_disable_clocks(mcspi);
 
+out:
        spin_unlock_irq(&mcspi->lock);
 }
 
@@ -885,8 +966,8 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
        struct spi_master       *master = mcspi->master;
        u32                     tmp;
 
-       clk_enable(mcspi->ick);
-       clk_enable(mcspi->fck);
+       if (omap2_mcspi_enable_clocks(mcspi))
+               return -1;
 
        mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
                        OMAP2_MCSPI_SYSCONFIG_SOFTRESET);
@@ -894,18 +975,18 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
                tmp = mcspi_read_reg(master, OMAP2_MCSPI_SYSSTATUS);
        } while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
 
-       mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
-                       OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
-                       OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
-                       OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
+       tmp = OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
+               OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
+               OMAP2_MCSPI_SYSCONFIG_SMARTIDLE;
+       mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG, tmp);
+       omap2_mcspi_ctx[master->bus_num - 1].sysconfig = tmp;
 
-       mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
-                       OMAP2_MCSPI_WAKEUPENABLE_WKEN);
+       tmp = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
+       mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE, tmp);
+       omap2_mcspi_ctx[master->bus_num - 1].wakeupenable = tmp;
 
        omap2_mcspi_set_master_mode(master);
-
-       clk_disable(mcspi->fck);
-       clk_disable(mcspi->ick);
+       omap2_mcspi_disable_clocks(mcspi);
        return 0;
 }
 
@@ -933,7 +1014,8 @@ static u8 __initdata spi2_txdma_id[] = {
        OMAP24XX_DMA_SPI2_TX1,
 };
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \
+       || defined(CONFIG_ARCH_OMAP4)
 static u8 __initdata spi3_rxdma_id[] = {
        OMAP24XX_DMA_SPI3_RX0,
        OMAP24XX_DMA_SPI3_RX1,
@@ -945,7 +1027,7 @@ static u8 __initdata spi3_txdma_id[] = {
 };
 #endif
 
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static u8 __initdata spi4_rxdma_id[] = {
        OMAP34XX_DMA_SPI4_RX0,
 };
@@ -975,14 +1057,15 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
                txdma_id = spi2_txdma_id;
                num_chipselect = 2;
                break;
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
+       || defined(CONFIG_ARCH_OMAP4)
        case 3:
                rxdma_id = spi3_rxdma_id;
                txdma_id = spi3_txdma_id;
                num_chipselect = 2;
                break;
 #endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
        case 4:
                rxdma_id = spi4_rxdma_id;
                txdma_id = spi4_txdma_id;
@@ -1038,6 +1121,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
 
        spin_lock_init(&mcspi->lock);
        INIT_LIST_HEAD(&mcspi->msg_queue);
+       INIT_LIST_HEAD(&omap2_mcspi_ctx[master->bus_num - 1].cs);
 
        mcspi->ick = clk_get(&pdev->dev, "ick");
        if (IS_ERR(mcspi->ick)) {
index 8980a56..e75ba9b 100644 (file)
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
        unsigned        bits = ust->bits_per_word;
        unsigned        bytes;
        u16             val, w;
-       int             status = 0;;
+       int             status = 0;
 
        if (!t->tx_buf && !t->rx_buf)
                return 0;
index d949dbf..31dd56f 100644 (file)
@@ -1729,7 +1729,7 @@ static int __init pxa2xx_spi_init(void)
 {
        return platform_driver_probe(&driver, pxa2xx_spi_probe);
 }
-module_init(pxa2xx_spi_init);
+subsys_initcall(pxa2xx_spi_init);
 
 static void __exit pxa2xx_spi_exit(void)
 {
index 70845cc..b76f246 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/cache.h>
 #include <linux/mutex.h>
+#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 
@@ -59,9 +60,32 @@ static struct device_attribute spi_dev_attrs[] = {
  * and the sysfs version makes coldplug work too.
  */
 
+static const struct spi_device_id *spi_match_id(const struct spi_device_id *id,
+                                               const struct spi_device *sdev)
+{
+       while (id->name[0]) {
+               if (!strcmp(sdev->modalias, id->name))
+                       return id;
+               id++;
+       }
+       return NULL;
+}
+
+const struct spi_device_id *spi_get_device_id(const struct spi_device *sdev)
+{
+       const struct spi_driver *sdrv = to_spi_driver(sdev->dev.driver);
+
+       return spi_match_id(sdrv->id_table, sdev);
+}
+EXPORT_SYMBOL_GPL(spi_get_device_id);
+
 static int spi_match_device(struct device *dev, struct device_driver *drv)
 {
        const struct spi_device *spi = to_spi_device(dev);
+       const struct spi_driver *sdrv = to_spi_driver(drv);
+
+       if (sdrv->id_table)
+               return !!spi_match_id(sdrv->id_table, spi);
 
        return strcmp(spi->modalias, drv->name) == 0;
 }
@@ -70,7 +94,7 @@ static int spi_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        const struct spi_device         *spi = to_spi_device(dev);
 
-       add_uevent_var(env, "MODALIAS=%s", spi->modalias);
+       add_uevent_var(env, "MODALIAS=%s%s", SPI_MODULE_PREFIX, spi->modalias);
        return 0;
 }
 
@@ -639,6 +663,65 @@ int spi_setup(struct spi_device *spi)
 }
 EXPORT_SYMBOL_GPL(spi_setup);
 
+/**
+ * spi_async - asynchronous SPI transfer
+ * @spi: device with which data will be exchanged
+ * @message: describes the data transfers, including completion callback
+ * Context: any (irqs may be blocked, etc)
+ *
+ * This call may be used in_irq and other contexts which can't sleep,
+ * as well as from task contexts which can sleep.
+ *
+ * The completion callback is invoked in a context which can't sleep.
+ * Before that invocation, the value of message->status is undefined.
+ * When the callback is issued, message->status holds either zero (to
+ * indicate complete success) or a negative error code.  After that
+ * callback returns, the driver which issued the transfer request may
+ * deallocate the associated memory; it's no longer in use by any SPI
+ * core or controller driver code.
+ *
+ * Note that although all messages to a spi_device are handled in
+ * FIFO order, messages may go to different devices in other orders.
+ * Some device might be higher priority, or have various "hard" access
+ * time requirements, for example.
+ *
+ * On detection of any fault during the transfer, processing of
+ * the entire message is aborted, and the device is deselected.
+ * Until returning from the associated message completion callback,
+ * no other spi_message queued to that device will be processed.
+ * (This rule applies equally to all the synchronous transfer calls,
+ * which are wrappers around this core asynchronous primitive.)
+ */
+int spi_async(struct spi_device *spi, struct spi_message *message)
+{
+       struct spi_master *master = spi->master;
+
+       /* Half-duplex links include original MicroWire, and ones with
+        * only one data pin like SPI_3WIRE (switches direction) or where
+        * either MOSI or MISO is missing.  They can also be caused by
+        * software limitations.
+        */
+       if ((master->flags & SPI_MASTER_HALF_DUPLEX)
+                       || (spi->mode & SPI_3WIRE)) {
+               struct spi_transfer *xfer;
+               unsigned flags = master->flags;
+
+               list_for_each_entry(xfer, &message->transfers, transfer_list) {
+                       if (xfer->rx_buf && xfer->tx_buf)
+                               return -EINVAL;
+                       if ((flags & SPI_MASTER_NO_TX) && xfer->tx_buf)
+                               return -EINVAL;
+                       if ((flags & SPI_MASTER_NO_RX) && xfer->rx_buf)
+                               return -EINVAL;
+               }
+       }
+
+       message->spi = spi;
+       message->status = -EINPROGRESS;
+       return master->transfer(spi, message);
+}
+EXPORT_SYMBOL_GPL(spi_async);
+
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
deleted file mode 100644 (file)
index c195e45..0000000
+++ /dev/null
@@ -1,1770 +0,0 @@
-/*
- * drivers/spi/spi_imx.c
- *
- * Copyright (C) 2006 SWAPP
- *     Andrea Paterniani <a.paterniani@swapp-eng.it>
- *
- * Initial version inspired by:
- *     linux-2.6.17-rc3-mm1/drivers/spi/pxa2xx_spi.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/ioport.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/spi/spi.h>
-#include <linux/workqueue.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/delay.h>
-
-#include <mach/hardware.h>
-#include <mach/imx-dma.h>
-#include <mach/spi_imx.h>
-
-/*-------------------------------------------------------------------------*/
-/* SPI Registers offsets from peripheral base address */
-#define SPI_RXDATA             (0x00)
-#define SPI_TXDATA             (0x04)
-#define SPI_CONTROL            (0x08)
-#define SPI_INT_STATUS         (0x0C)
-#define SPI_TEST               (0x10)
-#define SPI_PERIOD             (0x14)
-#define SPI_DMA                        (0x18)
-#define SPI_RESET              (0x1C)
-
-/* SPI Control Register Bit Fields & Masks */
-#define SPI_CONTROL_BITCOUNT_MASK      (0xF)           /* Bit Count Mask */
-#define SPI_CONTROL_BITCOUNT(n)                (((n) - 1) & SPI_CONTROL_BITCOUNT_MASK)
-#define SPI_CONTROL_POL                        (0x1 << 4)      /* Clock Polarity Mask */
-#define SPI_CONTROL_POL_ACT_HIGH       (0x0 << 4)      /* Active high pol. (0=idle) */
-#define SPI_CONTROL_POL_ACT_LOW                (0x1 << 4)      /* Active low pol. (1=idle) */
-#define SPI_CONTROL_PHA                        (0x1 << 5)      /* Clock Phase Mask */
-#define SPI_CONTROL_PHA_0              (0x0 << 5)      /* Clock Phase 0 */
-#define SPI_CONTROL_PHA_1              (0x1 << 5)      /* Clock Phase 1 */
-#define SPI_CONTROL_SSCTL              (0x1 << 6)      /* /SS Waveform Select Mask */
-#define SPI_CONTROL_SSCTL_0            (0x0 << 6)      /* Master: /SS stays low between SPI burst
-                                                          Slave: RXFIFO advanced by BIT_COUNT */
-#define SPI_CONTROL_SSCTL_1            (0x1 << 6)      /* Master: /SS insert pulse between SPI burst
-                                                          Slave: RXFIFO advanced by /SS rising edge */
-#define SPI_CONTROL_SSPOL              (0x1 << 7)      /* /SS Polarity Select Mask */
-#define SPI_CONTROL_SSPOL_ACT_LOW      (0x0 << 7)      /* /SS Active low */
-#define SPI_CONTROL_SSPOL_ACT_HIGH     (0x1 << 7)      /* /SS Active high */
-#define SPI_CONTROL_XCH                        (0x1 << 8)      /* Exchange */
-#define SPI_CONTROL_SPIEN              (0x1 << 9)      /* SPI Module Enable */
-#define SPI_CONTROL_MODE               (0x1 << 10)     /* SPI Mode Select Mask */
-#define SPI_CONTROL_MODE_SLAVE         (0x0 << 10)     /* SPI Mode Slave */
-#define SPI_CONTROL_MODE_MASTER                (0x1 << 10)     /* SPI Mode Master */
-#define SPI_CONTROL_DRCTL              (0x3 << 11)     /* /SPI_RDY Control Mask */
-#define SPI_CONTROL_DRCTL_0            (0x0 << 11)     /* Ignore /SPI_RDY */
-#define SPI_CONTROL_DRCTL_1            (0x1 << 11)     /* /SPI_RDY falling edge triggers input */
-#define SPI_CONTROL_DRCTL_2            (0x2 << 11)     /* /SPI_RDY active low level triggers input */
-#define SPI_CONTROL_DATARATE           (0x7 << 13)     /* Data Rate Mask */
-#define SPI_PERCLK2_DIV_MIN            (0)             /* PERCLK2:4 */
-#define SPI_PERCLK2_DIV_MAX            (7)             /* PERCLK2:512 */
-#define SPI_CONTROL_DATARATE_MIN       (SPI_PERCLK2_DIV_MAX << 13)
-#define SPI_CONTROL_DATARATE_MAX       (SPI_PERCLK2_DIV_MIN << 13)
-#define SPI_CONTROL_DATARATE_BAD       (SPI_CONTROL_DATARATE_MIN + 1)
-
-/* SPI Interrupt/Status Register Bit Fields & Masks */
-#define SPI_STATUS_TE  (0x1 << 0)      /* TXFIFO Empty Status */
-#define SPI_STATUS_TH  (0x1 << 1)      /* TXFIFO Half Status */
-#define SPI_STATUS_TF  (0x1 << 2)      /* TXFIFO Full Status */
-#define SPI_STATUS_RR  (0x1 << 3)      /* RXFIFO Data Ready Status */
-#define SPI_STATUS_RH  (0x1 << 4)      /* RXFIFO Half Status */
-#define SPI_STATUS_RF  (0x1 << 5)      /* RXFIFO Full Status */
-#define SPI_STATUS_RO  (0x1 << 6)      /* RXFIFO Overflow */
-#define SPI_STATUS_BO  (0x1 << 7)      /* Bit Count Overflow */
-#define SPI_STATUS     (0xFF)          /* SPI Status Mask */
-#define SPI_INTEN_TE   (0x1 << 8)      /* TXFIFO Empty Interrupt Enable */
-#define SPI_INTEN_TH   (0x1 << 9)      /* TXFIFO Half Interrupt Enable */
-#define SPI_INTEN_TF   (0x1 << 10)     /* TXFIFO Full Interrupt Enable */
-#define SPI_INTEN_RE   (0x1 << 11)     /* RXFIFO Data Ready Interrupt Enable */
-#define SPI_INTEN_RH   (0x1 << 12)     /* RXFIFO Half Interrupt Enable */
-#define SPI_INTEN_RF   (0x1 << 13)     /* RXFIFO Full Interrupt Enable */
-#define SPI_INTEN_RO   (0x1 << 14)     /* RXFIFO Overflow Interrupt Enable */
-#define SPI_INTEN_BO   (0x1 << 15)     /* Bit Count Overflow Interrupt Enable */
-#define SPI_INTEN      (0xFF << 8)     /* SPI Interrupt Enable Mask */
-
-/* SPI Test Register Bit Fields & Masks */
-#define SPI_TEST_TXCNT         (0xF << 0)      /* TXFIFO Counter */
-#define SPI_TEST_RXCNT_LSB     (4)             /* RXFIFO Counter LSB */
-#define SPI_TEST_RXCNT         (0xF << 4)      /* RXFIFO Counter */
-#define SPI_TEST_SSTATUS       (0xF << 8)      /* State Machine Status */
-#define SPI_TEST_LBC           (0x1 << 14)     /* Loop Back Control */
-
-/* SPI Period Register Bit Fields & Masks */
-#define SPI_PERIOD_WAIT                (0x7FFF << 0)   /* Wait Between Transactions */
-#define SPI_PERIOD_MAX_WAIT    (0x7FFF)        /* Max Wait Between
-                                                       Transactions */
-#define SPI_PERIOD_CSRC                (0x1 << 15)     /* Period Clock Source Mask */
-#define SPI_PERIOD_CSRC_BCLK   (0x0 << 15)     /* Period Clock Source is
-                                                       Bit Clock */
-#define SPI_PERIOD_CSRC_32768  (0x1 << 15)     /* Period Clock Source is
-                                                       32.768 KHz Clock */
-
-/* SPI DMA Register Bit Fields & Masks */
-#define SPI_DMA_RHDMA  (0x1 << 4)      /* RXFIFO Half Status */
-#define SPI_DMA_RFDMA  (0x1 << 5)      /* RXFIFO Full Status */
-#define SPI_DMA_TEDMA  (0x1 << 6)      /* TXFIFO Empty Status */
-#define SPI_DMA_THDMA  (0x1 << 7)      /* TXFIFO Half Status */
-#define SPI_DMA_RHDEN  (0x1 << 12)     /* RXFIFO Half DMA Request Enable */
-#define SPI_DMA_RFDEN  (0x1 << 13)     /* RXFIFO Full DMA Request Enable */
-#define SPI_DMA_TEDEN  (0x1 << 14)     /* TXFIFO Empty DMA Request Enable */
-#define SPI_DMA_THDEN  (0x1 << 15)     /* TXFIFO Half DMA Request Enable */
-
-/* SPI Soft Reset Register Bit Fields & Masks */
-#define SPI_RESET_START        (0x1)           /* Start */
-
-/* Default SPI configuration values */
-#define SPI_DEFAULT_CONTROL            \
-(                                      \
-       SPI_CONTROL_BITCOUNT(16) |      \
-       SPI_CONTROL_POL_ACT_HIGH |      \
-       SPI_CONTROL_PHA_0 |             \
-       SPI_CONTROL_SPIEN |             \
-       SPI_CONTROL_SSCTL_1 |           \
-       SPI_CONTROL_MODE_MASTER |       \
-       SPI_CONTROL_DRCTL_0 |           \
-       SPI_CONTROL_DATARATE_MIN        \
-)
-#define SPI_DEFAULT_ENABLE_LOOPBACK    (0)
-#define SPI_DEFAULT_ENABLE_DMA         (0)
-#define SPI_DEFAULT_PERIOD_WAIT                (8)
-/*-------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------*/
-/* TX/RX SPI FIFO size */
-#define SPI_FIFO_DEPTH                 (8)
-#define SPI_FIFO_BYTE_WIDTH            (2)
-#define SPI_FIFO_OVERFLOW_MARGIN       (2)
-
-/* DMA burst length for half full/empty request trigger */
-#define SPI_DMA_BLR                    (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2)
-
-/* Dummy char output to achieve reads.
-   Choosing something different from all zeroes may help pattern recogition
-   for oscilloscope analysis, but may break some drivers. */
-#define SPI_DUMMY_u8                   0
-#define SPI_DUMMY_u16                  ((SPI_DUMMY_u8 << 8) | SPI_DUMMY_u8)
-#define SPI_DUMMY_u32                  ((SPI_DUMMY_u16 << 16) | SPI_DUMMY_u16)
-
-/**
- * Macro to change a u32 field:
- * @r : register to edit
- * @m : bit mask
- * @v : new value for the field correctly bit-alligned
-*/
-#define u32_EDIT(r, m, v)              r = (r & ~(m)) | (v)
-
-/* Message state */
-#define START_STATE                    ((void*)0)
-#define RUNNING_STATE                  ((void*)1)
-#define DONE_STATE                     ((void*)2)
-#define ERROR_STATE                    ((void*)-1)
-
-/* Queue state */
-#define QUEUE_RUNNING                  (0)
-#define QUEUE_STOPPED                  (1)
-
-#define IS_DMA_ALIGNED(x)              (((u32)(x) & 0x03) == 0)
-#define DMA_ALIGNMENT                  4
-/*-------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------*/
-/* Driver data structs */
-
-/* Context */
-struct driver_data {
-       /* Driver model hookup */
-       struct platform_device *pdev;
-
-       /* SPI framework hookup */
-       struct spi_master *master;
-
-       /* IMX hookup */
-       struct spi_imx_master *master_info;
-
-       /* Memory resources and SPI regs virtual address */
-       struct resource *ioarea;
-       void __iomem *regs;
-
-       /* SPI RX_DATA physical address */
-       dma_addr_t rd_data_phys;
-
-       /* Driver message queue */
-       struct workqueue_struct *workqueue;
-       struct work_struct work;
-       spinlock_t lock;
-       struct list_head queue;
-       int busy;
-       int run;
-
-       /* Message Transfer pump */
-       struct tasklet_struct pump_transfers;
-
-       /* Current message, transfer and state */
-       struct spi_message *cur_msg;
-       struct spi_transfer *cur_transfer;
-       struct chip_data *cur_chip;
-
-       /* Rd / Wr buffers pointers */
-       size_t len;
-       void *tx;
-       void *tx_end;
-       void *rx;
-       void *rx_end;
-
-       u8 rd_only;
-       u8 n_bytes;
-       int cs_change;
-
-       /* Function pointers */
-       irqreturn_t (*transfer_handler)(struct driver_data *drv_data);
-       void (*cs_control)(u32 command);
-
-       /* DMA setup */
-       int rx_channel;
-       int tx_channel;
-       dma_addr_t rx_dma;
-       dma_addr_t tx_dma;
-       int rx_dma_needs_unmap;
-       int tx_dma_needs_unmap;
-       size_t tx_map_len;
-       u32 dummy_dma_buf ____cacheline_aligned;
-
-       struct clk *clk;
-};
-
-/* Runtime state */
-struct chip_data {
-       u32 control;
-       u32 period;
-       u32 test;
-
-       u8 enable_dma:1;
-       u8 bits_per_word;
-       u8 n_bytes;
-       u32 max_speed_hz;
-
-       void (*cs_control)(u32 command);
-};
-/*-------------------------------------------------------------------------*/
-
-
-static void pump_messages(struct work_struct *work);
-
-static void flush(struct driver_data *drv_data)
-{
-       void __iomem *regs = drv_data->regs;
-       u32 control;
-
-       dev_dbg(&drv_data->pdev->dev, "flush\n");
-
-       /* Wait for end of transaction */
-       do {
-               control = readl(regs + SPI_CONTROL);
-       } while (control & SPI_CONTROL_XCH);
-
-       /* Release chip select if requested, transfer delays are
-          handled in pump_transfers */
-       if (drv_data->cs_change)
-               drv_data->cs_control(SPI_CS_DEASSERT);
-
-       /* Disable SPI to flush FIFOs */
-       writel(control & ~SPI_CONTROL_SPIEN, regs + SPI_CONTROL);
-       writel(control, regs + SPI_CONTROL);
-}
-
-static void restore_state(struct driver_data *drv_data)
-{
-       void __iomem *regs = drv_data->regs;
-       struct chip_data *chip = drv_data->cur_chip;
-
-       /* Load chip registers */
-       dev_dbg(&drv_data->pdev->dev,
-               "restore_state\n"
-               "    test    = 0x%08X\n"
-               "    control = 0x%08X\n",
-               chip->test,
-               chip->control);
-       writel(chip->test, regs + SPI_TEST);
-       writel(chip->period, regs + SPI_PERIOD);
-       writel(0, regs + SPI_INT_STATUS);
-       writel(chip->control, regs + SPI_CONTROL);
-}
-
-static void null_cs_control(u32 command)
-{
-}
-
-static inline u32 data_to_write(struct driver_data *drv_data)
-{
-       return ((u32)(drv_data->tx_end - drv_data->tx)) / drv_data->n_bytes;
-}
-
-static inline u32 data_to_read(struct driver_data *drv_data)
-{
-       return ((u32)(drv_data->rx_end - drv_data->rx)) / drv_data->n_bytes;
-}
-
-static int write(struct driver_data *drv_data)
-{
-       void __iomem *regs = drv_data->regs;
-       void *tx = drv_data->tx;
-       void *tx_end = drv_data->tx_end;
-       u8 n_bytes = drv_data->n_bytes;
-       u32 remaining_writes;
-       u32 fifo_avail_space;
-       u32 n;
-       u16 d;
-
-       /* Compute how many fifo writes to do */
-       remaining_writes = (u32)(tx_end - tx) / n_bytes;
-       fifo_avail_space = SPI_FIFO_DEPTH -
-                               (readl(regs + SPI_TEST) & SPI_TEST_TXCNT);
-       if (drv_data->rx && (fifo_avail_space > SPI_FIFO_OVERFLOW_MARGIN))
-               /* Fix misunderstood receive overflow */
-               fifo_avail_space -= SPI_FIFO_OVERFLOW_MARGIN;
-       n = min(remaining_writes, fifo_avail_space);
-
-       dev_dbg(&drv_data->pdev->dev,
-               "write type %s\n"
-               "    remaining writes = %d\n"
-               "    fifo avail space = %d\n"
-               "    fifo writes      = %d\n",
-               (n_bytes == 1) ? "u8" : "u16",
-               remaining_writes,
-               fifo_avail_space,
-               n);
-
-       if (n > 0) {
-               /* Fill SPI TXFIFO */
-               if (drv_data->rd_only) {
-                       tx += n * n_bytes;
-                       while (n--)
-                               writel(SPI_DUMMY_u16, regs + SPI_TXDATA);
-               } else {
-                       if (n_bytes == 1) {
-                               while (n--) {
-                                       d = *(u8*)tx;
-                                       writel(d, regs + SPI_TXDATA);
-                                       tx += 1;
-                               }
-                       } else {
-                               while (n--) {
-                                       d = *(u16*)tx;
-                                       writel(d, regs + SPI_TXDATA);
-                                       tx += 2;
-                               }
-                       }
-               }
-
-               /* Trigger transfer */
-               writel(readl(regs + SPI_CONTROL) | SPI_CONTROL_XCH,
-                       regs + SPI_CONTROL);
-
-               /* Update tx pointer */
-               drv_data->tx = tx;
-       }
-
-       return (tx >= tx_end);
-}
-
-static int read(struct driver_data *drv_data)
-{
-       void __iomem *regs = drv_data->regs;
-       void *rx = drv_data->rx;
-       void *rx_end = drv_data->rx_end;
-       u8 n_bytes = drv_data->n_bytes;
-       u32 remaining_reads;
-       u32 fifo_rxcnt;
-       u32 n;
-       u16 d;
-
-       /* Compute how many fifo reads to do */
-       remaining_reads = (u32)(rx_end - rx) / n_bytes;
-       fifo_rxcnt = (readl(regs + SPI_TEST) & SPI_TEST_RXCNT) >>
-                       SPI_TEST_RXCNT_LSB;
-       n = min(remaining_reads, fifo_rxcnt);
-
-       dev_dbg(&drv_data->pdev->dev,
-               "read type %s\n"
-               "    remaining reads = %d\n"
-               "    fifo rx count   = %d\n"
-               "    fifo reads      = %d\n",
-               (n_bytes == 1) ? "u8" : "u16",
-               remaining_reads,
-               fifo_rxcnt,
-               n);
-
-       if (n > 0) {
-               /* Read SPI RXFIFO */
-               if (n_bytes == 1) {
-                       while (n--) {
-                               d = readl(regs + SPI_RXDATA);
-                               *((u8*)rx) = d;
-                               rx += 1;
-                       }
-               } else {
-                       while (n--) {
-                               d = readl(regs + SPI_RXDATA);
-                               *((u16*)rx) = d;
-                               rx += 2;
-                       }
-               }
-
-               /* Update rx pointer */
-               drv_data->rx = rx;
-       }
-
-       return (rx >= rx_end);
-}
-
-static void *next_transfer(struct driver_data *drv_data)
-{
-       struct spi_message *msg = drv_data->cur_msg;
-       struct spi_transfer *trans = drv_data->cur_transfer;
-
-       /* Move to next transfer */
-       if (trans->transfer_list.next != &msg->transfers) {
-               drv_data->cur_transfer =
-                       list_entry(trans->transfer_list.next,
-                                       struct spi_transfer,
-                                       transfer_list);
-               return RUNNING_STATE;
-       }
-
-       return DONE_STATE;
-}
-
-static int map_dma_buffers(struct driver_data *drv_data)
-{
-       struct spi_message *msg;
-       struct device *dev;
-       void *buf;
-
-       drv_data->rx_dma_needs_unmap = 0;
-       drv_data->tx_dma_needs_unmap = 0;
-
-       if (!drv_data->master_info->enable_dma ||
-               !drv_data->cur_chip->enable_dma)
-                       return -1;
-
-       msg = drv_data->cur_msg;
-       dev = &msg->spi->dev;
-       if (msg->is_dma_mapped) {
-               if (drv_data->tx_dma)
-                       /* The caller provided at least dma and cpu virtual
-                          address for write; pump_transfers() will consider the
-                          transfer as write only if cpu rx virtual address is
-                          NULL */
-                       return 0;
-
-               if (drv_data->rx_dma) {
-                       /* The caller provided dma and cpu virtual address to
-                          performe read only transfer -->
-                          use drv_data->dummy_dma_buf for dummy writes to
-                          achive reads */
-                       buf = &drv_data->dummy_dma_buf;
-                       drv_data->tx_map_len = sizeof(drv_data->dummy_dma_buf);
-                       drv_data->tx_dma = dma_map_single(dev,
-                                                       buf,
-                                                       drv_data->tx_map_len,
-                                                       DMA_TO_DEVICE);
-                       if (dma_mapping_error(dev, drv_data->tx_dma))
-                               return -1;
-
-                       drv_data->tx_dma_needs_unmap = 1;
-
-                       /* Flags transfer as rd_only for pump_transfers() DMA
-                          regs programming (should be redundant) */
-                       drv_data->tx = NULL;
-
-                       return 0;
-               }
-       }
-
-       if (!IS_DMA_ALIGNED(drv_data->rx) || !IS_DMA_ALIGNED(drv_data->tx))
-               return -1;
-
-       if (drv_data->tx == NULL) {
-               /* Read only message --> use drv_data->dummy_dma_buf for dummy
-                  writes to achive reads */
-               buf = &drv_data->dummy_dma_buf;
-               drv_data->tx_map_len = sizeof(drv_data->dummy_dma_buf);
-       } else {
-               buf = drv_data->tx;
-               drv_data->tx_map_len = drv_data->len;
-       }
-       drv_data->tx_dma = dma_map_single(dev,
-                                       buf,
-                                       drv_data->tx_map_len,
-                                       DMA_TO_DEVICE);
-       if (dma_mapping_error(dev, drv_data->tx_dma))
-               return -1;
-       drv_data->tx_dma_needs_unmap = 1;
-
-       /* NULL rx means write-only transfer and no map needed
-        * since rx DMA will not be used */
-       if (drv_data->rx) {
-               buf = drv_data->rx;
-               drv_data->rx_dma = dma_map_single(dev,
-                                               buf,
-                                               drv_data->len,
-                                               DMA_FROM_DEVICE);
-               if (dma_mapping_error(dev, drv_data->rx_dma)) {
-                       if (drv_data->tx_dma) {
-                               dma_unmap_single(dev,
-                                               drv_data->tx_dma,
-                                               drv_data->tx_map_len,
-                                               DMA_TO_DEVICE);
-                               drv_data->tx_dma_needs_unmap = 0;
-                       }
-                       return -1;
-               }
-               drv_data->rx_dma_needs_unmap = 1;
-       }
-
-       return 0;
-}
-
-static void unmap_dma_buffers(struct driver_data *drv_data)
-{
-       struct spi_message *msg = drv_data->cur_msg;
-       struct device *dev = &msg->spi->dev;
-
-       if (drv_data->rx_dma_needs_unmap) {
-               dma_unmap_single(dev,
-                               drv_data->rx_dma,
-                               drv_data->len,
-                               DMA_FROM_DEVICE);
-               drv_data->rx_dma_needs_unmap = 0;
-       }
-       if (drv_data->tx_dma_needs_unmap) {
-               dma_unmap_single(dev,
-                               drv_data->tx_dma,
-                               drv_data->tx_map_len,
-                               DMA_TO_DEVICE);
-               drv_data->tx_dma_needs_unmap = 0;
-       }
-}
-
-/* Caller already set message->status (dma is already blocked) */
-static void giveback(struct spi_message *message, struct driver_data *drv_data)
-{
-       void __iomem *regs = drv_data->regs;
-
-       /* Bring SPI to sleep; restore_state() and pump_transfer()
-          will do new setup */
-       writel(0, regs + SPI_INT_STATUS);
-       writel(0, regs + SPI_DMA);
-
-       /* Unconditioned deselct */
-       drv_data->cs_control(SPI_CS_DEASSERT);
-
-       message->state = NULL;
-       if (message->complete)
-               message->complete(message->context);
-
-       drv_data->cur_msg = NULL;
-       drv_data->cur_transfer = NULL;
-       drv_data->cur_chip = NULL;
-       queue_work(drv_data->workqueue, &drv_data->work);
-}
-
-static void dma_err_handler(int channel, void *data, int errcode)
-{
-       struct driver_data *drv_data = data;
-       struct spi_message *msg = drv_data->cur_msg;
-
-       dev_dbg(&drv_data->pdev->dev, "dma_err_handler\n");
-
-       /* Disable both rx and tx dma channels */
-       imx_dma_disable(drv_data->rx_channel);
-       imx_dma_disable(drv_data->tx_channel);
-       unmap_dma_buffers(drv_data);
-
-       flush(drv_data);
-
-       msg->state = ERROR_STATE;
-       tasklet_schedule(&drv_data->pump_transfers);
-}
-
-static void dma_tx_handler(int channel, void *data)
-{
-       struct driver_data *drv_data = data;
-
-       dev_dbg(&drv_data->pdev->dev, "dma_tx_handler\n");
-
-       imx_dma_disable(channel);
-
-       /* Now waits for TX FIFO empty */
-       writel(SPI_INTEN_TE, drv_data->regs + SPI_INT_STATUS);
-}
-
-static irqreturn_t dma_transfer(struct driver_data *drv_data)
-{
-       u32 status;
-       struct spi_message *msg = drv_data->cur_msg;
-       void __iomem *regs = drv_data->regs;
-
-       status = readl(regs + SPI_INT_STATUS);
-
-       if ((status & (SPI_INTEN_RO | SPI_STATUS_RO))
-                       == (SPI_INTEN_RO | SPI_STATUS_RO)) {
-               writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
-
-               imx_dma_disable(drv_data->tx_channel);
-               imx_dma_disable(drv_data->rx_channel);
-               unmap_dma_buffers(drv_data);
-
-               flush(drv_data);
-
-               dev_warn(&drv_data->pdev->dev,
-                               "dma_transfer - fifo overun\n");
-
-               msg->state = ERROR_STATE;
-               tasklet_schedule(&drv_data->pump_transfers);
-
-               return IRQ_HANDLED;
-       }
-
-       if (status & SPI_STATUS_TE) {
-               writel(status & ~SPI_INTEN_TE, regs + SPI_INT_STATUS);
-
-               if (drv_data->rx) {
-                       /* Wait end of transfer before read trailing data */
-                       while (readl(regs + SPI_CONTROL) & SPI_CONTROL_XCH)
-                               cpu_relax();
-
-                       imx_dma_disable(drv_data->rx_channel);
-                       unmap_dma_buffers(drv_data);
-
-                       /* Release chip select if requested, transfer delays are
-                          handled in pump_transfers() */
-                       if (drv_data->cs_change)
-                               drv_data->cs_control(SPI_CS_DEASSERT);
-
-                       /* Calculate number of trailing data and read them */
-                       dev_dbg(&drv_data->pdev->dev,
-                               "dma_transfer - test = 0x%08X\n",
-                               readl(regs + SPI_TEST));
-                       drv_data->rx = drv_data->rx_end -
-                                       ((readl(regs + SPI_TEST) &
-                                       SPI_TEST_RXCNT) >>
-                                       SPI_TEST_RXCNT_LSB)*drv_data->n_bytes;
-                       read(drv_data);
-               } else {
-                       /* Write only transfer */
-                       unmap_dma_buffers(drv_data);
-
-                       flush(drv_data);
-               }
-
-               /* End of transfer, update total byte transfered */
-               msg->actual_length += drv_data->len;
-
-               /* Move to next transfer */
-               msg->state = next_transfer(drv_data);
-
-               /* Schedule transfer tasklet */
-               tasklet_schedule(&drv_data->pump_transfers);
-
-               return IRQ_HANDLED;
-       }
-
-       /* Opps problem detected */
-       return IRQ_NONE;
-}
-
-static irqreturn_t interrupt_wronly_transfer(struct driver_data *drv_data)
-{
-       struct spi_message *msg = drv_data->cur_msg;
-       void __iomem *regs = drv_data->regs;
-       u32 status;
-       irqreturn_t handled = IRQ_NONE;
-
-       status = readl(regs + SPI_INT_STATUS);
-
-       if (status & SPI_INTEN_TE) {
-               /* TXFIFO Empty Interrupt on the last transfered word */
-               writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
-               dev_dbg(&drv_data->pdev->dev,
-                       "interrupt_wronly_transfer - end of tx\n");
-
-               flush(drv_data);
-
-               /* Update total byte transfered */
-               msg->actual_length += drv_data->len;
-
-               /* Move to next transfer */
-               msg->state = next_transfer(drv_data);
-
-               /* Schedule transfer tasklet */
-               tasklet_schedule(&drv_data->pump_transfers);
-
-               return IRQ_HANDLED;
-       } else {
-               while (status & SPI_STATUS_TH) {
-                       dev_dbg(&drv_data->pdev->dev,
-                               "interrupt_wronly_transfer - status = 0x%08X\n",
-                               status);
-
-                       /* Pump data */
-                       if (write(drv_data)) {
-                               /* End of TXFIFO writes,
-                                  now wait until TXFIFO is empty */
-                               writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
-                               return IRQ_HANDLED;
-                       }
-
-                       status = readl(regs + SPI_INT_STATUS);
-
-                       /* We did something */
-                       handled = IRQ_HANDLED;
-               }
-       }
-
-       return handled;
-}
-
-static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
-{
-       struct spi_message *msg = drv_data->cur_msg;
-       void __iomem *regs = drv_data->regs;
-       u32 status, control;
-       irqreturn_t handled = IRQ_NONE;
-       unsigned long limit;
-
-       status = readl(regs + SPI_INT_STATUS);
-
-       if (status & SPI_INTEN_TE) {
-               /* TXFIFO Empty Interrupt on the last transfered word */
-               writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
-               dev_dbg(&drv_data->pdev->dev,
-                       "interrupt_transfer - end of tx\n");
-
-               if (msg->state == ERROR_STATE) {
-                       /* RXFIFO overrun was detected and message aborted */
-                       flush(drv_data);
-               } else {
-                       /* Wait for end of transaction */
-                       do {
-                               control = readl(regs + SPI_CONTROL);
-                       } while (control & SPI_CONTROL_XCH);
-
-                       /* Release chip select if requested, transfer delays are
-                          handled in pump_transfers */
-                       if (drv_data->cs_change)
-                               drv_data->cs_control(SPI_CS_DEASSERT);
-
-                       /* Read trailing bytes */
-                       limit = loops_per_jiffy << 1;
-                       while ((read(drv_data) == 0) && --limit)
-                               cpu_relax();
-
-                       if (limit == 0)
-                               dev_err(&drv_data->pdev->dev,
-                                       "interrupt_transfer - "
-                                       "trailing byte read failed\n");
-                       else
-                               dev_dbg(&drv_data->pdev->dev,
-                                       "interrupt_transfer - end of rx\n");
-
-                       /* Update total byte transfered */
-                       msg->actual_length += drv_data->len;
-
-                       /* Move to next transfer */
-                       msg->state = next_transfer(drv_data);
-               }
-
-               /* Schedule transfer tasklet */
-               tasklet_schedule(&drv_data->pump_transfers);
-
-               return IRQ_HANDLED;
-       } else {
-               while (status & (SPI_STATUS_TH | SPI_STATUS_RO)) {
-                       dev_dbg(&drv_data->pdev->dev,
-                               "interrupt_transfer - status = 0x%08X\n",
-                               status);
-
-                       if (status & SPI_STATUS_RO) {
-                               /* RXFIFO overrun, abort message end wait
-                                  until TXFIFO is empty */
-                               writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
-
-                               dev_warn(&drv_data->pdev->dev,
-                                       "interrupt_transfer - fifo overun\n"
-                                       "    data not yet written = %d\n"
-                                       "    data not yet read    = %d\n",
-                                       data_to_write(drv_data),
-                                       data_to_read(drv_data));
-
-                               msg->state = ERROR_STATE;
-
-                               return IRQ_HANDLED;
-                       }
-
-                       /* Pump data */
-                       read(drv_data);
-                       if (write(drv_data)) {
-                               /* End of TXFIFO writes,
-                                  now wait until TXFIFO is empty */
-                               writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
-                               return IRQ_HANDLED;
-                       }
-
-                       status = readl(regs + SPI_INT_STATUS);
-
-                       /* We did something */
-                       handled = IRQ_HANDLED;
-               }
-       }
-
-       return handled;
-}
-
-static irqreturn_t spi_int(int irq, void *dev_id)
-{
-       struct driver_data *drv_data = (struct driver_data *)dev_id;
-
-       if (!drv_data->cur_msg) {
-               dev_err(&drv_data->pdev->dev,
-                       "spi_int - bad message state\n");
-               /* Never fail */
-               return IRQ_HANDLED;
-       }
-
-       return drv_data->transfer_handler(drv_data);
-}
-
-static inline u32 spi_speed_hz(struct driver_data *drv_data, u32 data_rate)
-{
-       return clk_get_rate(drv_data->clk) / (4 << ((data_rate) >> 13));
-}
-
-static u32 spi_data_rate(struct driver_data *drv_data, u32 speed_hz)
-{
-       u32 div;
-       u32 quantized_hz = clk_get_rate(drv_data->clk) >> 2;
-
-       for (div = SPI_PERCLK2_DIV_MIN;
-               div <= SPI_PERCLK2_DIV_MAX;
-               div++, quantized_hz >>= 1) {
-                       if (quantized_hz <= speed_hz)
-                               /* Max available speed LEQ required speed */
-                               return div << 13;
-       }
-       return SPI_CONTROL_DATARATE_BAD;
-}
-
-static void pump_transfers(unsigned long data)
-{
-       struct driver_data *drv_data = (struct driver_data *)data;
-       struct spi_message *message;
-       struct spi_transfer *transfer, *previous;
-       struct chip_data *chip;
-       void __iomem *regs;
-       u32 tmp, control;
-
-       dev_dbg(&drv_data->pdev->dev, "pump_transfer\n");
-
-       message = drv_data->cur_msg;
-
-       /* Handle for abort */
-       if (message->state == ERROR_STATE) {
-               message->status = -EIO;
-               giveback(message, drv_data);
-               return;
-       }
-
-       /* Handle end of message */
-       if (message->state == DONE_STATE) {
-               message->status = 0;
-               giveback(message, drv_data);
-               return;
-       }
-
-       chip = drv_data->cur_chip;
-
-       /* Delay if requested at end of transfer*/
-       transfer = drv_data->cur_transfer;
-       if (message->state == RUNNING_STATE) {
-               previous = list_entry(transfer->transfer_list.prev,
-                                       struct spi_transfer,
-                                       transfer_list);
-               if (previous->delay_usecs)
-                       udelay(previous->delay_usecs);
-       } else {
-               /* START_STATE */
-               message->state = RUNNING_STATE;
-               drv_data->cs_control = chip->cs_control;
-       }
-
-       transfer = drv_data->cur_transfer;
-       drv_data->tx = (void *)transfer->tx_buf;
-       drv_data->tx_end = drv_data->tx + transfer->len;
-       drv_data->rx = transfer->rx_buf;
-       drv_data->rx_end = drv_data->rx + transfer->len;
-       drv_data->rx_dma = transfer->rx_dma;
-       drv_data->tx_dma = transfer->tx_dma;
-       drv_data->len = transfer->len;
-       drv_data->cs_change = transfer->cs_change;
-       drv_data->rd_only = (drv_data->tx == NULL);
-
-       regs = drv_data->regs;
-       control = readl(regs + SPI_CONTROL);
-
-       /* Bits per word setup */
-       tmp = transfer->bits_per_word;
-       if (tmp == 0) {
-               /* Use device setup */
-               tmp = chip->bits_per_word;
-               drv_data->n_bytes = chip->n_bytes;
-       } else
-               /* Use per-transfer setup */
-               drv_data->n_bytes = (tmp <= 8) ? 1 : 2;
-       u32_EDIT(control, SPI_CONTROL_BITCOUNT_MASK, tmp - 1);
-
-       /* Speed setup (surely valid because already checked) */
-       tmp = transfer->speed_hz;
-       if (tmp == 0)
-               tmp = chip->max_speed_hz;
-       tmp = spi_data_rate(drv_data, tmp);
-       u32_EDIT(control, SPI_CONTROL_DATARATE, tmp);
-
-       writel(control, regs + SPI_CONTROL);
-
-       /* Assert device chip-select */
-       drv_data->cs_control(SPI_CS_ASSERT);
-
-       /* DMA cannot read/write SPI FIFOs other than 16 bits at a time; hence
-          if bits_per_word is less or equal 8 PIO transfers are performed.
-          Moreover DMA is convinient for transfer length bigger than FIFOs
-          byte size. */
-       if ((drv_data->n_bytes == 2) &&
-               (drv_data->len > SPI_FIFO_DEPTH*SPI_FIFO_BYTE_WIDTH) &&
-               (map_dma_buffers(drv_data) == 0)) {
-               dev_dbg(&drv_data->pdev->dev,
-                       "pump dma transfer\n"
-                       "    tx      = %p\n"
-                       "    tx_dma  = %08X\n"
-                       "    rx      = %p\n"
-                       "    rx_dma  = %08X\n"
-                       "    len     = %d\n",
-                       drv_data->tx,
-                       (unsigned int)drv_data->tx_dma,
-                       drv_data->rx,
-                       (unsigned int)drv_data->rx_dma,
-                       drv_data->len);
-
-               /* Ensure we have the correct interrupt handler */
-               drv_data->transfer_handler = dma_transfer;
-
-               /* Trigger transfer */
-               writel(readl(regs + SPI_CONTROL) | SPI_CONTROL_XCH,
-                       regs + SPI_CONTROL);
-
-               /* Setup tx DMA */
-               if (drv_data->tx)
-                       /* Linear source address */
-                       CCR(drv_data->tx_channel) =
-                               CCR_DMOD_FIFO |
-                               CCR_SMOD_LINEAR |
-                               CCR_SSIZ_32 | CCR_DSIZ_16 |
-                               CCR_REN;
-               else
-                       /* Read only transfer -> fixed source address for
-                          dummy write to achive read */
-                       CCR(drv_data->tx_channel) =
-                               CCR_DMOD_FIFO |
-                               CCR_SMOD_FIFO |
-                               CCR_SSIZ_32 | CCR_DSIZ_16 |
-                               CCR_REN;
-
-               imx_dma_setup_single(
-                       drv_data->tx_channel,
-                       drv_data->tx_dma,
-                       drv_data->len,
-                       drv_data->rd_data_phys + 4,
-                       DMA_MODE_WRITE);
-
-               if (drv_data->rx) {
-                       /* Setup rx DMA for linear destination address */
-                       CCR(drv_data->rx_channel) =
-                               CCR_DMOD_LINEAR |
-                               CCR_SMOD_FIFO |
-                               CCR_DSIZ_32 | CCR_SSIZ_16 |
-                               CCR_REN;
-                       imx_dma_setup_single(
-                               drv_data->rx_channel,
-                               drv_data->rx_dma,
-                               drv_data->len,
-                               drv_data->rd_data_phys,
-                               DMA_MODE_READ);
-                       imx_dma_enable(drv_data->rx_channel);
-
-                       /* Enable SPI interrupt */
-                       writel(SPI_INTEN_RO, regs + SPI_INT_STATUS);
-
-                       /* Set SPI to request DMA service on both
-                          Rx and Tx half fifo watermark */
-                       writel(SPI_DMA_RHDEN | SPI_DMA_THDEN, regs + SPI_DMA);
-               } else
-                       /* Write only access -> set SPI to request DMA
-                          service on Tx half fifo watermark */
-                       writel(SPI_DMA_THDEN, regs + SPI_DMA);
-
-               imx_dma_enable(drv_data->tx_channel);
-       } else {
-               dev_dbg(&drv_data->pdev->dev,
-                       "pump pio transfer\n"
-                       "    tx      = %p\n"
-                       "    rx      = %p\n"
-                       "    len     = %d\n",
-                       drv_data->tx,
-                       drv_data->rx,
-                       drv_data->len);
-
-               /* Ensure we have the correct interrupt handler */
-               if (drv_data->rx)
-                       drv_data->transfer_handler = interrupt_transfer;
-               else
-                       drv_data->transfer_handler = interrupt_wronly_transfer;
-
-               /* Enable SPI interrupt */
-               if (drv_data->rx)
-                       writel(SPI_INTEN_TH | SPI_INTEN_RO,
-                               regs + SPI_INT_STATUS);
-               else
-                       writel(SPI_INTEN_TH, regs + SPI_INT_STATUS);
-       }
-}
-
-static void pump_messages(struct work_struct *work)
-{
-       struct driver_data *drv_data =
-                               container_of(work, struct driver_data, work);
-       unsigned long flags;
-
-       /* Lock queue and check for queue work */
-       spin_lock_irqsave(&drv_data->lock, flags);
-       if (list_empty(&drv_data->queue) || drv_data->run == QUEUE_STOPPED) {
-               drv_data->busy = 0;
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               return;
-       }
-
-       /* Make sure we are not already running a message */
-       if (drv_data->cur_msg) {
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               return;
-       }
-
-       /* Extract head of queue */
-       drv_data->cur_msg = list_entry(drv_data->queue.next,
-                                       struct spi_message, queue);
-       list_del_init(&drv_data->cur_msg->queue);
-       drv_data->busy = 1;
-       spin_unlock_irqrestore(&drv_data->lock, flags);
-
-       /* Initial message state */
-       drv_data->cur_msg->state = START_STATE;
-       drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next,
-                                               struct spi_transfer,
-                                               transfer_list);
-
-       /* Setup the SPI using the per chip configuration */
-       drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-       restore_state(drv_data);
-
-       /* Mark as busy and launch transfers */
-       tasklet_schedule(&drv_data->pump_transfers);
-}
-
-static int transfer(struct spi_device *spi, struct spi_message *msg)
-{
-       struct driver_data *drv_data = spi_master_get_devdata(spi->master);
-       u32 min_speed_hz, max_speed_hz, tmp;
-       struct spi_transfer *trans;
-       unsigned long flags;
-
-       msg->actual_length = 0;
-
-       /* Per transfer setup check */
-       min_speed_hz = spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN);
-       max_speed_hz = spi->max_speed_hz;
-       list_for_each_entry(trans, &msg->transfers, transfer_list) {
-               tmp = trans->bits_per_word;
-               if (tmp > 16) {
-                       dev_err(&drv_data->pdev->dev,
-                               "message rejected : "
-                               "invalid transfer bits_per_word (%d bits)\n",
-                               tmp);
-                       goto msg_rejected;
-               }
-               tmp = trans->speed_hz;
-               if (tmp) {
-                       if (tmp < min_speed_hz) {
-                               dev_err(&drv_data->pdev->dev,
-                                       "message rejected : "
-                                       "device min speed (%d Hz) exceeds "
-                                       "required transfer speed (%d Hz)\n",
-                                       min_speed_hz,
-                                       tmp);
-                               goto msg_rejected;
-                       } else if (tmp > max_speed_hz) {
-                               dev_err(&drv_data->pdev->dev,
-                                       "message rejected : "
-                                       "transfer speed (%d Hz) exceeds "
-                                       "device max speed (%d Hz)\n",
-                                       tmp,
-                                       max_speed_hz);
-                               goto msg_rejected;
-                       }
-               }
-       }
-
-       /* Message accepted */
-       msg->status = -EINPROGRESS;
-       msg->state = START_STATE;
-
-       spin_lock_irqsave(&drv_data->lock, flags);
-       if (drv_data->run == QUEUE_STOPPED) {
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               return -ESHUTDOWN;
-       }
-
-       list_add_tail(&msg->queue, &drv_data->queue);
-       if (drv_data->run == QUEUE_RUNNING && !drv_data->busy)
-               queue_work(drv_data->workqueue, &drv_data->work);
-
-       spin_unlock_irqrestore(&drv_data->lock, flags);
-       return 0;
-
-msg_rejected:
-       /* Message rejected and not queued */
-       msg->status = -EINVAL;
-       msg->state = ERROR_STATE;
-       if (msg->complete)
-               msg->complete(msg->context);
-       return -EINVAL;
-}
-
-/* On first setup bad values must free chip_data memory since will cause
-   spi_new_device to fail. Bad value setup from protocol driver are simply not
-   applied and notified to the calling driver. */
-static int setup(struct spi_device *spi)
-{
-       struct driver_data *drv_data = spi_master_get_devdata(spi->master);
-       struct spi_imx_chip *chip_info;
-       struct chip_data *chip;
-       int first_setup = 0;
-       u32 tmp;
-       int status = 0;
-
-       /* Get controller data */
-       chip_info = spi->controller_data;
-
-       /* Get controller_state */
-       chip = spi_get_ctldata(spi);
-       if (chip == NULL) {
-               first_setup = 1;
-
-               chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
-               if (!chip) {
-                       dev_err(&spi->dev,
-                               "setup - cannot allocate controller state\n");
-                       return -ENOMEM;
-               }
-               chip->control = SPI_DEFAULT_CONTROL;
-
-               if (chip_info == NULL) {
-                       /* spi_board_info.controller_data not is supplied */
-                       chip_info = kzalloc(sizeof(struct spi_imx_chip),
-                                               GFP_KERNEL);
-                       if (!chip_info) {
-                               dev_err(&spi->dev,
-                                       "setup - "
-                                       "cannot allocate controller data\n");
-                               status = -ENOMEM;
-                               goto err_first_setup;
-                       }
-                       /* Set controller data default value */
-                       chip_info->enable_loopback =
-                                               SPI_DEFAULT_ENABLE_LOOPBACK;
-                       chip_info->enable_dma = SPI_DEFAULT_ENABLE_DMA;
-                       chip_info->ins_ss_pulse = 1;
-                       chip_info->bclk_wait = SPI_DEFAULT_PERIOD_WAIT;
-                       chip_info->cs_control = null_cs_control;
-               }
-       }
-
-       /* Now set controller state based on controller data */
-
-       if (first_setup) {
-               /* SPI loopback */
-               if (chip_info->enable_loopback)
-                       chip->test = SPI_TEST_LBC;
-               else
-                       chip->test = 0;
-
-               /* SPI dma driven */
-               chip->enable_dma = chip_info->enable_dma;
-
-               /* SPI /SS pulse between spi burst */
-               if (chip_info->ins_ss_pulse)
-                       u32_EDIT(chip->control,
-                               SPI_CONTROL_SSCTL, SPI_CONTROL_SSCTL_1);
-               else
-                       u32_EDIT(chip->control,
-                               SPI_CONTROL_SSCTL, SPI_CONTROL_SSCTL_0);
-
-               /* SPI bclk waits between each bits_per_word spi burst */
-               if (chip_info->bclk_wait > SPI_PERIOD_MAX_WAIT) {
-                       dev_err(&spi->dev,
-                               "setup - "
-                               "bclk_wait exceeds max allowed (%d)\n",
-                               SPI_PERIOD_MAX_WAIT);
-                       goto err_first_setup;
-               }
-               chip->period = SPI_PERIOD_CSRC_BCLK |
-                               (chip_info->bclk_wait & SPI_PERIOD_WAIT);
-       }
-
-       /* SPI mode */
-       tmp = spi->mode;
-       if (tmp & SPI_CS_HIGH) {
-               u32_EDIT(chip->control,
-                               SPI_CONTROL_SSPOL, SPI_CONTROL_SSPOL_ACT_HIGH);
-       }
-       switch (tmp & SPI_MODE_3) {
-       case SPI_MODE_0:
-               tmp = 0;
-               break;
-       case SPI_MODE_1:
-               tmp = SPI_CONTROL_PHA_1;
-               break;
-       case SPI_MODE_2:
-               tmp = SPI_CONTROL_POL_ACT_LOW;
-               break;
-       default:
-               /* SPI_MODE_3 */
-               tmp = SPI_CONTROL_PHA_1 | SPI_CONTROL_POL_ACT_LOW;
-               break;
-       }
-       u32_EDIT(chip->control, SPI_CONTROL_POL | SPI_CONTROL_PHA, tmp);
-
-       /* SPI word width */
-       tmp = spi->bits_per_word;
-       if (tmp > 16) {
-               status = -EINVAL;
-               dev_err(&spi->dev,
-                       "setup - "
-                       "invalid bits_per_word (%d)\n",
-                       tmp);
-               if (first_setup)
-                       goto err_first_setup;
-               else {
-                       /* Undo setup using chip as backup copy */
-                       tmp = chip->bits_per_word;
-                       spi->bits_per_word = tmp;
-               }
-       }
-       chip->bits_per_word = tmp;
-       u32_EDIT(chip->control, SPI_CONTROL_BITCOUNT_MASK, tmp - 1);
-       chip->n_bytes = (tmp <= 8) ? 1 : 2;
-
-       /* SPI datarate */
-       tmp = spi_data_rate(drv_data, spi->max_speed_hz);
-       if (tmp == SPI_CONTROL_DATARATE_BAD) {
-               status = -EINVAL;
-               dev_err(&spi->dev,
-                       "setup - "
-                       "HW min speed (%d Hz) exceeds required "
-                       "max speed (%d Hz)\n",
-                       spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN),
-                       spi->max_speed_hz);
-               if (first_setup)
-                       goto err_first_setup;
-               else
-                       /* Undo setup using chip as backup copy */
-                       spi->max_speed_hz = chip->max_speed_hz;
-       } else {
-               u32_EDIT(chip->control, SPI_CONTROL_DATARATE, tmp);
-               /* Actual rounded max_speed_hz */
-               tmp = spi_speed_hz(drv_data, tmp);
-               spi->max_speed_hz = tmp;
-               chip->max_speed_hz = tmp;
-       }
-
-       /* SPI chip-select management */
-       if (chip_info->cs_control)
-               chip->cs_control = chip_info->cs_control;
-       else
-               chip->cs_control = null_cs_control;
-
-       /* Save controller_state */
-       spi_set_ctldata(spi, chip);
-
-       /* Summary */
-       dev_dbg(&spi->dev,
-               "setup succeded\n"
-               "    loopback enable   = %s\n"
-               "    dma enable        = %s\n"
-               "    insert /ss pulse  = %s\n"
-               "    period wait       = %d\n"
-               "    mode              = %d\n"
-               "    bits per word     = %d\n"
-               "    min speed         = %d Hz\n"
-               "    rounded max speed = %d Hz\n",
-               chip->test & SPI_TEST_LBC ? "Yes" : "No",
-               chip->enable_dma ? "Yes" : "No",
-               chip->control & SPI_CONTROL_SSCTL ? "Yes" : "No",
-               chip->period & SPI_PERIOD_WAIT,
-               spi->mode,
-               spi->bits_per_word,
-               spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN),
-               spi->max_speed_hz);
-       return status;
-
-err_first_setup:
-       kfree(chip);
-       return status;
-}
-
-static void cleanup(struct spi_device *spi)
-{
-       kfree(spi_get_ctldata(spi));
-}
-
-static int __init init_queue(struct driver_data *drv_data)
-{
-       INIT_LIST_HEAD(&drv_data->queue);
-       spin_lock_init(&drv_data->lock);
-
-       drv_data->run = QUEUE_STOPPED;
-       drv_data->busy = 0;
-
-       tasklet_init(&drv_data->pump_transfers,
-                       pump_transfers, (unsigned long)drv_data);
-
-       INIT_WORK(&drv_data->work, pump_messages);
-       drv_data->workqueue = create_singlethread_workqueue(
-                               dev_name(drv_data->master->dev.parent));
-       if (drv_data->workqueue == NULL)
-               return -EBUSY;
-
-       return 0;
-}
-
-static int start_queue(struct driver_data *drv_data)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&drv_data->lock, flags);
-
-       if (drv_data->run == QUEUE_RUNNING || drv_data->busy) {
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               return -EBUSY;
-       }
-
-       drv_data->run = QUEUE_RUNNING;
-       drv_data->cur_msg = NULL;
-       drv_data->cur_transfer = NULL;
-       drv_data->cur_chip = NULL;
-       spin_unlock_irqrestore(&drv_data->lock, flags);
-
-       queue_work(drv_data->workqueue, &drv_data->work);
-
-       return 0;
-}
-
-static int stop_queue(struct driver_data *drv_data)
-{
-       unsigned long flags;
-       unsigned limit = 500;
-       int status = 0;
-
-       spin_lock_irqsave(&drv_data->lock, flags);
-
-       /* This is a bit lame, but is optimized for the common execution path.
-        * A wait_queue on the drv_data->busy could be used, but then the common
-        * execution path (pump_messages) would be required to call wake_up or
-        * friends on every SPI message. Do this instead */
-       drv_data->run = QUEUE_STOPPED;
-       while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) {
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               msleep(10);
-               spin_lock_irqsave(&drv_data->lock, flags);
-       }
-
-       if (!list_empty(&drv_data->queue) || drv_data->busy)
-               status = -EBUSY;
-
-       spin_unlock_irqrestore(&drv_data->lock, flags);
-
-       return status;
-}
-
-static int destroy_queue(struct driver_data *drv_data)
-{
-       int status;
-
-       status = stop_queue(drv_data);
-       if (status != 0)
-               return status;
-
-       if (drv_data->workqueue)
-               destroy_workqueue(drv_data->workqueue);
-
-       return 0;
-}
-
-static int __init spi_imx_probe(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct spi_imx_master *platform_info;
-       struct spi_master *master;
-       struct driver_data *drv_data;
-       struct resource *res;
-       int irq, status = 0;
-
-       platform_info = dev->platform_data;
-       if (platform_info == NULL) {
-               dev_err(&pdev->dev, "probe - no platform data supplied\n");
-               status = -ENODEV;
-               goto err_no_pdata;
-       }
-
-       /* Allocate master with space for drv_data */
-       master = spi_alloc_master(dev, sizeof(struct driver_data));
-       if (!master) {
-               dev_err(&pdev->dev, "probe - cannot alloc spi_master\n");
-               status = -ENOMEM;
-               goto err_no_mem;
-       }
-       drv_data = spi_master_get_devdata(master);
-       drv_data->master = master;
-       drv_data->master_info = platform_info;
-       drv_data->pdev = pdev;
-
-       /* the spi->mode bits understood by this driver: */
-       master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
-
-       master->bus_num = pdev->id;
-       master->num_chipselect = platform_info->num_chipselect;
-       master->dma_alignment = DMA_ALIGNMENT;
-       master->cleanup = cleanup;
-       master->setup = setup;
-       master->transfer = transfer;
-
-       drv_data->dummy_dma_buf = SPI_DUMMY_u32;
-
-       drv_data->clk = clk_get(&pdev->dev, "perclk2");
-       if (IS_ERR(drv_data->clk)) {
-               dev_err(&pdev->dev, "probe - cannot get clock\n");
-               status = PTR_ERR(drv_data->clk);
-               goto err_no_clk;
-       }
-       clk_enable(drv_data->clk);
-
-       /* Find and map resources */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "probe - MEM resources not defined\n");
-               status = -ENODEV;
-               goto err_no_iores;
-       }
-       drv_data->ioarea = request_mem_region(res->start,
-                                               res->end - res->start + 1,
-                                               pdev->name);
-       if (drv_data->ioarea == NULL) {
-               dev_err(&pdev->dev, "probe - cannot reserve region\n");
-               status = -ENXIO;
-               goto err_no_iores;
-       }
-       drv_data->regs = ioremap(res->start, res->end - res->start + 1);
-       if (drv_data->regs == NULL) {
-               dev_err(&pdev->dev, "probe - cannot map IO\n");
-               status = -ENXIO;
-               goto err_no_iomap;
-       }
-       drv_data->rd_data_phys = (dma_addr_t)res->start;
-
-       /* Attach to IRQ */
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "probe - IRQ resource not defined\n");
-               status = -ENODEV;
-               goto err_no_irqres;
-       }
-       status = request_irq(irq, spi_int, IRQF_DISABLED,
-                            dev_name(dev), drv_data);
-       if (status < 0) {
-               dev_err(&pdev->dev, "probe - cannot get IRQ (%d)\n", status);
-               goto err_no_irqres;
-       }
-
-       /* Setup DMA if requested */
-       drv_data->tx_channel = -1;
-       drv_data->rx_channel = -1;
-       if (platform_info->enable_dma) {
-               /* Get rx DMA channel */
-               drv_data->rx_channel = imx_dma_request_by_prio("spi_imx_rx",
-                                                              DMA_PRIO_HIGH);
-               if (drv_data->rx_channel < 0) {
-                       dev_err(dev,
-                               "probe - problem (%d) requesting rx channel\n",
-                               drv_data->rx_channel);
-                       goto err_no_rxdma;
-               } else
-                       imx_dma_setup_handlers(drv_data->rx_channel, NULL,
-                                               dma_err_handler, drv_data);
-
-               /* Get tx DMA channel */
-               drv_data->tx_channel = imx_dma_request_by_prio("spi_imx_tx",
-                                                              DMA_PRIO_MEDIUM);
-               if (drv_data->tx_channel < 0) {
-                       dev_err(dev,
-                               "probe - problem (%d) requesting tx channel\n",
-                               drv_data->tx_channel);
-                       imx_dma_free(drv_data->rx_channel);
-                       goto err_no_txdma;
-               } else
-                       imx_dma_setup_handlers(drv_data->tx_channel,
-                                               dma_tx_handler, dma_err_handler,
-                                               drv_data);
-
-               /* Set request source and burst length for allocated channels */
-               switch (drv_data->pdev->id) {
-               case 1:
-                       /* Using SPI1 */
-                       RSSR(drv_data->rx_channel) = DMA_REQ_SPI1_R;
-                       RSSR(drv_data->tx_channel) = DMA_REQ_SPI1_T;
-                       break;
-               case 2:
-                       /* Using SPI2 */
-                       RSSR(drv_data->rx_channel) = DMA_REQ_SPI2_R;
-                       RSSR(drv_data->tx_channel) = DMA_REQ_SPI2_T;
-                       break;
-               default:
-                       dev_err(dev, "probe - bad SPI Id\n");
-                       imx_dma_free(drv_data->rx_channel);
-                       imx_dma_free(drv_data->tx_channel);
-                       status = -ENODEV;
-                       goto err_no_devid;
-               }
-               BLR(drv_data->rx_channel) = SPI_DMA_BLR;
-               BLR(drv_data->tx_channel) = SPI_DMA_BLR;
-       }
-
-       /* Load default SPI configuration */
-       writel(SPI_RESET_START, drv_data->regs + SPI_RESET);
-       writel(0, drv_data->regs + SPI_RESET);
-       writel(SPI_DEFAULT_CONTROL, drv_data->regs + SPI_CONTROL);
-
-       /* Initial and start queue */
-       status = init_queue(drv_data);
-       if (status != 0) {
-               dev_err(&pdev->dev, "probe - problem initializing queue\n");
-               goto err_init_queue;
-       }
-       status = start_queue(drv_data);
-       if (status != 0) {
-               dev_err(&pdev->dev, "probe - problem starting queue\n");
-               goto err_start_queue;
-       }
-
-       /* Register with the SPI framework */
-       platform_set_drvdata(pdev, drv_data);
-       status = spi_register_master(master);
-       if (status != 0) {
-               dev_err(&pdev->dev, "probe - problem registering spi master\n");
-               goto err_spi_register;
-       }
-
-       dev_dbg(dev, "probe succeded\n");
-       return 0;
-
-err_init_queue:
-err_start_queue:
-err_spi_register:
-       destroy_queue(drv_data);
-
-err_no_rxdma:
-err_no_txdma:
-err_no_devid:
-       free_irq(irq, drv_data);
-
-err_no_irqres:
-       iounmap(drv_data->regs);
-
-err_no_iomap:
-       release_resource(drv_data->ioarea);
-       kfree(drv_data->ioarea);
-
-err_no_iores:
-       clk_disable(drv_data->clk);
-       clk_put(drv_data->clk);
-
-err_no_clk:
-       spi_master_put(master);
-
-err_no_pdata:
-err_no_mem:
-       return status;
-}
-
-static int __exit spi_imx_remove(struct platform_device *pdev)
-{
-       struct driver_data *drv_data = platform_get_drvdata(pdev);
-       int irq;
-       int status = 0;
-
-       if (!drv_data)
-               return 0;
-
-       tasklet_kill(&drv_data->pump_transfers);
-
-       /* Remove the queue */
-       status = destroy_queue(drv_data);
-       if (status != 0) {
-               dev_err(&pdev->dev, "queue remove failed (%d)\n", status);
-               return status;
-       }
-
-       /* Reset SPI */
-       writel(SPI_RESET_START, drv_data->regs + SPI_RESET);
-       writel(0, drv_data->regs + SPI_RESET);
-
-       /* Release DMA */
-       if (drv_data->master_info->enable_dma) {
-               RSSR(drv_data->rx_channel) = 0;
-               RSSR(drv_data->tx_channel) = 0;
-               imx_dma_free(drv_data->tx_channel);
-               imx_dma_free(drv_data->rx_channel);
-       }
-
-       /* Release IRQ */
-       irq = platform_get_irq(pdev, 0);
-       if (irq >= 0)
-               free_irq(irq, drv_data);
-
-       clk_disable(drv_data->clk);
-       clk_put(drv_data->clk);
-
-       /* Release map resources */
-       iounmap(drv_data->regs);
-       release_resource(drv_data->ioarea);
-       kfree(drv_data->ioarea);
-
-       /* Disconnect from the SPI framework */
-       spi_unregister_master(drv_data->master);
-       spi_master_put(drv_data->master);
-
-       /* Prevent double remove */
-       platform_set_drvdata(pdev, NULL);
-
-       dev_dbg(&pdev->dev, "remove succeded\n");
-
-       return 0;
-}
-
-static void spi_imx_shutdown(struct platform_device *pdev)
-{
-       struct driver_data *drv_data = platform_get_drvdata(pdev);
-
-       /* Reset SPI */
-       writel(SPI_RESET_START, drv_data->regs + SPI_RESET);
-       writel(0, drv_data->regs + SPI_RESET);
-
-       dev_dbg(&pdev->dev, "shutdown succeded\n");
-}
-
-#ifdef CONFIG_PM
-
-static int spi_imx_suspend(struct platform_device *pdev, pm_message_t state)
-{
-       struct driver_data *drv_data = platform_get_drvdata(pdev);
-       int status = 0;
-
-       status = stop_queue(drv_data);
-       if (status != 0) {
-               dev_warn(&pdev->dev, "suspend cannot stop queue\n");
-               return status;
-       }
-
-       dev_dbg(&pdev->dev, "suspended\n");
-
-       return 0;
-}
-
-static int spi_imx_resume(struct platform_device *pdev)
-{
-       struct driver_data *drv_data = platform_get_drvdata(pdev);
-       int status = 0;
-
-       /* Start the queue running */
-       status = start_queue(drv_data);
-       if (status != 0)
-               dev_err(&pdev->dev, "problem starting queue (%d)\n", status);
-       else
-               dev_dbg(&pdev->dev, "resumed\n");
-
-       return status;
-}
-#else
-#define spi_imx_suspend NULL
-#define spi_imx_resume NULL
-#endif /* CONFIG_PM */
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:spi_imx");
-
-static struct platform_driver driver = {
-       .driver = {
-               .name = "spi_imx",
-               .owner = THIS_MODULE,
-       },
-       .remove = __exit_p(spi_imx_remove),
-       .shutdown = spi_imx_shutdown,
-       .suspend = spi_imx_suspend,
-       .resume = spi_imx_resume,
-};
-
-static int __init spi_imx_init(void)
-{
-       return platform_driver_probe(&driver, spi_imx_probe);
-}
-module_init(spi_imx_init);
-
-static void __exit spi_imx_exit(void)
-{
-       platform_driver_unregister(&driver);
-}
-module_exit(spi_imx_exit);
-
-MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
-MODULE_DESCRIPTION("iMX SPI Controller Driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c
new file mode 100644 (file)
index 0000000..140a18d
--- /dev/null
@@ -0,0 +1,612 @@
+/*
+ * SPI_PPC4XX SPI controller driver.
+ *
+ * Copyright (C) 2007 Gary Jennejohn <garyj@denx.de>
+ * Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
+ * Copyright 2009 Harris Corporation, Steven A. Falco <sfalco@harris.com>
+ *
+ * Based in part on drivers/spi/spi_s3c24xx.c
+ *
+ * Copyright (c) 2006 Ben Dooks
+ * Copyright (c) 2006 Simtec Electronics
+ *     Ben Dooks <ben@simtec.co.uk>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+/*
+ * The PPC4xx SPI controller has no FIFO so each sent/received byte will
+ * generate an interrupt to the CPU. This can cause high CPU utilization.
+ * This driver allows platforms to reduce the interrupt load on the CPU
+ * during SPI transfers by setting max_speed_hz via the device tree.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/wait.h>
+#include <linux/of_platform.h>
+#include <linux/of_spi.h>
+#include <linux/of_gpio.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+
+#include <linux/gpio.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+
+#include <asm/io.h>
+#include <asm/dcr.h>
+#include <asm/dcr-regs.h>
+
+/* bits in mode register - bit 0 is MSb */
+
+/*
+ * SPI_PPC4XX_MODE_SCP = 0 means "data latched on trailing edge of clock"
+ * SPI_PPC4XX_MODE_SCP = 1 means "data latched on leading edge of clock"
+ * Note: This is the inverse of CPHA.
+ */
+#define SPI_PPC4XX_MODE_SCP    (0x80 >> 3)
+
+/* SPI_PPC4XX_MODE_SPE = 1 means "port enabled" */
+#define SPI_PPC4XX_MODE_SPE    (0x80 >> 4)
+
+/*
+ * SPI_PPC4XX_MODE_RD = 0 means "MSB first" - this is the normal mode
+ * SPI_PPC4XX_MODE_RD = 1 means "LSB first" - this is bit-reversed mode
+ * Note: This is identical to SPI_LSB_FIRST.
+ */
+#define SPI_PPC4XX_MODE_RD     (0x80 >> 5)
+
+/*
+ * SPI_PPC4XX_MODE_CI = 0 means "clock idles low"
+ * SPI_PPC4XX_MODE_CI = 1 means "clock idles high"
+ * Note: This is identical to CPOL.
+ */
+#define SPI_PPC4XX_MODE_CI     (0x80 >> 6)
+
+/*
+ * SPI_PPC4XX_MODE_IL = 0 means "loopback disable"
+ * SPI_PPC4XX_MODE_IL = 1 means "loopback enable"
+ */
+#define SPI_PPC4XX_MODE_IL     (0x80 >> 7)
+
+/* bits in control register */
+/* starts a transfer when set */
+#define SPI_PPC4XX_CR_STR      (0x80 >> 7)
+
+/* bits in status register */
+/* port is busy with a transfer */
+#define SPI_PPC4XX_SR_BSY      (0x80 >> 6)
+/* RxD ready */
+#define SPI_PPC4XX_SR_RBR      (0x80 >> 7)
+
+/* clock settings (SCP and CI) for various SPI modes */
+#define SPI_CLK_MODE0  (SPI_PPC4XX_MODE_SCP | 0)
+#define SPI_CLK_MODE1  (0 | 0)
+#define SPI_CLK_MODE2  (SPI_PPC4XX_MODE_SCP | SPI_PPC4XX_MODE_CI)
+#define SPI_CLK_MODE3  (0 | SPI_PPC4XX_MODE_CI)
+
+#define DRIVER_NAME    "spi_ppc4xx_of"
+
+struct spi_ppc4xx_regs {
+       u8 mode;
+       u8 rxd;
+       u8 txd;
+       u8 cr;
+       u8 sr;
+       u8 dummy;
+       /*
+        * Clock divisor modulus register
+        * This uses the follwing formula:
+        *    SCPClkOut = OPBCLK/(4(CDM + 1))
+        * or
+        *    CDM = (OPBCLK/4*SCPClkOut) - 1
+        * bit 0 is the MSb!
+        */
+       u8 cdm;
+};
+
+/* SPI Controller driver's private data. */
+struct ppc4xx_spi {
+       /* bitbang has to be first */
+       struct spi_bitbang bitbang;
+       struct completion done;
+
+       u64 mapbase;
+       u64 mapsize;
+       int irqnum;
+       /* need this to set the SPI clock */
+       unsigned int opb_freq;
+
+       /* for transfers */
+       int len;
+       int count;
+       /* data buffers */
+       const unsigned char *tx;
+       unsigned char *rx;
+
+       int *gpios;
+
+       struct spi_ppc4xx_regs __iomem *regs; /* pointer to the registers */
+       struct spi_master *master;
+       struct device *dev;
+};
+
+/* need this so we can set the clock in the chipselect routine */
+struct spi_ppc4xx_cs {
+       u8 mode;
+};
+
+static int spi_ppc4xx_txrx(struct spi_device *spi, struct spi_transfer *t)
+{
+       struct ppc4xx_spi *hw;
+       u8 data;
+
+       dev_dbg(&spi->dev, "txrx: tx %p, rx %p, len %d\n",
+               t->tx_buf, t->rx_buf, t->len);
+
+       hw = spi_master_get_devdata(spi->master);
+
+       hw->tx = t->tx_buf;
+       hw->rx = t->rx_buf;
+       hw->len = t->len;
+       hw->count = 0;
+
+       /* send the first byte */
+       data = hw->tx ? hw->tx[0] : 0;
+       out_8(&hw->regs->txd, data);
+       out_8(&hw->regs->cr, SPI_PPC4XX_CR_STR);
+       wait_for_completion(&hw->done);
+
+       return hw->count;
+}
+
+static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)
+{
+       struct ppc4xx_spi *hw = spi_master_get_devdata(spi->master);
+       struct spi_ppc4xx_cs *cs = spi->controller_state;
+       int scr;
+       u8 cdm = 0;
+       u32 speed;
+       u8 bits_per_word;
+
+       /* Start with the generic configuration for this device. */
+       bits_per_word = spi->bits_per_word;
+       speed = spi->max_speed_hz;
+
+       /*
+        * Modify the configuration if the transfer overrides it.  Do not allow
+        * the transfer to overwrite the generic configuration with zeros.
+        */
+       if (t) {
+               if (t->bits_per_word)
+                       bits_per_word = t->bits_per_word;
+
+               if (t->speed_hz)
+                       speed = min(t->speed_hz, spi->max_speed_hz);
+       }
+
+       if (bits_per_word != 8) {
+               dev_err(&spi->dev, "invalid bits-per-word (%d)\n",
+                               bits_per_word);
+               return -EINVAL;
+       }
+
+       if (!speed || (speed > spi->max_speed_hz)) {
+               dev_err(&spi->dev, "invalid speed_hz (%d)\n", speed);
+               return -EINVAL;
+       }
+
+       /* Write new configration */
+       out_8(&hw->regs->mode, cs->mode);
+
+       /* Set the clock */
+       /* opb_freq was already divided by 4 */
+       scr = (hw->opb_freq / speed) - 1;
+       if (scr > 0)
+               cdm = min(scr, 0xff);
+
+       dev_dbg(&spi->dev, "setting pre-scaler to %d (hz %d)\n", cdm, speed);
+
+       if (in_8(&hw->regs->cdm) != cdm)
+               out_8(&hw->regs->cdm, cdm);
+
+       spin_lock(&hw->bitbang.lock);
+       if (!hw->bitbang.busy) {
+               hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE);
+               /* Need to ndelay here? */
+       }
+       spin_unlock(&hw->bitbang.lock);
+
+       return 0;
+}
+
+static int spi_ppc4xx_setup(struct spi_device *spi)
+{
+       struct spi_ppc4xx_cs *cs = spi->controller_state;
+
+       if (spi->bits_per_word != 8) {
+               dev_err(&spi->dev, "invalid bits-per-word (%d)\n",
+                       spi->bits_per_word);
+               return -EINVAL;
+       }
+
+       if (!spi->max_speed_hz) {
+               dev_err(&spi->dev, "invalid max_speed_hz (must be non-zero)\n");
+               return -EINVAL;
+       }
+
+       if (cs == NULL) {
+               cs = kzalloc(sizeof *cs, GFP_KERNEL);
+               if (!cs)
+                       return -ENOMEM;
+               spi->controller_state = cs;
+       }
+
+       /*
+        * We set all bits of the SPI0_MODE register, so,
+        * no need to read-modify-write
+        */
+       cs->mode = SPI_PPC4XX_MODE_SPE;
+
+       switch (spi->mode & (SPI_CPHA | SPI_CPOL)) {
+       case SPI_MODE_0:
+               cs->mode |= SPI_CLK_MODE0;
+               break;
+       case SPI_MODE_1:
+               cs->mode |= SPI_CLK_MODE1;
+               break;
+       case SPI_MODE_2:
+               cs->mode |= SPI_CLK_MODE2;
+               break;
+       case SPI_MODE_3:
+               cs->mode |= SPI_CLK_MODE3;
+               break;
+       }
+
+       if (spi->mode & SPI_LSB_FIRST)
+               cs->mode |= SPI_PPC4XX_MODE_RD;
+
+       return 0;
+}
+
+static void spi_ppc4xx_chipsel(struct spi_device *spi, int value)
+{
+       struct ppc4xx_spi *hw = spi_master_get_devdata(spi->master);
+       unsigned int cs = spi->chip_select;
+       unsigned int cspol;
+
+       /*
+        * If there are no chip selects at all, or if this is the special
+        * case of a non-existent (dummy) chip select, do nothing.
+        */
+
+       if (!hw->master->num_chipselect || hw->gpios[cs] == -EEXIST)
+               return;
+
+       cspol = spi->mode & SPI_CS_HIGH ? 1 : 0;
+       if (value == BITBANG_CS_INACTIVE)
+               cspol = !cspol;
+
+       gpio_set_value(hw->gpios[cs], cspol);
+}
+
+static irqreturn_t spi_ppc4xx_int(int irq, void *dev_id)
+{
+       struct ppc4xx_spi *hw;
+       u8 status;
+       u8 data;
+       unsigned int count;
+
+       hw = (struct ppc4xx_spi *)dev_id;
+
+       status = in_8(&hw->regs->sr);
+       if (!status)
+               return IRQ_NONE;
+
+       /*
+        * BSY de-asserts one cycle after the transfer is complete.  The
+        * interrupt is asserted after the transfer is complete.  The exact
+        * relationship is not documented, hence this code.
+        */
+
+       if (unlikely(status & SPI_PPC4XX_SR_BSY)) {
+               u8 lstatus;
+               int cnt = 0;
+
+               dev_dbg(hw->dev, "got interrupt but spi still busy?\n");
+               do {
+                       ndelay(10);
+                       lstatus = in_8(&hw->regs->sr);
+               } while (++cnt < 100 && lstatus & SPI_PPC4XX_SR_BSY);
+
+               if (cnt >= 100) {
+                       dev_err(hw->dev, "busywait: too many loops!\n");
+                       complete(&hw->done);
+                       return IRQ_HANDLED;
+               } else {
+                       /* status is always 1 (RBR) here */
+                       status = in_8(&hw->regs->sr);
+                       dev_dbg(hw->dev, "loops %d status %x\n", cnt, status);
+               }
+       }
+
+       count = hw->count;
+       hw->count++;
+
+       /* RBR triggered this interrupt.  Therefore, data must be ready. */
+       data = in_8(&hw->regs->rxd);
+       if (hw->rx)
+               hw->rx[count] = data;
+
+       count++;
+
+       if (count < hw->len) {
+               data = hw->tx ? hw->tx[count] : 0;
+               out_8(&hw->regs->txd, data);
+               out_8(&hw->regs->cr, SPI_PPC4XX_CR_STR);
+       } else {
+               complete(&hw->done);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static void spi_ppc4xx_cleanup(struct spi_device *spi)
+{
+       kfree(spi->controller_state);
+}
+
+static void spi_ppc4xx_enable(struct ppc4xx_spi *hw)
+{
+       /*
+        * On all 4xx PPC's the SPI bus is shared/multiplexed with
+        * the 2nd I2C bus. We need to enable the the SPI bus before
+        * using it.
+        */
+
+       /* need to clear bit 14 to enable SPC */
+       dcri_clrset(SDR0, SDR0_PFC1, 0x80000000 >> 14, 0);
+}
+
+static void free_gpios(struct ppc4xx_spi *hw)
+{
+       if (hw->master->num_chipselect) {
+               int i;
+               for (i = 0; i < hw->master->num_chipselect; i++)
+                       if (gpio_is_valid(hw->gpios[i]))
+                               gpio_free(hw->gpios[i]);
+
+               kfree(hw->gpios);
+               hw->gpios = NULL;
+       }
+}
+
+/*
+ * of_device layer stuff...
+ */
+static int __init spi_ppc4xx_of_probe(struct of_device *op,
+                                     const struct of_device_id *match)
+{
+       struct ppc4xx_spi *hw;
+       struct spi_master *master;
+       struct spi_bitbang *bbp;
+       struct resource resource;
+       struct device_node *np = op->node;
+       struct device *dev = &op->dev;
+       struct device_node *opbnp;
+       int ret;
+       int num_gpios;
+       const unsigned int *clk;
+
+       master = spi_alloc_master(dev, sizeof *hw);
+       if (master == NULL)
+               return -ENOMEM;
+       dev_set_drvdata(dev, master);
+       hw = spi_master_get_devdata(master);
+       hw->master = spi_master_get(master);
+       hw->dev = dev;
+
+       init_completion(&hw->done);
+
+       /*
+        * A count of zero implies a single SPI device without any chip-select.
+        * Note that of_gpio_count counts all gpios assigned to this spi master.
+        * This includes both "null" gpio's and real ones.
+        */
+       num_gpios = of_gpio_count(np);
+       if (num_gpios) {
+               int i;
+
+               hw->gpios = kzalloc(sizeof(int) * num_gpios, GFP_KERNEL);
+               if (!hw->gpios) {
+                       ret = -ENOMEM;
+                       goto free_master;
+               }
+
+               for (i = 0; i < num_gpios; i++) {
+                       int gpio;
+                       enum of_gpio_flags flags;
+
+                       gpio = of_get_gpio_flags(np, i, &flags);
+                       hw->gpios[i] = gpio;
+
+                       if (gpio_is_valid(gpio)) {
+                               /* Real CS - set the initial state. */
+                               ret = gpio_request(gpio, np->name);
+                               if (ret < 0) {
+                                       dev_err(dev, "can't request gpio "
+                                                       "#%d: %d\n", i, ret);
+                                       goto free_gpios;
+                               }
+
+                               gpio_direction_output(gpio,
+                                               !!(flags & OF_GPIO_ACTIVE_LOW));
+                       } else if (gpio == -EEXIST) {
+                               ; /* No CS, but that's OK. */
+                       } else {
+                               dev_err(dev, "invalid gpio #%d: %d\n", i, gpio);
+                               ret = -EINVAL;
+                               goto free_gpios;
+                       }
+               }
+       }
+
+       /* Setup the state for the bitbang driver */
+       bbp = &hw->bitbang;
+       bbp->master = hw->master;
+       bbp->setup_transfer = spi_ppc4xx_setupxfer;
+       bbp->chipselect = spi_ppc4xx_chipsel;
+       bbp->txrx_bufs = spi_ppc4xx_txrx;
+       bbp->use_dma = 0;
+       bbp->master->setup = spi_ppc4xx_setup;
+       bbp->master->cleanup = spi_ppc4xx_cleanup;
+
+       /* Allocate bus num dynamically. */
+       bbp->master->bus_num = -1;
+
+       /* the spi->mode bits understood by this driver: */
+       bbp->master->mode_bits =
+               SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST;
+
+       /* this many pins in all GPIO controllers */
+       bbp->master->num_chipselect = num_gpios;
+
+       /* Get the clock for the OPB */
+       opbnp = of_find_compatible_node(NULL, NULL, "ibm,opb");
+       if (opbnp == NULL) {
+               dev_err(dev, "OPB: cannot find node\n");
+               ret = -ENODEV;
+               goto free_gpios;
+       }
+       /* Get the clock (Hz) for the OPB */
+       clk = of_get_property(opbnp, "clock-frequency", NULL);
+       if (clk == NULL) {
+               dev_err(dev, "OPB: no clock-frequency property set\n");
+               of_node_put(opbnp);
+               ret = -ENODEV;
+               goto free_gpios;
+       }
+       hw->opb_freq = *clk;
+       hw->opb_freq >>= 2;
+       of_node_put(opbnp);
+
+       ret = of_address_to_resource(np, 0, &resource);
+       if (ret) {
+               dev_err(dev, "error while parsing device node resource\n");
+               goto free_gpios;
+       }
+       hw->mapbase = resource.start;
+       hw->mapsize = resource.end - resource.start + 1;
+
+       /* Sanity check */
+       if (hw->mapsize < sizeof(struct spi_ppc4xx_regs)) {
+               dev_err(dev, "too small to map registers\n");
+               ret = -EINVAL;
+               goto free_gpios;
+       }
+
+       /* Request IRQ */
+       hw->irqnum = irq_of_parse_and_map(np, 0);
+       ret = request_irq(hw->irqnum, spi_ppc4xx_int,
+                         IRQF_DISABLED, "spi_ppc4xx_of", (void *)hw);
+       if (ret) {
+               dev_err(dev, "unable to allocate interrupt\n");
+               goto free_gpios;
+       }
+
+       if (!request_mem_region(hw->mapbase, hw->mapsize, DRIVER_NAME)) {
+               dev_err(dev, "resource unavailable\n");
+               ret = -EBUSY;
+               goto request_mem_error;
+       }
+
+       hw->regs = ioremap(hw->mapbase, sizeof(struct spi_ppc4xx_regs));
+
+       if (!hw->regs) {
+               dev_err(dev, "unable to memory map registers\n");
+               ret = -ENXIO;
+               goto map_io_error;
+       }
+
+       spi_ppc4xx_enable(hw);
+
+       /* Finally register our spi controller */
+       dev->dma_mask = 0;
+       ret = spi_bitbang_start(bbp);
+       if (ret) {
+               dev_err(dev, "failed to register SPI master\n");
+               goto unmap_regs;
+       }
+
+       dev_info(dev, "driver initialized\n");
+       of_register_spi_devices(master, np);
+
+       return 0;
+
+unmap_regs:
+       iounmap(hw->regs);
+map_io_error:
+       release_mem_region(hw->mapbase, hw->mapsize);
+request_mem_error:
+       free_irq(hw->irqnum, hw);
+free_gpios:
+       free_gpios(hw);
+free_master:
+       dev_set_drvdata(dev, NULL);
+       spi_master_put(master);
+
+       dev_err(dev, "initialization failed\n");
+       return ret;
+}
+
+static int __exit spi_ppc4xx_of_remove(struct of_device *op)
+{
+       struct spi_master *master = dev_get_drvdata(&op->dev);
+       struct ppc4xx_spi *hw = spi_master_get_devdata(master);
+
+       spi_bitbang_stop(&hw->bitbang);
+       dev_set_drvdata(&op->dev, NULL);
+       release_mem_region(hw->mapbase, hw->mapsize);
+       free_irq(hw->irqnum, hw);
+       iounmap(hw->regs);
+       free_gpios(hw);
+       return 0;
+}
+
+static struct of_device_id spi_ppc4xx_of_match[] = {
+       { .compatible = "ibm,ppc4xx-spi", },
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
+
+static struct of_platform_driver spi_ppc4xx_of_driver = {
+       .match_table = spi_ppc4xx_of_match,
+       .probe = spi_ppc4xx_of_probe,
+       .remove = __exit_p(spi_ppc4xx_of_remove),
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+       },
+};
+
+static int __init spi_ppc4xx_init(void)
+{
+       return of_register_platform_driver(&spi_ppc4xx_of_driver);
+}
+module_init(spi_ppc4xx_init);
+
+static void __exit spi_ppc4xx_exit(void)
+{
+       of_unregister_platform_driver(&spi_ppc4xx_of_driver);
+}
+module_exit(spi_ppc4xx_exit);
+
+MODULE_AUTHOR("Gary Jennejohn & Stefan Roese");
+MODULE_DESCRIPTION("Simple PPC4xx SPI Driver");
+MODULE_LICENSE("GPL");
index 3f3119d..33d94f7 100644 (file)
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/io.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <mach/hardware.h>
-
 #include <plat/regs-spi.h>
 #include <mach/spi.h>
 
+/**
+ * s3c24xx_spi_devstate - per device data
+ * @hz: Last frequency calculated for @sppre field.
+ * @mode: Last mode setting for the @spcon field.
+ * @spcon: Value to write to the SPCON register.
+ * @sppre: Value to write to the SPPRE register.
+ */
+struct s3c24xx_spi_devstate {
+       unsigned int    hz;
+       unsigned int    mode;
+       u8              spcon;
+       u8              sppre;
+};
+
 struct s3c24xx_spi {
        /* bitbang has to be first */
        struct spi_bitbang       bitbang;
@@ -71,43 +82,31 @@ static void s3c24xx_spi_gpiocs(struct s3c2410_spi_info *spi, int cs, int pol)
 
 static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
 {
+       struct s3c24xx_spi_devstate *cs = spi->controller_state;
        struct s3c24xx_spi *hw = to_hw(spi);
        unsigned int cspol = spi->mode & SPI_CS_HIGH ? 1 : 0;
-       unsigned int spcon;
+
+       /* change the chipselect state and the state of the spi engine clock */
 
        switch (value) {
        case BITBANG_CS_INACTIVE:
                hw->set_cs(hw->pdata, spi->chip_select, cspol^1);
+               writeb(cs->spcon, hw->regs + S3C2410_SPCON);
                break;
 
        case BITBANG_CS_ACTIVE:
-               spcon = readb(hw->regs + S3C2410_SPCON);
-
-               if (spi->mode & SPI_CPHA)
-                       spcon |= S3C2410_SPCON_CPHA_FMTB;
-               else
-                       spcon &= ~S3C2410_SPCON_CPHA_FMTB;
-
-               if (spi->mode & SPI_CPOL)
-                       spcon |= S3C2410_SPCON_CPOL_HIGH;
-               else
-                       spcon &= ~S3C2410_SPCON_CPOL_HIGH;
-
-               spcon |= S3C2410_SPCON_ENSCK;
-
-               /* write new configration */
-
-               writeb(spcon, hw->regs + S3C2410_SPCON);
+               writeb(cs->spcon | S3C2410_SPCON_ENSCK,
+                      hw->regs + S3C2410_SPCON);
                hw->set_cs(hw->pdata, spi->chip_select, cspol);
-
                break;
        }
 }
 
-static int s3c24xx_spi_setupxfer(struct spi_device *spi,
-                                struct spi_transfer *t)
+static int s3c24xx_spi_update_state(struct spi_device *spi,
+                                   struct spi_transfer *t)
 {
        struct s3c24xx_spi *hw = to_hw(spi);
+       struct s3c24xx_spi_devstate *cs = spi->controller_state;
        unsigned int bpw;
        unsigned int hz;
        unsigned int div;
@@ -127,41 +126,89 @@ static int s3c24xx_spi_setupxfer(struct spi_device *spi,
                return -EINVAL;
        }
 
-       clk = clk_get_rate(hw->clk);
-       div = DIV_ROUND_UP(clk, hz * 2) - 1;
+       if (spi->mode != cs->mode) {
+               u8 spcon = SPCON_DEFAULT;
 
-       if (div > 255)
-               div = 255;
+               if (spi->mode & SPI_CPHA)
+                       spcon |= S3C2410_SPCON_CPHA_FMTB;
 
-       dev_dbg(&spi->dev, "setting pre-scaler to %d (wanted %d, got %ld)\n",
-               div, hz, clk / (2 * (div + 1)));
+               if (spi->mode & SPI_CPOL)
+                       spcon |= S3C2410_SPCON_CPOL_HIGH;
 
+               cs->mode = spi->mode;
+               cs->spcon = spcon;
+       }
 
-       writeb(div, hw->regs + S3C2410_SPPRE);
+       if (cs->hz != hz) {
+               clk = clk_get_rate(hw->clk);
+               div = DIV_ROUND_UP(clk, hz * 2) - 1;
 
-       spin_lock(&hw->bitbang.lock);
-       if (!hw->bitbang.busy) {
-               hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE);
-               /* need to ndelay for 0.5 clocktick ? */
+               if (div > 255)
+                       div = 255;
+
+               dev_dbg(&spi->dev, "pre-scaler=%d (wanted %d, got %ld)\n",
+                       div, hz, clk / (2 * (div + 1)));
+
+               cs->hz = hz;
+               cs->sppre = div;
        }
-       spin_unlock(&hw->bitbang.lock);
 
        return 0;
 }
 
+static int s3c24xx_spi_setupxfer(struct spi_device *spi,
+                                struct spi_transfer *t)
+{
+       struct s3c24xx_spi_devstate *cs = spi->controller_state;
+       struct s3c24xx_spi *hw = to_hw(spi);
+       int ret;
+
+       ret = s3c24xx_spi_update_state(spi, t);
+       if (!ret)
+               writeb(cs->sppre, hw->regs + S3C2410_SPPRE);
+
+       return ret;
+}
+
 static int s3c24xx_spi_setup(struct spi_device *spi)
 {
+       struct s3c24xx_spi_devstate *cs = spi->controller_state;
+       struct s3c24xx_spi *hw = to_hw(spi);
        int ret;
 
-       ret = s3c24xx_spi_setupxfer(spi, NULL);
-       if (ret < 0) {
-               dev_err(&spi->dev, "setupxfer returned %d\n", ret);
+       /* allocate settings on the first call */
+       if (!cs) {
+               cs = kzalloc(sizeof(struct s3c24xx_spi_devstate), GFP_KERNEL);
+               if (!cs) {
+                       dev_err(&spi->dev, "no memory for controller state\n");
+                       return -ENOMEM;
+               }
+
+               cs->spcon = SPCON_DEFAULT;
+               cs->hz = -1;
+               spi->controller_state = cs;
+       }
+
+       /* initialise the state from the device */
+       ret = s3c24xx_spi_update_state(spi, NULL);
+       if (ret)
                return ret;
+
+       spin_lock(&hw->bitbang.lock);
+       if (!hw->bitbang.busy) {
+               hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE);
+               /* need to ndelay for 0.5 clocktick ? */
        }
+       spin_unlock(&hw->bitbang.lock);
 
        return 0;
 }
 
+static void s3c24xx_spi_cleanup(struct spi_device *spi)
+{
+       kfree(spi->controller_state);
+}
+
 static inline unsigned int hw_txbyte(struct s3c24xx_spi *hw, int count)
 {
        return hw->tx ? hw->tx[count] : 0;
@@ -289,7 +336,9 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
        hw->bitbang.setup_transfer = s3c24xx_spi_setupxfer;
        hw->bitbang.chipselect     = s3c24xx_spi_chipsel;
        hw->bitbang.txrx_bufs      = s3c24xx_spi_txrx;
-       hw->bitbang.master->setup  = s3c24xx_spi_setup;
+
+       hw->master->setup  = s3c24xx_spi_setup;
+       hw->master->cleanup = s3c24xx_spi_cleanup;
 
        dev_dbg(hw->dev, "bitbang at %p\n", &hw->bitbang);
 
@@ -302,7 +351,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
                goto err_no_iores;
        }
 
-       hw->ioarea = request_mem_region(res->start, (res->end - res->start)+1,
+       hw->ioarea = request_mem_region(res->start, resource_size(res),
                                        pdev->name);
 
        if (hw->ioarea == NULL) {
@@ -311,7 +360,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
                goto err_no_iores;
        }
 
-       hw->regs = ioremap(res->start, (res->end - res->start)+1);
+       hw->regs = ioremap(res->start, resource_size(res));
        if (hw->regs == NULL) {
                dev_err(&pdev->dev, "Cannot map IO\n");
                err = -ENXIO;
@@ -388,7 +437,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
 
  err_no_iores:
  err_no_pdata:
-       spi_master_put(hw->master);;
+       spi_master_put(hw->master);
 
  err_nomem:
        return err;
@@ -421,9 +470,9 @@ static int __exit s3c24xx_spi_remove(struct platform_device *dev)
 
 #ifdef CONFIG_PM
 
-static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
+static int s3c24xx_spi_suspend(struct device *dev)
 {
-       struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
+       struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
 
        if (hw->pdata && hw->pdata->gpio_setup)
                hw->pdata->gpio_setup(hw->pdata, 0);
@@ -432,27 +481,31 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
        return 0;
 }
 
-static int s3c24xx_spi_resume(struct platform_device *pdev)
+static int s3c24xx_spi_resume(struct device *dev)
 {
-       struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
+       struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
 
        s3c24xx_spi_initialsetup(hw);
        return 0;
 }
 
+static struct dev_pm_ops s3c24xx_spi_pmops = {
+       .suspend        = s3c24xx_spi_suspend,
+       .resume         = s3c24xx_spi_resume,
+};
+
+#define S3C24XX_SPI_PMOPS &s3c24xx_spi_pmops
 #else
-#define s3c24xx_spi_suspend NULL
-#define s3c24xx_spi_resume  NULL
-#endif
+#define S3C24XX_SPI_PMOPS NULL
+#endif /* CONFIG_PM */
 
 MODULE_ALIAS("platform:s3c2410-spi");
 static struct platform_driver s3c24xx_spi_driver = {
        .remove         = __exit_p(s3c24xx_spi_remove),
-       .suspend        = s3c24xx_spi_suspend,
-       .resume         = s3c24xx_spi_resume,
        .driver         = {
                .name   = "s3c2410-spi",
                .owner  = THIS_MODULE,
+               .pm     = S3C24XX_SPI_PMOPS,
        },
 };
 
diff --git a/drivers/spi/spi_stmp.c b/drivers/spi/spi_stmp.c
new file mode 100644 (file)
index 0000000..d871dc2
--- /dev/null
@@ -0,0 +1,679 @@
+/*
+ * Freescale STMP378X SPI master driver
+ *
+ * Author: dmitry pervushin <dimka@embeddedalley.com>
+ *
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+
+#include <mach/platform.h>
+#include <mach/stmp3xxx.h>
+#include <mach/dma.h>
+#include <mach/regs-ssp.h>
+#include <mach/regs-apbh.h>
+
+
+/* 0 means DMA mode(recommended, default), !0 - PIO mode */
+static int pio;
+static int clock;
+
+/* default timeout for busy waits is 2 seconds */
+#define STMP_SPI_TIMEOUT       (2 * HZ)
+
+struct stmp_spi {
+       int             id;
+
+       void *  __iomem regs;   /* vaddr of the control registers */
+
+       int             irq, err_irq;
+       u32             dma;
+       struct stmp3xxx_dma_descriptor d;
+
+       u32             speed_khz;
+       u32             saved_timings;
+       u32             divider;
+
+       struct clk      *clk;
+       struct device   *master_dev;
+
+       struct work_struct work;
+       struct workqueue_struct *workqueue;
+
+       /* lock protects queue access */
+       spinlock_t lock;
+       struct list_head queue;
+
+       struct completion done;
+};
+
+#define busy_wait(cond)                                                        \
+       ({                                                              \
+       unsigned long end_jiffies = jiffies + STMP_SPI_TIMEOUT;         \
+       bool succeeded = false;                                         \
+       do {                                                            \
+               if (cond) {                                             \
+                       succeeded = true;                               \
+                       break;                                          \
+               }                                                       \
+               cpu_relax();                                            \
+       } while (time_before(end_jiffies, jiffies));                    \
+       succeeded;                                                      \
+       })
+
+/**
+ * stmp_spi_init_hw
+ * Initialize the SSP port
+ */
+static int stmp_spi_init_hw(struct stmp_spi *ss)
+{
+       int err = 0;
+       void *pins = ss->master_dev->platform_data;
+
+       err = stmp3xxx_request_pin_group(pins, dev_name(ss->master_dev));
+       if (err)
+               goto out;
+
+       ss->clk = clk_get(NULL, "ssp");
+       if (IS_ERR(ss->clk)) {
+               err = PTR_ERR(ss->clk);
+               goto out_free_pins;
+       }
+       clk_enable(ss->clk);
+
+       stmp3xxx_reset_block(ss->regs, false);
+       stmp3xxx_dma_reset_channel(ss->dma);
+
+       return 0;
+
+out_free_pins:
+       stmp3xxx_release_pin_group(pins, dev_name(ss->master_dev));
+out:
+       return err;
+}
+
+static void stmp_spi_release_hw(struct stmp_spi *ss)
+{
+       void *pins = ss->master_dev->platform_data;
+
+       if (ss->clk && !IS_ERR(ss->clk)) {
+               clk_disable(ss->clk);
+               clk_put(ss->clk);
+       }
+       stmp3xxx_release_pin_group(pins, dev_name(ss->master_dev));
+}
+
+static int stmp_spi_setup_transfer(struct spi_device *spi,
+               struct spi_transfer *t)
+{
+       u8 bits_per_word;
+       u32 hz;
+       struct stmp_spi *ss = spi_master_get_devdata(spi->master);
+       u16 rate;
+
+       bits_per_word = spi->bits_per_word;
+       if (t && t->bits_per_word)
+               bits_per_word = t->bits_per_word;
+
+       /*
+        * Calculate speed:
+        *      - by default, use maximum speed from ssp clk
+        *      - if device overrides it, use it
+        *      - if transfer specifies other speed, use transfer's one
+        */
+       hz = 1000 * ss->speed_khz / ss->divider;
+       if (spi->max_speed_hz)
+               hz = min(hz, spi->max_speed_hz);
+       if (t && t->speed_hz)
+               hz = min(hz, t->speed_hz);
+
+       if (hz == 0) {
+               dev_err(&spi->dev, "Cannot continue with zero clock\n");
+               return -EINVAL;
+       }
+
+       if (bits_per_word != 8) {
+               dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
+                       __func__, bits_per_word);
+               return -EINVAL;
+       }
+
+       dev_dbg(&spi->dev, "Requested clk rate = %uHz, max = %uHz/%d = %uHz\n",
+               hz, ss->speed_khz, ss->divider,
+               ss->speed_khz * 1000 / ss->divider);
+
+       if (ss->speed_khz * 1000 / ss->divider < hz) {
+               dev_err(&spi->dev, "%s, unsupported clock rate %uHz\n",
+                       __func__, hz);
+               return -EINVAL;
+       }
+
+       rate = 1000 * ss->speed_khz/ss->divider/hz;
+
+       writel(BF(ss->divider, SSP_TIMING_CLOCK_DIVIDE)         |
+              BF(rate - 1, SSP_TIMING_CLOCK_RATE),
+              HW_SSP_TIMING + ss->regs);
+
+       writel(BF(1 /* mode SPI */, SSP_CTRL1_SSP_MODE)         |
+              BF(4 /* 8 bits   */, SSP_CTRL1_WORD_LENGTH)      |
+              ((spi->mode & SPI_CPOL) ? BM_SSP_CTRL1_POLARITY : 0) |
+              ((spi->mode & SPI_CPHA) ? BM_SSP_CTRL1_PHASE : 0) |
+              (pio ? 0 : BM_SSP_CTRL1_DMA_ENABLE),
+              ss->regs + HW_SSP_CTRL1);
+
+       return 0;
+}
+
+static int stmp_spi_setup(struct spi_device *spi)
+{
+       /* spi_setup() does basic checks,
+        * stmp_spi_setup_transfer() does more later
+        */
+       if (spi->bits_per_word != 8) {
+               dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
+                       __func__, spi->bits_per_word);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static inline u32 stmp_spi_cs(unsigned cs)
+{
+       return  ((cs & 1) ? BM_SSP_CTRL0_WAIT_FOR_CMD : 0) |
+               ((cs & 2) ? BM_SSP_CTRL0_WAIT_FOR_IRQ : 0);
+}
+
+static int stmp_spi_txrx_dma(struct stmp_spi *ss, int cs,
+               unsigned char *buf, dma_addr_t dma_buf, int len,
+               int first, int last, bool write)
+{
+       u32 c0 = 0;
+       dma_addr_t spi_buf_dma = dma_buf;
+       int status = 0;
+       enum dma_data_direction dir = write ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+
+       c0 |= (first ? BM_SSP_CTRL0_LOCK_CS : 0);
+       c0 |= (last ? BM_SSP_CTRL0_IGNORE_CRC : 0);
+       c0 |= (write ? 0 : BM_SSP_CTRL0_READ);
+       c0 |= BM_SSP_CTRL0_DATA_XFER;
+
+       c0 |= stmp_spi_cs(cs);
+
+       c0 |= BF(len, SSP_CTRL0_XFER_COUNT);
+
+       if (!dma_buf)
+               spi_buf_dma = dma_map_single(ss->master_dev, buf, len, dir);
+
+       ss->d.command->cmd =
+               BF(len, APBH_CHn_CMD_XFER_COUNT)        |
+               BF(1, APBH_CHn_CMD_CMDWORDS)            |
+               BM_APBH_CHn_CMD_WAIT4ENDCMD             |
+               BM_APBH_CHn_CMD_IRQONCMPLT              |
+               BF(write ? BV_APBH_CHn_CMD_COMMAND__DMA_READ :
+                          BV_APBH_CHn_CMD_COMMAND__DMA_WRITE,
+                  APBH_CHn_CMD_COMMAND);
+       ss->d.command->pio_words[0] = c0;
+       ss->d.command->buf_ptr = spi_buf_dma;
+
+       stmp3xxx_dma_reset_channel(ss->dma);
+       stmp3xxx_dma_clear_interrupt(ss->dma);
+       stmp3xxx_dma_enable_interrupt(ss->dma);
+       init_completion(&ss->done);
+       stmp3xxx_dma_go(ss->dma, &ss->d, 1);
+       wait_for_completion(&ss->done);
+
+       if (!busy_wait(readl(ss->regs + HW_SSP_CTRL0) & BM_SSP_CTRL0_RUN))
+               status = ETIMEDOUT;
+
+       if (!dma_buf)
+               dma_unmap_single(ss->master_dev, spi_buf_dma, len, dir);
+
+       return status;
+}
+
+static inline void stmp_spi_enable(struct stmp_spi *ss)
+{
+       stmp3xxx_setl(BM_SSP_CTRL0_LOCK_CS, ss->regs + HW_SSP_CTRL0);
+       stmp3xxx_clearl(BM_SSP_CTRL0_IGNORE_CRC, ss->regs + HW_SSP_CTRL0);
+}
+
+static inline void stmp_spi_disable(struct stmp_spi *ss)
+{
+       stmp3xxx_clearl(BM_SSP_CTRL0_LOCK_CS, ss->regs + HW_SSP_CTRL0);
+       stmp3xxx_setl(BM_SSP_CTRL0_IGNORE_CRC, ss->regs + HW_SSP_CTRL0);
+}
+
+static int stmp_spi_txrx_pio(struct stmp_spi *ss, int cs,
+               unsigned char *buf, int len,
+               bool first, bool last, bool write)
+{
+       if (first)
+               stmp_spi_enable(ss);
+
+       stmp3xxx_setl(stmp_spi_cs(cs), ss->regs + HW_SSP_CTRL0);
+
+       while (len--) {
+               if (last && len <= 0)
+                       stmp_spi_disable(ss);
+
+               stmp3xxx_clearl(BM_SSP_CTRL0_XFER_COUNT,
+                               ss->regs + HW_SSP_CTRL0);
+               stmp3xxx_setl(1, ss->regs + HW_SSP_CTRL0);
+
+               if (write)
+                       stmp3xxx_clearl(BM_SSP_CTRL0_READ,
+                                       ss->regs + HW_SSP_CTRL0);
+               else
+                       stmp3xxx_setl(BM_SSP_CTRL0_READ,
+                                       ss->regs + HW_SSP_CTRL0);
+
+               /* Run! */
+               stmp3xxx_setl(BM_SSP_CTRL0_RUN, ss->regs + HW_SSP_CTRL0);
+
+               if (!busy_wait(readl(ss->regs + HW_SSP_CTRL0) &
+                               BM_SSP_CTRL0_RUN))
+                       break;
+
+               if (write)
+                       writel(*buf, ss->regs + HW_SSP_DATA);
+
+               /* Set TRANSFER */
+               stmp3xxx_setl(BM_SSP_CTRL0_DATA_XFER, ss->regs + HW_SSP_CTRL0);
+
+               if (!write) {
+                       if (busy_wait((readl(ss->regs + HW_SSP_STATUS) &
+                                       BM_SSP_STATUS_FIFO_EMPTY)))
+                               break;
+                       *buf = readl(ss->regs + HW_SSP_DATA) & 0xFF;
+               }
+
+               if (!busy_wait(readl(ss->regs + HW_SSP_CTRL0) &
+                                       BM_SSP_CTRL0_RUN))
+                       break;
+
+               /* advance to the next byte */
+               buf++;
+       }
+
+       return len < 0 ? 0 : -ETIMEDOUT;
+}
+
+static int stmp_spi_handle_message(struct stmp_spi *ss, struct spi_message *m)
+{
+       bool first, last;
+       struct spi_transfer *t, *tmp_t;
+       int status = 0;
+       int cs;
+
+       cs = m->spi->chip_select;
+
+       list_for_each_entry_safe(t, tmp_t, &m->transfers, transfer_list) {
+
+               first = (&t->transfer_list == m->transfers.next);
+               last = (&t->transfer_list == m->transfers.prev);
+
+               if (first || t->speed_hz || t->bits_per_word)
+                       stmp_spi_setup_transfer(m->spi, t);
+
+               /* reject "not last" transfers which request to change cs */
+               if (t->cs_change && !last) {
+                       dev_err(&m->spi->dev,
+                               "Message with t->cs_change has been skipped\n");
+                       continue;
+               }
+
+               if (t->tx_buf) {
+                       status = pio ?
+                          stmp_spi_txrx_pio(ss, cs, (void *)t->tx_buf,
+                                  t->len, first, last, true) :
+                          stmp_spi_txrx_dma(ss, cs, (void *)t->tx_buf,
+                                  t->tx_dma, t->len, first, last, true);
+#ifdef DEBUG
+                       if (t->len < 0x10)
+                               print_hex_dump_bytes("Tx ",
+                                       DUMP_PREFIX_OFFSET,
+                                       t->tx_buf, t->len);
+                       else
+                               pr_debug("Tx: %d bytes\n", t->len);
+#endif
+               }
+               if (t->rx_buf) {
+                       status = pio ?
+                          stmp_spi_txrx_pio(ss, cs, t->rx_buf,
+                                  t->len, first, last, false) :
+                          stmp_spi_txrx_dma(ss, cs, t->rx_buf,
+                                  t->rx_dma, t->len, first, last, false);
+#ifdef DEBUG
+                       if (t->len < 0x10)
+                               print_hex_dump_bytes("Rx ",
+                                       DUMP_PREFIX_OFFSET,
+                                       t->rx_buf, t->len);
+                       else
+                               pr_debug("Rx: %d bytes\n", t->len);
+#endif
+               }
+
+               if (t->delay_usecs)
+                       udelay(t->delay_usecs);
+
+               if (status)
+                       break;
+
+       }
+       return status;
+}
+
+/**
+ * stmp_spi_handle - handle messages from the queue
+ */
+static void stmp_spi_handle(struct work_struct *w)
+{
+       struct stmp_spi *ss = container_of(w, struct stmp_spi, work);
+       unsigned long flags;
+       struct spi_message *m;
+
+       spin_lock_irqsave(&ss->lock, flags);
+       while (!list_empty(&ss->queue)) {
+               m = list_entry(ss->queue.next, struct spi_message, queue);
+               list_del_init(&m->queue);
+               spin_unlock_irqrestore(&ss->lock, flags);
+
+               m->status = stmp_spi_handle_message(ss, m);
+               m->complete(m->context);
+
+               spin_lock_irqsave(&ss->lock, flags);
+       }
+       spin_unlock_irqrestore(&ss->lock, flags);
+
+       return;
+}
+
+/**
+ * stmp_spi_transfer - perform message transfer.
+ * Called indirectly from spi_async, queues all the messages to
+ * spi_handle_message.
+ * @spi: spi device
+ * @m: message to be queued
+ */
+static int stmp_spi_transfer(struct spi_device *spi, struct spi_message *m)
+{
+       struct stmp_spi *ss = spi_master_get_devdata(spi->master);
+       unsigned long flags;
+
+       m->status = -EINPROGRESS;
+       spin_lock_irqsave(&ss->lock, flags);
+       list_add_tail(&m->queue, &ss->queue);
+       queue_work(ss->workqueue, &ss->work);
+       spin_unlock_irqrestore(&ss->lock, flags);
+       return 0;
+}
+
+static irqreturn_t stmp_spi_irq(int irq, void *dev_id)
+{
+       struct stmp_spi *ss = dev_id;
+
+       stmp3xxx_dma_clear_interrupt(ss->dma);
+       complete(&ss->done);
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t stmp_spi_irq_err(int irq, void *dev_id)
+{
+       struct stmp_spi *ss = dev_id;
+       u32 c1, st;
+
+       c1 = readl(ss->regs + HW_SSP_CTRL1);
+       st = readl(ss->regs + HW_SSP_STATUS);
+       dev_err(ss->master_dev, "%s: status = 0x%08X, c1 = 0x%08X\n",
+               __func__, st, c1);
+       stmp3xxx_clearl(c1 & 0xCCCC0000, ss->regs + HW_SSP_CTRL1);
+
+       return IRQ_HANDLED;
+}
+
+static int __devinit stmp_spi_probe(struct platform_device *dev)
+{
+       int err = 0;
+       struct spi_master *master;
+       struct stmp_spi *ss;
+       struct resource *r;
+
+       master = spi_alloc_master(&dev->dev, sizeof(struct stmp_spi));
+       if (master == NULL) {
+               err = -ENOMEM;
+               goto out0;
+       }
+       master->flags = SPI_MASTER_HALF_DUPLEX;
+
+       ss = spi_master_get_devdata(master);
+       platform_set_drvdata(dev, master);
+
+       /* Get resources(memory, IRQ) associated with the device */
+       r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+       if (r == NULL) {
+               err = -ENODEV;
+               goto out_put_master;
+       }
+       ss->regs = ioremap(r->start, resource_size(r));
+       if (!ss->regs) {
+               err = -EINVAL;
+               goto out_put_master;
+       }
+
+       ss->master_dev = &dev->dev;
+       ss->id = dev->id;
+
+       INIT_WORK(&ss->work, stmp_spi_handle);
+       INIT_LIST_HEAD(&ss->queue);
+       spin_lock_init(&ss->lock);
+
+       ss->workqueue = create_singlethread_workqueue(dev_name(&dev->dev));
+       if (!ss->workqueue) {
+               err = -ENXIO;
+               goto out_put_master;
+       }
+       master->transfer = stmp_spi_transfer;
+       master->setup = stmp_spi_setup;
+
+       /* the spi->mode bits understood by this driver: */
+       master->mode_bits = SPI_CPOL | SPI_CPHA;
+
+       ss->irq = platform_get_irq(dev, 0);
+       if (ss->irq < 0) {
+               err = ss->irq;
+               goto out_put_master;
+       }
+       ss->err_irq = platform_get_irq(dev, 1);
+       if (ss->err_irq < 0) {
+               err = ss->err_irq;
+               goto out_put_master;
+       }
+
+       r = platform_get_resource(dev, IORESOURCE_DMA, 0);
+       if (r == NULL) {
+               err = -ENODEV;
+               goto out_put_master;
+       }
+
+       ss->dma = r->start;
+       err = stmp3xxx_dma_request(ss->dma, &dev->dev, dev_name(&dev->dev));
+       if (err)
+               goto out_put_master;
+
+       err = stmp3xxx_dma_allocate_command(ss->dma, &ss->d);
+       if (err)
+               goto out_free_dma;
+
+       master->bus_num = dev->id;
+       master->num_chipselect = 1;
+
+       /* SPI controller initializations */
+       err = stmp_spi_init_hw(ss);
+       if (err) {
+               dev_dbg(&dev->dev, "cannot initialize hardware\n");
+               goto out_free_dma_desc;
+       }
+
+       if (clock) {
+               dev_info(&dev->dev, "clock rate forced to %d\n", clock);
+               clk_set_rate(ss->clk, clock);
+       }
+       ss->speed_khz = clk_get_rate(ss->clk);
+       ss->divider = 2;
+       dev_info(&dev->dev, "max possible speed %d = %ld/%d kHz\n",
+               ss->speed_khz, clk_get_rate(ss->clk), ss->divider);
+
+       /* Register for SPI interrupt */
+       err = request_irq(ss->irq, stmp_spi_irq, 0,
+                         dev_name(&dev->dev), ss);
+       if (err) {
+               dev_dbg(&dev->dev, "request_irq failed, %d\n", err);
+               goto out_release_hw;
+       }
+
+       /* ..and shared interrupt for all SSP controllers */
+       err = request_irq(ss->err_irq, stmp_spi_irq_err, IRQF_SHARED,
+                         dev_name(&dev->dev), ss);
+       if (err) {
+               dev_dbg(&dev->dev, "request_irq(error) failed, %d\n", err);
+               goto out_free_irq;
+       }
+
+       err = spi_register_master(master);
+       if (err) {
+               dev_dbg(&dev->dev, "cannot register spi master, %d\n", err);
+               goto out_free_irq_2;
+       }
+       dev_info(&dev->dev, "at (mapped) 0x%08X, irq=%d, bus %d, %s mode\n",
+                       (u32)ss->regs, ss->irq, master->bus_num,
+                       pio ? "PIO" : "DMA");
+       return 0;
+
+out_free_irq_2:
+       free_irq(ss->err_irq, ss);
+out_free_irq:
+       free_irq(ss->irq, ss);
+out_free_dma_desc:
+       stmp3xxx_dma_free_command(ss->dma, &ss->d);
+out_free_dma:
+       stmp3xxx_dma_release(ss->dma);
+out_release_hw:
+       stmp_spi_release_hw(ss);
+out_put_master:
+       if (ss->workqueue)
+               destroy_workqueue(ss->workqueue);
+       if (ss->regs)
+               iounmap(ss->regs);
+       platform_set_drvdata(dev, NULL);
+       spi_master_put(master);
+out0:
+       return err;
+}
+
+static int __devexit stmp_spi_remove(struct platform_device *dev)
+{
+       struct stmp_spi *ss;
+       struct spi_master *master;
+
+       master = platform_get_drvdata(dev);
+       if (master == NULL)
+               goto out0;
+       ss = spi_master_get_devdata(master);
+
+       spi_unregister_master(master);
+
+       free_irq(ss->err_irq, ss);
+       free_irq(ss->irq, ss);
+       stmp3xxx_dma_free_command(ss->dma, &ss->d);
+       stmp3xxx_dma_release(ss->dma);
+       stmp_spi_release_hw(ss);
+       destroy_workqueue(ss->workqueue);
+       iounmap(ss->regs);
+       spi_master_put(master);
+       platform_set_drvdata(dev, NULL);
+out0:
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int stmp_spi_suspend(struct platform_device *pdev, pm_message_t pmsg)
+{
+       struct stmp_spi *ss;
+       struct spi_master *master;
+
+       master = platform_get_drvdata(pdev);
+       ss = spi_master_get_devdata(master);
+
+       ss->saved_timings = readl(HW_SSP_TIMING + ss->regs);
+       clk_disable(ss->clk);
+
+       return 0;
+}
+
+static int stmp_spi_resume(struct platform_device *pdev)
+{
+       struct stmp_spi *ss;
+       struct spi_master *master;
+
+       master = platform_get_drvdata(pdev);
+       ss = spi_master_get_devdata(master);
+
+       clk_enable(ss->clk);
+       stmp3xxx_reset_block(ss->regs, false);
+       writel(ss->saved_timings, ss->regs + HW_SSP_TIMING);
+
+       return 0;
+}
+
+#else
+#define stmp_spi_suspend NULL
+#define stmp_spi_resume  NULL
+#endif
+
+static struct platform_driver stmp_spi_driver = {
+       .probe  = stmp_spi_probe,
+       .remove = __devexit_p(stmp_spi_remove),
+       .driver = {
+               .name = "stmp3xxx_ssp",
+               .owner = THIS_MODULE,
+       },
+       .suspend = stmp_spi_suspend,
+       .resume  = stmp_spi_resume,
+};
+
+static int __init stmp_spi_init(void)
+{
+       return platform_driver_register(&stmp_spi_driver);
+}
+
+static void __exit stmp_spi_exit(void)
+{
+       platform_driver_unregister(&stmp_spi_driver);
+}
+
+module_init(stmp_spi_init);
+module_exit(stmp_spi_exit);
+module_param(pio, int, S_IRUGO);
+module_param(clock, int, S_IRUGO);
+MODULE_AUTHOR("dmitry pervushin <dpervushin@embeddedalley.com>");
+MODULE_DESCRIPTION("STMP3xxx SPI/SSP driver");
+MODULE_LICENSE("GPL");
index 606e7a4..f921bd1 100644 (file)
@@ -688,3 +688,4 @@ module_exit(spidev_exit);
 MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
 MODULE_DESCRIPTION("User mode SPI device interface");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:spidev");
index 455991f..bf9540f 100644 (file)
@@ -329,3 +329,4 @@ module_exit(tle62x0_exit);
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("TLE62x0 SPI driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:tle62x0");
index 10d3fcf..82b3489 100644 (file)
@@ -47,6 +47,8 @@ source "drivers/staging/slicoss/Kconfig"
 
 source "drivers/staging/go7007/Kconfig"
 
+source "drivers/staging/cx25821/Kconfig"
+
 source "drivers/staging/usbip/Kconfig"
 
 source "drivers/staging/winbond/Kconfig"
index c30093b..b1cad0d 100644 (file)
@@ -6,6 +6,7 @@ obj-$(CONFIG_STAGING)           += staging.o
 obj-$(CONFIG_ET131X)           += et131x/
 obj-$(CONFIG_SLICOSS)          += slicoss/
 obj-$(CONFIG_VIDEO_GO7007)     += go7007/
+obj-$(CONFIG_VIDEO_CX25821)    += cx25821/
 obj-$(CONFIG_USB_IP_COMMON)    += usbip/
 obj-$(CONFIG_W35UND)           += winbond/
 obj-$(CONFIG_PRISM2_USB)       += wlan-ng/
diff --git a/drivers/staging/cx25821/Kconfig b/drivers/staging/cx25821/Kconfig
new file mode 100644 (file)
index 0000000..df7756a
--- /dev/null
@@ -0,0 +1,34 @@
+config VIDEO_CX25821
+       tristate "Conexant cx25821 support"
+       depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+       select I2C_ALGOBIT
+       select VIDEO_BTCX
+       select VIDEO_TVEEPROM
+       select VIDEO_IR
+       select VIDEOBUF_DVB
+       select VIDEOBUF_DMA_SG
+       select VIDEO_CX25840
+       select VIDEO_CX2341X
+       ---help---
+         This is a video4linux driver for Conexant 25821 based
+         TV cards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx25821
+
+config VIDEO_CX25821_ALSA
+       tristate "Conexant 25821 DMA audio support"
+       depends on VIDEO_CX25821 && SND && EXPERIMENTAL
+       select SND_PCM
+       ---help---
+         This is a video4linux driver for direct (DMA) audio on
+         Conexant 25821 based capture cards using ALSA.
+
+         It only works with boards with function 01 enabled.
+         To check if your board supports, use lspci -n.
+         If supported, you should see 14f1:8801 or 14f1:8811
+         PCI device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx25821-alsa.
+
diff --git a/drivers/staging/cx25821/Makefile b/drivers/staging/cx25821/Makefile
new file mode 100644 (file)
index 0000000..10f87f0
--- /dev/null
@@ -0,0 +1,14 @@
+cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o cx25821-gpio.o                          \
+                               cx25821-medusa-video.o cx25821-video.o cx25821-video0.o cx25821-video1.o    \
+                               cx25821-video2.o cx25821-video3.o cx25821-video4.o cx25821-video5.o         \
+                               cx25821-video6.o cx25821-video7.o cx25821-vidups9.o cx25821-vidups10.o      \
+                               cx25821-audups11.o cx25821-video-upstream.o cx25821-video-upstream-ch2.o        \
+                               cx25821-audio-upstream.o cx25821-videoioctl.o
+
+obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
+obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
+
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/staging/cx25821/README b/drivers/staging/cx25821/README
new file mode 100644 (file)
index 0000000..a9ba50b
--- /dev/null
@@ -0,0 +1,6 @@
+Todo:
+       - checkpatch.pl cleanups
+       - sparse cleanups
+
+Please send patches to linux-media@vger.kernel.org
+
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
new file mode 100644 (file)
index 0000000..e0eef12
--- /dev/null
@@ -0,0 +1,789 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *     Based on SAA713x ALSA driver and CX88 driver
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, version 2
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
+#include <linux/pci.h>
+
+#include <asm/delay.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/control.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "cx25821.h"
+#include "cx25821-reg.h"
+
+#define AUDIO_SRAM_CHANNEL     SRAM_CH08
+
+#define dprintk(level,fmt, arg...)     if (debug >= level) \
+       printk(KERN_INFO "%s/1: " fmt, chip->dev->name , ## arg)
+
+#define dprintk_core(level,fmt, arg...)        if (debug >= level) \
+       printk(KERN_DEBUG "%s/1: " fmt, chip->dev->name , ## arg)
+
+/****************************************************************************
+       Data type declarations - Can be moded to a header file later
+ ****************************************************************************/
+
+static struct snd_card *snd_cx25821_cards[SNDRV_CARDS];
+static int devno;
+
+struct cx25821_audio_dev {
+       struct cx25821_dev *dev;
+       struct cx25821_dmaqueue q;
+
+       /* pci i/o */
+       struct pci_dev *pci;
+
+       /* audio controls */
+       int irq;
+
+       struct snd_card *card;
+
+       unsigned long iobase;
+       spinlock_t reg_lock;
+       atomic_t count;
+
+       unsigned int dma_size;
+       unsigned int period_size;
+       unsigned int num_periods;
+
+       struct videobuf_dmabuf *dma_risc;
+
+       struct cx25821_buffer *buf;
+
+       struct snd_pcm_substream *substream;
+};
+typedef struct cx25821_audio_dev snd_cx25821_card_t;
+
+
+/****************************************************************************
+                       Module global static vars
+ ****************************************************************************/
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;      /* ID for this card */
+static int enable[SNDRV_CARDS] = { 1,[1 ... (SNDRV_CARDS - 1)] = 1 };
+
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for cx25821 capture interface(s).");
+
+/****************************************************************************
+                               Module macros
+ ****************************************************************************/
+
+MODULE_DESCRIPTION("ALSA driver module for cx25821 based capture cards");
+MODULE_AUTHOR("Hiep Huynh");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{Conexant,25821}");  //"{{Conexant,23881},"
+
+static unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug messages");
+
+/****************************************************************************
+                       Module specific funtions
+ ****************************************************************************/
+/* Constants taken from cx88-reg.h */
+#define AUD_INT_DN_RISCI1       (1 <<  0)
+#define AUD_INT_UP_RISCI1       (1 <<  1)
+#define AUD_INT_RDS_DN_RISCI1   (1 <<  2)
+#define AUD_INT_DN_RISCI2       (1 <<  4)      /* yes, 3 is skipped */
+#define AUD_INT_UP_RISCI2       (1 <<  5)
+#define AUD_INT_RDS_DN_RISCI2   (1 <<  6)
+#define AUD_INT_DN_SYNC         (1 << 12)
+#define AUD_INT_UP_SYNC         (1 << 13)
+#define AUD_INT_RDS_DN_SYNC     (1 << 14)
+#define AUD_INT_OPC_ERR         (1 << 16)
+#define AUD_INT_BER_IRQ         (1 << 20)
+#define AUD_INT_MCHG_IRQ        (1 << 21)
+#define GP_COUNT_CONTROL_RESET 0x3
+
+#define PCI_MSK_AUD_EXT   (1 <<  4)
+#define PCI_MSK_AUD_INT   (1 <<  3)
+/*
+ * BOARD Specific: Sets audio DMA
+ */
+
+static int _cx25821_start_audio_dma(snd_cx25821_card_t * chip)
+{
+       struct cx25821_buffer *buf = chip->buf;
+       struct cx25821_dev *dev = chip->dev;
+       struct sram_channel *audio_ch =
+           &cx25821_sram_channels[AUDIO_SRAM_CHANNEL];
+       u32 tmp = 0;
+
+       // enable output on the GPIO 0 for the MCLK ADC (Audio)
+       cx25821_set_gpiopin_direction(chip->dev, 0, 0);
+
+       /* Make sure RISC/FIFO are off before changing FIFO/RISC settings */
+       cx_clear(AUD_INT_DMA_CTL,
+                FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN);
+
+       /* setup fifo + format - out channel */
+       cx25821_sram_channel_setup_audio(chip->dev, audio_ch, buf->bpl,
+                                        buf->risc.dma);
+
+       /* sets bpl size */
+       cx_write(AUD_A_LNGTH, buf->bpl);
+
+       /* reset counter */
+       cx_write(AUD_A_GPCNT_CTL, GP_COUNT_CONTROL_RESET);      //GP_COUNT_CONTROL_RESET = 0x3
+       atomic_set(&chip->count, 0);
+
+       //Set the input mode to 16-bit
+       tmp = cx_read(AUD_A_CFG);
+       cx_write(AUD_A_CFG,
+                tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |
+                FLD_AUD_CLK_ENABLE);
+
+       //printk(KERN_INFO "DEBUG: Start audio DMA, %d B/line, cmds_start(0x%x)= %d lines/FIFO, %d periods, %d "
+       //      "byte buffer\n", buf->bpl, audio_ch->cmds_start, cx_read(audio_ch->cmds_start + 12)>>1,
+       //      chip->num_periods, buf->bpl * chip->num_periods);
+
+       /* Enables corresponding bits at AUD_INT_STAT */
+       cx_write(AUD_A_INT_MSK,
+                FLD_AUD_DST_RISCI1 | FLD_AUD_DST_OF | FLD_AUD_DST_SYNC |
+                FLD_AUD_DST_OPC_ERR);
+
+       /* Clean any pending interrupt bits already set */
+       cx_write(AUD_A_INT_STAT, ~0);
+
+       /* enable audio irqs */
+       cx_set(PCI_INT_MSK, chip->dev->pci_irqmask | PCI_MSK_AUD_INT);
+
+       // Turn on audio downstream fifo and risc enable 0x101
+       tmp = cx_read(AUD_INT_DMA_CTL);
+       cx_set(AUD_INT_DMA_CTL,
+              tmp | (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));
+
+       mdelay(100);
+       return 0;
+}
+
+/*
+ * BOARD Specific: Resets audio DMA
+ */
+static int _cx25821_stop_audio_dma(snd_cx25821_card_t * chip)
+{
+       struct cx25821_dev *dev = chip->dev;
+
+       /* stop dma */
+       cx_clear(AUD_INT_DMA_CTL,
+                FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN);
+
+       /* disable irqs */
+       cx_clear(PCI_INT_MSK, PCI_MSK_AUD_INT);
+       cx_clear(AUD_A_INT_MSK,
+                AUD_INT_OPC_ERR | AUD_INT_DN_SYNC | AUD_INT_DN_RISCI2 |
+                AUD_INT_DN_RISCI1);
+
+       return 0;
+}
+
+#define MAX_IRQ_LOOP 50
+
+/*
+ * BOARD Specific: IRQ dma bits
+ */
+static char *cx25821_aud_irqs[32] = {
+       "dn_risci1", "up_risci1", "rds_dn_risc1",       /* 0-2 */
+       NULL,                   /* reserved */
+       "dn_risci2", "up_risci2", "rds_dn_risc2",       /* 4-6 */
+       NULL,                   /* reserved */
+       "dnf_of", "upf_uf", "rds_dnf_uf",       /* 8-10 */
+       NULL,                   /* reserved */
+       "dn_sync", "up_sync", "rds_dn_sync",    /* 12-14 */
+       NULL,                   /* reserved */
+       "opc_err", "par_err", "rip_err",        /* 16-18 */
+       "pci_abort", "ber_irq", "mchg_irq"      /* 19-21 */
+};
+
+/*
+ * BOARD Specific: Threats IRQ audio specific calls
+ */
+static void cx25821_aud_irq(snd_cx25821_card_t * chip, u32 status, u32 mask)
+{
+       struct cx25821_dev *dev = chip->dev;
+
+       if (0 == (status & mask)) {
+               return;
+       }
+
+       cx_write(AUD_A_INT_STAT, status);
+       if (debug > 1 || (status & mask & ~0xff))
+               cx25821_print_irqbits(dev->name, "irq aud",
+                                     cx25821_aud_irqs,
+                                     ARRAY_SIZE(cx25821_aud_irqs), status,
+                                     mask);
+
+       /* risc op code error */
+       if (status & AUD_INT_OPC_ERR) {
+               printk(KERN_WARNING "WARNING %s/1: Audio risc op code error\n",
+                      dev->name);
+
+               cx_clear(AUD_INT_DMA_CTL,
+                        FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN);
+               cx25821_sram_channel_dump_audio(dev,
+                                               &cx25821_sram_channels
+                                               [AUDIO_SRAM_CHANNEL]);
+       }
+       if (status & AUD_INT_DN_SYNC) {
+               printk(KERN_WARNING "WARNING %s: Downstream sync error!\n",
+                      dev->name);
+               cx_write(AUD_A_GPCNT_CTL, GP_COUNT_CONTROL_RESET);
+               return;
+       }
+
+       /* risc1 downstream */
+       if (status & AUD_INT_DN_RISCI1) {
+               atomic_set(&chip->count, cx_read(AUD_A_GPCNT));
+               snd_pcm_period_elapsed(chip->substream);
+       }
+}
+
+/*
+ * BOARD Specific: Handles IRQ calls
+ */
+static irqreturn_t cx25821_irq(int irq, void *dev_id)
+{
+       snd_cx25821_card_t *chip = dev_id;
+       struct cx25821_dev *dev = chip->dev;
+       u32 status, pci_status;
+       u32 audint_status, audint_mask;
+       int loop, handled = 0;
+       int audint_count = 0;
+
+       audint_status = cx_read(AUD_A_INT_STAT);
+       audint_mask = cx_read(AUD_A_INT_MSK);
+       audint_count = cx_read(AUD_A_GPCNT);
+       status = cx_read(PCI_INT_STAT);
+
+       for (loop = 0; loop < 1; loop++) {
+               status = cx_read(PCI_INT_STAT);
+               if (0 == status) {
+                       status = cx_read(PCI_INT_STAT);
+                       audint_status = cx_read(AUD_A_INT_STAT);
+                       audint_mask = cx_read(AUD_A_INT_MSK);
+
+                       if (status) {
+                               handled = 1;
+                               cx_write(PCI_INT_STAT, status);
+
+                               cx25821_aud_irq(chip, audint_status,
+                                               audint_mask);
+                               break;
+                       } else
+                               goto out;
+               }
+
+               handled = 1;
+               cx_write(PCI_INT_STAT, status);
+
+               cx25821_aud_irq(chip, audint_status, audint_mask);
+       }
+
+       pci_status = cx_read(PCI_INT_STAT);
+
+       if (handled)
+               cx_write(PCI_INT_STAT, pci_status);
+
+      out:
+       return IRQ_RETVAL(handled);
+}
+
+static int dsp_buffer_free(snd_cx25821_card_t * chip)
+{
+       BUG_ON(!chip->dma_size);
+
+       dprintk(2, "Freeing buffer\n");
+       videobuf_sg_dma_unmap(&chip->pci->dev, chip->dma_risc);
+       videobuf_dma_free(chip->dma_risc);
+       btcx_riscmem_free(chip->pci, &chip->buf->risc);
+       kfree(chip->buf);
+
+       chip->dma_risc = NULL;
+       chip->dma_size = 0;
+
+       return 0;
+}
+
+/****************************************************************************
+                               ALSA PCM Interface
+ ****************************************************************************/
+
+/*
+ * Digital hardware definition
+ */
+#define DEFAULT_FIFO_SIZE      384
+static struct snd_pcm_hardware snd_cx25821_digital_hw = {
+       .info = SNDRV_PCM_INFO_MMAP |
+           SNDRV_PCM_INFO_INTERLEAVED |
+           SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+
+       .rates = SNDRV_PCM_RATE_48000,
+       .rate_min = 48000,
+       .rate_max = 48000,
+       .channels_min = 2,
+       .channels_max = 2,
+       /* Analog audio output will be full of clicks and pops if there
+          are not exactly four lines in the SRAM FIFO buffer.  */
+       .period_bytes_min = DEFAULT_FIFO_SIZE / 3,
+       .period_bytes_max = DEFAULT_FIFO_SIZE / 3,
+       .periods_min = 1,
+       .periods_max = AUDIO_LINE_SIZE,
+       .buffer_bytes_max = (AUDIO_LINE_SIZE * AUDIO_LINE_SIZE),        //128*128 = 16384 = 1024 * 16
+};
+
+/*
+ * audio pcm capture open callback
+ */
+static int snd_cx25821_pcm_open(struct snd_pcm_substream *substream)
+{
+       snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       int err;
+       unsigned int bpl = 0;
+
+       if (!chip) {
+               printk(KERN_ERR "DEBUG: cx25821 can't find device struct."
+                      " Can't proceed with open\n");
+               return -ENODEV;
+       }
+
+       err =
+           snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS);
+       if (err < 0)
+               goto _error;
+
+       chip->substream = substream;
+
+       runtime->hw = snd_cx25821_digital_hw;
+
+       if (cx25821_sram_channels[AUDIO_SRAM_CHANNEL].fifo_size !=
+           DEFAULT_FIFO_SIZE) {
+               bpl = cx25821_sram_channels[AUDIO_SRAM_CHANNEL].fifo_size / 3;  //since there are 3 audio Clusters
+               bpl &= ~7;      /* must be multiple of 8 */
+
+               if (bpl > AUDIO_LINE_SIZE) {
+                       bpl = AUDIO_LINE_SIZE;
+               }
+               runtime->hw.period_bytes_min = bpl;
+               runtime->hw.period_bytes_max = bpl;
+       }
+
+       return 0;
+      _error:
+       dprintk(1, "Error opening PCM!\n");
+       return err;
+}
+
+/*
+ * audio close callback
+ */
+static int snd_cx25821_close(struct snd_pcm_substream *substream)
+{
+       return 0;
+}
+
+/*
+ * hw_params callback
+ */
+static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *hw_params)
+{
+       snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
+       struct videobuf_dmabuf *dma;
+
+       struct cx25821_buffer *buf;
+       int ret;
+
+       if (substream->runtime->dma_area) {
+               dsp_buffer_free(chip);
+               substream->runtime->dma_area = NULL;
+       }
+
+       chip->period_size = params_period_bytes(hw_params);
+       chip->num_periods = params_periods(hw_params);
+       chip->dma_size = chip->period_size * params_periods(hw_params);
+
+       BUG_ON(!chip->dma_size);
+       BUG_ON(chip->num_periods & (chip->num_periods - 1));
+
+       buf = videobuf_sg_alloc(sizeof(*buf));
+       if (NULL == buf)
+               return -ENOMEM;
+
+       if (chip->period_size > AUDIO_LINE_SIZE) {
+               chip->period_size = AUDIO_LINE_SIZE;
+       }
+
+       buf->vb.memory = V4L2_MEMORY_MMAP;
+       buf->vb.field = V4L2_FIELD_NONE;
+       buf->vb.width = chip->period_size;
+       buf->bpl = chip->period_size;
+       buf->vb.height = chip->num_periods;
+       buf->vb.size = chip->dma_size;
+
+       dma = videobuf_to_dma(&buf->vb);
+       videobuf_dma_init(dma);
+
+       ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,
+                                      (PAGE_ALIGN(buf->vb.size) >>
+                                       PAGE_SHIFT));
+       if (ret < 0)
+               goto error;
+
+       ret = videobuf_sg_dma_map(&chip->pci->dev, dma);
+       if (ret < 0)
+               goto error;
+
+       ret =
+           cx25821_risc_databuffer_audio(chip->pci, &buf->risc, dma->sglist,
+                                         buf->vb.width, buf->vb.height, 1);
+       if (ret < 0) {
+               printk(KERN_INFO
+                      "DEBUG: ERROR after cx25821_risc_databuffer_audio() \n");
+               goto error;
+       }
+
+       /* Loop back to start of program */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       buf->vb.state = VIDEOBUF_PREPARED;
+
+       chip->buf = buf;
+       chip->dma_risc = dma;
+
+       substream->runtime->dma_area = chip->dma_risc->vmalloc;
+       substream->runtime->dma_bytes = chip->dma_size;
+       substream->runtime->dma_addr = 0;
+
+       return 0;
+
+      error:
+       kfree(buf);
+       return ret;
+}
+
+/*
+ * hw free callback
+ */
+static int snd_cx25821_hw_free(struct snd_pcm_substream *substream)
+{
+       snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
+
+       if (substream->runtime->dma_area) {
+               dsp_buffer_free(chip);
+               substream->runtime->dma_area = NULL;
+       }
+
+       return 0;
+}
+
+/*
+ * prepare callback
+ */
+static int snd_cx25821_prepare(struct snd_pcm_substream *substream)
+{
+       return 0;
+}
+
+/*
+ * trigger callback
+ */
+static int snd_cx25821_card_trigger(struct snd_pcm_substream *substream,
+                                   int cmd)
+{
+       snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
+       int err = 0;
+
+       /* Local interrupts are already disabled by ALSA */
+       spin_lock(&chip->reg_lock);
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+               err = _cx25821_start_audio_dma(chip);
+               break;
+       case SNDRV_PCM_TRIGGER_STOP:
+               err = _cx25821_stop_audio_dma(chip);
+               break;
+       default:
+               err = -EINVAL;
+               break;
+       }
+
+       spin_unlock(&chip->reg_lock);
+
+       return err;
+}
+
+/*
+ * pointer callback
+ */
+static snd_pcm_uframes_t snd_cx25821_pointer(struct snd_pcm_substream
+                                            *substream)
+{
+       snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       u16 count;
+
+       count = atomic_read(&chip->count);
+
+       return runtime->period_size * (count & (runtime->periods - 1));
+}
+
+/*
+ * page callback (needed for mmap)
+ */
+static struct page *snd_cx25821_page(struct snd_pcm_substream *substream,
+                                    unsigned long offset)
+{
+       void *pageptr = substream->runtime->dma_area + offset;
+
+       return vmalloc_to_page(pageptr);
+}
+
+/*
+ * operators
+ */
+static struct snd_pcm_ops snd_cx25821_pcm_ops = {
+       .open = snd_cx25821_pcm_open,
+       .close = snd_cx25821_close,
+       .ioctl = snd_pcm_lib_ioctl,
+       .hw_params = snd_cx25821_hw_params,
+       .hw_free = snd_cx25821_hw_free,
+       .prepare = snd_cx25821_prepare,
+       .trigger = snd_cx25821_card_trigger,
+       .pointer = snd_cx25821_pointer,
+       .page = snd_cx25821_page,
+};
+
+/*
+ * ALSA create a PCM device:  Called when initializing the board. Sets up the name and hooks up
+ *  the callbacks
+ */
+static int snd_cx25821_pcm(snd_cx25821_card_t * chip, int device, char *name)
+{
+       struct snd_pcm *pcm;
+       int err;
+
+       err = snd_pcm_new(chip->card, name, device, 0, 1, &pcm);
+       if (err < 0) {
+               printk(KERN_INFO "ERROR: FAILED snd_pcm_new() in %s\n",
+                      __func__);
+               return err;
+       }
+       pcm->private_data = chip;
+       pcm->info_flags = 0;
+       strcpy(pcm->name, name);
+       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cx25821_pcm_ops);
+
+       return 0;
+}
+
+/****************************************************************************
+                       Basic Flow for Sound Devices
+ ****************************************************************************/
+
+/*
+ * PCI ID Table - 14f1:8801 and 14f1:8811 means function 1: Audio
+ * Only boards with eeprom and byte 1 at eeprom=1 have it
+ */
+
+static struct pci_device_id cx25821_audio_pci_tbl[] __devinitdata = {
+       {0x14f1, 0x0920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, cx25821_audio_pci_tbl);
+
+/*
+ * Not used in the function snd_cx25821_dev_free so removing
+ * from the file.
+ */
+/*
+static int snd_cx25821_free(snd_cx25821_card_t *chip)
+{
+       if (chip->irq >= 0)
+               free_irq(chip->irq, chip);
+
+       cx25821_dev_unregister(chip->dev);
+       pci_disable_device(chip->pci);
+
+       return 0;
+}
+*/
+
+/*
+ * Component Destructor
+ */
+static void snd_cx25821_dev_free(struct snd_card *card)
+{
+       snd_cx25821_card_t *chip = card->private_data;
+
+       //snd_cx25821_free(chip);
+       snd_card_free(chip->card);
+}
+
+/*
+ * Alsa Constructor - Component probe
+ */
+static int cx25821_audio_initdev(struct cx25821_dev *dev)
+{
+       struct snd_card *card;
+       snd_cx25821_card_t *chip;
+       int err;
+
+       if (devno >= SNDRV_CARDS) {
+               printk(KERN_INFO "DEBUG ERROR: devno >= SNDRV_CARDS %s\n",
+                      __func__);
+               return (-ENODEV);
+       }
+
+       if (!enable[devno]) {
+               ++devno;
+               printk(KERN_INFO "DEBUG ERROR: !enable[devno] %s\n", __func__);
+               return (-ENOENT);
+       }
+
+       err = snd_card_create(index[devno], id[devno], THIS_MODULE,
+                        sizeof(snd_cx25821_card_t), &card);
+       if (err < 0) {
+               printk(KERN_INFO
+                      "DEBUG ERROR: cannot create snd_card_new in %s\n",
+                      __func__);
+               return err;
+       }
+
+       strcpy(card->driver, "cx25821");
+
+       /* Card "creation" */
+       card->private_free = snd_cx25821_dev_free;
+       chip = (snd_cx25821_card_t *) card->private_data;
+       spin_lock_init(&chip->reg_lock);
+
+       chip->dev = dev;
+       chip->card = card;
+       chip->pci = dev->pci;
+       chip->iobase = pci_resource_start(dev->pci, 0);
+
+       chip->irq = dev->pci->irq;
+
+       err = request_irq(dev->pci->irq, cx25821_irq,
+                         IRQF_SHARED | IRQF_DISABLED, chip->dev->name, chip);
+
+       if (err < 0) {
+               printk(KERN_ERR "ERROR %s: can't get IRQ %d for ALSA\n",
+                      chip->dev->name, dev->pci->irq);
+               goto error;
+       }
+
+       if ((err = snd_cx25821_pcm(chip, 0, "cx25821 Digital")) < 0) {
+               printk(KERN_INFO
+                      "DEBUG ERROR: cannot create snd_cx25821_pcm %s\n",
+                      __func__);
+               goto error;
+       }
+
+       snd_card_set_dev(card, &chip->pci->dev);
+
+       strcpy(card->shortname, "cx25821");
+       sprintf(card->longname, "%s at 0x%lx irq %d", chip->dev->name,
+               chip->iobase, chip->irq);
+       strcpy(card->mixername, "CX25821");
+
+       printk(KERN_INFO "%s/%i: ALSA support for cx25821 boards\n",
+              card->driver, devno);
+
+       err = snd_card_register(card);
+       if (err < 0) {
+               printk(KERN_INFO "DEBUG ERROR: cannot register sound card %s\n",
+                      __func__);
+               goto error;
+       }
+
+       snd_cx25821_cards[devno] = card;
+
+       devno++;
+       return 0;
+
+      error:
+       snd_card_free(card);
+       return err;
+}
+
+/****************************************************************************
+                               LINUX MODULE INIT
+ ****************************************************************************/
+static void cx25821_audio_fini(void)
+{
+       snd_card_free(snd_cx25821_cards[0]);
+}
+
+/*
+ * Module initializer
+ *
+ * Loops through present saa7134 cards, and assigns an ALSA device
+ * to each one
+ *
+ */
+static int cx25821_alsa_init(void)
+{
+       struct cx25821_dev *dev = NULL;
+       struct list_head *list;
+
+       list_for_each(list, &cx25821_devlist) {
+               dev = list_entry(list, struct cx25821_dev, devlist);
+               cx25821_audio_initdev(dev);
+       }
+
+       if (dev == NULL)
+               printk(KERN_INFO
+                      "cx25821 ERROR ALSA: no cx25821 cards found\n");
+
+       return 0;
+
+}
+
+late_initcall(cx25821_alsa_init);
+module_exit(cx25821_audio_fini);
+
+/* ----------------------------------------------------------- */
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
new file mode 100644 (file)
index 0000000..ddddf65
--- /dev/null
@@ -0,0 +1,804 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+#include "cx25821-audio-upstream.h"
+
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/syscalls.h>
+#include <linux/file.h>
+#include <linux/fcntl.h>
+#include <linux/delay.h>
+#include <asm/uaccess.h>
+
+MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
+MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
+MODULE_LICENSE("GPL");
+
+static int _intr_msk =
+    FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC |
+    FLD_AUD_SRC_OPC_ERR;
+
+int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,
+                                             struct sram_channel *ch,
+                                             unsigned int bpl, u32 risc)
+{
+       unsigned int i, lines;
+       u32 cdt;
+
+       if (ch->cmds_start == 0) {
+               cx_write(ch->ptr1_reg, 0);
+               cx_write(ch->ptr2_reg, 0);
+               cx_write(ch->cnt2_reg, 0);
+               cx_write(ch->cnt1_reg, 0);
+               return 0;
+       }
+
+       bpl = (bpl + 7) & ~7;   /* alignment */
+       cdt = ch->cdt;
+       lines = ch->fifo_size / bpl;
+
+       if (lines > 3) {
+               lines = 3;
+       }
+
+       BUG_ON(lines < 2);
+
+       /* write CDT */
+       for (i = 0; i < lines; i++) {
+               cx_write(cdt + 16 * i, ch->fifo_start + bpl * i);
+               cx_write(cdt + 16 * i + 4, 0);
+               cx_write(cdt + 16 * i + 8, 0);
+               cx_write(cdt + 16 * i + 12, 0);
+       }
+
+       /* write CMDS */
+       cx_write(ch->cmds_start + 0, risc);
+
+       cx_write(ch->cmds_start + 4, 0);
+       cx_write(ch->cmds_start + 8, cdt);
+       cx_write(ch->cmds_start + 12, AUDIO_CDT_SIZE_QW);
+       cx_write(ch->cmds_start + 16, ch->ctrl_start);
+
+       //IQ size
+       cx_write(ch->cmds_start + 20, AUDIO_IQ_SIZE_DW);
+
+       for (i = 24; i < 80; i += 4)
+               cx_write(ch->cmds_start + i, 0);
+
+       /* fill registers */
+       cx_write(ch->ptr1_reg, ch->fifo_start);
+       cx_write(ch->ptr2_reg, cdt);
+       cx_write(ch->cnt2_reg, AUDIO_CDT_SIZE_QW);
+       cx_write(ch->cnt1_reg, AUDIO_CLUSTER_SIZE_QW - 1);
+
+       return 0;
+}
+
+static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev,
+                                                __le32 * rp,
+                                                dma_addr_t databuf_phys_addr,
+                                                unsigned int bpl,
+                                                int fifo_enable)
+{
+       unsigned int line;
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[dev->_audio_upstream_channel_select];
+       int offset = 0;
+
+       /* scan lines */
+       for (line = 0; line < LINES_PER_AUDIO_BUFFER; line++) {
+               *(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
+               *(rp++) = cpu_to_le32(databuf_phys_addr + offset);
+               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+
+               // Check if we need to enable the FIFO after the first 3 lines
+               // For the upstream audio channel, the risc engine will enable the FIFO.
+               if (fifo_enable && line == 2) {
+                       *(rp++) = RISC_WRITECR;
+                       *(rp++) = sram_ch->dma_ctl;
+                       *(rp++) = sram_ch->fld_aud_fifo_en;
+                       *(rp++) = 0x00000020;
+               }
+
+               offset += AUDIO_LINE_SIZE;
+       }
+
+       return rp;
+}
+
+int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,
+                                      struct pci_dev *pci,
+                                      unsigned int bpl, unsigned int lines)
+{
+       __le32 *rp;
+       int fifo_enable = 0;
+       int frame = 0, i = 0;
+       int frame_size = AUDIO_DATA_BUF_SZ;
+       int databuf_offset = 0;
+       int risc_flag = RISC_CNT_INC;
+       dma_addr_t risc_phys_jump_addr;
+
+       /* Virtual address of Risc buffer program */
+       rp = dev->_risc_virt_addr;
+
+       /* sync instruction */
+       *(rp++) = cpu_to_le32(RISC_RESYNC | AUDIO_SYNC_LINE);
+
+       for (frame = 0; frame < NUM_AUDIO_FRAMES; frame++) {
+               databuf_offset = frame_size * frame;
+
+               if (frame == 0) {
+                       fifo_enable = 1;
+                       risc_flag = RISC_CNT_RESET;
+               } else {
+                       fifo_enable = 0;
+                       risc_flag = RISC_CNT_INC;
+               }
+
+               //Calculate physical jump address
+               if ((frame + 1) == NUM_AUDIO_FRAMES) {
+                       risc_phys_jump_addr =
+                           dev->_risc_phys_start_addr +
+                           RISC_SYNC_INSTRUCTION_SIZE;
+               } else {
+                       risc_phys_jump_addr =
+                           dev->_risc_phys_start_addr +
+                           RISC_SYNC_INSTRUCTION_SIZE +
+                           AUDIO_RISC_DMA_BUF_SIZE * (frame + 1);
+               }
+
+               rp = cx25821_risc_field_upstream_audio(dev, rp,
+                                                      dev->
+                                                      _audiodata_buf_phys_addr
+                                                      + databuf_offset, bpl,
+                                                      fifo_enable);
+
+               if (USE_RISC_NOOP_AUDIO) {
+                       for (i = 0; i < NUM_NO_OPS; i++) {
+                               *(rp++) = cpu_to_le32(RISC_NOOP);
+                       }
+               }
+
+               // Loop to (Nth)FrameRISC or to Start of Risc program & generate IRQ
+               *(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | risc_flag);
+               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+               *(rp++) = cpu_to_le32(0);
+
+               //Recalculate virtual address based on frame index
+               rp = dev->_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE / 4 +
+                   (AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);
+       }
+
+       return 0;
+}
+
+void cx25821_free_memory_audio(struct cx25821_dev *dev)
+{
+       if (dev->_risc_virt_addr) {
+               pci_free_consistent(dev->pci, dev->_audiorisc_size,
+                                   dev->_risc_virt_addr, dev->_risc_phys_addr);
+               dev->_risc_virt_addr = NULL;
+       }
+
+       if (dev->_audiodata_buf_virt_addr) {
+               pci_free_consistent(dev->pci, dev->_audiodata_buf_size,
+                                   dev->_audiodata_buf_virt_addr,
+                                   dev->_audiodata_buf_phys_addr);
+               dev->_audiodata_buf_virt_addr = NULL;
+       }
+}
+
+void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
+{
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B];
+       u32 tmp = 0;
+
+       if (!dev->_audio_is_running) {
+               printk
+                   ("cx25821: No audio file is currently running so return!\n");
+               return;
+       }
+       //Disable RISC interrupts
+       cx_write(sram_ch->int_msk, 0);
+
+       //Turn OFF risc and fifo enable in AUD_DMA_CNTRL
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_write(sram_ch->dma_ctl,
+                tmp & ~(sram_ch->fld_aud_fifo_en | sram_ch->fld_aud_risc_en));
+
+       //Clear data buffer memory
+       if (dev->_audiodata_buf_virt_addr)
+               memset(dev->_audiodata_buf_virt_addr, 0,
+                      dev->_audiodata_buf_size);
+
+       dev->_audio_is_running = 0;
+       dev->_is_first_audio_frame = 0;
+       dev->_audioframe_count = 0;
+       dev->_audiofile_status = END_OF_FILE;
+
+       if (dev->_irq_audio_queues) {
+               kfree(dev->_irq_audio_queues);
+               dev->_irq_audio_queues = NULL;
+       }
+
+       if (dev->_audiofilename != NULL)
+               kfree(dev->_audiofilename);
+}
+
+void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev)
+{
+       if (dev->_audio_is_running) {
+               cx25821_stop_upstream_audio(dev);
+       }
+
+       cx25821_free_memory_audio(dev);
+}
+
+int cx25821_get_audio_data(struct cx25821_dev *dev,
+                          struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int frame_index_temp = dev->_audioframe_index;
+       int i = 0;
+       int line_size = AUDIO_LINE_SIZE;
+       int frame_size = AUDIO_DATA_BUF_SZ;
+       int frame_offset = frame_size * frame_index_temp;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t file_offset = dev->_audioframe_count * frame_size;
+       loff_t pos;
+       mm_segment_t old_fs;
+
+       if (dev->_audiofile_status == END_OF_FILE)
+               return 0;
+
+       myfile = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_audiofilename, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered!\n",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk("%s: File has no READ operations registered! \n",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (i = 0; i < dev->_audio_lines_count; i++) {
+                       pos = file_offset;
+
+                       vfs_read_retval =
+                           vfs_read(myfile, mybuf, line_size, &pos);
+
+                       if (vfs_read_retval > 0 && vfs_read_retval == line_size
+                           && dev->_audiodata_buf_virt_addr != NULL) {
+                               memcpy((void *)(dev->_audiodata_buf_virt_addr +
+                                               frame_offset / 4), mybuf,
+                                      vfs_read_retval);
+                       }
+
+                       file_offset += vfs_read_retval;
+                       frame_offset += vfs_read_retval;
+
+                       if (vfs_read_retval < line_size) {
+                               printk(KERN_INFO
+                                      "Done: exit %s() since no more bytes to read from Audio file.\n",
+                                      __func__);
+                               break;
+                       }
+               }
+
+               if (i > 0)
+                       dev->_audioframe_count++;
+
+               dev->_audiofile_status =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+static void cx25821_audioups_handler(struct work_struct *work)
+{
+       struct cx25821_dev *dev =
+           container_of(work, struct cx25821_dev, _audio_work_entry);
+
+       if (!dev) {
+               printk("ERROR %s(): since container_of(work_struct) FAILED! \n",
+                      __func__);
+               return;
+       }
+
+       cx25821_get_audio_data(dev,
+                              &dev->sram_channels[dev->
+                                                  _audio_upstream_channel_select]);
+}
+
+int cx25821_openfile_audio(struct cx25821_dev *dev,
+                          struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int i = 0, j = 0;
+       int line_size = AUDIO_LINE_SIZE;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t pos;
+       loff_t offset = (unsigned long)0;
+       mm_segment_t old_fs;
+
+       myfile = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_audiofilename, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered! \n",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk("%s: File has no READ operations registered! \n",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (j = 0; j < NUM_AUDIO_FRAMES; j++) {
+                       for (i = 0; i < dev->_audio_lines_count; i++) {
+                               pos = offset;
+
+                               vfs_read_retval =
+                                   vfs_read(myfile, mybuf, line_size, &pos);
+
+                               if (vfs_read_retval > 0
+                                   && vfs_read_retval == line_size
+                                   && dev->_audiodata_buf_virt_addr != NULL) {
+                                       memcpy((void *)(dev->
+                                                       _audiodata_buf_virt_addr
+                                                       + offset / 4), mybuf,
+                                              vfs_read_retval);
+                               }
+
+                               offset += vfs_read_retval;
+
+                               if (vfs_read_retval < line_size) {
+                                       printk(KERN_INFO
+                                              "Done: exit %s() since no more bytes to read from Audio file.\n",
+                                              __func__);
+                                       break;
+                               }
+                       }
+
+                       if (i > 0) {
+                               dev->_audioframe_count++;
+                       }
+
+                       if (vfs_read_retval < line_size) {
+                               break;
+                       }
+               }
+
+               dev->_audiofile_status =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               myfile->f_pos = 0;
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
+                                                struct sram_channel *sram_ch,
+                                                int bpl)
+{
+       int ret = 0;
+       dma_addr_t dma_addr;
+       dma_addr_t data_dma_addr;
+
+       cx25821_free_memory_audio(dev);
+
+       dev->_risc_virt_addr =
+           pci_alloc_consistent(dev->pci, dev->audio_upstream_riscbuf_size,
+                                &dma_addr);
+       dev->_risc_virt_start_addr = dev->_risc_virt_addr;
+       dev->_risc_phys_start_addr = dma_addr;
+       dev->_risc_phys_addr = dma_addr;
+       dev->_audiorisc_size = dev->audio_upstream_riscbuf_size;
+
+       if (!dev->_risc_virt_addr) {
+               printk
+                   ("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning.\n");
+               return -ENOMEM;
+       }
+       //Clear out memory at address
+       memset(dev->_risc_virt_addr, 0, dev->_audiorisc_size);
+
+       //For Audio Data buffer allocation
+       dev->_audiodata_buf_virt_addr =
+           pci_alloc_consistent(dev->pci, dev->audio_upstream_databuf_size,
+                                &data_dma_addr);
+       dev->_audiodata_buf_phys_addr = data_dma_addr;
+       dev->_audiodata_buf_size = dev->audio_upstream_databuf_size;
+
+       if (!dev->_audiodata_buf_virt_addr) {
+               printk
+                   ("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning. \n");
+               return -ENOMEM;
+       }
+       //Clear out memory at address
+       memset(dev->_audiodata_buf_virt_addr, 0, dev->_audiodata_buf_size);
+
+       ret = cx25821_openfile_audio(dev, sram_ch);
+       if (ret < 0)
+               return ret;
+
+       //Creating RISC programs
+       ret =
+           cx25821_risc_buffer_upstream_audio(dev, dev->pci, bpl,
+                                              dev->_audio_lines_count);
+       if (ret < 0) {
+               printk(KERN_DEBUG
+                      "cx25821 ERROR creating audio upstream RISC programs! \n");
+               goto error;
+       }
+
+       return 0;
+
+      error:
+       return ret;
+}
+
+int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
+                              u32 status)
+{
+       int i = 0;
+       u32 int_msk_tmp;
+       struct sram_channel *channel = &dev->sram_channels[chan_num];
+       dma_addr_t risc_phys_jump_addr;
+       __le32 *rp;
+
+       if (status & FLD_AUD_SRC_RISCI1) {
+               //Get interrupt_index of the program that interrupted
+               u32 prog_cnt = cx_read(channel->gpcnt);
+
+               //Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers
+               cx_write(channel->int_msk, 0);
+               cx_write(channel->int_stat, cx_read(channel->int_stat));
+
+               spin_lock(&dev->slock);
+
+               while (prog_cnt != dev->_last_index_irq) {
+                       //Update _last_index_irq
+                       if (dev->_last_index_irq < (NUMBER_OF_PROGRAMS - 1)) {
+                               dev->_last_index_irq++;
+                       } else {
+                               dev->_last_index_irq = 0;
+                       }
+
+                       dev->_audioframe_index = dev->_last_index_irq;
+
+                       queue_work(dev->_irq_audio_queues,
+                                  &dev->_audio_work_entry);
+               }
+
+               if (dev->_is_first_audio_frame) {
+                       dev->_is_first_audio_frame = 0;
+
+                       if (dev->_risc_virt_start_addr != NULL) {
+                               risc_phys_jump_addr =
+                                   dev->_risc_phys_start_addr +
+                                   RISC_SYNC_INSTRUCTION_SIZE +
+                                   AUDIO_RISC_DMA_BUF_SIZE;
+
+                               rp = cx25821_risc_field_upstream_audio(dev,
+                                                                      dev->
+                                                                      _risc_virt_start_addr
+                                                                      + 1,
+                                                                      dev->
+                                                                      _audiodata_buf_phys_addr,
+                                                                      AUDIO_LINE_SIZE,
+                                                                      FIFO_DISABLE);
+
+                               if (USE_RISC_NOOP_AUDIO) {
+                                       for (i = 0; i < NUM_NO_OPS; i++) {
+                                               *(rp++) =
+                                                   cpu_to_le32(RISC_NOOP);
+                                       }
+                               }
+                               // Jump to 2nd Audio Frame
+                               *(rp++) =
+                                   cpu_to_le32(RISC_JUMP | RISC_IRQ1 |
+                                               RISC_CNT_RESET);
+                               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+                               *(rp++) = cpu_to_le32(0);
+                       }
+               }
+
+               spin_unlock(&dev->slock);
+       } else {
+               if (status & FLD_AUD_SRC_OF)
+                       printk("%s: Audio Received Overflow Error Interrupt!\n",
+                              __func__);
+
+               if (status & FLD_AUD_SRC_SYNC)
+                       printk("%s: Audio Received Sync Error Interrupt!\n",
+                              __func__);
+
+               if (status & FLD_AUD_SRC_OPC_ERR)
+                       printk("%s: Audio Received OpCode Error Interrupt!\n",
+                              __func__);
+
+               // Read and write back the interrupt status register to clear our bits
+               cx_write(channel->int_stat, cx_read(channel->int_stat));
+       }
+
+       if (dev->_audiofile_status == END_OF_FILE) {
+               printk("cx25821: EOF Channel Audio Framecount = %d\n",
+                      dev->_audioframe_count);
+               return -1;
+       }
+       //ElSE, set the interrupt mask register, re-enable irq.
+       int_msk_tmp = cx_read(channel->int_msk);
+       cx_write(channel->int_msk, int_msk_tmp |= _intr_msk);
+
+       return 0;
+}
+
+static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id)
+{
+       struct cx25821_dev *dev = dev_id;
+       u32 msk_stat, audio_status;
+       int handled = 0;
+       struct sram_channel *sram_ch;
+
+       if (!dev)
+               return -1;
+
+       sram_ch = &dev->sram_channels[dev->_audio_upstream_channel_select];
+
+       msk_stat = cx_read(sram_ch->int_mstat);
+       audio_status = cx_read(sram_ch->int_stat);
+
+       // Only deal with our interrupt
+       if (audio_status) {
+               handled =
+                   cx25821_audio_upstream_irq(dev,
+                                              dev->
+                                              _audio_upstream_channel_select,
+                                              audio_status);
+       }
+
+       if (handled < 0) {
+               cx25821_stop_upstream_audio(dev);
+       } else {
+               handled += handled;
+       }
+
+       return IRQ_RETVAL(handled);
+}
+
+static void cx25821_wait_fifo_enable(struct cx25821_dev *dev,
+                                    struct sram_channel *sram_ch)
+{
+       int count = 0;
+       u32 tmp;
+
+       do {
+               //Wait 10 microsecond before checking to see if the FIFO is turned ON.
+               udelay(10);
+
+               tmp = cx_read(sram_ch->dma_ctl);
+
+               if (count++ > 1000)     //10 millisecond timeout
+               {
+                       printk
+                           ("cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n",
+                            __func__);
+                       return;
+               }
+
+       } while (!(tmp & sram_ch->fld_aud_fifo_en));
+
+}
+
+int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,
+                                    struct sram_channel *sram_ch)
+{
+       u32 tmp = 0;
+       int err = 0;
+
+       // Set the physical start address of the RISC program in the initial program counter(IPC) member of the CMDS.
+       cx_write(sram_ch->cmds_start + 0, dev->_risc_phys_addr);
+       cx_write(sram_ch->cmds_start + 4, 0);   /* Risc IPC High 64 bits 63-32 */
+
+       /* reset counter */
+       cx_write(sram_ch->gpcnt_ctl, 3);
+
+       //Set the line length       (It looks like we do not need to set the line length)
+       cx_write(sram_ch->aud_length, AUDIO_LINE_SIZE & FLD_AUD_DST_LN_LNGTH);
+
+       //Set the input mode to 16-bit
+       tmp = cx_read(sram_ch->aud_cfg);
+       tmp |=
+           FLD_AUD_SRC_ENABLE | FLD_AUD_DST_PK_MODE | FLD_AUD_CLK_ENABLE |
+           FLD_AUD_MASTER_MODE | FLD_AUD_CLK_SELECT_PLL_D | FLD_AUD_SONY_MODE;
+       cx_write(sram_ch->aud_cfg, tmp);
+
+       // Read and write back the interrupt status register to clear it
+       tmp = cx_read(sram_ch->int_stat);
+       cx_write(sram_ch->int_stat, tmp);
+
+       // Clear our bits from the interrupt status register.
+       cx_write(sram_ch->int_stat, _intr_msk);
+
+       //Set the interrupt mask register, enable irq.
+       cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | (1 << sram_ch->irq_bit));
+       tmp = cx_read(sram_ch->int_msk);
+       cx_write(sram_ch->int_msk, tmp |= _intr_msk);
+
+       err =
+           request_irq(dev->pci->irq, cx25821_upstream_irq_audio,
+                       IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+       if (err < 0) {
+               printk(KERN_ERR "%s: can't get upstream IRQ %d\n", dev->name,
+                      dev->pci->irq);
+               goto fail_irq;
+       }
+
+       // Start the DMA  engine
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_set(sram_ch->dma_ctl, tmp | sram_ch->fld_aud_risc_en);
+
+       dev->_audio_is_running = 1;
+       dev->_is_first_audio_frame = 1;
+
+       // The fifo_en bit turns on by the first Risc program
+       cx25821_wait_fifo_enable(dev, sram_ch);
+
+       return 0;
+
+      fail_irq:
+       cx25821_dev_unregister(dev);
+       return err;
+}
+
+int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
+{
+       struct sram_channel *sram_ch;
+       int retval = 0;
+       int err = 0;
+       int str_length = 0;
+
+       if (dev->_audio_is_running) {
+               printk("Audio Channel is still running so return!\n");
+               return 0;
+       }
+
+       dev->_audio_upstream_channel_select = channel_select;
+       sram_ch = &dev->sram_channels[channel_select];
+
+       //Work queue
+       INIT_WORK(&dev->_audio_work_entry, cx25821_audioups_handler);
+       dev->_irq_audio_queues =
+           create_singlethread_workqueue("cx25821_audioworkqueue");
+
+       if (!dev->_irq_audio_queues) {
+               printk
+                   ("cx25821 ERROR: create_singlethread_workqueue() for Audio FAILED!\n");
+               return -ENOMEM;
+       }
+
+       dev->_last_index_irq = 0;
+       dev->_audio_is_running = 0;
+       dev->_audioframe_count = 0;
+       dev->_audiofile_status = RESET_STATUS;
+       dev->_audio_lines_count = LINES_PER_AUDIO_BUFFER;
+       _line_size = AUDIO_LINE_SIZE;
+
+       if (dev->input_audiofilename) {
+               str_length = strlen(dev->input_audiofilename);
+               dev->_audiofilename =
+                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_audiofilename)
+                       goto error;
+
+               memcpy(dev->_audiofilename, dev->input_audiofilename,
+                      str_length + 1);
+
+               //Default if filename is empty string
+               if (strcmp(dev->input_audiofilename, "") == 0) {
+                       dev->_audiofilename = "/root/audioGOOD.wav";
+               }
+       } else {
+               str_length = strlen(_defaultAudioName);
+               dev->_audiofilename =
+                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_audiofilename)
+                       goto error;
+
+               memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1);
+       }
+
+       retval =
+           cx25821_sram_channel_setup_upstream_audio(dev, sram_ch, _line_size,
+                                                     0);
+
+       dev->audio_upstream_riscbuf_size =
+           AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +
+           RISC_SYNC_INSTRUCTION_SIZE;
+       dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;
+
+       //Allocating buffers and prepare RISC program
+       retval =
+           cx25821_audio_upstream_buffer_prepare(dev, sram_ch, _line_size);
+       if (retval < 0) {
+               printk(KERN_ERR
+                      "%s: Failed to set up Audio upstream buffers!\n",
+                      dev->name);
+               goto error;
+       }
+       //Start RISC engine
+       cx25821_start_audio_dma_upstream(dev, sram_ch);
+
+       return 0;
+
+      error:
+       cx25821_dev_unregister(dev);
+
+       return err;
+}
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.h b/drivers/staging/cx25821/cx25821-audio-upstream.h
new file mode 100644 (file)
index 0000000..ca987ad
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+
+#define NUM_AUDIO_PROGS       8
+#define NUM_AUDIO_FRAMES      8
+#define END_OF_FILE           0
+#define IN_PROGRESS           1
+#define RESET_STATUS          -1
+#define FIFO_DISABLE          0
+#define FIFO_ENABLE           1
+#define NUM_NO_OPS            4
+
+#define RISC_READ_INSTRUCTION_SIZE      12
+#define RISC_JUMP_INSTRUCTION_SIZE      12
+#define RISC_WRITECR_INSTRUCTION_SIZE   16
+#define RISC_SYNC_INSTRUCTION_SIZE      4
+#define DWORD_SIZE                      4
+#define AUDIO_SYNC_LINE                 4
+
+#define LINES_PER_AUDIO_BUFFER      15
+#define AUDIO_LINE_SIZE             128
+#define AUDIO_DATA_BUF_SZ           (AUDIO_LINE_SIZE * LINES_PER_AUDIO_BUFFER)
+
+#define USE_RISC_NOOP_AUDIO   1
+
+#ifdef USE_RISC_NOOP_AUDIO
+#define AUDIO_RISC_DMA_BUF_SIZE    ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
+#endif
+
+#ifndef USE_RISC_NOOP_AUDIO
+#define AUDIO_RISC_DMA_BUF_SIZE    ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
+#endif
+
+static int _line_size;
+char *_defaultAudioName = "/root/audioGOOD.wav";
diff --git a/drivers/staging/cx25821/cx25821-audio.h b/drivers/staging/cx25821/cx25821-audio.h
new file mode 100644 (file)
index 0000000..503f42f
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __CX25821_AUDIO_H__
+#define __CX25821_AUDIO_H__
+
+#define USE_RISC_NOOP               1
+#define LINES_PER_BUFFER            15
+#define AUDIO_LINE_SIZE             128
+
+//Number of buffer programs to use at once.
+#define NUMBER_OF_PROGRAMS  8
+
+//Max size of the RISC program for a buffer. - worst case is 2 writes per line
+// Space is also added for the 4 no-op instructions added on the end.
+
+#ifndef USE_RISC_NOOP
+#define MAX_BUFFER_PROGRAM_SIZE     \
+    (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE*4)
+#endif
+
+// MAE 12 July 2005 Try to use NOOP RISC instruction instead
+#ifdef USE_RISC_NOOP
+#define MAX_BUFFER_PROGRAM_SIZE     \
+    (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_NOOP_INSTRUCTION_SIZE*4)
+#endif
+
+//Sizes of various instructions in bytes.  Used when adding instructions.
+#define RISC_WRITE_INSTRUCTION_SIZE 12
+#define RISC_JUMP_INSTRUCTION_SIZE  12
+#define RISC_SKIP_INSTRUCTION_SIZE  4
+#define RISC_SYNC_INSTRUCTION_SIZE  4
+#define RISC_WRITECR_INSTRUCTION_SIZE  16
+#define RISC_NOOP_INSTRUCTION_SIZE 4
+
+#define MAX_AUDIO_DMA_BUFFER_SIZE (MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE)
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c
new file mode 100644 (file)
index 0000000..f78b891
--- /dev/null
@@ -0,0 +1,434 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH11];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH11]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH11]
+                   && h->video_dev[SRAM_CH11]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = 10;
+       fh->fmt = format_by_fourcc(V4L2_PIX_FMT_YUYV);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO11))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO11)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR)
+               return POLLIN | POLLRDNORM;
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       //cx_write(channel11->dma_ctl, 0);
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO11)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO11);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO11)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO11);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->width = f->fmt.pix.width;
+       fh->height = f->fmt.pix.height;
+       fh->vidq.field = f->fmt.pix.field;
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+       return 0;
+}
+
+static long video_ioctl_upstream11(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+       int command = 0;
+       struct upstream_user_struct *data_from_user;
+
+       data_from_user = (struct upstream_user_struct *)arg;
+
+       if (!data_from_user) {
+               printk
+                   ("cx25821 in %s(): Upstream data is INVALID. Returning.\n",
+                    __func__);
+               return 0;
+       }
+
+       command = data_from_user->command;
+
+       if (command != UPSTREAM_START_AUDIO && command != UPSTREAM_STOP_AUDIO) {
+               return 0;
+       }
+
+       dev->input_filename = data_from_user->input_filename;
+       dev->input_audiofilename = data_from_user->input_filename;
+       dev->vid_stdname = data_from_user->vid_stdname;
+       dev->pixel_format = data_from_user->pixel_format;
+       dev->channel_select = data_from_user->channel_select;
+       dev->command = data_from_user->command;
+
+       switch (command) {
+       case UPSTREAM_START_AUDIO:
+               cx25821_start_upstream_audio(dev, data_from_user);
+               break;
+
+       case UPSTREAM_STOP_AUDIO:
+               cx25821_stop_upstream_audio(dev);
+               break;
+       }
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+       return 0;
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl_upstream11,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template11 = {
+       .name = "cx25821-audioupstream",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-biffuncs.h b/drivers/staging/cx25821/cx25821-biffuncs.h
new file mode 100644 (file)
index 0000000..9326a7c
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _BITFUNCS_H
+#define _BITFUNCS_H
+
+#define SetBit(Bit)  (1 << Bit)
+
+inline u8 getBit(u32 sample, u8 index)
+{
+       return (u8) ((sample >> index) & 1);
+}
+
+inline u32 clearBitAtPos(u32 value, u8 bit)
+{
+       return value & ~(1 << bit);
+}
+
+inline u32 setBitAtPos(u32 sample, u8 bit)
+{
+       sample |= (1 << bit);
+       return sample;
+
+}
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-cards.c b/drivers/staging/cx25821/cx25821-cards.c
new file mode 100644 (file)
index 0000000..4d0b9ea
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *     Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <media/cx25840.h>
+
+#include "cx25821.h"
+#include "tuner-xc2028.h"
+
+// board config info
+
+struct cx25821_board cx25821_boards[] = {
+       [UNKNOWN_BOARD] = {
+                          .name = "UNKNOWN/GENERIC",
+                          // Ensure safe default for unknown boards
+                          .clk_freq = 0,
+                          },
+
+       [CX25821_BOARD] = {
+                          .name = "CX25821",
+                          .portb = CX25821_RAW,
+                          .portc = CX25821_264,
+                          .input[0].type = CX25821_VMUX_COMPOSITE,
+                          },
+
+};
+
+const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
+
+struct cx25821_subid cx25821_subids[] = {
+       {
+        .subvendor = 0x14f1,
+        .subdevice = 0x0920,
+        .card = CX25821_BOARD,
+        },
+};
+
+void cx25821_card_setup(struct cx25821_dev *dev)
+{
+       static u8 eeprom[256];
+
+       if (dev->i2c_bus[0].i2c_rc == 0) {
+               dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
+               tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
+                             sizeof(eeprom));
+       }
+}
diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/staging/cx25821/cx25821-core.c
new file mode 100644 (file)
index 0000000..8aceae5
--- /dev/null
@@ -0,0 +1,1551 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/i2c.h>
+#include "cx25821.h"
+#include "cx25821-sram.h"
+#include "cx25821-video.h"
+
+MODULE_DESCRIPTION("Driver for Athena cards");
+MODULE_AUTHOR("Shu Lin - Hiep Huynh");
+MODULE_LICENSE("GPL");
+
+struct list_head cx25821_devlist;
+
+static unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug messages");
+
+static unsigned int card[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
+module_param_array(card, int, NULL, 0444);
+MODULE_PARM_DESC(card, "card type");
+
+static unsigned int cx25821_devcount = 0;
+
+static DEFINE_MUTEX(devlist);
+LIST_HEAD(cx25821_devlist);
+
+struct sram_channel cx25821_sram_channels[] = {
+       [SRAM_CH00] = {
+                      .i = SRAM_CH00,
+                      .name = "VID A",
+                      .cmds_start = VID_A_DOWN_CMDS,
+                      .ctrl_start = VID_A_IQ,
+                      .cdt = VID_A_CDT,
+                      .fifo_start = VID_A_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA1_PTR1,
+                      .ptr2_reg = DMA1_PTR2,
+                      .cnt1_reg = DMA1_CNT1,
+                      .cnt2_reg = DMA1_CNT2,
+                      .int_msk = VID_A_INT_MSK,
+                      .int_stat = VID_A_INT_STAT,
+                      .int_mstat = VID_A_INT_MSTAT,
+                      .dma_ctl = VID_DST_A_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_A_GPCNT_CTL,
+                      .gpcnt = VID_DST_A_GPCNT,
+                      .vip_ctl = VID_DST_A_VIP_CTL,
+                      .pix_frmt = VID_DST_A_PIX_FRMT,
+                      },
+
+       [SRAM_CH01] = {
+                      .i = SRAM_CH01,
+                      .name = "VID B",
+                      .cmds_start = VID_B_DOWN_CMDS,
+                      .ctrl_start = VID_B_IQ,
+                      .cdt = VID_B_CDT,
+                      .fifo_start = VID_B_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA2_PTR1,
+                      .ptr2_reg = DMA2_PTR2,
+                      .cnt1_reg = DMA2_CNT1,
+                      .cnt2_reg = DMA2_CNT2,
+                      .int_msk = VID_B_INT_MSK,
+                      .int_stat = VID_B_INT_STAT,
+                      .int_mstat = VID_B_INT_MSTAT,
+                      .dma_ctl = VID_DST_B_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_B_GPCNT_CTL,
+                      .gpcnt = VID_DST_B_GPCNT,
+                      .vip_ctl = VID_DST_B_VIP_CTL,
+                      .pix_frmt = VID_DST_B_PIX_FRMT,
+                      },
+
+       [SRAM_CH02] = {
+                      .i = SRAM_CH02,
+                      .name = "VID C",
+                      .cmds_start = VID_C_DOWN_CMDS,
+                      .ctrl_start = VID_C_IQ,
+                      .cdt = VID_C_CDT,
+                      .fifo_start = VID_C_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA3_PTR1,
+                      .ptr2_reg = DMA3_PTR2,
+                      .cnt1_reg = DMA3_CNT1,
+                      .cnt2_reg = DMA3_CNT2,
+                      .int_msk = VID_C_INT_MSK,
+                      .int_stat = VID_C_INT_STAT,
+                      .int_mstat = VID_C_INT_MSTAT,
+                      .dma_ctl = VID_DST_C_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_C_GPCNT_CTL,
+                      .gpcnt = VID_DST_C_GPCNT,
+                      .vip_ctl = VID_DST_C_VIP_CTL,
+                      .pix_frmt = VID_DST_C_PIX_FRMT,
+                      },
+
+       [SRAM_CH03] = {
+                      .i = SRAM_CH03,
+                      .name = "VID D",
+                      .cmds_start = VID_D_DOWN_CMDS,
+                      .ctrl_start = VID_D_IQ,
+                      .cdt = VID_D_CDT,
+                      .fifo_start = VID_D_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA4_PTR1,
+                      .ptr2_reg = DMA4_PTR2,
+                      .cnt1_reg = DMA4_CNT1,
+                      .cnt2_reg = DMA4_CNT2,
+                      .int_msk = VID_D_INT_MSK,
+                      .int_stat = VID_D_INT_STAT,
+                      .int_mstat = VID_D_INT_MSTAT,
+                      .dma_ctl = VID_DST_D_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_D_GPCNT_CTL,
+                      .gpcnt = VID_DST_D_GPCNT,
+                      .vip_ctl = VID_DST_D_VIP_CTL,
+                      .pix_frmt = VID_DST_D_PIX_FRMT,
+                      },
+
+       [SRAM_CH04] = {
+                      .i = SRAM_CH04,
+                      .name = "VID E",
+                      .cmds_start = VID_E_DOWN_CMDS,
+                      .ctrl_start = VID_E_IQ,
+                      .cdt = VID_E_CDT,
+                      .fifo_start = VID_E_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA5_PTR1,
+                      .ptr2_reg = DMA5_PTR2,
+                      .cnt1_reg = DMA5_CNT1,
+                      .cnt2_reg = DMA5_CNT2,
+                      .int_msk = VID_E_INT_MSK,
+                      .int_stat = VID_E_INT_STAT,
+                      .int_mstat = VID_E_INT_MSTAT,
+                      .dma_ctl = VID_DST_E_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_E_GPCNT_CTL,
+                      .gpcnt = VID_DST_E_GPCNT,
+                      .vip_ctl = VID_DST_E_VIP_CTL,
+                      .pix_frmt = VID_DST_E_PIX_FRMT,
+                      },
+
+       [SRAM_CH05] = {
+                      .i = SRAM_CH05,
+                      .name = "VID F",
+                      .cmds_start = VID_F_DOWN_CMDS,
+                      .ctrl_start = VID_F_IQ,
+                      .cdt = VID_F_CDT,
+                      .fifo_start = VID_F_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA6_PTR1,
+                      .ptr2_reg = DMA6_PTR2,
+                      .cnt1_reg = DMA6_CNT1,
+                      .cnt2_reg = DMA6_CNT2,
+                      .int_msk = VID_F_INT_MSK,
+                      .int_stat = VID_F_INT_STAT,
+                      .int_mstat = VID_F_INT_MSTAT,
+                      .dma_ctl = VID_DST_F_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_F_GPCNT_CTL,
+                      .gpcnt = VID_DST_F_GPCNT,
+                      .vip_ctl = VID_DST_F_VIP_CTL,
+                      .pix_frmt = VID_DST_F_PIX_FRMT,
+                      },
+
+       [SRAM_CH06] = {
+                      .i = SRAM_CH06,
+                      .name = "VID G",
+                      .cmds_start = VID_G_DOWN_CMDS,
+                      .ctrl_start = VID_G_IQ,
+                      .cdt = VID_G_CDT,
+                      .fifo_start = VID_G_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA7_PTR1,
+                      .ptr2_reg = DMA7_PTR2,
+                      .cnt1_reg = DMA7_CNT1,
+                      .cnt2_reg = DMA7_CNT2,
+                      .int_msk = VID_G_INT_MSK,
+                      .int_stat = VID_G_INT_STAT,
+                      .int_mstat = VID_G_INT_MSTAT,
+                      .dma_ctl = VID_DST_G_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_G_GPCNT_CTL,
+                      .gpcnt = VID_DST_G_GPCNT,
+                      .vip_ctl = VID_DST_G_VIP_CTL,
+                      .pix_frmt = VID_DST_G_PIX_FRMT,
+                      },
+
+       [SRAM_CH07] = {
+                      .i = SRAM_CH07,
+                      .name = "VID H",
+                      .cmds_start = VID_H_DOWN_CMDS,
+                      .ctrl_start = VID_H_IQ,
+                      .cdt = VID_H_CDT,
+                      .fifo_start = VID_H_DOWN_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA8_PTR1,
+                      .ptr2_reg = DMA8_PTR2,
+                      .cnt1_reg = DMA8_CNT1,
+                      .cnt2_reg = DMA8_CNT2,
+                      .int_msk = VID_H_INT_MSK,
+                      .int_stat = VID_H_INT_STAT,
+                      .int_mstat = VID_H_INT_MSTAT,
+                      .dma_ctl = VID_DST_H_DMA_CTL,
+                      .gpcnt_ctl = VID_DST_H_GPCNT_CTL,
+                      .gpcnt = VID_DST_H_GPCNT,
+                      .vip_ctl = VID_DST_H_VIP_CTL,
+                      .pix_frmt = VID_DST_H_PIX_FRMT,
+                      },
+
+       [SRAM_CH08] = {
+                      .name = "audio from",
+                      .cmds_start = AUD_A_DOWN_CMDS,
+                      .ctrl_start = AUD_A_IQ,
+                      .cdt = AUD_A_CDT,
+                      .fifo_start = AUD_A_DOWN_CLUSTER_1,
+                      .fifo_size = AUDIO_CLUSTER_SIZE * 3,
+                      .ptr1_reg = DMA17_PTR1,
+                      .ptr2_reg = DMA17_PTR2,
+                      .cnt1_reg = DMA17_CNT1,
+                      .cnt2_reg = DMA17_CNT2,
+                      },
+
+       [SRAM_CH09] = {
+                      .i = SRAM_CH09,
+                      .name = "VID Upstream I",
+                      .cmds_start = VID_I_UP_CMDS,
+                      .ctrl_start = VID_I_IQ,
+                      .cdt = VID_I_CDT,
+                      .fifo_start = VID_I_UP_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA15_PTR1,
+                      .ptr2_reg = DMA15_PTR2,
+                      .cnt1_reg = DMA15_CNT1,
+                      .cnt2_reg = DMA15_CNT2,
+                      .int_msk = VID_I_INT_MSK,
+                      .int_stat = VID_I_INT_STAT,
+                      .int_mstat = VID_I_INT_MSTAT,
+                      .dma_ctl = VID_SRC_I_DMA_CTL,
+                      .gpcnt_ctl = VID_SRC_I_GPCNT_CTL,
+                      .gpcnt = VID_SRC_I_GPCNT,
+
+                      .vid_fmt_ctl = VID_SRC_I_FMT_CTL,
+                      .vid_active_ctl1 = VID_SRC_I_ACTIVE_CTL1,
+                      .vid_active_ctl2 = VID_SRC_I_ACTIVE_CTL2,
+                      .vid_cdt_size = VID_SRC_I_CDT_SZ,
+                      .irq_bit = 8,
+                      },
+
+       [SRAM_CH10] = {
+                      .i = SRAM_CH10,
+                      .name = "VID Upstream J",
+                      .cmds_start = VID_J_UP_CMDS,
+                      .ctrl_start = VID_J_IQ,
+                      .cdt = VID_J_CDT,
+                      .fifo_start = VID_J_UP_CLUSTER_1,
+                      .fifo_size = (VID_CLUSTER_SIZE << 2),
+                      .ptr1_reg = DMA16_PTR1,
+                      .ptr2_reg = DMA16_PTR2,
+                      .cnt1_reg = DMA16_CNT1,
+                      .cnt2_reg = DMA16_CNT2,
+                      .int_msk = VID_J_INT_MSK,
+                      .int_stat = VID_J_INT_STAT,
+                      .int_mstat = VID_J_INT_MSTAT,
+                      .dma_ctl = VID_SRC_J_DMA_CTL,
+                      .gpcnt_ctl = VID_SRC_J_GPCNT_CTL,
+                      .gpcnt = VID_SRC_J_GPCNT,
+
+                      .vid_fmt_ctl = VID_SRC_J_FMT_CTL,
+                      .vid_active_ctl1 = VID_SRC_J_ACTIVE_CTL1,
+                      .vid_active_ctl2 = VID_SRC_J_ACTIVE_CTL2,
+                      .vid_cdt_size = VID_SRC_J_CDT_SZ,
+                      .irq_bit = 9,
+                      },
+
+       [SRAM_CH11] = {
+                      .i = SRAM_CH11,
+                      .name = "Audio Upstream Channel B",
+                      .cmds_start = AUD_B_UP_CMDS,
+                      .ctrl_start = AUD_B_IQ,
+                      .cdt = AUD_B_CDT,
+                      .fifo_start = AUD_B_UP_CLUSTER_1,
+                      .fifo_size = (AUDIO_CLUSTER_SIZE * 3),
+                      .ptr1_reg = DMA22_PTR1,
+                      .ptr2_reg = DMA22_PTR2,
+                      .cnt1_reg = DMA22_CNT1,
+                      .cnt2_reg = DMA22_CNT2,
+                      .int_msk = AUD_B_INT_MSK,
+                      .int_stat = AUD_B_INT_STAT,
+                      .int_mstat = AUD_B_INT_MSTAT,
+                      .dma_ctl = AUD_INT_DMA_CTL,
+                      .gpcnt_ctl = AUD_B_GPCNT_CTL,
+                      .gpcnt = AUD_B_GPCNT,
+                      .aud_length = AUD_B_LNGTH,
+                      .aud_cfg = AUD_B_CFG,
+                      .fld_aud_fifo_en = FLD_AUD_SRC_B_FIFO_EN,
+                      .fld_aud_risc_en = FLD_AUD_SRC_B_RISC_EN,
+                      .irq_bit = 11,
+                      },
+};
+
+struct sram_channel *channel0 = &cx25821_sram_channels[SRAM_CH00];
+struct sram_channel *channel1 = &cx25821_sram_channels[SRAM_CH01];
+struct sram_channel *channel2 = &cx25821_sram_channels[SRAM_CH02];
+struct sram_channel *channel3 = &cx25821_sram_channels[SRAM_CH03];
+struct sram_channel *channel4 = &cx25821_sram_channels[SRAM_CH04];
+struct sram_channel *channel5 = &cx25821_sram_channels[SRAM_CH05];
+struct sram_channel *channel6 = &cx25821_sram_channels[SRAM_CH06];
+struct sram_channel *channel7 = &cx25821_sram_channels[SRAM_CH07];
+struct sram_channel *channel9 = &cx25821_sram_channels[SRAM_CH09];
+struct sram_channel *channel10 = &cx25821_sram_channels[SRAM_CH10];
+struct sram_channel *channel11 = &cx25821_sram_channels[SRAM_CH11];
+
+struct cx25821_dmaqueue mpegq;
+
+static int cx25821_risc_decode(u32 risc)
+{
+       static char *instr[16] = {
+               [RISC_SYNC >> 28] = "sync",
+               [RISC_WRITE >> 28] = "write",
+               [RISC_WRITEC >> 28] = "writec",
+               [RISC_READ >> 28] = "read",
+               [RISC_READC >> 28] = "readc",
+               [RISC_JUMP >> 28] = "jump",
+               [RISC_SKIP >> 28] = "skip",
+               [RISC_WRITERM >> 28] = "writerm",
+               [RISC_WRITECM >> 28] = "writecm",
+               [RISC_WRITECR >> 28] = "writecr",
+       };
+       static int incr[16] = {
+               [RISC_WRITE >> 28] = 3,
+               [RISC_JUMP >> 28] = 3,
+               [RISC_SKIP >> 28] = 1,
+               [RISC_SYNC >> 28] = 1,
+               [RISC_WRITERM >> 28] = 3,
+               [RISC_WRITECM >> 28] = 3,
+               [RISC_WRITECR >> 28] = 4,
+       };
+       static char *bits[] = {
+               "12", "13", "14", "resync",
+               "cnt0", "cnt1", "18", "19",
+               "20", "21", "22", "23",
+               "irq1", "irq2", "eol", "sol",
+       };
+       int i;
+
+       printk("0x%08x [ %s", risc,
+              instr[risc >> 28] ? instr[risc >> 28] : "INVALID");
+       for (i = ARRAY_SIZE(bits) - 1; i >= 0; i--) {
+               if (risc & (1 << (i + 12)))
+                       printk(" %s", bits[i]);
+       }
+       printk(" count=%d ]\n", risc & 0xfff);
+       return incr[risc >> 28] ? incr[risc >> 28] : 1;
+}
+
+static inline int i2c_slave_did_ack(struct i2c_adapter *i2c_adap)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       return cx_read(bus->reg_stat) & 0x01;
+}
+
+void cx_i2c_read_print(struct cx25821_dev *dev, u32 reg, const char *reg_string)
+{
+       int tmp = 0;
+       u32 value = 0;
+
+       value = cx25821_i2c_read(&dev->i2c_bus[0], reg, &tmp);
+}
+
+static void cx25821_registers_init(struct cx25821_dev *dev)
+{
+       u32 tmp;
+
+       // enable RUN_RISC in Pecos
+       cx_write(DEV_CNTRL2, 0x20);
+
+       // Set the master PCI interrupt masks to enable video, audio, MBIF, and GPIO interrupts
+       // I2C interrupt masking is handled by the I2C objects themselves.
+       cx_write(PCI_INT_MSK, 0x2001FFFF);
+
+       tmp = cx_read(RDR_TLCTL0);
+       tmp &= ~FLD_CFG_RCB_CK_EN;      // Clear the RCB_CK_EN bit
+       cx_write(RDR_TLCTL0, tmp);
+
+       // PLL-A setting for the Audio Master Clock
+       cx_write(PLL_A_INT_FRAC, 0x9807A58B);
+
+       // PLL_A_POST = 0x1C, PLL_A_OUT_TO_PIN = 0x1
+       cx_write(PLL_A_POST_STAT_BIST, 0x8000019C);
+
+       // clear reset bit [31]
+       tmp = cx_read(PLL_A_INT_FRAC);
+       cx_write(PLL_A_INT_FRAC, tmp & 0x7FFFFFFF);
+
+       // PLL-B setting for Mobilygen Host Bus Interface
+       cx_write(PLL_B_INT_FRAC, 0x9883A86F);
+
+       // PLL_B_POST = 0xD, PLL_B_OUT_TO_PIN = 0x0
+       cx_write(PLL_B_POST_STAT_BIST, 0x8000018D);
+
+       // clear reset bit [31]
+       tmp = cx_read(PLL_B_INT_FRAC);
+       cx_write(PLL_B_INT_FRAC, tmp & 0x7FFFFFFF);
+
+       // PLL-C setting for video upstream channel
+       cx_write(PLL_C_INT_FRAC, 0x96A0EA3F);
+
+       // PLL_C_POST = 0x3, PLL_C_OUT_TO_PIN = 0x0
+       cx_write(PLL_C_POST_STAT_BIST, 0x80000103);
+
+       // clear reset bit [31]
+       tmp = cx_read(PLL_C_INT_FRAC);
+       cx_write(PLL_C_INT_FRAC, tmp & 0x7FFFFFFF);
+
+       // PLL-D setting for audio upstream channel
+       cx_write(PLL_D_INT_FRAC, 0x98757F5B);
+
+       // PLL_D_POST = 0x13, PLL_D_OUT_TO_PIN = 0x0
+       cx_write(PLL_D_POST_STAT_BIST, 0x80000113);
+
+       // clear reset bit [31]
+       tmp = cx_read(PLL_D_INT_FRAC);
+       cx_write(PLL_D_INT_FRAC, tmp & 0x7FFFFFFF);
+
+       // This selects the PLL C clock source for the video upstream channel I and J
+       tmp = cx_read(VID_CH_CLK_SEL);
+       cx_write(VID_CH_CLK_SEL, (tmp & 0x00FFFFFF) | 0x24000000);
+
+       // 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for channel A-C
+       //select 656/VIP DST for downstream Channel A - C
+       tmp = cx_read(VID_CH_MODE_SEL);
+       //cx_write( VID_CH_MODE_SEL, tmp | 0x1B0001FF);
+       cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);
+
+       // enables 656 port I and J as output
+       tmp = cx_read(CLK_RST);
+       tmp |= FLD_USE_ALT_PLL_REF;     // use external ALT_PLL_REF pin as its reference clock instead
+       cx_write(CLK_RST, tmp & ~(FLD_VID_I_CLK_NOE | FLD_VID_J_CLK_NOE));
+
+       mdelay(100);
+}
+
+int cx25821_sram_channel_setup(struct cx25821_dev *dev,
+                              struct sram_channel *ch,
+                              unsigned int bpl, u32 risc)
+{
+       unsigned int i, lines;
+       u32 cdt;
+
+       if (ch->cmds_start == 0) {
+               cx_write(ch->ptr1_reg, 0);
+               cx_write(ch->ptr2_reg, 0);
+               cx_write(ch->cnt2_reg, 0);
+               cx_write(ch->cnt1_reg, 0);
+               return 0;
+       }
+
+       bpl = (bpl + 7) & ~7;   /* alignment */
+       cdt = ch->cdt;
+       lines = ch->fifo_size / bpl;
+
+       if (lines > 4) {
+               lines = 4;
+       }
+
+       BUG_ON(lines < 2);
+
+       cx_write(8 + 0, RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       cx_write(8 + 4, 8);
+       cx_write(8 + 8, 0);
+
+       /* write CDT */
+       for (i = 0; i < lines; i++) {
+               cx_write(cdt + 16 * i, ch->fifo_start + bpl * i);
+               cx_write(cdt + 16 * i + 4, 0);
+               cx_write(cdt + 16 * i + 8, 0);
+               cx_write(cdt + 16 * i + 12, 0);
+       }
+
+       //init the first cdt buffer
+       for (i = 0; i < 128; i++)
+               cx_write(ch->fifo_start + 4 * i, i);
+
+       /* write CMDS */
+       if (ch->jumponly) {
+               cx_write(ch->cmds_start + 0, 8);
+       } else {
+               cx_write(ch->cmds_start + 0, risc);
+       }
+
+       cx_write(ch->cmds_start + 4, 0);        /* 64 bits 63-32 */
+       cx_write(ch->cmds_start + 8, cdt);
+       cx_write(ch->cmds_start + 12, (lines * 16) >> 3);
+       cx_write(ch->cmds_start + 16, ch->ctrl_start);
+
+       if (ch->jumponly)
+               cx_write(ch->cmds_start + 20, 0x80000000 | (64 >> 2));
+       else
+               cx_write(ch->cmds_start + 20, 64 >> 2);
+
+       for (i = 24; i < 80; i += 4)
+               cx_write(ch->cmds_start + i, 0);
+
+       /* fill registers */
+       cx_write(ch->ptr1_reg, ch->fifo_start);
+       cx_write(ch->ptr2_reg, cdt);
+       cx_write(ch->cnt2_reg, (lines * 16) >> 3);
+       cx_write(ch->cnt1_reg, (bpl >> 3) - 1);
+
+       return 0;
+}
+
+int cx25821_sram_channel_setup_audio(struct cx25821_dev *dev,
+                                    struct sram_channel *ch,
+                                    unsigned int bpl, u32 risc)
+{
+       unsigned int i, lines;
+       u32 cdt;
+
+       if (ch->cmds_start == 0) {
+               cx_write(ch->ptr1_reg, 0);
+               cx_write(ch->ptr2_reg, 0);
+               cx_write(ch->cnt2_reg, 0);
+               cx_write(ch->cnt1_reg, 0);
+               return 0;
+       }
+
+       bpl = (bpl + 7) & ~7;   /* alignment */
+       cdt = ch->cdt;
+       lines = ch->fifo_size / bpl;
+
+       if (lines > 3) {
+               lines = 3;      //for AUDIO
+       }
+
+       BUG_ON(lines < 2);
+
+       cx_write(8 + 0, RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       cx_write(8 + 4, 8);
+       cx_write(8 + 8, 0);
+
+       /* write CDT */
+       for (i = 0; i < lines; i++) {
+               cx_write(cdt + 16 * i, ch->fifo_start + bpl * i);
+               cx_write(cdt + 16 * i + 4, 0);
+               cx_write(cdt + 16 * i + 8, 0);
+               cx_write(cdt + 16 * i + 12, 0);
+       }
+
+       /* write CMDS */
+       if (ch->jumponly) {
+               cx_write(ch->cmds_start + 0, 8);
+       } else {
+               cx_write(ch->cmds_start + 0, risc);
+       }
+
+       cx_write(ch->cmds_start + 4, 0);        /* 64 bits 63-32 */
+       cx_write(ch->cmds_start + 8, cdt);
+       cx_write(ch->cmds_start + 12, (lines * 16) >> 3);
+       cx_write(ch->cmds_start + 16, ch->ctrl_start);
+
+       //IQ size
+       if (ch->jumponly) {
+               cx_write(ch->cmds_start + 20, 0x80000000 | (64 >> 2));
+       } else {
+               cx_write(ch->cmds_start + 20, 64 >> 2);
+       }
+
+       //zero out
+       for (i = 24; i < 80; i += 4)
+               cx_write(ch->cmds_start + i, 0);
+
+       /* fill registers */
+       cx_write(ch->ptr1_reg, ch->fifo_start);
+       cx_write(ch->ptr2_reg, cdt);
+       cx_write(ch->cnt2_reg, (lines * 16) >> 3);
+       cx_write(ch->cnt1_reg, (bpl >> 3) - 1);
+
+       return 0;
+}
+
+void cx25821_sram_channel_dump(struct cx25821_dev *dev, struct sram_channel *ch)
+{
+       static char *name[] = {
+               "init risc lo",
+               "init risc hi",
+               "cdt base",
+               "cdt size",
+               "iq base",
+               "iq size",
+               "risc pc lo",
+               "risc pc hi",
+               "iq wr ptr",
+               "iq rd ptr",
+               "cdt current",
+               "pci target lo",
+               "pci target hi",
+               "line / byte",
+       };
+       u32 risc;
+       unsigned int i, j, n;
+
+       printk(KERN_WARNING "%s: %s - dma channel status dump\n", dev->name,
+              ch->name);
+       for (i = 0; i < ARRAY_SIZE(name); i++)
+               printk(KERN_WARNING "cmds + 0x%2x:   %-15s: 0x%08x\n", i * 4,
+                      name[i], cx_read(ch->cmds_start + 4 * i));
+
+       j = i * 4;
+       for (i = 0; i < 4;) {
+               risc = cx_read(ch->cmds_start + 4 * (i + 14));
+               printk(KERN_WARNING "cmds + 0x%2x:   risc%d: ", j + i * 4, i);
+               i += cx25821_risc_decode(risc);
+       }
+
+       for (i = 0; i < (64 >> 2); i += n) {
+               risc = cx_read(ch->ctrl_start + 4 * i);
+               /* No consideration for bits 63-32 */
+
+               printk(KERN_WARNING "ctrl + 0x%2x (0x%08x): iq %x: ", i * 4,
+                      ch->ctrl_start + 4 * i, i);
+               n = cx25821_risc_decode(risc);
+               for (j = 1; j < n; j++) {
+                       risc = cx_read(ch->ctrl_start + 4 * (i + j));
+                       printk(KERN_WARNING
+                              "ctrl + 0x%2x :   iq %x: 0x%08x [ arg #%d ]\n",
+                              4 * (i + j), i + j, risc, j);
+               }
+       }
+
+       printk(KERN_WARNING "        :   fifo: 0x%08x -> 0x%x\n",
+              ch->fifo_start, ch->fifo_start + ch->fifo_size);
+       printk(KERN_WARNING "        :   ctrl: 0x%08x -> 0x%x\n",
+              ch->ctrl_start, ch->ctrl_start + 6 * 16);
+       printk(KERN_WARNING "        :   ptr1_reg: 0x%08x\n",
+              cx_read(ch->ptr1_reg));
+       printk(KERN_WARNING "        :   ptr2_reg: 0x%08x\n",
+              cx_read(ch->ptr2_reg));
+       printk(KERN_WARNING "        :   cnt1_reg: 0x%08x\n",
+              cx_read(ch->cnt1_reg));
+       printk(KERN_WARNING "        :   cnt2_reg: 0x%08x\n",
+              cx_read(ch->cnt2_reg));
+}
+
+void cx25821_sram_channel_dump_audio(struct cx25821_dev *dev,
+                                    struct sram_channel *ch)
+{
+       static char *name[] = {
+               "init risc lo",
+               "init risc hi",
+               "cdt base",
+               "cdt size",
+               "iq base",
+               "iq size",
+               "risc pc lo",
+               "risc pc hi",
+               "iq wr ptr",
+               "iq rd ptr",
+               "cdt current",
+               "pci target lo",
+               "pci target hi",
+               "line / byte",
+       };
+
+       u32 risc, value, tmp;
+       unsigned int i, j, n;
+
+       printk(KERN_INFO "\n%s: %s - dma Audio channel status dump\n",
+              dev->name, ch->name);
+
+       for (i = 0; i < ARRAY_SIZE(name); i++)
+               printk(KERN_INFO "%s: cmds + 0x%2x:   %-15s: 0x%08x\n",
+                      dev->name, i * 4, name[i],
+                      cx_read(ch->cmds_start + 4 * i));
+
+       j = i * 4;
+       for (i = 0; i < 4;) {
+               risc = cx_read(ch->cmds_start + 4 * (i + 14));
+               printk(KERN_WARNING "cmds + 0x%2x:   risc%d: ", j + i * 4, i);
+               i += cx25821_risc_decode(risc);
+       }
+
+       for (i = 0; i < (64 >> 2); i += n) {
+               risc = cx_read(ch->ctrl_start + 4 * i);
+               /* No consideration for bits 63-32 */
+
+               printk(KERN_WARNING "ctrl + 0x%2x (0x%08x): iq %x: ", i * 4,
+                      ch->ctrl_start + 4 * i, i);
+               n = cx25821_risc_decode(risc);
+
+               for (j = 1; j < n; j++) {
+                       risc = cx_read(ch->ctrl_start + 4 * (i + j));
+                       printk(KERN_WARNING
+                              "ctrl + 0x%2x :   iq %x: 0x%08x [ arg #%d ]\n",
+                              4 * (i + j), i + j, risc, j);
+               }
+       }
+
+       printk(KERN_WARNING "        :   fifo: 0x%08x -> 0x%x\n",
+              ch->fifo_start, ch->fifo_start + ch->fifo_size);
+       printk(KERN_WARNING "        :   ctrl: 0x%08x -> 0x%x\n",
+              ch->ctrl_start, ch->ctrl_start + 6 * 16);
+       printk(KERN_WARNING "        :   ptr1_reg: 0x%08x\n",
+              cx_read(ch->ptr1_reg));
+       printk(KERN_WARNING "        :   ptr2_reg: 0x%08x\n",
+              cx_read(ch->ptr2_reg));
+       printk(KERN_WARNING "        :   cnt1_reg: 0x%08x\n",
+              cx_read(ch->cnt1_reg));
+       printk(KERN_WARNING "        :   cnt2_reg: 0x%08x\n",
+              cx_read(ch->cnt2_reg));
+
+       for (i = 0; i < 4; i++) {
+               risc = cx_read(ch->cmds_start + 56 + (i * 4));
+               printk(KERN_WARNING "instruction %d = 0x%x\n", i, risc);
+       }
+
+       //read data from the first cdt buffer
+       risc = cx_read(AUD_A_CDT);
+       printk(KERN_WARNING "\nread cdt loc=0x%x\n", risc);
+       for (i = 0; i < 8; i++) {
+               n = cx_read(risc + i * 4);
+               printk(KERN_WARNING "0x%x ", n);
+       }
+       printk(KERN_WARNING "\n\n");
+
+       value = cx_read(CLK_RST);
+       CX25821_INFO(" CLK_RST = 0x%x \n\n", value);
+
+       value = cx_read(PLL_A_POST_STAT_BIST);
+       CX25821_INFO(" PLL_A_POST_STAT_BIST = 0x%x \n\n", value);
+       value = cx_read(PLL_A_INT_FRAC);
+       CX25821_INFO(" PLL_A_INT_FRAC = 0x%x \n\n", value);
+
+       value = cx_read(PLL_B_POST_STAT_BIST);
+       CX25821_INFO(" PLL_B_POST_STAT_BIST = 0x%x \n\n", value);
+       value = cx_read(PLL_B_INT_FRAC);
+       CX25821_INFO(" PLL_B_INT_FRAC = 0x%x \n\n", value);
+
+       value = cx_read(PLL_C_POST_STAT_BIST);
+       CX25821_INFO(" PLL_C_POST_STAT_BIST = 0x%x \n\n", value);
+       value = cx_read(PLL_C_INT_FRAC);
+       CX25821_INFO(" PLL_C_INT_FRAC = 0x%x \n\n", value);
+
+       value = cx_read(PLL_D_POST_STAT_BIST);
+       CX25821_INFO(" PLL_D_POST_STAT_BIST = 0x%x \n\n", value);
+       value = cx_read(PLL_D_INT_FRAC);
+       CX25821_INFO(" PLL_D_INT_FRAC = 0x%x \n\n", value);
+
+       value = cx25821_i2c_read(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL, &tmp);
+       CX25821_INFO(" AFE_AB_DIAG_CTRL (0x10900090) = 0x%x \n\n", value);
+}
+
+static void cx25821_shutdown(struct cx25821_dev *dev)
+{
+       int i;
+
+       /* disable RISC controller */
+       cx_write(DEV_CNTRL2, 0);
+
+       /* Disable Video A/B activity */
+       for (i = 0; i < VID_CHANNEL_NUM; i++) {
+               cx_write(dev->sram_channels[i].dma_ctl, 0);
+               cx_write(dev->sram_channels[i].int_msk, 0);
+       }
+
+       for (i = VID_UPSTREAM_SRAM_CHANNEL_I; i <= VID_UPSTREAM_SRAM_CHANNEL_J;
+            i++) {
+               cx_write(dev->sram_channels[i].dma_ctl, 0);
+               cx_write(dev->sram_channels[i].int_msk, 0);
+       }
+
+       /* Disable Audio activity */
+       cx_write(AUD_INT_DMA_CTL, 0);
+
+       /* Disable Serial port */
+       cx_write(UART_CTL, 0);
+
+       /* Disable Interrupts */
+       cx_write(PCI_INT_MSK, 0);
+       cx_write(AUD_A_INT_MSK, 0);
+}
+
+void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel_select,
+                             u32 format)
+{
+       struct sram_channel *ch;
+
+       if (channel_select <= 7 && channel_select >= 0) {
+               ch = &cx25821_sram_channels[channel_select];
+               cx_write(ch->pix_frmt, format);
+               dev->pixel_formats[channel_select] = format;
+       }
+}
+
+static void cx25821_set_vip_mode(struct cx25821_dev *dev,
+                                struct sram_channel *ch)
+{
+       cx_write(ch->pix_frmt, PIXEL_FRMT_422);
+       cx_write(ch->vip_ctl, PIXEL_ENGINE_VIP1);
+}
+
+static void cx25821_initialize(struct cx25821_dev *dev)
+{
+       int i;
+
+       dprintk(1, "%s()\n", __func__);
+
+       cx25821_shutdown(dev);
+       cx_write(PCI_INT_STAT, 0xffffffff);
+
+       for (i = 0; i < VID_CHANNEL_NUM; i++)
+               cx_write(dev->sram_channels[i].int_stat, 0xffffffff);
+
+       cx_write(AUD_A_INT_STAT, 0xffffffff);
+       cx_write(AUD_B_INT_STAT, 0xffffffff);
+       cx_write(AUD_C_INT_STAT, 0xffffffff);
+       cx_write(AUD_D_INT_STAT, 0xffffffff);
+       cx_write(AUD_E_INT_STAT, 0xffffffff);
+
+       cx_write(CLK_DELAY, cx_read(CLK_DELAY) & 0x80000000);
+       cx_write(PAD_CTRL, 0x12);       //for I2C
+       cx25821_registers_init(dev);    //init Pecos registers
+       mdelay(100);
+
+       for (i = 0; i < VID_CHANNEL_NUM; i++) {
+               cx25821_set_vip_mode(dev, &dev->sram_channels[i]);
+               cx25821_sram_channel_setup(dev, &dev->sram_channels[i], 1440,
+                                          0);
+               dev->pixel_formats[i] = PIXEL_FRMT_422;
+               dev->use_cif_resolution[i] = FALSE;
+       }
+
+       //Probably only affect Downstream
+       for (i = VID_UPSTREAM_SRAM_CHANNEL_I; i <= VID_UPSTREAM_SRAM_CHANNEL_J;
+            i++) {
+               cx25821_set_vip_mode(dev, &dev->sram_channels[i]);
+       }
+
+       cx25821_sram_channel_setup_audio(dev, &dev->sram_channels[SRAM_CH08],
+                                        128, 0);
+
+       cx25821_gpio_init(dev);
+}
+
+static int get_resources(struct cx25821_dev *dev)
+{
+       if (request_mem_region
+           (pci_resource_start(dev->pci, 0), pci_resource_len(dev->pci, 0),
+            dev->name))
+               return 0;
+
+       printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",
+              dev->name, (unsigned long long)pci_resource_start(dev->pci, 0));
+
+       return -EBUSY;
+}
+
+static void cx25821_dev_checkrevision(struct cx25821_dev *dev)
+{
+       dev->hwrevision = cx_read(RDR_CFG2) & 0xff;
+
+       printk(KERN_INFO "%s() Hardware revision = 0x%02x\n", __func__,
+              dev->hwrevision);
+}
+
+static void cx25821_iounmap(struct cx25821_dev *dev)
+{
+       if (dev == NULL)
+               return;
+
+       /* Releasing IO memory */
+       if (dev->lmmio != NULL) {
+               CX25821_INFO("Releasing lmmio.\n");
+               iounmap(dev->lmmio);
+               dev->lmmio = NULL;
+       }
+}
+
+static int cx25821_dev_setup(struct cx25821_dev *dev)
+{
+       int io_size = 0, i;
+
+       struct video_device *video_template[] = {
+               &cx25821_video_template0,
+               &cx25821_video_template1,
+               &cx25821_video_template2,
+               &cx25821_video_template3,
+               &cx25821_video_template4,
+               &cx25821_video_template5,
+               &cx25821_video_template6,
+               &cx25821_video_template7,
+               &cx25821_video_template9,
+               &cx25821_video_template10,
+               &cx25821_video_template11,
+               &cx25821_videoioctl_template,
+       };
+
+       printk(KERN_INFO "\n***********************************\n");
+       printk(KERN_INFO "cx25821 set up\n");
+       printk(KERN_INFO "***********************************\n\n");
+
+       mutex_init(&dev->lock);
+
+       atomic_inc(&dev->refcount);
+
+       dev->nr = ++cx25821_devcount;
+       sprintf(dev->name, "cx25821[%d]", dev->nr);
+
+       mutex_lock(&devlist);
+       list_add_tail(&dev->devlist, &cx25821_devlist);
+       mutex_unlock(&devlist);
+
+       strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown");
+       strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821");
+
+       if (dev->pci->device != 0x8210) {
+               printk(KERN_INFO
+                      "%s() Exiting. Incorrect Hardware device = 0x%02x\n",
+                      __func__, dev->pci->device);
+               return -1;
+       } else {
+               printk(KERN_INFO "Athena Hardware device = 0x%02x\n",
+                      dev->pci->device);
+       }
+
+       /* Apply a sensible clock frequency for the PCIe bridge */
+       dev->clk_freq = 28000000;
+       dev->sram_channels = cx25821_sram_channels;
+
+       if (dev->nr > 1) {
+               CX25821_INFO("dev->nr > 1!");
+       }
+
+       /* board config */
+       dev->board = 1;         //card[dev->nr];
+       dev->_max_num_decoders = MAX_DECODERS;
+
+       dev->pci_bus = dev->pci->bus->number;
+       dev->pci_slot = PCI_SLOT(dev->pci->devfn);
+       dev->pci_irqmask = 0x001f00;
+
+       /* External Master 1 Bus */
+       dev->i2c_bus[0].nr = 0;
+       dev->i2c_bus[0].dev = dev;
+       dev->i2c_bus[0].reg_stat = I2C1_STAT;
+       dev->i2c_bus[0].reg_ctrl = I2C1_CTRL;
+       dev->i2c_bus[0].reg_addr = I2C1_ADDR;
+       dev->i2c_bus[0].reg_rdata = I2C1_RDATA;
+       dev->i2c_bus[0].reg_wdata = I2C1_WDATA;
+       dev->i2c_bus[0].i2c_period = (0x07 << 24);      /* 1.95MHz */
+
+
+       if (get_resources(dev) < 0) {
+               printk(KERN_ERR "%s No more PCIe resources for "
+                      "subsystem: %04x:%04x\n",
+                      dev->name, dev->pci->subsystem_vendor,
+                      dev->pci->subsystem_device);
+
+               cx25821_devcount--;
+               return -ENODEV;
+       }
+
+       /* PCIe stuff */
+       dev->base_io_addr = pci_resource_start(dev->pci, 0);
+       io_size = pci_resource_len(dev->pci, 0);
+
+       if (!dev->base_io_addr) {
+               CX25821_ERR("No PCI Memory resources, exiting!\n");
+               return -ENODEV;
+       }
+
+       dev->lmmio = ioremap(dev->base_io_addr, pci_resource_len(dev->pci, 0));
+
+       if (!dev->lmmio) {
+               CX25821_ERR
+                   ("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");
+               cx25821_iounmap(dev);
+               return -ENOMEM;
+       }
+
+       dev->bmmio = (u8 __iomem *) dev->lmmio;
+
+       printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+              dev->name, dev->pci->subsystem_vendor,
+              dev->pci->subsystem_device, cx25821_boards[dev->board].name,
+              dev->board, card[dev->nr] == dev->board ?
+              "insmod option" : "autodetected");
+
+       /* init hardware */
+       cx25821_initialize(dev);
+
+       cx25821_i2c_register(&dev->i2c_bus[0]);
+//  cx25821_i2c_register(&dev->i2c_bus[1]);
+//  cx25821_i2c_register(&dev->i2c_bus[2]);
+
+       CX25821_INFO("i2c register! bus->i2c_rc = %d\n",
+                    dev->i2c_bus[0].i2c_rc);
+
+       cx25821_card_setup(dev);
+       medusa_video_init(dev);
+
+       for (i = 0; i < VID_CHANNEL_NUM; i++) {
+               if (cx25821_video_register(dev, i, video_template[i]) < 0) {
+                       printk(KERN_ERR
+                              "%s() Failed to register analog video adapters on VID channel %d\n",
+                              __func__, i);
+               }
+       }
+
+       for (i = VID_UPSTREAM_SRAM_CHANNEL_I;
+            i <= AUDIO_UPSTREAM_SRAM_CHANNEL_B; i++) {
+               //Since we don't have template8 for Audio Downstream
+               if (cx25821_video_register(dev, i, video_template[i - 1]) < 0) {
+                       printk(KERN_ERR
+                              "%s() Failed to register analog video adapters for Upstream channel %d.\n",
+                              __func__, i);
+               }
+       }
+
+       // register IOCTL device
+       dev->ioctl_dev =
+           cx25821_vdev_init(dev, dev->pci, video_template[VIDEO_IOCTL_CH],
+                             "video");
+
+       if (video_register_device
+           (dev->ioctl_dev, VFL_TYPE_GRABBER, VIDEO_IOCTL_CH) < 0) {
+               cx25821_videoioctl_unregister(dev);
+               printk(KERN_ERR
+                      "%s() Failed to register video adapter for IOCTL so releasing.\n",
+                      __func__);
+       }
+
+       cx25821_dev_checkrevision(dev);
+       CX25821_INFO("cx25821 setup done!\n");
+
+       return 0;
+}
+
+void cx25821_start_upstream_video_ch1(struct cx25821_dev *dev,
+                                     struct upstream_user_struct *up_data)
+{
+       dev->_isNTSC = !strcmp(dev->vid_stdname, "NTSC") ? 1 : 0;
+
+       dev->tvnorm = !dev->_isNTSC ? V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
+       medusa_set_videostandard(dev);
+
+       cx25821_vidupstream_init_ch1(dev, dev->channel_select,
+                                    dev->pixel_format);
+}
+
+void cx25821_start_upstream_video_ch2(struct cx25821_dev *dev,
+                                     struct upstream_user_struct *up_data)
+{
+       dev->_isNTSC_ch2 = !strcmp(dev->vid_stdname_ch2, "NTSC") ? 1 : 0;
+
+       dev->tvnorm = !dev->_isNTSC_ch2 ? V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
+       medusa_set_videostandard(dev);
+
+       cx25821_vidupstream_init_ch2(dev, dev->channel_select_ch2,
+                                    dev->pixel_format_ch2);
+}
+
+void cx25821_start_upstream_audio(struct cx25821_dev *dev,
+                                 struct upstream_user_struct *up_data)
+{
+       cx25821_audio_upstream_init(dev, AUDIO_UPSTREAM_SRAM_CHANNEL_B);
+}
+
+void cx25821_dev_unregister(struct cx25821_dev *dev)
+{
+       int i;
+
+       if (!dev->base_io_addr)
+               return;
+
+       cx25821_free_mem_upstream_ch1(dev);
+       cx25821_free_mem_upstream_ch2(dev);
+       cx25821_free_mem_upstream_audio(dev);
+
+       release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
+
+       if (!atomic_dec_and_test(&dev->refcount))
+               return;
+
+       for (i = 0; i < VID_CHANNEL_NUM; i++)
+               cx25821_video_unregister(dev, i);
+
+       for (i = VID_UPSTREAM_SRAM_CHANNEL_I;
+            i <= AUDIO_UPSTREAM_SRAM_CHANNEL_B; i++) {
+               cx25821_video_unregister(dev, i);
+       }
+
+       cx25821_videoioctl_unregister(dev);
+
+       cx25821_i2c_unregister(&dev->i2c_bus[0]);
+       cx25821_iounmap(dev);
+}
+
+static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,
+                                 unsigned int offset, u32 sync_line,
+                                 unsigned int bpl, unsigned int padding,
+                                 unsigned int lines)
+{
+       struct scatterlist *sg;
+       unsigned int line, todo;
+
+       /* sync instruction */
+       if (sync_line != NO_SYNC_LINE) {
+               *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+       }
+
+       /* scan lines */
+       sg = sglist;
+       for (line = 0; line < lines; line++) {
+               while (offset && offset >= sg_dma_len(sg)) {
+                       offset -= sg_dma_len(sg);
+                       sg++;
+               }
+               if (bpl <= sg_dma_len(sg) - offset) {
+                       /* fits into current chunk */
+                       *(rp++) =
+                           cpu_to_le32(RISC_WRITE | RISC_SOL | RISC_EOL | bpl);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       offset += bpl;
+               } else {
+                       /* scanline needs to be split */
+                       todo = bpl;
+                       *(rp++) =
+                           cpu_to_le32(RISC_WRITE | RISC_SOL |
+                                       (sg_dma_len(sg) - offset));
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       todo -= (sg_dma_len(sg) - offset);
+                       offset = 0;
+                       sg++;
+                       while (todo > sg_dma_len(sg)) {
+                               *(rp++) =
+                                   cpu_to_le32(RISC_WRITE | sg_dma_len(sg));
+                               *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                               todo -= sg_dma_len(sg);
+                               sg++;
+                       }
+                       *(rp++) = cpu_to_le32(RISC_WRITE | RISC_EOL | todo);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       offset += todo;
+               }
+
+               offset += padding;
+       }
+
+       return rp;
+}
+
+int cx25821_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+                       struct scatterlist *sglist, unsigned int top_offset,
+                       unsigned int bottom_offset, unsigned int bpl,
+                       unsigned int padding, unsigned int lines)
+{
+       u32 instructions;
+       u32 fields;
+       __le32 *rp;
+       int rc;
+
+       fields = 0;
+       if (UNSET != top_offset)
+               fields++;
+       if (UNSET != bottom_offset)
+               fields++;
+
+       /* estimate risc mem: worst case is one write per page border +
+          one write per scan line + syncs + jump (all 2 dwords).  Padding
+          can cause next bpl to start close to a page border.  First DMA
+          region may be smaller than PAGE_SIZE */
+       /* write and jump need and extra dword */
+       instructions =
+           fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
+       instructions += 2;
+       rc = btcx_riscmem_alloc(pci, risc, instructions * 12);
+
+       if (rc < 0)
+               return rc;
+
+       /* write risc instructions */
+       rp = risc->cpu;
+
+       if (UNSET != top_offset) {
+               rp = cx25821_risc_field(rp, sglist, top_offset, 0, bpl, padding,
+                                       lines);
+       }
+
+       if (UNSET != bottom_offset) {
+               rp = cx25821_risc_field(rp, sglist, bottom_offset, 0x200, bpl,
+                                       padding, lines);
+       }
+
+       /* save pointer to jmp instruction address */
+       risc->jmp = rp;
+       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof(*risc->cpu) > risc->size);
+
+       return 0;
+}
+
+static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,
+                                       unsigned int offset, u32 sync_line,
+                                       unsigned int bpl, unsigned int padding,
+                                       unsigned int lines, unsigned int lpi)
+{
+       struct scatterlist *sg;
+       unsigned int line, todo, sol;
+
+       /* sync instruction */
+       if (sync_line != NO_SYNC_LINE)
+               *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+
+       /* scan lines */
+       sg = sglist;
+       for (line = 0; line < lines; line++) {
+               while (offset && offset >= sg_dma_len(sg)) {
+                       offset -= sg_dma_len(sg);
+                       sg++;
+               }
+
+               if (lpi && line > 0 && !(line % lpi))
+                       sol = RISC_SOL | RISC_IRQ1 | RISC_CNT_INC;
+               else
+                       sol = RISC_SOL;
+
+               if (bpl <= sg_dma_len(sg) - offset) {
+                       /* fits into current chunk */
+                       *(rp++) =
+                           cpu_to_le32(RISC_WRITE | sol | RISC_EOL | bpl);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       offset += bpl;
+               } else {
+                       /* scanline needs to be split */
+                       todo = bpl;
+                       *(rp++) = cpu_to_le32(RISC_WRITE | sol |
+                                             (sg_dma_len(sg) - offset));
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       todo -= (sg_dma_len(sg) - offset);
+                       offset = 0;
+                       sg++;
+                       while (todo > sg_dma_len(sg)) {
+                               *(rp++) = cpu_to_le32(RISC_WRITE |
+                                                     sg_dma_len(sg));
+                               *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                               todo -= sg_dma_len(sg);
+                               sg++;
+                       }
+                       *(rp++) = cpu_to_le32(RISC_WRITE | RISC_EOL | todo);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+                       offset += todo;
+               }
+               offset += padding;
+       }
+
+       return rp;
+}
+
+int cx25821_risc_databuffer_audio(struct pci_dev *pci,
+                                 struct btcx_riscmem *risc,
+                                 struct scatterlist *sglist,
+                                 unsigned int bpl,
+                                 unsigned int lines, unsigned int lpi)
+{
+       u32 instructions;
+       __le32 *rp;
+       int rc;
+
+       /* estimate risc mem: worst case is one write per page border +
+          one write per scan line + syncs + jump (all 2 dwords).  Here
+          there is no padding and no sync.  First DMA region may be smaller
+          than PAGE_SIZE */
+       /* Jump and write need an extra dword */
+       instructions = 1 + (bpl * lines) / PAGE_SIZE + lines;
+       instructions += 1;
+
+       if ((rc = btcx_riscmem_alloc(pci, risc, instructions * 12)) < 0)
+               return rc;
+
+       /* write risc instructions */
+       rp = risc->cpu;
+       rp = cx25821_risc_field_audio(rp, sglist, 0, NO_SYNC_LINE, bpl, 0,
+                                     lines, lpi);
+
+       /* save pointer to jmp instruction address */
+       risc->jmp = rp;
+       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof(*risc->cpu) > risc->size);
+       return 0;
+}
+
+int cx25821_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
+                        u32 reg, u32 mask, u32 value)
+{
+       __le32 *rp;
+       int rc;
+
+       rc = btcx_riscmem_alloc(pci, risc, 4 * 16);
+
+       if (rc < 0)
+               return rc;
+
+       /* write risc instructions */
+       rp = risc->cpu;
+
+       *(rp++) = cpu_to_le32(RISC_WRITECR | RISC_IRQ1);
+       *(rp++) = cpu_to_le32(reg);
+       *(rp++) = cpu_to_le32(value);
+       *(rp++) = cpu_to_le32(mask);
+       *(rp++) = cpu_to_le32(RISC_JUMP);
+       *(rp++) = cpu_to_le32(risc->dma);
+       *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+       return 0;
+}
+
+void cx25821_free_buffer(struct videobuf_queue *q, struct cx25821_buffer *buf)
+{
+       struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);
+
+       BUG_ON(in_interrupt());
+       videobuf_waiton(&buf->vb, 0, 0);
+       videobuf_dma_unmap(q, dma);
+       videobuf_dma_free(dma);
+       btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
+       buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+
+static irqreturn_t cx25821_irq(int irq, void *dev_id)
+{
+       struct cx25821_dev *dev = dev_id;
+       u32 pci_status, pci_mask;
+       u32 vid_status;
+       int i, handled = 0;
+       u32 mask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+
+       pci_status = cx_read(PCI_INT_STAT);
+       pci_mask = cx_read(PCI_INT_MSK);
+
+       if (pci_status == 0)
+               goto out;
+
+       for (i = 0; i < VID_CHANNEL_NUM; i++) {
+               if (pci_status & mask[i]) {
+                       vid_status = cx_read(dev->sram_channels[i].int_stat);
+
+                       if (vid_status)
+                               handled +=
+                                   cx25821_video_irq(dev, i, vid_status);
+
+                       cx_write(PCI_INT_STAT, mask[i]);
+               }
+       }
+
+      out:
+       return IRQ_RETVAL(handled);
+}
+
+void cx25821_print_irqbits(char *name, char *tag, char **strings,
+                          int len, u32 bits, u32 mask)
+{
+       unsigned int i;
+
+       printk(KERN_DEBUG "%s: %s [0x%x]", name, tag, bits);
+
+       for (i = 0; i < len; i++) {
+               if (!(bits & (1 << i)))
+                       continue;
+               if (strings[i])
+                       printk(" %s", strings[i]);
+               else
+                       printk(" %d", i);
+               if (!(mask & (1 << i)))
+                       continue;
+               printk("*");
+       }
+       printk("\n");
+}
+
+struct cx25821_dev *cx25821_dev_get(struct pci_dev *pci)
+{
+       struct cx25821_dev *dev = pci_get_drvdata(pci);
+       return dev;
+}
+
+static int __devinit cx25821_initdev(struct pci_dev *pci_dev,
+                                    const struct pci_device_id *pci_id)
+{
+       struct cx25821_dev *dev;
+       int err = 0;
+
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (NULL == dev)
+               return -ENOMEM;
+
+       err = v4l2_device_register(&pci_dev->dev, &dev->v4l2_dev);
+       if (err < 0)
+               goto fail_free;
+
+       /* pci init */
+       dev->pci = pci_dev;
+       if (pci_enable_device(pci_dev)) {
+               err = -EIO;
+
+               printk(KERN_INFO "pci enable failed! ");
+
+               goto fail_unregister_device;
+       }
+
+       printk(KERN_INFO "cx25821 Athena pci enable ! \n");
+
+       if (cx25821_dev_setup(dev) < 0) {
+               err = -EINVAL;
+               goto fail_unregister_device;
+       }
+
+       /* print pci info */
+       pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
+       pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat);
+       printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
+              "latency: %d, mmio: 0x%llx\n", dev->name,
+              pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
+              dev->pci_lat, (unsigned long long)dev->base_io_addr);
+
+       pci_set_master(pci_dev);
+       if (!pci_dma_supported(pci_dev, 0xffffffff)) {
+               printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
+               err = -EIO;
+               goto fail_irq;
+       }
+
+       err =
+           request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED | IRQF_DISABLED,
+                       dev->name, dev);
+
+       if (err < 0) {
+               printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
+                      pci_dev->irq);
+               goto fail_irq;
+       }
+
+       return 0;
+
+      fail_irq:
+       printk(KERN_INFO "cx25821 cx25821_initdev() can't get IRQ ! \n");
+       cx25821_dev_unregister(dev);
+
+      fail_unregister_device:
+       v4l2_device_unregister(&dev->v4l2_dev);
+
+      fail_free:
+       kfree(dev);
+       return err;
+}
+
+static void __devexit cx25821_finidev(struct pci_dev *pci_dev)
+{
+       struct v4l2_device *v4l2_dev = pci_get_drvdata(pci_dev);
+       struct cx25821_dev *dev = get_cx25821(v4l2_dev);
+
+       cx25821_shutdown(dev);
+       pci_disable_device(pci_dev);
+
+       /* unregister stuff */
+       if (pci_dev->irq)
+               free_irq(pci_dev->irq, dev);
+
+       mutex_lock(&devlist);
+       list_del(&dev->devlist);
+       mutex_unlock(&devlist);
+
+       cx25821_dev_unregister(dev);
+       v4l2_device_unregister(v4l2_dev);
+       kfree(dev);
+}
+
+static struct pci_device_id cx25821_pci_tbl[] = {
+       {
+        /* CX25821 Athena */
+        .vendor = 0x14f1,
+        .device = 0x8210,
+        .subvendor = 0x14f1,
+        .subdevice = 0x0920,
+        },
+       {
+        /* --- end of list --- */
+        }
+};
+
+MODULE_DEVICE_TABLE(pci, cx25821_pci_tbl);
+
+static struct pci_driver cx25821_pci_driver = {
+       .name = "cx25821",
+       .id_table = cx25821_pci_tbl,
+       .probe = cx25821_initdev,
+       .remove = __devexit_p(cx25821_finidev),
+       /* TODO */
+       .suspend = NULL,
+       .resume = NULL,
+};
+
+static int cx25821_init(void)
+{
+       INIT_LIST_HEAD(&cx25821_devlist);
+       printk(KERN_INFO "cx25821 driver version %d.%d.%d loaded\n",
+              (CX25821_VERSION_CODE >> 16) & 0xff,
+              (CX25821_VERSION_CODE >> 8) & 0xff, CX25821_VERSION_CODE & 0xff);
+       return pci_register_driver(&cx25821_pci_driver);
+}
+
+static void cx25821_fini(void)
+{
+       pci_unregister_driver(&cx25821_pci_driver);
+}
+
+EXPORT_SYMBOL(cx25821_devlist);
+EXPORT_SYMBOL(cx25821_sram_channels);
+EXPORT_SYMBOL(cx25821_print_irqbits);
+EXPORT_SYMBOL(cx25821_dev_get);
+EXPORT_SYMBOL(cx25821_dev_unregister);
+EXPORT_SYMBOL(cx25821_sram_channel_setup);
+EXPORT_SYMBOL(cx25821_sram_channel_dump);
+EXPORT_SYMBOL(cx25821_sram_channel_setup_audio);
+EXPORT_SYMBOL(cx25821_sram_channel_dump_audio);
+EXPORT_SYMBOL(cx25821_risc_databuffer_audio);
+EXPORT_SYMBOL(cx25821_set_gpiopin_direction);
+
+module_init(cx25821_init);
+module_exit(cx25821_fini);
diff --git a/drivers/staging/cx25821/cx25821-gpio.c b/drivers/staging/cx25821/cx25821-gpio.c
new file mode 100644 (file)
index 0000000..e8a37b4
--- /dev/null
@@ -0,0 +1,98 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821.h"
+
+/********************* GPIO stuffs *********************/
+void cx25821_set_gpiopin_direction(struct cx25821_dev *dev,
+                                  int pin_number, int pin_logic_value)
+{
+       int bit = pin_number;
+       u32 gpio_oe_reg = GPIO_LO_OE;
+       u32 gpio_register = 0;
+       u32 value = 0;
+
+       // Check for valid pinNumber
+       if (pin_number >= 47)
+               return;
+
+       if (pin_number > 31) {
+               bit = pin_number - 31;
+               gpio_oe_reg = GPIO_HI_OE;
+       }
+       // Here we will make sure that the GPIOs 0 and 1 are output. keep the rest as is
+       gpio_register = cx_read(gpio_oe_reg);
+
+       if (pin_logic_value == 1) {
+               value = gpio_register | Set_GPIO_Bit(bit);
+       } else {
+               value = gpio_register & Clear_GPIO_Bit(bit);
+       }
+
+       cx_write(gpio_oe_reg, value);
+}
+
+static void cx25821_set_gpiopin_logicvalue(struct cx25821_dev *dev,
+                                          int pin_number, int pin_logic_value)
+{
+       int bit = pin_number;
+       u32 gpio_reg = GPIO_LO;
+       u32 value = 0;
+
+       // Check for valid pinNumber
+       if (pin_number >= 47)
+               return;
+
+       cx25821_set_gpiopin_direction(dev, pin_number, 0);      // change to output direction
+
+       if (pin_number > 31) {
+               bit = pin_number - 31;
+               gpio_reg = GPIO_HI;
+       }
+
+       value = cx_read(gpio_reg);
+
+       if (pin_logic_value == 0) {
+               value &= Clear_GPIO_Bit(bit);
+       } else {
+               value |= Set_GPIO_Bit(bit);
+       }
+
+       cx_write(gpio_reg, value);
+}
+
+void cx25821_gpio_init(struct cx25821_dev *dev)
+{
+       if (dev == NULL) {
+               return;
+       }
+
+       switch (dev->board) {
+       case CX25821_BOARD_CONEXANT_ATHENA10:
+       default:
+               //set GPIO 5 to select the path for Medusa/Athena
+               cx25821_set_gpiopin_logicvalue(dev, 5, 1);
+               mdelay(20);
+               break;
+       }
+
+}
diff --git a/drivers/staging/cx25821/cx25821-gpio.h b/drivers/staging/cx25821/cx25821-gpio.h
new file mode 100644 (file)
index 0000000..ca07644
--- /dev/null
@@ -0,0 +1,2 @@
+
+void cx25821_gpio_init(struct athena_dev *dev);
diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/staging/cx25821/cx25821-i2c.c
new file mode 100644 (file)
index 0000000..f4f2681
--- /dev/null
@@ -0,0 +1,419 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *     Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821.h"
+#include <linux/i2c.h>
+
+static unsigned int i2c_debug;
+module_param(i2c_debug, int, 0644);
+MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
+
+static unsigned int i2c_scan = 0;
+module_param(i2c_scan, int, 0444);
+MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
+
+#define dprintk(level, fmt, arg...)\
+       do { if (i2c_debug >= level)\
+               printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
+       } while (0)
+
+#define I2C_WAIT_DELAY 32
+#define I2C_WAIT_RETRY 64
+
+#define I2C_EXTEND  (1 << 3)
+#define I2C_NOSTOP  (1 << 4)
+
+static inline int i2c_slave_did_ack(struct i2c_adapter *i2c_adap)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       return cx_read(bus->reg_stat) & 0x01;
+}
+
+static inline int i2c_is_busy(struct i2c_adapter *i2c_adap)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       return cx_read(bus->reg_stat) & 0x02 ? 1 : 0;
+}
+
+static int i2c_wait_done(struct i2c_adapter *i2c_adap)
+{
+       int count;
+
+       for (count = 0; count < I2C_WAIT_RETRY; count++) {
+               if (!i2c_is_busy(i2c_adap))
+                       break;
+               udelay(I2C_WAIT_DELAY);
+       }
+
+       if (I2C_WAIT_RETRY == count)
+               return 0;
+
+       return 1;
+}
+
+static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+                        const struct i2c_msg *msg, int joined_rlen)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       u32 wdata, addr, ctrl;
+       int retval, cnt;
+
+       if (joined_rlen)
+               dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __func__,
+                       msg->len, joined_rlen);
+       else
+               dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
+
+       /* Deal with i2c probe functions with zero payload */
+       if (msg->len == 0) {
+               cx_write(bus->reg_addr, msg->addr << 25);
+               cx_write(bus->reg_ctrl, bus->i2c_period | (1 << 2));
+
+               if (!i2c_wait_done(i2c_adap))
+                       return -EIO;
+
+               if (!i2c_slave_did_ack(i2c_adap))
+                       return -EIO;
+
+               dprintk(1, "%s() returns 0\n", __func__);
+               return 0;
+       }
+
+       /* dev, reg + first byte */
+       addr = (msg->addr << 25) | msg->buf[0];
+       wdata = msg->buf[0];
+
+       ctrl = bus->i2c_period | (1 << 12) | (1 << 2);
+
+       if (msg->len > 1)
+               ctrl |= I2C_NOSTOP | I2C_EXTEND;
+       else if (joined_rlen)
+               ctrl |= I2C_NOSTOP;
+
+       cx_write(bus->reg_addr, addr);
+       cx_write(bus->reg_wdata, wdata);
+       cx_write(bus->reg_ctrl, ctrl);
+
+       retval = i2c_wait_done(i2c_adap);
+       if (retval < 0)
+               goto err;
+
+       if (retval == 0)
+               goto eio;
+
+       if (i2c_debug) {
+               if (!(ctrl & I2C_NOSTOP))
+                       printk(" >\n");
+       }
+
+       for (cnt = 1; cnt < msg->len; cnt++) {
+               /* following bytes */
+               wdata = msg->buf[cnt];
+               ctrl = bus->i2c_period | (1 << 12) | (1 << 2);
+
+               if (cnt < msg->len - 1)
+                       ctrl |= I2C_NOSTOP | I2C_EXTEND;
+               else if (joined_rlen)
+                       ctrl |= I2C_NOSTOP;
+
+               cx_write(bus->reg_addr, addr);
+               cx_write(bus->reg_wdata, wdata);
+               cx_write(bus->reg_ctrl, ctrl);
+
+               retval = i2c_wait_done(i2c_adap);
+               if (retval < 0)
+                       goto err;
+
+               if (retval == 0)
+                       goto eio;
+
+               if (i2c_debug) {
+                       dprintk(1, " %02x", msg->buf[cnt]);
+                       if (!(ctrl & I2C_NOSTOP))
+                               dprintk(1, " >\n");
+               }
+       }
+
+       return msg->len;
+
+      eio:
+       retval = -EIO;
+      err:
+       if (i2c_debug)
+               printk(KERN_ERR " ERR: %d\n", retval);
+       return retval;
+}
+
+static int i2c_readbytes(struct i2c_adapter *i2c_adap,
+                        const struct i2c_msg *msg, int joined)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       u32 ctrl, cnt;
+       int retval;
+
+       if (i2c_debug && !joined)
+               dprintk(1, "6-%s(msg->len=%d)\n", __func__, msg->len);
+
+       /* Deal with i2c probe functions with zero payload */
+       if (msg->len == 0) {
+               cx_write(bus->reg_addr, msg->addr << 25);
+               cx_write(bus->reg_ctrl, bus->i2c_period | (1 << 2) | 1);
+               if (!i2c_wait_done(i2c_adap))
+                       return -EIO;
+               if (!i2c_slave_did_ack(i2c_adap))
+                       return -EIO;
+
+               dprintk(1, "%s() returns 0\n", __func__);
+               return 0;
+       }
+
+       if (i2c_debug) {
+               if (joined)
+                       dprintk(1, " R");
+               else
+                       dprintk(1, " <R %02x", (msg->addr << 1) + 1);
+       }
+
+       for (cnt = 0; cnt < msg->len; cnt++) {
+
+               ctrl = bus->i2c_period | (1 << 12) | (1 << 2) | 1;
+
+               if (cnt < msg->len - 1)
+                       ctrl |= I2C_NOSTOP | I2C_EXTEND;
+
+               cx_write(bus->reg_addr, msg->addr << 25);
+               cx_write(bus->reg_ctrl, ctrl);
+
+               retval = i2c_wait_done(i2c_adap);
+               if (retval < 0)
+                       goto err;
+               if (retval == 0)
+                       goto eio;
+               msg->buf[cnt] = cx_read(bus->reg_rdata) & 0xff;
+
+               if (i2c_debug) {
+                       dprintk(1, " %02x", msg->buf[cnt]);
+                       if (!(ctrl & I2C_NOSTOP))
+                               dprintk(1, " >\n");
+               }
+       }
+
+       return msg->len;
+      eio:
+       retval = -EIO;
+      err:
+       if (i2c_debug)
+               printk(KERN_ERR " ERR: %d\n", retval);
+       return retval;
+}
+
+static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
+{
+       struct cx25821_i2c *bus = i2c_adap->algo_data;
+       struct cx25821_dev *dev = bus->dev;
+       int i, retval = 0;
+
+       dprintk(1, "%s(num = %d)\n", __func__, num);
+
+       for (i = 0; i < num; i++) {
+               dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
+                       __func__, num, msgs[i].addr, msgs[i].len);
+
+               if (msgs[i].flags & I2C_M_RD) {
+                       /* read */
+                       retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
+               } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) &&
+                          msgs[i].addr == msgs[i + 1].addr) {
+                       /* write then read from same address */
+                       retval =
+                           i2c_sendbytes(i2c_adap, &msgs[i], msgs[i + 1].len);
+
+                       if (retval < 0)
+                               goto err;
+                       i++;
+                       retval = i2c_readbytes(i2c_adap, &msgs[i], 1);
+               } else {
+                       /* write */
+                       retval = i2c_sendbytes(i2c_adap, &msgs[i], 0);
+               }
+
+               if (retval < 0)
+                       goto err;
+       }
+       return num;
+
+      err:
+       return retval;
+}
+
+
+static u32 cx25821_functionality(struct i2c_adapter *adap)
+{
+       return I2C_FUNC_SMBUS_EMUL |
+           I2C_FUNC_I2C |
+           I2C_FUNC_SMBUS_WORD_DATA |
+           I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA;
+}
+
+static struct i2c_algorithm cx25821_i2c_algo_template = {
+       .master_xfer = i2c_xfer,
+       .functionality = cx25821_functionality,
+};
+
+static struct i2c_adapter cx25821_i2c_adap_template = {
+       .name = "cx25821",
+       .owner = THIS_MODULE,
+       .algo = &cx25821_i2c_algo_template,
+};
+
+static struct i2c_client cx25821_i2c_client_template = {
+       .name = "cx25821 internal",
+};
+
+/* init + register i2c algo-bit adapter */
+int cx25821_i2c_register(struct cx25821_i2c *bus)
+{
+       struct cx25821_dev *dev = bus->dev;
+
+       dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
+
+       memcpy(&bus->i2c_adap, &cx25821_i2c_adap_template,
+              sizeof(bus->i2c_adap));
+       memcpy(&bus->i2c_algo, &cx25821_i2c_algo_template,
+              sizeof(bus->i2c_algo));
+       memcpy(&bus->i2c_client, &cx25821_i2c_client_template,
+              sizeof(bus->i2c_client));
+
+       bus->i2c_adap.dev.parent = &dev->pci->dev;
+
+       strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
+
+       bus->i2c_algo.data = bus;
+       bus->i2c_adap.algo_data = bus;
+       i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
+       i2c_add_adapter(&bus->i2c_adap);
+
+       bus->i2c_client.adapter = &bus->i2c_adap;
+
+       //set up the I2c
+       bus->i2c_client.addr = (0x88 >> 1);
+
+       return bus->i2c_rc;
+}
+
+int cx25821_i2c_unregister(struct cx25821_i2c *bus)
+{
+       i2c_del_adapter(&bus->i2c_adap);
+       return 0;
+}
+
+void cx25821_av_clk(struct cx25821_dev *dev, int enable)
+{
+       /* write 0 to bus 2 addr 0x144 via i2x_xfer() */
+       char buffer[3];
+       struct i2c_msg msg;
+       dprintk(1, "%s(enabled = %d)\n", __func__, enable);
+
+       /* Register 0x144 */
+       buffer[0] = 0x01;
+       buffer[1] = 0x44;
+       if (enable == 1)
+               buffer[2] = 0x05;
+       else
+               buffer[2] = 0x00;
+
+       msg.addr = 0x44;
+       msg.flags = I2C_M_TEN;
+       msg.len = 3;
+       msg.buf = buffer;
+
+       i2c_xfer(&dev->i2c_bus[0].i2c_adap, &msg, 1);
+}
+
+int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value)
+{
+       struct i2c_client *client = &bus->i2c_client;
+       int retval = 0;
+       int v = 0;
+       u8 addr[2] = { 0, 0 };
+       u8 buf[4] = { 0, 0, 0, 0 };
+
+       struct i2c_msg msgs[2] = {
+               {
+                .addr = client->addr,
+                .flags = 0,
+                .len = 2,
+                .buf = addr,
+                }, {
+                    .addr = client->addr,
+                    .flags = I2C_M_RD,
+                    .len = 4,
+                    .buf = buf,
+                    }
+       };
+
+       addr[0] = (reg_addr >> 8);
+       addr[1] = (reg_addr & 0xff);
+       msgs[0].addr = 0x44;
+       msgs[1].addr = 0x44;
+
+       retval = i2c_xfer(client->adapter, msgs, 2);
+
+       v = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+       *value = v;
+
+       return v;
+}
+
+int cx25821_i2c_write(struct cx25821_i2c *bus, u16 reg_addr, int value)
+{
+       struct i2c_client *client = &bus->i2c_client;
+       int retval = 0;
+       u8 buf[6] = { 0, 0, 0, 0, 0, 0 };
+
+       struct i2c_msg msgs[1] = {
+               {
+                .addr = client->addr,
+                .flags = 0,
+                .len = 6,
+                .buf = buf,
+                }
+       };
+
+       buf[0] = reg_addr >> 8;
+       buf[1] = reg_addr & 0xff;
+       buf[5] = (value >> 24) & 0xff;
+       buf[4] = (value >> 16) & 0xff;
+       buf[3] = (value >> 8) & 0xff;
+       buf[2] = value & 0xff;
+       client->flags = 0;
+       msgs[0].addr = 0x44;
+
+       retval = i2c_xfer(client->adapter, msgs, 1);
+
+       return retval;
+}
diff --git a/drivers/staging/cx25821/cx25821-medusa-defines.h b/drivers/staging/cx25821/cx25821-medusa-defines.h
new file mode 100644 (file)
index 0000000..b0d216b
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _MEDUSA_DEF_H_
+#define _MEDUSA_DEF_H_
+
+// Video deocder that we supported
+#define VDEC_A         0
+#define VDEC_B         1
+#define VDEC_C         2
+#define VDEC_D         3
+#define VDEC_E         4
+#define VDEC_F         5
+#define VDEC_G         6
+#define VDEC_H         7
+
+//#define AUTO_SWITCH_BIT[]  = { 8, 9, 10, 11, 12, 13, 14, 15 };
+
+// The following bit position enables automatic source switching for decoder A-H.
+// Display index per camera.
+//#define VDEC_INDEX[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7};
+
+// Select input bit to video decoder A-H.
+//#define CH_SRC_SEL_BIT[] = {24, 25, 26, 27, 28, 29, 30, 31};
+
+// end of display sequence
+#define END_OF_SEQ                                     0xF;
+
+// registry string size
+#define MAX_REGISTRY_SZ                                        40;
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-medusa-reg.h b/drivers/staging/cx25821/cx25821-medusa-reg.h
new file mode 100644 (file)
index 0000000..12c90f8
--- /dev/null
@@ -0,0 +1,455 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __MEDUSA_REGISTERS__
+#define __MEDUSA_REGISTERS__
+
+// Serial Slave Registers
+#define        HOST_REGISTER1                          0x0000
+#define        HOST_REGISTER2                          0x0001
+
+// Chip Configuration Registers
+#define        CHIP_CTRL                                       0x0100
+#define        AFE_AB_CTRL                                     0x0104
+#define        AFE_CD_CTRL                                     0x0108
+#define        AFE_EF_CTRL                                     0x010C
+#define        AFE_GH_CTRL                                     0x0110
+#define        DENC_AB_CTRL                            0x0114
+#define        BYP_AB_CTRL                                     0x0118
+#define        MON_A_CTRL                                      0x011C
+#define        DISP_SEQ_A                                      0x0120
+#define        DISP_SEQ_B                                      0x0124
+#define        DISP_AB_CNT                                     0x0128
+#define        DISP_CD_CNT                                     0x012C
+#define        DISP_EF_CNT                                     0x0130
+#define        DISP_GH_CNT                                     0x0134
+#define        DISP_IJ_CNT                                     0x0138
+#define        PIN_OE_CTRL                                     0x013C
+#define        PIN_SPD_CTRL                            0x0140
+#define        PIN_SPD_CTRL2                           0x0144
+#define        IRQ_STAT_CTRL                           0x0148
+#define        POWER_CTRL_AB                           0x014C
+#define        POWER_CTRL_CD                           0x0150
+#define        POWER_CTRL_EF                           0x0154
+#define        POWER_CTRL_GH                           0x0158
+#define        TUNE_CTRL                                       0x015C
+#define        BIAS_CTRL                                       0x0160
+#define        AFE_AB_DIAG_CTRL                        0x0164
+#define        AFE_CD_DIAG_CTRL                        0x0168
+#define        AFE_EF_DIAG_CTRL                        0x016C
+#define        AFE_GH_DIAG_CTRL                        0x0170
+#define        PLL_AB_DIAG_CTRL                        0x0174
+#define        PLL_CD_DIAG_CTRL                        0x0178
+#define        PLL_EF_DIAG_CTRL                        0x017C
+#define        PLL_GH_DIAG_CTRL                        0x0180
+#define        TEST_CTRL                                       0x0184
+#define        BIST_STAT                                       0x0188
+#define        BIST_STAT2                                      0x018C
+#define        BIST_VID_PLL_AB_STAT            0x0190
+#define        BIST_VID_PLL_CD_STAT            0x0194
+#define        BIST_VID_PLL_EF_STAT            0x0198
+#define        BIST_VID_PLL_GH_STAT            0x019C
+#define        DLL_DIAG_CTRL                           0x01A0
+#define        DEV_CH_ID_CTRL                          0x01A4
+#define        ABIST_CTRL_STATUS                       0x01A8
+#define        ABIST_FREQ                                      0x01AC
+#define        ABIST_GOERT_SHIFT                       0x01B0
+#define        ABIST_COEF12                            0x01B4
+#define        ABIST_COEF34                            0x01B8
+#define        ABIST_COEF56                            0x01BC
+#define        ABIST_COEF7_SNR                         0x01C0
+#define        ABIST_ADC_CAL                           0x01C4
+#define        ABIST_BIN1_VGA0                         0x01C8
+#define        ABIST_BIN2_VGA1                         0x01CC
+#define        ABIST_BIN3_VGA2                         0x01D0
+#define        ABIST_BIN4_VGA3                         0x01D4
+#define        ABIST_BIN5_VGA4                         0x01D8
+#define        ABIST_BIN6_VGA5                         0x01DC
+#define        ABIST_BIN7_VGA6                         0x0x1E0
+#define        ABIST_CLAMP_A                           0x0x1E4
+#define        ABIST_CLAMP_B                           0x0x1E8
+#define        ABIST_CLAMP_C                           0x01EC
+#define        ABIST_CLAMP_D                           0x01F0
+#define        ABIST_CLAMP_E                           0x01F4
+#define        ABIST_CLAMP_F                           0x01F8
+
+//              Digital Video Encoder A Registers
+#define        DENC_A_REG_1                                    0x0200
+#define        DENC_A_REG_2                                    0x0204
+#define        DENC_A_REG_3                                    0x0208
+#define        DENC_A_REG_4                                    0x020C
+#define        DENC_A_REG_5                                    0x0210
+#define        DENC_A_REG_6                                    0x0214
+#define        DENC_A_REG_7                                    0x0218
+#define        DENC_A_REG_8                                    0x021C
+
+//      Digital Video Encoder B Registers
+#define        DENC_B_REG_1                                    0x0300
+#define        DENC_B_REG_2                                    0x0304
+#define        DENC_B_REG_3                                    0x0308
+#define        DENC_B_REG_4                                    0x030C
+#define        DENC_B_REG_5                                    0x0310
+#define        DENC_B_REG_6                                    0x0314
+#define        DENC_B_REG_7                                    0x0318
+#define        DENC_B_REG_8                                    0x031C
+
+//              Video Decoder A Registers
+#define        MODE_CTRL                                               0x1000
+#define        OUT_CTRL1                                               0x1004
+#define        OUT_CTRL_NS                                             0x1008
+#define        GEN_STAT                                                0x100C
+#define        INT_STAT_MASK                                   0x1010
+#define        LUMA_CTRL                                               0x1014
+#define        CHROMA_CTRL                                             0x1018
+#define        CRUSH_CTRL                                              0x101C
+#define        HORIZ_TIM_CTRL                                  0x1020
+#define        VERT_TIM_CTRL                                   0x1024
+#define        MISC_TIM_CTRL                                   0x1028
+#define        FIELD_COUNT                                             0x102C
+#define        HSCALE_CTRL                                             0x1030
+#define        VSCALE_CTRL                                             0x1034
+#define        MAN_VGA_CTRL                                    0x1038
+#define        MAN_AGC_CTRL                                    0x103C
+#define        DFE_CTRL1                                               0x1040
+#define        DFE_CTRL2                                               0x1044
+#define        DFE_CTRL3                                               0x1048
+#define        PLL_CTRL                                                0x104C
+#define        PLL_CTRL_FAST                                   0x1050
+#define        HTL_CTRL                                                0x1054
+#define        SRC_CFG                                                 0x1058
+#define        SC_STEP_SIZE                                    0x105C
+#define        SC_CONVERGE_CTRL                                0x1060
+#define        SC_LOOP_CTRL                                    0x1064
+#define        COMB_2D_HFS_CFG                                 0x1068
+#define        COMB_2D_HFD_CFG                                 0x106C
+#define        COMB_2D_LF_CFG                                  0x1070
+#define        COMB_2D_BLEND                                   0x1074
+#define        COMB_MISC_CTRL                                  0x1078
+#define        COMB_FLAT_THRESH_CTRL                   0x107C
+#define        COMB_TEST                                               0x1080
+#define        BP_MISC_CTRL                                    0x1084
+#define        VCR_DET_CTRL                                    0x1088
+#define        NOISE_DET_CTRL                                  0x108C
+#define        COMB_FLAT_NOISE_CTRL                    0x1090
+#define        VERSION                                                 0x11F8
+#define        SOFT_RST_CTRL                                   0x11FC
+
+//      Video Decoder B Registers
+#define        VDEC_B_MODE_CTRL                                0x1200
+#define        VDEC_B_OUT_CTRL1                                0x1204
+#define        VDEC_B_OUT_CTRL_NS                              0x1208
+#define        VDEC_B_GEN_STAT                                 0x120C
+#define        VDEC_B_INT_STAT_MASK                    0x1210
+#define        VDEC_B_LUMA_CTRL                                0x1214
+#define        VDEC_B_CHROMA_CTRL                              0x1218
+#define        VDEC_B_CRUSH_CTRL                               0x121C
+#define        VDEC_B_HORIZ_TIM_CTRL                   0x1220
+#define        VDEC_B_VERT_TIM_CTRL                    0x1224
+#define        VDEC_B_MISC_TIM_CTRL                    0x1228
+#define        VDEC_B_FIELD_COUNT                              0x122C
+#define        VDEC_B_HSCALE_CTRL                              0x1230
+#define        VDEC_B_VSCALE_CTRL                              0x1234
+#define        VDEC_B_MAN_VGA_CTRL                             0x1238
+#define        VDEC_B_MAN_AGC_CTRL                             0x123C
+#define        VDEC_B_DFE_CTRL1                                0x1240
+#define        VDEC_B_DFE_CTRL2                                0x1244
+#define        VDEC_B_DFE_CTRL3                                0x1248
+#define        VDEC_B_PLL_CTRL                                 0x124C
+#define        VDEC_B_PLL_CTRL_FAST                    0x1250
+#define        VDEC_B_HTL_CTRL                                 0x1254
+#define        VDEC_B_SRC_CFG                                  0x1258
+#define        VDEC_B_SC_STEP_SIZE                             0x125C
+#define        VDEC_B_SC_CONVERGE_CTRL                 0x1260
+#define        VDEC_B_SC_LOOP_CTRL                             0x1264
+#define        VDEC_B_COMB_2D_HFS_CFG                  0x1268
+#define        VDEC_B_COMB_2D_HFD_CFG                  0x126C
+#define        VDEC_B_COMB_2D_LF_CFG                   0x1270
+#define        VDEC_B_COMB_2D_BLEND                    0x1274
+#define        VDEC_B_COMB_MISC_CTRL                   0x1278
+#define        VDEC_B_COMB_FLAT_THRESH_CTRL    0x127C
+#define        VDEC_B_COMB_TEST                                0x1280
+#define        VDEC_B_BP_MISC_CTRL                             0x1284
+#define        VDEC_B_VCR_DET_CTRL                             0x1288
+#define        VDEC_B_NOISE_DET_CTRL                   0x128C
+#define        VDEC_B_COMB_FLAT_NOISE_CTRL             0x1290
+#define        VDEC_B_VERSION                                  0x13F8
+#define        VDEC_B_SOFT_RST_CTRL                    0x13FC
+
+// Video Decoder C Registers
+#define        VDEC_C_MODE_CTRL                                0x1400
+#define        VDEC_C_OUT_CTRL1                                0x1404
+#define        VDEC_C_OUT_CTRL_NS                              0x1408
+#define        VDEC_C_GEN_STAT                                 0x140C
+#define        VDEC_C_INT_STAT_MASK                    0x1410
+#define VDEC_C_LUMA_CTRL                               0x1414
+#define VDEC_C_CHROMA_CTRL                             0x1418
+#define        VDEC_C_CRUSH_CTRL                               0x141C
+#define        VDEC_C_HORIZ_TIM_CTRL                   0x1420
+#define        VDEC_C_VERT_TIM_CTRL                    0x1424
+#define        VDEC_C_MISC_TIM_CTRL                    0x1428
+#define        VDEC_C_FIELD_COUNT                              0x142C
+#define        VDEC_C_HSCALE_CTRL                              0x1430
+#define        VDEC_C_VSCALE_CTRL                              0x1434
+#define        VDEC_C_MAN_VGA_CTRL                             0x1438
+#define        VDEC_C_MAN_AGC_CTRL                             0x143C
+#define        VDEC_C_DFE_CTRL1                                0x1440
+#define        VDEC_C_DFE_CTRL2                                0x1444
+#define        VDEC_C_DFE_CTRL3                                0x1448
+#define        VDEC_C_PLL_CTRL                                 0x144C
+#define        VDEC_C_PLL_CTRL_FAST                    0x1450
+#define        VDEC_C_HTL_CTRL                                 0x1454
+#define        VDEC_C_SRC_CFG                                  0x1458
+#define        VDEC_C_SC_STEP_SIZE                             0x145C
+#define        VDEC_C_SC_CONVERGE_CTRL                 0x1460
+#define        VDEC_C_SC_LOOP_CTRL                             0x1464
+#define        VDEC_C_COMB_2D_HFS_CFG                  0x1468
+#define        VDEC_C_COMB_2D_HFD_CFG                  0x146C
+#define        VDEC_C_COMB_2D_LF_CFG                   0x1470
+#define        VDEC_C_COMB_2D_BLEND                    0x1474
+#define        VDEC_C_COMB_MISC_CTRL                   0x1478
+#define        VDEC_C_COMB_FLAT_THRESH_CTRL    0x147C
+#define        VDEC_C_COMB_TEST                                0x1480
+#define        VDEC_C_BP_MISC_CTRL                             0x1484
+#define        VDEC_C_VCR_DET_CTRL                             0x1488
+#define        VDEC_C_NOISE_DET_CTRL                   0x148C
+#define        VDEC_C_COMB_FLAT_NOISE_CTRL             0x1490
+#define        VDEC_C_VERSION                                  0x15F8
+#define        VDEC_C_SOFT_RST_CTRL                    0x15FC
+
+// Video Decoder D Registers
+#define VDEC_D_MODE_CTRL                               0x1600
+#define VDEC_D_OUT_CTRL1                               0x1604
+#define VDEC_D_OUT_CTRL_NS                             0x1608
+#define VDEC_D_GEN_STAT                                        0x160C
+#define VDEC_D_INT_STAT_MASK                   0x1610
+#define VDEC_D_LUMA_CTRL                               0x1614
+#define VDEC_D_CHROMA_CTRL                             0x1618
+#define VDEC_D_CRUSH_CTRL                              0x161C
+#define VDEC_D_HORIZ_TIM_CTRL                  0x1620
+#define VDEC_D_VERT_TIM_CTRL                   0x1624
+#define VDEC_D_MISC_TIM_CTRL                   0x1628
+#define VDEC_D_FIELD_COUNT                             0x162C
+#define VDEC_D_HSCALE_CTRL                             0x1630
+#define VDEC_D_VSCALE_CTRL                             0x1634
+#define VDEC_D_MAN_VGA_CTRL                            0x1638
+#define VDEC_D_MAN_AGC_CTRL                            0x163C
+#define VDEC_D_DFE_CTRL1                               0x1640
+#define VDEC_D_DFE_CTRL2                               0x1644
+#define VDEC_D_DFE_CTRL3                               0x1648
+#define VDEC_D_PLL_CTRL                                        0x164C
+#define VDEC_D_PLL_CTRL_FAST                   0x1650
+#define VDEC_D_HTL_CTRL                                        0x1654
+#define VDEC_D_SRC_CFG                                 0x1658
+#define VDEC_D_SC_STEP_SIZE                            0x165C
+#define VDEC_D_SC_CONVERGE_CTRL                        0x1660
+#define VDEC_D_SC_LOOP_CTRL                            0x1664
+#define VDEC_D_COMB_2D_HFS_CFG                 0x1668
+#define VDEC_D_COMB_2D_HFD_CFG                 0x166C
+#define VDEC_D_COMB_2D_LF_CFG                  0x1670
+#define VDEC_D_COMB_2D_BLEND                   0x1674
+#define VDEC_D_COMB_MISC_CTRL                  0x1678
+#define VDEC_D_COMB_FLAT_THRESH_CTRL   0x167C
+#define VDEC_D_COMB_TEST                               0x1680
+#define VDEC_D_BP_MISC_CTRL                            0x1684
+#define VDEC_D_VCR_DET_CTRL                            0x1688
+#define VDEC_D_NOISE_DET_CTRL                  0x168C
+#define VDEC_D_COMB_FLAT_NOISE_CTRL            0x1690
+#define VDEC_D_VERSION                                 0x17F8
+#define VDEC_D_SOFT_RST_CTRL                   0x17FC
+
+// Video Decoder E Registers
+#define        VDEC_E_MODE_CTRL                                0x1800
+#define        VDEC_E_OUT_CTRL1                                0x1804
+#define        VDEC_E_OUT_CTRL_NS                              0x1808
+#define        VDEC_E_GEN_STAT                                 0x180C
+#define        VDEC_E_INT_STAT_MASK                    0x1810
+#define        VDEC_E_LUMA_CTRL                                0x1814
+#define        VDEC_E_CHROMA_CTRL                              0x1818
+#define        VDEC_E_CRUSH_CTRL                               0x181C
+#define        VDEC_E_HORIZ_TIM_CTRL                   0x1820
+#define        VDEC_E_VERT_TIM_CTRL                    0x1824
+#define        VDEC_E_MISC_TIM_CTRL                    0x1828
+#define        VDEC_E_FIELD_COUNT                              0x182C
+#define        VDEC_E_HSCALE_CTRL                              0x1830
+#define        VDEC_E_VSCALE_CTRL                              0x1834
+#define        VDEC_E_MAN_VGA_CTRL                             0x1838
+#define        VDEC_E_MAN_AGC_CTRL                             0x183C
+#define        VDEC_E_DFE_CTRL1                                0x1840
+#define        VDEC_E_DFE_CTRL2                                0x1844
+#define        VDEC_E_DFE_CTRL3                                0x1848
+#define        VDEC_E_PLL_CTRL                                 0x184C
+#define        VDEC_E_PLL_CTRL_FAST                    0x1850
+#define        VDEC_E_HTL_CTRL                                 0x1854
+#define        VDEC_E_SRC_CFG                                  0x1858
+#define        VDEC_E_SC_STEP_SIZE                             0x185C
+#define        VDEC_E_SC_CONVERGE_CTRL                 0x1860
+#define        VDEC_E_SC_LOOP_CTRL                             0x1864
+#define        VDEC_E_COMB_2D_HFS_CFG                  0x1868
+#define        VDEC_E_COMB_2D_HFD_CFG                  0x186C
+#define        VDEC_E_COMB_2D_LF_CFG                   0x1870
+#define        VDEC_E_COMB_2D_BLEND                    0x1874
+#define        VDEC_E_COMB_MISC_CTRL                   0x1878
+#define        VDEC_E_COMB_FLAT_THRESH_CTRL    0x187C
+#define        VDEC_E_COMB_TEST                                0x1880
+#define        VDEC_E_BP_MISC_CTRL                             0x1884
+#define        VDEC_E_VCR_DET_CTRL                             0x1888
+#define        VDEC_E_NOISE_DET_CTRL                   0x188C
+#define        VDEC_E_COMB_FLAT_NOISE_CTRL             0x1890
+#define        VDEC_E_VERSION                                  0x19F8
+#define        VDEC_E_SOFT_RST_CTRL                    0x19FC
+
+// Video Decoder F Registers
+#define        VDEC_F_MODE_CTRL                                0x1A00
+#define        VDEC_F_OUT_CTRL1                                0x1A04
+#define        VDEC_F_OUT_CTRL_NS                              0x1A08
+#define        VDEC_F_GEN_STAT                                 0x1A0C
+#define        VDEC_F_INT_STAT_MASK                    0x1A10
+#define        VDEC_F_LUMA_CTRL                                0x1A14
+#define        VDEC_F_CHROMA_CTRL                              0x1A18
+#define        VDEC_F_CRUSH_CTRL                               0x1A1C
+#define        VDEC_F_HORIZ_TIM_CTRL                   0x1A20
+#define        VDEC_F_VERT_TIM_CTRL                    0x1A24
+#define        VDEC_F_MISC_TIM_CTRL                    0x1A28
+#define        VDEC_F_FIELD_COUNT                              0x1A2C
+#define        VDEC_F_HSCALE_CTRL                              0x1A30
+#define        VDEC_F_VSCALE_CTRL                              0x1A34
+#define        VDEC_F_MAN_VGA_CTRL                             0x1A38
+#define        VDEC_F_MAN_AGC_CTRL                             0x1A3C
+#define        VDEC_F_DFE_CTRL1                                0x1A40
+#define        VDEC_F_DFE_CTRL2                                0x1A44
+#define        VDEC_F_DFE_CTRL3                                0x1A48
+#define        VDEC_F_PLL_CTRL                                 0x1A4C
+#define        VDEC_F_PLL_CTRL_FAST                    0x1A50
+#define        VDEC_F_HTL_CTRL                                 0x1A54
+#define        VDEC_F_SRC_CFG                                  0x1A58
+#define        VDEC_F_SC_STEP_SIZE                             0x1A5C
+#define        VDEC_F_SC_CONVERGE_CTRL                 0x1A60
+#define        VDEC_F_SC_LOOP_CTRL                             0x1A64
+#define        VDEC_F_COMB_2D_HFS_CFG                  0x1A68
+#define        VDEC_F_COMB_2D_HFD_CFG                  0x1A6C
+#define        VDEC_F_COMB_2D_LF_CFG                   0x1A70
+#define        VDEC_F_COMB_2D_BLEND                    0x1A74
+#define        VDEC_F_COMB_MISC_CTRL                   0x1A78
+#define        VDEC_F_COMB_FLAT_THRESH_CTRL    0x1A7C
+#define        VDEC_F_COMB_TEST                                0x1A80
+#define        VDEC_F_BP_MISC_CTRL                             0x1A84
+#define        VDEC_F_VCR_DET_CTRL                             0x1A88
+#define        VDEC_F_NOISE_DET_CTRL                   0x1A8C
+#define        VDEC_F_COMB_FLAT_NOISE_CTRL             0x1A90
+#define        VDEC_F_VERSION                                  0x1BF8
+#define        VDEC_F_SOFT_RST_CTRL                    0x1BFC
+
+// Video Decoder G Registers
+#define        VDEC_G_MODE_CTRL                                0x1C00
+#define        VDEC_G_OUT_CTRL1                                0x1C04
+#define        VDEC_G_OUT_CTRL_NS                              0x1C08
+#define        VDEC_G_GEN_STAT                                 0x1C0C
+#define        VDEC_G_INT_STAT_MASK                    0x1C10
+#define        VDEC_G_LUMA_CTRL                                0x1C14
+#define        VDEC_G_CHROMA_CTRL                              0x1C18
+#define        VDEC_G_CRUSH_CTRL                               0x1C1C
+#define        VDEC_G_HORIZ_TIM_CTRL                   0x1C20
+#define        VDEC_G_VERT_TIM_CTRL                    0x1C24
+#define        VDEC_G_MISC_TIM_CTRL                    0x1C28
+#define        VDEC_G_FIELD_COUNT                              0x1C2C
+#define        VDEC_G_HSCALE_CTRL                              0x1C30
+#define        VDEC_G_VSCALE_CTRL                              0x1C34
+#define        VDEC_G_MAN_VGA_CTRL                             0x1C38
+#define        VDEC_G_MAN_AGC_CTRL                             0x1C3C
+#define        VDEC_G_DFE_CTRL1                                0x1C40
+#define        VDEC_G_DFE_CTRL2                                0x1C44
+#define        VDEC_G_DFE_CTRL3                                0x1C48
+#define        VDEC_G_PLL_CTRL                                 0x1C4C
+#define        VDEC_G_PLL_CTRL_FAST                    0x1C50
+#define        VDEC_G_HTL_CTRL                                 0x1C54
+#define        VDEC_G_SRC_CFG                                  0x1C58
+#define        VDEC_G_SC_STEP_SIZE                             0x1C5C
+#define        VDEC_G_SC_CONVERGE_CTRL                 0x1C60
+#define        VDEC_G_SC_LOOP_CTRL                             0x1C64
+#define        VDEC_G_COMB_2D_HFS_CFG                  0x1C68
+#define        VDEC_G_COMB_2D_HFD_CFG                  0x1C6C
+#define        VDEC_G_COMB_2D_LF_CFG                   0x1C70
+#define        VDEC_G_COMB_2D_BLEND                    0x1C74
+#define        VDEC_G_COMB_MISC_CTRL                   0x1C78
+#define        VDEC_G_COMB_FLAT_THRESH_CTRL    0x1C7C
+#define        VDEC_G_COMB_TEST                                0x1C80
+#define        VDEC_G_BP_MISC_CTRL                             0x1C84
+#define        VDEC_G_VCR_DET_CTRL                             0x1C88
+#define        VDEC_G_NOISE_DET_CTRL                   0x1C8C
+#define        VDEC_G_COMB_FLAT_NOISE_CTRL             0x1C90
+#define        VDEC_G_VERSION                                  0x1DF8
+#define        VDEC_G_SOFT_RST_CTRL                    0x1DFC
+
+//              Video Decoder H Registers
+#define        VDEC_H_MODE_CTRL                                0x1E00
+#define        VDEC_H_OUT_CTRL1                                0x1E04
+#define        VDEC_H_OUT_CTRL_NS                              0x1E08
+#define        VDEC_H_GEN_STAT                                 0x1E0C
+#define        VDEC_H_INT_STAT_MASK                    0x1E1E
+#define        VDEC_H_LUMA_CTRL                                0x1E14
+#define        VDEC_H_CHROMA_CTRL                              0x1E18
+#define        VDEC_H_CRUSH_CTRL                               0x1E1C
+#define        VDEC_H_HORIZ_TIM_CTRL                   0x1E20
+#define        VDEC_H_VERT_TIM_CTRL                    0x1E24
+#define        VDEC_H_MISC_TIM_CTRL                    0x1E28
+#define        VDEC_H_FIELD_COUNT                              0x1E2C
+#define        VDEC_H_HSCALE_CTRL                              0x1E30
+#define        VDEC_H_VSCALE_CTRL                              0x1E34
+#define        VDEC_H_MAN_VGA_CTRL                             0x1E38
+#define        VDEC_H_MAN_AGC_CTRL                             0x1E3C
+#define        VDEC_H_DFE_CTRL1                                0x1E40
+#define        VDEC_H_DFE_CTRL2                                0x1E44
+#define        VDEC_H_DFE_CTRL3                                0x1E48
+#define        VDEC_H_PLL_CTRL                                 0x1E4C
+#define        VDEC_H_PLL_CTRL_FAST                    0x1E50
+#define        VDEC_H_HTL_CTRL                                 0x1E54
+#define        VDEC_H_SRC_CFG                                  0x1E58
+#define        VDEC_H_SC_STEP_SIZE                             0x1E5C
+#define        VDEC_H_SC_CONVERGE_CTRL                 0x1E60
+#define        VDEC_H_SC_LOOP_CTRL                             0x1E64
+#define        VDEC_H_COMB_2D_HFS_CFG                  0x1E68
+#define        VDEC_H_COMB_2D_HFD_CFG                  0x1E6C
+#define        VDEC_H_COMB_2D_LF_CFG                   0x1E70
+#define        VDEC_H_COMB_2D_BLEND                    0x1E74
+#define        VDEC_H_COMB_MISC_CTRL                   0x1E78
+#define        VDEC_H_COMB_FLAT_THRESH_CTRL    0x1E7C
+#define        VDEC_H_COMB_TEST                                0x1E80
+#define        VDEC_H_BP_MISC_CTRL                             0x1E84
+#define        VDEC_H_VCR_DET_CTRL                             0x1E88
+#define        VDEC_H_NOISE_DET_CTRL                   0x1E8C
+#define        VDEC_H_COMB_FLAT_NOISE_CTRL             0x1E90
+#define        VDEC_H_VERSION                                  0x1FF8
+#define        VDEC_H_SOFT_RST_CTRL                    0x1FFC
+
+//*****************************************************************************
+// LUMA_CTRL register fields
+#define VDEC_A_BRITE_CTRL                              0x1014
+#define VDEC_A_CNTRST_CTRL                     0x1015
+#define VDEC_A_PEAK_SEL                        0x1016
+
+//*****************************************************************************
+// CHROMA_CTRL register fields
+#define VDEC_A_USAT_CTRL                       0x1018
+#define VDEC_A_VSAT_CTRL                       0x1019
+#define VDEC_A_HUE_CTRL                        0x101A
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-medusa-video.c b/drivers/staging/cx25821/cx25821-medusa-video.c
new file mode 100644 (file)
index 0000000..e4df813
--- /dev/null
@@ -0,0 +1,869 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821.h"
+#include "cx25821-medusa-video.h"
+#include "cx25821-biffuncs.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+//medusa_enable_bluefield_output()
+//
+// Enable the generation of blue filed output if no video
+//
+static void medusa_enable_bluefield_output(struct cx25821_dev *dev, int channel,
+                                          int enable)
+{
+       int ret_val = 1;
+       u32 value = 0;
+       u32 tmp = 0;
+       int out_ctrl = OUT_CTRL1;
+       int out_ctrl_ns = OUT_CTRL_NS;
+
+       switch (channel) {
+       default:
+       case VDEC_A:
+               break;
+       case VDEC_B:
+               out_ctrl = VDEC_B_OUT_CTRL1;
+               out_ctrl_ns = VDEC_B_OUT_CTRL_NS;
+               break;
+       case VDEC_C:
+               out_ctrl = VDEC_C_OUT_CTRL1;
+               out_ctrl_ns = VDEC_C_OUT_CTRL_NS;
+               break;
+       case VDEC_D:
+               out_ctrl = VDEC_D_OUT_CTRL1;
+               out_ctrl_ns = VDEC_D_OUT_CTRL_NS;
+               break;
+       case VDEC_E:
+               out_ctrl = VDEC_E_OUT_CTRL1;
+               out_ctrl_ns = VDEC_E_OUT_CTRL_NS;
+               return;
+       case VDEC_F:
+               out_ctrl = VDEC_F_OUT_CTRL1;
+               out_ctrl_ns = VDEC_F_OUT_CTRL_NS;
+               return;
+       case VDEC_G:
+               out_ctrl = VDEC_G_OUT_CTRL1;
+               out_ctrl_ns = VDEC_G_OUT_CTRL_NS;
+               return;
+       case VDEC_H:
+               out_ctrl = VDEC_H_OUT_CTRL1;
+               out_ctrl_ns = VDEC_H_OUT_CTRL_NS;
+               return;
+       }
+
+       value = cx25821_i2c_read(&dev->i2c_bus[0], out_ctrl, &tmp);
+       value &= 0xFFFFFF7F;    // clear BLUE_FIELD_EN
+       if (enable)
+               value |= 0x00000080;    // set BLUE_FIELD_EN
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl, value);
+
+       value = cx25821_i2c_read(&dev->i2c_bus[0], out_ctrl_ns, &tmp);
+       value &= 0xFFFFFF7F;
+       if (enable)
+               value |= 0x00000080;    // set BLUE_FIELD_EN
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl_ns, value);
+}
+
+static int medusa_initialize_ntsc(struct cx25821_dev *dev)
+{
+       int ret_val = 0;
+       int i = 0;
+       u32 value = 0;
+       u32 tmp = 0;
+
+       mutex_lock(&dev->lock);
+
+       for (i = 0; i < MAX_DECODERS; i++) {
+               // set video format NTSC-M
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], MODE_CTRL + (0x200 * i),
+                                    &tmp);
+               value &= 0xFFFFFFF0;
+               value |= 0x10001;       // enable the fast locking mode bit[16]
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], MODE_CTRL + (0x200 * i),
+                                     value);
+
+               // resolution NTSC 720x480
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    HORIZ_TIM_CTRL + (0x200 * i), &tmp);
+               value &= 0x00C00C00;
+               value |= 0x612D0074;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     HORIZ_TIM_CTRL + (0x200 * i), value);
+
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    VERT_TIM_CTRL + (0x200 * i), &tmp);
+               value &= 0x00C00C00;
+               value |= 0x1C1E001A;    // vblank_cnt + 2 to get camera ID
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     VERT_TIM_CTRL + (0x200 * i), value);
+
+               // chroma subcarrier step size
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     SC_STEP_SIZE + (0x200 * i), 0x43E00000);
+
+               // enable VIP optional active
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    OUT_CTRL_NS + (0x200 * i), &tmp);
+               value &= 0xFFFBFFFF;
+               value |= 0x00040000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     OUT_CTRL_NS + (0x200 * i), value);
+
+               // enable VIP optional active (VIP_OPT_AL) for direct output.
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], OUT_CTRL1 + (0x200 * i),
+                                    &tmp);
+               value &= 0xFFFBFFFF;
+               value |= 0x00040000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], OUT_CTRL1 + (0x200 * i),
+                                     value);
+
+               // clear VPRES_VERT_EN bit, fixes the chroma run away problem
+               // when the input switching rate < 16 fields
+               //
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    MISC_TIM_CTRL + (0x200 * i), &tmp);
+               value = setBitAtPos(value, 14); // disable special play detection
+               value = clearBitAtPos(value, 15);
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     MISC_TIM_CTRL + (0x200 * i), value);
+
+               // set vbi_gate_en to 0
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], DFE_CTRL1 + (0x200 * i),
+                                    &tmp);
+               value = clearBitAtPos(value, 29);
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], DFE_CTRL1 + (0x200 * i),
+                                     value);
+
+               // Enable the generation of blue field output if no video
+               medusa_enable_bluefield_output(dev, i, 1);
+       }
+
+       for (i = 0; i < MAX_ENCODERS; i++) {
+               // NTSC hclock
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_1 + (0x100 * i), &tmp);
+               value &= 0xF000FC00;
+               value |= 0x06B402D0;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_1 + (0x100 * i), value);
+
+               // burst begin and burst end
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_2 + (0x100 * i), &tmp);
+               value &= 0xFF000000;
+               value |= 0x007E9054;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_2 + (0x100 * i), value);
+
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_3 + (0x100 * i), &tmp);
+               value &= 0xFC00FE00;
+               value |= 0x00EC00F0;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_3 + (0x100 * i), value);
+
+               // set NTSC vblank, no phase alternation, 7.5 IRE pedestal
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_4 + (0x100 * i), &tmp);
+               value &= 0x00FCFFFF;
+               value |= 0x13020000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_4 + (0x100 * i), value);
+
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_5 + (0x100 * i), &tmp);
+               value &= 0xFFFF0000;
+               value |= 0x0000E575;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_5 + (0x100 * i), value);
+
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_6 + (0x100 * i), 0x009A89C1);
+
+               // Subcarrier Increment
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_7 + (0x100 * i), 0x21F07C1F);
+       }
+
+       //set picture resolutions
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], HSCALE_CTRL, 0x0);        //0 - 720
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], VSCALE_CTRL, 0x0);        //0 - 480
+
+       // set Bypass input format to NTSC 525 lines
+       value = cx25821_i2c_read(&dev->i2c_bus[0], BYP_AB_CTRL, &tmp);
+       value |= 0x00080200;
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], BYP_AB_CTRL, value);
+
+       mutex_unlock(&dev->lock);
+
+       return ret_val;
+}
+
+static int medusa_PALCombInit(struct cx25821_dev *dev, int dec)
+{
+       int ret_val = -1;
+       u32 value = 0, tmp = 0;
+
+       // Setup for 2D threshold
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], COMB_2D_HFS_CFG + (0x200 * dec),
+                             0x20002861);
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], COMB_2D_HFD_CFG + (0x200 * dec),
+                             0x20002861);
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], COMB_2D_LF_CFG + (0x200 * dec),
+                             0x200A1023);
+
+       // Setup flat chroma and luma thresholds
+       value =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            COMB_FLAT_THRESH_CTRL + (0x200 * dec), &tmp);
+       value &= 0x06230000;
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             COMB_FLAT_THRESH_CTRL + (0x200 * dec), value);
+
+       // set comb 2D blend
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], COMB_2D_BLEND + (0x200 * dec),
+                             0x210F0F0F);
+
+       // COMB MISC CONTROL
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], COMB_MISC_CTRL + (0x200 * dec),
+                             0x41120A7F);
+
+       return ret_val;
+}
+
+static int medusa_initialize_pal(struct cx25821_dev *dev)
+{
+       int ret_val = 0;
+       int i = 0;
+       u32 value = 0;
+       u32 tmp = 0;
+
+       mutex_lock(&dev->lock);
+
+       for (i = 0; i < MAX_DECODERS; i++) {
+               // set video format PAL-BDGHI
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], MODE_CTRL + (0x200 * i),
+                                    &tmp);
+               value &= 0xFFFFFFF0;
+               value |= 0x10004;       // enable the fast locking mode bit[16]
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], MODE_CTRL + (0x200 * i),
+                                     value);
+
+               // resolution PAL 720x576
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    HORIZ_TIM_CTRL + (0x200 * i), &tmp);
+               value &= 0x00C00C00;
+               value |= 0x632D007D;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     HORIZ_TIM_CTRL + (0x200 * i), value);
+
+               // vblank656_cnt=x26, vactive_cnt=240h, vblank_cnt=x24
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    VERT_TIM_CTRL + (0x200 * i), &tmp);
+               value &= 0x00C00C00;
+               value |= 0x28240026;    // vblank_cnt + 2 to get camera ID
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     VERT_TIM_CTRL + (0x200 * i), value);
+
+               // chroma subcarrier step size
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     SC_STEP_SIZE + (0x200 * i), 0x5411E2D0);
+
+               // enable VIP optional active
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    OUT_CTRL_NS + (0x200 * i), &tmp);
+               value &= 0xFFFBFFFF;
+               value |= 0x00040000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     OUT_CTRL_NS + (0x200 * i), value);
+
+               // enable VIP optional active (VIP_OPT_AL) for direct output.
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], OUT_CTRL1 + (0x200 * i),
+                                    &tmp);
+               value &= 0xFFFBFFFF;
+               value |= 0x00040000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], OUT_CTRL1 + (0x200 * i),
+                                     value);
+
+               // clear VPRES_VERT_EN bit, fixes the chroma run away problem
+               // when the input switching rate < 16 fields
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    MISC_TIM_CTRL + (0x200 * i), &tmp);
+               value = setBitAtPos(value, 14); // disable special play detection
+               value = clearBitAtPos(value, 15);
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     MISC_TIM_CTRL + (0x200 * i), value);
+
+               // set vbi_gate_en to 0
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0], DFE_CTRL1 + (0x200 * i),
+                                    &tmp);
+               value = clearBitAtPos(value, 29);
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0], DFE_CTRL1 + (0x200 * i),
+                                     value);
+
+               medusa_PALCombInit(dev, i);
+
+               // Enable the generation of blue field output if no video
+               medusa_enable_bluefield_output(dev, i, 1);
+       }
+
+       for (i = 0; i < MAX_ENCODERS; i++) {
+               // PAL hclock
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_1 + (0x100 * i), &tmp);
+               value &= 0xF000FC00;
+               value |= 0x06C002D0;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_1 + (0x100 * i), value);
+
+               // burst begin and burst end
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_2 + (0x100 * i), &tmp);
+               value &= 0xFF000000;
+               value |= 0x007E9754;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_2 + (0x100 * i), value);
+
+               // hblank and vactive
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_3 + (0x100 * i), &tmp);
+               value &= 0xFC00FE00;
+               value |= 0x00FC0120;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_3 + (0x100 * i), value);
+
+               // set PAL vblank, phase alternation, 0 IRE pedestal
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_4 + (0x100 * i), &tmp);
+               value &= 0x00FCFFFF;
+               value |= 0x14010000;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_4 + (0x100 * i), value);
+
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    DENC_A_REG_5 + (0x100 * i), &tmp);
+               value &= 0xFFFF0000;
+               value |= 0x0000F078;
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_5 + (0x100 * i), value);
+
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_6 + (0x100 * i), 0x00A493CF);
+
+               // Subcarrier Increment
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     DENC_A_REG_7 + (0x100 * i), 0x2A098ACB);
+       }
+
+       //set picture resolutions
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], HSCALE_CTRL, 0x0);        //0 - 720
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], VSCALE_CTRL, 0x0);        //0 - 576
+
+       // set Bypass input format to PAL 625 lines
+       value = cx25821_i2c_read(&dev->i2c_bus[0], BYP_AB_CTRL, &tmp);
+       value &= 0xFFF7FDFF;
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], BYP_AB_CTRL, value);
+
+       mutex_unlock(&dev->lock);
+
+       return ret_val;
+}
+
+int medusa_set_videostandard(struct cx25821_dev *dev)
+{
+       int status = STATUS_SUCCESS;
+       u32 value = 0, tmp = 0;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK) {
+               status = medusa_initialize_pal(dev);
+       } else {
+               status = medusa_initialize_ntsc(dev);
+       }
+
+       // Enable DENC_A output
+       value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_A_REG_4, &tmp);
+       value = setBitAtPos(value, 4);
+       status = cx25821_i2c_write(&dev->i2c_bus[0], DENC_A_REG_4, value);
+
+       // Enable DENC_B output
+       value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_B_REG_4, &tmp);
+       value = setBitAtPos(value, 4);
+       status = cx25821_i2c_write(&dev->i2c_bus[0], DENC_B_REG_4, value);
+
+       return status;
+}
+
+void medusa_set_resolution(struct cx25821_dev *dev, int width,
+                          int decoder_select)
+{
+       int decoder = 0;
+       int decoder_count = 0;
+       int ret_val = 0;
+       u32 hscale = 0x0;
+       u32 vscale = 0x0;
+       const int MAX_WIDTH = 720;
+
+       mutex_lock(&dev->lock);
+
+       // validate the width - cannot be negative
+       if (width > MAX_WIDTH) {
+               printk
+                   ("cx25821 %s() : width %d > MAX_WIDTH %d ! resetting to MAX_WIDTH \n",
+                    __func__, width, MAX_WIDTH);
+               width = MAX_WIDTH;
+       }
+
+       if (decoder_select <= 7 && decoder_select >= 0) {
+               decoder = decoder_select;
+               decoder_count = decoder_select + 1;
+       } else {
+               decoder = 0;
+               decoder_count = _num_decoders;
+       }
+
+       switch (width) {
+       case 320:
+               hscale = 0x13E34B;
+               vscale = 0x0;
+               break;
+
+       case 352:
+               hscale = 0x10A273;
+               vscale = 0x0;
+               break;
+
+       case 176:
+               hscale = 0x3115B2;
+               vscale = 0x1E00;
+               break;
+
+       case 160:
+               hscale = 0x378D84;
+               vscale = 0x1E00;
+               break;
+
+       default:                //720
+               hscale = 0x0;
+               vscale = 0x0;
+               break;
+       }
+
+       for (; decoder < decoder_count; decoder++) {
+               // write scaling values for each decoder
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     HSCALE_CTRL + (0x200 * decoder), hscale);
+               ret_val =
+                   cx25821_i2c_write(&dev->i2c_bus[0],
+                                     VSCALE_CTRL + (0x200 * decoder), vscale);
+       }
+
+       mutex_unlock(&dev->lock);
+}
+
+static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
+                                      int duration)
+{
+       int ret_val = 0;
+       u32 fld_cnt = 0;
+       u32 tmp = 0;
+       u32 disp_cnt_reg = DISP_AB_CNT;
+
+       mutex_lock(&dev->lock);
+
+       // no support
+       if (decoder < VDEC_A && decoder > VDEC_H) {
+               mutex_unlock(&dev->lock);
+               return;
+       }
+
+       switch (decoder) {
+       default:
+               break;
+       case VDEC_C:
+       case VDEC_D:
+               disp_cnt_reg = DISP_CD_CNT;
+               break;
+       case VDEC_E:
+       case VDEC_F:
+               disp_cnt_reg = DISP_EF_CNT;
+               break;
+       case VDEC_G:
+       case VDEC_H:
+               disp_cnt_reg = DISP_GH_CNT;
+               break;
+       }
+
+       _display_field_cnt[decoder] = duration;
+
+       // update hardware
+       fld_cnt = cx25821_i2c_read(&dev->i2c_bus[0], disp_cnt_reg, &tmp);
+
+       if (!(decoder % 2))     // EVEN decoder
+       {
+               fld_cnt &= 0xFFFF0000;
+               fld_cnt |= duration;
+       } else {
+               fld_cnt &= 0x0000FFFF;
+               fld_cnt |= ((u32) duration) << 16;
+       }
+
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], disp_cnt_reg, fld_cnt);
+
+       mutex_unlock(&dev->lock);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Map to Medusa register setting
+static int mapM(int srcMin,
+               int srcMax, int srcVal, int dstMin, int dstMax, int *dstVal)
+{
+       int numerator;
+       int denominator;
+       int quotient;
+
+       if ((srcMin == srcMax) || (srcVal < srcMin) || (srcVal > srcMax)) {
+               return -1;
+       }
+       // This is the overall expression used:
+       // *dstVal = (srcVal - srcMin)*(dstMax - dstMin) / (srcMax - srcMin) + dstMin;
+       // but we need to account for rounding so below we use the modulus
+       // operator to find the remainder and increment if necessary.
+       numerator = (srcVal - srcMin) * (dstMax - dstMin);
+       denominator = srcMax - srcMin;
+       quotient = numerator / denominator;
+
+       if (2 * (numerator % denominator) >= denominator) {
+               quotient++;
+       }
+
+       *dstVal = quotient + dstMin;
+
+       return 0;
+}
+
+static unsigned long convert_to_twos(long numeric, unsigned long bits_len)
+{
+       unsigned char temp;
+
+       if (numeric >= 0)
+               return numeric;
+       else {
+               temp = ~(abs(numeric) & 0xFF);
+               temp += 1;
+               return temp;
+       }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int medusa_set_brightness(struct cx25821_dev *dev, int brightness, int decoder)
+{
+       int ret_val = 0;
+       int value = 0;
+       u32 val = 0, tmp = 0;
+
+       mutex_lock(&dev->lock);
+       if ((brightness > VIDEO_PROCAMP_MAX)
+           || (brightness < VIDEO_PROCAMP_MIN)) {
+               mutex_unlock(&dev->lock);
+               return -1;
+       }
+       ret_val =
+           mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, brightness,
+                SIGNED_BYTE_MIN, SIGNED_BYTE_MAX, &value);
+       value = convert_to_twos(value, 8);
+       val =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            VDEC_A_BRITE_CTRL + (0x200 * decoder), &tmp);
+       val &= 0xFFFFFF00;
+       ret_val |=
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             VDEC_A_BRITE_CTRL + (0x200 * decoder),
+                             val | value);
+       mutex_unlock(&dev->lock);
+       return ret_val;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int medusa_set_contrast(struct cx25821_dev *dev, int contrast, int decoder)
+{
+       int ret_val = 0;
+       int value = 0;
+       u32 val = 0, tmp = 0;
+
+       mutex_lock(&dev->lock);
+
+       if ((contrast > VIDEO_PROCAMP_MAX) || (contrast < VIDEO_PROCAMP_MIN)) {
+               mutex_unlock(&dev->lock);
+               return -1;
+       }
+
+       ret_val =
+           mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, contrast,
+                UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &value);
+       val =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            VDEC_A_CNTRST_CTRL + (0x200 * decoder), &tmp);
+       val &= 0xFFFFFF00;
+       ret_val |=
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             VDEC_A_CNTRST_CTRL + (0x200 * decoder),
+                             val | value);
+
+       mutex_unlock(&dev->lock);
+       return ret_val;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int medusa_set_hue(struct cx25821_dev *dev, int hue, int decoder)
+{
+       int ret_val = 0;
+       int value = 0;
+       u32 val = 0, tmp = 0;
+
+       mutex_lock(&dev->lock);
+
+       if ((hue > VIDEO_PROCAMP_MAX) || (hue < VIDEO_PROCAMP_MIN)) {
+               mutex_unlock(&dev->lock);
+               return -1;
+       }
+
+       ret_val =
+           mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, hue, SIGNED_BYTE_MIN,
+                SIGNED_BYTE_MAX, &value);
+
+       value = convert_to_twos(value, 8);
+       val =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            VDEC_A_HUE_CTRL + (0x200 * decoder), &tmp);
+       val &= 0xFFFFFF00;
+
+       ret_val |=
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             VDEC_A_HUE_CTRL + (0x200 * decoder), val | value);
+
+       mutex_unlock(&dev->lock);
+       return ret_val;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder)
+{
+       int ret_val = 0;
+       int value = 0;
+       u32 val = 0, tmp = 0;
+
+       mutex_lock(&dev->lock);
+
+       if ((saturation > VIDEO_PROCAMP_MAX)
+           || (saturation < VIDEO_PROCAMP_MIN)) {
+               mutex_unlock(&dev->lock);
+               return -1;
+       }
+
+       ret_val =
+           mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, saturation,
+                UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &value);
+
+       val =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            VDEC_A_USAT_CTRL + (0x200 * decoder), &tmp);
+       val &= 0xFFFFFF00;
+       ret_val |=
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             VDEC_A_USAT_CTRL + (0x200 * decoder),
+                             val | value);
+
+       val =
+           cx25821_i2c_read(&dev->i2c_bus[0],
+                            VDEC_A_VSAT_CTRL + (0x200 * decoder), &tmp);
+       val &= 0xFFFFFF00;
+       ret_val |=
+           cx25821_i2c_write(&dev->i2c_bus[0],
+                             VDEC_A_VSAT_CTRL + (0x200 * decoder),
+                             val | value);
+
+       mutex_unlock(&dev->lock);
+       return ret_val;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// Program the display sequence and monitor output.
+//
+int medusa_video_init(struct cx25821_dev *dev)
+{
+       u32 value = 0, tmp = 0;
+       int ret_val = 0;
+       int i = 0;
+
+       mutex_lock(&dev->lock);
+
+       _num_decoders = dev->_max_num_decoders;
+
+       // disable Auto source selection on all video decoders
+       value = cx25821_i2c_read(&dev->i2c_bus[0], MON_A_CTRL, &tmp);
+       value &= 0xFFFFF0FF;
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], MON_A_CTRL, value);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+       // Turn off Master source switch enable
+       value = cx25821_i2c_read(&dev->i2c_bus[0], MON_A_CTRL, &tmp);
+       value &= 0xFFFFFFDF;
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], MON_A_CTRL, value);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+
+       mutex_unlock(&dev->lock);
+
+       for (i = 0; i < _num_decoders; i++) {
+               medusa_set_decoderduration(dev, i, _display_field_cnt[i]);
+       }
+
+       mutex_lock(&dev->lock);
+
+       // Select monitor as DENC A input, power up the DAC
+       value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_AB_CTRL, &tmp);
+       value &= 0xFF70FF70;
+       value |= 0x00090008;    // set en_active
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], DENC_AB_CTRL, value);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+       // enable input is VIP/656
+       value = cx25821_i2c_read(&dev->i2c_bus[0], BYP_AB_CTRL, &tmp);
+       value |= 0x00040100;    // enable VIP
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], BYP_AB_CTRL, value);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+       // select AFE clock to output mode
+       value = cx25821_i2c_read(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL, &tmp);
+       value &= 0x83FFFFFF;
+       ret_val =
+           cx25821_i2c_write(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL,
+                             value | 0x10000000);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+       // Turn on all of the data out and control output pins.
+       value = cx25821_i2c_read(&dev->i2c_bus[0], PIN_OE_CTRL, &tmp);
+       value &= 0xFEF0FE00;
+       if (_num_decoders == MAX_DECODERS) {
+               // Note: The octal board does not support control pins(bit16-19).
+               // These bits are ignored in the octal board.
+               value |= 0x010001F8;    // disable VDEC A-C port, default to Mobilygen Interface
+       } else {
+               value |= 0x010F0108;    // disable VDEC A-C port, default to Mobilygen Interface
+       }
+
+       value |= 7;
+       ret_val = cx25821_i2c_write(&dev->i2c_bus[0], PIN_OE_CTRL, value);
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+
+       mutex_unlock(&dev->lock);
+
+       ret_val = medusa_set_videostandard(dev);
+
+       if (ret_val < 0) {
+               mutex_unlock(&dev->lock);
+               return -EINVAL;
+       }
+
+       return 1;
+}
diff --git a/drivers/staging/cx25821/cx25821-medusa-video.h b/drivers/staging/cx25821/cx25821-medusa-video.h
new file mode 100644 (file)
index 0000000..2fab4b2
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _MEDUSA_VIDEO_H
+#define _MEDUSA_VIDEO_H
+
+#include "cx25821-medusa-defines.h"
+
+// Color control constants
+#define VIDEO_PROCAMP_MIN                 0
+#define VIDEO_PROCAMP_MAX                 10000
+#define UNSIGNED_BYTE_MIN                 0
+#define UNSIGNED_BYTE_MAX                 0xFF
+#define SIGNED_BYTE_MIN                   -128
+#define SIGNED_BYTE_MAX                   127
+
+// Default video color settings
+#define SHARPNESS_DEFAULT                 50
+#define SATURATION_DEFAULT              5000
+#define BRIGHTNESS_DEFAULT              6200
+#define CONTRAST_DEFAULT                5000
+#define HUE_DEFAULT                     5000
+
+unsigned short _num_decoders;
+unsigned short _num_cameras;
+
+unsigned int _video_standard;
+int _display_field_cnt[MAX_DECODERS];
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-reg.h b/drivers/staging/cx25821/cx25821-reg.h
new file mode 100644 (file)
index 0000000..7241e7e
--- /dev/null
@@ -0,0 +1,1592 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __CX25821_REGISTERS__
+#define __CX25821_REGISTERS__
+
+/* Risc Instructions */
+#define RISC_CNT_INC    0x00010000
+#define RISC_CNT_RESET  0x00030000
+#define RISC_IRQ1               0x01000000
+#define RISC_IRQ2               0x02000000
+#define RISC_EOL                0x04000000
+#define RISC_SOL                0x08000000
+#define RISC_WRITE              0x10000000
+#define RISC_SKIP               0x20000000
+#define RISC_JUMP               0x70000000
+#define RISC_SYNC               0x80000000
+#define RISC_RESYNC             0x80008000
+#define RISC_READ               0x90000000
+#define RISC_WRITERM    0xB0000000
+#define RISC_WRITECM    0xC0000000
+#define RISC_WRITECR    0xD0000000
+#define RISC_WRITEC             0x50000000
+#define RISC_READC              0xA0000000
+
+#define RISC_SYNC_ODD           0x00000000
+#define RISC_SYNC_EVEN          0x00000200
+#define RISC_SYNC_ODD_VBI       0x00000006
+#define RISC_SYNC_EVEN_VBI      0x00000207
+#define RISC_NOOP                       0xF0000000
+
+//*****************************************************************************
+// ASB SRAM
+//*****************************************************************************
+#define  TX_SRAM                   0x000000    // Transmit SRAM
+
+//*****************************************************************************
+#define  RX_RAM                    0x010000    // Receive SRAM
+
+//*****************************************************************************
+// Application Layer (AL)
+//*****************************************************************************
+#define  DEV_CNTRL2                0x040000    // Device control
+#define  FLD_RUN_RISC              0x00000020
+
+//*****************************************************************************
+#define  PCI_INT_MSK               0x040010    // PCI interrupt mask
+#define  PCI_INT_STAT              0x040014    // PCI interrupt status
+#define  PCI_INT_MSTAT             0x040018    // PCI interrupt masked status
+#define  FLD_HAMMERHEAD_INT        (1 << 27)
+#define  FLD_UART_INT              (1 << 26)
+#define  FLD_IRQN_INT              (1 << 25)
+#define  FLD_TM_INT                (1 << 28)
+#define  FLD_I2C_3_RACK            (1 << 27)
+#define  FLD_I2C_3_INT             (1 << 26)
+#define  FLD_I2C_2_RACK            (1 << 25)
+#define  FLD_I2C_2_INT             (1 << 24)
+#define  FLD_I2C_1_RACK            (1 << 23)
+#define  FLD_I2C_1_INT             (1 << 22)
+
+#define  FLD_APB_DMA_BERR_INT      (1 << 21)
+#define  FLD_AL_WR_BERR_INT        (1 << 20)
+#define  FLD_AL_RD_BERR_INT        (1 << 19)
+#define  FLD_RISC_WR_BERR_INT      (1 << 18)
+#define  FLD_RISC_RD_BERR_INT      (1 << 17)
+
+#define  FLD_VID_I_INT             (1 << 8)
+#define  FLD_VID_H_INT             (1 << 7)
+#define  FLD_VID_G_INT             (1 << 6)
+#define  FLD_VID_F_INT             (1 << 5)
+#define  FLD_VID_E_INT             (1 << 4)
+#define  FLD_VID_D_INT             (1 << 3)
+#define  FLD_VID_C_INT             (1 << 2)
+#define  FLD_VID_B_INT             (1 << 1)
+#define  FLD_VID_A_INT             (1 << 0)
+
+//*****************************************************************************
+#define  VID_A_INT_MSK             0x040020    // Video A interrupt mask
+#define  VID_A_INT_STAT            0x040024    // Video A interrupt status
+#define  VID_A_INT_MSTAT           0x040028    // Video A interrupt masked status
+#define  VID_A_INT_SSTAT           0x04002C    // Video A interrupt set status
+
+//*****************************************************************************
+#define  VID_B_INT_MSK             0x040030    // Video B interrupt mask
+#define  VID_B_INT_STAT            0x040034    // Video B interrupt status
+#define  VID_B_INT_MSTAT           0x040038    // Video B interrupt masked status
+#define  VID_B_INT_SSTAT           0x04003C    // Video B interrupt set status
+
+//*****************************************************************************
+#define  VID_C_INT_MSK             0x040040    // Video C interrupt mask
+#define  VID_C_INT_STAT            0x040044    // Video C interrupt status
+#define  VID_C_INT_MSTAT           0x040048    // Video C interrupt masked status
+#define  VID_C_INT_SSTAT           0x04004C    // Video C interrupt set status
+
+//*****************************************************************************
+#define  VID_D_INT_MSK             0x040050    // Video D interrupt mask
+#define  VID_D_INT_STAT            0x040054    // Video D interrupt status
+#define  VID_D_INT_MSTAT           0x040058    // Video D interrupt masked status
+#define  VID_D_INT_SSTAT           0x04005C    // Video D interrupt set status
+
+//*****************************************************************************
+#define  VID_E_INT_MSK             0x040060    // Video E interrupt mask
+#define  VID_E_INT_STAT            0x040064    // Video E interrupt status
+#define  VID_E_INT_MSTAT           0x040068    // Video E interrupt masked status
+#define  VID_E_INT_SSTAT           0x04006C    // Video E interrupt set status
+
+//*****************************************************************************
+#define  VID_F_INT_MSK             0x040070    // Video F interrupt mask
+#define  VID_F_INT_STAT            0x040074    // Video F interrupt status
+#define  VID_F_INT_MSTAT           0x040078    // Video F interrupt masked status
+#define  VID_F_INT_SSTAT           0x04007C    // Video F interrupt set status
+
+//*****************************************************************************
+#define  VID_G_INT_MSK             0x040080    // Video G interrupt mask
+#define  VID_G_INT_STAT            0x040084    // Video G interrupt status
+#define  VID_G_INT_MSTAT           0x040088    // Video G interrupt masked status
+#define  VID_G_INT_SSTAT           0x04008C    // Video G interrupt set status
+
+//*****************************************************************************
+#define  VID_H_INT_MSK             0x040090    // Video H interrupt mask
+#define  VID_H_INT_STAT            0x040094    // Video H interrupt status
+#define  VID_H_INT_MSTAT           0x040098    // Video H interrupt masked status
+#define  VID_H_INT_SSTAT           0x04009C    // Video H interrupt set status
+
+//*****************************************************************************
+#define  VID_I_INT_MSK             0x0400A0    // Video I interrupt mask
+#define  VID_I_INT_STAT            0x0400A4    // Video I interrupt status
+#define  VID_I_INT_MSTAT           0x0400A8    // Video I interrupt masked status
+#define  VID_I_INT_SSTAT           0x0400AC    // Video I interrupt set status
+
+//*****************************************************************************
+#define  VID_J_INT_MSK             0x0400B0    // Video J interrupt mask
+#define  VID_J_INT_STAT            0x0400B4    // Video J interrupt status
+#define  VID_J_INT_MSTAT           0x0400B8    // Video J interrupt masked status
+#define  VID_J_INT_SSTAT           0x0400BC    // Video J interrupt set status
+
+#define  FLD_VID_SRC_OPC_ERR       0x00020000
+#define  FLD_VID_DST_OPC_ERR       0x00010000
+#define  FLD_VID_SRC_SYNC          0x00002000
+#define  FLD_VID_DST_SYNC          0x00001000
+#define  FLD_VID_SRC_UF            0x00000200
+#define  FLD_VID_DST_OF            0x00000100
+#define  FLD_VID_SRC_RISC2         0x00000020
+#define  FLD_VID_DST_RISC2         0x00000010
+#define  FLD_VID_SRC_RISC1         0x00000002
+#define  FLD_VID_DST_RISC1         0x00000001
+#define  FLD_VID_SRC_ERRORS            FLD_VID_SRC_OPC_ERR | FLD_VID_SRC_SYNC | FLD_VID_SRC_UF
+#define  FLD_VID_DST_ERRORS            FLD_VID_DST_OPC_ERR | FLD_VID_DST_SYNC | FLD_VID_DST_OF
+
+//*****************************************************************************
+#define  AUD_A_INT_MSK             0x0400C0    // Audio Int interrupt mask
+#define  AUD_A_INT_STAT            0x0400C4    // Audio Int interrupt status
+#define  AUD_A_INT_MSTAT           0x0400C8    // Audio Int interrupt masked status
+#define  AUD_A_INT_SSTAT           0x0400CC    // Audio Int interrupt set status
+
+//*****************************************************************************
+#define  AUD_B_INT_MSK             0x0400D0    // Audio Int interrupt mask
+#define  AUD_B_INT_STAT            0x0400D4    // Audio Int interrupt status
+#define  AUD_B_INT_MSTAT           0x0400D8    // Audio Int interrupt masked status
+#define  AUD_B_INT_SSTAT           0x0400DC    // Audio Int interrupt set status
+
+//*****************************************************************************
+#define  AUD_C_INT_MSK             0x0400E0    // Audio Int interrupt mask
+#define  AUD_C_INT_STAT            0x0400E4    // Audio Int interrupt status
+#define  AUD_C_INT_MSTAT           0x0400E8    // Audio Int interrupt masked status
+#define  AUD_C_INT_SSTAT           0x0400EC    // Audio Int interrupt set status
+
+//*****************************************************************************
+#define  AUD_D_INT_MSK             0x0400F0    // Audio Int interrupt mask
+#define  AUD_D_INT_STAT            0x0400F4    // Audio Int interrupt status
+#define  AUD_D_INT_MSTAT           0x0400F8    // Audio Int interrupt masked status
+#define  AUD_D_INT_SSTAT           0x0400FC    // Audio Int interrupt set status
+
+//*****************************************************************************
+#define  AUD_E_INT_MSK             0x040100    // Audio Int interrupt mask
+#define  AUD_E_INT_STAT            0x040104    // Audio Int interrupt status
+#define  AUD_E_INT_MSTAT           0x040108    // Audio Int interrupt masked status
+#define  AUD_E_INT_SSTAT           0x04010C    // Audio Int interrupt set status
+
+#define  FLD_AUD_SRC_OPC_ERR       0x00020000
+#define  FLD_AUD_DST_OPC_ERR       0x00010000
+#define  FLD_AUD_SRC_SYNC          0x00002000
+#define  FLD_AUD_DST_SYNC          0x00001000
+#define  FLD_AUD_SRC_OF            0x00000200
+#define  FLD_AUD_DST_OF            0x00000100
+#define  FLD_AUD_SRC_RISCI2        0x00000020
+#define  FLD_AUD_DST_RISCI2        0x00000010
+#define  FLD_AUD_SRC_RISCI1        0x00000002
+#define  FLD_AUD_DST_RISCI1        0x00000001
+
+//*****************************************************************************
+#define  MBIF_A_INT_MSK             0x040110   // MBIF Int interrupt mask
+#define  MBIF_A_INT_STAT            0x040114   // MBIF Int interrupt status
+#define  MBIF_A_INT_MSTAT           0x040118   // MBIF Int interrupt masked status
+#define  MBIF_A_INT_SSTAT           0x04011C   // MBIF Int interrupt set status
+
+//*****************************************************************************
+#define  MBIF_B_INT_MSK             0x040120   // MBIF Int interrupt mask
+#define  MBIF_B_INT_STAT            0x040124   // MBIF Int interrupt status
+#define  MBIF_B_INT_MSTAT           0x040128   // MBIF Int interrupt masked status
+#define  MBIF_B_INT_SSTAT           0x04012C   // MBIF Int interrupt set status
+
+#define  FLD_MBIF_DST_OPC_ERR       0x00010000
+#define  FLD_MBIF_DST_SYNC          0x00001000
+#define  FLD_MBIF_DST_OF            0x00000100
+#define  FLD_MBIF_DST_RISCI2        0x00000010
+#define  FLD_MBIF_DST_RISCI1        0x00000001
+
+//*****************************************************************************
+#define  AUD_EXT_INT_MSK           0x040060    // Audio Ext interrupt mask
+#define  AUD_EXT_INT_STAT          0x040064    // Audio Ext interrupt status
+#define  AUD_EXT_INT_MSTAT         0x040068    // Audio Ext interrupt masked status
+#define  AUD_EXT_INT_SSTAT         0x04006C    // Audio Ext interrupt set status
+#define  FLD_AUD_EXT_OPC_ERR       0x00010000
+#define  FLD_AUD_EXT_SYNC          0x00001000
+#define  FLD_AUD_EXT_OF            0x00000100
+#define  FLD_AUD_EXT_RISCI2        0x00000010
+#define  FLD_AUD_EXT_RISCI1        0x00000001
+
+//*****************************************************************************
+#define  GPIO_LO                   0x110010    // Lower  of GPIO pins [31:0]
+#define  GPIO_HI                   0x110014    // Upper WORD  of GPIO pins [47:31]
+
+#define  GPIO_LO_OE                0x110018    // Lower  of GPIO output enable [31:0]
+#define  GPIO_HI_OE                0x11001C    // Upper word  of GPIO output enable [47:32]
+
+#define  GPIO_LO_INT_MSK           0x11003C    // GPIO interrupt mask
+#define  GPIO_LO_INT_STAT          0x110044    // GPIO interrupt status
+#define  GPIO_LO_INT_MSTAT         0x11004C    // GPIO interrupt masked status
+#define  GPIO_LO_ISM_SNS           0x110054    // GPIO interrupt sensitivity
+#define  GPIO_LO_ISM_POL           0x11005C    // GPIO interrupt polarity
+
+#define  GPIO_HI_INT_MSK           0x110040    // GPIO interrupt mask
+#define  GPIO_HI_INT_STAT          0x110048    // GPIO interrupt status
+#define  GPIO_HI_INT_MSTAT         0x110050    // GPIO interrupt masked status
+#define  GPIO_HI_ISM_SNS           0x110058    // GPIO interrupt sensitivity
+#define  GPIO_HI_ISM_POL           0x110060    // GPIO interrupt polarity
+
+#define  FLD_GPIO43_INT            (1 << 11)
+#define  FLD_GPIO42_INT            (1 << 10)
+#define  FLD_GPIO41_INT            (1 << 9)
+#define  FLD_GPIO40_INT            (1 << 8)
+
+#define  FLD_GPIO9_INT             (1 << 9)
+#define  FLD_GPIO8_INT             (1 << 8)
+#define  FLD_GPIO7_INT             (1 << 7)
+#define  FLD_GPIO6_INT             (1 << 6)
+#define  FLD_GPIO5_INT             (1 << 5)
+#define  FLD_GPIO4_INT             (1 << 4)
+#define  FLD_GPIO3_INT             (1 << 3)
+#define  FLD_GPIO2_INT             (1 << 2)
+#define  FLD_GPIO1_INT             (1 << 1)
+#define  FLD_GPIO0_INT             (1 << 0)
+
+//*****************************************************************************
+#define  TC_REQ                    0x040090    // Rider PCI Express traFFic class request
+
+//*****************************************************************************
+#define  TC_REQ_SET                0x040094    // Rider PCI Express traFFic class request set
+
+//*****************************************************************************
+// Rider
+//*****************************************************************************
+
+// PCI Compatible Header
+//*****************************************************************************
+#define  RDR_CFG0                  0x050000
+#define  RDR_VENDOR_DEVICE_ID_CFG  0x050000
+
+//*****************************************************************************
+#define  RDR_CFG1                  0x050004
+
+//*****************************************************************************
+#define  RDR_CFG2                  0x050008
+
+//*****************************************************************************
+#define  RDR_CFG3                  0x05000C
+
+//*****************************************************************************
+#define  RDR_CFG4                  0x050010
+
+//*****************************************************************************
+#define  RDR_CFG5                  0x050014
+
+//*****************************************************************************
+#define  RDR_CFG6                  0x050018
+
+//*****************************************************************************
+#define  RDR_CFG7                  0x05001C
+
+//*****************************************************************************
+#define  RDR_CFG8                  0x050020
+
+//*****************************************************************************
+#define  RDR_CFG9                  0x050024
+
+//*****************************************************************************
+#define  RDR_CFGA                  0x050028
+
+//*****************************************************************************
+#define  RDR_CFGB                  0x05002C
+#define  RDR_SUSSYSTEM_ID_CFG      0x05002C
+
+//*****************************************************************************
+#define  RDR_CFGC                  0x050030
+
+//*****************************************************************************
+#define  RDR_CFGD                  0x050034
+
+//*****************************************************************************
+#define  RDR_CFGE                  0x050038
+
+//*****************************************************************************
+#define  RDR_CFGF                  0x05003C
+
+//*****************************************************************************
+// PCI-Express Capabilities
+//*****************************************************************************
+#define  RDR_PECAP                 0x050040
+
+//*****************************************************************************
+#define  RDR_PEDEVCAP              0x050044
+
+//*****************************************************************************
+#define  RDR_PEDEVSC               0x050048
+
+//*****************************************************************************
+#define  RDR_PELINKCAP             0x05004C
+
+//*****************************************************************************
+#define  RDR_PELINKSC              0x050050
+
+//*****************************************************************************
+#define  RDR_PMICAP                0x050080
+
+//*****************************************************************************
+#define  RDR_PMCSR                 0x050084
+
+//*****************************************************************************
+#define  RDR_VPDCAP                0x050090
+
+//*****************************************************************************
+#define  RDR_VPDDATA               0x050094
+
+//*****************************************************************************
+#define  RDR_MSICAP                0x0500A0
+
+//*****************************************************************************
+#define  RDR_MSIARL                0x0500A4
+
+//*****************************************************************************
+#define  RDR_MSIARU                0x0500A8
+
+//*****************************************************************************
+#define  RDR_MSIDATA               0x0500AC
+
+//*****************************************************************************
+// PCI Express Extended Capabilities
+//*****************************************************************************
+#define  RDR_AERXCAP               0x050100
+
+//*****************************************************************************
+#define  RDR_AERUESTA              0x050104
+
+//*****************************************************************************
+#define  RDR_AERUEMSK              0x050108
+
+//*****************************************************************************
+#define  RDR_AERUESEV              0x05010C
+
+//*****************************************************************************
+#define  RDR_AERCESTA              0x050110
+
+//*****************************************************************************
+#define  RDR_AERCEMSK              0x050114
+
+//*****************************************************************************
+#define  RDR_AERCC                 0x050118
+
+//*****************************************************************************
+#define  RDR_AERHL0                0x05011C
+
+//*****************************************************************************
+#define  RDR_AERHL1                0x050120
+
+//*****************************************************************************
+#define  RDR_AERHL2                0x050124
+
+//*****************************************************************************
+#define  RDR_AERHL3                0x050128
+
+//*****************************************************************************
+#define  RDR_VCXCAP                0x050200
+
+//*****************************************************************************
+#define  RDR_VCCAP1                0x050204
+
+//*****************************************************************************
+#define  RDR_VCCAP2                0x050208
+
+//*****************************************************************************
+#define  RDR_VCSC                  0x05020C
+
+//*****************************************************************************
+#define  RDR_VCR0_CAP              0x050210
+
+//*****************************************************************************
+#define  RDR_VCR0_CTRL             0x050214
+
+//*****************************************************************************
+#define  RDR_VCR0_STAT             0x050218
+
+//*****************************************************************************
+#define  RDR_VCR1_CAP              0x05021C
+
+//*****************************************************************************
+#define  RDR_VCR1_CTRL             0x050220
+
+//*****************************************************************************
+#define  RDR_VCR1_STAT             0x050224
+
+//*****************************************************************************
+#define  RDR_VCR2_CAP              0x050228
+
+//*****************************************************************************
+#define  RDR_VCR2_CTRL             0x05022C
+
+//*****************************************************************************
+#define  RDR_VCR2_STAT             0x050230
+
+//*****************************************************************************
+#define  RDR_VCR3_CAP              0x050234
+
+//*****************************************************************************
+#define  RDR_VCR3_CTRL             0x050238
+
+//*****************************************************************************
+#define  RDR_VCR3_STAT             0x05023C
+
+//*****************************************************************************
+#define  RDR_VCARB0                0x050240
+
+//*****************************************************************************
+#define  RDR_VCARB1                0x050244
+
+//*****************************************************************************
+#define  RDR_VCARB2                0x050248
+
+//*****************************************************************************
+#define  RDR_VCARB3                0x05024C
+
+//*****************************************************************************
+#define  RDR_VCARB4                0x050250
+
+//*****************************************************************************
+#define  RDR_VCARB5                0x050254
+
+//*****************************************************************************
+#define  RDR_VCARB6                0x050258
+
+//*****************************************************************************
+#define  RDR_VCARB7                0x05025C
+
+//*****************************************************************************
+#define  RDR_RDRSTAT0              0x050300
+
+//*****************************************************************************
+#define  RDR_RDRSTAT1              0x050304
+
+//*****************************************************************************
+#define  RDR_RDRCTL0               0x050308
+
+//*****************************************************************************
+#define  RDR_RDRCTL1               0x05030C
+
+//*****************************************************************************
+// Transaction Layer Registers
+//*****************************************************************************
+#define  RDR_TLSTAT0               0x050310
+
+//*****************************************************************************
+#define  RDR_TLSTAT1               0x050314
+
+//*****************************************************************************
+#define  RDR_TLCTL0                0x050318
+#define  FLD_CFG_UR_CPL_MODE       0x00000040
+#define  FLD_CFG_CORR_ERR_QUITE    0x00000020
+#define  FLD_CFG_RCB_CK_EN         0x00000010
+#define  FLD_CFG_BNDRY_CK_EN       0x00000008
+#define  FLD_CFG_BYTE_EN_CK_EN     0x00000004
+#define  FLD_CFG_RELAX_ORDER_MSK   0x00000002
+#define  FLD_CFG_TAG_ORDER_EN      0x00000001
+
+//*****************************************************************************
+#define  RDR_TLCTL1                0x05031C
+
+//*****************************************************************************
+#define  RDR_REQRCAL               0x050320
+
+//*****************************************************************************
+#define  RDR_REQRCAU               0x050324
+
+//*****************************************************************************
+#define  RDR_REQEPA                0x050328
+
+//*****************************************************************************
+#define  RDR_REQCTRL               0x05032C
+
+//*****************************************************************************
+#define  RDR_REQSTAT               0x050330
+
+//*****************************************************************************
+#define  RDR_TL_TEST               0x050334
+
+//*****************************************************************************
+#define  RDR_VCR01_CTL             0x050348
+
+//*****************************************************************************
+#define  RDR_VCR23_CTL             0x05034C
+
+//*****************************************************************************
+#define  RDR_RX_VCR0_FC            0x050350
+
+//*****************************************************************************
+#define  RDR_RX_VCR1_FC            0x050354
+
+//*****************************************************************************
+#define  RDR_RX_VCR2_FC            0x050358
+
+//*****************************************************************************
+#define  RDR_RX_VCR3_FC            0x05035C
+
+//*****************************************************************************
+// Data Link Layer Registers
+//*****************************************************************************
+#define  RDR_DLLSTAT               0x050360
+
+//*****************************************************************************
+#define  RDR_DLLCTRL               0x050364
+
+//*****************************************************************************
+#define  RDR_REPLAYTO              0x050368
+
+//*****************************************************************************
+#define  RDR_ACKLATTO              0x05036C
+
+//*****************************************************************************
+// MAC Layer Registers
+//*****************************************************************************
+#define  RDR_MACSTAT0              0x050380
+
+//*****************************************************************************
+#define  RDR_MACSTAT1              0x050384
+
+//*****************************************************************************
+#define  RDR_MACCTRL0              0x050388
+
+//*****************************************************************************
+#define  RDR_MACCTRL1              0x05038C
+
+//*****************************************************************************
+#define  RDR_MACCTRL2              0x050390
+
+//*****************************************************************************
+#define  RDR_MAC_LB_DATA           0x050394
+
+//*****************************************************************************
+#define  RDR_L0S_EXIT_LAT          0x050398
+
+//*****************************************************************************
+// DMAC
+//*****************************************************************************
+#define  DMA1_PTR1                 0x100000    // DMA Current Ptr : Ch#1
+
+//*****************************************************************************
+#define  DMA2_PTR1                 0x100004    // DMA Current Ptr : Ch#2
+
+//*****************************************************************************
+#define  DMA3_PTR1                 0x100008    // DMA Current Ptr : Ch#3
+
+//*****************************************************************************
+#define  DMA4_PTR1                 0x10000C    // DMA Current Ptr : Ch#4
+
+//*****************************************************************************
+#define  DMA5_PTR1                 0x100010    // DMA Current Ptr : Ch#5
+
+//*****************************************************************************
+#define  DMA6_PTR1                 0x100014    // DMA Current Ptr : Ch#6
+
+//*****************************************************************************
+#define  DMA7_PTR1                 0x100018    // DMA Current Ptr : Ch#7
+
+//*****************************************************************************
+#define  DMA8_PTR1                 0x10001C    // DMA Current Ptr : Ch#8
+
+//*****************************************************************************
+#define  DMA9_PTR1                 0x100020    // DMA Current Ptr : Ch#9
+
+//*****************************************************************************
+#define  DMA10_PTR1                0x100024    // DMA Current Ptr : Ch#10
+
+//*****************************************************************************
+#define  DMA11_PTR1                0x100028    // DMA Current Ptr : Ch#11
+
+//*****************************************************************************
+#define  DMA12_PTR1                0x10002C    // DMA Current Ptr : Ch#12
+
+//*****************************************************************************
+#define  DMA13_PTR1                0x100030    // DMA Current Ptr : Ch#13
+
+//*****************************************************************************
+#define  DMA14_PTR1                0x100034    // DMA Current Ptr : Ch#14
+
+//*****************************************************************************
+#define  DMA15_PTR1                0x100038    // DMA Current Ptr : Ch#15
+
+//*****************************************************************************
+#define  DMA16_PTR1                0x10003C    // DMA Current Ptr : Ch#16
+
+//*****************************************************************************
+#define  DMA17_PTR1                0x100040    // DMA Current Ptr : Ch#17
+
+//*****************************************************************************
+#define  DMA18_PTR1                0x100044    // DMA Current Ptr : Ch#18
+
+//*****************************************************************************
+#define  DMA19_PTR1                0x100048    // DMA Current Ptr : Ch#19
+
+//*****************************************************************************
+#define  DMA20_PTR1                0x10004C    // DMA Current Ptr : Ch#20
+
+//*****************************************************************************
+#define  DMA21_PTR1                0x100050    // DMA Current Ptr : Ch#21
+
+//*****************************************************************************
+#define  DMA22_PTR1                0x100054    // DMA Current Ptr : Ch#22
+
+//*****************************************************************************
+#define  DMA23_PTR1                0x100058    // DMA Current Ptr : Ch#23
+
+//*****************************************************************************
+#define  DMA24_PTR1                0x10005C    // DMA Current Ptr : Ch#24
+
+//*****************************************************************************
+#define  DMA25_PTR1                0x100060    // DMA Current Ptr : Ch#25
+
+//*****************************************************************************
+#define  DMA26_PTR1                0x100064    // DMA Current Ptr : Ch#26
+
+//*****************************************************************************
+#define  DMA1_PTR2                 0x100080    // DMA Tab Ptr : Ch#1
+
+//*****************************************************************************
+#define  DMA2_PTR2                 0x100084    // DMA Tab Ptr : Ch#2
+
+//*****************************************************************************
+#define  DMA3_PTR2                 0x100088    // DMA Tab Ptr : Ch#3
+
+//*****************************************************************************
+#define  DMA4_PTR2                 0x10008C    // DMA Tab Ptr : Ch#4
+
+//*****************************************************************************
+#define  DMA5_PTR2                 0x100090    // DMA Tab Ptr : Ch#5
+
+//*****************************************************************************
+#define  DMA6_PTR2                 0x100094    // DMA Tab Ptr : Ch#6
+
+//*****************************************************************************
+#define  DMA7_PTR2                 0x100098    // DMA Tab Ptr : Ch#7
+
+//*****************************************************************************
+#define  DMA8_PTR2                 0x10009C    // DMA Tab Ptr : Ch#8
+
+//*****************************************************************************
+#define  DMA9_PTR2                 0x1000A0    // DMA Tab Ptr : Ch#9
+
+//*****************************************************************************
+#define  DMA10_PTR2                0x1000A4    // DMA Tab Ptr : Ch#10
+
+//*****************************************************************************
+#define  DMA11_PTR2                0x1000A8    // DMA Tab Ptr : Ch#11
+
+//*****************************************************************************
+#define  DMA12_PTR2                0x1000AC    // DMA Tab Ptr : Ch#12
+
+//*****************************************************************************
+#define  DMA13_PTR2                0x1000B0    // DMA Tab Ptr : Ch#13
+
+//*****************************************************************************
+#define  DMA14_PTR2                0x1000B4    // DMA Tab Ptr : Ch#14
+
+//*****************************************************************************
+#define  DMA15_PTR2                0x1000B8    // DMA Tab Ptr : Ch#15
+
+//*****************************************************************************
+#define  DMA16_PTR2                0x1000BC    // DMA Tab Ptr : Ch#16
+
+//*****************************************************************************
+#define  DMA17_PTR2                0x1000C0    // DMA Tab Ptr : Ch#17
+
+//*****************************************************************************
+#define  DMA18_PTR2                0x1000C4    // DMA Tab Ptr : Ch#18
+
+//*****************************************************************************
+#define  DMA19_PTR2                0x1000C8    // DMA Tab Ptr : Ch#19
+
+//*****************************************************************************
+#define  DMA20_PTR2                0x1000CC    // DMA Tab Ptr : Ch#20
+
+//*****************************************************************************
+#define  DMA21_PTR2                0x1000D0    // DMA Tab Ptr : Ch#21
+
+//*****************************************************************************
+#define  DMA22_PTR2                0x1000D4    // DMA Tab Ptr : Ch#22
+
+//*****************************************************************************
+#define  DMA23_PTR2                0x1000D8    // DMA Tab Ptr : Ch#23
+
+//*****************************************************************************
+#define  DMA24_PTR2                0x1000DC    // DMA Tab Ptr : Ch#24
+
+//*****************************************************************************
+#define  DMA25_PTR2                0x1000E0    // DMA Tab Ptr : Ch#25
+
+//*****************************************************************************
+#define  DMA26_PTR2                0x1000E4    // DMA Tab Ptr : Ch#26
+
+//*****************************************************************************
+#define  DMA1_CNT1                 0x100100    // DMA BuFFer Size : Ch#1
+
+//*****************************************************************************
+#define  DMA2_CNT1                 0x100104    // DMA BuFFer Size : Ch#2
+
+//*****************************************************************************
+#define  DMA3_CNT1                 0x100108    // DMA BuFFer Size : Ch#3
+
+//*****************************************************************************
+#define  DMA4_CNT1                 0x10010C    // DMA BuFFer Size : Ch#4
+
+//*****************************************************************************
+#define  DMA5_CNT1                 0x100110    // DMA BuFFer Size : Ch#5
+
+//*****************************************************************************
+#define  DMA6_CNT1                 0x100114    // DMA BuFFer Size : Ch#6
+
+//*****************************************************************************
+#define  DMA7_CNT1                 0x100118    // DMA BuFFer Size : Ch#7
+
+//*****************************************************************************
+#define  DMA8_CNT1                 0x10011C    // DMA BuFFer Size : Ch#8
+
+//*****************************************************************************
+#define  DMA9_CNT1                 0x100120    // DMA BuFFer Size : Ch#9
+
+//*****************************************************************************
+#define  DMA10_CNT1                0x100124    // DMA BuFFer Size : Ch#10
+
+//*****************************************************************************
+#define  DMA11_CNT1                0x100128    // DMA BuFFer Size : Ch#11
+
+//*****************************************************************************
+#define  DMA12_CNT1                0x10012C    // DMA BuFFer Size : Ch#12
+
+//*****************************************************************************
+#define  DMA13_CNT1                0x100130    // DMA BuFFer Size : Ch#13
+
+//*****************************************************************************
+#define  DMA14_CNT1                0x100134    // DMA BuFFer Size : Ch#14
+
+//*****************************************************************************
+#define  DMA15_CNT1                0x100138    // DMA BuFFer Size : Ch#15
+
+//*****************************************************************************
+#define  DMA16_CNT1                0x10013C    // DMA BuFFer Size : Ch#16
+
+//*****************************************************************************
+#define  DMA17_CNT1                0x100140    // DMA BuFFer Size : Ch#17
+
+//*****************************************************************************
+#define  DMA18_CNT1                0x100144    // DMA BuFFer Size : Ch#18
+
+//*****************************************************************************
+#define  DMA19_CNT1                0x100148    // DMA BuFFer Size : Ch#19
+
+//*****************************************************************************
+#define  DMA20_CNT1                0x10014C    // DMA BuFFer Size : Ch#20
+
+//*****************************************************************************
+#define  DMA21_CNT1                0x100150    // DMA BuFFer Size : Ch#21
+
+//*****************************************************************************
+#define  DMA22_CNT1                0x100154    // DMA BuFFer Size : Ch#22
+
+//*****************************************************************************
+#define  DMA23_CNT1                0x100158    // DMA BuFFer Size : Ch#23
+
+//*****************************************************************************
+#define  DMA24_CNT1                0x10015C    // DMA BuFFer Size : Ch#24
+
+//*****************************************************************************
+#define  DMA25_CNT1                0x100160    // DMA BuFFer Size : Ch#25
+
+//*****************************************************************************
+#define  DMA26_CNT1                0x100164    // DMA BuFFer Size : Ch#26
+
+//*****************************************************************************
+#define  DMA1_CNT2                 0x100180    // DMA Table Size : Ch#1
+
+//*****************************************************************************
+#define  DMA2_CNT2                 0x100184    // DMA Table Size : Ch#2
+
+//*****************************************************************************
+#define  DMA3_CNT2                 0x100188    // DMA Table Size : Ch#3
+
+//*****************************************************************************
+#define  DMA4_CNT2                 0x10018C    // DMA Table Size : Ch#4
+
+//*****************************************************************************
+#define  DMA5_CNT2                 0x100190    // DMA Table Size : Ch#5
+
+//*****************************************************************************
+#define  DMA6_CNT2                 0x100194    // DMA Table Size : Ch#6
+
+//*****************************************************************************
+#define  DMA7_CNT2                 0x100198    // DMA Table Size : Ch#7
+
+//*****************************************************************************
+#define  DMA8_CNT2                 0x10019C    // DMA Table Size : Ch#8
+
+//*****************************************************************************
+#define  DMA9_CNT2                 0x1001A0    // DMA Table Size : Ch#9
+
+//*****************************************************************************
+#define  DMA10_CNT2                0x1001A4    // DMA Table Size : Ch#10
+
+//*****************************************************************************
+#define  DMA11_CNT2                0x1001A8    // DMA Table Size : Ch#11
+
+//*****************************************************************************
+#define  DMA12_CNT2                0x1001AC    // DMA Table Size : Ch#12
+
+//*****************************************************************************
+#define  DMA13_CNT2                0x1001B0    // DMA Table Size : Ch#13
+
+//*****************************************************************************
+#define  DMA14_CNT2                0x1001B4    // DMA Table Size : Ch#14
+
+//*****************************************************************************
+#define  DMA15_CNT2                0x1001B8    // DMA Table Size : Ch#15
+
+//*****************************************************************************
+#define  DMA16_CNT2                0x1001BC    // DMA Table Size : Ch#16
+
+//*****************************************************************************
+#define  DMA17_CNT2                0x1001C0    // DMA Table Size : Ch#17
+
+//*****************************************************************************
+#define  DMA18_CNT2                0x1001C4    // DMA Table Size : Ch#18
+
+//*****************************************************************************
+#define  DMA19_CNT2                0x1001C8    // DMA Table Size : Ch#19
+
+//*****************************************************************************
+#define  DMA20_CNT2                0x1001CC    // DMA Table Size : Ch#20
+
+//*****************************************************************************
+#define  DMA21_CNT2                0x1001D0    // DMA Table Size : Ch#21
+
+//*****************************************************************************
+#define  DMA22_CNT2                0x1001D4    // DMA Table Size : Ch#22
+
+//*****************************************************************************
+#define  DMA23_CNT2                0x1001D8    // DMA Table Size : Ch#23
+
+//*****************************************************************************
+#define  DMA24_CNT2                0x1001DC    // DMA Table Size : Ch#24
+
+//*****************************************************************************
+#define  DMA25_CNT2                0x1001E0    // DMA Table Size : Ch#25
+
+//*****************************************************************************
+#define  DMA26_CNT2                0x1001E4    // DMA Table Size : Ch#26
+
+//*****************************************************************************
+ // ITG
+//*****************************************************************************
+#define  TM_CNT_LDW                0x110000    // Timer : Counter low
+
+//*****************************************************************************
+#define  TM_CNT_UW                 0x110004    // Timer : Counter high word
+
+//*****************************************************************************
+#define  TM_LMT_LDW                0x110008    // Timer : Limit low
+
+//*****************************************************************************
+#define  TM_LMT_UW                 0x11000C    // Timer : Limit high word
+
+//*****************************************************************************
+#define  GP0_IO                    0x110010    // GPIO output enables data I/O
+#define  FLD_GP_OE                 0x00FF0000  // GPIO: GP_OE output enable
+#define  FLD_GP_IN                 0x0000FF00  // GPIO: GP_IN status
+#define  FLD_GP_OUT                0x000000FF  // GPIO: GP_OUT control
+
+//*****************************************************************************
+#define  GPIO_ISM                  0x110014    // GPIO interrupt sensitivity mode
+#define  FLD_GP_ISM_SNS            0x00000070
+#define  FLD_GP_ISM_POL            0x00000007
+
+//*****************************************************************************
+#define  SOFT_RESET                0x11001C    // Output system reset reg
+#define  FLD_PECOS_SOFT_RESET      0x00000001
+
+//*****************************************************************************
+#define  MC416_RWD                 0x110020    // MC416 GPIO[18:3] pin
+#define  MC416_OEN                 0x110024    // Output enable of GPIO[18:3]
+#define  MC416_CTL                 0x110028
+
+//*****************************************************************************
+#define  ALT_PIN_OUT_SEL           0x11002C    // Alternate GPIO output select
+
+#define  FLD_ALT_GPIO_OUT_SEL      0xF0000000
+// 0          Disabled <-- default
+// 1          GPIO[0]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+// 8          ATT_IF
+
+#define  FLD_AUX_PLL_CLK_ALT_SEL   0x0F000000
+// 0          AUX_PLL_CLK<-- default
+// 1          GPIO[2]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_IR_TX_ALT_SEL         0x00F00000
+// 0          IR_TX <-- default
+// 1          GPIO[1]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_IR_RX_ALT_SEL         0x000F0000
+// 0          IR_RX <-- default
+// 1          GPIO[0]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_GPIO10_ALT_SEL        0x0000F000
+// 0          GPIO[10] <-- default
+// 1          GPIO[0]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_GPIO2_ALT_SEL         0x00000F00
+// 0          GPIO[2] <-- default
+// 1          GPIO[1]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_GPIO1_ALT_SEL         0x000000F0
+// 0          GPIO[1] <-- default
+// 1          GPIO[0]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  FLD_GPIO0_ALT_SEL         0x0000000F
+// 0          GPIO[0] <-- default
+// 1          GPIO[1]
+// 2          GPIO[10]
+// 3          VIP_656_DATA_VAL
+// 4          VIP_656_DATA[0]
+// 5          VIP_656_CLK
+// 6          VIP_656_DATA_EXT[1]
+// 7          VIP_656_DATA_EXT[0]
+
+#define  ALT_PIN_IN_SEL            0x110030    // Alternate GPIO input select
+
+#define  FLD_GPIO10_ALT_IN_SEL     0x0000F000
+// 0          GPIO[10] <-- default
+// 1          IR_RX
+// 2          IR_TX
+// 3          AUX_PLL_CLK
+// 4          IF_ATT_SEL
+// 5          GPIO[0]
+// 6          GPIO[1]
+// 7          GPIO[2]
+
+#define  FLD_GPIO2_ALT_IN_SEL      0x00000F00
+// 0          GPIO[2] <-- default
+// 1          IR_RX
+// 2          IR_TX
+// 3          AUX_PLL_CLK
+// 4          IF_ATT_SEL
+
+#define  FLD_GPIO1_ALT_IN_SEL      0x000000F0
+// 0          GPIO[1] <-- default
+// 1          IR_RX
+// 2          IR_TX
+// 3          AUX_PLL_CLK
+// 4          IF_ATT_SEL
+
+#define  FLD_GPIO0_ALT_IN_SEL      0x0000000F
+// 0          GPIO[0] <-- default
+// 1          IR_RX
+// 2          IR_TX
+// 3          AUX_PLL_CLK
+// 4          IF_ATT_SEL
+
+//*****************************************************************************
+#define  TEST_BUS_CTL1             0x110040    // Test bus control register #1
+
+//*****************************************************************************
+#define  TEST_BUS_CTL2             0x110044    // Test bus control register #2
+
+//*****************************************************************************
+#define  CLK_DELAY                 0x110048    // Clock delay
+#define  FLD_MOE_CLK_DIS           0x80000000  // Disable MoE clock
+
+//*****************************************************************************
+#define  PAD_CTRL                  0x110068    // Pad drive strength control
+
+//*****************************************************************************
+#define  MBIST_CTRL                0x110050    // SRAM memory built-in self test control
+
+//*****************************************************************************
+#define  MBIST_STAT                0x110054    // SRAM memory built-in self test status
+
+//*****************************************************************************
+// PLL registers
+//*****************************************************************************
+#define  PLL_A_INT_FRAC            0x110088
+#define  PLL_A_POST_STAT_BIST      0x11008C
+#define  PLL_B_INT_FRAC            0x110090
+#define  PLL_B_POST_STAT_BIST      0x110094
+#define  PLL_C_INT_FRAC            0x110098
+#define  PLL_C_POST_STAT_BIST      0x11009C
+#define  PLL_D_INT_FRAC            0x1100A0
+#define  PLL_D_POST_STAT_BIST      0x1100A4
+
+#define  CLK_RST                   0x11002C
+#define  FLD_VID_I_CLK_NOE         0x00001000
+#define  FLD_VID_J_CLK_NOE         0x00002000
+#define  FLD_USE_ALT_PLL_REF       0x00004000
+
+#define  VID_CH_MODE_SEL           0x110078
+#define  VID_CH_CLK_SEL            0x11007C
+
+//*****************************************************************************
+#define  VBI_A_DMA                 0x130008    // VBI A DMA data port
+
+//*****************************************************************************
+#define  VID_A_VIP_CTL             0x130080    // Video A VIP format control
+#define  FLD_VIP_MODE              0x00000001
+
+//*****************************************************************************
+#define  VID_A_PIXEL_FRMT          0x130084    // Video A pixel format
+#define  FLD_VID_A_GAMMA_DIS       0x00000008
+#define  FLD_VID_A_FORMAT          0x00000007
+#define  FLD_VID_A_GAMMA_FACTOR    0x00000010
+
+//*****************************************************************************
+#define  VID_A_VBI_CTL             0x130088    // Video A VBI miscellaneous control
+#define  FLD_VID_A_VIP_EXT         0x00000003
+
+//*****************************************************************************
+#define  VID_B_DMA                 0x130100    // Video B DMA data port
+
+//*****************************************************************************
+#define  VBI_B_DMA                 0x130108    // VBI B DMA data port
+
+//*****************************************************************************
+#define  VID_B_SRC_SEL             0x130144    // Video B source select
+#define  FLD_VID_B_SRC_SEL         0x00000000
+
+//*****************************************************************************
+#define  VID_B_LNGTH               0x130150    // Video B line length
+#define  FLD_VID_B_LN_LNGTH        0x00000FFF
+
+//*****************************************************************************
+#define  VID_B_VIP_CTL             0x130180    // Video B VIP format control
+
+//*****************************************************************************
+#define  VID_B_PIXEL_FRMT          0x130184    // Video B pixel format
+#define  FLD_VID_B_GAMMA_DIS       0x00000008
+#define  FLD_VID_B_FORMAT          0x00000007
+#define  FLD_VID_B_GAMMA_FACTOR    0x00000010
+
+//*****************************************************************************
+#define  VID_C_DMA                 0x130200    // Video C DMA data port
+
+//*****************************************************************************
+#define  VID_C_LNGTH               0x130250    // Video C line length
+#define  FLD_VID_C_LN_LNGTH        0x00000FFF
+
+//*****************************************************************************
+// Video Destination Channels
+//*****************************************************************************
+
+#define  VID_DST_A_GPCNT           0x130020    // Video A general purpose counter
+#define  VID_DST_B_GPCNT           0x130120    // Video B general purpose counter
+#define  VID_DST_C_GPCNT           0x130220    // Video C general purpose counter
+#define  VID_DST_D_GPCNT           0x130320    // Video D general purpose counter
+#define  VID_DST_E_GPCNT           0x130420    // Video E general purpose counter
+#define  VID_DST_F_GPCNT           0x130520    // Video F general purpose counter
+#define  VID_DST_G_GPCNT           0x130620    // Video G general purpose counter
+#define  VID_DST_H_GPCNT           0x130720    // Video H general purpose counter
+
+//*****************************************************************************
+
+#define  VID_DST_A_GPCNT_CTL       0x130030    // Video A general purpose control
+#define  VID_DST_B_GPCNT_CTL       0x130130    // Video B general purpose control
+#define  VID_DST_C_GPCNT_CTL       0x130230    // Video C general purpose control
+#define  VID_DST_D_GPCNT_CTL       0x130330    // Video D general purpose control
+#define  VID_DST_E_GPCNT_CTL       0x130430    // Video E general purpose control
+#define  VID_DST_F_GPCNT_CTL       0x130530    // Video F general purpose control
+#define  VID_DST_G_GPCNT_CTL       0x130630    // Video G general purpose control
+#define  VID_DST_H_GPCNT_CTL       0x130730    // Video H general purpose control
+
+//*****************************************************************************
+
+#define  VID_DST_A_DMA_CTL         0x130040    // Video A DMA control
+#define  VID_DST_B_DMA_CTL         0x130140    // Video B DMA control
+#define  VID_DST_C_DMA_CTL         0x130240    // Video C DMA control
+#define  VID_DST_D_DMA_CTL         0x130340    // Video D DMA control
+#define  VID_DST_E_DMA_CTL         0x130440    // Video E DMA control
+#define  VID_DST_F_DMA_CTL         0x130540    // Video F DMA control
+#define  VID_DST_G_DMA_CTL         0x130640    // Video G DMA control
+#define  VID_DST_H_DMA_CTL         0x130740    // Video H DMA control
+
+#define  FLD_VID_RISC_EN           0x00000010
+#define  FLD_VID_FIFO_EN           0x00000001
+
+//*****************************************************************************
+
+#define  VID_DST_A_VIP_CTL         0x130080    // Video A VIP control
+#define  VID_DST_B_VIP_CTL         0x130180    // Video B VIP control
+#define  VID_DST_C_VIP_CTL         0x130280    // Video C VIP control
+#define  VID_DST_D_VIP_CTL         0x130380    // Video D VIP control
+#define  VID_DST_E_VIP_CTL         0x130480    // Video E VIP control
+#define  VID_DST_F_VIP_CTL         0x130580    // Video F VIP control
+#define  VID_DST_G_VIP_CTL         0x130680    // Video G VIP control
+#define  VID_DST_H_VIP_CTL         0x130780    // Video H VIP control
+
+//*****************************************************************************
+
+#define  VID_DST_A_PIX_FRMT        0x130084    // Video A Pixel format
+#define  VID_DST_B_PIX_FRMT        0x130184    // Video B Pixel format
+#define  VID_DST_C_PIX_FRMT        0x130284    // Video C Pixel format
+#define  VID_DST_D_PIX_FRMT        0x130384    // Video D Pixel format
+#define  VID_DST_E_PIX_FRMT        0x130484    // Video E Pixel format
+#define  VID_DST_F_PIX_FRMT        0x130584    // Video F Pixel format
+#define  VID_DST_G_PIX_FRMT        0x130684    // Video G Pixel format
+#define  VID_DST_H_PIX_FRMT        0x130784    // Video H Pixel format
+
+//*****************************************************************************
+// Video Source Channels
+//*****************************************************************************
+
+#define  VID_SRC_A_GPCNT_CTL       0x130804    // Video A general purpose control
+#define  VID_SRC_B_GPCNT_CTL       0x130904    // Video B general purpose control
+#define  VID_SRC_C_GPCNT_CTL       0x130A04    // Video C general purpose control
+#define  VID_SRC_D_GPCNT_CTL       0x130B04    // Video D general purpose control
+#define  VID_SRC_E_GPCNT_CTL       0x130C04    // Video E general purpose control
+#define  VID_SRC_F_GPCNT_CTL       0x130D04    // Video F general purpose control
+#define  VID_SRC_I_GPCNT_CTL       0x130E04    // Video I general purpose control
+#define  VID_SRC_J_GPCNT_CTL       0x130F04    // Video J general purpose control
+
+//*****************************************************************************
+
+#define  VID_SRC_A_GPCNT           0x130808    // Video A general purpose counter
+#define  VID_SRC_B_GPCNT           0x130908    // Video B general purpose counter
+#define  VID_SRC_C_GPCNT           0x130A08    // Video C general purpose counter
+#define  VID_SRC_D_GPCNT           0x130B08    // Video D general purpose counter
+#define  VID_SRC_E_GPCNT           0x130C08    // Video E general purpose counter
+#define  VID_SRC_F_GPCNT           0x130D08    // Video F general purpose counter
+#define  VID_SRC_I_GPCNT           0x130E08    // Video I general purpose counter
+#define  VID_SRC_J_GPCNT           0x130F08    // Video J general purpose counter
+
+//*****************************************************************************
+
+#define  VID_SRC_A_DMA_CTL         0x13080C    // Video A DMA control
+#define  VID_SRC_B_DMA_CTL         0x13090C    // Video B DMA control
+#define  VID_SRC_C_DMA_CTL         0x130A0C    // Video C DMA control
+#define  VID_SRC_D_DMA_CTL         0x130B0C    // Video D DMA control
+#define  VID_SRC_E_DMA_CTL         0x130C0C    // Video E DMA control
+#define  VID_SRC_F_DMA_CTL         0x130D0C    // Video F DMA control
+#define  VID_SRC_I_DMA_CTL         0x130E0C    // Video I DMA control
+#define  VID_SRC_J_DMA_CTL         0x130F0C    // Video J DMA control
+
+#define  FLD_APB_RISC_EN           0x00000010
+#define  FLD_APB_FIFO_EN           0x00000001
+
+//*****************************************************************************
+
+#define  VID_SRC_A_FMT_CTL         0x130810    // Video A format control
+#define  VID_SRC_B_FMT_CTL         0x130910    // Video B format control
+#define  VID_SRC_C_FMT_CTL         0x130A10    // Video C format control
+#define  VID_SRC_D_FMT_CTL         0x130B10    // Video D format control
+#define  VID_SRC_E_FMT_CTL         0x130C10    // Video E format control
+#define  VID_SRC_F_FMT_CTL         0x130D10    // Video F format control
+#define  VID_SRC_I_FMT_CTL         0x130E10    // Video I format control
+#define  VID_SRC_J_FMT_CTL         0x130F10    // Video J format control
+
+//*****************************************************************************
+
+#define  VID_SRC_A_ACTIVE_CTL1     0x130814    // Video A active control      1
+#define  VID_SRC_B_ACTIVE_CTL1     0x130914    // Video B active control      1
+#define  VID_SRC_C_ACTIVE_CTL1     0x130A14    // Video C active control      1
+#define  VID_SRC_D_ACTIVE_CTL1     0x130B14    // Video D active control      1
+#define  VID_SRC_E_ACTIVE_CTL1     0x130C14    // Video E active control      1
+#define  VID_SRC_F_ACTIVE_CTL1     0x130D14    // Video F active control      1
+#define  VID_SRC_I_ACTIVE_CTL1     0x130E14    // Video I active control      1
+#define  VID_SRC_J_ACTIVE_CTL1     0x130F14    // Video J active control      1
+
+//*****************************************************************************
+
+#define  VID_SRC_A_ACTIVE_CTL2     0x130818    // Video A active control      2
+#define  VID_SRC_B_ACTIVE_CTL2     0x130918    // Video B active control      2
+#define  VID_SRC_C_ACTIVE_CTL2     0x130A18    // Video C active control      2
+#define  VID_SRC_D_ACTIVE_CTL2     0x130B18    // Video D active control      2
+#define  VID_SRC_E_ACTIVE_CTL2     0x130C18    // Video E active control      2
+#define  VID_SRC_F_ACTIVE_CTL2     0x130D18    // Video F active control      2
+#define  VID_SRC_I_ACTIVE_CTL2     0x130E18    // Video I active control      2
+#define  VID_SRC_J_ACTIVE_CTL2     0x130F18    // Video J active control      2
+
+//*****************************************************************************
+
+#define  VID_SRC_A_CDT_SZ          0x13081C    // Video A CDT size
+#define  VID_SRC_B_CDT_SZ          0x13091C    // Video B CDT size
+#define  VID_SRC_C_CDT_SZ          0x130A1C    // Video C CDT size
+#define  VID_SRC_D_CDT_SZ          0x130B1C    // Video D CDT size
+#define  VID_SRC_E_CDT_SZ          0x130C1C    // Video E CDT size
+#define  VID_SRC_F_CDT_SZ          0x130D1C    // Video F CDT size
+#define  VID_SRC_I_CDT_SZ          0x130E1C    // Video I CDT size
+#define  VID_SRC_J_CDT_SZ          0x130F1C    // Video J CDT size
+
+//*****************************************************************************
+// Audio I/F
+//*****************************************************************************
+#define  AUD_DST_A_DMA             0x140000    // Audio Int A DMA data port
+#define  AUD_SRC_A_DMA             0x140008    // Audio Int A DMA data port
+
+#define  AUD_A_GPCNT               0x140010    // Audio Int A gp counter
+#define  FLD_AUD_A_GP_CNT          0x0000FFFF
+
+#define  AUD_A_GPCNT_CTL           0x140014    // Audio Int A gp control
+
+#define  AUD_A_LNGTH               0x140018    // Audio Int A line length
+
+#define  AUD_A_CFG                 0x14001C    // Audio Int A configuration
+
+//*****************************************************************************
+#define  AUD_DST_B_DMA             0x140100    // Audio Int B DMA data port
+#define  AUD_SRC_B_DMA             0x140108    // Audio Int B DMA data port
+
+#define  AUD_B_GPCNT               0x140110    // Audio Int B gp counter
+#define  FLD_AUD_B_GP_CNT          0x0000FFFF
+
+#define  AUD_B_GPCNT_CTL           0x140114    // Audio Int B gp control
+
+#define  AUD_B_LNGTH               0x140118    // Audio Int B line length
+
+#define  AUD_B_CFG                 0x14011C    // Audio Int B configuration
+
+//*****************************************************************************
+#define  AUD_DST_C_DMA             0x140200    // Audio Int C DMA data port
+#define  AUD_SRC_C_DMA             0x140208    // Audio Int C DMA data port
+
+#define  AUD_C_GPCNT               0x140210    // Audio Int C gp counter
+#define  FLD_AUD_C_GP_CNT          0x0000FFFF
+
+#define  AUD_C_GPCNT_CTL           0x140214    // Audio Int C gp control
+
+#define  AUD_C_LNGTH               0x140218    // Audio Int C line length
+
+#define  AUD_C_CFG                 0x14021C    // Audio Int C configuration
+
+//*****************************************************************************
+#define  AUD_DST_D_DMA             0x140300    // Audio Int D DMA data port
+#define  AUD_SRC_D_DMA             0x140308    // Audio Int D DMA data port
+
+#define  AUD_D_GPCNT               0x140310    // Audio Int D gp counter
+#define  FLD_AUD_D_GP_CNT          0x0000FFFF
+
+#define  AUD_D_GPCNT_CTL           0x140314    // Audio Int D gp control
+
+#define  AUD_D_LNGTH               0x140318    // Audio Int D line length
+
+#define  AUD_D_CFG                 0x14031C    // Audio Int D configuration
+
+//*****************************************************************************
+#define  AUD_SRC_E_DMA             0x140400    // Audio Int E DMA data port
+
+#define  AUD_E_GPCNT               0x140410    // Audio Int E gp counter
+#define  FLD_AUD_E_GP_CNT          0x0000FFFF
+
+#define  AUD_E_GPCNT_CTL           0x140414    // Audio Int E gp control
+
+#define  AUD_E_CFG                 0x14041C    // Audio Int E configuration
+
+//*****************************************************************************
+
+#define  FLD_AUD_DST_LN_LNGTH      0x00000FFF
+
+#define  FLD_AUD_DST_PK_MODE       0x00004000
+
+#define  FLD_AUD_CLK_ENABLE        0x00000200
+
+#define  FLD_AUD_MASTER_MODE       0x00000002
+
+#define  FLD_AUD_SONY_MODE         0x00000001
+
+#define  FLD_AUD_CLK_SELECT_PLL_D  0x00001800
+
+#define  FLD_AUD_DST_ENABLE        0x00020000
+
+#define  FLD_AUD_SRC_ENABLE        0x00010000
+
+//*****************************************************************************
+#define  AUD_INT_DMA_CTL           0x140500    // Audio Int DMA control
+
+#define  FLD_AUD_SRC_E_RISC_EN     0x00008000
+#define  FLD_AUD_SRC_C_RISC_EN     0x00004000
+#define  FLD_AUD_SRC_B_RISC_EN     0x00002000
+#define  FLD_AUD_SRC_A_RISC_EN     0x00001000
+
+#define  FLD_AUD_DST_D_RISC_EN     0x00000800
+#define  FLD_AUD_DST_C_RISC_EN     0x00000400
+#define  FLD_AUD_DST_B_RISC_EN     0x00000200
+#define  FLD_AUD_DST_A_RISC_EN     0x00000100
+
+#define  FLD_AUD_SRC_E_FIFO_EN     0x00000080
+#define  FLD_AUD_SRC_C_FIFO_EN     0x00000040
+#define  FLD_AUD_SRC_B_FIFO_EN     0x00000020
+#define  FLD_AUD_SRC_A_FIFO_EN     0x00000010
+
+#define  FLD_AUD_DST_D_FIFO_EN     0x00000008
+#define  FLD_AUD_DST_C_FIFO_EN     0x00000004
+#define  FLD_AUD_DST_B_FIFO_EN     0x00000002
+#define  FLD_AUD_DST_A_FIFO_EN     0x00000001
+
+//*****************************************************************************
+//
+//                   Mobilygen Interface Registers
+//
+//*****************************************************************************
+// Mobilygen Interface A
+//*****************************************************************************
+#define  MB_IF_A_DMA               0x150000    // MBIF A DMA data port
+#define  MB_IF_A_GPCN              0x150008    // MBIF A GP counter
+#define  MB_IF_A_GPCN_CTRL         0x15000C
+#define  MB_IF_A_DMA_CTRL          0x150010
+#define  MB_IF_A_LENGTH            0x150014
+#define  MB_IF_A_HDMA_XFER_SZ      0x150018
+#define  MB_IF_A_HCMD              0x15001C
+#define  MB_IF_A_HCONFIG           0x150020
+#define  MB_IF_A_DATA_STRUCT_0     0x150024
+#define  MB_IF_A_DATA_STRUCT_1     0x150028
+#define  MB_IF_A_DATA_STRUCT_2     0x15002C
+#define  MB_IF_A_DATA_STRUCT_3     0x150030
+#define  MB_IF_A_DATA_STRUCT_4     0x150034
+#define  MB_IF_A_DATA_STRUCT_5     0x150038
+#define  MB_IF_A_DATA_STRUCT_6     0x15003C
+#define  MB_IF_A_DATA_STRUCT_7     0x150040
+#define  MB_IF_A_DATA_STRUCT_8     0x150044
+#define  MB_IF_A_DATA_STRUCT_9     0x150048
+#define  MB_IF_A_DATA_STRUCT_A     0x15004C
+#define  MB_IF_A_DATA_STRUCT_B     0x150050
+#define  MB_IF_A_DATA_STRUCT_C     0x150054
+#define  MB_IF_A_DATA_STRUCT_D     0x150058
+#define  MB_IF_A_DATA_STRUCT_E     0x15005C
+#define  MB_IF_A_DATA_STRUCT_F     0x150060
+//*****************************************************************************
+// Mobilygen Interface B
+//*****************************************************************************
+#define  MB_IF_B_DMA               0x160000    // MBIF A DMA data port
+#define  MB_IF_B_GPCN              0x160008    // MBIF A GP counter
+#define  MB_IF_B_GPCN_CTRL         0x16000C
+#define  MB_IF_B_DMA_CTRL          0x160010
+#define  MB_IF_B_LENGTH            0x160014
+#define  MB_IF_B_HDMA_XFER_SZ      0x160018
+#define  MB_IF_B_HCMD              0x16001C
+#define  MB_IF_B_HCONFIG           0x160020
+#define  MB_IF_B_DATA_STRUCT_0     0x160024
+#define  MB_IF_B_DATA_STRUCT_1     0x160028
+#define  MB_IF_B_DATA_STRUCT_2     0x16002C
+#define  MB_IF_B_DATA_STRUCT_3     0x160030
+#define  MB_IF_B_DATA_STRUCT_4     0x160034
+#define  MB_IF_B_DATA_STRUCT_5     0x160038
+#define  MB_IF_B_DATA_STRUCT_6     0x16003C
+#define  MB_IF_B_DATA_STRUCT_7     0x160040
+#define  MB_IF_B_DATA_STRUCT_8     0x160044
+#define  MB_IF_B_DATA_STRUCT_9     0x160048
+#define  MB_IF_B_DATA_STRUCT_A     0x16004C
+#define  MB_IF_B_DATA_STRUCT_B     0x160050
+#define  MB_IF_B_DATA_STRUCT_C     0x160054
+#define  MB_IF_B_DATA_STRUCT_D     0x160058
+#define  MB_IF_B_DATA_STRUCT_E     0x16005C
+#define  MB_IF_B_DATA_STRUCT_F     0x160060
+
+// MB_DMA_CTRL
+#define  FLD_MB_IF_RISC_EN         0x00000010
+#define  FLD_MB_IF_FIFO_EN         0x00000001
+
+// MB_LENGTH
+#define  FLD_MB_IF_LN_LNGTH        0x00000FFF
+
+// MB_HCMD register
+#define  FLD_MB_HCMD_H_GO          0x80000000
+#define  FLD_MB_HCMD_H_BUSY        0x40000000
+#define  FLD_MB_HCMD_H_DMA_HOLD    0x10000000
+#define  FLD_MB_HCMD_H_DMA_BUSY    0x08000000
+#define  FLD_MB_HCMD_H_DMA_TYPE    0x04000000
+#define  FLD_MB_HCMD_H_DMA_XACT    0x02000000
+#define  FLD_MB_HCMD_H_RW_N        0x01000000
+#define  FLD_MB_HCMD_H_ADDR        0x00FF0000
+#define  FLD_MB_HCMD_H_DATA        0x0000FFFF
+
+//*****************************************************************************
+// I2C #1
+//*****************************************************************************
+#define  I2C1_ADDR                 0x180000    // I2C #1 address
+#define  FLD_I2C_DADDR             0xfe000000  // RW [31:25] I2C Device Address
+                                                // RO [24] reserved
+//*****************************************************************************
+#define  FLD_I2C_SADDR             0x00FFFFFF  // RW [23:0]  I2C Sub-address
+
+//*****************************************************************************
+#define  I2C1_WDATA                0x180004    // I2C #1 write data
+#define  FLD_I2C_WDATA             0xFFFFFFFF  // RW [31:0]
+
+//*****************************************************************************
+#define  I2C1_CTRL                 0x180008    // I2C #1 control
+#define  FLD_I2C_PERIOD            0xFF000000  // RW [31:24]
+#define  FLD_I2C_SCL_IN            0x00200000  // RW [21]
+#define  FLD_I2C_SDA_IN            0x00100000  // RW [20]
+                                                // RO [19:18] reserved
+#define  FLD_I2C_SCL_OUT           0x00020000  // RW [17]
+#define  FLD_I2C_SDA_OUT           0x00010000  // RW [16]
+                                                // RO [15] reserved
+#define  FLD_I2C_DATA_LEN          0x00007000  // RW [14:12]
+#define  FLD_I2C_SADDR_INC         0x00000800  // RW [11]
+                                                // RO [10:9] reserved
+#define  FLD_I2C_SADDR_LEN         0x00000300  // RW [9:8]
+                                                // RO [7:6] reserved
+#define  FLD_I2C_SOFT              0x00000020  // RW [5]
+#define  FLD_I2C_NOSTOP            0x00000010  // RW [4]
+#define  FLD_I2C_EXTEND            0x00000008  // RW [3]
+#define  FLD_I2C_SYNC              0x00000004  // RW [2]
+#define  FLD_I2C_READ_SA           0x00000002  // RW [1]
+#define  FLD_I2C_READ_WRN          0x00000001  // RW [0]
+
+//*****************************************************************************
+#define  I2C1_RDATA                0x18000C    // I2C #1 read data
+#define  FLD_I2C_RDATA             0xFFFFFFFF  // RO [31:0]
+
+//*****************************************************************************
+#define  I2C1_STAT                 0x180010    // I2C #1 status
+#define  FLD_I2C_XFER_IN_PROG      0x00000002  // RO [1]
+#define  FLD_I2C_RACK              0x00000001  // RO [0]
+
+//*****************************************************************************
+// I2C #2
+//*****************************************************************************
+#define  I2C2_ADDR                 0x190000    // I2C #2 address
+
+//*****************************************************************************
+#define  I2C2_WDATA                0x190004    // I2C #2 write data
+
+//*****************************************************************************
+#define  I2C2_CTRL                 0x190008    // I2C #2 control
+
+//*****************************************************************************
+#define  I2C2_RDATA                0x19000C    // I2C #2 read data
+
+//*****************************************************************************
+#define  I2C2_STAT                 0x190010    // I2C #2 status
+
+//*****************************************************************************
+// I2C #3
+//*****************************************************************************
+#define  I2C3_ADDR                 0x1A0000    // I2C #3 address
+
+//*****************************************************************************
+#define  I2C3_WDATA                0x1A0004    // I2C #3 write data
+
+//*****************************************************************************
+#define  I2C3_CTRL                 0x1A0008    // I2C #3 control
+
+//*****************************************************************************
+#define  I2C3_RDATA                0x1A000C    // I2C #3 read data
+
+//*****************************************************************************
+#define  I2C3_STAT                 0x1A0010    // I2C #3 status
+
+//*****************************************************************************
+// UART
+//*****************************************************************************
+#define  UART_CTL                  0x1B0000    // UART Control Register
+#define  FLD_LOOP_BACK_EN          (1 << 7)    // RW field - default 0
+#define  FLD_RX_TRG_SZ             (3 << 2)    // RW field - default 0
+#define  FLD_RX_EN                 (1 << 1)    // RW field - default 0
+#define  FLD_TX_EN                 (1 << 0)    // RW field - default 0
+
+//*****************************************************************************
+#define  UART_BRD                  0x1B0004    // UART Baud Rate Divisor
+#define  FLD_BRD                   0x0000FFFF  // RW field - default 0x197
+
+//*****************************************************************************
+#define  UART_DBUF                 0x1B0008    // UART Tx/Rx Data BuFFer
+#define  FLD_DB                    0xFFFFFFFF  // RW field - default 0
+
+//*****************************************************************************
+#define  UART_ISR                  0x1B000C    // UART Interrupt Status
+#define  FLD_RXD_TIMEOUT_EN        (1 << 7)    // RW field - default 0
+#define  FLD_FRM_ERR_EN            (1 << 6)    // RW field - default 0
+#define  FLD_RXD_RDY_EN            (1 << 5)    // RW field - default 0
+#define  FLD_TXD_EMPTY_EN          (1 << 4)    // RW field - default 0
+#define  FLD_RXD_OVERFLOW          (1 << 3)    // RW field - default 0
+#define  FLD_FRM_ERR               (1 << 2)    // RW field - default 0
+#define  FLD_RXD_RDY               (1 << 1)    // RW field - default 0
+#define  FLD_TXD_EMPTY             (1 << 0)    // RW field - default 0
+
+//*****************************************************************************
+#define  UART_CNT                  0x1B0010    // UART Tx/Rx FIFO Byte Count
+#define  FLD_TXD_CNT               (0x1F << 8) // RW field - default 0
+#define  FLD_RXD_CNT               (0x1F << 0) // RW field - default 0
+
+//*****************************************************************************
+// Motion Detection
+#define  MD_CH0_GRID_BLOCK_YCNT    0x170014
+#define  MD_CH1_GRID_BLOCK_YCNT    0x170094
+#define  MD_CH2_GRID_BLOCK_YCNT    0x170114
+#define  MD_CH3_GRID_BLOCK_YCNT    0x170194
+#define  MD_CH4_GRID_BLOCK_YCNT    0x170214
+#define  MD_CH5_GRID_BLOCK_YCNT    0x170294
+#define  MD_CH6_GRID_BLOCK_YCNT    0x170314
+#define  MD_CH7_GRID_BLOCK_YCNT    0x170394
+
+#define PIXEL_FRMT_422    4
+#define PIXEL_FRMT_411    5
+#define PIXEL_FRMT_Y8     6
+
+#define PIXEL_ENGINE_VIP1 0
+#define PIXEL_ENGINE_VIP2 1
+
+#endif //Athena_REGISTERS
diff --git a/drivers/staging/cx25821/cx25821-sram.h b/drivers/staging/cx25821/cx25821-sram.h
new file mode 100644 (file)
index 0000000..bd677ee
--- /dev/null
@@ -0,0 +1,261 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __ATHENA_SRAM_H__
+#define __ATHENA_SRAM_H__
+
+//#define RX_SRAM_START_SIZE        = 0;  //  Start of reserved SRAM
+#define VID_CMDS_SIZE             80   //  Video CMDS size in bytes
+#define AUDIO_CMDS_SIZE           80   //  AUDIO CMDS size in bytes
+#define MBIF_CMDS_SIZE            80   //  MBIF  CMDS size in bytes
+
+//#define RX_SRAM_POOL_START_SIZE   = 0;  //  Start of useable RX SRAM for buffers
+#define VID_IQ_SIZE               64   //  VID instruction queue size in bytes
+#define MBIF_IQ_SIZE              64
+#define AUDIO_IQ_SIZE             64   //  AUD instruction queue size in bytes
+
+#define VID_CDT_SIZE              64   //  VID cluster descriptor table size in bytes
+#define MBIF_CDT_SIZE             64   //  MBIF/HBI cluster descriptor table size in bytes
+#define AUDIO_CDT_SIZE            48   //  AUD cluster descriptor table size in bytes
+
+//#define RX_SRAM_POOL_FREE_SIZE    = 16; //  Start of available RX SRAM
+//#define RX_SRAM_END_SIZE          = 0;  //  End of RX SRAM
+
+//#define TX_SRAM_POOL_START_SIZE   = 0;  //  Start of transmit pool SRAM
+//#define MSI_DATA_SIZE             = 64; //  Reserved (MSI Data, RISC working stora
+
+#define VID_CLUSTER_SIZE          1440 //  VID cluster data line
+#define AUDIO_CLUSTER_SIZE        128  //  AUDIO cluster data line
+#define MBIF_CLUSTER_SIZE         1440 //  MBIF/HBI cluster data line
+
+//#define TX_SRAM_POOL_FREE_SIZE    = 704;    //  Start of available TX SRAM
+//#define TX_SRAM_END_SIZE          = 0;      //  End of TX SRAM
+
+// Receive SRAM
+#define RX_SRAM_START             0x10000
+#define VID_A_DOWN_CMDS           0x10000
+#define VID_B_DOWN_CMDS           0x10050
+#define VID_C_DOWN_CMDS           0x100A0
+#define VID_D_DOWN_CMDS           0x100F0
+#define VID_E_DOWN_CMDS           0x10140
+#define VID_F_DOWN_CMDS           0x10190
+#define VID_G_DOWN_CMDS           0x101E0
+#define VID_H_DOWN_CMDS           0x10230
+#define VID_A_UP_CMDS             0x10280
+#define VID_B_UP_CMDS             0x102D0
+#define VID_C_UP_CMDS             0x10320
+#define VID_D_UP_CMDS             0x10370
+#define VID_E_UP_CMDS             0x103C0
+#define VID_F_UP_CMDS             0x10410
+#define VID_I_UP_CMDS             0x10460
+#define VID_J_UP_CMDS             0x104B0
+#define AUD_A_DOWN_CMDS           0x10500
+#define AUD_B_DOWN_CMDS           0x10550
+#define AUD_C_DOWN_CMDS           0x105A0
+#define AUD_D_DOWN_CMDS           0x105F0
+#define AUD_A_UP_CMDS             0x10640
+#define AUD_B_UP_CMDS             0x10690
+#define AUD_C_UP_CMDS             0x106E0
+#define AUD_E_UP_CMDS             0x10730
+#define MBIF_A_DOWN_CMDS          0x10780
+#define MBIF_B_DOWN_CMDS          0x107D0
+#define DMA_SCRATCH_PAD           0x10820      // Scratch pad area from 0x10820 to 0x10B40
+
+//#define RX_SRAM_POOL_START        = 0x105B0;
+
+#define VID_A_IQ                  0x11000
+#define VID_B_IQ                  0x11040
+#define VID_C_IQ                  0x11080
+#define VID_D_IQ                  0x110C0
+#define VID_E_IQ                  0x11100
+#define VID_F_IQ                  0x11140
+#define VID_G_IQ                  0x11180
+#define VID_H_IQ                  0x111C0
+#define VID_I_IQ                  0x11200
+#define VID_J_IQ                  0x11240
+#define AUD_A_IQ                  0x11280
+#define AUD_B_IQ                  0x112C0
+#define AUD_C_IQ                  0x11300
+#define AUD_D_IQ                  0x11340
+#define AUD_E_IQ                  0x11380
+#define MBIF_A_IQ                 0x11000
+#define MBIF_B_IQ                 0x110C0
+
+#define VID_A_CDT                 0x10C00
+#define VID_B_CDT                 0x10C40
+#define VID_C_CDT                 0x10C80
+#define VID_D_CDT                 0x10CC0
+#define VID_E_CDT                 0x10D00
+#define VID_F_CDT                 0x10D40
+#define VID_G_CDT                 0x10D80
+#define VID_H_CDT                 0x10DC0
+#define VID_I_CDT                 0x10E00
+#define VID_J_CDT                 0x10E40
+#define AUD_A_CDT                 0x10E80
+#define AUD_B_CDT                 0x10EB0
+#define AUD_C_CDT                 0x10EE0
+#define AUD_D_CDT                 0x10F10
+#define AUD_E_CDT                 0x10F40
+#define MBIF_A_CDT                0x10C00
+#define MBIF_B_CDT                0x10CC0
+
+// Cluster Buffer for RX
+#define VID_A_UP_CLUSTER_1        0x11400
+#define VID_A_UP_CLUSTER_2        0x119A0
+#define VID_A_UP_CLUSTER_3        0x11F40
+#define VID_A_UP_CLUSTER_4        0x124E0
+
+#define VID_B_UP_CLUSTER_1        0x12A80
+#define VID_B_UP_CLUSTER_2        0x13020
+#define VID_B_UP_CLUSTER_3        0x135C0
+#define VID_B_UP_CLUSTER_4        0x13B60
+
+#define VID_C_UP_CLUSTER_1        0x14100
+#define VID_C_UP_CLUSTER_2        0x146A0
+#define VID_C_UP_CLUSTER_3        0x14C40
+#define VID_C_UP_CLUSTER_4        0x151E0
+
+#define VID_D_UP_CLUSTER_1        0x15780
+#define VID_D_UP_CLUSTER_2        0x15D20
+#define VID_D_UP_CLUSTER_3        0x162C0
+#define VID_D_UP_CLUSTER_4        0x16860
+
+#define VID_E_UP_CLUSTER_1        0x16E00
+#define VID_E_UP_CLUSTER_2        0x173A0
+#define VID_E_UP_CLUSTER_3        0x17940
+#define VID_E_UP_CLUSTER_4        0x17EE0
+
+#define VID_F_UP_CLUSTER_1        0x18480
+#define VID_F_UP_CLUSTER_2        0x18A20
+#define VID_F_UP_CLUSTER_3        0x18FC0
+#define VID_F_UP_CLUSTER_4        0x19560
+
+#define VID_I_UP_CLUSTER_1        0x19B00
+#define VID_I_UP_CLUSTER_2        0x1A0A0
+#define VID_I_UP_CLUSTER_3        0x1A640
+#define VID_I_UP_CLUSTER_4        0x1ABE0
+
+#define VID_J_UP_CLUSTER_1        0x1B180
+#define VID_J_UP_CLUSTER_2        0x1B720
+#define VID_J_UP_CLUSTER_3        0x1BCC0
+#define VID_J_UP_CLUSTER_4        0x1C260
+
+#define AUD_A_UP_CLUSTER_1        0x1C800
+#define AUD_A_UP_CLUSTER_2        0x1C880
+#define AUD_A_UP_CLUSTER_3        0x1C900
+
+#define AUD_B_UP_CLUSTER_1        0x1C980
+#define AUD_B_UP_CLUSTER_2        0x1CA00
+#define AUD_B_UP_CLUSTER_3        0x1CA80
+
+#define AUD_C_UP_CLUSTER_1        0x1CB00
+#define AUD_C_UP_CLUSTER_2        0x1CB80
+#define AUD_C_UP_CLUSTER_3        0x1CC00
+
+#define AUD_E_UP_CLUSTER_1        0x1CC80
+#define AUD_E_UP_CLUSTER_2        0x1CD00
+#define AUD_E_UP_CLUSTER_3        0x1CD80
+
+#define RX_SRAM_POOL_FREE         0x1CE00
+#define RX_SRAM_END               0x1D000
+
+// Free Receive SRAM    144 Bytes
+
+// Transmit SRAM
+#define TX_SRAM_POOL_START        0x00000
+
+#define VID_A_DOWN_CLUSTER_1      0x00040
+#define VID_A_DOWN_CLUSTER_2      0x005E0
+#define VID_A_DOWN_CLUSTER_3      0x00B80
+#define VID_A_DOWN_CLUSTER_4      0x01120
+
+#define VID_B_DOWN_CLUSTER_1      0x016C0
+#define VID_B_DOWN_CLUSTER_2      0x01C60
+#define VID_B_DOWN_CLUSTER_3      0x02200
+#define VID_B_DOWN_CLUSTER_4      0x027A0
+
+#define VID_C_DOWN_CLUSTER_1      0x02D40
+#define VID_C_DOWN_CLUSTER_2      0x032E0
+#define VID_C_DOWN_CLUSTER_3      0x03880
+#define VID_C_DOWN_CLUSTER_4      0x03E20
+
+#define VID_D_DOWN_CLUSTER_1      0x043C0
+#define VID_D_DOWN_CLUSTER_2      0x04960
+#define VID_D_DOWN_CLUSTER_3      0x04F00
+#define VID_D_DOWN_CLUSTER_4      0x054A0
+
+#define VID_E_DOWN_CLUSTER_1      0x05a40
+#define VID_E_DOWN_CLUSTER_2      0x05FE0
+#define VID_E_DOWN_CLUSTER_3      0x06580
+#define VID_E_DOWN_CLUSTER_4      0x06B20
+
+#define VID_F_DOWN_CLUSTER_1      0x070C0
+#define VID_F_DOWN_CLUSTER_2      0x07660
+#define VID_F_DOWN_CLUSTER_3      0x07C00
+#define VID_F_DOWN_CLUSTER_4      0x081A0
+
+#define VID_G_DOWN_CLUSTER_1      0x08740
+#define VID_G_DOWN_CLUSTER_2      0x08CE0
+#define VID_G_DOWN_CLUSTER_3      0x09280
+#define VID_G_DOWN_CLUSTER_4      0x09820
+
+#define VID_H_DOWN_CLUSTER_1      0x09DC0
+#define VID_H_DOWN_CLUSTER_2      0x0A360
+#define VID_H_DOWN_CLUSTER_3      0x0A900
+#define VID_H_DOWN_CLUSTER_4      0x0AEA0
+
+#define AUD_A_DOWN_CLUSTER_1      0x0B500
+#define AUD_A_DOWN_CLUSTER_2      0x0B580
+#define AUD_A_DOWN_CLUSTER_3      0x0B600
+
+#define AUD_B_DOWN_CLUSTER_1      0x0B680
+#define AUD_B_DOWN_CLUSTER_2      0x0B700
+#define AUD_B_DOWN_CLUSTER_3      0x0B780
+
+#define AUD_C_DOWN_CLUSTER_1      0x0B800
+#define AUD_C_DOWN_CLUSTER_2      0x0B880
+#define AUD_C_DOWN_CLUSTER_3      0x0B900
+
+#define AUD_D_DOWN_CLUSTER_1      0x0B980
+#define AUD_D_DOWN_CLUSTER_2      0x0BA00
+#define AUD_D_DOWN_CLUSTER_3      0x0BA80
+
+#define TX_SRAM_POOL_FREE         0x0BB00
+#define TX_SRAM_END               0x0C000
+
+#define BYTES_TO_DWORDS(bcount) ((bcount) >> 2)
+#define BYTES_TO_QWORDS(bcount) ((bcount) >> 3)
+#define BYTES_TO_OWORDS(bcount) ((bcount) >> 4)
+
+#define VID_IQ_SIZE_DW             BYTES_TO_DWORDS(VID_IQ_SIZE)
+#define VID_CDT_SIZE_QW            BYTES_TO_QWORDS(VID_CDT_SIZE)
+#define VID_CLUSTER_SIZE_OW        BYTES_TO_OWORDS(VID_CLUSTER_SIZE)
+
+#define AUDIO_IQ_SIZE_DW           BYTES_TO_DWORDS(AUDIO_IQ_SIZE)
+#define AUDIO_CDT_SIZE_QW          BYTES_TO_QWORDS(AUDIO_CDT_SIZE)
+#define AUDIO_CLUSTER_SIZE_QW      BYTES_TO_QWORDS(AUDIO_CLUSTER_SIZE)
+
+#define MBIF_IQ_SIZE_DW            BYTES_TO_DWORDS(MBIF_IQ_SIZE)
+#define MBIF_CDT_SIZE_QW           BYTES_TO_QWORDS(MBIF_CDT_SIZE)
+#define MBIF_CLUSTER_SIZE_OW       BYTES_TO_OWORDS(MBIF_CLUSTER_SIZE)
+
+#endif
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
new file mode 100644 (file)
index 0000000..c8905e0
--- /dev/null
@@ -0,0 +1,835 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+#include "cx25821-video-upstream-ch2.h"
+
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/syscalls.h>
+#include <linux/file.h>
+#include <linux/fcntl.h>
+#include <asm/uaccess.h>
+
+MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
+MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
+MODULE_LICENSE("GPL");
+
+static int _intr_msk =
+    FLD_VID_SRC_RISC1 | FLD_VID_SRC_UF | FLD_VID_SRC_SYNC | FLD_VID_SRC_OPC_ERR;
+
+static __le32 *cx25821_update_riscprogram_ch2(struct cx25821_dev *dev,
+                                             __le32 * rp, unsigned int offset,
+                                             unsigned int bpl, u32 sync_line,
+                                             unsigned int lines,
+                                             int fifo_enable, int field_type)
+{
+       unsigned int line, i;
+       int dist_betwn_starts = bpl * 2;
+
+       *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+
+       if (USE_RISC_NOOP_VIDEO) {
+               for (i = 0; i < NUM_NO_OPS; i++) {
+                       *(rp++) = cpu_to_le32(RISC_NOOP);
+               }
+       }
+
+       /* scan lines */
+       for (line = 0; line < lines; line++) {
+               *(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
+               *(rp++) = cpu_to_le32(dev->_data_buf_phys_addr_ch2 + offset);
+               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+
+               if ((lines <= NTSC_FIELD_HEIGHT)
+                   || (line < (NTSC_FIELD_HEIGHT - 1))
+                   || !(dev->_isNTSC_ch2)) {
+                       offset += dist_betwn_starts;
+               }
+       }
+
+       return rp;
+}
+
+static __le32 *cx25821_risc_field_upstream_ch2(struct cx25821_dev *dev,
+                                              __le32 * rp,
+                                              dma_addr_t databuf_phys_addr,
+                                              unsigned int offset,
+                                              u32 sync_line, unsigned int bpl,
+                                              unsigned int lines,
+                                              int fifo_enable, int field_type)
+{
+       unsigned int line, i;
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[dev->_channel2_upstream_select];
+       int dist_betwn_starts = bpl * 2;
+
+       /* sync instruction */
+       if (sync_line != NO_SYNC_LINE) {
+               *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+       }
+
+       if (USE_RISC_NOOP_VIDEO) {
+               for (i = 0; i < NUM_NO_OPS; i++) {
+                       *(rp++) = cpu_to_le32(RISC_NOOP);
+               }
+       }
+
+       /* scan lines */
+       for (line = 0; line < lines; line++) {
+               *(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
+               *(rp++) = cpu_to_le32(databuf_phys_addr + offset);
+               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+
+               if ((lines <= NTSC_FIELD_HEIGHT)
+                   || (line < (NTSC_FIELD_HEIGHT - 1))
+                   || !(dev->_isNTSC_ch2)) {
+                       offset += dist_betwn_starts;
+               }
+
+               // check if we need to enable the FIFO after the first 4 lines
+               // For the upstream video channel, the risc engine will enable the FIFO.
+               if (fifo_enable && line == 3) {
+                       *(rp++) = RISC_WRITECR;
+                       *(rp++) = sram_ch->dma_ctl;
+                       *(rp++) = FLD_VID_FIFO_EN;
+                       *(rp++) = 0x00000001;
+               }
+       }
+
+       return rp;
+}
+
+int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,
+                                    struct pci_dev *pci,
+                                    unsigned int top_offset, unsigned int bpl,
+                                    unsigned int lines)
+{
+       __le32 *rp;
+       int fifo_enable = 0;
+       int singlefield_lines = lines >> 1;     //get line count for single field
+       int odd_num_lines = singlefield_lines;
+       int frame = 0;
+       int frame_size = 0;
+       int databuf_offset = 0;
+       int risc_program_size = 0;
+       int risc_flag = RISC_CNT_RESET;
+       unsigned int bottom_offset = bpl;
+       dma_addr_t risc_phys_jump_addr;
+
+       if (dev->_isNTSC_ch2) {
+               odd_num_lines = singlefield_lines + 1;
+               risc_program_size = FRAME1_VID_PROG_SIZE;
+               frame_size =
+                   (bpl ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :
+                   FRAME_SIZE_NTSC_Y422;
+       } else {
+               risc_program_size = PAL_VID_PROG_SIZE;
+               frame_size =
+                   (bpl ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
+       }
+
+       /* Virtual address of Risc buffer program */
+       rp = dev->_dma_virt_addr_ch2;
+
+       for (frame = 0; frame < NUM_FRAMES; frame++) {
+               databuf_offset = frame_size * frame;
+
+               if (UNSET != top_offset) {
+                       fifo_enable = (frame == 0) ? FIFO_ENABLE : FIFO_DISABLE;
+                       rp = cx25821_risc_field_upstream_ch2(dev, rp,
+                                                            dev->
+                                                            _data_buf_phys_addr_ch2
+                                                            + databuf_offset,
+                                                            top_offset, 0, bpl,
+                                                            odd_num_lines,
+                                                            fifo_enable,
+                                                            ODD_FIELD);
+               }
+
+               fifo_enable = FIFO_DISABLE;
+
+               //Even field
+               rp = cx25821_risc_field_upstream_ch2(dev, rp,
+                                                    dev->
+                                                    _data_buf_phys_addr_ch2 +
+                                                    databuf_offset,
+                                                    bottom_offset, 0x200, bpl,
+                                                    singlefield_lines,
+                                                    fifo_enable, EVEN_FIELD);
+
+               if (frame == 0) {
+                       risc_flag = RISC_CNT_RESET;
+                       risc_phys_jump_addr =
+                           dev->_dma_phys_start_addr_ch2 + risc_program_size;
+               } else {
+                       risc_flag = RISC_CNT_INC;
+                       risc_phys_jump_addr = dev->_dma_phys_start_addr_ch2;
+               }
+
+               // Loop to 2ndFrameRISC or to Start of Risc program & generate IRQ
+               *(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | risc_flag);
+               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+               *(rp++) = cpu_to_le32(0);
+       }
+
+       return 0;
+}
+
+void cx25821_stop_upstream_video_ch2(struct cx25821_dev *dev)
+{
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[VID_UPSTREAM_SRAM_CHANNEL_J];
+       u32 tmp = 0;
+
+       if (!dev->_is_running_ch2) {
+               printk
+                   ("cx25821: No video file is currently running so return!\n");
+               return;
+       }
+       //Disable RISC interrupts
+       tmp = cx_read(sram_ch->int_msk);
+       cx_write(sram_ch->int_msk, tmp & ~_intr_msk);
+
+       //Turn OFF risc and fifo
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_write(sram_ch->dma_ctl, tmp & ~(FLD_VID_FIFO_EN | FLD_VID_RISC_EN));
+
+       //Clear data buffer memory
+       if (dev->_data_buf_virt_addr_ch2)
+               memset(dev->_data_buf_virt_addr_ch2, 0,
+                      dev->_data_buf_size_ch2);
+
+       dev->_is_running_ch2 = 0;
+       dev->_is_first_frame_ch2 = 0;
+       dev->_frame_count_ch2 = 0;
+       dev->_file_status_ch2 = END_OF_FILE;
+
+       if (dev->_irq_queues_ch2) {
+               kfree(dev->_irq_queues_ch2);
+               dev->_irq_queues_ch2 = NULL;
+       }
+
+       if (dev->_filename_ch2 != NULL)
+               kfree(dev->_filename_ch2);
+
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);
+}
+
+void cx25821_free_mem_upstream_ch2(struct cx25821_dev *dev)
+{
+       if (dev->_is_running_ch2) {
+               cx25821_stop_upstream_video_ch2(dev);
+       }
+
+       if (dev->_dma_virt_addr_ch2) {
+               pci_free_consistent(dev->pci, dev->_risc_size_ch2,
+                                   dev->_dma_virt_addr_ch2,
+                                   dev->_dma_phys_addr_ch2);
+               dev->_dma_virt_addr_ch2 = NULL;
+       }
+
+       if (dev->_data_buf_virt_addr_ch2) {
+               pci_free_consistent(dev->pci, dev->_data_buf_size_ch2,
+                                   dev->_data_buf_virt_addr_ch2,
+                                   dev->_data_buf_phys_addr_ch2);
+               dev->_data_buf_virt_addr_ch2 = NULL;
+       }
+}
+
+int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int frame_index_temp = dev->_frame_index_ch2;
+       int i = 0;
+       int line_size =
+           (dev->_pixel_format_ch2 ==
+            PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;
+       int frame_size = 0;
+       int frame_offset = 0;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t file_offset;
+       loff_t pos;
+       mm_segment_t old_fs;
+
+       if (dev->_file_status_ch2 == END_OF_FILE)
+               return 0;
+
+       if (dev->_isNTSC_ch2) {
+               frame_size =
+                   (line_size ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :
+                   FRAME_SIZE_NTSC_Y422;
+       } else {
+               frame_size =
+                   (line_size ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
+       }
+
+       frame_offset = (frame_index_temp > 0) ? frame_size : 0;
+       file_offset = dev->_frame_count_ch2 * frame_size;
+
+       myfile = filp_open(dev->_filename_ch2, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_filename_ch2, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk("%s: File has no READ operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (i = 0; i < dev->_lines_count_ch2; i++) {
+                       pos = file_offset;
+
+                       vfs_read_retval =
+                           vfs_read(myfile, mybuf, line_size, &pos);
+
+                       if (vfs_read_retval > 0 && vfs_read_retval == line_size
+                           && dev->_data_buf_virt_addr_ch2 != NULL) {
+                               memcpy((void *)(dev->_data_buf_virt_addr_ch2 +
+                                               frame_offset / 4), mybuf,
+                                      vfs_read_retval);
+                       }
+
+                       file_offset += vfs_read_retval;
+                       frame_offset += vfs_read_retval;
+
+                       if (vfs_read_retval < line_size) {
+                               printk(KERN_INFO
+                                      "Done: exit %s() since no more bytes to read from Video file.\n",
+                                      __func__);
+                               break;
+                       }
+               }
+
+               if (i > 0)
+                       dev->_frame_count_ch2++;
+
+               dev->_file_status_ch2 =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+static void cx25821_vidups_handler_ch2(struct work_struct *work)
+{
+       struct cx25821_dev *dev =
+           container_of(work, struct cx25821_dev, _irq_work_entry_ch2);
+
+       if (!dev) {
+               printk("ERROR %s(): since container_of(work_struct) FAILED! \n",
+                      __func__);
+               return;
+       }
+
+       cx25821_get_frame_ch2(dev,
+                             &dev->sram_channels[dev->
+                                                 _channel2_upstream_select]);
+}
+
+int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int i = 0, j = 0;
+       int line_size =
+           (dev->_pixel_format_ch2 ==
+            PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t pos;
+       loff_t offset = (unsigned long)0;
+       mm_segment_t old_fs;
+
+       myfile = filp_open(dev->_filename_ch2, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_filename_ch2, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk
+                           ("%s: File has no READ operations registered!  Returning.",
+                            __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (j = 0; j < NUM_FRAMES; j++) {
+                       for (i = 0; i < dev->_lines_count_ch2; i++) {
+                               pos = offset;
+
+                               vfs_read_retval =
+                                   vfs_read(myfile, mybuf, line_size, &pos);
+
+                               if (vfs_read_retval > 0
+                                   && vfs_read_retval == line_size
+                                   && dev->_data_buf_virt_addr_ch2 != NULL) {
+                                       memcpy((void *)(dev->
+                                                       _data_buf_virt_addr_ch2
+                                                       + offset / 4), mybuf,
+                                              vfs_read_retval);
+                               }
+
+                               offset += vfs_read_retval;
+
+                               if (vfs_read_retval < line_size) {
+                                       printk(KERN_INFO
+                                              "Done: exit %s() since no more bytes to read from Video file.\n",
+                                              __func__);
+                                       break;
+                               }
+                       }
+
+                       if (i > 0)
+                               dev->_frame_count_ch2++;
+
+                       if (vfs_read_retval < line_size) {
+                               break;
+                       }
+               }
+
+               dev->_file_status_ch2 =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               myfile->f_pos = 0;
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,
+                                              struct sram_channel *sram_ch,
+                                              int bpl)
+{
+       int ret = 0;
+       dma_addr_t dma_addr;
+       dma_addr_t data_dma_addr;
+
+       if (dev->_dma_virt_addr_ch2 != NULL) {
+               pci_free_consistent(dev->pci, dev->upstream_riscbuf_size_ch2,
+                                   dev->_dma_virt_addr_ch2,
+                                   dev->_dma_phys_addr_ch2);
+       }
+
+       dev->_dma_virt_addr_ch2 =
+           pci_alloc_consistent(dev->pci, dev->upstream_riscbuf_size_ch2,
+                                &dma_addr);
+       dev->_dma_virt_start_addr_ch2 = dev->_dma_virt_addr_ch2;
+       dev->_dma_phys_start_addr_ch2 = dma_addr;
+       dev->_dma_phys_addr_ch2 = dma_addr;
+       dev->_risc_size_ch2 = dev->upstream_riscbuf_size_ch2;
+
+       if (!dev->_dma_virt_addr_ch2) {
+               printk
+                   ("cx25821: FAILED to allocate memory for Risc buffer! Returning.\n");
+               return -ENOMEM;
+       }
+
+       //Iniitize at this address until n bytes to 0
+       memset(dev->_dma_virt_addr_ch2, 0, dev->_risc_size_ch2);
+
+       if (dev->_data_buf_virt_addr_ch2 != NULL) {
+               pci_free_consistent(dev->pci, dev->upstream_databuf_size_ch2,
+                                   dev->_data_buf_virt_addr_ch2,
+                                   dev->_data_buf_phys_addr_ch2);
+       }
+       //For Video Data buffer allocation
+       dev->_data_buf_virt_addr_ch2 =
+           pci_alloc_consistent(dev->pci, dev->upstream_databuf_size_ch2,
+                                &data_dma_addr);
+       dev->_data_buf_phys_addr_ch2 = data_dma_addr;
+       dev->_data_buf_size_ch2 = dev->upstream_databuf_size_ch2;
+
+       if (!dev->_data_buf_virt_addr_ch2) {
+               printk
+                   ("cx25821: FAILED to allocate memory for data buffer! Returning.\n");
+               return -ENOMEM;
+       }
+
+       //Initialize at this address until n bytes to 0
+       memset(dev->_data_buf_virt_addr_ch2, 0, dev->_data_buf_size_ch2);
+
+       ret = cx25821_openfile_ch2(dev, sram_ch);
+       if (ret < 0)
+               return ret;
+
+       //Creating RISC programs
+       ret =
+           cx25821_risc_buffer_upstream_ch2(dev, dev->pci, 0, bpl,
+                                            dev->_lines_count_ch2);
+       if (ret < 0) {
+               printk(KERN_INFO
+                      "cx25821: Failed creating Video Upstream Risc programs! \n");
+               goto error;
+       }
+
+       return 0;
+
+      error:
+       return ret;
+}
+
+int cx25821_video_upstream_irq_ch2(struct cx25821_dev *dev, int chan_num,
+                                  u32 status)
+{
+       u32 int_msk_tmp;
+       struct sram_channel *channel = &dev->sram_channels[chan_num];
+       int singlefield_lines = NTSC_FIELD_HEIGHT;
+       int line_size_in_bytes = Y422_LINE_SZ;
+       int odd_risc_prog_size = 0;
+       dma_addr_t risc_phys_jump_addr;
+       __le32 *rp;
+
+       if (status & FLD_VID_SRC_RISC1) {
+               // We should only process one program per call
+               u32 prog_cnt = cx_read(channel->gpcnt);
+
+               //Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers
+               int_msk_tmp = cx_read(channel->int_msk);
+               cx_write(channel->int_msk, int_msk_tmp & ~_intr_msk);
+               cx_write(channel->int_stat, _intr_msk);
+
+               spin_lock(&dev->slock);
+
+               dev->_frame_index_ch2 = prog_cnt;
+
+               queue_work(dev->_irq_queues_ch2, &dev->_irq_work_entry_ch2);
+
+               if (dev->_is_first_frame_ch2) {
+                       dev->_is_first_frame_ch2 = 0;
+
+                       if (dev->_isNTSC_ch2) {
+                               singlefield_lines += 1;
+                               odd_risc_prog_size = ODD_FLD_NTSC_PROG_SIZE;
+                       } else {
+                               singlefield_lines = PAL_FIELD_HEIGHT;
+                               odd_risc_prog_size = ODD_FLD_PAL_PROG_SIZE;
+                       }
+
+                       if (dev->_dma_virt_start_addr_ch2 != NULL) {
+                               line_size_in_bytes =
+                                   (dev->_pixel_format_ch2 ==
+                                    PIXEL_FRMT_411) ? Y411_LINE_SZ :
+                                   Y422_LINE_SZ;
+                               risc_phys_jump_addr =
+                                   dev->_dma_phys_start_addr_ch2 +
+                                   odd_risc_prog_size;
+
+                               rp = cx25821_update_riscprogram_ch2(dev,
+                                                                   dev->
+                                                                   _dma_virt_start_addr_ch2,
+                                                                   TOP_OFFSET,
+                                                                   line_size_in_bytes,
+                                                                   0x0,
+                                                                   singlefield_lines,
+                                                                   FIFO_DISABLE,
+                                                                   ODD_FIELD);
+
+                               // Jump to Even Risc program of 1st Frame
+                               *(rp++) = cpu_to_le32(RISC_JUMP);
+                               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+                               *(rp++) = cpu_to_le32(0);
+                       }
+               }
+
+               spin_unlock(&dev->slock);
+       }
+
+       if (dev->_file_status_ch2 == END_OF_FILE) {
+               printk("cx25821: EOF Channel 2 Framecount = %d\n",
+                      dev->_frame_count_ch2);
+               return -1;
+       }
+       //ElSE, set the interrupt mask register, re-enable irq.
+       int_msk_tmp = cx_read(channel->int_msk);
+       cx_write(channel->int_msk, int_msk_tmp |= _intr_msk);
+
+       return 0;
+}
+
+static irqreturn_t cx25821_upstream_irq_ch2(int irq, void *dev_id)
+{
+       struct cx25821_dev *dev = dev_id;
+       u32 msk_stat, vid_status;
+       int handled = 0;
+       int channel_num = 0;
+       struct sram_channel *sram_ch;
+
+       if (!dev)
+               return -1;
+
+       channel_num = VID_UPSTREAM_SRAM_CHANNEL_J;
+
+       sram_ch = &dev->sram_channels[channel_num];
+
+       msk_stat = cx_read(sram_ch->int_mstat);
+       vid_status = cx_read(sram_ch->int_stat);
+
+       // Only deal with our interrupt
+       if (vid_status) {
+               handled =
+                   cx25821_video_upstream_irq_ch2(dev, channel_num,
+                                                  vid_status);
+       }
+
+       if (handled < 0) {
+               cx25821_stop_upstream_video_ch2(dev);
+       } else {
+               handled += handled;
+       }
+
+       return IRQ_RETVAL(handled);
+}
+
+static void cx25821_set_pixelengine_ch2(struct cx25821_dev *dev,
+                                       struct sram_channel *ch, int pix_format)
+{
+       int width = WIDTH_D1;
+       int height = dev->_lines_count_ch2;
+       int num_lines, odd_num_lines;
+       u32 value;
+       int vip_mode = PIXEL_ENGINE_VIP1;
+
+       value = ((pix_format & 0x3) << 12) | (vip_mode & 0x7);
+       value &= 0xFFFFFFEF;
+       value |= dev->_isNTSC_ch2 ? 0 : 0x10;
+       cx_write(ch->vid_fmt_ctl, value);
+
+       // set number of active pixels in each line. Default is 720 pixels in both NTSC and PAL format
+       cx_write(ch->vid_active_ctl1, width);
+
+       num_lines = (height / 2) & 0x3FF;
+       odd_num_lines = num_lines;
+
+       if (dev->_isNTSC_ch2) {
+               odd_num_lines += 1;
+       }
+
+       value = (num_lines << 16) | odd_num_lines;
+
+       // set number of active lines in field 0 (top) and field 1 (bottom)
+       cx_write(ch->vid_active_ctl2, value);
+
+       cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);
+}
+
+int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,
+                                        struct sram_channel *sram_ch)
+{
+       u32 tmp = 0;
+       int err = 0;
+
+       // 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for channel A-C
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp | 0x1B0001FF);
+
+       // Set the physical start address of the RISC program in the initial program counter(IPC) member of the cmds.
+       cx_write(sram_ch->cmds_start + 0, dev->_dma_phys_addr_ch2);
+       cx_write(sram_ch->cmds_start + 4, 0);   /* Risc IPC High 64 bits 63-32 */
+
+       /* reset counter */
+       cx_write(sram_ch->gpcnt_ctl, 3);
+
+       // Clear our bits from the interrupt status register.
+       cx_write(sram_ch->int_stat, _intr_msk);
+
+       //Set the interrupt mask register, enable irq.
+       cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | (1 << sram_ch->irq_bit));
+       tmp = cx_read(sram_ch->int_msk);
+       cx_write(sram_ch->int_msk, tmp |= _intr_msk);
+
+       err =
+           request_irq(dev->pci->irq, cx25821_upstream_irq_ch2,
+                       IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+       if (err < 0) {
+               printk(KERN_ERR "%s: can't get upstream IRQ %d\n", dev->name,
+                      dev->pci->irq);
+               goto fail_irq;
+       }
+       // Start the DMA  engine
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_set(sram_ch->dma_ctl, tmp | FLD_VID_RISC_EN);
+
+       dev->_is_running_ch2 = 1;
+       dev->_is_first_frame_ch2 = 1;
+
+       return 0;
+
+      fail_irq:
+       cx25821_dev_unregister(dev);
+       return err;
+}
+
+int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
+                                int pixel_format)
+{
+       struct sram_channel *sram_ch;
+       u32 tmp;
+       int retval = 0;
+       int err = 0;
+       int data_frame_size = 0;
+       int risc_buffer_size = 0;
+       int str_length = 0;
+
+       if (dev->_is_running_ch2) {
+               printk("Video Channel is still running so return!\n");
+               return 0;
+       }
+
+       dev->_channel2_upstream_select = channel_select;
+       sram_ch = &dev->sram_channels[channel_select];
+
+       INIT_WORK(&dev->_irq_work_entry_ch2, cx25821_vidups_handler_ch2);
+       dev->_irq_queues_ch2 =
+           create_singlethread_workqueue("cx25821_workqueue2");
+
+       if (!dev->_irq_queues_ch2) {
+               printk
+                   ("cx25821: create_singlethread_workqueue() for Video FAILED!\n");
+               return -ENOMEM;
+       }
+       // 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for channel A-C
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp | 0x1B0001FF);
+
+       dev->_is_running_ch2 = 0;
+       dev->_frame_count_ch2 = 0;
+       dev->_file_status_ch2 = RESET_STATUS;
+       dev->_lines_count_ch2 = dev->_isNTSC_ch2 ? 480 : 576;
+       dev->_pixel_format_ch2 = pixel_format;
+       dev->_line_size_ch2 =
+           (dev->_pixel_format_ch2 ==
+            PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;
+       data_frame_size = dev->_isNTSC_ch2 ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;
+       risc_buffer_size =
+           dev->_isNTSC_ch2 ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
+
+       if (dev->input_filename_ch2) {
+               str_length = strlen(dev->input_filename_ch2);
+               dev->_filename_ch2 =
+                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_filename_ch2)
+                       goto error;
+
+               memcpy(dev->_filename_ch2, dev->input_filename_ch2,
+                      str_length + 1);
+       } else {
+               str_length = strlen(dev->_defaultname_ch2);
+               dev->_filename_ch2 =
+                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_filename_ch2)
+                       goto error;
+
+               memcpy(dev->_filename_ch2, dev->_defaultname_ch2,
+                      str_length + 1);
+       }
+
+       //Default if filename is empty string
+       if (strcmp(dev->input_filename_ch2, "") == 0) {
+               if (dev->_isNTSC_ch2) {
+                       dev->_filename_ch2 =
+                           (dev->_pixel_format_ch2 ==
+                            PIXEL_FRMT_411) ? "/root/vid411.yuv" :
+                           "/root/vidtest.yuv";
+               } else {
+                       dev->_filename_ch2 =
+                           (dev->_pixel_format_ch2 ==
+                            PIXEL_FRMT_411) ? "/root/pal411.yuv" :
+                           "/root/pal422.yuv";
+               }
+       }
+
+       retval =
+           cx25821_sram_channel_setup_upstream(dev, sram_ch,
+                                               dev->_line_size_ch2, 0);
+
+       /* setup fifo + format */
+       cx25821_set_pixelengine_ch2(dev, sram_ch, dev->_pixel_format_ch2);
+
+       dev->upstream_riscbuf_size_ch2 = risc_buffer_size * 2;
+       dev->upstream_databuf_size_ch2 = data_frame_size * 2;
+
+       //Allocating buffers and prepare RISC program
+       retval =
+           cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
+                                               dev->_line_size_ch2);
+       if (retval < 0) {
+               printk(KERN_ERR
+                      "%s: Failed to set up Video upstream buffers!\n",
+                      dev->name);
+               goto error;
+       }
+
+       cx25821_start_video_dma_upstream_ch2(dev, sram_ch);
+
+       return 0;
+
+      error:
+       cx25821_dev_unregister(dev);
+
+       return err;
+}
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h b/drivers/staging/cx25821/cx25821-video-upstream-ch2.h
new file mode 100644 (file)
index 0000000..73feea1
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+
+#define OPEN_FILE_1           0
+#define NUM_PROGS             8
+#define NUM_FRAMES            2
+#define ODD_FIELD             0
+#define EVEN_FIELD            1
+#define TOP_OFFSET            0
+#define FIFO_DISABLE          0
+#define FIFO_ENABLE           1
+#define TEST_FRAMES           5
+#define END_OF_FILE           0
+#define IN_PROGRESS           1
+#define RESET_STATUS          -1
+#define NUM_NO_OPS            5
+
+// PAL and NTSC line sizes and number of lines.
+#define WIDTH_D1              720
+#define NTSC_LINES_PER_FRAME  480
+#define PAL_LINES_PER_FRAME   576
+#define PAL_LINE_SZ           1440
+#define Y422_LINE_SZ          1440
+#define Y411_LINE_SZ          1080
+#define NTSC_FIELD_HEIGHT     240
+#define NTSC_ODD_FLD_LINES    241
+#define PAL_FIELD_HEIGHT      288
+
+#define FRAME_SIZE_NTSC_Y422    (NTSC_LINES_PER_FRAME * Y422_LINE_SZ)
+#define FRAME_SIZE_NTSC_Y411    (NTSC_LINES_PER_FRAME * Y411_LINE_SZ)
+#define FRAME_SIZE_PAL_Y422     (PAL_LINES_PER_FRAME * Y422_LINE_SZ)
+#define FRAME_SIZE_PAL_Y411     (PAL_LINES_PER_FRAME * Y411_LINE_SZ)
+
+#define NTSC_DATA_BUF_SZ        (Y422_LINE_SZ * NTSC_LINES_PER_FRAME)
+#define PAL_DATA_BUF_SZ         (Y422_LINE_SZ * PAL_LINES_PER_FRAME)
+
+#define RISC_WRITECR_INSTRUCTION_SIZE   16
+#define RISC_SYNC_INSTRUCTION_SIZE      4
+#define JUMP_INSTRUCTION_SIZE           12
+#define MAXSIZE_NO_OPS                  36
+#define DWORD_SIZE                      4
+
+#define USE_RISC_NOOP_VIDEO   1
+
+#ifdef USE_RISC_NOOP_VIDEO
+#define PAL_US_VID_PROG_SIZE      ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE +   \
+                                   RISC_SYNC_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define PAL_RISC_BUF_SIZE         (2 * PAL_US_VID_PROG_SIZE)
+
+#define PAL_VID_PROG_SIZE         ((PAL_FIELD_HEIGHT*2) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE + 2*NUM_NO_OPS*DWORD_SIZE)
+
+#define ODD_FLD_PAL_PROG_SIZE     ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define NTSC_US_VID_PROG_SIZE     ((NTSC_ODD_FLD_LINES + 1) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + \
+                                   JUMP_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define NTSC_RISC_BUF_SIZE        (2 * (RISC_SYNC_INSTRUCTION_SIZE + NTSC_US_VID_PROG_SIZE))
+
+#define FRAME1_VID_PROG_SIZE      ((NTSC_ODD_FLD_LINES + NTSC_FIELD_HEIGHT) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE + 2*NUM_NO_OPS*DWORD_SIZE)
+#define ODD_FLD_NTSC_PROG_SIZE    ((NTSC_ODD_FLD_LINES) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+#endif
+
+#ifndef USE_RISC_NOOP_VIDEO
+#define PAL_US_VID_PROG_SIZE      ((PAL_FIELD_HEIGHT + 1) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE )
+#define PAL_RISC_BUF_SIZE         ( 2 * (RISC_SYNC_INSTRUCTION_SIZE + PAL_US_VID_PROG_SIZE) )
+#define PAL_VID_PROG_SIZE         ((PAL_FIELD_HEIGHT*2) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE )
+#define ODD_FLD_PAL_PROG_SIZE     ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE )
+#define ODD_FLD_NTSC_PROG_SIZE    ((NTSC_ODD_FLD_LINES) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE )
+#define NTSC_US_VID_PROG_SIZE     ((NTSC_ODD_FLD_LINES + 1) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE)
+#define NTSC_RISC_BUF_SIZE        (2 * (RISC_SYNC_INSTRUCTION_SIZE + NTSC_US_VID_PROG_SIZE) )
+#define FRAME1_VID_PROG_SIZE      ((NTSC_ODD_FLD_LINES + NTSC_FIELD_HEIGHT) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                   RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE )
+#endif
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
new file mode 100644 (file)
index 0000000..3d7dd3f
--- /dev/null
@@ -0,0 +1,894 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+#include "cx25821-video-upstream.h"
+
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/syscalls.h>
+#include <linux/file.h>
+#include <linux/fcntl.h>
+#include <asm/uaccess.h>
+
+MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
+MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
+MODULE_LICENSE("GPL");
+
+static int _intr_msk =
+    FLD_VID_SRC_RISC1 | FLD_VID_SRC_UF | FLD_VID_SRC_SYNC | FLD_VID_SRC_OPC_ERR;
+
+int cx25821_sram_channel_setup_upstream(struct cx25821_dev *dev,
+                                       struct sram_channel *ch,
+                                       unsigned int bpl, u32 risc)
+{
+       unsigned int i, lines;
+       u32 cdt;
+
+       if (ch->cmds_start == 0) {
+               cx_write(ch->ptr1_reg, 0);
+               cx_write(ch->ptr2_reg, 0);
+               cx_write(ch->cnt2_reg, 0);
+               cx_write(ch->cnt1_reg, 0);
+               return 0;
+       }
+
+       bpl = (bpl + 7) & ~7;   /* alignment */
+       cdt = ch->cdt;
+       lines = ch->fifo_size / bpl;
+
+       if (lines > 4) {
+               lines = 4;
+       }
+
+       BUG_ON(lines < 2);
+
+       /* write CDT */
+       for (i = 0; i < lines; i++) {
+               cx_write(cdt + 16 * i, ch->fifo_start + bpl * i);
+               cx_write(cdt + 16 * i + 4, 0);
+               cx_write(cdt + 16 * i + 8, 0);
+               cx_write(cdt + 16 * i + 12, 0);
+       }
+
+       /* write CMDS */
+       cx_write(ch->cmds_start + 0, risc);
+
+       cx_write(ch->cmds_start + 4, 0);
+       cx_write(ch->cmds_start + 8, cdt);
+       cx_write(ch->cmds_start + 12, (lines * 16) >> 3);
+       cx_write(ch->cmds_start + 16, ch->ctrl_start);
+
+       cx_write(ch->cmds_start + 20, VID_IQ_SIZE_DW);
+
+       for (i = 24; i < 80; i += 4)
+               cx_write(ch->cmds_start + i, 0);
+
+       /* fill registers */
+       cx_write(ch->ptr1_reg, ch->fifo_start);
+       cx_write(ch->ptr2_reg, cdt);
+       cx_write(ch->cnt2_reg, (lines * 16) >> 3);
+       cx_write(ch->cnt1_reg, (bpl >> 3) - 1);
+
+       return 0;
+}
+
+static __le32 *cx25821_update_riscprogram(struct cx25821_dev *dev,
+                                         __le32 * rp, unsigned int offset,
+                                         unsigned int bpl, u32 sync_line,
+                                         unsigned int lines, int fifo_enable,
+                                         int field_type)
+{
+       unsigned int line, i;
+       int dist_betwn_starts = bpl * 2;
+
+       *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+
+       if (USE_RISC_NOOP_VIDEO) {
+               for (i = 0; i < NUM_NO_OPS; i++) {
+                       *(rp++) = cpu_to_le32(RISC_NOOP);
+               }
+       }
+
+       /* scan lines */
+       for (line = 0; line < lines; line++) {
+               *(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
+               *(rp++) = cpu_to_le32(dev->_data_buf_phys_addr + offset);
+               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+
+               if ((lines <= NTSC_FIELD_HEIGHT)
+                   || (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC)) {
+                       offset += dist_betwn_starts;
+               }
+       }
+
+       return rp;
+}
+
+static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp,
+                                          dma_addr_t databuf_phys_addr,
+                                          unsigned int offset, u32 sync_line,
+                                          unsigned int bpl, unsigned int lines,
+                                          int fifo_enable, int field_type)
+{
+       unsigned int line, i;
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[dev->_channel_upstream_select];
+       int dist_betwn_starts = bpl * 2;
+
+       /* sync instruction */
+       if (sync_line != NO_SYNC_LINE) {
+               *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
+       }
+
+       if (USE_RISC_NOOP_VIDEO) {
+               for (i = 0; i < NUM_NO_OPS; i++) {
+                       *(rp++) = cpu_to_le32(RISC_NOOP);
+               }
+       }
+
+       /* scan lines */
+       for (line = 0; line < lines; line++) {
+               *(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
+               *(rp++) = cpu_to_le32(databuf_phys_addr + offset);
+               *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
+
+               if ((lines <= NTSC_FIELD_HEIGHT)
+                   || (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC)) {
+                       offset += dist_betwn_starts;    //to skip the other field line
+               }
+
+               // check if we need to enable the FIFO after the first 4 lines
+               // For the upstream video channel, the risc engine will enable the FIFO.
+               if (fifo_enable && line == 3) {
+                       *(rp++) = RISC_WRITECR;
+                       *(rp++) = sram_ch->dma_ctl;
+                       *(rp++) = FLD_VID_FIFO_EN;
+                       *(rp++) = 0x00000001;
+               }
+       }
+
+       return rp;
+}
+
+int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
+                                struct pci_dev *pci,
+                                unsigned int top_offset,
+                                unsigned int bpl, unsigned int lines)
+{
+       __le32 *rp;
+       int fifo_enable = 0;
+       int singlefield_lines = lines >> 1;     //get line count for single field
+       int odd_num_lines = singlefield_lines;
+       int frame = 0;
+       int frame_size = 0;
+       int databuf_offset = 0;
+       int risc_program_size = 0;
+       int risc_flag = RISC_CNT_RESET;
+       unsigned int bottom_offset = bpl;
+       dma_addr_t risc_phys_jump_addr;
+
+       if (dev->_isNTSC) {
+               odd_num_lines = singlefield_lines + 1;
+               risc_program_size = FRAME1_VID_PROG_SIZE;
+               frame_size =
+                   (bpl ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :
+                   FRAME_SIZE_NTSC_Y422;
+       } else {
+               risc_program_size = PAL_VID_PROG_SIZE;
+               frame_size =
+                   (bpl ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
+       }
+
+       /* Virtual address of Risc buffer program */
+       rp = dev->_dma_virt_addr;
+
+       for (frame = 0; frame < NUM_FRAMES; frame++) {
+               databuf_offset = frame_size * frame;
+
+               if (UNSET != top_offset) {
+                       fifo_enable = (frame == 0) ? FIFO_ENABLE : FIFO_DISABLE;
+                       rp = cx25821_risc_field_upstream(dev, rp,
+                                                        dev->
+                                                        _data_buf_phys_addr +
+                                                        databuf_offset,
+                                                        top_offset, 0, bpl,
+                                                        odd_num_lines,
+                                                        fifo_enable,
+                                                        ODD_FIELD);
+               }
+
+               fifo_enable = FIFO_DISABLE;
+
+               //Even Field
+               rp = cx25821_risc_field_upstream(dev, rp,
+                                                dev->_data_buf_phys_addr +
+                                                databuf_offset, bottom_offset,
+                                                0x200, bpl, singlefield_lines,
+                                                fifo_enable, EVEN_FIELD);
+
+               if (frame == 0) {
+                       risc_flag = RISC_CNT_RESET;
+                       risc_phys_jump_addr =
+                           dev->_dma_phys_start_addr + risc_program_size;
+               } else {
+                       risc_phys_jump_addr = dev->_dma_phys_start_addr;
+                       risc_flag = RISC_CNT_INC;
+               }
+
+               // Loop to 2ndFrameRISC or to Start of Risc program & generate IRQ
+               *(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | risc_flag);
+               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+               *(rp++) = cpu_to_le32(0);
+       }
+
+       return 0;
+}
+
+void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
+{
+       struct sram_channel *sram_ch =
+           &dev->sram_channels[VID_UPSTREAM_SRAM_CHANNEL_I];
+       u32 tmp = 0;
+
+       if (!dev->_is_running) {
+               printk
+                   ("cx25821: No video file is currently running so return!\n");
+               return;
+       }
+       //Disable RISC interrupts
+       tmp = cx_read(sram_ch->int_msk);
+       cx_write(sram_ch->int_msk, tmp & ~_intr_msk);
+
+       //Turn OFF risc and fifo enable
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_write(sram_ch->dma_ctl, tmp & ~(FLD_VID_FIFO_EN | FLD_VID_RISC_EN));
+
+       //Clear data buffer memory
+       if (dev->_data_buf_virt_addr)
+               memset(dev->_data_buf_virt_addr, 0, dev->_data_buf_size);
+
+       dev->_is_running = 0;
+       dev->_is_first_frame = 0;
+       dev->_frame_count = 0;
+       dev->_file_status = END_OF_FILE;
+
+       if (dev->_irq_queues) {
+               kfree(dev->_irq_queues);
+               dev->_irq_queues = NULL;
+       }
+
+       if (dev->_filename != NULL)
+               kfree(dev->_filename);
+
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);
+}
+
+void cx25821_free_mem_upstream_ch1(struct cx25821_dev *dev)
+{
+       if (dev->_is_running) {
+               cx25821_stop_upstream_video_ch1(dev);
+       }
+
+       if (dev->_dma_virt_addr) {
+               pci_free_consistent(dev->pci, dev->_risc_size,
+                                   dev->_dma_virt_addr, dev->_dma_phys_addr);
+               dev->_dma_virt_addr = NULL;
+       }
+
+       if (dev->_data_buf_virt_addr) {
+               pci_free_consistent(dev->pci, dev->_data_buf_size,
+                                   dev->_data_buf_virt_addr,
+                                   dev->_data_buf_phys_addr);
+               dev->_data_buf_virt_addr = NULL;
+       }
+}
+
+int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int frame_index_temp = dev->_frame_index;
+       int i = 0;
+       int line_size =
+           (dev->_pixel_format ==
+            PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;
+       int frame_size = 0;
+       int frame_offset = 0;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t file_offset;
+       loff_t pos;
+       mm_segment_t old_fs;
+
+       if (dev->_file_status == END_OF_FILE)
+               return 0;
+
+       if (dev->_isNTSC) {
+               frame_size =
+                   (line_size ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :
+                   FRAME_SIZE_NTSC_Y422;
+       } else {
+               frame_size =
+                   (line_size ==
+                    Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
+       }
+
+       frame_offset = (frame_index_temp > 0) ? frame_size : 0;
+       file_offset = dev->_frame_count * frame_size;
+
+       myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_filename, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk("%s: File has no READ operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (i = 0; i < dev->_lines_count; i++) {
+                       pos = file_offset;
+
+                       vfs_read_retval =
+                           vfs_read(myfile, mybuf, line_size, &pos);
+
+                       if (vfs_read_retval > 0 && vfs_read_retval == line_size
+                           && dev->_data_buf_virt_addr != NULL) {
+                               memcpy((void *)(dev->_data_buf_virt_addr +
+                                               frame_offset / 4), mybuf,
+                                      vfs_read_retval);
+                       }
+
+                       file_offset += vfs_read_retval;
+                       frame_offset += vfs_read_retval;
+
+                       if (vfs_read_retval < line_size) {
+                               printk(KERN_INFO
+                                      "Done: exit %s() since no more bytes to read from Video file.\n",
+                                      __func__);
+                               break;
+                       }
+               }
+
+               if (i > 0)
+                       dev->_frame_count++;
+
+               dev->_file_status =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+static void cx25821_vidups_handler(struct work_struct *work)
+{
+       struct cx25821_dev *dev =
+           container_of(work, struct cx25821_dev, _irq_work_entry);
+
+       if (!dev) {
+               printk("ERROR %s(): since container_of(work_struct) FAILED! \n",
+                      __func__);
+               return;
+       }
+
+       cx25821_get_frame(dev,
+                         &dev->sram_channels[dev->_channel_upstream_select]);
+}
+
+int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)
+{
+       struct file *myfile;
+       int i = 0, j = 0;
+       int line_size =
+           (dev->_pixel_format ==
+            PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;
+       ssize_t vfs_read_retval = 0;
+       char mybuf[line_size];
+       loff_t pos;
+       loff_t offset = (unsigned long)0;
+       mm_segment_t old_fs;
+
+       myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
+
+       if (IS_ERR(myfile)) {
+               const int open_errno = -PTR_ERR(myfile);
+               printk("%s(): ERROR opening file(%s) with errno = %d! \n",
+                      __func__, dev->_filename, open_errno);
+               return PTR_ERR(myfile);
+       } else {
+               if (!(myfile->f_op)) {
+                       printk("%s: File has no file operations registered!",
+                              __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               if (!myfile->f_op->read) {
+                       printk
+                           ("%s: File has no READ operations registered!  Returning.",
+                            __func__);
+                       filp_close(myfile, NULL);
+                       return -EIO;
+               }
+
+               pos = myfile->f_pos;
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+
+               for (j = 0; j < NUM_FRAMES; j++) {
+                       for (i = 0; i < dev->_lines_count; i++) {
+                               pos = offset;
+
+                               vfs_read_retval =
+                                   vfs_read(myfile, mybuf, line_size, &pos);
+
+                               if (vfs_read_retval > 0
+                                   && vfs_read_retval == line_size
+                                   && dev->_data_buf_virt_addr != NULL) {
+                                       memcpy((void *)(dev->
+                                                       _data_buf_virt_addr +
+                                                       offset / 4), mybuf,
+                                              vfs_read_retval);
+                               }
+
+                               offset += vfs_read_retval;
+
+                               if (vfs_read_retval < line_size) {
+                                       printk(KERN_INFO
+                                              "Done: exit %s() since no more bytes to read from Video file.\n",
+                                              __func__);
+                                       break;
+                               }
+                       }
+
+                       if (i > 0)
+                               dev->_frame_count++;
+
+                       if (vfs_read_retval < line_size) {
+                               break;
+                       }
+               }
+
+               dev->_file_status =
+                   (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
+
+               set_fs(old_fs);
+               myfile->f_pos = 0;
+               filp_close(myfile, NULL);
+       }
+
+       return 0;
+}
+
+int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,
+                                   struct sram_channel *sram_ch, int bpl)
+{
+       int ret = 0;
+       dma_addr_t dma_addr;
+       dma_addr_t data_dma_addr;
+
+       if (dev->_dma_virt_addr != NULL) {
+               pci_free_consistent(dev->pci, dev->upstream_riscbuf_size,
+                                   dev->_dma_virt_addr, dev->_dma_phys_addr);
+       }
+
+       dev->_dma_virt_addr =
+           pci_alloc_consistent(dev->pci, dev->upstream_riscbuf_size,
+                                &dma_addr);
+       dev->_dma_virt_start_addr = dev->_dma_virt_addr;
+       dev->_dma_phys_start_addr = dma_addr;
+       dev->_dma_phys_addr = dma_addr;
+       dev->_risc_size = dev->upstream_riscbuf_size;
+
+       if (!dev->_dma_virt_addr) {
+               printk
+                   ("cx25821: FAILED to allocate memory for Risc buffer! Returning.\n");
+               return -ENOMEM;
+       }
+
+       //Clear memory at address
+       memset(dev->_dma_virt_addr, 0, dev->_risc_size);
+
+       if (dev->_data_buf_virt_addr != NULL) {
+               pci_free_consistent(dev->pci, dev->upstream_databuf_size,
+                                   dev->_data_buf_virt_addr,
+                                   dev->_data_buf_phys_addr);
+       }
+       //For Video Data buffer allocation
+       dev->_data_buf_virt_addr =
+           pci_alloc_consistent(dev->pci, dev->upstream_databuf_size,
+                                &data_dma_addr);
+       dev->_data_buf_phys_addr = data_dma_addr;
+       dev->_data_buf_size = dev->upstream_databuf_size;
+
+       if (!dev->_data_buf_virt_addr) {
+               printk
+                   ("cx25821: FAILED to allocate memory for data buffer! Returning.\n");
+               return -ENOMEM;
+       }
+
+       //Clear memory at address
+       memset(dev->_data_buf_virt_addr, 0, dev->_data_buf_size);
+
+       ret = cx25821_openfile(dev, sram_ch);
+       if (ret < 0)
+               return ret;
+
+       //Create RISC programs
+       ret =
+           cx25821_risc_buffer_upstream(dev, dev->pci, 0, bpl,
+                                        dev->_lines_count);
+       if (ret < 0) {
+               printk(KERN_INFO
+                      "cx25821: Failed creating Video Upstream Risc programs! \n");
+               goto error;
+       }
+
+       return 0;
+
+      error:
+       return ret;
+}
+
+int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
+                              u32 status)
+{
+       u32 int_msk_tmp;
+       struct sram_channel *channel = &dev->sram_channels[chan_num];
+       int singlefield_lines = NTSC_FIELD_HEIGHT;
+       int line_size_in_bytes = Y422_LINE_SZ;
+       int odd_risc_prog_size = 0;
+       dma_addr_t risc_phys_jump_addr;
+       __le32 *rp;
+
+       if (status & FLD_VID_SRC_RISC1) {
+               // We should only process one program per call
+               u32 prog_cnt = cx_read(channel->gpcnt);
+
+               //Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers
+               int_msk_tmp = cx_read(channel->int_msk);
+               cx_write(channel->int_msk, int_msk_tmp & ~_intr_msk);
+               cx_write(channel->int_stat, _intr_msk);
+
+               spin_lock(&dev->slock);
+
+               dev->_frame_index = prog_cnt;
+
+               queue_work(dev->_irq_queues, &dev->_irq_work_entry);
+
+               if (dev->_is_first_frame) {
+                       dev->_is_first_frame = 0;
+
+                       if (dev->_isNTSC) {
+                               singlefield_lines += 1;
+                               odd_risc_prog_size = ODD_FLD_NTSC_PROG_SIZE;
+                       } else {
+                               singlefield_lines = PAL_FIELD_HEIGHT;
+                               odd_risc_prog_size = ODD_FLD_PAL_PROG_SIZE;
+                       }
+
+                       if (dev->_dma_virt_start_addr != NULL) {
+                               line_size_in_bytes =
+                                   (dev->_pixel_format ==
+                                    PIXEL_FRMT_411) ? Y411_LINE_SZ :
+                                   Y422_LINE_SZ;
+                               risc_phys_jump_addr =
+                                   dev->_dma_phys_start_addr +
+                                   odd_risc_prog_size;
+
+                               rp = cx25821_update_riscprogram(dev,
+                                                               dev->
+                                                               _dma_virt_start_addr,
+                                                               TOP_OFFSET,
+                                                               line_size_in_bytes,
+                                                               0x0,
+                                                               singlefield_lines,
+                                                               FIFO_DISABLE,
+                                                               ODD_FIELD);
+
+                               // Jump to Even Risc program of 1st Frame
+                               *(rp++) = cpu_to_le32(RISC_JUMP);
+                               *(rp++) = cpu_to_le32(risc_phys_jump_addr);
+                               *(rp++) = cpu_to_le32(0);
+                       }
+               }
+
+               spin_unlock(&dev->slock);
+       } else {
+               if (status & FLD_VID_SRC_UF)
+                       printk
+                           ("%s: Video Received Underflow Error Interrupt!\n",
+                            __func__);
+
+               if (status & FLD_VID_SRC_SYNC)
+                       printk("%s: Video Received Sync Error Interrupt!\n",
+                              __func__);
+
+               if (status & FLD_VID_SRC_OPC_ERR)
+                       printk("%s: Video Received OpCode Error Interrupt!\n",
+                              __func__);
+       }
+
+       if (dev->_file_status == END_OF_FILE) {
+               printk("cx25821: EOF Channel 1 Framecount = %d\n",
+                      dev->_frame_count);
+               return -1;
+       }
+       //ElSE, set the interrupt mask register, re-enable irq.
+       int_msk_tmp = cx_read(channel->int_msk);
+       cx_write(channel->int_msk, int_msk_tmp |= _intr_msk);
+
+       return 0;
+}
+
+static irqreturn_t cx25821_upstream_irq(int irq, void *dev_id)
+{
+       struct cx25821_dev *dev = dev_id;
+       u32 msk_stat, vid_status;
+       int handled = 0;
+       int channel_num = 0;
+       struct sram_channel *sram_ch;
+
+       if (!dev)
+               return -1;
+
+       channel_num = VID_UPSTREAM_SRAM_CHANNEL_I;
+
+       sram_ch = &dev->sram_channels[channel_num];
+
+       msk_stat = cx_read(sram_ch->int_mstat);
+       vid_status = cx_read(sram_ch->int_stat);
+
+       // Only deal with our interrupt
+       if (vid_status) {
+               handled =
+                   cx25821_video_upstream_irq(dev, channel_num, vid_status);
+       }
+
+       if (handled < 0) {
+               cx25821_stop_upstream_video_ch1(dev);
+       } else {
+               handled += handled;
+       }
+
+       return IRQ_RETVAL(handled);
+}
+
+void cx25821_set_pixelengine(struct cx25821_dev *dev, struct sram_channel *ch,
+                            int pix_format)
+{
+       int width = WIDTH_D1;
+       int height = dev->_lines_count;
+       int num_lines, odd_num_lines;
+       u32 value;
+       int vip_mode = OUTPUT_FRMT_656;
+
+       value = ((pix_format & 0x3) << 12) | (vip_mode & 0x7);
+       value &= 0xFFFFFFEF;
+       value |= dev->_isNTSC ? 0 : 0x10;
+       cx_write(ch->vid_fmt_ctl, value);
+
+       // set number of active pixels in each line. Default is 720 pixels in both NTSC and PAL format
+       cx_write(ch->vid_active_ctl1, width);
+
+       num_lines = (height / 2) & 0x3FF;
+       odd_num_lines = num_lines;
+
+       if (dev->_isNTSC) {
+               odd_num_lines += 1;
+       }
+
+       value = (num_lines << 16) | odd_num_lines;
+
+       // set number of active lines in field 0 (top) and field 1 (bottom)
+       cx_write(ch->vid_active_ctl2, value);
+
+       cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);
+}
+
+int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
+                                    struct sram_channel *sram_ch)
+{
+       u32 tmp = 0;
+       int err = 0;
+
+       // 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for channel A-C
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp | 0x1B0001FF);
+
+       // Set the physical start address of the RISC program in the initial program counter(IPC) member of the cmds.
+       cx_write(sram_ch->cmds_start + 0, dev->_dma_phys_addr);
+       cx_write(sram_ch->cmds_start + 4, 0);   /* Risc IPC High 64 bits 63-32 */
+
+       /* reset counter */
+       cx_write(sram_ch->gpcnt_ctl, 3);
+
+       // Clear our bits from the interrupt status register.
+       cx_write(sram_ch->int_stat, _intr_msk);
+
+       //Set the interrupt mask register, enable irq.
+       cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | (1 << sram_ch->irq_bit));
+       tmp = cx_read(sram_ch->int_msk);
+       cx_write(sram_ch->int_msk, tmp |= _intr_msk);
+
+       err =
+           request_irq(dev->pci->irq, cx25821_upstream_irq,
+                       IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+       if (err < 0) {
+               printk(KERN_ERR "%s: can't get upstream IRQ %d\n", dev->name,
+                      dev->pci->irq);
+               goto fail_irq;
+       }
+
+       // Start the DMA  engine
+       tmp = cx_read(sram_ch->dma_ctl);
+       cx_set(sram_ch->dma_ctl, tmp | FLD_VID_RISC_EN);
+
+       dev->_is_running = 1;
+       dev->_is_first_frame = 1;
+
+       return 0;
+
+      fail_irq:
+       cx25821_dev_unregister(dev);
+       return err;
+}
+
+int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
+                                int pixel_format)
+{
+       struct sram_channel *sram_ch;
+       u32 tmp;
+       int retval = 0;
+       int err = 0;
+       int data_frame_size = 0;
+       int risc_buffer_size = 0;
+       int str_length = 0;
+
+       if (dev->_is_running) {
+               printk("Video Channel is still running so return!\n");
+               return 0;
+       }
+
+       dev->_channel_upstream_select = channel_select;
+       sram_ch = &dev->sram_channels[channel_select];
+
+       INIT_WORK(&dev->_irq_work_entry, cx25821_vidups_handler);
+       dev->_irq_queues = create_singlethread_workqueue("cx25821_workqueue");
+
+       if (!dev->_irq_queues) {
+               printk
+                   ("cx25821: create_singlethread_workqueue() for Video FAILED!\n");
+               return -ENOMEM;
+       }
+       // 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for channel A-C
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp | 0x1B0001FF);
+
+       dev->_is_running = 0;
+       dev->_frame_count = 0;
+       dev->_file_status = RESET_STATUS;
+       dev->_lines_count = dev->_isNTSC ? 480 : 576;
+       dev->_pixel_format = pixel_format;
+       dev->_line_size =
+           (dev->_pixel_format ==
+            PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;
+       data_frame_size = dev->_isNTSC ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;
+       risc_buffer_size =
+           dev->_isNTSC ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
+
+       if (dev->input_filename) {
+               str_length = strlen(dev->input_filename);
+               dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_filename)
+                       goto error;
+
+               memcpy(dev->_filename, dev->input_filename, str_length + 1);
+       } else {
+               str_length = strlen(dev->_defaultname);
+               dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+
+               if (!dev->_filename)
+                       goto error;
+
+               memcpy(dev->_filename, dev->_defaultname, str_length + 1);
+       }
+
+       //Default if filename is empty string
+       if (strcmp(dev->input_filename, "") == 0) {
+               if (dev->_isNTSC) {
+                       dev->_filename =
+                           (dev->_pixel_format ==
+                            PIXEL_FRMT_411) ? "/root/vid411.yuv" :
+                           "/root/vidtest.yuv";
+               } else {
+                       dev->_filename =
+                           (dev->_pixel_format ==
+                            PIXEL_FRMT_411) ? "/root/pal411.yuv" :
+                           "/root/pal422.yuv";
+               }
+       }
+
+       dev->_is_running = 0;
+       dev->_frame_count = 0;
+       dev->_file_status = RESET_STATUS;
+       dev->_lines_count = dev->_isNTSC ? 480 : 576;
+       dev->_pixel_format = pixel_format;
+       dev->_line_size =
+           (dev->_pixel_format ==
+            PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;
+
+       retval =
+           cx25821_sram_channel_setup_upstream(dev, sram_ch, dev->_line_size,
+                                               0);
+
+       /* setup fifo + format */
+       cx25821_set_pixelengine(dev, sram_ch, dev->_pixel_format);
+
+       dev->upstream_riscbuf_size = risc_buffer_size * 2;
+       dev->upstream_databuf_size = data_frame_size * 2;
+
+       //Allocating buffers and prepare RISC program
+       retval = cx25821_upstream_buffer_prepare(dev, sram_ch, dev->_line_size);
+       if (retval < 0) {
+               printk(KERN_ERR
+                      "%s: Failed to set up Video upstream buffers!\n",
+                      dev->name);
+               goto error;
+       }
+
+       cx25821_start_video_dma_upstream(dev, sram_ch);
+
+       return 0;
+
+      error:
+       cx25821_dev_unregister(dev);
+
+       return err;
+}
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.h b/drivers/staging/cx25821/cx25821-video-upstream.h
new file mode 100644 (file)
index 0000000..cc9f938
--- /dev/null
@@ -0,0 +1,109 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <hiep.huynh@conexant.com>, <shu.lin@conexant.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+
+#define OUTPUT_FRMT_656       0
+#define OPEN_FILE_1           0
+#define NUM_PROGS             8
+#define NUM_FRAMES            2
+#define ODD_FIELD             0
+#define EVEN_FIELD            1
+#define TOP_OFFSET            0
+#define FIFO_DISABLE          0
+#define FIFO_ENABLE           1
+#define TEST_FRAMES           5
+#define END_OF_FILE           0
+#define IN_PROGRESS           1
+#define RESET_STATUS          -1
+#define NUM_NO_OPS            5
+
+// PAL and NTSC line sizes and number of lines.
+#define WIDTH_D1              720
+#define NTSC_LINES_PER_FRAME  480
+#define PAL_LINES_PER_FRAME   576
+#define PAL_LINE_SZ           1440
+#define Y422_LINE_SZ          1440
+#define Y411_LINE_SZ          1080
+#define NTSC_FIELD_HEIGHT     240
+#define NTSC_ODD_FLD_LINES    241
+#define PAL_FIELD_HEIGHT      288
+
+#define FRAME_SIZE_NTSC_Y422    (NTSC_LINES_PER_FRAME * Y422_LINE_SZ)
+#define FRAME_SIZE_NTSC_Y411    (NTSC_LINES_PER_FRAME * Y411_LINE_SZ)
+#define FRAME_SIZE_PAL_Y422     (PAL_LINES_PER_FRAME * Y422_LINE_SZ)
+#define FRAME_SIZE_PAL_Y411     (PAL_LINES_PER_FRAME * Y411_LINE_SZ)
+
+#define NTSC_DATA_BUF_SZ        (Y422_LINE_SZ * NTSC_LINES_PER_FRAME)
+#define PAL_DATA_BUF_SZ         (Y422_LINE_SZ * PAL_LINES_PER_FRAME)
+
+#define RISC_WRITECR_INSTRUCTION_SIZE   16
+#define RISC_SYNC_INSTRUCTION_SIZE      4
+#define JUMP_INSTRUCTION_SIZE           12
+#define MAXSIZE_NO_OPS                  36
+#define DWORD_SIZE                      4
+
+#define USE_RISC_NOOP_VIDEO   1
+
+#ifdef USE_RISC_NOOP_VIDEO
+#define PAL_US_VID_PROG_SIZE        ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE +   \
+                                     RISC_SYNC_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define PAL_RISC_BUF_SIZE           (2 * PAL_US_VID_PROG_SIZE)
+
+#define PAL_VID_PROG_SIZE           ((PAL_FIELD_HEIGHT*2) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE + 2*NUM_NO_OPS*DWORD_SIZE)
+
+#define ODD_FLD_PAL_PROG_SIZE       ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define ODD_FLD_NTSC_PROG_SIZE      ((NTSC_ODD_FLD_LINES) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define NTSC_US_VID_PROG_SIZE       ((NTSC_ODD_FLD_LINES + 1) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + \
+                                     JUMP_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE)
+
+#define NTSC_RISC_BUF_SIZE          (2 * (RISC_SYNC_INSTRUCTION_SIZE + NTSC_US_VID_PROG_SIZE))
+
+#define FRAME1_VID_PROG_SIZE        ((NTSC_ODD_FLD_LINES + NTSC_FIELD_HEIGHT) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE + 2*NUM_NO_OPS*DWORD_SIZE)
+
+#endif
+
+#ifndef USE_RISC_NOOP_VIDEO
+#define PAL_US_VID_PROG_SIZE        ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + \
+                                     RISC_SYNC_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE)
+
+#define PAL_RISC_BUF_SIZE           (2 * PAL_US_VID_PROG_SIZE)
+
+#define PAL_VID_PROG_SIZE           ((PAL_FIELD_HEIGHT*2) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE )
+
+#define ODD_FLD_PAL_PROG_SIZE       ((PAL_FIELD_HEIGHT) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE )
+#define ODD_FLD_NTSC_PROG_SIZE      ((NTSC_ODD_FLD_LINES) * 3 * DWORD_SIZE + RISC_SYNC_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE )
+
+#define NTSC_US_VID_PROG_SIZE       ((NTSC_ODD_FLD_LINES + 1) * 3 * DWORD_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE)
+#define NTSC_RISC_BUF_SIZE          ( 2 * (RISC_SYNC_INSTRUCTION_SIZE + NTSC_US_VID_PROG_SIZE) )
+#define FRAME1_VID_PROG_SIZE        ((NTSC_ODD_FLD_LINES + NTSC_FIELD_HEIGHT) * 3 * DWORD_SIZE + 2*RISC_SYNC_INSTRUCTION_SIZE + \
+                                     RISC_WRITECR_INSTRUCTION_SIZE + JUMP_INSTRUCTION_SIZE )
+#endif
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
new file mode 100644 (file)
index 0000000..8834bc8
--- /dev/null
@@ -0,0 +1,1299 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
+MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
+MODULE_LICENSE("GPL");
+
+static unsigned int video_nr[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
+static unsigned int radio_nr[] = {[0 ... (CX25821_MAXBOARDS - 1)] = UNSET };
+
+module_param_array(video_nr, int, NULL, 0444);
+module_param_array(radio_nr, int, NULL, 0444);
+
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
+
+static unsigned int video_debug = VIDEO_DEBUG;
+module_param(video_debug, int, 0644);
+MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
+
+static unsigned int irq_debug;
+module_param(irq_debug, int, 0644);
+MODULE_PARM_DESC(irq_debug, "enable debug messages [IRQ handler]");
+
+unsigned int vid_limit = 16;
+module_param(vid_limit, int, 0644);
+MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes");
+
+static void init_controls(struct cx25821_dev *dev, int chan_num);
+
+#define FORMAT_FLAGS_PACKED       0x01
+
+struct cx25821_fmt formats[] = {
+       {
+        .name = "8 bpp, gray",
+        .fourcc = V4L2_PIX_FMT_GREY,
+        .depth = 8,
+        .flags = FORMAT_FLAGS_PACKED,
+        }, {
+            .name = "4:1:1, packed, Y41P",
+            .fourcc = V4L2_PIX_FMT_Y41P,
+            .depth = 12,
+            .flags = FORMAT_FLAGS_PACKED,
+            }, {
+                .name = "4:2:2, packed, YUYV",
+                .fourcc = V4L2_PIX_FMT_YUYV,
+                .depth = 16,
+                .flags = FORMAT_FLAGS_PACKED,
+                }, {
+                    .name = "4:2:2, packed, UYVY",
+                    .fourcc = V4L2_PIX_FMT_UYVY,
+                    .depth = 16,
+                    .flags = FORMAT_FLAGS_PACKED,
+                    }, {
+                        .name = "4:2:0, YUV",
+                        .fourcc = V4L2_PIX_FMT_YUV420,
+                        .depth = 12,
+                        .flags = FORMAT_FLAGS_PACKED,
+                        },
+};
+
+int get_format_size(void)
+{
+       return ARRAY_SIZE(formats);
+}
+
+struct cx25821_fmt *format_by_fourcc(unsigned int fourcc)
+{
+       unsigned int i;
+
+       if (fourcc == V4L2_PIX_FMT_Y41P || fourcc == V4L2_PIX_FMT_YUV411P) {
+               return formats + 1;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(formats); i++)
+               if (formats[i].fourcc == fourcc)
+                       return formats + i;
+
+       printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __func__, fourcc);
+       return NULL;
+}
+
+void dump_video_queue(struct cx25821_dev *dev, struct cx25821_dmaqueue *q)
+{
+       struct cx25821_buffer *buf;
+       struct list_head *item;
+       dprintk(1, "%s()\n", __func__);
+
+       if (!list_empty(&q->active)) {
+               list_for_each(item, &q->active)
+                   buf = list_entry(item, struct cx25821_buffer, vb.queue);
+       }
+
+       if (!list_empty(&q->queued)) {
+               list_for_each(item, &q->queued)
+                   buf = list_entry(item, struct cx25821_buffer, vb.queue);
+       }
+
+}
+
+void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,
+                         u32 count)
+{
+       struct cx25821_buffer *buf;
+       int bc;
+
+       for (bc = 0;; bc++) {
+               if (list_empty(&q->active)) {
+                       dprintk(1, "bc=%d (=0: active empty)\n", bc);
+                       break;
+               }
+
+               buf =
+                   list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+
+               /* count comes from the hw and it is 16bit wide --
+                * this trick handles wrap-arounds correctly for
+                * up to 32767 buffers in flight... */
+               if ((s16) (count - buf->count) < 0) {
+                       break;
+               }
+
+               do_gettimeofday(&buf->vb.ts);
+               buf->vb.state = VIDEOBUF_DONE;
+               list_del(&buf->vb.queue);
+               wake_up(&buf->vb.done);
+       }
+
+       if (list_empty(&q->active))
+               del_timer(&q->timeout);
+       else
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+       if (bc != 1)
+               printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
+                      __func__, bc);
+}
+
+#ifdef TUNER_FLAG
+int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm)
+{
+       dprintk(1, "%s(norm = 0x%08x) name: [%s]\n", __func__,
+               (unsigned int)norm, v4l2_norm_to_name(norm));
+
+       dev->tvnorm = norm;
+
+       /* Tell the internal A/V decoder */
+       cx25821_call_all(dev, core, s_std, norm);
+
+       return 0;
+}
+#endif
+
+struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,
+                                      struct pci_dev *pci,
+                                      struct video_device *template,
+                                      char *type)
+{
+       struct video_device *vfd;
+       dprintk(1, "%s()\n", __func__);
+
+       vfd = video_device_alloc();
+       if (NULL == vfd)
+               return NULL;
+       *vfd = *template;
+       vfd->minor = -1;
+       vfd->v4l2_dev = &dev->v4l2_dev;
+       vfd->release = video_device_release;
+       snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type,
+                cx25821_boards[dev->board].name);
+       return vfd;
+}
+
+/*
+static int cx25821_ctrl_query(struct v4l2_queryctrl *qctrl)
+{
+    int i;
+
+    if (qctrl->id < V4L2_CID_BASE || qctrl->id >= V4L2_CID_LASTP1)
+       return -EINVAL;
+    for (i = 0; i < CX25821_CTLS; i++)
+       if (cx25821_ctls[i].v.id == qctrl->id)
+           break;
+    if (i == CX25821_CTLS) {
+       *qctrl = no_ctl;
+       return 0;
+    }
+    *qctrl = cx25821_ctls[i].v;
+    return 0;
+}
+*/
+
+// resource management
+int res_get(struct cx25821_dev *dev, struct cx25821_fh *fh, unsigned int bit)
+{
+       dprintk(1, "%s()\n", __func__);
+       if (fh->resources & bit)
+               /* have it already allocated */
+               return 1;
+
+       /* is it free? */
+       mutex_lock(&dev->lock);
+       if (dev->resources & bit) {
+               /* no, someone else uses it */
+               mutex_unlock(&dev->lock);
+               return 0;
+       }
+       /* it's free, grab it */
+       fh->resources |= bit;
+       dev->resources |= bit;
+       dprintk(1, "res: get %d\n", bit);
+       mutex_unlock(&dev->lock);
+       return 1;
+}
+
+int res_check(struct cx25821_fh *fh, unsigned int bit)
+{
+       return fh->resources & bit;
+}
+
+int res_locked(struct cx25821_dev *dev, unsigned int bit)
+{
+       return dev->resources & bit;
+}
+
+void res_free(struct cx25821_dev *dev, struct cx25821_fh *fh, unsigned int bits)
+{
+       BUG_ON((fh->resources & bits) != bits);
+       dprintk(1, "%s()\n", __func__);
+
+       mutex_lock(&dev->lock);
+       fh->resources &= ~bits;
+       dev->resources &= ~bits;
+       dprintk(1, "res: put %d\n", bits);
+       mutex_unlock(&dev->lock);
+}
+
+int cx25821_video_mux(struct cx25821_dev *dev, unsigned int input)
+{
+       struct v4l2_routing route;
+       memset(&route, 0, sizeof(route));
+
+       dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
+               __func__, input, INPUT(input)->vmux, INPUT(input)->gpio0,
+               INPUT(input)->gpio1, INPUT(input)->gpio2, INPUT(input)->gpio3);
+       dev->input = input;
+
+       route.input = INPUT(input)->vmux;
+
+       /* Tell the internal A/V decoder */
+       cx25821_call_all(dev, video, s_routing, INPUT(input)->vmux, 0, 0);
+
+       return 0;
+}
+
+int cx25821_start_video_dma(struct cx25821_dev *dev,
+                           struct cx25821_dmaqueue *q,
+                           struct cx25821_buffer *buf,
+                           struct sram_channel *channel)
+{
+       int tmp = 0;
+
+       /* setup fifo + format */
+       cx25821_sram_channel_setup(dev, channel, buf->bpl, buf->risc.dma);
+
+       /* reset counter */
+       cx_write(channel->gpcnt_ctl, 3);
+       q->count = 1;
+
+       /* enable irq */
+       cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | (1 << channel->i));
+       cx_set(channel->int_msk, 0x11);
+
+       /* start dma */
+       cx_write(channel->dma_ctl, 0x11);       /* FIFO and RISC enable */
+
+       /* make sure upstream setting if any is reversed */
+       tmp = cx_read(VID_CH_MODE_SEL);
+       cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);
+
+       return 0;
+}
+
+int cx25821_restart_video_queue(struct cx25821_dev *dev,
+                               struct cx25821_dmaqueue *q,
+                               struct sram_channel *channel)
+{
+       struct cx25821_buffer *buf, *prev;
+       struct list_head *item;
+
+       if (!list_empty(&q->active)) {
+               buf =
+                   list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+
+               cx25821_start_video_dma(dev, q, buf, channel);
+
+               list_for_each(item, &q->active) {
+                       buf = list_entry(item, struct cx25821_buffer, vb.queue);
+                       buf->count = q->count++;
+               }
+
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               return 0;
+       }
+
+       prev = NULL;
+       for (;;) {
+               if (list_empty(&q->queued))
+                       return 0;
+
+               buf =
+                   list_entry(q->queued.next, struct cx25821_buffer, vb.queue);
+
+               if (NULL == prev) {
+                       list_move_tail(&buf->vb.queue, &q->active);
+                       cx25821_start_video_dma(dev, q, buf, channel);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               } else if (prev->vb.width == buf->vb.width &&
+                          prev->vb.height == buf->vb.height &&
+                          prev->fmt == buf->fmt) {
+                       list_move_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+                       prev->risc.jmp[2] = cpu_to_le32(0);     /* Bits 63 - 32 */
+               } else {
+                       return 0;
+               }
+               prev = buf;
+       }
+}
+
+void cx25821_vid_timeout(unsigned long data)
+{
+       struct cx25821_data *timeout_data = (struct cx25821_data *)data;
+       struct cx25821_dev *dev = timeout_data->dev;
+       struct sram_channel *channel = timeout_data->channel;
+       struct cx25821_dmaqueue *q = &dev->vidq[channel->i];
+       struct cx25821_buffer *buf;
+       unsigned long flags;
+
+       //cx25821_sram_channel_dump(dev, channel);
+       cx_clear(channel->dma_ctl, 0x11);
+
+       spin_lock_irqsave(&dev->slock, flags);
+       while (!list_empty(&q->active)) {
+               buf =
+                   list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+               list_del(&buf->vb.queue);
+
+               buf->vb.state = VIDEOBUF_ERROR;
+               wake_up(&buf->vb.done);
+       }
+
+       cx25821_restart_video_queue(dev, q, channel);
+       spin_unlock_irqrestore(&dev->slock, flags);
+}
+
+int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
+{
+       u32 count = 0;
+       int handled = 0;
+       u32 mask;
+       struct sram_channel *channel = &dev->sram_channels[chan_num];
+
+       mask = cx_read(channel->int_msk);
+       if (0 == (status & mask))
+               return handled;
+
+       cx_write(channel->int_stat, status);
+
+       /* risc op code error */
+       if (status & (1 << 16)) {
+               printk(KERN_WARNING "%s, %s: video risc op code error\n",
+                      dev->name, channel->name);
+               cx_clear(channel->dma_ctl, 0x11);
+               cx25821_sram_channel_dump(dev, channel);
+       }
+
+       /* risc1 y */
+       if (status & FLD_VID_DST_RISC1) {
+               spin_lock(&dev->slock);
+               count = cx_read(channel->gpcnt);
+               cx25821_video_wakeup(dev, &dev->vidq[channel->i], count);
+               spin_unlock(&dev->slock);
+               handled++;
+       }
+
+       /* risc2 y */
+       if (status & 0x10) {
+               dprintk(2, "stopper video\n");
+               spin_lock(&dev->slock);
+               cx25821_restart_video_queue(dev, &dev->vidq[channel->i],
+                                           channel);
+               spin_unlock(&dev->slock);
+               handled++;
+       }
+       return handled;
+}
+
+void cx25821_videoioctl_unregister(struct cx25821_dev *dev)
+{
+       if (dev->ioctl_dev) {
+               if (dev->ioctl_dev->minor != -1)
+                       video_unregister_device(dev->ioctl_dev);
+               else
+                       video_device_release(dev->ioctl_dev);
+
+               dev->ioctl_dev = NULL;
+       }
+}
+
+void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num)
+{
+       cx_clear(PCI_INT_MSK, 1);
+
+       if (dev->video_dev[chan_num]) {
+               if (-1 != dev->video_dev[chan_num]->minor)
+                       video_unregister_device(dev->video_dev[chan_num]);
+               else
+                       video_device_release(dev->video_dev[chan_num]);
+
+               dev->video_dev[chan_num] = NULL;
+
+               btcx_riscmem_free(dev->pci, &dev->vidq[chan_num].stopper);
+
+               printk(KERN_WARNING "device %d released!\n", chan_num);
+       }
+
+}
+
+int cx25821_video_register(struct cx25821_dev *dev, int chan_num,
+                          struct video_device *video_template)
+{
+       int err;
+
+       spin_lock_init(&dev->slock);
+
+       //printk(KERN_WARNING "Channel %d\n", chan_num);
+
+#ifdef TUNER_FLAG
+       dev->tvnorm = video_template->current_norm;
+#endif
+
+       /* init video dma queues */
+       dev->timeout_data[chan_num].dev = dev;
+       dev->timeout_data[chan_num].channel = &dev->sram_channels[chan_num];
+       INIT_LIST_HEAD(&dev->vidq[chan_num].active);
+       INIT_LIST_HEAD(&dev->vidq[chan_num].queued);
+       dev->vidq[chan_num].timeout.function = cx25821_vid_timeout;
+       dev->vidq[chan_num].timeout.data =
+           (unsigned long)&dev->timeout_data[chan_num];
+       init_timer(&dev->vidq[chan_num].timeout);
+       cx25821_risc_stopper(dev->pci, &dev->vidq[chan_num].stopper,
+                            dev->sram_channels[chan_num].dma_ctl, 0x11, 0);
+
+       /* register v4l devices */
+       dev->video_dev[chan_num] =
+           cx25821_vdev_init(dev, dev->pci, video_template, "video");
+       err =
+           video_register_device(dev->video_dev[chan_num], VFL_TYPE_GRABBER,
+                                 video_nr[dev->nr]);
+
+       if (err < 0) {
+               goto fail_unreg;
+       }
+       //set PCI interrupt
+       cx_set(PCI_INT_MSK, 0xff);
+
+       /* initial device configuration */
+       mutex_lock(&dev->lock);
+#ifdef TUNER_FLAG
+       cx25821_set_tvnorm(dev, dev->tvnorm);
+#endif
+       mutex_unlock(&dev->lock);
+
+       init_controls(dev, chan_num);
+
+       return 0;
+
+      fail_unreg:
+       cx25821_video_unregister(dev, chan_num);
+       return err;
+}
+
+int buffer_setup(struct videobuf_queue *q, unsigned int *count,
+                unsigned int *size)
+{
+       struct cx25821_fh *fh = q->priv_data;
+
+       *size = fh->fmt->depth * fh->width * fh->height >> 3;
+
+       if (0 == *count)
+               *count = 32;
+
+       while (*size * *count > vid_limit * 1024 * 1024)
+               (*count)--;
+
+       return 0;
+}
+
+int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
+                  enum v4l2_field field)
+{
+       struct cx25821_fh *fh = q->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       int rc, init_buffer = 0;
+       u32 line0_offset, line1_offset;
+       struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);
+       int bpl_local = LINE_SIZE_D1;
+       int channel_opened = 0;
+
+       BUG_ON(NULL == fh->fmt);
+       if (fh->width < 48 || fh->width > 720 ||
+           fh->height < 32 || fh->height > 576)
+               return -EINVAL;
+
+       buf->vb.size = (fh->width * fh->height * fh->fmt->depth) >> 3;
+
+       if (0 != buf->vb.baddr && buf->vb.bsize < buf->vb.size)
+               return -EINVAL;
+
+       if (buf->fmt != fh->fmt ||
+           buf->vb.width != fh->width ||
+           buf->vb.height != fh->height || buf->vb.field != field) {
+               buf->fmt = fh->fmt;
+               buf->vb.width = fh->width;
+               buf->vb.height = fh->height;
+               buf->vb.field = field;
+               init_buffer = 1;
+       }
+
+       if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+               init_buffer = 1;
+               rc = videobuf_iolock(q, &buf->vb, NULL);
+               if (0 != rc) {
+                       printk(KERN_DEBUG "videobuf_iolock failed!\n");
+                       goto fail;
+               }
+       }
+
+       dprintk(1, "init_buffer=%d\n", init_buffer);
+
+       if (init_buffer) {
+
+               channel_opened = dev->channel_opened;
+               channel_opened = (channel_opened < 0
+                                 || channel_opened > 7) ? 7 : channel_opened;
+
+               if (dev->pixel_formats[channel_opened] == PIXEL_FRMT_411)
+                       buf->bpl = (buf->fmt->depth * buf->vb.width) >> 3;
+               else
+                       buf->bpl = (buf->fmt->depth >> 3) * (buf->vb.width);
+
+               if (dev->pixel_formats[channel_opened] == PIXEL_FRMT_411) {
+                       bpl_local = buf->bpl;
+               } else {
+                       bpl_local = buf->bpl;   //Default
+
+                       if (channel_opened >= 0 && channel_opened <= 7) {
+                               if (dev->use_cif_resolution[channel_opened]) {
+                                       if (dev->tvnorm & V4L2_STD_PAL_BG
+                                           || dev->tvnorm & V4L2_STD_PAL_DK)
+                                               bpl_local = 352 << 1;
+                                       else
+                                               bpl_local =
+                                                   dev->
+                                                   cif_width[channel_opened] <<
+                                                   1;
+                               }
+                       }
+               }
+
+               switch (buf->vb.field) {
+               case V4L2_FIELD_TOP:
+                       cx25821_risc_buffer(dev->pci, &buf->risc,
+                                           dma->sglist, 0, UNSET,
+                                           buf->bpl, 0, buf->vb.height);
+                       break;
+               case V4L2_FIELD_BOTTOM:
+                       cx25821_risc_buffer(dev->pci, &buf->risc,
+                                           dma->sglist, UNSET, 0,
+                                           buf->bpl, 0, buf->vb.height);
+                       break;
+               case V4L2_FIELD_INTERLACED:
+                       /* All other formats are top field first */
+                       line0_offset = 0;
+                       line1_offset = buf->bpl;
+                       dprintk(1, "top field first\n");
+
+                       cx25821_risc_buffer(dev->pci, &buf->risc,
+                                           dma->sglist, line0_offset,
+                                           bpl_local, bpl_local, bpl_local,
+                                           buf->vb.height >> 1);
+                       break;
+               case V4L2_FIELD_SEQ_TB:
+                       cx25821_risc_buffer(dev->pci, &buf->risc,
+                                           dma->sglist,
+                                           0, buf->bpl * (buf->vb.height >> 1),
+                                           buf->bpl, 0, buf->vb.height >> 1);
+                       break;
+               case V4L2_FIELD_SEQ_BT:
+                       cx25821_risc_buffer(dev->pci, &buf->risc,
+                                           dma->sglist,
+                                           buf->bpl * (buf->vb.height >> 1), 0,
+                                           buf->bpl, 0, buf->vb.height >> 1);
+                       break;
+               default:
+                       BUG();
+               }
+       }
+
+       dprintk(2, "[%p/%d] buffer_prep - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
+               buf, buf->vb.i, fh->width, fh->height, fh->fmt->depth,
+               fh->fmt->name, (unsigned long)buf->risc.dma);
+
+       buf->vb.state = VIDEOBUF_PREPARED;
+
+       return 0;
+
+      fail:
+       cx25821_free_buffer(q, buf);
+       return rc;
+}
+
+void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+
+       cx25821_free_buffer(q, buf);
+}
+
+struct videobuf_queue *get_queue(struct cx25821_fh *fh)
+{
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               return &fh->vidq;
+       default:
+               BUG();
+               return NULL;
+       }
+}
+
+int get_resource(struct cx25821_fh *fh, int resource)
+{
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               return resource;
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+int video_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       return videobuf_mmap_mapper(get_queue(fh), vma);
+}
+
+/* VIDEO IOCTLS                                                       */
+int vidioc_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+
+       f->fmt.pix.width = fh->width;
+       f->fmt.pix.height = fh->height;
+       f->fmt.pix.field = fh->vidq.field;
+       f->fmt.pix.pixelformat = fh->fmt->fourcc;
+       f->fmt.pix.bytesperline = (f->fmt.pix.width * fh->fmt->depth) >> 3;
+       f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
+
+       return 0;
+}
+
+int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f)
+{
+       struct cx25821_fmt *fmt;
+       enum v4l2_field field;
+       unsigned int maxw, maxh;
+
+       fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       if (NULL == fmt)
+               return -EINVAL;
+
+       field = f->fmt.pix.field;
+       maxw = 720;
+       maxh = 576;
+
+       if (V4L2_FIELD_ANY == field) {
+               field = (f->fmt.pix.height > maxh / 2)
+                   ? V4L2_FIELD_INTERLACED : V4L2_FIELD_TOP;
+       }
+
+       switch (field) {
+       case V4L2_FIELD_TOP:
+       case V4L2_FIELD_BOTTOM:
+               maxh = maxh / 2;
+               break;
+       case V4L2_FIELD_INTERLACED:
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       f->fmt.pix.field = field;
+       if (f->fmt.pix.height < 32)
+               f->fmt.pix.height = 32;
+       if (f->fmt.pix.height > maxh)
+               f->fmt.pix.height = maxh;
+       if (f->fmt.pix.width < 48)
+               f->fmt.pix.width = 48;
+       if (f->fmt.pix.width > maxw)
+               f->fmt.pix.width = maxw;
+       f->fmt.pix.width &= ~0x03;
+       f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3;
+       f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
+
+       return 0;
+}
+
+int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *cap)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       strcpy(cap->driver, "cx25821");
+       strlcpy(cap->card, cx25821_boards[dev->board].name, sizeof(cap->card));
+       sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));
+       cap->version = CX25821_VERSION_CODE;
+       cap->capabilities =
+           V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+       if (UNSET != dev->tuner_type)
+               cap->capabilities |= V4L2_CAP_TUNER;
+       return 0;
+}
+
+int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
+                           struct v4l2_fmtdesc *f)
+{
+       if (unlikely(f->index >= ARRAY_SIZE(formats)))
+               return -EINVAL;
+
+       strlcpy(f->description, formats[f->index].name, sizeof(f->description));
+       f->pixelformat = formats[f->index].fourcc;
+
+       return 0;
+}
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
+{
+       struct cx25821_fh *fh = priv;
+       struct videobuf_queue *q;
+       struct v4l2_requestbuffers req;
+       unsigned int i;
+       int err;
+
+       q = get_queue(fh);
+       memset(&req, 0, sizeof(req));
+       req.type = q->type;
+       req.count = 8;
+       req.memory = V4L2_MEMORY_MMAP;
+       err = videobuf_reqbufs(q, &req);
+       if (err < 0)
+               return err;
+
+       mbuf->frames = req.count;
+       mbuf->size = 0;
+       for (i = 0; i < mbuf->frames; i++) {
+               mbuf->offsets[i] = q->bufs[i]->boff;
+               mbuf->size += q->bufs[i]->bsize;
+       }
+       return 0;
+}
+#endif
+
+int vidioc_reqbufs(struct file *file, void *priv, struct v4l2_requestbuffers *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_reqbufs(get_queue(fh), p);
+}
+
+int vidioc_querybuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_querybuf(get_queue(fh), p);
+}
+
+int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_qbuf(get_queue(fh), p);
+}
+
+int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev;
+
+       *p = v4l2_prio_max(&dev->prio);
+
+       return 0;
+}
+
+int vidioc_s_priority(struct file *file, void *f, enum v4l2_priority prio)
+{
+       struct cx25821_fh *fh = f;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev;
+
+       return v4l2_prio_change(&dev->prio, &fh->prio, prio);
+}
+
+#ifdef TUNER_FLAG
+int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       dprintk(1, "%s()\n", __func__);
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       if (dev->tvnorm == *tvnorms) {
+               return 0;
+       }
+
+       mutex_lock(&dev->lock);
+       cx25821_set_tvnorm(dev, *tvnorms);
+       mutex_unlock(&dev->lock);
+
+       medusa_set_videostandard(dev);
+
+       return 0;
+}
+#endif
+
+int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i)
+{
+       static const char *iname[] = {
+               [CX25821_VMUX_COMPOSITE] = "Composite",
+               [CX25821_VMUX_SVIDEO] = "S-Video",
+               [CX25821_VMUX_DEBUG] = "for debug only",
+       };
+       unsigned int n;
+       dprintk(1, "%s()\n", __func__);
+
+       n = i->index;
+       if (n > 2)
+               return -EINVAL;
+
+       if (0 == INPUT(n)->type)
+               return -EINVAL;
+
+       memset(i, 0, sizeof(*i));
+       i->index = n;
+       i->type = V4L2_INPUT_TYPE_CAMERA;
+       strcpy(i->name, iname[INPUT(n)->type]);
+
+       i->std = CX25821_NORMS;
+       return 0;
+}
+
+int vidioc_enum_input(struct file *file, void *priv, struct v4l2_input *i)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       dprintk(1, "%s()\n", __func__);
+       return cx25821_enum_input(dev, i);
+}
+
+int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       *i = dev->input;
+       dprintk(1, "%s() returns %d\n", __func__, *i);
+       return 0;
+}
+
+int vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       dprintk(1, "%s(%d)\n", __func__, i);
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       if (i > 2) {
+               dprintk(1, "%s() -EINVAL\n", __func__);
+               return -EINVAL;
+       }
+
+       mutex_lock(&dev->lock);
+       cx25821_video_mux(dev, i);
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+#ifdef TUNER_FLAG
+int vidioc_g_frequency(struct file *file, void *priv, struct v4l2_frequency *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       f->frequency = dev->freq;
+
+       cx25821_call_all(dev, tuner, g_frequency, f);
+
+       return 0;
+}
+
+int cx25821_set_freq(struct cx25821_dev *dev, struct v4l2_frequency *f)
+{
+       mutex_lock(&dev->lock);
+       dev->freq = f->frequency;
+
+       cx25821_call_all(dev, tuner, s_frequency, f);
+
+       /* When changing channels it is required to reset TVAUDIO */
+       msleep(10);
+
+       mutex_unlock(&dev->lock);
+
+       return 0;
+}
+
+int vidioc_s_frequency(struct file *file, void *priv, struct v4l2_frequency *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_freq(dev, f);
+}
+#endif
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+int vidioc_g_register(struct file *file, void *fh,
+                     struct v4l2_dbg_register *reg)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)fh)->dev;
+
+       if (!v4l2_chip_match_host(&reg->match))
+               return -EINVAL;
+
+       cx25821_call_all(dev, core, g_register, reg);
+
+       return 0;
+}
+
+int vidioc_s_register(struct file *file, void *fh,
+                     struct v4l2_dbg_register *reg)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)fh)->dev;
+
+       if (!v4l2_chip_match_host(&reg->match))
+               return -EINVAL;
+
+       cx25821_call_all(dev, core, s_register, reg);
+
+       return 0;
+}
+
+#endif
+
+#ifdef TUNER_FLAG
+int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       if (unlikely(UNSET == dev->tuner_type))
+               return -EINVAL;
+       if (0 != t->index)
+               return -EINVAL;
+
+       strcpy(t->name, "Television");
+       t->type = V4L2_TUNER_ANALOG_TV;
+       t->capability = V4L2_TUNER_CAP_NORM;
+       t->rangehigh = 0xffffffffUL;
+
+       t->signal = 0xffff;     /* LOCKED */
+       return 0;
+}
+
+int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       struct cx25821_fh *fh = priv;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(1, "%s()\n", __func__);
+       if (UNSET == dev->tuner_type)
+               return -EINVAL;
+       if (0 != t->index)
+               return -EINVAL;
+
+       return 0;
+}
+
+#endif
+// ******************************************************************************************
+static const struct v4l2_queryctrl no_ctl = {
+       .name = "42",
+       .flags = V4L2_CTRL_FLAG_DISABLED,
+};
+
+static struct v4l2_queryctrl cx25821_ctls[] = {
+       /* --- video --- */
+       {
+        .id = V4L2_CID_BRIGHTNESS,
+        .name = "Brightness",
+        .minimum = 0,
+        .maximum = 10000,
+        .step = 1,
+        .default_value = 6200,
+        .type = V4L2_CTRL_TYPE_INTEGER,
+        }, {
+            .id = V4L2_CID_CONTRAST,
+            .name = "Contrast",
+            .minimum = 0,
+            .maximum = 10000,
+            .step = 1,
+            .default_value = 5000,
+            .type = V4L2_CTRL_TYPE_INTEGER,
+            }, {
+                .id = V4L2_CID_SATURATION,
+                .name = "Saturation",
+                .minimum = 0,
+                .maximum = 10000,
+                .step = 1,
+                .default_value = 5000,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                }, {
+                    .id = V4L2_CID_HUE,
+                    .name = "Hue",
+                    .minimum = 0,
+                    .maximum = 10000,
+                    .step = 1,
+                    .default_value = 5000,
+                    .type = V4L2_CTRL_TYPE_INTEGER,
+                    }
+};
+static const int CX25821_CTLS = ARRAY_SIZE(cx25821_ctls);
+
+static int cx25821_ctrl_query(struct v4l2_queryctrl *qctrl)
+{
+       int i;
+
+       if (qctrl->id < V4L2_CID_BASE || qctrl->id >= V4L2_CID_LASTP1)
+               return -EINVAL;
+       for (i = 0; i < CX25821_CTLS; i++)
+               if (cx25821_ctls[i].id == qctrl->id)
+                       break;
+       if (i == CX25821_CTLS) {
+               *qctrl = no_ctl;
+               return 0;
+       }
+       *qctrl = cx25821_ctls[i];
+       return 0;
+}
+
+int vidioc_queryctrl(struct file *file, void *priv,
+                    struct v4l2_queryctrl *qctrl)
+{
+       return cx25821_ctrl_query(qctrl);
+}
+
+/* ------------------------------------------------------------------ */
+/* VIDEO CTRL IOCTLS                                                  */
+
+static const struct v4l2_queryctrl *ctrl_by_id(unsigned int id)
+{
+       unsigned int i;
+
+       for (i = 0; i < CX25821_CTLS; i++)
+               if (cx25821_ctls[i].id == id)
+                       return cx25821_ctls + i;
+       return NULL;
+}
+
+int vidioc_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctl)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       const struct v4l2_queryctrl *ctrl;
+
+       ctrl = ctrl_by_id(ctl->id);
+
+       if (NULL == ctrl)
+               return -EINVAL;
+       switch (ctl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               ctl->value = dev->ctl_bright;
+               break;
+       case V4L2_CID_HUE:
+               ctl->value = dev->ctl_hue;
+               break;
+       case V4L2_CID_CONTRAST:
+               ctl->value = dev->ctl_contrast;
+               break;
+       case V4L2_CID_SATURATION:
+               ctl->value = dev->ctl_saturation;
+               break;
+       }
+       return 0;
+}
+
+int cx25821_set_control(struct cx25821_dev *dev,
+                       struct v4l2_control *ctl, int chan_num)
+{
+       int err;
+       const struct v4l2_queryctrl *ctrl;
+
+       err = -EINVAL;
+
+       ctrl = ctrl_by_id(ctl->id);
+
+       if (NULL == ctrl)
+               return err;
+
+       switch (ctrl->type) {
+       case V4L2_CTRL_TYPE_BOOLEAN:
+       case V4L2_CTRL_TYPE_MENU:
+       case V4L2_CTRL_TYPE_INTEGER:
+               if (ctl->value < ctrl->minimum)
+                       ctl->value = ctrl->minimum;
+               if (ctl->value > ctrl->maximum)
+                       ctl->value = ctrl->maximum;
+               break;
+       default:
+               /* nothing */ ;
+       };
+
+       switch (ctl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               dev->ctl_bright = ctl->value;
+               medusa_set_brightness(dev, ctl->value, chan_num);
+               break;
+       case V4L2_CID_HUE:
+               dev->ctl_hue = ctl->value;
+               medusa_set_hue(dev, ctl->value, chan_num);
+               break;
+       case V4L2_CID_CONTRAST:
+               dev->ctl_contrast = ctl->value;
+               medusa_set_contrast(dev, ctl->value, chan_num);
+               break;
+       case V4L2_CID_SATURATION:
+               dev->ctl_saturation = ctl->value;
+               medusa_set_saturation(dev, ctl->value, chan_num);
+               break;
+       }
+
+       err = 0;
+
+       return err;
+}
+
+static void init_controls(struct cx25821_dev *dev, int chan_num)
+{
+       struct v4l2_control ctrl;
+       int i;
+       for (i = 0; i < CX25821_CTLS; i++) {
+               ctrl.id = cx25821_ctls[i].id;
+               ctrl.value = cx25821_ctls[i].default_value;
+
+               cx25821_set_control(dev, &ctrl, chan_num);
+       }
+}
+
+int vidioc_cropcap(struct file *file, void *priv, struct v4l2_cropcap *cropcap)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       cropcap->bounds.top = cropcap->bounds.left = 0;
+       cropcap->bounds.width = 720;
+       cropcap->bounds.height = dev->tvnorm == V4L2_STD_PAL_BG ? 576 : 480;
+       cropcap->pixelaspect.numerator =
+           dev->tvnorm == V4L2_STD_PAL_BG ? 59 : 10;
+       cropcap->pixelaspect.denominator =
+           dev->tvnorm == V4L2_STD_PAL_BG ? 54 : 11;
+       cropcap->defrect = cropcap->bounds;
+       return 0;
+}
+
+int vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       struct cx25821_fh *fh = priv;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+       // vidioc_s_crop not supported
+       return -EINVAL;
+}
+
+int vidioc_g_crop(struct file *file, void *priv, struct v4l2_crop *crop)
+{
+       // vidioc_g_crop not supported
+       return -EINVAL;
+}
+
+int vidioc_querystd(struct file *file, void *priv, v4l2_std_id * norm)
+{
+       // medusa does not support video standard sensing of current input
+       *norm = CX25821_NORMS;
+
+       return 0;
+}
+
+int is_valid_width(u32 width, v4l2_std_id tvnorm)
+{
+       if (tvnorm == V4L2_STD_PAL_BG) {
+               if (width == 352 || width == 720)
+                       return 1;
+               else
+                       return 0;
+       }
+
+       if (tvnorm == V4L2_STD_NTSC_M) {
+               if (width == 320 || width == 352 || width == 720)
+                       return 1;
+               else
+                       return 0;
+       }
+       return 0;
+}
+
+int is_valid_height(u32 height, v4l2_std_id tvnorm)
+{
+       if (tvnorm == V4L2_STD_PAL_BG) {
+               if (height == 576 || height == 288)
+                       return 1;
+               else
+                       return 0;
+       }
+
+       if (tvnorm == V4L2_STD_NTSC_M) {
+               if (height == 480 || height == 240)
+                       return 1;
+               else
+                       return 0;
+       }
+
+       return 0;
+}
diff --git a/drivers/staging/cx25821/cx25821-video.h b/drivers/staging/cx25821/cx25821-video.h
new file mode 100644 (file)
index 0000000..4417ff5
--- /dev/null
@@ -0,0 +1,194 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef CX25821_VIDEO_H_
+#define CX25821_VIDEO_H_
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kmod.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/kthread.h>
+#include <asm/div64.h>
+
+#include "cx25821.h"
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+#endif
+
+#define TUNER_FLAG
+
+#define VIDEO_DEBUG 0
+
+#define dprintk(level, fmt, arg...)\
+    do { if (VIDEO_DEBUG >= level)\
+       printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
+    } while (0)
+
+//For IOCTL to identify running upstream
+#define UPSTREAM_START_VIDEO        700
+#define UPSTREAM_STOP_VIDEO         701
+#define UPSTREAM_START_AUDIO        702
+#define UPSTREAM_STOP_AUDIO         703
+#define UPSTREAM_DUMP_REGISTERS     702
+#define SET_VIDEO_STD               800
+#define SET_PIXEL_FORMAT            1000
+#define ENABLE_CIF_RESOLUTION       1001
+
+#define REG_READ                   900
+#define REG_WRITE                  901
+#define MEDUSA_READ                910
+#define MEDUSA_WRITE           911
+
+extern struct sram_channel *channel0;
+extern struct sram_channel *channel1;
+extern struct sram_channel *channel2;
+extern struct sram_channel *channel3;
+extern struct sram_channel *channel4;
+extern struct sram_channel *channel5;
+extern struct sram_channel *channel6;
+extern struct sram_channel *channel7;
+extern struct sram_channel *channel9;
+extern struct sram_channel *channel10;
+extern struct sram_channel *channel11;
+extern struct video_device cx25821_video_template0;
+extern struct video_device cx25821_video_template1;
+extern struct video_device cx25821_video_template2;
+extern struct video_device cx25821_video_template3;
+extern struct video_device cx25821_video_template4;
+extern struct video_device cx25821_video_template5;
+extern struct video_device cx25821_video_template6;
+extern struct video_device cx25821_video_template7;
+extern struct video_device cx25821_video_template9;
+extern struct video_device cx25821_video_template10;
+extern struct video_device cx25821_video_template11;
+extern struct video_device cx25821_videoioctl_template;
+//extern const u32 *ctrl_classes[];
+
+extern unsigned int vid_limit;
+
+#define FORMAT_FLAGS_PACKED       0x01
+extern struct cx25821_fmt formats[];
+extern struct cx25821_fmt *format_by_fourcc(unsigned int fourcc);
+extern struct cx25821_data timeout_data[MAX_VID_CHANNEL_NUM];
+
+extern void dump_video_queue(struct cx25821_dev *dev,
+                            struct cx25821_dmaqueue *q);
+extern void cx25821_video_wakeup(struct cx25821_dev *dev,
+                                struct cx25821_dmaqueue *q, u32 count);
+
+#ifdef TUNER_FLAG
+extern int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm);
+#endif
+
+extern int res_get(struct cx25821_dev *dev, struct cx25821_fh *fh,
+                  unsigned int bit);
+extern int res_check(struct cx25821_fh *fh, unsigned int bit);
+extern int res_locked(struct cx25821_dev *dev, unsigned int bit);
+extern void res_free(struct cx25821_dev *dev, struct cx25821_fh *fh,
+                    unsigned int bits);
+extern int cx25821_video_mux(struct cx25821_dev *dev, unsigned int input);
+extern int cx25821_start_video_dma(struct cx25821_dev *dev,
+                                  struct cx25821_dmaqueue *q,
+                                  struct cx25821_buffer *buf,
+                                  struct sram_channel *channel);
+
+extern int cx25821_set_scale(struct cx25821_dev *dev, unsigned int width,
+                            unsigned int height, enum v4l2_field field);
+extern int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status);
+extern void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num);
+extern int cx25821_video_register(struct cx25821_dev *dev, int chan_num,
+                                 struct video_device *video_template);
+extern int get_format_size(void);
+
+extern int buffer_setup(struct videobuf_queue *q, unsigned int *count,
+                       unsigned int *size);
+extern int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
+                         enum v4l2_field field);
+extern void buffer_release(struct videobuf_queue *q,
+                          struct videobuf_buffer *vb);
+extern struct videobuf_queue *get_queue(struct cx25821_fh *fh);
+extern int get_resource(struct cx25821_fh *fh, int resource);
+extern int video_mmap(struct file *file, struct vm_area_struct *vma);
+extern int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+                                 struct v4l2_format *f);
+extern int vidioc_querycap(struct file *file, void *priv,
+                          struct v4l2_capability *cap);
+extern int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
+                                  struct v4l2_fmtdesc *f);
+extern int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf);
+extern int vidioc_reqbufs(struct file *file, void *priv,
+                         struct v4l2_requestbuffers *p);
+extern int vidioc_querybuf(struct file *file, void *priv,
+                          struct v4l2_buffer *p);
+extern int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p);
+extern int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms);
+extern int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i);
+extern int vidioc_enum_input(struct file *file, void *priv,
+                            struct v4l2_input *i);
+extern int vidioc_g_input(struct file *file, void *priv, unsigned int *i);
+extern int vidioc_s_input(struct file *file, void *priv, unsigned int i);
+extern int vidioc_g_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl);
+extern int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f);
+extern int vidioc_g_frequency(struct file *file, void *priv,
+                             struct v4l2_frequency *f);
+extern int cx25821_set_freq(struct cx25821_dev *dev, struct v4l2_frequency *f);
+extern int vidioc_s_frequency(struct file *file, void *priv,
+                             struct v4l2_frequency *f);
+extern int vidioc_g_register(struct file *file, void *fh,
+                            struct v4l2_dbg_register *reg);
+extern int vidioc_s_register(struct file *file, void *fh,
+                            struct v4l2_dbg_register *reg);
+extern int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t);
+extern int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t);
+
+extern int is_valid_width(u32 width, v4l2_std_id tvnorm);
+extern int is_valid_height(u32 height, v4l2_std_id tvnorm);
+
+extern int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p);
+extern int vidioc_s_priority(struct file *file, void *f,
+                            enum v4l2_priority prio);
+
+extern int vidioc_queryctrl(struct file *file, void *priv,
+                           struct v4l2_queryctrl *qctrl);
+extern int cx25821_set_control(struct cx25821_dev *dev,
+                              struct v4l2_control *ctrl, int chan_num);
+
+extern int vidioc_cropcap(struct file *file, void *fh,
+                         struct v4l2_cropcap *cropcap);
+extern int vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop);
+extern int vidioc_g_crop(struct file *file, void *priv, struct v4l2_crop *crop);
+
+extern int vidioc_querystd(struct file *file, void *priv, v4l2_std_id * norm);
+#endif
diff --git a/drivers/staging/cx25821/cx25821-video0.c b/drivers/staging/cx25821/cx25821-video0.c
new file mode 100644 (file)
index 0000000..950fac1
--- /dev/null
@@ -0,0 +1,451 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH00];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH00]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH00]
+                   && h->video_dev[SRAM_CH00]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH00;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO0))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO0)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH00]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel0->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO0)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO0);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO0)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO0);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = PIXEL_FRMT_422;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH00, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH00] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH00] = 0;
+       }
+       dev->cif_width[SRAM_CH00] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH00);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH00].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH00];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 0 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH00);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template0 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video1.c b/drivers/staging/cx25821/cx25821-video1.c
new file mode 100644 (file)
index 0000000..a4dddc6
--- /dev/null
@@ -0,0 +1,451 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH01];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH01]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH01]
+                   && h->video_dev[SRAM_CH01]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH01;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO1))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO1)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH01]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel1->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO1)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO1);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO1)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO1);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH01, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH01] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH01] = 0;
+       }
+       dev->cif_width[SRAM_CH01] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH01);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH01].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH01];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 1 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH01);
+}
+
+//exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template1 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video2.c b/drivers/staging/cx25821/cx25821-video2.c
new file mode 100644 (file)
index 0000000..8e04e25
--- /dev/null
@@ -0,0 +1,452 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH02];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH02]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH02]
+                   && h->video_dev[SRAM_CH02]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH02;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO2))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO2)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH02]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel2->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO2)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO2);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO2)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO2);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH02, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH02] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH02] = 0;
+       }
+       dev->cif_width[SRAM_CH02] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH02);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH02].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH02];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 2 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH02);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template2 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video3.c b/drivers/staging/cx25821/cx25821-video3.c
new file mode 100644 (file)
index 0000000..8801a8e
--- /dev/null
@@ -0,0 +1,451 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH03];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH03]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH03]
+                   && h->video_dev[SRAM_CH03]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH03;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO3))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO3)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH03]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel3->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO3)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO3);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO3)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO3);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH03, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH03] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH03] = 0;
+       }
+       dev->cif_width[SRAM_CH03] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH03);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH03].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH03];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 3 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH03);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template3 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video4.c b/drivers/staging/cx25821/cx25821-video4.c
new file mode 100644 (file)
index 0000000..ab0d747
--- /dev/null
@@ -0,0 +1,450 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH04];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH04]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH04]
+                   && h->video_dev[SRAM_CH04]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH04;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO4))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO4)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH04]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel4->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO4)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO4);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO4)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO4);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       // check priority
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH04, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH04] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH04] = 0;
+       }
+       dev->cif_width[SRAM_CH04] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH04);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH04].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH04];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 4 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH04);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template4 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video5.c b/drivers/staging/cx25821/cx25821-video5.c
new file mode 100644 (file)
index 0000000..7ef0b97
--- /dev/null
@@ -0,0 +1,450 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH05];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH05]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH05]
+                   && h->video_dev[SRAM_CH05]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH05;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO5))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO5)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH05]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel5->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO5)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO5);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO5)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO5);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH05, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH05] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH05] = 0;
+       }
+       dev->cif_width[SRAM_CH05] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH05);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH05].count;
+
+       return ret_val;
+}
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH05];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 5 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH05);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template5 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video6.c b/drivers/staging/cx25821/cx25821-video6.c
new file mode 100644 (file)
index 0000000..3c41b49
--- /dev/null
@@ -0,0 +1,450 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH06];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH06]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH06]
+                   && h->video_dev[SRAM_CH06]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH06;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO6))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO6)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH06]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel6->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO6)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO6);
+       }
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO6)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO6);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH06, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH06] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH06] = 0;
+       }
+       dev->cif_width[SRAM_CH06] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH06);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH06].count;
+
+       return ret_val;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH06];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 6 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH06);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template6 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-video7.c b/drivers/staging/cx25821/cx25821-video7.c
new file mode 100644 (file)
index 0000000..625c9b7
--- /dev/null
@@ -0,0 +1,449 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH07];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH07]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH07]
+                   && h->video_dev[SRAM_CH07]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = SRAM_CH07;
+       pix_format =
+           (dev->pixel_formats[dev->channel_opened] ==
+            PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO7))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO7)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
+               if (buf->vb.state == VIDEOBUF_DONE) {
+                       struct cx25821_dev *dev = fh->dev;
+
+                       if (dev && dev->use_cif_resolution[SRAM_CH07]) {
+                               u8 cam_id = *((char *)buf->vb.baddr + 3);
+                               memcpy((char *)buf->vb.baddr,
+                                      (char *)buf->vb.baddr + (fh->width * 2),
+                                      (fh->width * 2));
+                               *((char *)buf->vb.baddr + 3) = cam_id;
+                       }
+               }
+
+               return POLLIN | POLLRDNORM;
+       }
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       cx_write(channel7->dma_ctl, 0); /* FIFO and RISC disable */
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO7)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO7);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO7)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO7);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+       int pix_format = 0;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->vidq.field = f->fmt.pix.field;
+
+       // check if width and height is valid based on set standard
+       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+               fh->width = f->fmt.pix.width;
+       }
+
+       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+               fh->height = f->fmt.pix.height;
+       }
+
+       if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_Y41P)
+               pix_format = PIXEL_FRMT_411;
+       else if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_YUYV)
+               pix_format = PIXEL_FRMT_422;
+       else
+               return -EINVAL;
+
+       cx25821_set_pixel_format(dev, SRAM_CH07, pix_format);
+
+       // check if cif resolution
+       if (fh->width == 320 || fh->width == 352) {
+               dev->use_cif_resolution[SRAM_CH07] = 1;
+       } else {
+               dev->use_cif_resolution[SRAM_CH07] = 0;
+       }
+       dev->cif_width[SRAM_CH07] = fh->width;
+       medusa_set_resolution(dev, fh->width, SRAM_CH07);
+
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       int ret_val = 0;
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+
+       ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+
+       p->sequence = dev->vidq[SRAM_CH07].count;
+
+       return ret_val;
+}
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH07];
+       u32 tmp = 0;
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+
+       tmp = cx_read(sram_ch->dma_ctl);
+       printk(KERN_INFO "Video input 7 is %s\n",
+              (tmp & 0x11) ? "streaming" : "stopped");
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return cx25821_set_control(dev, ctl, SRAM_CH07);
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template7 = {
+       .name = "cx25821-video",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-videoioctl.c b/drivers/staging/cx25821/cx25821-videoioctl.c
new file mode 100644 (file)
index 0000000..2a312ce
--- /dev/null
@@ -0,0 +1,496 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[VIDEO_IOCTL_CH];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[VIDEO_IOCTL_CH]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+       u32 pix_format;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->ioctl_dev && h->ioctl_dev->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = VIDEO_IOCTL_CH;
+       pix_format = V4L2_PIX_FMT_YUYV;
+       fh->fmt = format_by_fourcc(pix_format);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO_IOCTL))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO_IOCTL)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR)
+               return POLLIN | POLLRDNORM;
+
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO_IOCTL)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO_IOCTL);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO_IOCTL)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO_IOCTL);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->width = f->fmt.pix.width;
+       fh->height = f->fmt.pix.height;
+       fh->vidq.field = f->fmt.pix.field;
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+}
+
+static long video_ioctl_set(struct file *file, unsigned int cmd,
+                           unsigned long arg)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct downstream_user_struct *data_from_user;
+       int command;
+       int width = 720;
+       int selected_channel = 0, pix_format = 0, i = 0;
+       int cif_enable = 0, cif_width = 0;
+       u32 value = 0;
+
+       data_from_user = (struct downstream_user_struct *)arg;
+
+       if (!data_from_user) {
+               printk("cx25821 in %s(): User data is INVALID. Returning.\n",
+                      __func__);
+               return 0;
+       }
+
+       command = data_from_user->command;
+
+       if (command != SET_VIDEO_STD && command != SET_PIXEL_FORMAT
+           && command != ENABLE_CIF_RESOLUTION && command != REG_READ
+           && command != REG_WRITE && command != MEDUSA_READ
+           && command != MEDUSA_WRITE) {
+               return 0;
+       }
+
+       switch (command) {
+       case SET_VIDEO_STD:
+               dev->tvnorm =
+                   !strcmp(data_from_user->vid_stdname,
+                           "PAL") ? V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
+               medusa_set_videostandard(dev);
+               break;
+
+       case SET_PIXEL_FORMAT:
+               selected_channel = data_from_user->decoder_select;
+               pix_format = data_from_user->pixel_format;
+
+               if (!(selected_channel <= 7 && selected_channel >= 0)) {
+                       selected_channel -= 4;
+                       selected_channel = selected_channel % 8;
+               }
+
+               if (selected_channel >= 0)
+                       cx25821_set_pixel_format(dev, selected_channel,
+                                                pix_format);
+
+               break;
+
+       case ENABLE_CIF_RESOLUTION:
+               selected_channel = data_from_user->decoder_select;
+               cif_enable = data_from_user->cif_resolution_enable;
+               cif_width = data_from_user->cif_width;
+
+               if (cif_enable) {
+                       if (dev->tvnorm & V4L2_STD_PAL_BG
+                           || dev->tvnorm & V4L2_STD_PAL_DK)
+                               width = 352;
+                       else
+                               width = (cif_width == 320
+                                        || cif_width == 352) ? cif_width : 320;
+               }
+
+               if (!(selected_channel <= 7 && selected_channel >= 0)) {
+                       selected_channel -= 4;
+                       selected_channel = selected_channel % 8;
+               }
+
+               if (selected_channel <= 7 && selected_channel >= 0) {
+                       dev->use_cif_resolution[selected_channel] = cif_enable;
+                       dev->cif_width[selected_channel] = width;
+               } else {
+                       for (i = 0; i < VID_CHANNEL_NUM; i++) {
+                               dev->use_cif_resolution[i] = cif_enable;
+                               dev->cif_width[i] = width;
+                       }
+               }
+
+               medusa_set_resolution(dev, width, selected_channel);
+               break;
+       case REG_READ:
+               data_from_user->reg_data = cx_read(data_from_user->reg_address);
+               break;
+       case REG_WRITE:
+               cx_write(data_from_user->reg_address, data_from_user->reg_data);
+               break;
+       case MEDUSA_READ:
+               value =
+                   cx25821_i2c_read(&dev->i2c_bus[0],
+                                    (u16) data_from_user->reg_address,
+                                    &data_from_user->reg_data);
+               break;
+       case MEDUSA_WRITE:
+               cx25821_i2c_write(&dev->i2c_bus[0],
+                                 (u16) data_from_user->reg_address,
+                                 data_from_user->reg_data);
+               break;
+       }
+
+       return 0;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return 0;
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl_set,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_videoioctl_template = {
+       .name = "cx25821-videoioctl",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-vidups10.c b/drivers/staging/cx25821/cx25821-vidups10.c
new file mode 100644 (file)
index 0000000..77b63b0
--- /dev/null
@@ -0,0 +1,435 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH10];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH10]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH10]
+                   && h->video_dev[SRAM_CH10]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = 9;
+       fh->fmt = format_by_fourcc(V4L2_PIX_FMT_YUYV);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO10))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO10)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR)
+               return POLLIN | POLLRDNORM;
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       //cx_write(channel10->dma_ctl, 0);
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO10)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO10);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO10)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO10);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static long video_ioctl_upstream10(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+       int command = 0;
+       struct upstream_user_struct *data_from_user;
+
+       data_from_user = (struct upstream_user_struct *)arg;
+
+       if (!data_from_user) {
+               printk
+                   ("cx25821 in %s(): Upstream data is INVALID. Returning.\n",
+                    __func__);
+               return 0;
+       }
+
+       command = data_from_user->command;
+
+       if (command != UPSTREAM_START_VIDEO && command != UPSTREAM_STOP_VIDEO) {
+               return 0;
+       }
+
+       dev->input_filename_ch2 = data_from_user->input_filename;
+       dev->input_audiofilename = data_from_user->input_filename;
+       dev->vid_stdname_ch2 = data_from_user->vid_stdname;
+       dev->pixel_format_ch2 = data_from_user->pixel_format;
+       dev->channel_select_ch2 = data_from_user->channel_select;
+       dev->command_ch2 = data_from_user->command;
+
+       switch (command) {
+       case UPSTREAM_START_VIDEO:
+               cx25821_start_upstream_video_ch2(dev, data_from_user);
+               break;
+
+       case UPSTREAM_STOP_VIDEO:
+               cx25821_stop_upstream_video_ch2(dev);
+               break;
+       }
+
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->width = f->fmt.pix.width;
+       fh->height = f->fmt.pix.height;
+       fh->vidq.field = f->fmt.pix.field;
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return 0;
+}
+
+//exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl_upstream10,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template10 = {
+       .name = "cx25821-upstream10",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821-vidups9.c b/drivers/staging/cx25821/cx25821-vidups9.c
new file mode 100644 (file)
index 0000000..75c8c1e
--- /dev/null
@@ -0,0 +1,433 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx25821-video.h"
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct cx25821_buffer *buf =
+           container_of(vb, struct cx25821_buffer, vb);
+       struct cx25821_buffer *prev;
+       struct cx25821_fh *fh = vq->priv_data;
+       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH09];
+
+       /* add jump to stopper */
+       buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+       buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+       buf->risc.jmp[2] = cpu_to_le32(0);      /* bits 63-32 */
+
+       dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
+
+       if (!list_empty(&q->queued)) {
+               list_add_tail(&buf->vb.queue, &q->queued);
+               buf->vb.state = VIDEOBUF_QUEUED;
+               dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
+                       buf->vb.i);
+
+       } else if (list_empty(&q->active)) {
+               list_add_tail(&buf->vb.queue, &q->active);
+               cx25821_start_video_dma(dev, q, buf,
+                                       &dev->sram_channels[SRAM_CH09]);
+               buf->vb.state = VIDEOBUF_ACTIVE;
+               buf->count = q->count++;
+               mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
+               dprintk(2,
+                       "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+                       buf, buf->vb.i, buf->count, q->count);
+       } else {
+               prev =
+                   list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
+               if (prev->vb.width == buf->vb.width
+                   && prev->vb.height == buf->vb.height
+                   && prev->fmt == buf->fmt) {
+                       list_add_tail(&buf->vb.queue, &q->active);
+                       buf->vb.state = VIDEOBUF_ACTIVE;
+                       buf->count = q->count++;
+                       prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+                       /* 64 bit bits 63-32 */
+                       prev->risc.jmp[2] = cpu_to_le32(0);
+                       dprintk(2,
+                               "[%p/%d] buffer_queue - append to active, buf->count=%d\n",
+                               buf, buf->vb.i, buf->count);
+
+               } else {
+                       list_add_tail(&buf->vb.queue, &q->queued);
+                       buf->vb.state = VIDEOBUF_QUEUED;
+                       dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf,
+                               buf->vb.i);
+               }
+       }
+
+       if (list_empty(&q->active)) {
+               dprintk(2, "active queue empty!\n");
+       }
+}
+
+static struct videobuf_queue_ops cx25821_video_qops = {
+       .buf_setup = buffer_setup,
+       .buf_prepare = buffer_prepare,
+       .buf_queue = buffer_queue,
+       .buf_release = buffer_release,
+};
+
+static int video_open(struct file *file)
+{
+       int minor = video_devdata(file)->minor;
+       struct cx25821_dev *h, *dev = NULL;
+       struct cx25821_fh *fh;
+       struct list_head *list;
+       enum v4l2_buf_type type = 0;
+
+       lock_kernel();
+       list_for_each(list, &cx25821_devlist) {
+               h = list_entry(list, struct cx25821_dev, devlist);
+
+               if (h->video_dev[SRAM_CH09]
+                   && h->video_dev[SRAM_CH09]->minor == minor) {
+                       dev = h;
+                       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+       }
+
+       if (NULL == dev) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->dev = dev;
+       fh->type = type;
+       fh->width = 720;
+
+       if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
+               fh->height = 576;
+       else
+               fh->height = 480;
+
+       dev->channel_opened = 8;
+       fh->fmt = format_by_fourcc(V4L2_PIX_FMT_YUYV);
+
+       v4l2_prio_open(&dev->prio, &fh->prio);
+
+       videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
+                              &dev->pci->dev, &dev->slock,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                              V4L2_FIELD_INTERLACED,
+                              sizeof(struct cx25821_buffer), fh);
+
+       dprintk(1, "post videobuf_queue_init()\n");
+       unlock_kernel();
+
+       return 0;
+}
+
+static ssize_t video_read(struct file *file, char __user * data, size_t count,
+                         loff_t * ppos)
+{
+       struct cx25821_fh *fh = file->private_data;
+
+       switch (fh->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+               if (res_locked(fh->dev, RESOURCE_VIDEO9))
+                       return -EBUSY;
+
+               return videobuf_read_one(&fh->vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+
+       default:
+               BUG();
+               return 0;
+       }
+}
+
+static unsigned int video_poll(struct file *file,
+                              struct poll_table_struct *wait)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_buffer *buf;
+
+       if (res_check(fh, RESOURCE_VIDEO9)) {
+               /* streaming capture */
+               if (list_empty(&fh->vidq.stream))
+                       return POLLERR;
+               buf = list_entry(fh->vidq.stream.next,
+                                struct cx25821_buffer, vb.stream);
+       } else {
+               /* read() capture */
+               buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+               if (NULL == buf)
+                       return POLLERR;
+       }
+
+       poll_wait(file, &buf->vb.done, wait);
+       if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR)
+               return POLLIN | POLLRDNORM;
+       return 0;
+}
+
+static int video_release(struct file *file)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+
+       //stop the risc engine and fifo
+       //cx_write(channel9->dma_ctl, 0);
+
+       /* stop video capture */
+       if (res_check(fh, RESOURCE_VIDEO9)) {
+               videobuf_queue_cancel(&fh->vidq);
+               res_free(dev, fh, RESOURCE_VIDEO9);
+       }
+
+       if (fh->vidq.read_buf) {
+               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               kfree(fh->vidq.read_buf);
+       }
+
+       videobuf_mmap_free(&fh->vidq);
+
+       v4l2_prio_close(&dev->prio, &fh->prio);
+
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+
+       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(i != fh->type)) {
+               return -EINVAL;
+       }
+
+       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO9)))) {
+               return -EBUSY;
+       }
+
+       return videobuf_streamon(get_queue(fh));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = fh->dev;
+       int err, res;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (i != fh->type)
+               return -EINVAL;
+
+       res = get_resource(fh, RESOURCE_VIDEO9);
+       err = videobuf_streamoff(get_queue(fh));
+       if (err < 0)
+               return err;
+       res_free(dev, fh, res);
+       return 0;
+}
+
+static long video_ioctl_upstream9(struct file *file, unsigned int cmd,
+                                 unsigned long arg)
+{
+       struct cx25821_fh *fh = file->private_data;
+       struct cx25821_dev *dev = fh->dev;
+       int command = 0;
+       struct upstream_user_struct *data_from_user;
+
+       data_from_user = (struct upstream_user_struct *)arg;
+
+       if (!data_from_user) {
+               printk
+                   ("cx25821 in %s(): Upstream data is INVALID. Returning.\n",
+                    __func__);
+               return 0;
+       }
+
+       command = data_from_user->command;
+
+       if (command != UPSTREAM_START_VIDEO && command != UPSTREAM_STOP_VIDEO) {
+               return 0;
+       }
+
+       dev->input_filename = data_from_user->input_filename;
+       dev->input_audiofilename = data_from_user->input_filename;
+       dev->vid_stdname = data_from_user->vid_stdname;
+       dev->pixel_format = data_from_user->pixel_format;
+       dev->channel_select = data_from_user->channel_select;
+       dev->command = data_from_user->command;
+
+       switch (command) {
+       case UPSTREAM_START_VIDEO:
+               cx25821_start_upstream_video_ch1(dev, data_from_user);
+               break;
+
+       case UPSTREAM_STOP_VIDEO:
+               cx25821_stop_upstream_video_ch1(dev);
+               break;
+       }
+
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct cx25821_fh *fh = priv;
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       int err;
+
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       dprintk(2, "%s()\n", __func__);
+       err = vidioc_try_fmt_vid_cap(file, priv, f);
+
+       if (0 != err)
+               return err;
+       fh->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+       fh->width = f->fmt.pix.width;
+       fh->height = f->fmt.pix.height;
+       fh->vidq.field = f->fmt.pix.field;
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
+               fh->height, fh->vidq.field);
+       cx25821_call_all(dev, video, s_fmt, f);
+       return 0;
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+       struct cx25821_fh *fh = priv;
+       return videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
+}
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       char name[32 + 2];
+
+       snprintf(name, sizeof(name), "%s/2", dev->name);
+       printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
+              dev->name);
+       cx25821_call_all(dev, core, log_status);
+       printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
+              dev->name);
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                        struct v4l2_control *ctl)
+{
+       struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
+       struct cx25821_fh *fh = priv;
+       int err;
+       if (fh) {
+               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               if (0 != err)
+                       return err;
+       }
+
+       return 0;
+}
+
+// exported stuff
+static const struct v4l2_file_operations video_fops = {
+       .owner = THIS_MODULE,
+       .open = video_open,
+       .release = video_release,
+       .read = video_read,
+       .poll = video_poll,
+       .mmap = video_mmap,
+       .ioctl = video_ioctl_upstream9,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
+       .vidioc_reqbufs = vidioc_reqbufs,
+       .vidioc_querybuf = vidioc_querybuf,
+       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_dqbuf = vidioc_dqbuf,
+#ifdef TUNER_FLAG
+       .vidioc_s_std = vidioc_s_std,
+       .vidioc_querystd = vidioc_querystd,
+#endif
+       .vidioc_cropcap = vidioc_cropcap,
+       .vidioc_s_crop = vidioc_s_crop,
+       .vidioc_g_crop = vidioc_g_crop,
+       .vidioc_enum_input = vidioc_enum_input,
+       .vidioc_g_input = vidioc_g_input,
+       .vidioc_s_input = vidioc_s_input,
+       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_s_ctrl = vidioc_s_ctrl,
+       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_streamon = vidioc_streamon,
+       .vidioc_streamoff = vidioc_streamoff,
+       .vidioc_log_status = vidioc_log_status,
+       .vidioc_g_priority = vidioc_g_priority,
+       .vidioc_s_priority = vidioc_s_priority,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf = vidiocgmbuf,
+#endif
+#ifdef TUNER_FLAG
+       .vidioc_g_tuner = vidioc_g_tuner,
+       .vidioc_s_tuner = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+#endif
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register = vidioc_g_register,
+       .vidioc_s_register = vidioc_s_register,
+#endif
+};
+
+struct video_device cx25821_video_template9 = {
+       .name = "cx25821-upstream9",
+       .fops = &video_fops,
+       .minor = -1,
+       .ioctl_ops = &video_ioctl_ops,
+       .tvnorms = CX25821_NORMS,
+       .current_norm = V4L2_STD_NTSC_M,
+};
diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/staging/cx25821/cx25821.h
new file mode 100644 (file)
index 0000000..cf2286d
--- /dev/null
@@ -0,0 +1,602 @@
+/*
+ *  Driver for the Conexant CX25821 PCIe bridge
+ *
+ *  Copyright (C) 2009 Conexant Systems Inc.
+ *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
+ *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef CX25821_H_
+#define CX25821_H_
+
+#include <linux/pci.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/kdev_t.h>
+#include <linux/smp_lock.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
+#include <media/tuner.h>
+#include <media/tveeprom.h>
+#include <media/videobuf-dma-sg.h>
+#include <media/videobuf-dvb.h>
+
+#include "btcx-risc.h"
+#include "cx25821-reg.h"
+#include "cx25821-medusa-reg.h"
+#include "cx25821-sram.h"
+#include "cx25821-audio.h"
+#include "media/cx2341x.h"
+
+#include <linux/version.h>
+#include <linux/mutex.h>
+
+#define CX25821_VERSION_CODE KERNEL_VERSION(0, 0, 106)
+
+#define UNSET (-1U)
+#define NO_SYNC_LINE (-1U)
+
+#define CX25821_MAXBOARDS 2
+
+#define TRUE    1
+#define FALSE   0
+#define LINE_SIZE_D1    1440
+
+// Number of decoders and encoders
+#define MAX_DECODERS            8
+#define MAX_ENCODERS            2
+#define QUAD_DECODERS           4
+#define MAX_CAMERAS             16
+
+/* Max number of inputs by card */
+#define MAX_CX25821_INPUT 8
+#define INPUT(nr) (&cx25821_boards[dev->board].input[nr])
+#define RESOURCE_VIDEO0       1
+#define RESOURCE_VIDEO1       2
+#define RESOURCE_VIDEO2       4
+#define RESOURCE_VIDEO3       8
+#define RESOURCE_VIDEO4       16
+#define RESOURCE_VIDEO5       32
+#define RESOURCE_VIDEO6       64
+#define RESOURCE_VIDEO7       128
+#define RESOURCE_VIDEO8       256
+#define RESOURCE_VIDEO9       512
+#define RESOURCE_VIDEO10      1024
+#define RESOURCE_VIDEO11      2048
+#define RESOURCE_VIDEO_IOCTL  4096
+
+#define BUFFER_TIMEOUT     (HZ)        /* 0.5 seconds */
+
+#define UNKNOWN_BOARD       0
+#define CX25821_BOARD        1
+
+/* Currently supported by the driver */
+#define CX25821_NORMS (\
+    V4L2_STD_NTSC_M |  V4L2_STD_NTSC_M_JP | V4L2_STD_NTSC_M_KR | \
+    V4L2_STD_PAL_BG |  V4L2_STD_PAL_DK    |  V4L2_STD_PAL_I    | \
+    V4L2_STD_PAL_M  |  V4L2_STD_PAL_N     |  V4L2_STD_PAL_H    | \
+    V4L2_STD_PAL_Nc )
+
+#define CX25821_BOARD_CONEXANT_ATHENA10 1
+#define MAX_VID_CHANNEL_NUM     12
+#define VID_CHANNEL_NUM 8
+
+struct cx25821_fmt {
+       char *name;
+       u32 fourcc;             /* v4l2 format id */
+       int depth;
+       int flags;
+       u32 cxformat;
+};
+
+struct cx25821_ctrl {
+       struct v4l2_queryctrl v;
+       u32 off;
+       u32 reg;
+       u32 mask;
+       u32 shift;
+};
+
+struct cx25821_tvnorm {
+       char *name;
+       v4l2_std_id id;
+       u32 cxiformat;
+       u32 cxoformat;
+};
+
+struct cx25821_fh {
+       struct cx25821_dev *dev;
+       enum v4l2_buf_type type;
+       int radio;
+       u32 resources;
+
+       enum v4l2_priority prio;
+
+       /* video overlay */
+       struct v4l2_window win;
+       struct v4l2_clip *clips;
+       unsigned int nclips;
+
+       /* video capture */
+       struct cx25821_fmt *fmt;
+       unsigned int width, height;
+
+       /* vbi capture */
+       struct videobuf_queue vidq;
+       struct videobuf_queue vbiq;
+
+       /* H264 Encoder specifics ONLY */
+       struct videobuf_queue mpegq;
+       atomic_t v4l_reading;
+};
+
+enum cx25821_itype {
+       CX25821_VMUX_COMPOSITE = 1,
+       CX25821_VMUX_SVIDEO,
+       CX25821_VMUX_DEBUG,
+       CX25821_RADIO,
+};
+
+enum cx25821_src_sel_type {
+       CX25821_SRC_SEL_EXT_656_VIDEO = 0,
+       CX25821_SRC_SEL_PARALLEL_MPEG_VIDEO
+};
+
+/* buffer for one video frame */
+struct cx25821_buffer {
+       /* common v4l buffer stuff -- must be first */
+       struct videobuf_buffer vb;
+
+       /* cx25821 specific */
+       unsigned int bpl;
+       struct btcx_riscmem risc;
+       struct cx25821_fmt *fmt;
+       u32 count;
+};
+
+struct cx25821_input {
+       enum cx25821_itype type;
+       unsigned int vmux;
+       u32 gpio0, gpio1, gpio2, gpio3;
+};
+
+typedef enum {
+       CX25821_UNDEFINED = 0,
+       CX25821_RAW,
+       CX25821_264
+} port_t;
+
+struct cx25821_board {
+       char *name;
+       port_t porta, portb, portc;
+       unsigned int tuner_type;
+       unsigned int radio_type;
+       unsigned char tuner_addr;
+       unsigned char radio_addr;
+
+       u32 clk_freq;
+       struct cx25821_input input[2];
+};
+
+struct cx25821_subid {
+       u16 subvendor;
+       u16 subdevice;
+       u32 card;
+};
+
+struct cx25821_i2c {
+       struct cx25821_dev *dev;
+
+       int nr;
+
+       /* i2c i/o */
+       struct i2c_adapter i2c_adap;
+       struct i2c_algo_bit_data i2c_algo;
+       struct i2c_client i2c_client;
+       u32 i2c_rc;
+
+       /* cx25821 registers used for raw addess */
+       u32 i2c_period;
+       u32 reg_ctrl;
+       u32 reg_stat;
+       u32 reg_addr;
+       u32 reg_rdata;
+       u32 reg_wdata;
+};
+
+struct cx25821_dmaqueue {
+       struct list_head active;
+       struct list_head queued;
+       struct timer_list timeout;
+       struct btcx_riscmem stopper;
+       u32 count;
+};
+
+struct cx25821_data {
+       struct cx25821_dev *dev;
+       struct sram_channel *channel;
+};
+
+struct cx25821_dev {
+       struct list_head devlist;
+       atomic_t refcount;
+       struct v4l2_device v4l2_dev;
+
+       struct v4l2_prio_state prio;
+
+       /* pci stuff */
+       struct pci_dev *pci;
+       unsigned char pci_rev, pci_lat;
+       int pci_bus, pci_slot;
+       u32 base_io_addr;
+       u32 __iomem *lmmio;
+       u8 __iomem *bmmio;
+       int pci_irqmask;
+       int hwrevision;
+
+       u32 clk_freq;
+
+       /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
+       struct cx25821_i2c i2c_bus[3];
+
+       int nr;
+       struct mutex lock;
+
+       /* board details */
+       unsigned int board;
+       char name[32];
+
+       /* sram configuration */
+       struct sram_channel *sram_channels;
+
+       /* Analog video */
+       u32 resources;
+       unsigned int input;
+       u32 tvaudio;
+       v4l2_std_id tvnorm;
+       unsigned int tuner_type;
+       unsigned char tuner_addr;
+       unsigned int radio_type;
+       unsigned char radio_addr;
+       unsigned int has_radio;
+       unsigned int videc_type;
+       unsigned char videc_addr;
+       unsigned short _max_num_decoders;
+
+       int ctl_bright;
+       int ctl_contrast;
+       int ctl_hue;
+       int ctl_saturation;
+
+       struct cx25821_data timeout_data[MAX_VID_CHANNEL_NUM];
+
+       /* Analog Audio Upstream */
+       int _audio_is_running;
+       int _audiopixel_format;
+       int _is_first_audio_frame;
+       int _audiofile_status;
+       int _audio_lines_count;
+       int _audioframe_count;
+       int _audio_upstream_channel_select;
+       int _last_index_irq;    //The last interrupt index processed.
+
+       __le32 *_risc_audio_jmp_addr;
+       __le32 *_risc_virt_start_addr;
+       __le32 *_risc_virt_addr;
+       dma_addr_t _risc_phys_addr;
+       dma_addr_t _risc_phys_start_addr;
+
+       unsigned int _audiorisc_size;
+       unsigned int _audiodata_buf_size;
+       __le32 *_audiodata_buf_virt_addr;
+       dma_addr_t _audiodata_buf_phys_addr;
+       char *_audiofilename;
+
+       /* V4l */
+       u32 freq;
+       struct video_device *video_dev[MAX_VID_CHANNEL_NUM];
+       struct video_device *vbi_dev;
+       struct video_device *radio_dev;
+       struct video_device *ioctl_dev;
+
+       struct cx25821_dmaqueue vidq[MAX_VID_CHANNEL_NUM];
+       spinlock_t slock;
+
+       /* Video Upstream */
+       int _line_size;
+       int _prog_cnt;
+       int _pixel_format;
+       int _is_first_frame;
+       int _is_running;
+       int _file_status;
+       int _lines_count;
+       int _frame_count;
+       int _channel_upstream_select;
+       unsigned int _risc_size;
+
+       __le32 *_dma_virt_start_addr;
+       __le32 *_dma_virt_addr;
+       dma_addr_t _dma_phys_addr;
+       dma_addr_t _dma_phys_start_addr;
+
+       unsigned int _data_buf_size;
+       __le32 *_data_buf_virt_addr;
+       dma_addr_t _data_buf_phys_addr;
+       char *_filename;
+       char *_defaultname;
+
+       int _line_size_ch2;
+       int _prog_cnt_ch2;
+       int _pixel_format_ch2;
+       int _is_first_frame_ch2;
+       int _is_running_ch2;
+       int _file_status_ch2;
+       int _lines_count_ch2;
+       int _frame_count_ch2;
+       int _channel2_upstream_select;
+       unsigned int _risc_size_ch2;
+
+       __le32 *_dma_virt_start_addr_ch2;
+       __le32 *_dma_virt_addr_ch2;
+       dma_addr_t _dma_phys_addr_ch2;
+       dma_addr_t _dma_phys_start_addr_ch2;
+
+       unsigned int _data_buf_size_ch2;
+       __le32 *_data_buf_virt_addr_ch2;
+       dma_addr_t _data_buf_phys_addr_ch2;
+       char *_filename_ch2;
+       char *_defaultname_ch2;
+
+       /* MPEG Encoder ONLY settings */
+       u32 cx23417_mailbox;
+       struct cx2341x_mpeg_params mpeg_params;
+       struct video_device *v4l_device;
+       atomic_t v4l_reader_count;
+       struct cx25821_tvnorm encodernorm;
+
+       u32 upstream_riscbuf_size;
+       u32 upstream_databuf_size;
+       u32 upstream_riscbuf_size_ch2;
+       u32 upstream_databuf_size_ch2;
+       u32 audio_upstream_riscbuf_size;
+       u32 audio_upstream_databuf_size;
+       int _isNTSC;
+       int _frame_index;
+       int _audioframe_index;
+       struct workqueue_struct *_irq_queues;
+       struct work_struct _irq_work_entry;
+       struct workqueue_struct *_irq_queues_ch2;
+       struct work_struct _irq_work_entry_ch2;
+       struct workqueue_struct *_irq_audio_queues;
+       struct work_struct _audio_work_entry;
+       char *input_filename;
+       char *input_filename_ch2;
+       int _frame_index_ch2;
+       int _isNTSC_ch2;
+       char *vid_stdname_ch2;
+       int pixel_format_ch2;
+       int channel_select_ch2;
+       int command_ch2;
+       char *input_audiofilename;
+       char *vid_stdname;
+       int pixel_format;
+       int channel_select;
+       int command;
+       int pixel_formats[VID_CHANNEL_NUM];
+       int use_cif_resolution[VID_CHANNEL_NUM];
+       int cif_width[VID_CHANNEL_NUM];
+       int channel_opened;
+};
+
+struct upstream_user_struct {
+       char *input_filename;
+       char *vid_stdname;
+       int pixel_format;
+       int channel_select;
+       int command;
+};
+
+struct downstream_user_struct {
+       char *vid_stdname;
+       int pixel_format;
+       int cif_resolution_enable;
+       int cif_width;
+       int decoder_select;
+       int command;
+       int reg_address;
+       int reg_data;
+};
+
+extern struct upstream_user_struct *up_data;
+
+static inline struct cx25821_dev *get_cx25821(struct v4l2_device *v4l2_dev)
+{
+       return container_of(v4l2_dev, struct cx25821_dev, v4l2_dev);
+}
+
+#define cx25821_call_all(dev, o, f, args...) \
+    v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args)
+
+extern struct list_head cx25821_devlist;
+extern struct cx25821_board cx25821_boards[];
+extern struct cx25821_subid cx25821_subids[];
+
+#define SRAM_CH00  0           /* Video A */
+#define SRAM_CH01  1           /* Video B */
+#define SRAM_CH02  2           /* Video C */
+#define SRAM_CH03  3           /* Video D */
+#define SRAM_CH04  4           /* Video E */
+#define SRAM_CH05  5           /* Video F */
+#define SRAM_CH06  6           /* Video G */
+#define SRAM_CH07  7           /* Video H */
+
+#define SRAM_CH08  8           /* Audio A */
+#define SRAM_CH09  9           /* Video Upstream I */
+#define SRAM_CH10  10          /* Video Upstream J */
+#define SRAM_CH11  11          /* Audio Upstream AUD_CHANNEL_B */
+
+#define VID_UPSTREAM_SRAM_CHANNEL_I     SRAM_CH09
+#define VID_UPSTREAM_SRAM_CHANNEL_J     SRAM_CH10
+#define AUDIO_UPSTREAM_SRAM_CHANNEL_B   SRAM_CH11
+#define VIDEO_IOCTL_CH  11
+
+struct sram_channel {
+       char *name;
+       u32 i;
+       u32 cmds_start;
+       u32 ctrl_start;
+       u32 cdt;
+       u32 fifo_start;
+       u32 fifo_size;
+       u32 ptr1_reg;
+       u32 ptr2_reg;
+       u32 cnt1_reg;
+       u32 cnt2_reg;
+       u32 int_msk;
+       u32 int_stat;
+       u32 int_mstat;
+       u32 dma_ctl;
+       u32 gpcnt_ctl;
+       u32 gpcnt;
+       u32 aud_length;
+       u32 aud_cfg;
+       u32 fld_aud_fifo_en;
+       u32 fld_aud_risc_en;
+
+       //For Upstream Video
+       u32 vid_fmt_ctl;
+       u32 vid_active_ctl1;
+       u32 vid_active_ctl2;
+       u32 vid_cdt_size;
+
+       u32 vip_ctl;
+       u32 pix_frmt;
+       u32 jumponly;
+       u32 irq_bit;
+};
+extern struct sram_channel cx25821_sram_channels[];
+
+#define STATUS_SUCCESS         0
+#define STATUS_UNSUCCESSFUL    -1
+
+#define cx_read(reg)             readl(dev->lmmio + ((reg)>>2))
+#define cx_write(reg, value)     writel((value), dev->lmmio + ((reg)>>2))
+
+#define cx_andor(reg, mask, value) \
+  writel((readl(dev->lmmio+((reg)>>2)) & ~(mask)) |\
+  ((value) & (mask)), dev->lmmio+((reg)>>2))
+
+#define cx_set(reg, bit)          cx_andor((reg), (bit), (bit))
+#define cx_clear(reg, bit)        cx_andor((reg), (bit), 0)
+
+#define Set_GPIO_Bit(Bit)                       (1 << Bit)
+#define Clear_GPIO_Bit(Bit)                     (~(1 << Bit))
+
+#define CX25821_ERR(fmt, args...)      printk(KERN_ERR  "cx25821(%d): " fmt, dev->board, ## args)
+#define CX25821_WARN(fmt, args...)     printk(KERN_WARNING "cx25821(%d): " fmt, dev->board , ## args)
+#define CX25821_INFO(fmt, args...)     printk(KERN_INFO "cx25821(%d): " fmt, dev->board , ## args)
+
+extern int cx25821_i2c_register(struct cx25821_i2c *bus);
+extern void cx25821_card_setup(struct cx25821_dev *dev);
+extern int cx25821_ir_init(struct cx25821_dev *dev);
+extern int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value);
+extern int cx25821_i2c_write(struct cx25821_i2c *bus, u16 reg_addr, int value);
+extern int cx25821_i2c_unregister(struct cx25821_i2c *bus);
+extern void cx25821_gpio_init(struct cx25821_dev *dev);
+extern void cx25821_set_gpiopin_direction(struct cx25821_dev *dev,
+                                         int pin_number, int pin_logic_value);
+
+extern int medusa_video_init(struct cx25821_dev *dev);
+extern int medusa_set_videostandard(struct cx25821_dev *dev);
+extern void medusa_set_resolution(struct cx25821_dev *dev, int width,
+                                 int decoder_select);
+extern int medusa_set_brightness(struct cx25821_dev *dev, int brightness,
+                                int decoder);
+extern int medusa_set_contrast(struct cx25821_dev *dev, int contrast,
+                              int decoder);
+extern int medusa_set_hue(struct cx25821_dev *dev, int hue, int decoder);
+extern int medusa_set_saturation(struct cx25821_dev *dev, int saturation,
+                                int decoder);
+
+extern int cx25821_sram_channel_setup(struct cx25821_dev *dev,
+                                     struct sram_channel *ch, unsigned int bpl,
+                                     u32 risc);
+
+extern int cx25821_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+                              struct scatterlist *sglist,
+                              unsigned int top_offset,
+                              unsigned int bottom_offset,
+                              unsigned int bpl,
+                              unsigned int padding, unsigned int lines);
+extern int cx25821_risc_databuffer_audio(struct pci_dev *pci,
+                                        struct btcx_riscmem *risc,
+                                        struct scatterlist *sglist,
+                                        unsigned int bpl,
+                                        unsigned int lines, unsigned int lpi);
+extern void cx25821_free_buffer(struct videobuf_queue *q,
+                               struct cx25821_buffer *buf);
+extern int cx25821_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
+                               u32 reg, u32 mask, u32 value);
+extern void cx25821_sram_channel_dump(struct cx25821_dev *dev,
+                                     struct sram_channel *ch);
+extern void cx25821_sram_channel_dump_audio(struct cx25821_dev *dev,
+                                           struct sram_channel *ch);
+
+extern struct cx25821_dev *cx25821_dev_get(struct pci_dev *pci);
+extern void cx25821_print_irqbits(char *name, char *tag, char **strings,
+                                 int len, u32 bits, u32 mask);
+extern void cx25821_dev_unregister(struct cx25821_dev *dev);
+extern int cx25821_sram_channel_setup_audio(struct cx25821_dev *dev,
+                                           struct sram_channel *ch,
+                                           unsigned int bpl, u32 risc);
+
+extern int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev,
+                                       int channel_select, int pixel_format);
+extern int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev,
+                                       int channel_select, int pixel_format);
+extern int cx25821_audio_upstream_init(struct cx25821_dev *dev,
+                                      int channel_select);
+extern void cx25821_free_mem_upstream_ch1(struct cx25821_dev *dev);
+extern void cx25821_free_mem_upstream_ch2(struct cx25821_dev *dev);
+extern void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev);
+extern void cx25821_start_upstream_video_ch1(struct cx25821_dev *dev,
+                                            struct upstream_user_struct
+                                            *up_data);
+extern void cx25821_start_upstream_video_ch2(struct cx25821_dev *dev,
+                                            struct upstream_user_struct
+                                            *up_data);
+extern void cx25821_start_upstream_audio(struct cx25821_dev *dev,
+                                        struct upstream_user_struct *up_data);
+extern void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev);
+extern void cx25821_stop_upstream_video_ch2(struct cx25821_dev *dev);
+extern void cx25821_stop_upstream_audio(struct cx25821_dev *dev);
+extern int cx25821_sram_channel_setup_upstream(struct cx25821_dev *dev,
+                                              struct sram_channel *ch,
+                                              unsigned int bpl, u32 risc);
+extern void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel,
+                                    u32 format);
+extern void cx25821_videoioctl_unregister(struct cx25821_dev *dev);
+extern struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,
+                                             struct pci_dev *pci,
+                                             struct video_device *template,
+                                             char *type);
+#endif
index ca6ade6..e47f683 100644 (file)
@@ -1,5 +1,5 @@
 config VIDEO_GO7007
-       tristate "Go 7007 support"
+       tristate "WIS GO7007 MPEG encoder support"
        depends on VIDEO_DEV && PCI && I2C && INPUT
        depends on SND
        select VIDEOBUF_DMA_SG
@@ -10,17 +10,19 @@ config VIDEO_GO7007
        select CRC32
        default N
        ---help---
-         This is a video4linux driver for some weird device...
+         This is a video4linux driver for the WIS GO7007 MPEG
+         encoder chip.
 
          To compile this driver as a module, choose M here: the
          module will be called go7007
 
 config VIDEO_GO7007_USB
-       tristate "Go 7007 USB support"
+       tristate "WIS GO7007 USB support"
        depends on VIDEO_GO7007 && USB
        default N
        ---help---
-         This is a video4linux driver for some weird device...
+         This is a video4linux driver for the WIS GO7007 MPEG
+         encoder chip over USB.
 
          To compile this driver as a module, choose M here: the
          module will be called go7007-usb
@@ -30,8 +32,78 @@ config VIDEO_GO7007_USB_S2250_BOARD
        depends on VIDEO_GO7007_USB && DVB_USB
        default N
        ---help---
-         This is a video4linux driver for the Sensoray 2250/2251 device
+         This is a video4linux driver for the Sensoray 2250/2251 device.
 
          To compile this driver as a module, choose M here: the
-         module will be called s2250-board
+         module will be called s2250
+
+config VIDEO_GO7007_OV7640
+       tristate "OV7640 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the OV7640 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-ov7640
+
+config VIDEO_GO7007_SAA7113
+       tristate "SAA7113 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the SAA7113 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-saa7113
+
+config VIDEO_GO7007_SAA7115
+       tristate "SAA7115 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the SAA7115 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-saa7115
+
+config VIDEO_GO7007_TW9903
+       tristate "TW9903 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the TW9903 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-tw9903
+
+config VIDEO_GO7007_UDA1342
+       tristate "UDA1342 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the UDA1342 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-uda1342
+
+config VIDEO_GO7007_SONY_TUNER
+       tristate "Sony tuner subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the Sony Tuner sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-sony-tuner
+
+config VIDEO_GO7007_TW2804
+       tristate "TW2804 subdev support"
+       depends on VIDEO_GO7007
+       default N
+       ---help---
+         This is a video4linux driver for the TW2804 sub-device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wis-tw2804
 
index e514b4a..d14ea84 100644 (file)
@@ -6,22 +6,34 @@
 obj-$(CONFIG_VIDEO_GO7007) += go7007.o
 obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o
 obj-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD) += s2250.o
+obj-$(CONFIG_VIDEO_GO7007_SAA7113) += wis-saa7113.o
+obj-$(CONFIG_VIDEO_GO7007_OV7640) += wis-ov7640.o
+obj-$(CONFIG_VIDEO_GO7007_SAA7115) += wis-saa7115.o
+obj-$(CONFIG_VIDEO_GO7007_TW9903) += wis-tw9903.o
+obj-$(CONFIG_VIDEO_GO7007_UDA1342) += wis-uda1342.o
+obj-$(CONFIG_VIDEO_GO7007_SONY_TUNER) += wis-sony-tuner.o
+obj-$(CONFIG_VIDEO_GO7007_TW2804) += wis-tw2804.o
 
 go7007-objs += go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \
-               snd-go7007.o wis-saa7113.o
+               snd-go7007.o
 
 s2250-objs += s2250-board.o s2250-loader.o
 
-# Uncompile when the saa7134 patches get into upstream
+# Uncomment when the saa7134 patches get into upstream
 #ifneq ($(CONFIG_VIDEO_SAA7134),)
 #obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
-#EXTRA_CFLAGS += -Idrivers/media/video/saa7134
+#EXTRA_CFLAGS += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
 #endif
 
+# S2250 needs cypress ezusb loader from dvb-usb
 ifneq ($(CONFIG_VIDEO_GO7007_USB_S2250_BOARD),)
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb
 endif
 
-EXTRA_CFLAGS += -Idrivers/staging/saa7134
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+
+# Ubuntu 8.04 has CONFIG_SND undefined, so include lum sound/config.h too
+ifeq ($(CONFIG_SND),)
+EXTRA_CFLAGS += -include sound/config.h
+endif
index 77b1e76..472f4bb 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/firmware.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <asm/system.h>
 #include <linux/videodev2.h>
@@ -49,7 +49,7 @@ int go7007_read_interrupt(struct go7007 *go, u16 *value, u16 *data)
        go->hpi_ops->read_interrupt(go);
        if (wait_event_timeout(go->interrupt_waitq,
                                go->interrupt_available, 5*HZ) < 0) {
-               printk(KERN_ERR "go7007: timeout waiting for read interrupt\n");
+               v4l2_err(go->video_dev, "timeout waiting for read interrupt\n");
                return -1;
        }
        if (!go->interrupt_available)
@@ -97,13 +97,12 @@ static int go7007_load_encoder(struct go7007 *go)
        u16 intr_val, intr_data;
 
        if (request_firmware(&fw_entry, fw_name, go->dev)) {
-               printk(KERN_ERR
-                       "go7007: unable to load firmware from file \"%s\"\n",
-                       fw_name);
+               v4l2_err(go, "unable to load firmware from file "
+                       "\"%s\"\n", fw_name);
                return -1;
        }
        if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) {
-               printk(KERN_ERR "go7007: file \"%s\" does not appear to be "
+               v4l2_err(go, "file \"%s\" does not appear to be "
                                "go7007 firmware\n", fw_name);
                release_firmware(fw_entry);
                return -1;
@@ -111,7 +110,7 @@ static int go7007_load_encoder(struct go7007 *go)
        fw_len = fw_entry->size - 16;
        bounce = kmalloc(fw_len, GFP_KERNEL);
        if (bounce == NULL) {
-               printk(KERN_ERR "go7007: unable to allocate %d bytes for "
+               v4l2_err(go, "unable to allocate %d bytes for "
                                "firmware transfer\n", fw_len);
                release_firmware(fw_entry);
                return -1;
@@ -122,7 +121,7 @@ static int go7007_load_encoder(struct go7007 *go)
                        go7007_send_firmware(go, bounce, fw_len) < 0 ||
                        go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
                        (intr_val & ~0x1) != 0x5a5a) {
-               printk(KERN_ERR "go7007: error transferring firmware\n");
+               v4l2_err(go, "error transferring firmware\n");
                rv = -1;
        }
        kfree(bounce);
@@ -140,9 +139,9 @@ int go7007_boot_encoder(struct go7007 *go, int init_i2c)
 {
        int ret;
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
        ret = go7007_load_encoder(go);
-       up(&go->hw_lock);
+       mutex_unlock(&go->hw_lock);
        if (ret < 0)
                return -1;
        if (!init_i2c)
@@ -257,9 +256,9 @@ int go7007_register_encoder(struct go7007 *go)
 
        printk(KERN_INFO "go7007: registering new %s\n", go->name);
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
        ret = go7007_init_encoder(go);
-       up(&go->hw_lock);
+       mutex_unlock(&go->hw_lock);
        if (ret < 0)
                return -1;
 
@@ -316,7 +315,7 @@ int go7007_start_encoder(struct go7007 *go)
 
        if (go7007_send_firmware(go, fw, fw_len) < 0 ||
                        go7007_read_interrupt(go, &intr_val, &intr_data) < 0) {
-               printk(KERN_ERR "go7007: error transferring firmware\n");
+               v4l2_err(go->video_dev, "error transferring firmware\n");
                rv = -1;
                goto start_error;
        }
@@ -325,7 +324,7 @@ int go7007_start_encoder(struct go7007 *go)
        go->parse_length = 0;
        go->seen_frame = 0;
        if (go7007_stream_start(go) < 0) {
-               printk(KERN_ERR "go7007: error starting stream transfer\n");
+               v4l2_err(go->video_dev, "error starting stream transfer\n");
                rv = -1;
                goto start_error;
        }
@@ -421,7 +420,7 @@ void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
        for (i = 0; i < length; ++i) {
                if (go->active_buf != NULL &&
                            go->active_buf->bytesused >= GO7007_BUF_SIZE - 3) {
-                       printk(KERN_DEBUG "go7007: dropping oversized frame\n");
+                       v4l2_info(go->video_dev, "dropping oversized frame\n");
                        go->active_buf->offset -= go->active_buf->bytesused;
                        go->active_buf->bytesused = 0;
                        go->active_buf->modet_active = 0;
@@ -604,7 +603,7 @@ struct go7007 *go7007_alloc(struct go7007_board_info *board, struct device *dev)
        go->tuner_type = -1;
        go->channel_number = 0;
        go->name[0] = 0;
-       init_MUTEX(&go->hw_lock);
+       mutex_init(&go->hw_lock);
        init_waitqueue_head(&go->frame_waitq);
        spin_lock_init(&go->spinlock);
        go->video_dev = NULL;
@@ -669,8 +668,8 @@ void go7007_remove(struct go7007 *go)
                if (i2c_del_adapter(&go->i2c_adapter) == 0)
                        go->i2c_adapter_online = 0;
                else
-                       printk(KERN_ERR
-                               "go7007: error removing I2C adapter!\n");
+                       v4l2_err(go->video_dev,
+                               "error removing I2C adapter!\n");
        }
 
        if (go->audio_enabled)
index 871ed43..a8bb264 100644 (file)
@@ -1034,7 +1034,8 @@ static int brctrl_to_package(struct go7007 *go,
                0xBF1B,         framelen[7],
                0,              0,
 
-#if 0 /* Remove once we don't care about matching */
+#if 0
+               /* Remove once we don't care about matching */
                0x200e,         0x0000,
                0xBF56,         4,
                0xBF57,         0,
index c82867f..b8cfa1a 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/time.h>
 #include <linux/device.h>
 #include <linux/i2c.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <asm/system.h>
 
@@ -48,7 +48,7 @@
 
 /* There is only one I2C port on the TW2804 that feeds all four GO7007 VIPs
  * on the Adlink PCI-MPG24, so access is shared between all of them. */
-static DECLARE_MUTEX(adlink_mpg24_i2c_lock);
+static DEFINE_MUTEX(adlink_mpg24_i2c_lock);
 
 static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,
                u16 command, int flags, u8 *data)
@@ -69,11 +69,11 @@ static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,
                        *data, command, addr);
 #endif
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
 
        if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
                /* Bridge the I2C port on this GO7007 to the shared bus */
-               down(&adlink_mpg24_i2c_lock);
+               mutex_lock(&adlink_mpg24_i2c_lock);
                go7007_write_addr(go, 0x3c82, 0x0020);
        }
 
@@ -134,9 +134,9 @@ i2c_done:
        if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
                /* Isolate the I2C port on this GO7007 from the shared bus */
                go7007_write_addr(go, 0x3c82, 0x0000);
-               up(&adlink_mpg24_i2c_lock);
+               mutex_unlock(&adlink_mpg24_i2c_lock);
        }
-       up(&go->hw_lock);
+       mutex_unlock(&go->hw_lock);
        return ret;
 }
 
index 178d181..ce9307e 100644 (file)
@@ -132,7 +132,7 @@ struct go7007_buffer {
 
 struct go7007_file {
        struct go7007 *go;
-       struct semaphore lock;
+       struct mutex lock;
        int buf_count;
        struct go7007_buffer *bufs;
 };
@@ -170,7 +170,7 @@ struct go7007 {
        int ref_count;
        enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status;
        spinlock_t spinlock;
-       struct semaphore hw_lock;
+       struct mutex hw_lock;
        int streaming;
        int in_use;
        int audio_enabled;
@@ -240,7 +240,7 @@ struct go7007 {
        unsigned short interrupt_data;
 };
 
-/* All of these must be called with the hpi_lock semaphore held! */
+/* All of these must be called with the hpi_lock mutex held! */
 #define go7007_interface_reset(go) \
                        ((go)->hpi_ops->interface_reset(go))
 #define        go7007_write_interrupt(go, x, y) \
index aa4a9e0..ecaa3c9 100644 (file)
@@ -33,7 +33,8 @@
 
 static unsigned int assume_endura;
 module_param(assume_endura, int, 0644);
-MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura");
+MODULE_PARM_DESC(assume_endura, "when probing fails, "
+                               "hardware is a Pelco Endura");
 
 /* #define GO7007_USB_DEBUG */
 /* #define GO7007_I2C_DEBUG */ /* for debugging the EZ-USB I2C adapter */
@@ -44,12 +45,12 @@ MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura"
 
 /*
  * Pipes on EZ-USB interface:
- *     0 snd - Control
- *     0 rcv - Control
- *     2 snd - Download firmware (control)
- *     4 rcv - Read Interrupt (interrupt)
- *     6 rcv - Read Video (bulk)
- *     8 rcv - Read Audio (bulk)
+ *     0 snd - Control
+ *     0 rcv - Control
+ *     2 snd - Download firmware (control)
+ *     4 rcv - Read Interrupt (interrupt)
+ *     6 rcv - Read Video (bulk)
+ *     8 rcv - Read Audio (bulk)
  */
 
 #define GO7007_USB_EZUSB               (1<<0)
@@ -62,7 +63,7 @@ struct go7007_usb_board {
 
 struct go7007_usb {
        struct go7007_usb_board *board;
-       struct semaphore i2c_lock;
+       struct mutex i2c_lock;
        struct usb_device *usbdev;
        struct urb *video_urbs[8];
        struct urb *audio_urbs[8];
@@ -97,7 +98,7 @@ static struct go7007_usb_board board_matrix_ii = {
                        },
                },
                .num_inputs      = 2,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 0,
                                .name           = "Composite",
@@ -134,7 +135,7 @@ static struct go7007_usb_board board_matrix_reload = {
                        },
                },
                .num_inputs      = 2,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 0,
                                .name           = "Composite",
@@ -172,7 +173,7 @@ static struct go7007_usb_board board_star_trek = {
                        },
                },
                .num_inputs      = 2,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 1,
                        /*      .audio_input    = AUDIO_EXTERN, */
@@ -228,7 +229,7 @@ static struct go7007_usb_board board_px_tv402u = {
                        },
                },
                .num_inputs      = 3,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 1,
                                .audio_input    = TVAUDIO_INPUT_EXTERN,
@@ -276,7 +277,7 @@ static struct go7007_usb_board board_xmen = {
                        },
                },
                .num_inputs       = 1,
-               .inputs           = {
+               .inputs           = {
                        {
                                .name           = "Camera",
                        },
@@ -309,7 +310,7 @@ static struct go7007_usb_board board_matrix_revolution = {
                        },
                },
                .num_inputs      = 2,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 2,
                                .name           = "Composite",
@@ -341,7 +342,7 @@ static struct go7007_usb_board board_lifeview_lr192 = {
                                        GO7007_SENSOR_SCALING,
                .num_i2c_devs    = 0,
                .num_inputs      = 1,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 0,
                                .name           = "Composite",
@@ -367,7 +368,7 @@ static struct go7007_usb_board board_endura = {
                .sensor_h_offset = 8,
                .num_i2c_devs    = 0,
                .num_inputs      = 1,
-               .inputs          = {
+               .inputs          = {
                        {
                                .name           = "Camera",
                        },
@@ -399,7 +400,7 @@ static struct go7007_usb_board board_adlink_mpg24 = {
                        },
                },
                .num_inputs      = 1,
-               .inputs          = {
+               .inputs          = {
                        {
                                .name           = "Composite",
                        },
@@ -430,7 +431,7 @@ static struct go7007_usb_board board_sensoray_2250 = {
                        },
                },
                .num_inputs      = 2,
-               .inputs          = {
+               .inputs          = {
                        {
                                .video_input    = 0,
                                .name           = "Composite",
@@ -734,14 +735,15 @@ static int go7007_usb_read_interrupt(struct go7007 *go)
 static void go7007_usb_read_video_pipe_complete(struct urb *urb)
 {
        struct go7007 *go = (struct go7007 *)urb->context;
-       int r, status = urb-> status;
+       int r, status = urb->status;
 
        if (!go->streaming) {
                wake_up_interruptible(&go->frame_waitq);
                return;
        }
        if (status) {
-               printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", status);
+               printk(KERN_ERR "go7007-usb: error in video pipe: %d\n",
+                       status);
                return;
        }
        if (urb->actual_length != urb->transfer_buffer_length) {
@@ -762,7 +764,8 @@ static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
        if (!go->streaming)
                return;
        if (status) {
-               printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", status);
+               printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n",
+                       status);
                return;
        }
        if (urb->actual_length != urb->transfer_buffer_length) {
@@ -877,7 +880,7 @@ static int go7007_usb_i2c_master_xfer(struct i2c_adapter *adapter,
        if (go->status == STATUS_SHUTDOWN)
                return -1;
 
-       down(&usb->i2c_lock);
+       mutex_lock(&usb->i2c_lock);
 
        for (i = 0; i < num; ++i) {
                /* The hardware command is "write some bytes then read some
@@ -935,7 +938,7 @@ static int go7007_usb_i2c_master_xfer(struct i2c_adapter *adapter,
        ret = 0;
 
 i2c_done:
-       up(&usb->i2c_lock);
+       mutex_unlock(&usb->i2c_lock);
        return ret;
 }
 
@@ -1017,7 +1020,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
                break;
        case GO7007_BOARDID_SENSORAY_2250:
                printk(KERN_INFO "Sensoray 2250 found\n");
-               name = "Sensoray 2250/2251\n";
+               name = "Sensoray 2250/2251";
                board = &board_sensoray_2250;
                break;
        default:
@@ -1065,7 +1068,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
        if (board->flags & GO7007_USB_EZUSB_I2C) {
                memcpy(&go->i2c_adapter, &go7007_usb_adap_templ,
                                sizeof(go7007_usb_adap_templ));
-               init_MUTEX(&usb->i2c_lock);
+               mutex_init(&usb->i2c_lock);
                go->i2c_adapter.dev.parent = go->dev;
                i2c_set_adapdata(&go->i2c_adapter, go);
                if (i2c_add_adapter(&go->i2c_adapter) < 0) {
@@ -1096,7 +1099,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
                                usb->board = board = &board_endura;
                                go->board_info = &board->main_info;
                                strncpy(go->name, "Pelco Endura",
-                                               sizeof(go->name));
+                                       sizeof(go->name));
                        } else {
                                u16 channel;
 
@@ -1154,8 +1157,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
                 * to the EZ-USB GPIO output pins */
                if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,
                                        NULL, 0, 0) < 0) {
-                       printk(KERN_ERR
-                               "go7007-usb: GPIO write failed!\n");
+                       printk(KERN_ERR "go7007-usb: GPIO write failed!\n");
                        goto initfail;
                }
        }
index 06cacd3..4bd353a 100644 (file)
@@ -30,7 +30,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/i2c.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <asm/system.h>
 
@@ -75,7 +75,7 @@ static int go7007_streamoff(struct go7007 *go)
        int retval = -EINVAL;
        unsigned long flags;
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
        if (go->streaming) {
                go->streaming = 0;
                go7007_stream_stop(go);
@@ -85,7 +85,7 @@ static int go7007_streamoff(struct go7007 *go)
                go7007_reset_encoder(go);
                retval = 0;
        }
-       up(&go->hw_lock);
+       mutex_unlock(&go->hw_lock);
        return 0;
 }
 
@@ -101,7 +101,7 @@ static int go7007_open(struct file *file)
                return -ENOMEM;
        ++go->ref_count;
        gofh->go = go;
-       init_MUTEX(&gofh->lock);
+       mutex_init(&gofh->lock);
        gofh->buf_count = 0;
        file->private_data = gofh;
        return 0;
@@ -383,13 +383,10 @@ static int clip_to_modet_map(struct go7007 *go, int region,
        }
        return 0;
 }
+#endif
 
-static int mpeg_queryctrl(u32 id, struct v4l2_queryctrl *ctrl)
+static int mpeg_queryctrl(struct v4l2_queryctrl *ctrl)
 {
-       static const u32 user_ctrls[] = {
-               V4L2_CID_USER_CLASS,
-               0
-       };
        static const u32 mpeg_ctrls[] = {
                V4L2_CID_MPEG_CLASS,
                V4L2_CID_MPEG_STREAM_TYPE,
@@ -401,26 +398,15 @@ static int mpeg_queryctrl(u32 id, struct v4l2_queryctrl *ctrl)
                0
        };
        static const u32 *ctrl_classes[] = {
-               user_ctrls,
                mpeg_ctrls,
                NULL
        };
 
-       /* The ctrl may already contain the queried i2c controls,
-        * query the mpeg controls if the existing ctrl id is
-        * greater than the next mpeg ctrl id.
-        */
-       id = v4l2_ctrl_next(ctrl_classes, id);
-       if (id >= ctrl->id && ctrl->name[0])
-               return 0;
-
-       memset(ctrl, 0, sizeof(*ctrl));
-       ctrl->id = id;
+       ctrl->id = v4l2_ctrl_next(ctrl_classes, ctrl->id);
 
        switch (ctrl->id) {
-       case V4L2_CID_USER_CLASS:
        case V4L2_CID_MPEG_CLASS:
-               return v4l2_ctrl_query_fill_std(ctrl);
+               return v4l2_ctrl_query_fill(ctrl, 0, 0, 0, 0);
        case V4L2_CID_MPEG_STREAM_TYPE:
                return v4l2_ctrl_query_fill(ctrl,
                                V4L2_MPEG_STREAM_TYPE_MPEG2_DVD,
@@ -437,20 +423,21 @@ static int mpeg_queryctrl(u32 id, struct v4l2_queryctrl *ctrl)
                                V4L2_MPEG_VIDEO_ASPECT_16x9, 1,
                                V4L2_MPEG_VIDEO_ASPECT_1x1);
        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
+               return v4l2_ctrl_query_fill(ctrl, 0, 34, 1, 15);
        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
-               return v4l2_ctrl_query_fill_std(ctrl);
+               return v4l2_ctrl_query_fill(ctrl, 0, 1, 1, 0);
        case V4L2_CID_MPEG_VIDEO_BITRATE:
                return v4l2_ctrl_query_fill(ctrl,
                                64000,
                                10000000, 1,
-                               9800000);
+                               1500000);
        default:
-               break;
+               return -EINVAL;
        }
-       return -EINVAL;
+       return 0;
 }
 
-static int mpeg_s_control(struct v4l2_control *ctrl, struct go7007 *go)
+static int mpeg_s_ctrl(struct v4l2_control *ctrl, struct go7007 *go)
 {
        /* pretty sure we can't change any of these while streaming */
        if (go->streaming)
@@ -528,6 +515,8 @@ static int mpeg_s_control(struct v4l2_control *ctrl, struct go7007 *go)
                }
                break;
        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
+               if (ctrl->value < 0 || ctrl->value > 34)
+                       return -EINVAL;
                go->gop_size = ctrl->value;
                break;
        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
@@ -547,7 +536,7 @@ static int mpeg_s_control(struct v4l2_control *ctrl, struct go7007 *go)
        return 0;
 }
 
-static int mpeg_g_control(struct v4l2_control *ctrl, struct go7007 *go)
+static int mpeg_g_ctrl(struct v4l2_control *ctrl, struct go7007 *go)
 {
        switch (ctrl->id) {
        case V4L2_CID_MPEG_STREAM_TYPE:
@@ -600,13 +589,11 @@ static int mpeg_g_control(struct v4l2_control *ctrl, struct go7007 *go)
        }
        return 0;
 }
-#endif
 
 static int vidioc_querycap(struct file *file, void  *priv,
                                        struct v4l2_capability *cap)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        strlcpy(cap->driver, "go7007", sizeof(cap->driver));
        strlcpy(cap->card, go->name, sizeof(cap->card));
@@ -653,8 +640,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
 static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                                        struct v4l2_format *fmt)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        fmt->fmt.pix.width = go->width;
@@ -672,8 +658,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                        struct v4l2_format *fmt)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        return set_capture_size(go, fmt, 1);
 }
@@ -681,8 +666,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                        struct v4l2_format *fmt)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (go->streaming)
                return -EBUSY;
@@ -705,14 +689,14 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                        req->memory != V4L2_MEMORY_MMAP)
                return -EINVAL;
 
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        for (i = 0; i < gofh->buf_count; ++i)
                if (gofh->bufs[i].mapped > 0)
                        goto unlock_and_return;
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
        if (go->in_use > 0 && gofh->buf_count == 0) {
-               up(&go->hw_lock);
+               mutex_unlock(&go->hw_lock);
                goto unlock_and_return;
        }
 
@@ -731,7 +715,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                                     GFP_KERNEL);
 
                if (!gofh->bufs) {
-                       up(&go->hw_lock);
+                       mutex_unlock(&go->hw_lock);
                        goto unlock_and_return;
                }
 
@@ -750,8 +734,8 @@ static int vidioc_reqbufs(struct file *file, void *priv,
        }
 
        gofh->buf_count = count;
-       up(&go->hw_lock);
-       up(&gofh->lock);
+       mutex_unlock(&go->hw_lock);
+       mutex_unlock(&gofh->lock);
 
        memset(req, 0, sizeof(*req));
 
@@ -762,7 +746,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
        return 0;
 
 unlock_and_return:
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return retval;
 }
 
@@ -778,7 +762,7 @@ static int vidioc_querybuf(struct file *file, void *priv,
 
        index = buf->index;
 
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        if (index >= gofh->buf_count)
                goto unlock_and_return;
 
@@ -802,12 +786,12 @@ static int vidioc_querybuf(struct file *file, void *priv,
        buf->memory = V4L2_MEMORY_MMAP;
        buf->m.offset = index * GO7007_BUF_SIZE;
        buf->length = GO7007_BUF_SIZE;
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
 
        return 0;
 
 unlock_and_return:
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return retval;
 }
 
@@ -824,7 +808,7 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
                        buf->memory != V4L2_MEMORY_MMAP)
                return retval;
 
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        if (buf->index < 0 || buf->index >= gofh->buf_count)
                goto unlock_and_return;
 
@@ -865,12 +849,12 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        spin_lock_irqsave(&go->spinlock, flags);
        list_add_tail(&gobuf->stream, &go->stream);
        spin_unlock_irqrestore(&go->spinlock, flags);
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
 
        return 0;
 
 unlock_and_return:
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return retval;
 }
 
@@ -890,7 +874,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        if (buf->memory != V4L2_MEMORY_MMAP)
                return retval;
 
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        if (list_empty(&go->stream))
                goto unlock_and_return;
        gobuf = list_entry(go->stream.next,
@@ -934,11 +918,11 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        buf->length = GO7007_BUF_SIZE;
        buf->reserved = gobuf->modet_active;
 
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return 0;
 
 unlock_and_return:
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return retval;
 }
 
@@ -952,8 +936,8 @@ static int vidioc_streamon(struct file *file, void *priv,
        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
-       down(&gofh->lock);
-       down(&go->hw_lock);
+       mutex_lock(&gofh->lock);
+       mutex_lock(&go->hw_lock);
 
        if (!go->streaming) {
                go->streaming = 1;
@@ -964,8 +948,8 @@ static int vidioc_streamon(struct file *file, void *priv,
                else
                        retval = 0;
        }
-       up(&go->hw_lock);
-       up(&gofh->lock);
+       mutex_unlock(&go->hw_lock);
+       mutex_unlock(&gofh->lock);
 
        return retval;
 }
@@ -978,9 +962,9 @@ static int vidioc_streamoff(struct file *file, void *priv,
 
        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        go7007_streamoff(go);
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
 
        return 0;
 }
@@ -988,22 +972,20 @@ static int vidioc_streamoff(struct file *file, void *priv,
 static int vidioc_queryctrl(struct file *file, void *priv,
                           struct v4l2_queryctrl *query)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (!go->i2c_adapter_online)
                return -EIO;
 
        i2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, query);
 
-       return (!query->name[0]) ? -EINVAL : 0;
+       return (!query->name[0]) ? mpeg_queryctrl(query) : 0;
 }
 
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                struct v4l2_control *ctrl)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
        struct v4l2_queryctrl query;
 
        if (!go->i2c_adapter_online)
@@ -1013,7 +995,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
        query.id = ctrl->id;
        i2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, &query);
        if (query.name[0] == 0)
-               return -EINVAL;
+               return mpeg_g_ctrl(ctrl, go);
        i2c_clients_command(&go->i2c_adapter, VIDIOC_G_CTRL, ctrl);
 
        return 0;
@@ -1022,8 +1004,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                struct v4l2_control *ctrl)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
        struct v4l2_queryctrl query;
 
        if (!go->i2c_adapter_online)
@@ -1033,7 +1014,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        query.id = ctrl->id;
        i2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, &query);
        if (query.name[0] == 0)
-               return -EINVAL;
+               return mpeg_s_ctrl(ctrl, go);
        i2c_clients_command(&go->i2c_adapter, VIDIOC_S_CTRL, ctrl);
 
        return 0;
@@ -1042,8 +1023,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 static int vidioc_g_parm(struct file *filp, void *priv,
                struct v4l2_streamparm *parm)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
        struct v4l2_fract timeperframe = {
                .numerator = 1001 *  go->fps_scale,
                .denominator = go->sensor_framerate,
@@ -1061,8 +1041,7 @@ static int vidioc_g_parm(struct file *filp, void *priv,
 static int vidioc_s_parm(struct file *filp, void *priv,
                struct v4l2_streamparm *parm)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
        unsigned int n, d;
 
        if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1094,8 +1073,7 @@ static int vidioc_s_parm(struct file *filp, void *priv,
 static int vidioc_enum_framesizes(struct file *filp, void *priv,
                                  struct v4l2_frmsizeenum *fsize)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        /* Return -EINVAL, if it is a TV board */
        if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) ||
@@ -1115,8 +1093,7 @@ static int vidioc_enum_framesizes(struct file *filp, void *priv,
 static int vidioc_enum_frameintervals(struct file *filp, void *priv,
                                      struct v4l2_frmivalenum *fival)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        /* Return -EINVAL, if it is a TV board */
        if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) ||
@@ -1133,10 +1110,27 @@ static int vidioc_enum_frameintervals(struct file *filp, void *priv,
        return 0;
 }
 
+static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *std)
+{
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
+
+       switch (go->standard) {
+       case GO7007_STD_NTSC:
+               *std = V4L2_STD_NTSC;
+               break;
+       case GO7007_STD_PAL:
+               *std = V4L2_STD_PAL;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (go->streaming)
                return -EBUSY;
@@ -1178,30 +1172,27 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std)
        return 0;
 }
 
-#if 0
-       case VIDIOC_QUERYSTD:
-       {
-               v4l2_std_id *std = arg;
+static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *std)
+{
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
-               if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) &&
-                               go->input == go->board_info->num_inputs - 1) {
-                       if (!go->i2c_adapter_online)
-                               return -EIO;
-                       i2c_clients_command(&go->i2c_adapter,
-                                               VIDIOC_QUERYSTD, arg);
-               } else if (go->board_info->sensor_flags & GO7007_SENSOR_TV)
-                       *std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;
-               else
-                       *std = 0;
-               return 0;
-       }
-#endif
+       if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) &&
+                       go->input == go->board_info->num_inputs - 1) {
+               if (!go->i2c_adapter_online)
+                       return -EIO;
+               i2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYSTD, std);
+       } else if (go->board_info->sensor_flags & GO7007_SENSOR_TV)
+               *std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;
+       else
+               *std = 0;
+
+       return 0;
+}
 
 static int vidioc_enum_input(struct file *file, void *priv,
                                struct v4l2_input *inp)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (inp->index >= go->board_info->num_inputs)
                return -EINVAL;
@@ -1230,8 +1221,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
 
 static int vidioc_g_input(struct file *file, void *priv, unsigned int *input)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        *input = go->input;
 
@@ -1240,8 +1230,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *input)
 
 static int vidioc_s_input(struct file *file, void *priv, unsigned int input)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (input >= go->board_info->num_inputs)
                return -EINVAL;
@@ -1262,8 +1251,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int input)
 static int vidioc_g_tuner(struct file *file, void *priv,
                                struct v4l2_tuner *t)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (!(go->board_info->flags & GO7007_BOARD_HAS_TUNER))
                return -EINVAL;
@@ -1281,8 +1269,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 static int vidioc_s_tuner(struct file *file, void *priv,
                                struct v4l2_tuner *t)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (!(go->board_info->flags & GO7007_BOARD_HAS_TUNER))
                return -EINVAL;
@@ -1308,8 +1295,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (!(go->board_info->flags & GO7007_BOARD_HAS_TUNER))
                return -EINVAL;
@@ -1324,8 +1310,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (!(go->board_info->flags & GO7007_BOARD_HAS_TUNER))
                return -EINVAL;
@@ -1340,8 +1325,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_cropcap(struct file *file, void *priv,
                                        struct v4l2_cropcap *cropcap)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -1385,8 +1369,7 @@ static int vidioc_cropcap(struct file *file, void *priv,
 
 static int vidioc_g_crop(struct file *file, void *priv, struct v4l2_crop *crop)
 {
-       struct go7007_file *gofh = priv;
-       struct go7007 *go = gofh->go;
+       struct go7007 *go = ((struct go7007_file *) priv)->go;
 
        if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -1734,18 +1717,18 @@ static int go7007_mmap(struct file *file, struct vm_area_struct *vma)
                return -EINVAL; /* only support VM_SHARED mapping */
        if (vma->vm_end - vma->vm_start != GO7007_BUF_SIZE)
                return -EINVAL; /* must map exactly one full buffer */
-       down(&gofh->lock);
+       mutex_lock(&gofh->lock);
        index = vma->vm_pgoff / GO7007_BUF_PAGES;
        if (index >= gofh->buf_count) {
-               up(&gofh->lock);
+               mutex_unlock(&gofh->lock);
                return -EINVAL; /* trying to map beyond requested buffers */
        }
        if (index * GO7007_BUF_PAGES != vma->vm_pgoff) {
-               up(&gofh->lock);
+               mutex_unlock(&gofh->lock);
                return -EINVAL; /* offset is not aligned on buffer boundary */
        }
        if (gofh->bufs[index].mapped > 0) {
-               up(&gofh->lock);
+               mutex_unlock(&gofh->lock);
                return -EBUSY;
        }
        gofh->bufs[index].mapped = 1;
@@ -1754,7 +1737,7 @@ static int go7007_mmap(struct file *file, struct vm_area_struct *vma)
        vma->vm_flags |= VM_DONTEXPAND;
        vma->vm_flags &= ~VM_IO;
        vma->vm_private_data = &gofh->bufs[index];
-       up(&gofh->lock);
+       mutex_unlock(&gofh->lock);
        return 0;
 }
 
@@ -1801,7 +1784,9 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
        .vidioc_querybuf          = vidioc_querybuf,
        .vidioc_qbuf              = vidioc_qbuf,
        .vidioc_dqbuf             = vidioc_dqbuf,
+       .vidioc_g_std             = vidioc_g_std,
        .vidioc_s_std             = vidioc_s_std,
+       .vidioc_querystd          = vidioc_querystd,
        .vidioc_enum_input        = vidioc_enum_input,
        .vidioc_g_input           = vidioc_g_input,
        .vidioc_s_input           = vidioc_s_input,
@@ -1862,7 +1847,7 @@ void go7007_v4l2_remove(struct go7007 *go)
 {
        unsigned long flags;
 
-       down(&go->hw_lock);
+       mutex_lock(&go->hw_lock);
        if (go->streaming) {
                go->streaming = 0;
                go7007_stream_stop(go);
@@ -1870,7 +1855,7 @@ void go7007_v4l2_remove(struct go7007 *go)
                abort_queued(go);
                spin_unlock_irqrestore(&go->spinlock, flags);
        }
-       up(&go->hw_lock);
+       mutex_unlock(&go->hw_lock);
        if (go->video_dev)
                video_unregister_device(go->video_dev);
 }
index 1c2907c..06a76da 100644 (file)
@@ -2,7 +2,7 @@ This is a driver for the WIS GO7007SB multi-format video encoder.
 
 Pete Eberlein <pete@sensoray.com>
 
-The driver was originally released under the GPL and is currently hosted at:
+The driver was orignally released under the GPL and is currently hosted at:
 http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver
 The go7007 firmware can be acquired from the package on the site above.
 
@@ -24,10 +24,10 @@ These should be used instead of the non-standard GO7007 ioctls described
 below.
 
 
-The README files from the original package appears below:
+The README files from the orignal package appear below:
 
 ---------------------------------------------------------------------------
-                     WIS GO7007SB Public Linux Driver
+                    WIS GO7007SB Public Linux Driver
 ---------------------------------------------------------------------------
 
 
@@ -78,23 +78,23 @@ All vendor-built kernels should already be configured properly.  However,
 for custom-built kernels, the following options need to be enabled in the
 kernel as built-in or modules:
 
-        CONFIG_HOTPLUG           - Support for hot-pluggable devices
-        CONFIG_MODULES           - Enable loadable module support
-        CONFIG_KMOD              - Automatic kernel module loading
-        CONFIG_FW_LOADER         - Hotplug firmware loading support
-        CONFIG_I2C               - I2C support
-        CONFIG_VIDEO_DEV         - Video For Linux
-        CONFIG_SOUND             - Sound card support
-        CONFIG_SND               - Advanced Linux Sound Architecture
-        CONFIG_USB               - Support for Host-side USB
-        CONFIG_USB_DEVICEFS      - USB device filesystem
-        CONFIG_USB_EHCI_HCD      - EHCI HCD (USB 2.0) support
+       CONFIG_HOTPLUG           - Support for hot-pluggable devices
+       CONFIG_MODULES           - Enable loadable module support
+       CONFIG_KMOD              - Automatic kernel module loading
+       CONFIG_FW_LOADER         - Hotplug firmware loading support
+       CONFIG_I2C               - I2C support
+       CONFIG_VIDEO_DEV         - Video For Linux
+       CONFIG_SOUND             - Sound card support
+       CONFIG_SND               - Advanced Linux Sound Architecture
+       CONFIG_USB               - Support for Host-side USB
+       CONFIG_USB_DEVICEFS      - USB device filesystem
+       CONFIG_USB_EHCI_HCD      - EHCI HCD (USB 2.0) support
 
 Additionally, to use the example application, the following options need to
 be enabled in the ALSA section:
 
-        CONFIG_SND_MIXER_OSS     - OSS Mixer API
-        CONFIG_SND_PCM_OSS       - OSS PCM (digital audio) API
+       CONFIG_SND_MIXER_OSS     - OSS Mixer API
+       CONFIG_SND_PCM_OSS       - OSS PCM (digital audio) API
 
 The hotplug scripts, along with the fxload utility, must also be installed.
 These scripts can be obtained from <http://linux-hotplug.sourceforge.net/>.
@@ -107,7 +107,7 @@ fxload and for loading firmware into the driver using the firmware agent.
 
 Most users should be able to compile the driver by simply running:
 
-        $ make
+       $ make
 
 in the top-level directory of the driver kit.  First the kernel modules
 will be built, followed by the example applications.
@@ -117,12 +117,12 @@ currently-running kernel, or if the module should be built for a kernel
 other than the currently-running kernel, an additional parameter will need
 to be passed to make to specify the appropriate kernel source directory:
 
-        $ make KERNELSRC=/usr/src/linux-2.6.10-custom3
+       $ make KERNELSRC=/usr/src/linux-2.6.10-custom3
 
 Once the compile completes, the driver and firmware files should be
 installed by running:
 
-        $ make install
+       $ make install
 
 The kernel modules will be placed in "/lib/modules/<KERNEL VERSION>/extra"
 and the firmware files will be placed in the appropriate hotplug firmware
@@ -200,7 +200,7 @@ stereo audio broadcasts on the A2 carrier.
 To verify that the configuration has been placed in the correct location,
 execute:
 
-        $ modprobe -c | grep wis-sony-tuner
+       $ modprobe -c | grep wis-sony-tuner
 
 If the configuration line appears, then modprobe will pass the parameters
 correctly the next time the wis-sony-tuner module is loaded into the
@@ -223,7 +223,7 @@ This application will auto-detect the V4L2 and ALSA/OSS device names of the
 hardware and will record video and audio to an AVI file for a specified
 number of seconds.  For example:
 
-        $ apps/gorecord -duration 60 capture.avi
+       $ apps/gorecord -duration 60 capture.avi
 
 If this application does not successfully record an AVI file, the error
 messages produced by gorecord and recorded in the system log (usually in
@@ -286,35 +286,35 @@ features of the GO7007SB encoder, which are described below:
 
     Fields in struct go7007_comp_params:
 
-        __u32                        The maximum number of frames in each
-          gop_size                   Group Of Pictures; i.e. the maximum
-                                     number of frames minus one between
-                                     each key frame.
+       __u32                        The maximum number of frames in each
+         gop_size                   Group Of Pictures; i.e. the maximum
+                                    number of frames minus one between
+                                    each key frame.
 
-        __u32                        The maximum number of sequential
-          max_b_frames               bidirectionally-predicted frames.
-                                     (B-frames are not yet supported.)
+       __u32                        The maximum number of sequential
+         max_b_frames               bidirectionally-predicted frames.
+                                    (B-frames are not yet supported.)
 
-        enum go7007_aspect_ratio     The aspect ratio to be encoded in the
-          aspect_ratio               meta-data of the compressed format.
+       enum go7007_aspect_ratio     The aspect ratio to be encoded in the
+         aspect_ratio               meta-data of the compressed format.
 
-                                     Choices are:
-                                        GO7007_ASPECT_RATIO_1_1
-                                        GO7007_ASPECT_RATIO_4_3_NTSC
-                                        GO7007_ASPECT_RATIO_4_3_PAL
-                                        GO7007_ASPECT_RATIO_16_9_NTSC
-                                        GO7007_ASPECT_RATIO_16_9_PAL
+                                    Choices are:
+                                       GO7007_ASPECT_RATIO_1_1
+                                       GO7007_ASPECT_RATIO_4_3_NTSC
+                                       GO7007_ASPECT_RATIO_4_3_PAL
+                                       GO7007_ASPECT_RATIO_16_9_NTSC
+                                       GO7007_ASPECT_RATIO_16_9_PAL
 
-        __u32                        Bit-wise OR of control flags (below)
-          flags
+       __u32                        Bit-wise OR of control flags (below)
+         flags
 
     Flags in struct go7007_comp_params:
 
-        GO7007_COMP_CLOSED_GOP       Only produce self-contained GOPs, used
-                                     to produce streams appropriate for
-                                     random seeking.
+       GO7007_COMP_CLOSED_GOP       Only produce self-contained GOPs, used
+                                    to produce streams appropriate for
+                                    random seeking.
 
-        GO7007_COMP_OMIT_SEQ_HEADER  Omit the stream sequence header.
+       GO7007_COMP_OMIT_SEQ_HEADER  Omit the stream sequence header.
 
 
   GO7007IOC_S_MPEG_PARAMS, GO7007IOC_G_MPEG_PARAMS
@@ -337,56 +337,56 @@ features of the GO7007SB encoder, which are described below:
 
     Fields in struct go7007_mpeg_params:
 
-        enum go7007_mpeg_video_standard
-          mpeg_video_standard        The MPEG video standard in which to
-                                     compress the video.
-
-                                     Choices are:
-                                        GO7007_MPEG_VIDEO_MPEG1
-                                        GO7007_MPEG_VIDEO_MPEG2
-                                        GO7007_MPEG_VIDEO_MPEG4
-
-        __u32                        Bit-wise OR of control flags (below)
-          flags
-
-        __u32                        The profile and level indication to be
-          pali                       stored in the sequence header.  This
-                                     is only used as an indicator to the
-                                     decoder, and does not affect the MPEG
-                                     features used in the video stream.
-                                     Not valid for MPEG1.
-
-                                     Choices for MPEG2 are:
-                                        GO7007_MPEG2_PROFILE_MAIN_MAIN
-
-                                     Choices for MPEG4 are:
-                                        GO7007_MPEG4_PROFILE_S_L0
-                                        GO7007_MPEG4_PROFILE_S_L1
-                                        GO7007_MPEG4_PROFILE_S_L2
-                                        GO7007_MPEG4_PROFILE_S_L3
-                                        GO7007_MPEG4_PROFILE_ARTS_L1
-                                        GO7007_MPEG4_PROFILE_ARTS_L2
-                                        GO7007_MPEG4_PROFILE_ARTS_L3
-                                        GO7007_MPEG4_PROFILE_ARTS_L4
-                                        GO7007_MPEG4_PROFILE_AS_L0
-                                        GO7007_MPEG4_PROFILE_AS_L1
-                                        GO7007_MPEG4_PROFILE_AS_L2
-                                        GO7007_MPEG4_PROFILE_AS_L3
-                                        GO7007_MPEG4_PROFILE_AS_L4
-                                        GO7007_MPEG4_PROFILE_AS_L5
+       enum go7007_mpeg_video_standard
+         mpeg_video_standard        The MPEG video standard in which to
+                                    compress the video.
+
+                                    Choices are:
+                                       GO7007_MPEG_VIDEO_MPEG1
+                                       GO7007_MPEG_VIDEO_MPEG2
+                                       GO7007_MPEG_VIDEO_MPEG4
+
+       __u32                        Bit-wise OR of control flags (below)
+         flags
+
+       __u32                        The profile and level indication to be
+         pali                       stored in the sequence header.  This
+                                    is only used as an indicator to the
+                                    decoder, and does not affect the MPEG
+                                    features used in the video stream.
+                                    Not valid for MPEG1.
+
+                                    Choices for MPEG2 are:
+                                       GO7007_MPEG2_PROFILE_MAIN_MAIN
+
+                                    Choices for MPEG4 are:
+                                       GO7007_MPEG4_PROFILE_S_L0
+                                       GO7007_MPEG4_PROFILE_S_L1
+                                       GO7007_MPEG4_PROFILE_S_L2
+                                       GO7007_MPEG4_PROFILE_S_L3
+                                       GO7007_MPEG4_PROFILE_ARTS_L1
+                                       GO7007_MPEG4_PROFILE_ARTS_L2
+                                       GO7007_MPEG4_PROFILE_ARTS_L3
+                                       GO7007_MPEG4_PROFILE_ARTS_L4
+                                       GO7007_MPEG4_PROFILE_AS_L0
+                                       GO7007_MPEG4_PROFILE_AS_L1
+                                       GO7007_MPEG4_PROFILE_AS_L2
+                                       GO7007_MPEG4_PROFILE_AS_L3
+                                       GO7007_MPEG4_PROFILE_AS_L4
+                                       GO7007_MPEG4_PROFILE_AS_L5
 
     Flags in struct go7007_mpeg_params:
 
-        GO7007_MPEG_FORCE_DVD_MODE   Force all compression parameters and
-                                     bitrate control settings to comply
-                                     with DVD MPEG2 stream requirements.
-                                     This overrides most compression and
-                                     bitrate settings!
+       GO7007_MPEG_FORCE_DVD_MODE   Force all compression parameters and
+                                    bitrate control settings to comply
+                                    with DVD MPEG2 stream requirements.
+                                    This overrides most compression and
+                                    bitrate settings!
 
-        GO7007_MPEG_OMIT_GOP_HEADER  Omit the GOP header.
+       GO7007_MPEG_OMIT_GOP_HEADER  Omit the GOP header.
 
-        GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
-                                     the start of each GOP.
+       GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
+                                    the start of each GOP.
 
 
   GO7007IOC_S_BITRATE, GO7007IOC_G_BITRATE
@@ -404,7 +404,7 @@ features of the GO7007SB encoder, which are described below:
 
 
 ----------------------------------------------------------------------------
-                   Installing the WIS PCI Voyager Driver
+                  Installing the WIS PCI Voyager Driver
 ---------------------------------------------------------------------------
 
 The WIS PCI Voyager driver requires several patches to the Linux 2.6.11.x
index 1706fbf..8c85a9c 100644 (file)
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include "s2250-loader.h"
 #include "go7007-priv.h"
 #include "wis-i2c.h"
 
-extern int s2250loader_init(void);
-extern void s2250loader_cleanup(void);
-
 #define TLV320_ADDRESS      0x34
 #define VPX322_ADDR_ANALOGCONTROL1     0x02
 #define VPX322_ADDR_BRIGHTNESS0                0x0127
@@ -34,7 +32,7 @@ extern void s2250loader_cleanup(void);
 #define VPX322_ADDR_CONTRAST0          0x0128
 #define VPX322_ADDR_CONTRAST1          0x0132
 #define VPX322_ADDR_HUE                        0x00dc
-#define VPX322_ADDR_SAT                        0x0030
+#define VPX322_ADDR_SAT                        0x0030
 
 struct go7007_usb_board {
        unsigned int flags;
@@ -43,7 +41,7 @@ struct go7007_usb_board {
 
 struct go7007_usb {
        struct go7007_usb_board *board;
-       struct semaphore i2c_lock;
+       struct mutex i2c_lock;
        struct usb_device *usbdev;
        struct urb *video_urbs[8];
        struct urb *audio_urbs[8];
@@ -114,7 +112,7 @@ static u16 vid_regs_fp_pal[] =
 };
 
 struct s2250 {
-       int std;
+       v4l2_std_id std;
        int input;
        int brightness;
        int contrast;
@@ -165,7 +163,7 @@ static int write_reg(struct i2c_client *client, u8 reg, u8 value)
                return -ENOMEM;
 
        usb = go->hpi_context;
-       if (down_interruptible(&usb->i2c_lock) != 0) {
+       if (mutex_lock_interruptible(&usb->i2c_lock) != 0) {
                printk(KERN_INFO "i2c lock failed\n");
                kfree(buf);
                return -EINTR;
@@ -175,7 +173,7 @@ static int write_reg(struct i2c_client *client, u8 reg, u8 value)
                                       buf,
                                       16, 1);
 
-       up(&usb->i2c_lock);
+       mutex_unlock(&usb->i2c_lock);
        kfree(buf);
        return rc;
 }
@@ -203,19 +201,23 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
        memset(buf, 0xcd, 6);
 
        usb = go->hpi_context;
-       if (down_interruptible(&usb->i2c_lock) != 0) {
+       if (mutex_lock_interruptible(&usb->i2c_lock) != 0) {
                printk(KERN_INFO "i2c lock failed\n");
+               kfree(buf);
                return -EINTR;
        }
-       if (go7007_usb_vendor_request(go, 0x57, addr, val, buf, 16, 1) < 0)
+       if (go7007_usb_vendor_request(go, 0x57, addr, val, buf, 16, 1) < 0) {
+               kfree(buf);
                return -EFAULT;
+       }
 
-       up(&usb->i2c_lock);
+       mutex_unlock(&usb->i2c_lock);
        if (buf[0] == 0) {
                unsigned int subaddr, val_read;
 
                subaddr = (buf[4] << 8) + buf[5];
                val_read = (buf[2] << 8) + buf[3];
+               kfree(buf);
                if (val_read != val) {
                        printk(KERN_INFO "invalid fp write %x %x\n",
                               val_read, val);
@@ -226,8 +228,10 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
                               subaddr, addr);
                        return -EFAULT;
                }
-       } else
+       } else {
+               kfree(buf);
                return -EFAULT;
+       }
 
        /* save last 12b value */
        if (addr == 0x12b)
@@ -236,6 +240,45 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
        return 0;
 }
 
+static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val)
+{
+       struct go7007 *go = i2c_get_adapdata(client->adapter);
+       struct go7007_usb *usb;
+       u8 *buf;
+
+       if (go == NULL)
+               return -ENODEV;
+
+       if (go->status == STATUS_SHUTDOWN)
+               return -EBUSY;
+
+       buf = kzalloc(16, GFP_KERNEL);
+
+       if (buf == NULL)
+               return -ENOMEM;
+
+
+
+       memset(buf, 0xcd, 6);
+       usb = go->hpi_context;
+       if (down_interruptible(&usb->i2c_lock) != 0) {
+               printk(KERN_INFO "i2c lock failed\n");
+               kfree(buf);
+               return -EINTR;
+       }
+       if (go7007_usb_vendor_request(go, 0x58, addr, 0, buf, 16, 1) < 0) {
+               kfree(buf);
+               return -EFAULT;
+       }
+       up(&usb->i2c_lock);
+
+       *val = (buf[0] << 8) | buf[1];
+       kfree(buf);
+
+       return 0;
+}
+
+
 static int write_regs(struct i2c_client *client, u8 *regs)
 {
        int i;
@@ -350,14 +393,42 @@ static int s2250_command(struct i2c_client *client,
        {
                struct v4l2_control *ctrl = arg;
                int value1;
+               u16 oldvalue;
 
                switch (ctrl->id) {
                case V4L2_CID_BRIGHTNESS:
-                       printk(KERN_INFO "s2250: future setting\n");
-                       return -EINVAL;
+                       if (ctrl->value > 100)
+                               dec->brightness = 100;
+                       else if (ctrl->value < 0)
+                               dec->brightness = 0;
+                       else
+                               dec->brightness = ctrl->value;
+                       value1 = (dec->brightness - 50) * 255 / 100;
+                       read_reg_fp(client, VPX322_ADDR_BRIGHTNESS0, &oldvalue);
+                       write_reg_fp(client, VPX322_ADDR_BRIGHTNESS0,
+                                    value1 | (oldvalue & ~0xff));
+                       read_reg_fp(client, VPX322_ADDR_BRIGHTNESS1, &oldvalue);
+                       write_reg_fp(client, VPX322_ADDR_BRIGHTNESS1,
+                                    value1 | (oldvalue & ~0xff));
+                       write_reg_fp(client, 0x140, 0x60);
+                       break;
                case V4L2_CID_CONTRAST:
-                       printk(KERN_INFO "s2250: future setting\n");
-                       return -EINVAL;
+                       if (ctrl->value > 100)
+                               dec->contrast = 100;
+                       else if (ctrl->value < 0)
+                               dec->contrast = 0;
+                       else
+                               dec->contrast = ctrl->value;
+                       value1 = dec->contrast * 0x40 / 100;
+                       if (value1 > 0x3f)
+                               value1 = 0x3f; /* max */
+                       read_reg_fp(client, VPX322_ADDR_CONTRAST0, &oldvalue);
+                       write_reg_fp(client, VPX322_ADDR_CONTRAST0,
+                                    value1 | (oldvalue & ~0x3f));
+                       read_reg_fp(client, VPX322_ADDR_CONTRAST1, &oldvalue);
+                       write_reg_fp(client, VPX322_ADDR_CONTRAST1,
+                                    value1 | (oldvalue & ~0x3f));
+                       write_reg_fp(client, 0x140, 0x60);
                        break;
                case V4L2_CID_SATURATION:
                        if (ctrl->value > 127)
@@ -541,7 +612,7 @@ static int s2250_probe(struct i2c_client *client,
        dec->audio_input = 0;
        write_reg(client, 0x08, 0x02); /* Line In */
 
-       if (down_interruptible(&usb->i2c_lock) == 0) {
+       if (mutex_lock_interruptible(&usb->i2c_lock) == 0) {
                data = kzalloc(16, GFP_KERNEL);
                if (data != NULL) {
                        int rc;
@@ -560,7 +631,7 @@ static int s2250_probe(struct i2c_client *client,
                        }
                        kfree(data);
                }
-               up(&usb->i2c_lock);
+               mutex_unlock(&usb->i2c_lock);
        }
 
        printk("s2250: initialized successfully\n");
index bb22347..d7bf829 100644 (file)
@@ -35,7 +35,7 @@ typedef struct device_extension_s {
 #define MAX_DEVICES 256
 
 static pdevice_extension_t s2250_dev_table[MAX_DEVICES];
-static DECLARE_MUTEX(s2250_dev_table_mutex);
+static DEFINE_MUTEX(s2250_dev_table_mutex);
 
 #define to_s2250loader_dev_common(d) container_of(d, device_extension_t, kref)
 static void s2250loader_delete(struct kref *kref)
@@ -67,7 +67,7 @@ static int s2250loader_probe(struct usb_interface *interface,
                printk(KERN_ERR "can't handle multiple config\n");
                return -1;
        }
-       down(&s2250_dev_table_mutex);
+       mutex_lock(&s2250_dev_table_mutex);
 
        for (minor = 0; minor < MAX_DEVICES; minor++) {
                if (s2250_dev_table[minor] == NULL)
@@ -96,7 +96,7 @@ static int s2250loader_probe(struct usb_interface *interface,
 
        kref_init(&(s->kref));
 
-       up(&s2250_dev_table_mutex);
+       mutex_unlock(&s2250_dev_table_mutex);
 
        if (request_firmware(&fw, S2250_LOADER_FIRMWARE, &usbdev->dev)) {
                printk(KERN_ERR
@@ -128,7 +128,7 @@ static int s2250loader_probe(struct usb_interface *interface,
        return 0;
 
 failed:
-       up(&s2250_dev_table_mutex);
+       mutex_unlock(&s2250_dev_table_mutex);
 failed2:
        if (s)
                kref_put(&(s->kref), s2250loader_delete);
index cd19be6..03c4dfc 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/i2c.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <asm/system.h>
 #include <sound/core.h>
index 6c3427b..506dca6 100644 (file)
@@ -111,7 +111,8 @@ static int wis_tw9903_command(struct i2c_client *client,
                i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input << 1));
                break;
        }
-#if 0   /* The scaler on this thing seems to be horribly broken */
+#if 0
+       /* The scaler on this thing seems to be horribly broken */
        case DECODER_SET_RESOLUTION:
        {
                struct video_decoder_resolution *res = arg;
index 660a9c1..1fa18f2 100644 (file)
@@ -39,14 +39,14 @@ dev_t iio_devt;
 EXPORT_SYMBOL(iio_devt);
 
 #define IIO_DEV_MAX 256
-static char *iio_nodename(struct device *dev)
+static char *iio_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev));
 }
 
 struct class iio_class = {
        .name = "iio",
-       .nodename = iio_nodename,
+       .devnode = iio_devnode,
 };
 EXPORT_SYMBOL(iio_class);
 
index 3f498f6..90fd40f 100644 (file)
@@ -2060,7 +2060,7 @@ typedef struct _STA_ADMIN_CONFIG {
     BOOLEAN            AdhocBGJoined;          // Indicate Adhoc B/G Join.
     BOOLEAN            Adhoc20NJoined;         // Indicate Adhoc 20MHz N Join.
 #endif
-       // New for WPA, windows want us to to keep association information and
+       // New for WPA, windows want us to keep association information and
        // Fixed IEs from last association response
        NDIS_802_11_ASSOCIATION_INFORMATION     AssocInfo;
        USHORT       ReqVarIELen;                // Length of next VIE include EID & Length
index 12d414d..be99eb3 100644 (file)
@@ -2591,3 +2591,4 @@ module_exit(stlc45xx_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
+MODULE_ALIAS("spi:cx3110x");
index a86e952..bf7c687 100644 (file)
@@ -15,6 +15,7 @@ menuconfig THERMAL
 
 config THERMAL_HWMON
        bool "Hardware monitoring support"
+       depends on THERMAL
        depends on HWMON=y || HWMON=THERMAL
        help
          The generic thermal sysfs driver's hardware monitoring support
index dcd49f1..ebd7237 100644 (file)
@@ -39,6 +39,7 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_AT91
        default y if ARCH_PNX4008 && I2C
        default y if MFD_TC6393XB
+       default y if ARCH_W90X900
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@ -58,6 +59,8 @@ config USB_ARCH_HAS_EHCI
        default y if PPC_83xx
        default y if SOC_AU1200
        default y if ARCH_IXP4XX
+       default y if ARCH_W90X900
+       default y if ARCH_AT91SAM9G45
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
index 19cb7d5..be3c9b8 100644 (file)
@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD)    += host/
 obj-$(CONFIG_USB_FHCI_HCD)     += host/
 obj-$(CONFIG_USB_XHCI_HCD)     += host/
 obj-$(CONFIG_USB_SL811_HCD)    += host/
+obj-$(CONFIG_USB_ISP1362_HCD)  += host/
 obj-$(CONFIG_USB_U132_HCD)     += host/
 obj-$(CONFIG_USB_R8A66597_HCD) += host/
 obj-$(CONFIG_USB_HWA_HCD)      += host/
@@ -39,6 +40,7 @@ obj-$(CONFIG_USB_MICROTEK)    += image/
 obj-$(CONFIG_USB_SERIAL)       += serial/
 
 obj-$(CONFIG_USB)              += misc/
+obj-y                          += early/
 
 obj-$(CONFIG_USB_ATM)          += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)   += atm/
index 2bfc41e..e3861b2 100644 (file)
@@ -59,6 +59,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
+#include <linux/serial.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
@@ -609,6 +610,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
        acm->throttle = 0;
 
        tasklet_schedule(&acm->urb_task);
+       set_bit(ASYNCB_INITIALIZED, &acm->port.flags);
        rv = tty_port_block_til_ready(&acm->port, tty, filp);
 done:
        mutex_unlock(&acm->mutex);
@@ -858,10 +860,7 @@ static void acm_tty_set_termios(struct tty_struct *tty,
        if (!ACM_READY(acm))
                return;
 
-       /* FIXME: Needs to support the tty_baud interface */
-       /* FIXME: Broken on sparc */
-       newline.dwDTERate = cpu_to_le32p(acm_tty_speed +
-               (termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0));
+       newline.dwDTERate = cpu_to_le32(tty_get_baud_rate(tty));
        newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;
        newline.bParityType = termios->c_cflag & PARENB ?
                                (termios->c_cflag & PARODD ? 1 : 2) +
index ba589d4..3e564bf 100644 (file)
@@ -313,8 +313,13 @@ static ssize_t wdm_write
        r = usb_autopm_get_interface(desc->intf);
        if (r < 0)
                goto outnp;
-       r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
-                                                          &desc->flags));
+
+       if (!file->f_flags && O_NONBLOCK)
+               r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
+                                                               &desc->flags));
+       else
+               if (test_bit(WDM_IN_USE, &desc->flags))
+                       r = -EAGAIN;
        if (r < 0)
                goto out;
 
@@ -377,7 +382,7 @@ outnl:
 static ssize_t wdm_read
 (struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-       int rv, cntr;
+       int rv, cntr = 0;
        int i = 0;
        struct wdm_device *desc = file->private_data;
 
@@ -389,10 +394,23 @@ static ssize_t wdm_read
        if (desc->length == 0) {
                desc->read = 0;
 retry:
+               if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                       rv = -ENODEV;
+                       goto err;
+               }
                i++;
-               rv = wait_event_interruptible(desc->wait,
-                                             test_bit(WDM_READ, &desc->flags));
+               if (file->f_flags & O_NONBLOCK) {
+                       if (!test_bit(WDM_READ, &desc->flags)) {
+                               rv = cntr ? cntr : -EAGAIN;
+                               goto err;
+                       }
+                       rv = 0;
+               } else {
+                       rv = wait_event_interruptible(desc->wait,
+                               test_bit(WDM_READ, &desc->flags));
+               }
 
+               /* may have happened while we slept */
                if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
                        rv = -ENODEV;
                        goto err;
@@ -448,7 +466,7 @@ retry:
 
 err:
        mutex_unlock(&desc->rlock);
-       if (rv < 0)
+       if (rv < 0 && rv != -EAGAIN)
                dev_err(&desc->intf->dev, "wdm_read: exit error\n");
        return rv;
 }
@@ -506,8 +524,6 @@ static int wdm_open(struct inode *inode, struct file *file)
        desc = usb_get_intfdata(intf);
        if (test_bit(WDM_DISCONNECTING, &desc->flags))
                goto out;
-
-       ;
        file->private_data = desc;
 
        rv = usb_autopm_get_interface(desc->intf);
index 26c09f0..9bc112e 100644 (file)
@@ -1057,14 +1057,14 @@ static const struct file_operations usblp_fops = {
        .release =      usblp_release,
 };
 
-static char *usblp_nodename(struct device *dev)
+static char *usblp_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
 
 static struct usb_class_driver usblp_class = {
        .name =         "lp%d",
-       .nodename =     usblp_nodename,
+       .devnode =      usblp_devnode,
        .fops =         &usblp_fops,
        .minor_base =   USBLP_MINOR_BASE,
 };
index b09a527..333ee02 100644 (file)
@@ -57,7 +57,9 @@ MODULE_DEVICE_TABLE(usb, usbtmc_devices);
 
 /*
  * This structure is the capabilities for the device
- * See section 4.2.1.8 of the USBTMC specification for details.
+ * See section 4.2.1.8 of the USBTMC specification,
+ * and section 4.2.2 of the USBTMC usb488 subclass
+ * specification for details.
  */
 struct usbtmc_dev_capabilities {
        __u8 interface_capabilities;
@@ -86,6 +88,8 @@ struct usbtmc_device_data {
        bool TermCharEnabled;
        bool auto_abort;
 
+       bool zombie; /* fd of disconnected device */
+
        struct usbtmc_dev_capabilities  capabilities;
        struct kref kref;
        struct mutex io_mutex;  /* only one i/o function running at a time */
@@ -367,13 +371,13 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
 {
        struct usbtmc_device_data *data;
        struct device *dev;
-       unsigned long int n_characters;
+       u32 n_characters;
        u8 *buffer;
        int actual;
-       int done;
-       int remaining;
+       size_t done;
+       size_t remaining;
        int retval;
-       int this_part;
+       size_t this_part;
 
        /* Get pointer to private data structure */
        data = filp->private_data;
@@ -384,6 +388,10 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
                return -ENOMEM;
 
        mutex_lock(&data->io_mutex);
+       if (data->zombie) {
+               retval = -ENODEV;
+               goto exit;
+       }
 
        remaining = count;
        done = 0;
@@ -401,10 +409,10 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
                buffer[1] = data->bTag;
                buffer[2] = ~(data->bTag);
                buffer[3] = 0; /* Reserved */
-               buffer[4] = (this_part - 12 - 3) & 255;
-               buffer[5] = ((this_part - 12 - 3) >> 8) & 255;
-               buffer[6] = ((this_part - 12 - 3) >> 16) & 255;
-               buffer[7] = ((this_part - 12 - 3) >> 24) & 255;
+               buffer[4] = (this_part) & 255;
+               buffer[5] = ((this_part) >> 8) & 255;
+               buffer[6] = ((this_part) >> 16) & 255;
+               buffer[7] = ((this_part) >> 24) & 255;
                buffer[8] = data->TermCharEnabled * 2;
                /* Use term character? */
                buffer[9] = data->TermChar;
@@ -455,6 +463,22 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
                               (buffer[6] << 16) +
                               (buffer[7] << 24);
 
+               /* Ensure the instrument doesn't lie about it */
+               if(n_characters > actual - 12) {
+                       dev_err(dev, "Device lies about message size: %u > %d\n", n_characters, actual - 12);
+                       n_characters = actual - 12;
+               }
+
+               /* Ensure the instrument doesn't send more back than requested */
+               if(n_characters > this_part) {
+                       dev_err(dev, "Device returns more than requested: %zu > %zu\n", done + n_characters, done + this_part);
+                       n_characters = this_part;
+               }
+
+               /* Bound amount of data received by amount of data requested */
+               if (n_characters > this_part)
+                       n_characters = this_part;
+
                /* Copy buffer to user space */
                if (copy_to_user(buf + done, &buffer[12], n_characters)) {
                        /* There must have been an addressing problem */
@@ -463,8 +487,11 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
                }
 
                done += n_characters;
-               if (n_characters < USBTMC_SIZE_IOBUFFER)
+               /* Terminate if end-of-message bit recieved from device */
+               if ((buffer[8] &  0x01) && (actual >= n_characters + 12))
                        remaining = 0;
+               else
+                       remaining -= n_characters;
        }
 
        /* Update file position value */
@@ -496,6 +523,10 @@ static ssize_t usbtmc_write(struct file *filp, const char __user *buf,
                return -ENOMEM;
 
        mutex_lock(&data->io_mutex);
+       if (data->zombie) {
+               retval = -ENODEV;
+               goto exit;
+       }
 
        remaining = count;
        done = 0;
@@ -767,20 +798,21 @@ static int get_capabilities(struct usbtmc_device_data *data)
        }
 
        dev_dbg(dev, "GET_CAPABILITIES returned %x\n", buffer[0]);
-       dev_dbg(dev, "Interface capabilities are %x\n", buffer[4]);
-       dev_dbg(dev, "Device capabilities are %x\n", buffer[5]);
-       dev_dbg(dev, "USB488 interface capabilities are %x\n", buffer[14]);
-       dev_dbg(dev, "USB488 device capabilities are %x\n", buffer[15]);
        if (buffer[0] != USBTMC_STATUS_SUCCESS) {
                dev_err(dev, "GET_CAPABILITIES returned %x\n", buffer[0]);
                rv = -EPERM;
                goto err_out;
        }
+       dev_dbg(dev, "Interface capabilities are %x\n", buffer[4]);
+       dev_dbg(dev, "Device capabilities are %x\n", buffer[5]);
+       dev_dbg(dev, "USB488 interface capabilities are %x\n", buffer[14]);
+       dev_dbg(dev, "USB488 device capabilities are %x\n", buffer[15]);
 
        data->capabilities.interface_capabilities = buffer[4];
        data->capabilities.device_capabilities = buffer[5];
        data->capabilities.usb488_interface_capabilities = buffer[14];
        data->capabilities.usb488_device_capabilities = buffer[15];
+       rv = 0;
 
 err_out:
        kfree(buffer);
@@ -925,6 +957,10 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
        data = file->private_data;
        mutex_lock(&data->io_mutex);
+       if (data->zombie) {
+               retval = -ENODEV;
+               goto skip_io_on_zombie;
+       }
 
        switch (cmd) {
        case USBTMC_IOCTL_CLEAR_OUT_HALT:
@@ -952,6 +988,7 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
        }
 
+skip_io_on_zombie:
        mutex_unlock(&data->io_mutex);
        return retval;
 }
@@ -995,6 +1032,7 @@ static int usbtmc_probe(struct usb_interface *intf,
        usb_set_intfdata(intf, data);
        kref_init(&data->kref);
        mutex_init(&data->io_mutex);
+       data->zombie = 0;
 
        /* Initialize USBTMC bTag and other fields */
        data->bTag      = 1;
@@ -1065,14 +1103,30 @@ static void usbtmc_disconnect(struct usb_interface *intf)
        usb_deregister_dev(intf, &usbtmc_class);
        sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
        sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
+       mutex_lock(&data->io_mutex);
+       data->zombie = 1;
+       mutex_unlock(&data->io_mutex);
        kref_put(&data->kref, usbtmc_delete);
 }
 
+static int usbtmc_suspend (struct usb_interface *intf, pm_message_t message)
+{
+       /* this driver does not have pending URBs */
+       return 0;
+}
+
+static int usbtmc_resume (struct usb_interface *intf)
+{
+       return 0;
+}
+
 static struct usb_driver usbtmc_driver = {
        .name           = "usbtmc",
        .id_table       = usbtmc_devices,
        .probe          = usbtmc_probe,
-       .disconnect     = usbtmc_disconnect
+       .disconnect     = usbtmc_disconnect,
+       .suspend        = usbtmc_suspend,
+       .resume         = usbtmc_resume,
 };
 
 static int __init usbtmc_init(void)
index a16c538..0d3af6a 100644 (file)
@@ -105,7 +105,7 @@ static int usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
        ep->ss_ep_comp->extralen = i;
        buffer += i;
        size -= i;
-       retval = buffer - buffer_start + i;
+       retval = buffer - buffer_start;
        if (num_skipped > 0)
                dev_dbg(ddev, "skipped %d descriptor%s after %s\n",
                                num_skipped, plural(num_skipped),
index 4247ecc..181f78c 100644 (file)
@@ -52,6 +52,7 @@
 
 #include "hcd.h"       /* for usbcore internals */
 #include "usb.h"
+#include "hub.h"
 
 #define USB_MAXBUS                     64
 #define USB_DEVICE_MAX                 USB_MAXBUS * 128
@@ -73,6 +74,7 @@ struct dev_state {
        void __user *disccontext;
        unsigned long ifclaimed;
        u32 secid;
+       u32 disabled_bulk_eps;
 };
 
 struct async {
@@ -87,6 +89,8 @@ struct async {
        struct urb *urb;
        int status;
        u32 secid;
+       u8 bulk_addr;
+       u8 bulk_status;
 };
 
 static int usbfs_snoop;
@@ -99,11 +103,15 @@ MODULE_PARM_DESC(usbfs_snoop, "true to log all usbfs traffic");
                        dev_info(dev , format , ## arg);        \
        } while (0)
 
-#define USB_DEVICE_DEV         MKDEV(USB_DEVICE_MAJOR, 0)
+enum snoop_when {
+       SUBMIT, COMPLETE
+};
 
+#define USB_DEVICE_DEV         MKDEV(USB_DEVICE_MAJOR, 0)
 
 #define        MAX_USBFS_BUFFER_SIZE   16384
 
+
 static int connected(struct dev_state *ps)
 {
        return (!list_empty(&ps->list) &&
@@ -300,24 +308,79 @@ static struct async *async_getpending(struct dev_state *ps,
        return NULL;
 }
 
-static void snoop_urb(struct urb *urb, void __user *userurb)
+static void snoop_urb(struct usb_device *udev,
+               void __user *userurb, int pipe, unsigned length,
+               int timeout_or_status, enum snoop_when when)
 {
-       unsigned j;
-       unsigned char *data = urb->transfer_buffer;
+       static const char *types[] = {"isoc", "int", "ctrl", "bulk"};
+       static const char *dirs[] = {"out", "in"};
+       int ep;
+       const char *t, *d;
 
        if (!usbfs_snoop)
                return;
 
-       dev_info(&urb->dev->dev, "direction=%s\n",
-                       usb_urb_dir_in(urb) ? "IN" : "OUT");
-       dev_info(&urb->dev->dev, "userurb=%p\n", userurb);
-       dev_info(&urb->dev->dev, "transfer_buffer_length=%u\n",
-                urb->transfer_buffer_length);
-       dev_info(&urb->dev->dev, "actual_length=%u\n", urb->actual_length);
-       dev_info(&urb->dev->dev, "data: ");
-       for (j = 0; j < urb->transfer_buffer_length; ++j)
-               printk("%02x ", data[j]);
-       printk("\n");
+       ep = usb_pipeendpoint(pipe);
+       t = types[usb_pipetype(pipe)];
+       d = dirs[!!usb_pipein(pipe)];
+
+       if (userurb) {          /* Async */
+               if (when == SUBMIT)
+                       dev_info(&udev->dev, "userurb %p, ep%d %s-%s, "
+                                       "length %u\n",
+                                       userurb, ep, t, d, length);
+               else
+                       dev_info(&udev->dev, "userurb %p, ep%d %s-%s, "
+                                       "actual_length %u status %d\n",
+                                       userurb, ep, t, d, length,
+                                       timeout_or_status);
+       } else {
+               if (when == SUBMIT)
+                       dev_info(&udev->dev, "ep%d %s-%s, length %u, "
+                                       "timeout %d\n",
+                                       ep, t, d, length, timeout_or_status);
+               else
+                       dev_info(&udev->dev, "ep%d %s-%s, actual_length %u, "
+                                       "status %d\n",
+                                       ep, t, d, length, timeout_or_status);
+       }
+}
+
+#define AS_CONTINUATION        1
+#define AS_UNLINK      2
+
+static void cancel_bulk_urbs(struct dev_state *ps, unsigned bulk_addr)
+__releases(ps->lock)
+__acquires(ps->lock)
+{
+       struct async *as;
+
+       /* Mark all the pending URBs that match bulk_addr, up to but not
+        * including the first one without AS_CONTINUATION.  If such an
+        * URB is encountered then a new transfer has already started so
+        * the endpoint doesn't need to be disabled; otherwise it does.
+        */
+       list_for_each_entry(as, &ps->async_pending, asynclist) {
+               if (as->bulk_addr == bulk_addr) {
+                       if (as->bulk_status != AS_CONTINUATION)
+                               goto rescan;
+                       as->bulk_status = AS_UNLINK;
+                       as->bulk_addr = 0;
+               }
+       }
+       ps->disabled_bulk_eps |= (1 << bulk_addr);
+
+       /* Now carefully unlink all the marked pending URBs */
+ rescan:
+       list_for_each_entry(as, &ps->async_pending, asynclist) {
+               if (as->bulk_status == AS_UNLINK) {
+                       as->bulk_status = 0;            /* Only once */
+                       spin_unlock(&ps->lock);         /* Allow completions */
+                       usb_unlink_urb(as->urb);
+                       spin_lock(&ps->lock);
+                       goto rescan;
+               }
+       }
 }
 
 static void async_completed(struct urb *urb)
@@ -346,7 +409,11 @@ static void async_completed(struct urb *urb)
                secid = as->secid;
        }
        snoop(&urb->dev->dev, "urb complete\n");
-       snoop_urb(urb, as->userurb);
+       snoop_urb(urb->dev, as->userurb, urb->pipe, urb->actual_length,
+                       as->status, COMPLETE);
+       if (as->status < 0 && as->bulk_addr && as->status != -ECONNRESET &&
+                       as->status != -ENOENT)
+               cancel_bulk_urbs(ps, as->bulk_addr);
        spin_unlock(&ps->lock);
 
        if (signr)
@@ -655,6 +722,7 @@ static int usbdev_release(struct inode *inode, struct file *file)
        struct async *as;
 
        usb_lock_device(dev);
+       usb_hub_release_all_ports(dev, ps);
 
        /* Protect against simultaneous open */
        mutex_lock(&usbfs_mutex);
@@ -688,7 +756,7 @@ static int proc_control(struct dev_state *ps, void __user *arg)
        unsigned int tmo;
        unsigned char *tbuf;
        unsigned wLength;
-       int i, j, ret;
+       int i, pipe, ret;
 
        if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
                return -EFAULT;
@@ -708,24 +776,17 @@ static int proc_control(struct dev_state *ps, void __user *arg)
                        free_page((unsigned long)tbuf);
                        return -EINVAL;
                }
-               snoop(&dev->dev, "control read: bRequest=%02x "
-                               "bRrequestType=%02x wValue=%04x "
-                               "wIndex=%04x wLength=%04x\n",
-                       ctrl.bRequest, ctrl.bRequestType, ctrl.wValue,
-                               ctrl.wIndex, ctrl.wLength);
+               pipe = usb_rcvctrlpipe(dev, 0);
+               snoop_urb(dev, NULL, pipe, ctrl.wLength, tmo, SUBMIT);
 
                usb_unlock_device(dev);
-               i = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), ctrl.bRequest,
+               i = usb_control_msg(dev, pipe, ctrl.bRequest,
                                    ctrl.bRequestType, ctrl.wValue, ctrl.wIndex,
                                    tbuf, ctrl.wLength, tmo);
                usb_lock_device(dev);
+               snoop_urb(dev, NULL, pipe, max(i, 0), min(i, 0), COMPLETE);
+
                if ((i > 0) && ctrl.wLength) {
-                       if (usbfs_snoop) {
-                               dev_info(&dev->dev, "control read: data ");
-                               for (j = 0; j < i; ++j)
-                                       printk("%02x ", (u8)(tbuf)[j]);
-                               printk("\n");
-                       }
                        if (copy_to_user(ctrl.data, tbuf, i)) {
                                free_page((unsigned long)tbuf);
                                return -EFAULT;
@@ -738,22 +799,15 @@ static int proc_control(struct dev_state *ps, void __user *arg)
                                return -EFAULT;
                        }
                }
-               snoop(&dev->dev, "control write: bRequest=%02x "
-                               "bRrequestType=%02x wValue=%04x "
-                               "wIndex=%04x wLength=%04x\n",
-                       ctrl.bRequest, ctrl.bRequestType, ctrl.wValue,
-                               ctrl.wIndex, ctrl.wLength);
-               if (usbfs_snoop) {
-                       dev_info(&dev->dev, "control write: data: ");
-                       for (j = 0; j < ctrl.wLength; ++j)
-                               printk("%02x ", (unsigned char)(tbuf)[j]);
-                       printk("\n");
-               }
+               pipe = usb_sndctrlpipe(dev, 0);
+               snoop_urb(dev, NULL, pipe, ctrl.wLength, tmo, SUBMIT);
+
                usb_unlock_device(dev);
                i = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ctrl.bRequest,
                                    ctrl.bRequestType, ctrl.wValue, ctrl.wIndex,
                                    tbuf, ctrl.wLength, tmo);
                usb_lock_device(dev);
+               snoop_urb(dev, NULL, pipe, max(i, 0), min(i, 0), COMPLETE);
        }
        free_page((unsigned long)tbuf);
        if (i < 0 && i != -EPIPE) {
@@ -772,7 +826,7 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
        unsigned int tmo, len1, pipe;
        int len2;
        unsigned char *tbuf;
-       int i, j, ret;
+       int i, ret;
 
        if (copy_from_user(&bulk, arg, sizeof(bulk)))
                return -EFAULT;
@@ -799,18 +853,14 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
                        kfree(tbuf);
                        return -EINVAL;
                }
-               snoop(&dev->dev, "bulk read: len=0x%02x timeout=%04d\n",
-                       bulk.len, bulk.timeout);
+               snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT);
+
                usb_unlock_device(dev);
                i = usb_bulk_msg(dev, pipe, tbuf, len1, &len2, tmo);
                usb_lock_device(dev);
+               snoop_urb(dev, NULL, pipe, len2, i, COMPLETE);
+
                if (!i && len2) {
-                       if (usbfs_snoop) {
-                               dev_info(&dev->dev, "bulk read: data ");
-                               for (j = 0; j < len2; ++j)
-                                       printk("%02x ", (u8)(tbuf)[j]);
-                               printk("\n");
-                       }
                        if (copy_to_user(bulk.data, tbuf, len2)) {
                                kfree(tbuf);
                                return -EFAULT;
@@ -823,17 +873,12 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
                                return -EFAULT;
                        }
                }
-               snoop(&dev->dev, "bulk write: len=0x%02x timeout=%04d\n",
-                       bulk.len, bulk.timeout);
-               if (usbfs_snoop) {
-                       dev_info(&dev->dev, "bulk write: data: ");
-                       for (j = 0; j < len1; ++j)
-                               printk("%02x ", (unsigned char)(tbuf)[j]);
-                       printk("\n");
-               }
+               snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT);
+
                usb_unlock_device(dev);
                i = usb_bulk_msg(dev, pipe, tbuf, len1, &len2, tmo);
                usb_lock_device(dev);
+               snoop_urb(dev, NULL, pipe, len2, i, COMPLETE);
        }
        kfree(tbuf);
        if (i < 0)
@@ -991,6 +1036,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
 
        if (uurb->flags & ~(USBDEVFS_URB_ISO_ASAP |
                                USBDEVFS_URB_SHORT_NOT_OK |
+                               USBDEVFS_URB_BULK_CONTINUATION |
                                USBDEVFS_URB_NO_FSBR |
                                USBDEVFS_URB_ZERO_PACKET |
                                USBDEVFS_URB_NO_INTERRUPT))
@@ -1051,13 +1097,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                        is_in = 0;
                        uurb->endpoint &= ~USB_DIR_IN;
                }
-               snoop(&ps->dev->dev, "control urb: bRequest=%02x "
-                       "bRrequestType=%02x wValue=%04x "
-                       "wIndex=%04x wLength=%04x\n",
-                       dr->bRequest, dr->bRequestType,
-                       __le16_to_cpup(&dr->wValue),
-                       __le16_to_cpup(&dr->wIndex),
-                       __le16_to_cpup(&dr->wLength));
                break;
 
        case USBDEVFS_URB_TYPE_BULK:
@@ -1070,7 +1109,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                uurb->number_of_packets = 0;
                if (uurb->buffer_length > MAX_USBFS_BUFFER_SIZE)
                        return -EINVAL;
-               snoop(&ps->dev->dev, "bulk urb\n");
                break;
 
        case USBDEVFS_URB_TYPE_ISO:
@@ -1097,12 +1135,12 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                        }
                        totlen += isopkt[u].length;
                }
-               if (totlen > 32768) {
+               /* 3072 * 64 microframes */
+               if (totlen > 196608) {
                        kfree(isopkt);
                        return -EINVAL;
                }
                uurb->buffer_length = totlen;
-               snoop(&ps->dev->dev, "iso urb\n");
                break;
 
        case USBDEVFS_URB_TYPE_INTERRUPT:
@@ -1111,7 +1149,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                        return -EINVAL;
                if (uurb->buffer_length > MAX_USBFS_BUFFER_SIZE)
                        return -EINVAL;
-               snoop(&ps->dev->dev, "interrupt urb\n");
                break;
 
        default:
@@ -1198,11 +1235,46 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                        return -EFAULT;
                }
        }
-       snoop_urb(as->urb, as->userurb);
+       snoop_urb(ps->dev, as->userurb, as->urb->pipe,
+                       as->urb->transfer_buffer_length, 0, SUBMIT);
        async_newpending(as);
-       if ((ret = usb_submit_urb(as->urb, GFP_KERNEL))) {
+
+       if (usb_endpoint_xfer_bulk(&ep->desc)) {
+               spin_lock_irq(&ps->lock);
+
+               /* Not exactly the endpoint address; the direction bit is
+                * shifted to the 0x10 position so that the value will be
+                * between 0 and 31.
+                */
+               as->bulk_addr = usb_endpoint_num(&ep->desc) |
+                       ((ep->desc.bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                               >> 3);
+
+               /* If this bulk URB is the start of a new transfer, re-enable
+                * the endpoint.  Otherwise mark it as a continuation URB.
+                */
+               if (uurb->flags & USBDEVFS_URB_BULK_CONTINUATION)
+                       as->bulk_status = AS_CONTINUATION;
+               else
+                       ps->disabled_bulk_eps &= ~(1 << as->bulk_addr);
+
+               /* Don't accept continuation URBs if the endpoint is
+                * disabled because of an earlier error.
+                */
+               if (ps->disabled_bulk_eps & (1 << as->bulk_addr))
+                       ret = -EREMOTEIO;
+               else
+                       ret = usb_submit_urb(as->urb, GFP_ATOMIC);
+               spin_unlock_irq(&ps->lock);
+       } else {
+               ret = usb_submit_urb(as->urb, GFP_KERNEL);
+       }
+
+       if (ret) {
                dev_printk(KERN_DEBUG, &ps->dev->dev,
                           "usbfs: usb_submit_urb returned %d\n", ret);
+               snoop_urb(ps->dev, as->userurb, as->urb->pipe,
+                               0, ret, COMPLETE);
                async_removepending(as);
                free_async(as);
                return ret;
@@ -1548,6 +1620,29 @@ static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg)
 }
 #endif
 
+static int proc_claim_port(struct dev_state *ps, void __user *arg)
+{
+       unsigned portnum;
+       int rc;
+
+       if (get_user(portnum, (unsigned __user *) arg))
+               return -EFAULT;
+       rc = usb_hub_claim_port(ps->dev, portnum, ps);
+       if (rc == 0)
+               snoop(&ps->dev->dev, "port %d claimed by process %d: %s\n",
+                       portnum, task_pid_nr(current), current->comm);
+       return rc;
+}
+
+static int proc_release_port(struct dev_state *ps, void __user *arg)
+{
+       unsigned portnum;
+
+       if (get_user(portnum, (unsigned __user *) arg))
+               return -EFAULT;
+       return usb_hub_release_port(ps->dev, portnum, ps);
+}
+
 /*
  * NOTE:  All requests here that have interface numbers as parameters
  * are assuming that somehow the configuration has been prevented from
@@ -1645,7 +1740,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
                break;
 
        case USBDEVFS_REAPURBNDELAY32:
-               snoop(&dev->dev, "%s: REAPURBDELAY32\n", __func__);
+               snoop(&dev->dev, "%s: REAPURBNDELAY32\n", __func__);
                ret = proc_reapurbnonblock_compat(ps, p);
                break;
 
@@ -1666,7 +1761,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
                break;
 
        case USBDEVFS_REAPURBNDELAY:
-               snoop(&dev->dev, "%s: REAPURBDELAY\n", __func__);
+               snoop(&dev->dev, "%s: REAPURBNDELAY\n", __func__);
                ret = proc_reapurbnonblock(ps, p);
                break;
 
@@ -1689,6 +1784,16 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
                snoop(&dev->dev, "%s: IOCTL\n", __func__);
                ret = proc_ioctl_default(ps, p);
                break;
+
+       case USBDEVFS_CLAIM_PORT:
+               snoop(&dev->dev, "%s: CLAIM_PORT\n", __func__);
+               ret = proc_claim_port(ps, p);
+               break;
+
+       case USBDEVFS_RELEASE_PORT:
+               snoop(&dev->dev, "%s: RELEASE_PORT\n", __func__);
+               ret = proc_release_port(ps, p);
+               break;
        }
        usb_unlock_device(dev);
        if (ret >= 0)
index 69e5773..4f86447 100644 (file)
@@ -207,6 +207,9 @@ static int usb_probe_interface(struct device *dev)
 
        intf->needs_binding = 0;
 
+       if (usb_device_is_owned(udev))
+               return -ENODEV;
+
        if (udev->authorized == 0) {
                dev_err(&intf->dev, "Device is not authorized for usage\n");
                return -ENODEV;
@@ -232,28 +235,35 @@ static int usb_probe_interface(struct device *dev)
                /* The interface should always appear to be in use
                 * unless the driver suports autosuspend.
                 */
-               intf->pm_usage_cnt = !(driver->supports_autosuspend);
+               atomic_set(&intf->pm_usage_cnt, !driver->supports_autosuspend);
 
                /* Carry out a deferred switch to altsetting 0 */
                if (intf->needs_altsetting0) {
-                       usb_set_interface(udev, intf->altsetting[0].
+                       error = usb_set_interface(udev, intf->altsetting[0].
                                        desc.bInterfaceNumber, 0);
+                       if (error < 0)
+                               goto err;
+
                        intf->needs_altsetting0 = 0;
                }
 
                error = driver->probe(intf, id);
-               if (error) {
-                       mark_quiesced(intf);
-                       intf->needs_remote_wakeup = 0;
-                       intf->condition = USB_INTERFACE_UNBOUND;
-                       usb_cancel_queued_reset(intf);
-               } else
-                       intf->condition = USB_INTERFACE_BOUND;
+               if (error)
+                       goto err;
 
+               intf->condition = USB_INTERFACE_BOUND;
                usb_autosuspend_device(udev);
        }
 
        return error;
+
+err:
+       mark_quiesced(intf);
+       intf->needs_remote_wakeup = 0;
+       intf->condition = USB_INTERFACE_UNBOUND;
+       usb_cancel_queued_reset(intf);
+       usb_autosuspend_device(udev);
+       return error;
 }
 
 /* called from driver core with dev locked */
@@ -262,7 +272,7 @@ static int usb_unbind_interface(struct device *dev)
        struct usb_driver *driver = to_usb_driver(dev->driver);
        struct usb_interface *intf = to_usb_interface(dev);
        struct usb_device *udev;
-       int error;
+       int error, r;
 
        intf->condition = USB_INTERFACE_UNBINDING;
 
@@ -290,11 +300,14 @@ static int usb_unbind_interface(struct device *dev)
                 * Just re-enable it without affecting the endpoint toggles.
                 */
                usb_enable_interface(udev, intf, false);
-       } else if (!error && intf->dev.power.status == DPM_ON)
-               usb_set_interface(udev, intf->altsetting[0].
+       } else if (!error && intf->dev.power.status == DPM_ON) {
+               r = usb_set_interface(udev, intf->altsetting[0].
                                desc.bInterfaceNumber, 0);
-       else
+               if (r < 0)
+                       intf->needs_altsetting0 = 1;
+       } else {
                intf->needs_altsetting0 = 1;
+       }
        usb_set_intfdata(intf, NULL);
 
        intf->condition = USB_INTERFACE_UNBOUND;
@@ -344,7 +357,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
        usb_pm_lock(udev);
        iface->condition = USB_INTERFACE_BOUND;
        mark_active(iface);
-       iface->pm_usage_cnt = !(driver->supports_autosuspend);
+       atomic_set(&iface->pm_usage_cnt, !driver->supports_autosuspend);
        usb_pm_unlock(udev);
 
        /* if interface was already added, bind now; else let
@@ -1065,7 +1078,7 @@ static int autosuspend_check(struct usb_device *udev, int reschedule)
                        intf = udev->actconfig->interface[i];
                        if (!is_active(intf))
                                continue;
-                       if (intf->pm_usage_cnt > 0)
+                       if (atomic_read(&intf->pm_usage_cnt) > 0)
                                return -EBUSY;
                        if (intf->needs_remote_wakeup &&
                                        !udev->do_remote_wakeup) {
@@ -1461,17 +1474,19 @@ static int usb_autopm_do_interface(struct usb_interface *intf,
                status = -ENODEV;
        else {
                udev->auto_pm = 1;
-               intf->pm_usage_cnt += inc_usage_cnt;
+               atomic_add(inc_usage_cnt, &intf->pm_usage_cnt);
                udev->last_busy = jiffies;
-               if (inc_usage_cnt >= 0 && intf->pm_usage_cnt > 0) {
+               if (inc_usage_cnt >= 0 &&
+                               atomic_read(&intf->pm_usage_cnt) > 0) {
                        if (udev->state == USB_STATE_SUSPENDED)
                                status = usb_resume_both(udev,
                                                PMSG_AUTO_RESUME);
                        if (status != 0)
-                               intf->pm_usage_cnt -= inc_usage_cnt;
+                               atomic_sub(inc_usage_cnt, &intf->pm_usage_cnt);
                        else
                                udev->last_busy = jiffies;
-               } else if (inc_usage_cnt <= 0 && intf->pm_usage_cnt <= 0) {
+               } else if (inc_usage_cnt <= 0 &&
+                               atomic_read(&intf->pm_usage_cnt) <= 0) {
                        status = usb_suspend_both(udev, PMSG_AUTO_SUSPEND);
                }
        }
@@ -1516,7 +1531,7 @@ void usb_autopm_put_interface(struct usb_interface *intf)
 
        status = usb_autopm_do_interface(intf, -1);
        dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                       __func__, status, intf->pm_usage_cnt);
+                       __func__, status, atomic_read(&intf->pm_usage_cnt));
 }
 EXPORT_SYMBOL_GPL(usb_autopm_put_interface);
 
@@ -1544,10 +1559,10 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
                status = -ENODEV;
        } else {
                udev->last_busy = jiffies;
-               --intf->pm_usage_cnt;
+               atomic_dec(&intf->pm_usage_cnt);
                if (udev->autosuspend_disabled || udev->autosuspend_delay < 0)
                        status = -EPERM;
-               else if (intf->pm_usage_cnt <= 0 &&
+               else if (atomic_read(&intf->pm_usage_cnt) <= 0 &&
                                !timer_pending(&udev->autosuspend.timer)) {
                        queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
                                        round_jiffies_up_relative(
@@ -1555,7 +1570,7 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
                }
        }
        dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                       __func__, status, intf->pm_usage_cnt);
+                       __func__, status, atomic_read(&intf->pm_usage_cnt));
 }
 EXPORT_SYMBOL_GPL(usb_autopm_put_interface_async);
 
@@ -1599,7 +1614,7 @@ int usb_autopm_get_interface(struct usb_interface *intf)
 
        status = usb_autopm_do_interface(intf, 1);
        dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                       __func__, status, intf->pm_usage_cnt);
+                       __func__, status, atomic_read(&intf->pm_usage_cnt));
        return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_get_interface);
@@ -1627,10 +1642,14 @@ int usb_autopm_get_interface_async(struct usb_interface *intf)
                status = -ENODEV;
        else if (udev->autoresume_disabled)
                status = -EPERM;
-       else if (++intf->pm_usage_cnt > 0 && udev->state == USB_STATE_SUSPENDED)
-               queue_work(ksuspend_usb_wq, &udev->autoresume);
+       else {
+               atomic_inc(&intf->pm_usage_cnt);
+               if (atomic_read(&intf->pm_usage_cnt) > 0 &&
+                               udev->state == USB_STATE_SUSPENDED)
+                       queue_work(ksuspend_usb_wq, &udev->autoresume);
+       }
        dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                       __func__, status, intf->pm_usage_cnt);
+                       __func__, status, atomic_read(&intf->pm_usage_cnt));
        return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_get_interface_async);
@@ -1652,7 +1671,7 @@ int usb_autopm_set_interface(struct usb_interface *intf)
 
        status = usb_autopm_do_interface(intf, 0);
        dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                       __func__, status, intf->pm_usage_cnt);
+                       __func__, status, atomic_read(&intf->pm_usage_cnt));
        return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_set_interface);
index 5cef889..222ee07 100644 (file)
@@ -67,14 +67,14 @@ static struct usb_class {
        struct class *class;
 } *usb_class;
 
-static char *usb_nodename(struct device *dev)
+static char *usb_devnode(struct device *dev, mode_t *mode)
 {
        struct usb_class_driver *drv;
 
        drv = dev_get_drvdata(dev);
-       if (!drv || !drv->nodename)
+       if (!drv || !drv->devnode)
                return NULL;
-       return drv->nodename(dev);
+       return drv->devnode(dev, mode);
 }
 
 static int init_usb_class(void)
@@ -100,7 +100,7 @@ static int init_usb_class(void)
                kfree(usb_class);
                usb_class = NULL;
        }
-       usb_class->class->nodename = usb_nodename;
+       usb_class->class->devnode = usb_devnode;
 
 exit:
        return result;
index 30ecac3..05e6d31 100644 (file)
@@ -158,7 +158,9 @@ static int generic_probe(struct usb_device *udev)
        /* Choose and set the configuration.  This registers the interfaces
         * with the driver core and lets interface drivers bind to them.
         */
-       if (udev->authorized == 0)
+       if (usb_device_is_owned(udev))
+               ;               /* Don't configure if the device is owned */
+       else if (udev->authorized == 0)
                dev_err(&udev->dev, "Device is not authorized for usage\n");
        else {
                c = usb_choose_configuration(udev);
index 95ccfa0..34de475 100644 (file)
@@ -337,72 +337,89 @@ static const u8 ss_rh_config_descriptor[] = {
 
 /*-------------------------------------------------------------------------*/
 
-/*
- * helper routine for returning string descriptors in UTF-16LE
- * input can actually be ISO-8859-1; ASCII is its 7-bit subset
+/**
+ * ascii2desc() - Helper routine for producing UTF-16LE string descriptors
+ * @s: Null-terminated ASCII (actually ISO-8859-1) string
+ * @buf: Buffer for USB string descriptor (header + UTF-16LE)
+ * @len: Length (in bytes; may be odd) of descriptor buffer.
+ *
+ * The return value is the number of bytes filled in: 2 + 2*strlen(s) or
+ * buflen, whichever is less.
+ *
+ * USB String descriptors can contain at most 126 characters; input
+ * strings longer than that are truncated.
  */
-static unsigned ascii2utf(char *s, u8 *utf, int utfmax)
+static unsigned
+ascii2desc(char const *s, u8 *buf, unsigned len)
 {
-       unsigned retval;
+       unsigned n, t = 2 + 2*strlen(s);
 
-       for (retval = 0; *s && utfmax > 1; utfmax -= 2, retval += 2) {
-               *utf++ = *s++;
-               *utf++ = 0;
-       }
-       if (utfmax > 0) {
-               *utf = *s;
-               ++retval;
+       if (t > 254)
+               t = 254;        /* Longest possible UTF string descriptor */
+       if (len > t)
+               len = t;
+
+       t += USB_DT_STRING << 8;        /* Now t is first 16 bits to store */
+
+       n = len;
+       while (n--) {
+               *buf++ = t;
+               if (!n--)
+                       break;
+               *buf++ = t >> 8;
+               t = (unsigned char)*s++;
        }
-       return retval;
+       return len;
 }
 
-/*
- * rh_string - provides manufacturer, product and serial strings for root hub
- * @id: the string ID number (1: serial number, 2: product, 3: vendor)
+/**
+ * rh_string() - provides string descriptors for root hub
+ * @id: the string ID number (0: langids, 1: serial #, 2: product, 3: vendor)
  * @hcd: the host controller for this root hub
- * @data: return packet in UTF-16 LE
- * @len: length of the return packet
+ * @data: buffer for output packet
+ * @len: length of the provided buffer
  *
  * Produces either a manufacturer, product or serial number string for the
  * virtual root hub device.
+ * Returns the number of bytes filled in: the length of the descriptor or
+ * of the provided buffer, whichever is less.
  */
-static unsigned rh_string(int id, struct usb_hcd *hcd, u8 *data, unsigned len)
+static unsigned
+rh_string(int id, struct usb_hcd const *hcd, u8 *data, unsigned len)
 {
-       char buf [100];
+       char buf[100];
+       char const *s;
+       static char const langids[4] = {4, USB_DT_STRING, 0x09, 0x04};
 
        // language ids
-       if (id == 0) {
-               buf[0] = 4;    buf[1] = 3;      /* 4 bytes string data */
-               buf[2] = 0x09; buf[3] = 0x04;   /* MSFT-speak for "en-us" */
-               len = min_t(unsigned, len, 4);
-               memcpy (data, buf, len);
+       switch (id) {
+       case 0:
+               /* Array of LANGID codes (0x0409 is MSFT-speak for "en-us") */
+               /* See http://www.usb.org/developers/docs/USB_LANGIDs.pdf */
+               if (len > 4)
+                       len = 4;
+               memcpy(data, langids, len);
                return len;
-
-       // serial number
-       } else if (id == 1) {
-               strlcpy (buf, hcd->self.bus_name, sizeof buf);
-
-       // product description
-       } else if (id == 2) {
-               strlcpy (buf, hcd->product_desc, sizeof buf);
-
-       // id 3 == vendor description
-       } else if (id == 3) {
+       case 1:
+               /* Serial number */
+               s = hcd->self.bus_name;
+               break;
+       case 2:
+               /* Product name */
+               s = hcd->product_desc;
+               break;
+       case 3:
+               /* Manufacturer */
                snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
                        init_utsname()->release, hcd->driver->description);
-       }
-
-       switch (len) {          /* All cases fall through */
+               s = buf;
+               break;
        default:
-               len = 2 + ascii2utf (buf, data + 2, len - 2);
-       case 2:
-               data [1] = 3;   /* type == string */
-       case 1:
-               data [0] = 2 * (strlen (buf) + 1);
-       case 0:
-               ;               /* Compiler wants a statement here */
+               /* Can't happen; caller guarantees it */
+               return 0;
        }
-       return len;
+
+       return ascii2desc(s, data, len);
 }
 
 
index ec5c67e..79782a1 100644 (file)
@@ -267,6 +267,11 @@ struct hc_driver {
        void    (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
                /* Returns the hardware-chosen device address */
        int     (*address_device)(struct usb_hcd *, struct usb_device *udev);
+               /* Notifies the HCD after a hub descriptor is fetched.
+                * Will block.
+                */
+       int     (*update_hub_device)(struct usb_hcd *, struct usb_device *hdev,
+                       struct usb_tt *tt, gfp_t mem_flags);
 };
 
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
index 71f86c6..5ce8391 100644 (file)
@@ -78,6 +78,7 @@ struct usb_hub {
        u8                      indicator[USB_MAXCHILDREN];
        struct delayed_work     leds;
        struct delayed_work     init_work;
+       void                    **port_owners;
 };
 
 
@@ -162,8 +163,10 @@ static inline char *portspeed(int portstatus)
 }
 
 /* Note that hdev or one of its children must be locked! */
-static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)
+static struct usb_hub *hdev_to_hub(struct usb_device *hdev)
 {
+       if (!hdev || !hdev->actconfig)
+               return NULL;
        return usb_get_intfdata(hdev->actconfig->interface[0]);
 }
 
@@ -372,7 +375,7 @@ static void kick_khubd(struct usb_hub *hub)
        unsigned long   flags;
 
        /* Suppress autosuspend until khubd runs */
-       to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
+       atomic_set(&to_usb_interface(hub->intfdev)->pm_usage_cnt, 1);
 
        spin_lock_irqsave(&hub_event_lock, flags);
        if (!hub->disconnected && list_empty(&hub->event_list)) {
@@ -384,8 +387,10 @@ static void kick_khubd(struct usb_hub *hub)
 
 void usb_kick_khubd(struct usb_device *hdev)
 {
-       /* FIXME: What if hdev isn't bound to the hub driver? */
-       kick_khubd(hdev_to_hub(hdev));
+       struct usb_hub *hub = hdev_to_hub(hdev);
+
+       if (hub)
+               kick_khubd(hub);
 }
 
 
@@ -677,7 +682,8 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                                        msecs_to_jiffies(delay));
 
                        /* Suppress autosuspend until init is done */
-                       to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
+                       atomic_set(&to_usb_interface(hub->intfdev)->
+                                       pm_usage_cnt, 1);
                        return;         /* Continues at init2: below */
                } else {
                        hub_power_on(hub, true);
@@ -854,25 +860,24 @@ static int hub_post_reset(struct usb_interface *intf)
 static int hub_configure(struct usb_hub *hub,
        struct usb_endpoint_descriptor *endpoint)
 {
+       struct usb_hcd *hcd;
        struct usb_device *hdev = hub->hdev;
        struct device *hub_dev = hub->intfdev;
        u16 hubstatus, hubchange;
        u16 wHubCharacteristics;
        unsigned int pipe;
        int maxp, ret;
-       char *message;
+       char *message = "out of memory";
 
        hub->buffer = usb_buffer_alloc(hdev, sizeof(*hub->buffer), GFP_KERNEL,
                        &hub->buffer_dma);
        if (!hub->buffer) {
-               message = "can't allocate hub irq buffer";
                ret = -ENOMEM;
                goto fail;
        }
 
        hub->status = kmalloc(sizeof(*hub->status), GFP_KERNEL);
        if (!hub->status) {
-               message = "can't kmalloc hub status buffer";
                ret = -ENOMEM;
                goto fail;
        }
@@ -880,7 +885,6 @@ static int hub_configure(struct usb_hub *hub,
 
        hub->descriptor = kmalloc(sizeof(*hub->descriptor), GFP_KERNEL);
        if (!hub->descriptor) {
-               message = "can't kmalloc hub descriptor";
                ret = -ENOMEM;
                goto fail;
        }
@@ -904,6 +908,12 @@ static int hub_configure(struct usb_hub *hub,
        dev_info (hub_dev, "%d port%s detected\n", hdev->maxchild,
                (hdev->maxchild == 1) ? "" : "s");
 
+       hub->port_owners = kzalloc(hdev->maxchild * sizeof(void *), GFP_KERNEL);
+       if (!hub->port_owners) {
+               ret = -ENOMEM;
+               goto fail;
+       }
+
        wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
 
        if (wHubCharacteristics & HUB_CHAR_COMPOUND) {
@@ -1052,6 +1062,19 @@ static int hub_configure(struct usb_hub *hub,
                dev_dbg(hub_dev, "%umA bus power budget for each child\n",
                                hub->mA_per_port);
 
+       /* Update the HCD's internal representation of this hub before khubd
+        * starts getting port status changes for devices under the hub.
+        */
+       hcd = bus_to_hcd(hdev->bus);
+       if (hcd->driver->update_hub_device) {
+               ret = hcd->driver->update_hub_device(hcd, hdev,
+                               &hub->tt, GFP_KERNEL);
+               if (ret < 0) {
+                       message = "can't update HCD hub info";
+                       goto fail;
+               }
+       }
+
        ret = hub_hub_status(hub, &hubstatus, &hubchange);
        if (ret < 0) {
                message = "can't get hub status";
@@ -1082,7 +1105,6 @@ static int hub_configure(struct usb_hub *hub,
 
        hub->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!hub->urb) {
-               message = "couldn't allocate interrupt urb";
                ret = -ENOMEM;
                goto fail;
        }
@@ -1131,11 +1153,13 @@ static void hub_disconnect(struct usb_interface *intf)
        hub_quiesce(hub, HUB_DISCONNECT);
 
        usb_set_intfdata (intf, NULL);
+       hub->hdev->maxchild = 0;
 
        if (hub->hdev->speed == USB_SPEED_HIGH)
                highspeed_hubs--;
 
        usb_free_urb(hub->urb);
+       kfree(hub->port_owners);
        kfree(hub->descriptor);
        kfree(hub->status);
        usb_buffer_free(hub->hdev, sizeof(*hub->buffer), hub->buffer,
@@ -1250,6 +1274,79 @@ hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
        }
 }
 
+/*
+ * Allow user programs to claim ports on a hub.  When a device is attached
+ * to one of these "claimed" ports, the program will "own" the device.
+ */
+static int find_port_owner(struct usb_device *hdev, unsigned port1,
+               void ***ppowner)
+{
+       if (hdev->state == USB_STATE_NOTATTACHED)
+               return -ENODEV;
+       if (port1 == 0 || port1 > hdev->maxchild)
+               return -EINVAL;
+
+       /* This assumes that devices not managed by the hub driver
+        * will always have maxchild equal to 0.
+        */
+       *ppowner = &(hdev_to_hub(hdev)->port_owners[port1 - 1]);
+       return 0;
+}
+
+/* In the following three functions, the caller must hold hdev's lock */
+int usb_hub_claim_port(struct usb_device *hdev, unsigned port1, void *owner)
+{
+       int rc;
+       void **powner;
+
+       rc = find_port_owner(hdev, port1, &powner);
+       if (rc)
+               return rc;
+       if (*powner)
+               return -EBUSY;
+       *powner = owner;
+       return rc;
+}
+
+int usb_hub_release_port(struct usb_device *hdev, unsigned port1, void *owner)
+{
+       int rc;
+       void **powner;
+
+       rc = find_port_owner(hdev, port1, &powner);
+       if (rc)
+               return rc;
+       if (*powner != owner)
+               return -ENOENT;
+       *powner = NULL;
+       return rc;
+}
+
+void usb_hub_release_all_ports(struct usb_device *hdev, void *owner)
+{
+       int n;
+       void **powner;
+
+       n = find_port_owner(hdev, 1, &powner);
+       if (n == 0) {
+               for (; n < hdev->maxchild; (++n, ++powner)) {
+                       if (*powner == owner)
+                               *powner = NULL;
+               }
+       }
+}
+
+/* The caller must hold udev's lock */
+bool usb_device_is_owned(struct usb_device *udev)
+{
+       struct usb_hub *hub;
+
+       if (udev->state == USB_STATE_NOTATTACHED || !udev->parent)
+               return false;
+       hub = hdev_to_hub(udev->parent);
+       return !!hub->port_owners[udev->portnum - 1];
+}
+
 
 static void recursively_mark_NOTATTACHED(struct usb_device *udev)
 {
@@ -2849,14 +2946,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                        /* For a suspended device, treat this as a
                         * remote wakeup event.
                         */
-                       if (udev->do_remote_wakeup)
-                               status = remote_wakeup(udev);
-
-                       /* Otherwise leave it be; devices can't tell the
-                        * difference between suspended and disabled.
-                        */
-                       else
-                               status = 0;
+                       status = remote_wakeup(udev);
 #endif
 
                } else {
index ffe75e8..97b40ce 100644 (file)
@@ -48,7 +48,6 @@
 #define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO)
 #define USBFS_DEFAULT_LISTMODE S_IRUGO
 
-static struct super_operations usbfs_ops;
 static const struct file_operations default_file_operations;
 static struct vfsmount *usbfs_mount;
 static int usbfs_mount_count;  /* = 0 */
@@ -449,7 +448,7 @@ static const struct file_operations default_file_operations = {
        .llseek =       default_file_lseek,
 };
 
-static struct super_operations usbfs_ops = {
+static const struct super_operations usbfs_ops = {
        .statfs =       simple_statfs,
        .drop_inode =   generic_delete_inode,
        .remount_fs =   remount,
index 9720e69..da718e8 100644 (file)
@@ -459,35 +459,23 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
                        io->urbs[i]->context = io;
 
                        /*
-                        * Some systems need to revert to PIO when DMA is
-                        * temporarily unavailable.  For their sakes, both
-                        * transfer_buffer and transfer_dma are set when
-                        * possible.  However this can only work on systems
-                        * without:
+                        * Some systems need to revert to PIO when DMA is temporarily
+                        * unavailable.  For their sakes, both transfer_buffer and
+                        * transfer_dma are set when possible.
                         *
-                        *  - HIGHMEM, since DMA buffers located in high memory
-                        *    are not directly addressable by the CPU for PIO;
-                        *
-                        *  - IOMMU, since dma_map_sg() is allowed to use an
-                        *    IOMMU to make virtually discontiguous buffers be
-                        *    "dma-contiguous" so that PIO and DMA need diferent
-                        *    numbers of URBs.
-                        *
-                        * So when HIGHMEM or IOMMU are in use, transfer_buffer
-                        * is NULL to prevent stale pointers and to help spot
-                        * bugs.
+                        * Note that if IOMMU coalescing occurred, we cannot
+                        * trust sg_page anymore, so check if S/G list shrunk.
                         */
+                       if (io->nents == io->entries && !PageHighMem(sg_page(sg)))
+                               io->urbs[i]->transfer_buffer = sg_virt(sg);
+                       else
+                               io->urbs[i]->transfer_buffer = NULL;
+
                        if (dma) {
                                io->urbs[i]->transfer_dma = sg_dma_address(sg);
                                len = sg_dma_len(sg);
-#if defined(CONFIG_HIGHMEM) || defined(CONFIG_GART_IOMMU)
-                               io->urbs[i]->transfer_buffer = NULL;
-#else
-                               io->urbs[i]->transfer_buffer = sg_virt(sg);
-#endif
                        } else {
                                /* hc may use _only_ transfer_buffer */
-                               io->urbs[i]->transfer_buffer = sg_virt(sg);
                                len = sg->length;
                        }
 
index a26f738..b1b85ab 100644 (file)
@@ -311,7 +311,7 @@ static struct dev_pm_ops usb_device_pm_ops = {
 #endif /* CONFIG_PM */
 
 
-static char *usb_nodename(struct device *dev)
+static char *usb_devnode(struct device *dev, mode_t *mode)
 {
        struct usb_device *usb_dev;
 
@@ -324,7 +324,7 @@ struct device_type usb_device_type = {
        .name =         "usb_device",
        .release =      usb_release_dev,
        .uevent =       usb_dev_uevent,
-       .nodename =     usb_nodename,
+       .devnode =      usb_devnode,
        .pm =           &usb_device_pm_ops,
 };
 
@@ -413,8 +413,13 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
                } else {
                        snprintf(dev->devpath, sizeof dev->devpath,
                                "%s.%d", parent->devpath, port1);
-                       dev->route = parent->route +
-                               (port1 << ((parent->level - 1)*4));
+                       /* Route string assumes hubs have less than 16 ports */
+                       if (port1 < 15)
+                               dev->route = parent->route +
+                                       (port1 << ((parent->level - 1)*4));
+                       else
+                               dev->route = parent->route +
+                                       (15 << ((parent->level - 1)*4));
                }
 
                dev->dev.parent = &parent->dev;
@@ -914,11 +919,11 @@ int usb_buffer_map_sg(const struct usb_device *dev, int is_in,
                        || !(bus = dev->bus)
                        || !(controller = bus->controller)
                        || !controller->dma_mask)
-               return -1;
+               return -EINVAL;
 
        /* FIXME generic api broken like pci, can't report errors */
        return dma_map_sg(controller, sg, nents,
-                       is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
+                       is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE) ? : -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(usb_buffer_map_sg);
 
index c0e0ae2..9a8b15e 100644 (file)
@@ -37,6 +37,13 @@ extern int usb_match_device(struct usb_device *dev,
 extern void usb_forced_unbind_intf(struct usb_interface *intf);
 extern void usb_rebind_intf(struct usb_interface *intf);
 
+extern int usb_hub_claim_port(struct usb_device *hdev, unsigned port,
+               void *owner);
+extern int usb_hub_release_port(struct usb_device *hdev, unsigned port,
+               void *owner);
+extern void usb_hub_release_all_ports(struct usb_device *hdev, void *owner);
+extern bool usb_device_is_owned(struct usb_device *udev);
+
 extern int  usb_hub_init(void);
 extern void usb_hub_cleanup(void);
 extern int usb_major_init(void);
diff --git a/drivers/usb/early/Makefile b/drivers/usb/early/Makefile
new file mode 100644 (file)
index 0000000..dfedee8
--- /dev/null
@@ -0,0 +1,5 @@
+#
+# Makefile for early USB devices
+#
+
+obj-$(CONFIG_EARLY_PRINTK_DBGP)        += ehci-dbgp.o
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
new file mode 100644 (file)
index 0000000..1206a26
--- /dev/null
@@ -0,0 +1,996 @@
+/*
+ * Standalone EHCI usb debug driver
+ *
+ * Originally written by:
+ *  Eric W. Biederman" <ebiederm@xmission.com> and
+ *  Yinghai Lu <yhlu.kernel@gmail.com>
+ *
+ * Changes for early/late printk and HW errata:
+ *  Jason Wessel <jason.wessel@windriver.com>
+ *  Copyright (C) 2009 Wind River Systems, Inc.
+ *
+ */
+
+#include <linux/console.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+#include <linux/pci_regs.h>
+#include <linux/pci_ids.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/ehci_def.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <asm/pci-direct.h>
+#include <asm/fixmap.h>
+
+/* The code here is intended to talk directly to the EHCI debug port
+ * and does not require that you have any kind of USB host controller
+ * drivers or USB device drivers compiled into the kernel.
+ *
+ * If you make a change to anything in here, the following test cases
+ * need to pass where a USB debug device works in the following
+ * configurations.
+ *
+ * 1. boot args:  earlyprintk=dbgp
+ *     o kernel compiled with # CONFIG_USB_EHCI_HCD is not set
+ *     o kernel compiled with CONFIG_USB_EHCI_HCD=y
+ * 2. boot args: earlyprintk=dbgp,keep
+ *     o kernel compiled with # CONFIG_USB_EHCI_HCD is not set
+ *     o kernel compiled with CONFIG_USB_EHCI_HCD=y
+ * 3. boot args: earlyprintk=dbgp console=ttyUSB0
+ *     o kernel has CONFIG_USB_EHCI_HCD=y and
+ *       CONFIG_USB_SERIAL_DEBUG=y
+ * 4. boot args: earlyprintk=vga,dbgp
+ *     o kernel compiled with # CONFIG_USB_EHCI_HCD is not set
+ *     o kernel compiled with CONFIG_USB_EHCI_HCD=y
+ *
+ * For the 4th configuration you can turn on or off the DBGP_DEBUG
+ * such that you can debug the dbgp device's driver code.
+ */
+
+static int dbgp_phys_port = 1;
+
+static struct ehci_caps __iomem *ehci_caps;
+static struct ehci_regs __iomem *ehci_regs;
+static struct ehci_dbg_port __iomem *ehci_debug;
+static int dbgp_not_safe; /* Cannot use debug device during ehci reset */
+static unsigned int dbgp_endpoint_out;
+
+struct ehci_dev {
+       u32 bus;
+       u32 slot;
+       u32 func;
+};
+
+static struct ehci_dev ehci_dev;
+
+#define USB_DEBUG_DEVNUM 127
+
+#define DBGP_DATA_TOGGLE       0x8800
+
+#ifdef DBGP_DEBUG
+#define dbgp_printk printk
+static void dbgp_ehci_status(char *str)
+{
+       if (!ehci_debug)
+               return;
+       dbgp_printk("dbgp: %s\n", str);
+       dbgp_printk("  Debug control: %08x", readl(&ehci_debug->control));
+       dbgp_printk("  ehci cmd     : %08x", readl(&ehci_regs->command));
+       dbgp_printk("  ehci conf flg: %08x\n",
+                   readl(&ehci_regs->configured_flag));
+       dbgp_printk("  ehci status  : %08x", readl(&ehci_regs->status));
+       dbgp_printk("  ehci portsc  : %08x\n",
+                   readl(&ehci_regs->port_status[dbgp_phys_port - 1]));
+}
+#else
+static inline void dbgp_ehci_status(char *str) { }
+static inline void dbgp_printk(const char *fmt, ...) { }
+#endif
+
+static inline u32 dbgp_pid_update(u32 x, u32 tok)
+{
+       return ((x ^ DBGP_DATA_TOGGLE) & 0xffff00) | (tok & 0xff);
+}
+
+static inline u32 dbgp_len_update(u32 x, u32 len)
+{
+       return (x & ~0x0f) | (len & 0x0f);
+}
+
+/*
+ * USB Packet IDs (PIDs)
+ */
+
+/* token */
+#define USB_PID_OUT            0xe1
+#define USB_PID_IN             0x69
+#define USB_PID_SOF            0xa5
+#define USB_PID_SETUP          0x2d
+/* handshake */
+#define USB_PID_ACK            0xd2
+#define USB_PID_NAK            0x5a
+#define USB_PID_STALL          0x1e
+#define USB_PID_NYET           0x96
+/* data */
+#define USB_PID_DATA0          0xc3
+#define USB_PID_DATA1          0x4b
+#define USB_PID_DATA2          0x87
+#define USB_PID_MDATA          0x0f
+/* Special */
+#define USB_PID_PREAMBLE       0x3c
+#define USB_PID_ERR            0x3c
+#define USB_PID_SPLIT          0x78
+#define USB_PID_PING           0xb4
+#define USB_PID_UNDEF_0                0xf0
+
+#define USB_PID_DATA_TOGGLE    0x88
+#define DBGP_CLAIM (DBGP_OWNER | DBGP_ENABLED | DBGP_INUSE)
+
+#define PCI_CAP_ID_EHCI_DEBUG  0xa
+
+#define HUB_ROOT_RESET_TIME    50      /* times are in msec */
+#define HUB_SHORT_RESET_TIME   10
+#define HUB_LONG_RESET_TIME    200
+#define HUB_RESET_TIMEOUT      500
+
+#define DBGP_MAX_PACKET                8
+#define DBGP_TIMEOUT           (250 * 1000)
+
+static int dbgp_wait_until_complete(void)
+{
+       u32 ctrl;
+       int loop = DBGP_TIMEOUT;
+
+       do {
+               ctrl = readl(&ehci_debug->control);
+               /* Stop when the transaction is finished */
+               if (ctrl & DBGP_DONE)
+                       break;
+               udelay(1);
+       } while (--loop > 0);
+
+       if (!loop)
+               return -DBGP_TIMEOUT;
+
+       /*
+        * Now that we have observed the completed transaction,
+        * clear the done bit.
+        */
+       writel(ctrl | DBGP_DONE, &ehci_debug->control);
+       return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);
+}
+
+static inline void dbgp_mdelay(int ms)
+{
+       int i;
+
+       while (ms--) {
+               for (i = 0; i < 1000; i++)
+                       outb(0x1, 0x80);
+       }
+}
+
+static void dbgp_breath(void)
+{
+       /* Sleep to give the debug port a chance to breathe */
+}
+
+static int dbgp_wait_until_done(unsigned ctrl)
+{
+       u32 pids, lpid;
+       int ret;
+       int loop = 3;
+
+retry:
+       writel(ctrl | DBGP_GO, &ehci_debug->control);
+       ret = dbgp_wait_until_complete();
+       pids = readl(&ehci_debug->pids);
+       lpid = DBGP_PID_GET(pids);
+
+       if (ret < 0) {
+               /* A -DBGP_TIMEOUT failure here means the device has
+                * failed, perhaps because it was unplugged, in which
+                * case we do not want to hang the system so the dbgp
+                * will be marked as unsafe to use.  EHCI reset is the
+                * only way to recover if you unplug the dbgp device.
+                */
+               if (ret == -DBGP_TIMEOUT && !dbgp_not_safe)
+                       dbgp_not_safe = 1;
+               return ret;
+       }
+
+       /*
+        * If the port is getting full or it has dropped data
+        * start pacing ourselves, not necessary but it's friendly.
+        */
+       if ((lpid == USB_PID_NAK) || (lpid == USB_PID_NYET))
+               dbgp_breath();
+
+       /* If I get a NACK reissue the transmission */
+       if (lpid == USB_PID_NAK) {
+               if (--loop > 0)
+                       goto retry;
+       }
+
+       return ret;
+}
+
+static inline void dbgp_set_data(const void *buf, int size)
+{
+       const unsigned char *bytes = buf;
+       u32 lo, hi;
+       int i;
+
+       lo = hi = 0;
+       for (i = 0; i < 4 && i < size; i++)
+               lo |= bytes[i] << (8*i);
+       for (; i < 8 && i < size; i++)
+               hi |= bytes[i] << (8*(i - 4));
+       writel(lo, &ehci_debug->data03);
+       writel(hi, &ehci_debug->data47);
+}
+
+static inline void dbgp_get_data(void *buf, int size)
+{
+       unsigned char *bytes = buf;
+       u32 lo, hi;
+       int i;
+
+       lo = readl(&ehci_debug->data03);
+       hi = readl(&ehci_debug->data47);
+       for (i = 0; i < 4 && i < size; i++)
+               bytes[i] = (lo >> (8*i)) & 0xff;
+       for (; i < 8 && i < size; i++)
+               bytes[i] = (hi >> (8*(i - 4))) & 0xff;
+}
+
+static int dbgp_out(u32 addr, const char *bytes, int size)
+{
+       u32 pids, ctrl;
+
+       pids = readl(&ehci_debug->pids);
+       pids = dbgp_pid_update(pids, USB_PID_OUT);
+
+       ctrl = readl(&ehci_debug->control);
+       ctrl = dbgp_len_update(ctrl, size);
+       ctrl |= DBGP_OUT;
+       ctrl |= DBGP_GO;
+
+       dbgp_set_data(bytes, size);
+       writel(addr, &ehci_debug->address);
+       writel(pids, &ehci_debug->pids);
+       return dbgp_wait_until_done(ctrl);
+}
+
+static int dbgp_bulk_write(unsigned devnum, unsigned endpoint,
+                        const char *bytes, int size)
+{
+       int ret;
+       int loops = 5;
+       u32 addr;
+       if (size > DBGP_MAX_PACKET)
+               return -1;
+
+       addr = DBGP_EPADDR(devnum, endpoint);
+try_again:
+       if (loops--) {
+               ret = dbgp_out(addr, bytes, size);
+               if (ret == -DBGP_ERR_BAD) {
+                       int try_loops = 3;
+                       do {
+                               /* Emit a dummy packet to re-sync communication
+                                * with the debug device */
+                               if (dbgp_out(addr, "12345678", 8) >= 0) {
+                                       udelay(2);
+                                       goto try_again;
+                               }
+                       } while (try_loops--);
+               }
+       }
+
+       return ret;
+}
+
+static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data,
+                                int size)
+{
+       u32 pids, addr, ctrl;
+       int ret;
+
+       if (size > DBGP_MAX_PACKET)
+               return -1;
+
+       addr = DBGP_EPADDR(devnum, endpoint);
+
+       pids = readl(&ehci_debug->pids);
+       pids = dbgp_pid_update(pids, USB_PID_IN);
+
+       ctrl = readl(&ehci_debug->control);
+       ctrl = dbgp_len_update(ctrl, size);
+       ctrl &= ~DBGP_OUT;
+       ctrl |= DBGP_GO;
+
+       writel(addr, &ehci_debug->address);
+       writel(pids, &ehci_debug->pids);
+       ret = dbgp_wait_until_done(ctrl);
+       if (ret < 0)
+               return ret;
+
+       if (size > ret)
+               size = ret;
+       dbgp_get_data(data, size);
+       return ret;
+}
+
+static int dbgp_control_msg(unsigned devnum, int requesttype,
+       int request, int value, int index, void *data, int size)
+{
+       u32 pids, addr, ctrl;
+       struct usb_ctrlrequest req;
+       int read;
+       int ret;
+
+       read = (requesttype & USB_DIR_IN) != 0;
+       if (size > (read ? DBGP_MAX_PACKET:0))
+               return -1;
+
+       /* Compute the control message */
+       req.bRequestType = requesttype;
+       req.bRequest = request;
+       req.wValue = cpu_to_le16(value);
+       req.wIndex = cpu_to_le16(index);
+       req.wLength = cpu_to_le16(size);
+
+       pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);
+       addr = DBGP_EPADDR(devnum, 0);
+
+       ctrl = readl(&ehci_debug->control);
+       ctrl = dbgp_len_update(ctrl, sizeof(req));
+       ctrl |= DBGP_OUT;
+       ctrl |= DBGP_GO;
+
+       /* Send the setup message */
+       dbgp_set_data(&req, sizeof(req));
+       writel(addr, &ehci_debug->address);
+       writel(pids, &ehci_debug->pids);
+       ret = dbgp_wait_until_done(ctrl);
+       if (ret < 0)
+               return ret;
+
+       /* Read the result */
+       return dbgp_bulk_read(devnum, 0, data, size);
+}
+
+
+/* Find a PCI capability */
+static u32 __init find_cap(u32 num, u32 slot, u32 func, int cap)
+{
+       u8 pos;
+       int bytes;
+
+       if (!(read_pci_config_16(num, slot, func, PCI_STATUS) &
+               PCI_STATUS_CAP_LIST))
+               return 0;
+
+       pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST);
+       for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) {
+               u8 id;
+
+               pos &= ~3;
+               id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID);
+               if (id == 0xff)
+                       break;
+               if (id == cap)
+                       return pos;
+
+               pos = read_pci_config_byte(num, slot, func,
+                                                pos+PCI_CAP_LIST_NEXT);
+       }
+       return 0;
+}
+
+static u32 __init __find_dbgp(u32 bus, u32 slot, u32 func)
+{
+       u32 class;
+
+       class = read_pci_config(bus, slot, func, PCI_CLASS_REVISION);
+       if ((class >> 8) != PCI_CLASS_SERIAL_USB_EHCI)
+               return 0;
+
+       return find_cap(bus, slot, func, PCI_CAP_ID_EHCI_DEBUG);
+}
+
+static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc)
+{
+       u32 bus, slot, func;
+
+       for (bus = 0; bus < 256; bus++) {
+               for (slot = 0; slot < 32; slot++) {
+                       for (func = 0; func < 8; func++) {
+                               unsigned cap;
+
+                               cap = __find_dbgp(bus, slot, func);
+
+                               if (!cap)
+                                       continue;
+                               if (ehci_num-- != 0)
+                                       continue;
+                               *rbus = bus;
+                               *rslot = slot;
+                               *rfunc = func;
+                               return cap;
+                       }
+               }
+       }
+       return 0;
+}
+
+static int dbgp_ehci_startup(void)
+{
+       u32 ctrl, cmd, status;
+       int loop;
+
+       /* Claim ownership, but do not enable yet */
+       ctrl = readl(&ehci_debug->control);
+       ctrl |= DBGP_OWNER;
+       ctrl &= ~(DBGP_ENABLED | DBGP_INUSE);
+       writel(ctrl, &ehci_debug->control);
+       udelay(1);
+
+       dbgp_ehci_status("EHCI startup");
+       /* Start the ehci running */
+       cmd = readl(&ehci_regs->command);
+       cmd &= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET);
+       cmd |= CMD_RUN;
+       writel(cmd, &ehci_regs->command);
+
+       /* Ensure everything is routed to the EHCI */
+       writel(FLAG_CF, &ehci_regs->configured_flag);
+
+       /* Wait until the controller is no longer halted */
+       loop = 10;
+       do {
+               status = readl(&ehci_regs->status);
+               if (!(status & STS_HALT))
+                       break;
+               udelay(1);
+       } while (--loop > 0);
+
+       if (!loop) {
+               dbgp_printk("ehci can not be started\n");
+               return -ENODEV;
+       }
+       dbgp_printk("ehci started\n");
+       return 0;
+}
+
+static int dbgp_ehci_controller_reset(void)
+{
+       int loop = 250 * 1000;
+       u32 cmd;
+
+       /* Reset the EHCI controller */
+       cmd = readl(&ehci_regs->command);
+       cmd |= CMD_RESET;
+       writel(cmd, &ehci_regs->command);
+       do {
+               cmd = readl(&ehci_regs->command);
+       } while ((cmd & CMD_RESET) && (--loop > 0));
+
+       if (!loop) {
+               dbgp_printk("can not reset ehci\n");
+               return -1;
+       }
+       dbgp_ehci_status("ehci reset done");
+       return 0;
+}
+static int ehci_wait_for_port(int port);
+/* Return 0 on success
+ * Return -ENODEV for any general failure
+ * Return -EIO if wait for port fails
+ */
+int dbgp_external_startup(void)
+{
+       int devnum;
+       struct usb_debug_descriptor dbgp_desc;
+       int ret;
+       u32 ctrl, portsc, cmd;
+       int dbg_port = dbgp_phys_port;
+       int tries = 3;
+       int reset_port_tries = 1;
+       int try_hard_once = 1;
+
+try_port_reset_again:
+       ret = dbgp_ehci_startup();
+       if (ret)
+               return ret;
+
+       /* Wait for a device to show up in the debug port */
+       ret = ehci_wait_for_port(dbg_port);
+       if (ret < 0) {
+               portsc = readl(&ehci_regs->port_status[dbg_port - 1]);
+               if (!(portsc & PORT_CONNECT) && try_hard_once) {
+                       /* Last ditch effort to try to force enable
+                        * the debug device by using the packet test
+                        * ehci command to try and wake it up. */
+                       try_hard_once = 0;
+                       cmd = readl(&ehci_regs->command);
+                       cmd &= ~CMD_RUN;
+                       writel(cmd, &ehci_regs->command);
+                       portsc = readl(&ehci_regs->port_status[dbg_port - 1]);
+                       portsc |= PORT_TEST_PKT;
+                       writel(portsc, &ehci_regs->port_status[dbg_port - 1]);
+                       dbgp_ehci_status("Trying to force debug port online");
+                       mdelay(50);
+                       dbgp_ehci_controller_reset();
+                       goto try_port_reset_again;
+               } else if (reset_port_tries--) {
+                       goto try_port_reset_again;
+               }
+               dbgp_printk("No device found in debug port\n");
+               return -EIO;
+       }
+       dbgp_ehci_status("wait for port done");
+
+       /* Enable the debug port */
+       ctrl = readl(&ehci_debug->control);
+       ctrl |= DBGP_CLAIM;
+       writel(ctrl, &ehci_debug->control);
+       ctrl = readl(&ehci_debug->control);
+       if ((ctrl & DBGP_CLAIM) != DBGP_CLAIM) {
+               dbgp_printk("No device in debug port\n");
+               writel(ctrl & ~DBGP_CLAIM, &ehci_debug->control);
+               return -ENODEV;
+       }
+       dbgp_ehci_status("debug ported enabled");
+
+       /* Completely transfer the debug device to the debug controller */
+       portsc = readl(&ehci_regs->port_status[dbg_port - 1]);
+       portsc &= ~PORT_PE;
+       writel(portsc, &ehci_regs->port_status[dbg_port - 1]);
+
+       dbgp_mdelay(100);
+
+try_again:
+       /* Find the debug device and make it device number 127 */
+       for (devnum = 0; devnum <= 127; devnum++) {
+               ret = dbgp_control_msg(devnum,
+                       USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+                       USB_REQ_GET_DESCRIPTOR, (USB_DT_DEBUG << 8), 0,
+                       &dbgp_desc, sizeof(dbgp_desc));
+               if (ret > 0)
+                       break;
+       }
+       if (devnum > 127) {
+               dbgp_printk("Could not find attached debug device\n");
+               goto err;
+       }
+       if (ret < 0) {
+               dbgp_printk("Attached device is not a debug device\n");
+               goto err;
+       }
+       dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint;
+
+       /* Move the device to 127 if it isn't already there */
+       if (devnum != USB_DEBUG_DEVNUM) {
+               ret = dbgp_control_msg(devnum,
+                       USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+                       USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, NULL, 0);
+               if (ret < 0) {
+                       dbgp_printk("Could not move attached device to %d\n",
+                               USB_DEBUG_DEVNUM);
+                       goto err;
+               }
+               devnum = USB_DEBUG_DEVNUM;
+               dbgp_printk("debug device renamed to 127\n");
+       }
+
+       /* Enable the debug interface */
+       ret = dbgp_control_msg(USB_DEBUG_DEVNUM,
+               USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+               USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, NULL, 0);
+       if (ret < 0) {
+               dbgp_printk(" Could not enable the debug device\n");
+               goto err;
+       }
+       dbgp_printk("debug interface enabled\n");
+       /* Perform a small write to get the even/odd data state in sync
+        */
+       ret = dbgp_bulk_write(USB_DEBUG_DEVNUM, dbgp_endpoint_out, " ", 1);
+       if (ret < 0) {
+               dbgp_printk("dbgp_bulk_write failed: %d\n", ret);
+               goto err;
+       }
+       dbgp_printk("small write doned\n");
+       dbgp_not_safe = 0;
+
+       return 0;
+err:
+       if (tries--)
+               goto try_again;
+       return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(dbgp_external_startup);
+
+static int __init ehci_reset_port(int port)
+{
+       u32 portsc;
+       u32 delay_time, delay;
+       int loop;
+
+       dbgp_ehci_status("reset port");
+       /* Reset the usb debug port */
+       portsc = readl(&ehci_regs->port_status[port - 1]);
+       portsc &= ~PORT_PE;
+       portsc |= PORT_RESET;
+       writel(portsc, &ehci_regs->port_status[port - 1]);
+
+       delay = HUB_ROOT_RESET_TIME;
+       for (delay_time = 0; delay_time < HUB_RESET_TIMEOUT;
+            delay_time += delay) {
+               dbgp_mdelay(delay);
+               portsc = readl(&ehci_regs->port_status[port - 1]);
+               if (!(portsc & PORT_RESET))
+                       break;
+       }
+               if (portsc & PORT_RESET) {
+                       /* force reset to complete */
+                       loop = 100 * 1000;
+                       writel(portsc & ~(PORT_RWC_BITS | PORT_RESET),
+                               &ehci_regs->port_status[port - 1]);
+                       do {
+                               udelay(1);
+                               portsc = readl(&ehci_regs->port_status[port-1]);
+                       } while ((portsc & PORT_RESET) && (--loop > 0));
+               }
+
+               /* Device went away? */
+               if (!(portsc & PORT_CONNECT))
+                       return -ENOTCONN;
+
+               /* bomb out completely if something weird happend */
+               if ((portsc & PORT_CSC))
+                       return -EINVAL;
+
+               /* If we've finished resetting, then break out of the loop */
+               if (!(portsc & PORT_RESET) && (portsc & PORT_PE))
+                       return 0;
+       return -EBUSY;
+}
+
+static int ehci_wait_for_port(int port)
+{
+       u32 status;
+       int ret, reps;
+
+       for (reps = 0; reps < 300; reps++) {
+               status = readl(&ehci_regs->status);
+               if (status & STS_PCD)
+                       break;
+               dbgp_mdelay(1);
+       }
+       ret = ehci_reset_port(port);
+       if (ret == 0)
+               return 0;
+       return -ENOTCONN;
+}
+
+typedef void (*set_debug_port_t)(int port);
+
+static void __init default_set_debug_port(int port)
+{
+}
+
+static set_debug_port_t __initdata set_debug_port = default_set_debug_port;
+
+static void __init nvidia_set_debug_port(int port)
+{
+       u32 dword;
+       dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
+                                0x74);
+       dword &= ~(0x0f<<12);
+       dword |= ((port & 0x0f)<<12);
+       write_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, 0x74,
+                                dword);
+       dbgp_printk("set debug port to %d\n", port);
+}
+
+static void __init detect_set_debug_port(void)
+{
+       u32 vendorid;
+
+       vendorid = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
+                0x00);
+
+       if ((vendorid & 0xffff) == 0x10de) {
+               dbgp_printk("using nvidia set_debug_port\n");
+               set_debug_port = nvidia_set_debug_port;
+       }
+}
+
+/* The code in early_ehci_bios_handoff() is derived from the usb pci
+ * quirk initialization, but altered so as to use the early PCI
+ * routines. */
+#define EHCI_USBLEGSUP_BIOS    (1 << 16)       /* BIOS semaphore */
+#define EHCI_USBLEGCTLSTS      4               /* legacy control/status */
+static void __init early_ehci_bios_handoff(void)
+{
+       u32 hcc_params = readl(&ehci_caps->hcc_params);
+       int offset = (hcc_params >> 8) & 0xff;
+       u32 cap;
+       int msec;
+
+       if (!offset)
+               return;
+
+       cap = read_pci_config(ehci_dev.bus, ehci_dev.slot,
+                             ehci_dev.func, offset);
+       dbgp_printk("dbgp: ehci BIOS state %08x\n", cap);
+
+       if ((cap & 0xff) == 1 && (cap & EHCI_USBLEGSUP_BIOS)) {
+               dbgp_printk("dbgp: BIOS handoff\n");
+               write_pci_config_byte(ehci_dev.bus, ehci_dev.slot,
+                                     ehci_dev.func, offset + 3, 1);
+       }
+
+       /* if boot firmware now owns EHCI, spin till it hands it over. */
+       msec = 1000;
+       while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
+               mdelay(10);
+               msec -= 10;
+               cap = read_pci_config(ehci_dev.bus, ehci_dev.slot,
+                                     ehci_dev.func, offset);
+       }
+
+       if (cap & EHCI_USBLEGSUP_BIOS) {
+               /* well, possibly buggy BIOS... try to shut it down,
+                * and hope nothing goes too wrong */
+               dbgp_printk("dbgp: BIOS handoff failed: %08x\n", cap);
+               write_pci_config_byte(ehci_dev.bus, ehci_dev.slot,
+                                     ehci_dev.func, offset + 2, 0);
+       }
+
+       /* just in case, always disable EHCI SMIs */
+       write_pci_config_byte(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
+                             offset + EHCI_USBLEGCTLSTS, 0);
+}
+
+static int __init ehci_setup(void)
+{
+       u32 ctrl, portsc, hcs_params;
+       u32 debug_port, new_debug_port = 0, n_ports;
+       int ret, i;
+       int port_map_tried;
+       int playtimes = 3;
+
+       early_ehci_bios_handoff();
+
+try_next_time:
+       port_map_tried = 0;
+
+try_next_port:
+
+       hcs_params = readl(&ehci_caps->hcs_params);
+       debug_port = HCS_DEBUG_PORT(hcs_params);
+       dbgp_phys_port = debug_port;
+       n_ports    = HCS_N_PORTS(hcs_params);
+
+       dbgp_printk("debug_port: %d\n", debug_port);
+       dbgp_printk("n_ports:    %d\n", n_ports);
+       dbgp_ehci_status("");
+
+       for (i = 1; i <= n_ports; i++) {
+               portsc = readl(&ehci_regs->port_status[i-1]);
+               dbgp_printk("portstatus%d: %08x\n", i, portsc);
+       }
+
+       if (port_map_tried && (new_debug_port != debug_port)) {
+               if (--playtimes) {
+                       set_debug_port(new_debug_port);
+                       goto try_next_time;
+               }
+               return -1;
+       }
+
+       /* Only reset the controller if it is not already in the
+        * configured state */
+       if (!(readl(&ehci_regs->configured_flag) & FLAG_CF)) {
+               if (dbgp_ehci_controller_reset() != 0)
+                       return -1;
+       } else {
+               dbgp_ehci_status("ehci skip - already configured");
+       }
+
+       ret = dbgp_external_startup();
+       if (ret == -EIO)
+               goto next_debug_port;
+
+       if (ret < 0) {
+               /* Things didn't work so remove my claim */
+               ctrl = readl(&ehci_debug->control);
+               ctrl &= ~(DBGP_CLAIM | DBGP_OUT);
+               writel(ctrl, &ehci_debug->control);
+               return -1;
+       }
+       return 0;
+
+next_debug_port:
+       port_map_tried |= (1<<(debug_port - 1));
+       new_debug_port = ((debug_port-1+1)%n_ports) + 1;
+       if (port_map_tried != ((1<<n_ports) - 1)) {
+               set_debug_port(new_debug_port);
+               goto try_next_port;
+       }
+       if (--playtimes) {
+               set_debug_port(new_debug_port);
+               goto try_next_time;
+       }
+
+       return -1;
+}
+
+int __init early_dbgp_init(char *s)
+{
+       u32 debug_port, bar, offset;
+       u32 bus, slot, func, cap;
+       void __iomem *ehci_bar;
+       u32 dbgp_num;
+       u32 bar_val;
+       char *e;
+       int ret;
+       u8 byte;
+
+       if (!early_pci_allowed())
+               return -1;
+
+       dbgp_num = 0;
+       if (*s)
+               dbgp_num = simple_strtoul(s, &e, 10);
+       dbgp_printk("dbgp_num: %d\n", dbgp_num);
+
+       cap = find_dbgp(dbgp_num, &bus, &slot, &func);
+       if (!cap)
+               return -1;
+
+       dbgp_printk("Found EHCI debug port on %02x:%02x.%1x\n", bus, slot,
+                        func);
+
+       debug_port = read_pci_config(bus, slot, func, cap);
+       bar = (debug_port >> 29) & 0x7;
+       bar = (bar * 4) + 0xc;
+       offset = (debug_port >> 16) & 0xfff;
+       dbgp_printk("bar: %02x offset: %03x\n", bar, offset);
+       if (bar != PCI_BASE_ADDRESS_0) {
+               dbgp_printk("only debug ports on bar 1 handled.\n");
+
+               return -1;
+       }
+
+       bar_val = read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_0);
+       dbgp_printk("bar_val: %02x offset: %03x\n", bar_val, offset);
+       if (bar_val & ~PCI_BASE_ADDRESS_MEM_MASK) {
+               dbgp_printk("only simple 32bit mmio bars supported\n");
+
+               return -1;
+       }
+
+       /* double check if the mem space is enabled */
+       byte = read_pci_config_byte(bus, slot, func, 0x04);
+       if (!(byte & 0x2)) {
+               byte  |= 0x02;
+               write_pci_config_byte(bus, slot, func, 0x04, byte);
+               dbgp_printk("mmio for ehci enabled\n");
+       }
+
+       /*
+        * FIXME I don't have the bar size so just guess PAGE_SIZE is more
+        * than enough.  1K is the biggest I have seen.
+        */
+       set_fixmap_nocache(FIX_DBGP_BASE, bar_val & PAGE_MASK);
+       ehci_bar = (void __iomem *)__fix_to_virt(FIX_DBGP_BASE);
+       ehci_bar += bar_val & ~PAGE_MASK;
+       dbgp_printk("ehci_bar: %p\n", ehci_bar);
+
+       ehci_caps  = ehci_bar;
+       ehci_regs  = ehci_bar + HC_LENGTH(readl(&ehci_caps->hc_capbase));
+       ehci_debug = ehci_bar + offset;
+       ehci_dev.bus = bus;
+       ehci_dev.slot = slot;
+       ehci_dev.func = func;
+
+       detect_set_debug_port();
+
+       ret = ehci_setup();
+       if (ret < 0) {
+               dbgp_printk("ehci_setup failed\n");
+               ehci_debug = NULL;
+
+               return -1;
+       }
+       dbgp_ehci_status("early_init_complete");
+
+       return 0;
+}
+
+static void early_dbgp_write(struct console *con, const char *str, u32 n)
+{
+       int chunk, ret;
+       char buf[DBGP_MAX_PACKET];
+       int use_cr = 0;
+       u32 cmd, ctrl;
+       int reset_run = 0;
+
+       if (!ehci_debug || dbgp_not_safe)
+               return;
+
+       cmd = readl(&ehci_regs->command);
+       if (unlikely(!(cmd & CMD_RUN))) {
+               /* If the ehci controller is not in the run state do extended
+                * checks to see if the acpi or some other initialization also
+                * reset the ehci debug port */
+               ctrl = readl(&ehci_debug->control);
+               if (!(ctrl & DBGP_ENABLED)) {
+                       dbgp_not_safe = 1;
+                       dbgp_external_startup();
+               } else {
+                       cmd |= CMD_RUN;
+                       writel(cmd, &ehci_regs->command);
+                       reset_run = 1;
+               }
+       }
+       while (n > 0) {
+               for (chunk = 0; chunk < DBGP_MAX_PACKET && n > 0;
+                    str++, chunk++, n--) {
+                       if (!use_cr && *str == '\n') {
+                               use_cr = 1;
+                               buf[chunk] = '\r';
+                               str--;
+                               n++;
+                               continue;
+                       }
+                       if (use_cr)
+                               use_cr = 0;
+                       buf[chunk] = *str;
+               }
+               if (chunk > 0) {
+                       ret = dbgp_bulk_write(USB_DEBUG_DEVNUM,
+                                     dbgp_endpoint_out, buf, chunk);
+               }
+       }
+       if (unlikely(reset_run)) {
+               cmd = readl(&ehci_regs->command);
+               cmd &= ~CMD_RUN;
+               writel(cmd, &ehci_regs->command);
+       }
+}
+
+struct console early_dbgp_console = {
+       .name =         "earlydbg",
+       .write =        early_dbgp_write,
+       .flags =        CON_PRINTBUFFER,
+       .index =        -1,
+};
+
+int dbgp_reset_prep(void)
+{
+       u32 ctrl;
+
+       dbgp_not_safe = 1;
+       if (!ehci_debug)
+               return 0;
+
+       if (early_dbgp_console.index != -1 &&
+               !(early_dbgp_console.flags & CON_BOOT))
+               return 1;
+       /* This means the console is not initialized, or should get
+        * shutdown so as to allow for reuse of the usb device, which
+        * means it is time to shutdown the usb debug port. */
+       ctrl = readl(&ehci_debug->control);
+       if (ctrl & DBGP_ENABLED) {
+               ctrl &= ~(DBGP_CLAIM);
+               writel(ctrl, &ehci_debug->control);
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(dbgp_reset_prep);
index 9f986b4..3335131 100644 (file)
@@ -124,7 +124,7 @@ choice
 
 config USB_GADGET_AT91
        boolean "Atmel AT91 USB Device Port"
-       depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9
+       depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45
        select USB_GADGET_SELECTED
        help
           Many Atmel AT91 processors (such as the AT91RM2000) have a
@@ -143,7 +143,7 @@ config USB_AT91
 config USB_GADGET_ATMEL_USBA
        boolean "Atmel USBA"
        select USB_GADGET_DUALSPEED
-       depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL
+       depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
        help
          USBA is the integrated high-speed USB Device controller on
          the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
@@ -627,9 +627,10 @@ config USB_AUDIO
 config USB_ETH
        tristate "Ethernet Gadget (with CDC Ethernet support)"
        depends on NET
+       select CRC32
        help
-         This driver implements Ethernet style communication, in either
-         of two ways:
+         This driver implements Ethernet style communication, in one of
+         several ways:
          
           - The "Communication Device Class" (CDC) Ethernet Control Model.
             That protocol is often avoided with pure Ethernet adapters, in
@@ -639,7 +640,11 @@ config USB_ETH
           - On hardware can't implement that protocol, a simple CDC subset
             is used, placing fewer demands on USB.
 
-         RNDIS support is a third option, more demanding than that subset.
+          - CDC Ethernet Emulation Model (EEM) is a newer standard that has
+            a simpler interface that can be used by more USB hardware.
+
+         RNDIS support is an additional option, more demanding than than
+         subset.
 
          Within the USB device, this gadget driver exposes a network device
          "usbX", where X depends on what other networking devices you have.
@@ -672,6 +677,22 @@ config USB_ETH_RNDIS
           XP, you'll need to download drivers from Microsoft's website; a URL
           is given in comments found in that info file.
 
+config USB_ETH_EEM
+       bool "Ethernet Emulation Model (EEM) support"
+       depends on USB_ETH
+       default n
+       help
+         CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM
+         and therefore can be supported by more hardware.  Technically ECM and
+         EEM are designed for different applications.  The ECM model extends
+         the network interface to the target (e.g. a USB cable modem), and the
+         EEM model is for mobile devices to communicate with hosts using
+         ethernet over USB.  For Linux gadgets, however, the interface with
+         the host is the same (a usbX device), so the differences are minimal.
+
+         If you say "y" here, the Ethernet gadget driver will use the EEM
+         protocol rather than ECM.  If unsure, say "n".
+
 config USB_GADGETFS
        tristate "Gadget Filesystem (EXPERIMENTAL)"
        depends on EXPERIMENTAL
index 77352cc..d5b6596 100644 (file)
@@ -2378,40 +2378,34 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
                if (!ep->cancel_transfer && !list_empty(&ep->queue)) {
                        req = list_entry(ep->queue.next,
                                        struct udc_request, queue);
-                       if (req) {
-                               /*
-                                * length bytes transfered
-                                * check dma done of last desc. in PPBDU mode
-                                */
-                               if (use_dma_ppb_du) {
-                                       td = udc_get_last_dma_desc(req);
-                                       if (td) {
-                                               dma_done =
-                                                       AMD_GETBITS(td->status,
-                                                       UDC_DMA_IN_STS_BS);
-                                               /* don't care DMA done */
-                                               req->req.actual =
-                                                       req->req.length;
-                                       }
-                               } else {
-                                       /* assume all bytes transferred */
+                       /*
+                        * length bytes transfered
+                        * check dma done of last desc. in PPBDU mode
+                        */
+                       if (use_dma_ppb_du) {
+                               td = udc_get_last_dma_desc(req);
+                               if (td) {
+                                       dma_done =
+                                               AMD_GETBITS(td->status,
+                                               UDC_DMA_IN_STS_BS);
+                                       /* don't care DMA done */
                                        req->req.actual = req->req.length;
                                }
+                       } else {
+                               /* assume all bytes transferred */
+                               req->req.actual = req->req.length;
+                       }
 
-                               if (req->req.actual == req->req.length) {
-                                       /* complete req */
-                                       complete_req(ep, req, 0);
-                                       req->dma_going = 0;
-                                       /* further request available ? */
-                                       if (list_empty(&ep->queue)) {
-                                               /* disable interrupt */
-                                               tmp = readl(
-                                                       &dev->regs->ep_irqmsk);
-                                               tmp |= AMD_BIT(ep->num);
-                                               writel(tmp,
-                                                       &dev->regs->ep_irqmsk);
-                                       }
-
+                       if (req->req.actual == req->req.length) {
+                               /* complete req */
+                               complete_req(ep, req, 0);
+                               req->dma_going = 0;
+                               /* further request available ? */
+                               if (list_empty(&ep->queue)) {
+                                       /* disable interrupt */
+                                       tmp = readl(&dev->regs->ep_irqmsk);
+                                       tmp |= AMD_BIT(ep->num);
+                                       writel(tmp, &dev->regs->ep_irqmsk);
                                }
                        }
                }
index 72bae8f..66450a1 100644 (file)
@@ -1754,7 +1754,6 @@ static int __init at91udc_probe(struct platform_device *pdev)
                                IRQF_DISABLED, driver_name, udc)) {
                        DBG("request vbus irq %d failed\n",
                                        udc->board.vbus_pin);
-                       free_irq(udc->udp_irq, udc);
                        retval = -EBUSY;
                        goto fail3;
                }
index 9f80f4e..a3a0f4a 100644 (file)
@@ -106,20 +106,20 @@ static int audio_set_endpoint_req(struct usb_configuration *c,
                        ctrl->bRequest, w_value, len, ep);
 
        switch (ctrl->bRequest) {
-       case SET_CUR:
+       case UAC_SET_CUR:
                value = 0;
                break;
 
-       case SET_MIN:
+       case UAC_SET_MIN:
                break;
 
-       case SET_MAX:
+       case UAC_SET_MAX:
                break;
 
-       case SET_RES:
+       case UAC_SET_RES:
                break;
 
-       case SET_MEM:
+       case UAC_SET_MEM:
                break;
 
        default:
@@ -142,13 +142,13 @@ static int audio_get_endpoint_req(struct usb_configuration *c,
                        ctrl->bRequest, w_value, len, ep);
 
        switch (ctrl->bRequest) {
-       case GET_CUR:
-       case GET_MIN:
-       case GET_MAX:
-       case GET_RES:
+       case UAC_GET_CUR:
+       case UAC_GET_MIN:
+       case UAC_GET_MAX:
+       case UAC_GET_RES:
                value = 3;
                break;
-       case GET_MEM:
+       case UAC_GET_MEM:
                break;
        default:
                break;
@@ -171,11 +171,11 @@ audio_setup(struct usb_configuration *c, const struct usb_ctrlrequest *ctrl)
         * Audio class messages; interface activation uses set_alt().
         */
        switch (ctrl->bRequestType) {
-       case USB_AUDIO_SET_ENDPOINT:
+       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                value = audio_set_endpoint_req(c, ctrl);
                break;
 
-       case USB_AUDIO_GET_ENDPOINT:
+       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                value = audio_get_endpoint_req(c, ctrl);
                break;
 
index 59e8523..d05397e 100644 (file)
@@ -602,7 +602,7 @@ static int get_string(struct usb_composite_dev *cdev,
                        }
                }
 
-               for (len = 0; s->wData[len] && len <= 126; len++)
+               for (len = 0; len <= 126 && s->wData[len]; len++)
                        continue;
                if (!len)
                        return -EINVAL;
index a56b24d..5e09664 100644 (file)
@@ -1306,11 +1306,6 @@ restart:
                        setup = *(struct usb_ctrlrequest*) urb->setup_packet;
                        w_index = le16_to_cpu(setup.wIndex);
                        w_value = le16_to_cpu(setup.wValue);
-                       if (le16_to_cpu(setup.wLength) !=
-                                       urb->transfer_buffer_length) {
-                               status = -EOVERFLOW;
-                               goto return_urb;
-                       }
 
                        /* paranoia, in case of stale queued data */
                        list_for_each_entry (req, &ep->queue, queue) {
index bd102f5..f37de28 100644 (file)
  * simpler, Microsoft pushes their own approach: RNDIS.  The published
  * RNDIS specs are ambiguous and appear to be incomplete, and are also
  * needlessly complex.  They borrow more from CDC ACM than CDC ECM.
+ *
+ * While CDC ECM, CDC Subset, and RNDIS are designed to extend the ethernet
+ * interface to the target, CDC EEM was designed to use ethernet over the USB
+ * link between the host and target.  CDC EEM is implemented as an alternative
+ * to those other protocols when that communication model is more appropriate
  */
 
 #define DRIVER_DESC            "Ethernet Gadget"
@@ -114,6 +119,7 @@ static inline bool has_rndis(void)
 #include "f_rndis.c"
 #include "rndis.c"
 #endif
+#include "f_eem.c"
 #include "u_ether.c"
 
 /*-------------------------------------------------------------------------*/
@@ -150,6 +156,10 @@ static inline bool has_rndis(void)
 #define RNDIS_VENDOR_NUM       0x0525  /* NetChip */
 #define RNDIS_PRODUCT_NUM      0xa4a2  /* Ethernet/RNDIS Gadget */
 
+/* For EEM gadgets */
+#define EEM_VENDOR_NUM 0x0525  /* INVALID - NEEDS TO BE ALLOCATED */
+#define EEM_PRODUCT_NUM        0xa4a1  /* INVALID - NEEDS TO BE ALLOCATED */
+
 /*-------------------------------------------------------------------------*/
 
 static struct usb_device_descriptor device_desc = {
@@ -246,8 +256,16 @@ static struct usb_configuration rndis_config_driver = {
 
 /*-------------------------------------------------------------------------*/
 
+#ifdef CONFIG_USB_ETH_EEM
+static int use_eem = 1;
+#else
+static int use_eem;
+#endif
+module_param(use_eem, bool, 0);
+MODULE_PARM_DESC(use_eem, "use CDC EEM mode");
+
 /*
- * We _always_ have an ECM or CDC Subset configuration.
+ * We _always_ have an ECM, CDC Subset, or EEM configuration.
  */
 static int __init eth_do_config(struct usb_configuration *c)
 {
@@ -258,7 +276,9 @@ static int __init eth_do_config(struct usb_configuration *c)
                c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
        }
 
-       if (can_support_ecm(c->cdev->gadget))
+       if (use_eem)
+               return eem_bind_config(c);
+       else if (can_support_ecm(c->cdev->gadget))
                return ecm_bind_config(c, hostaddr);
        else
                return geth_bind_config(c, hostaddr);
@@ -286,7 +306,12 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
                return status;
 
        /* set up main config label and device descriptor */
-       if (can_support_ecm(cdev->gadget)) {
+       if (use_eem) {
+               /* EEM */
+               eth_config_driver.label = "CDC Ethernet (EEM)";
+               device_desc.idVendor = cpu_to_le16(EEM_VENDOR_NUM);
+               device_desc.idProduct = cpu_to_le16(EEM_PRODUCT_NUM);
+       } else if (can_support_ecm(cdev->gadget)) {
                /* ECM */
                eth_config_driver.label = "CDC Ethernet (ECM)";
        } else {
index 66527ba..98e9bb9 100644 (file)
@@ -28,6 +28,9 @@ static int audio_buf_size = 48000;
 module_param(audio_buf_size, int, S_IRUGO);
 MODULE_PARM_DESC(audio_buf_size, "Audio buffer size");
 
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value);
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd);
+
 /*
  * DESCRIPTORS ... most are static, but strings and full
  * configuration descriptors are built on demand.
@@ -50,16 +53,16 @@ static struct usb_interface_descriptor ac_interface_desc __initdata = {
        .bInterfaceSubClass =   USB_SUBCLASS_AUDIOCONTROL,
 };
 
-DECLARE_USB_AC_HEADER_DESCRIPTOR(2);
+DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
 
-#define USB_DT_AC_HEADER_LENGH USB_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
+#define UAC_DT_AC_HEADER_LENGTH        UAC_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static struct usb_ac_header_descriptor_2 ac_header_desc = {
-       .bLength =              USB_DT_AC_HEADER_LENGH,
+static struct uac_ac_header_descriptor_2 ac_header_desc = {
+       .bLength =              UAC_DT_AC_HEADER_LENGTH,
        .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   HEADER,
+       .bDescriptorSubtype =   UAC_HEADER,
        .bcdADC =               __constant_cpu_to_le16(0x0100),
-       .wTotalLength =         __constant_cpu_to_le16(USB_DT_AC_HEADER_LENGH),
+       .wTotalLength =         __constant_cpu_to_le16(UAC_DT_AC_HEADER_LENGTH),
        .bInCollection =        F_AUDIO_NUM_INTERFACES,
        .baInterfaceNr = {
                [0] =           F_AUDIO_AC_INTERFACE,
@@ -68,33 +71,33 @@ static struct usb_ac_header_descriptor_2 ac_header_desc = {
 };
 
 #define INPUT_TERMINAL_ID      1
-static struct usb_input_terminal_descriptor input_terminal_desc = {
-       .bLength =              USB_DT_AC_INPUT_TERMINAL_SIZE,
+static struct uac_input_terminal_descriptor input_terminal_desc = {
+       .bLength =              UAC_DT_INPUT_TERMINAL_SIZE,
        .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   INPUT_TERMINAL,
+       .bDescriptorSubtype =   UAC_INPUT_TERMINAL,
        .bTerminalID =          INPUT_TERMINAL_ID,
-       .wTerminalType =        USB_AC_TERMINAL_STREAMING,
+       .wTerminalType =        UAC_TERMINAL_STREAMING,
        .bAssocTerminal =       0,
        .wChannelConfig =       0x3,
 };
 
-DECLARE_USB_AC_FEATURE_UNIT_DESCRIPTOR(0);
+DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(0);
 
 #define FEATURE_UNIT_ID                2
-static struct usb_ac_feature_unit_descriptor_0 feature_unit_desc = {
-       .bLength                = USB_DT_AC_FEATURE_UNIT_SIZE(0),
+static struct uac_feature_unit_descriptor_0 feature_unit_desc = {
+       .bLength                = UAC_DT_FEATURE_UNIT_SIZE(0),
        .bDescriptorType        = USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype     = FEATURE_UNIT,
+       .bDescriptorSubtype     = UAC_FEATURE_UNIT,
        .bUnitID                = FEATURE_UNIT_ID,
        .bSourceID              = INPUT_TERMINAL_ID,
        .bControlSize           = 2,
-       .bmaControls[0]         = (FU_MUTE | FU_VOLUME),
+       .bmaControls[0]         = (UAC_FU_MUTE | UAC_FU_VOLUME),
 };
 
 static struct usb_audio_control mute_control = {
        .list = LIST_HEAD_INIT(mute_control.list),
        .name = "Mute Control",
-       .type = MUTE_CONTROL,
+       .type = UAC_MUTE_CONTROL,
        /* Todo: add real Mute control code */
        .set = generic_set_cmd,
        .get = generic_get_cmd,
@@ -103,7 +106,7 @@ static struct usb_audio_control mute_control = {
 static struct usb_audio_control volume_control = {
        .list = LIST_HEAD_INIT(volume_control.list),
        .name = "Volume Control",
-       .type = VOLUME_CONTROL,
+       .type = UAC_VOLUME_CONTROL,
        /* Todo: add real Volume control code */
        .set = generic_set_cmd,
        .get = generic_get_cmd,
@@ -113,17 +116,17 @@ static struct usb_audio_control_selector feature_unit = {
        .list = LIST_HEAD_INIT(feature_unit.list),
        .id = FEATURE_UNIT_ID,
        .name = "Mute & Volume Control",
-       .type = FEATURE_UNIT,
+       .type = UAC_FEATURE_UNIT,
        .desc = (struct usb_descriptor_header *)&feature_unit_desc,
 };
 
 #define OUTPUT_TERMINAL_ID     3
-static struct usb_output_terminal_descriptor output_terminal_desc = {
-       .bLength                = USB_DT_AC_OUTPUT_TERMINAL_SIZE,
+static struct uac_output_terminal_descriptor output_terminal_desc = {
+       .bLength                = UAC_DT_OUTPUT_TERMINAL_SIZE,
        .bDescriptorType        = USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype     = OUTPUT_TERMINAL,
+       .bDescriptorSubtype     = UAC_OUTPUT_TERMINAL,
        .bTerminalID            = OUTPUT_TERMINAL_ID,
-       .wTerminalType          = USB_AC_OUTPUT_TERMINAL_SPEAKER,
+       .wTerminalType          = UAC_OUTPUT_TERMINAL_SPEAKER,
        .bAssocTerminal         = FEATURE_UNIT_ID,
        .bSourceID              = FEATURE_UNIT_ID,
 };
@@ -148,22 +151,22 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = {
 };
 
 /* B.4.2  Class-Specific AS Interface Descriptor */
-static struct usb_as_header_descriptor as_header_desc = {
-       .bLength =              USB_DT_AS_HEADER_SIZE,
+static struct uac_as_header_descriptor as_header_desc = {
+       .bLength =              UAC_DT_AS_HEADER_SIZE,
        .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   AS_GENERAL,
+       .bDescriptorSubtype =   UAC_AS_GENERAL,
        .bTerminalLink =        INPUT_TERMINAL_ID,
        .bDelay =               1,
-       .wFormatTag =           USB_AS_AUDIO_FORMAT_TYPE_I_PCM,
+       .wFormatTag =           UAC_FORMAT_TYPE_I_PCM,
 };
 
-DECLARE_USB_AS_FORMAT_TYPE_I_DISCRETE_DESC(1);
+DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(1);
 
-static struct usb_as_formate_type_i_discrete_descriptor_1 as_type_i_desc = {
-       .bLength =              USB_AS_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
+static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = {
+       .bLength =              UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
        .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   FORMAT_TYPE,
-       .bFormatType =          USB_AS_FORMAT_TYPE_I,
+       .bDescriptorSubtype =   UAC_FORMAT_TYPE,
+       .bFormatType =          UAC_FORMAT_TYPE_I,
        .bSubframeSize =        2,
        .bBitResolution =       16,
        .bSamFreqType =         1,
@@ -174,17 +177,17 @@ static struct usb_endpoint_descriptor as_out_ep_desc __initdata = {
        .bLength =              USB_DT_ENDPOINT_AUDIO_SIZE,
        .bDescriptorType =      USB_DT_ENDPOINT,
        .bEndpointAddress =     USB_DIR_OUT,
-       .bmAttributes =         USB_AS_ENDPOINT_ADAPTIVE
+       .bmAttributes =         USB_ENDPOINT_SYNC_ADAPTIVE
                                | USB_ENDPOINT_XFER_ISOC,
        .wMaxPacketSize =       __constant_cpu_to_le16(OUT_EP_MAX_PACKET_SIZE),
        .bInterval =            4,
 };
 
 /* Class-specific AS ISO OUT Endpoint Descriptor */
-static struct usb_as_iso_endpoint_descriptor as_iso_out_desc __initdata = {
-       .bLength =              USB_AS_ISO_ENDPOINT_DESC_SIZE,
+static struct uac_iso_endpoint_descriptor as_iso_out_desc __initdata = {
+       .bLength =              UAC_ISO_ENDPOINT_DESC_SIZE,
        .bDescriptorType =      USB_DT_CS_ENDPOINT,
-       .bDescriptorSubtype =   EP_GENERAL,
+       .bDescriptorSubtype =   UAC_EP_GENERAL,
        .bmAttributes =         1,
        .bLockDelayUnits =      1,
        .wLockDelay =           __constant_cpu_to_le16(1),
@@ -456,11 +459,11 @@ f_audio_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
         * Audio class messages; interface activation uses set_alt().
         */
        switch (ctrl->bRequestType) {
-       case USB_AUDIO_SET_INTF:
+       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
                value = audio_set_intf_req(f, ctrl);
                break;
 
-       case USB_AUDIO_GET_INTF:
+       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
                value = audio_get_intf_req(f, ctrl);
                break;
 
@@ -632,6 +635,18 @@ f_audio_unbind(struct usb_configuration *c, struct usb_function *f)
 
 /*-------------------------------------------------------------------------*/
 
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
+{
+       con->data[cmd] = value;
+
+       return 0;
+}
+
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
+{
+       return con->data[cmd];
+}
+
 /* Todo: add more control selecotor dynamically */
 int __init control_selector_init(struct f_audio *audio)
 {
@@ -642,10 +657,10 @@ int __init control_selector_init(struct f_audio *audio)
        list_add(&mute_control.list, &feature_unit.control);
        list_add(&volume_control.list, &feature_unit.control);
 
-       volume_control.data[_CUR] = 0xffc0;
-       volume_control.data[_MIN] = 0xe3a0;
-       volume_control.data[_MAX] = 0xfff0;
-       volume_control.data[_RES] = 0x0030;
+       volume_control.data[UAC__CUR] = 0xffc0;
+       volume_control.data[UAC__MIN] = 0xe3a0;
+       volume_control.data[UAC__MAX] = 0xfff0;
+       volume_control.data[UAC__RES] = 0x0030;
 
        return 0;
 }
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
new file mode 100644 (file)
index 0000000..0a577d5
--- /dev/null
@@ -0,0 +1,562 @@
+/*
+ * f_eem.c -- USB CDC Ethernet (EEM) link function driver
+ *
+ * Copyright (C) 2003-2005,2008 David Brownell
+ * Copyright (C) 2008 Nokia Corporation
+ * Copyright (C) 2009 EF Johnson Technologies
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/etherdevice.h>
+#include <linux/crc32.h>
+
+#include "u_ether.h"
+
+#define EEM_HLEN 2
+
+/*
+ * This function is a "CDC Ethernet Emulation Model" (CDC EEM)
+ * Ethernet link.
+ */
+
+struct eem_ep_descs {
+       struct usb_endpoint_descriptor  *in;
+       struct usb_endpoint_descriptor  *out;
+};
+
+struct f_eem {
+       struct gether                   port;
+       u8                              ctrl_id;
+
+       struct eem_ep_descs             fs;
+       struct eem_ep_descs             hs;
+};
+
+static inline struct f_eem *func_to_eem(struct usb_function *f)
+{
+       return container_of(f, struct f_eem, port.func);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* interface descriptor: */
+
+static struct usb_interface_descriptor eem_intf __initdata = {
+       .bLength =              sizeof eem_intf,
+       .bDescriptorType =      USB_DT_INTERFACE,
+
+       /* .bInterfaceNumber = DYNAMIC */
+       .bNumEndpoints =        2,
+       .bInterfaceClass =      USB_CLASS_COMM,
+       .bInterfaceSubClass =   USB_CDC_SUBCLASS_EEM,
+       .bInterfaceProtocol =   USB_CDC_PROTO_EEM,
+       /* .iInterface = DYNAMIC */
+};
+
+/* full speed support: */
+
+static struct usb_endpoint_descriptor eem_fs_in_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+
+       .bEndpointAddress =     USB_DIR_IN,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+};
+
+static struct usb_endpoint_descriptor eem_fs_out_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+
+       .bEndpointAddress =     USB_DIR_OUT,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+};
+
+static struct usb_descriptor_header *eem_fs_function[] __initdata = {
+       /* CDC EEM control descriptors */
+       (struct usb_descriptor_header *) &eem_intf,
+       (struct usb_descriptor_header *) &eem_fs_in_desc,
+       (struct usb_descriptor_header *) &eem_fs_out_desc,
+       NULL,
+};
+
+/* high speed support: */
+
+static struct usb_endpoint_descriptor eem_hs_in_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+
+       .bEndpointAddress =     USB_DIR_IN,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize =       cpu_to_le16(512),
+};
+
+static struct usb_endpoint_descriptor eem_hs_out_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+
+       .bEndpointAddress =     USB_DIR_OUT,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize =       cpu_to_le16(512),
+};
+
+static struct usb_descriptor_header *eem_hs_function[] __initdata = {
+       /* CDC EEM control descriptors */
+       (struct usb_descriptor_header *) &eem_intf,
+       (struct usb_descriptor_header *) &eem_hs_in_desc,
+       (struct usb_descriptor_header *) &eem_hs_out_desc,
+       NULL,
+};
+
+/* string descriptors: */
+
+static struct usb_string eem_string_defs[] = {
+       [0].s = "CDC Ethernet Emulation Model (EEM)",
+       {  } /* end of list */
+};
+
+static struct usb_gadget_strings eem_string_table = {
+       .language =             0x0409, /* en-us */
+       .strings =              eem_string_defs,
+};
+
+static struct usb_gadget_strings *eem_strings[] = {
+       &eem_string_table,
+       NULL,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int eem_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
+{
+       struct usb_composite_dev *cdev = f->config->cdev;
+       int                     value = -EOPNOTSUPP;
+       u16                     w_index = le16_to_cpu(ctrl->wIndex);
+       u16                     w_value = le16_to_cpu(ctrl->wValue);
+       u16                     w_length = le16_to_cpu(ctrl->wLength);
+
+       DBG(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n",
+               ctrl->bRequestType, ctrl->bRequest,
+               w_value, w_index, w_length);
+
+       /* device either stalls (value < 0) or reports success */
+       return value;
+}
+
+
+static int eem_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
+{
+       struct f_eem            *eem = func_to_eem(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+       struct net_device       *net;
+
+       /* we know alt == 0, so this is an activation or a reset */
+       if (alt != 0)
+               goto fail;
+
+       if (intf == eem->ctrl_id) {
+
+               if (eem->port.in_ep->driver_data) {
+                       DBG(cdev, "reset eem\n");
+                       gether_disconnect(&eem->port);
+               }
+
+               if (!eem->port.in) {
+                       DBG(cdev, "init eem\n");
+                       eem->port.in = ep_choose(cdev->gadget,
+                                       eem->hs.in, eem->fs.in);
+                       eem->port.out = ep_choose(cdev->gadget,
+                                       eem->hs.out, eem->fs.out);
+               }
+
+               /* zlps should not occur because zero-length EEM packets
+                * will be inserted in those cases where they would occur
+                */
+               eem->port.is_zlp_ok = 1;
+               eem->port.cdc_filter = DEFAULT_FILTER;
+               DBG(cdev, "activate eem\n");
+               net = gether_connect(&eem->port);
+               if (IS_ERR(net))
+                       return PTR_ERR(net);
+       } else
+               goto fail;
+
+       return 0;
+fail:
+       return -EINVAL;
+}
+
+static void eem_disable(struct usb_function *f)
+{
+       struct f_eem            *eem = func_to_eem(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+
+       DBG(cdev, "eem deactivated\n");
+
+       if (eem->port.in_ep->driver_data)
+               gether_disconnect(&eem->port);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* EEM function driver setup/binding */
+
+static int __init
+eem_bind(struct usb_configuration *c, struct usb_function *f)
+{
+       struct usb_composite_dev *cdev = c->cdev;
+       struct f_eem            *eem = func_to_eem(f);
+       int                     status;
+       struct usb_ep           *ep;
+
+       /* allocate instance-specific interface IDs */
+       status = usb_interface_id(c, f);
+       if (status < 0)
+               goto fail;
+       eem->ctrl_id = status;
+       eem_intf.bInterfaceNumber = status;
+
+       status = -ENODEV;
+
+       /* allocate instance-specific endpoints */
+       ep = usb_ep_autoconfig(cdev->gadget, &eem_fs_in_desc);
+       if (!ep)
+               goto fail;
+       eem->port.in_ep = ep;
+       ep->driver_data = cdev; /* claim */
+
+       ep = usb_ep_autoconfig(cdev->gadget, &eem_fs_out_desc);
+       if (!ep)
+               goto fail;
+       eem->port.out_ep = ep;
+       ep->driver_data = cdev; /* claim */
+
+       status = -ENOMEM;
+
+       /* copy descriptors, and track endpoint copies */
+       f->descriptors = usb_copy_descriptors(eem_fs_function);
+       if (!f->descriptors)
+               goto fail;
+
+       eem->fs.in = usb_find_endpoint(eem_fs_function,
+                       f->descriptors, &eem_fs_in_desc);
+       eem->fs.out = usb_find_endpoint(eem_fs_function,
+                       f->descriptors, &eem_fs_out_desc);
+
+       /* support all relevant hardware speeds... we expect that when
+        * hardware is dual speed, all bulk-capable endpoints work at
+        * both speeds
+        */
+       if (gadget_is_dualspeed(c->cdev->gadget)) {
+               eem_hs_in_desc.bEndpointAddress =
+                               eem_fs_in_desc.bEndpointAddress;
+               eem_hs_out_desc.bEndpointAddress =
+                               eem_fs_out_desc.bEndpointAddress;
+
+               /* copy descriptors, and track endpoint copies */
+               f->hs_descriptors = usb_copy_descriptors(eem_hs_function);
+               if (!f->hs_descriptors)
+                       goto fail;
+
+               eem->hs.in = usb_find_endpoint(eem_hs_function,
+                               f->hs_descriptors, &eem_hs_in_desc);
+               eem->hs.out = usb_find_endpoint(eem_hs_function,
+                               f->hs_descriptors, &eem_hs_out_desc);
+       }
+
+       DBG(cdev, "CDC Ethernet (EEM): %s speed IN/%s OUT/%s\n",
+                       gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+                       eem->port.in_ep->name, eem->port.out_ep->name);
+       return 0;
+
+fail:
+       if (f->descriptors)
+               usb_free_descriptors(f->descriptors);
+
+       /* we might as well release our claims on endpoints */
+       if (eem->port.out)
+               eem->port.out_ep->driver_data = NULL;
+       if (eem->port.in)
+               eem->port.in_ep->driver_data = NULL;
+
+       ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+
+       return status;
+}
+
+static void
+eem_unbind(struct usb_configuration *c, struct usb_function *f)
+{
+       struct f_eem    *eem = func_to_eem(f);
+
+       DBG(c->cdev, "eem unbind\n");
+
+       if (gadget_is_dualspeed(c->cdev->gadget))
+               usb_free_descriptors(f->hs_descriptors);
+       usb_free_descriptors(f->descriptors);
+       kfree(eem);
+}
+
+static void eem_cmd_complete(struct usb_ep *ep, struct usb_request *req)
+{
+}
+
+/*
+ * Add the EEM header and ethernet checksum.
+ * We currently do not attempt to put multiple ethernet frames
+ * into a single USB transfer
+ */
+static struct sk_buff *eem_wrap(struct gether *port, struct sk_buff *skb)
+{
+       struct sk_buff  *skb2 = NULL;
+       struct usb_ep   *in = port->in_ep;
+       int             padlen = 0;
+       u16             len = skb->len;
+
+       if (!skb_cloned(skb)) {
+               int headroom = skb_headroom(skb);
+               int tailroom = skb_tailroom(skb);
+
+               /* When (len + EEM_HLEN + ETH_FCS_LEN) % in->maxpacket) is 0,
+                * stick two bytes of zero-length EEM packet on the end.
+                */
+               if (((len + EEM_HLEN + ETH_FCS_LEN) % in->maxpacket) == 0)
+                       padlen += 2;
+
+               if ((tailroom >= (ETH_FCS_LEN + padlen)) &&
+                               (headroom >= EEM_HLEN))
+                       goto done;
+       }
+
+       skb2 = skb_copy_expand(skb, EEM_HLEN, ETH_FCS_LEN + padlen, GFP_ATOMIC);
+       dev_kfree_skb_any(skb);
+       skb = skb2;
+       if (!skb)
+               return skb;
+
+done:
+       /* use the "no CRC" option */
+       put_unaligned_be32(0xdeadbeef, skb_put(skb, 4));
+
+       /* EEM packet header format:
+        * b0..13:      length of ethernet frame
+        * b14:         bmCRC (0 == sentinel CRC)
+        * b15:         bmType (0 == data)
+        */
+       len = skb->len;
+       put_unaligned_le16((len & 0x3FFF) | BIT(14), skb_push(skb, 2));
+
+       /* add a zero-length EEM packet, if needed */
+       if (padlen)
+               put_unaligned_le16(0, skb_put(skb, 2));
+
+       return skb;
+}
+
+/*
+ * Remove the EEM header.  Note that there can be many EEM packets in a single
+ * USB transfer, so we need to break them out and handle them independently.
+ */
+static int eem_unwrap(struct gether *port,
+                       struct sk_buff *skb,
+                       struct sk_buff_head *list)
+{
+       struct usb_composite_dev        *cdev = port->func.config->cdev;
+       int                             status = 0;
+
+       do {
+               struct sk_buff  *skb2;
+               u16             header;
+               u16             len = 0;
+
+               if (skb->len < EEM_HLEN) {
+                       status = -EINVAL;
+                       DBG(cdev, "invalid EEM header\n");
+                       goto error;
+               }
+
+               /* remove the EEM header */
+               header = get_unaligned_le16(skb->data);
+               skb_pull(skb, EEM_HLEN);
+
+               /* EEM packet header format:
+                * b0..14:      EEM type dependent (data or command)
+                * b15:         bmType (0 == data, 1 == command)
+                */
+               if (header & BIT(15)) {
+                       struct usb_request      *req = cdev->req;
+                       u16                     bmEEMCmd;
+
+                       /* EEM command packet format:
+                        * b0..10:      bmEEMCmdParam
+                        * b11..13:     bmEEMCmd
+                        * b14:         reserved (must be zero)
+                        * b15:         bmType (1 == command)
+                        */
+                       if (header & BIT(14))
+                               continue;
+
+                       bmEEMCmd = (header >> 11) & 0x7;
+                       switch (bmEEMCmd) {
+                       case 0: /* echo */
+                               len = header & 0x7FF;
+                               if (skb->len < len) {
+                                       status = -EOVERFLOW;
+                                       goto error;
+                               }
+
+                               skb2 = skb_clone(skb, GFP_ATOMIC);
+                               if (unlikely(!skb2)) {
+                                       DBG(cdev, "EEM echo response error\n");
+                                       goto next;
+                               }
+                               skb_trim(skb2, len);
+                               put_unaligned_le16(BIT(15) | BIT(11) | len,
+                                                       skb_push(skb2, 2));
+                               skb_copy_bits(skb, 0, req->buf, skb->len);
+                               req->length = skb->len;
+                               req->complete = eem_cmd_complete;
+                               req->zero = 1;
+                               if (usb_ep_queue(port->in_ep, req, GFP_ATOMIC))
+                                       DBG(cdev, "echo response queue fail\n");
+                               break;
+
+                       case 1:  /* echo response */
+                       case 2:  /* suspend hint */
+                       case 3:  /* response hint */
+                       case 4:  /* response complete hint */
+                       case 5:  /* tickle */
+                       default: /* reserved */
+                               continue;
+                       }
+               } else {
+                       u32             crc, crc2;
+                       struct sk_buff  *skb3;
+
+                       /* check for zero-length EEM packet */
+                       if (header == 0)
+                               continue;
+
+                       /* EEM data packet format:
+                        * b0..13:      length of ethernet frame
+                        * b14:         bmCRC (0 == sentinel, 1 == calculated)
+                        * b15:         bmType (0 == data)
+                        */
+                       len = header & 0x3FFF;
+                       if ((skb->len < len)
+                                       || (len < (ETH_HLEN + ETH_FCS_LEN))) {
+                               status = -EINVAL;
+                               goto error;
+                       }
+
+                       /* validate CRC */
+                       crc = get_unaligned_le32(skb->data + len - ETH_FCS_LEN);
+                       if (header & BIT(14)) {
+                               crc = get_unaligned_le32(skb->data + len
+                                                       - ETH_FCS_LEN);
+                               crc2 = ~crc32_le(~0,
+                                               skb->data,
+                                               skb->len - ETH_FCS_LEN);
+                       } else {
+                               crc = get_unaligned_be32(skb->data + len
+                                                       - ETH_FCS_LEN);
+                               crc2 = 0xdeadbeef;
+                       }
+                       if (crc != crc2) {
+                               DBG(cdev, "invalid EEM CRC\n");
+                               goto next;
+                       }
+
+                       skb2 = skb_clone(skb, GFP_ATOMIC);
+                       if (unlikely(!skb2)) {
+                               DBG(cdev, "unable to unframe EEM packet\n");
+                               continue;
+                       }
+                       skb_trim(skb2, len - ETH_FCS_LEN);
+
+                       skb3 = skb_copy_expand(skb2,
+                                               NET_IP_ALIGN,
+                                               0,
+                                               GFP_ATOMIC);
+                       if (unlikely(!skb3)) {
+                               DBG(cdev, "unable to realign EEM packet\n");
+                               dev_kfree_skb_any(skb2);
+                               continue;
+                       }
+                       dev_kfree_skb_any(skb2);
+                       skb_queue_tail(list, skb3);
+               }
+next:
+               skb_pull(skb, len);
+       } while (skb->len);
+
+error:
+       dev_kfree_skb_any(skb);
+       return status;
+}
+
+/**
+ * eem_bind_config - add CDC Ethernet (EEM) network link to a configuration
+ * @c: the configuration to support the network link
+ * Context: single threaded during gadget setup
+ *
+ * Returns zero on success, else negative errno.
+ *
+ * Caller must have called @gether_setup().  Caller is also responsible
+ * for calling @gether_cleanup() before module unload.
+ */
+int __init eem_bind_config(struct usb_configuration *c)
+{
+       struct f_eem    *eem;
+       int             status;
+
+       /* maybe allocate device-global string IDs */
+       if (eem_string_defs[0].id == 0) {
+
+               /* control interface label */
+               status = usb_string_id(c->cdev);
+               if (status < 0)
+                       return status;
+               eem_string_defs[0].id = status;
+               eem_intf.iInterface = status;
+       }
+
+       /* allocate and initialize one new instance */
+       eem = kzalloc(sizeof *eem, GFP_KERNEL);
+       if (!eem)
+               return -ENOMEM;
+
+       eem->port.cdc_filter = DEFAULT_FILTER;
+
+       eem->port.func.name = "cdc_eem";
+       eem->port.func.strings = eem_strings;
+       /* descriptors are per-instance copies */
+       eem->port.func.bind = eem_bind;
+       eem->port.func.unbind = eem_unbind;
+       eem->port.func.set_alt = eem_set_alt;
+       eem->port.func.setup = eem_setup;
+       eem->port.func.disable = eem_disable;
+       eem->port.wrap = eem_wrap;
+       eem->port.unwrap = eem_unwrap;
+       eem->port.header_len = EEM_HLEN;
+
+       status = usb_add_function(c, &eem->port.func);
+       if (status)
+               kfree(eem);
+       return status;
+}
+
index 424a37c..c9966cc 100644 (file)
@@ -286,12 +286,17 @@ static struct usb_gadget_strings *rndis_strings[] = {
 
 /*-------------------------------------------------------------------------*/
 
-static struct sk_buff *rndis_add_header(struct sk_buff *skb)
+static struct sk_buff *rndis_add_header(struct gether *port,
+                                       struct sk_buff *skb)
 {
-       skb = skb_realloc_headroom(skb, sizeof(struct rndis_packet_msg_type));
-       if (skb)
-               rndis_add_hdr(skb);
-       return skb;
+       struct sk_buff *skb2;
+
+       skb2 = skb_realloc_headroom(skb, sizeof(struct rndis_packet_msg_type));
+       if (skb2)
+               rndis_add_hdr(skb2);
+
+       dev_kfree_skb_any(skb);
+       return skb2;
 }
 
 static void rndis_response_available(void *_rndis)
index d701bf4..7881f12 100644 (file)
@@ -2750,6 +2750,10 @@ static int __devexit qe_udc_remove(struct of_device *ofdev)
 
 /*-------------------------------------------------------------------------*/
 static struct of_device_id __devinitdata qe_udc_match[] = {
+       {
+               .compatible = "fsl,mpc8323-qe-usb",
+               .data = (void *)PORT_QE,
+       },
        {
                .compatible = "fsl,mpc8360-qe-usb",
                .data = (void *)PORT_QE,
index b9312dc..d0b1e83 100644 (file)
@@ -191,7 +191,7 @@ module_param(qlen, uint, S_IRUGO);
 #define GMIDI_MS_INTERFACE     1
 #define GMIDI_NUM_INTERFACES   2
 
-DECLARE_USB_AC_HEADER_DESCRIPTOR(1);
+DECLARE_UAC_AC_HEADER_DESCRIPTOR(1);
 DECLARE_USB_MIDI_OUT_JACK_DESCRIPTOR(1);
 DECLARE_USB_MS_ENDPOINT_DESCRIPTOR(1);
 
@@ -237,12 +237,12 @@ static const struct usb_interface_descriptor ac_interface_desc = {
 };
 
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static const struct usb_ac_header_descriptor_1 ac_header_desc = {
-       .bLength =              USB_DT_AC_HEADER_SIZE(1),
+static const struct uac_ac_header_descriptor_1 ac_header_desc = {
+       .bLength =              UAC_DT_AC_HEADER_SIZE(1),
        .bDescriptorType =      USB_DT_CS_INTERFACE,
        .bDescriptorSubtype =   USB_MS_HEADER,
        .bcdADC =               cpu_to_le16(0x0100),
-       .wTotalLength =         cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
+       .wTotalLength =         cpu_to_le16(UAC_DT_AC_HEADER_SIZE(1)),
        .bInCollection =        1,
        .baInterfaceNr = {
                [0] =           GMIDI_MS_INTERFACE,
index 7d33f50..c44367f 100644 (file)
@@ -2033,7 +2033,7 @@ gadgetfs_create_file (struct super_block *sb, char const *name,
        return inode;
 }
 
-static struct super_operations gadget_fs_operations = {
+static const struct super_operations gadget_fs_operations = {
        .statfs =       simple_statfs,
        .drop_inode =   generic_delete_inode,
 };
index ed21e26..e6fedbd 100644 (file)
@@ -56,6 +56,7 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/otg.h>
 
 /*
  * This driver is PXA25x only.  Grab the right register definitions.
@@ -1008,15 +1009,27 @@ static int pxa25x_udc_pullup(struct usb_gadget *_gadget, int is_active)
        return 0;
 }
 
+/* boards may consume current from VBUS, up to 100-500mA based on config.
+ * the 500uA suspend ceiling means that exclusively vbus-powered PXA designs
+ * violate USB specs.
+ */
+static int pxa25x_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
+{
+       struct pxa25x_udc       *udc;
+
+       udc = container_of(_gadget, struct pxa25x_udc, gadget);
+
+       if (udc->transceiver)
+               return otg_set_power(udc->transceiver, mA);
+       return -EOPNOTSUPP;
+}
+
 static const struct usb_gadget_ops pxa25x_udc_ops = {
        .get_frame      = pxa25x_udc_get_frame,
        .wakeup         = pxa25x_udc_wakeup,
        .vbus_session   = pxa25x_udc_vbus_session,
        .pullup         = pxa25x_udc_pullup,
-
-       // .vbus_draw ... boards may consume current from VBUS, up to
-       // 100-500mA based on config.  the 500uA suspend ceiling means
-       // that exclusively vbus-powered PXA designs violate USB specs.
+       .vbus_draw      = pxa25x_udc_vbus_draw,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1303,9 +1316,23 @@ fail:
         * for set_configuration as well as eventual disconnect.
         */
        DMSG("registered gadget driver '%s'\n", driver->driver.name);
+
+       /* connect to bus through transceiver */
+       if (dev->transceiver) {
+               retval = otg_set_peripheral(dev->transceiver, &dev->gadget);
+               if (retval) {
+                       DMSG("can't bind to transceiver\n");
+                       if (driver->unbind)
+                               driver->unbind(&dev->gadget);
+                       goto bind_fail;
+               }
+       }
+
        pullup(dev);
        dump_state(dev);
        return 0;
+bind_fail:
+       return retval;
 }
 EXPORT_SYMBOL(usb_gadget_register_driver);
 
@@ -1351,6 +1378,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
        stop_activity(dev, driver);
        local_irq_enable();
 
+       if (dev->transceiver)
+               (void) otg_set_peripheral(dev->transceiver, NULL);
+
        driver->unbind(&dev->gadget);
        dev->gadget.dev.driver = NULL;
        dev->driver = NULL;
@@ -2162,6 +2192,8 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
        dev->dev = &pdev->dev;
        dev->mach = pdev->dev.platform_data;
 
+       dev->transceiver = otg_get_transceiver();
+
        if (gpio_is_valid(dev->mach->gpio_vbus)) {
                if ((retval = gpio_request(dev->mach->gpio_vbus,
                                "pxa25x_udc GPIO VBUS"))) {
@@ -2264,6 +2296,10 @@ lubbock_fail0:
        if (gpio_is_valid(dev->mach->gpio_vbus))
                gpio_free(dev->mach->gpio_vbus);
  err_gpio_vbus:
+       if (dev->transceiver) {
+               otg_put_transceiver(dev->transceiver);
+               dev->transceiver = NULL;
+       }
        clk_put(dev->clk);
  err_clk:
        return retval;
@@ -2305,6 +2341,11 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
 
        clk_put(dev->clk);
 
+       if (dev->transceiver) {
+               otg_put_transceiver(dev->transceiver);
+               dev->transceiver = NULL;
+       }
+
        platform_set_drvdata(pdev, NULL);
        the_controller = NULL;
        return 0;
index 1d51aa2..f572c56 100644 (file)
@@ -128,6 +128,7 @@ struct pxa25x_udc {
        struct device                           *dev;
        struct clk                              *clk;
        struct pxa2xx_udc_mach_info             *mach;
+       struct otg_transceiver                  *transceiver;
        u64                                     dma_mask;
        struct pxa25x_ep                        ep [PXA_UDC_NUM_ENDPOINTS];
 
index ca41b0b..48267bc 100644 (file)
@@ -1022,22 +1022,29 @@ static rndis_resp_t *rndis_add_response (int configNr, u32 length)
        return r;
 }
 
-int rndis_rm_hdr(struct sk_buff *skb)
+int rndis_rm_hdr(struct gether *port,
+                       struct sk_buff *skb,
+                       struct sk_buff_head *list)
 {
        /* tmp points to a struct rndis_packet_msg_type */
        __le32          *tmp = (void *) skb->data;
 
        /* MessageType, MessageLength */
        if (cpu_to_le32(REMOTE_NDIS_PACKET_MSG)
-                       != get_unaligned(tmp++))
+                       != get_unaligned(tmp++)) {
+               dev_kfree_skb_any(skb);
                return -EINVAL;
+       }
        tmp++;
 
        /* DataOffset, DataLength */
-       if (!skb_pull(skb, get_unaligned_le32(tmp++) + 8))
+       if (!skb_pull(skb, get_unaligned_le32(tmp++) + 8)) {
+               dev_kfree_skb_any(skb);
                return -EOVERFLOW;
+       }
        skb_trim(skb, get_unaligned_le32(tmp++));
 
+       skb_queue_tail(list, skb);
        return 0;
 }
 
index aac61df..c236aaa 100644 (file)
@@ -251,7 +251,8 @@ int  rndis_set_param_vendor (u8 configNr, u32 vendorID,
                            const char *vendorDescr);
 int  rndis_set_param_medium (u8 configNr, u32 medium, u32 speed);
 void rndis_add_hdr (struct sk_buff *skb);
-int rndis_rm_hdr (struct sk_buff *skb);
+int rndis_rm_hdr(struct gether *port, struct sk_buff *skb,
+                       struct sk_buff_head *list);
 u8   *rndis_get_next_response (int configNr, u32 *length);
 void rndis_free_response (int configNr, u8 *buf);
 
index 50c71aa..4b5dbd0 100644 (file)
@@ -2392,7 +2392,7 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg)
                grstctl = readl(hsotg->regs + S3C_GRSTCTL);
        } while (!(grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0);
 
-       if (!grstctl & S3C_GRSTCTL_CSftRst) {
+       if (!(grstctl & S3C_GRSTCTL_CSftRst)) {
                dev_err(hsotg->dev, "Failed to get CSftRst asserted\n");
                return -EINVAL;
        }
@@ -2514,8 +2514,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         * DMA mode we may need this. */
        writel(S3C_DOEPMSK_SetupMsk | S3C_DOEPMSK_AHBErrMsk |
               S3C_DOEPMSK_EPDisbldMsk |
-              using_dma(hsotg) ? (S3C_DIEPMSK_XferComplMsk |
-                                  S3C_DIEPMSK_TimeOUTMsk) : 0,
+              (using_dma(hsotg) ? (S3C_DIEPMSK_XferComplMsk |
+                                  S3C_DIEPMSK_TimeOUTMsk) : 0),
               hsotg->regs + S3C_DOEPMSK);
 
        writel(0, hsotg->regs + S3C_DAINTMSK);
index a9b452f..d5f4c1d 100644 (file)
@@ -1703,8 +1703,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
        dprintk(DEBUG_NORMAL,"usb_gadget_register_driver() '%s'\n",
                driver->driver.name);
 
-       if (driver->disconnect)
-               driver->disconnect(&udc->gadget);
+       driver->unbind(&udc->gadget);
 
        device_del(&udc->gadget.dev);
        udc->driver = NULL;
index 0f3d22f..b5200d5 100644 (file)
@@ -253,11 +253,13 @@ static int gaudio_open_snd_dev(struct gaudio *card)
        snd->filp = filp_open(fn_cap, O_RDONLY, 0);
        if (IS_ERR(snd->filp)) {
                ERROR(card, "No such PCM capture device: %s\n", fn_cap);
-               snd->filp = NULL;
+               snd->substream = NULL;
+               snd->card = NULL;
+       } else {
+               pcm_file = snd->filp->private_data;
+               snd->substream = pcm_file->substream;
+               snd->card = card;
        }
-       pcm_file = snd->filp->private_data;
-       snd->substream = pcm_file->substream;
-       snd->card = card;
 
        return 0;
 }
index c665219..f8751ff 100644 (file)
@@ -37,8 +37,9 @@
  * one (!) network link through the USB gadget stack, normally "usb0".
  *
  * The control and data models are handled by the function driver which
- * connects to this code; such as CDC Ethernet, "CDC Subset", or RNDIS.
- * That includes all descriptor and endpoint management.
+ * connects to this code; such as CDC Ethernet (ECM or EEM),
+ * "CDC Subset", or RNDIS.  That includes all descriptor and endpoint
+ * management.
  *
  * Link level addressing is handled by this component using module
  * parameters; if no such parameters are provided, random link level
@@ -68,9 +69,13 @@ struct eth_dev {
        struct list_head        tx_reqs, rx_reqs;
        atomic_t                tx_qlen;
 
+       struct sk_buff_head     rx_frames;
+
        unsigned                header_len;
-       struct sk_buff          *(*wrap)(struct sk_buff *skb);
-       int                     (*unwrap)(struct sk_buff *skb);
+       struct sk_buff          *(*wrap)(struct gether *, struct sk_buff *skb);
+       int                     (*unwrap)(struct gether *,
+                                               struct sk_buff *skb,
+                                               struct sk_buff_head *list);
 
        struct work_struct      work;
 
@@ -269,7 +274,7 @@ enomem:
 
 static void rx_complete(struct usb_ep *ep, struct usb_request *req)
 {
-       struct sk_buff  *skb = req->context;
+       struct sk_buff  *skb = req->context, *skb2;
        struct eth_dev  *dev = ep->driver_data;
        int             status = req->status;
 
@@ -278,26 +283,47 @@ static void rx_complete(struct usb_ep *ep, struct usb_request *req)
        /* normal completion */
        case 0:
                skb_put(skb, req->actual);
-               if (dev->unwrap)
-                       status = dev->unwrap(skb);
-               if (status < 0
-                               || ETH_HLEN > skb->len
-                               || skb->len > ETH_FRAME_LEN) {
-                       dev->net->stats.rx_errors++;
-                       dev->net->stats.rx_length_errors++;
-                       DBG(dev, "rx length %d\n", skb->len);
-                       break;
-               }
 
-               skb->protocol = eth_type_trans(skb, dev->net);
-               dev->net->stats.rx_packets++;
-               dev->net->stats.rx_bytes += skb->len;
+               if (dev->unwrap) {
+                       unsigned long   flags;
 
-               /* no buffer copies needed, unless hardware can't
-                * use skb buffers.
-                */
-               status = netif_rx(skb);
+                       spin_lock_irqsave(&dev->lock, flags);
+                       if (dev->port_usb) {
+                               status = dev->unwrap(dev->port_usb,
+                                                       skb,
+                                                       &dev->rx_frames);
+                       } else {
+                               dev_kfree_skb_any(skb);
+                               status = -ENOTCONN;
+                       }
+                       spin_unlock_irqrestore(&dev->lock, flags);
+               } else {
+                       skb_queue_tail(&dev->rx_frames, skb);
+               }
                skb = NULL;
+
+               skb2 = skb_dequeue(&dev->rx_frames);
+               while (skb2) {
+                       if (status < 0
+                                       || ETH_HLEN > skb2->len
+                                       || skb2->len > ETH_FRAME_LEN) {
+                               dev->net->stats.rx_errors++;
+                               dev->net->stats.rx_length_errors++;
+                               DBG(dev, "rx length %d\n", skb2->len);
+                               dev_kfree_skb_any(skb2);
+                               goto next_frame;
+                       }
+                       skb2->protocol = eth_type_trans(skb2, dev->net);
+                       dev->net->stats.rx_packets++;
+                       dev->net->stats.rx_bytes += skb2->len;
+
+                       /* no buffer copies needed, unless hardware can't
+                        * use skb buffers.
+                        */
+                       status = netif_rx(skb2);
+next_frame:
+                       skb2 = skb_dequeue(&dev->rx_frames);
+               }
                break;
 
        /* software-driven interface shutdown */
@@ -537,14 +563,15 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
         * or there's not enough space for extra headers we need
         */
        if (dev->wrap) {
-               struct sk_buff  *skb_new;
+               unsigned long   flags;
 
-               skb_new = dev->wrap(skb);
-               if (!skb_new)
+               spin_lock_irqsave(&dev->lock, flags);
+               if (dev->port_usb)
+                       skb = dev->wrap(dev->port_usb, skb);
+               spin_unlock_irqrestore(&dev->lock, flags);
+               if (!skb)
                        goto drop;
 
-               dev_kfree_skb_any(skb);
-               skb = skb_new;
                length = skb->len;
        }
        req->buf = skb->data;
@@ -578,9 +605,9 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
        }
 
        if (retval) {
+               dev_kfree_skb_any(skb);
 drop:
                dev->net->stats.tx_dropped++;
-               dev_kfree_skb_any(skb);
                spin_lock_irqsave(&dev->req_lock, flags);
                if (list_empty(&dev->tx_reqs))
                        netif_start_queue(net);
@@ -753,6 +780,8 @@ int __init gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN])
        INIT_LIST_HEAD(&dev->tx_reqs);
        INIT_LIST_HEAD(&dev->rx_reqs);
 
+       skb_queue_head_init(&dev->rx_frames);
+
        /* network device setup */
        dev->net = net;
        strcpy(net->name, "usb%d");
index 0d1f7ae..91b39ff 100644 (file)
@@ -60,12 +60,13 @@ struct gether {
 
        u16                             cdc_filter;
 
-       /* hooks for added framing, as needed for RNDIS and EEM.
-        * we currently don't support multiple frames per SKB.
-        */
+       /* hooks for added framing, as needed for RNDIS and EEM. */
        u32                             header_len;
-       struct sk_buff                  *(*wrap)(struct sk_buff *skb);
-       int                             (*unwrap)(struct sk_buff *skb);
+       struct sk_buff                  *(*wrap)(struct gether *port,
+                                               struct sk_buff *skb);
+       int                             (*unwrap)(struct gether *port,
+                                               struct sk_buff *skb,
+                                               struct sk_buff_head *list);
 
        /* called on network open/close */
        void                            (*open)(struct gether *);
@@ -109,6 +110,7 @@ static inline bool can_support_ecm(struct usb_gadget *gadget)
 /* each configuration may bind one instance of an ethernet link */
 int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]);
 int ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]);
+int eem_bind_config(struct usb_configuration *c);
 
 #ifdef CONFIG_USB_ETH_RNDIS
 
index fc6e709..adf8260 100644 (file)
@@ -1114,7 +1114,6 @@ int __init gserial_setup(struct usb_gadget *g, unsigned count)
        /* export the driver ... */
        status = tty_register_driver(gs_tty_driver);
        if (status) {
-               put_tty_driver(gs_tty_driver);
                pr_err("%s: cannot register, err %d\n",
                                __func__, status);
                goto fail;
index f21ca7d..9b43b22 100644 (file)
@@ -113,6 +113,12 @@ config USB_EHCI_HCD_PPC_OF
          Enables support for the USB controller present on the PowerPC
          OpenFirmware platform bus.
 
+config USB_W90X900_EHCI
+       bool "W90X900(W90P910) EHCI support"
+       depends on USB_EHCI_HCD && ARCH_W90X900
+       ---help---
+               Enables support for the W90X900 USB controller
+
 config USB_OXU210HP_HCD
        tristate "OXU210HP HCD support"
        depends on USB
@@ -153,6 +159,18 @@ config USB_ISP1760_HCD
          To compile this driver as a module, choose M here: the
          module will be called isp1760.
 
+config USB_ISP1362_HCD
+       tristate "ISP1362 HCD support"
+       depends on USB
+       default N
+       ---help---
+         Supports the Philips ISP1362 chip as a host controller
+
+         This driver does not support isochronous transfers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called isp1362-hcd.
+
 config USB_OHCI_HCD
        tristate "OHCI HCD support"
        depends on USB && USB_ARCH_HAS_OHCI
index 289d748..f58b249 100644 (file)
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCI)             += pci-quirks.o
 obj-$(CONFIG_USB_EHCI_HCD)     += ehci-hcd.o
 obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
 obj-$(CONFIG_USB_ISP116X_HCD)  += isp116x-hcd.o
+obj-$(CONFIG_USB_ISP1362_HCD)  += isp1362-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)     += ohci-hcd.o
 obj-$(CONFIG_USB_UHCI_HCD)     += uhci-hcd.o
 obj-$(CONFIG_USB_FHCI_HCD)     += fhci.o
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
new file mode 100644 (file)
index 0000000..87c1b7c
--- /dev/null
@@ -0,0 +1,230 @@
+/*
+ * Driver for EHCI UHP on Atmel chips
+ *
+ *  Copyright (C) 2009 Atmel Corporation,
+ *                     Nicolas Ferre <nicolas.ferre@atmel.com>
+ *
+ *  Based on various ehci-*.c drivers
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive for
+ * more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+
+/* interface and function clocks */
+static struct clk *iclk, *fclk;
+static int clocked;
+
+/*-------------------------------------------------------------------------*/
+
+static void atmel_start_clock(void)
+{
+       clk_enable(iclk);
+       clk_enable(fclk);
+       clocked = 1;
+}
+
+static void atmel_stop_clock(void)
+{
+       clk_disable(fclk);
+       clk_disable(iclk);
+       clocked = 0;
+}
+
+static void atmel_start_ehci(struct platform_device *pdev)
+{
+       dev_dbg(&pdev->dev, "start\n");
+       atmel_start_clock();
+}
+
+static void atmel_stop_ehci(struct platform_device *pdev)
+{
+       dev_dbg(&pdev->dev, "stop\n");
+       atmel_stop_clock();
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int ehci_atmel_setup(struct usb_hcd *hcd)
+{
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       int retval = 0;
+
+       /* registers start at offset 0x0 */
+       ehci->caps = hcd->regs;
+       ehci->regs = hcd->regs +
+               HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+       dbg_hcs_params(ehci, "reset");
+       dbg_hcc_params(ehci, "reset");
+
+       /* cache this readonly data; minimize chip reads */
+       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+
+       retval = ehci_halt(ehci);
+       if (retval)
+               return retval;
+
+       /* data structure init */
+       retval = ehci_init(hcd);
+       if (retval)
+               return retval;
+
+       ehci->sbrn = 0x20;
+
+       ehci_reset(ehci);
+       ehci_port_power(ehci, 0);
+
+       return retval;
+}
+
+static const struct hc_driver ehci_atmel_hc_driver = {
+       .description            = hcd_name,
+       .product_desc           = "Atmel EHCI UHP HS",
+       .hcd_priv_size          = sizeof(struct ehci_hcd),
+
+       /* generic hardware linkage */
+       .irq                    = ehci_irq,
+       .flags                  = HCD_MEMORY | HCD_USB2,
+
+       /* basic lifecycle operations */
+       .reset                  = ehci_atmel_setup,
+       .start                  = ehci_run,
+       .stop                   = ehci_stop,
+       .shutdown               = ehci_shutdown,
+
+       /* managing i/o requests and associated device resources */
+       .urb_enqueue            = ehci_urb_enqueue,
+       .urb_dequeue            = ehci_urb_dequeue,
+       .endpoint_disable       = ehci_endpoint_disable,
+
+       /* scheduling support */
+       .get_frame_number       = ehci_get_frame,
+
+       /* root hub support */
+       .hub_status_data        = ehci_hub_status_data,
+       .hub_control            = ehci_hub_control,
+       .bus_suspend            = ehci_bus_suspend,
+       .bus_resume             = ehci_bus_resume,
+       .relinquish_port        = ehci_relinquish_port,
+       .port_handed_over       = ehci_port_handed_over,
+};
+
+static int __init ehci_atmel_drv_probe(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd;
+       const struct hc_driver *driver = &ehci_atmel_hc_driver;
+       struct resource *res;
+       int irq;
+       int retval;
+
+       if (usb_disabled())
+               return -ENODEV;
+
+       pr_debug("Initializing Atmel-SoC USB Host Controller\n");
+
+       irq = platform_get_irq(pdev, 0);
+       if (irq <= 0) {
+               dev_err(&pdev->dev,
+                       "Found HC with no IRQ. Check %s setup!\n",
+                       dev_name(&pdev->dev));
+               retval = -ENODEV;
+               goto fail_create_hcd;
+       }
+
+       hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+       if (!hcd) {
+               retval = -ENOMEM;
+               goto fail_create_hcd;
+       }
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&pdev->dev,
+                       "Found HC with no register addr. Check %s setup!\n",
+                       dev_name(&pdev->dev));
+               retval = -ENODEV;
+               goto fail_request_resource;
+       }
+       hcd->rsrc_start = res->start;
+       hcd->rsrc_len = res->end - res->start + 1;
+
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                               driver->description)) {
+               dev_dbg(&pdev->dev, "controller already in use\n");
+               retval = -EBUSY;
+               goto fail_request_resource;
+       }
+
+       hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+       if (hcd->regs == NULL) {
+               dev_dbg(&pdev->dev, "error mapping memory\n");
+               retval = -EFAULT;
+               goto fail_ioremap;
+       }
+
+       iclk = clk_get(&pdev->dev, "ehci_clk");
+       if (IS_ERR(iclk)) {
+               dev_err(&pdev->dev, "Error getting interface clock\n");
+               retval = -ENOENT;
+               goto fail_get_iclk;
+       }
+       fclk = clk_get(&pdev->dev, "uhpck");
+       if (IS_ERR(fclk)) {
+               dev_err(&pdev->dev, "Error getting function clock\n");
+               retval = -ENOENT;
+               goto fail_get_fclk;
+       }
+
+       atmel_start_ehci(pdev);
+
+       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
+       if (retval)
+               goto fail_add_hcd;
+
+       return retval;
+
+fail_add_hcd:
+       atmel_stop_ehci(pdev);
+       clk_put(fclk);
+fail_get_fclk:
+       clk_put(iclk);
+fail_get_iclk:
+       iounmap(hcd->regs);
+fail_ioremap:
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+fail_request_resource:
+       usb_put_hcd(hcd);
+fail_create_hcd:
+       dev_err(&pdev->dev, "init %s fail, %d\n",
+               dev_name(&pdev->dev), retval);
+
+       return retval;
+}
+
+static int __exit ehci_atmel_drv_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+       ehci_shutdown(hcd);
+       usb_remove_hcd(hcd);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
+
+       atmel_stop_ehci(pdev);
+       clk_put(fclk);
+       clk_put(iclk);
+       fclk = iclk = NULL;
+
+       return 0;
+}
+
+static struct platform_driver ehci_atmel_driver = {
+       .probe          = ehci_atmel_drv_probe,
+       .remove         = __exit_p(ehci_atmel_drv_remove),
+       .shutdown       = usb_hcd_platform_shutdown,
+       .driver.name    = "atmel-ehci",
+};
index 59d208d..ed77be7 100644 (file)
@@ -199,10 +199,9 @@ static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int ehci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
-                                       pm_message_t message)
+static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
 {
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
        unsigned long flags;
        int rc;
@@ -229,12 +228,6 @@ static int ehci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
        ehci_writel(ehci, 0, &ehci->regs->intr_enable);
        (void)ehci_readl(ehci, &ehci->regs->intr_enable);
 
-       /* make sure snapshot being resumed re-enumerates everything */
-       if (message.event == PM_EVENT_PRETHAW) {
-               ehci_halt(ehci);
-               ehci_reset(ehci);
-       }
-
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 
        au1xxx_stop_ehc();
@@ -248,10 +241,9 @@ bail:
        return rc;
 }
 
-
-static int ehci_hcd_au1xxx_drv_resume(struct platform_device *pdev)
+static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
 {
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
        au1xxx_start_ehc();
@@ -305,20 +297,25 @@ static int ehci_hcd_au1xxx_drv_resume(struct platform_device *pdev)
        return 0;
 }
 
+static struct dev_pm_ops au1xxx_ehci_pmops = {
+       .suspend        = ehci_hcd_au1xxx_drv_suspend,
+       .resume         = ehci_hcd_au1xxx_drv_resume,
+};
+
+#define AU1XXX_EHCI_PMOPS &au1xxx_ehci_pmops
+
 #else
-#define ehci_hcd_au1xxx_drv_suspend NULL
-#define ehci_hcd_au1xxx_drv_resume NULL
+#define AU1XXX_EHCI_PMOPS NULL
 #endif
 
 static struct platform_driver ehci_hcd_au1xxx_driver = {
        .probe          = ehci_hcd_au1xxx_drv_probe,
        .remove         = ehci_hcd_au1xxx_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-       .suspend        = ehci_hcd_au1xxx_drv_suspend,
-       .resume         = ehci_hcd_au1xxx_drv_resume,
        .driver = {
                .name   = "au1xxx-ehci",
                .owner  = THIS_MODULE,
+               .pm     = AU1XXX_EHCI_PMOPS,
        }
 };
 
index 7f4ace7..874d200 100644 (file)
@@ -134,10 +134,11 @@ dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd)
 static void __maybe_unused
 dbg_qh (const char *label, struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
+       struct ehci_qh_hw *hw = qh->hw;
+
        ehci_dbg (ehci, "%s qh %p n%08x info %x %x qtd %x\n", label,
-               qh, qh->hw_next, qh->hw_info1, qh->hw_info2,
-               qh->hw_current);
-       dbg_qtd ("overlay", ehci, (struct ehci_qtd *) &qh->hw_qtd_next);
+               qh, hw->hw_next, hw->hw_info1, hw->hw_info2, hw->hw_current);
+       dbg_qtd("overlay", ehci, (struct ehci_qtd *) &hw->hw_qtd_next);
 }
 
 static void __maybe_unused
@@ -400,31 +401,32 @@ static void qh_lines (
        char                    *next = *nextp;
        char                    mark;
        __le32                  list_end = EHCI_LIST_END(ehci);
+       struct ehci_qh_hw       *hw = qh->hw;
 
-       if (qh->hw_qtd_next == list_end)        /* NEC does this */
+       if (hw->hw_qtd_next == list_end)        /* NEC does this */
                mark = '@';
        else
-               mark = token_mark(ehci, qh->hw_token);
+               mark = token_mark(ehci, hw->hw_token);
        if (mark == '/') {      /* qh_alt_next controls qh advance? */
-               if ((qh->hw_alt_next & QTD_MASK(ehci))
-                               == ehci->async->hw_alt_next)
+               if ((hw->hw_alt_next & QTD_MASK(ehci))
+                               == ehci->async->hw->hw_alt_next)
                        mark = '#';     /* blocked */
-               else if (qh->hw_alt_next == list_end)
+               else if (hw->hw_alt_next == list_end)
                        mark = '.';     /* use hw_qtd_next */
                /* else alt_next points to some other qtd */
        }
-       scratch = hc32_to_cpup(ehci, &qh->hw_info1);
-       hw_curr = (mark == '*') ? hc32_to_cpup(ehci, &qh->hw_current) : 0;
+       scratch = hc32_to_cpup(ehci, &hw->hw_info1);
+       hw_curr = (mark == '*') ? hc32_to_cpup(ehci, &hw->hw_current) : 0;
        temp = scnprintf (next, size,
                        "qh/%p dev%d %cs ep%d %08x %08x (%08x%c %s nak%d)",
                        qh, scratch & 0x007f,
                        speed_char (scratch),
                        (scratch >> 8) & 0x000f,
-                       scratch, hc32_to_cpup(ehci, &qh->hw_info2),
-                       hc32_to_cpup(ehci, &qh->hw_token), mark,
-                       (cpu_to_hc32(ehci, QTD_TOGGLE) & qh->hw_token)
+                       scratch, hc32_to_cpup(ehci, &hw->hw_info2),
+                       hc32_to_cpup(ehci, &hw->hw_token), mark,
+                       (cpu_to_hc32(ehci, QTD_TOGGLE) & hw->hw_token)
                                ? "data1" : "data0",
-                       (hc32_to_cpup(ehci, &qh->hw_alt_next) >> 1) & 0x0f);
+                       (hc32_to_cpup(ehci, &hw->hw_alt_next) >> 1) & 0x0f);
        size -= temp;
        next += temp;
 
@@ -435,10 +437,10 @@ static void qh_lines (
                mark = ' ';
                if (hw_curr == td->qtd_dma)
                        mark = '*';
-               else if (qh->hw_qtd_next == cpu_to_hc32(ehci, td->qtd_dma))
+               else if (hw->hw_qtd_next == cpu_to_hc32(ehci, td->qtd_dma))
                        mark = '+';
                else if (QTD_LENGTH (scratch)) {
-                       if (td->hw_alt_next == ehci->async->hw_alt_next)
+                       if (td->hw_alt_next == ehci->async->hw->hw_alt_next)
                                mark = '#';
                        else if (td->hw_alt_next != list_end)
                                mark = '/';
@@ -550,12 +552,15 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
                next += temp;
 
                do {
+                       struct ehci_qh_hw *hw;
+
                        switch (hc32_to_cpu(ehci, tag)) {
                        case Q_TYPE_QH:
+                               hw = p.qh->hw;
                                temp = scnprintf (next, size, " qh%d-%04x/%p",
                                                p.qh->period,
                                                hc32_to_cpup(ehci,
-                                                               &p.qh->hw_info2)
+                                                       &hw->hw_info2)
                                                        /* uframe masks */
                                                        & (QH_CMASK | QH_SMASK),
                                                p.qh);
@@ -576,7 +581,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
                                /* show more info the first time around */
                                if (temp == seen_count) {
                                        u32     scratch = hc32_to_cpup(ehci,
-                                                       &p.qh->hw_info1);
+                                                       &hw->hw_info1);
                                        struct ehci_qtd *qtd;
                                        char            *type = "";
 
@@ -609,7 +614,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
                                } else
                                        temp = 0;
                                if (p.qh) {
-                                       tag = Q_NEXT_TYPE(ehci, p.qh->hw_next);
+                                       tag = Q_NEXT_TYPE(ehci, hw->hw_next);
                                        p = p.qh->qh_next;
                                }
                                break;
@@ -879,8 +884,7 @@ static int debug_close(struct inode *inode, struct file *file)
        struct debug_buffer *buf = file->private_data;
 
        if (buf) {
-               if (buf->output_buf)
-                       vfree(buf->output_buf);
+               vfree(buf->output_buf);
                kfree(buf);
        }
 
index 11c627c..9835e07 100644 (file)
@@ -30,7 +30,6 @@
 #include <linux/timer.h>
 #include <linux/list.h>
 #include <linux/interrupt.h>
-#include <linux/reboot.h>
 #include <linux/usb.h>
 #include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
@@ -127,6 +126,8 @@ timer_action(struct ehci_hcd *ehci, enum ehci_timer_action action)
 
                switch (action) {
                case TIMER_IO_WATCHDOG:
+                       if (!ehci->need_io_watchdog)
+                               return;
                        t = EHCI_IO_JIFFIES;
                        break;
                case TIMER_ASYNC_OFF:
@@ -239,6 +240,11 @@ static int ehci_reset (struct ehci_hcd *ehci)
        int     retval;
        u32     command = ehci_readl(ehci, &ehci->regs->command);
 
+       /* If the EHCI debug controller is active, special care must be
+        * taken before and after a host controller reset */
+       if (ehci->debug && !dbgp_reset_prep())
+               ehci->debug = NULL;
+
        command |= CMD_RESET;
        dbg_cmd (ehci, "reset", command);
        ehci_writel(ehci, command, &ehci->regs->command);
@@ -247,12 +253,21 @@ static int ehci_reset (struct ehci_hcd *ehci)
        retval = handshake (ehci, &ehci->regs->command,
                            CMD_RESET, 0, 250 * 1000);
 
+       if (ehci->has_hostpc) {
+               ehci_writel(ehci, USBMODE_EX_HC | USBMODE_EX_VBPS,
+                       (u32 __iomem *)(((u8 *)ehci->regs) + USBMODE_EX));
+               ehci_writel(ehci, TXFIFO_DEFAULT,
+                       (u32 __iomem *)(((u8 *)ehci->regs) + TXFILLTUNING));
+       }
        if (retval)
                return retval;
 
        if (ehci_is_TDI(ehci))
                tdi_reset (ehci);
 
+       if (ehci->debug)
+               dbgp_external_startup();
+
        return retval;
 }
 
@@ -505,9 +520,14 @@ static int ehci_init(struct usb_hcd *hcd)
        u32                     temp;
        int                     retval;
        u32                     hcc_params;
+       struct ehci_qh_hw       *hw;
 
        spin_lock_init(&ehci->lock);
 
+       /*
+        * keep io watchdog by default, those good HCDs could turn off it later
+        */
+       ehci->need_io_watchdog = 1;
        init_timer(&ehci->watchdog);
        ehci->watchdog.function = ehci_watchdog;
        ehci->watchdog.data = (unsigned long) ehci;
@@ -544,12 +564,13 @@ static int ehci_init(struct usb_hcd *hcd)
         * from automatically advancing to the next td after short reads.
         */
        ehci->async->qh_next.qh = NULL;
-       ehci->async->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
-       ehci->async->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
-       ehci->async->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
-       ehci->async->hw_qtd_next = EHCI_LIST_END(ehci);
+       hw = ehci->async->hw;
+       hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
+       hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
+       hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
+       hw->hw_qtd_next = EHCI_LIST_END(ehci);
        ehci->async->qh_state = QH_STATE_LINKED;
-       ehci->async->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma);
+       hw->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma);
 
        /* clear interrupt enables, set irq latency */
        if (log2_irq_thresh < 0 || log2_irq_thresh > 6)
@@ -850,12 +871,18 @@ static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
        if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state) && ehci->reclaim)
                end_unlink_async(ehci);
 
-       /* if it's not linked then there's nothing to do */
-       if (qh->qh_state != QH_STATE_LINKED)
-               ;
+       /* If the QH isn't linked then there's nothing we can do
+        * unless we were called during a giveback, in which case
+        * qh_completions() has to deal with it.
+        */
+       if (qh->qh_state != QH_STATE_LINKED) {
+               if (qh->qh_state == QH_STATE_COMPLETING)
+                       qh->needs_rescan = 1;
+               return;
+       }
 
        /* defer till later if busy */
-       else if (ehci->reclaim) {
+       if (ehci->reclaim) {
                struct ehci_qh          *last;
 
                for (last = ehci->reclaim;
@@ -915,8 +942,9 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                        break;
                switch (qh->qh_state) {
                case QH_STATE_LINKED:
+               case QH_STATE_COMPLETING:
                        intr_deschedule (ehci, qh);
-                       /* FALL THROUGH */
+                       break;
                case QH_STATE_IDLE:
                        qh_completions (ehci, qh);
                        break;
@@ -925,23 +953,6 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                                        qh, qh->qh_state);
                        goto done;
                }
-
-               /* reschedule QH iff another request is queued */
-               if (!list_empty (&qh->qtd_list)
-                               && HC_IS_RUNNING (hcd->state)) {
-                       rc = qh_schedule(ehci, qh);
-
-                       /* An error here likely indicates handshake failure
-                        * or no space left in the schedule.  Neither fault
-                        * should happen often ...
-                        *
-                        * FIXME kill the now-dysfunctional queued urbs
-                        */
-                       if (rc != 0)
-                               ehci_err(ehci,
-                                       "can't reschedule qh %p, err %d",
-                                       qh, rc);
-               }
                break;
 
        case PIPE_ISOCHRONOUS:
@@ -979,7 +990,7 @@ rescan:
        /* endpoints can be iso streams.  for now, we don't
         * accelerate iso completions ... so spin a while.
         */
-       if (qh->hw_info1 == 0) {
+       if (qh->hw->hw_info1 == 0) {
                ehci_vdbg (ehci, "iso delay\n");
                goto idle_timeout;
        }
@@ -988,6 +999,7 @@ rescan:
                qh->qh_state = QH_STATE_IDLE;
        switch (qh->qh_state) {
        case QH_STATE_LINKED:
+       case QH_STATE_COMPLETING:
                for (tmp = ehci->async->qh_next.qh;
                                tmp && tmp != qh;
                                tmp = tmp->qh_next.qh)
@@ -1052,18 +1064,17 @@ ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
                usb_settoggle(qh->dev, epnum, is_out, 0);
                if (!list_empty(&qh->qtd_list)) {
                        WARN_ONCE(1, "clear_halt for a busy endpoint\n");
-               } else if (qh->qh_state == QH_STATE_LINKED) {
+               } else if (qh->qh_state == QH_STATE_LINKED ||
+                               qh->qh_state == QH_STATE_COMPLETING) {
 
                        /* The toggle value in the QH can't be updated
                         * while the QH is active.  Unlink it now;
                         * re-linking will call qh_refresh().
                         */
-                       if (eptype == USB_ENDPOINT_XFER_BULK) {
+                       if (eptype == USB_ENDPOINT_XFER_BULK)
                                unlink_async(ehci, qh);
-                       } else {
+                       else
                                intr_deschedule(ehci, qh);
-                               (void) qh_schedule(ehci, qh);
-                       }
                }
        }
        spin_unlock_irqrestore(&ehci->lock, flags);
@@ -1117,6 +1128,16 @@ MODULE_LICENSE ("GPL");
 #define        PLATFORM_DRIVER         ixp4xx_ehci_driver
 #endif
 
+#ifdef CONFIG_USB_W90X900_EHCI
+#include "ehci-w90x900.c"
+#define        PLATFORM_DRIVER         ehci_hcd_w90x900_driver
+#endif
+
+#ifdef CONFIG_ARCH_AT91
+#include "ehci-atmel.c"
+#define        PLATFORM_DRIVER         ehci_atmel_driver
+#endif
+
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
 #error "missing bus glue for ehci-hcd"
index f46ad27..1b6f1c0 100644 (file)
@@ -111,6 +111,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
        int                     port;
        int                     mask;
+       u32 __iomem             *hostpc_reg = NULL;
 
        ehci_dbg(ehci, "suspend root hub\n");
 
@@ -142,6 +143,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                u32             t1 = ehci_readl(ehci, reg) & ~PORT_RWC_BITS;
                u32             t2 = t1;
 
+               if (ehci->has_hostpc)
+                       hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
+                               + HOSTPC0 + 4 * (port & 0xff));
                /* keep track of which ports we suspend */
                if (t1 & PORT_OWNER)
                        set_bit(port, &ehci->owned_ports);
@@ -151,15 +155,37 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                }
 
                /* enable remote wakeup on all ports */
-               if (hcd->self.root_hub->do_remote_wakeup)
-                       t2 |= PORT_WAKE_BITS;
-               else
+               if (hcd->self.root_hub->do_remote_wakeup) {
+                       /* only enable appropriate wake bits, otherwise the
+                        * hardware can not go phy low power mode. If a race
+                        * condition happens here(connection change during bits
+                        * set), the port change detection will finally fix it.
+                        */
+                       if (t1 & PORT_CONNECT) {
+                               t2 |= PORT_WKOC_E | PORT_WKDISC_E;
+                               t2 &= ~PORT_WKCONN_E;
+                       } else {
+                               t2 |= PORT_WKOC_E | PORT_WKCONN_E;
+                               t2 &= ~PORT_WKDISC_E;
+                       }
+               } else
                        t2 &= ~PORT_WAKE_BITS;
 
                if (t1 != t2) {
                        ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
                                port + 1, t1, t2);
                        ehci_writel(ehci, t2, reg);
+                       if (hostpc_reg) {
+                               u32     t3;
+
+                               msleep(5);/* 5ms for HCD enter low pwr mode */
+                               t3 = ehci_readl(ehci, hostpc_reg);
+                               ehci_writel(ehci, t3 | HOSTPC_PHCD, hostpc_reg);
+                               t3 = ehci_readl(ehci, hostpc_reg);
+                               ehci_dbg(ehci, "Port%d phy low pwr mode %s\n",
+                                       port, (t3 & HOSTPC_PHCD) ?
+                                       "succeeded" : "failed");
+                       }
                }
        }
 
@@ -183,6 +209,11 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 
        ehci->next_statechange = jiffies + msecs_to_jiffies(10);
        spin_unlock_irq (&ehci->lock);
+
+       /* ehci_work() may have re-enabled the watchdog timer, which we do not
+        * want, and so we must delete any pending watchdog timer events.
+        */
+       del_timer_sync(&ehci->watchdog);
        return 0;
 }
 
@@ -204,6 +235,13 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
                return -ESHUTDOWN;
        }
 
+       if (unlikely(ehci->debug)) {
+               if (ehci->debug && !dbgp_reset_prep())
+                       ehci->debug = NULL;
+               else
+                       dbgp_external_startup();
+       }
+
        /* Ideally and we've got a real resume here, and no port's power
         * was lost.  (For PCI, that means Vaux was maintained.)  But we
         * could instead be restoring a swsusp snapshot -- so that BIOS was
@@ -563,7 +601,8 @@ static int ehci_hub_control (
        int             ports = HCS_N_PORTS (ehci->hcs_params);
        u32 __iomem     *status_reg = &ehci->regs->port_status[
                                (wIndex & 0xff) - 1];
-       u32             temp, status;
+       u32 __iomem     *hostpc_reg = NULL;
+       u32             temp, temp1, status;
        unsigned long   flags;
        int             retval = 0;
        unsigned        selector;
@@ -575,6 +614,9 @@ static int ehci_hub_control (
         * power, "this is the one", etc.  EHCI spec supports this.
         */
 
+       if (ehci->has_hostpc)
+               hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
+                               + HOSTPC0 + 4 * ((wIndex & 0xff) - 1));
        spin_lock_irqsave (&ehci->lock, flags);
        switch (typeReq) {
        case ClearHubFeature:
@@ -773,7 +815,11 @@ static int ehci_hub_control (
                if (temp & PORT_CONNECT) {
                        status |= 1 << USB_PORT_FEAT_CONNECTION;
                        // status may be from integrated TT
-                       status |= ehci_port_speed(ehci, temp);
+                       if (ehci->has_hostpc) {
+                               temp1 = ehci_readl(ehci, hostpc_reg);
+                               status |= ehci_port_speed(ehci, temp1);
+                       } else
+                               status |= ehci_port_speed(ehci, temp);
                }
                if (temp & PORT_PE)
                        status |= 1 << USB_PORT_FEAT_ENABLE;
@@ -816,6 +862,15 @@ static int ehci_hub_control (
        case SetPortFeature:
                selector = wIndex >> 8;
                wIndex &= 0xff;
+               if (unlikely(ehci->debug)) {
+                       /* If the debug port is active any port
+                        * feature requests should get denied */
+                       if (wIndex == HCS_DEBUG_PORT(ehci->hcs_params) &&
+                           (readl(&ehci->debug->control) & DBGP_ENABLED)) {
+                               retval = -ENODEV;
+                               goto error_exit;
+                       }
+               }
                if (!wIndex || wIndex > ports)
                        goto error;
                wIndex--;
@@ -832,6 +887,24 @@ static int ehci_hub_control (
                                        || (temp & PORT_RESET) != 0)
                                goto error;
                        ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
+                       /* After above check the port must be connected.
+                        * Set appropriate bit thus could put phy into low power
+                        * mode if we have hostpc feature
+                        */
+                       if (hostpc_reg) {
+                               temp &= ~PORT_WKCONN_E;
+                               temp |= (PORT_WKDISC_E | PORT_WKOC_E);
+                               ehci_writel(ehci, temp | PORT_SUSPEND,
+                                                       status_reg);
+                               msleep(5);/* 5ms for HCD enter low pwr mode */
+                               temp1 = ehci_readl(ehci, hostpc_reg);
+                               ehci_writel(ehci, temp1 | HOSTPC_PHCD,
+                                       hostpc_reg);
+                               temp1 = ehci_readl(ehci, hostpc_reg);
+                               ehci_dbg(ehci, "Port%d phy low pwr mode %s\n",
+                                       wIndex, (temp1 & HOSTPC_PHCD) ?
+                                       "succeeded" : "failed");
+                       }
                        set_bit(wIndex, &ehci->suspended_ports);
                        break;
                case USB_PORT_FEAT_POWER:
@@ -894,6 +967,7 @@ error:
                /* "stall" on error */
                retval = -EPIPE;
        }
+error_exit:
        spin_unlock_irqrestore (&ehci->lock, flags);
        return retval;
 }
index 10d5291..aeda96e 100644 (file)
@@ -75,7 +75,8 @@ static void qh_destroy(struct ehci_qh *qh)
        }
        if (qh->dummy)
                ehci_qtd_free (ehci, qh->dummy);
-       dma_pool_free (ehci->qh_pool, qh, qh->qh_dma);
+       dma_pool_free(ehci->qh_pool, qh->hw, qh->qh_dma);
+       kfree(qh);
 }
 
 static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
@@ -83,12 +84,14 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
        struct ehci_qh          *qh;
        dma_addr_t              dma;
 
-       qh = (struct ehci_qh *)
-               dma_pool_alloc (ehci->qh_pool, flags, &dma);
+       qh = kzalloc(sizeof *qh, GFP_ATOMIC);
        if (!qh)
-               return qh;
-
-       memset (qh, 0, sizeof *qh);
+               goto done;
+       qh->hw = (struct ehci_qh_hw *)
+               dma_pool_alloc(ehci->qh_pool, flags, &dma);
+       if (!qh->hw)
+               goto fail;
+       memset(qh->hw, 0, sizeof *qh->hw);
        qh->refcount = 1;
        qh->ehci = ehci;
        qh->qh_dma = dma;
@@ -99,10 +102,15 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
        qh->dummy = ehci_qtd_alloc (ehci, flags);
        if (qh->dummy == NULL) {
                ehci_dbg (ehci, "no dummy td\n");
-               dma_pool_free (ehci->qh_pool, qh, qh->qh_dma);
-               qh = NULL;
+               goto fail1;
        }
+done:
        return qh;
+fail1:
+       dma_pool_free(ehci->qh_pool, qh->hw, qh->qh_dma);
+fail:
+       kfree(qh);
+       return NULL;
 }
 
 /* to share a qh (cpu threads, or hc) */
@@ -180,7 +188,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
        /* QHs for control/bulk/intr transfers */
        ehci->qh_pool = dma_pool_create ("ehci_qh",
                        ehci_to_hcd(ehci)->self.controller,
-                       sizeof (struct ehci_qh),
+                       sizeof(struct ehci_qh_hw),
                        32 /* byte alignment (for hw parts) */,
                        4096 /* can't cross 4K */);
        if (!ehci->qh_pool) {
index c2f1b7d..378861b 100644 (file)
 /* called after powerup, by probe or system-pm "wakeup" */
 static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
 {
-       u32                     temp;
        int                     retval;
 
-       /* optional debug port, normally in the first BAR */
-       temp = pci_find_capability(pdev, 0x0a);
-       if (temp) {
-               pci_read_config_dword(pdev, temp, &temp);
-               temp >>= 16;
-               if ((temp & (3 << 13)) == (1 << 13)) {
-                       temp &= 0x1fff;
-                       ehci->debug = ehci_to_hcd(ehci)->regs + temp;
-                       temp = ehci_readl(ehci, &ehci->debug->control);
-                       ehci_info(ehci, "debug port %d%s\n",
-                               HCS_DEBUG_PORT(ehci->hcs_params),
-                               (temp & DBGP_ENABLED)
-                                       ? " IN USE"
-                                       : "");
-                       if (!(temp & DBGP_ENABLED))
-                               ehci->debug = NULL;
-               }
-       }
-
        /* we expect static quirk code to handle the "extended capabilities"
         * (currently just BIOS handoff) allowed starting with EHCI 0.96
         */
@@ -129,6 +109,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                return retval;
 
        switch (pdev->vendor) {
+       case PCI_VENDOR_ID_INTEL:
+               ehci->need_io_watchdog = 0;
+               break;
        case PCI_VENDOR_ID_TDI:
                if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
                        hcd->has_tt = 1;
@@ -192,6 +175,25 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                break;
        }
 
+       /* optional debug port, normally in the first BAR */
+       temp = pci_find_capability(pdev, 0x0a);
+       if (temp) {
+               pci_read_config_dword(pdev, temp, &temp);
+               temp >>= 16;
+               if ((temp & (3 << 13)) == (1 << 13)) {
+                       temp &= 0x1fff;
+                       ehci->debug = ehci_to_hcd(ehci)->regs + temp;
+                       temp = ehci_readl(ehci, &ehci->debug->control);
+                       ehci_info(ehci, "debug port %d%s\n",
+                               HCS_DEBUG_PORT(ehci->hcs_params),
+                               (temp & DBGP_ENABLED)
+                                       ? " IN USE"
+                                       : "");
+                       if (!(temp & DBGP_ENABLED))
+                               ehci->debug = NULL;
+               }
+       }
+
        ehci_reset(ehci);
 
        /* at least the Genesys GL880S needs fixup here */
@@ -242,7 +244,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
         * System suspend currently expects to be able to suspend the entire
         * device tree, device-at-a-time.  If we failed selective suspend
         * reports, system suspend would fail; so the root hub code must claim
-        * success.  That's lying to usbcore, and it matters for for runtime
+        * success.  That's lying to usbcore, and it matters for runtime
         * PM scenarios with selective suspend and remote wakeup...
         */
        if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev))
index 7673554..00ad9ce 100644 (file)
@@ -87,31 +87,33 @@ qtd_fill(struct ehci_hcd *ehci, struct ehci_qtd *qtd, dma_addr_t buf,
 static inline void
 qh_update (struct ehci_hcd *ehci, struct ehci_qh *qh, struct ehci_qtd *qtd)
 {
+       struct ehci_qh_hw *hw = qh->hw;
+
        /* writes to an active overlay are unsafe */
        BUG_ON(qh->qh_state != QH_STATE_IDLE);
 
-       qh->hw_qtd_next = QTD_NEXT(ehci, qtd->qtd_dma);
-       qh->hw_alt_next = EHCI_LIST_END(ehci);
+       hw->hw_qtd_next = QTD_NEXT(ehci, qtd->qtd_dma);
+       hw->hw_alt_next = EHCI_LIST_END(ehci);
 
        /* Except for control endpoints, we make hardware maintain data
         * toggle (like OHCI) ... here (re)initialize the toggle in the QH,
         * and set the pseudo-toggle in udev. Only usb_clear_halt() will
         * ever clear it.
         */
-       if (!(qh->hw_info1 & cpu_to_hc32(ehci, 1 << 14))) {
+       if (!(hw->hw_info1 & cpu_to_hc32(ehci, 1 << 14))) {
                unsigned        is_out, epnum;
 
                is_out = !(qtd->hw_token & cpu_to_hc32(ehci, 1 << 8));
-               epnum = (hc32_to_cpup(ehci, &qh->hw_info1) >> 8) & 0x0f;
+               epnum = (hc32_to_cpup(ehci, &hw->hw_info1) >> 8) & 0x0f;
                if (unlikely (!usb_gettoggle (qh->dev, epnum, is_out))) {
-                       qh->hw_token &= ~cpu_to_hc32(ehci, QTD_TOGGLE);
+                       hw->hw_token &= ~cpu_to_hc32(ehci, QTD_TOGGLE);
                        usb_settoggle (qh->dev, epnum, is_out, 1);
                }
        }
 
        /* HC must see latest qtd and qh data before we clear ACTIVE+HALT */
        wmb ();
-       qh->hw_token &= cpu_to_hc32(ehci, QTD_TOGGLE | QTD_STS_PING);
+       hw->hw_token &= cpu_to_hc32(ehci, QTD_TOGGLE | QTD_STS_PING);
 }
 
 /* if it weren't for a common silicon quirk (writing the dummy into the qh
@@ -129,7 +131,7 @@ qh_refresh (struct ehci_hcd *ehci, struct ehci_qh *qh)
                qtd = list_entry (qh->qtd_list.next,
                                struct ehci_qtd, qtd_list);
                /* first qtd may already be partially processed */
-               if (cpu_to_hc32(ehci, qtd->qtd_dma) == qh->hw_current)
+               if (cpu_to_hc32(ehci, qtd->qtd_dma) == qh->hw->hw_current)
                        qtd = NULL;
        }
 
@@ -260,7 +262,7 @@ __acquires(ehci->lock)
                struct ehci_qh  *qh = (struct ehci_qh *) urb->hcpriv;
 
                /* S-mask in a QH means it's an interrupt urb */
-               if ((qh->hw_info2 & cpu_to_hc32(ehci, QH_SMASK)) != 0) {
+               if ((qh->hw->hw_info2 & cpu_to_hc32(ehci, QH_SMASK)) != 0) {
 
                        /* ... update hc-wide periodic stats (for usbfs) */
                        ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
@@ -297,7 +299,6 @@ __acquires(ehci->lock)
 static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh);
 static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh);
 
-static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
 static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
 
 /*
@@ -308,13 +309,14 @@ static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
 static unsigned
 qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
-       struct ehci_qtd         *last = NULL, *end = qh->dummy;
+       struct ehci_qtd         *last, *end = qh->dummy;
        struct list_head        *entry, *tmp;
-       int                     last_status = -EINPROGRESS;
+       int                     last_status;
        int                     stopped;
        unsigned                count = 0;
        u8                      state;
-       __le32                  halt = HALT_BIT(ehci);
+       const __le32            halt = HALT_BIT(ehci);
+       struct ehci_qh_hw       *hw = qh->hw;
 
        if (unlikely (list_empty (&qh->qtd_list)))
                return count;
@@ -324,11 +326,20 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
         * they add urbs to this qh's queue or mark them for unlinking.
         *
         * NOTE:  unlinking expects to be done in queue order.
+        *
+        * It's a bug for qh->qh_state to be anything other than
+        * QH_STATE_IDLE, unless our caller is scan_async() or
+        * scan_periodic().
         */
        state = qh->qh_state;
        qh->qh_state = QH_STATE_COMPLETING;
        stopped = (state == QH_STATE_IDLE);
 
+ rescan:
+       last = NULL;
+       last_status = -EINPROGRESS;
+       qh->needs_rescan = 0;
+
        /* remove de-activated QTDs from front of queue.
         * after faults (including short reads), cleanup this urb
         * then let the queue advance.
@@ -392,7 +403,8 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
                                        qtd->hw_token = cpu_to_hc32(ehci,
                                                        token);
                                        wmb();
-                                       qh->hw_token = cpu_to_hc32(ehci, token);
+                                       hw->hw_token = cpu_to_hc32(ehci,
+                                                       token);
                                        goto retry_xacterr;
                                }
                                stopped = 1;
@@ -435,8 +447,8 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
                        /* qh unlinked; token in overlay may be most current */
                        if (state == QH_STATE_IDLE
                                        && cpu_to_hc32(ehci, qtd->qtd_dma)
-                                               == qh->hw_current) {
-                               token = hc32_to_cpu(ehci, qh->hw_token);
+                                               == hw->hw_current) {
+                               token = hc32_to_cpu(ehci, hw->hw_token);
 
                                /* An unlink may leave an incomplete
                                 * async transaction in the TT buffer.
@@ -449,9 +461,9 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
                         * patch the qh later and so that completions can't
                         * activate it while we "know" it's stopped.
                         */
-                       if ((halt & qh->hw_token) == 0) {
+                       if ((halt & hw->hw_token) == 0) {
 halt:
-                               qh->hw_token |= halt;
+                               hw->hw_token |= halt;
                                wmb ();
                        }
                }
@@ -503,6 +515,21 @@ halt:
                ehci_qtd_free (ehci, last);
        }
 
+       /* Do we need to rescan for URBs dequeued during a giveback? */
+       if (unlikely(qh->needs_rescan)) {
+               /* If the QH is already unlinked, do the rescan now. */
+               if (state == QH_STATE_IDLE)
+                       goto rescan;
+
+               /* Otherwise we have to wait until the QH is fully unlinked.
+                * Our caller will start an unlink if qh->needs_rescan is
+                * set.  But if an unlink has already started, nothing needs
+                * to be done.
+                */
+               if (state != QH_STATE_LINKED)
+                       qh->needs_rescan = 0;
+       }
+
        /* restore original state; caller must unlink or relink */
        qh->qh_state = state;
 
@@ -510,7 +537,7 @@ halt:
         * it after fault cleanup, or recovering from silicon wrongly
         * overlaying the dummy qtd (which reduces DMA chatter).
         */
-       if (stopped != 0 || qh->hw_qtd_next == EHCI_LIST_END(ehci)) {
+       if (stopped != 0 || hw->hw_qtd_next == EHCI_LIST_END(ehci)) {
                switch (state) {
                case QH_STATE_IDLE:
                        qh_refresh(ehci, qh);
@@ -527,12 +554,9 @@ halt:
                         * That should be rare for interrupt transfers,
                         * except maybe high bandwidth ...
                         */
-                       if ((cpu_to_hc32(ehci, QH_SMASK)
-                                       & qh->hw_info2) != 0) {
-                               intr_deschedule (ehci, qh);
-                               (void) qh_schedule (ehci, qh);
-                       } else
-                               unlink_async (ehci, qh);
+
+                       /* Tell the caller to start an unlink */
+                       qh->needs_rescan = 1;
                        break;
                /* otherwise, unlink already started */
                }
@@ -649,7 +673,7 @@ qh_urb_transaction (
                 * (this will usually be overridden later.)
                 */
                if (is_input)
-                       qtd->hw_alt_next = ehci->async->hw_alt_next;
+                       qtd->hw_alt_next = ehci->async->hw->hw_alt_next;
 
                /* qh makes control packets use qtd toggle; maybe switch it */
                if ((maxpacket & (this_qtd_len + (maxpacket - 1))) == 0)
@@ -744,6 +768,7 @@ qh_make (
        int                     is_input, type;
        int                     maxp = 0;
        struct usb_tt           *tt = urb->dev->tt;
+       struct ehci_qh_hw       *hw;
 
        if (!qh)
                return qh;
@@ -890,8 +915,9 @@ done:
 
        /* init as live, toggle clear, advance to dummy */
        qh->qh_state = QH_STATE_IDLE;
-       qh->hw_info1 = cpu_to_hc32(ehci, info1);
-       qh->hw_info2 = cpu_to_hc32(ehci, info2);
+       hw = qh->hw;
+       hw->hw_info1 = cpu_to_hc32(ehci, info1);
+       hw->hw_info2 = cpu_to_hc32(ehci, info2);
        usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe), !is_input, 1);
        qh_refresh (ehci, qh);
        return qh;
@@ -910,6 +936,8 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
        if (unlikely(qh->clearing_tt))
                return;
 
+       WARN_ON(qh->qh_state != QH_STATE_IDLE);
+
        /* (re)start the async schedule? */
        head = ehci->async;
        timer_action_done (ehci, TIMER_ASYNC_OFF);
@@ -928,16 +956,15 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
        }
 
        /* clear halt and/or toggle; and maybe recover from silicon quirk */
-       if (qh->qh_state == QH_STATE_IDLE)
-               qh_refresh (ehci, qh);
+       qh_refresh(ehci, qh);
 
        /* splice right after start */
        qh->qh_next = head->qh_next;
-       qh->hw_next = head->hw_next;
+       qh->hw->hw_next = head->hw->hw_next;
        wmb ();
 
        head->qh_next.qh = qh;
-       head->hw_next = dma;
+       head->hw->hw_next = dma;
 
        qh_get(qh);
        qh->xacterrs = 0;
@@ -984,7 +1011,7 @@ static struct ehci_qh *qh_append_tds (
 
                         /* usb_reset_device() briefly reverts to address 0 */
                         if (usb_pipedevice (urb->pipe) == 0)
-                                qh->hw_info1 &= ~qh_addr_mask;
+                               qh->hw->hw_info1 &= ~qh_addr_mask;
                }
 
                /* just one way to queue requests: swap with the dummy qtd.
@@ -1169,7 +1196,7 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
        while (prev->qh_next.qh != qh)
                prev = prev->qh_next.qh;
 
-       prev->hw_next = qh->hw_next;
+       prev->hw->hw_next = qh->hw->hw_next;
        prev->qh_next = qh->qh_next;
        wmb ();
 
@@ -1214,6 +1241,8 @@ rescan:
                                qh = qh_get (qh);
                                qh->stamp = ehci->stamp;
                                temp = qh_completions (ehci, qh);
+                               if (qh->needs_rescan)
+                                       unlink_async(ehci, qh);
                                qh_put (qh);
                                if (temp != 0) {
                                        goto rescan;
index edd61ee..3ea0593 100644 (file)
@@ -60,6 +60,20 @@ periodic_next_shadow(struct ehci_hcd *ehci, union ehci_shadow *periodic,
        }
 }
 
+static __hc32 *
+shadow_next_periodic(struct ehci_hcd *ehci, union ehci_shadow *periodic,
+               __hc32 tag)
+{
+       switch (hc32_to_cpu(ehci, tag)) {
+       /* our ehci_shadow.qh is actually software part */
+       case Q_TYPE_QH:
+               return &periodic->qh->hw->hw_next;
+       /* others are hw parts */
+       default:
+               return periodic->hw_next;
+       }
+}
+
 /* caller must hold ehci->lock */
 static void periodic_unlink (struct ehci_hcd *ehci, unsigned frame, void *ptr)
 {
@@ -71,7 +85,8 @@ static void periodic_unlink (struct ehci_hcd *ehci, unsigned frame, void *ptr)
        while (here.ptr && here.ptr != ptr) {
                prev_p = periodic_next_shadow(ehci, prev_p,
                                Q_NEXT_TYPE(ehci, *hw_p));
-               hw_p = here.hw_next;
+               hw_p = shadow_next_periodic(ehci, &here,
+                               Q_NEXT_TYPE(ehci, *hw_p));
                here = *prev_p;
        }
        /* an interrupt entry (at list end) could have been shared */
@@ -83,7 +98,7 @@ static void periodic_unlink (struct ehci_hcd *ehci, unsigned frame, void *ptr)
         */
        *prev_p = *periodic_next_shadow(ehci, &here,
                        Q_NEXT_TYPE(ehci, *hw_p));
-       *hw_p = *here.hw_next;
+       *hw_p = *shadow_next_periodic(ehci, &here, Q_NEXT_TYPE(ehci, *hw_p));
 }
 
 /* how many of the uframe's 125 usecs are allocated? */
@@ -93,18 +108,20 @@ periodic_usecs (struct ehci_hcd *ehci, unsigned frame, unsigned uframe)
        __hc32                  *hw_p = &ehci->periodic [frame];
        union ehci_shadow       *q = &ehci->pshadow [frame];
        unsigned                usecs = 0;
+       struct ehci_qh_hw       *hw;
 
        while (q->ptr) {
                switch (hc32_to_cpu(ehci, Q_NEXT_TYPE(ehci, *hw_p))) {
                case Q_TYPE_QH:
+                       hw = q->qh->hw;
                        /* is it in the S-mask? */
-                       if (q->qh->hw_info2 & cpu_to_hc32(ehci, 1 << uframe))
+                       if (hw->hw_info2 & cpu_to_hc32(ehci, 1 << uframe))
                                usecs += q->qh->usecs;
                        /* ... or C-mask? */
-                       if (q->qh->hw_info2 & cpu_to_hc32(ehci,
+                       if (hw->hw_info2 & cpu_to_hc32(ehci,
                                        1 << (8 + uframe)))
                                usecs += q->qh->c_usecs;
-                       hw_p = &q->qh->hw_next;
+                       hw_p = &hw->hw_next;
                        q = &q->qh->qh_next;
                        break;
                // case Q_TYPE_FSTN:
@@ -237,10 +254,10 @@ periodic_tt_usecs (
                        continue;
                case Q_TYPE_QH:
                        if (same_tt(dev, q->qh->dev)) {
-                               uf = tt_start_uframe(ehci, q->qh->hw_info2);
+                               uf = tt_start_uframe(ehci, q->qh->hw->hw_info2);
                                tt_usecs[uf] += q->qh->tt_usecs;
                        }
-                       hw_p = &q->qh->hw_next;
+                       hw_p = &q->qh->hw->hw_next;
                        q = &q->qh->qh_next;
                        continue;
                case Q_TYPE_SITD:
@@ -375,6 +392,7 @@ static int tt_no_collision (
        for (; frame < ehci->periodic_size; frame += period) {
                union ehci_shadow       here;
                __hc32                  type;
+               struct ehci_qh_hw       *hw;
 
                here = ehci->pshadow [frame];
                type = Q_NEXT_TYPE(ehci, ehci->periodic [frame]);
@@ -385,17 +403,18 @@ static int tt_no_collision (
                                here = here.itd->itd_next;
                                continue;
                        case Q_TYPE_QH:
+                               hw = here.qh->hw;
                                if (same_tt (dev, here.qh->dev)) {
                                        u32             mask;
 
                                        mask = hc32_to_cpu(ehci,
-                                                       here.qh->hw_info2);
+                                                       hw->hw_info2);
                                        /* "knows" no gap is needed */
                                        mask |= mask >> 8;
                                        if (mask & uf_mask)
                                                break;
                                }
-                               type = Q_NEXT_TYPE(ehci, here.qh->hw_next);
+                               type = Q_NEXT_TYPE(ehci, hw->hw_next);
                                here = here.qh->qh_next;
                                continue;
                        case Q_TYPE_SITD:
@@ -498,7 +517,8 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
 
        dev_dbg (&qh->dev->dev,
                "link qh%d-%04x/%p start %d [%d/%d us]\n",
-               period, hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK),
+               period, hc32_to_cpup(ehci, &qh->hw->hw_info2)
+                       & (QH_CMASK | QH_SMASK),
                qh, qh->start, qh->usecs, qh->c_usecs);
 
        /* high bandwidth, or otherwise every microframe */
@@ -517,7 +537,7 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
                        if (type == cpu_to_hc32(ehci, Q_TYPE_QH))
                                break;
                        prev = periodic_next_shadow(ehci, prev, type);
-                       hw_p = &here.qh->hw_next;
+                       hw_p = shadow_next_periodic(ehci, &here, type);
                        here = *prev;
                }
 
@@ -528,14 +548,14 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
                        if (qh->period > here.qh->period)
                                break;
                        prev = &here.qh->qh_next;
-                       hw_p = &here.qh->hw_next;
+                       hw_p = &here.qh->hw->hw_next;
                        here = *prev;
                }
                /* link in this qh, unless some earlier pass did that */
                if (qh != here.qh) {
                        qh->qh_next = here;
                        if (here.qh)
-                               qh->hw_next = *hw_p;
+                               qh->hw->hw_next = *hw_p;
                        wmb ();
                        prev->qh = qh;
                        *hw_p = QH_NEXT (ehci, qh->qh_dma);
@@ -581,7 +601,7 @@ static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh)
        dev_dbg (&qh->dev->dev,
                "unlink qh%d-%04x/%p start %d [%d/%d us]\n",
                qh->period,
-               hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK),
+               hc32_to_cpup(ehci, &qh->hw->hw_info2) & (QH_CMASK | QH_SMASK),
                qh, qh->start, qh->usecs, qh->c_usecs);
 
        /* qh->qh_next still "live" to HC */
@@ -595,7 +615,19 @@ static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh)
 
 static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
-       unsigned        wait;
+       unsigned                wait;
+       struct ehci_qh_hw       *hw = qh->hw;
+       int                     rc;
+
+       /* If the QH isn't linked then there's nothing we can do
+        * unless we were called during a giveback, in which case
+        * qh_completions() has to deal with it.
+        */
+       if (qh->qh_state != QH_STATE_LINKED) {
+               if (qh->qh_state == QH_STATE_COMPLETING)
+                       qh->needs_rescan = 1;
+               return;
+       }
 
        qh_unlink_periodic (ehci, qh);
 
@@ -606,15 +638,33 @@ static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
         */
        if (list_empty (&qh->qtd_list)
                        || (cpu_to_hc32(ehci, QH_CMASK)
-                                       & qh->hw_info2) != 0)
+                                       & hw->hw_info2) != 0)
                wait = 2;
        else
                wait = 55;      /* worst case: 3 * 1024 */
 
        udelay (wait);
        qh->qh_state = QH_STATE_IDLE;
-       qh->hw_next = EHCI_LIST_END(ehci);
+       hw->hw_next = EHCI_LIST_END(ehci);
        wmb ();
+
+       qh_completions(ehci, qh);
+
+       /* reschedule QH iff another request is queued */
+       if (!list_empty(&qh->qtd_list) &&
+                       HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {
+               rc = qh_schedule(ehci, qh);
+
+               /* An error here likely indicates handshake failure
+                * or no space left in the schedule.  Neither fault
+                * should happen often ...
+                *
+                * FIXME kill the now-dysfunctional queued urbs
+                */
+               if (rc != 0)
+                       ehci_err(ehci, "can't reschedule qh %p, err %d\n",
+                                       qh, rc);
+       }
 }
 
 /*-------------------------------------------------------------------------*/
@@ -739,14 +789,15 @@ static int qh_schedule(struct ehci_hcd *ehci, struct ehci_qh *qh)
        unsigned        uframe;
        __hc32          c_mask;
        unsigned        frame;          /* 0..(qh->period - 1), or NO_FRAME */
+       struct ehci_qh_hw       *hw = qh->hw;
 
        qh_refresh(ehci, qh);
-       qh->hw_next = EHCI_LIST_END(ehci);
+       hw->hw_next = EHCI_LIST_END(ehci);
        frame = qh->start;
 
        /* reuse the previous schedule slots, if we can */
        if (frame < qh->period) {
-               uframe = ffs(hc32_to_cpup(ehci, &qh->hw_info2) & QH_SMASK);
+               uframe = ffs(hc32_to_cpup(ehci, &hw->hw_info2) & QH_SMASK);
                status = check_intr_schedule (ehci, frame, --uframe,
                                qh, &c_mask);
        } else {
@@ -784,11 +835,11 @@ static int qh_schedule(struct ehci_hcd *ehci, struct ehci_qh *qh)
                qh->start = frame;
 
                /* reset S-frame and (maybe) C-frame masks */
-               qh->hw_info2 &= cpu_to_hc32(ehci, ~(QH_CMASK | QH_SMASK));
-               qh->hw_info2 |= qh->period
+               hw->hw_info2 &= cpu_to_hc32(ehci, ~(QH_CMASK | QH_SMASK));
+               hw->hw_info2 |= qh->period
                        ? cpu_to_hc32(ehci, 1 << uframe)
                        : cpu_to_hc32(ehci, QH_SMASK);
-               qh->hw_info2 |= c_mask;
+               hw->hw_info2 |= c_mask;
        } else
                ehci_dbg (ehci, "reused qh %p schedule\n", qh);
 
@@ -2188,10 +2239,11 @@ restart:
                        case Q_TYPE_QH:
                                /* handle any completions */
                                temp.qh = qh_get (q.qh);
-                               type = Q_NEXT_TYPE(ehci, q.qh->hw_next);
+                               type = Q_NEXT_TYPE(ehci, q.qh->hw->hw_next);
                                q = q.qh->qh_next;
                                modified = qh_completions (ehci, temp.qh);
-                               if (unlikely (list_empty (&temp.qh->qtd_list)))
+                               if (unlikely(list_empty(&temp.qh->qtd_list) ||
+                                               temp.qh->needs_rescan))
                                        intr_deschedule (ehci, temp.qh);
                                qh_put (temp.qh);
                                break;
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
new file mode 100644 (file)
index 0000000..cfa21ea
--- /dev/null
@@ -0,0 +1,181 @@
+/*
+ * linux/driver/usb/host/ehci-w90x900.c
+ *
+ * Copyright (c) 2008 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation;version 2 of the License.
+ *
+ */
+
+#include <linux/platform_device.h>
+
+/*ebable phy0 and phy1 for w90p910*/
+#define        ENPHY           (0x01<<8)
+#define PHY0_CTR       (0xA4)
+#define PHY1_CTR       (0xA8)
+
+static int __devinit usb_w90x900_probe(const struct hc_driver *driver,
+                     struct platform_device *pdev)
+{
+       struct usb_hcd *hcd;
+       struct ehci_hcd *ehci;
+       struct resource *res;
+       int retval = 0, irq;
+       unsigned long val;
+
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               retval = -ENXIO;
+               goto err1;
+       }
+
+       hcd = usb_create_hcd(driver, &pdev->dev, "w90x900 EHCI");
+       if (!hcd) {
+               retval = -ENOMEM;
+               goto err1;
+       }
+
+       hcd->rsrc_start = res->start;
+       hcd->rsrc_len = res->end - res->start + 1;
+
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+               retval = -EBUSY;
+               goto err2;
+       }
+
+       hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+       if (hcd->regs == NULL) {
+               retval = -EFAULT;
+               goto err3;
+       }
+
+       ehci = hcd_to_ehci(hcd);
+       ehci->caps = hcd->regs;
+       ehci->regs = hcd->regs +
+                HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+
+       /* enable PHY 0,1,the regs only apply to w90p910
+       *  0xA4,0xA8 were offsets of PHY0 and PHY1 controller of
+       *  w90p910 IC relative to ehci->regs.
+       */
+       val = __raw_readl(ehci->regs+PHY0_CTR);
+       val |= ENPHY;
+       __raw_writel(val, ehci->regs+PHY0_CTR);
+
+       val = __raw_readl(ehci->regs+PHY1_CTR);
+       val |= ENPHY;
+       __raw_writel(val, ehci->regs+PHY1_CTR);
+
+       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+       ehci->sbrn = 0x20;
+
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0)
+               goto err4;
+
+       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
+       if (retval != 0)
+               goto err4;
+
+       ehci_writel(ehci, 1, &ehci->regs->configured_flag);
+
+       return retval;
+err4:
+       iounmap(hcd->regs);
+err3:
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err2:
+       usb_put_hcd(hcd);
+err1:
+       return retval;
+}
+
+static
+void usb_w90x900_remove(struct usb_hcd *hcd, struct platform_device *pdev)
+{
+       usb_remove_hcd(hcd);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
+}
+
+static const struct hc_driver ehci_w90x900_hc_driver = {
+       .description = hcd_name,
+       .product_desc = "Nuvoton w90x900 EHCI Host Controller",
+       .hcd_priv_size = sizeof(struct ehci_hcd),
+
+       /*
+        * generic hardware linkage
+        */
+       .irq = ehci_irq,
+       .flags = HCD_USB2|HCD_MEMORY,
+
+       /*
+        * basic lifecycle operations
+        */
+       .reset = ehci_init,
+       .start = ehci_run,
+
+       .stop = ehci_stop,
+       .shutdown = ehci_shutdown,
+
+       /*
+        * managing i/o requests and associated device resources
+        */
+       .urb_enqueue = ehci_urb_enqueue,
+       .urb_dequeue = ehci_urb_dequeue,
+       .endpoint_disable = ehci_endpoint_disable,
+
+       /*
+        * scheduling support
+        */
+       .get_frame_number = ehci_get_frame,
+
+       /*
+        * root hub support
+        */
+       .hub_status_data = ehci_hub_status_data,
+       .hub_control = ehci_hub_control,
+#ifdef CONFIG_PM
+       .bus_suspend = ehci_bus_suspend,
+       .bus_resume = ehci_bus_resume,
+#endif
+       .relinquish_port        = ehci_relinquish_port,
+       .port_handed_over       = ehci_port_handed_over,
+};
+
+static int __devinit ehci_w90x900_probe(struct platform_device *pdev)
+{
+       if (usb_disabled())
+               return -ENODEV;
+
+       return usb_w90x900_probe(&ehci_w90x900_hc_driver, pdev);
+}
+
+static int __devexit ehci_w90x900_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+       usb_w90x900_remove(hcd, pdev);
+
+       return 0;
+}
+
+static struct platform_driver ehci_hcd_w90x900_driver = {
+       .probe  = ehci_w90x900_probe,
+       .remove = __devexit_p(ehci_w90x900_remove),
+       .driver = {
+               .name = "w90x900-ehci",
+               .owner = THIS_MODULE,
+       },
+};
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("w90p910 usb ehci driver!");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:w90p910-ehci");
index 2bfff30..064e768 100644 (file)
@@ -37,7 +37,7 @@ typedef __u16 __bitwise __hc16;
 #define __hc16 __le16
 #endif
 
-/* statistics can be kept for for tuning/monitoring */
+/* statistics can be kept for tuning/monitoring */
 struct ehci_stats {
        /* irq usage */
        unsigned long           normal;
@@ -126,6 +126,7 @@ struct ehci_hcd {                   /* one per controller */
        unsigned                big_endian_mmio:1;
        unsigned                big_endian_desc:1;
        unsigned                has_amcc_usb23:1;
+       unsigned                need_io_watchdog:1;
 
        /* required for usb32 quirk */
        #define OHCI_CTRL_HCFS          (3 << 6)
@@ -135,6 +136,7 @@ struct ehci_hcd {                   /* one per controller */
        #define OHCI_HCCTRL_OFFSET      0x4
        #define OHCI_HCCTRL_LEN         0x4
        __hc32                  *ohci_hcctrl_reg;
+       unsigned                has_hostpc:1;
 
        u8                      sbrn;           /* packed release number */
 
@@ -298,8 +300,8 @@ union ehci_shadow {
  * These appear in both the async and (for interrupt) periodic schedules.
  */
 
-struct ehci_qh {
-       /* first part defined by EHCI spec */
+/* first part defined by EHCI spec */
+struct ehci_qh_hw {
        __hc32                  hw_next;        /* see EHCI 3.6.1 */
        __hc32                  hw_info1;       /* see EHCI 3.6.2 */
 #define        QH_HEAD         0x00008000
@@ -317,7 +319,10 @@ struct ehci_qh {
        __hc32                  hw_token;
        __hc32                  hw_buf [5];
        __hc32                  hw_buf_hi [5];
+} __attribute__ ((aligned(32)));
 
+struct ehci_qh {
+       struct ehci_qh_hw       *hw;
        /* the rest is HCD-private */
        dma_addr_t              qh_dma;         /* address of qh */
        union ehci_shadow       qh_next;        /* ptr to qh; or periodic */
@@ -336,6 +341,7 @@ struct ehci_qh {
        u32                     refcount;
        unsigned                stamp;
 
+       u8                      needs_rescan;   /* Dequeue during giveback */
        u8                      qh_state;
 #define        QH_STATE_LINKED         1               /* HC sees this */
 #define        QH_STATE_UNLINK         2               /* HC may still see this */
@@ -357,7 +363,7 @@ struct ehci_qh {
 
        struct usb_device       *dev;           /* access to TT */
        unsigned                clearing_tt:1;  /* Clear-TT-Buf in progress */
-} __attribute__ ((aligned (32)));
+};
 
 /*-------------------------------------------------------------------------*/
 
@@ -544,7 +550,7 @@ static inline unsigned int
 ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 {
        if (ehci_is_TDI(ehci)) {
-               switch ((portsc>>26)&3) {
+               switch ((portsc >> (ehci->has_hostpc ? 25 : 26)) & 3) {
                case 0:
                        return 0;
                case 1:
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
new file mode 100644 (file)
index 0000000..e35d828
--- /dev/null
@@ -0,0 +1,2909 @@
+/*
+ * ISP1362 HCD (Host Controller Driver) for USB.
+ *
+ * Copyright (C) 2005 Lothar Wassmann <LW@KARO-electronics.de>
+ *
+ * Derived from the SL811 HCD, rewritten for ISP116x.
+ * Copyright (C) 2005 Olav Kongas <ok@artecdesign.ee>
+ *
+ * Portions:
+ * Copyright (C) 2004 Psion Teklogix (for NetBook PRO)
+ * Copyright (C) 2004 David Brownell
+ */
+
+/*
+ * The ISP1362 chip requires a large delay (300ns and 462ns) between
+ * accesses to the address and data register.
+ * The following timing options exist:
+ *
+ * 1. Configure your memory controller to add such delays if it can (the best)
+ * 2. Implement platform-specific delay function possibly
+ *    combined with configuring the memory controller; see
+ *    include/linux/usb_isp1362.h for more info.
+ * 3. Use ndelay (easiest, poorest).
+ *
+ * Use the corresponding macros USE_PLATFORM_DELAY and USE_NDELAY in the
+ * platform specific section of isp1362.h to select the appropriate variant.
+ *
+ * Also note that according to the Philips "ISP1362 Errata" document
+ * Rev 1.00 from 27 May data corruption may occur when the #WR signal
+ * is reasserted (even with #CS deasserted) within 132ns after a
+ * write cycle to any controller register. If the hardware doesn't
+ * implement the recommended fix (gating the #WR with #CS) software
+ * must ensure that no further write cycle (not necessarily to the chip!)
+ * is issued by the CPU within this interval.
+
+ * For PXA25x this can be ensured by using VLIO with the maximum
+ * recovery time (MSCx = 0x7f8c) with a memory clock of 99.53 MHz.
+ */
+
+#ifdef CONFIG_USB_DEBUG
+# define ISP1362_DEBUG
+#else
+# undef ISP1362_DEBUG
+#endif
+
+/*
+ * The PXA255 UDC apparently doesn't handle GET_STATUS, GET_CONFIG and
+ * GET_INTERFACE requests correctly when the SETUP and DATA stages of the
+ * requests are carried out in separate frames. This will delay any SETUP
+ * packets until the start of the next frame so that this situation is
+ * unlikely to occur (and makes usbtest happy running with a PXA255 target
+ * device).
+ */
+#undef BUGGY_PXA2XX_UDC_USBTEST
+
+#undef PTD_TRACE
+#undef URB_TRACE
+#undef VERBOSE
+#undef REGISTERS
+
+/* This enables a memory test on the ISP1362 chip memory to make sure the
+ * chip access timing is correct.
+ */
+#undef CHIP_BUFFER_TEST
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/smp_lock.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/interrupt.h>
+#include <linux/usb.h>
+#include <linux/usb/isp1362.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
+
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
+
+static int dbg_level;
+#ifdef ISP1362_DEBUG
+module_param(dbg_level, int, 0644);
+#else
+module_param(dbg_level, int, 0);
+#define        STUB_DEBUG_FILE
+#endif
+
+#include "../core/hcd.h"
+#include "../core/usb.h"
+#include "isp1362.h"
+
+
+#define DRIVER_VERSION "2005-04-04"
+#define DRIVER_DESC    "ISP1362 USB Host Controller Driver"
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+static const char hcd_name[] = "isp1362-hcd";
+
+static void isp1362_hc_stop(struct usb_hcd *hcd);
+static int isp1362_hc_start(struct usb_hcd *hcd);
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * When called from the interrupthandler only isp1362_hcd->irqenb is modified,
+ * since the interrupt handler will write isp1362_hcd->irqenb to HCuPINT upon
+ * completion.
+ * We don't need a 'disable' counterpart, since interrupts will be disabled
+ * only by the interrupt handler.
+ */
+static inline void isp1362_enable_int(struct isp1362_hcd *isp1362_hcd, u16 mask)
+{
+       if ((isp1362_hcd->irqenb | mask) == isp1362_hcd->irqenb)
+               return;
+       if (mask & ~isp1362_hcd->irqenb)
+               isp1362_write_reg16(isp1362_hcd, HCuPINT, mask & ~isp1362_hcd->irqenb);
+       isp1362_hcd->irqenb |= mask;
+       if (isp1362_hcd->irq_active)
+               return;
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, isp1362_hcd->irqenb);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static inline struct isp1362_ep_queue *get_ptd_queue(struct isp1362_hcd *isp1362_hcd,
+                                                    u16 offset)
+{
+       struct isp1362_ep_queue *epq = NULL;
+
+       if (offset < isp1362_hcd->istl_queue[1].buf_start)
+               epq = &isp1362_hcd->istl_queue[0];
+       else if (offset < isp1362_hcd->intl_queue.buf_start)
+               epq = &isp1362_hcd->istl_queue[1];
+       else if (offset < isp1362_hcd->atl_queue.buf_start)
+               epq = &isp1362_hcd->intl_queue;
+       else if (offset < isp1362_hcd->atl_queue.buf_start +
+                  isp1362_hcd->atl_queue.buf_size)
+               epq = &isp1362_hcd->atl_queue;
+
+       if (epq)
+               DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name);
+       else
+               pr_warning("%s: invalid PTD $%04x\n", __func__, offset);
+
+       return epq;
+}
+
+static inline int get_ptd_offset(struct isp1362_ep_queue *epq, u8 index)
+{
+       int offset;
+
+       if (index * epq->blk_size > epq->buf_size) {
+               pr_warning("%s: Bad %s index %d(%d)\n", __func__, epq->name, index,
+                    epq->buf_size / epq->blk_size);
+               return -EINVAL;
+       }
+       offset = epq->buf_start + index * epq->blk_size;
+       DBG(3, "%s: %s PTD[%02x] # %04x\n", __func__, epq->name, index, offset);
+
+       return offset;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static inline u16 max_transfer_size(struct isp1362_ep_queue *epq, size_t size,
+                                   int mps)
+{
+       u16 xfer_size = min_t(size_t, MAX_XFER_SIZE, size);
+
+       xfer_size = min_t(size_t, xfer_size, epq->buf_avail * epq->blk_size - PTD_HEADER_SIZE);
+       if (xfer_size < size && xfer_size % mps)
+               xfer_size -= xfer_size % mps;
+
+       return xfer_size;
+}
+
+static int claim_ptd_buffers(struct isp1362_ep_queue *epq,
+                            struct isp1362_ep *ep, u16 len)
+{
+       int ptd_offset = -EINVAL;
+       int index;
+       int num_ptds = ((len + PTD_HEADER_SIZE - 1) / epq->blk_size) + 1;
+       int found = -1;
+       int last = -1;
+
+       BUG_ON(len > epq->buf_size);
+
+       if (!epq->buf_avail)
+               return -ENOMEM;
+
+       if (ep->num_ptds)
+               pr_err("%s: %s len %d/%d num_ptds %d buf_map %08lx skip_map %08lx\n", __func__,
+                   epq->name, len, epq->blk_size, num_ptds, epq->buf_map, epq->skip_map);
+       BUG_ON(ep->num_ptds != 0);
+
+       for (index = 0; index <= epq->buf_count - num_ptds; index++) {
+               if (test_bit(index, &epq->buf_map))
+                       continue;
+               found = index;
+               for (last = index + 1; last < index + num_ptds; last++) {
+                       if (test_bit(last, &epq->buf_map)) {
+                               found = -1;
+                               break;
+                       }
+               }
+               if (found >= 0)
+                       break;
+       }
+       if (found < 0)
+               return -EOVERFLOW;
+
+       DBG(1, "%s: Found %d PTDs[%d] for %d/%d byte\n", __func__,
+           num_ptds, found, len, (int)(epq->blk_size - PTD_HEADER_SIZE));
+       ptd_offset = get_ptd_offset(epq, found);
+       WARN_ON(ptd_offset < 0);
+       ep->ptd_offset = ptd_offset;
+       ep->num_ptds += num_ptds;
+       epq->buf_avail -= num_ptds;
+       BUG_ON(epq->buf_avail > epq->buf_count);
+       ep->ptd_index = found;
+       for (index = found; index < last; index++)
+               __set_bit(index, &epq->buf_map);
+       DBG(1, "%s: Done %s PTD[%d] $%04x, avail %d count %d claimed %d %08lx:%08lx\n",
+           __func__, epq->name, ep->ptd_index, ep->ptd_offset,
+           epq->buf_avail, epq->buf_count, num_ptds, epq->buf_map, epq->skip_map);
+
+       return found;
+}
+
+static inline void release_ptd_buffers(struct isp1362_ep_queue *epq, struct isp1362_ep *ep)
+{
+       int index = ep->ptd_index;
+       int last = ep->ptd_index + ep->num_ptds;
+
+       if (last > epq->buf_count)
+               pr_err("%s: ep %p req %d len %d %s PTD[%d] $%04x num_ptds %d buf_count %d buf_avail %d buf_map %08lx skip_map %08lx\n",
+                   __func__, ep, ep->num_req, ep->length, epq->name, ep->ptd_index,
+                   ep->ptd_offset, ep->num_ptds, epq->buf_count, epq->buf_avail,
+                   epq->buf_map, epq->skip_map);
+       BUG_ON(last > epq->buf_count);
+
+       for (; index < last; index++) {
+               __clear_bit(index, &epq->buf_map);
+               __set_bit(index, &epq->skip_map);
+       }
+       epq->buf_avail += ep->num_ptds;
+       epq->ptd_count--;
+
+       BUG_ON(epq->buf_avail > epq->buf_count);
+       BUG_ON(epq->ptd_count > epq->buf_count);
+
+       DBG(1, "%s: Done %s PTDs $%04x released %d avail %d count %d\n",
+           __func__, epq->name,
+           ep->ptd_offset, ep->num_ptds, epq->buf_avail, epq->buf_count);
+       DBG(1, "%s: buf_map %08lx skip_map %08lx\n", __func__,
+           epq->buf_map, epq->skip_map);
+
+       ep->num_ptds = 0;
+       ep->ptd_offset = -EINVAL;
+       ep->ptd_index = -EINVAL;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/*
+  Set up PTD's.
+*/
+static void prepare_ptd(struct isp1362_hcd *isp1362_hcd, struct urb *urb,
+                       struct isp1362_ep *ep, struct isp1362_ep_queue *epq,
+                       u16 fno)
+{
+       struct ptd *ptd;
+       int toggle;
+       int dir;
+       u16 len;
+       size_t buf_len = urb->transfer_buffer_length - urb->actual_length;
+
+       DBG(3, "%s: %s ep %p\n", __func__, epq->name, ep);
+
+       ptd = &ep->ptd;
+
+       ep->data = (unsigned char *)urb->transfer_buffer + urb->actual_length;
+
+       switch (ep->nextpid) {
+       case USB_PID_IN:
+               toggle = usb_gettoggle(urb->dev, ep->epnum, 0);
+               dir = PTD_DIR_IN;
+               if (usb_pipecontrol(urb->pipe)) {
+                       len = min_t(size_t, ep->maxpacket, buf_len);
+               } else if (usb_pipeisoc(urb->pipe)) {
+                       len = min_t(size_t, urb->iso_frame_desc[fno].length, MAX_XFER_SIZE);
+                       ep->data = urb->transfer_buffer + urb->iso_frame_desc[fno].offset;
+               } else
+                       len = max_transfer_size(epq, buf_len, ep->maxpacket);
+               DBG(1, "%s: IN    len %d/%d/%d from URB\n", __func__, len, ep->maxpacket,
+                   (int)buf_len);
+               break;
+       case USB_PID_OUT:
+               toggle = usb_gettoggle(urb->dev, ep->epnum, 1);
+               dir = PTD_DIR_OUT;
+               if (usb_pipecontrol(urb->pipe))
+                       len = min_t(size_t, ep->maxpacket, buf_len);
+               else if (usb_pipeisoc(urb->pipe))
+                       len = min_t(size_t, urb->iso_frame_desc[0].length, MAX_XFER_SIZE);
+               else
+                       len = max_transfer_size(epq, buf_len, ep->maxpacket);
+               if (len == 0)
+                       pr_info("%s: Sending ZERO packet: %d\n", __func__,
+                            urb->transfer_flags & URB_ZERO_PACKET);
+               DBG(1, "%s: OUT   len %d/%d/%d from URB\n", __func__, len, ep->maxpacket,
+                   (int)buf_len);
+               break;
+       case USB_PID_SETUP:
+               toggle = 0;
+               dir = PTD_DIR_SETUP;
+               len = sizeof(struct usb_ctrlrequest);
+               DBG(1, "%s: SETUP len %d\n", __func__, len);
+               ep->data = urb->setup_packet;
+               break;
+       case USB_PID_ACK:
+               toggle = 1;
+               len = 0;
+               dir = (urb->transfer_buffer_length && usb_pipein(urb->pipe)) ?
+                       PTD_DIR_OUT : PTD_DIR_IN;
+               DBG(1, "%s: ACK   len %d\n", __func__, len);
+               break;
+       default:
+               toggle = dir = len = 0;
+               pr_err("%s@%d: ep->nextpid %02x\n", __func__, __LINE__, ep->nextpid);
+               BUG_ON(1);
+       }
+
+       ep->length = len;
+       if (!len)
+               ep->data = NULL;
+
+       ptd->count = PTD_CC_MSK | PTD_ACTIVE_MSK | PTD_TOGGLE(toggle);
+       ptd->mps = PTD_MPS(ep->maxpacket) | PTD_SPD(urb->dev->speed == USB_SPEED_LOW) |
+               PTD_EP(ep->epnum);
+       ptd->len = PTD_LEN(len) | PTD_DIR(dir);
+       ptd->faddr = PTD_FA(usb_pipedevice(urb->pipe));
+
+       if (usb_pipeint(urb->pipe)) {
+               ptd->faddr |= PTD_SF_INT(ep->branch);
+               ptd->faddr |= PTD_PR(ep->interval ? __ffs(ep->interval) : 0);
+       }
+       if (usb_pipeisoc(urb->pipe))
+               ptd->faddr |= PTD_SF_ISO(fno);
+
+       DBG(1, "%s: Finished\n", __func__);
+}
+
+static void isp1362_write_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep,
+                             struct isp1362_ep_queue *epq)
+{
+       struct ptd *ptd = &ep->ptd;
+       int len = PTD_GET_DIR(ptd) == PTD_DIR_IN ? 0 : ep->length;
+
+       _BUG_ON(ep->ptd_offset < 0);
+
+       prefetch(ptd);
+       isp1362_write_buffer(isp1362_hcd, ptd, ep->ptd_offset, PTD_HEADER_SIZE);
+       if (len)
+               isp1362_write_buffer(isp1362_hcd, ep->data,
+                                    ep->ptd_offset + PTD_HEADER_SIZE, len);
+
+       dump_ptd(ptd);
+       dump_ptd_out_data(ptd, ep->data);
+}
+
+static void isp1362_read_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep,
+                            struct isp1362_ep_queue *epq)
+{
+       struct ptd *ptd = &ep->ptd;
+       int act_len;
+
+       WARN_ON(list_empty(&ep->active));
+       BUG_ON(ep->ptd_offset < 0);
+
+       list_del_init(&ep->active);
+       DBG(1, "%s: ep %p removed from active list %p\n", __func__, ep, &epq->active);
+
+       prefetchw(ptd);
+       isp1362_read_buffer(isp1362_hcd, ptd, ep->ptd_offset, PTD_HEADER_SIZE);
+       dump_ptd(ptd);
+       act_len = PTD_GET_COUNT(ptd);
+       if (PTD_GET_DIR(ptd) != PTD_DIR_IN || act_len == 0)
+               return;
+       if (act_len > ep->length)
+               pr_err("%s: ep %p PTD $%04x act_len %d ep->length %d\n", __func__, ep,
+                        ep->ptd_offset, act_len, ep->length);
+       BUG_ON(act_len > ep->length);
+       /* Only transfer the amount of data that has actually been overwritten
+        * in the chip buffer. We don't want any data that doesn't belong to the
+        * transfer to leak out of the chip to the callers transfer buffer!
+        */
+       prefetchw(ep->data);
+       isp1362_read_buffer(isp1362_hcd, ep->data,
+                           ep->ptd_offset + PTD_HEADER_SIZE, act_len);
+       dump_ptd_in_data(ptd, ep->data);
+}
+
+/*
+ * INT PTDs will stay in the chip until data is available.
+ * This function will remove a PTD from the chip when the URB is dequeued.
+ * Must be called with the spinlock held and IRQs disabled
+ */
+static void remove_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
+
+{
+       int index;
+       struct isp1362_ep_queue *epq;
+
+       DBG(1, "%s: ep %p PTD[%d] $%04x\n", __func__, ep, ep->ptd_index, ep->ptd_offset);
+       BUG_ON(ep->ptd_offset < 0);
+
+       epq = get_ptd_queue(isp1362_hcd, ep->ptd_offset);
+       BUG_ON(!epq);
+
+       /* put ep in remove_list for cleanup */
+       WARN_ON(!list_empty(&ep->remove_list));
+       list_add_tail(&ep->remove_list, &isp1362_hcd->remove_list);
+       /* let SOF interrupt handle the cleanup */
+       isp1362_enable_int(isp1362_hcd, HCuPINT_SOF);
+
+       index = ep->ptd_index;
+       if (index < 0)
+               /* ISO queues don't have SKIP registers */
+               return;
+
+       DBG(1, "%s: Disabling PTD[%02x] $%04x %08lx|%08x\n", __func__,
+           index, ep->ptd_offset, epq->skip_map, 1 << index);
+
+       /* prevent further processing of PTD (will be effective after next SOF) */
+       epq->skip_map |= 1 << index;
+       if (epq == &isp1362_hcd->atl_queue) {
+               DBG(2, "%s: ATLSKIP = %08x -> %08lx\n", __func__,
+                   isp1362_read_reg32(isp1362_hcd, HCATLSKIP), epq->skip_map);
+               isp1362_write_reg32(isp1362_hcd, HCATLSKIP, epq->skip_map);
+               if (~epq->skip_map == 0)
+                       isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ATL_ACTIVE);
+       } else if (epq == &isp1362_hcd->intl_queue) {
+               DBG(2, "%s: INTLSKIP = %08x -> %08lx\n", __func__,
+                   isp1362_read_reg32(isp1362_hcd, HCINTLSKIP), epq->skip_map);
+               isp1362_write_reg32(isp1362_hcd, HCINTLSKIP, epq->skip_map);
+               if (~epq->skip_map == 0)
+                       isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_INTL_ACTIVE);
+       }
+}
+
+/*
+  Take done or failed requests out of schedule. Give back
+  processed urbs.
+*/
+static void finish_request(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep,
+                          struct urb *urb, int status)
+     __releases(isp1362_hcd->lock)
+     __acquires(isp1362_hcd->lock)
+{
+       urb->hcpriv = NULL;
+       ep->error_count = 0;
+
+       if (usb_pipecontrol(urb->pipe))
+               ep->nextpid = USB_PID_SETUP;
+
+       URB_DBG("%s: req %d FA %d ep%d%s %s: len %d/%d %s stat %d\n", __func__,
+               ep->num_req, usb_pipedevice(urb->pipe),
+               usb_pipeendpoint(urb->pipe),
+               !usb_pipein(urb->pipe) ? "out" : "in",
+               usb_pipecontrol(urb->pipe) ? "ctrl" :
+                       usb_pipeint(urb->pipe) ? "int" :
+                       usb_pipebulk(urb->pipe) ? "bulk" :
+                       "iso",
+               urb->actual_length, urb->transfer_buffer_length,
+               !(urb->transfer_flags & URB_SHORT_NOT_OK) ?
+               "short_ok" : "", urb->status);
+
+
+       usb_hcd_unlink_urb_from_ep(isp1362_hcd_to_hcd(isp1362_hcd), urb);
+       spin_unlock(&isp1362_hcd->lock);
+       usb_hcd_giveback_urb(isp1362_hcd_to_hcd(isp1362_hcd), urb, status);
+       spin_lock(&isp1362_hcd->lock);
+
+       /* take idle endpoints out of the schedule right away */
+       if (!list_empty(&ep->hep->urb_list))
+               return;
+
+       /* async deschedule */
+       if (!list_empty(&ep->schedule)) {
+               list_del_init(&ep->schedule);
+               return;
+       }
+
+
+       if (ep->interval) {
+               /* periodic deschedule */
+               DBG(1, "deschedule qh%d/%p branch %d load %d bandwidth %d -> %d\n", ep->interval,
+                   ep, ep->branch, ep->load,
+                   isp1362_hcd->load[ep->branch],
+                   isp1362_hcd->load[ep->branch] - ep->load);
+               isp1362_hcd->load[ep->branch] -= ep->load;
+               ep->branch = PERIODIC_SIZE;
+       }
+}
+
+/*
+ * Analyze transfer results, handle partial transfers and errors
+*/
+static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
+{
+       struct urb *urb = get_urb(ep);
+       struct usb_device *udev;
+       struct ptd *ptd;
+       int short_ok;
+       u16 len;
+       int urbstat = -EINPROGRESS;
+       u8 cc;
+
+       DBG(2, "%s: ep %p req %d\n", __func__, ep, ep->num_req);
+
+       udev = urb->dev;
+       ptd = &ep->ptd;
+       cc = PTD_GET_CC(ptd);
+       if (cc == PTD_NOTACCESSED) {
+               pr_err("%s: req %d PTD %p Untouched by ISP1362\n", __func__,
+                   ep->num_req, ptd);
+               cc = PTD_DEVNOTRESP;
+       }
+
+       short_ok = !(urb->transfer_flags & URB_SHORT_NOT_OK);
+       len = urb->transfer_buffer_length - urb->actual_length;
+
+       /* Data underrun is special. For allowed underrun
+          we clear the error and continue as normal. For
+          forbidden underrun we finish the DATA stage
+          immediately while for control transfer,
+          we do a STATUS stage.
+       */
+       if (cc == PTD_DATAUNDERRUN) {
+               if (short_ok) {
+                       DBG(1, "%s: req %d Allowed data underrun short_%sok %d/%d/%d byte\n",
+                           __func__, ep->num_req, short_ok ? "" : "not_",
+                           PTD_GET_COUNT(ptd), ep->maxpacket, len);
+                       cc = PTD_CC_NOERROR;
+                       urbstat = 0;
+               } else {
+                       DBG(1, "%s: req %d Data Underrun %s nextpid %02x short_%sok %d/%d/%d byte\n",
+                           __func__, ep->num_req,
+                           usb_pipein(urb->pipe) ? "IN" : "OUT", ep->nextpid,
+                           short_ok ? "" : "not_",
+                           PTD_GET_COUNT(ptd), ep->maxpacket, len);
+                       if (usb_pipecontrol(urb->pipe)) {
+                               ep->nextpid = USB_PID_ACK;
+                               /* save the data underrun error code for later and
+                                * procede with the status stage
+                                */
+                               urb->actual_length += PTD_GET_COUNT(ptd);
+                               BUG_ON(urb->actual_length > urb->transfer_buffer_length);
+
+                               if (urb->status == -EINPROGRESS)
+                                       urb->status = cc_to_error[PTD_DATAUNDERRUN];
+                       } else {
+                               usb_settoggle(udev, ep->epnum, ep->nextpid == USB_PID_OUT,
+                                             PTD_GET_TOGGLE(ptd));
+                               urbstat = cc_to_error[PTD_DATAUNDERRUN];
+                       }
+                       goto out;
+               }
+       }
+
+       if (cc != PTD_CC_NOERROR) {
+               if (++ep->error_count >= 3 || cc == PTD_CC_STALL || cc == PTD_DATAOVERRUN) {
+                       urbstat = cc_to_error[cc];
+                       DBG(1, "%s: req %d nextpid %02x, status %d, error %d, error_count %d\n",
+                           __func__, ep->num_req, ep->nextpid, urbstat, cc,
+                           ep->error_count);
+               }
+               goto out;
+       }
+
+       switch (ep->nextpid) {
+       case USB_PID_OUT:
+               if (PTD_GET_COUNT(ptd) != ep->length)
+                       pr_err("%s: count=%d len=%d\n", __func__,
+                          PTD_GET_COUNT(ptd), ep->length);
+               BUG_ON(PTD_GET_COUNT(ptd) != ep->length);
+               urb->actual_length += ep->length;
+               BUG_ON(urb->actual_length > urb->transfer_buffer_length);
+               usb_settoggle(udev, ep->epnum, 1, PTD_GET_TOGGLE(ptd));
+               if (urb->actual_length == urb->transfer_buffer_length) {
+                       DBG(3, "%s: req %d xfer complete %d/%d status %d -> 0\n", __func__,
+                           ep->num_req, len, ep->maxpacket, urbstat);
+                       if (usb_pipecontrol(urb->pipe)) {
+                               DBG(3, "%s: req %d %s Wait for ACK\n", __func__,
+                                   ep->num_req,
+                                   usb_pipein(urb->pipe) ? "IN" : "OUT");
+                               ep->nextpid = USB_PID_ACK;
+                       } else {
+                               if (len % ep->maxpacket ||
+                                   !(urb->transfer_flags & URB_ZERO_PACKET)) {
+                                       urbstat = 0;
+                                       DBG(3, "%s: req %d URB %s status %d count %d/%d/%d\n",
+                                           __func__, ep->num_req, usb_pipein(urb->pipe) ? "IN" : "OUT",
+                                           urbstat, len, ep->maxpacket, urb->actual_length);
+                               }
+                       }
+               }
+               break;
+       case USB_PID_IN:
+               len = PTD_GET_COUNT(ptd);
+               BUG_ON(len > ep->length);
+               urb->actual_length += len;
+               BUG_ON(urb->actual_length > urb->transfer_buffer_length);
+               usb_settoggle(udev, ep->epnum, 0, PTD_GET_TOGGLE(ptd));
+               /* if transfer completed or (allowed) data underrun */
+               if ((urb->transfer_buffer_length == urb->actual_length) ||
+                   len % ep->maxpacket) {
+                       DBG(3, "%s: req %d xfer complete %d/%d status %d -> 0\n", __func__,
+                           ep->num_req, len, ep->maxpacket, urbstat);
+                       if (usb_pipecontrol(urb->pipe)) {
+                               DBG(3, "%s: req %d %s Wait for ACK\n", __func__,
+                                   ep->num_req,
+                                   usb_pipein(urb->pipe) ? "IN" : "OUT");
+                               ep->nextpid = USB_PID_ACK;
+                       } else {
+                               urbstat = 0;
+                               DBG(3, "%s: req %d URB %s status %d count %d/%d/%d\n",
+                                   __func__, ep->num_req, usb_pipein(urb->pipe) ? "IN" : "OUT",
+                                   urbstat, len, ep->maxpacket, urb->actual_length);
+                       }
+               }
+               break;
+       case USB_PID_SETUP:
+               if (urb->transfer_buffer_length == urb->actual_length) {
+                       ep->nextpid = USB_PID_ACK;
+               } else if (usb_pipeout(urb->pipe)) {
+                       usb_settoggle(udev, 0, 1, 1);
+                       ep->nextpid = USB_PID_OUT;
+               } else {
+                       usb_settoggle(udev, 0, 0, 1);
+                       ep->nextpid = USB_PID_IN;
+               }
+               break;
+       case USB_PID_ACK:
+               DBG(3, "%s: req %d got ACK %d -> 0\n", __func__, ep->num_req,
+                   urbstat);
+               WARN_ON(urbstat != -EINPROGRESS);
+               urbstat = 0;
+               ep->nextpid = 0;
+               break;
+       default:
+               BUG_ON(1);
+       }
+
+ out:
+       if (urbstat != -EINPROGRESS) {
+               DBG(2, "%s: Finishing ep %p req %d urb %p status %d\n", __func__,
+                   ep, ep->num_req, urb, urbstat);
+               finish_request(isp1362_hcd, ep, urb, urbstat);
+       }
+}
+
+static void finish_unlinks(struct isp1362_hcd *isp1362_hcd)
+{
+       struct isp1362_ep *ep;
+       struct isp1362_ep *tmp;
+
+       list_for_each_entry_safe(ep, tmp, &isp1362_hcd->remove_list, remove_list) {
+               struct isp1362_ep_queue *epq =
+                       get_ptd_queue(isp1362_hcd, ep->ptd_offset);
+               int index = ep->ptd_index;
+
+               BUG_ON(epq == NULL);
+               if (index >= 0) {
+                       DBG(1, "%s: remove PTD[%d] $%04x\n", __func__, index, ep->ptd_offset);
+                       BUG_ON(ep->num_ptds == 0);
+                       release_ptd_buffers(epq, ep);
+               }
+               if (!list_empty(&ep->hep->urb_list)) {
+                       struct urb *urb = get_urb(ep);
+
+                       DBG(1, "%s: Finishing req %d ep %p from remove_list\n", __func__,
+                           ep->num_req, ep);
+                       finish_request(isp1362_hcd, ep, urb, -ESHUTDOWN);
+               }
+               WARN_ON(list_empty(&ep->active));
+               if (!list_empty(&ep->active)) {
+                       list_del_init(&ep->active);
+                       DBG(1, "%s: ep %p removed from active list\n", __func__, ep);
+               }
+               list_del_init(&ep->remove_list);
+               DBG(1, "%s: ep %p removed from remove_list\n", __func__, ep);
+       }
+       DBG(1, "%s: Done\n", __func__);
+}
+
+static inline void enable_atl_transfers(struct isp1362_hcd *isp1362_hcd, int count)
+{
+       if (count > 0) {
+               if (count < isp1362_hcd->atl_queue.ptd_count)
+                       isp1362_write_reg16(isp1362_hcd, HCATLDTC, count);
+               isp1362_enable_int(isp1362_hcd, HCuPINT_ATL);
+               isp1362_write_reg32(isp1362_hcd, HCATLSKIP, isp1362_hcd->atl_queue.skip_map);
+               isp1362_set_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ATL_ACTIVE);
+       } else
+               isp1362_enable_int(isp1362_hcd, HCuPINT_SOF);
+}
+
+static inline void enable_intl_transfers(struct isp1362_hcd *isp1362_hcd)
+{
+       isp1362_enable_int(isp1362_hcd, HCuPINT_INTL);
+       isp1362_set_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_INTL_ACTIVE);
+       isp1362_write_reg32(isp1362_hcd, HCINTLSKIP, isp1362_hcd->intl_queue.skip_map);
+}
+
+static inline void enable_istl_transfers(struct isp1362_hcd *isp1362_hcd, int flip)
+{
+       isp1362_enable_int(isp1362_hcd, flip ? HCuPINT_ISTL1 : HCuPINT_ISTL0);
+       isp1362_set_mask16(isp1362_hcd, HCBUFSTAT, flip ?
+                          HCBUFSTAT_ISTL1_FULL : HCBUFSTAT_ISTL0_FULL);
+}
+
+static int submit_req(struct isp1362_hcd *isp1362_hcd, struct urb *urb,
+                     struct isp1362_ep *ep, struct isp1362_ep_queue *epq)
+{
+       int index = epq->free_ptd;
+
+       prepare_ptd(isp1362_hcd, urb, ep, epq, 0);
+       index = claim_ptd_buffers(epq, ep, ep->length);
+       if (index == -ENOMEM) {
+               DBG(1, "%s: req %d No free %s PTD available: %d, %08lx:%08lx\n", __func__,
+                   ep->num_req, epq->name, ep->num_ptds, epq->buf_map, epq->skip_map);
+               return index;
+       } else if (index == -EOVERFLOW) {
+               DBG(1, "%s: req %d Not enough space for %d byte %s PTD %d %08lx:%08lx\n",
+                   __func__, ep->num_req, ep->length, epq->name, ep->num_ptds,
+                   epq->buf_map, epq->skip_map);
+               return index;
+       } else
+               BUG_ON(index < 0);
+       list_add_tail(&ep->active, &epq->active);
+       DBG(1, "%s: ep %p req %d len %d added to active list %p\n", __func__,
+           ep, ep->num_req, ep->length, &epq->active);
+       DBG(1, "%s: Submitting %s PTD $%04x for ep %p req %d\n", __func__, epq->name,
+           ep->ptd_offset, ep, ep->num_req);
+       isp1362_write_ptd(isp1362_hcd, ep, epq);
+       __clear_bit(ep->ptd_index, &epq->skip_map);
+
+       return 0;
+}
+
+static void start_atl_transfers(struct isp1362_hcd *isp1362_hcd)
+{
+       int ptd_count = 0;
+       struct isp1362_ep_queue *epq = &isp1362_hcd->atl_queue;
+       struct isp1362_ep *ep;
+       int defer = 0;
+
+       if (atomic_read(&epq->finishing)) {
+               DBG(1, "%s: finish_transfers is active for %s\n", __func__, epq->name);
+               return;
+       }
+
+       list_for_each_entry(ep, &isp1362_hcd->async, schedule) {
+               struct urb *urb = get_urb(ep);
+               int ret;
+
+               if (!list_empty(&ep->active)) {
+                       DBG(2, "%s: Skipping active %s ep %p\n", __func__, epq->name, ep);
+                       continue;
+               }
+
+               DBG(1, "%s: Processing %s ep %p req %d\n", __func__, epq->name,
+                   ep, ep->num_req);
+
+               ret = submit_req(isp1362_hcd, urb, ep, epq);
+               if (ret == -ENOMEM) {
+                       defer = 1;
+                       break;
+               } else if (ret == -EOVERFLOW) {
+                       defer = 1;
+                       continue;
+               }
+#ifdef BUGGY_PXA2XX_UDC_USBTEST
+               defer = ep->nextpid == USB_PID_SETUP;
+#endif
+               ptd_count++;
+       }
+
+       /* Avoid starving of endpoints */
+       if (isp1362_hcd->async.next != isp1362_hcd->async.prev) {
+               DBG(2, "%s: Cycling ASYNC schedule %d\n", __func__, ptd_count);
+               list_move(&isp1362_hcd->async, isp1362_hcd->async.next);
+       }
+       if (ptd_count || defer)
+               enable_atl_transfers(isp1362_hcd, defer ? 0 : ptd_count);
+
+       epq->ptd_count += ptd_count;
+       if (epq->ptd_count > epq->stat_maxptds) {
+               epq->stat_maxptds = epq->ptd_count;
+               DBG(0, "%s: max_ptds: %d\n", __func__, epq->stat_maxptds);
+       }
+}
+
+static void start_intl_transfers(struct isp1362_hcd *isp1362_hcd)
+{
+       int ptd_count = 0;
+       struct isp1362_ep_queue *epq = &isp1362_hcd->intl_queue;
+       struct isp1362_ep *ep;
+
+       if (atomic_read(&epq->finishing)) {
+               DBG(1, "%s: finish_transfers is active for %s\n", __func__, epq->name);
+               return;
+       }
+
+       list_for_each_entry(ep, &isp1362_hcd->periodic, schedule) {
+               struct urb *urb = get_urb(ep);
+               int ret;
+
+               if (!list_empty(&ep->active)) {
+                       DBG(1, "%s: Skipping active %s ep %p\n", __func__,
+                           epq->name, ep);
+                       continue;
+               }
+
+               DBG(1, "%s: Processing %s ep %p req %d\n", __func__,
+                   epq->name, ep, ep->num_req);
+               ret = submit_req(isp1362_hcd, urb, ep, epq);
+               if (ret == -ENOMEM)
+                       break;
+               else if (ret == -EOVERFLOW)
+                       continue;
+               ptd_count++;
+       }
+
+       if (ptd_count) {
+               static int last_count;
+
+               if (ptd_count != last_count) {
+                       DBG(0, "%s: ptd_count: %d\n", __func__, ptd_count);
+                       last_count = ptd_count;
+               }
+               enable_intl_transfers(isp1362_hcd);
+       }
+
+       epq->ptd_count += ptd_count;
+       if (epq->ptd_count > epq->stat_maxptds)
+               epq->stat_maxptds = epq->ptd_count;
+}
+
+static inline int next_ptd(struct isp1362_ep_queue *epq, struct isp1362_ep *ep)
+{
+       u16 ptd_offset = ep->ptd_offset;
+       int num_ptds = (ep->length + PTD_HEADER_SIZE + (epq->blk_size - 1)) / epq->blk_size;
+
+       DBG(2, "%s: PTD offset $%04x + %04x => %d * %04x -> $%04x\n", __func__, ptd_offset,
+           ep->length, num_ptds, epq->blk_size, ptd_offset + num_ptds * epq->blk_size);
+
+       ptd_offset += num_ptds * epq->blk_size;
+       if (ptd_offset < epq->buf_start + epq->buf_size)
+               return ptd_offset;
+       else
+               return -ENOMEM;
+}
+
+static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd)
+{
+       int ptd_count = 0;
+       int flip = isp1362_hcd->istl_flip;
+       struct isp1362_ep_queue *epq;
+       int ptd_offset;
+       struct isp1362_ep *ep;
+       struct isp1362_ep *tmp;
+       u16 fno = isp1362_read_reg32(isp1362_hcd, HCFMNUM);
+
+ fill2:
+       epq = &isp1362_hcd->istl_queue[flip];
+       if (atomic_read(&epq->finishing)) {
+               DBG(1, "%s: finish_transfers is active for %s\n", __func__, epq->name);
+               return;
+       }
+
+       if (!list_empty(&epq->active))
+               return;
+
+       ptd_offset = epq->buf_start;
+       list_for_each_entry_safe(ep, tmp, &isp1362_hcd->isoc, schedule) {
+               struct urb *urb = get_urb(ep);
+               s16 diff = fno - (u16)urb->start_frame;
+
+               DBG(1, "%s: Processing %s ep %p\n", __func__, epq->name, ep);
+
+               if (diff > urb->number_of_packets) {
+                       /* time frame for this URB has elapsed */
+                       finish_request(isp1362_hcd, ep, urb, -EOVERFLOW);
+                       continue;
+               } else if (diff < -1) {
+                       /* URB is not due in this frame or the next one.
+                        * Comparing with '-1' instead of '0' accounts for double
+                        * buffering in the ISP1362 which enables us to queue the PTD
+                        * one frame ahead of time
+                        */
+               } else if (diff == -1) {
+                       /* submit PTD's that are due in the next frame */
+                       prepare_ptd(isp1362_hcd, urb, ep, epq, fno);
+                       if (ptd_offset + PTD_HEADER_SIZE + ep->length >
+                           epq->buf_start + epq->buf_size) {
+                               pr_err("%s: Not enough ISO buffer space for %d byte PTD\n",
+                                   __func__, ep->length);
+                               continue;
+                       }
+                       ep->ptd_offset = ptd_offset;
+                       list_add_tail(&ep->active, &epq->active);
+
+                       ptd_offset = next_ptd(epq, ep);
+                       if (ptd_offset < 0) {
+                               pr_warning("%s: req %d No more %s PTD buffers available\n", __func__,
+                                    ep->num_req, epq->name);
+                               break;
+                       }
+               }
+       }
+       list_for_each_entry(ep, &epq->active, active) {
+               if (epq->active.next == &ep->active)
+                       ep->ptd.mps |= PTD_LAST_MSK;
+               isp1362_write_ptd(isp1362_hcd, ep, epq);
+               ptd_count++;
+       }
+
+       if (ptd_count)
+               enable_istl_transfers(isp1362_hcd, flip);
+
+       epq->ptd_count += ptd_count;
+       if (epq->ptd_count > epq->stat_maxptds)
+               epq->stat_maxptds = epq->ptd_count;
+
+       /* check, whether the second ISTL buffer may also be filled */
+       if (!(isp1362_read_reg16(isp1362_hcd, HCBUFSTAT) &
+             (flip ? HCBUFSTAT_ISTL0_FULL : HCBUFSTAT_ISTL1_FULL))) {
+               fno++;
+               ptd_count = 0;
+               flip = 1 - flip;
+               goto fill2;
+       }
+}
+
+static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done_map,
+                            struct isp1362_ep_queue *epq)
+{
+       struct isp1362_ep *ep;
+       struct isp1362_ep *tmp;
+
+       if (list_empty(&epq->active)) {
+               DBG(1, "%s: Nothing to do for %s queue\n", __func__, epq->name);
+               return;
+       }
+
+       DBG(1, "%s: Finishing %s transfers %08lx\n", __func__, epq->name, done_map);
+
+       atomic_inc(&epq->finishing);
+       list_for_each_entry_safe(ep, tmp, &epq->active, active) {
+               int index = ep->ptd_index;
+
+               DBG(1, "%s: Checking %s PTD[%02x] $%04x\n", __func__, epq->name,
+                   index, ep->ptd_offset);
+
+               BUG_ON(index < 0);
+               if (__test_and_clear_bit(index, &done_map)) {
+                       isp1362_read_ptd(isp1362_hcd, ep, epq);
+                       epq->free_ptd = index;
+                       BUG_ON(ep->num_ptds == 0);
+                       release_ptd_buffers(epq, ep);
+
+                       DBG(1, "%s: ep %p req %d removed from active list\n", __func__,
+                           ep, ep->num_req);
+                       if (!list_empty(&ep->remove_list)) {
+                               list_del_init(&ep->remove_list);
+                               DBG(1, "%s: ep %p removed from remove list\n", __func__, ep);
+                       }
+                       DBG(1, "%s: Postprocessing %s ep %p req %d\n", __func__, epq->name,
+                           ep, ep->num_req);
+                       postproc_ep(isp1362_hcd, ep);
+               }
+               if (!done_map)
+                       break;
+       }
+       if (done_map)
+               pr_warning("%s: done_map not clear: %08lx:%08lx\n", __func__, done_map,
+                    epq->skip_map);
+       atomic_dec(&epq->finishing);
+}
+
+static void finish_iso_transfers(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep_queue *epq)
+{
+       struct isp1362_ep *ep;
+       struct isp1362_ep *tmp;
+
+       if (list_empty(&epq->active)) {
+               DBG(1, "%s: Nothing to do for %s queue\n", __func__, epq->name);
+               return;
+       }
+
+       DBG(1, "%s: Finishing %s transfers\n", __func__, epq->name);
+
+       atomic_inc(&epq->finishing);
+       list_for_each_entry_safe(ep, tmp, &epq->active, active) {
+               DBG(1, "%s: Checking PTD $%04x\n", __func__, ep->ptd_offset);
+
+               isp1362_read_ptd(isp1362_hcd, ep, epq);
+               DBG(1, "%s: Postprocessing %s ep %p\n", __func__, epq->name, ep);
+               postproc_ep(isp1362_hcd, ep);
+       }
+       WARN_ON(epq->blk_size != 0);
+       atomic_dec(&epq->finishing);
+}
+
+static irqreturn_t isp1362_irq(struct usb_hcd *hcd)
+{
+       int handled = 0;
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       u16 irqstat;
+       u16 svc_mask;
+
+       spin_lock(&isp1362_hcd->lock);
+
+       BUG_ON(isp1362_hcd->irq_active++);
+
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, 0);
+
+       irqstat = isp1362_read_reg16(isp1362_hcd, HCuPINT);
+       DBG(3, "%s: got IRQ %04x:%04x\n", __func__, irqstat, isp1362_hcd->irqenb);
+
+       /* only handle interrupts that are currently enabled */
+       irqstat &= isp1362_hcd->irqenb;
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, irqstat);
+       svc_mask = irqstat;
+
+       if (irqstat & HCuPINT_SOF) {
+               isp1362_hcd->irqenb &= ~HCuPINT_SOF;
+               isp1362_hcd->irq_stat[ISP1362_INT_SOF]++;
+               handled = 1;
+               svc_mask &= ~HCuPINT_SOF;
+               DBG(3, "%s: SOF\n", __func__);
+               isp1362_hcd->fmindex = isp1362_read_reg32(isp1362_hcd, HCFMNUM);
+               if (!list_empty(&isp1362_hcd->remove_list))
+                       finish_unlinks(isp1362_hcd);
+               if (!list_empty(&isp1362_hcd->async) && !(irqstat & HCuPINT_ATL)) {
+                       if (list_empty(&isp1362_hcd->atl_queue.active)) {
+                               start_atl_transfers(isp1362_hcd);
+                       } else {
+                               isp1362_enable_int(isp1362_hcd, HCuPINT_ATL);
+                               isp1362_write_reg32(isp1362_hcd, HCATLSKIP,
+                                                   isp1362_hcd->atl_queue.skip_map);
+                               isp1362_set_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ATL_ACTIVE);
+                       }
+               }
+       }
+
+       if (irqstat & HCuPINT_ISTL0) {
+               isp1362_hcd->irq_stat[ISP1362_INT_ISTL0]++;
+               handled = 1;
+               svc_mask &= ~HCuPINT_ISTL0;
+               isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ISTL0_FULL);
+               DBG(1, "%s: ISTL0\n", __func__);
+               WARN_ON((int)!!isp1362_hcd->istl_flip);
+               WARN_ON(isp1362_read_reg16(isp1362_hcd, HCBUFSTAT) &
+                       HCBUFSTAT_ISTL0_ACTIVE);
+               WARN_ON(!(isp1362_read_reg16(isp1362_hcd, HCBUFSTAT) &
+                       HCBUFSTAT_ISTL0_DONE));
+               isp1362_hcd->irqenb &= ~HCuPINT_ISTL0;
+       }
+
+       if (irqstat & HCuPINT_ISTL1) {
+               isp1362_hcd->irq_stat[ISP1362_INT_ISTL1]++;
+               handled = 1;
+               svc_mask &= ~HCuPINT_ISTL1;
+               isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ISTL1_FULL);
+               DBG(1, "%s: ISTL1\n", __func__);
+               WARN_ON(!(int)isp1362_hcd->istl_flip);
+               WARN_ON(isp1362_read_reg16(isp1362_hcd, HCBUFSTAT) &
+                       HCBUFSTAT_ISTL1_ACTIVE);
+               WARN_ON(!(isp1362_read_reg16(isp1362_hcd, HCBUFSTAT) &
+                       HCBUFSTAT_ISTL1_DONE));
+               isp1362_hcd->irqenb &= ~HCuPINT_ISTL1;
+       }
+
+       if (irqstat & (HCuPINT_ISTL0 | HCuPINT_ISTL1)) {
+               WARN_ON((irqstat & (HCuPINT_ISTL0 | HCuPINT_ISTL1)) ==
+                       (HCuPINT_ISTL0 | HCuPINT_ISTL1));
+               finish_iso_transfers(isp1362_hcd,
+                                    &isp1362_hcd->istl_queue[isp1362_hcd->istl_flip]);
+               start_iso_transfers(isp1362_hcd);
+               isp1362_hcd->istl_flip = 1 - isp1362_hcd->istl_flip;
+       }
+
+       if (irqstat & HCuPINT_INTL) {
+               u32 done_map = isp1362_read_reg32(isp1362_hcd, HCINTLDONE);
+               u32 skip_map = isp1362_read_reg32(isp1362_hcd, HCINTLSKIP);
+               isp1362_hcd->irq_stat[ISP1362_INT_INTL]++;
+
+               DBG(2, "%s: INTL\n", __func__);
+
+               svc_mask &= ~HCuPINT_INTL;
+
+               isp1362_write_reg32(isp1362_hcd, HCINTLSKIP, skip_map | done_map);
+               if (~(done_map | skip_map) == 0)
+                       /* All PTDs are finished, disable INTL processing entirely */
+                       isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_INTL_ACTIVE);
+
+               handled = 1;
+               WARN_ON(!done_map);
+               if (done_map) {
+                       DBG(3, "%s: INTL done_map %08x\n", __func__, done_map);
+                       finish_transfers(isp1362_hcd, done_map, &isp1362_hcd->intl_queue);
+                       start_intl_transfers(isp1362_hcd);
+               }
+       }
+
+       if (irqstat & HCuPINT_ATL) {
+               u32 done_map = isp1362_read_reg32(isp1362_hcd, HCATLDONE);
+               u32 skip_map = isp1362_read_reg32(isp1362_hcd, HCATLSKIP);
+               isp1362_hcd->irq_stat[ISP1362_INT_ATL]++;
+
+               DBG(2, "%s: ATL\n", __func__);
+
+               svc_mask &= ~HCuPINT_ATL;
+
+               isp1362_write_reg32(isp1362_hcd, HCATLSKIP, skip_map | done_map);
+               if (~(done_map | skip_map) == 0)
+                       isp1362_clr_mask16(isp1362_hcd, HCBUFSTAT, HCBUFSTAT_ATL_ACTIVE);
+               if (done_map) {
+                       DBG(3, "%s: ATL done_map %08x\n", __func__, done_map);
+                       finish_transfers(isp1362_hcd, done_map, &isp1362_hcd->atl_queue);
+                       start_atl_transfers(isp1362_hcd);
+               }
+               handled = 1;
+       }
+
+       if (irqstat & HCuPINT_OPR) {
+               u32 intstat = isp1362_read_reg32(isp1362_hcd, HCINTSTAT);
+               isp1362_hcd->irq_stat[ISP1362_INT_OPR]++;
+
+               svc_mask &= ~HCuPINT_OPR;
+               DBG(2, "%s: OPR %08x:%08x\n", __func__, intstat, isp1362_hcd->intenb);
+               intstat &= isp1362_hcd->intenb;
+               if (intstat & OHCI_INTR_UE) {
+                       pr_err("Unrecoverable error\n");
+                       /* FIXME: do here reset or cleanup or whatever */
+               }
+               if (intstat & OHCI_INTR_RHSC) {
+                       isp1362_hcd->rhstatus = isp1362_read_reg32(isp1362_hcd, HCRHSTATUS);
+                       isp1362_hcd->rhport[0] = isp1362_read_reg32(isp1362_hcd, HCRHPORT1);
+                       isp1362_hcd->rhport[1] = isp1362_read_reg32(isp1362_hcd, HCRHPORT2);
+               }
+               if (intstat & OHCI_INTR_RD) {
+                       pr_info("%s: RESUME DETECTED\n", __func__);
+                       isp1362_show_reg(isp1362_hcd, HCCONTROL);
+                       usb_hcd_resume_root_hub(hcd);
+               }
+               isp1362_write_reg32(isp1362_hcd, HCINTSTAT, intstat);
+               irqstat &= ~HCuPINT_OPR;
+               handled = 1;
+       }
+
+       if (irqstat & HCuPINT_SUSP) {
+               isp1362_hcd->irq_stat[ISP1362_INT_SUSP]++;
+               handled = 1;
+               svc_mask &= ~HCuPINT_SUSP;
+
+               pr_info("%s: SUSPEND IRQ\n", __func__);
+       }
+
+       if (irqstat & HCuPINT_CLKRDY) {
+               isp1362_hcd->irq_stat[ISP1362_INT_CLKRDY]++;
+               handled = 1;
+               isp1362_hcd->irqenb &= ~HCuPINT_CLKRDY;
+               svc_mask &= ~HCuPINT_CLKRDY;
+               pr_info("%s: CLKRDY IRQ\n", __func__);
+       }
+
+       if (svc_mask)
+               pr_err("%s: Unserviced interrupt(s) %04x\n", __func__, svc_mask);
+
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, isp1362_hcd->irqenb);
+       isp1362_hcd->irq_active--;
+       spin_unlock(&isp1362_hcd->lock);
+
+       return IRQ_RETVAL(handled);
+}
+
+/*-------------------------------------------------------------------------*/
+
+#define        MAX_PERIODIC_LOAD       900     /* out of 1000 usec */
+static int balance(struct isp1362_hcd *isp1362_hcd, u16 interval, u16 load)
+{
+       int i, branch = -ENOSPC;
+
+       /* search for the least loaded schedule branch of that interval
+        * which has enough bandwidth left unreserved.
+        */
+       for (i = 0; i < interval; i++) {
+               if (branch < 0 || isp1362_hcd->load[branch] > isp1362_hcd->load[i]) {
+                       int j;
+
+                       for (j = i; j < PERIODIC_SIZE; j += interval) {
+                               if ((isp1362_hcd->load[j] + load) > MAX_PERIODIC_LOAD) {
+                                       pr_err("%s: new load %d load[%02x] %d max %d\n", __func__,
+                                           load, j, isp1362_hcd->load[j], MAX_PERIODIC_LOAD);
+                                       break;
+                               }
+                       }
+                       if (j < PERIODIC_SIZE)
+                               continue;
+                       branch = i;
+               }
+       }
+       return branch;
+}
+
+/* NB! ALL the code above this point runs with isp1362_hcd->lock
+   held, irqs off
+*/
+
+/*-------------------------------------------------------------------------*/
+
+static int isp1362_urb_enqueue(struct usb_hcd *hcd,
+                              struct urb *urb,
+                              gfp_t mem_flags)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       struct usb_device *udev = urb->dev;
+       unsigned int pipe = urb->pipe;
+       int is_out = !usb_pipein(pipe);
+       int type = usb_pipetype(pipe);
+       int epnum = usb_pipeendpoint(pipe);
+       struct usb_host_endpoint *hep = urb->ep;
+       struct isp1362_ep *ep = NULL;
+       unsigned long flags;
+       int retval = 0;
+
+       DBG(3, "%s: urb %p\n", __func__, urb);
+
+       if (type == PIPE_ISOCHRONOUS) {
+               pr_err("Isochronous transfers not supported\n");
+               return -ENOSPC;
+       }
+
+       URB_DBG("%s: FA %d ep%d%s %s: len %d %s%s\n", __func__,
+               usb_pipedevice(pipe), epnum,
+               is_out ? "out" : "in",
+               usb_pipecontrol(pipe) ? "ctrl" :
+                       usb_pipeint(pipe) ? "int" :
+                       usb_pipebulk(pipe) ? "bulk" :
+                       "iso",
+               urb->transfer_buffer_length,
+               (urb->transfer_flags & URB_ZERO_PACKET) ? "ZERO_PACKET " : "",
+               !(urb->transfer_flags & URB_SHORT_NOT_OK) ?
+               "short_ok" : "");
+
+       /* avoid all allocations within spinlocks: request or endpoint */
+       if (!hep->hcpriv) {
+               ep = kcalloc(1, sizeof *ep, mem_flags);
+               if (!ep)
+                       return -ENOMEM;
+       }
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       /* don't submit to a dead or disabled port */
+       if (!((isp1362_hcd->rhport[0] | isp1362_hcd->rhport[1]) &
+             (1 << USB_PORT_FEAT_ENABLE)) ||
+           !HC_IS_RUNNING(hcd->state)) {
+               kfree(ep);
+               retval = -ENODEV;
+               goto fail_not_linked;
+       }
+
+       retval = usb_hcd_link_urb_to_ep(hcd, urb);
+       if (retval) {
+               kfree(ep);
+               goto fail_not_linked;
+       }
+
+       if (hep->hcpriv) {
+               ep = hep->hcpriv;
+       } else {
+               INIT_LIST_HEAD(&ep->schedule);
+               INIT_LIST_HEAD(&ep->active);
+               INIT_LIST_HEAD(&ep->remove_list);
+               ep->udev = usb_get_dev(udev);
+               ep->hep = hep;
+               ep->epnum = epnum;
+               ep->maxpacket = usb_maxpacket(udev, urb->pipe, is_out);
+               ep->ptd_offset = -EINVAL;
+               ep->ptd_index = -EINVAL;
+               usb_settoggle(udev, epnum, is_out, 0);
+
+               if (type == PIPE_CONTROL)
+                       ep->nextpid = USB_PID_SETUP;
+               else if (is_out)
+                       ep->nextpid = USB_PID_OUT;
+               else
+                       ep->nextpid = USB_PID_IN;
+
+               switch (type) {
+               case PIPE_ISOCHRONOUS:
+               case PIPE_INTERRUPT:
+                       if (urb->interval > PERIODIC_SIZE)
+                               urb->interval = PERIODIC_SIZE;
+                       ep->interval = urb->interval;
+                       ep->branch = PERIODIC_SIZE;
+                       ep->load = usb_calc_bus_time(udev->speed, !is_out,
+                                                    (type == PIPE_ISOCHRONOUS),
+                                                    usb_maxpacket(udev, pipe, is_out)) / 1000;
+                       break;
+               }
+               hep->hcpriv = ep;
+       }
+       ep->num_req = isp1362_hcd->req_serial++;
+
+       /* maybe put endpoint into schedule */
+       switch (type) {
+       case PIPE_CONTROL:
+       case PIPE_BULK:
+               if (list_empty(&ep->schedule)) {
+                       DBG(1, "%s: Adding ep %p req %d to async schedule\n",
+                               __func__, ep, ep->num_req);
+                       list_add_tail(&ep->schedule, &isp1362_hcd->async);
+               }
+               break;
+       case PIPE_ISOCHRONOUS:
+       case PIPE_INTERRUPT:
+               urb->interval = ep->interval;
+
+               /* urb submitted for already existing EP */
+               if (ep->branch < PERIODIC_SIZE)
+                       break;
+
+               retval = balance(isp1362_hcd, ep->interval, ep->load);
+               if (retval < 0) {
+                       pr_err("%s: balance returned %d\n", __func__, retval);
+                       goto fail;
+               }
+               ep->branch = retval;
+               retval = 0;
+               isp1362_hcd->fmindex = isp1362_read_reg32(isp1362_hcd, HCFMNUM);
+               DBG(1, "%s: Current frame %04x branch %02x start_frame %04x(%04x)\n",
+                   __func__, isp1362_hcd->fmindex, ep->branch,
+                   ((isp1362_hcd->fmindex + PERIODIC_SIZE - 1) &
+                    ~(PERIODIC_SIZE - 1)) + ep->branch,
+                   (isp1362_hcd->fmindex & (PERIODIC_SIZE - 1)) + ep->branch);
+
+               if (list_empty(&ep->schedule)) {
+                       if (type == PIPE_ISOCHRONOUS) {
+                               u16 frame = isp1362_hcd->fmindex;
+
+                               frame += max_t(u16, 8, ep->interval);
+                               frame &= ~(ep->interval - 1);
+                               frame |= ep->branch;
+                               if (frame_before(frame, isp1362_hcd->fmindex))
+                                       frame += ep->interval;
+                               urb->start_frame = frame;
+
+                               DBG(1, "%s: Adding ep %p to isoc schedule\n", __func__, ep);
+                               list_add_tail(&ep->schedule, &isp1362_hcd->isoc);
+                       } else {
+                               DBG(1, "%s: Adding ep %p to periodic schedule\n", __func__, ep);
+                               list_add_tail(&ep->schedule, &isp1362_hcd->periodic);
+                       }
+               } else
+                       DBG(1, "%s: ep %p already scheduled\n", __func__, ep);
+
+               DBG(2, "%s: load %d bandwidth %d -> %d\n", __func__,
+                   ep->load / ep->interval, isp1362_hcd->load[ep->branch],
+                   isp1362_hcd->load[ep->branch] + ep->load);
+               isp1362_hcd->load[ep->branch] += ep->load;
+       }
+
+       urb->hcpriv = hep;
+       ALIGNSTAT(isp1362_hcd, urb->transfer_buffer);
+
+       switch (type) {
+       case PIPE_CONTROL:
+       case PIPE_BULK:
+               start_atl_transfers(isp1362_hcd);
+               break;
+       case PIPE_INTERRUPT:
+               start_intl_transfers(isp1362_hcd);
+               break;
+       case PIPE_ISOCHRONOUS:
+               start_iso_transfers(isp1362_hcd);
+               break;
+       default:
+               BUG();
+       }
+ fail:
+       if (retval)
+               usb_hcd_unlink_urb_from_ep(hcd, urb);
+
+
+ fail_not_linked:
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       if (retval)
+               DBG(0, "%s: urb %p failed with %d\n", __func__, urb, retval);
+       return retval;
+}
+
+static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       struct usb_host_endpoint *hep;
+       unsigned long flags;
+       struct isp1362_ep *ep;
+       int retval = 0;
+
+       DBG(3, "%s: urb %p\n", __func__, urb);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       retval = usb_hcd_check_unlink_urb(hcd, urb, status);
+       if (retval)
+               goto done;
+
+       hep = urb->hcpriv;
+
+       if (!hep) {
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+               return -EIDRM;
+       }
+
+       ep = hep->hcpriv;
+       if (ep) {
+               /* In front of queue? */
+               if (ep->hep->urb_list.next == &urb->urb_list) {
+                       if (!list_empty(&ep->active)) {
+                               DBG(1, "%s: urb %p ep %p req %d active PTD[%d] $%04x\n", __func__,
+                                   urb, ep, ep->num_req, ep->ptd_index, ep->ptd_offset);
+                               /* disable processing and queue PTD for removal */
+                               remove_ptd(isp1362_hcd, ep);
+                               urb = NULL;
+                       }
+               }
+               if (urb) {
+                       DBG(1, "%s: Finishing ep %p req %d\n", __func__, ep,
+                           ep->num_req);
+                       finish_request(isp1362_hcd, ep, urb, status);
+               } else
+                       DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb);
+       } else {
+               pr_warning("%s: No EP in URB %p\n", __func__, urb);
+               retval = -EINVAL;
+       }
+done:
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       DBG(3, "%s: exit\n", __func__);
+
+       return retval;
+}
+
+static void isp1362_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep)
+{
+       struct isp1362_ep *ep = hep->hcpriv;
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+
+       DBG(1, "%s: ep %p\n", __func__, ep);
+       if (!ep)
+               return;
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       if (!list_empty(&hep->urb_list)) {
+               if (!list_empty(&ep->active) && list_empty(&ep->remove_list)) {
+                       DBG(1, "%s: Removing ep %p req %d PTD[%d] $%04x\n", __func__,
+                           ep, ep->num_req, ep->ptd_index, ep->ptd_offset);
+                       remove_ptd(isp1362_hcd, ep);
+                       pr_info("%s: Waiting for Interrupt to clean up\n", __func__);
+               }
+       }
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       /* Wait for interrupt to clear out active list */
+       while (!list_empty(&ep->active))
+               msleep(1);
+
+       DBG(1, "%s: Freeing EP %p\n", __func__, ep);
+
+       usb_put_dev(ep->udev);
+       kfree(ep);
+       hep->hcpriv = NULL;
+}
+
+static int isp1362_get_frame(struct usb_hcd *hcd)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       u32 fmnum;
+       unsigned long flags;
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       fmnum = isp1362_read_reg32(isp1362_hcd, HCFMNUM);
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       return (int)fmnum;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* Adapted from ohci-hub.c */
+static int isp1362_hub_status_data(struct usb_hcd *hcd, char *buf)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       int ports, i, changed = 0;
+       unsigned long flags;
+
+       if (!HC_IS_RUNNING(hcd->state))
+               return -ESHUTDOWN;
+
+       /* Report no status change now, if we are scheduled to be
+          called later */
+       if (timer_pending(&hcd->rh_timer))
+               return 0;
+
+       ports = isp1362_hcd->rhdesca & RH_A_NDP;
+       BUG_ON(ports > 2);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       /* init status */
+       if (isp1362_hcd->rhstatus & (RH_HS_LPSC | RH_HS_OCIC))
+               buf[0] = changed = 1;
+       else
+               buf[0] = 0;
+
+       for (i = 0; i < ports; i++) {
+               u32 status = isp1362_hcd->rhport[i];
+
+               if (status & (RH_PS_CSC | RH_PS_PESC | RH_PS_PSSC |
+                             RH_PS_OCIC | RH_PS_PRSC)) {
+                       changed = 1;
+                       buf[0] |= 1 << (i + 1);
+                       continue;
+               }
+
+               if (!(status & RH_PS_CCS))
+                       continue;
+       }
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       return changed;
+}
+
+static void isp1362_hub_descriptor(struct isp1362_hcd *isp1362_hcd,
+                                  struct usb_hub_descriptor *desc)
+{
+       u32 reg = isp1362_hcd->rhdesca;
+
+       DBG(3, "%s: enter\n", __func__);
+
+       desc->bDescriptorType = 0x29;
+       desc->bDescLength = 9;
+       desc->bHubContrCurrent = 0;
+       desc->bNbrPorts = reg & 0x3;
+       /* Power switching, device type, overcurrent. */
+       desc->wHubCharacteristics = cpu_to_le16((reg >> 8) & 0x1f);
+       DBG(0, "%s: hubcharacteristics = %02x\n", __func__, cpu_to_le16((reg >> 8) & 0x1f));
+       desc->bPwrOn2PwrGood = (reg >> 24) & 0xff;
+       /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
+       desc->bitmap[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
+       desc->bitmap[1] = ~0;
+
+       DBG(3, "%s: exit\n", __func__);
+}
+
+/* Adapted from ohci-hub.c */
+static int isp1362_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+                              u16 wIndex, char *buf, u16 wLength)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       int retval = 0;
+       unsigned long flags;
+       unsigned long t1;
+       int ports = isp1362_hcd->rhdesca & RH_A_NDP;
+       u32 tmp = 0;
+
+       switch (typeReq) {
+       case ClearHubFeature:
+               DBG(0, "ClearHubFeature: ");
+               switch (wValue) {
+               case C_HUB_OVER_CURRENT:
+                       _DBG(0, "C_HUB_OVER_CURRENT\n");
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_OCIC);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+               case C_HUB_LOCAL_POWER:
+                       _DBG(0, "C_HUB_LOCAL_POWER\n");
+                       break;
+               default:
+                       goto error;
+               }
+               break;
+       case SetHubFeature:
+               DBG(0, "SetHubFeature: ");
+               switch (wValue) {
+               case C_HUB_OVER_CURRENT:
+               case C_HUB_LOCAL_POWER:
+                       _DBG(0, "C_HUB_OVER_CURRENT or C_HUB_LOCAL_POWER\n");
+                       break;
+               default:
+                       goto error;
+               }
+               break;
+       case GetHubDescriptor:
+               DBG(0, "GetHubDescriptor\n");
+               isp1362_hub_descriptor(isp1362_hcd, (struct usb_hub_descriptor *)buf);
+               break;
+       case GetHubStatus:
+               DBG(0, "GetHubStatus\n");
+               put_unaligned(cpu_to_le32(0), (__le32 *) buf);
+               break;
+       case GetPortStatus:
+#ifndef VERBOSE
+               DBG(0, "GetPortStatus\n");
+#endif
+               if (!wIndex || wIndex > ports)
+                       goto error;
+               tmp = isp1362_hcd->rhport[--wIndex];
+               put_unaligned(cpu_to_le32(tmp), (__le32 *) buf);
+               break;
+       case ClearPortFeature:
+               DBG(0, "ClearPortFeature: ");
+               if (!wIndex || wIndex > ports)
+                       goto error;
+               wIndex--;
+
+               switch (wValue) {
+               case USB_PORT_FEAT_ENABLE:
+                       _DBG(0, "USB_PORT_FEAT_ENABLE\n");
+                       tmp = RH_PS_CCS;
+                       break;
+               case USB_PORT_FEAT_C_ENABLE:
+                       _DBG(0, "USB_PORT_FEAT_C_ENABLE\n");
+                       tmp = RH_PS_PESC;
+                       break;
+               case USB_PORT_FEAT_SUSPEND:
+                       _DBG(0, "USB_PORT_FEAT_SUSPEND\n");
+                       tmp = RH_PS_POCI;
+                       break;
+               case USB_PORT_FEAT_C_SUSPEND:
+                       _DBG(0, "USB_PORT_FEAT_C_SUSPEND\n");
+                       tmp = RH_PS_PSSC;
+                       break;
+               case USB_PORT_FEAT_POWER:
+                       _DBG(0, "USB_PORT_FEAT_POWER\n");
+                       tmp = RH_PS_LSDA;
+
+                       break;
+               case USB_PORT_FEAT_C_CONNECTION:
+                       _DBG(0, "USB_PORT_FEAT_C_CONNECTION\n");
+                       tmp = RH_PS_CSC;
+                       break;
+               case USB_PORT_FEAT_C_OVER_CURRENT:
+                       _DBG(0, "USB_PORT_FEAT_C_OVER_CURRENT\n");
+                       tmp = RH_PS_OCIC;
+                       break;
+               case USB_PORT_FEAT_C_RESET:
+                       _DBG(0, "USB_PORT_FEAT_C_RESET\n");
+                       tmp = RH_PS_PRSC;
+                       break;
+               default:
+                       goto error;
+               }
+
+               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+               isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, tmp);
+               isp1362_hcd->rhport[wIndex] =
+                       isp1362_read_reg32(isp1362_hcd, HCRHPORT1 + wIndex);
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+               break;
+       case SetPortFeature:
+               DBG(0, "SetPortFeature: ");
+               if (!wIndex || wIndex > ports)
+                       goto error;
+               wIndex--;
+               switch (wValue) {
+               case USB_PORT_FEAT_SUSPEND:
+                       _DBG(0, "USB_PORT_FEAT_SUSPEND\n");
+#ifdef CONFIG_USB_OTG
+                       if (ohci->hcd.self.otg_port == (wIndex + 1) &&
+                           ohci->hcd.self.b_hnp_enable) {
+                               start_hnp(ohci);
+                               break;
+                       }
+#endif
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, RH_PS_PSS);
+                       isp1362_hcd->rhport[wIndex] =
+                               isp1362_read_reg32(isp1362_hcd, HCRHPORT1 + wIndex);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                       break;
+               case USB_PORT_FEAT_POWER:
+                       _DBG(0, "USB_PORT_FEAT_POWER\n");
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, RH_PS_PPS);
+                       isp1362_hcd->rhport[wIndex] =
+                               isp1362_read_reg32(isp1362_hcd, HCRHPORT1 + wIndex);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                       break;
+               case USB_PORT_FEAT_RESET:
+                       _DBG(0, "USB_PORT_FEAT_RESET\n");
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+                       t1 = jiffies + msecs_to_jiffies(USB_RESET_WIDTH);
+                       while (time_before(jiffies, t1)) {
+                               /* spin until any current reset finishes */
+                               for (;;) {
+                                       tmp = isp1362_read_reg32(isp1362_hcd, HCRHPORT1 + wIndex);
+                                       if (!(tmp & RH_PS_PRS))
+                                               break;
+                                       udelay(500);
+                               }
+                               if (!(tmp & RH_PS_CCS))
+                                       break;
+                               /* Reset lasts 10ms (claims datasheet) */
+                               isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, (RH_PS_PRS));
+
+                               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                               msleep(10);
+                               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       }
+
+                       isp1362_hcd->rhport[wIndex] = isp1362_read_reg32(isp1362_hcd,
+                                                                        HCRHPORT1 + wIndex);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                       break;
+               default:
+                       goto error;
+               }
+               break;
+
+       default:
+ error:
+               /* "protocol stall" on error */
+               _DBG(0, "PROTOCOL STALL\n");
+               retval = -EPIPE;
+       }
+
+       return retval;
+}
+
+#ifdef CONFIG_PM
+static int isp1362_bus_suspend(struct usb_hcd *hcd)
+{
+       int status = 0;
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+
+       if (time_before(jiffies, isp1362_hcd->next_statechange))
+               msleep(5);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
+       switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) {
+       case OHCI_USB_RESUME:
+               DBG(0, "%s: resume/suspend?\n", __func__);
+               isp1362_hcd->hc_control &= ~OHCI_CTRL_HCFS;
+               isp1362_hcd->hc_control |= OHCI_USB_RESET;
+               isp1362_write_reg32(isp1362_hcd, HCCONTROL, isp1362_hcd->hc_control);
+               /* FALL THROUGH */
+       case OHCI_USB_RESET:
+               status = -EBUSY;
+               pr_warning("%s: needs reinit!\n", __func__);
+               goto done;
+       case OHCI_USB_SUSPEND:
+               pr_warning("%s: already suspended?\n", __func__);
+               goto done;
+       }
+       DBG(0, "%s: suspend root hub\n", __func__);
+
+       /* First stop any processing */
+       hcd->state = HC_STATE_QUIESCING;
+       if (!list_empty(&isp1362_hcd->atl_queue.active) ||
+           !list_empty(&isp1362_hcd->intl_queue.active) ||
+           !list_empty(&isp1362_hcd->istl_queue[0] .active) ||
+           !list_empty(&isp1362_hcd->istl_queue[1] .active)) {
+               int limit;
+
+               isp1362_write_reg32(isp1362_hcd, HCATLSKIP, ~0);
+               isp1362_write_reg32(isp1362_hcd, HCINTLSKIP, ~0);
+               isp1362_write_reg16(isp1362_hcd, HCBUFSTAT, 0);
+               isp1362_write_reg16(isp1362_hcd, HCuPINTENB, 0);
+               isp1362_write_reg32(isp1362_hcd, HCINTSTAT, OHCI_INTR_SF);
+
+               DBG(0, "%s: stopping schedules ...\n", __func__);
+               limit = 2000;
+               while (limit > 0) {
+                       udelay(250);
+                       limit -= 250;
+                       if (isp1362_read_reg32(isp1362_hcd, HCINTSTAT) & OHCI_INTR_SF)
+                               break;
+               }
+               mdelay(7);
+               if (isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_ATL) {
+                       u32 done_map = isp1362_read_reg32(isp1362_hcd, HCATLDONE);
+                       finish_transfers(isp1362_hcd, done_map, &isp1362_hcd->atl_queue);
+               }
+               if (isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_INTL) {
+                       u32 done_map = isp1362_read_reg32(isp1362_hcd, HCINTLDONE);
+                       finish_transfers(isp1362_hcd, done_map, &isp1362_hcd->intl_queue);
+               }
+               if (isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_ISTL0)
+                       finish_iso_transfers(isp1362_hcd, &isp1362_hcd->istl_queue[0]);
+               if (isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_ISTL1)
+                       finish_iso_transfers(isp1362_hcd, &isp1362_hcd->istl_queue[1]);
+       }
+       DBG(0, "%s: HCINTSTAT: %08x\n", __func__,
+                   isp1362_read_reg32(isp1362_hcd, HCINTSTAT));
+       isp1362_write_reg32(isp1362_hcd, HCINTSTAT,
+                           isp1362_read_reg32(isp1362_hcd, HCINTSTAT));
+
+       /* Suspend hub */
+       isp1362_hcd->hc_control = OHCI_USB_SUSPEND;
+       isp1362_show_reg(isp1362_hcd, HCCONTROL);
+       isp1362_write_reg32(isp1362_hcd, HCCONTROL, isp1362_hcd->hc_control);
+       isp1362_show_reg(isp1362_hcd, HCCONTROL);
+
+#if 1
+       isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
+       if ((isp1362_hcd->hc_control & OHCI_CTRL_HCFS) != OHCI_USB_SUSPEND) {
+               pr_err("%s: controller won't suspend %08x\n", __func__,
+                   isp1362_hcd->hc_control);
+               status = -EBUSY;
+       } else
+#endif
+       {
+               /* no resumes until devices finish suspending */
+               isp1362_hcd->next_statechange = jiffies + msecs_to_jiffies(5);
+       }
+done:
+       if (status == 0) {
+               hcd->state = HC_STATE_SUSPENDED;
+               DBG(0, "%s: HCD suspended: %08x\n", __func__,
+                   isp1362_read_reg32(isp1362_hcd, HCCONTROL));
+       }
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       return status;
+}
+
+static int isp1362_bus_resume(struct usb_hcd *hcd)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       u32 port;
+       unsigned long flags;
+       int status = -EINPROGRESS;
+
+       if (time_before(jiffies, isp1362_hcd->next_statechange))
+               msleep(5);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
+       pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control);
+       if (hcd->state == HC_STATE_RESUMING) {
+               pr_warning("%s: duplicate resume\n", __func__);
+               status = 0;
+       } else
+               switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) {
+               case OHCI_USB_SUSPEND:
+                       DBG(0, "%s: resume root hub\n", __func__);
+                       isp1362_hcd->hc_control &= ~OHCI_CTRL_HCFS;
+                       isp1362_hcd->hc_control |= OHCI_USB_RESUME;
+                       isp1362_write_reg32(isp1362_hcd, HCCONTROL, isp1362_hcd->hc_control);
+                       break;
+               case OHCI_USB_RESUME:
+                       /* HCFS changes sometime after INTR_RD */
+                       DBG(0, "%s: remote wakeup\n", __func__);
+                       break;
+               case OHCI_USB_OPER:
+                       DBG(0, "%s: odd resume\n", __func__);
+                       status = 0;
+                       hcd->self.root_hub->dev.power.power_state = PMSG_ON;
+                       break;
+               default:                /* RESET, we lost power */
+                       DBG(0, "%s: root hub hardware reset\n", __func__);
+                       status = -EBUSY;
+               }
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       if (status == -EBUSY) {
+               DBG(0, "%s: Restarting HC\n", __func__);
+               isp1362_hc_stop(hcd);
+               return isp1362_hc_start(hcd);
+       }
+       if (status != -EINPROGRESS)
+               return status;
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       port = isp1362_read_reg32(isp1362_hcd, HCRHDESCA) & RH_A_NDP;
+       while (port--) {
+               u32 stat = isp1362_read_reg32(isp1362_hcd, HCRHPORT1 + port);
+
+               /* force global, not selective, resume */
+               if (!(stat & RH_PS_PSS)) {
+                       DBG(0, "%s: Not Resuming RH port %d\n", __func__, port);
+                       continue;
+               }
+               DBG(0, "%s: Resuming RH port %d\n", __func__, port);
+               isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + port, RH_PS_POCI);
+       }
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       /* Some controllers (lucent) need extra-long delays */
+       hcd->state = HC_STATE_RESUMING;
+       mdelay(20 /* usb 11.5.1.10 */ + 15);
+
+       isp1362_hcd->hc_control = OHCI_USB_OPER;
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       isp1362_show_reg(isp1362_hcd, HCCONTROL);
+       isp1362_write_reg32(isp1362_hcd, HCCONTROL, isp1362_hcd->hc_control);
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       /* TRSMRCY */
+       msleep(10);
+
+       /* keep it alive for ~5x suspend + resume costs */
+       isp1362_hcd->next_statechange = jiffies + msecs_to_jiffies(250);
+
+       hcd->self.root_hub->dev.power.power_state = PMSG_ON;
+       hcd->state = HC_STATE_RUNNING;
+       return 0;
+}
+#else
+#define        isp1362_bus_suspend     NULL
+#define        isp1362_bus_resume      NULL
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+#ifdef STUB_DEBUG_FILE
+
+static inline void create_debug_file(struct isp1362_hcd *isp1362_hcd)
+{
+}
+static inline void remove_debug_file(struct isp1362_hcd *isp1362_hcd)
+{
+}
+
+#else
+
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+
+static void dump_irq(struct seq_file *s, char *label, u16 mask)
+{
+       seq_printf(s, "%-15s %04x%s%s%s%s%s%s\n", label, mask,
+                  mask & HCuPINT_CLKRDY ? " clkrdy" : "",
+                  mask & HCuPINT_SUSP ? " susp" : "",
+                  mask & HCuPINT_OPR ? " opr" : "",
+                  mask & HCuPINT_EOT ? " eot" : "",
+                  mask & HCuPINT_ATL ? " atl" : "",
+                  mask & HCuPINT_SOF ? " sof" : "");
+}
+
+static void dump_int(struct seq_file *s, char *label, u32 mask)
+{
+       seq_printf(s, "%-15s %08x%s%s%s%s%s%s%s\n", label, mask,
+                  mask & OHCI_INTR_MIE ? " MIE" : "",
+                  mask & OHCI_INTR_RHSC ? " rhsc" : "",
+                  mask & OHCI_INTR_FNO ? " fno" : "",
+                  mask & OHCI_INTR_UE ? " ue" : "",
+                  mask & OHCI_INTR_RD ? " rd" : "",
+                  mask & OHCI_INTR_SF ? " sof" : "",
+                  mask & OHCI_INTR_SO ? " so" : "");
+}
+
+static void dump_ctrl(struct seq_file *s, char *label, u32 mask)
+{
+       seq_printf(s, "%-15s %08x%s%s%s\n", label, mask,
+                  mask & OHCI_CTRL_RWC ? " rwc" : "",
+                  mask & OHCI_CTRL_RWE ? " rwe" : "",
+                  ({
+                          char *hcfs;
+                          switch (mask & OHCI_CTRL_HCFS) {
+                          case OHCI_USB_OPER:
+                                  hcfs = " oper";
+                                  break;
+                          case OHCI_USB_RESET:
+                                  hcfs = " reset";
+                                  break;
+                          case OHCI_USB_RESUME:
+                                  hcfs = " resume";
+                                  break;
+                          case OHCI_USB_SUSPEND:
+                                  hcfs = " suspend";
+                                  break;
+                          default:
+                                  hcfs = " ?";
+                          }
+                          hcfs;
+                  }));
+}
+
+static void dump_regs(struct seq_file *s, struct isp1362_hcd *isp1362_hcd)
+{
+       seq_printf(s, "HCREVISION [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCREVISION),
+                  isp1362_read_reg32(isp1362_hcd, HCREVISION));
+       seq_printf(s, "HCCONTROL  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCCONTROL),
+                  isp1362_read_reg32(isp1362_hcd, HCCONTROL));
+       seq_printf(s, "HCCMDSTAT  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCCMDSTAT),
+                  isp1362_read_reg32(isp1362_hcd, HCCMDSTAT));
+       seq_printf(s, "HCINTSTAT  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCINTSTAT),
+                  isp1362_read_reg32(isp1362_hcd, HCINTSTAT));
+       seq_printf(s, "HCINTENB   [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCINTENB),
+                  isp1362_read_reg32(isp1362_hcd, HCINTENB));
+       seq_printf(s, "HCFMINTVL  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCFMINTVL),
+                  isp1362_read_reg32(isp1362_hcd, HCFMINTVL));
+       seq_printf(s, "HCFMREM    [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCFMREM),
+                  isp1362_read_reg32(isp1362_hcd, HCFMREM));
+       seq_printf(s, "HCFMNUM    [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCFMNUM),
+                  isp1362_read_reg32(isp1362_hcd, HCFMNUM));
+       seq_printf(s, "HCLSTHRESH [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCLSTHRESH),
+                  isp1362_read_reg32(isp1362_hcd, HCLSTHRESH));
+       seq_printf(s, "HCRHDESCA  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCRHDESCA),
+                  isp1362_read_reg32(isp1362_hcd, HCRHDESCA));
+       seq_printf(s, "HCRHDESCB  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCRHDESCB),
+                  isp1362_read_reg32(isp1362_hcd, HCRHDESCB));
+       seq_printf(s, "HCRHSTATUS [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCRHSTATUS),
+                  isp1362_read_reg32(isp1362_hcd, HCRHSTATUS));
+       seq_printf(s, "HCRHPORT1  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCRHPORT1),
+                  isp1362_read_reg32(isp1362_hcd, HCRHPORT1));
+       seq_printf(s, "HCRHPORT2  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCRHPORT2),
+                  isp1362_read_reg32(isp1362_hcd, HCRHPORT2));
+       seq_printf(s, "\n");
+       seq_printf(s, "HCHWCFG    [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCHWCFG),
+                  isp1362_read_reg16(isp1362_hcd, HCHWCFG));
+       seq_printf(s, "HCDMACFG   [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCDMACFG),
+                  isp1362_read_reg16(isp1362_hcd, HCDMACFG));
+       seq_printf(s, "HCXFERCTR  [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCXFERCTR),
+                  isp1362_read_reg16(isp1362_hcd, HCXFERCTR));
+       seq_printf(s, "HCuPINT    [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCuPINT),
+                  isp1362_read_reg16(isp1362_hcd, HCuPINT));
+       seq_printf(s, "HCuPINTENB [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCuPINTENB),
+                  isp1362_read_reg16(isp1362_hcd, HCuPINTENB));
+       seq_printf(s, "HCCHIPID   [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCCHIPID),
+                  isp1362_read_reg16(isp1362_hcd, HCCHIPID));
+       seq_printf(s, "HCSCRATCH  [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCSCRATCH),
+                  isp1362_read_reg16(isp1362_hcd, HCSCRATCH));
+       seq_printf(s, "HCBUFSTAT  [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCBUFSTAT),
+                  isp1362_read_reg16(isp1362_hcd, HCBUFSTAT));
+       seq_printf(s, "HCDIRADDR  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCDIRADDR),
+                  isp1362_read_reg32(isp1362_hcd, HCDIRADDR));
+#if 0
+       seq_printf(s, "HCDIRDATA  [%02x]     %04x\n", ISP1362_REG_NO(HCDIRDATA),
+                  isp1362_read_reg16(isp1362_hcd, HCDIRDATA));
+#endif
+       seq_printf(s, "HCISTLBUFSZ[%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCISTLBUFSZ),
+                  isp1362_read_reg16(isp1362_hcd, HCISTLBUFSZ));
+       seq_printf(s, "HCISTLRATE [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCISTLRATE),
+                  isp1362_read_reg16(isp1362_hcd, HCISTLRATE));
+       seq_printf(s, "\n");
+       seq_printf(s, "HCINTLBUFSZ[%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLBUFSZ),
+                  isp1362_read_reg16(isp1362_hcd, HCINTLBUFSZ));
+       seq_printf(s, "HCINTLBLKSZ[%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLBLKSZ),
+                  isp1362_read_reg16(isp1362_hcd, HCINTLBLKSZ));
+       seq_printf(s, "HCINTLDONE [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLDONE),
+                  isp1362_read_reg32(isp1362_hcd, HCINTLDONE));
+       seq_printf(s, "HCINTLSKIP [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLSKIP),
+                  isp1362_read_reg32(isp1362_hcd, HCINTLSKIP));
+       seq_printf(s, "HCINTLLAST [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLLAST),
+                  isp1362_read_reg32(isp1362_hcd, HCINTLLAST));
+       seq_printf(s, "HCINTLCURR [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCINTLCURR),
+                  isp1362_read_reg16(isp1362_hcd, HCINTLCURR));
+       seq_printf(s, "\n");
+       seq_printf(s, "HCATLBUFSZ [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCATLBUFSZ),
+                  isp1362_read_reg16(isp1362_hcd, HCATLBUFSZ));
+       seq_printf(s, "HCATLBLKSZ [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCATLBLKSZ),
+                  isp1362_read_reg16(isp1362_hcd, HCATLBLKSZ));
+#if 0
+       seq_printf(s, "HCATLDONE  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCATLDONE),
+                  isp1362_read_reg32(isp1362_hcd, HCATLDONE));
+#endif
+       seq_printf(s, "HCATLSKIP  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCATLSKIP),
+                  isp1362_read_reg32(isp1362_hcd, HCATLSKIP));
+       seq_printf(s, "HCATLLAST  [%02x] %08x\n", ISP1362_REG_NO(ISP1362_REG_HCATLLAST),
+                  isp1362_read_reg32(isp1362_hcd, HCATLLAST));
+       seq_printf(s, "HCATLCURR  [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCATLCURR),
+                  isp1362_read_reg16(isp1362_hcd, HCATLCURR));
+       seq_printf(s, "\n");
+       seq_printf(s, "HCATLDTC   [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCATLDTC),
+                  isp1362_read_reg16(isp1362_hcd, HCATLDTC));
+       seq_printf(s, "HCATLDTCTO [%02x]     %04x\n", ISP1362_REG_NO(ISP1362_REG_HCATLDTCTO),
+                  isp1362_read_reg16(isp1362_hcd, HCATLDTCTO));
+}
+
+static int proc_isp1362_show(struct seq_file *s, void *unused)
+{
+       struct isp1362_hcd *isp1362_hcd = s->private;
+       struct isp1362_ep *ep;
+       int i;
+
+       seq_printf(s, "%s\n%s version %s\n",
+                  isp1362_hcd_to_hcd(isp1362_hcd)->product_desc, hcd_name, DRIVER_VERSION);
+
+       /* collect statistics to help estimate potential win for
+        * DMA engines that care about alignment (PXA)
+        */
+       seq_printf(s, "alignment:  16b/%ld 8b/%ld 4b/%ld 2b/%ld 1b/%ld\n",
+                  isp1362_hcd->stat16, isp1362_hcd->stat8, isp1362_hcd->stat4,
+                  isp1362_hcd->stat2, isp1362_hcd->stat1);
+       seq_printf(s, "max # ptds in ATL  fifo: %d\n", isp1362_hcd->atl_queue.stat_maxptds);
+       seq_printf(s, "max # ptds in INTL fifo: %d\n", isp1362_hcd->intl_queue.stat_maxptds);
+       seq_printf(s, "max # ptds in ISTL fifo: %d\n",
+                  max(isp1362_hcd->istl_queue[0] .stat_maxptds,
+                      isp1362_hcd->istl_queue[1] .stat_maxptds));
+
+       /* FIXME: don't show the following in suspended state */
+       spin_lock_irq(&isp1362_hcd->lock);
+
+       dump_irq(s, "hc_irq_enable", isp1362_read_reg16(isp1362_hcd, HCuPINTENB));
+       dump_irq(s, "hc_irq_status", isp1362_read_reg16(isp1362_hcd, HCuPINT));
+       dump_int(s, "ohci_int_enable", isp1362_read_reg32(isp1362_hcd, HCINTENB));
+       dump_int(s, "ohci_int_status", isp1362_read_reg32(isp1362_hcd, HCINTSTAT));
+       dump_ctrl(s, "ohci_control", isp1362_read_reg32(isp1362_hcd, HCCONTROL));
+
+       for (i = 0; i < NUM_ISP1362_IRQS; i++)
+               if (isp1362_hcd->irq_stat[i])
+                       seq_printf(s, "%-15s: %d\n",
+                                  ISP1362_INT_NAME(i), isp1362_hcd->irq_stat[i]);
+
+       dump_regs(s, isp1362_hcd);
+       list_for_each_entry(ep, &isp1362_hcd->async, schedule) {
+               struct urb *urb;
+
+               seq_printf(s, "%p, ep%d%s, maxpacket %d:\n", ep, ep->epnum,
+                          ({
+                                  char *s;
+                                  switch (ep->nextpid) {
+                                  case USB_PID_IN:
+                                          s = "in";
+                                          break;
+                                  case USB_PID_OUT:
+                                          s = "out";
+                                          break;
+                                  case USB_PID_SETUP:
+                                          s = "setup";
+                                          break;
+                                  case USB_PID_ACK:
+                                          s = "status";
+                                          break;
+                                  default:
+                                          s = "?";
+                                          break;
+                                  };
+                                  s;}), ep->maxpacket) ;
+               list_for_each_entry(urb, &ep->hep->urb_list, urb_list) {
+                       seq_printf(s, "  urb%p, %d/%d\n", urb,
+                                  urb->actual_length,
+                                  urb->transfer_buffer_length);
+               }
+       }
+       if (!list_empty(&isp1362_hcd->async))
+               seq_printf(s, "\n");
+       dump_ptd_queue(&isp1362_hcd->atl_queue);
+
+       seq_printf(s, "periodic size= %d\n", PERIODIC_SIZE);
+
+       list_for_each_entry(ep, &isp1362_hcd->periodic, schedule) {
+               seq_printf(s, "branch:%2d load:%3d PTD[%d] $%04x:\n", ep->branch,
+                          isp1362_hcd->load[ep->branch], ep->ptd_index, ep->ptd_offset);
+
+               seq_printf(s, "   %d/%p (%sdev%d ep%d%s max %d)\n",
+                          ep->interval, ep,
+                          (ep->udev->speed == USB_SPEED_FULL) ? "" : "ls ",
+                          ep->udev->devnum, ep->epnum,
+                          (ep->epnum == 0) ? "" :
+                          ((ep->nextpid == USB_PID_IN) ?
+                           "in" : "out"), ep->maxpacket);
+       }
+       dump_ptd_queue(&isp1362_hcd->intl_queue);
+
+       seq_printf(s, "ISO:\n");
+
+       list_for_each_entry(ep, &isp1362_hcd->isoc, schedule) {
+               seq_printf(s, "   %d/%p (%sdev%d ep%d%s max %d)\n",
+                          ep->interval, ep,
+                          (ep->udev->speed == USB_SPEED_FULL) ? "" : "ls ",
+                          ep->udev->devnum, ep->epnum,
+                          (ep->epnum == 0) ? "" :
+                          ((ep->nextpid == USB_PID_IN) ?
+                           "in" : "out"), ep->maxpacket);
+       }
+
+       spin_unlock_irq(&isp1362_hcd->lock);
+       seq_printf(s, "\n");
+
+       return 0;
+}
+
+static int proc_isp1362_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, proc_isp1362_show, PDE(inode)->data);
+}
+
+static const struct file_operations proc_ops = {
+       .open = proc_isp1362_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+};
+
+/* expect just one isp1362_hcd per system */
+static const char proc_filename[] = "driver/isp1362";
+
+static void create_debug_file(struct isp1362_hcd *isp1362_hcd)
+{
+       struct proc_dir_entry *pde;
+
+       pde = create_proc_entry(proc_filename, 0, NULL);
+       if (pde == NULL) {
+               pr_warning("%s: Failed to create debug file '%s'\n", __func__, proc_filename);
+               return;
+       }
+
+       pde->proc_fops = &proc_ops;
+       pde->data = isp1362_hcd;
+       isp1362_hcd->pde = pde;
+}
+
+static void remove_debug_file(struct isp1362_hcd *isp1362_hcd)
+{
+       if (isp1362_hcd->pde)
+               remove_proc_entry(proc_filename, 0);
+}
+
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+static void isp1362_sw_reset(struct isp1362_hcd *isp1362_hcd)
+{
+       int tmp = 20;
+       unsigned long flags;
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       isp1362_write_reg16(isp1362_hcd, HCSWRES, HCSWRES_MAGIC);
+       isp1362_write_reg32(isp1362_hcd, HCCMDSTAT, OHCI_HCR);
+       while (--tmp) {
+               mdelay(1);
+               if (!(isp1362_read_reg32(isp1362_hcd, HCCMDSTAT) & OHCI_HCR))
+                       break;
+       }
+       if (!tmp)
+               pr_err("Software reset timeout\n");
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+}
+
+static int isp1362_mem_config(struct usb_hcd *hcd)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+       u32 total;
+       u16 istl_size = ISP1362_ISTL_BUFSIZE;
+       u16 intl_blksize = ISP1362_INTL_BLKSIZE + PTD_HEADER_SIZE;
+       u16 intl_size = ISP1362_INTL_BUFFERS * intl_blksize;
+       u16 atl_blksize = ISP1362_ATL_BLKSIZE + PTD_HEADER_SIZE;
+       u16 atl_buffers = (ISP1362_BUF_SIZE - (istl_size + intl_size)) / atl_blksize;
+       u16 atl_size;
+       int i;
+
+       WARN_ON(istl_size & 3);
+       WARN_ON(atl_blksize & 3);
+       WARN_ON(intl_blksize & 3);
+       WARN_ON(atl_blksize < PTD_HEADER_SIZE);
+       WARN_ON(intl_blksize < PTD_HEADER_SIZE);
+
+       BUG_ON((unsigned)ISP1362_INTL_BUFFERS > 32);
+       if (atl_buffers > 32)
+               atl_buffers = 32;
+       atl_size = atl_buffers * atl_blksize;
+       total = atl_size + intl_size + istl_size;
+       dev_info(hcd->self.controller, "ISP1362 Memory usage:\n");
+       dev_info(hcd->self.controller, "  ISTL:    2 * %4d:     %4d @ $%04x:$%04x\n",
+                istl_size / 2, istl_size, 0, istl_size / 2);
+       dev_info(hcd->self.controller, "  INTL: %4d * (%3u+8):  %4d @ $%04x\n",
+                ISP1362_INTL_BUFFERS, intl_blksize - PTD_HEADER_SIZE,
+                intl_size, istl_size);
+       dev_info(hcd->self.controller, "  ATL : %4d * (%3u+8):  %4d @ $%04x\n",
+                atl_buffers, atl_blksize - PTD_HEADER_SIZE,
+                atl_size, istl_size + intl_size);
+       dev_info(hcd->self.controller, "  USED/FREE:   %4d      %4d\n", total,
+                ISP1362_BUF_SIZE - total);
+
+       if (total > ISP1362_BUF_SIZE) {
+               dev_err(hcd->self.controller, "%s: Memory requested: %d, available %d\n",
+                       __func__, total, ISP1362_BUF_SIZE);
+               return -ENOMEM;
+       }
+
+       total = istl_size + intl_size + atl_size;
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       for (i = 0; i < 2; i++) {
+               isp1362_hcd->istl_queue[i].buf_start = i * istl_size / 2,
+               isp1362_hcd->istl_queue[i].buf_size = istl_size / 2;
+               isp1362_hcd->istl_queue[i].blk_size = 4;
+               INIT_LIST_HEAD(&isp1362_hcd->istl_queue[i].active);
+               snprintf(isp1362_hcd->istl_queue[i].name,
+                        sizeof(isp1362_hcd->istl_queue[i].name), "ISTL%d", i);
+               DBG(3, "%s: %5s buf $%04x %d\n", __func__,
+                    isp1362_hcd->istl_queue[i].name,
+                    isp1362_hcd->istl_queue[i].buf_start,
+                    isp1362_hcd->istl_queue[i].buf_size);
+       }
+       isp1362_write_reg16(isp1362_hcd, HCISTLBUFSZ, istl_size / 2);
+
+       isp1362_hcd->intl_queue.buf_start = istl_size;
+       isp1362_hcd->intl_queue.buf_size = intl_size;
+       isp1362_hcd->intl_queue.buf_count = ISP1362_INTL_BUFFERS;
+       isp1362_hcd->intl_queue.blk_size = intl_blksize;
+       isp1362_hcd->intl_queue.buf_avail = isp1362_hcd->intl_queue.buf_count;
+       isp1362_hcd->intl_queue.skip_map = ~0;
+       INIT_LIST_HEAD(&isp1362_hcd->intl_queue.active);
+
+       isp1362_write_reg16(isp1362_hcd, HCINTLBUFSZ,
+                           isp1362_hcd->intl_queue.buf_size);
+       isp1362_write_reg16(isp1362_hcd, HCINTLBLKSZ,
+                           isp1362_hcd->intl_queue.blk_size - PTD_HEADER_SIZE);
+       isp1362_write_reg32(isp1362_hcd, HCINTLSKIP, ~0);
+       isp1362_write_reg32(isp1362_hcd, HCINTLLAST,
+                           1 << (ISP1362_INTL_BUFFERS - 1));
+
+       isp1362_hcd->atl_queue.buf_start = istl_size + intl_size;
+       isp1362_hcd->atl_queue.buf_size = atl_size;
+       isp1362_hcd->atl_queue.buf_count = atl_buffers;
+       isp1362_hcd->atl_queue.blk_size = atl_blksize;
+       isp1362_hcd->atl_queue.buf_avail = isp1362_hcd->atl_queue.buf_count;
+       isp1362_hcd->atl_queue.skip_map = ~0;
+       INIT_LIST_HEAD(&isp1362_hcd->atl_queue.active);
+
+       isp1362_write_reg16(isp1362_hcd, HCATLBUFSZ,
+                           isp1362_hcd->atl_queue.buf_size);
+       isp1362_write_reg16(isp1362_hcd, HCATLBLKSZ,
+                           isp1362_hcd->atl_queue.blk_size - PTD_HEADER_SIZE);
+       isp1362_write_reg32(isp1362_hcd, HCATLSKIP, ~0);
+       isp1362_write_reg32(isp1362_hcd, HCATLLAST,
+                           1 << (atl_buffers - 1));
+
+       snprintf(isp1362_hcd->atl_queue.name,
+                sizeof(isp1362_hcd->atl_queue.name), "ATL");
+       snprintf(isp1362_hcd->intl_queue.name,
+                sizeof(isp1362_hcd->intl_queue.name), "INTL");
+       DBG(3, "%s: %5s buf $%04x %2d * %4d = %4d\n", __func__,
+            isp1362_hcd->intl_queue.name,
+            isp1362_hcd->intl_queue.buf_start,
+            ISP1362_INTL_BUFFERS, isp1362_hcd->intl_queue.blk_size,
+            isp1362_hcd->intl_queue.buf_size);
+       DBG(3, "%s: %5s buf $%04x %2d * %4d = %4d\n", __func__,
+            isp1362_hcd->atl_queue.name,
+            isp1362_hcd->atl_queue.buf_start,
+            atl_buffers, isp1362_hcd->atl_queue.blk_size,
+            isp1362_hcd->atl_queue.buf_size);
+
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       return 0;
+}
+
+static int isp1362_hc_reset(struct usb_hcd *hcd)
+{
+       int ret = 0;
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long t;
+       unsigned long timeout = 100;
+       unsigned long flags;
+       int clkrdy = 0;
+
+       pr_info("%s:\n", __func__);
+
+       if (isp1362_hcd->board && isp1362_hcd->board->reset) {
+               isp1362_hcd->board->reset(hcd->self.controller, 1);
+               msleep(20);
+               if (isp1362_hcd->board->clock)
+                       isp1362_hcd->board->clock(hcd->self.controller, 1);
+               isp1362_hcd->board->reset(hcd->self.controller, 0);
+       } else
+               isp1362_sw_reset(isp1362_hcd);
+
+       /* chip has been reset. First we need to see a clock */
+       t = jiffies + msecs_to_jiffies(timeout);
+       while (!clkrdy && time_before_eq(jiffies, t)) {
+               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+               clkrdy = isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_CLKRDY;
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+               if (!clkrdy)
+                       msleep(4);
+       }
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_CLKRDY);
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       if (!clkrdy) {
+               pr_err("Clock not ready after %lums\n", timeout);
+               ret = -ENODEV;
+       }
+       return ret;
+}
+
+static void isp1362_hc_stop(struct usb_hcd *hcd)
+{
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+       u32 tmp;
+
+       pr_info("%s:\n", __func__);
+
+       del_timer_sync(&hcd->rh_timer);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, 0);
+
+       /* Switch off power for all ports */
+       tmp = isp1362_read_reg32(isp1362_hcd, HCRHDESCA);
+       tmp &= ~(RH_A_NPS | RH_A_PSM);
+       isp1362_write_reg32(isp1362_hcd, HCRHDESCA, tmp);
+       isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_LPS);
+
+       /* Reset the chip */
+       if (isp1362_hcd->board && isp1362_hcd->board->reset)
+               isp1362_hcd->board->reset(hcd->self.controller, 1);
+       else
+               isp1362_sw_reset(isp1362_hcd);
+
+       if (isp1362_hcd->board && isp1362_hcd->board->clock)
+               isp1362_hcd->board->clock(hcd->self.controller, 0);
+
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+}
+
+#ifdef CHIP_BUFFER_TEST
+static int isp1362_chip_test(struct isp1362_hcd *isp1362_hcd)
+{
+       int ret = 0;
+       u16 *ref;
+       unsigned long flags;
+
+       ref = kmalloc(2 * ISP1362_BUF_SIZE, GFP_KERNEL);
+       if (ref) {
+               int offset;
+               u16 *tst = &ref[ISP1362_BUF_SIZE / 2];
+
+               for (offset = 0; offset < ISP1362_BUF_SIZE / 2; offset++) {
+                       ref[offset] = ~offset;
+                       tst[offset] = offset;
+               }
+
+               for (offset = 0; offset < 4; offset++) {
+                       int j;
+
+                       for (j = 0; j < 8; j++) {
+                               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                               isp1362_write_buffer(isp1362_hcd, (u8 *)ref + offset, 0, j);
+                               isp1362_read_buffer(isp1362_hcd, (u8 *)tst + offset, 0, j);
+                               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+                               if (memcmp(ref, tst, j)) {
+                                       ret = -ENODEV;
+                                       pr_err("%s: memory check with %d byte offset %d failed\n",
+                                           __func__, j, offset);
+                                       dump_data((u8 *)ref + offset, j);
+                                       dump_data((u8 *)tst + offset, j);
+                               }
+                       }
+               }
+
+               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+               isp1362_write_buffer(isp1362_hcd, ref, 0, ISP1362_BUF_SIZE);
+               isp1362_read_buffer(isp1362_hcd, tst, 0, ISP1362_BUF_SIZE);
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+               if (memcmp(ref, tst, ISP1362_BUF_SIZE)) {
+                       ret = -ENODEV;
+                       pr_err("%s: memory check failed\n", __func__);
+                       dump_data((u8 *)tst, ISP1362_BUF_SIZE / 2);
+               }
+
+               for (offset = 0; offset < 256; offset++) {
+                       int test_size = 0;
+
+                       yield();
+
+                       memset(tst, 0, ISP1362_BUF_SIZE);
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       isp1362_write_buffer(isp1362_hcd, tst, 0, ISP1362_BUF_SIZE);
+                       isp1362_read_buffer(isp1362_hcd, tst, 0, ISP1362_BUF_SIZE);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                       if (memcmp(tst, tst + (ISP1362_BUF_SIZE / (2 * sizeof(*tst))),
+                                  ISP1362_BUF_SIZE / 2)) {
+                               pr_err("%s: Failed to clear buffer\n", __func__);
+                               dump_data((u8 *)tst, ISP1362_BUF_SIZE);
+                               break;
+                       }
+                       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                       isp1362_write_buffer(isp1362_hcd, ref, offset * 2, PTD_HEADER_SIZE);
+                       isp1362_write_buffer(isp1362_hcd, ref + PTD_HEADER_SIZE / sizeof(*ref),
+                                            offset * 2 + PTD_HEADER_SIZE, test_size);
+                       isp1362_read_buffer(isp1362_hcd, tst, offset * 2,
+                                           PTD_HEADER_SIZE + test_size);
+                       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                       if (memcmp(ref, tst, PTD_HEADER_SIZE + test_size)) {
+                               dump_data(((u8 *)ref) + offset, PTD_HEADER_SIZE + test_size);
+                               dump_data((u8 *)tst, PTD_HEADER_SIZE + test_size);
+                               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+                               isp1362_read_buffer(isp1362_hcd, tst, offset * 2,
+                                                   PTD_HEADER_SIZE + test_size);
+                               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                               if (memcmp(ref, tst, PTD_HEADER_SIZE + test_size)) {
+                                       ret = -ENODEV;
+                                       pr_err("%s: memory check with offset %02x failed\n",
+                                           __func__, offset);
+                                       break;
+                               }
+                               pr_warning("%s: memory check with offset %02x ok after second read\n",
+                                    __func__, offset);
+                       }
+               }
+               kfree(ref);
+       }
+       return ret;
+}
+#endif
+
+static int isp1362_hc_start(struct usb_hcd *hcd)
+{
+       int ret;
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       struct isp1362_platform_data *board = isp1362_hcd->board;
+       u16 hwcfg;
+       u16 chipid;
+       unsigned long flags;
+
+       pr_info("%s:\n", __func__);
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       chipid = isp1362_read_reg16(isp1362_hcd, HCCHIPID);
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       if ((chipid & HCCHIPID_MASK) != HCCHIPID_MAGIC) {
+               pr_err("%s: Invalid chip ID %04x\n", __func__, chipid);
+               return -ENODEV;
+       }
+
+#ifdef CHIP_BUFFER_TEST
+       ret = isp1362_chip_test(isp1362_hcd);
+       if (ret)
+               return -ENODEV;
+#endif
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       /* clear interrupt status and disable all interrupt sources */
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, 0xff);
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, 0);
+
+       /* HW conf */
+       hwcfg = HCHWCFG_INT_ENABLE | HCHWCFG_DBWIDTH(1);
+       if (board->sel15Kres)
+               hwcfg |= HCHWCFG_PULLDOWN_DS2 |
+                       ((MAX_ROOT_PORTS > 1) ? HCHWCFG_PULLDOWN_DS1 : 0);
+       if (board->clknotstop)
+               hwcfg |= HCHWCFG_CLKNOTSTOP;
+       if (board->oc_enable)
+               hwcfg |= HCHWCFG_ANALOG_OC;
+       if (board->int_act_high)
+               hwcfg |= HCHWCFG_INT_POL;
+       if (board->int_edge_triggered)
+               hwcfg |= HCHWCFG_INT_TRIGGER;
+       if (board->dreq_act_high)
+               hwcfg |= HCHWCFG_DREQ_POL;
+       if (board->dack_act_high)
+               hwcfg |= HCHWCFG_DACK_POL;
+       isp1362_write_reg16(isp1362_hcd, HCHWCFG, hwcfg);
+       isp1362_show_reg(isp1362_hcd, HCHWCFG);
+       isp1362_write_reg16(isp1362_hcd, HCDMACFG, 0);
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       ret = isp1362_mem_config(hcd);
+       if (ret)
+               return ret;
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+
+       /* Root hub conf */
+       isp1362_hcd->rhdesca = 0;
+       if (board->no_power_switching)
+               isp1362_hcd->rhdesca |= RH_A_NPS;
+       if (board->power_switching_mode)
+               isp1362_hcd->rhdesca |= RH_A_PSM;
+       if (board->potpg)
+               isp1362_hcd->rhdesca |= (board->potpg << 24) & RH_A_POTPGT;
+       else
+               isp1362_hcd->rhdesca |= (25 << 24) & RH_A_POTPGT;
+
+       isp1362_write_reg32(isp1362_hcd, HCRHDESCA, isp1362_hcd->rhdesca & ~RH_A_OCPM);
+       isp1362_write_reg32(isp1362_hcd, HCRHDESCA, isp1362_hcd->rhdesca | RH_A_OCPM);
+       isp1362_hcd->rhdesca = isp1362_read_reg32(isp1362_hcd, HCRHDESCA);
+
+       isp1362_hcd->rhdescb = RH_B_PPCM;
+       isp1362_write_reg32(isp1362_hcd, HCRHDESCB, isp1362_hcd->rhdescb);
+       isp1362_hcd->rhdescb = isp1362_read_reg32(isp1362_hcd, HCRHDESCB);
+
+       isp1362_read_reg32(isp1362_hcd, HCFMINTVL);
+       isp1362_write_reg32(isp1362_hcd, HCFMINTVL, (FSMP(FI) << 16) | FI);
+       isp1362_write_reg32(isp1362_hcd, HCLSTHRESH, LSTHRESH);
+
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       isp1362_hcd->hc_control = OHCI_USB_OPER;
+       hcd->state = HC_STATE_RUNNING;
+
+       spin_lock_irqsave(&isp1362_hcd->lock, flags);
+       /* Set up interrupts */
+       isp1362_hcd->intenb = OHCI_INTR_MIE | OHCI_INTR_RHSC | OHCI_INTR_UE;
+       isp1362_hcd->intenb |= OHCI_INTR_RD;
+       isp1362_hcd->irqenb = HCuPINT_OPR | HCuPINT_SUSP;
+       isp1362_write_reg32(isp1362_hcd, HCINTENB, isp1362_hcd->intenb);
+       isp1362_write_reg16(isp1362_hcd, HCuPINTENB, isp1362_hcd->irqenb);
+
+       /* Go operational */
+       isp1362_write_reg32(isp1362_hcd, HCCONTROL, isp1362_hcd->hc_control);
+       /* enable global power */
+       isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_LPSC | RH_HS_DRWE);
+
+       spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+
+       return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static struct hc_driver isp1362_hc_driver = {
+       .description =          hcd_name,
+       .product_desc =         "ISP1362 Host Controller",
+       .hcd_priv_size =        sizeof(struct isp1362_hcd),
+
+       .irq =                  isp1362_irq,
+       .flags =                HCD_USB11 | HCD_MEMORY,
+
+       .reset =                isp1362_hc_reset,
+       .start =                isp1362_hc_start,
+       .stop =                 isp1362_hc_stop,
+
+       .urb_enqueue =          isp1362_urb_enqueue,
+       .urb_dequeue =          isp1362_urb_dequeue,
+       .endpoint_disable =     isp1362_endpoint_disable,
+
+       .get_frame_number =     isp1362_get_frame,
+
+       .hub_status_data =      isp1362_hub_status_data,
+       .hub_control =          isp1362_hub_control,
+       .bus_suspend =          isp1362_bus_suspend,
+       .bus_resume =           isp1362_bus_resume,
+};
+
+/*-------------------------------------------------------------------------*/
+
+#define resource_len(r) (((r)->end - (r)->start) + 1)
+
+static int __devexit isp1362_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       struct resource *res;
+
+       remove_debug_file(isp1362_hcd);
+       DBG(0, "%s: Removing HCD\n", __func__);
+       usb_remove_hcd(hcd);
+
+       DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__,
+           (u32)isp1362_hcd->data_reg);
+       iounmap(isp1362_hcd->data_reg);
+
+       DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__,
+           (u32)isp1362_hcd->addr_reg);
+       iounmap(isp1362_hcd->addr_reg);
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
+       if (res)
+               release_mem_region(res->start, resource_len(res));
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
+       if (res)
+               release_mem_region(res->start, resource_len(res));
+
+       DBG(0, "%s: put_hcd\n", __func__);
+       usb_put_hcd(hcd);
+       DBG(0, "%s: Done\n", __func__);
+
+       return 0;
+}
+
+static int __init isp1362_probe(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd;
+       struct isp1362_hcd *isp1362_hcd;
+       struct resource *addr, *data;
+       void __iomem *addr_reg;
+       void __iomem *data_reg;
+       int irq;
+       int retval = 0;
+
+       /* basic sanity checks first.  board-specific init logic should
+        * have initialized this the three resources and probably board
+        * specific platform_data.  we don't probe for IRQs, and do only
+        * minimal sanity checking.
+        */
+       if (pdev->num_resources < 3) {
+               retval = -ENODEV;
+               goto err1;
+       }
+
+       data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       irq = platform_get_irq(pdev, 0);
+       if (!addr || !data || irq < 0) {
+               retval = -ENODEV;
+               goto err1;
+       }
+
+#ifdef CONFIG_USB_HCD_DMA
+       if (pdev->dev.dma_mask) {
+               struct resource *dma_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+
+               if (!dma_res) {
+                       retval = -ENODEV;
+                       goto err1;
+               }
+               isp1362_hcd->data_dma = dma_res->start;
+               isp1362_hcd->max_dma_size = resource_len(dma_res);
+       }
+#else
+       if (pdev->dev.dma_mask) {
+               DBG(1, "won't do DMA");
+               retval = -ENODEV;
+               goto err1;
+       }
+#endif
+
+       if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) {
+               retval = -EBUSY;
+               goto err1;
+       }
+       addr_reg = ioremap(addr->start, resource_len(addr));
+       if (addr_reg == NULL) {
+               retval = -ENOMEM;
+               goto err2;
+       }
+
+       if (!request_mem_region(data->start, resource_len(data), hcd_name)) {
+               retval = -EBUSY;
+               goto err3;
+       }
+       data_reg = ioremap(data->start, resource_len(data));
+       if (data_reg == NULL) {
+               retval = -ENOMEM;
+               goto err4;
+       }
+
+       /* allocate and initialize hcd */
+       hcd = usb_create_hcd(&isp1362_hc_driver, &pdev->dev, dev_name(&pdev->dev));
+       if (!hcd) {
+               retval = -ENOMEM;
+               goto err5;
+       }
+       hcd->rsrc_start = data->start;
+       isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       isp1362_hcd->data_reg = data_reg;
+       isp1362_hcd->addr_reg = addr_reg;
+
+       isp1362_hcd->next_statechange = jiffies;
+       spin_lock_init(&isp1362_hcd->lock);
+       INIT_LIST_HEAD(&isp1362_hcd->async);
+       INIT_LIST_HEAD(&isp1362_hcd->periodic);
+       INIT_LIST_HEAD(&isp1362_hcd->isoc);
+       INIT_LIST_HEAD(&isp1362_hcd->remove_list);
+       isp1362_hcd->board = pdev->dev.platform_data;
+#if USE_PLATFORM_DELAY
+       if (!isp1362_hcd->board->delay) {
+               dev_err(hcd->self.controller, "No platform delay function given\n");
+               retval = -ENODEV;
+               goto err6;
+       }
+#endif
+
+#ifdef CONFIG_ARM
+       if (isp1362_hcd->board)
+               set_irq_type(irq, isp1362_hcd->board->int_act_high ? IRQT_RISING : IRQT_FALLING);
+#endif
+
+       retval = usb_add_hcd(hcd, irq, IRQF_TRIGGER_LOW | IRQF_DISABLED | IRQF_SHARED);
+       if (retval != 0)
+               goto err6;
+       pr_info("%s, irq %d\n", hcd->product_desc, irq);
+
+       create_debug_file(isp1362_hcd);
+
+       return 0;
+
+ err6:
+       DBG(0, "%s: Freeing dev %08x\n", __func__, (u32)isp1362_hcd);
+       usb_put_hcd(hcd);
+ err5:
+       DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__, (u32)data_reg);
+       iounmap(data_reg);
+ err4:
+       DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start);
+       release_mem_region(data->start, resource_len(data));
+ err3:
+       DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__, (u32)addr_reg);
+       iounmap(addr_reg);
+ err2:
+       DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start);
+       release_mem_region(addr->start, resource_len(addr));
+ err1:
+       pr_err("%s: init error, %d\n", __func__, retval);
+
+       return retval;
+}
+
+#ifdef CONFIG_PM
+static int isp1362_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+       int retval = 0;
+
+       DBG(0, "%s: Suspending device\n", __func__);
+
+       if (state.event == PM_EVENT_FREEZE) {
+               DBG(0, "%s: Suspending root hub\n", __func__);
+               retval = isp1362_bus_suspend(hcd);
+       } else {
+               DBG(0, "%s: Suspending RH ports\n", __func__);
+               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+               isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_LPS);
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+       }
+       if (retval == 0)
+               pdev->dev.power.power_state = state;
+       return retval;
+}
+
+static int isp1362_resume(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
+       unsigned long flags;
+
+       DBG(0, "%s: Resuming\n", __func__);
+
+       if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
+               DBG(0, "%s: Resume RH ports\n", __func__);
+               spin_lock_irqsave(&isp1362_hcd->lock, flags);
+               isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_LPSC);
+               spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+               return 0;
+       }
+
+       pdev->dev.power.power_state = PMSG_ON;
+
+       return isp1362_bus_resume(isp1362_hcd_to_hcd(isp1362_hcd));
+}
+#else
+#define        isp1362_suspend NULL
+#define        isp1362_resume  NULL
+#endif
+
+static struct platform_driver isp1362_driver = {
+       .probe = isp1362_probe,
+       .remove = __devexit_p(isp1362_remove),
+
+       .suspend = isp1362_suspend,
+       .resume = isp1362_resume,
+       .driver = {
+               .name = (char *)hcd_name,
+               .owner = THIS_MODULE,
+       },
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int __init isp1362_init(void)
+{
+       if (usb_disabled())
+               return -ENODEV;
+       pr_info("driver %s, %s\n", hcd_name, DRIVER_VERSION);
+       return platform_driver_register(&isp1362_driver);
+}
+module_init(isp1362_init);
+
+static void __exit isp1362_cleanup(void)
+{
+       platform_driver_unregister(&isp1362_driver);
+}
+module_exit(isp1362_cleanup);
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
new file mode 100644 (file)
index 0000000..fe60f62
--- /dev/null
@@ -0,0 +1,1079 @@
+/*
+ * ISP1362 HCD (Host Controller Driver) for USB.
+ *
+ * COPYRIGHT (C) by L. Wassmann <LW@KARO-electronics.de>
+ */
+
+/* ------------------------------------------------------------------------- */
+/*
+ * Platform specific compile time options
+ */
+#if defined(CONFIG_ARCH_KARO)
+#include <asm/arch/hardware.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/karo.h>
+
+#define USE_32BIT              1
+
+
+/* These options are mutually eclusive */
+#define USE_PLATFORM_DELAY     1
+#define USE_NDELAY             0
+/*
+ * MAX_ROOT_PORTS: Number of downstream ports
+ *
+ * The chip has two USB ports, one of which can be configured as
+ * an USB device port, so the value of this constant is implementation
+ * specific.
+ */
+#define MAX_ROOT_PORTS         2
+#define DUMMY_DELAY_ACCESS do {} while (0)
+
+/* insert platform specific definitions for other machines here */
+#elif defined(CONFIG_BLACKFIN)
+
+#include <linux/io.h>
+#define USE_32BIT              0
+#define MAX_ROOT_PORTS         2
+#define USE_PLATFORM_DELAY     0
+#define USE_NDELAY             1
+
+#define DUMMY_DELAY_ACCESS \
+       do { \
+               bfin_read16(ASYNC_BANK0_BASE); \
+               bfin_read16(ASYNC_BANK0_BASE); \
+               bfin_read16(ASYNC_BANK0_BASE); \
+       } while (0)
+
+#undef insw
+#undef outsw
+
+#define insw  delayed_insw
+#define outsw  delayed_outsw
+
+static inline void delayed_outsw(unsigned int addr, void *buf, int len)
+{
+       unsigned short *bp = (unsigned short *)buf;
+       while (len--) {
+               DUMMY_DELAY_ACCESS;
+               outw(*bp++, addr);
+       }
+}
+
+static inline void delayed_insw(unsigned int addr, void *buf, int len)
+{
+       unsigned short *bp = (unsigned short *)buf;
+       while (len--) {
+               DUMMY_DELAY_ACCESS;
+               *bp++ = inw((void *)addr);
+       }
+}
+
+#else
+
+#define MAX_ROOT_PORTS         2
+
+#define USE_32BIT              0
+
+/* These options are mutually eclusive */
+#define USE_PLATFORM_DELAY     0
+#define USE_NDELAY             0
+
+#define DUMMY_DELAY_ACCESS do {} while (0)
+
+#endif
+
+
+/* ------------------------------------------------------------------------- */
+
+#define USB_RESET_WIDTH                        50
+#define MAX_XFER_SIZE                  1023
+
+/* Buffer sizes */
+#define ISP1362_BUF_SIZE               4096
+#define ISP1362_ISTL_BUFSIZE           512
+#define ISP1362_INTL_BLKSIZE           64
+#define ISP1362_INTL_BUFFERS           16
+#define ISP1362_ATL_BLKSIZE            64
+
+#define ISP1362_REG_WRITE_OFFSET       0x80
+
+#ifdef ISP1362_DEBUG
+typedef const unsigned int isp1362_reg_t;
+
+#define REG_WIDTH_16                   0x000
+#define REG_WIDTH_32                   0x100
+#define REG_WIDTH_MASK                 0x100
+#define REG_NO_MASK                    0x0ff
+
+#define REG_ACCESS_R                   0x200
+#define REG_ACCESS_W                   0x400
+#define REG_ACCESS_RW                  0x600
+#define REG_ACCESS_MASK                        0x600
+
+#define ISP1362_REG_NO(r)              ((r) & REG_NO_MASK)
+
+#define _BUG_ON(x)     BUG_ON(x)
+#define _WARN_ON(x)    WARN_ON(x)
+
+#define ISP1362_REG(name, addr, width, rw) \
+static isp1362_reg_t ISP1362_REG_##name = ((addr) | (width) | (rw))
+
+#define REG_ACCESS_TEST(r)   BUG_ON(((r) & ISP1362_REG_WRITE_OFFSET) && !((r) & REG_ACCESS_W))
+#define REG_WIDTH_TEST(r, w) BUG_ON(((r) & REG_WIDTH_MASK) != (w))
+#else
+typedef const unsigned char isp1362_reg_t;
+#define ISP1362_REG_NO(r)              (r)
+#define _BUG_ON(x)                     do {} while (0)
+#define _WARN_ON(x)                    do {} while (0)
+
+#define ISP1362_REG(name, addr, width, rw) \
+static isp1362_reg_t ISP1362_REG_##name = addr
+
+#define REG_ACCESS_TEST(r)             do {} while (0)
+#define REG_WIDTH_TEST(r, w)           do {} while (0)
+#endif
+
+/* OHCI compatible registers */
+/*
+ * Note: Some of the ISP1362 'OHCI' registers implement only
+ * a subset of the bits defined in the OHCI spec.
+ *
+ * Bitmasks for the individual bits of these registers are defined in "ohci.h"
+ */
+ISP1362_REG(HCREVISION,        0x00,   REG_WIDTH_32,   REG_ACCESS_R);
+ISP1362_REG(HCCONTROL, 0x01,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCCMDSTAT, 0x02,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCINTSTAT, 0x03,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCINTENB,  0x04,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCINTDIS,  0x05,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCFMINTVL, 0x0d,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCFMREM,   0x0e,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCFMNUM,   0x0f,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCLSTHRESH,        0x11,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCRHDESCA, 0x12,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCRHDESCB, 0x13,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCRHSTATUS,        0x14,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCRHPORT1, 0x15,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCRHPORT2, 0x16,   REG_WIDTH_32,   REG_ACCESS_RW);
+
+/* Philips ISP1362 specific registers */
+ISP1362_REG(HCHWCFG,   0x20,   REG_WIDTH_16,   REG_ACCESS_RW);
+#define HCHWCFG_DISABLE_SUSPEND        (1 << 15)
+#define HCHWCFG_GLOBAL_PWRDOWN (1 << 14)
+#define HCHWCFG_PULLDOWN_DS2   (1 << 13)
+#define HCHWCFG_PULLDOWN_DS1   (1 << 12)
+#define HCHWCFG_CLKNOTSTOP     (1 << 11)
+#define HCHWCFG_ANALOG_OC      (1 << 10)
+#define HCHWCFG_ONEINT         (1 << 9)
+#define HCHWCFG_DACK_MODE      (1 << 8)
+#define HCHWCFG_ONEDMA         (1 << 7)
+#define HCHWCFG_DACK_POL       (1 << 6)
+#define HCHWCFG_DREQ_POL       (1 << 5)
+#define HCHWCFG_DBWIDTH_MASK   (0x03 << 3)
+#define HCHWCFG_DBWIDTH(n)     (((n) << 3) & HCHWCFG_DBWIDTH_MASK)
+#define HCHWCFG_INT_POL                (1 << 2)
+#define HCHWCFG_INT_TRIGGER    (1 << 1)
+#define HCHWCFG_INT_ENABLE     (1 << 0)
+
+ISP1362_REG(HCDMACFG,  0x21,   REG_WIDTH_16,   REG_ACCESS_RW);
+#define HCDMACFG_CTR_ENABLE    (1 << 7)
+#define HCDMACFG_BURST_LEN_MASK        (0x03 << 5)
+#define HCDMACFG_BURST_LEN(n)  (((n) << 5) & HCDMACFG_BURST_LEN_MASK)
+#define HCDMACFG_BURST_LEN_1   HCDMACFG_BURST_LEN(0)
+#define HCDMACFG_BURST_LEN_4   HCDMACFG_BURST_LEN(1)
+#define HCDMACFG_BURST_LEN_8   HCDMACFG_BURST_LEN(2)
+#define HCDMACFG_DMA_ENABLE    (1 << 4)
+#define HCDMACFG_BUF_TYPE_MASK (0x07 << 1)
+#define HCDMACFG_BUF_TYPE(n)   (((n) << 1) & HCDMACFG_BUF_TYPE_MASK)
+#define HCDMACFG_BUF_ISTL0     HCDMACFG_BUF_TYPE(0)
+#define HCDMACFG_BUF_ISTL1     HCDMACFG_BUF_TYPE(1)
+#define HCDMACFG_BUF_INTL      HCDMACFG_BUF_TYPE(2)
+#define HCDMACFG_BUF_ATL       HCDMACFG_BUF_TYPE(3)
+#define HCDMACFG_BUF_DIRECT    HCDMACFG_BUF_TYPE(4)
+#define HCDMACFG_DMA_RW_SELECT (1 << 0)
+
+ISP1362_REG(HCXFERCTR, 0x22,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+ISP1362_REG(HCuPINT,   0x24,   REG_WIDTH_16,   REG_ACCESS_RW);
+#define HCuPINT_SOF            (1 << 0)
+#define HCuPINT_ISTL0          (1 << 1)
+#define HCuPINT_ISTL1          (1 << 2)
+#define HCuPINT_EOT            (1 << 3)
+#define HCuPINT_OPR            (1 << 4)
+#define HCuPINT_SUSP           (1 << 5)
+#define HCuPINT_CLKRDY         (1 << 6)
+#define HCuPINT_INTL           (1 << 7)
+#define HCuPINT_ATL            (1 << 8)
+#define HCuPINT_OTG            (1 << 9)
+
+ISP1362_REG(HCuPINTENB,        0x25,   REG_WIDTH_16,   REG_ACCESS_RW);
+/* same bit definitions apply as for HCuPINT */
+
+ISP1362_REG(HCCHIPID,  0x27,   REG_WIDTH_16,   REG_ACCESS_R);
+#define HCCHIPID_MASK          0xff00
+#define HCCHIPID_MAGIC         0x3600
+
+ISP1362_REG(HCSCRATCH, 0x28,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+ISP1362_REG(HCSWRES,   0x29,   REG_WIDTH_16,   REG_ACCESS_W);
+#define HCSWRES_MAGIC          0x00f6
+
+ISP1362_REG(HCBUFSTAT, 0x2c,   REG_WIDTH_16,   REG_ACCESS_RW);
+#define HCBUFSTAT_ISTL0_FULL   (1 << 0)
+#define HCBUFSTAT_ISTL1_FULL   (1 << 1)
+#define HCBUFSTAT_INTL_ACTIVE  (1 << 2)
+#define HCBUFSTAT_ATL_ACTIVE   (1 << 3)
+#define HCBUFSTAT_RESET_HWPP   (1 << 4)
+#define HCBUFSTAT_ISTL0_ACTIVE (1 << 5)
+#define HCBUFSTAT_ISTL1_ACTIVE (1 << 6)
+#define HCBUFSTAT_ISTL0_DONE   (1 << 8)
+#define HCBUFSTAT_ISTL1_DONE   (1 << 9)
+#define HCBUFSTAT_PAIRED_PTDPP (1 << 10)
+
+ISP1362_REG(HCDIRADDR, 0x32,   REG_WIDTH_32,   REG_ACCESS_RW);
+#define HCDIRADDR_ADDR_MASK    0x0000ffff
+#define HCDIRADDR_ADDR(n)      (((n) << 0) & HCDIRADDR_ADDR_MASK)
+#define HCDIRADDR_COUNT_MASK   0xffff0000
+#define HCDIRADDR_COUNT(n)     (((n) << 16) & HCDIRADDR_COUNT_MASK)
+ISP1362_REG(HCDIRDATA, 0x45,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+ISP1362_REG(HCISTLBUFSZ, 0x30, REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCISTL0PORT, 0x40, REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCISTL1PORT, 0x42, REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCISTLRATE,        0x47,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+ISP1362_REG(HCINTLBUFSZ, 0x33, REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCINTLPORT,        0x43,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCINTLBLKSZ, 0x53, REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCINTLDONE,        0x17,   REG_WIDTH_32,   REG_ACCESS_R);
+ISP1362_REG(HCINTLSKIP,        0x18,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCINTLLAST,        0x19,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCINTLCURR,        0x1a,   REG_WIDTH_16,   REG_ACCESS_R);
+
+ISP1362_REG(HCATLBUFSZ, 0x34,  REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCATLPORT, 0x44,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCATLBLKSZ, 0x54,  REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCATLDONE, 0x1b,   REG_WIDTH_32,   REG_ACCESS_R);
+ISP1362_REG(HCATLSKIP, 0x1c,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCATLLAST, 0x1d,   REG_WIDTH_32,   REG_ACCESS_RW);
+ISP1362_REG(HCATLCURR, 0x1e,   REG_WIDTH_16,   REG_ACCESS_R);
+
+ISP1362_REG(HCATLDTC,  0x51,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(HCATLDTCTO,        0x52,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+
+ISP1362_REG(OTGCONTROL,        0x62,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(OTGSTATUS, 0x67,   REG_WIDTH_16,   REG_ACCESS_R);
+ISP1362_REG(OTGINT,    0x68,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(OTGINTENB, 0x69,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(OTGTIMER,  0x6A,   REG_WIDTH_16,   REG_ACCESS_RW);
+ISP1362_REG(OTGALTTMR, 0x6C,   REG_WIDTH_16,   REG_ACCESS_RW);
+
+/* Philips transfer descriptor, cpu-endian */
+struct ptd {
+       u16 count;
+#define        PTD_COUNT_MSK   (0x3ff << 0)
+#define        PTD_TOGGLE_MSK  (1 << 10)
+#define        PTD_ACTIVE_MSK  (1 << 11)
+#define        PTD_CC_MSK      (0xf << 12)
+       u16 mps;
+#define        PTD_MPS_MSK     (0x3ff << 0)
+#define        PTD_SPD_MSK     (1 << 10)
+#define        PTD_LAST_MSK    (1 << 11)
+#define        PTD_EP_MSK      (0xf << 12)
+       u16 len;
+#define        PTD_LEN_MSK     (0x3ff << 0)
+#define        PTD_DIR_MSK     (3 << 10)
+#define        PTD_DIR_SETUP   (0)
+#define        PTD_DIR_OUT     (1)
+#define        PTD_DIR_IN      (2)
+       u16 faddr;
+#define        PTD_FA_MSK      (0x7f << 0)
+/* PTD Byte 7: [StartingFrame (if ISO PTD) | StartingFrame[0..4], PollingRate[0..2] (if INT PTD)] */
+#define PTD_SF_ISO_MSK (0xff << 8)
+#define PTD_SF_INT_MSK (0x1f << 8)
+#define PTD_PR_MSK     (0x07 << 13)
+} __attribute__ ((packed, aligned(2)));
+#define PTD_HEADER_SIZE sizeof(struct ptd)
+
+/* ------------------------------------------------------------------------- */
+/* Copied from ohci.h: */
+/*
+ * Hardware transfer status codes -- CC from PTD
+ */
+#define PTD_CC_NOERROR      0x00
+#define PTD_CC_CRC          0x01
+#define PTD_CC_BITSTUFFING  0x02
+#define PTD_CC_DATATOGGLEM  0x03
+#define PTD_CC_STALL        0x04
+#define PTD_DEVNOTRESP      0x05
+#define PTD_PIDCHECKFAIL    0x06
+#define PTD_UNEXPECTEDPID   0x07
+#define PTD_DATAOVERRUN     0x08
+#define PTD_DATAUNDERRUN    0x09
+    /* 0x0A, 0x0B reserved for hardware */
+#define PTD_BUFFEROVERRUN   0x0C
+#define PTD_BUFFERUNDERRUN  0x0D
+    /* 0x0E, 0x0F reserved for HCD */
+#define PTD_NOTACCESSED     0x0F
+
+
+/* map OHCI TD status codes (CC) to errno values */
+static const int cc_to_error[16] = {
+       /* No  Error  */               0,
+       /* CRC Error  */               -EILSEQ,
+       /* Bit Stuff  */               -EPROTO,
+       /* Data Togg  */               -EILSEQ,
+       /* Stall      */               -EPIPE,
+       /* DevNotResp */               -ETIMEDOUT,
+       /* PIDCheck   */               -EPROTO,
+       /* UnExpPID   */               -EPROTO,
+       /* DataOver   */               -EOVERFLOW,
+       /* DataUnder  */               -EREMOTEIO,
+       /* (for hw)   */               -EIO,
+       /* (for hw)   */               -EIO,
+       /* BufferOver */               -ECOMM,
+       /* BuffUnder  */               -ENOSR,
+       /* (for HCD)  */               -EALREADY,
+       /* (for HCD)  */               -EALREADY
+};
+
+
+/*
+ * HcControl (control) register masks
+ */
+#define OHCI_CTRL_HCFS (3 << 6)        /* host controller functional state */
+#define OHCI_CTRL_RWC  (1 << 9)        /* remote wakeup connected */
+#define OHCI_CTRL_RWE  (1 << 10)       /* remote wakeup enable */
+
+/* pre-shifted values for HCFS */
+#      define OHCI_USB_RESET   (0 << 6)
+#      define OHCI_USB_RESUME  (1 << 6)
+#      define OHCI_USB_OPER    (2 << 6)
+#      define OHCI_USB_SUSPEND (3 << 6)
+
+/*
+ * HcCommandStatus (cmdstatus) register masks
+ */
+#define OHCI_HCR       (1 << 0)        /* host controller reset */
+#define OHCI_SOC       (3 << 16)       /* scheduling overrun count */
+
+/*
+ * masks used with interrupt registers:
+ * HcInterruptStatus (intrstatus)
+ * HcInterruptEnable (intrenable)
+ * HcInterruptDisable (intrdisable)
+ */
+#define OHCI_INTR_SO   (1 << 0)        /* scheduling overrun */
+#define OHCI_INTR_WDH  (1 << 1)        /* writeback of done_head */
+#define OHCI_INTR_SF   (1 << 2)        /* start frame */
+#define OHCI_INTR_RD   (1 << 3)        /* resume detect */
+#define OHCI_INTR_UE   (1 << 4)        /* unrecoverable error */
+#define OHCI_INTR_FNO  (1 << 5)        /* frame number overflow */
+#define OHCI_INTR_RHSC (1 << 6)        /* root hub status change */
+#define OHCI_INTR_OC   (1 << 30)       /* ownership change */
+#define OHCI_INTR_MIE  (1 << 31)       /* master interrupt enable */
+
+/* roothub.portstatus [i] bits */
+#define RH_PS_CCS            0x00000001        /* current connect status */
+#define RH_PS_PES            0x00000002        /* port enable status*/
+#define RH_PS_PSS            0x00000004        /* port suspend status */
+#define RH_PS_POCI           0x00000008        /* port over current indicator */
+#define RH_PS_PRS            0x00000010        /* port reset status */
+#define RH_PS_PPS            0x00000100        /* port power status */
+#define RH_PS_LSDA           0x00000200        /* low speed device attached */
+#define RH_PS_CSC            0x00010000        /* connect status change */
+#define RH_PS_PESC           0x00020000        /* port enable status change */
+#define RH_PS_PSSC           0x00040000        /* port suspend status change */
+#define RH_PS_OCIC           0x00080000        /* over current indicator change */
+#define RH_PS_PRSC           0x00100000        /* port reset status change */
+
+/* roothub.status bits */
+#define RH_HS_LPS           0x00000001         /* local power status */
+#define RH_HS_OCI           0x00000002         /* over current indicator */
+#define RH_HS_DRWE          0x00008000         /* device remote wakeup enable */
+#define RH_HS_LPSC          0x00010000         /* local power status change */
+#define RH_HS_OCIC          0x00020000         /* over current indicator change */
+#define RH_HS_CRWE          0x80000000         /* clear remote wakeup enable */
+
+/* roothub.b masks */
+#define RH_B_DR                0x0000ffff              /* device removable flags */
+#define RH_B_PPCM      0xffff0000              /* port power control mask */
+
+/* roothub.a masks */
+#define        RH_A_NDP        (0xff << 0)             /* number of downstream ports */
+#define        RH_A_PSM        (1 << 8)                /* power switching mode */
+#define        RH_A_NPS        (1 << 9)                /* no power switching */
+#define        RH_A_DT         (1 << 10)               /* device type (mbz) */
+#define        RH_A_OCPM       (1 << 11)               /* over current protection mode */
+#define        RH_A_NOCP       (1 << 12)               /* no over current protection */
+#define        RH_A_POTPGT     (0xff << 24)            /* power on to power good time */
+
+#define        FI                      0x2edf          /* 12000 bits per frame (-1) */
+#define        FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
+#define LSTHRESH               0x628           /* lowspeed bit threshold */
+
+/* ------------------------------------------------------------------------- */
+
+/* PTD accessor macros. */
+#define PTD_GET_COUNT(p)       (((p)->count & PTD_COUNT_MSK) >> 0)
+#define PTD_COUNT(v)           (((v) << 0) & PTD_COUNT_MSK)
+#define PTD_GET_TOGGLE(p)      (((p)->count & PTD_TOGGLE_MSK) >> 10)
+#define PTD_TOGGLE(v)          (((v) << 10) & PTD_TOGGLE_MSK)
+#define PTD_GET_ACTIVE(p)      (((p)->count & PTD_ACTIVE_MSK) >> 11)
+#define PTD_ACTIVE(v)          (((v) << 11) & PTD_ACTIVE_MSK)
+#define PTD_GET_CC(p)          (((p)->count & PTD_CC_MSK) >> 12)
+#define PTD_CC(v)              (((v) << 12) & PTD_CC_MSK)
+#define PTD_GET_MPS(p)         (((p)->mps & PTD_MPS_MSK) >> 0)
+#define PTD_MPS(v)             (((v) << 0) & PTD_MPS_MSK)
+#define PTD_GET_SPD(p)         (((p)->mps & PTD_SPD_MSK) >> 10)
+#define PTD_SPD(v)             (((v) << 10) & PTD_SPD_MSK)
+#define PTD_GET_LAST(p)                (((p)->mps & PTD_LAST_MSK) >> 11)
+#define PTD_LAST(v)            (((v) << 11) & PTD_LAST_MSK)
+#define PTD_GET_EP(p)          (((p)->mps & PTD_EP_MSK) >> 12)
+#define PTD_EP(v)              (((v) << 12) & PTD_EP_MSK)
+#define PTD_GET_LEN(p)         (((p)->len & PTD_LEN_MSK) >> 0)
+#define PTD_LEN(v)             (((v) << 0) & PTD_LEN_MSK)
+#define PTD_GET_DIR(p)         (((p)->len & PTD_DIR_MSK) >> 10)
+#define PTD_DIR(v)             (((v) << 10) & PTD_DIR_MSK)
+#define PTD_GET_FA(p)          (((p)->faddr & PTD_FA_MSK) >> 0)
+#define PTD_FA(v)              (((v) << 0) & PTD_FA_MSK)
+#define PTD_GET_SF_INT(p)      (((p)->faddr & PTD_SF_INT_MSK) >> 8)
+#define PTD_SF_INT(v)          (((v) << 8) & PTD_SF_INT_MSK)
+#define PTD_GET_SF_ISO(p)      (((p)->faddr & PTD_SF_ISO_MSK) >> 8)
+#define PTD_SF_ISO(v)          (((v) << 8) & PTD_SF_ISO_MSK)
+#define PTD_GET_PR(p)          (((p)->faddr & PTD_PR_MSK) >> 13)
+#define PTD_PR(v)              (((v) << 13) & PTD_PR_MSK)
+
+#define        LOG2_PERIODIC_SIZE      5       /* arbitrary; this matches OHCI */
+#define        PERIODIC_SIZE           (1 << LOG2_PERIODIC_SIZE)
+
+struct isp1362_ep {
+       struct usb_host_endpoint *hep;
+       struct usb_device       *udev;
+
+       /* philips transfer descriptor */
+       struct ptd              ptd;
+
+       u8                      maxpacket;
+       u8                      epnum;
+       u8                      nextpid;
+       u16                     error_count;
+       u16                     length;         /* of current packet */
+       s16                     ptd_offset;     /* buffer offset in ISP1362 where
+                                                  PTD has been stored
+                                                  (for access thru HCDIRDATA) */
+       int                     ptd_index;
+       int num_ptds;
+       void                    *data;          /* to databuf */
+       /* queue of active EPs (the ones transmitted to the chip) */
+       struct list_head        active;
+
+       /* periodic schedule */
+       u8                      branch;
+       u16                     interval;
+       u16                     load;
+       u16                     last_iso;
+
+       /* async schedule */
+       struct list_head        schedule;       /* list of all EPs that need processing */
+       struct list_head        remove_list;
+       int                     num_req;
+};
+
+struct isp1362_ep_queue {
+       struct list_head        active;         /* list of PTDs currently processed by HC */
+       atomic_t                finishing;
+       unsigned long           buf_map;
+       unsigned long           skip_map;
+       int                     free_ptd;
+       u16                     buf_start;
+       u16                     buf_size;
+       u16                     blk_size;       /* PTD buffer block size for ATL and INTL */
+       u8                      buf_count;
+       u8                      buf_avail;
+       char                    name[16];
+
+       /* for statistical tracking */
+       u8                      stat_maxptds;   /* Max # of ptds seen simultaneously in fifo */
+       u8                      ptd_count;      /* number of ptds submitted to this queue */
+};
+
+struct isp1362_hcd {
+       spinlock_t              lock;
+       void __iomem            *addr_reg;
+       void __iomem            *data_reg;
+
+       struct isp1362_platform_data *board;
+
+       struct proc_dir_entry   *pde;
+       unsigned long           stat1, stat2, stat4, stat8, stat16;
+
+       /* HC registers */
+       u32                     intenb;         /* "OHCI" interrupts */
+       u16                     irqenb;         /* uP interrupts */
+
+       /* Root hub registers */
+       u32                     rhdesca;
+       u32                     rhdescb;
+       u32                     rhstatus;
+       u32                     rhport[MAX_ROOT_PORTS];
+       unsigned long           next_statechange;
+
+       /* HC control reg shadow copy */
+       u32                     hc_control;
+
+       /* async schedule: control, bulk */
+       struct list_head        async;
+
+       /* periodic schedule: int */
+       u16                     load[PERIODIC_SIZE];
+       struct list_head        periodic;
+       u16                     fmindex;
+
+       /* periodic schedule: isochronous */
+       struct list_head        isoc;
+       int                     istl_flip:1;
+       int                     irq_active:1;
+
+       /* Schedules for the current frame */
+       struct isp1362_ep_queue atl_queue;
+       struct isp1362_ep_queue intl_queue;
+       struct isp1362_ep_queue istl_queue[2];
+
+       /* list of PTDs retrieved from HC */
+       struct list_head        remove_list;
+       enum {
+               ISP1362_INT_SOF,
+               ISP1362_INT_ISTL0,
+               ISP1362_INT_ISTL1,
+               ISP1362_INT_EOT,
+               ISP1362_INT_OPR,
+               ISP1362_INT_SUSP,
+               ISP1362_INT_CLKRDY,
+               ISP1362_INT_INTL,
+               ISP1362_INT_ATL,
+               ISP1362_INT_OTG,
+               NUM_ISP1362_IRQS
+       } IRQ_NAMES;
+       unsigned int            irq_stat[NUM_ISP1362_IRQS];
+       int                     req_serial;
+};
+
+static inline const char *ISP1362_INT_NAME(int n)
+{
+       switch (n) {
+       case ISP1362_INT_SOF:    return "SOF";
+       case ISP1362_INT_ISTL0:  return "ISTL0";
+       case ISP1362_INT_ISTL1:  return "ISTL1";
+       case ISP1362_INT_EOT:    return "EOT";
+       case ISP1362_INT_OPR:    return "OPR";
+       case ISP1362_INT_SUSP:   return "SUSP";
+       case ISP1362_INT_CLKRDY: return "CLKRDY";
+       case ISP1362_INT_INTL:   return "INTL";
+       case ISP1362_INT_ATL:    return "ATL";
+       case ISP1362_INT_OTG:    return "OTG";
+       default:                 return "unknown";
+       }
+}
+
+static inline void ALIGNSTAT(struct isp1362_hcd *isp1362_hcd, void *ptr)
+{
+       unsigned p = (unsigned)ptr;
+       if (!(p & 0xf))
+               isp1362_hcd->stat16++;
+       else if (!(p & 0x7))
+               isp1362_hcd->stat8++;
+       else if (!(p & 0x3))
+               isp1362_hcd->stat4++;
+       else if (!(p & 0x1))
+               isp1362_hcd->stat2++;
+       else
+               isp1362_hcd->stat1++;
+}
+
+static inline struct isp1362_hcd *hcd_to_isp1362_hcd(struct usb_hcd *hcd)
+{
+       return (struct isp1362_hcd *) (hcd->hcd_priv);
+}
+
+static inline struct usb_hcd *isp1362_hcd_to_hcd(struct isp1362_hcd *isp1362_hcd)
+{
+       return container_of((void *)isp1362_hcd, struct usb_hcd, hcd_priv);
+}
+
+#define frame_before(f1, f2)   ((s16)((u16)f1 - (u16)f2) < 0)
+
+/*
+ * ISP1362 HW Interface
+ */
+
+#ifdef ISP1362_DEBUG
+#define DBG(level, fmt...) \
+       do { \
+               if (dbg_level > level) \
+                       pr_debug(fmt); \
+       } while (0)
+#define _DBG(level, fmt...)    \
+       do { \
+               if (dbg_level > level) \
+                       printk(fmt); \
+       } while (0)
+#else
+#define DBG(fmt...)            do {} while (0)
+#define _DBG DBG
+#endif
+
+#ifdef VERBOSE
+#    define VDBG(fmt...)       DBG(3, fmt)
+#else
+#    define VDBG(fmt...)       do {} while (0)
+#endif
+
+#ifdef REGISTERS
+#    define RDBG(fmt...)       DBG(1, fmt)
+#else
+#    define RDBG(fmt...)       do {} while (0)
+#endif
+
+#ifdef URB_TRACE
+#define URB_DBG(fmt...)                DBG(0, fmt)
+#else
+#define URB_DBG(fmt...)                do {} while (0)
+#endif
+
+
+#if USE_PLATFORM_DELAY
+#if USE_NDELAY
+#error USE_PLATFORM_DELAY and USE_NDELAY defined simultaneously.
+#endif
+#define        isp1362_delay(h, d)     (h)->board->delay(isp1362_hcd_to_hcd(h)->self.controller, d)
+#elif USE_NDELAY
+#define        isp1362_delay(h, d)     ndelay(d)
+#else
+#define        isp1362_delay(h, d)     do {} while (0)
+#endif
+
+#define get_urb(ep) ({                                                 \
+       BUG_ON(list_empty(&ep->hep->urb_list));                         \
+       container_of(ep->hep->urb_list.next, struct urb, urb_list);     \
+})
+
+/* basic access functions for ISP1362 chip registers */
+/* NOTE: The contents of the address pointer register cannot be read back! The driver must ensure,
+ * that all register accesses are performed with interrupts disabled, since the interrupt
+ * handler has no way of restoring the previous state.
+ */
+static void isp1362_write_addr(struct isp1362_hcd *isp1362_hcd, isp1362_reg_t reg)
+{
+       /*_BUG_ON((reg & ISP1362_REG_WRITE_OFFSET) && !(reg & REG_ACCESS_W));*/
+       REG_ACCESS_TEST(reg);
+       _BUG_ON(!irqs_disabled());
+       DUMMY_DELAY_ACCESS;
+       writew(ISP1362_REG_NO(reg), isp1362_hcd->addr_reg);
+       DUMMY_DELAY_ACCESS;
+       isp1362_delay(isp1362_hcd, 1);
+}
+
+static void isp1362_write_data16(struct isp1362_hcd *isp1362_hcd, u16 val)
+{
+       _BUG_ON(!irqs_disabled());
+       DUMMY_DELAY_ACCESS;
+       writew(val, isp1362_hcd->data_reg);
+}
+
+static u16 isp1362_read_data16(struct isp1362_hcd *isp1362_hcd)
+{
+       u16 val;
+
+       _BUG_ON(!irqs_disabled());
+       DUMMY_DELAY_ACCESS;
+       val = readw(isp1362_hcd->data_reg);
+
+       return val;
+}
+
+static void isp1362_write_data32(struct isp1362_hcd *isp1362_hcd, u32 val)
+{
+       _BUG_ON(!irqs_disabled());
+#if USE_32BIT
+       DUMMY_DELAY_ACCESS;
+       writel(val, isp1362_hcd->data_reg);
+#else
+       DUMMY_DELAY_ACCESS;
+       writew((u16)val, isp1362_hcd->data_reg);
+       DUMMY_DELAY_ACCESS;
+       writew(val >> 16, isp1362_hcd->data_reg);
+#endif
+}
+
+static u32 isp1362_read_data32(struct isp1362_hcd *isp1362_hcd)
+{
+       u32 val;
+
+       _BUG_ON(!irqs_disabled());
+#if USE_32BIT
+       DUMMY_DELAY_ACCESS;
+       val = readl(isp1362_hcd->data_reg);
+#else
+       DUMMY_DELAY_ACCESS;
+       val = (u32)readw(isp1362_hcd->data_reg);
+       DUMMY_DELAY_ACCESS;
+       val |= (u32)readw(isp1362_hcd->data_reg) << 16;
+#endif
+       return val;
+}
+
+/* use readsw/writesw to access the fifo whenever possible */
+/* assume HCDIRDATA or XFERCTR & addr_reg have been set up */
+static void isp1362_read_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 len)
+{
+       u8 *dp = buf;
+       u16 data;
+
+       if (!len)
+               return;
+
+       _BUG_ON(!irqs_disabled());
+
+       RDBG("%s: Reading %d byte from fifo to mem @ %p\n", __func__, len, buf);
+#if USE_32BIT
+       if (len >= 4) {
+               RDBG("%s: Using readsl for %d dwords\n", __func__, len >> 2);
+               readsl(isp1362_hcd->data_reg, dp, len >> 2);
+               dp += len & ~3;
+               len &= 3;
+       }
+#endif
+       if (len >= 2) {
+               RDBG("%s: Using readsw for %d words\n", __func__, len >> 1);
+               insw((unsigned long)isp1362_hcd->data_reg, dp, len >> 1);
+               dp += len & ~1;
+               len &= 1;
+       }
+
+       BUG_ON(len & ~1);
+       if (len > 0) {
+               data = isp1362_read_data16(isp1362_hcd);
+               RDBG("%s: Reading trailing byte %02x to mem @ %08x\n", __func__,
+                    (u8)data, (u32)dp);
+               *dp = (u8)data;
+       }
+}
+
+static void isp1362_write_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 len)
+{
+       u8 *dp = buf;
+       u16 data;
+
+       if (!len)
+               return;
+
+       if ((unsigned)dp & 0x1) {
+               /* not aligned */
+               for (; len > 1; len -= 2) {
+                       data = *dp++;
+                       data |= *dp++ << 8;
+                       isp1362_write_data16(isp1362_hcd, data);
+               }
+               if (len)
+                       isp1362_write_data16(isp1362_hcd, *dp);
+               return;
+       }
+
+       _BUG_ON(!irqs_disabled());
+
+       RDBG("%s: Writing %d byte to fifo from memory @%p\n", __func__, len, buf);
+#if USE_32BIT
+       if (len >= 4) {
+               RDBG("%s: Using writesl for %d dwords\n", __func__, len >> 2);
+               writesl(isp1362_hcd->data_reg, dp, len >> 2);
+               dp += len & ~3;
+               len &= 3;
+       }
+#endif
+       if (len >= 2) {
+               RDBG("%s: Using writesw for %d words\n", __func__, len >> 1);
+               outsw((unsigned long)isp1362_hcd->data_reg, dp, len >> 1);
+               dp += len & ~1;
+               len &= 1;
+       }
+
+       BUG_ON(len & ~1);
+       if (len > 0) {
+               /* finally write any trailing byte; we don't need to care
+                * about the high byte of the last word written
+                */
+               data = (u16)*dp;
+               RDBG("%s: Sending trailing byte %02x from mem @ %08x\n", __func__,
+                       data, (u32)dp);
+               isp1362_write_data16(isp1362_hcd, data);
+       }
+}
+
+#define isp1362_read_reg16(d, r)               ({                      \
+       u16 __v;                                                        \
+       REG_WIDTH_TEST(ISP1362_REG_##r, REG_WIDTH_16);                  \
+       isp1362_write_addr(d, ISP1362_REG_##r);                         \
+       __v = isp1362_read_data16(d);                                   \
+       RDBG("%s: Read %04x from %s[%02x]\n", __func__, __v, #r,        \
+            ISP1362_REG_NO(ISP1362_REG_##r));                          \
+       __v;                                                            \
+})
+
+#define isp1362_read_reg32(d, r)               ({                      \
+       u32 __v;                                                        \
+       REG_WIDTH_TEST(ISP1362_REG_##r, REG_WIDTH_32);                  \
+       isp1362_write_addr(d, ISP1362_REG_##r);                         \
+       __v = isp1362_read_data32(d);                                   \
+       RDBG("%s: Read %08x from %s[%02x]\n", __func__, __v, #r,        \
+            ISP1362_REG_NO(ISP1362_REG_##r));                          \
+       __v;                                                            \
+})
+
+#define isp1362_write_reg16(d, r, v)   {                                       \
+       REG_WIDTH_TEST(ISP1362_REG_##r, REG_WIDTH_16);                          \
+       isp1362_write_addr(d, (ISP1362_REG_##r) | ISP1362_REG_WRITE_OFFSET);    \
+       isp1362_write_data16(d, (u16)(v));                                      \
+       RDBG("%s: Wrote %04x to %s[%02x]\n", __func__, (u16)(v), #r,    \
+            ISP1362_REG_NO(ISP1362_REG_##r));                                  \
+}
+
+#define isp1362_write_reg32(d, r, v)   {                                       \
+       REG_WIDTH_TEST(ISP1362_REG_##r, REG_WIDTH_32);                          \
+       isp1362_write_addr(d, (ISP1362_REG_##r) | ISP1362_REG_WRITE_OFFSET);    \
+       isp1362_write_data32(d, (u32)(v));                                      \
+       RDBG("%s: Wrote %08x to %s[%02x]\n", __func__, (u32)(v), #r,    \
+            ISP1362_REG_NO(ISP1362_REG_##r));                                  \
+}
+
+#define isp1362_set_mask16(d, r, m) {                  \
+       u16 __v;                                        \
+       __v = isp1362_read_reg16(d, r);                 \
+       if ((__v | m) != __v)                           \
+               isp1362_write_reg16(d, r, __v | m);     \
+}
+
+#define isp1362_clr_mask16(d, r, m) {                  \
+       u16 __v;                                        \
+       __v = isp1362_read_reg16(d, r);                 \
+       if ((__v & ~m) != __v)                  \
+               isp1362_write_reg16(d, r, __v & ~m);    \
+}
+
+#define isp1362_set_mask32(d, r, m) {                  \
+       u32 __v;                                        \
+       __v = isp1362_read_reg32(d, r);                 \
+       if ((__v | m) != __v)                           \
+               isp1362_write_reg32(d, r, __v | m);     \
+}
+
+#define isp1362_clr_mask32(d, r, m) {                  \
+       u32 __v;                                        \
+       __v = isp1362_read_reg32(d, r);                 \
+       if ((__v & ~m) != __v)                  \
+               isp1362_write_reg32(d, r, __v & ~m);    \
+}
+
+#ifdef ISP1362_DEBUG
+#define isp1362_show_reg(d, r) {                                                               \
+       if ((ISP1362_REG_##r & REG_WIDTH_MASK) == REG_WIDTH_32)                 \
+               DBG(0, "%-12s[%02x]: %08x\n", #r,                                       \
+                       ISP1362_REG_NO(ISP1362_REG_##r), isp1362_read_reg32(d, r));     \
+       else                                                                    \
+               DBG(0, "%-12s[%02x]:     %04x\n", #r,                                   \
+                       ISP1362_REG_NO(ISP1362_REG_##r), isp1362_read_reg16(d, r));     \
+}
+#else
+#define isp1362_show_reg(d, r) do {} while (0)
+#endif
+
+static void __attribute__((__unused__)) isp1362_show_regs(struct isp1362_hcd *isp1362_hcd)
+{
+       isp1362_show_reg(isp1362_hcd, HCREVISION);
+       isp1362_show_reg(isp1362_hcd, HCCONTROL);
+       isp1362_show_reg(isp1362_hcd, HCCMDSTAT);
+       isp1362_show_reg(isp1362_hcd, HCINTSTAT);
+       isp1362_show_reg(isp1362_hcd, HCINTENB);
+       isp1362_show_reg(isp1362_hcd, HCFMINTVL);
+       isp1362_show_reg(isp1362_hcd, HCFMREM);
+       isp1362_show_reg(isp1362_hcd, HCFMNUM);
+       isp1362_show_reg(isp1362_hcd, HCLSTHRESH);
+       isp1362_show_reg(isp1362_hcd, HCRHDESCA);
+       isp1362_show_reg(isp1362_hcd, HCRHDESCB);
+       isp1362_show_reg(isp1362_hcd, HCRHSTATUS);
+       isp1362_show_reg(isp1362_hcd, HCRHPORT1);
+       isp1362_show_reg(isp1362_hcd, HCRHPORT2);
+
+       isp1362_show_reg(isp1362_hcd, HCHWCFG);
+       isp1362_show_reg(isp1362_hcd, HCDMACFG);
+       isp1362_show_reg(isp1362_hcd, HCXFERCTR);
+       isp1362_show_reg(isp1362_hcd, HCuPINT);
+
+       if (in_interrupt())
+               DBG(0, "%-12s[%02x]:     %04x\n", "HCuPINTENB",
+                        ISP1362_REG_NO(ISP1362_REG_HCuPINTENB), isp1362_hcd->irqenb);
+       else
+               isp1362_show_reg(isp1362_hcd, HCuPINTENB);
+       isp1362_show_reg(isp1362_hcd, HCCHIPID);
+       isp1362_show_reg(isp1362_hcd, HCSCRATCH);
+       isp1362_show_reg(isp1362_hcd, HCBUFSTAT);
+       isp1362_show_reg(isp1362_hcd, HCDIRADDR);
+       /* Access would advance fifo
+        * isp1362_show_reg(isp1362_hcd, HCDIRDATA);
+        */
+       isp1362_show_reg(isp1362_hcd, HCISTLBUFSZ);
+       isp1362_show_reg(isp1362_hcd, HCISTLRATE);
+       isp1362_show_reg(isp1362_hcd, HCINTLBUFSZ);
+       isp1362_show_reg(isp1362_hcd, HCINTLBLKSZ);
+       isp1362_show_reg(isp1362_hcd, HCINTLDONE);
+       isp1362_show_reg(isp1362_hcd, HCINTLSKIP);
+       isp1362_show_reg(isp1362_hcd, HCINTLLAST);
+       isp1362_show_reg(isp1362_hcd, HCINTLCURR);
+       isp1362_show_reg(isp1362_hcd, HCATLBUFSZ);
+       isp1362_show_reg(isp1362_hcd, HCATLBLKSZ);
+       /* only valid after ATL_DONE interrupt
+        * isp1362_show_reg(isp1362_hcd, HCATLDONE);
+        */
+       isp1362_show_reg(isp1362_hcd, HCATLSKIP);
+       isp1362_show_reg(isp1362_hcd, HCATLLAST);
+       isp1362_show_reg(isp1362_hcd, HCATLCURR);
+       isp1362_show_reg(isp1362_hcd, HCATLDTC);
+       isp1362_show_reg(isp1362_hcd, HCATLDTCTO);
+}
+
+static void isp1362_write_diraddr(struct isp1362_hcd *isp1362_hcd, u16 offset, u16 len)
+{
+       _BUG_ON(offset & 1);
+       _BUG_ON(offset >= ISP1362_BUF_SIZE);
+       _BUG_ON(len > ISP1362_BUF_SIZE);
+       _BUG_ON(offset + len > ISP1362_BUF_SIZE);
+       len = (len + 1) & ~1;
+
+       isp1362_clr_mask16(isp1362_hcd, HCDMACFG, HCDMACFG_CTR_ENABLE);
+       isp1362_write_reg32(isp1362_hcd, HCDIRADDR,
+                           HCDIRADDR_ADDR(offset) | HCDIRADDR_COUNT(len));
+}
+
+static void isp1362_read_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 offset, int len)
+{
+       _BUG_ON(offset & 1);
+
+       isp1362_write_diraddr(isp1362_hcd, offset, len);
+
+       DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %08x\n", __func__,
+           len, offset, (u32)buf);
+
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
+       _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+
+       isp1362_write_addr(isp1362_hcd, ISP1362_REG_HCDIRDATA);
+
+       isp1362_read_fifo(isp1362_hcd, buf, len);
+       _WARN_ON(!(isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
+       _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+}
+
+static void isp1362_write_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 offset, int len)
+{
+       _BUG_ON(offset & 1);
+
+       isp1362_write_diraddr(isp1362_hcd, offset, len);
+
+       DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %08x\n", __func__,
+           len, offset, (u32)buf);
+
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
+       _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+
+       isp1362_write_addr(isp1362_hcd, ISP1362_REG_HCDIRDATA | ISP1362_REG_WRITE_OFFSET);
+       isp1362_write_fifo(isp1362_hcd, buf, len);
+
+       _WARN_ON(!(isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+       isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
+       _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
+}
+
+static void __attribute__((unused)) dump_data(char *buf, int len)
+{
+       if (dbg_level > 0) {
+               int k;
+               int lf = 0;
+
+               for (k = 0; k < len; ++k) {
+                       if (!lf)
+                               DBG(0, "%04x:", k);
+                       printk(" %02x", ((u8 *) buf)[k]);
+                       lf = 1;
+                       if (!k)
+                               continue;
+                       if (k % 16 == 15) {
+                               printk("\n");
+                               lf = 0;
+                               continue;
+                       }
+                       if (k % 8 == 7)
+                               printk(" ");
+                       if (k % 4 == 3)
+                               printk(" ");
+               }
+               if (lf)
+                       printk("\n");
+       }
+}
+
+#if defined(ISP1362_DEBUG) && defined(PTD_TRACE)
+
+static void dump_ptd(struct ptd *ptd)
+{
+       DBG(0, "EP %p: CC=%x EP=%d DIR=%x CNT=%d LEN=%d MPS=%d TGL=%x ACT=%x FA=%d SPD=%x SF=%x PR=%x LST=%x\n",
+           container_of(ptd, struct isp1362_ep, ptd),
+           PTD_GET_CC(ptd), PTD_GET_EP(ptd), PTD_GET_DIR(ptd),
+           PTD_GET_COUNT(ptd), PTD_GET_LEN(ptd), PTD_GET_MPS(ptd),
+           PTD_GET_TOGGLE(ptd), PTD_GET_ACTIVE(ptd), PTD_GET_FA(ptd),
+           PTD_GET_SPD(ptd), PTD_GET_SF_INT(ptd), PTD_GET_PR(ptd), PTD_GET_LAST(ptd));
+       DBG(0, "  %04x %04x %04x %04x\n", ptd->count, ptd->mps, ptd->len, ptd->faddr);
+}
+
+static void dump_ptd_out_data(struct ptd *ptd, u8 *buf)
+{
+       if (dbg_level > 0) {
+               if (PTD_GET_DIR(ptd) != PTD_DIR_IN && PTD_GET_LEN(ptd)) {
+                       DBG(0, "--out->\n");
+                       dump_data(buf, PTD_GET_LEN(ptd));
+               }
+       }
+}
+
+static void dump_ptd_in_data(struct ptd *ptd, u8 *buf)
+{
+       if (dbg_level > 0) {
+               if (PTD_GET_DIR(ptd) == PTD_DIR_IN && PTD_GET_COUNT(ptd)) {
+                       DBG(0, "<--in--\n");
+                       dump_data(buf, PTD_GET_COUNT(ptd));
+               }
+               DBG(0, "-----\n");
+       }
+}
+
+static void dump_ptd_queue(struct isp1362_ep_queue *epq)
+{
+       struct isp1362_ep *ep;
+       int dbg = dbg_level;
+
+       dbg_level = 1;
+       list_for_each_entry(ep, &epq->active, active) {
+               dump_ptd(&ep->ptd);
+               dump_data(ep->data, ep->length);
+       }
+       dbg_level = dbg;
+}
+#else
+#define dump_ptd(ptd)                  do {} while (0)
+#define dump_ptd_in_data(ptd, buf)     do {} while (0)
+#define dump_ptd_out_data(ptd, buf)    do {} while (0)
+#define dump_ptd_data(ptd, buf)                do {} while (0)
+#define dump_ptd_queue(epq)            do {} while (0)
+#endif
index 1543846..9600a58 100644 (file)
@@ -386,6 +386,10 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
                hwmode |= HW_DACK_POL_HIGH;
        if (priv->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
                hwmode |= HW_DREQ_POL_HIGH;
+       if (priv->devflags & ISP1760_FLAG_INTR_POL_HIGH)
+               hwmode |= HW_INTR_HIGH_ACT;
+       if (priv->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
+               hwmode |= HW_INTR_EDGE_TRIG;
 
        /*
         * We have to set this first in case we're in 16-bit mode.
index 462f494..6931ef5 100644 (file)
@@ -142,6 +142,8 @@ typedef void (packet_enqueue)(struct usb_hcd *hcd, struct isp1760_qh *qh,
 #define ISP1760_FLAG_DACK_POL_HIGH     0x00000010 /* DACK active high */
 #define ISP1760_FLAG_DREQ_POL_HIGH     0x00000020 /* DREQ active high */
 #define ISP1760_FLAG_ISP1761           0x00000040 /* Chip is ISP1761 */
+#define ISP1760_FLAG_INTR_POL_HIGH     0x00000080 /* Interrupt polarity active high */
+#define ISP1760_FLAG_INTR_EDGE_TRIG    0x00000100 /* Interrupt edge triggered */
 
 /* chip memory management */
 struct memory_chunk {
index d4feebf..1c9f977 100644 (file)
@@ -3,6 +3,7 @@
  * Currently there is support for
  * - OpenFirmware
  * - PCI
+ * - PDEV (generic platform device centralized driver model)
  *
  * (c) 2007 Sebastian Siewior <bigeasy@linutronix.de>
  *
@@ -11,6 +12,7 @@
 #include <linux/usb.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/usb/isp1760.h>
 
 #include "../core/hcd.h"
 #include "isp1760-hcd.h"
@@ -308,6 +310,8 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev)
        struct resource *mem_res;
        struct resource *irq_res;
        resource_size_t mem_size;
+       struct isp1760_platform_data *priv = pdev->dev.platform_data;
+       unsigned int devflags = 0;
        unsigned long irqflags = IRQF_SHARED | IRQF_DISABLED;
 
        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -330,8 +334,23 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev)
        }
        irqflags |= irq_res->flags & IRQF_TRIGGER_MASK;
 
+       if (priv) {
+               if (priv->is_isp1761)
+                       devflags |= ISP1760_FLAG_ISP1761;
+               if (priv->bus_width_16)
+                       devflags |= ISP1760_FLAG_BUS_WIDTH_16;
+               if (priv->port1_otg)
+                       devflags |= ISP1760_FLAG_OTG_EN;
+               if (priv->analog_oc)
+                       devflags |= ISP1760_FLAG_ANALOG_OC;
+               if (priv->dack_polarity_high)
+                       devflags |= ISP1760_FLAG_DACK_POL_HIGH;
+               if (priv->dreq_polarity_high)
+                       devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
+       }
+
        hcd = isp1760_register(mem_res->start, mem_size, irq_res->start,
-                              irqflags, &pdev->dev, dev_name(&pdev->dev), 0);
+                              irqflags, &pdev->dev, dev_name(&pdev->dev), devflags);
        if (IS_ERR(hcd)) {
                pr_warning("isp1760: Failed to register the HCD device\n");
                ret = -ENODEV;
index bb5e6f6..7ccffcb 100644 (file)
@@ -148,7 +148,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
        at91_start_hc(pdev);
        ohci_hcd_init(hcd_to_ohci(hcd));
 
-       retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED);
+       retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
        if (retval == 0)
                return retval;
 
index 2ac4e02..e438008 100644 (file)
@@ -248,10 +248,9 @@ static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
-                                       pm_message_t message)
+static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
 {
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
        unsigned long flags;
        int rc;
@@ -274,10 +273,6 @@ static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *pdev,
        ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
        (void)ohci_readl(ohci, &ohci->regs->intrdisable);
 
-       /* make sure snapshot being resumed re-enumerates everything */
-       if (message.event == PM_EVENT_PRETHAW)
-               ohci_usb_reset(ohci);
-
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 
        au1xxx_stop_ohc();
@@ -287,9 +282,9 @@ bail:
        return rc;
 }
 
-static int ohci_hcd_au1xxx_drv_resume(struct platform_device *pdev)
+static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
 {
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct usb_hcd *hcd = dev_get_drvdata(dev);
 
        au1xxx_start_ohc();
 
@@ -298,20 +293,26 @@ static int ohci_hcd_au1xxx_drv_resume(struct platform_device *pdev)
 
        return 0;
 }
+
+static struct dev_pm_ops au1xxx_ohci_pmops = {
+       .suspend        = ohci_hcd_au1xxx_drv_suspend,
+       .resume         = ohci_hcd_au1xxx_drv_resume,
+};
+
+#define AU1XXX_OHCI_PMOPS &au1xxx_ohci_pmops
+
 #else
-#define ohci_hcd_au1xxx_drv_suspend NULL
-#define ohci_hcd_au1xxx_drv_resume NULL
+#define AU1XXX_OHCI_PMOPS NULL
 #endif
 
 static struct platform_driver ohci_hcd_au1xxx_driver = {
        .probe          = ohci_hcd_au1xxx_drv_probe,
        .remove         = ohci_hcd_au1xxx_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-       .suspend        = ohci_hcd_au1xxx_drv_suspend,
-       .resume         = ohci_hcd_au1xxx_drv_resume,
        .driver         = {
                .name   = "au1xxx-ohci",
                .owner  = THIS_MODULE,
+               .pm     = AU1XXX_OHCI_PMOPS,
        },
 };
 
index b0dbf41..4e68161 100644 (file)
@@ -188,7 +188,6 @@ static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)
 {
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
-       int status;
 
        if (time_before(jiffies, ohci->next_statechange))
                msleep(5);
index 5815168..78bb771 100644 (file)
@@ -34,7 +34,6 @@
 #include <linux/usb/otg.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
-#include <linux/reboot.h>
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
 
index e44dc2c..b5294a9 100644 (file)
@@ -177,9 +177,13 @@ static inline void pxa27x_setup_hc(struct pxa27x_ohci *ohci,
 
        if (inf->flags & NO_OC_PROTECTION)
                uhcrhda |= UHCRHDA_NOCP;
+       else
+               uhcrhda &= ~UHCRHDA_NOCP;
 
        if (inf->flags & OC_MODE_PERPORT)
                uhcrhda |= UHCRHDA_OCPM;
+       else
+               uhcrhda &= ~UHCRHDA_OCPM;
 
        if (inf->power_on_delay) {
                uhcrhda &= ~UHCRHDA_POTPGT(0xff);
index c2d80f8..16fecb8 100644 (file)
@@ -418,7 +418,7 @@ static struct ed *ed_get (
                is_out = !(ep->desc.bEndpointAddress & USB_DIR_IN);
 
                /* FIXME usbcore changes dev->devnum before SET_ADDRESS
-                * suceeds ... otherwise we wouldn't need "pipe".
+                * succeeds ... otherwise we wouldn't need "pipe".
                 */
                info = usb_pipedevice (pipe);
                ed->type = usb_pipetype(pipe);
index 5ac489e..50f57f4 100644 (file)
@@ -33,7 +33,6 @@
 #include <linux/timer.h>
 #include <linux/list.h>
 #include <linux/interrupt.h>
-#include <linux/reboot.h>
 #include <linux/usb.h>
 #include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
index 83b5f9c..23cf3bd 100644 (file)
@@ -475,4 +475,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
        else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
                quirk_usb_handoff_xhci(pdev);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
index a949259..5b22a4d 100644 (file)
@@ -719,8 +719,12 @@ retry:
                /* port status seems weird until after reset, so
                 * force the reset and make khubd clean up later.
                 */
-               sl811->port1 |= (1 << USB_PORT_FEAT_C_CONNECTION)
-                               | (1 << USB_PORT_FEAT_CONNECTION);
+               if (sl811->stat_insrmv & 1)
+                       sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION;
+               else
+                       sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION);
+
+               sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION;
 
        } else if (irqstat & SL11H_INTMASK_RD) {
                if (sl811->port1 & (1 << USB_PORT_FEAT_SUSPEND)) {
index 64e57bf..acd582c 100644 (file)
@@ -1422,7 +1422,6 @@ static int uhci_urb_enqueue(struct usb_hcd *hcd,
                goto err_submit_failed;
 
        /* Add this URB to the QH */
-       urbp->qh = qh;
        list_add_tail(&urbp->node, &qh->queue);
 
        /* If the new URB is the first and only one on this QH then either
index c205078..c632437 100644 (file)
@@ -227,11 +227,21 @@ void scan_async_work(struct work_struct *work)
        /*
         * Now that the ASL is updated, complete the removal of any
         * removed qsets.
+        *
+        * If the qset was to be reset, do so and reinsert it into the
+        * ASL if it has pending transfers.
         */
        spin_lock_irq(&whc->lock);
 
        list_for_each_entry_safe(qset, t, &whc->async_removed_list, list_node) {
                qset_remove_complete(whc, qset);
+               if (qset->reset) {
+                       qset_reset(whc, qset);
+                       if (!list_empty(&qset->stds)) {
+                               asl_qset_insert_begin(whc, qset);
+                               queue_work(whc->workqueue, &whc->async_work);
+                       }
+               }
        }
 
        spin_unlock_irq(&whc->lock);
@@ -267,7 +277,7 @@ int asl_urb_enqueue(struct whc *whc, struct urb *urb, gfp_t mem_flags)
        else
                err = qset_add_urb(whc, qset, urb, GFP_ATOMIC);
        if (!err) {
-               if (!qset->in_sw_list)
+               if (!qset->in_sw_list && !qset->remove)
                        asl_qset_insert_begin(whc, qset);
        } else
                usb_hcd_unlink_urb_from_ep(&whc->wusbhc.usb_hcd, urb);
index e019a50..687b622 100644 (file)
@@ -192,19 +192,23 @@ static void whc_endpoint_reset(struct usb_hcd *usb_hcd,
        struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);
        struct whc *whc = wusbhc_to_whc(wusbhc);
        struct whc_qset *qset;
+       unsigned long flags;
+
+       spin_lock_irqsave(&whc->lock, flags);
 
        qset = ep->hcpriv;
        if (qset) {
                qset->remove = 1;
+               qset->reset = 1;
 
                if (usb_endpoint_xfer_bulk(&ep->desc)
                    || usb_endpoint_xfer_control(&ep->desc))
                        queue_work(whc->workqueue, &whc->async_work);
                else
                        queue_work(whc->workqueue, &whc->periodic_work);
-
-               qset_reset(whc, qset);
        }
+
+       spin_unlock_irqrestore(&whc->lock, flags);
 }
 
 
index ff4ef9e..a9e05ba 100644 (file)
@@ -255,11 +255,21 @@ void scan_periodic_work(struct work_struct *work)
        /*
         * Now that the PZL is updated, complete the removal of any
         * removed qsets.
+        *
+        * If the qset was to be reset, do so and reinsert it into the
+        * PZL if it has pending transfers.
         */
        spin_lock_irq(&whc->lock);
 
        list_for_each_entry_safe(qset, t, &whc->periodic_removed_list, list_node) {
                qset_remove_complete(whc, qset);
+               if (qset->reset) {
+                       qset_reset(whc, qset);
+                       if (!list_empty(&qset->stds)) {
+                               qset_insert_in_sw_list(whc, qset);
+                               queue_work(whc->workqueue, &whc->periodic_work);
+                       }
+               }
        }
 
        spin_unlock_irq(&whc->lock);
@@ -295,7 +305,7 @@ int pzl_urb_enqueue(struct whc *whc, struct urb *urb, gfp_t mem_flags)
        else
                err = qset_add_urb(whc, qset, urb, GFP_ATOMIC);
        if (!err) {
-               if (!qset->in_sw_list)
+               if (!qset->in_sw_list && !qset->remove)
                        qset_insert_in_sw_list(whc, qset);
        } else
                usb_hcd_unlink_urb_from_ep(&whc->wusbhc.usb_hcd, urb);
index 640b38f..1b9dc15 100644 (file)
@@ -103,7 +103,6 @@ static void qset_fill_qh(struct whc_qset *qset, struct urb *urb)
 void qset_clear(struct whc *whc, struct whc_qset *qset)
 {
        qset->td_start = qset->td_end = qset->ntds = 0;
-       qset->remove = 0;
 
        qset->qh.link = cpu_to_le32(QH_LINK_NTDS(8) | QH_LINK_T);
        qset->qh.status = qset->qh.status & QH_STATUS_SEQ_MASK;
@@ -125,7 +124,7 @@ void qset_clear(struct whc *whc, struct whc_qset *qset)
  */
 void qset_reset(struct whc *whc, struct whc_qset *qset)
 {
-       wait_for_completion(&qset->remove_complete);
+       qset->reset = 0;
 
        qset->qh.status &= ~QH_STATUS_SEQ_MASK;
        qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1);
@@ -156,6 +155,7 @@ struct whc_qset *get_qset(struct whc *whc, struct urb *urb,
 
 void qset_remove_complete(struct whc *whc, struct whc_qset *qset)
 {
+       qset->remove = 0;
        list_del_init(&qset->list_node);
        complete(&qset->remove_complete);
 }
index 794dba0..e8d0001 100644 (file)
@@ -264,6 +264,7 @@ struct whc_qset {
        unsigned in_sw_list:1;
        unsigned in_hw_list:1;
        unsigned remove:1;
+       unsigned reset:1;
        struct urb *pause_after_urb;
        struct completion remove_complete;
        int max_burst;
index 705e343..33128d5 100644 (file)
@@ -413,7 +413,8 @@ void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx)
        int i;
 
        struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx);
-       dma_addr_t dma = ctx->dma + ((unsigned long)slot_ctx - (unsigned long)ctx);
+       dma_addr_t dma = ctx->dma +
+               ((unsigned long)slot_ctx - (unsigned long)ctx->bytes);
        int csz = HCC_64BYTE_CONTEXT(xhci->hcc_params);
 
        xhci_dbg(xhci, "Slot Context:\n");
@@ -459,7 +460,7 @@ void xhci_dbg_ep_ctx(struct xhci_hcd *xhci,
        for (i = 0; i < last_ep_ctx; ++i) {
                struct xhci_ep_ctx *ep_ctx = xhci_get_ep_ctx(xhci, ctx, i);
                dma_addr_t dma = ctx->dma +
-                       ((unsigned long)ep_ctx - (unsigned long)ctx);
+                       ((unsigned long)ep_ctx - (unsigned long)ctx->bytes);
 
                xhci_dbg(xhci, "Endpoint %02d Context:\n", i);
                xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - ep_info\n",
index 816c39c..99911e7 100644 (file)
 
 #include <linux/irq.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 
 #include "xhci.h"
 
 #define DRIVER_AUTHOR "Sarah Sharp"
 #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"
 
+/* Some 0.95 hardware can't handle the chain bit on a Link TRB being cleared */
+static int link_quirk;
+module_param(link_quirk, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(link_quirk, "Don't clear the chain bit on a link TRB");
+
 /* TODO: copied from ehci-hcd.c - can this be refactored? */
 /*
  * handshake - spin reading hc until handshake completes or fails
@@ -214,6 +220,12 @@ int xhci_init(struct usb_hcd *hcd)
 
        xhci_dbg(xhci, "xhci_init\n");
        spin_lock_init(&xhci->lock);
+       if (link_quirk) {
+               xhci_dbg(xhci, "QUIRK: Not clearing Link TRB chain bits.\n");
+               xhci->quirks |= XHCI_LINK_TRB_QUIRK;
+       } else {
+               xhci_dbg(xhci, "xHCI doesn't need link TRB QUIRK\n");
+       }
        retval = xhci_mem_init(xhci, GFP_KERNEL);
        xhci_dbg(xhci, "Finished xhci_init\n");
 
@@ -339,13 +351,14 @@ void xhci_event_ring_work(unsigned long arg)
        xhci_dbg_ring_ptrs(xhci, xhci->cmd_ring);
        xhci_dbg_cmd_ptrs(xhci);
        for (i = 0; i < MAX_HC_SLOTS; ++i) {
-               if (xhci->devs[i]) {
-                       for (j = 0; j < 31; ++j) {
-                               if (xhci->devs[i]->ep_rings[j]) {
-                                       xhci_dbg(xhci, "Dev %d endpoint ring %d:\n", i, j);
-                                       xhci_debug_segment(xhci, xhci->devs[i]->ep_rings[j]->deq_seg);
-                               }
-                       }
+               if (!xhci->devs[i])
+                       continue;
+               for (j = 0; j < 31; ++j) {
+                       struct xhci_ring *ring = xhci->devs[i]->eps[j].ring;
+                       if (!ring)
+                               continue;
+                       xhci_dbg(xhci, "Dev %d endpoint ring %d:\n", i, j);
+                       xhci_debug_segment(xhci, ring->deq_seg);
                }
        }
 
@@ -555,13 +568,22 @@ unsigned int xhci_get_endpoint_flag(struct usb_endpoint_descriptor *desc)
        return 1 << (xhci_get_endpoint_index(desc) + 1);
 }
 
+/* Find the flag for this endpoint (for use in the control context).  Use the
+ * endpoint index to create a bitmask.  The slot context is bit 0, endpoint 0 is
+ * bit 1, etc.
+ */
+unsigned int xhci_get_endpoint_flag_from_index(unsigned int ep_index)
+{
+       return 1 << (ep_index + 1);
+}
+
 /* Compute the last valid endpoint context index.  Basically, this is the
  * endpoint index plus one.  For slot contexts with more than valid endpoint,
  * we find the most significant bit set in the added contexts flags.
  * e.g. ep 1 IN (with epnum 0x81) => added_ctxs = 0b1000
  * fls(0b1000) = 4, but the endpoint context index is 3, so subtract one.
  */
-static inline unsigned int xhci_last_valid_endpoint(u32 added_ctxs)
+unsigned int xhci_last_valid_endpoint(u32 added_ctxs)
 {
        return fls(added_ctxs) - 1;
 }
@@ -589,6 +611,71 @@ int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev,
        return 1;
 }
 
+static int xhci_configure_endpoint(struct xhci_hcd *xhci,
+               struct usb_device *udev, struct xhci_command *command,
+               bool ctx_change, bool must_succeed);
+
+/*
+ * Full speed devices may have a max packet size greater than 8 bytes, but the
+ * USB core doesn't know that until it reads the first 8 bytes of the
+ * descriptor.  If the usb_device's max packet size changes after that point,
+ * we need to issue an evaluate context command and wait on it.
+ */
+static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
+               unsigned int ep_index, struct urb *urb)
+{
+       struct xhci_container_ctx *in_ctx;
+       struct xhci_container_ctx *out_ctx;
+       struct xhci_input_control_ctx *ctrl_ctx;
+       struct xhci_ep_ctx *ep_ctx;
+       int max_packet_size;
+       int hw_max_packet_size;
+       int ret = 0;
+
+       out_ctx = xhci->devs[slot_id]->out_ctx;
+       ep_ctx = xhci_get_ep_ctx(xhci, out_ctx, ep_index);
+       hw_max_packet_size = MAX_PACKET_DECODED(ep_ctx->ep_info2);
+       max_packet_size = urb->dev->ep0.desc.wMaxPacketSize;
+       if (hw_max_packet_size != max_packet_size) {
+               xhci_dbg(xhci, "Max Packet Size for ep 0 changed.\n");
+               xhci_dbg(xhci, "Max packet size in usb_device = %d\n",
+                               max_packet_size);
+               xhci_dbg(xhci, "Max packet size in xHCI HW = %d\n",
+                               hw_max_packet_size);
+               xhci_dbg(xhci, "Issuing evaluate context command.\n");
+
+               /* Set up the modified control endpoint 0 */
+               xhci_endpoint_copy(xhci, xhci->devs[slot_id]->in_ctx,
+                               xhci->devs[slot_id]->out_ctx, ep_index);
+               in_ctx = xhci->devs[slot_id]->in_ctx;
+               ep_ctx = xhci_get_ep_ctx(xhci, in_ctx, ep_index);
+               ep_ctx->ep_info2 &= ~MAX_PACKET_MASK;
+               ep_ctx->ep_info2 |= MAX_PACKET(max_packet_size);
+
+               /* Set up the input context flags for the command */
+               /* FIXME: This won't work if a non-default control endpoint
+                * changes max packet sizes.
+                */
+               ctrl_ctx = xhci_get_input_control_ctx(xhci, in_ctx);
+               ctrl_ctx->add_flags = EP0_FLAG;
+               ctrl_ctx->drop_flags = 0;
+
+               xhci_dbg(xhci, "Slot %d input context\n", slot_id);
+               xhci_dbg_ctx(xhci, in_ctx, ep_index);
+               xhci_dbg(xhci, "Slot %d output context\n", slot_id);
+               xhci_dbg_ctx(xhci, out_ctx, ep_index);
+
+               ret = xhci_configure_endpoint(xhci, urb->dev, NULL,
+                               true, false);
+
+               /* Clean up the input context for later use by bandwidth
+                * functions.
+                */
+               ctrl_ctx->add_flags = SLOT_FLAG;
+       }
+       return ret;
+}
+
 /*
  * non-error returns are a promise to giveback() the urb later
  * we drop ownership so next owner (or urb unlink) can get it
@@ -600,13 +687,13 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
        int ret = 0;
        unsigned int slot_id, ep_index;
 
+
        if (!urb || xhci_check_args(hcd, urb->dev, urb->ep, true, __func__) <= 0)
                return -EINVAL;
 
        slot_id = urb->dev->slot_id;
        ep_index = xhci_get_endpoint_index(&urb->ep->desc);
 
-       spin_lock_irqsave(&xhci->lock, flags);
        if (!xhci->devs || !xhci->devs[slot_id]) {
                if (!in_interrupt())
                        dev_warn(&urb->dev->dev, "WARN: urb submitted for dev with no Slot ID\n");
@@ -619,19 +706,38 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
                ret = -ESHUTDOWN;
                goto exit;
        }
-       if (usb_endpoint_xfer_control(&urb->ep->desc))
+       if (usb_endpoint_xfer_control(&urb->ep->desc)) {
+               /* Check to see if the max packet size for the default control
+                * endpoint changed during FS device enumeration
+                */
+               if (urb->dev->speed == USB_SPEED_FULL) {
+                       ret = xhci_check_maxpacket(xhci, slot_id,
+                                       ep_index, urb);
+                       if (ret < 0)
+                               return ret;
+               }
+
                /* We have a spinlock and interrupts disabled, so we must pass
                 * atomic context to this function, which may allocate memory.
                 */
+               spin_lock_irqsave(&xhci->lock, flags);
                ret = xhci_queue_ctrl_tx(xhci, GFP_ATOMIC, urb,
                                slot_id, ep_index);
-       else if (usb_endpoint_xfer_bulk(&urb->ep->desc))
+               spin_unlock_irqrestore(&xhci->lock, flags);
+       } else if (usb_endpoint_xfer_bulk(&urb->ep->desc)) {
+               spin_lock_irqsave(&xhci->lock, flags);
                ret = xhci_queue_bulk_tx(xhci, GFP_ATOMIC, urb,
                                slot_id, ep_index);
-       else
+               spin_unlock_irqrestore(&xhci->lock, flags);
+       } else if (usb_endpoint_xfer_int(&urb->ep->desc)) {
+               spin_lock_irqsave(&xhci->lock, flags);
+               ret = xhci_queue_intr_tx(xhci, GFP_ATOMIC, urb,
+                               slot_id, ep_index);
+               spin_unlock_irqrestore(&xhci->lock, flags);
+       } else {
                ret = -EINVAL;
+       }
 exit:
-       spin_unlock_irqrestore(&xhci->lock, flags);
        return ret;
 }
 
@@ -674,6 +780,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
        struct xhci_td *td;
        unsigned int ep_index;
        struct xhci_ring *ep_ring;
+       struct xhci_virt_ep *ep;
 
        xhci = hcd_to_xhci(hcd);
        spin_lock_irqsave(&xhci->lock, flags);
@@ -686,17 +793,18 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
        xhci_dbg(xhci, "Event ring:\n");
        xhci_debug_ring(xhci, xhci->event_ring);
        ep_index = xhci_get_endpoint_index(&urb->ep->desc);
-       ep_ring = xhci->devs[urb->dev->slot_id]->ep_rings[ep_index];
+       ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index];
+       ep_ring = ep->ring;
        xhci_dbg(xhci, "Endpoint ring:\n");
        xhci_debug_ring(xhci, ep_ring);
        td = (struct xhci_td *) urb->hcpriv;
 
-       ep_ring->cancels_pending++;
-       list_add_tail(&td->cancelled_td_list, &ep_ring->cancelled_td_list);
+       ep->cancels_pending++;
+       list_add_tail(&td->cancelled_td_list, &ep->cancelled_td_list);
        /* Queue a stop endpoint command, but only if this is
         * the first cancellation to be handled.
         */
-       if (ep_ring->cancels_pending == 1) {
+       if (ep->cancels_pending == 1) {
                xhci_queue_stop_endpoint(xhci, urb->dev->slot_id, ep_index);
                xhci_ring_cmd_db(xhci);
        }
@@ -930,6 +1038,141 @@ static void xhci_zero_in_ctx(struct xhci_hcd *xhci, struct xhci_virt_device *vir
        }
 }
 
+static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
+               struct usb_device *udev, int *cmd_status)
+{
+       int ret;
+
+       switch (*cmd_status) {
+       case COMP_ENOMEM:
+               dev_warn(&udev->dev, "Not enough host controller resources "
+                               "for new device state.\n");
+               ret = -ENOMEM;
+               /* FIXME: can we allocate more resources for the HC? */
+               break;
+       case COMP_BW_ERR:
+               dev_warn(&udev->dev, "Not enough bandwidth "
+                               "for new device state.\n");
+               ret = -ENOSPC;
+               /* FIXME: can we go back to the old state? */
+               break;
+       case COMP_TRB_ERR:
+               /* the HCD set up something wrong */
+               dev_warn(&udev->dev, "ERROR: Endpoint drop flag = 0, "
+                               "add flag = 1, "
+                               "and endpoint is not disabled.\n");
+               ret = -EINVAL;
+               break;
+       case COMP_SUCCESS:
+               dev_dbg(&udev->dev, "Successful Endpoint Configure command\n");
+               ret = 0;
+               break;
+       default:
+               xhci_err(xhci, "ERROR: unexpected command completion "
+                               "code 0x%x.\n", *cmd_status);
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
+static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
+               struct usb_device *udev, int *cmd_status)
+{
+       int ret;
+       struct xhci_virt_device *virt_dev = xhci->devs[udev->slot_id];
+
+       switch (*cmd_status) {
+       case COMP_EINVAL:
+               dev_warn(&udev->dev, "WARN: xHCI driver setup invalid evaluate "
+                               "context command.\n");
+               ret = -EINVAL;
+               break;
+       case COMP_EBADSLT:
+               dev_warn(&udev->dev, "WARN: slot not enabled for"
+                               "evaluate context command.\n");
+       case COMP_CTX_STATE:
+               dev_warn(&udev->dev, "WARN: invalid context state for "
+                               "evaluate context command.\n");
+               xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1);
+               ret = -EINVAL;
+               break;
+       case COMP_SUCCESS:
+               dev_dbg(&udev->dev, "Successful evaluate context command\n");
+               ret = 0;
+               break;
+       default:
+               xhci_err(xhci, "ERROR: unexpected command completion "
+                               "code 0x%x.\n", *cmd_status);
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
+/* Issue a configure endpoint command or evaluate context command
+ * and wait for it to finish.
+ */
+static int xhci_configure_endpoint(struct xhci_hcd *xhci,
+               struct usb_device *udev,
+               struct xhci_command *command,
+               bool ctx_change, bool must_succeed)
+{
+       int ret;
+       int timeleft;
+       unsigned long flags;
+       struct xhci_container_ctx *in_ctx;
+       struct completion *cmd_completion;
+       int *cmd_status;
+       struct xhci_virt_device *virt_dev;
+
+       spin_lock_irqsave(&xhci->lock, flags);
+       virt_dev = xhci->devs[udev->slot_id];
+       if (command) {
+               in_ctx = command->in_ctx;
+               cmd_completion = command->completion;
+               cmd_status = &command->status;
+               command->command_trb = xhci->cmd_ring->enqueue;
+               list_add_tail(&command->cmd_list, &virt_dev->cmd_list);
+       } else {
+               in_ctx = virt_dev->in_ctx;
+               cmd_completion = &virt_dev->cmd_completion;
+               cmd_status = &virt_dev->cmd_status;
+       }
+
+       if (!ctx_change)
+               ret = xhci_queue_configure_endpoint(xhci, in_ctx->dma,
+                               udev->slot_id, must_succeed);
+       else
+               ret = xhci_queue_evaluate_context(xhci, in_ctx->dma,
+                               udev->slot_id);
+       if (ret < 0) {
+               spin_unlock_irqrestore(&xhci->lock, flags);
+               xhci_dbg(xhci, "FIXME allocate a new ring segment\n");
+               return -ENOMEM;
+       }
+       xhci_ring_cmd_db(xhci);
+       spin_unlock_irqrestore(&xhci->lock, flags);
+
+       /* Wait for the configure endpoint command to complete */
+       timeleft = wait_for_completion_interruptible_timeout(
+                       cmd_completion,
+                       USB_CTRL_SET_TIMEOUT);
+       if (timeleft <= 0) {
+               xhci_warn(xhci, "%s while waiting for %s command\n",
+                               timeleft == 0 ? "Timeout" : "Signal",
+                               ctx_change == 0 ?
+                                       "configure endpoint" :
+                                       "evaluate context");
+               /* FIXME cancel the configure endpoint command */
+               return -ETIME;
+       }
+
+       if (!ctx_change)
+               return xhci_configure_endpoint_result(xhci, udev, cmd_status);
+       return xhci_evaluate_context_result(xhci, udev, cmd_status);
+}
+
 /* Called after one or more calls to xhci_add_endpoint() or
  * xhci_drop_endpoint().  If this call fails, the USB core is expected
  * to call xhci_reset_bandwidth().
@@ -944,8 +1187,6 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
 {
        int i;
        int ret = 0;
-       int timeleft;
-       unsigned long flags;
        struct xhci_hcd *xhci;
        struct xhci_virt_device *virt_dev;
        struct xhci_input_control_ctx *ctrl_ctx;
@@ -975,56 +1216,8 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
        xhci_dbg_ctx(xhci, virt_dev->in_ctx,
                        LAST_CTX_TO_EP_NUM(slot_ctx->dev_info));
 
-       spin_lock_irqsave(&xhci->lock, flags);
-       ret = xhci_queue_configure_endpoint(xhci, virt_dev->in_ctx->dma,
-                       udev->slot_id);
-       if (ret < 0) {
-               spin_unlock_irqrestore(&xhci->lock, flags);
-               xhci_dbg(xhci, "FIXME allocate a new ring segment\n");
-               return -ENOMEM;
-       }
-       xhci_ring_cmd_db(xhci);
-       spin_unlock_irqrestore(&xhci->lock, flags);
-
-       /* Wait for the configure endpoint command to complete */
-       timeleft = wait_for_completion_interruptible_timeout(
-                       &virt_dev->cmd_completion,
-                       USB_CTRL_SET_TIMEOUT);
-       if (timeleft <= 0) {
-               xhci_warn(xhci, "%s while waiting for configure endpoint command\n",
-                               timeleft == 0 ? "Timeout" : "Signal");
-               /* FIXME cancel the configure endpoint command */
-               return -ETIME;
-       }
-
-       switch (virt_dev->cmd_status) {
-       case COMP_ENOMEM:
-               dev_warn(&udev->dev, "Not enough host controller resources "
-                               "for new device state.\n");
-               ret = -ENOMEM;
-               /* FIXME: can we allocate more resources for the HC? */
-               break;
-       case COMP_BW_ERR:
-               dev_warn(&udev->dev, "Not enough bandwidth "
-                               "for new device state.\n");
-               ret = -ENOSPC;
-               /* FIXME: can we go back to the old state? */
-               break;
-       case COMP_TRB_ERR:
-               /* the HCD set up something wrong */
-               dev_warn(&udev->dev, "ERROR: Endpoint drop flag = 0, add flag = 1, "
-                               "and endpoint is not disabled.\n");
-               ret = -EINVAL;
-               break;
-       case COMP_SUCCESS:
-               dev_dbg(&udev->dev, "Successful Endpoint Configure command\n");
-               break;
-       default:
-               xhci_err(xhci, "ERROR: unexpected command completion "
-                               "code 0x%x.\n", virt_dev->cmd_status);
-               ret = -EINVAL;
-               break;
-       }
+       ret = xhci_configure_endpoint(xhci, udev, NULL,
+                       false, false);
        if (ret) {
                /* Callee should call reset_bandwidth() */
                return ret;
@@ -1037,10 +1230,10 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
        xhci_zero_in_ctx(xhci, virt_dev);
        /* Free any old rings */
        for (i = 1; i < 31; ++i) {
-               if (virt_dev->new_ep_rings[i]) {
-                       xhci_ring_free(xhci, virt_dev->ep_rings[i]);
-                       virt_dev->ep_rings[i] = virt_dev->new_ep_rings[i];
-                       virt_dev->new_ep_rings[i] = NULL;
+               if (virt_dev->eps[i].new_ring) {
+                       xhci_ring_free(xhci, virt_dev->eps[i].ring);
+                       virt_dev->eps[i].ring = virt_dev->eps[i].new_ring;
+                       virt_dev->eps[i].new_ring = NULL;
                }
        }
 
@@ -1067,14 +1260,93 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
        virt_dev = xhci->devs[udev->slot_id];
        /* Free any rings allocated for added endpoints */
        for (i = 0; i < 31; ++i) {
-               if (virt_dev->new_ep_rings[i]) {
-                       xhci_ring_free(xhci, virt_dev->new_ep_rings[i]);
-                       virt_dev->new_ep_rings[i] = NULL;
+               if (virt_dev->eps[i].new_ring) {
+                       xhci_ring_free(xhci, virt_dev->eps[i].new_ring);
+                       virt_dev->eps[i].new_ring = NULL;
                }
        }
        xhci_zero_in_ctx(xhci, virt_dev);
 }
 
+static void xhci_setup_input_ctx_for_config_ep(struct xhci_hcd *xhci,
+               struct xhci_container_ctx *in_ctx,
+               struct xhci_container_ctx *out_ctx,
+               u32 add_flags, u32 drop_flags)
+{
+       struct xhci_input_control_ctx *ctrl_ctx;
+       ctrl_ctx = xhci_get_input_control_ctx(xhci, in_ctx);
+       ctrl_ctx->add_flags = add_flags;
+       ctrl_ctx->drop_flags = drop_flags;
+       xhci_slot_copy(xhci, in_ctx, out_ctx);
+       ctrl_ctx->add_flags |= SLOT_FLAG;
+
+       xhci_dbg(xhci, "Input Context:\n");
+       xhci_dbg_ctx(xhci, in_ctx, xhci_last_valid_endpoint(add_flags));
+}
+
+void xhci_setup_input_ctx_for_quirk(struct xhci_hcd *xhci,
+               unsigned int slot_id, unsigned int ep_index,
+               struct xhci_dequeue_state *deq_state)
+{
+       struct xhci_container_ctx *in_ctx;
+       struct xhci_ep_ctx *ep_ctx;
+       u32 added_ctxs;
+       dma_addr_t addr;
+
+       xhci_endpoint_copy(xhci, xhci->devs[slot_id]->in_ctx,
+                       xhci->devs[slot_id]->out_ctx, ep_index);
+       in_ctx = xhci->devs[slot_id]->in_ctx;
+       ep_ctx = xhci_get_ep_ctx(xhci, in_ctx, ep_index);
+       addr = xhci_trb_virt_to_dma(deq_state->new_deq_seg,
+                       deq_state->new_deq_ptr);
+       if (addr == 0) {
+               xhci_warn(xhci, "WARN Cannot submit config ep after "
+                               "reset ep command\n");
+               xhci_warn(xhci, "WARN deq seg = %p, deq ptr = %p\n",
+                               deq_state->new_deq_seg,
+                               deq_state->new_deq_ptr);
+               return;
+       }
+       ep_ctx->deq = addr | deq_state->new_cycle_state;
+
+       added_ctxs = xhci_get_endpoint_flag_from_index(ep_index);
+       xhci_setup_input_ctx_for_config_ep(xhci, xhci->devs[slot_id]->in_ctx,
+                       xhci->devs[slot_id]->out_ctx, added_ctxs, added_ctxs);
+}
+
+void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
+               struct usb_device *udev, unsigned int ep_index)
+{
+       struct xhci_dequeue_state deq_state;
+       struct xhci_virt_ep *ep;
+
+       xhci_dbg(xhci, "Cleaning up stalled endpoint ring\n");
+       ep = &xhci->devs[udev->slot_id]->eps[ep_index];
+       /* We need to move the HW's dequeue pointer past this TD,
+        * or it will attempt to resend it on the next doorbell ring.
+        */
+       xhci_find_new_dequeue_state(xhci, udev->slot_id,
+                       ep_index, ep->stopped_td,
+                       &deq_state);
+
+       /* HW with the reset endpoint quirk will use the saved dequeue state to
+        * issue a configure endpoint command later.
+        */
+       if (!(xhci->quirks & XHCI_RESET_EP_QUIRK)) {
+               xhci_dbg(xhci, "Queueing new dequeue state\n");
+               xhci_queue_new_dequeue_state(xhci, udev->slot_id,
+                               ep_index, &deq_state);
+       } else {
+               /* Better hope no one uses the input context between now and the
+                * reset endpoint completion!
+                */
+               xhci_dbg(xhci, "Setting up input context for "
+                               "configure endpoint command\n");
+               xhci_setup_input_ctx_for_quirk(xhci, udev->slot_id,
+                               ep_index, &deq_state);
+       }
+}
+
 /* Deal with stalled endpoints.  The core should have sent the control message
  * to clear the halt condition.  However, we need to make the xHCI hardware
  * reset its sequence number, since a device will expect a sequence number of
@@ -1089,8 +1361,7 @@ void xhci_endpoint_reset(struct usb_hcd *hcd,
        unsigned int ep_index;
        unsigned long flags;
        int ret;
-       struct xhci_dequeue_state deq_state;
-       struct xhci_ring *ep_ring;
+       struct xhci_virt_ep *virt_ep;
 
        xhci = hcd_to_xhci(hcd);
        udev = (struct usb_device *) ep->hcpriv;
@@ -1100,12 +1371,16 @@ void xhci_endpoint_reset(struct usb_hcd *hcd,
        if (!ep->hcpriv)
                return;
        ep_index = xhci_get_endpoint_index(&ep->desc);
-       ep_ring = xhci->devs[udev->slot_id]->ep_rings[ep_index];
-       if (!ep_ring->stopped_td) {
+       virt_ep = &xhci->devs[udev->slot_id]->eps[ep_index];
+       if (!virt_ep->stopped_td) {
                xhci_dbg(xhci, "Endpoint 0x%x not halted, refusing to reset.\n",
                                ep->desc.bEndpointAddress);
                return;
        }
+       if (usb_endpoint_xfer_control(&ep->desc)) {
+               xhci_dbg(xhci, "Control endpoint stall already handled.\n");
+               return;
+       }
 
        xhci_dbg(xhci, "Queueing reset endpoint command\n");
        spin_lock_irqsave(&xhci->lock, flags);
@@ -1116,17 +1391,8 @@ void xhci_endpoint_reset(struct usb_hcd *hcd,
         * command.  Better hope that last command worked!
         */
        if (!ret) {
-               xhci_dbg(xhci, "Cleaning up stalled endpoint ring\n");
-               /* We need to move the HW's dequeue pointer past this TD,
-                * or it will attempt to resend it on the next doorbell ring.
-                */
-               xhci_find_new_dequeue_state(xhci, udev->slot_id,
-                               ep_index, ep_ring->stopped_td, &deq_state);
-               xhci_dbg(xhci, "Queueing new dequeue state\n");
-               xhci_queue_new_dequeue_state(xhci, ep_ring,
-                               udev->slot_id,
-                               ep_index, &deq_state);
-               kfree(ep_ring->stopped_td);
+               xhci_cleanup_stalled_ring(xhci, udev, ep_index);
+               kfree(virt_ep->stopped_td);
                xhci_ring_cmd_db(xhci);
        }
        spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1328,6 +1594,88 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
        return 0;
 }
 
+/* Once a hub descriptor is fetched for a device, we need to update the xHC's
+ * internal data structures for the device.
+ */
+int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+                       struct usb_tt *tt, gfp_t mem_flags)
+{
+       struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+       struct xhci_virt_device *vdev;
+       struct xhci_command *config_cmd;
+       struct xhci_input_control_ctx *ctrl_ctx;
+       struct xhci_slot_ctx *slot_ctx;
+       unsigned long flags;
+       unsigned think_time;
+       int ret;
+
+       /* Ignore root hubs */
+       if (!hdev->parent)
+               return 0;
+
+       vdev = xhci->devs[hdev->slot_id];
+       if (!vdev) {
+               xhci_warn(xhci, "Cannot update hub desc for unknown device.\n");
+               return -EINVAL;
+       }
+       config_cmd = xhci_alloc_command(xhci, true, mem_flags);
+       if (!config_cmd) {
+               xhci_dbg(xhci, "Could not allocate xHCI command structure.\n");
+               return -ENOMEM;
+       }
+
+       spin_lock_irqsave(&xhci->lock, flags);
+       xhci_slot_copy(xhci, config_cmd->in_ctx, vdev->out_ctx);
+       ctrl_ctx = xhci_get_input_control_ctx(xhci, config_cmd->in_ctx);
+       ctrl_ctx->add_flags |= SLOT_FLAG;
+       slot_ctx = xhci_get_slot_ctx(xhci, config_cmd->in_ctx);
+       slot_ctx->dev_info |= DEV_HUB;
+       if (tt->multi)
+               slot_ctx->dev_info |= DEV_MTT;
+       if (xhci->hci_version > 0x95) {
+               xhci_dbg(xhci, "xHCI version %x needs hub "
+                               "TT think time and number of ports\n",
+                               (unsigned int) xhci->hci_version);
+               slot_ctx->dev_info2 |= XHCI_MAX_PORTS(hdev->maxchild);
+               /* Set TT think time - convert from ns to FS bit times.
+                * 0 = 8 FS bit times, 1 = 16 FS bit times,
+                * 2 = 24 FS bit times, 3 = 32 FS bit times.
+                */
+               think_time = tt->think_time;
+               if (think_time != 0)
+                       think_time = (think_time / 666) - 1;
+               slot_ctx->tt_info |= TT_THINK_TIME(think_time);
+       } else {
+               xhci_dbg(xhci, "xHCI version %x doesn't need hub "
+                               "TT think time or number of ports\n",
+                               (unsigned int) xhci->hci_version);
+       }
+       slot_ctx->dev_state = 0;
+       spin_unlock_irqrestore(&xhci->lock, flags);
+
+       xhci_dbg(xhci, "Set up %s for hub device.\n",
+                       (xhci->hci_version > 0x95) ?
+                       "configure endpoint" : "evaluate context");
+       xhci_dbg(xhci, "Slot %u Input Context:\n", hdev->slot_id);
+       xhci_dbg_ctx(xhci, config_cmd->in_ctx, 0);
+
+       /* Issue and wait for the configure endpoint or
+        * evaluate context command.
+        */
+       if (xhci->hci_version > 0x95)
+               ret = xhci_configure_endpoint(xhci, hdev, config_cmd,
+                               false, false);
+       else
+               ret = xhci_configure_endpoint(xhci, hdev, config_cmd,
+                               true, false);
+
+       xhci_dbg(xhci, "Slot %u Output Context:\n", hdev->slot_id);
+       xhci_dbg_ctx(xhci, vdev->out_ctx, 0);
+
+       xhci_free_command(xhci, config_cmd);
+       return ret;
+}
+
 int xhci_get_frame(struct usb_hcd *hcd)
 {
        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
index e6b9a1c..1db4fea 100644 (file)
@@ -94,6 +94,9 @@ static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev,
                val = prev->trbs[TRBS_PER_SEGMENT-1].link.control;
                val &= ~TRB_TYPE_BITMASK;
                val |= TRB_TYPE(TRB_LINK);
+               /* Always set the chain bit with 0.95 hardware */
+               if (xhci_link_trb_quirk(xhci))
+                       val |= TRB_CHAIN;
                prev->trbs[TRBS_PER_SEGMENT-1].link.control = val;
        }
        xhci_dbg(xhci, "Linking segment 0x%llx to segment 0x%llx (DMA)\n",
@@ -141,7 +144,6 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
                return 0;
 
        INIT_LIST_HEAD(&ring->td_list);
-       INIT_LIST_HEAD(&ring->cancelled_td_list);
        if (num_segs == 0)
                return ring;
 
@@ -262,8 +264,8 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id)
                return;
 
        for (i = 0; i < 31; ++i)
-               if (dev->ep_rings[i])
-                       xhci_ring_free(xhci, dev->ep_rings[i]);
+               if (dev->eps[i].ring)
+                       xhci_ring_free(xhci, dev->eps[i].ring);
 
        if (dev->in_ctx)
                xhci_free_container_ctx(xhci, dev->in_ctx);
@@ -278,6 +280,7 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
                struct usb_device *udev, gfp_t flags)
 {
        struct xhci_virt_device *dev;
+       int i;
 
        /* Slot ID 0 is reserved */
        if (slot_id == 0 || xhci->devs[slot_id]) {
@@ -306,12 +309,17 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
        xhci_dbg(xhci, "Slot %d input ctx = 0x%llx (dma)\n", slot_id,
                        (unsigned long long)dev->in_ctx->dma);
 
+       /* Initialize the cancellation list for each endpoint */
+       for (i = 0; i < 31; i++)
+               INIT_LIST_HEAD(&dev->eps[i].cancelled_td_list);
+
        /* Allocate endpoint 0 ring */
-       dev->ep_rings[0] = xhci_ring_alloc(xhci, 1, true, flags);
-       if (!dev->ep_rings[0])
+       dev->eps[0].ring = xhci_ring_alloc(xhci, 1, true, flags);
+       if (!dev->eps[0].ring)
                goto fail;
 
        init_completion(&dev->cmd_completion);
+       INIT_LIST_HEAD(&dev->cmd_list);
 
        /* Point to output device context in dcbaa. */
        xhci->dcbaa->dev_context_ptrs[slot_id] = dev->out_ctx->dma;
@@ -352,9 +360,9 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
        /* 3) Only the control endpoint is valid - one endpoint context */
        slot_ctx->dev_info |= LAST_CTX(1);
 
+       slot_ctx->dev_info |= (u32) udev->route;
        switch (udev->speed) {
        case USB_SPEED_SUPER:
-               slot_ctx->dev_info |= (u32) udev->route;
                slot_ctx->dev_info |= (u32) SLOT_SPEED_SS;
                break;
        case USB_SPEED_HIGH:
@@ -382,14 +390,12 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
        xhci_dbg(xhci, "Set root hub portnum to %d\n", top_dev->portnum);
 
        /* Is this a LS/FS device under a HS hub? */
-       /*
-        * FIXME: I don't think this is right, where does the TT info for the
-        * roothub or parent hub come from?
-        */
        if ((udev->speed == USB_SPEED_LOW || udev->speed == USB_SPEED_FULL) &&
                        udev->tt) {
                slot_ctx->tt_info = udev->tt->hub->slot_id;
                slot_ctx->tt_info |= udev->ttport << 8;
+               if (udev->tt->multi)
+                       slot_ctx->dev_info |= DEV_MTT;
        }
        xhci_dbg(xhci, "udev->tt = %p\n", udev->tt);
        xhci_dbg(xhci, "udev->ttport = 0x%x\n", udev->ttport);
@@ -398,22 +404,35 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
        /* Step 5 */
        ep0_ctx->ep_info2 = EP_TYPE(CTRL_EP);
        /*
-        * See section 4.3 bullet 6:
-        * The default Max Packet size for ep0 is "8 bytes for a USB2
-        * LS/FS/HS device or 512 bytes for a USB3 SS device"
         * XXX: Not sure about wireless USB devices.
         */
-       if (udev->speed == USB_SPEED_SUPER)
+       switch (udev->speed) {
+       case USB_SPEED_SUPER:
                ep0_ctx->ep_info2 |= MAX_PACKET(512);
-       else
+               break;
+       case USB_SPEED_HIGH:
+       /* USB core guesses at a 64-byte max packet first for FS devices */
+       case USB_SPEED_FULL:
+               ep0_ctx->ep_info2 |= MAX_PACKET(64);
+               break;
+       case USB_SPEED_LOW:
                ep0_ctx->ep_info2 |= MAX_PACKET(8);
+               break;
+       case USB_SPEED_VARIABLE:
+               xhci_dbg(xhci, "FIXME xHCI doesn't support wireless speeds\n");
+               return -EINVAL;
+               break;
+       default:
+               /* New speed? */
+               BUG();
+       }
        /* EP 0 can handle "burst" sizes of 1, so Max Burst Size field is 0 */
        ep0_ctx->ep_info2 |= MAX_BURST(0);
        ep0_ctx->ep_info2 |= ERROR_COUNT(3);
 
        ep0_ctx->deq =
-               dev->ep_rings[0]->first_seg->dma;
-       ep0_ctx->deq |= dev->ep_rings[0]->cycle_state;
+               dev->eps[0].ring->first_seg->dma;
+       ep0_ctx->deq |= dev->eps[0].ring->cycle_state;
 
        /* Steps 7 and 8 were done in xhci_alloc_virt_device() */
 
@@ -523,10 +542,11 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
        ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index);
 
        /* Set up the endpoint ring */
-       virt_dev->new_ep_rings[ep_index] = xhci_ring_alloc(xhci, 1, true, mem_flags);
-       if (!virt_dev->new_ep_rings[ep_index])
+       virt_dev->eps[ep_index].new_ring =
+               xhci_ring_alloc(xhci, 1, true, mem_flags);
+       if (!virt_dev->eps[ep_index].new_ring)
                return -ENOMEM;
-       ep_ring = virt_dev->new_ep_rings[ep_index];
+       ep_ring = virt_dev->eps[ep_index].new_ring;
        ep_ctx->deq = ep_ring->first_seg->dma | ep_ring->cycle_state;
 
        ep_ctx->ep_info = xhci_get_endpoint_interval(udev, ep);
@@ -598,6 +618,48 @@ void xhci_endpoint_zero(struct xhci_hcd *xhci,
         */
 }
 
+/* Copy output xhci_ep_ctx to the input xhci_ep_ctx copy.
+ * Useful when you want to change one particular aspect of the endpoint and then
+ * issue a configure endpoint command.
+ */
+void xhci_endpoint_copy(struct xhci_hcd *xhci,
+               struct xhci_container_ctx *in_ctx,
+               struct xhci_container_ctx *out_ctx,
+               unsigned int ep_index)
+{
+       struct xhci_ep_ctx *out_ep_ctx;
+       struct xhci_ep_ctx *in_ep_ctx;
+
+       out_ep_ctx = xhci_get_ep_ctx(xhci, out_ctx, ep_index);
+       in_ep_ctx = xhci_get_ep_ctx(xhci, in_ctx, ep_index);
+
+       in_ep_ctx->ep_info = out_ep_ctx->ep_info;
+       in_ep_ctx->ep_info2 = out_ep_ctx->ep_info2;
+       in_ep_ctx->deq = out_ep_ctx->deq;
+       in_ep_ctx->tx_info = out_ep_ctx->tx_info;
+}
+
+/* Copy output xhci_slot_ctx to the input xhci_slot_ctx.
+ * Useful when you want to change one particular aspect of the endpoint and then
+ * issue a configure endpoint command.  Only the context entries field matters,
+ * but we'll copy the whole thing anyway.
+ */
+void xhci_slot_copy(struct xhci_hcd *xhci,
+               struct xhci_container_ctx *in_ctx,
+               struct xhci_container_ctx *out_ctx)
+{
+       struct xhci_slot_ctx *in_slot_ctx;
+       struct xhci_slot_ctx *out_slot_ctx;
+
+       in_slot_ctx = xhci_get_slot_ctx(xhci, in_ctx);
+       out_slot_ctx = xhci_get_slot_ctx(xhci, out_ctx);
+
+       in_slot_ctx->dev_info = out_slot_ctx->dev_info;
+       in_slot_ctx->dev_info2 = out_slot_ctx->dev_info2;
+       in_slot_ctx->tt_info = out_slot_ctx->tt_info;
+       in_slot_ctx->dev_state = out_slot_ctx->dev_state;
+}
+
 /* Set up the scratchpad buffer array and scratchpad buffers, if needed. */
 static int scratchpad_alloc(struct xhci_hcd *xhci, gfp_t flags)
 {
@@ -695,6 +757,44 @@ static void scratchpad_free(struct xhci_hcd *xhci)
        xhci->scratchpad = NULL;
 }
 
+struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
+               bool allocate_completion, gfp_t mem_flags)
+{
+       struct xhci_command *command;
+
+       command = kzalloc(sizeof(*command), mem_flags);
+       if (!command)
+               return NULL;
+
+       command->in_ctx =
+               xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_INPUT, mem_flags);
+       if (!command->in_ctx)
+               return NULL;
+
+       if (allocate_completion) {
+               command->completion =
+                       kzalloc(sizeof(struct completion), mem_flags);
+               if (!command->completion) {
+                       xhci_free_container_ctx(xhci, command->in_ctx);
+                       return NULL;
+               }
+               init_completion(command->completion);
+       }
+
+       command->status = 0;
+       INIT_LIST_HEAD(&command->cmd_list);
+       return command;
+}
+
+void xhci_free_command(struct xhci_hcd *xhci,
+               struct xhci_command *command)
+{
+       xhci_free_container_ctx(xhci,
+                       command->in_ctx);
+       kfree(command->completion);
+       kfree(command);
+}
+
 void xhci_mem_cleanup(struct xhci_hcd *xhci)
 {
        struct pci_dev  *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
index 592fe7e..06595ec 100644 (file)
 
 #include "xhci.h"
 
+/* Device for a quirk */
+#define PCI_VENDOR_ID_FRESCO_LOGIC     0x1b73
+#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
+
 static const char hcd_name[] = "xhci_hcd";
 
 /* called after powerup, by probe or system-pm "wakeup" */
@@ -59,9 +63,20 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
        xhci->hcs_params1 = xhci_readl(xhci, &xhci->cap_regs->hcs_params1);
        xhci->hcs_params2 = xhci_readl(xhci, &xhci->cap_regs->hcs_params2);
        xhci->hcs_params3 = xhci_readl(xhci, &xhci->cap_regs->hcs_params3);
+       xhci->hcc_params = xhci_readl(xhci, &xhci->cap_regs->hc_capbase);
+       xhci->hci_version = HC_VERSION(xhci->hcc_params);
        xhci->hcc_params = xhci_readl(xhci, &xhci->cap_regs->hcc_params);
        xhci_print_registers(xhci);
 
+       /* Look for vendor-specific quirks */
+       if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
+                       pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
+                       pdev->revision == 0x0) {
+                       xhci->quirks |= XHCI_RESET_EP_QUIRK;
+                       xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
+                                       " endpoint cmd after reset endpoint\n");
+       }
+
        /* Make sure the HC is halted. */
        retval = xhci_halt(xhci);
        if (retval)
@@ -121,6 +136,7 @@ static const struct hc_driver xhci_pci_hc_driver = {
        .check_bandwidth =      xhci_check_bandwidth,
        .reset_bandwidth =      xhci_reset_bandwidth,
        .address_device =       xhci_address_device,
+       .update_hub_device =    xhci_update_hub_device,
 
        /*
         * scheduling support
index aa88a06..173c39c 100644 (file)
@@ -172,8 +172,9 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer
  * have their chain bit cleared (so that each Link TRB is a separate TD).
  *
  * Section 6.4.4.1 of the 0.95 spec says link TRBs cannot have the chain bit
- * set, but other sections talk about dealing with the chain bit set.
- * Assume section 6.4.4.1 is wrong, and the chain bit can be set in a Link TRB.
+ * set, but other sections talk about dealing with the chain bit set.  This was
+ * fixed in the 0.96 specification errata, but we have to assume that all 0.95
+ * xHCI hardware can't handle the chain bit being cleared on a link TRB.
  */
 static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer)
 {
@@ -191,8 +192,14 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer
        while (last_trb(xhci, ring, ring->enq_seg, next)) {
                if (!consumer) {
                        if (ring != xhci->event_ring) {
-                               next->link.control &= ~TRB_CHAIN;
-                               next->link.control |= chain;
+                               /* If we're not dealing with 0.95 hardware,
+                                * carry over the chain bit of the previous TRB
+                                * (which may mean the chain bit is cleared).
+                                */
+                               if (!xhci_link_trb_quirk(xhci)) {
+                                       next->link.control &= ~TRB_CHAIN;
+                                       next->link.control |= chain;
+                               }
                                /* Give this link TRB to the hardware */
                                wmb();
                                if (next->link.control & TRB_CYCLE)
@@ -289,16 +296,18 @@ static void ring_ep_doorbell(struct xhci_hcd *xhci,
                unsigned int slot_id,
                unsigned int ep_index)
 {
-       struct xhci_ring *ep_ring;
+       struct xhci_virt_ep *ep;
+       unsigned int ep_state;
        u32 field;
        __u32 __iomem *db_addr = &xhci->dba->doorbell[slot_id];
 
-       ep_ring = xhci->devs[slot_id]->ep_rings[ep_index];
+       ep = &xhci->devs[slot_id]->eps[ep_index];
+       ep_state = ep->ep_state;
        /* Don't ring the doorbell for this endpoint if there are pending
         * cancellations because the we don't want to interrupt processing.
         */
-       if (!ep_ring->cancels_pending && !(ep_ring->state & SET_DEQ_PENDING)
-                       && !(ep_ring->state & EP_HALTED)) {
+       if (!ep->cancels_pending && !(ep_state & SET_DEQ_PENDING)
+                       && !(ep_state & EP_HALTED)) {
                field = xhci_readl(xhci, db_addr) & DB_MASK;
                xhci_writel(xhci, field | EPI_TO_DB(ep_index), db_addr);
                /* Flush PCI posted writes - FIXME Matthew Wilcox says this
@@ -354,7 +363,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
                struct xhci_td *cur_td, struct xhci_dequeue_state *state)
 {
        struct xhci_virt_device *dev = xhci->devs[slot_id];
-       struct xhci_ring *ep_ring = dev->ep_rings[ep_index];
+       struct xhci_ring *ep_ring = dev->eps[ep_index].ring;
        struct xhci_generic_trb *trb;
        struct xhci_ep_ctx *ep_ctx;
        dma_addr_t addr;
@@ -362,7 +371,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
        state->new_cycle_state = 0;
        xhci_dbg(xhci, "Finding segment containing stopped TRB.\n");
        state->new_deq_seg = find_trb_seg(cur_td->start_seg,
-                       ep_ring->stopped_trb,
+                       dev->eps[ep_index].stopped_trb,
                        &state->new_cycle_state);
        if (!state->new_deq_seg)
                BUG();
@@ -442,9 +451,11 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id,
                union xhci_trb *deq_ptr, u32 cycle_state);
 
 void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
-               struct xhci_ring *ep_ring, unsigned int slot_id,
-               unsigned int ep_index, struct xhci_dequeue_state *deq_state)
+               unsigned int slot_id, unsigned int ep_index,
+               struct xhci_dequeue_state *deq_state)
 {
+       struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index];
+
        xhci_dbg(xhci, "Set TR Deq Ptr cmd, new deq seg = %p (0x%llx dma), "
                        "new deq ptr = %p (0x%llx dma), new cycle = %u\n",
                        deq_state->new_deq_seg,
@@ -461,8 +472,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
         * if the ring is running, and ringing the doorbell starts the
         * ring running.
         */
-       ep_ring->state |= SET_DEQ_PENDING;
-       xhci_ring_cmd_db(xhci);
+       ep->ep_state |= SET_DEQ_PENDING;
 }
 
 /*
@@ -481,6 +491,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
        unsigned int slot_id;
        unsigned int ep_index;
        struct xhci_ring *ep_ring;
+       struct xhci_virt_ep *ep;
        struct list_head *entry;
        struct xhci_td *cur_td = 0;
        struct xhci_td *last_unlinked_td;
@@ -493,9 +504,10 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
        memset(&deq_state, 0, sizeof(deq_state));
        slot_id = TRB_TO_SLOT_ID(trb->generic.field[3]);
        ep_index = TRB_TO_EP_INDEX(trb->generic.field[3]);
-       ep_ring = xhci->devs[slot_id]->ep_rings[ep_index];
+       ep = &xhci->devs[slot_id]->eps[ep_index];
+       ep_ring = ep->ring;
 
-       if (list_empty(&ep_ring->cancelled_td_list))
+       if (list_empty(&ep->cancelled_td_list))
                return;
 
        /* Fix up the ep ring first, so HW stops executing cancelled TDs.
@@ -503,7 +515,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
         * it.  We're also in the event handler, so we can't get re-interrupted
         * if another Stop Endpoint command completes
         */
-       list_for_each(entry, &ep_ring->cancelled_td_list) {
+       list_for_each(entry, &ep->cancelled_td_list) {
                cur_td = list_entry(entry, struct xhci_td, cancelled_td_list);
                xhci_dbg(xhci, "Cancelling TD starting at %p, 0x%llx (dma).\n",
                                cur_td->first_trb,
@@ -512,7 +524,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
                 * If we stopped on the TD we need to cancel, then we have to
                 * move the xHC endpoint ring dequeue pointer past this TD.
                 */
-               if (cur_td == ep_ring->stopped_td)
+               if (cur_td == ep->stopped_td)
                        xhci_find_new_dequeue_state(xhci, slot_id, ep_index, cur_td,
                                        &deq_state);
                else
@@ -523,14 +535,15 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
                 * the cancelled TD list for URB completion later.
                 */
                list_del(&cur_td->td_list);
-               ep_ring->cancels_pending--;
+               ep->cancels_pending--;
        }
        last_unlinked_td = cur_td;
 
        /* If necessary, queue a Set Transfer Ring Dequeue Pointer command */
        if (deq_state.new_deq_ptr && deq_state.new_deq_seg) {
-               xhci_queue_new_dequeue_state(xhci, ep_ring,
+               xhci_queue_new_dequeue_state(xhci,
                                slot_id, ep_index, &deq_state);
+               xhci_ring_cmd_db(xhci);
        } else {
                /* Otherwise just ring the doorbell to restart the ring */
                ring_ep_doorbell(xhci, slot_id, ep_index);
@@ -543,7 +556,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
         * So stop when we've completed the URB for the last TD we unlinked.
         */
        do {
-               cur_td = list_entry(ep_ring->cancelled_td_list.next,
+               cur_td = list_entry(ep->cancelled_td_list.next,
                                struct xhci_td, cancelled_td_list);
                list_del(&cur_td->cancelled_td_list);
 
@@ -590,7 +603,7 @@ static void handle_set_deq_completion(struct xhci_hcd *xhci,
        slot_id = TRB_TO_SLOT_ID(trb->generic.field[3]);
        ep_index = TRB_TO_EP_INDEX(trb->generic.field[3]);
        dev = xhci->devs[slot_id];
-       ep_ring = dev->ep_rings[ep_index];
+       ep_ring = dev->eps[ep_index].ring;
        ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index);
        slot_ctx = xhci_get_slot_ctx(xhci, dev->out_ctx);
 
@@ -634,7 +647,7 @@ static void handle_set_deq_completion(struct xhci_hcd *xhci,
                                ep_ctx->deq);
        }
 
-       ep_ring->state &= ~SET_DEQ_PENDING;
+       dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING;
        ring_ep_doorbell(xhci, slot_id, ep_index);
 }
 
@@ -644,18 +657,60 @@ static void handle_reset_ep_completion(struct xhci_hcd *xhci,
 {
        int slot_id;
        unsigned int ep_index;
+       struct xhci_ring *ep_ring;
 
        slot_id = TRB_TO_SLOT_ID(trb->generic.field[3]);
        ep_index = TRB_TO_EP_INDEX(trb->generic.field[3]);
+       ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
        /* This command will only fail if the endpoint wasn't halted,
         * but we don't care.
         */
        xhci_dbg(xhci, "Ignoring reset ep completion code of %u\n",
                        (unsigned int) GET_COMP_CODE(event->status));
 
-       /* Clear our internal halted state and restart the ring */
-       xhci->devs[slot_id]->ep_rings[ep_index]->state &= ~EP_HALTED;
-       ring_ep_doorbell(xhci, slot_id, ep_index);
+       /* HW with the reset endpoint quirk needs to have a configure endpoint
+        * command complete before the endpoint can be used.  Queue that here
+        * because the HW can't handle two commands being queued in a row.
+        */
+       if (xhci->quirks & XHCI_RESET_EP_QUIRK) {
+               xhci_dbg(xhci, "Queueing configure endpoint command\n");
+               xhci_queue_configure_endpoint(xhci,
+                               xhci->devs[slot_id]->in_ctx->dma, slot_id,
+                               false);
+               xhci_ring_cmd_db(xhci);
+       } else {
+               /* Clear our internal halted state and restart the ring */
+               xhci->devs[slot_id]->eps[ep_index].ep_state &= ~EP_HALTED;
+               ring_ep_doorbell(xhci, slot_id, ep_index);
+       }
+}
+
+/* Check to see if a command in the device's command queue matches this one.
+ * Signal the completion or free the command, and return 1.  Return 0 if the
+ * completed command isn't at the head of the command list.
+ */
+static int handle_cmd_in_cmd_wait_list(struct xhci_hcd *xhci,
+               struct xhci_virt_device *virt_dev,
+               struct xhci_event_cmd *event)
+{
+       struct xhci_command *command;
+
+       if (list_empty(&virt_dev->cmd_list))
+               return 0;
+
+       command = list_entry(virt_dev->cmd_list.next,
+                       struct xhci_command, cmd_list);
+       if (xhci->cmd_ring->dequeue != command->command_trb)
+               return 0;
+
+       command->status =
+               GET_COMP_CODE(event->status);
+       list_del(&command->cmd_list);
+       if (command->completion)
+               complete(command->completion);
+       else
+               xhci_free_command(xhci, command);
+       return 1;
 }
 
 static void handle_cmd_completion(struct xhci_hcd *xhci,
@@ -664,6 +719,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
        int slot_id = TRB_TO_SLOT_ID(event->flags);
        u64 cmd_dma;
        dma_addr_t cmd_dequeue_dma;
+       struct xhci_input_control_ctx *ctrl_ctx;
+       struct xhci_virt_device *virt_dev;
+       unsigned int ep_index;
+       struct xhci_ring *ep_ring;
+       unsigned int ep_state;
 
        cmd_dma = event->cmd_trb;
        cmd_dequeue_dma = xhci_trb_virt_to_dma(xhci->cmd_ring->deq_seg,
@@ -691,6 +751,47 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
                        xhci_free_virt_device(xhci, slot_id);
                break;
        case TRB_TYPE(TRB_CONFIG_EP):
+               virt_dev = xhci->devs[slot_id];
+               if (handle_cmd_in_cmd_wait_list(xhci, virt_dev, event))
+                       break;
+               /*
+                * Configure endpoint commands can come from the USB core
+                * configuration or alt setting changes, or because the HW
+                * needed an extra configure endpoint command after a reset
+                * endpoint command.  In the latter case, the xHCI driver is
+                * not waiting on the configure endpoint command.
+                */
+               ctrl_ctx = xhci_get_input_control_ctx(xhci,
+                               virt_dev->in_ctx);
+               /* Input ctx add_flags are the endpoint index plus one */
+               ep_index = xhci_last_valid_endpoint(ctrl_ctx->add_flags) - 1;
+               ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
+               if (!ep_ring) {
+                       /* This must have been an initial configure endpoint */
+                       xhci->devs[slot_id]->cmd_status =
+                               GET_COMP_CODE(event->status);
+                       complete(&xhci->devs[slot_id]->cmd_completion);
+                       break;
+               }
+               ep_state = xhci->devs[slot_id]->eps[ep_index].ep_state;
+               xhci_dbg(xhci, "Completed config ep cmd - last ep index = %d, "
+                               "state = %d\n", ep_index, ep_state);
+               if (xhci->quirks & XHCI_RESET_EP_QUIRK &&
+                               ep_state & EP_HALTED) {
+                       /* Clear our internal halted state and restart ring */
+                       xhci->devs[slot_id]->eps[ep_index].ep_state &=
+                               ~EP_HALTED;
+                       ring_ep_doorbell(xhci, slot_id, ep_index);
+               } else {
+                       xhci->devs[slot_id]->cmd_status =
+                               GET_COMP_CODE(event->status);
+                       complete(&xhci->devs[slot_id]->cmd_completion);
+               }
+               break;
+       case TRB_TYPE(TRB_EVAL_CONTEXT):
+               virt_dev = xhci->devs[slot_id];
+               if (handle_cmd_in_cmd_wait_list(xhci, virt_dev, event))
+                       break;
                xhci->devs[slot_id]->cmd_status = GET_COMP_CODE(event->status);
                complete(&xhci->devs[slot_id]->cmd_completion);
                break;
@@ -805,7 +906,9 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                struct xhci_transfer_event *event)
 {
        struct xhci_virt_device *xdev;
+       struct xhci_virt_ep *ep;
        struct xhci_ring *ep_ring;
+       unsigned int slot_id;
        int ep_index;
        struct xhci_td *td = 0;
        dma_addr_t event_dma;
@@ -814,9 +917,11 @@ static int handle_tx_event(struct xhci_hcd *xhci,
        struct urb *urb = 0;
        int status = -EINPROGRESS;
        struct xhci_ep_ctx *ep_ctx;
+       u32 trb_comp_code;
 
        xhci_dbg(xhci, "In %s\n", __func__);
-       xdev = xhci->devs[TRB_TO_SLOT_ID(event->flags)];
+       slot_id = TRB_TO_SLOT_ID(event->flags);
+       xdev = xhci->devs[slot_id];
        if (!xdev) {
                xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n");
                return -ENODEV;
@@ -825,7 +930,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
        /* Endpoint ID is 1 based, our index is zero based */
        ep_index = TRB_TO_EP_ID(event->flags) - 1;
        xhci_dbg(xhci, "%s - ep index = %d\n", __func__, ep_index);
-       ep_ring = xdev->ep_rings[ep_index];
+       ep = &xdev->eps[ep_index];
+       ep_ring = ep->ring;
        ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
        if (!ep_ring || (ep_ctx->ep_info & EP_STATE_MASK) == EP_STATE_DISABLED) {
                xhci_err(xhci, "ERROR Transfer event pointed to disabled endpoint\n");
@@ -870,7 +976,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        (unsigned int) event->flags);
 
        /* Look for common error cases */
-       switch (GET_COMP_CODE(event->transfer_len)) {
+       trb_comp_code = GET_COMP_CODE(event->transfer_len);
+       switch (trb_comp_code) {
        /* Skip codes that require special handling depending on
         * transfer type
         */
@@ -885,7 +992,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                break;
        case COMP_STALL:
                xhci_warn(xhci, "WARN: Stalled endpoint\n");
-               ep_ring->state |= EP_HALTED;
+               ep->ep_state |= EP_HALTED;
                status = -EPIPE;
                break;
        case COMP_TRB_ERR:
@@ -913,7 +1020,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
        /* Was this a control transfer? */
        if (usb_endpoint_xfer_control(&td->urb->ep->desc)) {
                xhci_debug_trb(xhci, xhci->event_ring->dequeue);
-               switch (GET_COMP_CODE(event->transfer_len)) {
+               switch (trb_comp_code) {
                case COMP_SUCCESS:
                        if (event_trb == ep_ring->dequeue) {
                                xhci_warn(xhci, "WARN: Success on ctrl setup TRB without IOC set??\n");
@@ -928,8 +1035,37 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        break;
                case COMP_SHORT_TX:
                        xhci_warn(xhci, "WARN: short transfer on control ep\n");
-                       status = -EREMOTEIO;
+                       if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
+                               status = -EREMOTEIO;
+                       else
+                               status = 0;
                        break;
+               case COMP_BABBLE:
+                       /* The 0.96 spec says a babbling control endpoint
+                        * is not halted. The 0.96 spec says it is.  Some HW
+                        * claims to be 0.95 compliant, but it halts the control
+                        * endpoint anyway.  Check if a babble halted the
+                        * endpoint.
+                        */
+                       if (ep_ctx->ep_info != EP_STATE_HALTED)
+                               break;
+                       /* else fall through */
+               case COMP_STALL:
+                       /* Did we transfer part of the data (middle) phase? */
+                       if (event_trb != ep_ring->dequeue &&
+                                       event_trb != td->last_trb)
+                               td->urb->actual_length =
+                                       td->urb->transfer_buffer_length
+                                       - TRB_LEN(event->transfer_len);
+                       else
+                               td->urb->actual_length = 0;
+
+                       ep->stopped_td = td;
+                       ep->stopped_trb = event_trb;
+                       xhci_queue_reset_ep(xhci, slot_id, ep_index);
+                       xhci_cleanup_stalled_ring(xhci, td->urb->dev, ep_index);
+                       xhci_ring_cmd_db(xhci);
+                       goto td_cleanup;
                default:
                        /* Others already handled above */
                        break;
@@ -943,7 +1079,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        if (event_trb == td->last_trb) {
                                if (td->urb->actual_length != 0) {
                                        /* Don't overwrite a previously set error code */
-                                       if (status == -EINPROGRESS || status == 0)
+                                       if ((status == -EINPROGRESS ||
+                                                               status == 0) &&
+                                                       (td->urb->transfer_flags
+                                                        & URB_SHORT_NOT_OK))
                                                /* Did we already see a short data stage? */
                                                status = -EREMOTEIO;
                                } else {
@@ -952,7 +1091,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                }
                        } else {
                        /* Maybe the event was for the data stage? */
-                               if (GET_COMP_CODE(event->transfer_len) != COMP_STOP_INVAL) {
+                               if (trb_comp_code != COMP_STOP_INVAL) {
                                        /* We didn't stop on a link TRB in the middle */
                                        td->urb->actual_length =
                                                td->urb->transfer_buffer_length -
@@ -964,7 +1103,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        }
                }
        } else {
-               switch (GET_COMP_CODE(event->transfer_len)) {
+               switch (trb_comp_code) {
                case COMP_SUCCESS:
                        /* Double check that the HW transferred everything. */
                        if (event_trb != td->last_trb) {
@@ -975,7 +1114,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                else
                                        status = 0;
                        } else {
-                               xhci_dbg(xhci, "Successful bulk transfer!\n");
+                               if (usb_endpoint_xfer_bulk(&td->urb->ep->desc))
+                                       xhci_dbg(xhci, "Successful bulk "
+                                                       "transfer!\n");
+                               else
+                                       xhci_dbg(xhci, "Successful interrupt "
+                                                       "transfer!\n");
                                status = 0;
                        }
                        break;
@@ -1001,11 +1145,17 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                td->urb->actual_length =
                                        td->urb->transfer_buffer_length -
                                        TRB_LEN(event->transfer_len);
-                               if (td->urb->actual_length < 0) {
+                               if (td->urb->transfer_buffer_length <
+                                               td->urb->actual_length) {
                                        xhci_warn(xhci, "HC gave bad length "
                                                        "of %d bytes left\n",
                                                        TRB_LEN(event->transfer_len));
                                        td->urb->actual_length = 0;
+                                       if (td->urb->transfer_flags &
+                                                       URB_SHORT_NOT_OK)
+                                               status = -EREMOTEIO;
+                                       else
+                                               status = 0;
                                }
                                /* Don't overwrite a previously set error code */
                                if (status == -EINPROGRESS) {
@@ -1041,30 +1191,31 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        /* If the ring didn't stop on a Link or No-op TRB, add
                         * in the actual bytes transferred from the Normal TRB
                         */
-                       if (GET_COMP_CODE(event->transfer_len) != COMP_STOP_INVAL)
+                       if (trb_comp_code != COMP_STOP_INVAL)
                                td->urb->actual_length +=
                                        TRB_LEN(cur_trb->generic.field[2]) -
                                        TRB_LEN(event->transfer_len);
                }
        }
-       if (GET_COMP_CODE(event->transfer_len) == COMP_STOP_INVAL ||
-                       GET_COMP_CODE(event->transfer_len) == COMP_STOP) {
+       if (trb_comp_code == COMP_STOP_INVAL ||
+                       trb_comp_code == COMP_STOP) {
                /* The Endpoint Stop Command completion will take care of any
                 * stopped TDs.  A stopped TD may be restarted, so don't update
                 * the ring dequeue pointer or take this TD off any lists yet.
                 */
-               ep_ring->stopped_td = td;
-               ep_ring->stopped_trb = event_trb;
+               ep->stopped_td = td;
+               ep->stopped_trb = event_trb;
        } else {
-               if (GET_COMP_CODE(event->transfer_len) == COMP_STALL) {
+               if (trb_comp_code == COMP_STALL ||
+                               trb_comp_code == COMP_BABBLE) {
                        /* The transfer is completed from the driver's
                         * perspective, but we need to issue a set dequeue
                         * command for this stalled endpoint to move the dequeue
                         * pointer past the TD.  We can't do that here because
                         * the halt condition must be cleared first.
                         */
-                       ep_ring->stopped_td = td;
-                       ep_ring->stopped_trb = event_trb;
+                       ep->stopped_td = td;
+                       ep->stopped_trb = event_trb;
                } else {
                        /* Update ring dequeue pointer */
                        while (ep_ring->dequeue != td->last_trb)
@@ -1072,16 +1223,41 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        inc_deq(xhci, ep_ring, false);
                }
 
+td_cleanup:
                /* Clean up the endpoint's TD list */
                urb = td->urb;
+               /* Do one last check of the actual transfer length.
+                * If the host controller said we transferred more data than
+                * the buffer length, urb->actual_length will be a very big
+                * number (since it's unsigned).  Play it safe and say we didn't
+                * transfer anything.
+                */
+               if (urb->actual_length > urb->transfer_buffer_length) {
+                       xhci_warn(xhci, "URB transfer length is wrong, "
+                                       "xHC issue? req. len = %u, "
+                                       "act. len = %u\n",
+                                       urb->transfer_buffer_length,
+                                       urb->actual_length);
+                       urb->actual_length = 0;
+                       if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
+                               status = -EREMOTEIO;
+                       else
+                               status = 0;
+               }
                list_del(&td->td_list);
                /* Was this TD slated to be cancelled but completed anyway? */
                if (!list_empty(&td->cancelled_td_list)) {
                        list_del(&td->cancelled_td_list);
-                       ep_ring->cancels_pending--;
+                       ep->cancels_pending--;
                }
-               /* Leave the TD around for the reset endpoint function to use */
-               if (GET_COMP_CODE(event->transfer_len) != COMP_STALL) {
+               /* Leave the TD around for the reset endpoint function to use
+                * (but only if it's not a control endpoint, since we already
+                * queued the Set TR dequeue pointer command for stalled
+                * control endpoints).
+                */
+               if (usb_endpoint_xfer_control(&urb->ep->desc) ||
+                       (trb_comp_code != COMP_STALL &&
+                               trb_comp_code != COMP_BABBLE)) {
                        kfree(td);
                }
                urb->hcpriv = NULL;
@@ -1094,7 +1270,7 @@ cleanup:
        if (urb) {
                usb_hcd_unlink_urb_from_ep(xhci_to_hcd(xhci), urb);
                xhci_dbg(xhci, "Giveback URB %p, len = %d, status = %d\n",
-                               urb, td->urb->actual_length, status);
+                               urb, urb->actual_length, status);
                spin_unlock(&xhci->lock);
                usb_hcd_giveback_urb(xhci_to_hcd(xhci), urb, status);
                spin_lock(&xhci->lock);
@@ -1235,7 +1411,7 @@ static int prepare_transfer(struct xhci_hcd *xhci,
 {
        int ret;
        struct xhci_ep_ctx *ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
-       ret = prepare_ring(xhci, xdev->ep_rings[ep_index],
+       ret = prepare_ring(xhci, xdev->eps[ep_index].ring,
                        ep_ctx->ep_info & EP_STATE_MASK,
                        num_trbs, mem_flags);
        if (ret)
@@ -1255,9 +1431,9 @@ static int prepare_transfer(struct xhci_hcd *xhci,
        (*td)->urb = urb;
        urb->hcpriv = (void *) (*td);
        /* Add this TD to the tail of the endpoint ring's TD list */
-       list_add_tail(&(*td)->td_list, &xdev->ep_rings[ep_index]->td_list);
-       (*td)->start_seg = xdev->ep_rings[ep_index]->enq_seg;
-       (*td)->first_trb = xdev->ep_rings[ep_index]->enqueue;
+       list_add_tail(&(*td)->td_list, &xdev->eps[ep_index].ring->td_list);
+       (*td)->start_seg = xdev->eps[ep_index].ring->enq_seg;
+       (*td)->first_trb = xdev->eps[ep_index].ring->enqueue;
 
        return 0;
 }
@@ -1335,6 +1511,47 @@ static void giveback_first_trb(struct xhci_hcd *xhci, int slot_id,
        ring_ep_doorbell(xhci, slot_id, ep_index);
 }
 
+/*
+ * xHCI uses normal TRBs for both bulk and interrupt.  When the interrupt
+ * endpoint is to be serviced, the xHC will consume (at most) one TD.  A TD
+ * (comprised of sg list entries) can take several service intervals to
+ * transmit.
+ */
+int xhci_queue_intr_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+               struct urb *urb, int slot_id, unsigned int ep_index)
+{
+       struct xhci_ep_ctx *ep_ctx = xhci_get_ep_ctx(xhci,
+                       xhci->devs[slot_id]->out_ctx, ep_index);
+       int xhci_interval;
+       int ep_interval;
+
+       xhci_interval = EP_INTERVAL_TO_UFRAMES(ep_ctx->ep_info);
+       ep_interval = urb->interval;
+       /* Convert to microframes */
+       if (urb->dev->speed == USB_SPEED_LOW ||
+                       urb->dev->speed == USB_SPEED_FULL)
+               ep_interval *= 8;
+       /* FIXME change this to a warning and a suggestion to use the new API
+        * to set the polling interval (once the API is added).
+        */
+       if (xhci_interval != ep_interval) {
+               if (!printk_ratelimit())
+                       dev_dbg(&urb->dev->dev, "Driver uses different interval"
+                                       " (%d microframe%s) than xHCI "
+                                       "(%d microframe%s)\n",
+                                       ep_interval,
+                                       ep_interval == 1 ? "" : "s",
+                                       xhci_interval,
+                                       xhci_interval == 1 ? "" : "s");
+               urb->interval = xhci_interval;
+               /* Convert back to frames for LS/FS devices */
+               if (urb->dev->speed == USB_SPEED_LOW ||
+                               urb->dev->speed == USB_SPEED_FULL)
+                       urb->interval /= 8;
+       }
+       return xhci_queue_bulk_tx(xhci, GFP_ATOMIC, urb, slot_id, ep_index);
+}
+
 static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                struct urb *urb, int slot_id, unsigned int ep_index)
 {
@@ -1350,7 +1567,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
        struct xhci_generic_trb *start_trb;
        int start_cycle;
 
-       ep_ring = xhci->devs[slot_id]->ep_rings[ep_index];
+       ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
        num_trbs = count_sg_trbs_needed(xhci, urb);
        num_sgs = urb->num_sgs;
 
@@ -1483,7 +1700,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
        if (urb->sg)
                return queue_bulk_sg_tx(xhci, mem_flags, urb, slot_id, ep_index);
 
-       ep_ring = xhci->devs[slot_id]->ep_rings[ep_index];
+       ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
 
        num_trbs = 0;
        /* How much data is (potentially) left before the 64KB boundary? */
@@ -1594,7 +1811,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
        u32 field, length_field;
        struct xhci_td *td;
 
-       ep_ring = xhci->devs[slot_id]->ep_rings[ep_index];
+       ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
 
        /*
         * Need to copy setup packet into setup TRB, so we can't use the setup
@@ -1677,12 +1894,27 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
 
 /****          Command Ring Operations         ****/
 
-/* Generic function for queueing a command TRB on the command ring */
-static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2, u32 field3, u32 field4)
+/* Generic function for queueing a command TRB on the command ring.
+ * Check to make sure there's room on the command ring for one command TRB.
+ * Also check that there's room reserved for commands that must not fail.
+ * If this is a command that must not fail, meaning command_must_succeed = TRUE,
+ * then only check for the number of reserved spots.
+ * Don't decrement xhci->cmd_ring_reserved_trbs after we've queued the TRB
+ * because the command event handler may want to resubmit a failed command.
+ */
+static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2,
+               u32 field3, u32 field4, bool command_must_succeed)
 {
-       if (!room_on_ring(xhci, xhci->cmd_ring, 1)) {
+       int reserved_trbs = xhci->cmd_ring_reserved_trbs;
+       if (!command_must_succeed)
+               reserved_trbs++;
+
+       if (!room_on_ring(xhci, xhci->cmd_ring, reserved_trbs)) {
                if (!in_interrupt())
                        xhci_err(xhci, "ERR: No room for command on command ring\n");
+               if (command_must_succeed)
+                       xhci_err(xhci, "ERR: Reserved TRB counting for "
+                                       "unfailable commands failed.\n");
                return -ENOMEM;
        }
        queue_trb(xhci, xhci->cmd_ring, false, field1, field2, field3,
@@ -1693,7 +1925,7 @@ static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2, u32 fiel
 /* Queue a no-op command on the command ring */
 static int queue_cmd_noop(struct xhci_hcd *xhci)
 {
-       return queue_command(xhci, 0, 0, 0, TRB_TYPE(TRB_CMD_NOOP));
+       return queue_command(xhci, 0, 0, 0, TRB_TYPE(TRB_CMD_NOOP), false);
 }
 
 /*
@@ -1712,7 +1944,7 @@ void *xhci_setup_one_noop(struct xhci_hcd *xhci)
 int xhci_queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id)
 {
        return queue_command(xhci, 0, 0, 0,
-                       TRB_TYPE(trb_type) | SLOT_ID_FOR_TRB(slot_id));
+                       TRB_TYPE(trb_type) | SLOT_ID_FOR_TRB(slot_id), false);
 }
 
 /* Queue an address device command TRB */
@@ -1721,16 +1953,28 @@ int xhci_queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
 {
        return queue_command(xhci, lower_32_bits(in_ctx_ptr),
                        upper_32_bits(in_ctx_ptr), 0,
-                       TRB_TYPE(TRB_ADDR_DEV) | SLOT_ID_FOR_TRB(slot_id));
+                       TRB_TYPE(TRB_ADDR_DEV) | SLOT_ID_FOR_TRB(slot_id),
+                       false);
 }
 
 /* Queue a configure endpoint command TRB */
 int xhci_queue_configure_endpoint(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
+               u32 slot_id, bool command_must_succeed)
+{
+       return queue_command(xhci, lower_32_bits(in_ctx_ptr),
+                       upper_32_bits(in_ctx_ptr), 0,
+                       TRB_TYPE(TRB_CONFIG_EP) | SLOT_ID_FOR_TRB(slot_id),
+                       command_must_succeed);
+}
+
+/* Queue an evaluate context command TRB */
+int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
                u32 slot_id)
 {
        return queue_command(xhci, lower_32_bits(in_ctx_ptr),
                        upper_32_bits(in_ctx_ptr), 0,
-                       TRB_TYPE(TRB_CONFIG_EP) | SLOT_ID_FOR_TRB(slot_id));
+                       TRB_TYPE(TRB_EVAL_CONTEXT) | SLOT_ID_FOR_TRB(slot_id),
+                       false);
 }
 
 int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, int slot_id,
@@ -1741,7 +1985,7 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, int slot_id,
        u32 type = TRB_TYPE(TRB_STOP_RING);
 
        return queue_command(xhci, 0, 0, 0,
-                       trb_slot_id | trb_ep_index | type);
+                       trb_slot_id | trb_ep_index | type, false);
 }
 
 /* Set Transfer Ring Dequeue Pointer command.
@@ -1765,7 +2009,7 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id,
        }
        return queue_command(xhci, lower_32_bits(addr) | cycle_state,
                        upper_32_bits(addr), 0,
-                       trb_slot_id | trb_ep_index | type);
+                       trb_slot_id | trb_ep_index | type, false);
 }
 
 int xhci_queue_reset_ep(struct xhci_hcd *xhci, int slot_id,
@@ -1775,5 +2019,6 @@ int xhci_queue_reset_ep(struct xhci_hcd *xhci, int slot_id,
        u32 trb_ep_index = EP_ID_FOR_TRB(ep_index);
        u32 type = TRB_TYPE(TRB_RESET_EP);
 
-       return queue_command(xhci, 0, 0, 0, trb_slot_id | trb_ep_index | type);
+       return queue_command(xhci, 0, 0, 0, trb_slot_id | trb_ep_index | type,
+                       false);
 }
index d31d322..4b254b6 100644 (file)
@@ -509,6 +509,8 @@ struct xhci_slot_ctx {
 #define MAX_EXIT       (0xffff)
 /* Root hub port number that is needed to access the USB device */
 #define ROOT_HUB_PORT(p)       (((p) & 0xff) << 16)
+/* Maximum number of ports under a hub device */
+#define XHCI_MAX_PORTS(p)      (((p) & 0xff) << 24)
 
 /* tt_info bitmasks */
 /*
@@ -522,6 +524,7 @@ struct xhci_slot_ctx {
  * '0' if the device is not low or full speed.
  */
 #define TT_PORT                (0xff << 8)
+#define TT_THINK_TIME(p)       (((p) & 0x3) << 16)
 
 /* dev_state bitmasks */
 /* USB device address - assigned by the HC */
@@ -581,6 +584,7 @@ struct xhci_ep_ctx {
 /* bit 15 is Linear Stream Array */
 /* Interval - period between requests to an endpoint - 125u increments. */
 #define EP_INTERVAL(p)         ((p & 0xff) << 16)
+#define EP_INTERVAL_TO_UFRAMES(p)              (1 << (((p) >> 16) & 0xff))
 
 /* ep_info2 bitmasks */
 /*
@@ -589,6 +593,7 @@ struct xhci_ep_ctx {
  */
 #define        FORCE_EVENT     (0x1)
 #define ERROR_COUNT(p) (((p) & 0x3) << 1)
+#define CTX_TO_EP_TYPE(p)      (((p) >> 3) & 0x7)
 #define EP_TYPE(p)     ((p) << 3)
 #define ISOC_OUT_EP    1
 #define BULK_OUT_EP    2
@@ -601,6 +606,8 @@ struct xhci_ep_ctx {
 /* bit 7 is Host Initiate Disable - for disabling stream selection */
 #define MAX_BURST(p)   (((p)&0xff) << 8)
 #define MAX_PACKET(p)  (((p)&0xffff) << 16)
+#define MAX_PACKET_MASK                (0xffff << 16)
+#define MAX_PACKET_DECODED(p)  (((p) >> 16) & 0xffff)
 
 
 /**
@@ -616,11 +623,44 @@ struct xhci_input_control_ctx {
        u32     rsvd2[6];
 };
 
+/* Represents everything that is needed to issue a command on the command ring.
+ * It's useful to pre-allocate these for commands that cannot fail due to
+ * out-of-memory errors, like freeing streams.
+ */
+struct xhci_command {
+       /* Input context for changing device state */
+       struct xhci_container_ctx       *in_ctx;
+       u32                             status;
+       /* If completion is null, no one is waiting on this command
+        * and the structure can be freed after the command completes.
+        */
+       struct completion               *completion;
+       union xhci_trb                  *command_trb;
+       struct list_head                cmd_list;
+};
+
 /* drop context bitmasks */
 #define        DROP_EP(x)      (0x1 << x)
 /* add context bitmasks */
 #define        ADD_EP(x)       (0x1 << x)
 
+struct xhci_virt_ep {
+       struct xhci_ring                *ring;
+       /* Temporary storage in case the configure endpoint command fails and we
+        * have to restore the device state to the previous state
+        */
+       struct xhci_ring                *new_ring;
+       unsigned int                    ep_state;
+#define SET_DEQ_PENDING                (1 << 0)
+#define EP_HALTED              (1 << 1)
+       /* ----  Related to URB cancellation ---- */
+       struct list_head        cancelled_td_list;
+       unsigned int            cancels_pending;
+       /* The TRB that was last reported in a stopped endpoint ring */
+       union xhci_trb          *stopped_trb;
+       struct xhci_td          *stopped_td;
+};
+
 struct xhci_virt_device {
        /*
         * Commands to the hardware are passed an "input context" that
@@ -633,16 +673,11 @@ struct xhci_virt_device {
        struct xhci_container_ctx       *out_ctx;
        /* Used for addressing devices and configuration changes */
        struct xhci_container_ctx       *in_ctx;
-
-       /* FIXME when stream support is added */
-       struct xhci_ring                *ep_rings[31];
-       /* Temporary storage in case the configure endpoint command fails and we
-        * have to restore the device state to the previous state
-        */
-       struct xhci_ring                *new_ep_rings[31];
+       struct xhci_virt_ep             eps[31];
        struct completion               cmd_completion;
        /* Status of the last command issued for this device */
        u32                             cmd_status;
+       struct list_head                cmd_list;
 };
 
 
@@ -905,6 +940,8 @@ union xhci_trb {
  * It must also be greater than 16.
  */
 #define TRBS_PER_SEGMENT       64
+/* Allow two commands + a link TRB, along with any reserved command TRBs */
+#define MAX_RSVD_CMD_TRBS      (TRBS_PER_SEGMENT - 3)
 #define SEGMENT_SIZE           (TRBS_PER_SEGMENT*16)
 /* TRB buffer pointers can't cross 64KB boundaries */
 #define TRB_MAX_BUFF_SHIFT             16
@@ -926,6 +963,12 @@ struct xhci_td {
        union xhci_trb          *last_trb;
 };
 
+struct xhci_dequeue_state {
+       struct xhci_segment *new_deq_seg;
+       union xhci_trb *new_deq_ptr;
+       int new_cycle_state;
+};
+
 struct xhci_ring {
        struct xhci_segment     *first_seg;
        union  xhci_trb         *enqueue;
@@ -935,15 +978,6 @@ struct xhci_ring {
        struct xhci_segment     *deq_seg;
        unsigned int            deq_updates;
        struct list_head        td_list;
-       /* ----  Related to URB cancellation ---- */
-       struct list_head        cancelled_td_list;
-       unsigned int            cancels_pending;
-       unsigned int            state;
-#define SET_DEQ_PENDING                (1 << 0)
-#define EP_HALTED              (1 << 1)
-       /* The TRB that was last reported in a stopped endpoint ring */
-       union xhci_trb          *stopped_trb;
-       struct xhci_td          *stopped_td;
        /*
         * Write the cycle state into the TRB cycle field to give ownership of
         * the TRB to the host controller (if we are the producer), or to check
@@ -952,12 +986,6 @@ struct xhci_ring {
        u32                     cycle_state;
 };
 
-struct xhci_dequeue_state {
-       struct xhci_segment *new_deq_seg;
-       union xhci_trb *new_deq_ptr;
-       int new_cycle_state;
-};
-
 struct xhci_erst_entry {
        /* 64-bit event ring segment address */
        u64     seg_addr;
@@ -1034,6 +1062,7 @@ struct xhci_hcd {
        /* data structures */
        struct xhci_device_context_array *dcbaa;
        struct xhci_ring        *cmd_ring;
+       unsigned int            cmd_ring_reserved_trbs;
        struct xhci_ring        *event_ring;
        struct xhci_erst        erst;
        /* Scratchpad */
@@ -1058,6 +1087,9 @@ struct xhci_hcd {
        int                     noops_submitted;
        int                     noops_handled;
        int                     error_bitmask;
+       unsigned int            quirks;
+#define        XHCI_LINK_TRB_QUIRK     (1 << 0)
+#define XHCI_RESET_EP_QUIRK    (1 << 1)
 };
 
 /* For testing purposes */
@@ -1136,6 +1168,13 @@ static inline void xhci_write_64(struct xhci_hcd *xhci,
        writel(val_hi, ptr + 1);
 }
 
+static inline int xhci_link_trb_quirk(struct xhci_hcd *xhci)
+{
+       u32 temp = xhci_readl(xhci, &xhci->cap_regs->hc_capbase);
+       return ((HC_VERSION(temp) == 0x95) &&
+                       (xhci->quirks & XHCI_LINK_TRB_QUIRK));
+}
+
 /* xHCI debugging */
 void xhci_print_ir_set(struct xhci_hcd *xhci, struct xhci_intr_reg *ir_set, int set_num);
 void xhci_print_registers(struct xhci_hcd *xhci);
@@ -1150,7 +1189,7 @@ void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci);
 void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring);
 void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep);
 
-/* xHCI memory managment */
+/* xHCI memory management */
 void xhci_mem_cleanup(struct xhci_hcd *xhci);
 int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags);
 void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id);
@@ -1158,11 +1197,24 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, struct usb_device
 int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev);
 unsigned int xhci_get_endpoint_index(struct usb_endpoint_descriptor *desc);
 unsigned int xhci_get_endpoint_flag(struct usb_endpoint_descriptor *desc);
+unsigned int xhci_get_endpoint_flag_from_index(unsigned int ep_index);
+unsigned int xhci_last_valid_endpoint(u32 added_ctxs);
 void xhci_endpoint_zero(struct xhci_hcd *xhci, struct xhci_virt_device *virt_dev, struct usb_host_endpoint *ep);
+void xhci_endpoint_copy(struct xhci_hcd *xhci,
+               struct xhci_container_ctx *in_ctx,
+               struct xhci_container_ctx *out_ctx,
+               unsigned int ep_index);
+void xhci_slot_copy(struct xhci_hcd *xhci,
+               struct xhci_container_ctx *in_ctx,
+               struct xhci_container_ctx *out_ctx);
 int xhci_endpoint_init(struct xhci_hcd *xhci, struct xhci_virt_device *virt_dev,
                struct usb_device *udev, struct usb_host_endpoint *ep,
                gfp_t mem_flags);
 void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring);
+struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
+               bool allocate_completion, gfp_t mem_flags);
+void xhci_free_command(struct xhci_hcd *xhci,
+               struct xhci_command *command);
 
 #ifdef CONFIG_PCI
 /* xHCI PCI glue */
@@ -1182,6 +1234,8 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd);
 int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev);
 void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev);
 int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev);
+int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+                       struct usb_tt *tt, gfp_t mem_flags);
 int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags);
 int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status);
 int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep);
@@ -1205,7 +1259,11 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, struct urb *urb,
                int slot_id, unsigned int ep_index);
 int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, struct urb *urb,
                int slot_id, unsigned int ep_index);
+int xhci_queue_intr_tx(struct xhci_hcd *xhci, gfp_t mem_flags, struct urb *urb,
+               int slot_id, unsigned int ep_index);
 int xhci_queue_configure_endpoint(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
+               u32 slot_id, bool command_must_succeed);
+int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,
                u32 slot_id);
 int xhci_queue_reset_ep(struct xhci_hcd *xhci, int slot_id,
                unsigned int ep_index);
@@ -1213,8 +1271,13 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
                unsigned int slot_id, unsigned int ep_index,
                struct xhci_td *cur_td, struct xhci_dequeue_state *state);
 void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
-               struct xhci_ring *ep_ring, unsigned int slot_id,
-               unsigned int ep_index, struct xhci_dequeue_state *deq_state);
+               unsigned int slot_id, unsigned int ep_index,
+               struct xhci_dequeue_state *deq_state);
+void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
+               struct usb_device *udev, unsigned int ep_index);
+void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci,
+               unsigned int slot_id, unsigned int ep_index,
+               struct xhci_dequeue_state *deq_state);
 
 /* xHCI roothub code */
 int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
index 4541dfc..459a728 100644 (file)
@@ -653,33 +653,6 @@ static struct scsi_host_template mts_scsi_host_template = {
        .max_sectors=           256, /* 128 K */
 };
 
-struct vendor_product
-{
-       char* name;
-       enum
-       {
-               mts_sup_unknown=0,
-               mts_sup_alpha,
-               mts_sup_full
-       }
-       support_status;
-} ;
-
-
-/* These are taken from the msmUSB.inf file on the Windows driver CD */
-static const struct vendor_product mts_supported_products[] =
-{
-       { "Phantom 336CX",      mts_sup_unknown},
-       { "Phantom 336CX",      mts_sup_unknown},
-       { "Scanmaker X6",       mts_sup_alpha},
-       { "Phantom C6",         mts_sup_unknown},
-       { "Phantom 336CX",      mts_sup_unknown},
-       { "ScanMaker V6USL",    mts_sup_unknown},
-       { "ScanMaker V6USL",    mts_sup_unknown},
-       { "Scanmaker V6UL",     mts_sup_unknown},
-       { "Scanmaker V6UPL",    mts_sup_alpha},
-};
-
 /* The entries of microtek_table must correspond, line-by-line to
    the entries of mts_supported_products[]. */
 
@@ -711,7 +684,6 @@ static int mts_usb_probe(struct usb_interface *intf,
        int err_retval = -ENOMEM;
 
        struct mts_desc * new_desc;
-       struct vendor_product const* p;
        struct usb_device *dev = interface_to_usbdev (intf);
 
        /* the current altsetting on the interface we're probing */
@@ -726,15 +698,6 @@ static int mts_usb_probe(struct usb_interface *intf,
 
        MTS_DEBUG_GOT_HERE();
 
-       p = &mts_supported_products[id - mts_usb_ids];
-
-       MTS_DEBUG_GOT_HERE();
-
-       MTS_DEBUG( "found model %s\n", p->name );
-       if ( p->support_status != mts_sup_full )
-               MTS_MESSAGE( "model %s is not known to be fully supported, reports welcome!\n",
-                            p->name );
-
        /* the current altsetting on the interface we're probing */
        altsetting = intf->cur_altsetting;
 
index 6da8887..1337a9c 100644 (file)
@@ -96,6 +96,8 @@ static int idmouse_probe(struct usb_interface *interface,
                                const struct usb_device_id *id);
 
 static void idmouse_disconnect(struct usb_interface *interface);
+static int idmouse_suspend(struct usb_interface *intf, pm_message_t message);
+static int idmouse_resume(struct usb_interface *intf);
 
 /* file operation pointers */
 static const struct file_operations idmouse_fops = {
@@ -117,7 +119,11 @@ static struct usb_driver idmouse_driver = {
        .name = DRIVER_SHORT,
        .probe = idmouse_probe,
        .disconnect = idmouse_disconnect,
+       .suspend = idmouse_suspend,
+       .resume = idmouse_resume,
+       .reset_resume = idmouse_resume,
        .id_table = idmouse_table,
+       .supports_autosuspend = 1,
 };
 
 static int idmouse_create_image(struct usb_idmouse *dev)
@@ -197,6 +203,17 @@ reset:
        return result;
 }
 
+/* PM operations are nops as this driver does IO only during open() */
+static int idmouse_suspend(struct usb_interface *intf, pm_message_t message)
+{
+       return 0;
+}
+
+static int idmouse_resume(struct usb_interface *intf)
+{
+       return 0;
+}
+
 static inline void idmouse_delete(struct usb_idmouse *dev)
 {
        kfree(dev->bulk_in_buffer);
@@ -235,9 +252,13 @@ static int idmouse_open(struct inode *inode, struct file *file)
        } else {
 
                /* create a new image and check for success */
+               result = usb_autopm_get_interface(interface);
+               if (result)
+                       goto error;
                result = idmouse_create_image (dev);
                if (result)
                        goto error;
+               usb_autopm_put_interface(interface);
 
                /* increment our usage count for the driver */
                ++dev->open;
index 90e1a8d..e75bb87 100644 (file)
@@ -727,7 +727,7 @@ static const struct file_operations iowarrior_fops = {
        .poll = iowarrior_poll,
 };
 
-static char *iowarrior_nodename(struct device *dev)
+static char *iowarrior_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
@@ -738,7 +738,7 @@ static char *iowarrior_nodename(struct device *dev)
  */
 static struct usb_class_driver iowarrior_class = {
        .name = "iowarrior%d",
-       .nodename = iowarrior_nodename,
+       .devnode = iowarrior_devnode,
        .fops = &iowarrior_fops,
        .minor_base = IOWARRIOR_MINOR_BASE,
 };
index ad4fb15..90f1301 100644 (file)
@@ -412,6 +412,9 @@ static unsigned int ld_usb_poll(struct file *file, poll_table *wait)
 
        dev = file->private_data;
 
+       if (!dev->intf)
+               return POLLERR | POLLHUP;
+
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
 
@@ -767,6 +770,9 @@ static void ld_usb_disconnect(struct usb_interface *intf)
                ld_usb_delete(dev);
        } else {
                dev->intf = NULL;
+               /* wake up pollers */
+               wake_up_interruptible_all(&dev->read_wait);
+               wake_up_interruptible_all(&dev->write_wait);
                mutex_unlock(&dev->mutex);
        }
 
index c1e2433..faa6d62 100644 (file)
@@ -266,7 +266,7 @@ static const struct file_operations tower_fops = {
        .llseek =       tower_llseek,
 };
 
-static char *legousbtower_nodename(struct device *dev)
+static char *legousbtower_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
@@ -277,7 +277,7 @@ static char *legousbtower_nodename(struct device *dev)
  */
 static struct usb_class_driver tower_class = {
        .name =         "legousbtower%d",
-       .nodename =     legousbtower_nodename,
+       .devnode =      legousbtower_devnode,
        .fops =         &tower_fops,
        .minor_base =   LEGO_USB_TOWER_MINOR_BASE,
 };
@@ -552,6 +552,9 @@ static unsigned int tower_poll (struct file *file, poll_table *wait)
 
        dev = file->private_data;
 
+       if (!dev->udev)
+               return POLLERR | POLLHUP;
+
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
 
@@ -1025,6 +1028,9 @@ static void tower_disconnect (struct usb_interface *interface)
                tower_delete (dev);
        } else {
                dev->udev = NULL;
+               /* wake up pollers */
+               wake_up_interruptible_all(&dev->read_wait);
+               wake_up_interruptible_all(&dev->write_wait);
                mutex_unlock(&dev->lock);
        }
 
index b4ec716..0025847 100644 (file)
@@ -79,14 +79,12 @@ sisusb_free_buffers(struct sisusb_usb_data *sisusb)
 
        for (i = 0; i < NUMOBUFS; i++) {
                if (sisusb->obuf[i]) {
-                       usb_buffer_free(sisusb->sisusb_dev, sisusb->obufsize,
-                               sisusb->obuf[i], sisusb->transfer_dma_out[i]);
+                       kfree(sisusb->obuf[i]);
                        sisusb->obuf[i] = NULL;
                }
        }
        if (sisusb->ibuf) {
-               usb_buffer_free(sisusb->sisusb_dev, sisusb->ibufsize,
-                       sisusb->ibuf, sisusb->transfer_dma_in);
+               kfree(sisusb->ibuf);
                sisusb->ibuf = NULL;
        }
 }
@@ -230,8 +228,7 @@ sisusb_bulk_completeout(struct urb *urb)
 
 static int
 sisusb_bulkout_msg(struct sisusb_usb_data *sisusb, int index, unsigned int pipe, void *data,
-               int len, int *actual_length, int timeout, unsigned int tflags,
-               dma_addr_t transfer_dma)
+               int len, int *actual_length, int timeout, unsigned int tflags)
 {
        struct urb *urb = sisusb->sisurbout[index];
        int retval, byteswritten = 0;
@@ -245,9 +242,6 @@ sisusb_bulkout_msg(struct sisusb_usb_data *sisusb, int index, unsigned int pipe,
        urb->transfer_flags |= tflags;
        urb->actual_length = 0;
 
-       if ((urb->transfer_dma = transfer_dma))
-               urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-
        /* Set up context */
        sisusb->urbout_context[index].actual_length = (timeout) ?
                                                NULL : actual_length;
@@ -297,8 +291,8 @@ sisusb_bulk_completein(struct urb *urb)
 }
 
 static int
-sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data, int len,
-               int *actual_length, int timeout, unsigned int tflags, dma_addr_t transfer_dma)
+sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
+       int len, int *actual_length, int timeout, unsigned int tflags)
 {
        struct urb *urb = sisusb->sisurbin;
        int retval, readbytes = 0;
@@ -311,9 +305,6 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
        urb->transfer_flags |= tflags;
        urb->actual_length = 0;
 
-       if ((urb->transfer_dma = transfer_dma))
-               urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-
        sisusb->completein = 0;
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval == 0) {
@@ -422,8 +413,7 @@ static int sisusb_send_bulk_msg(struct sisusb_usb_data *sisusb, int ep, int len,
                                                thispass,
                                                &transferred_len,
                                                async ? 0 : 5 * HZ,
-                                               tflags,
-                                               sisusb->transfer_dma_out[index]);
+                                               tflags);
 
                        if (result == -ETIMEDOUT) {
 
@@ -432,29 +422,16 @@ static int sisusb_send_bulk_msg(struct sisusb_usb_data *sisusb, int ep, int len,
                                        return -ETIME;
 
                                continue;
+                       }
 
-                       } else if ((result == 0) && !async && transferred_len) {
+                       if ((result == 0) && !async && transferred_len) {
 
                                thispass -= transferred_len;
-                               if (thispass) {
-                                       if (sisusb->transfer_dma_out) {
-                                               /* If DMA, copy remaining
-                                                * to beginning of buffer
-                                                */
-                                               memcpy(buffer,
-                                                      buffer + transferred_len,
-                                                      thispass);
-                                       } else {
-                                               /* If not DMA, simply increase
-                                                * the pointer
-                                                */
-                                               buffer += transferred_len;
-                                       }
-                               }
+                               buffer += transferred_len;
 
                        } else
                                break;
-               };
+               }
 
                if (result)
                        return result;
@@ -530,8 +507,7 @@ static int sisusb_recv_bulk_msg(struct sisusb_usb_data *sisusb, int ep, int len,
                                           thispass,
                                           &transferred_len,
                                           5 * HZ,
-                                          tflags,
-                                          sisusb->transfer_dma_in);
+                                          tflags);
 
                if (transferred_len)
                        thispass = transferred_len;
@@ -3132,8 +3108,7 @@ static int sisusb_probe(struct usb_interface *intf,
 
        /* Allocate buffers */
        sisusb->ibufsize = SISUSB_IBUF_SIZE;
-       if (!(sisusb->ibuf = usb_buffer_alloc(dev, SISUSB_IBUF_SIZE,
-                                       GFP_KERNEL, &sisusb->transfer_dma_in))) {
+       if (!(sisusb->ibuf = kmalloc(SISUSB_IBUF_SIZE, GFP_KERNEL))) {
                dev_err(&sisusb->sisusb_dev->dev, "Failed to allocate memory for input buffer");
                retval = -ENOMEM;
                goto error_2;
@@ -3142,9 +3117,7 @@ static int sisusb_probe(struct usb_interface *intf,
        sisusb->numobufs = 0;
        sisusb->obufsize = SISUSB_OBUF_SIZE;
        for (i = 0; i < NUMOBUFS; i++) {
-               if (!(sisusb->obuf[i] = usb_buffer_alloc(dev, SISUSB_OBUF_SIZE,
-                                       GFP_KERNEL,
-                                       &sisusb->transfer_dma_out[i]))) {
+               if (!(sisusb->obuf[i] = kmalloc(SISUSB_OBUF_SIZE, GFP_KERNEL))) {
                        if (i == 0) {
                                dev_err(&sisusb->sisusb_dev->dev, "Failed to allocate memory for output buffer\n");
                                retval = -ENOMEM;
index cf0b4a5..55492a5 100644 (file)
@@ -123,8 +123,6 @@ struct sisusb_usb_data {
        int numobufs;           /* number of obufs = number of out urbs */
        char *obuf[NUMOBUFS], *ibuf;    /* transfer buffers */
        int obufsize, ibufsize;
-       dma_addr_t transfer_dma_out[NUMOBUFS];
-       dma_addr_t transfer_dma_in;
        struct urb *sisurbout[NUMOBUFS];
        struct urb *sisurbin;
        unsigned char urbstatus[NUMOBUFS];
index 28a6a3a..3db2555 100644 (file)
@@ -38,6 +38,7 @@ static char *display_textmodes[] = {"raw", "hex", "ascii", NULL};
 
 struct usb_sevsegdev {
        struct usb_device *udev;
+       struct usb_interface *intf;
 
        u8 powered;
        u8 mode_msb;
@@ -46,6 +47,8 @@ struct usb_sevsegdev {
        u8 textmode;
        u8 text[MAXLEN];
        u16 textlength;
+
+       u8 shadow_power; /* for PM */
 };
 
 /* sysfs_streq can't replace this completely
@@ -65,6 +68,12 @@ static void update_display_powered(struct usb_sevsegdev *mydev)
 {
        int rc;
 
+       if (!mydev->shadow_power && mydev->powered) {
+               rc = usb_autopm_get_interface(mydev->intf);
+               if (rc < 0)
+                       return;
+       }
+
        rc = usb_control_msg(mydev->udev,
                        usb_sndctrlpipe(mydev->udev, 0),
                        0x12,
@@ -76,12 +85,18 @@ static void update_display_powered(struct usb_sevsegdev *mydev)
                        2000);
        if (rc < 0)
                dev_dbg(&mydev->udev->dev, "power retval = %d\n", rc);
+
+       if (mydev->shadow_power && !mydev->powered)
+               usb_autopm_put_interface(mydev->intf);
 }
 
 static void update_display_mode(struct usb_sevsegdev *mydev)
 {
        int rc;
 
+       if(mydev->shadow_power != 1)
+               return;
+
        rc = usb_control_msg(mydev->udev,
                        usb_sndctrlpipe(mydev->udev, 0),
                        0x12,
@@ -96,14 +111,17 @@ static void update_display_mode(struct usb_sevsegdev *mydev)
                dev_dbg(&mydev->udev->dev, "mode retval = %d\n", rc);
 }
 
-static void update_display_visual(struct usb_sevsegdev *mydev)
+static void update_display_visual(struct usb_sevsegdev *mydev, gfp_t mf)
 {
        int rc;
        int i;
        unsigned char *buffer;
        u8 decimals = 0;
 
-       buffer = kzalloc(MAXLEN, GFP_KERNEL);
+       if(mydev->shadow_power != 1)
+               return;
+
+       buffer = kzalloc(MAXLEN, mf);
        if (!buffer) {
                dev_err(&mydev->udev->dev, "out of memory\n");
                return;
@@ -163,7 +181,7 @@ static ssize_t set_attr_##name(struct device *dev,          \
        struct usb_sevsegdev *mydev = usb_get_intfdata(intf);   \
                                                                \
        mydev->name = simple_strtoul(buf, NULL, 10);            \
-       update_fcn(mydev); \
+       update_fcn(mydev);                                      \
                                                                \
        return count;                                           \
 }                                                              \
@@ -194,7 +212,7 @@ static ssize_t set_attr_text(struct device *dev,
        if (end > 0)
                memcpy(mydev->text, buf, end);
 
-       update_display_visual(mydev);
+       update_display_visual(mydev, GFP_KERNEL);
        return count;
 }
 
@@ -242,7 +260,7 @@ static ssize_t set_attr_decimals(struct device *dev,
                if (buf[i] == '1')
                        mydev->decimals[end-1-i] = 1;
 
-       update_display_visual(mydev);
+       update_display_visual(mydev, GFP_KERNEL);
 
        return count;
 }
@@ -286,7 +304,7 @@ static ssize_t set_attr_textmode(struct device *dev,
        for (i = 0; display_textmodes[i]; i++) {
                if (sysfs_streq(display_textmodes[i], buf)) {
                        mydev->textmode = i;
-                       update_display_visual(mydev);
+                       update_display_visual(mydev, GFP_KERNEL);
                        return count;
                }
        }
@@ -330,6 +348,7 @@ static int sevseg_probe(struct usb_interface *interface,
        }
 
        mydev->udev = usb_get_dev(udev);
+       mydev->intf = interface;
        usb_set_intfdata(interface, mydev);
 
        /*set defaults */
@@ -364,11 +383,49 @@ static void sevseg_disconnect(struct usb_interface *interface)
        dev_info(&interface->dev, "USB 7 Segment now disconnected\n");
 }
 
+static int sevseg_suspend(struct usb_interface *intf, pm_message_t message)
+{
+       struct usb_sevsegdev *mydev;
+
+       mydev = usb_get_intfdata(intf);
+       mydev->shadow_power = 0;
+
+       return 0;
+}
+
+static int sevseg_resume(struct usb_interface *intf)
+{
+       struct usb_sevsegdev *mydev;
+
+       mydev = usb_get_intfdata(intf);
+       mydev->shadow_power = 1;
+       update_display_mode(mydev);
+       update_display_visual(mydev, GFP_NOIO);
+
+       return 0;
+}
+
+static int sevseg_reset_resume(struct usb_interface *intf)
+{
+       struct usb_sevsegdev *mydev;
+
+       mydev = usb_get_intfdata(intf);
+       mydev->shadow_power = 1;
+       update_display_mode(mydev);
+       update_display_visual(mydev, GFP_NOIO);
+
+       return 0;
+}
+
 static struct usb_driver sevseg_driver = {
        .name =         "usbsevseg",
        .probe =        sevseg_probe,
        .disconnect =   sevseg_disconnect,
+       .suspend =      sevseg_suspend,
+       .resume =       sevseg_resume,
+       .reset_resume = sevseg_reset_resume,
        .id_table =     id_table,
+       .supports_autosuspend = 1,
 };
 
 static int __init usb_sevseg_init(void)
index f28f350..635745f 100644 (file)
@@ -5,11 +5,9 @@
 config USB_MON
        tristate "USB Monitor"
        depends on USB
-       default y if USB=y
-       default m if USB=m
        help
          If you select this option, a component which captures the USB traffic
          between peripheral-specific drivers and HC drivers will be built.
          For more information, see <file:Documentation/usb/usbmon.txt>.
 
-         If unsure, say Y (if allowed), otherwise M.
+         If unsure, say Y, if allowed, otherwise M.
index c6516b5..384b198 100644 (file)
@@ -2,6 +2,6 @@
 # Makefile for USB monitor
 #
 
-usbmon-objs    := mon_main.o mon_stat.o mon_text.o mon_bin.o mon_dma.o
+usbmon-objs    := mon_main.o mon_stat.o mon_text.o mon_bin.o
 
 obj-$(CONFIG_USB_MON)  += usbmon.o
index 0f7a30b..dfdc43e 100644 (file)
@@ -220,9 +220,8 @@ static void mon_free_buff(struct mon_pgmap *map, int npages);
 
 /*
  * This is a "chunked memcpy". It does not manipulate any counters.
- * But it returns the new offset for repeated application.
  */
-unsigned int mon_copy_to_buff(const struct mon_reader_bin *this,
+static void mon_copy_to_buff(const struct mon_reader_bin *this,
     unsigned int off, const unsigned char *from, unsigned int length)
 {
        unsigned int step_len;
@@ -247,7 +246,6 @@ unsigned int mon_copy_to_buff(const struct mon_reader_bin *this,
                from += step_len;
                length -= step_len;
        }
-       return off;
 }
 
 /*
@@ -400,15 +398,8 @@ static char mon_bin_get_data(const struct mon_reader_bin *rp,
     unsigned int offset, struct urb *urb, unsigned int length)
 {
 
-       if (urb->dev->bus->uses_dma &&
-           (urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) {
-               mon_dmapeek_vec(rp, offset, urb->transfer_dma, length);
-               return 0;
-       }
-
        if (urb->transfer_buffer == NULL)
                return 'Z';
-
        mon_copy_to_buff(rp, offset, urb->transfer_buffer, length);
        return 0;
 }
@@ -635,7 +626,6 @@ static int mon_bin_open(struct inode *inode, struct file *file)
        spin_lock_init(&rp->b_lock);
        init_waitqueue_head(&rp->b_wait);
        mutex_init(&rp->fetch_lock);
-
        rp->b_size = BUFF_DFL;
 
        size = sizeof(struct mon_pgmap) * (rp->b_size/CHUNK_SIZE);
diff --git a/drivers/usb/mon/mon_dma.c b/drivers/usb/mon/mon_dma.c
deleted file mode 100644 (file)
index 140cc80..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * The USB Monitor, inspired by Dave Harding's USBMon.
- *
- * mon_dma.c: Library which snoops on DMA areas.
- *
- * Copyright (C) 2005 Pete Zaitcev (zaitcev@redhat.com)
- */
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/highmem.h>
-#include <asm/page.h>
-
-#include <linux/usb.h> /* Only needed for declarations in usb_mon.h */
-#include "usb_mon.h"
-
-/*
- * PC-compatibles, are, fortunately, sufficiently cache-coherent for this.
- */
-#if defined(__i386__) || defined(__x86_64__) /* CONFIG_ARCH_I386 doesn't exit */
-#define MON_HAS_UNMAP 1
-
-#define phys_to_page(phys)     pfn_to_page((phys) >> PAGE_SHIFT)
-
-char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len)
-{
-       struct page *pg;
-       unsigned long flags;
-       unsigned char *map;
-       unsigned char *ptr;
-
-       /*
-        * On i386, a DMA handle is the "physical" address of a page.
-        * In other words, the bus address is equal to physical address.
-        * There is no IOMMU.
-        */
-       pg = phys_to_page(dma_addr);
-
-       /*
-        * We are called from hardware IRQs in case of callbacks.
-        * But we can be called from softirq or process context in case
-        * of submissions. In such case, we need to protect KM_IRQ0.
-        */
-       local_irq_save(flags);
-       map = kmap_atomic(pg, KM_IRQ0);
-       ptr = map + (dma_addr & (PAGE_SIZE-1));
-       memcpy(dst, ptr, len);
-       kunmap_atomic(map, KM_IRQ0);
-       local_irq_restore(flags);
-       return 0;
-}
-
-void mon_dmapeek_vec(const struct mon_reader_bin *rp,
-    unsigned int offset, dma_addr_t dma_addr, unsigned int length)
-{
-       unsigned long flags;
-       unsigned int step_len;
-       struct page *pg;
-       unsigned char *map;
-       unsigned long page_off, page_len;
-
-       local_irq_save(flags);
-       while (length) {
-               /* compute number of bytes we are going to copy in this page */
-               step_len = length;
-               page_off = dma_addr & (PAGE_SIZE-1);
-               page_len = PAGE_SIZE - page_off;
-               if (page_len < step_len)
-                       step_len = page_len;
-
-               /* copy data and advance pointers */
-               pg = phys_to_page(dma_addr);
-               map = kmap_atomic(pg, KM_IRQ0);
-               offset = mon_copy_to_buff(rp, offset, map + page_off, step_len);
-               kunmap_atomic(map, KM_IRQ0);
-               dma_addr += step_len;
-               length -= step_len;
-       }
-       local_irq_restore(flags);
-}
-
-#endif /* __i386__ */
-
-#ifndef MON_HAS_UNMAP
-char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len)
-{
-       return 'D';
-}
-
-void mon_dmapeek_vec(const struct mon_reader_bin *rp,
-    unsigned int offset, dma_addr_t dma_addr, unsigned int length)
-{
-       ;
-}
-
-#endif /* MON_HAS_UNMAP */
index 5e0ab42..e0c2db3 100644 (file)
@@ -361,7 +361,6 @@ static int __init mon_init(void)
        }
        // MOD_INC_USE_COUNT(which_module?);
 
-
        mutex_lock(&usb_bus_list_lock);
        list_for_each_entry (ubus, &usb_bus_list, bus_list) {
                mon_bus_init(ubus);
index a7eb4c9..9f1a922 100644 (file)
@@ -150,20 +150,6 @@ static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb,
                        return '>';
        }
 
-       /*
-        * The check to see if it's safe to poke at data has an enormous
-        * number of corner cases, but it seems that the following is
-        * more or less safe.
-        *
-        * We do not even try to look at transfer_buffer, because it can
-        * contain non-NULL garbage in case the upper level promised to
-        * set DMA for the HCD.
-        */
-       if (urb->dev->bus->uses_dma &&
-           (urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) {
-               return mon_dmapeek(ep->data, urb->transfer_dma, len);
-       }
-
        if (urb->transfer_buffer == NULL)
                return 'Z';     /* '0' would be not as pretty. */
 
index f5d84ff..df9a4df 100644 (file)
@@ -64,20 +64,6 @@ void mon_text_exit(void);
 int __init mon_bin_init(void);
 void mon_bin_exit(void);
 
-/*
- * DMA interface.
- *
- * XXX The vectored side needs a serious re-thinking. Abstracting vectors,
- * like in Paolo's original patch, produces a double pkmap. We need an idea.
-*/
-extern char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len);
-
-struct mon_reader_bin;
-extern void mon_dmapeek_vec(const struct mon_reader_bin *rp,
-    unsigned int offset, dma_addr_t dma_addr, unsigned int len);
-extern unsigned int mon_copy_to_buff(const struct mon_reader_bin *rp,
-    unsigned int offset, const unsigned char *from, unsigned int len);
-
 /*
  */
 extern struct mutex mon_lock;
index 1d26bed..3a61ddb 100644 (file)
@@ -1850,6 +1850,10 @@ static void musb_free(struct musb *musb)
                dma_controller_destroy(c);
        }
 
+#ifdef CONFIG_USB_MUSB_OTG
+       put_device(musb->xceiv->dev);
+#endif
+
        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
        musb_platform_exit(musb);
        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
@@ -1859,10 +1863,6 @@ static void musb_free(struct musb *musb)
                clk_put(musb->clock);
        }
 
-#ifdef CONFIG_USB_MUSB_OTG
-       put_device(musb->xceiv->dev);
-#endif
-
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
        usb_put_hcd(musb_to_hcd(musb));
 #else
index e0d56ef..77a5f41 100644 (file)
@@ -117,24 +117,7 @@ static void enable_vbus_draw(struct isp1301 *isp, unsigned mA)
                pr_debug("  VBUS %d mA error %d\n", mA, status);
 }
 
-static void enable_vbus_source(struct isp1301 *isp)
-{
-       /* this board won't supply more than 8mA vbus power.
-        * some boards can switch a 100ma "unit load" (or more).
-        */
-}
-
-
-/* products will deliver OTG messages with LEDs, GUI, etc */
-static inline void notresponding(struct isp1301 *isp)
-{
-       printk(KERN_NOTICE "OTG device not responding.\n");
-}
-
-
-#endif
-
-#if defined(CONFIG_MACH_OMAP_H4)
+#else
 
 static void enable_vbus_draw(struct isp1301 *isp, unsigned mA)
 {
@@ -144,6 +127,8 @@ static void enable_vbus_draw(struct isp1301 *isp, unsigned mA)
         */
 }
 
+#endif
+
 static void enable_vbus_source(struct isp1301 *isp)
 {
        /* this board won't supply more than 8mA vbus power.
@@ -159,8 +144,6 @@ static inline void notresponding(struct isp1301 *isp)
 }
 
 
-#endif
-
 /*-------------------------------------------------------------------------*/
 
 static struct i2c_driver isp1301_driver;
index aec6188..131e61a 100644 (file)
@@ -31,14 +31,19 @@ static int debug;
 
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x6547, 0x0232) },
+       { USB_DEVICE(0x18ec, 0x3118) },         /* USB to IrDA adapter */
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
-struct ark3116_private {
-       spinlock_t lock;
-       u8 termios_initialized;
-};
+static int is_irda(struct usb_serial *serial)
+{
+       struct usb_device *dev = serial->dev;
+       if (le16_to_cpu(dev->descriptor.idVendor) == 0x18ec &&
+                       le16_to_cpu(dev->descriptor.idProduct) == 0x3118)
+               return 1;
+       return 0;
+}
 
 static inline void ARK3116_SND(struct usb_serial *serial, int seq,
                               __u8 request, __u8 requesttype,
@@ -82,29 +87,28 @@ static inline void ARK3116_RCV_QUIET(struct usb_serial *serial,
 static int ark3116_attach(struct usb_serial *serial)
 {
        char *buf;
-       struct ark3116_private *priv;
-       int i;
-
-       for (i = 0; i < serial->num_ports; ++i) {
-               priv = kzalloc(sizeof(struct ark3116_private), GFP_KERNEL);
-               if (!priv)
-                       goto cleanup;
-               spin_lock_init(&priv->lock);
-
-               usb_set_serial_port_data(serial->port[i], priv);
-       }
 
        buf = kmalloc(1, GFP_KERNEL);
        if (!buf) {
                dbg("error kmalloc -> out of mem?");
-               goto cleanup;
+               return -ENOMEM;
        }
 
+       if (is_irda(serial))
+               dbg("IrDA mode");
+
        /* 3 */
        ARK3116_SND(serial, 3, 0xFE, 0x40, 0x0008, 0x0002);
        ARK3116_SND(serial, 4, 0xFE, 0x40, 0x0008, 0x0001);
        ARK3116_SND(serial, 5, 0xFE, 0x40, 0x0000, 0x0008);
-       ARK3116_SND(serial, 6, 0xFE, 0x40, 0x0000, 0x000B);
+       ARK3116_SND(serial, 6, 0xFE, 0x40, is_irda(serial) ? 0x0001 : 0x0000,
+                   0x000B);
+
+       if (is_irda(serial)) {
+               ARK3116_SND(serial, 1001, 0xFE, 0x40, 0x0000, 0x000C);
+               ARK3116_SND(serial, 1002, 0xFE, 0x40, 0x0041, 0x000D);
+               ARK3116_SND(serial, 1003, 0xFE, 0x40, 0x0001, 0x000A);
+       }
 
        /* <-- seq7 */
        ARK3116_RCV(serial,  7, 0xFE, 0xC0, 0x0000, 0x0003, 0x00, buf);
@@ -141,6 +145,8 @@ static int ark3116_attach(struct usb_serial *serial)
        ARK3116_SND(serial, 147, 0xFE, 0x40, 0x0083, 0x0003);
        ARK3116_SND(serial, 148, 0xFE, 0x40, 0x0038, 0x0000);
        ARK3116_SND(serial, 149, 0xFE, 0x40, 0x0001, 0x0001);
+       if (is_irda(serial))
+               ARK3116_SND(serial, 1004, 0xFE, 0x40, 0x0000, 0x0009);
        ARK3116_SND(serial, 150, 0xFE, 0x40, 0x0003, 0x0003);
        ARK3116_RCV(serial, 151, 0xFE, 0xC0, 0x0000, 0x0004, 0x03, buf);
        ARK3116_SND(serial, 152, 0xFE, 0x40, 0x0000, 0x0003);
@@ -149,13 +155,16 @@ static int ark3116_attach(struct usb_serial *serial)
 
        kfree(buf);
        return 0;
+}
 
-cleanup:
-       for (--i; i >= 0; --i) {
-               kfree(usb_get_serial_port_data(serial->port[i]));
-               usb_set_serial_port_data(serial->port[i], NULL);
-       }
-       return -ENOMEM;
+static void ark3116_init_termios(struct tty_struct *tty)
+{
+       struct ktermios *termios = tty->termios;
+       *termios = tty_std_termios;
+       termios->c_cflag = B9600 | CS8
+                                     | CREAD | HUPCL | CLOCAL;
+       termios->c_ispeed = 9600;
+       termios->c_ospeed = 9600;
 }
 
 static void ark3116_set_termios(struct tty_struct *tty,
@@ -163,10 +172,8 @@ static void ark3116_set_termios(struct tty_struct *tty,
                                struct ktermios *old_termios)
 {
        struct usb_serial *serial = port->serial;
-       struct ark3116_private *priv = usb_get_serial_port_data(port);
        struct ktermios *termios = tty->termios;
        unsigned int cflag = termios->c_cflag;
-       unsigned long flags;
        int baud;
        int ark3116_baud;
        char *buf;
@@ -176,16 +183,6 @@ static void ark3116_set_termios(struct tty_struct *tty,
 
        dbg("%s - port %d", __func__, port->number);
 
-       spin_lock_irqsave(&priv->lock, flags);
-       if (!priv->termios_initialized) {
-               *termios = tty_std_termios;
-               termios->c_cflag = B9600 | CS8
-                                             | CREAD | HUPCL | CLOCAL;
-               termios->c_ispeed = 9600;
-               termios->c_ospeed = 9600;
-               priv->termios_initialized = 1;
-       }
-       spin_unlock_irqrestore(&priv->lock, flags);
 
        cflag = termios->c_cflag;
        termios->c_cflag &= ~(CMSPAR|CRTSCTS);
@@ -318,8 +315,7 @@ static void ark3116_set_termios(struct tty_struct *tty,
        return;
 }
 
-static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                       struct file *filp)
+static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct ktermios tmp_termios;
        struct usb_serial *serial = port->serial;
@@ -334,7 +330,7 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port,
                return -ENOMEM;
        }
 
-       result = usb_serial_generic_open(tty, port, filp);
+       result = usb_serial_generic_open(tty, port);
        if (result)
                goto err_out;
 
@@ -455,6 +451,7 @@ static struct usb_serial_driver ark3116_device = {
        .num_ports =            1,
        .attach =               ark3116_attach,
        .set_termios =          ark3116_set_termios,
+       .init_termios =         ark3116_init_termios,
        .ioctl =                ark3116_ioctl,
        .tiocmget =             ark3116_tiocmget,
        .open =                 ark3116_open,
index 7033b03..a0467bc 100644 (file)
@@ -92,7 +92,7 @@ static int debug;
 static int  belkin_sa_startup(struct usb_serial *serial);
 static void belkin_sa_release(struct usb_serial *serial);
 static int  belkin_sa_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+                       struct usb_serial_port *port);
 static void belkin_sa_close(struct usb_serial_port *port);
 static void belkin_sa_read_int_callback(struct urb *urb);
 static void belkin_sa_set_termios(struct tty_struct *tty,
@@ -213,7 +213,7 @@ static void belkin_sa_release(struct usb_serial *serial)
 
 
 static int  belkin_sa_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+                                       struct usb_serial_port *port)
 {
        int retval = 0;
 
index 2830766..59eff72 100644 (file)
 #define CH341_BAUDBASE_FACTOR 1532620800
 #define CH341_BAUDBASE_DIVMAX 3
 
+/* Break support - the information used to implement this was gleaned from
+ * the Net/FreeBSD uchcom.c driver by Takanori Watanabe.  Domo arigato.
+ */
+
+#define CH341_REQ_WRITE_REG    0x9A
+#define CH341_REQ_READ_REG     0x95
+#define CH341_REG_BREAK1       0x05
+#define CH341_REG_BREAK2       0x18
+#define CH341_NBREAK_BITS_REG1 0x01
+#define CH341_NBREAK_BITS_REG2 0x40
+
+
 static int debug;
 
 static struct usb_device_id id_table [] = {
@@ -300,8 +312,7 @@ static void ch341_close(struct usb_serial_port *port)
 
 
 /* open this device, set default parameters */
-static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port,
-                               struct file *filp)
+static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]);
@@ -333,7 +344,7 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port,
                return -EPROTO;
        }
 
-       r = usb_serial_generic_open(tty, port, filp);
+       r = usb_serial_generic_open(tty, port);
 
 out:   return r;
 }
@@ -374,6 +385,45 @@ static void ch341_set_termios(struct tty_struct *tty,
         */
 }
 
+static void ch341_break_ctl(struct tty_struct *tty, int break_state)
+{
+       const uint16_t ch341_break_reg =
+               CH341_REG_BREAK1 | ((uint16_t) CH341_REG_BREAK2 << 8);
+       struct usb_serial_port *port = tty->driver_data;
+       int r;
+       uint16_t reg_contents;
+       uint8_t break_reg[2];
+
+       dbg("%s()", __func__);
+
+       r = ch341_control_in(port->serial->dev, CH341_REQ_READ_REG,
+                       ch341_break_reg, 0, break_reg, sizeof(break_reg));
+       if (r < 0) {
+               printk(KERN_WARNING "%s: USB control read error whilst getting"
+                               " break register contents.\n", __FILE__);
+               return;
+       }
+       dbg("%s - initial ch341 break register contents - reg1: %x, reg2: %x",
+                       __func__, break_reg[0], break_reg[1]);
+       if (break_state != 0) {
+               dbg("%s - Enter break state requested", __func__);
+               break_reg[0] &= ~CH341_NBREAK_BITS_REG1;
+               break_reg[1] &= ~CH341_NBREAK_BITS_REG2;
+       } else {
+               dbg("%s - Leave break state requested", __func__);
+               break_reg[0] |= CH341_NBREAK_BITS_REG1;
+               break_reg[1] |= CH341_NBREAK_BITS_REG2;
+       }
+       dbg("%s - New ch341 break register contents - reg1: %x, reg2: %x",
+                       __func__, break_reg[0], break_reg[1]);
+       reg_contents = (uint16_t)break_reg[0] | ((uint16_t)break_reg[1] << 8);
+       r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG,
+                       ch341_break_reg, reg_contents);
+       if (r < 0)
+               printk(KERN_WARNING "%s: USB control write error whilst setting"
+                               " break register contents.\n", __FILE__);
+}
+
 static int ch341_tiocmset(struct tty_struct *tty, struct file *file,
                          unsigned int set, unsigned int clear)
 {
@@ -577,6 +627,7 @@ static struct usb_serial_driver ch341_device = {
        .close             = ch341_close,
        .ioctl             = ch341_ioctl,
        .set_termios       = ch341_set_termios,
+       .break_ctl         = ch341_break_ctl,
        .tiocmget          = ch341_tiocmget,
        .tiocmset          = ch341_tiocmset,
        .read_int_callback = ch341_read_int_callback,
index 0e4f2e4..b22ac32 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/console.h>
+#include <linux/serial.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
@@ -63,7 +64,7 @@ static int usb_console_setup(struct console *co, char *options)
        char *s;
        struct usb_serial *serial;
        struct usb_serial_port *port;
-       int retval = 0;
+       int retval;
        struct tty_struct *tty = NULL;
        struct ktermios *termios = NULL, dummy;
 
@@ -116,13 +117,17 @@ static int usb_console_setup(struct console *co, char *options)
                return -ENODEV;
        }
 
-       port = serial->port[0];
+       retval = usb_autopm_get_interface(serial->interface);
+       if (retval)
+               goto error_get_interface;
+
+       port = serial->port[co->index - serial->minor];
        tty_port_tty_set(&port->port, NULL);
 
        info->port = port;
 
        ++port->port.count;
-       if (port->port.count == 1) {
+       if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
                if (serial->type->set_termios) {
                        /*
                         * allocate a fake tty so the driver can initialize
@@ -150,9 +155,9 @@ static int usb_console_setup(struct console *co, char *options)
                /* only call the device specific open if this
                 * is the first time the port is opened */
                if (serial->type->open)
-                       retval = serial->type->open(NULL, port, NULL);
+                       retval = serial->type->open(NULL, port);
                else
-                       retval = usb_serial_generic_open(NULL, port, NULL);
+                       retval = usb_serial_generic_open(NULL, port);
 
                if (retval) {
                        err("could not open USB console port");
@@ -168,6 +173,7 @@ static int usb_console_setup(struct console *co, char *options)
                        kfree(termios);
                        kfree(tty);
                }
+               set_bit(ASYNCB_INITIALIZED, &port->port.flags);
        }
        /* Now that any required fake tty operations are completed restore
         * the tty port count */
@@ -175,18 +181,22 @@ static int usb_console_setup(struct console *co, char *options)
        /* The console is special in terms of closing the device so
         * indicate this port is now acting as a system console. */
        port->console = 1;
-       retval = 0;
 
-out:
+       mutex_unlock(&serial->disc_mutex);
        return retval;
-free_termios:
+
+ free_termios:
        kfree(termios);
        tty_port_tty_set(&port->port, NULL);
-free_tty:
+ free_tty:
        kfree(tty);
-reset_open_count:
+ reset_open_count:
        port->port.count = 0;
-       goto out;
+       usb_autopm_put_interface(serial->interface);
+ error_get_interface:
+       usb_serial_put(serial);
+       mutex_unlock(&serial->disc_mutex);
+       return retval;
 }
 
 static void usb_console_write(struct console *co,
index 985cbcf..4a208fe 100644 (file)
@@ -33,8 +33,7 @@
 /*
  * Function Prototypes
  */
-static int cp210x_open(struct tty_struct *, struct usb_serial_port *,
-                                                       struct file *);
+static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *);
 static void cp210x_cleanup(struct usb_serial_port *);
 static void cp210x_close(struct usb_serial_port *);
 static void cp210x_get_termios(struct tty_struct *,
@@ -368,8 +367,7 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
        return baud;
 }
 
-static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port,
-                               struct file *filp)
+static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        int result;
@@ -399,12 +397,6 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port,
 
        /* Configure the termios structure */
        cp210x_get_termios(tty, port);
-
-       /* Set the DTR and RTS pins low */
-       cp210x_tiocmset_port(tty ? (struct usb_serial_port *) tty->driver_data
-                       : port,
-               NULL, TIOCM_DTR | TIOCM_RTS, 0);
-
        return 0;
 }
 
index 336523f..b0f6402 100644 (file)
@@ -61,7 +61,7 @@ static int cyberjack_startup(struct usb_serial *serial);
 static void cyberjack_disconnect(struct usb_serial *serial);
 static void cyberjack_release(struct usb_serial *serial);
 static int  cyberjack_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+       struct usb_serial_port *port);
 static void cyberjack_close(struct usb_serial_port *port);
 static int cyberjack_write(struct tty_struct *tty,
        struct usb_serial_port *port, const unsigned char *buf, int count);
@@ -173,7 +173,7 @@ static void cyberjack_release(struct usb_serial *serial)
 }
 
 static int  cyberjack_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+                                       struct usb_serial_port *port)
 {
        struct cyberjack_private *priv;
        unsigned long flags;
index 59adfe1..e0a8b71 100644 (file)
@@ -172,8 +172,7 @@ static int  cypress_earthmate_startup(struct usb_serial *serial);
 static int  cypress_hidcom_startup(struct usb_serial *serial);
 static int  cypress_ca42v2_startup(struct usb_serial *serial);
 static void cypress_release(struct usb_serial *serial);
-static int  cypress_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int  cypress_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void cypress_close(struct usb_serial_port *port);
 static void cypress_dtr_rts(struct usb_serial_port *port, int on);
 static int  cypress_write(struct tty_struct *tty, struct usb_serial_port *port,
@@ -633,8 +632,7 @@ static void cypress_release(struct usb_serial *serial)
 }
 
 
-static int cypress_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct cypress_private *priv = usb_get_serial_port_data(port);
        struct usb_serial *serial = port->serial;
@@ -659,15 +657,7 @@ static int cypress_open(struct tty_struct *tty,
        spin_unlock_irqrestore(&priv->lock, flags);
 
        /* Set termios */
-       result = cypress_write(tty, port, NULL, 0);
-
-       if (result) {
-               dev_err(&port->dev,
-                       "%s - failed setting the control lines - error %d\n",
-                                                       __func__, result);
-               return result;
-       } else
-               dbg("%s - success setting the control lines", __func__);
+       cypress_send(port);
 
        if (tty)
                cypress_set_termios(tty, port, &priv->tmp_termios);
@@ -1005,6 +995,8 @@ static void cypress_set_termios(struct tty_struct *tty,
        dbg("%s - port %d", __func__, port->number);
 
        spin_lock_irqsave(&priv->lock, flags);
+       /* We can't clean this one up as we don't know the device type
+          early enough */
        if (!priv->termios_initialized) {
                if (priv->chiptype == CT_EARTHMATE) {
                        *(tty->termios) = tty_std_termios;
index e772b01..1fd360e 100644 (file)
@@ -57,7 +57,7 @@
 #define        UART_RI         0x10    /* ring indicator - modem - device to host */
 #define UART_CD                0x40    /* carrier detect - modem - device to host */
 #define CYP_ERROR      0x08    /* received from input report - device to host */
-/* Note - the below has nothing to to with the "feature report" reset */
+/* Note - the below has nothing to do with the "feature report" reset */
 #define CONTROL_RESET  0x08    /* sent with output report - host to device */
 
 /* End of RS-232 protocol definitions */
index f480809..ab3dd99 100644 (file)
@@ -453,8 +453,7 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
 static void digi_write_bulk_callback(struct urb *urb);
 static int digi_write_room(struct tty_struct *tty);
 static int digi_chars_in_buffer(struct tty_struct *tty);
-static int digi_open(struct tty_struct *tty, struct usb_serial_port *port,
-       struct file *filp);
+static int digi_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void digi_close(struct usb_serial_port *port);
 static int digi_carrier_raised(struct usb_serial_port *port);
 static void digi_dtr_rts(struct usb_serial_port *port, int on);
@@ -1347,8 +1346,7 @@ static int digi_carrier_raised(struct usb_serial_port *port)
        return 0;
 }
 
-static int digi_open(struct tty_struct *tty, struct usb_serial_port *port,
-                               struct file *filp)
+static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        int ret;
        unsigned char buf[32];
index 80cb347..33c9e9c 100644 (file)
@@ -79,8 +79,7 @@ static int debug;
 #define EMPEG_PRODUCT_ID               0x0001
 
 /* function prototypes for an empeg-car player */
-static int  empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                               struct file *filp);
+static int  empeg_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void empeg_close(struct usb_serial_port *port);
 static int  empeg_write(struct tty_struct *tty, struct usb_serial_port *port,
                                                const unsigned char *buf,
@@ -90,8 +89,7 @@ static int  empeg_chars_in_buffer(struct tty_struct *tty);
 static void empeg_throttle(struct tty_struct *tty);
 static void empeg_unthrottle(struct tty_struct *tty);
 static int  empeg_startup(struct usb_serial *serial);
-static void empeg_set_termios(struct tty_struct *tty,
-               struct usb_serial_port *port, struct ktermios *old_termios);
+static void empeg_init_termios(struct tty_struct *tty);
 static void empeg_write_bulk_callback(struct urb *urb);
 static void empeg_read_bulk_callback(struct urb *urb);
 
@@ -123,7 +121,7 @@ static struct usb_serial_driver empeg_device = {
        .throttle =             empeg_throttle,
        .unthrottle =           empeg_unthrottle,
        .attach =               empeg_startup,
-       .set_termios =          empeg_set_termios,
+       .init_termios =         empeg_init_termios,
        .write =                empeg_write,
        .write_room =           empeg_write_room,
        .chars_in_buffer =      empeg_chars_in_buffer,
@@ -142,17 +140,13 @@ static int                bytes_out;
 /******************************************************************************
  * Empeg specific driver functions
  ******************************************************************************/
-static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
-                               struct file *filp)
+static int empeg_open(struct tty_struct *tty,struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        int result = 0;
 
        dbg("%s - port %d", __func__, port->number);
 
-       /* Force default termio settings */
-       empeg_set_termios(tty, port, NULL) ;
-
        bytes_in = 0;
        bytes_out = 0;
 
@@ -425,11 +419,9 @@ static int  empeg_startup(struct usb_serial *serial)
 }
 
 
-static void empeg_set_termios(struct tty_struct *tty,
-               struct usb_serial_port *port, struct ktermios *old_termios)
+static void empeg_init_termios(struct tty_struct *tty)
 {
        struct ktermios *termios = tty->termios;
-       dbg("%s - port %d", __func__, port->number);
 
        /*
         * The empeg-car player wants these particular tty settings.
index 8fec5d4..4f883b1 100644 (file)
@@ -176,6 +176,9 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_SNIFFER_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) },
        { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
        { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
@@ -694,6 +697,8 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(DE_VID, WHT_PID) },
        { USB_DEVICE(ADI_VID, ADI_GNICE_PID),
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+       { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
+               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
        { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
        { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
@@ -702,6 +707,8 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
        { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+       { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
+       { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
        { },                                    /* Optional parameter entry */
        { }                                     /* Terminating entry */
 };
@@ -747,8 +754,7 @@ static int  ftdi_sio_probe(struct usb_serial *serial,
                                        const struct usb_device_id *id);
 static int  ftdi_sio_port_probe(struct usb_serial_port *port);
 static int  ftdi_sio_port_remove(struct usb_serial_port *port);
-static int  ftdi_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int  ftdi_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void ftdi_close(struct usb_serial_port *port);
 static void ftdi_dtr_rts(struct usb_serial_port *port, int on);
 static int  ftdi_write(struct tty_struct *tty, struct usb_serial_port *port,
@@ -1680,8 +1686,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
        return 0;
 }
 
-static int ftdi_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
 { /* ftdi_open */
        struct usb_device *dev = port->serial->dev;
        struct ftdi_private *priv = usb_get_serial_port_data(port);
index 8c92b88..6f31e0d 100644 (file)
@@ -81,6 +81,9 @@
 
 /* OpenDCC (www.opendcc.de) product id */
 #define FTDI_OPENDCC_PID       0xBFD8
+#define FTDI_OPENDCC_SNIFFER_PID       0xBFD9
+#define FTDI_OPENDCC_THROTTLE_PID      0xBFDA
+#define FTDI_OPENDCC_GATEWAY_PID       0xBFDB
 
 /* Sprog II (Andrew Crosland's SprogII DCC interface) */
 #define FTDI_SPROG_II          0xF0C8
  */
 #define ADI_VID                0x0456
 #define ADI_GNICE_PID          0xF000
+#define ADI_GNICEPLUS_PID      0xF001
 
 /*
  * JETI SPECTROMETER SPECBOS 1201
  */
 #define MARVELL_OPENRD_PID     0x9e90
 
+/*
+ * Hameg HO820 and HO870 interface (using VID 0x0403)
+ */
+#define        HAMEG_HO820_PID         0xed74
+#define        HAMEG_HO870_PID         0xed71
+
 /*
  *   BmRequestType:  1100 0000b
  *   bRequest:       FTDI_E2_READ
index 8839f1c..20432d3 100644 (file)
@@ -933,8 +933,7 @@ static int garmin_init_session(struct usb_serial_port *port)
 
 
 
-static int garmin_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        unsigned long flags;
        int status = 0;
index ce57f6a..deba08c 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/uaccess.h>
-
+#include <linux/kfifo.h>
 
 static int debug;
 
@@ -114,8 +114,7 @@ void usb_serial_generic_deregister(void)
 #endif
 }
 
-int usb_serial_generic_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+int usb_serial_generic_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        int result = 0;
@@ -167,24 +166,6 @@ static void generic_cleanup(struct usb_serial_port *port)
        }
 }
 
-int usb_serial_generic_resume(struct usb_serial *serial)
-{
-       struct usb_serial_port *port;
-       int i, c = 0, r;
-
-       for (i = 0; i < serial->num_ports; i++) {
-               port = serial->port[i];
-               if (port->port.count && port->read_urb) {
-                       r = usb_submit_urb(port->read_urb, GFP_NOIO);
-                       if (r < 0)
-                               c++;
-               }
-       }
-
-       return c ? -EIO : 0;
-}
-EXPORT_SYMBOL_GPL(usb_serial_generic_resume);
-
 void usb_serial_generic_close(struct usb_serial_port *port)
 {
        dbg("%s - port %d", __func__, port->number);
@@ -273,12 +254,81 @@ error_no_buffer:
        return bwrite;
 }
 
+/**
+ * usb_serial_generic_write_start - kick off an URB write
+ * @port:      Pointer to the &struct usb_serial_port data
+ *
+ * Returns the number of bytes queued on success. This will be zero if there
+ * was nothing to send. Otherwise, it returns a negative errno value
+ */
+static int usb_serial_generic_write_start(struct usb_serial_port *port)
+{
+       struct usb_serial *serial = port->serial;
+       unsigned char *data;
+       int result;
+       int count;
+       unsigned long flags;
+       bool start_io;
+
+       /* Atomically determine whether we can and need to start a USB
+        * operation. */
+       spin_lock_irqsave(&port->lock, flags);
+       if (port->write_urb_busy)
+               start_io = false;
+       else {
+               start_io = (__kfifo_len(port->write_fifo) != 0);
+               port->write_urb_busy = start_io;
+       }
+       spin_unlock_irqrestore(&port->lock, flags);
+
+       if (!start_io)
+               return 0;
+
+       data = port->write_urb->transfer_buffer;
+       count = kfifo_get(port->write_fifo, data, port->bulk_out_size);
+       usb_serial_debug_data(debug, &port->dev, __func__, count, data);
+
+       /* set up our urb */
+       usb_fill_bulk_urb(port->write_urb, serial->dev,
+                          usb_sndbulkpipe(serial->dev,
+                               port->bulk_out_endpointAddress),
+                          port->write_urb->transfer_buffer, count,
+                          ((serial->type->write_bulk_callback) ?
+                            serial->type->write_bulk_callback :
+                            usb_serial_generic_write_bulk_callback),
+                          port);
+
+       /* send the data out the bulk port */
+       result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
+       if (result) {
+               dev_err(&port->dev,
+                       "%s - failed submitting write urb, error %d\n",
+                                               __func__, result);
+               /* don't have to grab the lock here, as we will
+                  retry if != 0 */
+               port->write_urb_busy = 0;
+       } else
+               result = count;
+
+       return result;
+}
+
+/**
+ * usb_serial_generic_write - generic write function for serial USB devices
+ * @tty:       Pointer to &struct tty_struct for the device
+ * @port:      Pointer to the &usb_serial_port structure for the device
+ * @buf:       Pointer to the data to write
+ * @count:     Number of bytes to write
+ *
+ * Returns the number of characters actually written, which may be anything
+ * from zero to @count. If an error occurs, it returns the negative errno
+ * value.
+ */
 int usb_serial_generic_write(struct tty_struct *tty,
        struct usb_serial_port *port, const unsigned char *buf, int count)
 {
        struct usb_serial *serial = port->serial;
        int result;
-       unsigned char *data;
 
        dbg("%s - port %d", __func__, port->number);
 
@@ -288,57 +338,20 @@ int usb_serial_generic_write(struct tty_struct *tty,
        }
 
        /* only do something if we have a bulk out endpoint */
-       if (serial->num_bulk_out) {
-               unsigned long flags;
-
-               if (serial->type->max_in_flight_urbs)
-                       return usb_serial_multi_urb_write(tty, port,
-                                                         buf, count);
-
-               spin_lock_irqsave(&port->lock, flags);
-               if (port->write_urb_busy) {
-                       spin_unlock_irqrestore(&port->lock, flags);
-                       dbg("%s - already writing", __func__);
-                       return 0;
-               }
-               port->write_urb_busy = 1;
-               spin_unlock_irqrestore(&port->lock, flags);
-
-               count = (count > port->bulk_out_size) ?
-                                       port->bulk_out_size : count;
-
-               memcpy(port->write_urb->transfer_buffer, buf, count);
-               data = port->write_urb->transfer_buffer;
-               usb_serial_debug_data(debug, &port->dev, __func__, count, data);
+       if (!serial->num_bulk_out)
+               return 0;
 
-               /* set up our urb */
-               usb_fill_bulk_urb(port->write_urb, serial->dev,
-                                  usb_sndbulkpipe(serial->dev,
-                                       port->bulk_out_endpointAddress),
-                                  port->write_urb->transfer_buffer, count,
-                                  ((serial->type->write_bulk_callback) ?
-                                    serial->type->write_bulk_callback :
-                                    usb_serial_generic_write_bulk_callback),
-                                  port);
+       if (serial->type->max_in_flight_urbs)
+               return usb_serial_multi_urb_write(tty, port,
+                                                 buf, count);
 
-               /* send the data out the bulk port */
-               port->write_urb_busy = 1;
-               result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
-               if (result) {
-                       dev_err(&port->dev,
-                               "%s - failed submitting write urb, error %d\n",
-                                                       __func__, result);
-                       /* don't have to grab the lock here, as we will
-                          retry if != 0 */
-                       port->write_urb_busy = 0;
-               } else
-                       result = count;
+       count = kfifo_put(port->write_fifo, buf, count);
+       result = usb_serial_generic_write_start(port);
 
-               return result;
-       }
+       if (result >= 0)
+               result = count;
 
-       /* no bulk out, so return 0 bytes written */
-       return 0;
+       return result;
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_write);
 
@@ -356,9 +369,8 @@ int usb_serial_generic_write_room(struct tty_struct *tty)
                        room = port->bulk_out_size *
                                (serial->type->max_in_flight_urbs -
                                 port->urbs_in_flight);
-       } else if (serial->num_bulk_out && !(port->write_urb_busy)) {
-               room = port->bulk_out_size;
-       }
+       } else if (serial->num_bulk_out)
+               room = port->write_fifo->size - __kfifo_len(port->write_fifo);
        spin_unlock_irqrestore(&port->lock, flags);
 
        dbg("%s - returns %d", __func__, room);
@@ -378,11 +390,8 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)
                spin_lock_irqsave(&port->lock, flags);
                chars = port->tx_bytes_flight;
                spin_unlock_irqrestore(&port->lock, flags);
-       } else if (serial->num_bulk_out) {
-               /* FIXME: Locking */
-               if (port->write_urb_busy)
-                       chars = port->write_urb->transfer_buffer_length;
-       }
+       } else if (serial->num_bulk_out)
+               chars = kfifo_len(port->write_fifo);
 
        dbg("%s - returns %d", __func__, chars);
        return chars;
@@ -486,16 +495,23 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb)
                if (port->urbs_in_flight < 0)
                        port->urbs_in_flight = 0;
                spin_unlock_irqrestore(&port->lock, flags);
+
+               if (status) {
+                       dbg("%s - nonzero multi-urb write bulk status "
+                               "received: %d", __func__, status);
+                       return;
+               }
        } else {
-               /* Handle the case for single urb mode */
                port->write_urb_busy = 0;
-       }
 
-       if (status) {
-               dbg("%s - nonzero write bulk status received: %d",
-                   __func__, status);
-               return;
+               if (status) {
+                       dbg("%s - nonzero multi-urb write bulk status "
+                               "received: %d", __func__, status);
+                       kfifo_reset(port->write_fifo);
+               } else
+                       usb_serial_generic_write_start(port);
        }
+
        usb_serial_port_softint(port);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
@@ -560,6 +576,33 @@ int usb_serial_handle_break(struct usb_serial_port *port)
 }
 EXPORT_SYMBOL_GPL(usb_serial_handle_break);
 
+int usb_serial_generic_resume(struct usb_serial *serial)
+{
+       struct usb_serial_port *port;
+       int i, c = 0, r;
+
+       for (i = 0; i < serial->num_ports; i++) {
+               port = serial->port[i];
+               if (!port->port.count)
+                       continue;
+
+               if (port->read_urb) {
+                       r = usb_submit_urb(port->read_urb, GFP_NOIO);
+                       if (r < 0)
+                               c++;
+               }
+
+               if (port->write_urb) {
+                       r = usb_serial_generic_write_start(port);
+                       if (r < 0)
+                               c++;
+               }
+       }
+
+       return c ? -EIO : 0;
+}
+EXPORT_SYMBOL_GPL(usb_serial_generic_resume);
+
 void usb_serial_generic_disconnect(struct usb_serial *serial)
 {
        int i;
index 0191693..b97960a 100644 (file)
@@ -205,8 +205,7 @@ static void edge_bulk_out_data_callback(struct urb *urb);
 static void edge_bulk_out_cmd_callback(struct urb *urb);
 
 /* function prototypes for the usbserial callbacks */
-static int edge_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                       struct file *filp);
+static int edge_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void edge_close(struct usb_serial_port *port);
 static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
                                        const unsigned char *buf, int count);
@@ -852,8 +851,7 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)
  *     If successful, we return 0
  *     Otherwise we return a negative error number.
  *****************************************************************************/
-static int edge_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
        struct usb_serial *serial;
@@ -2542,7 +2540,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor)
 
 /*****************************************************************************
  * send_cmd_write_uart_register
- *  this function builds up a uart register message and sends to to the device.
+ *  this function builds up a uart register message and sends to the device.
  *****************************************************************************/
 static int send_cmd_write_uart_register(struct edgeport_port *edge_port,
                                                __u8 regNum, __u8 regValue)
index e8bc42f..d4cc0f7 100644 (file)
@@ -1831,8 +1831,7 @@ static void edge_bulk_out_callback(struct urb *urb)
        tty_kref_put(tty);
 }
 
-static int edge_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
        struct edgeport_serial *edge_serial;
index 2545d45..24fcc64 100644 (file)
@@ -75,7 +75,7 @@ static int initial_wait;
 
 /* Function prototypes for an ipaq */
 static int  ipaq_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+                       struct usb_serial_port *port);
 static void ipaq_close(struct usb_serial_port *port);
 static int  ipaq_calc_num_ports(struct usb_serial *serial);
 static int  ipaq_startup(struct usb_serial *serial);
@@ -587,7 +587,7 @@ static int          bytes_in;
 static int             bytes_out;
 
 static int ipaq_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+                       struct usb_serial_port *port)
 {
        struct usb_serial       *serial = port->serial;
        struct ipaq_private     *priv;
@@ -628,11 +628,6 @@ static int ipaq_open(struct tty_struct *tty,
                priv->free_len += PACKET_SIZE;
        }
 
-       if (tty) {
-               /* FIXME: These two are bogus */
-               tty->raw = 1;
-               tty->real_raw = 1;
-       }
        /*
         * Lose the small buffers usbserial provides. Make larger ones.
         */
index 29ad038..727d323 100644 (file)
@@ -193,8 +193,7 @@ static void ipw_read_bulk_callback(struct urb *urb)
        return;
 }
 
-static int ipw_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_device *dev = port->serial->dev;
        u8 buf_flow_static[16] = IPW_BYTES_FLOWINIT;
index 66009b6..95d8d26 100644 (file)
@@ -86,8 +86,7 @@ static int buffer_size;
 static int xbof = -1;
 
 static int  ir_startup (struct usb_serial *serial);
-static int  ir_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                       struct file *filep);
+static int  ir_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void ir_close(struct usb_serial_port *port);
 static int  ir_write(struct tty_struct *tty, struct usb_serial_port *port,
                                        const unsigned char *buf, int count);
@@ -296,8 +295,7 @@ static int ir_startup(struct usb_serial *serial)
        return 0;
 }
 
-static int ir_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        char *buffer;
        int result = 0;
index 96873a7..e6e02b1 100644 (file)
@@ -40,7 +40,7 @@ static int debug;
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.10"
+#define DRIVER_VERSION "v0.11"
 #define DRIVER_DESC "Infinity USB Unlimited Phoenix driver"
 
 static struct usb_device_id id_table[] = {
@@ -64,6 +64,7 @@ static int cdmode = 1;
 static int iuu_cardin;
 static int iuu_cardout;
 static int xmas;
+static int vcc_default = 5;
 
 static void read_rxcmd_callback(struct urb *urb);
 
@@ -71,7 +72,6 @@ struct iuu_private {
        spinlock_t lock;        /* store irq state */
        wait_queue_head_t delta_msr_wait;
        u8 line_status;
-       u8 termios_initialized;
        int tiostatus;          /* store IUART SIGNAL for tiocmget call */
        u8 reset;               /* if 1 reset is needed */
        int poll;               /* number of poll */
@@ -80,6 +80,7 @@ struct iuu_private {
        u8 *buf;                /* used for initialize speed */
        u8 *dbgbuf;             /* debug buffer */
        u8 len;
+       int vcc;                /* vcc (either 3 or 5 V) */
 };
 
 
@@ -115,6 +116,7 @@ static int iuu_startup(struct usb_serial *serial)
                kfree(priv);
                return -ENOMEM;
        }
+       priv->vcc = vcc_default;
        spin_lock_init(&priv->lock);
        init_waitqueue_head(&priv->delta_msr_wait);
        usb_set_serial_port_data(serial->port[0], priv);
@@ -1010,22 +1012,28 @@ static void iuu_close(struct usb_serial_port *port)
                usb_kill_urb(port->write_urb);
                usb_kill_urb(port->read_urb);
                usb_kill_urb(port->interrupt_in_urb);
-               msleep(1000);
-               /* wait one second to free all buffers */
                iuu_led(port, 0, 0, 0xF000, 0xFF);
-               msleep(1000);
-               usb_reset_device(port->serial->dev);
        }
 }
 
-static int iuu_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static void iuu_init_termios(struct tty_struct *tty)
+{
+       *(tty->termios) = tty_std_termios;
+       tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
+                               | TIOCM_CTS | CSTOPB | PARENB;
+       tty->termios->c_ispeed = 9600;
+       tty->termios->c_ospeed = 9600;
+       tty->termios->c_lflag = 0;
+       tty->termios->c_oflag = 0;
+       tty->termios->c_iflag = 0;
+}
+
+static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        u8 *buf;
        int result;
        u32 actual;
-       unsigned long flags;
        struct iuu_private *priv = usb_get_serial_port_data(port);
 
        dbg("%s -  port %d", __func__, port->number);
@@ -1064,21 +1072,7 @@ static int iuu_open(struct tty_struct *tty,
                          port->bulk_in_buffer, 512,
                          NULL, NULL);
 
-       /* set the termios structure */
-       spin_lock_irqsave(&priv->lock, flags);
-       if (tty && !priv->termios_initialized) {
-               *(tty->termios) = tty_std_termios;
-               tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
-                                       | TIOCM_CTS | CSTOPB | PARENB;
-               tty->termios->c_ispeed = 9600;
-               tty->termios->c_ospeed = 9600;
-               tty->termios->c_lflag = 0;
-               tty->termios->c_oflag = 0;
-               tty->termios->c_iflag = 0;
-               priv->termios_initialized = 1;
-               priv->poll = 0;
-        }
-       spin_unlock_irqrestore(&priv->lock, flags);
+       priv->poll = 0;
 
        /* initialize writebuf */
 #define FISH(a, b, c, d) do { \
@@ -1187,6 +1181,95 @@ static int iuu_open(struct tty_struct *tty,
        return result;
 }
 
+/* how to change VCC */
+static int iuu_vcc_set(struct usb_serial_port *port, unsigned int vcc)
+{
+       int status;
+       u8 *buf;
+
+       buf = kmalloc(5, GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+
+       dbg("%s - enter", __func__);
+
+       buf[0] = IUU_SET_VCC;
+       buf[1] = vcc & 0xFF;
+       buf[2] = (vcc >> 8) & 0xFF;
+       buf[3] = (vcc >> 16) & 0xFF;
+       buf[4] = (vcc >> 24) & 0xFF;
+
+       status = bulk_immediate(port, buf, 5);
+       kfree(buf);
+
+       if (status != IUU_OPERATION_OK)
+               dbg("%s - vcc error status = %2x", __func__, status);
+       else
+               dbg("%s - vcc OK !", __func__);
+
+       return status;
+}
+
+/*
+ * Sysfs Attributes
+ */
+
+static ssize_t show_vcc_mode(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+       struct usb_serial_port *port = to_usb_serial_port(dev);
+       struct iuu_private *priv = usb_get_serial_port_data(port);
+
+       return sprintf(buf, "%d\n", priv->vcc);
+}
+
+static ssize_t store_vcc_mode(struct device *dev,
+       struct device_attribute *attr, const char *buf, size_t count)
+{
+       struct usb_serial_port *port = to_usb_serial_port(dev);
+       struct iuu_private *priv = usb_get_serial_port_data(port);
+       unsigned long v;
+
+       if (strict_strtoul(buf, 10, &v)) {
+               dev_err(dev, "%s - vcc_mode: %s is not a unsigned long\n",
+                               __func__, buf);
+               goto fail_store_vcc_mode;
+       }
+
+       dbg("%s: setting vcc_mode = %ld", __func__, v);
+
+       if ((v != 3) && (v != 5)) {
+               dev_err(dev, "%s - vcc_mode %ld is invalid\n", __func__, v);
+       } else {
+               iuu_vcc_set(port, v);
+               priv->vcc = v;
+       }
+fail_store_vcc_mode:
+       return count;
+}
+
+static DEVICE_ATTR(vcc_mode, S_IRUSR | S_IWUSR, show_vcc_mode,
+       store_vcc_mode);
+
+static int iuu_create_sysfs_attrs(struct usb_serial_port *port)
+{
+       dbg("%s", __func__);
+
+       return device_create_file(&port->dev, &dev_attr_vcc_mode);
+}
+
+static int iuu_remove_sysfs_attrs(struct usb_serial_port *port)
+{
+       dbg("%s", __func__);
+
+       device_remove_file(&port->dev, &dev_attr_vcc_mode);
+       return 0;
+}
+
+/*
+ * End Sysfs Attributes
+ */
+
 static struct usb_serial_driver iuu_device = {
        .driver = {
                   .owner = THIS_MODULE,
@@ -1194,6 +1277,8 @@ static struct usb_serial_driver iuu_device = {
                   },
        .id_table = id_table,
        .num_ports = 1,
+       .port_probe = iuu_create_sysfs_attrs,
+       .port_remove = iuu_remove_sysfs_attrs,
        .open = iuu_open,
        .close = iuu_close,
        .write = iuu_uart_write,
@@ -1201,6 +1286,7 @@ static struct usb_serial_driver iuu_device = {
        .tiocmget = iuu_tiocmget,
        .tiocmset = iuu_tiocmset,
        .set_termios = iuu_set_termios,
+       .init_termios = iuu_init_termios,
        .attach = iuu_startup,
        .release = iuu_release,
 };
@@ -1242,14 +1328,19 @@ module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
 
 module_param(xmas, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(xmas, "xmas color enabled or not");
+MODULE_PARM_DESC(xmas, "Xmas colors enabled or not");
 
 module_param(boost, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(boost, "overclock boost percent 100 to 500");
+MODULE_PARM_DESC(boost, "Card overclock boost (in percent 100-500)");
 
 module_param(clockmode, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(clockmode, "1=3Mhz579,2=3Mhz680,3=6Mhz");
+MODULE_PARM_DESC(clockmode, "Card clock mode (1=3.579 MHz, 2=3.680 MHz, "
+               "3=6 Mhz)");
 
 module_param(cdmode, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(cdmode, "Card detect mode 0=none, 1=CD, 2=!CD, 3=DSR, "
-                "4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING");
+MODULE_PARM_DESC(cdmode, "Card detect mode (0=none, 1=CD, 2=!CD, 3=DSR, "
+                "4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING)");
+
+module_param(vcc_default, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(vcc_default, "Set default VCC (either 3 for 3.3V or 5 "
+               "for 5V). Default to 5.");
index 2594b87..f8c4b07 100644 (file)
@@ -1209,8 +1209,7 @@ static int keyspan_write_room(struct tty_struct *tty)
 }
 
 
-static int keyspan_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct keyspan_port_private     *p_priv;
        struct keyspan_serial_private   *s_priv;
index 3107ed1..30771e5 100644 (file)
@@ -36,8 +36,7 @@
 
 /* Function prototypes for Keyspan serial converter */
 static int  keyspan_open               (struct tty_struct *tty,
-                                        struct usb_serial_port *port,
-                                        struct file *filp);
+                                        struct usb_serial_port *port);
 static void keyspan_close              (struct usb_serial_port *port);
 static void keyspan_dtr_rts            (struct usb_serial_port *port, int on);
 static int  keyspan_startup            (struct usb_serial *serial);
index d0b12e4..257c16c 100644 (file)
@@ -681,7 +681,7 @@ static int keyspan_pda_carrier_raised(struct usb_serial_port *port)
 
 
 static int keyspan_pda_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+                                       struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        unsigned char room;
index 0f44bb8..f737337 100644 (file)
@@ -38,7 +38,7 @@
  *   0.3a - implemented pools of write URBs
  *   0.3  - alpha version for public testing
  *   0.2  - TIOCMGET works, so autopilot(1) can be used!
- *   0.1  - can be used to to pilot-xfer -p /dev/ttyUSB0 -l
+ *   0.1  - can be used to do pilot-xfer -p /dev/ttyUSB0 -l
  *
  *   The driver skeleton is mainly based on mct_u232.c and various other
  *   pieces of code shamelessly copied from the drivers/usb/serial/ directory.
@@ -75,8 +75,7 @@ static int debug;
 static int  klsi_105_startup(struct usb_serial *serial);
 static void klsi_105_disconnect(struct usb_serial *serial);
 static void klsi_105_release(struct usb_serial *serial);
-static int  klsi_105_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void klsi_105_close(struct usb_serial_port *port);
 static int  klsi_105_write(struct tty_struct *tty,
        struct usb_serial_port *port, const unsigned char *buf, int count);
@@ -358,8 +357,7 @@ static void klsi_105_release(struct usb_serial *serial)
        }
 } /* klsi_105_release */
 
-static int  klsi_105_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct klsi_105_private *priv = usb_get_serial_port_data(port);
        int retval = 0;
@@ -371,10 +369,6 @@ static int  klsi_105_open(struct tty_struct *tty,
 
        dbg("%s port %d", __func__, port->number);
 
-       /* force low_latency on so that our tty_push actually forces
-        * the data through
-        * tty->low_latency = 1; */
-
        /* Do a defined restart:
         * Set up sane default baud rate and send the 'READ_ON'
         * vendor command.
index 6db0e56..45ea694 100644 (file)
@@ -70,8 +70,7 @@ static int debug;
 /* Function prototypes */
 static int  kobil_startup(struct usb_serial *serial);
 static void kobil_release(struct usb_serial *serial);
-static int  kobil_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int  kobil_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void kobil_close(struct usb_serial_port *port);
 static int  kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
                         const unsigned char *buf, int count);
@@ -85,7 +84,7 @@ static void kobil_read_int_callback(struct urb *urb);
 static void kobil_write_callback(struct urb *purb);
 static void kobil_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
-
+static void kobil_init_termios(struct tty_struct *tty);
 
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(KOBIL_VENDOR_ID, KOBIL_ADAPTER_B_PRODUCT_ID) },
@@ -120,6 +119,7 @@ static struct usb_serial_driver kobil_device = {
        .release =              kobil_release,
        .ioctl =                kobil_ioctl,
        .set_termios =          kobil_set_termios,
+       .init_termios =         kobil_init_termios,
        .tiocmget =             kobil_tiocmget,
        .tiocmset =             kobil_tiocmset,
        .open =                 kobil_open,
@@ -210,9 +210,17 @@ static void kobil_release(struct usb_serial *serial)
                kfree(usb_get_serial_port_data(serial->port[i]));
 }
 
+static void kobil_init_termios(struct tty_struct *tty)
+{
+       /* Default to echo off and other sane device settings */
+       tty->termios->c_lflag = 0;
+       tty->termios->c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN | XCASE);
+       tty->termios->c_iflag = IGNBRK | IGNPAR | IXOFF;
+       /* do NOT translate CR to CR-NL (0x0A -> 0x0A 0x0D) */
+       tty->termios->c_oflag &= ~ONLCR;
+}
 
-static int kobil_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        int result = 0;
        struct kobil_private *priv;
@@ -226,16 +234,6 @@ static int kobil_open(struct tty_struct *tty,
        /* someone sets the dev to 0 if the close method has been called */
        port->interrupt_in_urb->dev = port->serial->dev;
 
-       if (tty) {
-
-               /* Default to echo off and other sane device settings */
-               tty->termios->c_lflag = 0;
-               tty->termios->c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN |
-                                                                XCASE);
-               tty->termios->c_iflag = IGNBRK | IGNPAR | IXOFF;
-               /* do NOT translate CR to CR-NL (0x0A -> 0x0A 0x0D) */
-               tty->termios->c_oflag &= ~ONLCR;
-       }
        /* allocate memory for transfer buffer */
        transfer_buffer = kzalloc(transfer_buffer_length, GFP_KERNEL);
        if (!transfer_buffer)
index d8825e1..ad4998b 100644 (file)
@@ -93,8 +93,7 @@ static int debug;
  */
 static int  mct_u232_startup(struct usb_serial *serial);
 static void mct_u232_release(struct usb_serial *serial);
-static int  mct_u232_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int  mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void mct_u232_close(struct usb_serial_port *port);
 static void mct_u232_dtr_rts(struct usb_serial_port *port, int on);
 static void mct_u232_read_int_callback(struct urb *urb);
@@ -421,8 +420,7 @@ static void mct_u232_release(struct usb_serial *serial)
        }
 } /* mct_u232_release */
 
-static int  mct_u232_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int  mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
@@ -568,10 +566,13 @@ static void mct_u232_read_int_callback(struct urb *urb)
         * Work-a-round: handle the 'usual' bulk-in pipe here
         */
        if (urb->transfer_buffer_length > 2) {
-               tty = tty_port_tty_get(&port->port);
                if (urb->actual_length) {
-                       tty_insert_flip_string(tty, data, urb->actual_length);
-                       tty_flip_buffer_push(tty);
+                       tty = tty_port_tty_get(&port->port);
+                       if (tty) {
+                               tty_insert_flip_string(tty, data,
+                                               urb->actual_length);
+                               tty_flip_buffer_push(tty);
+                       }
                        tty_kref_put(tty);
                }
                goto exit;
index ccd4dd3..763e32a 100644 (file)
@@ -85,7 +85,7 @@ static int debug;
 #define MOSCHIP_DEVICE_ID_7720         0x7720
 #define MOSCHIP_DEVICE_ID_7715         0x7715
 
-static struct usb_device_id moschip_port_id_table [] = {
+static struct usb_device_id moschip_port_id_table[] = {
        { USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7720) },
        { } /* terminating entry */
 };
@@ -319,8 +319,7 @@ static int send_mos_cmd(struct usb_serial *serial, __u8 request, __u16 value,
        return status;
 }
 
-static int mos7720_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial;
        struct usb_serial_port *port0;
@@ -378,10 +377,14 @@ static int mos7720_open(struct tty_struct *tty,
         /* Initialize MCS7720 -- Write Init values to corresponding Registers
          *
          * Register Index
+         * 0 : THR/RHR
          * 1 : IER
          * 2 : FCR
          * 3 : LCR
          * 4 : MCR
+         * 5 : LSR
+         * 6 : MSR
+         * 7 : SPR
          *
          * 0x08 : SP1/2 Control Reg
          */
@@ -1250,20 +1253,88 @@ static void mos7720_set_termios(struct tty_struct *tty,
 static int get_lsr_info(struct tty_struct *tty,
                struct moschip_port *mos7720_port, unsigned int __user *value)
 {
-       int count;
+       struct usb_serial_port *port = tty->driver_data;
        unsigned int result = 0;
+       unsigned char data = 0;
+       int port_number = port->number - port->serial->minor;
+       int count;
 
        count = mos7720_chars_in_buffer(tty);
        if (count == 0) {
-               dbg("%s -- Empty", __func__);
-               result = TIOCSER_TEMT;
+               send_mos_cmd(port->serial, MOS_READ, port_number,
+                                                       UART_LSR, &data);
+               if ((data & (UART_LSR_TEMT | UART_LSR_THRE))
+                                       == (UART_LSR_TEMT | UART_LSR_THRE)) {
+                       dbg("%s -- Empty", __func__);
+                       result = TIOCSER_TEMT;
+               }
        }
-
        if (copy_to_user(value, &result, sizeof(int)))
                return -EFAULT;
        return 0;
 }
 
+static int mos7720_tiocmget(struct tty_struct *tty, struct file *file)
+{
+       struct usb_serial_port *port = tty->driver_data;
+       struct moschip_port *mos7720_port = usb_get_serial_port_data(port);
+       unsigned int result = 0;
+       unsigned int mcr ;
+       unsigned int msr ;
+
+       dbg("%s - port %d", __func__, port->number);
+
+       mcr = mos7720_port->shadowMCR;
+       msr = mos7720_port->shadowMSR;
+
+       result = ((mcr & UART_MCR_DTR)  ? TIOCM_DTR : 0)   /* 0x002 */
+         | ((mcr & UART_MCR_RTS)   ? TIOCM_RTS : 0)   /* 0x004 */
+         | ((msr & UART_MSR_CTS)   ? TIOCM_CTS : 0)   /* 0x020 */
+         | ((msr & UART_MSR_DCD)   ? TIOCM_CAR : 0)   /* 0x040 */
+         | ((msr & UART_MSR_RI)    ? TIOCM_RI :  0)   /* 0x080 */
+         | ((msr & UART_MSR_DSR)   ? TIOCM_DSR : 0);  /* 0x100 */
+
+       dbg("%s -- %x", __func__, result);
+
+       return result;
+}
+
+static int mos7720_tiocmset(struct tty_struct *tty, struct file *file,
+                                       unsigned int set, unsigned int clear)
+{
+       struct usb_serial_port *port = tty->driver_data;
+       struct moschip_port *mos7720_port = usb_get_serial_port_data(port);
+       unsigned int mcr ;
+       unsigned char lmcr;
+
+       dbg("%s - port %d", __func__, port->number);
+       dbg("he was at tiocmget");
+
+       mcr = mos7720_port->shadowMCR;
+
+       if (set & TIOCM_RTS)
+               mcr |= UART_MCR_RTS;
+       if (set & TIOCM_DTR)
+               mcr |= UART_MCR_DTR;
+       if (set & TIOCM_LOOP)
+               mcr |= UART_MCR_LOOP;
+
+       if (clear & TIOCM_RTS)
+               mcr &= ~UART_MCR_RTS;
+       if (clear & TIOCM_DTR)
+               mcr &= ~UART_MCR_DTR;
+       if (clear & TIOCM_LOOP)
+               mcr &= ~UART_MCR_LOOP;
+
+       mos7720_port->shadowMCR = mcr;
+       lmcr = mos7720_port->shadowMCR;
+
+       send_mos_cmd(port->serial, MOS_WRITE,
+               port->number - port->serial->minor, UART_MCR, &lmcr);
+
+       return 0;
+}
+
 static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,
                          unsigned int __user *value)
 {
@@ -1301,14 +1372,6 @@ static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,
                        mcr &= ~UART_MCR_LOOP;
                break;
 
-       case TIOCMSET:
-               /* turn off the RTS and DTR and LOOPBACK
-                * and then only turn on what was asked to */
-               mcr &=  ~(UART_MCR_RTS | UART_MCR_DTR | UART_MCR_LOOP);
-               mcr |= ((arg & TIOCM_RTS) ? UART_MCR_RTS : 0);
-               mcr |= ((arg & TIOCM_DTR) ? UART_MCR_DTR : 0);
-               mcr |= ((arg & TIOCM_LOOP) ? UART_MCR_LOOP : 0);
-               break;
        }
 
        mos7720_port->shadowMCR = mcr;
@@ -1320,28 +1383,6 @@ static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,
        return 0;
 }
 
-static int get_modem_info(struct moschip_port *mos7720_port,
-                         unsigned int __user *value)
-{
-       unsigned int result = 0;
-       unsigned int msr = mos7720_port->shadowMSR;
-       unsigned int mcr = mos7720_port->shadowMCR;
-
-       result = ((mcr & UART_MCR_DTR)  ? TIOCM_DTR: 0)   /* 0x002 */
-                 | ((mcr & UART_MCR_RTS)       ? TIOCM_RTS: 0)   /* 0x004 */
-                 | ((msr & UART_MSR_CTS)       ? TIOCM_CTS: 0)   /* 0x020 */
-                 | ((msr & UART_MSR_DCD)       ? TIOCM_CAR: 0)   /* 0x040 */
-                 | ((msr & UART_MSR_RI)        ? TIOCM_RI:  0)   /* 0x080 */
-                 | ((msr & UART_MSR_DSR)       ? TIOCM_DSR: 0);  /* 0x100 */
-
-
-       dbg("%s -- %x", __func__, result);
-
-       if (copy_to_user(value, &result, sizeof(int)))
-               return -EFAULT;
-       return 0;
-}
-
 static int get_serial_info(struct moschip_port *mos7720_port,
                           struct serial_struct __user *retinfo)
 {
@@ -1392,17 +1433,11 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file,
        /* FIXME: These should be using the mode methods */
        case TIOCMBIS:
        case TIOCMBIC:
-       case TIOCMSET:
                dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET",
                                        __func__, port->number);
                return set_modem_info(mos7720_port, cmd,
                                      (unsigned int __user *)arg);
 
-       case TIOCMGET:
-               dbg("%s (%d) TIOCMGET", __func__,  port->number);
-               return get_modem_info(mos7720_port,
-                                     (unsigned int __user *)arg);
-
        case TIOCGSERIAL:
                dbg("%s (%d) TIOCGSERIAL", __func__,  port->number);
                return get_serial_info(mos7720_port,
@@ -1557,6 +1592,8 @@ static struct usb_serial_driver moschip7720_2port_driver = {
        .attach                 = mos7720_startup,
        .release                = mos7720_release,
        .ioctl                  = mos7720_ioctl,
+       .tiocmget               = mos7720_tiocmget,
+       .tiocmset               = mos7720_tiocmset,
        .set_termios            = mos7720_set_termios,
        .write                  = mos7720_write,
        .write_room             = mos7720_write_room,
index 270009a..f11abf5 100644 (file)
@@ -824,8 +824,7 @@ static int mos7840_serial_probe(struct usb_serial *serial,
  *     Otherwise we return a negative error number.
  *****************************************************************************/
 
-static int mos7840_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        int response;
        int j;
@@ -2133,106 +2132,6 @@ static int mos7840_get_lsr_info(struct tty_struct *tty,
        return 0;
 }
 
-/*****************************************************************************
- * mos7840_set_modem_info
- *      function to set modem info
- *****************************************************************************/
-
-/* FIXME: Should be using the model control hooks */
-
-static int mos7840_set_modem_info(struct moschip_port *mos7840_port,
-                                 unsigned int cmd, unsigned int __user *value)
-{
-       unsigned int mcr;
-       unsigned int arg;
-       __u16 Data;
-       int status;
-       struct usb_serial_port *port;
-
-       if (mos7840_port == NULL)
-               return -1;
-
-       port = (struct usb_serial_port *)mos7840_port->port;
-       if (mos7840_port_paranoia_check(port, __func__)) {
-               dbg("%s", "Invalid port");
-               return -1;
-       }
-
-       mcr = mos7840_port->shadowMCR;
-
-       if (copy_from_user(&arg, value, sizeof(int)))
-               return -EFAULT;
-
-       switch (cmd) {
-       case TIOCMBIS:
-               if (arg & TIOCM_RTS)
-                       mcr |= MCR_RTS;
-               if (arg & TIOCM_DTR)
-                       mcr |= MCR_RTS;
-               if (arg & TIOCM_LOOP)
-                       mcr |= MCR_LOOPBACK;
-               break;
-
-       case TIOCMBIC:
-               if (arg & TIOCM_RTS)
-                       mcr &= ~MCR_RTS;
-               if (arg & TIOCM_DTR)
-                       mcr &= ~MCR_RTS;
-               if (arg & TIOCM_LOOP)
-                       mcr &= ~MCR_LOOPBACK;
-               break;
-
-       case TIOCMSET:
-               /* turn off the RTS and DTR and LOOPBACK
-                * and then only turn on what was asked to */
-               mcr &= ~(MCR_RTS | MCR_DTR | MCR_LOOPBACK);
-               mcr |= ((arg & TIOCM_RTS) ? MCR_RTS : 0);
-               mcr |= ((arg & TIOCM_DTR) ? MCR_DTR : 0);
-               mcr |= ((arg & TIOCM_LOOP) ? MCR_LOOPBACK : 0);
-               break;
-       }
-
-       lock_kernel();
-       mos7840_port->shadowMCR = mcr;
-
-       Data = mos7840_port->shadowMCR;
-       status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
-       unlock_kernel();
-       if (status < 0) {
-               dbg("setting MODEM_CONTROL_REGISTER Failed");
-               return -1;
-       }
-
-       return 0;
-}
-
-/*****************************************************************************
- * mos7840_get_modem_info
- *      function to get modem info
- *****************************************************************************/
-
-static int mos7840_get_modem_info(struct moschip_port *mos7840_port,
-                                 unsigned int __user *value)
-{
-       unsigned int result = 0;
-       __u16 msr;
-       unsigned int mcr = mos7840_port->shadowMCR;
-        mos7840_get_uart_reg(mos7840_port->port,
-                                               MODEM_STATUS_REGISTER, &msr);
-       result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0)      /* 0x002 */
-           |((mcr & MCR_RTS) ? TIOCM_RTS : 0)  /* 0x004 */
-           |((msr & MOS7840_MSR_CTS) ? TIOCM_CTS : 0)  /* 0x020 */
-           |((msr & MOS7840_MSR_CD) ? TIOCM_CAR : 0)   /* 0x040 */
-           |((msr & MOS7840_MSR_RI) ? TIOCM_RI : 0)    /* 0x080 */
-           |((msr & MOS7840_MSR_DSR) ? TIOCM_DSR : 0); /* 0x100 */
-
-       dbg("%s -- %x", __func__, result);
-
-       if (copy_to_user(value, &result, sizeof(int)))
-               return -EFAULT;
-       return 0;
-}
-
 /*****************************************************************************
  * mos7840_get_serial_info
  *      function to get information about serial port
@@ -2281,7 +2180,6 @@ static int mos7840_ioctl(struct tty_struct *tty, struct file *file,
        struct async_icount cnow;
        struct async_icount cprev;
        struct serial_icounter_struct icount;
-       int mosret = 0;
 
        if (mos7840_port_paranoia_check(port, __func__)) {
                dbg("%s", "Invalid port");
@@ -2303,20 +2201,6 @@ static int mos7840_ioctl(struct tty_struct *tty, struct file *file,
                return mos7840_get_lsr_info(tty, argp);
                return 0;
 
-       /* FIXME: use the modem hooks and remove this */
-       case TIOCMBIS:
-       case TIOCMBIC:
-       case TIOCMSET:
-               dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __func__,
-                   port->number);
-               mosret =
-                   mos7840_set_modem_info(mos7840_port, cmd, argp);
-               return mosret;
-
-       case TIOCMGET:
-               dbg("%s (%d) TIOCMGET", __func__, port->number);
-               return mos7840_get_modem_info(mos7840_port, argp);
-
        case TIOCGSERIAL:
                dbg("%s (%d) TIOCGSERIAL", __func__, port->number);
                return mos7840_get_serial_info(mos7840_port, argp);
index b66b71c..99bd00f 100644 (file)
@@ -8,7 +8,7 @@
  *  published by the Free Software Foundation.
  *
  * {sigh}
- * Mororola should be using the CDC ACM USB spec, but instead
+ * Motorola should be using the CDC ACM USB spec, but instead
  * they try to just "do their own thing"...  This driver should handle a
  * few phones in which a basic "dumb serial connection" is needed to be
  * able to get a connection through to them.
index f5f3751..5ceaa4c 100644 (file)
@@ -80,8 +80,7 @@ exit:
                        __func__, result);
 }
 
-static int navman_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int navman_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        int result = 0;
 
index 56857dd..0622650 100644 (file)
@@ -64,8 +64,7 @@ static int debug;
 #define BT_IGNITIONPRO_ID      0x2000
 
 /* function prototypes */
-static int  omninet_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                                       struct file *filp);
+static int  omninet_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void omninet_close(struct usb_serial_port *port);
 static void omninet_read_bulk_callback(struct urb *urb);
 static void omninet_write_bulk_callback(struct urb *urb);
@@ -163,8 +162,7 @@ static int omninet_attach(struct usb_serial *serial)
        return 0;
 }
 
-static int omninet_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int omninet_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial       *serial = port->serial;
        struct usb_serial_port  *wport;
index 336bba7..1085a57 100644 (file)
@@ -144,8 +144,7 @@ exit:
        spin_unlock(&priv->lock);
 }
 
-static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port,
-                       struct file *filp)
+static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct opticon_private *priv = usb_get_serial_data(port->serial);
        unsigned long flags;
index c784ddb..f66e398 100644 (file)
@@ -45,8 +45,7 @@
 /* Function prototypes */
 static int  option_probe(struct usb_serial *serial,
                        const struct usb_device_id *id);
-static int  option_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                                       struct file *filp);
+static int  option_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void option_close(struct usb_serial_port *port);
 static void option_dtr_rts(struct usb_serial_port *port, int on);
 
@@ -292,6 +291,7 @@ static int  option_resume(struct usb_serial *serial);
 
 #define TELIT_VENDOR_ID                                0x1bc7
 #define TELIT_PRODUCT_UC864E                   0x1003
+#define TELIT_PRODUCT_UC864G                   0x1004
 
 /* ZTE PRODUCTS */
 #define ZTE_VENDOR_ID                          0x19d2
@@ -300,6 +300,7 @@ static int  option_resume(struct usb_serial *serial);
 #define ZTE_PRODUCT_MF626                      0x0031
 #define ZTE_PRODUCT_CDMA_TECH                  0xfffe
 #define ZTE_PRODUCT_AC8710                     0xfff1
+#define ZTE_PRODUCT_AC2726                     0xfff5
 
 #define BENQ_VENDOR_ID                         0x04a5
 #define BENQ_PRODUCT_H10                       0x4068
@@ -503,6 +504,7 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
        { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
        { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
+       { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) },
@@ -572,6 +574,7 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
+       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
        { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
        { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
        { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) },
@@ -593,6 +596,7 @@ static struct usb_driver option_driver = {
 #ifdef CONFIG_PM
        .suspend    = usb_serial_suspend,
        .resume     = usb_serial_resume,
+       .supports_autosuspend = 1,
 #endif
        .id_table   = option_ids,
        .no_dynamic_id =        1,
@@ -640,6 +644,12 @@ static int debug;
 #define IN_BUFLEN 4096
 #define OUT_BUFLEN 4096
 
+struct option_intf_private {
+       spinlock_t susp_lock;
+       unsigned int suspended:1;
+       int in_flight;
+};
+
 struct option_port_private {
        /* Input endpoints and buffer for this port */
        struct urb *in_urbs[N_IN_URB];
@@ -648,6 +658,8 @@ struct option_port_private {
        struct urb *out_urbs[N_OUT_URB];
        u8 *out_buffer[N_OUT_URB];
        unsigned long out_busy;         /* Bit vector of URBs in use */
+       int opened;
+       struct usb_anchor delayed;
 
        /* Settings for the port */
        int rts_state;  /* Handshaking pins (outputs) */
@@ -694,12 +706,17 @@ module_exit(option_exit);
 static int option_probe(struct usb_serial *serial,
                        const struct usb_device_id *id)
 {
+       struct option_intf_private *data;
        /* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
        if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
                serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
                serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8)
                return -ENODEV;
 
+       data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+       spin_lock_init(&data->susp_lock);
        return 0;
 }
 
@@ -756,12 +773,15 @@ static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
                        const unsigned char *buf, int count)
 {
        struct option_port_private *portdata;
+       struct option_intf_private *intfdata;
        int i;
        int left, todo;
        struct urb *this_urb = NULL; /* spurious */
        int err;
+       unsigned long flags;
 
        portdata = usb_get_serial_port_data(port);
+       intfdata = port->serial->private;
 
        dbg("%s: write (%d chars)", __func__, count);
 
@@ -783,17 +803,33 @@ static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
                dbg("%s: endpoint %d buf %d", __func__,
                        usb_pipeendpoint(this_urb->pipe), i);
 
+               err = usb_autopm_get_interface_async(port->serial->interface);
+               if (err < 0)
+                       break;
+
                /* send the data */
                memcpy(this_urb->transfer_buffer, buf, todo);
                this_urb->transfer_buffer_length = todo;
 
-               err = usb_submit_urb(this_urb, GFP_ATOMIC);
-               if (err) {
-                       dbg("usb_submit_urb %p (write bulk) failed "
-                               "(%d)", this_urb, err);
-                       clear_bit(i, &portdata->out_busy);
-                       continue;
+               spin_lock_irqsave(&intfdata->susp_lock, flags);
+               if (intfdata->suspended) {
+                       usb_anchor_urb(this_urb, &portdata->delayed);
+                       spin_unlock_irqrestore(&intfdata->susp_lock, flags);
+               } else {
+                       intfdata->in_flight++;
+                       spin_unlock_irqrestore(&intfdata->susp_lock, flags);
+                       err = usb_submit_urb(this_urb, GFP_ATOMIC);
+                       if (err) {
+                               dbg("usb_submit_urb %p (write bulk) failed "
+                                       "(%d)", this_urb, err);
+                               clear_bit(i, &portdata->out_busy);
+                               spin_lock_irqsave(&intfdata->susp_lock, flags);
+                               intfdata->in_flight--;
+                               spin_unlock_irqrestore(&intfdata->susp_lock, flags);
+                               continue;
+                       }
                }
+
                portdata->tx_start_time[i] = jiffies;
                buf += todo;
                left -= todo;
@@ -837,7 +873,10 @@ static void option_indat_callback(struct urb *urb)
                        if (err)
                                printk(KERN_ERR "%s: resubmit read urb failed. "
                                        "(%d)", __func__, err);
+                       else
+                               usb_mark_last_busy(port->serial->dev);
                }
+
        }
        return;
 }
@@ -846,15 +885,21 @@ static void option_outdat_callback(struct urb *urb)
 {
        struct usb_serial_port *port;
        struct option_port_private *portdata;
+       struct option_intf_private *intfdata;
        int i;
 
        dbg("%s", __func__);
 
        port =  urb->context;
+       intfdata = port->serial->private;
 
        usb_serial_port_softint(port);
-
+       usb_autopm_put_interface_async(port->serial->interface);
        portdata = usb_get_serial_port_data(port);
+       spin_lock(&intfdata->susp_lock);
+       intfdata->in_flight--;
+       spin_unlock(&intfdata->susp_lock);
+
        for (i = 0; i < N_OUT_URB; ++i) {
                if (portdata->out_urbs[i] == urb) {
                        smp_mb__before_clear_bit();
@@ -961,14 +1006,16 @@ static int option_chars_in_buffer(struct tty_struct *tty)
        return data_len;
 }
 
-static int option_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int option_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct option_port_private *portdata;
+       struct option_intf_private *intfdata;
+       struct usb_serial *serial = port->serial;
        int i, err;
        struct urb *urb;
 
        portdata = usb_get_serial_port_data(port);
+       intfdata = serial->private;
 
        dbg("%s", __func__);
 
@@ -987,6 +1034,12 @@ static int option_open(struct tty_struct *tty,
 
        option_send_setup(port);
 
+       serial->interface->needs_remote_wakeup = 1;
+       spin_lock_irq(&intfdata->susp_lock);
+       portdata->opened = 1;
+       spin_unlock_irq(&intfdata->susp_lock);
+       usb_autopm_put_interface(serial->interface);
+
        return 0;
 }
 
@@ -1011,16 +1064,23 @@ static void option_close(struct usb_serial_port *port)
        int i;
        struct usb_serial *serial = port->serial;
        struct option_port_private *portdata;
+       struct option_intf_private *intfdata = port->serial->private;
 
        dbg("%s", __func__);
        portdata = usb_get_serial_port_data(port);
 
        if (serial->dev) {
                /* Stop reading/writing urbs */
+               spin_lock_irq(&intfdata->susp_lock);
+               portdata->opened = 0;
+               spin_unlock_irq(&intfdata->susp_lock);
+
                for (i = 0; i < N_IN_URB; i++)
                        usb_kill_urb(portdata->in_urbs[i]);
                for (i = 0; i < N_OUT_URB; i++)
                        usb_kill_urb(portdata->out_urbs[i]);
+               usb_autopm_get_interface(serial->interface);
+               serial->interface->needs_remote_wakeup = 0;
        }
 }
 
@@ -1125,6 +1185,7 @@ static int option_startup(struct usb_serial *serial)
                                        __func__, i);
                        return 1;
                }
+               init_usb_anchor(&portdata->delayed);
 
                for (j = 0; j < N_IN_URB; j++) {
                        buffer = (u8 *)__get_free_page(GFP_KERNEL);
@@ -1227,18 +1288,52 @@ static void option_release(struct usb_serial *serial)
 #ifdef CONFIG_PM
 static int option_suspend(struct usb_serial *serial, pm_message_t message)
 {
+       struct option_intf_private *intfdata = serial->private;
+       int b;
+
        dbg("%s entered", __func__);
+
+       if (serial->dev->auto_pm) {
+               spin_lock_irq(&intfdata->susp_lock);
+               b = intfdata->in_flight;
+               spin_unlock_irq(&intfdata->susp_lock);
+
+               if (b)
+                       return -EBUSY;
+       }
+
+       spin_lock_irq(&intfdata->susp_lock);
+       intfdata->suspended = 1;
+       spin_unlock_irq(&intfdata->susp_lock);
        stop_read_write_urbs(serial);
 
        return 0;
 }
 
+static void play_delayed(struct usb_serial_port *port)
+{
+       struct option_intf_private *data;
+       struct option_port_private *portdata;
+       struct urb *urb;
+       int err;
+
+       portdata = usb_get_serial_port_data(port);
+       data = port->serial->private;
+       while ((urb = usb_get_from_anchor(&portdata->delayed))) {
+               err = usb_submit_urb(urb, GFP_ATOMIC);
+               if (!err)
+                       data->in_flight++;
+       }
+}
+
 static int option_resume(struct usb_serial *serial)
 {
-       int err, i, j;
+       int i, j;
        struct usb_serial_port *port;
-       struct urb *urb;
+       struct option_intf_private *intfdata = serial->private;
        struct option_port_private *portdata;
+       struct urb *urb;
+       int err = 0;
 
        dbg("%s entered", __func__);
        /* get the interrupt URBs resubmitted unconditionally */
@@ -1253,7 +1348,7 @@ static int option_resume(struct usb_serial *serial)
                if (err < 0) {
                        err("%s: Error %d for interrupt URB of port%d",
                                 __func__, err, i);
-                       return err;
+                       goto err_out;
                }
        }
 
@@ -1261,27 +1356,32 @@ static int option_resume(struct usb_serial *serial)
                /* walk all ports */
                port = serial->port[i];
                portdata = usb_get_serial_port_data(port);
-               mutex_lock(&port->mutex);
 
                /* skip closed ports */
-               if (!port->port.count) {
-                       mutex_unlock(&port->mutex);
+               spin_lock_irq(&intfdata->susp_lock);
+               if (!portdata->opened) {
+                       spin_unlock_irq(&intfdata->susp_lock);
                        continue;
                }
 
                for (j = 0; j < N_IN_URB; j++) {
                        urb = portdata->in_urbs[j];
-                       err = usb_submit_urb(urb, GFP_NOIO);
+                       err = usb_submit_urb(urb, GFP_ATOMIC);
                        if (err < 0) {
-                               mutex_unlock(&port->mutex);
                                err("%s: Error %d for bulk URB %d",
                                         __func__, err, i);
-                               return err;
+                               spin_unlock_irq(&intfdata->susp_lock);
+                               goto err_out;
                        }
                }
-               mutex_unlock(&port->mutex);
+               play_delayed(port);
+               spin_unlock_irq(&intfdata->susp_lock);
        }
-       return 0;
+       spin_lock_irq(&intfdata->susp_lock);
+       intfdata->suspended = 0;
+       spin_unlock_irq(&intfdata->susp_lock);
+err_out:
+       return err;
 }
 #endif
 
index 3cece27..0f4a70c 100644 (file)
@@ -141,11 +141,11 @@ struct oti6858_control_pkt {
          && ((a)->frame_fmt == (priv)->pending_setup.frame_fmt))
 
 /* function prototypes */
-static int oti6858_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void oti6858_close(struct usb_serial_port *port);
 static void oti6858_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
+static void oti6858_init_termios(struct tty_struct *tty);
 static int oti6858_ioctl(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg);
 static void oti6858_read_int_callback(struct urb *urb);
@@ -186,6 +186,7 @@ static struct usb_serial_driver oti6858_device = {
        .write =                oti6858_write,
        .ioctl =                oti6858_ioctl,
        .set_termios =          oti6858_set_termios,
+       .init_termios =         oti6858_init_termios,
        .tiocmget =             oti6858_tiocmget,
        .tiocmset =             oti6858_tiocmset,
        .read_bulk_callback =   oti6858_read_bulk_callback,
@@ -206,7 +207,6 @@ struct oti6858_private {
        struct {
                u8 read_urb_in_use;
                u8 write_urb_in_use;
-               u8 termios_initialized;
        } flags;
        struct delayed_work delayed_write_work;
 
@@ -447,6 +447,14 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty)
        return chars;
 }
 
+static void oti6858_init_termios(struct tty_struct *tty)
+{
+       *(tty->termios) = tty_std_termios;
+       tty->termios->c_cflag = B38400 | CS8 | CREAD | HUPCL | CLOCAL;
+       tty->termios->c_ispeed = 38400;
+       tty->termios->c_ospeed = 38400;
+}
+
 static void oti6858_set_termios(struct tty_struct *tty,
                struct usb_serial_port *port, struct ktermios *old_termios)
 {
@@ -464,16 +472,6 @@ static void oti6858_set_termios(struct tty_struct *tty,
                return;
        }
 
-       spin_lock_irqsave(&priv->lock, flags);
-       if (!priv->flags.termios_initialized) {
-               *(tty->termios) = tty_std_termios;
-               tty->termios->c_cflag = B38400 | CS8 | CREAD | HUPCL | CLOCAL;
-               tty->termios->c_ispeed = 38400;
-               tty->termios->c_ospeed = 38400;
-               priv->flags.termios_initialized = 1;
-       }
-       spin_unlock_irqrestore(&priv->lock, flags);
-
        cflag = tty->termios->c_cflag;
 
        spin_lock_irqsave(&priv->lock, flags);
@@ -566,8 +564,7 @@ static void oti6858_set_termios(struct tty_struct *tty,
        spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-static int oti6858_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct oti6858_private *priv = usb_get_serial_port_data(port);
        struct ktermios tmp_termios;
index 3e86815..1128e01 100644 (file)
@@ -96,6 +96,7 @@ static struct usb_device_id id_table [] = {
        { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) },
        { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },
        { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
+       { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };
 
@@ -527,6 +528,12 @@ static void pl2303_set_termios(struct tty_struct *tty,
        int baud;
        int i;
        u8 control;
+       const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, 3600,
+                                4800, 7200, 9600, 14400, 19200, 28800, 38400,
+                                57600, 115200, 230400, 460800, 614400,
+                                921600, 1228800, 2457600, 3000000, 6000000 };
+       int baud_floor, baud_ceil;
+       int k;
 
        dbg("%s -  port %d", __func__, port->number);
 
@@ -572,9 +579,39 @@ static void pl2303_set_termios(struct tty_struct *tty,
                dbg("%s - data bits = %d", __func__, buf[6]);
        }
 
+       /* For reference buf[0]:buf[3] baud rate value */
+       /* NOTE: Only the values defined in baud_sup are supported !
+        *       => if unsupported values are set, the PL2303 seems to use
+        *          9600 baud (at least my PL2303X always does)
+        */
        baud = tty_get_baud_rate(tty);
-       dbg("%s - baud = %d", __func__, baud);
+       dbg("%s - baud requested = %d", __func__, baud);
        if (baud) {
+               /* Set baudrate to nearest supported value */
+               for (k=0; k<ARRAY_SIZE(baud_sup); k++) {
+                       if (baud_sup[k] / baud) {
+                               baud_ceil = baud_sup[k];
+                               if (k==0) {
+                                       baud = baud_ceil;
+                               } else {
+                                       baud_floor = baud_sup[k-1];
+                                       if ((baud_ceil % baud)
+                                           > (baud % baud_floor))
+                                               baud = baud_floor;
+                                       else
+                                               baud = baud_ceil;
+                               }
+                               break;
+                       }
+               }
+               if (baud > 1228800) {
+                       /* type_0, type_1 only support up to 1228800 baud */
+                       if (priv->type != HX)
+                               baud = 1228800;
+                       else if (baud > 6000000)
+                               baud = 6000000;
+               }
+               dbg("%s - baud set = %d", __func__, baud);
                buf[0] = baud & 0xff;
                buf[1] = (baud >> 8) & 0xff;
                buf[2] = (baud >> 16) & 0xff;
@@ -585,8 +622,16 @@ static void pl2303_set_termios(struct tty_struct *tty,
        /* For reference buf[4]=1 is 1.5 stop bits */
        /* For reference buf[4]=2 is 2 stop bits */
        if (cflag & CSTOPB) {
-               buf[4] = 2;
-               dbg("%s - stop bits = 2", __func__);
+               /* NOTE: Comply with "real" UARTs / RS232:
+                *       use 1.5 instead of 2 stop bits with 5 data bits
+                */
+               if ((cflag & CSIZE) == CS5) {
+                       buf[4] = 1;
+                       dbg("%s - stop bits = 1.5", __func__);
+               } else {
+                       buf[4] = 2;
+                       dbg("%s - stop bits = 2", __func__);
+               }
        } else {
                buf[4] = 0;
                dbg("%s - stop bits = 1", __func__);
@@ -599,11 +644,21 @@ static void pl2303_set_termios(struct tty_struct *tty,
                /* For reference buf[5]=3 is mark parity */
                /* For reference buf[5]=4 is space parity */
                if (cflag & PARODD) {
-                       buf[5] = 1;
-                       dbg("%s - parity = odd", __func__);
+                       if (cflag & CMSPAR) {
+                               buf[5] = 3;
+                               dbg("%s - parity = mark", __func__);
+                       } else {
+                               buf[5] = 1;
+                               dbg("%s - parity = odd", __func__);
+                       }
                } else {
-                       buf[5] = 2;
-                       dbg("%s - parity = even", __func__);
+                       if (cflag & CMSPAR) {
+                               buf[5] = 4;
+                               dbg("%s - parity = space", __func__);
+                       } else {
+                               buf[5] = 2;
+                               dbg("%s - parity = even", __func__);
+                       }
                }
        } else {
                buf[5] = 0;
@@ -647,7 +702,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
                pl2303_vendor_write(0x0, 0x0, serial);
        }
 
-       /* FIXME: Need to read back resulting baud rate */
+       /* Save resulting baud rate */
        if (baud)
                tty_encode_baud_rate(tty, baud, baud);
 
@@ -691,8 +746,7 @@ static void pl2303_close(struct usb_serial_port *port)
 
 }
 
-static int pl2303_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct ktermios tmp_termios;
        struct usb_serial *serial = port->serial;
@@ -714,8 +768,6 @@ static int pl2303_open(struct tty_struct *tty,
        if (tty)
                pl2303_set_termios(tty, port, &tmp_termios);
 
-       /* FIXME: need to assert RTS and DTR if CRTSCTS off */
-
        dbg("%s - submitting read urb", __func__);
        port->read_urb->dev = serial->dev;
        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
index ee9505e..d640dc9 100644 (file)
 /* Sony, USB data cable for CMD-Jxx mobile phones */
 #define SONY_VENDOR_ID         0x054c
 #define SONY_QN3USB_PRODUCT_ID 0x0437
+
+/* Sanwa KB-USB2 multimeter cable (ID: 11ad:0001) */
+#define SANWA_VENDOR_ID                0x11ad
+#define SANWA_PRODUCT_ID       0x0001
index f48d05e..68fa0e4 100644 (file)
@@ -51,6 +51,12 @@ struct sierra_iface_info {
        const u8  *ifaceinfo;   /* pointer to the array holding the numbers */
 };
 
+struct sierra_intf_private {
+       spinlock_t susp_lock;
+       unsigned int suspended:1;
+       int in_flight;
+};
+
 static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 {
        int result;
@@ -144,6 +150,7 @@ static int sierra_probe(struct usb_serial *serial,
 {
        int result = 0;
        struct usb_device *udev;
+       struct sierra_intf_private *data;
        u8 ifnum;
 
        udev = serial->dev;
@@ -171,6 +178,11 @@ static int sierra_probe(struct usb_serial *serial,
                return -ENODEV;
        }
 
+       data = serial->private = kzalloc(sizeof(struct sierra_intf_private), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+       spin_lock_init(&data->susp_lock);
+
        return result;
 }
 
@@ -261,13 +273,18 @@ static struct usb_driver sierra_driver = {
        .name       = "sierra",
        .probe      = usb_serial_probe,
        .disconnect = usb_serial_disconnect,
+       .suspend    = usb_serial_suspend,
+       .resume     = usb_serial_resume,
        .id_table   = id_table,
        .no_dynamic_id =        1,
+       .supports_autosuspend = 1,
 };
 
 struct sierra_port_private {
        spinlock_t lock;        /* lock the structure */
        int outstanding_urbs;   /* number of out urbs in flight */
+       struct usb_anchor active;
+       struct usb_anchor delayed;
 
        /* Input endpoints and buffers for this port */
        struct urb *in_urbs[N_IN_URB];
@@ -279,6 +296,8 @@ struct sierra_port_private {
        int dsr_state;
        int dcd_state;
        int ri_state;
+
+       unsigned int opened:1;
 };
 
 static int sierra_send_setup(struct usb_serial_port *port)
@@ -390,21 +409,25 @@ static void sierra_outdat_callback(struct urb *urb)
 {
        struct usb_serial_port *port = urb->context;
        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+       struct sierra_intf_private *intfdata;
        int status = urb->status;
-       unsigned long flags;
 
        dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
+       intfdata = port->serial->private;
 
        /* free up the transfer buffer, as usb_free_urb() does not do this */
        kfree(urb->transfer_buffer);
-
+       usb_autopm_put_interface_async(port->serial->interface);
        if (status)
                dev_dbg(&port->dev, "%s - nonzero write bulk status "
                    "received: %d\n", __func__, status);
 
-       spin_lock_irqsave(&portdata->lock, flags);
+       spin_lock(&portdata->lock);
        --portdata->outstanding_urbs;
-       spin_unlock_irqrestore(&portdata->lock, flags);
+       spin_unlock(&portdata->lock);
+       spin_lock(&intfdata->susp_lock);
+       --intfdata->in_flight;
+       spin_unlock(&intfdata->susp_lock);
 
        usb_serial_port_softint(port);
 }
@@ -414,6 +437,7 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,
                                        const unsigned char *buf, int count)
 {
        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+       struct sierra_intf_private *intfdata;
        struct usb_serial *serial = port->serial;
        unsigned long flags;
        unsigned char *buffer;
@@ -426,9 +450,9 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,
                return 0;
 
        portdata = usb_get_serial_port_data(port);
+       intfdata = serial->private;
 
        dev_dbg(&port->dev, "%s: write (%zd bytes)\n", __func__, writesize);
-
        spin_lock_irqsave(&portdata->lock, flags);
        dev_dbg(&port->dev, "%s - outstanding_urbs: %d\n", __func__,
                portdata->outstanding_urbs);
@@ -442,6 +466,14 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,
                portdata->outstanding_urbs);
        spin_unlock_irqrestore(&portdata->lock, flags);
 
+       retval = usb_autopm_get_interface_async(serial->interface);
+       if (retval < 0) {
+               spin_lock_irqsave(&portdata->lock, flags);
+               portdata->outstanding_urbs--;
+               spin_unlock_irqrestore(&portdata->lock, flags);
+               goto error_simple;
+       }
+
        buffer = kmalloc(writesize, GFP_ATOMIC);
        if (!buffer) {
                dev_err(&port->dev, "out of memory\n");
@@ -468,14 +500,29 @@ static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,
        /* Handle the need to send a zero length packet */
        urb->transfer_flags |= URB_ZERO_PACKET;
 
+       spin_lock_irqsave(&intfdata->susp_lock, flags);
+
+       if (intfdata->suspended) {
+               usb_anchor_urb(urb, &portdata->delayed);
+               spin_unlock_irqrestore(&intfdata->susp_lock, flags);
+               goto skip_power;
+       } else {
+               usb_anchor_urb(urb, &portdata->active);
+       }
        /* send it down the pipe */
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval) {
+               usb_unanchor_urb(urb);
+               spin_unlock_irqrestore(&intfdata->susp_lock, flags);
                dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
                        "with status = %d\n", __func__, retval);
                goto error;
+       } else {
+               intfdata->in_flight++;
+               spin_unlock_irqrestore(&intfdata->susp_lock, flags);
        }
 
+skip_power:
        /* we are done with this urb, so let the host driver
         * really free it when it is finished with it */
        usb_free_urb(urb);
@@ -491,6 +538,8 @@ error_no_buffer:
        dev_dbg(&port->dev, "%s - 2. outstanding_urbs: %d\n", __func__,
                portdata->outstanding_urbs);
        spin_unlock_irqrestore(&portdata->lock, flags);
+       usb_autopm_put_interface_async(serial->interface);
+error_simple:
        return retval;
 }
 
@@ -530,6 +579,7 @@ static void sierra_indat_callback(struct urb *urb)
 
        /* Resubmit urb so we continue receiving */
        if (port->port.count && status != -ESHUTDOWN && status != -EPERM) {
+               usb_mark_last_busy(port->serial->dev);
                err = usb_submit_urb(urb, GFP_ATOMIC);
                if (err)
                        dev_err(&port->dev, "resubmit read urb failed."
@@ -591,6 +641,7 @@ static void sierra_instat_callback(struct urb *urb)
 
        /* Resubmit urb so we continue receiving IRQ data */
        if (port->port.count && status != -ESHUTDOWN && status != -ENOENT) {
+               usb_mark_last_busy(serial->dev);
                urb->dev = serial->dev;
                err = usb_submit_urb(urb, GFP_ATOMIC);
                if (err)
@@ -711,6 +762,8 @@ static void sierra_close(struct usb_serial_port *port)
        int i;
        struct usb_serial *serial = port->serial;
        struct sierra_port_private *portdata;
+       struct sierra_intf_private *intfdata = port->serial->private;
+
 
        dev_dbg(&port->dev, "%s\n", __func__);
        portdata = usb_get_serial_port_data(port);
@@ -723,6 +776,10 @@ static void sierra_close(struct usb_serial_port *port)
                if (!serial->disconnected)
                        sierra_send_setup(port);
                mutex_unlock(&serial->disc_mutex);
+               spin_lock_irq(&intfdata->susp_lock);
+               portdata->opened = 0;
+               spin_unlock_irq(&intfdata->susp_lock);
+
 
                /* Stop reading urbs */
                sierra_stop_rx_urbs(port);
@@ -731,14 +788,16 @@ static void sierra_close(struct usb_serial_port *port)
                        sierra_release_urb(portdata->in_urbs[i]);
                        portdata->in_urbs[i] = NULL;
                }
+               usb_autopm_get_interface(serial->interface);
+               serial->interface->needs_remote_wakeup = 0;
        }
 }
 
-static int sierra_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct sierra_port_private *portdata;
        struct usb_serial *serial = port->serial;
+       struct sierra_intf_private *intfdata = serial->private;
        int i;
        int err;
        int endpoint;
@@ -772,6 +831,12 @@ static int sierra_open(struct tty_struct *tty,
        }
        sierra_send_setup(port);
 
+       serial->interface->needs_remote_wakeup = 1;
+       spin_lock_irq(&intfdata->susp_lock);
+       portdata->opened = 1;
+       spin_unlock_irq(&intfdata->susp_lock);
+       usb_autopm_put_interface(serial->interface);
+
        return 0;
 }
 
@@ -819,6 +884,8 @@ static int sierra_startup(struct usb_serial *serial)
                        return -ENOMEM;
                }
                spin_lock_init(&portdata->lock);
+               init_usb_anchor(&portdata->active);
+               init_usb_anchor(&portdata->delayed);
                /* Set the port private data pointer */
                usb_set_serial_port_data(port, portdata);
        }
@@ -845,6 +912,83 @@ static void sierra_release(struct usb_serial *serial)
        }
 }
 
+static void stop_read_write_urbs(struct usb_serial *serial)
+{
+       int i, j;
+       struct usb_serial_port *port;
+       struct sierra_port_private *portdata;
+
+       /* Stop reading/writing urbs */
+       for (i = 0; i < serial->num_ports; ++i) {
+               port = serial->port[i];
+               portdata = usb_get_serial_port_data(port);
+               for (j = 0; j < N_IN_URB; j++)
+                       usb_kill_urb(portdata->in_urbs[j]);
+               usb_kill_anchored_urbs(&portdata->active);
+       }
+}
+
+static int sierra_suspend(struct usb_serial *serial, pm_message_t message)
+{
+       struct sierra_intf_private *intfdata;
+       int b;
+
+       if (serial->dev->auto_pm) {
+               intfdata = serial->private;
+               spin_lock_irq(&intfdata->susp_lock);
+               b = intfdata->in_flight;
+
+               if (b) {
+                       spin_unlock_irq(&intfdata->susp_lock);
+                       return -EBUSY;
+               } else {
+                       intfdata->suspended = 1;
+                       spin_unlock_irq(&intfdata->susp_lock);
+               }
+       }
+       stop_read_write_urbs(serial);
+
+       return 0;
+}
+
+static int sierra_resume(struct usb_serial *serial)
+{
+       struct usb_serial_port *port;
+       struct sierra_intf_private *intfdata = serial->private;
+       struct sierra_port_private *portdata;
+       struct urb *urb;
+       int ec = 0;
+       int i, err;
+
+       spin_lock_irq(&intfdata->susp_lock);
+       for (i = 0; i < serial->num_ports; i++) {
+               port = serial->port[i];
+               portdata = usb_get_serial_port_data(port);
+
+               while ((urb = usb_get_from_anchor(&portdata->delayed))) {
+                       usb_anchor_urb(urb, &portdata->active);
+                       intfdata->in_flight++;
+                       err = usb_submit_urb(urb, GFP_ATOMIC);
+                       if (err < 0) {
+                               intfdata->in_flight--;
+                               usb_unanchor_urb(urb);
+                               usb_scuttle_anchored_urbs(&portdata->delayed);
+                               break;
+                       }
+               }
+
+               if (portdata->opened) {
+                       err = sierra_submit_rx_urbs(port, GFP_ATOMIC);
+                       if (err)
+                               ec++;
+               }
+       }
+       intfdata->suspended = 0;
+       spin_unlock_irq(&intfdata->susp_lock);
+
+       return ec ? -EIO : 0;
+}
+
 static struct usb_serial_driver sierra_device = {
        .driver = {
                .owner =        THIS_MODULE,
@@ -865,6 +1009,8 @@ static struct usb_serial_driver sierra_device = {
        .tiocmset          = sierra_tiocmset,
        .attach            = sierra_startup,
        .release           = sierra_release,
+       .suspend           = sierra_suspend,
+       .resume            = sierra_resume,
        .read_int_callback = sierra_instat_callback,
 };
 
index 3c249d8..1e58220 100644 (file)
@@ -299,7 +299,6 @@ struct spcp8x5_private {
        wait_queue_head_t       delta_msr_wait;
        u8                      line_control;
        u8                      line_status;
-       u8                      termios_initialized;
 };
 
 /* desc : when device plug in,this function would be called.
@@ -498,6 +497,15 @@ static void spcp8x5_close(struct usb_serial_port *port)
                dev_dbg(&port->dev, "usb_unlink_urb(read_urb) = %d\n", result);
 }
 
+static void spcp8x5_init_termios(struct tty_struct *tty)
+{
+       /* for the 1st time call this function */
+       *(tty->termios) = tty_std_termios;
+       tty->termios->c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
+       tty->termios->c_ispeed = 115200;
+       tty->termios->c_ospeed = 115200;
+}
+
 /* set the serial param for transfer. we should check if we really need to
  * transfer. if we set flow control we should do this too. */
 static void spcp8x5_set_termios(struct tty_struct *tty,
@@ -514,16 +522,6 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        int i;
        u8 control;
 
-       /* for the 1st time call this function */
-       spin_lock_irqsave(&priv->lock, flags);
-       if (!priv->termios_initialized) {
-               *(tty->termios) = tty_std_termios;
-               tty->termios->c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
-               tty->termios->c_ispeed = 115200;
-               tty->termios->c_ospeed = 115200;
-               priv->termios_initialized = 1;
-       }
-       spin_unlock_irqrestore(&priv->lock, flags);
 
        /* check that they really want us to change something */
        if (!tty_termios_hw_change(tty->termios, old_termios))
@@ -546,7 +544,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        }
 
        /* Set Baud Rate */
-       baud = tty_get_baud_rate(tty);;
+       baud = tty_get_baud_rate(tty);
        switch (baud) {
        case 300:       buf[0] = 0x00;  break;
        case 600:       buf[0] = 0x01;  break;
@@ -623,8 +621,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
 
 /* open the serial port. do some usb system call. set termios and get the line
  * status of the device. then submit the read urb */
-static int spcp8x5_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int spcp8x5_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct ktermios tmp_termios;
        struct usb_serial *serial = port->serial;
@@ -658,8 +655,6 @@ static int spcp8x5_open(struct tty_struct *tty,
        priv->line_status = status & 0xf0 ;
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       /* FIXME: need to assert RTS and DTR if CRTSCTS off */
-
        dbg("%s - submitting read urb", __func__);
        port->read_urb->dev = serial->dev;
        ret = usb_submit_urb(port->read_urb, GFP_KERNEL);
@@ -1011,6 +1006,7 @@ static struct usb_serial_driver spcp8x5_device = {
        .carrier_raised         = spcp8x5_carrier_raised,
        .write                  = spcp8x5_write,
        .set_termios            = spcp8x5_set_termios,
+       .init_termios           = spcp8x5_init_termios,
        .ioctl                  = spcp8x5_ioctl,
        .tiocmget               = spcp8x5_tiocmget,
        .tiocmset               = spcp8x5_tiocmset,
index 6157fac..cb7e95f 100644 (file)
@@ -124,8 +124,7 @@ exit:
        spin_unlock(&priv->lock);
 }
 
-static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port,
-                       struct file *filp)
+static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct symbol_private *priv = usb_get_serial_data(port->serial);
        unsigned long flags;
index 3bc609f..1e9dc88 100644 (file)
@@ -98,8 +98,7 @@ struct ti_device {
 
 static int ti_startup(struct usb_serial *serial);
 static void ti_release(struct usb_serial *serial);
-static int ti_open(struct tty_struct *tty, struct usb_serial_port *port,
-               struct file *file);
+static int ti_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void ti_close(struct usb_serial_port *port);
 static int ti_write(struct tty_struct *tty, struct usb_serial_port *port,
                const unsigned char *data, int count);
@@ -492,8 +491,7 @@ static void ti_release(struct usb_serial *serial)
 }
 
 
-static int ti_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *file)
+static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct ti_port *tport = usb_get_serial_port_data(port);
        struct ti_device *tdev;
index 99188c9..ff75a35 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/serial.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
+#include <linux/kfifo.h>
 #include "pl2303.h"
 
 /*
@@ -43,8 +44,6 @@
 #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/"
 #define DRIVER_DESC "USB Serial Driver core"
 
-static void port_free(struct usb_serial_port *port);
-
 /* Driver structure we register with the USB core */
 static struct usb_driver usb_serial_driver = {
        .name =         "usbserial",
@@ -68,6 +67,11 @@ static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
 static DEFINE_MUTEX(table_lock);
 static LIST_HEAD(usb_serial_driver_list);
 
+/*
+ * Look up the serial structure.  If it is found and it hasn't been
+ * disconnected, return with its disc_mutex held and its refcount
+ * incremented.  Otherwise return NULL.
+ */
 struct usb_serial *usb_serial_get_by_index(unsigned index)
 {
        struct usb_serial *serial;
@@ -75,8 +79,15 @@ struct usb_serial *usb_serial_get_by_index(unsigned index)
        mutex_lock(&table_lock);
        serial = serial_table[index];
 
-       if (serial)
-               kref_get(&serial->kref);
+       if (serial) {
+               mutex_lock(&serial->disc_mutex);
+               if (serial->disconnected) {
+                       mutex_unlock(&serial->disc_mutex);
+                       serial = NULL;
+               } else {
+                       kref_get(&serial->kref);
+               }
+       }
        mutex_unlock(&table_lock);
        return serial;
 }
@@ -125,8 +136,10 @@ static void return_serial(struct usb_serial *serial)
 
        dbg("%s", __func__);
 
+       mutex_lock(&table_lock);
        for (i = 0; i < serial->num_ports; ++i)
                serial_table[serial->minor + i] = NULL;
+       mutex_unlock(&table_lock);
 }
 
 static void destroy_serial(struct kref *kref)
@@ -145,244 +158,224 @@ static void destroy_serial(struct kref *kref)
 
        serial->type->release(serial);
 
-       for (i = 0; i < serial->num_ports; ++i) {
+       /* Now that nothing is using the ports, they can be freed */
+       for (i = 0; i < serial->num_port_pointers; ++i) {
                port = serial->port[i];
-               if (port)
+               if (port) {
+                       port->serial = NULL;
                        put_device(&port->dev);
-       }
-
-       /* If this is a "fake" port, we have to clean it up here, as it will
-        * not get cleaned up in port_release() as it was never registered with
-        * the driver core */
-       if (serial->num_ports < serial->num_port_pointers) {
-               for (i = serial->num_ports;
-                                       i < serial->num_port_pointers; ++i) {
-                       port = serial->port[i];
-                       if (port)
-                               port_free(port);
                }
        }
 
        usb_put_dev(serial->dev);
-
-       /* free up any memory that we allocated */
        kfree(serial);
 }
 
 void usb_serial_put(struct usb_serial *serial)
 {
-       mutex_lock(&table_lock);
        kref_put(&serial->kref, destroy_serial);
-       mutex_unlock(&table_lock);
 }
 
 /*****************************************************************************
  * Driver tty interface functions
  *****************************************************************************/
-static int serial_open (struct tty_struct *tty, struct file *filp)
+
+/**
+ * serial_install - install tty
+ * @driver: the driver (USB in our case)
+ * @tty: the tty being created
+ *
+ * Create the termios objects for this tty.  We use the default
+ * USB serial settings but permit them to be overridden by
+ * serial->type->init_termios.
+ *
+ * This is the first place a new tty gets used.  Hence this is where we
+ * acquire references to the usb_serial structure and the driver module,
+ * where we store a pointer to the port, and where we do an autoresume.
+ * All these actions are reversed in serial_release().
+ */
+static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
 {
+       int idx = tty->index;
        struct usb_serial *serial;
        struct usb_serial_port *port;
-       unsigned int portNumber;
-       int retval = 0;
-       int first = 0;
+       int retval = -ENODEV;
 
        dbg("%s", __func__);
 
-       /* get the serial object associated with this tty pointer */
-       serial = usb_serial_get_by_index(tty->index);
-       if (!serial) {
-               tty->driver_data = NULL;
-               return -ENODEV;
-       }
+       serial = usb_serial_get_by_index(idx);
+       if (!serial)
+               return retval;
 
-       mutex_lock(&serial->disc_mutex);
-       portNumber = tty->index - serial->minor;
-       port = serial->port[portNumber];
-       if (!port || serial->disconnected)
-               retval = -ENODEV;
-       else
-               get_device(&port->dev);
-       /*
-        * Note: Our locking order requirement does not allow port->mutex
-        * to be acquired while serial->disc_mutex is held.
-        */
-       mutex_unlock(&serial->disc_mutex);
+       port = serial->port[idx - serial->minor];
+       if (!port)
+               goto error_no_port;
+       if (!try_module_get(serial->type->driver.owner))
+               goto error_module_get;
+
+       /* perform the standard setup */
+       retval = tty_init_termios(tty);
        if (retval)
-               goto bailout_serial_put;
+               goto error_init_termios;
 
-       if (mutex_lock_interruptible(&port->mutex)) {
-               retval = -ERESTARTSYS;
-               goto bailout_port_put;
-       }
+       retval = usb_autopm_get_interface(serial->interface);
+       if (retval)
+               goto error_get_interface;
 
-       ++port->port.count;
+       mutex_unlock(&serial->disc_mutex);
+
+       /* allow the driver to update the settings */
+       if (serial->type->init_termios)
+               serial->type->init_termios(tty);
 
-       /* set up our port structure making the tty driver
-        * remember our port object, and us it */
        tty->driver_data = port;
-       tty_port_tty_set(&port->port, tty);
 
-       /* If the console is attached, the device is already open */
-       if (port->port.count == 1 && !port->console) {
-               first = 1;
-               /* lock this module before we call it
-                * this may fail, which means we must bail out,
-                * safe because we are called with BKL held */
-               if (!try_module_get(serial->type->driver.owner)) {
-                       retval = -ENODEV;
-                       goto bailout_mutex_unlock;
-               }
+       /* Final install (we use the default method) */
+       tty_driver_kref_get(driver);
+       tty->count++;
+       driver->ttys[idx] = tty;
+       return retval;
+
+ error_get_interface:
+ error_init_termios:
+       module_put(serial->type->driver.owner);
+ error_module_get:
+ error_no_port:
+       usb_serial_put(serial);
+       mutex_unlock(&serial->disc_mutex);
+       return retval;
+}
 
+static int serial_open(struct tty_struct *tty, struct file *filp)
+{
+       struct usb_serial_port *port = tty->driver_data;
+       struct usb_serial *serial = port->serial;
+       int retval;
+
+       dbg("%s - port %d", __func__, port->number);
+
+       spin_lock_irq(&port->port.lock);
+       if (!tty_hung_up_p(filp))
+               ++port->port.count;
+       spin_unlock_irq(&port->port.lock);
+       tty_port_tty_set(&port->port, tty);
+
+       /* Do the device-specific open only if the hardware isn't
+        * already initialized.
+        */
+       if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
+               if (mutex_lock_interruptible(&port->mutex))
+                       return -ERESTARTSYS;
                mutex_lock(&serial->disc_mutex);
                if (serial->disconnected)
                        retval = -ENODEV;
                else
-                       retval = usb_autopm_get_interface(serial->interface);
-               if (retval)
-                       goto bailout_module_put;
-
-               /* only call the device specific open if this
-                * is the first time the port is opened */
-               retval = serial->type->open(tty, port, filp);
-               if (retval)
-                       goto bailout_interface_put;
+                       retval = port->serial->type->open(tty, port);
                mutex_unlock(&serial->disc_mutex);
+               mutex_unlock(&port->mutex);
+               if (retval)
+                       return retval;
                set_bit(ASYNCB_INITIALIZED, &port->port.flags);
        }
-       mutex_unlock(&port->mutex);
+
        /* Now do the correct tty layer semantics */
        retval = tty_port_block_til_ready(&port->port, tty, filp);
-       if (retval == 0) {
-               if (!first)
-                       usb_serial_put(serial);
-               return 0;
-       }
-       mutex_lock(&port->mutex);
-       if (first == 0)
-               goto bailout_mutex_unlock;
-       /* Undo the initial port actions */
-       mutex_lock(&serial->disc_mutex);
-bailout_interface_put:
-       usb_autopm_put_interface(serial->interface);
-bailout_module_put:
-       mutex_unlock(&serial->disc_mutex);
-       module_put(serial->type->driver.owner);
-bailout_mutex_unlock:
-       port->port.count = 0;
-       tty->driver_data = NULL;
-       tty_port_tty_set(&port->port, NULL);
-       mutex_unlock(&port->mutex);
-bailout_port_put:
-       put_device(&port->dev);
-bailout_serial_put:
-       usb_serial_put(serial);
        return retval;
 }
 
 /**
- *     serial_do_down          -       shut down hardware
- *     @port: port to shut down
- *
- *     Shut down a USB port unless it is the console. We never shut down the
- *     console hardware as it will always be in use.
+ * serial_down - shut down hardware
+ * @port: port to shut down
  *
- *     Don't free any resources at this point
+ * Shut down a USB serial port unless it is the console.  We never
+ * shut down the console hardware as it will always be in use.
  */
-static void serial_do_down(struct usb_serial_port *port)
+static void serial_down(struct usb_serial_port *port)
 {
        struct usb_serial_driver *drv = port->serial->type;
-       struct usb_serial *serial;
-       struct module *owner;
 
-       /* The console is magical, do not hang up the console hardware
-          or there will be tears */
+       /*
+        * The console is magical.  Do not hang up the console hardware
+        * or there will be tears.
+        */
        if (port->console)
                return;
 
-       mutex_lock(&port->mutex);
-       serial = port->serial;
-       owner = serial->type->driver.owner;
+       /* Don't call the close method if the hardware hasn't been
+        * initialized.
+        */
+       if (!test_and_clear_bit(ASYNCB_INITIALIZED, &port->port.flags))
+               return;
 
+       mutex_lock(&port->mutex);
        if (drv->close)
                drv->close(port);
-
        mutex_unlock(&port->mutex);
 }
 
-/**
- *     serial_do_free          -       free resources post close/hangup
- *     @port: port to free up
- *
- *     Do the resource freeing and refcount dropping for the port. We must
- *     be careful about ordering and we must avoid freeing up the console.
- */
-
-static void serial_do_free(struct usb_serial_port *port)
+static void serial_hangup(struct tty_struct *tty)
 {
-       struct usb_serial *serial;
-       struct module *owner;
+       struct usb_serial_port *port = tty->driver_data;
 
-       /* The console is magical, do not hang up the console hardware
-          or there will be tears */
-       if (port->console)
-               return;
+       dbg("%s - port %d", __func__, port->number);
 
-       serial = port->serial;
-       owner = serial->type->driver.owner;
-       put_device(&port->dev);
-       /* Mustn't dereference port any more */
-       mutex_lock(&serial->disc_mutex);
-       if (!serial->disconnected)
-               usb_autopm_put_interface(serial->interface);
-       mutex_unlock(&serial->disc_mutex);
-       usb_serial_put(serial);
-       /* Mustn't dereference serial any more */
-       module_put(owner);
+       serial_down(port);
+       tty_port_hangup(&port->port);
 }
 
 static void serial_close(struct tty_struct *tty, struct file *filp)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       if (!port)
-               return;
-
        dbg("%s - port %d", __func__, port->number);
 
-       /* FIXME:
-          This leaves a very narrow race. Really we should do the
-          serial_do_free() on tty->shutdown(), but tty->shutdown can
-          be called from IRQ context and serial_do_free can sleep.
-
-          The right fix is probably to make the tty free (which is rare)
-          and thus tty->shutdown() occur via a work queue and simplify all
-          the drivers that use it.
-       */
-       if (tty_hung_up_p(filp)) {
-               /* serial_hangup already called serial_down at this point.
-                  Another user may have already reopened the port but
-                  serial_do_free is refcounted */
-               serial_do_free(port);
+       if (tty_hung_up_p(filp))
                return;
-       }
-
        if (tty_port_close_start(&port->port, tty, filp) == 0)
                return;
-
-       serial_do_down(port);           
+       serial_down(port);
        tty_port_close_end(&port->port, tty);
        tty_port_tty_set(&port->port, NULL);
-       serial_do_free(port);
 }
 
-static void serial_hangup(struct tty_struct *tty)
+/**
+ * serial_release - free resources post close/hangup
+ * @port: port to free up
+ *
+ * Do the resource freeing and refcount dropping for the port.
+ * Avoid freeing the console.
+ *
+ * Called when the last tty kref is dropped.
+ */
+static void serial_release(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
-       serial_do_down(port);
-       tty_port_hangup(&port->port);
-       /* We must not free port yet - the USB serial layer depends on it's
-          continued existence */
+       struct usb_serial *serial;
+       struct module *owner;
+
+       /* The console is magical.  Do not hang up the console hardware
+        * or there will be tears.
+        */
+       if (port->console)
+               return;
+
+       dbg("%s - port %d", __func__, port->number);
+
+       /* Standard shutdown processing */
+       tty_shutdown(tty);
+
+       tty->driver_data = NULL;
+
+       serial = port->serial;
+       owner = serial->type->driver.owner;
+
+       mutex_lock(&serial->disc_mutex);
+       if (!serial->disconnected)
+               usb_autopm_put_interface(serial->interface);
+       mutex_unlock(&serial->disc_mutex);
+
+       usb_serial_put(serial);
+       module_put(owner);
 }
 
 static int serial_write(struct tty_struct *tty, const unsigned char *buf,
@@ -527,6 +520,7 @@ static int serial_proc_show(struct seq_file *m, void *v)
 
                seq_putc(m, '\n');
                usb_serial_put(serial);
+               mutex_unlock(&serial->disc_mutex);
        }
        return 0;
 }
@@ -596,14 +590,6 @@ static void usb_serial_port_work(struct work_struct *work)
        tty_kref_put(tty);
 }
 
-static void port_release(struct device *dev)
-{
-       struct usb_serial_port *port = to_usb_serial_port(dev);
-
-       dbg ("%s - %s", __func__, dev_name(dev));
-       port_free(port);
-}
-
 static void kill_traffic(struct usb_serial_port *port)
 {
        usb_kill_urb(port->read_urb);
@@ -623,8 +609,12 @@ static void kill_traffic(struct usb_serial_port *port)
        usb_kill_urb(port->interrupt_out_urb);
 }
 
-static void port_free(struct usb_serial_port *port)
+static void port_release(struct device *dev)
 {
+       struct usb_serial_port *port = to_usb_serial_port(dev);
+
+       dbg ("%s - %s", __func__, dev_name(dev));
+
        /*
         * Stop all the traffic before cancelling the work, so that
         * nobody will restart it by calling usb_serial_port_softint.
@@ -636,6 +626,8 @@ static void port_free(struct usb_serial_port *port)
        usb_free_urb(port->write_urb);
        usb_free_urb(port->interrupt_in_urb);
        usb_free_urb(port->interrupt_out_urb);
+       if (!IS_ERR(port->write_fifo) && port->write_fifo)
+               kfifo_free(port->write_fifo);
        kfree(port->bulk_in_buffer);
        kfree(port->bulk_out_buffer);
        kfree(port->interrupt_in_buffer);
@@ -935,6 +927,11 @@ int usb_serial_probe(struct usb_interface *interface,
                mutex_init(&port->mutex);
                INIT_WORK(&port->work, usb_serial_port_work);
                serial->port[i] = port;
+               port->dev.parent = &interface->dev;
+               port->dev.driver = NULL;
+               port->dev.bus = &usb_serial_bus_type;
+               port->dev.release = &port_release;
+               device_initialize(&port->dev);
        }
 
        /* set up the endpoint information */
@@ -970,6 +967,10 @@ int usb_serial_probe(struct usb_interface *interface,
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }
+               port->write_fifo = kfifo_alloc(PAGE_SIZE, GFP_KERNEL,
+                       &port->lock);
+               if (IS_ERR(port->write_fifo))
+                       goto probe_error;
                buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
                port->bulk_out_size = buffer_size;
                port->bulk_out_endpointAddress = endpoint->bEndpointAddress;
@@ -1077,15 +1078,10 @@ int usb_serial_probe(struct usb_interface *interface,
        /* register all of the individual ports with the driver core */
        for (i = 0; i < num_ports; ++i) {
                port = serial->port[i];
-               port->dev.parent = &interface->dev;
-               port->dev.driver = NULL;
-               port->dev.bus = &usb_serial_bus_type;
-               port->dev.release = &port_release;
-
                dev_set_name(&port->dev, "ttyUSB%d", port->number);
                dbg ("%s - registering %s", __func__, dev_name(&port->dev));
                port->dev_state = PORT_REGISTERING;
-               retval = device_register(&port->dev);
+               retval = device_add(&port->dev);
                if (retval) {
                        dev_err(&port->dev, "Error registering port device, "
                                "continuing\n");
@@ -1103,39 +1099,7 @@ exit:
        return 0;
 
 probe_error:
-       for (i = 0; i < num_bulk_in; ++i) {
-               port = serial->port[i];
-               if (!port)
-                       continue;
-               usb_free_urb(port->read_urb);
-               kfree(port->bulk_in_buffer);
-       }
-       for (i = 0; i < num_bulk_out; ++i) {
-               port = serial->port[i];
-               if (!port)
-                       continue;
-               usb_free_urb(port->write_urb);
-               kfree(port->bulk_out_buffer);
-       }
-       for (i = 0; i < num_interrupt_in; ++i) {
-               port = serial->port[i];
-               if (!port)
-                       continue;
-               usb_free_urb(port->interrupt_in_urb);
-               kfree(port->interrupt_in_buffer);
-       }
-       for (i = 0; i < num_interrupt_out; ++i) {
-               port = serial->port[i];
-               if (!port)
-                       continue;
-               usb_free_urb(port->interrupt_out_urb);
-               kfree(port->interrupt_out_buffer);
-       }
-
-       /* free up any memory that we allocated */
-       for (i = 0; i < serial->num_port_pointers; ++i)
-               kfree(serial->port[i]);
-       kfree(serial);
+       usb_serial_put(serial);
        return -EIO;
 }
 EXPORT_SYMBOL_GPL(usb_serial_probe);
@@ -1161,10 +1125,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
                if (port) {
                        struct tty_struct *tty = tty_port_tty_get(&port->port);
                        if (tty) {
-                               /* The hangup will occur asynchronously but
-                                  the object refcounts will sort out all the
-                                  cleanup */
-                               tty_hangup(tty);
+                               tty_vhangup(tty);
                                tty_kref_put(tty);
                        }
                        kill_traffic(port);
@@ -1189,8 +1150,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
        }
        serial->type->disconnect(serial);
 
-       /* let the last holder of this object
-        * cause it to be cleaned up */
+       /* let the last holder of this object cause it to be cleaned up */
        usb_serial_put(serial);
        dev_info(dev, "device disconnected\n");
 }
@@ -1204,15 +1164,19 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
 
        serial->suspending = 1;
 
+       if (serial->type->suspend) {
+               r = serial->type->suspend(serial, message);
+               if (r < 0)
+                       goto err_out;
+       }
+
        for (i = 0; i < serial->num_ports; ++i) {
                port = serial->port[i];
                if (port)
                        kill_traffic(port);
        }
 
-       if (serial->type->suspend)
-               r = serial->type->suspend(serial, message);
-
+err_out:
        return r;
 }
 EXPORT_SYMBOL(usb_serial_suspend);
@@ -1246,6 +1210,8 @@ static const struct tty_operations serial_ops = {
        .chars_in_buffer =      serial_chars_in_buffer,
        .tiocmget =             serial_tiocmget,
        .tiocmset =             serial_tiocmset,
+       .shutdown =             serial_release,
+       .install =              serial_install,
        .proc_fops =            &serial_proc_fops,
 };
 
index 6148009..7b5bfc4 100644 (file)
@@ -43,11 +43,10 @@ static struct usb_driver debug_driver = {
        .no_dynamic_id =        1,
 };
 
-static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                                       struct file *filp)
+static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE;
-       return usb_serial_generic_open(tty, port, filp);
+       return usb_serial_generic_open(tty, port);
 }
 
 /* This HW really does not support a serial break, so one will be
index f5d0f64..1aa5d20 100644 (file)
@@ -36,8 +36,7 @@
 #define DRIVER_DESC "USB HandSpring Visor / Palm OS driver"
 
 /* function prototypes for a handspring visor */
-static int  visor_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                       struct file *filp);
+static int  visor_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void visor_close(struct usb_serial_port *port);
 static int  visor_write(struct tty_struct *tty, struct usb_serial_port *port,
                                        const unsigned char *buf, int count);
@@ -273,8 +272,7 @@ static int stats;
 /******************************************************************************
  * Handspring Visor specific driver functions
  ******************************************************************************/
-static int visor_open(struct tty_struct *tty, struct usb_serial_port *port,
-                                                       struct file *filp)
+static int visor_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
        struct visor_private *priv = usb_get_serial_port_data(port);
index 8d126dd..62424ee 100644 (file)
@@ -146,7 +146,7 @@ static int  whiteheat_firmware_attach(struct usb_serial *serial);
 static int  whiteheat_attach(struct usb_serial *serial);
 static void whiteheat_release(struct usb_serial *serial);
 static int  whiteheat_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+                       struct usb_serial_port *port);
 static void whiteheat_close(struct usb_serial_port *port);
 static int  whiteheat_write(struct tty_struct *tty,
                        struct usb_serial_port *port,
@@ -259,7 +259,7 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command,
                                                __u8 *data, __u8 datasize);
 static int firm_open(struct usb_serial_port *port);
 static int firm_close(struct usb_serial_port *port);
-static int firm_setup_port(struct tty_struct *tty);
+static void firm_setup_port(struct tty_struct *tty);
 static int firm_set_rts(struct usb_serial_port *port, __u8 onoff);
 static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff);
 static int firm_set_break(struct usb_serial_port *port, __u8 onoff);
@@ -659,8 +659,7 @@ static void whiteheat_release(struct usb_serial *serial)
        return;
 }
 
-static int whiteheat_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
        int             retval = 0;
 
@@ -1211,7 +1210,7 @@ static int firm_close(struct usb_serial_port *port)
 }
 
 
-static int firm_setup_port(struct tty_struct *tty)
+static void firm_setup_port(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct whiteheat_port_settings port_settings;
@@ -1286,7 +1285,7 @@ static int firm_setup_port(struct tty_struct *tty)
        port_settings.lloop = 0;
 
        /* now send the message to the device */
-       return firm_send_command(port, WHITEHEAT_SETUP_PORT,
+       firm_send_command(port, WHITEHEAT_SETUP_PORT,
                        (__u8 *)&port_settings, sizeof(port_settings));
 }
 
index 2b6e565..ded836b 100644 (file)
@@ -334,7 +334,7 @@ static int datafab_determine_lun(struct us_data *us,
        unsigned char *buf;
        int count = 0, rc;
 
-       if (!us || !info)
+       if (!info)
                return USB_STOR_TRANSPORT_ERROR;
 
        memcpy(command, scommand, 8);
@@ -399,7 +399,7 @@ static int datafab_id_device(struct us_data *us,
        unsigned char *reply;
        int rc;
 
-       if (!us || !info)
+       if (!info)
                return USB_STOR_TRANSPORT_ERROR;
 
        if (info->lun == -1) {
index ec17c96..105d900 100644 (file)
@@ -102,5 +102,5 @@ int usb_stor_huawei_e220_init(struct us_data *us)
                                      USB_TYPE_STANDARD | USB_RECIP_DEVICE,
                                      0x01, 0x0, NULL, 0x0, 1000);
        US_DEBUGP("Huawei mode set result is %d\n", result);
-       return (result ? 0 : -ENODEV);
+       return 0;
 }
index 1c69420..6168596 100644 (file)
@@ -335,7 +335,7 @@ static int jumpshot_id_device(struct us_data *us,
        unsigned char *reply;
        int      rc;
 
-       if (!us || !info)
+       if (!info)
                return USB_STOR_TRANSPORT_ERROR;
 
        command[0] = 0xE0;
index 380233b..80e65f2 100644 (file)
@@ -163,7 +163,7 @@ static void usb_onetouch_pm_hook(struct us_data *us, int action)
                        usb_kill_urb(onetouch->irq);
                        break;
                case US_RESUME:
-                       if (usb_submit_urb(onetouch->irq, GFP_KERNEL) != 0)
+                       if (usb_submit_urb(onetouch->irq, GFP_NOIO) != 0)
                                dev_err(&onetouch->irq->dev->dev,
                                        "usb_submit_urb failed\n");
                        break;
index 7477d41..079ae0f 100644 (file)
@@ -66,13 +66,6 @@ UNUSUAL_DEV(  0x03eb, 0x2002, 0x0100, 0x0100,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_IGNORE_RESIDUE),
 
-/* modified by Tobias Lorenz <tobias.lorenz@gmx.net> */
-UNUSUAL_DEV(  0x03ee, 0x6901, 0x0000, 0x0200,
-               "Mitsumi",
-               "USB FDD",
-               US_SC_DEVICE, US_PR_DEVICE, NULL,
-               US_FL_SINGLE_LUN ),
-
 /* Reported by Rodolfo Quesada <rquesada@roqz.net> */
 UNUSUAL_DEV(  0x03ee, 0x6906, 0x0003, 0x0003,
                "VIA Technologies Inc.",
@@ -233,13 +226,6 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_MAX_SECTORS_64 ),
 
-/* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
-UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
-               "SMSC",
-               "FDC GOLD-2.30",
-               US_SC_DEVICE, US_PR_DEVICE, NULL,
-               US_FL_SINGLE_LUN ),
-
 #ifdef NO_SDDR09
 UNUSUAL_DEV(  0x0436, 0x0005, 0x0100, 0x0100,
                "Microtech",
@@ -664,19 +650,13 @@ UNUSUAL_DEV(  0x055d, 0x2020, 0x0000, 0x0210,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_SINGLE_LUN ),
 
-               
+/* We keep this entry to force the transport; firmware 3.00 and later is ok. */
 UNUSUAL_DEV(  0x057b, 0x0000, 0x0000, 0x0299,
                "Y-E Data",
                "Flashbuster-U",
                US_SC_DEVICE,  US_PR_CB, NULL,
                US_FL_SINGLE_LUN),
 
-UNUSUAL_DEV(  0x057b, 0x0000, 0x0300, 0x9999,
-               "Y-E Data",
-               "Flashbuster-U",
-               US_SC_DEVICE,  US_PR_DEVICE, NULL,
-               US_FL_SINGLE_LUN),
-
 /* Reported by Johann Cardon <johann.cardon@free.fr>
  * This entry is needed only because the device reports
  * bInterfaceClass = 0xff (vendor-specific)
index 60ba631..b62f2bc 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
@@ -28,7 +28,7 @@
 #define USB_SKEL_PRODUCT_ID    0xfff0
 
 /* table of devices that work with this driver */
-static struct usb_device_id skel_table [] = {
+static struct usb_device_id skel_table[] = {
        { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };
@@ -52,15 +52,21 @@ struct usb_skel {
        struct usb_interface    *interface;             /* the interface for this device */
        struct semaphore        limit_sem;              /* limiting the number of writes in progress */
        struct usb_anchor       submitted;              /* in case we need to retract our submissions */
+       struct urb              *bulk_in_urb;           /* the urb to read data with */
        unsigned char           *bulk_in_buffer;        /* the buffer to receive data */
        size_t                  bulk_in_size;           /* the size of the receive buffer */
+       size_t                  bulk_in_filled;         /* number of bytes in the buffer */
+       size_t                  bulk_in_copied;         /* already copied to user space */
        __u8                    bulk_in_endpointAddr;   /* the address of the bulk in endpoint */
        __u8                    bulk_out_endpointAddr;  /* the address of the bulk out endpoint */
        int                     errors;                 /* the last request tanked */
        int                     open_count;             /* count the number of openers */
+       bool                    ongoing_read;           /* a read is going on */
+       bool                    processed_urb;          /* indicates we haven't processed the urb */
        spinlock_t              err_lock;               /* lock for errors */
        struct kref             kref;
        struct mutex            io_mutex;               /* synchronize I/O with disconnect */
+       struct completion       bulk_in_completion;     /* to wait for an ongoing read */
 };
 #define to_skel_dev(d) container_of(d, struct usb_skel, kref)
 
@@ -71,6 +77,7 @@ static void skel_delete(struct kref *kref)
 {
        struct usb_skel *dev = to_skel_dev(kref);
 
+       usb_free_urb(dev->bulk_in_urb);
        usb_put_dev(dev->udev);
        kfree(dev->bulk_in_buffer);
        kfree(dev);
@@ -87,7 +94,7 @@ static int skel_open(struct inode *inode, struct file *file)
 
        interface = usb_find_interface(&skel_driver, subminor);
        if (!interface) {
-               err ("%s - error, can't find device for minor %d",
+               err("%s - error, can't find device for minor %d",
                     __func__, subminor);
                retval = -ENODEV;
                goto exit;
@@ -174,38 +181,190 @@ static int skel_flush(struct file *file, fl_owner_t id)
        return res;
 }
 
-static ssize_t skel_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
+static void skel_read_bulk_callback(struct urb *urb)
 {
        struct usb_skel *dev;
-       int retval;
-       int bytes_read;
+
+       dev = urb->context;
+
+       spin_lock(&dev->err_lock);
+       /* sync/async unlink faults aren't errors */
+       if (urb->status) {
+               if (!(urb->status == -ENOENT ||
+                   urb->status == -ECONNRESET ||
+                   urb->status == -ESHUTDOWN))
+                       err("%s - nonzero write bulk status received: %d",
+                           __func__, urb->status);
+
+               dev->errors = urb->status;
+       } else {
+               dev->bulk_in_filled = urb->actual_length;
+       }
+       dev->ongoing_read = 0;
+       spin_unlock(&dev->err_lock);
+
+       complete(&dev->bulk_in_completion);
+}
+
+static int skel_do_read_io(struct usb_skel *dev, size_t count)
+{
+       int rv;
+
+       /* prepare a read */
+       usb_fill_bulk_urb(dev->bulk_in_urb,
+                       dev->udev,
+                       usb_rcvbulkpipe(dev->udev,
+                               dev->bulk_in_endpointAddr),
+                       dev->bulk_in_buffer,
+                       min(dev->bulk_in_size, count),
+                       skel_read_bulk_callback,
+                       dev);
+       /* tell everybody to leave the URB alone */
+       spin_lock_irq(&dev->err_lock);
+       dev->ongoing_read = 1;
+       spin_unlock_irq(&dev->err_lock);
+
+       /* do it */
+       rv = usb_submit_urb(dev->bulk_in_urb, GFP_KERNEL);
+       if (rv < 0) {
+               err("%s - failed submitting read urb, error %d",
+                       __func__, rv);
+               dev->bulk_in_filled = 0;
+               rv = (rv == -ENOMEM) ? rv : -EIO;
+               spin_lock_irq(&dev->err_lock);
+               dev->ongoing_read = 0;
+               spin_unlock_irq(&dev->err_lock);
+       }
+
+       return rv;
+}
+
+static ssize_t skel_read(struct file *file, char *buffer, size_t count,
+                        loff_t *ppos)
+{
+       struct usb_skel *dev;
+       int rv;
+       bool ongoing_io;
 
        dev = (struct usb_skel *)file->private_data;
 
-       mutex_lock(&dev->io_mutex);
+       /* if we cannot read at all, return EOF */
+       if (!dev->bulk_in_urb || !count)
+               return 0;
+
+       /* no concurrent readers */
+       rv = mutex_lock_interruptible(&dev->io_mutex);
+       if (rv < 0)
+               return rv;
+
        if (!dev->interface) {          /* disconnect() was called */
-               retval = -ENODEV;
+               rv = -ENODEV;
                goto exit;
        }
 
-       /* do a blocking bulk read to get data from the device */
-       retval = usb_bulk_msg(dev->udev,
-                             usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr),
-                             dev->bulk_in_buffer,
-                             min(dev->bulk_in_size, count),
-                             &bytes_read, 10000);
-
-       /* if the read was successful, copy the data to userspace */
-       if (!retval) {
-               if (copy_to_user(buffer, dev->bulk_in_buffer, bytes_read))
-                       retval = -EFAULT;
-               else
-                       retval = bytes_read;
+       /* if IO is under way, we must not touch things */
+retry:
+       spin_lock_irq(&dev->err_lock);
+       ongoing_io = dev->ongoing_read;
+       spin_unlock_irq(&dev->err_lock);
+
+       if (ongoing_io) {
+               /* nonblocking IO shall not wait */
+               if (file->f_flags & O_NONBLOCK) {
+                       rv = -EAGAIN;
+                       goto exit;
+               }
+               /*
+                * IO may take forever
+                * hence wait in an interruptible state
+                */
+               rv = wait_for_completion_interruptible(&dev->bulk_in_completion);
+               if (rv < 0)
+                       goto exit;
+               /*
+                * by waiting we also semiprocessed the urb
+                * we must finish now
+                */
+               dev->bulk_in_copied = 0;
+               dev->processed_urb = 1;
+       }
+
+       if (!dev->processed_urb) {
+               /*
+                * the URB hasn't been processed
+                * do it now
+                */
+               wait_for_completion(&dev->bulk_in_completion);
+               dev->bulk_in_copied = 0;
+               dev->processed_urb = 1;
+       }
+
+       /* errors must be reported */
+       rv = dev->errors;
+       if (rv < 0) {
+               /* any error is reported once */
+               dev->errors = 0;
+               /* to preserve notifications about reset */
+               rv = (rv == -EPIPE) ? rv : -EIO;
+               /* no data to deliver */
+               dev->bulk_in_filled = 0;
+               /* report it */
+               goto exit;
        }
 
+       /*
+        * if the buffer is filled we may satisfy the read
+        * else we need to start IO
+        */
+
+       if (dev->bulk_in_filled) {
+               /* we had read data */
+               size_t available = dev->bulk_in_filled - dev->bulk_in_copied;
+               size_t chunk = min(available, count);
+
+               if (!available) {
+                       /*
+                        * all data has been used
+                        * actual IO needs to be done
+                        */
+                       rv = skel_do_read_io(dev, count);
+                       if (rv < 0)
+                               goto exit;
+                       else
+                               goto retry;
+               }
+               /*
+                * data is available
+                * chunk tells us how much shall be copied
+                */
+
+               if (copy_to_user(buffer,
+                                dev->bulk_in_buffer + dev->bulk_in_copied,
+                                chunk))
+                       rv = -EFAULT;
+               else
+                       rv = chunk;
+
+               dev->bulk_in_copied += chunk;
+
+               /*
+                * if we are asked for more than we have,
+                * we start IO but don't wait
+                */
+               if (available < count)
+                       skel_do_read_io(dev, count - chunk);
+       } else {
+               /* no data in the buffer */
+               rv = skel_do_read_io(dev, count);
+               if (rv < 0)
+                       goto exit;
+               else if (!file->f_flags & O_NONBLOCK)
+                       goto retry;
+               rv = -EAGAIN;
+       }
 exit:
        mutex_unlock(&dev->io_mutex);
-       return retval;
+       return rv;
 }
 
 static void skel_write_bulk_callback(struct urb *urb)
@@ -216,7 +375,7 @@ static void skel_write_bulk_callback(struct urb *urb)
 
        /* sync/async unlink faults aren't errors */
        if (urb->status) {
-               if(!(urb->status == -ENOENT ||
+               if (!(urb->status == -ENOENT ||
                    urb->status == -ECONNRESET ||
                    urb->status == -ESHUTDOWN))
                        err("%s - nonzero write bulk status received: %d",
@@ -233,7 +392,8 @@ static void skel_write_bulk_callback(struct urb *urb)
        up(&dev->limit_sem);
 }
 
-static ssize_t skel_write(struct file *file, const char *user_buffer, size_t count, loff_t *ppos)
+static ssize_t skel_write(struct file *file, const char *user_buffer,
+                         size_t count, loff_t *ppos)
 {
        struct usb_skel *dev;
        int retval = 0;
@@ -247,14 +407,25 @@ static ssize_t skel_write(struct file *file, const char *user_buffer, size_t cou
        if (count == 0)
                goto exit;
 
-       /* limit the number of URBs in flight to stop a user from using up all RAM */
-       if (down_interruptible(&dev->limit_sem)) {
-               retval = -ERESTARTSYS;
-               goto exit;
+       /*
+        * limit the number of URBs in flight to stop a user from using up all
+        * RAM
+        */
+       if (!file->f_flags & O_NONBLOCK) {
+               if (down_interruptible(&dev->limit_sem)) {
+                       retval = -ERESTARTSYS;
+                       goto exit;
+               }
+       } else {
+               if (down_trylock(&dev->limit_sem)) {
+                       retval = -EAGAIN;
+                       goto exit;
+               }
        }
 
        spin_lock_irq(&dev->err_lock);
-       if ((retval = dev->errors) < 0) {
+       retval = dev->errors;
+       if (retval < 0) {
                /* any error is reported once */
                dev->errors = 0;
                /* to preserve notifications about reset */
@@ -271,7 +442,8 @@ static ssize_t skel_write(struct file *file, const char *user_buffer, size_t cou
                goto error;
        }
 
-       buf = usb_buffer_alloc(dev->udev, writesize, GFP_KERNEL, &urb->transfer_dma);
+       buf = usb_buffer_alloc(dev->udev, writesize, GFP_KERNEL,
+                              &urb->transfer_dma);
        if (!buf) {
                retval = -ENOMEM;
                goto error;
@@ -301,11 +473,15 @@ static ssize_t skel_write(struct file *file, const char *user_buffer, size_t cou
        retval = usb_submit_urb(urb, GFP_KERNEL);
        mutex_unlock(&dev->io_mutex);
        if (retval) {
-               err("%s - failed submitting write urb, error %d", __func__, retval);
+               err("%s - failed submitting write urb, error %d", __func__,
+                   retval);
                goto error_unanchor;
        }
 
-       /* release our reference to this urb, the USB core will eventually free it entirely */
+       /*
+        * release our reference to this urb, the USB core will eventually free
+        * it entirely
+        */
        usb_free_urb(urb);
 
 
@@ -343,7 +519,8 @@ static struct usb_class_driver skel_class = {
        .minor_base =   USB_SKEL_MINOR_BASE,
 };
 
-static int skel_probe(struct usb_interface *interface, const struct usb_device_id *id)
+static int skel_probe(struct usb_interface *interface,
+                     const struct usb_device_id *id)
 {
        struct usb_skel *dev;
        struct usb_host_interface *iface_desc;
@@ -363,6 +540,7 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i
        mutex_init(&dev->io_mutex);
        spin_lock_init(&dev->err_lock);
        init_usb_anchor(&dev->submitted);
+       init_completion(&dev->bulk_in_completion);
 
        dev->udev = usb_get_dev(interface_to_usbdev(interface));
        dev->interface = interface;
@@ -384,6 +562,11 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i
                                err("Could not allocate bulk_in_buffer");
                                goto error;
                        }
+                       dev->bulk_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+                       if (!dev->bulk_in_urb) {
+                               err("Could not allocate bulk_in_urb");
+                               goto error;
+                       }
                }
 
                if (!dev->bulk_out_endpointAddr &&
@@ -453,6 +636,7 @@ static void skel_draw_down(struct usb_skel *dev)
        time = usb_wait_anchor_empty_timeout(&dev->submitted, 1000);
        if (!time)
                usb_kill_anchored_urbs(&dev->submitted);
+       usb_kill_urb(dev->bulk_in_urb);
 }
 
 static int skel_suspend(struct usb_interface *intf, pm_message_t message)
@@ -465,7 +649,7 @@ static int skel_suspend(struct usb_interface *intf, pm_message_t message)
        return 0;
 }
 
-static int skel_resume (struct usb_interface *intf)
+static int skel_resume(struct usb_interface *intf)
 {
        return 0;
 }
index 586d350..d6bea3e 100644 (file)
@@ -47,7 +47,7 @@
  *             to an endpoint on a WUSB device that is connected to a
  *             HWA RC.
  *
- *  xfer       Transfer managment -- this is all the code that gets a
+ *  xfer       Transfer management -- this is all the code that gets a
  *             buffer and pushes it to a device (or viceversa). *
  *
  * Some day a lot of this code will be shared between this driver and
index 7305553..b236e69 100644 (file)
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)
 
        netif_wake_queue(net_dev);
 #ifdef i1480u_FLOW_CONTROL
-       result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);;
+       result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);
        if (result < 0) {
                dev_err(dev, "Can't submit notification URB: %d\n", result);
                goto error_notif_urb_submit;
index 11af4cb..9bbb285 100644 (file)
@@ -1275,26 +1275,6 @@ config FB_MATROX_MAVEN
          painting procedures (the secondary head does not use acceleration
          engine).
 
-config FB_MATROX_MULTIHEAD
-       bool "Multihead support"
-       depends on FB_MATROX
-       ---help---
-         Say Y here if you have more than one (supported) Matrox device in
-         your computer and you want to use all of them for different monitors
-         ("multihead"). If you have only one device, you should say N because
-         the driver compiled with Y is larger and a bit slower, especially on
-         ia32 (ix86).
-
-         If you said M to "Matrox unified accelerated driver" and N here, you
-         will still be able to use several Matrox devices simultaneously:
-         insert several instances of the module matroxfb into the kernel
-         with insmod, supplying the parameter "dev=N" where N is 0, 1, etc.
-         for the different Matrox devices. This method is slightly faster but
-         uses 40 KB of kernel memory per Matrox card.
-
-         There is no need for enabling 'Matrox multihead support' if you have
-         only one Matrox card in the box.
-
 config FB_RADEON
        tristate "ATI Radeon display support"
        depends on FB && PCI
@@ -2041,6 +2021,17 @@ config FB_SH7760
          and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
          panels <= 320 pixel horizontal resolution.
 
+config FB_DA8XX
+       tristate "DA8xx/OMAP-L1xx Framebuffer support"
+       depends on FB && ARCH_DAVINCI_DA8XX
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       ---help---
+         This is the frame buffer device driver for the TI LCD controller
+         found on DA8xx/OMAP-L1xx SoCs.
+         If unsure, say N.
+
 config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB
@@ -2117,6 +2108,17 @@ config FB_MB862XX_LIME
        ---help---
          Framebuffer support for Fujitsu Lime GDC on host CPU bus.
 
+config FB_EP93XX
+       tristate "EP93XX frame buffer support"
+       depends on FB && ARCH_EP93XX
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       ---help---
+         Framebuffer driver for the Cirrus Logic EP93XX series of processors.
+         This driver is also available as a module. The module will be called
+         ep93xx-fb.
+
 config FB_PRE_INIT_FB
        bool "Don't reinitialize, use bootloader's GDC/Display configuration"
        depends on FB_MB862XX_LIME
@@ -2124,6 +2126,14 @@ config FB_PRE_INIT_FB
          Select this option if display contents should be inherited as set by
          the bootloader.
 
+config FB_MSM
+       tristate
+       depends on FB && ARCH_MSM
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       default y
+
 config FB_MX3
        tristate "MX3 Framebuffer support"
        depends on FB && MX3_IPU
index 01a819f..80232e1 100644 (file)
@@ -85,6 +85,7 @@ obj-$(CONFIG_FB_Q40)              += q40fb.o
 obj-$(CONFIG_FB_TGA)              += tgafb.o
 obj-$(CONFIG_FB_HP300)            += hpfb.o
 obj-$(CONFIG_FB_G364)             += g364fb.o
+obj-$(CONFIG_FB_EP93XX)                  += ep93xx-fb.o
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
 obj-$(CONFIG_FB_HIT)              += hitfb.o
 obj-$(CONFIG_FB_EPSON1355)       += epson1355fb.o
@@ -126,6 +127,7 @@ obj-$(CONFIG_FB_OMAP)             += omap/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
 obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 obj-$(CONFIG_FB_MB862XX)         += mb862xx/
+obj-$(CONFIG_FB_MSM)              += msm/
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
@@ -136,6 +138,7 @@ obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_BF54X_LQ043)     += bf54x-lq043fb.o
 obj-$(CONFIG_FB_BFIN_T350MCQB)   += bfin-t350mcqb-fb.o
 obj-$(CONFIG_FB_MX3)             += mx3fb.o
+obj-$(CONFIG_FB_DA8XX)           += da8xx-fb.o
 
 # the test framebuffer is last
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
index 63d3739..913b4a4 100644 (file)
 #endif
 
 #define PRINTKI(fmt, args...)  printk(KERN_INFO "atyfb: " fmt, ## args)
-#define PRINTKE(fmt, args...)   printk(KERN_ERR "atyfb: " fmt, ## args)
+#define PRINTKE(fmt, args...)  printk(KERN_ERR "atyfb: " fmt, ## args)
 
 #if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
 defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
@@ -188,24 +188,23 @@ u32 aty_ld_lcd(int index, const struct atyfb_par *par)
  */
 static void ATIReduceRatio(int *Numerator, int *Denominator)
 {
-    int Multiplier, Divider, Remainder;
+       int Multiplier, Divider, Remainder;
 
-    Multiplier = *Numerator;
-    Divider = *Denominator;
+       Multiplier = *Numerator;
+       Divider = *Denominator;
 
-    while ((Remainder = Multiplier % Divider))
-    {
-        Multiplier = Divider;
-        Divider = Remainder;
-    }
+       while ((Remainder = Multiplier % Divider)) {
+               Multiplier = Divider;
+               Divider = Remainder;
+       }
 
-    *Numerator /= Divider;
-    *Denominator /= Divider;
+       *Numerator /= Divider;
+       *Denominator /= Divider;
 }
 #endif
-    /*
    *  The Hardware parameters for each card
    */
+/*
* The Hardware parameters for each card
+ */
 
 struct pci_mmap_map {
        unsigned long voff;
@@ -223,17 +222,19 @@ static struct fb_fix_screeninfo atyfb_fix __devinitdata = {
        .ypanstep       = 1,
 };
 
-    /*
    *  Frame buffer device API
    */
+/*
* Frame buffer device API
+ */
 
 static int atyfb_open(struct fb_info *info, int user);
 static int atyfb_release(struct fb_info *info, int user);
-static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info);
+static int atyfb_check_var(struct fb_var_screeninfo *var,
+                          struct fb_info *info);
 static int atyfb_set_par(struct fb_info *info);
 static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-       u_int transp, struct fb_info *info);
-static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
+                          u_int transp, struct fb_info *info);
+static int atyfb_pan_display(struct fb_var_screeninfo *var,
+                            struct fb_info *info);
 static int atyfb_blank(int blank, struct fb_info *info);
 static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg);
 #ifdef __sparc__
@@ -241,9 +242,9 @@ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma);
 #endif
 static int atyfb_sync(struct fb_info *info);
 
-    /*
    *  Internal routines
    */
+/*
* Internal routines
+ */
 
 static int aty_init(struct fb_info *info);
 
@@ -254,8 +255,11 @@ static int store_video_par(char *videopar, unsigned char m64_num);
 static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc);
 
 static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc);
-static int aty_var_to_crtc(const struct fb_info *info, const struct fb_var_screeninfo *var, struct crtc *crtc);
-static int aty_crtc_to_var(const struct crtc *crtc, struct fb_var_screeninfo *var);
+static int aty_var_to_crtc(const struct fb_info *info,
+                          const struct fb_var_screeninfo *var,
+                          struct crtc *crtc);
+static int aty_crtc_to_var(const struct crtc *crtc,
+                          struct fb_var_screeninfo *var);
 static void set_off_pitch(struct atyfb_par *par, const struct fb_info *info);
 #ifdef CONFIG_PPC
 static int read_aty_sense(const struct atyfb_par *par);
@@ -264,9 +268,9 @@ static int read_aty_sense(const struct atyfb_par *par);
 static DEFINE_MUTEX(reboot_lock);
 static struct fb_info *reboot_info;
 
-    /*
    *  Interface used by the world
    */
+/*
* Interface used by the world
+ */
 
 static struct fb_var_screeninfo default_var = {
        /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
@@ -452,14 +456,14 @@ static int __devinit correct_chipset(struct atyfb_par *par)
        type = chip_id & CFG_CHIP_TYPE;
        rev = (chip_id & CFG_CHIP_REV) >> 24;
 
-       switch(par->pci_id) {
+       switch (par->pci_id) {
 #ifdef CONFIG_FB_ATY_GX
        case PCI_CHIP_MACH64GX:
-               if(type != 0x00d7)
+               if (type != 0x00d7)
                        return -ENODEV;
                break;
        case PCI_CHIP_MACH64CX:
-               if(type != 0x0057)
+               if (type != 0x0057)
                        return -ENODEV;
                break;
 #endif
@@ -564,7 +568,8 @@ static char *aty_xl_ram[8] __devinitdata = {
 };
 #endif /* CONFIG_FB_ATY_CT */
 
-static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *par)
+static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var,
+                             struct atyfb_par *par)
 {
        u32 pixclock = var->pixclock;
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
@@ -572,7 +577,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *p
        par->pll.ct.xres = 0;
        if (par->lcd_table != 0) {
                lcd_on_off = aty_ld_lcd(LCD_GEN_CNTL, par);
-               if(lcd_on_off & LCD_ON) {
+               if (lcd_on_off & LCD_ON) {
                        par->pll.ct.xres = var->xres;
                        pixclock = par->lcd_pixclock;
                }
@@ -584,7 +589,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *p
 #if defined(CONFIG_PPC)
 
 /*
- *  Apple monitor sense
+ * Apple monitor sense
  */
 
 static int __devinit read_aty_sense(const struct atyfb_par *par)
@@ -625,16 +630,16 @@ static int __devinit read_aty_sense(const struct atyfb_par *par)
 /* ------------------------------------------------------------------------- */
 
 /*
- *  CRTC programming
+ * CRTC programming
  */
 
 static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
 {
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
        if (par->lcd_table != 0) {
-               if(!M64_HAS(LT_LCD_REGS)) {
-                   crtc->lcd_index = aty_ld_le32(LCD_INDEX, par);
-                   aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
+               if (!M64_HAS(LT_LCD_REGS)) {
+                       crtc->lcd_index = aty_ld_le32(LCD_INDEX, par);
+                       aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
                }
                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par);
                crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par);
@@ -642,7 +647,7 @@ static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
 
                /* switch to non shadow registers */
                aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl &
-                    ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
+                          ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
 
                /* save stretching */
                crtc->horz_stretching = aty_ld_lcd(HORZ_STRETCHING, par);
@@ -663,7 +668,7 @@ static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
        if (par->lcd_table != 0) {
                /* switch to shadow registers */
                aty_st_lcd(LCD_GEN_CNTL, (crtc->lcd_gen_cntl & ~CRTC_RW_SELECT) |
-                       SHADOW_EN | SHADOW_RW_EN, par);
+                          SHADOW_EN | SHADOW_RW_EN, par);
 
                crtc->shadow_h_tot_disp = aty_ld_le32(CRTC_H_TOTAL_DISP, par);
                crtc->shadow_h_sync_strt_wid = aty_ld_le32(CRTC_H_SYNC_STRT_WID, par);
@@ -680,21 +685,20 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
        if (par->lcd_table != 0) {
                /* stop CRTC */
-               aty_st_le32(CRTC_GEN_CNTL, crtc->gen_cntl & ~(CRTC_EXT_DISP_EN | CRTC_EN), par);
+               aty_st_le32(CRTC_GEN_CNTL, crtc->gen_cntl &
+                           ~(CRTC_EXT_DISP_EN | CRTC_EN), par);
 
                /* update non-shadow registers first */
                aty_st_lcd(CNFG_PANEL, crtc->lcd_config_panel, par);
                aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl &
-                       ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
+                          ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
 
                /* temporarily disable stretching */
-               aty_st_lcd(HORZ_STRETCHING,
-                       crtc->horz_stretching &
-                       ~(HORZ_STRETCH_MODE | HORZ_STRETCH_EN), par);
-               aty_st_lcd(VERT_STRETCHING,
-                       crtc->vert_stretching &
-                       ~(VERT_STRETCH_RATIO1 | VERT_STRETCH_RATIO2 |
-                       VERT_STRETCH_USE0 | VERT_STRETCH_EN), par);
+               aty_st_lcd(HORZ_STRETCHING, crtc->horz_stretching &
+                          ~(HORZ_STRETCH_MODE | HORZ_STRETCH_EN), par);
+               aty_st_lcd(VERT_STRETCHING, crtc->vert_stretching &
+                          ~(VERT_STRETCH_RATIO1 | VERT_STRETCH_RATIO2 |
+                            VERT_STRETCH_USE0 | VERT_STRETCH_EN), par);
        }
 #endif
        /* turn off CRT */
@@ -702,17 +706,19 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
 
        DPRINTK("setting up CRTC\n");
        DPRINTK("set primary CRT to %ix%i %c%c composite %c\n",
-           ((((crtc->h_tot_disp>>16) & 0xff) + 1)<<3), (((crtc->v_tot_disp>>16) & 0x7ff) + 1),
-           (crtc->h_sync_strt_wid & 0x200000)?'N':'P', (crtc->v_sync_strt_wid & 0x200000)?'N':'P',
-           (crtc->gen_cntl & CRTC_CSYNC_EN)?'P':'N');
-
-       DPRINTK("CRTC_H_TOTAL_DISP: %x\n",crtc->h_tot_disp);
-       DPRINTK("CRTC_H_SYNC_STRT_WID: %x\n",crtc->h_sync_strt_wid);
-       DPRINTK("CRTC_V_TOTAL_DISP: %x\n",crtc->v_tot_disp);
-       DPRINTK("CRTC_V_SYNC_STRT_WID: %x\n",crtc->v_sync_strt_wid);
+               ((((crtc->h_tot_disp >> 16) & 0xff) + 1) << 3),
+               (((crtc->v_tot_disp >> 16) & 0x7ff) + 1),
+               (crtc->h_sync_strt_wid & 0x200000) ? 'N' : 'P',
+               (crtc->v_sync_strt_wid & 0x200000) ? 'N' : 'P',
+               (crtc->gen_cntl & CRTC_CSYNC_EN) ? 'P' : 'N');
+
+       DPRINTK("CRTC_H_TOTAL_DISP: %x\n", crtc->h_tot_disp);
+       DPRINTK("CRTC_H_SYNC_STRT_WID: %x\n", crtc->h_sync_strt_wid);
+       DPRINTK("CRTC_V_TOTAL_DISP: %x\n", crtc->v_tot_disp);
+       DPRINTK("CRTC_V_SYNC_STRT_WID: %x\n", crtc->v_sync_strt_wid);
        DPRINTK("CRTC_OFF_PITCH: %x\n", crtc->off_pitch);
        DPRINTK("CRTC_VLINE_CRNT_VLINE: %x\n", crtc->vline_crnt_vline);
-       DPRINTK("CRTC_GEN_CNTL: %x\n",crtc->gen_cntl);
+       DPRINTK("CRTC_GEN_CNTL: %x\n", crtc->gen_cntl);
 
        aty_st_le32(CRTC_H_TOTAL_DISP, crtc->h_tot_disp, par);
        aty_st_le32(CRTC_H_SYNC_STRT_WID, crtc->h_sync_strt_wid, par);
@@ -732,16 +738,22 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
        if (par->lcd_table != 0) {
                /* switch to shadow registers */
                aty_st_lcd(LCD_GEN_CNTL, (crtc->lcd_gen_cntl & ~CRTC_RW_SELECT) |
-                       (SHADOW_EN | SHADOW_RW_EN), par);
+                          SHADOW_EN | SHADOW_RW_EN, par);
 
                DPRINTK("set shadow CRT to %ix%i %c%c\n",
-                   ((((crtc->shadow_h_tot_disp>>16) & 0xff) + 1)<<3), (((crtc->shadow_v_tot_disp>>16) & 0x7ff) + 1),
-                   (crtc->shadow_h_sync_strt_wid & 0x200000)?'N':'P', (crtc->shadow_v_sync_strt_wid & 0x200000)?'N':'P');
-
-               DPRINTK("SHADOW CRTC_H_TOTAL_DISP: %x\n", crtc->shadow_h_tot_disp);
-               DPRINTK("SHADOW CRTC_H_SYNC_STRT_WID: %x\n", crtc->shadow_h_sync_strt_wid);
-               DPRINTK("SHADOW CRTC_V_TOTAL_DISP: %x\n", crtc->shadow_v_tot_disp);
-               DPRINTK("SHADOW CRTC_V_SYNC_STRT_WID: %x\n", crtc->shadow_v_sync_strt_wid);
+                       ((((crtc->shadow_h_tot_disp >> 16) & 0xff) + 1) << 3),
+                       (((crtc->shadow_v_tot_disp >> 16) & 0x7ff) + 1),
+                       (crtc->shadow_h_sync_strt_wid & 0x200000) ? 'N' : 'P',
+                       (crtc->shadow_v_sync_strt_wid & 0x200000) ? 'N' : 'P');
+
+               DPRINTK("SHADOW CRTC_H_TOTAL_DISP: %x\n",
+                       crtc->shadow_h_tot_disp);
+               DPRINTK("SHADOW CRTC_H_SYNC_STRT_WID: %x\n",
+                       crtc->shadow_h_sync_strt_wid);
+               DPRINTK("SHADOW CRTC_V_TOTAL_DISP: %x\n",
+                       crtc->shadow_v_tot_disp);
+               DPRINTK("SHADOW CRTC_V_SYNC_STRT_WID: %x\n",
+                       crtc->shadow_v_sync_strt_wid);
 
                aty_st_le32(CRTC_H_TOTAL_DISP, crtc->shadow_h_tot_disp, par);
                aty_st_le32(CRTC_H_SYNC_STRT_WID, crtc->shadow_h_sync_strt_wid, par);
@@ -752,16 +764,16 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
                DPRINTK("LCD_GEN_CNTL: %x\n", crtc->lcd_gen_cntl);
                DPRINTK("HORZ_STRETCHING: %x\n", crtc->horz_stretching);
                DPRINTK("VERT_STRETCHING: %x\n", crtc->vert_stretching);
-               if(!M64_HAS(LT_LCD_REGS))
-                   DPRINTK("EXT_VERT_STRETCH: %x\n", crtc->ext_vert_stretch);
+               if (!M64_HAS(LT_LCD_REGS))
+                       DPRINTK("EXT_VERT_STRETCH: %x\n", crtc->ext_vert_stretch);
 
                aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl, par);
                aty_st_lcd(HORZ_STRETCHING, crtc->horz_stretching, par);
                aty_st_lcd(VERT_STRETCHING, crtc->vert_stretching, par);
-               if(!M64_HAS(LT_LCD_REGS)) {
-                   aty_st_lcd(EXT_VERT_STRETCH, crtc->ext_vert_stretch, par);
-                   aty_ld_le32(LCD_INDEX, par);
-                   aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
+               if (!M64_HAS(LT_LCD_REGS)) {
+                       aty_st_lcd(EXT_VERT_STRETCH, crtc->ext_vert_stretch, par);
+                       aty_ld_le32(LCD_INDEX, par);
+                       aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
                }
        }
 #endif /* CONFIG_FB_ATY_GENERIC_LCD */
@@ -779,7 +791,8 @@ static u32 calc_line_length(struct atyfb_par *par, u32 vxres, u32 bpp)
 }
 
 static int aty_var_to_crtc(const struct fb_info *info,
-       const struct fb_var_screeninfo *var, struct crtc *crtc)
+                          const struct fb_var_screeninfo *var,
+                          struct crtc *crtc)
 {
        struct atyfb_par *par = (struct atyfb_par *) info->par;
        u32 xres, yres, vxres, vyres, xoffset, yoffset, bpp;
@@ -814,34 +827,32 @@ static int aty_var_to_crtc(const struct fb_info *info,
        if (bpp <= 8) {
                bpp = 8;
                pix_width = CRTC_PIX_WIDTH_8BPP;
-               dp_pix_width =
-                   HOST_8BPP | SRC_8BPP | DST_8BPP |
-                   BYTE_ORDER_LSB_TO_MSB;
+               dp_pix_width = HOST_8BPP | SRC_8BPP | DST_8BPP |
+                       BYTE_ORDER_LSB_TO_MSB;
                dp_chain_mask = DP_CHAIN_8BPP;
        } else if (bpp <= 15) {
                bpp = 16;
                pix_width = CRTC_PIX_WIDTH_15BPP;
                dp_pix_width = HOST_15BPP | SRC_15BPP | DST_15BPP |
-                   BYTE_ORDER_LSB_TO_MSB;
+                       BYTE_ORDER_LSB_TO_MSB;
                dp_chain_mask = DP_CHAIN_15BPP;
        } else if (bpp <= 16) {
                bpp = 16;
                pix_width = CRTC_PIX_WIDTH_16BPP;
                dp_pix_width = HOST_16BPP | SRC_16BPP | DST_16BPP |
-                   BYTE_ORDER_LSB_TO_MSB;
+                       BYTE_ORDER_LSB_TO_MSB;
                dp_chain_mask = DP_CHAIN_16BPP;
        } else if (bpp <= 24 && M64_HAS(INTEGRATED)) {
                bpp = 24;
                pix_width = CRTC_PIX_WIDTH_24BPP;
-               dp_pix_width =
-                   HOST_8BPP | SRC_8BPP | DST_8BPP |
-                   BYTE_ORDER_LSB_TO_MSB;
+               dp_pix_width = HOST_8BPP | SRC_8BPP | DST_8BPP |
+                       BYTE_ORDER_LSB_TO_MSB;
                dp_chain_mask = DP_CHAIN_24BPP;
        } else if (bpp <= 32) {
                bpp = 32;
                pix_width = CRTC_PIX_WIDTH_32BPP;
                dp_pix_width = HOST_32BPP | SRC_32BPP | DST_32BPP |
-                   BYTE_ORDER_LSB_TO_MSB;
+                       BYTE_ORDER_LSB_TO_MSB;
                dp_chain_mask = DP_CHAIN_32BPP;
        } else
                FAIL("invalid bpp");
@@ -854,9 +865,9 @@ static int aty_var_to_crtc(const struct fb_info *info,
        h_sync_pol = sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1;
        v_sync_pol = sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1;
 
-       if((xres > 1600) || (yres > 1200)) {
+       if ((xres > 1600) || (yres > 1200)) {
                FAIL("MACH64 chips are designed for max 1600x1200\n"
-               "select anoter resolution.");
+                    "select anoter resolution.");
        }
        h_sync_strt = h_disp + var->right_margin;
        h_sync_end = h_sync_strt + var->hsync_len;
@@ -869,11 +880,12 @@ static int aty_var_to_crtc(const struct fb_info *info,
 
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
        if (par->lcd_table != 0) {
-               if(!M64_HAS(LT_LCD_REGS)) {
-                   u32 lcd_index = aty_ld_le32(LCD_INDEX, par);
-                   crtc->lcd_index = lcd_index &
-                       ~(LCD_INDEX_MASK | LCD_DISPLAY_DIS | LCD_SRC_SEL | CRTC2_DISPLAY_DIS);
-                   aty_st_le32(LCD_INDEX, lcd_index, par);
+               if (!M64_HAS(LT_LCD_REGS)) {
+                       u32 lcd_index = aty_ld_le32(LCD_INDEX, par);
+                       crtc->lcd_index = lcd_index &
+                               ~(LCD_INDEX_MASK | LCD_DISPLAY_DIS |
+                                 LCD_SRC_SEL | CRTC2_DISPLAY_DIS);
+                       aty_st_le32(LCD_INDEX, lcd_index, par);
                }
 
                if (!M64_HAS(MOBIL_BUS))
@@ -888,12 +900,14 @@ static int aty_var_to_crtc(const struct fb_info *info,
                        USE_SHADOWED_ROWCUR | SHADOW_EN | SHADOW_RW_EN);
                crtc->lcd_gen_cntl |= DONT_SHADOW_VPAR | LOCK_8DOT;
 
-               if((crtc->lcd_gen_cntl & LCD_ON) &&
-                       ((xres > par->lcd_width) || (yres > par->lcd_height))) {
-                       /* We cannot display the mode on the LCD. If the CRT is enabled
-                          we can turn off the LCD.
-                          If the CRT is off, it isn't a good idea to switch it on; we don't
-                          know if one is connected. So it's better to fail then.
+               if ((crtc->lcd_gen_cntl & LCD_ON) &&
+                   ((xres > par->lcd_width) || (yres > par->lcd_height))) {
+                       /*
+                        * We cannot display the mode on the LCD. If the CRT is
+                        * enabled we can turn off the LCD.
+                        * If the CRT is off, it isn't a good idea to switch it
+                        * on; we don't know if one is connected. So it's better
+                        * to fail then.
                         */
                        if (crtc->lcd_gen_cntl & CRT_ON) {
                                if (!(var->activate & FB_ACTIVATE_TEST))
@@ -916,17 +930,18 @@ static int aty_var_to_crtc(const struct fb_info *info,
 
                vmode &= ~(FB_VMODE_DOUBLE | FB_VMODE_INTERLACED);
 
-               /* This is horror! When we simulate, say 640x480 on an 800x600
-                  LCD monitor, the CRTC should be programmed 800x600 values for
-                  the non visible part, but 640x480 for the visible part.
-                  This code has been tested on a laptop with it's 1400x1050 LCD
-                  monitor and a conventional monitor both switched on.
-                  Tested modes: 1280x1024, 1152x864, 1024x768, 800x600,
-                   works with little glitches also with DOUBLESCAN modes
+               /*
+                * This is horror! When we simulate, say 640x480 on an 800x600
+                * LCD monitor, the CRTC should be programmed 800x600 values for
+                * the non visible part, but 640x480 for the visible part.
+                * This code has been tested on a laptop with it's 1400x1050 LCD
+                * monitor and a conventional monitor both switched on.
+                * Tested modes: 1280x1024, 1152x864, 1024x768, 800x600,
+                * works with little glitches also with DOUBLESCAN modes
                 */
                if (yres < par->lcd_height) {
                        VScan = par->lcd_height / yres;
-                       if(VScan > 1) {
+                       if (VScan > 1) {
                                VScan = 2;
                                vmode |= FB_VMODE_DOUBLE;
                        }
@@ -952,7 +967,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
        FAIL_MAX("h_disp too large", h_disp, 0xff);
        FAIL_MAX("h_sync_strt too large", h_sync_strt, 0x1ff);
        /*FAIL_MAX("h_sync_wid too large", h_sync_wid, 0x1f);*/
-       if(h_sync_wid > 0x1f)
+       if (h_sync_wid > 0x1f)
                h_sync_wid = 0x1f;
        FAIL_MAX("h_total too large", h_total, 0x1ff);
 
@@ -978,7 +993,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
        FAIL_MAX("v_disp too large", v_disp, 0x7ff);
        FAIL_MAX("v_sync_stsrt too large", v_sync_strt, 0x7ff);
        /*FAIL_MAX("v_sync_wid too large", v_sync_wid, 0x1f);*/
-       if(v_sync_wid > 0x1f)
+       if (v_sync_wid > 0x1f)
                v_sync_wid = 0x1f;
        FAIL_MAX("v_total too large", v_total, 0x7ff);
 
@@ -995,11 +1010,13 @@ static int aty_var_to_crtc(const struct fb_info *info,
                ((line_length / bpp) << 22);
        crtc->vline_crnt_vline = 0;
 
-       crtc->h_tot_disp = h_total | (h_disp<<16);
-       crtc->h_sync_strt_wid = (h_sync_strt & 0xff) | (h_sync_dly<<8) |
-               ((h_sync_strt & 0x100)<<4) | (h_sync_wid<<16) | (h_sync_pol<<21);
-       crtc->v_tot_disp = v_total | (v_disp<<16);
-       crtc->v_sync_strt_wid = v_sync_strt | (v_sync_wid<<16) | (v_sync_pol<<21);
+       crtc->h_tot_disp = h_total | (h_disp << 16);
+       crtc->h_sync_strt_wid = (h_sync_strt & 0xff) | (h_sync_dly << 8) |
+               ((h_sync_strt & 0x100) << 4) | (h_sync_wid << 16) |
+               (h_sync_pol << 21);
+       crtc->v_tot_disp = v_total | (v_disp << 16);
+       crtc->v_sync_strt_wid = v_sync_strt | (v_sync_wid << 16) |
+               (v_sync_pol << 21);
 
        /* crtc->gen_cntl = aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC_PRESERVED_MASK; */
        crtc->gen_cntl = CRTC_EXT_DISP_EN | CRTC_EN | pix_width | c_sync;
@@ -1014,13 +1031,15 @@ static int aty_var_to_crtc(const struct fb_info *info,
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
        if (par->lcd_table != 0) {
                vdisplay = yres;
-               if(vmode & FB_VMODE_DOUBLE)
+               if (vmode & FB_VMODE_DOUBLE)
                        vdisplay <<= 1;
                crtc->gen_cntl &= ~(CRTC2_EN | CRTC2_PIX_WIDTH);
                crtc->lcd_gen_cntl &= ~(HORZ_DIVBY2_EN | DIS_HOR_CRT_DIVBY2 |
-                       /*TVCLK_PM_EN | VCLK_DAC_PM_EN |*/
-                       USE_SHADOWED_VEND | USE_SHADOWED_ROWCUR | SHADOW_EN | SHADOW_RW_EN);
-               crtc->lcd_gen_cntl |= (DONT_SHADOW_VPAR/* | LOCK_8DOT*/);
+                                       /*TVCLK_PM_EN | VCLK_DAC_PM_EN |*/
+                                       USE_SHADOWED_VEND |
+                                       USE_SHADOWED_ROWCUR |
+                                       SHADOW_EN | SHADOW_RW_EN);
+               crtc->lcd_gen_cntl |= DONT_SHADOW_VPAR/* | LOCK_8DOT*/;
 
                /* MOBILITY M1 tested, FIXME: LT */
                crtc->horz_stretching = aty_ld_lcd(HORZ_STRETCHING, par);
@@ -1028,28 +1047,32 @@ static int aty_var_to_crtc(const struct fb_info *info,
                        crtc->ext_vert_stretch = aty_ld_lcd(EXT_VERT_STRETCH, par) &
                                ~(AUTO_VERT_RATIO | VERT_STRETCH_MODE | VERT_STRETCH_RATIO3);
 
-               crtc->horz_stretching &=
-                       ~(HORZ_STRETCH_RATIO | HORZ_STRETCH_LOOP | AUTO_HORZ_RATIO |
-                       HORZ_STRETCH_MODE | HORZ_STRETCH_EN);
+               crtc->horz_stretching &= ~(HORZ_STRETCH_RATIO |
+                                          HORZ_STRETCH_LOOP | AUTO_HORZ_RATIO |
+                                          HORZ_STRETCH_MODE | HORZ_STRETCH_EN);
                if (xres < par->lcd_width && crtc->lcd_gen_cntl & LCD_ON) {
                        do {
                                /*
-                               * The horizontal blender misbehaves when HDisplay is less than a
-                               * a certain threshold (440 for a 1024-wide panel).  It doesn't
-                               * stretch such modes enough.  Use pixel replication instead of
-                               * blending to stretch modes that can be made to exactly fit the
-                               * panel width.  The undocumented "NoLCDBlend" option allows the
-                               * pixel-replicated mode to be slightly wider or narrower than the
-                               * panel width.  It also causes a mode that is exactly half as wide
-                               * as the panel to be pixel-replicated, rather than blended.
-                               */
+                                * The horizontal blender misbehaves when
+                                * HDisplay is less than a certain threshold
+                                * (440 for a 1024-wide panel).  It doesn't
+                                * stretch such modes enough.  Use pixel
+                                * replication instead of blending to stretch
+                                * modes that can be made to exactly fit the
+                                * panel width.  The undocumented "NoLCDBlend"
+                                * option allows the pixel-replicated mode to
+                                * be slightly wider or narrower than the
+                                * panel width.  It also causes a mode that is
+                                * exactly half as wide as the panel to be
+                                * pixel-replicated, rather than blended.
+                                */
                                int HDisplay  = xres & ~7;
                                int nStretch  = par->lcd_width / HDisplay;
                                int Remainder = par->lcd_width % HDisplay;
 
                                if ((!Remainder && ((nStretch > 2))) ||
-                                       (((HDisplay * 16) / par->lcd_width) < 7)) {
-                                       static const char StretchLoops[] = {10, 12, 13, 15, 16};
+                                   (((HDisplay * 16) / par->lcd_width) < 7)) {
+                                       static const char StretchLoops[] = { 10, 12, 13, 15, 16 };
                                        int horz_stretch_loop = -1, BestRemainder;
                                        int Numerator = HDisplay, Denominator = par->lcd_width;
                                        int Index = 5;
@@ -1098,12 +1121,12 @@ static int aty_var_to_crtc(const struct fb_info *info,
                                (((vdisplay * (VERT_STRETCH_RATIO0 + 1)) / par->lcd_height) & VERT_STRETCH_RATIO0));
 
                        if (!M64_HAS(LT_LCD_REGS) &&
-                           xres <= (M64_HAS(MOBIL_BUS)?1024:800))
+                           xres <= (M64_HAS(MOBIL_BUS) ? 1024 : 800))
                                crtc->ext_vert_stretch |= VERT_STRETCH_MODE;
                } else {
                        /*
-                        * Don't use vertical blending if the mode is too wide or not
-                        * vertically stretched.
+                        * Don't use vertical blending if the mode is too wide
+                        * or not vertically stretched.
                         */
                        crtc->vert_stretching = 0;
                }
@@ -1125,11 +1148,11 @@ static int aty_var_to_crtc(const struct fb_info *info,
        return 0;
 }
 
-static int aty_crtc_to_var(const struct crtc *crtc, struct fb_var_screeninfo *var)
+static int aty_crtc_to_var(const struct crtc *crtc,
+                          struct fb_var_screeninfo *var)
 {
        u32 xres, yres, bpp, left, right, upper, lower, hslen, vslen, sync;
-       u32 h_total, h_disp, h_sync_strt, h_sync_dly, h_sync_wid,
-           h_sync_pol;
+       u32 h_total, h_disp, h_sync_strt, h_sync_dly, h_sync_wid, h_sync_pol;
        u32 v_total, v_disp, v_sync_strt, v_sync_wid, v_sync_pol, c_sync;
        u32 pix_width;
        u32 double_scan, interlace;
@@ -1161,8 +1184,8 @@ static int aty_crtc_to_var(const struct crtc *crtc, struct fb_var_screeninfo *va
        lower = v_sync_strt - v_disp;
        vslen = v_sync_wid;
        sync = (h_sync_pol ? 0 : FB_SYNC_HOR_HIGH_ACT) |
-           (v_sync_pol ? 0 : FB_SYNC_VERT_HIGH_ACT) |
-           (c_sync ? FB_SYNC_COMP_HIGH_ACT : 0);
+               (v_sync_pol ? 0 : FB_SYNC_VERT_HIGH_ACT) |
+               (c_sync ? FB_SYNC_COMP_HIGH_ACT : 0);
 
        switch (pix_width) {
 #if 0
@@ -1252,20 +1275,21 @@ static int aty_crtc_to_var(const struct crtc *crtc, struct fb_var_screeninfo *va
        var->vsync_len = vslen;
        var->sync = sync;
        var->vmode = FB_VMODE_NONINTERLACED;
-       /* In double scan mode, the vertical parameters are doubled, so we need to
-          half them to get the right values.
-          In interlaced mode the values are already correct, so no correction is
-          necessary.
+       /*
+        * In double scan mode, the vertical parameters are doubled,
+        * so we need to halve them to get the right values.
+        * In interlaced mode the values are already correct,
+        * so no correction is necessary.
         */
        if (interlace)
                var->vmode = FB_VMODE_INTERLACED;
 
        if (double_scan) {
                var->vmode = FB_VMODE_DOUBLE;
-               var->yres>>=1;
-               var->upper_margin>>=1;
-               var->lower_margin>>=1;
-               var->vsync_len>>=1;
+               var->yres >>= 1;
+               var->upper_margin >>= 1;
+               var->lower_margin >>= 1;
+               var->vsync_len >>= 1;
        }
 
        return 0;
@@ -1286,7 +1310,8 @@ static int atyfb_set_par(struct fb_info *info)
        if (par->asleep)
                return 0;
 
-       if ((err = aty_var_to_crtc(info, var, &par->crtc)))
+       err = aty_var_to_crtc(info, var, &par->crtc);
+       if (err)
                return err;
 
        pixclock = atyfb_get_pixclock(var, par);
@@ -1295,7 +1320,9 @@ static int atyfb_set_par(struct fb_info *info)
                PRINTKE("Invalid pixclock\n");
                return -EINVAL;
        } else {
-               if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &par->pll)))
+               err = par->pll_ops->var_to_pll(info, pixclock,
+                                              var->bits_per_pixel, &par->pll);
+               if (err)
                        return err;
        }
 
@@ -1313,22 +1340,23 @@ static int atyfb_set_par(struct fb_info *info)
                wait_for_idle(par);
 
        aty_set_crtc(par, &par->crtc);
-       par->dac_ops->set_dac(info, &par->pll, var->bits_per_pixel, par->accel_flags);
+       par->dac_ops->set_dac(info, &par->pll,
+                             var->bits_per_pixel, par->accel_flags);
        par->pll_ops->set_pll(info, &par->pll);
 
 #ifdef DEBUG
-       if(par->pll_ops && par->pll_ops->pll_to_var)
-               pixclock_in_ps = par->pll_ops->pll_to_var(info, &(par->pll));
+       if (par->pll_ops && par->pll_ops->pll_to_var)
+               pixclock_in_ps = par->pll_ops->pll_to_var(info, &par->pll);
        else
                pixclock_in_ps = 0;
 
-       if(0 == pixclock_in_ps) {
+       if (0 == pixclock_in_ps) {
                PRINTKE("ALERT ops->pll_to_var get 0\n");
                pixclock_in_ps = pixclock;
        }
 
        memset(&debug, 0, sizeof(debug));
-       if(!aty_crtc_to_var(&(par->crtc), &debug)) {
+       if (!aty_crtc_to_var(&par->crtc, &debug)) {
                u32 hSync, vRefresh;
                u32 h_disp, h_sync_strt, h_sync_end, h_total;
                u32 v_disp, v_sync_strt, v_sync_end, v_total;
@@ -1344,16 +1372,20 @@ static int atyfb_set_par(struct fb_info *info)
 
                hSync = 1000000000 / (pixclock_in_ps * h_total);
                vRefresh = (hSync * 1000) / v_total;
-               if (par->crtc.gen_cntl & CRTC_INTERLACE_EN)
-               vRefresh *= 2;
-               if (par->crtc.gen_cntl & CRTC_DBL_SCAN_EN)
-               vRefresh /= 2;
+               if (par->crtc.gen_cntl & CRTC_INTERLACE_EN)
+                       vRefresh *= 2;
+               if (par->crtc.gen_cntl & CRTC_DBL_SCAN_EN)
+                       vRefresh /= 2;
 
                DPRINTK("atyfb_set_par\n");
-               DPRINTK(" Set Visible Mode to %ix%i-%i\n", var->xres, var->yres, var->bits_per_pixel);
-               DPRINTK(" Virtual resolution %ix%i, pixclock_in_ps %i (calculated %i)\n",
-                       var->xres_virtual, var->yres_virtual, pixclock, pixclock_in_ps);
-               DPRINTK(" Dot clock:           %i MHz\n", 1000000 / pixclock_in_ps);
+               DPRINTK(" Set Visible Mode to %ix%i-%i\n",
+                       var->xres, var->yres, var->bits_per_pixel);
+               DPRINTK(" Virtual resolution %ix%i, "
+                       "pixclock_in_ps %i (calculated %i)\n",
+                       var->xres_virtual, var->yres_virtual,
+                       pixclock, pixclock_in_ps);
+               DPRINTK(" Dot clock:           %i MHz\n",
+                       1000000 / pixclock_in_ps);
                DPRINTK(" Horizontal sync:     %i kHz\n", hSync);
                DPRINTK(" Vertical refresh:    %i Hz\n", vRefresh);
                DPRINTK(" x  style: %i.%03i %i %i %i %i   %i %i %i %i\n",
@@ -1448,7 +1480,8 @@ static int atyfb_set_par(struct fb_info *info)
        base = 0x2000;
        printk("debug atyfb: Mach64 non-shadow register values:");
        for (i = 0; i < 256; i = i+4) {
-               if(i%16 == 0) printk("\ndebug atyfb: 0x%04X: ", base + i);
+               if (i % 16 == 0)
+                       printk("\ndebug atyfb: 0x%04X: ", base + i);
                printk(" %08X", aty_ld_le32(i, par));
        }
        printk("\n\n");
@@ -1458,8 +1491,10 @@ static int atyfb_set_par(struct fb_info *info)
        base = 0x00;
        printk("debug atyfb: Mach64 PLL register values:");
        for (i = 0; i < 64; i++) {
-               if(i%16 == 0) printk("\ndebug atyfb: 0x%02X: ", base + i);
-               if(i%4 == 0)  printk(" ");
+               if (i % 16 == 0)
+                       printk("\ndebug atyfb: 0x%02X: ", base + i);
+               if (i % 4 == 0)
+                       printk(" ");
                printk("%02X", aty_ld_pll_ct(i, par));
        }
        printk("\n\n");
@@ -1470,19 +1505,21 @@ static int atyfb_set_par(struct fb_info *info)
                /* LCD registers */
                base = 0x00;
                printk("debug atyfb: LCD register values:");
-               if(M64_HAS(LT_LCD_REGS)) {
-                   for(i = 0; i <= POWER_MANAGEMENT; i++) {
-                       if(i == EXT_VERT_STRETCH)
-                           continue;
-                       printk("\ndebug atyfb: 0x%04X: ", lt_lcd_regs[i]);
-                       printk(" %08X", aty_ld_lcd(i, par));
-                   }
-
+               if (M64_HAS(LT_LCD_REGS)) {
+                       for (i = 0; i <= POWER_MANAGEMENT; i++) {
+                               if (i == EXT_VERT_STRETCH)
+                                       continue;
+                               printk("\ndebug atyfb: 0x%04X: ",
+                                      lt_lcd_regs[i]);
+                               printk(" %08X", aty_ld_lcd(i, par));
+                       }
                } else {
-                   for (i = 0; i < 64; i++) {
-                       if(i%4 == 0) printk("\ndebug atyfb: 0x%02X: ", base + i);
-                       printk(" %08X", aty_ld_lcd(i, par));
-                   }
+                       for (i = 0; i < 64; i++) {
+                               if (i % 4 == 0)
+                                       printk("\ndebug atyfb: 0x%02X: ",
+                                              base + i);
+                               printk(" %08X", aty_ld_lcd(i, par));
+                       }
                }
                printk("\n\n");
        }
@@ -1500,9 +1537,10 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        union aty_pll pll;
        u32 pixclock;
 
-       memcpy(&pll, &(par->pll), sizeof(pll));
+       memcpy(&pll, &par->pll, sizeof(pll));
 
-       if((err = aty_var_to_crtc(info, var, &crtc)))
+       err = aty_var_to_crtc(info, var, &crtc);
+       if (err)
                return err;
 
        pixclock = atyfb_get_pixclock(var, par);
@@ -1512,7 +1550,9 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                        PRINTKE("Invalid pixclock\n");
                return -EINVAL;
        } else {
-               if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &pll)))
+               err = par->pll_ops->var_to_pll(info, pixclock,
+                                              var->bits_per_pixel, &pll);
+               if (err)
                        return err;
        }
 
@@ -1539,9 +1579,9 @@ static void set_off_pitch(struct atyfb_par *par, const struct fb_info *info)
 }
 
 
-    /*
    *  Open/Release the frame buffer device
    */
+/*
* Open/Release the frame buffer device
+ */
 
 static int atyfb_open(struct fb_info *info, int user)
 {
@@ -1553,7 +1593,7 @@ static int atyfb_open(struct fb_info *info, int user)
                par->mmaped = 0;
 #endif
        }
-       return (0);
+       return 0;
 }
 
 static irqreturn_t aty_irq(int irq, void *dev_id)
@@ -1568,7 +1608,8 @@ static irqreturn_t aty_irq(int irq, void *dev_id)
 
        if (int_cntl & CRTC_VBLANK_INT) {
                /* clear interrupt */
-               aty_st_le32(CRTC_INT_CNTL, (int_cntl & CRTC_INT_EN_MASK) | CRTC_VBLANK_INT_AK, par);
+               aty_st_le32(CRTC_INT_CNTL, (int_cntl & CRTC_INT_EN_MASK) |
+                           CRTC_VBLANK_INT_AK, par);
                par->vblank.count++;
                if (par->vblank.pan_display) {
                        par->vblank.pan_display = 0;
@@ -1603,9 +1644,11 @@ static int aty_enable_irq(struct atyfb_par *par, int reenable)
                spin_lock_irq(&par->int_lock);
                int_cntl = aty_ld_le32(CRTC_INT_CNTL, par) & CRTC_INT_EN_MASK;
                if (!(int_cntl & CRTC_VBLANK_INT_EN)) {
-                       printk("atyfb: someone disabled IRQ [%08x]\n", int_cntl);
+                       printk("atyfb: someone disabled IRQ [%08x]\n",
+                              int_cntl);
                        /* re-enable interrupt */
-                       aty_st_le32(CRTC_INT_CNTL, int_cntl | CRTC_VBLANK_INT_EN, par );
+                       aty_st_le32(CRTC_INT_CNTL, int_cntl |
+                                   CRTC_VBLANK_INT_EN, par);
                }
                spin_unlock_irq(&par->int_lock);
        }
@@ -1625,7 +1668,7 @@ static int aty_disable_irq(struct atyfb_par *par)
                spin_lock_irq(&par->int_lock);
                int_cntl = aty_ld_le32(CRTC_INT_CNTL, par) & CRTC_INT_EN_MASK;
                /* disable interrupt */
-               aty_st_le32(CRTC_INT_CNTL, int_cntl & ~CRTC_VBLANK_INT_EN, par );
+               aty_st_le32(CRTC_INT_CNTL, int_cntl & ~CRTC_VBLANK_INT_EN, par);
                spin_unlock_irq(&par->int_lock);
                free_irq(par->irq, par);
        }
@@ -1636,50 +1679,62 @@ static int aty_disable_irq(struct atyfb_par *par)
 static int atyfb_release(struct fb_info *info, int user)
 {
        struct atyfb_par *par = (struct atyfb_par *) info->par;
-       if (user) {
-               par->open--;
-               mdelay(1);
-               wait_for_idle(par);
-               if (!par->open) {
 #ifdef __sparc__
-                       int was_mmaped = par->mmaped;
+       int was_mmaped;
+#endif
 
-                       par->mmaped = 0;
+       if (!user)
+               return 0;
 
-                       if (was_mmaped) {
-                               struct fb_var_screeninfo var;
+       par->open--;
+       mdelay(1);
+       wait_for_idle(par);
 
-                               /* Now reset the default display config, we have no
-                                * idea what the program(s) which mmap'd the chip did
-                                * to the configuration, nor whether it restored it
-                                * correctly.
-                                */
-                               var = default_var;
-                               if (noaccel)
-                                       var.accel_flags &= ~FB_ACCELF_TEXT;
-                               else
-                                       var.accel_flags |= FB_ACCELF_TEXT;
-                               if (var.yres == var.yres_virtual) {
-                                       u32 videoram = (info->fix.smem_len - (PAGE_SIZE << 2));
-                                       var.yres_virtual = ((videoram * 8) / var.bits_per_pixel) / var.xres_virtual;
-                                       if (var.yres_virtual < var.yres)
-                                               var.yres_virtual = var.yres;
-                               }
-                       }
-#endif
-                       aty_disable_irq(par);
+       if (par->open)
+               return 0;
+
+#ifdef __sparc__
+       was_mmaped = par->mmaped;
+
+       par->mmaped = 0;
+
+       if (was_mmaped) {
+               struct fb_var_screeninfo var;
+
+               /*
+                * Now reset the default display config, we have
+                * no idea what the program(s) which mmap'd the
+                * chip did to the configuration, nor whether it
+                * restored it correctly.
+                */
+               var = default_var;
+               if (noaccel)
+                       var.accel_flags &= ~FB_ACCELF_TEXT;
+               else
+                       var.accel_flags |= FB_ACCELF_TEXT;
+               if (var.yres == var.yres_virtual) {
+                       u32 videoram = (info->fix.smem_len - (PAGE_SIZE << 2));
+                       var.yres_virtual =
+                               ((videoram * 8) / var.bits_per_pixel) /
+                               var.xres_virtual;
+                       if (var.yres_virtual < var.yres)
+                               var.yres_virtual = var.yres;
                }
        }
-       return (0);
+#endif
+       aty_disable_irq(par);
+
+       return 0;
 }
 
-    /*
    *  Pan or Wrap the Display
    *
    *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
    */
+/*
* Pan or Wrap the Display
+ *
* This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
+ */
 
-static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+static int atyfb_pan_display(struct fb_var_screeninfo *var,
+                            struct fb_info *info)
 {
        struct atyfb_par *par = (struct atyfb_par *) info->par;
        u32 xres, yres, xoffset, yoffset;
@@ -1690,7 +1745,8 @@ static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info
                yres >>= 1;
        xoffset = (var->xoffset + 7) & ~7;
        yoffset = var->yoffset;
-       if (xoffset + xres > par->crtc.vxres || yoffset + yres > par->crtc.vyres)
+       if (xoffset + xres > par->crtc.vxres ||
+           yoffset + yres > par->crtc.vyres)
                return -EINVAL;
        info->var.xoffset = xoffset;
        info->var.yoffset = yoffset;
@@ -1727,10 +1783,10 @@ static int aty_waitforvblank(struct atyfb_par *par, u32 crtc)
                return ret;
 
        count = vbl->count;
-       ret = wait_event_interruptible_timeout(vbl->wait, count != vbl->count, HZ/10);
-       if (ret < 0) {
+       ret = wait_event_interruptible_timeout(vbl->wait,
+                                              count != vbl->count, HZ/10);
+       if (ret < 0)
                return ret;
-       }
        if (ret == 0) {
                aty_enable_irq(par, 1);
                return -ETIMEDOUT;
@@ -1784,7 +1840,8 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                fbtyp.fb_depth = info->var.bits_per_pixel;
                fbtyp.fb_cmsize = info->cmap.len;
                fbtyp.fb_size = info->fix.smem_len;
-               if (copy_to_user((struct fbtype __user *) arg, &fbtyp, sizeof(fbtyp)))
+               if (copy_to_user((struct fbtype __user *) arg, &fbtyp,
+                                sizeof(fbtyp)))
                        return -EFAULT;
                break;
 #endif /* __sparc__ */
@@ -1804,7 +1861,7 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
        case ATYIO_CLKR:
                if (M64_HAS(INTEGRATED)) {
                        struct atyclk clk;
-                       union aty_pll *pll = &(par->pll);
+                       union aty_pll *pll = &par->pll;
                        u32 dsp_config = pll->ct.dsp_config;
                        u32 dsp_on_off = pll->ct.dsp_on_off;
                        clk.ref_clk_per = par->ref_clk_per;
@@ -1829,8 +1886,9 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
        case ATYIO_CLKW:
                if (M64_HAS(INTEGRATED)) {
                        struct atyclk clk;
-                       union aty_pll *pll = &(par->pll);
-                       if (copy_from_user(&clk, (struct atyclk __user *) arg, sizeof(clk)))
+                       union aty_pll *pll = &par->pll;
+                       if (copy_from_user(&clk, (struct atyclk __user *) arg,
+                                          sizeof(clk)))
                                return -EFAULT;
                        par->ref_clk_per = clk.ref_clk_per;
                        pll->ct.pll_ref_div = clk.pll_ref_div;
@@ -1841,8 +1899,10 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                        pll->ct.vclk_fb_div = clk.vclk_fb_div;
                        pll->ct.vclk_post_div_real = clk.vclk_post_div;
                        pll->ct.dsp_config = (clk.dsp_xclks_per_row & 0x3fff) |
-                               ((clk.dsp_loop_latency & 0xf)<<16)| ((clk.dsp_precision & 7)<<20);
-                       pll->ct.dsp_on_off = (clk.dsp_off & 0x7ff) | ((clk.dsp_on & 0x7ff)<<16);
+                               ((clk.dsp_loop_latency & 0xf) << 16) |
+                               ((clk.dsp_precision & 7) << 20);
+                       pll->ct.dsp_on_off = (clk.dsp_off & 0x7ff) |
+                               ((clk.dsp_on & 0x7ff) << 16);
                        /*aty_calc_pll_ct(info, &pll->ct);*/
                        aty_set_pll_ct(info, pll);
                } else
@@ -1913,8 +1973,7 @@ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
                                continue;
 
                        map_size = par->mmap_map[i].size - (offset - start);
-                       map_offset =
-                           par->mmap_map[i].poff + (offset - start);
+                       map_offset = par->mmap_map[i].poff + (offset - start);
                        break;
                }
                if (!map_size) {
@@ -1924,8 +1983,7 @@ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
                if (page + map_size > size)
                        map_size = size - page;
 
-               pgprot_val(vma->vm_page_prot) &=
-                   ~(par->mmap_map[i].prot_mask);
+               pgprot_val(vma->vm_page_prot) &= ~(par->mmap_map[i].prot_mask);
                pgprot_val(vma->vm_page_prot) |= par->mmap_map[i].prot_flag;
 
                if (remap_pfn_range(vma, vma->vm_start + page,
@@ -2029,7 +2087,8 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        par->asleep = 1;
        par->lock_blank = 1;
 
-       /* Because we may change PCI D state ourselves, we need to
+       /*
+        * Because we may change PCI D state ourselves, we need to
         * first save the config space content so the core can
         * restore it properly on resume.
         */
@@ -2080,7 +2139,8 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
        acquire_console_sem();
 
-       /* PCI state will have been restored by the core, so
+       /*
+        * PCI state will have been restored by the core, so
         * we should be in D0 now with our config space fully
         * restored
         */
@@ -2192,8 +2252,8 @@ static void aty_bl_init(struct atyfb_par *par)
 
        info->bl_dev = bd;
        fb_bl_default_curve(info, 0,
-               0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
-               0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
+                           0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                           0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
        bd->props.brightness = bd->props.max_brightness;
@@ -2236,16 +2296,16 @@ static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
                size = ARRAY_SIZE(ragepro_tbl);
        }
 
-       for (i=0; i < size; i++) {
+       for (i = 0; i < size; i++) {
                if (xclk < refresh_tbl[i])
-               break;
+                       break;
        }
        par->mem_refresh_rate = i;
 }
 
-    /*
    *  Initialisation
    */
+/*
* Initialisation
+ */
 
 static struct fb_info *fb_list = NULL;
 
@@ -2375,8 +2435,10 @@ static int __devinit aty_init(struct fb_info *info)
        }
 #endif
 #ifdef CONFIG_PPC_PMAC
-       /* The Apple iBook1 uses non-standard memory frequencies. We detect it
-        * and set the frequency manually. */
+       /*
+        * The Apple iBook1 uses non-standard memory frequencies.
+        * We detect it and set the frequency manually.
+        */
        if (machine_is_compatible("PowerBook2,1")) {
                par->pll_limits.mclk = 70;
                par->pll_limits.xclk = 53;
@@ -2421,13 +2483,14 @@ static int __devinit aty_init(struct fb_info *info)
 
        /* save previous video mode */
        aty_get_crtc(par, &par->saved_crtc);
-       if(par->pll_ops->get_pll)
+       if (par->pll_ops->get_pll)
                par->pll_ops->get_pll(info, &par->saved_pll);
 
        par->mem_cntl = aty_ld_le32(MEM_CNTL, par);
        gtb_memsize = M64_HAS(GTB_DSP);
        if (gtb_memsize)
-               switch (par->mem_cntl & 0xF) {  /* 0xF used instead of MEM_SIZE_ALIAS */
+               /* 0xF used instead of MEM_SIZE_ALIAS */
+               switch (par->mem_cntl & 0xF) {
                case MEM_SIZE_512K:
                        info->fix.smem_len = 0x80000;
                        break;
@@ -2496,8 +2559,8 @@ static int __devinit aty_init(struct fb_info *info)
        }
 
        /*
-        *  Reg Block 0 (CT-compatible block) is at mmio_start
-        *  Reg Block 1 (multimedia extensions) is at mmio_start - 0x400
+        * Reg Block 0 (CT-compatible block) is at mmio_start
+        * Reg Block 1 (multimedia extensions) is at mmio_start - 0x400
         */
        if (M64_HAS(GX)) {
                info->fix.mmio_len = 0x400;
@@ -2516,84 +2579,98 @@ static int __devinit aty_init(struct fb_info *info)
        }
 
        PRINTKI("%d%c %s, %s MHz XTAL, %d MHz PLL, %d Mhz MCLK, %d MHz XCLK\n",
-              info->fix.smem_len == 0x80000 ? 512 : (info->fix.smem_len >> 20),
-              info->fix.smem_len == 0x80000 ? 'K' : 'M', ramname, xtal, par->pll_limits.pll_max,
-              par->pll_limits.mclk, par->pll_limits.xclk);
+               info->fix.smem_len == 0x80000 ? 512 : (info->fix.smem_len>>20),
+               info->fix.smem_len == 0x80000 ? 'K' : 'M', ramname, xtal,
+               par->pll_limits.pll_max, par->pll_limits.mclk,
+               par->pll_limits.xclk);
 
 #if defined(DEBUG) && defined(CONFIG_FB_ATY_CT)
        if (M64_HAS(INTEGRATED)) {
                int i;
-               printk("debug atyfb: BUS_CNTL DAC_CNTL MEM_CNTL EXT_MEM_CNTL CRTC_GEN_CNTL "
-                      "DSP_CONFIG DSP_ON_OFF CLOCK_CNTL\n"
-                      "debug atyfb: %08x %08x %08x %08x     %08x      %08x   %08x   %08x\n"
+               printk("debug atyfb: BUS_CNTL DAC_CNTL MEM_CNTL "
+                      "EXT_MEM_CNTL CRTC_GEN_CNTL DSP_CONFIG "
+                      "DSP_ON_OFF CLOCK_CNTL\n"
+                      "debug atyfb: %08x %08x %08x "
+                      "%08x     %08x      %08x   "
+                      "%08x   %08x\n"
                       "debug atyfb: PLL",
-                       aty_ld_le32(BUS_CNTL, par), aty_ld_le32(DAC_CNTL, par),
-                       aty_ld_le32(MEM_CNTL, par), aty_ld_le32(EXT_MEM_CNTL, par),
-                       aty_ld_le32(CRTC_GEN_CNTL, par), aty_ld_le32(DSP_CONFIG, par),
-                       aty_ld_le32(DSP_ON_OFF, par), aty_ld_le32(CLOCK_CNTL, par));
+                      aty_ld_le32(BUS_CNTL, par),
+                      aty_ld_le32(DAC_CNTL, par),
+                      aty_ld_le32(MEM_CNTL, par),
+                      aty_ld_le32(EXT_MEM_CNTL, par),
+                      aty_ld_le32(CRTC_GEN_CNTL, par),
+                      aty_ld_le32(DSP_CONFIG, par),
+                      aty_ld_le32(DSP_ON_OFF, par),
+                      aty_ld_le32(CLOCK_CNTL, par));
                for (i = 0; i < 40; i++)
                        printk(" %02x", aty_ld_pll_ct(i, par));
                printk("\n");
        }
 #endif
-       if(par->pll_ops->init_pll)
+       if (par->pll_ops->init_pll)
                par->pll_ops->init_pll(info, &par->pll);
        if (par->pll_ops->resume_pll)
                par->pll_ops->resume_pll(info, &par->pll);
 
        /*
-        *  Last page of 8 MB (4 MB on ISA) aperture is MMIO,
-        *  unless the auxiliary register aperture is used.
+        * Last page of 8 MB (4 MB on ISA) aperture is MMIO,
+        * unless the auxiliary register aperture is used.
         */
-
        if (!par->aux_start &&
-               (info->fix.smem_len == 0x800000 || (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
+           (info->fix.smem_len == 0x800000 ||
+            (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
                info->fix.smem_len -= GUI_RESERVE;
 
        /*
-        *  Disable register access through the linear aperture
-        *  if the auxiliary aperture is used so we can access
-        *  the full 8 MB of video RAM on 8 MB boards.
+        * Disable register access through the linear aperture
+        * if the auxiliary aperture is used so we can access
+        * the full 8 MB of video RAM on 8 MB boards.
         */
        if (par->aux_start)
-               aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+               aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) |
+                           BUS_APER_REG_DIS, par);
 
 #ifdef CONFIG_MTRR
        par->mtrr_aper = -1;
        par->mtrr_reg = -1;
        if (!nomtrr) {
                /* Cover the whole resource. */
-                par->mtrr_aper = mtrr_add(par->res_start, par->res_size, MTRR_TYPE_WRCOMB, 1);
-                if (par->mtrr_aper >= 0 && !par->aux_start) {
+               par->mtrr_aper = mtrr_add(par->res_start, par->res_size,
+                                         MTRR_TYPE_WRCOMB, 1);
+               if (par->mtrr_aper >= 0 && !par->aux_start) {
                        /* Make a hole for mmio. */
-                       par->mtrr_reg = mtrr_add(par->res_start + 0x800000 - GUI_RESERVE,
-                               GUI_RESERVE, MTRR_TYPE_UNCACHABLE, 1);
+                       par->mtrr_reg = mtrr_add(par->res_start + 0x800000 -
+                                                GUI_RESERVE, GUI_RESERVE,
+                                                MTRR_TYPE_UNCACHABLE, 1);
                        if (par->mtrr_reg < 0) {
                                mtrr_del(par->mtrr_aper, 0, 0);
                                par->mtrr_aper = -1;
                        }
-                }
+               }
        }
 #endif
 
        info->fbops = &atyfb_ops;
        info->pseudo_palette = par->pseudo_palette;
        info->flags = FBINFO_DEFAULT           |
-                     FBINFO_HWACCEL_IMAGEBLIT |
-                     FBINFO_HWACCEL_FILLRECT  |
-                     FBINFO_HWACCEL_COPYAREA  |
-                     FBINFO_HWACCEL_YPAN;
+                     FBINFO_HWACCEL_IMAGEBLIT |
+                     FBINFO_HWACCEL_FILLRECT  |
+                     FBINFO_HWACCEL_COPYAREA  |
+                     FBINFO_HWACCEL_YPAN;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
        if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {
-               /* these bits let the 101 powerbook wake up from sleep -- paulus */
-               aty_st_lcd(POWER_MANAGEMENT, aty_ld_lcd(POWER_MANAGEMENT, par)
-                          | (USE_F32KHZ | TRISTATE_MEM_EN), par);
+               /*
+                * these bits let the 101 powerbook
+                * wake up from sleep -- paulus
+                */
+               aty_st_lcd(POWER_MANAGEMENT, aty_ld_lcd(POWER_MANAGEMENT, par) |
+                          USE_F32KHZ | TRISTATE_MEM_EN, par);
        } else
 #endif
        if (M64_HAS(MOBIL_BUS) && backlight) {
 #ifdef CONFIG_FB_ATY_BACKLIGHT
-               aty_bl_init (par);
+               aty_bl_init(par);
 #endif
        }
 
@@ -2601,8 +2678,8 @@ static int __devinit aty_init(struct fb_info *info)
 #ifdef CONFIG_PPC
        if (machine_is(powermac)) {
                /*
-                *  FIXME: The NVRAM stuff should be put in a Mac-specific file, as it
-                *         applies to all Mac video cards
+                * FIXME: The NVRAM stuff should be put in a Mac-specific file,
+                *        as it applies to all Mac video cards
                 */
                if (mode) {
                        if (mac_find_mode(&var, info, mode, 8))
@@ -2615,8 +2692,7 @@ static int __devinit aty_init(struct fb_info *info)
                                        default_vmode = VMODE_1024_768_60;
                                else if (machine_is_compatible("iMac"))
                                        default_vmode = VMODE_1024_768_75;
-                               else if (machine_is_compatible
-                                        ("PowerBook2,1"))
+                               else if (machine_is_compatible("PowerBook2,1"))
                                        /* iBook with 800x600 LCD */
                                        default_vmode = VMODE_800_600_60;
                                else
@@ -2630,7 +2706,7 @@ static int __devinit aty_init(struct fb_info *info)
                        if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
                                default_cmode = CMODE_8;
                        if (!mac_vmode_to_var(default_vmode, default_cmode,
-                                              &var))
+                                             &var))
                                has_var = 1;
                }
        }
@@ -2702,12 +2778,12 @@ aty_init_exit:
 
 #ifdef CONFIG_MTRR
        if (par->mtrr_reg >= 0) {
-           mtrr_del(par->mtrr_reg, 0, 0);
-           par->mtrr_reg = -1;
+               mtrr_del(par->mtrr_reg, 0, 0);
+               par->mtrr_reg = -1;
        }
        if (par->mtrr_aper >= 0) {
-           mtrr_del(par->mtrr_aper, 0, 0);
-           par->mtrr_aper = -1;
+               mtrr_del(par->mtrr_aper, 0, 0);
+               par->mtrr_aper = -1;
        }
 #endif
        return ret;
@@ -2735,18 +2811,18 @@ static int __devinit store_video_par(char *video_str, unsigned char m64_num)
        phys_size[m64_num] = size;
        phys_guiregbase[m64_num] = guiregbase;
        PRINTKI("stored them all: $%08lX $%08lX $%08lX \n", vmembase, size,
-              guiregbase);
+               guiregbase);
        return 0;
 
     mach64_invalid:
+ mach64_invalid:
        phys_vmembase[m64_num] = 0;
        return -1;
 }
 #endif /* CONFIG_ATARI */
 
-    /*
    *  Blank the display.
    */
+/*
* Blank the display.
+ */
 
 static int atyfb_blank(int blank, struct fb_info *info)
 {
@@ -2768,20 +2844,20 @@ static int atyfb_blank(int blank, struct fb_info *info)
        gen_cntl = aty_ld_le32(CRTC_GEN_CNTL, par);
        gen_cntl &= ~0x400004c;
        switch (blank) {
-               case FB_BLANK_UNBLANK:
-                       break;
-               case FB_BLANK_NORMAL:
-                       gen_cntl |= 0x4000040;
-                       break;
-               case FB_BLANK_VSYNC_SUSPEND:
-                       gen_cntl |= 0x4000048;
-                       break;
-               case FB_BLANK_HSYNC_SUSPEND:
-                       gen_cntl |= 0x4000044;
-                       break;
-               case FB_BLANK_POWERDOWN:
-                       gen_cntl |= 0x400004c;
-                       break;
+       case FB_BLANK_UNBLANK:
+               break;
+       case FB_BLANK_NORMAL:
+               gen_cntl |= 0x4000040;
+               break;
+       case FB_BLANK_VSYNC_SUSPEND:
+               gen_cntl |= 0x4000048;
+               break;
+       case FB_BLANK_HSYNC_SUSPEND:
+               gen_cntl |= 0x4000044;
+               break;
+       case FB_BLANK_POWERDOWN:
+               gen_cntl |= 0x400004c;
+               break;
        }
        aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
@@ -2806,15 +2882,15 @@ static void aty_st_pal(u_int regno, u_int red, u_int green, u_int blue,
        aty_st_8(DAC_DATA, blue, par);
 }
 
-    /*
    *  Set a single color register. The values supplied are already
    *  rounded down to the hardware's capabilities (according to the
    *  entries in the var structure). Return != 0 for invalid regno.
    *  !! 4 & 8 =  PSEUDO, > 8 = DIRECTCOLOR
    */
+/*
* Set a single color register. The values supplied are already
* rounded down to the hardware's capabilities (according to the
* entries in the var structure). Return != 0 for invalid regno.
* !! 4 & 8 =  PSEUDO, > 8 = DIRECTCOLOR
+ */
 
 static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-       u_int transp, struct fb_info *info)
+                          u_int transp, struct fb_info *info)
 {
        struct atyfb_par *par = (struct atyfb_par *) info->par;
        int i, depth;
@@ -2868,16 +2944,15 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                if (depth == 16) {
                        if (regno < 32)
                                aty_st_pal(regno << 3, red,
-                                          par->palette[regno<<1].green,
+                                          par->palette[regno << 1].green,
                                           blue, par);
-                       red = par->palette[regno>>1].red;
-                       blue = par->palette[regno>>1].blue;
+                       red = par->palette[regno >> 1].red;
+                       blue = par->palette[regno >> 1].blue;
                        regno <<= 2;
                } else if (depth == 15) {
                        regno <<= 3;
-                       for(i = 0; i < 8; i++) {
-                           aty_st_pal(regno + i, red, green, blue, par);
-                       }
+                       for (i = 0; i < 8; i++)
+                               aty_st_pal(regno + i, red, green, blue, par);
                }
        }
        aty_st_pal(regno, red, green, blue, par);
@@ -2890,7 +2965,8 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 #ifdef __sparc__
 
 static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
-                       struct fb_info *info, unsigned long addr)
+                                      struct fb_info *info,
+                                      unsigned long addr)
 {
        struct atyfb_par *par = info->par;
        struct device_node *dp;
@@ -2978,7 +3054,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                j++;
        }
 
-       if((ret = correct_chipset(par)))
+       ret = correct_chipset(par);
+       if (ret)
                return ret;
 
        if (IS_XL(pdev->device)) {
@@ -3108,28 +3185,28 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
        u32 driv_inf_tab, sig;
        u16 lcd_ofs;
 
-       /* To support an LCD panel, we should know it's dimensions and
+       /*
+        * To support an LCD panel, we should know it's dimensions and
         *  it's desired pixel clock.
         * There are two ways to do it:
         *  - Check the startup video mode and calculate the panel
         *    size from it. This is unreliable.
         *  - Read it from the driver information table in the video BIOS.
-       */
+        */
        /* Address of driver information table is at offset 0x78. */
        driv_inf_tab = bios_base + *((u16 *)(bios_base+0x78));
 
        /* Check for the driver information table signature. */
-       sig = (*(u32 *)driv_inf_tab);
+       sig = *(u32 *)driv_inf_tab;
        if ((sig == 0x54504c24) || /* Rage LT pro */
-               (sig == 0x544d5224) || /* Rage mobility */
-               (sig == 0x54435824) || /* Rage XC */
-               (sig == 0x544c5824)) { /* Rage XL */
+           (sig == 0x544d5224) || /* Rage mobility */
+           (sig == 0x54435824) || /* Rage XC */
+           (sig == 0x544c5824)) { /* Rage XL */
                PRINTKI("BIOS contains driver information table.\n");
-               lcd_ofs = (*(u16 *)(driv_inf_tab + 10));
+               lcd_ofs = *(u16 *)(driv_inf_tab + 10);
                par->lcd_table = 0;
-               if (lcd_ofs != 0) {
+               if (lcd_ofs != 0)
                        par->lcd_table = bios_base + lcd_ofs;
-               }
        }
 
        if (par->lcd_table != 0) {
@@ -3144,14 +3221,16 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                u16 width, height, panel_type, refresh_rates;
                u16 *lcdmodeptr;
                u32 format;
-               u8 lcd_refresh_rates[16] = {50,56,60,67,70,72,75,76,85,90,100,120,140,150,160,200};
-               /* The most important information is the panel size at
+               u8 lcd_refresh_rates[16] = { 50, 56, 60, 67, 70, 72, 75, 76, 85,
+                                            90, 100, 120, 140, 150, 160, 200 };
+               /*
+                * The most important information is the panel size at
                 * offset 25 and 27, but there's some other nice information
                 * which we print to the screen.
                 */
                id = *(u8 *)par->lcd_table;
-               strncpy(model,(char *)par->lcd_table+1,24);
-               model[23]=0;
+               strncpy(model, (char *)par->lcd_table+1, 24);
+               model[23] = 0;
 
                width = par->lcd_width = *(u16 *)(par->lcd_table+25);
                height = par->lcd_height = *(u16 *)(par->lcd_table+27);
@@ -3164,7 +3243,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                        txtdual = "dual (split) ";
                else
                        txtdual = "";
-               tech = (panel_type>>2) & 63;
+               tech = (panel_type >> 2) & 63;
                switch (tech) {
                case 0:
                        txtmonitor = "passive matrix";
@@ -3224,22 +3303,24 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                        }
                }
                PRINTKI("%s%s %s monitor detected: %s\n",
-                       txtdual ,txtcolour, txtmonitor, model);
+                       txtdualtxtcolour, txtmonitor, model);
                PRINTKI("       id=%d, %dx%d pixels, %s\n",
                        id, width, height, txtformat);
                refresh_rates_buf[0] = 0;
                refresh_rates = *(u16 *)(par->lcd_table+62);
                m = 1;
                f = 0;
-               for (i=0;i<16;i++) {
+               for (i = 0; i < 16; i++) {
                        if (refresh_rates & m) {
                                if (f == 0) {
-                                       sprintf(strbuf, "%d", lcd_refresh_rates[i]);
+                                       sprintf(strbuf, "%d",
+                                               lcd_refresh_rates[i]);
                                        f++;
                                } else {
-                                       sprintf(strbuf, ",%d", lcd_refresh_rates[i]);
+                                       sprintf(strbuf, ",%d",
+                                               lcd_refresh_rates[i]);
                                }
-                               strcat(refresh_rates_buf,strbuf);
+                               strcat(refresh_rates_buf, strbuf);
                        }
                        m = m << 1;
                }
@@ -3247,7 +3328,8 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                PRINTKI("       supports refresh rates [%s], default %d Hz\n",
                        refresh_rates_buf, lcd_refresh_rates[default_refresh_rate]);
                par->lcd_refreshrate = lcd_refresh_rates[default_refresh_rate];
-               /* We now need to determine the crtc parameters for the
+               /*
+                * We now need to determine the crtc parameters for the
                 * LCD monitor. This is tricky, because they are not stored
                 * individually in the BIOS. Instead, the BIOS contains a
                 * table of display modes that work for this monitor.
@@ -3382,7 +3464,9 @@ static int __devinit init_from_bios(struct atyfb_par *par)
 }
 #endif /* __i386__ */
 
-static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, unsigned long addr)
+static int __devinit atyfb_setup_generic(struct pci_dev *pdev,
+                                        struct fb_info *info,
+                                        unsigned long addr)
 {
        struct atyfb_par *par = info->par;
        u16 tmp;
@@ -3429,10 +3513,12 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i
                goto atyfb_setup_generic_fail;
        }
 
-       if((ret = correct_chipset(par)))
+       ret = correct_chipset(par);
+       if (ret)
                goto atyfb_setup_generic_fail;
 #ifdef __i386__
-       if((ret = init_from_bios(par)))
+       ret = init_from_bios(par);
+       if (ret)
                goto atyfb_setup_generic_fail;
 #endif
        if (!(aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC_EXT_DISP_EN))
@@ -3457,7 +3543,8 @@ atyfb_setup_generic_fail:
 
 #endif /* !__sparc__ */
 
-static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit atyfb_pci_probe(struct pci_dev *pdev,
+                                    const struct pci_device_id *ent)
 {
        unsigned long addr, res_start, res_size;
        struct fb_info *info;
@@ -3482,10 +3569,10 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
        /* Reserve space */
        res_start = rp->start;
        res_size = rp->end - rp->start + 1;
-       if (!request_mem_region (res_start, res_size, "atyfb"))
+       if (!request_mem_region(res_start, res_size, "atyfb"))
                return -EBUSY;
 
-        /* Allocate framebuffer */
+       /* Allocate framebuffer */
        info = framebuffer_alloc(sizeof(struct atyfb_par), &pdev->dev);
        if (!info) {
                PRINTKE("atyfb_pci_probe() can't alloc fb_info\n");
@@ -3573,7 +3660,8 @@ static int __init atyfb_atari_probe(void)
        for (m64_num = 0; m64_num < mach64_count; m64_num++) {
                if (!phys_vmembase[m64_num] || !phys_size[m64_num] ||
                    !phys_guiregbase[m64_num]) {
-                   PRINTKI("phys_*[%d] parameters not set => returning early. \n", m64_num);
+                       PRINTKI("phys_*[%d] parameters not set => "
+                               "returning early. \n", m64_num);
                        continue;
                }
 
@@ -3589,8 +3677,8 @@ static int __init atyfb_atari_probe(void)
                par->irq = (unsigned int) -1; /* something invalid */
 
                /*
-                *  Map the video memory (physical address given) to somewhere in the
-                *  kernel address space.
+                * Map the video memory (physical address given)
+                * to somewhere in the kernel address space.
                 */
                info->screen_base = ioremap(phys_vmembase[m64_num], phys_size[m64_num]);
                info->fix.smem_start = (unsigned long)info->screen_base; /* Fake! */
@@ -3661,12 +3749,12 @@ static void __devexit atyfb_remove(struct fb_info *info)
 
 #ifdef CONFIG_MTRR
        if (par->mtrr_reg >= 0) {
-           mtrr_del(par->mtrr_reg, 0, 0);
-           par->mtrr_reg = -1;
+               mtrr_del(par->mtrr_reg, 0, 0);
+               par->mtrr_reg = -1;
        }
        if (par->mtrr_aper >= 0) {
-           mtrr_del(par->mtrr_aper, 0, 0);
-           par->mtrr_aper = -1;
+               mtrr_del(par->mtrr_aper, 0, 0);
+               par->mtrr_aper = -1;
        }
 #endif
 #ifndef __sparc__
@@ -3900,29 +3988,29 @@ static const struct dmi_system_id atyfb_reboot_ids[] = {
 
 static int __init atyfb_init(void)
 {
-    int err1 = 1, err2 = 1;
+       int err1 = 1, err2 = 1;
 #ifndef MODULE
-    char *option = NULL;
+       char *option = NULL;
 
-    if (fb_get_options("atyfb", &option))
-       return -ENODEV;
-    atyfb_setup(option);
+       if (fb_get_options("atyfb", &option))
+               return -ENODEV;
+       atyfb_setup(option);
 #endif
 
 #ifdef CONFIG_PCI
-    err1 = pci_register_driver(&atyfb_driver);
+       err1 = pci_register_driver(&atyfb_driver);
 #endif
 #ifdef CONFIG_ATARI
-    err2 = atyfb_atari_probe();
+       err2 = atyfb_atari_probe();
 #endif
 
-    if (err1 && err2)
-       return -ENODEV;
+       if (err1 && err2)
+               return -ENODEV;
 
-    if (dmi_check_system(atyfb_reboot_ids))
-       register_reboot_notifier(&atyfb_reboot_notifier);
+       if (dmi_check_system(atyfb_reboot_ids))
+               register_reboot_notifier(&atyfb_reboot_notifier);
 
-    return 0;
+       return 0;
 }
 
 static void __exit atyfb_exit(void)
@@ -3951,8 +4039,7 @@ MODULE_PARM_DESC(mclk, "int: override memory clock");
 module_param(xclk, int, 0);
 MODULE_PARM_DESC(xclk, "int: override accelerated engine clock");
 module_param(comp_sync, int, 0);
-MODULE_PARM_DESC(comp_sync,
-                "Set composite sync signal to low (0) or high (1)");
+MODULE_PARM_DESC(comp_sync, "Set composite sync signal to low (0) or high (1)");
 module_param(mode, charp, 0);
 MODULE_PARM_DESC(mode, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
 #ifdef CONFIG_MTRR
index 378f277..a699aab 100644 (file)
@@ -715,8 +715,11 @@ int au1100fb_setup(char *options)
                        }
                        /* Mode option (only option that start with digit) */
                        else if (isdigit(this_opt[0])) {
-                               mode = kmalloc(strlen(this_opt) + 1, GFP_KERNEL);
-                               strncpy(mode, this_opt, strlen(this_opt) + 1);
+                               mode = kstrdup(this_opt, GFP_KERNEL);
+                               if (!mode) {
+                                       print_err("memory allocation failed");
+                                       return -ENOMEM;
+                               }
                        }
                        /* Unsupported option */
                        else {
index f8a4bb2..2211a85 100644 (file)
@@ -639,3 +639,4 @@ module_exit(corgi_lcd_exit);
 MODULE_DESCRIPTION("LCD and backlight driver for SHARP C7x0/Cxx00");
 MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:corgi-lcd");
index 2eb206b..4631ca8 100644 (file)
@@ -328,3 +328,4 @@ module_exit(ltv350qv_exit);
 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 MODULE_DESCRIPTION("Samsung LTV350QV LCD Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ltv350qv");
index 51422fc..bbfb502 100644 (file)
@@ -472,3 +472,4 @@ module_exit(tdo24m_exit);
 MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
 MODULE_DESCRIPTION("Driver for Toppoly TDO24M LCD Panel");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:tdo24m");
index b7fbc75..50ec17d 100644 (file)
@@ -300,4 +300,4 @@ module_exit(tosa_lcd_exit);
 MODULE_AUTHOR("Dmitry Baryshkov");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("LCD/Backlight control for Sharp SL-6000 PDA");
-
+MODULE_ALIAS("spi:tosa-lcd");
index 8e653b8..b49063c 100644 (file)
@@ -280,5 +280,4 @@ module_exit(vgg2432a4_exit);
 MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
 MODULE_DESCRIPTION("VGG2432A4 LCD Driver");
 MODULE_LICENSE("GPL v2");
-
-
+MODULE_ALIAS("spi:VGG2432A4");
index df03f37..79e5f40 100644 (file)
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
                                d0 >>= right;
                        } else if (src_idx+n <= bits) {
                                // Single source word
-                               d0 <<= left;;
+                               d0 <<= left;
                        } else {
                                // 2 source words
                                d1 = FB_READL(src + 1);
index 69864b1..6b7c8fb 100644 (file)
@@ -25,7 +25,7 @@ static inline void update_attr(u8 *dst, u8 *src, int attribute,
                               struct vc_data *vc)
 {
        int i, offset = (vc->vc_font.height < 10) ? 1 : 2;
-       int width = (vc->vc_font.width + 7) >> 3;
+       int width = DIV_ROUND_UP(vc->vc_font.width, 8);
        unsigned int cellsize = vc->vc_font.height * width;
        u8 c;
 
@@ -144,7 +144,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                      int fg, int bg)
 {
        struct fb_image image;
-       u32 width = (vc->vc_font.width + 7)/8;
+       u32 width = DIV_ROUND_UP(vc->vc_font.width, 8);
        u32 cellsize = width * vc->vc_font.height;
        u32 maxcnt = info->pixmap.size/cellsize;
        u32 scan_align = info->pixmap.scan_align - 1;
@@ -173,7 +173,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                        cnt = count;
 
                image.width = vc->vc_font.width * cnt;
-               pitch = ((image.width + 7) >> 3) + scan_align;
+               pitch = DIV_ROUND_UP(image.width, 8) + scan_align;
                pitch &= ~scan_align;
                size = pitch * image.height + buf_align;
                size &= ~buf_align;
@@ -239,7 +239,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
        struct fb_cursor cursor;
        struct fbcon_ops *ops = info->fbcon_par;
        unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-       int w = (vc->vc_font.width + 7) >> 3, c;
+       int w = DIV_ROUND_UP(vc->vc_font.width, 8), c;
        int y = real_y(ops->p, vc->vc_y);
        int attribute, use_sw = (vc->vc_cursor_type & 0x10);
        int err = 1;
index 3a44695..5a686ce 100644 (file)
@@ -114,6 +114,7 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1;
 static int fbcon_is_default = 1; 
 static int fbcon_has_exited;
 static int primary_device = -1;
+static int fbcon_has_console_bind;
 
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 static int map_override;
@@ -544,6 +545,8 @@ static int fbcon_takeover(int show_logo)
                        con2fb_map[i] = -1;
                }
                info_idx = -1;
+       } else {
+               fbcon_has_console_bind = 1;
        }
 
        return err;
@@ -725,7 +728,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
                                  int oldidx, int found)
 {
        struct fbcon_ops *ops = oldinfo->fbcon_par;
-       int err = 0;
+       int err = 0, ret;
 
        if (oldinfo->fbops->fb_release &&
            oldinfo->fbops->fb_release(oldinfo, 0)) {
@@ -752,8 +755,14 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
                  newinfo in an undefined state. Thus, a call to
                  fb_set_par() may be needed for the newinfo.
                */
-               if (newinfo->fbops->fb_set_par)
-                       newinfo->fbops->fb_set_par(newinfo);
+               if (newinfo->fbops->fb_set_par) {
+                       ret = newinfo->fbops->fb_set_par(newinfo);
+
+                       if (ret)
+                               printk(KERN_ERR "con2fb_release_oldinfo: "
+                                       "detected unhandled fb_set_par error, "
+                                       "error code %d\n", ret);
+               }
        }
 
        return err;
@@ -763,11 +772,18 @@ static void con2fb_init_display(struct vc_data *vc, struct fb_info *info,
                                int unit, int show_logo)
 {
        struct fbcon_ops *ops = info->fbcon_par;
+       int ret;
 
        ops->currcon = fg_console;
 
-       if (info->fbops->fb_set_par && !(ops->flags & FBCON_FLAGS_INIT))
-               info->fbops->fb_set_par(info);
+       if (info->fbops->fb_set_par && !(ops->flags & FBCON_FLAGS_INIT)) {
+               ret = info->fbops->fb_set_par(info);
+
+               if (ret)
+                       printk(KERN_ERR "con2fb_init_display: detected "
+                               "unhandled fb_set_par error, "
+                               "error code %d\n", ret);
+       }
 
        ops->flags |= FBCON_FLAGS_INIT;
        ops->graphics = 0;
@@ -1006,7 +1022,7 @@ static void fbcon_init(struct vc_data *vc, int init)
        struct vc_data *svc = *default_mode;
        struct display *t, *p = &fb_display[vc->vc_num];
        int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256;
-       int cap;
+       int cap, ret;
 
        if (info_idx == -1 || info == NULL)
            return;
@@ -1092,8 +1108,15 @@ static void fbcon_init(struct vc_data *vc, int init)
         */
        if (CON_IS_VISIBLE(vc) && vc->vc_mode == KD_TEXT) {
                if (info->fbops->fb_set_par &&
-                   !(ops->flags & FBCON_FLAGS_INIT))
-                       info->fbops->fb_set_par(info);
+                   !(ops->flags & FBCON_FLAGS_INIT)) {
+                       ret = info->fbops->fb_set_par(info);
+
+                       if (ret)
+                               printk(KERN_ERR "fbcon_init: detected "
+                                       "unhandled fb_set_par error, "
+                                       "error code %d\n", ret);
+               }
+
                ops->flags |= FBCON_FLAGS_INIT;
        }
 
@@ -2119,7 +2142,7 @@ static int fbcon_switch(struct vc_data *vc)
        struct fbcon_ops *ops;
        struct display *p = &fb_display[vc->vc_num];
        struct fb_var_screeninfo var;
-       int i, prev_console, charcnt = 256;
+       int i, ret, prev_console, charcnt = 256;
 
        info = registered_fb[con2fb_map[vc->vc_num]];
        ops = info->fbcon_par;
@@ -2174,8 +2197,14 @@ static int fbcon_switch(struct vc_data *vc)
 
        if (old_info != NULL && (old_info != info ||
                                 info->flags & FBINFO_MISC_ALWAYS_SETPAR)) {
-               if (info->fbops->fb_set_par)
-                       info->fbops->fb_set_par(info);
+               if (info->fbops->fb_set_par) {
+                       ret = info->fbops->fb_set_par(info);
+
+                       if (ret)
+                               printk(KERN_ERR "fbcon_switch: detected "
+                                       "unhandled fb_set_par error, "
+                                       "error code %d\n", ret);
+               }
 
                if (old_info != info)
                        fbcon_del_cursor_timer(old_info);
@@ -2923,6 +2952,10 @@ static int fbcon_unbind(void)
 
        ret = unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
                                fbcon_is_default);
+
+       if (!ret)
+               fbcon_has_console_bind = 0;
+
        return ret;
 }
 #else
@@ -2936,6 +2969,9 @@ static int fbcon_fb_unbind(int idx)
 {
        int i, new_idx = -1, ret = 0;
 
+       if (!fbcon_has_console_bind)
+               return 0;
+
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                if (con2fb_map[i] != idx &&
                    con2fb_map[i] != -1) {
index d31b203..3772433 100644 (file)
@@ -216,7 +216,7 @@ static void newport_get_screensize(void)
        }
 
        newport_xsize = newport_ysize = 0;
-       for (i = 0; linetable[i + 1] && (i < sizeof(linetable)); i += 2) {
+       for (i = 0; i < ARRAY_SIZE(linetable) - 1 && linetable[i + 1]; i += 2) {
                cols = 0;
                newport_vc2_set(npregs, VC2_IREG_RADDR, linetable[i]);
                npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM |
index 59d7d5e..da55cca 100644 (file)
@@ -180,7 +180,6 @@ static inline void vga_set_mem_top(struct vc_data *c)
 }
 
 #ifdef CONFIG_VGACON_SOFT_SCROLLBACK
-#include <linux/slab.h>
 /* software scrollback */
 static void *vgacon_scrollback;
 static int vgacon_scrollback_tail;
@@ -590,12 +589,14 @@ static void vgacon_init(struct vc_data *c, int init)
 
 static void vgacon_deinit(struct vc_data *c)
 {
-       /* When closing the last console, reset video origin */
-       if (!--vgacon_uni_pagedir[1]) {
+       /* When closing the active console, reset video origin */
+       if (CON_IS_VISIBLE(c)) {
                c->vc_visible_origin = vga_vram_base;
                vga_set_mem_top(c);
-               con_free_unimap(c);
        }
+
+       if (!--vgacon_uni_pagedir[1])
+               con_free_unimap(c);
        c->vc_uni_pagedir_loc = &c->vc_uni_pagedir;
        con_set_default_unimap(c);
 }
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
new file mode 100644 (file)
index 0000000..42e1005
--- /dev/null
@@ -0,0 +1,890 @@
+/*
+ * Copyright (C) 2008-2009 MontaVista Software Inc.
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * Based on the LCD driver for TI Avalanche processors written by
+ * Ajay Singh and Shalom Hai.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option)any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/fb.h>
+#include <linux/dma-mapping.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <video/da8xx-fb.h>
+
+#define DRIVER_NAME "da8xx_lcdc"
+
+/* LCD Status Register */
+#define LCD_END_OF_FRAME0              BIT(8)
+#define LCD_FIFO_UNDERFLOW             BIT(5)
+#define LCD_SYNC_LOST                  BIT(2)
+
+/* LCD DMA Control Register */
+#define LCD_DMA_BURST_SIZE(x)          ((x) << 4)
+#define LCD_DMA_BURST_1                        0x0
+#define LCD_DMA_BURST_2                        0x1
+#define LCD_DMA_BURST_4                        0x2
+#define LCD_DMA_BURST_8                        0x3
+#define LCD_DMA_BURST_16               0x4
+#define LCD_END_OF_FRAME_INT_ENA       BIT(2)
+#define LCD_DUAL_FRAME_BUFFER_ENABLE   BIT(0)
+
+/* LCD Control Register */
+#define LCD_CLK_DIVISOR(x)             ((x) << 8)
+#define LCD_RASTER_MODE                        0x01
+
+/* LCD Raster Control Register */
+#define LCD_PALETTE_LOAD_MODE(x)       ((x) << 20)
+#define PALETTE_AND_DATA               0x00
+#define PALETTE_ONLY                   0x01
+
+#define LCD_MONO_8BIT_MODE             BIT(9)
+#define LCD_RASTER_ORDER               BIT(8)
+#define LCD_TFT_MODE                   BIT(7)
+#define LCD_UNDERFLOW_INT_ENA          BIT(6)
+#define LCD_MONOCHROME_MODE            BIT(1)
+#define LCD_RASTER_ENABLE              BIT(0)
+#define LCD_TFT_ALT_ENABLE             BIT(23)
+#define LCD_STN_565_ENABLE             BIT(24)
+
+/* LCD Raster Timing 2 Register */
+#define LCD_AC_BIAS_TRANSITIONS_PER_INT(x)     ((x) << 16)
+#define LCD_AC_BIAS_FREQUENCY(x)               ((x) << 8)
+#define LCD_SYNC_CTRL                          BIT(25)
+#define LCD_SYNC_EDGE                          BIT(24)
+#define LCD_INVERT_PIXEL_CLOCK                 BIT(22)
+#define LCD_INVERT_LINE_CLOCK                  BIT(21)
+#define LCD_INVERT_FRAME_CLOCK                 BIT(20)
+
+/* LCD Block */
+#define  LCD_CTRL_REG                          0x4
+#define  LCD_STAT_REG                          0x8
+#define  LCD_RASTER_CTRL_REG                   0x28
+#define  LCD_RASTER_TIMING_0_REG               0x2C
+#define  LCD_RASTER_TIMING_1_REG               0x30
+#define  LCD_RASTER_TIMING_2_REG               0x34
+#define  LCD_DMA_CTRL_REG                      0x40
+#define  LCD_DMA_FRM_BUF_BASE_ADDR_0_REG       0x44
+#define  LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG    0x48
+
+#define WSI_TIMEOUT    50
+#define PALETTE_SIZE   256
+#define LEFT_MARGIN    64
+#define RIGHT_MARGIN   64
+#define UPPER_MARGIN   32
+#define LOWER_MARGIN   32
+
+static resource_size_t da8xx_fb_reg_base;
+static struct resource *lcdc_regs;
+
+static inline unsigned int lcdc_read(unsigned int addr)
+{
+       return (unsigned int)__raw_readl(da8xx_fb_reg_base + (addr));
+}
+
+static inline void lcdc_write(unsigned int val, unsigned int addr)
+{
+       __raw_writel(val, da8xx_fb_reg_base + (addr));
+}
+
+struct da8xx_fb_par {
+       resource_size_t p_palette_base;
+       unsigned char *v_palette_base;
+       struct clk *lcdc_clk;
+       int irq;
+       unsigned short pseudo_palette[16];
+       unsigned int databuf_sz;
+       unsigned int palette_sz;
+};
+
+/* Variable Screen Information */
+static struct fb_var_screeninfo da8xx_fb_var __devinitdata = {
+       .xoffset = 0,
+       .yoffset = 0,
+       .transp = {0, 0, 0},
+       .nonstd = 0,
+       .activate = 0,
+       .height = -1,
+       .width = -1,
+       .pixclock = 46666,      /* 46us - AUO display */
+       .accel_flags = 0,
+       .left_margin = LEFT_MARGIN,
+       .right_margin = RIGHT_MARGIN,
+       .upper_margin = UPPER_MARGIN,
+       .lower_margin = LOWER_MARGIN,
+       .sync = 0,
+       .vmode = FB_VMODE_NONINTERLACED
+};
+
+static struct fb_fix_screeninfo da8xx_fb_fix __devinitdata = {
+       .id = "DA8xx FB Drv",
+       .type = FB_TYPE_PACKED_PIXELS,
+       .type_aux = 0,
+       .visual = FB_VISUAL_PSEUDOCOLOR,
+       .xpanstep = 1,
+       .ypanstep = 1,
+       .ywrapstep = 1,
+       .accel = FB_ACCEL_NONE
+};
+
+struct da8xx_panel {
+       const char      name[25];       /* Full name <vendor>_<model> */
+       unsigned short  width;
+       unsigned short  height;
+       int             hfp;            /* Horizontal front porch */
+       int             hbp;            /* Horizontal back porch */
+       int             hsw;            /* Horizontal Sync Pulse Width */
+       int             vfp;            /* Vertical front porch */
+       int             vbp;            /* Vertical back porch */
+       int             vsw;            /* Vertical Sync Pulse Width */
+       int             pxl_clk;        /* Pixel clock */
+       unsigned char   invert_pxl_clk; /* Invert Pixel clock */
+};
+
+static struct da8xx_panel known_lcd_panels[] = {
+       /* Sharp LCD035Q3DG01 */
+       [0] = {
+               .name = "Sharp_LCD035Q3DG01",
+               .width = 320,
+               .height = 240,
+               .hfp = 8,
+               .hbp = 6,
+               .hsw = 0,
+               .vfp = 2,
+               .vbp = 2,
+               .vsw = 0,
+               .pxl_clk = 0x10,
+               .invert_pxl_clk = 1,
+       },
+       /* Sharp LK043T1DG01 */
+       [1] = {
+               .name = "Sharp_LK043T1DG01",
+               .width = 480,
+               .height = 272,
+               .hfp = 2,
+               .hbp = 2,
+               .hsw = 41,
+               .vfp = 2,
+               .vbp = 2,
+               .vsw = 10,
+               .pxl_clk = 0x12,
+               .invert_pxl_clk = 0,
+       },
+};
+
+/* Disable the Raster Engine of the LCD Controller */
+static void lcd_disable_raster(struct da8xx_fb_par *par)
+{
+       u32 reg;
+
+       reg = lcdc_read(LCD_RASTER_CTRL_REG);
+       if (reg & LCD_RASTER_ENABLE)
+               lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+}
+
+static void lcd_blit(int load_mode, struct da8xx_fb_par *par)
+{
+       u32 tmp = par->p_palette_base + par->databuf_sz - 4;
+       u32 reg;
+
+       /* Update the databuf in the hw. */
+       lcdc_write(par->p_palette_base, LCD_DMA_FRM_BUF_BASE_ADDR_0_REG);
+       lcdc_write(tmp, LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG);
+
+       /* Start the DMA. */
+       reg = lcdc_read(LCD_RASTER_CTRL_REG);
+       reg &= ~(3 << 20);
+       if (load_mode == LOAD_DATA)
+               reg |= LCD_PALETTE_LOAD_MODE(PALETTE_AND_DATA);
+       else if (load_mode == LOAD_PALETTE)
+               reg |= LCD_PALETTE_LOAD_MODE(PALETTE_ONLY);
+
+       lcdc_write(reg, LCD_RASTER_CTRL_REG);
+}
+
+/* Configure the Burst Size of DMA */
+static int lcd_cfg_dma(int burst_size)
+{
+       u32 reg;
+
+       reg = lcdc_read(LCD_DMA_CTRL_REG) & 0x00000001;
+       switch (burst_size) {
+       case 1:
+               reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_1);
+               break;
+       case 2:
+               reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_2);
+               break;
+       case 4:
+               reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_4);
+               break;
+       case 8:
+               reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_8);
+               break;
+       case 16:
+               reg |= LCD_DMA_BURST_SIZE(LCD_DMA_BURST_16);
+               break;
+       default:
+               return -EINVAL;
+       }
+       lcdc_write(reg, LCD_DMA_CTRL_REG);
+
+       return 0;
+}
+
+static void lcd_cfg_ac_bias(int period, int transitions_per_int)
+{
+       u32 reg;
+
+       /* Set the AC Bias Period and Number of Transisitons per Interrupt */
+       reg = lcdc_read(LCD_RASTER_TIMING_2_REG) & 0xFFF00000;
+       reg |= LCD_AC_BIAS_FREQUENCY(period) |
+               LCD_AC_BIAS_TRANSITIONS_PER_INT(transitions_per_int);
+       lcdc_write(reg, LCD_RASTER_TIMING_2_REG);
+}
+
+static void lcd_cfg_horizontal_sync(int back_porch, int pulse_width,
+               int front_porch)
+{
+       u32 reg;
+
+       reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0xf;
+       reg |= ((back_porch & 0xff) << 24)
+           | ((front_porch & 0xff) << 16)
+           | ((pulse_width & 0x3f) << 10);
+       lcdc_write(reg, LCD_RASTER_TIMING_0_REG);
+}
+
+static void lcd_cfg_vertical_sync(int back_porch, int pulse_width,
+               int front_porch)
+{
+       u32 reg;
+
+       reg = lcdc_read(LCD_RASTER_TIMING_1_REG) & 0x3ff;
+       reg |= ((back_porch & 0xff) << 24)
+           | ((front_porch & 0xff) << 16)
+           | ((pulse_width & 0x3f) << 10);
+       lcdc_write(reg, LCD_RASTER_TIMING_1_REG);
+}
+
+static int lcd_cfg_display(const struct lcd_ctrl_config *cfg)
+{
+       u32 reg;
+
+       reg = lcdc_read(LCD_RASTER_CTRL_REG) & ~(LCD_TFT_MODE |
+                                               LCD_MONO_8BIT_MODE |
+                                               LCD_MONOCHROME_MODE);
+
+       switch (cfg->p_disp_panel->panel_shade) {
+       case MONOCHROME:
+               reg |= LCD_MONOCHROME_MODE;
+               if (cfg->mono_8bit_mode)
+                       reg |= LCD_MONO_8BIT_MODE;
+               break;
+       case COLOR_ACTIVE:
+               reg |= LCD_TFT_MODE;
+               if (cfg->tft_alt_mode)
+                       reg |= LCD_TFT_ALT_ENABLE;
+               break;
+
+       case COLOR_PASSIVE:
+               if (cfg->stn_565_mode)
+                       reg |= LCD_STN_565_ENABLE;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       /* enable additional interrupts here */
+       reg |= LCD_UNDERFLOW_INT_ENA;
+
+       lcdc_write(reg, LCD_RASTER_CTRL_REG);
+
+       reg = lcdc_read(LCD_RASTER_TIMING_2_REG);
+
+       if (cfg->sync_ctrl)
+               reg |= LCD_SYNC_CTRL;
+       else
+               reg &= ~LCD_SYNC_CTRL;
+
+       if (cfg->sync_edge)
+               reg |= LCD_SYNC_EDGE;
+       else
+               reg &= ~LCD_SYNC_EDGE;
+
+       if (cfg->invert_line_clock)
+               reg |= LCD_INVERT_LINE_CLOCK;
+       else
+               reg &= ~LCD_INVERT_LINE_CLOCK;
+
+       if (cfg->invert_frm_clock)
+               reg |= LCD_INVERT_FRAME_CLOCK;
+       else
+               reg &= ~LCD_INVERT_FRAME_CLOCK;
+
+       lcdc_write(reg, LCD_RASTER_TIMING_2_REG);
+
+       return 0;
+}
+
+static int lcd_cfg_frame_buffer(struct da8xx_fb_par *par, u32 width, u32 height,
+               u32 bpp, u32 raster_order)
+{
+       u32 bpl, reg;
+
+       /* Disable Dual Frame Buffer. */
+       reg = lcdc_read(LCD_DMA_CTRL_REG);
+       lcdc_write(reg & ~LCD_DUAL_FRAME_BUFFER_ENABLE,
+                                               LCD_DMA_CTRL_REG);
+       /* Set the Panel Width */
+       /* Pixels per line = (PPL + 1)*16 */
+       /*0x3F in bits 4..9 gives max horisontal resolution = 1024 pixels*/
+       width &= 0x3f0;
+       reg = lcdc_read(LCD_RASTER_TIMING_0_REG);
+       reg &= 0xfffffc00;
+       reg |= ((width >> 4) - 1) << 4;
+       lcdc_write(reg, LCD_RASTER_TIMING_0_REG);
+
+       /* Set the Panel Height */
+       reg = lcdc_read(LCD_RASTER_TIMING_1_REG);
+       reg = ((height - 1) & 0x3ff) | (reg & 0xfffffc00);
+       lcdc_write(reg, LCD_RASTER_TIMING_1_REG);
+
+       /* Set the Raster Order of the Frame Buffer */
+       reg = lcdc_read(LCD_RASTER_CTRL_REG) & ~(1 << 8);
+       if (raster_order)
+               reg |= LCD_RASTER_ORDER;
+       lcdc_write(reg, LCD_RASTER_CTRL_REG);
+
+       switch (bpp) {
+       case 1:
+       case 2:
+       case 4:
+       case 16:
+               par->palette_sz = 16 * 2;
+               break;
+
+       case 8:
+               par->palette_sz = 256 * 2;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       bpl = width * bpp / 8;
+       par->databuf_sz = height * bpl + par->palette_sz;
+
+       return 0;
+}
+
+static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                             unsigned blue, unsigned transp,
+                             struct fb_info *info)
+{
+       struct da8xx_fb_par *par = info->par;
+       unsigned short *palette = (unsigned short *)par->v_palette_base;
+       u_short pal;
+
+       if (regno > 255)
+               return 1;
+
+       if (info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+               return 1;
+
+       if (info->var.bits_per_pixel == 8) {
+               red >>= 4;
+               green >>= 8;
+               blue >>= 12;
+
+               pal = (red & 0x0f00);
+               pal |= (green & 0x00f0);
+               pal |= (blue & 0x000f);
+
+               palette[regno] = pal;
+
+       } else if ((info->var.bits_per_pixel == 16) && regno < 16) {
+               red >>= (16 - info->var.red.length);
+               red <<= info->var.red.offset;
+
+               green >>= (16 - info->var.green.length);
+               green <<= info->var.green.offset;
+
+               blue >>= (16 - info->var.blue.length);
+               blue <<= info->var.blue.offset;
+
+               par->pseudo_palette[regno] = red | green | blue;
+
+               palette[0] = 0x4000;
+       }
+
+       return 0;
+}
+
+static void lcd_reset(struct da8xx_fb_par *par)
+{
+       /* Disable the Raster if previously Enabled */
+       if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
+               lcd_disable_raster(par);
+
+       /* DMA has to be disabled */
+       lcdc_write(0, LCD_DMA_CTRL_REG);
+       lcdc_write(0, LCD_RASTER_CTRL_REG);
+}
+
+static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
+               struct da8xx_panel *panel)
+{
+       u32 bpp;
+       int ret = 0;
+
+       lcd_reset(par);
+
+       /* Configure the LCD clock divisor. */
+       lcdc_write(LCD_CLK_DIVISOR(panel->pxl_clk) |
+                       (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG);
+
+       if (panel->invert_pxl_clk)
+               lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) |
+                       LCD_INVERT_PIXEL_CLOCK), LCD_RASTER_TIMING_2_REG);
+       else
+               lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) &
+                       ~LCD_INVERT_PIXEL_CLOCK), LCD_RASTER_TIMING_2_REG);
+
+       /* Configure the DMA burst size. */
+       ret = lcd_cfg_dma(cfg->dma_burst_sz);
+       if (ret < 0)
+               return ret;
+
+       /* Configure the AC bias properties. */
+       lcd_cfg_ac_bias(cfg->ac_bias, cfg->ac_bias_intrpt);
+
+       /* Configure the vertical and horizontal sync properties. */
+       lcd_cfg_vertical_sync(panel->vbp, panel->vsw, panel->vfp);
+       lcd_cfg_horizontal_sync(panel->hbp, panel->hsw, panel->hfp);
+
+       /* Configure for disply */
+       ret = lcd_cfg_display(cfg);
+       if (ret < 0)
+               return ret;
+
+       if (QVGA != cfg->p_disp_panel->panel_type)
+               return -EINVAL;
+
+       if (cfg->bpp <= cfg->p_disp_panel->max_bpp &&
+           cfg->bpp >= cfg->p_disp_panel->min_bpp)
+               bpp = cfg->bpp;
+       else
+               bpp = cfg->p_disp_panel->max_bpp;
+       if (bpp == 12)
+               bpp = 16;
+       ret = lcd_cfg_frame_buffer(par, (unsigned int)panel->width,
+                               (unsigned int)panel->height, bpp,
+                               cfg->raster_order);
+       if (ret < 0)
+               return ret;
+
+       /* Configure FDD */
+       lcdc_write((lcdc_read(LCD_RASTER_CTRL_REG) & 0xfff00fff) |
+                      (cfg->fdd << 12), LCD_RASTER_CTRL_REG);
+
+       return 0;
+}
+
+static irqreturn_t lcdc_irq_handler(int irq, void *arg)
+{
+       u32 stat = lcdc_read(LCD_STAT_REG);
+       u32 reg;
+
+       if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
+               reg = lcdc_read(LCD_RASTER_CTRL_REG);
+               lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+               lcdc_write(stat, LCD_STAT_REG);
+               lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+       } else
+               lcdc_write(stat, LCD_STAT_REG);
+
+       return IRQ_HANDLED;
+}
+
+static int fb_check_var(struct fb_var_screeninfo *var,
+                       struct fb_info *info)
+{
+       int err = 0;
+
+       switch (var->bits_per_pixel) {
+       case 1:
+       case 8:
+               var->red.offset = 0;
+               var->red.length = 8;
+               var->green.offset = 0;
+               var->green.length = 8;
+               var->blue.offset = 0;
+               var->blue.length = 8;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               break;
+       case 4:
+               var->red.offset = 0;
+               var->red.length = 4;
+               var->green.offset = 0;
+               var->green.length = 4;
+               var->blue.offset = 0;
+               var->blue.length = 4;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               break;
+       case 16:                /* RGB 565 */
+               var->red.offset = 0;
+               var->red.length = 5;
+               var->green.offset = 5;
+               var->green.length = 6;
+               var->blue.offset = 11;
+               var->blue.length = 5;
+               var->transp.offset = 0;
+               var->transp.length = 0;
+               break;
+       default:
+               err = -EINVAL;
+       }
+
+       var->red.msb_right = 0;
+       var->green.msb_right = 0;
+       var->blue.msb_right = 0;
+       var->transp.msb_right = 0;
+       return err;
+}
+
+static int __devexit fb_remove(struct platform_device *dev)
+{
+       struct fb_info *info = dev_get_drvdata(&dev->dev);
+
+       if (info) {
+               struct da8xx_fb_par *par = info->par;
+
+               if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
+                       lcd_disable_raster(par);
+               lcdc_write(0, LCD_RASTER_CTRL_REG);
+
+               /* disable DMA  */
+               lcdc_write(0, LCD_DMA_CTRL_REG);
+
+               unregister_framebuffer(info);
+               fb_dealloc_cmap(&info->cmap);
+               dma_free_coherent(NULL, par->databuf_sz + PAGE_SIZE,
+                                       info->screen_base,
+                                       info->fix.smem_start);
+               free_irq(par->irq, par);
+               clk_disable(par->lcdc_clk);
+               clk_put(par->lcdc_clk);
+               framebuffer_release(info);
+               iounmap((void __iomem *)da8xx_fb_reg_base);
+               release_mem_region(lcdc_regs->start, resource_size(lcdc_regs));
+
+       }
+       return 0;
+}
+
+static int fb_ioctl(struct fb_info *info, unsigned int cmd,
+                         unsigned long arg)
+{
+       struct lcd_sync_arg sync_arg;
+
+       switch (cmd) {
+       case FBIOGET_CONTRAST:
+       case FBIOPUT_CONTRAST:
+       case FBIGET_BRIGHTNESS:
+       case FBIPUT_BRIGHTNESS:
+       case FBIGET_COLOR:
+       case FBIPUT_COLOR:
+               return -ENOTTY;
+       case FBIPUT_HSYNC:
+               if (copy_from_user(&sync_arg, (char *)arg,
+                               sizeof(struct lcd_sync_arg)))
+                       return -EFAULT;
+               lcd_cfg_horizontal_sync(sync_arg.back_porch,
+                                       sync_arg.pulse_width,
+                                       sync_arg.front_porch);
+               break;
+       case FBIPUT_VSYNC:
+               if (copy_from_user(&sync_arg, (char *)arg,
+                               sizeof(struct lcd_sync_arg)))
+                       return -EFAULT;
+               lcd_cfg_vertical_sync(sync_arg.back_porch,
+                                       sync_arg.pulse_width,
+                                       sync_arg.front_porch);
+               break;
+       default:
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static struct fb_ops da8xx_fb_ops = {
+       .owner = THIS_MODULE,
+       .fb_check_var = fb_check_var,
+       .fb_setcolreg = fb_setcolreg,
+       .fb_ioctl = fb_ioctl,
+       .fb_fillrect = cfb_fillrect,
+       .fb_copyarea = cfb_copyarea,
+       .fb_imageblit = cfb_imageblit,
+};
+
+static int __init fb_probe(struct platform_device *device)
+{
+       struct da8xx_lcdc_platform_data *fb_pdata =
+                                               device->dev.platform_data;
+       struct lcd_ctrl_config *lcd_cfg;
+       struct da8xx_panel *lcdc_info;
+       struct fb_info *da8xx_fb_info;
+       struct clk *fb_clk = NULL;
+       struct da8xx_fb_par *par;
+       resource_size_t len;
+       int ret, i;
+
+       if (fb_pdata == NULL) {
+               dev_err(&device->dev, "Can not get platform data\n");
+               return -ENOENT;
+       }
+
+       lcdc_regs = platform_get_resource(device, IORESOURCE_MEM, 0);
+       if (!lcdc_regs) {
+               dev_err(&device->dev,
+                       "Can not get memory resource for LCD controller\n");
+               return -ENOENT;
+       }
+
+       len = resource_size(lcdc_regs);
+
+       lcdc_regs = request_mem_region(lcdc_regs->start, len, lcdc_regs->name);
+       if (!lcdc_regs)
+               return -EBUSY;
+
+       da8xx_fb_reg_base = (resource_size_t)ioremap(lcdc_regs->start, len);
+       if (!da8xx_fb_reg_base) {
+               ret = -EBUSY;
+               goto err_request_mem;
+       }
+
+       fb_clk = clk_get(&device->dev, NULL);
+       if (IS_ERR(fb_clk)) {
+               dev_err(&device->dev, "Can not get device clock\n");
+               ret = -ENODEV;
+               goto err_ioremap;
+       }
+       ret = clk_enable(fb_clk);
+       if (ret)
+               goto err_clk_put;
+
+       for (i = 0, lcdc_info = known_lcd_panels;
+               i < ARRAY_SIZE(known_lcd_panels);
+               i++, lcdc_info++) {
+               if (strcmp(fb_pdata->type, lcdc_info->name) == 0)
+                       break;
+       }
+
+       if (i == ARRAY_SIZE(known_lcd_panels)) {
+               dev_err(&device->dev, "GLCD: No valid panel found\n");
+               ret = ENODEV;
+               goto err_clk_disable;
+       } else
+               dev_info(&device->dev, "GLCD: Found %s panel\n",
+                                       fb_pdata->type);
+
+       lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data;
+
+       da8xx_fb_info = framebuffer_alloc(sizeof(struct da8xx_fb_par),
+                                       &device->dev);
+       if (!da8xx_fb_info) {
+               dev_dbg(&device->dev, "Memory allocation failed for fb_info\n");
+               ret = -ENOMEM;
+               goto err_clk_disable;
+       }
+
+       par = da8xx_fb_info->par;
+
+       if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
+               dev_err(&device->dev, "lcd_init failed\n");
+               ret = -EFAULT;
+               goto err_release_fb;
+       }
+
+       /* allocate frame buffer */
+       da8xx_fb_info->screen_base = dma_alloc_coherent(NULL,
+                                       par->databuf_sz + PAGE_SIZE,
+                                       (resource_size_t *)
+                                       &da8xx_fb_info->fix.smem_start,
+                                       GFP_KERNEL | GFP_DMA);
+
+       if (!da8xx_fb_info->screen_base) {
+               dev_err(&device->dev,
+                       "GLCD: kmalloc for frame buffer failed\n");
+               ret = -EINVAL;
+               goto err_release_fb;
+       }
+
+       /* move palette base pointer by (PAGE_SIZE - palette_sz) bytes */
+       par->v_palette_base = da8xx_fb_info->screen_base +
+                               (PAGE_SIZE - par->palette_sz);
+       par->p_palette_base = da8xx_fb_info->fix.smem_start +
+                               (PAGE_SIZE - par->palette_sz);
+
+       /* the rest of the frame buffer is pixel data */
+       da8xx_fb_fix.smem_start = par->p_palette_base + par->palette_sz;
+       da8xx_fb_fix.smem_len = par->databuf_sz - par->palette_sz;
+       da8xx_fb_fix.line_length = (lcdc_info->width * lcd_cfg->bpp) / 8;
+
+       par->lcdc_clk = fb_clk;
+
+       par->irq = platform_get_irq(device, 0);
+       if (par->irq < 0) {
+               ret = -ENOENT;
+               goto err_release_fb_mem;
+       }
+
+       ret = request_irq(par->irq, lcdc_irq_handler, 0, DRIVER_NAME, par);
+       if (ret)
+               goto err_release_fb_mem;
+
+       /* Initialize par */
+       da8xx_fb_info->var.bits_per_pixel = lcd_cfg->bpp;
+
+       da8xx_fb_var.xres = lcdc_info->width;
+       da8xx_fb_var.xres_virtual = lcdc_info->width;
+
+       da8xx_fb_var.yres = lcdc_info->height;
+       da8xx_fb_var.yres_virtual = lcdc_info->height;
+
+       da8xx_fb_var.grayscale =
+           lcd_cfg->p_disp_panel->panel_shade == MONOCHROME ? 1 : 0;
+       da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp;
+
+       da8xx_fb_var.hsync_len = lcdc_info->hsw;
+       da8xx_fb_var.vsync_len = lcdc_info->vsw;
+
+       /* Initialize fbinfo */
+       da8xx_fb_info->flags = FBINFO_FLAG_DEFAULT;
+       da8xx_fb_info->fix = da8xx_fb_fix;
+       da8xx_fb_info->var = da8xx_fb_var;
+       da8xx_fb_info->fbops = &da8xx_fb_ops;
+       da8xx_fb_info->pseudo_palette = par->pseudo_palette;
+
+       ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);
+       if (ret)
+               goto err_free_irq;
+
+       /* First palette_sz byte of the frame buffer is the palette */
+       da8xx_fb_info->cmap.len = par->palette_sz;
+
+       /* Flush the buffer to the screen. */
+       lcd_blit(LOAD_DATA, par);
+
+       /* initialize var_screeninfo */
+       da8xx_fb_var.activate = FB_ACTIVATE_FORCE;
+       fb_set_var(da8xx_fb_info, &da8xx_fb_var);
+
+       dev_set_drvdata(&device->dev, da8xx_fb_info);
+       /* Register the Frame Buffer  */
+       if (register_framebuffer(da8xx_fb_info) < 0) {
+               dev_err(&device->dev,
+                       "GLCD: Frame Buffer Registration Failed!\n");
+               ret = -EINVAL;
+               goto err_dealloc_cmap;
+       }
+
+       /* enable raster engine */
+       lcdc_write(lcdc_read(LCD_RASTER_CTRL_REG) |
+                       LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+
+       return 0;
+
+err_dealloc_cmap:
+       fb_dealloc_cmap(&da8xx_fb_info->cmap);
+
+err_free_irq:
+       free_irq(par->irq, par);
+
+err_release_fb_mem:
+       dma_free_coherent(NULL, par->databuf_sz + PAGE_SIZE,
+                               da8xx_fb_info->screen_base,
+                               da8xx_fb_info->fix.smem_start);
+
+err_release_fb:
+       framebuffer_release(da8xx_fb_info);
+
+err_clk_disable:
+       clk_disable(fb_clk);
+
+err_clk_put:
+       clk_put(fb_clk);
+
+err_ioremap:
+       iounmap((void __iomem *)da8xx_fb_reg_base);
+
+err_request_mem:
+       release_mem_region(lcdc_regs->start, len);
+
+       return ret;
+}
+
+#ifdef CONFIG_PM
+static int fb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        return -EBUSY;
+}
+static int fb_resume(struct platform_device *dev)
+{
+        return -EBUSY;
+}
+#else
+#define fb_suspend NULL
+#define fb_resume NULL
+#endif
+
+static struct platform_driver da8xx_fb_driver = {
+       .probe = fb_probe,
+       .remove = fb_remove,
+       .suspend = fb_suspend,
+       .resume = fb_resume,
+       .driver = {
+                  .name = DRIVER_NAME,
+                  .owner = THIS_MODULE,
+                  },
+};
+
+static int __init da8xx_fb_init(void)
+{
+       return platform_driver_register(&da8xx_fb_driver);
+}
+
+static void __exit da8xx_fb_cleanup(void)
+{
+       platform_driver_unregister(&da8xx_fb_driver);
+}
+
+module_init(da8xx_fb_init);
+module_exit(da8xx_fb_cleanup);
+
+MODULE_DESCRIPTION("Framebuffer driver for TI da8xx/omap-l1xx");
+MODULE_AUTHOR("Texas Instruments");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
new file mode 100644 (file)
index 0000000..bd9d46f
--- /dev/null
@@ -0,0 +1,646 @@
+/*
+ * linux/drivers/video/ep93xx-fb.c
+ *
+ * Framebuffer support for the EP93xx series.
+ *
+ * Copyright (C) 2007 Bluewater Systems Ltd
+ * Author: Ryan Mallon <ryan@bluewatersys.com>
+ *
+ * Copyright (c) 2009 H Hartley Sweeten <hsweeten@visionengravers.com>
+ *
+ * Based on the Cirrus Logic ep93xxfb driver, and various other ep93xxfb
+ * drivers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/clk.h>
+#include <linux/fb.h>
+
+#include <mach/fb.h>
+
+/* Vertical Frame Timing Registers */
+#define EP93XXFB_VLINES_TOTAL                  0x0000  /* SW locked */
+#define EP93XXFB_VSYNC                         0x0004  /* SW locked */
+#define EP93XXFB_VACTIVE                       0x0008  /* SW locked */
+#define EP93XXFB_VBLANK                                0x0228  /* SW locked */
+#define EP93XXFB_VCLK                          0x000c  /* SW locked */
+
+/* Horizontal Frame Timing Registers */
+#define EP93XXFB_HCLKS_TOTAL                   0x0010  /* SW locked */
+#define EP93XXFB_HSYNC                         0x0014  /* SW locked */
+#define EP93XXFB_HACTIVE                       0x0018  /* SW locked */
+#define EP93XXFB_HBLANK                                0x022c  /* SW locked */
+#define EP93XXFB_HCLK                          0x001c  /* SW locked */
+
+/* Frame Buffer Memory Configuration Registers */
+#define EP93XXFB_SCREEN_PAGE                   0x0028
+#define EP93XXFB_SCREEN_HPAGE                  0x002c
+#define EP93XXFB_SCREEN_LINES                  0x0030
+#define EP93XXFB_LINE_LENGTH                   0x0034
+#define EP93XXFB_VLINE_STEP                    0x0038
+#define EP93XXFB_LINE_CARRY                    0x003c  /* SW locked */
+#define EP93XXFB_EOL_OFFSET                    0x0230
+
+/* Other Video Registers */
+#define EP93XXFB_BRIGHTNESS                    0x0020
+#define EP93XXFB_ATTRIBS                       0x0024  /* SW locked */
+#define EP93XXFB_SWLOCK                                0x007c  /* SW locked */
+#define EP93XXFB_AC_RATE                       0x0214
+#define EP93XXFB_FIFO_LEVEL                    0x0234
+#define EP93XXFB_PIXELMODE                     0x0054
+#define EP93XXFB_PIXELMODE_32BPP               (0x7 << 0)
+#define EP93XXFB_PIXELMODE_24BPP               (0x6 << 0)
+#define EP93XXFB_PIXELMODE_16BPP               (0x4 << 0)
+#define EP93XXFB_PIXELMODE_8BPP                        (0x2 << 0)
+#define EP93XXFB_PIXELMODE_SHIFT_1P_24B                (0x0 << 3)
+#define EP93XXFB_PIXELMODE_SHIFT_1P_18B                (0x1 << 3)
+#define EP93XXFB_PIXELMODE_COLOR_LUT           (0x0 << 10)
+#define EP93XXFB_PIXELMODE_COLOR_888           (0x4 << 10)
+#define EP93XXFB_PIXELMODE_COLOR_555           (0x5 << 10)
+#define EP93XXFB_PARL_IF_OUT                   0x0058
+#define EP93XXFB_PARL_IF_IN                    0x005c
+
+/* Blink Control Registers */
+#define EP93XXFB_BLINK_RATE                    0x0040
+#define EP93XXFB_BLINK_MASK                    0x0044
+#define EP93XXFB_BLINK_PATTRN                  0x0048
+#define EP93XXFB_PATTRN_MASK                   0x004c
+#define EP93XXFB_BKGRND_OFFSET                 0x0050
+
+/* Hardware Cursor Registers */
+#define EP93XXFB_CURSOR_ADR_START              0x0060
+#define EP93XXFB_CURSOR_ADR_RESET              0x0064
+#define EP93XXFB_CURSOR_SIZE                   0x0068
+#define EP93XXFB_CURSOR_COLOR1                 0x006c
+#define EP93XXFB_CURSOR_COLOR2                 0x0070
+#define EP93XXFB_CURSOR_BLINK_COLOR1           0x021c
+#define EP93XXFB_CURSOR_BLINK_COLOR2           0x0220
+#define EP93XXFB_CURSOR_XY_LOC                 0x0074
+#define EP93XXFB_CURSOR_DSCAN_HY_LOC           0x0078
+#define EP93XXFB_CURSOR_BLINK_RATE_CTRL                0x0224
+
+/* LUT Registers */
+#define EP93XXFB_GRY_SCL_LUTR                  0x0080
+#define EP93XXFB_GRY_SCL_LUTG                  0x0280
+#define EP93XXFB_GRY_SCL_LUTB                  0x0300
+#define EP93XXFB_LUT_SW_CONTROL                        0x0218
+#define EP93XXFB_LUT_SW_CONTROL_SWTCH          (1 << 0)
+#define EP93XXFB_LUT_SW_CONTROL_SSTAT          (1 << 1)
+#define EP93XXFB_COLOR_LUT                     0x0400
+
+/* Video Signature Registers */
+#define EP93XXFB_VID_SIG_RSLT_VAL              0x0200
+#define EP93XXFB_VID_SIG_CTRL                  0x0204
+#define EP93XXFB_VSIG                          0x0208
+#define EP93XXFB_HSIG                          0x020c
+#define EP93XXFB_SIG_CLR_STR                   0x0210
+
+/* Minimum / Maximum resolutions supported */
+#define EP93XXFB_MIN_XRES                      64
+#define EP93XXFB_MIN_YRES                      64
+#define EP93XXFB_MAX_XRES                      1024
+#define EP93XXFB_MAX_YRES                      768
+
+struct ep93xx_fbi {
+       struct ep93xxfb_mach_info       *mach_info;
+       struct clk                      *clk;
+       struct resource                 *res;
+       void __iomem                    *mmio_base;
+       unsigned int                    pseudo_palette[256];
+};
+
+static int check_screenpage_bug = 1;
+module_param(check_screenpage_bug, int, 0644);
+MODULE_PARM_DESC(check_screenpage_bug,
+                "Check for bit 27 screen page bug. Default = 1");
+
+static inline unsigned int ep93xxfb_readl(struct ep93xx_fbi *fbi,
+                                         unsigned int off)
+{
+       return __raw_readl(fbi->mmio_base + off);
+}
+
+static inline void ep93xxfb_writel(struct ep93xx_fbi *fbi,
+                                  unsigned int val, unsigned int off)
+{
+       __raw_writel(val, fbi->mmio_base + off);
+}
+
+/*
+ * Write to one of the locked raster registers.
+ */
+static inline void ep93xxfb_out_locked(struct ep93xx_fbi *fbi,
+                                      unsigned int val, unsigned int reg)
+{
+       /*
+        * We don't need a lock or delay here since the raster register
+        * block will remain unlocked until the next access.
+        */
+       ep93xxfb_writel(fbi, 0xaa, EP93XXFB_SWLOCK);
+       ep93xxfb_writel(fbi, val, reg);
+}
+
+static void ep93xxfb_set_video_attribs(struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       unsigned int attribs;
+
+       attribs = EP93XXFB_ENABLE;
+       attribs |= fbi->mach_info->flags;
+       ep93xxfb_out_locked(fbi, attribs, EP93XXFB_ATTRIBS);
+}
+
+static int ep93xxfb_set_pixelmode(struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       unsigned int val;
+
+       info->var.transp.offset = 0;
+       info->var.transp.length = 0;
+
+       switch (info->var.bits_per_pixel) {
+       case 8:
+               val = EP93XXFB_PIXELMODE_8BPP | EP93XXFB_PIXELMODE_COLOR_LUT |
+                       EP93XXFB_PIXELMODE_SHIFT_1P_18B;
+
+               info->var.red.offset    = 0;
+               info->var.red.length    = 8;
+               info->var.green.offset  = 0;
+               info->var.green.length  = 8;
+               info->var.blue.offset   = 0;
+               info->var.blue.length   = 8;
+               info->fix.visual        = FB_VISUAL_PSEUDOCOLOR;
+               break;
+
+       case 16:
+               val = EP93XXFB_PIXELMODE_16BPP | EP93XXFB_PIXELMODE_COLOR_555 |
+                       EP93XXFB_PIXELMODE_SHIFT_1P_18B;
+
+               info->var.red.offset    = 11;
+               info->var.red.length    = 5;
+               info->var.green.offset  = 5;
+               info->var.green.length  = 6;
+               info->var.blue.offset   = 0;
+               info->var.blue.length   = 5;
+               info->fix.visual        = FB_VISUAL_TRUECOLOR;
+               break;
+
+       case 24:
+               val = EP93XXFB_PIXELMODE_24BPP | EP93XXFB_PIXELMODE_COLOR_888 |
+                       EP93XXFB_PIXELMODE_SHIFT_1P_24B;
+
+               info->var.red.offset    = 16;
+               info->var.red.length    = 8;
+               info->var.green.offset  = 8;
+               info->var.green.length  = 8;
+               info->var.blue.offset   = 0;
+               info->var.blue.length   = 8;
+               info->fix.visual        = FB_VISUAL_TRUECOLOR;
+               break;
+
+       case 32:
+               val = EP93XXFB_PIXELMODE_32BPP | EP93XXFB_PIXELMODE_COLOR_888 |
+                       EP93XXFB_PIXELMODE_SHIFT_1P_24B;
+
+               info->var.red.offset    = 16;
+               info->var.red.length    = 8;
+               info->var.green.offset  = 8;
+               info->var.green.length  = 8;
+               info->var.blue.offset   = 0;
+               info->var.blue.length   = 8;
+               info->fix.visual        = FB_VISUAL_TRUECOLOR;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       ep93xxfb_writel(fbi, val, EP93XXFB_PIXELMODE);
+       return 0;
+}
+
+static void ep93xxfb_set_timing(struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       unsigned int vlines_total, hclks_total, start, stop;
+
+       vlines_total = info->var.yres + info->var.upper_margin +
+               info->var.lower_margin + info->var.vsync_len - 1;
+
+       hclks_total = info->var.xres + info->var.left_margin +
+               info->var.right_margin + info->var.hsync_len - 1;
+
+       ep93xxfb_out_locked(fbi, vlines_total, EP93XXFB_VLINES_TOTAL);
+       ep93xxfb_out_locked(fbi, hclks_total, EP93XXFB_HCLKS_TOTAL);
+
+       start = vlines_total;
+       stop = vlines_total - info->var.vsync_len;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_VSYNC);
+
+       start = vlines_total - info->var.vsync_len - info->var.upper_margin;
+       stop = info->var.lower_margin - 1;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_VBLANK);
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_VACTIVE);
+
+       start = vlines_total;
+       stop = vlines_total + 1;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_VCLK);
+
+       start = hclks_total;
+       stop = hclks_total - info->var.hsync_len;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_HSYNC);
+
+       start = hclks_total - info->var.hsync_len - info->var.left_margin;
+       stop = info->var.right_margin - 1;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_HBLANK);
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_HACTIVE);
+
+       start = hclks_total;
+       stop = hclks_total;
+       ep93xxfb_out_locked(fbi, start | (stop << 16), EP93XXFB_HCLK);
+
+       ep93xxfb_out_locked(fbi, 0x0, EP93XXFB_LINE_CARRY);
+}
+
+static int ep93xxfb_set_par(struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+
+       clk_set_rate(fbi->clk, 1000 * PICOS2KHZ(info->var.pixclock));
+
+       ep93xxfb_set_timing(info);
+
+       info->fix.line_length = info->var.xres_virtual *
+               info->var.bits_per_pixel / 8;
+
+       ep93xxfb_writel(fbi, info->fix.smem_start, EP93XXFB_SCREEN_PAGE);
+       ep93xxfb_writel(fbi, info->var.yres - 1, EP93XXFB_SCREEN_LINES);
+       ep93xxfb_writel(fbi, ((info->var.xres * info->var.bits_per_pixel)
+                             / 32) - 1, EP93XXFB_LINE_LENGTH);
+       ep93xxfb_writel(fbi, info->fix.line_length / 4, EP93XXFB_VLINE_STEP);
+       ep93xxfb_set_video_attribs(info);
+       return 0;
+}
+
+static int ep93xxfb_check_var(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+       int err;
+
+       err = ep93xxfb_set_pixelmode(info);
+       if (err)
+               return err;
+
+       var->xres = max_t(unsigned int, var->xres, EP93XXFB_MIN_XRES);
+       var->xres = min_t(unsigned int, var->xres, EP93XXFB_MAX_XRES);
+       var->xres_virtual = max(var->xres_virtual, var->xres);
+
+       var->yres = max_t(unsigned int, var->yres, EP93XXFB_MIN_YRES);
+       var->yres = min_t(unsigned int, var->yres, EP93XXFB_MAX_YRES);
+       var->yres_virtual = max(var->yres_virtual, var->yres);
+
+       return 0;
+}
+
+static int ep93xxfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+       unsigned int offset = vma->vm_pgoff << PAGE_SHIFT;
+
+       if (offset < info->fix.smem_len) {
+               return dma_mmap_writecombine(info->dev, vma, info->screen_base,
+                                            info->fix.smem_start,
+                                            info->fix.smem_len);
+       }
+
+       return -EINVAL;
+}
+
+static int ep93xxfb_blank(int blank_mode, struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       unsigned int attribs = ep93xxfb_readl(fbi, EP93XXFB_ATTRIBS);
+
+       if (blank_mode) {
+               if (fbi->mach_info->blank)
+                       fbi->mach_info->blank(blank_mode, info);
+               ep93xxfb_out_locked(fbi, attribs & ~EP93XXFB_ENABLE,
+                                   EP93XXFB_ATTRIBS);
+               clk_disable(fbi->clk);
+       } else {
+               clk_enable(fbi->clk);
+               ep93xxfb_out_locked(fbi, attribs | EP93XXFB_ENABLE,
+                                   EP93XXFB_ATTRIBS);
+               if (fbi->mach_info->blank)
+                       fbi->mach_info->blank(blank_mode, info);
+       }
+
+       return 0;
+}
+
+static inline int ep93xxfb_convert_color(int val, int width)
+{
+       return ((val << width) + 0x7fff - val) >> 16;
+}
+
+static int ep93xxfb_setcolreg(unsigned int regno, unsigned int red,
+                             unsigned int green, unsigned int blue,
+                             unsigned int transp, struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       unsigned int *pal = info->pseudo_palette;
+       unsigned int ctrl, i, rgb, lut_current, lut_stat;
+
+       switch (info->fix.visual) {
+       case FB_VISUAL_PSEUDOCOLOR:
+               rgb = ((red & 0xff00) << 8) | (green & 0xff00) |
+                       ((blue & 0xff00) >> 8);
+
+               pal[regno] = rgb;
+               ep93xxfb_writel(fbi, rgb, (EP93XXFB_COLOR_LUT + (regno << 2)));
+               ctrl = ep93xxfb_readl(fbi, EP93XXFB_LUT_SW_CONTROL);
+               lut_stat = !!(ctrl & EP93XXFB_LUT_SW_CONTROL_SSTAT);
+               lut_current = !!(ctrl & EP93XXFB_LUT_SW_CONTROL_SWTCH);
+
+               if (lut_stat == lut_current) {
+                       for (i = 0; i < 256; i++) {
+                               ep93xxfb_writel(fbi, pal[i],
+                                       EP93XXFB_COLOR_LUT + (i << 2));
+                       }
+
+                       ep93xxfb_writel(fbi,
+                                       ctrl ^ EP93XXFB_LUT_SW_CONTROL_SWTCH,
+                                       EP93XXFB_LUT_SW_CONTROL);
+               }
+               break;
+
+       case FB_VISUAL_TRUECOLOR:
+               if (regno > 16)
+                       return 1;
+
+               red = ep93xxfb_convert_color(red, info->var.red.length);
+               green = ep93xxfb_convert_color(green, info->var.green.length);
+               blue = ep93xxfb_convert_color(blue, info->var.blue.length);
+               transp = ep93xxfb_convert_color(transp,
+                                               info->var.transp.length);
+
+               pal[regno] = (red << info->var.red.offset) |
+                       (green << info->var.green.offset) |
+                       (blue << info->var.blue.offset) |
+                       (transp << info->var.transp.offset);
+               break;
+
+       default:
+               return 1;
+       }
+
+       return 0;
+}
+
+static struct fb_ops ep93xxfb_ops = {
+       .owner          = THIS_MODULE,
+       .fb_check_var   = ep93xxfb_check_var,
+       .fb_set_par     = ep93xxfb_set_par,
+       .fb_blank       = ep93xxfb_blank,
+       .fb_fillrect    = cfb_fillrect,
+       .fb_copyarea    = cfb_copyarea,
+       .fb_imageblit   = cfb_imageblit,
+       .fb_setcolreg   = ep93xxfb_setcolreg,
+       .fb_mmap        = ep93xxfb_mmap,
+};
+
+static int __init ep93xxfb_calc_fbsize(struct ep93xxfb_mach_info *mach_info)
+{
+       int i, fb_size = 0;
+
+       if (mach_info->num_modes == EP93XXFB_USE_MODEDB) {
+               fb_size = EP93XXFB_MAX_XRES * EP93XXFB_MAX_YRES *
+                       mach_info->bpp / 8;
+       } else {
+               for (i = 0; i < mach_info->num_modes; i++) {
+                       const struct fb_videomode *mode;
+                       int size;
+
+                       mode = &mach_info->modes[i];
+                       size = mode->xres * mode->yres * mach_info->bpp / 8;
+                       if (size > fb_size)
+                               fb_size = size;
+               }
+       }
+
+       return fb_size;
+}
+
+static int __init ep93xxfb_alloc_videomem(struct fb_info *info)
+{
+       struct ep93xx_fbi *fbi = info->par;
+       char __iomem *virt_addr;
+       dma_addr_t phys_addr;
+       unsigned int fb_size;
+
+       fb_size = ep93xxfb_calc_fbsize(fbi->mach_info);
+       virt_addr = dma_alloc_writecombine(info->dev, fb_size,
+                                          &phys_addr, GFP_KERNEL);
+       if (!virt_addr)
+               return -ENOMEM;
+
+       /*
+        * There is a bug in the ep93xx framebuffer which causes problems
+        * if bit 27 of the physical address is set.
+        * See: http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2
+        * There does not seem to be any offical errata for this, but I
+        * have confirmed the problem exists on my hardware (ep9315) at
+        * least.
+        */
+       if (check_screenpage_bug && phys_addr & (1 << 27)) {
+               dev_err(info->dev, "ep93xx framebuffer bug. phys addr (0x%x) "
+                       "has bit 27 set: cannot init framebuffer\n",
+                       phys_addr);
+
+               dma_free_coherent(info->dev, fb_size, virt_addr, phys_addr);
+               return -ENOMEM;
+       }
+
+       info->fix.smem_start = phys_addr;
+       info->fix.smem_len = fb_size;
+       info->screen_base = virt_addr;
+
+       return 0;
+}
+
+static void ep93xxfb_dealloc_videomem(struct fb_info *info)
+{
+       if (info->screen_base)
+               dma_free_coherent(info->dev, info->fix.smem_len,
+                                 info->screen_base, info->fix.smem_start);
+}
+
+static int __init ep93xxfb_probe(struct platform_device *pdev)
+{
+       struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
+       struct fb_info *info;
+       struct ep93xx_fbi *fbi;
+       struct resource *res;
+       char *video_mode;
+       int err;
+
+       if (!mach_info)
+               return -EINVAL;
+
+       info = framebuffer_alloc(sizeof(struct ep93xx_fbi), &pdev->dev);
+       if (!info)
+               return -ENOMEM;
+
+       info->dev = &pdev->dev;
+       platform_set_drvdata(pdev, info);
+       fbi = info->par;
+       fbi->mach_info = mach_info;
+
+       err = fb_alloc_cmap(&info->cmap, 256, 0);
+       if (err)
+               goto failed;
+
+       err = ep93xxfb_alloc_videomem(info);
+       if (err)
+               goto failed;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               err = -ENXIO;
+               goto failed;
+       }
+
+       res = request_mem_region(res->start, resource_size(res), pdev->name);
+       if (!res) {
+               err = -EBUSY;
+               goto failed;
+       }
+
+       fbi->res = res;
+       fbi->mmio_base = ioremap(res->start, resource_size(res));
+       if (!fbi->mmio_base) {
+               err = -ENXIO;
+               goto failed;
+       }
+
+       strcpy(info->fix.id, pdev->name);
+       info->fbops             = &ep93xxfb_ops;
+       info->fix.type          = FB_TYPE_PACKED_PIXELS;
+       info->fix.accel         = FB_ACCEL_NONE;
+       info->var.activate      = FB_ACTIVATE_NOW;
+       info->var.vmode         = FB_VMODE_NONINTERLACED;
+       info->flags             = FBINFO_DEFAULT;
+       info->node              = -1;
+       info->state             = FBINFO_STATE_RUNNING;
+       info->pseudo_palette    = &fbi->pseudo_palette;
+
+       fb_get_options("ep93xx-fb", &video_mode);
+       err = fb_find_mode(&info->var, info, video_mode,
+                          fbi->mach_info->modes, fbi->mach_info->num_modes,
+                          fbi->mach_info->default_mode, fbi->mach_info->bpp);
+       if (err == 0) {
+               dev_err(info->dev, "No suitable video mode found\n");
+               err = -EINVAL;
+               goto failed;
+       }
+
+       if (mach_info->setup) {
+               err = mach_info->setup(pdev);
+               if (err)
+                       return err;
+       }
+
+       err = ep93xxfb_check_var(&info->var, info);
+       if (err)
+               goto failed;
+
+       fbi->clk = clk_get(info->dev, NULL);
+       if (IS_ERR(fbi->clk)) {
+               err = PTR_ERR(fbi->clk);
+               fbi->clk = NULL;
+               goto failed;
+       }
+
+       ep93xxfb_set_par(info);
+       clk_enable(fbi->clk);
+
+       err = register_framebuffer(info);
+       if (err)
+               goto failed;
+
+       dev_info(info->dev, "registered. Mode = %dx%d-%d\n",
+                info->var.xres, info->var.yres, info->var.bits_per_pixel);
+       return 0;
+
+failed:
+       if (fbi->clk)
+               clk_put(fbi->clk);
+       if (fbi->mmio_base)
+               iounmap(fbi->mmio_base);
+       if (fbi->res)
+               release_mem_region(fbi->res->start, resource_size(fbi->res));
+       ep93xxfb_dealloc_videomem(info);
+       if (&info->cmap)
+               fb_dealloc_cmap(&info->cmap);
+       if (fbi->mach_info->teardown)
+               fbi->mach_info->teardown(pdev);
+       kfree(info);
+       platform_set_drvdata(pdev, NULL);
+
+       return err;
+}
+
+static int ep93xxfb_remove(struct platform_device *pdev)
+{
+       struct fb_info *info = platform_get_drvdata(pdev);
+       struct ep93xx_fbi *fbi = info->par;
+
+       unregister_framebuffer(info);
+       clk_disable(fbi->clk);
+       clk_put(fbi->clk);
+       iounmap(fbi->mmio_base);
+       release_mem_region(fbi->res->start, resource_size(fbi->res));
+       ep93xxfb_dealloc_videomem(info);
+       fb_dealloc_cmap(&info->cmap);
+
+       if (fbi->mach_info->teardown)
+               fbi->mach_info->teardown(pdev);
+
+       kfree(info);
+       platform_set_drvdata(pdev, NULL);
+
+       return 0;
+}
+
+static struct platform_driver ep93xxfb_driver = {
+       .probe          = ep93xxfb_probe,
+       .remove         = ep93xxfb_remove,
+       .driver = {
+               .name   = "ep93xx-fb",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __devinit ep93xxfb_init(void)
+{
+       return platform_driver_register(&ep93xxfb_driver);
+}
+
+static void __exit ep93xxfb_exit(void)
+{
+       platform_driver_unregister(&ep93xxfb_driver);
+}
+
+module_init(ep93xxfb_init);
+module_exit(ep93xxfb_exit);
+
+MODULE_DESCRIPTION("EP93XX Framebuffer Driver");
+MODULE_ALIAS("platform:ep93xx-fb");
+MODULE_AUTHOR("Ryan Mallon <ryan&bluewatersys.com>, "
+             "H Hartley Sweeten <hsweeten@visionengravers.com");
+MODULE_LICENSE("GPL");
index a85c818..a1f2e7c 100644 (file)
@@ -871,8 +871,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
                err = -EINVAL;
 
        if (err || !info->fbops->fb_pan_display ||
-           var->yoffset + yres > info->var.yres_virtual ||
-           var->xoffset + info->var.xres > info->var.xres_virtual)
+           var->yoffset > info->var.yres_virtual - yres ||
+           var->xoffset > info->var.xres_virtual - info->var.xres)
                return -EINVAL;
 
        if ((err = info->fbops->fb_pan_display(var, info)))
@@ -954,6 +954,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                        goto done;
 
                if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
+                       struct fb_var_screeninfo old_var;
                        struct fb_videomode mode;
 
                        if (info->fbops->fb_get_caps) {
@@ -963,10 +964,20 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                                        goto done;
                        }
 
+                       old_var = info->var;
                        info->var = *var;
 
-                       if (info->fbops->fb_set_par)
-                               info->fbops->fb_set_par(info);
+                       if (info->fbops->fb_set_par) {
+                               ret = info->fbops->fb_set_par(info);
+
+                               if (ret) {
+                                       info->var = old_var;
+                                       printk(KERN_WARNING "detected "
+                                               "fb_set_par error, "
+                                               "error code: %d\n", ret);
+                                       goto done;
+                               }
+                       }
 
                        fb_pan_display(info, &info->var);
                        fb_set_cmap(&info->cmap, info);
index 30ae302..66358fa 100644 (file)
@@ -710,7 +710,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 
        fbi->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(fbi->clk)) {
-               ret = PTR_ERR(fbi->clk);;
+               ret = PTR_ERR(fbi->clk);
                dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
                goto failed_getclock;
        }
index d42346e..09f6e04 100644 (file)
@@ -25,16 +25,19 @@ static inline unsigned int g450_f2vco(unsigned char p, unsigned int fin) {
        return (p & 0x40) ? fin : fin << ((p & 3) + 1);
 }
 
-static unsigned int g450_mnp2vco(CPMINFO unsigned int mnp) {
+static unsigned int g450_mnp2vco(const struct matrox_fb_info *minfo,
+                                unsigned int mnp)
+{
        unsigned int m, n;
 
        m = ((mnp >> 16) & 0x0FF) + 1;
        n = ((mnp >>  7) & 0x1FE) + 4;
-       return (ACCESS_FBINFO(features).pll.ref_freq * n + (m >> 1)) / m;
+       return (minfo->features.pll.ref_freq * n + (m >> 1)) / m;
 }
 
-unsigned int g450_mnp2f(CPMINFO unsigned int mnp) {
-       return g450_vco2f(mnp, g450_mnp2vco(PMINFO mnp));
+unsigned int g450_mnp2f(const struct matrox_fb_info *minfo, unsigned int mnp)
+{
+       return g450_vco2f(mnp, g450_mnp2vco(minfo, mnp));
 }
 
 static inline unsigned int pll_freq_delta(unsigned int f1, unsigned int f2) {
@@ -49,7 +52,10 @@ static inline unsigned int pll_freq_delta(unsigned int f1, unsigned int f2) {
 #define NO_MORE_MNP    0x01FFFFFF
 #define G450_MNP_FREQBITS      (0xFFFFFF43)    /* do not mask high byte so we'll catch NO_MORE_MNP */
 
-static unsigned int g450_nextpll(CPMINFO const struct matrox_pll_limits* pi, unsigned int* fvco, unsigned int mnp) {
+static unsigned int g450_nextpll(const struct matrox_fb_info *minfo,
+                                const struct matrox_pll_limits *pi,
+                                unsigned int *fvco, unsigned int mnp)
+{
        unsigned int m, n, p;
        unsigned int tvco = *fvco;
 
@@ -90,12 +96,15 @@ static unsigned int g450_nextpll(CPMINFO const struct matrox_pll_limits* pi, uns
                } else {
                        m--;
                }
-               n = ((tvco * (m+1) + ACCESS_FBINFO(features).pll.ref_freq) / (ACCESS_FBINFO(features).pll.ref_freq * 2)) - 2;
+               n = ((tvco * (m+1) + minfo->features.pll.ref_freq) / (minfo->features.pll.ref_freq * 2)) - 2;
        } while (n < 0x03 || n > 0x7A);
        return (m << 16) | (n << 8) | p;
 }
 
-static unsigned int g450_firstpll(CPMINFO const struct matrox_pll_limits* pi, unsigned int* vco, unsigned int fout) {
+static unsigned int g450_firstpll(const struct matrox_fb_info *minfo,
+                                 const struct matrox_pll_limits *pi,
+                                 unsigned int *vco, unsigned int fout)
+{
        unsigned int p;
        unsigned int vcomax;
 
@@ -121,88 +130,94 @@ static unsigned int g450_firstpll(CPMINFO const struct matrox_pll_limits* pi, un
                }
                *vco = tvco;
        }
-       return g450_nextpll(PMINFO pi, vco, 0xFF0000 | p);
+       return g450_nextpll(minfo, pi, vco, 0xFF0000 | p);
 }
 
-static inline unsigned int g450_setpll(CPMINFO unsigned int mnp, unsigned int pll) {
+static inline unsigned int g450_setpll(const struct matrox_fb_info *minfo,
+                                      unsigned int mnp, unsigned int pll)
+{
        switch (pll) {
                case M_PIXEL_PLL_A:
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLAM, mnp >> 16);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLAN, mnp >> 8);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLAP, mnp);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLAM, mnp >> 16);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLAN, mnp >> 8);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLAP, mnp);
                        return M1064_XPIXPLLSTAT;
 
                case M_PIXEL_PLL_B:
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLBM, mnp >> 16);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLBN, mnp >> 8);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLBP, mnp);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLBM, mnp >> 16);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLBN, mnp >> 8);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLBP, mnp);
                        return M1064_XPIXPLLSTAT;
 
                case M_PIXEL_PLL_C:
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLCM, mnp >> 16);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLCN, mnp >> 8);
-                       matroxfb_DAC_out(PMINFO M1064_XPIXPLLCP, mnp);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLCM, mnp >> 16);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLCN, mnp >> 8);
+                       matroxfb_DAC_out(minfo, M1064_XPIXPLLCP, mnp);
                        return M1064_XPIXPLLSTAT;
 
                case M_SYSTEM_PLL:
-                       matroxfb_DAC_out(PMINFO DAC1064_XSYSPLLM, mnp >> 16);
-                       matroxfb_DAC_out(PMINFO DAC1064_XSYSPLLN, mnp >> 8);
-                       matroxfb_DAC_out(PMINFO DAC1064_XSYSPLLP, mnp);
+                       matroxfb_DAC_out(minfo, DAC1064_XSYSPLLM, mnp >> 16);
+                       matroxfb_DAC_out(minfo, DAC1064_XSYSPLLN, mnp >> 8);
+                       matroxfb_DAC_out(minfo, DAC1064_XSYSPLLP, mnp);
                        return DAC1064_XSYSPLLSTAT;
 
                case M_VIDEO_PLL:
-                       matroxfb_DAC_out(PMINFO M1064_XVIDPLLM, mnp >> 16);
-                       matroxfb_DAC_out(PMINFO M1064_XVIDPLLN, mnp >> 8);
-                       matroxfb_DAC_out(PMINFO M1064_XVIDPLLP, mnp);
+                       matroxfb_DAC_out(minfo, M1064_XVIDPLLM, mnp >> 16);
+                       matroxfb_DAC_out(minfo, M1064_XVIDPLLN, mnp >> 8);
+                       matroxfb_DAC_out(minfo, M1064_XVIDPLLP, mnp);
                        return M1064_XVIDPLLSTAT;
        }
        return 0;
 }
 
-static inline unsigned int g450_cmppll(CPMINFO unsigned int mnp, unsigned int pll) {
+static inline unsigned int g450_cmppll(const struct matrox_fb_info *minfo,
+                                      unsigned int mnp, unsigned int pll)
+{
        unsigned char m = mnp >> 16;
        unsigned char n = mnp >> 8;
        unsigned char p = mnp;
 
        switch (pll) {
                case M_PIXEL_PLL_A:
-                       return (matroxfb_DAC_in(PMINFO M1064_XPIXPLLAM) != m ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLAN) != n ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLAP) != p);
+                       return (matroxfb_DAC_in(minfo, M1064_XPIXPLLAM) != m ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLAN) != n ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLAP) != p);
 
                case M_PIXEL_PLL_B:
-                       return (matroxfb_DAC_in(PMINFO M1064_XPIXPLLBM) != m ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLBN) != n ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLBP) != p);
+                       return (matroxfb_DAC_in(minfo, M1064_XPIXPLLBM) != m ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLBN) != n ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLBP) != p);
 
                case M_PIXEL_PLL_C:
-                       return (matroxfb_DAC_in(PMINFO M1064_XPIXPLLCM) != m ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLCN) != n ||
-                               matroxfb_DAC_in(PMINFO M1064_XPIXPLLCP) != p);
+                       return (matroxfb_DAC_in(minfo, M1064_XPIXPLLCM) != m ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLCN) != n ||
+                               matroxfb_DAC_in(minfo, M1064_XPIXPLLCP) != p);
 
                case M_SYSTEM_PLL:
-                       return (matroxfb_DAC_in(PMINFO DAC1064_XSYSPLLM) != m ||
-                               matroxfb_DAC_in(PMINFO DAC1064_XSYSPLLN) != n ||
-                               matroxfb_DAC_in(PMINFO DAC1064_XSYSPLLP) != p);
+                       return (matroxfb_DAC_in(minfo, DAC1064_XSYSPLLM) != m ||
+                               matroxfb_DAC_in(minfo, DAC1064_XSYSPLLN) != n ||
+                               matroxfb_DAC_in(minfo, DAC1064_XSYSPLLP) != p);
 
                case M_VIDEO_PLL:
-                       return (matroxfb_DAC_in(PMINFO M1064_XVIDPLLM) != m ||
-                               matroxfb_DAC_in(PMINFO M1064_XVIDPLLN) != n ||
-                               matroxfb_DAC_in(PMINFO M1064_XVIDPLLP) != p);
+                       return (matroxfb_DAC_in(minfo, M1064_XVIDPLLM) != m ||
+                               matroxfb_DAC_in(minfo, M1064_XVIDPLLN) != n ||
+                               matroxfb_DAC_in(minfo, M1064_XVIDPLLP) != p);
        }
        return 1;
 }
 
-static inline int g450_isplllocked(CPMINFO unsigned int regidx) {
+static inline int g450_isplllocked(const struct matrox_fb_info *minfo,
+                                  unsigned int regidx)
+{
        unsigned int j;
 
        for (j = 0; j < 1000; j++) {
-               if (matroxfb_DAC_in(PMINFO regidx) & 0x40) {
+               if (matroxfb_DAC_in(minfo, regidx) & 0x40) {
                        unsigned int r = 0;
                        int i;
 
                        for (i = 0; i < 100; i++) {
-                               r += matroxfb_DAC_in(PMINFO regidx) & 0x40;
+                               r += matroxfb_DAC_in(minfo, regidx) & 0x40;
                        }
                        return r >= (90 * 0x40);
                }
@@ -211,8 +226,10 @@ static inline int g450_isplllocked(CPMINFO unsigned int regidx) {
        return 0;
 }
 
-static int g450_testpll(CPMINFO unsigned int mnp, unsigned int pll) {
-       return g450_isplllocked(PMINFO g450_setpll(PMINFO mnp, pll));
+static int g450_testpll(const struct matrox_fb_info *minfo, unsigned int mnp,
+                       unsigned int pll)
+{
+       return g450_isplllocked(minfo, g450_setpll(minfo, mnp, pll));
 }
 
 static void updatehwstate_clk(struct matrox_hw_state* hw, unsigned int mnp, unsigned int pll) {
@@ -225,13 +242,19 @@ static void updatehwstate_clk(struct matrox_hw_state* hw, unsigned int mnp, unsi
        }
 }
 
-void matroxfb_g450_setpll_cond(WPMINFO unsigned int mnp, unsigned int pll) {
-       if (g450_cmppll(PMINFO mnp, pll)) {
-               g450_setpll(PMINFO mnp, pll);
+void matroxfb_g450_setpll_cond(struct matrox_fb_info *minfo, unsigned int mnp,
+                              unsigned int pll)
+{
+       if (g450_cmppll(minfo, mnp, pll)) {
+               g450_setpll(minfo, mnp, pll);
        }
 }
 
-static inline unsigned int g450_findworkingpll(WPMINFO unsigned int pll, unsigned int* mnparray, unsigned int mnpcount) {
+static inline unsigned int g450_findworkingpll(struct matrox_fb_info *minfo,
+                                              unsigned int pll,
+                                              unsigned int *mnparray,
+                                              unsigned int mnpcount)
+{
        unsigned int found = 0;
        unsigned int idx;
        unsigned int mnpfound = mnparray[0];
@@ -255,22 +278,22 @@ static inline unsigned int g450_findworkingpll(WPMINFO unsigned int pll, unsigne
                while (sptr >= sarray) {
                        unsigned int mnp = *sptr--;
                
-                       if (g450_testpll(PMINFO mnp - 0x0300, pll) &&
-                           g450_testpll(PMINFO mnp + 0x0300, pll) &&
-                           g450_testpll(PMINFO mnp - 0x0200, pll) &&
-                           g450_testpll(PMINFO mnp + 0x0200, pll) &&
-                           g450_testpll(PMINFO mnp - 0x0100, pll) &&
-                           g450_testpll(PMINFO mnp + 0x0100, pll)) {
-                               if (g450_testpll(PMINFO mnp, pll)) {
+                       if (g450_testpll(minfo, mnp - 0x0300, pll) &&
+                           g450_testpll(minfo, mnp + 0x0300, pll) &&
+                           g450_testpll(minfo, mnp - 0x0200, pll) &&
+                           g450_testpll(minfo, mnp + 0x0200, pll) &&
+                           g450_testpll(minfo, mnp - 0x0100, pll) &&
+                           g450_testpll(minfo, mnp + 0x0100, pll)) {
+                               if (g450_testpll(minfo, mnp, pll)) {
                                        return mnp;
                                }
-                       } else if (!found && g450_testpll(PMINFO mnp, pll)) {
+                       } else if (!found && g450_testpll(minfo, mnp, pll)) {
                                mnpfound = mnp;
                                found = 1;
                        }
                }
        }
-       g450_setpll(PMINFO mnpfound, pll);
+       g450_setpll(minfo, mnpfound, pll);
        return mnpfound;
 }
 
@@ -283,7 +306,9 @@ static void g450_addcache(struct matrox_pll_cache* ci, unsigned int mnp_key, uns
        ci->data[0].mnp_value = mnp_value;
 }
 
-static int g450_checkcache(WPMINFO struct matrox_pll_cache* ci, unsigned int mnp_key) {
+static int g450_checkcache(struct matrox_fb_info *minfo,
+                          struct matrox_pll_cache *ci, unsigned int mnp_key)
+{
        unsigned int i;
        
        mnp_key &= G450_MNP_FREQBITS;
@@ -303,8 +328,10 @@ static int g450_checkcache(WPMINFO struct matrox_pll_cache* ci, unsigned int mnp
        return NO_MORE_MNP;
 }
 
-static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, 
-               unsigned int* mnparray, unsigned int* deltaarray) {
+static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,
+                        unsigned int pll, unsigned int *mnparray,
+                        unsigned int *deltaarray)
+{
        unsigned int mnpcount;
        unsigned int pixel_vco;
        const struct matrox_pll_limits* pi;
@@ -321,19 +348,19 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                
                                matroxfb_DAC_lock_irqsave(flags);
 
-                               xpwrctrl = matroxfb_DAC_in(PMINFO M1064_XPWRCTRL);
-                               matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl & ~M1064_XPWRCTRL_PANELPDN);
+                               xpwrctrl = matroxfb_DAC_in(minfo, M1064_XPWRCTRL);
+                               matroxfb_DAC_out(minfo, M1064_XPWRCTRL, xpwrctrl & ~M1064_XPWRCTRL_PANELPDN);
                                mga_outb(M_SEQ_INDEX, M_SEQ1);
                                mga_outb(M_SEQ_DATA, mga_inb(M_SEQ_DATA) | M_SEQ1_SCROFF);
-                               tmp = matroxfb_DAC_in(PMINFO M1064_XPIXCLKCTRL);
+                               tmp = matroxfb_DAC_in(minfo, M1064_XPIXCLKCTRL);
                                tmp |= M1064_XPIXCLKCTRL_DIS;
                                if (!(tmp & M1064_XPIXCLKCTRL_PLL_UP)) {
                                        tmp |= M1064_XPIXCLKCTRL_PLL_UP;
                                }
-                               matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp);
+                               matroxfb_DAC_out(minfo, M1064_XPIXCLKCTRL, tmp);
                                /* DVI PLL preferred for frequencies up to
                                   panel link max, standard PLL otherwise */
-                               if (fout >= MINFO->max_pixel_clock_panellink)
+                               if (fout >= minfo->max_pixel_clock_panellink)
                                        tmp = 0;
                                else tmp =
                                        M1064_XDVICLKCTRL_DVIDATAPATHSEL |
@@ -341,8 +368,8 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                        M1064_XDVICLKCTRL_C1DVICLKEN |
                                        M1064_XDVICLKCTRL_DVILOOPCTL |
                                        M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
-                               matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp);
-                               matroxfb_DAC_out(PMINFO M1064_XPWRCTRL,
+                               matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp);
+                               matroxfb_DAC_out(minfo, M1064_XPWRCTRL,
                                                 xpwrctrl);
 
                                matroxfb_DAC_unlock_irqrestore(flags);
@@ -363,20 +390,20 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                }
                                mga_outb(M_MISC_REG, misc);
                        }
-                       pi = &ACCESS_FBINFO(limits.pixel);
-                       ci = &ACCESS_FBINFO(cache.pixel);
+                       pi = &minfo->limits.pixel;
+                       ci = &minfo->cache.pixel;
                        break;
                case M_SYSTEM_PLL:
                        {
                                u_int32_t opt;
 
-                               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, &opt);
+                               pci_read_config_dword(minfo->pcidev, PCI_OPTION_REG, &opt);
                                if (!(opt & 0x20)) {
-                                       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, opt | 0x20);
+                                       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, opt | 0x20);
                                }
                        }
-                       pi = &ACCESS_FBINFO(limits.system);
-                       ci = &ACCESS_FBINFO(cache.system);
+                       pi = &minfo->limits.system;
+                       ci = &minfo->cache.system;
                        break;
                case M_VIDEO_PLL:
                        {
@@ -385,18 +412,18 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                unsigned long flags;
                                
                                matroxfb_DAC_lock_irqsave(flags);
-                               tmp = matroxfb_DAC_in(PMINFO M1064_XPWRCTRL);
+                               tmp = matroxfb_DAC_in(minfo, M1064_XPWRCTRL);
                                if (!(tmp & 2)) {
-                                       matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, tmp | 2);
+                                       matroxfb_DAC_out(minfo, M1064_XPWRCTRL, tmp | 2);
                                }
                                
-                               mnp = matroxfb_DAC_in(PMINFO M1064_XPIXPLLCM) << 16;
-                               mnp |= matroxfb_DAC_in(PMINFO M1064_XPIXPLLCN) << 8;
-                               pixel_vco = g450_mnp2vco(PMINFO mnp);
+                               mnp = matroxfb_DAC_in(minfo, M1064_XPIXPLLCM) << 16;
+                               mnp |= matroxfb_DAC_in(minfo, M1064_XPIXPLLCN) << 8;
+                               pixel_vco = g450_mnp2vco(minfo, mnp);
                                matroxfb_DAC_unlock_irqrestore(flags);
                        }
-                       pi = &ACCESS_FBINFO(limits.video);
-                       ci = &ACCESS_FBINFO(cache.video);
+                       pi = &minfo->limits.video;
+                       ci = &minfo->cache.video;
                        break;
                default:
                        return -EINVAL;
@@ -407,12 +434,12 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                unsigned int mnp;
                unsigned int xvco;
 
-               for(mnp = g450_firstpll(PMINFO pi, &xvco, fout); mnp != NO_MORE_MNP; mnp = g450_nextpll(PMINFO pi, &xvco, mnp)) {
+               for (mnp = g450_firstpll(minfo, pi, &xvco, fout); mnp != NO_MORE_MNP; mnp = g450_nextpll(minfo, pi, &xvco, mnp)) {
                        unsigned int idx;
                        unsigned int vco;
                        unsigned int delta;
 
-                       vco = g450_mnp2vco(PMINFO mnp);
+                       vco = g450_mnp2vco(minfo, mnp);
 #if 0                  
                        if (pll == M_VIDEO_PLL) {
                                unsigned int big, small;
@@ -444,7 +471,7 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                         * (freqs near VCOmin aren't as stable)
                                         */
                                        if (delta == deltaarray[idx-1]
-                                           && vco != g450_mnp2vco(PMINFO mnparray[idx-1])
+                                           && vco != g450_mnp2vco(minfo, mnparray[idx-1])
                                            && vco < (pi->vcomin * 17 / 16)) {
                                                break;
                                        }
@@ -468,14 +495,14 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                unsigned int mnp;
                
                matroxfb_DAC_lock_irqsave(flags);
-               mnp = g450_checkcache(PMINFO ci, mnparray[0]);
+               mnp = g450_checkcache(minfo, ci, mnparray[0]);
                if (mnp != NO_MORE_MNP) {
-                       matroxfb_g450_setpll_cond(PMINFO mnp, pll);
+                       matroxfb_g450_setpll_cond(minfo, mnp, pll);
                } else {
-                       mnp = g450_findworkingpll(PMINFO pll, mnparray, mnpcount);
+                       mnp = g450_findworkingpll(minfo, pll, mnparray, mnpcount);
                        g450_addcache(ci, mnparray[0], mnp);
                }
-               updatehwstate_clk(&ACCESS_FBINFO(hw), mnp, pll);
+               updatehwstate_clk(&minfo->hw, mnp, pll);
                matroxfb_DAC_unlock_irqrestore(flags);
                return mnp;
        }
@@ -485,14 +512,16 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
  * Currently there is 5(p) * 10(m) = 50 possible values. */
 #define MNP_TABLE_SIZE  64
 
-int matroxfb_g450_setclk(WPMINFO unsigned int fout, unsigned int pll) {
+int matroxfb_g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,
+                        unsigned int pll)
+{
        unsigned int* arr;
        
        arr = kmalloc(sizeof(*arr) * MNP_TABLE_SIZE * 2, GFP_KERNEL);
        if (arr) {
                int r;
 
-               r = __g450_setclk(PMINFO fout, pll, arr, arr + MNP_TABLE_SIZE);
+               r = __g450_setclk(minfo, fout, pll, arr, arr + MNP_TABLE_SIZE);
                kfree(arr);
                return r;
        }
index c17ed74..aac615d 100644 (file)
@@ -3,8 +3,10 @@
 
 #include "matroxfb_base.h"
 
-int matroxfb_g450_setclk(WPMINFO unsigned int fout, unsigned int pll);
-unsigned int g450_mnp2f(CPMINFO unsigned int mnp);
-void matroxfb_g450_setpll_cond(WPMINFO unsigned int mnp, unsigned int pll);
+int matroxfb_g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,
+                        unsigned int pll);
+unsigned int g450_mnp2f(const struct matrox_fb_info *minfo, unsigned int mnp);
+void matroxfb_g450_setpll_cond(struct matrox_fb_info *minfo, unsigned int mnp,
+                              unsigned int pll);
 
 #endif /* __G450_PLL_H__ */
index c14e3e2..f3728ab 100644 (file)
@@ -41,7 +41,7 @@ static int matroxfb_read_gpio(struct matrox_fb_info* minfo) {
        int v;
 
        matroxfb_DAC_lock_irqsave(flags);
-       v = matroxfb_DAC_in(PMINFO DAC_XGENIODATA);
+       v = matroxfb_DAC_in(minfo, DAC_XGENIODATA);
        matroxfb_DAC_unlock_irqrestore(flags);
        return v;
 }
@@ -51,10 +51,10 @@ static void matroxfb_set_gpio(struct matrox_fb_info* minfo, int mask, int val) {
        int v;
 
        matroxfb_DAC_lock_irqsave(flags);
-       v = (matroxfb_DAC_in(PMINFO DAC_XGENIOCTRL) & mask) | val;
-       matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, v);
+       v = (matroxfb_DAC_in(minfo, DAC_XGENIOCTRL) & mask) | val;
+       matroxfb_DAC_out(minfo, DAC_XGENIOCTRL, v);
        /* We must reset GENIODATA very often... XFree plays with this register */
-       matroxfb_DAC_out(PMINFO DAC_XGENIODATA, 0x00);
+       matroxfb_DAC_out(minfo, DAC_XGENIODATA, 0x00);
        matroxfb_DAC_unlock_irqrestore(flags);
 }
 
@@ -112,7 +112,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
        i2c_set_adapdata(&b->adapter, b);
        b->adapter.class = class;
        b->adapter.algo_data = &b->bac;
-       b->adapter.dev.parent = &ACCESS_FBINFO(pcidev)->dev;
+       b->adapter.dev.parent = &minfo->pcidev->dev;
        b->bac = matrox_i2c_algo_template;
        b->bac.data = b;
        err = i2c_bit_add_bus(&b->adapter);
@@ -149,11 +149,11 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
                return NULL;
 
        matroxfb_DAC_lock_irqsave(flags);
-       matroxfb_DAC_out(PMINFO DAC_XGENIODATA, 0xFF);
-       matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00);
+       matroxfb_DAC_out(minfo, DAC_XGENIODATA, 0xFF);
+       matroxfb_DAC_out(minfo, DAC_XGENIOCTRL, 0x00);
        matroxfb_DAC_unlock_irqrestore(flags);
 
-       switch (ACCESS_FBINFO(chip)) {
+       switch (minfo->chip) {
                case MGA_2064:
                case MGA_2164:
                        err = i2c_bus_reg(&m2info->ddc1, minfo,
@@ -168,7 +168,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
        }
        if (err)
                goto fail_ddc1;
-       if (ACCESS_FBINFO(devflags.dualhead)) {
+       if (minfo->devflags.dualhead) {
                err = i2c_bus_reg(&m2info->ddc2, minfo,
                                  DDC2_DATA, DDC2_CLK,
                                  "DDC:fb%u #1", I2C_CLASS_DDC);
index a74e5da..f9fa0fd 100644 (file)
 #define DAC1064_OPT_MDIV2      0x00
 #define DAC1064_OPT_RESERVED   0x10
 
-static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsigned int* in, unsigned int* feed, unsigned int* post) {
+static void DAC1064_calcclock(const struct matrox_fb_info *minfo,
+                             unsigned int freq, unsigned int fmax,
+                             unsigned int *in, unsigned int *feed,
+                             unsigned int *post)
+{
        unsigned int fvco;
        unsigned int p;
 
@@ -41,7 +45,7 @@ static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsi
        
        /* only for devices older than G450 */
 
-       fvco = PLL_calcclock(PMINFO freq, fmax, in, feed, &p);
+       fvco = PLL_calcclock(minfo, freq, fmax, in, feed, &p);
        
        p = (1 << p) - 1;
        if (fvco <= 100000)
@@ -80,32 +84,35 @@ static const unsigned char MGA1064_DAC[] = {
                0x00,
                0x00, 0x00, 0xFF, 0xFF};
 
-static void DAC1064_setpclk(WPMINFO unsigned long fout) {
+static void DAC1064_setpclk(struct matrox_fb_info *minfo, unsigned long fout)
+{
        unsigned int m, n, p;
 
        DBG(__func__)
 
-       DAC1064_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
-       ACCESS_FBINFO(hw).DACclk[0] = m;
-       ACCESS_FBINFO(hw).DACclk[1] = n;
-       ACCESS_FBINFO(hw).DACclk[2] = p;
+       DAC1064_calcclock(minfo, fout, minfo->max_pixel_clock, &m, &n, &p);
+       minfo->hw.DACclk[0] = m;
+       minfo->hw.DACclk[1] = n;
+       minfo->hw.DACclk[2] = p;
 }
 
-static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
+static void DAC1064_setmclk(struct matrox_fb_info *minfo, int oscinfo,
+                           unsigned long fmem)
+{
        u_int32_t mx;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(devflags.noinit)) {
+       if (minfo->devflags.noinit) {
                /* read MCLK and give up... */
-               hw->DACclk[3] = inDAC1064(PMINFO DAC1064_XSYSPLLM);
-               hw->DACclk[4] = inDAC1064(PMINFO DAC1064_XSYSPLLN);
-               hw->DACclk[5] = inDAC1064(PMINFO DAC1064_XSYSPLLP);
+               hw->DACclk[3] = inDAC1064(minfo, DAC1064_XSYSPLLM);
+               hw->DACclk[4] = inDAC1064(minfo, DAC1064_XSYSPLLN);
+               hw->DACclk[5] = inDAC1064(minfo, DAC1064_XSYSPLLP);
                return;
        }
        mx = hw->MXoptionReg | 0x00000004;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mx);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mx);
        mx &= ~0x000000BB;
        if (oscinfo & DAC1064_OPT_GDIV1)
                mx |= 0x00000008;
@@ -120,9 +127,9 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
 
                /* powerup system PLL, select PCI clock */
                mx |= 0x00000020;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mx);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mx);
                mx &= ~0x00000004;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mx);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mx);
 
                /* !!! you must not access device if MCLK is not running !!!
                   Doing so cause immediate PCI lockup :-( Maybe they should
@@ -131,12 +138,12 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
                   perfect... */
                /* (bit 2 of PCI_OPTION_REG must be 0... and bits 0,1 must not
                   select PLL... because of PLL can be stopped at this time) */
-               DAC1064_calcclock(PMINFO fmem, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
-               outDAC1064(PMINFO DAC1064_XSYSPLLM, hw->DACclk[3] = m);
-               outDAC1064(PMINFO DAC1064_XSYSPLLN, hw->DACclk[4] = n);
-               outDAC1064(PMINFO DAC1064_XSYSPLLP, hw->DACclk[5] = p);
+               DAC1064_calcclock(minfo, fmem, minfo->max_pixel_clock, &m, &n, &p);
+               outDAC1064(minfo, DAC1064_XSYSPLLM, hw->DACclk[3] = m);
+               outDAC1064(minfo, DAC1064_XSYSPLLN, hw->DACclk[4] = n);
+               outDAC1064(minfo, DAC1064_XSYSPLLP, hw->DACclk[5] = p);
                for (clk = 65536; clk; --clk) {
-                       if (inDAC1064(PMINFO DAC1064_XSYSPLLSTAT) & 0x40)
+                       if (inDAC1064(minfo, DAC1064_XSYSPLLSTAT) & 0x40)
                                break;
                }
                if (!clk)
@@ -147,29 +154,30 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
                /* select specified system clock source */
                mx |= oscinfo & DAC1064_OPT_SCLK_MASK;
        }
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mx);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mx);
        mx &= ~0x00000004;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mx);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mx);
        hw->MXoptionReg = mx;
 }
 
 #ifdef CONFIG_FB_MATROX_G
-static void g450_set_plls(WPMINFO2) {
+static void g450_set_plls(struct matrox_fb_info *minfo)
+{
        u_int32_t c2_ctl;
        unsigned int pxc;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
        int pixelmnp;
        int videomnp;
        
        c2_ctl = hw->crtc2.ctl & ~0x4007;       /* Clear PLL + enable for CRTC2 */
        c2_ctl |= 0x0001;                       /* Enable CRTC2 */
        hw->DACreg[POS1064_XPWRCTRL] &= ~0x02;  /* Stop VIDEO PLL */
-       pixelmnp = ACCESS_FBINFO(crtc1).mnp;
-       videomnp = ACCESS_FBINFO(crtc2).mnp;
+       pixelmnp = minfo->crtc1.mnp;
+       videomnp = minfo->crtc2.mnp;
        if (videomnp < 0) {
                c2_ctl &= ~0x0001;                      /* Disable CRTC2 */
                hw->DACreg[POS1064_XPWRCTRL] &= ~0x10;  /* Powerdown CRTC2 */
-       } else if (ACCESS_FBINFO(crtc2).pixclock == ACCESS_FBINFO(features).pll.ref_freq) {
+       } else if (minfo->crtc2.pixclock == minfo->features.pll.ref_freq) {
                c2_ctl |=  0x4002;      /* Use reference directly */
        } else if (videomnp == pixelmnp) {
                c2_ctl |=  0x0004;      /* Use pixel PLL */
@@ -184,27 +192,27 @@ static void g450_set_plls(WPMINFO2) {
                c2_ctl |=  0x0006;      /* Use video PLL */
                hw->DACreg[POS1064_XPWRCTRL] |= 0x02;
                
-               outDAC1064(PMINFO M1064_XPWRCTRL, hw->DACreg[POS1064_XPWRCTRL]);
-               matroxfb_g450_setpll_cond(PMINFO videomnp, M_VIDEO_PLL);
+               outDAC1064(minfo, M1064_XPWRCTRL, hw->DACreg[POS1064_XPWRCTRL]);
+               matroxfb_g450_setpll_cond(minfo, videomnp, M_VIDEO_PLL);
        }
 
        hw->DACreg[POS1064_XPIXCLKCTRL] &= ~M1064_XPIXCLKCTRL_PLL_UP;
        if (pixelmnp >= 0) {
                hw->DACreg[POS1064_XPIXCLKCTRL] |= M1064_XPIXCLKCTRL_PLL_UP;
                
-               outDAC1064(PMINFO M1064_XPIXCLKCTRL, hw->DACreg[POS1064_XPIXCLKCTRL]);
-               matroxfb_g450_setpll_cond(PMINFO pixelmnp, M_PIXEL_PLL_C);
+               outDAC1064(minfo, M1064_XPIXCLKCTRL, hw->DACreg[POS1064_XPIXCLKCTRL]);
+               matroxfb_g450_setpll_cond(minfo, pixelmnp, M_PIXEL_PLL_C);
        }
        if (c2_ctl != hw->crtc2.ctl) {
                hw->crtc2.ctl = c2_ctl;
                mga_outl(0x3C10, c2_ctl);
        }
 
-       pxc = ACCESS_FBINFO(crtc1).pixclock;
-       if (pxc == 0 || ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC2) {
-               pxc = ACCESS_FBINFO(crtc2).pixclock;
+       pxc = minfo->crtc1.pixclock;
+       if (pxc == 0 || minfo->outputs[2].src == MATROXFB_SRC_CRTC2) {
+               pxc = minfo->crtc2.pixclock;
        }
-       if (ACCESS_FBINFO(chip) == MGA_G550) {
+       if (minfo->chip == MGA_G550) {
                if (pxc < 45000) {
                        hw->DACreg[POS1064_XPANMODE] = 0x00;    /* 0-50 */
                } else if (pxc < 55000) {
@@ -245,18 +253,19 @@ static void g450_set_plls(WPMINFO2) {
 }
 #endif
 
-void DAC1064_global_init(WPMINFO2) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+void DAC1064_global_init(struct matrox_fb_info *minfo)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        hw->DACreg[POS1064_XMISCCTRL] &= M1064_XMISCCTRL_DAC_WIDTHMASK;
        hw->DACreg[POS1064_XMISCCTRL] |= M1064_XMISCCTRL_LUT_EN;
        hw->DACreg[POS1064_XPIXCLKCTRL] = M1064_XPIXCLKCTRL_PLL_UP | M1064_XPIXCLKCTRL_EN | M1064_XPIXCLKCTRL_SRC_PLL;
 #ifdef CONFIG_FB_MATROX_G
-       if (ACCESS_FBINFO(devflags.g450dac)) {
+       if (minfo->devflags.g450dac) {
                hw->DACreg[POS1064_XPWRCTRL] = 0x1F;    /* powerup everything */
                hw->DACreg[POS1064_XOUTPUTCONN] = 0x00; /* disable outputs */
                hw->DACreg[POS1064_XMISCCTRL] |= M1064_XMISCCTRL_DAC_EN;
-               switch (ACCESS_FBINFO(outputs[0]).src) {
+               switch (minfo->outputs[0].src) {
                        case MATROXFB_SRC_CRTC1:
                        case MATROXFB_SRC_CRTC2:
                                hw->DACreg[POS1064_XOUTPUTCONN] |= 0x01;        /* enable output; CRTC1/2 selection is in CRTC2 ctl */
@@ -265,12 +274,12 @@ void DAC1064_global_init(WPMINFO2) {
                                hw->DACreg[POS1064_XMISCCTRL] &= ~M1064_XMISCCTRL_DAC_EN;
                                break;
                }
-               switch (ACCESS_FBINFO(outputs[1]).src) {
+               switch (minfo->outputs[1].src) {
                        case MATROXFB_SRC_CRTC1:
                                hw->DACreg[POS1064_XOUTPUTCONN] |= 0x04;
                                break;
                        case MATROXFB_SRC_CRTC2:
-                               if (ACCESS_FBINFO(outputs[1]).mode == MATROXFB_OUTPUT_MODE_MONITOR) {
+                               if (minfo->outputs[1].mode == MATROXFB_OUTPUT_MODE_MONITOR) {
                                        hw->DACreg[POS1064_XOUTPUTCONN] |= 0x08;
                                } else {
                                        hw->DACreg[POS1064_XOUTPUTCONN] |= 0x0C;
@@ -280,7 +289,7 @@ void DAC1064_global_init(WPMINFO2) {
                                hw->DACreg[POS1064_XPWRCTRL] &= ~0x01;          /* Poweroff DAC2 */
                                break;
                }
-               switch (ACCESS_FBINFO(outputs[2]).src) {
+               switch (minfo->outputs[2].src) {
                        case MATROXFB_SRC_CRTC1:
                                hw->DACreg[POS1064_XOUTPUTCONN] |= 0x20;
                                break;
@@ -299,55 +308,57 @@ void DAC1064_global_init(WPMINFO2) {
                                break;
                }
                /* Now set timming related variables... */
-               g450_set_plls(PMINFO2);
+               g450_set_plls(minfo);
        } else
 #endif
        {
-               if (ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_CRTC1) {
+               if (minfo->outputs[1].src == MATROXFB_SRC_CRTC1) {
                        hw->DACreg[POS1064_XPIXCLKCTRL] = M1064_XPIXCLKCTRL_PLL_UP | M1064_XPIXCLKCTRL_EN | M1064_XPIXCLKCTRL_SRC_EXT;
                        hw->DACreg[POS1064_XMISCCTRL] |= GX00_XMISCCTRL_MFC_MAFC | G400_XMISCCTRL_VDO_MAFC12;
-               } else if (ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_CRTC2) {
+               } else if (minfo->outputs[1].src == MATROXFB_SRC_CRTC2) {
                        hw->DACreg[POS1064_XMISCCTRL] |= GX00_XMISCCTRL_MFC_MAFC | G400_XMISCCTRL_VDO_C2_MAFC12;
-               } else if (ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC1)
+               } else if (minfo->outputs[2].src == MATROXFB_SRC_CRTC1)
                        hw->DACreg[POS1064_XMISCCTRL] |= GX00_XMISCCTRL_MFC_PANELLINK | G400_XMISCCTRL_VDO_MAFC12;
                else
                        hw->DACreg[POS1064_XMISCCTRL] |= GX00_XMISCCTRL_MFC_DIS;
 
-               if (ACCESS_FBINFO(outputs[0]).src != MATROXFB_SRC_NONE)
+               if (minfo->outputs[0].src != MATROXFB_SRC_NONE)
                        hw->DACreg[POS1064_XMISCCTRL] |= M1064_XMISCCTRL_DAC_EN;
        }
 }
 
-void DAC1064_global_restore(WPMINFO2) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
-
-       outDAC1064(PMINFO M1064_XPIXCLKCTRL, hw->DACreg[POS1064_XPIXCLKCTRL]);
-       outDAC1064(PMINFO M1064_XMISCCTRL, hw->DACreg[POS1064_XMISCCTRL]);
-       if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400) {
-               outDAC1064(PMINFO 0x20, 0x04);
-               outDAC1064(PMINFO 0x1F, ACCESS_FBINFO(devflags.dfp_type));
-               if (ACCESS_FBINFO(devflags.g450dac)) {
-                       outDAC1064(PMINFO M1064_XSYNCCTRL, 0xCC);
-                       outDAC1064(PMINFO M1064_XPWRCTRL, hw->DACreg[POS1064_XPWRCTRL]);
-                       outDAC1064(PMINFO M1064_XPANMODE, hw->DACreg[POS1064_XPANMODE]);
-                       outDAC1064(PMINFO M1064_XOUTPUTCONN, hw->DACreg[POS1064_XOUTPUTCONN]);
+void DAC1064_global_restore(struct matrox_fb_info *minfo)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
+
+       outDAC1064(minfo, M1064_XPIXCLKCTRL, hw->DACreg[POS1064_XPIXCLKCTRL]);
+       outDAC1064(minfo, M1064_XMISCCTRL, hw->DACreg[POS1064_XMISCCTRL]);
+       if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG400) {
+               outDAC1064(minfo, 0x20, 0x04);
+               outDAC1064(minfo, 0x1F, minfo->devflags.dfp_type);
+               if (minfo->devflags.g450dac) {
+                       outDAC1064(minfo, M1064_XSYNCCTRL, 0xCC);
+                       outDAC1064(minfo, M1064_XPWRCTRL, hw->DACreg[POS1064_XPWRCTRL]);
+                       outDAC1064(minfo, M1064_XPANMODE, hw->DACreg[POS1064_XPANMODE]);
+                       outDAC1064(minfo, M1064_XOUTPUTCONN, hw->DACreg[POS1064_XOUTPUTCONN]);
                }
        }
 }
 
-static int DAC1064_init_1(WPMINFO struct my_timming* m) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static int DAC1064_init_1(struct matrox_fb_info *minfo, struct my_timming *m)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
        memcpy(hw->DACreg, MGA1064_DAC, sizeof(MGA1064_DAC_regs));
-       switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
+       switch (minfo->fbcon.var.bits_per_pixel) {
                /* case 4: not supported by MGA1064 DAC */
                case 8:
                        hw->DACreg[POS1064_XMULCTRL] = M1064_XMULCTRL_DEPTH_8BPP | M1064_XMULCTRL_GRAPHICS_PALETIZED;
                        break;
                case 16:
-                       if (ACCESS_FBINFO(fbcon).var.green.length == 5)
+                       if (minfo->fbcon.var.green.length == 5)
                                hw->DACreg[POS1064_XMULCTRL] = M1064_XMULCTRL_DEPTH_15BPP_1BPP | M1064_XMULCTRL_GRAPHICS_PALETIZED;
                        else
                                hw->DACreg[POS1064_XMULCTRL] = M1064_XMULCTRL_DEPTH_16BPP | M1064_XMULCTRL_GRAPHICS_PALETIZED;
@@ -361,22 +372,23 @@ static int DAC1064_init_1(WPMINFO struct my_timming* m) {
                default:
                        return 1;       /* unsupported depth */
        }
-       hw->DACreg[POS1064_XVREFCTRL] = ACCESS_FBINFO(features.DAC1064.xvrefctrl);
+       hw->DACreg[POS1064_XVREFCTRL] = minfo->features.DAC1064.xvrefctrl;
        hw->DACreg[POS1064_XGENCTRL] &= ~M1064_XGENCTRL_SYNC_ON_GREEN_MASK;
        hw->DACreg[POS1064_XGENCTRL] |= (m->sync & FB_SYNC_ON_GREEN)?M1064_XGENCTRL_SYNC_ON_GREEN:M1064_XGENCTRL_NO_SYNC_ON_GREEN;
        hw->DACreg[POS1064_XCURADDL] = 0;
        hw->DACreg[POS1064_XCURADDH] = 0;
 
-       DAC1064_global_init(PMINFO2);
+       DAC1064_global_init(minfo);
        return 0;
 }
 
-static int DAC1064_init_2(WPMINFO struct my_timming* m) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static int DAC1064_init_2(struct matrox_fb_info *minfo, struct my_timming *m)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 16) {     /* 256 entries */
+       if (minfo->fbcon.var.bits_per_pixel > 16) {     /* 256 entries */
                int i;
 
                for (i = 0; i < 256; i++) {
@@ -384,8 +396,8 @@ static int DAC1064_init_2(WPMINFO struct my_timming* m) {
                        hw->DACpal[i * 3 + 1] = i;
                        hw->DACpal[i * 3 + 2] = i;
                }
-       } else if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 8) {
-               if (ACCESS_FBINFO(fbcon).var.green.length == 5) {       /* 0..31, 128..159 */
+       } else if (minfo->fbcon.var.bits_per_pixel > 8) {
+               if (minfo->fbcon.var.green.length == 5) {       /* 0..31, 128..159 */
                        int i;
 
                        for (i = 0; i < 32; i++) {
@@ -413,8 +425,9 @@ static int DAC1064_init_2(WPMINFO struct my_timming* m) {
        return 0;
 }
 
-static void DAC1064_restore_1(WPMINFO2) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static void DAC1064_restore_1(struct matrox_fb_info *minfo)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        CRITFLAGS
 
@@ -422,28 +435,29 @@ static void DAC1064_restore_1(WPMINFO2) {
 
        CRITBEGIN
 
-       if ((inDAC1064(PMINFO DAC1064_XSYSPLLM) != hw->DACclk[3]) ||
-           (inDAC1064(PMINFO DAC1064_XSYSPLLN) != hw->DACclk[4]) ||
-           (inDAC1064(PMINFO DAC1064_XSYSPLLP) != hw->DACclk[5])) {
-               outDAC1064(PMINFO DAC1064_XSYSPLLM, hw->DACclk[3]);
-               outDAC1064(PMINFO DAC1064_XSYSPLLN, hw->DACclk[4]);
-               outDAC1064(PMINFO DAC1064_XSYSPLLP, hw->DACclk[5]);
+       if ((inDAC1064(minfo, DAC1064_XSYSPLLM) != hw->DACclk[3]) ||
+           (inDAC1064(minfo, DAC1064_XSYSPLLN) != hw->DACclk[4]) ||
+           (inDAC1064(minfo, DAC1064_XSYSPLLP) != hw->DACclk[5])) {
+               outDAC1064(minfo, DAC1064_XSYSPLLM, hw->DACclk[3]);
+               outDAC1064(minfo, DAC1064_XSYSPLLN, hw->DACclk[4]);
+               outDAC1064(minfo, DAC1064_XSYSPLLP, hw->DACclk[5]);
        }
        {
                unsigned int i;
 
                for (i = 0; i < sizeof(MGA1064_DAC_regs); i++) {
                        if ((i != POS1064_XPIXCLKCTRL) && (i != POS1064_XMISCCTRL))
-                               outDAC1064(PMINFO MGA1064_DAC_regs[i], hw->DACreg[i]);
+                               outDAC1064(minfo, MGA1064_DAC_regs[i], hw->DACreg[i]);
                }
        }
 
-       DAC1064_global_restore(PMINFO2);
+       DAC1064_global_restore(minfo);
 
        CRITEND
 };
 
-static void DAC1064_restore_2(WPMINFO2) {
+static void DAC1064_restore_2(struct matrox_fb_info *minfo)
+{
 #ifdef DEBUG
        unsigned int i;
 #endif
@@ -453,12 +467,12 @@ static void DAC1064_restore_2(WPMINFO2) {
 #ifdef DEBUG
        dprintk(KERN_DEBUG "DAC1064regs ");
        for (i = 0; i < sizeof(MGA1064_DAC_regs); i++) {
-               dprintk("R%02X=%02X ", MGA1064_DAC_regs[i], ACCESS_FBINFO(hw).DACreg[i]);
+               dprintk("R%02X=%02X ", MGA1064_DAC_regs[i], minfo->hw.DACreg[i]);
                if ((i & 0x7) == 0x7) dprintk(KERN_DEBUG "continuing... ");
        }
        dprintk(KERN_DEBUG "DAC1064clk ");
        for (i = 0; i < 6; i++)
-               dprintk("C%02X=%02X ", i, ACCESS_FBINFO(hw).DACclk[i]);
+               dprintk("C%02X=%02X ", i, minfo->hw.DACclk[i]);
        dprintk("\n");
 #endif
 }
@@ -470,14 +484,14 @@ static int m1064_compute(void* out, struct my_timming* m) {
                int tmout;
                CRITFLAGS
 
-               DAC1064_setpclk(PMINFO m->pixclock);
+               DAC1064_setpclk(minfo, m->pixclock);
 
                CRITBEGIN
 
                for (i = 0; i < 3; i++)
-                       outDAC1064(PMINFO M1064_XPIXPLLCM + i, ACCESS_FBINFO(hw).DACclk[i]);
+                       outDAC1064(minfo, M1064_XPIXPLLCM + i, minfo->hw.DACclk[i]);
                for (tmout = 500000; tmout; tmout--) {
-                       if (inDAC1064(PMINFO M1064_XPIXPLLSTAT) & 0x40)
+                       if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
                                break;
                        udelay(10);
                };
@@ -500,9 +514,9 @@ static struct matrox_altout m1064 = {
 static int g450_compute(void* out, struct my_timming* m) {
 #define minfo ((struct matrox_fb_info*)out)
        if (m->mnp < 0) {
-               m->mnp = matroxfb_g450_setclk(PMINFO m->pixclock, (m->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
+               m->mnp = matroxfb_g450_setclk(minfo, m->pixclock, (m->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
                if (m->mnp >= 0) {
-                       m->pixclock = g450_mnp2f(PMINFO m->mnp);
+                       m->pixclock = g450_mnp2f(minfo, m->mnp);
                }
        }
 #undef minfo
@@ -518,13 +532,14 @@ static struct matrox_altout g450out = {
 #endif /* NEED_DAC1064 */
 
 #ifdef CONFIG_FB_MATROX_MYSTIQUE
-static int MGA1064_init(WPMINFO struct my_timming* m) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static int MGA1064_init(struct matrox_fb_info *minfo, struct my_timming *m)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       if (DAC1064_init_1(PMINFO m)) return 1;
-       if (matroxfb_vgaHWinit(PMINFO m)) return 1;
+       if (DAC1064_init_1(minfo, m)) return 1;
+       if (matroxfb_vgaHWinit(minfo, m)) return 1;
 
        hw->MiscOutReg = 0xCB;
        if (m->sync & FB_SYNC_HOR_HIGH_ACT)
@@ -534,20 +549,21 @@ static int MGA1064_init(WPMINFO struct my_timming* m) {
        if (m->sync & FB_SYNC_COMP_HIGH_ACT) /* should be only FB_SYNC_COMP */
                hw->CRTCEXT[3] |= 0x40;
 
-       if (DAC1064_init_2(PMINFO m)) return 1;
+       if (DAC1064_init_2(minfo, m)) return 1;
        return 0;
 }
 #endif
 
 #ifdef CONFIG_FB_MATROX_G
-static int MGAG100_init(WPMINFO struct my_timming* m) {
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static int MGAG100_init(struct matrox_fb_info *minfo, struct my_timming *m)
+{
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       if (DAC1064_init_1(PMINFO m)) return 1;
+       if (DAC1064_init_1(minfo, m)) return 1;
        hw->MXoptionReg &= ~0x2000;
-       if (matroxfb_vgaHWinit(PMINFO m)) return 1;
+       if (matroxfb_vgaHWinit(minfo, m)) return 1;
 
        hw->MiscOutReg = 0xEF;
        if (m->sync & FB_SYNC_HOR_HIGH_ACT)
@@ -557,27 +573,28 @@ static int MGAG100_init(WPMINFO struct my_timming* m) {
        if (m->sync & FB_SYNC_COMP_HIGH_ACT) /* should be only FB_SYNC_COMP */
                hw->CRTCEXT[3] |= 0x40;
 
-       if (DAC1064_init_2(PMINFO m)) return 1;
+       if (DAC1064_init_2(minfo, m)) return 1;
        return 0;
 }
 #endif /* G */
 
 #ifdef CONFIG_FB_MATROX_MYSTIQUE
-static void MGA1064_ramdac_init(WPMINFO2) {
+static void MGA1064_ramdac_init(struct matrox_fb_info *minfo)
+{
 
        DBG(__func__)
 
-       /* ACCESS_FBINFO(features.DAC1064.vco_freq_min) = 120000; */
-       ACCESS_FBINFO(features.pll.vco_freq_min) = 62000;
-       ACCESS_FBINFO(features.pll.ref_freq)     = 14318;
-       ACCESS_FBINFO(features.pll.feed_div_min) = 100;
-       ACCESS_FBINFO(features.pll.feed_div_max) = 127;
-       ACCESS_FBINFO(features.pll.in_div_min)   = 1;
-       ACCESS_FBINFO(features.pll.in_div_max)   = 31;
-       ACCESS_FBINFO(features.pll.post_shift_max) = 3;
-       ACCESS_FBINFO(features.DAC1064.xvrefctrl) = DAC1064_XVREFCTRL_EXTERNAL;
+       /* minfo->features.DAC1064.vco_freq_min = 120000; */
+       minfo->features.pll.vco_freq_min = 62000;
+       minfo->features.pll.ref_freq     = 14318;
+       minfo->features.pll.feed_div_min = 100;
+       minfo->features.pll.feed_div_max = 127;
+       minfo->features.pll.in_div_min   = 1;
+       minfo->features.pll.in_div_max   = 31;
+       minfo->features.pll.post_shift_max = 3;
+       minfo->features.DAC1064.xvrefctrl = DAC1064_XVREFCTRL_EXTERNAL;
        /* maybe cmdline MCLK= ?, doc says gclk=44MHz, mclk=66MHz... it was 55/83 with old values */
-       DAC1064_setmclk(PMINFO DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV3 | DAC1064_OPT_SCLK_PLL, 133333);
+       DAC1064_setmclk(minfo, DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV3 | DAC1064_OPT_SCLK_PLL, 133333);
 }
 #endif
 
@@ -589,23 +606,25 @@ static int x7AF4 = 0x10;  /* flags, maybe 0x10 = SDRAM, 0x00 = SGRAM??? */
 static int def50 = 0;  /* reg50, & 0x0F, & 0x3000 (only 0x0000, 0x1000, 0x2000 (0x3000 disallowed and treated as 0) */
 #endif
 
-static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
+static void MGAG100_progPixClock(const struct matrox_fb_info *minfo, int flags,
+                                int m, int n, int p)
+{
        int reg;
        int selClk;
        int clk;
 
        DBG(__func__)
 
-       outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS |
+       outDAC1064(minfo, M1064_XPIXCLKCTRL, inDAC1064(minfo, M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS |
                   M1064_XPIXCLKCTRL_PLL_UP);
        switch (flags & 3) {
                case 0:         reg = M1064_XPIXPLLAM; break;
                case 1:         reg = M1064_XPIXPLLBM; break;
                default:        reg = M1064_XPIXPLLCM; break;
        }
-       outDAC1064(PMINFO reg++, m);
-       outDAC1064(PMINFO reg++, n);
-       outDAC1064(PMINFO reg, p);
+       outDAC1064(minfo, reg++, m);
+       outDAC1064(minfo, reg++, n);
+       outDAC1064(minfo, reg, p);
        selClk = mga_inb(M_MISC_REG_READ) & ~0xC;
        /* there should be flags & 0x03 & case 0/1/else */
        /* and we should first select source and after that we should wait for PLL */
@@ -617,61 +636,64 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
        }
        mga_outb(M_MISC_REG, selClk);
        for (clk = 500000; clk; clk--) {
-               if (inDAC1064(PMINFO M1064_XPIXPLLSTAT) & 0x40)
+               if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
                        break;
                udelay(10);
        };
        if (!clk)
                printk(KERN_ERR "matroxfb: Pixel PLL%c not locked after usual time\n", (reg-M1064_XPIXPLLAM-2)/4 + 'A');
-       selClk = inDAC1064(PMINFO M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_SRC_MASK;
+       selClk = inDAC1064(minfo, M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_SRC_MASK;
        switch (flags & 0x0C) {
                case 0x00:      selClk |= M1064_XPIXCLKCTRL_SRC_PCI; break;
                case 0x04:      selClk |= M1064_XPIXCLKCTRL_SRC_PLL; break;
                default:        selClk |= M1064_XPIXCLKCTRL_SRC_EXT; break;
        }
-       outDAC1064(PMINFO M1064_XPIXCLKCTRL, selClk);
-       outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_DIS);
+       outDAC1064(minfo, M1064_XPIXCLKCTRL, selClk);
+       outDAC1064(minfo, M1064_XPIXCLKCTRL, inDAC1064(minfo, M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_DIS);
 }
 
-static void MGAG100_setPixClock(CPMINFO int flags, int freq) {
+static void MGAG100_setPixClock(const struct matrox_fb_info *minfo, int flags,
+                               int freq)
+{
        unsigned int m, n, p;
 
        DBG(__func__)
 
-       DAC1064_calcclock(PMINFO freq, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
-       MGAG100_progPixClock(PMINFO flags, m, n, p);
+       DAC1064_calcclock(minfo, freq, minfo->max_pixel_clock, &m, &n, &p);
+       MGAG100_progPixClock(minfo, flags, m, n, p);
 }
 #endif
 
 #ifdef CONFIG_FB_MATROX_MYSTIQUE
-static int MGA1064_preinit(WPMINFO2) {
+static int MGA1064_preinit(struct matrox_fb_info *minfo)
+{
        static const int vxres_mystique[] = { 512,        640, 768,  800,  832,  960,
                                             1024, 1152, 1280,      1600, 1664, 1920,
                                             2048,    0};
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
-       ACCESS_FBINFO(capable.text) = 1;
-       ACCESS_FBINFO(capable.vxres) = vxres_mystique;
+       /* minfo->capable.cfb4 = 0; ... preinitialized by 0 */
+       minfo->capable.text = 1;
+       minfo->capable.vxres = vxres_mystique;
 
-       ACCESS_FBINFO(outputs[0]).output = &m1064;
-       ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;
-       ACCESS_FBINFO(outputs[0]).data = MINFO;
-       ACCESS_FBINFO(outputs[0]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
+       minfo->outputs[0].output = &m1064;
+       minfo->outputs[0].src = minfo->outputs[0].default_src;
+       minfo->outputs[0].data = minfo;
+       minfo->outputs[0].mode = MATROXFB_OUTPUT_MODE_MONITOR;
 
-       if (ACCESS_FBINFO(devflags.noinit))
+       if (minfo->devflags.noinit)
                return 0;       /* do not modify settings */
        hw->MXoptionReg &= 0xC0000100;
        hw->MXoptionReg |= 0x00094E20;
-       if (ACCESS_FBINFO(devflags.novga))
+       if (minfo->devflags.novga)
                hw->MXoptionReg &= ~0x00000100;
-       if (ACCESS_FBINFO(devflags.nobios))
+       if (minfo->devflags.nobios)
                hw->MXoptionReg &= ~0x40000000;
-       if (ACCESS_FBINFO(devflags.nopciretry))
+       if (minfo->devflags.nopciretry)
                hw->MXoptionReg |=  0x20000000;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
        mga_setr(M_SEQ_INDEX, 0x01, 0x20);
        mga_outl(M_CTLWTST, 0x00000000);
        udelay(200);
@@ -681,101 +703,105 @@ static int MGA1064_preinit(WPMINFO2) {
        return 0;
 }
 
-static void MGA1064_reset(WPMINFO2) {
+static void MGA1064_reset(struct matrox_fb_info *minfo)
+{
 
        DBG(__func__);
 
-       MGA1064_ramdac_init(PMINFO2);
+       MGA1064_ramdac_init(minfo);
 }
 #endif
 
 #ifdef CONFIG_FB_MATROX_G
-static void g450_mclk_init(WPMINFO2) {
+static void g450_mclk_init(struct matrox_fb_info *minfo)
+{
        /* switch all clocks to PCI source */
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg | 4);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION3_REG, ACCESS_FBINFO(values).reg.opt3 & ~0x00300C03);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
-       
-       if (((ACCESS_FBINFO(values).reg.opt3 & 0x000003) == 0x000003) ||
-           ((ACCESS_FBINFO(values).reg.opt3 & 0x000C00) == 0x000C00) ||
-           ((ACCESS_FBINFO(values).reg.opt3 & 0x300000) == 0x300000)) {
-               matroxfb_g450_setclk(PMINFO ACCESS_FBINFO(values.pll.video), M_VIDEO_PLL);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg | 4);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION3_REG, minfo->values.reg.opt3 & ~0x00300C03);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
+
+       if (((minfo->values.reg.opt3 & 0x000003) == 0x000003) ||
+           ((minfo->values.reg.opt3 & 0x000C00) == 0x000C00) ||
+           ((minfo->values.reg.opt3 & 0x300000) == 0x300000)) {
+               matroxfb_g450_setclk(minfo, minfo->values.pll.video, M_VIDEO_PLL);
        } else {
                unsigned long flags;
                unsigned int pwr;
                
                matroxfb_DAC_lock_irqsave(flags);
-               pwr = inDAC1064(PMINFO M1064_XPWRCTRL) & ~0x02;
-               outDAC1064(PMINFO M1064_XPWRCTRL, pwr);
+               pwr = inDAC1064(minfo, M1064_XPWRCTRL) & ~0x02;
+               outDAC1064(minfo, M1064_XPWRCTRL, pwr);
                matroxfb_DAC_unlock_irqrestore(flags);
        }
-       matroxfb_g450_setclk(PMINFO ACCESS_FBINFO(values.pll.system), M_SYSTEM_PLL);
+       matroxfb_g450_setclk(minfo, minfo->values.pll.system, M_SYSTEM_PLL);
        
        /* switch clocks to their real PLL source(s) */
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg | 4);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION3_REG, ACCESS_FBINFO(values).reg.opt3);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg | 4);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION3_REG, minfo->values.reg.opt3);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
 
 }
 
-static void g450_memory_init(WPMINFO2) {
+static void g450_memory_init(struct matrox_fb_info *minfo)
+{
        /* disable memory refresh */
-       ACCESS_FBINFO(hw).MXoptionReg &= ~0x001F8000;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
+       minfo->hw.MXoptionReg &= ~0x001F8000;
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
        
        /* set memory interface parameters */
-       ACCESS_FBINFO(hw).MXoptionReg &= ~0x00207E00;
-       ACCESS_FBINFO(hw).MXoptionReg |= 0x00207E00 & ACCESS_FBINFO(values).reg.opt;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, ACCESS_FBINFO(values).reg.opt2);
+       minfo->hw.MXoptionReg &= ~0x00207E00;
+       minfo->hw.MXoptionReg |= 0x00207E00 & minfo->values.reg.opt;
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION2_REG, minfo->values.reg.opt2);
        
-       mga_outl(M_CTLWTST, ACCESS_FBINFO(values).reg.mctlwtst);
+       mga_outl(M_CTLWTST, minfo->values.reg.mctlwtst);
        
        /* first set up memory interface with disabled memory interface clocks */
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_MEMMISC_REG, ACCESS_FBINFO(values).reg.memmisc & ~0x80000000U);
-       mga_outl(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk);
-       mga_outl(M_MACCESS, ACCESS_FBINFO(values).reg.maccess);
+       pci_write_config_dword(minfo->pcidev, PCI_MEMMISC_REG, minfo->values.reg.memmisc & ~0x80000000U);
+       mga_outl(M_MEMRDBK, minfo->values.reg.memrdbk);
+       mga_outl(M_MACCESS, minfo->values.reg.maccess);
        /* start memory clocks */
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_MEMMISC_REG, ACCESS_FBINFO(values).reg.memmisc | 0x80000000U);
+       pci_write_config_dword(minfo->pcidev, PCI_MEMMISC_REG, minfo->values.reg.memmisc | 0x80000000U);
 
        udelay(200);
        
-       if (ACCESS_FBINFO(values).memory.ddr && (!ACCESS_FBINFO(values).memory.emrswen || !ACCESS_FBINFO(values).memory.dll)) {
-               mga_outl(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk & ~0x1000);
+       if (minfo->values.memory.ddr && (!minfo->values.memory.emrswen || !minfo->values.memory.dll)) {
+               mga_outl(M_MEMRDBK, minfo->values.reg.memrdbk & ~0x1000);
        }
-       mga_outl(M_MACCESS, ACCESS_FBINFO(values).reg.maccess | 0x8000);
+       mga_outl(M_MACCESS, minfo->values.reg.maccess | 0x8000);
        
        udelay(200);
        
-       ACCESS_FBINFO(hw).MXoptionReg |= 0x001F8000 & ACCESS_FBINFO(values).reg.opt;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
+       minfo->hw.MXoptionReg |= 0x001F8000 & minfo->values.reg.opt;
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
        
        /* value is written to memory chips only if old != new */
        mga_outl(M_PLNWT, 0);
        mga_outl(M_PLNWT, ~0);
        
-       if (ACCESS_FBINFO(values).reg.mctlwtst != ACCESS_FBINFO(values).reg.mctlwtst_core) {
-               mga_outl(M_CTLWTST, ACCESS_FBINFO(values).reg.mctlwtst_core);
+       if (minfo->values.reg.mctlwtst != minfo->values.reg.mctlwtst_core) {
+               mga_outl(M_CTLWTST, minfo->values.reg.mctlwtst_core);
        }
        
 }
 
-static void g450_preinit(WPMINFO2) {
+static void g450_preinit(struct matrox_fb_info *minfo)
+{
        u_int32_t c2ctl;
        u_int8_t curctl;
        u_int8_t c1ctl;
        
-       /* ACCESS_FBINFO(hw).MXoptionReg = minfo->values.reg.opt; */
-       ACCESS_FBINFO(hw).MXoptionReg &= 0xC0000100;
-       ACCESS_FBINFO(hw).MXoptionReg |= 0x00000020;
-       if (ACCESS_FBINFO(devflags.novga))
-               ACCESS_FBINFO(hw).MXoptionReg &= ~0x00000100;
-       if (ACCESS_FBINFO(devflags.nobios))
-               ACCESS_FBINFO(hw).MXoptionReg &= ~0x40000000;
-       if (ACCESS_FBINFO(devflags.nopciretry))
-               ACCESS_FBINFO(hw).MXoptionReg |=  0x20000000;
-       ACCESS_FBINFO(hw).MXoptionReg |= ACCESS_FBINFO(values).reg.opt & 0x03400040;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
+       /* minfo->hw.MXoptionReg = minfo->values.reg.opt; */
+       minfo->hw.MXoptionReg &= 0xC0000100;
+       minfo->hw.MXoptionReg |= 0x00000020;
+       if (minfo->devflags.novga)
+               minfo->hw.MXoptionReg &= ~0x00000100;
+       if (minfo->devflags.nobios)
+               minfo->hw.MXoptionReg &= ~0x40000000;
+       if (minfo->devflags.nopciretry)
+               minfo->hw.MXoptionReg |=  0x20000000;
+       minfo->hw.MXoptionReg |= minfo->values.reg.opt & 0x03400040;
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
 
        /* Init system clocks */
                
@@ -783,24 +809,24 @@ static void g450_preinit(WPMINFO2) {
        c2ctl = mga_inl(M_C2CTL);
        mga_outl(M_C2CTL, c2ctl & ~1);
        /* stop cursor */
-       curctl = inDAC1064(PMINFO M1064_XCURCTRL);
-       outDAC1064(PMINFO M1064_XCURCTRL, 0);
+       curctl = inDAC1064(minfo, M1064_XCURCTRL);
+       outDAC1064(minfo, M1064_XCURCTRL, 0);
        /* stop crtc1 */
        c1ctl = mga_readr(M_SEQ_INDEX, 1);
        mga_setr(M_SEQ_INDEX, 1, c1ctl | 0x20);
 
-       g450_mclk_init(PMINFO2);
-       g450_memory_init(PMINFO2);
+       g450_mclk_init(minfo);
+       g450_memory_init(minfo);
        
        /* set legacy VGA clock sources for DOSEmu or VMware... */
-       matroxfb_g450_setclk(PMINFO 25175, M_PIXEL_PLL_A);
-       matroxfb_g450_setclk(PMINFO 28322, M_PIXEL_PLL_B);
+       matroxfb_g450_setclk(minfo, 25175, M_PIXEL_PLL_A);
+       matroxfb_g450_setclk(minfo, 28322, M_PIXEL_PLL_B);
 
        /* restore crtc1 */
        mga_setr(M_SEQ_INDEX, 1, c1ctl);
        
        /* restore cursor */
-       outDAC1064(PMINFO M1064_XCURCTRL, curctl);
+       outDAC1064(minfo, M1064_XCURCTRL, curctl);
 
        /* restore crtc2 */
        mga_outl(M_C2CTL, c2ctl);
@@ -808,11 +834,12 @@ static void g450_preinit(WPMINFO2) {
        return;
 }
 
-static int MGAG100_preinit(WPMINFO2) {
+static int MGAG100_preinit(struct matrox_fb_info *minfo)
+{
        static const int vxres_g100[] = {  512,        640, 768,  800,  832,  960,
                                           1024, 1152, 1280,      1600, 1664, 1920,
                                           2048, 0};
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
         u_int32_t reg50;
 #if 0
@@ -822,68 +849,68 @@ static int MGAG100_preinit(WPMINFO2) {
        DBG(__func__)
 
        /* there are some instabilities if in_div > 19 && vco < 61000 */
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               ACCESS_FBINFO(features.pll.vco_freq_min) = 130000;      /* my sample: >118 */
+       if (minfo->devflags.g450dac) {
+               minfo->features.pll.vco_freq_min = 130000;      /* my sample: >118 */
        } else {
-               ACCESS_FBINFO(features.pll.vco_freq_min) = 62000;
+               minfo->features.pll.vco_freq_min = 62000;
        }
-       if (!ACCESS_FBINFO(features.pll.ref_freq)) {
-               ACCESS_FBINFO(features.pll.ref_freq)     = 27000;
+       if (!minfo->features.pll.ref_freq) {
+               minfo->features.pll.ref_freq     = 27000;
        }
-       ACCESS_FBINFO(features.pll.feed_div_min) = 7;
-       ACCESS_FBINFO(features.pll.feed_div_max) = 127;
-       ACCESS_FBINFO(features.pll.in_div_min)   = 1;
-       ACCESS_FBINFO(features.pll.in_div_max)   = 31;
-       ACCESS_FBINFO(features.pll.post_shift_max) = 3;
-       ACCESS_FBINFO(features.DAC1064.xvrefctrl) = DAC1064_XVREFCTRL_G100_DEFAULT;
-       /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
-       ACCESS_FBINFO(capable.text) = 1;
-       ACCESS_FBINFO(capable.vxres) = vxres_g100;
-       ACCESS_FBINFO(capable.plnwt) = ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100
-                       ? ACCESS_FBINFO(devflags.sgram) : 1;
+       minfo->features.pll.feed_div_min = 7;
+       minfo->features.pll.feed_div_max = 127;
+       minfo->features.pll.in_div_min   = 1;
+       minfo->features.pll.in_div_max   = 31;
+       minfo->features.pll.post_shift_max = 3;
+       minfo->features.DAC1064.xvrefctrl = DAC1064_XVREFCTRL_G100_DEFAULT;
+       /* minfo->capable.cfb4 = 0; ... preinitialized by 0 */
+       minfo->capable.text = 1;
+       minfo->capable.vxres = vxres_g100;
+       minfo->capable.plnwt = minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG100
+                       ? minfo->devflags.sgram : 1;
 
 #ifdef CONFIG_FB_MATROX_G
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               ACCESS_FBINFO(outputs[0]).output = &g450out;
+       if (minfo->devflags.g450dac) {
+               minfo->outputs[0].output = &g450out;
        } else
 #endif
        {
-               ACCESS_FBINFO(outputs[0]).output = &m1064;
+               minfo->outputs[0].output = &m1064;
        }
-       ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;
-       ACCESS_FBINFO(outputs[0]).data = MINFO;
-       ACCESS_FBINFO(outputs[0]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
+       minfo->outputs[0].src = minfo->outputs[0].default_src;
+       minfo->outputs[0].data = minfo;
+       minfo->outputs[0].mode = MATROXFB_OUTPUT_MODE_MONITOR;
 
-       if (ACCESS_FBINFO(devflags.g450dac)) {
+       if (minfo->devflags.g450dac) {
                /* we must do this always, BIOS does not do it for us
                   and accelerator dies without it */
                mga_outl(0x1C0C, 0);
        }
-       if (ACCESS_FBINFO(devflags.noinit))
+       if (minfo->devflags.noinit)
                return 0;
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               g450_preinit(PMINFO2);
+       if (minfo->devflags.g450dac) {
+               g450_preinit(minfo);
                return 0;
        }
        hw->MXoptionReg &= 0xC0000100;
        hw->MXoptionReg |= 0x00000020;
-       if (ACCESS_FBINFO(devflags.novga))
+       if (minfo->devflags.novga)
                hw->MXoptionReg &= ~0x00000100;
-       if (ACCESS_FBINFO(devflags.nobios))
+       if (minfo->devflags.nobios)
                hw->MXoptionReg &= ~0x40000000;
-       if (ACCESS_FBINFO(devflags.nopciretry))
+       if (minfo->devflags.nopciretry)
                hw->MXoptionReg |=  0x20000000;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
-       DAC1064_setmclk(PMINFO DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV3 | DAC1064_OPT_SCLK_PCI, 133333);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
+       DAC1064_setmclk(minfo, DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV3 | DAC1064_OPT_SCLK_PCI, 133333);
 
-       if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100) {
-               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, &reg50);
+       if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG100) {
+               pci_read_config_dword(minfo->pcidev, PCI_OPTION2_REG, &reg50);
                reg50 &= ~0x3000;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, reg50);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION2_REG, reg50);
 
                hw->MXoptionReg |= 0x1080;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
-               mga_outl(M_CTLWTST, ACCESS_FBINFO(values).reg.mctlwtst);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
+               mga_outl(M_CTLWTST, minfo->values.reg.mctlwtst);
                udelay(100);
                mga_outb(0x1C05, 0x00);
                mga_outb(0x1C05, 0x80);
@@ -893,68 +920,69 @@ static int MGAG100_preinit(WPMINFO2) {
                udelay(100);
                reg50 &= ~0xFF;
                reg50 |=  0x07;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, reg50);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION2_REG, reg50);
                /* it should help with G100 */
                mga_outb(M_GRAPHICS_INDEX, 6);
                mga_outb(M_GRAPHICS_DATA, (mga_inb(M_GRAPHICS_DATA) & 3) | 4);
                mga_setr(M_EXTVGA_INDEX, 0x03, 0x81);
                mga_setr(M_EXTVGA_INDEX, 0x04, 0x00);
-               mga_writeb(ACCESS_FBINFO(video.vbase), 0x0000, 0xAA);
-               mga_writeb(ACCESS_FBINFO(video.vbase), 0x0800, 0x55);
-               mga_writeb(ACCESS_FBINFO(video.vbase), 0x4000, 0x55);
+               mga_writeb(minfo->video.vbase, 0x0000, 0xAA);
+               mga_writeb(minfo->video.vbase, 0x0800, 0x55);
+               mga_writeb(minfo->video.vbase, 0x4000, 0x55);
 #if 0
-               if (mga_readb(ACCESS_FBINFO(video.vbase), 0x0000) != 0xAA) {
+               if (mga_readb(minfo->video.vbase, 0x0000) != 0xAA) {
                        hw->MXoptionReg &= ~0x1000;
                }
 #endif
                hw->MXoptionReg |= 0x00078020;
-       } else if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG200) {
-               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, &reg50);
+       } else if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG200) {
+               pci_read_config_dword(minfo->pcidev, PCI_OPTION2_REG, &reg50);
                reg50 &= ~0x3000;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, reg50);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION2_REG, reg50);
 
-               if (ACCESS_FBINFO(devflags.memtype) == -1)
-                       hw->MXoptionReg |= ACCESS_FBINFO(values).reg.opt & 0x1C00;
+               if (minfo->devflags.memtype == -1)
+                       hw->MXoptionReg |= minfo->values.reg.opt & 0x1C00;
                else
-                       hw->MXoptionReg |= (ACCESS_FBINFO(devflags.memtype) & 7) << 10;
-               if (ACCESS_FBINFO(devflags.sgram))
+                       hw->MXoptionReg |= (minfo->devflags.memtype & 7) << 10;
+               if (minfo->devflags.sgram)
                        hw->MXoptionReg |= 0x4000;
-               mga_outl(M_CTLWTST, ACCESS_FBINFO(values).reg.mctlwtst);
-               mga_outl(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk);
+               mga_outl(M_CTLWTST, minfo->values.reg.mctlwtst);
+               mga_outl(M_MEMRDBK, minfo->values.reg.memrdbk);
                udelay(200);
                mga_outl(M_MACCESS, 0x00000000);
                mga_outl(M_MACCESS, 0x00008000);
                udelay(100);
-               mga_outw(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk);
+               mga_outw(M_MEMRDBK, minfo->values.reg.memrdbk);
                hw->MXoptionReg |= 0x00078020;
        } else {
-               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, &reg50);
+               pci_read_config_dword(minfo->pcidev, PCI_OPTION2_REG, &reg50);
                reg50 &= ~0x00000100;
                reg50 |=  0x00000000;
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION2_REG, reg50);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION2_REG, reg50);
 
-               if (ACCESS_FBINFO(devflags.memtype) == -1)
-                       hw->MXoptionReg |= ACCESS_FBINFO(values).reg.opt & 0x1C00;
+               if (minfo->devflags.memtype == -1)
+                       hw->MXoptionReg |= minfo->values.reg.opt & 0x1C00;
                else
-                       hw->MXoptionReg |= (ACCESS_FBINFO(devflags.memtype) & 7) << 10;
-               if (ACCESS_FBINFO(devflags.sgram))
+                       hw->MXoptionReg |= (minfo->devflags.memtype & 7) << 10;
+               if (minfo->devflags.sgram)
                        hw->MXoptionReg |= 0x4000;
-               mga_outl(M_CTLWTST, ACCESS_FBINFO(values).reg.mctlwtst);
-               mga_outl(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk);
+               mga_outl(M_CTLWTST, minfo->values.reg.mctlwtst);
+               mga_outl(M_MEMRDBK, minfo->values.reg.memrdbk);
                udelay(200);
                mga_outl(M_MACCESS, 0x00000000);
                mga_outl(M_MACCESS, 0x00008000);
                udelay(100);
-               mga_outl(M_MEMRDBK, ACCESS_FBINFO(values).reg.memrdbk);
+               mga_outl(M_MEMRDBK, minfo->values.reg.memrdbk);
                hw->MXoptionReg |= 0x00040020;
        }
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
        return 0;
 }
 
-static void MGAG100_reset(WPMINFO2) {
+static void MGAG100_reset(struct matrox_fb_info *minfo)
+{
        u_int8_t b;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
@@ -964,54 +992,55 @@ static void MGAG100_reset(WPMINFO2) {
 
                find 1014/22 (IBM/82351); /* if found and bridging Matrox, do some strange stuff */
                pci_read_config_byte(ibm, PCI_SECONDARY_BUS, &b);
-               if (b == ACCESS_FBINFO(pcidev)->bus->number) {
+               if (b == minfo->pcidev->bus->number) {
                        pci_write_config_byte(ibm, PCI_COMMAND+1, 0);   /* disable back-to-back & SERR */
                        pci_write_config_byte(ibm, 0x41, 0xF4);         /* ??? */
                        pci_write_config_byte(ibm, PCI_IO_BASE, 0xF0);  /* ??? */
                        pci_write_config_byte(ibm, PCI_IO_LIMIT, 0x00); /* ??? */
                }
 #endif
-               if (!ACCESS_FBINFO(devflags.noinit)) {
+               if (!minfo->devflags.noinit) {
                        if (x7AF4 & 8) {
                                hw->MXoptionReg |= 0x40;        /* FIXME... */
-                               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+                               pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
                        }
                        mga_setr(M_EXTVGA_INDEX, 0x06, 0x00);
                }
        }
-       if (ACCESS_FBINFO(devflags.g450dac)) {
+       if (minfo->devflags.g450dac) {
                /* either leave MCLK as is... or they were set in preinit */
-               hw->DACclk[3] = inDAC1064(PMINFO DAC1064_XSYSPLLM);
-               hw->DACclk[4] = inDAC1064(PMINFO DAC1064_XSYSPLLN);
-               hw->DACclk[5] = inDAC1064(PMINFO DAC1064_XSYSPLLP);
+               hw->DACclk[3] = inDAC1064(minfo, DAC1064_XSYSPLLM);
+               hw->DACclk[4] = inDAC1064(minfo, DAC1064_XSYSPLLN);
+               hw->DACclk[5] = inDAC1064(minfo, DAC1064_XSYSPLLP);
        } else {
-               DAC1064_setmclk(PMINFO DAC1064_OPT_RESERVED | DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV1 | DAC1064_OPT_SCLK_PLL, 133333);
+               DAC1064_setmclk(minfo, DAC1064_OPT_RESERVED | DAC1064_OPT_MDIV2 | DAC1064_OPT_GDIV1 | DAC1064_OPT_SCLK_PLL, 133333);
        }
-       if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400) {
-               if (ACCESS_FBINFO(devflags.dfp_type) == -1) {
-                       ACCESS_FBINFO(devflags.dfp_type) = inDAC1064(PMINFO 0x1F);
+       if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG400) {
+               if (minfo->devflags.dfp_type == -1) {
+                       minfo->devflags.dfp_type = inDAC1064(minfo, 0x1F);
                }
        }
-       if (ACCESS_FBINFO(devflags.noinit))
+       if (minfo->devflags.noinit)
                return;
-       if (ACCESS_FBINFO(devflags.g450dac)) {
+       if (minfo->devflags.g450dac) {
        } else {
-               MGAG100_setPixClock(PMINFO 4, 25175);
-               MGAG100_setPixClock(PMINFO 5, 28322);
+               MGAG100_setPixClock(minfo, 4, 25175);
+               MGAG100_setPixClock(minfo, 5, 28322);
                if (x7AF4 & 0x10) {
-                       b = inDAC1064(PMINFO M1064_XGENIODATA) & ~1;
-                       outDAC1064(PMINFO M1064_XGENIODATA, b);
-                       b = inDAC1064(PMINFO M1064_XGENIOCTRL) | 1;
-                       outDAC1064(PMINFO M1064_XGENIOCTRL, b);
+                       b = inDAC1064(minfo, M1064_XGENIODATA) & ~1;
+                       outDAC1064(minfo, M1064_XGENIODATA, b);
+                       b = inDAC1064(minfo, M1064_XGENIOCTRL) | 1;
+                       outDAC1064(minfo, M1064_XGENIOCTRL, b);
                }
        }
 }
 #endif
 
 #ifdef CONFIG_FB_MATROX_MYSTIQUE
-static void MGA1064_restore(WPMINFO2) {
+static void MGA1064_restore(struct matrox_fb_info *minfo)
+{
        int i;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        CRITFLAGS
 
@@ -1019,25 +1048,26 @@ static void MGA1064_restore(WPMINFO2) {
 
        CRITBEGIN
 
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
        mga_outb(M_IEN, 0x00);
        mga_outb(M_CACHEFLUSH, 0x00);
 
        CRITEND
 
-       DAC1064_restore_1(PMINFO2);
-       matroxfb_vgaHWrestore(PMINFO2);
-       ACCESS_FBINFO(crtc1.panpos) = -1;
+       DAC1064_restore_1(minfo);
+       matroxfb_vgaHWrestore(minfo);
+       minfo->crtc1.panpos = -1;
        for (i = 0; i < 6; i++)
                mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);
-       DAC1064_restore_2(PMINFO2);
+       DAC1064_restore_2(minfo);
 }
 #endif
 
 #ifdef CONFIG_FB_MATROX_G
-static void MGAG100_restore(WPMINFO2) {
+static void MGAG100_restore(struct matrox_fb_info *minfo)
+{
        int i;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        CRITFLAGS
 
@@ -1045,19 +1075,17 @@ static void MGAG100_restore(WPMINFO2) {
 
        CRITBEGIN
 
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
        CRITEND
 
-       DAC1064_restore_1(PMINFO2);
-       matroxfb_vgaHWrestore(PMINFO2);
-#ifdef CONFIG_FB_MATROX_32MB
-       if (ACCESS_FBINFO(devflags.support32MB))
+       DAC1064_restore_1(minfo);
+       matroxfb_vgaHWrestore(minfo);
+       if (minfo->devflags.support32MB)
                mga_setr(M_EXTVGA_INDEX, 8, hw->CRTCEXT[8]);
-#endif
-       ACCESS_FBINFO(crtc1.panpos) = -1;
+       minfo->crtc1.panpos = -1;
        for (i = 0; i < 6; i++)
                mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);
-       DAC1064_restore_2(PMINFO2);
+       DAC1064_restore_2(minfo);
 }
 #endif
 
index 7a98ce8..c6ed780 100644 (file)
@@ -11,8 +11,8 @@ extern struct matrox_switch matrox_mystique;
 extern struct matrox_switch matrox_G100;
 #endif
 #ifdef NEED_DAC1064
-void DAC1064_global_init(WPMINFO2);
-void DAC1064_global_restore(WPMINFO2);
+void DAC1064_global_init(struct matrox_fb_info *minfo);
+void DAC1064_global_restore(struct matrox_fb_info *minfo);
 #endif
 
 #define M1064_INDEX    0x00
index 4e82511..835aaaa 100644 (file)
@@ -279,27 +279,31 @@ static const unsigned char MGADACbpp32[] =
   TVP3026_XCOLKEYCTRL_ZOOM1,
   0x00, 0x00, TVP3026_XCURCTRL_DIS };
 
-static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* in, int* feed, int* post) {
+static int Ti3026_calcclock(const struct matrox_fb_info *minfo,
+                           unsigned int freq, unsigned int fmax, int *in,
+                           int *feed, int *post)
+{
        unsigned int fvco;
        unsigned int lin, lfeed, lpost;
 
        DBG(__func__)
 
-       fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost);
+       fvco = PLL_calcclock(minfo, freq, fmax, &lin, &lfeed, &lpost);
        fvco >>= (*post = lpost);
        *in = 64 - lin;
        *feed = 64 - lfeed;
        return fvco;
 }
 
-static int Ti3026_setpclk(WPMINFO int clk) {
+static int Ti3026_setpclk(struct matrox_fb_info *minfo, int clk)
+{
        unsigned int f_pll;
        unsigned int pixfeed, pixin, pixpost;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost);
+       f_pll = Ti3026_calcclock(minfo, clk, minfo->max_pixel_clock, &pixin, &pixfeed, &pixpost);
 
        hw->DACclk[0] = pixin | 0xC0;
        hw->DACclk[1] = pixfeed;
@@ -309,9 +313,9 @@ static int Ti3026_setpclk(WPMINFO int clk) {
                unsigned int loopfeed, loopin, looppost, loopdiv, z;
                unsigned int Bpp;
 
-               Bpp = ACCESS_FBINFO(curr.final_bppShift);
+               Bpp = minfo->curr.final_bppShift;
 
-               if (ACCESS_FBINFO(fbcon).var.bits_per_pixel == 24) {
+               if (minfo->fbcon.var.bits_per_pixel == 24) {
                        loopfeed = 3;           /* set lm to any possible value */
                        loopin = 3 * 32 / Bpp;
                } else {
@@ -330,18 +334,18 @@ static int Ti3026_setpclk(WPMINFO int clk) {
                        looppost = 3;
                        loopdiv = z/16;
                }
-               if (ACCESS_FBINFO(fbcon).var.bits_per_pixel == 24) {
+               if (minfo->fbcon.var.bits_per_pixel == 24) {
                        hw->DACclk[3] = ((65 - loopin) & 0x3F) | 0xC0;
                        hw->DACclk[4] = (65 - loopfeed) | 0x80;
-                       if (ACCESS_FBINFO(accel.ramdac_rev) > 0x20) {
-                               if (isInterleave(MINFO))
+                       if (minfo->accel.ramdac_rev > 0x20) {
+                               if (isInterleave(minfo))
                                        hw->DACreg[POS3026_XLATCHCTRL] = TVP3026B_XLATCHCTRL_8_3;
                                else {
                                        hw->DACclk[4] &= ~0xC0;
                                        hw->DACreg[POS3026_XLATCHCTRL] = TVP3026B_XLATCHCTRL_4_3;
                                }
                        } else {
-                               if (isInterleave(MINFO))
+                               if (isInterleave(minfo))
                                        ;       /* default... */
                                else {
                                        hw->DACclk[4] ^= 0xC0;  /* change from 0x80 to 0x40 */
@@ -349,7 +353,7 @@ static int Ti3026_setpclk(WPMINFO int clk) {
                                }
                        }
                        hw->DACclk[5] = looppost | 0xF8;
-                       if (ACCESS_FBINFO(devflags.mga_24bpp_fix))
+                       if (minfo->devflags.mga_24bpp_fix)
                                hw->DACclk[5] ^= 0x40;
                } else {
                        hw->DACclk[3] = ((65 - loopin) & 0x3F) | 0xC0;
@@ -361,14 +365,15 @@ static int Ti3026_setpclk(WPMINFO int clk) {
        return 0;
 }
 
-static int Ti3026_init(WPMINFO struct my_timming* m) {
-       u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+static int Ti3026_init(struct matrox_fb_info *minfo, struct my_timming *m)
+{
+       u_int8_t muxctrl = isInterleave(minfo) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
        memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));
-       switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
+       switch (minfo->fbcon.var.bits_per_pixel) {
                case 4: hw->DACreg[POS3026_XLATCHCTRL] = TVP3026_XLATCHCTRL_16_1;       /* or _8_1, they are same */
                        hw->DACreg[POS3026_XTRUECOLORCTRL] = TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR;
                        hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_4BIT;
@@ -383,7 +388,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
                        break;
                case 16:
                        /* XLATCHCTRL should be _4_1 / _2_1... Why is not? (_2_1 is used everytime) */
-                       hw->DACreg[POS3026_XTRUECOLORCTRL] = (ACCESS_FBINFO(fbcon).var.green.length == 5)? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555 ) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565);
+                       hw->DACreg[POS3026_XTRUECOLORCTRL] = (minfo->fbcon.var.green.length == 5) ? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565);
                        hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_16BIT;
                        hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV2;
                        break;
@@ -400,7 +405,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
                default:
                        return 1;       /* TODO: failed */
        }
-       if (matroxfb_vgaHWinit(PMINFO m)) return 1;
+       if (matroxfb_vgaHWinit(minfo, m)) return 1;
 
        /* set SYNC */
        hw->MiscOutReg = 0xCB;
@@ -412,9 +417,9 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
                hw->DACreg[POS3026_XGENCTRL] |= TVP3026_XGENCTRL_SYNC_ON_GREEN;
 
        /* set DELAY */
-       if (ACCESS_FBINFO(video.len) < 0x400000)
+       if (minfo->video.len < 0x400000)
                hw->CRTCEXT[3] |= 0x08;
-       else if (ACCESS_FBINFO(video.len) > 0x400000)
+       else if (minfo->video.len > 0x400000)
                hw->CRTCEXT[3] |= 0x10;
 
        /* set HWCURSOR */
@@ -426,14 +431,15 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
 
        /* set interleaving */
        hw->MXoptionReg &= ~0x00001000;
-       if (isInterleave(MINFO)) hw->MXoptionReg |= 0x00001000;
+       if (isInterleave(minfo)) hw->MXoptionReg |= 0x00001000;
 
        /* set DAC */
-       Ti3026_setpclk(PMINFO m->pixclock);
+       Ti3026_setpclk(minfo, m->pixclock);
        return 0;
 }
 
-static void ti3026_setMCLK(WPMINFO int fout){
+static void ti3026_setMCLK(struct matrox_fb_info *minfo, int fout)
+{
        unsigned int f_pll;
        unsigned int pclk_m, pclk_n, pclk_p;
        unsigned int mclk_m, mclk_n, mclk_p;
@@ -442,29 +448,29 @@ static void ti3026_setMCLK(WPMINFO int fout){
 
        DBG(__func__)
 
-       f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p);
+       f_pll = Ti3026_calcclock(minfo, fout, minfo->max_pixel_clock, &mclk_n, &mclk_m, &mclk_p);
 
        /* save pclk */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFC);
-       pclk_n = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFD);
-       pclk_m = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFE);
-       pclk_p = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFC);
+       pclk_n = inTi3026(minfo, TVP3026_XPIXPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFD);
+       pclk_m = inTi3026(minfo, TVP3026_XPIXPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFE);
+       pclk_p = inTi3026(minfo, TVP3026_XPIXPLLDATA);
 
        /* stop pclk */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFE);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, 0x00);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFE);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, 0x00);
 
        /* set pclk to new mclk */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFC);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, mclk_n | 0xC0);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, mclk_m);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, mclk_p | 0xB0);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFC);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, mclk_n | 0xC0);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, mclk_m);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, mclk_p | 0xB0);
 
        /* wait for PLL to lock */
        for (tmout = 500000; tmout; tmout--) {
-               if (inTi3026(PMINFO TVP3026_XPIXPLLDATA) & 0x40)
+               if (inTi3026(minfo, TVP3026_XPIXPLLDATA) & 0x40)
                        break;
                udelay(10);
        };
@@ -472,23 +478,23 @@ static void ti3026_setMCLK(WPMINFO int fout){
                printk(KERN_ERR "matroxfb: Temporary pixel PLL not locked after 5 secs\n");
 
        /* output pclk on mclk pin */
-       mclk_ctl = inTi3026(PMINFO TVP3026_XMEMPLLCTRL);
-       outTi3026(PMINFO TVP3026_XMEMPLLCTRL, mclk_ctl & 0xE7);
-       outTi3026(PMINFO TVP3026_XMEMPLLCTRL, (mclk_ctl & 0xE7) | TVP3026_XMEMPLLCTRL_STROBEMKC4);
+       mclk_ctl = inTi3026(minfo, TVP3026_XMEMPLLCTRL);
+       outTi3026(minfo, TVP3026_XMEMPLLCTRL, mclk_ctl & 0xE7);
+       outTi3026(minfo, TVP3026_XMEMPLLCTRL, (mclk_ctl & 0xE7) | TVP3026_XMEMPLLCTRL_STROBEMKC4);
 
        /* stop MCLK */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFB);
-       outTi3026(PMINFO TVP3026_XMEMPLLDATA, 0x00);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFB);
+       outTi3026(minfo, TVP3026_XMEMPLLDATA, 0x00);
 
        /* set mclk to new freq */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xF3);
-       outTi3026(PMINFO TVP3026_XMEMPLLDATA, mclk_n | 0xC0);
-       outTi3026(PMINFO TVP3026_XMEMPLLDATA, mclk_m);
-       outTi3026(PMINFO TVP3026_XMEMPLLDATA, mclk_p | 0xB0);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xF3);
+       outTi3026(minfo, TVP3026_XMEMPLLDATA, mclk_n | 0xC0);
+       outTi3026(minfo, TVP3026_XMEMPLLDATA, mclk_m);
+       outTi3026(minfo, TVP3026_XMEMPLLDATA, mclk_p | 0xB0);
 
        /* wait for PLL to lock */
        for (tmout = 500000; tmout; tmout--) {
-               if (inTi3026(PMINFO TVP3026_XMEMPLLDATA) & 0x40)
+               if (inTi3026(minfo, TVP3026_XMEMPLLDATA) & 0x40)
                        break;
                udelay(10);
        }
@@ -496,7 +502,7 @@ static void ti3026_setMCLK(WPMINFO int fout){
                printk(KERN_ERR "matroxfb: Memory PLL not locked after 5 secs\n");
 
        f_pll = f_pll * 333 / (10000 << mclk_p);
-       if (isMilleniumII(MINFO)) {
+       if (isMilleniumII(minfo)) {
                rfhcnt = (f_pll - 128) / 256;
                if (rfhcnt > 15)
                        rfhcnt = 15;
@@ -505,26 +511,26 @@ static void ti3026_setMCLK(WPMINFO int fout){
                if (rfhcnt > 15)
                        rfhcnt = 0;
        }
-       ACCESS_FBINFO(hw).MXoptionReg = (ACCESS_FBINFO(hw).MXoptionReg & ~0x000F0000) | (rfhcnt << 16);
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);
+       minfo->hw.MXoptionReg = (minfo->hw.MXoptionReg & ~0x000F0000) | (rfhcnt << 16);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);
 
        /* output MCLK to MCLK pin */
-       outTi3026(PMINFO TVP3026_XMEMPLLCTRL, (mclk_ctl & 0xE7) | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL);
-       outTi3026(PMINFO TVP3026_XMEMPLLCTRL, (mclk_ctl       ) | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL | TVP3026_XMEMPLLCTRL_STROBEMKC4);
+       outTi3026(minfo, TVP3026_XMEMPLLCTRL, (mclk_ctl & 0xE7) | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL);
+       outTi3026(minfo, TVP3026_XMEMPLLCTRL, (mclk_ctl       ) | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL | TVP3026_XMEMPLLCTRL_STROBEMKC4);
 
        /* stop PCLK */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFE);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, 0x00);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFE);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, 0x00);
 
        /* restore pclk */
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0xFC);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, pclk_n);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, pclk_m);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, pclk_p);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0xFC);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, pclk_n);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, pclk_m);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, pclk_p);
 
        /* wait for PLL to lock */
        for (tmout = 500000; tmout; tmout--) {
-               if (inTi3026(PMINFO TVP3026_XPIXPLLDATA) & 0x40)
+               if (inTi3026(minfo, TVP3026_XPIXPLLDATA) & 0x40)
                        break;
                udelay(10);
        }
@@ -532,26 +538,27 @@ static void ti3026_setMCLK(WPMINFO int fout){
                printk(KERN_ERR "matroxfb: Pixel PLL not locked after 5 secs\n");
 }
 
-static void ti3026_ramdac_init(WPMINFO2) {
-
+static void ti3026_ramdac_init(struct matrox_fb_info *minfo)
+{
        DBG(__func__)
 
-       ACCESS_FBINFO(features.pll.vco_freq_min) = 110000;
-       ACCESS_FBINFO(features.pll.ref_freq)     = 114545;
-       ACCESS_FBINFO(features.pll.feed_div_min) = 2;
-       ACCESS_FBINFO(features.pll.feed_div_max) = 24;
-       ACCESS_FBINFO(features.pll.in_div_min)   = 2;
-       ACCESS_FBINFO(features.pll.in_div_max)   = 63;
-       ACCESS_FBINFO(features.pll.post_shift_max) = 3;
-       if (ACCESS_FBINFO(devflags.noinit))
+       minfo->features.pll.vco_freq_min = 110000;
+       minfo->features.pll.ref_freq     = 114545;
+       minfo->features.pll.feed_div_min = 2;
+       minfo->features.pll.feed_div_max = 24;
+       minfo->features.pll.in_div_min   = 2;
+       minfo->features.pll.in_div_max   = 63;
+       minfo->features.pll.post_shift_max = 3;
+       if (minfo->devflags.noinit)
                return;
-       ti3026_setMCLK(PMINFO 60000);
+       ti3026_setMCLK(minfo, 60000);
 }
 
-static void Ti3026_restore(WPMINFO2) {
+static void Ti3026_restore(struct matrox_fb_info *minfo)
+{
        int i;
        unsigned char progdac[6];
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
        CRITFLAGS
 
        DBG(__func__)
@@ -565,31 +572,31 @@ static void Ti3026_restore(WPMINFO2) {
 
        CRITBEGIN
 
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
 
        CRITEND
 
-       matroxfb_vgaHWrestore(PMINFO2);
+       matroxfb_vgaHWrestore(minfo);
 
        CRITBEGIN
 
-       ACCESS_FBINFO(crtc1.panpos) = -1;
+       minfo->crtc1.panpos = -1;
        for (i = 0; i < 6; i++)
                mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);
 
        for (i = 0; i < 21; i++) {
-               outTi3026(PMINFO DACseq[i], hw->DACreg[i]);
+               outTi3026(minfo, DACseq[i], hw->DACreg[i]);
        }
 
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0x00);
-       progdac[0] = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
-       progdac[3] = inTi3026(PMINFO TVP3026_XLOOPPLLDATA);
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0x15);
-       progdac[1] = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
-       progdac[4] = inTi3026(PMINFO TVP3026_XLOOPPLLDATA);
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0x2A);
-       progdac[2] = inTi3026(PMINFO TVP3026_XPIXPLLDATA);
-       progdac[5] = inTi3026(PMINFO TVP3026_XLOOPPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0x00);
+       progdac[0] = inTi3026(minfo, TVP3026_XPIXPLLDATA);
+       progdac[3] = inTi3026(minfo, TVP3026_XLOOPPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0x15);
+       progdac[1] = inTi3026(minfo, TVP3026_XPIXPLLDATA);
+       progdac[4] = inTi3026(minfo, TVP3026_XLOOPPLLDATA);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0x2A);
+       progdac[2] = inTi3026(minfo, TVP3026_XPIXPLLDATA);
+       progdac[5] = inTi3026(minfo, TVP3026_XLOOPPLLDATA);
 
        CRITEND
        if (memcmp(hw->DACclk, progdac, 6)) {
@@ -598,20 +605,20 @@ static void Ti3026_restore(WPMINFO2) {
                /* Maybe even we should call schedule() ? */
 
                CRITBEGIN
-               outTi3026(PMINFO TVP3026_XCLKCTRL, hw->DACreg[POS3026_XCLKCTRL]);
-               outTi3026(PMINFO TVP3026_XPLLADDR, 0x2A);
-               outTi3026(PMINFO TVP3026_XLOOPPLLDATA, 0);
-               outTi3026(PMINFO TVP3026_XPIXPLLDATA, 0);
+               outTi3026(minfo, TVP3026_XCLKCTRL, hw->DACreg[POS3026_XCLKCTRL]);
+               outTi3026(minfo, TVP3026_XPLLADDR, 0x2A);
+               outTi3026(minfo, TVP3026_XLOOPPLLDATA, 0);
+               outTi3026(minfo, TVP3026_XPIXPLLDATA, 0);
 
-               outTi3026(PMINFO TVP3026_XPLLADDR, 0x00);
+               outTi3026(minfo, TVP3026_XPLLADDR, 0x00);
                for (i = 0; i < 3; i++)
-                       outTi3026(PMINFO TVP3026_XPIXPLLDATA, hw->DACclk[i]);
+                       outTi3026(minfo, TVP3026_XPIXPLLDATA, hw->DACclk[i]);
                /* wait for PLL only if PLL clock requested (always for PowerMode, never for VGA) */
                if (hw->MiscOutReg & 0x08) {
                        int tmout;
-                       outTi3026(PMINFO TVP3026_XPLLADDR, 0x3F);
+                       outTi3026(minfo, TVP3026_XPLLADDR, 0x3F);
                        for (tmout = 500000; tmout; --tmout) {
-                               if (inTi3026(PMINFO TVP3026_XPIXPLLDATA) & 0x40)
+                               if (inTi3026(minfo, TVP3026_XPIXPLLDATA) & 0x40)
                                        break;
                                udelay(10);
                        }
@@ -624,18 +631,18 @@ static void Ti3026_restore(WPMINFO2) {
                                dprintk(KERN_INFO "PixelPLL: %d\n", 500000-tmout);
                        CRITBEGIN
                }
-               outTi3026(PMINFO TVP3026_XMEMPLLCTRL, hw->DACreg[POS3026_XMEMPLLCTRL]);
-               outTi3026(PMINFO TVP3026_XPLLADDR, 0x00);
+               outTi3026(minfo, TVP3026_XMEMPLLCTRL, hw->DACreg[POS3026_XMEMPLLCTRL]);
+               outTi3026(minfo, TVP3026_XPLLADDR, 0x00);
                for (i = 3; i < 6; i++)
-                       outTi3026(PMINFO TVP3026_XLOOPPLLDATA, hw->DACclk[i]);
+                       outTi3026(minfo, TVP3026_XLOOPPLLDATA, hw->DACclk[i]);
                CRITEND
                if ((hw->MiscOutReg & 0x08) && ((hw->DACclk[5] & 0x80) == 0x80)) {
                        int tmout;
 
                        CRITBEGIN
-                       outTi3026(PMINFO TVP3026_XPLLADDR, 0x3F);
+                       outTi3026(minfo, TVP3026_XPLLADDR, 0x3F);
                        for (tmout = 500000; tmout; --tmout) {
-                               if (inTi3026(PMINFO TVP3026_XLOOPPLLDATA) & 0x40)
+                               if (inTi3026(minfo, TVP3026_XLOOPPLLDATA) & 0x40)
                                        break;
                                udelay(10);
                        }
@@ -660,65 +667,66 @@ static void Ti3026_restore(WPMINFO2) {
 #endif
 }
 
-static void Ti3026_reset(WPMINFO2) {
-
+static void Ti3026_reset(struct matrox_fb_info *minfo)
+{
        DBG(__func__)
 
-       ti3026_ramdac_init(PMINFO2);
+       ti3026_ramdac_init(minfo);
 }
 
 static struct matrox_altout ti3026_output = {
        .name    = "Primary output",
 };
 
-static int Ti3026_preinit(WPMINFO2) {
+static int Ti3026_preinit(struct matrox_fb_info *minfo)
+{
        static const int vxres_mill2[] = { 512,        640, 768,  800,  832,  960,
                                          1024, 1152, 1280,      1600, 1664, 1920,
                                          2048, 0};
        static const int vxres_mill1[] = {             640, 768,  800,        960,
                                          1024, 1152, 1280,      1600,       1920,
                                          2048, 0};
-       struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state *hw = &minfo->hw;
 
        DBG(__func__)
 
-       ACCESS_FBINFO(millenium) = 1;
-       ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL);
-       ACCESS_FBINFO(capable.cfb4) = 1;
-       ACCESS_FBINFO(capable.text) = 1; /* isMilleniumII(MINFO); */
-       ACCESS_FBINFO(capable.vxres) = isMilleniumII(MINFO)?vxres_mill2:vxres_mill1;
+       minfo->millenium = 1;
+       minfo->milleniumII = (minfo->pcidev->device != PCI_DEVICE_ID_MATROX_MIL);
+       minfo->capable.cfb4 = 1;
+       minfo->capable.text = 1; /* isMilleniumII(minfo); */
+       minfo->capable.vxres = isMilleniumII(minfo) ? vxres_mill2 : vxres_mill1;
 
-       ACCESS_FBINFO(outputs[0]).data = MINFO;
-       ACCESS_FBINFO(outputs[0]).output = &ti3026_output;
-       ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;
-       ACCESS_FBINFO(outputs[0]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
+       minfo->outputs[0].data = minfo;
+       minfo->outputs[0].output = &ti3026_output;
+       minfo->outputs[0].src = minfo->outputs[0].default_src;
+       minfo->outputs[0].mode = MATROXFB_OUTPUT_MODE_MONITOR;
 
-       if (ACCESS_FBINFO(devflags.noinit))
+       if (minfo->devflags.noinit)
                return 0;
        /* preserve VGA I/O, BIOS and PPC */
        hw->MXoptionReg &= 0xC0000100;
        hw->MXoptionReg |= 0x002C0000;
-       if (ACCESS_FBINFO(devflags.novga))
+       if (minfo->devflags.novga)
                hw->MXoptionReg &= ~0x00000100;
-       if (ACCESS_FBINFO(devflags.nobios))
+       if (minfo->devflags.nobios)
                hw->MXoptionReg &= ~0x40000000;
-       if (ACCESS_FBINFO(devflags.nopciretry))
+       if (minfo->devflags.nopciretry)
                hw->MXoptionReg |=  0x20000000;
-       pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
+       pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);
 
-       ACCESS_FBINFO(accel.ramdac_rev) = inTi3026(PMINFO TVP3026_XSILICONREV);
+       minfo->accel.ramdac_rev = inTi3026(minfo, TVP3026_XSILICONREV);
 
-       outTi3026(PMINFO TVP3026_XCLKCTRL, TVP3026_XCLKCTRL_SRC_CLK0VGA | TVP3026_XCLKCTRL_CLKSTOPPED);
-       outTi3026(PMINFO TVP3026_XTRUECOLORCTRL, TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR);
-       outTi3026(PMINFO TVP3026_XMUXCTRL, TVP3026_XMUXCTRL_VGA);
+       outTi3026(minfo, TVP3026_XCLKCTRL, TVP3026_XCLKCTRL_SRC_CLK0VGA | TVP3026_XCLKCTRL_CLKSTOPPED);
+       outTi3026(minfo, TVP3026_XTRUECOLORCTRL, TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR);
+       outTi3026(minfo, TVP3026_XMUXCTRL, TVP3026_XMUXCTRL_VGA);
 
-       outTi3026(PMINFO TVP3026_XPLLADDR, 0x2A);
-       outTi3026(PMINFO TVP3026_XLOOPPLLDATA, 0x00);
-       outTi3026(PMINFO TVP3026_XPIXPLLDATA, 0x00);
+       outTi3026(minfo, TVP3026_XPLLADDR, 0x2A);
+       outTi3026(minfo, TVP3026_XLOOPPLLDATA, 0x00);
+       outTi3026(minfo, TVP3026_XPIXPLLDATA, 0x00);
 
        mga_outb(M_MISC_REG, 0x67);
 
-       outTi3026(PMINFO TVP3026_XMEMPLLCTRL, TVP3026_XMEMPLLCTRL_STROBEMKC4 | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL);
+       outTi3026(minfo, TVP3026_XMEMPLLCTRL, TVP3026_XMEMPLLCTRL_STROBEMKC4 | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL);
 
        mga_outl(M_RESET, 1);
        udelay(250);
index 9c3aeee..8335a6f 100644 (file)
@@ -81,7 +81,7 @@
 #include "matroxfb_Ti3026.h"
 #include "matroxfb_misc.h"
 
-#define curr_ydstorg(x)        ACCESS_FBINFO2(x, curr.ydstorg.pixels)
+#define curr_ydstorg(x)        ((x)->curr.ydstorg.pixels)
 
 #define mga_ydstlen(y,l) mga_outl(M_YDSTLEN | M_EXEC, ((y) << 16) | (l))
 
@@ -107,7 +107,8 @@ static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* imag
 static void matroxfb_cfb4_fillrect(struct fb_info* info, const struct fb_fillrect* rect);
 static void matroxfb_cfb4_copyarea(struct fb_info* info, const struct fb_copyarea* area);
 
-void matrox_cfbX_init(WPMINFO2) {
+void matrox_cfbX_init(struct matrox_fb_info *minfo)
+{
        u_int32_t maccess;
        u_int32_t mpitch;
        u_int32_t mopmode;
@@ -115,59 +116,59 @@ void matrox_cfbX_init(WPMINFO2) {
 
        DBG(__func__)
 
-       mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual;
+       mpitch = minfo->fbcon.var.xres_virtual;
 
-       ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea;
-       ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect;
-       ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit;
-       ACCESS_FBINFO(fbops).fb_cursor = NULL;
+       minfo->fbops.fb_copyarea = cfb_copyarea;
+       minfo->fbops.fb_fillrect = cfb_fillrect;
+       minfo->fbops.fb_imageblit = cfb_imageblit;
+       minfo->fbops.fb_cursor = NULL;
 
-       accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;
+       accel = (minfo->fbcon.var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;
 
-       switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
+       switch (minfo->fbcon.var.bits_per_pixel) {
                case 4:         maccess = 0x00000000;   /* accelerate as 8bpp video */
                                mpitch = (mpitch >> 1) | 0x8000; /* disable linearization */
                                mopmode = M_OPMODE_4BPP;
-                               matrox_cfb4_pal(ACCESS_FBINFO(cmap));
+                               matrox_cfb4_pal(minfo->cmap);
                                if (accel && !(mpitch & 1)) {
-                                       ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_cfb4_copyarea;
-                                       ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_cfb4_fillrect;
+                                       minfo->fbops.fb_copyarea = matroxfb_cfb4_copyarea;
+                                       minfo->fbops.fb_fillrect = matroxfb_cfb4_fillrect;
                                }
                                break;
                case 8:         maccess = 0x00000000;
                                mopmode = M_OPMODE_8BPP;
-                               matrox_cfb8_pal(ACCESS_FBINFO(cmap));
+                               matrox_cfb8_pal(minfo->cmap);
                                if (accel) {
-                                       ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
-                                       ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
-                                       ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
+                                       minfo->fbops.fb_copyarea = matroxfb_copyarea;
+                                       minfo->fbops.fb_fillrect = matroxfb_fillrect;
+                                       minfo->fbops.fb_imageblit = matroxfb_imageblit;
                                }
                                break;
-               case 16:        if (ACCESS_FBINFO(fbcon).var.green.length == 5)
+               case 16:        if (minfo->fbcon.var.green.length == 5)
                                        maccess = 0xC0000001;
                                else
                                        maccess = 0x40000001;
                                mopmode = M_OPMODE_16BPP;
                                if (accel) {
-                                       ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
-                                       ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
-                                       ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
+                                       minfo->fbops.fb_copyarea = matroxfb_copyarea;
+                                       minfo->fbops.fb_fillrect = matroxfb_fillrect;
+                                       minfo->fbops.fb_imageblit = matroxfb_imageblit;
                                }
                                break;
                case 24:        maccess = 0x00000003;
                                mopmode = M_OPMODE_24BPP;
                                if (accel) {
-                                       ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
-                                       ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
-                                       ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
+                                       minfo->fbops.fb_copyarea = matroxfb_copyarea;
+                                       minfo->fbops.fb_fillrect = matroxfb_fillrect;
+                                       minfo->fbops.fb_imageblit = matroxfb_imageblit;
                                }
                                break;
                case 32:        maccess = 0x00000002;
                                mopmode = M_OPMODE_32BPP;
                                if (accel) {
-                                       ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
-                                       ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
-                                       ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
+                                       minfo->fbops.fb_copyarea = matroxfb_copyarea;
+                                       minfo->fbops.fb_fillrect = matroxfb_fillrect;
+                                       minfo->fbops.fb_imageblit = matroxfb_imageblit;
                                }
                                break;
                default:        maccess = 0x00000000;
@@ -176,10 +177,10 @@ void matrox_cfbX_init(WPMINFO2) {
        }
        mga_fifo(8);
        mga_outl(M_PITCH, mpitch);
-       mga_outl(M_YDSTORG, curr_ydstorg(MINFO));
-       if (ACCESS_FBINFO(capable.plnwt))
+       mga_outl(M_YDSTORG, curr_ydstorg(minfo));
+       if (minfo->capable.plnwt)
                mga_outl(M_PLNWT, -1);
-       if (ACCESS_FBINFO(capable.srcorg)) {
+       if (minfo->capable.srcorg) {
                mga_outl(M_SRCORG, 0);
                mga_outl(M_DSTORG, 0);
        }
@@ -188,14 +189,16 @@ void matrox_cfbX_init(WPMINFO2) {
        mga_outl(M_YTOP, 0);
        mga_outl(M_YBOT, 0x01FFFFFF);
        mga_outl(M_MACCESS, maccess);
-       ACCESS_FBINFO(accel.m_dwg_rect) = M_DWG_TRAP | M_DWG_SOLID | M_DWG_ARZERO | M_DWG_SGNZERO | M_DWG_SHIFTZERO;
-       if (isMilleniumII(MINFO)) ACCESS_FBINFO(accel.m_dwg_rect) |= M_DWG_TRANSC;
-       ACCESS_FBINFO(accel.m_opmode) = mopmode;
+       minfo->accel.m_dwg_rect = M_DWG_TRAP | M_DWG_SOLID | M_DWG_ARZERO | M_DWG_SGNZERO | M_DWG_SHIFTZERO;
+       if (isMilleniumII(minfo)) minfo->accel.m_dwg_rect |= M_DWG_TRANSC;
+       minfo->accel.m_opmode = mopmode;
 }
 
 EXPORT_SYMBOL(matrox_cfbX_init);
 
-static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx, int height, int width) {
+static void matrox_accel_bmove(struct matrox_fb_info *minfo, int vxres, int sy,
+                              int sx, int dy, int dx, int height, int width)
+{
        int start, end;
        CRITFLAGS
 
@@ -209,7 +212,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
                         M_DWG_BFCOL | M_DWG_REPLACE);
                mga_outl(M_AR5, vxres);
                width--;
-               start = sy*vxres+sx+curr_ydstorg(MINFO);
+               start = sy*vxres+sx+curr_ydstorg(minfo);
                end = start+width;
        } else {
                mga_fifo(3);
@@ -217,7 +220,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
                mga_outl(M_SGN, 5);
                mga_outl(M_AR5, -vxres);
                width--;
-               end = (sy+height-1)*vxres+sx+curr_ydstorg(MINFO);
+               end = (sy+height-1)*vxres+sx+curr_ydstorg(minfo);
                start = end+width;
                dy += height-1;
        }
@@ -231,7 +234,10 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
        CRITEND
 }
 
-static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, int dx, int height, int width) {
+static void matrox_accel_bmove_lin(struct matrox_fb_info *minfo, int vxres,
+                                  int sy, int sx, int dy, int dx, int height,
+                                  int width)
+{
        int start, end;
        CRITFLAGS
 
@@ -245,7 +251,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
                        M_DWG_BFCOL | M_DWG_REPLACE);
                mga_outl(M_AR5, vxres);
                width--;
-               start = sy*vxres+sx+curr_ydstorg(MINFO);
+               start = sy*vxres+sx+curr_ydstorg(minfo);
                end = start+width;
        } else {
                mga_fifo(3);
@@ -253,7 +259,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
                mga_outl(M_SGN, 5);
                mga_outl(M_AR5, -vxres);
                width--;
-               end = (sy+height-1)*vxres+sx+curr_ydstorg(MINFO);
+               end = (sy+height-1)*vxres+sx+curr_ydstorg(minfo);
                start = end+width;
                dy += height-1;
        }
@@ -269,22 +275,23 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
 }
 
 static void matroxfb_cfb4_copyarea(struct fb_info* info, const struct fb_copyarea* area) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        if ((area->sx | area->dx | area->width) & 1)
                cfb_copyarea(info, area);
        else
-               matrox_accel_bmove_lin(PMINFO ACCESS_FBINFO(fbcon.var.xres_virtual) >> 1, area->sy, area->sx >> 1, area->dy, area->dx >> 1, area->height, area->width >> 1);
+               matrox_accel_bmove_lin(minfo, minfo->fbcon.var.xres_virtual >> 1, area->sy, area->sx >> 1, area->dy, area->dx >> 1, area->height, area->width >> 1);
 }
 
 static void matroxfb_copyarea(struct fb_info* info, const struct fb_copyarea* area) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
-       matrox_accel_bmove(PMINFO ACCESS_FBINFO(fbcon.var.xres_virtual), area->sy, area->sx, area->dy, area->dx, area->height, area->width);
+       matrox_accel_bmove(minfo, minfo->fbcon.var.xres_virtual, area->sy, area->sx, area->dy, area->dx, area->height, area->width);
 }
 
-static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int height,
-               int width) {
+static void matroxfb_accel_clear(struct matrox_fb_info *minfo, u_int32_t color,
+                                int sy, int sx, int height, int width)
+{
        CRITFLAGS
 
        DBG(__func__)
@@ -292,7 +299,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he
        CRITBEGIN
 
        mga_fifo(5);
-       mga_outl(M_DWGCTL, ACCESS_FBINFO(accel.m_dwg_rect) | M_DWG_REPLACE);
+       mga_outl(M_DWGCTL, minfo->accel.m_dwg_rect | M_DWG_REPLACE);
        mga_outl(M_FCOL, color);
        mga_outl(M_FXBNDRY, ((sx + width) << 16) | sx);
        mga_ydstlen(sy, height);
@@ -302,16 +309,18 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he
 }
 
 static void matroxfb_fillrect(struct fb_info* info, const struct fb_fillrect* rect) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        switch (rect->rop) {
                case ROP_COPY:
-                       matroxfb_accel_clear(PMINFO ((u_int32_t*)info->pseudo_palette)[rect->color], rect->dy, rect->dx, rect->height, rect->width);
+                       matroxfb_accel_clear(minfo, ((u_int32_t *)info->pseudo_palette)[rect->color], rect->dy, rect->dx, rect->height, rect->width);
                        break;
        }
 }
 
-static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int height, int width) {
+static void matroxfb_cfb4_clear(struct matrox_fb_info *minfo, u_int32_t bgx,
+                               int sy, int sx, int height, int width)
+{
        int whattodo;
        CRITFLAGS
 
@@ -333,16 +342,16 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh
        sx >>= 1;
        if (width) {
                mga_fifo(5);
-               mga_outl(M_DWGCTL, ACCESS_FBINFO(accel.m_dwg_rect) | M_DWG_REPLACE2);
+               mga_outl(M_DWGCTL, minfo->accel.m_dwg_rect | M_DWG_REPLACE2);
                mga_outl(M_FCOL, bgx);
                mga_outl(M_FXBNDRY, ((sx + width) << 16) | sx);
-               mga_outl(M_YDST, sy * ACCESS_FBINFO(fbcon).var.xres_virtual >> 6);
+               mga_outl(M_YDST, sy * minfo->fbcon.var.xres_virtual >> 6);
                mga_outl(M_LEN | M_EXEC, height);
                WaitTillIdle();
        }
        if (whattodo) {
-               u_int32_t step = ACCESS_FBINFO(fbcon).var.xres_virtual >> 1;
-               vaddr_t vbase = ACCESS_FBINFO(video.vbase);
+               u_int32_t step = minfo->fbcon.var.xres_virtual >> 1;
+               vaddr_t vbase = minfo->video.vbase;
                if (whattodo & 1) {
                        unsigned int uaddr = sy * step + sx - 1;
                        u_int32_t loop;
@@ -367,17 +376,19 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh
 }
 
 static void matroxfb_cfb4_fillrect(struct fb_info* info, const struct fb_fillrect* rect) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        switch (rect->rop) {
                case ROP_COPY:
-                       matroxfb_cfb4_clear(PMINFO ((u_int32_t*)info->pseudo_palette)[rect->color], rect->dy, rect->dx, rect->height, rect->width);
+                       matroxfb_cfb4_clear(minfo, ((u_int32_t *)info->pseudo_palette)[rect->color], rect->dy, rect->dx, rect->height, rect->width);
                        break;
        }
 }
 
-static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
-               const u_int8_t* chardata, int width, int height, int yy, int xx) {
+static void matroxfb_1bpp_imageblit(struct matrox_fb_info *minfo, u_int32_t fgx,
+                                   u_int32_t bgx, const u_int8_t *chardata,
+                                   int width, int height, int yy, int xx)
+{
        u_int32_t step;
        u_int32_t ydstlen;
        u_int32_t xlen;
@@ -412,7 +423,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
        mga_outl(M_FCOL, fgx);
        mga_outl(M_BCOL, bgx);
        fxbndry = ((xx + width - 1) << 16) | xx;
-       mmio = ACCESS_FBINFO(mmio.vbase);
+       mmio = minfo->mmio.vbase;
 
        mga_fifo(6);
        mga_writel(mmio, M_FXBNDRY, fxbndry);
@@ -467,7 +478,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
 
 
 static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG_HEAVY(__func__);
 
@@ -476,7 +487,7 @@ static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* imag
 
                fgx = ((u_int32_t*)info->pseudo_palette)[image->fg_color];
                bgx = ((u_int32_t*)info->pseudo_palette)[image->bg_color];
-               matroxfb_1bpp_imageblit(PMINFO fgx, bgx, image->data, image->width, image->height, image->dy, image->dx);
+               matroxfb_1bpp_imageblit(minfo, fgx, bgx, image->data, image->width, image->height, image->dy, image->dx);
        } else {
                /* Danger! image->depth is useless: logo painting code always
                   passes framebuffer color depth here, although logo data are
index f40c314..1e418e6 100644 (file)
@@ -3,6 +3,6 @@
 
 #include "matroxfb_base.h"
 
-void matrox_cfbX_init(WPMINFO2);
+void matrox_cfbX_init(struct matrox_fb_info *minfo);
 
 #endif
index 0c1049b..7064fb4 100644 (file)
@@ -154,21 +154,22 @@ static struct fb_var_screeninfo vesafb_defined = {
 
 
 /* --------------------------------------------------------------------- */
-static void update_crtc2(WPMINFO unsigned int pos) {
-       struct matroxfb_dh_fb_info* info = ACCESS_FBINFO(crtc2.info);
+static void update_crtc2(struct matrox_fb_info *minfo, unsigned int pos)
+{
+       struct matroxfb_dh_fb_info *info = minfo->crtc2.info;
 
        /* Make sure that displays are compatible */
-       if (info && (info->fbcon.var.bits_per_pixel == ACCESS_FBINFO(fbcon).var.bits_per_pixel)
-                && (info->fbcon.var.xres_virtual == ACCESS_FBINFO(fbcon).var.xres_virtual)
-                && (info->fbcon.var.green.length == ACCESS_FBINFO(fbcon).var.green.length)
+       if (info && (info->fbcon.var.bits_per_pixel == minfo->fbcon.var.bits_per_pixel)
+                && (info->fbcon.var.xres_virtual == minfo->fbcon.var.xres_virtual)
+                && (info->fbcon.var.green.length == minfo->fbcon.var.green.length)
                 ) {
-               switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
+               switch (minfo->fbcon.var.bits_per_pixel) {
                        case 16:
                        case 32:
                                pos = pos * 8;
                                if (info->interlaced) {
                                        mga_outl(0x3C2C, pos);
-                                       mga_outl(0x3C28, pos + ACCESS_FBINFO(fbcon).var.xres_virtual * ACCESS_FBINFO(fbcon).var.bits_per_pixel / 8);
+                                       mga_outl(0x3C28, pos + minfo->fbcon.var.xres_virtual * minfo->fbcon.var.bits_per_pixel / 8);
                                } else {
                                        mga_outl(0x3C28, pos);
                                }
@@ -177,17 +178,18 @@ static void update_crtc2(WPMINFO unsigned int pos) {
        }
 }
 
-static void matroxfb_crtc1_panpos(WPMINFO2) {
-       if (ACCESS_FBINFO(crtc1.panpos) >= 0) {
+static void matroxfb_crtc1_panpos(struct matrox_fb_info *minfo)
+{
+       if (minfo->crtc1.panpos >= 0) {
                unsigned long flags;
                int panpos;
 
                matroxfb_DAC_lock_irqsave(flags);
-               panpos = ACCESS_FBINFO(crtc1.panpos);
+               panpos = minfo->crtc1.panpos;
                if (panpos >= 0) {
                        unsigned int extvga_reg;
 
-                       ACCESS_FBINFO(crtc1.panpos) = -1; /* No update pending anymore */
+                       minfo->crtc1.panpos = -1; /* No update pending anymore */
                        extvga_reg = mga_inb(M_EXTVGA_INDEX);
                        mga_setr(M_EXTVGA_INDEX, 0x00, panpos);
                        if (extvga_reg != 0x00) {
@@ -202,39 +204,39 @@ static irqreturn_t matrox_irq(int irq, void *dev_id)
 {
        u_int32_t status;
        int handled = 0;
-
-       MINFO_FROM(dev_id);
+       struct matrox_fb_info *minfo = dev_id;
 
        status = mga_inl(M_STATUS);
 
        if (status & 0x20) {
                mga_outl(M_ICLEAR, 0x20);
-               ACCESS_FBINFO(crtc1.vsync.cnt)++;
-               matroxfb_crtc1_panpos(PMINFO2);
-               wake_up_interruptible(&ACCESS_FBINFO(crtc1.vsync.wait));
+               minfo->crtc1.vsync.cnt++;
+               matroxfb_crtc1_panpos(minfo);
+               wake_up_interruptible(&minfo->crtc1.vsync.wait);
                handled = 1;
        }
        if (status & 0x200) {
                mga_outl(M_ICLEAR, 0x200);
-               ACCESS_FBINFO(crtc2.vsync.cnt)++;
-               wake_up_interruptible(&ACCESS_FBINFO(crtc2.vsync.wait));
+               minfo->crtc2.vsync.cnt++;
+               wake_up_interruptible(&minfo->crtc2.vsync.wait);
                handled = 1;
        }
        return IRQ_RETVAL(handled);
 }
 
-int matroxfb_enable_irq(WPMINFO int reenable) {
+int matroxfb_enable_irq(struct matrox_fb_info *minfo, int reenable)
+{
        u_int32_t bm;
 
-       if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400)
+       if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG400)
                bm = 0x220;
        else
                bm = 0x020;
 
-       if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) {
-               if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq,
-                               IRQF_SHARED, "matroxfb", MINFO)) {
-                       clear_bit(0, &ACCESS_FBINFO(irq_flags));
+       if (!test_and_set_bit(0, &minfo->irq_flags)) {
+               if (request_irq(minfo->pcidev->irq, matrox_irq,
+                               IRQF_SHARED, "matroxfb", minfo)) {
+                       clear_bit(0, &minfo->irq_flags);
                        return -EINVAL;
                }
                /* Clear any pending field interrupts */
@@ -252,37 +254,39 @@ int matroxfb_enable_irq(WPMINFO int reenable) {
        return 0;
 }
 
-static void matroxfb_disable_irq(WPMINFO2) {
-       if (test_and_clear_bit(0, &ACCESS_FBINFO(irq_flags))) {
+static void matroxfb_disable_irq(struct matrox_fb_info *minfo)
+{
+       if (test_and_clear_bit(0, &minfo->irq_flags)) {
                /* Flush pending pan-at-vbl request... */
-               matroxfb_crtc1_panpos(PMINFO2);
-               if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400)
+               matroxfb_crtc1_panpos(minfo);
+               if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG400)
                        mga_outl(M_IEN, mga_inl(M_IEN) & ~0x220);
                else
                        mga_outl(M_IEN, mga_inl(M_IEN) & ~0x20);
-               free_irq(ACCESS_FBINFO(pcidev)->irq, MINFO);
+               free_irq(minfo->pcidev->irq, minfo);
        }
 }
 
-int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
+int matroxfb_wait_for_sync(struct matrox_fb_info *minfo, u_int32_t crtc)
+{
        struct matrox_vsync *vs;
        unsigned int cnt;
        int ret;
 
        switch (crtc) {
                case 0:
-                       vs = &ACCESS_FBINFO(crtc1.vsync);
+                       vs = &minfo->crtc1.vsync;
                        break;
                case 1:
-                       if (ACCESS_FBINFO(devflags.accelerator) != FB_ACCEL_MATROX_MGAG400) {
+                       if (minfo->devflags.accelerator != FB_ACCEL_MATROX_MGAG400) {
                                return -ENODEV;
                        }
-                       vs = &ACCESS_FBINFO(crtc2.vsync);
+                       vs = &minfo->crtc2.vsync;
                        break;
                default:
                        return -ENODEV;
        }
-       ret = matroxfb_enable_irq(PMINFO 0);
+       ret = matroxfb_enable_irq(minfo, 0);
        if (ret) {
                return ret;
        }
@@ -293,7 +297,7 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
                return ret;
        }
        if (ret == 0) {
-               matroxfb_enable_irq(PMINFO 1);
+               matroxfb_enable_irq(minfo, 1);
                return -ETIMEDOUT;
        }
        return 0;
@@ -301,12 +305,12 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
 
 /* --------------------------------------------------------------------- */
 
-static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {
+static void matrox_pan_var(struct matrox_fb_info *minfo,
+                          struct fb_var_screeninfo *var)
+{
        unsigned int pos;
        unsigned short p0, p1, p2;
-#ifdef CONFIG_FB_MATROX_32MB
        unsigned int p3;
-#endif
        int vbl;
        unsigned long flags;
 
@@ -314,47 +318,44 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(dead))
+       if (minfo->dead)
                return;
 
-       ACCESS_FBINFO(fbcon).var.xoffset = var->xoffset;
-       ACCESS_FBINFO(fbcon).var.yoffset = var->yoffset;
-       pos = (ACCESS_FBINFO(fbcon).var.yoffset * ACCESS_FBINFO(fbcon).var.xres_virtual + ACCESS_FBINFO(fbcon).var.xoffset) * ACCESS_FBINFO(curr.final_bppShift) / 32;
-       pos += ACCESS_FBINFO(curr.ydstorg.chunks);
-       p0 = ACCESS_FBINFO(hw).CRTC[0x0D] = pos & 0xFF;
-       p1 = ACCESS_FBINFO(hw).CRTC[0x0C] = (pos & 0xFF00) >> 8;
-       p2 = ACCESS_FBINFO(hw).CRTCEXT[0] = (ACCESS_FBINFO(hw).CRTCEXT[0] & 0xB0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40);
-#ifdef CONFIG_FB_MATROX_32MB
-       p3 = ACCESS_FBINFO(hw).CRTCEXT[8] = pos >> 21;
-#endif
+       minfo->fbcon.var.xoffset = var->xoffset;
+       minfo->fbcon.var.yoffset = var->yoffset;
+       pos = (minfo->fbcon.var.yoffset * minfo->fbcon.var.xres_virtual + minfo->fbcon.var.xoffset) * minfo->curr.final_bppShift / 32;
+       pos += minfo->curr.ydstorg.chunks;
+       p0 = minfo->hw.CRTC[0x0D] = pos & 0xFF;
+       p1 = minfo->hw.CRTC[0x0C] = (pos & 0xFF00) >> 8;
+       p2 = minfo->hw.CRTCEXT[0] = (minfo->hw.CRTCEXT[0] & 0xB0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40);
+       p3 = minfo->hw.CRTCEXT[8] = pos >> 21;
 
        /* FB_ACTIVATE_VBL and we can acquire interrupts? Honor FB_ACTIVATE_VBL then... */
-       vbl = (var->activate & FB_ACTIVATE_VBL) && (matroxfb_enable_irq(PMINFO 0) == 0);
+       vbl = (var->activate & FB_ACTIVATE_VBL) && (matroxfb_enable_irq(minfo, 0) == 0);
 
        CRITBEGIN
 
        matroxfb_DAC_lock_irqsave(flags);
        mga_setr(M_CRTC_INDEX, 0x0D, p0);
        mga_setr(M_CRTC_INDEX, 0x0C, p1);
-#ifdef CONFIG_FB_MATROX_32MB
-       if (ACCESS_FBINFO(devflags.support32MB))
+       if (minfo->devflags.support32MB)
                mga_setr(M_EXTVGA_INDEX, 0x08, p3);
-#endif
        if (vbl) {
-               ACCESS_FBINFO(crtc1.panpos) = p2;
+               minfo->crtc1.panpos = p2;
        } else {
                /* Abort any pending change */
-               ACCESS_FBINFO(crtc1.panpos) = -1;
+               minfo->crtc1.panpos = -1;
                mga_setr(M_EXTVGA_INDEX, 0x00, p2);
        }
        matroxfb_DAC_unlock_irqrestore(flags);
 
-       update_crtc2(PMINFO pos);
+       update_crtc2(minfo, pos);
 
        CRITEND
 }
 
-static void matroxfb_remove(WPMINFO int dummy) {
+static void matroxfb_remove(struct matrox_fb_info *minfo, int dummy)
+{
        /* Currently we are holding big kernel lock on all dead & usecount updates.
         * Destroy everything after all users release it. Especially do not unregister
         * framebuffer and iounmap memory, neither fbmem nor fbcon-cfb* does not check
@@ -363,25 +364,23 @@ static void matroxfb_remove(WPMINFO int dummy) {
         * write data without causing too much damage...
         */
 
-       ACCESS_FBINFO(dead) = 1;
-       if (ACCESS_FBINFO(usecount)) {
+       minfo->dead = 1;
+       if (minfo->usecount) {
                /* destroy it later */
                return;
        }
-       matroxfb_unregister_device(MINFO);
-       unregister_framebuffer(&ACCESS_FBINFO(fbcon));
-       matroxfb_g450_shutdown(PMINFO2);
+       matroxfb_unregister_device(minfo);
+       unregister_framebuffer(&minfo->fbcon);
+       matroxfb_g450_shutdown(minfo);
 #ifdef CONFIG_MTRR
-       if (ACCESS_FBINFO(mtrr.vram_valid))
-               mtrr_del(ACCESS_FBINFO(mtrr.vram), ACCESS_FBINFO(video.base), ACCESS_FBINFO(video.len));
+       if (minfo->mtrr.vram_valid)
+               mtrr_del(minfo->mtrr.vram, minfo->video.base, minfo->video.len);
 #endif
-       mga_iounmap(ACCESS_FBINFO(mmio.vbase));
-       mga_iounmap(ACCESS_FBINFO(video.vbase));
-       release_mem_region(ACCESS_FBINFO(video.base), ACCESS_FBINFO(video.len_maximum));
-       release_mem_region(ACCESS_FBINFO(mmio.base), 16384);
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
+       mga_iounmap(minfo->mmio.vbase);
+       mga_iounmap(minfo->video.vbase);
+       release_mem_region(minfo->video.base, minfo->video.len_maximum);
+       release_mem_region(minfo->mmio.base, 16384);
        kfree(minfo);
-#endif
 }
 
        /*
@@ -390,48 +389,50 @@ static void matroxfb_remove(WPMINFO int dummy) {
 
 static int matroxfb_open(struct fb_info *info, int user)
 {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG_LOOP(__func__)
 
-       if (ACCESS_FBINFO(dead)) {
+       if (minfo->dead) {
                return -ENXIO;
        }
-       ACCESS_FBINFO(usecount)++;
+       minfo->usecount++;
        if (user) {
-               ACCESS_FBINFO(userusecount)++;
+               minfo->userusecount++;
        }
        return(0);
 }
 
 static int matroxfb_release(struct fb_info *info, int user)
 {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG_LOOP(__func__)
 
        if (user) {
-               if (0 == --ACCESS_FBINFO(userusecount)) {
-                       matroxfb_disable_irq(PMINFO2);
+               if (0 == --minfo->userusecount) {
+                       matroxfb_disable_irq(minfo);
                }
        }
-       if (!(--ACCESS_FBINFO(usecount)) && ACCESS_FBINFO(dead)) {
-               matroxfb_remove(PMINFO 0);
+       if (!(--minfo->usecount) && minfo->dead) {
+               matroxfb_remove(minfo, 0);
        }
        return(0);
 }
 
 static int matroxfb_pan_display(struct fb_var_screeninfo *var,
                struct fb_info* info) {
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG(__func__)
 
-       matrox_pan_var(PMINFO var);
+       matrox_pan_var(minfo, var);
        return 0;
 }
 
-static int matroxfb_get_final_bppShift(CPMINFO int bpp) {
+static int matroxfb_get_final_bppShift(const struct matrox_fb_info *minfo,
+                                      int bpp)
+{
        int bppshft2;
 
        DBG(__func__)
@@ -440,14 +441,16 @@ static int matroxfb_get_final_bppShift(CPMINFO int bpp) {
        if (!bppshft2) {
                return 8;
        }
-       if (isInterleave(MINFO))
+       if (isInterleave(minfo))
                bppshft2 >>= 1;
-       if (ACCESS_FBINFO(devflags.video64bits))
+       if (minfo->devflags.video64bits)
                bppshft2 >>= 1;
        return bppshft2;
 }
 
-static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) {
+static int matroxfb_test_and_set_rounding(const struct matrox_fb_info *minfo,
+                                         int xres, int bpp)
+{
        int over;
        int rounding;
 
@@ -465,11 +468,11 @@ static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) {
                                break;
                default:        rounding = 16;
                                /* on G400, 16 really does not work */
-                               if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400)
+                               if (minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG400)
                                        rounding = 32;
                                break;
        }
-       if (isInterleave(MINFO)) {
+       if (isInterleave(minfo)) {
                rounding *= 2;
        }
        over = xres % rounding;
@@ -478,7 +481,9 @@ static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) {
        return xres;
 }
 
-static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
+static int matroxfb_pitch_adjust(const struct matrox_fb_info *minfo, int xres,
+                                int bpp)
+{
        const int* width;
        int xres_new;
 
@@ -486,18 +491,18 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
 
        if (!bpp) return xres;
 
-       width = ACCESS_FBINFO(capable.vxres);
+       width = minfo->capable.vxres;
 
-       if (ACCESS_FBINFO(devflags.precise_width)) {
+       if (minfo->devflags.precise_width) {
                while (*width) {
-                       if ((*width >= xres) && (matroxfb_test_and_set_rounding(PMINFO *width, bpp) == *width)) {
+                       if ((*width >= xres) && (matroxfb_test_and_set_rounding(minfo, *width, bpp) == *width)) {
                                break;
                        }
                        width++;
                }
                xres_new = *width;
        } else {
-               xres_new = matroxfb_test_and_set_rounding(PMINFO xres, bpp);
+               xres_new = matroxfb_test_and_set_rounding(minfo, xres, bpp);
        }
        return xres_new;
 }
@@ -524,7 +529,10 @@ static int matroxfb_get_cmap_len(struct fb_var_screeninfo *var) {
        return 16;      /* return something reasonable... or panic()? */
 }
 
-static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visual, int *video_cmap_len, unsigned int* ydstorg) {
+static int matroxfb_decode_var(const struct matrox_fb_info *minfo,
+                              struct fb_var_screeninfo *var, int *visual,
+                              int *video_cmap_len, unsigned int* ydstorg)
+{
        struct RGBT {
                unsigned char bpp;
                struct {
@@ -551,7 +559,7 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua
        DBG(__func__)
 
        switch (bpp) {
-               case 4:  if (!ACCESS_FBINFO(capable.cfb4)) return -EINVAL;
+               case 4:  if (!minfo->capable.cfb4) return -EINVAL;
                         break;
                case 8:  break;
                case 16: break;
@@ -560,13 +568,13 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua
                default: return -EINVAL;
        }
        *ydstorg = 0;
-       vramlen = ACCESS_FBINFO(video.len_usable);
+       vramlen = minfo->video.len_usable;
        if (var->yres_virtual < var->yres)
                var->yres_virtual = var->yres;
        if (var->xres_virtual < var->xres)
                var->xres_virtual = var->xres;
 
-       var->xres_virtual = matroxfb_pitch_adjust(PMINFO var->xres_virtual, bpp);
+       var->xres_virtual = matroxfb_pitch_adjust(minfo, var->xres_virtual, bpp);
        memlen = var->xres_virtual * bpp * var->yres_virtual / 8;
        if (memlen > vramlen) {
                var->yres_virtual = vramlen * 8 / (var->xres_virtual * bpp);
@@ -575,7 +583,7 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua
        /* There is hardware bug that no line can cross 4MB boundary */
        /* give up for CFB24, it is impossible to easy workaround it */
        /* for other try to do something */
-       if (!ACCESS_FBINFO(capable.cross4MB) && (memlen > 0x400000)) {
+       if (!minfo->capable.cross4MB && (memlen > 0x400000)) {
                if (bpp == 24) {
                        /* sorry */
                } else {
@@ -644,9 +652,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                              unsigned blue, unsigned transp,
                              struct fb_info *fb_info)
 {
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
        struct matrox_fb_info* minfo = container_of(fb_info, struct matrox_fb_info, fbcon);
-#endif
 
        DBG(__func__)
 
@@ -657,20 +663,20 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         *  != 0 for invalid regno.
         */
 
-       if (regno >= ACCESS_FBINFO(curr.cmap_len))
+       if (regno >= minfo->curr.cmap_len)
                return 1;
 
-       if (ACCESS_FBINFO(fbcon).var.grayscale) {
+       if (minfo->fbcon.var.grayscale) {
                /* gray = 0.30*R + 0.59*G + 0.11*B */
                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
        }
 
-       red = CNVT_TOHW(red, ACCESS_FBINFO(fbcon).var.red.length);
-       green = CNVT_TOHW(green, ACCESS_FBINFO(fbcon).var.green.length);
-       blue = CNVT_TOHW(blue, ACCESS_FBINFO(fbcon).var.blue.length);
-       transp = CNVT_TOHW(transp, ACCESS_FBINFO(fbcon).var.transp.length);
+       red = CNVT_TOHW(red, minfo->fbcon.var.red.length);
+       green = CNVT_TOHW(green, minfo->fbcon.var.green.length);
+       blue = CNVT_TOHW(blue, minfo->fbcon.var.blue.length);
+       transp = CNVT_TOHW(transp, minfo->fbcon.var.transp.length);
 
-       switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
+       switch (minfo->fbcon.var.bits_per_pixel) {
        case 4:
        case 8:
                mga_outb(M_DAC_REG, regno);
@@ -683,30 +689,30 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                        break;
                {
                        u_int16_t col =
-                               (red << ACCESS_FBINFO(fbcon).var.red.offset)     |
-                               (green << ACCESS_FBINFO(fbcon).var.green.offset) |
-                               (blue << ACCESS_FBINFO(fbcon).var.blue.offset)   |
-                               (transp << ACCESS_FBINFO(fbcon).var.transp.offset); /* for 1:5:5:5 */
-                       ACCESS_FBINFO(cmap[regno]) = col | (col << 16);
+                               (red << minfo->fbcon.var.red.offset)     |
+                               (green << minfo->fbcon.var.green.offset) |
+                               (blue << minfo->fbcon.var.blue.offset)   |
+                               (transp << minfo->fbcon.var.transp.offset); /* for 1:5:5:5 */
+                       minfo->cmap[regno] = col | (col << 16);
                }
                break;
        case 24:
        case 32:
                if (regno >= 16)
                        break;
-               ACCESS_FBINFO(cmap[regno]) =
-                       (red   << ACCESS_FBINFO(fbcon).var.red.offset)   |
-                       (green << ACCESS_FBINFO(fbcon).var.green.offset) |
-                       (blue  << ACCESS_FBINFO(fbcon).var.blue.offset)  |
-                       (transp << ACCESS_FBINFO(fbcon).var.transp.offset);     /* 8:8:8:8 */
+               minfo->cmap[regno] =
+                       (red   << minfo->fbcon.var.red.offset)   |
+                       (green << minfo->fbcon.var.green.offset) |
+                       (blue  << minfo->fbcon.var.blue.offset)  |
+                       (transp << minfo->fbcon.var.transp.offset);     /* 8:8:8:8 */
                break;
        }
        return 0;
 }
 
-static void matroxfb_init_fix(WPMINFO2)
+static void matroxfb_init_fix(struct matrox_fb_info *minfo)
 {
-       struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
+       struct fb_fix_screeninfo *fix = &minfo->fbcon.fix;
        DBG(__func__)
 
        strcpy(fix->id,"MATROX");
@@ -714,20 +720,20 @@ static void matroxfb_init_fix(WPMINFO2)
        fix->xpanstep = 8;      /* 8 for 8bpp, 4 for 16bpp, 2 for 32bpp */
        fix->ypanstep = 1;
        fix->ywrapstep = 0;
-       fix->mmio_start = ACCESS_FBINFO(mmio.base);
-       fix->mmio_len = ACCESS_FBINFO(mmio.len);
-       fix->accel = ACCESS_FBINFO(devflags.accelerator);
+       fix->mmio_start = minfo->mmio.base;
+       fix->mmio_len = minfo->mmio.len;
+       fix->accel = minfo->devflags.accelerator;
 }
 
-static void matroxfb_update_fix(WPMINFO2)
+static void matroxfb_update_fix(struct matrox_fb_info *minfo)
 {
-       struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
+       struct fb_fix_screeninfo *fix = &minfo->fbcon.fix;
        DBG(__func__)
 
-       mutex_lock(&ACCESS_FBINFO(fbcon).mm_lock);
-       fix->smem_start = ACCESS_FBINFO(video.base) + ACCESS_FBINFO(curr.ydstorg.bytes);
-       fix->smem_len = ACCESS_FBINFO(video.len_usable) - ACCESS_FBINFO(curr.ydstorg.bytes);
-       mutex_unlock(&ACCESS_FBINFO(fbcon).mm_lock);
+       mutex_lock(&minfo->fbcon.mm_lock);
+       fix->smem_start = minfo->video.base + minfo->curr.ydstorg.bytes;
+       fix->smem_len = minfo->video.len_usable - minfo->curr.ydstorg.bytes;
+       mutex_unlock(&minfo->fbcon.mm_lock);
 }
 
 static int matroxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
@@ -736,12 +742,12 @@ static int matroxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *inf
        int visual;
        int cmap_len;
        unsigned int ydstorg;
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
-       if (ACCESS_FBINFO(dead)) {
+       if (minfo->dead) {
                return -ENXIO;
        }
-       if ((err = matroxfb_decode_var(PMINFO var, &visual, &cmap_len, &ydstorg)) != 0)
+       if ((err = matroxfb_decode_var(minfo, var, &visual, &cmap_len, &ydstorg)) != 0)
                return err;
        return 0;
 }
@@ -753,35 +759,35 @@ static int matroxfb_set_par(struct fb_info *info)
        int cmap_len;
        unsigned int ydstorg;
        struct fb_var_screeninfo *var;
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(dead)) {
+       if (minfo->dead) {
                return -ENXIO;
        }
 
        var = &info->var;
-       if ((err = matroxfb_decode_var(PMINFO var, &visual, &cmap_len, &ydstorg)) != 0)
+       if ((err = matroxfb_decode_var(minfo, var, &visual, &cmap_len, &ydstorg)) != 0)
                return err;
-       ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase)) + ydstorg;
-       matroxfb_update_fix(PMINFO2);
-       ACCESS_FBINFO(fbcon).fix.visual = visual;
-       ACCESS_FBINFO(fbcon).fix.type = FB_TYPE_PACKED_PIXELS;
-       ACCESS_FBINFO(fbcon).fix.type_aux = 0;
-       ACCESS_FBINFO(fbcon).fix.line_length = (var->xres_virtual * var->bits_per_pixel) >> 3;
+       minfo->fbcon.screen_base = vaddr_va(minfo->video.vbase) + ydstorg;
+       matroxfb_update_fix(minfo);
+       minfo->fbcon.fix.visual = visual;
+       minfo->fbcon.fix.type = FB_TYPE_PACKED_PIXELS;
+       minfo->fbcon.fix.type_aux = 0;
+       minfo->fbcon.fix.line_length = (var->xres_virtual * var->bits_per_pixel) >> 3;
        {
                unsigned int pos;
 
-               ACCESS_FBINFO(curr.cmap_len) = cmap_len;
-               ydstorg += ACCESS_FBINFO(devflags.ydstorg);
-               ACCESS_FBINFO(curr.ydstorg.bytes) = ydstorg;
-               ACCESS_FBINFO(curr.ydstorg.chunks) = ydstorg >> (isInterleave(MINFO)?3:2);
+               minfo->curr.cmap_len = cmap_len;
+               ydstorg += minfo->devflags.ydstorg;
+               minfo->curr.ydstorg.bytes = ydstorg;
+               minfo->curr.ydstorg.chunks = ydstorg >> (isInterleave(minfo) ? 3 : 2);
                if (var->bits_per_pixel == 4)
-                       ACCESS_FBINFO(curr.ydstorg.pixels) = ydstorg;
+                       minfo->curr.ydstorg.pixels = ydstorg;
                else
-                       ACCESS_FBINFO(curr.ydstorg.pixels) = (ydstorg * 8) / var->bits_per_pixel;
-               ACCESS_FBINFO(curr.final_bppShift) = matroxfb_get_final_bppShift(PMINFO var->bits_per_pixel);
+                       minfo->curr.ydstorg.pixels = (ydstorg * 8) / var->bits_per_pixel;
+               minfo->curr.final_bppShift = matroxfb_get_final_bppShift(minfo, var->bits_per_pixel);
                {       struct my_timming mt;
                        struct matrox_hw_state* hw;
                        int out;
@@ -797,54 +803,55 @@ static int matroxfb_set_par(struct fb_info *info)
                                default:        mt.delay = 31 + 8; break;
                        }
 
-                       hw = &ACCESS_FBINFO(hw);
+                       hw = &minfo->hw;
 
-                       down_read(&ACCESS_FBINFO(altout).lock);
+                       down_read(&minfo->altout.lock);
                        for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                               if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC1 &&
-                                   ACCESS_FBINFO(outputs[out]).output->compute) {
-                                       ACCESS_FBINFO(outputs[out]).output->compute(ACCESS_FBINFO(outputs[out]).data, &mt);
+                               if (minfo->outputs[out].src == MATROXFB_SRC_CRTC1 &&
+                                   minfo->outputs[out].output->compute) {
+                                       minfo->outputs[out].output->compute(minfo->outputs[out].data, &mt);
                                }
                        }
-                       up_read(&ACCESS_FBINFO(altout).lock);
-                       ACCESS_FBINFO(crtc1).pixclock = mt.pixclock;
-                       ACCESS_FBINFO(crtc1).mnp = mt.mnp;
-                       ACCESS_FBINFO(hw_switch->init(PMINFO &mt));
-                       pos = (var->yoffset * var->xres_virtual + var->xoffset) * ACCESS_FBINFO(curr.final_bppShift) / 32;
-                       pos += ACCESS_FBINFO(curr.ydstorg.chunks);
+                       up_read(&minfo->altout.lock);
+                       minfo->crtc1.pixclock = mt.pixclock;
+                       minfo->crtc1.mnp = mt.mnp;
+                       minfo->hw_switch->init(minfo, &mt);
+                       pos = (var->yoffset * var->xres_virtual + var->xoffset) * minfo->curr.final_bppShift / 32;
+                       pos += minfo->curr.ydstorg.chunks;
 
                        hw->CRTC[0x0D] = pos & 0xFF;
                        hw->CRTC[0x0C] = (pos & 0xFF00) >> 8;
                        hw->CRTCEXT[0] = (hw->CRTCEXT[0] & 0xF0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40);
                        hw->CRTCEXT[8] = pos >> 21;
-                       ACCESS_FBINFO(hw_switch->restore(PMINFO2));
-                       update_crtc2(PMINFO pos);
-                       down_read(&ACCESS_FBINFO(altout).lock);
+                       minfo->hw_switch->restore(minfo);
+                       update_crtc2(minfo, pos);
+                       down_read(&minfo->altout.lock);
                        for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                               if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC1 &&
-                                   ACCESS_FBINFO(outputs[out]).output->program) {
-                                       ACCESS_FBINFO(outputs[out]).output->program(ACCESS_FBINFO(outputs[out]).data);
+                               if (minfo->outputs[out].src == MATROXFB_SRC_CRTC1 &&
+                                   minfo->outputs[out].output->program) {
+                                       minfo->outputs[out].output->program(minfo->outputs[out].data);
                                }
                        }
                        for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                               if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC1 &&
-                                   ACCESS_FBINFO(outputs[out]).output->start) {
-                                       ACCESS_FBINFO(outputs[out]).output->start(ACCESS_FBINFO(outputs[out]).data);
+                               if (minfo->outputs[out].src == MATROXFB_SRC_CRTC1 &&
+                                   minfo->outputs[out].output->start) {
+                                       minfo->outputs[out].output->start(minfo->outputs[out].data);
                                }
                        }
-                       up_read(&ACCESS_FBINFO(altout).lock);
-                       matrox_cfbX_init(PMINFO2);
+                       up_read(&minfo->altout.lock);
+                       matrox_cfbX_init(minfo);
                }
        }
-       ACCESS_FBINFO(initialized) = 1;
+       minfo->initialized = 1;
        return 0;
 }
 
-static int matroxfb_get_vblank(WPMINFO struct fb_vblank *vblank)
+static int matroxfb_get_vblank(struct matrox_fb_info *minfo,
+                              struct fb_vblank *vblank)
 {
        unsigned int sts1;
 
-       matroxfb_enable_irq(PMINFO 0);
+       matroxfb_enable_irq(minfo, 0);
        memset(vblank, 0, sizeof(*vblank));
        vblank->flags = FB_VBLANK_HAVE_VCOUNT | FB_VBLANK_HAVE_VSYNC |
                        FB_VBLANK_HAVE_VBLANK | FB_VBLANK_HAVE_HBLANK;
@@ -857,13 +864,13 @@ static int matroxfb_get_vblank(WPMINFO struct fb_vblank *vblank)
                vblank->flags |= FB_VBLANK_HBLANKING;
        if (sts1 & 8)
                vblank->flags |= FB_VBLANK_VSYNCING;
-       if (vblank->vcount >= ACCESS_FBINFO(fbcon).var.yres)
+       if (vblank->vcount >= minfo->fbcon.var.yres)
                vblank->flags |= FB_VBLANK_VBLANKING;
-       if (test_bit(0, &ACCESS_FBINFO(irq_flags))) {
+       if (test_bit(0, &minfo->irq_flags)) {
                vblank->flags |= FB_VBLANK_HAVE_COUNT;
                /* Only one writer, aligned int value...
                   it should work without lock and without atomic_t */
-               vblank->count = ACCESS_FBINFO(crtc1).vsync.cnt;
+               vblank->count = minfo->crtc1.vsync.cnt;
        }
        return 0;
 }
@@ -876,11 +883,11 @@ static int matroxfb_ioctl(struct fb_info *info,
                          unsigned int cmd, unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(dead)) {
+       if (minfo->dead) {
                return -ENXIO;
        }
 
@@ -890,7 +897,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                struct fb_vblank vblank;
                                int err;
 
-                               err = matroxfb_get_vblank(PMINFO &vblank);
+                               err = matroxfb_get_vblank(minfo, &vblank);
                                if (err)
                                        return err;
                                if (copy_to_user(argp, &vblank, sizeof(vblank)))
@@ -904,7 +911,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                if (get_user(crt, (u_int32_t __user *)arg))
                                        return -EFAULT;
 
-                               return matroxfb_wait_for_sync(PMINFO crt);
+                               return matroxfb_wait_for_sync(minfo, crt);
                        }
                case MATROXFB_SET_OUTPUT_MODE:
                        {
@@ -916,8 +923,8 @@ static int matroxfb_ioctl(struct fb_info *info,
                                        return -EFAULT;
                                if (mom.output >= MATROXFB_MAX_OUTPUTS)
                                        return -ENXIO;
-                               down_read(&ACCESS_FBINFO(altout.lock));
-                               oproc = ACCESS_FBINFO(outputs[mom.output]).output;
+                               down_read(&minfo->altout.lock);
+                               oproc = minfo->outputs[mom.output].output;
                                if (!oproc) {
                                        val = -ENXIO;
                                } else if (!oproc->verifymode) {
@@ -927,18 +934,18 @@ static int matroxfb_ioctl(struct fb_info *info,
                                                val = -EINVAL;
                                        }
                                } else {
-                                       val = oproc->verifymode(ACCESS_FBINFO(outputs[mom.output]).data, mom.mode);
+                                       val = oproc->verifymode(minfo->outputs[mom.output].data, mom.mode);
                                }
                                if (!val) {
-                                       if (ACCESS_FBINFO(outputs[mom.output]).mode != mom.mode) {
-                                               ACCESS_FBINFO(outputs[mom.output]).mode = mom.mode;
+                                       if (minfo->outputs[mom.output].mode != mom.mode) {
+                                               minfo->outputs[mom.output].mode = mom.mode;
                                                val = 1;
                                        }
                                }
-                               up_read(&ACCESS_FBINFO(altout.lock));
+                               up_read(&minfo->altout.lock);
                                if (val != 1)
                                        return val;
-                               switch (ACCESS_FBINFO(outputs[mom.output]).src) {
+                               switch (minfo->outputs[mom.output].src) {
                                        case MATROXFB_SRC_CRTC1:
                                                matroxfb_set_par(info);
                                                break;
@@ -946,11 +953,11 @@ static int matroxfb_ioctl(struct fb_info *info,
                                                {
                                                        struct matroxfb_dh_fb_info* crtc2;
 
-                                                       down_read(&ACCESS_FBINFO(crtc2.lock));
-                                                       crtc2 = ACCESS_FBINFO(crtc2.info);
+                                                       down_read(&minfo->crtc2.lock);
+                                                       crtc2 = minfo->crtc2.info;
                                                        if (crtc2)
                                                                crtc2->fbcon.fbops->fb_set_par(&crtc2->fbcon);
-                                                       up_read(&ACCESS_FBINFO(crtc2.lock));
+                                                       up_read(&minfo->crtc2.lock);
                                                }
                                                break;
                                }
@@ -966,15 +973,15 @@ static int matroxfb_ioctl(struct fb_info *info,
                                        return -EFAULT;
                                if (mom.output >= MATROXFB_MAX_OUTPUTS)
                                        return -ENXIO;
-                               down_read(&ACCESS_FBINFO(altout.lock));
-                               oproc = ACCESS_FBINFO(outputs[mom.output]).output;
+                               down_read(&minfo->altout.lock);
+                               oproc = minfo->outputs[mom.output].output;
                                if (!oproc) {
                                        val = -ENXIO;
                                } else {
-                                       mom.mode = ACCESS_FBINFO(outputs[mom.output]).mode;
+                                       mom.mode = minfo->outputs[mom.output].mode;
                                        val = 0;
                                }
-                               up_read(&ACCESS_FBINFO(altout.lock));
+                               up_read(&minfo->altout.lock);
                                if (val)
                                        return val;
                                if (copy_to_user(argp, &mom, sizeof(mom)))
@@ -993,9 +1000,9 @@ static int matroxfb_ioctl(struct fb_info *info,
                                        if (tmp & (1 << i)) {
                                                if (i >= MATROXFB_MAX_OUTPUTS)
                                                        return -ENXIO;
-                                               if (!ACCESS_FBINFO(outputs[i]).output)
+                                               if (!minfo->outputs[i].output)
                                                        return -ENXIO;
-                                               switch (ACCESS_FBINFO(outputs[i]).src) {
+                                               switch (minfo->outputs[i].src) {
                                                        case MATROXFB_SRC_NONE:
                                                        case MATROXFB_SRC_CRTC1:
                                                                break;
@@ -1004,12 +1011,12 @@ static int matroxfb_ioctl(struct fb_info *info,
                                                }
                                        }
                                }
-                               if (ACCESS_FBINFO(devflags.panellink)) {
+                               if (minfo->devflags.panellink) {
                                        if (tmp & MATROXFB_OUTPUT_CONN_DFP) {
                                                if (tmp & MATROXFB_OUTPUT_CONN_SECONDARY)
                                                        return -EINVAL;
                                                for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
-                                                       if (ACCESS_FBINFO(outputs[i]).src == MATROXFB_SRC_CRTC2) {
+                                                       if (minfo->outputs[i].src == MATROXFB_SRC_CRTC2) {
                                                                return -EBUSY;
                                                        }
                                                }
@@ -1018,13 +1025,13 @@ static int matroxfb_ioctl(struct fb_info *info,
                                changes = 0;
                                for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
                                        if (tmp & (1 << i)) {
-                                               if (ACCESS_FBINFO(outputs[i]).src != MATROXFB_SRC_CRTC1) {
+                                               if (minfo->outputs[i].src != MATROXFB_SRC_CRTC1) {
                                                        changes = 1;
-                                                       ACCESS_FBINFO(outputs[i]).src = MATROXFB_SRC_CRTC1;
+                                                       minfo->outputs[i].src = MATROXFB_SRC_CRTC1;
                                                }
-                                       } else if (ACCESS_FBINFO(outputs[i]).src == MATROXFB_SRC_CRTC1) {
+                                       } else if (minfo->outputs[i].src == MATROXFB_SRC_CRTC1) {
                                                changes = 1;
-                                               ACCESS_FBINFO(outputs[i]).src = MATROXFB_SRC_NONE;
+                                               minfo->outputs[i].src = MATROXFB_SRC_NONE;
                                        }
                                }
                                if (!changes)
@@ -1038,7 +1045,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                int i;
 
                                for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
-                                       if (ACCESS_FBINFO(outputs[i]).src == MATROXFB_SRC_CRTC1) {
+                                       if (minfo->outputs[i].src == MATROXFB_SRC_CRTC1) {
                                                conn |= 1 << i;
                                        }
                                }
@@ -1052,8 +1059,8 @@ static int matroxfb_ioctl(struct fb_info *info,
                                int i;
 
                                for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
-                                       if (ACCESS_FBINFO(outputs[i]).output) {
-                                               switch (ACCESS_FBINFO(outputs[i]).src) {
+                                       if (minfo->outputs[i].output) {
+                                               switch (minfo->outputs[i].src) {
                                                        case MATROXFB_SRC_NONE:
                                                        case MATROXFB_SRC_CRTC1:
                                                                conn |= 1 << i;
@@ -1061,7 +1068,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                                }
                                        }
                                }
-                               if (ACCESS_FBINFO(devflags.panellink)) {
+                               if (minfo->devflags.panellink) {
                                        if (conn & MATROXFB_OUTPUT_CONN_DFP)
                                                conn &= ~MATROXFB_OUTPUT_CONN_SECONDARY;
                                        if (conn & MATROXFB_OUTPUT_CONN_SECONDARY)
@@ -1077,7 +1084,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                int i;
 
                                for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
-                                       if (ACCESS_FBINFO(outputs[i]).output) {
+                                       if (minfo->outputs[i].output) {
                                                conn |= 1 << i;
                                        }
                                }
@@ -1092,7 +1099,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                memset(&r, 0, sizeof(r));
                                strcpy(r.driver, "matroxfb");
                                strcpy(r.card, "Matrox");
-                               sprintf(r.bus_info, "PCI:%s", pci_name(ACCESS_FBINFO(pcidev)));
+                               sprintf(r.bus_info, "PCI:%s", pci_name(minfo->pcidev));
                                r.version = KERNEL_VERSION(1,0,0);
                                r.capabilities = V4L2_CAP_VIDEO_OUTPUT;
                                if (copy_to_user(argp, &r, sizeof(r)))
@@ -1108,15 +1115,15 @@ static int matroxfb_ioctl(struct fb_info *info,
                                if (copy_from_user(&qctrl, argp, sizeof(qctrl)))
                                        return -EFAULT;
 
-                               down_read(&ACCESS_FBINFO(altout).lock);
-                               if (!ACCESS_FBINFO(outputs[1]).output) {
+                               down_read(&minfo->altout.lock);
+                               if (!minfo->outputs[1].output) {
                                        err = -ENXIO;
-                               } else if (ACCESS_FBINFO(outputs[1]).output->getqueryctrl) {
-                                       err = ACCESS_FBINFO(outputs[1]).output->getqueryctrl(ACCESS_FBINFO(outputs[1]).data, &qctrl);
+                               } else if (minfo->outputs[1].output->getqueryctrl) {
+                                       err = minfo->outputs[1].output->getqueryctrl(minfo->outputs[1].data, &qctrl);
                                } else {
                                        err = -EINVAL;
                                }
-                               up_read(&ACCESS_FBINFO(altout).lock);
+                               up_read(&minfo->altout.lock);
                                if (err >= 0 &&
                                    copy_to_user(argp, &qctrl, sizeof(qctrl)))
                                        return -EFAULT;
@@ -1130,15 +1137,15 @@ static int matroxfb_ioctl(struct fb_info *info,
                                if (copy_from_user(&ctrl, argp, sizeof(ctrl)))
                                        return -EFAULT;
 
-                               down_read(&ACCESS_FBINFO(altout).lock);
-                               if (!ACCESS_FBINFO(outputs[1]).output) {
+                               down_read(&minfo->altout.lock);
+                               if (!minfo->outputs[1].output) {
                                        err = -ENXIO;
-                               } else if (ACCESS_FBINFO(outputs[1]).output->getctrl) {
-                                       err = ACCESS_FBINFO(outputs[1]).output->getctrl(ACCESS_FBINFO(outputs[1]).data, &ctrl);
+                               } else if (minfo->outputs[1].output->getctrl) {
+                                       err = minfo->outputs[1].output->getctrl(minfo->outputs[1].data, &ctrl);
                                } else {
                                        err = -EINVAL;
                                }
-                               up_read(&ACCESS_FBINFO(altout).lock);
+                               up_read(&minfo->altout.lock);
                                if (err >= 0 &&
                                    copy_to_user(argp, &ctrl, sizeof(ctrl)))
                                        return -EFAULT;
@@ -1153,15 +1160,15 @@ static int matroxfb_ioctl(struct fb_info *info,
                                if (copy_from_user(&ctrl, argp, sizeof(ctrl)))
                                        return -EFAULT;
 
-                               down_read(&ACCESS_FBINFO(altout).lock);
-                               if (!ACCESS_FBINFO(outputs[1]).output) {
+                               down_read(&minfo->altout.lock);
+                               if (!minfo->outputs[1].output) {
                                        err = -ENXIO;
-                               } else if (ACCESS_FBINFO(outputs[1]).output->setctrl) {
-                                       err = ACCESS_FBINFO(outputs[1]).output->setctrl(ACCESS_FBINFO(outputs[1]).data, &ctrl);
+                               } else if (minfo->outputs[1].output->setctrl) {
+                                       err = minfo->outputs[1].output->setctrl(minfo->outputs[1].data, &ctrl);
                                } else {
                                        err = -EINVAL;
                                }
-                               up_read(&ACCESS_FBINFO(altout).lock);
+                               up_read(&minfo->altout.lock);
                                return err;
                        }
        }
@@ -1175,11 +1182,11 @@ static int matroxfb_blank(int blank, struct fb_info *info)
        int seq;
        int crtc;
        CRITFLAGS
-       MINFO_FROM_INFO(info);
+       struct matrox_fb_info *minfo = info2minfo(info);
 
        DBG(__func__)
 
-       if (ACCESS_FBINFO(dead))
+       if (minfo->dead)
                return 1;
 
        switch (blank) {
@@ -1281,7 +1288,9 @@ static char outputs[8];                   /* "matrox:outputs:xxx" */
 static char videomode[64];             /* "matrox:mode:xxxxx" or "matrox:xxxxx" */
 #endif
 
-static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSize){
+static int matroxfb_getmemory(struct matrox_fb_info *minfo,
+                             unsigned int maxSize, unsigned int *realSize)
+{
        vaddr_t vm;
        unsigned int offs;
        unsigned int offs2;
@@ -1291,7 +1300,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
 
        DBG(__func__)
 
-       vm = ACCESS_FBINFO(video.vbase);
+       vm = minfo->video.vbase;
        maxSize &= ~0x1FFFFF;   /* must be X*2MB (really it must be 2 or X*4MB) */
        /* at least 2MB */
        if (maxSize < 0x0200000) return 0;
@@ -1323,7 +1332,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
 
        *realSize = offs - 0x100000;
 #ifdef CONFIG_FB_MATROX_MILLENIUM
-       ACCESS_FBINFO(interleave) = !(!isMillenium(MINFO) || ((offs - 0x100000) & 0x3FFFFF));
+       minfo->interleave = !(!isMillenium(minfo) || ((offs - 0x100000) & 0x3FFFFF));
 #endif
        return 1;
 }
@@ -1345,13 +1354,9 @@ static struct video_board vbMystique             = {0x0800000, 0x0800000, FB_ACCEL_MATROX_M
 #ifdef CONFIG_FB_MATROX_G
 static struct video_board vbG100               = {0x0800000, 0x0800000, FB_ACCEL_MATROX_MGAG100,       &matrox_G100};
 static struct video_board vbG200               = {0x1000000, 0x1000000, FB_ACCEL_MATROX_MGAG200,       &matrox_G100};
-#ifdef CONFIG_FB_MATROX_32MB
 /* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for
    whole 32MB */
 static struct video_board vbG400               = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400,       &matrox_G100};
-#else
-static struct video_board vbG400               = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400,       &matrox_G100};
-#endif
 #endif
 
 #define DEVF_VIDEO64BIT                0x0001
@@ -1558,16 +1563,17 @@ static struct fb_videomode defaultmode = {
 
 static int hotplug = 0;
 
-static void setDefaultOutputs(WPMINFO2) {
+static void setDefaultOutputs(struct matrox_fb_info *minfo)
+{
        unsigned int i;
        const char* ptr;
 
-       ACCESS_FBINFO(outputs[0]).default_src = MATROXFB_SRC_CRTC1;
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               ACCESS_FBINFO(outputs[1]).default_src = MATROXFB_SRC_CRTC1;
-               ACCESS_FBINFO(outputs[2]).default_src = MATROXFB_SRC_CRTC1;
+       minfo->outputs[0].default_src = MATROXFB_SRC_CRTC1;
+       if (minfo->devflags.g450dac) {
+               minfo->outputs[1].default_src = MATROXFB_SRC_CRTC1;
+               minfo->outputs[2].default_src = MATROXFB_SRC_CRTC1;
        } else if (dfp) {
-               ACCESS_FBINFO(outputs[2]).default_src = MATROXFB_SRC_CRTC1;
+               minfo->outputs[2].default_src = MATROXFB_SRC_CRTC1;
        }
        ptr = outputs;
        for (i = 0; i < MATROXFB_MAX_OUTPUTS; i++) {
@@ -1577,11 +1583,11 @@ static void setDefaultOutputs(WPMINFO2) {
                        break;
                }
                if (c == '0') {
-                       ACCESS_FBINFO(outputs[i]).default_src = MATROXFB_SRC_NONE;
+                       minfo->outputs[i].default_src = MATROXFB_SRC_NONE;
                } else if (c == '1') {
-                       ACCESS_FBINFO(outputs[i]).default_src = MATROXFB_SRC_CRTC1;
-               } else if (c == '2' && ACCESS_FBINFO(devflags.crtc2)) {
-                       ACCESS_FBINFO(outputs[i]).default_src = MATROXFB_SRC_CRTC2;
+                       minfo->outputs[i].default_src = MATROXFB_SRC_CRTC1;
+               } else if (c == '2' && minfo->devflags.crtc2) {
+                       minfo->outputs[i].default_src = MATROXFB_SRC_CRTC2;
                } else {
                        printk(KERN_ERR "matroxfb: Unknown outputs setting\n");
                        break;
@@ -1591,7 +1597,8 @@ static void setDefaultOutputs(WPMINFO2) {
        outputs[0] = 0;
 }
 
-static int initMatrox2(WPMINFO struct board* b){
+static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
+{
        unsigned long ctrlptr_phys = 0;
        unsigned long video_base_phys = 0;
        unsigned int memsize;
@@ -1607,58 +1614,56 @@ static int initMatrox2(WPMINFO struct board* b){
        /* set default values... */
        vesafb_defined.accel_flags = FB_ACCELF_TEXT;
 
-       ACCESS_FBINFO(hw_switch) = b->base->lowlevel;
-       ACCESS_FBINFO(devflags.accelerator) = b->base->accelID;
-       ACCESS_FBINFO(max_pixel_clock) = b->maxclk;
+       minfo->hw_switch = b->base->lowlevel;
+       minfo->devflags.accelerator = b->base->accelID;
+       minfo->max_pixel_clock = b->maxclk;
 
        printk(KERN_INFO "matroxfb: Matrox %s detected\n", b->name);
-       ACCESS_FBINFO(capable.plnwt) = 1;
-       ACCESS_FBINFO(chip) = b->chip;
-       ACCESS_FBINFO(capable.srcorg) = b->flags & DEVF_SRCORG;
-       ACCESS_FBINFO(devflags.video64bits) = b->flags & DEVF_VIDEO64BIT;
+       minfo->capable.plnwt = 1;
+       minfo->chip = b->chip;
+       minfo->capable.srcorg = b->flags & DEVF_SRCORG;
+       minfo->devflags.video64bits = b->flags & DEVF_VIDEO64BIT;
        if (b->flags & DEVF_TEXT4B) {
-               ACCESS_FBINFO(devflags.vgastep) = 4;
-               ACCESS_FBINFO(devflags.textmode) = 4;
-               ACCESS_FBINFO(devflags.text_type_aux) = FB_AUX_TEXT_MGA_STEP16;
+               minfo->devflags.vgastep = 4;
+               minfo->devflags.textmode = 4;
+               minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP16;
        } else if (b->flags & DEVF_TEXT16B) {
-               ACCESS_FBINFO(devflags.vgastep) = 16;
-               ACCESS_FBINFO(devflags.textmode) = 1;
-               ACCESS_FBINFO(devflags.text_type_aux) = FB_AUX_TEXT_MGA_STEP16;
+               minfo->devflags.vgastep = 16;
+               minfo->devflags.textmode = 1;
+               minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP16;
        } else {
-               ACCESS_FBINFO(devflags.vgastep) = 8;
-               ACCESS_FBINFO(devflags.textmode) = 1;
-               ACCESS_FBINFO(devflags.text_type_aux) = FB_AUX_TEXT_MGA_STEP8;
-       }
-#ifdef CONFIG_FB_MATROX_32MB
-       ACCESS_FBINFO(devflags.support32MB) = (b->flags & DEVF_SUPPORT32MB) != 0;
-#endif
-       ACCESS_FBINFO(devflags.precise_width) = !(b->flags & DEVF_ANY_VXRES);
-       ACCESS_FBINFO(devflags.crtc2) = (b->flags & DEVF_CRTC2) != 0;
-       ACCESS_FBINFO(devflags.maven_capable) = (b->flags & DEVF_MAVEN_CAPABLE) != 0;
-       ACCESS_FBINFO(devflags.dualhead) = (b->flags & DEVF_DUALHEAD) != 0;
-       ACCESS_FBINFO(devflags.dfp_type) = dfp_type;
-       ACCESS_FBINFO(devflags.g450dac) = (b->flags & DEVF_G450DAC) != 0;
-       ACCESS_FBINFO(devflags.textstep) = ACCESS_FBINFO(devflags.vgastep) * ACCESS_FBINFO(devflags.textmode);
-       ACCESS_FBINFO(devflags.textvram) = 65536 / ACCESS_FBINFO(devflags.textmode);
-       setDefaultOutputs(PMINFO2);
+               minfo->devflags.vgastep = 8;
+               minfo->devflags.textmode = 1;
+               minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP8;
+       }
+       minfo->devflags.support32MB = (b->flags & DEVF_SUPPORT32MB) != 0;
+       minfo->devflags.precise_width = !(b->flags & DEVF_ANY_VXRES);
+       minfo->devflags.crtc2 = (b->flags & DEVF_CRTC2) != 0;
+       minfo->devflags.maven_capable = (b->flags & DEVF_MAVEN_CAPABLE) != 0;
+       minfo->devflags.dualhead = (b->flags & DEVF_DUALHEAD) != 0;
+       minfo->devflags.dfp_type = dfp_type;
+       minfo->devflags.g450dac = (b->flags & DEVF_G450DAC) != 0;
+       minfo->devflags.textstep = minfo->devflags.vgastep * minfo->devflags.textmode;
+       minfo->devflags.textvram = 65536 / minfo->devflags.textmode;
+       setDefaultOutputs(minfo);
        if (b->flags & DEVF_PANELLINK_CAPABLE) {
-               ACCESS_FBINFO(outputs[2]).data = MINFO;
-               ACCESS_FBINFO(outputs[2]).output = &panellink_output;
-               ACCESS_FBINFO(outputs[2]).src = ACCESS_FBINFO(outputs[2]).default_src;
-               ACCESS_FBINFO(outputs[2]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               ACCESS_FBINFO(devflags.panellink) = 1;
+               minfo->outputs[2].data = minfo;
+               minfo->outputs[2].output = &panellink_output;
+               minfo->outputs[2].src = minfo->outputs[2].default_src;
+               minfo->outputs[2].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               minfo->devflags.panellink = 1;
        }
 
-       if (ACCESS_FBINFO(capable.cross4MB) < 0)
-               ACCESS_FBINFO(capable.cross4MB) = b->flags & DEVF_CROSS4MB;
+       if (minfo->capable.cross4MB < 0)
+               minfo->capable.cross4MB = b->flags & DEVF_CROSS4MB;
        if (b->flags & DEVF_SWAPS) {
-               ctrlptr_phys = pci_resource_start(ACCESS_FBINFO(pcidev), 1);
-               video_base_phys = pci_resource_start(ACCESS_FBINFO(pcidev), 0);
-               ACCESS_FBINFO(devflags.fbResource) = PCI_BASE_ADDRESS_0;
+               ctrlptr_phys = pci_resource_start(minfo->pcidev, 1);
+               video_base_phys = pci_resource_start(minfo->pcidev, 0);
+               minfo->devflags.fbResource = PCI_BASE_ADDRESS_0;
        } else {
-               ctrlptr_phys = pci_resource_start(ACCESS_FBINFO(pcidev), 0);
-               video_base_phys = pci_resource_start(ACCESS_FBINFO(pcidev), 1);
-               ACCESS_FBINFO(devflags.fbResource) = PCI_BASE_ADDRESS_1;
+               ctrlptr_phys = pci_resource_start(minfo->pcidev, 0);
+               video_base_phys = pci_resource_start(minfo->pcidev, 1);
+               minfo->devflags.fbResource = PCI_BASE_ADDRESS_1;
        }
        err = -EINVAL;
        if (!ctrlptr_phys) {
@@ -1676,7 +1681,7 @@ static int initMatrox2(WPMINFO struct board* b){
        if (!request_mem_region(video_base_phys, memsize, "matroxfb FB")) {
                goto failCtrlMR;
        }
-       ACCESS_FBINFO(video.len_maximum) = memsize;
+       minfo->video.len_maximum = memsize;
        /* convert mem (autodetect k, M) */
        if (mem < 1024) mem *= 1024;
        if (mem < 0x00100000) mem *= 1024;
@@ -1684,14 +1689,14 @@ static int initMatrox2(WPMINFO struct board* b){
        if (mem && (mem < memsize))
                memsize = mem;
        err = -ENOMEM;
-       if (mga_ioremap(ctrlptr_phys, 16384, MGA_IOREMAP_MMIO, &ACCESS_FBINFO(mmio.vbase))) {
+       if (mga_ioremap(ctrlptr_phys, 16384, MGA_IOREMAP_MMIO, &minfo->mmio.vbase)) {
                printk(KERN_ERR "matroxfb: cannot ioremap(%lX, 16384), matroxfb disabled\n", ctrlptr_phys);
                goto failVideoMR;
        }
-       ACCESS_FBINFO(mmio.base) = ctrlptr_phys;
-       ACCESS_FBINFO(mmio.len) = 16384;
-       ACCESS_FBINFO(video.base) = video_base_phys;
-       if (mga_ioremap(video_base_phys, memsize, MGA_IOREMAP_FB, &ACCESS_FBINFO(video.vbase))) {
+       minfo->mmio.base = ctrlptr_phys;
+       minfo->mmio.len = 16384;
+       minfo->video.base = video_base_phys;
+       if (mga_ioremap(video_base_phys, memsize, MGA_IOREMAP_FB, &minfo->video.vbase)) {
                printk(KERN_ERR "matroxfb: cannot ioremap(%lX, %d), matroxfb disabled\n",
                        video_base_phys, memsize);
                goto failCtrlIO;
@@ -1700,63 +1705,63 @@ static int initMatrox2(WPMINFO struct board* b){
                u_int32_t cmd;
                u_int32_t mga_option;
 
-               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, &mga_option);
-               pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_COMMAND, &cmd);
+               pci_read_config_dword(minfo->pcidev, PCI_OPTION_REG, &mga_option);
+               pci_read_config_dword(minfo->pcidev, PCI_COMMAND, &cmd);
                mga_option &= 0x7FFFFFFF; /* clear BIG_ENDIAN */
                mga_option |= MX_OPTION_BSWAP;
                /* disable palette snooping */
                cmd &= ~PCI_COMMAND_VGA_PALETTE;
                if (pci_dev_present(intel_82437)) {
-                       if (!(mga_option & 0x20000000) && !ACCESS_FBINFO(devflags.nopciretry)) {
+                       if (!(mga_option & 0x20000000) && !minfo->devflags.nopciretry) {
                                printk(KERN_WARNING "matroxfb: Disabling PCI retries due to i82437 present\n");
                        }
                        mga_option |= 0x20000000;
-                       ACCESS_FBINFO(devflags.nopciretry) = 1;
+                       minfo->devflags.nopciretry = 1;
                }
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_COMMAND, cmd);
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, mga_option);
-               ACCESS_FBINFO(hw).MXoptionReg = mga_option;
+               pci_write_config_dword(minfo->pcidev, PCI_COMMAND, cmd);
+               pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, mga_option);
+               minfo->hw.MXoptionReg = mga_option;
 
                /* select non-DMA memory for PCI_MGA_DATA, otherwise dump of PCI cfg space can lock PCI bus */
                /* maybe preinit() candidate, but it is same... for all devices... at this time... */
-               pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_MGA_INDEX, 0x00003C00);
+               pci_write_config_dword(minfo->pcidev, PCI_MGA_INDEX, 0x00003C00);
        }
 
        err = -ENXIO;
-       matroxfb_read_pins(PMINFO2);
-       if (ACCESS_FBINFO(hw_switch)->preinit(PMINFO2)) {
+       matroxfb_read_pins(minfo);
+       if (minfo->hw_switch->preinit(minfo)) {
                goto failVideoIO;
        }
 
        err = -ENOMEM;
-       if (!matroxfb_getmemory(PMINFO memsize, &ACCESS_FBINFO(video.len)) || !ACCESS_FBINFO(video.len)) {
+       if (!matroxfb_getmemory(minfo, memsize, &minfo->video.len) || !minfo->video.len) {
                printk(KERN_ERR "matroxfb: cannot determine memory size\n");
                goto failVideoIO;
        }
-       ACCESS_FBINFO(devflags.ydstorg) = 0;
+       minfo->devflags.ydstorg = 0;
 
-       ACCESS_FBINFO(video.base) = video_base_phys;
-       ACCESS_FBINFO(video.len_usable) = ACCESS_FBINFO(video.len);
-       if (ACCESS_FBINFO(video.len_usable) > b->base->maxdisplayable)
-               ACCESS_FBINFO(video.len_usable) = b->base->maxdisplayable;
+       minfo->video.base = video_base_phys;
+       minfo->video.len_usable = minfo->video.len;
+       if (minfo->video.len_usable > b->base->maxdisplayable)
+               minfo->video.len_usable = b->base->maxdisplayable;
 #ifdef CONFIG_MTRR
        if (mtrr) {
-               ACCESS_FBINFO(mtrr.vram) = mtrr_add(video_base_phys, ACCESS_FBINFO(video.len), MTRR_TYPE_WRCOMB, 1);
-               ACCESS_FBINFO(mtrr.vram_valid) = 1;
+               minfo->mtrr.vram = mtrr_add(video_base_phys, minfo->video.len, MTRR_TYPE_WRCOMB, 1);
+               minfo->mtrr.vram_valid = 1;
                printk(KERN_INFO "matroxfb: MTRR's turned on\n");
        }
 #endif /* CONFIG_MTRR */
 
-       if (!ACCESS_FBINFO(devflags.novga))
+       if (!minfo->devflags.novga)
                request_region(0x3C0, 32, "matrox");
-       matroxfb_g450_connect(PMINFO2);
-       ACCESS_FBINFO(hw_switch->reset(PMINFO2));
+       matroxfb_g450_connect(minfo);
+       minfo->hw_switch->reset(minfo);
 
-       ACCESS_FBINFO(fbcon.monspecs.hfmin) = 0;
-       ACCESS_FBINFO(fbcon.monspecs.hfmax) = fh;
-       ACCESS_FBINFO(fbcon.monspecs.vfmin) = 0;
-       ACCESS_FBINFO(fbcon.monspecs.vfmax) = fv;
-       ACCESS_FBINFO(fbcon.monspecs.dpms) = 0; /* TBD */
+       minfo->fbcon.monspecs.hfmin = 0;
+       minfo->fbcon.monspecs.hfmax = fh;
+       minfo->fbcon.monspecs.vfmin = 0;
+       minfo->fbcon.monspecs.vfmax = fv;
+       minfo->fbcon.monspecs.dpms = 0; /* TBD */
 
        /* static settings */
        vesafb_defined.red = colors[depth-1].red;
@@ -1768,24 +1773,24 @@ static int initMatrox2(WPMINFO struct board* b){
        if (noaccel)
                vesafb_defined.accel_flags &= ~FB_ACCELF_TEXT;
 
-       ACCESS_FBINFO(fbops) = matroxfb_ops;
-       ACCESS_FBINFO(fbcon.fbops) = &ACCESS_FBINFO(fbops);
-       ACCESS_FBINFO(fbcon.pseudo_palette) = ACCESS_FBINFO(cmap);
+       minfo->fbops = matroxfb_ops;
+       minfo->fbcon.fbops = &minfo->fbops;
+       minfo->fbcon.pseudo_palette = minfo->cmap;
        /* after __init time we are like module... no logo */
-       ACCESS_FBINFO(fbcon.flags) = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;
-       ACCESS_FBINFO(fbcon.flags) |= FBINFO_PARTIAL_PAN_OK |    /* Prefer panning for scroll under MC viewer/edit */
+       minfo->fbcon.flags = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;
+       minfo->fbcon.flags |= FBINFO_PARTIAL_PAN_OK |    /* Prefer panning for scroll under MC viewer/edit */
                                      FBINFO_HWACCEL_COPYAREA |  /* We have hw-assisted bmove */
                                      FBINFO_HWACCEL_FILLRECT |  /* And fillrect */
                                      FBINFO_HWACCEL_IMAGEBLIT | /* And imageblit */
                                      FBINFO_HWACCEL_XPAN |      /* And we support both horizontal */
                                      FBINFO_HWACCEL_YPAN;       /* And vertical panning */
-       ACCESS_FBINFO(video.len_usable) &= PAGE_MASK;
-       fb_alloc_cmap(&ACCESS_FBINFO(fbcon.cmap), 256, 1);
+       minfo->video.len_usable &= PAGE_MASK;
+       fb_alloc_cmap(&minfo->fbcon.cmap, 256, 1);
 
 #ifndef MODULE
        /* mode database is marked __init!!! */
        if (!hotplug) {
-               fb_find_mode(&vesafb_defined, &ACCESS_FBINFO(fbcon), videomode[0]?videomode:NULL,
+               fb_find_mode(&vesafb_defined, &minfo->fbcon, videomode[0] ? videomode : NULL,
                        NULL, 0, &defaultmode, vesafb_defined.bits_per_pixel);
        }
 #endif /* !MODULE */
@@ -1874,52 +1879,52 @@ static int initMatrox2(WPMINFO struct board* b){
                vesafb_defined.yres_virtual = 65536; /* large enough to be INF, but small enough
                                                        to yres_virtual * xres_virtual < 2^32 */
        }
-       matroxfb_init_fix(PMINFO2);
-       ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase));
+       matroxfb_init_fix(minfo);
+       minfo->fbcon.screen_base = vaddr_va(minfo->video.vbase);
        /* Normalize values (namely yres_virtual) */
-       matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon));
+       matroxfb_check_var(&vesafb_defined, &minfo->fbcon);
        /* And put it into "current" var. Do NOT program hardware yet, or we'll not take over
         * vgacon correctly. fbcon_startup will call fb_set_par for us, WITHOUT check_var,
         * and unfortunately it will do it BEFORE vgacon contents is saved, so it won't work
         * anyway. But we at least tried... */
-       ACCESS_FBINFO(fbcon.var) = vesafb_defined;
+       minfo->fbcon.var = vesafb_defined;
        err = -EINVAL;
 
        printk(KERN_INFO "matroxfb: %dx%dx%dbpp (virtual: %dx%d)\n",
                vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel,
                vesafb_defined.xres_virtual, vesafb_defined.yres_virtual);
        printk(KERN_INFO "matroxfb: framebuffer at 0x%lX, mapped to 0x%p, size %d\n",
-               ACCESS_FBINFO(video.base), vaddr_va(ACCESS_FBINFO(video.vbase)), ACCESS_FBINFO(video.len));
+               minfo->video.base, vaddr_va(minfo->video.vbase), minfo->video.len);
 
 /* We do not have to set currcon to 0... register_framebuffer do it for us on first console
  * and we do not want currcon == 0 for subsequent framebuffers */
 
-       ACCESS_FBINFO(fbcon).device = &ACCESS_FBINFO(pcidev)->dev;
-       if (register_framebuffer(&ACCESS_FBINFO(fbcon)) < 0) {
+       minfo->fbcon.device = &minfo->pcidev->dev;
+       if (register_framebuffer(&minfo->fbcon) < 0) {
                goto failVideoIO;
        }
        printk("fb%d: %s frame buffer device\n",
-              ACCESS_FBINFO(fbcon.node), ACCESS_FBINFO(fbcon.fix.id));
+              minfo->fbcon.node, minfo->fbcon.fix.id);
 
        /* there is no console on this fb... but we have to initialize hardware
         * until someone tells me what is proper thing to do */
-       if (!ACCESS_FBINFO(initialized)) {
+       if (!minfo->initialized) {
                printk(KERN_INFO "fb%d: initializing hardware\n",
-                      ACCESS_FBINFO(fbcon.node));
+                      minfo->fbcon.node);
                /* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var
                 * already before, so register_framebuffer works correctly. */
                vesafb_defined.activate |= FB_ACTIVATE_FORCE;
-               fb_set_var(&ACCESS_FBINFO(fbcon), &vesafb_defined);
+               fb_set_var(&minfo->fbcon, &vesafb_defined);
        }
 
        return 0;
 failVideoIO:;
-       matroxfb_g450_shutdown(PMINFO2);
-       mga_iounmap(ACCESS_FBINFO(video.vbase));
+       matroxfb_g450_shutdown(minfo);
+       mga_iounmap(minfo->video.vbase);
 failCtrlIO:;
-       mga_iounmap(ACCESS_FBINFO(mmio.vbase));
+       mga_iounmap(minfo->mmio.vbase);
 failVideoMR:;
-       release_mem_region(video_base_phys, ACCESS_FBINFO(video.len_maximum));
+       release_mem_region(video_base_phys, minfo->video.len_maximum);
 failCtrlMR:;
        release_mem_region(ctrlptr_phys, 16384);
 fail:;
@@ -1975,7 +1980,7 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv) {
 static void matroxfb_register_device(struct matrox_fb_info* minfo) {
        struct matroxfb_driver* drv;
        int i = 0;
-       list_add(&ACCESS_FBINFO(next_fb), &matroxfb_list);
+       list_add(&minfo->next_fb, &matroxfb_list);
        for (drv = matroxfb_driver_l(matroxfb_driver_list.next);
             drv != matroxfb_driver_l(&matroxfb_driver_list);
             drv = matroxfb_driver_l(drv->node.next)) {
@@ -1995,7 +2000,7 @@ static void matroxfb_register_device(struct matrox_fb_info* minfo) {
 static void matroxfb_unregister_device(struct matrox_fb_info* minfo) {
        int i;
 
-       list_del(&ACCESS_FBINFO(next_fb));
+       list_del(&minfo->next_fb);
        for (i = 0; i < minfo->drivers_count; i++) {
                struct matroxfb_driver* drv = minfo->drivers[i];
 
@@ -2011,9 +2016,6 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
        struct matrox_fb_info* minfo;
        int err;
        u_int32_t cmd;
-#ifndef CONFIG_FB_MATROX_MULTIHEAD
-       static int registered = 0;
-#endif
        DBG(__func__)
 
        svid = pdev->subsystem_vendor;
@@ -2037,68 +2039,57 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
                return -1;
        }
 
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
        minfo = kmalloc(sizeof(*minfo), GFP_KERNEL);
        if (!minfo)
                return -1;
-#else
-       if (registered) /* singlehead driver... */
-               return -1;
-       minfo = &matroxfb_global_mxinfo;
-#endif
-       memset(MINFO, 0, sizeof(*MINFO));
+       memset(minfo, 0, sizeof(*minfo));
 
-       ACCESS_FBINFO(pcidev) = pdev;
-       ACCESS_FBINFO(dead) = 0;
-       ACCESS_FBINFO(usecount) = 0;
-       ACCESS_FBINFO(userusecount) = 0;
+       minfo->pcidev = pdev;
+       minfo->dead = 0;
+       minfo->usecount = 0;
+       minfo->userusecount = 0;
 
-       pci_set_drvdata(pdev, MINFO);
+       pci_set_drvdata(pdev, minfo);
        /* DEVFLAGS */
-       ACCESS_FBINFO(devflags.memtype) = memtype;
+       minfo->devflags.memtype = memtype;
        if (memtype != -1)
                noinit = 0;
        if (cmd & PCI_COMMAND_MEMORY) {
-               ACCESS_FBINFO(devflags.novga) = novga;
-               ACCESS_FBINFO(devflags.nobios) = nobios;
-               ACCESS_FBINFO(devflags.noinit) = noinit;
+               minfo->devflags.novga = novga;
+               minfo->devflags.nobios = nobios;
+               minfo->devflags.noinit = noinit;
                /* subsequent heads always needs initialization and must not enable BIOS */
                novga = 1;
                nobios = 1;
                noinit = 0;
        } else {
-               ACCESS_FBINFO(devflags.novga) = 1;
-               ACCESS_FBINFO(devflags.nobios) = 1;
-               ACCESS_FBINFO(devflags.noinit) = 0;
-       }
-
-       ACCESS_FBINFO(devflags.nopciretry) = no_pci_retry;
-       ACCESS_FBINFO(devflags.mga_24bpp_fix) = inv24;
-       ACCESS_FBINFO(devflags.precise_width) = option_precise_width;
-       ACCESS_FBINFO(devflags.sgram) = sgram;
-       ACCESS_FBINFO(capable.cross4MB) = cross4MB;
-
-       spin_lock_init(&ACCESS_FBINFO(lock.DAC));
-       spin_lock_init(&ACCESS_FBINFO(lock.accel));
-       init_rwsem(&ACCESS_FBINFO(crtc2.lock));
-       init_rwsem(&ACCESS_FBINFO(altout.lock));
-       mutex_init(&ACCESS_FBINFO(fbcon).mm_lock);
-       ACCESS_FBINFO(irq_flags) = 0;
-       init_waitqueue_head(&ACCESS_FBINFO(crtc1.vsync.wait));
-       init_waitqueue_head(&ACCESS_FBINFO(crtc2.vsync.wait));
-       ACCESS_FBINFO(crtc1.panpos) = -1;
-
-       err = initMatrox2(PMINFO b);
+               minfo->devflags.novga = 1;
+               minfo->devflags.nobios = 1;
+               minfo->devflags.noinit = 0;
+       }
+
+       minfo->devflags.nopciretry = no_pci_retry;
+       minfo->devflags.mga_24bpp_fix = inv24;
+       minfo->devflags.precise_width = option_precise_width;
+       minfo->devflags.sgram = sgram;
+       minfo->capable.cross4MB = cross4MB;
+
+       spin_lock_init(&minfo->lock.DAC);
+       spin_lock_init(&minfo->lock.accel);
+       init_rwsem(&minfo->crtc2.lock);
+       init_rwsem(&minfo->altout.lock);
+       mutex_init(&minfo->fbcon.mm_lock);
+       minfo->irq_flags = 0;
+       init_waitqueue_head(&minfo->crtc1.vsync.wait);
+       init_waitqueue_head(&minfo->crtc2.vsync.wait);
+       minfo->crtc1.panpos = -1;
+
+       err = initMatrox2(minfo, b);
        if (!err) {
-#ifndef CONFIG_FB_MATROX_MULTIHEAD
-               registered = 1;
-#endif
-               matroxfb_register_device(MINFO);
+               matroxfb_register_device(minfo);
                return 0;
        }
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
        kfree(minfo);
-#endif
        return -1;
 }
 
@@ -2106,7 +2097,7 @@ static void pci_remove_matrox(struct pci_dev* pdev) {
        struct matrox_fb_info* minfo;
 
        minfo = pci_get_drvdata(pdev);
-       matroxfb_remove(PMINFO 1);
+       matroxfb_remove(minfo, 1);
 }
 
 static struct pci_device_id matroxfb_devices[] = {
@@ -2510,13 +2501,8 @@ module_param(inv24, int, 0);
 MODULE_PARM_DESC(inv24, "Inverts clock polarity for 24bpp and loop frequency > 100MHz (default=do not invert polarity)");
 module_param(inverse, int, 0);
 MODULE_PARM_DESC(inverse, "Inverse (0 or 1) (default=0)");
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
 module_param(dev, int, 0);
 MODULE_PARM_DESC(dev, "Multihead support, attach to device ID (0..N) (default=all working)");
-#else
-module_param(dev, int, 0);
-MODULE_PARM_DESC(dev, "Multihead support, attach to device ID (0..N) (default=first working)");
-#endif
 module_param(vesa, int, 0);
 MODULE_PARM_DESC(vesa, "Startup videomode (0x000-0x1FF) (default=0x101)");
 module_param(xres, int, 0);
index 9588323..f3a4e15 100644 (file)
@@ -54,9 +54,6 @@
 #include "../macmodes.h"
 #endif
 
-/* always compile support for 32MB... It cost almost nothing */
-#define CONFIG_FB_MATROX_32MB
-
 #ifdef MATROXFB_DEBUG
 
 #define DEBUG
@@ -464,9 +461,7 @@ struct matrox_fb_info {
                int             nopciretry;
                int             noinit;
                int             sgram;
-#ifdef CONFIG_FB_MATROX_32MB
                int             support32MB;
-#endif
 
                int             accelerator;
                int             text_type_aux;
@@ -524,47 +519,11 @@ struct matrox_fb_info {
 
 #define info2minfo(info) container_of(info, struct matrox_fb_info, fbcon)
 
-#ifdef CONFIG_FB_MATROX_MULTIHEAD
-#define ACCESS_FBINFO2(info, x) (info->x)
-#define ACCESS_FBINFO(x) ACCESS_FBINFO2(minfo,x)
-
-#define MINFO minfo
-
-#define WPMINFO2 struct matrox_fb_info* minfo
-#define WPMINFO  WPMINFO2 ,
-#define CPMINFO2 const struct matrox_fb_info* minfo
-#define CPMINFO         CPMINFO2 ,
-#define PMINFO2  minfo
-#define PMINFO   PMINFO2 ,
-
-#define MINFO_FROM(x)     struct matrox_fb_info* minfo = x
-#else
-
-extern struct matrox_fb_info matroxfb_global_mxinfo;
-
-#define ACCESS_FBINFO(x) (matroxfb_global_mxinfo.x)
-#define ACCESS_FBINFO2(info, x) (matroxfb_global_mxinfo.x)
-
-#define MINFO (&matroxfb_global_mxinfo)
-
-#define WPMINFO2 void
-#define WPMINFO
-#define CPMINFO2 void
-#define CPMINFO
-#define PMINFO2
-#define PMINFO
-
-#define MINFO_FROM(x)
-
-#endif
-
-#define MINFO_FROM_INFO(x) MINFO_FROM(info2minfo(x))
-
 struct matrox_switch {
-       int     (*preinit)(WPMINFO2);
-       void    (*reset)(WPMINFO2);
-       int     (*init)(WPMINFO struct my_timming*);
-       void    (*restore)(WPMINFO2);
+       int     (*preinit)(struct matrox_fb_info *minfo);
+       void    (*reset)(struct matrox_fb_info *minfo);
+       int     (*init)(struct matrox_fb_info *minfo, struct my_timming*);
+       void    (*restore)(struct matrox_fb_info *minfo);
 };
 
 struct matroxfb_driver {
@@ -727,11 +686,11 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv);
 #endif
 #endif
 
-#define mga_inb(addr)          mga_readb(ACCESS_FBINFO(mmio.vbase), (addr))
-#define mga_inl(addr)          mga_readl(ACCESS_FBINFO(mmio.vbase), (addr))
-#define mga_outb(addr,val)     mga_writeb(ACCESS_FBINFO(mmio.vbase), (addr), (val))
-#define mga_outw(addr,val)     mga_writew(ACCESS_FBINFO(mmio.vbase), (addr), (val))
-#define mga_outl(addr,val)     mga_writel(ACCESS_FBINFO(mmio.vbase), (addr), (val))
+#define mga_inb(addr)          mga_readb(minfo->mmio.vbase, (addr))
+#define mga_inl(addr)          mga_readl(minfo->mmio.vbase, (addr))
+#define mga_outb(addr,val)     mga_writeb(minfo->mmio.vbase, (addr), (val))
+#define mga_outw(addr,val)     mga_writew(minfo->mmio.vbase, (addr), (val))
+#define mga_outl(addr,val)     mga_writel(minfo->mmio.vbase, (addr), (val))
 #define mga_readr(port,idx)    (mga_outb((port),(idx)), mga_inb((port)+1))
 #define mga_setr(addr,port,val)        mga_outw(addr, ((val)<<8) | (port))
 
@@ -750,19 +709,20 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv);
 #define isMilleniumII(x) (0)
 #endif
 
-#define matroxfb_DAC_lock()                   spin_lock(&ACCESS_FBINFO(lock.DAC))
-#define matroxfb_DAC_unlock()                 spin_unlock(&ACCESS_FBINFO(lock.DAC))
-#define matroxfb_DAC_lock_irqsave(flags)      spin_lock_irqsave(&ACCESS_FBINFO(lock.DAC),flags)
-#define matroxfb_DAC_unlock_irqrestore(flags) spin_unlock_irqrestore(&ACCESS_FBINFO(lock.DAC),flags)
-extern void matroxfb_DAC_out(CPMINFO int reg, int val);
-extern int matroxfb_DAC_in(CPMINFO int reg);
+#define matroxfb_DAC_lock()                   spin_lock(&minfo->lock.DAC)
+#define matroxfb_DAC_unlock()                 spin_unlock(&minfo->lock.DAC)
+#define matroxfb_DAC_lock_irqsave(flags)      spin_lock_irqsave(&minfo->lock.DAC, flags)
+#define matroxfb_DAC_unlock_irqrestore(flags) spin_unlock_irqrestore(&minfo->lock.DAC, flags)
+extern void matroxfb_DAC_out(const struct matrox_fb_info *minfo, int reg,
+                            int val);
+extern int matroxfb_DAC_in(const struct matrox_fb_info *minfo, int reg);
 extern void matroxfb_var2my(struct fb_var_screeninfo* fvsi, struct my_timming* mt);
-extern int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc);
-extern int matroxfb_enable_irq(WPMINFO int reenable);
+extern int matroxfb_wait_for_sync(struct matrox_fb_info *minfo, u_int32_t crtc);
+extern int matroxfb_enable_irq(struct matrox_fb_info *minfo, int reenable);
 
 #ifdef MATROXFB_USE_SPINLOCKS
-#define CRITBEGIN  spin_lock_irqsave(&ACCESS_FBINFO(lock.accel), critflags);
-#define CRITEND           spin_unlock_irqrestore(&ACCESS_FBINFO(lock.accel), critflags);
+#define CRITBEGIN  spin_lock_irqsave(&minfo->lock.accel, critflags);
+#define CRITEND           spin_unlock_irqrestore(&minfo->lock.accel, critflags);
 #define CRITFLAGS  unsigned long critflags;
 #else
 #define CRITBEGIN
index ebcb5c6..78414ba 100644 (file)
@@ -65,7 +65,7 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
                unsigned int pos) {
        u_int32_t tmp;
        u_int32_t datactl;
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
        switch (mode) {
                case 15:
@@ -81,11 +81,11 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
        }
        tmp |= 0x00000001;      /* enable CRTC2 */
        datactl = 0;
-       if (ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_CRTC2) {
-               if (ACCESS_FBINFO(devflags.g450dac)) {
+       if (minfo->outputs[1].src == MATROXFB_SRC_CRTC2) {
+               if (minfo->devflags.g450dac) {
                        tmp |= 0x00000006; /* source from secondary pixel PLL */
                        /* no vidrst when in monitor mode */
-                       if (ACCESS_FBINFO(outputs[1]).mode != MATROXFB_OUTPUT_MODE_MONITOR) {
+                       if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
                                tmp |=  0xC0001000; /* Enable H/V vidrst */
                        }
                } else {
@@ -93,11 +93,11 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
                        tmp |= 0xC0000000; /* enable vvidrst & hvidrst */
                        /* MGA TVO is our clock source */
                }
-       } else if (ACCESS_FBINFO(outputs[0]).src == MATROXFB_SRC_CRTC2) {
+       } else if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) {
                tmp |= 0x00000004; /* source from pixclock */
                /* PIXPLL is our clock source */
        }
-       if (ACCESS_FBINFO(outputs[0]).src == MATROXFB_SRC_CRTC2) {
+       if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) {
                tmp |= 0x00100000;      /* connect CRTC2 to DAC */
        }
        if (mt->interlaced) {
@@ -146,7 +146,7 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
                }
        }
        mga_outl(0x3C10, tmp);
-       ACCESS_FBINFO(hw).crtc2.ctl = tmp;
+       minfo->hw.crtc2.ctl = tmp;
 
        tmp = mt->VDisplay << 16;       /* line compare */
        if (mt->sync & FB_SYNC_HOR_HIGH_ACT)
@@ -157,10 +157,10 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
 }
 
 static void matroxfb_dh_disable(struct matroxfb_dh_fb_info* m2info) {
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
        mga_outl(0x3C10, 0x00000004);   /* disable CRTC2, CRTC1->DAC1, PLL as clock source */
-       ACCESS_FBINFO(hw).crtc2.ctl = 0x00000004;
+       minfo->hw.crtc2.ctl = 0x00000004;
 }
 
 static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info,
@@ -168,7 +168,7 @@ static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info,
        unsigned int pos;
        unsigned int linelen;
        unsigned int pixelsize;
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
        m2info->fbcon.var.xoffset = var->xoffset;
        m2info->fbcon.var.yoffset = var->yoffset;
@@ -260,15 +260,15 @@ static int matroxfb_dh_decode_var(struct matroxfb_dh_fb_info* m2info,
 
 static int matroxfb_dh_open(struct fb_info* info, int user) {
 #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
-       if (MINFO) {
+       if (minfo) {
                int err;
 
-               if (ACCESS_FBINFO(dead)) {
+               if (minfo->dead) {
                        return -ENXIO;
                }
-               err = ACCESS_FBINFO(fbops).fb_open(&ACCESS_FBINFO(fbcon), user);
+               err = minfo->fbops.fb_open(&minfo->fbcon, user);
                if (err) {
                        return err;
                }
@@ -280,10 +280,10 @@ static int matroxfb_dh_open(struct fb_info* info, int user) {
 static int matroxfb_dh_release(struct fb_info* info, int user) {
 #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
        int err = 0;
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
-       if (MINFO) {
-               err = ACCESS_FBINFO(fbops).fb_release(&ACCESS_FBINFO(fbcon), user);
+       if (minfo) {
+               err = minfo->fbops.fb_release(&minfo->fbcon, user);
        }
        return err;
 #undef m2info
@@ -326,7 +326,7 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
        int mode;
        int err;
        struct fb_var_screeninfo* var = &info->var;
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
        if ((err = matroxfb_dh_decode_var(m2info, var, &visual, &cmap_len, &mode)) != 0)
                return err;
@@ -352,39 +352,39 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
                pos = (m2info->fbcon.var.yoffset * m2info->fbcon.var.xres_virtual + m2info->fbcon.var.xoffset) * m2info->fbcon.var.bits_per_pixel >> 3;
                pos += m2info->video.offbase;
                cnt = 0;
-               down_read(&ACCESS_FBINFO(altout).lock);
+               down_read(&minfo->altout.lock);
                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                       if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                       if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                cnt++;
-                               if (ACCESS_FBINFO(outputs[out]).output->compute) {
-                                       ACCESS_FBINFO(outputs[out]).output->compute(ACCESS_FBINFO(outputs[out]).data, &mt);
+                               if (minfo->outputs[out].output->compute) {
+                                       minfo->outputs[out].output->compute(minfo->outputs[out].data, &mt);
                                }
                        }
                }
-               ACCESS_FBINFO(crtc2).pixclock = mt.pixclock;
-               ACCESS_FBINFO(crtc2).mnp = mt.mnp;
-               up_read(&ACCESS_FBINFO(altout).lock);
+               minfo->crtc2.pixclock = mt.pixclock;
+               minfo->crtc2.mnp = mt.mnp;
+               up_read(&minfo->altout.lock);
                if (cnt) {
                        matroxfb_dh_restore(m2info, &mt, mode, pos);
                } else {
                        matroxfb_dh_disable(m2info);
                }
-               DAC1064_global_init(PMINFO2);
-               DAC1064_global_restore(PMINFO2);
-               down_read(&ACCESS_FBINFO(altout).lock);
+               DAC1064_global_init(minfo);
+               DAC1064_global_restore(minfo);
+               down_read(&minfo->altout.lock);
                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                       if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2 &&
-                           ACCESS_FBINFO(outputs[out]).output->program) {
-                               ACCESS_FBINFO(outputs[out]).output->program(ACCESS_FBINFO(outputs[out]).data);
+                       if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&
+                           minfo->outputs[out].output->program) {
+                               minfo->outputs[out].output->program(minfo->outputs[out].data);
                        }
                }
                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                       if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2 &&
-                           ACCESS_FBINFO(outputs[out]).output->start) {
-                               ACCESS_FBINFO(outputs[out]).output->start(ACCESS_FBINFO(outputs[out]).data);
+                       if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&
+                           minfo->outputs[out].output->start) {
+                               minfo->outputs[out].output->start(minfo->outputs[out].data);
                        }
                }
-               up_read(&ACCESS_FBINFO(altout).lock);
+               up_read(&minfo->altout.lock);
        }
        m2info->initialized = 1;
        return 0;
@@ -399,9 +399,9 @@ static int matroxfb_dh_pan_display(struct fb_var_screeninfo* var, struct fb_info
 }
 
 static int matroxfb_dh_get_vblank(const struct matroxfb_dh_fb_info* m2info, struct fb_vblank* vblank) {
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
-       matroxfb_enable_irq(PMINFO 0);
+       matroxfb_enable_irq(minfo, 0);
        memset(vblank, 0, sizeof(*vblank));
        vblank->flags = FB_VBLANK_HAVE_VCOUNT | FB_VBLANK_HAVE_VBLANK;
        /* mask out reserved bits + field number (odd/even) */
@@ -409,11 +409,11 @@ static int matroxfb_dh_get_vblank(const struct matroxfb_dh_fb_info* m2info, stru
        /* compatibility stuff */
        if (vblank->vcount >= m2info->fbcon.var.yres)
                vblank->flags |= FB_VBLANK_VBLANKING;
-        if (test_bit(0, &ACCESS_FBINFO(irq_flags))) {
+       if (test_bit(0, &minfo->irq_flags)) {
                 vblank->flags |= FB_VBLANK_HAVE_COUNT;
                 /* Only one writer, aligned int value...
                    it should work without lock and without atomic_t */
-                vblank->count = ACCESS_FBINFO(crtc2).vsync.cnt;
+               vblank->count = minfo->crtc2.vsync.cnt;
         }
        return 0;
 }
@@ -423,7 +423,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                unsigned long arg)
 {
 #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
-       MINFO_FROM(m2info->primary_dev);
+       struct matrox_fb_info *minfo = m2info->primary_dev;
 
        DBG(__func__)
 
@@ -449,13 +449,13 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
 
                                if (crt != 0)
                                        return -ENODEV;
-                               return matroxfb_wait_for_sync(PMINFO 1);
+                               return matroxfb_wait_for_sync(minfo, 1);
                        }
                case MATROXFB_SET_OUTPUT_MODE:
                case MATROXFB_GET_OUTPUT_MODE:
                case MATROXFB_GET_ALL_OUTPUTS:
                        {
-                               return ACCESS_FBINFO(fbcon.fbops)->fb_ioctl(&ACCESS_FBINFO(fbcon), cmd, arg);
+                               return minfo->fbcon.fbops->fb_ioctl(&minfo->fbcon, cmd, arg);
                        }
                case MATROXFB_SET_OUTPUT_CONNECTION:
                        {
@@ -469,9 +469,9 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                        if (tmp & (1 << out)) {
                                                if (out >= MATROXFB_MAX_OUTPUTS)
                                                        return -ENXIO;
-                                               if (!ACCESS_FBINFO(outputs[out]).output)
+                                               if (!minfo->outputs[out].output)
                                                        return -ENXIO;
-                                               switch (ACCESS_FBINFO(outputs[out]).src) {
+                                               switch (minfo->outputs[out].src) {
                                                        case MATROXFB_SRC_NONE:
                                                        case MATROXFB_SRC_CRTC2:
                                                                break;
@@ -480,22 +480,22 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                                }
                                        }
                                }
-                               if (ACCESS_FBINFO(devflags.panellink)) {
+                               if (minfo->devflags.panellink) {
                                        if (tmp & MATROXFB_OUTPUT_CONN_DFP)
                                                return -EINVAL;
-                                       if ((ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC1) && tmp)
+                                       if ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp)
                                                return -EBUSY;
                                }
                                changes = 0;
                                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
                                        if (tmp & (1 << out)) {
-                                               if (ACCESS_FBINFO(outputs[out]).src != MATROXFB_SRC_CRTC2) {
+                                               if (minfo->outputs[out].src != MATROXFB_SRC_CRTC2) {
                                                        changes = 1;
-                                                       ACCESS_FBINFO(outputs[out]).src = MATROXFB_SRC_CRTC2;
+                                                       minfo->outputs[out].src = MATROXFB_SRC_CRTC2;
                                                }
-                                       } else if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                                       } else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                                changes = 1;
-                                               ACCESS_FBINFO(outputs[out]).src = MATROXFB_SRC_NONE;
+                                               minfo->outputs[out].src = MATROXFB_SRC_NONE;
                                        }
                                }
                                if (!changes)
@@ -509,7 +509,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                int out;
 
                                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                                       if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                                       if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                                conn |= 1 << out;
                                        }
                                }
@@ -523,8 +523,8 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                int out;
 
                                for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                                       if (ACCESS_FBINFO(outputs[out]).output) {
-                                               switch (ACCESS_FBINFO(outputs[out]).src) {
+                                       if (minfo->outputs[out].output) {
+                                               switch (minfo->outputs[out].src) {
                                                        case MATROXFB_SRC_NONE:
                                                        case MATROXFB_SRC_CRTC2:
                                                                tmp |= 1 << out;
@@ -532,9 +532,9 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                                }
                                        }
                                }
-                               if (ACCESS_FBINFO(devflags.panellink)) {
+                               if (minfo->devflags.panellink) {
                                        tmp &= ~MATROXFB_OUTPUT_CONN_DFP;
-                                       if (ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC1) {
+                                       if (minfo->outputs[2].src == MATROXFB_SRC_CRTC1) {
                                                tmp = 0;
                                        }
                                }
@@ -595,7 +595,9 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
                0, {0,0,0,0,0}
 };
 
-static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
+static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,
+                            struct matroxfb_dh_fb_info *m2info)
+{
 #define minfo (m2info->primary_dev)
        void* oldcrtc2;
 
@@ -611,21 +613,21 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
        if (mem < 64*1024)
                mem *= 1024;
        mem &= ~0x00000FFF;     /* PAGE_MASK? */
-       if (ACCESS_FBINFO(video.len_usable) + mem <= ACCESS_FBINFO(video.len))
-               m2info->video.offbase = ACCESS_FBINFO(video.len) - mem;
-       else if (ACCESS_FBINFO(video.len) < mem) {
+       if (minfo->video.len_usable + mem <= minfo->video.len)
+               m2info->video.offbase = minfo->video.len - mem;
+       else if (minfo->video.len < mem) {
                return -ENOMEM;
        } else { /* check yres on first head... */
                m2info->video.borrowed = mem;
-               ACCESS_FBINFO(video.len_usable) -= mem;
-               m2info->video.offbase = ACCESS_FBINFO(video.len_usable);
+               minfo->video.len_usable -= mem;
+               m2info->video.offbase = minfo->video.len_usable;
        }
-       m2info->video.base = ACCESS_FBINFO(video.base) + m2info->video.offbase;
+       m2info->video.base = minfo->video.base + m2info->video.offbase;
        m2info->video.len = m2info->video.len_usable = m2info->video.len_maximum = mem;
-       m2info->video.vbase.vaddr = vaddr_va(ACCESS_FBINFO(video.vbase)) + m2info->video.offbase;
-       m2info->mmio.base = ACCESS_FBINFO(mmio.base);
-       m2info->mmio.vbase = ACCESS_FBINFO(mmio.vbase);
-       m2info->mmio.len = ACCESS_FBINFO(mmio.len);
+       m2info->video.vbase.vaddr = vaddr_va(minfo->video.vbase) + m2info->video.offbase;
+       m2info->mmio.base = minfo->mmio.base;
+       m2info->mmio.vbase = minfo->mmio.vbase;
+       m2info->mmio.len = minfo->mmio.len;
 
        matroxfb_dh_init_fix(m2info);
        if (register_framebuffer(&m2info->fbcon)) {
@@ -633,10 +635,10 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
        }
        if (!m2info->initialized)
                fb_set_var(&m2info->fbcon, &matroxfb_dh_defined);
-       down_write(&ACCESS_FBINFO(crtc2.lock));
-       oldcrtc2 = ACCESS_FBINFO(crtc2.info);
-       ACCESS_FBINFO(crtc2.info) = m2info;
-       up_write(&ACCESS_FBINFO(crtc2.lock));
+       down_write(&minfo->crtc2.lock);
+       oldcrtc2 = minfo->crtc2.info;
+       minfo->crtc2.info = m2info;
+       up_write(&minfo->crtc2.lock);
        if (oldcrtc2) {
                printk(KERN_ERR "matroxfb_crtc2: Internal consistency check failed: crtc2 already present: %p\n",
                        oldcrtc2);
@@ -649,12 +651,12 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
 
 static int matroxfb_dh_registerfb(struct matroxfb_dh_fb_info* m2info) {
 #define minfo (m2info->primary_dev)
-       if (matroxfb_dh_regit(PMINFO m2info)) {
+       if (matroxfb_dh_regit(minfo, m2info)) {
                printk(KERN_ERR "matroxfb_crtc2: secondary head failed to register\n");
                return -1;
        }
        printk(KERN_INFO "matroxfb_crtc2: secondary head of fb%u was registered as fb%u\n",
-               ACCESS_FBINFO(fbcon.node), m2info->fbcon.node);
+               minfo->fbcon.node, m2info->fbcon.node);
        m2info->fbcon_registered = 1;
        return 0;
 #undef minfo
@@ -666,11 +668,11 @@ static void matroxfb_dh_deregisterfb(struct matroxfb_dh_fb_info* m2info) {
                int id;
                struct matroxfb_dh_fb_info* crtc2;
 
-               down_write(&ACCESS_FBINFO(crtc2.lock));
-               crtc2 = ACCESS_FBINFO(crtc2.info);
+               down_write(&minfo->crtc2.lock);
+               crtc2 = minfo->crtc2.info;
                if (crtc2 == m2info)
-                       ACCESS_FBINFO(crtc2.info) = NULL;
-               up_write(&ACCESS_FBINFO(crtc2.lock));
+                       minfo->crtc2.info = NULL;
+               up_write(&minfo->crtc2.lock);
                if (crtc2 != m2info) {
                        printk(KERN_ERR "matroxfb_crtc2: Internal consistency check failed: crtc2 mismatch at unload: %p != %p\n",
                                crtc2, m2info);
@@ -680,7 +682,7 @@ static void matroxfb_dh_deregisterfb(struct matroxfb_dh_fb_info* m2info) {
                id = m2info->fbcon.node;
                unregister_framebuffer(&m2info->fbcon);
                /* return memory back to primary head */
-               ACCESS_FBINFO(video.len_usable) += m2info->video.borrowed;
+               minfo->video.len_usable += m2info->video.borrowed;
                printk(KERN_INFO "matroxfb_crtc2: fb%u unregistered\n", id);
                m2info->fbcon_registered = 0;
        }
@@ -691,14 +693,14 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
        struct matroxfb_dh_fb_info* m2info;
 
        /* hardware is CRTC2 incapable... */
-       if (!ACCESS_FBINFO(devflags.crtc2))
+       if (!minfo->devflags.crtc2)
                return NULL;
        m2info = kzalloc(sizeof(*m2info), GFP_KERNEL);
        if (!m2info) {
                printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n");
                return NULL;
        }
-       m2info->primary_dev = MINFO;
+       m2info->primary_dev = minfo;
        if (matroxfb_dh_registerfb(m2info)) {
                kfree(m2info);
                printk(KERN_ERR "matroxfb_crtc2: CRTC2 framebuffer failed to register\n");
index 6209a76..cff0546 100644 (file)
@@ -80,52 +80,59 @@ static int get_ctrl_id(__u32 v4l2_id) {
        return -EINVAL;
 }
 
-static inline int* get_ctrl_ptr(WPMINFO unsigned int idx) {
-       return (int*)((char*)MINFO + g450_controls[idx].control);
+static inline int *get_ctrl_ptr(struct matrox_fb_info *minfo, unsigned int idx)
+{
+       return (int*)((char*)minfo + g450_controls[idx].control);
 }
 
-static void tvo_fill_defaults(WPMINFO2) {
+static void tvo_fill_defaults(struct matrox_fb_info *minfo)
+{
        unsigned int i;
        
        for (i = 0; i < G450CTRLS; i++) {
-               *get_ctrl_ptr(PMINFO i) = g450_controls[i].desc.default_value;
+               *get_ctrl_ptr(minfo, i) = g450_controls[i].desc.default_value;
        }
 }
 
-static int cve2_get_reg(WPMINFO int reg) {
+static int cve2_get_reg(struct matrox_fb_info *minfo, int reg)
+{
        unsigned long flags;
        int val;
        
        matroxfb_DAC_lock_irqsave(flags);
-       matroxfb_DAC_out(PMINFO 0x87, reg);
-       val = matroxfb_DAC_in(PMINFO 0x88);
+       matroxfb_DAC_out(minfo, 0x87, reg);
+       val = matroxfb_DAC_in(minfo, 0x88);
        matroxfb_DAC_unlock_irqrestore(flags);
        return val;
 }
 
-static void cve2_set_reg(WPMINFO int reg, int val) {
+static void cve2_set_reg(struct matrox_fb_info *minfo, int reg, int val)
+{
        unsigned long flags;
 
        matroxfb_DAC_lock_irqsave(flags);
-       matroxfb_DAC_out(PMINFO 0x87, reg);
-       matroxfb_DAC_out(PMINFO 0x88, val);
+       matroxfb_DAC_out(minfo, 0x87, reg);
+       matroxfb_DAC_out(minfo, 0x88, val);
        matroxfb_DAC_unlock_irqrestore(flags);
 }
 
-static void cve2_set_reg10(WPMINFO int reg, int val) {
+static void cve2_set_reg10(struct matrox_fb_info *minfo, int reg, int val)
+{
        unsigned long flags;
 
        matroxfb_DAC_lock_irqsave(flags);
-       matroxfb_DAC_out(PMINFO 0x87, reg);
-       matroxfb_DAC_out(PMINFO 0x88, val >> 2);
-       matroxfb_DAC_out(PMINFO 0x87, reg + 1);
-       matroxfb_DAC_out(PMINFO 0x88, val & 3);
+       matroxfb_DAC_out(minfo, 0x87, reg);
+       matroxfb_DAC_out(minfo, 0x88, val >> 2);
+       matroxfb_DAC_out(minfo, 0x87, reg + 1);
+       matroxfb_DAC_out(minfo, 0x88, val & 3);
        matroxfb_DAC_unlock_irqrestore(flags);
 }
 
-static void g450_compute_bwlevel(CPMINFO int *bl, int *wl) {
-       const int b = ACCESS_FBINFO(altout.tvo_params.brightness) + BLMIN;
-       const int c = ACCESS_FBINFO(altout.tvo_params.contrast);
+static void g450_compute_bwlevel(const struct matrox_fb_info *minfo, int *bl,
+                                int *wl)
+{
+       const int b = minfo->altout.tvo_params.brightness + BLMIN;
+       const int c = minfo->altout.tvo_params.contrast;
 
        *bl = max(b - c, BLMIN);
        *wl = min(b + c, WLMAX);
@@ -154,7 +161,7 @@ static int g450_query_ctrl(void* md, struct v4l2_queryctrl *p) {
 
 static int g450_set_ctrl(void* md, struct v4l2_control *p) {
        int i;
-       MINFO_FROM(md);
+       struct matrox_fb_info *minfo = md;
        
        i = get_ctrl_id(p->id);
        if (i < 0) return -EINVAL;
@@ -162,7 +169,7 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
        /*
         * Check if changed.
         */
-       if (p->value == *get_ctrl_ptr(PMINFO i)) return 0;
+       if (p->value == *get_ctrl_ptr(minfo, i)) return 0;
 
        /*
         * Check limits.
@@ -173,31 +180,31 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
        /*
         * Store new value.
         */
-       *get_ctrl_ptr(PMINFO i) = p->value;
+       *get_ctrl_ptr(minfo, i) = p->value;
 
        switch (p->id) {
                case V4L2_CID_BRIGHTNESS:
                case V4L2_CID_CONTRAST:
                        {
                                int blacklevel, whitelevel;
-                               g450_compute_bwlevel(PMINFO &blacklevel, &whitelevel);
-                               cve2_set_reg10(PMINFO 0x0e, blacklevel);
-                               cve2_set_reg10(PMINFO 0x1e, whitelevel);
+                               g450_compute_bwlevel(minfo, &blacklevel, &whitelevel);
+                               cve2_set_reg10(minfo, 0x0e, blacklevel);
+                               cve2_set_reg10(minfo, 0x1e, whitelevel);
                        }
                        break;
                case V4L2_CID_SATURATION:
-                       cve2_set_reg(PMINFO 0x20, p->value);
-                       cve2_set_reg(PMINFO 0x22, p->value);
+                       cve2_set_reg(minfo, 0x20, p->value);
+                       cve2_set_reg(minfo, 0x22, p->value);
                        break;
                case V4L2_CID_HUE:
-                       cve2_set_reg(PMINFO 0x25, p->value);
+                       cve2_set_reg(minfo, 0x25, p->value);
                        break;
                case MATROXFB_CID_TESTOUT:
                        {
-                               unsigned char val = cve2_get_reg (PMINFO 0x05);
+                               unsigned char val = cve2_get_reg(minfo, 0x05);
                                if (p->value) val |=  0x02;
                                else          val &= ~0x02;
-                               cve2_set_reg(PMINFO 0x05, val);
+                               cve2_set_reg(minfo, 0x05, val);
                        }
                        break;
        }
@@ -208,11 +215,11 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
 
 static int g450_get_ctrl(void* md, struct v4l2_control *p) {
        int i;
-       MINFO_FROM(md);
+       struct matrox_fb_info *minfo = md;
        
        i = get_ctrl_id(p->id);
        if (i < 0) return -EINVAL;
-       p->value = *get_ctrl_ptr(PMINFO i);
+       p->value = *get_ctrl_ptr(minfo, i);
        return 0;
 }
 
@@ -226,7 +233,9 @@ struct output_desc {
        unsigned int    v_total;
 };
 
-static void computeRegs(WPMINFO struct mavenregs* r, struct my_timming* mt, const struct output_desc* outd) {
+static void computeRegs(struct matrox_fb_info *minfo, struct mavenregs *r,
+                       struct my_timming *mt, const struct output_desc *outd)
+{
        u_int32_t chromasc;
        u_int32_t hlen;
        u_int32_t hsl;
@@ -251,10 +260,10 @@ static void computeRegs(WPMINFO struct mavenregs* r, struct my_timming* mt, cons
 
        dprintk(KERN_DEBUG "Want %u kHz pixclock\n", (unsigned int)piic);
        
-       mnp = matroxfb_g450_setclk(PMINFO piic, M_VIDEO_PLL);
+       mnp = matroxfb_g450_setclk(minfo, piic, M_VIDEO_PLL);
        
        mt->mnp = mnp;
-       mt->pixclock = g450_mnp2f(PMINFO mnp);
+       mt->pixclock = g450_mnp2f(minfo, mnp);
 
        dprintk(KERN_DEBUG "MNP=%08X\n", mnp);
 
@@ -490,65 +499,67 @@ static void cve2_init_TVdata(int norm, struct mavenregs* data, const struct outp
        return;
 }
 
-#define LR(x) cve2_set_reg(PMINFO (x), m->regs[(x)])
-static void cve2_init_TV(WPMINFO const struct mavenregs* m) {
+#define LR(x) cve2_set_reg(minfo, (x), m->regs[(x)])
+static void cve2_init_TV(struct matrox_fb_info *minfo,
+                        const struct mavenregs *m)
+{
        int i;
 
        LR(0x80);
        LR(0x82); LR(0x83);
        LR(0x84); LR(0x85);
        
-       cve2_set_reg(PMINFO 0x3E, 0x01);
+       cve2_set_reg(minfo, 0x3E, 0x01);
        
        for (i = 0; i < 0x3E; i++) {
                LR(i);
        }
-       cve2_set_reg(PMINFO 0x3E, 0x00);
+       cve2_set_reg(minfo, 0x3E, 0x00);
 }
 
 static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
-       MINFO_FROM(md);
+       struct matrox_fb_info *minfo = md;
 
-       dprintk(KERN_DEBUG "Computing, mode=%u\n", ACCESS_FBINFO(outputs[1]).mode);
+       dprintk(KERN_DEBUG "Computing, mode=%u\n", minfo->outputs[1].mode);
 
        if (mt->crtc == MATROXFB_SRC_CRTC2 &&
-           ACCESS_FBINFO(outputs[1]).mode != MATROXFB_OUTPUT_MODE_MONITOR) {
+           minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
                const struct output_desc* outd;
 
-               cve2_init_TVdata(ACCESS_FBINFO(outputs[1]).mode, &ACCESS_FBINFO(hw).maven, &outd);
+               cve2_init_TVdata(minfo->outputs[1].mode, &minfo->hw.maven, &outd);
                {
                        int blacklevel, whitelevel;
-                       g450_compute_bwlevel(PMINFO &blacklevel, &whitelevel);
-                       ACCESS_FBINFO(hw).maven.regs[0x0E] = blacklevel >> 2;
-                       ACCESS_FBINFO(hw).maven.regs[0x0F] = blacklevel & 3;
-                       ACCESS_FBINFO(hw).maven.regs[0x1E] = whitelevel >> 2;
-                       ACCESS_FBINFO(hw).maven.regs[0x1F] = whitelevel & 3;
+                       g450_compute_bwlevel(minfo, &blacklevel, &whitelevel);
+                       minfo->hw.maven.regs[0x0E] = blacklevel >> 2;
+                       minfo->hw.maven.regs[0x0F] = blacklevel & 3;
+                       minfo->hw.maven.regs[0x1E] = whitelevel >> 2;
+                       minfo->hw.maven.regs[0x1F] = whitelevel & 3;
 
-                       ACCESS_FBINFO(hw).maven.regs[0x20] =
-                       ACCESS_FBINFO(hw).maven.regs[0x22] = ACCESS_FBINFO(altout.tvo_params.saturation);
+                       minfo->hw.maven.regs[0x20] =
+                       minfo->hw.maven.regs[0x22] = minfo->altout.tvo_params.saturation;
 
-                       ACCESS_FBINFO(hw).maven.regs[0x25] = ACCESS_FBINFO(altout.tvo_params.hue);
+                       minfo->hw.maven.regs[0x25] = minfo->altout.tvo_params.hue;
 
-                       if (ACCESS_FBINFO(altout.tvo_params.testout)) {
-                               ACCESS_FBINFO(hw).maven.regs[0x05] |= 0x02;
+                       if (minfo->altout.tvo_params.testout) {
+                               minfo->hw.maven.regs[0x05] |= 0x02;
                        }
                }
-               computeRegs(PMINFO &ACCESS_FBINFO(hw).maven, mt, outd);
+               computeRegs(minfo, &minfo->hw.maven, mt, outd);
        } else if (mt->mnp < 0) {
                /* We must program clocks before CRTC2, otherwise interlaced mode
                   startup may fail */
-               mt->mnp = matroxfb_g450_setclk(PMINFO mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
-               mt->pixclock = g450_mnp2f(PMINFO mt->mnp);
+               mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
+               mt->pixclock = g450_mnp2f(minfo, mt->mnp);
        }
        dprintk(KERN_DEBUG "Pixclock = %u\n", mt->pixclock);
        return 0;
 }
 
 static int matroxfb_g450_program(void* md) {
-       MINFO_FROM(md);
+       struct matrox_fb_info *minfo = md;
        
-       if (ACCESS_FBINFO(outputs[1]).mode != MATROXFB_OUTPUT_MODE_MONITOR) {
-               cve2_init_TV(PMINFO &ACCESS_FBINFO(hw).maven);
+       if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
+               cve2_init_TV(minfo, &minfo->hw.maven);
        }
        return 0;
 }
@@ -564,11 +575,11 @@ static int matroxfb_g450_verify_mode(void* md, u_int32_t arg) {
 }
 
 static int g450_dvi_compute(void* md, struct my_timming* mt) {
-       MINFO_FROM(md);
+       struct matrox_fb_info *minfo = md;
 
        if (mt->mnp < 0) {
-               mt->mnp = matroxfb_g450_setclk(PMINFO mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
-               mt->pixclock = g450_mnp2f(PMINFO mt->mnp);
+               mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
+               mt->pixclock = g450_mnp2f(minfo, mt->mnp);
        }
        return 0;
 }
@@ -588,34 +599,36 @@ static struct matrox_altout matroxfb_g450_dvi = {
        .compute        = g450_dvi_compute,
 };
 
-void matroxfb_g450_connect(WPMINFO2) {
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               down_write(&ACCESS_FBINFO(altout.lock));
-               tvo_fill_defaults(PMINFO2);
-               ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src;
-               ACCESS_FBINFO(outputs[1]).data = MINFO;
-               ACCESS_FBINFO(outputs[1]).output = &matroxfb_g450_altout;
-               ACCESS_FBINFO(outputs[1]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               ACCESS_FBINFO(outputs[2]).src = ACCESS_FBINFO(outputs[2]).default_src;
-               ACCESS_FBINFO(outputs[2]).data = MINFO;
-               ACCESS_FBINFO(outputs[2]).output = &matroxfb_g450_dvi;
-               ACCESS_FBINFO(outputs[2]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               up_write(&ACCESS_FBINFO(altout.lock));
+void matroxfb_g450_connect(struct matrox_fb_info *minfo)
+{
+       if (minfo->devflags.g450dac) {
+               down_write(&minfo->altout.lock);
+               tvo_fill_defaults(minfo);
+               minfo->outputs[1].src = minfo->outputs[1].default_src;
+               minfo->outputs[1].data = minfo;
+               minfo->outputs[1].output = &matroxfb_g450_altout;
+               minfo->outputs[1].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               minfo->outputs[2].src = minfo->outputs[2].default_src;
+               minfo->outputs[2].data = minfo;
+               minfo->outputs[2].output = &matroxfb_g450_dvi;
+               minfo->outputs[2].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               up_write(&minfo->altout.lock);
        }
 }
 
-void matroxfb_g450_shutdown(WPMINFO2) {
-       if (ACCESS_FBINFO(devflags.g450dac)) {
-               down_write(&ACCESS_FBINFO(altout.lock));
-               ACCESS_FBINFO(outputs[1]).src = MATROXFB_SRC_NONE;
-               ACCESS_FBINFO(outputs[1]).output = NULL;
-               ACCESS_FBINFO(outputs[1]).data = NULL;
-               ACCESS_FBINFO(outputs[1]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               ACCESS_FBINFO(outputs[2]).src = MATROXFB_SRC_NONE;
-               ACCESS_FBINFO(outputs[2]).output = NULL;
-               ACCESS_FBINFO(outputs[2]).data = NULL;
-               ACCESS_FBINFO(outputs[2]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               up_write(&ACCESS_FBINFO(altout.lock));
+void matroxfb_g450_shutdown(struct matrox_fb_info *minfo)
+{
+       if (minfo->devflags.g450dac) {
+               down_write(&minfo->altout.lock);
+               minfo->outputs[1].src = MATROXFB_SRC_NONE;
+               minfo->outputs[1].output = NULL;
+               minfo->outputs[1].data = NULL;
+               minfo->outputs[1].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               minfo->outputs[2].src = MATROXFB_SRC_NONE;
+               minfo->outputs[2].output = NULL;
+               minfo->outputs[2].data = NULL;
+               minfo->outputs[2].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               up_write(&minfo->altout.lock);
        }
 }
 
index a0822a6..3a3e654 100644 (file)
@@ -4,11 +4,11 @@
 #include "matroxfb_base.h"
 
 #ifdef CONFIG_FB_MATROX_G
-void matroxfb_g450_connect(WPMINFO2);
-void matroxfb_g450_shutdown(WPMINFO2);
+void matroxfb_g450_connect(struct matrox_fb_info *minfo);
+void matroxfb_g450_shutdown(struct matrox_fb_info *minfo);
 #else
-static inline void matroxfb_g450_connect(WPMINFO2) { };
-static inline void matroxfb_g450_shutdown(WPMINFO2) { };
+static inline void matroxfb_g450_connect(struct matrox_fb_info *minfo) { };
+static inline void matroxfb_g450_shutdown(struct matrox_fb_info *minfo) { };
 #endif
 
 #endif /* __MATROXFB_G450_H__ */
index 042408a..91af915 100644 (file)
@@ -458,9 +458,9 @@ static void maven_init_TVdata(const struct maven_data* md, struct mavenregs* dat
                0x00,   /* 3E written multiple times */
                0x00,   /* never written */
        }, MATROXFB_OUTPUT_MODE_NTSC, 525, 60 };
-       MINFO_FROM(md->primary_head);
+       struct matrox_fb_info *minfo = md->primary_head;
 
-       if (ACCESS_FBINFO(outputs[1]).mode == MATROXFB_OUTPUT_MODE_PAL)
+       if (minfo->outputs[1].mode == MATROXFB_OUTPUT_MODE_PAL)
                *data = palregs;
        else
                *data = ntscregs;
@@ -496,11 +496,11 @@ static void maven_init_TVdata(const struct maven_data* md, struct mavenregs* dat
        /* Set saturation */
        {
                data->regs[0x20] =
-               data->regs[0x22] = ACCESS_FBINFO(altout.tvo_params.saturation);
+               data->regs[0x22] = minfo->altout.tvo_params.saturation;
        }
  
        /* Set HUE */
-       data->regs[0x25] = ACCESS_FBINFO(altout.tvo_params.hue);
+       data->regs[0x25] = minfo->altout.tvo_params.hue;
        return;
 }
 
@@ -741,9 +741,9 @@ static inline int maven_compute_timming(struct maven_data* md,
                struct mavenregs* m) {
        unsigned int tmpi;
        unsigned int a, bv, c;
-       MINFO_FROM(md->primary_head);
+       struct matrox_fb_info *minfo = md->primary_head;
 
-       m->mode = ACCESS_FBINFO(outputs[1]).mode;
+       m->mode = minfo->outputs[1].mode;
        if (m->mode != MATROXFB_OUTPUT_MODE_MONITOR) {
                unsigned int lmargin;
                unsigned int umargin;
@@ -1132,7 +1132,7 @@ static int maven_get_control (struct maven_data* md,
 static int maven_out_compute(void* md, struct my_timming* mt) {
 #define mdinfo ((struct maven_data*)md)
 #define minfo (mdinfo->primary_head)
-       return maven_compute_timming(md, mt, &ACCESS_FBINFO(hw).maven);
+       return maven_compute_timming(md, mt, &minfo->hw.maven);
 #undef minfo
 #undef mdinfo
 }
@@ -1140,7 +1140,7 @@ static int maven_out_compute(void* md, struct my_timming* mt) {
 static int maven_out_program(void* md) {
 #define mdinfo ((struct maven_data*)md)
 #define minfo (mdinfo->primary_head)
-       return maven_program_timming(md, &ACCESS_FBINFO(hw).maven);
+       return maven_program_timming(md, &minfo->hw.maven);
 #undef minfo
 #undef mdinfo
 }
@@ -1184,16 +1184,18 @@ static struct matrox_altout maven_altout = {
 
 static int maven_init_client(struct i2c_client* clnt) {
        struct maven_data* md = i2c_get_clientdata(clnt);
-       MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo);
+       struct matrox_fb_info *minfo = container_of(clnt->adapter,
+                                                   struct i2c_bit_adapter,
+                                                   adapter)->minfo;
 
-       md->primary_head = MINFO;
+       md->primary_head = minfo;
        md->client = clnt;
-       down_write(&ACCESS_FBINFO(altout.lock));
-       ACCESS_FBINFO(outputs[1]).output = &maven_altout;
-       ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src;
-       ACCESS_FBINFO(outputs[1]).data = md;
-       ACCESS_FBINFO(outputs[1]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-       up_write(&ACCESS_FBINFO(altout.lock));
+       down_write(&minfo->altout.lock);
+       minfo->outputs[1].output = &maven_altout;
+       minfo->outputs[1].src = minfo->outputs[1].default_src;
+       minfo->outputs[1].data = md;
+       minfo->outputs[1].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+       up_write(&minfo->altout.lock);
        if (maven_get_reg(clnt, 0xB2) < 0x14) {
                md->version = MGATVO_B;
                /* Tweak some things for this old chip */
@@ -1218,14 +1220,14 @@ static int maven_shutdown_client(struct i2c_client* clnt) {
        struct maven_data* md = i2c_get_clientdata(clnt);
 
        if (md->primary_head) {
-               MINFO_FROM(md->primary_head);
-
-               down_write(&ACCESS_FBINFO(altout.lock));
-               ACCESS_FBINFO(outputs[1]).src = MATROXFB_SRC_NONE;
-               ACCESS_FBINFO(outputs[1]).output = NULL;
-               ACCESS_FBINFO(outputs[1]).data = NULL;
-               ACCESS_FBINFO(outputs[1]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               up_write(&ACCESS_FBINFO(altout.lock));
+               struct matrox_fb_info *minfo = md->primary_head;
+
+               down_write(&minfo->altout.lock);
+               minfo->outputs[1].src = MATROXFB_SRC_NONE;
+               minfo->outputs[1].output = NULL;
+               minfo->outputs[1].data = NULL;
+               minfo->outputs[1].mode = MATROXFB_OUTPUT_MODE_MONITOR;
+               up_write(&minfo->altout.lock);
                md->primary_head = NULL;
        }
        return 0;
index 5b5f072..9948ca2 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/matroxfb.h>
 
-void matroxfb_DAC_out(CPMINFO int reg, int val) {
+void matroxfb_DAC_out(const struct matrox_fb_info *minfo, int reg, int val)
+{
        DBG_REG(__func__)
        mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
        mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val);
 }
 
-int matroxfb_DAC_in(CPMINFO int reg) {
+int matroxfb_DAC_in(const struct matrox_fb_info *minfo, int reg)
+{
        DBG_REG(__func__)
        mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
        return mga_inb(M_RAMDAC_BASE+M_X_DATAREG);
@@ -184,13 +186,14 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int f
        return bestvco;
 }
 
-int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
+int matroxfb_vgaHWinit(struct matrox_fb_info *minfo, struct my_timming *m)
+{
        unsigned int hd, hs, he, hbe, ht;
        unsigned int vd, vs, ve, vt, lc;
        unsigned int wd;
        unsigned int divider;
        int i;
-       struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state * const hw = &minfo->hw;
 
        DBG(__func__)
 
@@ -240,7 +243,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        /* standard timmings are in 8pixels, but for interleaved we cannot */
        /* do it for 4bpp (because of (4bpp >> 1(interleaved))/4 == 0) */
        /* using 16 or more pixels per unit can save us */
-       divider = ACCESS_FBINFO(curr.final_bppShift);
+       divider = minfo->curr.final_bppShift;
        while (divider & 3) {
                hd >>= 1;
                hs >>= 1;
@@ -270,7 +273,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        if (((ht & 0x07) == 0x06) || ((ht & 0x0F) == 0x04))
                ht++;
        hbe = ht;
-       wd = ACCESS_FBINFO(fbcon).var.xres_virtual * ACCESS_FBINFO(curr.final_bppShift) / 64;
+       wd = minfo->fbcon.var.xres_virtual * minfo->curr.final_bppShift / 64;
 
        hw->CRTCEXT[0] = 0;
        hw->CRTCEXT[5] = 0;
@@ -287,7 +290,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
                          ((hs      & 0x100) >> 6) | /* sync start */
                           (hbe     & 0x040);    /* end hor. blanking */
        /* FIXME: Enable vidrst only on G400, and only if TV-out is used */
-       if (ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_CRTC1)
+       if (minfo->outputs[1].src == MATROXFB_SRC_CRTC1)
                hw->CRTCEXT[1] |= 0x88;         /* enable horizontal and vertical vidrst */
        hw->CRTCEXT[2] =  ((vt & 0xC00) >> 10) |
                          ((vd & 0x400) >>  8) |        /* disp end */
@@ -331,9 +334,10 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        return 0;
 };
 
-void matroxfb_vgaHWrestore(WPMINFO2) {
+void matroxfb_vgaHWrestore(struct matrox_fb_info *minfo)
+{
        int i;
-       struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
+       struct matrox_hw_state * const hw = &minfo->hw;
        CRITFLAGS
 
        DBG(__func__)
@@ -522,7 +526,9 @@ static void parse_bios(unsigned char __iomem* vbios, struct matrox_bios* bd) {
 #endif
 }
 
-static int parse_pins1(WPMINFO const struct matrox_bios* bd) {
+static int parse_pins1(struct matrox_fb_info *minfo,
+                      const struct matrox_bios *bd)
+{
        unsigned int maxdac;
 
        switch (bd->pins[22]) {
@@ -533,173 +539,188 @@ static int parse_pins1(WPMINFO const struct matrox_bios* bd) {
        if (get_unaligned_le16(bd->pins + 24)) {
                maxdac = get_unaligned_le16(bd->pins + 24) * 10;
        }
-       MINFO->limits.pixel.vcomax = maxdac;
-       MINFO->values.pll.system = get_unaligned_le16(bd->pins + 28) ?
+       minfo->limits.pixel.vcomax = maxdac;
+       minfo->values.pll.system = get_unaligned_le16(bd->pins + 28) ?
                get_unaligned_le16(bd->pins + 28) * 10 : 50000;
        /* ignore 4MB, 8MB, module clocks */
-       MINFO->features.pll.ref_freq = 14318;
-       MINFO->values.reg.mctlwtst      = 0x00030101;
+       minfo->features.pll.ref_freq = 14318;
+       minfo->values.reg.mctlwtst      = 0x00030101;
        return 0;
 }
 
-static void default_pins1(WPMINFO2) {
+static void default_pins1(struct matrox_fb_info *minfo)
+{
        /* Millennium */
-       MINFO->limits.pixel.vcomax      = 220000;
-       MINFO->values.pll.system        =  50000;
-       MINFO->features.pll.ref_freq    =  14318;
-       MINFO->values.reg.mctlwtst      = 0x00030101;
+       minfo->limits.pixel.vcomax      = 220000;
+       minfo->values.pll.system        =  50000;
+       minfo->features.pll.ref_freq    =  14318;
+       minfo->values.reg.mctlwtst      = 0x00030101;
 }
 
-static int parse_pins2(WPMINFO const struct matrox_bios* bd) {
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     = (bd->pins[41] == 0xFF) ? 230000 : ((bd->pins[41] + 100) * 1000);
-       MINFO->values.reg.mctlwtst      = ((bd->pins[51] & 0x01) ? 0x00000001 : 0) |
+static int parse_pins2(struct matrox_fb_info *minfo,
+                      const struct matrox_bios *bd)
+{
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     = (bd->pins[41] == 0xFF) ? 230000 : ((bd->pins[41] + 100) * 1000);
+       minfo->values.reg.mctlwtst      = ((bd->pins[51] & 0x01) ? 0x00000001 : 0) |
                                          ((bd->pins[51] & 0x02) ? 0x00000100 : 0) |
                                          ((bd->pins[51] & 0x04) ? 0x00010000 : 0) |
                                          ((bd->pins[51] & 0x08) ? 0x00020000 : 0);
-       MINFO->values.pll.system        = (bd->pins[43] == 0xFF) ? 50000 : ((bd->pins[43] + 100) * 1000);
-       MINFO->features.pll.ref_freq    = 14318;
+       minfo->values.pll.system        = (bd->pins[43] == 0xFF) ? 50000 : ((bd->pins[43] + 100) * 1000);
+       minfo->features.pll.ref_freq    = 14318;
        return 0;
 }
 
-static void default_pins2(WPMINFO2) {
+static void default_pins2(struct matrox_fb_info *minfo)
+{
        /* Millennium II, Mystique */
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     = 230000;
-       MINFO->values.reg.mctlwtst      = 0x00030101;
-       MINFO->values.pll.system        =  50000;
-       MINFO->features.pll.ref_freq    =  14318;
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     = 230000;
+       minfo->values.reg.mctlwtst      = 0x00030101;
+       minfo->values.pll.system        =  50000;
+       minfo->features.pll.ref_freq    =  14318;
 }
 
-static int parse_pins3(WPMINFO const struct matrox_bios* bd) {
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     = (bd->pins[36] == 0xFF) ? 230000                       : ((bd->pins[36] + 100) * 1000);
-       MINFO->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 48) == 0xFFFFFFFF ?
+static int parse_pins3(struct matrox_fb_info *minfo,
+                      const struct matrox_bios *bd)
+{
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     = (bd->pins[36] == 0xFF) ? 230000                       : ((bd->pins[36] + 100) * 1000);
+       minfo->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 48) == 0xFFFFFFFF ?
                0x01250A21 : get_unaligned_le32(bd->pins + 48);
        /* memory config */
-       MINFO->values.reg.memrdbk       = ((bd->pins[57] << 21) & 0x1E000000) |
+       minfo->values.reg.memrdbk       = ((bd->pins[57] << 21) & 0x1E000000) |
                                          ((bd->pins[57] << 22) & 0x00C00000) |
                                          ((bd->pins[56] <<  1) & 0x000001E0) |
                                          ( bd->pins[56]        & 0x0000000F);
-       MINFO->values.reg.opt           = (bd->pins[54] & 7) << 10;
-       MINFO->values.reg.opt2          = bd->pins[58] << 12;
-       MINFO->features.pll.ref_freq    = (bd->pins[52] & 0x20) ? 14318 : 27000;
+       minfo->values.reg.opt           = (bd->pins[54] & 7) << 10;
+       minfo->values.reg.opt2          = bd->pins[58] << 12;
+       minfo->features.pll.ref_freq    = (bd->pins[52] & 0x20) ? 14318 : 27000;
        return 0;
 }
 
-static void default_pins3(WPMINFO2) {
+static void default_pins3(struct matrox_fb_info *minfo)
+{
        /* G100, G200 */
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     = 230000;
-       MINFO->values.reg.mctlwtst      = 0x01250A21;
-       MINFO->values.reg.memrdbk       = 0x00000000;
-       MINFO->values.reg.opt           = 0x00000C00;
-       MINFO->values.reg.opt2          = 0x00000000;
-       MINFO->features.pll.ref_freq    =  27000;
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     = 230000;
+       minfo->values.reg.mctlwtst      = 0x01250A21;
+       minfo->values.reg.memrdbk       = 0x00000000;
+       minfo->values.reg.opt           = 0x00000C00;
+       minfo->values.reg.opt2          = 0x00000000;
+       minfo->features.pll.ref_freq    =  27000;
 }
 
-static int parse_pins4(WPMINFO const struct matrox_bios* bd) {
-       MINFO->limits.pixel.vcomax      = (bd->pins[ 39] == 0xFF) ? 230000                      : bd->pins[ 39] * 4000;
-       MINFO->limits.system.vcomax     = (bd->pins[ 38] == 0xFF) ? MINFO->limits.pixel.vcomax  : bd->pins[ 38] * 4000;
-       MINFO->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 71);
-       MINFO->values.reg.memrdbk       = ((bd->pins[87] << 21) & 0x1E000000) |
+static int parse_pins4(struct matrox_fb_info *minfo,
+                      const struct matrox_bios *bd)
+{
+       minfo->limits.pixel.vcomax      = (bd->pins[ 39] == 0xFF) ? 230000                      : bd->pins[ 39] * 4000;
+       minfo->limits.system.vcomax     = (bd->pins[ 38] == 0xFF) ? minfo->limits.pixel.vcomax  : bd->pins[ 38] * 4000;
+       minfo->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 71);
+       minfo->values.reg.memrdbk       = ((bd->pins[87] << 21) & 0x1E000000) |
                                          ((bd->pins[87] << 22) & 0x00C00000) |
                                          ((bd->pins[86] <<  1) & 0x000001E0) |
                                          ( bd->pins[86]        & 0x0000000F);
-       MINFO->values.reg.opt           = ((bd->pins[53] << 15) & 0x00400000) |
+       minfo->values.reg.opt           = ((bd->pins[53] << 15) & 0x00400000) |
                                          ((bd->pins[53] << 22) & 0x10000000) |
                                          ((bd->pins[53] <<  7) & 0x00001C00);
-       MINFO->values.reg.opt3          = get_unaligned_le32(bd->pins + 67);
-       MINFO->values.pll.system        = (bd->pins[ 65] == 0xFF) ? 200000                      : bd->pins[ 65] * 4000;
-       MINFO->features.pll.ref_freq    = (bd->pins[ 92] & 0x01) ? 14318 : 27000;
+       minfo->values.reg.opt3          = get_unaligned_le32(bd->pins + 67);
+       minfo->values.pll.system        = (bd->pins[ 65] == 0xFF) ? 200000                      : bd->pins[ 65] * 4000;
+       minfo->features.pll.ref_freq    = (bd->pins[ 92] & 0x01) ? 14318 : 27000;
        return 0;
 }
 
-static void default_pins4(WPMINFO2) {
+static void default_pins4(struct matrox_fb_info *minfo)
+{
        /* G400 */
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     = 252000;
-       MINFO->values.reg.mctlwtst      = 0x04A450A1;
-       MINFO->values.reg.memrdbk       = 0x000000E7;
-       MINFO->values.reg.opt           = 0x10000400;
-       MINFO->values.reg.opt3          = 0x0190A419;
-       MINFO->values.pll.system        = 200000;
-       MINFO->features.pll.ref_freq    = 27000;
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     = 252000;
+       minfo->values.reg.mctlwtst      = 0x04A450A1;
+       minfo->values.reg.memrdbk       = 0x000000E7;
+       minfo->values.reg.opt           = 0x10000400;
+       minfo->values.reg.opt3          = 0x0190A419;
+       minfo->values.pll.system        = 200000;
+       minfo->features.pll.ref_freq    = 27000;
 }
 
-static int parse_pins5(WPMINFO const struct matrox_bios* bd) {
+static int parse_pins5(struct matrox_fb_info *minfo,
+                      const struct matrox_bios *bd)
+{
        unsigned int mult;
        
        mult = bd->pins[4]?8000:6000;
        
-       MINFO->limits.pixel.vcomax      = (bd->pins[ 38] == 0xFF) ? 600000                      : bd->pins[ 38] * mult;
-       MINFO->limits.system.vcomax     = (bd->pins[ 36] == 0xFF) ? MINFO->limits.pixel.vcomax  : bd->pins[ 36] * mult;
-       MINFO->limits.video.vcomax      = (bd->pins[ 37] == 0xFF) ? MINFO->limits.system.vcomax : bd->pins[ 37] * mult;
-       MINFO->limits.pixel.vcomin      = (bd->pins[123] == 0xFF) ? 256000                      : bd->pins[123] * mult;
-       MINFO->limits.system.vcomin     = (bd->pins[121] == 0xFF) ? MINFO->limits.pixel.vcomin  : bd->pins[121] * mult;
-       MINFO->limits.video.vcomin      = (bd->pins[122] == 0xFF) ? MINFO->limits.system.vcomin : bd->pins[122] * mult;
-       MINFO->values.pll.system        =
-       MINFO->values.pll.video         = (bd->pins[ 92] == 0xFF) ? 284000                      : bd->pins[ 92] * 4000;
-       MINFO->values.reg.opt           = get_unaligned_le32(bd->pins + 48);
-       MINFO->values.reg.opt2          = get_unaligned_le32(bd->pins + 52);
-       MINFO->values.reg.opt3          = get_unaligned_le32(bd->pins + 94);
-       MINFO->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 98);
-       MINFO->values.reg.memmisc       = get_unaligned_le32(bd->pins + 102);
-       MINFO->values.reg.memrdbk       = get_unaligned_le32(bd->pins + 106);
-       MINFO->features.pll.ref_freq    = (bd->pins[110] & 0x01) ? 14318 : 27000;
-       MINFO->values.memory.ddr        = (bd->pins[114] & 0x60) == 0x20;
-       MINFO->values.memory.dll        = (bd->pins[115] & 0x02) != 0;
-       MINFO->values.memory.emrswen    = (bd->pins[115] & 0x01) != 0;
-       MINFO->values.reg.maccess       = MINFO->values.memory.emrswen ? 0x00004000 : 0x00000000;
+       minfo->limits.pixel.vcomax      = (bd->pins[ 38] == 0xFF) ? 600000                      : bd->pins[ 38] * mult;
+       minfo->limits.system.vcomax     = (bd->pins[ 36] == 0xFF) ? minfo->limits.pixel.vcomax  : bd->pins[ 36] * mult;
+       minfo->limits.video.vcomax      = (bd->pins[ 37] == 0xFF) ? minfo->limits.system.vcomax : bd->pins[ 37] * mult;
+       minfo->limits.pixel.vcomin      = (bd->pins[123] == 0xFF) ? 256000                      : bd->pins[123] * mult;
+       minfo->limits.system.vcomin     = (bd->pins[121] == 0xFF) ? minfo->limits.pixel.vcomin  : bd->pins[121] * mult;
+       minfo->limits.video.vcomin      = (bd->pins[122] == 0xFF) ? minfo->limits.system.vcomin : bd->pins[122] * mult;
+       minfo->values.pll.system        =
+       minfo->values.pll.video         = (bd->pins[ 92] == 0xFF) ? 284000                      : bd->pins[ 92] * 4000;
+       minfo->values.reg.opt           = get_unaligned_le32(bd->pins + 48);
+       minfo->values.reg.opt2          = get_unaligned_le32(bd->pins + 52);
+       minfo->values.reg.opt3          = get_unaligned_le32(bd->pins + 94);
+       minfo->values.reg.mctlwtst      = get_unaligned_le32(bd->pins + 98);
+       minfo->values.reg.memmisc       = get_unaligned_le32(bd->pins + 102);
+       minfo->values.reg.memrdbk       = get_unaligned_le32(bd->pins + 106);
+       minfo->features.pll.ref_freq    = (bd->pins[110] & 0x01) ? 14318 : 27000;
+       minfo->values.memory.ddr        = (bd->pins[114] & 0x60) == 0x20;
+       minfo->values.memory.dll        = (bd->pins[115] & 0x02) != 0;
+       minfo->values.memory.emrswen    = (bd->pins[115] & 0x01) != 0;
+       minfo->values.reg.maccess       = minfo->values.memory.emrswen ? 0x00004000 : 0x00000000;
        if (bd->pins[115] & 4) {
-               MINFO->values.reg.mctlwtst_core = MINFO->values.reg.mctlwtst;
+               minfo->values.reg.mctlwtst_core = minfo->values.reg.mctlwtst;
        } else {
                u_int32_t wtst_xlat[] = { 0, 1, 5, 6, 7, 5, 2, 3 };
-               MINFO->values.reg.mctlwtst_core = (MINFO->values.reg.mctlwtst & ~7) |
-                                                 wtst_xlat[MINFO->values.reg.mctlwtst & 7];
+               minfo->values.reg.mctlwtst_core = (minfo->values.reg.mctlwtst & ~7) |
+                                                 wtst_xlat[minfo->values.reg.mctlwtst & 7];
        }
-       MINFO->max_pixel_clock_panellink = bd->pins[47] * 4000;
+       minfo->max_pixel_clock_panellink = bd->pins[47] * 4000;
        return 0;
 }
 
-static void default_pins5(WPMINFO2) {
+static void default_pins5(struct matrox_fb_info *minfo)
+{
        /* Mine 16MB G450 with SDRAM DDR */
-       MINFO->limits.pixel.vcomax      =
-       MINFO->limits.system.vcomax     =
-       MINFO->limits.video.vcomax      = 600000;
-       MINFO->limits.pixel.vcomin      =
-       MINFO->limits.system.vcomin     =
-       MINFO->limits.video.vcomin      = 256000;
-       MINFO->values.pll.system        =
-       MINFO->values.pll.video         = 284000;
-       MINFO->values.reg.opt           = 0x404A1160;
-       MINFO->values.reg.opt2          = 0x0000AC00;
-       MINFO->values.reg.opt3          = 0x0090A409;
-       MINFO->values.reg.mctlwtst_core =
-       MINFO->values.reg.mctlwtst      = 0x0C81462B;
-       MINFO->values.reg.memmisc       = 0x80000004;
-       MINFO->values.reg.memrdbk       = 0x01001103;
-       MINFO->features.pll.ref_freq    = 27000;
-       MINFO->values.memory.ddr        = 1;
-       MINFO->values.memory.dll        = 1;
-       MINFO->values.memory.emrswen    = 1;
-       MINFO->values.reg.maccess       = 0x00004000;
+       minfo->limits.pixel.vcomax      =
+       minfo->limits.system.vcomax     =
+       minfo->limits.video.vcomax      = 600000;
+       minfo->limits.pixel.vcomin      =
+       minfo->limits.system.vcomin     =
+       minfo->limits.video.vcomin      = 256000;
+       minfo->values.pll.system        =
+       minfo->values.pll.video         = 284000;
+       minfo->values.reg.opt           = 0x404A1160;
+       minfo->values.reg.opt2          = 0x0000AC00;
+       minfo->values.reg.opt3          = 0x0090A409;
+       minfo->values.reg.mctlwtst_core =
+       minfo->values.reg.mctlwtst      = 0x0C81462B;
+       minfo->values.reg.memmisc       = 0x80000004;
+       minfo->values.reg.memrdbk       = 0x01001103;
+       minfo->features.pll.ref_freq    = 27000;
+       minfo->values.memory.ddr        = 1;
+       minfo->values.memory.dll        = 1;
+       minfo->values.memory.emrswen    = 1;
+       minfo->values.reg.maccess       = 0x00004000;
 }
 
-static int matroxfb_set_limits(WPMINFO const struct matrox_bios* bd) {
+static int matroxfb_set_limits(struct matrox_fb_info *minfo,
+                              const struct matrox_bios *bd)
+{
        unsigned int pins_version;
        static const unsigned int pinslen[] = { 64, 64, 64, 128, 128 };
 
-       switch (ACCESS_FBINFO(chip)) {
-               case MGA_2064:  default_pins1(PMINFO2); break;
+       switch (minfo->chip) {
+               case MGA_2064:  default_pins1(minfo); break;
                case MGA_2164:
                case MGA_1064:
-               case MGA_1164:  default_pins2(PMINFO2); break;
+               case MGA_1164:  default_pins2(minfo); break;
                case MGA_G100:
-               case MGA_G200:  default_pins3(PMINFO2); break;
-               case MGA_G400:  default_pins4(PMINFO2); break;
+               case MGA_G200:  default_pins3(minfo); break;
+               case MGA_G400:  default_pins4(minfo); break;
                case MGA_G450:
-               case MGA_G550:  default_pins5(PMINFO2); break;
+               case MGA_G550:  default_pins5(minfo); break;
        }
        if (!bd->bios_valid) {
                printk(KERN_INFO "matroxfb: Your Matrox device does not have BIOS\n");
@@ -724,38 +745,39 @@ static int matroxfb_set_limits(WPMINFO const struct matrox_bios* bd) {
        }
        switch (pins_version) {
                case 1:
-                       return parse_pins1(PMINFO bd);
+                       return parse_pins1(minfo, bd);
                case 2:
-                       return parse_pins2(PMINFO bd);
+                       return parse_pins2(minfo, bd);
                case 3:
-                       return parse_pins3(PMINFO bd);
+                       return parse_pins3(minfo, bd);
                case 4:
-                       return parse_pins4(PMINFO bd);
+                       return parse_pins4(minfo, bd);
                case 5:
-                       return parse_pins5(PMINFO bd);
+                       return parse_pins5(minfo, bd);
                default:
                        printk(KERN_DEBUG "matroxfb: Powerup info version %u is not yet supported\n", pins_version);
                        return -1;
        }
 }
 
-void matroxfb_read_pins(WPMINFO2) {
+void matroxfb_read_pins(struct matrox_fb_info *minfo)
+{
        u32 opt;
        u32 biosbase;
        u32 fbbase;
-       struct pci_dev* pdev = ACCESS_FBINFO(pcidev);
+       struct pci_dev *pdev = minfo->pcidev;
        
-       memset(&ACCESS_FBINFO(bios), 0, sizeof(ACCESS_FBINFO(bios)));
+       memset(&minfo->bios, 0, sizeof(minfo->bios));
        pci_read_config_dword(pdev, PCI_OPTION_REG, &opt);
        pci_write_config_dword(pdev, PCI_OPTION_REG, opt | PCI_OPTION_ENABLE_ROM);
        pci_read_config_dword(pdev, PCI_ROM_ADDRESS, &biosbase);
-       pci_read_config_dword(pdev, ACCESS_FBINFO(devflags.fbResource), &fbbase);
+       pci_read_config_dword(pdev, minfo->devflags.fbResource, &fbbase);
        pci_write_config_dword(pdev, PCI_ROM_ADDRESS, (fbbase & PCI_ROM_ADDRESS_MASK) | PCI_ROM_ADDRESS_ENABLE);
-       parse_bios(vaddr_va(ACCESS_FBINFO(video).vbase), &ACCESS_FBINFO(bios));
+       parse_bios(vaddr_va(minfo->video.vbase), &minfo->bios);
        pci_write_config_dword(pdev, PCI_ROM_ADDRESS, biosbase);
        pci_write_config_dword(pdev, PCI_OPTION_REG, opt);
 #ifdef CONFIG_X86
-       if (!ACCESS_FBINFO(bios).bios_valid) {
+       if (!minfo->bios.bios_valid) {
                unsigned char __iomem* b;
 
                b = ioremap(0x000C0000, 65536);
@@ -769,25 +791,21 @@ void matroxfb_read_pins(WPMINFO2) {
                                printk(KERN_INFO "matroxfb: Legacy BIOS is for %04X:%04X, while this device is %04X:%04X\n",
                                        ven, dev, pdev->vendor, pdev->device);
                        } else {
-                               parse_bios(b, &ACCESS_FBINFO(bios));
+                               parse_bios(b, &minfo->bios);
                        }
                        iounmap(b);
                }
        }
 #endif
-       matroxfb_set_limits(PMINFO &ACCESS_FBINFO(bios));
+       matroxfb_set_limits(minfo, &minfo->bios);
        printk(KERN_INFO "PInS memtype = %u\n",
-              (ACCESS_FBINFO(values).reg.opt & 0x1C00) >> 10);
+              (minfo->values.reg.opt & 0x1C00) >> 10);
 }
 
 EXPORT_SYMBOL(matroxfb_DAC_in);
 EXPORT_SYMBOL(matroxfb_DAC_out);
 EXPORT_SYMBOL(matroxfb_var2my);
 EXPORT_SYMBOL(matroxfb_PLL_calcclock);
-#ifndef CONFIG_FB_MATROX_MULTIHEAD
-struct matrox_fb_info matroxfb_global_mxinfo;
-EXPORT_SYMBOL(matroxfb_global_mxinfo);
-#endif
 EXPORT_SYMBOL(matroxfb_vgaHWinit);             /* DAC1064, Ti3026 */
 EXPORT_SYMBOL(matroxfb_vgaHWrestore);          /* DAC1064, Ti3026 */
 EXPORT_SYMBOL(matroxfb_read_pins);
index cb62cc0..351c823 100644 (file)
@@ -6,13 +6,16 @@
 /* also for modules */
 int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int freq, unsigned int fmax,
        unsigned int* in, unsigned int* feed, unsigned int* post);
-static inline int PLL_calcclock(CPMINFO unsigned int freq, unsigned int fmax,
-               unsigned int* in, unsigned int* feed, unsigned int* post) {
-       return matroxfb_PLL_calcclock(&ACCESS_FBINFO(features.pll), freq, fmax, in, feed, post);
+static inline int PLL_calcclock(const struct matrox_fb_info *minfo,
+                               unsigned int freq, unsigned int fmax,
+                               unsigned int *in, unsigned int *feed,
+                               unsigned int *post)
+{
+       return matroxfb_PLL_calcclock(&minfo->features.pll, freq, fmax, in, feed, post);
 }
 
-int matroxfb_vgaHWinit(WPMINFO struct my_timming* m);
-void matroxfb_vgaHWrestore(WPMINFO2);
-void matroxfb_read_pins(WPMINFO2);
+int matroxfb_vgaHWinit(struct matrox_fb_info *minfo, struct my_timming* m);
+void matroxfb_vgaHWrestore(struct matrox_fb_info *minfo);
+void matroxfb_read_pins(struct matrox_fb_info *minfo);
 
 #endif /* __MATROXFB_MISC_H__ */
diff --git a/drivers/video/msm/Makefile b/drivers/video/msm/Makefile
new file mode 100644 (file)
index 0000000..802d6ae
--- /dev/null
@@ -0,0 +1,19 @@
+
+# core framebuffer
+#
+obj-y := msm_fb.o
+
+# MDP DMA/PPP engine
+#
+obj-y += mdp.o mdp_scale_tables.o mdp_ppp.o
+
+# MDDI interface
+#
+obj-y += mddi.o
+
+# MDDI client/panel drivers
+#
+obj-y += mddi_client_dummy.o
+obj-y += mddi_client_toshiba.o
+obj-y += mddi_client_nt35399.o
+
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
new file mode 100644 (file)
index 0000000..f2de5a1
--- /dev/null
@@ -0,0 +1,828 @@
+/*
+ * MSM MDDI Transport
+ *
+ * Copyright (C) 2007 Google Incorporated
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <mach/msm_iomap.h>
+#include <mach/irqs.h>
+#include <mach/board.h>
+#include <linux/delay.h>
+
+#include <mach/msm_fb.h>
+#include "mddi_hw.h"
+
+#define FLAG_DISABLE_HIBERNATION 0x0001
+#define FLAG_HAVE_CAPS          0x0002
+#define FLAG_HAS_VSYNC_IRQ      0x0004
+#define FLAG_HAVE_STATUS        0x0008
+
+#define CMD_GET_CLIENT_CAP     0x0601
+#define CMD_GET_CLIENT_STATUS  0x0602
+
+union mddi_rev {
+       unsigned char raw[MDDI_REV_BUFFER_SIZE];
+       struct mddi_rev_packet hdr;
+       struct mddi_client_status status;
+       struct mddi_client_caps caps;
+       struct mddi_register_access reg;
+};
+
+struct reg_read_info {
+       struct completion done;
+       uint32_t reg;
+       uint32_t status;
+       uint32_t result;
+};
+
+struct mddi_info {
+       uint16_t flags;
+       uint16_t version;
+       char __iomem *base;
+       int irq;
+       struct clk *clk;
+       struct msm_mddi_client_data client_data;
+
+       /* buffer for rev encap packets */
+       void *rev_data;
+       dma_addr_t rev_addr;
+       struct mddi_llentry *reg_write_data;
+       dma_addr_t reg_write_addr;
+       struct mddi_llentry *reg_read_data;
+       dma_addr_t reg_read_addr;
+       size_t rev_data_curr;
+
+       spinlock_t int_lock;
+       uint32_t int_enable;
+       uint32_t got_int;
+       wait_queue_head_t int_wait;
+
+       struct mutex reg_write_lock;
+       struct mutex reg_read_lock;
+       struct reg_read_info *reg_read;
+
+       struct mddi_client_caps caps;
+       struct mddi_client_status status;
+
+       void (*power_client)(struct msm_mddi_client_data *, int);
+
+       /* client device published to bind us to the
+        * appropriate mddi_client driver
+        */
+       char client_name[20];
+
+       struct platform_device client_pdev;
+};
+
+static void mddi_init_rev_encap(struct mddi_info *mddi);
+
+#define mddi_readl(r) readl(mddi->base + (MDDI_##r))
+#define mddi_writel(v, r) writel((v), mddi->base + (MDDI_##r))
+
+void mddi_activate_link(struct msm_mddi_client_data *cdata)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+
+       mddi_writel(MDDI_CMD_LINK_ACTIVE, CMD);
+}
+
+static void mddi_handle_link_list_done(struct mddi_info *mddi)
+{
+}
+
+static void mddi_reset_rev_encap_ptr(struct mddi_info *mddi)
+{
+       printk(KERN_INFO "mddi: resetting rev ptr\n");
+       mddi->rev_data_curr = 0;
+       mddi_writel(mddi->rev_addr, REV_PTR);
+       mddi_writel(mddi->rev_addr, REV_PTR);
+       mddi_writel(MDDI_CMD_FORCE_NEW_REV_PTR, CMD);
+}
+
+static void mddi_handle_rev_data(struct mddi_info *mddi, union mddi_rev *rev)
+{
+       int i;
+       struct reg_read_info *ri;
+
+       if ((rev->hdr.length <= MDDI_REV_BUFFER_SIZE - 2) &&
+          (rev->hdr.length >= sizeof(struct mddi_rev_packet) - 2)) {
+
+               switch (rev->hdr.type) {
+               case TYPE_CLIENT_CAPS:
+                       memcpy(&mddi->caps, &rev->caps,
+                              sizeof(struct mddi_client_caps));
+                       mddi->flags |= FLAG_HAVE_CAPS;
+                       wake_up(&mddi->int_wait);
+                       break;
+               case TYPE_CLIENT_STATUS:
+                       memcpy(&mddi->status, &rev->status,
+                              sizeof(struct mddi_client_status));
+                       mddi->flags |= FLAG_HAVE_STATUS;
+                       wake_up(&mddi->int_wait);
+                       break;
+               case TYPE_REGISTER_ACCESS:
+                       ri = mddi->reg_read;
+                       if (ri == 0) {
+                               printk(KERN_INFO "rev: got reg %x = %x without "
+                                                " pending read\n",
+                                      rev->reg.register_address,
+                                      rev->reg.register_data_list);
+                               break;
+                       }
+                       if (ri->reg != rev->reg.register_address) {
+                               printk(KERN_INFO "rev: got reg %x = %x for "
+                                                "wrong register, expected "
+                                                "%x\n",
+                                      rev->reg.register_address,
+                                      rev->reg.register_data_list, ri->reg);
+                               break;
+                       }
+                       mddi->reg_read = NULL;
+                       ri->status = 0;
+                       ri->result = rev->reg.register_data_list;
+                       complete(&ri->done);
+                       break;
+               default:
+                       printk(KERN_INFO "rev: unknown reverse packet: "
+                                        "len=%04x type=%04x CURR_REV_PTR=%x\n",
+                              rev->hdr.length, rev->hdr.type,
+                              mddi_readl(CURR_REV_PTR));
+                       for (i = 0; i < rev->hdr.length + 2; i++) {
+                               if ((i % 16) == 0)
+                                       printk(KERN_INFO "\n");
+                               printk(KERN_INFO " %02x", rev->raw[i]);
+                       }
+                       printk(KERN_INFO "\n");
+                       mddi_reset_rev_encap_ptr(mddi);
+               }
+       } else {
+               printk(KERN_INFO "bad rev length, %d, CURR_REV_PTR %x\n",
+                      rev->hdr.length, mddi_readl(CURR_REV_PTR));
+               mddi_reset_rev_encap_ptr(mddi);
+       }
+}
+
+static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);
+
+static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
+{
+       union mddi_rev *rev = mddi->rev_data;
+       uint32_t rev_data_count;
+       uint32_t rev_crc_err_count;
+       int i;
+       struct reg_read_info *ri;
+       size_t prev_offset;
+       uint16_t length;
+
+       union mddi_rev *crev = mddi->rev_data + mddi->rev_data_curr;
+
+       /* clear the interrupt */
+       mddi_writel(MDDI_INT_REV_DATA_AVAIL, INT);
+       rev_data_count = mddi_readl(REV_PKT_CNT);
+       rev_crc_err_count = mddi_readl(REV_CRC_ERR);
+       if (rev_data_count > 1)
+               printk(KERN_INFO "rev_data_count %d\n", rev_data_count);
+
+       if (rev_crc_err_count) {
+               printk(KERN_INFO "rev_crc_err_count %d, INT %x\n",
+                      rev_crc_err_count,  mddi_readl(INT));
+               ri = mddi->reg_read;
+               if (ri == 0) {
+                       printk(KERN_INFO "rev: got crc error without pending "
+                              "read\n");
+               } else {
+                       mddi->reg_read = NULL;
+                       ri->status = -EIO;
+                       ri->result = -1;
+                       complete(&ri->done);
+               }
+       }
+
+       if (rev_data_count == 0)
+               return;
+
+       prev_offset = mddi->rev_data_curr;
+
+       length = *((uint8_t *)mddi->rev_data + mddi->rev_data_curr);
+       mddi->rev_data_curr++;
+       if (mddi->rev_data_curr == MDDI_REV_BUFFER_SIZE)
+               mddi->rev_data_curr = 0;
+       length += *((uint8_t *)mddi->rev_data + mddi->rev_data_curr) << 8;
+       mddi->rev_data_curr += 1 + length;
+       if (mddi->rev_data_curr >= MDDI_REV_BUFFER_SIZE)
+               mddi->rev_data_curr =
+                       mddi->rev_data_curr % MDDI_REV_BUFFER_SIZE;
+
+       if (length > MDDI_REV_BUFFER_SIZE - 2) {
+               printk(KERN_INFO "mddi: rev data length greater than buffer"
+                       "size\n");
+               mddi_reset_rev_encap_ptr(mddi);
+               return;
+       }
+
+       if (prev_offset + 2 + length >= MDDI_REV_BUFFER_SIZE) {
+               union mddi_rev tmprev;
+               size_t rem = MDDI_REV_BUFFER_SIZE - prev_offset;
+               memcpy(&tmprev.raw[0], mddi->rev_data + prev_offset, rem);
+               memcpy(&tmprev.raw[rem], mddi->rev_data, 2 + length - rem);
+               mddi_handle_rev_data(mddi, &tmprev);
+       } else {
+               mddi_handle_rev_data(mddi, crev);
+       }
+
+       if (prev_offset < MDDI_REV_BUFFER_SIZE / 2 &&
+           mddi->rev_data_curr >= MDDI_REV_BUFFER_SIZE / 2) {
+               mddi_writel(mddi->rev_addr, REV_PTR);
+       }
+}
+
+static irqreturn_t mddi_isr(int irq, void *data)
+{
+       struct msm_mddi_client_data *cdata = data;
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       uint32_t active, status;
+
+       spin_lock(&mddi->int_lock);
+
+       active = mddi_readl(INT);
+       status = mddi_readl(STAT);
+
+       mddi_writel(active, INT);
+
+       /* ignore any interrupts we have disabled */
+       active &= mddi->int_enable;
+
+       mddi->got_int |= active;
+       wake_up(&mddi->int_wait);
+
+       if (active & MDDI_INT_PRI_LINK_LIST_DONE) {
+               mddi->int_enable &= (~MDDI_INT_PRI_LINK_LIST_DONE);
+               mddi_handle_link_list_done(mddi);
+       }
+       if (active & MDDI_INT_REV_DATA_AVAIL)
+               mddi_handle_rev_data_avail(mddi);
+
+       if (active & ~MDDI_INT_NEED_CLEAR)
+               mddi->int_enable &= ~(active & ~MDDI_INT_NEED_CLEAR);
+
+       if (active & MDDI_INT_LINK_ACTIVE) {
+               mddi->int_enable &= (~MDDI_INT_LINK_ACTIVE);
+               mddi->int_enable |= MDDI_INT_IN_HIBERNATION;
+       }
+
+       if (active & MDDI_INT_IN_HIBERNATION) {
+               mddi->int_enable &= (~MDDI_INT_IN_HIBERNATION);
+               mddi->int_enable |= MDDI_INT_LINK_ACTIVE;
+       }
+
+       mddi_writel(mddi->int_enable, INTEN);
+       spin_unlock(&mddi->int_lock);
+
+       return IRQ_HANDLED;
+}
+
+static long mddi_wait_interrupt_timeout(struct mddi_info *mddi,
+                                       uint32_t intmask, int timeout)
+{
+       unsigned long irq_flags;
+
+       spin_lock_irqsave(&mddi->int_lock, irq_flags);
+       mddi->got_int &= ~intmask;
+       mddi->int_enable |= intmask;
+       mddi_writel(mddi->int_enable, INTEN);
+       spin_unlock_irqrestore(&mddi->int_lock, irq_flags);
+       return wait_event_timeout(mddi->int_wait, mddi->got_int & intmask,
+                                 timeout);
+}
+
+static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask)
+{
+       if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0)
+               printk(KERN_INFO KERN_ERR "mddi_wait_interrupt %d, timeout "
+                      "waiting for %x, INT = %x, STAT = %x gotint = %x\n",
+                      current->pid, intmask, mddi_readl(INT), mddi_readl(STAT),
+                      mddi->got_int);
+}
+
+static void mddi_init_rev_encap(struct mddi_info *mddi)
+{
+       memset(mddi->rev_data, 0xee, MDDI_REV_BUFFER_SIZE);
+       mddi_writel(mddi->rev_addr, REV_PTR);
+       mddi_writel(MDDI_CMD_FORCE_NEW_REV_PTR, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+}
+
+void mddi_set_auto_hibernate(struct msm_mddi_client_data *cdata, int on)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       mddi_writel(MDDI_CMD_POWERDOWN, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_IN_HIBERNATION);
+       mddi_writel(MDDI_CMD_HIBERNATE | !!on, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+}
+
+
+static uint16_t mddi_init_registers(struct mddi_info *mddi)
+{
+       mddi_writel(0x0001, VERSION);
+       mddi_writel(MDDI_HOST_BYTES_PER_SUBFRAME, BPS);
+       mddi_writel(0x0003, SPM); /* subframes per media */
+       mddi_writel(0x0005, TA1_LEN);
+       mddi_writel(MDDI_HOST_TA2_LEN, TA2_LEN);
+       mddi_writel(0x0096, DRIVE_HI);
+       /* 0x32 normal, 0x50 for Toshiba display */
+       mddi_writel(0x0050, DRIVE_LO);
+       mddi_writel(0x003C, DISP_WAKE); /* wakeup counter */
+       mddi_writel(MDDI_HOST_REV_RATE_DIV, REV_RATE_DIV);
+
+       mddi_writel(MDDI_REV_BUFFER_SIZE, REV_SIZE);
+       mddi_writel(MDDI_MAX_REV_PKT_SIZE, REV_ENCAP_SZ);
+
+       /* disable periodic rev encap */
+       mddi_writel(MDDI_CMD_PERIODIC_REV_ENCAP, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+
+       if (mddi_readl(PAD_CTL) == 0) {
+               /* If we are turning on band gap, need to wait 5us before
+                * turning on the rest of the PAD */
+               mddi_writel(0x08000, PAD_CTL);
+               udelay(5);
+       }
+
+       /* Recommendation from PAD hw team */
+       mddi_writel(0xa850f, PAD_CTL);
+
+
+       /* Need an even number for counts */
+       mddi_writel(0x60006, DRIVER_START_CNT);
+
+       mddi_set_auto_hibernate(&mddi->client_data, 0);
+
+       mddi_writel(MDDI_CMD_DISP_IGNORE, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+
+       mddi_init_rev_encap(mddi);
+       return mddi_readl(CORE_VER) & 0xffff;
+}
+
+static void mddi_suspend(struct msm_mddi_client_data *cdata)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       /* turn off the client */
+       if (mddi->power_client)
+               mddi->power_client(&mddi->client_data, 0);
+       /* turn off the link */
+       mddi_writel(MDDI_CMD_RESET, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       /* turn off the clock */
+       clk_disable(mddi->clk);
+}
+
+static void mddi_resume(struct msm_mddi_client_data *cdata)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       mddi_set_auto_hibernate(&mddi->client_data, 0);
+       /* turn on the client */
+       if (mddi->power_client)
+               mddi->power_client(&mddi->client_data, 1);
+       /* turn on the clock */
+       clk_enable(mddi->clk);
+       /* set up the local registers */
+       mddi->rev_data_curr = 0;
+       mddi_init_registers(mddi);
+       mddi_writel(mddi->int_enable, INTEN);
+       mddi_writel(MDDI_CMD_LINK_ACTIVE, CMD);
+       mddi_writel(MDDI_CMD_SEND_RTD, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       mddi_set_auto_hibernate(&mddi->client_data, 1);
+}
+
+static int __init mddi_get_client_caps(struct mddi_info *mddi)
+{
+       int i, j;
+
+       /* clear any stale interrupts */
+       mddi_writel(0xffffffff, INT);
+
+       mddi->int_enable = MDDI_INT_LINK_ACTIVE |
+                          MDDI_INT_IN_HIBERNATION |
+                          MDDI_INT_PRI_LINK_LIST_DONE |
+                          MDDI_INT_REV_DATA_AVAIL |
+                          MDDI_INT_REV_OVERFLOW |
+                          MDDI_INT_REV_OVERWRITE |
+                          MDDI_INT_RTD_FAILURE;
+       mddi_writel(mddi->int_enable, INTEN);
+
+       mddi_writel(MDDI_CMD_LINK_ACTIVE, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+
+       for (j = 0; j < 3; j++) {
+               /* the toshiba vga panel does not respond to get
+                * caps unless you SEND_RTD, but the first SEND_RTD
+                * will fail...
+                */
+               for (i = 0; i < 4; i++) {
+                       uint32_t stat;
+
+                       mddi_writel(MDDI_CMD_SEND_RTD, CMD);
+                       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+                       stat = mddi_readl(STAT);
+                       printk(KERN_INFO "mddi cmd send rtd: int %x, stat %x, "
+                                       "rtd val %x\n", mddi_readl(INT), stat,
+                                       mddi_readl(RTD_VAL));
+                       if ((stat & MDDI_STAT_RTD_MEAS_FAIL) == 0)
+                               break;
+                       msleep(1);
+               }
+
+               mddi_writel(CMD_GET_CLIENT_CAP, CMD);
+               mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+               wait_event_timeout(mddi->int_wait, mddi->flags & FLAG_HAVE_CAPS,
+                                  HZ / 100);
+
+               if (mddi->flags & FLAG_HAVE_CAPS)
+                       break;
+               printk(KERN_INFO KERN_ERR "mddi_init, timeout waiting for "
+                               "caps\n");
+       }
+       return mddi->flags & FLAG_HAVE_CAPS;
+}
+
+/* link must be active when this is called */
+int mddi_check_status(struct mddi_info *mddi)
+{
+       int ret = -1, retry = 3;
+       mutex_lock(&mddi->reg_read_lock);
+       mddi_writel(MDDI_CMD_PERIODIC_REV_ENCAP | 1, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+
+       do {
+               mddi->flags &= ~FLAG_HAVE_STATUS;
+               mddi_writel(CMD_GET_CLIENT_STATUS, CMD);
+               mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+               wait_event_timeout(mddi->int_wait,
+                                  mddi->flags & FLAG_HAVE_STATUS,
+                                  HZ / 100);
+
+               if (mddi->flags & FLAG_HAVE_STATUS) {
+                       if (mddi->status.crc_error_count)
+                               printk(KERN_INFO "mddi status: crc_error "
+                                       "count: %d\n",
+                                       mddi->status.crc_error_count);
+                       else
+                               ret = 0;
+                       break;
+               } else
+                       printk(KERN_INFO "mddi status: failed to get client "
+                               "status\n");
+               mddi_writel(MDDI_CMD_SEND_RTD, CMD);
+               mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       } while (--retry);
+
+       mddi_writel(MDDI_CMD_PERIODIC_REV_ENCAP | 0, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       mutex_unlock(&mddi->reg_read_lock);
+       return ret;
+}
+
+
+void mddi_remote_write(struct msm_mddi_client_data *cdata, uint32_t val,
+                      uint32_t reg)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       struct mddi_llentry *ll;
+       struct mddi_register_access *ra;
+
+       mutex_lock(&mddi->reg_write_lock);
+
+       ll = mddi->reg_write_data;
+
+       ra = &(ll->u.r);
+       ra->length = 14 + 4;
+       ra->type = TYPE_REGISTER_ACCESS;
+       ra->client_id = 0;
+       ra->read_write_info = MDDI_WRITE | 1;
+       ra->crc16 = 0;
+
+       ra->register_address = reg;
+       ra->register_data_list = val;
+
+       ll->flags = 1;
+       ll->header_count = 14;
+       ll->data_count = 4;
+       ll->data = mddi->reg_write_addr + offsetof(struct mddi_llentry,
+                                                  u.r.register_data_list);
+       ll->next = 0;
+       ll->reserved = 0;
+
+       mddi_writel(mddi->reg_write_addr, PRI_PTR);
+
+       mddi_wait_interrupt(mddi, MDDI_INT_PRI_LINK_LIST_DONE);
+       mutex_unlock(&mddi->reg_write_lock);
+}
+
+uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg)
+{
+       struct mddi_info *mddi = container_of(cdata, struct mddi_info,
+                                             client_data);
+       struct mddi_llentry *ll;
+       struct mddi_register_access *ra;
+       struct reg_read_info ri;
+       unsigned s;
+       int retry_count = 2;
+       unsigned long irq_flags;
+
+       mutex_lock(&mddi->reg_read_lock);
+
+       ll = mddi->reg_read_data;
+
+       ra = &(ll->u.r);
+       ra->length = 14;
+       ra->type = TYPE_REGISTER_ACCESS;
+       ra->client_id = 0;
+       ra->read_write_info = MDDI_READ | 1;
+       ra->crc16 = 0;
+
+       ra->register_address = reg;
+
+       ll->flags = 0x11;
+       ll->header_count = 14;
+       ll->data_count = 0;
+       ll->data = 0;
+       ll->next = 0;
+       ll->reserved = 0;
+
+       s = mddi_readl(STAT);
+
+       ri.reg = reg;
+       ri.status = -1;
+
+       do {
+               init_completion(&ri.done);
+               mddi->reg_read = &ri;
+               mddi_writel(mddi->reg_read_addr, PRI_PTR);
+
+               mddi_wait_interrupt(mddi, MDDI_INT_PRI_LINK_LIST_DONE);
+
+               /* Enable Periodic Reverse Encapsulation. */
+               mddi_writel(MDDI_CMD_PERIODIC_REV_ENCAP | 1, CMD);
+               mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+               if (wait_for_completion_timeout(&ri.done, HZ/10) == 0 &&
+                   !ri.done.done) {
+                       printk(KERN_INFO "mddi_remote_read(%x) timeout "
+                                        "(%d %d %d)\n",
+                              reg, ri.status, ri.result, ri.done.done);
+                       spin_lock_irqsave(&mddi->int_lock, irq_flags);
+                       mddi->reg_read = NULL;
+                       spin_unlock_irqrestore(&mddi->int_lock, irq_flags);
+                       ri.status = -1;
+                       ri.result = -1;
+               }
+               if (ri.status == 0)
+                       break;
+
+               mddi_writel(MDDI_CMD_SEND_RTD, CMD);
+               mddi_writel(MDDI_CMD_LINK_ACTIVE, CMD);
+               mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+               printk(KERN_INFO "mddi_remote_read: failed, sent "
+                      "MDDI_CMD_SEND_RTD: int %x, stat %x, rtd val %x "
+                      "curr_rev_ptr %x\n", mddi_readl(INT), mddi_readl(STAT),
+                      mddi_readl(RTD_VAL), mddi_readl(CURR_REV_PTR));
+       } while (retry_count-- > 0);
+       /* Disable Periodic Reverse Encapsulation. */
+       mddi_writel(MDDI_CMD_PERIODIC_REV_ENCAP | 0, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       mddi->reg_read = NULL;
+       mutex_unlock(&mddi->reg_read_lock);
+       return ri.result;
+}
+
+static struct mddi_info mddi_info[2];
+
+static int __init mddi_clk_setup(struct platform_device *pdev,
+                                struct mddi_info *mddi,
+                                unsigned long clk_rate)
+{
+       int ret;
+
+       /* set up the clocks */
+       mddi->clk = clk_get(&pdev->dev, "mddi_clk");
+       if (IS_ERR(mddi->clk)) {
+               printk(KERN_INFO "mddi: failed to get clock\n");
+               return PTR_ERR(mddi->clk);
+       }
+       ret =  clk_enable(mddi->clk);
+       if (ret)
+               goto fail;
+       ret = clk_set_rate(mddi->clk, clk_rate);
+       if (ret)
+               goto fail;
+       return 0;
+
+fail:
+       clk_put(mddi->clk);
+       return ret;
+}
+
+static int __init mddi_rev_data_setup(struct mddi_info *mddi)
+{
+       void *dma;
+       dma_addr_t dma_addr;
+
+       /* set up dma buffer */
+       dma = dma_alloc_coherent(NULL, 0x1000, &dma_addr, GFP_KERNEL);
+       if (dma == 0)
+               return -ENOMEM;
+       mddi->rev_data = dma;
+       mddi->rev_data_curr = 0;
+       mddi->rev_addr = dma_addr;
+       mddi->reg_write_data = dma + MDDI_REV_BUFFER_SIZE;
+       mddi->reg_write_addr = dma_addr + MDDI_REV_BUFFER_SIZE;
+       mddi->reg_read_data = mddi->reg_write_data + 1;
+       mddi->reg_read_addr = mddi->reg_write_addr +
+                             sizeof(*mddi->reg_write_data);
+       return 0;
+}
+
+static int __init mddi_probe(struct platform_device *pdev)
+{
+       struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
+       struct mddi_info *mddi = &mddi_info[pdev->id];
+       struct resource *resource;
+       int ret, i;
+
+       resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!resource) {
+               printk(KERN_ERR "mddi: no associated mem resource!\n");
+               return -ENOMEM;
+       }
+       mddi->base = ioremap(resource->start, resource->end - resource->start);
+       if (!mddi->base) {
+               printk(KERN_ERR "mddi: failed to remap base!\n");
+               ret = -EINVAL;
+               goto error_ioremap;
+       }
+       resource = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!resource) {
+               printk(KERN_ERR "mddi: no associated irq resource!\n");
+               ret = -EINVAL;
+               goto error_get_irq_resource;
+       }
+       mddi->irq = resource->start;
+       printk(KERN_INFO "mddi: init() base=0x%p irq=%d\n", mddi->base,
+              mddi->irq);
+       mddi->power_client = pdata->power_client;
+
+       mutex_init(&mddi->reg_write_lock);
+       mutex_init(&mddi->reg_read_lock);
+       spin_lock_init(&mddi->int_lock);
+       init_waitqueue_head(&mddi->int_wait);
+
+       ret = mddi_clk_setup(pdev, mddi, pdata->clk_rate);
+       if (ret) {
+               printk(KERN_ERR "mddi: failed to setup clock!\n");
+               goto error_clk_setup;
+       }
+
+       ret = mddi_rev_data_setup(mddi);
+       if (ret) {
+               printk(KERN_ERR "mddi: failed to setup rev data!\n");
+               goto error_rev_data;
+       }
+
+       mddi->int_enable = 0;
+       mddi_writel(mddi->int_enable, INTEN);
+       ret = request_irq(mddi->irq, mddi_isr, IRQF_DISABLED, "mddi",
+                         &mddi->client_data);
+       if (ret) {
+               printk(KERN_ERR "mddi: failed to request enable irq!\n");
+               goto error_request_irq;
+       }
+
+       /* turn on the mddi client bridge chip */
+       if (mddi->power_client)
+               mddi->power_client(&mddi->client_data, 1);
+
+       /* initialize the mddi registers */
+       mddi_set_auto_hibernate(&mddi->client_data, 0);
+       mddi_writel(MDDI_CMD_RESET, CMD);
+       mddi_wait_interrupt(mddi, MDDI_INT_NO_CMD_PKTS_PEND);
+       mddi->version = mddi_init_registers(mddi);
+       if (mddi->version < 0x20) {
+               printk(KERN_ERR "mddi: unsupported version 0x%x\n",
+                      mddi->version);
+               ret = -ENODEV;
+               goto error_mddi_version;
+       }
+
+       /* read the capabilities off the client */
+       if (!mddi_get_client_caps(mddi)) {
+               printk(KERN_INFO "mddi: no client found\n");
+               /* power down the panel */
+               mddi_writel(MDDI_CMD_POWERDOWN, CMD);
+               printk(KERN_INFO "mddi powerdown: stat %x\n", mddi_readl(STAT));
+               msleep(100);
+               printk(KERN_INFO "mddi powerdown: stat %x\n", mddi_readl(STAT));
+               return 0;
+       }
+       mddi_set_auto_hibernate(&mddi->client_data, 1);
+
+       if (mddi->caps.Mfr_Name == 0 && mddi->caps.Product_Code == 0)
+               pdata->fixup(&mddi->caps.Mfr_Name, &mddi->caps.Product_Code);
+
+       mddi->client_pdev.id = 0;
+       for (i = 0; i < pdata->num_clients; i++) {
+               if (pdata->client_platform_data[i].product_id ==
+                   (mddi->caps.Mfr_Name << 16 | mddi->caps.Product_Code)) {
+                       mddi->client_data.private_client_data =
+                               pdata->client_platform_data[i].client_data;
+                       mddi->client_pdev.name =
+                               pdata->client_platform_data[i].name;
+                       mddi->client_pdev.id =
+                               pdata->client_platform_data[i].id;
+                       /* XXX: possibly set clock */
+                       break;
+               }
+       }
+
+       if (i >= pdata->num_clients)
+               mddi->client_pdev.name = "mddi_c_dummy";
+       printk(KERN_INFO "mddi: registering panel %s\n",
+               mddi->client_pdev.name);
+
+       mddi->client_data.suspend = mddi_suspend;
+       mddi->client_data.resume = mddi_resume;
+       mddi->client_data.activate_link = mddi_activate_link;
+       mddi->client_data.remote_write = mddi_remote_write;
+       mddi->client_data.remote_read = mddi_remote_read;
+       mddi->client_data.auto_hibernate = mddi_set_auto_hibernate;
+       mddi->client_data.fb_resource = pdata->fb_resource;
+       if (pdev->id == 0)
+               mddi->client_data.interface_type = MSM_MDDI_PMDH_INTERFACE;
+       else if (pdev->id == 1)
+               mddi->client_data.interface_type = MSM_MDDI_EMDH_INTERFACE;
+       else {
+               printk(KERN_ERR "mddi: can not determine interface %d!\n",
+                      pdev->id);
+               ret = -EINVAL;
+               goto error_mddi_interface;
+       }
+
+       mddi->client_pdev.dev.platform_data = &mddi->client_data;
+       printk(KERN_INFO "mddi: publish: %s\n", mddi->client_name);
+       platform_device_register(&mddi->client_pdev);
+       return 0;
+
+error_mddi_interface:
+error_mddi_version:
+       free_irq(mddi->irq, 0);
+error_request_irq:
+       dma_free_coherent(NULL, 0x1000, mddi->rev_data, mddi->rev_addr);
+error_rev_data:
+error_clk_setup:
+error_get_irq_resource:
+       iounmap(mddi->base);
+error_ioremap:
+
+       printk(KERN_INFO "mddi: mddi_init() failed (%d)\n", ret);
+       return ret;
+}
+
+
+static struct platform_driver mddi_driver = {
+       .probe = mddi_probe,
+       .driver = { .name = "msm_mddi" },
+};
+
+static int __init _mddi_init(void)
+{
+       return platform_driver_register(&mddi_driver);
+}
+
+module_init(_mddi_init);
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c
new file mode 100644 (file)
index 0000000..ebbae87
--- /dev/null
@@ -0,0 +1,97 @@
+/* drivers/video/msm_fb/mddi_client_dummy.c
+ *
+ * Support for "dummy" mddi client devices which require no
+ * special initialization code.
+ *
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+
+#include <mach/msm_fb.h>
+
+struct panel_info {
+       struct platform_device pdev;
+       struct msm_panel_data panel_data;
+};
+
+static int mddi_dummy_suspend(struct msm_panel_data *panel_data)
+{
+       return 0;
+}
+
+static int mddi_dummy_resume(struct msm_panel_data *panel_data)
+{
+       return 0;
+}
+
+static int mddi_dummy_blank(struct msm_panel_data *panel_data)
+{
+       return 0;
+}
+
+static int mddi_dummy_unblank(struct msm_panel_data *panel_data)
+{
+       return 0;
+}
+
+static int mddi_dummy_probe(struct platform_device *pdev)
+{
+       struct msm_mddi_client_data *client_data = pdev->dev.platform_data;
+       struct panel_info *panel =
+               kzalloc(sizeof(struct panel_info), GFP_KERNEL);
+       int ret;
+       if (!panel)
+               return -ENOMEM;
+       platform_set_drvdata(pdev, panel);
+       panel->panel_data.suspend = mddi_dummy_suspend;
+       panel->panel_data.resume = mddi_dummy_resume;
+       panel->panel_data.blank = mddi_dummy_blank;
+       panel->panel_data.unblank = mddi_dummy_unblank;
+       panel->panel_data.caps = MSMFB_CAP_PARTIAL_UPDATES;
+       panel->pdev.name = "msm_panel";
+       panel->pdev.id = pdev->id;
+       platform_device_add_resources(&panel->pdev,
+                                     client_data->fb_resource, 1);
+       panel->panel_data.fb_data = client_data->private_client_data;
+       panel->pdev.dev.platform_data = &panel->panel_data;
+       ret = platform_device_register(&panel->pdev);
+       if (ret) {
+               kfree(panel);
+               return ret;
+       }
+       return 0;
+}
+
+static int mddi_dummy_remove(struct platform_device *pdev)
+{
+       struct panel_info *panel = platform_get_drvdata(pdev);
+       kfree(panel);
+       return 0;
+}
+
+static struct platform_driver mddi_client_dummy = {
+       .probe = mddi_dummy_probe,
+       .remove = mddi_dummy_remove,
+       .driver = { .name = "mddi_c_dummy" },
+};
+
+static int __init mddi_client_dummy_init(void)
+{
+       platform_driver_register(&mddi_client_dummy);
+       return 0;
+}
+
+module_init(mddi_client_dummy_init);
+
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
new file mode 100644 (file)
index 0000000..9c78050
--- /dev/null
@@ -0,0 +1,255 @@
+/* drivers/video/msm_fb/mddi_client_nt35399.c
+ *
+ * Support for Novatek NT35399 MDDI client of Sapphire
+ *
+ * Copyright (C) 2008 HTC Incorporated
+ * Author: Solomon Chiu (solomon_chiu@htc.com)
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <mach/msm_fb.h>
+
+static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait);
+
+struct panel_info {
+       struct msm_mddi_client_data *client_data;
+       struct platform_device pdev;
+       struct msm_panel_data panel_data;
+       struct msmfb_callback *fb_callback;
+       struct work_struct panel_work;
+       struct workqueue_struct *fb_wq;
+       int nt35399_got_int;
+};
+
+static void
+nt35399_request_vsync(struct msm_panel_data *panel_data,
+                     struct msmfb_callback *callback)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       panel->fb_callback = callback;
+       if (panel->nt35399_got_int) {
+               panel->nt35399_got_int = 0;
+               client_data->activate_link(client_data); /* clears interrupt */
+       }
+}
+
+static void nt35399_wait_vsync(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       if (panel->nt35399_got_int) {
+               panel->nt35399_got_int = 0;
+               client_data->activate_link(client_data); /* clears interrupt */
+       }
+
+       if (wait_event_timeout(nt35399_vsync_wait, panel->nt35399_got_int,
+                               HZ/2) == 0)
+               printk(KERN_ERR "timeout waiting for VSYNC\n");
+
+       panel->nt35399_got_int = 0;
+       /* interrupt clears when screen dma starts */
+}
+
+static int nt35399_suspend(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+       int ret;
+
+       ret = bridge_data->uninit(bridge_data, client_data);
+       if (ret) {
+               printk(KERN_INFO "mddi nt35399 client: non zero return from "
+                       "uninit\n");
+               return ret;
+       }
+       client_data->suspend(client_data);
+       return 0;
+}
+
+static int nt35399_resume(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+       int ret;
+
+       client_data->resume(client_data);
+       ret = bridge_data->init(bridge_data, client_data);
+       if (ret)
+               return ret;
+       return 0;
+}
+
+static int nt35399_blank(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+
+       return bridge_data->blank(bridge_data, client_data);
+}
+
+static int nt35399_unblank(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+
+       return bridge_data->unblank(bridge_data, client_data);
+}
+
+irqreturn_t nt35399_vsync_interrupt(int irq, void *data)
+{
+       struct panel_info *panel = data;
+
+       panel->nt35399_got_int = 1;
+
+       if (panel->fb_callback) {
+               panel->fb_callback->func(panel->fb_callback);
+               panel->fb_callback = NULL;
+       }
+
+       wake_up(&nt35399_vsync_wait);
+
+       return IRQ_HANDLED;
+}
+
+static int setup_vsync(struct panel_info *panel, int init)
+{
+       int ret;
+       int gpio = 97;
+       unsigned int irq;
+
+       if (!init) {
+               ret = 0;
+               goto uninit;
+       }
+       ret = gpio_request(gpio, "vsync");
+       if (ret)
+               goto err_request_gpio_failed;
+
+       ret = gpio_direction_input(gpio);
+       if (ret)
+               goto err_gpio_direction_input_failed;
+
+       ret = irq = gpio_to_irq(gpio);
+       if (ret < 0)
+               goto err_get_irq_num_failed;
+
+       ret = request_irq(irq, nt35399_vsync_interrupt, IRQF_TRIGGER_RISING,
+                         "vsync", panel);
+       if (ret)
+               goto err_request_irq_failed;
+
+       printk(KERN_INFO "vsync on gpio %d now %d\n",
+              gpio, gpio_get_value(gpio));
+       return 0;
+
+uninit:
+       free_irq(gpio_to_irq(gpio), panel->client_data);
+err_request_irq_failed:
+err_get_irq_num_failed:
+err_gpio_direction_input_failed:
+       gpio_free(gpio);
+err_request_gpio_failed:
+       return ret;
+}
+
+static int mddi_nt35399_probe(struct platform_device *pdev)
+{
+       struct msm_mddi_client_data *client_data = pdev->dev.platform_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+
+       int ret;
+
+       struct panel_info *panel = kzalloc(sizeof(struct panel_info),
+                                          GFP_KERNEL);
+
+       printk(KERN_DEBUG "%s: enter.\n", __func__);
+
+       if (!panel)
+               return -ENOMEM;
+       platform_set_drvdata(pdev, panel);
+
+       ret = setup_vsync(panel, 1);
+       if (ret) {
+               dev_err(&pdev->dev, "mddi_nt35399_setup_vsync failed\n");
+               return ret;
+       }
+
+       panel->client_data = client_data;
+       panel->panel_data.suspend = nt35399_suspend;
+       panel->panel_data.resume = nt35399_resume;
+       panel->panel_data.wait_vsync = nt35399_wait_vsync;
+       panel->panel_data.request_vsync = nt35399_request_vsync;
+       panel->panel_data.blank = nt35399_blank;
+       panel->panel_data.unblank = nt35399_unblank;
+       panel->panel_data.fb_data = &bridge_data->fb_data;
+       panel->panel_data.caps = 0;
+
+       panel->pdev.name = "msm_panel";
+       panel->pdev.id = pdev->id;
+       panel->pdev.resource = client_data->fb_resource;
+       panel->pdev.num_resources = 1;
+       panel->pdev.dev.platform_data = &panel->panel_data;
+
+       if (bridge_data->init)
+               bridge_data->init(bridge_data, client_data);
+
+       platform_device_register(&panel->pdev);
+
+       return 0;
+}
+
+static int mddi_nt35399_remove(struct platform_device *pdev)
+{
+       struct panel_info *panel = platform_get_drvdata(pdev);
+
+       setup_vsync(panel, 0);
+       kfree(panel);
+       return 0;
+}
+
+static struct platform_driver mddi_client_0bda_8a47 = {
+       .probe = mddi_nt35399_probe,
+       .remove = mddi_nt35399_remove,
+       .driver = { .name = "mddi_c_0bda_8a47" },
+};
+
+static int __init mddi_client_nt35399_init(void)
+{
+       return platform_driver_register(&mddi_client_0bda_8a47);
+}
+
+module_init(mddi_client_nt35399_init);
+
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c
new file mode 100644 (file)
index 0000000..80d0f5f
--- /dev/null
@@ -0,0 +1,283 @@
+/* drivers/video/msm_fb/mddi_client_toshiba.c
+ *
+ * Support for Toshiba TC358720XBG mddi client devices which require no
+ * special initialization code.
+ *
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <mach/msm_fb.h>
+
+
+#define LCD_CONTROL_BLOCK_BASE 0x110000
+#define CMN         (LCD_CONTROL_BLOCK_BASE|0x10)
+#define INTFLG      (LCD_CONTROL_BLOCK_BASE|0x18)
+#define HCYCLE      (LCD_CONTROL_BLOCK_BASE|0x34)
+#define HDE_START   (LCD_CONTROL_BLOCK_BASE|0x3C)
+#define VPOS        (LCD_CONTROL_BLOCK_BASE|0xC0)
+#define MPLFBUF     (LCD_CONTROL_BLOCK_BASE|0x20)
+#define WAKEUP      (LCD_CONTROL_BLOCK_BASE|0x54)
+#define WSYN_DLY    (LCD_CONTROL_BLOCK_BASE|0x58)
+#define REGENB      (LCD_CONTROL_BLOCK_BASE|0x5C)
+
+#define BASE5 0x150000
+#define BASE6 0x160000
+#define BASE7 0x170000
+
+#define GPIOIEV     (BASE5 + 0x10)
+#define GPIOIE      (BASE5 + 0x14)
+#define GPIORIS     (BASE5 + 0x18)
+#define GPIOMIS     (BASE5 + 0x1C)
+#define GPIOIC      (BASE5 + 0x20)
+
+#define INTMASK     (BASE6 + 0x0C)
+#define INTMASK_VWAKEOUT (1U << 0)
+#define INTMASK_VWAKEOUT_ACTIVE_LOW (1U << 8)
+#define GPIOSEL     (BASE7 + 0x00)
+#define GPIOSEL_VWAKEINT (1U << 0)
+
+static DECLARE_WAIT_QUEUE_HEAD(toshiba_vsync_wait);
+
+struct panel_info {
+       struct msm_mddi_client_data *client_data;
+       struct platform_device pdev;
+       struct msm_panel_data panel_data;
+       struct msmfb_callback *toshiba_callback;
+       int toshiba_got_int;
+};
+
+
+static void toshiba_request_vsync(struct msm_panel_data *panel_data,
+                                 struct msmfb_callback *callback)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       panel->toshiba_callback = callback;
+       if (panel->toshiba_got_int) {
+               panel->toshiba_got_int = 0;
+               client_data->activate_link(client_data);
+       }
+}
+
+static void toshiba_clear_vsync(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       client_data->activate_link(client_data);
+}
+
+static void toshiba_wait_vsync(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       if (panel->toshiba_got_int) {
+               panel->toshiba_got_int = 0;
+               client_data->activate_link(client_data); /* clears interrupt */
+       }
+       if (wait_event_timeout(toshiba_vsync_wait, panel->toshiba_got_int,
+                               HZ/2) == 0)
+               printk(KERN_ERR "timeout waiting for VSYNC\n");
+       panel->toshiba_got_int = 0;
+       /* interrupt clears when screen dma starts */
+}
+
+static int toshiba_suspend(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+       int ret;
+
+       ret = bridge_data->uninit(bridge_data, client_data);
+       if (ret) {
+               printk(KERN_INFO "mddi toshiba client: non zero return from "
+                       "uninit\n");
+               return ret;
+       }
+       client_data->suspend(client_data);
+       return 0;
+}
+
+static int toshiba_resume(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+       int ret;
+
+       client_data->resume(client_data);
+       ret = bridge_data->init(bridge_data, client_data);
+       if (ret)
+               return ret;
+       return 0;
+}
+
+static int toshiba_blank(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+
+       return bridge_data->blank(bridge_data, client_data);
+}
+
+static int toshiba_unblank(struct msm_panel_data *panel_data)
+{
+       struct panel_info *panel = container_of(panel_data, struct panel_info,
+                                               panel_data);
+       struct msm_mddi_client_data *client_data = panel->client_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+
+       return bridge_data->unblank(bridge_data, client_data);
+}
+
+irqreturn_t toshiba_vsync_interrupt(int irq, void *data)
+{
+       struct panel_info *panel = data;
+
+       panel->toshiba_got_int = 1;
+       if (panel->toshiba_callback) {
+               panel->toshiba_callback->func(panel->toshiba_callback);
+               panel->toshiba_callback = 0;
+       }
+       wake_up(&toshiba_vsync_wait);
+       return IRQ_HANDLED;
+}
+
+static int setup_vsync(struct panel_info *panel,
+                      int init)
+{
+       int ret;
+       int gpio = 97;
+       unsigned int irq;
+
+       if (!init) {
+               ret = 0;
+               goto uninit;
+       }
+       ret = gpio_request(gpio, "vsync");
+       if (ret)
+               goto err_request_gpio_failed;
+
+       ret = gpio_direction_input(gpio);
+       if (ret)
+               goto err_gpio_direction_input_failed;
+
+       ret = irq = gpio_to_irq(gpio);
+       if (ret < 0)
+               goto err_get_irq_num_failed;
+
+       ret = request_irq(irq, toshiba_vsync_interrupt, IRQF_TRIGGER_RISING,
+                         "vsync", panel);
+       if (ret)
+               goto err_request_irq_failed;
+       printk(KERN_INFO "vsync on gpio %d now %d\n",
+              gpio, gpio_get_value(gpio));
+       return 0;
+
+uninit:
+       free_irq(gpio_to_irq(gpio), panel);
+err_request_irq_failed:
+err_get_irq_num_failed:
+err_gpio_direction_input_failed:
+       gpio_free(gpio);
+err_request_gpio_failed:
+       return ret;
+}
+
+static int mddi_toshiba_probe(struct platform_device *pdev)
+{
+       int ret;
+       struct msm_mddi_client_data *client_data = pdev->dev.platform_data;
+       struct msm_mddi_bridge_platform_data *bridge_data =
+               client_data->private_client_data;
+       struct panel_info *panel =
+               kzalloc(sizeof(struct panel_info), GFP_KERNEL);
+       if (!panel)
+               return -ENOMEM;
+       platform_set_drvdata(pdev, panel);
+
+       /* mddi_remote_write(mddi, 0, WAKEUP); */
+       client_data->remote_write(client_data, GPIOSEL_VWAKEINT, GPIOSEL);
+       client_data->remote_write(client_data, INTMASK_VWAKEOUT, INTMASK);
+
+       ret = setup_vsync(panel, 1);
+       if (ret) {
+               dev_err(&pdev->dev, "mddi_bridge_setup_vsync failed\n");
+               return ret;
+       }
+
+       panel->client_data = client_data;
+       panel->panel_data.suspend = toshiba_suspend;
+       panel->panel_data.resume = toshiba_resume;
+       panel->panel_data.wait_vsync = toshiba_wait_vsync;
+       panel->panel_data.request_vsync = toshiba_request_vsync;
+       panel->panel_data.clear_vsync = toshiba_clear_vsync;
+       panel->panel_data.blank = toshiba_blank;
+       panel->panel_data.unblank = toshiba_unblank;
+       panel->panel_data.fb_data =  &bridge_data->fb_data;
+       panel->panel_data.caps = MSMFB_CAP_PARTIAL_UPDATES;
+
+       panel->pdev.name = "msm_panel";
+       panel->pdev.id = pdev->id;
+       panel->pdev.resource = client_data->fb_resource;
+       panel->pdev.num_resources = 1;
+       panel->pdev.dev.platform_data = &panel->panel_data;
+       bridge_data->init(bridge_data, client_data);
+       platform_device_register(&panel->pdev);
+
+       return 0;
+}
+
+static int mddi_toshiba_remove(struct platform_device *pdev)
+{
+       struct panel_info *panel = platform_get_drvdata(pdev);
+
+       setup_vsync(panel, 0);
+       kfree(panel);
+       return 0;
+}
+
+static struct platform_driver mddi_client_d263_0000 = {
+       .probe = mddi_toshiba_probe,
+       .remove = mddi_toshiba_remove,
+       .driver = { .name = "mddi_c_d263_0000" },
+};
+
+static int __init mddi_client_toshiba_init(void)
+{
+       platform_driver_register(&mddi_client_d263_0000);
+       return 0;
+}
+
+module_init(mddi_client_toshiba_init);
+
diff --git a/drivers/video/msm/mddi_hw.h b/drivers/video/msm/mddi_hw.h
new file mode 100644 (file)
index 0000000..45cc01f
--- /dev/null
@@ -0,0 +1,305 @@
+/* drivers/video/msm_fb/mddi_hw.h
+ *
+ * MSM MDDI Hardware Registers and Structures
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _MDDI_HW_H_
+#define _MDDI_HW_H_
+
+#include <linux/types.h>
+
+#define MDDI_CMD                0x0000
+#define MDDI_VERSION            0x0004
+#define MDDI_PRI_PTR            0x0008
+#define MDDI_SEC_PTR            0x000c
+#define MDDI_BPS                0x0010
+#define MDDI_SPM                0x0014
+#define MDDI_INT                0x0018
+#define MDDI_INTEN              0x001c
+#define MDDI_REV_PTR            0x0020
+#define MDDI_REV_SIZE           0x0024
+#define MDDI_STAT               0x0028
+#define MDDI_REV_RATE_DIV       0x002c
+#define MDDI_REV_CRC_ERR        0x0030
+#define MDDI_TA1_LEN            0x0034
+#define MDDI_TA2_LEN            0x0038
+#define MDDI_TEST_BUS           0x003c
+#define MDDI_TEST               0x0040
+#define MDDI_REV_PKT_CNT        0x0044
+#define MDDI_DRIVE_HI           0x0048
+#define MDDI_DRIVE_LO           0x004c
+#define MDDI_DISP_WAKE          0x0050
+#define MDDI_REV_ENCAP_SZ       0x0054
+#define MDDI_RTD_VAL            0x0058
+#define MDDI_PAD_CTL            0x0068
+#define MDDI_DRIVER_START_CNT   0x006c
+#define MDDI_NEXT_PRI_PTR       0x0070
+#define MDDI_NEXT_SEC_PTR       0x0074
+#define MDDI_MISR_CTL           0x0078
+#define MDDI_MISR_DATA          0x007c
+#define MDDI_SF_CNT             0x0080
+#define MDDI_MF_CNT             0x0084
+#define MDDI_CURR_REV_PTR       0x0088
+#define MDDI_CORE_VER           0x008c
+
+#define MDDI_INT_PRI_PTR_READ       0x0001
+#define MDDI_INT_SEC_PTR_READ       0x0002
+#define MDDI_INT_REV_DATA_AVAIL     0x0004
+#define MDDI_INT_DISP_REQ           0x0008
+#define MDDI_INT_PRI_UNDERFLOW      0x0010
+#define MDDI_INT_SEC_UNDERFLOW      0x0020
+#define MDDI_INT_REV_OVERFLOW       0x0040
+#define MDDI_INT_CRC_ERROR          0x0080
+#define MDDI_INT_MDDI_IN            0x0100
+#define MDDI_INT_PRI_OVERWRITE      0x0200
+#define MDDI_INT_SEC_OVERWRITE      0x0400
+#define MDDI_INT_REV_OVERWRITE      0x0800
+#define MDDI_INT_DMA_FAILURE        0x1000
+#define MDDI_INT_LINK_ACTIVE        0x2000
+#define MDDI_INT_IN_HIBERNATION     0x4000
+#define MDDI_INT_PRI_LINK_LIST_DONE 0x8000
+#define MDDI_INT_SEC_LINK_LIST_DONE 0x10000
+#define MDDI_INT_NO_CMD_PKTS_PEND   0x20000
+#define MDDI_INT_RTD_FAILURE        0x40000
+#define MDDI_INT_REV_PKT_RECEIVED   0x80000
+#define MDDI_INT_REV_PKTS_AVAIL     0x100000
+
+#define MDDI_INT_NEED_CLEAR ( \
+       MDDI_INT_REV_DATA_AVAIL | \
+       MDDI_INT_PRI_UNDERFLOW | \
+       MDDI_INT_SEC_UNDERFLOW | \
+       MDDI_INT_REV_OVERFLOW | \
+       MDDI_INT_CRC_ERROR | \
+       MDDI_INT_REV_PKT_RECEIVED)
+
+
+#define MDDI_STAT_LINK_ACTIVE        0x0001
+#define MDDI_STAT_NEW_REV_PTR        0x0002
+#define MDDI_STAT_NEW_PRI_PTR        0x0004
+#define MDDI_STAT_NEW_SEC_PTR        0x0008
+#define MDDI_STAT_IN_HIBERNATION     0x0010
+#define MDDI_STAT_PRI_LINK_LIST_DONE 0x0020
+#define MDDI_STAT_SEC_LINK_LIST_DONE 0x0040
+#define MDDI_STAT_PENDING_TIMING_PKT 0x0080
+#define MDDI_STAT_PENDING_REV_ENCAP  0x0100
+#define MDDI_STAT_PENDING_POWERDOWN  0x0200
+#define MDDI_STAT_RTD_MEAS_FAIL      0x0800
+#define MDDI_STAT_CLIENT_WAKEUP_REQ  0x1000
+
+
+#define MDDI_CMD_POWERDOWN           0x0100
+#define MDDI_CMD_POWERUP             0x0200
+#define MDDI_CMD_HIBERNATE           0x0300
+#define MDDI_CMD_RESET               0x0400
+#define MDDI_CMD_DISP_IGNORE         0x0501
+#define MDDI_CMD_DISP_LISTEN         0x0500
+#define MDDI_CMD_SEND_REV_ENCAP      0x0600
+#define MDDI_CMD_GET_CLIENT_CAP      0x0601
+#define MDDI_CMD_GET_CLIENT_STATUS   0x0602
+#define MDDI_CMD_SEND_RTD            0x0700
+#define MDDI_CMD_LINK_ACTIVE         0x0900
+#define MDDI_CMD_PERIODIC_REV_ENCAP  0x0A00
+#define MDDI_CMD_FORCE_NEW_REV_PTR   0x0C00
+
+
+
+#define MDDI_VIDEO_REV_PKT_SIZE              0x40
+#define MDDI_CLIENT_CAPABILITY_REV_PKT_SIZE  0x60
+#define MDDI_MAX_REV_PKT_SIZE                0x60
+
+/* #define MDDI_REV_BUFFER_SIZE 128 */
+#define MDDI_REV_BUFFER_SIZE (MDDI_MAX_REV_PKT_SIZE * 4)
+
+/* MDP sends 256 pixel packets, so lower value hibernates more without
+ * significantly increasing latency of waiting for next subframe */
+#define MDDI_HOST_BYTES_PER_SUBFRAME  0x3C00
+#define MDDI_HOST_TA2_LEN       0x000c
+#define MDDI_HOST_REV_RATE_DIV  0x0002
+
+
+struct __attribute__((packed)) mddi_rev_packet {
+       uint16_t length;
+       uint16_t type;
+       uint16_t client_id;
+};
+
+struct __attribute__((packed)) mddi_client_status {
+       uint16_t length;
+       uint16_t type;
+       uint16_t client_id;
+       uint16_t reverse_link_request;  /* bytes needed in rev encap message */
+       uint8_t  crc_error_count;
+       uint8_t  capability_change;
+       uint16_t graphics_busy_flags;
+       uint16_t crc16;
+};
+
+struct __attribute__((packed)) mddi_client_caps {
+       uint16_t length; /* length, exclusive of this field */
+       uint16_t type; /* 66 */
+       uint16_t client_id;
+
+       uint16_t Protocol_Version;
+       uint16_t Minimum_Protocol_Version;
+       uint16_t Data_Rate_Capability;
+       uint8_t  Interface_Type_Capability;
+       uint8_t  Number_of_Alt_Displays;
+       uint16_t PostCal_Data_Rate;
+       uint16_t Bitmap_Width;
+       uint16_t Bitmap_Height;
+       uint16_t Display_Window_Width;
+       uint16_t Display_Window_Height;
+       uint32_t Color_Map_Size;
+       uint16_t Color_Map_RGB_Width;
+       uint16_t RGB_Capability;
+       uint8_t  Monochrome_Capability;
+       uint8_t  Reserved_1;
+       uint16_t Y_Cb_Cr_Capability;
+       uint16_t Bayer_Capability;
+       uint16_t Alpha_Cursor_Image_Planes;
+       uint32_t Client_Feature_Capability_Indicators;
+       uint8_t  Maximum_Video_Frame_Rate_Capability;
+       uint8_t  Minimum_Video_Frame_Rate_Capability;
+       uint16_t Minimum_Sub_frame_Rate;
+       uint16_t Audio_Buffer_Depth;
+       uint16_t Audio_Channel_Capability;
+       uint16_t Audio_Sample_Rate_Capability;
+       uint8_t  Audio_Sample_Resolution;
+       uint8_t  Mic_Audio_Sample_Resolution;
+       uint16_t Mic_Sample_Rate_Capability;
+       uint8_t  Keyboard_Data_Format;
+       uint8_t  pointing_device_data_format;
+       uint16_t content_protection_type;
+       uint16_t Mfr_Name;
+       uint16_t Product_Code;
+       uint16_t Reserved_3;
+       uint32_t Serial_Number;
+       uint8_t  Week_of_Manufacture;
+       uint8_t  Year_of_Manufacture;
+
+       uint16_t crc16;
+} mddi_client_capability_type;
+
+
+struct __attribute__((packed)) mddi_video_stream {
+       uint16_t length;
+       uint16_t type; /* 16 */
+       uint16_t client_id; /* 0 */
+
+       uint16_t video_data_format_descriptor;
+/* format of each pixel in the Pixel Data in the present stream in the
+ * present packet.
+ * If bits [15:13] = 000 monochrome
+ * If bits [15:13] = 001 color pixels (palette).
+ * If bits [15:13] = 010 color pixels in raw RGB
+ * If bits [15:13] = 011 data in 4:2:2 Y Cb Cr format
+ * If bits [15:13] = 100 Bayer pixels
+ */
+
+       uint16_t pixel_data_attributes;
+/* interpreted as follows:
+ * Bits [1:0] = 11  pixel data is displayed to both eyes
+ * Bits [1:0] = 10  pixel data is routed to the left eye only.
+ * Bits [1:0] = 01  pixel data is routed to the right eye only.
+ * Bits [1:0] = 00  pixel data is routed to the alternate display.
+ * Bit 2 is 0  Pixel Data is in the standard progressive format.
+ * Bit 2 is 1  Pixel Data is in interlace format.
+ * Bit 3 is 0  Pixel Data is in the standard progressive format.
+ * Bit 3 is 1  Pixel Data is in alternate pixel format.
+ * Bit 4 is 0  Pixel Data is to or from the display frame buffer.
+ * Bit 4 is 1  Pixel Data is to or from the camera.
+ * Bit 5 is 0  pixel data contains the next consecutive row of pixels.
+ * Bit 5 is 1  X Left Edge, Y Top Edge, X Right Edge, Y Bottom Edge,
+ *             X Start, and Y Start parameters are not defined and
+ *             shall be ignored by the client.
+ * Bits [7:6] = 01  Pixel data is written to the offline image buffer.
+ * Bits [7:6] = 00  Pixel data is written to the buffer to refresh display.
+ * Bits [7:6] = 11  Pixel data is written to all image buffers.
+ * Bits [7:6] = 10  Invalid. Reserved for future use.
+ * Bits 8 through 11 alternate display number.
+ * Bits 12 through 14 are reserved for future use and shall be set to zero.
+ * Bit 15 is 1 the row of pixels is the last row of pixels in a frame.
+ */
+
+       uint16_t x_left_edge;
+       uint16_t y_top_edge;
+       /* X,Y coordinate of the top left edge of the screen window */
+
+       uint16_t x_right_edge;
+       uint16_t y_bottom_edge;
+       /* X,Y coordinate of the bottom right edge of the window being
+        * updated. */
+
+       uint16_t x_start;
+       uint16_t y_start;
+       /* (X Start, Y Start) is the first pixel in the Pixel Data field
+        * below. */
+
+       uint16_t pixel_count;
+       /* number of pixels in the Pixel Data field below. */
+
+       uint16_t parameter_CRC;
+       /* 16-bit CRC of all bytes from the Packet Length to the Pixel Count. */
+
+       uint16_t reserved;
+       /* 16-bit variable to make structure align on 4 byte boundary */
+};
+
+#define TYPE_VIDEO_STREAM      16
+#define TYPE_CLIENT_CAPS       66
+#define TYPE_REGISTER_ACCESS   146
+#define TYPE_CLIENT_STATUS     70
+
+struct __attribute__((packed)) mddi_register_access {
+       uint16_t length;
+       uint16_t type; /* 146 */
+       uint16_t client_id;
+
+       uint16_t read_write_info;
+       /* Bits 13:0  a 14-bit unsigned integer that specifies the number of
+        *            32-bit Register Data List items to be transferred in the
+        *            Register Data List field.
+        * Bits[15:14] = 00  Write to register(s);
+        * Bits[15:14] = 10  Read from register(s);
+        * Bits[15:14] = 11  Response to a Read.
+        * Bits[15:14] = 01  this value is reserved for future use. */
+#define MDDI_WRITE     (0 << 14)
+#define MDDI_READ      (2 << 14)
+#define MDDI_READ_RESP (3 << 14)
+
+       uint32_t register_address;
+       /* the register address that is to be written to or read from. */
+
+       uint16_t crc16;
+
+       uint32_t register_data_list;
+       /* list of 4-byte register data values for/from client registers */
+};
+
+struct __attribute__((packed)) mddi_llentry {
+       uint16_t flags;
+       uint16_t header_count;
+       uint16_t data_count;
+       dma_addr_t data; /* 32 bit */
+       struct mddi_llentry *next;
+       uint16_t reserved;
+       union {
+               struct mddi_video_stream v;
+               struct mddi_register_access r;
+               uint32_t _[12];
+       } u;
+};
+
+#endif
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
new file mode 100644 (file)
index 0000000..99636a2
--- /dev/null
@@ -0,0 +1,538 @@
+/* drivers/video/msm_fb/mdp.c
+ *
+ * MSM MDP Interface (used by framebuffer core)
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/fb.h>
+#include <linux/msm_mdp.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/clk.h>
+#include <linux/file.h>
+#ifdef CONFIG_ANDROID_PMEM
+#include <linux/android_pmem.h>
+#endif
+#include <linux/major.h>
+
+#include <mach/msm_iomap.h>
+#include <mach/msm_fb.h>
+#include <linux/platform_device.h>
+
+#include "mdp_hw.h"
+
+struct class *mdp_class;
+
+#define MDP_CMD_DEBUG_ACCESS_BASE (0x10000)
+
+static uint16_t mdp_default_ccs[] = {
+       0x254, 0x000, 0x331, 0x254, 0xF38, 0xE61, 0x254, 0x409, 0x000,
+       0x010, 0x080, 0x080
+};
+
+static DECLARE_WAIT_QUEUE_HEAD(mdp_dma2_waitqueue);
+static DECLARE_WAIT_QUEUE_HEAD(mdp_ppp_waitqueue);
+static struct msmfb_callback *dma_callback;
+static struct clk *clk;
+static unsigned int mdp_irq_mask;
+static DEFINE_SPINLOCK(mdp_lock);
+DEFINE_MUTEX(mdp_mutex);
+
+static int enable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
+{
+       unsigned long irq_flags;
+       int ret = 0;
+
+       BUG_ON(!mask);
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       /* if the mask bits are already set return an error, this interrupt
+        * is already enabled */
+       if (mdp_irq_mask & mask) {
+               printk(KERN_ERR "mdp irq already on already on %x %x\n",
+                      mdp_irq_mask, mask);
+               ret = -1;
+       }
+       /* if the mdp irq is not already enabled enable it */
+       if (!mdp_irq_mask) {
+               if (clk)
+                       clk_enable(clk);
+               enable_irq(mdp->irq);
+       }
+
+       /* update the irq mask to reflect the fact that the interrupt is
+        * enabled */
+       mdp_irq_mask |= mask;
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+       return ret;
+}
+
+static int locked_disable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
+{
+       /* this interrupt is already disabled! */
+       if (!(mdp_irq_mask & mask)) {
+               printk(KERN_ERR "mdp irq already off %x %x\n",
+                      mdp_irq_mask, mask);
+               return -1;
+       }
+       /* update the irq mask to reflect the fact that the interrupt is
+        * disabled */
+       mdp_irq_mask &= ~(mask);
+       /* if no one is waiting on the interrupt, disable it */
+       if (!mdp_irq_mask) {
+               disable_irq(mdp->irq);
+               if (clk)
+                       clk_disable(clk);
+       }
+       return 0;
+}
+
+static int disable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
+{
+       unsigned long irq_flags;
+       int ret;
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       ret = locked_disable_mdp_irq(mdp, mask);
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+       return ret;
+}
+
+static irqreturn_t mdp_isr(int irq, void *data)
+{
+       uint32_t status;
+       unsigned long irq_flags;
+       struct mdp_info *mdp = data;
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+
+       status = mdp_readl(mdp, MDP_INTR_STATUS);
+       mdp_writel(mdp, status, MDP_INTR_CLEAR);
+
+       status &= mdp_irq_mask;
+       if (status & DL0_DMA2_TERM_DONE) {
+               if (dma_callback) {
+                       dma_callback->func(dma_callback);
+                       dma_callback = NULL;
+               }
+               wake_up(&mdp_dma2_waitqueue);
+       }
+
+       if (status & DL0_ROI_DONE)
+               wake_up(&mdp_ppp_waitqueue);
+
+       if (status)
+               locked_disable_mdp_irq(mdp, status);
+
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+       return IRQ_HANDLED;
+}
+
+static uint32_t mdp_check_mask(uint32_t mask)
+{
+       uint32_t ret;
+       unsigned long irq_flags;
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       ret = mdp_irq_mask & mask;
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+       return ret;
+}
+
+static int mdp_wait(struct mdp_info *mdp, uint32_t mask, wait_queue_head_t *wq)
+{
+       int ret = 0;
+       unsigned long irq_flags;
+
+       wait_event_timeout(*wq, !mdp_check_mask(mask), HZ);
+
+       spin_lock_irqsave(&mdp_lock, irq_flags);
+       if (mdp_irq_mask & mask) {
+               locked_disable_mdp_irq(mdp, mask);
+               printk(KERN_WARNING "timeout waiting for mdp to complete %x\n",
+                      mask);
+               ret = -ETIMEDOUT;
+       }
+       spin_unlock_irqrestore(&mdp_lock, irq_flags);
+
+       return ret;
+}
+
+void mdp_dma_wait(struct mdp_device *mdp_dev)
+{
+#define MDP_MAX_TIMEOUTS 20
+       static int timeout_count;
+       struct mdp_info *mdp = container_of(mdp_dev, struct mdp_info, mdp_dev);
+
+       if (mdp_wait(mdp, DL0_DMA2_TERM_DONE, &mdp_dma2_waitqueue) == -ETIMEDOUT)
+               timeout_count++;
+       else
+               timeout_count = 0;
+
+       if (timeout_count > MDP_MAX_TIMEOUTS) {
+               printk(KERN_ERR "mdp: dma failed %d times, somethings wrong!\n",
+                      MDP_MAX_TIMEOUTS);
+               BUG();
+       }
+}
+
+static int mdp_ppp_wait(struct mdp_info *mdp)
+{
+       return mdp_wait(mdp, DL0_ROI_DONE, &mdp_ppp_waitqueue);
+}
+
+void mdp_dma_to_mddi(struct mdp_info *mdp, uint32_t addr, uint32_t stride,
+                    uint32_t width, uint32_t height, uint32_t x, uint32_t y,
+                    struct msmfb_callback *callback)
+{
+       uint32_t dma2_cfg;
+       uint16_t ld_param = 0; /* 0=PRIM, 1=SECD, 2=EXT */
+
+       if (enable_mdp_irq(mdp, DL0_DMA2_TERM_DONE)) {
+               printk(KERN_ERR "mdp_dma_to_mddi: busy\n");
+               return;
+       }
+
+       dma_callback = callback;
+
+       dma2_cfg = DMA_PACK_TIGHT |
+               DMA_PACK_ALIGN_LSB |
+               DMA_PACK_PATTERN_RGB |
+               DMA_OUT_SEL_AHB |
+               DMA_IBUF_NONCONTIGUOUS;
+
+       dma2_cfg |= DMA_IBUF_FORMAT_RGB565;
+
+       dma2_cfg |= DMA_OUT_SEL_MDDI;
+
+       dma2_cfg |= DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY;
+
+       dma2_cfg |= DMA_DITHER_EN;
+
+       /* setup size, address, and stride */
+       mdp_writel(mdp, (height << 16) | (width),
+                  MDP_CMD_DEBUG_ACCESS_BASE + 0x0184);
+       mdp_writel(mdp, addr, MDP_CMD_DEBUG_ACCESS_BASE + 0x0188);
+       mdp_writel(mdp, stride, MDP_CMD_DEBUG_ACCESS_BASE + 0x018C);
+
+       /* 666 18BPP */
+       dma2_cfg |= DMA_DSTC0G_6BITS | DMA_DSTC1B_6BITS | DMA_DSTC2R_6BITS;
+
+       /* set y & x offset and MDDI transaction parameters */
+       mdp_writel(mdp, (y << 16) | (x), MDP_CMD_DEBUG_ACCESS_BASE + 0x0194);
+       mdp_writel(mdp, ld_param, MDP_CMD_DEBUG_ACCESS_BASE + 0x01a0);
+       mdp_writel(mdp, (MDDI_VDO_PACKET_DESC << 16) | MDDI_VDO_PACKET_PRIM,
+                  MDP_CMD_DEBUG_ACCESS_BASE + 0x01a4);
+
+       mdp_writel(mdp, dma2_cfg, MDP_CMD_DEBUG_ACCESS_BASE + 0x0180);
+
+       /* start DMA2 */
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0044);
+}
+
+void mdp_dma(struct mdp_device *mdp_dev, uint32_t addr, uint32_t stride,
+            uint32_t width, uint32_t height, uint32_t x, uint32_t y,
+            struct msmfb_callback *callback, int interface)
+{
+       struct mdp_info *mdp = container_of(mdp_dev, struct mdp_info, mdp_dev);
+
+       if (interface == MSM_MDDI_PMDH_INTERFACE) {
+               mdp_dma_to_mddi(mdp, addr, stride, width, height, x, y,
+                               callback);
+       }
+}
+
+int get_img(struct mdp_img *img, struct fb_info *info,
+           unsigned long *start, unsigned long *len,
+           struct file **filep)
+{
+       int put_needed, ret = 0;
+       struct file *file;
+       unsigned long vstart;
+
+#ifdef CONFIG_ANDROID_PMEM
+       if (!get_pmem_file(img->memory_id, start, &vstart, len, filep))
+               return 0;
+#endif
+
+       file = fget_light(img->memory_id, &put_needed);
+       if (file == NULL)
+               return -1;
+
+       if (MAJOR(file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
+               *start = info->fix.smem_start;
+               *len = info->fix.smem_len;
+       } else
+               ret = -1;
+       fput_light(file, put_needed);
+
+       return ret;
+}
+
+void put_img(struct file *src_file, struct file *dst_file)
+{
+#ifdef CONFIG_ANDROID_PMEM
+       if (src_file)
+               put_pmem_file(src_file);
+       if (dst_file)
+               put_pmem_file(dst_file);
+#endif
+}
+
+int mdp_blit(struct mdp_device *mdp_dev, struct fb_info *fb,
+            struct mdp_blit_req *req)
+{
+       int ret;
+       unsigned long src_start = 0, src_len = 0, dst_start = 0, dst_len = 0;
+       struct mdp_info *mdp = container_of(mdp_dev, struct mdp_info, mdp_dev);
+       struct file *src_file = 0, *dst_file = 0;
+
+       /* WORKAROUND FOR HARDWARE BUG IN BG TILE FETCH */
+       if (unlikely(req->src_rect.h == 0 ||
+                    req->src_rect.w == 0)) {
+               printk(KERN_ERR "mpd_ppp: src img of zero size!\n");
+               return -EINVAL;
+       }
+       if (unlikely(req->dst_rect.h == 0 ||
+                    req->dst_rect.w == 0))
+               return -EINVAL;
+
+       /* do this first so that if this fails, the caller can always
+        * safely call put_img */
+       if (unlikely(get_img(&req->src, fb, &src_start, &src_len, &src_file))) {
+               printk(KERN_ERR "mpd_ppp: could not retrieve src image from "
+                               "memory\n");
+               return -EINVAL;
+       }
+
+       if (unlikely(get_img(&req->dst, fb, &dst_start, &dst_len, &dst_file))) {
+               printk(KERN_ERR "mpd_ppp: could not retrieve dst image from "
+                               "memory\n");
+#ifdef CONFIG_ANDROID_PMEM
+               put_pmem_file(src_file);
+#endif
+               return -EINVAL;
+       }
+       mutex_lock(&mdp_mutex);
+
+       /* transp_masking unimplemented */
+       req->transp_mask = MDP_TRANSP_NOP;
+       if (unlikely((req->transp_mask != MDP_TRANSP_NOP ||
+                     req->alpha != MDP_ALPHA_NOP ||
+                     HAS_ALPHA(req->src.format)) &&
+                    (req->flags & MDP_ROT_90 &&
+                     req->dst_rect.w <= 16 && req->dst_rect.h >= 16))) {
+               int i;
+               unsigned int tiles = req->dst_rect.h / 16;
+               unsigned int remainder = req->dst_rect.h % 16;
+               req->src_rect.w = 16*req->src_rect.w / req->dst_rect.h;
+               req->dst_rect.h = 16;
+               for (i = 0; i < tiles; i++) {
+                       enable_mdp_irq(mdp, DL0_ROI_DONE);
+                       ret = mdp_ppp_blit(mdp, req, src_file, src_start,
+                                          src_len, dst_file, dst_start,
+                                          dst_len);
+                       if (ret)
+                               goto err_bad_blit;
+                       ret = mdp_ppp_wait(mdp);
+                       if (ret)
+                               goto err_wait_failed;
+                       req->dst_rect.y += 16;
+                       req->src_rect.x += req->src_rect.w;
+               }
+               if (!remainder)
+                       goto end;
+               req->src_rect.w = remainder*req->src_rect.w / req->dst_rect.h;
+               req->dst_rect.h = remainder;
+       }
+       enable_mdp_irq(mdp, DL0_ROI_DONE);
+       ret = mdp_ppp_blit(mdp, req, src_file, src_start, src_len, dst_file,
+                          dst_start,
+                          dst_len);
+       if (ret)
+               goto err_bad_blit;
+       ret = mdp_ppp_wait(mdp);
+       if (ret)
+               goto err_wait_failed;
+end:
+       put_img(src_file, dst_file);
+       mutex_unlock(&mdp_mutex);
+       return 0;
+err_bad_blit:
+       disable_mdp_irq(mdp, DL0_ROI_DONE);
+err_wait_failed:
+       put_img(src_file, dst_file);
+       mutex_unlock(&mdp_mutex);
+       return ret;
+}
+
+void mdp_set_grp_disp(struct mdp_device *mdp_dev, unsigned disp_id)
+{
+       struct mdp_info *mdp = container_of(mdp_dev, struct mdp_info, mdp_dev);
+
+       disp_id &= 0xf;
+       mdp_writel(mdp, disp_id, MDP_FULL_BYPASS_WORD43);
+}
+
+int register_mdp_client(struct class_interface *cint)
+{
+       if (!mdp_class) {
+               pr_err("mdp: no mdp_class when registering mdp client\n");
+               return -ENODEV;
+       }
+       cint->class = mdp_class;
+       return class_interface_register(cint);
+}
+
+#include "mdp_csc_table.h"
+#include "mdp_scale_tables.h"
+
+int mdp_probe(struct platform_device *pdev)
+{
+       struct resource *resource;
+       int ret;
+       int n;
+       struct mdp_info *mdp;
+
+       resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!resource) {
+               pr_err("mdp: can not get mdp mem resource!\n");
+               return -ENOMEM;
+       }
+
+       mdp = kzalloc(sizeof(struct mdp_info), GFP_KERNEL);
+       if (!mdp)
+               return -ENOMEM;
+
+       mdp->irq = platform_get_irq(pdev, 0);
+       if (mdp->irq < 0) {
+               pr_err("mdp: can not get mdp irq\n");
+               ret = mdp->irq;
+               goto error_get_irq;
+       }
+
+       mdp->base = ioremap(resource->start,
+                           resource->end - resource->start);
+       if (mdp->base == 0) {
+               printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n");
+               ret = -ENOMEM;
+               goto error_ioremap;
+       }
+
+       mdp->mdp_dev.dma = mdp_dma;
+       mdp->mdp_dev.dma_wait = mdp_dma_wait;
+       mdp->mdp_dev.blit = mdp_blit;
+       mdp->mdp_dev.set_grp_disp = mdp_set_grp_disp;
+
+       clk = clk_get(&pdev->dev, "mdp_clk");
+       if (IS_ERR(clk)) {
+               printk(KERN_INFO "mdp: failed to get mdp clk");
+               return PTR_ERR(clk);
+       }
+
+       ret = request_irq(mdp->irq, mdp_isr, IRQF_DISABLED, "msm_mdp", mdp);
+       if (ret)
+               goto error_request_irq;
+       disable_irq(mdp->irq);
+       mdp_irq_mask = 0;
+
+       /* debug interface write access */
+       mdp_writel(mdp, 1, 0x60);
+
+       mdp_writel(mdp, MDP_ANY_INTR_MASK, MDP_INTR_ENABLE);
+       mdp_writel(mdp, 1, MDP_EBI2_PORTMAP_MODE);
+
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01f8);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01fc);
+
+       for (n = 0; n < ARRAY_SIZE(csc_table); n++)
+               mdp_writel(mdp, csc_table[n].val, csc_table[n].reg);
+
+       /* clear up unused fg/main registers */
+       /* comp.plane 2&3 ystride */
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0120);
+
+       /* unpacked pattern */
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x012c);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0130);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0134);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0158);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x015c);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0160);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0170);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0174);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x017c);
+
+       /* comp.plane 2 & 3 */
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0114);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x0118);
+
+       /* clear unused bg registers */
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01c8);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01d0);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01dc);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01e0);
+       mdp_writel(mdp, 0, MDP_CMD_DEBUG_ACCESS_BASE + 0x01e4);
+
+       for (n = 0; n < ARRAY_SIZE(mdp_upscale_table); n++)
+               mdp_writel(mdp, mdp_upscale_table[n].val,
+                      mdp_upscale_table[n].reg);
+
+       for (n = 0; n < 9; n++)
+               mdp_writel(mdp, mdp_default_ccs[n], 0x40440 + 4 * n);
+       mdp_writel(mdp, mdp_default_ccs[9], 0x40500 + 4 * 0);
+       mdp_writel(mdp, mdp_default_ccs[10], 0x40500 + 4 * 0);
+       mdp_writel(mdp, mdp_default_ccs[11], 0x40500 + 4 * 0);
+
+       /* register mdp device */
+       mdp->mdp_dev.dev.parent = &pdev->dev;
+       mdp->mdp_dev.dev.class = mdp_class;
+       snprintf(mdp->mdp_dev.dev.bus_id, BUS_ID_SIZE, "mdp%d", pdev->id);
+
+       /* if you can remove the platform device you'd have to implement
+        * this:
+       mdp_dev.release = mdp_class; */
+
+       ret = device_register(&mdp->mdp_dev.dev);
+       if (ret)
+               goto error_device_register;
+       return 0;
+
+error_device_register:
+       free_irq(mdp->irq, mdp);
+error_request_irq:
+       iounmap(mdp->base);
+error_get_irq:
+error_ioremap:
+       kfree(mdp);
+       return ret;
+}
+
+static struct platform_driver msm_mdp_driver = {
+       .probe = mdp_probe,
+       .driver = {.name = "msm_mdp"},
+};
+
+static int __init mdp_init(void)
+{
+       mdp_class = class_create(THIS_MODULE, "msm_mdp");
+       if (IS_ERR(mdp_class)) {
+               printk(KERN_ERR "Error creating mdp class\n");
+               return PTR_ERR(mdp_class);
+       }
+       return platform_driver_register(&msm_mdp_driver);
+}
+
+subsys_initcall(mdp_init);
diff --git a/drivers/video/msm/mdp_csc_table.h b/drivers/video/msm/mdp_csc_table.h
new file mode 100644 (file)
index 0000000..d1cde30
--- /dev/null
@@ -0,0 +1,582 @@
+/* drivers/video/msm_fb/mdp_csc_table.h
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+static struct {
+       uint32_t reg;
+       uint32_t val;
+} csc_table[] = {
+       { 0x40400, 0x83 },
+       { 0x40404, 0x102 },
+       { 0x40408, 0x32 },
+       { 0x4040c, 0xffffffb5 },
+       { 0x40410, 0xffffff6c },
+       { 0x40414, 0xe1 },
+       { 0x40418, 0xe1 },
+       { 0x4041c, 0xffffff45 },
+       { 0x40420, 0xffffffdc },
+       { 0x40440, 0x254 },
+       { 0x40444, 0x0 },
+       { 0x40448, 0x331 },
+       { 0x4044c, 0x254 },
+       { 0x40450, 0xffffff38 },
+       { 0x40454, 0xfffffe61 },
+       { 0x40458, 0x254 },
+       { 0x4045c, 0x409 },
+       { 0x40460, 0x0 },
+       { 0x40480, 0x5d },
+       { 0x40484, 0x13a },
+       { 0x40488, 0x20 },
+       { 0x4048c, 0xffffffcd },
+       { 0x40490, 0xffffff54 },
+       { 0x40494, 0xe1 },
+       { 0x40498, 0xe1 },
+       { 0x4049c, 0xffffff35 },
+       { 0x404a0, 0xffffffec },
+       { 0x404c0, 0x254 },
+       { 0x404c4, 0x0 },
+       { 0x404c8, 0x396 },
+       { 0x404cc, 0x254 },
+       { 0x404d0, 0xffffff94 },
+       { 0x404d4, 0xfffffef0 },
+       { 0x404d8, 0x254 },
+       { 0x404dc, 0x43a },
+       { 0x404e0, 0x0 },
+       { 0x40500, 0x10 },
+       { 0x40504, 0x80 },
+       { 0x40508, 0x80 },
+       { 0x40540, 0x10 },
+       { 0x40544, 0x80 },
+       { 0x40548, 0x80 },
+       { 0x40580, 0x10 },
+       { 0x40584, 0xeb },
+       { 0x40588, 0x10 },
+       { 0x4058c, 0xf0 },
+       { 0x405c0, 0x10 },
+       { 0x405c4, 0xeb },
+       { 0x405c8, 0x10 },
+       { 0x405cc, 0xf0 },
+       { 0x40800, 0x0 },
+       { 0x40804, 0x151515 },
+       { 0x40808, 0x1d1d1d },
+       { 0x4080c, 0x232323 },
+       { 0x40810, 0x272727 },
+       { 0x40814, 0x2b2b2b },
+       { 0x40818, 0x2f2f2f },
+       { 0x4081c, 0x333333 },
+       { 0x40820, 0x363636 },
+       { 0x40824, 0x393939 },
+       { 0x40828, 0x3b3b3b },
+       { 0x4082c, 0x3e3e3e },
+       { 0x40830, 0x404040 },
+       { 0x40834, 0x434343 },
+       { 0x40838, 0x454545 },
+       { 0x4083c, 0x474747 },
+       { 0x40840, 0x494949 },
+       { 0x40844, 0x4b4b4b },
+       { 0x40848, 0x4d4d4d },
+       { 0x4084c, 0x4f4f4f },
+       { 0x40850, 0x515151 },
+       { 0x40854, 0x535353 },
+       { 0x40858, 0x555555 },
+       { 0x4085c, 0x565656 },
+       { 0x40860, 0x585858 },
+       { 0x40864, 0x5a5a5a },
+       { 0x40868, 0x5b5b5b },
+       { 0x4086c, 0x5d5d5d },
+       { 0x40870, 0x5e5e5e },
+       { 0x40874, 0x606060 },
+       { 0x40878, 0x616161 },
+       { 0x4087c, 0x636363 },
+       { 0x40880, 0x646464 },
+       { 0x40884, 0x666666 },
+       { 0x40888, 0x676767 },
+       { 0x4088c, 0x686868 },
+       { 0x40890, 0x6a6a6a },
+       { 0x40894, 0x6b6b6b },
+       { 0x40898, 0x6c6c6c },
+       { 0x4089c, 0x6e6e6e },
+       { 0x408a0, 0x6f6f6f },
+       { 0x408a4, 0x707070 },
+       { 0x408a8, 0x717171 },
+       { 0x408ac, 0x727272 },
+       { 0x408b0, 0x747474 },
+       { 0x408b4, 0x757575 },
+       { 0x408b8, 0x767676 },
+       { 0x408bc, 0x777777 },
+       { 0x408c0, 0x787878 },
+       { 0x408c4, 0x797979 },
+       { 0x408c8, 0x7a7a7a },
+       { 0x408cc, 0x7c7c7c },
+       { 0x408d0, 0x7d7d7d },
+       { 0x408d4, 0x7e7e7e },
+       { 0x408d8, 0x7f7f7f },
+       { 0x408dc, 0x808080 },
+       { 0x408e0, 0x818181 },
+       { 0x408e4, 0x828282 },
+       { 0x408e8, 0x838383 },
+       { 0x408ec, 0x848484 },
+       { 0x408f0, 0x858585 },
+       { 0x408f4, 0x868686 },
+       { 0x408f8, 0x878787 },
+       { 0x408fc, 0x888888 },
+       { 0x40900, 0x898989 },
+       { 0x40904, 0x8a8a8a },
+       { 0x40908, 0x8b8b8b },
+       { 0x4090c, 0x8c8c8c },
+       { 0x40910, 0x8d8d8d },
+       { 0x40914, 0x8e8e8e },
+       { 0x40918, 0x8f8f8f },
+       { 0x4091c, 0x8f8f8f },
+       { 0x40920, 0x909090 },
+       { 0x40924, 0x919191 },
+       { 0x40928, 0x929292 },
+       { 0x4092c, 0x939393 },
+       { 0x40930, 0x949494 },
+       { 0x40934, 0x959595 },
+       { 0x40938, 0x969696 },
+       { 0x4093c, 0x969696 },
+       { 0x40940, 0x979797 },
+       { 0x40944, 0x989898 },
+       { 0x40948, 0x999999 },
+       { 0x4094c, 0x9a9a9a },
+       { 0x40950, 0x9b9b9b },
+       { 0x40954, 0x9c9c9c },
+       { 0x40958, 0x9c9c9c },
+       { 0x4095c, 0x9d9d9d },
+       { 0x40960, 0x9e9e9e },
+       { 0x40964, 0x9f9f9f },
+       { 0x40968, 0xa0a0a0 },
+       { 0x4096c, 0xa0a0a0 },
+       { 0x40970, 0xa1a1a1 },
+       { 0x40974, 0xa2a2a2 },
+       { 0x40978, 0xa3a3a3 },
+       { 0x4097c, 0xa4a4a4 },
+       { 0x40980, 0xa4a4a4 },
+       { 0x40984, 0xa5a5a5 },
+       { 0x40988, 0xa6a6a6 },
+       { 0x4098c, 0xa7a7a7 },
+       { 0x40990, 0xa7a7a7 },
+       { 0x40994, 0xa8a8a8 },
+       { 0x40998, 0xa9a9a9 },
+       { 0x4099c, 0xaaaaaa },
+       { 0x409a0, 0xaaaaaa },
+       { 0x409a4, 0xababab },
+       { 0x409a8, 0xacacac },
+       { 0x409ac, 0xadadad },
+       { 0x409b0, 0xadadad },
+       { 0x409b4, 0xaeaeae },
+       { 0x409b8, 0xafafaf },
+       { 0x409bc, 0xafafaf },
+       { 0x409c0, 0xb0b0b0 },
+       { 0x409c4, 0xb1b1b1 },
+       { 0x409c8, 0xb2b2b2 },
+       { 0x409cc, 0xb2b2b2 },
+       { 0x409d0, 0xb3b3b3 },
+       { 0x409d4, 0xb4b4b4 },
+       { 0x409d8, 0xb4b4b4 },
+       { 0x409dc, 0xb5b5b5 },
+       { 0x409e0, 0xb6b6b6 },
+       { 0x409e4, 0xb6b6b6 },
+       { 0x409e8, 0xb7b7b7 },
+       { 0x409ec, 0xb8b8b8 },
+       { 0x409f0, 0xb8b8b8 },
+       { 0x409f4, 0xb9b9b9 },
+       { 0x409f8, 0xbababa },
+       { 0x409fc, 0xbababa },
+       { 0x40a00, 0xbbbbbb },
+       { 0x40a04, 0xbcbcbc },
+       { 0x40a08, 0xbcbcbc },
+       { 0x40a0c, 0xbdbdbd },
+       { 0x40a10, 0xbebebe },
+       { 0x40a14, 0xbebebe },
+       { 0x40a18, 0xbfbfbf },
+       { 0x40a1c, 0xc0c0c0 },
+       { 0x40a20, 0xc0c0c0 },
+       { 0x40a24, 0xc1c1c1 },
+       { 0x40a28, 0xc1c1c1 },
+       { 0x40a2c, 0xc2c2c2 },
+       { 0x40a30, 0xc3c3c3 },
+       { 0x40a34, 0xc3c3c3 },
+       { 0x40a38, 0xc4c4c4 },
+       { 0x40a3c, 0xc5c5c5 },
+       { 0x40a40, 0xc5c5c5 },
+       { 0x40a44, 0xc6c6c6 },
+       { 0x40a48, 0xc6c6c6 },
+       { 0x40a4c, 0xc7c7c7 },
+       { 0x40a50, 0xc8c8c8 },
+       { 0x40a54, 0xc8c8c8 },
+       { 0x40a58, 0xc9c9c9 },
+       { 0x40a5c, 0xc9c9c9 },
+       { 0x40a60, 0xcacaca },
+       { 0x40a64, 0xcbcbcb },
+       { 0x40a68, 0xcbcbcb },
+       { 0x40a6c, 0xcccccc },
+       { 0x40a70, 0xcccccc },
+       { 0x40a74, 0xcdcdcd },
+       { 0x40a78, 0xcecece },
+       { 0x40a7c, 0xcecece },
+       { 0x40a80, 0xcfcfcf },
+       { 0x40a84, 0xcfcfcf },
+       { 0x40a88, 0xd0d0d0 },
+       { 0x40a8c, 0xd0d0d0 },
+       { 0x40a90, 0xd1d1d1 },
+       { 0x40a94, 0xd2d2d2 },
+       { 0x40a98, 0xd2d2d2 },
+       { 0x40a9c, 0xd3d3d3 },
+       { 0x40aa0, 0xd3d3d3 },
+       { 0x40aa4, 0xd4d4d4 },
+       { 0x40aa8, 0xd4d4d4 },
+       { 0x40aac, 0xd5d5d5 },
+       { 0x40ab0, 0xd6d6d6 },
+       { 0x40ab4, 0xd6d6d6 },
+       { 0x40ab8, 0xd7d7d7 },
+       { 0x40abc, 0xd7d7d7 },
+       { 0x40ac0, 0xd8d8d8 },
+       { 0x40ac4, 0xd8d8d8 },
+       { 0x40ac8, 0xd9d9d9 },
+       { 0x40acc, 0xd9d9d9 },
+       { 0x40ad0, 0xdadada },
+       { 0x40ad4, 0xdbdbdb },
+       { 0x40ad8, 0xdbdbdb },
+       { 0x40adc, 0xdcdcdc },
+       { 0x40ae0, 0xdcdcdc },
+       { 0x40ae4, 0xdddddd },
+       { 0x40ae8, 0xdddddd },
+       { 0x40aec, 0xdedede },
+       { 0x40af0, 0xdedede },
+       { 0x40af4, 0xdfdfdf },
+       { 0x40af8, 0xdfdfdf },
+       { 0x40afc, 0xe0e0e0 },
+       { 0x40b00, 0xe0e0e0 },
+       { 0x40b04, 0xe1e1e1 },
+       { 0x40b08, 0xe1e1e1 },
+       { 0x40b0c, 0xe2e2e2 },
+       { 0x40b10, 0xe3e3e3 },
+       { 0x40b14, 0xe3e3e3 },
+       { 0x40b18, 0xe4e4e4 },
+       { 0x40b1c, 0xe4e4e4 },
+       { 0x40b20, 0xe5e5e5 },
+       { 0x40b24, 0xe5e5e5 },
+       { 0x40b28, 0xe6e6e6 },
+       { 0x40b2c, 0xe6e6e6 },
+       { 0x40b30, 0xe7e7e7 },
+       { 0x40b34, 0xe7e7e7 },
+       { 0x40b38, 0xe8e8e8 },
+       { 0x40b3c, 0xe8e8e8 },
+       { 0x40b40, 0xe9e9e9 },
+       { 0x40b44, 0xe9e9e9 },
+       { 0x40b48, 0xeaeaea },
+       { 0x40b4c, 0xeaeaea },
+       { 0x40b50, 0xebebeb },
+       { 0x40b54, 0xebebeb },
+       { 0x40b58, 0xececec },
+       { 0x40b5c, 0xececec },
+       { 0x40b60, 0xededed },
+       { 0x40b64, 0xededed },
+       { 0x40b68, 0xeeeeee },
+       { 0x40b6c, 0xeeeeee },
+       { 0x40b70, 0xefefef },
+       { 0x40b74, 0xefefef },
+       { 0x40b78, 0xf0f0f0 },
+       { 0x40b7c, 0xf0f0f0 },
+       { 0x40b80, 0xf1f1f1 },
+       { 0x40b84, 0xf1f1f1 },
+       { 0x40b88, 0xf2f2f2 },
+       { 0x40b8c, 0xf2f2f2 },
+       { 0x40b90, 0xf2f2f2 },
+       { 0x40b94, 0xf3f3f3 },
+       { 0x40b98, 0xf3f3f3 },
+       { 0x40b9c, 0xf4f4f4 },
+       { 0x40ba0, 0xf4f4f4 },
+       { 0x40ba4, 0xf5f5f5 },
+       { 0x40ba8, 0xf5f5f5 },
+       { 0x40bac, 0xf6f6f6 },
+       { 0x40bb0, 0xf6f6f6 },
+       { 0x40bb4, 0xf7f7f7 },
+       { 0x40bb8, 0xf7f7f7 },
+       { 0x40bbc, 0xf8f8f8 },
+       { 0x40bc0, 0xf8f8f8 },
+       { 0x40bc4, 0xf9f9f9 },
+       { 0x40bc8, 0xf9f9f9 },
+       { 0x40bcc, 0xfafafa },
+       { 0x40bd0, 0xfafafa },
+       { 0x40bd4, 0xfafafa },
+       { 0x40bd8, 0xfbfbfb },
+       { 0x40bdc, 0xfbfbfb },
+       { 0x40be0, 0xfcfcfc },
+       { 0x40be4, 0xfcfcfc },
+       { 0x40be8, 0xfdfdfd },
+       { 0x40bec, 0xfdfdfd },
+       { 0x40bf0, 0xfefefe },
+       { 0x40bf4, 0xfefefe },
+       { 0x40bf8, 0xffffff },
+       { 0x40bfc, 0xffffff },
+       { 0x40c00, 0x0 },
+       { 0x40c04, 0x0 },
+       { 0x40c08, 0x0 },
+       { 0x40c0c, 0x0 },
+       { 0x40c10, 0x0 },
+       { 0x40c14, 0x0 },
+       { 0x40c18, 0x0 },
+       { 0x40c1c, 0x0 },
+       { 0x40c20, 0x0 },
+       { 0x40c24, 0x0 },
+       { 0x40c28, 0x0 },
+       { 0x40c2c, 0x0 },
+       { 0x40c30, 0x0 },
+       { 0x40c34, 0x0 },
+       { 0x40c38, 0x0 },
+       { 0x40c3c, 0x0 },
+       { 0x40c40, 0x10101 },
+       { 0x40c44, 0x10101 },
+       { 0x40c48, 0x10101 },
+       { 0x40c4c, 0x10101 },
+       { 0x40c50, 0x10101 },
+       { 0x40c54, 0x10101 },
+       { 0x40c58, 0x10101 },
+       { 0x40c5c, 0x10101 },
+       { 0x40c60, 0x10101 },
+       { 0x40c64, 0x10101 },
+       { 0x40c68, 0x20202 },
+       { 0x40c6c, 0x20202 },
+       { 0x40c70, 0x20202 },
+       { 0x40c74, 0x20202 },
+       { 0x40c78, 0x20202 },
+       { 0x40c7c, 0x20202 },
+       { 0x40c80, 0x30303 },
+       { 0x40c84, 0x30303 },
+       { 0x40c88, 0x30303 },
+       { 0x40c8c, 0x30303 },
+       { 0x40c90, 0x30303 },
+       { 0x40c94, 0x40404 },
+       { 0x40c98, 0x40404 },
+       { 0x40c9c, 0x40404 },
+       { 0x40ca0, 0x40404 },
+       { 0x40ca4, 0x40404 },
+       { 0x40ca8, 0x50505 },
+       { 0x40cac, 0x50505 },
+       { 0x40cb0, 0x50505 },
+       { 0x40cb4, 0x50505 },
+       { 0x40cb8, 0x60606 },
+       { 0x40cbc, 0x60606 },
+       { 0x40cc0, 0x60606 },
+       { 0x40cc4, 0x70707 },
+       { 0x40cc8, 0x70707 },
+       { 0x40ccc, 0x70707 },
+       { 0x40cd0, 0x70707 },
+       { 0x40cd4, 0x80808 },
+       { 0x40cd8, 0x80808 },
+       { 0x40cdc, 0x80808 },
+       { 0x40ce0, 0x90909 },
+       { 0x40ce4, 0x90909 },
+       { 0x40ce8, 0xa0a0a },
+       { 0x40cec, 0xa0a0a },
+       { 0x40cf0, 0xa0a0a },
+       { 0x40cf4, 0xb0b0b },
+       { 0x40cf8, 0xb0b0b },
+       { 0x40cfc, 0xb0b0b },
+       { 0x40d00, 0xc0c0c },
+       { 0x40d04, 0xc0c0c },
+       { 0x40d08, 0xd0d0d },
+       { 0x40d0c, 0xd0d0d },
+       { 0x40d10, 0xe0e0e },
+       { 0x40d14, 0xe0e0e },
+       { 0x40d18, 0xe0e0e },
+       { 0x40d1c, 0xf0f0f },
+       { 0x40d20, 0xf0f0f },
+       { 0x40d24, 0x101010 },
+       { 0x40d28, 0x101010 },
+       { 0x40d2c, 0x111111 },
+       { 0x40d30, 0x111111 },
+       { 0x40d34, 0x121212 },
+       { 0x40d38, 0x121212 },
+       { 0x40d3c, 0x131313 },
+       { 0x40d40, 0x131313 },
+       { 0x40d44, 0x141414 },
+       { 0x40d48, 0x151515 },
+       { 0x40d4c, 0x151515 },
+       { 0x40d50, 0x161616 },
+       { 0x40d54, 0x161616 },
+       { 0x40d58, 0x171717 },
+       { 0x40d5c, 0x171717 },
+       { 0x40d60, 0x181818 },
+       { 0x40d64, 0x191919 },
+       { 0x40d68, 0x191919 },
+       { 0x40d6c, 0x1a1a1a },
+       { 0x40d70, 0x1b1b1b },
+       { 0x40d74, 0x1b1b1b },
+       { 0x40d78, 0x1c1c1c },
+       { 0x40d7c, 0x1c1c1c },
+       { 0x40d80, 0x1d1d1d },
+       { 0x40d84, 0x1e1e1e },
+       { 0x40d88, 0x1f1f1f },
+       { 0x40d8c, 0x1f1f1f },
+       { 0x40d90, 0x202020 },
+       { 0x40d94, 0x212121 },
+       { 0x40d98, 0x212121 },
+       { 0x40d9c, 0x222222 },
+       { 0x40da0, 0x232323 },
+       { 0x40da4, 0x242424 },
+       { 0x40da8, 0x242424 },
+       { 0x40dac, 0x252525 },
+       { 0x40db0, 0x262626 },
+       { 0x40db4, 0x272727 },
+       { 0x40db8, 0x272727 },
+       { 0x40dbc, 0x282828 },
+       { 0x40dc0, 0x292929 },
+       { 0x40dc4, 0x2a2a2a },
+       { 0x40dc8, 0x2b2b2b },
+       { 0x40dcc, 0x2c2c2c },
+       { 0x40dd0, 0x2c2c2c },
+       { 0x40dd4, 0x2d2d2d },
+       { 0x40dd8, 0x2e2e2e },
+       { 0x40ddc, 0x2f2f2f },
+       { 0x40de0, 0x303030 },
+       { 0x40de4, 0x313131 },
+       { 0x40de8, 0x323232 },
+       { 0x40dec, 0x333333 },
+       { 0x40df0, 0x333333 },
+       { 0x40df4, 0x343434 },
+       { 0x40df8, 0x353535 },
+       { 0x40dfc, 0x363636 },
+       { 0x40e00, 0x373737 },
+       { 0x40e04, 0x383838 },
+       { 0x40e08, 0x393939 },
+       { 0x40e0c, 0x3a3a3a },
+       { 0x40e10, 0x3b3b3b },
+       { 0x40e14, 0x3c3c3c },
+       { 0x40e18, 0x3d3d3d },
+       { 0x40e1c, 0x3e3e3e },
+       { 0x40e20, 0x3f3f3f },
+       { 0x40e24, 0x404040 },
+       { 0x40e28, 0x414141 },
+       { 0x40e2c, 0x424242 },
+       { 0x40e30, 0x434343 },
+       { 0x40e34, 0x444444 },
+       { 0x40e38, 0x464646 },
+       { 0x40e3c, 0x474747 },
+       { 0x40e40, 0x484848 },
+       { 0x40e44, 0x494949 },
+       { 0x40e48, 0x4a4a4a },
+       { 0x40e4c, 0x4b4b4b },
+       { 0x40e50, 0x4c4c4c },
+       { 0x40e54, 0x4d4d4d },
+       { 0x40e58, 0x4f4f4f },
+       { 0x40e5c, 0x505050 },
+       { 0x40e60, 0x515151 },
+       { 0x40e64, 0x525252 },
+       { 0x40e68, 0x535353 },
+       { 0x40e6c, 0x545454 },
+       { 0x40e70, 0x565656 },
+       { 0x40e74, 0x575757 },
+       { 0x40e78, 0x585858 },
+       { 0x40e7c, 0x595959 },
+       { 0x40e80, 0x5b5b5b },
+       { 0x40e84, 0x5c5c5c },
+       { 0x40e88, 0x5d5d5d },
+       { 0x40e8c, 0x5e5e5e },
+       { 0x40e90, 0x606060 },
+       { 0x40e94, 0x616161 },
+       { 0x40e98, 0x626262 },
+       { 0x40e9c, 0x646464 },
+       { 0x40ea0, 0x656565 },
+       { 0x40ea4, 0x666666 },
+       { 0x40ea8, 0x686868 },
+       { 0x40eac, 0x696969 },
+       { 0x40eb0, 0x6a6a6a },
+       { 0x40eb4, 0x6c6c6c },
+       { 0x40eb8, 0x6d6d6d },
+       { 0x40ebc, 0x6f6f6f },
+       { 0x40ec0, 0x707070 },
+       { 0x40ec4, 0x717171 },
+       { 0x40ec8, 0x737373 },
+       { 0x40ecc, 0x747474 },
+       { 0x40ed0, 0x767676 },
+       { 0x40ed4, 0x777777 },
+       { 0x40ed8, 0x797979 },
+       { 0x40edc, 0x7a7a7a },
+       { 0x40ee0, 0x7c7c7c },
+       { 0x40ee4, 0x7d7d7d },
+       { 0x40ee8, 0x7f7f7f },
+       { 0x40eec, 0x808080 },
+       { 0x40ef0, 0x828282 },
+       { 0x40ef4, 0x838383 },
+       { 0x40ef8, 0x858585 },
+       { 0x40efc, 0x868686 },
+       { 0x40f00, 0x888888 },
+       { 0x40f04, 0x898989 },
+       { 0x40f08, 0x8b8b8b },
+       { 0x40f0c, 0x8d8d8d },
+       { 0x40f10, 0x8e8e8e },
+       { 0x40f14, 0x909090 },
+       { 0x40f18, 0x919191 },
+       { 0x40f1c, 0x939393 },
+       { 0x40f20, 0x959595 },
+       { 0x40f24, 0x969696 },
+       { 0x40f28, 0x989898 },
+       { 0x40f2c, 0x9a9a9a },
+       { 0x40f30, 0x9b9b9b },
+       { 0x40f34, 0x9d9d9d },
+       { 0x40f38, 0x9f9f9f },
+       { 0x40f3c, 0xa1a1a1 },
+       { 0x40f40, 0xa2a2a2 },
+       { 0x40f44, 0xa4a4a4 },
+       { 0x40f48, 0xa6a6a6 },
+       { 0x40f4c, 0xa7a7a7 },
+       { 0x40f50, 0xa9a9a9 },
+       { 0x40f54, 0xababab },
+       { 0x40f58, 0xadadad },
+       { 0x40f5c, 0xafafaf },
+       { 0x40f60, 0xb0b0b0 },
+       { 0x40f64, 0xb2b2b2 },
+       { 0x40f68, 0xb4b4b4 },
+       { 0x40f6c, 0xb6b6b6 },
+       { 0x40f70, 0xb8b8b8 },
+       { 0x40f74, 0xbababa },
+       { 0x40f78, 0xbbbbbb },
+       { 0x40f7c, 0xbdbdbd },
+       { 0x40f80, 0xbfbfbf },
+       { 0x40f84, 0xc1c1c1 },
+       { 0x40f88, 0xc3c3c3 },
+       { 0x40f8c, 0xc5c5c5 },
+       { 0x40f90, 0xc7c7c7 },
+       { 0x40f94, 0xc9c9c9 },
+       { 0x40f98, 0xcbcbcb },
+       { 0x40f9c, 0xcdcdcd },
+       { 0x40fa0, 0xcfcfcf },
+       { 0x40fa4, 0xd1d1d1 },
+       { 0x40fa8, 0xd3d3d3 },
+       { 0x40fac, 0xd5d5d5 },
+       { 0x40fb0, 0xd7d7d7 },
+       { 0x40fb4, 0xd9d9d9 },
+       { 0x40fb8, 0xdbdbdb },
+       { 0x40fbc, 0xdddddd },
+       { 0x40fc0, 0xdfdfdf },
+       { 0x40fc4, 0xe1e1e1 },
+       { 0x40fc8, 0xe3e3e3 },
+       { 0x40fcc, 0xe5e5e5 },
+       { 0x40fd0, 0xe7e7e7 },
+       { 0x40fd4, 0xe9e9e9 },
+       { 0x40fd8, 0xebebeb },
+       { 0x40fdc, 0xeeeeee },
+       { 0x40fe0, 0xf0f0f0 },
+       { 0x40fe4, 0xf2f2f2 },
+       { 0x40fe8, 0xf4f4f4 },
+       { 0x40fec, 0xf6f6f6 },
+       { 0x40ff0, 0xf8f8f8 },
+       { 0x40ff4, 0xfbfbfb },
+       { 0x40ff8, 0xfdfdfd },
+       { 0x40ffc, 0xffffff },
+};
diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h
new file mode 100644 (file)
index 0000000..4e3deb4
--- /dev/null
@@ -0,0 +1,621 @@
+/* drivers/video/msm_fb/mdp_hw.h
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MDP_HW_H_
+#define _MDP_HW_H_
+
+#include <mach/msm_iomap.h>
+#include <mach/msm_fb.h>
+
+struct mdp_info {
+       struct mdp_device mdp_dev;
+       char * __iomem base;
+       int irq;
+};
+struct mdp_blit_req;
+struct mdp_device;
+int mdp_ppp_blit(const struct mdp_info *mdp, struct mdp_blit_req *req,
+                struct file *src_file, unsigned long src_start,
+                unsigned long src_len, struct file *dst_file,
+                unsigned long dst_start, unsigned long dst_len);
+#define mdp_writel(mdp, value, offset) writel(value, mdp->base + offset)
+#define mdp_readl(mdp, offset) readl(mdp->base + offset)
+
+#define MDP_SYNC_CONFIG_0                (0x00000)
+#define MDP_SYNC_CONFIG_1                (0x00004)
+#define MDP_SYNC_CONFIG_2                (0x00008)
+#define MDP_SYNC_STATUS_0                (0x0000c)
+#define MDP_SYNC_STATUS_1                (0x00010)
+#define MDP_SYNC_STATUS_2                (0x00014)
+#define MDP_SYNC_THRESH_0                (0x00018)
+#define MDP_SYNC_THRESH_1                (0x0001c)
+#define MDP_INTR_ENABLE                  (0x00020)
+#define MDP_INTR_STATUS                  (0x00024)
+#define MDP_INTR_CLEAR                   (0x00028)
+#define MDP_DISPLAY0_START               (0x00030)
+#define MDP_DISPLAY1_START               (0x00034)
+#define MDP_DISPLAY_STATUS               (0x00038)
+#define MDP_EBI2_LCD0                    (0x0003c)
+#define MDP_EBI2_LCD1                    (0x00040)
+#define MDP_DISPLAY0_ADDR                (0x00054)
+#define MDP_DISPLAY1_ADDR                (0x00058)
+#define MDP_EBI2_PORTMAP_MODE            (0x0005c)
+#define MDP_MODE                         (0x00060)
+#define MDP_TV_OUT_STATUS                (0x00064)
+#define MDP_HW_VERSION                   (0x00070)
+#define MDP_SW_RESET                     (0x00074)
+#define MDP_AXI_ERROR_MASTER_STOP        (0x00078)
+#define MDP_SEL_CLK_OR_HCLK_TEST_BUS     (0x0007c)
+#define MDP_PRIMARY_VSYNC_OUT_CTRL       (0x00080)
+#define MDP_SECONDARY_VSYNC_OUT_CTRL     (0x00084)
+#define MDP_EXTERNAL_VSYNC_OUT_CTRL      (0x00088)
+#define MDP_VSYNC_CTRL                   (0x0008c)
+#define MDP_CGC_EN                       (0x00100)
+#define MDP_CMD_STATUS                   (0x10008)
+#define MDP_PROFILE_EN                   (0x10010)
+#define MDP_PROFILE_COUNT                (0x10014)
+#define MDP_DMA_START                    (0x10044)
+#define MDP_FULL_BYPASS_WORD0            (0x10100)
+#define MDP_FULL_BYPASS_WORD1            (0x10104)
+#define MDP_COMMAND_CONFIG               (0x10104)
+#define MDP_FULL_BYPASS_WORD2            (0x10108)
+#define MDP_FULL_BYPASS_WORD3            (0x1010c)
+#define MDP_FULL_BYPASS_WORD4            (0x10110)
+#define MDP_FULL_BYPASS_WORD6            (0x10118)
+#define MDP_FULL_BYPASS_WORD7            (0x1011c)
+#define MDP_FULL_BYPASS_WORD8            (0x10120)
+#define MDP_FULL_BYPASS_WORD9            (0x10124)
+#define MDP_PPP_SOURCE_CONFIG            (0x10124)
+#define MDP_FULL_BYPASS_WORD10           (0x10128)
+#define MDP_FULL_BYPASS_WORD11           (0x1012c)
+#define MDP_FULL_BYPASS_WORD12           (0x10130)
+#define MDP_FULL_BYPASS_WORD13           (0x10134)
+#define MDP_FULL_BYPASS_WORD14           (0x10138)
+#define MDP_PPP_OPERATION_CONFIG         (0x10138)
+#define MDP_FULL_BYPASS_WORD15           (0x1013c)
+#define MDP_FULL_BYPASS_WORD16           (0x10140)
+#define MDP_FULL_BYPASS_WORD17           (0x10144)
+#define MDP_FULL_BYPASS_WORD18           (0x10148)
+#define MDP_FULL_BYPASS_WORD19           (0x1014c)
+#define MDP_FULL_BYPASS_WORD20           (0x10150)
+#define MDP_PPP_DESTINATION_CONFIG       (0x10150)
+#define MDP_FULL_BYPASS_WORD21           (0x10154)
+#define MDP_FULL_BYPASS_WORD22           (0x10158)
+#define MDP_FULL_BYPASS_WORD23           (0x1015c)
+#define MDP_FULL_BYPASS_WORD24           (0x10160)
+#define MDP_FULL_BYPASS_WORD25           (0x10164)
+#define MDP_FULL_BYPASS_WORD26           (0x10168)
+#define MDP_FULL_BYPASS_WORD27           (0x1016c)
+#define MDP_FULL_BYPASS_WORD29           (0x10174)
+#define MDP_FULL_BYPASS_WORD30           (0x10178)
+#define MDP_FULL_BYPASS_WORD31           (0x1017c)
+#define MDP_FULL_BYPASS_WORD32           (0x10180)
+#define MDP_DMA_CONFIG                   (0x10180)
+#define MDP_FULL_BYPASS_WORD33           (0x10184)
+#define MDP_FULL_BYPASS_WORD34           (0x10188)
+#define MDP_FULL_BYPASS_WORD35           (0x1018c)
+#define MDP_FULL_BYPASS_WORD37           (0x10194)
+#define MDP_FULL_BYPASS_WORD39           (0x1019c)
+#define MDP_FULL_BYPASS_WORD40           (0x101a0)
+#define MDP_FULL_BYPASS_WORD41           (0x101a4)
+#define MDP_FULL_BYPASS_WORD43           (0x101ac)
+#define MDP_FULL_BYPASS_WORD46           (0x101b8)
+#define MDP_FULL_BYPASS_WORD47           (0x101bc)
+#define MDP_FULL_BYPASS_WORD48           (0x101c0)
+#define MDP_FULL_BYPASS_WORD49           (0x101c4)
+#define MDP_FULL_BYPASS_WORD50           (0x101c8)
+#define MDP_FULL_BYPASS_WORD51           (0x101cc)
+#define MDP_FULL_BYPASS_WORD52           (0x101d0)
+#define MDP_FULL_BYPASS_WORD53           (0x101d4)
+#define MDP_FULL_BYPASS_WORD54           (0x101d8)
+#define MDP_FULL_BYPASS_WORD55           (0x101dc)
+#define MDP_FULL_BYPASS_WORD56           (0x101e0)
+#define MDP_FULL_BYPASS_WORD57           (0x101e4)
+#define MDP_FULL_BYPASS_WORD58           (0x101e8)
+#define MDP_FULL_BYPASS_WORD59           (0x101ec)
+#define MDP_FULL_BYPASS_WORD60           (0x101f0)
+#define MDP_VSYNC_THRESHOLD              (0x101f0)
+#define MDP_FULL_BYPASS_WORD61           (0x101f4)
+#define MDP_FULL_BYPASS_WORD62           (0x101f8)
+#define MDP_FULL_BYPASS_WORD63           (0x101fc)
+#define MDP_TFETCH_TEST_MODE             (0x20004)
+#define MDP_TFETCH_STATUS                (0x20008)
+#define MDP_TFETCH_TILE_COUNT            (0x20010)
+#define MDP_TFETCH_FETCH_COUNT           (0x20014)
+#define MDP_TFETCH_CONSTANT_COLOR        (0x20040)
+#define MDP_CSC_BYPASS                   (0x40004)
+#define MDP_SCALE_COEFF_LSB              (0x5fffc)
+#define MDP_TV_OUT_CTL                   (0xc0000)
+#define MDP_TV_OUT_FIR_COEFF             (0xc0004)
+#define MDP_TV_OUT_BUF_ADDR              (0xc0008)
+#define MDP_TV_OUT_CC_DATA               (0xc000c)
+#define MDP_TV_OUT_SOBEL                 (0xc0010)
+#define MDP_TV_OUT_Y_CLAMP               (0xc0018)
+#define MDP_TV_OUT_CB_CLAMP              (0xc001c)
+#define MDP_TV_OUT_CR_CLAMP              (0xc0020)
+#define MDP_TEST_MODE_CLK                (0xd0000)
+#define MDP_TEST_MISR_RESET_CLK          (0xd0004)
+#define MDP_TEST_EXPORT_MISR_CLK         (0xd0008)
+#define MDP_TEST_MISR_CURR_VAL_CLK       (0xd000c)
+#define MDP_TEST_MODE_HCLK               (0xd0100)
+#define MDP_TEST_MISR_RESET_HCLK         (0xd0104)
+#define MDP_TEST_EXPORT_MISR_HCLK        (0xd0108)
+#define MDP_TEST_MISR_CURR_VAL_HCLK      (0xd010c)
+#define MDP_TEST_MODE_DCLK               (0xd0200)
+#define MDP_TEST_MISR_RESET_DCLK         (0xd0204)
+#define MDP_TEST_EXPORT_MISR_DCLK        (0xd0208)
+#define MDP_TEST_MISR_CURR_VAL_DCLK      (0xd020c)
+#define MDP_TEST_CAPTURED_DCLK           (0xd0210)
+#define MDP_TEST_MISR_CAPT_VAL_DCLK      (0xd0214)
+#define MDP_LCDC_CTL                     (0xe0000)
+#define MDP_LCDC_HSYNC_CTL               (0xe0004)
+#define MDP_LCDC_VSYNC_CTL               (0xe0008)
+#define MDP_LCDC_ACTIVE_HCTL             (0xe000c)
+#define MDP_LCDC_ACTIVE_VCTL             (0xe0010)
+#define MDP_LCDC_BORDER_CLR              (0xe0014)
+#define MDP_LCDC_H_BLANK                 (0xe0018)
+#define MDP_LCDC_V_BLANK                 (0xe001c)
+#define MDP_LCDC_UNDERFLOW_CLR           (0xe0020)
+#define MDP_LCDC_HSYNC_SKEW              (0xe0024)
+#define MDP_LCDC_TEST_CTL                (0xe0028)
+#define MDP_LCDC_LINE_IRQ                (0xe002c)
+#define MDP_LCDC_CTL_POLARITY            (0xe0030)
+#define MDP_LCDC_DMA_CONFIG              (0xe1000)
+#define MDP_LCDC_DMA_SIZE                (0xe1004)
+#define MDP_LCDC_DMA_IBUF_ADDR           (0xe1008)
+#define MDP_LCDC_DMA_IBUF_Y_STRIDE       (0xe100c)
+
+
+#define MDP_DMA2_TERM 0x1
+#define MDP_DMA3_TERM 0x2
+#define MDP_PPP_TERM 0x3
+
+/* MDP_INTR_ENABLE */
+#define DL0_ROI_DONE           (1<<0)
+#define DL1_ROI_DONE           (1<<1)
+#define DL0_DMA2_TERM_DONE     (1<<2)
+#define DL1_DMA2_TERM_DONE     (1<<3)
+#define DL0_PPP_TERM_DONE      (1<<4)
+#define DL1_PPP_TERM_DONE      (1<<5)
+#define TV_OUT_DMA3_DONE       (1<<6)
+#define TV_ENC_UNDERRUN        (1<<7)
+#define DL0_FETCH_DONE         (1<<11)
+#define DL1_FETCH_DONE         (1<<12)
+
+#define MDP_PPP_BUSY_STATUS (DL0_ROI_DONE| \
+                          DL1_ROI_DONE| \
+                          DL0_PPP_TERM_DONE| \
+                          DL1_PPP_TERM_DONE)
+
+#define MDP_ANY_INTR_MASK (DL0_ROI_DONE| \
+                          DL1_ROI_DONE| \
+                          DL0_DMA2_TERM_DONE| \
+                          DL1_DMA2_TERM_DONE| \
+                          DL0_PPP_TERM_DONE| \
+                          DL1_PPP_TERM_DONE| \
+                          DL0_FETCH_DONE| \
+                          DL1_FETCH_DONE| \
+                          TV_ENC_UNDERRUN)
+
+#define MDP_TOP_LUMA       16
+#define MDP_TOP_CHROMA     0
+#define MDP_BOTTOM_LUMA    19
+#define MDP_BOTTOM_CHROMA  3
+#define MDP_LEFT_LUMA      22
+#define MDP_LEFT_CHROMA    6
+#define MDP_RIGHT_LUMA     25
+#define MDP_RIGHT_CHROMA   9
+
+#define CLR_G 0x0
+#define CLR_B 0x1
+#define CLR_R 0x2
+#define CLR_ALPHA 0x3
+
+#define CLR_Y  CLR_G
+#define CLR_CB CLR_B
+#define CLR_CR CLR_R
+
+/* from lsb to msb */
+#define MDP_GET_PACK_PATTERN(a, x, y, z, bit) \
+       (((a)<<(bit*3))|((x)<<(bit*2))|((y)<<bit)|(z))
+
+/* MDP_SYNC_CONFIG_0/1/2 */
+#define MDP_SYNCFG_HGT_LOC 22
+#define MDP_SYNCFG_VSYNC_EXT_EN (1<<21)
+#define MDP_SYNCFG_VSYNC_INT_EN (1<<20)
+
+/* MDP_SYNC_THRESH_0 */
+#define MDP_PRIM_BELOW_LOC 0
+#define MDP_PRIM_ABOVE_LOC 8
+
+/* MDP_{PRIMARY,SECONDARY,EXTERNAL}_VSYNC_OUT_CRL */
+#define VSYNC_PULSE_EN (1<<31)
+#define VSYNC_PULSE_INV (1<<30)
+
+/* MDP_VSYNC_CTRL */
+#define DISP0_VSYNC_MAP_VSYNC0 0
+#define DISP0_VSYNC_MAP_VSYNC1 (1<<0)
+#define DISP0_VSYNC_MAP_VSYNC2 ((1<<0)|(1<<1))
+
+#define DISP1_VSYNC_MAP_VSYNC0 0
+#define DISP1_VSYNC_MAP_VSYNC1 (1<<2)
+#define DISP1_VSYNC_MAP_VSYNC2 ((1<<2)|(1<<3))
+
+#define PRIMARY_LCD_SYNC_EN (1<<4)
+#define PRIMARY_LCD_SYNC_DISABLE 0
+
+#define SECONDARY_LCD_SYNC_EN (1<<5)
+#define SECONDARY_LCD_SYNC_DISABLE 0
+
+#define EXTERNAL_LCD_SYNC_EN (1<<6)
+#define EXTERNAL_LCD_SYNC_DISABLE 0
+
+/* MDP_VSYNC_THRESHOLD / MDP_FULL_BYPASS_WORD60 */
+#define VSYNC_THRESHOLD_ABOVE_LOC 0
+#define VSYNC_THRESHOLD_BELOW_LOC 16
+#define VSYNC_ANTI_TEAR_EN (1<<31)
+
+/* MDP_COMMAND_CONFIG / MDP_FULL_BYPASS_WORD1 */
+#define MDP_CMD_DBGBUS_EN (1<<0)
+
+/* MDP_PPP_SOURCE_CONFIG / MDP_FULL_BYPASS_WORD9&53 */
+#define PPP_SRC_C0G_8BIT ((1<<1)|(1<<0))
+#define PPP_SRC_C1B_8BIT ((1<<3)|(1<<2))
+#define PPP_SRC_C2R_8BIT ((1<<5)|(1<<4))
+#define PPP_SRC_C3A_8BIT ((1<<7)|(1<<6))
+
+#define PPP_SRC_C0G_6BIT (1<<1)
+#define PPP_SRC_C1B_6BIT (1<<3)
+#define PPP_SRC_C2R_6BIT (1<<5)
+
+#define PPP_SRC_C0G_5BIT (1<<0)
+#define PPP_SRC_C1B_5BIT (1<<2)
+#define PPP_SRC_C2R_5BIT (1<<4)
+
+#define PPP_SRC_C3ALPHA_EN (1<<8)
+
+#define PPP_SRC_BPP_1BYTES 0
+#define PPP_SRC_BPP_2BYTES (1<<9)
+#define PPP_SRC_BPP_3BYTES (1<<10)
+#define PPP_SRC_BPP_4BYTES ((1<<10)|(1<<9))
+
+#define PPP_SRC_BPP_ROI_ODD_X (1<<11)
+#define PPP_SRC_BPP_ROI_ODD_Y (1<<12)
+#define PPP_SRC_INTERLVD_2COMPONENTS (1<<13)
+#define PPP_SRC_INTERLVD_3COMPONENTS (1<<14)
+#define PPP_SRC_INTERLVD_4COMPONENTS ((1<<14)|(1<<13))
+
+
+/* RGB666 unpack format
+** TIGHT means R6+G6+B6 together
+** LOOSE means R6+2 +G6+2+ B6+2 (with MSB)
+**          or 2+R6 +2+G6 +2+B6 (with LSB)
+*/
+#define PPP_SRC_PACK_TIGHT (1<<17)
+#define PPP_SRC_PACK_LOOSE 0
+#define PPP_SRC_PACK_ALIGN_LSB 0
+#define PPP_SRC_PACK_ALIGN_MSB (1<<18)
+
+#define PPP_SRC_PLANE_INTERLVD 0
+#define PPP_SRC_PLANE_PSEUDOPLNR (1<<20)
+
+#define PPP_SRC_WMV9_MODE (1<<21)
+
+/* MDP_PPP_OPERATION_CONFIG / MDP_FULL_BYPASS_WORD14 */
+#define PPP_OP_SCALE_X_ON (1<<0)
+#define PPP_OP_SCALE_Y_ON (1<<1)
+
+#define PPP_OP_CONVERT_RGB2YCBCR 0
+#define PPP_OP_CONVERT_YCBCR2RGB (1<<2)
+#define PPP_OP_CONVERT_ON (1<<3)
+
+#define PPP_OP_CONVERT_MATRIX_PRIMARY 0
+#define PPP_OP_CONVERT_MATRIX_SECONDARY (1<<4)
+
+#define PPP_OP_LUT_C0_ON (1<<5)
+#define PPP_OP_LUT_C1_ON (1<<6)
+#define PPP_OP_LUT_C2_ON (1<<7)
+
+/* rotate or blend enable */
+#define PPP_OP_ROT_ON (1<<8)
+
+#define PPP_OP_ROT_90 (1<<9)
+#define PPP_OP_FLIP_LR (1<<10)
+#define PPP_OP_FLIP_UD (1<<11)
+
+#define PPP_OP_BLEND_ON (1<<12)
+
+#define PPP_OP_BLEND_SRCPIXEL_ALPHA 0
+#define PPP_OP_BLEND_DSTPIXEL_ALPHA (1<<13)
+#define PPP_OP_BLEND_CONSTANT_ALPHA (1<<14)
+#define PPP_OP_BLEND_SRCPIXEL_TRANSP ((1<<13)|(1<<14))
+
+#define PPP_OP_BLEND_ALPHA_BLEND_NORMAL 0
+#define PPP_OP_BLEND_ALPHA_BLEND_REVERSE (1<<15)
+
+#define PPP_OP_DITHER_EN (1<<16)
+
+#define PPP_OP_COLOR_SPACE_RGB 0
+#define PPP_OP_COLOR_SPACE_YCBCR (1<<17)
+
+#define PPP_OP_SRC_CHROMA_RGB 0
+#define PPP_OP_SRC_CHROMA_H2V1 (1<<18)
+#define PPP_OP_SRC_CHROMA_H1V2 (1<<19)
+#define PPP_OP_SRC_CHROMA_420 ((1<<18)|(1<<19))
+#define PPP_OP_SRC_CHROMA_COSITE 0
+#define PPP_OP_SRC_CHROMA_OFFSITE (1<<20)
+
+#define PPP_OP_DST_CHROMA_RGB 0
+#define PPP_OP_DST_CHROMA_H2V1 (1<<21)
+#define PPP_OP_DST_CHROMA_H1V2 (1<<22)
+#define PPP_OP_DST_CHROMA_420 ((1<<21)|(1<<22))
+#define PPP_OP_DST_CHROMA_COSITE 0
+#define PPP_OP_DST_CHROMA_OFFSITE (1<<23)
+
+#define PPP_BLEND_ALPHA_TRANSP (1<<24)
+
+#define PPP_OP_BG_CHROMA_RGB 0
+#define PPP_OP_BG_CHROMA_H2V1 (1<<25)
+#define PPP_OP_BG_CHROMA_H1V2 (1<<26)
+#define PPP_OP_BG_CHROMA_420 ((1<<25)|(1<<26))
+#define PPP_OP_BG_CHROMA_SITE_COSITE 0
+#define PPP_OP_BG_CHROMA_SITE_OFFSITE (1<<27)
+
+/* MDP_PPP_DESTINATION_CONFIG / MDP_FULL_BYPASS_WORD20 */
+#define PPP_DST_C0G_8BIT ((1<<0)|(1<<1))
+#define PPP_DST_C1B_8BIT ((1<<3)|(1<<2))
+#define PPP_DST_C2R_8BIT ((1<<5)|(1<<4))
+#define PPP_DST_C3A_8BIT ((1<<7)|(1<<6))
+
+#define PPP_DST_C0G_6BIT (1<<1)
+#define PPP_DST_C1B_6BIT (1<<3)
+#define PPP_DST_C2R_6BIT (1<<5)
+
+#define PPP_DST_C0G_5BIT (1<<0)
+#define PPP_DST_C1B_5BIT (1<<2)
+#define PPP_DST_C2R_5BIT (1<<4)
+
+#define PPP_DST_C3A_8BIT ((1<<7)|(1<<6))
+#define PPP_DST_C3ALPHA_EN (1<<8)
+
+#define PPP_DST_INTERLVD_2COMPONENTS (1<<9)
+#define PPP_DST_INTERLVD_3COMPONENTS (1<<10)
+#define PPP_DST_INTERLVD_4COMPONENTS ((1<<10)|(1<<9))
+#define PPP_DST_INTERLVD_6COMPONENTS ((1<<11)|(1<<9))
+
+#define PPP_DST_PACK_LOOSE 0
+#define PPP_DST_PACK_TIGHT (1<<13)
+#define PPP_DST_PACK_ALIGN_LSB 0
+#define PPP_DST_PACK_ALIGN_MSB (1<<14)
+
+#define PPP_DST_OUT_SEL_AXI 0
+#define PPP_DST_OUT_SEL_MDDI (1<<15)
+
+#define PPP_DST_BPP_2BYTES (1<<16)
+#define PPP_DST_BPP_3BYTES (1<<17)
+#define PPP_DST_BPP_4BYTES ((1<<17)|(1<<16))
+
+#define PPP_DST_PLANE_INTERLVD 0
+#define PPP_DST_PLANE_PLANAR (1<<18)
+#define PPP_DST_PLANE_PSEUDOPLNR (1<<19)
+
+#define PPP_DST_TO_TV (1<<20)
+
+#define PPP_DST_MDDI_PRIMARY 0
+#define PPP_DST_MDDI_SECONDARY (1<<21)
+#define PPP_DST_MDDI_EXTERNAL (1<<22)
+
+/* image configurations by image type */
+#define PPP_CFG_MDP_RGB_565(dir)       (PPP_##dir##_C2R_5BIT | \
+                                       PPP_##dir##_C0G_6BIT | \
+                                       PPP_##dir##_C1B_5BIT | \
+                                       PPP_##dir##_BPP_2BYTES | \
+                                       PPP_##dir##_INTERLVD_3COMPONENTS | \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB | \
+                                       PPP_##dir##_PLANE_INTERLVD)
+
+#define PPP_CFG_MDP_RGB_888(dir)       (PPP_##dir##_C2R_8BIT | \
+                                       PPP_##dir##_C0G_8BIT | \
+                                       PPP_##dir##_C1B_8BIT | \
+                                       PPP_##dir##_BPP_3BYTES | \
+                                       PPP_##dir##_INTERLVD_3COMPONENTS | \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB | \
+                                       PPP_##dir##_PLANE_INTERLVD)
+
+#define PPP_CFG_MDP_ARGB_8888(dir)     (PPP_##dir##_C2R_8BIT | \
+                                       PPP_##dir##_C0G_8BIT | \
+                                       PPP_##dir##_C1B_8BIT | \
+                                       PPP_##dir##_C3A_8BIT | \
+                                       PPP_##dir##_C3ALPHA_EN | \
+                                       PPP_##dir##_BPP_4BYTES | \
+                                       PPP_##dir##_INTERLVD_4COMPONENTS | \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB | \
+                                       PPP_##dir##_PLANE_INTERLVD)
+
+#define PPP_CFG_MDP_XRGB_8888(dir) PPP_CFG_MDP_ARGB_8888(dir)
+#define PPP_CFG_MDP_RGBA_8888(dir) PPP_CFG_MDP_ARGB_8888(dir)
+#define PPP_CFG_MDP_BGRA_8888(dir) PPP_CFG_MDP_ARGB_8888(dir)
+
+#define PPP_CFG_MDP_Y_CBCR_H2V2(dir)   (PPP_##dir##_C2R_8BIT | \
+                                       PPP_##dir##_C0G_8BIT | \
+                                       PPP_##dir##_C1B_8BIT | \
+                                       PPP_##dir##_C3A_8BIT | \
+                                       PPP_##dir##_BPP_2BYTES | \
+                                       PPP_##dir##_INTERLVD_2COMPONENTS | \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB | \
+                                       PPP_##dir##_PLANE_PSEUDOPLNR)
+
+#define PPP_CFG_MDP_Y_CRCB_H2V2(dir)   PPP_CFG_MDP_Y_CBCR_H2V2(dir)
+
+#define PPP_CFG_MDP_YCRYCB_H2V1(dir)   (PPP_##dir##_C2R_8BIT | \
+                                       PPP_##dir##_C0G_8BIT | \
+                                       PPP_##dir##_C1B_8BIT | \
+                                       PPP_##dir##_C3A_8BIT | \
+                                       PPP_##dir##_BPP_2BYTES | \
+                                       PPP_##dir##_INTERLVD_4COMPONENTS | \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB |\
+                                       PPP_##dir##_PLANE_INTERLVD)
+
+#define PPP_CFG_MDP_Y_CBCR_H2V1(dir)   (PPP_##dir##_C2R_8BIT | \
+                                       PPP_##dir##_C0G_8BIT | \
+                                       PPP_##dir##_C1B_8BIT | \
+                                       PPP_##dir##_C3A_8BIT | \
+                                       PPP_##dir##_BPP_2BYTES |   \
+                                       PPP_##dir##_INTERLVD_2COMPONENTS |  \
+                                       PPP_##dir##_PACK_TIGHT | \
+                                       PPP_##dir##_PACK_ALIGN_LSB | \
+                                       PPP_##dir##_PLANE_PSEUDOPLNR)
+
+#define PPP_CFG_MDP_Y_CRCB_H2V1(dir)   PPP_CFG_MDP_Y_CBCR_H2V1(dir)
+
+#define PPP_PACK_PATTERN_MDP_RGB_565 \
+       MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8)
+#define PPP_PACK_PATTERN_MDP_RGB_888 PPP_PACK_PATTERN_MDP_RGB_565
+#define PPP_PACK_PATTERN_MDP_XRGB_8888 \
+       MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B, 8)
+#define PPP_PACK_PATTERN_MDP_ARGB_8888 PPP_PACK_PATTERN_MDP_XRGB_8888
+#define PPP_PACK_PATTERN_MDP_RGBA_8888 \
+       MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R, 8)
+#define PPP_PACK_PATTERN_MDP_BGRA_8888 \
+       MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B, 8)
+#define PPP_PACK_PATTERN_MDP_Y_CBCR_H2V1 \
+       MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8)
+#define PPP_PACK_PATTERN_MDP_Y_CBCR_H2V2 PPP_PACK_PATTERN_MDP_Y_CBCR_H2V1
+#define PPP_PACK_PATTERN_MDP_Y_CRCB_H2V1 \
+       MDP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8)
+#define PPP_PACK_PATTERN_MDP_Y_CRCB_H2V2 PPP_PACK_PATTERN_MDP_Y_CRCB_H2V1
+#define PPP_PACK_PATTERN_MDP_YCRYCB_H2V1 \
+       MDP_GET_PACK_PATTERN(CLR_Y, CLR_R, CLR_Y, CLR_B, 8)
+
+#define PPP_CHROMA_SAMP_MDP_RGB_565(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_RGB_888(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_XRGB_8888(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_ARGB_8888(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_RGBA_8888(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_BGRA_8888(dir) PPP_OP_##dir##_CHROMA_RGB
+#define PPP_CHROMA_SAMP_MDP_Y_CBCR_H2V1(dir) PPP_OP_##dir##_CHROMA_H2V1
+#define PPP_CHROMA_SAMP_MDP_Y_CBCR_H2V2(dir) PPP_OP_##dir##_CHROMA_420
+#define PPP_CHROMA_SAMP_MDP_Y_CRCB_H2V1(dir) PPP_OP_##dir##_CHROMA_H2V1
+#define PPP_CHROMA_SAMP_MDP_Y_CRCB_H2V2(dir) PPP_OP_##dir##_CHROMA_420
+#define PPP_CHROMA_SAMP_MDP_YCRYCB_H2V1(dir) PPP_OP_##dir##_CHROMA_H2V1
+
+/* Helpful array generation macros */
+#define PPP_ARRAY0(name) \
+       [MDP_RGB_565] = PPP_##name##_MDP_RGB_565,\
+       [MDP_RGB_888] = PPP_##name##_MDP_RGB_888,\
+       [MDP_XRGB_8888] = PPP_##name##_MDP_XRGB_8888,\
+       [MDP_ARGB_8888] = PPP_##name##_MDP_ARGB_8888,\
+       [MDP_RGBA_8888] = PPP_##name##_MDP_RGBA_8888,\
+       [MDP_BGRA_8888] = PPP_##name##_MDP_BGRA_8888,\
+       [MDP_Y_CBCR_H2V1] = PPP_##name##_MDP_Y_CBCR_H2V1,\
+       [MDP_Y_CBCR_H2V2] = PPP_##name##_MDP_Y_CBCR_H2V2,\
+       [MDP_Y_CRCB_H2V1] = PPP_##name##_MDP_Y_CRCB_H2V1,\
+       [MDP_Y_CRCB_H2V2] = PPP_##name##_MDP_Y_CRCB_H2V2,\
+       [MDP_YCRYCB_H2V1] = PPP_##name##_MDP_YCRYCB_H2V1
+
+#define PPP_ARRAY1(name, dir) \
+       [MDP_RGB_565] = PPP_##name##_MDP_RGB_565(dir),\
+       [MDP_RGB_888] = PPP_##name##_MDP_RGB_888(dir),\
+       [MDP_XRGB_8888] = PPP_##name##_MDP_XRGB_8888(dir),\
+       [MDP_ARGB_8888] = PPP_##name##_MDP_ARGB_8888(dir),\
+       [MDP_RGBA_8888] = PPP_##name##_MDP_RGBA_8888(dir),\
+       [MDP_BGRA_8888] = PPP_##name##_MDP_BGRA_8888(dir),\
+       [MDP_Y_CBCR_H2V1] = PPP_##name##_MDP_Y_CBCR_H2V1(dir),\
+       [MDP_Y_CBCR_H2V2] = PPP_##name##_MDP_Y_CBCR_H2V2(dir),\
+       [MDP_Y_CRCB_H2V1] = PPP_##name##_MDP_Y_CRCB_H2V1(dir),\
+       [MDP_Y_CRCB_H2V2] = PPP_##name##_MDP_Y_CRCB_H2V2(dir),\
+       [MDP_YCRYCB_H2V1] = PPP_##name##_MDP_YCRYCB_H2V1(dir)
+
+#define IS_YCRCB(img) ((img == MDP_Y_CRCB_H2V2) | (img == MDP_Y_CBCR_H2V2) | \
+                      (img == MDP_Y_CRCB_H2V1) | (img == MDP_Y_CBCR_H2V1) | \
+                      (img == MDP_YCRYCB_H2V1))
+#define IS_RGB(img) ((img == MDP_RGB_565) | (img == MDP_RGB_888) | \
+                    (img == MDP_ARGB_8888) | (img == MDP_RGBA_8888) | \
+                    (img == MDP_XRGB_8888) | (img == MDP_BGRA_8888))
+#define HAS_ALPHA(img) ((img == MDP_ARGB_8888) | (img == MDP_RGBA_8888) | \
+                       (img == MDP_BGRA_8888))
+
+#define IS_PSEUDOPLNR(img) ((img == MDP_Y_CRCB_H2V2) | \
+                           (img == MDP_Y_CBCR_H2V2) | \
+                           (img == MDP_Y_CRCB_H2V1) | \
+                           (img == MDP_Y_CBCR_H2V1))
+
+/* Mappings from addr to purpose */
+#define PPP_ADDR_SRC_ROI               MDP_FULL_BYPASS_WORD2
+#define PPP_ADDR_SRC0                  MDP_FULL_BYPASS_WORD3
+#define PPP_ADDR_SRC1                  MDP_FULL_BYPASS_WORD4
+#define PPP_ADDR_SRC_YSTRIDE           MDP_FULL_BYPASS_WORD7
+#define PPP_ADDR_SRC_CFG               MDP_FULL_BYPASS_WORD9
+#define PPP_ADDR_SRC_PACK_PATTERN      MDP_FULL_BYPASS_WORD10
+#define PPP_ADDR_OPERATION             MDP_FULL_BYPASS_WORD14
+#define PPP_ADDR_PHASEX_INIT           MDP_FULL_BYPASS_WORD15
+#define PPP_ADDR_PHASEY_INIT           MDP_FULL_BYPASS_WORD16
+#define PPP_ADDR_PHASEX_STEP           MDP_FULL_BYPASS_WORD17
+#define PPP_ADDR_PHASEY_STEP           MDP_FULL_BYPASS_WORD18
+#define PPP_ADDR_ALPHA_TRANSP          MDP_FULL_BYPASS_WORD19
+#define PPP_ADDR_DST_CFG               MDP_FULL_BYPASS_WORD20
+#define PPP_ADDR_DST_PACK_PATTERN      MDP_FULL_BYPASS_WORD21
+#define PPP_ADDR_DST_ROI               MDP_FULL_BYPASS_WORD25
+#define PPP_ADDR_DST0                  MDP_FULL_BYPASS_WORD26
+#define PPP_ADDR_DST1                  MDP_FULL_BYPASS_WORD27
+#define PPP_ADDR_DST_YSTRIDE           MDP_FULL_BYPASS_WORD30
+#define PPP_ADDR_EDGE                  MDP_FULL_BYPASS_WORD46
+#define PPP_ADDR_BG0                   MDP_FULL_BYPASS_WORD48
+#define PPP_ADDR_BG1                   MDP_FULL_BYPASS_WORD49
+#define PPP_ADDR_BG_YSTRIDE            MDP_FULL_BYPASS_WORD51
+#define PPP_ADDR_BG_CFG                        MDP_FULL_BYPASS_WORD53
+#define PPP_ADDR_BG_PACK_PATTERN       MDP_FULL_BYPASS_WORD54
+
+/* MDP_DMA_CONFIG / MDP_FULL_BYPASS_WORD32 */
+#define DMA_DSTC0G_6BITS (1<<1)
+#define DMA_DSTC1B_6BITS (1<<3)
+#define DMA_DSTC2R_6BITS (1<<5)
+#define DMA_DSTC0G_5BITS (1<<0)
+#define DMA_DSTC1B_5BITS (1<<2)
+#define DMA_DSTC2R_5BITS (1<<4)
+
+#define DMA_PACK_TIGHT (1<<6)
+#define DMA_PACK_LOOSE 0
+#define DMA_PACK_ALIGN_LSB 0
+#define DMA_PACK_ALIGN_MSB (1<<7)
+#define DMA_PACK_PATTERN_RGB \
+       (MDP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 2)<<8)
+
+#define DMA_OUT_SEL_AHB  0
+#define DMA_OUT_SEL_MDDI (1<<14)
+#define DMA_AHBM_LCD_SEL_PRIMARY 0
+#define DMA_AHBM_LCD_SEL_SECONDARY (1<<15)
+#define DMA_IBUF_C3ALPHA_EN (1<<16)
+#define DMA_DITHER_EN (1<<17)
+
+#define DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY 0
+#define DMA_MDDI_DMAOUT_LCD_SEL_SECONDARY (1<<18)
+#define DMA_MDDI_DMAOUT_LCD_SEL_EXTERNAL (1<<19)
+
+#define DMA_IBUF_FORMAT_RGB565 (1<<20)
+#define DMA_IBUF_FORMAT_RGB888_OR_ARGB8888 0
+
+#define DMA_IBUF_NONCONTIGUOUS (1<<21)
+
+/* MDDI REGISTER ? */
+#define MDDI_VDO_PACKET_DESC  0x5666
+#define MDDI_VDO_PACKET_PRIM  0xC3
+#define MDDI_VDO_PACKET_SECD  0xC0
+
+#endif
diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c
new file mode 100644 (file)
index 0000000..ba2c467
--- /dev/null
@@ -0,0 +1,750 @@
+/* drivers/video/msm/mdp_ppp.c
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/fb.h>
+#include <linux/file.h>
+#include <linux/delay.h>
+#include <linux/msm_mdp.h>
+#include <linux/android_pmem.h>
+#include <mach/msm_fb.h>
+
+#include "mdp_hw.h"
+#include "mdp_scale_tables.h"
+
+#define DLOG(x...) do {} while (0)
+
+#define MDP_DOWNSCALE_BLUR (MDP_DOWNSCALE_MAX + 1)
+static int downscale_y_table = MDP_DOWNSCALE_MAX;
+static int downscale_x_table = MDP_DOWNSCALE_MAX;
+
+struct mdp_regs {
+       uint32_t src0;
+       uint32_t src1;
+       uint32_t dst0;
+       uint32_t dst1;
+       uint32_t src_cfg;
+       uint32_t dst_cfg;
+       uint32_t src_pack;
+       uint32_t dst_pack;
+       uint32_t src_rect;
+       uint32_t dst_rect;
+       uint32_t src_ystride;
+       uint32_t dst_ystride;
+       uint32_t op;
+       uint32_t src_bpp;
+       uint32_t dst_bpp;
+       uint32_t edge;
+       uint32_t phasex_init;
+       uint32_t phasey_init;
+       uint32_t phasex_step;
+       uint32_t phasey_step;
+};
+
+static uint32_t pack_pattern[] = {
+       PPP_ARRAY0(PACK_PATTERN)
+};
+
+static uint32_t src_img_cfg[] = {
+       PPP_ARRAY1(CFG, SRC)
+};
+
+static uint32_t dst_img_cfg[] = {
+       PPP_ARRAY1(CFG, DST)
+};
+
+static uint32_t bytes_per_pixel[] = {
+       [MDP_RGB_565] = 2,
+       [MDP_RGB_888] = 3,
+       [MDP_XRGB_8888] = 4,
+       [MDP_ARGB_8888] = 4,
+       [MDP_RGBA_8888] = 4,
+       [MDP_BGRA_8888] = 4,
+       [MDP_Y_CBCR_H2V1] = 1,
+       [MDP_Y_CBCR_H2V2] = 1,
+       [MDP_Y_CRCB_H2V1] = 1,
+       [MDP_Y_CRCB_H2V2] = 1,
+       [MDP_YCRYCB_H2V1] = 2
+};
+
+static uint32_t dst_op_chroma[] = {
+       PPP_ARRAY1(CHROMA_SAMP, DST)
+};
+
+static uint32_t src_op_chroma[] = {
+       PPP_ARRAY1(CHROMA_SAMP, SRC)
+};
+
+static uint32_t bg_op_chroma[] = {
+       PPP_ARRAY1(CHROMA_SAMP, BG)
+};
+
+static void rotate_dst_addr_x(struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       regs->dst0 += (req->dst_rect.w -
+                      min((uint32_t)16, req->dst_rect.w)) * regs->dst_bpp;
+       regs->dst1 += (req->dst_rect.w -
+                      min((uint32_t)16, req->dst_rect.w)) * regs->dst_bpp;
+}
+
+static void rotate_dst_addr_y(struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       regs->dst0 += (req->dst_rect.h -
+                      min((uint32_t)16, req->dst_rect.h)) *
+                      regs->dst_ystride;
+       regs->dst1 += (req->dst_rect.h -
+                      min((uint32_t)16, req->dst_rect.h)) *
+                      regs->dst_ystride;
+}
+
+static void blit_rotate(struct mdp_blit_req *req,
+                       struct mdp_regs *regs)
+{
+       if (req->flags == MDP_ROT_NOP)
+               return;
+
+       regs->op |= PPP_OP_ROT_ON;
+       if ((req->flags & MDP_ROT_90 || req->flags & MDP_FLIP_LR) &&
+           !(req->flags & MDP_ROT_90 && req->flags & MDP_FLIP_LR))
+               rotate_dst_addr_x(req, regs);
+       if (req->flags & MDP_ROT_90)
+               regs->op |= PPP_OP_ROT_90;
+       if (req->flags & MDP_FLIP_UD) {
+               regs->op |= PPP_OP_FLIP_UD;
+               rotate_dst_addr_y(req, regs);
+       }
+       if (req->flags & MDP_FLIP_LR)
+               regs->op |= PPP_OP_FLIP_LR;
+}
+
+static void blit_convert(struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       if (req->src.format == req->dst.format)
+               return;
+       if (IS_RGB(req->src.format) && IS_YCRCB(req->dst.format)) {
+               regs->op |= PPP_OP_CONVERT_RGB2YCBCR | PPP_OP_CONVERT_ON;
+       } else if (IS_YCRCB(req->src.format) && IS_RGB(req->dst.format)) {
+               regs->op |= PPP_OP_CONVERT_YCBCR2RGB | PPP_OP_CONVERT_ON;
+               if (req->dst.format == MDP_RGB_565)
+                       regs->op |= PPP_OP_CONVERT_MATRIX_SECONDARY;
+       }
+}
+
+#define GET_BIT_RANGE(value, high, low) \
+       (((1 << (high - low + 1)) - 1) & (value >> low))
+static uint32_t transp_convert(struct mdp_blit_req *req)
+{
+       uint32_t transp = 0;
+       if (req->src.format == MDP_RGB_565) {
+               /* pad each value to 8 bits by copying the high bits into the
+                * low end, convert RGB to RBG by switching low 2 components */
+               transp |= ((GET_BIT_RANGE(req->transp_mask, 15, 11) << 3) |
+                          (GET_BIT_RANGE(req->transp_mask, 15, 13))) << 16;
+
+               transp |= ((GET_BIT_RANGE(req->transp_mask, 4, 0) << 3) |
+                          (GET_BIT_RANGE(req->transp_mask, 4, 2))) << 8;
+
+               transp |= (GET_BIT_RANGE(req->transp_mask, 10, 5) << 2) |
+                         (GET_BIT_RANGE(req->transp_mask, 10, 9));
+       } else {
+               /* convert RGB to RBG */
+               transp |= (GET_BIT_RANGE(req->transp_mask, 15, 8)) |
+                         (GET_BIT_RANGE(req->transp_mask, 23, 16) << 16) |
+                         (GET_BIT_RANGE(req->transp_mask, 7, 0) << 8);
+       }
+       return transp;
+}
+#undef GET_BIT_RANGE
+
+static void blit_blend(struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       /* TRANSP BLEND */
+       if (req->transp_mask != MDP_TRANSP_NOP) {
+               req->transp_mask = transp_convert(req);
+               if (req->alpha != MDP_ALPHA_NOP) {
+                       /* use blended transparancy mode
+                        * pixel = (src == transp) ? dst : blend
+                        * blend is combo of blend_eq_sel and
+                        * blend_alpha_sel */
+                       regs->op |= PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                               PPP_OP_BLEND_ALPHA_BLEND_NORMAL |
+                               PPP_OP_BLEND_CONSTANT_ALPHA |
+                               PPP_BLEND_ALPHA_TRANSP;
+               } else {
+                       /* simple transparancy mode
+                        * pixel = (src == transp) ? dst : src */
+                       regs->op |= PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                               PPP_OP_BLEND_SRCPIXEL_TRANSP;
+               }
+       }
+
+       req->alpha &= 0xff;
+       /* ALPHA BLEND */
+       if (HAS_ALPHA(req->src.format)) {
+               regs->op |= PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                       PPP_OP_BLEND_SRCPIXEL_ALPHA;
+       } else if (req->alpha < MDP_ALPHA_NOP) {
+               /* just blend by alpha */
+               regs->op |= PPP_OP_ROT_ON | PPP_OP_BLEND_ON |
+                       PPP_OP_BLEND_ALPHA_BLEND_NORMAL |
+                       PPP_OP_BLEND_CONSTANT_ALPHA;
+       }
+
+       regs->op |= bg_op_chroma[req->dst.format];
+}
+
+#define ONE_HALF       (1LL << 32)
+#define ONE            (1LL << 33)
+#define TWO            (2LL << 33)
+#define THREE          (3LL << 33)
+#define FRAC_MASK (ONE - 1)
+#define INT_MASK (~FRAC_MASK)
+
+static int scale_params(uint32_t dim_in, uint32_t dim_out, uint32_t origin,
+                       uint32_t *phase_init, uint32_t *phase_step)
+{
+       /* to improve precicsion calculations are done in U31.33 and converted
+        * to U3.29 at the end */
+       int64_t k1, k2, k3, k4, tmp;
+       uint64_t n, d, os, os_p, od, od_p, oreq;
+       unsigned rpa = 0;
+       int64_t ip64, delta;
+
+       if (dim_out % 3 == 0)
+               rpa = !(dim_in % (dim_out / 3));
+
+       n = ((uint64_t)dim_out) << 34;
+       d = dim_in;
+       if (!d)
+               return -1;
+       do_div(n, d);
+       k3 = (n + 1) >> 1;
+       if ((k3 >> 4) < (1LL << 27) || (k3 >> 4) > (1LL << 31)) {
+               DLOG("crap bad scale\n");
+               return -1;
+       }
+       n = ((uint64_t)dim_in) << 34;
+       d = (uint64_t)dim_out;
+       if (!d)
+               return -1;
+       do_div(n, d);
+       k1 = (n + 1) >> 1;
+       k2 = (k1 - ONE) >> 1;
+
+       *phase_init = (int)(k2 >> 4);
+       k4 = (k3 - ONE) >> 1;
+
+       if (rpa) {
+               os = ((uint64_t)origin << 33) - ONE_HALF;
+               tmp = (dim_out * os) + ONE_HALF;
+               if (!dim_in)
+                       return -1;
+               do_div(tmp, dim_in);
+               od = tmp - ONE_HALF;
+       } else {
+               os = ((uint64_t)origin << 1) - 1;
+               od = (((k3 * os) >> 1) + k4);
+       }
+
+       od_p = od & INT_MASK;
+       if (od_p != od)
+               od_p += ONE;
+
+       if (rpa) {
+               tmp = (dim_in * od_p) + ONE_HALF;
+               if (!dim_in)
+                       return -1;
+               do_div(tmp, dim_in);
+               os_p = tmp - ONE_HALF;
+       } else {
+               os_p = ((k1 * (od_p >> 33)) + k2);
+       }
+
+       oreq = (os_p & INT_MASK) - ONE;
+
+       ip64 = os_p - oreq;
+       delta = ((int64_t)(origin) << 33) - oreq;
+       ip64 -= delta;
+       /* limit to valid range before the left shift */
+       delta = (ip64 & (1LL << 63)) ? 4 : -4;
+       delta <<= 33;
+       while (abs((int)(ip64 >> 33)) > 4)
+               ip64 += delta;
+       *phase_init = (int)(ip64 >> 4);
+       *phase_step = (uint32_t)(k1 >> 4);
+       return 0;
+}
+
+static void load_scale_table(const struct mdp_info *mdp,
+                            struct mdp_table_entry *table, int len)
+{
+       int i;
+       for (i = 0; i < len; i++)
+               mdp_writel(mdp, table[i].val, table[i].reg);
+}
+
+enum {
+IMG_LEFT,
+IMG_RIGHT,
+IMG_TOP,
+IMG_BOTTOM,
+};
+
+static void get_edge_info(uint32_t src, uint32_t src_coord, uint32_t dst,
+                         uint32_t *interp1, uint32_t *interp2,
+                         uint32_t *repeat1, uint32_t *repeat2) {
+       if (src > 3 * dst) {
+               *interp1 = 0;
+               *interp2 = src - 1;
+               *repeat1 = 0;
+               *repeat2 = 0;
+       } else if (src == 3 * dst) {
+               *interp1 = 0;
+               *interp2 = src;
+               *repeat1 = 0;
+               *repeat2 = 1;
+       } else if (src > dst && src < 3 * dst) {
+               *interp1 = -1;
+               *interp2 = src;
+               *repeat1 = 1;
+               *repeat2 = 1;
+       } else if (src == dst) {
+               *interp1 = -1;
+               *interp2 = src + 1;
+               *repeat1 = 1;
+               *repeat2 = 2;
+       } else {
+               *interp1 = -2;
+               *interp2 = src + 1;
+               *repeat1 = 2;
+               *repeat2 = 2;
+       }
+       *interp1 += src_coord;
+       *interp2 += src_coord;
+}
+
+static int get_edge_cond(struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       int32_t luma_interp[4];
+       int32_t luma_repeat[4];
+       int32_t chroma_interp[4];
+       int32_t chroma_bound[4];
+       int32_t chroma_repeat[4];
+       uint32_t dst_w, dst_h;
+
+       memset(&luma_interp, 0, sizeof(int32_t) * 4);
+       memset(&luma_repeat, 0, sizeof(int32_t) * 4);
+       memset(&chroma_interp, 0, sizeof(int32_t) * 4);
+       memset(&chroma_bound, 0, sizeof(int32_t) * 4);
+       memset(&chroma_repeat, 0, sizeof(int32_t) * 4);
+       regs->edge = 0;
+
+       if (req->flags & MDP_ROT_90) {
+               dst_w = req->dst_rect.h;
+               dst_h = req->dst_rect.w;
+       } else {
+               dst_w = req->dst_rect.w;
+               dst_h = req->dst_rect.h;
+       }
+
+       if (regs->op & (PPP_OP_SCALE_Y_ON | PPP_OP_SCALE_X_ON)) {
+               get_edge_info(req->src_rect.h, req->src_rect.y, dst_h,
+                             &luma_interp[IMG_TOP], &luma_interp[IMG_BOTTOM],
+                             &luma_repeat[IMG_TOP], &luma_repeat[IMG_BOTTOM]);
+               get_edge_info(req->src_rect.w, req->src_rect.x, dst_w,
+                             &luma_interp[IMG_LEFT], &luma_interp[IMG_RIGHT],
+                             &luma_repeat[IMG_LEFT], &luma_repeat[IMG_RIGHT]);
+       } else {
+               luma_interp[IMG_LEFT] = req->src_rect.x;
+               luma_interp[IMG_RIGHT] = req->src_rect.x + req->src_rect.w - 1;
+               luma_interp[IMG_TOP] = req->src_rect.y;
+               luma_interp[IMG_BOTTOM] = req->src_rect.y + req->src_rect.h - 1;
+               luma_repeat[IMG_LEFT] = 0;
+               luma_repeat[IMG_TOP] = 0;
+               luma_repeat[IMG_RIGHT] = 0;
+               luma_repeat[IMG_BOTTOM] = 0;
+       }
+
+       chroma_interp[IMG_LEFT] = luma_interp[IMG_LEFT];
+       chroma_interp[IMG_RIGHT] = luma_interp[IMG_RIGHT];
+       chroma_interp[IMG_TOP] = luma_interp[IMG_TOP];
+       chroma_interp[IMG_BOTTOM] = luma_interp[IMG_BOTTOM];
+
+       chroma_bound[IMG_LEFT] = req->src_rect.x;
+       chroma_bound[IMG_RIGHT] = req->src_rect.x + req->src_rect.w - 1;
+       chroma_bound[IMG_TOP] = req->src_rect.y;
+       chroma_bound[IMG_BOTTOM] = req->src_rect.y + req->src_rect.h - 1;
+
+       if (IS_YCRCB(req->src.format)) {
+               chroma_interp[IMG_LEFT] = chroma_interp[IMG_LEFT] >> 1;
+               chroma_interp[IMG_RIGHT] = (chroma_interp[IMG_RIGHT] + 1) >> 1;
+
+               chroma_bound[IMG_LEFT] = chroma_bound[IMG_LEFT] >> 1;
+               chroma_bound[IMG_RIGHT] = chroma_bound[IMG_RIGHT] >> 1;
+       }
+
+       if (req->src.format == MDP_Y_CBCR_H2V2 ||
+           req->src.format == MDP_Y_CRCB_H2V2) {
+               chroma_interp[IMG_TOP] = (chroma_interp[IMG_TOP] - 1) >> 1;
+               chroma_interp[IMG_BOTTOM] = (chroma_interp[IMG_BOTTOM] + 1)
+                                           >> 1;
+               chroma_bound[IMG_TOP] = (chroma_bound[IMG_TOP] + 1) >> 1;
+               chroma_bound[IMG_BOTTOM] = chroma_bound[IMG_BOTTOM] >> 1;
+       }
+
+       chroma_repeat[IMG_LEFT] = chroma_bound[IMG_LEFT] -
+                                 chroma_interp[IMG_LEFT];
+       chroma_repeat[IMG_RIGHT] = chroma_interp[IMG_RIGHT] -
+                                 chroma_bound[IMG_RIGHT];
+       chroma_repeat[IMG_TOP] = chroma_bound[IMG_TOP] -
+                                 chroma_interp[IMG_TOP];
+       chroma_repeat[IMG_BOTTOM] = chroma_interp[IMG_BOTTOM] -
+                                 chroma_bound[IMG_BOTTOM];
+
+       if (chroma_repeat[IMG_LEFT] < 0 || chroma_repeat[IMG_LEFT] > 3 ||
+           chroma_repeat[IMG_RIGHT] < 0 || chroma_repeat[IMG_RIGHT] > 3 ||
+           chroma_repeat[IMG_TOP] < 0 || chroma_repeat[IMG_TOP] > 3 ||
+           chroma_repeat[IMG_BOTTOM] < 0 || chroma_repeat[IMG_BOTTOM] > 3 ||
+           luma_repeat[IMG_LEFT] < 0 || luma_repeat[IMG_LEFT] > 3 ||
+           luma_repeat[IMG_RIGHT] < 0 || luma_repeat[IMG_RIGHT] > 3 ||
+           luma_repeat[IMG_TOP] < 0 || luma_repeat[IMG_TOP] > 3 ||
+           luma_repeat[IMG_BOTTOM] < 0 || luma_repeat[IMG_BOTTOM] > 3)
+               return -1;
+
+       regs->edge |= (chroma_repeat[IMG_LEFT] & 3) << MDP_LEFT_CHROMA;
+       regs->edge |= (chroma_repeat[IMG_RIGHT] & 3) << MDP_RIGHT_CHROMA;
+       regs->edge |= (chroma_repeat[IMG_TOP] & 3) << MDP_TOP_CHROMA;
+       regs->edge |= (chroma_repeat[IMG_BOTTOM] & 3) << MDP_BOTTOM_CHROMA;
+       regs->edge |= (luma_repeat[IMG_LEFT] & 3) << MDP_LEFT_LUMA;
+       regs->edge |= (luma_repeat[IMG_RIGHT] & 3) << MDP_RIGHT_LUMA;
+       regs->edge |= (luma_repeat[IMG_TOP] & 3) << MDP_TOP_LUMA;
+       regs->edge |= (luma_repeat[IMG_BOTTOM] & 3) << MDP_BOTTOM_LUMA;
+       return 0;
+}
+
+static int blit_scale(const struct mdp_info *mdp, struct mdp_blit_req *req,
+                     struct mdp_regs *regs)
+{
+       uint32_t phase_init_x, phase_init_y, phase_step_x, phase_step_y;
+       uint32_t scale_factor_x, scale_factor_y;
+       uint32_t downscale;
+       uint32_t dst_w, dst_h;
+
+       if (req->flags & MDP_ROT_90) {
+               dst_w = req->dst_rect.h;
+               dst_h = req->dst_rect.w;
+       } else {
+               dst_w = req->dst_rect.w;
+               dst_h = req->dst_rect.h;
+       }
+       if ((req->src_rect.w == dst_w)  && (req->src_rect.h == dst_h) &&
+           !(req->flags & MDP_BLUR)) {
+               regs->phasex_init = 0;
+               regs->phasey_init = 0;
+               regs->phasex_step = 0;
+               regs->phasey_step = 0;
+               return 0;
+       }
+
+       if (scale_params(req->src_rect.w, dst_w, 1, &phase_init_x,
+                        &phase_step_x) ||
+           scale_params(req->src_rect.h, dst_h, 1, &phase_init_y,
+                        &phase_step_y))
+               return -1;
+
+       scale_factor_x = (dst_w * 10) / req->src_rect.w;
+       scale_factor_y = (dst_h * 10) / req->src_rect.h;
+
+       if (scale_factor_x > 8)
+               downscale = MDP_DOWNSCALE_PT8TO1;
+       else if (scale_factor_x > 6)
+               downscale = MDP_DOWNSCALE_PT6TOPT8;
+       else if (scale_factor_x > 4)
+               downscale = MDP_DOWNSCALE_PT4TOPT6;
+       else
+               downscale = MDP_DOWNSCALE_PT2TOPT4;
+       if (downscale != downscale_x_table) {
+               load_scale_table(mdp, mdp_downscale_x_table[downscale], 64);
+               downscale_x_table = downscale;
+       }
+
+       if (scale_factor_y > 8)
+               downscale = MDP_DOWNSCALE_PT8TO1;
+       else if (scale_factor_y > 6)
+               downscale = MDP_DOWNSCALE_PT6TOPT8;
+       else if (scale_factor_y > 4)
+               downscale = MDP_DOWNSCALE_PT4TOPT6;
+       else
+               downscale = MDP_DOWNSCALE_PT2TOPT4;
+       if (downscale != downscale_y_table) {
+               load_scale_table(mdp, mdp_downscale_y_table[downscale], 64);
+               downscale_y_table = downscale;
+       }
+
+       regs->phasex_init = phase_init_x;
+       regs->phasey_init = phase_init_y;
+       regs->phasex_step = phase_step_x;
+       regs->phasey_step = phase_step_y;
+       regs->op |= (PPP_OP_SCALE_Y_ON | PPP_OP_SCALE_X_ON);
+       return 0;
+
+}
+
+static void blit_blur(const struct mdp_info *mdp, struct mdp_blit_req *req,
+                     struct mdp_regs *regs)
+{
+       if (!(req->flags & MDP_BLUR))
+               return;
+
+       if (!(downscale_x_table == MDP_DOWNSCALE_BLUR &&
+             downscale_y_table == MDP_DOWNSCALE_BLUR)) {
+               load_scale_table(mdp, mdp_gaussian_blur_table, 128);
+               downscale_x_table = MDP_DOWNSCALE_BLUR;
+               downscale_y_table = MDP_DOWNSCALE_BLUR;
+       }
+
+       regs->op |= (PPP_OP_SCALE_Y_ON | PPP_OP_SCALE_X_ON);
+}
+
+
+#define IMG_LEN(rect_h, w, rect_w, bpp) (((rect_h) * w) * bpp)
+
+#define Y_TO_CRCB_RATIO(format) \
+       ((format == MDP_Y_CBCR_H2V2 || format == MDP_Y_CRCB_H2V2) ?  2 :\
+        (format == MDP_Y_CBCR_H2V1 || format == MDP_Y_CRCB_H2V1) ?  1 : 1)
+
+static void get_len(struct mdp_img *img, struct mdp_rect *rect, uint32_t bpp,
+                   uint32_t *len0, uint32_t *len1)
+{
+       *len0 = IMG_LEN(rect->h, img->width, rect->w, bpp);
+       if (IS_PSEUDOPLNR(img->format))
+               *len1 = *len0/Y_TO_CRCB_RATIO(img->format);
+       else
+               *len1 = 0;
+}
+
+static int valid_src_dst(unsigned long src_start, unsigned long src_len,
+                        unsigned long dst_start, unsigned long dst_len,
+                        struct mdp_blit_req *req, struct mdp_regs *regs)
+{
+       unsigned long src_min_ok = src_start;
+       unsigned long src_max_ok = src_start + src_len;
+       unsigned long dst_min_ok = dst_start;
+       unsigned long dst_max_ok = dst_start + dst_len;
+       uint32_t src0_len, src1_len, dst0_len, dst1_len;
+       get_len(&req->src, &req->src_rect, regs->src_bpp, &src0_len,
+                &src1_len);
+       get_len(&req->dst, &req->dst_rect, regs->dst_bpp, &dst0_len,
+                &dst1_len);
+
+       if (regs->src0 < src_min_ok || regs->src0 > src_max_ok ||
+           regs->src0 + src0_len > src_max_ok) {
+               DLOG("invalid_src %x %x %lx %lx\n", regs->src0,
+                     src0_len, src_min_ok, src_max_ok);
+               return 0;
+       }
+       if (regs->src_cfg & PPP_SRC_PLANE_PSEUDOPLNR) {
+               if (regs->src1 < src_min_ok || regs->src1 > src_max_ok ||
+                   regs->src1 + src1_len > src_max_ok) {
+                       DLOG("invalid_src1");
+                       return 0;
+               }
+       }
+       if (regs->dst0 < dst_min_ok || regs->dst0 > dst_max_ok ||
+           regs->dst0 + dst0_len > dst_max_ok) {
+               DLOG("invalid_dst");
+               return 0;
+       }
+       if (regs->dst_cfg & PPP_SRC_PLANE_PSEUDOPLNR) {
+               if (regs->dst1 < dst_min_ok || regs->dst1 > dst_max_ok ||
+                   regs->dst1 + dst1_len > dst_max_ok) {
+                       DLOG("invalid_dst1");
+                       return 0;
+               }
+       }
+       return 1;
+}
+
+
+static void flush_imgs(struct mdp_blit_req *req, struct mdp_regs *regs,
+                      struct file *src_file, struct file *dst_file)
+{
+#ifdef CONFIG_ANDROID_PMEM
+       uint32_t src0_len, src1_len, dst0_len, dst1_len;
+
+       /* flush src images to memory before dma to mdp */
+       get_len(&req->src, &req->src_rect, regs->src_bpp, &src0_len,
+               &src1_len);
+       flush_pmem_file(src_file, req->src.offset, src0_len);
+       if (IS_PSEUDOPLNR(req->src.format))
+               flush_pmem_file(src_file, req->src.offset + src0_len,
+                               src1_len);
+
+       /* flush dst images */
+       get_len(&req->dst, &req->dst_rect, regs->dst_bpp, &dst0_len,
+               &dst1_len);
+       flush_pmem_file(dst_file, req->dst.offset, dst0_len);
+       if (IS_PSEUDOPLNR(req->dst.format))
+               flush_pmem_file(dst_file, req->dst.offset + dst0_len,
+                               dst1_len);
+#endif
+}
+
+static void get_chroma_addr(struct mdp_img *img, struct mdp_rect *rect,
+                           uint32_t base, uint32_t bpp, uint32_t cfg,
+                           uint32_t *addr, uint32_t *ystride)
+{
+       uint32_t compress_v = Y_TO_CRCB_RATIO(img->format);
+       uint32_t compress_h = 2;
+       uint32_t  offset;
+
+       if (IS_PSEUDOPLNR(img->format)) {
+               offset = (rect->x / compress_h) * compress_h;
+               offset += rect->y == 0 ? 0 :
+                         ((rect->y + 1) / compress_v) * img->width;
+               *addr = base + (img->width * img->height * bpp);
+               *addr += offset * bpp;
+               *ystride |= *ystride << 16;
+       } else {
+               *addr = 0;
+       }
+}
+
+static int send_blit(const struct mdp_info *mdp, struct mdp_blit_req *req,
+                    struct mdp_regs *regs, struct file *src_file,
+                    struct file *dst_file)
+{
+       mdp_writel(mdp, 1, 0x060);
+       mdp_writel(mdp, regs->src_rect, PPP_ADDR_SRC_ROI);
+       mdp_writel(mdp, regs->src0, PPP_ADDR_SRC0);
+       mdp_writel(mdp, regs->src1, PPP_ADDR_SRC1);
+       mdp_writel(mdp, regs->src_ystride, PPP_ADDR_SRC_YSTRIDE);
+       mdp_writel(mdp, regs->src_cfg, PPP_ADDR_SRC_CFG);
+       mdp_writel(mdp, regs->src_pack, PPP_ADDR_SRC_PACK_PATTERN);
+
+       mdp_writel(mdp, regs->op, PPP_ADDR_OPERATION);
+       mdp_writel(mdp, regs->phasex_init, PPP_ADDR_PHASEX_INIT);
+       mdp_writel(mdp, regs->phasey_init, PPP_ADDR_PHASEY_INIT);
+       mdp_writel(mdp, regs->phasex_step, PPP_ADDR_PHASEX_STEP);
+       mdp_writel(mdp, regs->phasey_step, PPP_ADDR_PHASEY_STEP);
+
+       mdp_writel(mdp, (req->alpha << 24) | (req->transp_mask & 0xffffff),
+              PPP_ADDR_ALPHA_TRANSP);
+
+       mdp_writel(mdp, regs->dst_cfg, PPP_ADDR_DST_CFG);
+       mdp_writel(mdp, regs->dst_pack, PPP_ADDR_DST_PACK_PATTERN);
+       mdp_writel(mdp, regs->dst_rect, PPP_ADDR_DST_ROI);
+       mdp_writel(mdp, regs->dst0, PPP_ADDR_DST0);
+       mdp_writel(mdp, regs->dst1, PPP_ADDR_DST1);
+       mdp_writel(mdp, regs->dst_ystride, PPP_ADDR_DST_YSTRIDE);
+
+       mdp_writel(mdp, regs->edge, PPP_ADDR_EDGE);
+       if (regs->op & PPP_OP_BLEND_ON) {
+               mdp_writel(mdp, regs->dst0, PPP_ADDR_BG0);
+               mdp_writel(mdp, regs->dst1, PPP_ADDR_BG1);
+               mdp_writel(mdp, regs->dst_ystride, PPP_ADDR_BG_YSTRIDE);
+               mdp_writel(mdp, src_img_cfg[req->dst.format], PPP_ADDR_BG_CFG);
+               mdp_writel(mdp, pack_pattern[req->dst.format],
+                          PPP_ADDR_BG_PACK_PATTERN);
+       }
+       flush_imgs(req, regs, src_file, dst_file);
+       mdp_writel(mdp, 0x1000, MDP_DISPLAY0_START);
+       return 0;
+}
+
+int mdp_ppp_blit(const struct mdp_info *mdp, struct mdp_blit_req *req,
+                struct file *src_file, unsigned long src_start, unsigned long src_len,
+                struct file *dst_file, unsigned long dst_start, unsigned long dst_len)
+{
+       struct mdp_regs regs = {0};
+
+       if (unlikely(req->src.format >= MDP_IMGTYPE_LIMIT ||
+                    req->dst.format >= MDP_IMGTYPE_LIMIT)) {
+               printk(KERN_ERR "mpd_ppp: img is of wrong format\n");
+               return -EINVAL;
+       }
+
+       if (unlikely(req->src_rect.x > req->src.width ||
+                    req->src_rect.y > req->src.height ||
+                    req->dst_rect.x > req->dst.width ||
+                    req->dst_rect.y > req->dst.height)) {
+               printk(KERN_ERR "mpd_ppp: img rect is outside of img!\n");
+               return -EINVAL;
+       }
+
+       /* set the src image configuration */
+       regs.src_cfg = src_img_cfg[req->src.format];
+       regs.src_cfg |= (req->src_rect.x & 0x1) ? PPP_SRC_BPP_ROI_ODD_X : 0;
+       regs.src_cfg |= (req->src_rect.y & 0x1) ? PPP_SRC_BPP_ROI_ODD_Y : 0;
+       regs.src_rect = (req->src_rect.h << 16) | req->src_rect.w;
+       regs.src_pack = pack_pattern[req->src.format];
+
+       /* set the dest image configuration */
+       regs.dst_cfg = dst_img_cfg[req->dst.format] | PPP_DST_OUT_SEL_AXI;
+       regs.dst_rect = (req->dst_rect.h << 16) | req->dst_rect.w;
+       regs.dst_pack = pack_pattern[req->dst.format];
+
+       /* set src, bpp, start pixel and ystride */
+       regs.src_bpp = bytes_per_pixel[req->src.format];
+       regs.src0 = src_start + req->src.offset;
+       regs.src_ystride = req->src.width * regs.src_bpp;
+       get_chroma_addr(&req->src, &req->src_rect, regs.src0, regs.src_bpp,
+                       regs.src_cfg, &regs.src1, &regs.src_ystride);
+       regs.src0 += (req->src_rect.x + (req->src_rect.y * req->src.width)) *
+                     regs.src_bpp;
+
+       /* set dst, bpp, start pixel and ystride */
+       regs.dst_bpp = bytes_per_pixel[req->dst.format];
+       regs.dst0 = dst_start + req->dst.offset;
+       regs.dst_ystride = req->dst.width * regs.dst_bpp;
+       get_chroma_addr(&req->dst, &req->dst_rect, regs.dst0, regs.dst_bpp,
+                       regs.dst_cfg, &regs.dst1, &regs.dst_ystride);
+       regs.dst0 += (req->dst_rect.x + (req->dst_rect.y * req->dst.width)) *
+                     regs.dst_bpp;
+
+       if (!valid_src_dst(src_start, src_len, dst_start, dst_len, req,
+                          &regs)) {
+               printk(KERN_ERR "mpd_ppp: final src or dst location is "
+                       "invalid, are you trying to make an image too large "
+                       "or to place it outside the screen?\n");
+               return -EINVAL;
+       }
+
+       /* set up operation register */
+       regs.op = 0;
+       blit_rotate(req, &regs);
+       blit_convert(req, &regs);
+       if (req->flags & MDP_DITHER)
+               regs.op |= PPP_OP_DITHER_EN;
+       blit_blend(req, &regs);
+       if (blit_scale(mdp, req, &regs)) {
+               printk(KERN_ERR "mpd_ppp: error computing scale for img.\n");
+               return -EINVAL;
+       }
+       blit_blur(mdp, req, &regs);
+       regs.op |= dst_op_chroma[req->dst.format] |
+                  src_op_chroma[req->src.format];
+
+       /* if the image is YCRYCB, the x and w must be even */
+       if (unlikely(req->src.format == MDP_YCRYCB_H2V1)) {
+               req->src_rect.x = req->src_rect.x & (~0x1);
+               req->src_rect.w = req->src_rect.w & (~0x1);
+               req->dst_rect.x = req->dst_rect.x & (~0x1);
+               req->dst_rect.w = req->dst_rect.w & (~0x1);
+       }
+       if (get_edge_cond(req, &regs))
+               return -EINVAL;
+
+       send_blit(mdp, req, &regs, src_file, dst_file);
+       return 0;
+}
diff --git a/drivers/video/msm/mdp_scale_tables.c b/drivers/video/msm/mdp_scale_tables.c
new file mode 100644 (file)
index 0000000..604783b
--- /dev/null
@@ -0,0 +1,766 @@
+/* drivers/video/msm_fb/mdp_scale_tables.c
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "mdp_scale_tables.h"
+#include "mdp_hw.h"
+
+struct mdp_table_entry mdp_upscale_table[] = {
+       { 0x5fffc, 0x0 },
+       { 0x50200, 0x7fc00000 },
+       { 0x5fffc, 0xff80000d },
+       { 0x50204, 0x7ec003f9 },
+       { 0x5fffc, 0xfec0001c },
+       { 0x50208, 0x7d4003f3 },
+       { 0x5fffc, 0xfe40002b },
+       { 0x5020c, 0x7b8003ed },
+       { 0x5fffc, 0xfd80003c },
+       { 0x50210, 0x794003e8 },
+       { 0x5fffc, 0xfcc0004d },
+       { 0x50214, 0x76c003e4 },
+       { 0x5fffc, 0xfc40005f },
+       { 0x50218, 0x73c003e0 },
+       { 0x5fffc, 0xfb800071 },
+       { 0x5021c, 0x708003de },
+       { 0x5fffc, 0xfac00085 },
+       { 0x50220, 0x6d0003db },
+       { 0x5fffc, 0xfa000098 },
+       { 0x50224, 0x698003d9 },
+       { 0x5fffc, 0xf98000ac },
+       { 0x50228, 0x654003d8 },
+       { 0x5fffc, 0xf8c000c1 },
+       { 0x5022c, 0x610003d7 },
+       { 0x5fffc, 0xf84000d5 },
+       { 0x50230, 0x5c8003d7 },
+       { 0x5fffc, 0xf7c000e9 },
+       { 0x50234, 0x580003d7 },
+       { 0x5fffc, 0xf74000fd },
+       { 0x50238, 0x534003d8 },
+       { 0x5fffc, 0xf6c00112 },
+       { 0x5023c, 0x4e8003d8 },
+       { 0x5fffc, 0xf6800126 },
+       { 0x50240, 0x494003da },
+       { 0x5fffc, 0xf600013a },
+       { 0x50244, 0x448003db },
+       { 0x5fffc, 0xf600014d },
+       { 0x50248, 0x3f4003dd },
+       { 0x5fffc, 0xf5c00160 },
+       { 0x5024c, 0x3a4003df },
+       { 0x5fffc, 0xf5c00172 },
+       { 0x50250, 0x354003e1 },
+       { 0x5fffc, 0xf5c00184 },
+       { 0x50254, 0x304003e3 },
+       { 0x5fffc, 0xf6000195 },
+       { 0x50258, 0x2b0003e6 },
+       { 0x5fffc, 0xf64001a6 },
+       { 0x5025c, 0x260003e8 },
+       { 0x5fffc, 0xf6c001b4 },
+       { 0x50260, 0x214003eb },
+       { 0x5fffc, 0xf78001c2 },
+       { 0x50264, 0x1c4003ee },
+       { 0x5fffc, 0xf80001cf },
+       { 0x50268, 0x17c003f1 },
+       { 0x5fffc, 0xf90001db },
+       { 0x5026c, 0x134003f3 },
+       { 0x5fffc, 0xfa0001e5 },
+       { 0x50270, 0xf0003f6 },
+       { 0x5fffc, 0xfb4001ee },
+       { 0x50274, 0xac003f9 },
+       { 0x5fffc, 0xfcc001f5 },
+       { 0x50278, 0x70003fb },
+       { 0x5fffc, 0xfe4001fb },
+       { 0x5027c, 0x34003fe },
+};
+
+static struct mdp_table_entry mdp_downscale_x_table_PT2TOPT4[] = {
+       { 0x5fffc, 0x740008c },
+       { 0x50280, 0x33800088 },
+       { 0x5fffc, 0x800008e },
+       { 0x50284, 0x33400084 },
+       { 0x5fffc, 0x8400092 },
+       { 0x50288, 0x33000080 },
+       { 0x5fffc, 0x9000094 },
+       { 0x5028c, 0x3300007b },
+       { 0x5fffc, 0x9c00098 },
+       { 0x50290, 0x32400077 },
+       { 0x5fffc, 0xa40009b },
+       { 0x50294, 0x32000073 },
+       { 0x5fffc, 0xb00009d },
+       { 0x50298,  0x31c0006f },
+       { 0x5fffc,  0xbc000a0 },
+       { 0x5029c,  0x3140006b },
+       { 0x5fffc,  0xc8000a2 },
+       { 0x502a0,  0x31000067 },
+       { 0x5fffc,  0xd8000a5 },
+       { 0x502a4,  0x30800062 },
+       { 0x5fffc,  0xe4000a8 },
+       { 0x502a8,  0x2fc0005f },
+       { 0x5fffc,  0xec000aa },
+       { 0x502ac,  0x2fc0005b },
+       { 0x5fffc,  0xf8000ad },
+       { 0x502b0,  0x2f400057 },
+       { 0x5fffc,  0x108000b0 },
+       { 0x502b4,  0x2e400054 },
+       { 0x5fffc,  0x114000b2 },
+       { 0x502b8,  0x2e000050 },
+       { 0x5fffc,  0x124000b4 },
+       { 0x502bc,  0x2d80004c },
+       { 0x5fffc,  0x130000b6 },
+       { 0x502c0,  0x2d000049 },
+       { 0x5fffc,  0x140000b8 },
+       { 0x502c4,  0x2c800045 },
+       { 0x5fffc,  0x150000b9 },
+       { 0x502c8,  0x2c000042 },
+       { 0x5fffc,  0x15c000bd },
+       { 0x502cc,  0x2b40003e },
+       { 0x5fffc,  0x16c000bf },
+       { 0x502d0,  0x2a80003b },
+       { 0x5fffc,  0x17c000bf },
+       { 0x502d4,  0x2a000039 },
+       { 0x5fffc,  0x188000c2 },
+       { 0x502d8,  0x29400036 },
+       { 0x5fffc,  0x19c000c4 },
+       { 0x502dc,  0x28800032 },
+       { 0x5fffc,  0x1ac000c5 },
+       { 0x502e0,  0x2800002f },
+       { 0x5fffc,  0x1bc000c7 },
+       { 0x502e4,  0x2740002c },
+       { 0x5fffc,  0x1cc000c8 },
+       { 0x502e8,  0x26c00029 },
+       { 0x5fffc,  0x1dc000c9 },
+       { 0x502ec,  0x26000027 },
+       { 0x5fffc,  0x1ec000cc },
+       { 0x502f0,  0x25000024 },
+       { 0x5fffc,  0x200000cc },
+       { 0x502f4,  0x24800021 },
+       { 0x5fffc,  0x210000cd },
+       { 0x502f8,  0x23800020 },
+       { 0x5fffc,  0x220000ce },
+       { 0x502fc,  0x2300001d },
+};
+
+static struct mdp_table_entry mdp_downscale_x_table_PT4TOPT6[] = {
+       { 0x5fffc,  0x740008c },
+       { 0x50280,  0x33800088 },
+       { 0x5fffc,  0x800008e },
+       { 0x50284,  0x33400084 },
+       { 0x5fffc,  0x8400092 },
+       { 0x50288,  0x33000080 },
+       { 0x5fffc,  0x9000094 },
+       { 0x5028c,  0x3300007b },
+       { 0x5fffc,  0x9c00098 },
+       { 0x50290,  0x32400077 },
+       { 0x5fffc,  0xa40009b },
+       { 0x50294,  0x32000073 },
+       { 0x5fffc,  0xb00009d },
+       { 0x50298,  0x31c0006f },
+       { 0x5fffc,  0xbc000a0 },
+       { 0x5029c,  0x3140006b },
+       { 0x5fffc,  0xc8000a2 },
+       { 0x502a0,  0x31000067 },
+       { 0x5fffc,  0xd8000a5 },
+       { 0x502a4,  0x30800062 },
+       { 0x5fffc,  0xe4000a8 },
+       { 0x502a8,  0x2fc0005f },
+       { 0x5fffc,  0xec000aa },
+       { 0x502ac,  0x2fc0005b },
+       { 0x5fffc,  0xf8000ad },
+       { 0x502b0,  0x2f400057 },
+       { 0x5fffc,  0x108000b0 },
+       { 0x502b4,  0x2e400054 },
+       { 0x5fffc,  0x114000b2 },
+       { 0x502b8,  0x2e000050 },
+       { 0x5fffc,  0x124000b4 },
+       { 0x502bc,  0x2d80004c },
+       { 0x5fffc,  0x130000b6 },
+       { 0x502c0,  0x2d000049 },
+       { 0x5fffc,  0x140000b8 },
+       { 0x502c4,  0x2c800045 },
+       { 0x5fffc,  0x150000b9 },
+       { 0x502c8,  0x2c000042 },
+       { 0x5fffc,  0x15c000bd },
+       { 0x502cc,  0x2b40003e },
+       { 0x5fffc,  0x16c000bf },
+       { 0x502d0,  0x2a80003b },
+       { 0x5fffc,  0x17c000bf },
+       { 0x502d4,  0x2a000039 },
+       { 0x5fffc,  0x188000c2 },
+       { 0x502d8,  0x29400036 },
+       { 0x5fffc,  0x19c000c4 },
+       { 0x502dc,  0x28800032 },
+       { 0x5fffc,  0x1ac000c5 },
+       { 0x502e0,  0x2800002f },
+       { 0x5fffc,  0x1bc000c7 },
+       { 0x502e4,  0x2740002c },
+       { 0x5fffc,  0x1cc000c8 },
+       { 0x502e8,  0x26c00029 },
+       { 0x5fffc,  0x1dc000c9 },
+       { 0x502ec,  0x26000027 },
+       { 0x5fffc,  0x1ec000cc },
+       { 0x502f0,  0x25000024 },
+       { 0x5fffc,  0x200000cc },
+       { 0x502f4,  0x24800021 },
+       { 0x5fffc,  0x210000cd },
+       { 0x502f8,  0x23800020 },
+       { 0x5fffc,  0x220000ce },
+       { 0x502fc,  0x2300001d },
+};
+
+static struct mdp_table_entry mdp_downscale_x_table_PT6TOPT8[] = {
+       { 0x5fffc,  0xfe000070 },
+       { 0x50280,  0x4bc00068 },
+       { 0x5fffc,  0xfe000078 },
+       { 0x50284,  0x4bc00060 },
+       { 0x5fffc,  0xfe000080 },
+       { 0x50288,  0x4b800059 },
+       { 0x5fffc,  0xfe000089 },
+       { 0x5028c,  0x4b000052 },
+       { 0x5fffc,  0xfe400091 },
+       { 0x50290,  0x4a80004b },
+       { 0x5fffc,  0xfe40009a },
+       { 0x50294,  0x4a000044 },
+       { 0x5fffc,  0xfe8000a3 },
+       { 0x50298,  0x4940003d },
+       { 0x5fffc,  0xfec000ac },
+       { 0x5029c,  0x48400037 },
+       { 0x5fffc,  0xff0000b4 },
+       { 0x502a0,  0x47800031 },
+       { 0x5fffc,  0xff8000bd },
+       { 0x502a4,  0x4640002b },
+       { 0x5fffc,  0xc5 },
+       { 0x502a8,  0x45000026 },
+       { 0x5fffc,  0x8000ce },
+       { 0x502ac,  0x43800021 },
+       { 0x5fffc,  0x10000d6 },
+       { 0x502b0,  0x4240001c },
+       { 0x5fffc,  0x18000df },
+       { 0x502b4,  0x40800018 },
+       { 0x5fffc,  0x24000e6 },
+       { 0x502b8,  0x3f000014 },
+       { 0x5fffc,  0x30000ee },
+       { 0x502bc,  0x3d400010 },
+       { 0x5fffc,  0x40000f5 },
+       { 0x502c0,  0x3b80000c },
+       { 0x5fffc,  0x50000fc },
+       { 0x502c4,  0x39800009 },
+       { 0x5fffc,  0x6000102 },
+       { 0x502c8,  0x37c00006 },
+       { 0x5fffc,  0x7000109 },
+       { 0x502cc,  0x35800004 },
+       { 0x5fffc,  0x840010e },
+       { 0x502d0,  0x33800002 },
+       { 0x5fffc,  0x9800114 },
+       { 0x502d4,  0x31400000 },
+       { 0x5fffc,  0xac00119 },
+       { 0x502d8,  0x2f4003fe },
+       { 0x5fffc,  0xc40011e },
+       { 0x502dc,  0x2d0003fc },
+       { 0x5fffc,  0xdc00121 },
+       { 0x502e0,  0x2b0003fb },
+       { 0x5fffc,  0xf400125 },
+       { 0x502e4,  0x28c003fa },
+       { 0x5fffc,  0x11000128 },
+       { 0x502e8,  0x268003f9 },
+       { 0x5fffc,  0x12c0012a },
+       { 0x502ec,  0x244003f9 },
+       { 0x5fffc,  0x1480012c },
+       { 0x502f0,  0x224003f8 },
+       { 0x5fffc,  0x1640012e },
+       { 0x502f4,  0x200003f8 },
+       { 0x5fffc,  0x1800012f },
+       { 0x502f8,  0x1e0003f8 },
+       { 0x5fffc,  0x1a00012f },
+       { 0x502fc,  0x1c0003f8 },
+};
+
+static struct mdp_table_entry mdp_downscale_x_table_PT8TO1[] = {
+       { 0x5fffc,  0x0 },
+       { 0x50280,  0x7fc00000 },
+       { 0x5fffc,  0xff80000d },
+       { 0x50284,  0x7ec003f9 },
+       { 0x5fffc,  0xfec0001c },
+       { 0x50288,  0x7d4003f3 },
+       { 0x5fffc,  0xfe40002b },
+       { 0x5028c,  0x7b8003ed },
+       { 0x5fffc,  0xfd80003c },
+       { 0x50290,  0x794003e8 },
+       { 0x5fffc,  0xfcc0004d },
+       { 0x50294,  0x76c003e4 },
+       { 0x5fffc,  0xfc40005f },
+       { 0x50298,  0x73c003e0 },
+       { 0x5fffc,  0xfb800071 },
+       { 0x5029c,  0x708003de },
+       { 0x5fffc,  0xfac00085 },
+       { 0x502a0,  0x6d0003db },
+       { 0x5fffc,  0xfa000098 },
+       { 0x502a4,  0x698003d9 },
+       { 0x5fffc,  0xf98000ac },
+       { 0x502a8,  0x654003d8 },
+       { 0x5fffc,  0xf8c000c1 },
+       { 0x502ac,  0x610003d7 },
+       { 0x5fffc,  0xf84000d5 },
+       { 0x502b0,  0x5c8003d7 },
+       { 0x5fffc,  0xf7c000e9 },
+       { 0x502b4,  0x580003d7 },
+       { 0x5fffc,  0xf74000fd },
+       { 0x502b8,  0x534003d8 },
+       { 0x5fffc,  0xf6c00112 },
+       { 0x502bc,  0x4e8003d8 },
+       { 0x5fffc,  0xf6800126 },
+       { 0x502c0,  0x494003da },
+       { 0x5fffc,  0xf600013a },
+       { 0x502c4,  0x448003db },
+       { 0x5fffc,  0xf600014d },
+       { 0x502c8,  0x3f4003dd },
+       { 0x5fffc,  0xf5c00160 },
+       { 0x502cc,  0x3a4003df },
+       { 0x5fffc,  0xf5c00172 },
+       { 0x502d0,  0x354003e1 },
+       { 0x5fffc,  0xf5c00184 },
+       { 0x502d4,  0x304003e3 },
+       { 0x5fffc,  0xf6000195 },
+       { 0x502d8,  0x2b0003e6 },
+       { 0x5fffc,  0xf64001a6 },
+       { 0x502dc,  0x260003e8 },
+       { 0x5fffc,  0xf6c001b4 },
+       { 0x502e0,  0x214003eb },
+       { 0x5fffc,  0xf78001c2 },
+       { 0x502e4,  0x1c4003ee },
+       { 0x5fffc,  0xf80001cf },
+       { 0x502e8,  0x17c003f1 },
+       { 0x5fffc,  0xf90001db },
+       { 0x502ec,  0x134003f3 },
+       { 0x5fffc,  0xfa0001e5 },
+       { 0x502f0,  0xf0003f6 },
+       { 0x5fffc,  0xfb4001ee },
+       { 0x502f4,  0xac003f9 },
+       { 0x5fffc,  0xfcc001f5 },
+       { 0x502f8,  0x70003fb },
+       { 0x5fffc,  0xfe4001fb },
+       { 0x502fc,  0x34003fe },
+};
+
+struct mdp_table_entry *mdp_downscale_x_table[MDP_DOWNSCALE_MAX] = {
+       [MDP_DOWNSCALE_PT2TOPT4] = mdp_downscale_x_table_PT2TOPT4,
+       [MDP_DOWNSCALE_PT4TOPT6] = mdp_downscale_x_table_PT4TOPT6,
+       [MDP_DOWNSCALE_PT6TOPT8] = mdp_downscale_x_table_PT6TOPT8,
+       [MDP_DOWNSCALE_PT8TO1]  = mdp_downscale_x_table_PT8TO1,
+};
+
+static struct mdp_table_entry mdp_downscale_y_table_PT2TOPT4[] = {
+       { 0x5fffc,  0x740008c },
+       { 0x50300,  0x33800088 },
+       { 0x5fffc,  0x800008e },
+       { 0x50304,  0x33400084 },
+       { 0x5fffc,  0x8400092 },
+       { 0x50308,  0x33000080 },
+       { 0x5fffc,  0x9000094 },
+       { 0x5030c,  0x3300007b },
+       { 0x5fffc,  0x9c00098 },
+       { 0x50310,  0x32400077 },
+       { 0x5fffc,  0xa40009b },
+       { 0x50314,  0x32000073 },
+       { 0x5fffc,  0xb00009d },
+       { 0x50318,  0x31c0006f },
+       { 0x5fffc,  0xbc000a0 },
+       { 0x5031c,  0x3140006b },
+       { 0x5fffc,  0xc8000a2 },
+       { 0x50320,  0x31000067 },
+       { 0x5fffc,  0xd8000a5 },
+       { 0x50324,  0x30800062 },
+       { 0x5fffc,  0xe4000a8 },
+       { 0x50328,  0x2fc0005f },
+       { 0x5fffc,  0xec000aa },
+       { 0x5032c,  0x2fc0005b },
+       { 0x5fffc,  0xf8000ad },
+       { 0x50330,  0x2f400057 },
+       { 0x5fffc,  0x108000b0 },
+       { 0x50334,  0x2e400054 },
+       { 0x5fffc,  0x114000b2 },
+       { 0x50338,  0x2e000050 },
+       { 0x5fffc,  0x124000b4 },
+       { 0x5033c,  0x2d80004c },
+       { 0x5fffc,  0x130000b6 },
+       { 0x50340,  0x2d000049 },
+       { 0x5fffc,  0x140000b8 },
+       { 0x50344,  0x2c800045 },
+       { 0x5fffc,  0x150000b9 },
+       { 0x50348,  0x2c000042 },
+       { 0x5fffc,  0x15c000bd },
+       { 0x5034c,  0x2b40003e },
+       { 0x5fffc,  0x16c000bf },
+       { 0x50350,  0x2a80003b },
+       { 0x5fffc,  0x17c000bf },
+       { 0x50354,  0x2a000039 },
+       { 0x5fffc,  0x188000c2 },
+       { 0x50358,  0x29400036 },
+       { 0x5fffc,  0x19c000c4 },
+       { 0x5035c,  0x28800032 },
+       { 0x5fffc,  0x1ac000c5 },
+       { 0x50360,  0x2800002f },
+       { 0x5fffc,  0x1bc000c7 },
+       { 0x50364,  0x2740002c },
+       { 0x5fffc,  0x1cc000c8 },
+       { 0x50368,  0x26c00029 },
+       { 0x5fffc,  0x1dc000c9 },
+       { 0x5036c,  0x26000027 },
+       { 0x5fffc,  0x1ec000cc },
+       { 0x50370,  0x25000024 },
+       { 0x5fffc,  0x200000cc },
+       { 0x50374,  0x24800021 },
+       { 0x5fffc,  0x210000cd },
+       { 0x50378,  0x23800020 },
+       { 0x5fffc,  0x220000ce },
+       { 0x5037c,  0x2300001d },
+};
+
+static struct mdp_table_entry mdp_downscale_y_table_PT4TOPT6[] = {
+       { 0x5fffc,  0x740008c },
+       { 0x50300,  0x33800088 },
+       { 0x5fffc,  0x800008e },
+       { 0x50304,  0x33400084 },
+       { 0x5fffc,  0x8400092 },
+       { 0x50308,  0x33000080 },
+       { 0x5fffc,  0x9000094 },
+       { 0x5030c,  0x3300007b },
+       { 0x5fffc,  0x9c00098 },
+       { 0x50310,  0x32400077 },
+       { 0x5fffc,  0xa40009b },
+       { 0x50314,  0x32000073 },
+       { 0x5fffc,  0xb00009d },
+       { 0x50318,  0x31c0006f },
+       { 0x5fffc,  0xbc000a0 },
+       { 0x5031c,  0x3140006b },
+       { 0x5fffc,  0xc8000a2 },
+       { 0x50320,  0x31000067 },
+       { 0x5fffc,  0xd8000a5 },
+       { 0x50324,  0x30800062 },
+       { 0x5fffc,  0xe4000a8 },
+       { 0x50328,  0x2fc0005f },
+       { 0x5fffc,  0xec000aa },
+       { 0x5032c,  0x2fc0005b },
+       { 0x5fffc,  0xf8000ad },
+       { 0x50330,  0x2f400057 },
+       { 0x5fffc,  0x108000b0 },
+       { 0x50334,  0x2e400054 },
+       { 0x5fffc,  0x114000b2 },
+       { 0x50338,  0x2e000050 },
+       { 0x5fffc,  0x124000b4 },
+       { 0x5033c,  0x2d80004c },
+       { 0x5fffc,  0x130000b6 },
+       { 0x50340,  0x2d000049 },
+       { 0x5fffc,  0x140000b8 },
+       { 0x50344,  0x2c800045 },
+       { 0x5fffc,  0x150000b9 },
+       { 0x50348,  0x2c000042 },
+       { 0x5fffc,  0x15c000bd },
+       { 0x5034c,  0x2b40003e },
+       { 0x5fffc,  0x16c000bf },
+       { 0x50350,  0x2a80003b },
+       { 0x5fffc,  0x17c000bf },
+       { 0x50354,  0x2a000039 },
+       { 0x5fffc,  0x188000c2 },
+       { 0x50358,  0x29400036 },
+       { 0x5fffc,  0x19c000c4 },
+       { 0x5035c,  0x28800032 },
+       { 0x5fffc,  0x1ac000c5 },
+       { 0x50360,  0x2800002f },
+       { 0x5fffc,  0x1bc000c7 },
+       { 0x50364,  0x2740002c },
+       { 0x5fffc,  0x1cc000c8 },
+       { 0x50368,  0x26c00029 },
+       { 0x5fffc,  0x1dc000c9 },
+       { 0x5036c,  0x26000027 },
+       { 0x5fffc,  0x1ec000cc },
+       { 0x50370,  0x25000024 },
+       { 0x5fffc,  0x200000cc },
+       { 0x50374,  0x24800021 },
+       { 0x5fffc,  0x210000cd },
+       { 0x50378,  0x23800020 },
+       { 0x5fffc,  0x220000ce },
+       { 0x5037c,  0x2300001d },
+};
+
+static struct mdp_table_entry mdp_downscale_y_table_PT6TOPT8[] = {
+       { 0x5fffc,  0xfe000070 },
+       { 0x50300,  0x4bc00068 },
+       { 0x5fffc,  0xfe000078 },
+       { 0x50304,  0x4bc00060 },
+       { 0x5fffc,  0xfe000080 },
+       { 0x50308,  0x4b800059 },
+       { 0x5fffc,  0xfe000089 },
+       { 0x5030c,  0x4b000052 },
+       { 0x5fffc,  0xfe400091 },
+       { 0x50310,  0x4a80004b },
+       { 0x5fffc,  0xfe40009a },
+       { 0x50314,  0x4a000044 },
+       { 0x5fffc,  0xfe8000a3 },
+       { 0x50318,  0x4940003d },
+       { 0x5fffc,  0xfec000ac },
+       { 0x5031c,  0x48400037 },
+       { 0x5fffc,  0xff0000b4 },
+       { 0x50320,  0x47800031 },
+       { 0x5fffc,  0xff8000bd },
+       { 0x50324,  0x4640002b },
+       { 0x5fffc,  0xc5 },
+       { 0x50328,  0x45000026 },
+       { 0x5fffc,  0x8000ce },
+       { 0x5032c,  0x43800021 },
+       { 0x5fffc,  0x10000d6 },
+       { 0x50330,  0x4240001c },
+       { 0x5fffc,  0x18000df },
+       { 0x50334,  0x40800018 },
+       { 0x5fffc,  0x24000e6 },
+       { 0x50338,  0x3f000014 },
+       { 0x5fffc,  0x30000ee },
+       { 0x5033c,  0x3d400010 },
+       { 0x5fffc,  0x40000f5 },
+       { 0x50340,  0x3b80000c },
+       { 0x5fffc,  0x50000fc },
+       { 0x50344,  0x39800009 },
+       { 0x5fffc,  0x6000102 },
+       { 0x50348,  0x37c00006 },
+       { 0x5fffc,  0x7000109 },
+       { 0x5034c,  0x35800004 },
+       { 0x5fffc,  0x840010e },
+       { 0x50350,  0x33800002 },
+       { 0x5fffc,  0x9800114 },
+       { 0x50354,  0x31400000 },
+       { 0x5fffc,  0xac00119 },
+       { 0x50358,  0x2f4003fe },
+       { 0x5fffc,  0xc40011e },
+       { 0x5035c,  0x2d0003fc },
+       { 0x5fffc,  0xdc00121 },
+       { 0x50360,  0x2b0003fb },
+       { 0x5fffc,  0xf400125 },
+       { 0x50364,  0x28c003fa },
+       { 0x5fffc,  0x11000128 },
+       { 0x50368,  0x268003f9 },
+       { 0x5fffc,  0x12c0012a },
+       { 0x5036c,  0x244003f9 },
+       { 0x5fffc,  0x1480012c },
+       { 0x50370,  0x224003f8 },
+       { 0x5fffc,  0x1640012e },
+       { 0x50374,  0x200003f8 },
+       { 0x5fffc,  0x1800012f },
+       { 0x50378,  0x1e0003f8 },
+       { 0x5fffc,  0x1a00012f },
+       { 0x5037c,  0x1c0003f8 },
+};
+
+static struct mdp_table_entry mdp_downscale_y_table_PT8TO1[] = {
+       { 0x5fffc,  0x0 },
+       { 0x50300,  0x7fc00000 },
+       { 0x5fffc,  0xff80000d },
+       { 0x50304,  0x7ec003f9 },
+       { 0x5fffc,  0xfec0001c },
+       { 0x50308,  0x7d4003f3 },
+       { 0x5fffc,  0xfe40002b },
+       { 0x5030c,  0x7b8003ed },
+       { 0x5fffc,  0xfd80003c },
+       { 0x50310,  0x794003e8 },
+       { 0x5fffc,  0xfcc0004d },
+       { 0x50314,  0x76c003e4 },
+       { 0x5fffc,  0xfc40005f },
+       { 0x50318,  0x73c003e0 },
+       { 0x5fffc,  0xfb800071 },
+       { 0x5031c,  0x708003de },
+       { 0x5fffc,  0xfac00085 },
+       { 0x50320,  0x6d0003db },
+       { 0x5fffc,  0xfa000098 },
+       { 0x50324,  0x698003d9 },
+       { 0x5fffc,  0xf98000ac },
+       { 0x50328,  0x654003d8 },
+       { 0x5fffc,  0xf8c000c1 },
+       { 0x5032c,  0x610003d7 },
+       { 0x5fffc,  0xf84000d5 },
+       { 0x50330,  0x5c8003d7 },
+       { 0x5fffc,  0xf7c000e9 },
+       { 0x50334,  0x580003d7 },
+       { 0x5fffc,  0xf74000fd },
+       { 0x50338,  0x534003d8 },
+       { 0x5fffc,  0xf6c00112 },
+       { 0x5033c,  0x4e8003d8 },
+       { 0x5fffc,  0xf6800126 },
+       { 0x50340,  0x494003da },
+       { 0x5fffc,  0xf600013a },
+       { 0x50344,  0x448003db },
+       { 0x5fffc,  0xf600014d },
+       { 0x50348,  0x3f4003dd },
+       { 0x5fffc,  0xf5c00160 },
+       { 0x5034c,  0x3a4003df },
+       { 0x5fffc,  0xf5c00172 },
+       { 0x50350,  0x354003e1 },
+       { 0x5fffc,  0xf5c00184 },
+       { 0x50354,  0x304003e3 },
+       { 0x5fffc,  0xf6000195 },
+       { 0x50358,  0x2b0003e6 },
+       { 0x5fffc,  0xf64001a6 },
+       { 0x5035c,  0x260003e8 },
+       { 0x5fffc,  0xf6c001b4 },
+       { 0x50360,  0x214003eb },
+       { 0x5fffc,  0xf78001c2 },
+       { 0x50364,  0x1c4003ee },
+       { 0x5fffc,  0xf80001cf },
+       { 0x50368,  0x17c003f1 },
+       { 0x5fffc,  0xf90001db },
+       { 0x5036c,  0x134003f3 },
+       { 0x5fffc,  0xfa0001e5 },
+       { 0x50370,  0xf0003f6 },
+       { 0x5fffc,  0xfb4001ee },
+       { 0x50374,  0xac003f9 },
+       { 0x5fffc,  0xfcc001f5 },
+       { 0x50378,  0x70003fb },
+       { 0x5fffc,  0xfe4001fb },
+       { 0x5037c,  0x34003fe },
+};
+
+struct mdp_table_entry *mdp_downscale_y_table[MDP_DOWNSCALE_MAX] = {
+       [MDP_DOWNSCALE_PT2TOPT4] = mdp_downscale_y_table_PT2TOPT4,
+       [MDP_DOWNSCALE_PT4TOPT6] = mdp_downscale_y_table_PT4TOPT6,
+       [MDP_DOWNSCALE_PT6TOPT8] = mdp_downscale_y_table_PT6TOPT8,
+       [MDP_DOWNSCALE_PT8TO1]  = mdp_downscale_y_table_PT8TO1,
+};
+
+struct mdp_table_entry mdp_gaussian_blur_table[] = {
+       /* max variance */
+       { 0x5fffc, 0x20000080 },
+       { 0x50280, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50284, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50288, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5028c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50290, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50294, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50298, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5029c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502a8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502ac, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502b8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502bc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502c8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502cc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502d8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502dc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502e8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502ec, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f0, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f4, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502f8, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x502fc, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50300, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50304, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50308, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5030c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50310, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50314, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50318, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5031c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50320, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50324, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50328, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5032c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50330, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50334, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50338, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5033c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50340, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50344, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50348, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5034c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50350, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50354, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50358, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5035c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50360, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50364, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50368, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5036c, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50370, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50374, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x50378, 0x20000080 },
+       { 0x5fffc, 0x20000080 },
+       { 0x5037c, 0x20000080 },
+};
diff --git a/drivers/video/msm/mdp_scale_tables.h b/drivers/video/msm/mdp_scale_tables.h
new file mode 100644 (file)
index 0000000..34077b1
--- /dev/null
@@ -0,0 +1,38 @@
+/* drivers/video/msm_fb/mdp_scale_tables.h
+ *
+ * Copyright (C) 2007 QUALCOMM Incorporated
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _MDP_SCALE_TABLES_H_
+#define _MDP_SCALE_TABLES_H_
+
+#include <linux/types.h>
+struct mdp_table_entry {
+       uint32_t reg;
+       uint32_t val;
+};
+
+extern struct mdp_table_entry mdp_upscale_table[64];
+
+enum {
+       MDP_DOWNSCALE_PT2TOPT4,
+       MDP_DOWNSCALE_PT4TOPT6,
+       MDP_DOWNSCALE_PT6TOPT8,
+       MDP_DOWNSCALE_PT8TO1,
+       MDP_DOWNSCALE_MAX,
+};
+
+extern struct mdp_table_entry *mdp_downscale_x_table[MDP_DOWNSCALE_MAX];
+extern struct mdp_table_entry *mdp_downscale_y_table[MDP_DOWNSCALE_MAX];
+extern struct mdp_table_entry mdp_gaussian_blur_table[];
+
+#endif
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
new file mode 100644 (file)
index 0000000..49101dd
--- /dev/null
@@ -0,0 +1,636 @@
+/* drivers/video/msm/msm_fb.c
+ *
+ * Core MSM framebuffer driver.
+ *
+ * Copyright (C) 2007 Google Incorporated
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/fb.h>
+#include <linux/delay.h>
+
+#include <linux/freezer.h>
+#include <linux/wait.h>
+#include <linux/msm_mdp.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <mach/msm_fb.h>
+#include <mach/board.h>
+#include <linux/workqueue.h>
+#include <linux/clk.h>
+#include <linux/debugfs.h>
+#include <linux/dma-mapping.h>
+
+#define PRINT_FPS 0
+#define PRINT_BLIT_TIME 0
+
+#define SLEEPING 0x4
+#define UPDATING 0x3
+#define FULL_UPDATE_DONE 0x2
+#define WAKING 0x1
+#define AWAKE 0x0
+
+#define NONE 0
+#define SUSPEND_RESUME 0x1
+#define FPS 0x2
+#define BLIT_TIME 0x4
+#define SHOW_UPDATES 0x8
+
+#define DLOG(mask, fmt, args...) \
+do { \
+       if (msmfb_debug_mask & mask) \
+               printk(KERN_INFO "msmfb: "fmt, ##args); \
+} while (0)
+
+static int msmfb_debug_mask;
+module_param_named(msmfb_debug_mask, msmfb_debug_mask, int,
+                  S_IRUGO | S_IWUSR | S_IWGRP);
+
+struct mdp_device *mdp;
+
+struct msmfb_info {
+       struct fb_info *fb;
+       struct msm_panel_data *panel;
+       int xres;
+       int yres;
+       unsigned output_format;
+       unsigned yoffset;
+       unsigned frame_requested;
+       unsigned frame_done;
+       int sleeping;
+       unsigned update_frame;
+       struct {
+               int left;
+               int top;
+               int eright; /* exclusive */
+               int ebottom; /* exclusive */
+       } update_info;
+       char *black;
+
+       spinlock_t update_lock;
+       struct mutex panel_init_lock;
+       wait_queue_head_t frame_wq;
+       struct workqueue_struct *resume_workqueue;
+       struct work_struct resume_work;
+       struct msmfb_callback dma_callback;
+       struct msmfb_callback vsync_callback;
+       struct hrtimer fake_vsync;
+       ktime_t vsync_request_time;
+};
+
+static int msmfb_open(struct fb_info *info, int user)
+{
+       return 0;
+}
+
+static int msmfb_release(struct fb_info *info, int user)
+{
+       return 0;
+}
+
+/* Called from dma interrupt handler, must not sleep */
+static void msmfb_handle_dma_interrupt(struct msmfb_callback *callback)
+{
+       unsigned long irq_flags;
+       struct msmfb_info *msmfb  = container_of(callback, struct msmfb_info,
+                                              dma_callback);
+
+       spin_lock_irqsave(&msmfb->update_lock, irq_flags);
+       msmfb->frame_done = msmfb->frame_requested;
+       if (msmfb->sleeping == UPDATING &&
+           msmfb->frame_done == msmfb->update_frame) {
+               DLOG(SUSPEND_RESUME, "full update completed\n");
+               queue_work(msmfb->resume_workqueue, &msmfb->resume_work);
+       }
+       spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+       wake_up(&msmfb->frame_wq);
+}
+
+static int msmfb_start_dma(struct msmfb_info *msmfb)
+{
+       uint32_t x, y, w, h;
+       unsigned addr;
+       unsigned long irq_flags;
+       uint32_t yoffset;
+       s64 time_since_request;
+       struct msm_panel_data *panel = msmfb->panel;
+
+       spin_lock_irqsave(&msmfb->update_lock, irq_flags);
+       time_since_request = ktime_to_ns(ktime_sub(ktime_get(),
+                            msmfb->vsync_request_time));
+       if (time_since_request > 20 * NSEC_PER_MSEC) {
+               uint32_t us;
+               us = do_div(time_since_request, NSEC_PER_MSEC) / NSEC_PER_USEC;
+               printk(KERN_WARNING "msmfb_start_dma %lld.%03u ms after vsync "
+                       "request\n", time_since_request, us);
+       }
+       if (msmfb->frame_done == msmfb->frame_requested) {
+               spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+               return -1;
+       }
+       if (msmfb->sleeping == SLEEPING) {
+               DLOG(SUSPEND_RESUME, "tried to start dma while asleep\n");
+               spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+               return -1;
+       }
+       x = msmfb->update_info.left;
+       y = msmfb->update_info.top;
+       w = msmfb->update_info.eright - x;
+       h = msmfb->update_info.ebottom - y;
+       yoffset = msmfb->yoffset;
+       msmfb->update_info.left = msmfb->xres + 1;
+       msmfb->update_info.top = msmfb->yres + 1;
+       msmfb->update_info.eright = 0;
+       msmfb->update_info.ebottom = 0;
+       if (unlikely(w > msmfb->xres || h > msmfb->yres ||
+                    w == 0 || h == 0)) {
+               printk(KERN_INFO "invalid update: %d %d %d "
+                               "%d\n", x, y, w, h);
+               msmfb->frame_done = msmfb->frame_requested;
+               goto error;
+       }
+       spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+
+       addr = ((msmfb->xres * (yoffset + y) + x) * 2);
+       mdp->dma(mdp, addr + msmfb->fb->fix.smem_start,
+                msmfb->xres * 2, w, h, x, y, &msmfb->dma_callback,
+                panel->interface_type);
+       return 0;
+error:
+       spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+       /* some clients need to clear their vsync interrupt */
+       if (panel->clear_vsync)
+               panel->clear_vsync(panel);
+       wake_up(&msmfb->frame_wq);
+       return 0;
+}
+
+/* Called from esync interrupt handler, must not sleep */
+static void msmfb_handle_vsync_interrupt(struct msmfb_callback *callback)
+{
+       struct msmfb_info *msmfb = container_of(callback, struct msmfb_info,
+                                              vsync_callback);
+       msmfb_start_dma(msmfb);
+}
+
+static enum hrtimer_restart msmfb_fake_vsync(struct hrtimer *timer)
+{
+       struct msmfb_info *msmfb  = container_of(timer, struct msmfb_info,
+                                              fake_vsync);
+       msmfb_start_dma(msmfb);
+       return HRTIMER_NORESTART;
+}
+
+static void msmfb_pan_update(struct fb_info *info, uint32_t left, uint32_t top,
+                            uint32_t eright, uint32_t ebottom,
+                            uint32_t yoffset, int pan_display)
+{
+       struct msmfb_info *msmfb = info->par;
+       struct msm_panel_data *panel = msmfb->panel;
+       unsigned long irq_flags;
+       int sleeping;
+       int retry = 1;
+
+       DLOG(SHOW_UPDATES, "update %d %d %d %d %d %d\n",
+               left, top, eright, ebottom, yoffset, pan_display);
+restart:
+       spin_lock_irqsave(&msmfb->update_lock, irq_flags);
+
+       /* if we are sleeping, on a pan_display wait 10ms (to throttle back
+        * drawing otherwise return */
+       if (msmfb->sleeping == SLEEPING) {
+               DLOG(SUSPEND_RESUME, "drawing while asleep\n");
+               spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+               if (pan_display)
+                       wait_event_interruptible_timeout(msmfb->frame_wq,
+                               msmfb->sleeping != SLEEPING, HZ/10);
+               return;
+       }
+
+       sleeping = msmfb->sleeping;
+       /* on a full update, if the last frame has not completed, wait for it */
+       if (pan_display && (msmfb->frame_requested != msmfb->frame_done ||
+                           sleeping == UPDATING)) {
+               int ret;
+               spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+               ret = wait_event_interruptible_timeout(msmfb->frame_wq,
+                       msmfb->frame_done == msmfb->frame_requested &&
+                       msmfb->sleeping != UPDATING, 5 * HZ);
+               if (ret <= 0 && (msmfb->frame_requested != msmfb->frame_done ||
+                                msmfb->sleeping == UPDATING)) {
+                       if (retry && panel->request_vsync &&
+                           (sleeping == AWAKE)) {
+                               panel->request_vsync(panel,
+                                       &msmfb->vsync_callback);
+                               retry = 0;
+                               printk(KERN_WARNING "msmfb_pan_display timeout "
+                                       "rerequest vsync\n");
+                       } else {
+                               printk(KERN_WARNING "msmfb_pan_display timeout "
+                                       "waiting for frame start, %d %d\n",
+                                       msmfb->frame_requested,
+                                       msmfb->frame_done);
+                               return;
+                       }
+               }
+               goto restart;
+       }
+
+
+       msmfb->frame_requested++;
+       /* if necessary, update the y offset, if this is the
+        * first full update on resume, set the sleeping state */
+       if (pan_display) {
+               msmfb->yoffset = yoffset;
+               if (left == 0 && top == 0 && eright == info->var.xres &&
+                   ebottom == info->var.yres) {
+                       if (sleeping == WAKING) {
+                               msmfb->update_frame = msmfb->frame_requested;
+                               DLOG(SUSPEND_RESUME, "full update starting\n");
+                               msmfb->sleeping = UPDATING;
+                       }
+               }
+       }
+
+       /* set the update request */
+       if (left < msmfb->update_info.left)
+               msmfb->update_info.left = left;
+       if (top < msmfb->update_info.top)
+               msmfb->update_info.top = top;
+       if (eright > msmfb->update_info.eright)
+               msmfb->update_info.eright = eright;
+       if (ebottom > msmfb->update_info.ebottom)
+               msmfb->update_info.ebottom = ebottom;
+       DLOG(SHOW_UPDATES, "update queued %d %d %d %d %d\n",
+               msmfb->update_info.left, msmfb->update_info.top,
+               msmfb->update_info.eright, msmfb->update_info.ebottom,
+               msmfb->yoffset);
+       spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+
+       /* if the panel is all the way on wait for vsync, otherwise sleep
+        * for 16 ms (long enough for the dma to panel) and then begin dma */
+       msmfb->vsync_request_time = ktime_get();
+       if (panel->request_vsync && (sleeping == AWAKE)) {
+               panel->request_vsync(panel, &msmfb->vsync_callback);
+       } else {
+               if (!hrtimer_active(&msmfb->fake_vsync)) {
+                       hrtimer_start(&msmfb->fake_vsync,
+                                     ktime_set(0, NSEC_PER_SEC/60),
+                                     HRTIMER_MODE_REL);
+               }
+       }
+}
+
+static void msmfb_update(struct fb_info *info, uint32_t left, uint32_t top,
+                        uint32_t eright, uint32_t ebottom)
+{
+       msmfb_pan_update(info, left, top, eright, ebottom, 0, 0);
+}
+
+static void power_on_panel(struct work_struct *work)
+{
+       struct msmfb_info *msmfb =
+               container_of(work, struct msmfb_info, resume_work);
+       struct msm_panel_data *panel = msmfb->panel;
+       unsigned long irq_flags;
+
+       mutex_lock(&msmfb->panel_init_lock);
+       DLOG(SUSPEND_RESUME, "turning on panel\n");
+       if (msmfb->sleeping == UPDATING) {
+               if (panel->unblank(panel)) {
+                       printk(KERN_INFO "msmfb: panel unblank failed,"
+                              "not starting drawing\n");
+                       goto error;
+               }
+               spin_lock_irqsave(&msmfb->update_lock, irq_flags);
+               msmfb->sleeping = AWAKE;
+               wake_up(&msmfb->frame_wq);
+               spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
+       }
+error:
+       mutex_unlock(&msmfb->panel_init_lock);
+}
+
+
+static int msmfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+       if ((var->xres != info->var.xres) ||
+           (var->yres != info->var.yres) ||
+           (var->xres_virtual != info->var.xres_virtual) ||
+           (var->yres_virtual != info->var.yres_virtual) ||
+           (var->xoffset != info->var.xoffset) ||
+           (var->bits_per_pixel != info->var.bits_per_pixel) ||
+           (var->grayscale != info->var.grayscale))
+                return -EINVAL;
+       return 0;
+}
+
+int msmfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+       struct msmfb_info *msmfb = info->par;
+       struct msm_panel_data *panel = msmfb->panel;
+
+       /* "UPDT" */
+       if ((panel->caps & MSMFB_CAP_PARTIAL_UPDATES) &&
+           (var->reserved[0] == 0x54445055)) {
+               msmfb_pan_update(info, var->reserved[1] & 0xffff,
+                                var->reserved[1] >> 16,
+                                var->reserved[2] & 0xffff,
+                                var->reserved[2] >> 16, var->yoffset, 1);
+       } else {
+               msmfb_pan_update(info, 0, 0, info->var.xres, info->var.yres,
+                                var->yoffset, 1);
+       }
+       return 0;
+}
+
+static void msmfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
+{
+       cfb_fillrect(p, rect);
+       msmfb_update(p, rect->dx, rect->dy, rect->dx + rect->width,
+                    rect->dy + rect->height);
+}
+
+static void msmfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
+{
+       cfb_copyarea(p, area);
+       msmfb_update(p, area->dx, area->dy, area->dx + area->width,
+                    area->dy + area->height);
+}
+
+static void msmfb_imageblit(struct fb_info *p, const struct fb_image *image)
+{
+       cfb_imageblit(p, image);
+       msmfb_update(p, image->dx, image->dy, image->dx + image->width,
+                    image->dy + image->height);
+}
+
+
+static int msmfb_blit(struct fb_info *info,
+                     void __user *p)
+{
+       struct mdp_blit_req req;
+       struct mdp_blit_req_list req_list;
+       int i;
+       int ret;
+
+       if (copy_from_user(&req_list, p, sizeof(req_list)))
+               return -EFAULT;
+
+       for (i = 0; i < req_list.count; i++) {
+               struct mdp_blit_req_list *list =
+                       (struct mdp_blit_req_list *)p;
+               if (copy_from_user(&req, &list->req[i], sizeof(req)))
+                       return -EFAULT;
+               ret = mdp->blit(mdp, info, &req);
+               if (ret)
+                       return ret;
+       }
+       return 0;
+}
+
+
+DEFINE_MUTEX(mdp_ppp_lock);
+
+static int msmfb_ioctl(struct fb_info *p, unsigned int cmd, unsigned long arg)
+{
+       void __user *argp = (void __user *)arg;
+       int ret;
+
+       switch (cmd) {
+       case MSMFB_GRP_DISP:
+               mdp->set_grp_disp(mdp, arg);
+               break;
+       case MSMFB_BLIT:
+               ret = msmfb_blit(p, argp);
+               if (ret)
+                       return ret;
+               break;
+       default:
+                       printk(KERN_INFO "msmfb unknown ioctl: %d\n", cmd);
+                       return -EINVAL;
+       }
+       return 0;
+}
+
+static struct fb_ops msmfb_ops = {
+       .owner = THIS_MODULE,
+       .fb_open = msmfb_open,
+       .fb_release = msmfb_release,
+       .fb_check_var = msmfb_check_var,
+       .fb_pan_display = msmfb_pan_display,
+       .fb_fillrect = msmfb_fillrect,
+       .fb_copyarea = msmfb_copyarea,
+       .fb_imageblit = msmfb_imageblit,
+       .fb_ioctl = msmfb_ioctl,
+};
+
+static unsigned PP[16];
+
+
+
+#define BITS_PER_PIXEL 16
+
+static void setup_fb_info(struct msmfb_info *msmfb)
+{
+       struct fb_info *fb_info = msmfb->fb;
+       int r;
+
+       /* finish setting up the fb_info struct */
+       strncpy(fb_info->fix.id, "msmfb", 16);
+       fb_info->fix.ypanstep = 1;
+
+       fb_info->fbops = &msmfb_ops;
+       fb_info->flags = FBINFO_DEFAULT;
+
+       fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
+       fb_info->fix.visual = FB_VISUAL_TRUECOLOR;
+       fb_info->fix.line_length = msmfb->xres * 2;
+
+       fb_info->var.xres = msmfb->xres;
+       fb_info->var.yres = msmfb->yres;
+       fb_info->var.width = msmfb->panel->fb_data->width;
+       fb_info->var.height = msmfb->panel->fb_data->height;
+       fb_info->var.xres_virtual = msmfb->xres;
+       fb_info->var.yres_virtual = msmfb->yres * 2;
+       fb_info->var.bits_per_pixel = BITS_PER_PIXEL;
+       fb_info->var.accel_flags = 0;
+
+       fb_info->var.yoffset = 0;
+
+       if (msmfb->panel->caps & MSMFB_CAP_PARTIAL_UPDATES) {
+               fb_info->var.reserved[0] = 0x54445055;
+               fb_info->var.reserved[1] = 0;
+               fb_info->var.reserved[2] = (uint16_t)msmfb->xres |
+                                          ((uint32_t)msmfb->yres << 16);
+       }
+
+       fb_info->var.red.offset = 11;
+       fb_info->var.red.length = 5;
+       fb_info->var.red.msb_right = 0;
+       fb_info->var.green.offset = 5;
+       fb_info->var.green.length = 6;
+       fb_info->var.green.msb_right = 0;
+       fb_info->var.blue.offset = 0;
+       fb_info->var.blue.length = 5;
+       fb_info->var.blue.msb_right = 0;
+
+       r = fb_alloc_cmap(&fb_info->cmap, 16, 0);
+       fb_info->pseudo_palette = PP;
+
+       PP[0] = 0;
+       for (r = 1; r < 16; r++)
+               PP[r] = 0xffffffff;
+}
+
+static int setup_fbmem(struct msmfb_info *msmfb, struct platform_device *pdev)
+{
+       struct fb_info *fb = msmfb->fb;
+       struct resource *resource;
+       unsigned long size = msmfb->xres * msmfb->yres *
+                            (BITS_PER_PIXEL >> 3) * 2;
+       unsigned char *fbram;
+
+       /* board file might have attached a resource describing an fb */
+       resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!resource)
+               return -EINVAL;
+
+       /* check the resource is large enough to fit the fb */
+       if (resource->end - resource->start < size) {
+               printk(KERN_ERR "allocated resource is too small for "
+                               "fb\n");
+               return -ENOMEM;
+       }
+       fb->fix.smem_start = resource->start;
+       fb->fix.smem_len = resource->end - resource->start;
+       fbram = ioremap(resource->start,
+                       resource->end - resource->start);
+       if (fbram == 0) {
+               printk(KERN_ERR "msmfb: cannot allocate fbram!\n");
+               return -ENOMEM;
+       }
+       fb->screen_base = fbram;
+       return 0;
+}
+
+static int msmfb_probe(struct platform_device *pdev)
+{
+       struct fb_info *fb;
+       struct msmfb_info *msmfb;
+       struct msm_panel_data *panel = pdev->dev.platform_data;
+       int ret;
+
+       if (!panel) {
+               pr_err("msmfb_probe: no platform data\n");
+               return -EINVAL;
+       }
+       if (!panel->fb_data) {
+               pr_err("msmfb_probe: no fb_data\n");
+               return -EINVAL;
+       }
+
+       fb = framebuffer_alloc(sizeof(struct msmfb_info), &pdev->dev);
+       if (!fb)
+               return -ENOMEM;
+       msmfb = fb->par;
+       msmfb->fb = fb;
+       msmfb->panel = panel;
+       msmfb->xres = panel->fb_data->xres;
+       msmfb->yres = panel->fb_data->yres;
+
+       ret = setup_fbmem(msmfb, pdev);
+       if (ret)
+               goto error_setup_fbmem;
+
+       setup_fb_info(msmfb);
+
+       spin_lock_init(&msmfb->update_lock);
+       mutex_init(&msmfb->panel_init_lock);
+       init_waitqueue_head(&msmfb->frame_wq);
+       msmfb->resume_workqueue = create_workqueue("panel_on");
+       if (msmfb->resume_workqueue == NULL) {
+               printk(KERN_ERR "failed to create panel_on workqueue\n");
+               ret = -ENOMEM;
+               goto error_create_workqueue;
+       }
+       INIT_WORK(&msmfb->resume_work, power_on_panel);
+       msmfb->black = kzalloc(msmfb->fb->var.bits_per_pixel*msmfb->xres,
+                              GFP_KERNEL);
+
+       printk(KERN_INFO "msmfb_probe() installing %d x %d panel\n",
+              msmfb->xres, msmfb->yres);
+
+       msmfb->dma_callback.func = msmfb_handle_dma_interrupt;
+       msmfb->vsync_callback.func = msmfb_handle_vsync_interrupt;
+       hrtimer_init(&msmfb->fake_vsync, CLOCK_MONOTONIC,
+                    HRTIMER_MODE_REL);
+
+
+       msmfb->fake_vsync.function = msmfb_fake_vsync;
+
+       ret = register_framebuffer(fb);
+       if (ret)
+               goto error_register_framebuffer;
+
+       msmfb->sleeping = WAKING;
+
+       return 0;
+
+error_register_framebuffer:
+       destroy_workqueue(msmfb->resume_workqueue);
+error_create_workqueue:
+       iounmap(fb->screen_base);
+error_setup_fbmem:
+       framebuffer_release(msmfb->fb);
+       return ret;
+}
+
+static struct platform_driver msm_panel_driver = {
+       /* need to write remove */
+       .probe = msmfb_probe,
+       .driver = {.name = "msm_panel"},
+};
+
+
+static int msmfb_add_mdp_device(struct device *dev,
+                               struct class_interface *class_intf)
+{
+       /* might need locking if mulitple mdp devices */
+       if (mdp)
+               return 0;
+       mdp = container_of(dev, struct mdp_device, dev);
+       return platform_driver_register(&msm_panel_driver);
+}
+
+static void msmfb_remove_mdp_device(struct device *dev,
+                               struct class_interface *class_intf)
+{
+       /* might need locking if mulitple mdp devices */
+       if (dev != &mdp->dev)
+               return;
+       platform_driver_unregister(&msm_panel_driver);
+       mdp = NULL;
+}
+
+static struct class_interface msm_fb_interface = {
+       .add_dev = &msmfb_add_mdp_device,
+       .remove_dev = &msmfb_remove_mdp_device,
+};
+
+static int __init msmfb_init(void)
+{
+       return register_mdp_client(&msm_fb_interface);
+}
+
+module_init(msmfb_init);
index 4440885..551e3e9 100644 (file)
@@ -7,6 +7,69 @@ config FB_OMAP
        help
           Frame buffer driver for OMAP based boards.
 
+config FB_OMAP_LCD_VGA
+        bool "Use LCD in VGA mode"
+               depends on MACH_OMAP_3430SDP || MACH_OMAP_LDP
+
+choice
+       depends on FB_OMAP && MACH_OVERO
+       prompt "Screen resolution"
+       default FB_OMAP_079M3R
+       help
+         Selected desired screen resolution
+
+config FB_OMAP_031M3R
+       boolean "640 x 480 @ 60 Hz Reduced blanking"
+
+config FB_OMAP_048M3R
+       boolean "800 x 600 @ 60 Hz Reduced blanking"
+
+config FB_OMAP_079M3R
+       boolean "1024 x 768 @ 60 Hz Reduced blanking"
+
+config FB_OMAP_092M9R
+       boolean "1280 x 720 @ 60 Hz Reduced blanking"
+
+endchoice
+
+config FB_OMAP_LCDC_EXTERNAL
+       bool "External LCD controller support"
+       depends on FB_OMAP
+       help
+         Say Y here, if you want to have support for boards with an
+         external LCD controller connected to the SoSSI/RFBI interface.
+
+config FB_OMAP_LCDC_HWA742
+       bool "Epson HWA742 LCD controller support"
+       depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
+       help
+         Say Y here if you want to have support for the external
+         Epson HWA742 LCD controller.
+
+config FB_OMAP_LCDC_BLIZZARD
+       bool "Epson Blizzard LCD controller support"
+       depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
+       help
+         Say Y here if you want to have support for the external
+         Epson Blizzard LCD controller.
+
+config FB_OMAP_MANUAL_UPDATE
+       bool "Default to manual update mode"
+       depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
+       help
+         Say Y here, if your user-space applications are capable of
+         notifying the frame buffer driver when a change has occured in
+         the frame buffer content and thus a reload of the image data to
+         the external frame buffer is required. If unsure, say N.
+
+config FB_OMAP_LCD_MIPID
+       bool "MIPI DBI-C/DCS compatible LCD support"
+       depends on FB_OMAP && SPI_MASTER
+       help
+         Say Y here if you want to have support for LCDs compatible with
+         the Mobile Industry Processor Interface DBI-C/DCS
+         specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3)
+
 config FB_OMAP_BOOTLOADER_INIT
        bool "Check bootloader initialization"
        depends on FB_OMAP
@@ -36,23 +99,4 @@ config FB_OMAP_DMA_TUNE
           answer yes. Answer no if you have a dedicated video
           memory, or don't use any of the accelerated features.
 
-config FB_OMAP_LCDC_EXTERNAL
-       bool "External LCD controller support"
-       depends on FB_OMAP
-       help
-         Say Y here, if you want to have support for boards with an
-         external LCD controller connected to the SoSSI/RFBI interface.
-
-config FB_OMAP_LCDC_HWA742
-       bool "Epson HWA742 LCD controller support"
-       depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
-       help
-         Say Y here if you want to have support for the external
-         Epson HWA742 LCD controller.
 
-config FB_OMAP_LCDC_BLIZZARD
-       bool "Epson Blizzard LCD controller support"
-       depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
-       help
-         Say Y here if you want to have support for the external
-         Epson Blizzard LCD controller.
index ed13889..b63b198 100644 (file)
@@ -8,6 +8,7 @@ objs-yy := omapfb_main.o
 
 objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o
 objs-y$(CONFIG_ARCH_OMAP2) += dispc.o
+objs-y$(CONFIG_ARCH_OMAP3) += dispc.o
 
 objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o
 objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o
@@ -15,6 +16,7 @@ objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o
 objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o
 objs-y$(CONFIG_FB_OMAP_LCDC_BLIZZARD) += blizzard.o
 
+objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o
 objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o
 objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o
 objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o
@@ -24,5 +26,15 @@ objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
 objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
 objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
 
+objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
+objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o
+objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o
+objs-y$(CONFIG_MACH_OMAP_LDP) += lcd_ldp.o
+objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o
+objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o
+objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
+objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
+objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o
+
 omapfb-objs := $(objs-yy)
 
index 9dfcf39..d5e5955 100644 (file)
@@ -44,6 +44,7 @@
 #define BLIZZARD_CLK_SRC                       0x0e
 #define BLIZZARD_MEM_BANK0_ACTIVATE            0x10
 #define BLIZZARD_MEM_BANK0_STATUS              0x14
+#define BLIZZARD_PANEL_CONFIGURATION           0x28
 #define BLIZZARD_HDISP                         0x2a
 #define BLIZZARD_HNDP                          0x2c
 #define BLIZZARD_VDISP0                                0x2e
@@ -162,6 +163,10 @@ struct blizzard_struct {
        int                     vid_scaled;
        int                     last_color_mode;
        int                     zoom_on;
+       int                     zoom_area_gx1;
+       int                     zoom_area_gx2;
+       int                     zoom_area_gy1;
+       int                     zoom_area_gy2;
        int                     screen_width;
        int                     screen_height;
        unsigned                te_connected:1;
@@ -513,6 +518,13 @@ static int do_full_screen_update(struct blizzard_request *req)
        return REQ_PENDING;
 }
 
+static int check_1d_intersect(int a1, int a2, int b1, int b2)
+{
+       if (a2 <= b1 || b2 <= a1)
+               return 0;
+       return 1;
+}
+
 /* Setup all planes with an overlapping area with the update window. */
 static int do_partial_update(struct blizzard_request *req, int plane,
                             int x, int y, int w, int h,
@@ -525,6 +537,7 @@ static int do_partial_update(struct blizzard_request *req, int plane,
        int color_mode;
        int flags;
        int zoom_off;
+       int have_zoom_for_this_update = 0;
 
        /* Global coordinates, relative to pixel 0,0 of the LCD */
        gx1 = x + blizzard.plane[plane].pos_x;
@@ -544,10 +557,6 @@ static int do_partial_update(struct blizzard_request *req, int plane,
                gx2_out = gx1_out + w_out;
                gy2_out = gy1_out + h_out;
        }
-       zoom_off = blizzard.zoom_on && gx1 == 0 && gy1 == 0 &&
-               w == blizzard.screen_width && h == blizzard.screen_height;
-       blizzard.zoom_on = (!zoom_off && blizzard.zoom_on) ||
-                          (w < w_out || h < h_out);
 
        for (i = 0; i < OMAPFB_PLANE_NUM; i++) {
                struct plane_info *p = &blizzard.plane[i];
@@ -653,8 +662,49 @@ static int do_partial_update(struct blizzard_request *req, int plane,
        else
                disable_tearsync();
 
+       if ((gx2_out - gx1_out) != (gx2 - gx1) ||
+           (gy2_out - gy1_out) != (gy2 - gy1))
+               have_zoom_for_this_update = 1;
+
+       /* 'background' type of screen update (as opposed to 'destructive')
+          can be used to disable scaling if scaling is active */
+       zoom_off = blizzard.zoom_on && !have_zoom_for_this_update &&
+           (gx1_out == 0) && (gx2_out == blizzard.screen_width) &&
+           (gy1_out == 0) && (gy2_out == blizzard.screen_height) &&
+           (gx1 == 0) && (gy1 == 0);
+
+       if (blizzard.zoom_on && !have_zoom_for_this_update && !zoom_off &&
+           check_1d_intersect(blizzard.zoom_area_gx1, blizzard.zoom_area_gx2,
+                              gx1_out, gx2_out) &&
+           check_1d_intersect(blizzard.zoom_area_gy1, blizzard.zoom_area_gy2,
+                              gy1_out, gy2_out)) {
+               /* Previous screen update was using scaling, current update
+                * is not using it. Additionally, current screen update is
+                * going to overlap with the scaled area. Scaling needs to be
+                * disabled in order to avoid 'magnifying glass' effect.
+                * Dummy setup of background window can be used for this.
+                */
+               set_window_regs(0, 0, blizzard.screen_width,
+                               blizzard.screen_height,
+                               0, 0, blizzard.screen_width,
+                               blizzard.screen_height,
+                               BLIZZARD_COLOR_RGB565, 1, flags);
+               blizzard.zoom_on = 0;
+       }
+
+       /* remember scaling settings if we have scaled update */
+       if (have_zoom_for_this_update) {
+               blizzard.zoom_on = 1;
+               blizzard.zoom_area_gx1 = gx1_out;
+               blizzard.zoom_area_gx2 = gx2_out;
+               blizzard.zoom_area_gy1 = gy1_out;
+               blizzard.zoom_area_gy2 = gy2_out;
+       }
+
        set_window_regs(gx1, gy1, gx2, gy2, gx1_out, gy1_out, gx2_out, gy2_out,
                        color_mode, zoom_off, flags);
+       if (zoom_off)
+               blizzard.zoom_on = 0;
 
        blizzard.extif->set_bits_per_cycle(16);
        /* set_window_regs has left the register index at the right
@@ -908,6 +958,35 @@ static int blizzard_set_scale(int plane, int orig_w, int orig_h,
        return 0;
 }
 
+static int blizzard_set_rotate(int angle)
+{
+       u32 l;
+
+       l = blizzard_read_reg(BLIZZARD_PANEL_CONFIGURATION);
+       l &= ~0x03;
+
+       switch (angle) {
+       case 0:
+               l = l | 0x00;
+               break;
+       case 90:
+               l = l | 0x03;
+               break;
+       case 180:
+               l = l | 0x02;
+               break;
+       case 270:
+               l = l | 0x01;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       blizzard_write_reg(BLIZZARD_PANEL_CONFIGURATION, l);
+
+       return 0;
+}
+
 static int blizzard_enable_plane(int plane, int enable)
 {
        if (enable)
@@ -1285,7 +1364,8 @@ static void blizzard_get_caps(int plane, struct omapfb_caps *caps)
        caps->ctrl |= OMAPFB_CAPS_MANUAL_UPDATE |
                OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE |
                OMAPFB_CAPS_WINDOW_SCALE |
-               OMAPFB_CAPS_WINDOW_OVERLAY;
+               OMAPFB_CAPS_WINDOW_OVERLAY |
+               OMAPFB_CAPS_WINDOW_ROTATE;
        if (blizzard.te_connected)
                caps->ctrl |= OMAPFB_CAPS_TEARSYNC;
        caps->wnd_color |= (1 << OMAPFB_COLOR_RGB565) |
@@ -1560,6 +1640,7 @@ struct lcd_ctrl blizzard_ctrl = {
        .setup_plane            = blizzard_setup_plane,
        .set_scale              = blizzard_set_scale,
        .enable_plane           = blizzard_enable_plane,
+       .set_rotate             = blizzard_set_rotate,
        .update_window          = blizzard_update_window_async,
        .sync                   = blizzard_sync,
        .suspend                = blizzard_suspend,
index 915439d..80a11d0 100644 (file)
@@ -155,6 +155,8 @@ struct resmap {
        unsigned long   *map;
 };
 
+#define MAX_IRQ_HANDLERS            4
+
 static struct {
        void __iomem    *base;
 
@@ -167,9 +169,11 @@ static struct {
 
        int             ext_mode;
 
-       unsigned long   enabled_irqs;
-       void            (*irq_callback)(void *);
-       void            *irq_callback_data;
+       struct {
+               u32     irq_mask;
+               void    (*callback)(void *);
+               void    *data;
+       } irq_handlers[MAX_IRQ_HANDLERS];
        struct completion       frame_done;
 
        int             fir_hinc[OMAPFB_PLANE_NUM];
@@ -286,7 +290,7 @@ static void setup_plane_fifo(int plane, int ext_mode)
        BUG_ON(plane > 2);
 
        l = dispc_read_reg(fsz_reg[plane]);
-       l &= FLD_MASK(0, 9);
+       l &= FLD_MASK(0, 11);
        if (ext_mode) {
                low = l * 3 / 4;
                high = l;
@@ -294,7 +298,7 @@ static void setup_plane_fifo(int plane, int ext_mode)
                low = l / 4;
                high = l * 3 / 4;
        }
-       MOD_REG_FLD(ftrs_reg[plane], FLD_MASK(16, 9) | FLD_MASK(0, 9),
+       MOD_REG_FLD(ftrs_reg[plane], FLD_MASK(16, 12) | FLD_MASK(0, 12),
                        (high << 16) | low);
 }
 
@@ -809,57 +813,74 @@ static void set_lcd_timings(void)
        panel->pixel_clock = fck / lck_div / pck_div / 1000;
 }
 
-int omap_dispc_request_irq(void (*callback)(void *data), void *data)
+static void recalc_irq_mask(void)
 {
-       int r = 0;
+       int i;
+       unsigned long irq_mask = DISPC_IRQ_MASK_ERROR;
 
-       BUG_ON(callback == NULL);
+       for (i = 0; i < MAX_IRQ_HANDLERS; i++) {
+               if (!dispc.irq_handlers[i].callback)
+                       continue;
 
-       if (dispc.irq_callback)
-               r = -EBUSY;
-       else {
-               dispc.irq_callback = callback;
-               dispc.irq_callback_data = data;
+               irq_mask |= dispc.irq_handlers[i].irq_mask;
        }
 
-       return r;
-}
-EXPORT_SYMBOL(omap_dispc_request_irq);
-
-void omap_dispc_enable_irqs(int irq_mask)
-{
        enable_lcd_clocks(1);
-       dispc.enabled_irqs = irq_mask;
-       irq_mask |= DISPC_IRQ_MASK_ERROR;
        MOD_REG_FLD(DISPC_IRQENABLE, 0x7fff, irq_mask);
        enable_lcd_clocks(0);
 }
-EXPORT_SYMBOL(omap_dispc_enable_irqs);
 
-void omap_dispc_disable_irqs(int irq_mask)
+int omap_dispc_request_irq(unsigned long irq_mask, void (*callback)(void *data),
+                          void *data)
 {
-       enable_lcd_clocks(1);
-       dispc.enabled_irqs &= ~irq_mask;
-       irq_mask &= ~DISPC_IRQ_MASK_ERROR;
-       MOD_REG_FLD(DISPC_IRQENABLE, 0x7fff, irq_mask);
-       enable_lcd_clocks(0);
+       int i;
+
+       BUG_ON(callback == NULL);
+
+       for (i = 0; i < MAX_IRQ_HANDLERS; i++) {
+               if (dispc.irq_handlers[i].callback)
+                       continue;
+
+               dispc.irq_handlers[i].irq_mask = irq_mask;
+               dispc.irq_handlers[i].callback = callback;
+               dispc.irq_handlers[i].data = data;
+               recalc_irq_mask();
+
+               return 0;
+       }
+
+       return -EBUSY;
 }
-EXPORT_SYMBOL(omap_dispc_disable_irqs);
+EXPORT_SYMBOL(omap_dispc_request_irq);
 
-void omap_dispc_free_irq(void)
+void omap_dispc_free_irq(unsigned long irq_mask, void (*callback)(void *data),
+                        void *data)
 {
-       enable_lcd_clocks(1);
-       omap_dispc_disable_irqs(DISPC_IRQ_MASK_ALL);
-       dispc.irq_callback = NULL;
-       dispc.irq_callback_data = NULL;
-       enable_lcd_clocks(0);
+       int i;
+
+       for (i = 0; i < MAX_IRQ_HANDLERS; i++) {
+               if (dispc.irq_handlers[i].callback == callback &&
+                   dispc.irq_handlers[i].data == data) {
+                       dispc.irq_handlers[i].irq_mask = 0;
+                       dispc.irq_handlers[i].callback = NULL;
+                       dispc.irq_handlers[i].data = NULL;
+                       recalc_irq_mask();
+                       return;
+               }
+       }
+
+       BUG();
 }
 EXPORT_SYMBOL(omap_dispc_free_irq);
 
 static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
 {
-       u32 stat = dispc_read_reg(DISPC_IRQSTATUS);
+       u32 stat;
+       int i = 0;
+
+       enable_lcd_clocks(1);
 
+       stat = dispc_read_reg(DISPC_IRQSTATUS);
        if (stat & DISPC_IRQ_FRAMEMASK)
                complete(&dispc.frame_done);
 
@@ -870,11 +891,17 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
                }
        }
 
-       if ((stat & dispc.enabled_irqs) && dispc.irq_callback)
-               dispc.irq_callback(dispc.irq_callback_data);
+       for (i = 0; i < MAX_IRQ_HANDLERS; i++) {
+               if (unlikely(dispc.irq_handlers[i].callback &&
+                            (stat & dispc.irq_handlers[i].irq_mask)))
+                       dispc.irq_handlers[i].callback(
+                                               dispc.irq_handlers[i].data);
+       }
 
        dispc_write_reg(DISPC_IRQSTATUS, stat);
 
+       enable_lcd_clocks(0);
+
        return IRQ_HANDLED;
 }
 
@@ -913,18 +940,13 @@ static void put_dss_clocks(void)
 
 static void enable_lcd_clocks(int enable)
 {
-       if (enable)
+       if (enable) {
+               clk_enable(dispc.dss_ick);
                clk_enable(dispc.dss1_fck);
-       else
+       } else {
                clk_disable(dispc.dss1_fck);
-}
-
-static void enable_interface_clocks(int enable)
-{
-       if (enable)
-               clk_enable(dispc.dss_ick);
-       else
                clk_disable(dispc.dss_ick);
+       }
 }
 
 static void enable_digit_clocks(int enable)
@@ -1365,7 +1387,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
        if ((r = get_dss_clocks()) < 0)
                goto fail0;
 
-       enable_interface_clocks(1);
        enable_lcd_clocks(1);
 
 #ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
@@ -1396,10 +1417,10 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
                enable_digit_clocks(0);
        }
 
-       /* Enable smart idle and autoidle */
-       l = dispc_read_reg(DISPC_CONTROL);
+       /* Enable smart standby/idle, autoidle and wakeup */
+       l = dispc_read_reg(DISPC_SYSCONFIG);
        l &= ~((3 << 12) | (3 << 3));
-       l |= (2 << 12) | (2 << 3) | (1 << 0);
+       l |= (2 << 12) | (2 << 3) | (1 << 2) | (1 << 0);
        dispc_write_reg(DISPC_SYSCONFIG, l);
        omap_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG);
 
@@ -1409,10 +1430,9 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
        dispc_write_reg(DISPC_CONFIG, l);
 
        l = dispc_read_reg(DISPC_IRQSTATUS);
-       dispc_write_reg(l, DISPC_IRQSTATUS);
+       dispc_write_reg(DISPC_IRQSTATUS, l);
 
-       /* Enable those that we handle always */
-       omap_dispc_enable_irqs(DISPC_IRQ_FRAMEMASK);
+       recalc_irq_mask();
 
        if ((r = request_irq(INT_24XX_DSS_IRQ, omap_dispc_irq_handler,
                           0, MODULE_NAME, fbdev)) < 0) {
@@ -1469,7 +1489,6 @@ fail2:
        free_irq(INT_24XX_DSS_IRQ, fbdev);
 fail1:
        enable_lcd_clocks(0);
-       enable_interface_clocks(0);
        put_dss_clocks();
 fail0:
        iounmap(dispc.base);
@@ -1487,7 +1506,6 @@ static void omap_dispc_cleanup(void)
        cleanup_fbmem();
        free_palette_ram();
        free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
-       enable_interface_clocks(0);
        put_dss_clocks();
        iounmap(dispc.base);
 }
index ef720a7..c15ea77 100644 (file)
@@ -37,9 +37,10 @@ extern void omap_dispc_set_lcd_size(int width, int height);
 extern void omap_dispc_enable_lcd_out(int enable);
 extern void omap_dispc_enable_digit_out(int enable);
 
-extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
-extern void omap_dispc_free_irq(void);
+extern int omap_dispc_request_irq(unsigned long irq_mask,
+                                  void (*callback)(void *data), void *data);
+extern void omap_dispc_free_irq(unsigned long irq_mask,
+                                void (*callback)(void *data), void *data);
 
 extern const struct lcd_ctrl omap2_int_ctrl;
-
 #endif
index 5d4f348..ca51583 100644 (file)
@@ -131,7 +131,7 @@ struct {
 
        struct omapfb_device    *fbdev;
        struct lcd_ctrl_extif   *extif;
-       struct lcd_ctrl         *int_ctrl;
+       const struct lcd_ctrl   *int_ctrl;
 
        struct clk              *sys_ck;
 } hwa742;
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
new file mode 100644 (file)
index 0000000..393712b
--- /dev/null
@@ -0,0 +1,202 @@
+/*
+ * LCD panel support for the TI 2430SDP board
+ *
+ * Copyright (C) 2007 MontaVista
+ * Author: Hunyue Yau <hyau@mvista.com>
+ *
+ * Derived from drivers/video/omap/lcd-apollon.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define SDP2430_LCD_PANEL_BACKLIGHT_GPIO       91
+#define SDP2430_LCD_PANEL_ENABLE_GPIO          154
+#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO       24
+#define SDP3430_LCD_PANEL_ENABLE_GPIO          28
+
+static unsigned backlight_gpio;
+static unsigned enable_gpio;
+
+#define LCD_PIXCLOCK_MAX               5400 /* freq 5.4 MHz */
+#define PM_RECEIVER             TWL4030_MODULE_PM_RECEIVER
+#define ENABLE_VAUX2_DEDICATED  0x09
+#define ENABLE_VAUX2_DEV_GRP    0x20
+#define ENABLE_VAUX3_DEDICATED 0x03
+#define ENABLE_VAUX3_DEV_GRP   0x20
+
+#define ENABLE_VPLL2_DEDICATED          0x05
+#define ENABLE_VPLL2_DEV_GRP            0xE0
+#define TWL4030_VPLL2_DEV_GRP           0x33
+#define TWL4030_VPLL2_DEDICATED         0x36
+
+#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+
+
+static int sdp2430_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       if (machine_is_omap_3430sdp()) {
+               enable_gpio    = SDP3430_LCD_PANEL_ENABLE_GPIO;
+               backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO;
+       } else {
+               enable_gpio    = SDP2430_LCD_PANEL_ENABLE_GPIO;
+               backlight_gpio = SDP2430_LCD_PANEL_BACKLIGHT_GPIO;
+       }
+
+       gpio_request(enable_gpio, "LCD enable");        /* LCD panel */
+       gpio_request(backlight_gpio, "LCD bl");         /* LCD backlight */
+       gpio_direction_output(enable_gpio, 0);
+       gpio_direction_output(backlight_gpio, 0);
+
+       return 0;
+}
+
+static void sdp2430_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(backlight_gpio);
+       gpio_free(enable_gpio);
+}
+
+static int sdp2430_panel_enable(struct lcd_panel *panel)
+{
+       u8 ded_val, ded_reg;
+       u8 grp_val, grp_reg;
+
+       if (machine_is_omap_3430sdp()) {
+               ded_reg = TWL4030_VAUX3_DEDICATED;
+               ded_val = ENABLE_VAUX3_DEDICATED;
+               grp_reg = TWL4030_VAUX3_DEV_GRP;
+               grp_val = ENABLE_VAUX3_DEV_GRP;
+
+               if (omap_rev() > OMAP3430_REV_ES1_0) {
+                       t2_out(PM_RECEIVER, ENABLE_VPLL2_DEDICATED,
+                                       TWL4030_VPLL2_DEDICATED);
+                       t2_out(PM_RECEIVER, ENABLE_VPLL2_DEV_GRP,
+                                       TWL4030_VPLL2_DEV_GRP);
+               }
+       } else {
+               ded_reg = TWL4030_VAUX2_DEDICATED;
+               ded_val = ENABLE_VAUX2_DEDICATED;
+               grp_reg = TWL4030_VAUX2_DEV_GRP;
+               grp_val = ENABLE_VAUX2_DEV_GRP;
+       }
+
+       gpio_set_value(enable_gpio, 1);
+       gpio_set_value(backlight_gpio, 1);
+
+       if (0 != t2_out(PM_RECEIVER, ded_val, ded_reg))
+               return -EIO;
+       if (0 != t2_out(PM_RECEIVER, grp_val, grp_reg))
+               return -EIO;
+
+       return 0;
+}
+
+static void sdp2430_panel_disable(struct lcd_panel *panel)
+{
+       gpio_set_value(enable_gpio, 0);
+       gpio_set_value(backlight_gpio, 0);
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
+               t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEDICATED);
+               t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEV_GRP);
+               msleep(4);
+       }
+}
+
+static unsigned long sdp2430_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+struct lcd_panel sdp2430_panel = {
+       .name           = "sdp2430",
+       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
+                         OMAP_LCDC_INV_HSYNC,
+
+       .bpp            = 16,
+       .data_lines     = 16,
+       .x_res          = 240,
+       .y_res          = 320,
+       .hsw            = 3,            /* hsync_len (4) - 1 */
+       .hfp            = 3,            /* right_margin (4) - 1 */
+       .hbp            = 39,           /* left_margin (40) - 1 */
+       .vsw            = 1,            /* vsync_len (2) - 1 */
+       .vfp            = 2,            /* lower_margin */
+       .vbp            = 7,            /* upper_margin (8) - 1 */
+
+       .pixel_clock    = LCD_PIXCLOCK_MAX,
+
+       .init           = sdp2430_panel_init,
+       .cleanup        = sdp2430_panel_cleanup,
+       .enable         = sdp2430_panel_enable,
+       .disable        = sdp2430_panel_disable,
+       .get_caps       = sdp2430_panel_get_caps,
+};
+
+static int sdp2430_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&sdp2430_panel);
+       return 0;
+}
+
+static int sdp2430_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int sdp2430_panel_suspend(struct platform_device *pdev,
+                                       pm_message_t mesg)
+{
+       return 0;
+}
+
+static int sdp2430_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver sdp2430_panel_driver = {
+       .probe          = sdp2430_panel_probe,
+       .remove         = sdp2430_panel_remove,
+       .suspend        = sdp2430_panel_suspend,
+       .resume         = sdp2430_panel_resume,
+       .driver         = {
+               .name   = "sdp2430_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init sdp2430_panel_drv_init(void)
+{
+       return platform_driver_register(&sdp2430_panel_driver);
+}
+
+static void __exit sdp2430_panel_drv_exit(void)
+{
+       platform_driver_unregister(&sdp2430_panel_driver);
+}
+
+module_init(sdp2430_panel_drv_init);
+module_exit(sdp2430_panel_drv_exit);
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
new file mode 100644 (file)
index 0000000..1f74399
--- /dev/null
@@ -0,0 +1,137 @@
+/*
+ * Based on drivers/video/omap/lcd_inn1510.c
+ *
+ * LCD panel support for the Amstrad E3 (Delta) videophone.
+ *
+ * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+
+#include <mach/board-ams-delta.h>
+#include <mach/hardware.h>
+#include <mach/omapfb.h>
+
+#define AMS_DELTA_DEFAULT_CONTRAST     112
+
+static int ams_delta_panel_init(struct lcd_panel *panel,
+               struct omapfb_device *fbdev)
+{
+       return 0;
+}
+
+static void ams_delta_panel_cleanup(struct lcd_panel *panel)
+{
+}
+
+static int ams_delta_panel_enable(struct lcd_panel *panel)
+{
+       ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP,
+                       AMS_DELTA_LATCH2_LCD_NDISP);
+       ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN,
+                       AMS_DELTA_LATCH2_LCD_VBLEN);
+
+       omap_writeb(1, OMAP_PWL_CLK_ENABLE);
+       omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE);
+
+       return 0;
+}
+
+static void ams_delta_panel_disable(struct lcd_panel *panel)
+{
+       ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, 0);
+       ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, 0);
+}
+
+static unsigned long ams_delta_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+static struct lcd_panel ams_delta_panel = {
+       .name           = "ams-delta",
+       .config         = 0,
+
+       .bpp            = 12,
+       .data_lines     = 16,
+       .x_res          = 480,
+       .y_res          = 320,
+       .pixel_clock    = 4687,
+       .hsw            = 3,
+       .hfp            = 1,
+       .hbp            = 1,
+       .vsw            = 1,
+       .vfp            = 0,
+       .vbp            = 0,
+       .pcd            = 0,
+       .acb            = 37,
+
+       .init           = ams_delta_panel_init,
+       .cleanup        = ams_delta_panel_cleanup,
+       .enable         = ams_delta_panel_enable,
+       .disable        = ams_delta_panel_disable,
+       .get_caps       = ams_delta_panel_get_caps,
+};
+
+static int ams_delta_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&ams_delta_panel);
+       return 0;
+}
+
+static int ams_delta_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int ams_delta_panel_suspend(struct platform_device *pdev,
+               pm_message_t mesg)
+{
+       return 0;
+}
+
+static int ams_delta_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver ams_delta_panel_driver = {
+       .probe          = ams_delta_panel_probe,
+       .remove         = ams_delta_panel_remove,
+       .suspend        = ams_delta_panel_suspend,
+       .resume         = ams_delta_panel_resume,
+       .driver         = {
+               .name   = "lcd_ams_delta",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int ams_delta_panel_drv_init(void)
+{
+       return platform_driver_register(&ams_delta_panel_driver);
+}
+
+static void ams_delta_panel_drv_cleanup(void)
+{
+       platform_driver_unregister(&ams_delta_panel_driver);
+}
+
+module_init(ams_delta_panel_drv_init);
+module_exit(ams_delta_panel_drv_cleanup);
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c
new file mode 100644 (file)
index 0000000..626ae3a
--- /dev/null
@@ -0,0 +1,138 @@
+/*
+ * LCD panel support for the Samsung OMAP2 Apollon board
+ *
+ * Copyright (C) 2005,2006 Samsung Electronics
+ * Author: Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * Derived from drivers/video/omap/lcd-h4.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+
+/* #define USE_35INCH_LCD 1 */
+
+static int apollon_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       /* configure LCD PWR_EN */
+       omap_cfg_reg(M21_242X_GPIO11);
+       return 0;
+}
+
+static void apollon_panel_cleanup(struct lcd_panel *panel)
+{
+}
+
+static int apollon_panel_enable(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+static void apollon_panel_disable(struct lcd_panel *panel)
+{
+}
+
+static unsigned long apollon_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+struct lcd_panel apollon_panel = {
+       .name           = "apollon",
+       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
+                         OMAP_LCDC_INV_HSYNC,
+
+       .bpp            = 16,
+       .data_lines     = 18,
+#ifdef USE_35INCH_LCD
+       .x_res          = 240,
+       .y_res          = 320,
+       .hsw            = 2,
+       .hfp            = 3,
+       .hbp            = 9,
+       .vsw            = 4,
+       .vfp            = 3,
+       .vbp            = 5,
+#else
+       .x_res          = 480,
+       .y_res          = 272,
+       .hsw            = 41,
+       .hfp            = 2,
+       .hbp            = 2,
+       .vsw            = 10,
+       .vfp            = 2,
+       .vbp            = 2,
+#endif
+       .pixel_clock    = 6250,
+
+       .init           = apollon_panel_init,
+       .cleanup        = apollon_panel_cleanup,
+       .enable         = apollon_panel_enable,
+       .disable        = apollon_panel_disable,
+       .get_caps       = apollon_panel_get_caps,
+};
+
+static int apollon_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&apollon_panel);
+       return 0;
+}
+
+static int apollon_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int apollon_panel_suspend(struct platform_device *pdev,
+                                 pm_message_t mesg)
+{
+       return 0;
+}
+
+static int apollon_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver apollon_panel_driver = {
+       .probe          = apollon_panel_probe,
+       .remove         = apollon_panel_remove,
+       .suspend        = apollon_panel_suspend,
+       .resume         = apollon_panel_resume,
+       .driver         = {
+               .name   = "apollon_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init apollon_panel_drv_init(void)
+{
+       return platform_driver_register(&apollon_panel_driver);
+}
+
+static void __exit apollon_panel_drv_exit(void)
+{
+       platform_driver_unregister(&apollon_panel_driver);
+}
+
+module_init(apollon_panel_drv_init);
+module_exit(apollon_panel_drv_exit);
index 2486237..417ae5e 100644 (file)
@@ -124,12 +124,12 @@ struct platform_driver h3_panel_driver = {
        },
 };
 
-static int h3_panel_drv_init(void)
+static int __init h3_panel_drv_init(void)
 {
        return platform_driver_register(&h3_panel_driver);
 }
 
-static void h3_panel_drv_cleanup(void)
+static void __exit h3_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&h3_panel_driver);
 }
index 6ff5643..0c398bd 100644 (file)
@@ -102,12 +102,12 @@ static struct platform_driver h4_panel_driver = {
        },
 };
 
-static int h4_panel_drv_init(void)
+static int __init h4_panel_drv_init(void)
 {
        return platform_driver_register(&h4_panel_driver);
 }
 
-static void h4_panel_drv_cleanup(void)
+static void __exit h4_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&h4_panel_driver);
 }
index 6953ed4..cdbd8bb 100644 (file)
@@ -109,12 +109,12 @@ struct platform_driver innovator1510_panel_driver = {
        },
 };
 
-static int innovator1510_panel_drv_init(void)
+static int __init innovator1510_panel_drv_init(void)
 {
        return platform_driver_register(&innovator1510_panel_driver);
 }
 
-static void innovator1510_panel_drv_cleanup(void)
+static void __exit innovator1510_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&innovator1510_panel_driver);
 }
index 4c4f7ee..268f7f8 100644 (file)
@@ -133,12 +133,12 @@ struct platform_driver innovator1610_panel_driver = {
        },
 };
 
-static int innovator1610_panel_drv_init(void)
+static int __init innovator1610_panel_drv_init(void)
 {
        return platform_driver_register(&innovator1610_panel_driver);
 }
 
-static void innovator1610_panel_drv_cleanup(void)
+static void __exit innovator1610_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&innovator1610_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c
new file mode 100644 (file)
index 0000000..dbfe897
--- /dev/null
@@ -0,0 +1,200 @@
+/*
+ * LCD panel support for the TI LDP board
+ *
+ * Copyright (C) 2007 WindRiver
+ * Author: Stanley Miao <stanley.miao@windriver.com>
+ *
+ * Derived from drivers/video/omap/lcd-2430sdp.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define LCD_PANEL_BACKLIGHT_GPIO       (15 + OMAP_MAX_GPIO_LINES)
+#define LCD_PANEL_ENABLE_GPIO          (7 + OMAP_MAX_GPIO_LINES)
+
+#define LCD_PANEL_RESET_GPIO           55
+#define LCD_PANEL_QVGA_GPIO            56
+
+#ifdef CONFIG_FB_OMAP_LCD_VGA
+#define LCD_XRES               480
+#define LCD_YRES               640
+#define LCD_PIXCLOCK_MAX       41700
+#else
+#define LCD_XRES               240
+#define LCD_YRES               320
+#define LCD_PIXCLOCK_MAX       185186
+#endif
+
+#define PM_RECEIVER             TWL4030_MODULE_PM_RECEIVER
+#define ENABLE_VAUX2_DEDICATED  0x09
+#define ENABLE_VAUX2_DEV_GRP    0x20
+#define ENABLE_VAUX3_DEDICATED 0x03
+#define ENABLE_VAUX3_DEV_GRP   0x20
+
+#define ENABLE_VPLL2_DEDICATED          0x05
+#define ENABLE_VPLL2_DEV_GRP            0xE0
+#define TWL4030_VPLL2_DEV_GRP           0x33
+#define TWL4030_VPLL2_DEDICATED         0x36
+
+#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+
+
+static int ldp_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       gpio_request(LCD_PANEL_RESET_GPIO, "lcd reset");
+       gpio_request(LCD_PANEL_QVGA_GPIO, "lcd qvga");
+       gpio_request(LCD_PANEL_ENABLE_GPIO, "lcd panel");
+       gpio_request(LCD_PANEL_BACKLIGHT_GPIO, "lcd backlight");
+
+       gpio_direction_output(LCD_PANEL_QVGA_GPIO, 0);
+       gpio_direction_output(LCD_PANEL_RESET_GPIO, 0);
+       gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0);
+       gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0);
+
+#ifdef CONFIG_FB_OMAP_LCD_VGA
+       gpio_set_value(LCD_PANEL_QVGA_GPIO, 0);
+#else
+       gpio_set_value(LCD_PANEL_QVGA_GPIO, 1);
+#endif
+       gpio_set_value(LCD_PANEL_RESET_GPIO, 1);
+
+       return 0;
+}
+
+static void ldp_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(LCD_PANEL_BACKLIGHT_GPIO);
+       gpio_free(LCD_PANEL_ENABLE_GPIO);
+       gpio_free(LCD_PANEL_QVGA_GPIO);
+       gpio_free(LCD_PANEL_RESET_GPIO);
+}
+
+static int ldp_panel_enable(struct lcd_panel *panel)
+{
+       if (0 != t2_out(PM_RECEIVER, ENABLE_VPLL2_DEDICATED,
+                       TWL4030_VPLL2_DEDICATED))
+               return -EIO;
+       if (0 != t2_out(PM_RECEIVER, ENABLE_VPLL2_DEV_GRP,
+                       TWL4030_VPLL2_DEV_GRP))
+               return -EIO;
+
+       gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);
+       gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 1);
+
+       if (0 != t2_out(PM_RECEIVER, ENABLE_VAUX3_DEDICATED,
+                               TWL4030_VAUX3_DEDICATED))
+               return -EIO;
+       if (0 != t2_out(PM_RECEIVER, ENABLE_VAUX3_DEV_GRP,
+                               TWL4030_VAUX3_DEV_GRP))
+               return -EIO;
+
+       return 0;
+}
+
+static void ldp_panel_disable(struct lcd_panel *panel)
+{
+       gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0);
+       gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0);
+
+       t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEDICATED);
+       t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEV_GRP);
+       msleep(4);
+}
+
+static unsigned long ldp_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+struct lcd_panel ldp_panel = {
+       .name           = "ldp",
+       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
+                         OMAP_LCDC_INV_HSYNC,
+
+       .bpp            = 16,
+       .data_lines     = 18,
+       .x_res          = LCD_XRES,
+       .y_res          = LCD_YRES,
+       .hsw            = 3,            /* hsync_len (4) - 1 */
+       .hfp            = 3,            /* right_margin (4) - 1 */
+       .hbp            = 39,           /* left_margin (40) - 1 */
+       .vsw            = 1,            /* vsync_len (2) - 1 */
+       .vfp            = 2,            /* lower_margin */
+       .vbp            = 7,            /* upper_margin (8) - 1 */
+
+       .pixel_clock    = LCD_PIXCLOCK_MAX,
+
+       .init           = ldp_panel_init,
+       .cleanup        = ldp_panel_cleanup,
+       .enable         = ldp_panel_enable,
+       .disable        = ldp_panel_disable,
+       .get_caps       = ldp_panel_get_caps,
+};
+
+static int ldp_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&ldp_panel);
+       return 0;
+}
+
+static int ldp_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int ldp_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+       return 0;
+}
+
+static int ldp_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver ldp_panel_driver = {
+       .probe          = ldp_panel_probe,
+       .remove         = ldp_panel_remove,
+       .suspend        = ldp_panel_suspend,
+       .resume         = ldp_panel_resume,
+       .driver         = {
+               .name   = "ldp_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init ldp_panel_drv_init(void)
+{
+       return platform_driver_register(&ldp_panel_driver);
+}
+
+static void __exit ldp_panel_drv_exit(void)
+{
+       platform_driver_unregister(&ldp_panel_driver);
+}
+
+module_init(ldp_panel_drv_init);
+module_exit(ldp_panel_drv_exit);
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
new file mode 100644 (file)
index 0000000..918ee89
--- /dev/null
@@ -0,0 +1,625 @@
+/*
+ * LCD driver for MIPI DBI-C / DCS compatible LCDs
+ *
+ * Copyright (C) 2006 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/spi/spi.h>
+
+#include <mach/omapfb.h>
+#include <mach/lcd_mipid.h>
+
+#define MIPID_MODULE_NAME              "lcd_mipid"
+
+#define MIPID_CMD_READ_DISP_ID         0x04
+#define MIPID_CMD_READ_RED             0x06
+#define MIPID_CMD_READ_GREEN           0x07
+#define MIPID_CMD_READ_BLUE            0x08
+#define MIPID_CMD_READ_DISP_STATUS     0x09
+#define MIPID_CMD_RDDSDR               0x0F
+#define MIPID_CMD_SLEEP_IN             0x10
+#define MIPID_CMD_SLEEP_OUT            0x11
+#define MIPID_CMD_DISP_OFF             0x28
+#define MIPID_CMD_DISP_ON              0x29
+
+#define MIPID_ESD_CHECK_PERIOD         msecs_to_jiffies(5000)
+
+#define to_mipid_device(p)             container_of(p, struct mipid_device, \
+                                               panel)
+struct mipid_device {
+       int             enabled;
+       int             revision;
+       unsigned int    saved_bklight_level;
+       unsigned long   hw_guard_end;           /* next value of jiffies
+                                                  when we can issue the
+                                                  next sleep in/out command */
+       unsigned long   hw_guard_wait;          /* max guard time in jiffies */
+
+       struct omapfb_device    *fbdev;
+       struct spi_device       *spi;
+       struct mutex            mutex;
+       struct lcd_panel        panel;
+
+       struct workqueue_struct *esd_wq;
+       struct delayed_work     esd_work;
+       void                    (*esd_check)(struct mipid_device *m);
+};
+
+static void mipid_transfer(struct mipid_device *md, int cmd, const u8 *wbuf,
+                          int wlen, u8 *rbuf, int rlen)
+{
+       struct spi_message      m;
+       struct spi_transfer     *x, xfer[4];
+       u16                     w;
+       int                     r;
+
+       BUG_ON(md->spi == NULL);
+
+       spi_message_init(&m);
+
+       memset(xfer, 0, sizeof(xfer));
+       x = &xfer[0];
+
+       cmd &=  0xff;
+       x->tx_buf               = &cmd;
+       x->bits_per_word        = 9;
+       x->len                  = 2;
+       spi_message_add_tail(x, &m);
+
+       if (wlen) {
+               x++;
+               x->tx_buf               = wbuf;
+               x->len                  = wlen;
+               x->bits_per_word        = 9;
+               spi_message_add_tail(x, &m);
+       }
+
+       if (rlen) {
+               x++;
+               x->rx_buf       = &w;
+               x->len          = 1;
+               spi_message_add_tail(x, &m);
+
+               if (rlen > 1) {
+                       /* Arrange for the extra clock before the first
+                        * data bit.
+                        */
+                       x->bits_per_word = 9;
+                       x->len           = 2;
+
+                       x++;
+                       x->rx_buf        = &rbuf[1];
+                       x->len           = rlen - 1;
+                       spi_message_add_tail(x, &m);
+               }
+       }
+
+       r = spi_sync(md->spi, &m);
+       if (r < 0)
+               dev_dbg(&md->spi->dev, "spi_sync %d\n", r);
+
+       if (rlen)
+               rbuf[0] = w & 0xff;
+}
+
+static inline void mipid_cmd(struct mipid_device *md, int cmd)
+{
+       mipid_transfer(md, cmd, NULL, 0, NULL, 0);
+}
+
+static inline void mipid_write(struct mipid_device *md,
+                              int reg, const u8 *buf, int len)
+{
+       mipid_transfer(md, reg, buf, len, NULL, 0);
+}
+
+static inline void mipid_read(struct mipid_device *md,
+                             int reg, u8 *buf, int len)
+{
+       mipid_transfer(md, reg, NULL, 0, buf, len);
+}
+
+static void set_data_lines(struct mipid_device *md, int data_lines)
+{
+       u16 par;
+
+       switch (data_lines) {
+       case 16:
+               par = 0x150;
+               break;
+       case 18:
+               par = 0x160;
+               break;
+       case 24:
+               par = 0x170;
+               break;
+       }
+       mipid_write(md, 0x3a, (u8 *)&par, 2);
+}
+
+static void send_init_string(struct mipid_device *md)
+{
+       u16 initpar[] = { 0x0102, 0x0100, 0x0100 };
+
+       mipid_write(md, 0xc2, (u8 *)initpar, sizeof(initpar));
+       set_data_lines(md, md->panel.data_lines);
+}
+
+static void hw_guard_start(struct mipid_device *md, int guard_msec)
+{
+       md->hw_guard_wait = msecs_to_jiffies(guard_msec);
+       md->hw_guard_end = jiffies + md->hw_guard_wait;
+}
+
+static void hw_guard_wait(struct mipid_device *md)
+{
+       unsigned long wait = md->hw_guard_end - jiffies;
+
+       if ((long)wait > 0 && wait <= md->hw_guard_wait) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(wait);
+       }
+}
+
+static void set_sleep_mode(struct mipid_device *md, int on)
+{
+       int cmd, sleep_time = 50;
+
+       if (on)
+               cmd = MIPID_CMD_SLEEP_IN;
+       else
+               cmd = MIPID_CMD_SLEEP_OUT;
+       hw_guard_wait(md);
+       mipid_cmd(md, cmd);
+       hw_guard_start(md, 120);
+       /*
+        * When we enable the panel, it seems we _have_ to sleep
+        * 120 ms before sending the init string. When disabling the
+        * panel we'll sleep for the duration of 2 frames, so that the
+        * controller can still provide the PCLK,HS,VS signals.
+        */
+       if (!on)
+               sleep_time = 120;
+       msleep(sleep_time);
+}
+
+static void set_display_state(struct mipid_device *md, int enabled)
+{
+       int cmd = enabled ? MIPID_CMD_DISP_ON : MIPID_CMD_DISP_OFF;
+
+       mipid_cmd(md, cmd);
+}
+
+static int mipid_set_bklight_level(struct lcd_panel *panel, unsigned int level)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+       struct mipid_platform_data *pd = md->spi->dev.platform_data;
+
+       if (pd->get_bklight_max == NULL || pd->set_bklight_level == NULL)
+               return -ENODEV;
+       if (level > pd->get_bklight_max(pd))
+               return -EINVAL;
+       if (!md->enabled) {
+               md->saved_bklight_level = level;
+               return 0;
+       }
+       pd->set_bklight_level(pd, level);
+
+       return 0;
+}
+
+static unsigned int mipid_get_bklight_level(struct lcd_panel *panel)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+       struct mipid_platform_data *pd = md->spi->dev.platform_data;
+
+       if (pd->get_bklight_level == NULL)
+               return -ENODEV;
+       return pd->get_bklight_level(pd);
+}
+
+static unsigned int mipid_get_bklight_max(struct lcd_panel *panel)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+       struct mipid_platform_data *pd = md->spi->dev.platform_data;
+
+       if (pd->get_bklight_max == NULL)
+               return -ENODEV;
+
+       return pd->get_bklight_max(pd);
+}
+
+static unsigned long mipid_get_caps(struct lcd_panel *panel)
+{
+       return OMAPFB_CAPS_SET_BACKLIGHT;
+}
+
+static u16 read_first_pixel(struct mipid_device *md)
+{
+       u16 pixel;
+       u8 red, green, blue;
+
+       mutex_lock(&md->mutex);
+       mipid_read(md, MIPID_CMD_READ_RED, &red, 1);
+       mipid_read(md, MIPID_CMD_READ_GREEN, &green, 1);
+       mipid_read(md, MIPID_CMD_READ_BLUE, &blue, 1);
+       mutex_unlock(&md->mutex);
+
+       switch (md->panel.data_lines) {
+       case 16:
+               pixel = ((red >> 1) << 11) | (green << 5) | (blue >> 1);
+               break;
+       case 24:
+               /* 24 bit -> 16 bit */
+               pixel = ((red >> 3) << 11) | ((green >> 2) << 5) |
+                       (blue >> 3);
+               break;
+       default:
+               pixel = 0;
+               BUG();
+       }
+
+       return pixel;
+}
+
+static int mipid_run_test(struct lcd_panel *panel, int test_num)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+       static const u16 test_values[4] = {
+               0x0000, 0xffff, 0xaaaa, 0x5555,
+       };
+       int i;
+
+       if (test_num != MIPID_TEST_RGB_LINES)
+               return MIPID_TEST_INVALID;
+
+       for (i = 0; i < ARRAY_SIZE(test_values); i++) {
+               int delay;
+               unsigned long tmo;
+
+               omapfb_write_first_pixel(md->fbdev, test_values[i]);
+               tmo = jiffies + msecs_to_jiffies(100);
+               delay = 25;
+               while (1) {
+                       u16 pixel;
+
+                       msleep(delay);
+                       pixel = read_first_pixel(md);
+                       if (pixel == test_values[i])
+                               break;
+                       if (time_after(jiffies, tmo)) {
+                               dev_err(&md->spi->dev,
+                                       "MIPI LCD RGB I/F test failed: "
+                                       "expecting %04x, got %04x\n",
+                                       test_values[i], pixel);
+                               return MIPID_TEST_FAILED;
+                       }
+                       delay = 10;
+               }
+       }
+
+       return 0;
+}
+
+static void ls041y3_esd_recover(struct mipid_device *md)
+{
+       dev_err(&md->spi->dev, "performing LCD ESD recovery\n");
+       set_sleep_mode(md, 1);
+       set_sleep_mode(md, 0);
+}
+
+static void ls041y3_esd_check_mode1(struct mipid_device *md)
+{
+       u8 state1, state2;
+
+       mipid_read(md, MIPID_CMD_RDDSDR, &state1, 1);
+       set_sleep_mode(md, 0);
+       mipid_read(md, MIPID_CMD_RDDSDR, &state2, 1);
+       dev_dbg(&md->spi->dev, "ESD mode 1 state1 %02x state2 %02x\n",
+               state1, state2);
+       /* Each sleep out command will trigger a self diagnostic and flip
+       * Bit6 if the test passes.
+       */
+       if (!((state1 ^ state2) & (1 << 6)))
+               ls041y3_esd_recover(md);
+}
+
+static void ls041y3_esd_check_mode2(struct mipid_device *md)
+{
+       int i;
+       u8 rbuf[2];
+       static const struct {
+               int     cmd;
+               int     wlen;
+               u16     wbuf[3];
+       } *rd, rd_ctrl[7] = {
+               { 0xb0, 4, { 0x0101, 0x01fe, } },
+               { 0xb1, 4, { 0x01de, 0x0121, } },
+               { 0xc2, 4, { 0x0100, 0x0100, } },
+               { 0xbd, 2, { 0x0100, } },
+               { 0xc2, 4, { 0x01fc, 0x0103, } },
+               { 0xb4, 0, },
+               { 0x00, 0, },
+       };
+
+       rd = rd_ctrl;
+       for (i = 0; i < 3; i++, rd++)
+               mipid_write(md, rd->cmd, (u8 *)rd->wbuf, rd->wlen);
+
+       udelay(10);
+       mipid_read(md, rd->cmd, rbuf, 2);
+       rd++;
+
+       for (i = 0; i < 3; i++, rd++) {
+               udelay(10);
+               mipid_write(md, rd->cmd, (u8 *)rd->wbuf, rd->wlen);
+       }
+
+       dev_dbg(&md->spi->dev, "ESD mode 2 state %02x\n", rbuf[1]);
+       if (rbuf[1] == 0x00)
+               ls041y3_esd_recover(md);
+}
+
+static void ls041y3_esd_check(struct mipid_device *md)
+{
+       ls041y3_esd_check_mode1(md);
+       if (md->revision >= 0x88)
+               ls041y3_esd_check_mode2(md);
+}
+
+static void mipid_esd_start_check(struct mipid_device *md)
+{
+       if (md->esd_check != NULL)
+               queue_delayed_work(md->esd_wq, &md->esd_work,
+                                  MIPID_ESD_CHECK_PERIOD);
+}
+
+static void mipid_esd_stop_check(struct mipid_device *md)
+{
+       if (md->esd_check != NULL)
+               cancel_rearming_delayed_workqueue(md->esd_wq, &md->esd_work);
+}
+
+static void mipid_esd_work(struct work_struct *work)
+{
+       struct mipid_device *md = container_of(work, struct mipid_device,
+                                              esd_work.work);
+
+       mutex_lock(&md->mutex);
+       md->esd_check(md);
+       mutex_unlock(&md->mutex);
+       mipid_esd_start_check(md);
+}
+
+static int mipid_enable(struct lcd_panel *panel)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+
+       mutex_lock(&md->mutex);
+
+       if (md->enabled) {
+               mutex_unlock(&md->mutex);
+               return 0;
+       }
+       set_sleep_mode(md, 0);
+       md->enabled = 1;
+       send_init_string(md);
+       set_display_state(md, 1);
+       mipid_set_bklight_level(panel, md->saved_bklight_level);
+       mipid_esd_start_check(md);
+
+       mutex_unlock(&md->mutex);
+       return 0;
+}
+
+static void mipid_disable(struct lcd_panel *panel)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+
+       /*
+        * A final ESD work might be called before returning,
+        * so do this without holding the lock.
+        */
+       mipid_esd_stop_check(md);
+       mutex_lock(&md->mutex);
+
+       if (!md->enabled) {
+               mutex_unlock(&md->mutex);
+               return;
+       }
+       md->saved_bklight_level = mipid_get_bklight_level(panel);
+       mipid_set_bklight_level(panel, 0);
+       set_display_state(md, 0);
+       set_sleep_mode(md, 1);
+       md->enabled = 0;
+
+       mutex_unlock(&md->mutex);
+}
+
+static int panel_enabled(struct mipid_device *md)
+{
+       u32 disp_status;
+       int enabled;
+
+       mipid_read(md, MIPID_CMD_READ_DISP_STATUS, (u8 *)&disp_status, 4);
+       disp_status = __be32_to_cpu(disp_status);
+       enabled = (disp_status & (1 << 17)) && (disp_status & (1 << 10));
+       dev_dbg(&md->spi->dev,
+               "LCD panel %senabled by bootloader (status 0x%04x)\n",
+               enabled ? "" : "not ", disp_status);
+       return enabled;
+}
+
+static int mipid_init(struct lcd_panel *panel,
+                           struct omapfb_device *fbdev)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+
+       md->fbdev = fbdev;
+       md->esd_wq = create_singlethread_workqueue("mipid_esd");
+       if (md->esd_wq == NULL) {
+               dev_err(&md->spi->dev, "can't create ESD workqueue\n");
+               return -ENOMEM;
+       }
+       INIT_DELAYED_WORK(&md->esd_work, mipid_esd_work);
+       mutex_init(&md->mutex);
+
+       md->enabled = panel_enabled(md);
+
+       if (md->enabled)
+               mipid_esd_start_check(md);
+       else
+               md->saved_bklight_level = mipid_get_bklight_level(panel);
+
+       return 0;
+}
+
+static void mipid_cleanup(struct lcd_panel *panel)
+{
+       struct mipid_device *md = to_mipid_device(panel);
+
+       if (md->enabled)
+               mipid_esd_stop_check(md);
+       destroy_workqueue(md->esd_wq);
+}
+
+static struct lcd_panel mipid_panel = {
+       .config         = OMAP_LCDC_PANEL_TFT,
+
+       .bpp            = 16,
+       .x_res          = 800,
+       .y_res          = 480,
+       .pixel_clock    = 21940,
+       .hsw            = 50,
+       .hfp            = 20,
+       .hbp            = 15,
+       .vsw            = 2,
+       .vfp            = 1,
+       .vbp            = 3,
+
+       .init                   = mipid_init,
+       .cleanup                = mipid_cleanup,
+       .enable                 = mipid_enable,
+       .disable                = mipid_disable,
+       .get_caps               = mipid_get_caps,
+       .set_bklight_level      = mipid_set_bklight_level,
+       .get_bklight_level      = mipid_get_bklight_level,
+       .get_bklight_max        = mipid_get_bklight_max,
+       .run_test               = mipid_run_test,
+};
+
+static int mipid_detect(struct mipid_device *md)
+{
+       struct mipid_platform_data *pdata;
+       u8 display_id[3];
+
+       pdata = md->spi->dev.platform_data;
+       if (pdata == NULL) {
+               dev_err(&md->spi->dev, "missing platform data\n");
+               return -ENOENT;
+       }
+
+       mipid_read(md, MIPID_CMD_READ_DISP_ID, display_id, 3);
+       dev_dbg(&md->spi->dev, "MIPI display ID: %02x%02x%02x\n",
+               display_id[0], display_id[1], display_id[2]);
+
+       switch (display_id[0]) {
+       case 0x45:
+               md->panel.name = "lph8923";
+               break;
+       case 0x83:
+               md->panel.name = "ls041y3";
+               md->esd_check = ls041y3_esd_check;
+               break;
+       default:
+               md->panel.name = "unknown";
+               dev_err(&md->spi->dev, "invalid display ID\n");
+               return -ENODEV;
+       }
+
+       md->revision = display_id[1];
+       md->panel.data_lines = pdata->data_lines;
+       pr_info("omapfb: %s rev %02x LCD detected, %d data lines\n",
+                       md->panel.name, md->revision, md->panel.data_lines);
+
+       return 0;
+}
+
+static int mipid_spi_probe(struct spi_device *spi)
+{
+       struct mipid_device *md;
+       int r;
+
+       md = kzalloc(sizeof(*md), GFP_KERNEL);
+       if (md == NULL) {
+               dev_err(&spi->dev, "out of memory\n");
+               return -ENOMEM;
+       }
+
+       spi->mode = SPI_MODE_0;
+       md->spi = spi;
+       dev_set_drvdata(&spi->dev, md);
+       md->panel = mipid_panel;
+
+       r = mipid_detect(md);
+       if (r < 0)
+               return r;
+
+       omapfb_register_panel(&md->panel);
+
+       return 0;
+}
+
+static int mipid_spi_remove(struct spi_device *spi)
+{
+       struct mipid_device *md = dev_get_drvdata(&spi->dev);
+
+       mipid_disable(&md->panel);
+       kfree(md);
+
+       return 0;
+}
+
+static struct spi_driver mipid_spi_driver = {
+       .driver = {
+               .name   = MIPID_MODULE_NAME,
+               .bus    = &spi_bus_type,
+               .owner  = THIS_MODULE,
+       },
+       .probe  = mipid_spi_probe,
+       .remove = __devexit_p(mipid_spi_remove),
+};
+
+static int mipid_drv_init(void)
+{
+       spi_register_driver(&mipid_spi_driver);
+
+       return 0;
+}
+module_init(mipid_drv_init);
+
+static void mipid_drv_cleanup(void)
+{
+       spi_unregister_driver(&mipid_spi_driver);
+}
+module_exit(mipid_drv_cleanup);
+
+MODULE_DESCRIPTION("MIPI display driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
new file mode 100644 (file)
index 0000000..7a2bbe2
--- /dev/null
@@ -0,0 +1,191 @@
+/*
+ * LCD panel support for the MISTRAL OMAP2EVM board
+ *
+ * Author: Arun C <arunedarath@mistralsolutions.com>
+ *
+ * Derived from drivers/video/omap/lcd_omap3evm.c
+ * Derived from drivers/video/omap/lcd-apollon.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define LCD_PANEL_ENABLE_GPIO  154
+#define LCD_PANEL_LR           128
+#define LCD_PANEL_UD           129
+#define LCD_PANEL_INI          152
+#define LCD_PANEL_QVGA         148
+#define LCD_PANEL_RESB         153
+
+#define TWL_LED_LEDEN          0x00
+#define TWL_PWMA_PWMAON                0x00
+#define TWL_PWMA_PWMAOFF       0x01
+
+static unsigned int bklight_level;
+
+static int omap2evm_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       gpio_request(LCD_PANEL_ENABLE_GPIO, "LCD enable");
+       gpio_request(LCD_PANEL_LR, "LCD lr");
+       gpio_request(LCD_PANEL_UD, "LCD ud");
+       gpio_request(LCD_PANEL_INI, "LCD ini");
+       gpio_request(LCD_PANEL_QVGA, "LCD qvga");
+       gpio_request(LCD_PANEL_RESB, "LCD resb");
+
+       gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);
+       gpio_direction_output(LCD_PANEL_RESB, 1);
+       gpio_direction_output(LCD_PANEL_INI, 1);
+       gpio_direction_output(LCD_PANEL_QVGA, 0);
+       gpio_direction_output(LCD_PANEL_LR, 1);
+       gpio_direction_output(LCD_PANEL_UD, 1);
+
+       twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+       bklight_level = 100;
+
+       return 0;
+}
+
+static void omap2evm_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(LCD_PANEL_RESB);
+       gpio_free(LCD_PANEL_QVGA);
+       gpio_free(LCD_PANEL_INI);
+       gpio_free(LCD_PANEL_UD);
+       gpio_free(LCD_PANEL_LR);
+       gpio_free(LCD_PANEL_ENABLE_GPIO);
+}
+
+static int omap2evm_panel_enable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 0);
+       return 0;
+}
+
+static void omap2evm_panel_disable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1);
+}
+
+static unsigned long omap2evm_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+static int omap2evm_bklight_setlevel(struct lcd_panel *panel,
+                                               unsigned int level)
+{
+       u8 c;
+       if ((level >= 0) && (level <= 100)) {
+               c = (125 * (100 - level)) / 100 + 2;
+               twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+               bklight_level = level;
+       }
+       return 0;
+}
+
+static unsigned int omap2evm_bklight_getlevel(struct lcd_panel *panel)
+{
+       return bklight_level;
+}
+
+static unsigned int omap2evm_bklight_getmaxlevel(struct lcd_panel *panel)
+{
+       return 100;
+}
+
+struct lcd_panel omap2evm_panel = {
+       .name           = "omap2evm",
+       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
+                         OMAP_LCDC_INV_HSYNC,
+
+       .bpp            = 16,
+       .data_lines     = 18,
+       .x_res          = 480,
+       .y_res          = 640,
+       .hsw            = 3,
+       .hfp            = 0,
+       .hbp            = 28,
+       .vsw            = 2,
+       .vfp            = 1,
+       .vbp            = 0,
+
+       .pixel_clock    = 20000,
+
+       .init           = omap2evm_panel_init,
+       .cleanup        = omap2evm_panel_cleanup,
+       .enable         = omap2evm_panel_enable,
+       .disable        = omap2evm_panel_disable,
+       .get_caps       = omap2evm_panel_get_caps,
+       .set_bklight_level      = omap2evm_bklight_setlevel,
+       .get_bklight_level      = omap2evm_bklight_getlevel,
+       .get_bklight_max        = omap2evm_bklight_getmaxlevel,
+};
+
+static int omap2evm_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&omap2evm_panel);
+       return 0;
+}
+
+static int omap2evm_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int omap2evm_panel_suspend(struct platform_device *pdev,
+                                  pm_message_t mesg)
+{
+       return 0;
+}
+
+static int omap2evm_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver omap2evm_panel_driver = {
+       .probe          = omap2evm_panel_probe,
+       .remove         = omap2evm_panel_remove,
+       .suspend        = omap2evm_panel_suspend,
+       .resume         = omap2evm_panel_resume,
+       .driver         = {
+               .name   = "omap2evm_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init omap2evm_panel_drv_init(void)
+{
+       return platform_driver_register(&omap2evm_panel_driver);
+}
+
+static void __exit omap2evm_panel_drv_exit(void)
+{
+       platform_driver_unregister(&omap2evm_panel_driver);
+}
+
+module_init(omap2evm_panel_drv_init);
+module_exit(omap2evm_panel_drv_exit);
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
new file mode 100644 (file)
index 0000000..4011910
--- /dev/null
@@ -0,0 +1,130 @@
+/*
+ * LCD panel support for the TI OMAP3 Beagle board
+ *
+ * Author: Koen Kooi <koen@openembedded.org>
+ *
+ * Derived from drivers/video/omap/lcd-omap3evm.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define LCD_PANEL_ENABLE_GPIO       170
+
+static int omap3beagle_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       gpio_request(LCD_PANEL_ENABLE_GPIO, "LCD enable");
+       return 0;
+}
+
+static void omap3beagle_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(LCD_PANEL_ENABLE_GPIO);
+}
+
+static int omap3beagle_panel_enable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1);
+       return 0;
+}
+
+static void omap3beagle_panel_disable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 0);
+}
+
+static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+struct lcd_panel omap3beagle_panel = {
+       .name           = "omap3beagle",
+       .config         = OMAP_LCDC_PANEL_TFT,
+
+       .bpp            = 16,
+       .data_lines     = 24,
+       .x_res          = 1024,
+       .y_res          = 768,
+       .hsw            = 3,            /* hsync_len (4) - 1 */
+       .hfp            = 3,            /* right_margin (4) - 1 */
+       .hbp            = 39,           /* left_margin (40) - 1 */
+       .vsw            = 1,            /* vsync_len (2) - 1 */
+       .vfp            = 2,            /* lower_margin */
+       .vbp            = 7,            /* upper_margin (8) - 1 */
+
+       .pixel_clock    = 64000,
+
+       .init           = omap3beagle_panel_init,
+       .cleanup        = omap3beagle_panel_cleanup,
+       .enable         = omap3beagle_panel_enable,
+       .disable        = omap3beagle_panel_disable,
+       .get_caps       = omap3beagle_panel_get_caps,
+};
+
+static int omap3beagle_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&omap3beagle_panel);
+       return 0;
+}
+
+static int omap3beagle_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int omap3beagle_panel_suspend(struct platform_device *pdev,
+                                  pm_message_t mesg)
+{
+       return 0;
+}
+
+static int omap3beagle_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver omap3beagle_panel_driver = {
+       .probe          = omap3beagle_panel_probe,
+       .remove         = omap3beagle_panel_remove,
+       .suspend        = omap3beagle_panel_suspend,
+       .resume         = omap3beagle_panel_resume,
+       .driver         = {
+               .name   = "omap3beagle_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init omap3beagle_panel_drv_init(void)
+{
+       return platform_driver_register(&omap3beagle_panel_driver);
+}
+
+static void __exit omap3beagle_panel_drv_exit(void)
+{
+       platform_driver_unregister(&omap3beagle_panel_driver);
+}
+
+module_init(omap3beagle_panel_drv_init);
+module_exit(omap3beagle_panel_drv_exit);
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
new file mode 100644 (file)
index 0000000..b6a4c2c
--- /dev/null
@@ -0,0 +1,192 @@
+/*
+ * LCD panel support for the TI OMAP3 EVM board
+ *
+ * Author: Steve Sakoman <steve@sakoman.com>
+ *
+ * Derived from drivers/video/omap/lcd-apollon.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define LCD_PANEL_ENABLE_GPIO       153
+#define LCD_PANEL_LR                2
+#define LCD_PANEL_UD                3
+#define LCD_PANEL_INI               152
+#define LCD_PANEL_QVGA              154
+#define LCD_PANEL_RESB              155
+
+#define ENABLE_VDAC_DEDICATED  0x03
+#define ENABLE_VDAC_DEV_GRP    0x20
+#define ENABLE_VPLL2_DEDICATED 0x05
+#define ENABLE_VPLL2_DEV_GRP   0xE0
+
+#define TWL_LED_LEDEN          0x00
+#define TWL_PWMA_PWMAON                0x00
+#define TWL_PWMA_PWMAOFF       0x01
+
+static unsigned int bklight_level;
+
+static int omap3evm_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       gpio_request(LCD_PANEL_LR, "LCD lr");
+       gpio_request(LCD_PANEL_UD, "LCD ud");
+       gpio_request(LCD_PANEL_INI, "LCD ini");
+       gpio_request(LCD_PANEL_RESB, "LCD resb");
+       gpio_request(LCD_PANEL_QVGA, "LCD qvga");
+
+       gpio_direction_output(LCD_PANEL_RESB, 1);
+       gpio_direction_output(LCD_PANEL_INI, 1);
+       gpio_direction_output(LCD_PANEL_QVGA, 0);
+       gpio_direction_output(LCD_PANEL_LR, 1);
+       gpio_direction_output(LCD_PANEL_UD, 1);
+
+       twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+       bklight_level = 100;
+
+       return 0;
+}
+
+static void omap3evm_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(LCD_PANEL_QVGA);
+       gpio_free(LCD_PANEL_RESB);
+       gpio_free(LCD_PANEL_INI);
+       gpio_free(LCD_PANEL_UD);
+       gpio_free(LCD_PANEL_LR);
+}
+
+static int omap3evm_panel_enable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 0);
+       return 0;
+}
+
+static void omap3evm_panel_disable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1);
+}
+
+static unsigned long omap3evm_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
+                                               unsigned int level)
+{
+       u8 c;
+       if ((level >= 0) && (level <= 100)) {
+               c = (125 * (100 - level)) / 100 + 2;
+               twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+               bklight_level = level;
+       }
+       return 0;
+}
+
+static unsigned int omap3evm_bklight_getlevel(struct lcd_panel *panel)
+{
+       return bklight_level;
+}
+
+static unsigned int omap3evm_bklight_getmaxlevel(struct lcd_panel *panel)
+{
+       return 100;
+}
+
+struct lcd_panel omap3evm_panel = {
+       .name           = "omap3evm",
+       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
+                         OMAP_LCDC_INV_HSYNC,
+
+       .bpp            = 16,
+       .data_lines     = 18,
+       .x_res          = 480,
+       .y_res          = 640,
+       .hsw            = 3,            /* hsync_len (4) - 1 */
+       .hfp            = 3,            /* right_margin (4) - 1 */
+       .hbp            = 39,           /* left_margin (40) - 1 */
+       .vsw            = 1,            /* vsync_len (2) - 1 */
+       .vfp            = 2,            /* lower_margin */
+       .vbp            = 7,            /* upper_margin (8) - 1 */
+
+       .pixel_clock    = 26000,
+
+       .init           = omap3evm_panel_init,
+       .cleanup        = omap3evm_panel_cleanup,
+       .enable         = omap3evm_panel_enable,
+       .disable        = omap3evm_panel_disable,
+       .get_caps       = omap3evm_panel_get_caps,
+       .set_bklight_level      = omap3evm_bklight_setlevel,
+       .get_bklight_level      = omap3evm_bklight_getlevel,
+       .get_bklight_max        = omap3evm_bklight_getmaxlevel,
+};
+
+static int omap3evm_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&omap3evm_panel);
+       return 0;
+}
+
+static int omap3evm_panel_remove(struct platform_device *pdev)
+{
+       return 0;
+}
+
+static int omap3evm_panel_suspend(struct platform_device *pdev,
+                                  pm_message_t mesg)
+{
+       return 0;
+}
+
+static int omap3evm_panel_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+
+struct platform_driver omap3evm_panel_driver = {
+       .probe          = omap3evm_panel_probe,
+       .remove         = omap3evm_panel_remove,
+       .suspend        = omap3evm_panel_suspend,
+       .resume         = omap3evm_panel_resume,
+       .driver         = {
+               .name   = "omap3evm_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init omap3evm_panel_drv_init(void)
+{
+       return platform_driver_register(&omap3evm_panel_driver);
+}
+
+static void __exit omap3evm_panel_drv_exit(void)
+{
+       platform_driver_unregister(&omap3evm_panel_driver);
+}
+
+module_init(omap3evm_panel_drv_init);
+module_exit(omap3evm_panel_drv_exit);
index 379c96d..b3fa88b 100644 (file)
@@ -127,12 +127,12 @@ struct platform_driver osk_panel_driver = {
        },
 };
 
-static int osk_panel_drv_init(void)
+static int __init osk_panel_drv_init(void)
 {
        return platform_driver_register(&osk_panel_driver);
 }
 
-static void osk_panel_drv_cleanup(void)
+static void __exit osk_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&osk_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c
new file mode 100644 (file)
index 0000000..2bc5c92
--- /dev/null
@@ -0,0 +1,179 @@
+/*
+ * LCD panel support for the Gumstix Overo
+ *
+ * Author: Steve Sakoman <steve@sakoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c/twl4030.h>
+
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <asm/mach-types.h>
+
+#define LCD_ENABLE       144
+
+static int overo_panel_init(struct lcd_panel *panel,
+                               struct omapfb_device *fbdev)
+{
+       if ((gpio_request(LCD_ENABLE, "LCD_ENABLE") == 0) &&
+           (gpio_direction_output(LCD_ENABLE, 1) == 0))
+               gpio_export(LCD_ENABLE, 0);
+       else
+               printk(KERN_ERR "could not obtain gpio for LCD_ENABLE\n");
+
+       return 0;
+}
+
+static void overo_panel_cleanup(struct lcd_panel *panel)
+{
+       gpio_free(LCD_ENABLE);
+}
+
+static int overo_panel_enable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_ENABLE, 1);
+       return 0;
+}
+
+static void overo_panel_disable(struct lcd_panel *panel)
+{
+       gpio_set_value(LCD_ENABLE, 0);
+}
+
+static unsigned long overo_panel_get_caps(struct lcd_panel *panel)
+{
+       return 0;
+}
+
+struct lcd_panel overo_panel = {
+       .name           = "overo",
+       .config         = OMAP_LCDC_PANEL_TFT,
+       .bpp            = 16,
+       .data_lines     = 24,
+
+#if defined CONFIG_FB_OMAP_031M3R
+
+       /* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
+       .x_res          = 640,
+       .y_res          = 480,
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+       .vfp            = 3,
+       .vsw            = 4,
+       .vbp            = 7,
+       .pixel_clock    = 23500,
+
+#elif defined CONFIG_FB_OMAP_048M3R
+
+       /* 800 x 600 @ 60 Hz  Reduced blanking VESA CVT 0.48M3-R */
+       .x_res          = 800,
+       .y_res          = 600,
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+       .vfp            = 3,
+       .vsw            = 4,
+       .vbp            = 11,
+       .pixel_clock    = 35500,
+
+#elif defined CONFIG_FB_OMAP_079M3R
+
+       /* 1024 x 768 @ 60 Hz  Reduced blanking VESA CVT 0.79M3-R */
+       .x_res          = 1024,
+       .y_res          = 768,
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+       .vfp            = 3,
+       .vsw            = 4,
+       .vbp            = 15,
+       .pixel_clock    = 56000,
+
+#elif defined CONFIG_FB_OMAP_092M9R
+
+       /* 1280 x 720 @ 60 Hz  Reduced blanking VESA CVT 0.92M9-R */
+       .x_res          = 1280,
+       .y_res          = 720,
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+       .vfp            = 3,
+       .vsw            = 5,
+       .vbp            = 13,
+       .pixel_clock    = 64000,
+
+#else
+
+       /* use 640 x 480 if no config option */
+       /* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
+       .x_res          = 640,
+       .y_res          = 480,
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+       .vfp            = 3,
+       .vsw            = 4,
+       .vbp            = 7,
+       .pixel_clock    = 23500,
+
+#endif
+
+       .init           = overo_panel_init,
+       .cleanup        = overo_panel_cleanup,
+       .enable         = overo_panel_enable,
+       .disable        = overo_panel_disable,
+       .get_caps       = overo_panel_get_caps,
+};
+
+static int overo_panel_probe(struct platform_device *pdev)
+{
+       omapfb_register_panel(&overo_panel);
+       return 0;
+}
+
+static int overo_panel_remove(struct platform_device *pdev)
+{
+       /* omapfb does not have unregister_panel */
+       return 0;
+}
+
+static struct platform_driver overo_panel_driver = {
+       .probe          = overo_panel_probe,
+       .remove         = overo_panel_remove,
+       .driver         = {
+               .name   = "overo_lcd",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init overo_panel_drv_init(void)
+{
+       return platform_driver_register(&overo_panel_driver);
+}
+
+static void __exit overo_panel_drv_exit(void)
+{
+       platform_driver_unregister(&overo_panel_driver);
+}
+
+module_init(overo_panel_drv_init);
+module_exit(overo_panel_drv_exit);
index 2183173..4bf3c79 100644 (file)
@@ -108,12 +108,12 @@ struct platform_driver palmte_panel_driver = {
        },
 };
 
-static int palmte_panel_drv_init(void)
+static int __init palmte_panel_drv_init(void)
 {
        return platform_driver_register(&palmte_panel_driver);
 }
 
-static void palmte_panel_drv_cleanup(void)
+static void __exit palmte_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&palmte_panel_driver);
 }
index 57b0f6c..48ea1f9 100644 (file)
@@ -113,12 +113,12 @@ struct platform_driver palmtt_panel_driver = {
        },
 };
 
-static int palmtt_panel_drv_init(void)
+static int __init palmtt_panel_drv_init(void)
 {
        return platform_driver_register(&palmtt_panel_driver);
 }
 
-static void palmtt_panel_drv_cleanup(void)
+static void __exit palmtt_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&palmtt_panel_driver);
 }
index d33d78b..0697d29 100644 (file)
@@ -109,12 +109,12 @@ struct platform_driver palmz71_panel_driver = {
        },
 };
 
-static int palmz71_panel_drv_init(void)
+static int __init palmz71_panel_drv_init(void)
 {
        return platform_driver_register(&palmz71_panel_driver);
 }
 
-static void palmz71_panel_drv_cleanup(void)
+static void __exit palmz71_panel_drv_cleanup(void)
 {
        platform_driver_unregister(&palmz71_panel_driver);
 }
index 8862233..125e605 100644 (file)
@@ -67,6 +67,7 @@ static struct caps_table_struct ctrl_caps[] = {
        { OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE, "pixel double window" },
        { OMAPFB_CAPS_WINDOW_SCALE,   "scale window" },
        { OMAPFB_CAPS_WINDOW_OVERLAY, "overlay window" },
+       { OMAPFB_CAPS_WINDOW_ROTATE,  "rotate window" },
        { OMAPFB_CAPS_SET_BACKLIGHT,  "backlight setting" },
 };
 
@@ -215,6 +216,15 @@ static int ctrl_change_mode(struct fb_info *fbi)
                                 offset, var->xres_virtual,
                                 plane->info.pos_x, plane->info.pos_y,
                                 var->xres, var->yres, plane->color_mode);
+       if (r < 0)
+               return r;
+
+       if (fbdev->ctrl->set_rotate != NULL) {
+               r = fbdev->ctrl->set_rotate(var->rotate);
+               if (r < 0)
+                       return r;
+       }
+
        if (fbdev->ctrl->set_scale != NULL)
                r = fbdev->ctrl->set_scale(plane->idx,
                                   var->xres, var->yres,
@@ -554,7 +564,6 @@ static int set_fb_var(struct fb_info *fbi,
                var->xoffset = var->xres_virtual - var->xres;
        if (var->yres + var->yoffset > var->yres_virtual)
                var->yoffset = var->yres_virtual - var->yres;
-       line_size = var->xres * bpp / 8;
 
        if (plane->color_mode == OMAPFB_COLOR_RGB444) {
                var->red.offset   = 8; var->red.length   = 4;
@@ -600,7 +609,7 @@ static void omapfb_rotate(struct fb_info *fbi, int rotate)
        struct omapfb_device *fbdev = plane->fbdev;
 
        omapfb_rqueue_lock(fbdev);
-       if (cpu_is_omap15xx() && rotate != fbi->var.rotate) {
+       if (rotate != fbi->var.rotate) {
                struct fb_var_screeninfo *new_var = &fbdev->new_var;
 
                memcpy(new_var, &fbi->var, sizeof(*new_var));
@@ -707,28 +716,42 @@ int omapfb_update_window_async(struct fb_info *fbi,
                                void (*callback)(void *),
                                void *callback_data)
 {
+       int xres, yres;
        struct omapfb_plane_struct *plane = fbi->par;
        struct omapfb_device *fbdev = plane->fbdev;
-       struct fb_var_screeninfo *var;
+       struct fb_var_screeninfo *var = &fbi->var;
+
+       switch (var->rotate) {
+       case 0:
+       case 180:
+               xres = fbdev->panel->x_res;
+               yres = fbdev->panel->y_res;
+               break;
+       case 90:
+       case 270:
+               xres = fbdev->panel->y_res;
+               yres = fbdev->panel->x_res;
+               break;
+       default:
+               return -EINVAL;
+       }
 
-       var = &fbi->var;
-       if (win->x >= var->xres || win->y >= var->yres ||
-           win->out_x > var->xres || win->out_y >= var->yres)
+       if (win->x >= xres || win->y >= yres ||
+           win->out_x > xres || win->out_y > yres)
                return -EINVAL;
 
        if (!fbdev->ctrl->update_window ||
            fbdev->ctrl->get_update_mode() != OMAPFB_MANUAL_UPDATE)
                return -ENODEV;
 
-       if (win->x + win->width >= var->xres)
-               win->width = var->xres - win->x;
-       if (win->y + win->height >= var->yres)
-               win->height = var->yres - win->y;
-       /* The out sizes should be cropped to the LCD size */
-       if (win->out_x + win->out_width > fbdev->panel->x_res)
-               win->out_width = fbdev->panel->x_res - win->out_x;
-       if (win->out_y + win->out_height > fbdev->panel->y_res)
-               win->out_height = fbdev->panel->y_res - win->out_y;
+       if (win->x + win->width > xres)
+               win->width = xres - win->x;
+       if (win->y + win->height > yres)
+               win->height = yres - win->y;
+       if (win->out_x + win->out_width > xres)
+               win->out_width = xres - win->out_x;
+       if (win->out_y + win->out_height > yres)
+               win->out_height = yres - win->out_y;
        if (!win->width || !win->height || !win->out_width || !win->out_height)
                return 0;
 
@@ -1699,8 +1722,8 @@ static int omapfb_do_probe(struct platform_device *pdev,
 
        pr_info("omapfb: configured for panel %s\n", fbdev->panel->name);
 
-       def_vxres = def_vxres ? : fbdev->panel->x_res;
-       def_vyres = def_vyres ? : fbdev->panel->y_res;
+       def_vxres = def_vxres ? def_vxres : fbdev->panel->x_res;
+       def_vyres = def_vyres ? def_vyres : fbdev->panel->y_res;
 
        init_state++;
 
@@ -1822,8 +1845,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
        struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-       omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
-
+       if (fbdev != NULL)
+               omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
        return 0;
 }
 
@@ -1832,7 +1855,8 @@ static int omapfb_resume(struct platform_device *pdev)
 {
        struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-       omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
+       if (fbdev != NULL)
+               omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
        return 0;
 }
 
index 9332d6c..ee01e84 100644 (file)
@@ -57,6 +57,7 @@
 
 #define DISPC_BASE             0x48050400
 #define DISPC_CONTROL          0x0040
+#define DISPC_IRQ_FRAMEMASK     0x0001
 
 static struct {
        void __iomem    *base;
@@ -553,7 +554,9 @@ static int rfbi_init(struct omapfb_device *fbdev)
        l = (0x01 << 2);
        rfbi_write_reg(RFBI_CONTROL, l);
 
-       if ((r = omap_dispc_request_irq(rfbi_dma_callback, NULL)) < 0) {
+       r = omap_dispc_request_irq(DISPC_IRQ_FRAMEMASK, rfbi_dma_callback,
+                                  NULL);
+       if (r < 0) {
                dev_err(fbdev->dev, "can't get DISPC irq\n");
                rfbi_enable_clocks(0);
                return r;
@@ -570,7 +573,7 @@ static int rfbi_init(struct omapfb_device *fbdev)
 
 static void rfbi_cleanup(void)
 {
-       omap_dispc_free_irq();
+       omap_dispc_free_irq(DISPC_IRQ_FRAMEMASK, rfbi_dma_callback, NULL);
        rfbi_put_clocks();
        iounmap(rfbi.base);
 }
index bacfabd..0a366d8 100644 (file)
@@ -223,10 +223,14 @@ static int platinumfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 
 static inline int platinum_vram_reqd(int video_mode, int color_mode)
 {
-       return vmode_attrs[video_mode-1].vres *
-              (vmode_attrs[video_mode-1].hres * (1<<color_mode) +
-               ((video_mode == VMODE_832_624_75) &&
-                (color_mode > CMODE_8)) ? 0x10 : 0x20) + 0x1000;
+       int baseval = vmode_attrs[video_mode-1].hres * (1<<color_mode);
+
+       if ((video_mode == VMODE_832_624_75) && (color_mode > CMODE_8))
+               baseval += 0x10;
+       else
+               baseval += 0x20;
+
+       return vmode_attrs[video_mode-1].vres * baseval + 0x1000;
 }
 
 #define STORE_D2(a, d) { \
index 5a72083..adf9632 100644 (file)
@@ -1036,7 +1036,7 @@ static int s3c_fb_resume(struct platform_device *pdev)
 
 static struct platform_driver s3c_fb_driver = {
        .probe          = s3c_fb_probe,
-       .remove         = s3c_fb_remove,
+       .remove         = __devexit_p(s3c_fb_remove),
        .suspend        = s3c_fb_suspend,
        .resume         = s3c_fb_resume,
        .driver         = {
index 7da0027..aac6612 100644 (file)
@@ -369,7 +369,9 @@ static void s3c2410fb_activate_var(struct fb_info *info)
        void __iomem *regs = fbi->io;
        int type = fbi->regs.lcdcon1 & S3C2410_LCDCON1_TFT;
        struct fb_var_screeninfo *var = &info->var;
-       int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock) / 2;
+       int clkdiv;
+
+       clkdiv = DIV_ROUND_UP(s3c2410fb_calc_pixclk(fbi, var->pixclock), 2);
 
        dprintk("%s: var->xres  = %d\n", __func__, var->xres);
        dprintk("%s: var->yres  = %d\n", __func__, var->yres);
@@ -1119,7 +1121,7 @@ int __init s3c2410fb_init(void)
        int ret = platform_driver_register(&s3c2410fb_driver);
 
        if (ret == 0)
-               ret = platform_driver_register(&s3c2412fb_driver);;
+               ret = platform_driver_register(&s3c2412fb_driver);
 
        return ret;
 }
index 4a067f0..a4e05e4 100644 (file)
@@ -698,8 +698,8 @@ sisfb_search_refresh_rate(struct sis_video_info *ivideo, unsigned int rate, int
                                                rate, sisfb_vrate[i].refresh);
                                        ivideo->rate_idx = sisfb_vrate[i].idx;
                                        ivideo->refresh_rate = sisfb_vrate[i].refresh;
-                               } else if(((rate - sisfb_vrate[i-1].refresh) <= 2)
-                                               && (sisfb_vrate[i].idx != 1)) {
+                               } else if((sisfb_vrate[i].idx != 1) &&
+                                               ((rate - sisfb_vrate[i-1].refresh) <= 2)) {
                                        DPRINTK("sisfb: Adjusting rate from %d down to %d\n",
                                                rate, sisfb_vrate[i-1].refresh);
                                        ivideo->rate_idx = sisfb_vrate[i-1].idx;
index 705c853..bef4aae 100644 (file)
@@ -342,7 +342,7 @@ struct SiS_Private
        unsigned short                  SiS_RY4COE;
        unsigned short                  SiS_LCDHDES;
        unsigned short                  SiS_LCDVDES;
-       unsigned short                  SiS_DDC_Port;
+       SISIOADDRESS                    SiS_DDC_Port;
        unsigned short                  SiS_DDC_Index;
        unsigned short                  SiS_DDC_Data;
        unsigned short                  SiS_DDC_NData;
index a1eb086..6913fe1 100644 (file)
@@ -974,7 +974,7 @@ static int tmiofb_resume(struct platform_device *dev)
 {
        struct fb_info *info = platform_get_drvdata(dev);
        struct mfd_cell *cell = dev->dev.platform_data;
-       int retval;
+       int retval = 0;
 
        acquire_console_sem();
 
index 45c54bf..9d4f3a4 100644 (file)
  */
 #include "global.h"
 
-void viafb_init_accel(void)
+static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height,
+       u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y,
+       u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
+       u32 fg_color, u32 bg_color, u8 fill_rop)
 {
-       viaparinfo->fbmem_free -= CURSOR_SIZE;
-       viaparinfo->cursor_start = viaparinfo->fbmem_free;
-       viaparinfo->fbmem_used += CURSOR_SIZE;
+       u32 ge_cmd = 0, tmp, i;
 
-       /* Reverse 8*1024 memory space for cursor image */
-       viaparinfo->fbmem_free -= (CURSOR_SIZE + VQ_SIZE);
-       viaparinfo->VQ_start = viaparinfo->fbmem_free;
-       viaparinfo->VQ_end = viaparinfo->VQ_start + VQ_SIZE - 1;
-       viaparinfo->fbmem_used += (CURSOR_SIZE + VQ_SIZE); }
-
-void viafb_init_2d_engine(void)
-{
-       u32 dwVQStartAddr, dwVQEndAddr;
-       u32 dwVQLen, dwVQStartL, dwVQEndL, dwVQStartEndH;
-
-       /* init 2D engine regs to reset 2D engine */
-       writel(0x0, viaparinfo->io_virt + VIA_REG_GEMODE);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_DSTPOS);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_DIMENSION);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_PATADDR);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_FGCOLOR);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_BGCOLOR);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPTL);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPBR);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_OFFSET);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_KEYCONTROL);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_PITCH);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_MONOPAT1);
-
-       /* Init AGP and VQ regs */
-       switch (viaparinfo->chip_info->gfx_chip_name) {
-       case UNICHROME_K8M890:
-       case UNICHROME_P4M900:
-               writel(0x00100000, viaparinfo->io_virt + VIA_REG_CR_TRANSET);
-               writel(0x680A0000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-               writel(0x02000000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-               break;
+       if (!op || op > 3) {
+               printk(KERN_WARNING "hw_bitblt_1: Invalid operation: %d\n", op);
+               return -EINVAL;
+       }
 
-       default:
-               writel(0x00100000, viaparinfo->io_virt + VIA_REG_TRANSET);
-               writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x00333004, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x60000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x61000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x62000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x63000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x64000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               writel(0x7D000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-
-               writel(0xFE020000, viaparinfo->io_virt + VIA_REG_TRANSET);
-               writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
-               break;
+       if (op != VIA_BITBLT_FILL && !src_mem && src_addr == dst_addr) {
+               if (src_x < dst_x) {
+                       ge_cmd |= 0x00008000;
+                       src_x += width - 1;
+                       dst_x += width - 1;
+               }
+               if (src_y < dst_y) {
+                       ge_cmd |= 0x00004000;
+                       src_y += height - 1;
+                       dst_y += height - 1;
+               }
        }
-       if (viaparinfo->VQ_start != 0) {
-               /* Enable VQ */
-               dwVQStartAddr = viaparinfo->VQ_start;
-               dwVQEndAddr = viaparinfo->VQ_end;
-
-               dwVQStartL = 0x50000000 | (dwVQStartAddr & 0xFFFFFF);
-               dwVQEndL = 0x51000000 | (dwVQEndAddr & 0xFFFFFF);
-               dwVQStartEndH = 0x52000000 |
-                       ((dwVQStartAddr & 0xFF000000) >> 24) |
-                       ((dwVQEndAddr & 0xFF000000) >> 16);
-               dwVQLen = 0x53000000 | (VQ_SIZE >> 3);
-               switch (viaparinfo->chip_info->gfx_chip_name) {
-               case UNICHROME_K8M890:
-               case UNICHROME_P4M900:
-                       dwVQStartL |= 0x20000000;
-                       dwVQEndL |= 0x20000000;
-                       dwVQStartEndH |= 0x20000000;
-                       dwVQLen |= 0x20000000;
+
+       if (op == VIA_BITBLT_FILL) {
+               switch (fill_rop) {
+               case 0x00: /* blackness */
+               case 0x5A: /* pattern inversion */
+               case 0xF0: /* pattern copy */
+               case 0xFF: /* whiteness */
                        break;
                default:
-                       break;
+                       printk(KERN_WARNING "hw_bitblt_1: Invalid fill rop: "
+                               "%u\n", fill_rop);
+                       return -EINVAL;
                }
+       }
 
-               switch (viaparinfo->chip_info->gfx_chip_name) {
-               case UNICHROME_K8M890:
-               case UNICHROME_P4M900:
-                       writel(0x00100000,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSET);
-                       writel(dwVQStartEndH,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       writel(dwVQStartL,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       writel(dwVQEndL,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       writel(dwVQLen,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       writel(0x74301001,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       writel(0x00000000,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       break;
-               default:
-                       writel(0x00FE0000,
-                               viaparinfo->io_virt + VIA_REG_TRANSET);
-                       writel(0x080003FE,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0A00027C,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0B000260,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0C000274,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0D000264,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0E000000,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x0F000020,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x1000027E,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x110002FE,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x200F0060,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-
-                       writel(0x00000006,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x40008C0F,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x44000000,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x45080C04,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x46800408,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-
-                       writel(dwVQStartEndH,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(dwVQStartL,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(dwVQEndL,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(dwVQLen,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       break;
+       switch (dst_bpp) {
+       case 8:
+               tmp = 0x00000000;
+               break;
+       case 16:
+               tmp = 0x00000100;
+               break;
+       case 32:
+               tmp = 0x00000300;
+               break;
+       default:
+               printk(KERN_WARNING "hw_bitblt_1: Unsupported bpp %d\n",
+                       dst_bpp);
+               return -EINVAL;
+       }
+       writel(tmp, engine + 0x04);
+
+       if (op != VIA_BITBLT_FILL) {
+               if (src_x & (op == VIA_BITBLT_MONO ? 0xFFFF8000 : 0xFFFFF000)
+                       || src_y & 0xFFFFF000) {
+                       printk(KERN_WARNING "hw_bitblt_1: Unsupported source "
+                               "x/y %d %d\n", src_x, src_y);
+                       return -EINVAL;
                }
-       } else {
-               /* Disable VQ */
-               switch (viaparinfo->chip_info->gfx_chip_name) {
-               case UNICHROME_K8M890:
-               case UNICHROME_P4M900:
-                       writel(0x00100000,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSET);
-                       writel(0x74301000,
-                               viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
-                       break;
-               default:
-                       writel(0x00FE0000,
-                               viaparinfo->io_virt + VIA_REG_TRANSET);
-                       writel(0x00000004,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x40008C0F,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x44000000,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x45080C04,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       writel(0x46800408,
-                               viaparinfo->io_virt + VIA_REG_TRANSPACE);
-                       break;
+               tmp = src_x | (src_y << 16);
+               writel(tmp, engine + 0x08);
+       }
+
+       if (dst_x & 0xFFFFF000 || dst_y & 0xFFFFF000) {
+               printk(KERN_WARNING "hw_bitblt_1: Unsupported destination x/y "
+                       "%d %d\n", dst_x, dst_y);
+               return -EINVAL;
+       }
+       tmp = dst_x | (dst_y << 16);
+       writel(tmp, engine + 0x0C);
+
+       if ((width - 1) & 0xFFFFF000 || (height - 1) & 0xFFFFF000) {
+               printk(KERN_WARNING "hw_bitblt_1: Unsupported width/height "
+                       "%d %d\n", width, height);
+               return -EINVAL;
+       }
+       tmp = (width - 1) | ((height - 1) << 16);
+       writel(tmp, engine + 0x10);
+
+       if (op != VIA_BITBLT_COLOR)
+               writel(fg_color, engine + 0x18);
+
+       if (op == VIA_BITBLT_MONO)
+               writel(bg_color, engine + 0x1C);
+
+       if (op != VIA_BITBLT_FILL) {
+               tmp = src_mem ? 0 : src_addr;
+               if (dst_addr & 0xE0000007) {
+                       printk(KERN_WARNING "hw_bitblt_1: Unsupported source "
+                               "address %X\n", tmp);
+                       return -EINVAL;
                }
+               tmp >>= 3;
+               writel(tmp, engine + 0x30);
+       }
+
+       if (dst_addr & 0xE0000007) {
+               printk(KERN_WARNING "hw_bitblt_1: Unsupported destination "
+                       "address %X\n", dst_addr);
+               return -EINVAL;
        }
+       tmp = dst_addr >> 3;
+       writel(tmp, engine + 0x34);
 
-       viafb_set_2d_color_depth(viaparinfo->bpp);
+       if (op == VIA_BITBLT_FILL)
+               tmp = 0;
+       else
+               tmp = src_pitch;
+       if (tmp & 0xFFFFC007 || dst_pitch & 0xFFFFC007) {
+               printk(KERN_WARNING "hw_bitblt_1: Unsupported pitch %X %X\n",
+                       tmp, dst_pitch);
+               return -EINVAL;
+       }
+       tmp = (tmp >> 3) | (dst_pitch << (16 - 3));
+       writel(tmp, engine + 0x38);
+
+       if (op == VIA_BITBLT_FILL)
+               ge_cmd |= fill_rop << 24 | 0x00002000 | 0x00000001;
+       else {
+               ge_cmd |= 0xCC000000; /* ROP=SRCCOPY */
+               if (src_mem)
+                       ge_cmd |= 0x00000040;
+               if (op == VIA_BITBLT_MONO)
+                       ge_cmd |= 0x00000002 | 0x00000100 | 0x00020000;
+               else
+                       ge_cmd |= 0x00000001;
+       }
+       writel(ge_cmd, engine);
 
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
+       if (op == VIA_BITBLT_FILL || !src_mem)
+               return 0;
 
-       writel(VIA_PITCH_ENABLE |
-                  (((viaparinfo->hres *
-                     viaparinfo->bpp >> 3) >> 3) | (((viaparinfo->hres *
-                                                  viaparinfo->
-                                                  bpp >> 3) >> 3) << 16)),
-                                       viaparinfo->io_virt + VIA_REG_PITCH);
+       tmp = (width * height * (op == VIA_BITBLT_MONO ? 1 : (dst_bpp >> 3)) +
+               3) >> 2;
+
+       for (i = 0; i < tmp; i++)
+               writel(src_mem[i], engine + VIA_MMIO_BLTBASE);
+
+       return 0;
 }
 
-void viafb_set_2d_color_depth(int bpp)
+static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,
+       u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y,
+       u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
+       u32 fg_color, u32 bg_color, u8 fill_rop)
 {
-       u32 dwGEMode;
+       u32 ge_cmd = 0, tmp, i;
+
+       if (!op || op > 3) {
+               printk(KERN_WARNING "hw_bitblt_2: Invalid operation: %d\n", op);
+               return -EINVAL;
+       }
 
-       dwGEMode = readl(viaparinfo->io_virt + 0x04) & 0xFFFFFCFF;
+       if (op != VIA_BITBLT_FILL && !src_mem && src_addr == dst_addr) {
+               if (src_x < dst_x) {
+                       ge_cmd |= 0x00008000;
+                       src_x += width - 1;
+                       dst_x += width - 1;
+               }
+               if (src_y < dst_y) {
+                       ge_cmd |= 0x00004000;
+                       src_y += height - 1;
+                       dst_y += height - 1;
+               }
+       }
 
-       switch (bpp) {
+       if (op == VIA_BITBLT_FILL) {
+               switch (fill_rop) {
+               case 0x00: /* blackness */
+               case 0x5A: /* pattern inversion */
+               case 0xF0: /* pattern copy */
+               case 0xFF: /* whiteness */
+                       break;
+               default:
+                       printk(KERN_WARNING "hw_bitblt_2: Invalid fill rop: "
+                               "%u\n", fill_rop);
+                       return -EINVAL;
+               }
+       }
+
+       switch (dst_bpp) {
+       case 8:
+               tmp = 0x00000000;
+               break;
        case 16:
-               dwGEMode |= VIA_GEM_16bpp;
+               tmp = 0x00000100;
                break;
        case 32:
-               dwGEMode |= VIA_GEM_32bpp;
+               tmp = 0x00000300;
                break;
        default:
-               dwGEMode |= VIA_GEM_8bpp;
-               break;
+               printk(KERN_WARNING "hw_bitblt_2: Unsupported bpp %d\n",
+                       dst_bpp);
+               return -EINVAL;
+       }
+       writel(tmp, engine + 0x04);
+
+       if (op == VIA_BITBLT_FILL)
+               tmp = 0;
+       else
+               tmp = src_pitch;
+       if (tmp & 0xFFFFC007 || dst_pitch & 0xFFFFC007) {
+               printk(KERN_WARNING "hw_bitblt_2: Unsupported pitch %X %X\n",
+                       tmp, dst_pitch);
+               return -EINVAL;
+       }
+       tmp = (tmp >> 3) | (dst_pitch << (16 - 3));
+       writel(tmp, engine + 0x08);
+
+       if ((width - 1) & 0xFFFFF000 || (height - 1) & 0xFFFFF000) {
+               printk(KERN_WARNING "hw_bitblt_2: Unsupported width/height "
+                       "%d %d\n", width, height);
+               return -EINVAL;
+       }
+       tmp = (width - 1) | ((height - 1) << 16);
+       writel(tmp, engine + 0x0C);
+
+       if (dst_x & 0xFFFFF000 || dst_y & 0xFFFFF000) {
+               printk(KERN_WARNING "hw_bitblt_2: Unsupported destination x/y "
+                       "%d %d\n", dst_x, dst_y);
+               return -EINVAL;
+       }
+       tmp = dst_x | (dst_y << 16);
+       writel(tmp, engine + 0x10);
+
+       if (dst_addr & 0xE0000007) {
+               printk(KERN_WARNING "hw_bitblt_2: Unsupported destination "
+                       "address %X\n", dst_addr);
+               return -EINVAL;
+       }
+       tmp = dst_addr >> 3;
+       writel(tmp, engine + 0x14);
+
+       if (op != VIA_BITBLT_FILL) {
+               if (src_x & (op == VIA_BITBLT_MONO ? 0xFFFF8000 : 0xFFFFF000)
+                       || src_y & 0xFFFFF000) {
+                       printk(KERN_WARNING "hw_bitblt_2: Unsupported source "
+                               "x/y %d %d\n", src_x, src_y);
+                       return -EINVAL;
+               }
+               tmp = src_x | (src_y << 16);
+               writel(tmp, engine + 0x18);
+
+               tmp = src_mem ? 0 : src_addr;
+               if (dst_addr & 0xE0000007) {
+                       printk(KERN_WARNING "hw_bitblt_2: Unsupported source "
+                               "address %X\n", tmp);
+                       return -EINVAL;
+               }
+               tmp >>= 3;
+               writel(tmp, engine + 0x1C);
        }
 
-       /* Set BPP and Pitch */
-       writel(dwGEMode, viaparinfo->io_virt + VIA_REG_GEMODE);
+       if (op != VIA_BITBLT_COLOR)
+               writel(fg_color, engine + 0x4C);
+
+       if (op == VIA_BITBLT_MONO)
+               writel(bg_color, engine + 0x50);
+
+       if (op == VIA_BITBLT_FILL)
+               ge_cmd |= fill_rop << 24 | 0x00002000 | 0x00000001;
+       else {
+               ge_cmd |= 0xCC000000; /* ROP=SRCCOPY */
+               if (src_mem)
+                       ge_cmd |= 0x00000040;
+               if (op == VIA_BITBLT_MONO)
+                       ge_cmd |= 0x00000002 | 0x00000100 | 0x00020000;
+               else
+                       ge_cmd |= 0x00000001;
+       }
+       writel(ge_cmd, engine);
+
+       if (op == VIA_BITBLT_FILL || !src_mem)
+               return 0;
+
+       tmp = (width * height * (op == VIA_BITBLT_MONO ? 1 : (dst_bpp >> 3)) +
+               3) >> 2;
+
+       for (i = 0; i < tmp; i++)
+               writel(src_mem[i], engine + VIA_MMIO_BLTBASE);
+
+       return 0;
 }
 
-void viafb_hw_cursor_init(void)
+int viafb_init_engine(struct fb_info *info)
 {
+       struct viafb_par *viapar = info->par;
+       void __iomem *engine;
+       u32 vq_start_addr, vq_end_addr, vq_start_low, vq_end_low, vq_high,
+               vq_len, chip_name = viapar->shared->chip_info.gfx_chip_name;
+
+       engine = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+       viapar->shared->engine_mmio = engine;
+       if (!engine) {
+               printk(KERN_WARNING "viafb_init_accel: ioremap failed, "
+                       "hardware acceleration disabled\n");
+               return -ENOMEM;
+       }
+
+       switch (chip_name) {
+       case UNICHROME_CLE266:
+       case UNICHROME_K400:
+       case UNICHROME_K800:
+       case UNICHROME_PM800:
+       case UNICHROME_CN700:
+       case UNICHROME_CX700:
+       case UNICHROME_CN750:
+       case UNICHROME_K8M890:
+       case UNICHROME_P4M890:
+       case UNICHROME_P4M900:
+               viapar->shared->hw_bitblt = hw_bitblt_1;
+               break;
+       case UNICHROME_VX800:
+       case UNICHROME_VX855:
+               viapar->shared->hw_bitblt = hw_bitblt_2;
+               break;
+       default:
+               viapar->shared->hw_bitblt = NULL;
+       }
+
+       viapar->fbmem_free -= CURSOR_SIZE;
+       viapar->shared->cursor_vram_addr = viapar->fbmem_free;
+       viapar->fbmem_used += CURSOR_SIZE;
+
+       viapar->fbmem_free -= VQ_SIZE;
+       viapar->shared->vq_vram_addr = viapar->fbmem_free;
+       viapar->fbmem_used += VQ_SIZE;
+
+       /* Init AGP and VQ regs */
+       switch (chip_name) {
+       case UNICHROME_K8M890:
+       case UNICHROME_P4M900:
+               writel(0x00100000, engine + VIA_REG_CR_TRANSET);
+               writel(0x680A0000, engine + VIA_REG_CR_TRANSPACE);
+               writel(0x02000000, engine + VIA_REG_CR_TRANSPACE);
+               break;
+
+       default:
+               writel(0x00100000, engine + VIA_REG_TRANSET);
+               writel(0x00000000, engine + VIA_REG_TRANSPACE);
+               writel(0x00333004, engine + VIA_REG_TRANSPACE);
+               writel(0x60000000, engine + VIA_REG_TRANSPACE);
+               writel(0x61000000, engine + VIA_REG_TRANSPACE);
+               writel(0x62000000, engine + VIA_REG_TRANSPACE);
+               writel(0x63000000, engine + VIA_REG_TRANSPACE);
+               writel(0x64000000, engine + VIA_REG_TRANSPACE);
+               writel(0x7D000000, engine + VIA_REG_TRANSPACE);
+
+               writel(0xFE020000, engine + VIA_REG_TRANSET);
+               writel(0x00000000, engine + VIA_REG_TRANSPACE);
+               break;
+       }
+
+       /* Enable VQ */
+       vq_start_addr = viapar->shared->vq_vram_addr;
+       vq_end_addr = viapar->shared->vq_vram_addr + VQ_SIZE - 1;
+
+       vq_start_low = 0x50000000 | (vq_start_addr & 0xFFFFFF);
+       vq_end_low = 0x51000000 | (vq_end_addr & 0xFFFFFF);
+       vq_high = 0x52000000 | ((vq_start_addr & 0xFF000000) >> 24) |
+               ((vq_end_addr & 0xFF000000) >> 16);
+       vq_len = 0x53000000 | (VQ_SIZE >> 3);
+
+       switch (chip_name) {
+       case UNICHROME_K8M890:
+       case UNICHROME_P4M900:
+               vq_start_low |= 0x20000000;
+               vq_end_low |= 0x20000000;
+               vq_high |= 0x20000000;
+               vq_len |= 0x20000000;
+
+               writel(0x00100000, engine + VIA_REG_CR_TRANSET);
+               writel(vq_high, engine + VIA_REG_CR_TRANSPACE);
+               writel(vq_start_low, engine + VIA_REG_CR_TRANSPACE);
+               writel(vq_end_low, engine + VIA_REG_CR_TRANSPACE);
+               writel(vq_len, engine + VIA_REG_CR_TRANSPACE);
+               writel(0x74301001, engine + VIA_REG_CR_TRANSPACE);
+               writel(0x00000000, engine + VIA_REG_CR_TRANSPACE);
+               break;
+       default:
+               writel(0x00FE0000, engine + VIA_REG_TRANSET);
+               writel(0x080003FE, engine + VIA_REG_TRANSPACE);
+               writel(0x0A00027C, engine + VIA_REG_TRANSPACE);
+               writel(0x0B000260, engine + VIA_REG_TRANSPACE);
+               writel(0x0C000274, engine + VIA_REG_TRANSPACE);
+               writel(0x0D000264, engine + VIA_REG_TRANSPACE);
+               writel(0x0E000000, engine + VIA_REG_TRANSPACE);
+               writel(0x0F000020, engine + VIA_REG_TRANSPACE);
+               writel(0x1000027E, engine + VIA_REG_TRANSPACE);
+               writel(0x110002FE, engine + VIA_REG_TRANSPACE);
+               writel(0x200F0060, engine + VIA_REG_TRANSPACE);
+
+               writel(0x00000006, engine + VIA_REG_TRANSPACE);
+               writel(0x40008C0F, engine + VIA_REG_TRANSPACE);
+               writel(0x44000000, engine + VIA_REG_TRANSPACE);
+               writel(0x45080C04, engine + VIA_REG_TRANSPACE);
+               writel(0x46800408, engine + VIA_REG_TRANSPACE);
+
+               writel(vq_high, engine + VIA_REG_TRANSPACE);
+               writel(vq_start_low, engine + VIA_REG_TRANSPACE);
+               writel(vq_end_low, engine + VIA_REG_TRANSPACE);
+               writel(vq_len, engine + VIA_REG_TRANSPACE);
+               break;
+       }
+
        /* Set Cursor Image Base Address */
-       writel(viaparinfo->cursor_start,
-               viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
-       writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+       writel(viapar->shared->cursor_vram_addr, engine + VIA_REG_CURSOR_MODE);
+       writel(0x0, engine + VIA_REG_CURSOR_POS);
+       writel(0x0, engine + VIA_REG_CURSOR_ORG);
+       writel(0x0, engine + VIA_REG_CURSOR_BG);
+       writel(0x0, engine + VIA_REG_CURSOR_FG);
+       return 0;
 }
 
 void viafb_show_hw_cursor(struct fb_info *info, int Status)
 {
-       u32 temp;
-       u32 iga_path = ((struct viafb_par *)(info->par))->iga_path;
+       struct viafb_par *viapar = info->par;
+       u32 temp, iga_path = viapar->iga_path;
 
-       temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+       temp = readl(viapar->shared->engine_mmio + VIA_REG_CURSOR_MODE);
        switch (Status) {
        case HW_Cursor_ON:
                temp |= 0x1;
@@ -259,25 +460,27 @@ void viafb_show_hw_cursor(struct fb_info *info, int Status)
        default:
                temp &= 0x7FFFFFFF;
        }
-       writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+       writel(temp, viapar->shared->engine_mmio + VIA_REG_CURSOR_MODE);
 }
 
-int viafb_wait_engine_idle(void)
+void viafb_wait_engine_idle(struct fb_info *info)
 {
+       struct viafb_par *viapar = info->par;
        int loop = 0;
 
-       while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+       while (!(readl(viapar->shared->engine_mmio + VIA_REG_STATUS) &
                        VIA_VR_QUEUE_BUSY) && (loop < MAXLOOP)) {
                loop++;
                cpu_relax();
        }
 
-       while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+       while ((readl(viapar->shared->engine_mmio + VIA_REG_STATUS) &
                    (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
                    (loop < MAXLOOP)) {
                loop++;
                cpu_relax();
        }
 
-       return loop >= MAXLOOP;
+       if (loop >= MAXLOOP)
+               printk(KERN_ERR "viafb_wait_engine_idle: not syncing\n");
 }
index 29bf854..615c84a 100644 (file)
 
 #define MAXLOOP                 0xFFFFFF
 
-void viafb_init_accel(void);
-void viafb_init_2d_engine(void);
-void set_2d_color_depth(int);
-void viafb_hw_cursor_init(void);
-void viafb_show_hw_cursor(struct fb_info *info, int Status); int
-viafb_wait_engine_idle(void); void viafb_set_2d_color_depth(int bpp);
+#define VIA_BITBLT_COLOR       1
+#define VIA_BITBLT_MONO                2
+#define VIA_BITBLT_FILL                3
+
+int viafb_init_engine(struct fb_info *info);
+void viafb_show_hw_cursor(struct fb_info *info, int Status);
+void viafb_wait_engine_idle(struct fb_info *info);
 
 #endif /* __ACCEL_H__ */
index dde95ed..474f428 100644 (file)
@@ -68,6 +68,9 @@
 #define     UNICHROME_VX800         11
 #define     UNICHROME_VX800_DID     0x1122
 
+#define     UNICHROME_VX855         12
+#define     UNICHROME_VX855_DID     0x5122
+
 /**************************************************/
 /* Definition TMDS Trasmitter Information         */
 /**************************************************/
@@ -122,7 +125,6 @@ struct lvds_chip_information {
 struct chip_information {
        int gfx_chip_name;
        int gfx_chip_revision;
-       int chip_on_slot;
        struct tmds_chip_information tmds_chip_info;
        struct lvds_chip_information lvds_chip_info;
        struct lvds_chip_information lvds_chip_info2;
index d696544..c5c32b6 100644 (file)
@@ -160,7 +160,7 @@ int viafb_tmds_trasmitter_identify(void)
 
 static void tmds_register_write(int index, u8 data)
 {
-       viaparinfo->i2c_stuff.i2c_port =
+       viaparinfo->shared->i2c_stuff.i2c_port =
                viaparinfo->chip_info->tmds_chip_info.i2c_port;
 
        viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.
@@ -172,7 +172,7 @@ static int tmds_register_read(int index)
 {
        u8 data;
 
-       viaparinfo->i2c_stuff.i2c_port =
+       viaparinfo->shared->i2c_stuff.i2c_port =
                viaparinfo->chip_info->tmds_chip_info.i2c_port;
        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
            tmds_chip_info.tmds_chip_slave_addr,
@@ -182,7 +182,7 @@ static int tmds_register_read(int index)
 
 static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
 {
-       viaparinfo->i2c_stuff.i2c_port =
+       viaparinfo->shared->i2c_stuff.i2c_port =
                viaparinfo->chip_info->tmds_chip_info.i2c_port;
        viafb_i2c_readbytes((u8) viaparinfo->chip_info->tmds_chip_info.
                         tmds_chip_slave_addr, (u8) index, buff, buff_len);
index 468be24..b675cdb 100644 (file)
@@ -32,7 +32,6 @@ int viafb_lcd_dsp_method = LCD_EXPANDSION;
 int viafb_lcd_mode = LCD_OPENLDI;
 int viafb_bpp = 32;
 int viafb_bpp1 = 32;
-int viafb_accel = 1;
 int viafb_CRT_ON = 1;
 int viafb_DVI_ON;
 int viafb_LCD_ON ;
@@ -46,13 +45,11 @@ int viafb_hotplug_refresh = 60;
 unsigned int viafb_second_offset;
 int viafb_second_size;
 int viafb_primary_dev = None_Device;
-void __iomem *viafb_FB_MM;
 unsigned int viafb_second_xres = 640;
 unsigned int viafb_second_yres = 480;
 unsigned int viafb_second_virtual_xres;
 unsigned int viafb_second_virtual_yres;
 int viafb_lcd_panel_id = LCD_PANEL_ID_MAXIMUM + 1;
-struct fb_cursor viacursor;
 struct fb_info *viafbinfo;
 struct fb_info *viafbinfo1;
 struct viafb_par *viaparinfo;
index 7543d5f..d69d0ca 100644 (file)
@@ -77,8 +77,6 @@ extern int viafb_hotplug_Yres;
 extern int viafb_hotplug_bpp;
 extern int viafb_hotplug_refresh;
 extern int viafb_primary_dev;
-extern void __iomem *viafb_FB_MM;
-extern struct fb_cursor viacursor;
 
 extern unsigned int viafb_second_xres;
 extern unsigned int viafb_second_yres;
index c896000..3e083ff 100644 (file)
 
 #include "global.h"
 
-static const struct pci_device_id_info pciidlist[] = {
-       {PCI_VIA_VENDOR_ID, UNICHROME_CLE266_DID, UNICHROME_CLE266},
-       {PCI_VIA_VENDOR_ID, UNICHROME_PM800_DID, UNICHROME_PM800},
-       {PCI_VIA_VENDOR_ID, UNICHROME_K400_DID, UNICHROME_K400},
-       {PCI_VIA_VENDOR_ID, UNICHROME_K800_DID, UNICHROME_K800},
-       {PCI_VIA_VENDOR_ID, UNICHROME_CN700_DID, UNICHROME_CN700},
-       {PCI_VIA_VENDOR_ID, UNICHROME_P4M890_DID, UNICHROME_P4M890},
-       {PCI_VIA_VENDOR_ID, UNICHROME_K8M890_DID, UNICHROME_K8M890},
-       {PCI_VIA_VENDOR_ID, UNICHROME_CX700_DID, UNICHROME_CX700},
-       {PCI_VIA_VENDOR_ID, UNICHROME_P4M900_DID, UNICHROME_P4M900},
-       {PCI_VIA_VENDOR_ID, UNICHROME_CN750_DID, UNICHROME_CN750},
-       {PCI_VIA_VENDOR_ID, UNICHROME_VX800_DID, UNICHROME_VX800},
-       {0, 0, 0}
-};
-
-struct offset offset_reg = {
-       /* IGA1 Offset Register */
-       {IGA1_OFFSET_REG_NUM, {{CR13, 0, 7}, {CR35, 5, 7} } },
-       /* IGA2 Offset Register */
-       {IGA2_OFFSET_REG_NUM, {{CR66, 0, 7}, {CR67, 0, 1} } }
-};
-
 static struct pll_map pll_value[] = {
-       {CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M, CX700_25_175M},
-       {CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M, CX700_29_581M},
-       {CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M, CX700_26_880M},
-       {CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M, CX700_31_490M},
-       {CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M, CX700_31_500M},
-       {CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M, CX700_31_728M},
-       {CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M, CX700_32_668M},
-       {CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M, CX700_36_000M},
-       {CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M, CX700_40_000M},
-       {CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M, CX700_41_291M},
-       {CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M, CX700_43_163M},
-       {CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M, CX700_45_250M},
-       {CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M, CX700_46_000M},
-       {CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M, CX700_46_996M},
-       {CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M, CX700_48_000M},
-       {CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M, CX700_48_875M},
-       {CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M, CX700_49_500M},
-       {CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M, CX700_52_406M},
-       {CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M, CX700_52_977M},
-       {CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, CX700_56_250M},
-       {CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, CX700_60_466M},
-       {CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, CX700_61_500M},
-       {CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M, CX700_65_000M},
-       {CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M, CX700_65_178M},
-       {CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M, CX700_66_750M},
-       {CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M, CX700_68_179M},
-       {CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M, CX700_69_924M},
-       {CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M, CX700_70_159M},
-       {CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M, CX700_72_000M},
-       {CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M, CX700_78_750M},
-       {CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M, CX700_80_136M},
-       {CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M, CX700_83_375M},
-       {CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M, CX700_83_950M},
-       {CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M, CX700_84_750M},
-       {CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M, CX700_85_860M},
-       {CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M, CX700_88_750M},
-       {CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M, CX700_94_500M},
-       {CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M, CX700_97_750M},
+       {CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M,
+        CX700_25_175M, VX855_25_175M},
+       {CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M,
+        CX700_29_581M, VX855_29_581M},
+       {CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M,
+        CX700_26_880M, VX855_26_880M},
+       {CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M,
+        CX700_31_490M, VX855_31_490M},
+       {CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M,
+        CX700_31_500M, VX855_31_500M},
+       {CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M,
+        CX700_31_728M, VX855_31_728M},
+       {CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M,
+        CX700_32_668M, VX855_32_668M},
+       {CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M,
+        CX700_36_000M, VX855_36_000M},
+       {CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M,
+        CX700_40_000M, VX855_40_000M},
+       {CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M,
+        CX700_41_291M, VX855_41_291M},
+       {CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M,
+        CX700_43_163M, VX855_43_163M},
+       {CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M,
+        CX700_45_250M, VX855_45_250M},
+       {CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M,
+        CX700_46_000M, VX855_46_000M},
+       {CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M,
+        CX700_46_996M, VX855_46_996M},
+       {CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M,
+        CX700_48_000M, VX855_48_000M},
+       {CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M,
+        CX700_48_875M, VX855_48_875M},
+       {CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M,
+        CX700_49_500M, VX855_49_500M},
+       {CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M,
+        CX700_52_406M, VX855_52_406M},
+       {CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M,
+        CX700_52_977M, VX855_52_977M},
+       {CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M,
+        CX700_56_250M, VX855_56_250M},
+       {CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M,
+        CX700_60_466M, VX855_60_466M},
+       {CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M,
+        CX700_61_500M, VX855_61_500M},
+       {CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M,
+        CX700_65_000M, VX855_65_000M},
+       {CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M,
+        CX700_65_178M, VX855_65_178M},
+       {CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M,
+        CX700_66_750M, VX855_66_750M},
+       {CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M,
+        CX700_68_179M, VX855_68_179M},
+       {CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M,
+        CX700_69_924M, VX855_69_924M},
+       {CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M,
+        CX700_70_159M, VX855_70_159M},
+       {CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M,
+        CX700_72_000M, VX855_72_000M},
+       {CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M,
+        CX700_78_750M, VX855_78_750M},
+       {CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M,
+        CX700_80_136M, VX855_80_136M},
+       {CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M,
+        CX700_83_375M, VX855_83_375M},
+       {CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M,
+        CX700_83_950M, VX855_83_950M},
+       {CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M,
+        CX700_84_750M, VX855_84_750M},
+       {CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M,
+        CX700_85_860M, VX855_85_860M},
+       {CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M,
+        CX700_88_750M, VX855_88_750M},
+       {CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M,
+        CX700_94_500M, VX855_94_500M},
+       {CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M,
+        CX700_97_750M, VX855_97_750M},
        {CLK_101_000M, CLE266_PLL_101_000M, K800_PLL_101_000M,
-        CX700_101_000M},
+        CX700_101_000M, VX855_101_000M},
        {CLK_106_500M, CLE266_PLL_106_500M, K800_PLL_106_500M,
-        CX700_106_500M},
+        CX700_106_500M, VX855_106_500M},
        {CLK_108_000M, CLE266_PLL_108_000M, K800_PLL_108_000M,
-        CX700_108_000M},
+        CX700_108_000M, VX855_108_000M},
        {CLK_113_309M, CLE266_PLL_113_309M, K800_PLL_113_309M,
-        CX700_113_309M},
+        CX700_113_309M, VX855_113_309M},
        {CLK_118_840M, CLE266_PLL_118_840M, K800_PLL_118_840M,
-        CX700_118_840M},
+        CX700_118_840M, VX855_118_840M},
        {CLK_119_000M, CLE266_PLL_119_000M, K800_PLL_119_000M,
-        CX700_119_000M},
+        CX700_119_000M, VX855_119_000M},
        {CLK_121_750M, CLE266_PLL_121_750M, K800_PLL_121_750M,
-        CX700_121_750M},
+        CX700_121_750M, 0},
        {CLK_125_104M, CLE266_PLL_125_104M, K800_PLL_125_104M,
-        CX700_125_104M},
+        CX700_125_104M, 0},
        {CLK_133_308M, CLE266_PLL_133_308M, K800_PLL_133_308M,
-        CX700_133_308M},
+        CX700_133_308M, 0},
        {CLK_135_000M, CLE266_PLL_135_000M, K800_PLL_135_000M,
-        CX700_135_000M},
+        CX700_135_000M, VX855_135_000M},
        {CLK_136_700M, CLE266_PLL_136_700M, K800_PLL_136_700M,
-        CX700_136_700M},
+        CX700_136_700M, VX855_136_700M},
        {CLK_138_400M, CLE266_PLL_138_400M, K800_PLL_138_400M,
-        CX700_138_400M},
+        CX700_138_400M, VX855_138_400M},
        {CLK_146_760M, CLE266_PLL_146_760M, K800_PLL_146_760M,
-        CX700_146_760M},
+        CX700_146_760M, VX855_146_760M},
        {CLK_153_920M, CLE266_PLL_153_920M, K800_PLL_153_920M,
-        CX700_153_920M},
+        CX700_153_920M, VX855_153_920M},
        {CLK_156_000M, CLE266_PLL_156_000M, K800_PLL_156_000M,
-        CX700_156_000M},
+        CX700_156_000M, VX855_156_000M},
        {CLK_157_500M, CLE266_PLL_157_500M, K800_PLL_157_500M,
-        CX700_157_500M},
+        CX700_157_500M, VX855_157_500M},
        {CLK_162_000M, CLE266_PLL_162_000M, K800_PLL_162_000M,
-        CX700_162_000M},
+        CX700_162_000M, VX855_162_000M},
        {CLK_187_000M, CLE266_PLL_187_000M, K800_PLL_187_000M,
-        CX700_187_000M},
+        CX700_187_000M, VX855_187_000M},
        {CLK_193_295M, CLE266_PLL_193_295M, K800_PLL_193_295M,
-        CX700_193_295M},
+        CX700_193_295M, VX855_193_295M},
        {CLK_202_500M, CLE266_PLL_202_500M, K800_PLL_202_500M,
-        CX700_202_500M},
+        CX700_202_500M, VX855_202_500M},
        {CLK_204_000M, CLE266_PLL_204_000M, K800_PLL_204_000M,
-        CX700_204_000M},
+        CX700_204_000M, VX855_204_000M},
        {CLK_218_500M, CLE266_PLL_218_500M, K800_PLL_218_500M,
-        CX700_218_500M},
+        CX700_218_500M, VX855_218_500M},
        {CLK_234_000M, CLE266_PLL_234_000M, K800_PLL_234_000M,
-        CX700_234_000M},
+        CX700_234_000M, VX855_234_000M},
        {CLK_267_250M, CLE266_PLL_267_250M, K800_PLL_267_250M,
-        CX700_267_250M},
+        CX700_267_250M, VX855_267_250M},
        {CLK_297_500M, CLE266_PLL_297_500M, K800_PLL_297_500M,
-        CX700_297_500M},
-       {CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M, CX700_74_481M},
+        CX700_297_500M, VX855_297_500M},
+       {CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M,
+        CX700_74_481M, VX855_74_481M},
        {CLK_172_798M, CLE266_PLL_172_798M, K800_PLL_172_798M,
-        CX700_172_798M},
+        CX700_172_798M, VX855_172_798M},
        {CLK_122_614M, CLE266_PLL_122_614M, K800_PLL_122_614M,
-        CX700_122_614M},
-       {CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M, CX700_74_270M},
+        CX700_122_614M, VX855_122_614M},
+       {CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M,
+        CX700_74_270M, 0},
        {CLK_148_500M, CLE266_PLL_148_500M, K800_PLL_148_500M,
-        CX700_148_500M}
+        CX700_148_500M, VX855_148_500M}
 };
 
 static struct fifo_depth_select display_fifo_depth_reg = {
@@ -508,7 +526,8 @@ static void set_dvi_output_path(int set_iga, int output_interface);
 static void set_lcd_output_path(int set_iga, int output_interface);
 static int search_mode_setting(int ModeInfoIndex);
 static void load_fix_bit_crtc_reg(void);
-static void init_gfx_chip_info(void);
+static void init_gfx_chip_info(struct pci_dev *pdev,
+                               const struct pci_device_id *pdi);
 static void init_tmds_chip_info(void);
 static void init_lvds_chip_info(void);
 static void device_screen_off(void);
@@ -518,7 +537,6 @@ static void device_off(void);
 static void device_on(void);
 static void enable_second_display_channel(void);
 static void disable_second_display_channel(void);
-static int get_fb_size_from_pci(void);
 
 void viafb_write_reg(u8 index, u16 io_port, u8 data)
 {
@@ -629,70 +647,43 @@ void viafb_set_iga_path(void)
        }
 }
 
-void viafb_set_start_addr(void)
+void viafb_set_primary_address(u32 addr)
 {
-       unsigned long offset = 0, tmp = 0, size = 0;
-       unsigned long length;
-
-       DEBUG_MSG(KERN_INFO "viafb_set_start_addr!\n");
-       viafb_unlock_crt();
-       /* update starting address of IGA1 */
-       viafb_write_reg(CR0C, VIACR, 0x00);     /*initial starting address */
-       viafb_write_reg(CR0D, VIACR, 0x00);
-       viafb_write_reg(CR34, VIACR, 0x00);
-       viafb_write_reg_mask(CR48, VIACR, 0x00, 0x1F);
-
-       if (viafb_dual_fb) {
-               viaparinfo->iga_path = IGA1;
-               viaparinfo1->iga_path = IGA2;
-       }
-
-       if (viafb_SAMM_ON == 1) {
-               if (!viafb_dual_fb) {
-                       if (viafb_second_size)
-                               size = viafb_second_size * 1024 * 1024;
-                       else
-                               size = 8 * 1024 * 1024;
-               } else {
+       DEBUG_MSG(KERN_DEBUG "viafb_set_primary_address(0x%08X)\n", addr);
+       viafb_write_reg(CR0D, VIACR, addr & 0xFF);
+       viafb_write_reg(CR0C, VIACR, (addr >> 8) & 0xFF);
+       viafb_write_reg(CR34, VIACR, (addr >> 16) & 0xFF);
+       viafb_write_reg_mask(CR48, VIACR, (addr >> 24) & 0x1F, 0x1F);
+}
 
-                       size = viaparinfo1->memsize;
-               }
-               offset = viafb_second_offset;
-               DEBUG_MSG(KERN_INFO
-                         "viafb_second_size=%lx, second start_adddress=%lx\n",
-                         size, offset);
-       }
-       if (viafb_SAMM_ON == 1) {
-               offset = offset >> 3;
-
-               tmp = viafb_read_reg(VIACR, 0x62) & 0x01;
-               tmp |= (offset & 0x7F) << 1;
-               viafb_write_reg(CR62, VIACR, tmp);
-               viafb_write_reg(CR63, VIACR, ((offset & 0x7F80) >> 7));
-               viafb_write_reg(CR64, VIACR, ((offset & 0x7F8000) >> 15));
-               viafb_write_reg(CRA3, VIACR, ((offset & 0x3800000) >> 23));
-       } else {
-               /* update starting address */
-               viafb_write_reg(CR62, VIACR, 0x00);
-               viafb_write_reg(CR63, VIACR, 0x00);
-               viafb_write_reg(CR64, VIACR, 0x00);
-               viafb_write_reg(CRA3, VIACR, 0x00);
-       }
+void viafb_set_secondary_address(u32 addr)
+{
+       DEBUG_MSG(KERN_DEBUG "viafb_set_secondary_address(0x%08X)\n", addr);
+       /* secondary display supports only quadword aligned memory */
+       viafb_write_reg_mask(CR62, VIACR, (addr >> 2) & 0xFE, 0xFE);
+       viafb_write_reg(CR63, VIACR, (addr >> 10) & 0xFF);
+       viafb_write_reg(CR64, VIACR, (addr >> 18) & 0xFF);
+       viafb_write_reg_mask(CRA3, VIACR, (addr >> 26) & 0x07, 0x07);
+}
 
-       if (viafb_SAMM_ON == 1) {
-               if (viafb_accel) {
-                       if (!viafb_dual_fb)
-                               length = size - viaparinfo->fbmem_used;
-                       else
-                               length = size - viaparinfo1->fbmem_used;
-               } else
-                       length = size;
-               offset = (unsigned long)(void *)viafb_FB_MM +
-                       viafb_second_offset;
-               memset((void *)offset, 0, length);
-       }
+void viafb_set_primary_pitch(u32 pitch)
+{
+       DEBUG_MSG(KERN_DEBUG "viafb_set_primary_pitch(0x%08X)\n", pitch);
+       /* spec does not say that first adapter skips 3 bits but old
+        * code did it and seems to be reasonable in analogy to 2nd adapter
+        */
+       pitch = pitch >> 3;
+       viafb_write_reg(0x13, VIACR, pitch & 0xFF);
+       viafb_write_reg_mask(0x35, VIACR, (pitch >> (8 - 5)) & 0xE0, 0xE0);
+}
 
-       viafb_lock_crt();
+void viafb_set_secondary_pitch(u32 pitch)
+{
+       DEBUG_MSG(KERN_DEBUG "viafb_set_secondary_pitch(0x%08X)\n", pitch);
+       pitch = pitch >> 3;
+       viafb_write_reg(0x66, VIACR, pitch & 0xFF);
+       viafb_write_reg_mask(0x67, VIACR, (pitch >> 8) & 0x03, 0x03);
+       viafb_write_reg_mask(0x71, VIACR, (pitch >> (10 - 7)) & 0x80, 0x80);
 }
 
 void viafb_set_output_path(int device, int set_iga, int output_interface)
@@ -1123,30 +1114,6 @@ void viafb_write_regx(struct io_reg RegTable[], int ItemNum)
        }
 }
 
-void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga)
-{
-       int reg_value;
-       int viafb_load_reg_num;
-       struct io_register *reg;
-
-       switch (set_iga) {
-       case IGA1_IGA2:
-       case IGA1:
-               reg_value = IGA1_OFFSET_FORMULA(h_addr, bpp_byte);
-               viafb_load_reg_num = offset_reg.iga1_offset_reg.reg_num;
-               reg = offset_reg.iga1_offset_reg.reg;
-               viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
-               if (set_iga == IGA1)
-                       break;
-       case IGA2:
-               reg_value = IGA2_OFFSET_FORMULA(h_addr, bpp_byte);
-               viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
-               reg = offset_reg.iga2_offset_reg.reg;
-               viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
-               break;
-       }
-}
-
 void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)
 {
        int reg_value;
@@ -1277,6 +1244,15 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)
                            VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
                }
 
+               if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX855) {
+                       iga1_fifo_max_depth = VX855_IGA1_FIFO_MAX_DEPTH;
+                       iga1_fifo_threshold = VX855_IGA1_FIFO_THRESHOLD;
+                       iga1_fifo_high_threshold =
+                           VX855_IGA1_FIFO_HIGH_THRESHOLD;
+                       iga1_display_queue_expire_num =
+                           VX855_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+               }
+
                /* Set Display FIFO Depath Select */
                reg_value = IGA1_FIFO_DEPTH_SELECT_FORMULA(iga1_fifo_max_depth);
                viafb_load_reg_num =
@@ -1408,6 +1384,15 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)
                            VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
                }
 
+               if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX855) {
+                       iga2_fifo_max_depth = VX855_IGA2_FIFO_MAX_DEPTH;
+                       iga2_fifo_threshold = VX855_IGA2_FIFO_THRESHOLD;
+                       iga2_fifo_high_threshold =
+                           VX855_IGA2_FIFO_HIGH_THRESHOLD;
+                       iga2_display_queue_expire_num =
+                           VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+               }
+
                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
                        /* Set Display FIFO Depath Select */
                        reg_value =
@@ -1496,6 +1481,8 @@ u32 viafb_get_clk_value(int clk)
                        case UNICHROME_P4M900:
                        case UNICHROME_VX800:
                                return pll_value[i].cx700_pll;
+                       case UNICHROME_VX855:
+                               return pll_value[i].vx855_pll;
                        }
                }
        }
@@ -1529,6 +1516,7 @@ void viafb_set_vclock(u32 CLK, int set_iga)
                case UNICHROME_P4M890:
                case UNICHROME_P4M900:
                case UNICHROME_VX800:
+               case UNICHROME_VX855:
                        viafb_write_reg(SR44, VIASR, CLK / 0x10000);
                        DEBUG_MSG(KERN_INFO "\nSR44=%x", CLK / 0x10000);
                        viafb_write_reg(SR45, VIASR, (CLK & 0xFFFF) / 0x100);
@@ -1557,6 +1545,7 @@ void viafb_set_vclock(u32 CLK, int set_iga)
                case UNICHROME_P4M890:
                case UNICHROME_P4M900:
                case UNICHROME_VX800:
+               case UNICHROME_VX855:
                        viafb_write_reg(SR4A, VIASR, CLK / 0x10000);
                        viafb_write_reg(SR4B, VIASR, (CLK & 0xFFFF) / 0x100);
                        viafb_write_reg(SR4C, VIASR, CLK % 0x100);
@@ -1916,7 +1905,6 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
        load_fix_bit_crtc_reg();
        viafb_lock_crt();
        viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
-       viafb_load_offset_reg(h_addr, bpp_byte, set_iga);
        viafb_load_fetch_count_reg(h_addr, bpp_byte, set_iga);
 
        /* load FIFO */
@@ -1933,9 +1921,10 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
 
 }
 
-void viafb_init_chip_info(void)
+void viafb_init_chip_info(struct pci_dev *pdev,
+                         const struct pci_device_id *pdi)
 {
-       init_gfx_chip_info();
+       init_gfx_chip_info(pdev, pdi);
        init_tmds_chip_info();
        init_lvds_chip_info();
 
@@ -2008,24 +1997,12 @@ void viafb_update_device_setting(int hres, int vres,
        }
 }
 
-static void init_gfx_chip_info(void)
+static void init_gfx_chip_info(struct pci_dev *pdev,
+                              const struct pci_device_id *pdi)
 {
-       struct pci_dev *pdev = NULL;
-       u32 i;
        u8 tmp;
 
-       /* Indentify GFX Chip Name */
-       for (i = 0; pciidlist[i].vendor != 0; i++) {
-               pdev = pci_get_device(pciidlist[i].vendor,
-                       pciidlist[i].device, 0);
-               if (pdev)
-                       break;
-       }
-
-       if (!pciidlist[i].vendor)
-               return ;
-
-       viaparinfo->chip_info->gfx_chip_name = pciidlist[i].chip_index;
+       viaparinfo->chip_info->gfx_chip_name = pdi->driver_data;
 
        /* Check revision of CLE266 Chip */
        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
@@ -2056,8 +2033,6 @@ static void init_gfx_chip_info(void)
                                CX700_REVISION_700;
                }
        }
-
-       pci_dev_put(pdev);
 }
 
 static void init_tmds_chip_info(void)
@@ -2271,11 +2246,12 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                break;
 
        case UNICHROME_CX700:
-               viafb_write_regx(CX700_ModeXregs, NUM_TOTAL_CX700_ModeXregs);
-
        case UNICHROME_VX800:
-               viafb_write_regx(VX800_ModeXregs, NUM_TOTAL_VX800_ModeXregs);
+               viafb_write_regx(CX700_ModeXregs, NUM_TOTAL_CX700_ModeXregs);
+               break;
 
+       case UNICHROME_VX855:
+               viafb_write_regx(VX855_ModeXregs, NUM_TOTAL_VX855_ModeXregs);
                break;
        }
 
@@ -2291,7 +2267,8 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                outb(VPIT.SR[i - 1], VIASR + 1);
        }
 
-       viafb_set_start_addr();
+       viafb_set_primary_address(0);
+       viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
        viafb_set_iga_path();
 
        /* Write CRTC */
@@ -2371,6 +2348,9 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                }
        }
 
+       viafb_set_primary_pitch(viafbinfo->fix.line_length);
+       viafb_set_secondary_pitch(viafb_dual_fb ? viafbinfo1->fix.line_length
+               : viafbinfo->fix.line_length);
        /* Update Refresh Rate Setting */
 
        /* Clear On Screen */
@@ -2545,38 +2525,6 @@ void viafb_crt_enable(void)
        viafb_write_reg_mask(CR36, VIACR, 0x0, BIT5 + BIT4);
 }
 
-void viafb_get_mmio_info(unsigned long *mmio_base,
-       unsigned long *mmio_len)
-{
-       struct pci_dev *pdev = NULL;
-       u32 vendor, device;
-       u32 i;
-
-       for (i = 0; pciidlist[i].vendor != 0; i++)
-               if (viaparinfo->chip_info->gfx_chip_name ==
-                       pciidlist[i].chip_index)
-                       break;
-
-       if (!pciidlist[i].vendor)
-               return ;
-
-       vendor = pciidlist[i].vendor;
-       device = pciidlist[i].device;
-
-       pdev = pci_get_device(vendor, device, NULL);
-
-       if (!pdev) {
-               *mmio_base = 0;
-               *mmio_len = 0;
-               return ;
-       }
-
-       *mmio_base = pci_resource_start(pdev, 1);
-       *mmio_len = pci_resource_len(pdev, 1);
-
-       pci_dev_put(pdev);
-}
-
 static void enable_second_display_channel(void)
 {
        /* to enable second display channel. */
@@ -2593,44 +2541,7 @@ static void disable_second_display_channel(void)
        viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);
 }
 
-void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len)
-{
-       struct pci_dev *pdev = NULL;
-       u32 vendor, device;
-       u32 i;
-
-       for (i = 0; pciidlist[i].vendor != 0; i++)
-               if (viaparinfo->chip_info->gfx_chip_name ==
-                       pciidlist[i].chip_index)
-                       break;
-
-       if (!pciidlist[i].vendor)
-               return ;
-
-       vendor = pciidlist[i].vendor;
-       device = pciidlist[i].device;
-
-       pdev = pci_get_device(vendor, device, NULL);
-
-       if (!pdev) {
-               *fb_base = viafb_read_reg(VIASR, SR30) << 24;
-               *fb_len = viafb_get_memsize();
-               DEBUG_MSG(KERN_INFO "Get FB info from SR30!\n");
-               DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
-               DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
-               return ;
-       }
-
-       *fb_base = (unsigned int)pci_resource_start(pdev, 0);
-       *fb_len = get_fb_size_from_pci();
-       DEBUG_MSG(KERN_INFO "Get FB info from PCI system!\n");
-       DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
-       DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
-
-       pci_dev_put(pdev);
-}
-
-static int get_fb_size_from_pci(void)
+int viafb_get_fb_size_from_pci(void)
 {
        unsigned long configid, deviceid, FBSize = 0;
        int VideoMemSize;
@@ -2656,6 +2567,7 @@ static int get_fb_size_from_pci(void)
                case P4M890_FUNCTION3:
                case P4M900_FUNCTION3:
                case VX800_FUNCTION3:
+               case VX855_FUNCTION3:
                        /*case CN750_FUNCTION3: */
                        outl(configid + 0xA0, (unsigned long)0xCF8);
                        FBSize = inl((unsigned long)0xCFC);
@@ -2719,6 +2631,10 @@ static int get_fb_size_from_pci(void)
                        VideoMemSize = (256 << 20);     /*256M */
                        break;
 
+               case 0x00007000:        /* Only on VX855/875 */
+                       VideoMemSize = (512 << 20);     /*512M */
+                       break;
+
                default:
                        VideoMemSize = (32 << 20);      /*32M */
                        break;
@@ -2788,24 +2704,6 @@ void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
        }
 }
 
-void viafb_memory_pitch_patch(struct fb_info *info)
-{
-       if (info->var.xres != info->var.xres_virtual) {
-               viafb_load_offset_reg(info->var.xres_virtual,
-                               info->var.bits_per_pixel >> 3, IGA1);
-
-               if (viafb_SAMM_ON) {
-                       viafb_load_offset_reg(viafb_second_virtual_xres,
-                               viafb_bpp1 >> 3,
-                                       IGA2);
-               } else {
-                       viafb_load_offset_reg(info->var.xres_virtual,
-                                       info->var.bits_per_pixel >> 3, IGA2);
-               }
-
-       }
-}
-
 /*According var's xres, yres fill var's other timing information*/
 void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
                          int mode_index)
index 6ff38fa..b874d95 100644 (file)
@@ -147,14 +147,8 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */
 /* location: {CR5F,0,4} */
 #define IGA2_VER_SYNC_END_REG_NUM       1
 
-/* Define Offset and Fetch Count Register*/
+/* Define Fetch Count Register*/
 
-/* location: {CR13,0,7},{CR35,5,7} */
-#define IGA1_OFFSET_REG_NUM             2
-/* 8 bytes alignment. */
-#define IGA1_OFFSER_ALIGN_BYTE          8
-/* x: H resolution, y: color depth */
-#define IGA1_OFFSET_FORMULA(x, y)        ((x*y)/IGA1_OFFSER_ALIGN_BYTE)
 /* location: {SR1C,0,7},{SR1D,0,1} */
 #define IGA1_FETCH_COUNT_REG_NUM        2
 /* 16 bytes alignment. */
@@ -164,11 +158,6 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */
 #define IGA1_FETCH_COUNT_FORMULA(x, y)   \
        (((x*y)/IGA1_FETCH_COUNT_ALIGN_BYTE) + IGA1_FETCH_COUNT_PATCH_VALUE)
 
-/* location: {CR66,0,7},{CR67,0,1} */
-#define IGA2_OFFSET_REG_NUM             2
-#define IGA2_OFFSET_ALIGN_BYTE          8
-/* x: H resolution, y: color depth */
-#define IGA2_OFFSET_FORMULA(x, y)        ((x*y)/IGA2_OFFSET_ALIGN_BYTE)
 /* location: {CR65,0,7},{CR67,2,3} */
 #define IGA2_FETCH_COUNT_REG_NUM        2
 #define IGA2_FETCH_COUNT_ALIGN_BYTE     16
@@ -335,6 +324,17 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */
 /* location: {CR94,0,6} */
 #define VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
 
+/* For VT3409 */
+#define VX855_IGA1_FIFO_MAX_DEPTH               400
+#define VX855_IGA1_FIFO_THRESHOLD               320
+#define VX855_IGA1_FIFO_HIGH_THRESHOLD          320
+#define VX855_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     160
+
+#define VX855_IGA2_FIFO_MAX_DEPTH               200
+#define VX855_IGA2_FIFO_THRESHOLD               160
+#define VX855_IGA2_FIFO_HIGH_THRESHOLD          160
+#define VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     320
+
 #define IGA1_FIFO_DEPTH_SELECT_REG_NUM          1
 #define IGA1_FIFO_THRESHOLD_REG_NUM             2
 #define IGA1_FIFO_HIGH_THRESHOLD_REG_NUM        2
@@ -617,23 +617,6 @@ struct iga2_ver_sync_end {
        struct io_register reg[IGA2_VER_SYNC_END_REG_NUM];
 };
 
-/* IGA1 Offset Register */
-struct iga1_offset {
-       int reg_num;
-       struct io_register reg[IGA1_OFFSET_REG_NUM];
-};
-
-/* IGA2 Offset Register */
-struct iga2_offset {
-       int reg_num;
-       struct io_register reg[IGA2_OFFSET_REG_NUM];
-};
-
-struct offset {
-       struct iga1_offset iga1_offset_reg;
-       struct iga2_offset iga2_offset_reg;
-};
-
 /* IGA1 Fetch Count Register */
 struct iga1_fetch_count {
        int reg_num;
@@ -716,6 +699,7 @@ struct pll_map {
        u32 cle266_pll;
        u32 k800_pll;
        u32 cx700_pll;
+       u32 vx855_pll;
 };
 
 struct rgbLUT {
@@ -860,6 +844,8 @@ struct iga2_crtc_timing {
 #define P4M900_FUNCTION3    0x3364
 /* VT3353 chipset*/
 #define VX800_FUNCTION3     0x3353
+/* VT3409 chipset*/
+#define VX855_FUNCTION3     0x3409
 
 #define NUM_TOTAL_PLL_TABLE ARRAY_SIZE(pll_value)
 
@@ -883,7 +869,6 @@ extern int viafb_dual_fb;
 extern int viafb_LCD2_ON;
 extern int viafb_LCD_ON;
 extern int viafb_DVI_ON;
-extern int viafb_accel;
 extern int viafb_hotplug;
 
 void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);
@@ -904,7 +889,6 @@ void viafb_write_reg(u8 index, u16 io_port, u8 data);
 u8 viafb_read_reg(int io_port, u8 index);
 void viafb_lock_crt(void);
 void viafb_unlock_crt(void);
-void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga);
 void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga);
 void viafb_write_regx(struct io_reg RegTable[], int ItemNum);
 struct VideoModeTable *viafb_get_modetbl_pointer(int Index);
@@ -917,17 +901,20 @@ void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
 int viafb_setmode(int vmode_index, int hor_res, int ver_res,
            int video_bpp, int vmode_index1, int hor_res1,
            int ver_res1, int video_bpp1);
-void viafb_init_chip_info(void);
+void viafb_init_chip_info(struct pci_dev *pdev,
+                         const struct pci_device_id *pdi);
 void viafb_init_dac(int set_iga);
 int viafb_get_pixclock(int hres, int vres, int vmode_refresh);
 int viafb_get_refresh(int hres, int vres, u32 float_refresh);
 void viafb_update_device_setting(int hres, int vres, int bpp,
                           int vmode_refresh, int flag);
-void viafb_get_mmio_info(unsigned long *mmio_base,
-       unsigned long *mmio_len);
 
+int viafb_get_fb_size_from_pci(void);
 void viafb_set_iga_path(void);
-void viafb_set_start_addr(void);
+void viafb_set_primary_address(u32 addr);
+void viafb_set_secondary_address(u32 addr);
+void viafb_set_primary_pitch(u32 pitch);
+void viafb_set_secondary_pitch(u32 pitch);
 void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len);
 
 #endif /* __HW_H__ */
index 842fe30..de89980 100644 (file)
@@ -50,8 +50,6 @@
 #define VIAFB_GET_GAMMA_LUT            0x56494124
 #define VIAFB_SET_GAMMA_LUT            0x56494125
 #define VIAFB_GET_GAMMA_SUPPORT_STATE  0x56494126
-#define VIAFB_SET_VIDEO_DEVICE         0x56494127
-#define VIAFB_GET_VIDEO_DEVICE         0x56494128
 #define VIAFB_SET_SECOND_MODE          0x56494129
 #define VIAFB_SYNC_SURFACE             0x56494130
 #define VIAFB_GET_DRIVER_CAPS          0x56494131
@@ -179,9 +177,7 @@ struct viafb_ioctl_setting {
        unsigned short second_dev_bpp;
        /* Indicate which device are primary display device. */
        unsigned int primary_device;
-       /* Indicate which device will show video. only valid in duoview mode */
-       unsigned int video_device_status;
-       unsigned int struct_reserved[34];
+       unsigned int struct_reserved[35];
        struct viafb_ioctl_lcd_attribute lcd_attributes;
 };
 
index 78c6b33..e3e597f 100644 (file)
@@ -207,13 +207,13 @@ static bool lvds_identify_integratedlvds(void)
 
 int viafb_lvds_trasmitter_identify(void)
 {
-       viaparinfo->i2c_stuff.i2c_port = I2CPORTINDEX;
+       viaparinfo->shared->i2c_stuff.i2c_port = I2CPORTINDEX;
        if (viafb_lvds_identify_vt1636()) {
                viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX;
                DEBUG_MSG(KERN_INFO
                          "Found VIA VT1636 LVDS on port i2c 0x31 \n");
        } else {
-               viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+               viaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX;
                if (viafb_lvds_identify_vt1636()) {
                        viaparinfo->chip_info->lvds_chip_info.i2c_port =
                                GPIOPORTINDEX;
@@ -470,7 +470,7 @@ static int lvds_register_read(int index)
 {
        u8 data;
 
-       viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+       viaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX;
        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
            lvds_chip_info.lvds_chip_slave_addr,
                        (u8) index, &data);
@@ -952,13 +952,10 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
        int video_index = plvds_setting_info->lcd_panel_size;
        int set_iga = plvds_setting_info->iga_path;
        int mode_bpp = plvds_setting_info->bpp;
-       int viafb_load_reg_num = 0;
-       int reg_value = 0;
        int set_hres, set_vres;
        int panel_hres, panel_vres;
        u32 pll_D_N;
        int offset;
-       struct io_register *reg = NULL;
        struct display_timing mode_crt_reg, panel_crt_reg;
        struct crt_mode_table *panel_crt_table = NULL;
        struct VideoModeTable *vmode_tbl = NULL;
@@ -1038,16 +1035,11 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
                }
 
                /* Offset for simultaneous */
-               reg_value = offset;
-               viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
-               reg = offset_reg.iga2_offset_reg.reg;
-               viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+               viafb_set_secondary_pitch(offset << 3);
                DEBUG_MSG(KERN_INFO "viafb_load_reg!!\n");
                viafb_load_fetch_count_reg(set_hres, 4, IGA2);
                /* Fetch count for simultaneous */
        } else {                /* SAMM */
-               /* Offset for IGA2 only */
-               viafb_load_offset_reg(set_hres, mode_bpp / 8, set_iga);
                /* Fetch count for IGA2 only */
                viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
 
index 2e1254d..7cd03e2 100644 (file)
 #define SR4B    0x4B
 #define SR4C    0x4C
 #define SR52    0x52
+#define SR57   0x57
+#define SR58   0x58
+#define SR59   0x59
+#define SR5D    0x5D
 #define SR5E    0x5E
 #define SR65    0x65
 
 #define CX700_297_500M    0x00CE0403
 #define CX700_122_614M    0x00870802
 
+/* PLL for VX855 */
+#define VX855_22_000M     0x007B1005
+#define VX855_25_175M     0x008D1005
+#define VX855_26_719M     0x00961005
+#define VX855_26_880M     0x00961005
+#define VX855_27_000M     0x00971005
+#define VX855_29_581M     0x00A51005
+#define VX855_29_829M     0x00641003
+#define VX855_31_490M     0x00B01005
+#define VX855_31_500M     0x00B01005
+#define VX855_31_728M     0x008E1004
+#define VX855_32_668M     0x00921004
+#define VX855_36_000M     0x00A11004
+#define VX855_40_000M     0x00700C05
+#define VX855_41_291M     0x00730C05
+#define VX855_43_163M     0x00790C05
+#define VX855_45_250M     0x007F0C05      /* 45.46MHz */
+#define VX855_46_000M     0x00670C04
+#define VX855_46_996M     0x00690C04
+#define VX855_48_000M     0x00860C05
+#define VX855_48_875M     0x00890C05
+#define VX855_49_500M     0x00530C03
+#define VX855_52_406M     0x00580C03
+#define VX855_52_977M     0x00940C05
+#define VX855_56_250M     0x009D0C05
+#define VX855_60_466M     0x00A90C05
+#define VX855_61_500M     0x00AC0C05
+#define VX855_65_000M     0x006D0C03
+#define VX855_65_178M     0x00B60C05
+#define VX855_66_750M     0x00700C03    /*67.116MHz */
+#define VX855_67_295M     0x00BC0C05
+#define VX855_68_179M     0x00BF0C05
+#define VX855_68_369M     0x00BF0C05
+#define VX855_69_924M     0x00C30C05
+#define VX855_70_159M     0x00C30C05
+#define VX855_72_000M     0x00A10C04
+#define VX855_73_023M     0x00CC0C05
+#define VX855_74_481M     0x00D10C05
+#define VX855_78_750M     0x006E0805
+#define VX855_79_466M     0x006F0805
+#define VX855_80_136M     0x00700805
+#define VX855_81_627M     0x00720805
+#define VX855_83_375M     0x00750805
+#define VX855_83_527M     0x00750805
+#define VX855_83_950M     0x00750805
+#define VX855_84_537M     0x00760805
+#define VX855_84_750M     0x00760805     /* 84.537Mhz */
+#define VX855_85_500M     0x00760805        /* 85.909080 MHz*/
+#define VX855_85_860M     0x00760805
+#define VX855_85_909M     0x00760805
+#define VX855_88_750M     0x007C0805
+#define VX855_89_489M     0x007D0805
+#define VX855_94_500M     0x00840805
+#define VX855_96_648M     0x00870805
+#define VX855_97_750M     0x00890805
+#define VX855_101_000M    0x008D0805
+#define VX855_106_500M    0x00950805
+#define VX855_108_000M    0x00970805
+#define VX855_110_125M    0x00990805
+#define VX855_112_000M    0x009D0805
+#define VX855_113_309M    0x009F0805
+#define VX855_115_000M    0x00A10805
+#define VX855_118_840M    0x00A60805
+#define VX855_119_000M    0x00A70805
+#define VX855_121_750M    0x00AA0805       /* 121.704MHz */
+#define VX855_122_614M    0x00AC0805
+#define VX855_126_266M    0x00B10805
+#define VX855_130_250M    0x00B60805      /* 130.250 */
+#define VX855_135_000M    0x00BD0805
+#define VX855_136_700M    0x00BF0805
+#define VX855_137_750M    0x00C10805
+#define VX855_138_400M    0x00C20805
+#define VX855_144_300M    0x00CA0805
+#define VX855_146_760M    0x00CE0805
+#define VX855_148_500M   0x00D00805
+#define VX855_153_920M    0x00540402
+#define VX855_156_000M    0x006C0405
+#define VX855_156_867M    0x006E0405
+#define VX855_157_500M    0x006E0405
+#define VX855_162_000M    0x00710405
+#define VX855_172_798M    0x00790405
+#define VX855_187_000M    0x00830405
+#define VX855_193_295M    0x00870405
+#define VX855_202_500M    0x008E0405
+#define VX855_204_000M    0x008F0405
+#define VX855_218_500M    0x00990405
+#define VX855_229_500M    0x00A10405
+#define VX855_234_000M    0x00A40405
+#define VX855_267_250M    0x00BB0405
+#define VX855_297_500M    0x00D00405
+#define VX855_339_500M    0x00770005
+#define VX855_340_772M    0x00770005
+
+
 /* Definition CRTC Timing Index */
 #define H_TOTAL_INDEX               0
 #define H_ADDR_INDEX                1
index 0f3ed4e..15543e9 100644 (file)
@@ -97,7 +97,7 @@ int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata)
        mm1[0] = index;
        msgs[0].len = 1; msgs[1].len = 1;
        msgs[0].buf = mm1; msgs[1].buf = pdata;
-       i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+       i2c_transfer(&viaparinfo->shared->i2c_stuff.adapter, msgs, 2);
 
        return 0;
 }
@@ -111,7 +111,7 @@ int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data)
        msgs.addr = slave_addr / 2;
        msgs.len = 2;
        msgs.buf = msg;
-       return i2c_transfer(&viaparinfo->i2c_stuff.adapter, &msgs, 1);
+       return i2c_transfer(&viaparinfo->shared->i2c_stuff.adapter, &msgs, 1);
 }
 
 int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len)
@@ -125,53 +125,53 @@ int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len)
        mm1[0] = index;
        msgs[0].len = 1; msgs[1].len = buff_len;
        msgs[0].buf = mm1; msgs[1].buf = buff;
-       i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+       i2c_transfer(&viaparinfo->shared->i2c_stuff.adapter, msgs, 2);
        return 0;
 }
 
 int viafb_create_i2c_bus(void *viapar)
 {
        int ret;
-       struct viafb_par *par = (struct viafb_par *)viapar;
-
-       strcpy(par->i2c_stuff.adapter.name, "via_i2c");
-       par->i2c_stuff.i2c_port = 0x0;
-       par->i2c_stuff.adapter.owner = THIS_MODULE;
-       par->i2c_stuff.adapter.id = 0x01FFFF;
-       par->i2c_stuff.adapter.class = 0;
-       par->i2c_stuff.adapter.algo_data = &par->i2c_stuff.algo;
-       par->i2c_stuff.adapter.dev.parent = NULL;
-       par->i2c_stuff.algo.setsda = via_i2c_setsda;
-       par->i2c_stuff.algo.setscl = via_i2c_setscl;
-       par->i2c_stuff.algo.getsda = via_i2c_getsda;
-       par->i2c_stuff.algo.getscl = via_i2c_getscl;
-       par->i2c_stuff.algo.udelay = 40;
-       par->i2c_stuff.algo.timeout = 20;
-       par->i2c_stuff.algo.data = &par->i2c_stuff;
-
-       i2c_set_adapdata(&par->i2c_stuff.adapter, &par->i2c_stuff);
+       struct via_i2c_stuff *i2c_stuff =
+               &((struct viafb_par *)viapar)->shared->i2c_stuff;
+
+       strcpy(i2c_stuff->adapter.name, "via_i2c");
+       i2c_stuff->i2c_port = 0x0;
+       i2c_stuff->adapter.owner = THIS_MODULE;
+       i2c_stuff->adapter.id = 0x01FFFF;
+       i2c_stuff->adapter.class = 0;
+       i2c_stuff->adapter.algo_data = &i2c_stuff->algo;
+       i2c_stuff->adapter.dev.parent = NULL;
+       i2c_stuff->algo.setsda = via_i2c_setsda;
+       i2c_stuff->algo.setscl = via_i2c_setscl;
+       i2c_stuff->algo.getsda = via_i2c_getsda;
+       i2c_stuff->algo.getscl = via_i2c_getscl;
+       i2c_stuff->algo.udelay = 40;
+       i2c_stuff->algo.timeout = 20;
+       i2c_stuff->algo.data = i2c_stuff;
+
+       i2c_set_adapdata(&i2c_stuff->adapter, i2c_stuff);
 
        /* Raise SCL and SDA */
-       par->i2c_stuff.i2c_port = I2CPORTINDEX;
-       via_i2c_setsda(&par->i2c_stuff, 1);
-       via_i2c_setscl(&par->i2c_stuff, 1);
+       i2c_stuff->i2c_port = I2CPORTINDEX;
+       via_i2c_setsda(i2c_stuff, 1);
+       via_i2c_setscl(i2c_stuff, 1);
 
-       par->i2c_stuff.i2c_port = GPIOPORTINDEX;
-       via_i2c_setsda(&par->i2c_stuff, 1);
-       via_i2c_setscl(&par->i2c_stuff, 1);
+       i2c_stuff->i2c_port = GPIOPORTINDEX;
+       via_i2c_setsda(i2c_stuff, 1);
+       via_i2c_setscl(i2c_stuff, 1);
        udelay(20);
 
-       ret = i2c_bit_add_bus(&par->i2c_stuff.adapter);
+       ret = i2c_bit_add_bus(&i2c_stuff->adapter);
        if (ret == 0)
-               DEBUG_MSG("I2C bus %s registered.\n",
-               par->i2c_stuff.adapter.name);
+               DEBUG_MSG("I2C bus %s registered.\n", i2c_stuff->adapter.name);
        else
                DEBUG_MSG("Failed to register I2C bus %s.\n",
-                       par->i2c_stuff.adapter.name);
+                       i2c_stuff->adapter.name);
        return ret;
 }
 
 void viafb_delete_i2c_buss(void *par)
 {
-       i2c_del_adapter(&((struct viafb_par *)par)->i2c_stuff.adapter);
+       i2c_del_adapter(&((struct viafb_par *)par)->shared->i2c_stuff.adapter);
 }
index 72833f3..56ec696 100644 (file)
  */
 
 #include <linux/module.h>
+#include <linux/seq_file.h>
+#include <linux/stat.h>
 #define _MASTER_FILE
 
 #include "global.h"
 
-static int MAX_CURS = 32;
 static struct fb_var_screeninfo default_var;
 static char *viafb_name = "Via";
 static u32 pseudo_pal[17];
@@ -33,12 +34,11 @@ static u32 pseudo_pal[17];
 static char *viafb_mode = "640x480";
 static char *viafb_mode1 = "640x480";
 
+static int viafb_accel = 1;
+
 /* Added for specifying active devices.*/
 char *viafb_active_dev = "";
 
-/* Added for specifying video on devices.*/
-char *viafb_video_dev = "";
-
 /*Added for specify lcd output port*/
 char *viafb_lcd_port = "";
 char *viafb_dvi_port = "";
@@ -50,71 +50,20 @@ static void apply_second_mode_setting(struct fb_var_screeninfo
        *sec_var);
 static void retrieve_device_setting(struct viafb_ioctl_setting
        *setting_info);
-static void viafb_set_video_device(u32 video_dev_info);
-static void viafb_get_video_device(u32 *video_dev_info);
-
-/* Mode information */
-static const struct viafb_modeinfo viafb_modentry[] = {
-       {480, 640, VIA_RES_480X640},
-       {640, 480, VIA_RES_640X480},
-       {800, 480, VIA_RES_800X480},
-       {800, 600, VIA_RES_800X600},
-       {1024, 768, VIA_RES_1024X768},
-       {1152, 864, VIA_RES_1152X864},
-       {1280, 1024, VIA_RES_1280X1024},
-       {1600, 1200, VIA_RES_1600X1200},
-       {1440, 1050, VIA_RES_1440X1050},
-       {1280, 768, VIA_RES_1280X768,},
-       {1280, 800, VIA_RES_1280X800},
-       {1280, 960, VIA_RES_1280X960},
-       {1920, 1440, VIA_RES_1920X1440},
-       {848, 480, VIA_RES_848X480},
-       {1400, 1050, VIA_RES_1400X1050},
-       {720, 480, VIA_RES_720X480},
-       {720, 576, VIA_RES_720X576},
-       {1024, 512, VIA_RES_1024X512},
-       {1024, 576, VIA_RES_1024X576},
-       {1024, 600, VIA_RES_1024X600},
-       {1280, 720, VIA_RES_1280X720},
-       {1920, 1080, VIA_RES_1920X1080},
-       {1366, 768, VIA_RES_1368X768},
-       {1680, 1050, VIA_RES_1680X1050},
-       {960, 600, VIA_RES_960X600},
-       {1000, 600, VIA_RES_1000X600},
-       {1024, 576, VIA_RES_1024X576},
-       {1024, 600, VIA_RES_1024X600},
-       {1088, 612, VIA_RES_1088X612},
-       {1152, 720, VIA_RES_1152X720},
-       {1200, 720, VIA_RES_1200X720},
-       {1280, 600, VIA_RES_1280X600},
-       {1360, 768, VIA_RES_1360X768},
-       {1440, 900, VIA_RES_1440X900},
-       {1600, 900, VIA_RES_1600X900},
-       {1600, 1024, VIA_RES_1600X1024},
-       {1792, 1344, VIA_RES_1792X1344},
-       {1856, 1392, VIA_RES_1856X1392},
-       {1920, 1200, VIA_RES_1920X1200},
-       {2048, 1536, VIA_RES_2048X1536},
-       {0, 0, VIA_RES_INVALID}
-};
 
 static struct fb_ops viafb_ops;
 
-static int viafb_update_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)
-{
-       struct viafb_par *ppar;
-       ppar = info->par;
-
-       DEBUG_MSG(KERN_INFO "viafb_update_fix!\n");
 
-       fix->visual =
-           ppar->bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
-       fix->line_length = ppar->linelength;
+static void viafb_update_fix(struct fb_info *info)
+{
+       u32 bpp = info->var.bits_per_pixel;
 
-       return 0;
+       info->fix.visual =
+               bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+       info->fix.line_length =
+               ((info->var.xres_virtual + 7) & ~7) * bpp / 8;
 }
 
-
 static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
        struct viafb_par *viaparinfo)
 {
@@ -123,8 +72,6 @@ static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
 
        fix->smem_start = viaparinfo->fbmem;
        fix->smem_len = viaparinfo->fbmem_free;
-       fix->mmio_start = viaparinfo->mmio_base;
-       fix->mmio_len = viaparinfo->mmio_len;
 
        fix->type = FB_TYPE_PACKED_PIXELS;
        fix->type_aux = 0;
@@ -147,28 +94,12 @@ static int viafb_release(struct fb_info *info, int user)
        return 0;
 }
 
-static void viafb_update_viafb_par(struct fb_info *info)
-{
-       struct viafb_par *ppar;
-
-       ppar = info->par;
-       ppar->bpp = info->var.bits_per_pixel;
-       ppar->linelength = ((info->var.xres_virtual + 7) & ~7) * ppar->bpp / 8;
-       ppar->hres = info->var.xres;
-       ppar->vres = info->var.yres;
-       ppar->xoffset = info->var.xoffset;
-       ppar->yoffset = info->var.yoffset;
-}
-
 static int viafb_check_var(struct fb_var_screeninfo *var,
        struct fb_info *info)
 {
        int vmode_index, htotal, vtotal;
-       struct viafb_par *ppar;
+       struct viafb_par *ppar = info->par;
        u32 long_refresh;
-       struct viafb_par *p_viafb_par;
-       ppar = info->par;
-
 
        DEBUG_MSG(KERN_INFO "viafb_check_var!\n");
        /* Sanity check */
@@ -212,23 +143,21 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
 
        /* Adjust var according to our driver's own table */
        viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);
-
-       /* This is indeed a patch for VT3353 */
-       if (!info->par)
-               return -1;
-       p_viafb_par = (struct viafb_par *)info->par;
-       if (p_viafb_par->chip_info->gfx_chip_name == UNICHROME_VX800)
-               var->accel_flags = 0;
+       if (info->var.accel_flags & FB_ACCELF_TEXT &&
+               !ppar->shared->engine_mmio)
+               info->var.accel_flags = 0;
 
        return 0;
 }
 
 static int viafb_set_par(struct fb_info *info)
 {
+       struct viafb_par *viapar = info->par;
        int vmode_index;
        int vmode_index1 = 0;
        DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
 
+       viapar->depth = fb_get_color_depth(&info->var, &info->fix);
        viafb_update_device_setting(info->var.xres, info->var.yres,
                              info->var.bits_per_pixel, viafb_refresh, 0);
 
@@ -252,21 +181,12 @@ static int viafb_set_par(struct fb_info *info)
                        info->var.bits_per_pixel, vmode_index1,
                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
 
-               /*We should set memory offset according virtual_x */
-               /*Fix me:put this function into viafb_setmode */
-               viafb_memory_pitch_patch(info);
-
-               /* Update ***fb_par information */
-               viafb_update_viafb_par(info);
-
-               /* Update other fixed information */
-               viafb_update_fix(&info->fix, info);
+               viafb_update_fix(info);
                viafb_bpp = info->var.bits_per_pixel;
-               /* Update viafb_accel, it is necessary to our 2D accelerate */
-               viafb_accel = info->var.accel_flags;
-
-               if (viafb_accel)
-                       viafb_set_2d_color_depth(info->var.bits_per_pixel);
+               if (info->var.accel_flags & FB_ACCELF_TEXT)
+                       info->flags &= ~FBINFO_HWACCEL_DISABLED;
+               else
+                       info->flags |= FBINFO_HWACCEL_DISABLED;
        }
 
        return 0;
@@ -503,12 +423,7 @@ static int viafb_pan_display(struct fb_var_screeninfo *var,
            var->bits_per_pixel / 16;
 
        DEBUG_MSG(KERN_INFO "\nviafb_pan_display,offset =%d ", offset);
-
-       viafb_write_reg_mask(0x48, 0x3d4, ((offset >> 24) & 0x3), 0x3);
-       viafb_write_reg_mask(0x34, 0x3d4, ((offset >> 16) & 0xff), 0xff);
-       viafb_write_reg_mask(0x0c, 0x3d4, ((offset >> 8) & 0xff), 0xff);
-       viafb_write_reg_mask(0x0d, 0x3d4, (offset & 0xff), 0xff);
-
+       viafb_set_primary_address(offset);
        return 0;
 }
 
@@ -560,7 +475,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
 
        u32 __user *argp = (u32 __user *) arg;
        u32 gpu32;
-       u32 video_dev_info = 0;
 
        DEBUG_MSG(KERN_INFO "viafb_ioctl: 0x%X !!\n", cmd);
        memset(&u, 0, sizeof(u));
@@ -792,15 +706,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                if (put_user(state_info, argp))
                        return -EFAULT;
                break;
-       case VIAFB_SET_VIDEO_DEVICE:
-               get_user(video_dev_info, argp);
-               viafb_set_video_device(video_dev_info);
-               break;
-       case VIAFB_GET_VIDEO_DEVICE:
-               viafb_get_video_device(&video_dev_info);
-               if (put_user(video_dev_info, argp))
-                       return -EFAULT;
-               break;
        case VIAFB_SYNC_SURFACE:
                DEBUG_MSG(KERN_INFO "lobo VIAFB_SYNC_SURFACE\n");
                break;
@@ -866,10 +771,12 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
 static void viafb_fillrect(struct fb_info *info,
        const struct fb_fillrect *rect)
 {
-       u32 col = 0, rop = 0;
-       int pitch;
+       struct viafb_par *viapar = info->par;
+       struct viafb_shared *shared = viapar->shared;
+       u32 fg_color;
+       u8 rop;
 
-       if (!viafb_accel) {
+       if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt) {
                cfb_fillrect(info, rect);
                return;
        }
@@ -877,68 +784,31 @@ static void viafb_fillrect(struct fb_info *info,
        if (!rect->width || !rect->height)
                return;
 
-       switch (rect->rop) {
-       case ROP_XOR:
+       if (info->fix.visual == FB_VISUAL_TRUECOLOR)
+               fg_color = ((u32 *)info->pseudo_palette)[rect->color];
+       else
+               fg_color = rect->color;
+
+       if (rect->rop == ROP_XOR)
                rop = 0x5A;
-               break;
-       case ROP_COPY:
-       default:
+       else
                rop = 0xF0;
-               break;
-       }
-
-       switch (info->var.bits_per_pixel) {
-       case 8:
-               col = rect->color;
-               break;
-       case 16:
-               col = ((u32 *) (info->pseudo_palette))[rect->color];
-               break;
-       case 32:
-               col = ((u32 *) (info->pseudo_palette))[rect->color];
-               break;
-       }
-
-       /* BitBlt Source Address */
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
-       /* Source Base Address */
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
-       /* Destination Base Address */
-       writel(((unsigned long) (info->screen_base) -
-                  (unsigned long) viafb_FB_MM) >> 3,
-                  viaparinfo->io_virt + VIA_REG_DSTBASE);
-       /* Pitch */
-       pitch = (info->var.xres_virtual + 7) & ~7;
-       writel(VIA_PITCH_ENABLE |
-                  (((pitch *
-                     info->var.bits_per_pixel >> 3) >> 3) |
-                     (((pitch * info->
-                     var.bits_per_pixel >> 3) >> 3) << 16)),
-                     viaparinfo->io_virt + VIA_REG_PITCH);
-       /* BitBlt Destination Address */
-       writel(((rect->dy << 16) | rect->dx),
-               viaparinfo->io_virt + VIA_REG_DSTPOS);
-       /* Dimension: width & height */
-       writel((((rect->height - 1) << 16) | (rect->width - 1)),
-               viaparinfo->io_virt + VIA_REG_DIMENSION);
-       /* Forground color or Destination color */
-       writel(col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
-       /* GE Command */
-       writel((0x01 | 0x2000 | (rop << 24)),
-               viaparinfo->io_virt + VIA_REG_GECMD);
 
+       DEBUG_MSG(KERN_DEBUG "viafb 2D engine: fillrect\n");
+       if (shared->hw_bitblt(shared->engine_mmio, VIA_BITBLT_FILL,
+               rect->width, rect->height, info->var.bits_per_pixel,
+               viapar->vram_addr, info->fix.line_length, rect->dx, rect->dy,
+               NULL, 0, 0, 0, 0, fg_color, 0, rop))
+               cfb_fillrect(info, rect);
 }
 
 static void viafb_copyarea(struct fb_info *info,
        const struct fb_copyarea *area)
 {
-       u32 dy = area->dy, sy = area->sy, direction = 0x0;
-       u32 sx = area->sx, dx = area->dx, width = area->width;
-       int pitch;
-
-       DEBUG_MSG(KERN_INFO "viafb_copyarea!!\n");
+       struct viafb_par *viapar = info->par;
+       struct viafb_shared *shared = viapar->shared;
 
-       if (!viafb_accel) {
+       if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt) {
                cfb_copyarea(info, area);
                return;
        }
@@ -946,263 +816,148 @@ static void viafb_copyarea(struct fb_info *info,
        if (!area->width || !area->height)
                return;
 
-       if (sy < dy) {
-               dy += area->height - 1;
-               sy += area->height - 1;
-               direction |= 0x4000;
-       }
-
-       if (sx < dx) {
-               dx += width - 1;
-               sx += width - 1;
-               direction |= 0x8000;
-       }
-
-       /* Source Base Address */
-       writel(((unsigned long) (info->screen_base) -
-                  (unsigned long) viafb_FB_MM) >> 3,
-                  viaparinfo->io_virt + VIA_REG_SRCBASE);
-       /* Destination Base Address */
-       writel(((unsigned long) (info->screen_base) -
-                  (unsigned long) viafb_FB_MM) >> 3,
-                  viaparinfo->io_virt + VIA_REG_DSTBASE);
-       /* Pitch */
-       pitch = (info->var.xres_virtual + 7) & ~7;
-       /* VIA_PITCH_ENABLE can be omitted now. */
-       writel(VIA_PITCH_ENABLE |
-                  (((pitch *
-                     info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
-                                                               info->var.
-                                                               bits_per_pixel
-                                                               >> 3) >> 3)
-                                                             << 16)),
-                               viaparinfo->io_virt + VIA_REG_PITCH);
-       /* BitBlt Source Address */
-       writel(((sy << 16) | sx), viaparinfo->io_virt + VIA_REG_SRCPOS);
-       /* BitBlt Destination Address */
-       writel(((dy << 16) | dx), viaparinfo->io_virt + VIA_REG_DSTPOS);
-       /* Dimension: width & height */
-       writel((((area->height - 1) << 16) | (area->width - 1)),
-                  viaparinfo->io_virt + VIA_REG_DIMENSION);
-       /* GE Command */
-       writel((0x01 | direction | (0xCC << 24)),
-               viaparinfo->io_virt + VIA_REG_GECMD);
-
+       DEBUG_MSG(KERN_DEBUG "viafb 2D engine: copyarea\n");
+       if (shared->hw_bitblt(shared->engine_mmio, VIA_BITBLT_COLOR,
+               area->width, area->height, info->var.bits_per_pixel,
+               viapar->vram_addr, info->fix.line_length, area->dx, area->dy,
+               NULL, viapar->vram_addr, info->fix.line_length,
+               area->sx, area->sy, 0, 0, 0))
+               cfb_copyarea(info, area);
 }
 
 static void viafb_imageblit(struct fb_info *info,
        const struct fb_image *image)
 {
-       u32 size, bg_col = 0, fg_col = 0, *udata;
-       int i;
-       int pitch;
+       struct viafb_par *viapar = info->par;
+       struct viafb_shared *shared = viapar->shared;
+       u32 fg_color = 0, bg_color = 0;
+       u8 op;
 
-       if (!viafb_accel) {
+       if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt ||
+               (image->depth != 1 && image->depth != viapar->depth)) {
                cfb_imageblit(info, image);
                return;
        }
 
-       udata = (u32 *) image->data;
-
-       switch (info->var.bits_per_pixel) {
-       case 8:
-               bg_col = image->bg_color;
-               fg_col = image->fg_color;
-               break;
-       case 16:
-               bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
-               fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
-               break;
-       case 32:
-               bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
-               fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
-               break;
-       }
-       size = image->width * image->height;
-
-       /* Source Base Address */
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
-       /* Destination Base Address */
-       writel(((unsigned long) (info->screen_base) -
-                  (unsigned long) viafb_FB_MM) >> 3,
-                  viaparinfo->io_virt + VIA_REG_DSTBASE);
-       /* Pitch */
-       pitch = (info->var.xres_virtual + 7) & ~7;
-       writel(VIA_PITCH_ENABLE |
-                  (((pitch *
-                     info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
-                                                               info->var.
-                                                               bits_per_pixel
-                                                               >> 3) >> 3)
-                                                             << 16)),
-                               viaparinfo->io_virt + VIA_REG_PITCH);
-       /* BitBlt Source Address */
-       writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
-       /* BitBlt Destination Address */
-       writel(((image->dy << 16) | image->dx),
-               viaparinfo->io_virt + VIA_REG_DSTPOS);
-       /* Dimension: width & height */
-       writel((((image->height - 1) << 16) | (image->width - 1)),
-                  viaparinfo->io_virt + VIA_REG_DIMENSION);
-       /* fb color */
-       writel(fg_col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
-       /* bg color */
-       writel(bg_col, viaparinfo->io_virt + VIA_REG_BGCOLOR);
-       /* GE Command */
-       writel(0xCC020142, viaparinfo->io_virt + VIA_REG_GECMD);
-
-       for (i = 0; i < size / 4; i++) {
-               writel(*udata, viaparinfo->io_virt + VIA_MMIO_BLTBASE);
-               udata++;
-       }
+       if (image->depth == 1) {
+               op = VIA_BITBLT_MONO;
+               if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+                       fg_color =
+                               ((u32 *)info->pseudo_palette)[image->fg_color];
+                       bg_color =
+                               ((u32 *)info->pseudo_palette)[image->bg_color];
+               } else {
+                       fg_color = image->fg_color;
+                       bg_color = image->bg_color;
+               }
+       } else
+               op = VIA_BITBLT_COLOR;
 
+       DEBUG_MSG(KERN_DEBUG "viafb 2D engine: imageblit\n");
+       if (shared->hw_bitblt(shared->engine_mmio, op,
+               image->width, image->height, info->var.bits_per_pixel,
+               viapar->vram_addr, info->fix.line_length, image->dx, image->dy,
+               (u32 *)image->data, 0, 0, 0, 0, fg_color, bg_color, 0))
+               cfb_imageblit(info, image);
 }
 
 static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
-       u32 temp, xx, yy, bg_col = 0, fg_col = 0;
-       int i, j = 0;
-       static int hw_cursor;
-       struct viafb_par *p_viafb_par;
-
-       if (viafb_accel)
-               hw_cursor = 1;
-
-       if (!viafb_accel) {
-               if (hw_cursor) {
-                       viafb_show_hw_cursor(info, HW_Cursor_OFF);
-                       hw_cursor = 0;
-               }
-               return -ENODEV;
-       }
+       struct viafb_par *viapar = info->par;
+       void __iomem *engine = viapar->shared->engine_mmio;
+       u32 temp, xx, yy, bg_color = 0, fg_color = 0,
+               chip_name = viapar->shared->chip_info.gfx_chip_name;
+       int i, j = 0, cur_size = 64;
 
-       if ((((struct viafb_par *)(info->par))->iga_path == IGA2)
-           && (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266))
+       if (info->flags & FBINFO_HWACCEL_DISABLED || info != viafbinfo)
                return -ENODEV;
 
-       /* When duoview and using lcd , use soft cursor */
-       if (viafb_LCD_ON || ((struct viafb_par *)(info->par))->duoview)
+       if (chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2)
                return -ENODEV;
 
        viafb_show_hw_cursor(info, HW_Cursor_OFF);
-       viacursor = *cursor;
 
        if (cursor->set & FB_CUR_SETHOT) {
-               viacursor.hot = cursor->hot;
-               temp = ((viacursor.hot.x) << 16) + viacursor.hot.y;
-               writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
+               temp = (cursor->hot.x << 16) + cursor->hot.y;
+               writel(temp, engine + VIA_REG_CURSOR_ORG);
        }
 
        if (cursor->set & FB_CUR_SETPOS) {
-               viacursor.image.dx = cursor->image.dx;
-               viacursor.image.dy = cursor->image.dy;
                yy = cursor->image.dy - info->var.yoffset;
                xx = cursor->image.dx - info->var.xoffset;
                temp = yy & 0xFFFF;
                temp |= (xx << 16);
-               writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
+               writel(temp, engine + VIA_REG_CURSOR_POS);
        }
 
-       if (cursor->set & FB_CUR_SETSIZE) {
-               temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+       if (cursor->image.width <= 32 && cursor->image.height <= 32)
+               cur_size = 32;
+       else if (cursor->image.width <= 64 && cursor->image.height <= 64)
+               cur_size = 64;
+       else {
+               printk(KERN_WARNING "viafb_cursor: The cursor is too large "
+                       "%dx%d", cursor->image.width, cursor->image.height);
+               return -ENXIO;
+       }
 
-               if ((cursor->image.width <= 32)
-                   && (cursor->image.height <= 32)) {
-                       MAX_CURS = 32;
+       if (cursor->set & FB_CUR_SETSIZE) {
+               temp = readl(engine + VIA_REG_CURSOR_MODE);
+               if (cur_size == 32)
                        temp |= 0x2;
-               } else if ((cursor->image.width <= 64)
-                          && (cursor->image.height <= 64)) {
-                       MAX_CURS = 64;
-                       temp &= 0xFFFFFFFD;
-               } else {
-                       DEBUG_MSG(KERN_INFO
-                       "The cursor image is biger than 64x64 bits...\n");
-                       return -ENXIO;
-               }
-               writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+               else
+                       temp &= ~0x2;
 
-               viacursor.image.height = cursor->image.height;
-               viacursor.image.width = cursor->image.width;
+               writel(temp, engine + VIA_REG_CURSOR_MODE);
        }
 
        if (cursor->set & FB_CUR_SETCMAP) {
-               viacursor.image.fg_color = cursor->image.fg_color;
-               viacursor.image.bg_color = cursor->image.bg_color;
-
-               switch (info->var.bits_per_pixel) {
-               case 8:
-               case 16:
-               case 32:
-                       bg_col =
-                           (0xFF << 24) |
-                           (((info->cmap.red)[viacursor.image.bg_color] &
-                           0xFF00) << 8) |
-                           ((info->cmap.green)[viacursor.image.bg_color] &
-                           0xFF00) |
-                           (((info->cmap.blue)[viacursor.image.bg_color] &
-                           0xFF00) >> 8);
-                       fg_col =
-                           (0xFF << 24) |
-                           (((info->cmap.red)[viacursor.image.fg_color] &
-                           0xFF00) << 8) |
-                           ((info->cmap.green)[viacursor.image.fg_color] &
-                           0xFF00) |
-                           (((info->cmap.blue)[viacursor.image.fg_color] &
-                           0xFF00) >> 8);
-                       break;
-               default:
-                       return 0;
-               }
-
-               /* This is indeed a patch for VT3324/VT3353 */
-               if (!info->par)
-                       return 0;
-               p_viafb_par = (struct viafb_par *)info->par;
-
-               if ((p_viafb_par->chip_info->gfx_chip_name ==
-                       UNICHROME_CX700) ||
-                       ((p_viafb_par->chip_info->gfx_chip_name ==
-                       UNICHROME_VX800))) {
-                       bg_col =
-                           (((info->cmap.red)[viacursor.image.bg_color] &
-                           0xFFC0) << 14) |
-                           (((info->cmap.green)[viacursor.image.bg_color] &
-                           0xFFC0) << 4) |
-                           (((info->cmap.blue)[viacursor.image.bg_color] &
-                           0xFFC0) >> 6);
-                       fg_col =
-                           (((info->cmap.red)[viacursor.image.fg_color] &
-                           0xFFC0) << 14) |
-                           (((info->cmap.green)[viacursor.image.fg_color] &
-                           0xFFC0) << 4) |
-                           (((info->cmap.blue)[viacursor.image.fg_color] &
-                           0xFFC0) >> 6);
+               fg_color = cursor->image.fg_color;
+               bg_color = cursor->image.bg_color;
+               if (chip_name == UNICHROME_CX700 ||
+                       chip_name == UNICHROME_VX800 ||
+                       chip_name == UNICHROME_VX855) {
+                       fg_color =
+                               ((info->cmap.red[fg_color] & 0xFFC0) << 14) |
+                               ((info->cmap.green[fg_color] & 0xFFC0) << 4) |
+                               ((info->cmap.blue[fg_color] & 0xFFC0) >> 6);
+                       bg_color =
+                               ((info->cmap.red[bg_color] & 0xFFC0) << 14) |
+                               ((info->cmap.green[bg_color] & 0xFFC0) << 4) |
+                               ((info->cmap.blue[bg_color] & 0xFFC0) >> 6);
+               } else {
+                       fg_color =
+                               ((info->cmap.red[fg_color] & 0xFF00) << 8) |
+                               (info->cmap.green[fg_color] & 0xFF00) |
+                               ((info->cmap.blue[fg_color] & 0xFF00) >> 8);
+                       bg_color =
+                               ((info->cmap.red[bg_color] & 0xFF00) << 8) |
+                               (info->cmap.green[bg_color] & 0xFF00) |
+                               ((info->cmap.blue[bg_color] & 0xFF00) >> 8);
                }
 
-               writel(bg_col, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
-               writel(fg_col, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+               writel(bg_color, engine + VIA_REG_CURSOR_BG);
+               writel(fg_color, engine + VIA_REG_CURSOR_FG);
        }
 
        if (cursor->set & FB_CUR_SETSHAPE) {
                struct {
-                       u8 data[CURSOR_SIZE / 8];
-                       u32 bak[CURSOR_SIZE / 32];
+                       u8 data[CURSOR_SIZE];
+                       u32 bak[CURSOR_SIZE / 4];
                } *cr_data = kzalloc(sizeof(*cr_data), GFP_ATOMIC);
-               int size =
-                   ((viacursor.image.width + 7) >> 3) *
-                   viacursor.image.height;
+               int size = ((cursor->image.width + 7) >> 3) *
+                       cursor->image.height;
 
-               if (cr_data == NULL)
-                       goto out;
+               if (!cr_data)
+                       return -ENOMEM;
 
-               if (MAX_CURS == 32) {
-                       for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+               if (cur_size == 32) {
+                       for (i = 0; i < (CURSOR_SIZE / 4); i++) {
                                cr_data->bak[i] = 0x0;
                                cr_data->bak[i + 1] = 0xFFFFFFFF;
                                i += 1;
                        }
-               } else if (MAX_CURS == 64) {
-                       for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+               } else {
+                       for (i = 0; i < (CURSOR_SIZE / 4); i++) {
                                cr_data->bak[i] = 0x0;
                                cr_data->bak[i + 1] = 0x0;
                                cr_data->bak[i + 2] = 0xFFFFFFFF;
@@ -1211,27 +966,27 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                        }
                }
 
-               switch (viacursor.rop) {
+               switch (cursor->rop) {
                case ROP_XOR:
                        for (i = 0; i < size; i++)
-                               cr_data->data[i] = viacursor.mask[i];
+                               cr_data->data[i] = cursor->mask[i];
                        break;
                case ROP_COPY:
 
                        for (i = 0; i < size; i++)
-                               cr_data->data[i] = viacursor.mask[i];
+                               cr_data->data[i] = cursor->mask[i];
                        break;
                default:
                        break;
                }
 
-               if (MAX_CURS == 32) {
+               if (cur_size == 32) {
                        for (i = 0; i < size; i++) {
                                cr_data->bak[j] = (u32) cr_data->data[i];
                                cr_data->bak[j + 1] = ~cr_data->bak[j];
                                j += 2;
                        }
-               } else if (MAX_CURS == 64) {
+               } else {
                        for (i = 0; i < size; i++) {
                                cr_data->bak[j] = (u32) cr_data->data[i];
                                cr_data->bak[j + 1] = 0x0;
@@ -1241,14 +996,12 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                        }
                }
 
-               memcpy(((struct viafb_par *)(info->par))->fbmem_virt +
-                      ((struct viafb_par *)(info->par))->cursor_start,
-                      cr_data->bak, CURSOR_SIZE);
-out:
+               memcpy_toio(viafbinfo->screen_base + viapar->shared->
+                       cursor_vram_addr, cr_data->bak, CURSOR_SIZE);
                kfree(cr_data);
        }
 
-       if (viacursor.enable)
+       if (cursor->enable)
                viafb_show_hw_cursor(info, HW_Cursor_ON);
 
        return 0;
@@ -1256,8 +1009,8 @@ out:
 
 static int viafb_sync(struct fb_info *info)
 {
-       if (viafb_accel)
-               viafb_wait_engine_idle();
+       if (!(info->flags & FBINFO_HWACCEL_DISABLED))
+               viafb_wait_engine_idle(info);
        return 0;
 }
 
@@ -1266,12 +1019,16 @@ int viafb_get_mode_index(int hres, int vres)
        u32 i;
        DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");
 
-       for (i = 0; viafb_modentry[i].mode_index != VIA_RES_INVALID; i++)
-               if (viafb_modentry[i].xres == hres &&
-                       viafb_modentry[i].yres == vres)
+       for (i = 0; i < NUM_TOTAL_MODETABLE; i++)
+               if (CLE266Modes[i].mode_array &&
+                       CLE266Modes[i].crtc[0].crtc.hor_addr == hres &&
+                       CLE266Modes[i].crtc[0].crtc.ver_addr == vres)
                        break;
 
-       return viafb_modentry[i].mode_index;
+       if (i == NUM_TOTAL_MODETABLE)
+               return VIA_RES_INVALID;
+
+       return CLE266Modes[i].ModeIndex;
 }
 
 static void check_available_device_to_enable(int device_id)
@@ -1375,36 +1132,11 @@ static void viafb_set_device(struct device_t active_dev)
                viafb_SAMM_ON = active_dev.samm;
        viafb_primary_dev = active_dev.primary_dev;
 
-       viafb_set_start_addr();
+       viafb_set_primary_address(0);
+       viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
        viafb_set_iga_path();
 }
 
-static void viafb_set_video_device(u32 video_dev_info)
-{
-       viaparinfo->video_on_crt = STATE_OFF;
-       viaparinfo->video_on_dvi = STATE_OFF;
-       viaparinfo->video_on_lcd = STATE_OFF;
-
-       /* Check available device to enable: */
-       if ((video_dev_info & CRT_Device) == CRT_Device)
-               viaparinfo->video_on_crt = STATE_ON;
-       else if ((video_dev_info & DVI_Device) == DVI_Device)
-               viaparinfo->video_on_dvi = STATE_ON;
-       else if ((video_dev_info & LCD_Device) == LCD_Device)
-               viaparinfo->video_on_lcd = STATE_ON;
-}
-
-static void viafb_get_video_device(u32 *video_dev_info)
-{
-       *video_dev_info = None_Device;
-       if (viaparinfo->video_on_crt == STATE_ON)
-               *video_dev_info |= CRT_Device;
-       else if (viaparinfo->video_on_dvi == STATE_ON)
-               *video_dev_info |= DVI_Device;
-       else if (viaparinfo->video_on_lcd == STATE_ON)
-               *video_dev_info |= LCD_Device;
-}
-
 static int get_primary_device(void)
 {
        int primary_device = 0;
@@ -1446,18 +1178,6 @@ static int get_primary_device(void)
        return primary_device;
 }
 
-static u8 is_duoview(void)
-{
-       if (0 == viafb_SAMM_ON) {
-               if (viafb_LCD_ON + viafb_LCD2_ON +
-                       viafb_DVI_ON + viafb_CRT_ON == 2)
-                       return true;
-               return false;
-       } else {
-               return false;
-       }
-}
-
 static void apply_second_mode_setting(struct fb_var_screeninfo
        *sec_var)
 {
@@ -1559,14 +1279,13 @@ static int apply_device_setting(struct viafb_ioctl_setting setting_info,
                        if (viafb_SAMM_ON)
                                viafb_primary_dev = setting_info.primary_device;
 
-                       viafb_set_start_addr();
+                       viafb_set_primary_address(0);
+                       viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
                        viafb_set_iga_path();
                }
                need_set_mode = 1;
        }
 
-       viaparinfo->duoview = is_duoview();
-
        if (!need_set_mode) {
                ;
        } else {
@@ -1589,18 +1308,6 @@ static void retrieve_device_setting(struct viafb_ioctl_setting
                setting_info->device_status |= LCD_Device;
        if (viafb_LCD2_ON == 1)
                setting_info->device_status |= LCD2_Device;
-       if ((viaparinfo->video_on_crt == 1) && (viafb_CRT_ON == 1)) {
-               setting_info->video_device_status =
-                       viaparinfo->crt_setting_info->iga_path;
-       } else if ((viaparinfo->video_on_dvi == 1) && (viafb_DVI_ON == 1)) {
-               setting_info->video_device_status =
-                       viaparinfo->tmds_setting_info->iga_path;
-       } else if ((viaparinfo->video_on_lcd == 1) && (viafb_LCD_ON == 1)) {
-               setting_info->video_device_status =
-                       viaparinfo->lvds_setting_info->iga_path;
-       } else {
-               setting_info->video_device_status = 0;
-       }
 
        setting_info->samm_status = viafb_SAMM_ON;
        setting_info->primary_device = get_primary_device();
@@ -1687,25 +1394,6 @@ static void parse_active_dev(void)
                viafb_CRT_ON = STATE_ON;
                viafb_SAMM_ON = STATE_OFF;
        }
-       viaparinfo->duoview = is_duoview();
-}
-
-static void parse_video_dev(void)
-{
-       viaparinfo->video_on_crt = STATE_OFF;
-       viaparinfo->video_on_dvi = STATE_OFF;
-       viaparinfo->video_on_lcd = STATE_OFF;
-
-       if (!strncmp(viafb_video_dev, "CRT", 3)) {
-               /* Video on CRT */
-               viaparinfo->video_on_crt = STATE_ON;
-       } else if (!strncmp(viafb_video_dev, "DVI", 3)) {
-               /* Video on DVI */
-               viaparinfo->video_on_dvi = STATE_ON;
-       } else if (!strncmp(viafb_video_dev, "LCD", 3)) {
-               /* Video on LCD */
-               viaparinfo->video_on_lcd = STATE_ON;
-       }
 }
 
 static int parse_port(char *opt_str, int *output_interface)
@@ -1754,10 +1442,8 @@ static void parse_dvi_port(void)
  * DVP1Driving, DFPHigh, DFPLow CR96,   SR2A[5], SR1B[1], SR2A[4], SR1E[2],
  * CR9B,    SR65,    CR97,    CR99
  */
-static int viafb_dvp0_proc_read(char *buf, char **start, off_t offset,
-int count, int *eof, void *data)
+static int viafb_dvp0_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
        u8 dvp0_data_dri = 0, dvp0_clk_dri = 0, dvp0 = 0;
        dvp0_data_dri =
            (viafb_read_reg(VIASR, SR2A) & BIT5) >> 4 |
@@ -1766,13 +1452,17 @@ int count, int *eof, void *data)
            (viafb_read_reg(VIASR, SR2A) & BIT4) >> 3 |
            (viafb_read_reg(VIASR, SR1E) & BIT2) >> 2;
        dvp0 = viafb_read_reg(VIACR, CR96) & 0x0f;
-       len +=
-           sprintf(buf + len, "%x %x %x\n", dvp0, dvp0_data_dri, dvp0_clk_dri);
-       *eof = 1;               /*Inform kernel end of data */
-       return len;
+       seq_printf(m, "%x %x %x\n", dvp0, dvp0_data_dri, dvp0_clk_dri);
+       return 0;
 }
-static int viafb_dvp0_proc_write(struct file *file,
-       const char __user *buffer, unsigned long count, void *data)
+
+static int viafb_dvp0_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, viafb_dvp0_proc_show, NULL);
+}
+
+static ssize_t viafb_dvp0_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
        char buf[20], *value, *pbuf;
        u8 reg_val = 0;
@@ -1816,21 +1506,33 @@ static int viafb_dvp0_proc_write(struct file *file,
        }
        return count;
 }
-static int viafb_dvp1_proc_read(char *buf, char **start, off_t offset,
-       int count, int *eof, void *data)
+
+static const struct file_operations viafb_dvp0_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = viafb_dvp0_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = viafb_dvp0_proc_write,
+};
+
+static int viafb_dvp1_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
        u8 dvp1 = 0, dvp1_data_dri = 0, dvp1_clk_dri = 0;
        dvp1 = viafb_read_reg(VIACR, CR9B) & 0x0f;
        dvp1_data_dri = (viafb_read_reg(VIASR, SR65) & 0x0c) >> 2;
        dvp1_clk_dri = viafb_read_reg(VIASR, SR65) & 0x03;
-       len +=
-           sprintf(buf + len, "%x %x %x\n", dvp1, dvp1_data_dri, dvp1_clk_dri);
-       *eof = 1;               /*Inform kernel end of data */
-       return len;
+       seq_printf(m, "%x %x %x\n", dvp1, dvp1_data_dri, dvp1_clk_dri);
+       return 0;
 }
-static int viafb_dvp1_proc_write(struct file *file,
-       const char __user *buffer, unsigned long count, void *data)
+
+static int viafb_dvp1_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, viafb_dvp1_proc_show, NULL);
+}
+
+static ssize_t viafb_dvp1_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
        char buf[20], *value, *pbuf;
        u8 reg_val = 0;
@@ -1869,18 +1571,30 @@ static int viafb_dvp1_proc_write(struct file *file,
        return count;
 }
 
-static int viafb_dfph_proc_read(char *buf, char **start, off_t offset,
-       int count, int *eof, void *data)
+static const struct file_operations viafb_dvp1_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = viafb_dvp1_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = viafb_dvp1_proc_write,
+};
+
+static int viafb_dfph_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
        u8 dfp_high = 0;
        dfp_high = viafb_read_reg(VIACR, CR97) & 0x0f;
-       len += sprintf(buf + len, "%x\n", dfp_high);
-       *eof = 1;               /*Inform kernel end of data */
-       return len;
+       seq_printf(m, "%x\n", dfp_high);
+       return 0;
 }
-static int viafb_dfph_proc_write(struct file *file,
-       const char __user *buffer, unsigned long count, void *data)
+
+static int viafb_dfph_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, viafb_dfph_proc_show, NULL);
+}
+
+static ssize_t viafb_dfph_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
        char buf[20];
        u8 reg_val = 0;
@@ -1895,18 +1609,31 @@ static int viafb_dfph_proc_write(struct file *file,
        viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
        return count;
 }
-static int viafb_dfpl_proc_read(char *buf, char **start, off_t offset,
-       int count, int *eof, void *data)
+
+static const struct file_operations viafb_dfph_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = viafb_dfph_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = viafb_dfph_proc_write,
+};
+
+static int viafb_dfpl_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
        u8 dfp_low = 0;
        dfp_low = viafb_read_reg(VIACR, CR99) & 0x0f;
-       len += sprintf(buf + len, "%x\n", dfp_low);
-       *eof = 1;               /*Inform kernel end of data */
-       return len;
+       seq_printf(m, "%x\n", dfp_low);
+       return 0;
 }
-static int viafb_dfpl_proc_write(struct file *file,
-       const char __user *buffer, unsigned long count, void *data)
+
+static int viafb_dfpl_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, viafb_dfpl_proc_show, NULL);
+}
+
+static ssize_t viafb_dfpl_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
        char buf[20];
        u8 reg_val = 0;
@@ -1921,10 +1648,18 @@ static int viafb_dfpl_proc_write(struct file *file,
        viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
        return count;
 }
-static int viafb_vt1636_proc_read(char *buf, char **start,
-       off_t offset, int count, int *eof, void *data)
+
+static const struct file_operations viafb_dfpl_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = viafb_dfpl_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = viafb_dfpl_proc_write,
+};
+
+static int viafb_vt1636_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
        u8 vt1636_08 = 0, vt1636_09 = 0;
        switch (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
        case VT1636_LVDS:
@@ -1934,7 +1669,7 @@ static int viafb_vt1636_proc_read(char *buf, char **start,
                vt1636_09 =
                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info,
                    &viaparinfo->chip_info->lvds_chip_info, 0x09) & 0x1f;
-               len += sprintf(buf + len, "%x %x\n", vt1636_08, vt1636_09);
+               seq_printf(m, "%x %x\n", vt1636_08, vt1636_09);
                break;
        default:
                break;
@@ -1947,16 +1682,21 @@ static int viafb_vt1636_proc_read(char *buf, char **start,
                vt1636_09 =
                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info2,
                        &viaparinfo->chip_info->lvds_chip_info2, 0x09) & 0x1f;
-               len += sprintf(buf + len, " %x %x\n", vt1636_08, vt1636_09);
+               seq_printf(m, " %x %x\n", vt1636_08, vt1636_09);
                break;
        default:
                break;
        }
-       *eof = 1;               /*Inform kernel end of data */
-       return len;
+       return 0;
 }
-static int viafb_vt1636_proc_write(struct file *file,
-       const char __user *buffer, unsigned long count, void *data)
+
+static int viafb_vt1636_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, viafb_vt1636_proc_show, NULL);
+}
+
+static ssize_t viafb_vt1636_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
        char buf[30], *value, *pbuf;
        struct IODATA reg_val;
@@ -2045,39 +1785,27 @@ static int viafb_vt1636_proc_write(struct file *file,
        return count;
 }
 
+static const struct file_operations viafb_vt1636_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = viafb_vt1636_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = viafb_vt1636_proc_write,
+};
+
 static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
 {
-       struct proc_dir_entry *entry;
        *viafb_entry = proc_mkdir("viafb", NULL);
        if (viafb_entry) {
-               entry = create_proc_entry("dvp0", 0, *viafb_entry);
-               if (entry) {
-                       entry->read_proc = viafb_dvp0_proc_read;
-                       entry->write_proc = viafb_dvp0_proc_write;
-               }
-               entry = create_proc_entry("dvp1", 0, *viafb_entry);
-               if (entry) {
-                       entry->read_proc = viafb_dvp1_proc_read;
-                       entry->write_proc = viafb_dvp1_proc_write;
-               }
-               entry = create_proc_entry("dfph", 0, *viafb_entry);
-               if (entry) {
-                       entry->read_proc = viafb_dfph_proc_read;
-                       entry->write_proc = viafb_dfph_proc_write;
-               }
-               entry = create_proc_entry("dfpl", 0, *viafb_entry);
-               if (entry) {
-                       entry->read_proc = viafb_dfpl_proc_read;
-                       entry->write_proc = viafb_dfpl_proc_write;
-               }
+               proc_create("dvp0", 0, *viafb_entry, &viafb_dvp0_proc_fops);
+               proc_create("dvp1", 0, *viafb_entry, &viafb_dvp1_proc_fops);
+               proc_create("dfph", 0, *viafb_entry, &viafb_dfph_proc_fops);
+               proc_create("dfpl", 0, *viafb_entry, &viafb_dfpl_proc_fops);
                if (VT1636_LVDS == viaparinfo->chip_info->lvds_chip_info.
                        lvds_chip_name || VT1636_LVDS ==
                    viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
-                       entry = create_proc_entry("vt1636", 0, *viafb_entry);
-                       if (entry) {
-                               entry->read_proc = viafb_vt1636_proc_read;
-                               entry->write_proc = viafb_vt1636_proc_write;
-                       }
+                       proc_create("vt1636", 0, *viafb_entry, &viafb_vt1636_proc_fops);
                }
 
        }
@@ -2094,51 +1822,61 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
        remove_proc_entry("viafb", NULL);
 }
 
-static int __devinit via_pci_probe(void)
+static void parse_mode(const char *str, u32 *xres, u32 *yres)
 {
-       unsigned long default_xres, default_yres;
-       char *tmpc, *tmpm;
-       char *tmpc_sec, *tmpm_sec;
+       char *ptr;
+
+       *xres = simple_strtoul(str, &ptr, 10);
+       if (ptr[0] != 'x')
+               goto out_default;
+
+       *yres = simple_strtoul(&ptr[1], &ptr, 10);
+       if (ptr[0])
+               goto out_default;
+
+       return;
+
+out_default:
+       printk(KERN_WARNING "viafb received invalid mode string: %s\n", str);
+       *xres = 640;
+       *yres = 480;
+}
+
+static int __devinit via_pci_probe(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
+{
+       u32 default_xres, default_yres;
        int vmode_index;
-       u32 tmds_length, lvds_length, crt_length, chip_length, viafb_par_length;
+       u32 viafb_par_length;
 
        DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");
 
        viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);
-       tmds_length = ALIGN(sizeof(struct tmds_setting_information),
-               BITS_PER_LONG/8);
-       lvds_length = ALIGN(sizeof(struct lvds_setting_information),
-               BITS_PER_LONG/8);
-       crt_length = ALIGN(sizeof(struct lvds_setting_information),
-               BITS_PER_LONG/8);
-       chip_length = ALIGN(sizeof(struct chip_information), BITS_PER_LONG/8);
 
        /* Allocate fb_info and ***_par here, also including some other needed
         * variables
        */
-       viafbinfo = framebuffer_alloc(viafb_par_length + 2 * lvds_length +
-       tmds_length + crt_length + chip_length, NULL);
+       viafbinfo = framebuffer_alloc(viafb_par_length +
+               ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8),
+               &pdev->dev);
        if (!viafbinfo) {
                printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
                return -ENODEV;
        }
 
        viaparinfo = (struct viafb_par *)viafbinfo->par;
-       viaparinfo->tmds_setting_info = (struct tmds_setting_information *)
-               ((unsigned long)viaparinfo + viafb_par_length);
-       viaparinfo->lvds_setting_info = (struct lvds_setting_information *)
-               ((unsigned long)viaparinfo->tmds_setting_info + tmds_length);
-       viaparinfo->lvds_setting_info2 = (struct lvds_setting_information *)
-               ((unsigned long)viaparinfo->lvds_setting_info + lvds_length);
-       viaparinfo->crt_setting_info = (struct crt_setting_information *)
-               ((unsigned long)viaparinfo->lvds_setting_info2 + lvds_length);
-       viaparinfo->chip_info = (struct chip_information *)
-               ((unsigned long)viaparinfo->crt_setting_info + crt_length);
+       viaparinfo->shared = viafbinfo->par + viafb_par_length;
+       viaparinfo->vram_addr = 0;
+       viaparinfo->tmds_setting_info = &viaparinfo->shared->tmds_setting_info;
+       viaparinfo->lvds_setting_info = &viaparinfo->shared->lvds_setting_info;
+       viaparinfo->lvds_setting_info2 =
+               &viaparinfo->shared->lvds_setting_info2;
+       viaparinfo->crt_setting_info = &viaparinfo->shared->crt_setting_info;
+       viaparinfo->chip_info = &viaparinfo->shared->chip_info;
 
        if (viafb_dual_fb)
                viafb_SAMM_ON = 1;
        parse_active_dev();
-       parse_video_dev();
        parse_lcd_port();
        parse_dvi_port();
 
@@ -2149,32 +1887,32 @@ static int __devinit via_pci_probe(void)
        /* Set up I2C bus stuff */
        viafb_create_i2c_bus(viaparinfo);
 
-       viafb_init_chip_info();
-       viafb_get_fb_info(&viaparinfo->fbmem, &viaparinfo->memsize);
+       viafb_init_chip_info(pdev, ent);
+       viaparinfo->fbmem = pci_resource_start(pdev, 0);
+       viaparinfo->memsize = viafb_get_fb_size_from_pci();
        viaparinfo->fbmem_free = viaparinfo->memsize;
        viaparinfo->fbmem_used = 0;
-       viaparinfo->fbmem_virt = ioremap_nocache(viaparinfo->fbmem,
+       viafbinfo->screen_base = ioremap_nocache(viaparinfo->fbmem,
                viaparinfo->memsize);
-       viafbinfo->screen_base = (char *)viaparinfo->fbmem_virt;
-
-       if (!viaparinfo->fbmem_virt) {
+       if (!viafbinfo->screen_base) {
                printk(KERN_INFO "ioremap failed\n");
-               return -1;
+               return -ENOMEM;
        }
 
-       viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len);
-       viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base,
-               viaparinfo->mmio_len);
-
+       viafbinfo->fix.mmio_start = pci_resource_start(pdev, 1);
+       viafbinfo->fix.mmio_len = pci_resource_len(pdev, 1);
        viafbinfo->node = 0;
        viafbinfo->fbops = &viafb_ops;
        viafbinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 
        viafbinfo->pseudo_palette = pseudo_pal;
-       if (viafb_accel) {
-               viafb_init_accel();
-               viafb_init_2d_engine();
-               viafb_hw_cursor_init();
+       if (viafb_accel && !viafb_init_engine(viafbinfo)) {
+               viafbinfo->flags |= FBINFO_HWACCEL_COPYAREA |
+                       FBINFO_HWACCEL_FILLRECT |  FBINFO_HWACCEL_IMAGEBLIT;
+               default_var.accel_flags = FB_ACCELF_TEXT;
+       } else {
+               viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
+               default_var.accel_flags = 0;
        }
 
        if (viafb_second_size && (viafb_second_size < 8)) {
@@ -2186,27 +1924,14 @@ static int __devinit via_pci_probe(void)
                        viafb_second_size * 1024 * 1024;
        }
 
-       viafb_FB_MM = viaparinfo->fbmem_virt;
-       tmpm = viafb_mode;
-       tmpc = strsep(&tmpm, "x");
-       strict_strtoul(tmpc, 0, &default_xres);
-       strict_strtoul(tmpm, 0, &default_yres);
-
+       parse_mode(viafb_mode, &default_xres, &default_yres);
        vmode_index = viafb_get_mode_index(default_xres, default_yres);
        DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index);
 
        if (viafb_SAMM_ON == 1) {
-               if (strcmp(viafb_mode, viafb_mode1)) {
-                       tmpm_sec = viafb_mode1;
-                       tmpc_sec = strsep(&tmpm_sec, "x");
-                       strict_strtoul(tmpc_sec, 0,
-                               (unsigned long *)&viafb_second_xres);
-                       strict_strtoul(tmpm_sec, 0,
-                               (unsigned long *)&viafb_second_yres);
-               } else {
-                       viafb_second_xres = default_xres;
-                       viafb_second_yres = default_yres;
-               }
+               parse_mode(viafb_mode1, &viafb_second_xres,
+                       &viafb_second_yres);
+
                if (0 == viafb_second_virtual_xres) {
                        switch (viafb_second_xres) {
                        case 1400:
@@ -2256,18 +1981,9 @@ static int __devinit via_pci_probe(void)
        default_var.lower_margin = 4;
        default_var.hsync_len = default_var.left_margin;
        default_var.vsync_len = 4;
-       default_var.accel_flags = 0;
-
-       if (viafb_accel) {
-               viafbinfo->flags |=
-                   (FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
-                    FBINFO_HWACCEL_IMAGEBLIT);
-               default_var.accel_flags |= FB_ACCELF_TEXT;
-       } else
-               viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
 
        if (viafb_dual_fb) {
-               viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
+               viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
                if (!viafbinfo1) {
                        printk(KERN_ERR
                        "allocate the second framebuffer struct error\n");
@@ -2276,11 +1992,10 @@ static int __devinit via_pci_probe(void)
                }
                viaparinfo1 = viafbinfo1->par;
                memcpy(viaparinfo1, viaparinfo, viafb_par_length);
+               viaparinfo1->vram_addr = viafb_second_offset;
                viaparinfo1->memsize = viaparinfo->memsize -
                        viafb_second_offset;
                viaparinfo->memsize = viafb_second_offset;
-               viaparinfo1->fbmem_virt = viaparinfo->fbmem_virt +
-                       viafb_second_offset;
                viaparinfo1->fbmem = viaparinfo->fbmem + viafb_second_offset;
 
                viaparinfo1->fbmem_used = viaparinfo->fbmem_used;
@@ -2288,20 +2003,13 @@ static int __devinit via_pci_probe(void)
                        viaparinfo1->fbmem_used;
                viaparinfo->fbmem_free = viaparinfo->memsize;
                viaparinfo->fbmem_used = 0;
-               if (viafb_accel) {
-                       viaparinfo1->cursor_start =
-                           viaparinfo->cursor_start - viafb_second_offset;
-                       viaparinfo1->VQ_start = viaparinfo->VQ_start -
-                               viafb_second_offset;
-                       viaparinfo1->VQ_end = viaparinfo->VQ_end -
-                               viafb_second_offset;
-               }
 
+               viaparinfo->iga_path = IGA1;
+               viaparinfo1->iga_path = IGA2;
                memcpy(viafbinfo1, viafbinfo, sizeof(struct fb_info));
+               viafbinfo1->par = viaparinfo1;
                viafbinfo1->screen_base = viafbinfo->screen_base +
                        viafb_second_offset;
-               viafbinfo1->fix.smem_start = viaparinfo1->fbmem;
-               viafbinfo1->fix.smem_len = viaparinfo1->fbmem_free;
 
                default_var.xres = viafb_second_xres;
                default_var.yres = viafb_second_yres;
@@ -2323,15 +2031,17 @@ static int __devinit via_pci_probe(void)
                viafb_setup_fixinfo(&viafbinfo1->fix, viaparinfo1);
                viafb_check_var(&default_var, viafbinfo1);
                viafbinfo1->var = default_var;
-               viafb_update_viafb_par(viafbinfo);
-               viafb_update_fix(&viafbinfo1->fix, viafbinfo1);
+               viafb_update_fix(viafbinfo1);
+               viaparinfo1->depth = fb_get_color_depth(&viafbinfo1->var,
+                       &viafbinfo1->fix);
        }
 
        viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
        viafb_check_var(&default_var, viafbinfo);
        viafbinfo->var = default_var;
-       viafb_update_viafb_par(viafbinfo);
-       viafb_update_fix(&viafbinfo->fix, viafbinfo);
+       viafb_update_fix(viafbinfo);
+       viaparinfo->depth = fb_get_color_depth(&viafbinfo->var,
+               &viafbinfo->fix);
        default_var.activate = FB_ACTIVATE_NOW;
        fb_alloc_cmap(&viafbinfo->cmap, 256, 0);
 
@@ -2353,20 +2063,20 @@ static int __devinit via_pci_probe(void)
                  viafbinfo->node, viafbinfo->fix.id, default_var.xres,
                  default_var.yres, default_var.bits_per_pixel);
 
-       viafb_init_proc(&viaparinfo->proc_entry);
+       viafb_init_proc(&viaparinfo->shared->proc_entry);
        viafb_init_dac(IGA2);
        return 0;
 }
 
-static void __devexit via_pci_remove(void)
+static void __devexit via_pci_remove(struct pci_dev *pdev)
 {
        DEBUG_MSG(KERN_INFO "via_pci_remove!\n");
        fb_dealloc_cmap(&viafbinfo->cmap);
        unregister_framebuffer(viafbinfo);
        if (viafb_dual_fb)
                unregister_framebuffer(viafbinfo1);
-       iounmap((void *)viaparinfo->fbmem_virt);
-       iounmap(viaparinfo->io_virt);
+       iounmap((void *)viafbinfo->screen_base);
+       iounmap(viaparinfo->shared->engine_mmio);
 
        viafb_delete_i2c_buss(viaparinfo);
 
@@ -2374,7 +2084,7 @@ static void __devexit via_pci_remove(void)
        if (viafb_dual_fb)
                framebuffer_release(viafbinfo1);
 
-       viafb_remove_proc(viaparinfo->proc_entry);
+       viafb_remove_proc(viaparinfo->shared->proc_entry);
 }
 
 #ifndef MODULE
@@ -2441,8 +2151,6 @@ static int __init viafb_setup(char *options)
                else if (!strncmp(this_opt, "viafb_lcd_mode=", 15))
                        strict_strtoul(this_opt + 15, 0,
                                (unsigned long *)&viafb_lcd_mode);
-               else if (!strncmp(this_opt, "viafb_video_dev=", 16))
-                       viafb_video_dev = kstrdup(this_opt + 16, GFP_KERNEL);
                else if (!strncmp(this_opt, "viafb_lcd_port=", 15))
                        viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL);
                else if (!strncmp(this_opt, "viafb_dvi_port=", 15))
@@ -2452,6 +2160,40 @@ static int __init viafb_setup(char *options)
 }
 #endif
 
+static struct pci_device_id viafb_pci_table[] __devinitdata = {
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID),
+         .driver_data = UNICHROME_CLE266 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
+         .driver_data = UNICHROME_PM800 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID),
+         .driver_data = UNICHROME_K400 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K800_DID),
+         .driver_data = UNICHROME_K800 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M890_DID),
+         .driver_data = UNICHROME_CN700 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K8M890_DID),
+         .driver_data = UNICHROME_K8M890 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CX700_DID),
+         .driver_data = UNICHROME_CX700 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M900_DID),
+         .driver_data = UNICHROME_P4M900 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN750_DID),
+         .driver_data = UNICHROME_CN750 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX800_DID),
+         .driver_data = UNICHROME_VX800 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),
+         .driver_data = UNICHROME_VX855 },
+       { }
+};
+MODULE_DEVICE_TABLE(pci, viafb_pci_table);
+
+static struct pci_driver viafb_driver = {
+       .name           = "viafb",
+       .id_table       = viafb_pci_table,
+       .probe          = via_pci_probe,
+       .remove         = __devexit_p(via_pci_remove),
+};
+
 static int __init viafb_init(void)
 {
 #ifndef MODULE
@@ -2463,13 +2205,13 @@ static int __init viafb_init(void)
        printk(KERN_INFO
        "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",
               VERSION_MAJOR, VERSION_MINOR);
-       return via_pci_probe();
+       return pci_register_driver(&viafb_driver);
 }
 
 static void __exit viafb_exit(void)
 {
        DEBUG_MSG(KERN_INFO "viafb_exit!\n");
-       via_pci_remove();
+       pci_unregister_driver(&viafb_driver);
 }
 
 static struct fb_ops viafb_ops = {
@@ -2494,82 +2236,79 @@ module_init(viafb_init);
 module_exit(viafb_exit);
 
 #ifdef MODULE
-module_param(viafb_memsize, int, 0);
+module_param(viafb_memsize, int, S_IRUSR);
 
-module_param(viafb_mode, charp, 0);
+module_param(viafb_mode, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_mode, "Set resolution (default=640x480)");
 
-module_param(viafb_mode1, charp, 0);
+module_param(viafb_mode1, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_mode1, "Set resolution (default=640x480)");
 
-module_param(viafb_bpp, int, 0);
+module_param(viafb_bpp, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_bpp, "Set color depth (default=32bpp)");
 
-module_param(viafb_bpp1, int, 0);
+module_param(viafb_bpp1, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_bpp1, "Set color depth (default=32bpp)");
 
-module_param(viafb_refresh, int, 0);
+module_param(viafb_refresh, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_refresh,
        "Set CRT viafb_refresh rate (default = 60)");
 
-module_param(viafb_refresh1, int, 0);
+module_param(viafb_refresh1, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_refresh1,
        "Set CRT refresh rate (default = 60)");
 
-module_param(viafb_lcd_panel_id, int, 0);
+module_param(viafb_lcd_panel_id, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_lcd_panel_id,
        "Set Flat Panel type(Default=1024x768)");
 
-module_param(viafb_lcd_dsp_method, int, 0);
+module_param(viafb_lcd_dsp_method, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_lcd_dsp_method,
        "Set Flat Panel display scaling method.(Default=Expandsion)");
 
-module_param(viafb_SAMM_ON, int, 0);
+module_param(viafb_SAMM_ON, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_SAMM_ON,
        "Turn on/off flag of SAMM(Default=OFF)");
 
-module_param(viafb_accel, int, 0);
+module_param(viafb_accel, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_accel,
-       "Set 2D Hardware Acceleration.(Default = OFF)");
+       "Set 2D Hardware Acceleration: 0 = OFF, 1 = ON (default)");
 
-module_param(viafb_active_dev, charp, 0);
+module_param(viafb_active_dev, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_active_dev, "Specify active devices.");
 
-module_param(viafb_display_hardware_layout, int, 0);
+module_param(viafb_display_hardware_layout, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_display_hardware_layout,
        "Display Hardware Layout (LCD Only, DVI Only...,etc)");
 
-module_param(viafb_second_size, int, 0);
+module_param(viafb_second_size, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_second_size,
        "Set secondary device memory size");
 
-module_param(viafb_dual_fb, int, 0);
+module_param(viafb_dual_fb, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_dual_fb,
        "Turn on/off flag of dual framebuffer devices.(Default = OFF)");
 
-module_param(viafb_platform_epia_dvi, int, 0);
+module_param(viafb_platform_epia_dvi, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_platform_epia_dvi,
        "Turn on/off flag of DVI devices on EPIA board.(Default = OFF)");
 
-module_param(viafb_device_lcd_dualedge, int, 0);
+module_param(viafb_device_lcd_dualedge, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_device_lcd_dualedge,
        "Turn on/off flag of dual edge panel.(Default = OFF)");
 
-module_param(viafb_bus_width, int, 0);
+module_param(viafb_bus_width, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_bus_width,
        "Set bus width of panel.(Default = 12)");
 
-module_param(viafb_lcd_mode, int, 0);
+module_param(viafb_lcd_mode, int, S_IRUSR);
 MODULE_PARM_DESC(viafb_lcd_mode,
        "Set Flat Panel mode(Default=OPENLDI)");
 
-module_param(viafb_video_dev, charp, 0);
-MODULE_PARM_DESC(viafb_video_dev, "Specify video devices.");
-
-module_param(viafb_lcd_port, charp, 0);
+module_param(viafb_lcd_port, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_lcd_port, "Specify LCD output port.");
 
-module_param(viafb_dvi_port, charp, 0);
+module_param(viafb_dvi_port, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_dvi_port, "Specify DVI output port.");
 
 MODULE_LICENSE("GPL");
index 227b000..0c94d24 100644 (file)
 #define VERSION_OS          0  /* 0: for 32 bits OS, 1: for 64 bits OS */
 #define VERSION_MINOR       4
 
+struct viafb_shared {
+       struct proc_dir_entry *proc_entry;      /*viafb proc entry */
+
+       /* I2C stuff */
+       struct via_i2c_stuff i2c_stuff;
+
+       /* All the information will be needed to set engine */
+       struct tmds_setting_information tmds_setting_info;
+       struct crt_setting_information crt_setting_info;
+       struct lvds_setting_information lvds_setting_info;
+       struct lvds_setting_information lvds_setting_info2;
+       struct chip_information chip_info;
+
+       /* hardware acceleration stuff */
+       void __iomem *engine_mmio;
+       u32 cursor_vram_addr;
+       u32 vq_vram_addr;       /* virtual queue address in video ram */
+       int (*hw_bitblt)(void __iomem *engine, u8 op, u32 width, u32 height,
+               u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y,
+               u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
+               u32 fg_color, u32 bg_color, u8 fill_rop);
+};
+
 struct viafb_par {
-       int bpp;
-       int hres;
-       int vres;
-       int linelength;
-       u32 xoffset;
-       u32 yoffset;
-
-       void __iomem *fbmem_virt;       /*framebuffer virtual memory address */
-       void __iomem *io_virt;  /*iospace virtual memory address */
+       u8 depth;
+       u32 vram_addr;
+
        unsigned int fbmem;     /*framebuffer physical memory address */
        unsigned int memsize;   /*size of fbmem */
-       unsigned int io;        /*io space address */
-       unsigned long mmio_base;        /*mmio base address */
-       unsigned long mmio_len; /*mmio base length */
        u32 fbmem_free;         /* Free FB memory */
        u32 fbmem_used;         /* Use FB memory size */
-       u32 cursor_start;       /* Cursor Start Address */
-       u32 VQ_start;           /* Virtual Queue Start Address */
-       u32 VQ_end;             /* Virtual Queue End Address */
        u32 iga_path;
-       struct proc_dir_entry *proc_entry;      /*viafb proc entry */
-       u8 duoview;             /*Is working in duoview mode? */
 
-       /* I2C stuff */
-       struct via_i2c_stuff i2c_stuff;
+       struct viafb_shared *shared;
 
        /* All the information will be needed to set engine */
+       /* depreciated, use the ones in shared directly */
        struct tmds_setting_information *tmds_setting_info;
        struct crt_setting_information *crt_setting_info;
        struct lvds_setting_information *lvds_setting_info;
        struct lvds_setting_information *lvds_setting_info2;
        struct chip_information *chip_info;
-
-       /* some information related to video playing */
-       int video_on_crt;
-       int video_on_dvi;
-       int video_on_lcd;
-
-};
-struct viafb_modeinfo {
-       u32 xres;
-       u32 yres;
-       int mode_index;
 };
+
 extern unsigned int viafb_second_virtual_yres;
 extern unsigned int viafb_second_virtual_xres;
 extern unsigned int viafb_second_offset;
@@ -91,14 +90,12 @@ extern int viafb_dual_fb;
 extern int viafb_LCD2_ON;
 extern int viafb_LCD_ON;
 extern int viafb_DVI_ON;
-extern int viafb_accel;
 extern int viafb_hotplug;
 extern int viafb_memsize;
 
 extern int strict_strtoul(const char *cp, unsigned int base,
        unsigned long *res);
 
-void viafb_memory_pitch_patch(struct fb_info *info);
 void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
                          int mode_index);
 int viafb_get_mode_index(int hres, int vres);
index 6dcf583..b74f8a6 100644 (file)
@@ -100,12 +100,8 @@ struct io_reg CN400_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
 {VIACR, CR0F, 0xFF, 0x00},     /* Cursor Localtion Low                */
 {VIACR, CR32, 0xFF, 0x00},
 {VIACR, CR33, 0xFF, 0x00},
-{VIACR, CR34, 0xFF, 0x00},
 {VIACR, CR35, 0xFF, 0x00},
 {VIACR, CR36, 0x08, 0x00},
-{VIACR, CR62, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR63, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR64, 0xFF, 0x00},     /* Secondary Display Starting Address  */
 {VIACR, CR69, 0xFF, 0x00},
 {VIACR, CR6A, 0xFF, 0x40},
 {VIACR, CR6B, 0xFF, 0x00},
@@ -159,16 +155,12 @@ struct io_reg CN700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
 {VIASR, CR30, 0xFF, 0x04},
 {VIACR, CR32, 0xFF, 0x00},
 {VIACR, CR33, 0x7F, 0x00},
-{VIACR, CR34, 0xFF, 0x00},
 {VIACR, CR35, 0xFF, 0x00},
 {VIACR, CR36, 0xFF, 0x31},
 {VIACR, CR41, 0xFF, 0x80},
 {VIACR, CR42, 0xFF, 0x00},
 {VIACR, CR55, 0x80, 0x00},
 {VIACR, CR5D, 0x80, 0x00},     /*Horizontal Retrace Start bit[11] should be 0*/
-{VIACR, CR62, 0xFF, 0x00},     /* Secondary Display Starting Address */
-{VIACR, CR63, 0xFF, 0x00},     /* Secondary Display Starting Address */
-{VIACR, CR64, 0xFF, 0x00},     /* Secondary Display Starting Address */
 {VIACR, CR68, 0xFF, 0x67},     /* Default FIFO For IGA2 */
 {VIACR, CR69, 0xFF, 0x00},
 {VIACR, CR6A, 0xFD, 0x40},
@@ -233,9 +225,6 @@ struct io_reg KM400_ModeXregs[] = {
        {VIACR, CR55, 0x80, 0x00},
        {VIACR, CR5D, 0x80, 0x00},
        {VIACR, CR36, 0xFF, 0x01},      /* Power Mangement 3                  */
-       {VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address */
-       {VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address */
-       {VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address */
        {VIACR, CR68, 0xFF, 0x67},      /* Default FIFO For IGA2              */
        {VIACR, CR6A, 0x20, 0x20},      /* Extended FIFO On                   */
        {VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1            */
@@ -285,14 +274,9 @@ struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
 {VIACR, CR0F, 0xFF, 0x00},     /* Cursor Localtion Low                */
 {VIACR, CR32, 0xFF, 0x00},
 {VIACR, CR33, 0xFF, 0x00},
-{VIACR, CR34, 0xFF, 0x00},
 {VIACR, CR35, 0xFF, 0x00},
 {VIACR, CR36, 0x08, 0x00},
 {VIACR, CR47, 0xC8, 0x00},     /* Clear VCK Plus. */
-{VIACR, CR62, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR63, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR64, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CRA3, 0xFF, 0x00},     /* Secondary Display Starting Address  */
 {VIACR, CR69, 0xFF, 0x00},
 {VIACR, CR6A, 0xFF, 0x40},
 {VIACR, CR6B, 0xFF, 0x00},
@@ -325,69 +309,61 @@ struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
 {VIACR, CR96, 0xFF, 0x00},
 {VIACR, CR97, 0xFF, 0x00},
 {VIACR, CR99, 0xFF, 0x00},
-{VIACR, CR9B, 0xFF, 0x00},
-{VIACR, CRD2, 0xFF, 0xFF}      /* TMDS/LVDS control register.         */
+{VIACR, CR9B, 0xFF, 0x00}
 };
 
-/* For VT3353: Common Setting for Video Mode */
-struct io_reg VX800_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+struct io_reg VX855_ModeXregs[] = {
+{VIASR, SR10, 0xFF, 0x01},
 {VIASR, SR15, 0x02, 0x02},
 {VIASR, SR16, 0xBF, 0x08},
 {VIASR, SR17, 0xFF, 0x1F},
 {VIASR, SR18, 0xFF, 0x4E},
 {VIASR, SR1A, 0xFB, 0x08},
 {VIASR, SR1B, 0xFF, 0xF0},
-{VIASR, SR1E, 0xFF, 0x01},
-{VIASR, SR2A, 0xFF, 0x00},
+{VIASR, SR1E, 0x07, 0x01},
+{VIASR, SR2A, 0xF0, 0x00},
+{VIASR, SR58, 0xFF, 0x00},
+{VIASR, SR59, 0xFF, 0x00},
 {VIASR, SR2D, 0xFF, 0xFF},     /* VCK and LCK PLL power on.           */
+{VIACR, CR09, 0xFF, 0x00},     /* Initial CR09=0*/
+{VIACR, CR11, 0x8F, 0x00},     /* IGA1 initial  Vertical end       */
+{VIACR, CR17, 0x7F, 0x00},     /* IGA1 CRT Mode control init   */
 {VIACR, CR0A, 0xFF, 0x1E},     /* Cursor Start                        */
 {VIACR, CR0B, 0xFF, 0x00},     /* Cursor End                          */
 {VIACR, CR0E, 0xFF, 0x00},     /* Cursor Location High                */
 {VIACR, CR0F, 0xFF, 0x00},     /* Cursor Localtion Low                */
 {VIACR, CR32, 0xFF, 0x00},
-{VIACR, CR33, 0xFF, 0x00},
-{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR33, 0x7F, 0x00},
 {VIACR, CR35, 0xFF, 0x00},
 {VIACR, CR36, 0x08, 0x00},
-{VIACR, CR47, 0xC8, 0x00},     /* Clear VCK Plus. */
-{VIACR, CR62, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR63, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CR64, 0xFF, 0x00},     /* Secondary Display Starting Address  */
-{VIACR, CRA3, 0xFF, 0x00},     /* Secondary Display Starting Address  */
 {VIACR, CR69, 0xFF, 0x00},
-{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6A, 0xFD, 0x60},
 {VIACR, CR6B, 0xFF, 0x00},
 {VIACR, CR6C, 0xFF, 0x00},
-{VIACR, CR7A, 0xFF, 0x01},     /* LCD Scaling Parameter 1             */
-{VIACR, CR7B, 0xFF, 0x02},     /* LCD Scaling Parameter 2             */
-{VIACR, CR7C, 0xFF, 0x03},     /* LCD Scaling Parameter 3             */
-{VIACR, CR7D, 0xFF, 0x04},     /* LCD Scaling Parameter 4             */
-{VIACR, CR7E, 0xFF, 0x07},     /* LCD Scaling Parameter 5             */
-{VIACR, CR7F, 0xFF, 0x0A},     /* LCD Scaling Parameter 6             */
-{VIACR, CR80, 0xFF, 0x0D},     /* LCD Scaling Parameter 7             */
-{VIACR, CR81, 0xFF, 0x13},     /* LCD Scaling Parameter 8             */
-{VIACR, CR82, 0xFF, 0x16},     /* LCD Scaling Parameter 9             */
-{VIACR, CR83, 0xFF, 0x19},     /* LCD Scaling Parameter 10            */
-{VIACR, CR84, 0xFF, 0x1C},     /* LCD Scaling Parameter 11            */
-{VIACR, CR85, 0xFF, 0x1D},     /* LCD Scaling Parameter 12            */
-{VIACR, CR86, 0xFF, 0x1E},     /* LCD Scaling Parameter 13            */
-{VIACR, CR87, 0xFF, 0x1F},     /* LCD Scaling Parameter 14            */
-{VIACR, CR88, 0xFF, 0x40},     /* LCD Panel Type                      */
-{VIACR, CR89, 0xFF, 0x00},     /* LCD Timing Control 0                */
-{VIACR, CR8A, 0xFF, 0x88},     /* LCD Timing Control 1                */
-{VIACR, CRD4, 0xFF, 0x81},     /* Second power sequence control       */
-{VIACR, CR8B, 0xFF, 0x5D},     /* LCD Power Sequence Control 0        */
-{VIACR, CR8C, 0xFF, 0x2B},     /* LCD Power Sequence Control 1        */
-{VIACR, CR8D, 0xFF, 0x6F},     /* LCD Power Sequence Control 2        */
-{VIACR, CR8E, 0xFF, 0x2B},     /* LCD Power Sequence Control 3        */
-{VIACR, CR8F, 0xFF, 0x01},     /* LCD Power Sequence Control 4        */
-{VIACR, CR90, 0xFF, 0x01},     /* LCD Power Sequence Control 5        */
-{VIACR, CR91, 0xFF, 0x80},     /* 24/12 bit LVDS Data off             */
+{VIACR, CR7A, 0xFF, 0x01},          /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},          /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},          /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},          /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},          /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},          /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},          /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},          /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},          /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},          /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},          /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},          /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},          /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},          /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},          /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},          /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},          /* LCD Timing Control 1                */
+{VIACR, CRD4, 0xFF, 0x81},          /* Second power sequence control       */
+{VIACR, CR91, 0xFF, 0x80},          /* 24/12 bit LVDS Data off             */
 {VIACR, CR96, 0xFF, 0x00},
 {VIACR, CR97, 0xFF, 0x00},
 {VIACR, CR99, 0xFF, 0x00},
 {VIACR, CR9B, 0xFF, 0x00},
-{VIACR, CRD2, 0xFF, 0xFF}      /* TMDS/LVDS control register.         */
+{VIACR, CRD2, 0xFF, 0xFF}           /* TMDS/LVDS control register.         */
 };
 
 /* Video Mode Table */
@@ -401,7 +377,6 @@ struct io_reg CLE266_ModeXregs[] = { {VIASR, SR1E, 0xF0, 0x00},
 {VIASR, SR1A, 0xFB, 0x08},
 
 {VIACR, CR32, 0xFF, 0x00},
-{VIACR, CR34, 0xFF, 0x00},
 {VIACR, CR35, 0xFF, 0x00},
 {VIACR, CR36, 0x08, 0x00},
 {VIACR, CR6A, 0xFF, 0x80},
@@ -1084,3 +1059,14 @@ struct VideoModeTable CEA_HDMI_Modes[] = {
        {VIA_RES_1280X720, CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},
        {VIA_RES_1920X1080, CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}
 };
+
+int NUM_TOTAL_RES_MAP_REFRESH = ARRAY_SIZE(res_map_refresh_tbl);
+int NUM_TOTAL_CEA_MODES = ARRAY_SIZE(CEA_HDMI_Modes);
+int NUM_TOTAL_CN400_ModeXregs = ARRAY_SIZE(CN400_ModeXregs);
+int NUM_TOTAL_CN700_ModeXregs = ARRAY_SIZE(CN700_ModeXregs);
+int NUM_TOTAL_KM400_ModeXregs = ARRAY_SIZE(KM400_ModeXregs);
+int NUM_TOTAL_CX700_ModeXregs = ARRAY_SIZE(CX700_ModeXregs);
+int NUM_TOTAL_VX855_ModeXregs = ARRAY_SIZE(VX855_ModeXregs);
+int NUM_TOTAL_CLE266_ModeXregs = ARRAY_SIZE(CLE266_ModeXregs);
+int NUM_TOTAL_PATCH_MODE = ARRAY_SIZE(res_patch_table);
+int NUM_TOTAL_MODETABLE = ARRAY_SIZE(CLE266Modes);
index 1a5de50..a9d6554 100644 (file)
@@ -50,128 +50,35 @@ struct res_map_refresh {
        int vmode_refresh;
 };
 
-#define NUM_TOTAL_RES_MAP_REFRESH ARRAY_SIZE(res_map_refresh_tbl)
-#define NUM_TOTAL_CEA_MODES  ARRAY_SIZE(CEA_HDMI_Modes)
-#define NUM_TOTAL_CN400_ModeXregs ARRAY_SIZE(CN400_ModeXregs)
-#define NUM_TOTAL_CN700_ModeXregs ARRAY_SIZE(CN700_ModeXregs)
-#define NUM_TOTAL_KM400_ModeXregs ARRAY_SIZE(KM400_ModeXregs)
-#define NUM_TOTAL_CX700_ModeXregs ARRAY_SIZE(CX700_ModeXregs)
-#define NUM_TOTAL_VX800_ModeXregs ARRAY_SIZE(VX800_ModeXregs)
-#define NUM_TOTAL_CLE266_ModeXregs ARRAY_SIZE(CLE266_ModeXregs)
-#define NUM_TOTAL_PATCH_MODE ARRAY_SIZE(res_patch_table)
-#define NUM_TOTAL_MODETABLE ARRAY_SIZE(CLE266Modes)
+extern int NUM_TOTAL_RES_MAP_REFRESH;
+extern int NUM_TOTAL_CEA_MODES;
+extern int NUM_TOTAL_CN400_ModeXregs;
+extern int NUM_TOTAL_CN700_ModeXregs;
+extern int NUM_TOTAL_KM400_ModeXregs;
+extern int NUM_TOTAL_CX700_ModeXregs;
+extern int NUM_TOTAL_VX855_ModeXregs;
+extern int NUM_TOTAL_CLE266_ModeXregs;
+extern int NUM_TOTAL_PATCH_MODE;
+extern int NUM_TOTAL_MODETABLE;
 
 /********************/
 /* Mode Table       */
 /********************/
 
-/* 480x640 */
-extern struct crt_mode_table CRTM480x640[1];
-/* 640x480*/
-extern struct crt_mode_table CRTM640x480[5];
-/*720x480 (GTF)*/
-extern struct crt_mode_table CRTM720x480[1];
-/*720x576 (GTF)*/
-extern struct crt_mode_table CRTM720x576[1];
-/* 800x480 (CVT) */
-extern struct crt_mode_table CRTM800x480[1];
-/* 800x600*/
-extern struct crt_mode_table CRTM800x600[5];
-/* 848x480 (CVT) */
-extern struct crt_mode_table CRTM848x480[1];
-/*856x480 (GTF) convert to 852x480*/
-extern struct crt_mode_table CRTM852x480[1];
-/*1024x512 (GTF)*/
-extern struct crt_mode_table CRTM1024x512[1];
-/* 1024x600*/
-extern struct crt_mode_table CRTM1024x600[1];
-/* 1024x768*/
-extern struct crt_mode_table CRTM1024x768[4];
-/* 1152x864*/
-extern struct crt_mode_table CRTM1152x864[1];
-/* 1280x720 (HDMI 720P)*/
-extern struct crt_mode_table CRTM1280x720[2];
-/*1280x768 (GTF)*/
-extern struct crt_mode_table CRTM1280x768[2];
-/* 1280x800 (CVT) */
-extern struct crt_mode_table CRTM1280x800[1];
-/*1280x960*/
-extern struct crt_mode_table CRTM1280x960[1];
-/* 1280x1024*/
-extern struct crt_mode_table CRTM1280x1024[3];
-/* 1368x768 (GTF) */
-extern struct crt_mode_table CRTM1368x768[1];
-/*1440x1050 (GTF)*/
-extern struct crt_mode_table CRTM1440x1050[1];
-/* 1600x1200*/
-extern struct crt_mode_table CRTM1600x1200[2];
-/* 1680x1050 (CVT) */
-extern struct crt_mode_table CRTM1680x1050[2];
-/* 1680x1050 (CVT Reduce Blanking) */
-extern struct crt_mode_table CRTM1680x1050_RB[1];
-/* 1920x1080 (CVT)*/
-extern struct crt_mode_table CRTM1920x1080[1];
-/* 1920x1080 (CVT with Reduce Blanking) */
-extern struct crt_mode_table CRTM1920x1080_RB[1];
-/* 1920x1440*/
-extern struct crt_mode_table CRTM1920x1440[2];
-/* 1400x1050 (CVT) */
-extern struct crt_mode_table CRTM1400x1050[2];
-/* 1400x1050 (CVT Reduce Blanking) */
-extern struct crt_mode_table CRTM1400x1050_RB[1];
-/* 960x600 (CVT) */
-extern struct crt_mode_table CRTM960x600[1];
-/* 1000x600 (GTF) */
-extern struct crt_mode_table CRTM1000x600[1];
-/* 1024x576 (GTF) */
-extern struct crt_mode_table CRTM1024x576[1];
-/* 1088x612 (CVT) */
-extern struct crt_mode_table CRTM1088x612[1];
-/* 1152x720 (CVT) */
-extern struct crt_mode_table CRTM1152x720[1];
-/* 1200x720 (GTF) */
-extern struct crt_mode_table CRTM1200x720[1];
-/* 1280x600 (GTF) */
-extern struct crt_mode_table CRTM1280x600[1];
-/* 1360x768 (CVT) */
-extern struct crt_mode_table CRTM1360x768[1];
-/* 1360x768 (CVT Reduce Blanking) */
-extern struct crt_mode_table CRTM1360x768_RB[1];
-/* 1366x768 (GTF) */
-extern struct crt_mode_table CRTM1366x768[2];
-/* 1440x900 (CVT) */
-extern struct crt_mode_table CRTM1440x900[2];
-/* 1440x900 (CVT Reduce Blanking) */
-extern struct crt_mode_table CRTM1440x900_RB[1];
-/* 1600x900 (CVT) */
-extern struct crt_mode_table CRTM1600x900[1];
-/* 1600x900 (CVT Reduce Blanking) */
-extern struct crt_mode_table CRTM1600x900_RB[1];
-/* 1600x1024 (GTF) */
-extern struct crt_mode_table CRTM1600x1024[1];
-/* 1792x1344 (DMT) */
-extern struct crt_mode_table CRTM1792x1344[1];
-/* 1856x1392 (DMT) */
-extern struct crt_mode_table CRTM1856x1392[1];
-/* 1920x1200 (CVT) */
-extern struct crt_mode_table CRTM1920x1200[1];
-/* 1920x1200 (CVT with Reduce Blanking) */
-extern struct crt_mode_table CRTM1920x1200_RB[1];
-/* 2048x1536 (CVT) */
-extern struct crt_mode_table CRTM2048x1536[1];
-extern struct VideoModeTable CLE266Modes[47];
-extern struct crt_mode_table CEAM1280x720[1];
-extern struct crt_mode_table CEAM1920x1080[1];
-extern struct VideoModeTable CEA_HDMI_Modes[2];
+extern struct VideoModeTable CLE266Modes[];
+extern struct crt_mode_table CEAM1280x720[];
+extern struct crt_mode_table CEAM1920x1080[];
+extern struct VideoModeTable CEA_HDMI_Modes[];
 
-extern struct res_map_refresh res_map_refresh_tbl[61];
-extern struct io_reg CN400_ModeXregs[52];
-extern struct io_reg CN700_ModeXregs[66];
-extern struct io_reg KM400_ModeXregs[55];
-extern struct io_reg CX700_ModeXregs[58];
-extern struct io_reg VX800_ModeXregs[58];
-extern struct io_reg CLE266_ModeXregs[32];
-extern struct io_reg PM1024x768[2];
-extern struct patch_table res_patch_table[1];
+extern struct res_map_refresh res_map_refresh_tbl[];
+extern struct io_reg CN400_ModeXregs[];
+extern struct io_reg CN700_ModeXregs[];
+extern struct io_reg KM400_ModeXregs[];
+extern struct io_reg CX700_ModeXregs[];
+extern struct io_reg VX800_ModeXregs[];
+extern struct io_reg VX855_ModeXregs[];
+extern struct io_reg CLE266_ModeXregs[];
+extern struct io_reg PM1024x768[];
+extern struct patch_table res_patch_table[];
 extern struct VPITTable VPIT;
 #endif /* __VIAMODE_H__ */
index 322a9f9..a6b3749 100644 (file)
@@ -27,7 +27,7 @@ u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
 {
        u8 data;
 
-       viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+       viaparinfo->shared->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
        viafb_i2c_readbyte(plvds_chip_info->lvds_chip_slave_addr, index, &data);
 
        return data;
@@ -39,7 +39,7 @@ void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
 {
        int index, data;
 
-       viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+       viaparinfo->shared->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
 
        index = io_data.Index;
        data = viafb_gpio_i2c_read_lvds(plvds_setting_info, plvds_chip_info,
index 26b2782..200c22f 100644 (file)
@@ -19,6 +19,7 @@
  */
 //#define DEBUG
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_balloon.h>
 #include <linux/swap.h>
 #include <linux/kthread.h>
@@ -84,7 +85,7 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
        init_completion(&vb->acked);
 
        /* We should always be able to add one buffer to an empty queue. */
-       if (vq->vq_ops->add_buf(vq, &sg, 1, 0, vb) != 0)
+       if (vq->vq_ops->add_buf(vq, &sg, 1, 0, vb) < 0)
                BUG();
        vq->vq_ops->kick(vq);
 
index 248e00e..4a1f1eb 100644 (file)
@@ -84,7 +84,7 @@ struct virtio_pci_vq_info
        struct list_head node;
 
        /* MSI-X vector (or none) */
-       unsigned vector;
+       unsigned msix_vector;
 };
 
 /* Qumranet donated their vendor ID for devices 0x1000 thru 0x10FF. */
@@ -280,25 +280,14 @@ static void vp_free_vectors(struct virtio_device *vdev)
        vp_dev->msix_entries = NULL;
 }
 
-static int vp_request_vectors(struct virtio_device *vdev, int nvectors,
-                             bool per_vq_vectors)
+static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
+                                  bool per_vq_vectors)
 {
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
        const char *name = dev_name(&vp_dev->vdev.dev);
        unsigned i, v;
        int err = -ENOMEM;
 
-       if (!nvectors) {
-               /* Can't allocate MSI-X vectors, use regular interrupt */
-               vp_dev->msix_vectors = 0;
-               err = request_irq(vp_dev->pci_dev->irq, vp_interrupt,
-                                 IRQF_SHARED, name, vp_dev);
-               if (err)
-                       return err;
-               vp_dev->intx_enabled = 1;
-               return 0;
-       }
-
        vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
                                       GFP_KERNEL);
        if (!vp_dev->msix_entries)
@@ -311,6 +300,7 @@ static int vp_request_vectors(struct virtio_device *vdev, int nvectors,
        for (i = 0; i < nvectors; ++i)
                vp_dev->msix_entries[i].entry = i;
 
+       /* pci_enable_msix returns positive if we can't get this many. */
        err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
        if (err > 0)
                err = -ENOSPC;
@@ -356,10 +346,22 @@ error:
        return err;
 }
 
-static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
-                                   void (*callback)(struct virtqueue *vq),
-                                   const char *name,
-                                   u16 vector)
+static int vp_request_intx(struct virtio_device *vdev)
+{
+       int err;
+       struct virtio_pci_device *vp_dev = to_vp_device(vdev);
+
+       err = request_irq(vp_dev->pci_dev->irq, vp_interrupt,
+                         IRQF_SHARED, dev_name(&vdev->dev), vp_dev);
+       if (!err)
+               vp_dev->intx_enabled = 1;
+       return err;
+}
+
+static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index,
+                                 void (*callback)(struct virtqueue *vq),
+                                 const char *name,
+                                 u16 msix_vec)
 {
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
        struct virtio_pci_vq_info *info;
@@ -384,7 +386,7 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
 
        info->queue_index = index;
        info->num = num;
-       info->vector = vector;
+       info->msix_vector = msix_vec;
 
        size = PAGE_ALIGN(vring_size(num, VIRTIO_PCI_VRING_ALIGN));
        info->queue = alloc_pages_exact(size, GFP_KERNEL|__GFP_ZERO);
@@ -408,10 +410,10 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
        vq->priv = info;
        info->vq = vq;
 
-        if (vector != VIRTIO_MSI_NO_VECTOR) {
-               iowrite16(vector, vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
-               vector = ioread16(vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
-               if (vector == VIRTIO_MSI_NO_VECTOR) {
+       if (msix_vec != VIRTIO_MSI_NO_VECTOR) {
+               iowrite16(msix_vec, vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
+               msix_vec = ioread16(vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
+               if (msix_vec == VIRTIO_MSI_NO_VECTOR) {
                        err = -EBUSY;
                        goto out_assign;
                }
@@ -472,7 +474,8 @@ static void vp_del_vqs(struct virtio_device *vdev)
        list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
                info = vq->priv;
                if (vp_dev->per_vq_vectors)
-                       free_irq(vp_dev->msix_entries[info->vector].vector, vq);
+                       free_irq(vp_dev->msix_entries[info->msix_vector].vector,
+                                vq);
                vp_del_vq(vq);
        }
        vp_dev->per_vq_vectors = false;
@@ -484,38 +487,58 @@ static int vp_try_to_find_vqs(struct virtio_device *vdev, unsigned nvqs,
                              struct virtqueue *vqs[],
                              vq_callback_t *callbacks[],
                              const char *names[],
-                             int nvectors,
+                             bool use_msix,
                              bool per_vq_vectors)
 {
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
-       u16 vector;
-       int i, err, allocated_vectors;
+       u16 msix_vec;
+       int i, err, nvectors, allocated_vectors;
 
-       err = vp_request_vectors(vdev, nvectors, per_vq_vectors);
-       if (err)
-               goto error_request;
+       if (!use_msix) {
+               /* Old style: one normal interrupt for change and all vqs. */
+               err = vp_request_intx(vdev);
+               if (err)
+                       goto error_request;
+       } else {
+               if (per_vq_vectors) {
+                       /* Best option: one for change interrupt, one per vq. */
+                       nvectors = 1;
+                       for (i = 0; i < nvqs; ++i)
+                               if (callbacks[i])
+                                       ++nvectors;
+               } else {
+                       /* Second best: one for change, shared for all vqs. */
+                       nvectors = 2;
+               }
+
+               err = vp_request_msix_vectors(vdev, nvectors, per_vq_vectors);
+               if (err)
+                       goto error_request;
+       }
 
        vp_dev->per_vq_vectors = per_vq_vectors;
        allocated_vectors = vp_dev->msix_used_vectors;
        for (i = 0; i < nvqs; ++i) {
                if (!callbacks[i] || !vp_dev->msix_enabled)
-                       vector = VIRTIO_MSI_NO_VECTOR;
+                       msix_vec = VIRTIO_MSI_NO_VECTOR;
                else if (vp_dev->per_vq_vectors)
-                       vector = allocated_vectors++;
+                       msix_vec = allocated_vectors++;
                else
-                       vector = VP_MSIX_VQ_VECTOR;
-               vqs[i] = vp_find_vq(vdev, i, callbacks[i], names[i], vector);
+                       msix_vec = VP_MSIX_VQ_VECTOR;
+               vqs[i] = setup_vq(vdev, i, callbacks[i], names[i], msix_vec);
                if (IS_ERR(vqs[i])) {
                        err = PTR_ERR(vqs[i]);
                        goto error_find;
                }
                /* allocate per-vq irq if available and necessary */
-               if (vp_dev->per_vq_vectors && vector != VIRTIO_MSI_NO_VECTOR) {
-                       snprintf(vp_dev->msix_names[vector], sizeof *vp_dev->msix_names,
-                                "%s-%s", dev_name(&vp_dev->vdev.dev), names[i]);
-                       err = request_irq(vp_dev->msix_entries[vector].vector,
-                                         vring_interrupt, 0,
-                                         vp_dev->msix_names[vector], vqs[i]);
+               if (vp_dev->per_vq_vectors) {
+                       snprintf(vp_dev->msix_names[msix_vec],
+                                sizeof *vp_dev->msix_names,
+                                "%s-%s",
+                                dev_name(&vp_dev->vdev.dev), names[i]);
+                       err = request_irq(msix_vec, vring_interrupt, 0,
+                                         vp_dev->msix_names[msix_vec],
+                                         vqs[i]);
                        if (err) {
                                vp_del_vq(vqs[i]);
                                goto error_find;
@@ -537,28 +560,20 @@ static int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs,
                       vq_callback_t *callbacks[],
                       const char *names[])
 {
-       int vectors = 0;
-       int i, uninitialized_var(err);
-
-       /* How many vectors would we like? */
-       for (i = 0; i < nvqs; ++i)
-               if (callbacks[i])
-                       ++vectors;
+       int err;
 
-       /* We want at most one vector per queue and one for config changes. */
-       err = vp_try_to_find_vqs(vdev, nvqs, vqs, callbacks, names,
-                                vectors + 1, true);
+       /* Try MSI-X with one vector per queue. */
+       err = vp_try_to_find_vqs(vdev, nvqs, vqs, callbacks, names, true, true);
        if (!err)
                return 0;
-       /* Fallback to separate vectors for config and a shared for queues. */
+       /* Fallback: MSI-X with one vector for config, one shared for queues. */
        err = vp_try_to_find_vqs(vdev, nvqs, vqs, callbacks, names,
-                                2, false);
+                                true, false);
        if (!err)
                return 0;
        /* Finally fall back to regular interrupts. */
-       err = vp_try_to_find_vqs(vdev, nvqs, vqs, callbacks, names,
-                                0, false);
-       return err;
+       return vp_try_to_find_vqs(vdev, nvqs, vqs, callbacks, names,
+                                 false, false);
 }
 
 static struct virtio_config_ops virtio_pci_config_ops = {
index a882f26..f536005 100644 (file)
@@ -208,7 +208,11 @@ add_head:
 
        pr_debug("Added buffer head %i to %p\n", head, vq);
        END_USE(vq);
-       return 0;
+
+       /* If we're indirect, we can fit many (assuming not OOM). */
+       if (vq->indirect)
+               return vq->num_free ? vq->vring.num : 0;
+       return vq->num_free;
 }
 
 static void vring_kick(struct virtqueue *_vq)
index f05d2a3..ba3d71f 100644 (file)
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
index f5bbd9e..d31505b 100644 (file)
@@ -96,11 +96,7 @@ static struct balloon_stats balloon_stats;
 /* We increase/decrease in batches which fit in a page */
 static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
 
-/* VM /proc information for memory */
-extern unsigned long totalram_pages;
-
 #ifdef CONFIG_HIGHMEM
-extern unsigned long totalhigh_pages;
 #define inc_totalhigh_pages() (totalhigh_pages++)
 #define dec_totalhigh_pages() (totalhigh_pages--)
 #else
@@ -214,7 +210,7 @@ static int increase_reservation(unsigned long nr_pages)
        page = balloon_first_page();
        for (i = 0; i < nr_pages; i++) {
                BUG_ON(page == NULL);
-               frame_list[i] = page_to_pfn(page);;
+               frame_list[i] = page_to_pfn(page);
                page = balloon_next_page(page);
        }
 
index af03195..79bedba 100644 (file)
@@ -38,7 +38,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/errno.h>
 #include <linux/miscdevice.h>
 #include <linux/major.h>
 #include <linux/proc_fs.h>
index ffe2663..5ea80b1 100644 (file)
@@ -46,6 +46,22 @@ fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
                                   cxgb3/ael2005_opt_edc.bin \
                                   cxgb3/ael2005_twx_edc.bin \
                                   cxgb3/ael2020_twx_edc.bin
+fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
+fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
+fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
+                                  radeon/R300_cp.bin radeon/R420_cp.bin \
+                                  radeon/RS690_cp.bin radeon/RS600_cp.bin \
+                                  radeon/R520_cp.bin \
+                                  radeon/R600_pfp.bin radeon/R600_me.bin \
+                                  radeon/RV610_pfp.bin radeon/RV610_me.bin \
+                                  radeon/RV630_pfp.bin radeon/RV630_me.bin \
+                                  radeon/RV620_pfp.bin radeon/RV620_me.bin \
+                                  radeon/RV635_pfp.bin radeon/RV635_me.bin \
+                                  radeon/RV670_pfp.bin radeon/RV670_me.bin \
+                                  radeon/RS780_pfp.bin radeon/RS780_me.bin \
+                                  radeon/RV770_pfp.bin radeon/RV770_me.bin \
+                                  radeon/RV730_pfp.bin radeon/RV730_me.bin \
+                                  radeon/RV710_pfp.bin radeon/RV710_me.bin
 fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
 fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
 fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
index 82db525..3f8c4f6 100644 (file)
@@ -727,3 +727,124 @@ Found in hex form in kernel source, with the following comment:
    Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
 
 --------------------------------------------------------------------------
+
+Driver: mga - Matrox G200/G400/G550
+
+File: matrox/g200_warp.fw
+File: matrox/g400_warp.fw
+
+Licence:
+
+Copyright 1999 Matrox Graphics Inc.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+Driver: r128 - ATI Rage 128
+
+File: r128/r128_cce.bin
+
+Licence:
+
+Copyright 2000 Advanced Micro Devices, Inc.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+
+Found in decimal form in kernel source.
+
+--------------------------------------------------------------------------
+
+Driver: radeon - ATI Radeon
+
+File: radeon/R100_cp.bin
+File: radeon/R200_cp.bin
+File: radeon/R300_cp.bin
+File: radeon/R420_cp.bin
+File: radeon/RS600_cp.bin
+File: radeon/RS690_cp.bin
+File: radeon/R520_cp.bin
+File: radeon/R600_pfp.bin
+File: radeon/R600_me.bin
+File: radeon/RV610_pfp.bin
+File: radeon/RV610_me.bin
+File: radeon/RV630_pfp.bin
+File: radeon/RV630_me.bin
+File: radeon/RV620_pfp.bin
+File: radeon/RV620_me.bin
+File: radeon/RV635_pfp.bin
+File: radeon/RV635_me.bin
+File: radeon/RV670_pfp.bin
+File: radeon/RV670_me.bin
+File: radeon/RS780_pfp.bin
+File: radeon/RS780_me.bin
+File: radeon/RV770_pfp.bin
+File: radeon/RV770_me.bin
+File: radeon/RV730_pfp.bin
+File: radeon/RV730_me.bin
+File: radeon/RV710_pfp.bin
+File: radeon/RV710_me.bin
+
+Licence:
+
+ * Copyright 2007-2009 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
index 8f7fdaa..5a03ba8 100644 (file)
@@ -56,7 +56,7 @@ static int output_records(int outfd);
 static int sort_records = 0;
 static int wide_records = 0;
 
-int usage(void)
+static int usage(void)
 {
        fprintf(stderr, "ihex2fw: Convert ihex files into binary "
                "representation for use by Linux kernel\n");
diff --git a/firmware/matrox/g200_warp.H16 b/firmware/matrox/g200_warp.H16
new file mode 100644 (file)
index 0000000..5064b6f
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * WARP pipes are named according to the functions they perform, where
+ *
+ *   - T stands for computation of texture stage 0
+ *   - T2 stands for computation of both texture stage 0 and texture stage 1
+ *   - G stands for computation of triangle intensity (Gouraud interpolation)
+ *   - Z stands for computation of Z buffer interpolation
+ *   - S stands for computation of specular highlight
+ *   - A stands for computation of the alpha channel
+ *   - F stands for computation of vertex fog interpolation
+ */
+/* TGZ */
+:04B8000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E9728007EA241F20E9154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E2608015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E803800AEA17C12BBD008000E8008000E8B3689725008000E833C033AF3C274FE9573920E9281960EC2B3220E91D3B20E9B30500E0162820E9233B33AD1E2B20E91C8020E9573620E90080A0E94040D8ECFF80C0E990E200E085FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E884FF0AEA008000E8C941C8EC42E100E082FF20EA008000E8008000E8008000E8C840C0EC008000E87FFF20EA008000E8008000E8008000E871
+/* TGZF */
+:0548000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E97F8007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E26B8015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E80D211AB6052131B603802AEA17C12BBD0D2005202FC021C6B3689725008000E833C033AF3C274FE91750569F008000E8370F5C9F00E02F20008000E8281960ECB30500E0008000E8233B33AD008000E8172617DF35174FE9008000E8008000E8008000E839374FE92F2F17AF008000E8008000E8008000E831804FE9008000E8008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E078FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E877FF0AEA008000E8C941C8EC42E100E075FF20EA008000E8008000E8008000E8C840C0EC008000E872FF20EA008000E8008000E8008000E8BB
+/* TGZA */
+:04E80000000098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E97D8007EA241F20E9154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E26B8015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E82D444CB6254454B603802AEA17C12BBD2D20252007C044C6B3689725008000E833C033AF3C274FE91F62579F008000E83F3D5D9F00E00720008000E8281960ECB30500E0008000E8233B33AD008000E81F261FDF9D1F4FE9008000E8008000E8008000E89E3F4FE907071FAF008000E8008000E8008000E89C804FE9008000E8008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E07AFF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E879FF0AEA008000E8C941C8EC42E100E077FF20EA008000E8008000E8008000E8C840C0EC008000E874FF20EA008000E8008000E8008000E8D9
+/* TGZAF */
+:0568000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E9838007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E26F8015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E80D211AB6052131B62D444CB6254454B603802AEA17C12BBD0D2005202FC021C6B3689725008000E833C033AF3C274FE900E0252007C044C61750569F00E02D20370F5C9F00E02F201F62579F00E007203F3D5D9F008000E8008000E8281960ECB30500E0172617DF233B33AD35174FE91F261FDF9D1F4FE99E3F4FE939374FE92F2F17AF008000E807071FAF008000E831804FE9008000E89C804FE9008000E8008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E074FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E873FF0AEA008000E8C941C8EC42E100E071FF20EA008000E8008000E8008000E8C840C0EC008000E86EFF20EA008000E8008000E8008000E830
+/* TGZS */
+:05C0000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E98B8007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E2778015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E82D211AB0252131B00D211AB2052131B203802AEA17C12BBD2D20252005200D20B3689725008000E833C033AF2FC021C01642569F3C274FE91E62579F008000E8252131B42D211AB43F2F5D9F008000E8330500E0281960EC370F5C9F00E02F20233B33AD1E261EDFA71E4FE9172616DF2D2000E0A83F4FE92F2F1EAF252000E0A4164FE90FC021C2A6804FE91F62579F3F2F5D9F00E08F20A5374FE90F170FAF06C021C4008000E8008000E8A3804FE9062000E01F261FDFA11F4FE9A23F4FE9008000E8008000E806061FAF008000E8008000E8008000E8A0804FE9008000E8008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E06CFF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E86BFF0AEA008000E8C941C8EC42E100E069FF20EA008000E8008000E8008000E8C840C0EC008000E866FF20EA008000E8008000E8008000E85C
+/* TGZSF */
+:05E0000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E98F8007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E27B8015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E82D211AB0252131B00D211AB2052131B203802AEA17C12BBD2D20252005200D20B3689725008000E833C033AF2FC021C01642569F3C274FE91E62579F008000E8252131B42D211AB43F2F5D9F008000E8330500E0281960EC0D211AB6052131B6370F5C9F00E02F20233B33AD1E261EDFA71E4FE9172616DF2D2000E0A83F4FE92F2F1EAF252000E0A4164FE90FC021C2A6804FE91F62579F0D2005202FC021C63F2F5D9F00E00F201750569FA5374FE906C021C40F170FAF370F5C9F008000E82F2000E0A3804FE9062000E01F261FDF172617DF35174FE9A11F4FE9A23F4FE906061FAF39374FE92F2F17AF008000E8A0804FE9008000E831804FE9008000E8008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E068FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E867FF0AEA008000E8C941C8EC42E100E065FF20EA008000E8008000E8008000E8C840C0EC008000E862FF20EA008000E8008000E8008000E8F9
+/* TGZSA */
+:05E0000000008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E98F8007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E27B8015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E82D211AB0252131B00D211AB2052131B203802AEA17C12BBD2D20252005200D20B3689725008000E833C033AF2FC021C01642569F3C274FE91E62579F008000E8252131B42D211AB43F2F5D9F008000E8330500E0281960EC0D444CB6054454B6370F5C9F00E02F20233B33AD1E261EDFA71E4FE9172616DF2D2000E0A83F4FE92F2F1EAF252000E0A4164FE90FC021C2A6804FE91F62579F0D200520008000E83F2F5D9F00E00F201750569FA5374FE906C021C40F170FAF370F5C9F008000E82FC044C6A3804FE9062000E01F261FDF172617DF9D174FE9A11F4FE9A23F4FE906061FAF00E0AF209E374FE92F172FAFA0804FE9008000E8008000E89C804FE9008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E068FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E867FF0AEA008000E8C941C8EC42E100E065FF20EA008000E8008000E8008000E8C840C0EC008000E862FF20EA008000E8008000E8008000E883
+/* TGZAF */
+:05B8000000008000E8008000E8008000E8008000E8008000E8008000E80098A0E94040D8ECFF80C0E9008000E81FD718BD3FD722BD8104890401040904C941C0EC110400E041CC41CD49CC49CDD141C0EC51CC51CD80041004080400E000CCC0CDD149C0EC8A1F20E98B3F20E9413C41AD493C49AD10CC10CD08CC08CDB94149BB1FF041CD513C51AD009880E9948007EA241F20E9214580E81A4D80E8315580E8008000E8154149BD1D4151BD2E412AB83453A0E815301D3058E300E0B54048BD3D4050BD2443A0E82C4BA0E8157209E300E01D723530B530BD303D309C97579F008000E86C64C8EC98E1B505BD052E3032C0A0E833C0A0E87464C8EC403C40AD326A2A302073336A00E028731C7283E2808015EAB83D28DF303520DF403000E0CCE26472254252BF2D424ABF302E30DF382E38DF181D45E91E1545E92B4951BD00E01F73383840AF303040AF241F24DF1D3220E92C1F2CDF1A3320E9B01008E34010B81026F030CD2FF038CD2B8020E92A8020E9A62088E200E0AF20282A26AF202AC0AF341F34DF462446DF283080BF203880BF472447DF4E2C4EDF4F2C4FDF563456DF281528DF201D20DF573457DF00E01D05048010EA89E22B303FC11DBD008000E8008000E8008000E8A068BF25008000E820C020AF2805977400E02A1016C020E9048010EA8CE2950528C128AD1FC115BD008000E8008000E8A8679F6B008000E828C028AD1D252005283280AD402A40BD1C8020E9203320AD207300E0B64951BB262FB0E8192020E9352035DF3D203DDF152015DF1D201DDF26D026CD29492AB8264080BD3B4850BD3E54579F00E082E11EAF599F008000E826302930483C48AD2B72C2E12CC044C2052434BF0D242CBF2D464EBF254656BF201D6F8F323E5FE93E50569F00E03B301E8F519F331E5FE9054454B20D444CB219C0B0E834C044C4337300E03E62579F1EAF599F00E00D20843E58E9281D6F8F052000E0851E58E99B3B33DF202042AF3042569F803E57E93F8F519F30805FE9282824AF811E57E9054757BF0D474FBF888058E91B291BDF301D6F8F3A304FE91C3026DF09E33B053E50569F3B3F4FE91E8F519F00E0AC202D444CB42C1CC0AF254454B400E0C830304630AF1B1B48AF00E02520382C4FE9868057E9381D6F8F287400E00D444CB0054454B02D209B10823E57E932F01BCD1EBD599F831E57E9384738AF34202A3000E00D2032200520878057E91F54579F1742569F00E03B6A3F8F519F371E4FE937322AAF00E03200008000E827C044C0361F4FE91F1F26DF371B37BF172617DF3E174FE93F3F4FE9341F34AF2B05A720332B37DF2717C0AF34804FE9008000E82D211AB0252131B00D211AB2052131B203802AEA17C12BBD2D20252005200D20B3689725008000E833C033AF2FC021C01642569F3C274FE91E62579F008000E8252131B42D211AB43F2F5D9F008000E8330500E0281960EC0D211AB6052131B6370F5C9F00E02F20233B33AD1E261EDFA71E4FE9172616DF2D2000E0A83F4FE92F2F1EAF252000E0A4164FE90FC021C2A6804FE91F62579F0D2005202FC021C62D444CB6254454B63F2F5D9F00E00F202D20252007C044C61750569FA5374FE906C021C40F170FAF370F5C9F008000E81E62579F008000E83E3D5D9F00E007202F2000E0A30F4FE9062000E01F261FDF172617DFA11F4FE91E261EDF9D1E4FE935174FE9A23F4FE906061FAF39374FE92F2F17AF07071EAFA0804FE99E3E4FE931804FE99C804FE9008000E8573920E9162820E91D3B20E91E2B20E92B3220E91C2320E9573620E90080A0E94040D8ECFF80C0E990E200E063FF20EA19C8C1CD1FD718BD3FD722BD9F4149BD008000E8254149BD2D4151BD0D8007EA008000E8354048BD3D4050BD008000E825302D303530B530BD303D309CA75B9F008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E8008000E862FF0AEA008000E8C941C8EC42E100E060FF20EA008000E8008000E8008000E8C840C0EC008000E85DFF20EA008000E8008000E8008000E8D8
+:0000000001FF
diff --git a/firmware/matrox/g400_warp.H16 b/firmware/matrox/g400_warp.H16
new file mode 100644 (file)
index 0000000..b432d10
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * WARP pipes are named according to the functions they perform, where
+ *
+ *   - T stands for computation of texture stage 0
+ *   - T2 stands for computation of both texture stage 0 and texture stage 1
+ *   - G stands for computation of triangle intensity (Gouraud interpolation)
+ *   - Z stands for computation of Z buffer interpolation
+ *   - S stands for computation of specular highlight
+ *   - A stands for computation of the alpha channel
+ *   - F stands for computation of vertex fog interpolation
+ */
+/* TGZ */
+:0338000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC31003900588015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF4A8007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF32322DDF22222DDF12122DDF3A3A2DDF473747DF573D57DF3DCF74C037CF74C431532F9F348020E939E52C9F3C3D20E90A444CB0024454B02A444CB21A4454B21D803AEA0A2002203DCF74C22A201A2030502E9F32315FE938212C9F33395FE931532F9F008000E82A444CB41A4454B439E52C9F383D20E988735EE92A201A202A464EBF1A4656BF31532F9F3E304FE939E52C9F3F384FE90A474FBF024757BF31532F9F3A314FE939E52C9F3B394FE92A434BBF1A4353BF30502E9F36314FE938212C9F37394FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E9AFFF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFD6FF20EA008000E84E334ECF573B57CF9DFF20EA57C0BFEA0080A0E90000D8EC59
+/* TGZF */
+:0360000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC310039005D8015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF4F8007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF32322DDF22222DDF12122DDF3A3A2DDF473747DF573D57DF3DCF74C037CF74C439E52C9F348020E931532F9F008000E888735EE9008000E827CF75C63C3D20E90A444CB0024454B02A444CB21A4454B220803AEA0A2002203DCF74C22A201A2030502E9F32315FE938212C9F33395FE931532F9F312720E90A444CB4024454B42A454DB61A4555B639E52C9F383D20E90A2002202A201A200A474FBF024757BF30502E9F3E304FE938212C9F3F384FE92A464EBF1A4656BF31532F9F3A314FE939E52C9F3B394FE931532F9F36304FE939E52C9F37384FE92A434BBF1A4353BF30502E9F35314FE938212C9F39394FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E9AAFF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFD3FF20EA008000E84E334ECF573B57CF98FF20EA57C0BFEA0080A0E90000D8EC90
+/* TGZA */
+:0358000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC310039005C8015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF4E8007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF32322DDF22222DDF12122DDF3A3A2DDF473747DF573D57DF3DCF74C037CF74C431532F9F348020E939E52C9F3C3D20E927CF74C63DCF74C20A444CB0024454B02A444CB21A4454B220803AEA0A20022088735EE92A201A2030502E9F32315FE938212C9F33395FE931532F9F9C2720E90A444CB4024454B42A444CB61A4454B639E52C9F383D20E90A2002202A201A200A474FBF024757BF30502E9F3E304FE938212C9F3F384FE92A464EBF1A4656BF31532F9F3A314FE939E52C9F3B394FE931532F9F36304FE939E52C9F37384FE92A434BBF1A4353BF30502E9F9D314FE938212C9F9E394FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E9ABFF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFD3FF20EA008000E84E334ECF573B57CF99FF20EA57C0BFEA0080A0E90000D8EC35
+/* TGZAF */
+:0380000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC31003900618015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF538007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF32322DDF22222DDF12122DDF3A3A2DDF473747DF573D57DF3DCF74C037CF74C40A444CB0024454B031532F9F343720E939E52C9F3C3D20E92A444CB21A4454B226803AEA0A20022088735EE92A201A203DCF74C227CF74C630502E9F32315FE938212C9F33395FE931532F9F9C2720E90A444CB4024454B42A444CB61A4454B639E52C9F383D20E90A2002202A201A203DCF75C6008000E830502E9F3E304FE938212C9F3F384FE90A454DB6024555B631532F9F3A314FE939E52C9F3B394FE9313D20E90A2002202A464EBF1A4656BF0A474FBF024757BF30502E9F36304FE938212C9F37384FE931532F9F9D314FE939E52C9F9E394FE92A434BBF1A4353BF30502E9F35304FE938212C9F39384FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E9A6FF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFCDFF20EA008000E84E334ECF573B57CF94FF20EA57C0BFEA0080A0E90000D8EC89
+/* TGZS */
+:03A0000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC31003900658015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF578007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF473747DF573D57DF32322DDF22222DDF12122DDF3A3A2DDF27CF74C237CF74C40A444CB0024454B03DCF74C0343720E931532F9F382720E939E52C9F3C3D20E92A444CB21A4454B229803AEA0A20022027CF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA62720E939E52C9FA33D20E92A444CB41A4454B40A454DB0024555B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE92A454DB21A4555B20A454DB4024555B438212C9F3B394FE90A2002202A201A202A464EBF1A4656BF31532F9F36314FE939E52C9F37394FE930502E9FA7304FE938212C9FA8384FE90A474FBF024757BF31532F9FA4314FE939E52C9FA5394FE92A434BBF1A4353BF30502E9FA1304FE938212C9FA2384FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E9A2FF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFCAFF20EA008000E84E334ECF573B57CF90FF20EA57C0BFEA0080A0E90000D8ECD8
+/* TGZSF */
+:03C8000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC310039006A8015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF5C8007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF473747DF573D57DF32322DDF22222DDF12122DDF3A3A2DDF27CF74C237CF74C40A444CB0024454B03DCF74C0343720E931532F9F382720E939E52C9F3C3D20E92A444CB21A4454B22E803AEA0A20022027CF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA62720E939E52C9FA33D20E92A444CB41A4454B40A454DB0024555B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A454DB21A4555B20A454DB4024555B427CF75C62A201A20A7304FE90A20022031532F9F312720E939E52C9FA8384FE92A454DB61A4555B630502E9F36314FE938212C9F37394FE9008000E82A201A202A464EBF1A4656BF31532F9FA4314FE939E52C9FA5394FE90A474FBF024757BF31532F9FA1304FE939E52C9FA2384FE92A434BBF1A4353BF30502E9F35314FE938212C9F39394FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E99DFF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFC5FF20EA008000E84E334ECF573B57CF8BFF20EA57C0BFEA0080A0E90000D8ECD3
+/* TGZSA */
+:03C8000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC310039006A8015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF5C8007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF473747DF573D57DF32322DDF22222DDF12122DDF3A3A2DDF27CF74C237CF74C40A444CB0024454B03DCF74C0343720E931532F9F382720E939E52C9F3C3D20E92A444CB21A4454B22E803AEA0A20022027CF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA62720E939E52C9FA33D20E92A444CB41A4454B40A454DB0024555B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A454DB21A4555B20A454DB4024555B427CF74C62A201A20A7304FE90A20022031532F9F9C2720E939E52C9FA8384FE92A444CB61A4454B630502E9F36314FE938212C9F37394FE9008000E82A201A202A464EBF1A4656BF31532F9FA4314FE939E52C9FA5394FE90A474FBF024757BF31532F9FA1304FE939E52C9FA2384FE92A434BBF1A4353BF30502E9F9D314FE938212C9F9E394FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E99DFF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFC5FF20EA008000E84E334ECF573B57CF8BFF20EA57C0BFEA0080A0E90000D8ECA0
+/* TGZSAF */
+:03E8000000008898E9008000E80080A0E90000D8ECFF80C0E9008000E8224048BF2A4050BF324149BF3A4151BFC36BCB6B008898E9737BC8EC96E241047B43A0E8734BA0E8ADEE299F00E0490490E251043146B1E84941C0EC3957B1E8000446E27353A0E85141C0EC310039006E8015EA080410045149C0EC2F4160EA312039201F42A0E82A424ABF274AA0E81A4252BF1E4960EA737BC8EC265160EA324048BD224050BD124149BD3A4151BDBF2F26BD00E07B723220222012203A20463146BF4E314EBFB3E22D9F008000E8563156BF473947BF4F394FBF573957BF608007EA244120E94273F8EC00E02D7333720CE3A52F1EBD43432DDF4B4B2DDFAE1E26BD58E3336653532DDF008000E8B83833BF00E059E31E1241E91A2241E92B403DE93F4BA0E82D73307605803DEA3743A0E83D53A0E84870F8EC2B483CE91F27BCE8008000E8008000E8008000E815C020E915C020E915C020E915C020E9183A41E91D3241E92A4020E9563D56DF463746DF4E3F4EDF163020E94F3F4FDF473747DF573D57DF32322DDF22222DDF12122DDF3A3A2DDF27CF74C237CF74C40A444CB0024454B03DCF74C0343720E931532F9F382720E939E52C9F3C3D20E92A444CB21A4454B232803AEA0A20022027CF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA62720E939E52C9FA33D20E92A444CB41A4454B40A454DB0024555B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A454DB21A4555B20A454DB4024555B427CF74C62A201A20A7304FE90A20022031532F9F9C2720E939E52C9FA8384FE92A444CB61A4454B630502E9F36314FE938212C9F37394FE90A454DB6024555B63DCF75C62A201A202A464EBF1A4656BF31532F9FA4314FE939E52C9FA5394FE9313D20E90A2002200A474FBF024757BF30502E9FA1304FE938212C9FA2384FE931532F9F9D314FE939E52C9F9E394FE92A434BBF1A4353BF30502E9F35304FE938212C9F39384FE931532F9F803157E939E52C9F813957E9374850BD8A3620E9867657E98B3E20E9823057E9877757E9833857E9354951BD84315EE9301F5FE985395EE9572520E92B4820E91D37E1EA1E35E1EA00E02677244920E999FF20EA162620E9572EBFEA1C46A0E8234EA0E82B56A0E81D47A0E8244FA0E82C57A0E81C0023002B0000E01D0024002C0000E01C6523652B6500E01D6524652C6500E01C2360EC36D736AD2B8060EC1D2460EC3ED73EAD2C8060EC1C2BDEE82380DEE8368036BD3E803EBD33D71CBD3BD723BD468046CF4F804FCF563356CF473B47CFC1FF20EA008000E84E334ECF573B57CF87FF20EA57C0BFEA0080A0E90000D8EC83
+/* T2GZ */
+:0438000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC31003900788015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF698007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF12122DDF22222DDF32322DDF3A3A2DDF683D68DF493749DF3DCF74C037CF74C431532F9F348020E939E52C9F3C3D20E90A4454B0024464B02A4454B21A4464B225803AEA0A2002203DCF74C22A201A2030502E9F32315FE938212C9F33395FE931532F9F008000E82A4454B41A4464B439E52C9F383D20E988735EE92A201A202A4656BF1A4666BF31532F9F3E304FE939E52C9F3F384FE90A4757BF024767BF31532F9F3A314FE939E52C9F3B394FE92A4353BF1A4363BF30502E9F36314FE938212C9F37394FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E99FFF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFBEFF20EA008000E8583358CF693B69CF7DFF20EA57C0BFEA0080A0E90000D8ECAC
+/* T2GZF */
+:0460000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC310039007D8015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF6E8007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF12122DDF22222DDF32322DDF3A3A2DDF683D68DF493749DF3DCF74C037CF74C439E52C9F348020E931532F9F008000E888735EE9008000E80FCF75C63C3D20E90A4454B0024464B02A4454B21A4464B228803AEA0A2002203DCF74C22A201A2030502E9F32315FE938212C9F33395FE931532F9F310F20E90A4454B4024464B42A4555B61A4565B639E52C9F383D20E90A2002202A201A200A4757BF024767BF30502E9F3E304FE938212C9F3F384FE92A4656BF1A4666BF31532F9F3A314FE939E52C9F3B394FE931532F9F36304FE939E52C9F37384FE92A4353BF1A4363BF30502E9F35314FE938212C9F39394FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E99AFF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFBBFF20EA008000E8583358CF693B69CF78FF20EA57C0BFEA0080A0E90000D8ECFB
+/* T2GZA */
+:0458000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC310039007C8015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF6D8007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF12122DDF22222DDF32322DDF3A3A2DDF683D68DF493749DF3DCF74C037CF74C431532F9F348020E939E52C9F3C3D20E90A4454B0024464B02A4454B21A4464B229803AEA0A2002200FCF74C63DCF74C288735EE92A201A2030502E9F32315FE938212C9F33395FE931532F9F9C0F20E90A4454B4024464B42A4454B61A4464B639E52C9F383D20E90A2002202A201A200A4757BF024767BF30502E9F3E304FE938212C9F3F384FE92A4656BF1A4666BF31532F9F3A314FE939E52C9F3B394FE931532F9F36304FE939E52C9F37384FE92A4353BF1A4363BF30502E9F9D314FE938212C9F9E394FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E99BFF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFBAFF20EA008000E8583358CF693B69CF79FF20EA57C0BFEA0080A0E90000D8ECA0
+/* T2GZAF */
+:0480000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC31003900818015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF728007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF12122DDF22222DDF32322DDF3A3A2DDF683D68DF493749DF3DCF74C037CF74C40A4454B0024464B031532F9F343720E939E52C9F3C3D20E92A4454B21A4464B22E803AEA0A20022088735EE92A201A203DCF74C20FCF74C630502E9F32315FE938212C9F33395FE931532F9F9C0F20E90A4454B4024464B42A4454B61A4464B639E52C9F383D20E90A2002202A201A203DCF75C6008000E830502E9F3E304FE938212C9F3F384FE90A4555B6024565B631532F9F3A314FE939E52C9F3B394FE9313D20E90A2002202A4656BF1A4666BF0A4757BF024767BF30502E9F36304FE938212C9F37384FE931532F9F9D314FE939E52C9F9E394FE92A4353BF1A4363BF30502E9F35304FE938212C9F39384FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E996FF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFB5FF20EA008000E8583358CF693B69CF74FF20EA57C0BFEA0080A0E90000D8ECDC
+/* T2GZS */
+:04A0000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC31003900858015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF768007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF683D68DF493749DF32322DDF22222DDF12122DDF3A3A2DDF0FCF74C237CF74C40A4454B0024464B03DCF74C0343720E931532F9F380F20E939E52C9F3C3D20E92A4454B21A4464B231803AEA0A2002200FCF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA60F20E939E52C9FA33D20E92A4454B41A4464B40A4555B0024565B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE92A4555B21A4565B20A4555B4024565B438212C9F3B394FE92A201A200A2002202A4656BF1A4666BF31532F9F36314FE939E52C9F37394FE930502E9FA7304FE938212C9FA8384FE90A4757BF024767BF31532F9FA4314FE939E52C9FA5394FE92A4353BF1A4363BF30502E9FA1304FE938212C9FA2384FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E992FF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFB2FF20EA008000E8583358CF693B69CF70FF20EA57C0BFEA0080A0E90000D8EC43
+/* T2GZSF */
+:04C8000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC310039008A8015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF7B8007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF683D68DF493749DF32322DDF22222DDF12122DDF3A3A2DDF0FCF74C237CF74C40A4454B0024464B03DCF74C0343720E931532F9F380F20E939E52C9F3C3D20E92A4454B21A4464B236803AEA0A2002200FCF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA60F20E939E52C9FA33D20E92A4454B41A4464B40A4555B0024565B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A4555B21A4565B20A4555B4024565B40FCF75C62A201A20A7304FE90A20022031532F9F310F20E939E52C9FA8384FE92A4555B61A4565B630502E9F36314FE938212C9F37394FE9008000E82A201A202A4656BF1A4666BF31532F9FA4314FE939E52C9FA5394FE90A4757BF024767BF31532F9FA1304FE939E52C9FA2384FE92A4353BF1A4363BF30502E9F35314FE938212C9F39394FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E98DFF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFADFF20EA008000E8583358CF693B69CF6BFF20EA57C0BFEA0080A0E90000D8EC56
+/* T2GZSA */
+:04C8000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC310039008A8015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF7B8007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF683D68DF493749DF32322DDF22222DDF12122DDF3A3A2DDF0FCF74C237CF74C40A4454B0024464B03DCF74C0343720E931532F9F380F20E939E52C9F3C3D20E92A4454B21A4464B236803AEA0A2002200FCF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA60F20E939E52C9FA33D20E92A4454B41A4464B40A4555B0024565B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A4555B21A4565B20A4555B4024565B40FCF74C62A201A20A7304FE90A20022031532F9F9C0F20E939E52C9FA8384FE92A4454B61A4464B630502E9F36314FE938212C9F37394FE9008000E82A201A202A4656BF1A4666BF31532F9FA4314FE939E52C9FA5394FE90A4757BF024767BF31532F9FA1304FE939E52C9FA2384FE92A4353BF1A4363BF30502E9F9D314FE938212C9F9E394FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E98DFF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFADFF20EA008000E8583358CF693B69CF6BFF20EA57C0BFEA0080A0E90000D8EC23
+/* T2GZSAF */
+:04E8000000008A98E9008000E80080A0E90000D8ECFF80C0E9008000E80A4050BF2A4060BF324151BF3A4161BFC36BD36B008A98E9737BC8EC96E241047B43A0E87353A0E8ADEE239F00E0510490E261043146B1E85141E0EC3967B1E8000446E27363A0E86141E0EC310039008E8015EA100420046151E0EC2F4160EA312039201F42A0E82A4252BF0F52A0E81A4262BF1E5160EA737BC8EC0E6160EA324050BD224060BD124151BD3A4161BDBF2F0EBD97E27B723220222012203A203548B1E83D59B1E8463146BF563156BFB3E22D9F008000E8663166BF473947BF573957BF673967BF7F8007EA244120E935003D0000E02D7333720CE38D2F1EBD4375F8EC35203D2043432DDF53532DDFAE1E0EBD58E33366483548BF583558BF683568BF493D49BF593D59BF693D69BF63632DDF4D7DF8EC59E300E0B83833BF2D733076183A41E93F53A0E805803DEA3743A0E83D63A0E85070F8EC2B503CE91F0FBCE8008000E85978F8EC008000E815C020E915C020E915C020E915C020E91E1241E91A2241E9463746DF563F56DF2B403DE9663D66DF1D3241E9673D67DF473747DF573F57DF2A4020E9593F59DF163020E9693D69DF483748DF583F58DF683D68DF493749DF32322DDF22222DDF12122DDF3A3A2DDF0FCF74C237CF74C40A4454B0024464B03DCF74C0343720E931532F9F380F20E939E52C9F3C3D20E92A4454B21A4464B23A803AEA0A2002200FCF75C02A201A2030502E9F32315FE938212C9F33395FE93DCF75C237CF75C431532F9FA60F20E939E52C9FA33D20E92A4454B41A4464B40A4555B0024565B088735EE92A201A20A03720E90A20022031532F9F3E304FE939E52C9F3F384FE930502E9F3A314FE938212C9F3B394FE92A4555B21A4565B20A4555B4024565B40FCF74C62A201A20A7304FE90A20022031532F9F9C0F20E939E52C9FA8384FE92A4454B61A4464B630502E9F36314FE938212C9F37394FE90A4555B6024565B63DCF75C62A201A202A4656BF1A4666BF31532F9FA4314FE939E52C9FA5394FE9313D20E90A2002200A4757BF024767BF30502E9FA1304FE938212C9FA2384FE931532F9F9D314FE939E52C9F9E394FE92A4353BF1A4363BF30502E9F35304FE938212C9F39384FE90A4858BF024868BF31532F9F803157E939E52C9F813957E92A4959BF1A4969BF30502E9F823057E938212C9F833857E931532F9F84315EE939E52C9F85395EE9867657E98A3620E9877757E98B3EBFEA803057E9813857E9823157E9867857E9833957E9877957E9301F5FE98A3420E98B3C20E9375060BD570D20E9355161BD2B5020E91D37E1EA1E35E1EA00E00E77245120E989FF20EA160E20E9572EBFEA0B46A0E81B56A0E82B66A0E80C47A0E81C57A0E82C67A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC36D736AD2B8060EC0C1C60EC3ED73EAD2C8060EC0B2BDEE81B80DEE8368036BD3E803EBD33D70BBD3BD71BBD468046CF578057CF663366CF473B47CF563356CF673B67CF0B48A0E81B58A0E82B68A0E80C49A0E81C59A0E82C69A0E80B001B002B0000E00C001C002C0000E00B651B652B6500E00C651C652C6500E00B1B60EC34D734AD2B8060EC0C1C60EC3CD73CAD2C8060EC0B2BDEE81B80DEE8348034BD3C803CBD33D70BBD3BD71BBD488048CF598059CF683368CF493B49CFA9FF20EA008000E8583358CF693B69CF67FF20EA57C0BFEA0080A0E90000D8ECEE
+:0000000001FF
diff --git a/firmware/r128/r128_cce.bin.ihex b/firmware/r128/r128_cce.bin.ihex
new file mode 100644 (file)
index 0000000..4831315
--- /dev/null
@@ -0,0 +1,129 @@
+:1000000000000000108038000000000010003800E0
+:10001000000000020000008E0000000200000091BD
+:1000200000000000402E2423000000006062124FF8
+:10003000000000002E2B596D000000007677753E01
+:1000400000000000898984820000000023BC8B0D21
+:10005000000000002323232300000000238DABB405
+:1000600000000000232323230000000100B028002B
+:100070000000000100032800000000010004C0008F
+:100080000000000100030800000000023660300E8E
+:100090000000000B00040000000000000000000051
+:1000A000000000010200151D0000000100001D0EEF
+:1000B00000000001000039D900000001000019D73C
+:1000C0000000000C0000001C00000001000019D618
+:1000D0000000000C0000001C0000000200000017DF
+:1000E0000000000B01200000000000000100358A24
+:1000F0000000000100064000000000090000001E92
+:100100000000000108D015B4000000101910100004
+:100110000000000300002000000000000000280094
+:1001200000000001000308000000000100003D0E77
+:10013000000000010000C8000000000A0000882A3A
+:10014000000000090000002A000000010200150F55
+:1001500000000002000028240000000100003D65AE
+:100160000000000100003D66000000020000002BBE
+:100170000000000100F32DB4000000012200D8BFF0
+:100180000000000100E088BF0000000C1333383786
+:1001900000000001020615650000000C0000003799
+:1001A00000000001020015640000000100003D662F
+:1001B000000000020000002E000000040020083AA9
+:1001C0000000000100080800000000010006C0FF58
+:1001D000000000040040003D000000010007C800CE
+:1001E00000000001000700FF000000030000000005
+:1001F0000000000C0000005C000000020000002E67
+:100200000000000C000000B00000000100003D767E
+:100210000000000100032800000000010000480069
+:1002200000000001000208000000000106001D0E91
+:1002300000000001000248000000000100028800E8
+:100240000000000100F3C5F80000000100100000EC
+:10025000000000060030004E0000000100003D6379
+:100260000000001080303DF0000000021000384314
+:1002700000000002000028430000000C000000B055
+:100280000000000100003D760000000100003D7705
+:100290000000000100003D0E0000000100003D0FC5
+:1002A000000000010050280000000006003000524D
+:1002B0000000001080303DF00000000100003DF81B
+:1002C00000000002000000520000000100053D0E89
+:1002D0000000000100103D0F00000002003000553A
+:1002E0000000000100003D700000000100001E89B8
+:1002F0000000000100003D710000000300003D729D
+:100300000000000C0000005C000000020000006221
+:100310000000000100003F280000000100003F270E
+:100320000000000100003E820000000100003E8845
+:100330000000000100003E660000000100003E6772
+:100340000000000100003E760000000100003E6851
+:100350000000000100003E690000000100003E6C4A
+:100360000000000000003E6D0000000100002800B9
+:1003700000000001005028000000000100003D685E
+:100380000000000100030800000000060000006EED
+:10039000000000010002C0000000000106303D62C4
+:1003A0000000000200000070000000020030006F3A
+:1003B00000000000200038C0000000010001C0C0A3
+:1003C0000000000E0000007D0000000C0003287FEC
+:1003D00000000001020015BB0000000C00030880B3
+:1003E0000000000002003DBC0000000100003DBB19
+:1003F0000000000000003DBC00000003000480007D
+:100400000000000100048000000000030006C0029C
+:100410000000000100B0280000000000306038003B
+:100420000000000100C028000000000100B008002A
+:100430000000000100D600000000000712801086B6
+:10044000000000000000280000000001000039CC7E
+:1004500000000001000039CD00000001000039C992
+:1004600000000001000039CA00000000000039CB84
+:10047000000000011003B80000000001009000001F
+:100480000000000110003800000000010003080017
+:100490000000000100903D1B0000000140203D0ACB
+:1004A0000000000140203D0B00000001000880001A
+:1004B000000000010001C0C00000000E0000009F0D
+:1004C0000000000C000308800000000142203DBD38
+:1004D0000000000C0003087F0000000142003DBB4B
+:1004E0000000000C000308800000000142203DBC19
+:1004F00000000002000000A20000000140203DBDFD
+:100500000000000140003DBB0000000140203DBC58
+:1005100000000001000840000000000100A00000F1
+:1005200000000006003000A6000000101060380037
+:1005300000000009000000A80000000300400000C7
+:100540000000000300403D1D00000000000000000E
+:1005500000000000000001000000000E000000AEDE
+:10056000000000010001C0A900000001020015C741
+:100570000000000C000000B0000000000000280097
+:10058000000000010001C0AA00000001020015D215
+:10059000000000010001C0A900000003020015C70F
+:1005A0000000000100003E88000000010001C0BA08
+:1005B0000000000102001728000000010001C0BB7C
+:1005C000000000010200165A0000000000003E5B1F
+:1005D000000000000000010000000000000010000A
+:1005E000000000010006400B00000009000000BCF4
+:1005F00000000000000028000000000000000000D3
+:1006000000000000000000000000000000000000EA
+:1006100000000000000000000000000000000000DA
+:1006200000000000000000000000000000000000CA
+:1006300000000000000000000000000000000000BA
+:1006400000000000000000000000000000000000AA
+:10065000000000000000000000000000000000009A
+:10066000000000000000000000000000000000008A
+:10067000000000000000000000000000000000007A
+:10068000000000000000000000000000000000006A
+:10069000000000000000000000000000000000005A
+:1006A000000000000000000000000000000000004A
+:1006B000000000000000000000000000000000003A
+:1006C000000000000000000000000000000000002A
+:1006D000000000000000000000000000000000001A
+:1006E000000000000000000000000000000000000A
+:1006F00000000000000000000000000000000000FA
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
diff --git a/firmware/radeon/R100_cp.bin.ihex b/firmware/radeon/R100_cp.bin.ihex
new file mode 100644 (file)
index 0000000..151647b
--- /dev/null
@@ -0,0 +1,130 @@
+:1000000000000000210070000000000020007000CF
+:1000100000000004000000B400000004000000B86C
+:10002000000000006F5B4D4C000000004C4C427F14
+:10003000000000005B568A92000000004CA09C6DFE
+:1000400000000000AD4C4C4C000000004CE1AF3D06
+:1000500000000000D8AFAFAF00000000D64C4CDC71
+:10006000000000004CD10D1000000016000F000031
+:1000700000000000362F242D0000000400000012B4
+:1000800000000016000F000000000000362F282D91
+:1000900000000002000380E70000000204002C972B
+:1000A00000000016000F000100000000333A373056
+:1000B00000000002000077EF0000000200061000C0
+:1000C0000000001A000000210000001E0000400097
+:1000D00000000002000610000000001A00000021CD
+:1000E0000000001E0000400000000002000610009A
+:1000F0000000001A000000210000001E0000400067
+:100100000000000400000017000000020003802B24
+:1001100000000002040067E0000000040000001777
+:1001200000000002000077E000000002000650001E
+:1001300000000002000037E100000006040067E153
+:1001400000000002000077E000000002000077E1FC
+:1001500000000006000077E100000000FFFFFFFF45
+:100160000000000010000000000000020003802BCF
+:1001700000000006040067E0000000020000767541
+:100180000000000200007676000000020000767792
+:100190000000000600007678000000020003802CBA
+:1001A00000000002040026760000000200007677BE
+:1001B0000000000600007678000000180000002F04
+:1001C000000000180000002F0000000600000000E2
+:1001D000000000180000003000000018000000308F
+:1001E0000000000600000000000000020160500056
+:1001F000000000020006500000000002000980001C
+:1002000000000002000610000000000464C0603E10
+:1002100000000002000380E600000002040025C583
+:1002200000000016000800000000000000000000B0
+:10023000000000020400251D00000002000075807F
+:100240000000000200067581000000020400258005
+:100250000000000200067581000000040000004953
+:10026000000000000000500000000002000380E6D3
+:1002700000000002040025C5000000020006100076
+:10028000000000020000750E000000020001900056
+:10029000000000140001105500000012000000557D
+:1002A000000000020400250F000000040000504F71
+:1002B00000000002000380E600000002040025C5E3
+:1002C0000000000200007565000000020000756675
+:1002D000000000040000005800000002000380E657
+:1002E00000000002040025C50000000201E655B42C
+:1002F000000000024401B0E40000000201C110E46B
+:10030000000000182666706600000002040C2565D7
+:1003100000000018000000660000000204002564D0
+:100320000000000200007566000000040000005D8F
+:1003300000000008004010690000000200101000DA
+:1003400000000002000D80FF000000080080006C2B
+:1003500000000002000F900000000002000E00FFED
+:100360000000000600000000000000180000008FE0
+:10037000000000040000005B00000002000380E6B3
+:1003800000000002040025C5000000020000757690
+:100390000000000200065000000000020000900073
+:1003A0000000000200041000000000020C00350EE6
+:1003B0000000000200049000000000020005100090
+:1003C0000000000201E785F80000000200200000A4
+:1003D0000000000C0060007E000000020000756359
+:1003E00000000021006075F0000000042000707320
+:1003F000000000040000507300000002000380E6CB
+:1004000000000002040025C500000002000075760F
+:100410000000000200007577000000020000750E69
+:10042000000000020000750F0000000200A0500054
+:100430000000000C0060008300000021006075F0E7
+:1004400000000002000075F80000000400000083B6
+:1004500000000002000A750E00000002000380E6A2
+:1004600000000002040025C5000000020020750FF6
+:1004700000000004006000860000000200007570AB
+:100480000000000200007571000000060000757297
+:1004900000000002000380E600000002040025C501
+:1004A00000000002000050000000000200A0500008
+:1004B0000000000200007568000000020006100045
+:1004C0000000000C00000095000000020005800004
+:1004D000000000020C60756200000004000000973C
+:1004E00000000002000380E600000002040025C5B1
+:1004F000000000040060009600000000400070E56D
+:1005000000000002000380E600000002040025C590
+:1005100000000002000380E50000001C000000A8AD
+:1005200000000018000650AA00000002040025BBCD
+:1005300000000018000610AB00000000040075BCAD
+:1005400000000002000075BB00000000000075BC48
+:100550000000000600090000000000020009000081
+:1005600000000006000D800200000002000078324A
+:10057000000000020000500000000002000380E7BD
+:100580000000000204002C97000000020000782008
+:100590000000000200007821000000000000780048
+:1005A000000000020120000000000002200770008F
+:1005B0000000000201200000000000022000700086
+:1005C0000000000200061000000000020120751B60
+:1005D000000000028040750A000000028040750B98
+:1005E000000000020011000000000002000380E58E
+:1005F0000000001C000000C600000018000610AB40
+:1006000000000002844075BD00000018000610AA1A
+:1006100000000002840075BB00000018000610AB4B
+:1006200000000002844075BC00000004000000C906
+:1006300000000002804075BD00000002800075BB14
+:1006400000000002804075BC000000020010800025
+:1006500000000002014000000000000C006000CD1E
+:100660000000002020C0700000000012000000CF39
+:100670000000000600800000000000060080751DDC
+:100680000000000000000000000000020000775C95
+:100690000000000200A050000000000200661000F0
+:1006A000000000200460275D000000000000400002
+:1006B0000000000201E0083000000000210070008E
+:1006C000000000006464614D00000000696874204F
+:1006D00000000000000000730000000000000000A7
+:1006E000000000020000500000000002000380D063
+:1006F00000000002040025E000000000000075E199
+:10070000000000000000000100000002000380E083
+:1007100000000002040023940000000000005000CC
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000080000000000000004AD
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/R200_cp.bin.ihex b/firmware/radeon/R200_cp.bin.ihex
new file mode 100644 (file)
index 0000000..3a0bd73
--- /dev/null
@@ -0,0 +1,130 @@
+:1000000000000000210070000000000020007000CF
+:1000100000000004000000BF00000004000000C356
+:10002000000000007A685E5D000000005D5D55889C
+:100030000000000068659197000000005DA19F78B6
+:10004000000000005D5D5D5D000000005DEE5D5044
+:1000500000000000F2ACACAC00000000E75DF9E984
+:1000600000000000B1DD0E1100000000E2AFAFAFF4
+:1000700000000016000F000000000000452F232D97
+:10008000000000040000001300000016000F000034
+:1000900000000000452F272D00000016000F000172
+:1000A000000000003E4D4A3700000002000077EFDC
+:1000B00000000002000610000000001A00000020EE
+:1000C0000000001E000040000000000200061000BA
+:1000D0000000001A000000200000001E0000400088
+:1000E00000000002000610000000001A00000020BE
+:1000F0000000001E00004000000000040000001688
+:10010000000000020003802A00000002040067E0F3
+:10011000000000040000001600000002000077E06C
+:10012000000000020006500000000002000037E15D
+:1001300000000006040067E100000002000077E014
+:1001400000000002000077E100000006000077E1F7
+:1001500000000000FFFFFFFF000000001000000093
+:100160000000000007F007F0000000020003802AF2
+:1001700000000006040067E0000000020003802C7D
+:100180000000000204002741000000020400274193
+:100190000000000204002743000000020000767502
+:1001A0000000000200007676000000020000767772
+:1001B0000000000600007678000000020003802C9A
+:1001C0000000000204002741000000020400274153
+:1001D00000000002040027430000000200007676C1
+:1001E000000000020000767700000006000076782C
+:1001F000000000020003802B0000000204002676AD
+:100200000000000200007677000000020003802C4E
+:100210000000000204002741000000020400274300
+:100220000000000600007678000000020003802C29
+:1002300000000002040027410000000204002741E2
+:10024000000000020400274300000006000076784A
+:10025000000000180000002F000000180000002F10
+:100260000000000600000000000000180000003739
+:100270000000001800000037000000060000000029
+:100280000000000201605000000000020006500063
+:1002900000000002000980000000000200061000BB
+:1002A0000000000464C06051000000160008000057
+:1002B0000000000000000000000000020400251DF6
+:1002C0000000000200007580000000020006758139
+:1002D0000000000204002580000000020006758175
+:1002E000000000040000005A000000000000500060
+:1002F0000000000200061000000000020000750E61
+:1003000000000002000190000000001400011064D1
+:100310000000001200000064000000020400250F2D
+:10032000000000040000505E00000002000075653F
+:100330000000000200007566000000040000006577
+:100340000000000201E655B4000000024401B0F0D4
+:100350000000000201C110F0000000182666707154
+:1003600000000002040C2565000000180000007168
+:100370000000000204002564000000020000756611
+:100380000000000400000068000000080040107435
+:10039000000000020010100000000002000D80FFAD
+:1003A000000000080080007700000002000F9000AD
+:1003B00000000002000E00FF000000060000000028
+:1003C0000000001800000094000000040000006815
+:1003D00000000002000075760000000200065000D8
+:1003E0000000000200009000000000020004100065
+:1003F000000000020C00350E000000020004900016
+:1004000000000002000510000000000201E785F86E
+:1004100000000002002000000000000C00600087C7
+:10042000000000020000756300000021006075F00C
+:10043000000000042000707C000000040000507CDC
+:1004400000000002000075760000000200007577D1
+:10045000000000020000750E000000020000750F91
+:100460000000000200A050000000000C0060008AA4
+:1004700000000021006075F000000002000075F827
+:10048000000000040000008A00000002000A750E4F
+:10049000000000020020750F000000040060008DC5
+:1004A000000000020000757000000002000075717D
+:1004B00000000006000075720000000200005000FD
+:1004C0000000000200A0500000000002000075685B
+:1004D00000000002000610000000000C0000009860
+:1004E0000000000200058000000000020C60756240
+:1004F000000000040000009A000000040060009961
+:1005000000000000400070F100000002000380F1D4
+:100510000000001C000000A700000018000650A901
+:1005200000000002040025BB00000018000610AA0D
+:1005300000000000040075BC00000002000075BB54
+:1005400000000000000075BC00000006000900006B
+:10055000000000020009000000000006000D8002FB
+:10056000000000020000500000000002000078219E
+:100570000000000000007800000000020000782168
+:10058000000000000000780000000002016650003A
+:1005900000000002000A000000000002000671CC0A
+:1005A000000000020286F1CD00000010000000B73C
+:1005B00000000000210070000000001C000000BED0
+:1005C000000000020006500000000002000A0000C7
+:1005D000000000020006100000000002000B0000F6
+:1005E000000000023806700000000004000A00BA93
+:1005F0000000000020007000000000020120000048
+:10060000000000022007700000000002012000002E
+:100610000000000020007000000000020006100032
+:10062000000000020120751B000000028040750AD6
+:10063000000000028040750B000000020011000065
+:1006400000000002000380F10000001C000000D147
+:1006500000000018000610AA00000002844075BDCA
+:1006600000000018000610A900000002840075BBFD
+:1006700000000018000610AA00000002844075BCAB
+:1006800000000004000000D400000002804075BD9E
+:1006900000000002800075BB00000002804075BCB5
+:1006A0000000000200108000000000020140000075
+:1006B0000000000C006000D80000002020C0700086
+:1006C00000000012000000DA0000000600800000B8
+:1006D000000000060080751D00000002000025BB20
+:1006E00000000004000040D4000000020000775C1D
+:1006F0000000000200A05000000000020066100090
+:10070000000000200460275D0000000000004000A1
+:1007100000000002000079990000000200A05000D3
+:100720000000000200661000000000200460299B09
+:1007300000000000000040000000000201E008305E
+:1007400000000000210070000000000200005000C6
+:10075000000000020003805600000002040025E0B3
+:1007600000000000000075E1000000000000000132
+:1007700000000002000380ED0000000004007394FC
+:100780000000000000000000000000000000000069
+:1007900000000002000078C400000002000078C5DC
+:1007A00000000002000078C600000002000079246A
+:1007B00000000002000079250000000200007926F8
+:1007C00000000004000000F2000000020000792494
+:1007D00000000002000079250000000200007926D8
+:1007E00000000004000000F900000000000000000C
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/R300_cp.bin.ihex b/firmware/radeon/R300_cp.bin.ihex
new file mode 100644 (file)
index 0000000..d307d56
--- /dev/null
@@ -0,0 +1,130 @@
+:10000000000000004200E000000000004000E000AE
+:1000100000000008000000AE00000008000000B270
+:100020000000000067554B4A000000004A4A447532
+:100030000000000055527D83000000004A8C8B6553
+:10004000000000004AEF4AF6000000004AE14A4A78
+:1000500000000000E497979700000000DB4AEBDD0A
+:10006000000000009CCC4A4A00000000D1989898FB
+:10007000000000004A0F9AD600000004000CA00007
+:1000800000000038000D0012000000040000E8B479
+:1000900000000038000D0014000000040000E8B665
+:1000A00000000038000D0016000000040000E854B5
+:1000B00000000038000D0018000000040000E855A2
+:1000C00000000038000D001A000000040000E8568F
+:1000D00000000038000D001C000000040000E8577C
+:1000E00000000038000D001E000000040000E8249D
+:1000F00000000038000D0020000000040000E8258A
+:1001000000000038000D0022000000040000E8306C
+:1001100000000038000D0024000000040000F0C0C2
+:1001200000000038000D0026000000040000F0C1AF
+:1001300000000038000D0028000000040000F0411D
+:1001400000000038000D002A000000040000F184C7
+:1001500000000038000D002C000000040000F185B4
+:1001600000000038000D002E000000040000F186A1
+:1001700000000038000D0030000000040000F1878E
+:1001800000000038000D0032000000040000F18083
+:1001900000000038000D0034000000040000F3935C
+:1001A00000000038000D0036000000040000F38A53
+:1001B00000000038000D0038000000040000F38E3D
+:1001C000000000040000E821000000040140A0003D
+:1001D00000000018000000430000000400CCE8000C
+:1001E00000000004001B000100000004080048009B
+:1001F00000000004001B000100000004080048008B
+:1002000000000004001B000100000004080048007A
+:10021000000000080000003A000000000000A000FC
+:10022000000000042000451D000000040000E580DF
+:1002300000000004000CE581000000040800458077
+:1002400000000004000CE5810000000800000047E9
+:10025000000000000000A00000000004000C2000CE
+:10026000000000040000E50E000000040003200070
+:10027000000000280002205100000024000000516E
+:10028000000000040800450F000000080000A04B1B
+:10029000000000040000E565000000040000E566C1
+:1002A00000000008000000520000000403CCA5B4C8
+:1002B00000000004054320000000000400022000AC
+:1002C000000000304CCCE05E0000000408274565CB
+:1002D000000000300000005E0000000408004564DB
+:1002E000000000040000E566000000080000005562
+:1002F00000000010008020610000000400202000A9
+:1003000000000004001B00FF00000010010000645A
+:1003100000000004001F200000000004001C00FF7B
+:100320000000000C00000000000000300000008011
+:100330000000000800000055000000040000E57601
+:1003400000000004000CA0000000000400012000D8
+:100350000000000400082000000000041800650EE2
+:10036000000000040009200000000004000A200032
+:1003700000000004000F0000000000040040000026
+:100380000000001800000074000000040000E56395
+:10039000000000C200C0E5F900000008000000698C
+:1003A000000000080000A069000000040000E576DD
+:1003B000000000040000E577000000040000E50EE6
+:1003C000000000040000E50F000000040140A00050
+:1003D0000000001800000077000000C200C0E5F92E
+:1003E0000000000800000077000000040014E50E83
+:1003F000000000040040E50F0000000800C0007A83
+:10040000000000040000E570000000040000E57139
+:100410000000000C0000E572000000040000A000D5
+:10042000000000040140A000000000040000E56896
+:1004300000000004000C20000000001800000084F0
+:1004400000000004000B00000000000418C0E5627A
+:1004500000000008000000860000000800C00085C1
+:1004600000000004000700E30000003800000092D4
+:1004700000000030000CA09400000004080045BB00
+:1004800000000030000C2095000000000800E5BCD2
+:10049000000000040000E5BB000000000000E5BC17
+:1004A0000000000C00120000000000040012000018
+:1004B0000000000C001B0002000000040000A0006F
+:1004C000000000040000E821000000000000E80037
+:1004D000000000040000E821000000000000E82EF9
+:1004E0000000000402CCA000000000040014000082
+:1004F00000000004000CE1CC00000004050DE1CD7B
+:10050000000000040040000000000018000000A4EB
+:100510000000000400C0A00000000008000000A1CE
+:1005200000000020000000A6000000004200E000E3
+:1005300000000038000000AD00000004000CA00026
+:10054000000000040014000000000004000C200063
+:10055000000000040016000000000004700CE00021
+:1005600000000008001400A9000000004000E000A6
+:10057000000000040240000000000004400EE00003
+:100580000000000402400000000000004000E00005
+:1005900000000004000C2000000000040240E51BE5
+:1005A000000000050080E50A000000050080E50B62
+:1005B000000000040022000000000004000700E327
+:1005C00000000038000000C000000030000C209542
+:1005D000000000050880E5BD00000030000C2094FC
+:1005E000000000050800E5BB00000030000C20956D
+:1005F000000000050880E5BC00000008000000C302
+:10060000000000050080E5BD000000050000E5BB1E
+:10061000000000050080E5BC00000004002100008F
+:1006200000000004028000000000001800C000C7A5
+:10063000000000404180E00000000024000000C9EC
+:100640000000000C010000000000000C0100E51D8E
+:1006500000000004000045BB00000008000080C34B
+:10066000000000040000F3CE000000040140A000E0
+:100670000000000400CC20000000004008C053CF60
+:100680000000000000008000000000040000F3D221
+:10069000000000040140A0000000000400CC200085
+:1006A0000000004008C053D300000000000080009C
+:1006B000000000040000F39D000000040140A000C1
+:1006C0000000000400CC20000000004008C0539E41
+:1006D00000000000000080000000000403C008309B
+:1006E000000000004200E000000000040000A00044
+:1006F00000000004200045E0000000000000E5E1EB
+:10070000000000000000000100000004000700E0FD
+:10071000000000000800E39400000000000000005A
+:10072000000000040000E8C4000000040000E8C568
+:10073000000000040000E8C6000000040000E928F2
+:10074000000000040000E929000000040000E92A7C
+:1007500000000008000000E4000000040000E92898
+:10076000000000040000E929000000040000E92A5C
+:1007700000000008000000EB0000000402C02000A0
+:10078000000000040006000000000034000000F338
+:1007900000000008000000F00000000400008000DD
+:1007A00000000000C000E0000000000000000000A9
+:1007B00000000004000C200000000004001D0018D0
+:1007C00000000004001A000100000034000000FBDB
+:1007D000000000080000004A000000080500A04AD0
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/R420_cp.bin.ihex b/firmware/radeon/R420_cp.bin.ihex
new file mode 100644 (file)
index 0000000..3815891
--- /dev/null
@@ -0,0 +1,130 @@
+:10000000000000004200E000000000004000E000AE
+:100010000000000800000099000000080000009D9A
+:10002000000000004A554B4A000000004A4A44675D
+:100030000000000055526F75000000004A7E7D658B
+:1000400000000000D9D3DFF6000000004AC54A4A8C
+:1000500000000000C882828200000000BF4ACFC1B9
+:100060000000000087B04A4A00000000B583838387
+:10007000000000004A0F85BA00000004000CA00038
+:1000800000000038000D0012000000040000E8B479
+:1000900000000038000D0014000000040000E8B665
+:1000A00000000038000D0016000000040000E854B5
+:1000B00000000038000D0018000000040000E855A2
+:1000C00000000038000D001A000000040000E8568F
+:1000D00000000038000D001C000000040000E8577C
+:1000E00000000038000D001E000000040000E8249D
+:1000F00000000038000D0020000000040000E8258A
+:1001000000000038000D0022000000040000E8306C
+:1001100000000038000D0024000000040000F0C0C2
+:1001200000000038000D0026000000040000F0C1AF
+:1001300000000038000D0028000000040000F0411D
+:1001400000000038000D002A000000040000F184C7
+:1001500000000038000D002C000000040000F185B4
+:1001600000000038000D002E000000040000F186A1
+:1001700000000038000D0030000000040000F1878E
+:1001800000000038000D0032000000040000F18083
+:1001900000000038000D0034000000040000F3935C
+:1001A00000000038000D0036000000040000F38A53
+:1001B00000000038000D0038000000040000F38E3D
+:1001C000000000040000E821000000040140A0003D
+:1001D00000000018000000430000000400CCE8000C
+:1001E00000000004001B000100000004080048009B
+:1001F00000000004001B000100000004080048008B
+:1002000000000004001B000100000004080048007A
+:10021000000000080000003A000000000000A000FC
+:10022000000000042000451D000000040000E580DF
+:1002300000000004000CE581000000040800458077
+:1002400000000004000CE5810000000800000047E9
+:10025000000000000000A00000000004000C2000CE
+:10026000000000040000E50E000000040003200070
+:10027000000000280002205100000024000000516E
+:10028000000000040800450F000000080000A04B1B
+:10029000000000040000E565000000040000E566C1
+:1002A00000000008000000520000000403CCA5B4C8
+:1002B00000000004054320000000000400022000AC
+:1002C000000000304CCCE05E0000000408274565CB
+:1002D000000000300000005E0000000408004564DB
+:1002E000000000040000E566000000080000005562
+:1002F00000000010008020610000000400202000A9
+:1003000000000004001B00FF00000010010000645A
+:1003100000000004001F200000000004001C00FF7B
+:100320000000000C0000000000000030000000721F
+:100330000000000800000055000000040000E57601
+:10034000000000040000E577000000040000E50E56
+:10035000000000040000E50F000000040140A000C0
+:100360000000001800000069000000C200C0E5F9AC
+:100370000000000800000069000000040014E50E01
+:10038000000000040040E50F0000000800C0006C01
+:10039000000000040000E570000000040000E571AA
+:1003A0000000000C0000E572000000040000A00046
+:1003B000000000040140A000000000040000E56807
+:1003C00000000004000C200000000018000000766F
+:1003D00000000004000B00000000000418C0E562EB
+:1003E00000000008000000780000000800C000774E
+:1003F00000000004000700C7000000380000008073
+:10040000000000040000E5BB000000000000E5BCA7
+:10041000000000040000A000000000040000E8212B
+:10042000000000000000E800000000040000E821D7
+:10043000000000000000E82E0000000402CCA00034
+:10044000000000040014000000000004000CE1CCD7
+:1004500000000004050DE1CD000000040040000094
+:10046000000000180000008F0000000400C0A00081
+:10047000000000080000008C000000200000009137
+:10048000000000004200E00000000038000000987A
+:1004900000000004000CA000000000040014000094
+:1004A00000000004000C2000000000040016000002
+:1004B00000000004700CE00000000008001400942C
+:1004C000000000004000E0000000000402400000C6
+:1004D00000000004400EE0000000000402400000A4
+:1004E000000000004000E00000000004000C2000BC
+:1004F000000000040240E51B000000050080E50A42
+:10050000000000050080E50B000000040022000050
+:1005100000000004000700C700000038000000A42D
+:10052000000000050080E5BD000000050000E5BBFF
+:10053000000000050080E5BC000000040021000070
+:1005400000000004028000000000001800C000ABA2
+:10055000000000404180E00000000024000000ADE9
+:100560000000000C010000000000000C0100E51D6F
+:1005700000000004000045BB00000008000080A748
+:10058000000000040000F3CE000000040140A000C1
+:100590000000000400CC20000000004008C053CF41
+:1005A0000000000000008000000000040000F3D202
+:1005B000000000040140A0000000000400CC200066
+:1005C0000000004008C053D300000000000080007D
+:1005D000000000040000F39D000000040140A000A2
+:1005E0000000000400CC20000000004008C0539E22
+:1005F00000000000000080000000000403C008307C
+:10060000000000004200E000000000040000A00024
+:1006100000000004200045E0000000000000E5E1CB
+:10062000000000000000000100000004000700C4FA
+:10063000000000000800E39400000000000000003B
+:10064000000000040000E8C4000000040000E8C549
+:10065000000000040000E8C6000000040000E928D3
+:10066000000000040000E929000000040000E92A5D
+:1006700000000008000000C8000000040000E92895
+:10068000000000040000E929000000040000E92A3D
+:1006900000000008000000CF0000000402C020009D
+:1006A000000000040006000000000034000000D735
+:1006B00000000008000000D40000000400008000DA
+:1006C00000000000C000E000000000040000E1CCD9
+:1006D000000000040500E1CD00000004000CA000B3
+:1006E00000000034000000DE00000008000000DA16
+:1006F000000000000000A000000000040019E1CC90
+:1007000000000004001B0001000000040500A00020
+:1007100000000004080041CD00000004000CA0000F
+:1007200000000034000000FB000000080000004A48
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B00000000004000C200000000004001D0018D0
+:1007C00000000004001A000100000034000000FBDB
+:1007D000000000080000004A000000080500A04AD0
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/R520_cp.bin.ihex b/firmware/radeon/R520_cp.bin.ihex
new file mode 100644 (file)
index 0000000..372ff82
--- /dev/null
@@ -0,0 +1,130 @@
+:10000000000000004200E000000000004000E000AE
+:100010000000000800000099000000080000009D9A
+:10002000000000004A554B4A000000004A4A44675D
+:100030000000000055526F75000000004A7E7D658B
+:1000400000000000E0DAE6F6000000004AC54A4A77
+:1000500000000000C882828200000000BF4ACFC1B9
+:100060000000000087B04AD500000000B5838383FC
+:10007000000000004A0F85BA00000004000CA00038
+:1000800000000038000D0012000000040000E8B479
+:1000900000000038000D0014000000040000E8B665
+:1000A00000000038000D0016000000040000E854B5
+:1000B00000000038000D0018000000040000E855A2
+:1000C00000000038000D001A000000040000E8568F
+:1000D00000000038000D001C000000040000E8577C
+:1000E00000000038000D001E000000040000E8249D
+:1000F00000000038000D0020000000040000E8258A
+:1001000000000038000D0022000000040000E8306C
+:1001100000000038000D0024000000040000F0C0C2
+:1001200000000038000D0026000000040000F0C1AF
+:1001300000000038000D0028000000040000E0006E
+:1001400000000038000D002A000000040000E0005C
+:1001500000000038000D002C000000040000E0004A
+:1001600000000038000D002E000000040000E00038
+:1001700000000038000D0030000000040000E00026
+:1001800000000038000D0032000000040000F18083
+:1001900000000038000D0034000000040000F3935C
+:1001A00000000038000D0036000000040000F38A53
+:1001B00000000038000D0038000000040000F38E3D
+:1001C000000000040000E821000000040140A0003D
+:1001D00000000018000000430000000400CCE8000C
+:1001E00000000004001B000100000004080048009B
+:1001F00000000004001B000100000004080048008B
+:1002000000000004001B000100000004080048007A
+:10021000000000080000003A000000000000A000FC
+:10022000000000042000451D000000040000E580DF
+:1002300000000004000CE581000000040800458077
+:1002400000000004000CE5810000000800000047E9
+:10025000000000000000A00000000004000C2000CE
+:10026000000000040000E50E000000040003200070
+:10027000000000280002205100000024000000516E
+:10028000000000040800450F000000080000A04B1B
+:10029000000000040000E565000000040000E566C1
+:1002A00000000008000000520000000403CCA5B4C8
+:1002B00000000004054320000000000400022000AC
+:1002C000000000304CCCE05E0000000408274565CB
+:1002D000000000300000005E0000000408004564DB
+:1002E000000000040000E566000000080000005562
+:1002F00000000010008020610000000400202000A9
+:1003000000000004001B00FF00000010010000645A
+:1003100000000004001F200000000004001C00FF7B
+:100320000000000C0000000000000030000000721F
+:100330000000000800000055000000040000E57601
+:10034000000000040000E577000000040000E50E56
+:10035000000000040000E50F000000040140A000C0
+:100360000000001800000069000000C200C0E5F9AC
+:100370000000000800000069000000040014E50E01
+:10038000000000040040E50F0000000800C0006C01
+:10039000000000040000E570000000040000E571AA
+:1003A0000000000C0000E572000000040000A00046
+:1003B000000000040140A000000000040000E56807
+:1003C00000000004000C200000000018000000766F
+:1003D00000000004000B00000000000418C0E562EB
+:1003E00000000008000000780000000800C000774E
+:1003F00000000004000700C7000000380000008073
+:10040000000000040000E5BB000000000000E5BCA7
+:10041000000000040000A000000000040000E8212B
+:10042000000000000000E800000000040000E821D7
+:10043000000000000000E82E0000000402CCA00034
+:10044000000000040014000000000004000CE1CCD7
+:1004500000000004050DE1CD000000040040000094
+:10046000000000180000008F0000000400C0A00081
+:10047000000000080000008C000000200000009137
+:10048000000000004200E00000000038000000987A
+:1004900000000004000CA000000000040014000094
+:1004A00000000004000C2000000000040016000002
+:1004B00000000004700CE00000000008001400942C
+:1004C000000000004000E0000000000402400000C6
+:1004D00000000004400EE0000000000402400000A4
+:1004E000000000004000E00000000004000C2000BC
+:1004F000000000040240E51B000000050080E50A42
+:10050000000000050080E50B000000040022000050
+:1005100000000004000700C700000038000000A42D
+:10052000000000050080E5BD000000050000E5BBFF
+:10053000000000050080E5BC000000040021000070
+:1005400000000004028000000000001800C000ABA2
+:10055000000000404180E00000000024000000ADE9
+:100560000000000C010000000000000C0100E51D6F
+:1005700000000004000045BB00000008000080A748
+:10058000000000040000F3CE000000040140A000C1
+:100590000000000400CC20000000004008C053CF41
+:1005A0000000000000008000000000040000F3D202
+:1005B000000000040140A0000000000400CC200066
+:1005C0000000004008C053D300000000000080007D
+:1005D000000000040000F39D000000040140A000A2
+:1005E0000000000400CC20000000004008C0539E22
+:1005F00000000000000080000000000403C008307C
+:10060000000000004200E000000000040000A00024
+:1006100000000004200045E0000000000000E5E1CB
+:10062000000000000000000100000004000700C4FA
+:10063000000000000800E39400000000000000003B
+:10064000000000040000E8C4000000040000E8C549
+:10065000000000040000E8C6000000040000E928D3
+:10066000000000040000E929000000040000E92A5D
+:1006700000000008000000C8000000040000E92895
+:10068000000000040000E929000000040000E92A3D
+:1006900000000008000000CF00000000DEADBEEF4B
+:1006A000000000000000011600000004000700D355
+:1006B00000000004080050E700000004000700D418
+:1006C000000000040800401C000000000000E01DC5
+:1006D0000000000402C0200000000004000600002A
+:1006E00000000034000000DE00000008000000DB15
+:1006F000000000040000800000000000C000E000D6
+:10070000000000040000E1CC000000040500E1CD81
+:1007100000000004000CA00000000034000000E510
+:1007200000000008000000E1000000000000A00040
+:10073000000000040019E1CC00000004001B0001CF
+:10074000000000040500A00000000004080041CDE6
+:1007500000000004000CA00000000034000000FBBA
+:10076000000000080000004A000000000000000037
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B00000000004000C200000000004001D0018D0
+:1007C00000000004001A000100000034000000FBDB
+:1007D000000000080000004A000000080500A04AD0
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/R600_me.bin.ihex b/firmware/radeon/R600_me.bin.ihex
new file mode 100644 (file)
index 0000000..30d4c14
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A0000060441100000614000000000060000021
+:1000B000000005B20000000000600000000005C55F
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E0000000000000000020002036250000000075
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000003100204A2D82
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000002100203625C1
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001D00200E2D54
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001D12
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000300020362407
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:1003800000000000000000100020362300000000E4
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E230000000000000011C7
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000003000204A2D0000000046
+:1003F0000000000000204811000000000000003252
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A0000000000000204804000000000000002DB2
+:1005B0000020162D0000000000000000002F00A306
+:1005C00000000000000000000CC0000000000080DF
+:1005D0000000002E0020162D00000000000000008A
+:1005E000002F00A400000000000000000CC000006C
+:1005F00000000081000000000040000000000087B3
+:100600000000002D00203623000000000000002E16
+:1006100000203624000000000000001D00201E2DD8
+:10062000000000000000000200210227000000007E
+:100630000000000014E0000000000087000000003F
+:1006400000600000000005ED0000000000600000F8
+:10065000000005E10000000200210E220000000061
+:100660000000000014C000000000008A0000001814
+:10067000C040362000000090000000002EE0000086
+:100680000000008E000000002CE000000000008D43
+:100690000000000200400E2D0000008F000000034B
+:1006A00000400E2D0000008F0000000C00200E2DD9
+:1006B00000000000000000180020362300000000A9
+:1006C0000000000300210E220000000000000000D6
+:1006D00014C00000000000950000A00C0020441190
+:1006E0000000000000000000C020480000000000E2
+:1006F00000000000C04048000000009D0000A00C69
+:1007000000204411000000000000000000204811FB
+:1007100000000000000000002EE000000000009B30
+:10072000000000002CE000000000009A0000000221
+:1007300000400E2D0000009C0000000300400E2D24
+:100740000000009C0000000C00200E2D00000000A6
+:10075000000000000020480300000000000000002E
+:10076000003A0C0200000000003F000000280E23A9
+:10077000000000000000001000210E230000000017
+:100780000000001300203623000000000000001EBF
+:100790000021022B000000000000000014C0000037
+:1007A000000000A40000001CC02036200000000053
+:1007B0000000001F0021022B0000000000000000CC
+:1007C00014C00000000000A70000001BC02036205D
+:1007D000000000000000000800210E2B00000000B7
+:1007E0000000007F00280E23000000000000000031
+:1007F000002F022300000000000000000CE00000B9
+:10080000000000DB000000002700000000000000E6
+:1008100000000000006000000000028C8100000069
+:1008200000204411000000000000000600204811D4
+:10083000000000000000000C00221E30000000003C
+:100840009980000000204411000000000000000416
+:100850000020122D000000000000000800221224D9
+:10086000000000000000001000201811000000002F
+:100870000000000000291CE400000000000000004F
+:1008800000604807000001289B0000000020441180
+:1008900000000000000000000020480200000000EE
+:1008A0009C00000000204411000000000000000037
+:1008B0000033146F000000000000000100333E23ED
+:1008C0000000000000000000D90048000000000007
+:1008D0000000000000203C05000000008100000036
+:1008E00000204411000000000000000E002048110C
+:1008F00000000000000000000020101000000000B8
+:100900000000E00700204411000000000000000F7C
+:100910000021022B000000000000000014C00000B5
+:10092000000000C500F8FF0800204811000000008A
+:100930009800000000404811000000D6000000F0C0
+:1009400000280E2200000000000000A0002F02235B
+:1009500000000000000000000CC00000000000D4F7
+:100960000000001300200E2D000000000000000118
+:10097000002F022300000000000000000CE0000037
+:10098000000000CF00000002002F02230000000042
+:10099000000000000CE00000000000CE00003F005E
+:1009A00000400C11000000D000001F0000400C119E
+:1009B000000000D000000F0000200C11000000001B
+:1009C0000038000900294A23000000003F00000011
+:1009D00000280E2B000000000000000200220E2361
+:1009E000000000000000000700494A23000000D674
+:1009F00000380F09002048110000000068000007BF
+:100A000000204811000000000000000800214A27D3
+:100A1000000000000000000000204811000000005D
+:100A2000060A020000294A2400000000000000001D
+:100A300000204811000000000000000000204811C4
+:100A4000000000000000A20200204411000000008D
+:100A500000FF000000284A220000000000000030D3
+:100A600000200E2D000000000000002E0020122D9E
+:100A70000000000000000000002F008300000000C4
+:100A8000000000000CE00000000000E30000000097
+:100A900000600000000005E70000000000400000CA
+:100AA000000000E40000000000600000000005EA13
+:100AB000000000070020222D0000000000000005BB
+:100AC00000220E22000000000010000000280E236B
+:100AD0000000000000000000002920680000000065
+:100AE00000000000003A0C0200000000000000EFCF
+:100AF00000280E23000000000000000000292068EC
+:100B0000000000000000001D00200E2D000000006D
+:100B1000000000030021022300000000000000008C
+:100B200014E00000000000F10000000B002102288A
+:100B3000000000000000000014C00000000000F1F0
+:100B40000000040000292228000000000000001A14
+:100B500000203628000000000000001C00210E22AA
+:100B6000000000000000000014C00000000000F6BB
+:100B70000000A30C00204411000000000000000051
+:100B800000204811000000000000001E00210E227D
+:100B9000000000000000000014C00000000001047C
+:100BA0000000A30F0020441100000000000000130B
+:100BB00000200E2D0000000000000001002F022385
+:100BC00000000000000000000CC00000000000FD5C
+:100BD000FFFFFFFF00404811000001040000000279
+:100BE000002F022300000000000000000CC00000E5
+:100BF000000001000000FFFF004048110000010458
+:100C000000000004002F022300000000000000008C
+:100C10000CC0000000000103000000FF004048116C
+:100C20000000010400000001002048110000000045
+:100C30000002C40000204411000000000000001F5A
+:100C400000210E22000000000000000014C000007F
+:100C50000000010B0000001040210E2000000000E9
+:100C600000000019002036230000000000000018DA
+:100C700040224A200000000000000010C0424A202C
+:100C80000000010D0000000000200C110000000019
+:100C900000000019002036230000000000000000C2
+:100CA0000020481100000000000000000020481152
+:100CB000000000000000000A0020101100000000E9
+:100CC00000000000002F02240000000000000000CF
+:100CD0000CE000000000011400000000002048119A
+:100CE0000000000000000001005312240000011069
+:100CF000FFBFFFFF00283A2E000000000000001B8D
+:100D000000210222000000000000000014C00000CA
+:100D100000000127810000000020441100000000B5
+:100D20000000000D00204811000000000000001825
+:100D300000220E3000000000FC00000000280E23FE
+:100D400000000000810000000020441100000000AD
+:100D50000000000E0020481100000000000000000C
+:100D600000201010000000000000E00E00204411E0
+:100D70000000000007F8FF080020481100000000F4
+:100D80000000000000294A230000000000000024A9
+:100D900000201E2D000000000000000800214A274E
+:100DA00000000000000000000020481100000000CA
+:100DB000060A020000294A2400000000000000008A
+:100DC0000020481100000000000000000020481131
+:100DD0000000000000000000008000000000000093
+:100DE000810000000020441100000000000000010C
+:100DF00000204811000000000000217C0020441168
+:100E000000000000008000000020481100000000E9
+:100E1000000000000020480600000000000000085C
+:100E200000214A2700000000000000001700000019
+:100E3000000000000004217F00604411000006143F
+:100E40000000001F00210230000000000000000030
+:100E500014C00000000006130000000400404C1104
+:100E60000000012E00000000006000000000000BE8
+:100E70000000000000600411000002FE00000000FD
+:100E800000200411000000000000000000600811B4
+:100E90000000019F00000000006000000000015100
+:100EA0000000FFFF40280E2000000000000000109E
+:100EB000C0211220000000000000FFFF4028062093
+:100EC0000000000000000010C0210A200000000007
+:100ED0000000000000341461000000000000000069
+:100EE00000741882000002A40001A1FD00604411FA
+:100EF000000002C900003FFF002F022F0000000089
+:100F0000000000000CC000000000013800000000DC
+:100F1000C04004000000000100000000006000006C
+:100F20000000000B0000000000600411000002FE41
+:100F3000000000000020041100000000000000007C
+:100F4000006008110000019F00003FFF002F022FEA
+:100F500000000000000000000CE0000000000000A5
+:100F600000000000006000000000015100000010BF
+:100F700040210E20000000000000FFFFC0281220CA
+:100F800000000000000000104021162000000000BA
+:100F90000000FFFFC0681A20000002A40001A1FDAC
+:100FA00000604411000002C900003FFF002F022F23
+:100FB00000000000000000000CC00000000001491B
+:100FC00000000000C0400400000000010000225C9E
+:100FD00000204411000000000000000100300A2F32
+:100FE000000000000000000100210A2200000000B3
+:100FF0000000000300384A220000000000002256D2
+:1010000000204411000000000000001A00204811D8
+:10101000000000000000A1FC0020441100000000BE
+:1010200000000001008048110000000000000000E6
+:10103000006000000000000B0000000000600000E5
+:101040000000017C00000000006000000000018D35
+:1010500000003FFF002F022F0000000000000000F2
+:101060000CE00000000000000000000000202C0840
+:10107000000000000000000000202411000000001B
+:10108000000000000020281100000000000022568F
+:10109000002044110000000000000016002048114C
+:1010A000000000000000225C00204411000000004D
+:1010B00000000003002048110000000093800000A1
+:1010C00000204411000000000000000200221E2940
+:1010D0000000000000000000007048EB00000189E3
+:1010E0000000000000600000000002A400000001F9
+:1010F000403306200000000000000000C03024093A
+:101100000000000000003FFF002F022F0000000041
+:10111000000000000CE000000000000000000000E3
+:10112000006000000000028C9500000000204411C7
+:101130000000000000000000002F0221000000005D
+:10114000000000000CE0000000000173000000003F
+:10115000C0204800000000000000000100530621EC
+:101160000000016F92000000002044110000000008
+:1011700000000000C0604800000001840001A1FDE3
+:101180000020441100000000000000130020062D84
+:1011900000000000000000000078042A000002E4C3
+:1011A00000000000002028090000000000003FFFB0
+:1011B000002F022F00000000000000000CC0000003
+:1011C0000000016500000000C040040000000001B4
+:1011D0000000021000600411000002FE00003FFF4A
+:1011E000002F022F00000000000000000CE00000B3
+:1011F000000001810000001BC0203620000000001C
+:101200000000001CC0203620000000003F800000CD
+:1012100000200411000000004600000000600811DA
+:101220000000019F0000000000800000000000009E
+:101230000000A1FC002044110000000000003FFF5E
+:10124000002F022F00000000000000000CC0000072
+:10125000000001880000000100804811000000002B
+:101260000000002100804811000000000000FFFF86
+:1012700040280E200000000000000010C0211220B5
+:10128000000000000000FFFF4028162000000000C2
+:1012900000000010C0811A20000000008100000042
+:1012A000002044110000000000000006002048114A
+:1012B000000000000000000800221E3000000000B6
+:1012C0000000003200201A2D000000000000E000A5
+:1012D0000020441100000000FFFBFF09002048111E
+:1012E00000000000000000110020222D000000007E
+:1012F00000001FFF00294A2800000000000000062F
+:101300000020222D0000000000000000002920E83D
+:10131000000000000000000000204808000000005D
+:10132000000000000020481100000000060A020032
+:1013300000294A260000000000000000002048119B
+:101340000000000000000000002048110000000024
+:10135000000001000020181100000000000000083B
+:1013600000621E28000001280000000800822228D8
+:10137000000000000002C000002044110000000036
+:101380000000001B00600E2D000001AA0000001CE0
+:1013900000600E2D000001AA0000C00800204411CA
+:1013A000000000000000001D00200E2D00000000C5
+:1013B0000000000014C00000000001A600000000B2
+:1013C000002004110000000000000000002048017F
+:1013D000000000003900000000204811000000005B
+:1013E0000000000000204811000000000000000084
+:1013F00000804802000000000000002000202E2D88
+:101400000000000000000000003B0D630000000031
+:101410000000000800224A23000000000000001025
+:1014200000224A23000000000000001800224A2386
+:1014300000000000000000000080480300000000E1
+:1014400000000000006000000000000B0000100021
+:1014500000600411000002FE0000000000200411E2
+:101460000000000000000000006008110000019F63
+:10147000000000070021062F0000000000000019F6
+:1014800000200A2D000000000000000100202C11A7
+:10149000000000000000FFFF4028222000000000A4
+:1014A0000000000F002622280000000000000010AD
+:1014B00040212620000000000000000F0026262901
+:1014C00000000000000000000020280200000000D2
+:1014D0000000225600204411000000000000001B04
+:1014E000002048110000000000000000002F022131
+:1014F00000000000000000000CE00000000001CD32
+:101500000000225C00204411000000000000008167
+:1015100000204811000000000000A1FC0020441140
+:101520000000000000000001002048110000000041
+:101530000000008000201C110000000000000000DE
+:10154000002F022700000000000000000CE0000057
+:10155000000001C90000000000600000000001D68A
+:101560000000000100531E27000001C5000000011B
+:1015700000202C11000000000000001F00280A229B
+:10158000000000000000001F00282A2A00000000C0
+:101590000000000100530621000001BE0000225C93
+:1015A00000204411000000000000000200304A2F1B
+:1015B000000000000000A1FC002044110000000019
+:1015C00000000001002048110000000000000001A0
+:1015D00000301E2F0000000000000000002F022736
+:1015E00000000000000000000CE00000000000000F
+:1015F0000000000000600000000001D600000001B3
+:1016000000531E27000001D20000FFFF40280E20DB
+:10161000000000000000000F00260E230000000064
+:1016200000000010C0211220000000000000000F88
+:101630000026122400000000000000000020141109
+:10164000000000000000000000601811000002A46B
+:101650000001A1FD00204411000000000000000076
+:10166000002F022B00000000000000000CE0000032
+:10167000000001E500000010002216280000000014
+:10168000FFFF000000281625000000000000FFFFFB
+:1016900000281A290000000000000000002948C5A9
+:1016A00000000000000000000020480A00000000C8
+:1016B0000000000000202C110000000000000010BD
+:1016C0000022162300000000FFFF0000002816255E
+:1016D000000000000000FFFF00281A2400000000A6
+:1016E00000000000002948C50000000000000000C4
+:1016F00000731503000001F200000000002018052F
+:10170000000000000000000000731524000001F23A
+:1017100000000000002D14C50000000000000000C3
+:10172000003008A200000000000000000020480275
+:10173000000000000000000000202802000000005F
+:101740000000000000202003000000000000000056
+:1017500000802404000000000000000F002102258A
+:10176000000000000000000014C00000000006138C
+:1017700000000000002B1405000000000000000124
+:10178000009016250000000000000000006000002E
+:101790000000000B0000000000600411000002FEC9
+:1017A0000000000000200411000000000000000004
+:1017B000006008110000019F000022560020441123
+:1017C000000000000000001A00294A22000000006A
+:1017D00000000000C02000000000000000003FFFEB
+:1017E000002F022F00000000000000000CE00000AD
+:1017F0000000000000000000C02004000000000005
+:101800000000225C002044110000000000000003E2
+:1018100000384A21000000000000A1FC0020441113
+:10182000000000000000000100204811000000003E
+:101830000000FFFF40281220000000000000001000
+:10184000C0211A20000000000000FFFF40280E20E9
+:101850000000000000000010C02116200000000061
+:101860000000000000741465000002A40001A1FD46
+:1018700000604411000002C900000001003306218D
+:101880000000000000000000002F02210000000006
+:10189000000000000CC000000000020600003FFF36
+:1018A000002F022F00000000000000000CC000000C
+:1018B000000001FF00000000C04004000000000123
+:1018C0000000000000600000000005C500000000EE
+:1018D0000040040F00000200000000000060000053
+:1018E000000005B20000000000600000000005C517
+:1018F0000000021000600411000002FE0000000061
+:10190000006000000000018D000000000060000089
+:10191000000001890000000000600000000002A437
+:1019200000000000006000000000028C93800000B6
+:1019300000204411000000000000000000204808C2
+:10194000000000009500000000204411000000008D
+:1019500000000000002F022F000000000000000027
+:101960000CE000000000021F00000000C040480022
+:101970000000021C92000000002044110000000042
+:1019800000000000C02048000000000000002256B7
+:101990000020441100000000000000160020481143
+:1019A000000000000000225C002044110000000044
+:1019B0000000000300204811000000000000A1FC0E
+:1019C0000020441100000000000000010020481128
+:1019D000000000000001A1FD0020441100000000F3
+:1019E0000000000000600411000002E4000000009C
+:1019F000C040040000000001000000000060000082
+:101A0000000005B20000A00C0020441100000000FE
+:101A100000000000C020480000000000000000009E
+:101A2000C04048000000000000000000006000000E
+:101A30000000000B0000001840210A2000000000F8
+:101A400000000003002F0222000000000000000040
+:101A50000AE00000000002350000001A0020222DDC
+:101A600000000000000801010029222800000000F9
+:101A70000000001A00203628000000000000A30C1F
+:101A8000002044110000000000000000C0204800B9
+:101A90000000000000000000C0204800000000001E
+:101AA00000000000C04048000000023A00000000B2
+:101AB000006000000000000B000000100060041136
+:101AC000000002FE3F800000002004110000000022
+:101AD00000000000006008110000019F0000225C6F
+:101AE0000020441100000000000000030020481105
+:101AF000000000000000000000600000000002651F
+:101B00000000001D00201E2D00000000000000014C
+:101B100000211E27000000000000000014E000006B
+:101B2000000002530000001800201E2D00000000DD
+:101B30000000FFFF00281E2700000000000000003A
+:101B400000341C27000000000000000012C000004C
+:101B5000000002480000000000201C1100000000EE
+:101B600000000000002F00E5000000000000000061
+:101B700008C000000000024B000000000020140715
+:101B8000000000000000001800201E2D00000000D2
+:101B90000000001000211E270000000000000000CF
+:101BA00000341C47000000000000000012C00000CC
+:101BB000000002500000000000201C110000000086
+:101BC00000000000002F00E6000000000000000000
+:101BD00008C00000000002530000000000201807A9
+:101BE000000000000000000000600000000002AAE9
+:101BF00000002256002044110000000000000000F8
+:101C000000342023000000000000000012C000008B
+:101C10000000025B000000000034204400000000CF
+:101C20000000000012C000000000025A0000001670
+:101C3000004048110000025F0000001800404811F9
+:101C40000000025F0000000000342044000000009B
+:101C50000000000012C000000000025E000000173B
+:101C6000004048110000025F0000001900204811E8
+:101C7000000000000000A1FC002044110000000052
+:101C80000000000100204811000000000001A1FD3B
+:101C900000604411000002D200003FFF002F022F1D
+:101CA00000000000000000000CC000000000023F27
+:101CB00000000000C040040000000001000000100F
+:101CC00040210620000000000000FFFFC0280A207D
+:101CD000000000000000001040210E200000000065
+:101CE0000000FFFFC02812200000000000000010CC
+:101CF00040211620000000000000FFFFC0881A20CD
+:101D000000000000810000000020441100000000DD
+:101D10000000000100204811000000000004200421
+:101D20000060441100000614000000000060000084
+:101D3000000005B200000000C06000000000028C3E
+:101D40000000000500200A2D00000000000000082F
+:101D500000220A22000000000000003400201A2D9A
+:101D6000000000000000002400201E2D00000000E4
+:101D70000000700000281E27000000000000000086
+:101D800000311CE6000000000000003300201A2D86
+:101D9000000000000000000C00221A2600000000D5
+:101DA00000000000002F00E600000000000000001E
+:101DB00006E000000000027B0000000000201C1173
+:101DC000000000000000000000200C1100000000D6
+:101DD0000000003400203623000000000000001046
+:101DE00000201811000000000000000000691CE243
+:101DF0000000012893800000002044110000000032
+:101E000000000000002048070000000095000000CE
+:101E1000002044110000000000000000002F022FED
+:101E200000000000000000000CE00000000002863E
+:101E30000000000100333E2F000000000000000001
+:101E4000D90048000000000092000000002044116A
+:101E50000000000000000000C0204800000000005A
+:101E60000000002400403627000000000000000CA5
+:101E7000C0220A20000000000000003200203622AC
+:101E80000000000000000031C040362000000000CB
+:101E90000000A2A40020441100000000000000097E
+:101EA0000020481100000000A100000000204411A3
+:101EB0000000000000000001008048110000000048
+:101EC0000000002900201E2D00000000000000007E
+:101ED000002C1CE300000000000000290020362731
+:101EE000000000000000002A00201E2D000000005D
+:101EF00000000000002C1CE4000000000000002A8C
+:101F000000203627000000000000002B00201E2DBE
+:101F10000000000000000000003120A300000000CD
+:101F200000000000002D1D07000000000000002B35
+:101F300000203627000000000000002C00201E2D8D
+:101F40000000000000000000003120C4000000007C
+:101F500000000000002D1D07000000000000002C04
+:101F600000803627000000000000002900203623F2
+:101F7000000000000000002A0020362400000000BD
+:101F80000000000000311CA3000000000000002B36
+:101F900000203627000000000000000000311CC4B3
+:101FA000000000000000002C008036270000000028
+:101FB000000000220020362700000000000000235F
+:101FC00000203628000000000000001D00201E2D0B
+:101FD00000000000000000020021022700000000B5
+:101FE0000000000014C00000000002C50000000056
+:101FF00000400000000002C200000022002036273E
+:10200000000000000000002300203628000000002F
+:102010000000001D00201E2D000000000000000236
+:1020200000210227000000000000000014E0000072
+:10203000000002C20000000300210227000000008F
+:102040000000000014E00000000002C50000002BAA
+:1020500000201E2D0000000000000000002E00E106
+:10206000000000000000000002C00000000002C5E7
+:102070000000002900201E2D0000000000000000CC
+:10208000003120A10000000000000000002E00E848
+:10209000000000000000000006C00000000002C5B3
+:1020A0000000002C00201E2D000000000000000099
+:1020B000002E00E2000000000000000002C000004E
+:1020C000000002C50000002A00201E2D00000000B4
+:1020D00000000000003120C20000000000000000ED
+:1020E000002E00E8000000000000000006C0000014
+:1020F000000002C50000000000600000000005EDC7
+:1021000000000000006000000000029E00000000CF
+:1021100000400000000002C7000000000060000056
+:102120000000029E0000000000600000000005E4C6
+:102130000000000000400000000002C70000000096
+:10214000006000000000029000000000004000005D
+:10215000000002C70000002200201E2D0000000029
+:10216000000000230080222D00000000000000106D
+:1021700000221E2300000000000000000029488704
+:10218000000000000000000000311CA3000000005F
+:102190000000001000221E270000000000000000C8
+:1021A00000294887000000000000001000221E23C4
+:1021B0000000000000000000003120C4000000000A
+:1021C0000000FFFF0028222800000000000000009F
+:1021D00000894907000000000000001000221E23B3
+:1021E00000000000000000000029488700000000F7
+:1021F0000000001000221E2100000000000000006E
+:1022000000294847000000000000000000311CA326
+:10221000000000000000001000221E270000000047
+:1022200000000000002948870000000000000000B6
+:1022300000311CA1000000000000001000221E2739
+:1022400000000000000000000029484700000000D6
+:102250000000001000221E2300000000000000000B
+:10226000003120C4000000000000FFFF00282228E9
+:1022700000000000000000000029490700000000E5
+:102280000000001000221E210000000000000000DD
+:10229000003120C2000000000000FFFF00282228BB
+:1022A0000000000000000000008949070000000055
+:1022B0000000001000221E230000000000000000AB
+:1022C00000294887000000000000000100220A21C8
+:1022D0000000000000000000003308A20000000021
+:1022E0000000001000221E2200000000000000106C
+:1022F0000021222200000000000000000029490700
+:10230000000000000000000000311CA300000000DD
+:102310000000001000221E27000000000000000046
+:1023200000294887000000000000000100220A2167
+:102330000000000000000000003008A200000000C3
+:102340000000001000221E2200000000000000100B
+:10235000002122220000000000000000002949079F
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:102390000000000000000000003808C50000000038
+:1023A00000000000003008410000000000000001B3
+:1023B00000220A220000000000000000003308A2F2
+:1023C000000000000000001000221E22000000009B
+:1023D0000000001000212222000000000000000088
+:1023E00000894907000000000000001D0020222D88
+:1023F000000000000000000014C000000000030105
+:10240000FFFFFFEF00280621000000000000001A77
+:102410000020222D000000000000F8E00020441100
+:102420000000000000000000002949010000000039
+:1024300000000000008949010000000000000000C9
+:10244000002048110000000000000000002048119A
+:1024500000000000060A0200008048110000000091
+:1024600000000000C02000000000000097000000F5
+:10247000C02044110000000000000000C0204811EE
+:10248000000000008A00000000204411000000004D
+:102490000000000000204811000000000000225C45
+:1024A000002044110000000000000000C02048008F
+:1024B000000000000000A1FC00204411000000000A
+:1024C00000000000C02048000000000000000000E4
+:1024D000C0200400000000000000000000A0000A6E
+:1024E00000000000970000000020441100000000E0
+:1024F0000000000000204811000000008A000000D9
+:1025000000204411000000000000000000204811DD
+:10251000000000000000225C0020441100000000C8
+:1025200000000000C0204800000000000000A1FCE6
+:10253000002044110000000000000000C0204800FE
+:102540000000000000000000C020040000000000A7
+:102550000000000000A0000A00000000970000003A
+:10256000002044110000000000000000002048117D
+:10257000000000008A00000000204411000000005C
+:102580000000000000204811000000000000225C54
+:10259000002044110000000000000000C02048009E
+:1025A000000000000000A1FC002044110000000019
+:1025B00000000000C0204800000000000001A1FD54
+:1025C000002044110000000000000000D900480075
+:1025D0000000000000000000C02004000000000017
+:1025E0000000000000A0000A0000000000002257C8
+:1025F000002044110000000000000003C0484A20F1
+:10260000000000000000225D0020441100000000D6
+:1026100000000000C0404800000000000000000072
+:1026200000600000000005C500000000C020080098
+:10263000000000000000225C0020441100000000A7
+:102640000000000300384A22000000000000A1FC46
+:10265000002044110000000000000000C0204800DD
+:10266000000000000001A1FD002044110000000056
+:1026700000000000002F0222000000000000000007
+:102680000CE00000000000000000000040204800B6
+:10269000000000000000000140304A20000000005F
+:1026A00000000002C0304A200000000000000001CD
+:1026B00000530A22000003340000003FC0280A2013
+:1026C0000000000081000000002044110000000014
+:1026D000000000010020481100000000000021F867
+:1026E00000204411000000000000001700204811E5
+:1026F00000000000000421F90060441100000614ED
+:102700000000001100210230000000000000000065
+:1027100014E000000000033D00000014002F02221E
+:1027200000000000000000000CC000000000035189
+:102730000000201000204411000000000000800074
+:1027400000204811000000000001A2A40020441154
+:102750000000000000000000002048110000000000
+:1027600000000016006048110000035E0000210018
+:10277000002044110000000000000000C0204800BC
+:102780000000000000000000C02048000000000021
+:1027900000000000C0204800000000000000000011
+:1027A000C0204800000000000001A2A40020441145
+:1027B00000000000000000000020481100000000A0
+:1027C000000000000040480200000000000000047B
+:1027D000002F022200000000000000000CC00000DA
+:1027E00000000355000020100020441100000000EC
+:1027F000000080000040481100000349000000284C
+:10280000002F022200000000000000000CE0000089
+:1028100000000349000021040020441100000000D2
+:1028200000000000C0204800000000000000000080
+:10283000C02048000000000000000000C020480048
+:102840000000000000000000C02048000000000060
+:102850000000A2A4002044110000000000000000BD
+:10286000004048020000000000000035002036262D
+:1028700000000000000000490020181100000000C6
+:1028800000000000002048110000000000000001CE
+:1028900000331A260000000000000000002F02266E
+:1028A00000000000000000000CC0000000000360F9
+:1028B0000000003500801A2D000000000000003FDD
+:1028C000C0280A200000000000000015002F02228E
+:1028D00000000000000000000CE000000000037693
+:1028E0000000001E002F0222000000000000000077
+:1028F0000CE000000000038000000020002F0222F6
+:1029000000000000000000000CE000000000038C4C
+:102910000000000F002F0222000000000000000055
+:102920000CE000000000039800000010002F0222BD
+:1029300000000000000000000CE000000000039810
+:1029400000000006002F022200000000000000002E
+:102950000CE000000000039A00000016002F022285
+:1029600000000000000000000CE000000000039FD9
+:102970000000A2A40020441100000000000000009C
+:1029800000404802000000000800000000290A2260
+:10299000000000000000000340210E2000000000A5
+:1029A0000000000CC0211220000000000008000000
+:1029B000002812240000000000000014C02216208D
+:1029C0000000000000000000002914A40000000026
+:1029D0000000A2A40020441100000000000000003C
+:1029E000002948A2000000000000A1FE00204411C0
+:1029F000000000000000000000404803000000004C
+:102A000081000000002044110000000000000001CF
+:102A10000020481100000000000021F800204411AF
+:102A20000000000000000015002048110000000018
+:102A3000000421F900604411000006140000001594
+:102A400000210230000000000000000014E000003F
+:102A5000000003820000210E00204411000000004D
+:102A600000000000C020480000000000000000003E
+:102A7000C0204800000000000000A2A40020441173
+:102A800000000000000000000040480200000000BC
+:102A9000810000000020441100000000000000013F
+:102AA0000020481100000000000021F8002044111F
+:102AB0000000000000000016002048110000000087
+:102AC000000421F900604411000006140000000316
+:102AD00000210230000000000000000014E00000AF
+:102AE0000000038E000021080020441100000000B7
+:102AF00000000000C02048000000000000000000AE
+:102B0000C0204800000000000000A2A400204411E2
+:102B1000000000000000000000404802000000002B
+:102B20000000201000204411000000000000800080
+:102B30000040481100000000000020100020441157
+:102B4000000000000000800000204811000000008C
+:102B50000001A2A4002044110000000000000000B9
+:102B6000002048110000000000000006004048114D
+:102B700000000000000020100020441100000000B0
+:102B80000000800000204811000000000001A2A405
+:102B90000020441100000000000000000020481147
+:102BA0000000000000000016006048110000035EF5
+:102BB0000000001600404811000000000000000066
+:102BC000C02008000000000000000000C0200C0031
+:102BD000000000000000001D002102230000000092
+:102BE0000000000014E00000000003B981000000B4
+:102BF00000204411000000000000000100204811E6
+:102C000000000000000021F8002044110000000036
+:102C1000000000170020481100000000000421F906
+:102C20000060441100000614000000110021023071
+:102C3000000000000000000014E00000000003ABF2
+:102C400000002100002044110000000000000000EE
+:102C5000002048020000000000000000002048039F
+:102C600000000000BABECAFE0020481100000000AB
+:102C7000CAFEBABE0020481100000000000020106B
+:102C800000204411000000000000800000204811D6
+:102C9000000000000000A2A4002044110000000079
+:102CA00000000004004048110000000000002170F6
+:102CB0000020441100000000000000000020480235
+:102CC0000000000000000000002048030000000099
+:102CD0008100000000204411000000000000000AF4
+:102CE000002048110000000000000000002000103B
+:102CF000000000000000000014C00000000003BE3F
+:102D00008C0000000020441100000000CAFEBABE82
+:102D10000040481100000000810000000020441124
+:102D20000000000000000001002048110000000029
+:102D300000003FFF40280A20000000008000000043
+:102D400040280E200000000040000000C028122093
+:102D50000000000000040000006946220000061484
+:102D6000000000000020141000000000000000001F
+:102D7000002F022300000000000000000CC0000033
+:102D8000000003CC00000000C0401800000003CF8A
+:102D900000003FFFC0281A200000000000040000CF
+:102DA00000694626000006140000000000201810EC
+:102DB0000000000000000000002F022400000000BE
+:102DC000000000000CC00000000003D20000000062
+:102DD000C0401C00000003D500003FFFC0281E209B
+:102DE00000000000000400000069462700000614EF
+:102DF0000000000000201C10000000000000000087
+:102E0000002044020000000000000000002820C54F
+:102E10000000000000000000004948E80000000039
+:102E2000A580000000200811000000000000200024
+:102E300000200C110000000083000000006044111D
+:102E4000000003FD0000000000204402000000001C
+:102E500000000000C020480000000000000000004A
+:102E600040204800000000000000001FC021022098
+:102E7000000000000000000014C00000000003E299
+:102E8000000020100020441100000000000080001D
+:102E900000204811000000000000FFFFC048122081
+:102EA000000003EAA78000000020081100000000D5
+:102EB0000000A00000200C110000000083000000B2
+:102EC00000604411000003FD0000000000204402E7
+:102ED0000000000000000000C020480000000000CA
+:102EE00000000000C0204800000000000000FFFFBC
+:102EF000C0281220000000008300000000204411C0
+:102F000000000000000000000030488300000000C6
+:102F100084000000002044110000000000000000B8
+:102F2000C020480000000000000000001D0000005C
+:102F3000000000008300000000604411000003FD59
+:102F400000000000C040040000000001A980000053
+:102F500000200811000000000000C00000400C111B
+:102F6000000003E5AB800000002008110000000015
+:102F70000000F8E000400C11000003E5AD80000007
+:102F800000200811000000000000F88000400C1133
+:102F9000000003E5B38000000020081100000000DD
+:102FA0000000F3FC00400C11000003E5AF800000BE
+:102FB00000200811000000000000E00000400C119B
+:102FC000000003E5B18000000020081100000000AF
+:102FD0000000F00000400C11000003E58300000039
+:102FE000002044110000000000002148002048118A
+:102FF00000000000840000000020441100000000D8
+:1030000000000000C0204800000000000000000098
+:103010001D00000000000000000000000080000013
+:103020000000000000182000C03046200000000012
+:1030300000000000D900480000000000000000006F
+:10304000C0200400000000000000000000A0000AF2
+:10305000000000000018A000C03046200000000062
+:1030600000000000D900480000000000000000003F
+:10307000C0200400000000000000000000A0000AC2
+:10308000000000000018C000C03046200000000012
+:1030900000000000D900480000000000000000000F
+:1030A000C0200400000000000000000000A0000A92
+:1030B000000000000018F8E0C030462000000000CA
+:1030C00000000000D90048000000000000000000DF
+:1030D000C0200400000000000000000000A0000A62
+:1030E000000000000018F880C030462000000000FA
+:1030F00000000000D90048000000000000000000AF
+:10310000C0200400000000000000000000A0000A31
+:10311000000000000018E000C03046200000000061
+:1031200000000000D900480000000000000000007E
+:10313000C0200400000000000000000000A0000A01
+:10314000000000000018F000C03046200000000021
+:1031500000000000D900480000000000000000004E
+:10316000C0200400000000000000000000A0000AD1
+:10317000000000000018F3FCC030462000000000F2
+:1031800000000000D900480000000000000000001E
+:10319000C0200400000000000000000000A0000AA1
+:1031A0000000000086000000002044110000000024
+:1031B0000000000000404801000000008500000001
+:1031C0000020441100000000000000000040480101
+:1031D000000000000000217C0020441100000000DD
+:1031E00000000000C02048000000000000000000B7
+:1031F000C02048000000000000000000C02048007F
+:1032000000000000810000000020441100000000C8
+:103210000000000100204811000000000000000034
+:10322000C02008000000000000000000170000009F
+:10323000000000000004217F00604411000006141B
+:103240000000001F0021023000000000000000000C
+:1032500014C00000000000000000000000404C020C
+:103260000000042E00000000C0200C000000000040
+:1032700000000000C020100000000000000000005E
+:10328000C02014000000000000000000C020180052
+:103290000000000000000000C0201C000000000032
+:1032A00000007F0000280A21000000000000450007
+:1032B000002F022200000000000000000CE00000CF
+:1032C0000000043C00000000C020200000000000BE
+:1032D00000000000170000000000000000000010C7
+:1032E00000280A230000000000000010002F022226
+:1032F00000000000000000000CE00000000004449A
+:1033000081000000002044110000000000000001C6
+:10331000002048110000000000040000006946245D
+:103320000000061400000000004000000000044DF2
+:103330008100000000204411000000000000000097
+:1033400000204811000000000000216D0020441101
+:103350000000000000000000002048040000000001
+:1033600000000000002048050000000000000000F0
+:103370001AC00000000004499E0000000020441113
+:1033800000000000CAFEBABE002048110000000084
+:10339000000000001AE000000000044C00000000E3
+:1033A000002824F0000000000000000700280A2385
+:1033B0000000000000000001002F022200000000B9
+:1033C000000000000AE000000000045400000000BB
+:1033D000002F00C9000000000000000004E0000011
+:1033E0000000046D00000000004000000000047AAE
+:1033F00000000002002F0222000000000000000078
+:103400000AE000000000045900000000002F00C97D
+:10341000000000000000000002E000000000046D59
+:1034200000000000004000000000047A00000003DB
+:10343000002F022200000000000000000AE000004F
+:103440000000045E00000000002F00C90000000022
+:10345000000000000CE000000000046D000000000F
+:10346000004000000000047A00000004002F022247
+:1034700000000000000000000AE0000000000463FB
+:1034800000000000002F00C9000000000000000044
+:103490000AE000000000046D000000000040000091
+:1034A0000000047A00000005002F02220000000046
+:1034B000000000000AE000000000046800000000B6
+:1034C000002F00C9000000000000000006E000001E
+:1034D0000000046D00000000004000000000047ABD
+:1034E00000000006002F0222000000000000000083
+:1034F0000AE000000000046D00000000002F00C979
+:10350000000000000000000008E000000000046D62
+:1035100000000000004000000000047A00007F006E
+:1035200000280A210000000000004500002F0222B0
+:1035300000000000000000000AE0000000000000A1
+:103540000000000800210A23000000000000000025
+:1035500014C000000000047700002169002044111D
+:103560000000000000000000C02048000000000033
+:1035700000000000C0204800000000000000000023
+:10358000C020480000000000CAFEBABE004048113A
+:103590000000000000000000C02044000000000007
+:1035A00000000000C020000000000000000000003B
+:1035B000C04048000000000000007F0000280A21F1
+:1035C0000000000000004500002F02220000000063
+:1035D000000000000AE0000000000480000000007D
+:1035E000C02000000000000000000000C02000001B
+:1035F0000000000000000000C040000000000000CB
+:103600000000000000404C080000043C00000000E6
+:10361000C0200800000000000000001040210E2023
+:1036200000000000000000114021122000000000F6
+:103630000000001240211620000000000000216957
+:10364000002044110000000000000000002048029B
+:103650000000000000000000002102250000000022
+:103660000000000014E000000000048A00040000D4
+:10367000C0494A200000048BFFFBFFFFC0284A20FE
+:1036800000000000000000000021022300000000F4
+:103690000000000014E0000000000497000000009B
+:1036A000C02048000000000000000000C0204800CA
+:1036B00000000000000000000021022400000000C3
+:1036C0000000000014C000000000000081000000A5
+:1036D00000204411000000000000000C00204811F0
+:1036E00000000000000000000020001000000000AA
+:1036F0000000000014C0000000000493A0000000BF
+:103700000020441100000000CAFEBABE004048116B
+:1037100000000000810000000020441100000000B3
+:103720000000000400204811000000000000216B90
+:10373000002044110000000000000000C0204810DC
+:103740000000000081000000002044110000000083
+:103750000000000500204811000000000000216C5E
+:10376000002044110000000000000000C0204810AC
+:103770000000000000000000002F022400000000F4
+:10378000000000000CE0000000000000000000004D
+:10379000004000000000049100000000C0210A2049
+:1037A000000000000000000014C00000000004AE93
+:1037B0008100000000204411000000000000000013
+:1037C00000204811000000000000216D002044117D
+:1037D0000000000000000000C020480000000000C1
+:1037E00000000000C02048000000000000000000B1
+:1037F0001AC00000000004A99E000000002044112F
+:1038000000000000CAFEBABE0020481100000000FF
+:10381000000000001AE00000000004AC00000000FE
+:1038200000400000000004B28100000000204411AC
+:10383000000000000000000100204811000000000E
+:1038400000040000C0294620000000000000000025
+:10385000C0600000000006140000000100210222E8
+:10386000000000000000000014C00000000004B9C7
+:103870000000216900204411000000000000000049
+:10388000C02048000000000000000000C0204800E8
+:1038900000000000000000000020481000000000B0
+:1038A000CAFEBABE0040481100000000000000003F
+:1038B000C02044000000000000000000C04048108C
+:1038C0000000000081000000002044110000000002
+:1038D000000000010020481100000000000021F855
+:1038E00000204411000000000000000D00204811DD
+:1038F00000000000000421F90060441100000614DB
+:103900000000000000210230000000000000000064
+:1039100014C00000000004BB0000218000204411FE
+:103920000000000000000000C0204800000000006F
+:1039300000000000C02000000000000000000000A7
+:10394000C02048000000000000000000C02000006F
+:103950000000000000000000C0404800000000001F
+:103960000000000300333E2F0000000000000001B3
+:1039700000210221000000000000000014E000000F
+:10398000000004EB0000003500200A2D00000000BC
+:103990000004000018E00C11000004DA000000012F
+:1039A00000333E2F00000000000021690020441178
+:1039B000000000000000000000204802000000009D
+:1039C0000000000000204803000000000000000884
+:1039D00000300A220000000000000000C020480063
+:1039E0000000000000000000C020480000000000AF
+:1039F00000002169002044110000000000000000C8
+:103A000000204802000000000000000000204803E1
+:103A1000000000000000000800300A220000000042
+:103A200000000000C020480000000000000000006E
+:103A3000D8C04800000004CE0000216900204411D5
+:103A4000000000000000000000204802000000000C
+:103A500000000000002048030000000000000008F3
+:103A600000300A220000000000000000C0204800D2
+:103A70000000000000000000C0204800000000001E
+:103A8000000000360020122D0000000000000000A1
+:103A900000290C830000000000002169002044116F
+:103AA00000000000000000000020480200000000AC
+:103AB0000000000000204803000000000000000893
+:103AC00000300A220000000000000000C020480072
+:103AD0000000000000000000C020480000000000BE
+:103AE000000000110021022400000000000000007E
+:103AF00014C00000000000000000000000400000B2
+:103B00000000049100000035C020362000000000B5
+:103B100000000036C0403620000000000000304A9F
+:103B20000020441100000000E0000000C0484A20CE
+:103B3000000000000000000F002102210000000032
+:103B40000000000014C00000000004F200000000AB
+:103B5000006000000000000B00000000D900000021
+:103B60000000000000000000C04004000000000150
+:103B7000810000000020441100000000000000024D
+:103B80000020481100000000000000FF00280E3057
+:103B90000000000000000000002F022300000000D1
+:103BA000000000000CC00000000004F6000000004F
+:103BB000C0200800000000000000000014C0000049
+:103BC0000000050B0000000000200C1100000000A8
+:103BD0000000002400203623000000000000003414
+:103BE00000203623000000000000003200203623B1
+:103BF000000000000000003100203623000000001B
+:103C00000000001D00203623000000000000002DF1
+:103C100000203623000000000000002E0020362384
+:103C2000000000000000001B002036230000000000
+:103C30000000001C0020362300000000FFFFE00011
+:103C400000200C1100000000000000290020362395
+:103C5000000000000000002A0020362300000000C1
+:103C600000001FFF00200C11000000000000002BCE
+:103C700000203623000000000000002C0020362326
+:103C800000000000F1FFFFFF00283A2E00000000B6
+:103C90000000001AC0220E200000000000000000FA
+:103CA0000029386E0000000081000000002044114F
+:103CB0000000000000000006002048110000000085
+:103CC0000000003340203620000000008700000084
+:103CD000002044110000000000000000C020480047
+:103CE000000000000000A1F40020441100000000CA
+:103CF0000000000000204810000000009D000000AF
+:103D000000204411000000000000001F40214A2054
+:103D10000000000096000000002044110000000098
+:103D200000000000C020480000000000000000006B
+:103D3000C0200C000000000000000000C0201000A7
+:103D4000000000000000001F0021162400000000F9
+:103D50000000000014C0000000000000000000256A
+:103D600000203623000000000000000300281E236E
+:103D700000000000000000080022222300000000D4
+:103D8000FFFFF000002822280000000000000000D3
+:103D9000002920E80000000000000027002036284D
+:103DA000000000000000001800211E230000000099
+:103DB000000000280020362700000000000000025C
+:103DC000002216240000000000000000003014A8AB
+:103DD0000000000000000026002036250000000042
+:103DE0000000000300211A24000000001000000061
+:103DF00000281A2600000000EFFFFFFF00283A2EDF
+:103E00000000000000000000004938CE000006025B
+:103E10000000000140280A20000000000000000609
+:103E200040280E200000000000000300C0281220DF
+:103E30000000000000000008002112240000000023
+:103E400000000000C020162000000000000000005C
+:103E5000C0201A2000000000000000000021022203
+:103E6000000000000000000014C000000000054138
+:103E7000810000000020441100000000000000014B
+:103E800000204811000000000000225800300A24E1
+:103E90000000000000040000006946220000061433
+:103EA0000000216900204411000000000000000013
+:103EB00000204805000000000002000000294A26FA
+:103EC000000000000000000000204810000000007A
+:103ED000CAFEBABE00204811000000000000000227
+:103EE000002F022300000000000000000CC00000B2
+:103EF0000000054900000000C0201C100000000068
+:103F000000000000C04000000000055B000000024F
+:103F1000002F022300000000000000000CC0000081
+:103F2000000005498100000000204411000000004D
+:103F3000000000010020481100000000000022588D
+:103F400000300A240000000000040000006946223E
+:103F50000000061400000000C0201C10000000003B
+:103F600000000000C04000000000055B00000000F1
+:103F7000002F022300000000000000000CC0000021
+:103F80000000054D00000000C0201C0000000000E3
+:103F900000000000C04000000000055B00000004BD
+:103FA000002F022300000000000000000CC00000F1
+:103FB00000000559810000000020441100000000AD
+:103FC0000000000000204811000000000000216DEA
+:103FD000002044110000000000000000C020480044
+:103FE0000000000000000000C020480000000000A9
+:103FF000000000001AC00000000005549E000000F0
+:104000000020441100000000CAFEBABE0020481182
+:1040100000000000000000001AE00000000005574A
+:104020000000000000401C100000055B00000000C4
+:10403000C02000000000000000000000C0400000A0
+:1040400000000000000000000EE000000000055D20
+:104050000000000000600000000005A40000000057
+:10406000002F022400000000000000000CC000002F
+:104070000000056D0000A2B7002044110000000000
+:104080000000000000204807000000008100000040
+:104090000020441100000000000000010020481131
+:1040A000000000000004A2B60060441100000614E5
+:1040B0000000001A0021223000000000000000066D
+:1040C00000222630000000000000A2C4002044119D
+:1040D0000000000000000000003048E9000000007F
+:1040E0000000000000E000000000056B0000A2D10D
+:1040F00000204411000000000000000000404808BB
+:10410000000000000000A2D10020441100000000C7
+:104110000000000100504A280000000000000001DB
+:10412000002F022400000000000000000CC000006E
+:104130000000057D0000A2BB00204411000000002B
+:10414000000000000020480700000000810000007F
+:104150000020441100000000000000010020481170
+:10416000000000000004A2BA006044110000061420
+:104170000000001A002122300000000000000006AC
+:1041800000222630000000000000A2C500204411DB
+:104190000000000000000000003048E900000000BE
+:1041A0000000000000E000000000057B0000A2D23B
+:1041B00000204411000000000000000000404808FA
+:1041C000000000000000A2D2002044110000000006
+:1041D0000000000100504A2800000000000000021A
+:1041E000002F022400000000000000000CC00000AE
+:1041F0000000058D0000A2BF002044110000000057
+:1042000000000000002048070000000081000000BE
+:1042100000204411000000000000000100204811AF
+:10422000000000000004A2BE00604411000006145B
+:104230000000001A002122300000000000000006EB
+:1042400000222630000000000000A2C60020441119
+:104250000000000000000000003048E900000000FD
+:104260000000000000E000000000058B0000A2D369
+:104270000020441100000000000000000040480839
+:10428000000000000000A2D3002044110000000044
+:104290000000000100504A28000000000000A2C3F6
+:1042A000002044110000000000000000002048072A
+:1042B0000000000081000000002044110000000008
+:1042C0000000000100204811000000000004A2C20C
+:1042D00000604411000006140000001A0021223082
+:1042E0000000000000000006002226300000000050
+:1042F0000000A2C7002044110000000000000000E0
+:10430000003048E9000000000000000000E000006C
+:10431000000005990000A2D4002044110000000014
+:104320000000000000404808000000000000A2D487
+:1043300000204411000000000000000100504A2845
+:104340000000000085000000002044110000000073
+:104350000000000000204801000000000000304A7A
+:10436000002044110000000001000000002048115E
+:104370000000000000000000004000000000059F59
+:10438000A4000000C0204411000000000000000054
+:10439000C04048000000000000000000C0600000B5
+:1043A000000005A400000000C0400400000000015F
+:1043B0000001A2A400204411000000000000000041
+:1043C00000204811000000000000000000204811FB
+:1043D0000000000000000000002048110000000064
+:1043E000000000000020481100000000000000054F
+:1043F00000204811000000000000A1F4002044113A
+:104400000000000000000000002048110000000033
+:10441000880000000020441100000000000000019E
+:104420000020481100000000FF000000002044119F
+:104430000000000000000000002048110000000003
+:1044400000000001002048110000000000000002F0
+:104450000080481100000000000000000EE0000095
+:10446000000005B700001000002008110000000047
+:104470000000003400203622000000000000000090
+:1044800000600000000005BB0000000000600000AC
+:10449000000005A498000000002044110000000066
+:1044A0000000000000804811000000000000000033
+:1044B000C0600000000005BB00000000C040040018
+:1044C000000000010000A2A4002044110000000030
+:1044D00000000022002048110000000089000000B8
+:1044E00000204411000000000000000100204811DD
+:1044F00000000000FF000000002044110000000048
+:104500000000000000204811000000000000000131
+:104510000020481100000000000000020080481147
+:10452000000000000000217AC020441100000000BB
+:10453000000000000040481100000000970000004B
+:10454000002044110000000000000000002048117D
+:10455000000000008A00000000204411000000005C
+:10456000000000000020481100000000FF000000D3
+:10457000002044110000000000000000002048114D
+:1045800000000000000000010020481100000000B1
+:104590000000000200804811000000000000000040
+:1045A00000600000000005E1000020100020441120
+:1045B0000000000000008000002048110000000002
+:1045C0000001A2A4C020441100000000000000006F
+:1045D0000020481100000000000000160060481193
+:1045E0000000035E000000160020481100000000DB
+:1045F0000000201000204411000000000001000015
+:10460000002048110000000081000000002044113B
+:104610000000000000000001002048110000000020
+:104620000000217C002044110000000009800000EF
+:104630000020481100000000FFFFFFFF002048118C
+:1046400000000000000000000020481100000000F1
+:104650000000000017000000000000000004217F9F
+:1046600000604411000006140000001F0021023009
+:10467000000000000000000014C000000000000066
+:104680000000000400404C11000005DC0000001D8B
+:1046900000201E2D000000000000000400291E273D
+:1046A000000000000000001D008036270000000010
+:1046B0000000001D00201E2D00000000FFFFFFFB7A
+:1046C00000281E27000000000000001D0080362783
+:1046D000000000000000001D00201E2D0000000052
+:1046E0000000000800291E27000000000000001D37
+:1046F00000803627000000000000001D00201E2D55
+:1047000000000000FFFFFFF700281E270000000048
+:104710000000001D0080362700000000000020106F
+:10472000002044110000000000008000002048111B
+:10473000000000000001A2A40020441100000000BD
+:1047400000000000002048110000000000000016DA
+:10475000006048110000035E0000001600204811B0
+:1047600000000000000020100020441100000000A4
+:104770000001000000204811000000000000217C22
+:1047800000204411000000000180000000204811BA
+:104790000000000000FFFFFF0020481100000000A3
+:1047A0000000000000204811000000000000000090
+:1047B00017000000000000008100000000204411EC
+:1047C000000000000000000100204811000000006F
+:1047D0000004217F00604411000006140000000066
+:1047E00000200010000000000000000014C00000C5
+:1047F000000006130000001000404C11000005F9F5
+:1048000000000000C02004000000000000000000C4
+:1048100038C00000000000000000002500200A2D24
+:10482000000000000000002600200E2D0000000007
+:10483000000000270020122D0000000000000028CA
+:104840000020162D00000000000021690020441106
+:1048500000000000000000000020480400000000EC
+:1048600000000000002048050000000000000000DB
+:104870000020480100000000CAFEBABE0020481116
+:1048800000000000000000040030122400000000BE
+:1048900000000000002F0064000000000000000085
+:1048A0000CC00000000006120000000300281A22BD
+:1048B000000000000000000800221222000000009A
+:1048C000FFFFF0000028122400000000000000009C
+:1048D000002910C40000000000000027004036241A
+:1048E0000000000000000000008000000000000048
+:1048F000000000001AC00000000006149F00000025
+:104900000020441100000000CAFEBABE0020481179
+:1049100000000000000000001AE000000000061780
+:104920000000000000800000000000000000000007
+:10493000006000000000000B000010000060041187
+:10494000000002FE00000000002004110000000032
+:1049500000000000006008110000019F0000225CC0
+:104960000020441100000000000000030020481156
+:10497000000000000000225600204411000000004A
+:104980000000001B00204811000000000000A1FCF6
+:104990000020441100000000000000010020481128
+:1049A000000000000001A1FDC02044110000000033
+:1049B0000000002900201E2D000000000000001053
+:1049C00000221E27000000000000002C0020222DE5
+:1049D000000000000000FFFF002822280000000067
+:1049E000000000000029490700000000000000004E
+:1049F00000204811000000000000002A0020222DA5
+:104A0000000000000000FFFF002822280000000036
+:104A1000000000000029490700000000000000001D
+:104A200000204811000000000000002B00201E2D77
+:104A3000000000000000001000221E2700000000FF
+:104A400000000000002949070000000000000000ED
+:104A500000404811000000000000000000000000BD
+:104A60000000000000000000000000000000000046
+:104A70000000000000000000000000000000000036
+:104A80000000000000000000000000000000000026
+:104A90000000000000000000000000000000000016
+:104AA0000000000000000000000000000000000006
+:104AB00000000000000000000000000000000000F6
+:104AC00000000000000000000000000000000000E6
+:104AD00000000000000000000000000000000000D6
+:104AE00000000000000000000000000000000000C6
+:104AF00000000000000000000000000000000000B6
+:104B000000000000000000000000000000000000A5
+:104B10000000000000000000000000000000000095
+:104B20000000000000000000000000000000000085
+:104B30000000000000000000000000000000000075
+:104B40000000000000000000000000000000000065
+:104B50000000000000000000000000000000000055
+:104B60000000000000000000000000000000000045
+:104B70000000000000000000000000000000000035
+:104B80000000000000000000000000000000000025
+:104B90000000000000000000000000000000000015
+:104BA0000000000000000000000000000000000005
+:104BB00000000000000000000000000000000000F5
+:104BC00000000000000000000000000000000000E5
+:104BD00000000000000000000000000000000000D5
+:104BE00000000000000000000000000000000000C5
+:104BF00000000000000000000000000000000000B5
+:104C000000000000000000000000000000000000A4
+:104C10000000000000000000000000000000000094
+:104C20000000000000000000000000000000000084
+:104C30000000000000000000000000000000000074
+:104C40000000000000000000000000000000000064
+:104C50000000000000000000000000000000000054
+:104C60000000000000000000000000000000000044
+:104C70000000000000000000000000000000000034
+:104C80000000000000000000000000000000000024
+:104C90000000000000000000000000000000000014
+:104CA0000000000000000000000000000000000004
+:104CB00000000000000000000000000000000000F4
+:104CC00000000000000000000000000000000000E4
+:104CD00000000000000000000000000000000000D4
+:104CE00000000000000000000000000000000000C4
+:104CF00000000000000000000000000000000000B4
+:104D000000000000000000000000000000000000A3
+:104D10000000000000000000000000000000000093
+:104D20000000000000000000000000000000000083
+:104D30000000000000000000000000000000000073
+:104D40000000000000000000000000000000000063
+:104D50000000000000000000000000000000000053
+:104D60000000000000000000000000000000000043
+:104D70000000000000000000000000000000000033
+:104D80000000000000000000000000000000000023
+:104D90000000000000000000000000000000000013
+:104DA0000000000000000000000000000000000003
+:104DB00000000000000000000000000000000000F3
+:104DC00000000000000000000000000000000000E3
+:104DD00000000000000000000000000000000000D3
+:104DE00000000000000000000000000000000000C3
+:104DF00000000000000000000000000000000000B3
+:104E000000000000000000000000000000000000A2
+:104E10000000000000000000000000000000000092
+:104E20000000000000000000000000000000000082
+:104E30000000000000000000000000000000000072
+:104E40000000000000000000000000000000000062
+:104E50000000000000000000000000000000000052
+:104E60000000000000000000000000000000000042
+:104E70000000000000000000000000000000000032
+:104E80000000000000000000000000000000000022
+:104E90000000000000000000000000000000000012
+:104EA0000000000000000000000000000000000002
+:104EB00000000000000000000000000000000000F2
+:104EC00000000000000000000000000000000000E2
+:104ED00000000000000000000000000000000000D2
+:104EE00000000000000000000000000000000000C2
+:104EF00000000000000000000000000000000000B2
+:104F000000000000000000000000000000000000A1
+:104F10000000000000000000000000000000000091
+:104F20000000000000000000000000000000000081
+:104F30000000000000000000000000000000000071
+:104F40000000000000000000000000000000000061
+:104F50000000000000000000000000000000000051
+:104F60000000000000000000000000000000000041
+:104F70000000000000000000000000000000000031
+:104F80000000000000000000000000000000000021
+:104F90000000000000000000000000000000000011
+:104FA0000000000000000000000000000000000001
+:104FB00000000000000000000000000000000000F1
+:104FC00000000000000000000000000000000000E1
+:104FD00000000000000000000000000000000000D1
+:104FE00000000000000000000000000000000000C1
+:104FF00000000000000000000000000000000000B1
+:1050000000000000000000000000000000000000A0
+:105010000000000000000000000000000000000090
+:105020000000000000000000000000000000000080
+:105030000000000000000000000000000000000070
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B000013304EF059B02390000000001B00159E1
+:1052C0000425059B00000000021201F6023901428C
+:1052D000000000000210022E0289022A00000000D5
+:1052E00003C2059B059B059B0000000005CD05CE74
+:1052F0000308059B00000000059B05A00309032986
+:10530000000000000313026B032B031D00000000CC
+:10531000059B059B059B059B00000000059B052C3C
+:10532000059B059B0000000003A5059B04A2032D1F
+:1053300000000000048104330423059B00000000EA
+:1053400004BB04ED042704C800000000043304F487
+:10535000033A036500000000059B059B059B059B28
+:1053600000000000059B059B059B059B00000000BD
+:10537000059B059B05B905A200000000059B059B48
+:105380000007059B00000000059B059B059B059BF6
+:1053900000000000059B059B059B059B000000008D
+:1053A00003E303D803F303F10000000003F903F55E
+:1053B00003F703FB0000000004070403040F040BC1
+:1053C0000000000004170413041F041B0000000069
+:1053D000059B059B059B059B00000000059B059B0D
+:1053E000059B059B00000000059B059B059B059BFD
+:1053F0000000000000020600061900060000000080
+:00000001FF
diff --git a/firmware/radeon/R600_pfp.bin.ihex b/firmware/radeon/R600_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..5236108
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000D4007100D4007200CA040000A00000F7
+:10001000007E828B0080000300CA040000D4401ED2
+:1000200000EE001E00CA040000A00000007E828BCB
+:1000300000C4183800CA240000CA2800009581A80E
+:1000400000C41C3A00C3C00000CA080000CA0C006B
+:10005000007C744B00C200050099C00000C41C3A2B
+:10006000007C744C00C0FFF000042C0400309002AF
+:10007000007D250000351402007D350B002554035A
+:10008000007CD58000259C030095C00400D5001B92
+:10009000007EDDC1007D9D8000D6801B00D5801BC9
+:1000A00000D4401E00D5401E00D6401E00D6801E43
+:1000B00000D4801E00D4C01E009783D400D5C01E7B
+:1000C00000CA08000080001B00CA0C0000E4011EEA
+:1000D00000D4001E0080000D00C4183800E4013E6A
+:1000E00000D4001E0080000D00C4183800D4401E4B
+:1000F00000EE001E00CA040000A00000007E828BFB
+:1001000000E4011E00D4001E00D4401E00EE001EBC
+:1001100000CA040000A00000007E828B00E4013EC3
+:1001200000D4001E00D4401E00EE001E00CA0400D1
+:1001300000A00000007E828B00CA180000D4401E80
+:1001400000D5801E0080005400D4007300D4401EEF
+:1001500000CA080000CA0C0000CA100000D48019B0
+:1001600000D4C01800D5001700D4801E00D4C01ED3
+:1001700000D5001E00E2001E00CA040000A000001E
+:10018000007E828B00CA080000D4806000D4401E2C
+:100190000080000200D4801E00CA080000D48061E4
+:1001A00000D4401E0080000200D4801E00CA080057
+:1001B00000CA0C0000D4401E00D4801600D4C01623
+:1001C00000D4801E008001B900D4C01E00C6083EC5
+:1001D00000CA0C0000CA10000094800400CA140079
+:1001E00000E420F300D4201300D5606500D4E01CA7
+:1001F00000D5201C00D5601C0080000200062001F4
+:1002000000C6083E00CA0C0000CA1000009483F724
+:1002100000CA140000E420F30080007A00D4201308
+:1002200000C6083E00CA0C0000CA1000009883EF08
+:1002300000CA140000D400640080008E000000009A
+:1002400000C4143200C6183E00C4082F00954005B3
+:1002500000C40C3000D4401E0080000200EE001EDE
+:10026000009583F500C4103100D4403300D52065DB
+:1002700000D4A01C00D4E01C00D5201C00D40073C6
+:1002800000E4015E00D4001E008001B900062001D8
+:10029000000A200100D6007400C4083600C61040D1
+:1002A0000098800700CC38350095010F00D4001F5E
+:1002B00000D460620080000200D4206200CC1433BD
+:1002C000008401BC00D4007000D5401E00800002F4
+:1002D00000EE001E00CA0C0000CA100000D4C01AB4
+:1002E000008401BC00D5001A00CC04430035101F67
+:1002F000002C9401007D098B00984005007D15CBF2
+:1003000000D4001A008001B900D4006D003444010B
+:1003100000CC0C440098403A00CC2C460095800458
+:1003200000CC0445008001B900D4001A00D4C01AE2
+:1003300000282801008400F300CC10030098801BE3
+:100340000004380C008400F300CC100300988017E0
+:1003500000043808008400F300CC100300988013D8
+:1003600000043804008400F300CC100300988014CB
+:1003700000CC1047009A800900CC1448009840DA5D
+:1003800000D4006D00CC184400D5001A00D5401AE6
+:10039000008000CC00D5801A0096C0D300D4006D38
+:1003A000008001B900D4006E009AC00300D4006D33
+:1003B00000D4006E0080000200EC007F009AC0CAEA
+:1003C00000D4006D008001B900D4006E00CC14038D
+:1003D00000CC180300CC1C03007D9103007DD58365
+:1003E000007D190C0035CC1F0035701F007CF0CB50
+:1003F000007CD08B00880000007E8E8B0095C004AE
+:1004000000D4006E008001B900D4001A00D4C01AD4
+:1004100000CC080300CC0C0300CC100300CC140368
+:1004200000CC180300CC1C0300CC240300CC280310
+:100430000035C41F0036B01F007C704B0034F01F25
+:10044000007C704B0035701F007C704B007D8881F4
+:10045000007DCCC1007E5101007E9541007C9082E0
+:10046000007CD4C2007C848B009AC003007C8C8BFF
+:10047000002C88010098809C00D4006D0098409A60
+:1004800000D4006E00CC084700CC0C4800CC1044CF
+:1004900000D4801A00D4C01A0080010400D5001ACC
+:1004A00000CC083200D40032009482D800CA0C007C
+:1004B00000D4401E0080000200D4001E00E4011E93
+:1004C00000D4001E00CA080000CA0C0000CA1000B8
+:1004D00000D4401E00CA140000D4801E00D4C01EE8
+:1004E00000D5001E00D5401E00D54034008000021B
+:1004F00000EE001E0028040400E2001A00E2001AC8
+:1005000000D4401A00CA380000CC080300CC0C0309
+:1005100000CC0C0300CC0C03009882BC000000004F
+:10052000008401BC00D7806F0080000200EE001F35
+:1005300000CA040000C2FF0000CC083400C13FFF25
+:10054000007C74CB007CC90B007D010F009902AFC9
+:10055000007C738B008401BC00D7806F0080000298
+:1005600000EE001F00CA080000281900007D898BDA
+:10057000009580140028140400CA0C0000CA100062
+:1005800000CA1C0000CA240000E2001F00D4C01AE8
+:1005900000D5001A00D5401A00CC180300CC2C035B
+:1005A00000CC2C0300CC2C03007DA58B007D9C4748
+:1005B00000984296000000000080016400D4C01A38
+:1005C00000D4401E00D4801E0080000200EE001EF9
+:1005D00000E4011E00D4001E00D4401E00EE001EE8
+:1005E00000CA040000A00000007E828B00E4013EEF
+:1005F00000D4001E00D4401E00EE001E00CA0400FD
+:1006000000A00000007E828B00CA080000248C0637
+:10061000000CCC060098C00600CC104900990004DC
+:1006200000D4007100E4011E00D4001E00D4401E5E
+:1006300000D4801E0080000200EE001E00CA0800E8
+:1006400000CA0C000034D018002510010095001FCE
+:1006500000C17FFF00CA100000CA140000CA1800C1
+:1006600000D4801D00D4C01D007DB18B00C14202AA
+:1006700000C2C00100D5801D0034DC0E007D5D4C41
+:10068000007F734C00D7401E00D5001E00D5401ED1
+:1006900000C1420000C2C00000099C010031DC1012
+:1006A000007F5F4C007F734C007D838000D5806F9E
+:1006B00000D5806600D7401E00EC005E00C8240212
+:1006C000008001B900D6007400D4401E00D4801E02
+:1006D00000D4C01E0080000200EE001E0080000258
+:1006E00000EE001F00D4001F0080000200D4001F95
+:1006F00000D4001F0088000000D4001F000000008C
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:10080000000101740002017B0003009000040080DD
+:100810000005000500060040000700330008012F16
+:1008200000090047000A0037001001B7001700A4B4
+:100830000022013D0023014C002000B500240128C6
+:100840000027004E0028006B002A0061002B005397
+:10085000002F00660032008800340182003C0159FC
+:10086000003F00730041018F0044013100550176C3
+:100870000056017D0060000C006100350062003907
+:1008800000630039006400390065003900660039F2
+:10089000006700390068003B00690042006A0049B7
+:1008A000006B0049006C0049006D0049006E004972
+:1008B000006F0049007301B7000000070000000747
+:1008C000000000070000000700000007000000070C
+:1008D00000000007000000070000000700000007FC
+:1008E00000000007000000070000000700000007EC
+:1008F00000000007000000070000000700000007DC
+:00000001FF
diff --git a/firmware/radeon/RS600_cp.bin.ihex b/firmware/radeon/RS600_cp.bin.ihex
new file mode 100644 (file)
index 0000000..4a89501
--- /dev/null
@@ -0,0 +1,130 @@
+:10000000000000004200E000000000004000E000AE
+:1000100000000008000000A000000008000000A48C
+:10002000000000004A554B4A000000004A4A44675D
+:100030000000000055526F75000000004A7E7D658B
+:10004000000000004AE74AF6000000004AD34A4A8E
+:1000500000000000D689898900000000CD4ADDCF6C
+:10006000000000008EBE4AE200000000C38A8A8AB7
+:10007000000000004A0F8CC800000004000CA00023
+:1000800000000038000D0012000000040000E8B479
+:1000900000000038000D0014000000040000E8B665
+:1000A00000000038000D0016000000040000E854B5
+:1000B00000000038000D0018000000040000E855A2
+:1000C00000000038000D001A000000040000E8568F
+:1000D00000000038000D001C000000040000E8577C
+:1000E00000000038000D001E000000040000E8249D
+:1000F00000000038000D0020000000040000E8258A
+:1001000000000038000D0022000000040000E8306C
+:1001100000000038000D0024000000040000F0C0C2
+:1001200000000038000D0026000000040000F0C1AF
+:1001300000000038000D0028000000040000F0411D
+:1001400000000038000D002A000000040000F184C7
+:1001500000000038000D002C000000040000F185B4
+:1001600000000038000D002E000000040000F186A1
+:1001700000000038000D0030000000040000F1878E
+:1001800000000038000D0032000000040000F18083
+:1001900000000038000D0034000000040000F3935C
+:1001A00000000038000D0036000000040000F38A53
+:1001B00000000038000D0038000000040000F38E3D
+:1001C000000000040000E821000000040140A0003D
+:1001D00000000018000000430000000400CCE8000C
+:1001E00000000004001B000100000004080048009B
+:1001F00000000004001B000100000004080048008B
+:1002000000000004001B000100000004080048007A
+:10021000000000080000003A000000000000A000FC
+:10022000000000042000451D000000040000E580DF
+:1002300000000004000CE581000000040800458077
+:1002400000000004000CE5810000000800000047E9
+:10025000000000000000A00000000004000C2000CE
+:10026000000000040000E50E000000040003200070
+:10027000000000280002205100000024000000516E
+:10028000000000040800450F000000080000A04B1B
+:10029000000000040000E565000000040000E566C1
+:1002A00000000008000000520000000403CCA5B4C8
+:1002B00000000004054320000000000400022000AC
+:1002C000000000304CCCE05E0000000408274565CB
+:1002D000000000300000005E0000000408004564DB
+:1002E000000000040000E566000000080000005562
+:1002F00000000010008020610000000400202000A9
+:1003000000000004001B00FF00000010010000645A
+:1003100000000004001F200000000004001C00FF7B
+:100320000000000C0000000000000030000000721F
+:100330000000000800000055000000040000E57601
+:10034000000000040000E577000000040000E50E56
+:10035000000000040000E50F000000040140A000C0
+:100360000000001800000069000000C200C0E5F9AC
+:100370000000000800000069000000040014E50E01
+:10038000000000040040E50F0000000800C0006C01
+:10039000000000040000E570000000040000E571AA
+:1003A0000000000C0000E572000000040000A00046
+:1003B000000000040140A000000000040000E56807
+:1003C00000000004000C200000000018000000766F
+:1003D00000000004000B00000000000418C0E562EB
+:1003E00000000008000000780000000800C000774E
+:1003F00000000004000700D5000000380000008461
+:1004000000000030000CA08600000004080045BB7E
+:1004100000000030000C2087000000000800E5BC50
+:10042000000000040000E5BB000000000000E5BC87
+:100430000000000C00120000000000040012000088
+:100440000000000C001B0002000000040000A000DF
+:10045000000000040000E821000000000000E800A7
+:10046000000000040000E821000000000000E82E69
+:100470000000000402CCA0000000000400140000F2
+:1004800000000004000CE1CC00000004050DE1CDEB
+:10049000000000040040000000000018000000966A
+:1004A0000000000400C0A00000000008000000934D
+:1004B0000000002000000098000000004200E00062
+:1004C000000000380000009F00000004000CA000A5
+:1004D000000000040014000000000004000C2000D4
+:1004E000000000040016000000000004700CE00092
+:1004F000000000080014009B000000004000E00025
+:10050000000000040240000000000004400EE00073
+:100510000000000402400000000000004000E00075
+:1005200000000004000C2000000000040240E51B55
+:10053000000000050080E50A000000050080E50BD2
+:10054000000000040022000000000004000700D5A5
+:1005500000000038000000B200000030000C2087CE
+:10056000000000050880E5BD00000030000C20867A
+:10057000000000050800E5BB00000030000C2087EB
+:10058000000000050880E5BC00000008000000B580
+:10059000000000050080E5BD000000050000E5BB8F
+:1005A000000000050080E5BC000000040021000000
+:1005B00000000004028000000000001800C000B924
+:1005C000000000404180E00000000024000000BB6B
+:1005D0000000000C010000000000000C0100E51DFF
+:1005E00000000004000045BB00000008000080B5CA
+:1005F000000000040000F3CE000000040140A00051
+:100600000000000400CC20000000004008C053CFD0
+:100610000000000000008000000000040000F3D291
+:10062000000000040140A0000000000400CC2000F5
+:100630000000004008C053D300000000000080000C
+:10064000000000040000F39D000000040140A00031
+:100650000000000400CC20000000004008C0539EB1
+:1006600000000000000080000000000403C008300B
+:10067000000000004200E000000000040000A000B4
+:1006800000000004200045E0000000000000E5E15B
+:10069000000000000000000100000004000700D27C
+:1006A000000000000800E3940000000000000000CB
+:1006B000000000040000E8C4000000040000E8C5D9
+:1006C000000000040000E8C6000000040000E92863
+:1006D000000000040000E929000000040000E92AED
+:1006E00000000008000000D6000000040000E92817
+:1006F000000000040000E929000000040000E92ACD
+:1007000000000008000000DD0000000000E001160D
+:1007100000000004000700E1000000040800401C85
+:1007200000000004200050E7000000040000E01D6D
+:1007300000000008000000E40000000402C02000E7
+:10074000000000040006000000000034000000EB80
+:1007500000000008000000E8000000040000800025
+:1007600000000000C000E0000000000000000000E9
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B00000000004000C200000000004001D0018D0
+:1007C00000000004001A000100000034000000FBDB
+:1007D000000000080000004A000000080500A04AD0
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/RS690_cp.bin.ihex b/firmware/radeon/RS690_cp.bin.ihex
new file mode 100644 (file)
index 0000000..6896274
--- /dev/null
@@ -0,0 +1,130 @@
+:1000000000000008000000DD00000008000000DF24
+:1000100000000008000000A000000008000000A48C
+:10002000000000004A554B4A000000004A4A44675D
+:100030000000000055526F75000000004A7E7D658B
+:10004000000000004AD74AF6000000004AC94A4AA8
+:1000500000000000CC89898900000000C34AD3C594
+:10006000000000008E4A4A4A000000004A8A8A8A3C
+:10007000000000004A0F8C4A00000004000CA000A1
+:1000800000000038000D0012000000040000E8B479
+:1000900000000038000D0014000000040000E8B665
+:1000A00000000038000D0016000000040000E854B5
+:1000B00000000038000D0018000000040000E855A2
+:1000C00000000038000D001A000000040000E8568F
+:1000D00000000038000D001C000000040000E8577C
+:1000E00000000038000D001E000000040000E8249D
+:1000F00000000038000D0020000000040000E8258A
+:1001000000000038000D0022000000040000E8306C
+:1001100000000038000D0024000000040000F0C0C2
+:1001200000000038000D0026000000040000F0C1AF
+:1001300000000038000D0028000000040000F0411D
+:1001400000000038000D002A000000040000F184C7
+:1001500000000038000D002C000000040000F185B4
+:1001600000000038000D002E000000040000F186A1
+:1001700000000038000D0030000000040000F1878E
+:1001800000000038000D0032000000040000F18083
+:1001900000000038000D0034000000040000F3935C
+:1001A00000000038000D0036000000040000F38A53
+:1001B00000000038000D0038000000040000F38E3D
+:1001C000000000040000E821000000040140A0003D
+:1001D00000000018000000430000000400CCE8000C
+:1001E00000000004001B000100000004080048009B
+:1001F00000000004001B000100000004080048008B
+:1002000000000004001B000100000004080048007A
+:10021000000000080000003A000000000000A000FC
+:10022000000000042000451D000000040000E580DF
+:1002300000000004000CE581000000040800458077
+:1002400000000004000CE5810000000800000047E9
+:10025000000000000000A00000000004000C2000CE
+:10026000000000040000E50E000000040003200070
+:10027000000000280002205100000024000000516E
+:10028000000000040800450F000000080000A04B1B
+:10029000000000040000E565000000040000E566C1
+:1002A00000000008000000520000000403CCA5B4C8
+:1002B00000000004054320000000000400022000AC
+:1002C000000000304CCCE05E0000000408274565CB
+:1002D000000000300000005E0000000408004564DB
+:1002E000000000040000E566000000080000005562
+:1002F00000000010008020610000000400202000A9
+:1003000000000004001B00FF00000010010000645A
+:1003100000000004001F200000000004001C00FF7B
+:100320000000000C0000000000000030000000721F
+:100330000000000800000055000000040000E57601
+:10034000000000040000E577000000040000E50E56
+:10035000000000040000E50F000000040140A000C0
+:100360000000001800000069000000C200C0E5F9AC
+:100370000000000800000069000000040014E50E01
+:10038000000000040040E50F0000000800C0006C01
+:10039000000000040000E570000000040000E571AA
+:1003A0000000000C0000E572000000040000A00046
+:1003B000000000040140A000000000040000E56807
+:1003C00000000004000C200000000018000000766F
+:1003D00000000004000B00000000000418C0E562EB
+:1003E00000000008000000780000000800C000774E
+:1003F00000000004000700CB00000038000000846B
+:1004000000000030000CA08600000004080045BB7E
+:1004100000000030000C2087000000000800E5BC50
+:10042000000000040000E5BB000000000000E5BC87
+:100430000000000C00120000000000040012000088
+:100440000000000C001B0002000000040000A000DF
+:10045000000000040000E821000000000000E800A7
+:10046000000000040000E821000000000000E82E69
+:100470000000000402CCA0000000000400140000F2
+:1004800000000004000CE1CC00000004050DE1CDEB
+:10049000000000040040000000000018000000966A
+:1004A0000000000400C0A00000000008000000934D
+:1004B0000000002000000098000000004200E00062
+:1004C000000000380000009F00000004000CA000A5
+:1004D000000000040014000000000004000C2000D4
+:1004E000000000040016000000000004700CE00092
+:1004F000000000080014009B000000004000E00025
+:10050000000000040240000000000004400EE00073
+:100510000000000402400000000000004000E00075
+:100520000000002C0010000000000000000040004F
+:1005300000000004080045C8000000040024000575
+:100540000000000408004D0B00000004000C200017
+:10055000000000040240E51B000000050080E50AE1
+:10056000000000050080E50B0000000400220000F0
+:1005700000000004000700CB00000038000000B7B6
+:1005800000000030000C2087000000050880E5BD59
+:1005900000000030000C2086000000050800E5BBCC
+:1005A00000000030000C2087000000050880E5BC3A
+:1005B00000000008000000BA000000050080E5BD52
+:1005C000000000050000E5BB000000050080E5BC60
+:1005D0000000000400210000000000040280000070
+:1005E0000000001800C000BE000000404180E00094
+:1005F00000000024000000C00000000C010000000A
+:100600000000000C0100E51D00000004000045BBD7
+:1006100000000008000080BA0000000403C0083099
+:10062000000000004200E000000000040000A00004
+:1006300000000004200045E0000000000000E5E1AB
+:10064000000000000000000100000004000700C8D6
+:10065000000000000800E39400000000000000001B
+:10066000000000040000E8C4000000040000E8C529
+:10067000000000040000E8C6000000040000E928B3
+:10068000000000040000E929000000040000E92A3D
+:1006900000000008000000CC000000040000E92871
+:1006A000000000040000E929000000040000E92A1D
+:1006B00000000008000000D30000000402C0200079
+:1006C000000000040006000000000034000000DB11
+:1006D00000000008000000D80000000400008000B6
+:1006E00000000000C000E00000000030000000E159
+:1006F000000000004200E00000000030000000E1C7
+:10070000000000004000E000000000040025001B85
+:100710000000000400230000000000040025000584
+:1007200000000034000000E60000000C00000000A3
+:10073000000000040024400000000004080045C838
+:1007400000000004002400050000000C08004D0B10
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B00000000004000C200000000004001D0018D0
+:1007C00000000004001A000100000034000000FBDB
+:1007D000000000080000004A000000080500A04AD0
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:00000001FF
+/* production radeon ucode r1xx-r6xx */
diff --git a/firmware/radeon/RS780_me.bin.ihex b/firmware/radeon/RS780_me.bin.ihex
new file mode 100644 (file)
index 0000000..6479c10
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A0000060441100000622000000000060000013
+:1000B000000005D10000000000600000000005DE27
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:100660000000000000600000000005FF0000000026
+:1006700000600000000005F30000000200210E22CF
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE0000000000000600000000005F900000000A8
+:100AF00000400000000000EB00000000006000006B
+:100B0000000005FC000000070020222D000000006E
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E9000000006220000001F0021023000000000B8
+:100EA0000000000014C00000000006210000000443
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000062200000011002102300000000066
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000062100000000002B1405000000001D
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A000000000010000000000600000000005DEF3
+:1019B000000000000040040F0000021300000000BF
+:1019C00000600000000005D1000000000060000081
+:1019D000000005DE00000210006004110000031585
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B100000600000000005D10000A00C002044116E
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E3000000420040060441100000622000000009D
+:101E400000600000000005D100000000C06000003C
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000005FF0000000000600000000002B5A3
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:10224000000005F60000000000400000000002DE73
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A0000000097000000C020441165
+:102600000000000000000000C02048110000000091
+:102610008A000000C02044110000000000000000FB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D00000000000C0200400000000000000000016
+:1026E00000A0000A00000000970000000020441134
+:1026F0000000000000000000002048110000000061
+:102700008A000000002044110000000000000000CA
+:1027100000204811000000000000225C002044114D
+:102720000000000000000000C02048000000000081
+:102730000000A1FC00204411000000000000000087
+:10274000C0204800000000000001A1FD002044114D
+:102750000000000000000000D90048000000000058
+:1027600000000000C0200400000000000000000085
+:1027700000A0000A000000000000225700204411C1
+:102780000000000000000003C0484A2000000000D4
+:102790000000225D00204411000000000000000045
+:1027A000C040480000000000000000000060000081
+:1027B000000005DE00000000C0200800000000004E
+:1027C0000000225C00204411000000000000000313
+:1027D00000384A22000000000000A1FC0020441143
+:1027E0000000000000000000C020480000000000C1
+:1027F0000001A1FD002044110000000000000000C5
+:10280000002F022200000000000000000CE0000089
+:102810000000000000000000402048000000000010
+:102820000000000140304A200000000000000002CB
+:10283000C0304A20000000000000000100530A22BE
+:10284000000003550000003FC0280A2000000000DF
+:102850008100000000204411000000000000000181
+:102860000020481100000000000021F80020441161
+:1028700000000000000000180020481100000000C7
+:10288000000421F90060441100000622000000113C
+:1028900000210230000000000000000014E00000F1
+:1028A0000000035E00000014002F02220000000060
+:1028B000000000000CC000000000036C0001A2A496
+:1028C00000204411000000000000000000604802E9
+:1028D00000000374000021000020441100000000EB
+:1028E00000000000C02048000000000000000000C0
+:1028F000C02048000000000000000000C020480088
+:102900000000000000000000C0404800000000007F
+:1029100000000004002F0222000000000000000060
+:102920000CC00000000003700001A2A400204411AC
+:1029300000000000000000000040480200000367A3
+:1029400000000028002F022200000000000000000C
+:102950000CC00000000005BA0001A2A40020441130
+:102960000000000000000000004048020000036773
+:102970000000002C00203626000000000000004966
+:1029800000201811000000000000003F0020481146
+:10299000000000000000000100331A2600000000C3
+:1029A00000000000002F02260000000000000000D0
+:1029B0000CC00000000003760000002C00801A2DDF
+:1029C000000000000000003FC0280A2000000000B6
+:1029D00000000015002F022200000000000000008F
+:1029E0000CE000000000038C00000006002F022213
+:1029F00000000000000000000CE00000000003B731
+:102A000000000016002F022200000000000000005D
+:102A10000CE00000000003B900000020002F02229B
+:102A200000000000000000000CE00000000003A215
+:102A30000000000F002F0222000000000000000034
+:102A40000CE00000000003AE00000010002F022286
+:102A500000000000000000000CE00000000003AED9
+:102A60000000001E002F02220000000000000000F5
+:102A70000CE00000000003960000A2A40020441116
+:102A800000000000000000000040480200000000BC
+:102A90000800000000290A220000000000000003D6
+:102AA00040210E20000000000000000CC021122078
+:102AB00000000000000800000028122400000000B0
+:102AC00000000014C02216200000000000000000DA
+:102AD000002914A4000000000000A2A4002044115A
+:102AE0000000000000000000002948A200000000D3
+:102AF0000000A1FE002044110000000000000000C2
+:102B00000040480300000000810000000020441144
+:102B1000000000000000000100204811000000003B
+:102B2000000021F800204411000000000000001601
+:102B30000020481100000000000421F90060441149
+:102B400000000622000000150021023000000000F5
+:102B50000000000014E00000000003980000210EB7
+:102B6000002044110000000000000000C0204800C8
+:102B70000000000000000000C0204800000000002D
+:102B80000000A2A40020441100000000000000008A
+:102B900000404802000000008100000000204411B5
+:102BA00000000000000000010020481100000000AB
+:102BB000000021F800204411000000000000001770
+:102BC0000020481100000000000421F900604411B9
+:102BD0000000062200000003002102300000000077
+:102BE0000000000014E00000000003A40000210821
+:102BF000002044110000000000000000C020480038
+:102C00000000000000000000C0204800000000009C
+:102C10000000A2A4002044110000000000000000F9
+:102C200000404802000000000000A2A4002044115F
+:102C3000000000000000000000204802000000002A
+:102C4000800000000020441100000000000000008F
+:102C50000020481100000000810000000020441105
+:102C600000000000000000100020481100000000DB
+:102C70000000000000200010000000000000000024
+:102C800014C00000000003B4000000000040000079
+:102C9000000000000001A2A4002044110000000078
+:102CA0000000000600404811000000000001A2A43E
+:102CB00000204411000000000000001600604811D0
+:102CC000000003740000000000400000000000004D
+:102CD00000000000C020080000000000000000000C
+:102CE000C0200C00000000000000001D0021022395
+:102CF000000000000000000014E00000000003CE0F
+:102D000081000000002044110000000000000001CC
+:102D10000020481100000000000021F800204411AC
+:102D20000000000000000018002048110000000012
+:102D3000000421F900604411000006220000001187
+:102D400000210230000000000000000014E000003C
+:102D5000000003C200002100002044110000000018
+:102D600000000000002048020000000000000000F9
+:102D70000020480300000000BABECAFE002048112F
+:102D800000000000CAFEBABE00204811000000008A
+:102D90000000A2A400204411000000000000000474
+:102DA0000040481100000000000021700020441184
+:102DB00000000000000000000020480200000000A9
+:102DC0000000000000204803000000008100000017
+:102DD00000204411000000000000000A00204811FB
+:102DE00000000000000000000020001000000000B3
+:102DF0000000000014C00000000003D38C0000009D
+:102E00000020441100000000CAFEBABE0040481174
+:102E100000000000810000000020441100000000BC
+:102E200000000001002048110000000000003FFFEA
+:102E300040280A20000000008000000040280E20EA
+:102E40000000000040000000C02812200000000028
+:102E50000004000000694622000006220000000075
+:102E6000002014100000000000000000002F0223CA
+:102E700000000000000000000CC00000000003E1A2
+:102E800000000000C0401800000003E400003FFF05
+:102E9000C0281A2000000000000400000069462637
+:102EA00000000622000000000020181000000000B2
+:102EB00000000000002F02240000000000000000BD
+:102EC0000CC00000000003E700000000C0401C0030
+:102ED000000003EA00003FFFC0281E2000000000A1
+:102EE00000040000006946270000062200000000E0
+:102EF00000201C1000000000000000000020440220
+:102F00000000000000000000002820C500000000B4
+:102F100000000000004948E800000000A580000013
+:102F200000200811000000000000200000200C110B
+:102F30000000000083000000006044110000041243
+:102F4000000000000020440200000000000000001B
+:102F5000C0204800000000000000000040204800A1
+:102F6000000000000000001FC0210220000000003F
+:102F70000000000014C00000000003F70000201053
+:102F800000204411000000000000800000204811D3
+:102F9000000000000000FFFFC0481220000003FFF7
+:102FA000A780000000200811000000000000A00021
+:102FB00000200C110000000083000000006044119C
+:102FC0000000041200000000002044020000000085
+:102FD00000000000C02048000000000000000000C9
+:102FE000C0204800000000000000FFFFC0281220A1
+:102FF00000000000830000000020441100000000D9
+:103000000000000000304883000000008400000041
+:10301000002044110000000000000000C020480013
+:1030200000000000000000001D0000000000000083
+:103030008300000000604411000004120000000042
+:10304000C040040000000001A98000000020081119
+:10305000000000000000C00000400C11000003FA56
+:10306000AB80000000200811000000000000F8E024
+:1030700000400C11000003FAAD8000000020081190
+:10308000000000000000F88000400C11000003FA6E
+:10309000B380000000200811000000000000F3FCD5
+:1030A00000400C11000003FAAF800000002008115E
+:1030B000000000000000E00000400C11000003FAD6
+:1030C000B180000000200811000000000000F000A6
+:1030D00000400C11000003FA83000000002044119E
+:1030E00000000000000021480020481100000000FE
+:1030F00084000000002044110000000000000000D7
+:10310000C020480000000000000000001D0000007A
+:10311000000000000000000000800000000000002F
+:1031200001182000C0304620000000000000000010
+:10313000D90048000000000000000000C02004008A
+:10314000000000000000000000A0000A00000000D5
+:103150000218A000C030462000000000000000005F
+:10316000D90048000000000000000000C02004005A
+:10317000000000000000000000A0000A00000000A5
+:103180000318C000C030462000000000000000000E
+:10319000D90048000000000000000000C02004002A
+:1031A000000000000000000000A0000A0000000075
+:1031B0000418F8E0C03046200000000000000000C5
+:1031C000D90048000000000000000000C0200400FA
+:1031D000000000000000000000A0000A0000000045
+:1031E0000518F880C03046200000000000000000F4
+:1031F000D90048000000000000000000C0200400CA
+:10320000000000000000000000A0000A0000000014
+:103210000618E000C030462000000000000000005A
+:10322000D90048000000000000000000C020040099
+:10323000000000000000000000A0000A00000000E4
+:103240000718F000C0304620000000000000000019
+:10325000D90048000000000000000000C020040069
+:10326000000000000000000000A0000A00000000B4
+:103270000818F3FCC03046200000000000000000E9
+:10328000D90048000000000000000000C020040039
+:10329000000000000000000000A0000A0000000084
+:1032A00000000033C0300A200000000000000000D1
+:1032B000C0403440000000000000003000200A2D13
+:1032C0000000000000000000C0290C4000000000C9
+:1032D0000000003000203623000000000000000045
+:1032E000C0200400000000000000000000A0000A50
+:1032F00000000000860000000020441100000000D3
+:1033000000000000004048010000000085000000AF
+:10331000C0204411000000000000000000404801EF
+:10332000000000000000217C00204411000000008B
+:1033300000000018402102200000000000000000F2
+:1033400014C000000000044700800000C0494A206B
+:103350000000044800000000C020480000000000F9
+:1033600000000000C0204800000000000000000035
+:10337000C02048000000000081000000002044112F
+:1033800000000000000000010020481100000000C3
+:1033900000000000C0200800000000000000000441
+:1033A000002F0222000000000000000006E00000E4
+:1033B000000004500000000400200811000000007C
+:1033C0000000000017000000000000000004217F42
+:1033D00000604411000006220000001F002102309E
+:1033E000000000000000000014C000000000000009
+:1033F0000000000000404C020000045000000000EB
+:10340000C0200C000000000000000000C0201000E0
+:103410000000000000000000C020140000000000B8
+:1034200000000000C02018000000000000000000A4
+:10343000C0201C000000000000007F0000280A21BE
+:103440000000000000004500002F022200000000E4
+:10345000000000000CE0000000000461000000001B
+:10346000C02020000000000000000004002F0228FF
+:10347000000000000000000006E000000000046101
+:1034800000000004002020110000000000000000E7
+:1034900017000000000000000000001000280A23B0
+:1034A0000000000000000010002F022200000000B9
+:1034B000000000000CE00000000004698100000032
+:1034C000002044110000000000000001002048110D
+:1034D00000000000000400000069462400000622ED
+:1034E00000000000004000000000046E81000000A9
+:1034F00000204411000000000000000000204811DE
+:10350000000000000000216D0020441100000000B8
+:10351000000000000020480400000000000000003F
+:10352000006048050000062700000000002824F085
+:10353000000000000000000700280A23000000002F
+:1035400000000001002F0222000000000000000027
+:103550000AE000000000047500000000002F00C910
+:10356000000000000000000004E000000000048EE5
+:1035700000000000004000000000049B000000026A
+:10358000002F022200000000000000000AE00000FE
+:103590000000047A00000000002F00C900000000B5
+:1035A0000000000002E000000000048E00000000A7
+:1035B000004000000000049B00000003002F0222D6
+:1035C00000000000000000000AE000000000047F8E
+:1035D00000000000002F00C90000000000000000F3
+:1035E0000CE000000000048E00000000004000001D
+:1035F0000000049B00000004002F022200000000D5
+:10360000000000000AE00000000004840000000048
+:10361000002F00C900000000000000000AE00000C8
+:103620000000048E00000000004000000000049B29
+:1036300000000005002F0222000000000000000032
+:103640000AE000000000048900000000002F00C90B
+:10365000000000000000000006E000000000048EF2
+:1036600000000000004000000000049B0000000675
+:10367000002F022200000000000000000AE000000D
+:103680000000048E00000000002F00C900000000B0
+:103690000000000008E000000000048E00000000B0
+:1036A000004000000000049B00007F0000280A2169
+:1036B0000000000000004500002F02220000000072
+:1036C000000000000AE00000000000000000000808
+:1036D00000210A23000000000000000014C00000C8
+:1036E000000004980000216900204411000000003F
+:1036F00000000000C02048000000000000000000A2
+:10370000C02048000000000000000000C020480069
+:1037100000000000CAFEBABE0040481100000000D0
+:1037200000000000C0204400000000000000000075
+:10373000C02000000000000000000000C040480061
+:103740000000000000007F0000280A2100000000A7
+:1037500000004500002F02220000000000000000D1
+:103760000AE00000000004A100000000C0200000EA
+:103770000000000000000000C02000000000000069
+:1037800000000000C0400000000000000000000039
+:1037900000404C080000046100000000C020080048
+:1037A000000000000000001040210E20000000007A
+:1037B0000000001140211220000000000000001253
+:1037C0004021162000000000000021690020441163
+:1037D000000000000000000000204802000000007F
+:1037E0000000000000210225000000000000000091
+:1037F00014E00000000004AB00040000C0494A20AF
+:10380000000004ACFFFBFFFFC0284A2000000000BE
+:103810000000000000210223000000000000000062
+:1038200014E00000000004B800000000C0204800C0
+:103830000000000000000000C02048000000000060
+:103840000000000000210224000000000000000031
+:1038500014C000000000000081000000002044119E
+:10386000000000000000000C0020481100000000D3
+:103870000000000000200010000000000000000018
+:1038800014C00000000004B4A00000000020441197
+:1038900000000000CAFEBABE00404811000000004F
+:1038A000810000000020441100000000000000041E
+:1038B00000204811000000000000216B002044118E
+:1038C0000000000000000000C020481000000000C0
+:1038D00081000000002044110000000000000005ED
+:1038E00000204811000000000000216C002044115D
+:1038F0000000000000000000C02048100000000090
+:1039000000000000002F0224000000000000000062
+:103910000CE000000000000000000000004000007B
+:10392000000004B200000000C0210A2000000000D6
+:103930000000000014C00000000004CB8100000063
+:103940000020441100000000000000000020481189
+:10395000000000000000216D002044110000000064
+:1039600000000000C020480000000000000000002F
+:10397000C060480000000627000000000040000072
+:10398000000004CF8100000000204411000000006E
+:1039900000000001002048110000000000040000A9
+:1039A000C02946200000000000000000C0600000A8
+:1039B0000000062200000001002102220000000099
+:1039C0000000000014C00000000004D600002169BF
+:1039D000002044110000000000000000C02048004A
+:1039E0000000000000000000C020480000000000AF
+:1039F000000000000020481000000000CAFEBABE0F
+:103A0000004048110000000000000000C0204400F9
+:103A10000000000000000000C0404810000000004E
+:103A2000810000000020441100000000000000019F
+:103A30000020481100000000000021F8002044117F
+:103A4000000000000000000E0020481100000000EF
+:103A5000000421F90060441100000622000000006B
+:103A600000210230000000000000000014C000002F
+:103A7000000004D800002180002044110000000054
+:103A800000000000C020480000000000000000000E
+:103A9000C02000000000000000000000C02048001E
+:103AA0000000000000000000C02000000000000036
+:103AB00000000000C04048000000000000000003BB
+:103AC00000333E2F00000000000000010021022111
+:103AD000000000000000000014E0000000000508E5
+:103AE0000000002C00200A2D00000000000400004F
+:103AF00018E00C11000004F70000000100333E2F15
+:103B000000000000000021690020441100000000B6
+:103B1000000000000020480200000000000000003B
+:103B200000204803000000000000000800300A22C6
+:103B30000000000000000000C0204800000000005D
+:103B400000000000C02048000000000000002169C3
+:103B50000020441100000000000000000020480286
+:103B600000000000000000000020480300000000EA
+:103B70000000000800300A220000000000000000E1
+:103B8000C02048000000000000000000D8C048002D
+:103B9000000004EB00002169002044110000000037
+:103BA00000000000002048020000000000000000AB
+:103BB00000204803000000000000000800300A2236
+:103BC0000000000000000000C020480000000000CD
+:103BD00000000000C0204800000000000000002D90
+:103BE0000020122D000000000000000000290C83BE
+:103BF00000000000000021690020441100000000C6
+:103C0000000000000020480200000000000000004A
+:103C100000204803000000000000000800300A22D5
+:103C20000000000000000000C0204800000000006C
+:103C300000000000C020480000000000000000114B
+:103C400000210224000000000000000014C0000059
+:103C5000000000000000000000400000000004B26E
+:103C60000000002CC0203620000000000000002DC5
+:103C7000C0403620000000000000000F002102219B
+:103C8000000000000000000014C000000000050D4E
+:103C900000000000006000000000000B00000000B9
+:103CA000D90000000000000000000000C040040037
+:103CB00000000001B50000000020441100000000D9
+:103CC000000020000020481100000000B6000000A5
+:103CD00000204411000000000000A0000020481156
+:103CE00000000000B70000000020441100000000A8
+:103CF0000000C0000020481100000000B8000000D3
+:103D000000204411000000000000F8E000204811ED
+:103D100000000000B9000000002044110000000075
+:103D20000000F8800020481100000000BA000000E8
+:103D300000204411000000000000E00000204811B5
+:103D400000000000BB000000002044110000000043
+:103D50000000F0000020481100000000BC0000003E
+:103D600000204411000000000000F3FC0020481176
+:103D7000000000008100000000204411000000004D
+:103D8000000000020020481100000000000000FFB9
+:103D900000280E300000000000000000002F022369
+:103DA00000000000000000000CC000000000052121
+:103DB00000000000C020080000000000000000001B
+:103DC00014C00000000005360000000000200C11A7
+:103DD000000000000000001C00203623000000004E
+:103DE0000000002B00203623000000000000002906
+:103DF00000203623000000000000002800203623A9
+:103E00000000000000000017002036230000000022
+:103E100000000025002036230000000000000026DE
+:103E2000002036230000000000000015002036238B
+:103E300000000000000000160020362300000000F3
+:103E4000FFFFE00000200C11000000000000002136
+:103E5000002036230000000000000022002036234E
+:103E60000000000000001FFF00200C1100000000F7
+:103E70000000002300203623000000000000002482
+:103E80000020362300000000F1FFFFFF00283A2E3B
+:103E9000000000000000001AC0220E2000000000F8
+:103EA000000000000029386E0000000081000000C2
+:103EB000002044110000000000000006002048110E
+:103EC000000000000000002A402036200000000012
+:103ED00087000000002044110000000000000000E6
+:103EE000C0204800000000000000A1F400204411A0
+:103EF000000000000000000000204810000000004A
+:103F00009D00000000204411000000000000001F80
+:103F100040214A20000000009600000000204411CB
+:103F20000000000000000000C02048000000000069
+:103F300000000000C0200C00000000000000000095
+:103F4000C0201000000000000000001F0021162407
+:103F5000000000000000000014C00000000000008D
+:103F60000000001D002036230000000000000003B8
+:103F700000281E2300000000000000080022222369
+:103F800000000000FFFFF0000028222800000000D1
+:103F900000000000002920E8000000000000001FD1
+:103FA00000203628000000000000001800211E2319
+:103FB0000000000000000020002036270000000064
+:103FC0000000000200221624000000000000000093
+:103FD000003014A8000000000000001E002036255C
+:103FE000000000000000000300211A24000000006F
+:103FF0001000000000281A2600000000EFFFFFFF5D
+:1040000000283A2E0000000000000000004938CED1
+:10401000000006100000000140280A2000000000F7
+:104020000000000640280E200000000000000300F1
+:10403000C028122000000000000000080021122407
+:104040000000000000000000C0201620000000005A
+:1040500000000000C0201A20000000000000000046
+:1040600000210222000000000000000014C0000037
+:104070000000056C810000000020441100000000D9
+:10408000000000010020481100000000000022583C
+:1040900000300A24000000000004000000694622ED
+:1040A00000000622000021690020441100000000E9
+:1040B0000000000000204805000000000002000091
+:1040C00000294A26000000000000000000204810DF
+:1040D00000000000CAFEBABE002048110000000027
+:1040E00000000002002F022300000000000000007A
+:1040F0000CC000000000057400000000C0201C106F
+:104100000000000000000000C04000000000058228
+:1041100000000002002F0223000000000000000049
+:104120000CC0000000000574810000000020441154
+:104130000000000000000001002048110000000005
+:104140000000225800300A24000000000004000093
+:10415000006946220000062200000000C0201C105A
+:104160000000000000000000C040000000000582C8
+:1041700000000000002F02230000000000000000EB
+:104180000CC000000000057800000000C0201C00EA
+:104190000000000000000000C04000000000058298
+:1041A00000000004002F02230000000000000000B7
+:1041B0000CC00000000005808100000000204411B8
+:1041C0000000000000000000002048110000000076
+:1041D0000000216D002044110000000000000000DC
+:1041E000C02048000000000000000000C06048003F
+:1041F000000006270000000000401C10000005829F
+:1042000000000000C02000000000000000000000CE
+:10421000C040000000000000000000000EE00000B0
+:10422000000005840000000000600000000005C3DD
+:1042300000000000002F0224000000000000000029
+:104240000CC00000000005920000A2B7002044113D
+:1042500000000000000000000020480700000000EF
+:10426000000000330020262D000000000000001A8E
+:10427000002122290000000000000006002226295B
+:10428000000000000000A2C4002044110000000053
+:1042900000000000003048E90000000000000000BD
+:1042A00000E00000000005900000A2D100204411B1
+:1042B000000000000000000000404808000000006E
+:1042C0000000A2D100204411000000000000000105
+:1042D00000504A280000000000000001002F0224C6
+:1042E00000000000000000000CC00000000005A05D
+:1042F0000000A2BB002044110000000000000000EC
+:104300000020480700000000000000340020262D97
+:10431000000000000000001A002122290000000017
+:104320000000000600222629000000000000A2C5AF
+:10433000002044110000000000000000003048E9A7
+:10434000000000000000000000E000000000059EEA
+:104350000000A2D200204411000000000000000074
+:1043600000404808000000000000A2D200204411D4
+:10437000000000000000000100504A28000000007A
+:1043800000000002002F02240000000000000000D6
+:104390000CC00000000005AE0000A2BF00204411C8
+:1043A000000000000000000000204807000000009E
+:1043B000000000350020262D000000000000001A3B
+:1043C000002122290000000000000006002226290A
+:1043D000000000000000A2C6002044110000000000
+:1043E00000000000003048E900000000000000006C
+:1043F00000E00000000005AC0000A2D30020441142
+:10440000000000000000000000404808000000001C
+:104410000000A2D3002044110000000000000001B1
+:1044200000504A28000000000000A2C300204411F0
+:10443000000000000000000000204807000000000D
+:10444000000000360020262D000000000000001AA9
+:104450000021222900000000000000060022262979
+:10446000000000000000A2C700204411000000006E
+:1044700000000000003048E90000000000000000DB
+:1044800000E00000000005B80000A2D400204411A4
+:10449000000000000000000000404808000000008C
+:1044A0000000A2D400204411000000000000000120
+:1044B00000504A2800000000850000000020441140
+:1044C0000000000000000000002048010000000083
+:1044D0000000304A002044110000000001000000EC
+:1044E0000020481100000000000000000040000013
+:1044F000000005BEA4000000C02044110000000020
+:1045000000000000C0404800000000000000000063
+:10451000C0600000000005C300000000C0400400AF
+:10452000000000010001A2A40020441100000000CE
+:104530000000003F00204811000000000000003F84
+:1045400000204811000000000000003F002048113A
+:10455000000000000000003F0020481100000000A3
+:104560000000000500204811000000000000A1F438
+:10457000002044110000000000000000002048114D
+:10458000000000008800000000204411000000002E
+:10459000000000010020481100000000FF000000A2
+:1045A000002044110000000000000000002048111D
+:1045B0000000000000000001002048110000000081
+:1045C0000000000200804811000000000000000010
+:1045D0000EE00000000005D60000100000200811C9
+:1045E000000000000000002B002036220000000028
+:1045F0000000000000600000000005DA000000007C
+:1046000000600000000005C3980000000020441175
+:1046100000000000000000000080481100000000C1
+:1046200000000000C0600000000005DA000000008B
+:10463000C0400400000000010000A2A400204411BA
+:1046400000000000000000220020481100000000CF
+:10465000890000000020441100000000000000015B
+:1046600000404811000005CD9700000000204411D3
+:1046700000000000000000000020481100000000C1
+:104680008A0000000020441100000000000000002B
+:1046900000404811000005CD00000000006000004F
+:1046A000000005F30001A2A4C02044110000000096
+:1046B0000000001600604811000003740000201084
+:1046C00000204411000000000001000000204811FB
+:1046D00000000000810000000020441100000000E4
+:1046E0000000000100204811000000000000217CB3
+:1046F0000020441100000000098000000020481143
+:1047000000000000FFFFFFFF002048110000000034
+:104710000000000000204811000000000000000020
+:1047200017000000000000000004217F0060441119
+:10473000000006220000001F0021023000000000DF
+:104740000000000014C00000000000000000000491
+:1047500000404C11000005ED00000000004000008A
+:10476000000000000000001700201E2D00000000C7
+:104770000000000400291E270000000000000017B0
+:1047800000803627000000000000001700201E2DCA
+:1047900000000000FFFFFFFB00281E2700000000B4
+:1047A00000000017008036270000000000000017FE
+:1047B00000201E2D000000000000000800291E2718
+:1047C00000000000000000170080362700000000F5
+:1047D0000000001700201E2D00000000FFFFFFF763
+:1047E00000281E2700000000000000170080362768
+:1047F000000000000001A2A40020441100000000FD
+:104800000000001600604811000003740000201032
+:1048100000204411000000000001000000204811A9
+:10482000000000000000217C002044110000000076
+:10483000018000000020481100000000FFFFFFFF82
+:104840000020481100000000000000000020481176
+:104850000000000000000000170000000000000041
+:104860008100000000204411000000000000000151
+:1048700000204811000000000004217F0060441166
+:10488000000006220000001F00210230000000008E
+:104890000000000014C0000000000621000000100D
+:1048A00000404C110000060700000000C02004007A
+:1048B000000000000000000038C000000000000000
+:1048C0000000001D00200A2D000000000000001E56
+:1048D00000200E2D000000000000001F0020122DFF
+:1048E00000000000000000200020162D0000000045
+:1048F00000002169002044110000000000000000B9
+:1049000000204804000000000000000000204805CE
+:10491000000000000000000000204801000000002E
+:10492000CAFEBABE002048110000000000000004CA
+:10493000003012240000000000000000002F00647E
+:1049400000000000000000000CC000000000062075
+:104950000000000300281A220000000000000008E8
+:104960000022122200000000FFFFF00000281224A5
+:104970000000000000000000002910C4000000003A
+:104980000000001F0040362400000000000000006E
+:104990000080000000000000000000001AC00000BD
+:1049A000000006229F0000000020441100000000CB
+:1049B000CAFEBABE0020481100000000000000003E
+:1049C0001AE0000000000625000000000080000042
+:1049D00000000000000000001AC0000000000627D0
+:1049E0009E0000000020441100000000CAFEBABE74
+:1049F0000020481100000000000000001AE0000044
+:104A00000000062A000000000080000000000000F6
+:104A100000000000006000000000000B000010001B
+:104A200000600411000003150000000000200411C4
+:104A3000000000000000000000600811000001B24A
+:104A40000000225C00204411000000000000000370
+:104A500000204811000000000000225600204411F0
+:104A6000000000000000001B0020481100000000B2
+:104A70000000A1FC00204411000000000000000123
+:104A800000204811000000000001A1FDC0204411D9
+:104A9000000000000000002100201E2D000000008A
+:104AA0000000001000221E2700000000000000246B
+:104AB0000020222D000000000000FFFF0028222817
+:104AC000000000000000000000294907000000006D
+:104AD000000000000020481100000000000000223B
+:104AE0000020222D000000000000FFFF00282228E7
+:104AF000000000000000000000294907000000003D
+:104B00000000000000204811000000000000002309
+:104B100000201E2D000000000000001000221E27B3
+:104B2000000000000000000000294907000000000C
+:104B300000000000004048110000000000000000DC
+:104B40000000000000000000000000000000000065
+:104B50000000000000000000000000000000000055
+:104B60000000000000000000000000000000000045
+:104B70000000000000000000000000000000000035
+:104B80000000000000000000000000000000000025
+:104B90000000000000000000000000000000000015
+:104BA0000000000000000000000000000000000005
+:104BB00000000000000000000000000000000000F5
+:104BC00000000000000000000000000000000000E5
+:104BD00000000000000000000000000000000000D5
+:104BE00000000000000000000000000000000000C5
+:104BF00000000000000000000000000000000000B5
+:104C000000000000000000000000000000000000A4
+:104C10000000000000000000000000000000000094
+:104C20000000000000000000000000000000000084
+:104C30000000000000000000000000000000000074
+:104C40000000000000000000000000000000000064
+:104C50000000000000000000000000000000000054
+:104C60000000000000000000000000000000000044
+:104C70000000000000000000000000000000000034
+:104C80000000000000000000000000000000000024
+:104C90000000000000000000000000000000000014
+:104CA0000000000000000000000000000000000004
+:104CB00000000000000000000000000000000000F4
+:104CC00000000000000000000000000000000000E4
+:104CD00000000000000000000000000000000000D4
+:104CE00000000000000000000000000000000000C4
+:104CF00000000000000000000000000000000000B4
+:104D000000000000000000000000000000000000A3
+:104D10000000000000000000000000000000000093
+:104D20000000000000000000000000000000000083
+:104D30000000000000000000000000000000000073
+:104D40000000000000000000000000000000000063
+:104D50000000000000000000000000000000000053
+:104D60000000000000000000000000000000000043
+:104D70000000000000000000000000000000000033
+:104D80000000000000000000000000000000000023
+:104D90000000000000000000000000000000000013
+:104DA0000000000000000000000000000000000003
+:104DB00000000000000000000000000000000000F3
+:104DC00000000000000000000000000000000000E3
+:104DD00000000000000000000000000000000000D3
+:104DE00000000000000000000000000000000000C3
+:104DF00000000000000000000000000000000000B3
+:104E000000000000000000000000000000000000A2
+:104E10000000000000000000000000000000000092
+:104E20000000000000000000000000000000000082
+:104E30000000000000000000000000000000000072
+:104E40000000000000000000000000000000000062
+:104E50000000000000000000000000000000000052
+:104E60000000000000000000000000000000000042
+:104E70000000000000000000000000000000000032
+:104E80000000000000000000000000000000000022
+:104E90000000000000000000000000000000000012
+:104EA0000000000000000000000000000000000002
+:104EB00000000000000000000000000000000000F2
+:104EC00000000000000000000000000000000000E2
+:104ED00000000000000000000000000000000000D2
+:104EE00000000000000000000000000000000000C2
+:104EF00000000000000000000000000000000000B2
+:104F000000000000000000000000000000000000A1
+:104F10000000000000000000000000000000000091
+:104F20000000000000000000000000000000000081
+:104F30000000000000000000000000000000000071
+:104F40000000000000000000000000000000000061
+:104F50000000000000000000000000000000000051
+:104F60000000000000000000000000000000000041
+:104F70000000000000000000000000000000000031
+:104F80000000000000000000000000000000000021
+:104F90000000000000000000000000000000000011
+:104FA0000000000000000000000000000000000001
+:104FB00000000000000000000000000000000000F1
+:104FC00000000000000000000000000000000000E1
+:104FD00000000000000000000000000000000000D1
+:104FE00000000000000000000000000000000000C1
+:104FF00000000000000000000000000000000000B1
+:1050000000000000000000000000000000000000A0
+:105010000000000000000000000000000000000090
+:105020000000000000000000000000000000000080
+:105030000000000000000000000000000000000070
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B0000142050A05BA02500000000001C301685E
+:1052C000044105BA00000000022502090250015104
+:1052D000000000000223024502A00241000000007D
+:1052E00003D705BA05BA05BA0000000005E205E3D8
+:1052F000031F05BA00000000032005BF0320034A76
+:105300000000000003340282034C033E0000000052
+:1053100005BA05BA05BA05BA0000000005BA055776
+:1053200005BA032A0000000003BC05BA04C3034EFB
+:105330000000000004A20455043F05BA000000006C
+:1053400004D805BA044304E5000000000455050F25
+:10535000035B037B0000000005BA05BA05BA05BA75
+:105360000000000005BA05BA05BA05BA0000000041
+:1053700005BA05BA05D805C10000000005BA05BA8E
+:10538000000705BA0000000005BA05BA05BA05BA5B
+:105390000000000005BA05BA05BA05BA0000000011
+:1053A00003F803ED0408040600000000040E040ADC
+:1053B000040C041000000000041C04180424042041
+:1053C00000000000042C0428043404300000000015
+:1053D00005BA05BA043A04380000000005BA05BA57
+:1053E00005BA05BA0000000005BA05BA05BA05BA43
+:1053F000000000000002060E062C0006000000005F
+:00000001FF
diff --git a/firmware/radeon/RS780_pfp.bin.ihex b/firmware/radeon/RS780_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..4088041
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001DB007C038B00D4401E00EE001E3C
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581CB00C41C3AE5
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFE000042C0800309002007D250055
+:1000700000351402007D350B00255407007CD58027
+:1000800000259C070095C00400D5001B007EDDC143
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA080000CA0C00008001DB30
+:1001400000D4802400CA0800007C00C000C8142528
+:1001500000C81824007C9488007C988000C20003AA
+:1001600000D40075007C744C0080006400D4401EF4
+:1001700000CA180000D4401E00D5801E0080006216
+:1001800000D4007500D4401E00CA080000CA0C004C
+:1001900000CA100000D4801900D4C01800D5001780
+:1001A00000D4801E00D4C01E00D5001E00E2001E38
+:1001B00000CA040000A00000007E828B00D40075FD
+:1001C00000D4401E00CA080000CA0C0000CA10007B
+:1001D00000D4801900D4C01800D5001700D4801EA8
+:1001E00000D4C01E00D5001E00EE001E00CA040090
+:1001F00000A00000007E828B00CA080000248C0151
+:1002000000D480600094C0030004100100041002B8
+:1002100000D5002500D4401E0080000000D4801EC0
+:1002200000CA080000D4806100D4401E0080000095
+:1002300000D4801E00CA080000CA0C0000D4401E72
+:1002400000D4801600D4C01600D4801E008001DBCC
+:1002500000D4C01E00C6084300CA0C0000CA10002B
+:100260000094800400CA140000E420F300D420139A
+:1002700000D5606500D4E01C00D5201C00D5601CB2
+:10028000008000000006200100C6084300CA0C00E0
+:1002900000CA1000009483F700CA140000E420F3A1
+:1002A0000080009C00D4201300C6084300CA0C0044
+:1002B00000CA1000009883EF00CA140000D4006444
+:1002C000008000B00000000000C4143200C61843D3
+:1002D00000C4082F0095400500C40C3000D4401E17
+:1002E0000080000000EE001E009583F500C4103170
+:1002F00000D4403300D5206500D4A01C00D4E01CFD
+:1003000000D5201C00E4015E00D4001E0080000027
+:100310000006200100CA1800000A200100D600765D
+:1003200000C408360098800700C6104500950110EB
+:1003300000D4001F00D460620080000000D420625E
+:1003400000CC383500CC1433008401DE00D40072B8
+:1003500000D5401E0080000000EE001E00E2001AE2
+:10036000008401DE00E2001A00CC104B00CC0447F0
+:10037000002C9401007D098B00984005007D15CB71
+:1003800000D4001A008001DB00D4006D0034440169
+:1003900000CC0C480098403A00CC2C4A00958004D0
+:1003A00000CC0449008001DB00D4001A00D4C01A3C
+:1003B000002828010084011300CC10030098801B42
+:1003C0000004380C0084011300CC1003009880173F
+:1003D000000438080084011300CC10030098801337
+:1003E000000438040084011300CC1003009880142A
+:1003F00000CC104C009A800900CC144D009840DCD1
+:1004000000D4006D00CC184800D5001A00D5401A61
+:10041000008000EC00D5801A0096C0D500D4006D95
+:10042000008001DB00D4006E009AC00300D4006D90
+:1004300000D4006E0080000000EC007F009AC0CC69
+:1004400000D4006D008001DB00D4006E00CC1403EA
+:1004500000CC180300CC1C03007D9103007DD583E4
+:10046000007D190C0035CC1F0035701F007CF0CBCF
+:10047000007CD08B00880000007E8E8B0095C0042D
+:1004800000D4006E008001DB00D4001A00D4C01A32
+:1004900000CC080300CC0C0300CC100300CC1403E8
+:1004A00000CC180300CC1C0300CC240300CC280390
+:1004B0000035C41F0036B01F007C704B0034F01FA5
+:1004C000007C704B0035701F007C704B007D888174
+:1004D000007DCCC1007E5101007E9541007C908260
+:1004E000007CD4C2007C848B009AC003007C8C8B7F
+:1004F000002C88010098809E00D4006D0098409CDC
+:1005000000D4006E00CC084C00CC0C4D00CC104840
+:1005100000D4801A00D4C01A0080012400D5001A2B
+:1005200000CC083200D40032009482B600CA0C001D
+:1005300000D4401E0080000000D4001E00E4011E14
+:1005400000D4001E00CA080000CA0C0000CA100037
+:1005500000D4401E00CA140000D4801E00D4C01E67
+:1005600000D5001E00D5401E00D54034008000009C
+:1005700000EE001E0028040400E2001A00E2001A47
+:1005800000D4401A00CA380000CC080300CC0C0389
+:1005900000CC0C0300CC0C030098829A00000000F1
+:1005A000008401DE00D7A06F0080000000EE001F75
+:1005B00000CA040000C2FF0000CC083400C13FFFA5
+:1005C000007C74CB007CC90B007D010F0099028D6B
+:1005D000007C738B008401DE00D7A06F00800000D8
+:1005E00000EE001F00CA080000281900007D898B5A
+:1005F000009580140028140400CA0C0000CA1000E2
+:1006000000CA1C0000CA240000E2001F00D4C01A67
+:1006100000D5001A00D5401A00CC180300CC2C03DA
+:1006200000CC2C0300CC2C03007DA58B007D9C47C7
+:1006300000984274000000000080018400D4C01AB9
+:1006400000D4401E00D4801E0080000000EE001E7A
+:1006500000E4011E00D4001E00D4401E00EE001E67
+:1006600000CA040000A00000007E828B00E4013E6E
+:1006700000D4001E00D4401E00EE001E00CA04007C
+:1006800000A00000007E828B00CA080000248C06B7
+:10069000000CCC060098C00600CC104E0099000457
+:1006A00000D4007300E4011E00D4001E00D4401EDC
+:1006B00000D4801E0080000000EE001E00CA08006A
+:1006C00000CA0C000034D01800251001009500214C
+:1006D00000C17FFF00CA100000CA140000CA180041
+:1006E00000D4801D00D4C01D007DB18B00C142022A
+:1006F00000C2C00100D5801D0034DC0E007D5D4CC1
+:10070000007F734C00D7401E00D5001E00D5401E50
+:1007100000C1420000C2C00000099C010031DC1091
+:10072000007F5F4C007F734C00042802007D8380B3
+:1007300000D5A86F00D5806600D7401E00EC005E93
+:1007400000C8240200C82402008001DB00D6007625
+:1007500000D4401E00D4801E00D4C01E00800000C3
+:1007600000EE001E0080000000EE001F00D4001FFD
+:100770000080000000D4001F00D4001F008800008B
+:1007800000D4001F00000000000000000000000076
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:10080000000101940002019B000300B2000400A259
+:10081000000500030006003F000700320008014FFA
+:1008200000090046000A0036001001D9001700C573
+:100830000022015D0023016C002000D70024014844
+:100840000026004D0027005C0028008D0029005183
+:10085000002A007E002B0061002F0088003200AAD1
+:10086000003401A20036006F003C0179003F009582
+:10087000004101AF00440151005501960056019D11
+:100880000060000B00610034006200380063003833
+:1008900000640038006500380066003800670038E2
+:1008A0000068003A00690041006A0048006B004897
+:1008B000006C0048006D0048006E0048006F004862
+:1008C000007301D9000000060000000600000006C9
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV610_me.bin.ihex b/firmware/radeon/RV610_me.bin.ihex
new file mode 100644 (file)
index 0000000..ba19ed8
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A000006044110000068D0000000000600000A8
+:1000B000000006310000000000600000000006455E
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:1006600000000000006000000000066800000000BC
+:10067000006000000000065C0000000200210E2265
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE000000000000060000000000662000000003E
+:100AF00000400000000000EB00000000006000006B
+:100B000000000665000000070020222D0000000004
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E90000000068D0000001F00210230000000004D
+:100EA0000000000014C000000000068C00000004D8
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000068D000000110021023000000000FB
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000068C00000000002B140500000000B2
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A000000000010000000000600000000006458B
+:1019B000000000000040040F0000021300000000BF
+:1019C0000060000000000631000000000060000020
+:1019D000000006450000021000600411000003151D
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B100000600000000006310000A00C002044110D
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E300000042004006044110000068D0000000032
+:101E4000006000000000063100000000C0600000DB
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000006680000000000600000000002B539
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:102240000000065F0000000000400000000002DE09
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A00000000970000000020441125
+:102600000000000000000000002048110000000051
+:102610008A000000002044110000000000000000BB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D0000001A1FD002044110000000000000000E6
+:1026E000D90048000000000000000000C0200400E5
+:1026F000000000000000000000A0000A0000000030
+:1027000000002257002044110000000000000003D8
+:10271000C0484A20000000000000225D0020441153
+:102720000000000000000000C04048000000000061
+:1027300000000000006000000000064500000000EE
+:10274000C0200800000000000000225C00204411AE
+:10275000000000000000000300384A2200000000D2
+:102760000000A1FC00204411000000000000000057
+:10277000C0204800000000000001A1FD002044111D
+:102780000000000000000000002F022200000000F6
+:10279000000000000CE0000000000000000000004D
+:1027A00040204800000000000000000140304A20A6
+:1027B0000000000000000002C0304A2000000000BD
+:1027C0000000000100530A220000034B0000003FFC
+:1027D000C0280A20000000008100000000204411F1
+:1027E000000000000000000100204811000000006F
+:1027F000000021F800204411000000000000001833
+:102800000020481100000000000421F9006044117C
+:102810000000068D000000110021023000000000C1
+:102820000000000014E00000000003540000001449
+:10283000002F022200000000000000000CC0000079
+:10284000000003640000201000204411000000007C
+:102850000000800000204811000000000001A2A438
+:102860000020441100000000000000000060480249
+:102870000000036E00002100002044110000000051
+:1028800000000000C0204800000000000000000020
+:10289000C02048000000000000000000C0204800E8
+:1028A0000000000000000000C040480000000000E0
+:1028B00000000004002F02220000000000000000C1
+:1028C0000CC000000000036A00002010002044112A
+:1028D00000000000000080000020481100000000FF
+:1028E0000001A2A40020441100000000000000002C
+:1028F000004048020000035F00000028002F022271
+:1029000000000000000000000CC00000000005C036
+:102910000001A2A4002044110000000000000000FB
+:10292000004048020000035F0000002C0020362613
+:102930000000000000000049002018110000000005
+:102940000000003F002048110000000000000001CE
+:1029500000331A260000000000000000002F0226AD
+:1029600000000000000000000CC000000000037028
+:102970000000002C00801A2D000000000000003F25
+:10298000C0280A200000000000000015002F0222CD
+:1029900000000000000000000CE0000000000386C2
+:1029A00000000006002F02220000000000000000CE
+:1029B0000CE00000000003B100000016002F02220E
+:1029C00000000000000000000CE00000000003B563
+:1029D00000000020002F0222000000000000000084
+:1029E0000CE000000000039C0000000F002F0222FA
+:1029F00000000000000000000CE00000000003A840
+:102A000000000010002F0222000000000000000063
+:102A10000CE00000000003A80000001E002F0222AE
+:102A200000000000000000000CE000000000039027
+:102A30000000A2A4002044110000000000000000DB
+:102A400000404802000000000800000000290A229F
+:102A5000000000000000000340210E2000000000E4
+:102A60000000000CC021122000000000000800003F
+:102A7000002812240000000000000014C0221620CC
+:102A80000000000000000000002914A40000000065
+:102A90000000A2A40020441100000000000000007B
+:102AA000002948A2000000000000A1FE00204411FF
+:102AB000000000000000000000404803000000008B
+:102AC000810000000020441100000000000000010F
+:102AD0000020481100000000000021F800204411EF
+:102AE0000000000000000016002048110000000057
+:102AF000000421F9006044110000068D000000155B
+:102B000000210230000000000000000014E000007E
+:102B1000000003920000210E00204411000000007C
+:102B200000000000C020480000000000000000007D
+:102B3000C0204800000000000000A2A400204411B2
+:102B400000000000000000000040480200000000FB
+:102B5000810000000020441100000000000000017E
+:102B60000020481100000000000021F8002044115E
+:102B700000000000000000170020481100000000C5
+:102B8000000421F9006044110000068D00000003DC
+:102B900000210230000000000000000014E00000EE
+:102BA0000000039E000021080020441100000000E6
+:102BB00000000000C02048000000000000000000ED
+:102BC000C0204800000000000000A2A40020441122
+:102BD000000000000000000000404802000000006B
+:102BE0000000A2A40020441100000000000000002A
+:102BF0000020480200000000800000000020441176
+:102C0000000000000000000000204811000000004B
+:102C100081000000002044110000000000000010AE
+:102C200000204811000000000000000000200010FB
+:102C3000000000000000000014C00000000003AE0F
+:102C40000000000000400000000000000000201014
+:102C50000020441100000000000080000020481106
+:102C6000000000000001A2A40020441100000000A8
+:102C70000000000600404811000000000000201085
+:102C800000204411000000000000800000204811D6
+:102C9000000000000001A2A4002044110000000078
+:102CA00000000016006048110000036E00000000E4
+:102CB000004000000000000000000000C0200800EC
+:102CC0000000000000000000C0200C000000000018
+:102CD0000000001D00210223000000000000000091
+:102CE00014E00000000003CE810000000020441129
+:102CF000000000000000000100204811000000005A
+:102D0000000021F80020441100000000000000181D
+:102D10000020481100000000000421F90060441167
+:102D20000000068D000000110021023000000000AC
+:102D30000000000014E00000000003C000002100BB
+:102D400000204411000000000000000000204802A4
+:102D50000000000000000000002048030000000008
+:102D6000BABECAFE0020481100000000CAFEBABE6A
+:102D70000020481100000000000020100020441135
+:102D8000000000000000800000204811000000004A
+:102D90000000A2A400204411000000000000000474
+:102DA0000040481100000000000021700020441184
+:102DB00000000000000000000020480200000000A9
+:102DC0000000000000204803000000008100000017
+:102DD00000204411000000000000000A00204811FB
+:102DE00000000000000000000020001000000000B3
+:102DF0000000000014C00000000003D38C0000009D
+:102E00000020441100000000CAFEBABE0040481174
+:102E100000000000810000000020441100000000BC
+:102E200000000001002048110000000000003FFFEA
+:102E300040280A20000000008000000040280E20EA
+:102E40000000000040000000C02812200000000028
+:102E500000040000006946220000068D000000000A
+:102E6000002014100000000000000000002F0223CA
+:102E700000000000000000000CC00000000003E1A2
+:102E800000000000C0401800000003E400003FFF05
+:102E9000C0281A2000000000000400000069462637
+:102EA0000000068D00000000002018100000000047
+:102EB00000000000002F02240000000000000000BD
+:102EC0000CC00000000003E700000000C0401C0030
+:102ED000000003EA00003FFFC0281E2000000000A1
+:102EE00000040000006946270000068D0000000075
+:102EF00000201C1000000000000000000020440220
+:102F00000000000000000000002820C500000000B4
+:102F100000000000004948E800000000A580000013
+:102F200000200811000000000000200000200C110B
+:102F30000000000083000000006044110000041243
+:102F4000000000000020440200000000000000001B
+:102F5000C0204800000000000000000040204800A1
+:102F6000000000000000001FC0210220000000003F
+:102F70000000000014C00000000003F70000201053
+:102F800000204411000000000000800000204811D3
+:102F9000000000000000FFFFC0481220000003FFF7
+:102FA000A780000000200811000000000000A00021
+:102FB00000200C110000000083000000006044119C
+:102FC0000000041200000000002044020000000085
+:102FD00000000000C02048000000000000000000C9
+:102FE000C0204800000000000000FFFFC0281220A1
+:102FF00000000000830000000020441100000000D9
+:103000000000000000304883000000008400000041
+:10301000002044110000000000000000C020480013
+:1030200000000000000000001D0000000000000083
+:103030008300000000604411000004120000000042
+:10304000C040040000000001A98000000020081119
+:10305000000000000000C00000400C11000003FA56
+:10306000AB80000000200811000000000000F8E024
+:1030700000400C11000003FAAD8000000020081190
+:10308000000000000000F88000400C11000003FA6E
+:10309000B380000000200811000000000000F3FCD5
+:1030A00000400C11000003FAAF800000002008115E
+:1030B000000000000000E00000400C11000003FAD6
+:1030C000B180000000200811000000000000F000A6
+:1030D00000400C11000003FA83000000002044119E
+:1030E00000000000000021480020481100000000FE
+:1030F00084000000002044110000000000000000D7
+:10310000C020480000000000000000001D0000007A
+:10311000000000000000000000800000000000002F
+:1031200001182000C0304620000000000000000010
+:10313000D90048000000000000000000C02004008A
+:10314000000000000000000000A0000A00000000D5
+:103150000218A000C030462000000000000000005F
+:10316000D90048000000000000000000C02004005A
+:10317000000000000000000000A0000A00000000A5
+:103180000318C000C030462000000000000000000E
+:10319000D90048000000000000000000C02004002A
+:1031A000000000000000000000A0000A0000000075
+:1031B0000418F8E0C03046200000000000000000C5
+:1031C000D90048000000000000000000C0200400FA
+:1031D000000000000000000000A0000A0000000045
+:1031E0000518F880C03046200000000000000000F4
+:1031F000D90048000000000000000000C0200400CA
+:10320000000000000000000000A0000A0000000014
+:103210000618E000C030462000000000000000005A
+:10322000D90048000000000000000000C020040099
+:10323000000000000000000000A0000A00000000E4
+:103240000718F000C0304620000000000000000019
+:10325000D90048000000000000000000C020040069
+:10326000000000000000000000A0000A00000000B4
+:103270000818F3FCC03046200000000000000000E9
+:10328000D90048000000000000000000C020040039
+:10329000000000000000000000A0000A0000000084
+:1032A0000000003000200A2D000000000000000097
+:1032B000C0290C4000000000000000300020362330
+:1032C0000000000000000000C0200400000000001A
+:1032D0000000000000A0000A0000000086000000BE
+:1032E00000204411000000000000000000404801E0
+:1032F0000000000085000000C02044110000000014
+:103300000000000000404801000000000000217C97
+:10331000002044110000000000000018402102209D
+:10332000000000000000000014C000000000044580
+:1033300000800000C0494A20000004460000000050
+:10334000C02048000000000000000000C02048002D
+:103350000000000000000000C02048000000000045
+:103360008100000000204411000000000000000166
+:10337000002048110000000000000000C0200800EC
+:103380000000000000000000170000000000000026
+:103390000004217F006044110000068D0000001F22
+:1033A00000210230000000000000000014C00000F6
+:1033B000000000000000000000404C020000044B30
+:1033C00000000000C0200C00000000000000000011
+:1033D000C02010000000000000000000C020140009
+:1033E0000000000000000000C020180000000000E5
+:1033F00000000000C0201C000000000000007F0052
+:1034000000280A210000000000004500002F0222D1
+:1034100000000000000000000CE000000000045963
+:1034200000000000C020200000000000000000009C
+:1034300017000000000000000000001000280A2310
+:103440000000000000000010002F02220000000019
+:10345000000000000CE0000000000461810000009A
+:10346000002044110000000000000001002048116D
+:103470000000000000040000006946240000068DE2
+:103480000000000000400000000004668100000011
+:10349000002044110000000000000000002048113E
+:1034A000000000000000216D002044110000000019
+:1034B00000000000002048040000000000000000A0
+:1034C000006048050000069200000000002824F07B
+:1034D000000000000000000700280A230000000090
+:1034E00000000001002F0222000000000000000088
+:1034F0000AE000000000046D00000000002F00C979
+:10350000000000000000000004E00000000004864D
+:1035100000000000004000000000049300000002D2
+:10352000002F022200000000000000000AE000005E
+:103530000000047200000000002F00C9000000001D
+:103540000000000002E0000000000486000000000F
+:10355000004000000000049300000003002F02223E
+:1035600000000000000000000AE0000000000477F6
+:1035700000000000002F00C9000000000000000053
+:103580000CE0000000000486000000000040000085
+:103590000000049300000004002F0222000000003D
+:1035A000000000000AE000000000047C00000000B1
+:1035B000002F00C900000000000000000AE0000029
+:1035C000000004860000000000400000000004939A
+:1035D00000000005002F0222000000000000000093
+:1035E0000AE000000000048100000000002F00C974
+:1035F000000000000000000006E00000000004865B
+:1036000000000000004000000000049300000006DD
+:10361000002F022200000000000000000AE000006D
+:103620000000048600000000002F00C90000000018
+:103630000000000008E00000000004860000000018
+:10364000004000000000049300007F0000280A21D1
+:103650000000000000004500002F022200000000D2
+:10366000000000000AE00000000000000000000868
+:1036700000210A23000000000000000014C0000028
+:1036800000000490000021690020441100000000A7
+:1036900000000000C0204800000000000000000002
+:1036A000C02048000000000000000000C0204800CA
+:1036B00000000000CAFEBABE004048110000000031
+:1036C00000000000C02044000000000000000000D6
+:1036D000C02000000000000000000000C0404800C2
+:1036E0000000000000007F0000280A210000000008
+:1036F00000004500002F0222000000000000000032
+:103700000AE000000000049900000000C020000052
+:103710000000000000000000C020000000000000C9
+:1037200000000000C0400000000000000000000099
+:1037300000404C080000045900000000C0200800B0
+:10374000000000000000001040210E2000000000DA
+:1037500000000011402112200000000000000012B3
+:1037600040211620000000000000216900204411C3
+:1037700000000000000000000020480200000000DF
+:1037800000000000002102250000000000000000F1
+:1037900014E00000000004A300040000C0494A2017
+:1037A000000004A4FFFBFFFFC0284A200000000027
+:1037B00000000000002102230000000000000000C3
+:1037C00014E00000000004B000000000C020480029
+:1037D0000000000000000000C020480000000000C1
+:1037E0000000000000210224000000000000000092
+:1037F00014C00000000000008100000000204411FF
+:10380000000000000000000C002048110000000033
+:103810000000000000200010000000000000000078
+:1038200014C00000000004ACA000000000204411FF
+:1038300000000000CAFEBABE0040481100000000AF
+:10384000810000000020441100000000000000047E
+:1038500000204811000000000000216B00204411EE
+:103860000000000000000000C02048100000000020
+:10387000810000000020441100000000000000054D
+:1038800000204811000000000000216C00204411BD
+:103890000000000000000000C020481000000000F0
+:1038A00000000000002F02240000000000000000C3
+:1038B0000CE00000000000000000000000400000DC
+:1038C000000004AA00000000C0210A20000000003F
+:1038D0000000000014C00000000004C381000000CC
+:1038E00000204411000000000000000000204811EA
+:1038F000000000000000216D0020441100000000C5
+:1039000000000000C020480000000000000000008F
+:10391000C060480000000692000000000040000067
+:10392000000004C7810000000020441100000000D6
+:103930000000000100204811000000000004000009
+:10394000C02946200000000000000000C060000008
+:103950000000068D0000000100210222000000008E
+:103960000000000014C00000000004CE0000216927
+:10397000002044110000000000000000C0204800AA
+:103980000000000000000000C0204800000000000F
+:10399000000000000020481000000000CAFEBABE6F
+:1039A000004048110000000000000000C02044005A
+:1039B0000000000000000000C040481000000000AF
+:1039C0008100000000204411000000000000000100
+:1039D0000020481100000000000021F800204411E0
+:1039E000000000000000000E002048110000000050
+:1039F000000421F9006044110000068D0000000061
+:103A000000210230000000000000000014C000008F
+:103A1000000004D0000021800020441100000000BC
+:103A200000000000C020480000000000000000006E
+:103A3000C02000000000000000000000C02048007E
+:103A40000000000000000000C02000000000000096
+:103A500000000000C040480000000000000000031B
+:103A600000333E2F00000000000000010021022171
+:103A7000000000000000000014E00000000005004D
+:103A80000000002C00200A2D0000000000040000AF
+:103A900018E00C11000004EF0000000100333E2F7D
+:103AA0000000000000002169002044110000000017
+:103AB000000000000020480200000000000000009C
+:103AC00000204803000000000000000800300A2227
+:103AD0000000000000000000C020480000000000BE
+:103AE00000000000C0204800000000000000216924
+:103AF00000204411000000000000000000204802E7
+:103B0000000000000000000000204803000000004A
+:103B10000000000800300A22000000000000000041
+:103B2000C02048000000000000000000D8C048008D
+:103B3000000004E30000216900204411000000009F
+:103B4000000000000020480200000000000000000B
+:103B500000204803000000000000000800300A2296
+:103B60000000000000000000C0204800000000002D
+:103B700000000000C0204800000000000000002DF0
+:103B80000020122D000000000000000000290C831E
+:103B90000000000000002169002044110000000026
+:103BA00000000000002048020000000000000000AB
+:103BB00000204803000000000000000800300A2236
+:103BC0000000000000000000C020480000000000CD
+:103BD00000000000C02048000000000000000011AC
+:103BE00000210224000000000000000014C00000BA
+:103BF000000000000000000000400000000004AAD7
+:103C00000000002CC0203620000000000000002D25
+:103C1000C0403620000000000000000F00210221FB
+:103C2000000000000000000014C0000000000505B6
+:103C300000000000006000000000000B0000000019
+:103C4000D90000000000000000000000C040040097
+:103C500000000001B5000000002044110000000039
+:103C6000000020000020481100000000B600000005
+:103C700000204411000000000000A00000204811B6
+:103C800000000000B7000000002044110000000008
+:103C90000000C0000020481100000000B800000033
+:103CA00000204411000000000000F8E0002048114E
+:103CB00000000000B90000000020441100000000D6
+:103CC0000000F8800020481100000000BA00000049
+:103CD00000204411000000000000E0000020481116
+:103CE00000000000BB0000000020441100000000A4
+:103CF0000000F0000020481100000000BC0000009F
+:103D000000204411000000000000F3FC00204811D6
+:103D100000000000810000000020441100000000AD
+:103D2000000000020020481100000000000000FF19
+:103D300000280E300000000000000000002F0223C9
+:103D400000000000000000000CC000000000051989
+:103D500000000000C020080000000000000000007B
+:103D600014C000000000052E0000000000200C110F
+:103D7000000000000000001C0020362300000000AE
+:103D80000000002B00203623000000000000002966
+:103D90000020362300000000000000280020362309
+:103DA0000000000000000017002036230000000083
+:103DB000000000250020362300000000000000263F
+:103DC00000203623000000000000001500203623EC
+:103DD0000000000000000016002036230000000054
+:103DE000FFFFE00000200C11000000000000002197
+:103DF00000203623000000000000002200203623AF
+:103E00000000000000001FFF00200C110000000057
+:103E100000000023002036230000000000000024E2
+:103E20000020362300000000F1FFFFFF00283A2E9B
+:103E3000000000000000001AC0220E200000000058
+:103E4000000000000029386E000000008100000022
+:103E5000002044110000000000000006002048116E
+:103E6000000000000000002A402036200000000072
+:103E70008700000000204411000000000000000046
+:103E8000C0204800000000000000A1F40020441100
+:103E900000000000000000000020481000000000AA
+:103EA0000000000000200C110000000000000030A5
+:103EB00000203623000000009D0000000020441177
+:103EC000000000000000001F40214A200000000008
+:103ED00096000000002044110000000000000000D7
+:103EE000C02048000000000000000000C0200C00BE
+:103EF0000000000000000000C020100000000000D2
+:103F00000000001F00211624000000000000000037
+:103F100014C00000000000000000001D0020362337
+:103F2000000000000000000300281E230000000025
+:103F3000000000080022222300000000FFFFF00024
+:103F4000002822280000000000000000002920E8CE
+:103F5000000000000000001F0020362800000000C4
+:103F60000000001800211E230000000000000020B7
+:103F70000020362700000000000000020022162466
+:103F80000000000000000000003014A80000000045
+:103F90000000001E00203625000000000000000385
+:103FA00000211A24000000001000000000281A263A
+:103FB00000000000EFFFFFFF00283A2E0000000085
+:103FC00000000000004938CE0000067B0000000120
+:103FD00040280A20000000000000000640280E20B3
+:103FE0000000000000000300C028122000000000B4
+:103FF0000000000800211224000000000000000062
+:10400000C02016200000000000000000C0201A2080
+:10401000000000000000000000210222000000005B
+:104020000000000014C000000000056681000000D0
+:104030000020441100000000000000010020481191
+:10404000000000000000225800300A240000000098
+:1040500000040000006946220000068D000021696E
+:10406000002044110000000000000000002048056E
+:10407000000000000002000000294A2600000000A5
+:10408000000000000020481000000000CAFEBABE78
+:10409000002048110000000000000002002F022351
+:1040A00000000000000000000CC000000000056ED1
+:1040B00000000000C0201C100000000000000000F4
+:1040C000C04000000000057C00000002002F022319
+:1040D00000000000000000000CC000000000056EA1
+:1040E00081000000002044110000000000000001D9
+:1040F00000204811000000000000225800300A246F
+:104100000000000000040000006946220000068D47
+:1041100000000000C0201C10000000000000000093
+:10412000C04000000000057C00000000002F0223BA
+:1041300000000000000000000CC00000000005723C
+:1041400000000000C0201C00000000000000000073
+:10415000C04000000000057C00000004002F022386
+:1041600000000000000000000CC000000000057A04
+:104170008100000000204411000000000000000049
+:1041800000204811000000000000216D00204411B3
+:104190000000000000000000C020480000000000F7
+:1041A00000000000C060480000000692000000000F
+:1041B00000401C100000057C00000000C020000032
+:1041C0000000000000000000C040000000000000EF
+:1041D000000000000EE000000000057E000000006E
+:1041E00000600000000005C900000000002F02244C
+:1041F00000000000000000000CC000000000058F5F
+:104200000000A2B7002044110000000000000000E0
+:104210000020480700000000810000000020441139
+:104220000000000000000001002048110000000014
+:104230000004A2B6006044110000068D0000001AC0
+:10424000002122300000000000000006002226307D
+:104250000000000000042004006044110000068DEE
+:104260000000A2C400204411000000000000000073
+:10427000003048E9000000000000000000E00000FD
+:104280000000058D0000A2D10020441100000000B4
+:104290000000000000404808000000000000A2D11B
+:1042A00000204411000000000000000100504A28D6
+:1042B0000000000000000001002F022400000000A8
+:1042C000000000000CC00000000005A00000A2BB20
+:1042D00000204411000000000000000000204807FA
+:1042E00000000000810000000020441100000000D8
+:1042F0000000000100204811000000000004A2BAE4
+:10430000006044110000068D0000001A00212230D8
+:10431000000000000000000600222630000000001F
+:1043200000042004006044110000068D0000A2C5B6
+:10433000002044110000000000000000003048E9A7
+:10434000000000000000000000E000000000059EEA
+:104350000000A2D200204411000000000000000074
+:1043600000404808000000000000A2D200204411D4
+:10437000000000000000000100504A28000000007A
+:1043800000000002002F02240000000000000000D6
+:104390000CC00000000005B10000A2BF00204411C5
+:1043A000000000000000000000204807000000009E
+:1043B0008100000000204411000000000000000106
+:1043C00000204811000000000004A2BE006044115B
+:1043D0000000068D0000001A0021223000000000BD
+:1043E0000000000600222630000000000004200427
+:1043F000006044110000068D0000A2C60020441198
+:104400000000000000000000003048E9000000004B
+:104410000000000000E00000000005AF0000A2D393
+:104420000020441100000000000000000040480887
+:10443000000000000000A2D3002044110000000092
+:104440000000000100504A28000000000000A2C344
+:104450000020441100000000000000000020480778
+:104460000000000081000000002044110000000056
+:104470000000000100204811000000000004A2C25A
+:10448000006044110000068D0000001A0021223057
+:10449000000000000000000600222630000000009E
+:1044A00000042004006044110000068D0000A2C733
+:1044B000002044110000000000000000003048E926
+:1044C000000000000000000000E00000000005BE49
+:1044D0000000A2D4002044110000000000000000F1
+:1044E00000404808000000000000A2D40020441151
+:1044F000000000000000000100504A2800000000F9
+:1045000085000000002044110000000000000000B1
+:1045100000204801000000000000304A0020441143
+:104520000000000001000000002048110000000011
+:104530000000000000400000000005C4A4000000CE
+:10454000C02044110000000000000000C0404800EE
+:104550000000000000000000C0600000000005C96D
+:1045600000000000C0400400000000010000002C1A
+:1045700000203621000000008100000000204411CE
+:1045800000000000000000060020481100000000AC
+:1045900000000000002F02300000000000000000BA
+:1045A0000CC00000000005D0000000000020041135
+:1045B000000000000000003000403621000005E34C
+:1045C000000000300020062D0000000000007E00EA
+:1045D000002806210000000000000000002F02213A
+:1045E00000000000000000000CE00000000005E3F7
+:1045F00081000000002044110000000000000001C4
+:1046000000204811000000000004A0920060441146
+:104610000000068D00000031002036300000000050
+:104620000004A093006044110000068D00000032D9
+:1046300000203630000000000004A2B600604411E3
+:104640000000068D0000003300203630000000001E
+:104650000004A2BA006044110000068D000000347E
+:1046600000203630000000000004A2BE00604411AB
+:104670000000068D000000350020363000000000EC
+:104680000004A2C2006044110000068D0000003644
+:1046900000203630000000000004200400604411B7
+:1046A0000000068D0001A2A40020441100000000BB
+:1046B0000000003F00204811000000000000003F03
+:1046C00000204811000000000000003F00204811B9
+:1046D000000000000000003F002048110000000022
+:1046E0000000000500204811000000000000A1F4B7
+:1046F00000204411000000000000000000204811CC
+:1047000000000000880000000020441100000000AC
+:10471000000000010020481100000000810000009E
+:104720000020441100000000000000060020481195
+:104730000000000000000001002F02300000000017
+:10474000000000000CE000000000062C000000301B
+:104750000020062D0000000000000000002F0221B4
+:1047600000000000000000000CE000000000062C2B
+:104770008100000000204411000000000000000142
+:10478000002048110000000000007E0000280621E3
+:104790000000000000000000002F022100000000C7
+:1047A000000000000CE00000000006050000A092E0
+:1047B00000204411000000000000003100204A2DBC
+:1047C000000000000000A093002044110000000041
+:1047D0000000003200204A2D000000000000A2B6B8
+:1047E00000204411000000000000003300204A2D8A
+:1047F000000000000000A2BA0020441100000000E8
+:104800000000003400204A2D000000000000A2BE7D
+:1048100000204411000000000000003500204A2D57
+:10482000000000000000A2C20020441100000000AF
+:104830000000003600204A2D00000000000000307B
+:104840000020062D00000000000001FF00280621C6
+:104850000000000000000000002F02210000000006
+:10486000000000000CE000000000062B000000002B
+:1048700000210221000000000000000014C0000020
+:104880000000060E0004A003006044110000068D25
+:104890000000A00300204411000000000000000000
+:1048A0000020481000000000000000010021062147
+:1048B000000000000000000014C00000000006130B
+:1048C0000004A010006044110000068D0000A0103C
+:1048D00000204411000000000000000000204810EB
+:1048E000000000000000000100210621000000007F
+:1048F00000000000002F0221000000000000000066
+:104900000CE000000000062B0004A0110060441120
+:104910000000068D0000A0110020441100000000DE
+:104920000000000000204810000000000004A01259
+:10493000006044110000068D0000A0120020441108
+:1049400000000000000000000020481000000000EF
+:104950000004A013006044110000068D0000A013A5
+:10496000002044110000000000000000002048105A
+:10497000000000000004A014006044110000068D37
+:104980000000A014002044110000000000000000FE
+:1049900000204810000000000004A0150060441131
+:1049A0000000068D0000A01500204411000000004A
+:1049B0000000000000204810000000000004A016C5
+:1049C000006044110000068D0000A0160020441174
+:1049D000000000000000000000204810000000005F
+:1049E0000004A017006044110000068D0000A0170D
+:1049F00000204411000000000000000000204810CA
+:104A00000000000000042004006044110000068D36
+:104A10000000002C0080062D00000000FF000000B8
+:104A20000020441100000000000000000020481198
+:104A300000000000000000010020481100000000FC
+:104A4000000000020080481100000000000000008B
+:104A50000EE000000000063D000000300020062DA2
+:104A600000000000000000020028062100000000F5
+:104A700000000000002F02210000000000000000E4
+:104A80000CE000000000063B810000000020441103
+:104A9000000000000000000100204811000000009C
+:104AA00000042004006044110000068D0000100086
+:104AB00000200811000000000000002B002036221A
+:104AC000000000000000000000600000000006413F
+:104AD0000000000000600000000005C99800000010
+:104AE0000020441100000000000000000080481178
+:104AF0000000000000000000C0600000000006414F
+:104B000000000000C0400400000000010000A2A45A
+:104B10000020441100000000000000220020481185
+:104B20000000000089000000002044110000000087
+:104B300000000001004048110000062D9700000011
+:104B40000020441100000000000000000020481177
+:104B5000000000008A000000002044110000000056
+:104B600000000000004048110000062D0000000079
+:104B7000006000000000065C0000201000204411CE
+:104B8000000000000000800000204811000000002C
+:104B90000001A2A4C0204411000000000000001683
+:104BA000006048110000036E000020100020441136
+:104BB000000000000001000000204811000000007B
+:104BC00081000000002044110000000000000001EE
+:104BD00000204811000000000000217C002044114A
+:104BE00000000000098000000020481100000000C3
+:104BF000FFFFFFFF00204811000000000000000040
+:104C00000020481100000000000000001700000014
+:104C1000000000000004217F006044110000068DA8
+:104C20000000001F00210230000000000000000012
+:104C300014C00000000000000000000400404C11FF
+:104C400000000656000000000040000000000000C8
+:104C50000000001700201E2D0000000000000004CE
+:104C600000291E27000000000000001700803627E2
+:104C7000000000000000001700201E2D00000000B2
+:104C8000FFFFFFFB00281E270000000000000017A8
+:104C900000803627000000000000001700201E2DB5
+:104CA000000000000000000800291E27000000008E
+:104CB00000000017008036270000000000000017E9
+:104CC00000201E2D00000000FFFFFFF700281E2718
+:104CD00000000000000000170080362700000000E0
+:104CE000000020100020441100000000000080009F
+:104CF00000204811000000000001A2A4002044117F
+:104D00000000000000000016006048110000036E63
+:104D100000002010002044110000000000010000ED
+:104D200000204811000000000000217C00204411F8
+:104D30000000000001800000002048110000000079
+:104D4000FFFFFFFF002048110000000000000000EE
+:104D500000204811000000000000000017000000C3
+:104D6000000000008100000000204411000000004D
+:104D70000000000100204811000000000004217F15
+:104D8000006044110000068D0000001F0021023069
+:104D9000000000000000000014C000000000068CAD
+:104DA0000000001000404C110000067200000000DE
+:104DB000C0200400000000000000000038C0000017
+:104DC000000000000000001D00200A2D000000006F
+:104DD0000000001E00200E2D000000000000001F3B
+:104DE0000020122D00000000000000200020162DE1
+:104DF00000000000000021690020441100000000B4
+:104E00000000000000204804000000000000000036
+:104E100000204805000000000000000000204801BC
+:104E200000000000CAFEBABE0020481100000000C9
+:104E30000000000400301224000000000000000008
+:104E4000002F006400000000000000000CC0000003
+:104E50000000068B0000000300281A22000000005A
+:104E6000000000080022122200000000FFFFF000F6
+:104E7000002812240000000000000000002910C4D7
+:104E8000000000000000001F004036240000000069
+:104E90000000000000800000000000000000000092
+:104EA0001AC000000000068D9F0000000020441181
+:104EB00000000000CAFEBABE002048110000000039
+:104EC000000000001AE00000000006900000000052
+:104ED0000080000000000000000000001AC0000078
+:104EE000000006929E000000002044110000000017
+:104EF000CAFEBABE002048110000000000000000F9
+:104F00001AE000000000069500000000008000008C
+:104F10000000000000000000006000000000000B26
+:104F200000001000006004110000031500000000E4
+:104F300000200411000000000000000000600811C3
+:104F4000000001B20000225C0020441100000000BB
+:104F5000000000030020481100000000000022565D
+:104F600000204411000000000000001B0020481138
+:104F7000000000000000A1FC00204411000000001F
+:104F80000000000100204811000000000001A1FD08
+:104F9000C0204411000000000000002100201E2D50
+:104FA000000000000000001000221E27000000008A
+:104FB000000000240020222D000000000000FFFF60
+:104FC00000282228000000000000000000294907F6
+:104FD0000000000000000000002048110000000058
+:104FE000000000220020222D000000000000FFFF32
+:104FF00000282228000000000000000000294907C6
+:105000000000000000000000002048110000000027
+:105010000000002300201E2D0000000000000010F2
+:1050200000221E27000000000000000000294907A0
+:1050300000000000000000000040481100000000D7
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B0000142050205C002500000000001C3016860
+:1052C000043F05C000000000022502090250015100
+:1052D000000000000223024502A00241000000007D
+:1052E00003D705C005C005C0000000000649064AF6
+:1052F000031F05C00000000005C005C503200340D2
+:1053000000000000032A0282034203340000000070
+:1053100005C005C005C005C00000000005C005515E
+:1053200005C005C00000000003BA05C004BB03446B
+:1053300000000000049A0450043D05C00000000075
+:1053400004D005C0044104DD00000000045005073E
+:10535000035103750000000005C005C005C005C06D
+:105360000000000005C005C005C005C00000000029
+:1053700005C005C0063F05C70000000005C005C008
+:10538000000705C00000000005C005C005C005C03D
+:105390000000000005C005C005C005C000000000F9
+:1053A00003F803ED0408040600000000040E040ADC
+:1053B000040C041000000000041C04180424042041
+:1053C00000000000042C0428043404300000000015
+:1053D00005C005C0043805C00000000005C005C0B8
+:1053E00005C005C00000000005C005C005C005C01F
+:1053F0000000000000020679069700060000000089
+:00000001FF
diff --git a/firmware/radeon/RV610_pfp.bin.ihex b/firmware/radeon/RV610_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..f55292c
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001B8007C038B00D4401E00EE001E5F
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581A800C41C3A08
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFF000042C0400309002007D250049
+:1000700000351402007D350B00255403007CD5802B
+:1000800000259C030095C00400D5001B007EDDC147
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA180000D4401E00D5801EAD
+:100140000080005300D4007500D4401E00CA08008F
+:1001500000CA0C0000CA100000D4801900D4C018D6
+:1001600000D5001700D4801E00D4C01E00D5001E8C
+:1001700000E2001E00CA040000A00000007E828B86
+:1001800000CA080000D4806000D4401E0080000037
+:1001900000D4801E00CA080000D4806100D4401E34
+:1001A0000080000000D4801E00CA080000CA0C00B5
+:1001B00000D4401E00D4801600D4C01600D4801E87
+:1001C000008001B800D4C01E00C6084300CA0C005D
+:1001D00000CA10000094800400CA140000E420F358
+:1001E00000D4201300D5606500D4E01C00D5201C8D
+:1001F00000D5601C008000000006200100C60843F6
+:1002000000CA0C0000CA1000009483F700CA140052
+:1002100000E420F30080007900D4201300C60843D6
+:1002200000CA0C0000CA1000009883EF00CA140036
+:1002300000D400640080008D0000000000C414326F
+:1002400000C6184300C4082F0095400500C40C30B8
+:1002500000D4401E0080000000EE001E009583F5D3
+:1002600000C4103100D4403300D5206500D4A01C58
+:1002700000D4E01C00D5201C00E4015E00D4001E68
+:10028000008000000006200100CA1800000A2001BA
+:1002900000D6007600C408360098800700C61045D6
+:1002A0000095011000D4001F00D46062008000009F
+:1002B00000D4206200CC383500CC1433008401BB5C
+:1002C00000D4007200D5401E0080000000EE001E29
+:1002D00000E2001A008401BB00E2001A00CC104BBF
+:1002E00000CC0447002C9401007D098B0098400548
+:1002F000007D15CB00D4001A008001B800D4006D39
+:100300000034440100CC0C480098403A00CC2C4A00
+:100310000095800400CC0449008001B800D4001A84
+:1003200000D4C01A00282801008400F000CC10037B
+:100330000098801B0004380C008400F000CC1003EF
+:100340000098801700043808008400F000CC1003E7
+:100350000098801300043804008400F000CC1003DF
+:100360000098801400CC104C009A800900CC144DE9
+:10037000009840DC00D4006D00CC184800D5001A6D
+:1003800000D5401A008000C900D5801A0096C0D55B
+:1003900000D4006D008001B800D4006E009AC00344
+:1003A00000D4006D00D4006E0080000000EC007FDF
+:1003B000009AC0CC00D4006D008001B800D4006E5B
+:1003C00000CC140300CC180300CC1C03007D910367
+:1003D000007DD583007D190C0035CC1F0035701FC2
+:1003E000007CF0CB007CD08B00880000007E8E8BE0
+:1003F0000095C00400D4006E008001B800D4001A3B
+:1004000000D4C01A00CC080300CC0C0300CC1003AD
+:1004100000CC140300CC180300CC1C0300CC240334
+:1004200000CC28030035C41F0036B01F007C704B81
+:100430000034F01F007C704B0035701F007C704B47
+:10044000007D8881007DCCC1007E5101007E9541F8
+:10045000007C9082007CD4C2007C848B009AC00314
+:10046000007C8C8B002C88010098809E00D4006D4D
+:100470000098409C00D4006E00CC084C00CC0C4D81
+:1004800000CC104800D4801A00D4C01A00800101AA
+:1004900000D5001A00CC083200D40032009482D972
+:1004A00000CA0C0000D4401E0080000000D4001ED2
+:1004B00000E4011E00D4001E00CA080000CA0C009F
+:1004C00000CA100000D4401E00CA140000D4801ED0
+:1004D00000D4C01E00D5001E00D5401E00D54034FB
+:1004E0000080000000EE001E0028040400E2001A54
+:1004F00000E2001A00D4401A00CA380000CC0803F9
+:1005000000CC0C0300CC0C0300CC0C03009882BD83
+:1005100000000000008401BB00D7A06F0080000035
+:1005200000EE001F00CA040000C2FF0000CC083427
+:1005300000C13FFF007C74CB007CC90B007D010F24
+:10054000009902B0007C738B008401BB00D7A06FC0
+:100550000080000000EE001F00CA080000281900FB
+:10056000007D898B009580140028140400CA0C00BB
+:1005700000CA100000CA1C0000CA240000E2001FCC
+:1005800000D4C01A00D5001A00D5401A00CC1803B8
+:1005900000CC2C0300CC2C0300CC2C03007DA58BBD
+:1005A000007D9C4700984297000000000080016198
+:1005B00000D4C01A00D4401E00D4801E0080000069
+:1005C00000EE001E00E4011E00D4001E00D4401EF8
+:1005D00000EE001E00CA040000A00000007E828B16
+:1005E00000E4013E00D4001E00D4401E00EE001EB8
+:1005F00000CA040000A00000007E828B00CA080030
+:1006000000248C06000CCC060098C00600CC104ECE
+:100610000099000400D4007300E4011E00D4001E01
+:1006200000D4401E00D4801E0080000000EE001E9A
+:1006300000CA080000CA0C000034D01800251001C0
+:100640000095002100C17FFF00CA100000CA1400FD
+:1006500000CA180000D4801D00D4C01D007DB18BDD
+:1006600000C1420200C2C00100D5801D0034DC0E72
+:10067000007D5D4C007F734C00D7401E00D5001EEE
+:1006800000D5401E00C1420000C2C00000099C010C
+:100690000031DC10007F5F4C007F734C00042802A7
+:1006A000007D838000D5A86F00D5806600D7401EEE
+:1006B00000EC005E00C8240200C82402008001B8DB
+:1006C00000D6007600D4401E00D4801E00D4C01E88
+:1006D0000080000000EE001E0080000000EE001F01
+:1006E00000D4001F0080000000D4001F00D4001FB1
+:1006F0000088000000D4001F00000000000000007F
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:1008000000010171000201780003008F0004007FE5
+:10081000000500030006003F000700320008012C1D
+:1008200000090046000A0036001001B6001700A2B9
+:100830000022013A00230149002000B400240125D0
+:100840000027004D0028006A002A0060002B00529B
+:10085000002F0065003200870034017F003C015604
+:10086000003F00720041018C0044012E00550173CD
+:100870000056017A0060000B00610034006200380D
+:1008800000630038006400380065003800660038F6
+:10089000006700380068003A00690041006A0048BB
+:1008A000006B0048006C0048006D0048006E004876
+:1008B000006F00480000000600000006000000066F
+:1008C0000000000600000006000000060000000610
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV620_me.bin.ihex b/firmware/radeon/RV620_me.bin.ihex
new file mode 100644 (file)
index 0000000..ba19ed8
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A000006044110000068D0000000000600000A8
+:1000B000000006310000000000600000000006455E
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:1006600000000000006000000000066800000000BC
+:10067000006000000000065C0000000200210E2265
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE000000000000060000000000662000000003E
+:100AF00000400000000000EB00000000006000006B
+:100B000000000665000000070020222D0000000004
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E90000000068D0000001F00210230000000004D
+:100EA0000000000014C000000000068C00000004D8
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000068D000000110021023000000000FB
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000068C00000000002B140500000000B2
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A000000000010000000000600000000006458B
+:1019B000000000000040040F0000021300000000BF
+:1019C0000060000000000631000000000060000020
+:1019D000000006450000021000600411000003151D
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B100000600000000006310000A00C002044110D
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E300000042004006044110000068D0000000032
+:101E4000006000000000063100000000C0600000DB
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000006680000000000600000000002B539
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:102240000000065F0000000000400000000002DE09
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A00000000970000000020441125
+:102600000000000000000000002048110000000051
+:102610008A000000002044110000000000000000BB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D0000001A1FD002044110000000000000000E6
+:1026E000D90048000000000000000000C0200400E5
+:1026F000000000000000000000A0000A0000000030
+:1027000000002257002044110000000000000003D8
+:10271000C0484A20000000000000225D0020441153
+:102720000000000000000000C04048000000000061
+:1027300000000000006000000000064500000000EE
+:10274000C0200800000000000000225C00204411AE
+:10275000000000000000000300384A2200000000D2
+:102760000000A1FC00204411000000000000000057
+:10277000C0204800000000000001A1FD002044111D
+:102780000000000000000000002F022200000000F6
+:10279000000000000CE0000000000000000000004D
+:1027A00040204800000000000000000140304A20A6
+:1027B0000000000000000002C0304A2000000000BD
+:1027C0000000000100530A220000034B0000003FFC
+:1027D000C0280A20000000008100000000204411F1
+:1027E000000000000000000100204811000000006F
+:1027F000000021F800204411000000000000001833
+:102800000020481100000000000421F9006044117C
+:102810000000068D000000110021023000000000C1
+:102820000000000014E00000000003540000001449
+:10283000002F022200000000000000000CC0000079
+:10284000000003640000201000204411000000007C
+:102850000000800000204811000000000001A2A438
+:102860000020441100000000000000000060480249
+:102870000000036E00002100002044110000000051
+:1028800000000000C0204800000000000000000020
+:10289000C02048000000000000000000C0204800E8
+:1028A0000000000000000000C040480000000000E0
+:1028B00000000004002F02220000000000000000C1
+:1028C0000CC000000000036A00002010002044112A
+:1028D00000000000000080000020481100000000FF
+:1028E0000001A2A40020441100000000000000002C
+:1028F000004048020000035F00000028002F022271
+:1029000000000000000000000CC00000000005C036
+:102910000001A2A4002044110000000000000000FB
+:10292000004048020000035F0000002C0020362613
+:102930000000000000000049002018110000000005
+:102940000000003F002048110000000000000001CE
+:1029500000331A260000000000000000002F0226AD
+:1029600000000000000000000CC000000000037028
+:102970000000002C00801A2D000000000000003F25
+:10298000C0280A200000000000000015002F0222CD
+:1029900000000000000000000CE0000000000386C2
+:1029A00000000006002F02220000000000000000CE
+:1029B0000CE00000000003B100000016002F02220E
+:1029C00000000000000000000CE00000000003B563
+:1029D00000000020002F0222000000000000000084
+:1029E0000CE000000000039C0000000F002F0222FA
+:1029F00000000000000000000CE00000000003A840
+:102A000000000010002F0222000000000000000063
+:102A10000CE00000000003A80000001E002F0222AE
+:102A200000000000000000000CE000000000039027
+:102A30000000A2A4002044110000000000000000DB
+:102A400000404802000000000800000000290A229F
+:102A5000000000000000000340210E2000000000E4
+:102A60000000000CC021122000000000000800003F
+:102A7000002812240000000000000014C0221620CC
+:102A80000000000000000000002914A40000000065
+:102A90000000A2A40020441100000000000000007B
+:102AA000002948A2000000000000A1FE00204411FF
+:102AB000000000000000000000404803000000008B
+:102AC000810000000020441100000000000000010F
+:102AD0000020481100000000000021F800204411EF
+:102AE0000000000000000016002048110000000057
+:102AF000000421F9006044110000068D000000155B
+:102B000000210230000000000000000014E000007E
+:102B1000000003920000210E00204411000000007C
+:102B200000000000C020480000000000000000007D
+:102B3000C0204800000000000000A2A400204411B2
+:102B400000000000000000000040480200000000FB
+:102B5000810000000020441100000000000000017E
+:102B60000020481100000000000021F8002044115E
+:102B700000000000000000170020481100000000C5
+:102B8000000421F9006044110000068D00000003DC
+:102B900000210230000000000000000014E00000EE
+:102BA0000000039E000021080020441100000000E6
+:102BB00000000000C02048000000000000000000ED
+:102BC000C0204800000000000000A2A40020441122
+:102BD000000000000000000000404802000000006B
+:102BE0000000A2A40020441100000000000000002A
+:102BF0000020480200000000800000000020441176
+:102C0000000000000000000000204811000000004B
+:102C100081000000002044110000000000000010AE
+:102C200000204811000000000000000000200010FB
+:102C3000000000000000000014C00000000003AE0F
+:102C40000000000000400000000000000000201014
+:102C50000020441100000000000080000020481106
+:102C6000000000000001A2A40020441100000000A8
+:102C70000000000600404811000000000000201085
+:102C800000204411000000000000800000204811D6
+:102C9000000000000001A2A4002044110000000078
+:102CA00000000016006048110000036E00000000E4
+:102CB000004000000000000000000000C0200800EC
+:102CC0000000000000000000C0200C000000000018
+:102CD0000000001D00210223000000000000000091
+:102CE00014E00000000003CE810000000020441129
+:102CF000000000000000000100204811000000005A
+:102D0000000021F80020441100000000000000181D
+:102D10000020481100000000000421F90060441167
+:102D20000000068D000000110021023000000000AC
+:102D30000000000014E00000000003C000002100BB
+:102D400000204411000000000000000000204802A4
+:102D50000000000000000000002048030000000008
+:102D6000BABECAFE0020481100000000CAFEBABE6A
+:102D70000020481100000000000020100020441135
+:102D8000000000000000800000204811000000004A
+:102D90000000A2A400204411000000000000000474
+:102DA0000040481100000000000021700020441184
+:102DB00000000000000000000020480200000000A9
+:102DC0000000000000204803000000008100000017
+:102DD00000204411000000000000000A00204811FB
+:102DE00000000000000000000020001000000000B3
+:102DF0000000000014C00000000003D38C0000009D
+:102E00000020441100000000CAFEBABE0040481174
+:102E100000000000810000000020441100000000BC
+:102E200000000001002048110000000000003FFFEA
+:102E300040280A20000000008000000040280E20EA
+:102E40000000000040000000C02812200000000028
+:102E500000040000006946220000068D000000000A
+:102E6000002014100000000000000000002F0223CA
+:102E700000000000000000000CC00000000003E1A2
+:102E800000000000C0401800000003E400003FFF05
+:102E9000C0281A2000000000000400000069462637
+:102EA0000000068D00000000002018100000000047
+:102EB00000000000002F02240000000000000000BD
+:102EC0000CC00000000003E700000000C0401C0030
+:102ED000000003EA00003FFFC0281E2000000000A1
+:102EE00000040000006946270000068D0000000075
+:102EF00000201C1000000000000000000020440220
+:102F00000000000000000000002820C500000000B4
+:102F100000000000004948E800000000A580000013
+:102F200000200811000000000000200000200C110B
+:102F30000000000083000000006044110000041243
+:102F4000000000000020440200000000000000001B
+:102F5000C0204800000000000000000040204800A1
+:102F6000000000000000001FC0210220000000003F
+:102F70000000000014C00000000003F70000201053
+:102F800000204411000000000000800000204811D3
+:102F9000000000000000FFFFC0481220000003FFF7
+:102FA000A780000000200811000000000000A00021
+:102FB00000200C110000000083000000006044119C
+:102FC0000000041200000000002044020000000085
+:102FD00000000000C02048000000000000000000C9
+:102FE000C0204800000000000000FFFFC0281220A1
+:102FF00000000000830000000020441100000000D9
+:103000000000000000304883000000008400000041
+:10301000002044110000000000000000C020480013
+:1030200000000000000000001D0000000000000083
+:103030008300000000604411000004120000000042
+:10304000C040040000000001A98000000020081119
+:10305000000000000000C00000400C11000003FA56
+:10306000AB80000000200811000000000000F8E024
+:1030700000400C11000003FAAD8000000020081190
+:10308000000000000000F88000400C11000003FA6E
+:10309000B380000000200811000000000000F3FCD5
+:1030A00000400C11000003FAAF800000002008115E
+:1030B000000000000000E00000400C11000003FAD6
+:1030C000B180000000200811000000000000F000A6
+:1030D00000400C11000003FA83000000002044119E
+:1030E00000000000000021480020481100000000FE
+:1030F00084000000002044110000000000000000D7
+:10310000C020480000000000000000001D0000007A
+:10311000000000000000000000800000000000002F
+:1031200001182000C0304620000000000000000010
+:10313000D90048000000000000000000C02004008A
+:10314000000000000000000000A0000A00000000D5
+:103150000218A000C030462000000000000000005F
+:10316000D90048000000000000000000C02004005A
+:10317000000000000000000000A0000A00000000A5
+:103180000318C000C030462000000000000000000E
+:10319000D90048000000000000000000C02004002A
+:1031A000000000000000000000A0000A0000000075
+:1031B0000418F8E0C03046200000000000000000C5
+:1031C000D90048000000000000000000C0200400FA
+:1031D000000000000000000000A0000A0000000045
+:1031E0000518F880C03046200000000000000000F4
+:1031F000D90048000000000000000000C0200400CA
+:10320000000000000000000000A0000A0000000014
+:103210000618E000C030462000000000000000005A
+:10322000D90048000000000000000000C020040099
+:10323000000000000000000000A0000A00000000E4
+:103240000718F000C0304620000000000000000019
+:10325000D90048000000000000000000C020040069
+:10326000000000000000000000A0000A00000000B4
+:103270000818F3FCC03046200000000000000000E9
+:10328000D90048000000000000000000C020040039
+:10329000000000000000000000A0000A0000000084
+:1032A0000000003000200A2D000000000000000097
+:1032B000C0290C4000000000000000300020362330
+:1032C0000000000000000000C0200400000000001A
+:1032D0000000000000A0000A0000000086000000BE
+:1032E00000204411000000000000000000404801E0
+:1032F0000000000085000000C02044110000000014
+:103300000000000000404801000000000000217C97
+:10331000002044110000000000000018402102209D
+:10332000000000000000000014C000000000044580
+:1033300000800000C0494A20000004460000000050
+:10334000C02048000000000000000000C02048002D
+:103350000000000000000000C02048000000000045
+:103360008100000000204411000000000000000166
+:10337000002048110000000000000000C0200800EC
+:103380000000000000000000170000000000000026
+:103390000004217F006044110000068D0000001F22
+:1033A00000210230000000000000000014C00000F6
+:1033B000000000000000000000404C020000044B30
+:1033C00000000000C0200C00000000000000000011
+:1033D000C02010000000000000000000C020140009
+:1033E0000000000000000000C020180000000000E5
+:1033F00000000000C0201C000000000000007F0052
+:1034000000280A210000000000004500002F0222D1
+:1034100000000000000000000CE000000000045963
+:1034200000000000C020200000000000000000009C
+:1034300017000000000000000000001000280A2310
+:103440000000000000000010002F02220000000019
+:10345000000000000CE0000000000461810000009A
+:10346000002044110000000000000001002048116D
+:103470000000000000040000006946240000068DE2
+:103480000000000000400000000004668100000011
+:10349000002044110000000000000000002048113E
+:1034A000000000000000216D002044110000000019
+:1034B00000000000002048040000000000000000A0
+:1034C000006048050000069200000000002824F07B
+:1034D000000000000000000700280A230000000090
+:1034E00000000001002F0222000000000000000088
+:1034F0000AE000000000046D00000000002F00C979
+:10350000000000000000000004E00000000004864D
+:1035100000000000004000000000049300000002D2
+:10352000002F022200000000000000000AE000005E
+:103530000000047200000000002F00C9000000001D
+:103540000000000002E0000000000486000000000F
+:10355000004000000000049300000003002F02223E
+:1035600000000000000000000AE0000000000477F6
+:1035700000000000002F00C9000000000000000053
+:103580000CE0000000000486000000000040000085
+:103590000000049300000004002F0222000000003D
+:1035A000000000000AE000000000047C00000000B1
+:1035B000002F00C900000000000000000AE0000029
+:1035C000000004860000000000400000000004939A
+:1035D00000000005002F0222000000000000000093
+:1035E0000AE000000000048100000000002F00C974
+:1035F000000000000000000006E00000000004865B
+:1036000000000000004000000000049300000006DD
+:10361000002F022200000000000000000AE000006D
+:103620000000048600000000002F00C90000000018
+:103630000000000008E00000000004860000000018
+:10364000004000000000049300007F0000280A21D1
+:103650000000000000004500002F022200000000D2
+:10366000000000000AE00000000000000000000868
+:1036700000210A23000000000000000014C0000028
+:1036800000000490000021690020441100000000A7
+:1036900000000000C0204800000000000000000002
+:1036A000C02048000000000000000000C0204800CA
+:1036B00000000000CAFEBABE004048110000000031
+:1036C00000000000C02044000000000000000000D6
+:1036D000C02000000000000000000000C0404800C2
+:1036E0000000000000007F0000280A210000000008
+:1036F00000004500002F0222000000000000000032
+:103700000AE000000000049900000000C020000052
+:103710000000000000000000C020000000000000C9
+:1037200000000000C0400000000000000000000099
+:1037300000404C080000045900000000C0200800B0
+:10374000000000000000001040210E2000000000DA
+:1037500000000011402112200000000000000012B3
+:1037600040211620000000000000216900204411C3
+:1037700000000000000000000020480200000000DF
+:1037800000000000002102250000000000000000F1
+:1037900014E00000000004A300040000C0494A2017
+:1037A000000004A4FFFBFFFFC0284A200000000027
+:1037B00000000000002102230000000000000000C3
+:1037C00014E00000000004B000000000C020480029
+:1037D0000000000000000000C020480000000000C1
+:1037E0000000000000210224000000000000000092
+:1037F00014C00000000000008100000000204411FF
+:10380000000000000000000C002048110000000033
+:103810000000000000200010000000000000000078
+:1038200014C00000000004ACA000000000204411FF
+:1038300000000000CAFEBABE0040481100000000AF
+:10384000810000000020441100000000000000047E
+:1038500000204811000000000000216B00204411EE
+:103860000000000000000000C02048100000000020
+:10387000810000000020441100000000000000054D
+:1038800000204811000000000000216C00204411BD
+:103890000000000000000000C020481000000000F0
+:1038A00000000000002F02240000000000000000C3
+:1038B0000CE00000000000000000000000400000DC
+:1038C000000004AA00000000C0210A20000000003F
+:1038D0000000000014C00000000004C381000000CC
+:1038E00000204411000000000000000000204811EA
+:1038F000000000000000216D0020441100000000C5
+:1039000000000000C020480000000000000000008F
+:10391000C060480000000692000000000040000067
+:10392000000004C7810000000020441100000000D6
+:103930000000000100204811000000000004000009
+:10394000C02946200000000000000000C060000008
+:103950000000068D0000000100210222000000008E
+:103960000000000014C00000000004CE0000216927
+:10397000002044110000000000000000C0204800AA
+:103980000000000000000000C0204800000000000F
+:10399000000000000020481000000000CAFEBABE6F
+:1039A000004048110000000000000000C02044005A
+:1039B0000000000000000000C040481000000000AF
+:1039C0008100000000204411000000000000000100
+:1039D0000020481100000000000021F800204411E0
+:1039E000000000000000000E002048110000000050
+:1039F000000421F9006044110000068D0000000061
+:103A000000210230000000000000000014C000008F
+:103A1000000004D0000021800020441100000000BC
+:103A200000000000C020480000000000000000006E
+:103A3000C02000000000000000000000C02048007E
+:103A40000000000000000000C02000000000000096
+:103A500000000000C040480000000000000000031B
+:103A600000333E2F00000000000000010021022171
+:103A7000000000000000000014E00000000005004D
+:103A80000000002C00200A2D0000000000040000AF
+:103A900018E00C11000004EF0000000100333E2F7D
+:103AA0000000000000002169002044110000000017
+:103AB000000000000020480200000000000000009C
+:103AC00000204803000000000000000800300A2227
+:103AD0000000000000000000C020480000000000BE
+:103AE00000000000C0204800000000000000216924
+:103AF00000204411000000000000000000204802E7
+:103B0000000000000000000000204803000000004A
+:103B10000000000800300A22000000000000000041
+:103B2000C02048000000000000000000D8C048008D
+:103B3000000004E30000216900204411000000009F
+:103B4000000000000020480200000000000000000B
+:103B500000204803000000000000000800300A2296
+:103B60000000000000000000C0204800000000002D
+:103B700000000000C0204800000000000000002DF0
+:103B80000020122D000000000000000000290C831E
+:103B90000000000000002169002044110000000026
+:103BA00000000000002048020000000000000000AB
+:103BB00000204803000000000000000800300A2236
+:103BC0000000000000000000C020480000000000CD
+:103BD00000000000C02048000000000000000011AC
+:103BE00000210224000000000000000014C00000BA
+:103BF000000000000000000000400000000004AAD7
+:103C00000000002CC0203620000000000000002D25
+:103C1000C0403620000000000000000F00210221FB
+:103C2000000000000000000014C0000000000505B6
+:103C300000000000006000000000000B0000000019
+:103C4000D90000000000000000000000C040040097
+:103C500000000001B5000000002044110000000039
+:103C6000000020000020481100000000B600000005
+:103C700000204411000000000000A00000204811B6
+:103C800000000000B7000000002044110000000008
+:103C90000000C0000020481100000000B800000033
+:103CA00000204411000000000000F8E0002048114E
+:103CB00000000000B90000000020441100000000D6
+:103CC0000000F8800020481100000000BA00000049
+:103CD00000204411000000000000E0000020481116
+:103CE00000000000BB0000000020441100000000A4
+:103CF0000000F0000020481100000000BC0000009F
+:103D000000204411000000000000F3FC00204811D6
+:103D100000000000810000000020441100000000AD
+:103D2000000000020020481100000000000000FF19
+:103D300000280E300000000000000000002F0223C9
+:103D400000000000000000000CC000000000051989
+:103D500000000000C020080000000000000000007B
+:103D600014C000000000052E0000000000200C110F
+:103D7000000000000000001C0020362300000000AE
+:103D80000000002B00203623000000000000002966
+:103D90000020362300000000000000280020362309
+:103DA0000000000000000017002036230000000083
+:103DB000000000250020362300000000000000263F
+:103DC00000203623000000000000001500203623EC
+:103DD0000000000000000016002036230000000054
+:103DE000FFFFE00000200C11000000000000002197
+:103DF00000203623000000000000002200203623AF
+:103E00000000000000001FFF00200C110000000057
+:103E100000000023002036230000000000000024E2
+:103E20000020362300000000F1FFFFFF00283A2E9B
+:103E3000000000000000001AC0220E200000000058
+:103E4000000000000029386E000000008100000022
+:103E5000002044110000000000000006002048116E
+:103E6000000000000000002A402036200000000072
+:103E70008700000000204411000000000000000046
+:103E8000C0204800000000000000A1F40020441100
+:103E900000000000000000000020481000000000AA
+:103EA0000000000000200C110000000000000030A5
+:103EB00000203623000000009D0000000020441177
+:103EC000000000000000001F40214A200000000008
+:103ED00096000000002044110000000000000000D7
+:103EE000C02048000000000000000000C0200C00BE
+:103EF0000000000000000000C020100000000000D2
+:103F00000000001F00211624000000000000000037
+:103F100014C00000000000000000001D0020362337
+:103F2000000000000000000300281E230000000025
+:103F3000000000080022222300000000FFFFF00024
+:103F4000002822280000000000000000002920E8CE
+:103F5000000000000000001F0020362800000000C4
+:103F60000000001800211E230000000000000020B7
+:103F70000020362700000000000000020022162466
+:103F80000000000000000000003014A80000000045
+:103F90000000001E00203625000000000000000385
+:103FA00000211A24000000001000000000281A263A
+:103FB00000000000EFFFFFFF00283A2E0000000085
+:103FC00000000000004938CE0000067B0000000120
+:103FD00040280A20000000000000000640280E20B3
+:103FE0000000000000000300C028122000000000B4
+:103FF0000000000800211224000000000000000062
+:10400000C02016200000000000000000C0201A2080
+:10401000000000000000000000210222000000005B
+:104020000000000014C000000000056681000000D0
+:104030000020441100000000000000010020481191
+:10404000000000000000225800300A240000000098
+:1040500000040000006946220000068D000021696E
+:10406000002044110000000000000000002048056E
+:10407000000000000002000000294A2600000000A5
+:10408000000000000020481000000000CAFEBABE78
+:10409000002048110000000000000002002F022351
+:1040A00000000000000000000CC000000000056ED1
+:1040B00000000000C0201C100000000000000000F4
+:1040C000C04000000000057C00000002002F022319
+:1040D00000000000000000000CC000000000056EA1
+:1040E00081000000002044110000000000000001D9
+:1040F00000204811000000000000225800300A246F
+:104100000000000000040000006946220000068D47
+:1041100000000000C0201C10000000000000000093
+:10412000C04000000000057C00000000002F0223BA
+:1041300000000000000000000CC00000000005723C
+:1041400000000000C0201C00000000000000000073
+:10415000C04000000000057C00000004002F022386
+:1041600000000000000000000CC000000000057A04
+:104170008100000000204411000000000000000049
+:1041800000204811000000000000216D00204411B3
+:104190000000000000000000C020480000000000F7
+:1041A00000000000C060480000000692000000000F
+:1041B00000401C100000057C00000000C020000032
+:1041C0000000000000000000C040000000000000EF
+:1041D000000000000EE000000000057E000000006E
+:1041E00000600000000005C900000000002F02244C
+:1041F00000000000000000000CC000000000058F5F
+:104200000000A2B7002044110000000000000000E0
+:104210000020480700000000810000000020441139
+:104220000000000000000001002048110000000014
+:104230000004A2B6006044110000068D0000001AC0
+:10424000002122300000000000000006002226307D
+:104250000000000000042004006044110000068DEE
+:104260000000A2C400204411000000000000000073
+:10427000003048E9000000000000000000E00000FD
+:104280000000058D0000A2D10020441100000000B4
+:104290000000000000404808000000000000A2D11B
+:1042A00000204411000000000000000100504A28D6
+:1042B0000000000000000001002F022400000000A8
+:1042C000000000000CC00000000005A00000A2BB20
+:1042D00000204411000000000000000000204807FA
+:1042E00000000000810000000020441100000000D8
+:1042F0000000000100204811000000000004A2BAE4
+:10430000006044110000068D0000001A00212230D8
+:10431000000000000000000600222630000000001F
+:1043200000042004006044110000068D0000A2C5B6
+:10433000002044110000000000000000003048E9A7
+:10434000000000000000000000E000000000059EEA
+:104350000000A2D200204411000000000000000074
+:1043600000404808000000000000A2D200204411D4
+:10437000000000000000000100504A28000000007A
+:1043800000000002002F02240000000000000000D6
+:104390000CC00000000005B10000A2BF00204411C5
+:1043A000000000000000000000204807000000009E
+:1043B0008100000000204411000000000000000106
+:1043C00000204811000000000004A2BE006044115B
+:1043D0000000068D0000001A0021223000000000BD
+:1043E0000000000600222630000000000004200427
+:1043F000006044110000068D0000A2C60020441198
+:104400000000000000000000003048E9000000004B
+:104410000000000000E00000000005AF0000A2D393
+:104420000020441100000000000000000040480887
+:10443000000000000000A2D3002044110000000092
+:104440000000000100504A28000000000000A2C344
+:104450000020441100000000000000000020480778
+:104460000000000081000000002044110000000056
+:104470000000000100204811000000000004A2C25A
+:10448000006044110000068D0000001A0021223057
+:10449000000000000000000600222630000000009E
+:1044A00000042004006044110000068D0000A2C733
+:1044B000002044110000000000000000003048E926
+:1044C000000000000000000000E00000000005BE49
+:1044D0000000A2D4002044110000000000000000F1
+:1044E00000404808000000000000A2D40020441151
+:1044F000000000000000000100504A2800000000F9
+:1045000085000000002044110000000000000000B1
+:1045100000204801000000000000304A0020441143
+:104520000000000001000000002048110000000011
+:104530000000000000400000000005C4A4000000CE
+:10454000C02044110000000000000000C0404800EE
+:104550000000000000000000C0600000000005C96D
+:1045600000000000C0400400000000010000002C1A
+:1045700000203621000000008100000000204411CE
+:1045800000000000000000060020481100000000AC
+:1045900000000000002F02300000000000000000BA
+:1045A0000CC00000000005D0000000000020041135
+:1045B000000000000000003000403621000005E34C
+:1045C000000000300020062D0000000000007E00EA
+:1045D000002806210000000000000000002F02213A
+:1045E00000000000000000000CE00000000005E3F7
+:1045F00081000000002044110000000000000001C4
+:1046000000204811000000000004A0920060441146
+:104610000000068D00000031002036300000000050
+:104620000004A093006044110000068D00000032D9
+:1046300000203630000000000004A2B600604411E3
+:104640000000068D0000003300203630000000001E
+:104650000004A2BA006044110000068D000000347E
+:1046600000203630000000000004A2BE00604411AB
+:104670000000068D000000350020363000000000EC
+:104680000004A2C2006044110000068D0000003644
+:1046900000203630000000000004200400604411B7
+:1046A0000000068D0001A2A40020441100000000BB
+:1046B0000000003F00204811000000000000003F03
+:1046C00000204811000000000000003F00204811B9
+:1046D000000000000000003F002048110000000022
+:1046E0000000000500204811000000000000A1F4B7
+:1046F00000204411000000000000000000204811CC
+:1047000000000000880000000020441100000000AC
+:10471000000000010020481100000000810000009E
+:104720000020441100000000000000060020481195
+:104730000000000000000001002F02300000000017
+:10474000000000000CE000000000062C000000301B
+:104750000020062D0000000000000000002F0221B4
+:1047600000000000000000000CE000000000062C2B
+:104770008100000000204411000000000000000142
+:10478000002048110000000000007E0000280621E3
+:104790000000000000000000002F022100000000C7
+:1047A000000000000CE00000000006050000A092E0
+:1047B00000204411000000000000003100204A2DBC
+:1047C000000000000000A093002044110000000041
+:1047D0000000003200204A2D000000000000A2B6B8
+:1047E00000204411000000000000003300204A2D8A
+:1047F000000000000000A2BA0020441100000000E8
+:104800000000003400204A2D000000000000A2BE7D
+:1048100000204411000000000000003500204A2D57
+:10482000000000000000A2C20020441100000000AF
+:104830000000003600204A2D00000000000000307B
+:104840000020062D00000000000001FF00280621C6
+:104850000000000000000000002F02210000000006
+:10486000000000000CE000000000062B000000002B
+:1048700000210221000000000000000014C0000020
+:104880000000060E0004A003006044110000068D25
+:104890000000A00300204411000000000000000000
+:1048A0000020481000000000000000010021062147
+:1048B000000000000000000014C00000000006130B
+:1048C0000004A010006044110000068D0000A0103C
+:1048D00000204411000000000000000000204810EB
+:1048E000000000000000000100210621000000007F
+:1048F00000000000002F0221000000000000000066
+:104900000CE000000000062B0004A0110060441120
+:104910000000068D0000A0110020441100000000DE
+:104920000000000000204810000000000004A01259
+:10493000006044110000068D0000A0120020441108
+:1049400000000000000000000020481000000000EF
+:104950000004A013006044110000068D0000A013A5
+:10496000002044110000000000000000002048105A
+:10497000000000000004A014006044110000068D37
+:104980000000A014002044110000000000000000FE
+:1049900000204810000000000004A0150060441131
+:1049A0000000068D0000A01500204411000000004A
+:1049B0000000000000204810000000000004A016C5
+:1049C000006044110000068D0000A0160020441174
+:1049D000000000000000000000204810000000005F
+:1049E0000004A017006044110000068D0000A0170D
+:1049F00000204411000000000000000000204810CA
+:104A00000000000000042004006044110000068D36
+:104A10000000002C0080062D00000000FF000000B8
+:104A20000020441100000000000000000020481198
+:104A300000000000000000010020481100000000FC
+:104A4000000000020080481100000000000000008B
+:104A50000EE000000000063D000000300020062DA2
+:104A600000000000000000020028062100000000F5
+:104A700000000000002F02210000000000000000E4
+:104A80000CE000000000063B810000000020441103
+:104A9000000000000000000100204811000000009C
+:104AA00000042004006044110000068D0000100086
+:104AB00000200811000000000000002B002036221A
+:104AC000000000000000000000600000000006413F
+:104AD0000000000000600000000005C99800000010
+:104AE0000020441100000000000000000080481178
+:104AF0000000000000000000C0600000000006414F
+:104B000000000000C0400400000000010000A2A45A
+:104B10000020441100000000000000220020481185
+:104B20000000000089000000002044110000000087
+:104B300000000001004048110000062D9700000011
+:104B40000020441100000000000000000020481177
+:104B5000000000008A000000002044110000000056
+:104B600000000000004048110000062D0000000079
+:104B7000006000000000065C0000201000204411CE
+:104B8000000000000000800000204811000000002C
+:104B90000001A2A4C0204411000000000000001683
+:104BA000006048110000036E000020100020441136
+:104BB000000000000001000000204811000000007B
+:104BC00081000000002044110000000000000001EE
+:104BD00000204811000000000000217C002044114A
+:104BE00000000000098000000020481100000000C3
+:104BF000FFFFFFFF00204811000000000000000040
+:104C00000020481100000000000000001700000014
+:104C1000000000000004217F006044110000068DA8
+:104C20000000001F00210230000000000000000012
+:104C300014C00000000000000000000400404C11FF
+:104C400000000656000000000040000000000000C8
+:104C50000000001700201E2D0000000000000004CE
+:104C600000291E27000000000000001700803627E2
+:104C7000000000000000001700201E2D00000000B2
+:104C8000FFFFFFFB00281E270000000000000017A8
+:104C900000803627000000000000001700201E2DB5
+:104CA000000000000000000800291E27000000008E
+:104CB00000000017008036270000000000000017E9
+:104CC00000201E2D00000000FFFFFFF700281E2718
+:104CD00000000000000000170080362700000000E0
+:104CE000000020100020441100000000000080009F
+:104CF00000204811000000000001A2A4002044117F
+:104D00000000000000000016006048110000036E63
+:104D100000002010002044110000000000010000ED
+:104D200000204811000000000000217C00204411F8
+:104D30000000000001800000002048110000000079
+:104D4000FFFFFFFF002048110000000000000000EE
+:104D500000204811000000000000000017000000C3
+:104D6000000000008100000000204411000000004D
+:104D70000000000100204811000000000004217F15
+:104D8000006044110000068D0000001F0021023069
+:104D9000000000000000000014C000000000068CAD
+:104DA0000000001000404C110000067200000000DE
+:104DB000C0200400000000000000000038C0000017
+:104DC000000000000000001D00200A2D000000006F
+:104DD0000000001E00200E2D000000000000001F3B
+:104DE0000020122D00000000000000200020162DE1
+:104DF00000000000000021690020441100000000B4
+:104E00000000000000204804000000000000000036
+:104E100000204805000000000000000000204801BC
+:104E200000000000CAFEBABE0020481100000000C9
+:104E30000000000400301224000000000000000008
+:104E4000002F006400000000000000000CC0000003
+:104E50000000068B0000000300281A22000000005A
+:104E6000000000080022122200000000FFFFF000F6
+:104E7000002812240000000000000000002910C4D7
+:104E8000000000000000001F004036240000000069
+:104E90000000000000800000000000000000000092
+:104EA0001AC000000000068D9F0000000020441181
+:104EB00000000000CAFEBABE002048110000000039
+:104EC000000000001AE00000000006900000000052
+:104ED0000080000000000000000000001AC0000078
+:104EE000000006929E000000002044110000000017
+:104EF000CAFEBABE002048110000000000000000F9
+:104F00001AE000000000069500000000008000008C
+:104F10000000000000000000006000000000000B26
+:104F200000001000006004110000031500000000E4
+:104F300000200411000000000000000000600811C3
+:104F4000000001B20000225C0020441100000000BB
+:104F5000000000030020481100000000000022565D
+:104F600000204411000000000000001B0020481138
+:104F7000000000000000A1FC00204411000000001F
+:104F80000000000100204811000000000001A1FD08
+:104F9000C0204411000000000000002100201E2D50
+:104FA000000000000000001000221E27000000008A
+:104FB000000000240020222D000000000000FFFF60
+:104FC00000282228000000000000000000294907F6
+:104FD0000000000000000000002048110000000058
+:104FE000000000220020222D000000000000FFFF32
+:104FF00000282228000000000000000000294907C6
+:105000000000000000000000002048110000000027
+:105010000000002300201E2D0000000000000010F2
+:1050200000221E27000000000000000000294907A0
+:1050300000000000000000000040481100000000D7
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B0000142050205C002500000000001C3016860
+:1052C000043F05C000000000022502090250015100
+:1052D000000000000223024502A00241000000007D
+:1052E00003D705C005C005C0000000000649064AF6
+:1052F000031F05C00000000005C005C503200340D2
+:1053000000000000032A0282034203340000000070
+:1053100005C005C005C005C00000000005C005515E
+:1053200005C005C00000000003BA05C004BB03446B
+:1053300000000000049A0450043D05C00000000075
+:1053400004D005C0044104DD00000000045005073E
+:10535000035103750000000005C005C005C005C06D
+:105360000000000005C005C005C005C00000000029
+:1053700005C005C0063F05C70000000005C005C008
+:10538000000705C00000000005C005C005C005C03D
+:105390000000000005C005C005C005C000000000F9
+:1053A00003F803ED0408040600000000040E040ADC
+:1053B000040C041000000000041C04180424042041
+:1053C00000000000042C0428043404300000000015
+:1053D00005C005C0043805C00000000005C005C0B8
+:1053E00005C005C00000000005C005C005C005C01F
+:1053F0000000000000020679069700060000000089
+:00000001FF
diff --git a/firmware/radeon/RV620_pfp.bin.ihex b/firmware/radeon/RV620_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..f55292c
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001B8007C038B00D4401E00EE001E5F
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581A800C41C3A08
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFF000042C0400309002007D250049
+:1000700000351402007D350B00255403007CD5802B
+:1000800000259C030095C00400D5001B007EDDC147
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA180000D4401E00D5801EAD
+:100140000080005300D4007500D4401E00CA08008F
+:1001500000CA0C0000CA100000D4801900D4C018D6
+:1001600000D5001700D4801E00D4C01E00D5001E8C
+:1001700000E2001E00CA040000A00000007E828B86
+:1001800000CA080000D4806000D4401E0080000037
+:1001900000D4801E00CA080000D4806100D4401E34
+:1001A0000080000000D4801E00CA080000CA0C00B5
+:1001B00000D4401E00D4801600D4C01600D4801E87
+:1001C000008001B800D4C01E00C6084300CA0C005D
+:1001D00000CA10000094800400CA140000E420F358
+:1001E00000D4201300D5606500D4E01C00D5201C8D
+:1001F00000D5601C008000000006200100C60843F6
+:1002000000CA0C0000CA1000009483F700CA140052
+:1002100000E420F30080007900D4201300C60843D6
+:1002200000CA0C0000CA1000009883EF00CA140036
+:1002300000D400640080008D0000000000C414326F
+:1002400000C6184300C4082F0095400500C40C30B8
+:1002500000D4401E0080000000EE001E009583F5D3
+:1002600000C4103100D4403300D5206500D4A01C58
+:1002700000D4E01C00D5201C00E4015E00D4001E68
+:10028000008000000006200100CA1800000A2001BA
+:1002900000D6007600C408360098800700C61045D6
+:1002A0000095011000D4001F00D46062008000009F
+:1002B00000D4206200CC383500CC1433008401BB5C
+:1002C00000D4007200D5401E0080000000EE001E29
+:1002D00000E2001A008401BB00E2001A00CC104BBF
+:1002E00000CC0447002C9401007D098B0098400548
+:1002F000007D15CB00D4001A008001B800D4006D39
+:100300000034440100CC0C480098403A00CC2C4A00
+:100310000095800400CC0449008001B800D4001A84
+:1003200000D4C01A00282801008400F000CC10037B
+:100330000098801B0004380C008400F000CC1003EF
+:100340000098801700043808008400F000CC1003E7
+:100350000098801300043804008400F000CC1003DF
+:100360000098801400CC104C009A800900CC144DE9
+:10037000009840DC00D4006D00CC184800D5001A6D
+:1003800000D5401A008000C900D5801A0096C0D55B
+:1003900000D4006D008001B800D4006E009AC00344
+:1003A00000D4006D00D4006E0080000000EC007FDF
+:1003B000009AC0CC00D4006D008001B800D4006E5B
+:1003C00000CC140300CC180300CC1C03007D910367
+:1003D000007DD583007D190C0035CC1F0035701FC2
+:1003E000007CF0CB007CD08B00880000007E8E8BE0
+:1003F0000095C00400D4006E008001B800D4001A3B
+:1004000000D4C01A00CC080300CC0C0300CC1003AD
+:1004100000CC140300CC180300CC1C0300CC240334
+:1004200000CC28030035C41F0036B01F007C704B81
+:100430000034F01F007C704B0035701F007C704B47
+:10044000007D8881007DCCC1007E5101007E9541F8
+:10045000007C9082007CD4C2007C848B009AC00314
+:10046000007C8C8B002C88010098809E00D4006D4D
+:100470000098409C00D4006E00CC084C00CC0C4D81
+:1004800000CC104800D4801A00D4C01A00800101AA
+:1004900000D5001A00CC083200D40032009482D972
+:1004A00000CA0C0000D4401E0080000000D4001ED2
+:1004B00000E4011E00D4001E00CA080000CA0C009F
+:1004C00000CA100000D4401E00CA140000D4801ED0
+:1004D00000D4C01E00D5001E00D5401E00D54034FB
+:1004E0000080000000EE001E0028040400E2001A54
+:1004F00000E2001A00D4401A00CA380000CC0803F9
+:1005000000CC0C0300CC0C0300CC0C03009882BD83
+:1005100000000000008401BB00D7A06F0080000035
+:1005200000EE001F00CA040000C2FF0000CC083427
+:1005300000C13FFF007C74CB007CC90B007D010F24
+:10054000009902B0007C738B008401BB00D7A06FC0
+:100550000080000000EE001F00CA080000281900FB
+:10056000007D898B009580140028140400CA0C00BB
+:1005700000CA100000CA1C0000CA240000E2001FCC
+:1005800000D4C01A00D5001A00D5401A00CC1803B8
+:1005900000CC2C0300CC2C0300CC2C03007DA58BBD
+:1005A000007D9C4700984297000000000080016198
+:1005B00000D4C01A00D4401E00D4801E0080000069
+:1005C00000EE001E00E4011E00D4001E00D4401EF8
+:1005D00000EE001E00CA040000A00000007E828B16
+:1005E00000E4013E00D4001E00D4401E00EE001EB8
+:1005F00000CA040000A00000007E828B00CA080030
+:1006000000248C06000CCC060098C00600CC104ECE
+:100610000099000400D4007300E4011E00D4001E01
+:1006200000D4401E00D4801E0080000000EE001E9A
+:1006300000CA080000CA0C000034D01800251001C0
+:100640000095002100C17FFF00CA100000CA1400FD
+:1006500000CA180000D4801D00D4C01D007DB18BDD
+:1006600000C1420200C2C00100D5801D0034DC0E72
+:10067000007D5D4C007F734C00D7401E00D5001EEE
+:1006800000D5401E00C1420000C2C00000099C010C
+:100690000031DC10007F5F4C007F734C00042802A7
+:1006A000007D838000D5A86F00D5806600D7401EEE
+:1006B00000EC005E00C8240200C82402008001B8DB
+:1006C00000D6007600D4401E00D4801E00D4C01E88
+:1006D0000080000000EE001E0080000000EE001F01
+:1006E00000D4001F0080000000D4001F00D4001FB1
+:1006F0000088000000D4001F00000000000000007F
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:1008000000010171000201780003008F0004007FE5
+:10081000000500030006003F000700320008012C1D
+:1008200000090046000A0036001001B6001700A2B9
+:100830000022013A00230149002000B400240125D0
+:100840000027004D0028006A002A0060002B00529B
+:10085000002F0065003200870034017F003C015604
+:10086000003F00720041018C0044012E00550173CD
+:100870000056017A0060000B00610034006200380D
+:1008800000630038006400380065003800660038F6
+:10089000006700380068003A00690041006A0048BB
+:1008A000006B0048006C0048006D0048006E004876
+:1008B000006F00480000000600000006000000066F
+:1008C0000000000600000006000000060000000610
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV630_me.bin.ihex b/firmware/radeon/RV630_me.bin.ihex
new file mode 100644 (file)
index 0000000..ba3a7e6
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A000006044110000068A0000000000600000AB
+:1000B0000000062E00000000006000000000064264
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:1006600000000000006000000000066500000000BF
+:1006700000600000000006590000000200210E2268
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE00000000000006000000000065F0000000041
+:100AF00000400000000000EB00000000006000006B
+:100B000000000662000000070020222D0000000007
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E90000000068A0000001F002102300000000050
+:100EA0000000000014C000000000068900000004DB
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000068A000000110021023000000000FE
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000068900000000002B140500000000B5
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A000000000010000000000600000000006428E
+:1019B000000000000040040F0000021300000000BF
+:1019C000006000000000062E000000000060000023
+:1019D0000000064200000210006004110000031520
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B1000006000000000062E0000A00C0020441110
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E300000042004006044110000068A0000000035
+:101E4000006000000000062E00000000C0600000DE
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000006650000000000600000000002B53C
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:102240000000065C0000000000400000000002DE0C
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A00000000970000000020441125
+:102600000000000000000000002048110000000051
+:102610008A000000002044110000000000000000BB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D0000001A1FD002044110000000000000000E6
+:1026E000D90048000000000000000000C0200400E5
+:1026F000000000000000000000A0000A0000000030
+:1027000000002257002044110000000000000003D8
+:10271000C0484A20000000000000225D0020441153
+:102720000000000000000000C04048000000000061
+:1027300000000000006000000000064200000000F1
+:10274000C0200800000000000000225C00204411AE
+:10275000000000000000000300384A2200000000D2
+:102760000000A1FC00204411000000000000000057
+:10277000C0204800000000000001A1FD002044111D
+:102780000000000000000000002F022200000000F6
+:10279000000000000CE0000000000000000000004D
+:1027A00040204800000000000000000140304A20A6
+:1027B0000000000000000002C0304A2000000000BD
+:1027C0000000000100530A220000034B0000003FFC
+:1027D000C0280A20000000008100000000204411F1
+:1027E000000000000000000100204811000000006F
+:1027F000000021F800204411000000000000001833
+:102800000020481100000000000421F9006044117C
+:102810000000068A000000110021023000000000C4
+:102820000000000014E00000000003540000001449
+:10283000002F022200000000000000000CC0000079
+:10284000000003640000201000204411000000007C
+:102850000000800000204811000000000001A2A438
+:102860000020441100000000000000000060480249
+:102870000000036E00002100002044110000000051
+:1028800000000000C0204800000000000000000020
+:10289000C02048000000000000000000C0204800E8
+:1028A0000000000000000000C040480000000000E0
+:1028B00000000004002F02220000000000000000C1
+:1028C0000CC000000000036A00002010002044112A
+:1028D00000000000000080000020481100000000FF
+:1028E0000001A2A40020441100000000000000002C
+:1028F000004048020000035F00000028002F022271
+:1029000000000000000000000CC00000000005BD39
+:102910000001A2A4002044110000000000000000FB
+:10292000004048020000035F0000002C0020362613
+:102930000000000000000049002018110000000005
+:102940000000003F002048110000000000000001CE
+:1029500000331A260000000000000000002F0226AD
+:1029600000000000000000000CC000000000037028
+:102970000000002C00801A2D000000000000003F25
+:10298000C0280A200000000000000015002F0222CD
+:1029900000000000000000000CE0000000000386C2
+:1029A00000000006002F02220000000000000000CE
+:1029B0000CE00000000003B100000016002F02220E
+:1029C00000000000000000000CE00000000003B563
+:1029D00000000020002F0222000000000000000084
+:1029E0000CE000000000039C0000000F002F0222FA
+:1029F00000000000000000000CE00000000003A840
+:102A000000000010002F0222000000000000000063
+:102A10000CE00000000003A80000001E002F0222AE
+:102A200000000000000000000CE000000000039027
+:102A30000000A2A4002044110000000000000000DB
+:102A400000404802000000000800000000290A229F
+:102A5000000000000000000340210E2000000000E4
+:102A60000000000CC021122000000000000800003F
+:102A7000002812240000000000000014C0221620CC
+:102A80000000000000000000002914A40000000065
+:102A90000000A2A40020441100000000000000007B
+:102AA000002948A2000000000000A1FE00204411FF
+:102AB000000000000000000000404803000000008B
+:102AC000810000000020441100000000000000010F
+:102AD0000020481100000000000021F800204411EF
+:102AE0000000000000000016002048110000000057
+:102AF000000421F9006044110000068A000000155E
+:102B000000210230000000000000000014E000007E
+:102B1000000003920000210E00204411000000007C
+:102B200000000000C020480000000000000000007D
+:102B3000C0204800000000000000A2A400204411B2
+:102B400000000000000000000040480200000000FB
+:102B5000810000000020441100000000000000017E
+:102B60000020481100000000000021F8002044115E
+:102B700000000000000000170020481100000000C5
+:102B8000000421F9006044110000068A00000003DF
+:102B900000210230000000000000000014E00000EE
+:102BA0000000039E000021080020441100000000E6
+:102BB00000000000C02048000000000000000000ED
+:102BC000C0204800000000000000A2A40020441122
+:102BD000000000000000000000404802000000006B
+:102BE0000000A2A40020441100000000000000002A
+:102BF0000020480200000000800000000020441176
+:102C0000000000000000000000204811000000004B
+:102C100081000000002044110000000000000010AE
+:102C200000204811000000000000000000200010FB
+:102C3000000000000000000014C00000000003AE0F
+:102C40000000000000400000000000000000201014
+:102C50000020441100000000000080000020481106
+:102C6000000000000001A2A40020441100000000A8
+:102C70000000000600404811000000000000201085
+:102C800000204411000000000000800000204811D6
+:102C9000000000000001A2A4002044110000000078
+:102CA00000000016006048110000036E00000000E4
+:102CB000004000000000000000000000C0200800EC
+:102CC0000000000000000000C0200C000000000018
+:102CD0000000001D00210223000000000000000091
+:102CE00014E00000000003CE810000000020441129
+:102CF000000000000000000100204811000000005A
+:102D0000000021F80020441100000000000000181D
+:102D10000020481100000000000421F90060441167
+:102D20000000068A000000110021023000000000AF
+:102D30000000000014E00000000003C000002100BB
+:102D400000204411000000000000000000204802A4
+:102D50000000000000000000002048030000000008
+:102D6000BABECAFE0020481100000000CAFEBABE6A
+:102D70000020481100000000000020100020441135
+:102D8000000000000000800000204811000000004A
+:102D90000000A2A400204411000000000000000474
+:102DA0000040481100000000000021700020441184
+:102DB00000000000000000000020480200000000A9
+:102DC0000000000000204803000000008100000017
+:102DD00000204411000000000000000A00204811FB
+:102DE00000000000000000000020001000000000B3
+:102DF0000000000014C00000000003D38C0000009D
+:102E00000020441100000000CAFEBABE0040481174
+:102E100000000000810000000020441100000000BC
+:102E200000000001002048110000000000003FFFEA
+:102E300040280A20000000008000000040280E20EA
+:102E40000000000040000000C02812200000000028
+:102E500000040000006946220000068A000000000D
+:102E6000002014100000000000000000002F0223CA
+:102E700000000000000000000CC00000000003E1A2
+:102E800000000000C0401800000003E400003FFF05
+:102E9000C0281A2000000000000400000069462637
+:102EA0000000068A0000000000201810000000004A
+:102EB00000000000002F02240000000000000000BD
+:102EC0000CC00000000003E700000000C0401C0030
+:102ED000000003EA00003FFFC0281E2000000000A1
+:102EE00000040000006946270000068A0000000078
+:102EF00000201C1000000000000000000020440220
+:102F00000000000000000000002820C500000000B4
+:102F100000000000004948E800000000A580000013
+:102F200000200811000000000000200000200C110B
+:102F30000000000083000000006044110000041243
+:102F4000000000000020440200000000000000001B
+:102F5000C0204800000000000000000040204800A1
+:102F6000000000000000001FC0210220000000003F
+:102F70000000000014C00000000003F70000201053
+:102F800000204411000000000000800000204811D3
+:102F9000000000000000FFFFC0481220000003FFF7
+:102FA000A780000000200811000000000000A00021
+:102FB00000200C110000000083000000006044119C
+:102FC0000000041200000000002044020000000085
+:102FD00000000000C02048000000000000000000C9
+:102FE000C0204800000000000000FFFFC0281220A1
+:102FF00000000000830000000020441100000000D9
+:103000000000000000304883000000008400000041
+:10301000002044110000000000000000C020480013
+:1030200000000000000000001D0000000000000083
+:103030008300000000604411000004120000000042
+:10304000C040040000000001A98000000020081119
+:10305000000000000000C00000400C11000003FA56
+:10306000AB80000000200811000000000000F8E024
+:1030700000400C11000003FAAD8000000020081190
+:10308000000000000000F88000400C11000003FA6E
+:10309000B380000000200811000000000000F3FCD5
+:1030A00000400C11000003FAAF800000002008115E
+:1030B000000000000000E00000400C11000003FAD6
+:1030C000B180000000200811000000000000F000A6
+:1030D00000400C11000003FA83000000002044119E
+:1030E00000000000000021480020481100000000FE
+:1030F00084000000002044110000000000000000D7
+:10310000C020480000000000000000001D0000007A
+:10311000000000000000000000800000000000002F
+:1031200001182000C0304620000000000000000010
+:10313000D90048000000000000000000C02004008A
+:10314000000000000000000000A0000A00000000D5
+:103150000218A000C030462000000000000000005F
+:10316000D90048000000000000000000C02004005A
+:10317000000000000000000000A0000A00000000A5
+:103180000318C000C030462000000000000000000E
+:10319000D90048000000000000000000C02004002A
+:1031A000000000000000000000A0000A0000000075
+:1031B0000418F8E0C03046200000000000000000C5
+:1031C000D90048000000000000000000C0200400FA
+:1031D000000000000000000000A0000A0000000045
+:1031E0000518F880C03046200000000000000000F4
+:1031F000D90048000000000000000000C0200400CA
+:10320000000000000000000000A0000A0000000014
+:103210000618E000C030462000000000000000005A
+:10322000D90048000000000000000000C020040099
+:10323000000000000000000000A0000A00000000E4
+:103240000718F000C0304620000000000000000019
+:10325000D90048000000000000000000C020040069
+:10326000000000000000000000A0000A00000000B4
+:103270000818F3FCC03046200000000000000000E9
+:10328000D90048000000000000000000C020040039
+:10329000000000000000000000A0000A0000000084
+:1032A0000000003000200A2D000000000000000097
+:1032B000C0290C4000000000000000300020362330
+:1032C0000000000000000000C0200400000000001A
+:1032D0000000000000A0000A0000000086000000BE
+:1032E00000204411000000000000000000404801E0
+:1032F0000000000085000000C02044110000000014
+:103300000000000000404801000000000000217C97
+:10331000002044110000000000000000C020480010
+:103320000000000000000000C02048000000000075
+:1033300000000000C02048000000000081000000E4
+:10334000002044110000000000000001002048118E
+:103350000000000000000000C02008000000000085
+:103360000000000017000000000000000004217FA2
+:10337000006044110000068A0000001F0021023096
+:10338000000000000000000014C000000000000069
+:103390000000000000404C02000004480000000053
+:1033A000C0200C000000000000000000C020100041
+:1033B0000000000000000000C02014000000000019
+:1033C00000000000C0201800000000000000000005
+:1033D000C0201C000000000000007F0000280A211F
+:1033E0000000000000004500002F02220000000045
+:1033F000000000000CE00000000004560000000087
+:10340000C0202000000000000000000017000000A5
+:10341000000000000000001000280A230000000047
+:1034200000000010002F0222000000000000000039
+:103430000CE000000000045E810000000020441148
+:103440000000000000000001002048110000000002
+:1034500000040000006946240000068A0000000005
+:1034600000400000000004638100000000204411BF
+:1034700000000000000000000020481100000000D3
+:103480000000216D00204411000000000000000039
+:103490000020480400000000000000000060480513
+:1034A0000000068F00000000002824F0000000004B
+:1034B0000000000700280A230000000000000001AF
+:1034C000002F022200000000000000000AE00000BF
+:1034D0000000046A00000000002F00C90000000086
+:1034E0000000000004E00000000004830000000071
+:1034F000004000000000049000000002002F0222A3
+:1035000000000000000000000AE000000000046F5E
+:1035100000000000002F00C90000000000000000B3
+:1035200002E00000000004830000000000400000F2
+:103530000000049000000003002F022200000000A1
+:10354000000000000AE00000000004740000000019
+:10355000002F00C900000000000000000CE0000087
+:103560000000048300000000004000000000049000
+:1035700000000004002F02220000000000000000F4
+:103580000AE000000000047900000000002F00C9DC
+:1035900000000000000000000AE0000000000483BA
+:1035A0000000000000400000000004900000000542
+:1035B000002F022200000000000000000AE00000CE
+:1035C0000000047E00000000002F00C90000000081
+:1035D0000000000006E0000000000483000000007E
+:1035E000004000000000049000000006002F0222AE
+:1035F00000000000000000000AE00000000004835A
+:1036000000000000002F00C90000000000000000C2
+:1036100008E00000000004830000000000400000FB
+:103620000000049000007F0000280A210000000034
+:1036300000004500002F02220000000000000000F2
+:103640000AE00000000000000000000800210A233A
+:10365000000000000000000014C000000000048D05
+:10366000000021690020441100000000000000005B
+:10367000C02048000000000000000000C0204800FA
+:103680000000000000000000C02048000000000012
+:10369000CAFEBABE00404811000000000000000051
+:1036A000C02044000000000000000000C020000016
+:1036B0000000000000000000C040480000000000C2
+:1036C00000007F0000280A210000000000004500E3
+:1036D000002F022200000000000000000AE00000AD
+:1036E0000000049600000000C02000000000000060
+:1036F00000000000C02000000000000000000000EA
+:10370000C0400000000000000000000000404C0825
+:103710000000045600000000C02008000000000067
+:103720000000001040210E200000000000000011E9
+:10373000402112200000000000000012402116204D
+:10374000000000000000216900204411000000007A
+:1037500000000000002048020000000000000000FF
+:1037600000210225000000000000000014E000001D
+:10377000000004A000040000C0494A20000004A189
+:10378000FFFBFFFFC0284A200000000000000000EF
+:1037900000210223000000000000000014E00000EF
+:1037A000000004AD00000000C02048000000000040
+:1037B00000000000C02048000000000000000000E1
+:1037C00000210224000000000000000014C00000DE
+:1037D00000000000810000000020441100000000F3
+:1037E0000000000C00204811000000000000000054
+:1037F00000200010000000000000000014C00000C5
+:10380000000004A9A00000000020441100000000F6
+:10381000CAFEBABE0040481100000000810000004E
+:1038200000204411000000000000000400204811A6
+:10383000000000000000216B002044110000000087
+:1038400000000000C02048100000000081000000BF
+:103850000020441100000000000000050020481175
+:10386000000000000000216C002044110000000056
+:1038700000000000C0204810000000000000000010
+:10388000002F022400000000000000000CE00000F7
+:10389000000000000000000000400000000004A73D
+:1038A00000000000C0210A2000000000000000000D
+:1038B00014C00000000004C081000000002044117A
+:1038C000000000000000000000204811000000007F
+:1038D0000000216D002044110000000000000000E5
+:1038E000C02048000000000000000000C060480048
+:1038F0000000068F0000000000400000000004C42B
+:1039000081000000002044110000000000000001C0
+:10391000002048110000000000040000C0294620DB
+:103920000000000000000000C06000000000068AE7
+:103930000000000100210222000000000000000041
+:1039400014C00000000004CB0000216900204411D5
+:103950000000000000000000C0204800000000003F
+:1039600000000000C020480000000000000000002F
+:103970000020481000000000CAFEBABE00404811F6
+:103980000000000000000000C02044000000000013
+:1039900000000000C040481000000000810000004E
+:1039A0000020441100000000000000010020481128
+:1039B00000000000000021F8002044110000000079
+:1039C0000000000E0020481100000000000421F952
+:1039D000006044110000068A00000000002102304F
+:1039E000000000000000000014C00000000004CD32
+:1039F00000002180002044110000000000000000B1
+:103A0000C02048000000000000000000C0200000AE
+:103A10000000000000000000C0204800000000007E
+:103A200000000000C02000000000000000000000B6
+:103A3000C0404800000000000000000300333E2F9B
+:103A40000000000000000001002102210000000031
+:103A50000000000014E00000000004FD0000002C45
+:103A600000200A2D000000000004000018E00C11E6
+:103A7000000004EC0000000100333E2F00000000B5
+:103A80000000216900204411000000000000000037
+:103A90000020480200000000000000000020480351
+:103AA000000000000000000800300A2200000000B2
+:103AB00000000000C02048000000000000000000DE
+:103AC000C0204800000000000000216900204411CF
+:103AD000000000000000000000204802000000007C
+:103AE0000000000000204803000000000000000863
+:103AF00000300A220000000000000000C020480042
+:103B00000000000000000000D8C04800000004E0F1
+:103B100000002169002044110000000000000000A6
+:103B200000204802000000000000000000204803C0
+:103B3000000000000000000800300A220000000021
+:103B400000000000C020480000000000000000004D
+:103B5000C0204800000000000000002D0020122DB1
+:103B6000000000000000000000290C83000000009D
+:103B70000000216900204411000000000000000046
+:103B80000020480200000000000000000020480360
+:103B9000000000000000000800300A2200000000C1
+:103BA00000000000C02048000000000000000000ED
+:103BB000C020480000000000000000110021022485
+:103BC000000000000000000014C000000000000021
+:103BD0000000000000400000000004A70000002CCE
+:103BE000C0203620000000000000002DC04036201C
+:103BF000000000000000000F002102210000000072
+:103C00000000000014C000000000050200000000D9
+:103C1000006000000000000B00000000D900000060
+:103C20000000000000000000C0400400000000018F
+:103C3000B50000000020441100000000000020003A
+:103C40000020481100000000B600000000204411D0
+:103C5000000000000000A00000204811000000004B
+:103C6000B700000000204411000000000000C00068
+:103C70000020481100000000B8000000002044119E
+:103C8000000000000000F8E00020481100000000E3
+:103C9000B900000000204411000000000000F8807E
+:103CA0000020481100000000BA000000002044116C
+:103CB000000000000000E0000020481100000000AB
+:103CC000BB00000000204411000000000000F000D4
+:103CD0000020481100000000BC000000002044113A
+:103CE000000000000000F3FC00204811000000006C
+:103CF00081000000002044110000000000000002CC
+:103D00000020481100000000000000FF00280E30D5
+:103D10000000000000000000002F0223000000004F
+:103D2000000000000CC000000000051600000000AC
+:103D3000C0200800000000000000000014C00000C7
+:103D40000000052B0000000000200C110000000006
+:103D50000000001C00203623000000000000002BA3
+:103D60000020362300000000000000290020362338
+:103D700000000000000000280020362300000000A2
+:103D8000000000170020362300000000000000257E
+:103D9000002036230000000000000026002036230B
+:103DA0000000000000000015002036230000000085
+:103DB000000000160020362300000000FFFFE00096
+:103DC00000200C110000000000000021002036231C
+:103DD0000000000000000022002036230000000048
+:103DE00000001FFF00200C11000000000000002355
+:103DF00000203623000000000000002400203623AD
+:103E000000000000F1FFFFFF00283A2E0000000034
+:103E10000000001AC0220E20000000000000000078
+:103E20000029386E000000008100000000204411CD
+:103E30000000000000000006002048110000000003
+:103E40000000002A4020362000000000870000000B
+:103E5000002044110000000000000000C0204800C5
+:103E6000000000000000A1F4002044110000000048
+:103E700000000000002048100000000000000000CA
+:103E800000200C110000000000000030002036234C
+:103E9000000000009D000000002044110000000010
+:103EA0000000001F40214A20000000009600000092
+:103EB000002044110000000000000000C020480065
+:103EC0000000000000000000C0200C000000000006
+:103ED00000000000C0201000000000000000001FD3
+:103EE00000211624000000000000000014C00000A3
+:103EF000000000000000001D00203623000000002C
+:103F00000000000300281E2300000000000000083D
+:103F10000022222300000000FFFFF00000282228DA
+:103F20000000000000000000002920E80000000060
+:103F30000000001F002036280000000000000018CC
+:103F400000211E2300000000000000200020362772
+:103F50000000000000000002002216240000000003
+:103F600000000000003014A8000000000000001E47
+:103F700000203625000000000000000300211A2464
+:103F8000000000001000000000281A2600000000B9
+:103F9000EFFFFFFF00283A2E0000000000000000A5
+:103FA000004938CE000006780000000140280A20B1
+:103FB000000000000000000640280E200000000065
+:103FC00000000300C02812200000000000000008CC
+:103FD000002112240000000000000000C020162074
+:103FE0000000000000000000C0201A2000000000B7
+:103FF000000000000021022200000000000000007C
+:1040000014C000000000056381000000002044117E
+:104010000000000000000001002048110000000026
+:104020000000225800300A240000000000040000B4
+:10403000006946220000068A000021690020441120
+:104040000000000000000000002048050000000003
+:104050000002000000294A260000000000000000C5
+:104060000020481000000000CAFEBABE002048111F
+:104070000000000000000002002F022300000000EA
+:10408000000000000CC000000000056B00000000F4
+:10409000C0201C100000000000000000C040000014
+:1040A0000000057900000002002F0223000000003C
+:1040B000000000000CC000000000056B8100000043
+:1040C0000020441100000000000000010020481101
+:1040D000000000000000225800300A240000000008
+:1040E00000040000006946220000068A000000006B
+:1040F000C0201C100000000000000000C0400000B4
+:104100000000057900000000002F022300000000DD
+:10411000000000000CC000000000056F000000005F
+:10412000C0201C000000000000000000C040000093
+:104130000000057900000004002F022300000000A9
+:10414000000000000CC000000000057781000000A6
+:104150000020441100000000000000000020481171
+:10416000000000000000216D00204411000000004C
+:1041700000000000C0204800000000000000000017
+:10418000C06048000000068F0000000000401C10C6
+:104190000000057900000000C020000000000000C1
+:1041A00000000000C040000000000000000000000F
+:1041B0000EE000000000057B000000000060000031
+:1041C000000005C600000000002F022400000000CF
+:1041D000000000000CC000000000058C0000A2B729
+:1041E00000204411000000000000000000204807EB
+:1041F00000000000810000000020441100000000C9
+:104200000000000100204811000000000004A2B6D8
+:10421000006044110000068A0000001A00212230CC
+:104220000000000000000006002226300000000010
+:1042300000042004006044110000068A0000A2C4AB
+:10424000002044110000000000000000003048E998
+:10425000000000000000000000E000000000058AEF
+:104260000000A2D100204411000000000000000066
+:1042700000404808000000000000A2D100204411C6
+:10428000000000000000000100504A28000000006B
+:1042900000000001002F02240000000000000000C8
+:1042A0000CC000000000059D0000A2BB00204411CE
+:1042B000000000000000000000204807000000008F
+:1042C00081000000002044110000000000000001F7
+:1042D00000204811000000000004A2BA0060441150
+:1042E0000000068A0000001A0021223000000000B1
+:1042F0000000000600222630000000000004200418
+:10430000006044110000068A0000A2C5002044118C
+:104310000000000000000000003048E9000000003C
+:104320000000000000E000000000059B0000A2D299
+:104330000020441100000000000000000040480878
+:10434000000000000000A2D2002044110000000084
+:104350000000000100504A28000000000000000298
+:10436000002F022400000000000000000CC000002C
+:10437000000005AE0000A2BF0020441100000000B4
+:10438000000000000020480700000000810000003D
+:10439000002044110000000000000001002048112E
+:1043A000000000000004A2BE006044110000068A64
+:1043B0000000001A0021223000000000000000066A
+:1043C0000022263000000000000420040060441198
+:1043D0000000068A0000A2C6002044110000000070
+:1043E00000000000003048E900000000000000006C
+:1043F00000E00000000005AC0000A2D30020441142
+:10440000000000000000000000404808000000001C
+:104410000000A2D3002044110000000000000001B1
+:1044200000504A28000000000000A2C300204411F0
+:10443000000000000000000000204807000000000D
+:104440008100000000204411000000000000000175
+:1044500000204811000000000004A2C200604411C6
+:104460000000068A0000001A00212230000000002F
+:104470000000000600222630000000000004200496
+:10448000006044110000068A0000A2C70020441109
+:104490000000000000000000003048E900000000BB
+:1044A0000000000000E00000000005BB0000A2D4F6
+:1044B00000204411000000000000000000404808F7
+:1044C000000000000000A2D4002044110000000001
+:1044D0000000000100504A28000000008500000094
+:1044E00000204411000000000000000000204801EE
+:1044F000000000000000304A0020441100000000CD
+:104500000100000000204811000000000000000031
+:1045100000400000000005C1A4000000C0204411BC
+:104520000000000000000000C04048000000000043
+:1045300000000000C0600000000005C60000000090
+:10454000C0400400000000010000002C00203621C3
+:104550000000000081000000002044110000000065
+:1045600000000006002048110000000000000000CC
+:10457000002F023000000000000000000CC000000E
+:10458000000005CD00000000002004110000000024
+:104590000000003000403621000005E0000000303F
+:1045A0000020062D0000000000007E0000280621EB
+:1045B0000000000000000000002F022100000000A9
+:1045C000000000000CE00000000005E08100000099
+:1045D00000204411000000000000000100204811EC
+:1045E000000000000004A092006044110000068A50
+:1045F0000000003100203630000000000004A093CD
+:10460000006044110000068A0000003200203630AD
+:10461000000000000004A2B6006044110000068AF9
+:104620000000003300203630000000000004A2BA71
+:10463000006044110000068A00000034002036307B
+:10464000000000000004A2BE006044110000068AC1
+:104650000000003500203630000000000004A2C237
+:10466000006044110000068A000000360020363049
+:104670000000000000042004006044110000068ACD
+:104680000001A2A400204411000000000000003F2F
+:1046900000204811000000000000003F00204811E9
+:1046A000000000000000003F002048110000000052
+:1046B0000000003F0020481100000000000000053D
+:1046C00000204811000000000000A1F40020441167
+:1046D0000000000000000000002048110000000061
+:1046E00088000000002044110000000000000001CC
+:1046F000002048110000000081000000002044114B
+:10470000000000000000000600204811000000002A
+:1047100000000001002F0230000000000000000037
+:104720000CE0000000000629000000300020062DEB
+:104730000000000000000000002F02210000000027
+:10474000000000000CE000000000062981000000CD
+:10475000002044110000000000000001002048116A
+:104760000000000000007E0000280621000000007C
+:1047700000000000002F02210000000000000000E7
+:104780000CE00000000006020000A092002044118E
+:10479000000000000000003100204A2D0000000051
+:1047A0000000A0930020441100000000000000322F
+:1047B00000204A2D000000000000A2B60020441195
+:1047C000000000000000003300204A2D000000001F
+:1047D0000000A2BA002044110000000000000034D4
+:1047E00000204A2D000000000000A2BE002044115D
+:1047F000000000000000003500204A2D00000000ED
+:104800000000A2C200204411000000000000003699
+:1048100000204A2D00000000000000300020062D7E
+:1048200000000000000001FF002806210000000039
+:1048300000000000002F0221000000000000000026
+:104840000CE000000000062800000000002102210A
+:10485000000000000000000014C000000000060B73
+:104860000004A003006044110000068A0000A003B9
+:10487000002044110000000000000000002048104B
+:1048800000000000000000010021062100000000DF
+:104890000000000014C00000000006100004A0107A
+:1048A000006044110000068A0000A010002044119E
+:1048B0000000000000000000002048100000000080
+:1048C000000000010021062100000000000000009F
+:1048D000002F022100000000000000000CE000009A
+:1048E000000006280004A011006044110000068AA0
+:1048F0000000A01100204411000000000000000092
+:1049000000204810000000000004A01200604411C4
+:104910000000068A0000A0120020441100000000E0
+:104920000000000000204810000000000004A01358
+:10493000006044110000068A0000A013002044110A
+:1049400000000000000000000020481000000000EF
+:104950000004A014006044110000068A0000A014A6
+:10496000002044110000000000000000002048105A
+:10497000000000000004A015006044110000068A39
+:104980000000A015002044110000000000000000FD
+:1049900000204810000000000004A0160060441130
+:1049A0000000068A0000A01600204411000000004C
+:1049B0000000000000204810000000000004A017C4
+:1049C000006044110000068A0000A0170020441176
+:1049D000000000000000000000204810000000005F
+:1049E00000042004006044110000068A0000002C2E
+:1049F0000080062D00000000FF0000000020441190
+:104A0000000000000000000000204811000000002D
+:104A1000000000010020481100000000000000021A
+:104A20000080481100000000000000000EE00000BF
+:104A30000000063A000000300020062D00000000B3
+:104A40000000000200280621000000000000000015
+:104A5000002F022100000000000000000CE0000018
+:104A60000000063881000000002044110000000012
+:104A70000000000100204811000000000004200494
+:104A8000006044110000068A000010000020081198
+:104A9000000000000000002B002036220000000073
+:104AA00000000000006000000000063E0000000062
+:104AB00000600000000005C69800000000204411BE
+:104AC000000000000000000000804811000000000D
+:104AD00000000000C06000000000063E0000000072
+:104AE000C0400400000000010000A2A40020441106
+:104AF000000000000000002200204811000000001B
+:104B000089000000002044110000000000000001A6
+:104B1000004048110000062A9700000000204411C0
+:104B2000000000000000000000204811000000000C
+:104B30008A00000000204411000000000000000076
+:104B4000004048110000062A00000000006000003C
+:104B50000000065900002010002044110000000051
+:104B60000000800000204811000000000001A2A405
+:104B7000C020441100000000000000160060481131
+:104B80000000036E0000201000204411000000000F
+:104B9000000100000020481100000000810000001A
+:104BA0000020441100000000000000010020481116
+:104BB000000000000000217C0020441100000000E3
+:104BC000098000000020481100000000FFFFFFFFE7
+:104BD00000204811000000000000000000204811E3
+:104BE00000000000000000001700000000000000AE
+:104BF0000004217F006044110000068A0000001FAD
+:104C000000210230000000000000000014C000007D
+:104C1000000000000000000400404C11000006539A
+:104C2000000000000040000000000000000000172D
+:104C300000201E2D000000000000000400291E2797
+:104C40000000000000000017008036270000000070
+:104C50000000001700201E2D00000000FFFFFFFBDA
+:104C600000281E27000000000000001700803627E3
+:104C7000000000000000001700201E2D00000000B2
+:104C80000000000800291E27000000000000001797
+:104C900000803627000000000000001700201E2DB5
+:104CA00000000000FFFFFFF700281E2700000000A3
+:104CB00000000017008036270000000000002010D0
+:104CC0000020441100000000000080000020481176
+:104CD000000000000001A2A4002044110000000018
+:104CE00000000016006048110000036E0000201054
+:104CF00000204411000000000001000000204811C5
+:104D0000000000000000217C002044110000000091
+:104D1000018000000020481100000000FFFFFFFF9D
+:104D20000020481100000000000000000020481191
+:104D3000000000000000000017000000000000005C
+:104D4000810000000020441100000000000000016C
+:104D500000204811000000000004217F0060441181
+:104D60000000068A0000001F002102300000000041
+:104D70000000000014C000000000068900000010C0
+:104D800000404C110000066F00000000C02004002D
+:104D9000000000000000000038C00000000000001B
+:104DA0000000001D00200A2D000000000000001E71
+:104DB00000200E2D000000000000001F0020122D1A
+:104DC00000000000000000200020162D0000000060
+:104DD00000002169002044110000000000000000D4
+:104DE00000204804000000000000000000204805EA
+:104DF000000000000000000000204801000000004A
+:104E0000CAFEBABE002048110000000000000004E5
+:104E1000003012240000000000000000002F006499
+:104E200000000000000000000CC000000000068828
+:104E30000000000300281A22000000000000000803
+:104E40000022122200000000FFFFF00000281224C0
+:104E50000000000000000000002910C40000000055
+:104E60000000001F00403624000000000000000089
+:104E70000080000000000000000000001AC00000D8
+:104E80000000068A9F00000000204411000000007E
+:104E9000CAFEBABE00204811000000000000000059
+:104EA0001AE000000000068D0000000000800000F5
+:104EB00000000000000000001AC000000000068F83
+:104EC0009E0000000020441100000000CAFEBABE8F
+:104ED0000020481100000000000000001AE000005F
+:104EE00000000692000000000080000000000000AA
+:104EF00000000000006000000000000B0000100037
+:104F000000600411000003150000000000200411DF
+:104F1000000000000000000000600811000001B265
+:104F20000000225C0020441100000000000000038B
+:104F3000002048110000000000002256002044110B
+:104F4000000000000000001B0020481100000000CD
+:104F50000000A1FC0020441100000000000000013E
+:104F600000204811000000000001A1FDC0204411F4
+:104F7000000000000000002100201E2D00000000A5
+:104F80000000001000221E27000000000000002486
+:104F90000020222D000000000000FFFF0028222832
+:104FA0000000000000000000002949070000000088
+:104FB0000000000000204811000000000000002256
+:104FC0000020222D000000000000FFFF0028222802
+:104FD0000000000000000000002949070000000058
+:104FE0000000000000204811000000000000002325
+:104FF00000201E2D000000000000001000221E27CF
+:105000000000000000000000002949070000000027
+:1050100000000000004048110000000000000000F7
+:105020000000000000000000000000000000000080
+:105030000000000000000000000000000000000070
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B000014204FF05BD02500000000001C3016867
+:1052C000043F05BD00000000022502090250015103
+:1052D000000000000223024502A00241000000007D
+:1052E00003D705BD05BD05BD000000000646064705
+:1052F000031F05BD0000000005BD05C203200340DB
+:1053000000000000032A0282034203340000000070
+:1053100005BD05BD05BD05BD0000000005BD054E70
+:1053200005BD05BD0000000003BA05BD04B8034477
+:10533000000000000497044D043D05BD000000007E
+:1053400004CD05BD044104DA00000000044D05044D
+:10535000035103750000000005BD05BD05BD05BD79
+:105360000000000005BD05BD05BD05BD0000000035
+:1053700005BD05BD063C05C40000000005BD05BD1A
+:10538000000705BD0000000005BD05BD05BD05BD4C
+:105390000000000005BD05BD05BD05BD0000000005
+:1053A00003F803ED0408040600000000040E040ADC
+:1053B000040C041000000000041C04180424042041
+:1053C00000000000042C0428043404300000000015
+:1053D00005BD05BD043805BD0000000005BD05BDC7
+:1053E00005BD05BD0000000005BD05BD05BD05BD31
+:1053F000000000000002067606940006000000008F
+:00000001FF
diff --git a/firmware/radeon/RV630_pfp.bin.ihex b/firmware/radeon/RV630_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..f55292c
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001B8007C038B00D4401E00EE001E5F
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581A800C41C3A08
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFF000042C0400309002007D250049
+:1000700000351402007D350B00255403007CD5802B
+:1000800000259C030095C00400D5001B007EDDC147
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA180000D4401E00D5801EAD
+:100140000080005300D4007500D4401E00CA08008F
+:1001500000CA0C0000CA100000D4801900D4C018D6
+:1001600000D5001700D4801E00D4C01E00D5001E8C
+:1001700000E2001E00CA040000A00000007E828B86
+:1001800000CA080000D4806000D4401E0080000037
+:1001900000D4801E00CA080000D4806100D4401E34
+:1001A0000080000000D4801E00CA080000CA0C00B5
+:1001B00000D4401E00D4801600D4C01600D4801E87
+:1001C000008001B800D4C01E00C6084300CA0C005D
+:1001D00000CA10000094800400CA140000E420F358
+:1001E00000D4201300D5606500D4E01C00D5201C8D
+:1001F00000D5601C008000000006200100C60843F6
+:1002000000CA0C0000CA1000009483F700CA140052
+:1002100000E420F30080007900D4201300C60843D6
+:1002200000CA0C0000CA1000009883EF00CA140036
+:1002300000D400640080008D0000000000C414326F
+:1002400000C6184300C4082F0095400500C40C30B8
+:1002500000D4401E0080000000EE001E009583F5D3
+:1002600000C4103100D4403300D5206500D4A01C58
+:1002700000D4E01C00D5201C00E4015E00D4001E68
+:10028000008000000006200100CA1800000A2001BA
+:1002900000D6007600C408360098800700C61045D6
+:1002A0000095011000D4001F00D46062008000009F
+:1002B00000D4206200CC383500CC1433008401BB5C
+:1002C00000D4007200D5401E0080000000EE001E29
+:1002D00000E2001A008401BB00E2001A00CC104BBF
+:1002E00000CC0447002C9401007D098B0098400548
+:1002F000007D15CB00D4001A008001B800D4006D39
+:100300000034440100CC0C480098403A00CC2C4A00
+:100310000095800400CC0449008001B800D4001A84
+:1003200000D4C01A00282801008400F000CC10037B
+:100330000098801B0004380C008400F000CC1003EF
+:100340000098801700043808008400F000CC1003E7
+:100350000098801300043804008400F000CC1003DF
+:100360000098801400CC104C009A800900CC144DE9
+:10037000009840DC00D4006D00CC184800D5001A6D
+:1003800000D5401A008000C900D5801A0096C0D55B
+:1003900000D4006D008001B800D4006E009AC00344
+:1003A00000D4006D00D4006E0080000000EC007FDF
+:1003B000009AC0CC00D4006D008001B800D4006E5B
+:1003C00000CC140300CC180300CC1C03007D910367
+:1003D000007DD583007D190C0035CC1F0035701FC2
+:1003E000007CF0CB007CD08B00880000007E8E8BE0
+:1003F0000095C00400D4006E008001B800D4001A3B
+:1004000000D4C01A00CC080300CC0C0300CC1003AD
+:1004100000CC140300CC180300CC1C0300CC240334
+:1004200000CC28030035C41F0036B01F007C704B81
+:100430000034F01F007C704B0035701F007C704B47
+:10044000007D8881007DCCC1007E5101007E9541F8
+:10045000007C9082007CD4C2007C848B009AC00314
+:10046000007C8C8B002C88010098809E00D4006D4D
+:100470000098409C00D4006E00CC084C00CC0C4D81
+:1004800000CC104800D4801A00D4C01A00800101AA
+:1004900000D5001A00CC083200D40032009482D972
+:1004A00000CA0C0000D4401E0080000000D4001ED2
+:1004B00000E4011E00D4001E00CA080000CA0C009F
+:1004C00000CA100000D4401E00CA140000D4801ED0
+:1004D00000D4C01E00D5001E00D5401E00D54034FB
+:1004E0000080000000EE001E0028040400E2001A54
+:1004F00000E2001A00D4401A00CA380000CC0803F9
+:1005000000CC0C0300CC0C0300CC0C03009882BD83
+:1005100000000000008401BB00D7A06F0080000035
+:1005200000EE001F00CA040000C2FF0000CC083427
+:1005300000C13FFF007C74CB007CC90B007D010F24
+:10054000009902B0007C738B008401BB00D7A06FC0
+:100550000080000000EE001F00CA080000281900FB
+:10056000007D898B009580140028140400CA0C00BB
+:1005700000CA100000CA1C0000CA240000E2001FCC
+:1005800000D4C01A00D5001A00D5401A00CC1803B8
+:1005900000CC2C0300CC2C0300CC2C03007DA58BBD
+:1005A000007D9C4700984297000000000080016198
+:1005B00000D4C01A00D4401E00D4801E0080000069
+:1005C00000EE001E00E4011E00D4001E00D4401EF8
+:1005D00000EE001E00CA040000A00000007E828B16
+:1005E00000E4013E00D4001E00D4401E00EE001EB8
+:1005F00000CA040000A00000007E828B00CA080030
+:1006000000248C06000CCC060098C00600CC104ECE
+:100610000099000400D4007300E4011E00D4001E01
+:1006200000D4401E00D4801E0080000000EE001E9A
+:1006300000CA080000CA0C000034D01800251001C0
+:100640000095002100C17FFF00CA100000CA1400FD
+:1006500000CA180000D4801D00D4C01D007DB18BDD
+:1006600000C1420200C2C00100D5801D0034DC0E72
+:10067000007D5D4C007F734C00D7401E00D5001EEE
+:1006800000D5401E00C1420000C2C00000099C010C
+:100690000031DC10007F5F4C007F734C00042802A7
+:1006A000007D838000D5A86F00D5806600D7401EEE
+:1006B00000EC005E00C8240200C82402008001B8DB
+:1006C00000D6007600D4401E00D4801E00D4C01E88
+:1006D0000080000000EE001E0080000000EE001F01
+:1006E00000D4001F0080000000D4001F00D4001FB1
+:1006F0000088000000D4001F00000000000000007F
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:1008000000010171000201780003008F0004007FE5
+:10081000000500030006003F000700320008012C1D
+:1008200000090046000A0036001001B6001700A2B9
+:100830000022013A00230149002000B400240125D0
+:100840000027004D0028006A002A0060002B00529B
+:10085000002F0065003200870034017F003C015604
+:10086000003F00720041018C0044012E00550173CD
+:100870000056017A0060000B00610034006200380D
+:1008800000630038006400380065003800660038F6
+:10089000006700380068003A00690041006A0048BB
+:1008A000006B0048006C0048006D0048006E004876
+:1008B000006F00480000000600000006000000066F
+:1008C0000000000600000006000000060000000610
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV635_me.bin.ihex b/firmware/radeon/RV635_me.bin.ihex
new file mode 100644 (file)
index 0000000..ba3a7e6
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A000006044110000068A0000000000600000AB
+:1000B0000000062E00000000006000000000064264
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:1006600000000000006000000000066500000000BF
+:1006700000600000000006590000000200210E2268
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE00000000000006000000000065F0000000041
+:100AF00000400000000000EB00000000006000006B
+:100B000000000662000000070020222D0000000007
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E90000000068A0000001F002102300000000050
+:100EA0000000000014C000000000068900000004DB
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000068A000000110021023000000000FE
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000068900000000002B140500000000B5
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A000000000010000000000600000000006428E
+:1019B000000000000040040F0000021300000000BF
+:1019C000006000000000062E000000000060000023
+:1019D0000000064200000210006004110000031520
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B1000006000000000062E0000A00C0020441110
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E300000042004006044110000068A0000000035
+:101E4000006000000000062E00000000C0600000DE
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000006650000000000600000000002B53C
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:102240000000065C0000000000400000000002DE0C
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A00000000970000000020441125
+:102600000000000000000000002048110000000051
+:102610008A000000002044110000000000000000BB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D0000001A1FD002044110000000000000000E6
+:1026E000D90048000000000000000000C0200400E5
+:1026F000000000000000000000A0000A0000000030
+:1027000000002257002044110000000000000003D8
+:10271000C0484A20000000000000225D0020441153
+:102720000000000000000000C04048000000000061
+:1027300000000000006000000000064200000000F1
+:10274000C0200800000000000000225C00204411AE
+:10275000000000000000000300384A2200000000D2
+:102760000000A1FC00204411000000000000000057
+:10277000C0204800000000000001A1FD002044111D
+:102780000000000000000000002F022200000000F6
+:10279000000000000CE0000000000000000000004D
+:1027A00040204800000000000000000140304A20A6
+:1027B0000000000000000002C0304A2000000000BD
+:1027C0000000000100530A220000034B0000003FFC
+:1027D000C0280A20000000008100000000204411F1
+:1027E000000000000000000100204811000000006F
+:1027F000000021F800204411000000000000001833
+:102800000020481100000000000421F9006044117C
+:102810000000068A000000110021023000000000C4
+:102820000000000014E00000000003540000001449
+:10283000002F022200000000000000000CC0000079
+:10284000000003640000201000204411000000007C
+:102850000000800000204811000000000001A2A438
+:102860000020441100000000000000000060480249
+:102870000000036E00002100002044110000000051
+:1028800000000000C0204800000000000000000020
+:10289000C02048000000000000000000C0204800E8
+:1028A0000000000000000000C040480000000000E0
+:1028B00000000004002F02220000000000000000C1
+:1028C0000CC000000000036A00002010002044112A
+:1028D00000000000000080000020481100000000FF
+:1028E0000001A2A40020441100000000000000002C
+:1028F000004048020000035F00000028002F022271
+:1029000000000000000000000CC00000000005BD39
+:102910000001A2A4002044110000000000000000FB
+:10292000004048020000035F0000002C0020362613
+:102930000000000000000049002018110000000005
+:102940000000003F002048110000000000000001CE
+:1029500000331A260000000000000000002F0226AD
+:1029600000000000000000000CC000000000037028
+:102970000000002C00801A2D000000000000003F25
+:10298000C0280A200000000000000015002F0222CD
+:1029900000000000000000000CE0000000000386C2
+:1029A00000000006002F02220000000000000000CE
+:1029B0000CE00000000003B100000016002F02220E
+:1029C00000000000000000000CE00000000003B563
+:1029D00000000020002F0222000000000000000084
+:1029E0000CE000000000039C0000000F002F0222FA
+:1029F00000000000000000000CE00000000003A840
+:102A000000000010002F0222000000000000000063
+:102A10000CE00000000003A80000001E002F0222AE
+:102A200000000000000000000CE000000000039027
+:102A30000000A2A4002044110000000000000000DB
+:102A400000404802000000000800000000290A229F
+:102A5000000000000000000340210E2000000000E4
+:102A60000000000CC021122000000000000800003F
+:102A7000002812240000000000000014C0221620CC
+:102A80000000000000000000002914A40000000065
+:102A90000000A2A40020441100000000000000007B
+:102AA000002948A2000000000000A1FE00204411FF
+:102AB000000000000000000000404803000000008B
+:102AC000810000000020441100000000000000010F
+:102AD0000020481100000000000021F800204411EF
+:102AE0000000000000000016002048110000000057
+:102AF000000421F9006044110000068A000000155E
+:102B000000210230000000000000000014E000007E
+:102B1000000003920000210E00204411000000007C
+:102B200000000000C020480000000000000000007D
+:102B3000C0204800000000000000A2A400204411B2
+:102B400000000000000000000040480200000000FB
+:102B5000810000000020441100000000000000017E
+:102B60000020481100000000000021F8002044115E
+:102B700000000000000000170020481100000000C5
+:102B8000000421F9006044110000068A00000003DF
+:102B900000210230000000000000000014E00000EE
+:102BA0000000039E000021080020441100000000E6
+:102BB00000000000C02048000000000000000000ED
+:102BC000C0204800000000000000A2A40020441122
+:102BD000000000000000000000404802000000006B
+:102BE0000000A2A40020441100000000000000002A
+:102BF0000020480200000000800000000020441176
+:102C0000000000000000000000204811000000004B
+:102C100081000000002044110000000000000010AE
+:102C200000204811000000000000000000200010FB
+:102C3000000000000000000014C00000000003AE0F
+:102C40000000000000400000000000000000201014
+:102C50000020441100000000000080000020481106
+:102C6000000000000001A2A40020441100000000A8
+:102C70000000000600404811000000000000201085
+:102C800000204411000000000000800000204811D6
+:102C9000000000000001A2A4002044110000000078
+:102CA00000000016006048110000036E00000000E4
+:102CB000004000000000000000000000C0200800EC
+:102CC0000000000000000000C0200C000000000018
+:102CD0000000001D00210223000000000000000091
+:102CE00014E00000000003CE810000000020441129
+:102CF000000000000000000100204811000000005A
+:102D0000000021F80020441100000000000000181D
+:102D10000020481100000000000421F90060441167
+:102D20000000068A000000110021023000000000AF
+:102D30000000000014E00000000003C000002100BB
+:102D400000204411000000000000000000204802A4
+:102D50000000000000000000002048030000000008
+:102D6000BABECAFE0020481100000000CAFEBABE6A
+:102D70000020481100000000000020100020441135
+:102D8000000000000000800000204811000000004A
+:102D90000000A2A400204411000000000000000474
+:102DA0000040481100000000000021700020441184
+:102DB00000000000000000000020480200000000A9
+:102DC0000000000000204803000000008100000017
+:102DD00000204411000000000000000A00204811FB
+:102DE00000000000000000000020001000000000B3
+:102DF0000000000014C00000000003D38C0000009D
+:102E00000020441100000000CAFEBABE0040481174
+:102E100000000000810000000020441100000000BC
+:102E200000000001002048110000000000003FFFEA
+:102E300040280A20000000008000000040280E20EA
+:102E40000000000040000000C02812200000000028
+:102E500000040000006946220000068A000000000D
+:102E6000002014100000000000000000002F0223CA
+:102E700000000000000000000CC00000000003E1A2
+:102E800000000000C0401800000003E400003FFF05
+:102E9000C0281A2000000000000400000069462637
+:102EA0000000068A0000000000201810000000004A
+:102EB00000000000002F02240000000000000000BD
+:102EC0000CC00000000003E700000000C0401C0030
+:102ED000000003EA00003FFFC0281E2000000000A1
+:102EE00000040000006946270000068A0000000078
+:102EF00000201C1000000000000000000020440220
+:102F00000000000000000000002820C500000000B4
+:102F100000000000004948E800000000A580000013
+:102F200000200811000000000000200000200C110B
+:102F30000000000083000000006044110000041243
+:102F4000000000000020440200000000000000001B
+:102F5000C0204800000000000000000040204800A1
+:102F6000000000000000001FC0210220000000003F
+:102F70000000000014C00000000003F70000201053
+:102F800000204411000000000000800000204811D3
+:102F9000000000000000FFFFC0481220000003FFF7
+:102FA000A780000000200811000000000000A00021
+:102FB00000200C110000000083000000006044119C
+:102FC0000000041200000000002044020000000085
+:102FD00000000000C02048000000000000000000C9
+:102FE000C0204800000000000000FFFFC0281220A1
+:102FF00000000000830000000020441100000000D9
+:103000000000000000304883000000008400000041
+:10301000002044110000000000000000C020480013
+:1030200000000000000000001D0000000000000083
+:103030008300000000604411000004120000000042
+:10304000C040040000000001A98000000020081119
+:10305000000000000000C00000400C11000003FA56
+:10306000AB80000000200811000000000000F8E024
+:1030700000400C11000003FAAD8000000020081190
+:10308000000000000000F88000400C11000003FA6E
+:10309000B380000000200811000000000000F3FCD5
+:1030A00000400C11000003FAAF800000002008115E
+:1030B000000000000000E00000400C11000003FAD6
+:1030C000B180000000200811000000000000F000A6
+:1030D00000400C11000003FA83000000002044119E
+:1030E00000000000000021480020481100000000FE
+:1030F00084000000002044110000000000000000D7
+:10310000C020480000000000000000001D0000007A
+:10311000000000000000000000800000000000002F
+:1031200001182000C0304620000000000000000010
+:10313000D90048000000000000000000C02004008A
+:10314000000000000000000000A0000A00000000D5
+:103150000218A000C030462000000000000000005F
+:10316000D90048000000000000000000C02004005A
+:10317000000000000000000000A0000A00000000A5
+:103180000318C000C030462000000000000000000E
+:10319000D90048000000000000000000C02004002A
+:1031A000000000000000000000A0000A0000000075
+:1031B0000418F8E0C03046200000000000000000C5
+:1031C000D90048000000000000000000C0200400FA
+:1031D000000000000000000000A0000A0000000045
+:1031E0000518F880C03046200000000000000000F4
+:1031F000D90048000000000000000000C0200400CA
+:10320000000000000000000000A0000A0000000014
+:103210000618E000C030462000000000000000005A
+:10322000D90048000000000000000000C020040099
+:10323000000000000000000000A0000A00000000E4
+:103240000718F000C0304620000000000000000019
+:10325000D90048000000000000000000C020040069
+:10326000000000000000000000A0000A00000000B4
+:103270000818F3FCC03046200000000000000000E9
+:10328000D90048000000000000000000C020040039
+:10329000000000000000000000A0000A0000000084
+:1032A0000000003000200A2D000000000000000097
+:1032B000C0290C4000000000000000300020362330
+:1032C0000000000000000000C0200400000000001A
+:1032D0000000000000A0000A0000000086000000BE
+:1032E00000204411000000000000000000404801E0
+:1032F0000000000085000000C02044110000000014
+:103300000000000000404801000000000000217C97
+:10331000002044110000000000000000C020480010
+:103320000000000000000000C02048000000000075
+:1033300000000000C02048000000000081000000E4
+:10334000002044110000000000000001002048118E
+:103350000000000000000000C02008000000000085
+:103360000000000017000000000000000004217FA2
+:10337000006044110000068A0000001F0021023096
+:10338000000000000000000014C000000000000069
+:103390000000000000404C02000004480000000053
+:1033A000C0200C000000000000000000C020100041
+:1033B0000000000000000000C02014000000000019
+:1033C00000000000C0201800000000000000000005
+:1033D000C0201C000000000000007F0000280A211F
+:1033E0000000000000004500002F02220000000045
+:1033F000000000000CE00000000004560000000087
+:10340000C0202000000000000000000017000000A5
+:10341000000000000000001000280A230000000047
+:1034200000000010002F0222000000000000000039
+:103430000CE000000000045E810000000020441148
+:103440000000000000000001002048110000000002
+:1034500000040000006946240000068A0000000005
+:1034600000400000000004638100000000204411BF
+:1034700000000000000000000020481100000000D3
+:103480000000216D00204411000000000000000039
+:103490000020480400000000000000000060480513
+:1034A0000000068F00000000002824F0000000004B
+:1034B0000000000700280A230000000000000001AF
+:1034C000002F022200000000000000000AE00000BF
+:1034D0000000046A00000000002F00C90000000086
+:1034E0000000000004E00000000004830000000071
+:1034F000004000000000049000000002002F0222A3
+:1035000000000000000000000AE000000000046F5E
+:1035100000000000002F00C90000000000000000B3
+:1035200002E00000000004830000000000400000F2
+:103530000000049000000003002F022200000000A1
+:10354000000000000AE00000000004740000000019
+:10355000002F00C900000000000000000CE0000087
+:103560000000048300000000004000000000049000
+:1035700000000004002F02220000000000000000F4
+:103580000AE000000000047900000000002F00C9DC
+:1035900000000000000000000AE0000000000483BA
+:1035A0000000000000400000000004900000000542
+:1035B000002F022200000000000000000AE00000CE
+:1035C0000000047E00000000002F00C90000000081
+:1035D0000000000006E0000000000483000000007E
+:1035E000004000000000049000000006002F0222AE
+:1035F00000000000000000000AE00000000004835A
+:1036000000000000002F00C90000000000000000C2
+:1036100008E00000000004830000000000400000FB
+:103620000000049000007F0000280A210000000034
+:1036300000004500002F02220000000000000000F2
+:103640000AE00000000000000000000800210A233A
+:10365000000000000000000014C000000000048D05
+:10366000000021690020441100000000000000005B
+:10367000C02048000000000000000000C0204800FA
+:103680000000000000000000C02048000000000012
+:10369000CAFEBABE00404811000000000000000051
+:1036A000C02044000000000000000000C020000016
+:1036B0000000000000000000C040480000000000C2
+:1036C00000007F0000280A210000000000004500E3
+:1036D000002F022200000000000000000AE00000AD
+:1036E0000000049600000000C02000000000000060
+:1036F00000000000C02000000000000000000000EA
+:10370000C0400000000000000000000000404C0825
+:103710000000045600000000C02008000000000067
+:103720000000001040210E200000000000000011E9
+:10373000402112200000000000000012402116204D
+:10374000000000000000216900204411000000007A
+:1037500000000000002048020000000000000000FF
+:1037600000210225000000000000000014E000001D
+:10377000000004A000040000C0494A20000004A189
+:10378000FFFBFFFFC0284A200000000000000000EF
+:1037900000210223000000000000000014E00000EF
+:1037A000000004AD00000000C02048000000000040
+:1037B00000000000C02048000000000000000000E1
+:1037C00000210224000000000000000014C00000DE
+:1037D00000000000810000000020441100000000F3
+:1037E0000000000C00204811000000000000000054
+:1037F00000200010000000000000000014C00000C5
+:10380000000004A9A00000000020441100000000F6
+:10381000CAFEBABE0040481100000000810000004E
+:1038200000204411000000000000000400204811A6
+:10383000000000000000216B002044110000000087
+:1038400000000000C02048100000000081000000BF
+:103850000020441100000000000000050020481175
+:10386000000000000000216C002044110000000056
+:1038700000000000C0204810000000000000000010
+:10388000002F022400000000000000000CE00000F7
+:10389000000000000000000000400000000004A73D
+:1038A00000000000C0210A2000000000000000000D
+:1038B00014C00000000004C081000000002044117A
+:1038C000000000000000000000204811000000007F
+:1038D0000000216D002044110000000000000000E5
+:1038E000C02048000000000000000000C060480048
+:1038F0000000068F0000000000400000000004C42B
+:1039000081000000002044110000000000000001C0
+:10391000002048110000000000040000C0294620DB
+:103920000000000000000000C06000000000068AE7
+:103930000000000100210222000000000000000041
+:1039400014C00000000004CB0000216900204411D5
+:103950000000000000000000C0204800000000003F
+:1039600000000000C020480000000000000000002F
+:103970000020481000000000CAFEBABE00404811F6
+:103980000000000000000000C02044000000000013
+:1039900000000000C040481000000000810000004E
+:1039A0000020441100000000000000010020481128
+:1039B00000000000000021F8002044110000000079
+:1039C0000000000E0020481100000000000421F952
+:1039D000006044110000068A00000000002102304F
+:1039E000000000000000000014C00000000004CD32
+:1039F00000002180002044110000000000000000B1
+:103A0000C02048000000000000000000C0200000AE
+:103A10000000000000000000C0204800000000007E
+:103A200000000000C02000000000000000000000B6
+:103A3000C0404800000000000000000300333E2F9B
+:103A40000000000000000001002102210000000031
+:103A50000000000014E00000000004FD0000002C45
+:103A600000200A2D000000000004000018E00C11E6
+:103A7000000004EC0000000100333E2F00000000B5
+:103A80000000216900204411000000000000000037
+:103A90000020480200000000000000000020480351
+:103AA000000000000000000800300A2200000000B2
+:103AB00000000000C02048000000000000000000DE
+:103AC000C0204800000000000000216900204411CF
+:103AD000000000000000000000204802000000007C
+:103AE0000000000000204803000000000000000863
+:103AF00000300A220000000000000000C020480042
+:103B00000000000000000000D8C04800000004E0F1
+:103B100000002169002044110000000000000000A6
+:103B200000204802000000000000000000204803C0
+:103B3000000000000000000800300A220000000021
+:103B400000000000C020480000000000000000004D
+:103B5000C0204800000000000000002D0020122DB1
+:103B6000000000000000000000290C83000000009D
+:103B70000000216900204411000000000000000046
+:103B80000020480200000000000000000020480360
+:103B9000000000000000000800300A2200000000C1
+:103BA00000000000C02048000000000000000000ED
+:103BB000C020480000000000000000110021022485
+:103BC000000000000000000014C000000000000021
+:103BD0000000000000400000000004A70000002CCE
+:103BE000C0203620000000000000002DC04036201C
+:103BF000000000000000000F002102210000000072
+:103C00000000000014C000000000050200000000D9
+:103C1000006000000000000B00000000D900000060
+:103C20000000000000000000C0400400000000018F
+:103C3000B50000000020441100000000000020003A
+:103C40000020481100000000B600000000204411D0
+:103C5000000000000000A00000204811000000004B
+:103C6000B700000000204411000000000000C00068
+:103C70000020481100000000B8000000002044119E
+:103C8000000000000000F8E00020481100000000E3
+:103C9000B900000000204411000000000000F8807E
+:103CA0000020481100000000BA000000002044116C
+:103CB000000000000000E0000020481100000000AB
+:103CC000BB00000000204411000000000000F000D4
+:103CD0000020481100000000BC000000002044113A
+:103CE000000000000000F3FC00204811000000006C
+:103CF00081000000002044110000000000000002CC
+:103D00000020481100000000000000FF00280E30D5
+:103D10000000000000000000002F0223000000004F
+:103D2000000000000CC000000000051600000000AC
+:103D3000C0200800000000000000000014C00000C7
+:103D40000000052B0000000000200C110000000006
+:103D50000000001C00203623000000000000002BA3
+:103D60000020362300000000000000290020362338
+:103D700000000000000000280020362300000000A2
+:103D8000000000170020362300000000000000257E
+:103D9000002036230000000000000026002036230B
+:103DA0000000000000000015002036230000000085
+:103DB000000000160020362300000000FFFFE00096
+:103DC00000200C110000000000000021002036231C
+:103DD0000000000000000022002036230000000048
+:103DE00000001FFF00200C11000000000000002355
+:103DF00000203623000000000000002400203623AD
+:103E000000000000F1FFFFFF00283A2E0000000034
+:103E10000000001AC0220E20000000000000000078
+:103E20000029386E000000008100000000204411CD
+:103E30000000000000000006002048110000000003
+:103E40000000002A4020362000000000870000000B
+:103E5000002044110000000000000000C0204800C5
+:103E6000000000000000A1F4002044110000000048
+:103E700000000000002048100000000000000000CA
+:103E800000200C110000000000000030002036234C
+:103E9000000000009D000000002044110000000010
+:103EA0000000001F40214A20000000009600000092
+:103EB000002044110000000000000000C020480065
+:103EC0000000000000000000C0200C000000000006
+:103ED00000000000C0201000000000000000001FD3
+:103EE00000211624000000000000000014C00000A3
+:103EF000000000000000001D00203623000000002C
+:103F00000000000300281E2300000000000000083D
+:103F10000022222300000000FFFFF00000282228DA
+:103F20000000000000000000002920E80000000060
+:103F30000000001F002036280000000000000018CC
+:103F400000211E2300000000000000200020362772
+:103F50000000000000000002002216240000000003
+:103F600000000000003014A8000000000000001E47
+:103F700000203625000000000000000300211A2464
+:103F8000000000001000000000281A2600000000B9
+:103F9000EFFFFFFF00283A2E0000000000000000A5
+:103FA000004938CE000006780000000140280A20B1
+:103FB000000000000000000640280E200000000065
+:103FC00000000300C02812200000000000000008CC
+:103FD000002112240000000000000000C020162074
+:103FE0000000000000000000C0201A2000000000B7
+:103FF000000000000021022200000000000000007C
+:1040000014C000000000056381000000002044117E
+:104010000000000000000001002048110000000026
+:104020000000225800300A240000000000040000B4
+:10403000006946220000068A000021690020441120
+:104040000000000000000000002048050000000003
+:104050000002000000294A260000000000000000C5
+:104060000020481000000000CAFEBABE002048111F
+:104070000000000000000002002F022300000000EA
+:10408000000000000CC000000000056B00000000F4
+:10409000C0201C100000000000000000C040000014
+:1040A0000000057900000002002F0223000000003C
+:1040B000000000000CC000000000056B8100000043
+:1040C0000020441100000000000000010020481101
+:1040D000000000000000225800300A240000000008
+:1040E00000040000006946220000068A000000006B
+:1040F000C0201C100000000000000000C0400000B4
+:104100000000057900000000002F022300000000DD
+:10411000000000000CC000000000056F000000005F
+:10412000C0201C000000000000000000C040000093
+:104130000000057900000004002F022300000000A9
+:10414000000000000CC000000000057781000000A6
+:104150000020441100000000000000000020481171
+:10416000000000000000216D00204411000000004C
+:1041700000000000C0204800000000000000000017
+:10418000C06048000000068F0000000000401C10C6
+:104190000000057900000000C020000000000000C1
+:1041A00000000000C040000000000000000000000F
+:1041B0000EE000000000057B000000000060000031
+:1041C000000005C600000000002F022400000000CF
+:1041D000000000000CC000000000058C0000A2B729
+:1041E00000204411000000000000000000204807EB
+:1041F00000000000810000000020441100000000C9
+:104200000000000100204811000000000004A2B6D8
+:10421000006044110000068A0000001A00212230CC
+:104220000000000000000006002226300000000010
+:1042300000042004006044110000068A0000A2C4AB
+:10424000002044110000000000000000003048E998
+:10425000000000000000000000E000000000058AEF
+:104260000000A2D100204411000000000000000066
+:1042700000404808000000000000A2D100204411C6
+:10428000000000000000000100504A28000000006B
+:1042900000000001002F02240000000000000000C8
+:1042A0000CC000000000059D0000A2BB00204411CE
+:1042B000000000000000000000204807000000008F
+:1042C00081000000002044110000000000000001F7
+:1042D00000204811000000000004A2BA0060441150
+:1042E0000000068A0000001A0021223000000000B1
+:1042F0000000000600222630000000000004200418
+:10430000006044110000068A0000A2C5002044118C
+:104310000000000000000000003048E9000000003C
+:104320000000000000E000000000059B0000A2D299
+:104330000020441100000000000000000040480878
+:10434000000000000000A2D2002044110000000084
+:104350000000000100504A28000000000000000298
+:10436000002F022400000000000000000CC000002C
+:10437000000005AE0000A2BF0020441100000000B4
+:10438000000000000020480700000000810000003D
+:10439000002044110000000000000001002048112E
+:1043A000000000000004A2BE006044110000068A64
+:1043B0000000001A0021223000000000000000066A
+:1043C0000022263000000000000420040060441198
+:1043D0000000068A0000A2C6002044110000000070
+:1043E00000000000003048E900000000000000006C
+:1043F00000E00000000005AC0000A2D30020441142
+:10440000000000000000000000404808000000001C
+:104410000000A2D3002044110000000000000001B1
+:1044200000504A28000000000000A2C300204411F0
+:10443000000000000000000000204807000000000D
+:104440008100000000204411000000000000000175
+:1044500000204811000000000004A2C200604411C6
+:104460000000068A0000001A00212230000000002F
+:104470000000000600222630000000000004200496
+:10448000006044110000068A0000A2C70020441109
+:104490000000000000000000003048E900000000BB
+:1044A0000000000000E00000000005BB0000A2D4F6
+:1044B00000204411000000000000000000404808F7
+:1044C000000000000000A2D4002044110000000001
+:1044D0000000000100504A28000000008500000094
+:1044E00000204411000000000000000000204801EE
+:1044F000000000000000304A0020441100000000CD
+:104500000100000000204811000000000000000031
+:1045100000400000000005C1A4000000C0204411BC
+:104520000000000000000000C04048000000000043
+:1045300000000000C0600000000005C60000000090
+:10454000C0400400000000010000002C00203621C3
+:104550000000000081000000002044110000000065
+:1045600000000006002048110000000000000000CC
+:10457000002F023000000000000000000CC000000E
+:10458000000005CD00000000002004110000000024
+:104590000000003000403621000005E0000000303F
+:1045A0000020062D0000000000007E0000280621EB
+:1045B0000000000000000000002F022100000000A9
+:1045C000000000000CE00000000005E08100000099
+:1045D00000204411000000000000000100204811EC
+:1045E000000000000004A092006044110000068A50
+:1045F0000000003100203630000000000004A093CD
+:10460000006044110000068A0000003200203630AD
+:10461000000000000004A2B6006044110000068AF9
+:104620000000003300203630000000000004A2BA71
+:10463000006044110000068A00000034002036307B
+:10464000000000000004A2BE006044110000068AC1
+:104650000000003500203630000000000004A2C237
+:10466000006044110000068A000000360020363049
+:104670000000000000042004006044110000068ACD
+:104680000001A2A400204411000000000000003F2F
+:1046900000204811000000000000003F00204811E9
+:1046A000000000000000003F002048110000000052
+:1046B0000000003F0020481100000000000000053D
+:1046C00000204811000000000000A1F40020441167
+:1046D0000000000000000000002048110000000061
+:1046E00088000000002044110000000000000001CC
+:1046F000002048110000000081000000002044114B
+:10470000000000000000000600204811000000002A
+:1047100000000001002F0230000000000000000037
+:104720000CE0000000000629000000300020062DEB
+:104730000000000000000000002F02210000000027
+:10474000000000000CE000000000062981000000CD
+:10475000002044110000000000000001002048116A
+:104760000000000000007E0000280621000000007C
+:1047700000000000002F02210000000000000000E7
+:104780000CE00000000006020000A092002044118E
+:10479000000000000000003100204A2D0000000051
+:1047A0000000A0930020441100000000000000322F
+:1047B00000204A2D000000000000A2B60020441195
+:1047C000000000000000003300204A2D000000001F
+:1047D0000000A2BA002044110000000000000034D4
+:1047E00000204A2D000000000000A2BE002044115D
+:1047F000000000000000003500204A2D00000000ED
+:104800000000A2C200204411000000000000003699
+:1048100000204A2D00000000000000300020062D7E
+:1048200000000000000001FF002806210000000039
+:1048300000000000002F0221000000000000000026
+:104840000CE000000000062800000000002102210A
+:10485000000000000000000014C000000000060B73
+:104860000004A003006044110000068A0000A003B9
+:10487000002044110000000000000000002048104B
+:1048800000000000000000010021062100000000DF
+:104890000000000014C00000000006100004A0107A
+:1048A000006044110000068A0000A010002044119E
+:1048B0000000000000000000002048100000000080
+:1048C000000000010021062100000000000000009F
+:1048D000002F022100000000000000000CE000009A
+:1048E000000006280004A011006044110000068AA0
+:1048F0000000A01100204411000000000000000092
+:1049000000204810000000000004A01200604411C4
+:104910000000068A0000A0120020441100000000E0
+:104920000000000000204810000000000004A01358
+:10493000006044110000068A0000A013002044110A
+:1049400000000000000000000020481000000000EF
+:104950000004A014006044110000068A0000A014A6
+:10496000002044110000000000000000002048105A
+:10497000000000000004A015006044110000068A39
+:104980000000A015002044110000000000000000FD
+:1049900000204810000000000004A0160060441130
+:1049A0000000068A0000A01600204411000000004C
+:1049B0000000000000204810000000000004A017C4
+:1049C000006044110000068A0000A0170020441176
+:1049D000000000000000000000204810000000005F
+:1049E00000042004006044110000068A0000002C2E
+:1049F0000080062D00000000FF0000000020441190
+:104A0000000000000000000000204811000000002D
+:104A1000000000010020481100000000000000021A
+:104A20000080481100000000000000000EE00000BF
+:104A30000000063A000000300020062D00000000B3
+:104A40000000000200280621000000000000000015
+:104A5000002F022100000000000000000CE0000018
+:104A60000000063881000000002044110000000012
+:104A70000000000100204811000000000004200494
+:104A8000006044110000068A000010000020081198
+:104A9000000000000000002B002036220000000073
+:104AA00000000000006000000000063E0000000062
+:104AB00000600000000005C69800000000204411BE
+:104AC000000000000000000000804811000000000D
+:104AD00000000000C06000000000063E0000000072
+:104AE000C0400400000000010000A2A40020441106
+:104AF000000000000000002200204811000000001B
+:104B000089000000002044110000000000000001A6
+:104B1000004048110000062A9700000000204411C0
+:104B2000000000000000000000204811000000000C
+:104B30008A00000000204411000000000000000076
+:104B4000004048110000062A00000000006000003C
+:104B50000000065900002010002044110000000051
+:104B60000000800000204811000000000001A2A405
+:104B7000C020441100000000000000160060481131
+:104B80000000036E0000201000204411000000000F
+:104B9000000100000020481100000000810000001A
+:104BA0000020441100000000000000010020481116
+:104BB000000000000000217C0020441100000000E3
+:104BC000098000000020481100000000FFFFFFFFE7
+:104BD00000204811000000000000000000204811E3
+:104BE00000000000000000001700000000000000AE
+:104BF0000004217F006044110000068A0000001FAD
+:104C000000210230000000000000000014C000007D
+:104C1000000000000000000400404C11000006539A
+:104C2000000000000040000000000000000000172D
+:104C300000201E2D000000000000000400291E2797
+:104C40000000000000000017008036270000000070
+:104C50000000001700201E2D00000000FFFFFFFBDA
+:104C600000281E27000000000000001700803627E3
+:104C7000000000000000001700201E2D00000000B2
+:104C80000000000800291E27000000000000001797
+:104C900000803627000000000000001700201E2DB5
+:104CA00000000000FFFFFFF700281E2700000000A3
+:104CB00000000017008036270000000000002010D0
+:104CC0000020441100000000000080000020481176
+:104CD000000000000001A2A4002044110000000018
+:104CE00000000016006048110000036E0000201054
+:104CF00000204411000000000001000000204811C5
+:104D0000000000000000217C002044110000000091
+:104D1000018000000020481100000000FFFFFFFF9D
+:104D20000020481100000000000000000020481191
+:104D3000000000000000000017000000000000005C
+:104D4000810000000020441100000000000000016C
+:104D500000204811000000000004217F0060441181
+:104D60000000068A0000001F002102300000000041
+:104D70000000000014C000000000068900000010C0
+:104D800000404C110000066F00000000C02004002D
+:104D9000000000000000000038C00000000000001B
+:104DA0000000001D00200A2D000000000000001E71
+:104DB00000200E2D000000000000001F0020122D1A
+:104DC00000000000000000200020162D0000000060
+:104DD00000002169002044110000000000000000D4
+:104DE00000204804000000000000000000204805EA
+:104DF000000000000000000000204801000000004A
+:104E0000CAFEBABE002048110000000000000004E5
+:104E1000003012240000000000000000002F006499
+:104E200000000000000000000CC000000000068828
+:104E30000000000300281A22000000000000000803
+:104E40000022122200000000FFFFF00000281224C0
+:104E50000000000000000000002910C40000000055
+:104E60000000001F00403624000000000000000089
+:104E70000080000000000000000000001AC00000D8
+:104E80000000068A9F00000000204411000000007E
+:104E9000CAFEBABE00204811000000000000000059
+:104EA0001AE000000000068D0000000000800000F5
+:104EB00000000000000000001AC000000000068F83
+:104EC0009E0000000020441100000000CAFEBABE8F
+:104ED0000020481100000000000000001AE000005F
+:104EE00000000692000000000080000000000000AA
+:104EF00000000000006000000000000B0000100037
+:104F000000600411000003150000000000200411DF
+:104F1000000000000000000000600811000001B265
+:104F20000000225C0020441100000000000000038B
+:104F3000002048110000000000002256002044110B
+:104F4000000000000000001B0020481100000000CD
+:104F50000000A1FC0020441100000000000000013E
+:104F600000204811000000000001A1FDC0204411F4
+:104F7000000000000000002100201E2D00000000A5
+:104F80000000001000221E27000000000000002486
+:104F90000020222D000000000000FFFF0028222832
+:104FA0000000000000000000002949070000000088
+:104FB0000000000000204811000000000000002256
+:104FC0000020222D000000000000FFFF0028222802
+:104FD0000000000000000000002949070000000058
+:104FE0000000000000204811000000000000002325
+:104FF00000201E2D000000000000001000221E27CF
+:105000000000000000000000002949070000000027
+:1050100000000000004048110000000000000000F7
+:105020000000000000000000000000000000000080
+:105030000000000000000000000000000000000070
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B000014204FF05BD02500000000001C3016867
+:1052C000043F05BD00000000022502090250015103
+:1052D000000000000223024502A00241000000007D
+:1052E00003D705BD05BD05BD000000000646064705
+:1052F000031F05BD0000000005BD05C203200340DB
+:1053000000000000032A0282034203340000000070
+:1053100005BD05BD05BD05BD0000000005BD054E70
+:1053200005BD05BD0000000003BA05BD04B8034477
+:10533000000000000497044D043D05BD000000007E
+:1053400004CD05BD044104DA00000000044D05044D
+:10535000035103750000000005BD05BD05BD05BD79
+:105360000000000005BD05BD05BD05BD0000000035
+:1053700005BD05BD063C05C40000000005BD05BD1A
+:10538000000705BD0000000005BD05BD05BD05BD4C
+:105390000000000005BD05BD05BD05BD0000000005
+:1053A00003F803ED0408040600000000040E040ADC
+:1053B000040C041000000000041C04180424042041
+:1053C00000000000042C0428043404300000000015
+:1053D00005BD05BD043805BD0000000005BD05BDC7
+:1053E00005BD05BD0000000005BD05BD05BD05BD31
+:1053F000000000000002067606940006000000008F
+:00000001FF
diff --git a/firmware/radeon/RV635_pfp.bin.ihex b/firmware/radeon/RV635_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..f55292c
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001B8007C038B00D4401E00EE001E5F
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581A800C41C3A08
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFF000042C0400309002007D250049
+:1000700000351402007D350B00255403007CD5802B
+:1000800000259C030095C00400D5001B007EDDC147
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA180000D4401E00D5801EAD
+:100140000080005300D4007500D4401E00CA08008F
+:1001500000CA0C0000CA100000D4801900D4C018D6
+:1001600000D5001700D4801E00D4C01E00D5001E8C
+:1001700000E2001E00CA040000A00000007E828B86
+:1001800000CA080000D4806000D4401E0080000037
+:1001900000D4801E00CA080000D4806100D4401E34
+:1001A0000080000000D4801E00CA080000CA0C00B5
+:1001B00000D4401E00D4801600D4C01600D4801E87
+:1001C000008001B800D4C01E00C6084300CA0C005D
+:1001D00000CA10000094800400CA140000E420F358
+:1001E00000D4201300D5606500D4E01C00D5201C8D
+:1001F00000D5601C008000000006200100C60843F6
+:1002000000CA0C0000CA1000009483F700CA140052
+:1002100000E420F30080007900D4201300C60843D6
+:1002200000CA0C0000CA1000009883EF00CA140036
+:1002300000D400640080008D0000000000C414326F
+:1002400000C6184300C4082F0095400500C40C30B8
+:1002500000D4401E0080000000EE001E009583F5D3
+:1002600000C4103100D4403300D5206500D4A01C58
+:1002700000D4E01C00D5201C00E4015E00D4001E68
+:10028000008000000006200100CA1800000A2001BA
+:1002900000D6007600C408360098800700C61045D6
+:1002A0000095011000D4001F00D46062008000009F
+:1002B00000D4206200CC383500CC1433008401BB5C
+:1002C00000D4007200D5401E0080000000EE001E29
+:1002D00000E2001A008401BB00E2001A00CC104BBF
+:1002E00000CC0447002C9401007D098B0098400548
+:1002F000007D15CB00D4001A008001B800D4006D39
+:100300000034440100CC0C480098403A00CC2C4A00
+:100310000095800400CC0449008001B800D4001A84
+:1003200000D4C01A00282801008400F000CC10037B
+:100330000098801B0004380C008400F000CC1003EF
+:100340000098801700043808008400F000CC1003E7
+:100350000098801300043804008400F000CC1003DF
+:100360000098801400CC104C009A800900CC144DE9
+:10037000009840DC00D4006D00CC184800D5001A6D
+:1003800000D5401A008000C900D5801A0096C0D55B
+:1003900000D4006D008001B800D4006E009AC00344
+:1003A00000D4006D00D4006E0080000000EC007FDF
+:1003B000009AC0CC00D4006D008001B800D4006E5B
+:1003C00000CC140300CC180300CC1C03007D910367
+:1003D000007DD583007D190C0035CC1F0035701FC2
+:1003E000007CF0CB007CD08B00880000007E8E8BE0
+:1003F0000095C00400D4006E008001B800D4001A3B
+:1004000000D4C01A00CC080300CC0C0300CC1003AD
+:1004100000CC140300CC180300CC1C0300CC240334
+:1004200000CC28030035C41F0036B01F007C704B81
+:100430000034F01F007C704B0035701F007C704B47
+:10044000007D8881007DCCC1007E5101007E9541F8
+:10045000007C9082007CD4C2007C848B009AC00314
+:10046000007C8C8B002C88010098809E00D4006D4D
+:100470000098409C00D4006E00CC084C00CC0C4D81
+:1004800000CC104800D4801A00D4C01A00800101AA
+:1004900000D5001A00CC083200D40032009482D972
+:1004A00000CA0C0000D4401E0080000000D4001ED2
+:1004B00000E4011E00D4001E00CA080000CA0C009F
+:1004C00000CA100000D4401E00CA140000D4801ED0
+:1004D00000D4C01E00D5001E00D5401E00D54034FB
+:1004E0000080000000EE001E0028040400E2001A54
+:1004F00000E2001A00D4401A00CA380000CC0803F9
+:1005000000CC0C0300CC0C0300CC0C03009882BD83
+:1005100000000000008401BB00D7A06F0080000035
+:1005200000EE001F00CA040000C2FF0000CC083427
+:1005300000C13FFF007C74CB007CC90B007D010F24
+:10054000009902B0007C738B008401BB00D7A06FC0
+:100550000080000000EE001F00CA080000281900FB
+:10056000007D898B009580140028140400CA0C00BB
+:1005700000CA100000CA1C0000CA240000E2001FCC
+:1005800000D4C01A00D5001A00D5401A00CC1803B8
+:1005900000CC2C0300CC2C0300CC2C03007DA58BBD
+:1005A000007D9C4700984297000000000080016198
+:1005B00000D4C01A00D4401E00D4801E0080000069
+:1005C00000EE001E00E4011E00D4001E00D4401EF8
+:1005D00000EE001E00CA040000A00000007E828B16
+:1005E00000E4013E00D4001E00D4401E00EE001EB8
+:1005F00000CA040000A00000007E828B00CA080030
+:1006000000248C06000CCC060098C00600CC104ECE
+:100610000099000400D4007300E4011E00D4001E01
+:1006200000D4401E00D4801E0080000000EE001E9A
+:1006300000CA080000CA0C000034D01800251001C0
+:100640000095002100C17FFF00CA100000CA1400FD
+:1006500000CA180000D4801D00D4C01D007DB18BDD
+:1006600000C1420200C2C00100D5801D0034DC0E72
+:10067000007D5D4C007F734C00D7401E00D5001EEE
+:1006800000D5401E00C1420000C2C00000099C010C
+:100690000031DC10007F5F4C007F734C00042802A7
+:1006A000007D838000D5A86F00D5806600D7401EEE
+:1006B00000EC005E00C8240200C82402008001B8DB
+:1006C00000D6007600D4401E00D4801E00D4C01E88
+:1006D0000080000000EE001E0080000000EE001F01
+:1006E00000D4001F0080000000D4001F00D4001FB1
+:1006F0000088000000D4001F00000000000000007F
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:1008000000010171000201780003008F0004007FE5
+:10081000000500030006003F000700320008012C1D
+:1008200000090046000A0036001001B6001700A2B9
+:100830000022013A00230149002000B400240125D0
+:100840000027004D0028006A002A0060002B00529B
+:10085000002F0065003200870034017F003C015604
+:10086000003F00720041018C0044012E00550173CD
+:100870000056017A0060000B00610034006200380D
+:1008800000630038006400380065003800660038F6
+:10089000006700380068003A00690041006A0048BB
+:1008A000006B0048006C0048006D0048006E004876
+:1008B000006F00480000000600000006000000066F
+:1008C0000000000600000006000000060000000610
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV670_me.bin.ihex b/firmware/radeon/RV670_me.bin.ihex
new file mode 100644 (file)
index 0000000..9fbfc0e
--- /dev/null
@@ -0,0 +1,1345 @@
+:1000000000000000C020040000000000000000000C
+:1000100000A0000A000000000000FFFF00284621A9
+:100020000000000000000000D900480000000000AF
+:1000300000000000C02004000000000000000000DC
+:1000400000A0000A000000000000000000E0000026
+:100050000000000000010000C02946200000000050
+:1000600000000000D900480000000000000000006F
+:10007000C0200400000000000000000000A0000AF2
+:10008000000000008100000000204411000000007A
+:1000900000000001002048110000000000042004BE
+:1000A000006044110000067C0000000000600000B9
+:1000B0000000062400000000006000000000063878
+:1000C00000000000C02008000000000000000F0039
+:1000D000002816220000000000000008002116255C
+:1000E000000000000000001800203625000000007D
+:1000F0008D000000002044110000000000000004FA
+:10010000002F022500000000000000000CE00000AD
+:1001100000000018004120000040481100000019B4
+:100120000042200000204811000000008E00000066
+:1001300000204411000000000000002800204A2D8B
+:1001400000000000900000000020441100000000AA
+:100150000000000000204805000000000000000C26
+:1001600000211622000000000000000300281625D0
+:10017000000000000000001900211A220000000009
+:100180000000000400281A26000000000000000003
+:10019000002914C5000000000000001900203625C9
+:1001A0000000000000000000003A140200000000FF
+:1001B00000000016002116250000000000000003CA
+:1001C00000281625000000000000001700200E2D5A
+:1001D00000000000FFFFFFFC00280E2300000000CD
+:1001E00000000000002914A3000000000000001718
+:1001F00000203625000000000000800000280E22AC
+:10020000000000000000000700220E230000000094
+:10021000000000000029386E0000000020000000EF
+:1002200000280E22000000000000000600210E231E
+:1002300000000000000000000029386E00000000EF
+:100240000000000000220222000000000000000068
+:1002500014E0000000000038000000002EE0000064
+:1002600000000035000000002CE000000000003716
+:100270000000000000400E2D0000003900000008C2
+:1002800000200E2D00000000000000090040122D8B
+:10029000000000460000000100400E2D0000003963
+:1002A00000000000C0200C0000000000003FFFFC28
+:1002B0000028122300000000000000020022122487
+:1002C000000000000000001F00211E2300000000AD
+:1002D0000000000014E000000000003E00000008E4
+:1002E00000401C11000000410000000D00201E2DE8
+:1002F000000000000000000F00281E270000000082
+:100300000000000300221E27000000007FC0000044
+:1003100000281A23000000000000001400211A2603
+:10032000000000000000000100331A260000000059
+:100330000000000800221A26000000000000000053
+:1003400000290CC700000000000000270020362410
+:100350000000000000007F000028122100000000C3
+:1003600000001400002F0224000000000000000024
+:100370000CE000000000004B0000000100290E23EB
+:10038000000000000000000E0020362300000000E6
+:100390000000E0000020441100000000FFF8000011
+:1003A00000294A230000000000000000003A2C024F
+:1003B000000000000000000200220E2B00000000E0
+:1003C000FC00000000280E23000000000000000FC9
+:1003D000002036230000000000001FFF00294A23F0
+:1003E000000000000000002700204A2D000000004F
+:1003F000000000000020481100000000000000295B
+:1004000000200E2D00000000060A020000294A23E9
+:100410000000000000000000002048110000000063
+:100420000000000000204811000000000000000152
+:1004300000210222000000000000000014E0000083
+:1004400000000061000000002EE000000000005FDE
+:10045000000000002CE000000000005E0000000032
+:1004600000400E2D000000620000000100400E2D33
+:10047000000000620000000A00200E2D00000000B5
+:100480000000000B0040122D0000006A0000000078
+:10049000C0200C0000000000003FFFFC00281223D9
+:1004A00000000000000000020022122400000000F2
+:1004B0007FC0000000281623000000000000001488
+:1004C0000021162500000000000000010033162561
+:1004D000000000008000000000280E230000000043
+:1004E0000000000000290CA3000000003FFFFC00FA
+:1004F00000290E23000000000000001F00211E2321
+:10050000000000000000000014E000000000006D8A
+:100510000000010000401C11000000700000000DF0
+:1005200000201E2D00000000000000F000281E2703
+:10053000000000000000000400221E270000000050
+:100540008100000000204411000000000000000DA8
+:100550000020481100000000FFFFF0FF00281A30C3
+:10056000000000000000A02800204411000000004E
+:1005700000000000002948E6000000000000A0186C
+:1005800000204411000000003FFFFFFF00284A2325
+:10059000000000000000A010002044110000000036
+:1005A00000000000002048040000000000000030AF
+:1005B0000020162D00000000000000020029162572
+:1005C0000000000000000030002036250000000080
+:1005D000000000250020162D000000000000000093
+:1005E000002F00A300000000000000000CC000006D
+:1005F00000000083000000260020162D00000000EF
+:1006000000000000002F00A4000000000000000017
+:100610000CC000000000008400000000004000004A
+:100620000000008A000000250020362300000000A2
+:100630000000002600203624000000000000001703
+:1006400000201E2D000000000000000200210227F3
+:10065000000000000000000014E000000000008A1C
+:1006600000000000006000000000065900000000CB
+:10067000006000000000064D0000000200210E2274
+:10068000000000000000000014C000000000008D09
+:1006900000000012C040362000000093000000005F
+:1006A0002EE0000000000091000000002CE000009F
+:1006B000000000900000000200400E2D000000929B
+:1006C0000000000300400E2D000000920000000C0E
+:1006D00000200E2D00000000000000120020362334
+:1006E000000000000000000300210E2200000000B6
+:1006F0000000000014C00000000000980000A00CE2
+:10070000002044110000000000000000C02048004C
+:100710000000000000000000C0404800000000A0F1
+:100720000000A00C002044110000000000000000A8
+:100730000020481100000000000000002EE0000032
+:100740000000009E000000002CE000000000009D62
+:100750000000000200400E2D0000009F000000037A
+:1007600000400E2D0000009F0000000C00200E2D08
+:10077000000000000000000000204803000000000E
+:1007800000000000003A0C0200000000003F0000E2
+:1007900000280E23000000000000001000210E239E
+:1007A00000000000000000110020362300000000BF
+:1007B0000000001E0021022B0000000000000000CD
+:1007C00014C00000000000A700000016C020362062
+:1007D000000000000000001F0021022B00000000AC
+:1007E0000000000014C00000000000AA0000001576
+:1007F000C0203620000000000000000800210E2B61
+:10080000000000000000007F00280E230000000010
+:1008100000000000002F0223000000000000000084
+:100820000CE00000000000E10000000027000000D4
+:10083000000000000000000000600000000002A3B3
+:1008400000000001002F0223000000000000000053
+:100850000AE00000000000B300000000006000009B
+:100860000000013A81000000002044110000000057
+:100870000000000600204811000000000000000CED
+:1008800000221E300000000099800000002044116A
+:1008900000000000000000040020122D00000000F5
+:1008A00000000008002212240000000000000010D8
+:1008B00000201811000000000000000000291CE4C6
+:1008C0000000000000000000006048070000012F49
+:1008D0009B00000000204411000000000000000008
+:1008E00000204802000000009C000000002044118D
+:1008F00000000000000000000033146F0000000042
+:100900000000000100333E23000000000000000052
+:10091000D9004800000000000000000000203C0555
+:1009200000000000810000000020441100000000D1
+:100930000000000E00204811000000000000000030
+:1009400000201010000000000000E007002044110B
+:10095000000000000000000F0021022B000000003A
+:100960000000000014C00000000000CB00F8FF08E9
+:1009700000204811000000009800000000404811CD
+:10098000000000DC000000F000280E220000000043
+:10099000000000A0002F0223000000000000000063
+:1009A0000CC00000000000DA0000001100200E2D35
+:1009B0000000000000000001002F022300000000E2
+:1009C000000000000CE00000000000D50000000264
+:1009D000002F022300000000000000000CE00000D7
+:1009E000000000D400003F0000400C11000000D6C1
+:1009F00000001F0000400C11000000D600000F0096
+:100A000000200C11000000000038000900294A23D2
+:100A1000000000003F00000000280E2B0000000036
+:100A20000000000200220E2300000000000000076A
+:100A300000494A23000000DC00380F09002048115B
+:100A400000000000680000070020481100000000BE
+:100A50000000000800214A270000000000000000FC
+:100A60000020481100000000060A020000294A2464
+:100A700000000000000000000020481100000000FD
+:100A80000000000000204811000000000000A20249
+:100A9000002044110000000000FF000000280E228A
+:100AA000000000000000008000294A230000000030
+:100AB0000000002700200E2D00000000000000268E
+:100AC0000020122D0000000000000000002F008315
+:100AD00000000000000000000CE00000000000EA40
+:100AE000000000000060000000000653000000004D
+:100AF00000400000000000EB00000000006000006B
+:100B000000000656000000070020222D0000000013
+:100B10000000000500220E2200000000001000006E
+:100B200000280E23000000000000000000292068BB
+:100B30000000000000000000003A0C02000000006D
+:100B4000000000EF00280E2300000000000000005D
+:100B500000292068000000000000001700200E2D72
+:100B6000000000000000000300210223000000003C
+:100B70000000000014E00000000000F80000000B7E
+:100B800000210228000000000000000014C0000046
+:100B9000000000F8000004000029222800000000E6
+:100BA0000000001400203628000000000000001C97
+:100BB00000210E22000000000000000014C0000010
+:100BC000000000FD0000A30C002044110000000004
+:100BD0000000000000204811000000000000001E7E
+:100BE00000210E22000000000000000014C00000E0
+:100BF0000000010B0000A30F0020441100000000C2
+:100C00000000001100200E2D000000000000000177
+:100C1000002F022300000000000000000CC00000B4
+:100C200000000104FFFFFFFF004048110000010B1E
+:100C300000000002002F022300000000000000005E
+:100C40000CC00000000001070000FFFF0040481139
+:100C50000000010B00000004002F02230000000030
+:100C6000000000000CC000000000010A000000FFAE
+:100C7000004048110000010B000000010020481155
+:100C8000000000000002C400002044110000000029
+:100C90000000001F00210E220000000000000000E4
+:100CA00014C00000000001120000001040210E20BE
+:100CB00000000000000000130020362300000000A8
+:100CC0000000001840224A20000000000000001030
+:100CD000C0424A20000001140000000000200C1156
+:100CE0000000000000000013002036230000000078
+:100CF000000000000020481100000000000000007B
+:100D000000204811000000000000000A002010111F
+:100D10000000000000000000002F0224000000007E
+:100D2000000000000CE000000000011B00000000BB
+:100D300000204811000000000000000100531224B0
+:100D400000000117FFBFFFFF00283A2E000000003F
+:100D50000000001B00210222000000000000000033
+:100D600014C000000000012E81000000002044118A
+:100D7000000000000000000D0020481100000000ED
+:100D80000000001800220E3000000000FC000000EF
+:100D900000280E2300000000810000000020441104
+:100DA000000000000000000E0020481100000000BC
+:100DB0000000000000201010000000000000E00E05
+:100DC000002044110000000007F8FF08002048112F
+:100DD000000000000000000000294A23000000007D
+:100DE0000000001C00201E2D000000000000000874
+:100DF00000214A27000000000000000000204811E8
+:100E000000000000060A020000294A240000000039
+:100E10000000000000204811000000000000000059
+:100E200000204811000000000000000000800000C9
+:100E300000000000810000000020441100000000BC
+:100E40000000000100204811000000000000217C8B
+:100E50000020441100000000008000000020481124
+:100E60000000000000000000002048060000000014
+:100E70000000000800214A270000000000000000D8
+:100E800017000000000000000004217F00604411F2
+:100E90000000067C0000001F00210230000000005E
+:100EA0000000000014C000000000067B00000004E9
+:100EB00000404C1100000135810000000020441169
+:100EC00000000000000000010020481100000000A8
+:100ED000000021F800204411000000000000001C68
+:100EE0000020481100000000000421F900604411B6
+:100EF0000000067C0000001100210230000000000C
+:100F00000000000014E000000000013C00000000B0
+:100F100000800000000000000000000000600000F1
+:100F20000000000B00000000006004110000031529
+:100F3000000000000020041100000000000000007C
+:100F400000600811000001B2000000000060000015
+:100F5000000001600000FFFF40280E20000000009C
+:100F600000000010C0211220000000000000FFFF60
+:100F7000402806200000000000000010C0210A20C8
+:100F800000000000000000000034146100000000B8
+:100F90000000000000741882000002BB0001A1FDE7
+:100FA00000604411000002E000003FFF002F022F0C
+:100FB00000000000000000000CC00000000001471D
+:100FC00000000000C040040000000001000000001C
+:100FD000006000000000000B000000000060041131
+:100FE00000000315000000000020041100000000B4
+:100FF0000000000000600811000001B200003FFF87
+:10100000002F022F00000000000000000CE0000094
+:10101000000000000000000000600000000001600F
+:101020000000001040210E20000000000000FFFF23
+:10103000C0281220000000000000001040211620EF
+:10104000000000000000FFFFC0681A20000002BB83
+:101050000001A1FD00604411000002E000003FFF1C
+:10106000002F022F00000000000000000CC0000054
+:101070000000015800000000C04004000000000112
+:101080000000225C0020441100000000000000016C
+:1010900000300A2F000000000000000100210A2299
+:1010A000000000000000000300384A220000000099
+:1010B0000000225600204411000000000000001A29
+:1010C00000204811000000000000A1FC0020441195
+:1010D0000000000000000001008048110000000036
+:1010E00000000000006000000000000B0000000095
+:1010F000006000000000018F0000000000600000A0
+:10110000000001A000003FFF002F022F00000000A0
+:10111000000000000CE000000000000000000000E3
+:1011200000202C0800000000000000000020241116
+:101130000000000000000000002028110000000056
+:10114000000022560020441100000000000000169C
+:1011500000204811000000000000225C0020441123
+:101160000000000000000003002048110000000003
+:1011700093800000002044110000000000000002E5
+:1011800000221E290000000000000000007048EB53
+:101190000000019C0000000000600000000002BB95
+:1011A00000000001403306200000000000000000A5
+:1011B000C03024090000000000003FFF002F022F74
+:1011C00000000000000000000CE000000000000033
+:1011D0000000000000600000000002A3000000000A
+:1011E000002F022100000000000000000AE00000C3
+:1011F0000000018100000000006000000000013AD2
+:101200000000000000400000000001869500000082
+:10121000002044110000000000000000002F022107
+:1012200000000000000000000CE00000000001864B
+:1012300000000000C0204800000000000000000185
+:10124000005306210000018292000000002044119A
+:101250000000000000000000C0604800000001978E
+:101260000001A1FD00204411000000000000001159
+:101270000020062D00000000000000000078042A75
+:10128000000002FB00000000002028090000000010
+:1012900000003FFF002F022F0000000000000000B0
+:1012A0000CC000000000017400000000C0400400F9
+:1012B000000000010000021000600411000003158E
+:1012C00000003FFF002F022F000000000000000080
+:1012D0000CE000000000019400000015C020362042
+:1012E0000000000000000016C020362000000000B2
+:1012F0003F800000002004110000000046000000B4
+:1013000000600811000001B2000000000080000031
+:10131000000000000000A1FC0020441100000000BB
+:1013200000003FFF002F022F00000000000000001F
+:101330000CC000000000019B00000001008048116B
+:1013400000000000000000210080481100000000A3
+:101350000000FFFF40280E200000000000000010E9
+:10136000C0211220000000000000FFFF40281620CE
+:101370000000000000000010C0811A2000000000E2
+:101380008100000000204411000000000000000661
+:1013900000204811000000000000000800221E305C
+:1013A000000000000000002900201A2D00000000AD
+:1013B0000000E0000020441100000000FFFBFF09D6
+:1013C00000204811000000000000000F0020222D26
+:1013D0000000000000001FFF00294A280000000054
+:1013E000000000060020222D000000000000000088
+:1013F000002920E80000000000000000002048084C
+:101400000000000000000000002048110000000063
+:10141000060A020000294A26000000000000000021
+:1014200000204811000000000000000000204811CA
+:101430000000000000000100002018110000000062
+:101440000000000800621E280000012F00000008B4
+:1014500000822228000000000002C0000020441189
+:10146000000000000000001500600E2D000001BD0E
+:101470000000001600600E2D000001BD0000C00835
+:1014800000204411000000000000001700200E2D75
+:10149000000000000000000014C00000000001B9BE
+:1014A0000000000000200411000000000000000007
+:1014B0000020480100000000390000000020481111
+:1014C00000000000000000000020481100000000A3
+:1014D000000000000080480200000000000000182A
+:1014E00000202E2D0000000000000000003B0D63D6
+:1014F000000000000000000800224A230000000055
+:101500000000001000224A23000000000000001824
+:1015100000224A2300000000000000000080480371
+:101520000000000000000000006000000000000B50
+:10153000000010000060041100000315000000000E
+:1015400000200411000000000000000000600811ED
+:10155000000001B2000000070021062F000000007B
+:101560000000001300200A2D000000000000000110
+:1015700000202C11000000000000FFFF4028222066
+:10158000000000000000000F0026222800000000DC
+:101590000000001040212620000000000000000F85
+:1015A000002626290000000000000000002028027C
+:1015B000000000000000225600204411000000003E
+:1015C0000000001B00204811000000000000000087
+:1015D000002F022100000000000000000CE00000CD
+:1015E000000001E00000225C002044110000000027
+:1015F0000000008100204811000000000000A1FC54
+:1016000000204411000000000000000100204811EB
+:10161000000000000000008000201C1100000000FD
+:1016200000000000002F0227000000000000000062
+:101630000CE00000000001DC000000000060000081
+:10164000000001E90000000100531E27000001D83E
+:101650000000000100202C11000000000000001F0D
+:1016600000280A22000000000000001F00282A2A8B
+:10167000000000000000000100530621000001D11D
+:101680000000225C00204411000000000000000265
+:1016900000304A2F000000000000A1FC002044118F
+:1016A00000000000000000010020481100000000C0
+:1016B0000000000100301E2F0000000000000000AC
+:1016C000002F022700000000000000000CE00000D6
+:1016D000000000000000000000600000000001E9C0
+:1016E0000000000100531E27000001E50000FFFF7D
+:1016F00040280E20000000000000000F00260E23EE
+:101700000000000000000010C021122000000000B6
+:101710000000000F0026122400000000000000005E
+:1017200000201411000000000000000000601811EB
+:10173000000002BB0001A1FD0020441100000000D8
+:1017400000000000002F022B00000000000000003D
+:101750000CE00000000001F8000000100022162834
+:1017600000000000FFFF0000002816250000000018
+:101770000000FFFF00281A29000000000000000000
+:10178000002948C500000000000000000020480AB1
+:10179000000000000000000000202C1100000000EC
+:1017A000000000100022162300000000FFFF0000D0
+:1017B00000281625000000000000FFFF00281A2462
+:1017C0000000000000000000002948C500000000E3
+:1017D0000000000000731503000002050000000077
+:1017E0000020180500000000000000000073152410
+:1017F0000000020500000000002D14C500000000DC
+:1018000000000000003008A20000000000000000FE
+:101810000020480200000000000000000020280214
+:101820000000000000000000002020030000000075
+:101830000000000000802404000000000000000FF1
+:1018400000210225000000000000000014C000007C
+:101850000000067B00000000002B140500000000C3
+:1018600000000001009016250000000000000000AC
+:10187000006000000000000B000000000060041188
+:10188000000003150000000000200411000000000B
+:101890000000000000600811000001B200002256A4
+:1018A00000204411000000000000001A00294A2214
+:1018B0000000000000000000C02000000000000048
+:1018C00000003FFF002F022F00000000000000007A
+:1018D0000CE000000000000000000000C020040038
+:1018E000000000000000225C002044110000000005
+:1018F0000000000300384A21000000000000A1FCA5
+:1019000000204411000000000000000100204811E8
+:10191000000000000000FFFF40281220000000002F
+:1019200000000010C0211A20000000000000FFFF8E
+:1019300040280E200000000000000010C0211620EA
+:10194000000000000000000000741465000002BBED
+:101950000001A1FD00604411000002E00000000150
+:10196000003306210000000000000000002F0221CB
+:1019700000000000000000000CC000000000021980
+:1019800000003FFF002F022F0000000000000000B9
+:101990000CC000000000021200000000C040040063
+:1019A0000000000100000000006000000000063898
+:1019B000000000000040040F0000021300000000BF
+:1019C000006000000000062400000000006000002D
+:1019D000000006380000021000600411000003152A
+:1019E0000000000000600000000001A000000000F6
+:1019F000006000000000019C00000000006000008A
+:101A0000000002BB0000000000600000000002A314
+:101A1000938000000020441100000000000000003E
+:101A2000002048080000000000000000002F022FE6
+:101A300000000000000000000AE000000000023288
+:101A400000000000006000000000013A00000000FB
+:101A50000040000000000236950000000020441104
+:101A60000000000000000000002F022F0000000016
+:101A7000000000000CE00000000002360000000042
+:101A8000C0404800000002339200000000204411D2
+:101A90000000000000000000C0204800000000001E
+:101AA0000000225600204411000000000000001633
+:101AB00000204811000000000000225C00204411BA
+:101AC000000000000000000300204811000000009A
+:101AD0000000A1FC002044110000000000000001F3
+:101AE00000204811000000000001A1FD0020441169
+:101AF000000000000000000000600411000002FB74
+:101B000000000000C04004000000000100000000D0
+:101B100000600000000006240000A00C002044111A
+:101B20000000000000000000C0204800000000008D
+:101B300000000000C040480000000000000000005D
+:101B4000006000000000000B0000001840210A2087
+:101B50000000000000000003002F0222000000002F
+:101B6000000000000AE000000000024C0000001429
+:101B70000020222D00000000000801010029222879
+:101B800000000000000000140020362800000000C3
+:101B90000000A30C00204411000000000000000021
+:101BA000C02048000000000000000000C0204800E5
+:101BB0000000000000000000C0404800000002518A
+:101BC00000000000006000000000000B000000109A
+:101BD00000600411000003153F8000000020041184
+:101BE000000000000000000000600811000001B2C9
+:101BF0000000225C002044110000000000000003EF
+:101C000000204811000000000000000000600000FB
+:101C10000000027C0000001700201E2D00000000C4
+:101C20000000000100211E2700000000000000004D
+:101C300014E000000000026A0000001200201E2DC7
+:101C4000000000000000FFFF00281E270000000029
+:101C50000000000000341C2700000000000000000D
+:101C600012C000000000025F0000000000201C11F4
+:101C70000000000000000000002F00E50000000050
+:101C80000000000008C00000000002620000000028
+:101C900000201407000000000000001200201E2D8C
+:101CA000000000000000001000211E2700000000BE
+:101CB0000000000000341C4700000000000000008D
+:101CC00012C00000000002670000000000201C118C
+:101CD0000000000000000000002F00E600000000EF
+:101CE0000000000008C000000000026A00000000C0
+:101CF0000020180700000000000000000060000045
+:101D0000000002C100002256002044110000000023
+:101D1000000000000034202300000000000000004C
+:101D200012C00000000002720000000000342044D5
+:101D3000000000000000000012C00000000002715E
+:101D40000000001600404811000002760000001854
+:101D500000404811000002760000000000342044DA
+:101D6000000000000000000012C00000000002752A
+:101D70000000001700404811000002760000001922
+:101D800000204811000000000000A1FC00204411C8
+:101D900000000000000000010020481100000000C9
+:101DA0000001A1FD00604411000002E900003FFFB6
+:101DB000002F022F00000000000000000CC00000F7
+:101DC0000000025600000000C040040000000001B6
+:101DD0000000001040210620000000000000FFFF6E
+:101DE000C0280A20000000000000001040210E2042
+:101DF000000000000000FFFFC028122000000000CB
+:101E00000000001040211620000000000000FFFF2D
+:101E1000C0881A200000000081000000002044114A
+:101E20000000000000000001002048110000000038
+:101E300000042004006044110000067C0000000043
+:101E4000006000000000062400000000C0600000E8
+:101E5000000002A30000000500200A2D0000000081
+:101E60000000000800220A22000000000000002BF1
+:101E700000201A2D000000000000001C00201E2D74
+:101E8000000000000000700000281E270000000075
+:101E90000000000000311CE6000000000000002AE5
+:101EA00000201A2D000000000000000C00221A265D
+:101EB0000000000000000000002F00E6000000000D
+:101EC0000000000006E00000000002920000000098
+:101ED00000201C11000000000000000000200C1178
+:101EE000000000000000002B00203623000000004E
+:101EF0000000001000201811000000000000000089
+:101F000000691CE20000012F9380000000204411B2
+:101F10000000000000000000002048070000000052
+:101F200095000000002044110000000000000000A7
+:101F3000002F022F00000000000000000CE0000055
+:101F40000000029D0000000100333E2F0000000051
+:101F500000000000D90048000000000092000000CE
+:101F6000002044110000000000000000C0204800D4
+:101F7000000000000000001C0040362700000000A8
+:101F80000000000CC0220A20000000000000002910
+:101F9000002036220000000000000028C04036204B
+:101FA000000000000000A2A4002044110000000076
+:101FB000000000090020481100000000A1000000FE
+:101FC00000204411000000000000000100804811C2
+:101FD000000000000000002100201E2D0000000075
+:101FE00000000000002C1CE30000000000000021A5
+:101FF00000203627000000000000002200201E2DD7
+:102000000000000000000000002C1CE400000000A4
+:1020100000000022002036270000000000000023FE
+:1020200000201E2D0000000000000000003120A351
+:102030000000000000000000002D1D07000000004F
+:1020400000000023002036270000000000000024CC
+:1020500000201E2D0000000000000000003120C400
+:102060000000000000000000002D1D07000000001F
+:10207000000000240080362700000000000000213E
+:10208000002036230000000000000022002036243B
+:10209000000000000000000000311CA30000000050
+:1020A0000000002300203627000000000000000090
+:1020B00000311CC40000000000000024008036270E
+:1020C000000000000000001A002036270000000079
+:1020D0000000001B00203628000000000000001750
+:1020E00000201E2D00000000000000020021022739
+:1020F000000000000000000014C00000000002DC2E
+:102100000000000000400000000002D90000001A9A
+:1021100000203627000000000000001B00203628A9
+:10212000000000000000001700201E2D000000002D
+:102130000000000200210227000000000000000053
+:1021400014E00000000002D9000000030021022773
+:10215000000000000000000014E00000000002DCAD
+:102160000000002300201E2D0000000000000000E1
+:10217000002E00E1000000000000000002C000008E
+:10218000000002DC0000002100201E2D00000000E5
+:1021900000000000003120A100000000000000004D
+:1021A000002E00E8000000000000000006C0000053
+:1021B000000002DC0000002400201E2D00000000B2
+:1021C00000000000002E00E20000000000000000FF
+:1021D00002C00000000002DC0000002200201E2DD2
+:1021E0000000000000000000003120C200000000DC
+:1021F00000000000002E00E80000000000000000C9
+:1022000006C00000000002DC0000000000600000CA
+:10221000000006590000000000600000000002B548
+:102220000000000000400000000002DE000000008E
+:1022300000600000000002B5000000000060000027
+:10224000000006500000000000400000000002DE18
+:102250000000000000600000000002A70000000075
+:1022600000400000000002DE0000001A00201E2DC9
+:10227000000000000000001B0080222D0000000074
+:102280000000001000221E230000000000000000DB
+:1022900000294887000000000000000000311CA356
+:1022A000000000000000001000221E2700000000B7
+:1022B0000000000000294887000000000000001016
+:1022C00000221E230000000000000000003120C496
+:1022D000000000000000FFFF00282228000000008E
+:1022E0000000000000894907000000000000001005
+:1022F00000221E2300000000000000000029488783
+:10230000000000000000001000221E21000000005C
+:102310000000000000294847000000000000000005
+:1023200000311CA3000000000000001000221E2746
+:1023300000000000000000000029488700000000A5
+:102340000000000000311CA100000000000000108F
+:1023500000221E270000000000000000002948475E
+:10236000000000000000001000221E2300000000FA
+:1023700000000000003120C4000000000000FFFF4A
+:102380000028222800000000000000000029490762
+:10239000000000000000001000221E2100000000CC
+:1023A00000000000003120C2000000000000FFFF1C
+:1023B00000282228000000000000000000894907D2
+:1023C000000000000000001000221E23000000009A
+:1023D0000000000000294887000000000000000104
+:1023E00000220A210000000000000000003308A2C3
+:1023F000000000000000001000221E22000000006B
+:102400000000001000212222000000000000000057
+:1024100000294907000000000000000000311CA353
+:10242000000000000000001000221E270000000035
+:1024300000000000002948870000000000000001A3
+:1024400000220A210000000000000000003008A265
+:10245000000000000000001000221E22000000000A
+:1024600000000010002122220000000000000000F7
+:1024700000294907000000000000001000221E2370
+:102480000000000000000000003120C40000000037
+:102490000000FFFF002822280000000000000000CC
+:1024A000002949070000000000000000003808C5AE
+:1024B00000000000000000000030084100000000A3
+:1024C0000000000100220A220000000000000000BD
+:1024D000003308A2000000000000001000221E22AD
+:1024E0000000000000000010002122220000000077
+:1024F00000000000008949070000000000000017EC
+:102500000020222D000000000000000014C0000088
+:1025100000000318FFFFFFEF002806210000000065
+:10252000000000140020222D000000000000F8E050
+:1025300000204411000000000000000000294901B3
+:1025400000000000000000000089490100000000B8
+:102550000000000000204811000000000000000002
+:102560000020481100000000060A02000080481107
+:102570000000000000000000C0200000000000007B
+:1025800097000000C020441100000000000000007F
+:10259000C0204811000000008A0000000020441103
+:1025A00000000000000000000020481100000000B2
+:1025B0000000225C00204411000000000000000028
+:1025C000C0204800000000000000A1FC00204411D1
+:1025D0000000000000000000C020480000000000D3
+:1025E00000000000C0200400000000000000000007
+:1025F00000A0000A00000000970000000020441125
+:102600000000000000000000002048110000000051
+:102610008A000000002044110000000000000000BB
+:1026200000204811000000000000225C002044113E
+:102630000000000000000000C02048000000000072
+:102640000000A1FC00204411000000000000000078
+:10265000C02048000000000000000000C02004006E
+:10266000000000000000000000A0000A00000000C0
+:10267000970000000020441100000000000000004E
+:1026800000204811000000008A00000000204411D2
+:1026900000000000000000000020481100000000C1
+:1026A0000000225C00204411000000000000000037
+:1026B000C0204800000000000000A1FC00204411E0
+:1026C0000000000000000000C020480000000000E2
+:1026D0000001A1FD002044110000000000000000E6
+:1026E000D90048000000000000000000C0200400E5
+:1026F000000000000000000000A0000A0000000030
+:1027000000002257002044110000000000000003D8
+:10271000C0484A20000000000000225D0020441153
+:102720000000000000000000C04048000000000061
+:1027300000000000006000000000063800000000FB
+:10274000C0200800000000000000225C00204411AE
+:10275000000000000000000300384A2200000000D2
+:102760000000A1FC00204411000000000000000057
+:10277000C0204800000000000001A1FD002044111D
+:102780000000000000000000002F022200000000F6
+:10279000000000000CE0000000000000000000004D
+:1027A00040204800000000000000000140304A20A6
+:1027B0000000000000000002C0304A2000000000BD
+:1027C0000000000100530A220000034B0000003FFC
+:1027D000C0280A20000000008100000000204411F1
+:1027E000000000000000000100204811000000006F
+:1027F000000021F800204411000000000000001833
+:102800000020481100000000000421F9006044117C
+:102810000000067C000000110021023000000000D2
+:102820000000000014E00000000003540000001449
+:10283000002F022200000000000000000CC0000079
+:10284000000003620001A2A4002044110000000067
+:1028500000000000006048020000036A0000210040
+:10286000002044110000000000000000C0204800CB
+:102870000000000000000000C02048000000000030
+:1028800000000000C0204800000000000000000020
+:10289000C04048000000000000000004002F022299
+:1028A00000000000000000000CC0000000000366F3
+:1028B0000001A2A40020441100000000000000005C
+:1028C000004048020000035D00000028002F0222A3
+:1028D00000000000000000000CC00000000005B374
+:1028E0000001A2A40020441100000000000000002C
+:1028F000004048020000035D0000002C0020362646
+:102900000000000000000049002018110000000035
+:102910000000003F002048110000000000000001FE
+:1029200000331A260000000000000000002F0226DD
+:1029300000000000000000000CC000000000036C5C
+:102940000000002C00801A2D000000000000003F55
+:10295000C0280A200000000000000015002F0222FD
+:1029600000000000000000000CE0000000000382F6
+:1029700000000006002F02220000000000000000FE
+:102980000CE00000000003AD00000016002F022242
+:1029900000000000000000000CE00000000003AF99
+:1029A00000000020002F02220000000000000000B4
+:1029B0000CE00000000003980000000F002F02222E
+:1029C00000000000000000000CE00000000003A474
+:1029D00000000010002F0222000000000000000094
+:1029E0000CE00000000003A40000001E002F0222E3
+:1029F00000000000000000000CE000000000038C5C
+:102A00000000A2A40020441100000000000000000B
+:102A100000404802000000000800000000290A22CF
+:102A2000000000000000000340210E200000000014
+:102A30000000000CC021122000000000000800006F
+:102A4000002812240000000000000014C0221620FC
+:102A50000000000000000000002914A40000000095
+:102A60000000A2A4002044110000000000000000AB
+:102A7000002948A2000000000000A1FE002044112F
+:102A800000000000000000000040480300000000BB
+:102A9000810000000020441100000000000000013F
+:102AA0000020481100000000000021F8002044111F
+:102AB0000000000000000016002048110000000087
+:102AC000000421F9006044110000067C000000159C
+:102AD00000210230000000000000000014E00000AF
+:102AE0000000038E0000210E0020441100000000B1
+:102AF00000000000C02048000000000000000000AE
+:102B0000C0204800000000000000A2A400204411E2
+:102B1000000000000000000000404802000000002B
+:102B200081000000002044110000000000000001AE
+:102B30000020481100000000000021F8002044118E
+:102B400000000000000000170020481100000000F5
+:102B5000000421F9006044110000067C000000031D
+:102B600000210230000000000000000014E000001E
+:102B70000000039A0000210800204411000000001A
+:102B800000000000C020480000000000000000001D
+:102B9000C0204800000000000000A2A40020441152
+:102BA000000000000000000000404802000000009B
+:102BB0000000A2A40020441100000000000000005A
+:102BC00000204802000000008000000000204411A6
+:102BD000000000000000000000204811000000007C
+:102BE00081000000002044110000000000000010DF
+:102BF000002048110000000000000000002000102C
+:102C0000000000000000000014C00000000003AA43
+:102C10000000000000400000000000000001A2A42D
+:102C20000020441100000000000000060040481190
+:102C3000000000000001A2A40020441100000000D8
+:102C400000000016006048110000036A0000000048
+:102C5000004000000000000000000000C02008004C
+:102C60000000000000000000C0200C000000000078
+:102C70000000001D002102230000000000000000F1
+:102C800014E00000000003C4810000000020441193
+:102C900000000000000000010020481100000000BA
+:102CA000000021F80020441100000000000000187E
+:102CB0000020481100000000000421F900604411C8
+:102CC0000000067C0000001100210230000000001E
+:102CD0000000000014E00000000003B80000210024
+:102CE0000020441100000000000000000020480205
+:102CF0000000000000000000002048030000000069
+:102D0000BABECAFE0020481100000000CAFEBABECA
+:102D100000204811000000000000A2A4002044117F
+:102D20000000000000000004004048110000000006
+:102D3000000021700020441100000000000000008D
+:102D400000204802000000000000000000204803AE
+:102D5000000000008100000000204411000000007D
+:102D60000000000A002048110000000000000000E0
+:102D700000200010000000000000000014C000004F
+:102D8000000003C98C000000002044110000000076
+:102D9000CAFEBABE004048110000000081000000D9
+:102DA0000020441100000000000000010020481134
+:102DB0000000000000003FFF40280A200000000043
+:102DC0008000000040280E200000000040000000AD
+:102DD000C028122000000000000400000069462204
+:102DE0000000067C0000000000201410000000001D
+:102DF00000000000002F022300000000000000007F
+:102E00000CC00000000003D700000000C040180004
+:102E1000000003DA00003FFFC0281A200000000075
+:102E200000040000006946260000067C0000000047
+:102E3000002018100000000000000000002F0224F5
+:102E400000000000000000000CC00000000003DDD6
+:102E500000000000C0401C00000003E000003FFF35
+:102E6000C0281E2000000000000400000069462762
+:102E70000000067C0000000000201C100000000084
+:102E800000000000002044020000000000000000DC
+:102E9000002820C50000000000000000004948E8AC
+:102EA00000000000A58000000020081100000000C4
+:102EB0000000200000200C11000000008300000032
+:102EC00000604411000004080000000000204402DB
+:102ED0000000000000000000C020480000000000CA
+:102EE0000000000040204800000000000000001F1B
+:102EF000C0210220000000000000000014C00000FB
+:102F0000000003ED0000201000204411000000002C
+:102F10000000800000204811000000000000FFFFBA
+:102F2000C0481220000003F5A7800000002008110F
+:102F3000000000000000A00000200C1100000000B4
+:102F4000830000000060441100000408000000003D
+:102F5000002044020000000000000000C0204800E3
+:102F60000000000000000000C02048000000000039
+:102F70000000FFFFC02812200000000083000000B6
+:102F800000204411000000000000000000304883D1
+:102F90000000000084000000002044110000000038
+:102FA00000000000C02048000000000000000000F9
+:102FB0001D000000000000008300000000604411BC
+:102FC0000000040800000000C040040000000001F0
+:102FD000A980000000200811000000000000C000CF
+:102FE00000400C11000003F0AB800000002008112D
+:102FF000000000000000F8E000400C11000003F0A9
+:10300000AD80000000200811000000000000F880E2
+:1030100000400C11000003F0B380000000200811F4
+:10302000000000000000F3FC00400C11000003F061
+:10303000AF80000000200811000000000000E00048
+:1030400000400C11000003F0B180000000200811C6
+:10305000000000000000F00000400C11000003F030
+:1030600083000000002044110000000000002148FF
+:1030700000204811000000008400000000204411DE
+:103080000000000000000000C02048000000000018
+:10309000000000001D000000000000000000000013
+:1030A000008000000000000001182000C030462011
+:1030B0000000000000000000D900480000000000EF
+:1030C00000000000C020040000000000000000001C
+:1030D00000A0000A000000000218A000C030462036
+:1030E0000000000000000000D900480000000000BF
+:1030F00000000000C02004000000000000000000EC
+:1031000000A0000A000000000318C000C0304620E4
+:103110000000000000000000D9004800000000008E
+:1031200000000000C02004000000000000000000BB
+:1031300000A0000A000000000418F8E0C03046209B
+:103140000000000000000000D9004800000000005E
+:1031500000000000C020040000000000000000008B
+:1031600000A0000A000000000518F880C0304620CA
+:103170000000000000000000D9004800000000002E
+:1031800000000000C020040000000000000000005B
+:1031900000A0000A000000000618E000C030462031
+:1031A0000000000000000000D900480000000000FE
+:1031B00000000000C020040000000000000000002B
+:1031C00000A0000A000000000718F000C0304620F0
+:1031D0000000000000000000D900480000000000CE
+:1031E00000000000C02004000000000000000000FB
+:1031F00000A0000A000000000818F3FCC0304620C0
+:103200000000000000000000D9004800000000009D
+:1032100000000000C02004000000000000000000CA
+:1032200000A0000A000000000000003000200A2D6D
+:103230000000000000000000C0290C400000000059
+:1032400000000030002036230000000000000000D5
+:10325000C0200400000000000000000000A0000AE0
+:103260000000000086000000002044110000000063
+:103270000000000000404801000000008500000040
+:10328000C020441100000000000000000040480180
+:10329000000000000000217C00204411000000001C
+:1032A00000000000C02048000000000000000000F6
+:1032B000C02048000000000000000000C0204800BE
+:1032C0000000000081000000002044110000000008
+:1032D0000000000100204811000000000000000074
+:1032E000C0200800000000000000000017000000DF
+:1032F000000000000004217F006044110000067CF3
+:103300000000001F0021023000000000000000004B
+:1033100014C00000000000000000000000404C024B
+:103320000000043E00000000C0200C00000000006F
+:1033300000000000C020100000000000000000009D
+:10334000C02014000000000000000000C020180091
+:103350000000000000000000C0201C000000000071
+:1033600000007F0000280A21000000000000450046
+:10337000002F022200000000000000000CE000000E
+:103380000000044C00000000C020200000000000ED
+:103390000000000017000000000000000000001006
+:1033A00000280A230000000000000010002F022265
+:1033B00000000000000000000CE0000000000454C9
+:1033C0008100000000204411000000000000000106
+:1033D000002048110000000000040000006946249D
+:1033E0000000067C000000000040000000000459BE
+:1033F00081000000002044110000000000000000D7
+:1034000000204811000000000000216D0020441140
+:103410000000000000000000002048040000000040
+:103420000000000000604805000006810000000068
+:10343000002824F0000000000000000700280A23F4
+:103440000000000000000001002F02220000000028
+:10345000000000000AE0000000000460000000001E
+:10346000002F00C9000000000000000004E0000080
+:103470000000047900000000004000000000048605
+:1034800000000002002F02220000000000000000E7
+:103490000AE000000000046500000000002F00C9E1
+:1034A000000000000000000002E0000000000479BD
+:1034B000000000000040000000000486000000033F
+:1034C000002F022200000000000000000AE00000BF
+:1034D0000000046A00000000002F00C90000000086
+:1034E000000000000CE00000000004790000000073
+:1034F000004000000000048600000004002F0222AB
+:1035000000000000000000000AE000000000046F5E
+:1035100000000000002F00C90000000000000000B3
+:103520000AE00000000004790000000000400000F4
+:103530000000048600000005002F022200000000A9
+:10354000000000000AE00000000004740000000019
+:10355000002F00C9000000000000000006E000008D
+:103560000000047900000000004000000000048614
+:1035700000000006002F02220000000000000000F2
+:103580000AE000000000047900000000002F00C9DC
+:10359000000000000000000008E0000000000479C6
+:1035A00000000000004000000000048600007F00D2
+:1035B00000280A210000000000004500002F022220
+:1035C00000000000000000000AE000000000000011
+:1035D0000000000800210A23000000000000000095
+:1035E00014C0000000000483000021690020441181
+:1035F0000000000000000000C020480000000000A3
+:1036000000000000C0204800000000000000000092
+:10361000C020480000000000CAFEBABE00404811A9
+:103620000000000000000000C02044000000000076
+:1036300000000000C02000000000000000000000AA
+:10364000C04048000000000000007F0000280A2160
+:103650000000000000004500002F022200000000D2
+:10366000000000000AE000000000048C00000000E0
+:10367000C02000000000000000000000C02000008A
+:103680000000000000000000C0400000000000003A
+:103690000000000000404C080000044C0000000046
+:1036A000C0200800000000000000001040210E2093
+:1036B0000000000000000011402112200000000066
+:1036C00000000012402116200000000000002169C7
+:1036D000002044110000000000000000002048020B
+:1036E0000000000000000000002102250000000092
+:1036F0000000000014E00000000004960004000038
+:10370000C0494A2000000497FFFBFFFFC0284A2061
+:103710000000000000000000002102230000000063
+:103720000000000014E00000000004A300000000FE
+:10373000C02048000000000000000000C020480039
+:103740000000000000000000002102240000000032
+:103750000000000014C00000000000008100000014
+:1037600000204411000000000000000C002048115F
+:103770000000000000000000002000100000000019
+:103780000000000014C000000000049FA000000022
+:103790000020441100000000CAFEBABE00404811DB
+:1037A0000000000081000000002044110000000023
+:1037B0000000000400204811000000000000216B00
+:1037C000002044110000000000000000C02048104C
+:1037D00000000000810000000020441100000000F3
+:1037E0000000000500204811000000000000216CCE
+:1037F000002044110000000000000000C02048101C
+:103800000000000000000000002F02240000000063
+:10381000000000000CE000000000000000000000BC
+:10382000004000000000049D00000000C0210A20AC
+:10383000000000000000000014C00000000004B6FA
+:103840008100000000204411000000000000000082
+:1038500000204811000000000000216D00204411EC
+:103860000000000000000000C02048000000000030
+:1038700000000000C0604800000006810000000059
+:1038800000400000000004BA810000000020441144
+:1038900000000000000000010020481100000000AE
+:1038A00000040000C02946200000000000000000C5
+:1038B000C06000000000067C000000010021022220
+:1038C000000000000000000014C00000000004C15F
+:1038D00000002169002044110000000000000000E9
+:1038E000C02048000000000000000000C020480088
+:1038F0000000000000000000002048100000000050
+:10390000CAFEBABE004048110000000000000000DE
+:10391000C02044000000000000000000C04048102B
+:1039200000000000810000000020441100000000A1
+:10393000000000010020481100000000000021F8F4
+:1039400000204411000000000000000E002048117B
+:1039500000000000000421F9006044110000067C12
+:103960000000000000210230000000000000000004
+:1039700014C00000000004C3000021800020441196
+:103980000000000000000000C0204800000000000F
+:1039900000000000C0200000000000000000000047
+:1039A000C02048000000000000000000C02000000F
+:1039B0000000000000000000C040480000000000BF
+:1039C0000000000300333E2F000000000000000153
+:1039D00000210221000000000000000014E00000AF
+:1039E000000004F30000002C00200A2D000000005D
+:1039F0000004000018E00C11000004E200000001C7
+:103A000000333E2F00000000000021690020441117
+:103A1000000000000000000000204802000000003C
+:103A20000000000000204803000000000000000823
+:103A300000300A220000000000000000C020480002
+:103A40000000000000000000C0204800000000004E
+:103A50000000216900204411000000000000000067
+:103A60000020480200000000000000000020480381
+:103A7000000000000000000800300A2200000000E2
+:103A800000000000C020480000000000000000000E
+:103A9000D8C04800000004D600002169002044116D
+:103AA00000000000000000000020480200000000AC
+:103AB0000000000000204803000000000000000893
+:103AC00000300A220000000000000000C020480072
+:103AD0000000000000000000C020480000000000BE
+:103AE0000000002D0020122D00000000000000004A
+:103AF00000290C830000000000002169002044110F
+:103B0000000000000000000000204802000000004B
+:103B10000000000000204803000000000000000832
+:103B200000300A220000000000000000C020480011
+:103B30000000000000000000C0204800000000005D
+:103B4000000000110021022400000000000000001D
+:103B500014C0000000000000000000000040000051
+:103B60000000049D0000002CC02036200000000052
+:103B70000000002DC0403620000000000000000FB3
+:103B800000210221000000000000000014C000001D
+:103B9000000004F800000000006000000000000BBE
+:103BA00000000000D900000000000000000000003C
+:103BB000C040040000000001B500000000204411D6
+:103BC000000000000000200000204811000000005C
+:103BD000B600000000204411000000000000A0001A
+:103BE0000020481100000000B70000000020441130
+:103BF000000000000000C00000204811000000008C
+:103C0000B800000000204411000000000000F8E0AF
+:103C10000020481100000000B900000000204411FD
+:103C2000000000000000F8800020481100000000A3
+:103C3000BA00000000204411000000000000E00075
+:103C40000020481100000000BB00000000204411CB
+:103C5000000000000000F0000020481100000000FB
+:103C6000BC00000000204411000000000000F3FC34
+:103C700000204811000000008100000000204411D5
+:103C800000000000000000020020481100000000B9
+:103C9000000000FF00280E300000000000000000BF
+:103CA000002F022300000000000000000CC00000F4
+:103CB0000000050C00000000C0200800000000000B
+:103CC0000000000014C000000000052100000000FA
+:103CD00000200C11000000000000001C0020362312
+:103CE000000000000000002B002036230000000030
+:103CF00000000029002036230000000000000028FA
+:103D000000203623000000000000001700203623AA
+:103D10000000000000000025002036230000000005
+:103D200000000026002036230000000000000015DF
+:103D3000002036230000000000000016002036237B
+:103D400000000000FFFFE00000200C110000000058
+:103D500000000021002036230000000000000022A7
+:103D6000002036230000000000001FFF00200C117F
+:103D700000000000000000230020362300000000A7
+:103D8000000000240020362300000000F1FFFFFFA8
+:103D900000283A2E000000000000001AC0220E2069
+:103DA00000000000000000000029386E0000000044
+:103DB0008100000000204411000000000000000607
+:103DC00000204811000000000000002A402036209A
+:103DD00000000000870000000020441100000000E7
+:103DE00000000000C0204800000000000000A1F416
+:103DF00000204411000000000000000000204810D6
+:103E0000000000000000000000200C110000000075
+:103E10000000003000203623000000009D0000005C
+:103E200000204411000000000000001F40214A2033
+:103E30000000000096000000002044110000000077
+:103E400000000000C020480000000000000000004A
+:103E5000C0200C000000000000000000C020100086
+:103E6000000000000000001F0021162400000000D8
+:103E70000000000014C00000000000000000001D51
+:103E800000203623000000000000000300281E234D
+:103E900000000000000000080022222300000000B3
+:103EA000FFFFF000002822280000000000000000B2
+:103EB000002920E8000000000000001F0020362834
+:103EC000000000000000001800211E230000000078
+:103ED0000000002000203627000000000000000243
+:103EE000002216240000000000000000003014A88A
+:103EF000000000000000001E002036250000000029
+:103F00000000000300211A2400000000100000003F
+:103F100000281A2600000000EFFFFFFF00283A2EBD
+:103F20000000000000000000004938CE0000066AD2
+:103F30000000000140280A200000000000000006E8
+:103F400040280E200000000000000300C0281220BE
+:103F50000000000000000008002112240000000002
+:103F600000000000C020162000000000000000003B
+:103F7000C0201A20000000000000000000210222E2
+:103F8000000000000000000014C0000000000559FF
+:103F9000810000000020441100000000000000012A
+:103FA00000204811000000000000225800300A24C0
+:103FB0000000000000040000006946220000067CAA
+:103FC00000002169002044110000000000000000F2
+:103FD00000204805000000000002000000294A26D9
+:103FE0000000000000000000002048100000000059
+:103FF000CAFEBABE00204811000000000000000206
+:10400000002F022300000000000000000CC0000090
+:104010000000056100000000C0201C10000000002E
+:1040200000000000C04000000000056F000000021A
+:10403000002F022300000000000000000CC0000060
+:104040000000056181000000002044110000000014
+:10405000000000010020481100000000000022586C
+:1040600000300A240000000000040000006946221D
+:104070000000067C00000000C0201C1000000000B2
+:1040800000000000C04000000000056F00000000BC
+:10409000002F022300000000000000000CC0000000
+:1040A0000000056500000000C0201C0000000000AA
+:1040B00000000000C04000000000056F0000000488
+:1040C000002F022300000000000000000CC00000D0
+:1040D0000000056D81000000002044110000000078
+:1040E0000000000000204811000000000000216DC9
+:1040F000002044110000000000000000C020480023
+:104100000000000000000000C060480000000681C0
+:104110000000000000401C100000056F00000000BF
+:10412000C02000000000000000000000C0400000AF
+:1041300000000000000000000EE00000000005711B
+:104140000000000000600000000005BC000000004E
+:10415000002F022400000000000000000CC000003E
+:10416000000005820000A2B70020441100000000FA
+:10417000000000000020480700000000810000004F
+:104180000020441100000000000000010020481140
+:10419000000000000004A2B6006044110000067C8C
+:1041A0000000001A0021223000000000000000067C
+:1041B00000222630000000000004200400604411AA
+:1041C0000000067C0000A2C4002044110000000092
+:1041D00000000000003048E900000000000000007E
+:1041E00000E00000000005800000A2D10020441182
+:1041F000000000000000000000404808000000002F
+:104200000000A2D1002044110000000000000001C5
+:1042100000504A280000000000000001002F022486
+:1042200000000000000000000CC00000000005932A
+:104230000000A2BB002044110000000000000000AC
+:104240000020480700000000810000000020441109
+:1042500000000000000000010020481100000000E4
+:104260000004A2BA006044110000067C0000001A9D
+:10427000002122300000000000000006002226304D
+:104280000000000000042004006044110000067CCF
+:104290000000A2C500204411000000000000000042
+:1042A000003048E9000000000000000000E00000CD
+:1042B000000005910000A2D200204411000000007F
+:1042C0000000000000404808000000000000A2D2EA
+:1042D00000204411000000000000000100504A28A6
+:1042E0000000000000000002002F02240000000077
+:1042F000000000000CC00000000005A40000A2BFE8
+:1043000000204411000000000000000000204807C9
+:1043100000000000810000000020441100000000A7
+:104320000000000100204811000000000004A2BEAF
+:10433000006044110000067C0000001A00212230B9
+:1043400000000000000000060022263000000000EF
+:1043500000042004006044110000067C0000A2C696
+:10436000002044110000000000000000003048E977
+:10437000000000000000000000E00000000005A2B6
+:104380000000A2D300204411000000000000000043
+:1043900000404808000000000000A2D300204411A3
+:1043A000000000000000000100504A28000000004A
+:1043B0000000A2C300204411000000000000000023
+:1043C0000020480700000000810000000020441188
+:1043D0000000000000000001002048110000000063
+:1043E0000004A2C2006044110000067C0000001A14
+:1043F00000212230000000000000000600222630CC
+:104400000000000000042004006044110000067C4D
+:104410000000A2C7002044110000000000000000BE
+:10442000003048E9000000000000000000E000004B
+:10443000000005B10000A2D40020441100000000DB
+:104440000000000000404808000000000000A2D466
+:1044500000204411000000000000000100504A2824
+:104460000000000085000000002044110000000052
+:104470000000000000204801000000000000304A59
+:10448000002044110000000001000000002048113D
+:10449000000000000000000000400000000005B720
+:1044A000A4000000C0204411000000000000000033
+:1044B000C04048000000000000000000C060000094
+:1044C000000005BC00000000C04004000000000126
+:1044D0000000002C002036210000000081000000B8
+:1044E00000204411000000000000000600204811D8
+:1044F0000000000000000000002F0230000000005B
+:10450000000000000CC00000000005C30000000017
+:10451000002004110000000000000030004036219F
+:10452000000005D6000000300020062D000000002D
+:1045300000007E00002806210000000000000000AE
+:10454000002F022100000000000000000CE000002D
+:10455000000005D68100000000204411000000008A
+:104560000000000100204811000000000004A0929B
+:10457000006044110000067C00000031002036304D
+:10458000000000000004A093006044110000067CBD
+:104590000000003200203630000000000004A2B607
+:1045A000006044110000067C00000033002036301B
+:1045B000000000000004A2BA006044110000067C64
+:1045C0000000003400203630000000000004A2BECD
+:1045D000006044110000067C0000003500203630E9
+:1045E000000000000004A2C2006044110000067C2C
+:1045F00000000036002036300000000000042004D7
+:10460000006044110000067C0001A2A400204411B7
+:10461000000000000000003F0020481100000000E2
+:104620000000003F00204811000000000000003F93
+:1046300000204811000000000000003F0020481149
+:1046400000000000000000050020481100000000EC
+:104650000000A1F400204411000000000000000050
+:1046600000204811000000008800000000204411D4
+:1046700000000000000000010020481100000000C0
+:10468000810000000020441100000000000000062E
+:10469000002048110000000000000001002F02303F
+:1046A00000000000000000000CE000000000061FF9
+:1046B000000000300020062D000000000000000077
+:1046C000002F022100000000000000000CE00000AC
+:1046D0000000061F810000000020441100000000BF
+:1046E00000000001002048110000000000007E00D2
+:1046F000002806210000000000000000002F022119
+:1047000000000000000000000CE00000000005F8C0
+:104710000000A092002044110000000000000031C1
+:1047200000204A2D000000000000A093002044114A
+:10473000000000000000003200204A2D00000000B0
+:104740000000A2B600204411000000000000003369
+:1047500000204A2D000000000000A2BA00204411F1
+:10476000000000000000003400204A2D000000007E
+:104770000000A2BE0020441100000000000000352F
+:1047800000204A2D000000000000A2C200204411B9
+:10479000000000000000003600204A2D000000004C
+:1047A000000000300020062D00000000000001FF86
+:1047B000002806210000000000000000002F022158
+:1047C00000000000000000000CE000000000061ED9
+:1047D0000000000000210221000000000000000095
+:1047E00014C00000000006010004A0030060441192
+:1047F0000000067C0000A00300204411000000001F
+:10480000000000000020481000000000000000012F
+:1048100000210621000000000000000014C000007C
+:10482000000006060004A010006044110000067C91
+:104830000000A01000204411000000000000000053
+:1048400000204810000000000000000100210621A7
+:104850000000000000000000002F02210000000006
+:10486000000000000CE000000000061E0004A01183
+:10487000006044110000067C0000A01100204411DB
+:1048800000000000000000000020481000000000B0
+:104890000004A012006044110000067C0000A01279
+:1048A000002044110000000000000000002048101B
+:1048B000000000000004A013006044110000067C0A
+:1048C0000000A013002044110000000000000000C0
+:1048D00000204810000000000004A01400604411F3
+:1048E0000000067C0000A01400204411000000001D
+:1048F0000000000000204810000000000004A01587
+:10490000006044110000067C0000A0150020441146
+:10491000000000000000000000204810000000001F
+:104920000004A016006044110000067C0000A016E0
+:10493000002044110000000000000000002048108A
+:10494000000000000004A017006044110000067C75
+:104950000000A0170020441100000000000000002B
+:1049600000204810000000000004200400604411F2
+:104970000000067C0000002C0080062D00000000D6
+:10498000FF000000002044110000000000000000B3
+:104990000020481100000000000000010020481124
+:1049A000000000000000000200804811000000002C
+:1049B000000000000EE000000000063000000030A3
+:1049C0000020062D00000000000000020028062143
+:1049D0000000000000000000002F02210000000085
+:1049E000000000000CE000000000062E8100000026
+:1049F00000204411000000000000000100204811C8
+:104A00000000000000042004006044110000067C47
+:104A10000000100000200811000000000000002B22
+:104A200000203622000000000000000000600000AE
+:104A3000000006340000000000600000000005BC1B
+:104A40009800000000204411000000000000000059
+:104A5000008048110000000000000000C06000005D
+:104A60000000063400000000C04004000000000107
+:104A70000000A2A400204411000000000000002259
+:104A800000204811000000008900000000204411AF
+:104A90000000000000000001004048110000062056
+:104AA00097000000002044110000000000000000FA
+:104AB00000204811000000008A000000002044117E
+:104AC0000000000000000000004048110000062027
+:104AD00000000000006000000000064D0001A2A4DC
+:104AE000C0204411000000000000001600604811C2
+:104AF0000000036A000020100020441100000000A4
+:104B000000010000002048110000000081000000AA
+:104B100000204411000000000000000100204811A6
+:104B2000000000000000217C002044110000000073
+:104B3000098000000020481100000000FFFFFFFF77
+:104B40000020481100000000000000000020481173
+:104B5000000000000000000017000000000000003E
+:104B60000004217F006044110000067C0000001F4B
+:104B700000210230000000000000000014C000000E
+:104B8000000000000000000400404C110000064737
+:104B900000000000004000000000000000000017BE
+:104BA00000201E2D000000000000000400291E2728
+:104BB0000000000000000017008036270000000001
+:104BC0000000001700201E2D00000000FFFFFFFB6B
+:104BD00000281E2700000000000000170080362774
+:104BE000000000000000001700201E2D0000000043
+:104BF0000000000800291E27000000000000001728
+:104C000000803627000000000000001700201E2D45
+:104C100000000000FFFFFFF700281E270000000033
+:104C20000000001700803627000000000001A2A449
+:104C30000020441100000000000000160060481130
+:104C40000000036A00002010002044110000000052
+:104C50000001000000204811000000000000217C3D
+:104C600000204411000000000180000000204811D5
+:104C700000000000FFFFFFFF0020481100000000BF
+:104C800000000000002048110000000000000000AB
+:104C90001700000000000000810000000020441107
+:104CA000000000000000000100204811000000008A
+:104CB0000004217F006044110000067C0000001FFA
+:104CC00000210230000000000000000014C00000BD
+:104CD0000000067B0000001000404C11000006613F
+:104CE00000000000C02004000000000000000000E0
+:104CF00038C00000000000000000001D00200A2D48
+:104D0000000000000000001E00200E2D000000002A
+:104D10000000001F0020122D0000000000000020F5
+:104D20000020162D00000000000021690020441121
+:104D30000000000000000000002048040000000007
+:104D400000000000002048050000000000000000F6
+:104D50000020480100000000CAFEBABE0020481131
+:104D600000000000000000040030122400000000D9
+:104D700000000000002F00640000000000000000A0
+:104D80000CC000000000067A0000000300281A2270
+:104D900000000000000000080022122200000000B5
+:104DA000FFFFF000002812240000000000000000B7
+:104DB000002910C4000000000000001F004036243D
+:104DC0000000000000000000008000000000000063
+:104DD000000000001AC000000000067C9F000000D8
+:104DE0000020441100000000CAFEBABE0020481195
+:104DF00000000000000000001AE000000000067F34
+:104E00000000000000800000000000000000000022
+:104E10001AC00000000006819E000000002044111E
+:104E200000000000CAFEBABE0020481100000000C9
+:104E3000000000001AE000000000068400000000EE
+:104E40000080000000000000000000000060000082
+:104E50000000000B000010000060041100000315AA
+:104E6000000000000020041100000000000000000D
+:104E700000600811000001B20000225C0020441113
+:104E800000000000000000030020481100000000A6
+:104E90000000225600204411000000000000001B0A
+:104EA00000204811000000000000A1FC0020441177
+:104EB0000000000000000001002048110000000078
+:104EC0000001A1FDC02044110000000000000021ED
+:104ED00000201E2D000000000000001000221E27F0
+:104EE00000000000000000240020222D000000002F
+:104EF0000000FFFF00282228000000000000000042
+:104F000000294907000000000000000000204811AF
+:104F100000000000000000220020222D0000000000
+:104F20000000FFFF00282228000000000000000011
+:104F3000002949070000000000000000002048117F
+:104F4000000000000000002300201E2D00000000D3
+:104F50000000001000221E270000000000000000DA
+:104F6000002949070000000000000000004048112F
+:104F70000000000000000000000000000000000031
+:104F80000000000000000000000000000000000021
+:104F90000000000000000000000000000000000011
+:104FA0000000000000000000000000000000000001
+:104FB00000000000000000000000000000000000F1
+:104FC00000000000000000000000000000000000E1
+:104FD00000000000000000000000000000000000D1
+:104FE00000000000000000000000000000000000C1
+:104FF00000000000000000000000000000000000B1
+:1050000000000000000000000000000000000000A0
+:105010000000000000000000000000000000000090
+:105020000000000000000000000000000000000080
+:105030000000000000000000000000000000000070
+:105040000000000000000000000000000000000060
+:105050000000000000000000000000000000000050
+:105060000000000000000000000000000000000040
+:105070000000000000000000000000000000000030
+:105080000000000000000000000000000000000020
+:105090000000000000000000000000000000000010
+:1050A0000000000000000000000000000000000000
+:1050B00000000000000000000000000000000000F0
+:1050C00000000000000000000000000000000000E0
+:1050D00000000000000000000000000000000000D0
+:1050E00000000000000000000000000000000000C0
+:1050F00000000000000000000000000000000000B0
+:10510000000000000000000000000000000000009F
+:10511000000000000000000000000000000000008F
+:10512000000000000000000000000000000000007F
+:10513000000000000000000000000000000000006F
+:10514000000000000000000000000000000000005F
+:10515000000000000000000000000000000000004F
+:10516000000000000000000000000000000000003F
+:10517000000000000000000000000000000000002F
+:10518000000000000000000000000000000000001F
+:10519000000000000000000000000000000000000F
+:1051A00000000000000000000000000000000000FF
+:1051B00000000000000000000000000000000000EF
+:1051C00000000000000000000000000000000000DF
+:1051D00000000000000000000000000000000000CF
+:1051E00000000000000000000000000000000000BF
+:1051F00000000000000000000000000000000000AF
+:10520000000000000000000000000000000000009E
+:10521000000000000000000000000000000000008E
+:10522000000000000000000000000000000000007E
+:10523000000000000000000000000000000000006E
+:10524000000000000000000000000000000000005E
+:10525000000000000000000000000000000000004E
+:10526000000000000000000000000000000000003E
+:10527000000000000000000000000000000000002E
+:10528000000000000000000000000000000000001E
+:10529000000000000000000000000000000000000E
+:1052A00000000000000000000000000000000000FE
+:1052B000014204F505B302500000000001C301687B
+:1052C000043505B300000000022502090250015117
+:1052D000000000000223024502A00241000000007D
+:1052E00003CD05B305B305B300000000063C063D41
+:1052F000031F05B30000000005B305B803200340F9
+:1053000000000000032A0282034203340000000070
+:1053100005B305B305B305B30000000005B30544AC
+:1053200005B305B30000000003B205B304AE0344A7
+:1053300000000000048D0443043305B300000000A6
+:1053400004C305B3043704D000000000044304FA8A
+:10535000035103710000000005B305B305B305B3A5
+:105360000000000005B305B305B305B3000000005D
+:1053700005B305B3063205BA0000000005B305B356
+:10538000000705B30000000005B305B305B305B37E
+:105390000000000005B305B305B305B3000000002D
+:1053A00003EE03E303FE03FC00000000040404001A
+:1053B00004020406000000000412040E041A04167D
+:1053C000000000000422041E042A0426000000003D
+:1053D00005B305B3042E05B30000000005B305B303
+:1053E00005B305B30000000005B305B305B305B36D
+:1053F00000000000000206680686000600000000AB
+:00000001FF
diff --git a/firmware/radeon/RV670_pfp.bin.ihex b/firmware/radeon/RV670_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..f55292c
--- /dev/null
@@ -0,0 +1,145 @@
+:1000000000CA040000A00000007E828B007C038BED
+:10001000008001B8007C038B00D4401E00EE001E5F
+:1000200000CA040000A00000007E828B00C41838C3
+:1000300000CA240000CA2800009581A800C41C3A08
+:1000400000C3C00000CA080000CA0C00007C744B4A
+:1000500000C200050099C00000C41C3A007C744C2A
+:1000600000C0FFF000042C0400309002007D250049
+:1000700000351402007D350B00255403007CD5802B
+:1000800000259C030095C00400D5001B007EDDC147
+:10009000007D9D8000D6801B00D5801B00D4401EB3
+:1000A00000D5401E00D6401E00D6801E00D4801E03
+:1000B00000D4C01E009783D300D5C01E00CA08001C
+:1000C0000080001A00CA0C0000E4011E00D4001ECB
+:1000D0000080000C00C4183800E4013E00D4001E6B
+:1000E0000080000C00C4183800D4401E00EE001E32
+:1000F00000CA040000A00000007E828B00E4011E04
+:1001000000D4001E00D4401E00EE001E00CA0400F1
+:1001100000A00000007E828B00E4013E00D4001E9F
+:1001200000D4401E00EE001E00CA040000A0000023
+:10013000007E828B00CA180000D4401E00D5801EAD
+:100140000080005300D4007500D4401E00CA08008F
+:1001500000CA0C0000CA100000D4801900D4C018D6
+:1001600000D5001700D4801E00D4C01E00D5001E8C
+:1001700000E2001E00CA040000A00000007E828B86
+:1001800000CA080000D4806000D4401E0080000037
+:1001900000D4801E00CA080000D4806100D4401E34
+:1001A0000080000000D4801E00CA080000CA0C00B5
+:1001B00000D4401E00D4801600D4C01600D4801E87
+:1001C000008001B800D4C01E00C6084300CA0C005D
+:1001D00000CA10000094800400CA140000E420F358
+:1001E00000D4201300D5606500D4E01C00D5201C8D
+:1001F00000D5601C008000000006200100C60843F6
+:1002000000CA0C0000CA1000009483F700CA140052
+:1002100000E420F30080007900D4201300C60843D6
+:1002200000CA0C0000CA1000009883EF00CA140036
+:1002300000D400640080008D0000000000C414326F
+:1002400000C6184300C4082F0095400500C40C30B8
+:1002500000D4401E0080000000EE001E009583F5D3
+:1002600000C4103100D4403300D5206500D4A01C58
+:1002700000D4E01C00D5201C00E4015E00D4001E68
+:10028000008000000006200100CA1800000A2001BA
+:1002900000D6007600C408360098800700C61045D6
+:1002A0000095011000D4001F00D46062008000009F
+:1002B00000D4206200CC383500CC1433008401BB5C
+:1002C00000D4007200D5401E0080000000EE001E29
+:1002D00000E2001A008401BB00E2001A00CC104BBF
+:1002E00000CC0447002C9401007D098B0098400548
+:1002F000007D15CB00D4001A008001B800D4006D39
+:100300000034440100CC0C480098403A00CC2C4A00
+:100310000095800400CC0449008001B800D4001A84
+:1003200000D4C01A00282801008400F000CC10037B
+:100330000098801B0004380C008400F000CC1003EF
+:100340000098801700043808008400F000CC1003E7
+:100350000098801300043804008400F000CC1003DF
+:100360000098801400CC104C009A800900CC144DE9
+:10037000009840DC00D4006D00CC184800D5001A6D
+:1003800000D5401A008000C900D5801A0096C0D55B
+:1003900000D4006D008001B800D4006E009AC00344
+:1003A00000D4006D00D4006E0080000000EC007FDF
+:1003B000009AC0CC00D4006D008001B800D4006E5B
+:1003C00000CC140300CC180300CC1C03007D910367
+:1003D000007DD583007D190C0035CC1F0035701FC2
+:1003E000007CF0CB007CD08B00880000007E8E8BE0
+:1003F0000095C00400D4006E008001B800D4001A3B
+:1004000000D4C01A00CC080300CC0C0300CC1003AD
+:1004100000CC140300CC180300CC1C0300CC240334
+:1004200000CC28030035C41F0036B01F007C704B81
+:100430000034F01F007C704B0035701F007C704B47
+:10044000007D8881007DCCC1007E5101007E9541F8
+:10045000007C9082007CD4C2007C848B009AC00314
+:10046000007C8C8B002C88010098809E00D4006D4D
+:100470000098409C00D4006E00CC084C00CC0C4D81
+:1004800000CC104800D4801A00D4C01A00800101AA
+:1004900000D5001A00CC083200D40032009482D972
+:1004A00000CA0C0000D4401E0080000000D4001ED2
+:1004B00000E4011E00D4001E00CA080000CA0C009F
+:1004C00000CA100000D4401E00CA140000D4801ED0
+:1004D00000D4C01E00D5001E00D5401E00D54034FB
+:1004E0000080000000EE001E0028040400E2001A54
+:1004F00000E2001A00D4401A00CA380000CC0803F9
+:1005000000CC0C0300CC0C0300CC0C03009882BD83
+:1005100000000000008401BB00D7A06F0080000035
+:1005200000EE001F00CA040000C2FF0000CC083427
+:1005300000C13FFF007C74CB007CC90B007D010F24
+:10054000009902B0007C738B008401BB00D7A06FC0
+:100550000080000000EE001F00CA080000281900FB
+:10056000007D898B009580140028140400CA0C00BB
+:1005700000CA100000CA1C0000CA240000E2001FCC
+:1005800000D4C01A00D5001A00D5401A00CC1803B8
+:1005900000CC2C0300CC2C0300CC2C03007DA58BBD
+:1005A000007D9C4700984297000000000080016198
+:1005B00000D4C01A00D4401E00D4801E0080000069
+:1005C00000EE001E00E4011E00D4001E00D4401EF8
+:1005D00000EE001E00CA040000A00000007E828B16
+:1005E00000E4013E00D4001E00D4401E00EE001EB8
+:1005F00000CA040000A00000007E828B00CA080030
+:1006000000248C06000CCC060098C00600CC104ECE
+:100610000099000400D4007300E4011E00D4001E01
+:1006200000D4401E00D4801E0080000000EE001E9A
+:1006300000CA080000CA0C000034D01800251001C0
+:100640000095002100C17FFF00CA100000CA1400FD
+:1006500000CA180000D4801D00D4C01D007DB18BDD
+:1006600000C1420200C2C00100D5801D0034DC0E72
+:10067000007D5D4C007F734C00D7401E00D5001EEE
+:1006800000D5401E00C1420000C2C00000099C010C
+:100690000031DC10007F5F4C007F734C00042802A7
+:1006A000007D838000D5A86F00D5806600D7401EEE
+:1006B00000EC005E00C8240200C82402008001B8DB
+:1006C00000D6007600D4401E00D4801E00D4C01E88
+:1006D0000080000000EE001E0080000000EE001F01
+:1006E00000D4001F0080000000D4001F00D4001FB1
+:1006F0000088000000D4001F00000000000000007F
+:1007000000000000000000000000000000000000E9
+:1007100000000000000000000000000000000000D9
+:1007200000000000000000000000000000000000C9
+:1007300000000000000000000000000000000000B9
+:1007400000000000000000000000000000000000A9
+:100750000000000000000000000000000000000099
+:100760000000000000000000000000000000000089
+:100770000000000000000000000000000000000079
+:100780000000000000000000000000000000000069
+:100790000000000000000000000000000000000059
+:1007A0000000000000000000000000000000000049
+:1007B0000000000000000000000000000000000039
+:1007C0000000000000000000000000000000000029
+:1007D0000000000000000000000000000000000019
+:1007E0000000000000000000000000000000000009
+:1007F00000000000000000000000000000000000F9
+:1008000000010171000201780003008F0004007FE5
+:10081000000500030006003F000700320008012C1D
+:1008200000090046000A0036001001B6001700A2B9
+:100830000022013A00230149002000B400240125D0
+:100840000027004D0028006A002A0060002B00529B
+:10085000002F0065003200870034017F003C015604
+:10086000003F00720041018C0044012E00550173CD
+:100870000056017A0060000B00610034006200380D
+:1008800000630038006400380065003800660038F6
+:10089000006700380068003A00690041006A0048BB
+:1008A000006B0048006C0048006D0048006E004876
+:1008B000006F00480000000600000006000000066F
+:1008C0000000000600000006000000060000000610
+:1008D0000000000600000006000000060000000600
+:1008E00000000006000000060000000600000006F0
+:1008F00000000006000000060000000600000006E0
+:00000001FF
diff --git a/firmware/radeon/RV710_me.bin.ihex b/firmware/radeon/RV710_me.bin.ihex
new file mode 100644 (file)
index 0000000..5cdfe30
--- /dev/null
@@ -0,0 +1,341 @@
+:10000000CC0003EA04080003CC8000437C4080005D
+:10001000A0000000CC80006280000003D040007F80
+:1000200080000003CC4000417C40C000C0160004AA
+:1000300030D03FFF7D15000CCC11000028D8001EE9
+:100040003198000128DC001FC820000495C000067C
+:100050007C424000CC0000627E56800CCC2900001F
+:10006000C82400047E26000B958000067C42C00058
+:10007000CC0000627ED7000CCC310000C82C0004FC
+:100080007E2E000CCC00006231103FFF8000000388
+:10009000CE1100007C40C00080000003CC40004036
+:1000A00080000003CC4122577C418000CC400045B9
+:1000B000CC400048CC41225CCC41A1FC7C4080007B
+:1000C000A0000000CC800062CC400045CC4000483D
+:1000D0007C40C000CC41225CCC41A1FC7C40800033
+:1000E000A0000000CC800062CC000045CC0000489D
+:1000F000CC41225CCC41A1FC7C408000A0000000EF
+:10010000CC800062040CA1FDC0120001CC000045AF
+:10011000CC0000487CD0C00CCC41225CCC41A1FC7E
+:10012000D04D00007C408000A0000000CC80006228
+:1001300080000003CC41225D7C4080007C40C000F8
+:10014000C02A00027C4100007D29000C309400018F
+:1001500030980006309C030029DC00087C42000037
+:100160007C4240009540000FC02E000405F022584C
+:100170007F2F000CCC310000C8280004CCC12169BD
+:10018000CD01216ACE81216B0DB40002CC01216C1E
+:100190009740000E0DB400008000007DC834000AB6
+:1001A0000DB40002974000090DB40000C02E0004F9
+:1001B00005F022587F2F000CCC310000C828000425
+:1001C0008000007DC834000A974000047E02800051
+:1001D0008000007DC834000A0DB400049740FF8CF5
+:1001E00000000000CE01216DCE41216EC828000321
+:1001F000C834000A9B400004043C00058400026DE2
+:10020000CC0000620DF400009740000BC82C03E600
+:10021000CE81A2B7C03000067EF34028C030002057
+:100220007F6B80207FB3C029CF81A2C480000003F0
+:10023000CFC1A2D10DF400019740000BC82C03E7F9
+:10024000CE81A2BBC03000067EF34028C030002023
+:100250007F6B80207FB3C029CF81A2C580000003BF
+:10026000CFC1A2D20DF400029740000BC82C03E8C6
+:10027000CE81A2BFC03000067EF34028C0300020EF
+:100280007F6B80207FB3C029CF81A2C6800000038E
+:10029000CFC1A2D3C82C03E9CE81A2C3C0300006CF
+:1002A0007EF34028C03000207F6B80207FB3C029C0
+:1002B000CF81A2C780000003CFC1A2D48000000379
+:1002C000CC4000427C40C0007C4100002914001D4D
+:1002D000315400019940000C31181000C81C001165
+:1002E00095C00000C81C0011CCC12100CD01210126
+:1002F000CCC12102CD012103041800048000037E3B
+:10030000CD81A2A4C02A00049580000836A821A3AC
+:10031000CC290000C8280004C81C00110DE40040CE
+:100320009640FFFFC81C0011CCC12170CD01217186
+:10033000C820001296000000C82000128000037E32
+:10034000CC0000647C40C0007C410000CC00004533
+:10035000CC00004840D40003CD41225CCD01A1FC7B
+:10036000C01A0001041CA1FD7DD9C00C7C42000014
+:1003700008CC00010624000106280002CE1D000062
+:10038000CE5D000098C0FFFACE9D00007C4080004A
+:10039000A0000000CC8000627C40C00030D0000192
+:1003A00028CC00017C414000950000067C41800083
+:1003B000CD41216DCD81216E800000F4C81C000369
+:1003C000C02200047E16000CCC210000C81C0004D2
+:1003D0007C42400098C000047C4280008000000302
+:1003E000CDE50000CE412169CE81216ACDC1216BCE
+:1003F00080000003CC01216C7C40C0007C410000E7
+:100400007C4140007C4180007C41C00028A4000861
+:10041000326400FF0E68003C9680000A7C020000F7
+:100420007C4200001E300003CC00006A9B000003E9
+:100430004220000504200040800001117C024000A1
+:100440007E0240009A4000000A64000130EC001077
+:100450009AC0000ACC000062C02A0004C82C002107
+:100460007E92800CCC000041CC290000CEC000213F
+:1004700080000121C8300004CD01216DCD41216EE5
+:10048000C83000037F1F000B30F4000727780001FD
+:100490009740002A07B801269F8000000000000056
+:1004A000800001367F1B80048000013A7F1B80059D
+:1004B0008000013E7F1B8002800001427F1B800381
+:1004C000800001467F1B80078000014A7F1B800659
+:1004D0008000014F28A400089B80001928A4000870
+:1004E0008000015F326400FF9B80001528A4000893
+:1004F0008000015F326400FF9B80001128A4000887
+:100500008000015F326400FF9B80000D28A400087A
+:100510008000015F326400FF9B80000928A400086E
+:100520008000015F326400FF9B80000528A4000862
+:100530008000015F326400FF28A40008326400FFDD
+:100540000E68003C9A80FEB228EC00087C43400014
+:100550007C4380007C43C00096C00007CC00006252
+:10056000CF412169CF81216ACFC1216B8000000377
+:10057000CC01216C80000003CFF50000CC00006BA3
+:10058000840003810E68003C9A800004C82800158E
+:1005900080000003D040007F9680FFAB7E024000C9
+:1005A0008400023BC00E0002CC00004180000239F2
+:1005B000CCC1304A7C40C0007C410000C01E00011C
+:1005C00029240012C022000296400005C026000423
+:1005D000C027FFFB7D25000BC02600007DD2800BCD
+:1005E0007E12C00B7D25000C7C4140007C418000C8
+:1005F000CCC121699A80000ACD01216ACD41216BCD
+:1006000096C0FE83CD81216CC83000189700000091
+:10061000C830001880000003CC000018840003815B
+:10062000CC00007FC8140013C8180014CD41216B02
+:1006300096C0FE77CD81216C80000183C830001800
+:10064000C80C000898C00000C80C00087C410000DD
+:1006500095000002000000007C414000C820000915
+:10066000CC400043CE01A1F4CC400044C00E800039
+:100670007C4240007C4280002AAC001F96C0FE6491
+:10068000C035F000CE4003E232780003267C00083B
+:100690007FF7C00B7FFBC00C2A780018CFC003E3A4
+:1006A000CF8003E426B000027F3F0000CF0003E5C7
+:1006B0008000031F7C80C0007C40C00028D0000860
+:1006C0003110000F9500000F2528000106A801B485
+:1006D0009E80000000000000800001D5C0120800CC
+:1006E000800001E3C814000F800001EAC814001064
+:1006F000800001F1CCC1A2A4800001FAC81400114D
+:1007000030D0003F0D2800159A8000120D28001EE1
+:100710009A80001E0D2800209A8000230D24000FCF
+:100720000D2800107E6A800C9A8000260D2000049F
+:100730000D2400140D2800287E62400C7EA6800C3B
+:100740009A80002AC814001180000003CCC1A2A422
+:10075000C01208007C4140007D0CC00CC012000893
+:1007600029580003295C000C7C4200007DD1C00B9D
+:10077000262000147E1E400C7E4E800CCE81A2A44A
+:1007800080000003CD81A1FEC814000F0410210ECB
+:1007900095400000C814000FD051000080000003F5
+:1007A000CCC1A2A4C8140010041021089540000078
+:1007B000C8140010D051000080000003CCC1A2A4D6
+:1007C000CCC1A2A404100001CD0000198400038153
+:1007D000CC00007FC810001999000000C810001953
+:1007E000800000047C40800004102100954000003F
+:1007F000C8140011D05100008000037ECCC1A2A417
+:100800007C40C000CC40000D94C0FE01CC40000EE6
+:100810007C4100009500000508CC0001C8140005CB
+:10082000994000140000000098C0FFFB7C410000CC
+:10083000800000047D008000C81400057C40C000DA
+:100840009940000CC818000C7C4100009580FDF018
+:10085000C820000EC81C000D662000207E1E002C43
+:10086000252400027E62402080000003CCE60000C8
+:100870007C410000CC00006CCC00006DC818001F4B
+:10088000C81C001E659800207DD9C02C7CD4C00CEB
+:10089000CCDE000045DC0004C82800179680000F5D
+:1008A000C00E0001286800082AAC001632A800FF1C
+:1008B0000EB000497F2F000B9700000600000000DB
+:1008C000C81400057C40C000800002237C41000069
+:1008D00080000226D040007F8400023BCC00004113
+:1008E000CCC1304A94000000C83C001A043C00050A
+:1008F000CFC1A2A4C0361F90C0387FFF7C03C010B8
+:100900007F7B400CCF41217CCFC1217DCC01217E5A
+:10091000C03A00040434217F7F7B400CCC350000BA
+:10092000C83C00042BFC001F0438002097C00005C1
+:10093000CC0000629B8000000BB8000180000247E1
+:10094000CC000071CC01A1F404380016C0360002BE
+:10095000CF81A2A488000000CF4120107C40C000BD
+:1009600028D0001C9500000504D40001CD4000658E
+:1009700080000003CD40006809540002800000039D
+:10098000CD4000668400026CC81803EA7C40C000B9
+:100990009980FD9FC814001608D000019940002BD3
+:1009A000CD0000687C408000A0000000CC80006288
+:1009B000043C0005CFC1A2A4CC01A1F484000381B2
+:1009C000CC00004688000000CC00007F8400027E3E
+:1009D000C81803EA7C40C0009980FD8DC814001639
+:1009E00008D0000199400019CD0000687C408000CB
+:1009F000A0000000CC800062043C0022CFC1A2A471
+:100A000084000381CC00004788000000CC00007FF8
+:100A1000C81000169900000DCC400067800000044B
+:100A20007C408000C81803EA9980FD797C40C000B2
+:100A300094C00003C810001699000004CCC00068E0
+:100A4000800000047C4080008400023BC0148000D1
+:100A5000CC000041CD41304AC01480009900000014
+:100A6000C8100016800000047C408000C012000105
+:100A70007C51400C80000003D05500007C40C00039
+:100A80007C4100007C4140007C418000291C001F0B
+:100A9000CCC0004ACD00004B95C00003C01C8000B4
+:100AA000CDC12010DD830000055C2000CC00006279
+:100AB00080000003D81F41007C40C0007C41000042
+:100AC0007C4140007C418000CCC0004CCD00004DFA
+:100AD000DD830000055CA00080000003D81F4100FA
+:100AE0007C40C0007C4100007C4140007C41800093
+:100AF000CCC0004ECD00004FDD830000055CC0007F
+:100B000080000003D81F41007C40C0007C410000F1
+:100B10007C4140007C418000CCC00050CD000051A1
+:100B2000DD830000055CF8E080000003D81F410071
+:100B30007C40C0007C4100007C4140007C41800042
+:100B4000CCC00052CD000053DD830000055CF8806E
+:100B500080000003D81F41007C40C0007C410000A1
+:100B60007C4140007C418000CCC00054CD00005549
+:100B7000DD830000055CE00080000003D81F410019
+:100B80007C40C0007C4100007C4140007C418000F2
+:100B9000CCC00056CD000057DD830000055CF0009E
+:100BA00080000003D81F41007C40C0007C41000051
+:100BB0007C4140007C418000CCC00058CD000059F1
+:100BC000DD830000055CF3FC80000003D81F4100BA
+:100BD000D04320007C408000A0000000CC80006258
+:100BE000D043A0007C408000A0000000CC800062C8
+:100BF000D043C0007C408000A0000000CC80006298
+:100C0000D043F8E07C408000A0000000CC8000626F
+:100C1000D043F8807C408000A0000000CC800062BF
+:100C2000D043E0007C408000A0000000CC80006247
+:100C3000D043F0007C408000A0000000CC80006227
+:100C4000D043F3FC7C408000A0000000CC80006218
+:100C5000C81403E0CC430000CC430000CC430000A8
+:100C60007D45C000CDC30000D04300007C40800023
+:100C7000A0000000CC8000627C40C000C81003E2ED
+:100C8000C81403E5C81803E3C81C03E4CD81216937
+:100C9000CDC1216ACCC1216BCC01216C04200004A0
+:100CA0007DA180007D9640029640FCD9CD8003E373
+:100CB00031280003C02DF000251800087DAD800B01
+:100CC0007DA9800C80000003CD8003E3308CFFFF02
+:100CD000D04D00007C408000A0000000CC8000626D
+:100CE000C8140020155800029580FFFFC81400208A
+:100CF000CC00006ECC4121807C40C000CCC1218D55
+:100D0000CC41218128D0001F34588000CD81218C16
+:100D10009500FCBFCC412182C81400209940FFFF00
+:100D2000C8140020800000047C4080007C40C0008B
+:100D300028D0001831100001C01600809500000373
+:100D4000C02A00047CD4C00CCCC1217CCC41217DC4
+:100D5000CC41217E7C4180001DB0000336A0217F64
+:100D60009B000003419C0005041C004099C000004A
+:100D700009DC0001CC210000C82400042A6C001FFB
+:100D8000419C00059AC0FFFACC80006280000004FC
+:100D90007C4080007C40C00004D403E68000000357
+:100DA000CC5400008000037ECC4003EAC01C8000CD
+:100DB000044CA000CDC120107C410000C8140009E3
+:100DC00004180000041C0008CD80007109DC00013B
+:100DD00005980001CD0D000099C0FFFCCC80006299
+:100DE0008000037ECD400071C00E0100CC000041A8
+:100DF000CCC1304AC83C007FCC00007F800000039B
+:100E0000CC00007FCC00007F88000000CC00007F79
+:100E100000000000000000000000000000000000D2
+:100E200000000000000000000000000000000000C2
+:100E300000000000000000000000000000000000B2
+:100E400000000000000000000000000000000000A2
+:100E50000000000000000000000000000000000092
+:100E60000000000000000000000000000000000082
+:100E70000000000000000000000000000000000072
+:100E80000000000000000000000000000000000062
+:100E90000000000000000000000000000000000052
+:100EA0000000000000000000000000000000000042
+:100EB0000000000000000000000000000000000032
+:100EC0000000000000000000000000000000000022
+:100ED0000000000000000000000000000000000012
+:100EE0000000000000000000000000000000000002
+:100EF00000000000000000000000000000000000F2
+:100F000000000000000000000000000000000000E1
+:100F100000000000000000000000000000000000D1
+:100F200000000000000000000000000000000000C1
+:100F300000000000000000000000000000000000B1
+:100F400000000000000000000000000000000000A1
+:100F50000000000000000000000000000000000091
+:100F60000000000000000000000000000000000081
+:100F70000000000000000000000000000000000071
+:100F80000000000000000000000000000000000061
+:100F90000000000000000000000000000000000051
+:100FA0000000000000000000000000000000000041
+:100FB0000000000000000000000000000000000031
+:100FC0000000000000000000000000000000000021
+:100FD0000000000000000000000000000000000011
+:100FE0000000000000000000000000000000000001
+:100FF00000000000000000000000000000000000F1
+:1010000000000000000000000000000000000000E0
+:1010100000000000000000000000000000000000D0
+:1010200000000000000000000000000000000000C0
+:1010300000000000000000000000000000000000B0
+:1010400000000000000000000000000000000000A0
+:101050000000000000000000000000000000000090
+:101060000000000000000000000000000000000080
+:101070000000000000000000000000000000000070
+:101080000000000000000000000000000000000060
+:101090000000000000000000000000000000000050
+:1010A0000000000000000000000000000000000040
+:1010B0000000000000000000000000000000000030
+:1010C0000000000000000000000000000000000020
+:1010D0000000000000000000000000000000000010
+:1010E0000000000000000000000000000000000000
+:1010F00000000000000000000000000000000000F0
+:1011000000000000000000000000000000000000DF
+:1011100000000000000000000000000000000000CF
+:1011200000000000000000000000000000000000BF
+:1011300000000000000000000000000000000000AF
+:10114000000000000000000000000000000000009F
+:10115000000000000000000000000000000000008F
+:10116000000000000000000000000000000000007F
+:10117000000000000000000000000000000000006F
+:10118000000000000000000000000000000000005F
+:10119000000000000000000000000000000000004F
+:1011A000000000000000000000000000000000003F
+:1011B000000000000000000000000000000000002F
+:1011C000000000000000000000000000000000001F
+:1011D000000000000000000000000000000000000F
+:1011E00000000000000000000000000000000000FF
+:1011F00000000000000000000000000000000000EF
+:1012000000000000000000000000000000000000DE
+:1012100000000000000000000000000000000000CE
+:1012200000000000000000000000000000000000BE
+:1012300000000000000000000000000000000000AE
+:10124000000000000000000000000000000000009E
+:10125000000000000000000000000000000000008E
+:10126000000000000000000000000000000000007E
+:10127000000000000000000000000000000000006E
+:10128000000000000000000000000000000000005E
+:10129000000000000000000000000000000000004E
+:1012A000000000000000000000000000000000003E
+:1012B000000000000000000000000000000000002E
+:1012C000000000000000000000000000000000001E
+:1012D000000000000000000000000000000000000E
+:1012E00000000000000000000000000000000000FE
+:1012F00000000000000000000000000000000000EE
+:1013000000000000000000000000000000000000DD
+:1013100000000000000000000000000000000000CD
+:1013200000000000000000000000000000000000BD
+:1013300000000000000000000000000000000000AD
+:10134000000000000000000000000000000000009D
+:10135000000000000000000000000000000000008D
+:10136000000000000000000000000000000000007D
+:10137000000000000000000000000000000000006D
+:10138000000000000000000000000000000000005D
+:10139000000000000000000000000000000000004D
+:1013A000000000000000000000000000000000003D
+:1013B000000000000000000000000000000000002D
+:1013C000000000000000000000000000000000001D
+:1013D000000000000000000000000000000000000D
+:1013E00000000000000000000000000000000000FD
+:1013F00000000000000000000000000000000000ED
+:101400000001033300100006001700080021000A45
+:101410000027002A002800250029002B002A002888
+:10142000002B002B002D003A002E0041002F004C15
+:101430000034004E00360032003900B1003A00D1CD
+:10144000003B00E6003C00FE003D016D003F00AFA8
+:10145000004103380043034B00440190004500FE67
+:10146000004601AE004701AE004802000049020EEE
+:10147000004A0257004B028400520261005302737B
+:10148000005402890057029B0060029F006102AE77
+:10149000006202B8006302C2006402CC006502D69A
+:1014A000006602E0006702EA006802F4006902F8E0
+:1014B000006A02FC006B0300006C0304006D03086B
+:1014C000006E030C006F03100070031400720365BC
+:1014D0000074036B00790369007C031E000F037A1C
+:1014E000000F037A000F037A000F037A000F037ACC
+:1014F000000F037A000F037A000F037A000F037ABC
+:10150000000F037A000F037A000F037A000F037AAB
+:10151000000F037A000F037A000F037A000F037A9B
+:10152000000F037A000F037A000F037A000F037A8B
+:10153000000F037A000F037A000F037A000F037A7B
+:00000001FF
diff --git a/firmware/radeon/RV710_pfp.bin.ihex b/firmware/radeon/RV710_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..3d811ff
--- /dev/null
@@ -0,0 +1,213 @@
+:100000007C408000A00000007E82800B8000000009
+:10001000DC030000CC800040D04000407C408000E9
+:10002000A00000007E82800BC818000E31980001ED
+:100030007C4240009580023A7C428000C81C001C33
+:10004000C037C0007C40C0007C4100007CB4800B05
+:10005000C036000399C00000C81C001C7CB4800C92
+:1000600024D400027D654000CD400043CE80004393
+:10007000CD000043CC800040CE400040CE80004008
+:10008000CCC00040DC3A00009780FFDECD0000408D
+:100090007C40C000800000187C410000D400034078
+:1000A000D4000FC0D4000FA2C818000E8000000CAE
+:1000B00031980002D40003C0D4000FC0D4000FA2B6
+:1000C000C818000E288C000830CC000F3410000136
+:1000D0007D0D00088000000C7D91800BCC800040DD
+:1000E000D04000407C408000A00000007E82800B59
+:1000F000D4000340D4000FC0D4000FA2CC80004035
+:10010000D04000407C408000A00000007E82800B38
+:10011000D40003C0D4000FC0D4000FA2CC80004094
+:10012000D04000407C408000A00000007E82800B18
+:10013000CC4003F980000249CC4003F8C037FFFFF0
+:100140007C414000CF41A29EC82003F8C81C03F99F
+:1001500066200020C81803FB7DE1C02C7D58C00834
+:100160007CDCC02069100020C0360003CC000054A5
+:100170007CB4800C80000069CC8000407C41800011
+:10018000CD81A29ECC80004080000067CD800040E1
+:10019000C019FFFFCC800040CD81A29E7C40C000F2
+:1001A0007C4100007C414000CCC1A1FACD01A1F905
+:1001B000CD41A29DCCC00040CD000040CD400040CC
+:1001C000CC4000407C408000A00000007E82800B7C
+:1001D000CC000054CC8000407C40C0007C4100003A
+:1001E0007C414000CCC1A1FACD01A1F9CD41A29D35
+:1001F000CCC00040CD000040CD400040D040004089
+:100200007C408000A00000007E82800B7C40C0000B
+:1002100030D00001CCC1A29F95000003041400015E
+:1002200004140002CD4003FBCC800040800000009D
+:10023000CCC000407C40C000CC800040CCC1A2A219
+:1002400080000000CCC000407C40C00028D4001FCB
+:10025000CC800040954000037C410000CCC000579A
+:100260002918001FCCC0004095800003CD0000403D
+:10027000CD00005880000249CC00007FC820001744
+:10028000C83000229A0000060E280001C824001E73
+:100290000A640001D4001240CE400040C036C000C5
+:1002A0009680000737747900041C0001CF4000409D
+:1002B000CDC00040CF0003FA7C030000CA0C001040
+:1002C0007C41000094C000047C414000D42002C462
+:1002D000CDE000449B00000B7C418000CC00004B33
+:1002E000CDA00049CD200041CD600041CDA000410E
+:1002F00006200001CE00005680000249CC00007F9D
+:10030000C8280020C82C0021CC0000637EEA4001F0
+:10031000657400207F53402C269C00027DF5C02090
+:1003200069F80020CE80004BCE600049CDE000414E
+:10033000CFA00041CE600041271C00027DF5C02007
+:1003400069F800207DB24001CF00004BCE6000492B
+:10035000CDE00041CFA00041800000BCCE60004154
+:10036000C8200017C83000229A0000060E2800019D
+:10037000C824001E0A640001D4001240CE40004090
+:10038000CA0C00107C41000094C0000BC036C000B5
+:100390009680000737747900041C0001CF400040AC
+:1003A000CDC00040CF0003FA7C030000800000B500
+:1003B0007C414000CC000048800000EE00000000BE
+:1003C000C8200017C81C00230E24000299C0001585
+:1003D0007C4180000A200001CE000056D400044079
+:1003E000CC000040C036C000CA140013964000077D
+:1003F00037747900CF400040CC000040C83003FA89
+:1004000080000103CF000022CC000022954001466D
+:10041000CC00007FCCA0004680000000CC2000462D
+:1004200080000249CC000064C8200017C810001FDB
+:100430009600000509100001D4000440CD000040E2
+:10044000CD000022CC800040D0400040C80C0025E8
+:1004500094C0FEECC8100008CD000040D4000FC0CE
+:1004600080000000D4000FA27C40C0007C4100004E
+:10047000CCC003FDCD0003FCCCC00042CD00004247
+:100480002914001F29180010319800073B5C000157
+:100490007D76000B998000057D5E400BCC0000420C
+:1004A00080000249CC00004D29980001292C000849
+:1004B0009980003D32EC0001960000042930000CC8
+:1004C00080000249CC00004204140010CD400042DC
+:1004D00033300001342800018400015DC81400039A
+:1004E0009B40001B0438000C8400015DC81400030D
+:1004F0009B400017043800088400015DC814000305
+:100500009B400013043800048400015DC8140003FC
+:100510009B400015C80C03FD9A800009C81003FC1D
+:100520009B000101CC00004D04140010CCC000421F
+:10053000CD00004280000135CD40004296C000FA57
+:10054000CC00004D80000249CC00004E9AC0000350
+:10055000CC00004DCC00004EDF8300008000000086
+:10056000D80301FF9AC000F0CC00004D8000024982
+:10057000CC00004EC8180003C81C0003C8200003AC
+:100580007D5D40037DA1C0037D5D400C2A10001FEE
+:10059000299C001F7D1D000B7D17400B880000006B
+:1005A0007E92800B96400004CC00004E80000249F1
+:1005B000CC00004204380008CF800042C808000385
+:1005C000C80C0003C8100003C8140003C8180003B7
+:1005D000C81C0003C8240003C828000329FC001F0E
+:1005E0002AB0001F7FF3C00B28F0001F7FF3C00B61
+:1005F0002970001F7FF3C00B7D8880017DCCC00176
+:100600007E5100017E9540017C9080027CD4C00226
+:100610007CBC800B9AC000037C8F400B38B4000177
+:100620009B4000C1CC00004D9BC000BFCC00004EE1
+:10063000C80C03FDC81003FCCCC000428000016E52
+:10064000CD000042D4000340D4000FC0D4000FA25C
+:10065000CC800040CC400040CC400040CC4000402A
+:100660007C40C000CCC00040CCC0000D8000000029
+:10067000D04000407C40C0007C4100006514002058
+:100680007D4D402C245800027D5980207C41C000C3
+:10069000CD80004269980020CD800042CDC000424C
+:1006A000C023C00005E400027CA0800B266400107B
+:1006B0007CA4800CCC800040CDC00040CCC0004069
+:1006C00095C0000ECD00004009DC0001C8280003E1
+:1006D00096800008CE800040C834001D974000007E
+:1006E000C834001D26A800088400024CCC2B000052
+:1006F00099C0FFF709DC0001DC3A00009780000494
+:100700007C418000800001A225980002A00000002A
+:100710007D808000C818001D7C40C00064D00008A7
+:1007200095800000C818001DCC130000CC8000404C
+:10073000CCC0004080000000CC400040C810001F2A
+:100740007C40C000CC8000407CD1400CCD400040BB
+:100750000518000180000000CD8000227C40C00010
+:10076000645000208400024CCC0000617CD0C02C7E
+:10077000C8200017C8D60000994000087C438000BC
+:10078000DF830000CFA0004F8400024CCC00006249
+:1007900080000000D040007F80000249CC00006251
+:1007A0008400024CCC000061C82000177C40C000CF
+:1007B000C036FF00C810000DC0303FFF7CF5400B75
+:1007C0007D51800B7D81800F998000087CF3800B28
+:1007D000DF830000CFA0004F8400024CCC000062F9
+:1007E00080000000D040007F80000249CC00006201
+:1007F0008400024C7C40C00028DC000895C0001931
+:1008000030DC00107C41000099C0000464540020DA
+:1008100080000208C91D00007D15002CC91E0000C3
+:100820007C4200007C4240007C4180007DE5C00BA2
+:100830007DE280079A80000E41AC00059AC000005E
+:100840000AEC000130DC001099C000040000000038
+:100850008000020BC91D00008000020BC91E0000B1
+:10086000CC800040CCC00040D0400040C80C0025E7
+:1008700094C0FDE4C8100008CD000040D4000FC0B3
+:1008800080000000D4000FA2D4000340D4000FC0A9
+:10089000D4000FA2CC800040D04000407C408000BB
+:1008A000A00000007E82800BD40003C0D4000FC0E3
+:1008B000D4000FA2CC800040D04000407C4080009B
+:1008C000A00000007E82800B7C40C00030D000067B
+:1008D0000D10000699000007C81400159940000586
+:1008E000CC000052D4000340D4000FC0D4000FA2AB
+:1008F000CC800040CCC0004080000000D0400040D0
+:100900007C40C000CC4D0000DC3A00009780FDBD6B
+:1009100004CC000180000242CC4D000080000000A9
+:10092000D040007FCC00007F80000000CC00007F22
+:10093000CC00007F88000000CC00007F0000000099
+:1009400000000000000000000000000000000000A7
+:100950000000000000000000000000000000000097
+:100960000000000000000000000000000000000087
+:100970000000000000000000000000000000000077
+:100980000000000000000000000000000000000067
+:100990000000000000000000000000000000000057
+:1009A0000000000000000000000000000000000047
+:1009B0000000000000000000000000000000000037
+:1009C0000000000000000000000000000000000027
+:1009D0000000000000000000000000000000000017
+:1009E0000000000000000000000000000000000007
+:1009F00000000000000000000000000000000000F7
+:100A000000000000000000000000000000000000E6
+:100A100000000000000000000000000000000000D6
+:100A200000000000000000000000000000000000C6
+:100A300000000000000000000000000000000000B6
+:100A400000000000000000000000000000000000A6
+:100A50000000000000000000000000000000000096
+:100A60000000000000000000000000000000000086
+:100A70000000000000000000000000000000000076
+:100A80000000000000000000000000000000000066
+:100A90000000000000000000000000000000000056
+:100AA0000000000000000000000000000000000046
+:100AB0000000000000000000000000000000000036
+:100AC0000000000000000000000000000000000026
+:100AD0000000000000000000000000000000000016
+:100AE0000000000000000000000000000000000006
+:100AF00000000000000000000000000000000000F6
+:100B000000000000000000000000000000000000E5
+:100B100000000000000000000000000000000000D5
+:100B200000000000000000000000000000000000C5
+:100B300000000000000000000000000000000000B5
+:100B400000000000000000000000000000000000A5
+:100B50000000000000000000000000000000000095
+:100B60000000000000000000000000000000000085
+:100B70000000000000000000000000000000000075
+:100B80000000000000000000000000000000000065
+:100B90000000000000000000000000000000000055
+:100BA0000000000000000000000000000000000045
+:100BB0000000000000000000000000000000000035
+:100BC0000000000000000000000000000000000025
+:100BD0000000000000000000000000000000000015
+:100BE0000000000000000000000000000000000005
+:100BF00000000000000000000000000000000000F5
+:100C0000000302220004022A0005009F00020003E4
+:100C10000006003C0007002700080191000900447D
+:100C2000000A002D00100247001700F0002201D733
+:100C3000002301E80026004C0027005F0020011A75
+:100C4000002800920029004F002A0083002B006436
+:100C5000002F008D003200D80034023200360074BC
+:100C60000039010A003C01FC003F009F00410005E3
+:100C7000004401940048019D004901C5004A01CF8C
+:100C8000005502250056022D0060000A0061002A6E
+:100C90000062003000630030006400300065003006
+:100CA0000066003000670030006800370069003FD0
+:100CB000006A0047006B0047006C0047006D00476A
+:100CC000006E0047006F0047007000470073024746
+:100CD000007B024000000005000000050000000548
+:100CE00000000005000000050000000500000005F0
+:100CF00000000005000000050000000500000005E0
+:100D000000000005000000050000000500000005CF
+:100D100000000005000000050000000500000005BF
+:100D200000000005000000050000000500000005AF
+:100D3000000000050000000500000005000000059F
+:00000001FF
diff --git a/firmware/radeon/RV730_me.bin.ihex b/firmware/radeon/RV730_me.bin.ihex
new file mode 100644 (file)
index 0000000..390c18e
--- /dev/null
@@ -0,0 +1,341 @@
+:10000000CC0003EA7C408000A0000000CC800062AD
+:1000100080000001D040007F80000001CC40004102
+:100020007C40C000C016000430D03FFF7D15000C9E
+:10003000CC11000028D8001E3198000128DC001FD8
+:10004000C820000495C000067C424000CC0000623D
+:100050007E56800CCC290000C82400047E26000BAC
+:10006000958000067C42C000CC0000627ED7000C68
+:10007000CC310000C82C00047E2E000CCC000062A5
+:1000800031103FFF80000001CE1100007C40C00015
+:1000900080000001CC40004080000001CC4122578C
+:1000A0007C418000CC400045CC400048CC41225CE3
+:1000B000CC41A1FC7C408000A0000000CC8000620C
+:1000C000CC400045CC4000487C40C000CC41225C84
+:1000D000CC41A1FC7C408000A0000000CC800062EC
+:1000E000CC000045CC000048CC41225CCC41A1FCB6
+:1000F0007C408000A0000000CC800062040CA1FDC8
+:10010000C0120001CC000045CC0000487CD0C00CDF
+:10011000CC41225CCC41A1FCD04D00007C40800051
+:10012000A0000000CC80006280000001CC41225D74
+:100130007C4080007C40C000C02A00027C4100005E
+:100140007D29000C3094000130980006309C03009B
+:1001500029DC00087C4200007C4240009540000FF2
+:10016000C02E000405F022587F2F000CCC31000077
+:10017000C8280004CCC12169CD01216ACE81216B40
+:100180000DB40002CC01216C9740000E0DB40000AC
+:100190008000007BC834000A0DB4000297400009BB
+:1001A0000DB40000C02E000405F022587F2F000C73
+:1001B000CC310000C82800048000007BC834000A4D
+:1001C000974000047E0280008000007BC834000A53
+:1001D0000DB400049740FF8C00000000CE01216D9B
+:1001E000CE41216EC8280003C834000A9B40000499
+:1001F000043C00058400026BCC0000620DF400009A
+:100200009740000BC82C03E6CE81A2B7C030000691
+:100210007EF34028C03000207F6B80207FB3C02950
+:10022000CF81A2C480000001CFC1A2D10DF4000192
+:100230009740000BC82C03E7CE81A2BBC03000065C
+:100240007EF34028C03000207F6B80207FB3C02920
+:10025000CF81A2C580000001CFC1A2D20DF400025F
+:100260009740000BC82C03E8CE81A2BFC030000627
+:100270007EF34028C03000207F6B80207FB3C029F0
+:10028000CF81A2C680000001CFC1A2D3C82C03E950
+:10029000CE81A2C3C03000067EF34028C0300020CB
+:1002A0007F6B80207FB3C029CF81A2C7800000016F
+:1002B000CFC1A2D480000001CC4000427C40C000ED
+:1002C0007C4100002914001D315400019940000CAC
+:1002D00031181000C81C001195C00000C81C001186
+:1002E000CCC12100CD012101CCC12102CD012103CE
+:1002F000041800048000037CCD81A2A4C02A00045D
+:100300009580000836A821A3CC290000C828000445
+:10031000C81C00110DE400409640FFFFC81C0011EE
+:10032000CCC12170CD012171C820001296000000BF
+:10033000C82000128000037CCC0000647C40C00018
+:100340007C410000CC000045CC00004840D40003B4
+:10035000CD41225CCD01A1FCC01A0001041CA1FD0D
+:100360007DD9C00C7C42000008CC000106240001AD
+:1003700006280002CE1D0000CE5D000098C0FFFAE6
+:10038000CE9D00007C408000A0000000CC80006278
+:100390007C40C00030D0000128CC00017C414000EE
+:1003A000950000067C418000CD41216DCD81216EFC
+:1003B000800000F2C81C0003C02200047E16000C5E
+:1003C000CC210000C81C00047C42400098C00004FE
+:1003D0007C42800080000001CDE50000CE41216913
+:1003E000CE81216ACDC1216B80000001CC01216C3E
+:1003F0007C40C0007C4100007C4140007C4180008A
+:100400007C41C00028A40008326400FF0E68003C54
+:100410009680000A7C0200007C4200001E3000032F
+:10042000CC00006A9B00000342200005042000402D
+:100430008000010F7C0240007E0240009A400000D4
+:100440000A64000130EC00109AC0000ACC0000627F
+:10045000C02A0004C82C00217E92800CCC000041F0
+:10046000CC290000CEC000218000011FC83000044C
+:10047000CD01216DCD41216EC83000037F1F000BDF
+:1004800030F40007277800019740002A07B80124BC
+:100490009F80000000000000800001347F1B80046A
+:1004A000800001387F1B80058000013C7F1B80029B
+:1004B000800001407F1B8003800001447F1B800778
+:1004C000800001487F1B80068000014D28A40008A1
+:1004D0009B80001928A400088000015D326400FFA1
+:1004E0009B80001528A400088000015D326400FF95
+:1004F0009B80001128A400088000015D326400FF89
+:100500009B80000D28A400088000015D326400FF7C
+:100510009B80000928A400088000015D326400FF70
+:100520009B80000528A400088000015D326400FF64
+:1005300028A40008326400FF0E68003C9A80FEB2D6
+:1005400028EC00087C4340007C4380007C43C000D2
+:1005500096C00007CC000062CF412169CF81216A9B
+:10056000CFC1216B80000001CC01216C8000000113
+:10057000CFF50000CC00006B8400037F0E68003CC8
+:100580009A800004C828001580000001D040007F38
+:100590009680FFAB7E02400084000239C00E00024C
+:1005A000CC00004180000237CCC1304A7C40C00002
+:1005B0007C410000C01E000129240012C02200025C
+:1005C00096400005C0260004C027FFFB7D25000BD8
+:1005D000C02600007DD2800B7E12C00B7D25000C52
+:1005E0007C4140007C418000CCC121699A80000A96
+:1005F000CD01216ACD41216B96C0FE83CD81216C56
+:10060000C830001897000000C830001880000001B2
+:10061000CC0000188400037FCC00007FC8140013B6
+:10062000C8180014CD41216B96C0FE77CD81216C96
+:1006300080000181C8300018C80C000898C0000074
+:10064000C80C00087C41000095000002000000007A
+:100650007C414000C8200009CC400043CE01A1F4F9
+:10066000CC400044C00E80007C4240007C428000B0
+:100670002AAC001F96C0FE64C035F000CE4003E2F5
+:1006800032780003267C00087FF7C00B7FFBC00C8C
+:100690002A780018CFC003E3CF8003E426B000021D
+:1006A0007F3F0000CF0003E58000031D7C80C00079
+:1006B0007C40C00028D000083110000F9500000FCA
+:1006C0002528000106A801B29E800000000000005D
+:1006D000800001D3C0120800800001E1C814000F9F
+:1006E000800001E8C8140010800001EFCCC1A2A472
+:1006F000800001F8C814001130D0003F0D2800150B
+:100700009A8000120D28001E9A80001E0D280020DD
+:100710009A8000230D24000F0D2800107E6A800CA3
+:100720009A8000260D2000040D2400140D280028B6
+:100730007E62400C7EA6800C9A80002AC8140011AC
+:1007400080000001CCC1A2A4C01208007C4140007E
+:100750007D0CC00CC012000829580003295C000C55
+:100760007C4200007DD1C00B262000147E1E400C70
+:100770007E4E800CCE81A2A480000001CD81A1FE1E
+:10078000C814000F0410210E95400000C814000F7B
+:10079000D051000080000001CCC1A2A4C8140010F8
+:1007A0000410210895400000C8140010D05100002A
+:1007B00080000001CCC1A2A4CCC1A2A404100001FD
+:1007C000CD0000198400037FCC00007FC810001901
+:1007D00099000000C8100019800000027C408000D1
+:1007E0000410210095400000C8140011D0510000F1
+:1007F0008000037CCCC1A2A47C40C000CC40000D92
+:1008000094C0FE01CC40000E7C4100009500000524
+:1008100008CC0001C8140005994000140000000035
+:1008200098C0FFFB7C410000800000027D0080003A
+:10083000C81400057C40C0009940000CC818000C8A
+:100840007C4100009580FDF0C820000EC81C000D02
+:10085000662000207E1E002C252400027E6240209F
+:1008600080000001CCE600007C410000CC00006C60
+:10087000CC00006DC818001FC81C001E6598002021
+:100880007DD9C02C7CD4C00CCCDE000045DC00043B
+:10089000C82800179680000FC00E000128680008C5
+:1008A0002AAC001632A800FF0EB000497F2F000BC3
+:1008B0009700000600000000C81400057C40C0003E
+:1008C000800002217C41000080000224D040007F93
+:1008D00084000239CC000041CCC1304A94000000B1
+:1008E000C83C001A043C0005CFC1A2A4C0361F902A
+:1008F000C0387FFF7C03C0107F7B400CCF41217C40
+:10090000CFC1217DCC01217EC03A00040434217F77
+:100910007F7B400CCC350000C83C00042BFC001F42
+:100920000438002097C00005CC0000629B800000C6
+:100930000BB8000180000245CC000071CC01A1F48D
+:1009400004380016C0360002CF81A2A4880000003F
+:10095000CF4120107C40C00028D0001C950000052D
+:1009600004D40001CD40006580000001CD40006846
+:100970000954000280000001CD4000668400026A34
+:10098000C81803EA7C40C0009980FD9FC814001677
+:1009900008D000019940002BCD0000687C40800009
+:1009A000A0000000CC800062043C0005CFC1A2A4DE
+:1009B000CC01A1F48400037FCC0000468800000035
+:1009C000CC00007F8400027CC81803EA7C40C00091
+:1009D0009980FD8DC814001608D0000199400019B7
+:1009E000CD0000687C408000A0000000CC80006248
+:1009F000043C0022CFC1A2A48400037FCC000047A6
+:100A000088000000CC00007FC81000169900000D7F
+:100A1000CC400067800000027C408000C81803EAD8
+:100A20009980FD797C40C00094C00003C810001676
+:100A300099000004CCC00068800000027C40800067
+:100A400084000239C0148000CC000041CD41304AFE
+:100A5000C014800099000000C81000168000000239
+:100A60007C408000C01200017C51400C80000001DD
+:100A7000D05500007C40C0007C4100007C4140001B
+:100A80007C418000291C001FCCC0004ACD00004BD7
+:100A900095C00003C01C8000CDC12010DD83000084
+:100AA000055C2000CC00006280000001D81F4100DE
+:100AB0007C40C0007C4100007C4140007C418000C3
+:100AC000CCC0004CCD00004DDD830000055CA000D3
+:100AD00080000001D81F41007C40C0007C41000024
+:100AE0007C4140007C418000CCC0004ECD00004FD6
+:100AF000DD830000055CC00080000001D81F4100BC
+:100B00007C40C0007C4100007C4140007C41800072
+:100B1000CCC00050CD000051DD830000055CF8E042
+:100B200080000001D81F41007C40C0007C410000D3
+:100B30007C4140007C418000CCC00052CD0000537D
+:100B4000DD830000055CF88080000001D81F4100B3
+:100B50007C40C0007C4100007C4140007C41800022
+:100B6000CCC00054CD000055DD830000055CE000E2
+:100B700080000001D81F41007C40C0007C41000083
+:100B80007C4140007C418000CCC00056CD00005725
+:100B9000DD830000055CF00080000001D81F4100EB
+:100BA0007C40C0007C4100007C4140007C418000D2
+:100BB000CCC00058CD000059DD830000055CF3FC7B
+:100BC00080000001D81F4100D04320007C408000FD
+:100BD000A0000000CC800062D043A0007C408000D8
+:100BE000A0000000CC800062D043C0007C408000A8
+:100BF000A0000000CC800062D043F8E07C40800080
+:100C0000A0000000CC800062D043F8807C408000CF
+:100C1000A0000000CC800062D043E0007C40800057
+:100C2000A0000000CC800062D043F0007C40800037
+:100C3000A0000000CC800062D043F3FC7C40800028
+:100C4000A0000000CC800062C81403E0CC43000088
+:100C5000CC430000CC4300007D45C000CDC3000064
+:100C6000D04300007C408000A0000000CC800062E7
+:100C70007C40C000C81003E2C81403E5C81803E3B1
+:100C8000C81C03E4CD812169CDC1216ACCC1216B8F
+:100C9000CC01216C042000047DA180007D964002DF
+:100CA0009640FCD9CD8003E331280003C02DF0002D
+:100CB000251800087DAD800B7DA9800C8000000107
+:100CC000CD8003E3308CFFFFD04D00007C408000DE
+:100CD000A0000000CC800062C8140020155800025B
+:100CE0009580FFFFC8140020CC00006ECC4121800D
+:100CF0007C40C000CCC1218DCC41218128D0001F77
+:100D000034588000CD81218C9500FCBFCC412182DC
+:100D1000C81400209940FFFFC81400208000000282
+:100D20007C4080007C40C00028D0001831100001B9
+:100D3000C016008095000003C02A00047CD4C00CBB
+:100D4000CCC1217CCC41217DCC41217E7C418000E5
+:100D50001DB0000336A0217F9B000003419C0005CD
+:100D6000041C004099C0000009DC0001CC210000F7
+:100D7000C82400042A6C001F419C00059AC0FFFA99
+:100D8000CC800062800000027C4080007C40C0007B
+:100D900004D403E680000001CC5400008000037CF2
+:100DA000CC4003EAC01C8000044CA000CDC1201040
+:100DB0007C410000C814000904180000041C00084D
+:100DC000CD80007109DC000105980001CD0D000007
+:100DD00099C0FFFCCC8000628000037CCD40007194
+:100DE000C00E0100CC000041CCC1304AC83C007F9D
+:100DF000CC00007F80000001CC00007FCC00007F91
+:100E000088000000CC00007F00000000000000000F
+:100E100000000000000000000000000000000000D2
+:100E200000000000000000000000000000000000C2
+:100E300000000000000000000000000000000000B2
+:100E400000000000000000000000000000000000A2
+:100E50000000000000000000000000000000000092
+:100E60000000000000000000000000000000000082
+:100E70000000000000000000000000000000000072
+:100E80000000000000000000000000000000000062
+:100E90000000000000000000000000000000000052
+:100EA0000000000000000000000000000000000042
+:100EB0000000000000000000000000000000000032
+:100EC0000000000000000000000000000000000022
+:100ED0000000000000000000000000000000000012
+:100EE0000000000000000000000000000000000002
+:100EF00000000000000000000000000000000000F2
+:100F000000000000000000000000000000000000E1
+:100F100000000000000000000000000000000000D1
+:100F200000000000000000000000000000000000C1
+:100F300000000000000000000000000000000000B1
+:100F400000000000000000000000000000000000A1
+:100F50000000000000000000000000000000000091
+:100F60000000000000000000000000000000000081
+:100F70000000000000000000000000000000000071
+:100F80000000000000000000000000000000000061
+:100F90000000000000000000000000000000000051
+:100FA0000000000000000000000000000000000041
+:100FB0000000000000000000000000000000000031
+:100FC0000000000000000000000000000000000021
+:100FD0000000000000000000000000000000000011
+:100FE0000000000000000000000000000000000001
+:100FF00000000000000000000000000000000000F1
+:1010000000000000000000000000000000000000E0
+:1010100000000000000000000000000000000000D0
+:1010200000000000000000000000000000000000C0
+:1010300000000000000000000000000000000000B0
+:1010400000000000000000000000000000000000A0
+:101050000000000000000000000000000000000090
+:101060000000000000000000000000000000000080
+:101070000000000000000000000000000000000070
+:101080000000000000000000000000000000000060
+:101090000000000000000000000000000000000050
+:1010A0000000000000000000000000000000000040
+:1010B0000000000000000000000000000000000030
+:1010C0000000000000000000000000000000000020
+:1010D0000000000000000000000000000000000010
+:1010E0000000000000000000000000000000000000
+:1010F00000000000000000000000000000000000F0
+:1011000000000000000000000000000000000000DF
+:1011100000000000000000000000000000000000CF
+:1011200000000000000000000000000000000000BF
+:1011300000000000000000000000000000000000AF
+:10114000000000000000000000000000000000009F
+:10115000000000000000000000000000000000008F
+:10116000000000000000000000000000000000007F
+:10117000000000000000000000000000000000006F
+:10118000000000000000000000000000000000005F
+:10119000000000000000000000000000000000004F
+:1011A000000000000000000000000000000000003F
+:1011B000000000000000000000000000000000002F
+:1011C000000000000000000000000000000000001F
+:1011D000000000000000000000000000000000000F
+:1011E00000000000000000000000000000000000FF
+:1011F00000000000000000000000000000000000EF
+:1012000000000000000000000000000000000000DE
+:1012100000000000000000000000000000000000CE
+:1012200000000000000000000000000000000000BE
+:1012300000000000000000000000000000000000AE
+:10124000000000000000000000000000000000009E
+:10125000000000000000000000000000000000008E
+:10126000000000000000000000000000000000007E
+:10127000000000000000000000000000000000006E
+:10128000000000000000000000000000000000005E
+:10129000000000000000000000000000000000004E
+:1012A000000000000000000000000000000000003E
+:1012B000000000000000000000000000000000002E
+:1012C000000000000000000000000000000000001E
+:1012D000000000000000000000000000000000000E
+:1012E00000000000000000000000000000000000FE
+:1012F00000000000000000000000000000000000EE
+:1013000000000000000000000000000000000000DD
+:1013100000000000000000000000000000000000CD
+:1013200000000000000000000000000000000000BD
+:1013300000000000000000000000000000000000AD
+:10134000000000000000000000000000000000009D
+:10135000000000000000000000000000000000008D
+:10136000000000000000000000000000000000007D
+:10137000000000000000000000000000000000006D
+:10138000000000000000000000000000000000005D
+:10139000000000000000000000000000000000004D
+:1013A000000000000000000000000000000000003D
+:1013B000000000000000000000000000000000002D
+:1013C000000000000000000000000000000000001D
+:1013D000000000000000000000000000000000000D
+:1013E00000000000000000000000000000000000FD
+:1013F00000000000000000000000000000000000ED
+:10140000000103310010000400170006002100084D
+:10141000002700280028002300290029002A002690
+:10142000002B0029002D0038002E003F002F004A1D
+:101430000034004C00360030003900AF003A00CFD5
+:10144000003B00E4003C00FC003D016B003F00ADB0
+:1014500000410336004303490044018E004500FC6F
+:10146000004601AC004701AC004801FE0049020CF7
+:10147000004A0255004B02820052025F0053027183
+:1014800000540287005702990060029D006102AC7F
+:10149000006202B6006302C0006402CA006502D4A2
+:1014A000006602DE006702E8006802F2006902F6E8
+:1014B000006A02FA006B02FE006C0302006D030674
+:1014C000006E030A006F030E0070031200720363C4
+:1014D0000074036900790367007C031C000F037824
+:1014E000000F0378000F0378000F0378000F0378D4
+:1014F000000F0378000F0378000F0378000F0378C4
+:10150000000F0378000F0378000F0378000F0378B3
+:10151000000F0378000F0378000F0378000F0378A3
+:10152000000F0378000F0378000F0378000F037893
+:10153000000F0378000F0378000F0378000F037883
+:00000001FF
diff --git a/firmware/radeon/RV730_pfp.bin.ihex b/firmware/radeon/RV730_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..3d811ff
--- /dev/null
@@ -0,0 +1,213 @@
+:100000007C408000A00000007E82800B8000000009
+:10001000DC030000CC800040D04000407C408000E9
+:10002000A00000007E82800BC818000E31980001ED
+:100030007C4240009580023A7C428000C81C001C33
+:10004000C037C0007C40C0007C4100007CB4800B05
+:10005000C036000399C00000C81C001C7CB4800C92
+:1000600024D400027D654000CD400043CE80004393
+:10007000CD000043CC800040CE400040CE80004008
+:10008000CCC00040DC3A00009780FFDECD0000408D
+:100090007C40C000800000187C410000D400034078
+:1000A000D4000FC0D4000FA2C818000E8000000CAE
+:1000B00031980002D40003C0D4000FC0D4000FA2B6
+:1000C000C818000E288C000830CC000F3410000136
+:1000D0007D0D00088000000C7D91800BCC800040DD
+:1000E000D04000407C408000A00000007E82800B59
+:1000F000D4000340D4000FC0D4000FA2CC80004035
+:10010000D04000407C408000A00000007E82800B38
+:10011000D40003C0D4000FC0D4000FA2CC80004094
+:10012000D04000407C408000A00000007E82800B18
+:10013000CC4003F980000249CC4003F8C037FFFFF0
+:100140007C414000CF41A29EC82003F8C81C03F99F
+:1001500066200020C81803FB7DE1C02C7D58C00834
+:100160007CDCC02069100020C0360003CC000054A5
+:100170007CB4800C80000069CC8000407C41800011
+:10018000CD81A29ECC80004080000067CD800040E1
+:10019000C019FFFFCC800040CD81A29E7C40C000F2
+:1001A0007C4100007C414000CCC1A1FACD01A1F905
+:1001B000CD41A29DCCC00040CD000040CD400040CC
+:1001C000CC4000407C408000A00000007E82800B7C
+:1001D000CC000054CC8000407C40C0007C4100003A
+:1001E0007C414000CCC1A1FACD01A1F9CD41A29D35
+:1001F000CCC00040CD000040CD400040D040004089
+:100200007C408000A00000007E82800B7C40C0000B
+:1002100030D00001CCC1A29F95000003041400015E
+:1002200004140002CD4003FBCC800040800000009D
+:10023000CCC000407C40C000CC800040CCC1A2A219
+:1002400080000000CCC000407C40C00028D4001FCB
+:10025000CC800040954000037C410000CCC000579A
+:100260002918001FCCC0004095800003CD0000403D
+:10027000CD00005880000249CC00007FC820001744
+:10028000C83000229A0000060E280001C824001E73
+:100290000A640001D4001240CE400040C036C000C5
+:1002A0009680000737747900041C0001CF4000409D
+:1002B000CDC00040CF0003FA7C030000CA0C001040
+:1002C0007C41000094C000047C414000D42002C462
+:1002D000CDE000449B00000B7C418000CC00004B33
+:1002E000CDA00049CD200041CD600041CDA000410E
+:1002F00006200001CE00005680000249CC00007F9D
+:10030000C8280020C82C0021CC0000637EEA4001F0
+:10031000657400207F53402C269C00027DF5C02090
+:1003200069F80020CE80004BCE600049CDE000414E
+:10033000CFA00041CE600041271C00027DF5C02007
+:1003400069F800207DB24001CF00004BCE6000492B
+:10035000CDE00041CFA00041800000BCCE60004154
+:10036000C8200017C83000229A0000060E2800019D
+:10037000C824001E0A640001D4001240CE40004090
+:10038000CA0C00107C41000094C0000BC036C000B5
+:100390009680000737747900041C0001CF400040AC
+:1003A000CDC00040CF0003FA7C030000800000B500
+:1003B0007C414000CC000048800000EE00000000BE
+:1003C000C8200017C81C00230E24000299C0001585
+:1003D0007C4180000A200001CE000056D400044079
+:1003E000CC000040C036C000CA140013964000077D
+:1003F00037747900CF400040CC000040C83003FA89
+:1004000080000103CF000022CC000022954001466D
+:10041000CC00007FCCA0004680000000CC2000462D
+:1004200080000249CC000064C8200017C810001FDB
+:100430009600000509100001D4000440CD000040E2
+:10044000CD000022CC800040D0400040C80C0025E8
+:1004500094C0FEECC8100008CD000040D4000FC0CE
+:1004600080000000D4000FA27C40C0007C4100004E
+:10047000CCC003FDCD0003FCCCC00042CD00004247
+:100480002914001F29180010319800073B5C000157
+:100490007D76000B998000057D5E400BCC0000420C
+:1004A00080000249CC00004D29980001292C000849
+:1004B0009980003D32EC0001960000042930000CC8
+:1004C00080000249CC00004204140010CD400042DC
+:1004D00033300001342800018400015DC81400039A
+:1004E0009B40001B0438000C8400015DC81400030D
+:1004F0009B400017043800088400015DC814000305
+:100500009B400013043800048400015DC8140003FC
+:100510009B400015C80C03FD9A800009C81003FC1D
+:100520009B000101CC00004D04140010CCC000421F
+:10053000CD00004280000135CD40004296C000FA57
+:10054000CC00004D80000249CC00004E9AC0000350
+:10055000CC00004DCC00004EDF8300008000000086
+:10056000D80301FF9AC000F0CC00004D8000024982
+:10057000CC00004EC8180003C81C0003C8200003AC
+:100580007D5D40037DA1C0037D5D400C2A10001FEE
+:10059000299C001F7D1D000B7D17400B880000006B
+:1005A0007E92800B96400004CC00004E80000249F1
+:1005B000CC00004204380008CF800042C808000385
+:1005C000C80C0003C8100003C8140003C8180003B7
+:1005D000C81C0003C8240003C828000329FC001F0E
+:1005E0002AB0001F7FF3C00B28F0001F7FF3C00B61
+:1005F0002970001F7FF3C00B7D8880017DCCC00176
+:100600007E5100017E9540017C9080027CD4C00226
+:100610007CBC800B9AC000037C8F400B38B4000177
+:100620009B4000C1CC00004D9BC000BFCC00004EE1
+:10063000C80C03FDC81003FCCCC000428000016E52
+:10064000CD000042D4000340D4000FC0D4000FA25C
+:10065000CC800040CC400040CC400040CC4000402A
+:100660007C40C000CCC00040CCC0000D8000000029
+:10067000D04000407C40C0007C4100006514002058
+:100680007D4D402C245800027D5980207C41C000C3
+:10069000CD80004269980020CD800042CDC000424C
+:1006A000C023C00005E400027CA0800B266400107B
+:1006B0007CA4800CCC800040CDC00040CCC0004069
+:1006C00095C0000ECD00004009DC0001C8280003E1
+:1006D00096800008CE800040C834001D974000007E
+:1006E000C834001D26A800088400024CCC2B000052
+:1006F00099C0FFF709DC0001DC3A00009780000494
+:100700007C418000800001A225980002A00000002A
+:100710007D808000C818001D7C40C00064D00008A7
+:1007200095800000C818001DCC130000CC8000404C
+:10073000CCC0004080000000CC400040C810001F2A
+:100740007C40C000CC8000407CD1400CCD400040BB
+:100750000518000180000000CD8000227C40C00010
+:10076000645000208400024CCC0000617CD0C02C7E
+:10077000C8200017C8D60000994000087C438000BC
+:10078000DF830000CFA0004F8400024CCC00006249
+:1007900080000000D040007F80000249CC00006251
+:1007A0008400024CCC000061C82000177C40C000CF
+:1007B000C036FF00C810000DC0303FFF7CF5400B75
+:1007C0007D51800B7D81800F998000087CF3800B28
+:1007D000DF830000CFA0004F8400024CCC000062F9
+:1007E00080000000D040007F80000249CC00006201
+:1007F0008400024C7C40C00028DC000895C0001931
+:1008000030DC00107C41000099C0000464540020DA
+:1008100080000208C91D00007D15002CC91E0000C3
+:100820007C4200007C4240007C4180007DE5C00BA2
+:100830007DE280079A80000E41AC00059AC000005E
+:100840000AEC000130DC001099C000040000000038
+:100850008000020BC91D00008000020BC91E0000B1
+:10086000CC800040CCC00040D0400040C80C0025E7
+:1008700094C0FDE4C8100008CD000040D4000FC0B3
+:1008800080000000D4000FA2D4000340D4000FC0A9
+:10089000D4000FA2CC800040D04000407C408000BB
+:1008A000A00000007E82800BD40003C0D4000FC0E3
+:1008B000D4000FA2CC800040D04000407C4080009B
+:1008C000A00000007E82800B7C40C00030D000067B
+:1008D0000D10000699000007C81400159940000586
+:1008E000CC000052D4000340D4000FC0D4000FA2AB
+:1008F000CC800040CCC0004080000000D0400040D0
+:100900007C40C000CC4D0000DC3A00009780FDBD6B
+:1009100004CC000180000242CC4D000080000000A9
+:10092000D040007FCC00007F80000000CC00007F22
+:10093000CC00007F88000000CC00007F0000000099
+:1009400000000000000000000000000000000000A7
+:100950000000000000000000000000000000000097
+:100960000000000000000000000000000000000087
+:100970000000000000000000000000000000000077
+:100980000000000000000000000000000000000067
+:100990000000000000000000000000000000000057
+:1009A0000000000000000000000000000000000047
+:1009B0000000000000000000000000000000000037
+:1009C0000000000000000000000000000000000027
+:1009D0000000000000000000000000000000000017
+:1009E0000000000000000000000000000000000007
+:1009F00000000000000000000000000000000000F7
+:100A000000000000000000000000000000000000E6
+:100A100000000000000000000000000000000000D6
+:100A200000000000000000000000000000000000C6
+:100A300000000000000000000000000000000000B6
+:100A400000000000000000000000000000000000A6
+:100A50000000000000000000000000000000000096
+:100A60000000000000000000000000000000000086
+:100A70000000000000000000000000000000000076
+:100A80000000000000000000000000000000000066
+:100A90000000000000000000000000000000000056
+:100AA0000000000000000000000000000000000046
+:100AB0000000000000000000000000000000000036
+:100AC0000000000000000000000000000000000026
+:100AD0000000000000000000000000000000000016
+:100AE0000000000000000000000000000000000006
+:100AF00000000000000000000000000000000000F6
+:100B000000000000000000000000000000000000E5
+:100B100000000000000000000000000000000000D5
+:100B200000000000000000000000000000000000C5
+:100B300000000000000000000000000000000000B5
+:100B400000000000000000000000000000000000A5
+:100B50000000000000000000000000000000000095
+:100B60000000000000000000000000000000000085
+:100B70000000000000000000000000000000000075
+:100B80000000000000000000000000000000000065
+:100B90000000000000000000000000000000000055
+:100BA0000000000000000000000000000000000045
+:100BB0000000000000000000000000000000000035
+:100BC0000000000000000000000000000000000025
+:100BD0000000000000000000000000000000000015
+:100BE0000000000000000000000000000000000005
+:100BF00000000000000000000000000000000000F5
+:100C0000000302220004022A0005009F00020003E4
+:100C10000006003C0007002700080191000900447D
+:100C2000000A002D00100247001700F0002201D733
+:100C3000002301E80026004C0027005F0020011A75
+:100C4000002800920029004F002A0083002B006436
+:100C5000002F008D003200D80034023200360074BC
+:100C60000039010A003C01FC003F009F00410005E3
+:100C7000004401940048019D004901C5004A01CF8C
+:100C8000005502250056022D0060000A0061002A6E
+:100C90000062003000630030006400300065003006
+:100CA0000066003000670030006800370069003FD0
+:100CB000006A0047006B0047006C0047006D00476A
+:100CC000006E0047006F0047007000470073024746
+:100CD000007B024000000005000000050000000548
+:100CE00000000005000000050000000500000005F0
+:100CF00000000005000000050000000500000005E0
+:100D000000000005000000050000000500000005CF
+:100D100000000005000000050000000500000005BF
+:100D200000000005000000050000000500000005AF
+:100D3000000000050000000500000005000000059F
+:00000001FF
diff --git a/firmware/radeon/RV770_me.bin.ihex b/firmware/radeon/RV770_me.bin.ihex
new file mode 100644 (file)
index 0000000..a0e1699
--- /dev/null
@@ -0,0 +1,341 @@
+:10000000CC0003EA7C408000A0000000CC800062AD
+:1000100080000001D040007F80000001CC40004102
+:100020007C40C000C016000430D03FFF7D15000C9E
+:10003000CC11000028D8001E3198000128DC001FD8
+:10004000C820000495C000067C424000CC0000623D
+:100050007E56800CCC290000C82400047E26000BAC
+:10006000958000067C42C000CC0000627ED7000C68
+:10007000CC310000C82C00047E2E000CCC000062A5
+:1000800031103FFF80000001CE1100007C40C00015
+:1000900080000001CC40004080000001CC4122578C
+:1000A0007C418000CC400045CC400048CC41225CE3
+:1000B000CC41A1FC7C408000A0000000CC8000620C
+:1000C000CC400045CC4000487C40C000CC41225C84
+:1000D000CC41A1FC7C408000A0000000CC800062EC
+:1000E000CC000045CC000048CC41225CCC41A1FCB6
+:1000F0007C408000A0000000CC800062040CA1FDC8
+:10010000C0120001CC000045CC0000487CD0C00CDF
+:10011000CC41225CCC41A1FCD04D00007C40800051
+:10012000A0000000CC80006280000001CC41225D74
+:100130007C4080007C40C000C02A00027C4100005E
+:100140007D29000C3094000130980006309C03009B
+:1001500029DC00087C4200007C4240009540000FF2
+:10016000C02E000405F022587F2F000CCC31000077
+:10017000C8280004CCC12169CD01216ACE81216B40
+:100180000DB40002CC01216C9740000E0DB40000AC
+:100190008000007BC834000A0DB4000297400009BB
+:1001A0000DB40000C02E000405F022587F2F000C73
+:1001B000CC310000C82800048000007BC834000A4D
+:1001C000974000047E0280008000007BC834000A53
+:1001D0000DB400049740FF8C00000000CE01216D9B
+:1001E000CE41216EC8280003C834000A9B40000499
+:1001F000043C00058400026DCC0000620DF4000098
+:100200009740000BC82C03E6CE81A2B7C030000691
+:100210007EF34028C03000207F6B80207FB3C02950
+:10022000CF81A2C480000001CFC1A2D10DF4000192
+:100230009740000BC82C03E7CE81A2BBC03000065C
+:100240007EF34028C03000207F6B80207FB3C02920
+:10025000CF81A2C580000001CFC1A2D20DF400025F
+:100260009740000BC82C03E8CE81A2BFC030000627
+:100270007EF34028C03000207F6B80207FB3C029F0
+:10028000CF81A2C680000001CFC1A2D3C82C03E950
+:10029000CE81A2C3C03000067EF34028C0300020CB
+:1002A0007F6B80207FB3C029CF81A2C7800000016F
+:1002B000CFC1A2D480000001CC4000427C40C000ED
+:1002C0007C4100002914001D315400019940000DAB
+:1002D00031181000C81C001109DC000195C0FFFF97
+:1002E000C81C0011CCC12100CD012101CCC12102CB
+:1002F000CD012103041800048000039FCD81A2A436
+:10030000C02A00049580000836A821A3CC2900004B
+:10031000C8280004C81C00110DE400409640FFFFEF
+:10032000C81C0011CCC12170CD012171C820001260
+:1003300096000000C82000128000039FCC000064DB
+:100340007C40C0007C410000CC000045CC0000484F
+:1003500040D40003CD41225CCD01A1FCC01A0001B4
+:10036000041CA1FD7DD9C00C7C42000008CC00011A
+:100370000624000106280002CE1D0000CE5D00000C
+:1003800098C0FFFACE9D00007C408000A0000000D5
+:10039000CC8000627C40C00030D0000128CC00013D
+:1003A0007C414000950000067C418000CD41216DDC
+:1003B000CD81216E800000F3C81C0003C022000420
+:1003C0007E16000CCC210000C81C00047C424000BA
+:1003D00098C000047C42800080000001CDE5000050
+:1003E000CE412169CE81216ACDC1216B80000001FF
+:1003F000CC01216C7C40C0007C4100007C4140006D
+:100400007C4180007C41C00028A40008326400FFC9
+:100410000E68003C9680000A7C0200007C420000CE
+:100420001E300003CC00006A9B0000034220000540
+:1004300004200040800001107C0240007E02400049
+:100440009A4000000A64000130EC00109AC0000AD3
+:10045000CC000062C02A0004C82C00217E92800CCF
+:10046000CC000041CC290000CEC00021800001203A
+:10047000C8300004CD01216DCD41216EC83000038C
+:100480007F1F000B30F40007277800019740002AF7
+:1004900007B801259F8000000000000080000135A2
+:1004A0007F1B8004800001397F1B80058000013D97
+:1004B0007F1B8002800001417F1B8003800001457B
+:1004C0007F1B8007800001497F1B80068000014E52
+:1004D00028A400089B80001928A400088000015E61
+:1004E000326400FF9B80001528A400088000015E94
+:1004F000326400FF9B80001128A400088000015E88
+:10050000326400FF9B80000D28A400088000015E7B
+:10051000326400FF9B80000928A400088000015E6F
+:10052000326400FF9B80000528A400088000015E63
+:10053000326400FF28A40008326400FF0E68003C0B
+:100540009A80FEB128EC00087C4340007C43800088
+:100550007C43C00096C00007CC000062CF412169F7
+:10056000CF81216ACFC1216B80000001CC01216CB9
+:1005700080000001CFF50000CC00006B840003A2D6
+:100580000E68003C9A800004C82800158000000115
+:10059000D040007F9680FFAB7E0240008400023B8B
+:1005A000C00E0002CC00004180000239CCC1304AAC
+:1005B0007C40C0007C410000C01E000129240012C4
+:1005C000C022000296400005C0260004C027FFFBA1
+:1005D0007D25000BC02600007DD2800B7E12C00B53
+:1005E0007D25000C7C4140007C418000CCC121690C
+:1005F0009A80000ACD01216ACD41216B96C0FE820E
+:10060000CD81216CC830001897000000C830001858
+:1006100080000001CC000018840003A2CC00007F01
+:10062000C8140013C8180014CD41216B96C0FE7683
+:10063000CD81216C80000182C8300018C80C0008F0
+:1006400098C00000C80C00087C4100009500000222
+:10065000000000007C414000C8200009CC4000435D
+:10066000CE01A1F4CC400044C00E80007C4240008A
+:100670007C4280002AAC001F96C0FE63C035F000AB
+:10068000CE4003E232780003267C00087FF7C00BDF
+:100690007FFBC00C2A780018CFC003E3CF8003E4AF
+:1006A00026B000027F3F0000CF0003E58000031F5B
+:1006B0007C80C0007C40C00028D000083110000FB2
+:1006C0009500000F2528000106A801B39E800000B8
+:1006D00000000000800001D4C0120800800001E288
+:1006E000C814000F800001E9C8140010800001F058
+:1006F000CCC1A2A4800001F9C814001130D0003F81
+:100700000D2800159A8000120D28001E9A80001EE8
+:100710000D2800209A8000230D24000F0D280010C2
+:100720007E6A800C9A8000260D2000040D2400149F
+:100730000D2800287E62400C7EA6800C9A80002A3C
+:10074000C814001180000001CCC1A2A4C01208008E
+:100750007C4140007D0CC00CC012000829580003E9
+:10076000295C000C7C4200007DD1C00B26200014C7
+:100770007E1E400C7E4E800CCE81A2A48000000123
+:10078000CD81A1FEC814000F0410210E9540000079
+:10079000C814000FD051000080000001CCC1A2A4F9
+:1007A000C81400100410210895400000C81400105F
+:1007B000D051000080000001CCC1A2A4CCC1A2A4F1
+:1007C00004100001CD000019840003A2CC00007FBA
+:1007D000C810001999000000C8100019800000021C
+:1007E0007C40800004102100095400019540FFFF67
+:1007F000C8140011D05100008000039FCCC1A2A4F6
+:100800007C40C000CC40000D94C0FDFFCC40000EE9
+:100810007C4100009500000508CC0001C8140005CB
+:10082000994000140000000098C0FFFB7C410000CC
+:10083000800000027D008000C81400057C40C000DC
+:100840009940000CC818000C7C4100009580FDEE1A
+:10085000C820000EC81C000D662000207E1E002C43
+:10086000252400027E62402080000001CCE60000CA
+:100870007C410000CC00006CCC00006DC818001F4B
+:10088000C81C001E659800207DD9C02C7CD4C00CEB
+:10089000CCDE000045DC0004C82800179680000F5D
+:1008A000C00E0001286800082AAC001632A800FF1C
+:1008B0000EB000497F2F000B9700000600000000DB
+:1008C000C81400057C40C000800002237C41000069
+:1008D00080000226D040007F8400023BCC00004113
+:1008E000CCC1304A94000000C83C001A043C00050A
+:1008F000CFC1A2A4C0361F90C0387FFF7C03C010B8
+:100900007F7B400CCF41217CCFC1217DCC01217E5A
+:10091000C03A00040434217F7F7B400CCC350000BA
+:10092000C83C00042BFC001F0438002097C00005C1
+:10093000CC0000629B8000000BB8000180000247E1
+:10094000CC000071CC01A1F404380016C0360002BE
+:10095000CF81A2A488000000CF4120107C40C000BD
+:1009600028D0001C9500000504D40001CD4000658E
+:1009700080000001CD4000680954000280000001A1
+:10098000CD4000668400026CC81803EA7C40C000B9
+:100990009980FD9DC814001608D000019940002BD5
+:1009A000CD0000687C408000A0000000CC80006288
+:1009B000043C0005CFC1A2A4CC01A1F4840003A291
+:1009C000CC00004688000000CC00007F8400027E3E
+:1009D000C81803EA7C40C0009980FD8BC81400163B
+:1009E00008D0000199400019CD0000687C408000CB
+:1009F000A0000000CC800062043C0022CFC1A2A471
+:100A0000840003A2CC00004788000000CC00007FD7
+:100A1000C81000169900000DCC400067800000024D
+:100A20007C408000C81803EA9980FD777C40C000B4
+:100A300094C00003C810001699000004CCC00068E0
+:100A4000800000027C4080008400023BC0148000D3
+:100A5000CC000041CD41304AC01480009900000014
+:100A6000C8100016800000027C408000C012000107
+:100A70007C51400C80000001D05500007C40C0003B
+:100A80007C4100007C4140007C418000291C001F0B
+:100A9000CCC0004ACD00004B95C00003C01C8000B4
+:100AA000CDC12010DD830000055C2000CC00006279
+:100AB00080000001D81F41007C40C0007C41000044
+:100AC0007C4140007C418000CCC0004CCD00004DFA
+:100AD000DD830000055CA00080000001D81F4100FC
+:100AE0007C40C0007C4100007C4140007C41800093
+:100AF000CCC0004ECD00004FDD830000055CC0007F
+:100B000080000001D81F41007C40C0007C410000F3
+:100B10007C4140007C418000CCC00050CD000051A1
+:100B2000DD830000055CF8E080000001D81F410073
+:100B30007C40C0007C4100007C4140007C41800042
+:100B4000CCC00052CD000053DD830000055CF8806E
+:100B500080000001D81F41007C40C0007C410000A3
+:100B60007C4140007C418000CCC00054CD00005549
+:100B7000DD830000055CE00080000001D81F41001B
+:100B80007C40C0007C4100007C4140007C418000F2
+:100B9000CCC00056CD000057DD830000055CF0009E
+:100BA00080000001D81F41007C40C0007C41000053
+:100BB0007C4140007C418000CCC00058CD000059F1
+:100BC000DD830000055CF3FC80000001D81F4100BC
+:100BD000D04320007C408000A0000000CC80006258
+:100BE000D043A0007C408000A0000000CC800062C8
+:100BF000D043C0007C408000A0000000CC80006298
+:100C0000D043F8E07C408000A0000000CC8000626F
+:100C1000D043F8807C408000A0000000CC800062BF
+:100C2000D043E0007C408000A0000000CC80006247
+:100C3000D043F0007C408000A0000000CC80006227
+:100C4000D043F3FC7C408000A0000000CC80006218
+:100C5000C81403E0CC430000CC430000CC430000A8
+:100C60007D45C000CDC30000D04300007C40800023
+:100C7000A0000000CC8000627C40C000C81003E2ED
+:100C8000C81403E5C81803E3C81C03E4CD81216937
+:100C9000CDC1216ACCC1216BCC01216C04200004A0
+:100CA0007DA180007D9640029640FCD7CD8003E375
+:100CB00031280003C02DF000251800087DAD800B01
+:100CC0007DA9800C80000001CD8003E3308CFFFF04
+:100CD000D04D00007C408000A0000000CC8000626D
+:100CE0007C40C0007C4100002924001832640001CF
+:100CF0009A400013C8140020155800029580FFFF89
+:100D0000C8140020CC00006ECCC12180CD01218D03
+:100D1000CC4121812914001F34588000CD81218CC1
+:100D20009540FCB9CC412182C81400209940FFFFB6
+:100D3000C8140020800000027C4080007C414000FC
+:100D40007C4180007C41C00065B400207F57402C6E
+:100D5000D437810047740004D437810047740004FD
+:100D6000D43781004774000409DC0004D4378100C3
+:100D700099C0FFF8477400042924001FC0380019E7
+:100D80009640FCA1C03E0004CF8121F837E021F954
+:100D9000CC210000C82000042A20001832200001C5
+:100DA0009A00FFFBCF8121F8800000027C40800088
+:100DB0007C40C00028D0001831100001C01600800F
+:100DC00095000003C02A00047CD4C00CCCC1217C57
+:100DD000CC41217DCC41217E7C4180001DB00003AF
+:100DE00036A0217F9B000003419C0005041C0040AD
+:100DF00099C0000009DC0001CC210000C8240004D7
+:100E00002A6C001F419C00059AC0FFFACC8000624A
+:100E1000800000027C4080007C40C00004D403E6D7
+:100E200080000001CC5400008000039FCC4003EA06
+:100E3000C01C8000044CA000CDC120107C410000EB
+:100E4000C814000904180000041C0008CD800071BB
+:100E500009DC000105980001CD0D000099C0FFFCE0
+:100E6000CC8000628000039FCD400071C00E010065
+:100E7000CC000041CCC1304AC83C007FCC00007F90
+:100E800080000001CC00007FCC00007F88000000C3
+:100E9000CC00007F00000000000000000000000007
+:100EA0000000000000000000000000000000000042
+:100EB0000000000000000000000000000000000032
+:100EC0000000000000000000000000000000000022
+:100ED0000000000000000000000000000000000012
+:100EE0000000000000000000000000000000000002
+:100EF00000000000000000000000000000000000F2
+:100F000000000000000000000000000000000000E1
+:100F100000000000000000000000000000000000D1
+:100F200000000000000000000000000000000000C1
+:100F300000000000000000000000000000000000B1
+:100F400000000000000000000000000000000000A1
+:100F50000000000000000000000000000000000091
+:100F60000000000000000000000000000000000081
+:100F70000000000000000000000000000000000071
+:100F80000000000000000000000000000000000061
+:100F90000000000000000000000000000000000051
+:100FA0000000000000000000000000000000000041
+:100FB0000000000000000000000000000000000031
+:100FC0000000000000000000000000000000000021
+:100FD0000000000000000000000000000000000011
+:100FE0000000000000000000000000000000000001
+:100FF00000000000000000000000000000000000F1
+:1010000000000000000000000000000000000000E0
+:1010100000000000000000000000000000000000D0
+:1010200000000000000000000000000000000000C0
+:1010300000000000000000000000000000000000B0
+:1010400000000000000000000000000000000000A0
+:101050000000000000000000000000000000000090
+:101060000000000000000000000000000000000080
+:101070000000000000000000000000000000000070
+:101080000000000000000000000000000000000060
+:101090000000000000000000000000000000000050
+:1010A0000000000000000000000000000000000040
+:1010B0000000000000000000000000000000000030
+:1010C0000000000000000000000000000000000020
+:1010D0000000000000000000000000000000000010
+:1010E0000000000000000000000000000000000000
+:1010F00000000000000000000000000000000000F0
+:1011000000000000000000000000000000000000DF
+:1011100000000000000000000000000000000000CF
+:1011200000000000000000000000000000000000BF
+:1011300000000000000000000000000000000000AF
+:10114000000000000000000000000000000000009F
+:10115000000000000000000000000000000000008F
+:10116000000000000000000000000000000000007F
+:10117000000000000000000000000000000000006F
+:10118000000000000000000000000000000000005F
+:10119000000000000000000000000000000000004F
+:1011A000000000000000000000000000000000003F
+:1011B000000000000000000000000000000000002F
+:1011C000000000000000000000000000000000001F
+:1011D000000000000000000000000000000000000F
+:1011E00000000000000000000000000000000000FF
+:1011F00000000000000000000000000000000000EF
+:1012000000000000000000000000000000000000DE
+:1012100000000000000000000000000000000000CE
+:1012200000000000000000000000000000000000BE
+:1012300000000000000000000000000000000000AE
+:10124000000000000000000000000000000000009E
+:10125000000000000000000000000000000000008E
+:10126000000000000000000000000000000000007E
+:10127000000000000000000000000000000000006E
+:10128000000000000000000000000000000000005E
+:10129000000000000000000000000000000000004E
+:1012A000000000000000000000000000000000003E
+:1012B000000000000000000000000000000000002E
+:1012C000000000000000000000000000000000001E
+:1012D000000000000000000000000000000000000E
+:1012E00000000000000000000000000000000000FE
+:1012F00000000000000000000000000000000000EE
+:1013000000000000000000000000000000000000DD
+:1013100000000000000000000000000000000000CD
+:1013200000000000000000000000000000000000BD
+:1013300000000000000000000000000000000000AD
+:10134000000000000000000000000000000000009D
+:10135000000000000000000000000000000000008D
+:10136000000000000000000000000000000000007D
+:10137000000000000000000000000000000000006D
+:10138000000000000000000000000000000000005D
+:10139000000000000000000000000000000000004D
+:1013A000000000000000000000000000000000003D
+:1013B000000000000000000000000000000000002D
+:1013C000000000000000000000000000000000001D
+:1013D000000000000000000000000000000000000D
+:1013E00000000000000000000000000000000000FD
+:1013F00000000000000000000000000000000000ED
+:10140000000103330010000400170006002100084B
+:10141000002700280028002300290029002A002690
+:10142000002B0029002D0038002E003F002F004A1D
+:101430000034004C00360030003900AF003A00D0D4
+:10144000003B00E5003C00FD003D016C003F00ADAD
+:10145000004103380043036C0044018F004500FD48
+:10146000004601AD004701AD004802000049020EF0
+:10147000004A0257004B028400520261005302737B
+:10148000005402890057029B0060029F006102AE77
+:10149000006202B8006302C2006402CC006502D69A
+:1014A000006602E0006702EA006802F4006902F8E0
+:1014B000006A02FC006B0300006C0304006D03086B
+:1014C000006E030C006F031000700314007203869B
+:1014D0000074038C0079038A007C031E000F039BB9
+:1014E000000F039B000F039B000F039B000F039B48
+:1014F000000F039B000F039B000F039B000F039B38
+:10150000000F039B000F039B000F039B000F039B27
+:10151000000F039B000F039B000F039B000F039B17
+:10152000000F039B000F039B000F039B000F039B07
+:10153000000F039B000F039B000F039B000F039BF7
+:00000001FF
diff --git a/firmware/radeon/RV770_pfp.bin.ihex b/firmware/radeon/RV770_pfp.bin.ihex
new file mode 100644 (file)
index 0000000..a2d1619
--- /dev/null
@@ -0,0 +1,213 @@
+:100000007C408000A00000007E82800B8000000009
+:10001000DC030000CC800040D04000407C408000E9
+:10002000A00000007E82800BC818000E31980001ED
+:100030007C424000958002527C428000C81C001C1B
+:10004000C037C0007C40C0007C4100007CB4800B05
+:10005000C036000399C00000C81C001C7CB4800C92
+:1000600024D400027D654000CD400043CE80004393
+:10007000CD000043CC800040CE400040CE80004008
+:10008000CCC00040DC3A00009780FFDECD0000408D
+:100090007C40C000800000187C410000D400034078
+:1000A000D4000FC0D4000FA2C818000E8000000CAE
+:1000B00031980002D40003C0D4000FC0D4000FA2B6
+:1000C000C818000E288C000830CC000F3410000136
+:1000D0007D0D00088000000C7D91800BCC800040DD
+:1000E000D04000407C408000A00000007E82800B59
+:1000F000D4000340D4000FC0D4000FA2CC80004035
+:10010000D04000407C408000A00000007E82800B38
+:10011000D40003C0D4000FC0D4000FA2CC80004094
+:10012000D04000407C408000A00000007E82800B18
+:10013000CC4003F980000261CC4003F8C82003F8EA
+:10014000C81C03F9C81803FBC037FFFF7C414000FF
+:10015000CF41A29E662000207DE1C02C7D58C008C2
+:100160007CDCC02068D00020C0360003CC000054E6
+:100170007CB4800C8000006ACC8000407C41800010
+:10018000CD81A29ECC800040CD80004080000068E0
+:10019000CC000054C019FFFFCC800040CD81A29E4E
+:1001A0007C40C0007C4100007C414000CCC1A1FAF1
+:1001B000CD01A1F9CD41A29DCCC00040CD000040B1
+:1001C000CD400040CC4000407C408000A0000000BA
+:1001D0007E82800BCC000054CC8000407C40C0006C
+:1001E0007C4100007C414000CCC1A1FACD01A1F9C5
+:1001F000CD41A29DCCC00040CD000040CD4000408C
+:10020000D04000407C408000A00000007E82800B37
+:100210007C40C00030D00001CCC1A29F95000003FB
+:100220000414000104140002CD4003FBCC80004004
+:1002300080000000CCC000407C40C000CC8000406A
+:10024000CCC1A2A280000000CCC000407C40C00015
+:1002500028D4001FCC800040954000037C41000062
+:10026000CCC000572918001FCCC000409580000367
+:10027000CD000040CD00005880000261CC00007F1E
+:10028000C8200017C83000229A0000060E2800017E
+:10029000C824001E0A640001D4001240CE40004071
+:1002A000C036C0009680000737747900041C000136
+:1002B000CF400040CDC00040CF0003FA7C030000D7
+:1002C000CA0C00107C41000094C000047C41400036
+:1002D000D42002C4CDE000449B00000B7C41800090
+:1002E000CC00004BCDA00049CD200041CD600041A5
+:1002F000CDA0004106200001CE0000568000026122
+:10030000CC00007FC8280020C82C0021CC0000634E
+:100310007EEA4001657400207F53402C269C000239
+:100320007DF5C02069F80020CE80004BCE600049EA
+:10033000CDE00041CFA00041CE600041271C00026B
+:100340007DF5C02069F800207DB24001CF00004B50
+:10035000CE600049CDE00041CFA00041800000BD4B
+:10036000CE600041C8200017C83000229A00000665
+:100370000E280001C824001E0A640001D4001240A7
+:10038000CE400040CA0C00107C41000094C0000B1D
+:10039000C036C0009680000737747900041C000145
+:1003A000CF400040CDC00040CF0003FA7C030000E6
+:1003B000800000B67C414000CC000048800000EF87
+:1003C00000000000C8200017C81C00230E240002F3
+:1003D00099C000157C4180000A200001CE00005623
+:1003E000D4000440CC000040C036C000CA14001342
+:1003F0009640000737747900CF400040CC000040A1
+:10040000C83003FA80000104CF000022CC00002293
+:100410009540015DCC00007FCCA00046800000002C
+:10042000CC20004680000261CC000064C820001788
+:10043000C810001F9600000509100001D4000440F8
+:10044000CD000040CD000022CC800040D0400040D4
+:10045000C80C002594C0FEEBC8100008CD00004079
+:10046000D4000FC080000000D4000FA27C40C00068
+:100470007C410000CCC003FDCD0003FCCCC0004299
+:10048000CD0000422914001F2918001031980007E0
+:100490003B5C00017D76000B998000057D5E400B82
+:1004A000CC00004280000261CC00004D2998000180
+:1004B000292C00089980003D32EC000196000004D0
+:1004C0002930000C80000261CC00004204140010AE
+:1004D000CD40004233300001342800018400015E29
+:1004E000C81400039B40001B0438000C8400015E0C
+:1004F000C81400039B400017043800088400015E04
+:10050000C81400039B400013043800048400015EFB
+:10051000C81400039B400015C80C03FD9A80000915
+:10052000C81003FC9B000118CC00004D04140010FF
+:10053000CCC00042CD00004280000136CD400042D8
+:1005400096C00111CC00004D80000261CC00004E2D
+:100550009AC00003CC00004DCC00004EDF830000A9
+:1005600080000000D80301FF9AC00107CC00004DB5
+:1005700080000261CC00004EC8180003C81C0003B4
+:10058000C82000037D5D40037DA1C0037D5D400C5C
+:100590002A10001F299C001F7D1D000B7D17400B9A
+:1005A000880000007E92800B96400004CC00004E34
+:1005B00080000261CC00004204380008CF80004275
+:1005C000C8080003C80C0003C8100003C8140003C7
+:1005D000C8180003C81C0003C8240003C82800036F
+:1005E00029FC001F2AB0001F7FF3C00B28F0001F5A
+:1005F0007FF3C00B2970001F7FF3C00B7D88800143
+:100600007DCCC0017E5100017E9540017C9080022E
+:100610007CD4C0027CBC800B9AC000037C8F400B52
+:1006200038B400019B4000D8CC00004D9BC000D6E0
+:10063000CC00004EC80C03FDC81003FCCCC0004227
+:100640008000016FCD000042D4000340D4000FC0F1
+:10065000D4000FA2CC800040CC400040CC400040F1
+:10066000CC4000407C40C000CCC00040CCC0000D5D
+:1006700080000000D04000407C40C0007C41000071
+:10068000651400207D4D402C245800027D598020A7
+:100690007C41C000CD80004269980020CD8000429E
+:1006A000CDC00042C023C00005E400027CA0800B46
+:1006B000266400107CA4800CCC800040CDC000409B
+:1006C000CCC0004095C0000ECD00004009DC000108
+:1006D000C828000396800008CE800040C834001D62
+:1006E00097400000C834001D26A80008840002645A
+:1006F000CC2B000099C0FFF709DC0001DC3A0000B8
+:10070000978000047C418000800001A325980002AE
+:10071000A00000007D808000C818001D7C40C00043
+:1007200064D0000895800000C818001DCC1300009C
+:10073000CC800040CCC0004080000000CC40004095
+:10074000C810001F7C40C000CC8000407CD1400C11
+:10075000CD4000400518000180000000CD8000223F
+:100760007C40C0006450002084000264CC00006122
+:100770007CD0C02CC8200017C8D6000099400008C3
+:100780007C438000DF830000CFA0004F8400026420
+:10079000CC00006280000000D040007F8000026139
+:1007A000CC00006284000264CC000061C820001705
+:1007B0007C40C000C036FF00C810000DC0303FFFB5
+:1007C0007CF5400B7D51800B7D81800F9980000866
+:1007D0007CF3800BDF830000CFA0004F8400026415
+:1007E000CC00006280000000D040007F80000261E9
+:1007F000CC000062840002647C40C00028DC000859
+:1008000095C0001930DC00107C41000099C0000444
+:100810006454002080000209C91D00007D15002CD1
+:10082000C91E00007C4200007C4240007C418000E8
+:100830007DE5C00B7DE280079A80000E41AC00058B
+:100840009AC000000AEC000130DC001099C00004DE
+:10085000000000008000020CC91D00008000020C96
+:10086000C91E0000CC800040CCC00040D0400040F9
+:10087000C80C002594C0FDE3C8100008CD0000405E
+:10088000D4000FC080000000D4000FA2D4000340A9
+:10089000D4000FC0D4000FA2CC800040D040004054
+:1008A0007C408000A00000007E82800BD40003C04A
+:1008B000D4000FC0D4000FA2CC800040D040004034
+:1008C0007C408000A00000007E82800B7C40C00045
+:1008D00030D000060D10000699000007C81400155E
+:1008E00099400005CC000052D4000340D4000FC052
+:1008F000D4000FA2CC800040CCC00040800000009B
+:10090000D04000407C40C000CC4D0000DC3A0000EC
+:100910009780FDBC04CC000180000243CC4D000058
+:100920007C40C0007C410000292400183264000192
+:100930009640000FCC8000407C4140007C4180000C
+:100940007C41C000CCC00043CD00004331DC7FFFC0
+:10095000CDC00043CCC00040CD000040CD400040A1
+:10096000CD80004080000000CDC00040CCC00040E1
+:10097000CD00004080000000D0400040800000001A
+:10098000D040007FCC00007F80000000CC00007FC2
+:10099000CC00007F88000000CC00007F0000000039
+:1009A0000000000000000000000000000000000047
+:1009B0000000000000000000000000000000000037
+:1009C0000000000000000000000000000000000027
+:1009D0000000000000000000000000000000000017
+:1009E0000000000000000000000000000000000007
+:1009F00000000000000000000000000000000000F7
+:100A000000000000000000000000000000000000E6
+:100A100000000000000000000000000000000000D6
+:100A200000000000000000000000000000000000C6
+:100A300000000000000000000000000000000000B6
+:100A400000000000000000000000000000000000A6
+:100A50000000000000000000000000000000000096
+:100A60000000000000000000000000000000000086
+:100A70000000000000000000000000000000000076
+:100A80000000000000000000000000000000000066
+:100A90000000000000000000000000000000000056
+:100AA0000000000000000000000000000000000046
+:100AB0000000000000000000000000000000000036
+:100AC0000000000000000000000000000000000026
+:100AD0000000000000000000000000000000000016
+:100AE0000000000000000000000000000000000006
+:100AF00000000000000000000000000000000000F6
+:100B000000000000000000000000000000000000E5
+:100B100000000000000000000000000000000000D5
+:100B200000000000000000000000000000000000C5
+:100B300000000000000000000000000000000000B5
+:100B400000000000000000000000000000000000A5
+:100B50000000000000000000000000000000000095
+:100B60000000000000000000000000000000000085
+:100B70000000000000000000000000000000000075
+:100B80000000000000000000000000000000000065
+:100B90000000000000000000000000000000000055
+:100BA0000000000000000000000000000000000045
+:100BB0000000000000000000000000000000000035
+:100BC0000000000000000000000000000000000025
+:100BD0000000000000000000000000000000000015
+:100BE0000000000000000000000000000000000005
+:100BF00000000000000000000000000000000000F5
+:100C0000000302230004022B000500A000020003E1
+:100C10000006003C0007002700080192000900447C
+:100C2000000A002D0010025F001700F1002201D819
+:100C3000002301E90026004C0027005F0020011B73
+:100C4000002800930029004F002A0084002B006533
+:100C5000002F008E003200D90034023300360075B8
+:100C60000039010B003C01FD003F00A0004102489B
+:100C7000004401950048019E004901C6004A01D088
+:100C8000005502260056022E0060000A0061002A6C
+:100C90000062003000630030006400300065003006
+:100CA0000066003000670030006800370069003FD0
+:100CB000006A0047006B0047006C0047006D00476A
+:100CC000006E0047006F0047007000470073025F2E
+:100CD000007B024100000005000000050000000547
+:100CE00000000005000000050000000500000005F0
+:100CF00000000005000000050000000500000005E0
+:100D000000000005000000050000000500000005CF
+:100D100000000005000000050000000500000005BF
+:100D200000000005000000050000000500000005AF
+:100D3000000000050000000500000005000000059F
+:00000001FF
index 455aa20..d4bf8ca 100644 (file)
@@ -109,6 +109,7 @@ source "fs/sysfs/Kconfig"
 
 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
+       depends on SHMEM
        help
          Tmpfs is a file system which keeps all files in virtual memory.
 
index 3ff8bdd..0931bc1 100644 (file)
@@ -21,7 +21,7 @@ static void afs_fl_release_private(struct file_lock *fl);
 static struct workqueue_struct *afs_lock_manager;
 static DEFINE_MUTEX(afs_lock_manager_mutex);
 
-static struct file_lock_operations afs_lock_ops = {
+static const struct file_lock_operations afs_lock_ops = {
        .fl_copy_lock           = afs_fl_copy_lock,
        .fl_release_private     = afs_fl_release_private,
 };
index 8630615..852739d 100644 (file)
@@ -28,7 +28,7 @@ static int afs_proc_cells_show(struct seq_file *m, void *v);
 static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
                                    size_t size, loff_t *_pos);
 
-static struct seq_operations afs_proc_cells_ops = {
+static const struct seq_operations afs_proc_cells_ops = {
        .start  = afs_proc_cells_start,
        .next   = afs_proc_cells_next,
        .stop   = afs_proc_cells_stop,
@@ -70,7 +70,7 @@ static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
 static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v);
 static int afs_proc_cell_volumes_show(struct seq_file *m, void *v);
 
-static struct seq_operations afs_proc_cell_volumes_ops = {
+static const struct seq_operations afs_proc_cell_volumes_ops = {
        .start  = afs_proc_cell_volumes_start,
        .next   = afs_proc_cell_volumes_next,
        .stop   = afs_proc_cell_volumes_stop,
@@ -95,7 +95,7 @@ static void *afs_proc_cell_vlservers_next(struct seq_file *p, void *v,
 static void afs_proc_cell_vlservers_stop(struct seq_file *p, void *v);
 static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v);
 
-static struct seq_operations afs_proc_cell_vlservers_ops = {
+static const struct seq_operations afs_proc_cell_vlservers_ops = {
        .start  = afs_proc_cell_vlservers_start,
        .next   = afs_proc_cell_vlservers_next,
        .stop   = afs_proc_cell_vlservers_stop,
@@ -119,7 +119,7 @@ static void *afs_proc_cell_servers_next(struct seq_file *p, void *v,
 static void afs_proc_cell_servers_stop(struct seq_file *p, void *v);
 static int afs_proc_cell_servers_show(struct seq_file *m, void *v);
 
-static struct seq_operations afs_proc_cell_servers_ops = {
+static const struct seq_operations afs_proc_cell_servers_ops = {
        .start  = afs_proc_cell_servers_start,
        .next   = afs_proc_cell_servers_next,
        .stop   = afs_proc_cell_servers_stop,
index d065b2c..02a2c93 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -24,6 +24,7 @@
 #include <linux/file.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
+#include <linux/mmu_context.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/aio.h>
@@ -34,7 +35,6 @@
 
 #include <asm/kmap_types.h>
 #include <asm/uaccess.h>
-#include <asm/mmu_context.h>
 
 #if DEBUG > 1
 #define dprintk                printk
@@ -78,6 +78,7 @@ static int __init aio_setup(void)
 
        return 0;
 }
+__initcall(aio_setup);
 
 static void aio_free_ring(struct kioctx *ctx)
 {
@@ -380,6 +381,7 @@ ssize_t wait_on_sync_kiocb(struct kiocb *iocb)
        __set_current_state(TASK_RUNNING);
        return iocb->ki_user_data;
 }
+EXPORT_SYMBOL(wait_on_sync_kiocb);
 
 /* exit_aio: called when the last user of mm goes away.  At this point, 
  * there is no way for any new requests to be submited or any of the 
@@ -573,6 +575,7 @@ int aio_put_req(struct kiocb *req)
        spin_unlock_irq(&ctx->ctx_lock);
        return ret;
 }
+EXPORT_SYMBOL(aio_put_req);
 
 static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 {
@@ -594,51 +597,6 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
        return ret;
 }
 
-/*
- * use_mm
- *     Makes the calling kernel thread take on the specified
- *     mm context.
- *     Called by the retry thread execute retries within the
- *     iocb issuer's mm context, so that copy_from/to_user
- *     operations work seamlessly for aio.
- *     (Note: this routine is intended to be called only
- *     from a kernel thread context)
- */
-static void use_mm(struct mm_struct *mm)
-{
-       struct mm_struct *active_mm;
-       struct task_struct *tsk = current;
-
-       task_lock(tsk);
-       active_mm = tsk->active_mm;
-       atomic_inc(&mm->mm_count);
-       tsk->mm = mm;
-       tsk->active_mm = mm;
-       switch_mm(active_mm, mm, tsk);
-       task_unlock(tsk);
-
-       mmdrop(active_mm);
-}
-
-/*
- * unuse_mm
- *     Reverses the effect of use_mm, i.e. releases the
- *     specified mm context which was earlier taken on
- *     by the calling kernel thread
- *     (Note: this routine is intended to be called only
- *     from a kernel thread context)
- */
-static void unuse_mm(struct mm_struct *mm)
-{
-       struct task_struct *tsk = current;
-
-       task_lock(tsk);
-       tsk->mm = NULL;
-       /* active_mm is still 'mm' */
-       enter_lazy_tlb(mm, tsk);
-       task_unlock(tsk);
-}
-
 /*
  * Queue up a kiocb to be retried. Assumes that the kiocb
  * has already been marked as kicked, and places it on
@@ -1037,6 +995,7 @@ put_rq:
        spin_unlock_irqrestore(&ctx->ctx_lock, flags);
        return ret;
 }
+EXPORT_SYMBOL(aio_complete);
 
 /* aio_read_evt
  *     Pull an event off of the ioctx's event ring.  Returns the number of 
@@ -1825,9 +1784,3 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
        asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout);
        return ret;
 }
-
-__initcall(aio_setup);
-
-EXPORT_SYMBOL(aio_complete);
-EXPORT_SYMBOL(aio_put_req);
-EXPORT_SYMBOL(wait_on_sync_kiocb);
index 47d4a01..d11c51f 100644 (file)
@@ -77,28 +77,24 @@ static const struct address_space_operations anon_aops = {
  *
  * Creates a new file by hooking it on a single inode. This is useful for files
  * that do not need to have a full-fledged inode in order to operate correctly.
- * All the files created with anon_inode_getfd() will share a single inode,
+ * All the files created with anon_inode_getfile() will share a single inode,
  * hence saving memory and avoiding code duplication for the file/inode/dentry
- * setup.  Returns new descriptor or -error.
+ * setup.  Returns the newly created file* or an error pointer.
  */
-int anon_inode_getfd(const char *name, const struct file_operations *fops,
-                    void *priv, int flags)
+struct file *anon_inode_getfile(const char *name,
+                               const struct file_operations *fops,
+                               void *priv, int flags)
 {
        struct qstr this;
        struct dentry *dentry;
        struct file *file;
-       int error, fd;
+       int error;
 
        if (IS_ERR(anon_inode_inode))
-               return -ENODEV;
+               return ERR_PTR(-ENODEV);
 
        if (fops->owner && !try_module_get(fops->owner))
-               return -ENOENT;
-
-       error = get_unused_fd_flags(flags);
-       if (error < 0)
-               goto err_module;
-       fd = error;
+               return ERR_PTR(-ENOENT);
 
        /*
         * Link the inode to a directory entry by creating a unique name
@@ -110,7 +106,7 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops,
        this.hash = 0;
        dentry = d_alloc(anon_inode_mnt->mnt_sb->s_root, &this);
        if (!dentry)
-               goto err_put_unused_fd;
+               goto err_module;
 
        /*
         * We know the anon_inode inode count is always greater than zero,
@@ -136,16 +132,54 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops,
        file->f_version = 0;
        file->private_data = priv;
 
+       return file;
+
+err_dput:
+       dput(dentry);
+err_module:
+       module_put(fops->owner);
+       return ERR_PTR(error);
+}
+EXPORT_SYMBOL_GPL(anon_inode_getfile);
+
+/**
+ * anon_inode_getfd - creates a new file instance by hooking it up to an
+ *                    anonymous inode, and a dentry that describe the "class"
+ *                    of the file
+ *
+ * @name:    [in]    name of the "class" of the new file
+ * @fops:    [in]    file operations for the new file
+ * @priv:    [in]    private data for the new file (will be file's private_data)
+ * @flags:   [in]    flags
+ *
+ * Creates a new file by hooking it on a single inode. This is useful for files
+ * that do not need to have a full-fledged inode in order to operate correctly.
+ * All the files created with anon_inode_getfd() will share a single inode,
+ * hence saving memory and avoiding code duplication for the file/inode/dentry
+ * setup.  Returns new descriptor or an error code.
+ */
+int anon_inode_getfd(const char *name, const struct file_operations *fops,
+                    void *priv, int flags)
+{
+       int error, fd;
+       struct file *file;
+
+       error = get_unused_fd_flags(flags);
+       if (error < 0)
+               return error;
+       fd = error;
+
+       file = anon_inode_getfile(name, fops, priv, flags);
+       if (IS_ERR(file)) {
+               error = PTR_ERR(file);
+               goto err_put_unused_fd;
+       }
        fd_install(fd, file);
 
        return fd;
 
-err_dput:
-       dput(dentry);
 err_put_unused_fd:
        put_unused_fd(fd);
-err_module:
-       module_put(fops->owner);
        return error;
 }
 EXPORT_SYMBOL_GPL(anon_inode_getfd);
index 2316e94..e947915 100644 (file)
@@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                        DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name));
                        continue;
                }
-               while (d_mountpoint(path.dentry) && follow_down(&path));
+               while (d_mountpoint(path.dentry) && follow_down(&path))
                        ;
                umount_ok = may_umount(path.mnt);
                path_put(&path);
index 615d549..dd376c1 100644 (file)
@@ -842,7 +842,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_magic = BEFS_SUPER_MAGIC;
        /* Set real blocksize of fs */
        sb_set_blocksize(sb, (ulong) befs_sb->block_size);
-       sb->s_op = (struct super_operations *) &befs_sops;
+       sb->s_op = &befs_sops;
        root = befs_iget(sb, iaddr2blockno(sb, &(befs_sb->root_dir)));
        if (IS_ERR(root)) {
                ret = PTR_ERR(root);
index 7c1e65d..442d94f 100644 (file)
@@ -1280,9 +1280,6 @@ static int writenote(struct memelfnote *men, struct file *file,
 #define DUMP_WRITE(addr, nr)   \
        if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
                goto end_coredump;
-#define DUMP_SEEK(off) \
-       if (!dump_seek(file, (off))) \
-               goto end_coredump;
 
 static void fill_elf_header(struct elfhdr *elf, int segs,
                            u16 machine, u32 flags, u8 osabi)
@@ -2016,7 +2013,8 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
                goto end_coredump;
 
        /* Align to page */
-       DUMP_SEEK(dataoff - foffset);
+       if (!dump_seek(file, dataoff - foffset))
+               goto end_coredump;
 
        for (vma = first_vma(current, gate_vma); vma != NULL;
                        vma = next_vma(vma, gate_vma)) {
@@ -2027,33 +2025,19 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
 
                for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
                        struct page *page;
-                       struct vm_area_struct *tmp_vma;
-
-                       if (get_user_pages(current, current->mm, addr, 1, 0, 1,
-                                               &page, &tmp_vma) <= 0) {
-                               DUMP_SEEK(PAGE_SIZE);
-                       } else {
-                               if (page == ZERO_PAGE(0)) {
-                                       if (!dump_seek(file, PAGE_SIZE)) {
-                                               page_cache_release(page);
-                                               goto end_coredump;
-                                       }
-                               } else {
-                                       void *kaddr;
-                                       flush_cache_page(tmp_vma, addr,
-                                                        page_to_pfn(page));
-                                       kaddr = kmap(page);
-                                       if ((size += PAGE_SIZE) > limit ||
-                                           !dump_write(file, kaddr,
-                                           PAGE_SIZE)) {
-                                               kunmap(page);
-                                               page_cache_release(page);
-                                               goto end_coredump;
-                                       }
-                                       kunmap(page);
-                               }
+                       int stop;
+
+                       page = get_dump_page(addr);
+                       if (page) {
+                               void *kaddr = kmap(page);
+                               stop = ((size += PAGE_SIZE) > limit) ||
+                                       !dump_write(file, kaddr, PAGE_SIZE);
+                               kunmap(page);
                                page_cache_release(page);
-                       }
+                       } else
+                               stop = !dump_seek(file, PAGE_SIZE);
+                       if (stop)
+                               goto end_coredump;
                }
        }
 
index 20fbece..7628547 100644 (file)
@@ -1325,9 +1325,6 @@ static int writenote(struct memelfnote *men, struct file *file)
 #define DUMP_WRITE(addr, nr)   \
        if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
                goto end_coredump;
-#define DUMP_SEEK(off) \
-       if (!dump_seek(file, (off))) \
-               goto end_coredump;
 
 static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)
 {
@@ -1518,6 +1515,7 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                           unsigned long *limit, unsigned long mm_flags)
 {
        struct vm_area_struct *vma;
+       int err = 0;
 
        for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
                unsigned long addr;
@@ -1525,43 +1523,26 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                if (!maydump(vma, mm_flags))
                        continue;
 
-               for (addr = vma->vm_start;
-                    addr < vma->vm_end;
-                    addr += PAGE_SIZE
-                    ) {
-                       struct vm_area_struct *vma;
-                       struct page *page;
-
-                       if (get_user_pages(current, current->mm, addr, 1, 0, 1,
-                                          &page, &vma) <= 0) {
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else if (page == ZERO_PAGE(0)) {
-                               page_cache_release(page);
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else {
-                               void *kaddr;
-
-                               flush_cache_page(vma, addr, page_to_pfn(page));
-                               kaddr = kmap(page);
-                               if ((*size += PAGE_SIZE) > *limit ||
-                                   !dump_write(file, kaddr, PAGE_SIZE)
-                                   ) {
-                                       kunmap(page);
-                                       page_cache_release(page);
-                                       return -EIO;
-                               }
+               for (addr = vma->vm_start; addr < vma->vm_end;
+                                                       addr += PAGE_SIZE) {
+                       struct page *page = get_dump_page(addr);
+                       if (page) {
+                               void *kaddr = kmap(page);
+                               *size += PAGE_SIZE;
+                               if (*size > *limit)
+                                       err = -EFBIG;
+                               else if (!dump_write(file, kaddr, PAGE_SIZE))
+                                       err = -EIO;
                                kunmap(page);
                                page_cache_release(page);
-                       }
+                       } else if (!dump_seek(file, file->f_pos + PAGE_SIZE))
+                               err = -EFBIG;
+                       if (err)
+                               goto out;
                }
        }
-
-       return 0;
-
-end_coredump:
-       return -EFBIG;
+out:
+       return err;
 }
 #endif
 
@@ -1802,7 +1783,8 @@ static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,
                                goto end_coredump;
        }
 
-       DUMP_SEEK(dataoff);
+       if (!dump_seek(file, dataoff))
+               goto end_coredump;
 
        if (elf_fdpic_dump_segments(file, &size, &limit, mm_flags) < 0)
                goto end_coredump;
index 71e7e03..5d1ed50 100644 (file)
@@ -1114,7 +1114,7 @@ EXPORT_SYMBOL(revalidate_disk);
 int check_disk_change(struct block_device *bdev)
 {
        struct gendisk *disk = bdev->bd_disk;
-       struct block_device_operations * bdops = disk->fops;
+       const struct block_device_operations *bdops = disk->fops;
 
        if (!bdops->media_changed)
                return 0;
index 8b81927..6c41731 100644 (file)
@@ -772,7 +772,7 @@ static void btree_invalidatepage(struct page *page, unsigned long offset)
        }
 }
 
-static struct address_space_operations btree_aops = {
+static const struct address_space_operations btree_aops = {
        .readpage       = btree_readpage,
        .writepage      = btree_writepage,
        .writepages     = btree_writepages,
index 59cba18..9096fd0 100644 (file)
@@ -55,13 +55,13 @@ struct btrfs_iget_args {
        struct btrfs_root *root;
 };
 
-static struct inode_operations btrfs_dir_inode_operations;
-static struct inode_operations btrfs_symlink_inode_operations;
-static struct inode_operations btrfs_dir_ro_inode_operations;
-static struct inode_operations btrfs_special_inode_operations;
-static struct inode_operations btrfs_file_inode_operations;
-static struct address_space_operations btrfs_aops;
-static struct address_space_operations btrfs_symlink_aops;
+static const struct inode_operations btrfs_dir_inode_operations;
+static const struct inode_operations btrfs_symlink_inode_operations;
+static const struct inode_operations btrfs_dir_ro_inode_operations;
+static const struct inode_operations btrfs_special_inode_operations;
+static const struct inode_operations btrfs_file_inode_operations;
+static const struct address_space_operations btrfs_aops;
+static const struct address_space_operations btrfs_symlink_aops;
 static struct file_operations btrfs_dir_file_operations;
 static struct extent_io_ops btrfs_extent_io_ops;
 
@@ -5201,7 +5201,7 @@ static int btrfs_permission(struct inode *inode, int mask)
        return generic_permission(inode, mask, btrfs_check_acl);
 }
 
-static struct inode_operations btrfs_dir_inode_operations = {
+static const struct inode_operations btrfs_dir_inode_operations = {
        .getattr        = btrfs_getattr,
        .lookup         = btrfs_lookup,
        .create         = btrfs_create,
@@ -5219,7 +5219,7 @@ static struct inode_operations btrfs_dir_inode_operations = {
        .removexattr    = btrfs_removexattr,
        .permission     = btrfs_permission,
 };
-static struct inode_operations btrfs_dir_ro_inode_operations = {
+static const struct inode_operations btrfs_dir_ro_inode_operations = {
        .lookup         = btrfs_lookup,
        .permission     = btrfs_permission,
 };
@@ -5259,7 +5259,7 @@ static struct extent_io_ops btrfs_extent_io_ops = {
  *
  * For now we're avoiding this by dropping bmap.
  */
-static struct address_space_operations btrfs_aops = {
+static const struct address_space_operations btrfs_aops = {
        .readpage       = btrfs_readpage,
        .writepage      = btrfs_writepage,
        .writepages     = btrfs_writepages,
@@ -5271,14 +5271,14 @@ static struct address_space_operations btrfs_aops = {
        .set_page_dirty = btrfs_set_page_dirty,
 };
 
-static struct address_space_operations btrfs_symlink_aops = {
+static const struct address_space_operations btrfs_symlink_aops = {
        .readpage       = btrfs_readpage,
        .writepage      = btrfs_writepage,
        .invalidatepage = btrfs_invalidatepage,
        .releasepage    = btrfs_releasepage,
 };
 
-static struct inode_operations btrfs_file_inode_operations = {
+static const struct inode_operations btrfs_file_inode_operations = {
        .truncate       = btrfs_truncate,
        .getattr        = btrfs_getattr,
        .setattr        = btrfs_setattr,
@@ -5290,7 +5290,7 @@ static struct inode_operations btrfs_file_inode_operations = {
        .fallocate      = btrfs_fallocate,
        .fiemap         = btrfs_fiemap,
 };
-static struct inode_operations btrfs_special_inode_operations = {
+static const struct inode_operations btrfs_special_inode_operations = {
        .getattr        = btrfs_getattr,
        .setattr        = btrfs_setattr,
        .permission     = btrfs_permission,
@@ -5299,7 +5299,7 @@ static struct inode_operations btrfs_special_inode_operations = {
        .listxattr      = btrfs_listxattr,
        .removexattr    = btrfs_removexattr,
 };
-static struct inode_operations btrfs_symlink_inode_operations = {
+static const struct inode_operations btrfs_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = page_follow_link_light,
        .put_link       = page_put_link,
index 6d6d06c..2db17cd 100644 (file)
@@ -51,7 +51,7 @@
 #include "export.h"
 #include "compression.h"
 
-static struct super_operations btrfs_super_ops;
+static const struct super_operations btrfs_super_ops;
 
 static void btrfs_put_super(struct super_block *sb)
 {
@@ -675,7 +675,7 @@ static int btrfs_unfreeze(struct super_block *sb)
        return 0;
 }
 
-static struct super_operations btrfs_super_ops = {
+static const struct super_operations btrfs_super_ops = {
        .delete_inode   = btrfs_delete_inode,
        .put_super      = btrfs_put_super,
        .sync_fs        = btrfs_sync_fs,
index d91b0de..30c0d45 100644 (file)
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                                                                extent);
                                cs = btrfs_file_extent_offset(src, extent);
                                cl = btrfs_file_extent_num_bytes(src,
-                                                               extent);;
+                                                               extent);
                                if (btrfs_file_extent_compression(src,
                                                                  extent)) {
                                        cs = 0;
index 90a9886..209f7f1 100644 (file)
@@ -52,6 +52,7 @@ init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private)
        bh->b_end_io = handler;
        bh->b_private = private;
 }
+EXPORT_SYMBOL(init_buffer);
 
 static int sync_buffer(void *word)
 {
@@ -80,6 +81,7 @@ void unlock_buffer(struct buffer_head *bh)
        smp_mb__after_clear_bit();
        wake_up_bit(&bh->b_state, BH_Lock);
 }
+EXPORT_SYMBOL(unlock_buffer);
 
 /*
  * Block until a buffer comes unlocked.  This doesn't stop it
@@ -90,6 +92,7 @@ void __wait_on_buffer(struct buffer_head * bh)
 {
        wait_on_bit(&bh->b_state, BH_Lock, sync_buffer, TASK_UNINTERRUPTIBLE);
 }
+EXPORT_SYMBOL(__wait_on_buffer);
 
 static void
 __clear_page_buffers(struct page *page)
@@ -144,6 +147,7 @@ void end_buffer_read_sync(struct buffer_head *bh, int uptodate)
        __end_buffer_read_notouch(bh, uptodate);
        put_bh(bh);
 }
+EXPORT_SYMBOL(end_buffer_read_sync);
 
 void end_buffer_write_sync(struct buffer_head *bh, int uptodate)
 {
@@ -164,6 +168,7 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate)
        unlock_buffer(bh);
        put_bh(bh);
 }
+EXPORT_SYMBOL(end_buffer_write_sync);
 
 /*
  * Various filesystems appear to want __find_get_block to be non-blocking.
@@ -272,6 +277,7 @@ void invalidate_bdev(struct block_device *bdev)
        invalidate_bh_lrus();
        invalidate_mapping_pages(mapping, 0, -1);
 }
+EXPORT_SYMBOL(invalidate_bdev);
 
 /*
  * Kick pdflush then try to free up some ZONE_NORMAL memory.
@@ -410,6 +416,7 @@ still_busy:
        local_irq_restore(flags);
        return;
 }
+EXPORT_SYMBOL(end_buffer_async_write);
 
 /*
  * If a page's buffers are under async readin (end_buffer_async_read
@@ -438,8 +445,8 @@ static void mark_buffer_async_read(struct buffer_head *bh)
        set_buffer_async_read(bh);
 }
 
-void mark_buffer_async_write_endio(struct buffer_head *bh,
-                                  bh_end_io_t *handler)
+static void mark_buffer_async_write_endio(struct buffer_head *bh,
+                                         bh_end_io_t *handler)
 {
        bh->b_end_io = handler;
        set_buffer_async_write(bh);
@@ -553,7 +560,7 @@ repeat:
        return err;
 }
 
-void do_thaw_all(struct work_struct *work)
+static void do_thaw_all(struct work_struct *work)
 {
        struct super_block *sb;
        char b[BDEVNAME_SIZE];
@@ -1172,6 +1179,7 @@ void mark_buffer_dirty(struct buffer_head *bh)
                }
        }
 }
+EXPORT_SYMBOL(mark_buffer_dirty);
 
 /*
  * Decrement a buffer_head's reference count.  If all buffers against a page
@@ -1188,6 +1196,7 @@ void __brelse(struct buffer_head * buf)
        }
        WARN(1, KERN_ERR "VFS: brelse: Trying to free free buffer\n");
 }
+EXPORT_SYMBOL(__brelse);
 
 /*
  * bforget() is like brelse(), except it discards any
@@ -1206,6 +1215,7 @@ void __bforget(struct buffer_head *bh)
        }
        __brelse(bh);
 }
+EXPORT_SYMBOL(__bforget);
 
 static struct buffer_head *__bread_slow(struct buffer_head *bh)
 {
@@ -2218,6 +2228,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
        }
        return 0;
 }
+EXPORT_SYMBOL(block_read_full_page);
 
 /* utility function for filesystems that need to do work on expanding
  * truncates.  Uses filesystem pagecache writes to allow the filesystem to
@@ -2252,6 +2263,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)
 out:
        return err;
 }
+EXPORT_SYMBOL(generic_cont_expand_simple);
 
 static int cont_expand_zero(struct file *file, struct address_space *mapping,
                            loff_t pos, loff_t *bytes)
@@ -2352,6 +2364,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
 out:
        return err;
 }
+EXPORT_SYMBOL(cont_write_begin);
 
 int block_prepare_write(struct page *page, unsigned from, unsigned to,
                        get_block_t *get_block)
@@ -2362,6 +2375,7 @@ int block_prepare_write(struct page *page, unsigned from, unsigned to,
                ClearPageUptodate(page);
        return err;
 }
+EXPORT_SYMBOL(block_prepare_write);
 
 int block_commit_write(struct page *page, unsigned from, unsigned to)
 {
@@ -2369,6 +2383,7 @@ int block_commit_write(struct page *page, unsigned from, unsigned to)
        __block_commit_write(inode,page,from,to);
        return 0;
 }
+EXPORT_SYMBOL(block_commit_write);
 
 /*
  * block_page_mkwrite() is not allowed to change the file size as it gets
@@ -2426,6 +2441,7 @@ block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
 out:
        return ret;
 }
+EXPORT_SYMBOL(block_page_mkwrite);
 
 /*
  * nobh_write_begin()'s prereads are special: the buffer_heads are freed
@@ -2849,6 +2865,7 @@ unlock:
 out:
        return err;
 }
+EXPORT_SYMBOL(block_truncate_page);
 
 /*
  * The generic ->writepage function for buffer-backed address_spaces
@@ -2890,6 +2907,7 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,
        zero_user_segment(page, offset, PAGE_CACHE_SIZE);
        return __block_write_full_page(inode, page, get_block, wbc, handler);
 }
+EXPORT_SYMBOL(block_write_full_page_endio);
 
 /*
  * The generic ->writepage function for buffer-backed address_spaces
@@ -2900,7 +2918,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block,
        return block_write_full_page_endio(page, get_block, wbc,
                                           end_buffer_async_write);
 }
-
+EXPORT_SYMBOL(block_write_full_page);
 
 sector_t generic_block_bmap(struct address_space *mapping, sector_t block,
                            get_block_t *get_block)
@@ -2913,6 +2931,7 @@ sector_t generic_block_bmap(struct address_space *mapping, sector_t block,
        get_block(inode, block, &tmp, 0);
        return tmp.b_blocknr;
 }
+EXPORT_SYMBOL(generic_block_bmap);
 
 static void end_bio_bh_io_sync(struct bio *bio, int err)
 {
@@ -2982,6 +3001,7 @@ int submit_bh(int rw, struct buffer_head * bh)
        bio_put(bio);
        return ret;
 }
+EXPORT_SYMBOL(submit_bh);
 
 /**
  * ll_rw_block: low-level access to block devices (DEPRECATED)
@@ -3043,6 +3063,7 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])
                unlock_buffer(bh);
        }
 }
+EXPORT_SYMBOL(ll_rw_block);
 
 /*
  * For a data-integrity writeout, we need to wait upon any in-progress I/O
@@ -3071,6 +3092,7 @@ int sync_dirty_buffer(struct buffer_head *bh)
        }
        return ret;
 }
+EXPORT_SYMBOL(sync_dirty_buffer);
 
 /*
  * try_to_free_buffers() checks if all the buffers on this particular page
@@ -3185,6 +3207,7 @@ void block_sync_page(struct page *page)
        if (mapping)
                blk_run_backing_dev(mapping->backing_dev_info, page);
 }
+EXPORT_SYMBOL(block_sync_page);
 
 /*
  * There are no bdflush tunables left.  But distributions are
@@ -3361,29 +3384,3 @@ void __init buffer_init(void)
        max_buffer_heads = nrpages * (PAGE_SIZE / sizeof(struct buffer_head));
        hotcpu_notifier(buffer_cpu_notify, 0);
 }
-
-EXPORT_SYMBOL(__bforget);
-EXPORT_SYMBOL(__brelse);
-EXPORT_SYMBOL(__wait_on_buffer);
-EXPORT_SYMBOL(block_commit_write);
-EXPORT_SYMBOL(block_prepare_write);
-EXPORT_SYMBOL(block_page_mkwrite);
-EXPORT_SYMBOL(block_read_full_page);
-EXPORT_SYMBOL(block_sync_page);
-EXPORT_SYMBOL(block_truncate_page);
-EXPORT_SYMBOL(block_write_full_page);
-EXPORT_SYMBOL(block_write_full_page_endio);
-EXPORT_SYMBOL(cont_write_begin);
-EXPORT_SYMBOL(end_buffer_read_sync);
-EXPORT_SYMBOL(end_buffer_write_sync);
-EXPORT_SYMBOL(end_buffer_async_write);
-EXPORT_SYMBOL(file_fsync);
-EXPORT_SYMBOL(generic_block_bmap);
-EXPORT_SYMBOL(generic_cont_expand_simple);
-EXPORT_SYMBOL(init_buffer);
-EXPORT_SYMBOL(invalidate_bdev);
-EXPORT_SYMBOL(ll_rw_block);
-EXPORT_SYMBOL(mark_buffer_dirty);
-EXPORT_SYMBOL(submit_bh);
-EXPORT_SYMBOL(sync_dirty_buffer);
-EXPORT_SYMBOL(unlock_buffer);
index 606912d..fea9e89 100644 (file)
@@ -142,7 +142,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
        rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
        if (rc != 0) {
                cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d",
-                         __func__, *devname, rc));;
+                         __func__, *devname, rc));
                goto compose_mount_options_err;
        }
        /* md_len = strlen(...) + 12 for 'sep+prefixpath='
@@ -385,7 +385,7 @@ out_err:
        goto out;
 }
 
-struct inode_operations cifs_dfs_referral_inode_operations = {
+const struct inode_operations cifs_dfs_referral_inode_operations = {
        .follow_link = cifs_dfs_follow_mountpoint,
 };
 
index 3610e99..d79ce2e 100644 (file)
@@ -50,7 +50,7 @@
 #define CIFS_MAGIC_NUMBER 0xFF534D42   /* the first four bytes of SMB PDUs */
 
 #ifdef CONFIG_CIFS_QUOTA
-static struct quotactl_ops cifs_quotactl_ops;
+static const struct quotactl_ops cifs_quotactl_ops;
 #endif /* QUOTA */
 
 int cifsFYI = 0;
@@ -517,7 +517,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
        return rc;
 }
 
-static struct quotactl_ops cifs_quotactl_ops = {
+static const struct quotactl_ops cifs_quotactl_ops = {
        .set_xquota     = cifs_xquota_set,
        .get_xquota     = cifs_xquota_get,
        .set_xstate     = cifs_xstate_set,
index 094325e..ac2b24c 100644 (file)
@@ -67,7 +67,7 @@ extern int cifs_setattr(struct dentry *, struct iattr *);
 
 extern const struct inode_operations cifs_file_inode_ops;
 extern const struct inode_operations cifs_symlink_inode_ops;
-extern struct inode_operations cifs_dfs_referral_inode_operations;
+extern const struct inode_operations cifs_dfs_referral_inode_operations;
 
 
 /* Functions related to files and directories */
index 6d6f98f..3aa4883 100644 (file)
@@ -100,13 +100,6 @@ asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *filename, st
                    get_compat_timespec(&tv[1], &t[1]))
                        return -EFAULT;
 
-               if ((tv[0].tv_nsec == UTIME_OMIT || tv[0].tv_nsec == UTIME_NOW)
-                   && tv[0].tv_sec != 0)
-                       return -EINVAL;
-               if ((tv[1].tv_nsec == UTIME_OMIT || tv[1].tv_nsec == UTIME_NOW)
-                   && tv[1].tv_sec != 0)
-                       return -EINVAL;
-
                if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT)
                        return 0;
        }
index 75efb02..d5f8c96 100644 (file)
 #include <linux/mount.h>
 #include <linux/tty.h>
 #include <linux/mutex.h>
+#include <linux/magic.h>
 #include <linux/idr.h>
 #include <linux/devpts_fs.h>
 #include <linux/parser.h>
 #include <linux/fsnotify.h>
 #include <linux/seq_file.h>
 
-#define DEVPTS_SUPER_MAGIC 0x1cd1
-
 #define DEVPTS_DEFAULT_MODE 0600
 /*
  * ptmx is a new node in /dev/pts and will be unused in legacy (single-
index 1d1d274..1c8bb8c 100644 (file)
@@ -386,9 +386,9 @@ static int table_seq_show(struct seq_file *seq, void *iter_ptr)
        return rv;
 }
 
-static struct seq_operations format1_seq_ops;
-static struct seq_operations format2_seq_ops;
-static struct seq_operations format3_seq_ops;
+static const struct seq_operations format1_seq_ops;
+static const struct seq_operations format2_seq_ops;
+static const struct seq_operations format3_seq_ops;
 
 static void *table_seq_start(struct seq_file *seq, loff_t *pos)
 {
@@ -534,21 +534,21 @@ static void table_seq_stop(struct seq_file *seq, void *iter_ptr)
        }
 }
 
-static struct seq_operations format1_seq_ops = {
+static const struct seq_operations format1_seq_ops = {
        .start = table_seq_start,
        .next  = table_seq_next,
        .stop  = table_seq_stop,
        .show  = table_seq_show,
 };
 
-static struct seq_operations format2_seq_ops = {
+static const struct seq_operations format2_seq_ops = {
        .start = table_seq_start,
        .next  = table_seq_next,
        .stop  = table_seq_stop,
        .show  = table_seq_show,
 };
 
-static struct seq_operations format3_seq_ops = {
+static const struct seq_operations format3_seq_ops = {
        .start = table_seq_start,
        .next  = table_seq_next,
        .stop  = table_seq_stop,
index 00b30a2..542f625 100644 (file)
@@ -582,7 +582,7 @@ extern const struct inode_operations ecryptfs_dir_iops;
 extern const struct inode_operations ecryptfs_symlink_iops;
 extern const struct super_operations ecryptfs_sops;
 extern const struct dentry_operations ecryptfs_dops;
-extern struct address_space_operations ecryptfs_aops;
+extern const struct address_space_operations ecryptfs_aops;
 extern int ecryptfs_verbosity;
 extern unsigned int ecryptfs_message_buf_len;
 extern signed long ecryptfs_message_wait_timeout;
index 5c6bab9..05772ae 100644 (file)
@@ -545,7 +545,7 @@ static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t block)
        return rc;
 }
 
-struct address_space_operations ecryptfs_aops = {
+const struct address_space_operations ecryptfs_aops = {
        .writepage = ecryptfs_writepage,
        .readpage = ecryptfs_readpage,
        .write_begin = ecryptfs_write_begin,
index 31d12de..8b47e42 100644 (file)
@@ -68,11 +68,16 @@ int eventfd_signal(struct eventfd_ctx *ctx, int n)
 }
 EXPORT_SYMBOL_GPL(eventfd_signal);
 
+static void eventfd_free_ctx(struct eventfd_ctx *ctx)
+{
+       kfree(ctx);
+}
+
 static void eventfd_free(struct kref *kref)
 {
        struct eventfd_ctx *ctx = container_of(kref, struct eventfd_ctx, kref);
 
-       kfree(ctx);
+       eventfd_free_ctx(ctx);
 }
 
 /**
@@ -298,9 +303,23 @@ struct eventfd_ctx *eventfd_ctx_fileget(struct file *file)
 }
 EXPORT_SYMBOL_GPL(eventfd_ctx_fileget);
 
-SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags)
+/**
+ * eventfd_file_create - Creates an eventfd file pointer.
+ * @count: Initial eventfd counter value.
+ * @flags: Flags for the eventfd file.
+ *
+ * This function creates an eventfd file pointer, w/out installing it into
+ * the fd table. This is useful when the eventfd file is used during the
+ * initialization of data structures that require extra setup after the eventfd
+ * creation. So the eventfd creation is split into the file pointer creation
+ * phase, and the file descriptor installation phase.
+ * In this way races with userspace closing the newly installed file descriptor
+ * can be avoided.
+ * Returns an eventfd file pointer, or a proper error pointer.
+ */
+struct file *eventfd_file_create(unsigned int count, int flags)
 {
-       int fd;
+       struct file *file;
        struct eventfd_ctx *ctx;
 
        /* Check the EFD_* constants for consistency.  */
@@ -308,26 +327,48 @@ SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags)
        BUILD_BUG_ON(EFD_NONBLOCK != O_NONBLOCK);
 
        if (flags & ~EFD_FLAGS_SET)
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        kref_init(&ctx->kref);
        init_waitqueue_head(&ctx->wqh);
        ctx->count = count;
        ctx->flags = flags;
 
-       /*
-        * When we call this, the initialization must be complete, since
-        * anon_inode_getfd() will install the fd.
-        */
-       fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx,
-                             flags & EFD_SHARED_FCNTL_FLAGS);
-       if (fd < 0)
-               kfree(ctx);
+       file = anon_inode_getfile("[eventfd]", &eventfd_fops, ctx,
+                                 flags & EFD_SHARED_FCNTL_FLAGS);
+       if (IS_ERR(file))
+               eventfd_free_ctx(ctx);
+
+       return file;
+}
+
+SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags)
+{
+       int fd, error;
+       struct file *file;
+
+       error = get_unused_fd_flags(flags & EFD_SHARED_FCNTL_FLAGS);
+       if (error < 0)
+               return error;
+       fd = error;
+
+       file = eventfd_file_create(count, flags);
+       if (IS_ERR(file)) {
+               error = PTR_ERR(file);
+               goto err_put_unused_fd;
+       }
+       fd_install(fd, file);
+
        return fd;
+
+err_put_unused_fd:
+       put_unused_fd(fd);
+
+       return error;
 }
 
 SYSCALL_DEFINE1(eventfd, unsigned int, count)
index 172ceb6..5c833c1 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -33,7 +33,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/pagemap.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
 #include <linux/key.h>
@@ -845,6 +845,9 @@ static int de_thread(struct task_struct *tsk)
        sig->notify_count = 0;
 
 no_thread_group:
+       if (current->mm)
+               setmax_mm_hiwater_rss(&sig->maxrss, current->mm);
+
        exit_itimers(sig);
        flush_itimer_signals();
 
@@ -923,7 +926,7 @@ void set_task_comm(struct task_struct *tsk, char *buf)
        task_lock(tsk);
        strlcpy(tsk->comm, buf, sizeof(tsk->comm));
        task_unlock(tsk);
-       perf_counter_comm(tsk);
+       perf_event_comm(tsk);
 }
 
 int flush_old_exec(struct linux_binprm * bprm)
@@ -997,7 +1000,7 @@ int flush_old_exec(struct linux_binprm * bprm)
         * security domain:
         */
        if (!get_dumpable(current->mm))
-               perf_counter_exit_task(current);
+               perf_event_exit_task(current);
 
        /* An exec changes our domain. We are no longer part of the thread
           group */
@@ -1354,6 +1357,8 @@ int do_execve(char * filename,
        if (retval < 0)
                goto out;
 
+       current->stack_start = current->mm->start_stack;
+
        /* execve succeeded */
        current->fs->in_exec = 0;
        current->in_execve = 0;
index 23701f2..dd7175c 100644 (file)
@@ -70,7 +70,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
                        if (PTR_ERR(inode) == -ESTALE) {
                                ext2_error(dir->i_sb, __func__,
                                                "deleted inode referenced: %lu",
-                                               ino);
+                                               (unsigned long) ino);
                                return ERR_PTR(-EIO);
                        } else {
                                return ERR_CAST(inode);
index b72b858..c18fbf3 100644 (file)
@@ -20,7 +20,7 @@ __inode_direct_access(struct inode *inode, sector_t block,
                      void **kaddr, unsigned long *pfn)
 {
        struct block_device *bdev = inode->i_sb->s_bdev;
-       struct block_device_operations *ops = bdev->bd_disk->fops;
+       const struct block_device_operations *ops = bdev->bd_disk->fops;
        sector_t sector;
 
        sector = block * (PAGE_SIZE / 512); /* ext2 block to bdev sector */
index a8d80a7..72743d3 100644 (file)
@@ -720,7 +720,7 @@ static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
 static ssize_t ext3_quota_write(struct super_block *sb, int type,
                                const char *data, size_t len, loff_t off);
 
-static struct dquot_operations ext3_quota_operations = {
+static const struct dquot_operations ext3_quota_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,
@@ -737,7 +737,7 @@ static struct dquot_operations ext3_quota_operations = {
        .destroy_dquot  = dquot_destroy,
 };
 
-static struct quotactl_ops ext3_qctl_operations = {
+static const struct quotactl_ops ext3_qctl_operations = {
        .quota_on       = ext3_quota_on,
        .quota_off      = vfs_quota_off,
        .quota_sync     = vfs_quota_sync,
index 4abd683..3a79873 100644 (file)
@@ -2337,7 +2337,7 @@ static int __mpage_da_writepage(struct page *page,
                /*
                 * Rest of the page in the page_vec
                 * redirty then and skip then. We will
-                * try to to write them again after
+                * try to write them again after
                 * starting a new transaction
                 */
                redirty_page_for_writepage(wbc, page);
index a6b1ab7..df539ba 100644 (file)
@@ -964,7 +964,7 @@ static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
 static ssize_t ext4_quota_write(struct super_block *sb, int type,
                                const char *data, size_t len, loff_t off);
 
-static struct dquot_operations ext4_quota_operations = {
+static const struct dquot_operations ext4_quota_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,
@@ -985,7 +985,7 @@ static struct dquot_operations ext4_quota_operations = {
        .destroy_dquot  = dquot_destroy,
 };
 
-static struct quotactl_ops ext4_qctl_operations = {
+static const struct quotactl_ops ext4_qctl_operations = {
        .quota_on       = ext4_quota_on,
        .quota_off      = vfs_quota_off,
        .quota_sync     = vfs_quota_sync,
index 28c590b..8f1cfb0 100644 (file)
@@ -179,7 +179,7 @@ static inline u64 gfs2_bit_search(const __le64 *ptr, u64 mask, u8 state)
  * always aligned to a 64 bit boundary.
  *
  * The size of the buffer is in bytes, but is it assumed that it is
- * always ok to to read a complete multiple of 64 bits at the end
+ * always ok to read a complete multiple of 64 bits at the end
  * of the block in case the end is no aligned to a natural boundary.
  *
  * Return: the block number (bitmap buffer scope) that was found
index a93b885..eba6d55 100644 (file)
 #include <linux/statfs.h>
 #include <linux/security.h>
 #include <linux/ima.h>
+#include <linux/magic.h>
 
 #include <asm/uaccess.h>
 
-/* some random number */
-#define HUGETLBFS_MAGIC        0x958458f6
-
 static const struct super_operations hugetlbfs_ops;
 static const struct address_space_operations hugetlbfs_aops;
 const struct file_operations hugetlbfs_file_operations;
@@ -507,6 +505,13 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid,
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                INIT_LIST_HEAD(&inode->i_mapping->private_list);
                info = HUGETLBFS_I(inode);
+               /*
+                * The policy is initialized here even if we are creating a
+                * private inode because initialization simply creates an
+                * an empty rb tree and calls spin_lock_init(), later when we
+                * call mpol_free_shared_policy() it will just return because
+                * the rb tree will still be empty.
+                */
                mpol_shared_policy_init(&info->policy, NULL);
                switch (mode & S_IFMT) {
                default:
@@ -931,13 +936,19 @@ static struct file_system_type hugetlbfs_fs_type = {
 
 static struct vfsmount *hugetlbfs_vfsmount;
 
-static int can_do_hugetlb_shm(void)
+static int can_do_hugetlb_shm(int creat_flags)
 {
-       return capable(CAP_IPC_LOCK) || in_group_p(sysctl_hugetlb_shm_group);
+       if (creat_flags != HUGETLB_SHMFS_INODE)
+               return 0;
+       if (capable(CAP_IPC_LOCK))
+               return 1;
+       if (in_group_p(sysctl_hugetlb_shm_group))
+               return 1;
+       return 0;
 }
 
 struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,
-                                               struct user_struct **user)
+                               struct user_struct **user, int creat_flags)
 {
        int error = -ENOMEM;
        struct file *file;
@@ -949,7 +960,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,
        if (!hugetlbfs_vfsmount)
                return ERR_PTR(-ENOENT);
 
-       if (!can_do_hugetlb_shm()) {
+       if (!can_do_hugetlb_shm(creat_flags)) {
                *user = current_user();
                if (user_shm_lock(size, *user)) {
                        WARN_ONCE(1,
index b2ba83d..76582b0 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/backing-dev.h>
 #include <linux/wait.h>
+#include <linux/rwsem.h>
 #include <linux/hash.h>
 #include <linux/swap.h>
 #include <linux/security.h>
@@ -87,14 +88,18 @@ static struct hlist_head *inode_hashtable __read_mostly;
 DEFINE_SPINLOCK(inode_lock);
 
 /*
- * iprune_mutex provides exclusion between the kswapd or try_to_free_pages
+ * iprune_sem provides exclusion between the kswapd or try_to_free_pages
  * icache shrinking path, and the umount path.  Without this exclusion,
  * by the time prune_icache calls iput for the inode whose pages it has
  * been invalidating, or by the time it calls clear_inode & destroy_inode
  * from its final dispose_list, the struct super_block they refer to
  * (for inode->i_sb->s_op) may already have been freed and reused.
+ *
+ * We make this an rwsem because the fastpath is icache shrinking. In
+ * some cases a filesystem may be doing a significant amount of work in
+ * its inode reclaim code, so this should improve parallelism.
  */
-static DEFINE_MUTEX(iprune_mutex);
+static DECLARE_RWSEM(iprune_sem);
 
 /*
  * Statistics gathering..
@@ -123,7 +128,7 @@ static void wake_up_inode(struct inode *inode)
 int inode_init_always(struct super_block *sb, struct inode *inode)
 {
        static const struct address_space_operations empty_aops;
-       static struct inode_operations empty_iops;
+       static const struct inode_operations empty_iops;
        static const struct file_operations empty_fops;
        struct address_space *const mapping = &inode->i_data;
 
@@ -381,7 +386,7 @@ static int invalidate_list(struct list_head *head, struct list_head *dispose)
                /*
                 * We can reschedule here without worrying about the list's
                 * consistency because the per-sb list of inodes must not
-                * change during umount anymore, and because iprune_mutex keeps
+                * change during umount anymore, and because iprune_sem keeps
                 * shrink_icache_memory() away.
                 */
                cond_resched_lock(&inode_lock);
@@ -420,7 +425,7 @@ int invalidate_inodes(struct super_block *sb)
        int busy;
        LIST_HEAD(throw_away);
 
-       mutex_lock(&iprune_mutex);
+       down_write(&iprune_sem);
        spin_lock(&inode_lock);
        inotify_unmount_inodes(&sb->s_inodes);
        fsnotify_unmount_inodes(&sb->s_inodes);
@@ -428,7 +433,7 @@ int invalidate_inodes(struct super_block *sb)
        spin_unlock(&inode_lock);
 
        dispose_list(&throw_away);
-       mutex_unlock(&iprune_mutex);
+       up_write(&iprune_sem);
 
        return busy;
 }
@@ -467,7 +472,7 @@ static void prune_icache(int nr_to_scan)
        int nr_scanned;
        unsigned long reap = 0;
 
-       mutex_lock(&iprune_mutex);
+       down_read(&iprune_sem);
        spin_lock(&inode_lock);
        for (nr_scanned = 0; nr_scanned < nr_to_scan; nr_scanned++) {
                struct inode *inode;
@@ -509,7 +514,7 @@ static void prune_icache(int nr_to_scan)
        spin_unlock(&inode_lock);
 
        dispose_list(&freeable);
-       mutex_unlock(&iprune_mutex);
+       up_read(&iprune_sem);
 }
 
 /*
@@ -695,13 +700,15 @@ void unlock_new_inode(struct inode *inode)
        }
 #endif
        /*
-        * This is special!  We do not need the spinlock
-        * when clearing I_LOCK, because we're guaranteed
-        * that nobody else tries to do anything about the
-        * state of the inode when it is locked, as we
-        * just created it (so there can be no old holders
-        * that haven't tested I_LOCK).
+        * This is special!  We do not need the spinlock when clearing I_LOCK,
+        * because we're guaranteed that nobody else tries to do anything about
+        * the state of the inode when it is locked, as we just created it (so
+        * there can be no old holders that haven't tested I_LOCK).
+        * However we must emit the memory barrier so that other CPUs reliably
+        * see the clearing of I_LOCK after the other inode initialisation has
+        * completed.
         */
+       smp_mb();
        WARN_ON((inode->i_state & (I_LOCK|I_NEW)) != (I_LOCK|I_NEW));
        inode->i_state &= ~(I_LOCK|I_NEW);
        wake_up_inode(inode);
index a8a358b..53b86e1 100644 (file)
@@ -768,7 +768,7 @@ static void jbd2_seq_history_stop(struct seq_file *seq, void *v)
 {
 }
 
-static struct seq_operations jbd2_seq_history_ops = {
+static const struct seq_operations jbd2_seq_history_ops = {
        .start  = jbd2_seq_history_start,
        .next   = jbd2_seq_history_next,
        .stop   = jbd2_seq_history_stop,
@@ -872,7 +872,7 @@ static void jbd2_seq_info_stop(struct seq_file *seq, void *v)
 {
 }
 
-static struct seq_operations jbd2_seq_info_ops = {
+static const struct seq_operations jbd2_seq_info_ops = {
        .start  = jbd2_seq_info_start,
        .next   = jbd2_seq_info_next,
        .stop   = jbd2_seq_info_stop,
index 0035c02..9a80e8e 100644 (file)
@@ -123,7 +123,7 @@ static struct dentry *jffs2_get_parent(struct dentry *child)
        return d_obtain_alias(jffs2_iget(child->d_inode->i_sb, pino));
 }
 
-static struct export_operations jffs2_export_ops = {
+static const struct export_operations jffs2_export_ops = {
        .get_parent = jffs2_get_parent,
        .fh_to_dentry = jffs2_fh_to_dentry,
        .fh_to_parent = jffs2_fh_to_parent,
index 1f3b0fc..fc9032d 100644 (file)
@@ -166,7 +166,7 @@ __be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)
                 */
                if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid)
                        continue;
-               if (!nlm_cmp_addr(nlm_addr(block->b_host), addr))
+               if (!rpc_cmp_addr(nlm_addr(block->b_host), addr))
                        continue;
                if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)
                        continue;
index 4336adb..c81249f 100644 (file)
@@ -458,7 +458,7 @@ static void nlmclnt_locks_release_private(struct file_lock *fl)
        nlm_put_lockowner(fl->fl_u.nfs_fl.owner);
 }
 
-static struct file_lock_operations nlmclnt_lock_ops = {
+static const struct file_lock_operations nlmclnt_lock_ops = {
        .fl_copy_lock = nlmclnt_locks_copy_lock,
        .fl_release_private = nlmclnt_locks_release_private,
 };
index 7cb076a..4600c20 100644 (file)
@@ -111,7 +111,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni)
         */
        chain = &nlm_hosts[nlm_hash_address(ni->sap)];
        hlist_for_each_entry(host, pos, chain, h_hash) {
-               if (!nlm_cmp_addr(nlm_addr(host), ni->sap))
+               if (!rpc_cmp_addr(nlm_addr(host), ni->sap))
                        continue;
 
                /* See if we have an NSM handle for this client */
@@ -125,7 +125,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni)
                if (host->h_server != ni->server)
                        continue;
                if (ni->server &&
-                   !nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap))
+                   !rpc_cmp_addr(nlm_srcaddr(host), ni->src_sap))
                        continue;
 
                /* Move to head of hash chain. */
index 30c9331..f956651 100644 (file)
@@ -209,7 +209,7 @@ static struct nsm_handle *nsm_lookup_addr(const struct sockaddr *sap)
        struct nsm_handle *nsm;
 
        list_for_each_entry(nsm, &nsm_handles, sm_link)
-               if (nlm_cmp_addr(nsm_addr(nsm), sap))
+               if (rpc_cmp_addr(nsm_addr(nsm), sap))
                        return nsm;
        return NULL;
 }
index e577a78..d100179 100644 (file)
@@ -705,7 +705,7 @@ static int nlmsvc_same_owner(struct file_lock *fl1, struct file_lock *fl2)
        return fl1->fl_owner == fl2->fl_owner && fl1->fl_pid == fl2->fl_pid;
 }
 
-struct lock_manager_operations nlmsvc_lock_operations = {
+const struct lock_manager_operations nlmsvc_lock_operations = {
        .fl_compare_owner = nlmsvc_same_owner,
        .fl_notify = nlmsvc_notify_blocked,
        .fl_grant = nlmsvc_grant_deferred,
index 9e4d6aa..ad478da 100644 (file)
@@ -417,7 +417,7 @@ EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_sb);
 static int
 nlmsvc_match_ip(void *datap, struct nlm_host *host)
 {
-       return nlm_cmp_addr(nlm_srcaddr(host), datap);
+       return rpc_cmp_addr(nlm_srcaddr(host), datap);
 }
 
 /**
index 19ee18a..a8794f2 100644 (file)
@@ -434,7 +434,7 @@ static int lease_mylease_callback(struct file_lock *fl, struct file_lock *try)
        return fl->fl_file == try->fl_file;
 }
 
-static struct lock_manager_operations lease_manager_ops = {
+static const struct lock_manager_operations lease_manager_ops = {
        .fl_break = lease_break_callback,
        .fl_release_private = lease_release_private_callback,
        .fl_mylease = lease_mylease_callback,
index d407e7a..6198731 100644 (file)
@@ -308,14 +308,18 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
        struct inode *inode = (struct inode*)mapping->host;
        char *kaddr = page_address(page);
        loff_t pos = page_offset(page) + (char*)de - kaddr;
-       unsigned len = minix_sb(inode->i_sb)->s_dirsize;
+       struct minix_sb_info *sbi = minix_sb(inode->i_sb);
+       unsigned len = sbi->s_dirsize;
        int err;
 
        lock_page(page);
        err = __minix_write_begin(NULL, mapping, pos, len,
                                        AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        if (err == 0) {
-               de->inode = 0;
+               if (sbi->s_version == MINIX_V3)
+                       ((minix3_dirent *) de)->inode = 0;
+               else
+                       de->inode = 0;
                err = dir_commit_chunk(page, pos, len);
        } else {
                unlock_page(page);
@@ -440,7 +444,10 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
        err = __minix_write_begin(NULL, mapping, pos, sbi->s_dirsize,
                                        AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
        if (err == 0) {
-               de->inode = inode->i_ino;
+               if (sbi->s_version == MINIX_V3)
+                       ((minix3_dirent *) de)->inode = inode->i_ino;
+               else
+                       de->inode = inode->i_ino;
                err = dir_commit_chunk(page, pos, sbi->s_dirsize);
        } else {
                unlock_page(page);
@@ -470,7 +477,14 @@ ino_t minix_inode_by_name(struct dentry *dentry)
        ino_t res = 0;
 
        if (de) {
-               res = de->inode;
+               struct address_space *mapping = page->mapping;
+               struct inode *inode = mapping->host;
+               struct minix_sb_info *sbi = minix_sb(inode->i_sb);
+
+               if (sbi->s_version == MINIX_V3)
+                       res = ((minix3_dirent *) de)->inode;
+               else
+                       res = de->inode;
                dir_put_page(page);
        }
        return res;
index 9c59072..b8b5b30 100644 (file)
@@ -1241,7 +1241,7 @@ ncp_date_unix2dos(int unix_date, __le16 *time, __le16 *date)
                month = 2;
        } else {
                nl_day = (year & 3) || day <= 59 ? day : day - 1;
-               for (month = 0; month < 12; month++)
+               for (month = 1; month < 12; month++)
                        if (day_n[month] > nl_day)
                                break;
        }
index fa038df..53a7ed7 100644 (file)
@@ -442,7 +442,7 @@ static int __ncp_ioctl(struct inode *inode, struct file *filp,
                        if (dentry) {
                                struct inode* s_inode = dentry->d_inode;
                                
-                               if (inode) {
+                               if (s_inode) {
                                        NCP_FINFO(s_inode)->volNumber = vnum;
                                        NCP_FINFO(s_inode)->dirEntNum = de;
                                        NCP_FINFO(s_inode)->DosDirNum = dosde;
index e5a2dac..76b0aa0 100644 (file)
@@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr,
 
        p = read_buf(xdr, len);
        if (unlikely(p == NULL))
-               return htonl(NFS4ERR_RESOURCE);;
+               return htonl(NFS4ERR_RESOURCE);
 
        memcpy(sid->data, p, len);
        return 0;
index e350bd6..1520253 100644 (file)
@@ -933,10 +933,6 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
                goto out_error;
 
        nfs_server_set_fsinfo(server, &fsinfo);
-       error = bdi_init(&server->backing_dev_info);
-       if (error)
-               goto out_error;
-
 
        /* Get some general file system info */
        if (server->namelen == 0) {
@@ -995,6 +991,12 @@ static struct nfs_server *nfs_alloc_server(void)
                return NULL;
        }
 
+       if (bdi_init(&server->backing_dev_info)) {
+               nfs_free_iostats(server->io_stats);
+               kfree(server);
+               return NULL;
+       }
+
        return server;
 }
 
@@ -1529,7 +1531,7 @@ static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_server_list_stop(struct seq_file *p, void *v);
 static int nfs_server_list_show(struct seq_file *m, void *v);
 
-static struct seq_operations nfs_server_list_ops = {
+static const struct seq_operations nfs_server_list_ops = {
        .start  = nfs_server_list_start,
        .next   = nfs_server_list_next,
        .stop   = nfs_server_list_stop,
@@ -1550,7 +1552,7 @@ static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_volume_list_stop(struct seq_file *p, void *v);
 static int nfs_volume_list_show(struct seq_file *m, void *v);
 
-static struct seq_operations nfs_volume_list_ops = {
+static const struct seq_operations nfs_volume_list_ops = {
        .start  = nfs_volume_list_start,
        .next   = nfs_volume_list_next,
        .stop   = nfs_volume_list_stop,
index 1434080..2ef4fec 100644 (file)
@@ -638,7 +638,7 @@ static void nfs4_fl_release_lock(struct file_lock *fl)
        nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner);
 }
 
-static struct file_lock_operations nfs4_fl_lock_ops = {
+static const struct file_lock_operations nfs4_fl_lock_ops = {
        .fl_copy_lock = nfs4_fl_copy_lock,
        .fl_release_private = nfs4_fl_release_lock,
 };
index de93569..f1cc058 100644 (file)
@@ -2190,8 +2190,8 @@ static void nfs_kill_super(struct super_block *s)
 {
        struct nfs_server *server = NFS_SB(s);
 
-       bdi_unregister(&server->backing_dev_info);
        kill_anon_super(s);
+       bdi_unregister(&server->backing_dev_info);
        nfs_fscache_release_super_cookie(s);
        nfs_free_server(server);
 }
index d946264..c1c9e03 100644 (file)
@@ -1341,6 +1341,8 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
        if (rv)
                goto out;
        rv = check_nfsd_access(exp, rqstp);
+       if (rv)
+               fh_put(fhp);
 out:
        exp_put(exp);
        return rv;
@@ -1515,7 +1517,7 @@ static int e_show(struct seq_file *m, void *p)
        return svc_export_show(m, &svc_export_cache, cp);
 }
 
-struct seq_operations nfs_exports_op = {
+const struct seq_operations nfs_exports_op = {
        .start  = e_start,
        .next   = e_next,
        .stop   = e_stop,
index 01d4ec1..edf926e 100644 (file)
@@ -814,17 +814,6 @@ encode_entry_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name,
        return p;
 }
 
-static __be32 *
-encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p,
-               struct svc_fh *fhp)
-{
-       p = encode_post_op_attr(cd->rqstp, p, fhp);
-       *p++ = xdr_one;                 /* yes, a file handle follows */
-       p = encode_fh(p, fhp);
-       fh_put(fhp);
-       return p;
-}
-
 static int
 compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
                const char *name, int namlen)
@@ -836,29 +825,54 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
        dparent = cd->fh.fh_dentry;
        exp  = cd->fh.fh_export;
 
-       fh_init(fhp, NFS3_FHSIZE);
        if (isdotent(name, namlen)) {
                if (namlen == 2) {
                        dchild = dget_parent(dparent);
                        if (dchild == dparent) {
                                /* filesystem root - cannot return filehandle for ".." */
                                dput(dchild);
-                               return 1;
+                               return -ENOENT;
                        }
                } else
                        dchild = dget(dparent);
        } else
                dchild = lookup_one_len(name, dparent, namlen);
        if (IS_ERR(dchild))
-               return 1;
-       if (d_mountpoint(dchild) ||
-           fh_compose(fhp, exp, dchild, &cd->fh) != 0 ||
-           !dchild->d_inode)
-               rv = 1;
+               return -ENOENT;
+       rv = -ENOENT;
+       if (d_mountpoint(dchild))
+               goto out;
+       rv = fh_compose(fhp, exp, dchild, &cd->fh);
+       if (rv)
+               goto out;
+       if (!dchild->d_inode)
+               goto out;
+       rv = 0;
+out:
        dput(dchild);
        return rv;
 }
 
+__be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen)
+{
+       struct svc_fh   fh;
+       int err;
+
+       fh_init(&fh, NFS3_FHSIZE);
+       err = compose_entry_fh(cd, &fh, name, namlen);
+       if (err) {
+               *p++ = 0;
+               *p++ = 0;
+               goto out;
+       }
+       p = encode_post_op_attr(cd->rqstp, p, &fh);
+       *p++ = xdr_one;                 /* yes, a file handle follows */
+       p = encode_fh(p, &fh);
+out:
+       fh_put(&fh);
+       return p;
+}
+
 /*
  * Encode a directory entry. This one works for both normal readdir
  * and readdirplus.
@@ -929,16 +943,8 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
 
                p = encode_entry_baggage(cd, p, name, namlen, ino);
 
-               /* throw in readdirplus baggage */
-               if (plus) {
-                       struct svc_fh   fh;
-
-                       if (compose_entry_fh(cd, &fh, name, namlen) > 0) {
-                               *p++ = 0;
-                               *p++ = 0;
-                       } else
-                               p = encode_entryplus_baggage(cd, p, &fh);
-               }
+               if (plus)
+                       p = encode_entryplus_baggage(cd, p, name, namlen);
                num_entry_words = p - cd->buffer;
        } else if (cd->rqstp->rq_respages[pn+1] != NULL) {
                /* temporarily encode entry into next page, then move back to
@@ -951,17 +957,8 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
 
                p1 = encode_entry_baggage(cd, p1, name, namlen, ino);
 
-               /* throw in readdirplus baggage */
-               if (plus) {
-                       struct svc_fh   fh;
-
-                       if (compose_entry_fh(cd, &fh, name, namlen) > 0) {
-                               /* zero out the filehandle */
-                               *p1++ = 0;
-                               *p1++ = 0;
-                       } else
-                               p1 = encode_entryplus_baggage(cd, p1, &fh);
-               }
+               if (plus)
+                       p = encode_entryplus_baggage(cd, p1, name, namlen);
 
                /* determine entry word length and lengths to go in pages */
                num_entry_words = p1 - tmp;
index 54b8b41..725d02f 100644 (file)
@@ -321,7 +321,7 @@ _posix_to_nfsv4_one(struct posix_acl *pacl, struct nfs4_acl *acl,
        deny = ~pas.group & pas.other;
        if (deny) {
                ace->type = NFS4_ACE_ACCESS_DENIED_ACE_TYPE;
-               ace->flag = eflag | NFS4_ACE_IDENTIFIER_GROUP;
+               ace->flag = eflag;
                ace->access_mask = deny_mask_from_posix(deny, flags);
                ace->whotype = NFS4_ACL_WHO_GROUP;
                ace++;
@@ -335,7 +335,7 @@ _posix_to_nfsv4_one(struct posix_acl *pacl, struct nfs4_acl *acl,
                if (deny) {
                        ace->type = NFS4_ACE_ACCESS_DENIED_ACE_TYPE;
                        ace->flag = eflag | NFS4_ACE_IDENTIFIER_GROUP;
-                       ace->access_mask = mask_from_posix(deny, flags);
+                       ace->access_mask = deny_mask_from_posix(deny, flags);
                        ace->whotype = NFS4_ACL_WHO_NAMED;
                        ace->who = pa->e_id;
                        ace++;
index 3fd23f7..24e8d78 100644 (file)
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/svcsock.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/state.h>
 #include <linux/sunrpc/sched.h>
 #include <linux/nfs4.h>
+#include <linux/sunrpc/xprtsock.h>
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
 #define NFSPROC4_CB_NULL 0
 #define NFSPROC4_CB_COMPOUND 1
+#define NFS4_STATEID_SIZE 16
 
 /* Index of predefined Linux callback client operations */
 
 enum {
-        NFSPROC4_CLNT_CB_NULL = 0,
+       NFSPROC4_CLNT_CB_NULL = 0,
        NFSPROC4_CLNT_CB_RECALL,
+       NFSPROC4_CLNT_CB_SEQUENCE,
 };
 
 enum nfs_cb_opnum4 {
        OP_CB_RECALL            = 4,
+       OP_CB_SEQUENCE          = 11,
 };
 
 #define NFS4_MAXTAGLEN         20
@@ -70,17 +75,29 @@ enum nfs_cb_opnum4 {
 #define NFS4_dec_cb_null_sz            0
 #define cb_compound_enc_hdr_sz         4
 #define cb_compound_dec_hdr_sz         (3 + (NFS4_MAXTAGLEN >> 2))
+#define sessionid_sz                   (NFS4_MAX_SESSIONID_LEN >> 2)
+#define cb_sequence_enc_sz             (sessionid_sz + 4 +             \
+                                       1 /* no referring calls list yet */)
+#define cb_sequence_dec_sz             (op_dec_sz + sessionid_sz + 4)
+
 #define op_enc_sz                      1
 #define op_dec_sz                      2
 #define enc_nfs4_fh_sz                 (1 + (NFS4_FHSIZE >> 2))
 #define enc_stateid_sz                 (NFS4_STATEID_SIZE >> 2)
 #define NFS4_enc_cb_recall_sz          (cb_compound_enc_hdr_sz +       \
+                                       cb_sequence_enc_sz +            \
                                        1 + enc_stateid_sz +            \
                                        enc_nfs4_fh_sz)
 
 #define NFS4_dec_cb_recall_sz          (cb_compound_dec_hdr_sz  +      \
+                                       cb_sequence_dec_sz +            \
                                        op_dec_sz)
 
+struct nfs4_rpc_args {
+       void                            *args_op;
+       struct nfsd4_cb_sequence        args_seq;
+};
+
 /*
 * Generic encode routines from fs/nfs/nfs4xdr.c
 */
@@ -137,11 +154,13 @@ xdr_error:                                      \
 } while (0)
 
 struct nfs4_cb_compound_hdr {
-       int             status;
-       u32             ident;
+       /* args */
+       u32             ident;  /* minorversion 0 only */
        u32             nops;
        __be32          *nops_p;
        u32             minorversion;
+       /* res */
+       int             status;
        u32             taglen;
        char            *tag;
 };
@@ -238,6 +257,27 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,
        hdr->nops++;
 }
 
+static void
+encode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *args,
+                  struct nfs4_cb_compound_hdr *hdr)
+{
+       __be32 *p;
+
+       if (hdr->minorversion == 0)
+               return;
+
+       RESERVE_SPACE(1 + NFS4_MAX_SESSIONID_LEN + 20);
+
+       WRITE32(OP_CB_SEQUENCE);
+       WRITEMEM(args->cbs_clp->cl_sessionid.data, NFS4_MAX_SESSIONID_LEN);
+       WRITE32(args->cbs_clp->cl_cb_seq_nr);
+       WRITE32(0);             /* slotid, always 0 */
+       WRITE32(0);             /* highest slotid always 0 */
+       WRITE32(0);             /* cachethis always 0 */
+       WRITE32(0); /* FIXME: support referring_call_lists */
+       hdr->nops++;
+}
+
 static int
 nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 {
@@ -249,15 +289,19 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 }
 
 static int
-nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation *args)
+nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
+               struct nfs4_rpc_args *rpc_args)
 {
        struct xdr_stream xdr;
+       struct nfs4_delegation *args = rpc_args->args_op;
        struct nfs4_cb_compound_hdr hdr = {
                .ident = args->dl_ident,
+               .minorversion = rpc_args->args_seq.cbs_minorversion,
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
        encode_cb_compound_hdr(&xdr, &hdr);
+       encode_cb_sequence(&xdr, &rpc_args->args_seq, &hdr);
        encode_cb_recall(&xdr, args, &hdr);
        encode_cb_nops(&hdr);
        return 0;
@@ -299,6 +343,57 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
        return 0;
 }
 
+/*
+ * Our current back channel implmentation supports a single backchannel
+ * with a single slot.
+ */
+static int
+decode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *res,
+                  struct rpc_rqst *rqstp)
+{
+       struct nfs4_sessionid id;
+       int status;
+       u32 dummy;
+       __be32 *p;
+
+       if (res->cbs_minorversion == 0)
+               return 0;
+
+       status = decode_cb_op_hdr(xdr, OP_CB_SEQUENCE);
+       if (status)
+               return status;
+
+       /*
+        * If the server returns different values for sessionID, slotID or
+        * sequence number, the server is looney tunes.
+        */
+       status = -ESERVERFAULT;
+
+       READ_BUF(NFS4_MAX_SESSIONID_LEN + 16);
+       memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN);
+       p += XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN);
+       if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,
+                  NFS4_MAX_SESSIONID_LEN)) {
+               dprintk("%s Invalid session id\n", __func__);
+               goto out;
+       }
+       READ32(dummy);
+       if (dummy != res->cbs_clp->cl_cb_seq_nr) {
+               dprintk("%s Invalid sequence number\n", __func__);
+               goto out;
+       }
+       READ32(dummy);  /* slotid must be 0 */
+       if (dummy != 0) {
+               dprintk("%s Invalid slotid\n", __func__);
+               goto out;
+       }
+       /* FIXME: process highest slotid and target highest slotid */
+       status = 0;
+out:
+       return status;
+}
+
+
 static int
 nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p)
 {
@@ -306,7 +401,8 @@ nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p)
 }
 
 static int
-nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p)
+nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p,
+               struct nfsd4_cb_sequence *seq)
 {
        struct xdr_stream xdr;
        struct nfs4_cb_compound_hdr hdr;
@@ -316,6 +412,11 @@ nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p)
        status = decode_cb_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       if (seq) {
+               status = decode_cb_sequence(&xdr, seq, rqstp);
+               if (status)
+                       goto out;
+       }
        status = decode_cb_op_hdr(&xdr, OP_CB_RECALL);
 out:
        return status;
@@ -377,16 +478,15 @@ static int max_cb_time(void)
 
 int setup_callback_client(struct nfs4_client *clp)
 {
-       struct sockaddr_in      addr;
        struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
        struct rpc_timeout      timeparms = {
                .to_initval     = max_cb_time(),
                .to_retries     = 0,
        };
        struct rpc_create_args args = {
-               .protocol       = IPPROTO_TCP,
-               .address        = (struct sockaddr *)&addr,
-               .addrsize       = sizeof(addr),
+               .protocol       = XPRT_TRANSPORT_TCP,
+               .address        = (struct sockaddr *) &cb->cb_addr,
+               .addrsize       = cb->cb_addrlen,
                .timeout        = &timeparms,
                .program        = &cb_program,
                .prognumber     = cb->cb_prog,
@@ -399,13 +499,10 @@ int setup_callback_client(struct nfs4_client *clp)
 
        if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5))
                return -EINVAL;
-
-       /* Initialize address */
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(cb->cb_port);
-       addr.sin_addr.s_addr = htonl(cb->cb_addr);
-
+       if (cb->cb_minorversion) {
+               args.bc_xprt = clp->cl_cb_xprt;
+               args.protocol = XPRT_TRANSPORT_BC_TCP;
+       }
        /* Create RPC client */
        client = rpc_create(&args);
        if (IS_ERR(client)) {
@@ -439,42 +536,29 @@ static const struct rpc_call_ops nfsd4_cb_probe_ops = {
        .rpc_call_done = nfsd4_cb_probe_done,
 };
 
-static struct rpc_cred *lookup_cb_cred(struct nfs4_cb_conn *cb)
-{
-       struct auth_cred acred = {
-               .machine_cred = 1
-       };
+static struct rpc_cred *callback_cred;
 
-       /*
-        * Note in the gss case this doesn't actually have to wait for a
-        * gss upcall (or any calls to the client); this just creates a
-        * non-uptodate cred which the rpc state machine will fill in with
-        * a refresh_upcall later.
-        */
-       return rpcauth_lookup_credcache(cb->cb_client->cl_auth, &acred,
-                                                       RPCAUTH_LOOKUP_NEW);
+int set_callback_cred(void)
+{
+       callback_cred = rpc_lookup_machine_cred();
+       if (!callback_cred)
+               return -ENOMEM;
+       return 0;
 }
 
+
 void do_probe_callback(struct nfs4_client *clp)
 {
        struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
        struct rpc_message msg = {
                .rpc_proc       = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
                .rpc_argp       = clp,
+               .rpc_cred       = callback_cred
        };
-       struct rpc_cred *cred;
        int status;
 
-       cred = lookup_cb_cred(cb);
-       if (IS_ERR(cred)) {
-               status = PTR_ERR(cred);
-               goto out;
-       }
-       cb->cb_cred = cred;
-       msg.rpc_cred = cb->cb_cred;
        status = rpc_call_async(cb->cb_client, &msg, RPC_TASK_SOFT,
                                &nfsd4_cb_probe_ops, (void *)clp);
-out:
        if (status) {
                warn_no_callback_path(clp, status);
                put_nfs4_client(clp);
@@ -503,11 +587,95 @@ nfsd4_probe_callback(struct nfs4_client *clp)
        do_probe_callback(clp);
 }
 
+/*
+ * There's currently a single callback channel slot.
+ * If the slot is available, then mark it busy.  Otherwise, set the
+ * thread for sleeping on the callback RPC wait queue.
+ */
+static int nfsd41_cb_setup_sequence(struct nfs4_client *clp,
+               struct rpc_task *task)
+{
+       struct nfs4_rpc_args *args = task->tk_msg.rpc_argp;
+       u32 *ptr = (u32 *)clp->cl_sessionid.data;
+       int status = 0;
+
+       dprintk("%s: %u:%u:%u:%u\n", __func__,
+               ptr[0], ptr[1], ptr[2], ptr[3]);
+
+       if (test_and_set_bit(0, &clp->cl_cb_slot_busy) != 0) {
+               rpc_sleep_on(&clp->cl_cb_waitq, task, NULL);
+               dprintk("%s slot is busy\n", __func__);
+               status = -EAGAIN;
+               goto out;
+       }
+
+       /*
+        * We'll need the clp during XDR encoding and decoding,
+        * and the sequence during decoding to verify the reply
+        */
+       args->args_seq.cbs_clp = clp;
+       task->tk_msg.rpc_resp = &args->args_seq;
+
+out:
+       dprintk("%s status=%d\n", __func__, status);
+       return status;
+}
+
+/*
+ * TODO: cb_sequence should support referring call lists, cachethis, multiple
+ * slots, and mark callback channel down on communication errors.
+ */
+static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)
+{
+       struct nfs4_delegation *dp = calldata;
+       struct nfs4_client *clp = dp->dl_client;
+       struct nfs4_rpc_args *args = task->tk_msg.rpc_argp;
+       u32 minorversion = clp->cl_cb_conn.cb_minorversion;
+       int status = 0;
+
+       args->args_seq.cbs_minorversion = minorversion;
+       if (minorversion) {
+               status = nfsd41_cb_setup_sequence(clp, task);
+               if (status) {
+                       if (status != -EAGAIN) {
+                               /* terminate rpc task */
+                               task->tk_status = status;
+                               task->tk_action = NULL;
+                       }
+                       return;
+               }
+       }
+       rpc_call_start(task);
+}
+
+static void nfsd4_cb_done(struct rpc_task *task, void *calldata)
+{
+       struct nfs4_delegation *dp = calldata;
+       struct nfs4_client *clp = dp->dl_client;
+
+       dprintk("%s: minorversion=%d\n", __func__,
+               clp->cl_cb_conn.cb_minorversion);
+
+       if (clp->cl_cb_conn.cb_minorversion) {
+               /* No need for lock, access serialized in nfsd4_cb_prepare */
+               ++clp->cl_cb_seq_nr;
+               clear_bit(0, &clp->cl_cb_slot_busy);
+               rpc_wake_up_next(&clp->cl_cb_waitq);
+               dprintk("%s: freed slot, new seqid=%d\n", __func__,
+                       clp->cl_cb_seq_nr);
+
+               /* We're done looking into the sequence information */
+               task->tk_msg.rpc_resp = NULL;
+       }
+}
+
 static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
 {
        struct nfs4_delegation *dp = calldata;
        struct nfs4_client *clp = dp->dl_client;
 
+       nfsd4_cb_done(task, calldata);
+
        switch (task->tk_status) {
        case -EIO:
                /* Network partition? */
@@ -520,16 +688,19 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
                break;
        default:
                /* success, or error we can't handle */
-               return;
+               goto done;
        }
        if (dp->dl_retries--) {
                rpc_delay(task, 2*HZ);
                task->tk_status = 0;
                rpc_restart_call(task);
+               return;
        } else {
                atomic_set(&clp->cl_cb_conn.cb_set, 0);
                warn_no_callback_path(clp, task->tk_status);
        }
+done:
+       kfree(task->tk_msg.rpc_argp);
 }
 
 static void nfsd4_cb_recall_release(void *calldata)
@@ -542,6 +713,7 @@ static void nfsd4_cb_recall_release(void *calldata)
 }
 
 static const struct rpc_call_ops nfsd4_cb_recall_ops = {
+       .rpc_call_prepare = nfsd4_cb_prepare,
        .rpc_call_done = nfsd4_cb_recall_done,
        .rpc_release = nfsd4_cb_recall_release,
 };
@@ -554,17 +726,24 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
 {
        struct nfs4_client *clp = dp->dl_client;
        struct rpc_clnt *clnt = clp->cl_cb_conn.cb_client;
+       struct nfs4_rpc_args *args;
        struct rpc_message msg = {
                .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
-               .rpc_argp = dp,
-               .rpc_cred = clp->cl_cb_conn.cb_cred
+               .rpc_cred = callback_cred
        };
-       int status;
+       int status = -ENOMEM;
 
+       args = kzalloc(sizeof(*args), GFP_KERNEL);
+       if (!args)
+               goto out;
+       args->args_op = dp;
+       msg.rpc_argp = args;
        dp->dl_retries = 1;
        status = rpc_call_async(clnt, &msg, RPC_TASK_SOFT,
                                &nfsd4_cb_recall_ops, dp);
+out:
        if (status) {
+               kfree(args);
                put_nfs4_client(clp);
                nfs4_put_delegation(dp);
        }
index 7c88017..bebc0c2 100644 (file)
@@ -68,7 +68,6 @@ check_attr_support(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                   u32 *bmval, u32 *writable)
 {
        struct dentry *dentry = cstate->current_fh.fh_dentry;
-       struct svc_export *exp = cstate->current_fh.fh_export;
 
        /*
         * Check about attributes are supported by the NFSv4 server or not.
@@ -80,17 +79,13 @@ check_attr_support(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                return nfserr_attrnotsupp;
 
        /*
-        * Check FATTR4_WORD0_ACL & FATTR4_WORD0_FS_LOCATIONS can be supported
+        * Check FATTR4_WORD0_ACL can be supported
         * in current environment or not.
         */
        if (bmval[0] & FATTR4_WORD0_ACL) {
                if (!IS_POSIXACL(dentry->d_inode))
                        return nfserr_attrnotsupp;
        }
-       if (bmval[0] & FATTR4_WORD0_FS_LOCATIONS) {
-               if (exp->ex_fslocs.locations == NULL)
-                       return nfserr_attrnotsupp;
-       }
 
        /*
         * According to spec, read-only attributes return ERR_INVAL.
@@ -123,6 +118,35 @@ nfsd4_check_open_attributes(struct svc_rqst *rqstp,
        return status;
 }
 
+static int
+is_create_with_attrs(struct nfsd4_open *open)
+{
+       return open->op_create == NFS4_OPEN_CREATE
+               && (open->op_createmode == NFS4_CREATE_UNCHECKED
+                   || open->op_createmode == NFS4_CREATE_GUARDED
+                   || open->op_createmode == NFS4_CREATE_EXCLUSIVE4_1);
+}
+
+/*
+ * if error occurs when setting the acl, just clear the acl bit
+ * in the returned attr bitmap.
+ */
+static void
+do_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
+               struct nfs4_acl *acl, u32 *bmval)
+{
+       __be32 status;
+
+       status = nfsd4_set_nfs4_acl(rqstp, fhp, acl);
+       if (status)
+               /*
+                * We should probably fail the whole open at this point,
+                * but we've already created the file, so it's too late;
+                * So this seems the least of evils:
+                */
+               bmval[0] &= ~FATTR4_WORD0_ACL;
+}
+
 static inline void
 fh_dup2(struct svc_fh *dst, struct svc_fh *src)
 {
@@ -206,6 +230,9 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
        if (status)
                goto out;
 
+       if (is_create_with_attrs(open) && open->op_acl != NULL)
+               do_set_nfs4_acl(rqstp, &resfh, open->op_acl, open->op_bmval);
+
        set_change_info(&open->op_cinfo, current_fh);
        fh_dup2(current_fh, &resfh);
 
@@ -536,12 +563,17 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                status = nfserr_badtype;
        }
 
-       if (!status) {
-               fh_unlock(&cstate->current_fh);
-               set_change_info(&create->cr_cinfo, &cstate->current_fh);
-               fh_dup2(&cstate->current_fh, &resfh);
-       }
+       if (status)
+               goto out;
+
+       if (create->cr_acl != NULL)
+               do_set_nfs4_acl(rqstp, &resfh, create->cr_acl,
+                               create->cr_bmval);
 
+       fh_unlock(&cstate->current_fh);
+       set_change_info(&create->cr_cinfo, &cstate->current_fh);
+       fh_dup2(&cstate->current_fh, &resfh);
+out:
        fh_put(&resfh);
        return status;
 }
@@ -946,34 +978,6 @@ static struct nfsd4_operation nfsd4_ops[];
 
 static const char *nfsd4_op_name(unsigned opnum);
 
-/*
- * This is a replay of a compound for which no cache entry pages
- * were used. Encode the sequence operation, and if cachethis is FALSE
- * encode the uncache rep error on the next operation.
- */
-static __be32
-nfsd4_enc_uncached_replay(struct nfsd4_compoundargs *args,
-                        struct nfsd4_compoundres *resp)
-{
-       struct nfsd4_op *op;
-
-       dprintk("--> %s resp->opcnt %d ce_cachethis %u \n", __func__,
-               resp->opcnt, resp->cstate.slot->sl_cache_entry.ce_cachethis);
-
-       /* Encode the replayed sequence operation */
-       BUG_ON(resp->opcnt != 1);
-       op = &args->ops[resp->opcnt - 1];
-       nfsd4_encode_operation(resp, op);
-
-       /*return nfserr_retry_uncached_rep in next operation. */
-       if (resp->cstate.slot->sl_cache_entry.ce_cachethis == 0) {
-               op = &args->ops[resp->opcnt++];
-               op->status = nfserr_retry_uncached_rep;
-               nfsd4_encode_operation(resp, op);
-       }
-       return op->status;
-}
-
 /*
  * Enforce NFSv4.1 COMPOUND ordering rules.
  *
@@ -1083,13 +1087,10 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                        BUG_ON(op->status == nfs_ok);
 
 encode_op:
-               /* Only from SEQUENCE or CREATE_SESSION */
+               /* Only from SEQUENCE */
                if (resp->cstate.status == nfserr_replay_cache) {
                        dprintk("%s NFS4.1 replay from cache\n", __func__);
-                       if (nfsd4_not_cached(resp))
-                               status = nfsd4_enc_uncached_replay(args, resp);
-                       else
-                               status = op->status;
+                       status = op->status;
                        goto out;
                }
                if (op->status == nfserr_replay_me) {
index 980a216..2153f9b 100644 (file)
@@ -55,6 +55,7 @@
 #include <linux/lockd/bind.h>
 #include <linux/module.h>
 #include <linux/sunrpc/svcauth_gss.h>
+#include <linux/sunrpc/clnt.h>
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
@@ -413,36 +414,65 @@ gen_sessionid(struct nfsd4_session *ses)
 }
 
 /*
- * Give the client the number of slots it requests bound by
- * NFSD_MAX_SLOTS_PER_SESSION and by sv_drc_max_pages.
+ * The protocol defines ca_maxresponssize_cached to include the size of
+ * the rpc header, but all we need to cache is the data starting after
+ * the end of the initial SEQUENCE operation--the rest we regenerate
+ * each time.  Therefore we can advertise a ca_maxresponssize_cached
+ * value that is the number of bytes in our cache plus a few additional
+ * bytes.  In order to stay on the safe side, and not promise more than
+ * we can cache, those additional bytes must be the minimum possible: 24
+ * bytes of rpc header (xid through accept state, with AUTH_NULL
+ * verifier), 12 for the compound header (with zero-length tag), and 44
+ * for the SEQUENCE op response:
+ */
+#define NFSD_MIN_HDR_SEQ_SZ  (24 + 12 + 44)
+
+/*
+ * Give the client the number of ca_maxresponsesize_cached slots it
+ * requests, of size bounded by NFSD_SLOT_CACHE_SIZE,
+ * NFSD_MAX_MEM_PER_SESSION, and nfsd_drc_max_mem. Do not allow more
+ * than NFSD_MAX_SLOTS_PER_SESSION.
  *
- * If we run out of pages (sv_drc_pages_used == sv_drc_max_pages) we
- * should (up to a point) re-negotiate active sessions and reduce their
- * slot usage to make rooom for new connections. For now we just fail the
- * create session.
+ * If we run out of reserved DRC memory we should (up to a point)
+ * re-negotiate active sessions and reduce their slot usage to make
+ * rooom for new connections. For now we just fail the create session.
  */
-static int set_forechannel_maxreqs(struct nfsd4_channel_attrs *fchan)
+static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan)
 {
-       int status = 0, np = fchan->maxreqs * NFSD_PAGES_PER_SLOT;
+       int mem, size = fchan->maxresp_cached;
 
        if (fchan->maxreqs < 1)
                return nfserr_inval;
-       else if (fchan->maxreqs > NFSD_MAX_SLOTS_PER_SESSION)
-               fchan->maxreqs = NFSD_MAX_SLOTS_PER_SESSION;
 
-       spin_lock(&nfsd_serv->sv_lock);
-       if (np + nfsd_serv->sv_drc_pages_used > nfsd_serv->sv_drc_max_pages)
-               np = nfsd_serv->sv_drc_max_pages - nfsd_serv->sv_drc_pages_used;
-       nfsd_serv->sv_drc_pages_used += np;
-       spin_unlock(&nfsd_serv->sv_lock);
+       if (size < NFSD_MIN_HDR_SEQ_SZ)
+               size = NFSD_MIN_HDR_SEQ_SZ;
+       size -= NFSD_MIN_HDR_SEQ_SZ;
+       if (size > NFSD_SLOT_CACHE_SIZE)
+               size = NFSD_SLOT_CACHE_SIZE;
+
+       /* bound the maxreqs by NFSD_MAX_MEM_PER_SESSION */
+       mem = fchan->maxreqs * size;
+       if (mem > NFSD_MAX_MEM_PER_SESSION) {
+               fchan->maxreqs = NFSD_MAX_MEM_PER_SESSION / size;
+               if (fchan->maxreqs > NFSD_MAX_SLOTS_PER_SESSION)
+                       fchan->maxreqs = NFSD_MAX_SLOTS_PER_SESSION;
+               mem = fchan->maxreqs * size;
+       }
 
-       if (np <= 0) {
-               status = nfserr_resource;
-               fchan->maxreqs = 0;
-       } else
-               fchan->maxreqs = np / NFSD_PAGES_PER_SLOT;
+       spin_lock(&nfsd_drc_lock);
+       /* bound the total session drc memory ussage */
+       if (mem + nfsd_drc_mem_used > nfsd_drc_max_mem) {
+               fchan->maxreqs = (nfsd_drc_max_mem - nfsd_drc_mem_used) / size;
+               mem = fchan->maxreqs * size;
+       }
+       nfsd_drc_mem_used += mem;
+       spin_unlock(&nfsd_drc_lock);
 
-       return status;
+       if (fchan->maxreqs == 0)
+               return nfserr_serverfault;
+
+       fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ;
+       return 0;
 }
 
 /*
@@ -466,36 +496,41 @@ static int init_forechannel_attrs(struct svc_rqst *rqstp,
                fchan->maxresp_sz = maxcount;
        session_fchan->maxresp_sz = fchan->maxresp_sz;
 
-       /* Set the max response cached size our default which is
-        * a multiple of PAGE_SIZE and small */
-       session_fchan->maxresp_cached = NFSD_PAGES_PER_SLOT * PAGE_SIZE;
-       fchan->maxresp_cached = session_fchan->maxresp_cached;
-
        /* Use the client's maxops if possible */
        if (fchan->maxops > NFSD_MAX_OPS_PER_COMPOUND)
                fchan->maxops = NFSD_MAX_OPS_PER_COMPOUND;
        session_fchan->maxops = fchan->maxops;
 
-       /* try to use the client requested number of slots */
-       if (fchan->maxreqs > NFSD_MAX_SLOTS_PER_SESSION)
-               fchan->maxreqs = NFSD_MAX_SLOTS_PER_SESSION;
-
        /* FIXME: Error means no more DRC pages so the server should
         * recover pages from existing sessions. For now fail session
         * creation.
         */
-       status = set_forechannel_maxreqs(fchan);
+       status = set_forechannel_drc_size(fchan);
 
+       session_fchan->maxresp_cached = fchan->maxresp_cached;
        session_fchan->maxreqs = fchan->maxreqs;
+
+       dprintk("%s status %d\n", __func__, status);
        return status;
 }
 
+static void
+free_session_slots(struct nfsd4_session *ses)
+{
+       int i;
+
+       for (i = 0; i < ses->se_fchannel.maxreqs; i++)
+               kfree(ses->se_slots[i]);
+}
+
 static int
 alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
                   struct nfsd4_create_session *cses)
 {
        struct nfsd4_session *new, tmp;
-       int idx, status = nfserr_resource, slotsize;
+       struct nfsd4_slot *sp;
+       int idx, slotsize, cachesize, i;
+       int status;
 
        memset(&tmp, 0, sizeof(tmp));
 
@@ -506,14 +541,27 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
        if (status)
                goto out;
 
-       /* allocate struct nfsd4_session and slot table in one piece */
-       slotsize = tmp.se_fchannel.maxreqs * sizeof(struct nfsd4_slot);
+       BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot)
+                    + sizeof(struct nfsd4_session) > PAGE_SIZE);
+
+       status = nfserr_serverfault;
+       /* allocate struct nfsd4_session and slot table pointers in one piece */
+       slotsize = tmp.se_fchannel.maxreqs * sizeof(struct nfsd4_slot *);
        new = kzalloc(sizeof(*new) + slotsize, GFP_KERNEL);
        if (!new)
                goto out;
 
        memcpy(new, &tmp, sizeof(*new));
 
+       /* allocate each struct nfsd4_slot and data cache in one piece */
+       cachesize = new->se_fchannel.maxresp_cached - NFSD_MIN_HDR_SEQ_SZ;
+       for (i = 0; i < new->se_fchannel.maxreqs; i++) {
+               sp = kzalloc(sizeof(*sp) + cachesize, GFP_KERNEL);
+               if (!sp)
+                       goto out_free;
+               new->se_slots[i] = sp;
+       }
+
        new->se_client = clp;
        gen_sessionid(new);
        idx = hash_sessionid(&new->se_sessionid);
@@ -530,6 +578,10 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
        status = nfs_ok;
 out:
        return status;
+out_free:
+       free_session_slots(new);
+       kfree(new);
+       goto out;
 }
 
 /* caller must hold sessionid_lock */
@@ -572,19 +624,16 @@ release_session(struct nfsd4_session *ses)
        nfsd4_put_session(ses);
 }
 
-static void nfsd4_release_respages(struct page **respages, short resused);
-
 void
 free_session(struct kref *kref)
 {
        struct nfsd4_session *ses;
-       int i;
 
        ses = container_of(kref, struct nfsd4_session, se_ref);
-       for (i = 0; i < ses->se_fchannel.maxreqs; i++) {
-               struct nfsd4_cache_entry *e = &ses->se_slots[i].sl_cache_entry;
-               nfsd4_release_respages(e->ce_respages, e->ce_resused);
-       }
+       spin_lock(&nfsd_drc_lock);
+       nfsd_drc_mem_used -= ses->se_fchannel.maxreqs * NFSD_SLOT_CACHE_SIZE;
+       spin_unlock(&nfsd_drc_lock);
+       free_session_slots(ses);
        kfree(ses);
 }
 
@@ -647,18 +696,14 @@ shutdown_callback_client(struct nfs4_client *clp)
                clp->cl_cb_conn.cb_client = NULL;
                rpc_shutdown_client(clnt);
        }
-       if (clp->cl_cb_conn.cb_cred) {
-               put_rpccred(clp->cl_cb_conn.cb_cred);
-               clp->cl_cb_conn.cb_cred = NULL;
-       }
 }
 
 static inline void
 free_client(struct nfs4_client *clp)
 {
        shutdown_callback_client(clp);
-       nfsd4_release_respages(clp->cl_slot.sl_cache_entry.ce_respages,
-                            clp->cl_slot.sl_cache_entry.ce_resused);
+       if (clp->cl_cb_xprt)
+               svc_xprt_put(clp->cl_cb_xprt);
        if (clp->cl_cred.cr_group_info)
                put_group_info(clp->cl_cred.cr_group_info);
        kfree(clp->cl_principal);
@@ -714,25 +759,6 @@ expire_client(struct nfs4_client *clp)
        put_nfs4_client(clp);
 }
 
-static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir)
-{
-       struct nfs4_client *clp;
-
-       clp = alloc_client(name);
-       if (clp == NULL)
-               return NULL;
-       memcpy(clp->cl_recdir, recdir, HEXDIR_LEN);
-       atomic_set(&clp->cl_count, 1);
-       atomic_set(&clp->cl_cb_conn.cb_set, 0);
-       INIT_LIST_HEAD(&clp->cl_idhash);
-       INIT_LIST_HEAD(&clp->cl_strhash);
-       INIT_LIST_HEAD(&clp->cl_openowners);
-       INIT_LIST_HEAD(&clp->cl_delegations);
-       INIT_LIST_HEAD(&clp->cl_sessions);
-       INIT_LIST_HEAD(&clp->cl_lru);
-       return clp;
-}
-
 static void copy_verf(struct nfs4_client *target, nfs4_verifier *source)
 {
        memcpy(target->cl_verifier.data, source->data,
@@ -795,6 +821,46 @@ static void gen_confirm(struct nfs4_client *clp)
        *p++ = i++;
 }
 
+static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir,
+               struct svc_rqst *rqstp, nfs4_verifier *verf)
+{
+       struct nfs4_client *clp;
+       struct sockaddr *sa = svc_addr(rqstp);
+       char *princ;
+
+       clp = alloc_client(name);
+       if (clp == NULL)
+               return NULL;
+
+       princ = svc_gss_principal(rqstp);
+       if (princ) {
+               clp->cl_principal = kstrdup(princ, GFP_KERNEL);
+               if (clp->cl_principal == NULL) {
+                       free_client(clp);
+                       return NULL;
+               }
+       }
+
+       memcpy(clp->cl_recdir, recdir, HEXDIR_LEN);
+       atomic_set(&clp->cl_count, 1);
+       atomic_set(&clp->cl_cb_conn.cb_set, 0);
+       INIT_LIST_HEAD(&clp->cl_idhash);
+       INIT_LIST_HEAD(&clp->cl_strhash);
+       INIT_LIST_HEAD(&clp->cl_openowners);
+       INIT_LIST_HEAD(&clp->cl_delegations);
+       INIT_LIST_HEAD(&clp->cl_sessions);
+       INIT_LIST_HEAD(&clp->cl_lru);
+       clear_bit(0, &clp->cl_cb_slot_busy);
+       rpc_init_wait_queue(&clp->cl_cb_waitq, "Backchannel slot table");
+       copy_verf(clp, verf);
+       rpc_copy_addr((struct sockaddr *) &clp->cl_addr, sa);
+       clp->cl_flavor = rqstp->rq_flavor;
+       copy_cred(&clp->cl_cred, &rqstp->rq_cred);
+       gen_confirm(clp);
+
+       return clp;
+}
+
 static int check_name(struct xdr_netobj name)
 {
        if (name.len == 0) 
@@ -902,93 +968,40 @@ find_unconfirmed_client_by_str(const char *dname, unsigned int hashval,
        return NULL;
 }
 
-/* a helper function for parse_callback */
-static int
-parse_octet(unsigned int *lenp, char **addrp)
-{
-       unsigned int len = *lenp;
-       char *p = *addrp;
-       int n = -1;
-       char c;
-
-       for (;;) {
-               if (!len)
-                       break;
-               len--;
-               c = *p++;
-               if (c == '.')
-                       break;
-               if ((c < '0') || (c > '9')) {
-                       n = -1;
-                       break;
-               }
-               if (n < 0)
-                       n = 0;
-               n = (n * 10) + (c - '0');
-               if (n > 255) {
-                       n = -1;
-                       break;
-               }
-       }
-       *lenp = len;
-       *addrp = p;
-       return n;
-}
-
-/* parse and set the setclientid ipv4 callback address */
-static int
-parse_ipv4(unsigned int addr_len, char *addr_val, unsigned int *cbaddrp, unsigned short *cbportp)
-{
-       int temp = 0;
-       u32 cbaddr = 0;
-       u16 cbport = 0;
-       u32 addrlen = addr_len;
-       char *addr = addr_val;
-       int i, shift;
-
-       /* ipaddress */
-       shift = 24;
-       for(i = 4; i > 0  ; i--) {
-               if ((temp = parse_octet(&addrlen, &addr)) < 0) {
-                       return 0;
-               }
-               cbaddr |= (temp << shift);
-               if (shift > 0)
-               shift -= 8;
-       }
-       *cbaddrp = cbaddr;
-
-       /* port */
-       shift = 8;
-       for(i = 2; i > 0  ; i--) {
-               if ((temp = parse_octet(&addrlen, &addr)) < 0) {
-                       return 0;
-               }
-               cbport |= (temp << shift);
-               if (shift > 0)
-                       shift -= 8;
-       }
-       *cbportp = cbport;
-       return 1;
-}
-
 static void
-gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se)
+gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, u32 scopeid)
 {
        struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
-
-       /* Currently, we only support tcp for the callback channel */
-       if ((se->se_callback_netid_len != 3) || memcmp((char *)se->se_callback_netid_val, "tcp", 3))
+       unsigned short expected_family;
+
+       /* Currently, we only support tcp and tcp6 for the callback channel */
+       if (se->se_callback_netid_len == 3 &&
+           !memcmp(se->se_callback_netid_val, "tcp", 3))
+               expected_family = AF_INET;
+       else if (se->se_callback_netid_len == 4 &&
+                !memcmp(se->se_callback_netid_val, "tcp6", 4))
+               expected_family = AF_INET6;
+       else
                goto out_err;
 
-       if ( !(parse_ipv4(se->se_callback_addr_len, se->se_callback_addr_val,
-                        &cb->cb_addr, &cb->cb_port)))
+       cb->cb_addrlen = rpc_uaddr2sockaddr(se->se_callback_addr_val,
+                                           se->se_callback_addr_len,
+                                           (struct sockaddr *) &cb->cb_addr,
+                                           sizeof(cb->cb_addr));
+
+       if (!cb->cb_addrlen || cb->cb_addr.ss_family != expected_family)
                goto out_err;
+
+       if (cb->cb_addr.ss_family == AF_INET6)
+               ((struct sockaddr_in6 *) &cb->cb_addr)->sin6_scope_id = scopeid;
+
        cb->cb_minorversion = 0;
        cb->cb_prog = se->se_callback_prog;
        cb->cb_ident = se->se_callback_ident;
        return;
 out_err:
+       cb->cb_addr.ss_family = AF_UNSPEC;
+       cb->cb_addrlen = 0;
        dprintk(KERN_INFO "NFSD: this client (clientid %08x/%08x) "
                "will not receive delegations\n",
                clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id);
@@ -996,175 +1009,87 @@ out_err:
        return;
 }
 
-void
-nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
-{
-       struct nfsd4_compoundres *resp = rqstp->rq_resp;
-
-       resp->cstate.statp = statp;
-}
-
 /*
- * Dereference the result pages.
+ * Cache a reply. nfsd4_check_drc_limit() has bounded the cache size.
  */
-static void
-nfsd4_release_respages(struct page **respages, short resused)
+void
+nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
 {
-       int i;
+       struct nfsd4_slot *slot = resp->cstate.slot;
+       unsigned int base;
 
-       dprintk("--> %s\n", __func__);
-       for (i = 0; i < resused; i++) {
-               if (!respages[i])
-                       continue;
-               put_page(respages[i]);
-               respages[i] = NULL;
-       }
-}
+       dprintk("--> %s slot %p\n", __func__, slot);
 
-static void
-nfsd4_copy_pages(struct page **topages, struct page **frompages, short count)
-{
-       int i;
+       slot->sl_opcnt = resp->opcnt;
+       slot->sl_status = resp->cstate.status;
 
-       for (i = 0; i < count; i++) {
-               topages[i] = frompages[i];
-               if (!topages[i])
-                       continue;
-               get_page(topages[i]);
+       if (nfsd4_not_cached(resp)) {
+               slot->sl_datalen = 0;
+               return;
        }
+       slot->sl_datalen = (char *)resp->p - (char *)resp->cstate.datap;
+       base = (char *)resp->cstate.datap -
+                                       (char *)resp->xbuf->head[0].iov_base;
+       if (read_bytes_from_xdr_buf(resp->xbuf, base, slot->sl_data,
+                                   slot->sl_datalen))
+               WARN("%s: sessions DRC could not cache compound\n", __func__);
+       return;
 }
 
 /*
- * Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing the previous
- * pages. We add a page to NFSD_PAGES_PER_SLOT for the case where the total
- * length of the XDR response is less than se_fmaxresp_cached
- * (NFSD_PAGES_PER_SLOT * PAGE_SIZE) but the xdr_buf pages is used for a
- * of the reply (e.g. readdir).
+ * Encode the replay sequence operation from the slot values.
+ * If cachethis is FALSE encode the uncached rep error on the next
+ * operation which sets resp->p and increments resp->opcnt for
+ * nfs4svc_encode_compoundres.
  *
- * Store the base and length of the rq_req.head[0] page
- * of the NFSv4.1 data, just past the rpc header.
  */
-void
-nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
+static __be32
+nfsd4_enc_sequence_replay(struct nfsd4_compoundargs *args,
+                         struct nfsd4_compoundres *resp)
 {
-       struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;
-       struct svc_rqst *rqstp = resp->rqstp;
-       struct nfsd4_compoundargs *args = rqstp->rq_argp;
-       struct nfsd4_op *op = &args->ops[resp->opcnt];
-       struct kvec *resv = &rqstp->rq_res.head[0];
-
-       dprintk("--> %s entry %p\n", __func__, entry);
-
-       /* Don't cache a failed OP_SEQUENCE. */
-       if (resp->opcnt == 1 && op->opnum == OP_SEQUENCE && resp->cstate.status)
-               return;
+       struct nfsd4_op *op;
+       struct nfsd4_slot *slot = resp->cstate.slot;
 
-       nfsd4_release_respages(entry->ce_respages, entry->ce_resused);
-       entry->ce_opcnt = resp->opcnt;
-       entry->ce_status = resp->cstate.status;
+       dprintk("--> %s resp->opcnt %d cachethis %u \n", __func__,
+               resp->opcnt, resp->cstate.slot->sl_cachethis);
 
-       /*
-        * Don't need a page to cache just the sequence operation - the slot
-        * does this for us!
-        */
+       /* Encode the replayed sequence operation */
+       op = &args->ops[resp->opcnt - 1];
+       nfsd4_encode_operation(resp, op);
 
-       if (nfsd4_not_cached(resp)) {
-               entry->ce_resused = 0;
-               entry->ce_rpchdrlen = 0;
-               dprintk("%s Just cache SEQUENCE. ce_cachethis %d\n", __func__,
-                       resp->cstate.slot->sl_cache_entry.ce_cachethis);
-               return;
-       }
-       entry->ce_resused = rqstp->rq_resused;
-       if (entry->ce_resused > NFSD_PAGES_PER_SLOT + 1)
-               entry->ce_resused = NFSD_PAGES_PER_SLOT + 1;
-       nfsd4_copy_pages(entry->ce_respages, rqstp->rq_respages,
-                        entry->ce_resused);
-       entry->ce_datav.iov_base = resp->cstate.statp;
-       entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp -
-                               (char *)page_address(rqstp->rq_respages[0]));
-       /* Current request rpc header length*/
-       entry->ce_rpchdrlen = (char *)resp->cstate.statp -
-                               (char *)page_address(rqstp->rq_respages[0]);
-}
-
-/*
- * We keep the rpc header, but take the nfs reply from the replycache.
- */
-static int
-nfsd41_copy_replay_data(struct nfsd4_compoundres *resp,
-                       struct nfsd4_cache_entry *entry)
-{
-       struct svc_rqst *rqstp = resp->rqstp;
-       struct kvec *resv = &resp->rqstp->rq_res.head[0];
-       int len;
-
-       /* Current request rpc header length*/
-       len = (char *)resp->cstate.statp -
-                       (char *)page_address(rqstp->rq_respages[0]);
-       if (entry->ce_datav.iov_len + len > PAGE_SIZE) {
-               dprintk("%s v41 cached reply too large (%Zd).\n", __func__,
-                       entry->ce_datav.iov_len);
-               return 0;
+       /* Return nfserr_retry_uncached_rep in next operation. */
+       if (args->opcnt > 1 && slot->sl_cachethis == 0) {
+               op = &args->ops[resp->opcnt++];
+               op->status = nfserr_retry_uncached_rep;
+               nfsd4_encode_operation(resp, op);
        }
-       /* copy the cached reply nfsd data past the current rpc header */
-       memcpy((char *)resv->iov_base + len, entry->ce_datav.iov_base,
-               entry->ce_datav.iov_len);
-       resv->iov_len = len + entry->ce_datav.iov_len;
-       return 1;
+       return op->status;
 }
 
 /*
- * Keep the first page of the replay. Copy the NFSv4.1 data from the first
- * cached page.  Replace any futher replay pages from the cache.
+ * The sequence operation is not cached because we can use the slot and
+ * session values.
  */
 __be32
 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
                         struct nfsd4_sequence *seq)
 {
-       struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;
+       struct nfsd4_slot *slot = resp->cstate.slot;
        __be32 status;
 
-       dprintk("--> %s entry %p\n", __func__, entry);
-
-       /*
-        * If this is just the sequence operation, we did not keep
-        * a page in the cache entry because we can just use the
-        * slot info stored in struct nfsd4_sequence that was checked
-        * against the slot in nfsd4_sequence().
-        *
-        * This occurs when seq->cachethis is FALSE, or when the client
-        * session inactivity timer fires and a solo sequence operation
-        * is sent (lease renewal).
-        */
-       if (seq && nfsd4_not_cached(resp)) {
-               seq->maxslots = resp->cstate.session->se_fchannel.maxreqs;
-               return nfs_ok;
-       }
-
-       if (!nfsd41_copy_replay_data(resp, entry)) {
-               /*
-                * Not enough room to use the replay rpc header, send the
-                * cached header. Release all the allocated result pages.
-                */
-               svc_free_res_pages(resp->rqstp);
-               nfsd4_copy_pages(resp->rqstp->rq_respages, entry->ce_respages,
-                       entry->ce_resused);
-       } else {
-               /* Release all but the first allocated result page */
+       dprintk("--> %s slot %p\n", __func__, slot);
 
-               resp->rqstp->rq_resused--;
-               svc_free_res_pages(resp->rqstp);
+       /* Either returns 0 or nfserr_retry_uncached */
+       status = nfsd4_enc_sequence_replay(resp->rqstp->rq_argp, resp);
+       if (status == nfserr_retry_uncached_rep)
+               return status;
 
-               nfsd4_copy_pages(&resp->rqstp->rq_respages[1],
-                                &entry->ce_respages[1],
-                                entry->ce_resused - 1);
-       }
+       /* The sequence operation has been encoded, cstate->datap set. */
+       memcpy(resp->cstate.datap, slot->sl_data, slot->sl_datalen);
 
-       resp->rqstp->rq_resused = entry->ce_resused;
-       resp->opcnt = entry->ce_opcnt;
-       resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen;
-       status = entry->ce_status;
+       resp->opcnt = slot->sl_opcnt;
+       resp->p = resp->cstate.datap + XDR_QUADLEN(slot->sl_datalen);
+       status = slot->sl_status;
 
        return status;
 }
@@ -1194,13 +1119,15 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
        int status;
        unsigned int            strhashval;
        char                    dname[HEXDIR_LEN];
+       char                    addr_str[INET6_ADDRSTRLEN];
        nfs4_verifier           verf = exid->verifier;
-       u32                     ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr;
+       struct sockaddr         *sa = svc_addr(rqstp);
 
+       rpc_ntop(sa, addr_str, sizeof(addr_str));
        dprintk("%s rqstp=%p exid=%p clname.len=%u clname.data=%p "
-               " ip_addr=%u flags %x, spa_how %d\n",
+               "ip_addr=%s flags %x, spa_how %d\n",
                __func__, rqstp, exid, exid->clname.len, exid->clname.data,
-               ip_addr, exid->flags, exid->spa_how);
+               addr_str, exid->flags, exid->spa_how);
 
        if (!check_name(exid->clname) || (exid->flags & ~EXCHGID4_FLAG_MASK_A))
                return nfserr_inval;
@@ -1281,28 +1208,23 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
 
 out_new:
        /* Normal case */
-       new = create_client(exid->clname, dname);
+       new = create_client(exid->clname, dname, rqstp, &verf);
        if (new == NULL) {
-               status = nfserr_resource;
+               status = nfserr_serverfault;
                goto out;
        }
 
-       copy_verf(new, &verf);
-       copy_cred(&new->cl_cred, &rqstp->rq_cred);
-       new->cl_addr = ip_addr;
        gen_clid(new);
-       gen_confirm(new);
        add_to_unconfirmed(new, strhashval);
 out_copy:
        exid->clientid.cl_boot = new->cl_clientid.cl_boot;
        exid->clientid.cl_id = new->cl_clientid.cl_id;
 
-       new->cl_slot.sl_seqid = 0;
        exid->seqid = 1;
        nfsd4_set_ex_flags(new, exid);
 
        dprintk("nfsd4_exchange_id seqid %d flags %x\n",
-               new->cl_slot.sl_seqid, new->cl_exchange_flags);
+               new->cl_cs_slot.sl_seqid, new->cl_exchange_flags);
        status = nfs_ok;
 
 out:
@@ -1313,40 +1235,60 @@ error:
 }
 
 static int
-check_slot_seqid(u32 seqid, struct nfsd4_slot *slot)
+check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)
 {
-       dprintk("%s enter. seqid %d slot->sl_seqid %d\n", __func__, seqid,
-               slot->sl_seqid);
+       dprintk("%s enter. seqid %d slot_seqid %d\n", __func__, seqid,
+               slot_seqid);
 
        /* The slot is in use, and no response has been sent. */
-       if (slot->sl_inuse) {
-               if (seqid == slot->sl_seqid)
+       if (slot_inuse) {
+               if (seqid == slot_seqid)
                        return nfserr_jukebox;
                else
                        return nfserr_seq_misordered;
        }
        /* Normal */
-       if (likely(seqid == slot->sl_seqid + 1))
+       if (likely(seqid == slot_seqid + 1))
                return nfs_ok;
        /* Replay */
-       if (seqid == slot->sl_seqid)
+       if (seqid == slot_seqid)
                return nfserr_replay_cache;
        /* Wraparound */
-       if (seqid == 1 && (slot->sl_seqid + 1) == 0)
+       if (seqid == 1 && (slot_seqid + 1) == 0)
                return nfs_ok;
        /* Misordered replay or misordered new request */
        return nfserr_seq_misordered;
 }
 
+/*
+ * Cache the create session result into the create session single DRC
+ * slot cache by saving the xdr structure. sl_seqid has been set.
+ * Do this for solo or embedded create session operations.
+ */
+static void
+nfsd4_cache_create_session(struct nfsd4_create_session *cr_ses,
+                          struct nfsd4_clid_slot *slot, int nfserr)
+{
+       slot->sl_status = nfserr;
+       memcpy(&slot->sl_cr_ses, cr_ses, sizeof(*cr_ses));
+}
+
+static __be32
+nfsd4_replay_create_session(struct nfsd4_create_session *cr_ses,
+                           struct nfsd4_clid_slot *slot)
+{
+       memcpy(cr_ses, &slot->sl_cr_ses, sizeof(*cr_ses));
+       return slot->sl_status;
+}
+
 __be32
 nfsd4_create_session(struct svc_rqst *rqstp,
                     struct nfsd4_compound_state *cstate,
                     struct nfsd4_create_session *cr_ses)
 {
-       u32 ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr;
-       struct nfsd4_compoundres *resp = rqstp->rq_resp;
+       struct sockaddr *sa = svc_addr(rqstp);
        struct nfs4_client *conf, *unconf;
-       struct nfsd4_slot *slot = NULL;
+       struct nfsd4_clid_slot *cs_slot = NULL;
        int status = 0;
 
        nfs4_lock_state();
@@ -1354,40 +1296,38 @@ nfsd4_create_session(struct svc_rqst *rqstp,
        conf = find_confirmed_client(&cr_ses->clientid);
 
        if (conf) {
-               slot = &conf->cl_slot;
-               status = check_slot_seqid(cr_ses->seqid, slot);
+               cs_slot = &conf->cl_cs_slot;
+               status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0);
                if (status == nfserr_replay_cache) {
                        dprintk("Got a create_session replay! seqid= %d\n",
-                               slot->sl_seqid);
-                       cstate->slot = slot;
-                       cstate->status = status;
+                               cs_slot->sl_seqid);
                        /* Return the cached reply status */
-                       status = nfsd4_replay_cache_entry(resp, NULL);
+                       status = nfsd4_replay_create_session(cr_ses, cs_slot);
                        goto out;
-               } else if (cr_ses->seqid != conf->cl_slot.sl_seqid + 1) {
+               } else if (cr_ses->seqid != cs_slot->sl_seqid + 1) {
                        status = nfserr_seq_misordered;
                        dprintk("Sequence misordered!\n");
                        dprintk("Expected seqid= %d but got seqid= %d\n",
-                               slot->sl_seqid, cr_ses->seqid);
+                               cs_slot->sl_seqid, cr_ses->seqid);
                        goto out;
                }
-               conf->cl_slot.sl_seqid++;
+               cs_slot->sl_seqid++;
        } else if (unconf) {
                if (!same_creds(&unconf->cl_cred, &rqstp->rq_cred) ||
-                   (ip_addr != unconf->cl_addr)) {
+                   !rpc_cmp_addr(sa, (struct sockaddr *) &unconf->cl_addr)) {
                        status = nfserr_clid_inuse;
                        goto out;
                }
 
-               slot = &unconf->cl_slot;
-               status = check_slot_seqid(cr_ses->seqid, slot);
+               cs_slot = &unconf->cl_cs_slot;
+               status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0);
                if (status) {
                        /* an unconfirmed replay returns misordered */
                        status = nfserr_seq_misordered;
-                       goto out;
+                       goto out_cache;
                }
 
-               slot->sl_seqid++; /* from 0 to 1 */
+               cs_slot->sl_seqid++; /* from 0 to 1 */
                move_to_confirmed(unconf);
 
                /*
@@ -1396,6 +1336,19 @@ nfsd4_create_session(struct svc_rqst *rqstp,
                cr_ses->flags &= ~SESSION4_PERSIST;
                cr_ses->flags &= ~SESSION4_RDMA;
 
+               if (cr_ses->flags & SESSION4_BACK_CHAN) {
+                       unconf->cl_cb_xprt = rqstp->rq_xprt;
+                       svc_xprt_get(unconf->cl_cb_xprt);
+                       rpc_copy_addr(
+                               (struct sockaddr *)&unconf->cl_cb_conn.cb_addr,
+                               sa);
+                       unconf->cl_cb_conn.cb_addrlen = svc_addr_len(sa);
+                       unconf->cl_cb_conn.cb_minorversion =
+                               cstate->minorversion;
+                       unconf->cl_cb_conn.cb_prog = cr_ses->callback_prog;
+                       unconf->cl_cb_seq_nr = 1;
+                       nfsd4_probe_callback(unconf);
+               }
                conf = unconf;
        } else {
                status = nfserr_stale_clientid;
@@ -1408,12 +1361,11 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 
        memcpy(cr_ses->sessionid.data, conf->cl_sessionid.data,
               NFS4_MAX_SESSIONID_LEN);
-       cr_ses->seqid = slot->sl_seqid;
+       cr_ses->seqid = cs_slot->sl_seqid;
 
-       slot->sl_inuse = true;
-       cstate->slot = slot;
-       /* Ensure a page is used for the cache */
-       slot->sl_cache_entry.ce_cachethis = 1;
+out_cache:
+       /* cache solo and embedded create sessions under the state lock */
+       nfsd4_cache_create_session(cr_ses, cs_slot, status);
 out:
        nfs4_unlock_state();
        dprintk("%s returns %d\n", __func__, ntohl(status));
@@ -1478,18 +1430,23 @@ nfsd4_sequence(struct svc_rqst *rqstp,
        if (seq->slotid >= session->se_fchannel.maxreqs)
                goto out;
 
-       slot = &session->se_slots[seq->slotid];
+       slot = session->se_slots[seq->slotid];
        dprintk("%s: slotid %d\n", __func__, seq->slotid);
 
-       status = check_slot_seqid(seq->seqid, slot);
+       /* We do not negotiate the number of slots yet, so set the
+        * maxslots to the session maxreqs which is used to encode
+        * sr_highest_slotid and the sr_target_slot id to maxslots */
+       seq->maxslots = session->se_fchannel.maxreqs;
+
+       status = check_slot_seqid(seq->seqid, slot->sl_seqid, slot->sl_inuse);
        if (status == nfserr_replay_cache) {
                cstate->slot = slot;
                cstate->session = session;
                /* Return the cached reply status and set cstate->status
-                * for nfsd4_svc_encode_compoundres processing */
+                * for nfsd4_proc_compound processing */
                status = nfsd4_replay_cache_entry(resp, seq);
                cstate->status = nfserr_replay_cache;
-               goto replay_cache;
+               goto out;
        }
        if (status)
                goto out;
@@ -1497,23 +1454,23 @@ nfsd4_sequence(struct svc_rqst *rqstp,
        /* Success! bump slot seqid */
        slot->sl_inuse = true;
        slot->sl_seqid = seq->seqid;
-       slot->sl_cache_entry.ce_cachethis = seq->cachethis;
-       /* Always set the cache entry cachethis for solo sequence */
-       if (nfsd4_is_solo_sequence(resp))
-               slot->sl_cache_entry.ce_cachethis = 1;
+       slot->sl_cachethis = seq->cachethis;
 
        cstate->slot = slot;
        cstate->session = session;
 
-replay_cache:
-       /* Renew the clientid on success and on replay.
-        * Hold a session reference until done processing the compound:
+       /* Hold a session reference until done processing the compound:
         * nfsd4_put_session called only if the cstate slot is set.
         */
-       renew_client(session->se_client);
        nfsd4_get_session(session);
 out:
        spin_unlock(&sessionid_lock);
+       /* Renew the clientid on success and on replay */
+       if (cstate->session) {
+               nfs4_lock_state();
+               renew_client(session->se_client);
+               nfs4_unlock_state();
+       }
        dprintk("%s: return %d\n", __func__, ntohl(status));
        return status;
 }
@@ -1522,7 +1479,7 @@ __be32
 nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                  struct nfsd4_setclientid *setclid)
 {
-       struct sockaddr_in      *sin = svc_addr_in(rqstp);
+       struct sockaddr         *sa = svc_addr(rqstp);
        struct xdr_netobj       clname = { 
                .len = setclid->se_namelen,
                .data = setclid->se_name,
@@ -1531,7 +1488,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        unsigned int            strhashval;
        struct nfs4_client      *conf, *unconf, *new;
        __be32                  status;
-       char                    *princ;
        char                    dname[HEXDIR_LEN];
        
        if (!check_name(clname))
@@ -1554,8 +1510,11 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                /* RFC 3530 14.2.33 CASE 0: */
                status = nfserr_clid_inuse;
                if (!same_creds(&conf->cl_cred, &rqstp->rq_cred)) {
-                       dprintk("NFSD: setclientid: string in use by client"
-                               " at %pI4\n", &conf->cl_addr);
+                       char addr_str[INET6_ADDRSTRLEN];
+                       rpc_ntop((struct sockaddr *) &conf->cl_addr, addr_str,
+                                sizeof(addr_str));
+                       dprintk("NFSD: setclientid: string in use by client "
+                               "at %s\n", addr_str);
                        goto out;
                }
        }
@@ -1573,7 +1532,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 */
                if (unconf)
                        expire_client(unconf);
-               new = create_client(clname, dname);
+               new = create_client(clname, dname, rqstp, &clverifier);
                if (new == NULL)
                        goto out;
                gen_clid(new);
@@ -1590,7 +1549,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                         */
                        expire_client(unconf);
                }
-               new = create_client(clname, dname);
+               new = create_client(clname, dname, rqstp, &clverifier);
                if (new == NULL)
                        goto out;
                copy_clid(new, conf);
@@ -1600,7 +1559,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 * probable client reboot; state will be removed if
                 * confirmed.
                 */
-               new = create_client(clname, dname);
+               new = create_client(clname, dname, rqstp, &clverifier);
                if (new == NULL)
                        goto out;
                gen_clid(new);
@@ -1611,25 +1570,12 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 * confirmed.
                 */
                expire_client(unconf);
-               new = create_client(clname, dname);
+               new = create_client(clname, dname, rqstp, &clverifier);
                if (new == NULL)
                        goto out;
                gen_clid(new);
        }
-       copy_verf(new, &clverifier);
-       new->cl_addr = sin->sin_addr.s_addr;
-       new->cl_flavor = rqstp->rq_flavor;
-       princ = svc_gss_principal(rqstp);
-       if (princ) {
-               new->cl_principal = kstrdup(princ, GFP_KERNEL);
-               if (new->cl_principal == NULL) {
-                       free_client(new);
-                       goto out;
-               }
-       }
-       copy_cred(&new->cl_cred, &rqstp->rq_cred);
-       gen_confirm(new);
-       gen_callback(new, setclid);
+       gen_callback(new, setclid, rpc_get_scope_id(sa));
        add_to_unconfirmed(new, strhashval);
        setclid->se_clientid.cl_boot = new->cl_clientid.cl_boot;
        setclid->se_clientid.cl_id = new->cl_clientid.cl_id;
@@ -1651,7 +1597,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                         struct nfsd4_compound_state *cstate,
                         struct nfsd4_setclientid_confirm *setclientid_confirm)
 {
-       struct sockaddr_in *sin = svc_addr_in(rqstp);
+       struct sockaddr *sa = svc_addr(rqstp);
        struct nfs4_client *conf, *unconf;
        nfs4_verifier confirm = setclientid_confirm->sc_confirm; 
        clientid_t * clid = &setclientid_confirm->sc_clientid;
@@ -1670,9 +1616,9 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
        unconf = find_unconfirmed_client(clid);
 
        status = nfserr_clid_inuse;
-       if (conf && conf->cl_addr != sin->sin_addr.s_addr)
+       if (conf && !rpc_cmp_addr((struct sockaddr *) &conf->cl_addr, sa))
                goto out;
-       if (unconf && unconf->cl_addr != sin->sin_addr.s_addr)
+       if (unconf && !rpc_cmp_addr((struct sockaddr *) &unconf->cl_addr, sa))
                goto out;
 
        /*
@@ -2163,7 +2109,7 @@ int nfsd_change_deleg_cb(struct file_lock **onlist, int arg)
                return -EAGAIN;
 }
 
-static struct lock_manager_operations nfsd_lease_mng_ops = {
+static const struct lock_manager_operations nfsd_lease_mng_ops = {
        .fl_break = nfsd_break_deleg_cb,
        .fl_release_private = nfsd_release_deleg_cb,
        .fl_copy_lock = nfsd_copy_lock_deleg_cb,
@@ -3368,7 +3314,7 @@ nfs4_transform_lock_offset(struct file_lock *lock)
 
 /* Hack!: For now, we're defining this just so we can use a pointer to it
  * as a unique cookie to identify our (NFSv4's) posix locks. */
-static struct lock_manager_operations nfsd_posix_mng_ops  = {
+static const struct lock_manager_operations nfsd_posix_mng_ops  = {
 };
 
 static inline void
@@ -4072,7 +4018,7 @@ set_max_delegations(void)
 
 /* initialization to perform when the nfsd service is started: */
 
-static void
+static int
 __nfs4_state_start(void)
 {
        unsigned long grace_time;
@@ -4084,19 +4030,26 @@ __nfs4_state_start(void)
        printk(KERN_INFO "NFSD: starting %ld-second grace period\n",
               grace_time/HZ);
        laundry_wq = create_singlethread_workqueue("nfsd4");
+       if (laundry_wq == NULL)
+               return -ENOMEM;
        queue_delayed_work(laundry_wq, &laundromat_work, grace_time);
        set_max_delegations();
+       return set_callback_cred();
 }
 
-void
+int
 nfs4_state_start(void)
 {
+       int ret;
+
        if (nfs4_init)
-               return;
+               return 0;
        nfsd4_load_reboot_recovery_data();
-       __nfs4_state_start();
+       ret = __nfs4_state_start();
+       if (ret)
+               return ret;
        nfs4_init = 1;
-       return;
+       return 0;
 }
 
 time_t
index 2dcc7fe..0fbd50c 100644 (file)
@@ -1599,7 +1599,8 @@ static __be32 nfsd4_encode_fs_location4(struct nfsd4_fs_location *location,
 static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 *stat)
 {
        struct svc_fh tmp_fh;
-       char *path, *rootpath;
+       char *path = NULL, *rootpath;
+       size_t rootlen;
 
        fh_init(&tmp_fh, NFS4_FHSIZE);
        *stat = exp_pseudoroot(rqstp, &tmp_fh);
@@ -1609,14 +1610,18 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 *
 
        path = exp->ex_pathname;
 
-       if (strncmp(path, rootpath, strlen(rootpath))) {
+       rootlen = strlen(rootpath);
+       if (strncmp(path, rootpath, rootlen)) {
                dprintk("nfsd: fs_locations failed;"
                        "%s is not contained in %s\n", path, rootpath);
                *stat = nfserr_notsupp;
-               return NULL;
+               path = NULL;
+               goto out;
        }
-
-       return path + strlen(rootpath);
+       path += rootlen;
+out:
+       fh_put(&tmp_fh);
+       return path;
 }
 
 /*
@@ -1793,11 +1798,6 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
                                goto out_nfserr;
                }
        }
-       if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
-               if (exp->ex_fslocs.locations == NULL) {
-                       bmval0 &= ~FATTR4_WORD0_FS_LOCATIONS;
-               }
-       }
        if ((buflen -= 16) < 0)
                goto out_resource;
 
@@ -1825,8 +1825,6 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
                        goto out_resource;
                if (!aclsupport)
                        word0 &= ~FATTR4_WORD0_ACL;
-               if (!exp->ex_fslocs.locations)
-                       word0 &= ~FATTR4_WORD0_FS_LOCATIONS;
                if (!word2) {
                        WRITE32(2);
                        WRITE32(word0);
@@ -3064,6 +3062,7 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,
        WRITE32(0);
 
        ADJUST_ARGS();
+       resp->cstate.datap = p; /* DRC cache data pointer */
        return 0;
 }
 
@@ -3166,7 +3165,7 @@ static int nfsd4_check_drc_limit(struct nfsd4_compoundres *resp)
                return status;
 
        session = resp->cstate.session;
-       if (session == NULL || slot->sl_cache_entry.ce_cachethis == 0)
+       if (session == NULL || slot->sl_cachethis == 0)
                return status;
 
        if (resp->opcnt >= args->opcnt)
@@ -3291,6 +3290,7 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo
        /*
         * All that remains is to write the tag and operation count...
         */
+       struct nfsd4_compound_state *cs = &resp->cstate;
        struct kvec *iov;
        p = resp->tagp;
        *p++ = htonl(resp->taglen);
@@ -3304,17 +3304,11 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo
                iov = &rqstp->rq_res.head[0];
        iov->iov_len = ((char*)resp->p) - (char*)iov->iov_base;
        BUG_ON(iov->iov_len > PAGE_SIZE);
-       if (nfsd4_has_session(&resp->cstate)) {
-               if (resp->cstate.status == nfserr_replay_cache &&
-                               !nfsd4_not_cached(resp)) {
-                       iov->iov_len = resp->cstate.iovlen;
-               } else {
-                       nfsd4_store_cache_entry(resp);
-                       dprintk("%s: SET SLOT STATE TO AVAILABLE\n", __func__);
-                       resp->cstate.slot->sl_inuse = 0;
-               }
-               if (resp->cstate.session)
-                       nfsd4_put_session(resp->cstate.session);
+       if (nfsd4_has_session(cs) && cs->status != nfserr_replay_cache) {
+               nfsd4_store_cache_entry(resp);
+               dprintk("%s: SET SLOT STATE TO AVAILABLE\n", __func__);
+               resp->cstate.slot->sl_inuse = false;
+               nfsd4_put_session(resp->cstate.session);
        }
        return 1;
 }
index 7e906c5..00388d2 100644 (file)
@@ -174,12 +174,13 @@ static const struct file_operations exports_operations = {
 };
 
 extern int nfsd_pool_stats_open(struct inode *inode, struct file *file);
+extern int nfsd_pool_stats_release(struct inode *inode, struct file *file);
 
 static struct file_operations pool_stats_operations = {
        .open           = nfsd_pool_stats_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release,
+       .release        = nfsd_pool_stats_release,
        .owner          = THIS_MODULE,
 };
 
@@ -776,10 +777,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
                size -= len;
                mesg += len;
        }
-
-       mutex_unlock(&nfsd_mutex);
-       return (mesg-buf);
-
+       rv = mesg - buf;
 out_free:
        kfree(nthreads);
        mutex_unlock(&nfsd_mutex);
index 8847f3f..01965b2 100644 (file)
@@ -397,44 +397,51 @@ static inline void _fh_update_old(struct dentry *dentry,
                fh->ofh_dirino = 0;
 }
 
-__be32
-fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
-          struct svc_fh *ref_fh)
+static bool is_root_export(struct svc_export *exp)
 {
-       /* ref_fh is a reference file handle.
-        * if it is non-null and for the same filesystem, then we should compose
-        * a filehandle which is of the same version, where possible.
-        * Currently, that means that if ref_fh->fh_handle.fh_version == 0xca
-        * Then create a 32byte filehandle using nfs_fhbase_old
-        *
-        */
+       return exp->ex_path.dentry == exp->ex_path.dentry->d_sb->s_root;
+}
 
-       u8 version;
-       u8 fsid_type = 0;
-       struct inode * inode = dentry->d_inode;
-       struct dentry *parent = dentry->d_parent;
-       __u32 *datap;
-       dev_t ex_dev = exp->ex_path.dentry->d_inode->i_sb->s_dev;
-       int root_export = (exp->ex_path.dentry == exp->ex_path.dentry->d_sb->s_root);
+static struct super_block *exp_sb(struct svc_export *exp)
+{
+       return exp->ex_path.dentry->d_inode->i_sb;
+}
 
-       dprintk("nfsd: fh_compose(exp %02x:%02x/%ld %s/%s, ino=%ld)\n",
-               MAJOR(ex_dev), MINOR(ex_dev),
-               (long) exp->ex_path.dentry->d_inode->i_ino,
-               parent->d_name.name, dentry->d_name.name,
-               (inode ? inode->i_ino : 0));
+static bool fsid_type_ok_for_exp(u8 fsid_type, struct svc_export *exp)
+{
+       switch (fsid_type) {
+       case FSID_DEV:
+               if (!old_valid_dev(exp_sb(exp)->s_dev))
+                       return 0;
+               /* FALL THROUGH */
+       case FSID_MAJOR_MINOR:
+       case FSID_ENCODE_DEV:
+               return exp_sb(exp)->s_type->fs_flags & FS_REQUIRES_DEV;
+       case FSID_NUM:
+               return exp->ex_flags & NFSEXP_FSID;
+       case FSID_UUID8:
+       case FSID_UUID16:
+               if (!is_root_export(exp))
+                       return 0;
+               /* fall through */
+       case FSID_UUID4_INUM:
+       case FSID_UUID16_INUM:
+               return exp->ex_uuid != NULL;
+       }
+       return 1;
+}
 
-       /* Choose filehandle version and fsid type based on
-        * the reference filehandle (if it is in the same export)
-        * or the export options.
-        */
- retry:
+
+static void set_version_and_fsid_type(struct svc_fh *fhp, struct svc_export *exp, struct svc_fh *ref_fh)
+{
+       u8 version;
+       u8 fsid_type;
+retry:
        version = 1;
        if (ref_fh && ref_fh->fh_export == exp) {
                version = ref_fh->fh_handle.fh_version;
                fsid_type = ref_fh->fh_handle.fh_fsid_type;
 
-               if (ref_fh == fhp)
-                       fh_put(ref_fh);
                ref_fh = NULL;
 
                switch (version) {
@@ -447,58 +454,66 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
                        goto retry;
                }
 
-               /* Need to check that this type works for this
-                * export point.  As the fsid -> filesystem mapping
-                * was guided by user-space, there is no guarantee
-                * that the filesystem actually supports that fsid
-                * type. If it doesn't we loop around again without
-                * ref_fh set.
+               /*
+                * As the fsid -> filesystem mapping was guided by
+                * user-space, there is no guarantee that the filesystem
+                * actually supports that fsid type. If it doesn't we
+                * loop around again without ref_fh set.
                 */
-               switch(fsid_type) {
-               case FSID_DEV:
-                       if (!old_valid_dev(ex_dev))
-                               goto retry;
-                       /* FALL THROUGH */
-               case FSID_MAJOR_MINOR:
-               case FSID_ENCODE_DEV:
-                       if (!(exp->ex_path.dentry->d_inode->i_sb->s_type->fs_flags
-                             & FS_REQUIRES_DEV))
-                               goto retry;
-                       break;
-               case FSID_NUM:
-                       if (! (exp->ex_flags & NFSEXP_FSID))
-                               goto retry;
-                       break;
-               case FSID_UUID8:
-               case FSID_UUID16:
-                       if (!root_export)
-                               goto retry;
-                       /* fall through */
-               case FSID_UUID4_INUM:
-               case FSID_UUID16_INUM:
-                       if (exp->ex_uuid == NULL)
-                               goto retry;
-                       break;
-               }
+               if (!fsid_type_ok_for_exp(fsid_type, exp))
+                       goto retry;
        } else if (exp->ex_flags & NFSEXP_FSID) {
                fsid_type = FSID_NUM;
        } else if (exp->ex_uuid) {
                if (fhp->fh_maxsize >= 64) {
-                       if (root_export)
+                       if (is_root_export(exp))
                                fsid_type = FSID_UUID16;
                        else
                                fsid_type = FSID_UUID16_INUM;
                } else {
-                       if (root_export)
+                       if (is_root_export(exp))
                                fsid_type = FSID_UUID8;
                        else
                                fsid_type = FSID_UUID4_INUM;
                }
-       } else if (!old_valid_dev(ex_dev))
+       } else if (!old_valid_dev(exp_sb(exp)->s_dev))
                /* for newer device numbers, we must use a newer fsid format */
                fsid_type = FSID_ENCODE_DEV;
        else
                fsid_type = FSID_DEV;
+       fhp->fh_handle.fh_version = version;
+       if (version)
+               fhp->fh_handle.fh_fsid_type = fsid_type;
+}
+
+__be32
+fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
+          struct svc_fh *ref_fh)
+{
+       /* ref_fh is a reference file handle.
+        * if it is non-null and for the same filesystem, then we should compose
+        * a filehandle which is of the same version, where possible.
+        * Currently, that means that if ref_fh->fh_handle.fh_version == 0xca
+        * Then create a 32byte filehandle using nfs_fhbase_old
+        *
+        */
+
+       struct inode * inode = dentry->d_inode;
+       struct dentry *parent = dentry->d_parent;
+       __u32 *datap;
+       dev_t ex_dev = exp_sb(exp)->s_dev;
+
+       dprintk("nfsd: fh_compose(exp %02x:%02x/%ld %s/%s, ino=%ld)\n",
+               MAJOR(ex_dev), MINOR(ex_dev),
+               (long) exp->ex_path.dentry->d_inode->i_ino,
+               parent->d_name.name, dentry->d_name.name,
+               (inode ? inode->i_ino : 0));
+
+       /* Choose filehandle version and fsid type based on
+        * the reference filehandle (if it is in the same export)
+        * or the export options.
+        */
+        set_version_and_fsid_type(fhp, exp, ref_fh);
 
        if (ref_fh == fhp)
                fh_put(ref_fh);
@@ -516,7 +531,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
        fhp->fh_export = exp;
        cache_get(&exp->h);
 
-       if (version == 0xca) {
+       if (fhp->fh_handle.fh_version == 0xca) {
                /* old style filehandle please */
                memset(&fhp->fh_handle.fh_base, 0, NFS_FHSIZE);
                fhp->fh_handle.fh_size = NFS_FHSIZE;
@@ -530,22 +545,22 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
                        _fh_update_old(dentry, exp, &fhp->fh_handle);
        } else {
                int len;
-               fhp->fh_handle.fh_version = 1;
                fhp->fh_handle.fh_auth_type = 0;
                datap = fhp->fh_handle.fh_auth+0;
-               fhp->fh_handle.fh_fsid_type = fsid_type;
-               mk_fsid(fsid_type, datap, ex_dev,
+               mk_fsid(fhp->fh_handle.fh_fsid_type, datap, ex_dev,
                        exp->ex_path.dentry->d_inode->i_ino,
                        exp->ex_fsid, exp->ex_uuid);
 
-               len = key_len(fsid_type);
+               len = key_len(fhp->fh_handle.fh_fsid_type);
                datap += len/4;
                fhp->fh_handle.fh_size = 4 + len;
 
                if (inode)
                        _fh_update(fhp, exp, dentry);
-               if (fhp->fh_handle.fh_fileid_type == 255)
+               if (fhp->fh_handle.fh_fileid_type == 255) {
+                       fh_put(fhp);
                        return nfserr_opnotsupp;
+               }
        }
 
        return 0;
@@ -639,8 +654,7 @@ enum fsid_source fsid_source(struct svc_fh *fhp)
        case FSID_DEV:
        case FSID_ENCODE_DEV:
        case FSID_MAJOR_MINOR:
-               if (fhp->fh_export->ex_path.dentry->d_inode->i_sb->s_type->fs_flags
-                   & FS_REQUIRES_DEV)
+               if (exp_sb(fhp->fh_export)->s_type->fs_flags & FS_REQUIRES_DEV)
                        return FSIDSOURCE_DEV;
                break;
        case FSID_NUM:
index 24d58ad..67ea83e 100644 (file)
@@ -34,6 +34,7 @@
 #include <linux/nfsd/syscall.h>
 #include <linux/lockd/bind.h>
 #include <linux/nfsacl.h>
+#include <linux/seq_file.h>
 
 #define NFSDDBG_FACILITY       NFSDDBG_SVC
 
@@ -66,6 +67,16 @@ struct timeval                       nfssvc_boot;
 DEFINE_MUTEX(nfsd_mutex);
 struct svc_serv                *nfsd_serv;
 
+/*
+ * nfsd_drc_lock protects nfsd_drc_max_pages and nfsd_drc_pages_used.
+ * nfsd_drc_max_pages limits the total amount of memory available for
+ * version 4.1 DRC caches.
+ * nfsd_drc_pages_used tracks the current version 4.1 DRC memory usage.
+ */
+spinlock_t     nfsd_drc_lock;
+unsigned int   nfsd_drc_max_mem;
+unsigned int   nfsd_drc_mem_used;
+
 #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
 static struct svc_stat nfsd_acl_svcstats;
 static struct svc_version *    nfsd_acl_version[] = {
@@ -235,13 +246,12 @@ void nfsd_reset_versions(void)
  */
 static void set_max_drc(void)
 {
-       /* The percent of nr_free_buffer_pages used by the V4.1 server DRC */
-       #define NFSD_DRC_SIZE_SHIFT     7
-       nfsd_serv->sv_drc_max_pages = nr_free_buffer_pages()
-                                               >> NFSD_DRC_SIZE_SHIFT;
-       nfsd_serv->sv_drc_pages_used = 0;
-       dprintk("%s svc_drc_max_pages %u\n", __func__,
-               nfsd_serv->sv_drc_max_pages);
+       #define NFSD_DRC_SIZE_SHIFT     10
+       nfsd_drc_max_mem = (nr_free_buffer_pages()
+                                       >> NFSD_DRC_SIZE_SHIFT) * PAGE_SIZE;
+       nfsd_drc_mem_used = 0;
+       spin_lock_init(&nfsd_drc_lock);
+       dprintk("%s nfsd_drc_max_mem %u \n", __func__, nfsd_drc_max_mem);
 }
 
 int nfsd_create_serv(void)
@@ -401,7 +411,9 @@ nfsd_svc(unsigned short port, int nrservs)
        error = nfsd_racache_init(2*nrservs);
        if (error<0)
                goto out;
-       nfs4_state_start();
+       error = nfs4_state_start();
+       if (error)
+               goto out;
 
        nfsd_reset_versions();
 
@@ -569,10 +581,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
                + rqstp->rq_res.head[0].iov_len;
        rqstp->rq_res.head[0].iov_len += sizeof(__be32);
 
-       /* NFSv4.1 DRC requires statp */
-       if (rqstp->rq_vers == 4)
-               nfsd4_set_statp(rqstp, statp);
-
        /* Now call the procedure handler, and encode NFS status. */
        nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);
        nfserr = map_new_errors(rqstp->rq_vers, nfserr);
@@ -607,7 +615,25 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
 
 int nfsd_pool_stats_open(struct inode *inode, struct file *file)
 {
-       if (nfsd_serv == NULL)
+       int ret;
+       mutex_lock(&nfsd_mutex);
+       if (nfsd_serv == NULL) {
+               mutex_unlock(&nfsd_mutex);
                return -ENODEV;
-       return svc_pool_stats_open(nfsd_serv, file);
+       }
+       /* bump up the psudo refcount while traversing */
+       svc_get(nfsd_serv);
+       ret = svc_pool_stats_open(nfsd_serv, file);
+       mutex_unlock(&nfsd_mutex);
+       return ret;
+}
+
+int nfsd_pool_stats_release(struct inode *inode, struct file *file)
+{
+       int ret = seq_release(inode, file);
+       mutex_lock(&nfsd_mutex);
+       /* this function really, really should have been called svc_put() */
+       svc_destroy(nfsd_serv);
+       mutex_unlock(&nfsd_mutex);
+       return ret;
 }
index 8fa09bf..a293f02 100644 (file)
@@ -89,6 +89,12 @@ struct raparm_hbucket {
 #define RAPARM_HASH_MASK       (RAPARM_HASH_SIZE-1)
 static struct raparm_hbucket   raparm_hash[RAPARM_HASH_SIZE];
 
+static inline int
+nfsd_v4client(struct svc_rqst *rq)
+{
+    return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
+}
+
 /* 
  * Called from nfsd_lookup and encode_dirent. Check if we have crossed 
  * a mount point.
@@ -115,7 +121,8 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
                path_put(&path);
                goto out;
        }
-       if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
+       if (nfsd_v4client(rqstp) ||
+               (exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
                /* successfully crossed mount point */
                /*
                 * This is subtle: path.dentry is *not* on path.mnt
index c668bca..6a2711f 100644 (file)
@@ -46,7 +46,7 @@ void nilfs_btnode_cache_init_once(struct address_space *btnc)
        INIT_LIST_HEAD(&btnc->i_mmap_nonlinear);
 }
 
-static struct address_space_operations def_btnode_aops = {
+static const struct address_space_operations def_btnode_aops = {
        .sync_page              = block_sync_page,
 };
 
index 6bd84a0..fc8278c 100644 (file)
@@ -151,7 +151,7 @@ struct file_operations nilfs_file_operations = {
        .splice_read    = generic_file_splice_read,
 };
 
-struct inode_operations nilfs_file_inode_operations = {
+const struct inode_operations nilfs_file_inode_operations = {
        .truncate       = nilfs_truncate,
        .setattr        = nilfs_setattr,
        .permission     = nilfs_permission,
index 1b3c2bb..e6de0a2 100644 (file)
@@ -52,7 +52,7 @@
 #include "dat.h"
 #include "ifile.h"
 
-static struct address_space_operations def_gcinode_aops = {
+static const struct address_space_operations def_gcinode_aops = {
        .sync_page              = block_sync_page,
 };
 
index 807e584..2d2c501 100644 (file)
@@ -238,7 +238,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
        return size;
 }
 
-struct address_space_operations nilfs_aops = {
+const struct address_space_operations nilfs_aops = {
        .writepage              = nilfs_writepage,
        .readpage               = nilfs_readpage,
        .sync_page              = block_sync_page,
index 156bf60..b18c499 100644 (file)
@@ -427,12 +427,12 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
 }
 
 
-static struct address_space_operations def_mdt_aops = {
+static const struct address_space_operations def_mdt_aops = {
        .writepage              = nilfs_mdt_write_page,
        .sync_page              = block_sync_page,
 };
 
-static struct inode_operations def_mdt_iops;
+static const struct inode_operations def_mdt_iops;
 static struct file_operations def_mdt_fops;
 
 /*
index df70dad..ed02e88 100644 (file)
@@ -448,7 +448,7 @@ out:
        return err;
 }
 
-struct inode_operations nilfs_dir_inode_operations = {
+const struct inode_operations nilfs_dir_inode_operations = {
        .create         = nilfs_create,
        .lookup         = nilfs_lookup,
        .link           = nilfs_link,
@@ -462,12 +462,12 @@ struct inode_operations nilfs_dir_inode_operations = {
        .permission     = nilfs_permission,
 };
 
-struct inode_operations nilfs_special_inode_operations = {
+const struct inode_operations nilfs_special_inode_operations = {
        .setattr        = nilfs_setattr,
        .permission     = nilfs_permission,
 };
 
-struct inode_operations nilfs_symlink_inode_operations = {
+const struct inode_operations nilfs_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = page_follow_link_light,
        .put_link       = page_put_link,
index 724c637..bad7368 100644 (file)
@@ -295,12 +295,12 @@ void nilfs_clear_gcdat_inode(struct the_nilfs *);
  * Inodes and files operations
  */
 extern struct file_operations nilfs_dir_operations;
-extern struct inode_operations nilfs_file_inode_operations;
+extern const struct inode_operations nilfs_file_inode_operations;
 extern struct file_operations nilfs_file_operations;
-extern struct address_space_operations nilfs_aops;
-extern struct inode_operations nilfs_dir_inode_operations;
-extern struct inode_operations nilfs_special_inode_operations;
-extern struct inode_operations nilfs_symlink_inode_operations;
+extern const struct address_space_operations nilfs_aops;
+extern const struct inode_operations nilfs_dir_inode_operations;
+extern const struct inode_operations nilfs_special_inode_operations;
+extern const struct inode_operations nilfs_symlink_inode_operations;
 
 /*
  * filesystem type
index 55f3d6b..644e667 100644 (file)
@@ -504,7 +504,7 @@ static int nilfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
        return 0;
 }
 
-static struct super_operations nilfs_sops = {
+static const struct super_operations nilfs_sops = {
        .alloc_inode    = nilfs_alloc_inode,
        .destroy_inode  = nilfs_destroy_inode,
        .dirty_inode    = nilfs_dirty_inode,
@@ -560,7 +560,7 @@ nilfs_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len,
                                    nilfs_nfs_get_inode);
 }
 
-static struct export_operations nilfs_export_ops = {
+static const struct export_operations nilfs_export_ops = {
        .fh_to_dentry = nilfs_fh_to_dentry,
        .fh_to_parent = nilfs_fh_to_parent,
        .get_parent = nilfs_get_parent,
index 4350d49..663c0e3 100644 (file)
@@ -2145,46 +2145,6 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
        return ret;
 }
 
-/**
- * ntfs_file_writev -
- *
- * Basically the same as generic_file_writev() except that it ends up calling
- * ntfs_file_aio_write_nolock() instead of __generic_file_aio_write_nolock().
- */
-static ssize_t ntfs_file_writev(struct file *file, const struct iovec *iov,
-               unsigned long nr_segs, loff_t *ppos)
-{
-       struct address_space *mapping = file->f_mapping;
-       struct inode *inode = mapping->host;
-       struct kiocb kiocb;
-       ssize_t ret;
-
-       mutex_lock(&inode->i_mutex);
-       init_sync_kiocb(&kiocb, file);
-       ret = ntfs_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
-       if (ret == -EIOCBQUEUED)
-               ret = wait_on_sync_kiocb(&kiocb);
-       mutex_unlock(&inode->i_mutex);
-       if (ret > 0) {
-               int err = generic_write_sync(file, *ppos - ret, ret);
-               if (err < 0)
-                       ret = err;
-       }
-       return ret;
-}
-
-/**
- * ntfs_file_write - simple wrapper for ntfs_file_writev()
- */
-static ssize_t ntfs_file_write(struct file *file, const char __user *buf,
-               size_t count, loff_t *ppos)
-{
-       struct iovec local_iov = { .iov_base = (void __user *)buf,
-                                  .iov_len = count };
-
-       return ntfs_file_writev(file, &local_iov, 1, ppos);
-}
-
 /**
  * ntfs_file_fsync - sync a file to disk
  * @filp:      file to be synced
@@ -2247,7 +2207,7 @@ const struct file_operations ntfs_file_ops = {
        .read           = do_sync_read,          /* Read from file. */
        .aio_read       = generic_file_aio_read, /* Async read from file. */
 #ifdef NTFS_RW
-       .write          = ntfs_file_write,       /* Write to file. */
+       .write          = do_sync_write,         /* Write to file. */
        .aio_write      = ntfs_file_aio_write,   /* Async write to file. */
        /*.release      = ,*/                    /* Last file is closed.  See
                                                    fs/ext2/file.c::
index 50931b1..8b2549f 100644 (file)
@@ -829,7 +829,7 @@ enum {
        /* Note, FILE_ATTR_VALID_SET_FLAGS masks out the old DOS VolId, the
           F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT,
           F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest.  This mask
-          is used to to obtain all flags that are valid for setting. */
+          is used to obtain all flags that are valid for setting. */
        /*
         * The flag FILE_ATTR_DUP_FILENAME_INDEX_PRESENT is present in all
         * FILENAME_ATTR attributes but not in the STANDARD_INFORMATION
index cd0be3f..a44b14c 100644 (file)
@@ -47,7 +47,7 @@ static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask)
                return kmalloc(PAGE_SIZE, gfp_mask & ~__GFP_HIGHMEM);
                /* return (void *)__get_free_page(gfp_mask); */
        }
-       if (likely(size >> PAGE_SHIFT < num_physpages))
+       if (likely((size >> PAGE_SHIFT) < totalram_pages))
                return __vmalloc(size, gfp_mask, PAGE_KERNEL);
        return NULL;
 }
index 0159607..31f25ce 100644 (file)
@@ -28,6 +28,7 @@ ocfs2-objs := \
        locks.o                 \
        mmap.o                  \
        namei.o                 \
+       refcounttree.o          \
        resize.o                \
        slot_map.o              \
        suballoc.o              \
index ab513dd..38a42f5 100644 (file)
 #include "super.h"
 #include "uptodate.h"
 #include "xattr.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
+enum ocfs2_contig_type {
+       CONTIG_NONE = 0,
+       CONTIG_LEFT,
+       CONTIG_RIGHT,
+       CONTIG_LEFTRIGHT,
+};
 
+static enum ocfs2_contig_type
+       ocfs2_extent_rec_contig(struct super_block *sb,
+                               struct ocfs2_extent_rec *ext,
+                               struct ocfs2_extent_rec *insert_rec);
 /*
  * Operations for a specific extent tree type.
  *
@@ -79,18 +90,30 @@ struct ocfs2_extent_tree_operations {
         * that value.  new_clusters is the delta, and must be
         * added to the total.  Required.
         */
-       void (*eo_update_clusters)(struct inode *inode,
-                                  struct ocfs2_extent_tree *et,
+       void (*eo_update_clusters)(struct ocfs2_extent_tree *et,
                                   u32 new_clusters);
 
+       /*
+        * If this extent tree is supported by an extent map, insert
+        * a record into the map.
+        */
+       void (*eo_extent_map_insert)(struct ocfs2_extent_tree *et,
+                                    struct ocfs2_extent_rec *rec);
+
+       /*
+        * If this extent tree is supported by an extent map, truncate the
+        * map to clusters,
+        */
+       void (*eo_extent_map_truncate)(struct ocfs2_extent_tree *et,
+                                      u32 clusters);
+
        /*
         * If ->eo_insert_check() exists, it is called before rec is
         * inserted into the extent tree.  It is optional.
         */
-       int (*eo_insert_check)(struct inode *inode,
-                              struct ocfs2_extent_tree *et,
+       int (*eo_insert_check)(struct ocfs2_extent_tree *et,
                               struct ocfs2_extent_rec *rec);
-       int (*eo_sanity_check)(struct inode *inode, struct ocfs2_extent_tree *et);
+       int (*eo_sanity_check)(struct ocfs2_extent_tree *et);
 
        /*
         * --------------------------------------------------------------
@@ -109,8 +132,17 @@ struct ocfs2_extent_tree_operations {
         * it exists.  If it does not, et->et_max_leaf_clusters is set
         * to 0 (unlimited).  Optional.
         */
-       void (*eo_fill_max_leaf_clusters)(struct inode *inode,
-                                         struct ocfs2_extent_tree *et);
+       void (*eo_fill_max_leaf_clusters)(struct ocfs2_extent_tree *et);
+
+       /*
+        * ->eo_extent_contig test whether the 2 ocfs2_extent_rec
+        * are contiguous or not. Optional. Don't need to set it if use
+        * ocfs2_extent_rec as the tree leaf.
+        */
+       enum ocfs2_contig_type
+               (*eo_extent_contig)(struct ocfs2_extent_tree *et,
+                                   struct ocfs2_extent_rec *ext,
+                                   struct ocfs2_extent_rec *insert_rec);
 };
 
 
@@ -121,19 +153,22 @@ struct ocfs2_extent_tree_operations {
 static u64 ocfs2_dinode_get_last_eb_blk(struct ocfs2_extent_tree *et);
 static void ocfs2_dinode_set_last_eb_blk(struct ocfs2_extent_tree *et,
                                         u64 blkno);
-static void ocfs2_dinode_update_clusters(struct inode *inode,
-                                        struct ocfs2_extent_tree *et,
+static void ocfs2_dinode_update_clusters(struct ocfs2_extent_tree *et,
                                         u32 clusters);
-static int ocfs2_dinode_insert_check(struct inode *inode,
-                                    struct ocfs2_extent_tree *et,
+static void ocfs2_dinode_extent_map_insert(struct ocfs2_extent_tree *et,
+                                          struct ocfs2_extent_rec *rec);
+static void ocfs2_dinode_extent_map_truncate(struct ocfs2_extent_tree *et,
+                                            u32 clusters);
+static int ocfs2_dinode_insert_check(struct ocfs2_extent_tree *et,
                                     struct ocfs2_extent_rec *rec);
-static int ocfs2_dinode_sanity_check(struct inode *inode,
-                                    struct ocfs2_extent_tree *et);
+static int ocfs2_dinode_sanity_check(struct ocfs2_extent_tree *et);
 static void ocfs2_dinode_fill_root_el(struct ocfs2_extent_tree *et);
 static struct ocfs2_extent_tree_operations ocfs2_dinode_et_ops = {
        .eo_set_last_eb_blk     = ocfs2_dinode_set_last_eb_blk,
        .eo_get_last_eb_blk     = ocfs2_dinode_get_last_eb_blk,
        .eo_update_clusters     = ocfs2_dinode_update_clusters,
+       .eo_extent_map_insert   = ocfs2_dinode_extent_map_insert,
+       .eo_extent_map_truncate = ocfs2_dinode_extent_map_truncate,
        .eo_insert_check        = ocfs2_dinode_insert_check,
        .eo_sanity_check        = ocfs2_dinode_sanity_check,
        .eo_fill_root_el        = ocfs2_dinode_fill_root_el,
@@ -156,40 +191,53 @@ static u64 ocfs2_dinode_get_last_eb_blk(struct ocfs2_extent_tree *et)
        return le64_to_cpu(di->i_last_eb_blk);
 }
 
-static void ocfs2_dinode_update_clusters(struct inode *inode,
-                                        struct ocfs2_extent_tree *et,
+static void ocfs2_dinode_update_clusters(struct ocfs2_extent_tree *et,
                                         u32 clusters)
 {
+       struct ocfs2_inode_info *oi = cache_info_to_inode(et->et_ci);
        struct ocfs2_dinode *di = et->et_object;
 
        le32_add_cpu(&di->i_clusters, clusters);
-       spin_lock(&OCFS2_I(inode)->ip_lock);
-       OCFS2_I(inode)->ip_clusters = le32_to_cpu(di->i_clusters);
-       spin_unlock(&OCFS2_I(inode)->ip_lock);
+       spin_lock(&oi->ip_lock);
+       oi->ip_clusters = le32_to_cpu(di->i_clusters);
+       spin_unlock(&oi->ip_lock);
 }
 
-static int ocfs2_dinode_insert_check(struct inode *inode,
-                                    struct ocfs2_extent_tree *et,
+static void ocfs2_dinode_extent_map_insert(struct ocfs2_extent_tree *et,
+                                          struct ocfs2_extent_rec *rec)
+{
+       struct inode *inode = &cache_info_to_inode(et->et_ci)->vfs_inode;
+
+       ocfs2_extent_map_insert_rec(inode, rec);
+}
+
+static void ocfs2_dinode_extent_map_truncate(struct ocfs2_extent_tree *et,
+                                            u32 clusters)
+{
+       struct inode *inode = &cache_info_to_inode(et->et_ci)->vfs_inode;
+
+       ocfs2_extent_map_trunc(inode, clusters);
+}
+
+static int ocfs2_dinode_insert_check(struct ocfs2_extent_tree *et,
                                     struct ocfs2_extent_rec *rec)
 {
-       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_inode_info *oi = cache_info_to_inode(et->et_ci);
+       struct ocfs2_super *osb = OCFS2_SB(oi->vfs_inode.i_sb);
 
-       BUG_ON(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL);
+       BUG_ON(oi->ip_dyn_features & OCFS2_INLINE_DATA_FL);
        mlog_bug_on_msg(!ocfs2_sparse_alloc(osb) &&
-                       (OCFS2_I(inode)->ip_clusters !=
-                        le32_to_cpu(rec->e_cpos)),
+                       (oi->ip_clusters != le32_to_cpu(rec->e_cpos)),
                        "Device %s, asking for sparse allocation: inode %llu, "
                        "cpos %u, clusters %u\n",
                        osb->dev_str,
-                       (unsigned long long)OCFS2_I(inode)->ip_blkno,
-                       rec->e_cpos,
-                       OCFS2_I(inode)->ip_clusters);
+                       (unsigned long long)oi->ip_blkno,
+                       rec->e_cpos, oi->ip_clusters);
 
        return 0;
 }
 
-static int ocfs2_dinode_sanity_check(struct inode *inode,
-                                    struct ocfs2_extent_tree *et)
+static int ocfs2_dinode_sanity_check(struct ocfs2_extent_tree *et)
 {
        struct ocfs2_dinode *di = et->et_object;
 
@@ -229,8 +277,7 @@ static u64 ocfs2_xattr_value_get_last_eb_blk(struct ocfs2_extent_tree *et)
        return le64_to_cpu(vb->vb_xv->xr_last_eb_blk);
 }
 
-static void ocfs2_xattr_value_update_clusters(struct inode *inode,
-                                             struct ocfs2_extent_tree *et,
+static void ocfs2_xattr_value_update_clusters(struct ocfs2_extent_tree *et,
                                              u32 clusters)
 {
        struct ocfs2_xattr_value_buf *vb = et->et_object;
@@ -252,12 +299,11 @@ static void ocfs2_xattr_tree_fill_root_el(struct ocfs2_extent_tree *et)
        et->et_root_el = &xb->xb_attrs.xb_root.xt_list;
 }
 
-static void ocfs2_xattr_tree_fill_max_leaf_clusters(struct inode *inode,
-                                                   struct ocfs2_extent_tree *et)
+static void ocfs2_xattr_tree_fill_max_leaf_clusters(struct ocfs2_extent_tree *et)
 {
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
        et->et_max_leaf_clusters =
-               ocfs2_clusters_for_bytes(inode->i_sb,
-                                        OCFS2_MAX_XATTR_TREE_LEAF_SIZE);
+               ocfs2_clusters_for_bytes(sb, OCFS2_MAX_XATTR_TREE_LEAF_SIZE);
 }
 
 static void ocfs2_xattr_tree_set_last_eb_blk(struct ocfs2_extent_tree *et,
@@ -277,8 +323,7 @@ static u64 ocfs2_xattr_tree_get_last_eb_blk(struct ocfs2_extent_tree *et)
        return le64_to_cpu(xt->xt_last_eb_blk);
 }
 
-static void ocfs2_xattr_tree_update_clusters(struct inode *inode,
-                                            struct ocfs2_extent_tree *et,
+static void ocfs2_xattr_tree_update_clusters(struct ocfs2_extent_tree *et,
                                             u32 clusters)
 {
        struct ocfs2_xattr_block *xb = et->et_object;
@@ -309,8 +354,7 @@ static u64 ocfs2_dx_root_get_last_eb_blk(struct ocfs2_extent_tree *et)
        return le64_to_cpu(dx_root->dr_last_eb_blk);
 }
 
-static void ocfs2_dx_root_update_clusters(struct inode *inode,
-                                         struct ocfs2_extent_tree *et,
+static void ocfs2_dx_root_update_clusters(struct ocfs2_extent_tree *et,
                                          u32 clusters)
 {
        struct ocfs2_dx_root_block *dx_root = et->et_object;
@@ -318,8 +362,7 @@ static void ocfs2_dx_root_update_clusters(struct inode *inode,
        le32_add_cpu(&dx_root->dr_clusters, clusters);
 }
 
-static int ocfs2_dx_root_sanity_check(struct inode *inode,
-                                     struct ocfs2_extent_tree *et)
+static int ocfs2_dx_root_sanity_check(struct ocfs2_extent_tree *et)
 {
        struct ocfs2_dx_root_block *dx_root = et->et_object;
 
@@ -343,8 +386,54 @@ static struct ocfs2_extent_tree_operations ocfs2_dx_root_et_ops = {
        .eo_fill_root_el        = ocfs2_dx_root_fill_root_el,
 };
 
+static void ocfs2_refcount_tree_fill_root_el(struct ocfs2_extent_tree *et)
+{
+       struct ocfs2_refcount_block *rb = et->et_object;
+
+       et->et_root_el = &rb->rf_list;
+}
+
+static void ocfs2_refcount_tree_set_last_eb_blk(struct ocfs2_extent_tree *et,
+                                               u64 blkno)
+{
+       struct ocfs2_refcount_block *rb = et->et_object;
+
+       rb->rf_last_eb_blk = cpu_to_le64(blkno);
+}
+
+static u64 ocfs2_refcount_tree_get_last_eb_blk(struct ocfs2_extent_tree *et)
+{
+       struct ocfs2_refcount_block *rb = et->et_object;
+
+       return le64_to_cpu(rb->rf_last_eb_blk);
+}
+
+static void ocfs2_refcount_tree_update_clusters(struct ocfs2_extent_tree *et,
+                                               u32 clusters)
+{
+       struct ocfs2_refcount_block *rb = et->et_object;
+
+       le32_add_cpu(&rb->rf_clusters, clusters);
+}
+
+static enum ocfs2_contig_type
+ocfs2_refcount_tree_extent_contig(struct ocfs2_extent_tree *et,
+                                 struct ocfs2_extent_rec *ext,
+                                 struct ocfs2_extent_rec *insert_rec)
+{
+       return CONTIG_NONE;
+}
+
+static struct ocfs2_extent_tree_operations ocfs2_refcount_tree_et_ops = {
+       .eo_set_last_eb_blk     = ocfs2_refcount_tree_set_last_eb_blk,
+       .eo_get_last_eb_blk     = ocfs2_refcount_tree_get_last_eb_blk,
+       .eo_update_clusters     = ocfs2_refcount_tree_update_clusters,
+       .eo_fill_root_el        = ocfs2_refcount_tree_fill_root_el,
+       .eo_extent_contig       = ocfs2_refcount_tree_extent_contig,
+};
+
 static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,
-                                    struct inode *inode,
+                                    struct ocfs2_caching_info *ci,
                                     struct buffer_head *bh,
                                     ocfs2_journal_access_func access,
                                     void *obj,
@@ -352,6 +441,7 @@ static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,
 {
        et->et_ops = ops;
        et->et_root_bh = bh;
+       et->et_ci = ci;
        et->et_root_journal_access = access;
        if (!obj)
                obj = (void *)bh->b_data;
@@ -361,41 +451,49 @@ static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,
        if (!et->et_ops->eo_fill_max_leaf_clusters)
                et->et_max_leaf_clusters = 0;
        else
-               et->et_ops->eo_fill_max_leaf_clusters(inode, et);
+               et->et_ops->eo_fill_max_leaf_clusters(et);
 }
 
 void ocfs2_init_dinode_extent_tree(struct ocfs2_extent_tree *et,
-                                  struct inode *inode,
+                                  struct ocfs2_caching_info *ci,
                                   struct buffer_head *bh)
 {
-       __ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_di,
+       __ocfs2_init_extent_tree(et, ci, bh, ocfs2_journal_access_di,
                                 NULL, &ocfs2_dinode_et_ops);
 }
 
 void ocfs2_init_xattr_tree_extent_tree(struct ocfs2_extent_tree *et,
-                                      struct inode *inode,
+                                      struct ocfs2_caching_info *ci,
                                       struct buffer_head *bh)
 {
-       __ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_xb,
+       __ocfs2_init_extent_tree(et, ci, bh, ocfs2_journal_access_xb,
                                 NULL, &ocfs2_xattr_tree_et_ops);
 }
 
 void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,
-                                       struct inode *inode,
+                                       struct ocfs2_caching_info *ci,
                                        struct ocfs2_xattr_value_buf *vb)
 {
-       __ocfs2_init_extent_tree(et, inode, vb->vb_bh, vb->vb_access, vb,
+       __ocfs2_init_extent_tree(et, ci, vb->vb_bh, vb->vb_access, vb,
                                 &ocfs2_xattr_value_et_ops);
 }
 
 void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,
-                                   struct inode *inode,
+                                   struct ocfs2_caching_info *ci,
                                    struct buffer_head *bh)
 {
-       __ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_dr,
+       __ocfs2_init_extent_tree(et, ci, bh, ocfs2_journal_access_dr,
                                 NULL, &ocfs2_dx_root_et_ops);
 }
 
+void ocfs2_init_refcount_extent_tree(struct ocfs2_extent_tree *et,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *bh)
+{
+       __ocfs2_init_extent_tree(et, ci, bh, ocfs2_journal_access_rb,
+                                NULL, &ocfs2_refcount_tree_et_ops);
+}
+
 static inline void ocfs2_et_set_last_eb_blk(struct ocfs2_extent_tree *et,
                                            u64 new_last_eb_blk)
 {
@@ -407,78 +505,71 @@ static inline u64 ocfs2_et_get_last_eb_blk(struct ocfs2_extent_tree *et)
        return et->et_ops->eo_get_last_eb_blk(et);
 }
 
-static inline void ocfs2_et_update_clusters(struct inode *inode,
-                                           struct ocfs2_extent_tree *et,
+static inline void ocfs2_et_update_clusters(struct ocfs2_extent_tree *et,
                                            u32 clusters)
 {
-       et->et_ops->eo_update_clusters(inode, et, clusters);
+       et->et_ops->eo_update_clusters(et, clusters);
+}
+
+static inline void ocfs2_et_extent_map_insert(struct ocfs2_extent_tree *et,
+                                             struct ocfs2_extent_rec *rec)
+{
+       if (et->et_ops->eo_extent_map_insert)
+               et->et_ops->eo_extent_map_insert(et, rec);
+}
+
+static inline void ocfs2_et_extent_map_truncate(struct ocfs2_extent_tree *et,
+                                               u32 clusters)
+{
+       if (et->et_ops->eo_extent_map_truncate)
+               et->et_ops->eo_extent_map_truncate(et, clusters);
 }
 
 static inline int ocfs2_et_root_journal_access(handle_t *handle,
-                                              struct inode *inode,
                                               struct ocfs2_extent_tree *et,
                                               int type)
 {
-       return et->et_root_journal_access(handle, inode, et->et_root_bh,
+       return et->et_root_journal_access(handle, et->et_ci, et->et_root_bh,
                                          type);
 }
 
-static inline int ocfs2_et_insert_check(struct inode *inode,
-                                       struct ocfs2_extent_tree *et,
+static inline enum ocfs2_contig_type
+       ocfs2_et_extent_contig(struct ocfs2_extent_tree *et,
+                              struct ocfs2_extent_rec *rec,
+                              struct ocfs2_extent_rec *insert_rec)
+{
+       if (et->et_ops->eo_extent_contig)
+               return et->et_ops->eo_extent_contig(et, rec, insert_rec);
+
+       return ocfs2_extent_rec_contig(
+                               ocfs2_metadata_cache_get_super(et->et_ci),
+                               rec, insert_rec);
+}
+
+static inline int ocfs2_et_insert_check(struct ocfs2_extent_tree *et,
                                        struct ocfs2_extent_rec *rec)
 {
        int ret = 0;
 
        if (et->et_ops->eo_insert_check)
-               ret = et->et_ops->eo_insert_check(inode, et, rec);
+               ret = et->et_ops->eo_insert_check(et, rec);
        return ret;
 }
 
-static inline int ocfs2_et_sanity_check(struct inode *inode,
-                                       struct ocfs2_extent_tree *et)
+static inline int ocfs2_et_sanity_check(struct ocfs2_extent_tree *et)
 {
        int ret = 0;
 
        if (et->et_ops->eo_sanity_check)
-               ret = et->et_ops->eo_sanity_check(inode, et);
+               ret = et->et_ops->eo_sanity_check(et);
        return ret;
 }
 
 static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc);
 static int ocfs2_cache_extent_block_free(struct ocfs2_cached_dealloc_ctxt *ctxt,
                                         struct ocfs2_extent_block *eb);
-
-/*
- * Structures which describe a path through a btree, and functions to
- * manipulate them.
- *
- * The idea here is to be as generic as possible with the tree
- * manipulation code.
- */
-struct ocfs2_path_item {
-       struct buffer_head              *bh;
-       struct ocfs2_extent_list        *el;
-};
-
-#define OCFS2_MAX_PATH_DEPTH   5
-
-struct ocfs2_path {
-       int                             p_tree_depth;
-       ocfs2_journal_access_func       p_root_access;
-       struct ocfs2_path_item          p_node[OCFS2_MAX_PATH_DEPTH];
-};
-
-#define path_root_bh(_path) ((_path)->p_node[0].bh)
-#define path_root_el(_path) ((_path)->p_node[0].el)
-#define path_root_access(_path)((_path)->p_root_access)
-#define path_leaf_bh(_path) ((_path)->p_node[(_path)->p_tree_depth].bh)
-#define path_leaf_el(_path) ((_path)->p_node[(_path)->p_tree_depth].el)
-#define path_num_items(_path) ((_path)->p_tree_depth + 1)
-
-static int ocfs2_find_path(struct inode *inode, struct ocfs2_path *path,
-                          u32 cpos);
-static void ocfs2_adjust_rightmost_records(struct inode *inode,
-                                          handle_t *handle,
+static void ocfs2_adjust_rightmost_records(handle_t *handle,
+                                          struct ocfs2_extent_tree *et,
                                           struct ocfs2_path *path,
                                           struct ocfs2_extent_rec *insert_rec);
 /*
@@ -486,7 +577,7 @@ static void ocfs2_adjust_rightmost_records(struct inode *inode,
  * to build another path. Generally, this involves freeing the buffer
  * heads.
  */
-static void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root)
+void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root)
 {
        int i, start = 0, depth = 0;
        struct ocfs2_path_item *node;
@@ -515,7 +606,7 @@ static void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root)
        path->p_tree_depth = depth;
 }
 
-static void ocfs2_free_path(struct ocfs2_path *path)
+void ocfs2_free_path(struct ocfs2_path *path)
 {
        if (path) {
                ocfs2_reinit_path(path, 0);
@@ -613,13 +704,13 @@ static struct ocfs2_path *ocfs2_new_path(struct buffer_head *root_bh,
        return path;
 }
 
-static struct ocfs2_path *ocfs2_new_path_from_path(struct ocfs2_path *path)
+struct ocfs2_path *ocfs2_new_path_from_path(struct ocfs2_path *path)
 {
        return ocfs2_new_path(path_root_bh(path), path_root_el(path),
                              path_root_access(path));
 }
 
-static struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et)
+struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et)
 {
        return ocfs2_new_path(et->et_root_bh, et->et_root_el,
                              et->et_root_journal_access);
@@ -632,10 +723,10 @@ static struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et)
  * I don't like the way this function's name looks next to
  * ocfs2_journal_access_path(), but I don't have a better one.
  */
-static int ocfs2_path_bh_journal_access(handle_t *handle,
-                                       struct inode *inode,
-                                       struct ocfs2_path *path,
-                                       int idx)
+int ocfs2_path_bh_journal_access(handle_t *handle,
+                                struct ocfs2_caching_info *ci,
+                                struct ocfs2_path *path,
+                                int idx)
 {
        ocfs2_journal_access_func access = path_root_access(path);
 
@@ -645,15 +736,16 @@ static int ocfs2_path_bh_journal_access(handle_t *handle,
        if (idx)
                access = ocfs2_journal_access_eb;
 
-       return access(handle, inode, path->p_node[idx].bh,
+       return access(handle, ci, path->p_node[idx].bh,
                      OCFS2_JOURNAL_ACCESS_WRITE);
 }
 
 /*
  * Convenience function to journal all components in a path.
  */
-static int ocfs2_journal_access_path(struct inode *inode, handle_t *handle,
-                                    struct ocfs2_path *path)
+int ocfs2_journal_access_path(struct ocfs2_caching_info *ci,
+                             handle_t *handle,
+                             struct ocfs2_path *path)
 {
        int i, ret = 0;
 
@@ -661,7 +753,7 @@ static int ocfs2_journal_access_path(struct inode *inode, handle_t *handle,
                goto out;
 
        for(i = 0; i < path_num_items(path); i++) {
-               ret = ocfs2_path_bh_journal_access(handle, inode, path, i);
+               ret = ocfs2_path_bh_journal_access(handle, ci, path, i);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto out;
@@ -702,17 +794,9 @@ int ocfs2_search_extent_list(struct ocfs2_extent_list *el, u32 v_cluster)
        return ret;
 }
 
-enum ocfs2_contig_type {
-       CONTIG_NONE = 0,
-       CONTIG_LEFT,
-       CONTIG_RIGHT,
-       CONTIG_LEFTRIGHT,
-};
-
-
 /*
  * NOTE: ocfs2_block_extent_contig(), ocfs2_extents_adjacent() and
- * ocfs2_extent_contig only work properly against leaf nodes!
+ * ocfs2_extent_rec_contig only work properly against leaf nodes!
  */
 static int ocfs2_block_extent_contig(struct super_block *sb,
                                     struct ocfs2_extent_rec *ext,
@@ -738,9 +822,9 @@ static int ocfs2_extents_adjacent(struct ocfs2_extent_rec *left,
 }
 
 static enum ocfs2_contig_type
-       ocfs2_extent_contig(struct inode *inode,
-                           struct ocfs2_extent_rec *ext,
-                           struct ocfs2_extent_rec *insert_rec)
+       ocfs2_extent_rec_contig(struct super_block *sb,
+                               struct ocfs2_extent_rec *ext,
+                               struct ocfs2_extent_rec *insert_rec)
 {
        u64 blkno = le64_to_cpu(insert_rec->e_blkno);
 
@@ -753,12 +837,12 @@ static enum ocfs2_contig_type
                return CONTIG_NONE;
 
        if (ocfs2_extents_adjacent(ext, insert_rec) &&
-           ocfs2_block_extent_contig(inode->i_sb, ext, blkno))
+           ocfs2_block_extent_contig(sb, ext, blkno))
                        return CONTIG_RIGHT;
 
        blkno = le64_to_cpu(ext->e_blkno);
        if (ocfs2_extents_adjacent(insert_rec, ext) &&
-           ocfs2_block_extent_contig(inode->i_sb, insert_rec, blkno))
+           ocfs2_block_extent_contig(sb, insert_rec, blkno))
                return CONTIG_LEFT;
 
        return CONTIG_NONE;
@@ -853,13 +937,13 @@ static int ocfs2_validate_extent_block(struct super_block *sb,
        return 0;
 }
 
-int ocfs2_read_extent_block(struct inode *inode, u64 eb_blkno,
+int ocfs2_read_extent_block(struct ocfs2_caching_info *ci, u64 eb_blkno,
                            struct buffer_head **bh)
 {
        int rc;
        struct buffer_head *tmp = *bh;
 
-       rc = ocfs2_read_block(inode, eb_blkno, &tmp,
+       rc = ocfs2_read_block(ci, eb_blkno, &tmp,
                              ocfs2_validate_extent_block);
 
        /* If ocfs2_read_block() got us a new bh, pass it up. */
@@ -874,7 +958,6 @@ int ocfs2_read_extent_block(struct inode *inode, u64 eb_blkno,
  * How many free extents have we got before we need more meta data?
  */
 int ocfs2_num_free_extents(struct ocfs2_super *osb,
-                          struct inode *inode,
                           struct ocfs2_extent_tree *et)
 {
        int retval;
@@ -889,7 +972,8 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb,
        last_eb_blk = ocfs2_et_get_last_eb_blk(et);
 
        if (last_eb_blk) {
-               retval = ocfs2_read_extent_block(inode, last_eb_blk, &eb_bh);
+               retval = ocfs2_read_extent_block(et->et_ci, last_eb_blk,
+                                                &eb_bh);
                if (retval < 0) {
                        mlog_errno(retval);
                        goto bail;
@@ -913,9 +997,8 @@ bail:
  * sets h_signature, h_blkno, h_suballoc_bit, h_suballoc_slot, and
  * l_count for you
  */
-static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
-                                    handle_t *handle,
-                                    struct inode *inode,
+static int ocfs2_create_new_meta_bhs(handle_t *handle,
+                                    struct ocfs2_extent_tree *et,
                                     int wanted,
                                     struct ocfs2_alloc_context *meta_ac,
                                     struct buffer_head *bhs[])
@@ -924,6 +1007,8 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
        u16 suballoc_bit_start;
        u32 num_got;
        u64 first_blkno;
+       struct ocfs2_super *osb =
+               OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
        struct ocfs2_extent_block *eb;
 
        mlog_entry_void();
@@ -949,9 +1034,10 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
                                mlog_errno(status);
                                goto bail;
                        }
-                       ocfs2_set_new_buffer_uptodate(inode, bhs[i]);
+                       ocfs2_set_new_buffer_uptodate(et->et_ci, bhs[i]);
 
-                       status = ocfs2_journal_access_eb(handle, inode, bhs[i],
+                       status = ocfs2_journal_access_eb(handle, et->et_ci,
+                                                        bhs[i],
                                                         OCFS2_JOURNAL_ACCESS_CREATE);
                        if (status < 0) {
                                mlog_errno(status);
@@ -1023,7 +1109,6 @@ static inline u32 ocfs2_sum_rightmost_rec(struct ocfs2_extent_list  *el)
  * extent block's rightmost record.
  */
 static int ocfs2_adjust_rightmost_branch(handle_t *handle,
-                                        struct inode *inode,
                                         struct ocfs2_extent_tree *et)
 {
        int status;
@@ -1037,7 +1122,7 @@ static int ocfs2_adjust_rightmost_branch(handle_t *handle,
                return status;
        }
 
-       status = ocfs2_find_path(inode, path, UINT_MAX);
+       status = ocfs2_find_path(et->et_ci, path, UINT_MAX);
        if (status < 0) {
                mlog_errno(status);
                goto out;
@@ -1050,7 +1135,7 @@ static int ocfs2_adjust_rightmost_branch(handle_t *handle,
                goto out;
        }
 
-       status = ocfs2_journal_access_path(inode, handle, path);
+       status = ocfs2_journal_access_path(et->et_ci, handle, path);
        if (status < 0) {
                mlog_errno(status);
                goto out;
@@ -1059,7 +1144,7 @@ static int ocfs2_adjust_rightmost_branch(handle_t *handle,
        el = path_leaf_el(path);
        rec = &el->l_recs[le32_to_cpu(el->l_next_free_rec) - 1];
 
-       ocfs2_adjust_rightmost_records(inode, handle, path, rec);
+       ocfs2_adjust_rightmost_records(handle, et, path, rec);
 
 out:
        ocfs2_free_path(path);
@@ -1068,7 +1153,7 @@ out:
 
 /*
  * Add an entire tree branch to our inode. eb_bh is the extent block
- * to start at, if we don't want to start the branch at the dinode
+ * to start at, if we don't want to start the branch at the root
  * structure.
  *
  * last_eb_bh is required as we have to update it's next_leaf pointer
@@ -1077,9 +1162,7 @@ out:
  * the new branch will be 'empty' in the sense that every block will
  * contain a single record with cluster count == 0.
  */
-static int ocfs2_add_branch(struct ocfs2_super *osb,
-                           handle_t *handle,
-                           struct inode *inode,
+static int ocfs2_add_branch(handle_t *handle,
                            struct ocfs2_extent_tree *et,
                            struct buffer_head *eb_bh,
                            struct buffer_head **last_eb_bh,
@@ -1123,7 +1206,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
        if (root_end > new_cpos) {
                mlog(0, "adjust the cluster end from %u to %u\n",
                     root_end, new_cpos);
-               status = ocfs2_adjust_rightmost_branch(handle, inode, et);
+               status = ocfs2_adjust_rightmost_branch(handle, et);
                if (status) {
                        mlog_errno(status);
                        goto bail;
@@ -1139,7 +1222,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
                goto bail;
        }
 
-       status = ocfs2_create_new_meta_bhs(osb, handle, inode, new_blocks,
+       status = ocfs2_create_new_meta_bhs(handle, et, new_blocks,
                                           meta_ac, new_eb_bhs);
        if (status < 0) {
                mlog_errno(status);
@@ -1161,7 +1244,7 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
                BUG_ON(!OCFS2_IS_VALID_EXTENT_BLOCK(eb));
                eb_el = &eb->h_list;
 
-               status = ocfs2_journal_access_eb(handle, inode, bh,
+               status = ocfs2_journal_access_eb(handle, et->et_ci, bh,
                                                 OCFS2_JOURNAL_ACCESS_CREATE);
                if (status < 0) {
                        mlog_errno(status);
@@ -1201,20 +1284,20 @@ static int ocfs2_add_branch(struct ocfs2_super *osb,
         * journal_dirty erroring as it won't unless we've aborted the
         * handle (in which case we would never be here) so reserving
         * the write with journal_access is all we need to do. */
-       status = ocfs2_journal_access_eb(handle, inode, *last_eb_bh,
+       status = ocfs2_journal_access_eb(handle, et->et_ci, *last_eb_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
        }
-       status = ocfs2_et_root_journal_access(handle, inode, et,
+       status = ocfs2_et_root_journal_access(handle, et,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
        }
        if (eb_bh) {
-               status = ocfs2_journal_access_eb(handle, inode, eb_bh,
+               status = ocfs2_journal_access_eb(handle, et->et_ci, eb_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -1274,9 +1357,7 @@ bail:
  * returns back the new extent block so you can add a branch to it
  * after this call.
  */
-static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
-                                 handle_t *handle,
-                                 struct inode *inode,
+static int ocfs2_shift_tree_depth(handle_t *handle,
                                  struct ocfs2_extent_tree *et,
                                  struct ocfs2_alloc_context *meta_ac,
                                  struct buffer_head **ret_new_eb_bh)
@@ -1290,7 +1371,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
 
        mlog_entry_void();
 
-       status = ocfs2_create_new_meta_bhs(osb, handle, inode, 1, meta_ac,
+       status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,
                                           &new_eb_bh);
        if (status < 0) {
                mlog_errno(status);
@@ -1304,7 +1385,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
        eb_el = &eb->h_list;
        root_el = et->et_root_el;
 
-       status = ocfs2_journal_access_eb(handle, inode, new_eb_bh,
+       status = ocfs2_journal_access_eb(handle, et->et_ci, new_eb_bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -1323,7 +1404,7 @@ static int ocfs2_shift_tree_depth(struct ocfs2_super *osb,
                goto bail;
        }
 
-       status = ocfs2_et_root_journal_access(handle, inode, et,
+       status = ocfs2_et_root_journal_access(handle, et,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1379,9 +1460,7 @@ bail:
  *
  * return status < 0 indicates an error.
  */
-static int ocfs2_find_branch_target(struct ocfs2_super *osb,
-                                   struct inode *inode,
-                                   struct ocfs2_extent_tree *et,
+static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et,
                                    struct buffer_head **target_bh)
 {
        int status = 0, i;
@@ -1399,19 +1478,21 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb,
 
        while(le16_to_cpu(el->l_tree_depth) > 1) {
                if (le16_to_cpu(el->l_next_free_rec) == 0) {
-                       ocfs2_error(inode->i_sb, "Dinode %llu has empty "
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu has empty "
                                    "extent list (next_free_rec == 0)",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno);
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
                        status = -EIO;
                        goto bail;
                }
                i = le16_to_cpu(el->l_next_free_rec) - 1;
                blkno = le64_to_cpu(el->l_recs[i].e_blkno);
                if (!blkno) {
-                       ocfs2_error(inode->i_sb, "Dinode %llu has extent "
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu has extent "
                                    "list where extent # %d has no physical "
                                    "block start",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno, i);
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
                        status = -EIO;
                        goto bail;
                }
@@ -1419,7 +1500,7 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb,
                brelse(bh);
                bh = NULL;
 
-               status = ocfs2_read_extent_block(inode, blkno, &bh);
+               status = ocfs2_read_extent_block(et->et_ci, blkno, &bh);
                if (status < 0) {
                        mlog_errno(status);
                        goto bail;
@@ -1460,20 +1541,18 @@ bail:
  *
  * *last_eb_bh will be updated by ocfs2_add_branch().
  */
-static int ocfs2_grow_tree(struct inode *inode, handle_t *handle,
-                          struct ocfs2_extent_tree *et, int *final_depth,
-                          struct buffer_head **last_eb_bh,
+static int ocfs2_grow_tree(handle_t *handle, struct ocfs2_extent_tree *et,
+                          int *final_depth, struct buffer_head **last_eb_bh,
                           struct ocfs2_alloc_context *meta_ac)
 {
        int ret, shift;
        struct ocfs2_extent_list *el = et->et_root_el;
        int depth = le16_to_cpu(el->l_tree_depth);
-       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
        struct buffer_head *bh = NULL;
 
        BUG_ON(meta_ac == NULL);
 
-       shift = ocfs2_find_branch_target(osb, inode, et, &bh);
+       shift = ocfs2_find_branch_target(et, &bh);
        if (shift < 0) {
                ret = shift;
                mlog_errno(ret);
@@ -1490,8 +1569,7 @@ static int ocfs2_grow_tree(struct inode *inode, handle_t *handle,
                /* ocfs2_shift_tree_depth will return us a buffer with
                 * the new extent block (so we can pass that to
                 * ocfs2_add_branch). */
-               ret = ocfs2_shift_tree_depth(osb, handle, inode, et,
-                                            meta_ac, &bh);
+               ret = ocfs2_shift_tree_depth(handle, et, meta_ac, &bh);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto out;
@@ -1517,7 +1595,7 @@ static int ocfs2_grow_tree(struct inode *inode, handle_t *handle,
        /* call ocfs2_add_branch to add the final part of the tree with
         * the new data. */
        mlog(0, "add branch. bh = %p\n", bh);
-       ret = ocfs2_add_branch(osb, handle, inode, et, bh, last_eb_bh,
+       ret = ocfs2_add_branch(handle, et, bh, last_eb_bh,
                               meta_ac);
        if (ret < 0) {
                mlog_errno(ret);
@@ -1687,7 +1765,7 @@ set_and_inc:
  *
  * The array index of the subtree root is passed back.
  */
-static int ocfs2_find_subtree_root(struct inode *inode,
+static int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et,
                                   struct ocfs2_path *left,
                                   struct ocfs2_path *right)
 {
@@ -1705,10 +1783,10 @@ static int ocfs2_find_subtree_root(struct inode *inode,
                 * The caller didn't pass two adjacent paths.
                 */
                mlog_bug_on_msg(i > left->p_tree_depth,
-                               "Inode %lu, left depth %u, right depth %u\n"
+                               "Owner %llu, left depth %u, right depth %u\n"
                                "left leaf blk %llu, right leaf blk %llu\n",
-                               inode->i_ino, left->p_tree_depth,
-                               right->p_tree_depth,
+                               (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                               left->p_tree_depth, right->p_tree_depth,
                                (unsigned long long)path_leaf_bh(left)->b_blocknr,
                                (unsigned long long)path_leaf_bh(right)->b_blocknr);
        } while (left->p_node[i].bh->b_blocknr ==
@@ -1725,7 +1803,7 @@ typedef void (path_insert_t)(void *, struct buffer_head *);
  * This code can be called with a cpos larger than the tree, in which
  * case it will return the rightmost path.
  */
-static int __ocfs2_find_path(struct inode *inode,
+static int __ocfs2_find_path(struct ocfs2_caching_info *ci,
                             struct ocfs2_extent_list *root_el, u32 cpos,
                             path_insert_t *func, void *data)
 {
@@ -1736,15 +1814,14 @@ static int __ocfs2_find_path(struct inode *inode,
        struct ocfs2_extent_block *eb;
        struct ocfs2_extent_list *el;
        struct ocfs2_extent_rec *rec;
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
 
        el = root_el;
        while (el->l_tree_depth) {
                if (le16_to_cpu(el->l_next_free_rec) == 0) {
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu has empty extent list at "
+                       ocfs2_error(ocfs2_metadata_cache_get_super(ci),
+                                   "Owner %llu has empty extent list at "
                                    "depth %u\n",
-                                   (unsigned long long)oi->ip_blkno,
+                                   (unsigned long long)ocfs2_metadata_cache_owner(ci),
                                    le16_to_cpu(el->l_tree_depth));
                        ret = -EROFS;
                        goto out;
@@ -1767,10 +1844,10 @@ static int __ocfs2_find_path(struct inode *inode,
 
                blkno = le64_to_cpu(el->l_recs[i].e_blkno);
                if (blkno == 0) {
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu has bad blkno in extent list "
+                       ocfs2_error(ocfs2_metadata_cache_get_super(ci),
+                                   "Owner %llu has bad blkno in extent list "
                                    "at depth %u (index %d)\n",
-                                   (unsigned long long)oi->ip_blkno,
+                                   (unsigned long long)ocfs2_metadata_cache_owner(ci),
                                    le16_to_cpu(el->l_tree_depth), i);
                        ret = -EROFS;
                        goto out;
@@ -1778,7 +1855,7 @@ static int __ocfs2_find_path(struct inode *inode,
 
                brelse(bh);
                bh = NULL;
-               ret = ocfs2_read_extent_block(inode, blkno, &bh);
+               ret = ocfs2_read_extent_block(ci, blkno, &bh);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -1789,10 +1866,10 @@ static int __ocfs2_find_path(struct inode *inode,
 
                if (le16_to_cpu(el->l_next_free_rec) >
                    le16_to_cpu(el->l_count)) {
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu has bad count in extent list "
+                       ocfs2_error(ocfs2_metadata_cache_get_super(ci),
+                                   "Owner %llu has bad count in extent list "
                                    "at block %llu (next free=%u, count=%u)\n",
-                                   (unsigned long long)oi->ip_blkno,
+                                   (unsigned long long)ocfs2_metadata_cache_owner(ci),
                                    (unsigned long long)bh->b_blocknr,
                                    le16_to_cpu(el->l_next_free_rec),
                                    le16_to_cpu(el->l_count));
@@ -1836,14 +1913,14 @@ static void find_path_ins(void *data, struct buffer_head *bh)
        ocfs2_path_insert_eb(fp->path, fp->index, bh);
        fp->index++;
 }
-static int ocfs2_find_path(struct inode *inode, struct ocfs2_path *path,
-                          u32 cpos)
+int ocfs2_find_path(struct ocfs2_caching_info *ci,
+                   struct ocfs2_path *path, u32 cpos)
 {
        struct find_path_data data;
 
        data.index = 1;
        data.path = path;
-       return __ocfs2_find_path(inode, path_root_el(path), cpos,
+       return __ocfs2_find_path(ci, path_root_el(path), cpos,
                                 find_path_ins, &data);
 }
 
@@ -1868,13 +1945,14 @@ static void find_leaf_ins(void *data, struct buffer_head *bh)
  *
  * This function doesn't handle non btree extent lists.
  */
-int ocfs2_find_leaf(struct inode *inode, struct ocfs2_extent_list *root_el,
-                   u32 cpos, struct buffer_head **leaf_bh)
+int ocfs2_find_leaf(struct ocfs2_caching_info *ci,
+                   struct ocfs2_extent_list *root_el, u32 cpos,
+                   struct buffer_head **leaf_bh)
 {
        int ret;
        struct buffer_head *bh = NULL;
 
-       ret = __ocfs2_find_path(inode, root_el, cpos, find_leaf_ins, &bh);
+       ret = __ocfs2_find_path(ci, root_el, cpos, find_leaf_ins, &bh);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -1980,7 +2058,7 @@ static void ocfs2_adjust_root_records(struct ocfs2_extent_list *root_el,
  *   - When we've adjusted the last extent record in the left path leaf and the
  *     1st extent record in the right path leaf during cross extent block merge.
  */
-static void ocfs2_complete_edge_insert(struct inode *inode, handle_t *handle,
+static void ocfs2_complete_edge_insert(handle_t *handle,
                                       struct ocfs2_path *left_path,
                                       struct ocfs2_path *right_path,
                                       int subtree_index)
@@ -2058,8 +2136,8 @@ static void ocfs2_complete_edge_insert(struct inode *inode, handle_t *handle,
                mlog_errno(ret);
 }
 
-static int ocfs2_rotate_subtree_right(struct inode *inode,
-                                     handle_t *handle,
+static int ocfs2_rotate_subtree_right(handle_t *handle,
+                                     struct ocfs2_extent_tree *et,
                                      struct ocfs2_path *left_path,
                                      struct ocfs2_path *right_path,
                                      int subtree_index)
@@ -2075,10 +2153,10 @@ static int ocfs2_rotate_subtree_right(struct inode *inode,
        left_el = path_leaf_el(left_path);
 
        if (left_el->l_next_free_rec != left_el->l_count) {
-               ocfs2_error(inode->i_sb,
+               ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
                            "Inode %llu has non-full interior leaf node %llu"
                            "(next free = %u)",
-                           (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                           (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                            (unsigned long long)left_leaf_bh->b_blocknr,
                            le16_to_cpu(left_el->l_next_free_rec));
                return -EROFS;
@@ -2094,7 +2172,7 @@ static int ocfs2_rotate_subtree_right(struct inode *inode,
        root_bh = left_path->p_node[subtree_index].bh;
        BUG_ON(root_bh != right_path->p_node[subtree_index].bh);
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, right_path,
                                           subtree_index);
        if (ret) {
                mlog_errno(ret);
@@ -2102,14 +2180,14 @@ static int ocfs2_rotate_subtree_right(struct inode *inode,
        }
 
        for(i = subtree_index + 1; i < path_num_items(right_path); i++) {
-               ret = ocfs2_path_bh_journal_access(handle, inode,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                   right_path, i);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               ret = ocfs2_path_bh_journal_access(handle, inode,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                   left_path, i);
                if (ret) {
                        mlog_errno(ret);
@@ -2123,7 +2201,7 @@ static int ocfs2_rotate_subtree_right(struct inode *inode,
        /* This is a code error, not a disk corruption. */
        mlog_bug_on_msg(!right_el->l_next_free_rec, "Inode %llu: Rotate fails "
                        "because rightmost leaf block %llu is empty\n",
-                       (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                       (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                        (unsigned long long)right_leaf_bh->b_blocknr);
 
        ocfs2_create_empty_extent(right_el);
@@ -2157,8 +2235,8 @@ static int ocfs2_rotate_subtree_right(struct inode *inode,
                goto out;
        }
 
-       ocfs2_complete_edge_insert(inode, handle, left_path, right_path,
-                               subtree_index);
+       ocfs2_complete_edge_insert(handle, left_path, right_path,
+                                  subtree_index);
 
 out:
        return ret;
@@ -2248,10 +2326,18 @@ static int ocfs2_extend_rotate_transaction(handle_t *handle, int subtree_depth,
                                           int op_credits,
                                           struct ocfs2_path *path)
 {
+       int ret;
        int credits = (path->p_tree_depth - subtree_depth) * 2 + 1 + op_credits;
 
-       if (handle->h_buffer_credits < credits)
-               return ocfs2_extend_trans(handle, credits);
+       if (handle->h_buffer_credits < credits) {
+               ret = ocfs2_extend_trans(handle,
+                                        credits - handle->h_buffer_credits);
+               if (ret)
+                       return ret;
+
+               if (unlikely(handle->h_buffer_credits < credits))
+                       return ocfs2_extend_trans(handle, credits);
+       }
 
        return 0;
 }
@@ -2321,8 +2407,8 @@ static int ocfs2_leftmost_rec_contains(struct ocfs2_extent_list *el, u32 cpos)
  *   *ret_left_path will contain a valid path which can be passed to
  *   ocfs2_insert_path().
  */
-static int ocfs2_rotate_tree_right(struct inode *inode,
-                                  handle_t *handle,
+static int ocfs2_rotate_tree_right(handle_t *handle,
+                                  struct ocfs2_extent_tree *et,
                                   enum ocfs2_split_type split,
                                   u32 insert_cpos,
                                   struct ocfs2_path *right_path,
@@ -2331,6 +2417,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
        int ret, start, orig_credits = handle->h_buffer_credits;
        u32 cpos;
        struct ocfs2_path *left_path = NULL;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
 
        *ret_left_path = NULL;
 
@@ -2341,7 +2428,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb, right_path, &cpos);
+       ret = ocfs2_find_cpos_for_left_leaf(sb, right_path, &cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -2379,7 +2466,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
                mlog(0, "Rotating a tree: ins. cpos: %u, left path cpos: %u\n",
                     insert_cpos, cpos);
 
-               ret = ocfs2_find_path(inode, left_path, cpos);
+               ret = ocfs2_find_path(et->et_ci, left_path, cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -2387,10 +2474,11 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
 
                mlog_bug_on_msg(path_leaf_bh(left_path) ==
                                path_leaf_bh(right_path),
-                               "Inode %lu: error during insert of %u "
+                               "Owner %llu: error during insert of %u "
                                "(left path cpos %u) results in two identical "
                                "paths ending at %llu\n",
-                               inode->i_ino, insert_cpos, cpos,
+                               (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                               insert_cpos, cpos,
                                (unsigned long long)
                                path_leaf_bh(left_path)->b_blocknr);
 
@@ -2416,7 +2504,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
                        goto out_ret_path;
                }
 
-               start = ocfs2_find_subtree_root(inode, left_path, right_path);
+               start = ocfs2_find_subtree_root(et, left_path, right_path);
 
                mlog(0, "Subtree root at index %d (blk %llu, depth %d)\n",
                     start,
@@ -2430,7 +2518,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
                        goto out;
                }
 
-               ret = ocfs2_rotate_subtree_right(inode, handle, left_path,
+               ret = ocfs2_rotate_subtree_right(handle, et, left_path,
                                                 right_path, start);
                if (ret) {
                        mlog_errno(ret);
@@ -2462,8 +2550,7 @@ static int ocfs2_rotate_tree_right(struct inode *inode,
                 */
                ocfs2_mv_path(right_path, left_path);
 
-               ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb, right_path,
-                                                   &cpos);
+               ret = ocfs2_find_cpos_for_left_leaf(sb, right_path, &cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -2477,7 +2564,8 @@ out_ret_path:
        return ret;
 }
 
-static int ocfs2_update_edge_lengths(struct inode *inode, handle_t *handle,
+static int ocfs2_update_edge_lengths(handle_t *handle,
+                                    struct ocfs2_extent_tree *et,
                                     int subtree_index, struct ocfs2_path *path)
 {
        int i, idx, ret;
@@ -2502,7 +2590,7 @@ static int ocfs2_update_edge_lengths(struct inode *inode, handle_t *handle,
                goto out;
        }
 
-       ret = ocfs2_journal_access_path(inode, handle, path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, path);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -2532,7 +2620,8 @@ out:
        return ret;
 }
 
-static void ocfs2_unlink_path(struct inode *inode, handle_t *handle,
+static void ocfs2_unlink_path(handle_t *handle,
+                             struct ocfs2_extent_tree *et,
                              struct ocfs2_cached_dealloc_ctxt *dealloc,
                              struct ocfs2_path *path, int unlink_start)
 {
@@ -2554,12 +2643,12 @@ static void ocfs2_unlink_path(struct inode *inode, handle_t *handle,
                        mlog(ML_ERROR,
                             "Inode %llu, attempted to remove extent block "
                             "%llu with %u records\n",
-                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                            (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                             (unsigned long long)le64_to_cpu(eb->h_blkno),
                             le16_to_cpu(el->l_next_free_rec));
 
                        ocfs2_journal_dirty(handle, bh);
-                       ocfs2_remove_from_cache(inode, bh);
+                       ocfs2_remove_from_cache(et->et_ci, bh);
                        continue;
                }
 
@@ -2572,11 +2661,12 @@ static void ocfs2_unlink_path(struct inode *inode, handle_t *handle,
                if (ret)
                        mlog_errno(ret);
 
-               ocfs2_remove_from_cache(inode, bh);
+               ocfs2_remove_from_cache(et->et_ci, bh);
        }
 }
 
-static void ocfs2_unlink_subtree(struct inode *inode, handle_t *handle,
+static void ocfs2_unlink_subtree(handle_t *handle,
+                                struct ocfs2_extent_tree *et,
                                 struct ocfs2_path *left_path,
                                 struct ocfs2_path *right_path,
                                 int subtree_index,
@@ -2607,17 +2697,17 @@ static void ocfs2_unlink_subtree(struct inode *inode, handle_t *handle,
        ocfs2_journal_dirty(handle, root_bh);
        ocfs2_journal_dirty(handle, path_leaf_bh(left_path));
 
-       ocfs2_unlink_path(inode, handle, dealloc, right_path,
+       ocfs2_unlink_path(handle, et, dealloc, right_path,
                          subtree_index + 1);
 }
 
-static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
+static int ocfs2_rotate_subtree_left(handle_t *handle,
+                                    struct ocfs2_extent_tree *et,
                                     struct ocfs2_path *left_path,
                                     struct ocfs2_path *right_path,
                                     int subtree_index,
                                     struct ocfs2_cached_dealloc_ctxt *dealloc,
-                                    int *deleted,
-                                    struct ocfs2_extent_tree *et)
+                                    int *deleted)
 {
        int ret, i, del_right_subtree = 0, right_has_empty = 0;
        struct buffer_head *root_bh, *et_root_bh = path_root_bh(right_path);
@@ -2653,7 +2743,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
                        return -EAGAIN;
 
                if (le16_to_cpu(right_leaf_el->l_next_free_rec) > 1) {
-                       ret = ocfs2_journal_access_eb(handle, inode,
+                       ret = ocfs2_journal_access_eb(handle, et->et_ci,
                                                      path_leaf_bh(right_path),
                                                      OCFS2_JOURNAL_ACCESS_WRITE);
                        if (ret) {
@@ -2672,7 +2762,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
                 * We have to update i_last_eb_blk during the meta
                 * data delete.
                 */
-               ret = ocfs2_et_root_journal_access(handle, inode, et,
+               ret = ocfs2_et_root_journal_access(handle, et,
                                                   OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
                        mlog_errno(ret);
@@ -2688,7 +2778,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
         */
        BUG_ON(right_has_empty && !del_right_subtree);
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, right_path,
                                           subtree_index);
        if (ret) {
                mlog_errno(ret);
@@ -2696,14 +2786,14 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
        }
 
        for(i = subtree_index + 1; i < path_num_items(right_path); i++) {
-               ret = ocfs2_path_bh_journal_access(handle, inode,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                   right_path, i);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               ret = ocfs2_path_bh_journal_access(handle, inode,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                   left_path, i);
                if (ret) {
                        mlog_errno(ret);
@@ -2740,9 +2830,9 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
                mlog_errno(ret);
 
        if (del_right_subtree) {
-               ocfs2_unlink_subtree(inode, handle, left_path, right_path,
+               ocfs2_unlink_subtree(handle, et, left_path, right_path,
                                     subtree_index, dealloc);
-               ret = ocfs2_update_edge_lengths(inode, handle, subtree_index,
+               ret = ocfs2_update_edge_lengths(handle, et, subtree_index,
                                                left_path);
                if (ret) {
                        mlog_errno(ret);
@@ -2766,7 +2856,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle,
 
                *deleted = 1;
        } else
-               ocfs2_complete_edge_insert(inode, handle, left_path, right_path,
+               ocfs2_complete_edge_insert(handle, left_path, right_path,
                                           subtree_index);
 
 out:
@@ -2852,8 +2942,8 @@ out:
        return ret;
 }
 
-static int ocfs2_rotate_rightmost_leaf_left(struct inode *inode,
-                                           handle_t *handle,
+static int ocfs2_rotate_rightmost_leaf_left(handle_t *handle,
+                                           struct ocfs2_extent_tree *et,
                                            struct ocfs2_path *path)
 {
        int ret;
@@ -2863,7 +2953,7 @@ static int ocfs2_rotate_rightmost_leaf_left(struct inode *inode,
        if (!ocfs2_is_empty_extent(&el->l_recs[0]))
                return 0;
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, path,
                                           path_num_items(path) - 1);
        if (ret) {
                mlog_errno(ret);
@@ -2880,24 +2970,24 @@ out:
        return ret;
 }
 
-static int __ocfs2_rotate_tree_left(struct inode *inode,
-                                   handle_t *handle, int orig_credits,
+static int __ocfs2_rotate_tree_left(handle_t *handle,
+                                   struct ocfs2_extent_tree *et,
+                                   int orig_credits,
                                    struct ocfs2_path *path,
                                    struct ocfs2_cached_dealloc_ctxt *dealloc,
-                                   struct ocfs2_path **empty_extent_path,
-                                   struct ocfs2_extent_tree *et)
+                                   struct ocfs2_path **empty_extent_path)
 {
        int ret, subtree_root, deleted;
        u32 right_cpos;
        struct ocfs2_path *left_path = NULL;
        struct ocfs2_path *right_path = NULL;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
 
        BUG_ON(!ocfs2_is_empty_extent(&(path_leaf_el(path)->l_recs[0])));
 
        *empty_extent_path = NULL;
 
-       ret = ocfs2_find_cpos_for_right_leaf(inode->i_sb, path,
-                                            &right_cpos);
+       ret = ocfs2_find_cpos_for_right_leaf(sb, path, &right_cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -2920,13 +3010,13 @@ static int __ocfs2_rotate_tree_left(struct inode *inode,
        }
 
        while (right_cpos) {
-               ret = ocfs2_find_path(inode, right_path, right_cpos);
+               ret = ocfs2_find_path(et->et_ci, right_path, right_cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               subtree_root = ocfs2_find_subtree_root(inode, left_path,
+               subtree_root = ocfs2_find_subtree_root(et, left_path,
                                                       right_path);
 
                mlog(0, "Subtree root at index %d (blk %llu, depth %d)\n",
@@ -2946,16 +3036,16 @@ static int __ocfs2_rotate_tree_left(struct inode *inode,
                 * Caller might still want to make changes to the
                 * tree root, so re-add it to the journal here.
                 */
-               ret = ocfs2_path_bh_journal_access(handle, inode,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                   left_path, 0);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               ret = ocfs2_rotate_subtree_left(inode, handle, left_path,
+               ret = ocfs2_rotate_subtree_left(handle, et, left_path,
                                                right_path, subtree_root,
-                                               dealloc, &deleted, et);
+                                               dealloc, &deleted);
                if (ret == -EAGAIN) {
                        /*
                         * The rotation has to temporarily stop due to
@@ -2982,7 +3072,7 @@ static int __ocfs2_rotate_tree_left(struct inode *inode,
 
                ocfs2_mv_path(left_path, right_path);
 
-               ret = ocfs2_find_cpos_for_right_leaf(inode->i_sb, left_path,
+               ret = ocfs2_find_cpos_for_right_leaf(sb, left_path,
                                                     &right_cpos);
                if (ret) {
                        mlog_errno(ret);
@@ -2997,10 +3087,10 @@ out:
        return ret;
 }
 
-static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle,
+static int ocfs2_remove_rightmost_path(handle_t *handle,
+                               struct ocfs2_extent_tree *et,
                                struct ocfs2_path *path,
-                               struct ocfs2_cached_dealloc_ctxt *dealloc,
-                               struct ocfs2_extent_tree *et)
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
 {
        int ret, subtree_index;
        u32 cpos;
@@ -3009,7 +3099,7 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle,
        struct ocfs2_extent_list *el;
 
 
-       ret = ocfs2_et_sanity_check(inode, et);
+       ret = ocfs2_et_sanity_check(et);
        if (ret)
                goto out;
        /*
@@ -3024,13 +3114,14 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle,
                goto out;
        }
 
-       ret = ocfs2_journal_access_path(inode, handle, path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, path);
        if (ret) {
                mlog_errno(ret);
                goto out;
        }
 
-       ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb, path, &cpos);
+       ret = ocfs2_find_cpos_for_left_leaf(ocfs2_metadata_cache_get_super(et->et_ci),
+                                           path, &cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -3048,23 +3139,23 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle,
                        goto out;
                }
 
-               ret = ocfs2_find_path(inode, left_path, cpos);
+               ret = ocfs2_find_path(et->et_ci, left_path, cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               ret = ocfs2_journal_access_path(inode, handle, left_path);
+               ret = ocfs2_journal_access_path(et->et_ci, handle, left_path);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               subtree_index = ocfs2_find_subtree_root(inode, left_path, path);
+               subtree_index = ocfs2_find_subtree_root(et, left_path, path);
 
-               ocfs2_unlink_subtree(inode, handle, left_path, path,
+               ocfs2_unlink_subtree(handle, et, left_path, path,
                                     subtree_index, dealloc);
-               ret = ocfs2_update_edge_lengths(inode, handle, subtree_index,
+               ret = ocfs2_update_edge_lengths(handle, et, subtree_index,
                                                left_path);
                if (ret) {
                        mlog_errno(ret);
@@ -3078,10 +3169,10 @@ static int ocfs2_remove_rightmost_path(struct inode *inode, handle_t *handle,
                 * 'path' is also the leftmost path which
                 * means it must be the only one. This gets
                 * handled differently because we want to
-                * revert the inode back to having extents
+                * revert the root back to having extents
                 * in-line.
                 */
-               ocfs2_unlink_path(inode, handle, dealloc, path, 1);
+               ocfs2_unlink_path(handle, et, dealloc, path, 1);
 
                el = et->et_root_el;
                el->l_tree_depth = 0;
@@ -3114,10 +3205,10 @@ out:
  * the rightmost tree leaf record is removed so the caller is
  * responsible for detecting and correcting that.
  */
-static int ocfs2_rotate_tree_left(struct inode *inode, handle_t *handle,
+static int ocfs2_rotate_tree_left(handle_t *handle,
+                                 struct ocfs2_extent_tree *et,
                                  struct ocfs2_path *path,
-                                 struct ocfs2_cached_dealloc_ctxt *dealloc,
-                                 struct ocfs2_extent_tree *et)
+                                 struct ocfs2_cached_dealloc_ctxt *dealloc)
 {
        int ret, orig_credits = handle->h_buffer_credits;
        struct ocfs2_path *tmp_path = NULL, *restart_path = NULL;
@@ -3134,8 +3225,7 @@ rightmost_no_delete:
                 * Inline extents. This is trivially handled, so do
                 * it up front.
                 */
-               ret = ocfs2_rotate_rightmost_leaf_left(inode, handle,
-                                                      path);
+               ret = ocfs2_rotate_rightmost_leaf_left(handle, et, path);
                if (ret)
                        mlog_errno(ret);
                goto out;
@@ -3151,7 +3241,7 @@ rightmost_no_delete:
         *
         *  1) is handled via ocfs2_rotate_rightmost_leaf_left()
         *  2a) we need the left branch so that we can update it with the unlink
-        *  2b) we need to bring the inode back to inline extents.
+        *  2b) we need to bring the root back to inline extents.
         */
 
        eb = (struct ocfs2_extent_block *)path_leaf_bh(path)->b_data;
@@ -3167,9 +3257,9 @@ rightmost_no_delete:
 
                if (le16_to_cpu(el->l_next_free_rec) == 0) {
                        ret = -EIO;
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu has empty extent block at %llu",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu has empty extent block at %llu",
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                                    (unsigned long long)le64_to_cpu(eb->h_blkno));
                        goto out;
                }
@@ -3183,8 +3273,8 @@ rightmost_no_delete:
                 * nonempty list.
                 */
 
-               ret = ocfs2_remove_rightmost_path(inode, handle, path,
-                                                 dealloc, et);
+               ret = ocfs2_remove_rightmost_path(handle, et, path,
+                                                 dealloc);
                if (ret)
                        mlog_errno(ret);
                goto out;
@@ -3195,8 +3285,8 @@ rightmost_no_delete:
         * and restarting from there.
         */
 try_rotate:
-       ret = __ocfs2_rotate_tree_left(inode, handle, orig_credits, path,
-                                      dealloc, &restart_path, et);
+       ret = __ocfs2_rotate_tree_left(handle, et, orig_credits, path,
+                                      dealloc, &restart_path);
        if (ret && ret != -EAGAIN) {
                mlog_errno(ret);
                goto out;
@@ -3206,9 +3296,9 @@ try_rotate:
                tmp_path = restart_path;
                restart_path = NULL;
 
-               ret = __ocfs2_rotate_tree_left(inode, handle, orig_credits,
+               ret = __ocfs2_rotate_tree_left(handle, et, orig_credits,
                                               tmp_path, dealloc,
-                                              &restart_path, et);
+                                              &restart_path);
                if (ret && ret != -EAGAIN) {
                        mlog_errno(ret);
                        goto out;
@@ -3259,7 +3349,7 @@ static void ocfs2_cleanup_merge(struct ocfs2_extent_list *el,
        }
 }
 
-static int ocfs2_get_right_path(struct inode *inode,
+static int ocfs2_get_right_path(struct ocfs2_extent_tree *et,
                                struct ocfs2_path *left_path,
                                struct ocfs2_path **ret_right_path)
 {
@@ -3276,8 +3366,8 @@ static int ocfs2_get_right_path(struct inode *inode,
        left_el = path_leaf_el(left_path);
        BUG_ON(left_el->l_next_free_rec != left_el->l_count);
 
-       ret = ocfs2_find_cpos_for_right_leaf(inode->i_sb, left_path,
-                                            &right_cpos);
+       ret = ocfs2_find_cpos_for_right_leaf(ocfs2_metadata_cache_get_super(et->et_ci),
+                                            left_path, &right_cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -3293,7 +3383,7 @@ static int ocfs2_get_right_path(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_path(inode, right_path, right_cpos);
+       ret = ocfs2_find_path(et->et_ci, right_path, right_cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -3313,9 +3403,9 @@ out:
  * For index == l_count - 1, the "next" means the 1st extent rec of the
  * next extent block.
  */
-static int ocfs2_merge_rec_right(struct inode *inode,
-                                struct ocfs2_path *left_path,
+static int ocfs2_merge_rec_right(struct ocfs2_path *left_path,
                                 handle_t *handle,
+                                struct ocfs2_extent_tree *et,
                                 struct ocfs2_extent_rec *split_rec,
                                 int index)
 {
@@ -3336,7 +3426,7 @@ static int ocfs2_merge_rec_right(struct inode *inode,
        if (index == le16_to_cpu(el->l_next_free_rec) - 1 &&
            le16_to_cpu(el->l_next_free_rec) == le16_to_cpu(el->l_count)) {
                /* we meet with a cross extent block merge. */
-               ret = ocfs2_get_right_path(inode, left_path, &right_path);
+               ret = ocfs2_get_right_path(et, left_path, &right_path);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -3355,8 +3445,8 @@ static int ocfs2_merge_rec_right(struct inode *inode,
                       le16_to_cpu(left_rec->e_leaf_clusters) !=
                       le32_to_cpu(right_rec->e_cpos));
 
-               subtree_index = ocfs2_find_subtree_root(inode,
-                                                       left_path, right_path);
+               subtree_index = ocfs2_find_subtree_root(et, left_path,
+                                                       right_path);
 
                ret = ocfs2_extend_rotate_transaction(handle, subtree_index,
                                                      handle->h_buffer_credits,
@@ -3369,7 +3459,7 @@ static int ocfs2_merge_rec_right(struct inode *inode,
                root_bh = left_path->p_node[subtree_index].bh;
                BUG_ON(root_bh != right_path->p_node[subtree_index].bh);
 
-               ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci, right_path,
                                                   subtree_index);
                if (ret) {
                        mlog_errno(ret);
@@ -3378,14 +3468,14 @@ static int ocfs2_merge_rec_right(struct inode *inode,
 
                for (i = subtree_index + 1;
                     i < path_num_items(right_path); i++) {
-                       ret = ocfs2_path_bh_journal_access(handle, inode,
+                       ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                           right_path, i);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
                        }
 
-                       ret = ocfs2_path_bh_journal_access(handle, inode,
+                       ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                           left_path, i);
                        if (ret) {
                                mlog_errno(ret);
@@ -3398,7 +3488,7 @@ static int ocfs2_merge_rec_right(struct inode *inode,
                right_rec = &el->l_recs[index + 1];
        }
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, left_path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, left_path,
                                           path_num_items(left_path) - 1);
        if (ret) {
                mlog_errno(ret);
@@ -3409,7 +3499,8 @@ static int ocfs2_merge_rec_right(struct inode *inode,
 
        le32_add_cpu(&right_rec->e_cpos, -split_clusters);
        le64_add_cpu(&right_rec->e_blkno,
-                    -ocfs2_clusters_to_blocks(inode->i_sb, split_clusters));
+                    -ocfs2_clusters_to_blocks(ocfs2_metadata_cache_get_super(et->et_ci),
+                                              split_clusters));
        le16_add_cpu(&right_rec->e_leaf_clusters, split_clusters);
 
        ocfs2_cleanup_merge(el, index);
@@ -3423,8 +3514,8 @@ static int ocfs2_merge_rec_right(struct inode *inode,
                if (ret)
                        mlog_errno(ret);
 
-               ocfs2_complete_edge_insert(inode, handle, left_path,
-                                          right_path, subtree_index);
+               ocfs2_complete_edge_insert(handle, left_path, right_path,
+                                          subtree_index);
        }
 out:
        if (right_path)
@@ -3432,7 +3523,7 @@ out:
        return ret;
 }
 
-static int ocfs2_get_left_path(struct inode *inode,
+static int ocfs2_get_left_path(struct ocfs2_extent_tree *et,
                               struct ocfs2_path *right_path,
                               struct ocfs2_path **ret_left_path)
 {
@@ -3445,7 +3536,7 @@ static int ocfs2_get_left_path(struct inode *inode,
        /* This function shouldn't be called for non-trees. */
        BUG_ON(right_path->p_tree_depth == 0);
 
-       ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb,
+       ret = ocfs2_find_cpos_for_left_leaf(ocfs2_metadata_cache_get_super(et->et_ci),
                                            right_path, &left_cpos);
        if (ret) {
                mlog_errno(ret);
@@ -3462,7 +3553,7 @@ static int ocfs2_get_left_path(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_path(inode, left_path, left_cpos);
+       ret = ocfs2_find_path(et->et_ci, left_path, left_cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -3485,12 +3576,11 @@ out:
  * remove the rightmost leaf extent block in the right_path and change
  * the right path to indicate the new rightmost path.
  */
-static int ocfs2_merge_rec_left(struct inode *inode,
-                               struct ocfs2_path *right_path,
+static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
                                handle_t *handle,
+                               struct ocfs2_extent_tree *et,
                                struct ocfs2_extent_rec *split_rec,
                                struct ocfs2_cached_dealloc_ctxt *dealloc,
-                               struct ocfs2_extent_tree *et,
                                int index)
 {
        int ret, i, subtree_index = 0, has_empty_extent = 0;
@@ -3508,7 +3598,7 @@ static int ocfs2_merge_rec_left(struct inode *inode,
        right_rec = &el->l_recs[index];
        if (index == 0) {
                /* we meet with a cross extent block merge. */
-               ret = ocfs2_get_left_path(inode, right_path, &left_path);
+               ret = ocfs2_get_left_path(et, right_path, &left_path);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -3524,8 +3614,8 @@ static int ocfs2_merge_rec_left(struct inode *inode,
                       le16_to_cpu(left_rec->e_leaf_clusters) !=
                       le32_to_cpu(split_rec->e_cpos));
 
-               subtree_index = ocfs2_find_subtree_root(inode,
-                                                       left_path, right_path);
+               subtree_index = ocfs2_find_subtree_root(et, left_path,
+                                                       right_path);
 
                ret = ocfs2_extend_rotate_transaction(handle, subtree_index,
                                                      handle->h_buffer_credits,
@@ -3538,7 +3628,7 @@ static int ocfs2_merge_rec_left(struct inode *inode,
                root_bh = left_path->p_node[subtree_index].bh;
                BUG_ON(root_bh != right_path->p_node[subtree_index].bh);
 
-               ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+               ret = ocfs2_path_bh_journal_access(handle, et->et_ci, right_path,
                                                   subtree_index);
                if (ret) {
                        mlog_errno(ret);
@@ -3547,14 +3637,14 @@ static int ocfs2_merge_rec_left(struct inode *inode,
 
                for (i = subtree_index + 1;
                     i < path_num_items(right_path); i++) {
-                       ret = ocfs2_path_bh_journal_access(handle, inode,
+                       ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                           right_path, i);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
                        }
 
-                       ret = ocfs2_path_bh_journal_access(handle, inode,
+                       ret = ocfs2_path_bh_journal_access(handle, et->et_ci,
                                                           left_path, i);
                        if (ret) {
                                mlog_errno(ret);
@@ -3567,7 +3657,7 @@ static int ocfs2_merge_rec_left(struct inode *inode,
                        has_empty_extent = 1;
        }
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, right_path,
                                           path_num_items(right_path) - 1);
        if (ret) {
                mlog_errno(ret);
@@ -3586,7 +3676,8 @@ static int ocfs2_merge_rec_left(struct inode *inode,
 
        le32_add_cpu(&right_rec->e_cpos, split_clusters);
        le64_add_cpu(&right_rec->e_blkno,
-                    ocfs2_clusters_to_blocks(inode->i_sb, split_clusters));
+                    ocfs2_clusters_to_blocks(ocfs2_metadata_cache_get_super(et->et_ci),
+                                             split_clusters));
        le16_add_cpu(&right_rec->e_leaf_clusters, -split_clusters);
 
        ocfs2_cleanup_merge(el, index);
@@ -3608,9 +3699,9 @@ static int ocfs2_merge_rec_left(struct inode *inode,
                if (le16_to_cpu(right_rec->e_leaf_clusters) == 0 &&
                    le16_to_cpu(el->l_next_free_rec) == 1) {
 
-                       ret = ocfs2_remove_rightmost_path(inode, handle,
+                       ret = ocfs2_remove_rightmost_path(handle, et,
                                                          right_path,
-                                                         dealloc, et);
+                                                         dealloc);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
@@ -3622,7 +3713,7 @@ static int ocfs2_merge_rec_left(struct inode *inode,
                        ocfs2_mv_path(right_path, left_path);
                        left_path = NULL;
                } else
-                       ocfs2_complete_edge_insert(inode, handle, left_path,
+                       ocfs2_complete_edge_insert(handle, left_path,
                                                   right_path, subtree_index);
        }
 out:
@@ -3631,15 +3722,13 @@ out:
        return ret;
 }
 
-static int ocfs2_try_to_merge_extent(struct inode *inode,
-                                    handle_t *handle,
+static int ocfs2_try_to_merge_extent(handle_t *handle,
+                                    struct ocfs2_extent_tree *et,
                                     struct ocfs2_path *path,
                                     int split_index,
                                     struct ocfs2_extent_rec *split_rec,
                                     struct ocfs2_cached_dealloc_ctxt *dealloc,
-                                    struct ocfs2_merge_ctxt *ctxt,
-                                    struct ocfs2_extent_tree *et)
-
+                                    struct ocfs2_merge_ctxt *ctxt)
 {
        int ret = 0;
        struct ocfs2_extent_list *el = path_leaf_el(path);
@@ -3655,8 +3744,7 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                 * extents - having more than one in a leaf is
                 * illegal.
                 */
-               ret = ocfs2_rotate_tree_left(inode, handle, path,
-                                            dealloc, et);
+               ret = ocfs2_rotate_tree_left(handle, et, path, dealloc);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -3685,8 +3773,7 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                 * prevoius extent block. It is more efficient and easier
                 * if we do merge_right first and merge_left later.
                 */
-               ret = ocfs2_merge_rec_right(inode, path,
-                                           handle, split_rec,
+               ret = ocfs2_merge_rec_right(path, handle, et, split_rec,
                                            split_index);
                if (ret) {
                        mlog_errno(ret);
@@ -3699,8 +3786,7 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                BUG_ON(!ocfs2_is_empty_extent(&el->l_recs[0]));
 
                /* The merge left us with an empty extent, remove it. */
-               ret = ocfs2_rotate_tree_left(inode, handle, path,
-                                            dealloc, et);
+               ret = ocfs2_rotate_tree_left(handle, et, path, dealloc);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -3712,18 +3798,15 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                 * Note that we don't pass split_rec here on purpose -
                 * we've merged it into the rec already.
                 */
-               ret = ocfs2_merge_rec_left(inode, path,
-                                          handle, rec,
-                                          dealloc, et,
-                                          split_index);
+               ret = ocfs2_merge_rec_left(path, handle, et, rec,
+                                          dealloc, split_index);
 
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
-               ret = ocfs2_rotate_tree_left(inode, handle, path,
-                                            dealloc, et);
+               ret = ocfs2_rotate_tree_left(handle, et, path, dealloc);
                /*
                 * Error from this last rotate is not critical, so
                 * print but don't bubble it up.
@@ -3740,19 +3823,16 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                 * the record on the left (hence the left merge).
                 */
                if (ctxt->c_contig_type == CONTIG_RIGHT) {
-                       ret = ocfs2_merge_rec_left(inode,
-                                                  path,
-                                                  handle, split_rec,
-                                                  dealloc, et,
+                       ret = ocfs2_merge_rec_left(path, handle, et,
+                                                  split_rec, dealloc,
                                                   split_index);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
                        }
                } else {
-                       ret = ocfs2_merge_rec_right(inode,
-                                                   path,
-                                                   handle, split_rec,
+                       ret = ocfs2_merge_rec_right(path, handle,
+                                                   et, split_rec,
                                                    split_index);
                        if (ret) {
                                mlog_errno(ret);
@@ -3765,8 +3845,8 @@ static int ocfs2_try_to_merge_extent(struct inode *inode,
                         * The merge may have left an empty extent in
                         * our leaf. Try to rotate it away.
                         */
-                       ret = ocfs2_rotate_tree_left(inode, handle, path,
-                                                    dealloc, et);
+                       ret = ocfs2_rotate_tree_left(handle, et, path,
+                                                    dealloc);
                        if (ret)
                                mlog_errno(ret);
                        ret = 0;
@@ -3812,10 +3892,10 @@ static void ocfs2_subtract_from_rec(struct super_block *sb,
  * list. If this leaf is part of an allocation tree, it is assumed
  * that the tree above has been prepared.
  */
-static void ocfs2_insert_at_leaf(struct ocfs2_extent_rec *insert_rec,
+static void ocfs2_insert_at_leaf(struct ocfs2_extent_tree *et,
+                                struct ocfs2_extent_rec *insert_rec,
                                 struct ocfs2_extent_list *el,
-                                struct ocfs2_insert_type *insert,
-                                struct inode *inode)
+                                struct ocfs2_insert_type *insert)
 {
        int i = insert->ins_contig_index;
        unsigned int range;
@@ -3827,7 +3907,8 @@ static void ocfs2_insert_at_leaf(struct ocfs2_extent_rec *insert_rec,
                i = ocfs2_search_extent_list(el, le32_to_cpu(insert_rec->e_cpos));
                BUG_ON(i == -1);
                rec = &el->l_recs[i];
-               ocfs2_subtract_from_rec(inode->i_sb, insert->ins_split, rec,
+               ocfs2_subtract_from_rec(ocfs2_metadata_cache_get_super(et->et_ci),
+                                       insert->ins_split, rec,
                                        insert_rec);
                goto rotate;
        }
@@ -3869,10 +3950,10 @@ static void ocfs2_insert_at_leaf(struct ocfs2_extent_rec *insert_rec,
 
                mlog_bug_on_msg(le16_to_cpu(el->l_next_free_rec) >=
                                le16_to_cpu(el->l_count),
-                               "inode %lu, depth %u, count %u, next free %u, "
+                               "owner %llu, depth %u, count %u, next free %u, "
                                "rec.cpos %u, rec.clusters %u, "
                                "insert.cpos %u, insert.clusters %u\n",
-                               inode->i_ino,
+                               ocfs2_metadata_cache_owner(et->et_ci),
                                le16_to_cpu(el->l_tree_depth),
                                le16_to_cpu(el->l_count),
                                le16_to_cpu(el->l_next_free_rec),
@@ -3900,8 +3981,8 @@ rotate:
        ocfs2_rotate_leaf(el, insert_rec);
 }
 
-static void ocfs2_adjust_rightmost_records(struct inode *inode,
-                                          handle_t *handle,
+static void ocfs2_adjust_rightmost_records(handle_t *handle,
+                                          struct ocfs2_extent_tree *et,
                                           struct ocfs2_path *path,
                                           struct ocfs2_extent_rec *insert_rec)
 {
@@ -3919,9 +4000,9 @@ static void ocfs2_adjust_rightmost_records(struct inode *inode,
 
                next_free = le16_to_cpu(el->l_next_free_rec);
                if (next_free == 0) {
-                       ocfs2_error(inode->i_sb,
-                                   "Dinode %llu has a bad extent list",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno);
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu has a bad extent list",
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
                        ret = -EIO;
                        return;
                }
@@ -3941,7 +4022,8 @@ static void ocfs2_adjust_rightmost_records(struct inode *inode,
        }
 }
 
-static int ocfs2_append_rec_to_path(struct inode *inode, handle_t *handle,
+static int ocfs2_append_rec_to_path(handle_t *handle,
+                                   struct ocfs2_extent_tree *et,
                                    struct ocfs2_extent_rec *insert_rec,
                                    struct ocfs2_path *right_path,
                                    struct ocfs2_path **ret_left_path)
@@ -3969,8 +4051,8 @@ static int ocfs2_append_rec_to_path(struct inode *inode, handle_t *handle,
            (next_free == 1 && ocfs2_is_empty_extent(&el->l_recs[0]))) {
                u32 left_cpos;
 
-               ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb, right_path,
-                                                   &left_cpos);
+               ret = ocfs2_find_cpos_for_left_leaf(ocfs2_metadata_cache_get_super(et->et_ci),
+                                                   right_path, &left_cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -3992,7 +4074,8 @@ static int ocfs2_append_rec_to_path(struct inode *inode, handle_t *handle,
                                goto out;
                        }
 
-                       ret = ocfs2_find_path(inode, left_path, left_cpos);
+                       ret = ocfs2_find_path(et->et_ci, left_path,
+                                             left_cpos);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
@@ -4005,13 +4088,13 @@ static int ocfs2_append_rec_to_path(struct inode *inode, handle_t *handle,
                }
        }
 
-       ret = ocfs2_journal_access_path(inode, handle, right_path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, right_path);
        if (ret) {
                mlog_errno(ret);
                goto out;
        }
 
-       ocfs2_adjust_rightmost_records(inode, handle, right_path, insert_rec);
+       ocfs2_adjust_rightmost_records(handle, et, right_path, insert_rec);
 
        *ret_left_path = left_path;
        ret = 0;
@@ -4022,7 +4105,7 @@ out:
        return ret;
 }
 
-static void ocfs2_split_record(struct inode *inode,
+static void ocfs2_split_record(struct ocfs2_extent_tree *et,
                               struct ocfs2_path *left_path,
                               struct ocfs2_path *right_path,
                               struct ocfs2_extent_rec *split_rec,
@@ -4095,7 +4178,8 @@ static void ocfs2_split_record(struct inode *inode,
        }
 
        rec = &el->l_recs[index];
-       ocfs2_subtract_from_rec(inode->i_sb, split, rec, split_rec);
+       ocfs2_subtract_from_rec(ocfs2_metadata_cache_get_super(et->et_ci),
+                               split, rec, split_rec);
        ocfs2_rotate_leaf(insert_el, split_rec);
 }
 
@@ -4107,8 +4191,8 @@ static void ocfs2_split_record(struct inode *inode,
  * in. left_path should only be passed in if we need to update that
  * portion of the tree after an edge insert.
  */
-static int ocfs2_insert_path(struct inode *inode,
-                            handle_t *handle,
+static int ocfs2_insert_path(handle_t *handle,
+                            struct ocfs2_extent_tree *et,
                             struct ocfs2_path *left_path,
                             struct ocfs2_path *right_path,
                             struct ocfs2_extent_rec *insert_rec,
@@ -4134,7 +4218,7 @@ static int ocfs2_insert_path(struct inode *inode,
                        goto out;
                }
 
-               ret = ocfs2_journal_access_path(inode, handle, left_path);
+               ret = ocfs2_journal_access_path(et->et_ci, handle, left_path);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto out;
@@ -4145,7 +4229,7 @@ static int ocfs2_insert_path(struct inode *inode,
         * Pass both paths to the journal. The majority of inserts
         * will be touching all components anyway.
         */
-       ret = ocfs2_journal_access_path(inode, handle, right_path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, right_path);
        if (ret < 0) {
                mlog_errno(ret);
                goto out;
@@ -4157,7 +4241,7 @@ static int ocfs2_insert_path(struct inode *inode,
                 * of splits, but it's easier to just let one separate
                 * function sort it all out.
                 */
-               ocfs2_split_record(inode, left_path, right_path,
+               ocfs2_split_record(et, left_path, right_path,
                                   insert_rec, insert->ins_split);
 
                /*
@@ -4171,8 +4255,8 @@ static int ocfs2_insert_path(struct inode *inode,
                        if (ret)
                                mlog_errno(ret);
        } else
-               ocfs2_insert_at_leaf(insert_rec, path_leaf_el(right_path),
-                                    insert, inode);
+               ocfs2_insert_at_leaf(et, insert_rec, path_leaf_el(right_path),
+                                    insert);
 
        ret = ocfs2_journal_dirty(handle, leaf_bh);
        if (ret)
@@ -4185,10 +4269,10 @@ static int ocfs2_insert_path(struct inode *inode,
                 *
                 * XXX: Should we extend the transaction here?
                 */
-               subtree_index = ocfs2_find_subtree_root(inode, left_path,
+               subtree_index = ocfs2_find_subtree_root(et, left_path,
                                                        right_path);
-               ocfs2_complete_edge_insert(inode, handle, left_path,
-                                          right_path, subtree_index);
+               ocfs2_complete_edge_insert(handle, left_path, right_path,
+                                          subtree_index);
        }
 
        ret = 0;
@@ -4196,8 +4280,7 @@ out:
        return ret;
 }
 
-static int ocfs2_do_insert_extent(struct inode *inode,
-                                 handle_t *handle,
+static int ocfs2_do_insert_extent(handle_t *handle,
                                  struct ocfs2_extent_tree *et,
                                  struct ocfs2_extent_rec *insert_rec,
                                  struct ocfs2_insert_type *type)
@@ -4210,7 +4293,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
 
        el = et->et_root_el;
 
-       ret = ocfs2_et_root_journal_access(handle, inode, et,
+       ret = ocfs2_et_root_journal_access(handle, et,
                                           OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -4218,7 +4301,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
        }
 
        if (le16_to_cpu(el->l_tree_depth) == 0) {
-               ocfs2_insert_at_leaf(insert_rec, el, type, inode);
+               ocfs2_insert_at_leaf(et, insert_rec, el, type);
                goto out_update_clusters;
        }
 
@@ -4241,7 +4324,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
                cpos = UINT_MAX;
        }
 
-       ret = ocfs2_find_path(inode, right_path, cpos);
+       ret = ocfs2_find_path(et->et_ci, right_path, cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -4260,7 +4343,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
         * can wind up skipping both of these two special cases...
         */
        if (rotate) {
-               ret = ocfs2_rotate_tree_right(inode, handle, type->ins_split,
+               ret = ocfs2_rotate_tree_right(handle, et, type->ins_split,
                                              le32_to_cpu(insert_rec->e_cpos),
                                              right_path, &left_path);
                if (ret) {
@@ -4272,7 +4355,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
                 * ocfs2_rotate_tree_right() might have extended the
                 * transaction without re-journaling our tree root.
                 */
-               ret = ocfs2_et_root_journal_access(handle, inode, et,
+               ret = ocfs2_et_root_journal_access(handle, et,
                                                   OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
                        mlog_errno(ret);
@@ -4280,7 +4363,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
                }
        } else if (type->ins_appending == APPEND_TAIL
                   && type->ins_contig != CONTIG_LEFT) {
-               ret = ocfs2_append_rec_to_path(inode, handle, insert_rec,
+               ret = ocfs2_append_rec_to_path(handle, et, insert_rec,
                                               right_path, &left_path);
                if (ret) {
                        mlog_errno(ret);
@@ -4288,7 +4371,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
                }
        }
 
-       ret = ocfs2_insert_path(inode, handle, left_path, right_path,
+       ret = ocfs2_insert_path(handle, et, left_path, right_path,
                                insert_rec, type);
        if (ret) {
                mlog_errno(ret);
@@ -4297,7 +4380,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
 
 out_update_clusters:
        if (type->ins_split == SPLIT_NONE)
-               ocfs2_et_update_clusters(inode, et,
+               ocfs2_et_update_clusters(et,
                                         le16_to_cpu(insert_rec->e_leaf_clusters));
 
        ret = ocfs2_journal_dirty(handle, et->et_root_bh);
@@ -4312,7 +4395,8 @@ out:
 }
 
 static enum ocfs2_contig_type
-ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
+ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
+                              struct ocfs2_path *path,
                               struct ocfs2_extent_list *el, int index,
                               struct ocfs2_extent_rec *split_rec)
 {
@@ -4324,12 +4408,12 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
        struct ocfs2_path *left_path = NULL, *right_path = NULL;
        struct buffer_head *bh;
        struct ocfs2_extent_block *eb;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
 
        if (index > 0) {
                rec = &el->l_recs[index - 1];
        } else if (path->p_tree_depth > 0) {
-               status = ocfs2_find_cpos_for_left_leaf(inode->i_sb,
-                                                      path, &left_cpos);
+               status = ocfs2_find_cpos_for_left_leaf(sb, path, &left_cpos);
                if (status)
                        goto out;
 
@@ -4338,7 +4422,8 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                        if (!left_path)
                                goto out;
 
-                       status = ocfs2_find_path(inode, left_path, left_cpos);
+                       status = ocfs2_find_path(et->et_ci, left_path,
+                                                left_cpos);
                        if (status)
                                goto out;
 
@@ -4348,7 +4433,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                            le16_to_cpu(new_el->l_count)) {
                                bh = path_leaf_bh(left_path);
                                eb = (struct ocfs2_extent_block *)bh->b_data;
-                               ocfs2_error(inode->i_sb,
+                               ocfs2_error(sb,
                                            "Extent block #%llu has an "
                                            "invalid l_next_free_rec of "
                                            "%d.  It should have "
@@ -4373,7 +4458,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                        if (split_rec->e_cpos == el->l_recs[index].e_cpos)
                                ret = CONTIG_RIGHT;
                } else {
-                       ret = ocfs2_extent_contig(inode, rec, split_rec);
+                       ret = ocfs2_et_extent_contig(et, rec, split_rec);
                }
        }
 
@@ -4382,8 +4467,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                rec = &el->l_recs[index + 1];
        else if (le16_to_cpu(el->l_next_free_rec) == le16_to_cpu(el->l_count) &&
                 path->p_tree_depth > 0) {
-               status = ocfs2_find_cpos_for_right_leaf(inode->i_sb,
-                                                       path, &right_cpos);
+               status = ocfs2_find_cpos_for_right_leaf(sb, path, &right_cpos);
                if (status)
                        goto out;
 
@@ -4394,7 +4478,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                if (!right_path)
                        goto out;
 
-               status = ocfs2_find_path(inode, right_path, right_cpos);
+               status = ocfs2_find_path(et->et_ci, right_path, right_cpos);
                if (status)
                        goto out;
 
@@ -4404,7 +4488,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
                        if (le16_to_cpu(new_el->l_next_free_rec) <= 1) {
                                bh = path_leaf_bh(right_path);
                                eb = (struct ocfs2_extent_block *)bh->b_data;
-                               ocfs2_error(inode->i_sb,
+                               ocfs2_error(sb,
                                            "Extent block #%llu has an "
                                            "invalid l_next_free_rec of %d",
                                            (unsigned long long)le64_to_cpu(eb->h_blkno),
@@ -4419,7 +4503,7 @@ ocfs2_figure_merge_contig_type(struct inode *inode, struct ocfs2_path *path,
        if (rec) {
                enum ocfs2_contig_type contig_type;
 
-               contig_type = ocfs2_extent_contig(inode, rec, split_rec);
+               contig_type = ocfs2_et_extent_contig(et, rec, split_rec);
 
                if (contig_type == CONTIG_LEFT && ret == CONTIG_RIGHT)
                        ret = CONTIG_LEFTRIGHT;
@@ -4436,11 +4520,10 @@ out:
        return ret;
 }
 
-static void ocfs2_figure_contig_type(struct inode *inode,
+static void ocfs2_figure_contig_type(struct ocfs2_extent_tree *et,
                                     struct ocfs2_insert_type *insert,
                                     struct ocfs2_extent_list *el,
-                                    struct ocfs2_extent_rec *insert_rec,
-                                    struct ocfs2_extent_tree *et)
+                                    struct ocfs2_extent_rec *insert_rec)
 {
        int i;
        enum ocfs2_contig_type contig_type = CONTIG_NONE;
@@ -4448,8 +4531,8 @@ static void ocfs2_figure_contig_type(struct inode *inode,
        BUG_ON(le16_to_cpu(el->l_tree_depth) != 0);
 
        for(i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) {
-               contig_type = ocfs2_extent_contig(inode, &el->l_recs[i],
-                                                 insert_rec);
+               contig_type = ocfs2_et_extent_contig(et, &el->l_recs[i],
+                                                    insert_rec);
                if (contig_type != CONTIG_NONE) {
                        insert->ins_contig_index = i;
                        break;
@@ -4530,8 +4613,7 @@ set_tail_append:
  * All of the information is stored on the ocfs2_insert_type
  * structure.
  */
-static int ocfs2_figure_insert_type(struct inode *inode,
-                                   struct ocfs2_extent_tree *et,
+static int ocfs2_figure_insert_type(struct ocfs2_extent_tree *et,
                                    struct buffer_head **last_eb_bh,
                                    struct ocfs2_extent_rec *insert_rec,
                                    int *free_records,
@@ -4555,7 +4637,7 @@ static int ocfs2_figure_insert_type(struct inode *inode,
                 * ocfs2_figure_insert_type() and ocfs2_add_branch()
                 * may want it later.
                 */
-               ret = ocfs2_read_extent_block(inode,
+               ret = ocfs2_read_extent_block(et->et_ci,
                                              ocfs2_et_get_last_eb_blk(et),
                                              &bh);
                if (ret) {
@@ -4578,7 +4660,7 @@ static int ocfs2_figure_insert_type(struct inode *inode,
                le16_to_cpu(el->l_next_free_rec);
 
        if (!insert->ins_tree_depth) {
-               ocfs2_figure_contig_type(inode, insert, el, insert_rec, et);
+               ocfs2_figure_contig_type(et, insert, el, insert_rec);
                ocfs2_figure_appending_type(insert, el, insert_rec);
                return 0;
        }
@@ -4596,7 +4678,7 @@ static int ocfs2_figure_insert_type(struct inode *inode,
         * us the rightmost tree path. This is accounted for below in
         * the appending code.
         */
-       ret = ocfs2_find_path(inode, path, le32_to_cpu(insert_rec->e_cpos));
+       ret = ocfs2_find_path(et->et_ci, path, le32_to_cpu(insert_rec->e_cpos));
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -4612,7 +4694,7 @@ static int ocfs2_figure_insert_type(struct inode *inode,
          *     into two types of appends: simple record append, or a
          *     rotate inside the tail leaf.
         */
-       ocfs2_figure_contig_type(inode, insert, el, insert_rec, et);
+       ocfs2_figure_contig_type(et, insert, el, insert_rec);
 
        /*
         * The insert code isn't quite ready to deal with all cases of
@@ -4657,13 +4739,11 @@ out:
 }
 
 /*
- * Insert an extent into an inode btree.
+ * Insert an extent into a btree.
  *
- * The caller needs to update fe->i_clusters
+ * The caller needs to update the owning btree's cluster count.
  */
-int ocfs2_insert_extent(struct ocfs2_super *osb,
-                       handle_t *handle,
-                       struct inode *inode,
+int ocfs2_insert_extent(handle_t *handle,
                        struct ocfs2_extent_tree *et,
                        u32 cpos,
                        u64 start_blk,
@@ -4677,21 +4757,22 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,
        struct ocfs2_insert_type insert = {0, };
        struct ocfs2_extent_rec rec;
 
-       mlog(0, "add %u clusters at position %u to inode %llu\n",
-            new_clusters, cpos, (unsigned long long)OCFS2_I(inode)->ip_blkno);
+       mlog(0, "add %u clusters at position %u to owner %llu\n",
+            new_clusters, cpos,
+            (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
 
        memset(&rec, 0, sizeof(rec));
        rec.e_cpos = cpu_to_le32(cpos);
        rec.e_blkno = cpu_to_le64(start_blk);
        rec.e_leaf_clusters = cpu_to_le16(new_clusters);
        rec.e_flags = flags;
-       status = ocfs2_et_insert_check(inode, et, &rec);
+       status = ocfs2_et_insert_check(et, &rec);
        if (status) {
                mlog_errno(status);
                goto bail;
        }
 
-       status = ocfs2_figure_insert_type(inode, et, &last_eb_bh, &rec,
+       status = ocfs2_figure_insert_type(et, &last_eb_bh, &rec,
                                          &free_records, &insert);
        if (status < 0) {
                mlog_errno(status);
@@ -4705,7 +4786,7 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,
             free_records, insert.ins_tree_depth);
 
        if (insert.ins_contig == CONTIG_NONE && free_records == 0) {
-               status = ocfs2_grow_tree(inode, handle, et,
+               status = ocfs2_grow_tree(handle, et,
                                         &insert.ins_tree_depth, &last_eb_bh,
                                         meta_ac);
                if (status) {
@@ -4715,11 +4796,11 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,
        }
 
        /* Finally, we can add clusters. This might rotate the tree for us. */
-       status = ocfs2_do_insert_extent(inode, handle, et, &rec, &insert);
+       status = ocfs2_do_insert_extent(handle, et, &rec, &insert);
        if (status < 0)
                mlog_errno(status);
-       else if (et->et_ops == &ocfs2_dinode_et_ops)
-               ocfs2_extent_map_insert_rec(inode, &rec);
+       else
+               ocfs2_et_extent_map_insert(et, &rec);
 
 bail:
        brelse(last_eb_bh);
@@ -4735,13 +4816,11 @@ bail:
  * it is not limited to the file storage. Any extent tree can use this
  * function if it implements the proper ocfs2_extent_tree.
  */
-int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
-                               struct inode *inode,
+int ocfs2_add_clusters_in_btree(handle_t *handle,
+                               struct ocfs2_extent_tree *et,
                                u32 *logical_offset,
                                u32 clusters_to_add,
                                int mark_unwritten,
-                               struct ocfs2_extent_tree *et,
-                               handle_t *handle,
                                struct ocfs2_alloc_context *data_ac,
                                struct ocfs2_alloc_context *meta_ac,
                                enum ocfs2_alloc_restarted *reason_ret)
@@ -4752,13 +4831,15 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
        u32 bit_off, num_bits;
        u64 block;
        u8 flags = 0;
+       struct ocfs2_super *osb =
+               OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
 
        BUG_ON(!clusters_to_add);
 
        if (mark_unwritten)
                flags = OCFS2_EXT_UNWRITTEN;
 
-       free_extents = ocfs2_num_free_extents(osb, inode, et);
+       free_extents = ocfs2_num_free_extents(osb, et);
        if (free_extents < 0) {
                status = free_extents;
                mlog_errno(status);
@@ -4795,7 +4876,7 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
        BUG_ON(num_bits > clusters_to_add);
 
        /* reserve our write early -- insert_extent may update the tree root */
-       status = ocfs2_et_root_journal_access(handle, inode, et,
+       status = ocfs2_et_root_journal_access(handle, et,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -4803,10 +4884,10 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
        }
 
        block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
-       mlog(0, "Allocating %u clusters at block %u for inode %llu\n",
-            num_bits, bit_off, (unsigned long long)OCFS2_I(inode)->ip_blkno);
-       status = ocfs2_insert_extent(osb, handle, inode, et,
-                                    *logical_offset, block,
+       mlog(0, "Allocating %u clusters at block %u for owner %llu\n",
+            num_bits, bit_off,
+            (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
+       status = ocfs2_insert_extent(handle, et, *logical_offset, block,
                                     num_bits, flags, meta_ac);
        if (status < 0) {
                mlog_errno(status);
@@ -4856,10 +4937,9 @@ static void ocfs2_make_right_split_rec(struct super_block *sb,
        split_rec->e_flags = rec->e_flags;
 }
 
-static int ocfs2_split_and_insert(struct inode *inode,
-                                 handle_t *handle,
-                                 struct ocfs2_path *path,
+static int ocfs2_split_and_insert(handle_t *handle,
                                  struct ocfs2_extent_tree *et,
+                                 struct ocfs2_path *path,
                                  struct buffer_head **last_eb_bh,
                                  int split_index,
                                  struct ocfs2_extent_rec *orig_split_rec,
@@ -4892,7 +4972,7 @@ leftright:
 
        if (le16_to_cpu(rightmost_el->l_next_free_rec) ==
            le16_to_cpu(rightmost_el->l_count)) {
-               ret = ocfs2_grow_tree(inode, handle, et,
+               ret = ocfs2_grow_tree(handle, et,
                                      &depth, last_eb_bh, meta_ac);
                if (ret) {
                        mlog_errno(ret);
@@ -4921,8 +5001,8 @@ leftright:
                 */
                insert.ins_split = SPLIT_RIGHT;
 
-               ocfs2_make_right_split_rec(inode->i_sb, &tmprec, insert_range,
-                                          &rec);
+               ocfs2_make_right_split_rec(ocfs2_metadata_cache_get_super(et->et_ci),
+                                          &tmprec, insert_range, &rec);
 
                split_rec = tmprec;
 
@@ -4930,7 +5010,7 @@ leftright:
                do_leftright = 1;
        }
 
-       ret = ocfs2_do_insert_extent(inode, handle, et, &split_rec, &insert);
+       ret = ocfs2_do_insert_extent(handle, et, &split_rec, &insert);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -4946,7 +5026,7 @@ leftright:
                ocfs2_reinit_path(path, 1);
 
                cpos = le32_to_cpu(split_rec.e_cpos);
-               ret = ocfs2_find_path(inode, path, cpos);
+               ret = ocfs2_find_path(et->et_ci, path, cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -4961,8 +5041,8 @@ out:
        return ret;
 }
 
-static int ocfs2_replace_extent_rec(struct inode *inode,
-                                   handle_t *handle,
+static int ocfs2_replace_extent_rec(handle_t *handle,
+                                   struct ocfs2_extent_tree *et,
                                    struct ocfs2_path *path,
                                    struct ocfs2_extent_list *el,
                                    int split_index,
@@ -4970,7 +5050,7 @@ static int ocfs2_replace_extent_rec(struct inode *inode,
 {
        int ret;
 
-       ret = ocfs2_path_bh_journal_access(handle, inode, path,
+       ret = ocfs2_path_bh_journal_access(handle, et->et_ci, path,
                                           path_num_items(path) - 1);
        if (ret) {
                mlog_errno(ret);
@@ -4985,9 +5065,8 @@ out:
 }
 
 /*
- * Mark part or all of the extent record at split_index in the leaf
- * pointed to by path as written. This removes the unwritten
- * extent flag.
+ * Split part or all of the extent record at split_index in the leaf
+ * pointed to by path. Merge with the contiguous extent record if needed.
  *
  * Care is taken to handle contiguousness so as to not grow the tree.
  *
@@ -5004,14 +5083,13 @@ out:
  * have been brought into cache (and pinned via the journal), so the
  * extra overhead is not expressed in terms of disk reads.
  */
-static int __ocfs2_mark_extent_written(struct inode *inode,
-                                      struct ocfs2_extent_tree *et,
-                                      handle_t *handle,
-                                      struct ocfs2_path *path,
-                                      int split_index,
-                                      struct ocfs2_extent_rec *split_rec,
-                                      struct ocfs2_alloc_context *meta_ac,
-                                      struct ocfs2_cached_dealloc_ctxt *dealloc)
+int ocfs2_split_extent(handle_t *handle,
+                      struct ocfs2_extent_tree *et,
+                      struct ocfs2_path *path,
+                      int split_index,
+                      struct ocfs2_extent_rec *split_rec,
+                      struct ocfs2_alloc_context *meta_ac,
+                      struct ocfs2_cached_dealloc_ctxt *dealloc)
 {
        int ret = 0;
        struct ocfs2_extent_list *el = path_leaf_el(path);
@@ -5020,12 +5098,6 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
        struct ocfs2_merge_ctxt ctxt;
        struct ocfs2_extent_list *rightmost_el;
 
-       if (!(rec->e_flags & OCFS2_EXT_UNWRITTEN)) {
-               ret = -EIO;
-               mlog_errno(ret);
-               goto out;
-       }
-
        if (le32_to_cpu(rec->e_cpos) > le32_to_cpu(split_rec->e_cpos) ||
            ((le32_to_cpu(rec->e_cpos) + le16_to_cpu(rec->e_leaf_clusters)) <
             (le32_to_cpu(split_rec->e_cpos) + le16_to_cpu(split_rec->e_leaf_clusters)))) {
@@ -5034,19 +5106,19 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
                goto out;
        }
 
-       ctxt.c_contig_type = ocfs2_figure_merge_contig_type(inode, path, el,
+       ctxt.c_contig_type = ocfs2_figure_merge_contig_type(et, path, el,
                                                            split_index,
                                                            split_rec);
 
        /*
         * The core merge / split code wants to know how much room is
-        * left in this inodes allocation tree, so we pass the
+        * left in this allocation tree, so we pass the
         * rightmost extent list.
         */
        if (path->p_tree_depth) {
                struct ocfs2_extent_block *eb;
 
-               ret = ocfs2_read_extent_block(inode,
+               ret = ocfs2_read_extent_block(et->et_ci,
                                              ocfs2_et_get_last_eb_blk(et),
                                              &last_eb_bh);
                if (ret) {
@@ -5073,19 +5145,18 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
 
        if (ctxt.c_contig_type == CONTIG_NONE) {
                if (ctxt.c_split_covers_rec)
-                       ret = ocfs2_replace_extent_rec(inode, handle,
-                                                      path, el,
+                       ret = ocfs2_replace_extent_rec(handle, et, path, el,
                                                       split_index, split_rec);
                else
-                       ret = ocfs2_split_and_insert(inode, handle, path, et,
+                       ret = ocfs2_split_and_insert(handle, et, path,
                                                     &last_eb_bh, split_index,
                                                     split_rec, meta_ac);
                if (ret)
                        mlog_errno(ret);
        } else {
-               ret = ocfs2_try_to_merge_extent(inode, handle, path,
+               ret = ocfs2_try_to_merge_extent(handle, et, path,
                                                split_index, split_rec,
-                                               dealloc, &ctxt, et);
+                                               dealloc, &ctxt);
                if (ret)
                        mlog_errno(ret);
        }
@@ -5096,46 +5167,31 @@ out:
 }
 
 /*
- * Mark the already-existing extent at cpos as written for len clusters.
+ * Change the flags of the already-existing extent at cpos for len clusters.
+ *
+ * new_flags: the flags we want to set.
+ * clear_flags: the flags we want to clear.
+ * phys: the new physical offset we want this new extent starts from.
  *
  * If the existing extent is larger than the request, initiate a
  * split. An attempt will be made at merging with adjacent extents.
  *
  * The caller is responsible for passing down meta_ac if we'll need it.
  */
-int ocfs2_mark_extent_written(struct inode *inode,
-                             struct ocfs2_extent_tree *et,
-                             handle_t *handle, u32 cpos, u32 len, u32 phys,
-                             struct ocfs2_alloc_context *meta_ac,
-                             struct ocfs2_cached_dealloc_ctxt *dealloc)
+int ocfs2_change_extent_flag(handle_t *handle,
+                            struct ocfs2_extent_tree *et,
+                            u32 cpos, u32 len, u32 phys,
+                            struct ocfs2_alloc_context *meta_ac,
+                            struct ocfs2_cached_dealloc_ctxt *dealloc,
+                            int new_flags, int clear_flags)
 {
        int ret, index;
-       u64 start_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys);
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
+       u64 start_blkno = ocfs2_clusters_to_blocks(sb, phys);
        struct ocfs2_extent_rec split_rec;
        struct ocfs2_path *left_path = NULL;
        struct ocfs2_extent_list *el;
-
-       mlog(0, "Inode %lu cpos %u, len %u, phys %u (%llu)\n",
-            inode->i_ino, cpos, len, phys, (unsigned long long)start_blkno);
-
-       if (!ocfs2_writes_unwritten_extents(OCFS2_SB(inode->i_sb))) {
-               ocfs2_error(inode->i_sb, "Inode %llu has unwritten extents "
-                           "that are being written to, but the feature bit "
-                           "is not set in the super block.",
-                           (unsigned long long)OCFS2_I(inode)->ip_blkno);
-               ret = -EROFS;
-               goto out;
-       }
-
-       /*
-        * XXX: This should be fixed up so that we just re-insert the
-        * next extent records.
-        *
-        * XXX: This is a hack on the extent tree, maybe it should be
-        * an op?
-        */
-       if (et->et_ops == &ocfs2_dinode_et_ops)
-               ocfs2_extent_map_trunc(inode, 0);
+       struct ocfs2_extent_rec *rec;
 
        left_path = ocfs2_new_path_from_et(et);
        if (!left_path) {
@@ -5144,7 +5200,7 @@ int ocfs2_mark_extent_written(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_path(inode, left_path, cpos);
+       ret = ocfs2_find_path(et->et_ci, left_path, cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -5153,34 +5209,102 @@ int ocfs2_mark_extent_written(struct inode *inode,
 
        index = ocfs2_search_extent_list(el, cpos);
        if (index == -1 || index >= le16_to_cpu(el->l_next_free_rec)) {
-               ocfs2_error(inode->i_sb,
-                           "Inode %llu has an extent at cpos %u which can no "
+               ocfs2_error(sb,
+                           "Owner %llu has an extent at cpos %u which can no "
                            "longer be found.\n",
-                           (unsigned long long)OCFS2_I(inode)->ip_blkno, cpos);
+                            (unsigned long long)
+                            ocfs2_metadata_cache_owner(et->et_ci), cpos);
                ret = -EROFS;
                goto out;
        }
 
+       ret = -EIO;
+       rec = &el->l_recs[index];
+       if (new_flags && (rec->e_flags & new_flags)) {
+               mlog(ML_ERROR, "Owner %llu tried to set %d flags on an "
+                    "extent that already had them",
+                    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                    new_flags);
+               goto out;
+       }
+
+       if (clear_flags && !(rec->e_flags & clear_flags)) {
+               mlog(ML_ERROR, "Owner %llu tried to clear %d flags on an "
+                    "extent that didn't have them",
+                    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                    clear_flags);
+               goto out;
+       }
+
        memset(&split_rec, 0, sizeof(struct ocfs2_extent_rec));
        split_rec.e_cpos = cpu_to_le32(cpos);
        split_rec.e_leaf_clusters = cpu_to_le16(len);
        split_rec.e_blkno = cpu_to_le64(start_blkno);
-       split_rec.e_flags = path_leaf_el(left_path)->l_recs[index].e_flags;
-       split_rec.e_flags &= ~OCFS2_EXT_UNWRITTEN;
-
-       ret = __ocfs2_mark_extent_written(inode, et, handle, left_path,
-                                         index, &split_rec, meta_ac,
-                                         dealloc);
+       split_rec.e_flags = rec->e_flags;
+       if (new_flags)
+               split_rec.e_flags |= new_flags;
+       if (clear_flags)
+               split_rec.e_flags &= ~clear_flags;
+
+       ret = ocfs2_split_extent(handle, et, left_path,
+                                index, &split_rec, meta_ac,
+                                dealloc);
        if (ret)
                mlog_errno(ret);
 
 out:
        ocfs2_free_path(left_path);
        return ret;
+
 }
 
-static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et,
-                           handle_t *handle, struct ocfs2_path *path,
+/*
+ * Mark the already-existing extent at cpos as written for len clusters.
+ * This removes the unwritten extent flag.
+ *
+ * If the existing extent is larger than the request, initiate a
+ * split. An attempt will be made at merging with adjacent extents.
+ *
+ * The caller is responsible for passing down meta_ac if we'll need it.
+ */
+int ocfs2_mark_extent_written(struct inode *inode,
+                             struct ocfs2_extent_tree *et,
+                             handle_t *handle, u32 cpos, u32 len, u32 phys,
+                             struct ocfs2_alloc_context *meta_ac,
+                             struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret;
+
+       mlog(0, "Inode %lu cpos %u, len %u, phys clusters %u\n",
+            inode->i_ino, cpos, len, phys);
+
+       if (!ocfs2_writes_unwritten_extents(OCFS2_SB(inode->i_sb))) {
+               ocfs2_error(inode->i_sb, "Inode %llu has unwritten extents "
+                           "that are being written to, but the feature bit "
+                           "is not set in the super block.",
+                           (unsigned long long)OCFS2_I(inode)->ip_blkno);
+               ret = -EROFS;
+               goto out;
+       }
+
+       /*
+        * XXX: This should be fixed up so that we just re-insert the
+        * next extent records.
+        */
+       ocfs2_et_extent_map_truncate(et, 0);
+
+       ret = ocfs2_change_extent_flag(handle, et, cpos,
+                                      len, phys, meta_ac, dealloc,
+                                      0, OCFS2_EXT_UNWRITTEN);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       return ret;
+}
+
+static int ocfs2_split_tree(handle_t *handle, struct ocfs2_extent_tree *et,
+                           struct ocfs2_path *path,
                            int index, u32 new_range,
                            struct ocfs2_alloc_context *meta_ac)
 {
@@ -5197,11 +5321,12 @@ static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et,
         */
        el = path_leaf_el(path);
        rec = &el->l_recs[index];
-       ocfs2_make_right_split_rec(inode->i_sb, &split_rec, new_range, rec);
+       ocfs2_make_right_split_rec(ocfs2_metadata_cache_get_super(et->et_ci),
+                                  &split_rec, new_range, rec);
 
        depth = path->p_tree_depth;
        if (depth > 0) {
-               ret = ocfs2_read_extent_block(inode,
+               ret = ocfs2_read_extent_block(et->et_ci,
                                              ocfs2_et_get_last_eb_blk(et),
                                              &last_eb_bh);
                if (ret < 0) {
@@ -5224,7 +5349,7 @@ static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et,
 
        if (le16_to_cpu(rightmost_el->l_next_free_rec) ==
            le16_to_cpu(rightmost_el->l_count)) {
-               ret = ocfs2_grow_tree(inode, handle, et, &depth, &last_eb_bh,
+               ret = ocfs2_grow_tree(handle, et, &depth, &last_eb_bh,
                                      meta_ac);
                if (ret) {
                        mlog_errno(ret);
@@ -5238,7 +5363,7 @@ static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et,
        insert.ins_split = SPLIT_RIGHT;
        insert.ins_tree_depth = depth;
 
-       ret = ocfs2_do_insert_extent(inode, handle, et, &split_rec, &insert);
+       ret = ocfs2_do_insert_extent(handle, et, &split_rec, &insert);
        if (ret)
                mlog_errno(ret);
 
@@ -5247,23 +5372,23 @@ out:
        return ret;
 }
 
-static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
+static int ocfs2_truncate_rec(handle_t *handle,
+                             struct ocfs2_extent_tree *et,
                              struct ocfs2_path *path, int index,
                              struct ocfs2_cached_dealloc_ctxt *dealloc,
-                             u32 cpos, u32 len,
-                             struct ocfs2_extent_tree *et)
+                             u32 cpos, u32 len)
 {
        int ret;
        u32 left_cpos, rec_range, trunc_range;
        int wants_rotate = 0, is_rightmost_tree_rec = 0;
-       struct super_block *sb = inode->i_sb;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
        struct ocfs2_path *left_path = NULL;
        struct ocfs2_extent_list *el = path_leaf_el(path);
        struct ocfs2_extent_rec *rec;
        struct ocfs2_extent_block *eb;
 
        if (ocfs2_is_empty_extent(&el->l_recs[0]) && index > 0) {
-               ret = ocfs2_rotate_tree_left(inode, handle, path, dealloc, et);
+               ret = ocfs2_rotate_tree_left(handle, et, path, dealloc);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -5295,14 +5420,13 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
                 * by this leaf and the one to it's left.
                 *
                 * There are two cases we can skip:
-                *   1) Path is the leftmost one in our inode tree.
+                *   1) Path is the leftmost one in our btree.
                 *   2) The leaf is rightmost and will be empty after
                 *      we remove the extent record - the rotate code
                 *      knows how to update the newly formed edge.
                 */
 
-               ret = ocfs2_find_cpos_for_left_leaf(inode->i_sb, path,
-                                                   &left_cpos);
+               ret = ocfs2_find_cpos_for_left_leaf(sb, path, &left_cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -5316,7 +5440,8 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
                                goto out;
                        }
 
-                       ret = ocfs2_find_path(inode, left_path, left_cpos);
+                       ret = ocfs2_find_path(et->et_ci, left_path,
+                                             left_cpos);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
@@ -5332,13 +5457,13 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
                goto out;
        }
 
-       ret = ocfs2_journal_access_path(inode, handle, path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, path);
        if (ret) {
                mlog_errno(ret);
                goto out;
        }
 
-       ret = ocfs2_journal_access_path(inode, handle, left_path);
+       ret = ocfs2_journal_access_path(et->et_ci, handle, left_path);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -5361,7 +5486,7 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
                         * be deleted by the rotate code.
                         */
                        rec = &el->l_recs[next_free - 1];
-                       ocfs2_adjust_rightmost_records(inode, handle, path,
+                       ocfs2_adjust_rightmost_records(handle, et, path,
                                                       rec);
                }
        } else if (le32_to_cpu(rec->e_cpos) == cpos) {
@@ -5373,11 +5498,12 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
                /* Remove rightmost portion of the record */
                le16_add_cpu(&rec->e_leaf_clusters, -len);
                if (is_rightmost_tree_rec)
-                       ocfs2_adjust_rightmost_records(inode, handle, path, rec);
+                       ocfs2_adjust_rightmost_records(handle, et, path, rec);
        } else {
                /* Caller should have trapped this. */
-               mlog(ML_ERROR, "Inode %llu: Invalid record truncate: (%u, %u) "
-                    "(%u, %u)\n", (unsigned long long)OCFS2_I(inode)->ip_blkno,
+               mlog(ML_ERROR, "Owner %llu: Invalid record truncate: (%u, %u) "
+                    "(%u, %u)\n",
+                    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                     le32_to_cpu(rec->e_cpos),
                     le16_to_cpu(rec->e_leaf_clusters), cpos, len);
                BUG();
@@ -5386,14 +5512,14 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle,
        if (left_path) {
                int subtree_index;
 
-               subtree_index = ocfs2_find_subtree_root(inode, left_path, path);
-               ocfs2_complete_edge_insert(inode, handle, left_path, path,
+               subtree_index = ocfs2_find_subtree_root(et, left_path, path);
+               ocfs2_complete_edge_insert(handle, left_path, path,
                                           subtree_index);
        }
 
        ocfs2_journal_dirty(handle, path_leaf_bh(path));
 
-       ret = ocfs2_rotate_tree_left(inode, handle, path, dealloc, et);
+       ret = ocfs2_rotate_tree_left(handle, et, path, dealloc);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -5404,9 +5530,9 @@ out:
        return ret;
 }
 
-int ocfs2_remove_extent(struct inode *inode,
+int ocfs2_remove_extent(handle_t *handle,
                        struct ocfs2_extent_tree *et,
-                       u32 cpos, u32 len, handle_t *handle,
+                       u32 cpos, u32 len,
                        struct ocfs2_alloc_context *meta_ac,
                        struct ocfs2_cached_dealloc_ctxt *dealloc)
 {
@@ -5416,7 +5542,11 @@ int ocfs2_remove_extent(struct inode *inode,
        struct ocfs2_extent_list *el;
        struct ocfs2_path *path = NULL;
 
-       ocfs2_extent_map_trunc(inode, 0);
+       /*
+        * XXX: Why are we truncating to 0 instead of wherever this
+        * affects us?
+        */
+       ocfs2_et_extent_map_truncate(et, 0);
 
        path = ocfs2_new_path_from_et(et);
        if (!path) {
@@ -5425,7 +5555,7 @@ int ocfs2_remove_extent(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_path(inode, path, cpos);
+       ret = ocfs2_find_path(et->et_ci, path, cpos);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -5434,10 +5564,11 @@ int ocfs2_remove_extent(struct inode *inode,
        el = path_leaf_el(path);
        index = ocfs2_search_extent_list(el, cpos);
        if (index == -1 || index >= le16_to_cpu(el->l_next_free_rec)) {
-               ocfs2_error(inode->i_sb,
-                           "Inode %llu has an extent at cpos %u which can no "
+               ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                           "Owner %llu has an extent at cpos %u which can no "
                            "longer be found.\n",
-                           (unsigned long long)OCFS2_I(inode)->ip_blkno, cpos);
+                           (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                           cpos);
                ret = -EROFS;
                goto out;
        }
@@ -5464,20 +5595,21 @@ int ocfs2_remove_extent(struct inode *inode,
 
        BUG_ON(cpos < le32_to_cpu(rec->e_cpos) || trunc_range > rec_range);
 
-       mlog(0, "Inode %llu, remove (cpos %u, len %u). Existing index %d "
+       mlog(0, "Owner %llu, remove (cpos %u, len %u). Existing index %d "
             "(cpos %u, len %u)\n",
-            (unsigned long long)OCFS2_I(inode)->ip_blkno, cpos, len, index,
+            (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+            cpos, len, index,
             le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec));
 
        if (le32_to_cpu(rec->e_cpos) == cpos || rec_range == trunc_range) {
-               ret = ocfs2_truncate_rec(inode, handle, path, index, dealloc,
-                                        cpos, len, et);
+               ret = ocfs2_truncate_rec(handle, et, path, index, dealloc,
+                                        cpos, len);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
        } else {
-               ret = ocfs2_split_tree(inode, et, handle, path, index,
+               ret = ocfs2_split_tree(handle, et, path, index,
                                       trunc_range, meta_ac);
                if (ret) {
                        mlog_errno(ret);
@@ -5490,7 +5622,7 @@ int ocfs2_remove_extent(struct inode *inode,
                 */
                ocfs2_reinit_path(path, 1);
 
-               ret = ocfs2_find_path(inode, path, cpos);
+               ret = ocfs2_find_path(et->et_ci, path, cpos);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -5499,9 +5631,9 @@ int ocfs2_remove_extent(struct inode *inode,
                el = path_leaf_el(path);
                index = ocfs2_search_extent_list(el, cpos);
                if (index == -1 || index >= le16_to_cpu(el->l_next_free_rec)) {
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu: split at cpos %u lost record.",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu: split at cpos %u lost record.",
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                                    cpos);
                        ret = -EROFS;
                        goto out;
@@ -5515,18 +5647,18 @@ int ocfs2_remove_extent(struct inode *inode,
                rec_range = le32_to_cpu(rec->e_cpos) +
                        ocfs2_rec_clusters(el, rec);
                if (rec_range != trunc_range) {
-                       ocfs2_error(inode->i_sb,
-                                   "Inode %llu: error after split at cpos %u"
+                       ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                                   "Owner %llu: error after split at cpos %u"
                                    "trunc len %u, existing record is (%u,%u)",
-                                   (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                                   (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                                    cpos, len, le32_to_cpu(rec->e_cpos),
                                    ocfs2_rec_clusters(el, rec));
                        ret = -EROFS;
                        goto out;
                }
 
-               ret = ocfs2_truncate_rec(inode, handle, path, index, dealloc,
-                                        cpos, len, et);
+               ret = ocfs2_truncate_rec(handle, et, path, index, dealloc,
+                                        cpos, len);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -5573,7 +5705,7 @@ int ocfs2_remove_btree_range(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_et_root_journal_access(handle, inode, et,
+       ret = ocfs2_et_root_journal_access(handle, et,
                                           OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -5583,14 +5715,13 @@ int ocfs2_remove_btree_range(struct inode *inode,
        vfs_dq_free_space_nodirty(inode,
                                  ocfs2_clusters_to_bytes(inode->i_sb, len));
 
-       ret = ocfs2_remove_extent(inode, et, cpos, len, handle, meta_ac,
-                                 dealloc);
+       ret = ocfs2_remove_extent(handle, et, cpos, len, meta_ac, dealloc);
        if (ret) {
                mlog_errno(ret);
                goto out_commit;
        }
 
-       ocfs2_et_update_clusters(inode, et, -len);
+       ocfs2_et_update_clusters(et, -len);
 
        ret = ocfs2_journal_dirty(handle, et->et_root_bh);
        if (ret) {
@@ -5690,7 +5821,7 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb,
                goto bail;
        }
 
-       status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -5752,7 +5883,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
        while (i >= 0) {
                /* Caller has given us at least enough credits to
                 * update the truncate log dinode */
-               status = ocfs2_journal_access_di(handle, tl_inode, tl_bh,
+               status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -6010,7 +6141,7 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb,
                tl->tl_used = 0;
 
                ocfs2_compute_meta_ecc(osb->sb, tl_bh->b_data, &di->i_check);
-               status = ocfs2_write_block(osb, tl_bh, tl_inode);
+               status = ocfs2_write_block(osb, tl_bh, INODE_CACHE(tl_inode));
                if (status < 0) {
                        mlog_errno(status);
                        goto bail;
@@ -6400,9 +6531,9 @@ ocfs2_find_per_slot_free_list(int type,
        return fl;
 }
 
-static int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,
-                                    int type, int slot, u64 blkno,
-                                    unsigned int bit)
+int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,
+                             int type, int slot, u64 blkno,
+                             unsigned int bit)
 {
        int ret;
        struct ocfs2_per_slot_free_list *fl;
@@ -6518,7 +6649,7 @@ static int ocfs2_find_new_last_ext_blk(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_find_leaf(inode, path_root_el(path), cpos, &bh);
+       ret = ocfs2_find_leaf(INODE_CACHE(inode), path_root_el(path), cpos, &bh);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -6551,7 +6682,7 @@ out:
  */
 static int ocfs2_trim_tree(struct inode *inode, struct ocfs2_path *path,
                           handle_t *handle, struct ocfs2_truncate_context *tc,
-                          u32 clusters_to_del, u64 *delete_start)
+                          u32 clusters_to_del, u64 *delete_start, u8 *flags)
 {
        int ret, i, index = path->p_tree_depth;
        u32 new_edge = 0;
@@ -6561,6 +6692,7 @@ static int ocfs2_trim_tree(struct inode *inode, struct ocfs2_path *path,
        struct ocfs2_extent_rec *rec;
 
        *delete_start = 0;
+       *flags = 0;
 
        while (index >= 0) {
                bh = path->p_node[index].bh;
@@ -6648,6 +6780,7 @@ find_tail_record:
                        *delete_start = le64_to_cpu(rec->e_blkno)
                                + ocfs2_clusters_to_blocks(inode->i_sb,
                                        le16_to_cpu(rec->e_leaf_clusters));
+                       *flags = rec->e_flags;
 
                        /*
                         * If it's now empty, remove this record.
@@ -6719,7 +6852,7 @@ delete:
 
                        mlog(0, "deleting this extent block.\n");
 
-                       ocfs2_remove_from_cache(inode, bh);
+                       ocfs2_remove_from_cache(INODE_CACHE(inode), bh);
 
                        BUG_ON(ocfs2_rec_clusters(el, &el->l_recs[0]));
                        BUG_ON(le32_to_cpu(el->l_recs[0].e_cpos));
@@ -6747,7 +6880,8 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
                             struct buffer_head *fe_bh,
                             handle_t *handle,
                             struct ocfs2_truncate_context *tc,
-                            struct ocfs2_path *path)
+                            struct ocfs2_path *path,
+                            struct ocfs2_alloc_context *meta_ac)
 {
        int status;
        struct ocfs2_dinode *fe;
@@ -6755,6 +6889,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
        struct ocfs2_extent_list *el;
        struct buffer_head *last_eb_bh = NULL;
        u64 delete_blk = 0;
+       u8 rec_flags;
 
        fe = (struct ocfs2_dinode *) fe_bh->b_data;
 
@@ -6769,14 +6904,14 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
         * Each component will be touched, so we might as well journal
         * here to avoid having to handle errors later.
         */
-       status = ocfs2_journal_access_path(inode, handle, path);
+       status = ocfs2_journal_access_path(INODE_CACHE(inode), handle, path);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
        }
 
        if (last_eb_bh) {
-               status = ocfs2_journal_access_eb(handle, inode, last_eb_bh,
+               status = ocfs2_journal_access_eb(handle, INODE_CACHE(inode), last_eb_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -6810,7 +6945,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
        inode->i_blocks = ocfs2_inode_sector_count(inode);
 
        status = ocfs2_trim_tree(inode, path, handle, tc,
-                                clusters_to_del, &delete_blk);
+                                clusters_to_del, &delete_blk, &rec_flags);
        if (status) {
                mlog_errno(status);
                goto bail;
@@ -6842,8 +6977,16 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
        }
 
        if (delete_blk) {
-               status = ocfs2_truncate_log_append(osb, handle, delete_blk,
-                                                  clusters_to_del);
+               if (rec_flags & OCFS2_EXT_REFCOUNTED)
+                       status = ocfs2_decrease_refcount(inode, handle,
+                                       ocfs2_blocks_to_clusters(osb->sb,
+                                                                delete_blk),
+                                       clusters_to_del, meta_ac,
+                                       &tc->tc_dealloc, 1);
+               else
+                       status = ocfs2_truncate_log_append(osb, handle,
+                                                          delete_blk,
+                                                          clusters_to_del);
                if (status < 0) {
                        mlog_errno(status);
                        goto bail;
@@ -6863,9 +7006,9 @@ static int ocfs2_zero_func(handle_t *handle, struct buffer_head *bh)
        return 0;
 }
 
-static void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
-                                    unsigned int from, unsigned int to,
-                                    struct page *page, int zero, u64 *phys)
+void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
+                             unsigned int from, unsigned int to,
+                             struct page *page, int zero, u64 *phys)
 {
        int ret, partial = 0;
 
@@ -6933,20 +7076,16 @@ out:
                ocfs2_unlock_and_free_pages(pages, numpages);
 }
 
-static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end,
-                               struct page **pages, int *num)
+int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,
+                    struct page **pages, int *num)
 {
        int numpages, ret = 0;
-       struct super_block *sb = inode->i_sb;
        struct address_space *mapping = inode->i_mapping;
        unsigned long index;
        loff_t last_page_bytes;
 
        BUG_ON(start > end);
 
-       BUG_ON(start >> OCFS2_SB(sb)->s_clustersize_bits !=
-              (end - 1) >> OCFS2_SB(sb)->s_clustersize_bits);
-
        numpages = 0;
        last_page_bytes = PAGE_ALIGN(end);
        index = start >> PAGE_CACHE_SHIFT;
@@ -6974,6 +7113,17 @@ out:
        return ret;
 }
 
+static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end,
+                               struct page **pages, int *num)
+{
+       struct super_block *sb = inode->i_sb;
+
+       BUG_ON(start >> OCFS2_SB(sb)->s_clustersize_bits !=
+              (end - 1) >> OCFS2_SB(sb)->s_clustersize_bits);
+
+       return ocfs2_grab_pages(inode, start, end, pages, num);
+}
+
 /*
  * Zero the area past i_size but still within an allocated
  * cluster. This avoids exposing nonzero data on subsequent file
@@ -7138,7 +7288,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
                goto out_unlock;
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -7218,9 +7368,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
                 * this proves to be false, we could always re-build
                 * the in-inode data from our pages.
                 */
-               ocfs2_init_dinode_extent_tree(&et, inode, di_bh);
-               ret = ocfs2_insert_extent(osb, handle, inode, &et,
-                                         0, block, 1, 0, NULL);
+               ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);
+               ret = ocfs2_insert_extent(handle, &et, 0, block, 1, 0, NULL);
                if (ret) {
                        mlog_errno(ret);
                        goto out_commit;
@@ -7262,11 +7411,14 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
 {
        int status, i, credits, tl_sem = 0;
        u32 clusters_to_del, new_highest_cpos, range;
+       u64 blkno = 0;
        struct ocfs2_extent_list *el;
        handle_t *handle = NULL;
        struct inode *tl_inode = osb->osb_tl_inode;
        struct ocfs2_path *path = NULL;
        struct ocfs2_dinode *di = (struct ocfs2_dinode *)fe_bh->b_data;
+       struct ocfs2_alloc_context *meta_ac = NULL;
+       struct ocfs2_refcount_tree *ref_tree = NULL;
 
        mlog_entry_void();
 
@@ -7292,10 +7444,12 @@ start:
                goto bail;
        }
 
+       credits = 0;
+
        /*
         * Truncate always works against the rightmost tree branch.
         */
-       status = ocfs2_find_path(inode, path, UINT_MAX);
+       status = ocfs2_find_path(INODE_CACHE(inode), path, UINT_MAX);
        if (status) {
                mlog_errno(status);
                goto bail;
@@ -7332,10 +7486,15 @@ start:
                clusters_to_del = 0;
        } else if (le32_to_cpu(el->l_recs[i].e_cpos) >= new_highest_cpos) {
                clusters_to_del = ocfs2_rec_clusters(el, &el->l_recs[i]);
+               blkno = le64_to_cpu(el->l_recs[i].e_blkno);
        } else if (range > new_highest_cpos) {
                clusters_to_del = (ocfs2_rec_clusters(el, &el->l_recs[i]) +
                                   le32_to_cpu(el->l_recs[i].e_cpos)) -
                                  new_highest_cpos;
+               blkno = le64_to_cpu(el->l_recs[i].e_blkno) +
+                       ocfs2_clusters_to_blocks(inode->i_sb,
+                               ocfs2_rec_clusters(el, &el->l_recs[i]) -
+                               clusters_to_del);
        } else {
                status = 0;
                goto bail;
@@ -7344,6 +7503,29 @@ start:
        mlog(0, "clusters_to_del = %u in this pass, tail blk=%llu\n",
             clusters_to_del, (unsigned long long)path_leaf_bh(path)->b_blocknr);
 
+       if (el->l_recs[i].e_flags & OCFS2_EXT_REFCOUNTED && clusters_to_del) {
+               BUG_ON(!(OCFS2_I(inode)->ip_dyn_features &
+                        OCFS2_HAS_REFCOUNT_FL));
+
+               status = ocfs2_lock_refcount_tree(osb,
+                                               le64_to_cpu(di->i_refcount_loc),
+                                               1, &ref_tree, NULL);
+               if (status) {
+                       mlog_errno(status);
+                       goto bail;
+               }
+
+               status = ocfs2_prepare_refcount_change_for_del(inode, fe_bh,
+                                                              blkno,
+                                                              clusters_to_del,
+                                                              &credits,
+                                                              &meta_ac);
+               if (status < 0) {
+                       mlog_errno(status);
+                       goto bail;
+               }
+       }
+
        mutex_lock(&tl_inode->i_mutex);
        tl_sem = 1;
        /* ocfs2_truncate_log_needs_flush guarantees us at least one
@@ -7357,7 +7539,7 @@ start:
                }
        }
 
-       credits = ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del,
+       credits += ocfs2_calc_tree_trunc_credits(osb->sb, clusters_to_del,
                                                (struct ocfs2_dinode *)fe_bh->b_data,
                                                el);
        handle = ocfs2_start_trans(osb, credits);
@@ -7369,7 +7551,7 @@ start:
        }
 
        status = ocfs2_do_truncate(osb, clusters_to_del, inode, fe_bh, handle,
-                                  tc, path);
+                                  tc, path, meta_ac);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
@@ -7383,6 +7565,16 @@ start:
 
        ocfs2_reinit_path(path, 1);
 
+       if (meta_ac) {
+               ocfs2_free_alloc_context(meta_ac);
+               meta_ac = NULL;
+       }
+
+       if (ref_tree) {
+               ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+               ref_tree = NULL;
+       }
+
        /*
         * The check above will catch the case where we've truncated
         * away all allocation.
@@ -7399,6 +7591,12 @@ bail:
        if (handle)
                ocfs2_commit_trans(osb, handle);
 
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+
+       if (ref_tree)
+               ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+
        ocfs2_run_deallocs(osb, &tc->tc_dealloc);
 
        ocfs2_free_path(path);
@@ -7445,7 +7643,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
        ocfs2_init_dealloc_ctxt(&(*tc)->tc_dealloc);
 
        if (fe->id2.i_list.l_tree_depth) {
-               status = ocfs2_read_extent_block(inode,
+               status = ocfs2_read_extent_block(INODE_CACHE(inode),
                                                 le64_to_cpu(fe->i_last_eb_blk),
                                                 &last_eb_bh);
                if (status < 0) {
@@ -7507,7 +7705,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
                goto out;
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
index 353254b..9c122d5 100644 (file)
@@ -45,7 +45,8 @@
  *
  * ocfs2_extent_tree contains info for the root of the b-tree, it must have a
  * root ocfs2_extent_list and a root_bh so that they can be used in the b-tree
- * functions.  With metadata ecc, we now call different journal_access
+ * functions.  It needs the ocfs2_caching_info structure associated with
+ * I/O on the tree.  With metadata ecc, we now call different journal_access
  * functions for each type of metadata, so it must have the
  * root_journal_access function.
  * ocfs2_extent_tree_operations abstract the normal operations we do for
@@ -56,6 +57,7 @@ struct ocfs2_extent_tree {
        struct ocfs2_extent_tree_operations     *et_ops;
        struct buffer_head                      *et_root_bh;
        struct ocfs2_extent_list                *et_root_el;
+       struct ocfs2_caching_info               *et_ci;
        ocfs2_journal_access_func               et_root_journal_access;
        void                                    *et_object;
        unsigned int                            et_max_leaf_clusters;
@@ -66,31 +68,32 @@ struct ocfs2_extent_tree {
  * specified object buffer.
  */
 void ocfs2_init_dinode_extent_tree(struct ocfs2_extent_tree *et,
-                                  struct inode *inode,
+                                  struct ocfs2_caching_info *ci,
                                   struct buffer_head *bh);
 void ocfs2_init_xattr_tree_extent_tree(struct ocfs2_extent_tree *et,
-                                      struct inode *inode,
+                                      struct ocfs2_caching_info *ci,
                                       struct buffer_head *bh);
 struct ocfs2_xattr_value_buf;
 void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,
-                                       struct inode *inode,
+                                       struct ocfs2_caching_info *ci,
                                        struct ocfs2_xattr_value_buf *vb);
 void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,
-                                   struct inode *inode,
+                                   struct ocfs2_caching_info *ci,
                                    struct buffer_head *bh);
+void ocfs2_init_refcount_extent_tree(struct ocfs2_extent_tree *et,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *bh);
 
 /*
  * Read an extent block into *bh.  If *bh is NULL, a bh will be
  * allocated.  This is a cached read.  The extent block will be validated
  * with ocfs2_validate_extent_block().
  */
-int ocfs2_read_extent_block(struct inode *inode, u64 eb_blkno,
+int ocfs2_read_extent_block(struct ocfs2_caching_info *ci, u64 eb_blkno,
                            struct buffer_head **bh);
 
 struct ocfs2_alloc_context;
-int ocfs2_insert_extent(struct ocfs2_super *osb,
-                       handle_t *handle,
-                       struct inode *inode,
+int ocfs2_insert_extent(handle_t *handle,
                        struct ocfs2_extent_tree *et,
                        u32 cpos,
                        u64 start_blk,
@@ -103,25 +106,36 @@ enum ocfs2_alloc_restarted {
        RESTART_TRANS,
        RESTART_META
 };
-int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
-                               struct inode *inode,
+int ocfs2_add_clusters_in_btree(handle_t *handle,
+                               struct ocfs2_extent_tree *et,
                                u32 *logical_offset,
                                u32 clusters_to_add,
                                int mark_unwritten,
-                               struct ocfs2_extent_tree *et,
-                               handle_t *handle,
                                struct ocfs2_alloc_context *data_ac,
                                struct ocfs2_alloc_context *meta_ac,
                                enum ocfs2_alloc_restarted *reason_ret);
 struct ocfs2_cached_dealloc_ctxt;
+struct ocfs2_path;
+int ocfs2_split_extent(handle_t *handle,
+                      struct ocfs2_extent_tree *et,
+                      struct ocfs2_path *path,
+                      int split_index,
+                      struct ocfs2_extent_rec *split_rec,
+                      struct ocfs2_alloc_context *meta_ac,
+                      struct ocfs2_cached_dealloc_ctxt *dealloc);
 int ocfs2_mark_extent_written(struct inode *inode,
                              struct ocfs2_extent_tree *et,
                              handle_t *handle, u32 cpos, u32 len, u32 phys,
                              struct ocfs2_alloc_context *meta_ac,
                              struct ocfs2_cached_dealloc_ctxt *dealloc);
-int ocfs2_remove_extent(struct inode *inode,
-                       struct ocfs2_extent_tree *et,
-                       u32 cpos, u32 len, handle_t *handle,
+int ocfs2_change_extent_flag(handle_t *handle,
+                            struct ocfs2_extent_tree *et,
+                            u32 cpos, u32 len, u32 phys,
+                            struct ocfs2_alloc_context *meta_ac,
+                            struct ocfs2_cached_dealloc_ctxt *dealloc,
+                            int new_flags, int clear_flags);
+int ocfs2_remove_extent(handle_t *handle, struct ocfs2_extent_tree *et,
+                       u32 cpos, u32 len,
                        struct ocfs2_alloc_context *meta_ac,
                        struct ocfs2_cached_dealloc_ctxt *dealloc);
 int ocfs2_remove_btree_range(struct inode *inode,
@@ -130,7 +144,6 @@ int ocfs2_remove_btree_range(struct inode *inode,
                             struct ocfs2_cached_dealloc_ctxt *dealloc);
 
 int ocfs2_num_free_extents(struct ocfs2_super *osb,
-                          struct inode *inode,
                           struct ocfs2_extent_tree *et);
 
 /*
@@ -195,6 +208,9 @@ static inline void ocfs2_init_dealloc_ctxt(struct ocfs2_cached_dealloc_ctxt *c)
 }
 int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,
                                u64 blkno, unsigned int bit);
+int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,
+                             int type, int slot, u64 blkno,
+                             unsigned int bit);
 static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c)
 {
        return c->c_global_allocator != NULL;
@@ -222,8 +238,9 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
 int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
                          unsigned int start, unsigned int end, int trunc);
 
-int ocfs2_find_leaf(struct inode *inode, struct ocfs2_extent_list *root_el,
-                   u32 cpos, struct buffer_head **leaf_bh);
+int ocfs2_find_leaf(struct ocfs2_caching_info *ci,
+                   struct ocfs2_extent_list *root_el, u32 cpos,
+                   struct buffer_head **leaf_bh);
 int ocfs2_search_extent_list(struct ocfs2_extent_list *el, u32 v_cluster);
 
 /*
@@ -254,4 +271,50 @@ static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec)
        return !rec->e_leaf_clusters;
 }
 
+int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,
+                    struct page **pages, int *num);
+void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
+                             unsigned int from, unsigned int to,
+                             struct page *page, int zero, u64 *phys);
+/*
+ * Structures which describe a path through a btree, and functions to
+ * manipulate them.
+ *
+ * The idea here is to be as generic as possible with the tree
+ * manipulation code.
+ */
+struct ocfs2_path_item {
+       struct buffer_head              *bh;
+       struct ocfs2_extent_list        *el;
+};
+
+#define OCFS2_MAX_PATH_DEPTH   5
+
+struct ocfs2_path {
+       int                             p_tree_depth;
+       ocfs2_journal_access_func       p_root_access;
+       struct ocfs2_path_item          p_node[OCFS2_MAX_PATH_DEPTH];
+};
+
+#define path_root_bh(_path) ((_path)->p_node[0].bh)
+#define path_root_el(_path) ((_path)->p_node[0].el)
+#define path_root_access(_path)((_path)->p_root_access)
+#define path_leaf_bh(_path) ((_path)->p_node[(_path)->p_tree_depth].bh)
+#define path_leaf_el(_path) ((_path)->p_node[(_path)->p_tree_depth].el)
+#define path_num_items(_path) ((_path)->p_tree_depth + 1)
+
+void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root);
+void ocfs2_free_path(struct ocfs2_path *path);
+int ocfs2_find_path(struct ocfs2_caching_info *ci,
+                   struct ocfs2_path *path,
+                   u32 cpos);
+struct ocfs2_path *ocfs2_new_path_from_path(struct ocfs2_path *path);
+struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et);
+int ocfs2_path_bh_journal_access(handle_t *handle,
+                                struct ocfs2_caching_info *ci,
+                                struct ocfs2_path *path,
+                                int idx);
+int ocfs2_journal_access_path(struct ocfs2_caching_info *ci,
+                             handle_t *handle,
+                             struct ocfs2_path *path);
 #endif /* OCFS2_ALLOC_H */
index 8a1e615..72e7606 100644 (file)
@@ -44,6 +44,7 @@
 #include "suballoc.h"
 #include "super.h"
 #include "symlink.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
@@ -126,8 +127,8 @@ bail:
        return err;
 }
 
-static int ocfs2_get_block(struct inode *inode, sector_t iblock,
-                          struct buffer_head *bh_result, int create)
+int ocfs2_get_block(struct inode *inode, sector_t iblock,
+                   struct buffer_head *bh_result, int create)
 {
        int err = 0;
        unsigned int ext_flags;
@@ -590,6 +591,8 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
                goto bail;
        }
 
+       /* We should already CoW the refcounted extent. */
+       BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);
        /*
         * get_more_blocks() expects us to describe a hole by clearing
         * the mapped bit on bh_result().
@@ -687,6 +690,10 @@ static ssize_t ocfs2_direct_IO(int rw,
        if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)
                return 0;
 
+       /* Fallback to buffered I/O if we are appending. */
+       if (i_size_read(inode) <= offset)
+               return 0;
+
        ret = blockdev_direct_IO_no_locking(rw, iocb, inode,
                                            inode->i_sb->s_bdev, iov, offset,
                                            nr_segs, 
@@ -1259,7 +1266,8 @@ static int ocfs2_write_cluster(struct address_space *mapping,
                        goto out;
                }
        } else if (unwritten) {
-               ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh);
+               ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),
+                                             wc->w_di_bh);
                ret = ocfs2_mark_extent_written(inode, &et,
                                                wc->w_handle, cpos, 1, phys,
                                                meta_ac, &wc->w_dealloc);
@@ -1448,6 +1456,9 @@ static int ocfs2_populate_write_desc(struct inode *inode,
                                goto out;
                        }
 
+                       /* We should already CoW the refcountd extent. */
+                       BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);
+
                        /*
                         * Assume worst case - that we're writing in
                         * the middle of the extent.
@@ -1528,7 +1539,7 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,
                goto out;
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                ocfs2_commit_trans(osb, handle);
@@ -1699,6 +1710,19 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
                goto out;
        }
 
+       ret = ocfs2_check_range_for_refcount(inode, pos, len);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out;
+       } else if (ret == 1) {
+               ret = ocfs2_refcount_cow(inode, di_bh,
+                                        wc->w_cpos, wc->w_clen, UINT_MAX);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
        ret = ocfs2_populate_write_desc(inode, wc, &clusters_to_alloc,
                                        &extents_to_split);
        if (ret) {
@@ -1726,7 +1750,8 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
                     (long long)i_size_read(inode), le32_to_cpu(di->i_clusters),
                     clusters_to_alloc, extents_to_split);
 
-               ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh);
+               ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),
+                                             wc->w_di_bh);
                ret = ocfs2_lock_allocators(inode, &et,
                                            clusters_to_alloc, extents_to_split,
                                            &data_ac, &meta_ac);
@@ -1773,7 +1798,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
         * We don't want this to fail in ocfs2_write_end(), so do it
         * here.
         */
-       ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
index 503e492..c48e93f 100644 (file)
@@ -57,6 +57,8 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page,
                           struct buffer_head *di_bh);
 int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size);
 
+int ocfs2_get_block(struct inode *inode, sector_t iblock,
+                   struct buffer_head *bh_result, int create);
 /* all ocfs2_dio_end_io()'s fault */
 #define ocfs2_iocb_is_rw_locked(iocb) \
        test_bit(0, (unsigned long *)&iocb->private)
index 15c8e6d..d43d34a 100644 (file)
@@ -52,12 +52,12 @@ enum ocfs2_state_bits {
 BUFFER_FNS(NeedsValidate, needs_validate);
 
 int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
-                     struct inode *inode)
+                     struct ocfs2_caching_info *ci)
 {
        int ret = 0;
 
-       mlog_entry("(bh->b_blocknr = %llu, inode=%p)\n",
-                  (unsigned long long)bh->b_blocknr, inode);
+       mlog_entry("(bh->b_blocknr = %llu, ci=%p)\n",
+                  (unsigned long long)bh->b_blocknr, ci);
 
        BUG_ON(bh->b_blocknr < OCFS2_SUPER_BLOCK_BLKNO);
        BUG_ON(buffer_jbd(bh));
@@ -70,7 +70,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
                goto out;
        }
 
-       mutex_lock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_lock(ci);
 
        lock_buffer(bh);
        set_buffer_uptodate(bh);
@@ -85,7 +85,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
        wait_on_buffer(bh);
 
        if (buffer_uptodate(bh)) {
-               ocfs2_set_buffer_uptodate(inode, bh);
+               ocfs2_set_buffer_uptodate(ci, bh);
        } else {
                /* We don't need to remove the clustered uptodate
                 * information for this bh as it's not marked locally
@@ -94,7 +94,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
                put_bh(bh);
        }
 
-       mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_unlock(ci);
 out:
        mlog_exit(ret);
        return ret;
@@ -177,7 +177,7 @@ bail:
        return status;
 }
 
-int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
+int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
                      struct buffer_head *bhs[], int flags,
                      int (*validate)(struct super_block *sb,
                                      struct buffer_head *bh))
@@ -185,11 +185,12 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
        int status = 0;
        int i, ignore_cache = 0;
        struct buffer_head *bh;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
 
-       mlog_entry("(inode=%p, block=(%llu), nr=(%d), flags=%d)\n",
-                  inode, (unsigned long long)block, nr, flags);
+       mlog_entry("(ci=%p, block=(%llu), nr=(%d), flags=%d)\n",
+                  ci, (unsigned long long)block, nr, flags);
 
-       BUG_ON(!inode);
+       BUG_ON(!ci);
        BUG_ON((flags & OCFS2_BH_READAHEAD) &&
               (flags & OCFS2_BH_IGNORE_CACHE));
 
@@ -212,12 +213,12 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                goto bail;
        }
 
-       mutex_lock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_lock(ci);
        for (i = 0 ; i < nr ; i++) {
                if (bhs[i] == NULL) {
-                       bhs[i] = sb_getblk(inode->i_sb, block++);
+                       bhs[i] = sb_getblk(sb, block++);
                        if (bhs[i] == NULL) {
-                               mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
+                               ocfs2_metadata_cache_io_unlock(ci);
                                status = -EIO;
                                mlog_errno(status);
                                goto bail;
@@ -250,11 +251,11 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                 *    before our is-it-in-flight check.
                 */
 
-               if (!ignore_cache && !ocfs2_buffer_uptodate(inode, bh)) {
+               if (!ignore_cache && !ocfs2_buffer_uptodate(ci, bh)) {
                        mlog(ML_UPTODATE,
-                            "bh (%llu), inode %llu not uptodate\n",
+                            "bh (%llu), owner %llu not uptodate\n",
                             (unsigned long long)bh->b_blocknr,
-                            (unsigned long long)OCFS2_I(inode)->ip_blkno);
+                            (unsigned long long)ocfs2_metadata_cache_owner(ci));
                        /* We're using ignore_cache here to say
                         * "go to disk" */
                        ignore_cache = 1;
@@ -283,7 +284,7 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                         * previously submitted request than we are
                         * done here. */
                        if ((flags & OCFS2_BH_READAHEAD)
-                           && ocfs2_buffer_read_ahead(inode, bh))
+                           && ocfs2_buffer_read_ahead(ci, bh))
                                continue;
 
                        lock_buffer(bh);
@@ -305,7 +306,7 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                         * buffer lock. */
                        if (!(flags & OCFS2_BH_IGNORE_CACHE)
                            && !(flags & OCFS2_BH_READAHEAD)
-                           && ocfs2_buffer_uptodate(inode, bh)) {
+                           && ocfs2_buffer_uptodate(ci, bh)) {
                                unlock_buffer(bh);
                                continue;
                        }
@@ -327,7 +328,7 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
 
                if (!(flags & OCFS2_BH_READAHEAD)) {
                        /* We know this can't have changed as we hold the
-                        * inode sem. Avoid doing any work on the bh if the
+                        * owner sem. Avoid doing any work on the bh if the
                         * journal has it. */
                        if (!buffer_jbd(bh))
                                wait_on_buffer(bh);
@@ -351,7 +352,7 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                                 * that better not have changed */
                                BUG_ON(buffer_jbd(bh));
                                clear_buffer_needs_validate(bh);
-                               status = validate(inode->i_sb, bh);
+                               status = validate(sb, bh);
                                if (status) {
                                        put_bh(bh);
                                        bhs[i] = NULL;
@@ -363,9 +364,9 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
                /* Always set the buffer in the cache, even if it was
                 * a forced read, or read-ahead which hasn't yet
                 * completed. */
-               ocfs2_set_buffer_uptodate(inode, bh);
+               ocfs2_set_buffer_uptodate(ci, bh);
        }
-       mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_unlock(ci);
 
        mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s, flags=0x%x\n", 
             (unsigned long long)block, nr,
@@ -399,7 +400,7 @@ static void ocfs2_check_super_or_backup(struct super_block *sb,
 
 /*
  * Write super block and backups doesn't need to collaborate with journal,
- * so we don't need to lock ip_io_mutex and inode doesn't need to bea passed
+ * so we don't need to lock ip_io_mutex and ci doesn't need to bea passed
  * into this function.
  */
 int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
index c75d682..b97bcc6 100644 (file)
@@ -33,7 +33,7 @@ void ocfs2_end_buffer_io_sync(struct buffer_head *bh,
 
 int ocfs2_write_block(struct ocfs2_super          *osb,
                      struct buffer_head  *bh,
-                     struct inode        *inode);
+                     struct ocfs2_caching_info   *ci);
 int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
                           unsigned int nr, struct buffer_head *bhs[]);
 
@@ -44,7 +44,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
  * be set even for a READAHEAD call, as it marks the buffer for later
  * validation.
  */
-int ocfs2_read_blocks(struct inode *inode, u64 block, int nr,
+int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
                      struct buffer_head *bhs[], int flags,
                      int (*validate)(struct super_block *sb,
                                      struct buffer_head *bh));
@@ -55,7 +55,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
 #define OCFS2_BH_IGNORE_CACHE      1
 #define OCFS2_BH_READAHEAD         8
 
-static inline int ocfs2_read_block(struct inode *inode, u64 off,
+static inline int ocfs2_read_block(struct ocfs2_caching_info *ci, u64 off,
                                   struct buffer_head **bh,
                                   int (*validate)(struct super_block *sb,
                                                   struct buffer_head *bh))
@@ -68,7 +68,7 @@ static inline int ocfs2_read_block(struct inode *inode, u64 off,
                goto bail;
        }
 
-       status = ocfs2_read_blocks(inode, off, 1, bh, 0, validate);
+       status = ocfs2_read_blocks(ci, off, 1, bh, 0, validate);
 
 bail:
        return status;
index 96df541..1cd2934 100644 (file)
@@ -111,6 +111,7 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
        define_mask(EXPORT),
        define_mask(XATTR),
        define_mask(QUOTA),
+       define_mask(REFCOUNT),
        define_mask(ERROR),
        define_mask(NOTICE),
        define_mask(KTHREAD),
index 696c32e..9b4d117 100644 (file)
 #define ML_EXPORT      0x0000000010000000ULL /* ocfs2 export operations */
 #define ML_XATTR       0x0000000020000000ULL /* ocfs2 extended attributes */
 #define ML_QUOTA       0x0000000040000000ULL /* ocfs2 quota operations */
+#define ML_REFCOUNT    0x0000000080000000ULL /* refcount tree operations */
 /* bits that are infrequently given and frequently matched in the high word */
 #define ML_ERROR       0x0000000100000000ULL /* sent to KERN_ERR */
 #define ML_NOTICE      0x0000000200000000ULL /* setn to KERN_NOTICE */
index f842487..cfb2be7 100644 (file)
@@ -163,7 +163,7 @@ static void nst_seq_stop(struct seq_file *seq, void *v)
 {
 }
 
-static struct seq_operations nst_seq_ops = {
+static const struct seq_operations nst_seq_ops = {
        .start = nst_seq_start,
        .next = nst_seq_next,
        .stop = nst_seq_stop,
@@ -344,7 +344,7 @@ static void sc_seq_stop(struct seq_file *seq, void *v)
 {
 }
 
-static struct seq_operations sc_seq_ops = {
+static const struct seq_operations sc_seq_ops = {
        .start = sc_seq_start,
        .next = sc_seq_next,
        .stop = sc_seq_stop,
index b358f3b..28c3ec2 100644 (file)
@@ -176,7 +176,7 @@ static int ocfs2_dx_dir_link_trailer(struct inode *dir, handle_t *handle,
        struct ocfs2_dx_root_block *dx_root;
        struct ocfs2_dir_block_trailer *trailer;
 
-       ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,
+       ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -564,7 +564,8 @@ static int ocfs2_read_dir_block_direct(struct inode *dir, u64 phys,
        int ret;
        struct buffer_head *tmp = *bh;
 
-       ret = ocfs2_read_block(dir, phys, &tmp, ocfs2_validate_dir_block);
+       ret = ocfs2_read_block(INODE_CACHE(dir), phys, &tmp,
+                              ocfs2_validate_dir_block);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -622,7 +623,8 @@ static int ocfs2_read_dx_root(struct inode *dir, struct ocfs2_dinode *di,
        u64 blkno = le64_to_cpu(di->i_dx_root);
        struct buffer_head *tmp = *dx_root_bh;
 
-       ret = ocfs2_read_block(dir, blkno, &tmp, ocfs2_validate_dx_root);
+       ret = ocfs2_read_block(INODE_CACHE(dir), blkno, &tmp,
+                              ocfs2_validate_dx_root);
 
        /* If ocfs2_read_block() got us a new bh, pass it up. */
        if (!ret && !*dx_root_bh)
@@ -662,7 +664,8 @@ static int ocfs2_read_dx_leaf(struct inode *dir, u64 blkno,
        int ret;
        struct buffer_head *tmp = *dx_leaf_bh;
 
-       ret = ocfs2_read_block(dir, blkno, &tmp, ocfs2_validate_dx_leaf);
+       ret = ocfs2_read_block(INODE_CACHE(dir), blkno, &tmp,
+                              ocfs2_validate_dx_leaf);
 
        /* If ocfs2_read_block() got us a new bh, pass it up. */
        if (!ret && !*dx_leaf_bh)
@@ -680,7 +683,7 @@ static int ocfs2_read_dx_leaves(struct inode *dir, u64 start, int num,
 {
        int ret;
 
-       ret = ocfs2_read_blocks(dir, start, num, dx_leaf_bhs, 0,
+       ret = ocfs2_read_blocks(INODE_CACHE(dir), start, num, dx_leaf_bhs, 0,
                                ocfs2_validate_dx_leaf);
        if (ret)
                mlog_errno(ret);
@@ -802,7 +805,8 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,
        struct ocfs2_extent_rec *rec = NULL;
 
        if (el->l_tree_depth) {
-               ret = ocfs2_find_leaf(inode, el, major_hash, &eb_bh);
+               ret = ocfs2_find_leaf(INODE_CACHE(inode), el, major_hash,
+                                     &eb_bh);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -1133,7 +1137,8 @@ int ocfs2_update_entry(struct inode *dir, handle_t *handle,
        if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL)
                access = ocfs2_journal_access_di;
 
-       ret = access(handle, dir, de_bh, OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = access(handle, INODE_CACHE(dir), de_bh,
+                    OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -1176,7 +1181,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
                        goto bail;
                }
                if (de == de_del)  {
-                       status = access(handle, dir, bh,
+                       status = access(handle, INODE_CACHE(dir), bh,
                                        OCFS2_JOURNAL_ACCESS_WRITE);
                        if (status < 0) {
                                status = -EIO;
@@ -1326,7 +1331,7 @@ static int ocfs2_delete_entry_dx(handle_t *handle, struct inode *dir,
         * the entry count needs to be updated. Also, we might be
         * adding to the start of the free list.
         */
-       ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,
+       ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1334,7 +1339,7 @@ static int ocfs2_delete_entry_dx(handle_t *handle, struct inode *dir,
        }
 
        if (!ocfs2_dx_root_inline(dx_root)) {
-               ret = ocfs2_journal_access_dl(handle, dir,
+               ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),
                                              lookup->dl_dx_leaf_bh,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
@@ -1493,7 +1498,7 @@ static int __ocfs2_dx_dir_leaf_insert(struct inode *dir, handle_t *handle,
        int ret;
        struct ocfs2_dx_leaf *dx_leaf;
 
-       ret = ocfs2_journal_access_dl(handle, dir, dx_leaf_bh,
+       ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), dx_leaf_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1523,7 +1528,7 @@ static int ocfs2_dx_dir_insert(struct inode *dir, handle_t *handle,
        struct ocfs2_dx_root_block *dx_root;
        struct buffer_head *dx_root_bh = lookup->dl_dx_root_bh;
 
-       ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,
+       ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1645,11 +1650,13 @@ int __ocfs2_add_entry(handle_t *handle,
                 */
                if (ocfs2_free_list_at_root(lookup)) {
                        bh = lookup->dl_dx_root_bh;
-                       retval = ocfs2_journal_access_dr(handle, dir, bh,
+                       retval = ocfs2_journal_access_dr(handle,
+                                                INODE_CACHE(dir), bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                } else {
                        bh = lookup->dl_prev_leaf_bh;
-                       retval = ocfs2_journal_access_db(handle, dir, bh,
+                       retval = ocfs2_journal_access_db(handle,
+                                                INODE_CACHE(dir), bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                }
                if (retval) {
@@ -1700,11 +1707,13 @@ int __ocfs2_add_entry(handle_t *handle,
                        }
 
                        if (insert_bh == parent_fe_bh)
-                               status = ocfs2_journal_access_di(handle, dir,
+                               status = ocfs2_journal_access_di(handle,
+                                                                INODE_CACHE(dir),
                                                                 insert_bh,
                                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                        else {
-                               status = ocfs2_journal_access_db(handle, dir,
+                               status = ocfs2_journal_access_db(handle,
+                                                                INODE_CACHE(dir),
                                                                 insert_bh,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
 
@@ -2280,7 +2289,7 @@ static int ocfs2_fill_new_dir_id(struct ocfs2_super *osb,
        struct ocfs2_inline_data *data = &di->id2.i_data;
        unsigned int size = le16_to_cpu(data->id_count);
 
-       ret = ocfs2_journal_access_di(handle, inode, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -2332,9 +2341,9 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,
                goto bail;
        }
 
-       ocfs2_set_new_buffer_uptodate(inode, new_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
 
-       status = ocfs2_journal_access_db(handle, inode, new_bh,
+       status = ocfs2_journal_access_db(handle, INODE_CACHE(inode), new_bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -2418,9 +2427,9 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb,
                ret = -EIO;
                goto out;
        }
-       ocfs2_set_new_buffer_uptodate(dir, dx_root_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dx_root_bh);
 
-       ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,
+       ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,
                                      OCFS2_JOURNAL_ACCESS_CREATE);
        if (ret < 0) {
                mlog_errno(ret);
@@ -2454,7 +2463,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb,
        if (ret)
                mlog_errno(ret);
 
-       ret = ocfs2_journal_access_di(handle, dir, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,
                                      OCFS2_JOURNAL_ACCESS_CREATE);
        if (ret) {
                mlog_errno(ret);
@@ -2495,9 +2504,9 @@ static int ocfs2_dx_dir_format_cluster(struct ocfs2_super *osb,
                }
                dx_leaves[i] = bh;
 
-               ocfs2_set_new_buffer_uptodate(dir, bh);
+               ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), bh);
 
-               ret = ocfs2_journal_access_dl(handle, dir, bh,
+               ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), bh,
                                              OCFS2_JOURNAL_ACCESS_CREATE);
                if (ret < 0) {
                        mlog_errno(ret);
@@ -2582,7 +2591,6 @@ static int ocfs2_dx_dir_new_cluster(struct inode *dir,
 {
        int ret;
        u64 phys_blkno;
-       struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
 
        ret = __ocfs2_dx_dir_new_cluster(dir, cpos, handle, data_ac, dx_leaves,
                                         num_dx_leaves, &phys_blkno);
@@ -2591,7 +2599,7 @@ static int ocfs2_dx_dir_new_cluster(struct inode *dir,
                goto out;
        }
 
-       ret = ocfs2_insert_extent(osb, handle, dir, et, cpos, phys_blkno, 1, 0,
+       ret = ocfs2_insert_extent(handle, et, cpos, phys_blkno, 1, 0,
                                  meta_ac);
        if (ret)
                mlog_errno(ret);
@@ -2895,7 +2903,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
        struct ocfs2_extent_tree dx_et;
        int did_quota = 0, bytes_allocated = 0;
 
-       ocfs2_init_dinode_extent_tree(&et, dir, di_bh);
+       ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(dir), di_bh);
 
        alloc = ocfs2_clusters_for_bytes(sb, bytes);
        dx_alloc = 0;
@@ -3005,9 +3013,9 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
                goto out_commit;
        }
 
-       ocfs2_set_new_buffer_uptodate(dir, dirdata_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dirdata_bh);
 
-       ret = ocfs2_journal_access_db(handle, dir, dirdata_bh,
+       ret = ocfs2_journal_access_db(handle, INODE_CACHE(dir), dirdata_bh,
                                      OCFS2_JOURNAL_ACCESS_CREATE);
        if (ret) {
                mlog_errno(ret);
@@ -3060,7 +3068,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
         * We let the later dirent insert modify c/mtime - to the user
         * the data hasn't changed.
         */
-       ret = ocfs2_journal_access_di(handle, dir, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,
                                      OCFS2_JOURNAL_ACCESS_CREATE);
        if (ret) {
                mlog_errno(ret);
@@ -3085,7 +3093,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
         * This should never fail as our extent list is empty and all
         * related blocks have been journaled already.
         */
-       ret = ocfs2_insert_extent(osb, handle, dir, &et, 0, blkno, len,
+       ret = ocfs2_insert_extent(handle, &et, 0, blkno, len,
                                  0, NULL);
        if (ret) {
                mlog_errno(ret);
@@ -3117,8 +3125,10 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
                        ocfs2_dx_dir_index_root_block(dir, dx_root_bh,
                                                      dirdata_bh);
                } else {
-                       ocfs2_init_dx_root_extent_tree(&dx_et, dir, dx_root_bh);
-                       ret = ocfs2_insert_extent(osb, handle, dir, &dx_et, 0,
+                       ocfs2_init_dx_root_extent_tree(&dx_et,
+                                                      INODE_CACHE(dir),
+                                                      dx_root_bh);
+                       ret = ocfs2_insert_extent(handle, &dx_et, 0,
                                                  dx_insert_blkno, 1, 0, NULL);
                        if (ret)
                                mlog_errno(ret);
@@ -3138,7 +3148,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
                }
                blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off);
 
-               ret = ocfs2_insert_extent(osb, handle, dir, &et, 1,
+               ret = ocfs2_insert_extent(handle, &et, 1,
                                          blkno, len, 0, NULL);
                if (ret) {
                        mlog_errno(ret);
@@ -3337,8 +3347,9 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
        spin_lock(&OCFS2_I(dir)->ip_lock);
        if (dir_i_size == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters)) {
                spin_unlock(&OCFS2_I(dir)->ip_lock);
-               ocfs2_init_dinode_extent_tree(&et, dir, parent_fe_bh);
-               num_free_extents = ocfs2_num_free_extents(osb, dir, &et);
+               ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(dir),
+                                             parent_fe_bh);
+               num_free_extents = ocfs2_num_free_extents(osb, &et);
                if (num_free_extents < 0) {
                        status = num_free_extents;
                        mlog_errno(status);
@@ -3387,9 +3398,9 @@ do_extend:
                goto bail;
        }
 
-       ocfs2_set_new_buffer_uptodate(dir, new_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), new_bh);
 
-       status = ocfs2_journal_access_db(handle, dir, new_bh,
+       status = ocfs2_journal_access_db(handle, INODE_CACHE(dir), new_bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -3829,7 +3840,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,
             (unsigned long long)OCFS2_I(dir)->ip_blkno,
             (unsigned long long)leaf_blkno, insert_hash);
 
-       ocfs2_init_dx_root_extent_tree(&et, dir, dx_root_bh);
+       ocfs2_init_dx_root_extent_tree(&et, INODE_CACHE(dir), dx_root_bh);
 
        dx_root = (struct ocfs2_dx_root_block *)dx_root_bh->b_data;
        /*
@@ -3885,7 +3896,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,
        }
        did_quota = 1;
 
-       ret = ocfs2_journal_access_dl(handle, dir, dx_leaf_bh,
+       ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir), dx_leaf_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -3949,7 +3960,8 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,
        }
 
        for (i = 0; i < num_dx_leaves; i++) {
-               ret = ocfs2_journal_access_dl(handle, dir, orig_dx_leaves[i],
+               ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),
+                                             orig_dx_leaves[i],
                                              OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
                        mlog_errno(ret);
@@ -4165,7 +4177,7 @@ static int ocfs2_expand_inline_dx_root(struct inode *dir,
         * failure to add the dx_root_bh to the journal won't result
         * us losing clusters.
         */
-       ret = ocfs2_journal_access_dr(handle, dir, dx_root_bh,
+       ret = ocfs2_journal_access_dr(handle, INODE_CACHE(dir), dx_root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -4207,9 +4219,8 @@ static int ocfs2_expand_inline_dx_root(struct inode *dir,
 
        /* This should never fail considering we start with an empty
         * dx_root. */
-       ocfs2_init_dx_root_extent_tree(&et, dir, dx_root_bh);
-       ret = ocfs2_insert_extent(osb, handle, dir, &et, 0,
-                                 insert_blkno, 1, 0, NULL);
+       ocfs2_init_dx_root_extent_tree(&et, INODE_CACHE(dir), dx_root_bh);
+       ret = ocfs2_insert_extent(handle, &et, 0, insert_blkno, 1, 0, NULL);
        if (ret)
                mlog_errno(ret);
        did_quota = 0;
@@ -4469,7 +4480,7 @@ static int ocfs2_dx_dir_remove_index(struct inode *dir,
                goto out_unlock;
        }
 
-       ret = ocfs2_journal_access_di(handle, dir, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -4532,7 +4543,7 @@ int ocfs2_dx_dir_truncate(struct inode *dir, struct buffer_head *di_bh)
        if (ocfs2_dx_root_inline(dx_root))
                goto remove_index;
 
-       ocfs2_init_dx_root_extent_tree(&et, dir, dx_root_bh);
+       ocfs2_init_dx_root_extent_tree(&et, INODE_CACHE(dir), dx_root_bh);
 
        /* XXX: What if dr_clusters is too large? */
        while (le32_to_cpu(dx_root->dr_clusters)) {
@@ -4565,7 +4576,7 @@ remove_index:
                goto out;
        }
 
-       ocfs2_remove_from_cache(dir, dx_root_bh);
+       ocfs2_remove_from_cache(INODE_CACHE(dir), dx_root_bh);
 out:
        ocfs2_schedule_truncate_log_flush(osb, 1);
        ocfs2_run_deallocs(osb, &dealloc);
index df52f70..c5c8812 100644 (file)
@@ -683,7 +683,7 @@ static int lockres_seq_show(struct seq_file *s, void *v)
        return 0;
 }
 
-static struct seq_operations debug_lockres_ops = {
+static const struct seq_operations debug_lockres_ops = {
        .start =        lockres_seq_start,
        .stop =         lockres_seq_stop,
        .next =         lockres_seq_next,
index d490b66..98569e8 100644 (file)
@@ -212,14 +212,18 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
                spin_lock(&dlm->spinlock);
        }
 
+       spin_lock(&res->spinlock);
        if (!list_empty(&res->purge)) {
                mlog(0, "removing lockres %.*s:%p from purgelist, "
                     "master = %d\n", res->lockname.len, res->lockname.name,
                     res, master);
                list_del_init(&res->purge);
+               spin_unlock(&res->spinlock);
                dlm_lockres_put(res);
                dlm->purge_count--;
-       }
+       } else
+               spin_unlock(&res->spinlock);
+
        __dlm_unhash_lockres(res);
 
        /* lockres is not in the hash now.  drop the flag and wake up
index 110bb57..0d38d67 100644 (file)
@@ -53,6 +53,7 @@
 #include "super.h"
 #include "uptodate.h"
 #include "quota.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
@@ -110,6 +111,11 @@ static void ocfs2_dentry_post_unlock(struct ocfs2_super *osb,
 
 static void ocfs2_set_qinfo_lvb(struct ocfs2_lock_res *lockres);
 
+static int ocfs2_check_refcount_downconvert(struct ocfs2_lock_res *lockres,
+                                           int new_level);
+static int ocfs2_refcount_convert_worker(struct ocfs2_lock_res *lockres,
+                                        int blocking);
+
 #define mlog_meta_lvb(__level, __lockres) ocfs2_dump_meta_lvb_info(__level, __PRETTY_FUNCTION__, __LINE__, __lockres)
 
 /* This aids in debugging situations where a bad LVB might be involved. */
@@ -278,6 +284,12 @@ static struct ocfs2_lock_res_ops ocfs2_qinfo_lops = {
        .flags          = LOCK_TYPE_REQUIRES_REFRESH | LOCK_TYPE_USES_LVB,
 };
 
+static struct ocfs2_lock_res_ops ocfs2_refcount_block_lops = {
+       .check_downconvert = ocfs2_check_refcount_downconvert,
+       .downconvert_worker = ocfs2_refcount_convert_worker,
+       .flags          = 0,
+};
+
 static inline int ocfs2_is_inode_lock(struct ocfs2_lock_res *lockres)
 {
        return lockres->l_type == OCFS2_LOCK_TYPE_META ||
@@ -306,6 +318,12 @@ static inline struct ocfs2_mem_dqinfo *ocfs2_lock_res_qinfo(struct ocfs2_lock_re
        return (struct ocfs2_mem_dqinfo *)lockres->l_priv;
 }
 
+static inline struct ocfs2_refcount_tree *
+ocfs2_lock_res_refcount_tree(struct ocfs2_lock_res *res)
+{
+       return container_of(res, struct ocfs2_refcount_tree, rf_lockres);
+}
+
 static inline struct ocfs2_super *ocfs2_get_lockres_osb(struct ocfs2_lock_res *lockres)
 {
        if (lockres->l_ops->get_osb)
@@ -693,6 +711,17 @@ void ocfs2_qinfo_lock_res_init(struct ocfs2_lock_res *lockres,
                                   info);
 }
 
+void ocfs2_refcount_lock_res_init(struct ocfs2_lock_res *lockres,
+                                 struct ocfs2_super *osb, u64 ref_blkno,
+                                 unsigned int generation)
+{
+       ocfs2_lock_res_init_once(lockres);
+       ocfs2_build_lock_name(OCFS2_LOCK_TYPE_REFCOUNT, ref_blkno,
+                             generation, lockres->l_name);
+       ocfs2_lock_res_init_common(osb, lockres, OCFS2_LOCK_TYPE_REFCOUNT,
+                                  &ocfs2_refcount_block_lops, osb);
+}
+
 void ocfs2_lock_res_free(struct ocfs2_lock_res *res)
 {
        mlog_entry_void();
@@ -1548,8 +1577,10 @@ int ocfs2_rw_lock(struct inode *inode, int write)
             (unsigned long long)OCFS2_I(inode)->ip_blkno,
             write ? "EXMODE" : "PRMODE");
 
-       if (ocfs2_mount_local(osb))
+       if (ocfs2_mount_local(osb)) {
+               mlog_exit(0);
                return 0;
+       }
 
        lockres = &OCFS2_I(inode)->ip_rw_lockres;
 
@@ -2127,7 +2158,7 @@ static int ocfs2_inode_lock_update(struct inode *inode,
 
        /* This will discard any caching information we might have had
         * for the inode metadata. */
-       ocfs2_metadata_cache_purge(inode);
+       ocfs2_metadata_cache_purge(INODE_CACHE(inode));
 
        ocfs2_extent_map_trunc(inode, 0);
 
@@ -3009,6 +3040,7 @@ static void ocfs2_unlock_ast(void *opaque, int error)
                     "unlock_action %d\n", error, lockres->l_name,
                     lockres->l_unlock_action);
                spin_unlock_irqrestore(&lockres->l_lock, flags);
+               mlog_exit_void();
                return;
        }
 
@@ -3495,11 +3527,11 @@ out:
        return UNBLOCK_CONTINUE;
 }
 
-static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
-                                       int new_level)
+static int ocfs2_ci_checkpointed(struct ocfs2_caching_info *ci,
+                                struct ocfs2_lock_res *lockres,
+                                int new_level)
 {
-       struct inode *inode = ocfs2_lock_res_inode(lockres);
-       int checkpointed = ocfs2_inode_fully_checkpointed(inode);
+       int checkpointed = ocfs2_ci_fully_checkpointed(ci);
 
        BUG_ON(new_level != DLM_LOCK_NL && new_level != DLM_LOCK_PR);
        BUG_ON(lockres->l_level != DLM_LOCK_EX && !checkpointed);
@@ -3507,10 +3539,18 @@ static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
        if (checkpointed)
                return 1;
 
-       ocfs2_start_checkpoint(OCFS2_SB(inode->i_sb));
+       ocfs2_start_checkpoint(OCFS2_SB(ocfs2_metadata_cache_get_super(ci)));
        return 0;
 }
 
+static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
+                                       int new_level)
+{
+       struct inode *inode = ocfs2_lock_res_inode(lockres);
+
+       return ocfs2_ci_checkpointed(INODE_CACHE(inode), lockres, new_level);
+}
+
 static void ocfs2_set_meta_lvb(struct ocfs2_lock_res *lockres)
 {
        struct inode *inode = ocfs2_lock_res_inode(lockres);
@@ -3640,6 +3680,26 @@ static int ocfs2_dentry_convert_worker(struct ocfs2_lock_res *lockres,
        return UNBLOCK_CONTINUE_POST;
 }
 
+static int ocfs2_check_refcount_downconvert(struct ocfs2_lock_res *lockres,
+                                           int new_level)
+{
+       struct ocfs2_refcount_tree *tree =
+                               ocfs2_lock_res_refcount_tree(lockres);
+
+       return ocfs2_ci_checkpointed(&tree->rf_ci, lockres, new_level);
+}
+
+static int ocfs2_refcount_convert_worker(struct ocfs2_lock_res *lockres,
+                                        int blocking)
+{
+       struct ocfs2_refcount_tree *tree =
+                               ocfs2_lock_res_refcount_tree(lockres);
+
+       ocfs2_metadata_cache_purge(&tree->rf_ci);
+
+       return UNBLOCK_CONTINUE;
+}
+
 static void ocfs2_set_qinfo_lvb(struct ocfs2_lock_res *lockres)
 {
        struct ocfs2_qinfo_lvb *lvb;
@@ -3752,6 +3812,37 @@ bail:
        return status;
 }
 
+int ocfs2_refcount_lock(struct ocfs2_refcount_tree *ref_tree, int ex)
+{
+       int status;
+       int level = ex ? DLM_LOCK_EX : DLM_LOCK_PR;
+       struct ocfs2_lock_res *lockres = &ref_tree->rf_lockres;
+       struct ocfs2_super *osb = lockres->l_priv;
+
+
+       if (ocfs2_is_hard_readonly(osb))
+               return -EROFS;
+
+       if (ocfs2_mount_local(osb))
+               return 0;
+
+       status = ocfs2_cluster_lock(osb, lockres, level, 0, 0);
+       if (status < 0)
+               mlog_errno(status);
+
+       return status;
+}
+
+void ocfs2_refcount_unlock(struct ocfs2_refcount_tree *ref_tree, int ex)
+{
+       int level = ex ? DLM_LOCK_EX : DLM_LOCK_PR;
+       struct ocfs2_lock_res *lockres = &ref_tree->rf_lockres;
+       struct ocfs2_super *osb = lockres->l_priv;
+
+       if (!ocfs2_mount_local(osb))
+               ocfs2_cluster_unlock(osb, lockres, level);
+}
+
 /*
  * This is the filesystem locking protocol.  It provides the lock handling
  * hooks for the underlying DLM.  It has a maximum version number.
index 7553836..d1ce48e 100644 (file)
@@ -101,6 +101,9 @@ void ocfs2_file_lock_res_init(struct ocfs2_lock_res *lockres,
 struct ocfs2_mem_dqinfo;
 void ocfs2_qinfo_lock_res_init(struct ocfs2_lock_res *lockres,
                                struct ocfs2_mem_dqinfo *info);
+void ocfs2_refcount_lock_res_init(struct ocfs2_lock_res *lockres,
+                                 struct ocfs2_super *osb, u64 ref_blkno,
+                                 unsigned int generation);
 void ocfs2_lock_res_free(struct ocfs2_lock_res *res);
 int ocfs2_create_new_inode_locks(struct inode *inode);
 int ocfs2_drop_inode_locks(struct inode *inode);
@@ -148,6 +151,9 @@ int ocfs2_file_lock(struct file *file, int ex, int trylock);
 void ocfs2_file_unlock(struct file *file);
 int ocfs2_qinfo_lock(struct ocfs2_mem_dqinfo *oinfo, int ex);
 void ocfs2_qinfo_unlock(struct ocfs2_mem_dqinfo *oinfo, int ex);
+struct ocfs2_refcount_tree;
+int ocfs2_refcount_lock(struct ocfs2_refcount_tree *ref_tree, int ex);
+void ocfs2_refcount_unlock(struct ocfs2_refcount_tree *ref_tree, int ex);
 
 
 void ocfs2_mark_lockres_freeing(struct ocfs2_lock_res *lockres);
index f2bb1a0..843db64 100644 (file)
@@ -293,7 +293,7 @@ static int ocfs2_last_eb_is_empty(struct inode *inode,
        struct ocfs2_extent_block *eb;
        struct ocfs2_extent_list *el;
 
-       ret = ocfs2_read_extent_block(inode, last_eb_blk, &eb_bh);
+       ret = ocfs2_read_extent_block(INODE_CACHE(inode), last_eb_blk, &eb_bh);
        if (ret) {
                mlog_errno(ret);
                goto out;
@@ -353,11 +353,11 @@ static int ocfs2_search_for_hole_index(struct ocfs2_extent_list *el,
  * eb_bh is NULL. Otherwise, eb_bh should point to the extent block
  * containing el.
  */
-static int ocfs2_figure_hole_clusters(struct inode *inode,
-                                     struct ocfs2_extent_list *el,
-                                     struct buffer_head *eb_bh,
-                                     u32 v_cluster,
-                                     u32 *num_clusters)
+int ocfs2_figure_hole_clusters(struct ocfs2_caching_info *ci,
+                              struct ocfs2_extent_list *el,
+                              struct buffer_head *eb_bh,
+                              u32 v_cluster,
+                              u32 *num_clusters)
 {
        int ret, i;
        struct buffer_head *next_eb_bh = NULL;
@@ -375,7 +375,7 @@ static int ocfs2_figure_hole_clusters(struct inode *inode,
                if (le64_to_cpu(eb->h_next_leaf_blk) == 0ULL)
                        goto no_more_extents;
 
-               ret = ocfs2_read_extent_block(inode,
+               ret = ocfs2_read_extent_block(ci,
                                              le64_to_cpu(eb->h_next_leaf_blk),
                                              &next_eb_bh);
                if (ret) {
@@ -428,7 +428,8 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,
        tree_height = le16_to_cpu(el->l_tree_depth);
 
        if (tree_height > 0) {
-               ret = ocfs2_find_leaf(inode, el, v_cluster, &eb_bh);
+               ret = ocfs2_find_leaf(INODE_CACHE(inode), el, v_cluster,
+                                     &eb_bh);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -455,7 +456,8 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,
                 * field.
                 */
                if (hole_len) {
-                       ret = ocfs2_figure_hole_clusters(inode, el, eb_bh,
+                       ret = ocfs2_figure_hole_clusters(INODE_CACHE(inode),
+                                                        el, eb_bh,
                                                         v_cluster, &len);
                        if (ret) {
                                mlog_errno(ret);
@@ -539,7 +541,8 @@ static void ocfs2_relative_extent_offsets(struct super_block *sb,
 
 int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
                             u32 *p_cluster, u32 *num_clusters,
-                            struct ocfs2_extent_list *el)
+                            struct ocfs2_extent_list *el,
+                            unsigned int *extent_flags)
 {
        int ret = 0, i;
        struct buffer_head *eb_bh = NULL;
@@ -548,7 +551,8 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
        u32 coff;
 
        if (el->l_tree_depth) {
-               ret = ocfs2_find_leaf(inode, el, v_cluster, &eb_bh);
+               ret = ocfs2_find_leaf(INODE_CACHE(inode), el, v_cluster,
+                                     &eb_bh);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -590,6 +594,9 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
                *p_cluster = *p_cluster + coff;
                if (num_clusters)
                        *num_clusters = ocfs2_rec_clusters(el, rec) - coff;
+
+               if (extent_flags)
+                       *extent_flags = rec->e_flags;
        }
 out:
        if (eb_bh)
@@ -862,8 +869,8 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
                        BUG_ON(bhs[done + i]->b_blocknr != (p_block + i));
                }
 
-               rc = ocfs2_read_blocks(inode, p_block, count, bhs + done,
-                                      flags, validate);
+               rc = ocfs2_read_blocks(INODE_CACHE(inode), p_block, count,
+                                      bhs + done, flags, validate);
                if (rc) {
                        mlog_errno(rc);
                        break;
index b7dd973..e79d41c 100644 (file)
@@ -55,12 +55,18 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 
 int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
                             u32 *p_cluster, u32 *num_clusters,
-                            struct ocfs2_extent_list *el);
+                            struct ocfs2_extent_list *el,
+                            unsigned int *extent_flags);
 
 int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
                           struct buffer_head *bhs[], int flags,
                           int (*validate)(struct super_block *sb,
                                           struct buffer_head *bh));
+int ocfs2_figure_hole_clusters(struct ocfs2_caching_info *ci,
+                              struct ocfs2_extent_list *el,
+                              struct buffer_head *eb_bh,
+                              u32 v_cluster,
+                              u32 *num_clusters);
 static inline int ocfs2_read_virt_block(struct inode *inode, u64 v_block,
                                        struct buffer_head **bh,
                                        int (*validate)(struct super_block *sb,
index 221c5e9..89fc8ee 100644 (file)
@@ -59,6 +59,7 @@
 #include "xattr.h"
 #include "acl.h"
 #include "quota.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
@@ -259,7 +260,7 @@ int ocfs2_update_inode_atime(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -334,6 +335,39 @@ out:
        return ret;
 }
 
+static int ocfs2_cow_file_pos(struct inode *inode,
+                             struct buffer_head *fe_bh,
+                             u64 offset)
+{
+       int status;
+       u32 phys, cpos = offset >> OCFS2_SB(inode->i_sb)->s_clustersize_bits;
+       unsigned int num_clusters = 0;
+       unsigned int ext_flags = 0;
+
+       /*
+        * If the new offset is aligned to the range of the cluster, there is
+        * no space for ocfs2_zero_range_for_truncate to fill, so no need to
+        * CoW either.
+        */
+       if ((offset & (OCFS2_SB(inode->i_sb)->s_clustersize - 1)) == 0)
+               return 0;
+
+       status = ocfs2_get_clusters(inode, cpos, &phys,
+                                   &num_clusters, &ext_flags);
+       if (status) {
+               mlog_errno(status);
+               goto out;
+       }
+
+       if (!(ext_flags & OCFS2_EXT_REFCOUNTED))
+               goto out;
+
+       return ocfs2_refcount_cow(inode, fe_bh, cpos, 1, cpos+1);
+
+out:
+       return status;
+}
+
 static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
                                     struct inode *inode,
                                     struct buffer_head *fe_bh,
@@ -346,6 +380,17 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
 
        mlog_entry_void();
 
+       /*
+        * We need to CoW the cluster contains the offset if it is reflinked
+        * since we will call ocfs2_zero_range_for_truncate later which will
+        * write "0" from offset to the end of the cluster.
+        */
+       status = ocfs2_cow_file_pos(inode, fe_bh, new_i_size);
+       if (status) {
+               mlog_errno(status);
+               return status;
+       }
+
        /* TODO: This needs to actually orphan the inode in this
         * transaction. */
 
@@ -356,7 +401,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
                goto out;
        }
 
-       status = ocfs2_journal_access_di(handle, inode, fe_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), fe_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -486,6 +531,8 @@ bail_unlock_sem:
        up_write(&OCFS2_I(inode)->ip_alloc_sem);
 
 bail:
+       if (!status && OCFS2_I(inode)->ip_clusters == 0)
+               status = ocfs2_try_remove_refcount_tree(inode, di_bh);
 
        mlog_exit(status);
        return status;
@@ -515,11 +562,10 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,
        int ret;
        struct ocfs2_extent_tree et;
 
-       ocfs2_init_dinode_extent_tree(&et, inode, fe_bh);
-       ret = ocfs2_add_clusters_in_btree(osb, inode, logical_offset,
-                                          clusters_to_add, mark_unwritten,
-                                          &et, handle,
-                                          data_ac, meta_ac, reason_ret);
+       ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), fe_bh);
+       ret = ocfs2_add_clusters_in_btree(handle, &et, logical_offset,
+                                         clusters_to_add, mark_unwritten,
+                                         data_ac, meta_ac, reason_ret);
 
        return ret;
 }
@@ -564,7 +610,7 @@ restart_all:
             (unsigned long long)OCFS2_I(inode)->ip_blkno,
             (long long)i_size_read(inode), le32_to_cpu(fe->i_clusters),
             clusters_to_add);
-       ocfs2_init_dinode_extent_tree(&et, inode, bh);
+       ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), bh);
        status = ocfs2_lock_allocators(inode, &et, clusters_to_add, 0,
                                       &data_ac, &meta_ac);
        if (status) {
@@ -593,7 +639,7 @@ restarted_transaction:
        /* reserve a write to the file entry early on - that we if we
         * run out of credits in the allocation path, we can still
         * update i_size. */
-       status = ocfs2_journal_access_di(handle, inode, bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1131,7 +1177,7 @@ static int __ocfs2_write_remove_suid(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
@@ -1395,7 +1441,7 @@ static int ocfs2_remove_inode_range(struct inode *inode,
        struct address_space *mapping = inode->i_mapping;
        struct ocfs2_extent_tree et;
 
-       ocfs2_init_dinode_extent_tree(&et, inode, di_bh);
+       ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);
        ocfs2_init_dealloc_ctxt(&dealloc);
 
        if (byte_len == 0)
@@ -1657,6 +1703,70 @@ static long ocfs2_fallocate(struct inode *inode, int mode, loff_t offset,
                                         OCFS2_IOC_RESVSP64, &sr, change_size);
 }
 
+int ocfs2_check_range_for_refcount(struct inode *inode, loff_t pos,
+                                  size_t count)
+{
+       int ret = 0;
+       unsigned int extent_flags;
+       u32 cpos, clusters, extent_len, phys_cpos;
+       struct super_block *sb = inode->i_sb;
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb)) ||
+           !(OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL))
+               return 0;
+
+       cpos = pos >> OCFS2_SB(sb)->s_clustersize_bits;
+       clusters = ocfs2_clusters_for_bytes(sb, pos + count) - cpos;
+
+       while (clusters) {
+               ret = ocfs2_get_clusters(inode, cpos, &phys_cpos, &extent_len,
+                                        &extent_flags);
+               if (ret < 0) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               if (phys_cpos && (extent_flags & OCFS2_EXT_REFCOUNTED)) {
+                       ret = 1;
+                       break;
+               }
+
+               if (extent_len > clusters)
+                       extent_len = clusters;
+
+               clusters -= extent_len;
+               cpos += extent_len;
+       }
+out:
+       return ret;
+}
+
+static int ocfs2_prepare_inode_for_refcount(struct inode *inode,
+                                           loff_t pos, size_t count,
+                                           int *meta_level)
+{
+       int ret;
+       struct buffer_head *di_bh = NULL;
+       u32 cpos = pos >> OCFS2_SB(inode->i_sb)->s_clustersize_bits;
+       u32 clusters =
+               ocfs2_clusters_for_bytes(inode->i_sb, pos + count) - cpos;
+
+       ret = ocfs2_inode_lock(inode, &di_bh, 1);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       *meta_level = 1;
+
+       ret = ocfs2_refcount_cow(inode, di_bh, cpos, clusters, UINT_MAX);
+       if (ret)
+               mlog_errno(ret);
+out:
+       brelse(di_bh);
+       return ret;
+}
+
 static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
                                         loff_t *ppos,
                                         size_t count,
@@ -1713,6 +1823,22 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
 
                end = saved_pos + count;
 
+               ret = ocfs2_check_range_for_refcount(inode, saved_pos, count);
+               if (ret == 1) {
+                       ocfs2_inode_unlock(inode, meta_level);
+                       meta_level = -1;
+
+                       ret = ocfs2_prepare_inode_for_refcount(inode,
+                                                              saved_pos,
+                                                              count,
+                                                              &meta_level);
+               }
+
+               if (ret < 0) {
+                       mlog_errno(ret);
+                       goto out_unlock;
+               }
+
                /*
                 * Skip the O_DIRECT checks if we don't need
                 * them.
@@ -1759,7 +1885,8 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
                *ppos = saved_pos;
 
 out_unlock:
-       ocfs2_inode_unlock(inode, meta_level);
+       if (meta_level >= 0)
+               ocfs2_inode_unlock(inode, meta_level);
 
 out:
        return ret;
index 172f9fb..d66cf4f 100644 (file)
@@ -69,4 +69,6 @@ int ocfs2_update_inode_atime(struct inode *inode,
 int ocfs2_change_file_space(struct file *file, unsigned int cmd,
                            struct ocfs2_space_resv *sr);
 
+int ocfs2_check_range_for_refcount(struct inode *inode, loff_t pos,
+                                  size_t count);
 #endif /* OCFS2_FILE_H */
index 4dc8890..0297fb8 100644 (file)
@@ -53,6 +53,7 @@
 #include "sysfile.h"
 #include "uptodate.h"
 #include "xattr.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
@@ -562,7 +563,8 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
                        goto out;
                }
 
-               status = ocfs2_journal_access_di(handle, inode, fe_bh,
+               status = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
+                                                fe_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -646,7 +648,7 @@ static int ocfs2_remove_inode(struct inode *inode,
        }
 
        /* set the inodes dtime */
-       status = ocfs2_journal_access_di(handle, inode, di_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -662,7 +664,7 @@ static int ocfs2_remove_inode(struct inode *inode,
                goto bail_commit;
        }
 
-       ocfs2_remove_from_cache(inode, di_bh);
+       ocfs2_remove_from_cache(INODE_CACHE(inode), di_bh);
        vfs_dq_free_inode(inode);
 
        status = ocfs2_free_dinode(handle, inode_alloc_inode,
@@ -781,6 +783,12 @@ static int ocfs2_wipe_inode(struct inode *inode,
                goto bail_unlock_dir;
        }
 
+       status = ocfs2_remove_refcount_tree(inode, di_bh);
+       if (status < 0) {
+               mlog_errno(status);
+               goto bail_unlock_dir;
+       }
+
        status = ocfs2_remove_inode(inode, di_bh, orphan_dir_inode,
                                    orphan_dir_bh);
        if (status < 0)
@@ -1112,13 +1120,14 @@ void ocfs2_clear_inode(struct inode *inode)
        ocfs2_lock_res_free(&oi->ip_inode_lockres);
        ocfs2_lock_res_free(&oi->ip_open_lockres);
 
-       ocfs2_metadata_cache_purge(inode);
+       ocfs2_metadata_cache_exit(INODE_CACHE(inode));
 
-       mlog_bug_on_msg(oi->ip_metadata_cache.ci_num_cached,
+       mlog_bug_on_msg(INODE_CACHE(inode)->ci_num_cached,
                        "Clear inode of %llu, inode has %u cache items\n",
-                       (unsigned long long)oi->ip_blkno, oi->ip_metadata_cache.ci_num_cached);
+                       (unsigned long long)oi->ip_blkno,
+                       INODE_CACHE(inode)->ci_num_cached);
 
-       mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
+       mlog_bug_on_msg(!(INODE_CACHE(inode)->ci_flags & OCFS2_CACHE_FL_INLINE),
                        "Clear inode of %llu, inode has a bad flag\n",
                        (unsigned long long)oi->ip_blkno);
 
@@ -1145,9 +1154,7 @@ void ocfs2_clear_inode(struct inode *inode)
                        (unsigned long long)oi->ip_blkno, oi->ip_open_count);
 
        /* Clear all other flags. */
-       oi->ip_flags = OCFS2_INODE_CACHE_INLINE;
-       oi->ip_created_trans = 0;
-       oi->ip_last_trans = 0;
+       oi->ip_flags = 0;
        oi->ip_dir_start_lookup = 0;
        oi->ip_blkno = 0ULL;
 
@@ -1239,7 +1246,7 @@ int ocfs2_mark_inode_dirty(handle_t *handle,
        mlog_entry("(inode %llu)\n",
                   (unsigned long long)OCFS2_I(inode)->ip_blkno);
 
-       status = ocfs2_journal_access_di(handle, inode, bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1380,8 +1387,8 @@ int ocfs2_read_inode_block_full(struct inode *inode, struct buffer_head **bh,
        int rc;
        struct buffer_head *tmp = *bh;
 
-       rc = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1, &tmp,
-                              flags, ocfs2_validate_inode_block);
+       rc = ocfs2_read_blocks(INODE_CACHE(inode), OCFS2_I(inode)->ip_blkno,
+                              1, &tmp, flags, ocfs2_validate_inode_block);
 
        /* If ocfs2_read_blocks() got us a new bh, pass it up. */
        if (!rc && !*bh)
@@ -1394,3 +1401,56 @@ int ocfs2_read_inode_block(struct inode *inode, struct buffer_head **bh)
 {
        return ocfs2_read_inode_block_full(inode, bh, 0);
 }
+
+
+static u64 ocfs2_inode_cache_owner(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       return oi->ip_blkno;
+}
+
+static struct super_block *ocfs2_inode_cache_get_super(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       return oi->vfs_inode.i_sb;
+}
+
+static void ocfs2_inode_cache_lock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       spin_lock(&oi->ip_lock);
+}
+
+static void ocfs2_inode_cache_unlock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       spin_unlock(&oi->ip_lock);
+}
+
+static void ocfs2_inode_cache_io_lock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       mutex_lock(&oi->ip_io_mutex);
+}
+
+static void ocfs2_inode_cache_io_unlock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+       mutex_unlock(&oi->ip_io_mutex);
+}
+
+const struct ocfs2_caching_operations ocfs2_inode_caching_ops = {
+       .co_owner               = ocfs2_inode_cache_owner,
+       .co_get_super           = ocfs2_inode_cache_get_super,
+       .co_cache_lock          = ocfs2_inode_cache_lock,
+       .co_cache_unlock        = ocfs2_inode_cache_unlock,
+       .co_io_lock             = ocfs2_inode_cache_io_lock,
+       .co_io_unlock           = ocfs2_inode_cache_io_unlock,
+};
+
index ea71525..ba4fe07 100644 (file)
@@ -60,12 +60,6 @@ struct ocfs2_inode_info
 
        u32                             ip_dir_start_lookup;
 
-       /* next two are protected by trans_inc_lock */
-       /* which transaction were we created on? Zero if none. */
-       unsigned long                   ip_created_trans;
-       /* last transaction we were a part of. */
-       unsigned long                   ip_last_trans;
-
        struct ocfs2_caching_info       ip_metadata_cache;
 
        struct ocfs2_extent_map         ip_extent_map;
@@ -106,8 +100,6 @@ struct ocfs2_inode_info
 #define OCFS2_INODE_MAYBE_ORPHANED     0x00000020
 /* Does someone have the file open O_DIRECT */
 #define OCFS2_INODE_OPEN_DIRECT                0x00000040
-/* Indicates that the metadata cache should be used as an array. */
-#define OCFS2_INODE_CACHE_INLINE       0x00000080
 
 static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode)
 {
@@ -120,6 +112,12 @@ static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode)
 extern struct kmem_cache *ocfs2_inode_cache;
 
 extern const struct address_space_operations ocfs2_aops;
+extern const struct ocfs2_caching_operations ocfs2_inode_caching_ops;
+
+static inline struct ocfs2_caching_info *INODE_CACHE(struct inode *inode)
+{
+       return &OCFS2_I(inode)->ip_metadata_cache;
+}
 
 void ocfs2_clear_inode(struct inode *inode);
 void ocfs2_delete_inode(struct inode *inode);
@@ -172,4 +170,10 @@ int ocfs2_read_inode_block(struct inode *inode, struct buffer_head **bh);
 /* The same, but can be passed OCFS2_BH_* flags */
 int ocfs2_read_inode_block_full(struct inode *inode, struct buffer_head **bh,
                                int flags);
+
+static inline struct ocfs2_inode_info *cache_info_to_inode(struct ocfs2_caching_info *ci)
+{
+       return container_of(ci, struct ocfs2_inode_info, ip_metadata_cache);
+}
+
 #endif /* OCFS2_INODE_H */
index 467b413..31fbb06 100644 (file)
@@ -21,6 +21,7 @@
 #include "ocfs2_fs.h"
 #include "ioctl.h"
 #include "resize.h"
+#include "refcounttree.h"
 
 #include <linux/ext2_fs.h>
 
@@ -115,6 +116,9 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        int status;
        struct ocfs2_space_resv sr;
        struct ocfs2_new_group_input input;
+       struct reflink_arguments args;
+       const char *old_path, *new_path;
+       bool preserve;
 
        switch (cmd) {
        case OCFS2_IOC_GETFLAGS:
@@ -160,6 +164,15 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                        return -EFAULT;
 
                return ocfs2_group_add(inode, &input);
+       case OCFS2_IOC_REFLINK:
+               if (copy_from_user(&args, (struct reflink_arguments *)arg,
+                                  sizeof(args)))
+                       return -EFAULT;
+               old_path = (const char *)(unsigned long)args.old_path;
+               new_path = (const char *)(unsigned long)args.new_path;
+               preserve = (args.preserve != 0);
+
+               return ocfs2_reflink_ioctl(inode, old_path, new_path, preserve);
        default:
                return -ENOTTY;
        }
@@ -182,6 +195,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)
        case OCFS2_IOC_GROUP_EXTEND:
        case OCFS2_IOC_GROUP_ADD:
        case OCFS2_IOC_GROUP_ADD64:
+       case OCFS2_IOC_REFLINK:
                break;
        default:
                return -ENOIOCTLCMD;
index c48b93a..54c16b6 100644 (file)
@@ -48,6 +48,7 @@
 #include "slot_map.h"
 #include "super.h"
 #include "sysfile.h"
+#include "uptodate.h"
 #include "quota.h"
 
 #include "buffer_head_io.h"
@@ -554,6 +555,14 @@ static struct ocfs2_triggers eb_triggers = {
        .ot_offset      = offsetof(struct ocfs2_extent_block, h_check),
 };
 
+static struct ocfs2_triggers rb_triggers = {
+       .ot_triggers = {
+               .t_commit = ocfs2_commit_trigger,
+               .t_abort = ocfs2_abort_trigger,
+       },
+       .ot_offset      = offsetof(struct ocfs2_refcount_block, rf_check),
+};
+
 static struct ocfs2_triggers gd_triggers = {
        .ot_triggers = {
                .t_commit = ocfs2_commit_trigger,
@@ -601,14 +610,16 @@ static struct ocfs2_triggers dl_triggers = {
 };
 
 static int __ocfs2_journal_access(handle_t *handle,
-                                 struct inode *inode,
+                                 struct ocfs2_caching_info *ci,
                                  struct buffer_head *bh,
                                  struct ocfs2_triggers *triggers,
                                  int type)
 {
        int status;
+       struct ocfs2_super *osb =
+               OCFS2_SB(ocfs2_metadata_cache_get_super(ci));
 
-       BUG_ON(!inode);
+       BUG_ON(!ci || !ci->ci_ops);
        BUG_ON(!handle);
        BUG_ON(!bh);
 
@@ -627,15 +638,15 @@ static int __ocfs2_journal_access(handle_t *handle,
                BUG();
        }
 
-       /* Set the current transaction information on the inode so
+       /* Set the current transaction information on the ci so
         * that the locking code knows whether it can drop it's locks
-        * on this inode or not. We're protected from the commit
+        * on this ci or not. We're protected from the commit
         * thread updating the current transaction id until
         * ocfs2_commit_trans() because ocfs2_start_trans() took
         * j_trans_barrier for us. */
-       ocfs2_set_inode_lock_trans(OCFS2_SB(inode->i_sb)->journal, inode);
+       ocfs2_set_ci_lock_trans(osb->journal, ci);
 
-       mutex_lock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_lock(ci);
        switch (type) {
        case OCFS2_JOURNAL_ACCESS_CREATE:
        case OCFS2_JOURNAL_ACCESS_WRITE:
@@ -650,9 +661,9 @@ static int __ocfs2_journal_access(handle_t *handle,
                status = -EINVAL;
                mlog(ML_ERROR, "Uknown access type!\n");
        }
-       if (!status && ocfs2_meta_ecc(OCFS2_SB(inode->i_sb)) && triggers)
+       if (!status && ocfs2_meta_ecc(osb) && triggers)
                jbd2_journal_set_triggers(bh, &triggers->ot_triggers);
-       mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
+       ocfs2_metadata_cache_io_unlock(ci);
 
        if (status < 0)
                mlog(ML_ERROR, "Error %d getting %d access to buffer!\n",
@@ -662,66 +673,65 @@ static int __ocfs2_journal_access(handle_t *handle,
        return status;
 }
 
-int ocfs2_journal_access_di(handle_t *handle, struct inode *inode,
-                              struct buffer_head *bh, int type)
+int ocfs2_journal_access_di(handle_t *handle, struct ocfs2_caching_info *ci,
+                           struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &di_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &di_triggers, type);
 }
 
-int ocfs2_journal_access_eb(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_eb(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &eb_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &eb_triggers, type);
 }
 
-int ocfs2_journal_access_gd(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_rb(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &gd_triggers,
+       return __ocfs2_journal_access(handle, ci, bh, &rb_triggers,
                                      type);
 }
 
-int ocfs2_journal_access_db(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_gd(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &db_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &gd_triggers, type);
 }
 
-int ocfs2_journal_access_xb(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_db(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &xb_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &db_triggers, type);
 }
 
-int ocfs2_journal_access_dq(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_xb(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &dq_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &xb_triggers, type);
 }
 
-int ocfs2_journal_access_dr(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_dq(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &dr_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &dq_triggers, type);
 }
 
-int ocfs2_journal_access_dl(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_dr(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, &dl_triggers,
-                                     type);
+       return __ocfs2_journal_access(handle, ci, bh, &dr_triggers, type);
+}
+
+int ocfs2_journal_access_dl(handle_t *handle, struct ocfs2_caching_info *ci,
+                           struct buffer_head *bh, int type)
+{
+       return __ocfs2_journal_access(handle, ci, bh, &dl_triggers, type);
 }
 
-int ocfs2_journal_access(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci,
                         struct buffer_head *bh, int type)
 {
-       return __ocfs2_journal_access(handle, inode, bh, NULL, type);
+       return __ocfs2_journal_access(handle, ci, bh, NULL, type);
 }
 
 int ocfs2_journal_dirty(handle_t *handle,
@@ -898,7 +908,7 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
                ocfs2_bump_recovery_generation(fe);
 
        ocfs2_compute_meta_ecc(osb->sb, bh->b_data, &fe->i_check);
-       status = ocfs2_write_block(osb, bh, journal->j_inode);
+       status = ocfs2_write_block(osb, bh, INODE_CACHE(journal->j_inode));
        if (status < 0)
                mlog_errno(status);
 
@@ -1642,7 +1652,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
                                        ocfs2_get_recovery_generation(fe);
 
        ocfs2_compute_meta_ecc(osb->sb, bh->b_data, &fe->i_check);
-       status = ocfs2_write_block(osb, bh, inode);
+       status = ocfs2_write_block(osb, bh, INODE_CACHE(inode));
        if (status < 0)
                mlog_errno(status);
 
index 2c3222a..3f74e09 100644 (file)
@@ -90,56 +90,66 @@ static inline unsigned long ocfs2_inc_trans_id(struct ocfs2_journal *j)
        return old_id;
 }
 
-static inline void ocfs2_set_inode_lock_trans(struct ocfs2_journal *journal,
-                                             struct inode *inode)
+static inline void ocfs2_set_ci_lock_trans(struct ocfs2_journal *journal,
+                                          struct ocfs2_caching_info *ci)
 {
        spin_lock(&trans_inc_lock);
-       OCFS2_I(inode)->ip_last_trans = journal->j_trans_id;
+       ci->ci_last_trans = journal->j_trans_id;
        spin_unlock(&trans_inc_lock);
 }
 
 /* Used to figure out whether it's safe to drop a metadata lock on an
- * inode. Returns true if all the inodes changes have been
+ * cached object. Returns true if all the object's changes have been
  * checkpointed to disk. You should be holding the spinlock on the
  * metadata lock while calling this to be sure that nobody can take
  * the lock and put it on another transaction. */
-static inline int ocfs2_inode_fully_checkpointed(struct inode *inode)
+static inline int ocfs2_ci_fully_checkpointed(struct ocfs2_caching_info *ci)
 {
        int ret;
-       struct ocfs2_journal *journal = OCFS2_SB(inode->i_sb)->journal;
+       struct ocfs2_journal *journal =
+               OCFS2_SB(ocfs2_metadata_cache_get_super(ci))->journal;
 
        spin_lock(&trans_inc_lock);
-       ret = time_after(journal->j_trans_id, OCFS2_I(inode)->ip_last_trans);
+       ret = time_after(journal->j_trans_id, ci->ci_last_trans);
        spin_unlock(&trans_inc_lock);
        return ret;
 }
 
-/* convenience function to check if an inode is still new (has never
- * hit disk) Will do you a favor and set created_trans = 0 when you've
- * been checkpointed.  returns '1' if the inode is still new. */
-static inline int ocfs2_inode_is_new(struct inode *inode)
+/* convenience function to check if an object backed by struct
+ * ocfs2_caching_info  is still new (has never hit disk) Will do you a
+ * favor and set created_trans = 0 when you've
+ * been checkpointed.  returns '1' if the ci is still new. */
+static inline int ocfs2_ci_is_new(struct ocfs2_caching_info *ci)
 {
        int ret;
+       struct ocfs2_journal *journal =
+               OCFS2_SB(ocfs2_metadata_cache_get_super(ci))->journal;
 
+       spin_lock(&trans_inc_lock);
+       ret = !(time_after(journal->j_trans_id, ci->ci_created_trans));
+       if (!ret)
+               ci->ci_created_trans = 0;
+       spin_unlock(&trans_inc_lock);
+       return ret;
+}
+
+/* Wrapper for inodes so we can check system files */
+static inline int ocfs2_inode_is_new(struct inode *inode)
+{
        /* System files are never "new" as they're written out by
         * mkfs. This helps us early during mount, before we have the
         * journal open and j_trans_id could be junk. */
        if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
                return 0;
-       spin_lock(&trans_inc_lock);
-       ret = !(time_after(OCFS2_SB(inode->i_sb)->journal->j_trans_id,
-                          OCFS2_I(inode)->ip_created_trans));
-       if (!ret)
-               OCFS2_I(inode)->ip_created_trans = 0;
-       spin_unlock(&trans_inc_lock);
-       return ret;
+
+       return ocfs2_ci_is_new(INODE_CACHE(inode));
 }
 
-static inline void ocfs2_inode_set_new(struct ocfs2_super *osb,
-                                      struct inode *inode)
+static inline void ocfs2_ci_set_new(struct ocfs2_super *osb,
+                                   struct ocfs2_caching_info *ci)
 {
        spin_lock(&trans_inc_lock);
-       OCFS2_I(inode)->ip_created_trans = osb->journal->j_trans_id;
+       ci->ci_created_trans = osb->journal->j_trans_id;
        spin_unlock(&trans_inc_lock);
 }
 
@@ -200,7 +210,7 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
        if (ocfs2_mount_local(osb))
                return;
 
-       if (!ocfs2_inode_fully_checkpointed(inode)) {
+       if (!ocfs2_ci_fully_checkpointed(INODE_CACHE(inode))) {
                /* WARNING: This only kicks off a single
                 * checkpoint. If someone races you and adds more
                 * metadata to the journal, you won't know, and will
@@ -210,7 +220,7 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
                ocfs2_start_checkpoint(osb);
 
                wait_event(osb->journal->j_checkpointed,
-                          ocfs2_inode_fully_checkpointed(inode));
+                          ocfs2_ci_fully_checkpointed(INODE_CACHE(inode)));
        }
 }
 
@@ -266,31 +276,34 @@ int                            ocfs2_extend_trans(handle_t *handle, int nblocks);
 
 
 /* ocfs2_inode */
-int ocfs2_journal_access_di(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_di(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* ocfs2_extent_block */
-int ocfs2_journal_access_eb(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_eb(handle_t *handle, struct ocfs2_caching_info *ci,
+                           struct buffer_head *bh, int type);
+/* ocfs2_refcount_block */
+int ocfs2_journal_access_rb(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* ocfs2_group_desc */
-int ocfs2_journal_access_gd(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_gd(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* ocfs2_xattr_block */
-int ocfs2_journal_access_xb(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_xb(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* quota blocks */
-int ocfs2_journal_access_dq(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_dq(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* dirblock */
-int ocfs2_journal_access_db(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_db(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* ocfs2_dx_root_block */
-int ocfs2_journal_access_dr(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_dr(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* ocfs2_dx_leaf */
-int ocfs2_journal_access_dl(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access_dl(handle_t *handle, struct ocfs2_caching_info *ci,
                            struct buffer_head *bh, int type);
 /* Anything that has no ecc */
-int ocfs2_journal_access(handle_t *handle, struct inode *inode,
+int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci,
                         struct buffer_head *bh, int type);
 
 /*
@@ -477,6 +490,23 @@ static inline int ocfs2_calc_dxi_expand_credits(struct super_block *sb)
        return credits;
 }
 
+/* inode update, new refcount block and its allocation credits. */
+#define OCFS2_REFCOUNT_TREE_CREATE_CREDITS (OCFS2_INODE_UPDATE_CREDITS + 1 \
+                                           + OCFS2_SUBALLOC_ALLOC)
+
+/* inode and the refcount block update. */
+#define OCFS2_REFCOUNT_TREE_SET_CREDITS (OCFS2_INODE_UPDATE_CREDITS + 1)
+
+/*
+ * inode and the refcount block update.
+ * It doesn't include the credits for sub alloc change.
+ * So if we need to free the bit, OCFS2_SUBALLOC_FREE needs to be added.
+ */
+#define OCFS2_REFCOUNT_TREE_REMOVE_CREDITS (OCFS2_INODE_UPDATE_CREDITS + 1)
+
+/* 2 metadata alloc, 2 new blocks and root refcount block */
+#define OCFS2_EXPAND_REFCOUNT_TREE_CREDITS (OCFS2_SUBALLOC_ALLOC * 2 + 3)
+
 /*
  * Please note that the caller must make sure that root_el is the root
  * of extent tree. So for an inode, it should be &fe->id2.i_list. Otherwise
index bac7e6a..ac10f83 100644 (file)
@@ -297,8 +297,8 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
        }
        memcpy(alloc_copy, alloc, bh->b_size);
 
-       status = ocfs2_journal_access_di(handle, local_alloc_inode, bh,
-                                        OCFS2_JOURNAL_ACCESS_WRITE);
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(local_alloc_inode),
+                                        bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto out_commit;
@@ -392,7 +392,7 @@ int ocfs2_begin_local_alloc_recovery(struct ocfs2_super *osb,
        ocfs2_clear_local_alloc(alloc);
 
        ocfs2_compute_meta_ecc(osb->sb, alloc_bh->b_data, &alloc->i_check);
-       status = ocfs2_write_block(osb, alloc_bh, inode);
+       status = ocfs2_write_block(osb, alloc_bh, INODE_CACHE(inode));
        if (status < 0)
                mlog_errno(status);
 
@@ -678,7 +678,8 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
         * delete bits from it! */
        *num_bits = bits_wanted;
 
-       status = ocfs2_journal_access_di(handle, local_alloc_inode,
+       status = ocfs2_journal_access_di(handle,
+                                        INODE_CACHE(local_alloc_inode),
                                         osb->local_alloc_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
@@ -1156,7 +1157,8 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
        }
        memcpy(alloc_copy, alloc, osb->local_alloc_bh->b_size);
 
-       status = ocfs2_journal_access_di(handle, local_alloc_inode,
+       status = ocfs2_journal_access_di(handle,
+                                        INODE_CACHE(local_alloc_inode),
                                         osb->local_alloc_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
index 8601f93..f010b22 100644 (file)
@@ -69,7 +69,6 @@
 static int ocfs2_mknod_locked(struct ocfs2_super *osb,
                              struct inode *dir,
                              struct inode *inode,
-                             struct dentry *dentry,
                              dev_t dev,
                              struct buffer_head **new_fe_bh,
                              struct buffer_head *parent_fe_bh,
@@ -78,7 +77,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
 
 static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
                                    struct inode **ret_orphan_dir,
-                                   struct inode *inode,
+                                   u64 blkno,
                                    char *name,
                                    struct ocfs2_dir_lookup_result *lookup);
 
@@ -358,8 +357,12 @@ static int ocfs2_mknod(struct inode *dir,
        }
        did_quota_inode = 1;
 
+       mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry,
+                  inode->i_mode, (unsigned long)dev, dentry->d_name.len,
+                  dentry->d_name.name);
+
        /* do the real work now. */
-       status = ocfs2_mknod_locked(osb, dir, inode, dentry, dev,
+       status = ocfs2_mknod_locked(osb, dir, inode, dev,
                                    &new_fe_bh, parent_fe_bh, handle,
                                    inode_ac);
        if (status < 0) {
@@ -375,7 +378,8 @@ static int ocfs2_mknod(struct inode *dir,
                        goto leave;
                }
 
-               status = ocfs2_journal_access_di(handle, dir, parent_fe_bh,
+               status = ocfs2_journal_access_di(handle, INODE_CACHE(dir),
+                                                parent_fe_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -465,7 +469,6 @@ leave:
 static int ocfs2_mknod_locked(struct ocfs2_super *osb,
                              struct inode *dir,
                              struct inode *inode,
-                             struct dentry *dentry,
                              dev_t dev,
                              struct buffer_head **new_fe_bh,
                              struct buffer_head *parent_fe_bh,
@@ -479,10 +482,6 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
        u16 suballoc_bit;
        u16 feat;
 
-       mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry,
-                  inode->i_mode, (unsigned long)dev, dentry->d_name.len,
-                  dentry->d_name.name);
-
        *new_fe_bh = NULL;
 
        status = ocfs2_claim_new_inode(osb, handle, dir, parent_fe_bh,
@@ -507,9 +506,10 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
                mlog_errno(status);
                goto leave;
        }
-       ocfs2_set_new_buffer_uptodate(inode, *new_fe_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), *new_fe_bh);
 
-       status = ocfs2_journal_access_di(handle, inode, *new_fe_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
+                                        *new_fe_bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -565,7 +565,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
        }
 
        ocfs2_populate_inode(inode, fe, 1);
-       ocfs2_inode_set_new(osb, inode);
+       ocfs2_ci_set_new(osb, INODE_CACHE(inode));
        if (!ocfs2_mount_local(osb)) {
                status = ocfs2_create_new_inode_locks(inode);
                if (status < 0)
@@ -682,7 +682,7 @@ static int ocfs2_link(struct dentry *old_dentry,
                goto out_unlock_inode;
        }
 
-       err = ocfs2_journal_access_di(handle, inode, fe_bh,
+       err = ocfs2_journal_access_di(handle, INODE_CACHE(inode), fe_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (err < 0) {
                mlog_errno(err);
@@ -850,7 +850,8 @@ static int ocfs2_unlink(struct inode *dir,
        }
 
        if (inode_is_unlinkable(inode)) {
-               status = ocfs2_prepare_orphan_dir(osb, &orphan_dir, inode,
+               status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,
+                                                 OCFS2_I(inode)->ip_blkno,
                                                  orphan_name, &orphan_insert);
                if (status < 0) {
                        mlog_errno(status);
@@ -866,7 +867,7 @@ static int ocfs2_unlink(struct inode *dir,
                goto leave;
        }
 
-       status = ocfs2_journal_access_di(handle, inode, fe_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), fe_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1241,9 +1242,8 @@ static int ocfs2_rename(struct inode *old_dir,
 
                if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) {
                        status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,
-                                                         new_inode,
-                                                         orphan_name,
-                                                         &orphan_insert);
+                                               OCFS2_I(new_inode)->ip_blkno,
+                                               orphan_name, &orphan_insert);
                        if (status < 0) {
                                mlog_errno(status);
                                goto bail;
@@ -1284,7 +1284,8 @@ static int ocfs2_rename(struct inode *old_dir,
                                goto bail;
                        }
                }
-               status = ocfs2_journal_access_di(handle, new_inode, newfe_bh,
+               status = ocfs2_journal_access_di(handle, INODE_CACHE(new_inode),
+                                                newfe_bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -1331,7 +1332,8 @@ static int ocfs2_rename(struct inode *old_dir,
        old_inode->i_ctime = CURRENT_TIME;
        mark_inode_dirty(old_inode);
 
-       status = ocfs2_journal_access_di(handle, old_inode, old_inode_bh,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(old_inode),
+                                        old_inode_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status >= 0) {
                old_di = (struct ocfs2_dinode *) old_inode_bh->b_data;
@@ -1407,9 +1409,10 @@ static int ocfs2_rename(struct inode *old_dir,
                             (int)old_dir_nlink, old_dir->i_nlink);
                } else {
                        struct ocfs2_dinode *fe;
-                       status = ocfs2_journal_access_di(handle, old_dir,
-                                                     old_dir_bh,
-                                                     OCFS2_JOURNAL_ACCESS_WRITE);
+                       status = ocfs2_journal_access_di(handle,
+                                                        INODE_CACHE(old_dir),
+                                                        old_dir_bh,
+                                                        OCFS2_JOURNAL_ACCESS_WRITE);
                        fe = (struct ocfs2_dinode *) old_dir_bh->b_data;
                        ocfs2_set_links_count(fe, old_dir->i_nlink);
                        status = ocfs2_journal_dirty(handle, old_dir_bh);
@@ -1527,9 +1530,11 @@ static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
                        mlog_errno(status);
                        goto bail;
                }
-               ocfs2_set_new_buffer_uptodate(inode, bhs[virtual]);
+               ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode),
+                                             bhs[virtual]);
 
-               status = ocfs2_journal_access(handle, inode, bhs[virtual],
+               status = ocfs2_journal_access(handle, INODE_CACHE(inode),
+                                             bhs[virtual],
                                              OCFS2_JOURNAL_ACCESS_CREATE);
                if (status < 0) {
                        mlog_errno(status);
@@ -1692,7 +1697,11 @@ static int ocfs2_symlink(struct inode *dir,
        }
        did_quota_inode = 1;
 
-       status = ocfs2_mknod_locked(osb, dir, inode, dentry,
+       mlog_entry("(0x%p, 0x%p, %d, '%.*s')\n", dir, dentry,
+                  inode->i_mode, dentry->d_name.len,
+                  dentry->d_name.name);
+
+       status = ocfs2_mknod_locked(osb, dir, inode,
                                    0, &new_fe_bh, parent_fe_bh, handle,
                                    inode_ac);
        if (status < 0) {
@@ -1842,7 +1851,7 @@ bail:
 
 static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
                                    struct inode **ret_orphan_dir,
-                                   struct inode *inode,
+                                   u64 blkno,
                                    char *name,
                                    struct ocfs2_dir_lookup_result *lookup)
 {
@@ -1850,7 +1859,7 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
        struct buffer_head *orphan_dir_bh = NULL;
        int status = 0;
 
-       status = ocfs2_blkno_stringify(OCFS2_I(inode)->ip_blkno, name);
+       status = ocfs2_blkno_stringify(blkno, name);
        if (status < 0) {
                mlog_errno(status);
                return status;
@@ -1917,7 +1926,9 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
                goto leave;
        }
 
-       status = ocfs2_journal_access_di(handle, orphan_dir_inode, orphan_dir_bh,
+       status = ocfs2_journal_access_di(handle,
+                                        INODE_CACHE(orphan_dir_inode),
+                                        orphan_dir_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -2002,7 +2013,9 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,
                goto leave;
        }
 
-       status = ocfs2_journal_access_di(handle,orphan_dir_inode,  orphan_dir_bh,
+       status = ocfs2_journal_access_di(handle,
+                                        INODE_CACHE(orphan_dir_inode),
+                                        orphan_dir_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -2028,6 +2041,274 @@ leave:
        return status;
 }
 
+int ocfs2_create_inode_in_orphan(struct inode *dir,
+                                int mode,
+                                struct inode **new_inode)
+{
+       int status, did_quota_inode = 0;
+       struct inode *inode = NULL;
+       struct inode *orphan_dir = NULL;
+       struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
+       struct ocfs2_dinode *di = NULL;
+       handle_t *handle = NULL;
+       char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
+       struct buffer_head *parent_di_bh = NULL;
+       struct buffer_head *new_di_bh = NULL;
+       struct ocfs2_alloc_context *inode_ac = NULL;
+       struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
+
+       status = ocfs2_inode_lock(dir, &parent_di_bh, 1);
+       if (status < 0) {
+               if (status != -ENOENT)
+                       mlog_errno(status);
+               return status;
+       }
+
+       /*
+        * We give the orphan dir the root blkno to fake an orphan name,
+        * and allocate enough space for our insertion.
+        */
+       status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,
+                                         osb->root_blkno,
+                                         orphan_name, &orphan_insert);
+       if (status < 0) {
+               mlog_errno(status);
+               goto leave;
+       }
+
+       /* reserve an inode spot */
+       status = ocfs2_reserve_new_inode(osb, &inode_ac);
+       if (status < 0) {
+               if (status != -ENOSPC)
+                       mlog_errno(status);
+               goto leave;
+       }
+
+       inode = ocfs2_get_init_inode(dir, mode);
+       if (!inode) {
+               status = -ENOMEM;
+               mlog_errno(status);
+               goto leave;
+       }
+
+       handle = ocfs2_start_trans(osb, ocfs2_mknod_credits(osb->sb, 0, 0));
+       if (IS_ERR(handle)) {
+               status = PTR_ERR(handle);
+               handle = NULL;
+               mlog_errno(status);
+               goto leave;
+       }
+
+       /* We don't use standard VFS wrapper because we don't want vfs_dq_init
+        * to be called. */
+       if (sb_any_quota_active(osb->sb) &&
+           osb->sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA) {
+               status = -EDQUOT;
+               goto leave;
+       }
+       did_quota_inode = 1;
+
+       /* do the real work now. */
+       status = ocfs2_mknod_locked(osb, dir, inode,
+                                   0, &new_di_bh, parent_di_bh, handle,
+                                   inode_ac);
+       if (status < 0) {
+               mlog_errno(status);
+               goto leave;
+       }
+
+       status = ocfs2_blkno_stringify(OCFS2_I(inode)->ip_blkno, orphan_name);
+       if (status < 0) {
+               mlog_errno(status);
+               goto leave;
+       }
+
+       di = (struct ocfs2_dinode *)new_di_bh->b_data;
+       status = ocfs2_orphan_add(osb, handle, inode, di, orphan_name,
+                                 &orphan_insert, orphan_dir);
+       if (status < 0) {
+               mlog_errno(status);
+               goto leave;
+       }
+
+       /* get open lock so that only nodes can't remove it from orphan dir. */
+       status = ocfs2_open_lock(inode);
+       if (status < 0)
+               mlog_errno(status);
+
+leave:
+       if (status < 0 && did_quota_inode)
+               vfs_dq_free_inode(inode);
+       if (handle)
+               ocfs2_commit_trans(osb, handle);
+
+       if (orphan_dir) {
+               /* This was locked for us in ocfs2_prepare_orphan_dir() */
+               ocfs2_inode_unlock(orphan_dir, 1);
+               mutex_unlock(&orphan_dir->i_mutex);
+               iput(orphan_dir);
+       }
+
+       if (status == -ENOSPC)
+               mlog(0, "Disk is full\n");
+
+       if ((status < 0) && inode) {
+               clear_nlink(inode);
+               iput(inode);
+       }
+
+       if (inode_ac)
+               ocfs2_free_alloc_context(inode_ac);
+
+       brelse(new_di_bh);
+
+       if (!status)
+               *new_inode = inode;
+
+       ocfs2_free_dir_lookup_result(&orphan_insert);
+
+       ocfs2_inode_unlock(dir, 1);
+       brelse(parent_di_bh);
+       return status;
+}
+
+int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
+                                  struct inode *inode,
+                                  struct dentry *dentry)
+{
+       int status = 0;
+       struct buffer_head *parent_di_bh = NULL;
+       handle_t *handle = NULL;
+       struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
+       struct ocfs2_dinode *dir_di, *di;
+       struct inode *orphan_dir_inode = NULL;
+       struct buffer_head *orphan_dir_bh = NULL;
+       struct buffer_head *di_bh = NULL;
+       struct ocfs2_dir_lookup_result lookup = { NULL, };
+
+       mlog_entry("(0x%p, 0x%p, %.*s')\n", dir, dentry,
+                  dentry->d_name.len, dentry->d_name.name);
+
+       status = ocfs2_inode_lock(dir, &parent_di_bh, 1);
+       if (status < 0) {
+               if (status != -ENOENT)
+                       mlog_errno(status);
+               return status;
+       }
+
+       dir_di = (struct ocfs2_dinode *) parent_di_bh->b_data;
+       if (!dir_di->i_links_count) {
+               /* can't make a file in a deleted directory. */
+               status = -ENOENT;
+               goto leave;
+       }
+
+       status = ocfs2_check_dir_for_entry(dir, dentry->d_name.name,
+                                          dentry->d_name.len);
+       if (status)
+               goto leave;
+
+       /* get a spot inside the dir. */
+       status = ocfs2_prepare_dir_for_insert(osb, dir, parent_di_bh,
+                                             dentry->d_name.name,
+                                             dentry->d_name.len, &lookup);
+       if (status < 0) {
+               mlog_errno(status);
+               goto leave;
+       }
+
+       orphan_dir_inode = ocfs2_get_system_file_inode(osb,
+                                                      ORPHAN_DIR_SYSTEM_INODE,
+                                                      osb->slot_num);
+       if (!orphan_dir_inode) {
+               status = -EEXIST;
+               mlog_errno(status);
+               goto leave;
+       }
+
+       mutex_lock(&orphan_dir_inode->i_mutex);
+
+       status = ocfs2_inode_lock(orphan_dir_inode, &orphan_dir_bh, 1);
+       if (status < 0) {
+               mlog_errno(status);
+               mutex_unlock(&orphan_dir_inode->i_mutex);
+               iput(orphan_dir_inode);
+               goto leave;
+       }
+
+       status = ocfs2_read_inode_block(inode, &di_bh);
+       if (status < 0) {
+               mlog_errno(status);
+               goto orphan_unlock;
+       }
+
+       handle = ocfs2_start_trans(osb, ocfs2_rename_credits(osb->sb));
+       if (IS_ERR(handle)) {
+               status = PTR_ERR(handle);
+               handle = NULL;
+               mlog_errno(status);
+               goto orphan_unlock;
+       }
+
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
+                                        di_bh, OCFS2_JOURNAL_ACCESS_WRITE);
+       if (status < 0) {
+               mlog_errno(status);
+               goto out_commit;
+       }
+
+       status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode,
+                                 orphan_dir_bh);
+       if (status < 0) {
+               mlog_errno(status);
+               goto out_commit;
+       }
+
+       di = (struct ocfs2_dinode *)di_bh->b_data;
+       le32_add_cpu(&di->i_flags, -OCFS2_ORPHANED_FL);
+       di->i_orphaned_slot = 0;
+       ocfs2_journal_dirty(handle, di_bh);
+
+       status = ocfs2_add_entry(handle, dentry, inode,
+                                OCFS2_I(inode)->ip_blkno, parent_di_bh,
+                                &lookup);
+       if (status < 0) {
+               mlog_errno(status);
+               goto out_commit;
+       }
+
+       status = ocfs2_dentry_attach_lock(dentry, inode,
+                                         OCFS2_I(dir)->ip_blkno);
+       if (status) {
+               mlog_errno(status);
+               goto out_commit;
+       }
+
+       insert_inode_hash(inode);
+       dentry->d_op = &ocfs2_dentry_ops;
+       d_instantiate(dentry, inode);
+       status = 0;
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+orphan_unlock:
+       ocfs2_inode_unlock(orphan_dir_inode, 1);
+       mutex_unlock(&orphan_dir_inode->i_mutex);
+       iput(orphan_dir_inode);
+leave:
+
+       ocfs2_inode_unlock(dir, 1);
+
+       brelse(di_bh);
+       brelse(parent_di_bh);
+       brelse(orphan_dir_bh);
+
+       ocfs2_free_dir_lookup_result(&lookup);
+
+       mlog_exit(status);
+
+       return status;
+}
+
 const struct inode_operations ocfs2_dir_iops = {
        .create         = ocfs2_create,
        .lookup         = ocfs2_lookup,
index 688aef6..e5d059d 100644 (file)
@@ -35,5 +35,11 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,
                     struct inode *orphan_dir_inode,
                     struct inode *inode,
                     struct buffer_head *orphan_dir_bh);
+int ocfs2_create_inode_in_orphan(struct inode *dir,
+                                int mode,
+                                struct inode **new_inode);
+int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
+                                  struct inode *new_inode,
+                                  struct dentry *new_dentry);
 
 #endif /* OCFS2_NAMEI_H */
index 39e1d5a..eae4046 100644 (file)
 /* For struct ocfs2_blockcheck_stats */
 #include "blockcheck.h"
 
+
+/* Caching of metadata buffers */
+
 /* Most user visible OCFS2 inodes will have very few pieces of
  * metadata, but larger files (including bitmaps, etc) must be taken
  * into account when designing an access scheme. We allow a small
  * amount of inlined blocks to be stored on an array and grow the
  * structure into a rb tree when necessary. */
-#define OCFS2_INODE_MAX_CACHE_ARRAY 2
+#define OCFS2_CACHE_INFO_MAX_ARRAY 2
+
+/* Flags for ocfs2_caching_info */
+
+enum ocfs2_caching_info_flags {
+       /* Indicates that the metadata cache is using the inline array */
+       OCFS2_CACHE_FL_INLINE   = 1<<1,
+};
 
+struct ocfs2_caching_operations;
 struct ocfs2_caching_info {
+       /*
+        * The parent structure provides the locks, but because the
+        * parent structure can differ, it provides locking operations
+        * to struct ocfs2_caching_info.
+        */
+       const struct ocfs2_caching_operations *ci_ops;
+
+       /* next two are protected by trans_inc_lock */
+       /* which transaction were we created on? Zero if none. */
+       unsigned long           ci_created_trans;
+       /* last transaction we were a part of. */
+       unsigned long           ci_last_trans;
+
+       /* Cache structures */
+       unsigned int            ci_flags;
        unsigned int            ci_num_cached;
        union {
-               sector_t        ci_array[OCFS2_INODE_MAX_CACHE_ARRAY];
+       sector_t        ci_array[OCFS2_CACHE_INFO_MAX_ARRAY];
                struct rb_root  ci_tree;
        } ci_cache;
 };
+/*
+ * Need this prototype here instead of in uptodate.h because journal.h
+ * uses it.
+ */
+struct super_block *ocfs2_metadata_cache_get_super(struct ocfs2_caching_info *ci);
 
 /* this limits us to 256 nodes
  * if we need more, we can do a kmalloc for the map */
@@ -377,12 +408,17 @@ struct ocfs2_super
 
        /* the group we used to allocate inodes. */
        u64                             osb_inode_alloc_group;
+
+       /* rb tree root for refcount lock. */
+       struct rb_root  osb_rf_lock_tree;
+       struct ocfs2_refcount_tree *osb_ref_tree_lru;
 };
 
 #define OCFS2_SB(sb)       ((struct ocfs2_super *)(sb)->s_fs_info)
 
 /* Useful typedef for passing around journal access functions */
-typedef int (*ocfs2_journal_access_func)(handle_t *handle, struct inode *inode,
+typedef int (*ocfs2_journal_access_func)(handle_t *handle,
+                                        struct ocfs2_caching_info *ci,
                                         struct buffer_head *bh, int type);
 
 static inline int ocfs2_should_order_data(struct inode *inode)
@@ -480,6 +516,13 @@ static inline void ocfs2_add_links_count(struct ocfs2_dinode *di, int n)
        ocfs2_set_links_count(di, links);
 }
 
+static inline int ocfs2_refcount_tree(struct ocfs2_super *osb)
+{
+       if (osb->s_feature_incompat & OCFS2_FEATURE_INCOMPAT_REFCOUNT_TREE)
+               return 1;
+       return 0;
+}
+
 /* set / clear functions because cluster events can make these happen
  * in parallel so we want the transitions to be atomic. this also
  * means that any future flags osb_flags must be protected by spinlock
@@ -578,6 +621,9 @@ static inline int ocfs2_uses_extended_slot_map(struct ocfs2_super *osb)
 #define OCFS2_IS_VALID_DX_LEAF(ptr)                                    \
        (!strcmp((ptr)->dl_signature, OCFS2_DX_LEAF_SIGNATURE))
 
+#define OCFS2_IS_VALID_REFCOUNT_BLOCK(ptr)                             \
+       (!strcmp((ptr)->rf_signature, OCFS2_REFCOUNT_BLOCK_SIGNATURE))
+
 static inline unsigned long ino_from_blkno(struct super_block *sb,
                                           u64 blkno)
 {
index 7ab6e9e..e9431e4 100644 (file)
@@ -68,6 +68,7 @@
 #define OCFS2_DIR_TRAILER_SIGNATURE    "DIRTRL1"
 #define OCFS2_DX_ROOT_SIGNATURE                "DXDIR01"
 #define OCFS2_DX_LEAF_SIGNATURE                "DXLEAF1"
+#define OCFS2_REFCOUNT_BLOCK_SIGNATURE "REFCNT1"
 
 /* Compatibility flags */
 #define OCFS2_HAS_COMPAT_FEATURE(sb,mask)                      \
@@ -98,7 +99,8 @@
                                         | OCFS2_FEATURE_INCOMPAT_USERSPACE_STACK \
                                         | OCFS2_FEATURE_INCOMPAT_XATTR \
                                         | OCFS2_FEATURE_INCOMPAT_META_ECC \
-                                        | OCFS2_FEATURE_INCOMPAT_INDEXED_DIRS)
+                                        | OCFS2_FEATURE_INCOMPAT_INDEXED_DIRS \
+                                        | OCFS2_FEATURE_INCOMPAT_REFCOUNT_TREE)
 #define OCFS2_FEATURE_RO_COMPAT_SUPP   (OCFS2_FEATURE_RO_COMPAT_UNWRITTEN \
                                         | OCFS2_FEATURE_RO_COMPAT_USRQUOTA \
                                         | OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)
 /* Metadata checksum and error correction */
 #define OCFS2_FEATURE_INCOMPAT_META_ECC                0x0800
 
+/* Refcount tree support */
+#define OCFS2_FEATURE_INCOMPAT_REFCOUNT_TREE   0x1000
+
 /*
  * backup superblock flag is used to indicate that this volume
  * has backup superblocks.
 #define OCFS2_HAS_XATTR_FL     (0x0002)
 #define OCFS2_INLINE_XATTR_FL  (0x0004)
 #define OCFS2_INDEXED_DIR_FL   (0x0008)
+#define OCFS2_HAS_REFCOUNT_FL   (0x0010)
 
 /* Inode attributes, keep in sync with EXT2 */
 #define OCFS2_SECRM_FL         (0x00000001)    /* Secure deletion */
 /*
  * Extent record flags (e_node.leaf.flags)
  */
-#define OCFS2_EXT_UNWRITTEN    (0x01)  /* Extent is allocated but
-                                        * unwritten */
+#define OCFS2_EXT_UNWRITTEN            (0x01)  /* Extent is allocated but
+                                                * unwritten */
+#define OCFS2_EXT_REFCOUNTED           (0x02)  /* Extent is reference
+                                                * counted in an associated
+                                                * refcount tree */
 
 /*
  * ioctl commands
@@ -292,6 +301,15 @@ struct ocfs2_new_group_input {
 #define OCFS2_IOC_GROUP_ADD    _IOW('o', 2,struct ocfs2_new_group_input)
 #define OCFS2_IOC_GROUP_ADD64  _IOW('o', 3,struct ocfs2_new_group_input)
 
+/* Used to pass 2 file names to reflink. */
+struct reflink_arguments {
+       __u64 old_path;
+       __u64 new_path;
+       __u64 preserve;
+};
+#define OCFS2_IOC_REFLINK      _IOW('o', 4, struct reflink_arguments)
+
+
 /*
  * Journal Flags (ocfs2_dinode.id1.journal1.i_flags)
  */
@@ -717,7 +735,8 @@ struct ocfs2_dinode {
        __le64 i_xattr_loc;
 /*80*/ struct ocfs2_block_check i_check;       /* Error checking */
 /*88*/ __le64 i_dx_root;               /* Pointer to dir index root block */
-       __le64 i_reserved2[5];
+/*90*/ __le64 i_refcount_loc;
+       __le64 i_reserved2[4];
 /*B8*/ union {
                __le64 i_pad1;          /* Generic way to refer to this
                                           64bit union */
@@ -901,6 +920,60 @@ struct ocfs2_group_desc
 /*40*/ __u8    bg_bitmap[0];
 };
 
+struct ocfs2_refcount_rec {
+/*00*/ __le64 r_cpos;          /* Physical offset, in clusters */
+       __le32 r_clusters;      /* Clusters covered by this extent */
+       __le32 r_refcount;      /* Reference count of this extent */
+/*10*/
+};
+#define OCFS2_32BIT_POS_MASK           (0xffffffffULL)
+
+#define OCFS2_REFCOUNT_LEAF_FL          (0x00000001)
+#define OCFS2_REFCOUNT_TREE_FL          (0x00000002)
+
+struct ocfs2_refcount_list {
+/*00*/ __le16 rl_count;        /* Maximum number of entries possible
+                                  in rl_records */
+       __le16 rl_used;         /* Current number of used records */
+       __le32 rl_reserved2;
+       __le64 rl_reserved1;    /* Pad to sizeof(ocfs2_refcount_record) */
+/*10*/ struct ocfs2_refcount_rec rl_recs[0];   /* Refcount records */
+};
+
+
+struct ocfs2_refcount_block {
+/*00*/ __u8 rf_signature[8];           /* Signature for verification */
+       __le16 rf_suballoc_slot;        /* Slot suballocator this block
+                                          belongs to */
+       __le16 rf_suballoc_bit;         /* Bit offset in suballocator
+                                          block group */
+       __le32 rf_fs_generation;        /* Must match superblock */
+/*10*/ __le64 rf_blkno;                /* Offset on disk, in blocks */
+       __le64 rf_parent;               /* Parent block, only valid if
+                                          OCFS2_REFCOUNT_LEAF_FL is set in
+                                          rf_flags */
+/*20*/ struct ocfs2_block_check rf_check;      /* Error checking */
+       __le64 rf_last_eb_blk;          /* Pointer to last extent block */
+/*30*/ __le32 rf_count;                /* Number of inodes sharing this
+                                          refcount tree */
+       __le32 rf_flags;                /* See the flags above */
+       __le32 rf_clusters;             /* clusters covered by refcount tree. */
+       __le32 rf_cpos;                 /* cluster offset in refcount tree.*/
+/*40*/ __le32 rf_generation;           /* generation number. all be the same
+                                        * for the same refcount tree. */
+       __le32 rf_reserved0;
+       __le64 rf_reserved1[7];
+/*80*/ union {
+               struct ocfs2_refcount_list rf_records;  /* List of refcount
+                                                         records */
+               struct ocfs2_extent_list rf_list;       /* Extent record list,
+                                                       only valid if
+                                                       OCFS2_REFCOUNT_TREE_FL
+                                                       is set in rf_flags */
+       };
+/* Actual on-disk size is one block */
+};
+
 /*
  * On disk extended attribute structure for OCFS2.
  */
@@ -1312,6 +1385,32 @@ static inline u16 ocfs2_xattr_recs_per_xb(struct super_block *sb)
 
        return size / sizeof(struct ocfs2_extent_rec);
 }
+
+static inline u16 ocfs2_extent_recs_per_rb(struct super_block *sb)
+{
+       int size;
+
+       size = sb->s_blocksize -
+               offsetof(struct ocfs2_refcount_block, rf_list.l_recs);
+
+       return size / sizeof(struct ocfs2_extent_rec);
+}
+
+static inline u16 ocfs2_refcount_recs_per_rb(struct super_block *sb)
+{
+       int size;
+
+       size = sb->s_blocksize -
+               offsetof(struct ocfs2_refcount_block, rf_records.rl_recs);
+
+       return size / sizeof(struct ocfs2_refcount_rec);
+}
+
+static inline u32
+ocfs2_get_ref_rec_low_cpos(const struct ocfs2_refcount_rec *rec)
+{
+       return le64_to_cpu(rec->r_cpos) & OCFS2_32BIT_POS_MASK;
+}
 #else
 static inline int ocfs2_fast_symlink_chars(int blocksize)
 {
index c212cf5..d277aab 100644 (file)
@@ -49,6 +49,7 @@ enum ocfs2_lock_type {
        OCFS2_LOCK_TYPE_QINFO,
        OCFS2_LOCK_TYPE_NFS_SYNC,
        OCFS2_LOCK_TYPE_ORPHAN_SCAN,
+       OCFS2_LOCK_TYPE_REFCOUNT,
        OCFS2_NUM_LOCK_TYPES
 };
 
@@ -89,6 +90,9 @@ static inline char ocfs2_lock_type_char(enum ocfs2_lock_type type)
                case OCFS2_LOCK_TYPE_ORPHAN_SCAN:
                        c = 'P';
                        break;
+               case OCFS2_LOCK_TYPE_REFCOUNT:
+                       c = 'T';
+                       break;
                default:
                        c = '\0';
        }
@@ -110,6 +114,7 @@ static char *ocfs2_lock_type_strings[] = {
        [OCFS2_LOCK_TYPE_QINFO] = "Quota",
        [OCFS2_LOCK_TYPE_NFS_SYNC] = "NFSSync",
        [OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan",
+       [OCFS2_LOCK_TYPE_REFCOUNT] = "Refcount",
 };
 
 static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type)
index 3fb96fc..e5df9d1 100644 (file)
@@ -109,7 +109,7 @@ void ocfs2_unlock_global_qf(struct ocfs2_mem_dqinfo *oinfo, int ex);
 int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
                           struct buffer_head **bh);
 
-extern struct dquot_operations ocfs2_quota_operations;
+extern const struct dquot_operations ocfs2_quota_operations;
 extern struct quota_format_type ocfs2_quota_format;
 
 int ocfs2_quota_setup(void);
index 44f2a5e..b437dc0 100644 (file)
@@ -154,7 +154,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block,
                err = -EIO;
                mlog_errno(err);
        }
-       return err;;
+       return err;
 }
 
 /* Read data from global quotafile - avoid pagecache and such because we cannot
@@ -253,8 +253,9 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
        flush_dcache_page(bh->b_page);
        set_buffer_uptodate(bh);
        unlock_buffer(bh);
-       ocfs2_set_buffer_uptodate(gqinode, bh);
-       err = ocfs2_journal_access_dq(handle, gqinode, bh, ja_type);
+       ocfs2_set_buffer_uptodate(INODE_CACHE(gqinode), bh);
+       err = ocfs2_journal_access_dq(handle, INODE_CACHE(gqinode), bh,
+                                     ja_type);
        if (err < 0) {
                brelse(bh);
                goto out;
@@ -849,7 +850,7 @@ static void ocfs2_destroy_dquot(struct dquot *dquot)
        kmem_cache_free(ocfs2_dquot_cachep, dquot);
 }
 
-struct dquot_operations ocfs2_quota_operations = {
+const struct dquot_operations ocfs2_quota_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,
index bdb09cb..1a2c50a 100644 (file)
@@ -108,7 +108,7 @@ static int ocfs2_modify_bh(struct inode *inode, struct buffer_head *bh,
                mlog_errno(status);
                return status;
        }
-       status = ocfs2_journal_access_dq(handle, inode, bh,
+       status = ocfs2_journal_access_dq(handle, INODE_CACHE(inode), bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -510,7 +510,8 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,
                                goto out_commit;
                        }
                        /* Release local quota file entry */
-                       status = ocfs2_journal_access_dq(handle, lqinode,
+                       status = ocfs2_journal_access_dq(handle,
+                                       INODE_CACHE(lqinode),
                                        qbh, OCFS2_JOURNAL_ACCESS_WRITE);
                        if (status < 0) {
                                mlog_errno(status);
@@ -619,7 +620,8 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,
                        mlog_errno(status);
                        goto out_bh;
                }
-               status = ocfs2_journal_access_dq(handle, lqinode, bh,
+               status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode),
+                                                bh,
                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                if (status < 0) {
                        mlog_errno(status);
@@ -993,8 +995,8 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
                goto out_trans;
        }
        dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data;
-       ocfs2_set_new_buffer_uptodate(lqinode, bh);
-       status = ocfs2_journal_access_dq(handle, lqinode, bh,
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), bh);
+       status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -1027,8 +1029,8 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
                mlog_errno(status);
                goto out_trans;
        }
-       ocfs2_set_new_buffer_uptodate(lqinode, dbh);
-       status = ocfs2_journal_access_dq(handle, lqinode, dbh,
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), dbh);
+       status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), dbh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -1131,7 +1133,7 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file(
                mlog_errno(status);
                goto out;
        }
-       ocfs2_set_new_buffer_uptodate(lqinode, bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), bh);
 
        /* Local quota info, chunk header and the new block we initialize */
        handle = ocfs2_start_trans(OCFS2_SB(sb),
@@ -1143,7 +1145,7 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file(
                goto out;
        }
        /* Zero created block */
-       status = ocfs2_journal_access_dq(handle, lqinode, bh,
+       status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh,
                                 OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
                mlog_errno(status);
@@ -1158,7 +1160,8 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file(
                goto out_trans;
        }
        /* Update chunk header */
-       status = ocfs2_journal_access_dq(handle, lqinode, chunk->qc_headerbh,
+       status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode),
+                                        chunk->qc_headerbh,
                                 OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1292,7 +1295,8 @@ static int ocfs2_local_release_dquot(struct dquot *dquot)
                goto out;
        }
 
-       status = ocfs2_journal_access_dq(handle, sb_dqopt(sb)->files[type],
+       status = ocfs2_journal_access_dq(handle,
+                       INODE_CACHE(sb_dqopt(sb)->files[type]),
                        od->dq_chunk->qc_headerbh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
new file mode 100644 (file)
index 0000000..60287fc
--- /dev/null
@@ -0,0 +1,4313 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * refcounttree.c
+ *
+ * Copyright (C) 2009 Oracle.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/sort.h>
+#define MLOG_MASK_PREFIX ML_REFCOUNT
+#include <cluster/masklog.h>
+#include "ocfs2.h"
+#include "inode.h"
+#include "alloc.h"
+#include "suballoc.h"
+#include "journal.h"
+#include "uptodate.h"
+#include "super.h"
+#include "buffer_head_io.h"
+#include "blockcheck.h"
+#include "refcounttree.h"
+#include "sysfile.h"
+#include "dlmglue.h"
+#include "extent_map.h"
+#include "aops.h"
+#include "xattr.h"
+#include "namei.h"
+
+#include <linux/bio.h>
+#include <linux/blkdev.h>
+#include <linux/gfp.h>
+#include <linux/slab.h>
+#include <linux/writeback.h>
+#include <linux/pagevec.h>
+#include <linux/swap.h>
+#include <linux/security.h>
+#include <linux/fsnotify.h>
+#include <linux/quotaops.h>
+#include <linux/namei.h>
+#include <linux/mount.h>
+
+struct ocfs2_cow_context {
+       struct inode *inode;
+       u32 cow_start;
+       u32 cow_len;
+       struct ocfs2_extent_tree data_et;
+       struct ocfs2_refcount_tree *ref_tree;
+       struct buffer_head *ref_root_bh;
+       struct ocfs2_alloc_context *meta_ac;
+       struct ocfs2_alloc_context *data_ac;
+       struct ocfs2_cached_dealloc_ctxt dealloc;
+       void *cow_object;
+       struct ocfs2_post_refcount *post_refcount;
+       int extra_credits;
+       int (*get_clusters)(struct ocfs2_cow_context *context,
+                           u32 v_cluster, u32 *p_cluster,
+                           u32 *num_clusters,
+                           unsigned int *extent_flags);
+       int (*cow_duplicate_clusters)(handle_t *handle,
+                                     struct ocfs2_cow_context *context,
+                                     u32 cpos, u32 old_cluster,
+                                     u32 new_cluster, u32 new_len);
+};
+
+static inline struct ocfs2_refcount_tree *
+cache_info_to_refcount(struct ocfs2_caching_info *ci)
+{
+       return container_of(ci, struct ocfs2_refcount_tree, rf_ci);
+}
+
+static int ocfs2_validate_refcount_block(struct super_block *sb,
+                                        struct buffer_head *bh)
+{
+       int rc;
+       struct ocfs2_refcount_block *rb =
+               (struct ocfs2_refcount_block *)bh->b_data;
+
+       mlog(0, "Validating refcount block %llu\n",
+            (unsigned long long)bh->b_blocknr);
+
+       BUG_ON(!buffer_uptodate(bh));
+
+       /*
+        * If the ecc fails, we return the error but otherwise
+        * leave the filesystem running.  We know any error is
+        * local to this block.
+        */
+       rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &rb->rf_check);
+       if (rc) {
+               mlog(ML_ERROR, "Checksum failed for refcount block %llu\n",
+                    (unsigned long long)bh->b_blocknr);
+               return rc;
+       }
+
+
+       if (!OCFS2_IS_VALID_REFCOUNT_BLOCK(rb)) {
+               ocfs2_error(sb,
+                           "Refcount block #%llu has bad signature %.*s",
+                           (unsigned long long)bh->b_blocknr, 7,
+                           rb->rf_signature);
+               return -EINVAL;
+       }
+
+       if (le64_to_cpu(rb->rf_blkno) != bh->b_blocknr) {
+               ocfs2_error(sb,
+                           "Refcount block #%llu has an invalid rf_blkno "
+                           "of %llu",
+                           (unsigned long long)bh->b_blocknr,
+                           (unsigned long long)le64_to_cpu(rb->rf_blkno));
+               return -EINVAL;
+       }
+
+       if (le32_to_cpu(rb->rf_fs_generation) != OCFS2_SB(sb)->fs_generation) {
+               ocfs2_error(sb,
+                           "Refcount block #%llu has an invalid "
+                           "rf_fs_generation of #%u",
+                           (unsigned long long)bh->b_blocknr,
+                           le32_to_cpu(rb->rf_fs_generation));
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int ocfs2_read_refcount_block(struct ocfs2_caching_info *ci,
+                                    u64 rb_blkno,
+                                    struct buffer_head **bh)
+{
+       int rc;
+       struct buffer_head *tmp = *bh;
+
+       rc = ocfs2_read_block(ci, rb_blkno, &tmp,
+                             ocfs2_validate_refcount_block);
+
+       /* If ocfs2_read_block() got us a new bh, pass it up. */
+       if (!rc && !*bh)
+               *bh = tmp;
+
+       return rc;
+}
+
+static u64 ocfs2_refcount_cache_owner(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       return rf->rf_blkno;
+}
+
+static struct super_block *
+ocfs2_refcount_cache_get_super(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       return rf->rf_sb;
+}
+
+static void ocfs2_refcount_cache_lock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       spin_lock(&rf->rf_lock);
+}
+
+static void ocfs2_refcount_cache_unlock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       spin_unlock(&rf->rf_lock);
+}
+
+static void ocfs2_refcount_cache_io_lock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       mutex_lock(&rf->rf_io_mutex);
+}
+
+static void ocfs2_refcount_cache_io_unlock(struct ocfs2_caching_info *ci)
+{
+       struct ocfs2_refcount_tree *rf = cache_info_to_refcount(ci);
+
+       mutex_unlock(&rf->rf_io_mutex);
+}
+
+static const struct ocfs2_caching_operations ocfs2_refcount_caching_ops = {
+       .co_owner               = ocfs2_refcount_cache_owner,
+       .co_get_super           = ocfs2_refcount_cache_get_super,
+       .co_cache_lock          = ocfs2_refcount_cache_lock,
+       .co_cache_unlock        = ocfs2_refcount_cache_unlock,
+       .co_io_lock             = ocfs2_refcount_cache_io_lock,
+       .co_io_unlock           = ocfs2_refcount_cache_io_unlock,
+};
+
+static struct ocfs2_refcount_tree *
+ocfs2_find_refcount_tree(struct ocfs2_super *osb, u64 blkno)
+{
+       struct rb_node *n = osb->osb_rf_lock_tree.rb_node;
+       struct ocfs2_refcount_tree *tree = NULL;
+
+       while (n) {
+               tree = rb_entry(n, struct ocfs2_refcount_tree, rf_node);
+
+               if (blkno < tree->rf_blkno)
+                       n = n->rb_left;
+               else if (blkno > tree->rf_blkno)
+                       n = n->rb_right;
+               else
+                       return tree;
+       }
+
+       return NULL;
+}
+
+/* osb_lock is already locked. */
+static void ocfs2_insert_refcount_tree(struct ocfs2_super *osb,
+                                      struct ocfs2_refcount_tree *new)
+{
+       u64 rf_blkno = new->rf_blkno;
+       struct rb_node *parent = NULL;
+       struct rb_node **p = &osb->osb_rf_lock_tree.rb_node;
+       struct ocfs2_refcount_tree *tmp;
+
+       while (*p) {
+               parent = *p;
+
+               tmp = rb_entry(parent, struct ocfs2_refcount_tree,
+                              rf_node);
+
+               if (rf_blkno < tmp->rf_blkno)
+                       p = &(*p)->rb_left;
+               else if (rf_blkno > tmp->rf_blkno)
+                       p = &(*p)->rb_right;
+               else {
+                       /* This should never happen! */
+                       mlog(ML_ERROR, "Duplicate refcount block %llu found!\n",
+                            (unsigned long long)rf_blkno);
+                       BUG();
+               }
+       }
+
+       rb_link_node(&new->rf_node, parent, p);
+       rb_insert_color(&new->rf_node, &osb->osb_rf_lock_tree);
+}
+
+static void ocfs2_free_refcount_tree(struct ocfs2_refcount_tree *tree)
+{
+       ocfs2_metadata_cache_exit(&tree->rf_ci);
+       ocfs2_simple_drop_lockres(OCFS2_SB(tree->rf_sb), &tree->rf_lockres);
+       ocfs2_lock_res_free(&tree->rf_lockres);
+       kfree(tree);
+}
+
+static inline void
+ocfs2_erase_refcount_tree_from_list_no_lock(struct ocfs2_super *osb,
+                                       struct ocfs2_refcount_tree *tree)
+{
+       rb_erase(&tree->rf_node, &osb->osb_rf_lock_tree);
+       if (osb->osb_ref_tree_lru && osb->osb_ref_tree_lru == tree)
+               osb->osb_ref_tree_lru = NULL;
+}
+
+static void ocfs2_erase_refcount_tree_from_list(struct ocfs2_super *osb,
+                                       struct ocfs2_refcount_tree *tree)
+{
+       spin_lock(&osb->osb_lock);
+       ocfs2_erase_refcount_tree_from_list_no_lock(osb, tree);
+       spin_unlock(&osb->osb_lock);
+}
+
+void ocfs2_kref_remove_refcount_tree(struct kref *kref)
+{
+       struct ocfs2_refcount_tree *tree =
+               container_of(kref, struct ocfs2_refcount_tree, rf_getcnt);
+
+       ocfs2_free_refcount_tree(tree);
+}
+
+static inline void
+ocfs2_refcount_tree_get(struct ocfs2_refcount_tree *tree)
+{
+       kref_get(&tree->rf_getcnt);
+}
+
+static inline void
+ocfs2_refcount_tree_put(struct ocfs2_refcount_tree *tree)
+{
+       kref_put(&tree->rf_getcnt, ocfs2_kref_remove_refcount_tree);
+}
+
+static inline void ocfs2_init_refcount_tree_ci(struct ocfs2_refcount_tree *new,
+                                              struct super_block *sb)
+{
+       ocfs2_metadata_cache_init(&new->rf_ci, &ocfs2_refcount_caching_ops);
+       mutex_init(&new->rf_io_mutex);
+       new->rf_sb = sb;
+       spin_lock_init(&new->rf_lock);
+}
+
+static inline void ocfs2_init_refcount_tree_lock(struct ocfs2_super *osb,
+                                       struct ocfs2_refcount_tree *new,
+                                       u64 rf_blkno, u32 generation)
+{
+       init_rwsem(&new->rf_sem);
+       ocfs2_refcount_lock_res_init(&new->rf_lockres, osb,
+                                    rf_blkno, generation);
+}
+
+static struct ocfs2_refcount_tree*
+ocfs2_allocate_refcount_tree(struct ocfs2_super *osb, u64 rf_blkno)
+{
+       struct ocfs2_refcount_tree *new;
+
+       new = kzalloc(sizeof(struct ocfs2_refcount_tree), GFP_NOFS);
+       if (!new)
+               return NULL;
+
+       new->rf_blkno = rf_blkno;
+       kref_init(&new->rf_getcnt);
+       ocfs2_init_refcount_tree_ci(new, osb->sb);
+
+       return new;
+}
+
+static int ocfs2_get_refcount_tree(struct ocfs2_super *osb, u64 rf_blkno,
+                                  struct ocfs2_refcount_tree **ret_tree)
+{
+       int ret = 0;
+       struct ocfs2_refcount_tree *tree, *new = NULL;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_block *ref_rb;
+
+       spin_lock(&osb->osb_lock);
+       if (osb->osb_ref_tree_lru &&
+           osb->osb_ref_tree_lru->rf_blkno == rf_blkno)
+               tree = osb->osb_ref_tree_lru;
+       else
+               tree = ocfs2_find_refcount_tree(osb, rf_blkno);
+       if (tree)
+               goto out;
+
+       spin_unlock(&osb->osb_lock);
+
+       new = ocfs2_allocate_refcount_tree(osb, rf_blkno);
+       if (!new) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               return ret;
+       }
+       /*
+        * We need the generation to create the refcount tree lock and since
+        * it isn't changed during the tree modification, we are safe here to
+        * read without protection.
+        * We also have to purge the cache after we create the lock since the
+        * refcount block may have the stale data. It can only be trusted when
+        * we hold the refcount lock.
+        */
+       ret = ocfs2_read_refcount_block(&new->rf_ci, rf_blkno, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               ocfs2_metadata_cache_exit(&new->rf_ci);
+               kfree(new);
+               return ret;
+       }
+
+       ref_rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       new->rf_generation = le32_to_cpu(ref_rb->rf_generation);
+       ocfs2_init_refcount_tree_lock(osb, new, rf_blkno,
+                                     new->rf_generation);
+       ocfs2_metadata_cache_purge(&new->rf_ci);
+
+       spin_lock(&osb->osb_lock);
+       tree = ocfs2_find_refcount_tree(osb, rf_blkno);
+       if (tree)
+               goto out;
+
+       ocfs2_insert_refcount_tree(osb, new);
+
+       tree = new;
+       new = NULL;
+
+out:
+       *ret_tree = tree;
+
+       osb->osb_ref_tree_lru = tree;
+
+       spin_unlock(&osb->osb_lock);
+
+       if (new)
+               ocfs2_free_refcount_tree(new);
+
+       brelse(ref_root_bh);
+       return ret;
+}
+
+static int ocfs2_get_refcount_block(struct inode *inode, u64 *ref_blkno)
+{
+       int ret;
+       struct buffer_head *di_bh = NULL;
+       struct ocfs2_dinode *di;
+
+       ret = ocfs2_read_inode_block(inode, &di_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL));
+
+       di = (struct ocfs2_dinode *)di_bh->b_data;
+       *ref_blkno = le64_to_cpu(di->i_refcount_loc);
+       brelse(di_bh);
+out:
+       return ret;
+}
+
+static int __ocfs2_lock_refcount_tree(struct ocfs2_super *osb,
+                                     struct ocfs2_refcount_tree *tree, int rw)
+{
+       int ret;
+
+       ret = ocfs2_refcount_lock(tree, rw);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (rw)
+               down_write(&tree->rf_sem);
+       else
+               down_read(&tree->rf_sem);
+
+out:
+       return ret;
+}
+
+/*
+ * Lock the refcount tree pointed by ref_blkno and return the tree.
+ * In most case, we lock the tree and read the refcount block.
+ * So read it here if the caller really needs it.
+ *
+ * If the tree has been re-created by other node, it will free the
+ * old one and re-create it.
+ */
+int ocfs2_lock_refcount_tree(struct ocfs2_super *osb,
+                            u64 ref_blkno, int rw,
+                            struct ocfs2_refcount_tree **ret_tree,
+                            struct buffer_head **ref_bh)
+{
+       int ret, delete_tree = 0;
+       struct ocfs2_refcount_tree *tree = NULL;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_block *rb;
+
+again:
+       ret = ocfs2_get_refcount_tree(osb, ref_blkno, &tree);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       ocfs2_refcount_tree_get(tree);
+
+       ret = __ocfs2_lock_refcount_tree(osb, tree, rw);
+       if (ret) {
+               mlog_errno(ret);
+               ocfs2_refcount_tree_put(tree);
+               goto out;
+       }
+
+       ret = ocfs2_read_refcount_block(&tree->rf_ci, tree->rf_blkno,
+                                       &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               ocfs2_unlock_refcount_tree(osb, tree, rw);
+               ocfs2_refcount_tree_put(tree);
+               goto out;
+       }
+
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       /*
+        * If the refcount block has been freed and re-created, we may need
+        * to recreate the refcount tree also.
+        *
+        * Here we just remove the tree from the rb-tree, and the last
+        * kref holder will unlock and delete this refcount_tree.
+        * Then we goto "again" and ocfs2_get_refcount_tree will create
+        * the new refcount tree for us.
+        */
+       if (tree->rf_generation != le32_to_cpu(rb->rf_generation)) {
+               if (!tree->rf_removed) {
+                       ocfs2_erase_refcount_tree_from_list(osb, tree);
+                       tree->rf_removed = 1;
+                       delete_tree = 1;
+               }
+
+               ocfs2_unlock_refcount_tree(osb, tree, rw);
+               /*
+                * We get an extra reference when we create the refcount
+                * tree, so another put will destroy it.
+                */
+               if (delete_tree)
+                       ocfs2_refcount_tree_put(tree);
+               brelse(ref_root_bh);
+               ref_root_bh = NULL;
+               goto again;
+       }
+
+       *ret_tree = tree;
+       if (ref_bh) {
+               *ref_bh = ref_root_bh;
+               ref_root_bh = NULL;
+       }
+out:
+       brelse(ref_root_bh);
+       return ret;
+}
+
+int ocfs2_lock_refcount_tree_by_inode(struct inode *inode, int rw,
+                                     struct ocfs2_refcount_tree **ret_tree,
+                                     struct buffer_head **ref_bh)
+{
+       int ret;
+       u64 ref_blkno;
+
+       ret = ocfs2_get_refcount_block(inode, &ref_blkno);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       return ocfs2_lock_refcount_tree(OCFS2_SB(inode->i_sb), ref_blkno,
+                                       rw, ret_tree, ref_bh);
+}
+
+void ocfs2_unlock_refcount_tree(struct ocfs2_super *osb,
+                               struct ocfs2_refcount_tree *tree, int rw)
+{
+       if (rw)
+               up_write(&tree->rf_sem);
+       else
+               up_read(&tree->rf_sem);
+
+       ocfs2_refcount_unlock(tree, rw);
+       ocfs2_refcount_tree_put(tree);
+}
+
+void ocfs2_purge_refcount_trees(struct ocfs2_super *osb)
+{
+       struct rb_node *node;
+       struct ocfs2_refcount_tree *tree;
+       struct rb_root *root = &osb->osb_rf_lock_tree;
+
+       while ((node = rb_last(root)) != NULL) {
+               tree = rb_entry(node, struct ocfs2_refcount_tree, rf_node);
+
+               mlog(0, "Purge tree %llu\n",
+                    (unsigned long long) tree->rf_blkno);
+
+               rb_erase(&tree->rf_node, root);
+               ocfs2_free_refcount_tree(tree);
+       }
+}
+
+/*
+ * Create a refcount tree for an inode.
+ * We take for granted that the inode is already locked.
+ */
+static int ocfs2_create_refcount_tree(struct inode *inode,
+                                     struct buffer_head *di_bh)
+{
+       int ret;
+       handle_t *handle = NULL;
+       struct ocfs2_alloc_context *meta_ac = NULL;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct buffer_head *new_bh = NULL;
+       struct ocfs2_refcount_block *rb;
+       struct ocfs2_refcount_tree *new_tree = NULL, *tree = NULL;
+       u16 suballoc_bit_start;
+       u32 num_got;
+       u64 first_blkno;
+
+       BUG_ON(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL);
+
+       mlog(0, "create tree for inode %lu\n", inode->i_ino);
+
+       ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       handle = ocfs2_start_trans(osb, OCFS2_REFCOUNT_TREE_CREATE_CREDITS);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1,
+                                  &suballoc_bit_start, &num_got,
+                                  &first_blkno);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       new_tree = ocfs2_allocate_refcount_tree(osb, first_blkno);
+       if (!new_tree) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       new_bh = sb_getblk(inode->i_sb, first_blkno);
+       ocfs2_set_new_buffer_uptodate(&new_tree->rf_ci, new_bh);
+
+       ret = ocfs2_journal_access_rb(handle, &new_tree->rf_ci, new_bh,
+                                     OCFS2_JOURNAL_ACCESS_CREATE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       /* Initialize ocfs2_refcount_block. */
+       rb = (struct ocfs2_refcount_block *)new_bh->b_data;
+       memset(rb, 0, inode->i_sb->s_blocksize);
+       strcpy((void *)rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);
+       rb->rf_suballoc_slot = cpu_to_le16(osb->slot_num);
+       rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);
+       rb->rf_fs_generation = cpu_to_le32(osb->fs_generation);
+       rb->rf_blkno = cpu_to_le64(first_blkno);
+       rb->rf_count = cpu_to_le32(1);
+       rb->rf_records.rl_count =
+                       cpu_to_le16(ocfs2_refcount_recs_per_rb(osb->sb));
+       spin_lock(&osb->osb_lock);
+       rb->rf_generation = osb->s_next_generation++;
+       spin_unlock(&osb->osb_lock);
+
+       ocfs2_journal_dirty(handle, new_bh);
+
+       spin_lock(&oi->ip_lock);
+       oi->ip_dyn_features |= OCFS2_HAS_REFCOUNT_FL;
+       di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
+       di->i_refcount_loc = cpu_to_le64(first_blkno);
+       spin_unlock(&oi->ip_lock);
+
+       mlog(0, "created tree for inode %lu, refblock %llu\n",
+            inode->i_ino, (unsigned long long)first_blkno);
+
+       ocfs2_journal_dirty(handle, di_bh);
+
+       /*
+        * We have to init the tree lock here since it will use
+        * the generation number to create it.
+        */
+       new_tree->rf_generation = le32_to_cpu(rb->rf_generation);
+       ocfs2_init_refcount_tree_lock(osb, new_tree, first_blkno,
+                                     new_tree->rf_generation);
+
+       spin_lock(&osb->osb_lock);
+       tree = ocfs2_find_refcount_tree(osb, first_blkno);
+
+       /*
+        * We've just created a new refcount tree in this block.  If
+        * we found a refcount tree on the ocfs2_super, it must be
+        * one we just deleted.  We free the old tree before
+        * inserting the new tree.
+        */
+       BUG_ON(tree && tree->rf_generation == new_tree->rf_generation);
+       if (tree)
+               ocfs2_erase_refcount_tree_from_list_no_lock(osb, tree);
+       ocfs2_insert_refcount_tree(osb, new_tree);
+       spin_unlock(&osb->osb_lock);
+       new_tree = NULL;
+       if (tree)
+               ocfs2_refcount_tree_put(tree);
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+
+out:
+       if (new_tree) {
+               ocfs2_metadata_cache_exit(&new_tree->rf_ci);
+               kfree(new_tree);
+       }
+
+       brelse(new_bh);
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+
+       return ret;
+}
+
+static int ocfs2_set_refcount_tree(struct inode *inode,
+                                  struct buffer_head *di_bh,
+                                  u64 refcount_loc)
+{
+       int ret;
+       handle_t *handle = NULL;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_block *rb;
+       struct ocfs2_refcount_tree *ref_tree;
+
+       BUG_ON(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL);
+
+       ret = ocfs2_lock_refcount_tree(osb, refcount_loc, 1,
+                                      &ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       handle = ocfs2_start_trans(osb, OCFS2_REFCOUNT_TREE_SET_CREDITS);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, &ref_tree->rf_ci, ref_root_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       le32_add_cpu(&rb->rf_count, 1);
+
+       ocfs2_journal_dirty(handle, ref_root_bh);
+
+       spin_lock(&oi->ip_lock);
+       oi->ip_dyn_features |= OCFS2_HAS_REFCOUNT_FL;
+       di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
+       di->i_refcount_loc = cpu_to_le64(refcount_loc);
+       spin_unlock(&oi->ip_lock);
+       ocfs2_journal_dirty(handle, di_bh);
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+out:
+       ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+       brelse(ref_root_bh);
+
+       return ret;
+}
+
+int ocfs2_remove_refcount_tree(struct inode *inode, struct buffer_head *di_bh)
+{
+       int ret, delete_tree = 0;
+       handle_t *handle = NULL;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_refcount_block *rb;
+       struct inode *alloc_inode = NULL;
+       struct buffer_head *alloc_bh = NULL;
+       struct buffer_head *blk_bh = NULL;
+       struct ocfs2_refcount_tree *ref_tree;
+       int credits = OCFS2_REFCOUNT_TREE_REMOVE_CREDITS;
+       u64 blk = 0, bg_blkno = 0, ref_blkno = le64_to_cpu(di->i_refcount_loc);
+       u16 bit = 0;
+
+       if (!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL))
+               return 0;
+
+       BUG_ON(!ref_blkno);
+       ret = ocfs2_lock_refcount_tree(osb, ref_blkno, 1, &ref_tree, &blk_bh);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       rb = (struct ocfs2_refcount_block *)blk_bh->b_data;
+
+       /*
+        * If we are the last user, we need to free the block.
+        * So lock the allocator ahead.
+        */
+       if (le32_to_cpu(rb->rf_count) == 1) {
+               blk = le64_to_cpu(rb->rf_blkno);
+               bit = le16_to_cpu(rb->rf_suballoc_bit);
+               bg_blkno = ocfs2_which_suballoc_group(blk, bit);
+
+               alloc_inode = ocfs2_get_system_file_inode(osb,
+                                       EXTENT_ALLOC_SYSTEM_INODE,
+                                       le16_to_cpu(rb->rf_suballoc_slot));
+               if (!alloc_inode) {
+                       ret = -ENOMEM;
+                       mlog_errno(ret);
+                       goto out;
+               }
+               mutex_lock(&alloc_inode->i_mutex);
+
+               ret = ocfs2_inode_lock(alloc_inode, &alloc_bh, 1);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_mutex;
+               }
+
+               credits += OCFS2_SUBALLOC_FREE;
+       }
+
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out_unlock;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, &ref_tree->rf_ci, blk_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       spin_lock(&oi->ip_lock);
+       oi->ip_dyn_features &= ~OCFS2_HAS_REFCOUNT_FL;
+       di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
+       di->i_refcount_loc = 0;
+       spin_unlock(&oi->ip_lock);
+       ocfs2_journal_dirty(handle, di_bh);
+
+       le32_add_cpu(&rb->rf_count , -1);
+       ocfs2_journal_dirty(handle, blk_bh);
+
+       if (!rb->rf_count) {
+               delete_tree = 1;
+               ocfs2_erase_refcount_tree_from_list(osb, ref_tree);
+               ret = ocfs2_free_suballoc_bits(handle, alloc_inode,
+                                              alloc_bh, bit, bg_blkno, 1);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+out_unlock:
+       if (alloc_inode) {
+               ocfs2_inode_unlock(alloc_inode, 1);
+               brelse(alloc_bh);
+       }
+out_mutex:
+       if (alloc_inode) {
+               mutex_unlock(&alloc_inode->i_mutex);
+               iput(alloc_inode);
+       }
+out:
+       ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+       if (delete_tree)
+               ocfs2_refcount_tree_put(ref_tree);
+       brelse(blk_bh);
+
+       return ret;
+}
+
+static void ocfs2_find_refcount_rec_in_rl(struct ocfs2_caching_info *ci,
+                                         struct buffer_head *ref_leaf_bh,
+                                         u64 cpos, unsigned int len,
+                                         struct ocfs2_refcount_rec *ret_rec,
+                                         int *index)
+{
+       int i = 0;
+       struct ocfs2_refcount_block *rb =
+               (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_rec *rec = NULL;
+
+       for (; i < le16_to_cpu(rb->rf_records.rl_used); i++) {
+               rec = &rb->rf_records.rl_recs[i];
+
+               if (le64_to_cpu(rec->r_cpos) +
+                   le32_to_cpu(rec->r_clusters) <= cpos)
+                       continue;
+               else if (le64_to_cpu(rec->r_cpos) > cpos)
+                       break;
+
+               /* ok, cpos fail in this rec. Just return. */
+               if (ret_rec)
+                       *ret_rec = *rec;
+               goto out;
+       }
+
+       if (ret_rec) {
+               /* We meet with a hole here, so fake the rec. */
+               ret_rec->r_cpos = cpu_to_le64(cpos);
+               ret_rec->r_refcount = 0;
+               if (i < le16_to_cpu(rb->rf_records.rl_used) &&
+                   le64_to_cpu(rec->r_cpos) < cpos + len)
+                       ret_rec->r_clusters =
+                               cpu_to_le32(le64_to_cpu(rec->r_cpos) - cpos);
+               else
+                       ret_rec->r_clusters = cpu_to_le32(len);
+       }
+
+out:
+       *index = i;
+}
+
+/*
+ * Try to remove refcount tree. The mechanism is:
+ * 1) Check whether i_clusters == 0, if no, exit.
+ * 2) check whether we have i_xattr_loc in dinode. if yes, exit.
+ * 3) Check whether we have inline xattr stored outside, if yes, exit.
+ * 4) Remove the tree.
+ */
+int ocfs2_try_remove_refcount_tree(struct inode *inode,
+                                  struct buffer_head *di_bh)
+{
+       int ret;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+
+       down_write(&oi->ip_xattr_sem);
+       down_write(&oi->ip_alloc_sem);
+
+       if (oi->ip_clusters)
+               goto out;
+
+       if ((oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) && di->i_xattr_loc)
+               goto out;
+
+       if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL &&
+           ocfs2_has_inline_xattr_value_outside(inode, di))
+               goto out;
+
+       ret = ocfs2_remove_refcount_tree(inode, di_bh);
+       if (ret)
+               mlog_errno(ret);
+out:
+       up_write(&oi->ip_alloc_sem);
+       up_write(&oi->ip_xattr_sem);
+       return 0;
+}
+
+/*
+ * Given a cpos and len, try to find the refcount record which contains cpos.
+ * 1. If cpos can be found in one refcount record, return the record.
+ * 2. If cpos can't be found, return a fake record which start from cpos
+ *    and end at a small value between cpos+len and start of the next record.
+ *    This fake record has r_refcount = 0.
+ */
+static int ocfs2_get_refcount_rec(struct ocfs2_caching_info *ci,
+                                 struct buffer_head *ref_root_bh,
+                                 u64 cpos, unsigned int len,
+                                 struct ocfs2_refcount_rec *ret_rec,
+                                 int *index,
+                                 struct buffer_head **ret_bh)
+{
+       int ret = 0, i, found;
+       u32 low_cpos;
+       struct ocfs2_extent_list *el;
+       struct ocfs2_extent_rec *tmp, *rec = NULL;
+       struct ocfs2_extent_block *eb;
+       struct buffer_head *eb_bh = NULL, *ref_leaf_bh = NULL;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+
+       if (!(le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL)) {
+               ocfs2_find_refcount_rec_in_rl(ci, ref_root_bh, cpos, len,
+                                             ret_rec, index);
+               *ret_bh = ref_root_bh;
+               get_bh(ref_root_bh);
+               return 0;
+       }
+
+       el = &rb->rf_list;
+       low_cpos = cpos & OCFS2_32BIT_POS_MASK;
+
+       if (el->l_tree_depth) {
+               ret = ocfs2_find_leaf(ci, el, low_cpos, &eb_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               eb = (struct ocfs2_extent_block *) eb_bh->b_data;
+               el = &eb->h_list;
+
+               if (el->l_tree_depth) {
+                       ocfs2_error(sb,
+                       "refcount tree %llu has non zero tree "
+                       "depth in leaf btree tree block %llu\n",
+                       (unsigned long long)ocfs2_metadata_cache_owner(ci),
+                       (unsigned long long)eb_bh->b_blocknr);
+                       ret = -EROFS;
+                       goto out;
+               }
+       }
+
+       found = 0;
+       for (i = le16_to_cpu(el->l_next_free_rec) - 1; i >= 0; i--) {
+               rec = &el->l_recs[i];
+
+               if (le32_to_cpu(rec->e_cpos) <= low_cpos) {
+                       found = 1;
+                       break;
+               }
+       }
+
+       /* adjust len when we have ocfs2_extent_rec after it. */
+       if (found && i < le16_to_cpu(el->l_next_free_rec) - 1) {
+               tmp = &el->l_recs[i+1];
+
+               if (le32_to_cpu(tmp->e_cpos) < cpos + len)
+                       len = le32_to_cpu(tmp->e_cpos) - cpos;
+       }
+
+       ret = ocfs2_read_refcount_block(ci, le64_to_cpu(rec->e_blkno),
+                                       &ref_leaf_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ocfs2_find_refcount_rec_in_rl(ci, ref_leaf_bh, cpos, len,
+                                     ret_rec, index);
+       *ret_bh = ref_leaf_bh;
+out:
+       brelse(eb_bh);
+       return ret;
+}
+
+enum ocfs2_ref_rec_contig {
+       REF_CONTIG_NONE = 0,
+       REF_CONTIG_LEFT,
+       REF_CONTIG_RIGHT,
+       REF_CONTIG_LEFTRIGHT,
+};
+
+static enum ocfs2_ref_rec_contig
+       ocfs2_refcount_rec_adjacent(struct ocfs2_refcount_block *rb,
+                                   int index)
+{
+       if ((rb->rf_records.rl_recs[index].r_refcount ==
+           rb->rf_records.rl_recs[index + 1].r_refcount) &&
+           (le64_to_cpu(rb->rf_records.rl_recs[index].r_cpos) +
+           le32_to_cpu(rb->rf_records.rl_recs[index].r_clusters) ==
+           le64_to_cpu(rb->rf_records.rl_recs[index + 1].r_cpos)))
+               return REF_CONTIG_RIGHT;
+
+       return REF_CONTIG_NONE;
+}
+
+static enum ocfs2_ref_rec_contig
+       ocfs2_refcount_rec_contig(struct ocfs2_refcount_block *rb,
+                                 int index)
+{
+       enum ocfs2_ref_rec_contig ret = REF_CONTIG_NONE;
+
+       if (index < le16_to_cpu(rb->rf_records.rl_used) - 1)
+               ret = ocfs2_refcount_rec_adjacent(rb, index);
+
+       if (index > 0) {
+               enum ocfs2_ref_rec_contig tmp;
+
+               tmp = ocfs2_refcount_rec_adjacent(rb, index - 1);
+
+               if (tmp == REF_CONTIG_RIGHT) {
+                       if (ret == REF_CONTIG_RIGHT)
+                               ret = REF_CONTIG_LEFTRIGHT;
+                       else
+                               ret = REF_CONTIG_LEFT;
+               }
+       }
+
+       return ret;
+}
+
+static void ocfs2_rotate_refcount_rec_left(struct ocfs2_refcount_block *rb,
+                                          int index)
+{
+       BUG_ON(rb->rf_records.rl_recs[index].r_refcount !=
+              rb->rf_records.rl_recs[index+1].r_refcount);
+
+       le32_add_cpu(&rb->rf_records.rl_recs[index].r_clusters,
+                    le32_to_cpu(rb->rf_records.rl_recs[index+1].r_clusters));
+
+       if (index < le16_to_cpu(rb->rf_records.rl_used) - 2)
+               memmove(&rb->rf_records.rl_recs[index + 1],
+                       &rb->rf_records.rl_recs[index + 2],
+                       sizeof(struct ocfs2_refcount_rec) *
+                       (le16_to_cpu(rb->rf_records.rl_used) - index - 2));
+
+       memset(&rb->rf_records.rl_recs[le16_to_cpu(rb->rf_records.rl_used) - 1],
+              0, sizeof(struct ocfs2_refcount_rec));
+       le16_add_cpu(&rb->rf_records.rl_used, -1);
+}
+
+/*
+ * Merge the refcount rec if we are contiguous with the adjacent recs.
+ */
+static void ocfs2_refcount_rec_merge(struct ocfs2_refcount_block *rb,
+                                    int index)
+{
+       enum ocfs2_ref_rec_contig contig =
+                               ocfs2_refcount_rec_contig(rb, index);
+
+       if (contig == REF_CONTIG_NONE)
+               return;
+
+       if (contig == REF_CONTIG_LEFT || contig == REF_CONTIG_LEFTRIGHT) {
+               BUG_ON(index == 0);
+               index--;
+       }
+
+       ocfs2_rotate_refcount_rec_left(rb, index);
+
+       if (contig == REF_CONTIG_LEFTRIGHT)
+               ocfs2_rotate_refcount_rec_left(rb, index);
+}
+
+/*
+ * Change the refcount indexed by "index" in ref_bh.
+ * If refcount reaches 0, remove it.
+ */
+static int ocfs2_change_refcount_rec(handle_t *handle,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *ref_leaf_bh,
+                                    int index, int merge, int change)
+{
+       int ret;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_list *rl = &rb->rf_records;
+       struct ocfs2_refcount_rec *rec = &rl->rl_recs[index];
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_leaf_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "change index %d, old count %u, change %d\n", index,
+            le32_to_cpu(rec->r_refcount), change);
+       le32_add_cpu(&rec->r_refcount, change);
+
+       if (!rec->r_refcount) {
+               if (index != le16_to_cpu(rl->rl_used) - 1) {
+                       memmove(rec, rec + 1,
+                               (le16_to_cpu(rl->rl_used) - index - 1) *
+                               sizeof(struct ocfs2_refcount_rec));
+                       memset(&rl->rl_recs[le16_to_cpu(rl->rl_used) - 1],
+                              0, sizeof(struct ocfs2_refcount_rec));
+               }
+
+               le16_add_cpu(&rl->rl_used, -1);
+       } else if (merge)
+               ocfs2_refcount_rec_merge(rb, index);
+
+       ret = ocfs2_journal_dirty(handle, ref_leaf_bh);
+       if (ret)
+               mlog_errno(ret);
+out:
+       return ret;
+}
+
+static int ocfs2_expand_inline_ref_root(handle_t *handle,
+                                       struct ocfs2_caching_info *ci,
+                                       struct buffer_head *ref_root_bh,
+                                       struct buffer_head **ref_leaf_bh,
+                                       struct ocfs2_alloc_context *meta_ac)
+{
+       int ret;
+       u16 suballoc_bit_start;
+       u32 num_got;
+       u64 blkno;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       struct buffer_head *new_bh = NULL;
+       struct ocfs2_refcount_block *new_rb;
+       struct ocfs2_refcount_block *root_rb =
+                       (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_root_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_claim_metadata(OCFS2_SB(sb), handle, meta_ac, 1,
+                                  &suballoc_bit_start, &num_got,
+                                  &blkno);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       new_bh = sb_getblk(sb, blkno);
+       if (new_bh == NULL) {
+               ret = -EIO;
+               mlog_errno(ret);
+               goto out;
+       }
+       ocfs2_set_new_buffer_uptodate(ci, new_bh);
+
+       ret = ocfs2_journal_access_rb(handle, ci, new_bh,
+                                     OCFS2_JOURNAL_ACCESS_CREATE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * Initialize ocfs2_refcount_block.
+        * It should contain the same information as the old root.
+        * so just memcpy it and change the corresponding field.
+        */
+       memcpy(new_bh->b_data, ref_root_bh->b_data, sb->s_blocksize);
+
+       new_rb = (struct ocfs2_refcount_block *)new_bh->b_data;
+       new_rb->rf_suballoc_slot = cpu_to_le16(OCFS2_SB(sb)->slot_num);
+       new_rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);
+       new_rb->rf_blkno = cpu_to_le64(blkno);
+       new_rb->rf_cpos = cpu_to_le32(0);
+       new_rb->rf_parent = cpu_to_le64(ref_root_bh->b_blocknr);
+       new_rb->rf_flags = cpu_to_le32(OCFS2_REFCOUNT_LEAF_FL);
+       ocfs2_journal_dirty(handle, new_bh);
+
+       /* Now change the root. */
+       memset(&root_rb->rf_list, 0, sb->s_blocksize -
+              offsetof(struct ocfs2_refcount_block, rf_list));
+       root_rb->rf_list.l_count = cpu_to_le16(ocfs2_extent_recs_per_rb(sb));
+       root_rb->rf_clusters = cpu_to_le32(1);
+       root_rb->rf_list.l_next_free_rec = cpu_to_le16(1);
+       root_rb->rf_list.l_recs[0].e_blkno = cpu_to_le64(blkno);
+       root_rb->rf_list.l_recs[0].e_leaf_clusters = cpu_to_le16(1);
+       root_rb->rf_flags = cpu_to_le32(OCFS2_REFCOUNT_TREE_FL);
+
+       ocfs2_journal_dirty(handle, ref_root_bh);
+
+       mlog(0, "new leaf block %llu, used %u\n", (unsigned long long)blkno,
+            le16_to_cpu(new_rb->rf_records.rl_used));
+
+       *ref_leaf_bh = new_bh;
+       new_bh = NULL;
+out:
+       brelse(new_bh);
+       return ret;
+}
+
+static int ocfs2_refcount_rec_no_intersect(struct ocfs2_refcount_rec *prev,
+                                          struct ocfs2_refcount_rec *next)
+{
+       if (ocfs2_get_ref_rec_low_cpos(prev) + le32_to_cpu(prev->r_clusters) <=
+               ocfs2_get_ref_rec_low_cpos(next))
+               return 1;
+
+       return 0;
+}
+
+static int cmp_refcount_rec_by_low_cpos(const void *a, const void *b)
+{
+       const struct ocfs2_refcount_rec *l = a, *r = b;
+       u32 l_cpos = ocfs2_get_ref_rec_low_cpos(l);
+       u32 r_cpos = ocfs2_get_ref_rec_low_cpos(r);
+
+       if (l_cpos > r_cpos)
+               return 1;
+       if (l_cpos < r_cpos)
+               return -1;
+       return 0;
+}
+
+static int cmp_refcount_rec_by_cpos(const void *a, const void *b)
+{
+       const struct ocfs2_refcount_rec *l = a, *r = b;
+       u64 l_cpos = le64_to_cpu(l->r_cpos);
+       u64 r_cpos = le64_to_cpu(r->r_cpos);
+
+       if (l_cpos > r_cpos)
+               return 1;
+       if (l_cpos < r_cpos)
+               return -1;
+       return 0;
+}
+
+static void swap_refcount_rec(void *a, void *b, int size)
+{
+       struct ocfs2_refcount_rec *l = a, *r = b, tmp;
+
+       tmp = *(struct ocfs2_refcount_rec *)l;
+       *(struct ocfs2_refcount_rec *)l =
+                       *(struct ocfs2_refcount_rec *)r;
+       *(struct ocfs2_refcount_rec *)r = tmp;
+}
+
+/*
+ * The refcount cpos are ordered by their 64bit cpos,
+ * But we will use the low 32 bit to be the e_cpos in the b-tree.
+ * So we need to make sure that this pos isn't intersected with others.
+ *
+ * Note: The refcount block is already sorted by their low 32 bit cpos,
+ *       So just try the middle pos first, and we will exit when we find
+ *       the good position.
+ */
+static int ocfs2_find_refcount_split_pos(struct ocfs2_refcount_list *rl,
+                                        u32 *split_pos, int *split_index)
+{
+       int num_used = le16_to_cpu(rl->rl_used);
+       int delta, middle = num_used / 2;
+
+       for (delta = 0; delta < middle; delta++) {
+               /* Let's check delta earlier than middle */
+               if (ocfs2_refcount_rec_no_intersect(
+                                       &rl->rl_recs[middle - delta - 1],
+                                       &rl->rl_recs[middle - delta])) {
+                       *split_index = middle - delta;
+                       break;
+               }
+
+               /* For even counts, don't walk off the end */
+               if ((middle + delta + 1) == num_used)
+                       continue;
+
+               /* Now try delta past middle */
+               if (ocfs2_refcount_rec_no_intersect(
+                                       &rl->rl_recs[middle + delta],
+                                       &rl->rl_recs[middle + delta + 1])) {
+                       *split_index = middle + delta + 1;
+                       break;
+               }
+       }
+
+       if (delta >= middle)
+               return -ENOSPC;
+
+       *split_pos = ocfs2_get_ref_rec_low_cpos(&rl->rl_recs[*split_index]);
+       return 0;
+}
+
+static int ocfs2_divide_leaf_refcount_block(struct buffer_head *ref_leaf_bh,
+                                           struct buffer_head *new_bh,
+                                           u32 *split_cpos)
+{
+       int split_index = 0, num_moved, ret;
+       u32 cpos = 0;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_list *rl = &rb->rf_records;
+       struct ocfs2_refcount_block *new_rb =
+                       (struct ocfs2_refcount_block *)new_bh->b_data;
+       struct ocfs2_refcount_list *new_rl = &new_rb->rf_records;
+
+       mlog(0, "split old leaf refcount block %llu, count = %u, used = %u\n",
+            (unsigned long long)ref_leaf_bh->b_blocknr,
+            le32_to_cpu(rl->rl_count), le32_to_cpu(rl->rl_used));
+
+       /*
+        * XXX: Improvement later.
+        * If we know all the high 32 bit cpos is the same, no need to sort.
+        *
+        * In order to make the whole process safe, we do:
+        * 1. sort the entries by their low 32 bit cpos first so that we can
+        *    find the split cpos easily.
+        * 2. call ocfs2_insert_extent to insert the new refcount block.
+        * 3. move the refcount rec to the new block.
+        * 4. sort the entries by their 64 bit cpos.
+        * 5. dirty the new_rb and rb.
+        */
+       sort(&rl->rl_recs, le16_to_cpu(rl->rl_used),
+            sizeof(struct ocfs2_refcount_rec),
+            cmp_refcount_rec_by_low_cpos, swap_refcount_rec);
+
+       ret = ocfs2_find_refcount_split_pos(rl, &cpos, &split_index);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       new_rb->rf_cpos = cpu_to_le32(cpos);
+
+       /* move refcount records starting from split_index to the new block. */
+       num_moved = le16_to_cpu(rl->rl_used) - split_index;
+       memcpy(new_rl->rl_recs, &rl->rl_recs[split_index],
+              num_moved * sizeof(struct ocfs2_refcount_rec));
+
+       /*ok, remove the entries we just moved over to the other block. */
+       memset(&rl->rl_recs[split_index], 0,
+              num_moved * sizeof(struct ocfs2_refcount_rec));
+
+       /* change old and new rl_used accordingly. */
+       le16_add_cpu(&rl->rl_used, -num_moved);
+       new_rl->rl_used = cpu_to_le32(num_moved);
+
+       sort(&rl->rl_recs, le16_to_cpu(rl->rl_used),
+            sizeof(struct ocfs2_refcount_rec),
+            cmp_refcount_rec_by_cpos, swap_refcount_rec);
+
+       sort(&new_rl->rl_recs, le16_to_cpu(new_rl->rl_used),
+            sizeof(struct ocfs2_refcount_rec),
+            cmp_refcount_rec_by_cpos, swap_refcount_rec);
+
+       *split_cpos = cpos;
+       return 0;
+}
+
+static int ocfs2_new_leaf_refcount_block(handle_t *handle,
+                                        struct ocfs2_caching_info *ci,
+                                        struct buffer_head *ref_root_bh,
+                                        struct buffer_head *ref_leaf_bh,
+                                        struct ocfs2_alloc_context *meta_ac)
+{
+       int ret;
+       u16 suballoc_bit_start;
+       u32 num_got, new_cpos;
+       u64 blkno;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       struct ocfs2_refcount_block *root_rb =
+                       (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       struct buffer_head *new_bh = NULL;
+       struct ocfs2_refcount_block *new_rb;
+       struct ocfs2_extent_tree ref_et;
+
+       BUG_ON(!(le32_to_cpu(root_rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL));
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_root_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_leaf_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_claim_metadata(OCFS2_SB(sb), handle, meta_ac, 1,
+                                  &suballoc_bit_start, &num_got,
+                                  &blkno);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       new_bh = sb_getblk(sb, blkno);
+       if (new_bh == NULL) {
+               ret = -EIO;
+               mlog_errno(ret);
+               goto out;
+       }
+       ocfs2_set_new_buffer_uptodate(ci, new_bh);
+
+       ret = ocfs2_journal_access_rb(handle, ci, new_bh,
+                                     OCFS2_JOURNAL_ACCESS_CREATE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /* Initialize ocfs2_refcount_block. */
+       new_rb = (struct ocfs2_refcount_block *)new_bh->b_data;
+       memset(new_rb, 0, sb->s_blocksize);
+       strcpy((void *)new_rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);
+       new_rb->rf_suballoc_slot = cpu_to_le16(OCFS2_SB(sb)->slot_num);
+       new_rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);
+       new_rb->rf_fs_generation = cpu_to_le32(OCFS2_SB(sb)->fs_generation);
+       new_rb->rf_blkno = cpu_to_le64(blkno);
+       new_rb->rf_parent = cpu_to_le64(ref_root_bh->b_blocknr);
+       new_rb->rf_flags = cpu_to_le32(OCFS2_REFCOUNT_LEAF_FL);
+       new_rb->rf_records.rl_count =
+                               cpu_to_le16(ocfs2_refcount_recs_per_rb(sb));
+       new_rb->rf_generation = root_rb->rf_generation;
+
+       ret = ocfs2_divide_leaf_refcount_block(ref_leaf_bh, new_bh, &new_cpos);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ocfs2_journal_dirty(handle, ref_leaf_bh);
+       ocfs2_journal_dirty(handle, new_bh);
+
+       ocfs2_init_refcount_extent_tree(&ref_et, ci, ref_root_bh);
+
+       mlog(0, "insert new leaf block %llu at %u\n",
+            (unsigned long long)new_bh->b_blocknr, new_cpos);
+
+       /* Insert the new leaf block with the specific offset cpos. */
+       ret = ocfs2_insert_extent(handle, &ref_et, new_cpos, new_bh->b_blocknr,
+                                 1, 0, meta_ac);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       brelse(new_bh);
+       return ret;
+}
+
+static int ocfs2_expand_refcount_tree(handle_t *handle,
+                                     struct ocfs2_caching_info *ci,
+                                     struct buffer_head *ref_root_bh,
+                                     struct buffer_head *ref_leaf_bh,
+                                     struct ocfs2_alloc_context *meta_ac)
+{
+       int ret;
+       struct buffer_head *expand_bh = NULL;
+
+       if (ref_root_bh == ref_leaf_bh) {
+               /*
+                * the old root bh hasn't been expanded to a b-tree,
+                * so expand it first.
+                */
+               ret = ocfs2_expand_inline_ref_root(handle, ci, ref_root_bh,
+                                                  &expand_bh, meta_ac);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       } else {
+               expand_bh = ref_leaf_bh;
+               get_bh(expand_bh);
+       }
+
+
+       /* Now add a new refcount block into the tree.*/
+       ret = ocfs2_new_leaf_refcount_block(handle, ci, ref_root_bh,
+                                           expand_bh, meta_ac);
+       if (ret)
+               mlog_errno(ret);
+out:
+       brelse(expand_bh);
+       return ret;
+}
+
+/*
+ * Adjust the extent rec in b-tree representing ref_leaf_bh.
+ *
+ * Only called when we have inserted a new refcount rec at index 0
+ * which means ocfs2_extent_rec.e_cpos may need some change.
+ */
+static int ocfs2_adjust_refcount_rec(handle_t *handle,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *ref_root_bh,
+                                    struct buffer_head *ref_leaf_bh,
+                                    struct ocfs2_refcount_rec *rec)
+{
+       int ret = 0, i;
+       u32 new_cpos, old_cpos;
+       struct ocfs2_path *path = NULL;
+       struct ocfs2_extent_tree et;
+       struct ocfs2_refcount_block *rb =
+               (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       struct ocfs2_extent_list *el;
+
+       if (!(le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL))
+               goto out;
+
+       rb = (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       old_cpos = le32_to_cpu(rb->rf_cpos);
+       new_cpos = le64_to_cpu(rec->r_cpos) & OCFS2_32BIT_POS_MASK;
+       if (old_cpos <= new_cpos)
+               goto out;
+
+       ocfs2_init_refcount_extent_tree(&et, ci, ref_root_bh);
+
+       path = ocfs2_new_path_from_et(&et);
+       if (!path) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_find_path(ci, path, old_cpos);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * 2 more credits, one for the leaf refcount block, one for
+        * the extent block contains the extent rec.
+        */
+       ret = ocfs2_extend_trans(handle, handle->h_buffer_credits + 2);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_leaf_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_eb(handle, ci, path_leaf_bh(path),
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /* change the leaf extent block first. */
+       el = path_leaf_el(path);
+
+       for (i = 0; i < le16_to_cpu(el->l_next_free_rec); i++)
+               if (le32_to_cpu(el->l_recs[i].e_cpos) == old_cpos)
+                       break;
+
+       BUG_ON(i == le16_to_cpu(el->l_next_free_rec));
+
+       el->l_recs[i].e_cpos = cpu_to_le32(new_cpos);
+
+       /* change the r_cpos in the leaf block. */
+       rb->rf_cpos = cpu_to_le32(new_cpos);
+
+       ocfs2_journal_dirty(handle, path_leaf_bh(path));
+       ocfs2_journal_dirty(handle, ref_leaf_bh);
+
+out:
+       ocfs2_free_path(path);
+       return ret;
+}
+
+static int ocfs2_insert_refcount_rec(handle_t *handle,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *ref_root_bh,
+                                    struct buffer_head *ref_leaf_bh,
+                                    struct ocfs2_refcount_rec *rec,
+                                    int index, int merge,
+                                    struct ocfs2_alloc_context *meta_ac)
+{
+       int ret;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_list *rf_list = &rb->rf_records;
+       struct buffer_head *new_bh = NULL;
+
+       BUG_ON(le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL);
+
+       if (rf_list->rl_used == rf_list->rl_count) {
+               u64 cpos = le64_to_cpu(rec->r_cpos);
+               u32 len = le32_to_cpu(rec->r_clusters);
+
+               ret = ocfs2_expand_refcount_tree(handle, ci, ref_root_bh,
+                                                ref_leaf_bh, meta_ac);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               ret = ocfs2_get_refcount_rec(ci, ref_root_bh,
+                                            cpos, len, NULL, &index,
+                                            &new_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               ref_leaf_bh = new_bh;
+               rb = (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+               rf_list = &rb->rf_records;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_leaf_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (index < le16_to_cpu(rf_list->rl_used))
+               memmove(&rf_list->rl_recs[index + 1],
+                       &rf_list->rl_recs[index],
+                       (le16_to_cpu(rf_list->rl_used) - index) *
+                        sizeof(struct ocfs2_refcount_rec));
+
+       mlog(0, "insert refcount record start %llu, len %u, count %u "
+            "to leaf block %llu at index %d\n",
+            (unsigned long long)le64_to_cpu(rec->r_cpos),
+            le32_to_cpu(rec->r_clusters), le32_to_cpu(rec->r_refcount),
+            (unsigned long long)ref_leaf_bh->b_blocknr, index);
+
+       rf_list->rl_recs[index] = *rec;
+
+       le16_add_cpu(&rf_list->rl_used, 1);
+
+       if (merge)
+               ocfs2_refcount_rec_merge(rb, index);
+
+       ret = ocfs2_journal_dirty(handle, ref_leaf_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (index == 0) {
+               ret = ocfs2_adjust_refcount_rec(handle, ci,
+                                               ref_root_bh,
+                                               ref_leaf_bh, rec);
+               if (ret)
+                       mlog_errno(ret);
+       }
+out:
+       brelse(new_bh);
+       return ret;
+}
+
+/*
+ * Split the refcount_rec indexed by "index" in ref_leaf_bh.
+ * This is much simple than our b-tree code.
+ * split_rec is the new refcount rec we want to insert.
+ * If split_rec->r_refcount > 0, we are changing the refcount(in case we
+ * increase refcount or decrease a refcount to non-zero).
+ * If split_rec->r_refcount == 0, we are punching a hole in current refcount
+ * rec( in case we decrease a refcount to zero).
+ */
+static int ocfs2_split_refcount_rec(handle_t *handle,
+                                   struct ocfs2_caching_info *ci,
+                                   struct buffer_head *ref_root_bh,
+                                   struct buffer_head *ref_leaf_bh,
+                                   struct ocfs2_refcount_rec *split_rec,
+                                   int index, int merge,
+                                   struct ocfs2_alloc_context *meta_ac,
+                                   struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret, recs_need;
+       u32 len;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_list *rf_list = &rb->rf_records;
+       struct ocfs2_refcount_rec *orig_rec = &rf_list->rl_recs[index];
+       struct ocfs2_refcount_rec *tail_rec = NULL;
+       struct buffer_head *new_bh = NULL;
+
+       BUG_ON(le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL);
+
+       mlog(0, "original r_pos %llu, cluster %u, split %llu, cluster %u\n",
+            le64_to_cpu(orig_rec->r_cpos), le32_to_cpu(orig_rec->r_clusters),
+            le64_to_cpu(split_rec->r_cpos),
+            le32_to_cpu(split_rec->r_clusters));
+
+       /*
+        * If we just need to split the header or tail clusters,
+        * no more recs are needed, just split is OK.
+        * Otherwise we at least need one new recs.
+        */
+       if (!split_rec->r_refcount &&
+           (split_rec->r_cpos == orig_rec->r_cpos ||
+            le64_to_cpu(split_rec->r_cpos) +
+            le32_to_cpu(split_rec->r_clusters) ==
+            le64_to_cpu(orig_rec->r_cpos) + le32_to_cpu(orig_rec->r_clusters)))
+               recs_need = 0;
+       else
+               recs_need = 1;
+
+       /*
+        * We need one more rec if we split in the middle and the new rec have
+        * some refcount in it.
+        */
+       if (split_rec->r_refcount &&
+           (split_rec->r_cpos != orig_rec->r_cpos &&
+            le64_to_cpu(split_rec->r_cpos) +
+            le32_to_cpu(split_rec->r_clusters) !=
+            le64_to_cpu(orig_rec->r_cpos) + le32_to_cpu(orig_rec->r_clusters)))
+               recs_need++;
+
+       /* If the leaf block don't have enough record, expand it. */
+       if (le16_to_cpu(rf_list->rl_used) + recs_need > rf_list->rl_count) {
+               struct ocfs2_refcount_rec tmp_rec;
+               u64 cpos = le64_to_cpu(orig_rec->r_cpos);
+               len = le32_to_cpu(orig_rec->r_clusters);
+               ret = ocfs2_expand_refcount_tree(handle, ci, ref_root_bh,
+                                                ref_leaf_bh, meta_ac);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               /*
+                * We have to re-get it since now cpos may be moved to
+                * another leaf block.
+                */
+               ret = ocfs2_get_refcount_rec(ci, ref_root_bh,
+                                            cpos, len, &tmp_rec, &index,
+                                            &new_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               ref_leaf_bh = new_bh;
+               rb = (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+               rf_list = &rb->rf_records;
+               orig_rec = &rf_list->rl_recs[index];
+       }
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_leaf_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * We have calculated out how many new records we need and store
+        * in recs_need, so spare enough space first by moving the records
+        * after "index" to the end.
+        */
+       if (index != le16_to_cpu(rf_list->rl_used) - 1)
+               memmove(&rf_list->rl_recs[index + 1 + recs_need],
+                       &rf_list->rl_recs[index + 1],
+                       (le16_to_cpu(rf_list->rl_used) - index - 1) *
+                        sizeof(struct ocfs2_refcount_rec));
+
+       len = (le64_to_cpu(orig_rec->r_cpos) +
+             le32_to_cpu(orig_rec->r_clusters)) -
+             (le64_to_cpu(split_rec->r_cpos) +
+             le32_to_cpu(split_rec->r_clusters));
+
+       /*
+        * If we have "len", the we will split in the tail and move it
+        * to the end of the space we have just spared.
+        */
+       if (len) {
+               tail_rec = &rf_list->rl_recs[index + recs_need];
+
+               memcpy(tail_rec, orig_rec, sizeof(struct ocfs2_refcount_rec));
+               le64_add_cpu(&tail_rec->r_cpos,
+                            le32_to_cpu(tail_rec->r_clusters) - len);
+               tail_rec->r_clusters = le32_to_cpu(len);
+       }
+
+       /*
+        * If the split pos isn't the same as the original one, we need to
+        * split in the head.
+        *
+        * Note: We have the chance that split_rec.r_refcount = 0,
+        * recs_need = 0 and len > 0, which means we just cut the head from
+        * the orig_rec and in that case we have done some modification in
+        * orig_rec above, so the check for r_cpos is faked.
+        */
+       if (split_rec->r_cpos != orig_rec->r_cpos && tail_rec != orig_rec) {
+               len = le64_to_cpu(split_rec->r_cpos) -
+                     le64_to_cpu(orig_rec->r_cpos);
+               orig_rec->r_clusters = cpu_to_le32(len);
+               index++;
+       }
+
+       le16_add_cpu(&rf_list->rl_used, recs_need);
+
+       if (split_rec->r_refcount) {
+               rf_list->rl_recs[index] = *split_rec;
+               mlog(0, "insert refcount record start %llu, len %u, count %u "
+                    "to leaf block %llu at index %d\n",
+                    (unsigned long long)le64_to_cpu(split_rec->r_cpos),
+                    le32_to_cpu(split_rec->r_clusters),
+                    le32_to_cpu(split_rec->r_refcount),
+                    (unsigned long long)ref_leaf_bh->b_blocknr, index);
+
+               if (merge)
+                       ocfs2_refcount_rec_merge(rb, index);
+       }
+
+       ret = ocfs2_journal_dirty(handle, ref_leaf_bh);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       brelse(new_bh);
+       return ret;
+}
+
+static int __ocfs2_increase_refcount(handle_t *handle,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *ref_root_bh,
+                                    u64 cpos, u32 len, int merge,
+                                    struct ocfs2_alloc_context *meta_ac,
+                                    struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret = 0, index;
+       struct buffer_head *ref_leaf_bh = NULL;
+       struct ocfs2_refcount_rec rec;
+       unsigned int set_len = 0;
+
+       mlog(0, "Tree owner %llu, add refcount start %llu, len %u\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
+            (unsigned long long)cpos, len);
+
+       while (len) {
+               ret = ocfs2_get_refcount_rec(ci, ref_root_bh,
+                                            cpos, len, &rec, &index,
+                                            &ref_leaf_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               set_len = le32_to_cpu(rec.r_clusters);
+
+               /*
+                * Here we may meet with 3 situations:
+                *
+                * 1. If we find an already existing record, and the length
+                *    is the same, cool, we just need to increase the r_refcount
+                *    and it is OK.
+                * 2. If we find a hole, just insert it with r_refcount = 1.
+                * 3. If we are in the middle of one extent record, split
+                *    it.
+                */
+               if (rec.r_refcount && le64_to_cpu(rec.r_cpos) == cpos &&
+                   set_len <= len) {
+                       mlog(0, "increase refcount rec, start %llu, len %u, "
+                            "count %u\n", (unsigned long long)cpos, set_len,
+                            le32_to_cpu(rec.r_refcount));
+                       ret = ocfs2_change_refcount_rec(handle, ci,
+                                                       ref_leaf_bh, index,
+                                                       merge, 1);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+               } else if (!rec.r_refcount) {
+                       rec.r_refcount = cpu_to_le32(1);
+
+                       mlog(0, "insert refcount rec, start %llu, len %u\n",
+                            (unsigned long long)le64_to_cpu(rec.r_cpos),
+                            set_len);
+                       ret = ocfs2_insert_refcount_rec(handle, ci, ref_root_bh,
+                                                       ref_leaf_bh,
+                                                       &rec, index,
+                                                       merge, meta_ac);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+               } else  {
+                       set_len = min((u64)(cpos + len),
+                                     le64_to_cpu(rec.r_cpos) + set_len) - cpos;
+                       rec.r_cpos = cpu_to_le64(cpos);
+                       rec.r_clusters = cpu_to_le32(set_len);
+                       le32_add_cpu(&rec.r_refcount, 1);
+
+                       mlog(0, "split refcount rec, start %llu, "
+                            "len %u, count %u\n",
+                            (unsigned long long)le64_to_cpu(rec.r_cpos),
+                            set_len, le32_to_cpu(rec.r_refcount));
+                       ret = ocfs2_split_refcount_rec(handle, ci,
+                                                      ref_root_bh, ref_leaf_bh,
+                                                      &rec, index, merge,
+                                                      meta_ac, dealloc);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+               }
+
+               cpos += set_len;
+               len -= set_len;
+               brelse(ref_leaf_bh);
+               ref_leaf_bh = NULL;
+       }
+
+out:
+       brelse(ref_leaf_bh);
+       return ret;
+}
+
+static int ocfs2_remove_refcount_extent(handle_t *handle,
+                               struct ocfs2_caching_info *ci,
+                               struct buffer_head *ref_root_bh,
+                               struct buffer_head *ref_leaf_bh,
+                               struct ocfs2_alloc_context *meta_ac,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_extent_tree et;
+
+       BUG_ON(rb->rf_records.rl_used);
+
+       ocfs2_init_refcount_extent_tree(&et, ci, ref_root_bh);
+       ret = ocfs2_remove_extent(handle, &et, le32_to_cpu(rb->rf_cpos),
+                                 1, meta_ac, dealloc);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ocfs2_remove_from_cache(ci, ref_leaf_bh);
+
+       /*
+        * add the freed block to the dealloc so that it will be freed
+        * when we run dealloc.
+        */
+       ret = ocfs2_cache_block_dealloc(dealloc, EXTENT_ALLOC_SYSTEM_INODE,
+                                       le16_to_cpu(rb->rf_suballoc_slot),
+                                       le64_to_cpu(rb->rf_blkno),
+                                       le16_to_cpu(rb->rf_suballoc_bit));
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_rb(handle, ci, ref_root_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+
+       le32_add_cpu(&rb->rf_clusters, -1);
+
+       /*
+        * check whether we need to restore the root refcount block if
+        * there is no leaf extent block at atll.
+        */
+       if (!rb->rf_list.l_next_free_rec) {
+               BUG_ON(rb->rf_clusters);
+
+               mlog(0, "reset refcount tree root %llu to be a record block.\n",
+                    (unsigned long long)ref_root_bh->b_blocknr);
+
+               rb->rf_flags = 0;
+               rb->rf_parent = 0;
+               rb->rf_cpos = 0;
+               memset(&rb->rf_records, 0, sb->s_blocksize -
+                      offsetof(struct ocfs2_refcount_block, rf_records));
+               rb->rf_records.rl_count =
+                               cpu_to_le16(ocfs2_refcount_recs_per_rb(sb));
+       }
+
+       ocfs2_journal_dirty(handle, ref_root_bh);
+
+out:
+       return ret;
+}
+
+int ocfs2_increase_refcount(handle_t *handle,
+                           struct ocfs2_caching_info *ci,
+                           struct buffer_head *ref_root_bh,
+                           u64 cpos, u32 len,
+                           struct ocfs2_alloc_context *meta_ac,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       return __ocfs2_increase_refcount(handle, ci, ref_root_bh,
+                                        cpos, len, 1,
+                                        meta_ac, dealloc);
+}
+
+static int ocfs2_decrease_refcount_rec(handle_t *handle,
+                               struct ocfs2_caching_info *ci,
+                               struct buffer_head *ref_root_bh,
+                               struct buffer_head *ref_leaf_bh,
+                               int index, u64 cpos, unsigned int len,
+                               struct ocfs2_alloc_context *meta_ac,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+       struct ocfs2_refcount_rec *rec = &rb->rf_records.rl_recs[index];
+
+       BUG_ON(cpos < le64_to_cpu(rec->r_cpos));
+       BUG_ON(cpos + len >
+              le64_to_cpu(rec->r_cpos) + le32_to_cpu(rec->r_clusters));
+
+       if (cpos == le64_to_cpu(rec->r_cpos) &&
+           len == le32_to_cpu(rec->r_clusters))
+               ret = ocfs2_change_refcount_rec(handle, ci,
+                                               ref_leaf_bh, index, 1, -1);
+       else {
+               struct ocfs2_refcount_rec split = *rec;
+               split.r_cpos = cpu_to_le64(cpos);
+               split.r_clusters = cpu_to_le32(len);
+
+               le32_add_cpu(&split.r_refcount, -1);
+
+               mlog(0, "split refcount rec, start %llu, "
+                    "len %u, count %u, original start %llu, len %u\n",
+                    (unsigned long long)le64_to_cpu(split.r_cpos),
+                    len, le32_to_cpu(split.r_refcount),
+                    (unsigned long long)le64_to_cpu(rec->r_cpos),
+                    le32_to_cpu(rec->r_clusters));
+               ret = ocfs2_split_refcount_rec(handle, ci,
+                                              ref_root_bh, ref_leaf_bh,
+                                              &split, index, 1,
+                                              meta_ac, dealloc);
+       }
+
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /* Remove the leaf refcount block if it contains no refcount record. */
+       if (!rb->rf_records.rl_used && ref_leaf_bh != ref_root_bh) {
+               ret = ocfs2_remove_refcount_extent(handle, ci, ref_root_bh,
+                                                  ref_leaf_bh, meta_ac,
+                                                  dealloc);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out:
+       return ret;
+}
+
+static int __ocfs2_decrease_refcount(handle_t *handle,
+                                    struct ocfs2_caching_info *ci,
+                                    struct buffer_head *ref_root_bh,
+                                    u64 cpos, u32 len,
+                                    struct ocfs2_alloc_context *meta_ac,
+                                    struct ocfs2_cached_dealloc_ctxt *dealloc,
+                                    int delete)
+{
+       int ret = 0, index = 0;
+       struct ocfs2_refcount_rec rec;
+       unsigned int r_count = 0, r_len;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       struct buffer_head *ref_leaf_bh = NULL;
+
+       mlog(0, "Tree owner %llu, decrease refcount start %llu, "
+            "len %u, delete %u\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
+            (unsigned long long)cpos, len, delete);
+
+       while (len) {
+               ret = ocfs2_get_refcount_rec(ci, ref_root_bh,
+                                            cpos, len, &rec, &index,
+                                            &ref_leaf_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               r_count = le32_to_cpu(rec.r_refcount);
+               BUG_ON(r_count == 0);
+               if (!delete)
+                       BUG_ON(r_count > 1);
+
+               r_len = min((u64)(cpos + len), le64_to_cpu(rec.r_cpos) +
+                             le32_to_cpu(rec.r_clusters)) - cpos;
+
+               ret = ocfs2_decrease_refcount_rec(handle, ci, ref_root_bh,
+                                                 ref_leaf_bh, index,
+                                                 cpos, r_len,
+                                                 meta_ac, dealloc);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               if (le32_to_cpu(rec.r_refcount) == 1 && delete) {
+                       ret = ocfs2_cache_cluster_dealloc(dealloc,
+                                         ocfs2_clusters_to_blocks(sb, cpos),
+                                                         r_len);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+               }
+
+               cpos += r_len;
+               len -= r_len;
+               brelse(ref_leaf_bh);
+               ref_leaf_bh = NULL;
+       }
+
+out:
+       brelse(ref_leaf_bh);
+       return ret;
+}
+
+/* Caller must hold refcount tree lock. */
+int ocfs2_decrease_refcount(struct inode *inode,
+                           handle_t *handle, u32 cpos, u32 len,
+                           struct ocfs2_alloc_context *meta_ac,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc,
+                           int delete)
+{
+       int ret;
+       u64 ref_blkno;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_tree *tree;
+
+       BUG_ON(!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL));
+
+       ret = ocfs2_get_refcount_block(inode, &ref_blkno);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_get_refcount_tree(OCFS2_SB(inode->i_sb), ref_blkno, &tree);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_read_refcount_block(&tree->rf_ci, tree->rf_blkno,
+                                       &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = __ocfs2_decrease_refcount(handle, &tree->rf_ci, ref_root_bh,
+                                       cpos, len, meta_ac, dealloc, delete);
+       if (ret)
+               mlog_errno(ret);
+out:
+       brelse(ref_root_bh);
+       return ret;
+}
+
+/*
+ * Mark the already-existing extent at cpos as refcounted for len clusters.
+ * This adds the refcount extent flag.
+ *
+ * If the existing extent is larger than the request, initiate a
+ * split. An attempt will be made at merging with adjacent extents.
+ *
+ * The caller is responsible for passing down meta_ac if we'll need it.
+ */
+static int ocfs2_mark_extent_refcounted(struct inode *inode,
+                               struct ocfs2_extent_tree *et,
+                               handle_t *handle, u32 cpos,
+                               u32 len, u32 phys,
+                               struct ocfs2_alloc_context *meta_ac,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret;
+
+       mlog(0, "Inode %lu refcount tree cpos %u, len %u, phys cluster %u\n",
+            inode->i_ino, cpos, len, phys);
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {
+               ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "
+                           "tree, but the feature bit is not set in the "
+                           "super block.", inode->i_ino);
+               ret = -EROFS;
+               goto out;
+       }
+
+       ret = ocfs2_change_extent_flag(handle, et, cpos,
+                                      len, phys, meta_ac, dealloc,
+                                      OCFS2_EXT_REFCOUNTED, 0);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       return ret;
+}
+
+/*
+ * Given some contiguous physical clusters, calculate what we need
+ * for modifying their refcount.
+ */
+static int ocfs2_calc_refcount_meta_credits(struct super_block *sb,
+                                           struct ocfs2_caching_info *ci,
+                                           struct buffer_head *ref_root_bh,
+                                           u64 start_cpos,
+                                           u32 clusters,
+                                           int *meta_add,
+                                           int *credits)
+{
+       int ret = 0, index, ref_blocks = 0, recs_add = 0;
+       u64 cpos = start_cpos;
+       struct ocfs2_refcount_block *rb;
+       struct ocfs2_refcount_rec rec;
+       struct buffer_head *ref_leaf_bh = NULL, *prev_bh = NULL;
+       u32 len;
+
+       mlog(0, "start_cpos %llu, clusters %u\n",
+            (unsigned long long)start_cpos, clusters);
+       while (clusters) {
+               ret = ocfs2_get_refcount_rec(ci, ref_root_bh,
+                                            cpos, clusters, &rec,
+                                            &index, &ref_leaf_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               if (ref_leaf_bh != prev_bh) {
+                       /*
+                        * Now we encounter a new leaf block, so calculate
+                        * whether we need to extend the old leaf.
+                        */
+                       if (prev_bh) {
+                               rb = (struct ocfs2_refcount_block *)
+                                                       prev_bh->b_data;
+
+                               if (le64_to_cpu(rb->rf_records.rl_used) +
+                                   recs_add >
+                                   le16_to_cpu(rb->rf_records.rl_count))
+                                       ref_blocks++;
+                       }
+
+                       recs_add = 0;
+                       *credits += 1;
+                       brelse(prev_bh);
+                       prev_bh = ref_leaf_bh;
+                       get_bh(prev_bh);
+               }
+
+               rb = (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+
+               mlog(0, "recs_add %d,cpos %llu, clusters %u, rec->r_cpos %llu,"
+                    "rec->r_clusters %u, rec->r_refcount %u, index %d\n",
+                    recs_add, (unsigned long long)cpos, clusters,
+                    (unsigned long long)le64_to_cpu(rec.r_cpos),
+                    le32_to_cpu(rec.r_clusters),
+                    le32_to_cpu(rec.r_refcount), index);
+
+               len = min((u64)cpos + clusters, le64_to_cpu(rec.r_cpos) +
+                         le32_to_cpu(rec.r_clusters)) - cpos;
+               /*
+                * If the refcount rec already exist, cool. We just need
+                * to check whether there is a split. Otherwise we just need
+                * to increase the refcount.
+                * If we will insert one, increases recs_add.
+                *
+                * We record all the records which will be inserted to the
+                * same refcount block, so that we can tell exactly whether
+                * we need a new refcount block or not.
+                */
+               if (rec.r_refcount) {
+                       /* Check whether we need a split at the beginning. */
+                       if (cpos == start_cpos &&
+                           cpos != le64_to_cpu(rec.r_cpos))
+                               recs_add++;
+
+                       /* Check whether we need a split in the end. */
+                       if (cpos + clusters < le64_to_cpu(rec.r_cpos) +
+                           le32_to_cpu(rec.r_clusters))
+                               recs_add++;
+               } else
+                       recs_add++;
+
+               brelse(ref_leaf_bh);
+               ref_leaf_bh = NULL;
+               clusters -= len;
+               cpos += len;
+       }
+
+       if (prev_bh) {
+               rb = (struct ocfs2_refcount_block *)prev_bh->b_data;
+
+               if (le64_to_cpu(rb->rf_records.rl_used) + recs_add >
+                   le16_to_cpu(rb->rf_records.rl_count))
+                       ref_blocks++;
+
+               *credits += 1;
+       }
+
+       if (!ref_blocks)
+               goto out;
+
+       mlog(0, "we need ref_blocks %d\n", ref_blocks);
+       *meta_add += ref_blocks;
+       *credits += ref_blocks;
+
+       /*
+        * So we may need ref_blocks to insert into the tree.
+        * That also means we need to change the b-tree and add that number
+        * of records since we never merge them.
+        * We need one more block for expansion since the new created leaf
+        * block is also full and needs split.
+        */
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       if (le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL) {
+               struct ocfs2_extent_tree et;
+
+               ocfs2_init_refcount_extent_tree(&et, ci, ref_root_bh);
+               *meta_add += ocfs2_extend_meta_needed(et.et_root_el);
+               *credits += ocfs2_calc_extend_credits(sb,
+                                                     et.et_root_el,
+                                                     ref_blocks);
+       } else {
+               *credits += OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
+               *meta_add += 1;
+       }
+
+out:
+       brelse(ref_leaf_bh);
+       brelse(prev_bh);
+       return ret;
+}
+
+/*
+ * For refcount tree, we will decrease some contiguous clusters
+ * refcount count, so just go through it to see how many blocks
+ * we gonna touch and whether we need to create new blocks.
+ *
+ * Normally the refcount blocks store these refcount should be
+ * continguous also, so that we can get the number easily.
+ * As for meta_ac, we will at most add split 2 refcount record and
+ * 2 more refcount block, so just check it in a rough way.
+ *
+ * Caller must hold refcount tree lock.
+ */
+int ocfs2_prepare_refcount_change_for_del(struct inode *inode,
+                                         struct buffer_head *di_bh,
+                                         u64 phys_blkno,
+                                         u32 clusters,
+                                         int *credits,
+                                         struct ocfs2_alloc_context **meta_ac)
+{
+       int ret, ref_blocks = 0;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_tree *tree;
+       u64 start_cpos = ocfs2_blocks_to_clusters(inode->i_sb, phys_blkno);
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {
+               ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "
+                           "tree, but the feature bit is not set in the "
+                           "super block.", inode->i_ino);
+               ret = -EROFS;
+               goto out;
+       }
+
+       BUG_ON(!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL));
+
+       ret = ocfs2_get_refcount_tree(OCFS2_SB(inode->i_sb),
+                                     le64_to_cpu(di->i_refcount_loc), &tree);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_read_refcount_block(&tree->rf_ci,
+                                       le64_to_cpu(di->i_refcount_loc),
+                                       &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_calc_refcount_meta_credits(inode->i_sb,
+                                              &tree->rf_ci,
+                                              ref_root_bh,
+                                              start_cpos, clusters,
+                                              &ref_blocks, credits);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "reserve new metadata %d, credits = %d\n",
+            ref_blocks, *credits);
+
+       if (ref_blocks) {
+               ret = ocfs2_reserve_new_metadata_blocks(OCFS2_SB(inode->i_sb),
+                                                       ref_blocks, meta_ac);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out:
+       brelse(ref_root_bh);
+       return ret;
+}
+
+#define        MAX_CONTIG_BYTES        1048576
+
+static inline unsigned int ocfs2_cow_contig_clusters(struct super_block *sb)
+{
+       return ocfs2_clusters_for_bytes(sb, MAX_CONTIG_BYTES);
+}
+
+static inline unsigned int ocfs2_cow_contig_mask(struct super_block *sb)
+{
+       return ~(ocfs2_cow_contig_clusters(sb) - 1);
+}
+
+/*
+ * Given an extent that starts at 'start' and an I/O that starts at 'cpos',
+ * find an offset (start + (n * contig_clusters)) that is closest to cpos
+ * while still being less than or equal to it.
+ *
+ * The goal is to break the extent at a multiple of contig_clusters.
+ */
+static inline unsigned int ocfs2_cow_align_start(struct super_block *sb,
+                                                unsigned int start,
+                                                unsigned int cpos)
+{
+       BUG_ON(start > cpos);
+
+       return start + ((cpos - start) & ocfs2_cow_contig_mask(sb));
+}
+
+/*
+ * Given a cluster count of len, pad it out so that it is a multiple
+ * of contig_clusters.
+ */
+static inline unsigned int ocfs2_cow_align_length(struct super_block *sb,
+                                                 unsigned int len)
+{
+       unsigned int padded =
+               (len + (ocfs2_cow_contig_clusters(sb) - 1)) &
+               ocfs2_cow_contig_mask(sb);
+
+       /* Did we wrap? */
+       if (padded < len)
+               padded = UINT_MAX;
+
+       return padded;
+}
+
+/*
+ * Calculate out the start and number of virtual clusters we need to to CoW.
+ *
+ * cpos is vitual start cluster position we want to do CoW in a
+ * file and write_len is the cluster length.
+ * max_cpos is the place where we want to stop CoW intentionally.
+ *
+ * Normal we will start CoW from the beginning of extent record cotaining cpos.
+ * We try to break up extents on boundaries of MAX_CONTIG_BYTES so that we
+ * get good I/O from the resulting extent tree.
+ */
+static int ocfs2_refcount_cal_cow_clusters(struct inode *inode,
+                                          struct ocfs2_extent_list *el,
+                                          u32 cpos,
+                                          u32 write_len,
+                                          u32 max_cpos,
+                                          u32 *cow_start,
+                                          u32 *cow_len)
+{
+       int ret = 0;
+       int tree_height = le16_to_cpu(el->l_tree_depth), i;
+       struct buffer_head *eb_bh = NULL;
+       struct ocfs2_extent_block *eb = NULL;
+       struct ocfs2_extent_rec *rec;
+       unsigned int want_clusters, rec_end = 0;
+       int contig_clusters = ocfs2_cow_contig_clusters(inode->i_sb);
+       int leaf_clusters;
+
+       BUG_ON(cpos + write_len > max_cpos);
+
+       if (tree_height > 0) {
+               ret = ocfs2_find_leaf(INODE_CACHE(inode), el, cpos, &eb_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               eb = (struct ocfs2_extent_block *) eb_bh->b_data;
+               el = &eb->h_list;
+
+               if (el->l_tree_depth) {
+                       ocfs2_error(inode->i_sb,
+                                   "Inode %lu has non zero tree depth in "
+                                   "leaf block %llu\n", inode->i_ino,
+                                   (unsigned long long)eb_bh->b_blocknr);
+                       ret = -EROFS;
+                       goto out;
+               }
+       }
+
+       *cow_len = 0;
+       for (i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) {
+               rec = &el->l_recs[i];
+
+               if (ocfs2_is_empty_extent(rec)) {
+                       mlog_bug_on_msg(i != 0, "Inode %lu has empty record in "
+                                       "index %d\n", inode->i_ino, i);
+                       continue;
+               }
+
+               if (le32_to_cpu(rec->e_cpos) +
+                   le16_to_cpu(rec->e_leaf_clusters) <= cpos)
+                       continue;
+
+               if (*cow_len == 0) {
+                       /*
+                        * We should find a refcounted record in the
+                        * first pass.
+                        */
+                       BUG_ON(!(rec->e_flags & OCFS2_EXT_REFCOUNTED));
+                       *cow_start = le32_to_cpu(rec->e_cpos);
+               }
+
+               /*
+                * If we encounter a hole, a non-refcounted record or
+                * pass the max_cpos, stop the search.
+                */
+               if ((!(rec->e_flags & OCFS2_EXT_REFCOUNTED)) ||
+                   (*cow_len && rec_end != le32_to_cpu(rec->e_cpos)) ||
+                   (max_cpos <= le32_to_cpu(rec->e_cpos)))
+                       break;
+
+               leaf_clusters = le16_to_cpu(rec->e_leaf_clusters);
+               rec_end = le32_to_cpu(rec->e_cpos) + leaf_clusters;
+               if (rec_end > max_cpos) {
+                       rec_end = max_cpos;
+                       leaf_clusters = rec_end - le32_to_cpu(rec->e_cpos);
+               }
+
+               /*
+                * How many clusters do we actually need from
+                * this extent?  First we see how many we actually
+                * need to complete the write.  If that's smaller
+                * than contig_clusters, we try for contig_clusters.
+                */
+               if (!*cow_len)
+                       want_clusters = write_len;
+               else
+                       want_clusters = (cpos + write_len) -
+                               (*cow_start + *cow_len);
+               if (want_clusters < contig_clusters)
+                       want_clusters = contig_clusters;
+
+               /*
+                * If the write does not cover the whole extent, we
+                * need to calculate how we're going to split the extent.
+                * We try to do it on contig_clusters boundaries.
+                *
+                * Any extent smaller than contig_clusters will be
+                * CoWed in its entirety.
+                */
+               if (leaf_clusters <= contig_clusters)
+                       *cow_len += leaf_clusters;
+               else if (*cow_len || (*cow_start == cpos)) {
+                       /*
+                        * This extent needs to be CoW'd from its
+                        * beginning, so all we have to do is compute
+                        * how many clusters to grab.  We align
+                        * want_clusters to the edge of contig_clusters
+                        * to get better I/O.
+                        */
+                       want_clusters = ocfs2_cow_align_length(inode->i_sb,
+                                                              want_clusters);
+
+                       if (leaf_clusters < want_clusters)
+                               *cow_len += leaf_clusters;
+                       else
+                               *cow_len += want_clusters;
+               } else if ((*cow_start + contig_clusters) >=
+                          (cpos + write_len)) {
+                       /*
+                        * Breaking off contig_clusters at the front
+                        * of the extent will cover our write.  That's
+                        * easy.
+                        */
+                       *cow_len = contig_clusters;
+               } else if ((rec_end - cpos) <= contig_clusters) {
+                       /*
+                        * Breaking off contig_clusters at the tail of
+                        * this extent will cover cpos.
+                        */
+                       *cow_start = rec_end - contig_clusters;
+                       *cow_len = contig_clusters;
+               } else if ((rec_end - cpos) <= want_clusters) {
+                       /*
+                        * While we can't fit the entire write in this
+                        * extent, we know that the write goes from cpos
+                        * to the end of the extent.  Break that off.
+                        * We try to break it at some multiple of
+                        * contig_clusters from the front of the extent.
+                        * Failing that (ie, cpos is within
+                        * contig_clusters of the front), we'll CoW the
+                        * entire extent.
+                        */
+                       *cow_start = ocfs2_cow_align_start(inode->i_sb,
+                                                          *cow_start, cpos);
+                       *cow_len = rec_end - *cow_start;
+               } else {
+                       /*
+                        * Ok, the entire write lives in the middle of
+                        * this extent.  Let's try to slice the extent up
+                        * nicely.  Optimally, our CoW region starts at
+                        * m*contig_clusters from the beginning of the
+                        * extent and goes for n*contig_clusters,
+                        * covering the entire write.
+                        */
+                       *cow_start = ocfs2_cow_align_start(inode->i_sb,
+                                                          *cow_start, cpos);
+
+                       want_clusters = (cpos + write_len) - *cow_start;
+                       want_clusters = ocfs2_cow_align_length(inode->i_sb,
+                                                              want_clusters);
+                       if (*cow_start + want_clusters <= rec_end)
+                               *cow_len = want_clusters;
+                       else
+                               *cow_len = rec_end - *cow_start;
+               }
+
+               /* Have we covered our entire write yet? */
+               if ((*cow_start + *cow_len) >= (cpos + write_len))
+                       break;
+
+               /*
+                * If we reach the end of the extent block and don't get enough
+                * clusters, continue with the next extent block if possible.
+                */
+               if (i + 1 == le16_to_cpu(el->l_next_free_rec) &&
+                   eb && eb->h_next_leaf_blk) {
+                       brelse(eb_bh);
+                       eb_bh = NULL;
+
+                       ret = ocfs2_read_extent_block(INODE_CACHE(inode),
+                                              le64_to_cpu(eb->h_next_leaf_blk),
+                                              &eb_bh);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+
+                       eb = (struct ocfs2_extent_block *) eb_bh->b_data;
+                       el = &eb->h_list;
+                       i = -1;
+               }
+       }
+
+out:
+       brelse(eb_bh);
+       return ret;
+}
+
+/*
+ * Prepare meta_ac, data_ac and calculate credits when we want to add some
+ * num_clusters in data_tree "et" and change the refcount for the old
+ * clusters(starting form p_cluster) in the refcount tree.
+ *
+ * Note:
+ * 1. since we may split the old tree, so we at most will need num_clusters + 2
+ *    more new leaf records.
+ * 2. In some case, we may not need to reserve new clusters(e.g, reflink), so
+ *    just give data_ac = NULL.
+ */
+static int ocfs2_lock_refcount_allocators(struct super_block *sb,
+                                       u32 p_cluster, u32 num_clusters,
+                                       struct ocfs2_extent_tree *et,
+                                       struct ocfs2_caching_info *ref_ci,
+                                       struct buffer_head *ref_root_bh,
+                                       struct ocfs2_alloc_context **meta_ac,
+                                       struct ocfs2_alloc_context **data_ac,
+                                       int *credits)
+{
+       int ret = 0, meta_add = 0;
+       int num_free_extents = ocfs2_num_free_extents(OCFS2_SB(sb), et);
+
+       if (num_free_extents < 0) {
+               ret = num_free_extents;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (num_free_extents < num_clusters + 2)
+               meta_add =
+                       ocfs2_extend_meta_needed(et->et_root_el);
+
+       *credits += ocfs2_calc_extend_credits(sb, et->et_root_el,
+                                             num_clusters + 2);
+
+       ret = ocfs2_calc_refcount_meta_credits(sb, ref_ci, ref_root_bh,
+                                              p_cluster, num_clusters,
+                                              &meta_add, credits);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "reserve new metadata %d, clusters %u, credits = %d\n",
+            meta_add, num_clusters, *credits);
+       ret = ocfs2_reserve_new_metadata_blocks(OCFS2_SB(sb), meta_add,
+                                               meta_ac);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (data_ac) {
+               ret = ocfs2_reserve_clusters(OCFS2_SB(sb), num_clusters,
+                                            data_ac);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out:
+       if (ret) {
+               if (*meta_ac) {
+                       ocfs2_free_alloc_context(*meta_ac);
+                       *meta_ac = NULL;
+               }
+       }
+
+       return ret;
+}
+
+static int ocfs2_clear_cow_buffer(handle_t *handle, struct buffer_head *bh)
+{
+       BUG_ON(buffer_dirty(bh));
+
+       clear_buffer_mapped(bh);
+
+       return 0;
+}
+
+static int ocfs2_duplicate_clusters_by_page(handle_t *handle,
+                                           struct ocfs2_cow_context *context,
+                                           u32 cpos, u32 old_cluster,
+                                           u32 new_cluster, u32 new_len)
+{
+       int ret = 0, partial;
+       struct ocfs2_caching_info *ci = context->data_et.et_ci;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster);
+       struct page *page;
+       pgoff_t page_index;
+       unsigned int from, to;
+       loff_t offset, end, map_end;
+       struct address_space *mapping = context->inode->i_mapping;
+
+       mlog(0, "old_cluster %u, new %u, len %u at offset %u\n", old_cluster,
+            new_cluster, new_len, cpos);
+
+       offset = ((loff_t)cpos) << OCFS2_SB(sb)->s_clustersize_bits;
+       end = offset + (new_len << OCFS2_SB(sb)->s_clustersize_bits);
+
+       while (offset < end) {
+               page_index = offset >> PAGE_CACHE_SHIFT;
+               map_end = (page_index + 1) << PAGE_CACHE_SHIFT;
+               if (map_end > end)
+                       map_end = end;
+
+               /* from, to is the offset within the page. */
+               from = offset & (PAGE_CACHE_SIZE - 1);
+               to = PAGE_CACHE_SIZE;
+               if (map_end & (PAGE_CACHE_SIZE - 1))
+                       to = map_end & (PAGE_CACHE_SIZE - 1);
+
+               page = grab_cache_page(mapping, page_index);
+
+               /* This page can't be dirtied before we CoW it out. */
+               BUG_ON(PageDirty(page));
+
+               if (!PageUptodate(page)) {
+                       ret = block_read_full_page(page, ocfs2_get_block);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto unlock;
+                       }
+                       lock_page(page);
+               }
+
+               if (page_has_buffers(page)) {
+                       ret = walk_page_buffers(handle, page_buffers(page),
+                                               from, to, &partial,
+                                               ocfs2_clear_cow_buffer);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto unlock;
+                       }
+               }
+
+               ocfs2_map_and_dirty_page(context->inode,
+                                        handle, from, to,
+                                        page, 0, &new_block);
+               mark_page_accessed(page);
+unlock:
+               unlock_page(page);
+               page_cache_release(page);
+               page = NULL;
+               offset = map_end;
+               if (ret)
+                       break;
+       }
+
+       return ret;
+}
+
+static int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
+                                          struct ocfs2_cow_context *context,
+                                          u32 cpos, u32 old_cluster,
+                                          u32 new_cluster, u32 new_len)
+{
+       int ret = 0;
+       struct super_block *sb = context->inode->i_sb;
+       struct ocfs2_caching_info *ci = context->data_et.et_ci;
+       int i, blocks = ocfs2_clusters_to_blocks(sb, new_len);
+       u64 old_block = ocfs2_clusters_to_blocks(sb, old_cluster);
+       u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster);
+       struct ocfs2_super *osb = OCFS2_SB(sb);
+       struct buffer_head *old_bh = NULL;
+       struct buffer_head *new_bh = NULL;
+
+       mlog(0, "old_cluster %u, new %u, len %u\n", old_cluster,
+            new_cluster, new_len);
+
+       for (i = 0; i < blocks; i++, old_block++, new_block++) {
+               new_bh = sb_getblk(osb->sb, new_block);
+               if (new_bh == NULL) {
+                       ret = -EIO;
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ocfs2_set_new_buffer_uptodate(ci, new_bh);
+
+               ret = ocfs2_read_block(ci, old_block, &old_bh, NULL);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ret = ocfs2_journal_access(handle, ci, new_bh,
+                                          OCFS2_JOURNAL_ACCESS_CREATE);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               memcpy(new_bh->b_data, old_bh->b_data, sb->s_blocksize);
+               ret = ocfs2_journal_dirty(handle, new_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               brelse(new_bh);
+               brelse(old_bh);
+               new_bh = NULL;
+               old_bh = NULL;
+       }
+
+       brelse(new_bh);
+       brelse(old_bh);
+       return ret;
+}
+
+static int ocfs2_clear_ext_refcount(handle_t *handle,
+                                   struct ocfs2_extent_tree *et,
+                                   u32 cpos, u32 p_cluster, u32 len,
+                                   unsigned int ext_flags,
+                                   struct ocfs2_alloc_context *meta_ac,
+                                   struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret, index;
+       struct ocfs2_extent_rec replace_rec;
+       struct ocfs2_path *path = NULL;
+       struct ocfs2_extent_list *el;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
+       u64 ino = ocfs2_metadata_cache_owner(et->et_ci);
+
+       mlog(0, "inode %llu cpos %u, len %u, p_cluster %u, ext_flags %u\n",
+            (unsigned long long)ino, cpos, len, p_cluster, ext_flags);
+
+       memset(&replace_rec, 0, sizeof(replace_rec));
+       replace_rec.e_cpos = cpu_to_le32(cpos);
+       replace_rec.e_leaf_clusters = cpu_to_le16(len);
+       replace_rec.e_blkno = cpu_to_le64(ocfs2_clusters_to_blocks(sb,
+                                                                  p_cluster));
+       replace_rec.e_flags = ext_flags;
+       replace_rec.e_flags &= ~OCFS2_EXT_REFCOUNTED;
+
+       path = ocfs2_new_path_from_et(et);
+       if (!path) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_find_path(et->et_ci, path, cpos);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       el = path_leaf_el(path);
+
+       index = ocfs2_search_extent_list(el, cpos);
+       if (index == -1 || index >= le16_to_cpu(el->l_next_free_rec)) {
+               ocfs2_error(sb,
+                           "Inode %llu has an extent at cpos %u which can no "
+                           "longer be found.\n",
+                           (unsigned long long)ino, cpos);
+               ret = -EROFS;
+               goto out;
+       }
+
+       ret = ocfs2_split_extent(handle, et, path, index,
+                                &replace_rec, meta_ac, dealloc);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       ocfs2_free_path(path);
+       return ret;
+}
+
+static int ocfs2_replace_clusters(handle_t *handle,
+                                 struct ocfs2_cow_context *context,
+                                 u32 cpos, u32 old,
+                                 u32 new, u32 len,
+                                 unsigned int ext_flags)
+{
+       int ret;
+       struct ocfs2_caching_info *ci = context->data_et.et_ci;
+       u64 ino = ocfs2_metadata_cache_owner(ci);
+
+       mlog(0, "inode %llu, cpos %u, old %u, new %u, len %u, ext_flags %u\n",
+            (unsigned long long)ino, cpos, old, new, len, ext_flags);
+
+       /*If the old clusters is unwritten, no need to duplicate. */
+       if (!(ext_flags & OCFS2_EXT_UNWRITTEN)) {
+               ret = context->cow_duplicate_clusters(handle, context, cpos,
+                                                     old, new, len);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
+       ret = ocfs2_clear_ext_refcount(handle, &context->data_et,
+                                      cpos, new, len, ext_flags,
+                                      context->meta_ac, &context->dealloc);
+       if (ret)
+               mlog_errno(ret);
+out:
+       return ret;
+}
+
+static int ocfs2_cow_sync_writeback(struct super_block *sb,
+                                   struct ocfs2_cow_context *context,
+                                   u32 cpos, u32 num_clusters)
+{
+       int ret = 0;
+       loff_t offset, end, map_end;
+       pgoff_t page_index;
+       struct page *page;
+
+       if (ocfs2_should_order_data(context->inode))
+               return 0;
+
+       offset = ((loff_t)cpos) << OCFS2_SB(sb)->s_clustersize_bits;
+       end = offset + (num_clusters << OCFS2_SB(sb)->s_clustersize_bits);
+
+       ret = filemap_fdatawrite_range(context->inode->i_mapping,
+                                      offset, end - 1);
+       if (ret < 0) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       while (offset < end) {
+               page_index = offset >> PAGE_CACHE_SHIFT;
+               map_end = (page_index + 1) << PAGE_CACHE_SHIFT;
+               if (map_end > end)
+                       map_end = end;
+
+               page = grab_cache_page(context->inode->i_mapping, page_index);
+               BUG_ON(!page);
+
+               wait_on_page_writeback(page);
+               if (PageError(page)) {
+                       ret = -EIO;
+                       mlog_errno(ret);
+               } else
+                       mark_page_accessed(page);
+
+               unlock_page(page);
+               page_cache_release(page);
+               page = NULL;
+               offset = map_end;
+               if (ret)
+                       break;
+       }
+
+       return ret;
+}
+
+static int ocfs2_di_get_clusters(struct ocfs2_cow_context *context,
+                                u32 v_cluster, u32 *p_cluster,
+                                u32 *num_clusters,
+                                unsigned int *extent_flags)
+{
+       return ocfs2_get_clusters(context->inode, v_cluster, p_cluster,
+                                 num_clusters, extent_flags);
+}
+
+static int ocfs2_make_clusters_writable(struct super_block *sb,
+                                       struct ocfs2_cow_context *context,
+                                       u32 cpos, u32 p_cluster,
+                                       u32 num_clusters, unsigned int e_flags)
+{
+       int ret, delete, index, credits =  0;
+       u32 new_bit, new_len;
+       unsigned int set_len;
+       struct ocfs2_super *osb = OCFS2_SB(sb);
+       handle_t *handle;
+       struct buffer_head *ref_leaf_bh = NULL;
+       struct ocfs2_caching_info *ref_ci = &context->ref_tree->rf_ci;
+       struct ocfs2_refcount_rec rec;
+
+       mlog(0, "cpos %u, p_cluster %u, num_clusters %u, e_flags %u\n",
+            cpos, p_cluster, num_clusters, e_flags);
+
+       ret = ocfs2_lock_refcount_allocators(sb, p_cluster, num_clusters,
+                                            &context->data_et,
+                                            ref_ci,
+                                            context->ref_root_bh,
+                                            &context->meta_ac,
+                                            &context->data_ac, &credits);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       if (context->post_refcount)
+               credits += context->post_refcount->credits;
+
+       credits += context->extra_credits;
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       while (num_clusters) {
+               ret = ocfs2_get_refcount_rec(ref_ci, context->ref_root_bh,
+                                            p_cluster, num_clusters,
+                                            &rec, &index, &ref_leaf_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_commit;
+               }
+
+               BUG_ON(!rec.r_refcount);
+               set_len = min((u64)p_cluster + num_clusters,
+                             le64_to_cpu(rec.r_cpos) +
+                             le32_to_cpu(rec.r_clusters)) - p_cluster;
+
+               /*
+                * There are many different situation here.
+                * 1. If refcount == 1, remove the flag and don't COW.
+                * 2. If refcount > 1, allocate clusters.
+                *    Here we may not allocate r_len once at a time, so continue
+                *    until we reach num_clusters.
+                */
+               if (le32_to_cpu(rec.r_refcount) == 1) {
+                       delete = 0;
+                       ret = ocfs2_clear_ext_refcount(handle,
+                                                      &context->data_et,
+                                                      cpos, p_cluster,
+                                                      set_len, e_flags,
+                                                      context->meta_ac,
+                                                      &context->dealloc);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out_commit;
+                       }
+               } else {
+                       delete = 1;
+
+                       ret = __ocfs2_claim_clusters(osb, handle,
+                                                    context->data_ac,
+                                                    1, set_len,
+                                                    &new_bit, &new_len);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out_commit;
+                       }
+
+                       ret = ocfs2_replace_clusters(handle, context,
+                                                    cpos, p_cluster, new_bit,
+                                                    new_len, e_flags);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out_commit;
+                       }
+                       set_len = new_len;
+               }
+
+               ret = __ocfs2_decrease_refcount(handle, ref_ci,
+                                               context->ref_root_bh,
+                                               p_cluster, set_len,
+                                               context->meta_ac,
+                                               &context->dealloc, delete);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_commit;
+               }
+
+               cpos += set_len;
+               p_cluster += set_len;
+               num_clusters -= set_len;
+               brelse(ref_leaf_bh);
+               ref_leaf_bh = NULL;
+       }
+
+       /* handle any post_cow action. */
+       if (context->post_refcount && context->post_refcount->func) {
+               ret = context->post_refcount->func(context->inode, handle,
+                                               context->post_refcount->para);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_commit;
+               }
+       }
+
+       /*
+        * Here we should write the new page out first if we are
+        * in write-back mode.
+        */
+       if (context->get_clusters == ocfs2_di_get_clusters) {
+               ret = ocfs2_cow_sync_writeback(sb, context, cpos, num_clusters);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+
+out:
+       if (context->data_ac) {
+               ocfs2_free_alloc_context(context->data_ac);
+               context->data_ac = NULL;
+       }
+       if (context->meta_ac) {
+               ocfs2_free_alloc_context(context->meta_ac);
+               context->meta_ac = NULL;
+       }
+       brelse(ref_leaf_bh);
+
+       return ret;
+}
+
+static int ocfs2_replace_cow(struct ocfs2_cow_context *context)
+{
+       int ret = 0;
+       struct inode *inode = context->inode;
+       u32 cow_start = context->cow_start, cow_len = context->cow_len;
+       u32 p_cluster, num_clusters;
+       unsigned int ext_flags;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {
+               ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "
+                           "tree, but the feature bit is not set in the "
+                           "super block.", inode->i_ino);
+               return -EROFS;
+       }
+
+       ocfs2_init_dealloc_ctxt(&context->dealloc);
+
+       while (cow_len) {
+               ret = context->get_clusters(context, cow_start, &p_cluster,
+                                           &num_clusters, &ext_flags);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               BUG_ON(!(ext_flags & OCFS2_EXT_REFCOUNTED));
+
+               if (cow_len < num_clusters)
+                       num_clusters = cow_len;
+
+               ret = ocfs2_make_clusters_writable(inode->i_sb, context,
+                                                  cow_start, p_cluster,
+                                                  num_clusters, ext_flags);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               cow_len -= num_clusters;
+               cow_start += num_clusters;
+       }
+
+       if (ocfs2_dealloc_has_cluster(&context->dealloc)) {
+               ocfs2_schedule_truncate_log_flush(osb, 1);
+               ocfs2_run_deallocs(osb, &context->dealloc);
+       }
+
+       return ret;
+}
+
+/*
+ * Starting at cpos, try to CoW write_len clusters.  Don't CoW
+ * past max_cpos.  This will stop when it runs into a hole or an
+ * unrefcounted extent.
+ */
+static int ocfs2_refcount_cow_hunk(struct inode *inode,
+                                  struct buffer_head *di_bh,
+                                  u32 cpos, u32 write_len, u32 max_cpos)
+{
+       int ret;
+       u32 cow_start = 0, cow_len = 0;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_refcount_tree *ref_tree;
+       struct ocfs2_cow_context *context = NULL;
+
+       BUG_ON(!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL));
+
+       ret = ocfs2_refcount_cal_cow_clusters(inode, &di->id2.i_list,
+                                             cpos, write_len, max_cpos,
+                                             &cow_start, &cow_len);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "CoW inode %lu, cpos %u, write_len %u, cow_start %u, "
+            "cow_len %u\n", inode->i_ino,
+            cpos, write_len, cow_start, cow_len);
+
+       BUG_ON(cow_len == 0);
+
+       context = kzalloc(sizeof(struct ocfs2_cow_context), GFP_NOFS);
+       if (!context) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_lock_refcount_tree(osb, le64_to_cpu(di->i_refcount_loc),
+                                      1, &ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       context->inode = inode;
+       context->cow_start = cow_start;
+       context->cow_len = cow_len;
+       context->ref_tree = ref_tree;
+       context->ref_root_bh = ref_root_bh;
+       context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_page;
+       context->get_clusters = ocfs2_di_get_clusters;
+
+       ocfs2_init_dinode_extent_tree(&context->data_et,
+                                     INODE_CACHE(inode), di_bh);
+
+       ret = ocfs2_replace_cow(context);
+       if (ret)
+               mlog_errno(ret);
+
+       /*
+        * truncate the extent map here since no matter whether we meet with
+        * any error during the action, we shouldn't trust cached extent map
+        * any more.
+        */
+       ocfs2_extent_map_trunc(inode, cow_start);
+
+       ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+       brelse(ref_root_bh);
+out:
+       kfree(context);
+       return ret;
+}
+
+/*
+ * CoW any and all clusters between cpos and cpos+write_len.
+ * Don't CoW past max_cpos.  If this returns successfully, all
+ * clusters between cpos and cpos+write_len are safe to modify.
+ */
+int ocfs2_refcount_cow(struct inode *inode,
+                      struct buffer_head *di_bh,
+                      u32 cpos, u32 write_len, u32 max_cpos)
+{
+       int ret = 0;
+       u32 p_cluster, num_clusters;
+       unsigned int ext_flags;
+
+       while (write_len) {
+               ret = ocfs2_get_clusters(inode, cpos, &p_cluster,
+                                        &num_clusters, &ext_flags);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               if (write_len < num_clusters)
+                       num_clusters = write_len;
+
+               if (ext_flags & OCFS2_EXT_REFCOUNTED) {
+                       ret = ocfs2_refcount_cow_hunk(inode, di_bh, cpos,
+                                                     num_clusters, max_cpos);
+                       if (ret) {
+                               mlog_errno(ret);
+                               break;
+                       }
+               }
+
+               write_len -= num_clusters;
+               cpos += num_clusters;
+       }
+
+       return ret;
+}
+
+static int ocfs2_xattr_value_get_clusters(struct ocfs2_cow_context *context,
+                                         u32 v_cluster, u32 *p_cluster,
+                                         u32 *num_clusters,
+                                         unsigned int *extent_flags)
+{
+       struct inode *inode = context->inode;
+       struct ocfs2_xattr_value_root *xv = context->cow_object;
+
+       return ocfs2_xattr_get_clusters(inode, v_cluster, p_cluster,
+                                       num_clusters, &xv->xr_list,
+                                       extent_flags);
+}
+
+/*
+ * Given a xattr value root, calculate the most meta/credits we need for
+ * refcount tree change if we truncate it to 0.
+ */
+int ocfs2_refcounted_xattr_delete_need(struct inode *inode,
+                                      struct ocfs2_caching_info *ref_ci,
+                                      struct buffer_head *ref_root_bh,
+                                      struct ocfs2_xattr_value_root *xv,
+                                      int *meta_add, int *credits)
+{
+       int ret = 0, index, ref_blocks = 0;
+       u32 p_cluster, num_clusters;
+       u32 cpos = 0, clusters = le32_to_cpu(xv->xr_clusters);
+       struct ocfs2_refcount_block *rb;
+       struct ocfs2_refcount_rec rec;
+       struct buffer_head *ref_leaf_bh = NULL;
+
+       while (cpos < clusters) {
+               ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
+                                              &num_clusters, &xv->xr_list,
+                                              NULL);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+
+               cpos += num_clusters;
+
+               while (num_clusters) {
+                       ret = ocfs2_get_refcount_rec(ref_ci, ref_root_bh,
+                                                    p_cluster, num_clusters,
+                                                    &rec, &index,
+                                                    &ref_leaf_bh);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+
+                       BUG_ON(!rec.r_refcount);
+
+                       rb = (struct ocfs2_refcount_block *)ref_leaf_bh->b_data;
+
+                       /*
+                        * We really don't know whether the other clusters is in
+                        * this refcount block or not, so just take the worst
+                        * case that all the clusters are in this block and each
+                        * one will split a refcount rec, so totally we need
+                        * clusters * 2 new refcount rec.
+                        */
+                       if (le64_to_cpu(rb->rf_records.rl_used) + clusters * 2 >
+                           le16_to_cpu(rb->rf_records.rl_count))
+                               ref_blocks++;
+
+                       *credits += 1;
+                       brelse(ref_leaf_bh);
+                       ref_leaf_bh = NULL;
+
+                       if (num_clusters <= le32_to_cpu(rec.r_clusters))
+                               break;
+                       else
+                               num_clusters -= le32_to_cpu(rec.r_clusters);
+                       p_cluster += num_clusters;
+               }
+       }
+
+       *meta_add += ref_blocks;
+       if (!ref_blocks)
+               goto out;
+
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+       if (le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL)
+               *credits += OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
+       else {
+               struct ocfs2_extent_tree et;
+
+               ocfs2_init_refcount_extent_tree(&et, ref_ci, ref_root_bh);
+               *credits += ocfs2_calc_extend_credits(inode->i_sb,
+                                                     et.et_root_el,
+                                                     ref_blocks);
+       }
+
+out:
+       brelse(ref_leaf_bh);
+       return ret;
+}
+
+/*
+ * Do CoW for xattr.
+ */
+int ocfs2_refcount_cow_xattr(struct inode *inode,
+                            struct ocfs2_dinode *di,
+                            struct ocfs2_xattr_value_buf *vb,
+                            struct ocfs2_refcount_tree *ref_tree,
+                            struct buffer_head *ref_root_bh,
+                            u32 cpos, u32 write_len,
+                            struct ocfs2_post_refcount *post)
+{
+       int ret;
+       struct ocfs2_xattr_value_root *xv = vb->vb_xv;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_cow_context *context = NULL;
+       u32 cow_start, cow_len;
+
+       BUG_ON(!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL));
+
+       ret = ocfs2_refcount_cal_cow_clusters(inode, &xv->xr_list,
+                                             cpos, write_len, UINT_MAX,
+                                             &cow_start, &cow_len);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       BUG_ON(cow_len == 0);
+
+       context = kzalloc(sizeof(struct ocfs2_cow_context), GFP_NOFS);
+       if (!context) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       context->inode = inode;
+       context->cow_start = cow_start;
+       context->cow_len = cow_len;
+       context->ref_tree = ref_tree;
+       context->ref_root_bh = ref_root_bh;;
+       context->cow_object = xv;
+
+       context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd;
+       /* We need the extra credits for duplicate_clusters by jbd. */
+       context->extra_credits =
+               ocfs2_clusters_to_blocks(inode->i_sb, 1) * cow_len;
+       context->get_clusters = ocfs2_xattr_value_get_clusters;
+       context->post_refcount = post;
+
+       ocfs2_init_xattr_value_extent_tree(&context->data_et,
+                                          INODE_CACHE(inode), vb);
+
+       ret = ocfs2_replace_cow(context);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       kfree(context);
+       return ret;
+}
+
+/*
+ * Insert a new extent into refcount tree and mark a extent rec
+ * as refcounted in the dinode tree.
+ */
+int ocfs2_add_refcount_flag(struct inode *inode,
+                           struct ocfs2_extent_tree *data_et,
+                           struct ocfs2_caching_info *ref_ci,
+                           struct buffer_head *ref_root_bh,
+                           u32 cpos, u32 p_cluster, u32 num_clusters,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc,
+                           struct ocfs2_post_refcount *post)
+{
+       int ret;
+       handle_t *handle;
+       int credits = 1, ref_blocks = 0;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_alloc_context *meta_ac = NULL;
+
+       ret = ocfs2_calc_refcount_meta_credits(inode->i_sb,
+                                              ref_ci, ref_root_bh,
+                                              p_cluster, num_clusters,
+                                              &ref_blocks, &credits);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "reserve new metadata %d, credits = %d\n",
+            ref_blocks, credits);
+
+       if (ref_blocks) {
+               ret = ocfs2_reserve_new_metadata_blocks(OCFS2_SB(inode->i_sb),
+                                                       ref_blocks, &meta_ac);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
+       if (post)
+               credits += post->credits;
+
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_mark_extent_refcounted(inode, data_et, handle,
+                                          cpos, num_clusters, p_cluster,
+                                          meta_ac, dealloc);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ret = __ocfs2_increase_refcount(handle, ref_ci, ref_root_bh,
+                                       p_cluster, num_clusters, 0,
+                                       meta_ac, dealloc);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       if (post && post->func) {
+               ret = post->func(inode, handle, post->para);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+out:
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+       return ret;
+}
+
+static int ocfs2_change_ctime(struct inode *inode,
+                             struct buffer_head *di_bh)
+{
+       int ret;
+       handle_t *handle;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+
+       handle = ocfs2_start_trans(OCFS2_SB(inode->i_sb),
+                                  OCFS2_INODE_UPDATE_CREDITS);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       inode->i_ctime = CURRENT_TIME;
+       di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
+       di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
+
+       ocfs2_journal_dirty(handle, di_bh);
+
+out_commit:
+       ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
+out:
+       return ret;
+}
+
+static int ocfs2_attach_refcount_tree(struct inode *inode,
+                                     struct buffer_head *di_bh)
+{
+       int ret, data_changed = 0;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_refcount_tree *ref_tree;
+       unsigned int ext_flags;
+       loff_t size;
+       u32 cpos, num_clusters, clusters, p_cluster;
+       struct ocfs2_cached_dealloc_ctxt dealloc;
+       struct ocfs2_extent_tree di_et;
+
+       ocfs2_init_dealloc_ctxt(&dealloc);
+
+       if (!(oi->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL)) {
+               ret = ocfs2_create_refcount_tree(inode, di_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
+       BUG_ON(!di->i_refcount_loc);
+       ret = ocfs2_lock_refcount_tree(osb,
+                                      le64_to_cpu(di->i_refcount_loc), 1,
+                                      &ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ocfs2_init_dinode_extent_tree(&di_et, INODE_CACHE(inode), di_bh);
+
+       size = i_size_read(inode);
+       clusters = ocfs2_clusters_for_bytes(inode->i_sb, size);
+
+       cpos = 0;
+       while (cpos < clusters) {
+               ret = ocfs2_get_clusters(inode, cpos, &p_cluster,
+                                        &num_clusters, &ext_flags);
+
+               if (p_cluster && !(ext_flags & OCFS2_EXT_REFCOUNTED)) {
+                       ret = ocfs2_add_refcount_flag(inode, &di_et,
+                                                     &ref_tree->rf_ci,
+                                                     ref_root_bh, cpos,
+                                                     p_cluster, num_clusters,
+                                                     &dealloc, NULL);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto unlock;
+                       }
+
+                       data_changed = 1;
+               }
+               cpos += num_clusters;
+       }
+
+       if (oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
+               ret = ocfs2_xattr_attach_refcount_tree(inode, di_bh,
+                                                      &ref_tree->rf_ci,
+                                                      ref_root_bh,
+                                                      &dealloc);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto unlock;
+               }
+       }
+
+       if (data_changed) {
+               ret = ocfs2_change_ctime(inode, di_bh);
+               if (ret)
+                       mlog_errno(ret);
+       }
+
+unlock:
+       ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+       brelse(ref_root_bh);
+
+       if (!ret && ocfs2_dealloc_has_cluster(&dealloc)) {
+               ocfs2_schedule_truncate_log_flush(osb, 1);
+               ocfs2_run_deallocs(osb, &dealloc);
+       }
+out:
+       /*
+        * Empty the extent map so that we may get the right extent
+        * record from the disk.
+        */
+       ocfs2_extent_map_trunc(inode, 0);
+
+       return ret;
+}
+
+static int ocfs2_add_refcounted_extent(struct inode *inode,
+                                  struct ocfs2_extent_tree *et,
+                                  struct ocfs2_caching_info *ref_ci,
+                                  struct buffer_head *ref_root_bh,
+                                  u32 cpos, u32 p_cluster, u32 num_clusters,
+                                  unsigned int ext_flags,
+                                  struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret;
+       handle_t *handle;
+       int credits = 0;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_alloc_context *meta_ac = NULL;
+
+       ret = ocfs2_lock_refcount_allocators(inode->i_sb,
+                                            p_cluster, num_clusters,
+                                            et, ref_ci,
+                                            ref_root_bh, &meta_ac,
+                                            NULL, &credits);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_insert_extent(handle, et, cpos,
+                       cpu_to_le64(ocfs2_clusters_to_blocks(inode->i_sb,
+                                                            p_cluster)),
+                       num_clusters, ext_flags, meta_ac);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ret = ocfs2_increase_refcount(handle, ref_ci, ref_root_bh,
+                                     p_cluster, num_clusters,
+                                     meta_ac, dealloc);
+       if (ret)
+               mlog_errno(ret);
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+out:
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+       return ret;
+}
+
+static int ocfs2_duplicate_extent_list(struct inode *s_inode,
+                               struct inode *t_inode,
+                               struct buffer_head *t_bh,
+                               struct ocfs2_caching_info *ref_ci,
+                               struct buffer_head *ref_root_bh,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret = 0;
+       u32 p_cluster, num_clusters, clusters, cpos;
+       loff_t size;
+       unsigned int ext_flags;
+       struct ocfs2_extent_tree et;
+
+       ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(t_inode), t_bh);
+
+       size = i_size_read(s_inode);
+       clusters = ocfs2_clusters_for_bytes(s_inode->i_sb, size);
+
+       cpos = 0;
+       while (cpos < clusters) {
+               ret = ocfs2_get_clusters(s_inode, cpos, &p_cluster,
+                                        &num_clusters, &ext_flags);
+
+               if (p_cluster) {
+                       ret = ocfs2_add_refcounted_extent(t_inode, &et,
+                                                         ref_ci, ref_root_bh,
+                                                         cpos, p_cluster,
+                                                         num_clusters,
+                                                         ext_flags,
+                                                         dealloc);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+               }
+
+               cpos += num_clusters;
+       }
+
+out:
+       return ret;
+}
+
+/*
+ * change the new file's attributes to the src.
+ *
+ * reflink creates a snapshot of a file, that means the attributes
+ * must be identical except for three exceptions - nlink, ino, and ctime.
+ */
+static int ocfs2_complete_reflink(struct inode *s_inode,
+                                 struct buffer_head *s_bh,
+                                 struct inode *t_inode,
+                                 struct buffer_head *t_bh,
+                                 bool preserve)
+{
+       int ret;
+       handle_t *handle;
+       struct ocfs2_dinode *s_di = (struct ocfs2_dinode *)s_bh->b_data;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)t_bh->b_data;
+       loff_t size = i_size_read(s_inode);
+
+       handle = ocfs2_start_trans(OCFS2_SB(t_inode->i_sb),
+                                  OCFS2_INODE_UPDATE_CREDITS);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               return ret;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(t_inode), t_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       spin_lock(&OCFS2_I(t_inode)->ip_lock);
+       OCFS2_I(t_inode)->ip_clusters = OCFS2_I(s_inode)->ip_clusters;
+       OCFS2_I(t_inode)->ip_attr = OCFS2_I(s_inode)->ip_attr;
+       OCFS2_I(t_inode)->ip_dyn_features = OCFS2_I(s_inode)->ip_dyn_features;
+       spin_unlock(&OCFS2_I(t_inode)->ip_lock);
+       i_size_write(t_inode, size);
+
+       di->i_xattr_inline_size = s_di->i_xattr_inline_size;
+       di->i_clusters = s_di->i_clusters;
+       di->i_size = s_di->i_size;
+       di->i_dyn_features = s_di->i_dyn_features;
+       di->i_attr = s_di->i_attr;
+
+       if (preserve) {
+               di->i_uid = s_di->i_uid;
+               di->i_gid = s_di->i_gid;
+               di->i_mode = s_di->i_mode;
+
+               /*
+                * update time.
+                * we want mtime to appear identical to the source and
+                * update ctime.
+                */
+               t_inode->i_ctime = CURRENT_TIME;
+
+               di->i_ctime = cpu_to_le64(t_inode->i_ctime.tv_sec);
+               di->i_ctime_nsec = cpu_to_le32(t_inode->i_ctime.tv_nsec);
+
+               t_inode->i_mtime = s_inode->i_mtime;
+               di->i_mtime = s_di->i_mtime;
+               di->i_mtime_nsec = s_di->i_mtime_nsec;
+       }
+
+       ocfs2_journal_dirty(handle, t_bh);
+
+out_commit:
+       ocfs2_commit_trans(OCFS2_SB(t_inode->i_sb), handle);
+       return ret;
+}
+
+static int ocfs2_create_reflink_node(struct inode *s_inode,
+                                    struct buffer_head *s_bh,
+                                    struct inode *t_inode,
+                                    struct buffer_head *t_bh,
+                                    bool preserve)
+{
+       int ret;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_cached_dealloc_ctxt dealloc;
+       struct ocfs2_super *osb = OCFS2_SB(s_inode->i_sb);
+       struct ocfs2_refcount_block *rb;
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)s_bh->b_data;
+       struct ocfs2_refcount_tree *ref_tree;
+
+       ocfs2_init_dealloc_ctxt(&dealloc);
+
+       ret = ocfs2_set_refcount_tree(t_inode, t_bh,
+                                     le64_to_cpu(di->i_refcount_loc));
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_lock_refcount_tree(osb, le64_to_cpu(di->i_refcount_loc),
+                                      1, &ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+       rb = (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+
+       ret = ocfs2_duplicate_extent_list(s_inode, t_inode, t_bh,
+                                         &ref_tree->rf_ci, ref_root_bh,
+                                         &dealloc);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_unlock_refcount;
+       }
+
+       ret = ocfs2_complete_reflink(s_inode, s_bh, t_inode, t_bh, preserve);
+       if (ret)
+               mlog_errno(ret);
+
+out_unlock_refcount:
+       ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
+       brelse(ref_root_bh);
+out:
+       if (ocfs2_dealloc_has_cluster(&dealloc)) {
+               ocfs2_schedule_truncate_log_flush(osb, 1);
+               ocfs2_run_deallocs(osb, &dealloc);
+       }
+
+       return ret;
+}
+
+static int __ocfs2_reflink(struct dentry *old_dentry,
+                          struct buffer_head *old_bh,
+                          struct inode *new_inode,
+                          bool preserve)
+{
+       int ret;
+       struct inode *inode = old_dentry->d_inode;
+       struct buffer_head *new_bh = NULL;
+
+       ret = filemap_fdatawrite(inode->i_mapping);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_attach_refcount_tree(inode, old_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mutex_lock(&new_inode->i_mutex);
+       ret = ocfs2_inode_lock(new_inode, &new_bh, 1);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_unlock;
+       }
+
+       ret = ocfs2_create_reflink_node(inode, old_bh,
+                                       new_inode, new_bh, preserve);
+       if (ret) {
+               mlog_errno(ret);
+               goto inode_unlock;
+       }
+
+       if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
+               ret = ocfs2_reflink_xattrs(inode, old_bh,
+                                          new_inode, new_bh,
+                                          preserve);
+               if (ret)
+                       mlog_errno(ret);
+       }
+inode_unlock:
+       ocfs2_inode_unlock(new_inode, 1);
+       brelse(new_bh);
+out_unlock:
+       mutex_unlock(&new_inode->i_mutex);
+out:
+       if (!ret) {
+               ret = filemap_fdatawait(inode->i_mapping);
+               if (ret)
+                       mlog_errno(ret);
+       }
+       return ret;
+}
+
+static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
+                        struct dentry *new_dentry, bool preserve)
+{
+       int error;
+       struct inode *inode = old_dentry->d_inode;
+       struct buffer_head *old_bh = NULL;
+       struct inode *new_orphan_inode = NULL;
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb)))
+               return -EOPNOTSUPP;
+
+       error = ocfs2_create_inode_in_orphan(dir, inode->i_mode,
+                                            &new_orphan_inode);
+       if (error) {
+               mlog_errno(error);
+               goto out;
+       }
+
+       error = ocfs2_inode_lock(inode, &old_bh, 1);
+       if (error) {
+               mlog_errno(error);
+               goto out;
+       }
+
+       down_write(&OCFS2_I(inode)->ip_xattr_sem);
+       down_write(&OCFS2_I(inode)->ip_alloc_sem);
+       error = __ocfs2_reflink(old_dentry, old_bh,
+                               new_orphan_inode, preserve);
+       up_write(&OCFS2_I(inode)->ip_alloc_sem);
+       up_write(&OCFS2_I(inode)->ip_xattr_sem);
+
+       ocfs2_inode_unlock(inode, 1);
+       brelse(old_bh);
+
+       if (error) {
+               mlog_errno(error);
+               goto out;
+       }
+
+       /* If the security isn't preserved, we need to re-initialize them. */
+       if (!preserve) {
+               error = ocfs2_init_security_and_acl(dir, new_orphan_inode);
+               if (error)
+                       mlog_errno(error);
+       }
+out:
+       if (!error) {
+               error = ocfs2_mv_orphaned_inode_to_new(dir, new_orphan_inode,
+                                                      new_dentry);
+               if (error)
+                       mlog_errno(error);
+       }
+
+       if (new_orphan_inode) {
+               /*
+                * We need to open_unlock the inode no matter whether we
+                * succeed or not, so that other nodes can delete it later.
+                */
+               ocfs2_open_unlock(new_orphan_inode);
+               if (error)
+                       iput(new_orphan_inode);
+       }
+
+       return error;
+}
+
+/*
+ * Below here are the bits used by OCFS2_IOC_REFLINK() to fake
+ * sys_reflink().  This will go away when vfs_reflink() exists in
+ * fs/namei.c.
+ */
+
+/* copied from may_create in VFS. */
+static inline int ocfs2_may_create(struct inode *dir, struct dentry *child)
+{
+       if (child->d_inode)
+               return -EEXIST;
+       if (IS_DEADDIR(dir))
+               return -ENOENT;
+       return inode_permission(dir, MAY_WRITE | MAY_EXEC);
+}
+
+/* copied from user_path_parent. */
+static int ocfs2_user_path_parent(const char __user *path,
+                                 struct nameidata *nd, char **name)
+{
+       char *s = getname(path);
+       int error;
+
+       if (IS_ERR(s))
+               return PTR_ERR(s);
+
+       error = path_lookup(s, LOOKUP_PARENT, nd);
+       if (error)
+               putname(s);
+       else
+               *name = s;
+
+       return error;
+}
+
+/**
+ * ocfs2_vfs_reflink - Create a reference-counted link
+ *
+ * @old_dentry:        source dentry + inode
+ * @dir:       directory to create the target
+ * @new_dentry:        target dentry
+ * @preserve:  if true, preserve all file attributes
+ */
+int ocfs2_vfs_reflink(struct dentry *old_dentry, struct inode *dir,
+                     struct dentry *new_dentry, bool preserve)
+{
+       struct inode *inode = old_dentry->d_inode;
+       int error;
+
+       if (!inode)
+               return -ENOENT;
+
+       error = ocfs2_may_create(dir, new_dentry);
+       if (error)
+               return error;
+
+       if (dir->i_sb != inode->i_sb)
+               return -EXDEV;
+
+       /*
+        * A reflink to an append-only or immutable file cannot be created.
+        */
+       if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+               return -EPERM;
+
+       /* Only regular files can be reflinked. */
+       if (!S_ISREG(inode->i_mode))
+               return -EPERM;
+
+       /*
+        * If the caller wants to preserve ownership, they require the
+        * rights to do so.
+        */
+       if (preserve) {
+               if ((current_fsuid() != inode->i_uid) && !capable(CAP_CHOWN))
+                       return -EPERM;
+               if (!in_group_p(inode->i_gid) && !capable(CAP_CHOWN))
+                       return -EPERM;
+       }
+
+       /*
+        * If the caller is modifying any aspect of the attributes, they
+        * are not creating a snapshot.  They need read permission on the
+        * file.
+        */
+       if (!preserve) {
+               error = inode_permission(inode, MAY_READ);
+               if (error)
+                       return error;
+       }
+
+       mutex_lock(&inode->i_mutex);
+       vfs_dq_init(dir);
+       error = ocfs2_reflink(old_dentry, dir, new_dentry, preserve);
+       mutex_unlock(&inode->i_mutex);
+       if (!error)
+               fsnotify_create(dir, new_dentry);
+       return error;
+}
+/*
+ * Most codes are copied from sys_linkat.
+ */
+int ocfs2_reflink_ioctl(struct inode *inode,
+                       const char __user *oldname,
+                       const char __user *newname,
+                       bool preserve)
+{
+       struct dentry *new_dentry;
+       struct nameidata nd;
+       struct path old_path;
+       int error;
+       char *to = NULL;
+
+       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb)))
+               return -EOPNOTSUPP;
+
+       error = user_path_at(AT_FDCWD, oldname, 0, &old_path);
+       if (error) {
+               mlog_errno(error);
+               return error;
+       }
+
+       error = ocfs2_user_path_parent(newname, &nd, &to);
+       if (error) {
+               mlog_errno(error);
+               goto out;
+       }
+
+       error = -EXDEV;
+       if (old_path.mnt != nd.path.mnt)
+               goto out_release;
+       new_dentry = lookup_create(&nd, 0);
+       error = PTR_ERR(new_dentry);
+       if (IS_ERR(new_dentry)) {
+               mlog_errno(error);
+               goto out_unlock;
+       }
+
+       error = mnt_want_write(nd.path.mnt);
+       if (error) {
+               mlog_errno(error);
+               goto out_dput;
+       }
+
+       error = ocfs2_vfs_reflink(old_path.dentry,
+                                 nd.path.dentry->d_inode,
+                                 new_dentry, preserve);
+       mnt_drop_write(nd.path.mnt);
+out_dput:
+       dput(new_dentry);
+out_unlock:
+       mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
+out_release:
+       path_put(&nd.path);
+       putname(to);
+out:
+       path_put(&old_path);
+
+       return error;
+}
diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h
new file mode 100644 (file)
index 0000000..c1d19b1
--- /dev/null
@@ -0,0 +1,106 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * refcounttree.h
+ *
+ * Copyright (C) 2009 Oracle.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+#ifndef OCFS2_REFCOUNTTREE_H
+#define OCFS2_REFCOUNTTREE_H
+
+struct ocfs2_refcount_tree {
+       struct rb_node rf_node;
+       u64 rf_blkno;
+       u32 rf_generation;
+       struct rw_semaphore rf_sem;
+       struct ocfs2_lock_res rf_lockres;
+       struct kref rf_getcnt;
+       int rf_removed;
+
+       /* the following 4 fields are used by caching_info. */
+       struct ocfs2_caching_info rf_ci;
+       spinlock_t rf_lock;
+       struct mutex rf_io_mutex;
+       struct super_block *rf_sb;
+};
+
+void ocfs2_purge_refcount_trees(struct ocfs2_super *osb);
+int ocfs2_lock_refcount_tree(struct ocfs2_super *osb, u64 ref_blkno, int rw,
+                            struct ocfs2_refcount_tree **tree,
+                            struct buffer_head **ref_bh);
+void ocfs2_unlock_refcount_tree(struct ocfs2_super *osb,
+                               struct ocfs2_refcount_tree *tree,
+                               int rw);
+
+int ocfs2_decrease_refcount(struct inode *inode,
+                           handle_t *handle, u32 cpos, u32 len,
+                           struct ocfs2_alloc_context *meta_ac,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc,
+                           int delete);
+int ocfs2_prepare_refcount_change_for_del(struct inode *inode,
+                                         struct buffer_head *di_bh,
+                                         u64 phys_blkno,
+                                         u32 clusters,
+                                         int *credits,
+                                         struct ocfs2_alloc_context **meta_ac);
+int ocfs2_refcount_cow(struct inode *inode, struct buffer_head *di_bh,
+                      u32 cpos, u32 write_len, u32 max_cpos);
+
+typedef int (ocfs2_post_refcount_func)(struct inode *inode,
+                                      handle_t *handle,
+                                      void *para);
+/*
+ * Some refcount caller need to do more work after we modify the data b-tree
+ * during refcount operation(including CoW and add refcount flag), and make the
+ * transaction complete. So it must give us this structure so that we can do it
+ * within our transaction.
+ *
+ */
+struct ocfs2_post_refcount {
+       int credits;                    /* credits it need for journal. */
+       ocfs2_post_refcount_func *func; /* real function. */
+       void *para;
+};
+
+int ocfs2_refcounted_xattr_delete_need(struct inode *inode,
+                                      struct ocfs2_caching_info *ref_ci,
+                                      struct buffer_head *ref_root_bh,
+                                      struct ocfs2_xattr_value_root *xv,
+                                      int *meta_add, int *credits);
+int ocfs2_refcount_cow_xattr(struct inode *inode,
+                            struct ocfs2_dinode *di,
+                            struct ocfs2_xattr_value_buf *vb,
+                            struct ocfs2_refcount_tree *ref_tree,
+                            struct buffer_head *ref_root_bh,
+                            u32 cpos, u32 write_len,
+                            struct ocfs2_post_refcount *post);
+int ocfs2_add_refcount_flag(struct inode *inode,
+                           struct ocfs2_extent_tree *data_et,
+                           struct ocfs2_caching_info *ref_ci,
+                           struct buffer_head *ref_root_bh,
+                           u32 cpos, u32 p_cluster, u32 num_clusters,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc,
+                           struct ocfs2_post_refcount *post);
+int ocfs2_remove_refcount_tree(struct inode *inode, struct buffer_head *di_bh);
+int ocfs2_try_remove_refcount_tree(struct inode *inode,
+                                  struct buffer_head *di_bh);
+int ocfs2_increase_refcount(handle_t *handle,
+                           struct ocfs2_caching_info *ci,
+                           struct buffer_head *ref_root_bh,
+                           u64 cpos, u32 len,
+                           struct ocfs2_alloc_context *meta_ac,
+                           struct ocfs2_cached_dealloc_ctxt *dealloc);
+int ocfs2_reflink_ioctl(struct inode *inode,
+                       const char __user *oldname,
+                       const char __user *newname,
+                       bool preserve);
+#endif /* OCFS2_REFCOUNTTREE_H */
index 424adaa..3c3d673 100644 (file)
@@ -106,8 +106,8 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,
        mlog_entry("(new_clusters=%d, first_new_cluster = %u)\n",
                   new_clusters, first_new_cluster);
 
-       ret = ocfs2_journal_access_gd(handle, bm_inode, group_bh,
-                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_gd(handle, INODE_CACHE(bm_inode),
+                                     group_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out;
@@ -141,7 +141,7 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,
        }
 
        /* update the inode accordingly. */
-       ret = ocfs2_journal_access_di(handle, bm_inode, bm_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(bm_inode), bm_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
@@ -514,7 +514,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
                goto out_unlock;
        }
 
-       ocfs2_set_new_buffer_uptodate(inode, group_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), group_bh);
 
        ret = ocfs2_verify_group_and_input(main_bm_inode, fe, input, group_bh);
        if (ret) {
@@ -536,8 +536,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
        cl = &fe->id2.i_chain;
        cr = &cl->cl_recs[input->chain];
 
-       ret = ocfs2_journal_access_gd(handle, main_bm_inode, group_bh,
-                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_gd(handle, INODE_CACHE(main_bm_inode),
+                                     group_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_commit;
@@ -552,8 +552,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
                goto out_commit;
        }
 
-       ret = ocfs2_journal_access_di(handle, main_bm_inode, main_bm_bh,
-                                     OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(main_bm_inode),
+                                     main_bm_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_commit;
index 40661e7..bfbd7e9 100644 (file)
@@ -150,8 +150,8 @@ int ocfs2_refresh_slot_info(struct ocfs2_super *osb)
         * be !NULL.  Thus, ocfs2_read_blocks() will ignore blocknr.  If
         * this is not true, the read of -1 (UINT64_MAX) will fail.
         */
-       ret = ocfs2_read_blocks(si->si_inode, -1, si->si_blocks, si->si_bh,
-                               OCFS2_BH_IGNORE_CACHE, NULL);
+       ret = ocfs2_read_blocks(INODE_CACHE(si->si_inode), -1, si->si_blocks,
+                               si->si_bh, OCFS2_BH_IGNORE_CACHE, NULL);
        if (ret == 0) {
                spin_lock(&osb->osb_lock);
                ocfs2_update_slot_info(si);
@@ -213,7 +213,7 @@ static int ocfs2_update_disk_slot(struct ocfs2_super *osb,
                ocfs2_update_disk_slot_old(si, slot_num, &bh);
        spin_unlock(&osb->osb_lock);
 
-       status = ocfs2_write_block(osb, bh, si->si_inode);
+       status = ocfs2_write_block(osb, bh, INODE_CACHE(si->si_inode));
        if (status < 0)
                mlog_errno(status);
 
@@ -404,8 +404,8 @@ static int ocfs2_map_slot_buffers(struct ocfs2_super *osb,
                     (unsigned long long)blkno);
 
                bh = NULL;  /* Acquire a fresh bh */
-               status = ocfs2_read_blocks(si->si_inode, blkno, 1, &bh,
-                                          OCFS2_BH_IGNORE_CACHE, NULL);
+               status = ocfs2_read_blocks(INODE_CACHE(si->si_inode), blkno,
+                                          1, &bh, OCFS2_BH_IGNORE_CACHE, NULL);
                if (status < 0) {
                        mlog_errno(status);
                        goto bail;
index 73a16d4..c30b644 100644 (file)
@@ -310,7 +310,7 @@ int ocfs2_read_group_descriptor(struct inode *inode, struct ocfs2_dinode *di,
        int rc;
        struct buffer_head *tmp = *bh;
 
-       rc = ocfs2_read_block(inode, gd_blkno, &tmp,
+       rc = ocfs2_read_block(INODE_CACHE(inode), gd_blkno, &tmp,
                              ocfs2_validate_group_descriptor);
        if (rc)
                goto out;
@@ -352,7 +352,7 @@ static int ocfs2_block_group_fill(handle_t *handle,
        }
 
        status = ocfs2_journal_access_gd(handle,
-                                        alloc_inode,
+                                        INODE_CACHE(alloc_inode),
                                         bg_bh,
                                         OCFS2_JOURNAL_ACCESS_CREATE);
        if (status < 0) {
@@ -476,7 +476,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
                mlog_errno(status);
                goto bail;
        }
-       ocfs2_set_new_buffer_uptodate(alloc_inode, bg_bh);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(alloc_inode), bg_bh);
 
        status = ocfs2_block_group_fill(handle,
                                        alloc_inode,
@@ -491,7 +491,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
 
        bg = (struct ocfs2_group_desc *) bg_bh->b_data;
 
-       status = ocfs2_journal_access_di(handle, alloc_inode,
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(alloc_inode),
                                         bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1033,7 +1033,7 @@ static inline int ocfs2_block_group_set_bits(handle_t *handle,
                journal_type = OCFS2_JOURNAL_ACCESS_UNDO;
 
        status = ocfs2_journal_access_gd(handle,
-                                        alloc_inode,
+                                        INODE_CACHE(alloc_inode),
                                         group_bh,
                                         journal_type);
        if (status < 0) {
@@ -1106,7 +1106,8 @@ static int ocfs2_relink_block_group(handle_t *handle,
        bg_ptr = le64_to_cpu(bg->bg_next_group);
        prev_bg_ptr = le64_to_cpu(prev_bg->bg_next_group);
 
-       status = ocfs2_journal_access_gd(handle, alloc_inode, prev_bg_bh,
+       status = ocfs2_journal_access_gd(handle, INODE_CACHE(alloc_inode),
+                                        prev_bg_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -1121,8 +1122,8 @@ static int ocfs2_relink_block_group(handle_t *handle,
                goto out_rollback;
        }
 
-       status = ocfs2_journal_access_gd(handle, alloc_inode, bg_bh,
-                                        OCFS2_JOURNAL_ACCESS_WRITE);
+       status = ocfs2_journal_access_gd(handle, INODE_CACHE(alloc_inode),
+                                        bg_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto out_rollback;
@@ -1136,8 +1137,8 @@ static int ocfs2_relink_block_group(handle_t *handle,
                goto out_rollback;
        }
 
-       status = ocfs2_journal_access_di(handle, alloc_inode, fe_bh,
-                                        OCFS2_JOURNAL_ACCESS_WRITE);
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(alloc_inode),
+                                        fe_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto out_rollback;
@@ -1288,7 +1289,7 @@ static int ocfs2_alloc_dinode_update_counts(struct inode *inode,
        struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data;
        struct ocfs2_chain_list *cl = (struct ocfs2_chain_list *) &di->id2.i_chain;
 
-       ret = ocfs2_journal_access_di(handle, inode, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
@@ -1461,7 +1462,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
        /* Ok, claim our bits now: set the info on dinode, chainlist
         * and then the group */
        status = ocfs2_journal_access_di(handle,
-                                        alloc_inode,
+                                        INODE_CACHE(alloc_inode),
                                         ac->ac_bh,
                                         OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
@@ -1907,8 +1908,8 @@ static inline int ocfs2_block_group_clear_bits(handle_t *handle,
        if (ocfs2_is_cluster_bitmap(alloc_inode))
                journal_type = OCFS2_JOURNAL_ACCESS_UNDO;
 
-       status = ocfs2_journal_access_gd(handle, alloc_inode, group_bh,
-                                        journal_type);
+       status = ocfs2_journal_access_gd(handle, INODE_CACHE(alloc_inode),
+                                        group_bh, journal_type);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
@@ -1993,8 +1994,8 @@ int ocfs2_free_suballoc_bits(handle_t *handle,
                goto bail;
        }
 
-       status = ocfs2_journal_access_di(handle, alloc_inode, alloc_bh,
-                                        OCFS2_JOURNAL_ACCESS_WRITE);
+       status = ocfs2_journal_access_di(handle, INODE_CACHE(alloc_inode),
+                                        alloc_bh, OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
@@ -2151,7 +2152,7 @@ int ocfs2_lock_allocators(struct inode *inode,
 
        BUG_ON(clusters_to_add != 0 && data_ac == NULL);
 
-       num_free_extents = ocfs2_num_free_extents(osb, inode, et);
+       num_free_extents = ocfs2_num_free_extents(osb, et);
        if (num_free_extents < 0) {
                ret = num_free_extents;
                mlog_errno(ret);
index a3f8871..24feb44 100644 (file)
@@ -69,6 +69,7 @@
 #include "ver.h"
 #include "xattr.h"
 #include "quota.h"
+#include "refcounttree.h"
 
 #include "buffer_head_io.h"
 
@@ -965,7 +966,7 @@ static int ocfs2_quota_off(struct super_block *sb, int type, int remount)
        return vfs_quota_disable(sb, type, DQUOT_LIMITS_ENABLED);
 }
 
-static struct quotactl_ops ocfs2_quotactl_ops = {
+static const struct quotactl_ops ocfs2_quotactl_ops = {
        .quota_on       = ocfs2_quota_on,
        .quota_off      = ocfs2_quota_off,
        .quota_sync     = vfs_quota_sync,
@@ -1668,8 +1669,6 @@ static void ocfs2_inode_init_once(void *data)
        spin_lock_init(&oi->ip_lock);
        ocfs2_extent_map_init(&oi->vfs_inode);
        INIT_LIST_HEAD(&oi->ip_io_markers);
-       oi->ip_created_trans = 0;
-       oi->ip_last_trans = 0;
        oi->ip_dir_start_lookup = 0;
 
        init_rwsem(&oi->ip_alloc_sem);
@@ -1683,7 +1682,8 @@ static void ocfs2_inode_init_once(void *data)
        ocfs2_lock_res_init_once(&oi->ip_inode_lockres);
        ocfs2_lock_res_init_once(&oi->ip_open_lockres);
 
-       ocfs2_metadata_cache_init(&oi->vfs_inode);
+       ocfs2_metadata_cache_init(INODE_CACHE(&oi->vfs_inode),
+                                 &ocfs2_inode_caching_ops);
 
        inode_init_once(&oi->vfs_inode);
 }
@@ -1859,6 +1859,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
 
        ocfs2_sync_blockdev(sb);
 
+       ocfs2_purge_refcount_trees(osb);
+
        /* No cluster connection means we've failed during mount, so skip
         * all the steps which depended on that to complete. */
        if (osb->cconn) {
@@ -2065,6 +2067,8 @@ static int ocfs2_initialize_super(struct super_block *sb,
                goto bail;
        }
 
+       osb->osb_rf_lock_tree = RB_ROOT;
+
        osb->s_feature_compat =
                le32_to_cpu(OCFS2_RAW_SB(di)->s_feature_compat);
        osb->s_feature_ro_compat =
@@ -2490,7 +2494,8 @@ void __ocfs2_abort(struct super_block* sb,
        /* Force a panic(). This stinks, but it's better than letting
         * things continue without having a proper hard readonly
         * here. */
-       OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
+       if (!ocfs2_mount_local(OCFS2_SB(sb)))
+               OCFS2_SB(sb)->s_mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
        ocfs2_handle_error(sb);
 }
 
index 187b99f..b6284f2 100644 (file)
@@ -75,15 +75,77 @@ struct ocfs2_meta_cache_item {
 
 static struct kmem_cache *ocfs2_uptodate_cachep = NULL;
 
-void ocfs2_metadata_cache_init(struct inode *inode)
+u64 ocfs2_metadata_cache_owner(struct ocfs2_caching_info *ci)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
+       BUG_ON(!ci || !ci->ci_ops);
 
-       oi->ip_flags |= OCFS2_INODE_CACHE_INLINE;
+       return ci->ci_ops->co_owner(ci);
+}
+
+struct super_block *ocfs2_metadata_cache_get_super(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       return ci->ci_ops->co_get_super(ci);
+}
+
+static void ocfs2_metadata_cache_lock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_cache_lock(ci);
+}
+
+static void ocfs2_metadata_cache_unlock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_cache_unlock(ci);
+}
+
+void ocfs2_metadata_cache_io_lock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_io_lock(ci);
+}
+
+void ocfs2_metadata_cache_io_unlock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_io_unlock(ci);
+}
+
+
+static void ocfs2_metadata_cache_reset(struct ocfs2_caching_info *ci,
+                                      int clear)
+{
+       ci->ci_flags |= OCFS2_CACHE_FL_INLINE;
        ci->ci_num_cached = 0;
+
+       if (clear) {
+               ci->ci_created_trans = 0;
+               ci->ci_last_trans = 0;
+       }
+}
+
+void ocfs2_metadata_cache_init(struct ocfs2_caching_info *ci,
+                              const struct ocfs2_caching_operations *ops)
+{
+       BUG_ON(!ops);
+
+       ci->ci_ops = ops;
+       ocfs2_metadata_cache_reset(ci, 1);
 }
 
+void ocfs2_metadata_cache_exit(struct ocfs2_caching_info *ci)
+{
+       ocfs2_metadata_cache_purge(ci);
+       ocfs2_metadata_cache_reset(ci, 1);
+}
+
+
 /* No lock taken here as 'root' is not expected to be visible to other
  * processes. */
 static unsigned int ocfs2_purge_copied_metadata_tree(struct rb_root *root)
@@ -112,19 +174,20 @@ static unsigned int ocfs2_purge_copied_metadata_tree(struct rb_root *root)
  * This function is a few more lines longer than necessary due to some
  * accounting done here, but I think it's worth tracking down those
  * bugs sooner -- Mark */
-void ocfs2_metadata_cache_purge(struct inode *inode)
+void ocfs2_metadata_cache_purge(struct ocfs2_caching_info *ci)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
        unsigned int tree, to_purge, purged;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
        struct rb_root root = RB_ROOT;
 
-       spin_lock(&oi->ip_lock);
-       tree = !(oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ocfs2_metadata_cache_lock(ci);
+       tree = !(ci->ci_flags & OCFS2_CACHE_FL_INLINE);
        to_purge = ci->ci_num_cached;
 
-       mlog(0, "Purge %u %s items from Inode %llu\n", to_purge,
-            tree ? "array" : "tree", (unsigned long long)oi->ip_blkno);
+       mlog(0, "Purge %u %s items from Owner %llu\n", to_purge,
+            tree ? "array" : "tree",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci));
 
        /* If we're a tree, save off the root so that we can safely
         * initialize the cache. We do the work to free tree members
@@ -132,16 +195,17 @@ void ocfs2_metadata_cache_purge(struct inode *inode)
        if (tree)
                root = ci->ci_cache.ci_tree;
 
-       ocfs2_metadata_cache_init(inode);
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_reset(ci, 0);
+       ocfs2_metadata_cache_unlock(ci);
 
        purged = ocfs2_purge_copied_metadata_tree(&root);
        /* If possible, track the number wiped so that we can more
         * easily detect counting errors. Unfortunately, this is only
         * meaningful for trees. */
        if (tree && purged != to_purge)
-               mlog(ML_ERROR, "Inode %llu, count = %u, purged = %u\n",
-                    (unsigned long long)oi->ip_blkno, to_purge, purged);
+               mlog(ML_ERROR, "Owner %llu, count = %u, purged = %u\n",
+                    (unsigned long long)ocfs2_metadata_cache_owner(ci),
+                    to_purge, purged);
 }
 
 /* Returns the index in the cache array, -1 if not found.
@@ -182,27 +246,25 @@ ocfs2_search_cache_tree(struct ocfs2_caching_info *ci,
        return NULL;
 }
 
-static int ocfs2_buffer_cached(struct ocfs2_inode_info *oi,
+static int ocfs2_buffer_cached(struct ocfs2_caching_info *ci,
                               struct buffer_head *bh)
 {
        int index = -1;
        struct ocfs2_meta_cache_item *item = NULL;
 
-       spin_lock(&oi->ip_lock);
+       ocfs2_metadata_cache_lock(ci);
 
-       mlog(0, "Inode %llu, query block %llu (inline = %u)\n",
-            (unsigned long long)oi->ip_blkno,
+       mlog(0, "Owner %llu, query block %llu (inline = %u)\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
             (unsigned long long) bh->b_blocknr,
-            !!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE));
+            !!(ci->ci_flags & OCFS2_CACHE_FL_INLINE));
 
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE)
-               index = ocfs2_search_cache_array(&oi->ip_metadata_cache,
-                                                bh->b_blocknr);
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE)
+               index = ocfs2_search_cache_array(ci, bh->b_blocknr);
        else
-               item = ocfs2_search_cache_tree(&oi->ip_metadata_cache,
-                                              bh->b_blocknr);
+               item = ocfs2_search_cache_tree(ci, bh->b_blocknr);
 
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
        mlog(0, "index = %d, item = %p\n", index, item);
 
@@ -214,7 +276,7 @@ static int ocfs2_buffer_cached(struct ocfs2_inode_info *oi,
  * 
  * This can be called under lock_buffer()
  */
-int ocfs2_buffer_uptodate(struct inode *inode,
+int ocfs2_buffer_uptodate(struct ocfs2_caching_info *ci,
                          struct buffer_head *bh)
 {
        /* Doesn't matter if the bh is in our cache or not -- if it's
@@ -230,24 +292,24 @@ int ocfs2_buffer_uptodate(struct inode *inode,
 
        /* Ok, locally the buffer is marked as up to date, now search
         * our cache to see if we can trust that. */
-       return ocfs2_buffer_cached(OCFS2_I(inode), bh);
+       return ocfs2_buffer_cached(ci, bh);
 }
 
-/* 
+/*
  * Determine whether a buffer is currently out on a read-ahead request.
- * ip_io_sem should be held to serialize submitters with the logic here.
+ * ci_io_sem should be held to serialize submitters with the logic here.
  */
-int ocfs2_buffer_read_ahead(struct inode *inode,
+int ocfs2_buffer_read_ahead(struct ocfs2_caching_info *ci,
                            struct buffer_head *bh)
 {
-       return buffer_locked(bh) && ocfs2_buffer_cached(OCFS2_I(inode), bh);
+       return buffer_locked(bh) && ocfs2_buffer_cached(ci, bh);
 }
 
 /* Requires ip_lock */
 static void ocfs2_append_cache_array(struct ocfs2_caching_info *ci,
                                     sector_t block)
 {
-       BUG_ON(ci->ci_num_cached >= OCFS2_INODE_MAX_CACHE_ARRAY);
+       BUG_ON(ci->ci_num_cached >= OCFS2_CACHE_INFO_MAX_ARRAY);
 
        mlog(0, "block %llu takes position %u\n", (unsigned long long) block,
             ci->ci_num_cached);
@@ -292,66 +354,64 @@ static void __ocfs2_insert_cache_tree(struct ocfs2_caching_info *ci,
        ci->ci_num_cached++;
 }
 
-static inline int ocfs2_insert_can_use_array(struct ocfs2_inode_info *oi,
-                                            struct ocfs2_caching_info *ci)
+/* co_cache_lock() must be held */
+static inline int ocfs2_insert_can_use_array(struct ocfs2_caching_info *ci)
 {
-       assert_spin_locked(&oi->ip_lock);
-
-       return (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) &&
-               (ci->ci_num_cached < OCFS2_INODE_MAX_CACHE_ARRAY);
+       return (ci->ci_flags & OCFS2_CACHE_FL_INLINE) &&
+               (ci->ci_num_cached < OCFS2_CACHE_INFO_MAX_ARRAY);
 }
 
-/* tree should be exactly OCFS2_INODE_MAX_CACHE_ARRAY wide. NULL the
+/* tree should be exactly OCFS2_CACHE_INFO_MAX_ARRAY wide. NULL the
  * pointers in tree after we use them - this allows caller to detect
- * when to free in case of error. */
-static void ocfs2_expand_cache(struct ocfs2_inode_info *oi,
+ * when to free in case of error.
+ *
+ * The co_cache_lock() must be held. */
+static void ocfs2_expand_cache(struct ocfs2_caching_info *ci,
                               struct ocfs2_meta_cache_item **tree)
 {
        int i;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
-       mlog_bug_on_msg(ci->ci_num_cached != OCFS2_INODE_MAX_CACHE_ARRAY,
-                       "Inode %llu, num cached = %u, should be %u\n",
-                       (unsigned long long)oi->ip_blkno, ci->ci_num_cached,
-                       OCFS2_INODE_MAX_CACHE_ARRAY);
-       mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
-                       "Inode %llu not marked as inline anymore!\n",
-                       (unsigned long long)oi->ip_blkno);
-       assert_spin_locked(&oi->ip_lock);
+       mlog_bug_on_msg(ci->ci_num_cached != OCFS2_CACHE_INFO_MAX_ARRAY,
+                       "Owner %llu, num cached = %u, should be %u\n",
+                       (unsigned long long)ocfs2_metadata_cache_owner(ci),
+                       ci->ci_num_cached, OCFS2_CACHE_INFO_MAX_ARRAY);
+       mlog_bug_on_msg(!(ci->ci_flags & OCFS2_CACHE_FL_INLINE),
+                       "Owner %llu not marked as inline anymore!\n",
+                       (unsigned long long)ocfs2_metadata_cache_owner(ci));
 
        /* Be careful to initialize the tree members *first* because
         * once the ci_tree is used, the array is junk... */
-       for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++)
+       for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++)
                tree[i]->c_block = ci->ci_cache.ci_array[i];
 
-       oi->ip_flags &= ~OCFS2_INODE_CACHE_INLINE;
+       ci->ci_flags &= ~OCFS2_CACHE_FL_INLINE;
        ci->ci_cache.ci_tree = RB_ROOT;
        /* this will be set again by __ocfs2_insert_cache_tree */
        ci->ci_num_cached = 0;
 
-       for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++) {
+       for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++) {
                __ocfs2_insert_cache_tree(ci, tree[i]);
                tree[i] = NULL;
        }
 
        mlog(0, "Expanded %llu to a tree cache: flags 0x%x, num = %u\n",
-            (unsigned long long)oi->ip_blkno, oi->ip_flags, ci->ci_num_cached);
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
+            ci->ci_flags, ci->ci_num_cached);
 }
 
 /* Slow path function - memory allocation is necessary. See the
  * comment above ocfs2_set_buffer_uptodate for more information. */
-static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
+static void __ocfs2_set_buffer_uptodate(struct ocfs2_caching_info *ci,
                                        sector_t block,
                                        int expand_tree)
 {
        int i;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
        struct ocfs2_meta_cache_item *new = NULL;
-       struct ocfs2_meta_cache_item *tree[OCFS2_INODE_MAX_CACHE_ARRAY] =
+       struct ocfs2_meta_cache_item *tree[OCFS2_CACHE_INFO_MAX_ARRAY] =
                { NULL, };
 
-       mlog(0, "Inode %llu, block %llu, expand = %d\n",
-            (unsigned long long)oi->ip_blkno,
+       mlog(0, "Owner %llu, block %llu, expand = %d\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
             (unsigned long long)block, expand_tree);
 
        new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_NOFS);
@@ -364,7 +424,7 @@ static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
        if (expand_tree) {
                /* Do *not* allocate an array here - the removal code
                 * has no way of tracking that. */
-               for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++) {
+               for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++) {
                        tree[i] = kmem_cache_alloc(ocfs2_uptodate_cachep,
                                                   GFP_NOFS);
                        if (!tree[i]) {
@@ -376,21 +436,21 @@ static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
                }
        }
 
-       spin_lock(&oi->ip_lock);
-       if (ocfs2_insert_can_use_array(oi, ci)) {
+       ocfs2_metadata_cache_lock(ci);
+       if (ocfs2_insert_can_use_array(ci)) {
                mlog(0, "Someone cleared the tree underneath us\n");
                /* Ok, items were removed from the cache in between
                 * locks. Detect this and revert back to the fast path */
                ocfs2_append_cache_array(ci, block);
-               spin_unlock(&oi->ip_lock);
+               ocfs2_metadata_cache_unlock(ci);
                goto out_free;
        }
 
        if (expand_tree)
-               ocfs2_expand_cache(oi, tree);
+               ocfs2_expand_cache(ci, tree);
 
        __ocfs2_insert_cache_tree(ci, new);
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
        new = NULL;
 out_free:
@@ -400,14 +460,14 @@ out_free:
        /* If these were used, then ocfs2_expand_cache re-set them to
         * NULL for us. */
        if (tree[0]) {
-               for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++)
+               for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++)
                        if (tree[i])
                                kmem_cache_free(ocfs2_uptodate_cachep,
                                                tree[i]);
        }
 }
 
-/* Item insertion is guarded by ip_io_mutex, so the insertion path takes
+/* Item insertion is guarded by co_io_lock(), so the insertion path takes
  * advantage of this by not rechecking for a duplicate insert during
  * the slow case. Additionally, if the cache needs to be bumped up to
  * a tree, the code will not recheck after acquiring the lock --
@@ -425,59 +485,55 @@ out_free:
  * Readahead buffers can be passed in here before the I/O request is
  * completed.
  */
-void ocfs2_set_buffer_uptodate(struct inode *inode,
+void ocfs2_set_buffer_uptodate(struct ocfs2_caching_info *ci,
                               struct buffer_head *bh)
 {
        int expand;
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
        /* The block may very well exist in our cache already, so avoid
         * doing any more work in that case. */
-       if (ocfs2_buffer_cached(oi, bh))
+       if (ocfs2_buffer_cached(ci, bh))
                return;
 
-       mlog(0, "Inode %llu, inserting block %llu\n",
-            (unsigned long long)oi->ip_blkno,
+       mlog(0, "Owner %llu, inserting block %llu\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
             (unsigned long long)bh->b_blocknr);
 
        /* No need to recheck under spinlock - insertion is guarded by
-        * ip_io_mutex */
-       spin_lock(&oi->ip_lock);
-       if (ocfs2_insert_can_use_array(oi, ci)) {
+        * co_io_lock() */
+       ocfs2_metadata_cache_lock(ci);
+       if (ocfs2_insert_can_use_array(ci)) {
                /* Fast case - it's an array and there's a free
                 * spot. */
                ocfs2_append_cache_array(ci, bh->b_blocknr);
-               spin_unlock(&oi->ip_lock);
+               ocfs2_metadata_cache_unlock(ci);
                return;
        }
 
        expand = 0;
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) {
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE) {
                /* We need to bump things up to a tree. */
                expand = 1;
        }
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
-       __ocfs2_set_buffer_uptodate(oi, bh->b_blocknr, expand);
+       __ocfs2_set_buffer_uptodate(ci, bh->b_blocknr, expand);
 }
 
 /* Called against a newly allocated buffer. Most likely nobody should
  * be able to read this sort of metadata while it's still being
- * allocated, but this is careful to take ip_io_mutex anyway. */
-void ocfs2_set_new_buffer_uptodate(struct inode *inode,
+ * allocated, but this is careful to take co_io_lock() anyway. */
+void ocfs2_set_new_buffer_uptodate(struct ocfs2_caching_info *ci,
                                   struct buffer_head *bh)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-
        /* This should definitely *not* exist in our cache */
-       BUG_ON(ocfs2_buffer_cached(oi, bh));
+       BUG_ON(ocfs2_buffer_cached(ci, bh));
 
        set_buffer_uptodate(bh);
 
-       mutex_lock(&oi->ip_io_mutex);
-       ocfs2_set_buffer_uptodate(inode, bh);
-       mutex_unlock(&oi->ip_io_mutex);
+       ocfs2_metadata_cache_io_lock(ci);
+       ocfs2_set_buffer_uptodate(ci, bh);
+       ocfs2_metadata_cache_io_unlock(ci);
 }
 
 /* Requires ip_lock. */
@@ -487,7 +543,7 @@ static void ocfs2_remove_metadata_array(struct ocfs2_caching_info *ci,
        sector_t *array = ci->ci_cache.ci_array;
        int bytes;
 
-       BUG_ON(index < 0 || index >= OCFS2_INODE_MAX_CACHE_ARRAY);
+       BUG_ON(index < 0 || index >= OCFS2_CACHE_INFO_MAX_ARRAY);
        BUG_ON(index >= ci->ci_num_cached);
        BUG_ON(!ci->ci_num_cached);
 
@@ -515,21 +571,19 @@ static void ocfs2_remove_metadata_tree(struct ocfs2_caching_info *ci,
        ci->ci_num_cached--;
 }
 
-static void ocfs2_remove_block_from_cache(struct inode *inode,
+static void ocfs2_remove_block_from_cache(struct ocfs2_caching_info *ci,
                                          sector_t block)
 {
        int index;
        struct ocfs2_meta_cache_item *item = NULL;
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
-       spin_lock(&oi->ip_lock);
-       mlog(0, "Inode %llu, remove %llu, items = %u, array = %u\n",
-            (unsigned long long)oi->ip_blkno,
+       ocfs2_metadata_cache_lock(ci);
+       mlog(0, "Owner %llu, remove %llu, items = %u, array = %u\n",
+            (unsigned long long)ocfs2_metadata_cache_owner(ci),
             (unsigned long long) block, ci->ci_num_cached,
-            oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
+            ci->ci_flags & OCFS2_CACHE_FL_INLINE);
 
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) {
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE) {
                index = ocfs2_search_cache_array(ci, block);
                if (index != -1)
                        ocfs2_remove_metadata_array(ci, index);
@@ -538,7 +592,7 @@ static void ocfs2_remove_block_from_cache(struct inode *inode,
                if (item)
                        ocfs2_remove_metadata_tree(ci, item);
        }
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
        if (item)
                kmem_cache_free(ocfs2_uptodate_cachep, item);
@@ -549,23 +603,24 @@ static void ocfs2_remove_block_from_cache(struct inode *inode,
  * bother reverting things to an inlined array in the case of a remove
  * which moves us back under the limit.
  */
-void ocfs2_remove_from_cache(struct inode *inode,
+void ocfs2_remove_from_cache(struct ocfs2_caching_info *ci,
                             struct buffer_head *bh)
 {
        sector_t block = bh->b_blocknr;
 
-       ocfs2_remove_block_from_cache(inode, block);
+       ocfs2_remove_block_from_cache(ci, block);
 }
 
 /* Called when we remove xattr clusters from an inode. */
-void ocfs2_remove_xattr_clusters_from_cache(struct inode *inode,
+void ocfs2_remove_xattr_clusters_from_cache(struct ocfs2_caching_info *ci,
                                            sector_t block,
                                            u32 c_len)
 {
-       unsigned int i, b_len = ocfs2_clusters_to_blocks(inode->i_sb, 1) * c_len;
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       unsigned int i, b_len = ocfs2_clusters_to_blocks(sb, 1) * c_len;
 
        for (i = 0; i < b_len; i++, block++)
-               ocfs2_remove_block_from_cache(inode, block);
+               ocfs2_remove_block_from_cache(ci, block);
 }
 
 int __init init_ocfs2_uptodate_cache(void)
@@ -577,7 +632,7 @@ int __init init_ocfs2_uptodate_cache(void)
                return -ENOMEM;
 
        mlog(0, "%u inlined cache items per inode.\n",
-            OCFS2_INODE_MAX_CACHE_ARRAY);
+            OCFS2_CACHE_INFO_MAX_ARRAY);
 
        return 0;
 }
index 531b4b3..0d826fe 100644 (file)
 #ifndef OCFS2_UPTODATE_H
 #define OCFS2_UPTODATE_H
 
+/*
+ * The caching code relies on locking provided by the user of
+ * struct ocfs2_caching_info.  These operations connect that up.
+ */
+struct ocfs2_caching_operations {
+       /*
+        * A u64 representing the owning structure.  Usually this
+        * is the block number (i_blkno or whatnot).  This is used so
+        * that caching log messages can identify the owning structure.
+        */
+       u64     (*co_owner)(struct ocfs2_caching_info *ci);
+
+       /* The superblock is needed during I/O. */
+       struct super_block *(*co_get_super)(struct ocfs2_caching_info *ci);
+       /*
+        * Lock and unlock the caching data.  These will not sleep, and
+        * should probably be spinlocks.
+        */
+       void    (*co_cache_lock)(struct ocfs2_caching_info *ci);
+       void    (*co_cache_unlock)(struct ocfs2_caching_info *ci);
+
+       /*
+        * Lock and unlock for disk I/O.  These will sleep, and should
+        * be mutexes.
+        */
+       void    (*co_io_lock)(struct ocfs2_caching_info *ci);
+       void    (*co_io_unlock)(struct ocfs2_caching_info *ci);
+};
+
 int __init init_ocfs2_uptodate_cache(void);
 void exit_ocfs2_uptodate_cache(void);
 
-void ocfs2_metadata_cache_init(struct inode *inode);
-void ocfs2_metadata_cache_purge(struct inode *inode);
+void ocfs2_metadata_cache_init(struct ocfs2_caching_info *ci,
+                              const struct ocfs2_caching_operations *ops);
+void ocfs2_metadata_cache_purge(struct ocfs2_caching_info *ci);
+void ocfs2_metadata_cache_exit(struct ocfs2_caching_info *ci);
+
+u64 ocfs2_metadata_cache_owner(struct ocfs2_caching_info *ci);
+void ocfs2_metadata_cache_io_lock(struct ocfs2_caching_info *ci);
+void ocfs2_metadata_cache_io_unlock(struct ocfs2_caching_info *ci);
 
-int ocfs2_buffer_uptodate(struct inode *inode,
+int ocfs2_buffer_uptodate(struct ocfs2_caching_info *ci,
                          struct buffer_head *bh);
-void ocfs2_set_buffer_uptodate(struct inode *inode,
+void ocfs2_set_buffer_uptodate(struct ocfs2_caching_info *ci,
                               struct buffer_head *bh);
-void ocfs2_set_new_buffer_uptodate(struct inode *inode,
+void ocfs2_set_new_buffer_uptodate(struct ocfs2_caching_info *ci,
                                   struct buffer_head *bh);
-void ocfs2_remove_from_cache(struct inode *inode,
+void ocfs2_remove_from_cache(struct ocfs2_caching_info *ci,
                             struct buffer_head *bh);
-void ocfs2_remove_xattr_clusters_from_cache(struct inode *inode,
+void ocfs2_remove_xattr_clusters_from_cache(struct ocfs2_caching_info *ci,
                                            sector_t block,
                                            u32 c_len);
-int ocfs2_buffer_read_ahead(struct inode *inode,
+int ocfs2_buffer_read_ahead(struct ocfs2_caching_info *ci,
                            struct buffer_head *bh);
 
 #endif /* OCFS2_UPTODATE_H */
index d1a27cd..fe34190 100644 (file)
@@ -55,7 +55,8 @@
 #include "buffer_head_io.h"
 #include "super.h"
 #include "xattr.h"
-
+#include "refcounttree.h"
+#include "acl.h"
 
 struct ocfs2_xattr_def_value_root {
        struct ocfs2_xattr_value_root   xv;
@@ -140,7 +141,7 @@ struct ocfs2_xattr_search {
        int not_found;
 };
 
-static int ocfs2_xattr_bucket_get_name_value(struct inode *inode,
+static int ocfs2_xattr_bucket_get_name_value(struct super_block *sb,
                                             struct ocfs2_xattr_header *xh,
                                             int index,
                                             int *block_off,
@@ -157,7 +158,7 @@ static int ocfs2_xattr_index_block_find(struct inode *inode,
                                        struct ocfs2_xattr_search *xs);
 
 static int ocfs2_xattr_tree_list_index_block(struct inode *inode,
-                                       struct ocfs2_xattr_tree_root *xt,
+                                       struct buffer_head *blk_bh,
                                        char *buffer,
                                        size_t buffer_size);
 
@@ -170,12 +171,42 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode,
                                             struct ocfs2_xattr_search *xs,
                                             struct ocfs2_xattr_set_ctxt *ctxt);
 
-static int ocfs2_delete_xattr_index_block(struct inode *inode,
-                                         struct buffer_head *xb_bh);
+typedef int (xattr_tree_rec_func)(struct inode *inode,
+                                 struct buffer_head *root_bh,
+                                 u64 blkno, u32 cpos, u32 len, void *para);
+static int ocfs2_iterate_xattr_index_block(struct inode *inode,
+                                          struct buffer_head *root_bh,
+                                          xattr_tree_rec_func *rec_func,
+                                          void *para);
+static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
+                                       struct ocfs2_xattr_bucket *bucket,
+                                       void *para);
+static int ocfs2_rm_xattr_cluster(struct inode *inode,
+                                 struct buffer_head *root_bh,
+                                 u64 blkno,
+                                 u32 cpos,
+                                 u32 len,
+                                 void *para);
+
 static int ocfs2_mv_xattr_buckets(struct inode *inode, handle_t *handle,
                                  u64 src_blk, u64 last_blk, u64 to_blk,
                                  unsigned int start_bucket,
                                  u32 *first_hash);
+static int ocfs2_prepare_refcount_xattr(struct inode *inode,
+                                       struct ocfs2_dinode *di,
+                                       struct ocfs2_xattr_info *xi,
+                                       struct ocfs2_xattr_search *xis,
+                                       struct ocfs2_xattr_search *xbs,
+                                       struct ocfs2_refcount_tree **ref_tree,
+                                       int *meta_need,
+                                       int *credits);
+static int ocfs2_get_xattr_tree_value_root(struct super_block *sb,
+                                          struct ocfs2_xattr_bucket *bucket,
+                                          int offset,
+                                          struct ocfs2_xattr_value_root **xv,
+                                          struct buffer_head **bh);
+static int ocfs2_xattr_security_set(struct inode *inode, const char *name,
+                                   const void *value, size_t size, int flags);
 
 static inline u16 ocfs2_xattr_buckets_per_cluster(struct ocfs2_super *osb)
 {
@@ -254,9 +285,9 @@ static int ocfs2_init_xattr_bucket(struct ocfs2_xattr_bucket *bucket,
                        break;
                }
 
-               if (!ocfs2_buffer_uptodate(bucket->bu_inode,
+               if (!ocfs2_buffer_uptodate(INODE_CACHE(bucket->bu_inode),
                                           bucket->bu_bhs[i]))
-                       ocfs2_set_new_buffer_uptodate(bucket->bu_inode,
+                       ocfs2_set_new_buffer_uptodate(INODE_CACHE(bucket->bu_inode),
                                                      bucket->bu_bhs[i]);
        }
 
@@ -271,7 +302,7 @@ static int ocfs2_read_xattr_bucket(struct ocfs2_xattr_bucket *bucket,
 {
        int rc;
 
-       rc = ocfs2_read_blocks(bucket->bu_inode, xb_blkno,
+       rc = ocfs2_read_blocks(INODE_CACHE(bucket->bu_inode), xb_blkno,
                               bucket->bu_blocks, bucket->bu_bhs, 0,
                               NULL);
        if (!rc) {
@@ -297,7 +328,8 @@ static int ocfs2_xattr_bucket_journal_access(handle_t *handle,
        int i, rc = 0;
 
        for (i = 0; i < bucket->bu_blocks; i++) {
-               rc = ocfs2_journal_access(handle, bucket->bu_inode,
+               rc = ocfs2_journal_access(handle,
+                                         INODE_CACHE(bucket->bu_inode),
                                          bucket->bu_bhs[i], type);
                if (rc) {
                        mlog_errno(rc);
@@ -399,7 +431,7 @@ static int ocfs2_read_xattr_block(struct inode *inode, u64 xb_blkno,
        int rc;
        struct buffer_head *tmp = *bh;
 
-       rc = ocfs2_read_block(inode, xb_blkno, &tmp,
+       rc = ocfs2_read_block(INODE_CACHE(inode), xb_blkno, &tmp,
                              ocfs2_validate_xattr_block);
 
        /* If ocfs2_read_block() got us a new bh, pass it up. */
@@ -596,15 +628,14 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
        int status = 0;
        handle_t *handle = ctxt->handle;
        enum ocfs2_alloc_restarted why;
-       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
        u32 prev_clusters, logical_start = le32_to_cpu(vb->vb_xv->xr_clusters);
        struct ocfs2_extent_tree et;
 
        mlog(0, "(clusters_to_add for xattr= %u)\n", clusters_to_add);
 
-       ocfs2_init_xattr_value_extent_tree(&et, inode, vb);
+       ocfs2_init_xattr_value_extent_tree(&et, INODE_CACHE(inode), vb);
 
-       status = vb->vb_access(handle, inode, vb->vb_bh,
+       status = vb->vb_access(handle, INODE_CACHE(inode), vb->vb_bh,
                              OCFS2_JOURNAL_ACCESS_WRITE);
        if (status < 0) {
                mlog_errno(status);
@@ -612,13 +643,11 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
        }
 
        prev_clusters = le32_to_cpu(vb->vb_xv->xr_clusters);
-       status = ocfs2_add_clusters_in_btree(osb,
-                                            inode,
+       status = ocfs2_add_clusters_in_btree(handle,
+                                            &et,
                                             &logical_start,
                                             clusters_to_add,
                                             0,
-                                            &et,
-                                            handle,
                                             ctxt->data_ac,
                                             ctxt->meta_ac,
                                             &why);
@@ -649,6 +678,7 @@ leave:
 static int __ocfs2_remove_xattr_range(struct inode *inode,
                                      struct ocfs2_xattr_value_buf *vb,
                                      u32 cpos, u32 phys_cpos, u32 len,
+                                     unsigned int ext_flags,
                                      struct ocfs2_xattr_set_ctxt *ctxt)
 {
        int ret;
@@ -656,16 +686,16 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
        handle_t *handle = ctxt->handle;
        struct ocfs2_extent_tree et;
 
-       ocfs2_init_xattr_value_extent_tree(&et, inode, vb);
+       ocfs2_init_xattr_value_extent_tree(&et, INODE_CACHE(inode), vb);
 
-       ret = vb->vb_access(handle, inode, vb->vb_bh,
+       ret = vb->vb_access(handle, INODE_CACHE(inode), vb->vb_bh,
                            OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
                goto out;
        }
 
-       ret = ocfs2_remove_extent(inode, &et, cpos, len, handle, ctxt->meta_ac,
+       ret = ocfs2_remove_extent(handle, &et, cpos, len, ctxt->meta_ac,
                                  &ctxt->dealloc);
        if (ret) {
                mlog_errno(ret);
@@ -680,7 +710,14 @@ static int __ocfs2_remove_xattr_range(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_cache_cluster_dealloc(&ctxt->dealloc, phys_blkno, len);
+       if (ext_flags & OCFS2_EXT_REFCOUNTED)
+               ret = ocfs2_decrease_refcount(inode, handle,
+                                       ocfs2_blocks_to_clusters(inode->i_sb,
+                                                                phys_blkno),
+                                       len, ctxt->meta_ac, &ctxt->dealloc, 1);
+       else
+               ret = ocfs2_cache_cluster_dealloc(&ctxt->dealloc,
+                                                 phys_blkno, len);
        if (ret)
                mlog_errno(ret);
 
@@ -695,6 +732,7 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
                                   struct ocfs2_xattr_set_ctxt *ctxt)
 {
        int ret = 0;
+       unsigned int ext_flags;
        u32 trunc_len, cpos, phys_cpos, alloc_size;
        u64 block;
 
@@ -706,7 +744,7 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
        while (trunc_len) {
                ret = ocfs2_xattr_get_clusters(inode, cpos, &phys_cpos,
                                               &alloc_size,
-                                              &vb->vb_xv->xr_list);
+                                              &vb->vb_xv->xr_list, &ext_flags);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -717,15 +755,15 @@ static int ocfs2_xattr_shrink_size(struct inode *inode,
 
                ret = __ocfs2_remove_xattr_range(inode, vb, cpos,
                                                 phys_cpos, alloc_size,
-                                                ctxt);
+                                                ext_flags, ctxt);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
                block = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
-               ocfs2_remove_xattr_clusters_from_cache(inode, block,
-                                                      alloc_size);
+               ocfs2_remove_xattr_clusters_from_cache(INODE_CACHE(inode),
+                                                      block, alloc_size);
                cpos += alloc_size;
                trunc_len -= alloc_size;
        }
@@ -810,6 +848,23 @@ static int ocfs2_xattr_list_entries(struct inode *inode,
        return result;
 }
 
+int ocfs2_has_inline_xattr_value_outside(struct inode *inode,
+                                        struct ocfs2_dinode *di)
+{
+       struct ocfs2_xattr_header *xh;
+       int i;
+
+       xh = (struct ocfs2_xattr_header *)
+                ((void *)di + inode->i_sb->s_blocksize -
+                le16_to_cpu(di->i_xattr_inline_size));
+
+       for (i = 0; i < le16_to_cpu(xh->xh_count); i++)
+               if (!ocfs2_xattr_is_local(&xh->xh_entries[i]))
+                       return 1;
+
+       return 0;
+}
+
 static int ocfs2_xattr_ibody_list(struct inode *inode,
                                  struct ocfs2_dinode *di,
                                  char *buffer,
@@ -855,11 +910,9 @@ static int ocfs2_xattr_block_list(struct inode *inode,
                struct ocfs2_xattr_header *header = &xb->xb_attrs.xb_header;
                ret = ocfs2_xattr_list_entries(inode, header,
                                               buffer, buffer_size);
-       } else {
-               struct ocfs2_xattr_tree_root *xt = &xb->xb_attrs.xb_root;
-               ret = ocfs2_xattr_tree_list_index_block(inode, xt,
+       } else
+               ret = ocfs2_xattr_tree_list_index_block(inode, blk_bh,
                                                   buffer, buffer_size);
-       }
 
        brelse(blk_bh);
 
@@ -961,7 +1014,7 @@ static int ocfs2_xattr_get_value_outside(struct inode *inode,
        cpos = 0;
        while (cpos < clusters) {
                ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
-                                              &num_clusters, el);
+                                              &num_clusters, el, NULL);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -970,7 +1023,8 @@ static int ocfs2_xattr_get_value_outside(struct inode *inode,
                blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cluster);
                /* Copy ocfs2_xattr_value */
                for (i = 0; i < num_clusters * bpc; i++, blkno++) {
-                       ret = ocfs2_read_block(inode, blkno, &bh, NULL);
+                       ret = ocfs2_read_block(INODE_CACHE(inode), blkno,
+                                              &bh, NULL);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
@@ -1085,7 +1139,7 @@ static int ocfs2_xattr_block_get(struct inode *inode,
                i = xs->here - xs->header->xh_entries;
 
                if (le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED) {
-                       ret = ocfs2_xattr_bucket_get_name_value(inode,
+                       ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb,
                                                                bucket_xh(xs->bucket),
                                                                i,
                                                                &block_off,
@@ -1183,7 +1237,7 @@ static int ocfs2_xattr_get(struct inode *inode,
 
 static int __ocfs2_xattr_set_value_outside(struct inode *inode,
                                           handle_t *handle,
-                                          struct ocfs2_xattr_value_root *xv,
+                                          struct ocfs2_xattr_value_buf *vb,
                                           const void *value,
                                           int value_len)
 {
@@ -1194,28 +1248,34 @@ static int __ocfs2_xattr_set_value_outside(struct inode *inode,
        u32 clusters = ocfs2_clusters_for_bytes(inode->i_sb, value_len);
        u64 blkno;
        struct buffer_head *bh = NULL;
+       unsigned int ext_flags;
+       struct ocfs2_xattr_value_root *xv = vb->vb_xv;
 
        BUG_ON(clusters > le32_to_cpu(xv->xr_clusters));
 
        while (cpos < clusters) {
                ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
-                                              &num_clusters, &xv->xr_list);
+                                              &num_clusters, &xv->xr_list,
+                                              &ext_flags);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
                }
 
+               BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);
+
                blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cluster);
 
                for (i = 0; i < num_clusters * bpc; i++, blkno++) {
-                       ret = ocfs2_read_block(inode, blkno, &bh, NULL);
+                       ret = ocfs2_read_block(INODE_CACHE(inode), blkno,
+                                              &bh, NULL);
                        if (ret) {
                                mlog_errno(ret);
                                goto out;
                        }
 
                        ret = ocfs2_journal_access(handle,
-                                                  inode,
+                                                  INODE_CACHE(inode),
                                                   bh,
                                                   OCFS2_JOURNAL_ACCESS_WRITE);
                        if (ret < 0) {
@@ -1266,7 +1326,7 @@ static int ocfs2_xattr_cleanup(struct inode *inode,
        void *val = xs->base + offs;
        size_t size = OCFS2_XATTR_SIZE(name_len) + OCFS2_XATTR_ROOT_SIZE;
 
-       ret = vb->vb_access(handle, inode, vb->vb_bh,
+       ret = vb->vb_access(handle, INODE_CACHE(inode), vb->vb_bh,
                            OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1294,7 +1354,7 @@ static int ocfs2_xattr_update_entry(struct inode *inode,
 {
        int ret;
 
-       ret = vb->vb_access(handle, inode, vb->vb_bh,
+       ret = vb->vb_access(handle, INODE_CACHE(inode), vb->vb_bh,
                            OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1355,7 +1415,7 @@ static int ocfs2_xattr_set_value_outside(struct inode *inode,
                mlog_errno(ret);
                return ret;
        }
-       ret = __ocfs2_xattr_set_value_outside(inode, ctxt->handle, vb->vb_xv,
+       ret = __ocfs2_xattr_set_value_outside(inode, ctxt->handle, vb,
                                              xi->value, xi->value_len);
        if (ret < 0)
                mlog_errno(ret);
@@ -1594,7 +1654,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
 
                                ret = __ocfs2_xattr_set_value_outside(inode,
                                                                handle,
-                                                               vb.vb_xv,
+                                                               &vb,
                                                                xi->value,
                                                                xi->value_len);
                                if (ret < 0)
@@ -1615,7 +1675,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
                }
        }
 
-       ret = ocfs2_journal_access_di(handle, inode, xs->inode_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), xs->inode_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1623,7 +1683,7 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
        }
 
        if (!(flag & OCFS2_INLINE_XATTR_FL)) {
-               ret = vb.vb_access(handle, inode, vb.vb_bh,
+               ret = vb.vb_access(handle, INODE_CACHE(inode), vb.vb_bh,
                                   OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
                        mlog_errno(ret);
@@ -1700,51 +1760,112 @@ out:
        return ret;
 }
 
+/*
+ * In xattr remove, if it is stored outside and refcounted, we may have
+ * the chance to split the refcount tree. So need the allocators.
+ */
+static int ocfs2_lock_xattr_remove_allocators(struct inode *inode,
+                                       struct ocfs2_xattr_value_root *xv,
+                                       struct ocfs2_caching_info *ref_ci,
+                                       struct buffer_head *ref_root_bh,
+                                       struct ocfs2_alloc_context **meta_ac,
+                                       int *ref_credits)
+{
+       int ret, meta_add = 0;
+       u32 p_cluster, num_clusters;
+       unsigned int ext_flags;
+
+       *ref_credits = 0;
+       ret = ocfs2_xattr_get_clusters(inode, 0, &p_cluster,
+                                      &num_clusters,
+                                      &xv->xr_list,
+                                      &ext_flags);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (!(ext_flags & OCFS2_EXT_REFCOUNTED))
+               goto out;
+
+       ret = ocfs2_refcounted_xattr_delete_need(inode, ref_ci,
+                                                ref_root_bh, xv,
+                                                &meta_add, ref_credits);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_reserve_new_metadata_blocks(OCFS2_SB(inode->i_sb),
+                                               meta_add, meta_ac);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       return ret;
+}
+
 static int ocfs2_remove_value_outside(struct inode*inode,
                                      struct ocfs2_xattr_value_buf *vb,
-                                     struct ocfs2_xattr_header *header)
+                                     struct ocfs2_xattr_header *header,
+                                     struct ocfs2_caching_info *ref_ci,
+                                     struct buffer_head *ref_root_bh)
 {
-       int ret = 0, i;
+       int ret = 0, i, ref_credits;
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
        struct ocfs2_xattr_set_ctxt ctxt = { NULL, NULL, };
+       void *val;
 
        ocfs2_init_dealloc_ctxt(&ctxt.dealloc);
 
-       ctxt.handle = ocfs2_start_trans(osb,
-                                       ocfs2_remove_extent_credits(osb->sb));
-       if (IS_ERR(ctxt.handle)) {
-               ret = PTR_ERR(ctxt.handle);
-               mlog_errno(ret);
-               goto out;
-       }
-
        for (i = 0; i < le16_to_cpu(header->xh_count); i++) {
                struct ocfs2_xattr_entry *entry = &header->xh_entries[i];
 
-               if (!ocfs2_xattr_is_local(entry)) {
-                       void *val;
+               if (ocfs2_xattr_is_local(entry))
+                       continue;
+
+               val = (void *)header +
+                       le16_to_cpu(entry->xe_name_offset);
+               vb->vb_xv = (struct ocfs2_xattr_value_root *)
+                       (val + OCFS2_XATTR_SIZE(entry->xe_name_len));
 
-                       val = (void *)header +
-                               le16_to_cpu(entry->xe_name_offset);
-                       vb->vb_xv = (struct ocfs2_xattr_value_root *)
-                               (val + OCFS2_XATTR_SIZE(entry->xe_name_len));
-                       ret = ocfs2_xattr_value_truncate(inode, vb, 0, &ctxt);
-                       if (ret < 0) {
-                               mlog_errno(ret);
-                               break;
-                       }
+               ret = ocfs2_lock_xattr_remove_allocators(inode, vb->vb_xv,
+                                                        ref_ci, ref_root_bh,
+                                                        &ctxt.meta_ac,
+                                                        &ref_credits);
+
+               ctxt.handle = ocfs2_start_trans(osb, ref_credits +
+                                       ocfs2_remove_extent_credits(osb->sb));
+               if (IS_ERR(ctxt.handle)) {
+                       ret = PTR_ERR(ctxt.handle);
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ret = ocfs2_xattr_value_truncate(inode, vb, 0, &ctxt);
+               if (ret < 0) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ocfs2_commit_trans(osb, ctxt.handle);
+               if (ctxt.meta_ac) {
+                       ocfs2_free_alloc_context(ctxt.meta_ac);
+                       ctxt.meta_ac = NULL;
                }
        }
 
-       ocfs2_commit_trans(osb, ctxt.handle);
+       if (ctxt.meta_ac)
+               ocfs2_free_alloc_context(ctxt.meta_ac);
        ocfs2_schedule_truncate_log_flush(osb, 1);
        ocfs2_run_deallocs(osb, &ctxt.dealloc);
-out:
        return ret;
 }
 
 static int ocfs2_xattr_ibody_remove(struct inode *inode,
-                                   struct buffer_head *di_bh)
+                                   struct buffer_head *di_bh,
+                                   struct ocfs2_caching_info *ref_ci,
+                                   struct buffer_head *ref_root_bh)
 {
 
        struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
@@ -1759,13 +1880,21 @@ static int ocfs2_xattr_ibody_remove(struct inode *inode,
                 ((void *)di + inode->i_sb->s_blocksize -
                 le16_to_cpu(di->i_xattr_inline_size));
 
-       ret = ocfs2_remove_value_outside(inode, &vb, header);
+       ret = ocfs2_remove_value_outside(inode, &vb, header,
+                                        ref_ci, ref_root_bh);
 
        return ret;
 }
 
+struct ocfs2_rm_xattr_bucket_para {
+       struct ocfs2_caching_info *ref_ci;
+       struct buffer_head *ref_root_bh;
+};
+
 static int ocfs2_xattr_block_remove(struct inode *inode,
-                                   struct buffer_head *blk_bh)
+                                   struct buffer_head *blk_bh,
+                                   struct ocfs2_caching_info *ref_ci,
+                                   struct buffer_head *ref_root_bh)
 {
        struct ocfs2_xattr_block *xb;
        int ret = 0;
@@ -1773,19 +1902,29 @@ static int ocfs2_xattr_block_remove(struct inode *inode,
                .vb_bh = blk_bh,
                .vb_access = ocfs2_journal_access_xb,
        };
+       struct ocfs2_rm_xattr_bucket_para args = {
+               .ref_ci = ref_ci,
+               .ref_root_bh = ref_root_bh,
+       };
 
        xb = (struct ocfs2_xattr_block *)blk_bh->b_data;
        if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)) {
                struct ocfs2_xattr_header *header = &(xb->xb_attrs.xb_header);
-               ret = ocfs2_remove_value_outside(inode, &vb, header);
+               ret = ocfs2_remove_value_outside(inode, &vb, header,
+                                                ref_ci, ref_root_bh);
        } else
-               ret = ocfs2_delete_xattr_index_block(inode, blk_bh);
+               ret = ocfs2_iterate_xattr_index_block(inode,
+                                               blk_bh,
+                                               ocfs2_rm_xattr_cluster,
+                                               &args);
 
        return ret;
 }
 
 static int ocfs2_xattr_free_block(struct inode *inode,
-                                 u64 block)
+                                 u64 block,
+                                 struct ocfs2_caching_info *ref_ci,
+                                 struct buffer_head *ref_root_bh)
 {
        struct inode *xb_alloc_inode;
        struct buffer_head *xb_alloc_bh = NULL;
@@ -1803,7 +1942,7 @@ static int ocfs2_xattr_free_block(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_xattr_block_remove(inode, blk_bh);
+       ret = ocfs2_xattr_block_remove(inode, blk_bh, ref_ci, ref_root_bh);
        if (ret < 0) {
                mlog_errno(ret);
                goto out;
@@ -1863,6 +2002,9 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh)
 {
        struct ocfs2_inode_info *oi = OCFS2_I(inode);
        struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
+       struct ocfs2_refcount_tree *ref_tree = NULL;
+       struct buffer_head *ref_root_bh = NULL;
+       struct ocfs2_caching_info *ref_ci = NULL;
        handle_t *handle;
        int ret;
 
@@ -1872,8 +2014,21 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh)
        if (!(oi->ip_dyn_features & OCFS2_HAS_XATTR_FL))
                return 0;
 
+       if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL) {
+               ret = ocfs2_lock_refcount_tree(OCFS2_SB(inode->i_sb),
+                                              le64_to_cpu(di->i_refcount_loc),
+                                              1, &ref_tree, &ref_root_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+               ref_ci = &ref_tree->rf_ci;
+
+       }
+
        if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) {
-               ret = ocfs2_xattr_ibody_remove(inode, di_bh);
+               ret = ocfs2_xattr_ibody_remove(inode, di_bh,
+                                              ref_ci, ref_root_bh);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto out;
@@ -1882,7 +2037,8 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh)
 
        if (di->i_xattr_loc) {
                ret = ocfs2_xattr_free_block(inode,
-                                            le64_to_cpu(di->i_xattr_loc));
+                                            le64_to_cpu(di->i_xattr_loc),
+                                            ref_ci, ref_root_bh);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto out;
@@ -1896,7 +2052,7 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh)
                mlog_errno(ret);
                goto out;
        }
-       ret = ocfs2_journal_access_di(handle, inode, di_bh,
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -1916,6 +2072,9 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh)
 out_commit:
        ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out:
+       if (ref_tree)
+               ocfs2_unlock_refcount_tree(OCFS2_SB(inode->i_sb), ref_tree, 1);
+       brelse(ref_root_bh);
        return ret;
 }
 
@@ -2083,6 +2242,84 @@ cleanup:
        return ret;
 }
 
+static int ocfs2_create_xattr_block(handle_t *handle,
+                                   struct inode *inode,
+                                   struct buffer_head *inode_bh,
+                                   struct ocfs2_alloc_context *meta_ac,
+                                   struct buffer_head **ret_bh,
+                                   int indexed)
+{
+       int ret;
+       u16 suballoc_bit_start;
+       u32 num_got;
+       u64 first_blkno;
+       struct ocfs2_dinode *di =  (struct ocfs2_dinode *)inode_bh->b_data;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct buffer_head *new_bh = NULL;
+       struct ocfs2_xattr_block *xblk;
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), inode_bh,
+                                     OCFS2_JOURNAL_ACCESS_CREATE);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto end;
+       }
+
+       ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1,
+                                  &suballoc_bit_start, &num_got,
+                                  &first_blkno);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto end;
+       }
+
+       new_bh = sb_getblk(inode->i_sb, first_blkno);
+       ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
+
+       ret = ocfs2_journal_access_xb(handle, INODE_CACHE(inode),
+                                     new_bh,
+                                     OCFS2_JOURNAL_ACCESS_CREATE);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto end;
+       }
+
+       /* Initialize ocfs2_xattr_block */
+       xblk = (struct ocfs2_xattr_block *)new_bh->b_data;
+       memset(xblk, 0, inode->i_sb->s_blocksize);
+       strcpy((void *)xblk, OCFS2_XATTR_BLOCK_SIGNATURE);
+       xblk->xb_suballoc_slot = cpu_to_le16(osb->slot_num);
+       xblk->xb_suballoc_bit = cpu_to_le16(suballoc_bit_start);
+       xblk->xb_fs_generation = cpu_to_le32(osb->fs_generation);
+       xblk->xb_blkno = cpu_to_le64(first_blkno);
+
+       if (indexed) {
+               struct ocfs2_xattr_tree_root *xr = &xblk->xb_attrs.xb_root;
+               xr->xt_clusters = cpu_to_le32(1);
+               xr->xt_last_eb_blk = 0;
+               xr->xt_list.l_tree_depth = 0;
+               xr->xt_list.l_count = cpu_to_le16(
+                                       ocfs2_xattr_recs_per_xb(inode->i_sb));
+               xr->xt_list.l_next_free_rec = cpu_to_le16(1);
+               xblk->xb_flags = cpu_to_le16(OCFS2_XATTR_INDEXED);
+       }
+
+       ret = ocfs2_journal_dirty(handle, new_bh);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto end;
+       }
+       di->i_xattr_loc = cpu_to_le64(first_blkno);
+       ocfs2_journal_dirty(handle, inode_bh);
+
+       *ret_bh = new_bh;
+       new_bh = NULL;
+
+end:
+       brelse(new_bh);
+       return ret;
+}
+
 /*
  * ocfs2_xattr_block_set()
  *
@@ -2095,63 +2332,24 @@ static int ocfs2_xattr_block_set(struct inode *inode,
                                 struct ocfs2_xattr_set_ctxt *ctxt)
 {
        struct buffer_head *new_bh = NULL;
-       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
-       struct ocfs2_dinode *di =  (struct ocfs2_dinode *)xs->inode_bh->b_data;
        handle_t *handle = ctxt->handle;
        struct ocfs2_xattr_block *xblk = NULL;
-       u16 suballoc_bit_start;
-       u32 num_got;
-       u64 first_blkno;
        int ret;
 
        if (!xs->xattr_bh) {
-               ret = ocfs2_journal_access_di(handle, inode, xs->inode_bh,
-                                             OCFS2_JOURNAL_ACCESS_CREATE);
-               if (ret < 0) {
-                       mlog_errno(ret);
-                       goto end;
-               }
-
-               ret = ocfs2_claim_metadata(osb, handle, ctxt->meta_ac, 1,
-                                          &suballoc_bit_start, &num_got,
-                                          &first_blkno);
-               if (ret < 0) {
-                       mlog_errno(ret);
-                       goto end;
-               }
-
-               new_bh = sb_getblk(inode->i_sb, first_blkno);
-               ocfs2_set_new_buffer_uptodate(inode, new_bh);
-
-               ret = ocfs2_journal_access_xb(handle, inode, new_bh,
-                                             OCFS2_JOURNAL_ACCESS_CREATE);
-               if (ret < 0) {
+               ret = ocfs2_create_xattr_block(handle, inode, xs->inode_bh,
+                                              ctxt->meta_ac, &new_bh, 0);
+               if (ret) {
                        mlog_errno(ret);
                        goto end;
                }
 
-               /* Initialize ocfs2_xattr_block */
                xs->xattr_bh = new_bh;
-               xblk = (struct ocfs2_xattr_block *)new_bh->b_data;
-               memset(xblk, 0, inode->i_sb->s_blocksize);
-               strcpy((void *)xblk, OCFS2_XATTR_BLOCK_SIGNATURE);
-               xblk->xb_suballoc_slot = cpu_to_le16(osb->slot_num);
-               xblk->xb_suballoc_bit = cpu_to_le16(suballoc_bit_start);
-               xblk->xb_fs_generation = cpu_to_le32(osb->fs_generation);
-               xblk->xb_blkno = cpu_to_le64(first_blkno);
-
+               xblk = (struct ocfs2_xattr_block *)xs->xattr_bh->b_data;
                xs->header = &xblk->xb_attrs.xb_header;
                xs->base = (void *)xs->header;
                xs->end = (void *)xblk + inode->i_sb->s_blocksize;
                xs->here = xs->header->xh_entries;
-
-               ret = ocfs2_journal_dirty(handle, new_bh);
-               if (ret < 0) {
-                       mlog_errno(ret);
-                       goto end;
-               }
-               di->i_xattr_loc = cpu_to_le64(first_blkno);
-               ocfs2_journal_dirty(handle, xs->inode_bh);
        } else
                xblk = (struct ocfs2_xattr_block *)xs->xattr_bh->b_data;
 
@@ -2273,7 +2471,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                old_in_xb = 1;
 
                if (le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED) {
-                       ret = ocfs2_xattr_bucket_get_name_value(inode,
+                       ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb,
                                                        bucket_xh(xbs->bucket),
                                                        i, &block_off,
                                                        &name_offset);
@@ -2428,6 +2626,7 @@ static int ocfs2_init_xattr_set_ctxt(struct inode *inode,
                                     struct ocfs2_xattr_search *xis,
                                     struct ocfs2_xattr_search *xbs,
                                     struct ocfs2_xattr_set_ctxt *ctxt,
+                                    int extra_meta,
                                     int *credits)
 {
        int clusters_add, meta_add, ret;
@@ -2444,6 +2643,7 @@ static int ocfs2_init_xattr_set_ctxt(struct inode *inode,
                return ret;
        }
 
+       meta_add += extra_meta;
        mlog(0, "Set xattr %s, reserve meta blocks = %d, clusters = %d, "
             "credits = %d\n", xi->name, meta_add, clusters_add, *credits);
 
@@ -2598,7 +2798,7 @@ static int __ocfs2_xattr_set_handle(struct inode *inode,
 
        if (!ret) {
                /* Update inode ctime. */
-               ret = ocfs2_journal_access_di(ctxt->handle, inode,
+               ret = ocfs2_journal_access_di(ctxt->handle, INODE_CACHE(inode),
                                              xis->inode_bh,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
                if (ret) {
@@ -2711,10 +2911,11 @@ int ocfs2_xattr_set(struct inode *inode,
 {
        struct buffer_head *di_bh = NULL;
        struct ocfs2_dinode *di;
-       int ret, credits;
+       int ret, credits, ref_meta = 0, ref_credits = 0;
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
        struct inode *tl_inode = osb->osb_tl_inode;
        struct ocfs2_xattr_set_ctxt ctxt = { NULL, NULL, };
+       struct ocfs2_refcount_tree *ref_tree = NULL;
 
        struct ocfs2_xattr_info xi = {
                .name_index = name_index,
@@ -2779,6 +2980,17 @@ int ocfs2_xattr_set(struct inode *inode,
                        goto cleanup;
        }
 
+       /* Check whether the value is refcounted and do some prepartion. */
+       if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL &&
+           (!xis.not_found || !xbs.not_found)) {
+               ret = ocfs2_prepare_refcount_xattr(inode, di, &xi,
+                                                  &xis, &xbs, &ref_tree,
+                                                  &ref_meta, &ref_credits);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto cleanup;
+               }
+       }
 
        mutex_lock(&tl_inode->i_mutex);
 
@@ -2793,7 +3005,7 @@ int ocfs2_xattr_set(struct inode *inode,
        mutex_unlock(&tl_inode->i_mutex);
 
        ret = ocfs2_init_xattr_set_ctxt(inode, di, &xi, &xis,
-                                       &xbs, &ctxt, &credits);
+                                       &xbs, &ctxt, ref_meta, &credits);
        if (ret) {
                mlog_errno(ret);
                goto cleanup;
@@ -2801,7 +3013,7 @@ int ocfs2_xattr_set(struct inode *inode,
 
        /* we need to update inode's ctime field, so add credit for it. */
        credits += OCFS2_INODE_UPDATE_CREDITS;
-       ctxt.handle = ocfs2_start_trans(osb, credits);
+       ctxt.handle = ocfs2_start_trans(osb, credits + ref_credits);
        if (IS_ERR(ctxt.handle)) {
                ret = PTR_ERR(ctxt.handle);
                mlog_errno(ret);
@@ -2819,8 +3031,16 @@ int ocfs2_xattr_set(struct inode *inode,
        if (ocfs2_dealloc_has_cluster(&ctxt.dealloc))
                ocfs2_schedule_truncate_log_flush(osb, 1);
        ocfs2_run_deallocs(osb, &ctxt.dealloc);
+
 cleanup:
+       if (ref_tree)
+               ocfs2_unlock_refcount_tree(osb, ref_tree, 1);
        up_write(&OCFS2_I(inode)->ip_xattr_sem);
+       if (!value && !ret) {
+               ret = ocfs2_try_remove_refcount_tree(inode, di_bh);
+               if (ret)
+                       mlog_errno(ret);
+       }
        ocfs2_inode_unlock(inode, 1);
 cleanup_nolock:
        brelse(di_bh);
@@ -2849,7 +3069,8 @@ static int ocfs2_xattr_get_rec(struct inode *inode,
        u64 e_blkno = 0;
 
        if (el->l_tree_depth) {
-               ret = ocfs2_find_leaf(inode, el, name_hash, &eb_bh);
+               ret = ocfs2_find_leaf(INODE_CACHE(inode), el, name_hash,
+                                     &eb_bh);
                if (ret) {
                        mlog_errno(ret);
                        goto out;
@@ -2931,7 +3152,7 @@ static int ocfs2_find_xe_in_bucket(struct inode *inode,
                if (cmp)
                        continue;
 
-               ret = ocfs2_xattr_bucket_get_name_value(inode,
+               ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb,
                                                        xh,
                                                        i,
                                                        &block_off,
@@ -3175,7 +3396,7 @@ struct ocfs2_xattr_tree_list {
        size_t result;
 };
 
-static int ocfs2_xattr_bucket_get_name_value(struct inode *inode,
+static int ocfs2_xattr_bucket_get_name_value(struct super_block *sb,
                                             struct ocfs2_xattr_header *xh,
                                             int index,
                                             int *block_off,
@@ -3188,8 +3409,8 @@ static int ocfs2_xattr_bucket_get_name_value(struct inode *inode,
 
        name_offset = le16_to_cpu(xh->xh_entries[index].xe_name_offset);
 
-       *block_off = name_offset >> inode->i_sb->s_blocksize_bits;
-       *new_offset = name_offset % inode->i_sb->s_blocksize;
+       *block_off = name_offset >> sb->s_blocksize_bits;
+       *new_offset = name_offset % sb->s_blocksize;
 
        return 0;
 }
@@ -3209,7 +3430,7 @@ static int ocfs2_list_xattr_bucket(struct inode *inode,
                prefix = ocfs2_xattr_prefix(type);
 
                if (prefix) {
-                       ret = ocfs2_xattr_bucket_get_name_value(inode,
+                       ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb,
                                                                bucket_xh(bucket),
                                                                i,
                                                                &block_off,
@@ -3232,22 +3453,19 @@ static int ocfs2_list_xattr_bucket(struct inode *inode,
        return ret;
 }
 
-static int ocfs2_xattr_tree_list_index_block(struct inode *inode,
-                                            struct ocfs2_xattr_tree_root *xt,
-                                            char *buffer,
-                                            size_t buffer_size)
+static int ocfs2_iterate_xattr_index_block(struct inode *inode,
+                                          struct buffer_head *blk_bh,
+                                          xattr_tree_rec_func *rec_func,
+                                          void *para)
 {
-       struct ocfs2_extent_list *el = &xt->xt_list;
+       struct ocfs2_xattr_block *xb =
+                       (struct ocfs2_xattr_block *)blk_bh->b_data;
+       struct ocfs2_extent_list *el = &xb->xb_attrs.xb_root.xt_list;
        int ret = 0;
        u32 name_hash = UINT_MAX, e_cpos = 0, num_clusters = 0;
        u64 p_blkno = 0;
-       struct ocfs2_xattr_tree_list xl = {
-               .buffer = buffer,
-               .buffer_size = buffer_size,
-               .result = 0,
-       };
 
-       if (le16_to_cpu(el->l_next_free_rec) == 0)
+       if (!el->l_next_free_rec || !rec_func)
                return 0;
 
        while (name_hash > 0) {
@@ -3255,16 +3473,15 @@ static int ocfs2_xattr_tree_list_index_block(struct inode *inode,
                                          &e_cpos, &num_clusters, el);
                if (ret) {
                        mlog_errno(ret);
-                       goto out;
+                       break;
                }
 
-               ret = ocfs2_iterate_xattr_buckets(inode, p_blkno, num_clusters,
-                                                 ocfs2_list_xattr_bucket,
-                                                 &xl);
+               ret = rec_func(inode, blk_bh, p_blkno, e_cpos,
+                              num_clusters, para);
                if (ret) {
                        if (ret != -ERANGE)
                                mlog_errno(ret);
-                       goto out;
+                       break;
                }
 
                if (e_cpos == 0)
@@ -3273,6 +3490,37 @@ static int ocfs2_xattr_tree_list_index_block(struct inode *inode,
                name_hash = e_cpos - 1;
        }
 
+       return ret;
+
+}
+
+static int ocfs2_list_xattr_tree_rec(struct inode *inode,
+                                    struct buffer_head *root_bh,
+                                    u64 blkno, u32 cpos, u32 len, void *para)
+{
+       return ocfs2_iterate_xattr_buckets(inode, blkno, len,
+                                          ocfs2_list_xattr_bucket, para);
+}
+
+static int ocfs2_xattr_tree_list_index_block(struct inode *inode,
+                                            struct buffer_head *blk_bh,
+                                            char *buffer,
+                                            size_t buffer_size)
+{
+       int ret;
+       struct ocfs2_xattr_tree_list xl = {
+               .buffer = buffer,
+               .buffer_size = buffer_size,
+               .result = 0,
+       };
+
+       ret = ocfs2_iterate_xattr_index_block(inode, blk_bh,
+                                             ocfs2_list_xattr_tree_rec, &xl);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
        ret = xl.result;
 out:
        return ret;
@@ -3426,7 +3674,7 @@ static int ocfs2_xattr_create_index_block(struct inode *inode,
         */
        down_write(&oi->ip_alloc_sem);
 
-       ret = ocfs2_journal_access_xb(handle, inode, xb_bh,
+       ret = ocfs2_journal_access_xb(handle, INODE_CACHE(inode), xb_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
@@ -4263,9 +4511,9 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode,
             (unsigned long long)OCFS2_I(inode)->ip_blkno,
             prev_cpos, (unsigned long long)bucket_blkno(first));
 
-       ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh);
+       ocfs2_init_xattr_tree_extent_tree(&et, INODE_CACHE(inode), root_bh);
 
-       ret = ocfs2_journal_access_xb(handle, inode, root_bh,
+       ret = ocfs2_journal_access_xb(handle, INODE_CACHE(inode), root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
@@ -4319,7 +4567,7 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode,
 
        mlog(0, "Insert %u clusters at block %llu for xattr at %u\n",
             num_bits, (unsigned long long)block, v_start);
-       ret = ocfs2_insert_extent(osb, handle, inode, &et, v_start, block,
+       ret = ocfs2_insert_extent(handle, &et, v_start, block,
                                  num_bits, 0, ctxt->meta_ac);
        if (ret < 0) {
                mlog_errno(ret);
@@ -4798,10 +5046,13 @@ static int ocfs2_xattr_bucket_set_value_outside(struct inode *inode,
        struct ocfs2_xattr_entry *xe = xs->here;
        struct ocfs2_xattr_header *xh = bucket_xh(xs->bucket);
        void *base;
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_access = ocfs2_journal_access,
+       };
 
        BUG_ON(!xs->base || !xe || ocfs2_xattr_is_local(xe));
 
-       ret = ocfs2_xattr_bucket_get_name_value(inode, xh,
+       ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb, xh,
                                                xe - xh->xh_entries,
                                                &block_off,
                                                &offset);
@@ -4814,8 +5065,10 @@ static int ocfs2_xattr_bucket_set_value_outside(struct inode *inode,
        xv = (struct ocfs2_xattr_value_root *)(base + offset +
                 OCFS2_XATTR_SIZE(xe->xe_name_len));
 
+       vb.vb_xv = xv;
+       vb.vb_bh = xs->bucket->bu_bhs[block_off];
        ret = __ocfs2_xattr_set_value_outside(inode, handle,
-                                             xv, val, value_len);
+                                             &vb, val, value_len);
        if (ret)
                mlog_errno(ret);
 out:
@@ -4826,7 +5079,8 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode,
                                  struct buffer_head *root_bh,
                                  u64 blkno,
                                  u32 cpos,
-                                 u32 len)
+                                 u32 len,
+                                 void *para)
 {
        int ret;
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
@@ -4838,14 +5092,22 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode,
        struct ocfs2_cached_dealloc_ctxt dealloc;
        struct ocfs2_extent_tree et;
 
-       ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh);
+       ret = ocfs2_iterate_xattr_buckets(inode, blkno, len,
+                                         ocfs2_delete_xattr_in_bucket, para);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       ocfs2_init_xattr_tree_extent_tree(&et, INODE_CACHE(inode), root_bh);
 
        ocfs2_init_dealloc_ctxt(&dealloc);
 
        mlog(0, "rm xattr extent rec at %u len = %u, start from %llu\n",
             cpos, len, (unsigned long long)blkno);
 
-       ocfs2_remove_xattr_clusters_from_cache(inode, blkno, len);
+       ocfs2_remove_xattr_clusters_from_cache(INODE_CACHE(inode), blkno,
+                                              len);
 
        ret = ocfs2_lock_allocators(inode, &et, 0, 1, NULL, &meta_ac);
        if (ret) {
@@ -4870,14 +5132,14 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode,
                goto out;
        }
 
-       ret = ocfs2_journal_access_xb(handle, inode, root_bh,
+       ret = ocfs2_journal_access_xb(handle, INODE_CACHE(inode), root_bh,
                                      OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret) {
                mlog_errno(ret);
                goto out_commit;
        }
 
-       ret = ocfs2_remove_extent(inode, &et, cpos, len, handle, meta_ac,
+       ret = ocfs2_remove_extent(handle, &et, cpos, len, meta_ac,
                                  &dealloc);
        if (ret) {
                mlog_errno(ret);
@@ -5220,7 +5482,7 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
                                        struct ocfs2_xattr_bucket *bucket,
                                        void *para)
 {
-       int ret = 0;
+       int ret = 0, ref_credits;
        struct ocfs2_xattr_header *xh = bucket_xh(bucket);
        u16 i;
        struct ocfs2_xattr_entry *xe;
@@ -5228,7 +5490,9 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
        struct ocfs2_xattr_set_ctxt ctxt = {NULL, NULL,};
        int credits = ocfs2_remove_extent_credits(osb->sb) +
                ocfs2_blocks_per_xattr_bucket(inode->i_sb);
-
+       struct ocfs2_xattr_value_root *xv;
+       struct ocfs2_rm_xattr_bucket_para *args =
+                       (struct ocfs2_rm_xattr_bucket_para *)para;
 
        ocfs2_init_dealloc_ctxt(&ctxt.dealloc);
 
@@ -5237,7 +5501,16 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
                if (ocfs2_xattr_is_local(xe))
                        continue;
 
-               ctxt.handle = ocfs2_start_trans(osb, credits);
+               ret = ocfs2_get_xattr_tree_value_root(inode->i_sb, bucket,
+                                                     i, &xv, NULL);
+
+               ret = ocfs2_lock_xattr_remove_allocators(inode, xv,
+                                                        args->ref_ci,
+                                                        args->ref_root_bh,
+                                                        &ctxt.meta_ac,
+                                                        &ref_credits);
+
+               ctxt.handle = ocfs2_start_trans(osb, credits + ref_credits);
                if (IS_ERR(ctxt.handle)) {
                        ret = PTR_ERR(ctxt.handle);
                        mlog_errno(ret);
@@ -5248,63 +5521,1490 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
                                                        i, 0, &ctxt);
 
                ocfs2_commit_trans(osb, ctxt.handle);
+               if (ctxt.meta_ac) {
+                       ocfs2_free_alloc_context(ctxt.meta_ac);
+                       ctxt.meta_ac = NULL;
+               }
                if (ret) {
                        mlog_errno(ret);
                        break;
                }
        }
 
+       if (ctxt.meta_ac)
+               ocfs2_free_alloc_context(ctxt.meta_ac);
        ocfs2_schedule_truncate_log_flush(osb, 1);
        ocfs2_run_deallocs(osb, &ctxt.dealloc);
        return ret;
 }
 
-static int ocfs2_delete_xattr_index_block(struct inode *inode,
-                                         struct buffer_head *xb_bh)
+/*
+ * Whenever we modify a xattr value root in the bucket(e.g, CoW
+ * or change the extent record flag), we need to recalculate
+ * the metaecc for the whole bucket. So it is done here.
+ *
+ * Note:
+ * We have to give the extra credits for the caller.
+ */
+static int ocfs2_xattr_bucket_post_refcount(struct inode *inode,
+                                           handle_t *handle,
+                                           void *para)
 {
-       struct ocfs2_xattr_block *xb =
-                       (struct ocfs2_xattr_block *)xb_bh->b_data;
-       struct ocfs2_extent_list *el = &xb->xb_attrs.xb_root.xt_list;
-       int ret = 0;
-       u32 name_hash = UINT_MAX, e_cpos, num_clusters;
-       u64 p_blkno;
-
-       if (le16_to_cpu(el->l_next_free_rec) == 0)
-               return 0;
-
-       while (name_hash > 0) {
-               ret = ocfs2_xattr_get_rec(inode, name_hash, &p_blkno,
-                                         &e_cpos, &num_clusters, el);
-               if (ret) {
-                       mlog_errno(ret);
-                       goto out;
-               }
+       int ret;
+       struct ocfs2_xattr_bucket *bucket =
+                       (struct ocfs2_xattr_bucket *)para;
 
-               ret = ocfs2_iterate_xattr_buckets(inode, p_blkno, num_clusters,
-                                                 ocfs2_delete_xattr_in_bucket,
-                                                 NULL);
-               if (ret) {
-                       mlog_errno(ret);
-                       goto out;
-               }
+       ret = ocfs2_xattr_bucket_journal_access(handle, bucket,
+                                               OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
 
-               ret = ocfs2_rm_xattr_cluster(inode, xb_bh,
-                                            p_blkno, e_cpos, num_clusters);
-               if (ret) {
-                       mlog_errno(ret);
-                       break;
-               }
+       ocfs2_xattr_bucket_journal_dirty(handle, bucket);
 
-               if (e_cpos == 0)
-                       break;
+       return 0;
+}
 
-               name_hash = e_cpos - 1;
-       }
+/*
+ * Special action we need if the xattr value is refcounted.
+ *
+ * 1. If the xattr is refcounted, lock the tree.
+ * 2. CoW the xattr if we are setting the new value and the value
+ *    will be stored outside.
+ * 3. In other case, decrease_refcount will work for us, so just
+ *    lock the refcount tree, calculate the meta and credits is OK.
+ *
+ * We have to do CoW before ocfs2_init_xattr_set_ctxt since
+ * currently CoW is a completed transaction, while this function
+ * will also lock the allocators and let us deadlock. So we will
+ * CoW the whole xattr value.
+ */
+static int ocfs2_prepare_refcount_xattr(struct inode *inode,
+                                       struct ocfs2_dinode *di,
+                                       struct ocfs2_xattr_info *xi,
+                                       struct ocfs2_xattr_search *xis,
+                                       struct ocfs2_xattr_search *xbs,
+                                       struct ocfs2_refcount_tree **ref_tree,
+                                       int *meta_add,
+                                       int *credits)
+{
+       int ret = 0;
+       struct ocfs2_xattr_block *xb;
+       struct ocfs2_xattr_entry *xe;
+       char *base;
+       u32 p_cluster, num_clusters;
+       unsigned int ext_flags;
+       int name_offset, name_len;
+       struct ocfs2_xattr_value_buf vb;
+       struct ocfs2_xattr_bucket *bucket = NULL;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_post_refcount refcount;
+       struct ocfs2_post_refcount *p = NULL;
+       struct buffer_head *ref_root_bh = NULL;
+
+       if (!xis->not_found) {
+               xe = xis->here;
+               name_offset = le16_to_cpu(xe->xe_name_offset);
+               name_len = OCFS2_XATTR_SIZE(xe->xe_name_len);
+               base = xis->base;
+               vb.vb_bh = xis->inode_bh;
+               vb.vb_access = ocfs2_journal_access_di;
+       } else {
+               int i, block_off = 0;
+               xb = (struct ocfs2_xattr_block *)xbs->xattr_bh->b_data;
+               xe = xbs->here;
+               name_offset = le16_to_cpu(xe->xe_name_offset);
+               name_len = OCFS2_XATTR_SIZE(xe->xe_name_len);
+               i = xbs->here - xbs->header->xh_entries;
+
+               if (le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED) {
+                       ret = ocfs2_xattr_bucket_get_name_value(inode->i_sb,
+                                                       bucket_xh(xbs->bucket),
+                                                       i, &block_off,
+                                                       &name_offset);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+                       base = bucket_block(xbs->bucket, block_off);
+                       vb.vb_bh = xbs->bucket->bu_bhs[block_off];
+                       vb.vb_access = ocfs2_journal_access;
+
+                       if (ocfs2_meta_ecc(osb)) {
+                               /*create parameters for ocfs2_post_refcount. */
+                               bucket = xbs->bucket;
+                               refcount.credits = bucket->bu_blocks;
+                               refcount.para = bucket;
+                               refcount.func =
+                                       ocfs2_xattr_bucket_post_refcount;
+                               p = &refcount;
+                       }
+               } else {
+                       base = xbs->base;
+                       vb.vb_bh = xbs->xattr_bh;
+                       vb.vb_access = ocfs2_journal_access_xb;
+               }
+       }
+
+       if (ocfs2_xattr_is_local(xe))
+               goto out;
+
+       vb.vb_xv = (struct ocfs2_xattr_value_root *)
+                               (base + name_offset + name_len);
+
+       ret = ocfs2_xattr_get_clusters(inode, 0, &p_cluster,
+                                      &num_clusters, &vb.vb_xv->xr_list,
+                                      &ext_flags);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * We just need to check the 1st extent record, since we always
+        * CoW the whole xattr. So there shouldn't be a xattr with
+        * some REFCOUNT extent recs after the 1st one.
+        */
+       if (!(ext_flags & OCFS2_EXT_REFCOUNTED))
+               goto out;
+
+       ret = ocfs2_lock_refcount_tree(osb, le64_to_cpu(di->i_refcount_loc),
+                                      1, ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * If we are deleting the xattr or the new size will be stored inside,
+        * cool, leave it there, the xattr truncate process will remove them
+        * for us(it still needs the refcount tree lock and the meta, credits).
+        * And the worse case is that every cluster truncate will split the
+        * refcount tree, and make the original extent become 3. So we will need
+        * 2 * cluster more extent recs at most.
+        */
+       if (!xi->value || xi->value_len <= OCFS2_XATTR_INLINE_SIZE) {
+
+               ret = ocfs2_refcounted_xattr_delete_need(inode,
+                                                        &(*ref_tree)->rf_ci,
+                                                        ref_root_bh, vb.vb_xv,
+                                                        meta_add, credits);
+               if (ret)
+                       mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_refcount_cow_xattr(inode, di, &vb,
+                                      *ref_tree, ref_root_bh, 0,
+                                      le32_to_cpu(vb.vb_xv->xr_clusters), p);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       brelse(ref_root_bh);
+       return ret;
+}
+
+/*
+ * Add the REFCOUNTED flags for all the extent rec in ocfs2_xattr_value_root.
+ * The physical clusters will be added to refcount tree.
+ */
+static int ocfs2_xattr_value_attach_refcount(struct inode *inode,
+                               struct ocfs2_xattr_value_root *xv,
+                               struct ocfs2_extent_tree *value_et,
+                               struct ocfs2_caching_info *ref_ci,
+                               struct buffer_head *ref_root_bh,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc,
+                               struct ocfs2_post_refcount *refcount)
+{
+       int ret = 0;
+       u32 clusters = le32_to_cpu(xv->xr_clusters);
+       u32 cpos, p_cluster, num_clusters;
+       struct ocfs2_extent_list *el = &xv->xr_list;
+       unsigned int ext_flags;
+
+       cpos = 0;
+       while (cpos < clusters) {
+               ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
+                                              &num_clusters, el, &ext_flags);
+
+               cpos += num_clusters;
+               if ((ext_flags & OCFS2_EXT_REFCOUNTED))
+                       continue;
+
+               BUG_ON(!p_cluster);
+
+               ret = ocfs2_add_refcount_flag(inode, value_et,
+                                             ref_ci, ref_root_bh,
+                                             cpos - num_clusters,
+                                             p_cluster, num_clusters,
+                                             dealloc, refcount);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+       }
+
+       return ret;
+}
+
+/*
+ * Given a normal ocfs2_xattr_header, refcount all the entries which
+ * have value stored outside.
+ * Used for xattrs stored in inode and ocfs2_xattr_block.
+ */
+static int ocfs2_xattr_attach_refcount_normal(struct inode *inode,
+                               struct ocfs2_xattr_value_buf *vb,
+                               struct ocfs2_xattr_header *header,
+                               struct ocfs2_caching_info *ref_ci,
+                               struct buffer_head *ref_root_bh,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+
+       struct ocfs2_xattr_entry *xe;
+       struct ocfs2_xattr_value_root *xv;
+       struct ocfs2_extent_tree et;
+       int i, ret = 0;
+
+       for (i = 0; i < le16_to_cpu(header->xh_count); i++) {
+               xe = &header->xh_entries[i];
+
+               if (ocfs2_xattr_is_local(xe))
+                       continue;
+
+               xv = (struct ocfs2_xattr_value_root *)((void *)header +
+                       le16_to_cpu(xe->xe_name_offset) +
+                       OCFS2_XATTR_SIZE(xe->xe_name_len));
+
+               vb->vb_xv = xv;
+               ocfs2_init_xattr_value_extent_tree(&et, INODE_CACHE(inode), vb);
+
+               ret = ocfs2_xattr_value_attach_refcount(inode, xv, &et,
+                                                       ref_ci, ref_root_bh,
+                                                       dealloc, NULL);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+       }
+
+       return ret;
+}
+
+static int ocfs2_xattr_inline_attach_refcount(struct inode *inode,
+                               struct buffer_head *fe_bh,
+                               struct ocfs2_caching_info *ref_ci,
+                               struct buffer_head *ref_root_bh,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)fe_bh->b_data;
+       struct ocfs2_xattr_header *header = (struct ocfs2_xattr_header *)
+                               (fe_bh->b_data + inode->i_sb->s_blocksize -
+                               le16_to_cpu(di->i_xattr_inline_size));
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_bh = fe_bh,
+               .vb_access = ocfs2_journal_access_di,
+       };
+
+       return ocfs2_xattr_attach_refcount_normal(inode, &vb, header,
+                                                 ref_ci, ref_root_bh, dealloc);
+}
+
+struct ocfs2_xattr_tree_value_refcount_para {
+       struct ocfs2_caching_info *ref_ci;
+       struct buffer_head *ref_root_bh;
+       struct ocfs2_cached_dealloc_ctxt *dealloc;
+};
+
+static int ocfs2_get_xattr_tree_value_root(struct super_block *sb,
+                                          struct ocfs2_xattr_bucket *bucket,
+                                          int offset,
+                                          struct ocfs2_xattr_value_root **xv,
+                                          struct buffer_head **bh)
+{
+       int ret, block_off, name_offset;
+       struct ocfs2_xattr_header *xh = bucket_xh(bucket);
+       struct ocfs2_xattr_entry *xe = &xh->xh_entries[offset];
+       void *base;
+
+       ret = ocfs2_xattr_bucket_get_name_value(sb,
+                                               bucket_xh(bucket),
+                                               offset,
+                                               &block_off,
+                                               &name_offset);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       base = bucket_block(bucket, block_off);
+
+       *xv = (struct ocfs2_xattr_value_root *)(base + name_offset +
+                        OCFS2_XATTR_SIZE(xe->xe_name_len));
+
+       if (bh)
+               *bh = bucket->bu_bhs[block_off];
+out:
+       return ret;
+}
+
+/*
+ * For a given xattr bucket, refcount all the entries which
+ * have value stored outside.
+ */
+static int ocfs2_xattr_bucket_value_refcount(struct inode *inode,
+                                            struct ocfs2_xattr_bucket *bucket,
+                                            void *para)
+{
+       int i, ret = 0;
+       struct ocfs2_extent_tree et;
+       struct ocfs2_xattr_tree_value_refcount_para *ref =
+                       (struct ocfs2_xattr_tree_value_refcount_para *)para;
+       struct ocfs2_xattr_header *xh =
+                       (struct ocfs2_xattr_header *)bucket->bu_bhs[0]->b_data;
+       struct ocfs2_xattr_entry *xe;
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_access = ocfs2_journal_access,
+       };
+       struct ocfs2_post_refcount refcount = {
+               .credits = bucket->bu_blocks,
+               .para = bucket,
+               .func = ocfs2_xattr_bucket_post_refcount,
+       };
+       struct ocfs2_post_refcount *p = NULL;
+
+       /* We only need post_refcount if we support metaecc. */
+       if (ocfs2_meta_ecc(OCFS2_SB(inode->i_sb)))
+               p = &refcount;
+
+       mlog(0, "refcount bucket %llu, count = %u\n",
+            (unsigned long long)bucket_blkno(bucket),
+            le16_to_cpu(xh->xh_count));
+       for (i = 0; i < le16_to_cpu(xh->xh_count); i++) {
+               xe = &xh->xh_entries[i];
+
+               if (ocfs2_xattr_is_local(xe))
+                       continue;
+
+               ret = ocfs2_get_xattr_tree_value_root(inode->i_sb, bucket, i,
+                                                     &vb.vb_xv, &vb.vb_bh);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ocfs2_init_xattr_value_extent_tree(&et,
+                                                  INODE_CACHE(inode), &vb);
+
+               ret = ocfs2_xattr_value_attach_refcount(inode, vb.vb_xv,
+                                                       &et, ref->ref_ci,
+                                                       ref->ref_root_bh,
+                                                       ref->dealloc, p);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+       }
+
+       return ret;
+
+}
+
+static int ocfs2_refcount_xattr_tree_rec(struct inode *inode,
+                                    struct buffer_head *root_bh,
+                                    u64 blkno, u32 cpos, u32 len, void *para)
+{
+       return ocfs2_iterate_xattr_buckets(inode, blkno, len,
+                                          ocfs2_xattr_bucket_value_refcount,
+                                          para);
+}
+
+static int ocfs2_xattr_block_attach_refcount(struct inode *inode,
+                               struct buffer_head *blk_bh,
+                               struct ocfs2_caching_info *ref_ci,
+                               struct buffer_head *ref_root_bh,
+                               struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret = 0;
+       struct ocfs2_xattr_block *xb =
+                               (struct ocfs2_xattr_block *)blk_bh->b_data;
+
+       if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)) {
+               struct ocfs2_xattr_header *header = &xb->xb_attrs.xb_header;
+               struct ocfs2_xattr_value_buf vb = {
+                       .vb_bh = blk_bh,
+                       .vb_access = ocfs2_journal_access_xb,
+               };
+
+               ret = ocfs2_xattr_attach_refcount_normal(inode, &vb, header,
+                                                        ref_ci, ref_root_bh,
+                                                        dealloc);
+       } else {
+               struct ocfs2_xattr_tree_value_refcount_para para = {
+                       .ref_ci = ref_ci,
+                       .ref_root_bh = ref_root_bh,
+                       .dealloc = dealloc,
+               };
+
+               ret = ocfs2_iterate_xattr_index_block(inode, blk_bh,
+                                               ocfs2_refcount_xattr_tree_rec,
+                                               &para);
+       }
+
+       return ret;
+}
+
+int ocfs2_xattr_attach_refcount_tree(struct inode *inode,
+                                    struct buffer_head *fe_bh,
+                                    struct ocfs2_caching_info *ref_ci,
+                                    struct buffer_head *ref_root_bh,
+                                    struct ocfs2_cached_dealloc_ctxt *dealloc)
+{
+       int ret = 0;
+       struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)fe_bh->b_data;
+       struct buffer_head *blk_bh = NULL;
+
+       if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) {
+               ret = ocfs2_xattr_inline_attach_refcount(inode, fe_bh,
+                                                        ref_ci, ref_root_bh,
+                                                        dealloc);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
+       if (!di->i_xattr_loc)
+               goto out;
+
+       ret = ocfs2_read_xattr_block(inode, le64_to_cpu(di->i_xattr_loc),
+                                    &blk_bh);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_xattr_block_attach_refcount(inode, blk_bh, ref_ci,
+                                               ref_root_bh, dealloc);
+       if (ret)
+               mlog_errno(ret);
+
+       brelse(blk_bh);
+out:
+
+       return ret;
+}
+
+typedef int (should_xattr_reflinked)(struct ocfs2_xattr_entry *xe);
+/*
+ * Store the information we need in xattr reflink.
+ * old_bh and new_bh are inode bh for the old and new inode.
+ */
+struct ocfs2_xattr_reflink {
+       struct inode *old_inode;
+       struct inode *new_inode;
+       struct buffer_head *old_bh;
+       struct buffer_head *new_bh;
+       struct ocfs2_caching_info *ref_ci;
+       struct buffer_head *ref_root_bh;
+       struct ocfs2_cached_dealloc_ctxt *dealloc;
+       should_xattr_reflinked *xattr_reflinked;
+};
+
+/*
+ * Given a xattr header and xe offset,
+ * return the proper xv and the corresponding bh.
+ * xattr in inode, block and xattr tree have different implementaions.
+ */
+typedef int (get_xattr_value_root)(struct super_block *sb,
+                                  struct buffer_head *bh,
+                                  struct ocfs2_xattr_header *xh,
+                                  int offset,
+                                  struct ocfs2_xattr_value_root **xv,
+                                  struct buffer_head **ret_bh,
+                                  void *para);
+
+/*
+ * Calculate all the xattr value root metadata stored in this xattr header and
+ * credits we need if we create them from the scratch.
+ * We use get_xattr_value_root so that all types of xattr container can use it.
+ */
+static int ocfs2_value_metas_in_xattr_header(struct super_block *sb,
+                                            struct buffer_head *bh,
+                                            struct ocfs2_xattr_header *xh,
+                                            int *metas, int *credits,
+                                            int *num_recs,
+                                            get_xattr_value_root *func,
+                                            void *para)
+{
+       int i, ret = 0;
+       struct ocfs2_xattr_value_root *xv;
+       struct ocfs2_xattr_entry *xe;
+
+       for (i = 0; i < le16_to_cpu(xh->xh_count); i++) {
+               xe = &xh->xh_entries[i];
+               if (ocfs2_xattr_is_local(xe))
+                       continue;
+
+               ret = func(sb, bh, xh, i, &xv, NULL, para);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               *metas += le16_to_cpu(xv->xr_list.l_tree_depth) *
+                         le16_to_cpu(xv->xr_list.l_next_free_rec);
+
+               *credits += ocfs2_calc_extend_credits(sb,
+                                               &def_xv.xv.xr_list,
+                                               le32_to_cpu(xv->xr_clusters));
+
+               /*
+                * If the value is a tree with depth > 1, We don't go deep
+                * to the extent block, so just calculate a maximum record num.
+                */
+               if (!xv->xr_list.l_tree_depth)
+                       *num_recs += xv->xr_list.l_next_free_rec;
+               else
+                       *num_recs += ocfs2_clusters_for_bytes(sb,
+                                                             XATTR_SIZE_MAX);
+       }
+
+       return ret;
+}
+
+/* Used by xattr inode and block to return the right xv and buffer_head. */
+static int ocfs2_get_xattr_value_root(struct super_block *sb,
+                                     struct buffer_head *bh,
+                                     struct ocfs2_xattr_header *xh,
+                                     int offset,
+                                     struct ocfs2_xattr_value_root **xv,
+                                     struct buffer_head **ret_bh,
+                                     void *para)
+{
+       struct ocfs2_xattr_entry *xe = &xh->xh_entries[offset];
+
+       *xv = (struct ocfs2_xattr_value_root *)((void *)xh +
+               le16_to_cpu(xe->xe_name_offset) +
+               OCFS2_XATTR_SIZE(xe->xe_name_len));
+
+       if (ret_bh)
+               *ret_bh = bh;
+
+       return 0;
+}
+
+/*
+ * Lock the meta_ac and caculate how much credits we need for reflink xattrs.
+ * It is only used for inline xattr and xattr block.
+ */
+static int ocfs2_reflink_lock_xattr_allocators(struct ocfs2_super *osb,
+                                       struct ocfs2_xattr_header *xh,
+                                       struct buffer_head *ref_root_bh,
+                                       int *credits,
+                                       struct ocfs2_alloc_context **meta_ac)
+{
+       int ret, meta_add = 0, num_recs = 0;
+       struct ocfs2_refcount_block *rb =
+                       (struct ocfs2_refcount_block *)ref_root_bh->b_data;
+
+       *credits = 0;
+
+       ret = ocfs2_value_metas_in_xattr_header(osb->sb, NULL, xh,
+                                               &meta_add, credits, &num_recs,
+                                               ocfs2_get_xattr_value_root,
+                                               NULL);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       /*
+        * We need to add/modify num_recs in refcount tree, so just calculate
+        * an approximate number we need for refcount tree change.
+        * Sometimes we need to split the tree, and after split,  half recs
+        * will be moved to the new block, and a new block can only provide
+        * half number of recs. So we multiple new blocks by 2.
+        */
+       num_recs = num_recs / ocfs2_refcount_recs_per_rb(osb->sb) * 2;
+       meta_add += num_recs;
+       *credits += num_recs + num_recs * OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
+       if (le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL)
+               *credits += le16_to_cpu(rb->rf_list.l_tree_depth) *
+                           le16_to_cpu(rb->rf_list.l_next_free_rec) + 1;
+       else
+               *credits += 1;
+
+       ret = ocfs2_reserve_new_metadata_blocks(osb, meta_add, meta_ac);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       return ret;
+}
+
+/*
+ * Given a xattr header, reflink all the xattrs in this container.
+ * It can be used for inode, block and bucket.
+ *
+ * NOTE:
+ * Before we call this function, the caller has memcpy the xattr in
+ * old_xh to the new_xh.
+ *
+ * If args.xattr_reflinked is set, call it to decide whether the xe should
+ * be reflinked or not. If not, remove it from the new xattr header.
+ */
+static int ocfs2_reflink_xattr_header(handle_t *handle,
+                                     struct ocfs2_xattr_reflink *args,
+                                     struct buffer_head *old_bh,
+                                     struct ocfs2_xattr_header *xh,
+                                     struct buffer_head *new_bh,
+                                     struct ocfs2_xattr_header *new_xh,
+                                     struct ocfs2_xattr_value_buf *vb,
+                                     struct ocfs2_alloc_context *meta_ac,
+                                     get_xattr_value_root *func,
+                                     void *para)
+{
+       int ret = 0, i, j;
+       struct super_block *sb = args->old_inode->i_sb;
+       struct buffer_head *value_bh;
+       struct ocfs2_xattr_entry *xe, *last;
+       struct ocfs2_xattr_value_root *xv, *new_xv;
+       struct ocfs2_extent_tree data_et;
+       u32 clusters, cpos, p_cluster, num_clusters;
+       unsigned int ext_flags = 0;
+
+       mlog(0, "reflink xattr in container %llu, count = %u\n",
+            (unsigned long long)old_bh->b_blocknr, le16_to_cpu(xh->xh_count));
+
+       last = &new_xh->xh_entries[le16_to_cpu(new_xh->xh_count)];
+       for (i = 0, j = 0; i < le16_to_cpu(xh->xh_count); i++, j++) {
+               xe = &xh->xh_entries[i];
+
+               if (args->xattr_reflinked && !args->xattr_reflinked(xe)) {
+                       xe = &new_xh->xh_entries[j];
+
+                       le16_add_cpu(&new_xh->xh_count, -1);
+                       if (new_xh->xh_count) {
+                               memmove(xe, xe + 1,
+                                       (void *)last - (void *)xe);
+                               memset(last, 0,
+                                      sizeof(struct ocfs2_xattr_entry));
+                       }
+
+                       /*
+                        * We don't want j to increase in the next round since
+                        * it is already moved ahead.
+                        */
+                       j--;
+                       continue;
+               }
+
+               if (ocfs2_xattr_is_local(xe))
+                       continue;
+
+               ret = func(sb, old_bh, xh, i, &xv, NULL, para);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ret = func(sb, new_bh, new_xh, j, &new_xv, &value_bh, para);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               /*
+                * For the xattr which has l_tree_depth = 0, all the extent
+                * recs have already be copied to the new xh with the
+                * propriate OCFS2_EXT_REFCOUNTED flag we just need to
+                * increase the refount count int the refcount tree.
+                *
+                * For the xattr which has l_tree_depth > 0, we need
+                * to initialize it to the empty default value root,
+                * and then insert the extents one by one.
+                */
+               if (xv->xr_list.l_tree_depth) {
+                       memcpy(new_xv, &def_xv, sizeof(def_xv));
+                       vb->vb_xv = new_xv;
+                       vb->vb_bh = value_bh;
+                       ocfs2_init_xattr_value_extent_tree(&data_et,
+                                       INODE_CACHE(args->new_inode), vb);
+               }
+
+               clusters = le32_to_cpu(xv->xr_clusters);
+               cpos = 0;
+               while (cpos < clusters) {
+                       ret = ocfs2_xattr_get_clusters(args->old_inode,
+                                                      cpos,
+                                                      &p_cluster,
+                                                      &num_clusters,
+                                                      &xv->xr_list,
+                                                      &ext_flags);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+
+                       BUG_ON(!p_cluster);
+
+                       if (xv->xr_list.l_tree_depth) {
+                               ret = ocfs2_insert_extent(handle,
+                                               &data_et, cpos,
+                                               ocfs2_clusters_to_blocks(
+                                                       args->old_inode->i_sb,
+                                                       p_cluster),
+                                               num_clusters, ext_flags,
+                                               meta_ac);
+                               if (ret) {
+                                       mlog_errno(ret);
+                                       goto out;
+                               }
+                       }
+
+                       ret = ocfs2_increase_refcount(handle, args->ref_ci,
+                                                     args->ref_root_bh,
+                                                     p_cluster, num_clusters,
+                                                     meta_ac, args->dealloc);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto out;
+                       }
+
+                       cpos += num_clusters;
+               }
+       }
+
+out:
+       return ret;
+}
+
+static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args)
+{
+       int ret = 0, credits = 0;
+       handle_t *handle;
+       struct ocfs2_super *osb = OCFS2_SB(args->old_inode->i_sb);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)args->old_bh->b_data;
+       int inline_size = le16_to_cpu(di->i_xattr_inline_size);
+       int header_off = osb->sb->s_blocksize - inline_size;
+       struct ocfs2_xattr_header *xh = (struct ocfs2_xattr_header *)
+                                       (args->old_bh->b_data + header_off);
+       struct ocfs2_xattr_header *new_xh = (struct ocfs2_xattr_header *)
+                                       (args->new_bh->b_data + header_off);
+       struct ocfs2_alloc_context *meta_ac = NULL;
+       struct ocfs2_inode_info *new_oi;
+       struct ocfs2_dinode *new_di;
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_bh = args->new_bh,
+               .vb_access = ocfs2_journal_access_di,
+       };
+
+       ret = ocfs2_reflink_lock_xattr_allocators(osb, xh, args->ref_root_bh,
+                                                 &credits, &meta_ac);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_journal_access_di(handle, INODE_CACHE(args->new_inode),
+                                     args->new_bh, OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       memcpy(args->new_bh->b_data + header_off,
+              args->old_bh->b_data + header_off, inline_size);
+
+       new_di = (struct ocfs2_dinode *)args->new_bh->b_data;
+       new_di->i_xattr_inline_size = cpu_to_le16(inline_size);
+
+       ret = ocfs2_reflink_xattr_header(handle, args, args->old_bh, xh,
+                                        args->new_bh, new_xh, &vb, meta_ac,
+                                        ocfs2_get_xattr_value_root, NULL);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       new_oi = OCFS2_I(args->new_inode);
+       spin_lock(&new_oi->ip_lock);
+       new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;
+       new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);
+       spin_unlock(&new_oi->ip_lock);
+
+       ocfs2_journal_dirty(handle, args->new_bh);
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+
+out:
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+       return ret;
+}
+
+static int ocfs2_create_empty_xattr_block(struct inode *inode,
+                                         struct buffer_head *fe_bh,
+                                         struct buffer_head **ret_bh,
+                                         int indexed)
+{
+       int ret;
+       handle_t *handle;
+       struct ocfs2_alloc_context *meta_ac;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+
+       ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
+       if (ret < 0) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       handle = ocfs2_start_trans(osb, OCFS2_XATTR_BLOCK_CREATE_CREDITS);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       mlog(0, "create new xattr block for inode %llu, index = %d\n",
+            (unsigned long long)fe_bh->b_blocknr, indexed);
+       ret = ocfs2_create_xattr_block(handle, inode, fe_bh,
+                                      meta_ac, ret_bh, indexed);
+       if (ret)
+               mlog_errno(ret);
+
+       ocfs2_commit_trans(osb, handle);
+out:
+       ocfs2_free_alloc_context(meta_ac);
+       return ret;
+}
+
+static int ocfs2_reflink_xattr_block(struct ocfs2_xattr_reflink *args,
+                                    struct buffer_head *blk_bh,
+                                    struct buffer_head *new_blk_bh)
+{
+       int ret = 0, credits = 0;
+       handle_t *handle;
+       struct ocfs2_inode_info *new_oi = OCFS2_I(args->new_inode);
+       struct ocfs2_dinode *new_di;
+       struct ocfs2_super *osb = OCFS2_SB(args->new_inode->i_sb);
+       int header_off = offsetof(struct ocfs2_xattr_block, xb_attrs.xb_header);
+       struct ocfs2_xattr_block *xb =
+                       (struct ocfs2_xattr_block *)blk_bh->b_data;
+       struct ocfs2_xattr_header *xh = &xb->xb_attrs.xb_header;
+       struct ocfs2_xattr_block *new_xb =
+                       (struct ocfs2_xattr_block *)new_blk_bh->b_data;
+       struct ocfs2_xattr_header *new_xh = &new_xb->xb_attrs.xb_header;
+       struct ocfs2_alloc_context *meta_ac;
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_bh = new_blk_bh,
+               .vb_access = ocfs2_journal_access_xb,
+       };
+
+       ret = ocfs2_reflink_lock_xattr_allocators(osb, xh, args->ref_root_bh,
+                                                 &credits, &meta_ac);
+       if (ret) {
+               mlog_errno(ret);
+               return ret;
+       }
+
+       /* One more credits in case we need to add xattr flags in new inode. */
+       handle = ocfs2_start_trans(osb, credits + 1);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (!(new_oi->ip_dyn_features & OCFS2_HAS_XATTR_FL)) {
+               ret = ocfs2_journal_access_di(handle,
+                                             INODE_CACHE(args->new_inode),
+                                             args->new_bh,
+                                             OCFS2_JOURNAL_ACCESS_WRITE);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_commit;
+               }
+       }
+
+       ret = ocfs2_journal_access_xb(handle, INODE_CACHE(args->new_inode),
+                                     new_blk_bh, OCFS2_JOURNAL_ACCESS_WRITE);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       memcpy(new_blk_bh->b_data + header_off, blk_bh->b_data + header_off,
+              osb->sb->s_blocksize - header_off);
+
+       ret = ocfs2_reflink_xattr_header(handle, args, blk_bh, xh,
+                                        new_blk_bh, new_xh, &vb, meta_ac,
+                                        ocfs2_get_xattr_value_root, NULL);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       ocfs2_journal_dirty(handle, new_blk_bh);
+
+       if (!(new_oi->ip_dyn_features & OCFS2_HAS_XATTR_FL)) {
+               new_di = (struct ocfs2_dinode *)args->new_bh->b_data;
+               spin_lock(&new_oi->ip_lock);
+               new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL;
+               new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);
+               spin_unlock(&new_oi->ip_lock);
+
+               ocfs2_journal_dirty(handle, args->new_bh);
+       }
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+
+out:
+       ocfs2_free_alloc_context(meta_ac);
+       return ret;
+}
+
+struct ocfs2_reflink_xattr_tree_args {
+       struct ocfs2_xattr_reflink *reflink;
+       struct buffer_head *old_blk_bh;
+       struct buffer_head *new_blk_bh;
+       struct ocfs2_xattr_bucket *old_bucket;
+       struct ocfs2_xattr_bucket *new_bucket;
+};
+
+/*
+ * NOTE:
+ * We have to handle the case that both old bucket and new bucket
+ * will call this function to get the right ret_bh.
+ * So The caller must give us the right bh.
+ */
+static int ocfs2_get_reflink_xattr_value_root(struct super_block *sb,
+                                       struct buffer_head *bh,
+                                       struct ocfs2_xattr_header *xh,
+                                       int offset,
+                                       struct ocfs2_xattr_value_root **xv,
+                                       struct buffer_head **ret_bh,
+                                       void *para)
+{
+       struct ocfs2_reflink_xattr_tree_args *args =
+                       (struct ocfs2_reflink_xattr_tree_args *)para;
+       struct ocfs2_xattr_bucket *bucket;
+
+       if (bh == args->old_bucket->bu_bhs[0])
+               bucket = args->old_bucket;
+       else
+               bucket = args->new_bucket;
+
+       return ocfs2_get_xattr_tree_value_root(sb, bucket, offset,
+                                              xv, ret_bh);
+}
+
+struct ocfs2_value_tree_metas {
+       int num_metas;
+       int credits;
+       int num_recs;
+};
+
+static int ocfs2_value_tree_metas_in_bucket(struct super_block *sb,
+                                       struct buffer_head *bh,
+                                       struct ocfs2_xattr_header *xh,
+                                       int offset,
+                                       struct ocfs2_xattr_value_root **xv,
+                                       struct buffer_head **ret_bh,
+                                       void *para)
+{
+       struct ocfs2_xattr_bucket *bucket =
+                               (struct ocfs2_xattr_bucket *)para;
+
+       return ocfs2_get_xattr_tree_value_root(sb, bucket, offset,
+                                              xv, ret_bh);
+}
+
+static int ocfs2_calc_value_tree_metas(struct inode *inode,
+                                     struct ocfs2_xattr_bucket *bucket,
+                                     void *para)
+{
+       struct ocfs2_value_tree_metas *metas =
+                       (struct ocfs2_value_tree_metas *)para;
+       struct ocfs2_xattr_header *xh =
+                       (struct ocfs2_xattr_header *)bucket->bu_bhs[0]->b_data;
+
+       /* Add the credits for this bucket first. */
+       metas->credits += bucket->bu_blocks;
+       return ocfs2_value_metas_in_xattr_header(inode->i_sb, bucket->bu_bhs[0],
+                                       xh, &metas->num_metas,
+                                       &metas->credits, &metas->num_recs,
+                                       ocfs2_value_tree_metas_in_bucket,
+                                       bucket);
+}
+
+/*
+ * Given a xattr extent rec starting from blkno and having len clusters,
+ * iterate all the buckets calculate how much metadata we need for reflinking
+ * all the ocfs2_xattr_value_root and lock the allocators accordingly.
+ */
+static int ocfs2_lock_reflink_xattr_rec_allocators(
+                               struct ocfs2_reflink_xattr_tree_args *args,
+                               struct ocfs2_extent_tree *xt_et,
+                               u64 blkno, u32 len, int *credits,
+                               struct ocfs2_alloc_context **meta_ac,
+                               struct ocfs2_alloc_context **data_ac)
+{
+       int ret, num_free_extents;
+       struct ocfs2_value_tree_metas metas;
+       struct ocfs2_super *osb = OCFS2_SB(args->reflink->old_inode->i_sb);
+       struct ocfs2_refcount_block *rb;
+
+       memset(&metas, 0, sizeof(metas));
+
+       ret = ocfs2_iterate_xattr_buckets(args->reflink->old_inode, blkno, len,
+                                         ocfs2_calc_value_tree_metas, &metas);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       *credits = metas.credits;
+
+       /*
+        * Calculate we need for refcount tree change.
+        *
+        * We need to add/modify num_recs in refcount tree, so just calculate
+        * an approximate number we need for refcount tree change.
+        * Sometimes we need to split the tree, and after split,  half recs
+        * will be moved to the new block, and a new block can only provide
+        * half number of recs. So we multiple new blocks by 2.
+        * In the end, we have to add credits for modifying the already
+        * existed refcount block.
+        */
+       rb = (struct ocfs2_refcount_block *)args->reflink->ref_root_bh->b_data;
+       metas.num_recs =
+               (metas.num_recs + ocfs2_refcount_recs_per_rb(osb->sb) - 1) /
+                ocfs2_refcount_recs_per_rb(osb->sb) * 2;
+       metas.num_metas += metas.num_recs;
+       *credits += metas.num_recs +
+                   metas.num_recs * OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
+       if (le32_to_cpu(rb->rf_flags) & OCFS2_REFCOUNT_TREE_FL)
+               *credits += le16_to_cpu(rb->rf_list.l_tree_depth) *
+                           le16_to_cpu(rb->rf_list.l_next_free_rec) + 1;
+       else
+               *credits += 1;
+
+       /* count in the xattr tree change. */
+       num_free_extents = ocfs2_num_free_extents(osb, xt_et);
+       if (num_free_extents < 0) {
+               ret = num_free_extents;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (num_free_extents < len)
+               metas.num_metas += ocfs2_extend_meta_needed(xt_et->et_root_el);
+
+       *credits += ocfs2_calc_extend_credits(osb->sb,
+                                             xt_et->et_root_el, len);
+
+       if (metas.num_metas) {
+               ret = ocfs2_reserve_new_metadata_blocks(osb, metas.num_metas,
+                                                       meta_ac);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out;
+               }
+       }
+
+       if (len) {
+               ret = ocfs2_reserve_clusters(osb, len, data_ac);
+               if (ret)
+                       mlog_errno(ret);
+       }
+out:
+       if (ret) {
+               if (*meta_ac) {
+                       ocfs2_free_alloc_context(*meta_ac);
+                       meta_ac = NULL;
+               }
+       }
+
+       return ret;
+}
+
+static int ocfs2_reflink_xattr_buckets(handle_t *handle,
+                               u64 blkno, u64 new_blkno, u32 clusters,
+                               struct ocfs2_alloc_context *meta_ac,
+                               struct ocfs2_alloc_context *data_ac,
+                               struct ocfs2_reflink_xattr_tree_args *args)
+{
+       int i, j, ret = 0;
+       struct super_block *sb = args->reflink->old_inode->i_sb;
+       u32 bpc = ocfs2_xattr_buckets_per_cluster(OCFS2_SB(sb));
+       u32 num_buckets = clusters * bpc;
+       int bpb = args->old_bucket->bu_blocks;
+       struct ocfs2_xattr_value_buf vb = {
+               .vb_access = ocfs2_journal_access,
+       };
+
+       for (i = 0; i < num_buckets; i++, blkno += bpb, new_blkno += bpb) {
+               ret = ocfs2_read_xattr_bucket(args->old_bucket, blkno);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ret = ocfs2_init_xattr_bucket(args->new_bucket, new_blkno);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               /*
+                * The real bucket num in this series of blocks is stored
+                * in the 1st bucket.
+                */
+               if (i == 0)
+                       num_buckets = le16_to_cpu(
+                               bucket_xh(args->old_bucket)->xh_num_buckets);
+
+               ret = ocfs2_xattr_bucket_journal_access(handle,
+                                               args->new_bucket,
+                                               OCFS2_JOURNAL_ACCESS_CREATE);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               for (j = 0; j < bpb; j++)
+                       memcpy(bucket_block(args->new_bucket, j),
+                              bucket_block(args->old_bucket, j),
+                              sb->s_blocksize);
+
+               ocfs2_xattr_bucket_journal_dirty(handle, args->new_bucket);
+
+               ret = ocfs2_reflink_xattr_header(handle, args->reflink,
+                                       args->old_bucket->bu_bhs[0],
+                                       bucket_xh(args->old_bucket),
+                                       args->new_bucket->bu_bhs[0],
+                                       bucket_xh(args->new_bucket),
+                                       &vb, meta_ac,
+                                       ocfs2_get_reflink_xattr_value_root,
+                                       args);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               /*
+                * Re-access and dirty the bucket to calculate metaecc.
+                * Because we may extend the transaction in reflink_xattr_header
+                * which will let the already accessed block gone.
+                */
+               ret = ocfs2_xattr_bucket_journal_access(handle,
+                                               args->new_bucket,
+                                               OCFS2_JOURNAL_ACCESS_WRITE);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
+
+               ocfs2_xattr_bucket_journal_dirty(handle, args->new_bucket);
+               ocfs2_xattr_bucket_relse(args->old_bucket);
+               ocfs2_xattr_bucket_relse(args->new_bucket);
+       }
+
+       ocfs2_xattr_bucket_relse(args->old_bucket);
+       ocfs2_xattr_bucket_relse(args->new_bucket);
+       return ret;
+}
+/*
+ * Create the same xattr extent record in the new inode's xattr tree.
+ */
+static int ocfs2_reflink_xattr_rec(struct inode *inode,
+                                  struct buffer_head *root_bh,
+                                  u64 blkno,
+                                  u32 cpos,
+                                  u32 len,
+                                  void *para)
+{
+       int ret, credits = 0;
+       u32 p_cluster, num_clusters;
+       u64 new_blkno;
+       handle_t *handle;
+       struct ocfs2_reflink_xattr_tree_args *args =
+                       (struct ocfs2_reflink_xattr_tree_args *)para;
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct ocfs2_alloc_context *meta_ac = NULL;
+       struct ocfs2_alloc_context *data_ac = NULL;
+       struct ocfs2_extent_tree et;
+
+       ocfs2_init_xattr_tree_extent_tree(&et,
+                                         INODE_CACHE(args->reflink->new_inode),
+                                         args->new_blk_bh);
+
+       ret = ocfs2_lock_reflink_xattr_rec_allocators(args, &et, blkno,
+                                                     len, &credits,
+                                                     &meta_ac, &data_ac);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       handle = ocfs2_start_trans(osb, credits);
+       if (IS_ERR(handle)) {
+               ret = PTR_ERR(handle);
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_claim_clusters(osb, handle, data_ac,
+                                  len, &p_cluster, &num_clusters);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       new_blkno = ocfs2_clusters_to_blocks(osb->sb, p_cluster);
+
+       mlog(0, "reflink xattr buckets %llu to %llu, len %u\n",
+            (unsigned long long)blkno, (unsigned long long)new_blkno, len);
+       ret = ocfs2_reflink_xattr_buckets(handle, blkno, new_blkno, len,
+                                         meta_ac, data_ac, args);
+       if (ret) {
+               mlog_errno(ret);
+               goto out_commit;
+       }
+
+       mlog(0, "insert new xattr extent rec start %llu len %u to %u\n",
+            (unsigned long long)new_blkno, len, cpos);
+       ret = ocfs2_insert_extent(handle, &et, cpos, new_blkno,
+                                 len, 0, meta_ac);
+       if (ret)
+               mlog_errno(ret);
+
+out_commit:
+       ocfs2_commit_trans(osb, handle);
+
+out:
+       if (meta_ac)
+               ocfs2_free_alloc_context(meta_ac);
+       if (data_ac)
+               ocfs2_free_alloc_context(data_ac);
+       return ret;
+}
+
+/*
+ * Create reflinked xattr buckets.
+ * We will add bucket one by one, and refcount all the xattrs in the bucket
+ * if they are stored outside.
+ */
+static int ocfs2_reflink_xattr_tree(struct ocfs2_xattr_reflink *args,
+                                   struct buffer_head *blk_bh,
+                                   struct buffer_head *new_blk_bh)
+{
+       int ret;
+       struct ocfs2_reflink_xattr_tree_args para;
+
+       memset(&para, 0, sizeof(para));
+       para.reflink = args;
+       para.old_blk_bh = blk_bh;
+       para.new_blk_bh = new_blk_bh;
+
+       para.old_bucket = ocfs2_xattr_bucket_new(args->old_inode);
+       if (!para.old_bucket) {
+               mlog_errno(-ENOMEM);
+               return -ENOMEM;
+       }
+
+       para.new_bucket = ocfs2_xattr_bucket_new(args->new_inode);
+       if (!para.new_bucket) {
+               ret = -ENOMEM;
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ret = ocfs2_iterate_xattr_index_block(args->old_inode, blk_bh,
+                                             ocfs2_reflink_xattr_rec,
+                                             &para);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       ocfs2_xattr_bucket_free(para.old_bucket);
+       ocfs2_xattr_bucket_free(para.new_bucket);
+       return ret;
+}
+
+static int ocfs2_reflink_xattr_in_block(struct ocfs2_xattr_reflink *args,
+                                       struct buffer_head *blk_bh)
+{
+       int ret, indexed = 0;
+       struct buffer_head *new_blk_bh = NULL;
+       struct ocfs2_xattr_block *xb =
+                       (struct ocfs2_xattr_block *)blk_bh->b_data;
+
+
+       if (le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)
+               indexed = 1;
+
+       ret = ocfs2_create_empty_xattr_block(args->new_inode, args->new_bh,
+                                            &new_blk_bh, indexed);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED))
+               ret = ocfs2_reflink_xattr_block(args, blk_bh, new_blk_bh);
+       else
+               ret = ocfs2_reflink_xattr_tree(args, blk_bh, new_blk_bh);
+       if (ret)
+               mlog_errno(ret);
+
+out:
+       brelse(new_blk_bh);
+       return ret;
+}
+
+static int ocfs2_reflink_xattr_no_security(struct ocfs2_xattr_entry *xe)
+{
+       int type = ocfs2_xattr_get_type(xe);
+
+       return type != OCFS2_XATTR_INDEX_SECURITY &&
+              type != OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS &&
+              type != OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT;
+}
+
+int ocfs2_reflink_xattrs(struct inode *old_inode,
+                        struct buffer_head *old_bh,
+                        struct inode *new_inode,
+                        struct buffer_head *new_bh,
+                        bool preserve_security)
+{
+       int ret;
+       struct ocfs2_xattr_reflink args;
+       struct ocfs2_inode_info *oi = OCFS2_I(old_inode);
+       struct ocfs2_dinode *di = (struct ocfs2_dinode *)old_bh->b_data;
+       struct buffer_head *blk_bh = NULL;
+       struct ocfs2_cached_dealloc_ctxt dealloc;
+       struct ocfs2_refcount_tree *ref_tree;
+       struct buffer_head *ref_root_bh = NULL;
+
+       ret = ocfs2_lock_refcount_tree(OCFS2_SB(old_inode->i_sb),
+                                      le64_to_cpu(di->i_refcount_loc),
+                                      1, &ref_tree, &ref_root_bh);
+       if (ret) {
+               mlog_errno(ret);
+               goto out;
+       }
+
+       ocfs2_init_dealloc_ctxt(&dealloc);
+
+       args.old_inode = old_inode;
+       args.new_inode = new_inode;
+       args.old_bh = old_bh;
+       args.new_bh = new_bh;
+       args.ref_ci = &ref_tree->rf_ci;
+       args.ref_root_bh = ref_root_bh;
+       args.dealloc = &dealloc;
+       if (preserve_security)
+               args.xattr_reflinked = NULL;
+       else
+               args.xattr_reflinked = ocfs2_reflink_xattr_no_security;
+
+       if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) {
+               ret = ocfs2_reflink_xattr_inline(&args);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto out_unlock;
+               }
+       }
+
+       if (!di->i_xattr_loc)
+               goto out_unlock;
+
+       ret = ocfs2_read_xattr_block(old_inode, le64_to_cpu(di->i_xattr_loc),
+                                    &blk_bh);
+       if (ret < 0) {
+               mlog_errno(ret);
+               goto out_unlock;
+       }
+
+       ret = ocfs2_reflink_xattr_in_block(&args, blk_bh);
+       if (ret)
+               mlog_errno(ret);
+
+       brelse(blk_bh);
+
+out_unlock:
+       ocfs2_unlock_refcount_tree(OCFS2_SB(old_inode->i_sb),
+                                  ref_tree, 1);
+       brelse(ref_root_bh);
+
+       if (ocfs2_dealloc_has_cluster(&dealloc)) {
+               ocfs2_schedule_truncate_log_flush(OCFS2_SB(old_inode->i_sb), 1);
+               ocfs2_run_deallocs(OCFS2_SB(old_inode->i_sb), &dealloc);
+       }
 
 out:
        return ret;
 }
 
+/*
+ * Initialize security and acl for a already created inode.
+ * Used for reflink a non-preserve-security file.
+ *
+ * It uses common api like ocfs2_xattr_set, so the caller
+ * must not hold any lock expect i_mutex.
+ */
+int ocfs2_init_security_and_acl(struct inode *dir,
+                               struct inode *inode)
+{
+       int ret = 0;
+       struct buffer_head *dir_bh = NULL;
+       struct ocfs2_security_xattr_info si = {
+               .enable = 1,
+       };
+
+       ret = ocfs2_init_security_get(inode, dir, &si);
+       if (!ret) {
+               ret = ocfs2_xattr_security_set(inode, si.name,
+                                              si.value, si.value_len,
+                                              XATTR_CREATE);
+               if (ret) {
+                       mlog_errno(ret);
+                       goto leave;
+               }
+       } else if (ret != -EOPNOTSUPP) {
+               mlog_errno(ret);
+               goto leave;
+       }
+
+       ret = ocfs2_inode_lock(dir, &dir_bh, 0);
+       if (ret) {
+               mlog_errno(ret);
+               goto leave;
+       }
+
+       ret = ocfs2_init_acl(NULL, inode, dir, NULL, dir_bh, NULL, NULL);
+       if (ret)
+               mlog_errno(ret);
+
+       ocfs2_inode_unlock(dir, 0);
+       brelse(dir_bh);
+leave:
+       return ret;
+}
 /*
  * 'security' attributes support
  */
index 1ca7e9a..08e3638 100644 (file)
@@ -55,6 +55,8 @@ int ocfs2_xattr_set_handle(handle_t *, struct inode *, struct buffer_head *,
                           int, const char *, const void *, size_t, int,
                           struct ocfs2_alloc_context *,
                           struct ocfs2_alloc_context *);
+int ocfs2_has_inline_xattr_value_outside(struct inode *inode,
+                                        struct ocfs2_dinode *di);
 int ocfs2_xattr_remove(struct inode *, struct buffer_head *);
 int ocfs2_init_security_get(struct inode *, struct inode *,
                            struct ocfs2_security_xattr_info *);
@@ -83,5 +85,16 @@ struct ocfs2_xattr_value_buf {
        struct ocfs2_xattr_value_root   *vb_xv;
 };
 
-
+int ocfs2_xattr_attach_refcount_tree(struct inode *inode,
+                                    struct buffer_head *fe_bh,
+                                    struct ocfs2_caching_info *ref_ci,
+                                    struct buffer_head *ref_root_bh,
+                                    struct ocfs2_cached_dealloc_ctxt *dealloc);
+int ocfs2_reflink_xattrs(struct inode *old_inode,
+                        struct buffer_head *old_bh,
+                        struct inode *new_inode,
+                        struct buffer_head *new_bh,
+                        bool preserve_security);
+int ocfs2_init_security_and_acl(struct inode *dir,
+                               struct inode *inode);
 #endif /* OCFS2_XATTR_H */
index c7275cf..3680bae 100644 (file)
@@ -489,7 +489,7 @@ out:
        return ret;
 }
 
-struct inode_operations omfs_dir_inops = {
+const struct inode_operations omfs_dir_inops = {
        .lookup = omfs_lookup,
        .mkdir = omfs_mkdir,
        .rename = omfs_rename,
index d17e774..4845fbb 100644 (file)
@@ -333,11 +333,11 @@ struct file_operations omfs_file_operations = {
        .splice_read = generic_file_splice_read,
 };
 
-struct inode_operations omfs_file_inops = {
+const struct inode_operations omfs_file_inops = {
        .truncate = omfs_truncate
 };
 
-struct address_space_operations omfs_aops = {
+const struct address_space_operations omfs_aops = {
        .readpage = omfs_readpage,
        .readpages = omfs_readpages,
        .writepage = omfs_writepage,
index 379ae5f..f3b7c15 100644 (file)
@@ -278,7 +278,7 @@ static int omfs_statfs(struct dentry *dentry, struct kstatfs *buf)
        return 0;
 }
 
-static struct super_operations omfs_sops = {
+static const struct super_operations omfs_sops = {
        .write_inode    = omfs_write_inode,
        .delete_inode   = omfs_delete_inode,
        .put_super      = omfs_put_super,
index 2bc0f06..df71039 100644 (file)
@@ -45,15 +45,15 @@ extern int omfs_clear_range(struct super_block *sb, u64 block, int count);
 
 /* dir.c */
 extern struct file_operations omfs_dir_operations;
-extern struct inode_operations omfs_dir_inops;
+extern const struct inode_operations omfs_dir_inops;
 extern int omfs_make_empty(struct inode *inode, struct super_block *sb);
 extern int omfs_is_bad(struct omfs_sb_info *sbi, struct omfs_header *header,
                        u64 fsblock);
 
 /* file.c */
 extern struct file_operations omfs_file_operations;
-extern struct inode_operations omfs_file_inops;
-extern struct address_space_operations omfs_aops;
+extern const struct inode_operations omfs_file_inops;
+extern const struct address_space_operations omfs_aops;
 extern void omfs_make_empty_table(struct buffer_head *bh, int offset);
 extern int omfs_shrink_inode(struct inode *inode);
 
index 31191bf..4f01e06 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -290,10 +290,9 @@ out:
        return error;
 }
 
-SYSCALL_DEFINE2(truncate, const char __user *, path, unsigned long, length)
+SYSCALL_DEFINE2(truncate, const char __user *, path, long, length)
 {
-       /* on 32-bit boxen it will cut the range 2^31--2^32-1 off */
-       return do_sys_truncate(path, (long)length);
+       return do_sys_truncate(path, length);
 }
 
 static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
index fbeaddf..7b685e1 100644 (file)
@@ -581,7 +581,7 @@ try_scan:
                }
 
                if (from + size > get_capacity(disk)) {
-                       struct block_device_operations *bdops = disk->fops;
+                       const struct block_device_operations *bdops = disk->fops;
                        unsigned long long capacity;
 
                        printk(KERN_WARNING
index 725a650..0c6bc60 100644 (file)
@@ -82,6 +82,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/ptrace.h>
 #include <linux/tracehook.h>
+#include <linux/swapops.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -321,6 +322,87 @@ static inline void task_context_switch_counts(struct seq_file *m,
                        p->nivcsw);
 }
 
+struct stack_stats {
+       struct vm_area_struct *vma;
+       unsigned long   startpage;
+       unsigned long   usage;
+};
+
+static int stack_usage_pte_range(pmd_t *pmd, unsigned long addr,
+                               unsigned long end, struct mm_walk *walk)
+{
+       struct stack_stats *ss = walk->private;
+       struct vm_area_struct *vma = ss->vma;
+       pte_t *pte, ptent;
+       spinlock_t *ptl;
+       int ret = 0;
+
+       pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
+       for (; addr != end; pte++, addr += PAGE_SIZE) {
+               ptent = *pte;
+
+#ifdef CONFIG_STACK_GROWSUP
+               if (pte_present(ptent) || is_swap_pte(ptent))
+                       ss->usage = addr - ss->startpage + PAGE_SIZE;
+#else
+               if (pte_present(ptent) || is_swap_pte(ptent)) {
+                       ss->usage = ss->startpage - addr + PAGE_SIZE;
+                       pte++;
+                       ret = 1;
+                       break;
+               }
+#endif
+       }
+       pte_unmap_unlock(pte - 1, ptl);
+       cond_resched();
+       return ret;
+}
+
+static inline unsigned long get_stack_usage_in_bytes(struct vm_area_struct *vma,
+                               struct task_struct *task)
+{
+       struct stack_stats ss;
+       struct mm_walk stack_walk = {
+               .pmd_entry = stack_usage_pte_range,
+               .mm = vma->vm_mm,
+               .private = &ss,
+       };
+
+       if (!vma->vm_mm || is_vm_hugetlb_page(vma))
+               return 0;
+
+       ss.vma = vma;
+       ss.startpage = task->stack_start & PAGE_MASK;
+       ss.usage = 0;
+
+#ifdef CONFIG_STACK_GROWSUP
+       walk_page_range(KSTK_ESP(task) & PAGE_MASK, vma->vm_end,
+               &stack_walk);
+#else
+       walk_page_range(vma->vm_start, (KSTK_ESP(task) & PAGE_MASK) + PAGE_SIZE,
+               &stack_walk);
+#endif
+       return ss.usage;
+}
+
+static inline void task_show_stack_usage(struct seq_file *m,
+                                               struct task_struct *task)
+{
+       struct vm_area_struct   *vma;
+       struct mm_struct        *mm = get_task_mm(task);
+
+       if (mm) {
+               down_read(&mm->mmap_sem);
+               vma = find_vma(mm, task->stack_start);
+               if (vma)
+                       seq_printf(m, "Stack usage:\t%lu kB\n",
+                               get_stack_usage_in_bytes(vma, task) >> 10);
+
+               up_read(&mm->mmap_sem);
+               mmput(mm);
+       }
+}
+
 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
                        struct pid *pid, struct task_struct *task)
 {
@@ -340,6 +422,7 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
        task_show_regs(m, task);
 #endif
        task_context_switch_counts(m, task);
+       task_show_stack_usage(m, task);
        return 0;
 }
 
@@ -481,7 +564,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                rsslim,
                mm ? mm->start_code : 0,
                mm ? mm->end_code : 0,
-               (permitted && mm) ? mm->start_stack : 0,
+               (permitted) ? task->stack_start : 0,
                esp,
                eip,
                /* The signal information here is obsolete.
index 6f742f6..837469a 100644 (file)
@@ -447,7 +447,7 @@ static int proc_oom_score(struct task_struct *task, char *buffer)
 
        do_posix_clock_monotonic_gettime(&uptime);
        read_lock(&tasklist_lock);
-       points = badness(task, uptime.tv_sec);
+       points = badness(task->group_leader, uptime.tv_sec);
        read_unlock(&tasklist_lock);
        return sprintf(buffer, "%lu\n", points);
 }
@@ -458,7 +458,7 @@ struct limit_names {
 };
 
 static const struct limit_names lnames[RLIM_NLIMITS] = {
-       [RLIMIT_CPU] = {"Max cpu time", "ms"},
+       [RLIMIT_CPU] = {"Max cpu time", "seconds"},
        [RLIMIT_FSIZE] = {"Max file size", "bytes"},
        [RLIMIT_DATA] = {"Max data size", "bytes"},
        [RLIMIT_STACK] = {"Max stack size", "bytes"},
@@ -999,11 +999,17 @@ static ssize_t oom_adjust_read(struct file *file, char __user *buf,
        struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
        char buffer[PROC_NUMBUF];
        size_t len;
-       int oom_adjust;
+       int oom_adjust = OOM_DISABLE;
+       unsigned long flags;
 
        if (!task)
                return -ESRCH;
-       oom_adjust = task->oomkilladj;
+
+       if (lock_task_sighand(task, &flags)) {
+               oom_adjust = task->signal->oom_adj;
+               unlock_task_sighand(task, &flags);
+       }
+
        put_task_struct(task);
 
        len = snprintf(buffer, sizeof(buffer), "%i\n", oom_adjust);
@@ -1015,32 +1021,44 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
        struct task_struct *task;
-       char buffer[PROC_NUMBUF], *end;
-       int oom_adjust;
+       char buffer[PROC_NUMBUF];
+       long oom_adjust;
+       unsigned long flags;
+       int err;
 
        memset(buffer, 0, sizeof(buffer));
        if (count > sizeof(buffer) - 1)
                count = sizeof(buffer) - 1;
        if (copy_from_user(buffer, buf, count))
                return -EFAULT;
-       oom_adjust = simple_strtol(buffer, &end, 0);
+
+       err = strict_strtol(strstrip(buffer), 0, &oom_adjust);
+       if (err)
+               return -EINVAL;
        if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) &&
             oom_adjust != OOM_DISABLE)
                return -EINVAL;
-       if (*end == '\n')
-               end++;
+
        task = get_proc_task(file->f_path.dentry->d_inode);
        if (!task)
                return -ESRCH;
-       if (oom_adjust < task->oomkilladj && !capable(CAP_SYS_RESOURCE)) {
+       if (!lock_task_sighand(task, &flags)) {
+               put_task_struct(task);
+               return -ESRCH;
+       }
+
+       if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
+               unlock_task_sighand(task, &flags);
                put_task_struct(task);
                return -EACCES;
        }
-       task->oomkilladj = oom_adjust;
+
+       task->signal->oom_adj = oom_adjust;
+
+       unlock_task_sighand(task, &flags);
        put_task_struct(task);
-       if (end - buffer == 0)
-               return -EIO;
-       return end - buffer;
+
+       return count;
 }
 
 static const struct file_operations proc_oom_adjust_operations = {
@@ -1169,17 +1187,16 @@ static ssize_t proc_fault_inject_write(struct file * file,
                count = sizeof(buffer) - 1;
        if (copy_from_user(buffer, buf, count))
                return -EFAULT;
-       make_it_fail = simple_strtol(buffer, &end, 0);
-       if (*end == '\n')
-               end++;
+       make_it_fail = simple_strtol(strstrip(buffer), &end, 0);
+       if (*end)
+               return -EINVAL;
        task = get_proc_task(file->f_dentry->d_inode);
        if (!task)
                return -ESRCH;
        task->make_it_fail = make_it_fail;
        put_task_struct(task);
-       if (end - buffer == 0)
-               return -EIO;
-       return end - buffer;
+
+       return count;
 }
 
 static const struct file_operations proc_fault_inject_operations = {
@@ -2586,9 +2603,6 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)
                dput(dentry);
        }
 
-       if (tgid == 0)
-               goto out;
-
        name.name = buf;
        name.len = snprintf(buf, sizeof(buf), "%d", tgid);
        leader = d_hash_and_lookup(mnt->mnt_root, &name);
@@ -2645,17 +2659,16 @@ out:
 void proc_flush_task(struct task_struct *task)
 {
        int i;
-       struct pid *pid, *tgid = NULL;
+       struct pid *pid, *tgid;
        struct upid *upid;
 
        pid = task_pid(task);
-       if (thread_group_leader(task))
-               tgid = task_tgid(task);
+       tgid = task_tgid(task);
 
        for (i = 0; i <= pid->level; i++) {
                upid = &pid->numbers[i];
                proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr,
-                       tgid ? tgid->numbers[i].nr : 0);
+                                       tgid->numbers[i].nr);
        }
 
        upid = &pid->numbers[pid->level];
index 59b43a0..5601337 100644 (file)
 #include <linux/elfcore.h>
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
+#include <linux/bootmem.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <linux/list.h>
+#include <linux/ioport.h>
+#include <linux/mm.h>
+#include <linux/memory.h>
+#include <asm/sections.h>
 
 #define CORE_STR "CORE"
 
 
 static struct proc_dir_entry *proc_root_kcore;
 
-static int open_kcore(struct inode * inode, struct file * filp)
-{
-       return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
-}
-
-static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
-
-static const struct file_operations proc_kcore_operations = {
-       .read           = read_kcore,
-       .open           = open_kcore,
-};
 
 #ifndef kc_vaddr_to_offset
 #define        kc_vaddr_to_offset(v) ((v) - PAGE_OFFSET)
@@ -57,18 +52,19 @@ struct memelfnote
        void *data;
 };
 
-static struct kcore_list *kclist;
+static LIST_HEAD(kclist_head);
 static DEFINE_RWLOCK(kclist_lock);
+static int kcore_need_update = 1;
 
 void
-kclist_add(struct kcore_list *new, void *addr, size_t size)
+kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
 {
        new->addr = (unsigned long)addr;
        new->size = size;
+       new->type = type;
 
        write_lock(&kclist_lock);
-       new->next = kclist;
-       kclist = new;
+       list_add_tail(&new->list, &kclist_head);
        write_unlock(&kclist_lock);
 }
 
@@ -80,7 +76,7 @@ static size_t get_kcore_size(int *nphdr, size_t *elf_buflen)
        *nphdr = 1; /* PT_NOTE */
        size = 0;
 
-       for (m=kclist; m; m=m->next) {
+       list_for_each_entry(m, &kclist_head, list) {
                try = kc_vaddr_to_offset((size_t)m->addr + m->size);
                if (try > size)
                        size = try;
@@ -97,6 +93,177 @@ static size_t get_kcore_size(int *nphdr, size_t *elf_buflen)
        return size + *elf_buflen;
 }
 
+static void free_kclist_ents(struct list_head *head)
+{
+       struct kcore_list *tmp, *pos;
+
+       list_for_each_entry_safe(pos, tmp, head, list) {
+               list_del(&pos->list);
+               kfree(pos);
+       }
+}
+/*
+ * Replace all KCORE_RAM/KCORE_VMEMMAP information with passed list.
+ */
+static void __kcore_update_ram(struct list_head *list)
+{
+       int nphdr;
+       size_t size;
+       struct kcore_list *tmp, *pos;
+       LIST_HEAD(garbage);
+
+       write_lock(&kclist_lock);
+       if (kcore_need_update) {
+               list_for_each_entry_safe(pos, tmp, &kclist_head, list) {
+                       if (pos->type == KCORE_RAM
+                               || pos->type == KCORE_VMEMMAP)
+                               list_move(&pos->list, &garbage);
+               }
+               list_splice_tail(list, &kclist_head);
+       } else
+               list_splice(list, &garbage);
+       kcore_need_update = 0;
+       proc_root_kcore->size = get_kcore_size(&nphdr, &size);
+       write_unlock(&kclist_lock);
+
+       free_kclist_ents(&garbage);
+}
+
+
+#ifdef CONFIG_HIGHMEM
+/*
+ * If no highmem, we can assume [0...max_low_pfn) continuous range of memory
+ * because memory hole is not as big as !HIGHMEM case.
+ * (HIGHMEM is special because part of memory is _invisible_ from the kernel.)
+ */
+static int kcore_update_ram(void)
+{
+       LIST_HEAD(head);
+       struct kcore_list *ent;
+       int ret = 0;
+
+       ent = kmalloc(sizeof(*ent), GFP_KERNEL);
+       if (!ent)
+               return -ENOMEM;
+       ent->addr = (unsigned long)__va(0);
+       ent->size = max_low_pfn << PAGE_SHIFT;
+       ent->type = KCORE_RAM;
+       list_add(&ent->list, &head);
+       __kcore_update_ram(&head);
+       return ret;
+}
+
+#else /* !CONFIG_HIGHMEM */
+
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+/* calculate vmemmap's address from given system ram pfn and register it */
+int get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
+{
+       unsigned long pfn = __pa(ent->addr) >> PAGE_SHIFT;
+       unsigned long nr_pages = ent->size >> PAGE_SHIFT;
+       unsigned long start, end;
+       struct kcore_list *vmm, *tmp;
+
+
+       start = ((unsigned long)pfn_to_page(pfn)) & PAGE_MASK;
+       end = ((unsigned long)pfn_to_page(pfn + nr_pages)) - 1;
+       end = ALIGN(end, PAGE_SIZE);
+       /* overlap check (because we have to align page */
+       list_for_each_entry(tmp, head, list) {
+               if (tmp->type != KCORE_VMEMMAP)
+                       continue;
+               if (start < tmp->addr + tmp->size)
+                       if (end > tmp->addr)
+                               end = tmp->addr;
+       }
+       if (start < end) {
+               vmm = kmalloc(sizeof(*vmm), GFP_KERNEL);
+               if (!vmm)
+                       return 0;
+               vmm->addr = start;
+               vmm->size = end - start;
+               vmm->type = KCORE_VMEMMAP;
+               list_add_tail(&vmm->list, head);
+       }
+       return 1;
+
+}
+#else
+int get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
+{
+       return 1;
+}
+
+#endif
+
+static int
+kclist_add_private(unsigned long pfn, unsigned long nr_pages, void *arg)
+{
+       struct list_head *head = (struct list_head *)arg;
+       struct kcore_list *ent;
+
+       ent = kmalloc(sizeof(*ent), GFP_KERNEL);
+       if (!ent)
+               return -ENOMEM;
+       ent->addr = (unsigned long)__va((pfn << PAGE_SHIFT));
+       ent->size = nr_pages << PAGE_SHIFT;
+
+       /* Sanity check: Can happen in 32bit arch...maybe */
+       if (ent->addr < (unsigned long) __va(0))
+               goto free_out;
+
+       /* cut not-mapped area. ....from ppc-32 code. */
+       if (ULONG_MAX - ent->addr < ent->size)
+               ent->size = ULONG_MAX - ent->addr;
+
+       /* cut when vmalloc() area is higher than direct-map area */
+       if (VMALLOC_START > (unsigned long)__va(0)) {
+               if (ent->addr > VMALLOC_START)
+                       goto free_out;
+               if (VMALLOC_START - ent->addr < ent->size)
+                       ent->size = VMALLOC_START - ent->addr;
+       }
+
+       ent->type = KCORE_RAM;
+       list_add_tail(&ent->list, head);
+
+       if (!get_sparsemem_vmemmap_info(ent, head)) {
+               list_del(&ent->list);
+               goto free_out;
+       }
+
+       return 0;
+free_out:
+       kfree(ent);
+       return 1;
+}
+
+static int kcore_update_ram(void)
+{
+       int nid, ret;
+       unsigned long end_pfn;
+       LIST_HEAD(head);
+
+       /* Not inialized....update now */
+       /* find out "max pfn" */
+       end_pfn = 0;
+       for_each_node_state(nid, N_HIGH_MEMORY) {
+               unsigned long node_end;
+               node_end  = NODE_DATA(nid)->node_start_pfn +
+                       NODE_DATA(nid)->node_spanned_pages;
+               if (end_pfn < node_end)
+                       end_pfn = node_end;
+       }
+       /* scan 0 to max_pfn */
+       ret = walk_system_ram_range(0, end_pfn, &head, kclist_add_private);
+       if (ret) {
+               free_kclist_ents(&head);
+               return -ENOMEM;
+       }
+       __kcore_update_ram(&head);
+       return ret;
+}
+#endif /* CONFIG_HIGHMEM */
 
 /*****************************************************************************/
 /*
@@ -192,7 +359,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
        nhdr->p_align   = 0;
 
        /* setup ELF PT_LOAD program header for every area */
-       for (m=kclist; m; m=m->next) {
+       list_for_each_entry(m, &kclist_head, list) {
                phdr = (struct elf_phdr *) bufp;
                bufp += sizeof(struct elf_phdr);
                offset += sizeof(struct elf_phdr);
@@ -265,7 +432,8 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
        unsigned long start;
 
        read_lock(&kclist_lock);
-       proc_root_kcore->size = size = get_kcore_size(&nphdr, &elf_buflen);
+       size = get_kcore_size(&nphdr, &elf_buflen);
+
        if (buflen == 0 || *fpos >= size) {
                read_unlock(&kclist_lock);
                return 0;
@@ -317,7 +485,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
                struct kcore_list *m;
 
                read_lock(&kclist_lock);
-               for (m=kclist; m; m=m->next) {
+               list_for_each_entry(m, &kclist_head, list) {
                        if (start >= m->addr && start < (m->addr+m->size))
                                break;
                }
@@ -326,45 +494,14 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
                if (m == NULL) {
                        if (clear_user(buffer, tsz))
                                return -EFAULT;
-               } else if (is_vmalloc_addr((void *)start)) {
+               } else if (is_vmalloc_or_module_addr((void *)start)) {
                        char * elf_buf;
-                       struct vm_struct *m;
-                       unsigned long curstart = start;
-                       unsigned long cursize = tsz;
 
                        elf_buf = kzalloc(tsz, GFP_KERNEL);
                        if (!elf_buf)
                                return -ENOMEM;
-
-                       read_lock(&vmlist_lock);
-                       for (m=vmlist; m && cursize; m=m->next) {
-                               unsigned long vmstart;
-                               unsigned long vmsize;
-                               unsigned long msize = m->size - PAGE_SIZE;
-
-                               if (((unsigned long)m->addr + msize) < 
-                                                               curstart)
-                                       continue;
-                               if ((unsigned long)m->addr > (curstart + 
-                                                               cursize))
-                                       break;
-                               vmstart = (curstart < (unsigned long)m->addr ? 
-                                       (unsigned long)m->addr : curstart);
-                               if (((unsigned long)m->addr + msize) > 
-                                                       (curstart + cursize))
-                                       vmsize = curstart + cursize - vmstart;
-                               else
-                                       vmsize = (unsigned long)m->addr + 
-                                                       msize - vmstart;
-                               curstart = vmstart + vmsize;
-                               cursize -= vmsize;
-                               /* don't dump ioremap'd stuff! (TA) */
-                               if (m->flags & VM_IOREMAP)
-                                       continue;
-                               memcpy(elf_buf + (vmstart - start),
-                                       (char *)vmstart, vmsize);
-                       }
-                       read_unlock(&vmlist_lock);
+                       vread(elf_buf, (char *)start, tsz);
+                       /* we have to zero-fill user buffer even if no read */
                        if (copy_to_user(buffer, elf_buf, tsz)) {
                                kfree(elf_buf);
                                return -EFAULT;
@@ -402,12 +539,96 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
        return acc;
 }
 
+
+static int open_kcore(struct inode *inode, struct file *filp)
+{
+       if (!capable(CAP_SYS_RAWIO))
+               return -EPERM;
+       if (kcore_need_update)
+               kcore_update_ram();
+       if (i_size_read(inode) != proc_root_kcore->size) {
+               mutex_lock(&inode->i_mutex);
+               i_size_write(inode, proc_root_kcore->size);
+               mutex_unlock(&inode->i_mutex);
+       }
+       return 0;
+}
+
+
+static const struct file_operations proc_kcore_operations = {
+       .read           = read_kcore,
+       .open           = open_kcore,
+};
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+/* just remember that we have to update kcore */
+static int __meminit kcore_callback(struct notifier_block *self,
+                                   unsigned long action, void *arg)
+{
+       switch (action) {
+       case MEM_ONLINE:
+       case MEM_OFFLINE:
+               write_lock(&kclist_lock);
+               kcore_need_update = 1;
+               write_unlock(&kclist_lock);
+       }
+       return NOTIFY_OK;
+}
+#endif
+
+
+static struct kcore_list kcore_vmalloc;
+
+#ifdef CONFIG_ARCH_PROC_KCORE_TEXT
+static struct kcore_list kcore_text;
+/*
+ * If defined, special segment is used for mapping kernel text instead of
+ * direct-map area. We need to create special TEXT section.
+ */
+static void __init proc_kcore_text_init(void)
+{
+       kclist_add(&kcore_text, _stext, _end - _stext, KCORE_TEXT);
+}
+#else
+static void __init proc_kcore_text_init(void)
+{
+}
+#endif
+
+#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
+/*
+ * MODULES_VADDR has no intersection with VMALLOC_ADDR.
+ */
+struct kcore_list kcore_modules;
+static void __init add_modules_range(void)
+{
+       kclist_add(&kcore_modules, (void *)MODULES_VADDR,
+                       MODULES_END - MODULES_VADDR, KCORE_VMALLOC);
+}
+#else
+static void __init add_modules_range(void)
+{
+}
+#endif
+
 static int __init proc_kcore_init(void)
 {
-       proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations);
-       if (proc_root_kcore)
-               proc_root_kcore->size =
-                               (size_t)high_memory - PAGE_OFFSET + PAGE_SIZE;
+       proc_root_kcore = proc_create("kcore", S_IRUSR, NULL,
+                                     &proc_kcore_operations);
+       if (!proc_root_kcore) {
+               printk(KERN_ERR "couldn't create /proc/kcore\n");
+               return 0; /* Always returns 0. */
+       }
+       /* Store text area if it's special */
+       proc_kcore_text_init();
+       /* Store vmalloc area */
+       kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
+               VMALLOC_END - VMALLOC_START, KCORE_VMALLOC);
+       add_modules_range();
+       /* Store direct-map area from physical memory map */
+       kcore_update_ram();
+       hotplug_memory_notifier(kcore_callback, 0);
+
        return 0;
 }
 module_init(proc_kcore_init);
index d5c410d..171e052 100644 (file)
@@ -81,9 +81,11 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                "Writeback:      %8lu kB\n"
                "AnonPages:      %8lu kB\n"
                "Mapped:         %8lu kB\n"
+               "Shmem:          %8lu kB\n"
                "Slab:           %8lu kB\n"
                "SReclaimable:   %8lu kB\n"
                "SUnreclaim:     %8lu kB\n"
+               "KernelStack:    %8lu kB\n"
                "PageTables:     %8lu kB\n"
 #ifdef CONFIG_QUICKLIST
                "Quicklists:     %8lu kB\n"
@@ -124,10 +126,12 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                K(global_page_state(NR_WRITEBACK)),
                K(global_page_state(NR_ANON_PAGES)),
                K(global_page_state(NR_FILE_MAPPED)),
+               K(global_page_state(NR_SHMEM)),
                K(global_page_state(NR_SLAB_RECLAIMABLE) +
                                global_page_state(NR_SLAB_UNRECLAIMABLE)),
                K(global_page_state(NR_SLAB_RECLAIMABLE)),
                K(global_page_state(NR_SLAB_UNRECLAIMABLE)),
+               global_page_state(NR_KERNEL_STACK) * THREAD_SIZE / 1024,
                K(global_page_state(NR_PAGETABLE)),
 #ifdef CONFIG_QUICKLIST
                K(quicklist_total_size()),
index 7e14d1a..9fe7d7e 100644 (file)
@@ -109,7 +109,7 @@ static void *nommu_region_list_next(struct seq_file *m, void *v, loff_t *pos)
        return rb_next((struct rb_node *) v);
 }
 
-static struct seq_operations proc_nommu_region_list_seqop = {
+static const struct seq_operations proc_nommu_region_list_seqop = {
        .start  = nommu_region_list_start,
        .next   = nommu_region_list_next,
        .stop   = nommu_region_list_stop,
index 2707c6c..2281c2c 100644 (file)
@@ -2,6 +2,7 @@
 #include <linux/compiler.h>
 #include <linux/fs.h>
 #include <linux/init.h>
+#include <linux/ksm.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/proc_fs.h>
@@ -95,6 +96,8 @@ static const struct file_operations proc_kpagecount_operations = {
 #define KPF_UNEVICTABLE                18
 #define KPF_NOPAGE             20
 
+#define KPF_KSM                        21
+
 /* kernel hacking assistances
  * WARNING: subject to change, never rely on them!
  */
@@ -137,6 +140,8 @@ static u64 get_uflags(struct page *page)
                u |= 1 << KPF_MMAP;
        if (PageAnon(page))
                u |= 1 << KPF_ANON;
+       if (PageKsm(page))
+               u |= 1 << KPF_KSM;
 
        /*
         * compound pages: export both head/tail info
index 9bd8be1..2a1bef9 100644 (file)
@@ -243,6 +243,25 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
                                } else if (vma->vm_start <= mm->start_stack &&
                                           vma->vm_end >= mm->start_stack) {
                                        name = "[stack]";
+                               } else {
+                                       unsigned long stack_start;
+                                       struct proc_maps_private *pmp;
+
+                                       pmp = m->private;
+                                       stack_start = pmp->task->stack_start;
+
+                                       if (vma->vm_start <= stack_start &&
+                                           vma->vm_end >= stack_start) {
+                                               pad_len_spaces(m, len);
+                                               seq_printf(m,
+                                                "[threadstack:%08lx]",
+#ifdef CONFIG_STACK_GROWSUP
+                                                vma->vm_end - stack_start
+#else
+                                                stack_start - vma->vm_start
+#endif
+                                               );
+                                       }
                                }
                        } else {
                                name = "[vdso]";
@@ -465,23 +484,28 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
        return 0;
 }
 
+#define CLEAR_REFS_ALL 1
+#define CLEAR_REFS_ANON 2
+#define CLEAR_REFS_MAPPED 3
+
 static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
        struct task_struct *task;
-       char buffer[PROC_NUMBUF], *end;
+       char buffer[PROC_NUMBUF];
        struct mm_struct *mm;
        struct vm_area_struct *vma;
+       long type;
 
        memset(buffer, 0, sizeof(buffer));
        if (count > sizeof(buffer) - 1)
                count = sizeof(buffer) - 1;
        if (copy_from_user(buffer, buf, count))
                return -EFAULT;
-       if (!simple_strtol(buffer, &end, 0))
+       if (strict_strtol(strstrip(buffer), 10, &type))
+               return -EINVAL;
+       if (type < CLEAR_REFS_ALL || type > CLEAR_REFS_MAPPED)
                return -EINVAL;
-       if (*end == '\n')
-               end++;
        task = get_proc_task(file->f_path.dentry->d_inode);
        if (!task)
                return -ESRCH;
@@ -494,18 +518,31 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                down_read(&mm->mmap_sem);
                for (vma = mm->mmap; vma; vma = vma->vm_next) {
                        clear_refs_walk.private = vma;
-                       if (!is_vm_hugetlb_page(vma))
-                               walk_page_range(vma->vm_start, vma->vm_end,
-                                               &clear_refs_walk);
+                       if (is_vm_hugetlb_page(vma))
+                               continue;
+                       /*
+                        * Writing 1 to /proc/pid/clear_refs affects all pages.
+                        *
+                        * Writing 2 to /proc/pid/clear_refs only affects
+                        * Anonymous pages.
+                        *
+                        * Writing 3 to /proc/pid/clear_refs only affects file
+                        * mapped pages.
+                        */
+                       if (type == CLEAR_REFS_ANON && vma->vm_file)
+                               continue;
+                       if (type == CLEAR_REFS_MAPPED && !vma->vm_file)
+                               continue;
+                       walk_page_range(vma->vm_start, vma->vm_end,
+                                       &clear_refs_walk);
                }
                flush_tlb_mm(mm);
                up_read(&mm->mmap_sem);
                mmput(mm);
        }
        put_task_struct(task);
-       if (end - buffer == 0)
-               return -EIO;
-       return end - buffer;
+
+       return count;
 }
 
 const struct file_operations proc_clear_refs_operations = {
index be8e0e1..5f60899 100644 (file)
@@ -6,20 +6,9 @@ config QNX4FS_FS
          QNX 4 and QNX 6 (the latter is also called QNX RTP).
          Further information is available at <http://www.qnx.com/>.
          Say Y if you intend to mount QNX hard disks or floppies.
-         Unless you say Y to "QNX4FS read-write support" below, you will
-         only be able to read these file systems.
 
          To compile this file system support as a module, choose M here: the
          module will be called qnx4.
 
          If you don't know whether you need it, then you don't need it:
          answer N.
-
-config QNX4FS_RW
-       bool "QNX4FS write support (DANGEROUS)"
-       depends on QNX4FS_FS && EXPERIMENTAL && BROKEN
-       help
-         Say Y if you want to test write support for QNX4 file systems.
-
-         It's currently broken, so for now:
-         answer N.
index e4d408c..4a283b3 100644 (file)
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_QNX4FS_FS) += qnx4.o
 
-qnx4-objs := inode.o dir.o namei.o file.o bitmap.o truncate.o
+qnx4-objs := inode.o dir.o namei.o bitmap.o
index e1cd061..0afba06 100644 (file)
@@ -78,84 +78,3 @@ unsigned long qnx4_count_free_blocks(struct super_block *sb)
 
        return total_free;
 }
-
-#ifdef CONFIG_QNX4FS_RW
-
-int qnx4_is_free(struct super_block *sb, long block)
-{
-       int start = le32_to_cpu(qnx4_sb(sb)->BitMap->di_first_xtnt.xtnt_blk) - 1;
-       int size = le32_to_cpu(qnx4_sb(sb)->BitMap->di_size);
-       struct buffer_head *bh;
-       const char *g;
-       int ret = -EIO;
-
-       start += block / (QNX4_BLOCK_SIZE * 8);
-       QNX4DEBUG(("qnx4: is_free requesting block [%lu], bitmap in block [%lu]\n",
-                  (unsigned long) block, (unsigned long) start));
-       (void) size;            /* CHECKME */
-       bh = sb_bread(sb, start);
-       if (bh == NULL) {
-               return -EIO;
-       }
-       g = bh->b_data + (block % QNX4_BLOCK_SIZE);
-       if (((*g) & (1 << (block % 8))) == 0) {
-               QNX4DEBUG(("qnx4: is_free -> block is free\n"));
-               ret = 1;
-       } else {
-               QNX4DEBUG(("qnx4: is_free -> block is busy\n"));
-               ret = 0;
-       }
-       brelse(bh);
-
-       return ret;
-}
-
-int qnx4_set_bitmap(struct super_block *sb, long block, int busy)
-{
-       int start = le32_to_cpu(qnx4_sb(sb)->BitMap->di_first_xtnt.xtnt_blk) - 1;
-       int size = le32_to_cpu(qnx4_sb(sb)->BitMap->di_size);
-       struct buffer_head *bh;
-       char *g;
-
-       start += block / (QNX4_BLOCK_SIZE * 8);
-       QNX4DEBUG(("qnx4: set_bitmap requesting block [%lu], bitmap in block [%lu]\n",
-                  (unsigned long) block, (unsigned long) start));
-       (void) size;            /* CHECKME */
-       bh = sb_bread(sb, start);
-       if (bh == NULL) {
-               return -EIO;
-       }
-       g = bh->b_data + (block % QNX4_BLOCK_SIZE);
-       if (busy == 0) {
-               (*g) &= ~(1 << (block % 8));
-       } else {
-               (*g) |= (1 << (block % 8));
-       }
-       mark_buffer_dirty(bh);
-       brelse(bh);
-
-       return 0;
-}
-
-static void qnx4_clear_inode(struct inode *inode)
-{
-       struct qnx4_inode_entry *qnx4_ino = qnx4_raw_inode(inode);
-       /* What for? */
-       memset(qnx4_ino->di_fname, 0, sizeof qnx4_ino->di_fname);
-       qnx4_ino->di_size = 0;
-       qnx4_ino->di_num_xtnts = 0;
-       qnx4_ino->di_mode = 0;
-       qnx4_ino->di_status = 0;
-}
-
-void qnx4_free_inode(struct inode *inode)
-{
-       if (inode->i_ino < 1) {
-               printk("free_inode: inode 0 or nonexistent inode\n");
-               return;
-       }
-       qnx4_clear_inode(inode);
-       clear_inode(inode);
-}
-
-#endif
index 003c68f..86cc39c 100644 (file)
@@ -85,9 +85,4 @@ const struct file_operations qnx4_dir_operations =
 const struct inode_operations qnx4_dir_inode_operations =
 {
        .lookup         = qnx4_lookup,
-#ifdef CONFIG_QNX4FS_RW
-       .create         = qnx4_create,
-       .unlink         = qnx4_unlink,
-       .rmdir          = qnx4_rmdir,
-#endif
 };
diff --git a/fs/qnx4/file.c b/fs/qnx4/file.c
deleted file mode 100644 (file)
index 09b170a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * QNX4 file system, Linux implementation.
- *
- * Version : 0.2.1
- *
- * Using parts of the xiafs filesystem.
- *
- * History :
- *
- * 25-05-1998 by Richard Frowijn : first release.
- * 21-06-1998 by Frank Denis : wrote qnx4_readpage to use generic_file_read.
- * 27-06-1998 by Frank Denis : file overwriting.
- */
-
-#include "qnx4.h"
-
-/*
- * We have mostly NULL's here: the current defaults are ok for
- * the qnx4 filesystem.
- */
-const struct file_operations qnx4_file_operations =
-{
-       .llseek         = generic_file_llseek,
-       .read           = do_sync_read,
-       .aio_read       = generic_file_aio_read,
-       .mmap           = generic_file_mmap,
-       .splice_read    = generic_file_splice_read,
-#ifdef CONFIG_QNX4FS_RW
-       .write          = do_sync_write,
-       .aio_write      = generic_file_aio_write,
-       .fsync          = simple_fsync,
-#endif
-};
-
-const struct inode_operations qnx4_file_inode_operations =
-{
-#ifdef CONFIG_QNX4FS_RW
-       .truncate       = qnx4_truncate,
-#endif
-};
index 681df5f..d2cd179 100644 (file)
 
 static const struct super_operations qnx4_sops;
 
-#ifdef CONFIG_QNX4FS_RW
-
-static void qnx4_delete_inode(struct inode *inode)
-{
-       QNX4DEBUG(("qnx4: deleting inode [%lu]\n", (unsigned long) inode->i_ino));
-       truncate_inode_pages(&inode->i_data, 0);
-       inode->i_size = 0;
-       qnx4_truncate(inode);
-       lock_kernel();
-       qnx4_free_inode(inode);
-       unlock_kernel();
-}
-
-static int qnx4_write_inode(struct inode *inode, int do_sync)
-{
-       struct qnx4_inode_entry *raw_inode;
-       int block, ino;
-       struct buffer_head *bh;
-       ino = inode->i_ino;
-
-       QNX4DEBUG(("qnx4: write inode 1.\n"));
-       if (inode->i_nlink == 0) {
-               return 0;
-       }
-       if (!ino) {
-               printk("qnx4: bad inode number on dev %s: %d is out of range\n",
-                      inode->i_sb->s_id, ino);
-               return -EIO;
-       }
-       QNX4DEBUG(("qnx4: write inode 2.\n"));
-       block = ino / QNX4_INODES_PER_BLOCK;
-       lock_kernel();
-       if (!(bh = sb_bread(inode->i_sb, block))) {
-               printk("qnx4: major problem: unable to read inode from dev "
-                      "%s\n", inode->i_sb->s_id);
-               unlock_kernel();
-               return -EIO;
-       }
-       raw_inode = ((struct qnx4_inode_entry *) bh->b_data) +
-           (ino % QNX4_INODES_PER_BLOCK);
-       raw_inode->di_mode  = cpu_to_le16(inode->i_mode);
-       raw_inode->di_uid   = cpu_to_le16(fs_high2lowuid(inode->i_uid));
-       raw_inode->di_gid   = cpu_to_le16(fs_high2lowgid(inode->i_gid));
-       raw_inode->di_nlink = cpu_to_le16(inode->i_nlink);
-       raw_inode->di_size  = cpu_to_le32(inode->i_size);
-       raw_inode->di_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
-       raw_inode->di_atime = cpu_to_le32(inode->i_atime.tv_sec);
-       raw_inode->di_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
-       raw_inode->di_first_xtnt.xtnt_size = cpu_to_le32(inode->i_blocks);
-       mark_buffer_dirty(bh);
-       if (do_sync) {
-               sync_dirty_buffer(bh);
-               if (buffer_req(bh) && !buffer_uptodate(bh)) {
-                       printk("qnx4: IO error syncing inode [%s:%08x]\n",
-                                       inode->i_sb->s_id, ino);
-                       brelse(bh);
-                       unlock_kernel();
-                       return -EIO;
-               }
-       }
-       brelse(bh);
-       unlock_kernel();
-       return 0;
-}
-
-#endif
-
 static void qnx4_put_super(struct super_block *sb);
 static struct inode *qnx4_alloc_inode(struct super_block *sb);
 static void qnx4_destroy_inode(struct inode *inode);
@@ -108,10 +41,6 @@ static const struct super_operations qnx4_sops =
        .put_super      = qnx4_put_super,
        .statfs         = qnx4_statfs,
        .remount_fs     = qnx4_remount,
-#ifdef CONFIG_QNX4FS_RW
-       .write_inode    = qnx4_write_inode,
-       .delete_inode   = qnx4_delete_inode,
-#endif
 };
 
 static int qnx4_remount(struct super_block *sb, int *flags, char *data)
@@ -120,15 +49,7 @@ static int qnx4_remount(struct super_block *sb, int *flags, char *data)
 
        qs = qnx4_sb(sb);
        qs->Version = QNX4_VERSION;
-#ifndef CONFIG_QNX4FS_RW
        *flags |= MS_RDONLY;
-#endif
-       if (*flags & MS_RDONLY) {
-               return 0;
-       }
-
-       mark_buffer_dirty(qs->sb_buf);
-
        return 0;
 }
 
@@ -354,9 +275,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
        }
        s->s_op = &qnx4_sops;
        s->s_magic = QNX4_SUPER_MAGIC;
-#ifndef CONFIG_QNX4FS_RW
        s->s_flags |= MS_RDONLY;        /* Yup, read-only yet */
-#endif
        qnx4_sb(s)->sb_buf = bh;
        qnx4_sb(s)->sb = (struct qnx4_super_block *) bh->b_data;
 
@@ -489,8 +408,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
 
        memcpy(qnx4_inode, raw_inode, QNX4_DIR_ENTRY_SIZE);
        if (S_ISREG(inode->i_mode)) {
-               inode->i_op = &qnx4_file_inode_operations;
-               inode->i_fop = &qnx4_file_operations;
+               inode->i_fop = &generic_ro_fops;
                inode->i_mapping->a_ops = &qnx4_aops;
                qnx4_i(inode)->mmu_private = inode->i_size;
        } else if (S_ISDIR(inode->i_mode)) {
index 5972ed2..ae1e7ed 100644 (file)
@@ -134,108 +134,3 @@ out:
 
        return NULL;
 }
-
-#ifdef CONFIG_QNX4FS_RW
-int qnx4_create(struct inode *dir, struct dentry *dentry, int mode,
-               struct nameidata *nd)
-{
-       QNX4DEBUG(("qnx4: qnx4_create\n"));
-       if (dir == NULL) {
-               return -ENOENT;
-       }
-       return -ENOSPC;
-}
-
-int qnx4_rmdir(struct inode *dir, struct dentry *dentry)
-{
-       struct buffer_head *bh;
-       struct qnx4_inode_entry *de;
-       struct inode *inode;
-       int retval;
-       int ino;
-
-       QNX4DEBUG(("qnx4: qnx4_rmdir [%s]\n", dentry->d_name.name));
-       lock_kernel();
-       bh = qnx4_find_entry(dentry->d_name.len, dir, dentry->d_name.name,
-                            &de, &ino);
-       if (bh == NULL) {
-               unlock_kernel();
-               return -ENOENT;
-       }
-       inode = dentry->d_inode;
-       if (inode->i_ino != ino) {
-               retval = -EIO;
-               goto end_rmdir;
-       }
-#if 0
-       if (!empty_dir(inode)) {
-               retval = -ENOTEMPTY;
-               goto end_rmdir;
-       }
-#endif
-       if (inode->i_nlink != 2) {
-               QNX4DEBUG(("empty directory has nlink!=2 (%d)\n", inode->i_nlink));
-       }
-       QNX4DEBUG(("qnx4: deleting directory\n"));
-       de->di_status = 0;
-       memset(de->di_fname, 0, sizeof de->di_fname);
-       de->di_mode = 0;
-       mark_buffer_dirty_inode(bh, dir);
-       clear_nlink(inode);
-       mark_inode_dirty(inode);
-       inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
-       inode_dec_link_count(dir);
-       retval = 0;
-
-      end_rmdir:
-       brelse(bh);
-
-       unlock_kernel();
-       return retval;
-}
-
-int qnx4_unlink(struct inode *dir, struct dentry *dentry)
-{
-       struct buffer_head *bh;
-       struct qnx4_inode_entry *de;
-       struct inode *inode;
-       int retval;
-       int ino;
-
-       QNX4DEBUG(("qnx4: qnx4_unlink [%s]\n", dentry->d_name.name));
-       lock_kernel();
-       bh = qnx4_find_entry(dentry->d_name.len, dir, dentry->d_name.name,
-                            &de, &ino);
-       if (bh == NULL) {
-               unlock_kernel();
-               return -ENOENT;
-       }
-       inode = dentry->d_inode;
-       if (inode->i_ino != ino) {
-               retval = -EIO;
-               goto end_unlink;
-       }
-       retval = -EPERM;
-       if (!inode->i_nlink) {
-               QNX4DEBUG(("Deleting nonexistent file (%s:%lu), %d\n",
-                          inode->i_sb->s_id,
-                          inode->i_ino, inode->i_nlink));
-               inode->i_nlink = 1;
-       }
-       de->di_status = 0;
-       memset(de->di_fname, 0, sizeof de->di_fname);
-       de->di_mode = 0;
-       mark_buffer_dirty_inode(bh, dir);
-       dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
-       mark_inode_dirty(dir);
-       inode->i_ctime = dir->i_ctime;
-       inode_dec_link_count(inode);
-       retval = 0;
-
-end_unlink:
-       unlock_kernel();
-       brelse(bh);
-
-       return retval;
-}
-#endif
index 9efc089..33a6085 100644 (file)
@@ -29,17 +29,9 @@ extern unsigned long qnx4_block_map(struct inode *inode, long iblock);
 
 extern struct buffer_head *qnx4_bread(struct inode *, int, int);
 
-extern const struct inode_operations qnx4_file_inode_operations;
 extern const struct inode_operations qnx4_dir_inode_operations;
-extern const struct file_operations qnx4_file_operations;
 extern const struct file_operations qnx4_dir_operations;
 extern int qnx4_is_free(struct super_block *sb, long block);
-extern int qnx4_set_bitmap(struct super_block *sb, long block, int busy);
-extern int qnx4_create(struct inode *inode, struct dentry *dentry, int mode, struct nameidata *nd);
-extern void qnx4_truncate(struct inode *inode);
-extern void qnx4_free_inode(struct inode *inode);
-extern int qnx4_unlink(struct inode *dir, struct dentry *dentry);
-extern int qnx4_rmdir(struct inode *dir, struct dentry *dentry);
 
 static inline struct qnx4_sb_info *qnx4_sb(struct super_block *sb)
 {
diff --git a/fs/qnx4/truncate.c b/fs/qnx4/truncate.c
deleted file mode 100644 (file)
index d94d9ee..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * QNX4 file system, Linux implementation.
- * 
- * Version : 0.1
- * 
- * Using parts of the xiafs filesystem.
- * 
- * History :
- * 
- * 30-06-1998 by Frank DENIS : ugly filler.
- */
-
-#include <linux/smp_lock.h>
-#include "qnx4.h"
-
-#ifdef CONFIG_QNX4FS_RW
-
-void qnx4_truncate(struct inode *inode)
-{
-       if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
-             S_ISLNK(inode->i_mode))) {
-               return;
-       }
-       lock_kernel();
-       if (!(S_ISDIR(inode->i_mode))) {
-               /* TODO */
-       }
-       QNX4DEBUG(("qnx4: qnx4_truncate called\n"));
-       inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
-       mark_inode_dirty(inode);
-       unlock_kernel();
-}
-
-#endif
index 38f7bd5..39b49c4 100644 (file)
@@ -1839,7 +1839,7 @@ EXPORT_SYMBOL(dquot_commit_info);
 /*
  * Definitions of diskquota operations.
  */
-struct dquot_operations dquot_operations = {
+const struct dquot_operations dquot_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,
@@ -2461,7 +2461,7 @@ out:
 }
 EXPORT_SYMBOL(vfs_set_dqinfo);
 
-struct quotactl_ops vfs_quotactl_ops = {
+const struct quotactl_ops vfs_quotactl_ops = {
        .quota_on       = vfs_quota_on,
        .quota_off      = vfs_quota_off,
        .quota_sync     = vfs_quota_sync,
index a7f0110..a6090aa 100644 (file)
 #include <linux/ramfs.h>
 #include <linux/sched.h>
 #include <linux/parser.h>
+#include <linux/magic.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
-/* some random number */
-#define RAMFS_MAGIC    0x858458f6
-
 #define RAMFS_DEFAULT_MODE     0755
 
 static const struct super_operations ramfs_ops;
index 7adea74..f0ad05f 100644 (file)
@@ -612,7 +612,7 @@ static int reiserfs_mark_dquot_dirty(struct dquot *);
 static int reiserfs_write_info(struct super_block *, int);
 static int reiserfs_quota_on(struct super_block *, int, int, char *, int);
 
-static struct dquot_operations reiserfs_quota_operations = {
+static const struct dquot_operations reiserfs_quota_operations = {
        .initialize = dquot_initialize,
        .drop = dquot_drop,
        .alloc_space = dquot_alloc_space,
@@ -629,7 +629,7 @@ static struct dquot_operations reiserfs_quota_operations = {
        .destroy_dquot  = dquot_destroy,
 };
 
-static struct quotactl_ops reiserfs_qctl_operations = {
+static const struct quotactl_ops reiserfs_qctl_operations = {
        .quota_on = reiserfs_quota_on,
        .quota_off = vfs_quota_off,
        .quota_sync = vfs_quota_sync,
index 4ab3c03..47f132d 100644 (file)
@@ -284,7 +284,7 @@ static const struct file_operations romfs_dir_operations = {
        .readdir        = romfs_readdir,
 };
 
-static struct inode_operations romfs_dir_inode_operations = {
+static const struct inode_operations romfs_dir_inode_operations = {
        .lookup         = romfs_lookup,
 };
 
index 8084834..a201fc3 100644 (file)
  * better solutions..
  */
 
+#define MAX_SLACK      (100 * NSEC_PER_MSEC)
+
 static long __estimate_accuracy(struct timespec *tv)
 {
        long slack;
        int divfactor = 1000;
 
+       if (tv->tv_sec < 0)
+               return 0;
+
        if (task_nice(current) > 0)
                divfactor = divfactor / 5;
 
+       if (tv->tv_sec > MAX_SLACK / (NSEC_PER_SEC/divfactor))
+               return MAX_SLACK;
+
        slack = tv->tv_nsec / divfactor;
        slack += tv->tv_sec * (NSEC_PER_SEC/divfactor);
 
-       if (slack > 100 * NSEC_PER_MSEC)
-               slack =  100 * NSEC_PER_MSEC;
+       if (slack > MAX_SLACK)
+               return MAX_SLACK;
 
-       if (slack < 0)
-               slack = 0;
        return slack;
 }
 
index 9468168..71c29b6 100644 (file)
@@ -509,7 +509,7 @@ date_unix2dos(struct smb_sb_info *server,
                month = 2;
        } else {
                nl_day = (year & 3) || day <= 59 ? day : day - 1;
-               for (month = 0; month < 12; month++)
+               for (month = 1; month < 12; month++)
                        if (day_n[month] > nl_day)
                                break;
        }
index cb5fc57..6c197ef 100644 (file)
@@ -44,7 +44,7 @@
 #include "squashfs.h"
 
 static struct file_system_type squashfs_fs_type;
-static struct super_operations squashfs_super_ops;
+static const struct super_operations squashfs_super_ops;
 
 static int supported_squashfs_filesystem(short major, short minor, short comp)
 {
@@ -444,7 +444,7 @@ static struct file_system_type squashfs_fs_type = {
        .fs_flags = FS_REQUIRES_DEV
 };
 
-static struct super_operations squashfs_super_ops = {
+static const struct super_operations squashfs_super_ops = {
        .alloc_inode = squashfs_alloc_inode,
        .destroy_inode = squashfs_destroy_inode,
        .statfs = squashfs_statfs,
index b03fea8..0e7207b 100644 (file)
@@ -54,7 +54,7 @@ DEFINE_SPINLOCK(sb_lock);
 static struct super_block *alloc_super(struct file_system_type *type)
 {
        struct super_block *s = kzalloc(sizeof(struct super_block),  GFP_USER);
-       static struct super_operations default_op;
+       static const struct super_operations default_op;
 
        if (s) {
                if (security_sb_alloc(s)) {
index c08467a..d104591 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -183,6 +183,7 @@ int file_fsync(struct file *filp, struct dentry *dentry, int datasync)
                ret = err;
        return ret;
 }
+EXPORT_SYMBOL(file_fsync);
 
 /**
  * vfs_fsync_range - helper to sync a range of data & metadata to disk
index ee1ce68..076ca50 100644 (file)
@@ -715,7 +715,7 @@ long long ubifs_get_free_space_nolock(struct ubifs_info *c)
  * ubifs_get_free_space - return amount of free space.
  * @c: UBIFS file-system description object
  *
- * This function calculates and retuns amount of free space to report to
+ * This function calculates and returns amount of free space to report to
  * user-space.
  */
 long long ubifs_get_free_space(struct ubifs_info *c)
index f3a7945..4775af4 100644 (file)
@@ -510,7 +510,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot)
        int lnum, offs, len, err = 0, uninitialized_var(last_level), child_cnt;
        int first = 1, iip;
        struct ubifs_debug_info *d = c->dbg;
-       union ubifs_key lower_key, upper_key, l_key, u_key;
+       union ubifs_key uninitialized_var(lower_key), upper_key, l_key, u_key;
        unsigned long long uninitialized_var(last_sqnum);
        struct ubifs_idx_node *idx;
        struct list_head list;
index ce2cd83..dbc093a 100644 (file)
@@ -210,6 +210,20 @@ const char *dbg_cstate(int cmt_state)
        }
 }
 
+const char *dbg_jhead(int jhead)
+{
+       switch (jhead) {
+       case GCHD:
+               return "0 (GC)";
+       case BASEHD:
+               return "1 (base)";
+       case DATAHD:
+               return "2 (data)";
+       default:
+               return "unknown journal head";
+       }
+}
+
 static void dump_ch(const struct ubifs_ch *ch)
 {
        printk(KERN_DEBUG "\tmagic          %#x\n", le32_to_cpu(ch->magic));
@@ -623,8 +637,9 @@ void dbg_dump_budg(struct ubifs_info *c)
        /* If we are in R/O mode, journal heads do not exist */
        if (c->jheads)
                for (i = 0; i < c->jhead_cnt; i++)
-                       printk(KERN_DEBUG "\tjhead %d\t LEB %d\n",
-                              c->jheads[i].wbuf.jhead, c->jheads[i].wbuf.lnum);
+                       printk(KERN_DEBUG "\tjhead %s\t LEB %d\n",
+                              dbg_jhead(c->jheads[i].wbuf.jhead),
+                              c->jheads[i].wbuf.lnum);
        for (rb = rb_first(&c->buds); rb; rb = rb_next(rb)) {
                bud = rb_entry(rb, struct ubifs_bud, rb);
                printk(KERN_DEBUG "\tbud LEB %d\n", bud->lnum);
@@ -648,9 +663,90 @@ void dbg_dump_budg(struct ubifs_info *c)
 
 void dbg_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp)
 {
-       printk(KERN_DEBUG "LEB %d lprops: free %d, dirty %d (used %d), "
-              "flags %#x\n", lp->lnum, lp->free, lp->dirty,
-              c->leb_size - lp->free - lp->dirty, lp->flags);
+       int i, spc, dark = 0, dead = 0;
+       struct rb_node *rb;
+       struct ubifs_bud *bud;
+
+       spc = lp->free + lp->dirty;
+       if (spc < c->dead_wm)
+               dead = spc;
+       else
+               dark = ubifs_calc_dark(c, spc);
+
+       if (lp->flags & LPROPS_INDEX)
+               printk(KERN_DEBUG "LEB %-7d free %-8d dirty %-8d used %-8d "
+                      "free + dirty %-8d flags %#x (", lp->lnum, lp->free,
+                      lp->dirty, c->leb_size - spc, spc, lp->flags);
+       else
+               printk(KERN_DEBUG "LEB %-7d free %-8d dirty %-8d used %-8d "
+                      "free + dirty %-8d dark %-4d dead %-4d nodes fit %-3d "
+                      "flags %#-4x (", lp->lnum, lp->free, lp->dirty,
+                      c->leb_size - spc, spc, dark, dead,
+                      (int)(spc / UBIFS_MAX_NODE_SZ), lp->flags);
+
+       if (lp->flags & LPROPS_TAKEN) {
+               if (lp->flags & LPROPS_INDEX)
+                       printk(KERN_CONT "index, taken");
+               else
+                       printk(KERN_CONT "taken");
+       } else {
+               const char *s;
+
+               if (lp->flags & LPROPS_INDEX) {
+                       switch (lp->flags & LPROPS_CAT_MASK) {
+                       case LPROPS_DIRTY_IDX:
+                               s = "dirty index";
+                               break;
+                       case LPROPS_FRDI_IDX:
+                               s = "freeable index";
+                               break;
+                       default:
+                               s = "index";
+                       }
+               } else {
+                       switch (lp->flags & LPROPS_CAT_MASK) {
+                       case LPROPS_UNCAT:
+                               s = "not categorized";
+                               break;
+                       case LPROPS_DIRTY:
+                               s = "dirty";
+                               break;
+                       case LPROPS_FREE:
+                               s = "free";
+                               break;
+                       case LPROPS_EMPTY:
+                               s = "empty";
+                               break;
+                       case LPROPS_FREEABLE:
+                               s = "freeable";
+                               break;
+                       default:
+                               s = NULL;
+                               break;
+                       }
+               }
+               printk(KERN_CONT "%s", s);
+       }
+
+       for (rb = rb_first((struct rb_root *)&c->buds); rb; rb = rb_next(rb)) {
+               bud = rb_entry(rb, struct ubifs_bud, rb);
+               if (bud->lnum == lp->lnum) {
+                       int head = 0;
+                       for (i = 0; i < c->jhead_cnt; i++) {
+                               if (lp->lnum == c->jheads[i].wbuf.lnum) {
+                                       printk(KERN_CONT ", jhead %s",
+                                              dbg_jhead(i));
+                                       head = 1;
+                               }
+                       }
+                       if (!head)
+                               printk(KERN_CONT ", bud of jhead %s",
+                                      dbg_jhead(bud->jhead));
+               }
+       }
+       if (lp->lnum == c->gc_lnum)
+               printk(KERN_CONT ", GC LEB");
+       printk(KERN_CONT ")\n");
 }
 
 void dbg_dump_lprops(struct ubifs_info *c)
@@ -724,7 +820,7 @@ void dbg_dump_leb(const struct ubifs_info *c, int lnum)
 
        printk(KERN_DEBUG "(pid %d) start dumping LEB %d\n",
               current->pid, lnum);
-       sleb = ubifs_scan(c, lnum, 0, c->dbg->buf);
+       sleb = ubifs_scan(c, lnum, 0, c->dbg->buf, 0);
        if (IS_ERR(sleb)) {
                ubifs_err("scan error %d", (int)PTR_ERR(sleb));
                return;
@@ -909,8 +1005,10 @@ out:
        ubifs_msg("saved lprops statistics dump");
        dbg_dump_lstats(&d->saved_lst);
        ubifs_get_lp_stats(c, &lst);
+
        ubifs_msg("current lprops statistics dump");
-       dbg_dump_lstats(&d->saved_lst);
+       dbg_dump_lstats(&lst);
+
        spin_lock(&c->space_lock);
        dbg_dump_budg(c);
        spin_unlock(&c->space_lock);
index c1cd73b..29d9601 100644 (file)
@@ -271,6 +271,7 @@ void ubifs_debugging_exit(struct ubifs_info *c);
 /* Dump functions */
 const char *dbg_ntype(int type);
 const char *dbg_cstate(int cmt_state);
+const char *dbg_jhead(int jhead);
 const char *dbg_get_key_dump(const struct ubifs_info *c,
                             const union ubifs_key *key);
 void dbg_dump_inode(const struct ubifs_info *c, const struct inode *inode);
@@ -321,6 +322,8 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat,
 int dbg_check_lprops(struct ubifs_info *c);
 int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode,
                        int row, int col);
+int dbg_check_inode_size(struct ubifs_info *c, const struct inode *inode,
+                        loff_t size);
 
 /* Force the use of in-the-gaps method for testing */
 
@@ -425,6 +428,7 @@ void dbg_debugfs_exit_fs(struct ubifs_info *c);
 
 #define dbg_ntype(type)                        ""
 #define dbg_cstate(cmt_state)                  ""
+#define dbg_jhead(jhead)                       ""
 #define dbg_get_key_dump(c, key)               ({})
 #define dbg_dump_inode(c, inode)               ({})
 #define dbg_dump_node(c, node)                 ({})
@@ -460,6 +464,7 @@ void dbg_debugfs_exit_fs(struct ubifs_info *c);
 #define dbg_check_heap(c, heap, cat, add_pos)      ({})
 #define dbg_check_lprops(c)                        0
 #define dbg_check_lpt_nodes(c, cnode, row, col)    0
+#define dbg_check_inode_size(c, inode, size)       0
 #define dbg_force_in_the_gaps_enabled              0
 #define dbg_force_in_the_gaps()                    0
 #define dbg_failure_mode                           0
index 6d34dc7..2e6481a 100644 (file)
  */
 
 /*
- * This file implements VFS file and inode operations of regular files, device
+ * This file implements VFS file and inode operations for regular files, device
  * nodes and symlinks as well as address space operations.
  *
- * UBIFS uses 2 page flags: PG_private and PG_checked. PG_private is set if the
- * page is dirty and is used for budgeting purposes - dirty pages should not be
- * budgeted. The PG_checked flag is set if full budgeting is required for the
- * page e.g., when it corresponds to a file hole or it is just beyond the file
- * size. The budgeting is done in 'ubifs_write_begin()', because it is OK to
- * fail in this function, and the budget is released in 'ubifs_write_end()'. So
- * the PG_private and PG_checked flags carry the information about how the page
- * was budgeted, to make it possible to release the budget properly.
+ * UBIFS uses 2 page flags: @PG_private and @PG_checked. @PG_private is set if
+ * the page is dirty and is used for optimization purposes - dirty pages are
+ * not budgeted so the flag shows that 'ubifs_write_end()' should not release
+ * the budget for this page. The @PG_checked flag is set if full budgeting is
+ * required for the page e.g., when it corresponds to a file hole or it is
+ * beyond the file size. The budgeting is done in 'ubifs_write_begin()', because
+ * it is OK to fail in this function, and the budget is released in
+ * 'ubifs_write_end()'. So the @PG_private and @PG_checked flags carry
+ * information about how the page was budgeted, to make it possible to release
+ * the budget properly.
  *
- * A thing to keep in mind: inode's 'i_mutex' is locked in most VFS operations
- * we implement. However, this is not true for '->writepage()', which might be
- * called with 'i_mutex' unlocked. For example, when pdflush is performing
- * write-back, it calls 'writepage()' with unlocked 'i_mutex', although the
- * inode has 'I_LOCK' flag in this case. At "normal" work-paths 'i_mutex' is
- * locked in '->writepage', e.g. in "sys_write -> alloc_pages -> direct reclaim
- * path'. So, in '->writepage()' we are only guaranteed that the page is
- * locked.
+ * A thing to keep in mind: inode @i_mutex is locked in most VFS operations we
+ * implement. However, this is not true for 'ubifs_writepage()', which may be
+ * called with @i_mutex unlocked. For example, when pdflush is doing background
+ * write-back, it calls 'ubifs_writepage()' with unlocked @i_mutex. At "normal"
+ * work-paths the @i_mutex is locked in 'ubifs_writepage()', e.g. in the
+ * "sys_write -> alloc_pages -> direct reclaim path". So, in 'ubifs_writepage()'
+ * we are only guaranteed that the page is locked.
  *
- * Similarly, 'i_mutex' does not have to be locked in readpage(), e.g.,
- * readahead path does not have it locked ("sys_read -> generic_file_aio_read
- * -> ondemand_readahead -> readpage"). In case of readahead, 'I_LOCK' flag is
- * not set as well. However, UBIFS disables readahead.
- *
- * This, for example means that there might be 2 concurrent '->writepage()'
- * calls for the same inode, but different inode dirty pages.
+ * Similarly, @i_mutex is not always locked in 'ubifs_readpage()', e.g., the
+ * read-ahead path does not lock it ("sys_read -> generic_file_aio_read ->
+ * ondemand_readahead -> readpage"). In case of readahead, @I_LOCK flag is not
+ * set as well. However, UBIFS disables readahead.
  */
 
 #include "ubifs.h"
@@ -449,9 +447,9 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
                        /*
                         * We change whole page so no need to load it. But we
                         * have to set the @PG_checked flag to make the further
-                        * code the page is new. This might be not true, but it
-                        * is better to budget more that to read the page from
-                        * the media.
+                        * code know that the page is new. This might be not
+                        * true, but it is better to budget more than to read
+                        * the page from the media.
                         */
                        SetPageChecked(page);
                        skipped_read = 1;
@@ -497,8 +495,8 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
        }
 
        /*
-        * Whee, we aquired budgeting quickly - without involving
-        * garbage-collection, committing or forceing write-back. We return
+        * Whee, we acquired budgeting quickly - without involving
+        * garbage-collection, committing or forcing write-back. We return
         * with @ui->ui_mutex locked if we are appending pages, and unlocked
         * otherwise. This is an optimization (slightly hacky though).
         */
@@ -562,7 +560,7 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping,
 
                /*
                 * Return 0 to force VFS to repeat the whole operation, or the
-                * error code if 'do_readpage()' failes.
+                * error code if 'do_readpage()' fails.
                 */
                copied = do_readpage(page);
                goto out;
@@ -1175,11 +1173,11 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,
        ui->ui_size = inode->i_size;
        /* Truncation changes inode [mc]time */
        inode->i_mtime = inode->i_ctime = ubifs_current_time(inode);
-       /* The other attributes may be changed at the same time as well */
+       /* Other attributes may be changed at the same time as well */
        do_attr_changes(inode, attr);
-
        err = ubifs_jnl_truncate(c, inode, old_size, new_size);
        mutex_unlock(&ui->ui_mutex);
+
 out_budg:
        if (budgeted)
                ubifs_release_budget(c, &req);
index f0f5f15..618c270 100644 (file)
@@ -529,7 +529,7 @@ int ubifs_garbage_collect_leb(struct ubifs_info *c, struct ubifs_lprops *lp)
         * We scan the entire LEB even though we only really need to scan up to
         * (c->leb_size - lp->free).
         */
-       sleb = ubifs_scan(c, lnum, 0, c->sbuf);
+       sleb = ubifs_scan(c, lnum, 0, c->sbuf, 0);
        if (IS_ERR(sleb))
                return PTR_ERR(sleb);
 
index 762a7d6..e589fed 100644 (file)
@@ -297,7 +297,7 @@ static enum hrtimer_restart wbuf_timer_callback_nolock(struct hrtimer *timer)
 {
        struct ubifs_wbuf *wbuf = container_of(timer, struct ubifs_wbuf, timer);
 
-       dbg_io("jhead %d", wbuf->jhead);
+       dbg_io("jhead %s", dbg_jhead(wbuf->jhead));
        wbuf->need_sync = 1;
        wbuf->c->need_wbuf_sync = 1;
        ubifs_wake_up_bgt(wbuf->c);
@@ -314,7 +314,8 @@ static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
 
        if (wbuf->no_timer)
                return;
-       dbg_io("set timer for jhead %d, %llu-%llu millisecs", wbuf->jhead,
+       dbg_io("set timer for jhead %s, %llu-%llu millisecs",
+              dbg_jhead(wbuf->jhead),
               div_u64(ktime_to_ns(wbuf->softlimit), USEC_PER_SEC),
               div_u64(ktime_to_ns(wbuf->softlimit) + wbuf->delta,
                       USEC_PER_SEC));
@@ -351,8 +352,8 @@ int ubifs_wbuf_sync_nolock(struct ubifs_wbuf *wbuf)
                /* Write-buffer is empty or not seeked */
                return 0;
 
-       dbg_io("LEB %d:%d, %d bytes, jhead %d",
-              wbuf->lnum, wbuf->offs, wbuf->used, wbuf->jhead);
+       dbg_io("LEB %d:%d, %d bytes, jhead %s",
+              wbuf->lnum, wbuf->offs, wbuf->used, dbg_jhead(wbuf->jhead));
        ubifs_assert(!(c->vfs_sb->s_flags & MS_RDONLY));
        ubifs_assert(!(wbuf->avail & 7));
        ubifs_assert(wbuf->offs + c->min_io_size <= c->leb_size);
@@ -401,7 +402,7 @@ int ubifs_wbuf_seek_nolock(struct ubifs_wbuf *wbuf, int lnum, int offs,
 {
        const struct ubifs_info *c = wbuf->c;
 
-       dbg_io("LEB %d:%d, jhead %d", lnum, offs, wbuf->jhead);
+       dbg_io("LEB %d:%d, jhead %s", lnum, offs, dbg_jhead(wbuf->jhead));
        ubifs_assert(lnum >= 0 && lnum < c->leb_cnt);
        ubifs_assert(offs >= 0 && offs <= c->leb_size);
        ubifs_assert(offs % c->min_io_size == 0 && !(offs & 7));
@@ -508,9 +509,9 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
        struct ubifs_info *c = wbuf->c;
        int err, written, n, aligned_len = ALIGN(len, 8), offs;
 
-       dbg_io("%d bytes (%s) to jhead %d wbuf at LEB %d:%d", len,
-              dbg_ntype(((struct ubifs_ch *)buf)->node_type), wbuf->jhead,
-              wbuf->lnum, wbuf->offs + wbuf->used);
+       dbg_io("%d bytes (%s) to jhead %s wbuf at LEB %d:%d", len,
+              dbg_ntype(((struct ubifs_ch *)buf)->node_type),
+              dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs + wbuf->used);
        ubifs_assert(len > 0 && wbuf->lnum >= 0 && wbuf->lnum < c->leb_cnt);
        ubifs_assert(wbuf->offs >= 0 && wbuf->offs % c->min_io_size == 0);
        ubifs_assert(!(wbuf->offs & 7) && wbuf->offs <= c->leb_size);
@@ -535,8 +536,8 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
                memcpy(wbuf->buf + wbuf->used, buf, len);
 
                if (aligned_len == wbuf->avail) {
-                       dbg_io("flush jhead %d wbuf to LEB %d:%d",
-                              wbuf->jhead, wbuf->lnum, wbuf->offs);
+                       dbg_io("flush jhead %s wbuf to LEB %d:%d",
+                              dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
                        err = ubi_leb_write(c->ubi, wbuf->lnum, wbuf->buf,
                                            wbuf->offs, c->min_io_size,
                                            wbuf->dtype);
@@ -564,8 +565,8 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
         * minimal I/O unit. We have to fill and flush write-buffer and switch
         * to the next min. I/O unit.
         */
-       dbg_io("flush jhead %d wbuf to LEB %d:%d",
-              wbuf->jhead, wbuf->lnum, wbuf->offs);
+       dbg_io("flush jhead %s wbuf to LEB %d:%d",
+              dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
        memcpy(wbuf->buf + wbuf->used, buf, wbuf->avail);
        err = ubi_leb_write(c->ubi, wbuf->lnum, wbuf->buf, wbuf->offs,
                            c->min_io_size, wbuf->dtype);
@@ -698,8 +699,8 @@ int ubifs_read_node_wbuf(struct ubifs_wbuf *wbuf, void *buf, int type, int len,
        int err, rlen, overlap;
        struct ubifs_ch *ch = buf;
 
-       dbg_io("LEB %d:%d, %s, length %d, jhead %d", lnum, offs,
-              dbg_ntype(type), len, wbuf->jhead);
+       dbg_io("LEB %d:%d, %s, length %d, jhead %s", lnum, offs,
+              dbg_ntype(type), len, dbg_jhead(wbuf->jhead));
        ubifs_assert(wbuf && lnum >= 0 && lnum < c->leb_cnt && offs >= 0);
        ubifs_assert(!(offs & 7) && offs < c->leb_size);
        ubifs_assert(type >= 0 && type < UBIFS_NODE_TYPES_CNT);
index 64b5f3a..d321bae 100644 (file)
@@ -158,7 +158,7 @@ again:
         * some. But the write-buffer mutex has to be unlocked because
         * GC also takes it.
         */
-       dbg_jnl("no free space  jhead %d, run GC", jhead);
+       dbg_jnl("no free space in jhead %s, run GC", dbg_jhead(jhead));
        mutex_unlock(&wbuf->io_mutex);
 
        lnum = ubifs_garbage_collect(c, 0);
@@ -173,7 +173,8 @@ again:
                 * because we dropped @wbuf->io_mutex, so try once
                 * again.
                 */
-               dbg_jnl("GC couldn't make a free LEB for jhead %d", jhead);
+               dbg_jnl("GC couldn't make a free LEB for jhead %s",
+                       dbg_jhead(jhead));
                if (retries++ < 2) {
                        dbg_jnl("retry (%d)", retries);
                        goto again;
@@ -184,7 +185,7 @@ again:
        }
 
        mutex_lock_nested(&wbuf->io_mutex, wbuf->jhead);
-       dbg_jnl("got LEB %d for jhead %d", lnum, jhead);
+       dbg_jnl("got LEB %d for jhead %s", lnum, dbg_jhead(jhead));
        avail = c->leb_size - wbuf->offs - wbuf->used;
 
        if (wbuf->lnum != -1 && avail >= len) {
@@ -255,7 +256,8 @@ static int write_node(struct ubifs_info *c, int jhead, void *node, int len,
        *lnum = c->jheads[jhead].wbuf.lnum;
        *offs = c->jheads[jhead].wbuf.offs + c->jheads[jhead].wbuf.used;
 
-       dbg_jnl("jhead %d, LEB %d:%d, len %d", jhead, *lnum, *offs, len);
+       dbg_jnl("jhead %s, LEB %d:%d, len %d",
+               dbg_jhead(jhead), *lnum, *offs, len);
        ubifs_prepare_node(c, node, len, 0);
 
        return ubifs_wbuf_write_nolock(wbuf, node, len);
@@ -285,7 +287,8 @@ static int write_head(struct ubifs_info *c, int jhead, void *buf, int len,
 
        *lnum = c->jheads[jhead].wbuf.lnum;
        *offs = c->jheads[jhead].wbuf.offs + c->jheads[jhead].wbuf.used;
-       dbg_jnl("jhead %d, LEB %d:%d, len %d", jhead, *lnum, *offs, len);
+       dbg_jnl("jhead %s, LEB %d:%d, len %d",
+               dbg_jhead(jhead), *lnum, *offs, len);
 
        err = ubifs_wbuf_write_nolock(wbuf, buf, len);
        if (err)
index 5fa27ea..0f530c6 100644 (file)
@@ -228,23 +228,6 @@ static inline void xent_key_init(const struct ubifs_info *c,
        key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS);
 }
 
-/**
- * xent_key_init_hash - initialize extended attribute entry key without
- *                      re-calculating hash function.
- * @c: UBIFS file-system description object
- * @key: key to initialize
- * @inum: host inode number
- * @hash: extended attribute entry name hash
- */
-static inline void xent_key_init_hash(const struct ubifs_info *c,
-                                     union ubifs_key *key, ino_t inum,
-                                     uint32_t hash)
-{
-       ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK));
-       key->u32[0] = inum;
-       key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS);
-}
-
 /**
  * xent_key_init_flash - initialize on-flash extended attribute entry key.
  * @c: UBIFS file-system description object
@@ -295,22 +278,15 @@ static inline void data_key_init(const struct ubifs_info *c,
 }
 
 /**
- * data_key_init_flash - initialize on-flash data key.
+ * highest_data_key - get the highest possible data key for an inode.
  * @c: UBIFS file-system description object
- * @k: key to initialize
+ * @key: key to initialize
  * @inum: inode number
- * @block: block number
  */
-static inline void data_key_init_flash(const struct ubifs_info *c, void *k,
-                                      ino_t inum, unsigned int block)
+static inline void highest_data_key(const struct ubifs_info *c,
+                                  union ubifs_key *key, ino_t inum)
 {
-       union ubifs_key *key = k;
-
-       ubifs_assert(!(block & ~UBIFS_S_KEY_BLOCK_MASK));
-       key->j32[0] = cpu_to_le32(inum);
-       key->j32[1] = cpu_to_le32(block |
-                                 (UBIFS_DATA_KEY << UBIFS_S_KEY_BLOCK_BITS));
-       memset(k + 8, 0, UBIFS_MAX_KEY_LEN - 8);
+       data_key_init(c, key, inum, UBIFS_S_KEY_BLOCK_MASK);
 }
 
 /**
@@ -554,4 +530,5 @@ static inline unsigned long long key_max_inode_size(const struct ubifs_info *c)
                return 0;
        }
 }
+
 #endif /* !__UBIFS_KEY_H__ */
index 56e3377..c345e12 100644 (file)
@@ -169,8 +169,8 @@ void ubifs_add_bud(struct ubifs_info *c, struct ubifs_bud *bud)
         */
        c->bud_bytes += c->leb_size - bud->start;
 
-       dbg_log("LEB %d:%d, jhead %d, bud_bytes %lld", bud->lnum,
-               bud->start, bud->jhead, c->bud_bytes);
+       dbg_log("LEB %d:%d, jhead %s, bud_bytes %lld", bud->lnum,
+               bud->start, dbg_jhead(bud->jhead), c->bud_bytes);
        spin_unlock(&c->buds_lock);
 }
 
@@ -355,16 +355,16 @@ static void remove_buds(struct ubifs_info *c)
                         * heads (non-closed buds).
                         */
                        c->cmt_bud_bytes += wbuf->offs - bud->start;
-                       dbg_log("preserve %d:%d, jhead %d, bud bytes %d, "
+                       dbg_log("preserve %d:%d, jhead %s, bud bytes %d, "
                                "cmt_bud_bytes %lld", bud->lnum, bud->start,
-                               bud->jhead, wbuf->offs - bud->start,
+                               dbg_jhead(bud->jhead), wbuf->offs - bud->start,
                                c->cmt_bud_bytes);
                        bud->start = wbuf->offs;
                } else {
                        c->cmt_bud_bytes += c->leb_size - bud->start;
-                       dbg_log("remove %d:%d, jhead %d, bud bytes %d, "
+                       dbg_log("remove %d:%d, jhead %s, bud bytes %d, "
                                "cmt_bud_bytes %lld", bud->lnum, bud->start,
-                               bud->jhead, c->leb_size - bud->start,
+                               dbg_jhead(bud->jhead), c->leb_size - bud->start,
                                c->cmt_bud_bytes);
                        rb_erase(p1, &c->buds);
                        /*
@@ -429,7 +429,8 @@ int ubifs_log_start_commit(struct ubifs_info *c, int *ltail_lnum)
                if (lnum == -1 || offs == c->leb_size)
                        continue;
 
-               dbg_log("add ref to LEB %d:%d for jhead %d", lnum, offs, i);
+               dbg_log("add ref to LEB %d:%d for jhead %s",
+                       lnum, offs, dbg_jhead(i));
                ref = buf + len;
                ref->ch.node_type = UBIFS_REF_NODE;
                ref->lnum = cpu_to_le32(lnum);
@@ -695,7 +696,7 @@ int ubifs_consolidate_log(struct ubifs_info *c)
        lnum = c->ltail_lnum;
        write_lnum = lnum;
        while (1) {
-               sleb = ubifs_scan(c, lnum, 0, c->sbuf);
+               sleb = ubifs_scan(c, lnum, 0, c->sbuf, 0);
                if (IS_ERR(sleb)) {
                        err = PTR_ERR(sleb);
                        goto out_free;
index 4cdd284..4d4ca38 100644 (file)
@@ -281,7 +281,7 @@ void ubifs_add_to_cat(struct ubifs_info *c, struct ubifs_lprops *lprops,
        case LPROPS_FREE:
                if (add_to_lpt_heap(c, lprops, cat))
                        break;
-               /* No more room on heap so make it uncategorized */
+               /* No more room on heap so make it un-categorized */
                cat = LPROPS_UNCAT;
                /* Fall through */
        case LPROPS_UNCAT:
@@ -375,8 +375,8 @@ void ubifs_replace_cat(struct ubifs_info *c, struct ubifs_lprops *old_lprops,
  * @lprops: LEB properties
  *
  * A LEB may have fallen off of the bottom of a heap, and ended up as
- * uncategorized even though it has enough space for us now. If that is the case
- * this function will put the LEB back onto a heap.
+ * un-categorized even though it has enough space for us now. If that is the
+ * case this function will put the LEB back onto a heap.
  */
 void ubifs_ensure_cat(struct ubifs_info *c, struct ubifs_lprops *lprops)
 {
@@ -436,10 +436,10 @@ int ubifs_categorize_lprops(const struct ubifs_info *c,
 /**
  * change_category - change LEB properties category.
  * @c: UBIFS file-system description object
- * @lprops: LEB properties to recategorize
+ * @lprops: LEB properties to re-categorize
  *
  * LEB properties are categorized to enable fast find operations. When the LEB
- * properties change they must be recategorized.
+ * properties change they must be re-categorized.
  */
 static void change_category(struct ubifs_info *c, struct ubifs_lprops *lprops)
 {
@@ -461,21 +461,18 @@ static void change_category(struct ubifs_info *c, struct ubifs_lprops *lprops)
 }
 
 /**
- * calc_dark - calculate LEB dark space size.
+ * ubifs_calc_dark - calculate LEB dark space size.
  * @c: the UBIFS file-system description object
  * @spc: amount of free and dirty space in the LEB
  *
- * This function calculates amount of dark space in an LEB which has @spc bytes
- * of free and dirty space. Returns the calculations result.
+ * This function calculates and returns amount of dark space in an LEB which
+ * has @spc bytes of free and dirty space.
  *
- * Dark space is the space which is not always usable - it depends on which
- * nodes are written in which order. E.g., if an LEB has only 512 free bytes,
- * it is dark space, because it cannot fit a large data node. So UBIFS cannot
- * count on this LEB and treat these 512 bytes as usable because it is not true
- * if, for example, only big chunks of uncompressible data will be written to
- * the FS.
+ * UBIFS is trying to account the space which might not be usable, and this
+ * space is called "dark space". For example, if an LEB has only %512 free
+ * bytes, it is dark space, because it cannot fit a large data node.
  */
-static int calc_dark(struct ubifs_info *c, int spc)
+int ubifs_calc_dark(const struct ubifs_info *c, int spc)
 {
        ubifs_assert(!(spc & 7));
 
@@ -518,7 +515,7 @@ static int is_lprops_dirty(struct ubifs_info *c, struct ubifs_lprops *lprops)
  * @free: new free space amount
  * @dirty: new dirty space amount
  * @flags: new flags
- * @idx_gc_cnt: change to the count of idx_gc list
+ * @idx_gc_cnt: change to the count of @idx_gc list
  *
  * This function changes LEB properties (@free, @dirty or @flag). However, the
  * property which has the %LPROPS_NC value is not changed. Returns a pointer to
@@ -535,7 +532,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
 {
        /*
         * This is the only function that is allowed to change lprops, so we
-        * discard the const qualifier.
+        * discard the "const" qualifier.
         */
        struct ubifs_lprops *lprops = (struct ubifs_lprops *)lp;
 
@@ -575,7 +572,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
                if (old_spc < c->dead_wm)
                        c->lst.total_dead -= old_spc;
                else
-                       c->lst.total_dark -= calc_dark(c, old_spc);
+                       c->lst.total_dark -= ubifs_calc_dark(c, old_spc);
 
                c->lst.total_used -= c->leb_size - old_spc;
        }
@@ -616,7 +613,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
                if (new_spc < c->dead_wm)
                        c->lst.total_dead += new_spc;
                else
-                       c->lst.total_dark += calc_dark(c, new_spc);
+                       c->lst.total_dark += ubifs_calc_dark(c, new_spc);
 
                c->lst.total_used += c->leb_size - new_spc;
        }
@@ -1096,7 +1093,7 @@ static int scan_check_cb(struct ubifs_info *c,
                }
        }
 
-       sleb = ubifs_scan(c, lnum, 0, c->dbg->buf);
+       sleb = ubifs_scan(c, lnum, 0, c->dbg->buf, 0);
        if (IS_ERR(sleb)) {
                /*
                 * After an unclean unmount, empty and freeable LEBs
@@ -1107,7 +1104,7 @@ static int scan_check_cb(struct ubifs_info *c,
                                  "- continuing checking");
                        lst->empty_lebs += 1;
                        lst->total_free += c->leb_size;
-                       lst->total_dark += calc_dark(c, c->leb_size);
+                       lst->total_dark += ubifs_calc_dark(c, c->leb_size);
                        return LPT_SCAN_CONTINUE;
                }
 
@@ -1117,7 +1114,7 @@ static int scan_check_cb(struct ubifs_info *c,
                                  "- continuing checking");
                        lst->total_free  += lp->free;
                        lst->total_dirty += lp->dirty;
-                       lst->total_dark  +=  calc_dark(c, c->leb_size);
+                       lst->total_dark  +=  ubifs_calc_dark(c, c->leb_size);
                        return LPT_SCAN_CONTINUE;
                }
                data->err = PTR_ERR(sleb);
@@ -1235,7 +1232,7 @@ static int scan_check_cb(struct ubifs_info *c,
                if (spc < c->dead_wm)
                        lst->total_dead += spc;
                else
-                       lst->total_dark += calc_dark(c, spc);
+                       lst->total_dark += ubifs_calc_dark(c, spc);
        }
 
        ubifs_scan_destroy(sleb);
index a88f338..28beaee 100644 (file)
@@ -29,7 +29,8 @@
  * @c: UBIFS file-system description object
  *
  * This function scans the master node LEBs and search for the latest master
- * node. Returns zero in case of success and a negative error code in case of
+ * node. Returns zero in case of success, %-EUCLEAN if there master area is
+ * corrupted and requires recovery, and a negative error code in case of
  * failure.
  */
 static int scan_for_master(struct ubifs_info *c)
@@ -40,7 +41,7 @@ static int scan_for_master(struct ubifs_info *c)
 
        lnum = UBIFS_MST_LNUM;
 
-       sleb = ubifs_scan(c, lnum, 0, c->sbuf);
+       sleb = ubifs_scan(c, lnum, 0, c->sbuf, 1);
        if (IS_ERR(sleb))
                return PTR_ERR(sleb);
        nodes_cnt = sleb->nodes_cnt;
@@ -48,7 +49,7 @@ static int scan_for_master(struct ubifs_info *c)
                snod = list_entry(sleb->nodes.prev, struct ubifs_scan_node,
                                  list);
                if (snod->type != UBIFS_MST_NODE)
-                       goto out;
+                       goto out_dump;
                memcpy(c->mst_node, snod->node, snod->len);
                offs = snod->offs;
        }
@@ -56,7 +57,7 @@ static int scan_for_master(struct ubifs_info *c)
 
        lnum += 1;
 
-       sleb = ubifs_scan(c, lnum, 0, c->sbuf);
+       sleb = ubifs_scan(c, lnum, 0, c->sbuf, 1);
        if (IS_ERR(sleb))
                return PTR_ERR(sleb);
        if (sleb->nodes_cnt != nodes_cnt)
@@ -65,7 +66,7 @@ static int scan_for_master(struct ubifs_info *c)
                goto out;
        snod = list_entry(sleb->nodes.prev, struct ubifs_scan_node, list);
        if (snod->type != UBIFS_MST_NODE)
-               goto out;
+               goto out_dump;
        if (snod->offs != offs)
                goto out;
        if (memcmp((void *)c->mst_node + UBIFS_CH_SZ,
@@ -78,6 +79,12 @@ static int scan_for_master(struct ubifs_info *c)
 
 out:
        ubifs_scan_destroy(sleb);
+       return -EUCLEAN;
+
+out_dump:
+       ubifs_err("unexpected node type %d master LEB %d:%d",
+                 snod->type, lnum, snod->offs);
+       ubifs_scan_destroy(sleb);
        return -EINVAL;
 }
 
@@ -256,7 +263,8 @@ int ubifs_read_master(struct ubifs_info *c)
 
        err = scan_for_master(c);
        if (err) {
-               err = ubifs_recover_master_node(c);
+               if (err == -EUCLEAN)
+                       err = ubifs_recover_master_node(c);
                if (err)
                        /*
                         * Note, we do not free 'c->mst_node' here because the
index 152a7b3..82009c7 100644 (file)
@@ -670,9 +670,10 @@ static int kill_orphans(struct ubifs_info *c)
                struct ubifs_scan_leb *sleb;
 
                dbg_rcvry("LEB %d", lnum);
-               sleb = ubifs_scan(c, lnum, 0, c->sbuf);
+               sleb = ubifs_scan(c, lnum, 0, c->sbuf, 1);
                if (IS_ERR(sleb)) {
-                       sleb = ubifs_recover_leb(c, lnum, 0, c->sbuf, 0);
+                       if (PTR_ERR(sleb) == -EUCLEAN)
+                               sleb = ubifs_recover_leb(c, lnum, 0, c->sbuf, 0);
                        if (IS_ERR(sleb)) {
                                err = PTR_ERR(sleb);
                                break;
@@ -899,7 +900,7 @@ static int dbg_scan_orphans(struct ubifs_info *c, struct check_info *ci)
        for (lnum = c->orph_first; lnum <= c->orph_last; lnum++) {
                struct ubifs_scan_leb *sleb;
 
-               sleb = ubifs_scan(c, lnum, 0, c->dbg->buf);
+               sleb = ubifs_scan(c, lnum, 0, c->dbg->buf, 0);
                if (IS_ERR(sleb)) {
                        err = PTR_ERR(sleb);
                        break;
index e5f6cf8..f94ddf7 100644 (file)
@@ -286,7 +286,7 @@ int ubifs_recover_master_node(struct ubifs_info *c)
                mst = mst2;
        }
 
-       dbg_rcvry("recovered master node from LEB %d",
+       ubifs_msg("recovered master node from LEB %d",
                  (mst == mst1 ? UBIFS_MST_LNUM : UBIFS_MST_LNUM + 1));
 
        memcpy(c->mst_node, mst, UBIFS_MST_NODE_SZ);
@@ -790,7 +790,7 @@ struct ubifs_scan_leb *ubifs_recover_log_leb(struct ubifs_info *c, int lnum,
                 * We can only recover at the end of the log, so check that the
                 * next log LEB is empty or out of date.
                 */
-               sleb = ubifs_scan(c, next_lnum, 0, sbuf);
+               sleb = ubifs_scan(c, next_lnum, 0, sbuf, 0);
                if (IS_ERR(sleb))
                        return sleb;
                if (sleb->nodes_cnt) {
index 2970500..5c2d6d7 100644 (file)
@@ -506,7 +506,7 @@ static int replay_bud(struct ubifs_info *c, int lnum, int offs, int jhead,
        if (c->need_recovery)
                sleb = ubifs_recover_leb(c, lnum, offs, c->sbuf, jhead != GCHD);
        else
-               sleb = ubifs_scan(c, lnum, offs, c->sbuf);
+               sleb = ubifs_scan(c, lnum, offs, c->sbuf, 0);
        if (IS_ERR(sleb))
                return PTR_ERR(sleb);
 
@@ -836,8 +836,8 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
        const struct ubifs_cs_node *node;
 
        dbg_mnt("replay log LEB %d:%d", lnum, offs);
-       sleb = ubifs_scan(c, lnum, offs, sbuf);
-       if (IS_ERR(sleb) ) {
+       sleb = ubifs_scan(c, lnum, offs, sbuf, c->need_recovery);
+       if (IS_ERR(sleb)) {
                if (PTR_ERR(sleb) != -EUCLEAN || !c->need_recovery)
                        return PTR_ERR(sleb);
                sleb = ubifs_recover_log_leb(c, lnum, offs, sbuf);
index 892ebfe..96c5253 100644 (file)
@@ -108,10 +108,9 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
 
                /* Make the node pads to 8-byte boundary */
                if ((node_len + pad_len) & 7) {
-                       if (!quiet) {
+                       if (!quiet)
                                dbg_err("bad padding length %d - %d",
                                        offs, offs + node_len + pad_len);
-                       }
                        return SCANNED_A_BAD_PAD_NODE;
                }
 
@@ -253,15 +252,19 @@ void ubifs_scanned_corruption(const struct ubifs_info *c, int lnum, int offs,
  * @c: UBIFS file-system description object
  * @lnum: logical eraseblock number
  * @offs: offset to start at (usually zero)
- * @sbuf: scan buffer (must be c->leb_size)
+ * @sbuf: scan buffer (must be of @c->leb_size bytes in size)
+ * @quiet: print no messages
  *
  * This function scans LEB number @lnum and returns complete information about
  * its contents. Returns the scaned information in case of success and,
  * %-EUCLEAN if the LEB neads recovery, and other negative error codes in case
  * of failure.
+ *
+ * If @quiet is non-zero, this function does not print large and scary
+ * error messages and flash dumps in case of errors.
  */
 struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
-                                 int offs, void *sbuf)
+                                 int offs, void *sbuf, int quiet)
 {
        void *buf = sbuf + offs;
        int err, len = c->leb_size - offs;
@@ -280,7 +283,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
 
                cond_resched();
 
-               ret = ubifs_scan_a_node(c, buf, len, lnum, offs, 0);
+               ret = ubifs_scan_a_node(c, buf, len, lnum, offs, quiet);
                if (ret > 0) {
                        /* Padding bytes or a valid padding node */
                        offs += ret;
@@ -320,7 +323,9 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
        }
 
        if (offs % c->min_io_size) {
-               ubifs_err("empty space starts at non-aligned offset %d", offs);
+               if (!quiet)
+                       ubifs_err("empty space starts at non-aligned offset %d",
+                                 offs);
                goto corrupted;;
        }
 
@@ -331,18 +336,25 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
                        break;
        for (; len; offs++, buf++, len--)
                if (*(uint8_t *)buf != 0xff) {
-                       ubifs_err("corrupt empty space at LEB %d:%d",
-                                 lnum, offs);
+                       if (!quiet)
+                               ubifs_err("corrupt empty space at LEB %d:%d",
+                                         lnum, offs);
                        goto corrupted;
                }
 
        return sleb;
 
 corrupted:
-       ubifs_scanned_corruption(c, lnum, offs, buf);
+       if (!quiet) {
+               ubifs_scanned_corruption(c, lnum, offs, buf);
+               ubifs_err("LEB %d scanning failed", lnum);
+       }
        err = -EUCLEAN;
+       ubifs_scan_destroy(sleb);
+       return ERR_PTR(err);
+
 error:
-       ubifs_err("LEB %d scanning failed", lnum);
+       ubifs_err("LEB %d scanning failed, error %d", lnum, err);
        ubifs_scan_destroy(sleb);
        return ERR_PTR(err);
 }
index c4af069..333e181 100644 (file)
@@ -36,7 +36,6 @@
 #include <linux/mount.h>
 #include <linux/math64.h>
 #include <linux/writeback.h>
-#include <linux/smp_lock.h>
 #include "ubifs.h"
 
 /*
@@ -318,6 +317,8 @@ static int ubifs_write_inode(struct inode *inode, int wait)
                if (err)
                        ubifs_err("can't write inode %lu, error %d",
                                  inode->i_ino, err);
+               else
+                       err = dbg_check_inode_size(c, inode, ui->ui_size);
        }
 
        ui->dirty = 0;
@@ -447,17 +448,6 @@ static int ubifs_sync_fs(struct super_block *sb, int wait)
        if (!wait)
                return 0;
 
-       /*
-        * VFS calls '->sync_fs()' before synchronizing all dirty inodes and
-        * pages, so synchronize them first, then commit the journal. Strictly
-        * speaking, it is not necessary to commit the journal here,
-        * synchronizing write-buffers would be enough. But committing makes
-        * UBIFS free space predictions much more accurate, so we want to let
-        * the user be able to get more accurate results of 'statfs()' after
-        * they synchronize the file system.
-        */
-       sync_inodes_sb(sb);
-
        /*
         * Synchronize write buffers, because 'ubifs_run_commit()' does not
         * do this if it waits for an already running commit.
@@ -468,6 +458,13 @@ static int ubifs_sync_fs(struct super_block *sb, int wait)
                        return err;
        }
 
+       /*
+        * Strictly speaking, it is not necessary to commit the journal here,
+        * synchronizing write-buffers would be enough. But committing makes
+        * UBIFS free space predictions much more accurate, so we want to let
+        * the user be able to get more accurate results of 'statfs()' after
+        * they synchronize the file system.
+        */
        err = ubifs_run_commit(c);
        if (err)
                return err;
@@ -1720,8 +1717,6 @@ static void ubifs_put_super(struct super_block *sb)
        ubifs_msg("un-mount UBI device %d, volume %d", c->vi.ubi_num,
                  c->vi.vol_id);
 
-       lock_kernel();
-
        /*
         * The following asserts are only valid if there has not been a failure
         * of the media. For example, there will be dirty inodes if we failed
@@ -1786,8 +1781,6 @@ static void ubifs_put_super(struct super_block *sb)
        ubi_close_volume(c->ubi);
        mutex_unlock(&c->umount_mutex);
        kfree(c);
-
-       unlock_kernel();
 }
 
 static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
@@ -1803,22 +1796,17 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
                return err;
        }
 
-       lock_kernel();
        if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
                if (c->ro_media) {
                        ubifs_msg("cannot re-mount due to prior errors");
-                       unlock_kernel();
                        return -EROFS;
                }
                err = ubifs_remount_rw(c);
-               if (err) {
-                       unlock_kernel();
+               if (err)
                        return err;
-               }
        } else if (!(sb->s_flags & MS_RDONLY) && (*flags & MS_RDONLY)) {
                if (c->ro_media) {
                        ubifs_msg("cannot re-mount due to prior errors");
-                       unlock_kernel();
                        return -EROFS;
                }
                ubifs_remount_ro(c);
@@ -1833,7 +1821,6 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
        }
 
        ubifs_assert(c->lst.taken_empty_lebs > 0);
-       unlock_kernel();
        return 0;
 }
 
index f249f7b..e5b1a7d 100644 (file)
@@ -1159,8 +1159,8 @@ static struct ubifs_znode *dirty_cow_bottom_up(struct ubifs_info *c,
  *   o exact match, i.e. the found zero-level znode contains key @key, then %1
  *     is returned and slot number of the matched branch is stored in @n;
  *   o not exact match, which means that zero-level znode does not contain
- *     @key, then %0 is returned and slot number of the closed branch is stored
- *     in  @n;
+ *     @key, then %0 is returned and slot number of the closest branch is stored
+ *     in @n;
  *   o @key is so small that it is even less than the lowest key of the
  *     leftmost zero-level node, then %0 is returned and %0 is stored in @n.
  *
@@ -1433,7 +1433,7 @@ static int maybe_leb_gced(struct ubifs_info *c, int lnum, int gc_seq1)
  * @lnum: LEB number is returned here
  * @offs: offset is returned here
  *
- * This function look up and reads node with key @key. The caller has to make
+ * This function looks up and reads node with key @key. The caller has to make
  * sure the @node buffer is large enough to fit the node. Returns zero in case
  * of success, %-ENOENT if the node was not found, and a negative error code in
  * case of failure. The node location can be returned in @lnum and @offs.
@@ -3268,3 +3268,73 @@ out_unlock:
        mutex_unlock(&c->tnc_mutex);
        return err;
 }
+
+#ifdef CONFIG_UBIFS_FS_DEBUG
+
+/**
+ * dbg_check_inode_size - check if inode size is correct.
+ * @c: UBIFS file-system description object
+ * @inum: inode number
+ * @size: inode size
+ *
+ * This function makes sure that the inode size (@size) is correct and it does
+ * not have any pages beyond @size. Returns zero if the inode is OK, %-EINVAL
+ * if it has a data page beyond @size, and other negative error code in case of
+ * other errors.
+ */
+int dbg_check_inode_size(struct ubifs_info *c, const struct inode *inode,
+                        loff_t size)
+{
+       int err, n;
+       union ubifs_key from_key, to_key, *key;
+       struct ubifs_znode *znode;
+       unsigned int block;
+
+       if (!S_ISREG(inode->i_mode))
+               return 0;
+       if (!(ubifs_chk_flags & UBIFS_CHK_GEN))
+               return 0;
+
+       block = (size + UBIFS_BLOCK_SIZE - 1) >> UBIFS_BLOCK_SHIFT;
+       data_key_init(c, &from_key, inode->i_ino, block);
+       highest_data_key(c, &to_key, inode->i_ino);
+
+       mutex_lock(&c->tnc_mutex);
+       err = ubifs_lookup_level0(c, &from_key, &znode, &n);
+       if (err < 0)
+               goto out_unlock;
+
+       if (err) {
+               err = -EINVAL;
+               key = &from_key;
+               goto out_dump;
+       }
+
+       err = tnc_next(c, &znode, &n);
+       if (err == -ENOENT) {
+               err = 0;
+               goto out_unlock;
+       }
+       if (err < 0)
+               goto out_unlock;
+
+       ubifs_assert(err == 0);
+       key = &znode->zbranch[n].key;
+       if (!key_in_range(c, key, &from_key, &to_key))
+               goto out_unlock;
+
+out_dump:
+       block = key_block(c, key);
+       ubifs_err("inode %lu has size %lld, but there are data at offset %lld "
+                 "(data key %s)", (unsigned long)inode->i_ino, size,
+                 ((loff_t)block) << UBIFS_BLOCK_SHIFT, DBGKEY(key));
+       dbg_dump_inode(c, inode);
+       dbg_dump_stack();
+       err = -EINVAL;
+
+out_unlock:
+       mutex_unlock(&c->tnc_mutex);
+       return err;
+}
+
+#endif /* CONFIG_UBIFS_FS_DEBUG */
index fde8d12..53288e5 100644 (file)
@@ -245,7 +245,7 @@ static int layout_leb_in_gaps(struct ubifs_info *c, int *p)
         * it is more comprehensive and less efficient than is needed for this
         * purpose.
         */
-       sleb = ubifs_scan(c, lnum, 0, c->ileb_buf);
+       sleb = ubifs_scan(c, lnum, 0, c->ileb_buf, 0);
        c->ileb_len = 0;
        if (IS_ERR(sleb))
                return PTR_ERR(sleb);
index 3eee07e..191ca78 100644 (file)
 /* The key is always at the same position in all keyed nodes */
 #define UBIFS_KEY_OFFSET offsetof(struct ubifs_ino_node, key)
 
+/* Garbage collector journal head number */
+#define UBIFS_GC_HEAD   0
+/* Base journal head number */
+#define UBIFS_BASE_HEAD 1
+/* Data journal head number */
+#define UBIFS_DATA_HEAD 2
+
 /*
  * LEB Properties Tree node types.
  *
index a293490..b2d9763 100644 (file)
 /* Number of non-data journal heads */
 #define NONDATA_JHEADS_CNT 2
 
-/* Garbage collector head */
-#define GCHD   0
-/* Base journal head number */
-#define BASEHD 1
-/* First "general purpose" journal head */
-#define DATAHD 2
+/* Shorter names for journal head numbers for internal usage */
+#define GCHD   UBIFS_GC_HEAD
+#define BASEHD UBIFS_BASE_HEAD
+#define DATAHD UBIFS_DATA_HEAD
 
 /* 'No change' value for 'ubifs_change_lp()' */
 #define LPROPS_NC 0x80000001
@@ -1451,7 +1449,7 @@ int ubifs_sync_wbufs_by_inode(struct ubifs_info *c, struct inode *inode);
 
 /* scan.c */
 struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
-                                 int offs, void *sbuf);
+                                 int offs, void *sbuf, int quiet);
 void ubifs_scan_destroy(struct ubifs_scan_leb *sleb);
 int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
                      int offs, int quiet);
@@ -1676,6 +1674,7 @@ const struct ubifs_lprops *ubifs_fast_find_free(struct ubifs_info *c);
 const struct ubifs_lprops *ubifs_fast_find_empty(struct ubifs_info *c);
 const struct ubifs_lprops *ubifs_fast_find_freeable(struct ubifs_info *c);
 const struct ubifs_lprops *ubifs_fast_find_frdi_idx(struct ubifs_info *c);
+int ubifs_calc_dark(const struct ubifs_info *c, int spc);
 
 /* file.c */
 int ubifs_fsync(struct file *file, struct dentry *dentry, int datasync);
index adafcf5..195830f 100644 (file)
@@ -78,9 +78,9 @@ enum {
        SECURITY_XATTR,
 };
 
-static struct inode_operations none_inode_operations;
-static struct address_space_operations none_address_operations;
-static struct file_operations none_file_operations;
+static const struct inode_operations none_inode_operations;
+static const struct address_space_operations none_address_operations;
+static const struct file_operations none_file_operations;
 
 /**
  * create_xattr - create an extended attribute.
index cb6e2cc..9e41f91 100644 (file)
@@ -150,7 +150,7 @@ xfs_fs_set_xquota(
        return -xfs_qm_scall_setqlim(mp, id, xfs_quota_type(type), fdq);
 }
 
-struct quotactl_ops xfs_quotactl_operations = {
+const struct quotactl_ops xfs_quotactl_operations = {
        .quota_sync             = xfs_fs_quota_sync,
        .get_xstate             = xfs_fs_get_xstate,
        .set_xstate             = xfs_fs_set_xstate,
index 5d7c60a..bdd41c8 100644 (file)
@@ -67,7 +67,7 @@
 #include <linux/freezer.h>
 #include <linux/parser.h>
 
-static struct super_operations xfs_super_operations;
+static const struct super_operations xfs_super_operations;
 static kmem_zone_t *xfs_ioend_zone;
 mempool_t *xfs_ioend_pool;
 
@@ -1536,7 +1536,7 @@ xfs_fs_get_sb(
                           mnt);
 }
 
-static struct super_operations xfs_super_operations = {
+static const struct super_operations xfs_super_operations = {
        .alloc_inode            = xfs_fs_alloc_inode,
        .destroy_inode          = xfs_fs_destroy_inode,
        .write_inode            = xfs_fs_write_inode,
index 5a2ea3a..18175eb 100644 (file)
@@ -93,7 +93,7 @@ extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
 
 extern const struct export_operations xfs_export_operations;
 extern struct xattr_handler *xfs_xattr_handlers[];
-extern struct quotactl_ops xfs_quotactl_operations;
+extern const struct quotactl_ops xfs_quotactl_operations;
 
 #define XFS_M(sb)              ((struct xfs_mount *)((sb)->s_fs_info))
 
index c4ea51b..f52ac27 100644 (file)
@@ -117,7 +117,7 @@ struct getbmapx {
 #define BMV_IF_VALID   \
        (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC|BMV_IF_DELALLOC)
 
-/*     bmv_oflags values - returned for for each non-header segment */
+/*     bmv_oflags values - returned for each non-header segment */
 #define BMV_OF_PREALLOC                0x1     /* segment = unwritten pre-allocation */
 #define BMV_OF_DELALLOC                0x2     /* segment = delayed allocation */
 #define BMV_OF_LAST            0x4     /* segment is the last in the file */
index ca59ee9..1cef139 100644 (file)
@@ -87,7 +87,6 @@ struct acpi_device;
 typedef int (*acpi_op_add) (struct acpi_device * device);
 typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
 typedef int (*acpi_op_start) (struct acpi_device * device);
-typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
 typedef int (*acpi_op_suspend) (struct acpi_device * device,
                                pm_message_t state);
 typedef int (*acpi_op_resume) (struct acpi_device * device);
@@ -104,7 +103,6 @@ struct acpi_device_ops {
        acpi_op_add add;
        acpi_op_remove remove;
        acpi_op_start start;
-       acpi_op_stop stop;
        acpi_op_suspend suspend;
        acpi_op_resume resume;
        acpi_op_bind bind;
@@ -171,17 +169,15 @@ struct acpi_device_dir {
 
 typedef char acpi_bus_id[8];
 typedef unsigned long acpi_bus_address;
-typedef char acpi_hardware_id[15];
-typedef char acpi_unique_id[9];
 typedef char acpi_device_name[40];
 typedef char acpi_device_class[20];
 
 struct acpi_device_pnp {
        acpi_bus_id bus_id;     /* Object name */
        acpi_bus_address bus_address;   /* _ADR */
-       acpi_hardware_id hardware_id;   /* _HID */
-       struct acpi_compatible_id_list *cid_list;       /* _CIDs */
-       acpi_unique_id unique_id;       /* _UID */
+       char *hardware_id;      /* _HID */
+       struct acpica_device_id_list *cid_list; /* _CIDs */
+       char *unique_id;        /* _UID */
        acpi_device_name device_name;   /* Driver-determined */
        acpi_device_class device_class; /*        "          */
 };
@@ -312,7 +308,7 @@ struct acpi_bus_event {
 
 extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
-void acpi_bus_private_data_handler(acpi_handle, u32, void *);
+void acpi_bus_private_data_handler(acpi_handle, void *);
 int acpi_bus_get_private_data(acpi_handle, void **);
 extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);
 extern int register_acpi_notifier(struct notifier_block *);
@@ -325,7 +321,7 @@ extern void unregister_acpi_bus_notifier(struct notifier_block *nb);
  */
 
 int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device);
-void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context);
+void acpi_bus_data_handler(acpi_handle handle, void *context);
 int acpi_bus_get_status(struct acpi_device *device);
 int acpi_bus_get_power(acpi_handle handle, int *state);
 int acpi_bus_set_power(acpi_handle handle, int state);
@@ -354,7 +350,6 @@ void acpi_remove_dir(struct acpi_device *);
 /*
  * Bind physical devices with ACPI devices
  */
-#include <linux/device.h>
 struct acpi_bus_type {
        struct list_head list;
        struct bus_type *bus;
index ab0b85c..eb0e718 100644 (file)
@@ -245,6 +245,9 @@ acpi_status acpi_osi_invalidate(char* interface);
 acpi_status
 acpi_os_validate_address(u8 space_id, acpi_physical_address address,
                         acpi_size length, char *name);
+acpi_status
+acpi_os_invalidate_address(u8 space_id, acpi_physical_address address,
+                        acpi_size length);
 
 u64 acpi_os_get_timer(void);
 
index 82ec6a3..e723b0f 100644 (file)
@@ -47,7 +47,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20090521
+#define ACPI_CA_VERSION                 0x20090903
 
 #include "actypes.h"
 #include "actbl.h"
@@ -64,6 +64,7 @@ extern u8 acpi_gbl_enable_interpreter_slack;
 extern u8 acpi_gbl_all_methods_serialized;
 extern u8 acpi_gbl_create_osi_method;
 extern u8 acpi_gbl_leave_wake_gpes_disabled;
+extern u8 acpi_gbl_use_default_register_widths;
 extern acpi_name acpi_gbl_trace_method_name;
 extern u32 acpi_gbl_trace_flags;
 
@@ -199,7 +200,8 @@ acpi_evaluate_object_typed(acpi_handle object,
                           acpi_object_type return_type);
 
 acpi_status
-acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
+acpi_get_object_info(acpi_handle handle,
+                    struct acpi_device_info **return_buffer);
 
 acpi_status acpi_install_method(u8 *buffer);
 
@@ -359,9 +361,9 @@ acpi_status acpi_set_firmware_waking_vector(u32 physical_address);
 acpi_status acpi_set_firmware_waking_vector64(u64 physical_address);
 #endif
 
-acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg);
+acpi_status acpi_read(u64 *value, struct acpi_generic_address *reg);
 
-acpi_status acpi_write(u32 value, struct acpi_generic_address *reg);
+acpi_status acpi_write(u64 value, struct acpi_generic_address *reg);
 
 acpi_status
 acpi_get_sleep_type_data(u8 sleep_state, u8 * slp_typ_a, u8 * slp_typ_b);
index 222733d..1b65879 100644 (file)
 #ifndef __ACTBL_H__
 #define __ACTBL_H__
 
+/*******************************************************************************
+ *
+ * Fundamental ACPI tables
+ *
+ * This file contains definitions for the ACPI tables that are directly consumed
+ * by ACPICA. All other tables are consumed by the OS-dependent ACPI-related
+ * device drivers and other OS support code.
+ *
+ * The RSDP and FACS do not use the common ACPI table header. All other ACPI
+ * tables use the header.
+ *
+ ******************************************************************************/
+
 /*
- * Values for description table header signatures. Useful because they make
- * it more difficult to inadvertently type in the wrong signature.
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
  */
 #define ACPI_SIG_DSDT           "DSDT" /* Differentiated System Description Table */
 #define ACPI_SIG_FADT           "FACP" /* Fixed ACPI Description Table */
 #pragma pack(1)
 
 /*
- * These are the ACPI tables that are directly consumed by the subsystem.
- *
- * The RSDP and FACS do not use the common ACPI table header. All other ACPI
- * tables use the header.
- *
  * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
  * This is the only type that is even remotely portable. Anything else is not
  * portable, so do not use any other bitfield types.
@@ -77,9 +86,8 @@
 
 /*******************************************************************************
  *
- * ACPI Table Header. This common header is used by all tables except the
- * RSDP and FACS. The define is used for direct inclusion of header into
- * other ACPI tables
+ * Master ACPI Table Header. This common header is used by all ACPI tables
+ * except the RSDP and FACS.
  *
  ******************************************************************************/
 
@@ -95,13 +103,16 @@ struct acpi_table_header {
        u32 asl_compiler_revision;      /* ASL compiler version */
 };
 
-/*
+/*******************************************************************************
+ *
  * GAS - Generic Address Structure (ACPI 2.0+)
  *
  * Note: Since this structure is used in the ACPI tables, it is byte aligned.
- * If misalignment is not supported, access to the Address field must be
- * performed with care.
- */
+ * If misaliged access is not supported by the hardware, accesses to the
+ * 64-bit Address field must be performed with care.
+ *
+ ******************************************************************************/
+
 struct acpi_generic_address {
        u8 space_id;            /* Address space where struct or register exists */
        u8 bit_width;           /* Size in bits of given register */
@@ -113,6 +124,7 @@ struct acpi_generic_address {
 /*******************************************************************************
  *
  * RSDP - Root System Description Pointer (Signature is "RSD PTR ")
+ *        Version 2
  *
  ******************************************************************************/
 
@@ -133,6 +145,7 @@ struct acpi_table_rsdp {
 /*******************************************************************************
  *
  * RSDT/XSDT - Root System Description Tables
+ *             Version 1 (both)
  *
  ******************************************************************************/
 
@@ -161,21 +174,29 @@ struct acpi_table_facs {
        u32 flags;
        u64 xfirmware_waking_vector;    /* 64-bit version of the Firmware Waking Vector (ACPI 2.0+) */
        u8 version;             /* Version of this table (ACPI 2.0+) */
-       u8 reserved[31];        /* Reserved, must be zero */
+       u8 reserved[3];         /* Reserved, must be zero */
+       u32 ospm_flags;         /* Flags to be set by OSPM (ACPI 4.0) */
+       u8 reserved1[24];       /* Reserved, must be zero */
 };
 
-/* Flag macros */
+/* Masks for global_lock flag field above */
 
-#define ACPI_FACS_S4_BIOS_PRESENT (1)  /* 00: S4BIOS support is present */
+#define ACPI_GLOCK_PENDING          (1)        /* 00: Pending global lock ownership */
+#define ACPI_GLOCK_OWNED            (1<<1)     /* 01: Global lock is owned */
 
-/* Global lock flags */
+/* Masks for Flags field above  */
 
-#define ACPI_GLOCK_PENDING      0x01   /* 00: Pending global lock ownership */
-#define ACPI_GLOCK_OWNED        0x02   /* 01: Global lock is owned */
+#define ACPI_FACS_S4_BIOS_PRESENT   (1)        /* 00: S4BIOS support is present */
+#define ACPI_FACS_64BIT_WAKE        (1<<1)     /* 01: 64-bit wake vector supported (ACPI 4.0) */
+
+/* Masks for ospm_flags field above */
+
+#define ACPI_FACS_64BIT_ENVIRONMENT (1)        /* 00: 64-bit wake environment is required (ACPI 4.0) */
 
 /*******************************************************************************
  *
  * FADT - Fixed ACPI Description Table (Signature "FACP")
+ *        Version 4
  *
  ******************************************************************************/
 
@@ -236,7 +257,7 @@ struct acpi_table_fadt {
        struct acpi_generic_address xgpe1_block;        /* 64-bit Extended General Purpose Event 1 Reg Blk address */
 };
 
-/* FADT Boot Architecture Flags (boot_flags) */
+/* Masks for FADT Boot Architecture Flags (boot_flags) */
 
 #define ACPI_FADT_LEGACY_DEVICES    (1)        /* 00: [V2] System has LPC or ISA bus devices */
 #define ACPI_FADT_8042              (1<<1)     /* 01: [V3] System has an 8042 controller on port 60/64 */
@@ -246,7 +267,7 @@ struct acpi_table_fadt {
 
 #define FADT2_REVISION_ID               3
 
-/* FADT flags */
+/* Masks for FADT flags */
 
 #define ACPI_FADT_WBINVD            (1)        /* 00: [V1] The wbinvd instruction works properly */
 #define ACPI_FADT_WBINVD_FLUSH      (1<<1)     /* 01: [V1] wbinvd flushes but does not invalidate caches */
@@ -269,7 +290,7 @@ struct acpi_table_fadt {
 #define ACPI_FADT_APIC_CLUSTER      (1<<18)    /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */
 #define ACPI_FADT_APIC_PHYSICAL     (1<<19)    /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */
 
-/* FADT Prefered Power Management Profiles */
+/* Values for preferred_profile (Prefered Power Management Profiles) */
 
 enum acpi_prefered_pm_profiles {
        PM_UNSPECIFIED = 0,
@@ -287,14 +308,16 @@ enum acpi_prefered_pm_profiles {
 
 #define ACPI_FADT_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_fadt, f)
 
+/*
+ * Internal table-related structures
+ */
 union acpi_name_union {
        u32 integer;
        char ascii[4];
 };
 
-/*
- * Internal ACPI Table Descriptor. One per ACPI table
- */
+/* Internal ACPI Table Descriptor. One per ACPI table. */
+
 struct acpi_table_desc {
        acpi_physical_address address;
        struct acpi_table_header *pointer;
@@ -304,7 +327,7 @@ struct acpi_table_desc {
        u8 flags;
 };
 
-/* Flags for above */
+/* Masks for Flags field above */
 
 #define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
 #define ACPI_TABLE_ORIGIN_MAPPED        (1)
@@ -318,5 +341,6 @@ struct acpi_table_desc {
  */
 
 #include <acpi/actbl1.h>
+#include <acpi/actbl2.h>
 
 #endif                         /* __ACTBL_H__ */
index 59ade07..0b9b430 100644 (file)
 
 /*******************************************************************************
  *
- * Additional ACPI Tables
+ * Additional ACPI Tables (1)
  *
  * These tables are not consumed directly by the ACPICA subsystem, but are
  * included here to support device drivers and the AML disassembler.
  *
+ * The tables in this file are fully defined within the ACPI specification.
+ *
  ******************************************************************************/
 
 /*
- * Values for description table header signatures. Useful because they make
- * it more difficult to inadvertently type in the wrong signature.
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
  */
-#define ACPI_SIG_ASF            "ASF!" /* Alert Standard Format table */
 #define ACPI_SIG_BERT           "BERT" /* Boot Error Record Table */
-#define ACPI_SIG_BOOT           "BOOT" /* Simple Boot Flag Table */
 #define ACPI_SIG_CPEP           "CPEP" /* Corrected Platform Error Polling table */
-#define ACPI_SIG_DBGP           "DBGP" /* Debug Port table */
-#define ACPI_SIG_DMAR           "DMAR" /* DMA Remapping table */
 #define ACPI_SIG_ECDT           "ECDT" /* Embedded Controller Boot Resources Table */
 #define ACPI_SIG_EINJ           "EINJ" /* Error Injection table */
 #define ACPI_SIG_ERST           "ERST" /* Error Record Serialization Table */
 #define ACPI_SIG_HEST           "HEST" /* Hardware Error Source Table */
-#define ACPI_SIG_HPET           "HPET" /* High Precision Event Timer table */
-#define ACPI_SIG_IBFT           "IBFT" /* i_sCSI Boot Firmware Table */
 #define ACPI_SIG_MADT           "APIC" /* Multiple APIC Description Table */
-#define ACPI_SIG_MCFG           "MCFG" /* PCI Memory Mapped Configuration table */
+#define ACPI_SIG_MSCT           "MSCT" /* Maximum System Characteristics Table */
 #define ACPI_SIG_SBST           "SBST" /* Smart Battery Specification Table */
-#define ACPI_SIG_SLIC           "SLIC" /* Software Licensing Description Table */
 #define ACPI_SIG_SLIT           "SLIT" /* System Locality Distance Information Table */
-#define ACPI_SIG_SPCR           "SPCR" /* Serial Port Console Redirection table */
-#define ACPI_SIG_SPMI           "SPMI" /* Server Platform Management Interface table */
 #define ACPI_SIG_SRAT           "SRAT" /* System Resource Affinity Table */
-#define ACPI_SIG_TCPA           "TCPA" /* Trusted Computing Platform Alliance table */
-#define ACPI_SIG_UEFI           "UEFI" /* Uefi Boot Optimization Table */
-#define ACPI_SIG_WDAT           "WDAT" /* Watchdog Action Table */
-#define ACPI_SIG_WDRT           "WDRT" /* Watchdog Resource Table */
 
 /*
  * All tables must be byte-packed to match the ACPI specification, since
  * portable, so do not use any other bitfield types.
  */
 
-/* Common Subtable header (used in MADT, SRAT, etc.) */
+/*******************************************************************************
+ *
+ * Common subtable headers
+ *
+ ******************************************************************************/
+
+/* Generic subtable header (used in MADT, SRAT, etc.) */
 
 struct acpi_subtable_header {
        u8 type;
        u8 length;
 };
 
-/* Common Subtable header for WHEA tables (EINJ, ERST, WDAT) */
+/* Subtable header for WHEA tables (EINJ, ERST, WDAT) */
 
 struct acpi_whea_header {
        u8 action;
@@ -115,116 +111,8 @@ struct acpi_whea_header {
 
 /*******************************************************************************
  *
- * ASF - Alert Standard Format table (Signature "ASF!")
- *
- * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
- *
- ******************************************************************************/
-
-struct acpi_table_asf {
-       struct acpi_table_header header;        /* Common ACPI table header */
-};
-
-/* ASF subtable header */
-
-struct acpi_asf_header {
-       u8 type;
-       u8 reserved;
-       u16 length;
-};
-
-/* Values for Type field above */
-
-enum acpi_asf_type {
-       ACPI_ASF_TYPE_INFO = 0,
-       ACPI_ASF_TYPE_ALERT = 1,
-       ACPI_ASF_TYPE_CONTROL = 2,
-       ACPI_ASF_TYPE_BOOT = 3,
-       ACPI_ASF_TYPE_ADDRESS = 4,
-       ACPI_ASF_TYPE_RESERVED = 5
-};
-
-/*
- * ASF subtables
- */
-
-/* 0: ASF Information */
-
-struct acpi_asf_info {
-       struct acpi_asf_header header;
-       u8 min_reset_value;
-       u8 min_poll_interval;
-       u16 system_id;
-       u32 mfg_id;
-       u8 flags;
-       u8 reserved2[3];
-};
-
-/* 1: ASF Alerts */
-
-struct acpi_asf_alert {
-       struct acpi_asf_header header;
-       u8 assert_mask;
-       u8 deassert_mask;
-       u8 alerts;
-       u8 data_length;
-};
-
-struct acpi_asf_alert_data {
-       u8 address;
-       u8 command;
-       u8 mask;
-       u8 value;
-       u8 sensor_type;
-       u8 type;
-       u8 offset;
-       u8 source_type;
-       u8 severity;
-       u8 sensor_number;
-       u8 entity;
-       u8 instance;
-};
-
-/* 2: ASF Remote Control */
-
-struct acpi_asf_remote {
-       struct acpi_asf_header header;
-       u8 controls;
-       u8 data_length;
-       u16 reserved2;
-};
-
-struct acpi_asf_control_data {
-       u8 function;
-       u8 address;
-       u8 command;
-       u8 value;
-};
-
-/* 3: ASF RMCP Boot Options */
-
-struct acpi_asf_rmcp {
-       struct acpi_asf_header header;
-       u8 capabilities[7];
-       u8 completion_code;
-       u32 enterprise_id;
-       u8 command;
-       u16 parameter;
-       u16 boot_options;
-       u16 oem_parameters;
-};
-
-/* 4: ASF Address */
-
-struct acpi_asf_address {
-       struct acpi_asf_header header;
-       u8 eprom_address;
-       u8 devices;
-};
-
-/*******************************************************************************
- *
- * BERT - Boot Error Record Table
+ * BERT - Boot Error Record Table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -234,38 +122,43 @@ struct acpi_table_bert {
        u64 address;            /* Physical addresss of the error region */
 };
 
-/* Boot Error Region */
+/* Boot Error Region (not a subtable, pointed to by Address field above) */
 
 struct acpi_bert_region {
-       u32 block_status;
-       u32 raw_data_offset;
-       u32 raw_data_length;
-       u32 data_length;
-       u32 error_severity;
+       u32 block_status;       /* Type of error information */
+       u32 raw_data_offset;    /* Offset to raw error data */
+       u32 raw_data_length;    /* Length of raw error data */
+       u32 data_length;        /* Length of generic error data */
+       u32 error_severity;     /* Severity code */
 };
 
-/* block_status Flags */
+/* Values for block_status flags above */
 
 #define ACPI_BERT_UNCORRECTABLE             (1)
-#define ACPI_BERT_CORRECTABLE               (2)
-#define ACPI_BERT_MULTIPLE_UNCORRECTABLE    (4)
-#define ACPI_BERT_MULTIPLE_CORRECTABLE      (8)
+#define ACPI_BERT_CORRECTABLE               (1<<1)
+#define ACPI_BERT_MULTIPLE_UNCORRECTABLE    (1<<2)
+#define ACPI_BERT_MULTIPLE_CORRECTABLE      (1<<3)
+#define ACPI_BERT_ERROR_ENTRY_COUNT         (0xFF<<4)  /* 8 bits, error count */
 
-/*******************************************************************************
- *
- * BOOT - Simple Boot Flag Table
- *
- ******************************************************************************/
+/* Values for error_severity above */
 
-struct acpi_table_boot {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 cmos_index;          /* Index in CMOS RAM for the boot register */
-       u8 reserved[3];
+enum acpi_bert_error_severity {
+       ACPI_BERT_ERROR_CORRECTABLE = 0,
+       ACPI_BERT_ERROR_FATAL = 1,
+       ACPI_BERT_ERROR_CORRECTED = 2,
+       ACPI_BERT_ERROR_NONE = 3,
+       ACPI_BERT_ERROR_RESERVED = 4    /* 4 and greater are reserved */
 };
 
+/*
+ * Note: The generic error data that follows the error_severity field above
+ * uses the struct acpi_hest_generic_data defined under the HEST table below
+ */
+
 /*******************************************************************************
  *
- * CPEP - Corrected Platform Error Polling table
+ * CPEP - Corrected Platform Error Polling table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -277,133 +170,16 @@ struct acpi_table_cpep {
 /* Subtable */
 
 struct acpi_cpep_polling {
-       u8 type;
-       u8 length;
+       struct acpi_subtable_header header;
        u8 id;                  /* Processor ID */
        u8 eid;                 /* Processor EID */
        u32 interval;           /* Polling interval (msec) */
 };
 
-/*******************************************************************************
- *
- * DBGP - Debug Port table
- *
- ******************************************************************************/
-
-struct acpi_table_dbgp {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 type;                /* 0=full 16550, 1=subset of 16550 */
-       u8 reserved[3];
-       struct acpi_generic_address debug_port;
-};
-
-/*******************************************************************************
- *
- * DMAR - DMA Remapping table
- *       From "Intel Virtualization Technology for Directed I/O", Sept. 2007
- *
- ******************************************************************************/
-
-struct acpi_table_dmar {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 width;               /* Host Address Width */
-       u8 flags;
-       u8 reserved[10];
-};
-
-/* Flags */
-
-#define ACPI_DMAR_INTR_REMAP       (1)
-
-/* DMAR subtable header */
-
-struct acpi_dmar_header {
-       u16 type;
-       u16 length;
-};
-
-/* Values for subtable type in struct acpi_dmar_header */
-
-enum acpi_dmar_type {
-       ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
-       ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
-       ACPI_DMAR_TYPE_ATSR = 2,
-       ACPI_DMAR_TYPE_RESERVED = 3     /* 3 and greater are reserved */
-};
-
-struct acpi_dmar_device_scope {
-       u8 entry_type;
-       u8 length;
-       u16 reserved;
-       u8 enumeration_id;
-       u8 bus;
-};
-
-/* Values for entry_type in struct acpi_dmar_device_scope */
-
-enum acpi_dmar_scope_type {
-       ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
-       ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
-       ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
-       ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
-       ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-       ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
-};
-
-struct acpi_dmar_pci_path {
-       u8 dev;
-       u8 fn;
-};
-
-/*
- * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
- */
-
-/* 0: Hardware Unit Definition */
-
-struct acpi_dmar_hardware_unit {
-       struct acpi_dmar_header header;
-       u8 flags;
-       u8 reserved;
-       u16 segment;
-       u64 address;            /* Register Base Address */
-};
-
-/* Flags */
-
-#define ACPI_DMAR_INCLUDE_ALL       (1)
-
-/* 1: Reserved Memory Defininition */
-
-struct acpi_dmar_reserved_memory {
-       struct acpi_dmar_header header;
-       u16 reserved;
-       u16 segment;
-       u64 base_address;               /* 4_k aligned base address */
-       u64 end_address;        /* 4_k aligned limit address */
-};
-
-/* Flags */
-
-#define ACPI_DMAR_ALLOW_ALL         (1)
-
-
-/* 2: Root Port ATS Capability Reporting Structure */
-
-struct acpi_dmar_atsr {
-       struct acpi_dmar_header header;
-       u8 flags;
-       u8 reserved;
-       u16 segment;
-};
-
-/* Flags */
-
-#define ACPI_DMAR_ALL_PORTS        (1)
-
 /*******************************************************************************
  *
  * ECDT - Embedded Controller Boot Resources Table
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -418,14 +194,16 @@ struct acpi_table_ecdt {
 
 /*******************************************************************************
  *
- * EINJ - Error Injection Table
+ * EINJ - Error Injection Table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
 struct acpi_table_einj {
        struct acpi_table_header header;        /* Common ACPI table header */
        u32 header_length;
-       u32 reserved;
+       u8 flags;
+       u8 reserved[3];
        u32 entries;
 };
 
@@ -435,6 +213,10 @@ struct acpi_einj_entry {
        struct acpi_whea_header whea_header;    /* Common header for WHEA tables */
 };
 
+/* Masks for Flags field above */
+
+#define ACPI_EINJ_PRESERVE          (1)
+
 /* Values for Action field above */
 
 enum acpi_einj_actions {
@@ -470,9 +252,34 @@ struct acpi_einj_trigger {
        u32 entry_count;
 };
 
+/* Command status return values */
+
+enum acpi_einj_command_status {
+       ACPI_EINJ_SUCCESS = 0,
+       ACPI_EINJ_FAILURE = 1,
+       ACPI_EINJ_INVALID_ACCESS = 2,
+       ACPI_EINJ_STATUS_RESERVED = 3   /* 3 and greater are reserved */
+};
+
+/* Error types returned from ACPI_EINJ_GET_ERROR_TYPE (bitfield) */
+
+#define ACPI_EINJ_PROCESSOR_CORRECTABLE     (1)
+#define ACPI_EINJ_PROCESSOR_UNCORRECTABLE   (1<<1)
+#define ACPI_EINJ_PROCESSOR_FATAL           (1<<2)
+#define ACPI_EINJ_MEMORY_CORRECTABLE        (1<<3)
+#define ACPI_EINJ_MEMORY_UNCORRECTABLE      (1<<4)
+#define ACPI_EINJ_MEMORY_FATAL              (1<<5)
+#define ACPI_EINJ_PCIX_CORRECTABLE          (1<<6)
+#define ACPI_EINJ_PCIX_UNCORRECTABLE        (1<<7)
+#define ACPI_EINJ_PCIX_FATAL                (1<<8)
+#define ACPI_EINJ_PLATFORM_CORRECTABLE      (1<<9)
+#define ACPI_EINJ_PLATFORM_UNCORRECTABLE    (1<<10)
+#define ACPI_EINJ_PLATFORM_FATAL            (1<<11)
+
 /*******************************************************************************
  *
- * ERST - Error Record Serialization Table
+ * ERST - Error Record Serialization Table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -489,19 +296,23 @@ struct acpi_erst_entry {
        struct acpi_whea_header whea_header;    /* Common header for WHEA tables */
 };
 
+/* Masks for Flags field above */
+
+#define ACPI_ERST_PRESERVE          (1)
+
 /* Values for Action field above */
 
 enum acpi_erst_actions {
-       ACPI_ERST_BEGIN_WRITE_OPERATION = 0,
-       ACPI_ERST_BEGIN_READ_OPERATION = 1,
-       ACPI_ERST_BETGIN_CLEAR_OPERATION = 2,
-       ACPI_ERST_END_OPERATION = 3,
+       ACPI_ERST_BEGIN_WRITE = 0,
+       ACPI_ERST_BEGIN_READ = 1,
+       ACPI_ERST_BEGIN_CLEAR = 2,
+       ACPI_ERST_END = 3,
        ACPI_ERST_SET_RECORD_OFFSET = 4,
        ACPI_ERST_EXECUTE_OPERATION = 5,
        ACPI_ERST_CHECK_BUSY_STATUS = 6,
        ACPI_ERST_GET_COMMAND_STATUS = 7,
-       ACPI_ERST_GET_RECORD_IDENTIFIER = 8,
-       ACPI_ERST_SET_RECORD_IDENTIFIER = 9,
+       ACPI_ERST_GET_RECORD_ID = 8,
+       ACPI_ERST_SET_RECORD_ID = 9,
        ACPI_ERST_GET_RECORD_COUNT = 10,
        ACPI_ERST_BEGIN_DUMMY_WRIITE = 11,
        ACPI_ERST_NOT_USED = 12,
@@ -536,9 +347,29 @@ enum acpi_erst_instructions {
        ACPI_ERST_INSTRUCTION_RESERVED = 19     /* 19 and greater are reserved */
 };
 
+/* Command status return values */
+
+enum acpi_erst_command_status {
+       ACPI_ERST_SUCESS = 0,
+       ACPI_ERST_NO_SPACE = 1,
+       ACPI_ERST_NOT_AVAILABLE = 2,
+       ACPI_ERST_FAILURE = 3,
+       ACPI_ERST_RECORD_EMPTY = 4,
+       ACPI_ERST_NOT_FOUND = 5,
+       ACPI_ERST_STATUS_RESERVED = 6   /* 6 and greater are reserved */
+};
+
+/* Error Record Serialization Information */
+
+struct acpi_erst_info {
+       u16 signature;          /* Should be "ER" */
+       u8 data[48];
+};
+
 /*******************************************************************************
  *
- * HEST - Hardware Error Source Table
+ * HEST - Hardware Error Source Table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -551,85 +382,69 @@ struct acpi_table_hest {
 
 struct acpi_hest_header {
        u16 type;
+       u16 source_id;
 };
 
 /* Values for Type field above for subtables */
 
 enum acpi_hest_types {
-       ACPI_HEST_TYPE_XPF_MACHINE_CHECK = 0,
-       ACPI_HEST_TYPE_XPF_CORRECTED_MACHINE_CHECK = 1,
-       ACPI_HEST_TYPE_XPF_UNUSED = 2,
-       ACPI_HEST_TYPE_XPF_NON_MASKABLE_INTERRUPT = 3,
-       ACPI_HEST_TYPE_IPF_CORRECTED_MACHINE_CHECK = 4,
-       ACPI_HEST_TYPE_IPF_CORRECTED_PLATFORM_ERROR = 5,
+       ACPI_HEST_TYPE_IA32_CHECK = 0,
+       ACPI_HEST_TYPE_IA32_CORRECTED_CHECK = 1,
+       ACPI_HEST_TYPE_IA32_NMI = 2,
+       ACPI_HEST_TYPE_NOT_USED3 = 3,
+       ACPI_HEST_TYPE_NOT_USED4 = 4,
+       ACPI_HEST_TYPE_NOT_USED5 = 5,
        ACPI_HEST_TYPE_AER_ROOT_PORT = 6,
        ACPI_HEST_TYPE_AER_ENDPOINT = 7,
        ACPI_HEST_TYPE_AER_BRIDGE = 8,
-       ACPI_HEST_TYPE_GENERIC_HARDWARE_ERROR_SOURCE = 9,
+       ACPI_HEST_TYPE_GENERIC_ERROR = 9,
        ACPI_HEST_TYPE_RESERVED = 10    /* 10 and greater are reserved */
 };
 
 /*
- * HEST Sub-subtables
+ * HEST substructures contained in subtables
  */
 
-/* XPF Machine Check Error Bank */
-
-struct acpi_hest_xpf_error_bank {
+/*
+ * IA32 Error Bank(s) - Follows the struct acpi_hest_ia_machine_check and
+ * struct acpi_hest_ia_corrected structures.
+ */
+struct acpi_hest_ia_error_bank {
        u8 bank_number;
        u8 clear_status_on_init;
        u8 status_format;
-       u8 config_write_enable;
+       u8 reserved;
        u32 control_register;
-       u64 control_init_data;
+       u64 control_data;
        u32 status_register;
        u32 address_register;
        u32 misc_register;
 };
 
-/* Generic Error Status */
-
-struct acpi_hest_generic_status {
-       u32 block_status;
-       u32 raw_data_offset;
-       u32 raw_data_length;
-       u32 data_length;
-       u32 error_severity;
-};
-
-/* Generic Error Data */
-
-struct acpi_hest_generic_data {
-       u8 section_type[16];
-       u32 error_severity;
-       u16 revision;
-       u8 validation_bits;
-       u8 flags;
-       u32 error_data_length;
-       u8 fru_id[16];
-       u8 fru_text[20];
-};
-
-/* Common HEST structure for PCI/AER types below (6,7,8) */
+/* Common HEST sub-structure for PCI/AER structures below (6,7,8) */
 
 struct acpi_hest_aer_common {
-       u16 source_id;
-       u16 config_write_enable;
+       u16 reserved1;
        u8 flags;
        u8 enabled;
-       u32 records_to_pre_allocate;
+       u32 records_to_preallocate;
        u32 max_sections_per_record;
        u32 bus;
        u16 device;
        u16 function;
        u16 device_control;
-       u16 reserved;
-       u32 uncorrectable_error_mask;
-       u32 uncorrectable_error_severity;
-       u32 correctable_error_mask;
-       u32 advanced_error_capabilities;
+       u16 reserved2;
+       u32 uncorrectable_mask;
+       u32 uncorrectable_severity;
+       u32 correctable_mask;
+       u32 advanced_capabilities;
 };
 
+/* Masks for HEST Flags fields */
+
+#define ACPI_HEST_FIRMWARE_FIRST        (1)
+#define ACPI_HEST_GLOBAL                (1<<1)
+
 /* Hardware Error Notification */
 
 struct acpi_hest_notify {
@@ -655,71 +470,59 @@ enum acpi_hest_notify_types {
        ACPI_HEST_NOTIFY_RESERVED = 5   /* 5 and greater are reserved */
 };
 
+/* Values for config_write_enable bitfield above */
+
+#define ACPI_HEST_TYPE                  (1)
+#define ACPI_HEST_POLL_INTERVAL         (1<<1)
+#define ACPI_HEST_POLL_THRESHOLD_VALUE  (1<<2)
+#define ACPI_HEST_POLL_THRESHOLD_WINDOW (1<<3)
+#define ACPI_HEST_ERR_THRESHOLD_VALUE   (1<<4)
+#define ACPI_HEST_ERR_THRESHOLD_WINDOW  (1<<5)
+
 /*
  * HEST subtables
- *
- * From WHEA Design Document, 16 May 2007.
- * Note: There is no subtable type 2 in this version of the document,
- * and there are two different subtable type 3s.
  */
 
- /* 0: XPF Machine Check Exception */
+/* 0: IA32 Machine Check Exception */
 
-struct acpi_hest_xpf_machine_check {
+struct acpi_hest_ia_machine_check {
        struct acpi_hest_header header;
-       u16 source_id;
-       u16 config_write_enable;
+       u16 reserved1;
        u8 flags;
-       u8 reserved1;
-       u32 records_to_pre_allocate;
+       u8 enabled;
+       u32 records_to_preallocate;
        u32 max_sections_per_record;
        u64 global_capability_data;
        u64 global_control_data;
        u8 num_hardware_banks;
-       u8 reserved2[7];
+       u8 reserved3[7];
 };
 
-/* 1: XPF Corrected Machine Check */
+/* 1: IA32 Corrected Machine Check */
 
-struct acpi_table_hest_xpf_corrected {
+struct acpi_hest_ia_corrected {
        struct acpi_hest_header header;
-       u16 source_id;
-       u16 config_write_enable;
+       u16 reserved1;
        u8 flags;
        u8 enabled;
-       u32 records_to_pre_allocate;
+       u32 records_to_preallocate;
        u32 max_sections_per_record;
        struct acpi_hest_notify notify;
        u8 num_hardware_banks;
-       u8 reserved[3];
+       u8 reserved2[3];
 };
 
-/* 3: XPF Non-Maskable Interrupt */
+/* 2: IA32 Non-Maskable Interrupt */
 
-struct acpi_hest_xpf_nmi {
+struct acpi_hest_ia_nmi {
        struct acpi_hest_header header;
-       u16 source_id;
        u32 reserved;
-       u32 records_to_pre_allocate;
+       u32 records_to_preallocate;
        u32 max_sections_per_record;
        u32 max_raw_data_length;
 };
 
-/* 4: IPF Corrected Machine Check */
-
-struct acpi_hest_ipf_corrected {
-       struct acpi_hest_header header;
-       u8 enabled;
-       u8 reserved;
-};
-
-/* 5: IPF Corrected Platform Error */
-
-struct acpi_hest_ipf_corrected_platform {
-       struct acpi_hest_header header;
-       u8 enabled;
-       u8 reserved;
-};
+/* 3,4,5: Not used */
 
 /* 6: PCI Express Root Port AER */
 
@@ -741,143 +544,61 @@ struct acpi_hest_aer {
 struct acpi_hest_aer_bridge {
        struct acpi_hest_header header;
        struct acpi_hest_aer_common aer;
-       u32 secondary_uncorrectable_error_mask;
-       u32 secondary_uncorrectable_error_severity;
-       u32 secondary_advanced_capabilities;
+       u32 uncorrectable_mask2;
+       u32 uncorrectable_severity2;
+       u32 advanced_capabilities2;
 };
 
 /* 9: Generic Hardware Error Source */
 
 struct acpi_hest_generic {
        struct acpi_hest_header header;
-       u16 source_id;
        u16 related_source_id;
-       u8 config_write_enable;
+       u8 reserved;
        u8 enabled;
-       u32 records_to_pre_allocate;
+       u32 records_to_preallocate;
        u32 max_sections_per_record;
        u32 max_raw_data_length;
        struct acpi_generic_address error_status_address;
        struct acpi_hest_notify notify;
-       u32 error_status_block_length;
+       u32 error_block_length;
 };
 
-/*******************************************************************************
- *
- * HPET - High Precision Event Timer table
- *
- ******************************************************************************/
+/* Generic Error Status block */
 
-struct acpi_table_hpet {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u32 id;                 /* Hardware ID of event timer block */
-       struct acpi_generic_address address;    /* Address of event timer block */
-       u8 sequence;            /* HPET sequence number */
-       u16 minimum_tick;       /* Main counter min tick, periodic mode */
-       u8 flags;
+struct acpi_hest_generic_status {
+       u32 block_status;
+       u32 raw_data_offset;
+       u32 raw_data_length;
+       u32 data_length;
+       u32 error_severity;
 };
 
-/*! Flags */
+/* Values for block_status flags above */
 
-#define ACPI_HPET_PAGE_PROTECT      (1)        /* 00: No page protection */
-#define ACPI_HPET_PAGE_PROTECT_4    (1<<1)     /* 01: 4KB page protected */
-#define ACPI_HPET_PAGE_PROTECT_64   (1<<2)     /* 02: 64KB page protected */
+#define ACPI_HEST_UNCORRECTABLE             (1)
+#define ACPI_HEST_CORRECTABLE               (1<<1)
+#define ACPI_HEST_MULTIPLE_UNCORRECTABLE    (1<<2)
+#define ACPI_HEST_MULTIPLE_CORRECTABLE      (1<<3)
+#define ACPI_HEST_ERROR_ENTRY_COUNT         (0xFF<<4)  /* 8 bits, error count */
 
-/*! [End] no source code translation !*/
+/* Generic Error Data entry */
 
-/*******************************************************************************
- *
- * IBFT - Boot Firmware Table
- *
- ******************************************************************************/
-
-struct acpi_table_ibft {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 reserved[12];
-};
-
-/* IBFT common subtable header */
-
-struct acpi_ibft_header {
-       u8 type;
-       u8 version;
-       u16 length;
-       u8 index;
+struct acpi_hest_generic_data {
+       u8 section_type[16];
+       u32 error_severity;
+       u16 revision;
+       u8 validation_bits;
        u8 flags;
-};
-
-/* Values for Type field above */
-
-enum acpi_ibft_type {
-       ACPI_IBFT_TYPE_NOT_USED = 0,
-       ACPI_IBFT_TYPE_CONTROL = 1,
-       ACPI_IBFT_TYPE_INITIATOR = 2,
-       ACPI_IBFT_TYPE_NIC = 3,
-       ACPI_IBFT_TYPE_TARGET = 4,
-       ACPI_IBFT_TYPE_EXTENSIONS = 5,
-       ACPI_IBFT_TYPE_RESERVED = 6     /* 6 and greater are reserved */
-};
-
-/* IBFT subtables */
-
-struct acpi_ibft_control {
-       struct acpi_ibft_header header;
-       u16 extensions;
-       u16 initiator_offset;
-       u16 nic0_offset;
-       u16 target0_offset;
-       u16 nic1_offset;
-       u16 target1_offset;
-};
-
-struct acpi_ibft_initiator {
-       struct acpi_ibft_header header;
-       u8 sns_server[16];
-       u8 slp_server[16];
-       u8 primary_server[16];
-       u8 secondary_server[16];
-       u16 name_length;
-       u16 name_offset;
-};
-
-struct acpi_ibft_nic {
-       struct acpi_ibft_header header;
-       u8 ip_address[16];
-       u8 subnet_mask_prefix;
-       u8 origin;
-       u8 gateway[16];
-       u8 primary_dns[16];
-       u8 secondary_dns[16];
-       u8 dhcp[16];
-       u16 vlan;
-       u8 mac_address[6];
-       u16 pci_address;
-       u16 name_length;
-       u16 name_offset;
-};
-
-struct acpi_ibft_target {
-       struct acpi_ibft_header header;
-       u8 target_ip_address[16];
-       u16 target_ip_socket;
-       u8 target_boot_lun[8];
-       u8 chap_type;
-       u8 nic_association;
-       u16 target_name_length;
-       u16 target_name_offset;
-       u16 chap_name_length;
-       u16 chap_name_offset;
-       u16 chap_secret_length;
-       u16 chap_secret_offset;
-       u16 reverse_chap_name_length;
-       u16 reverse_chap_name_offset;
-       u16 reverse_chap_secret_length;
-       u16 reverse_chap_secret_offset;
+       u32 error_data_length;
+       u8 fru_id[16];
+       u8 fru_text[20];
 };
 
 /*******************************************************************************
  *
  * MADT - Multiple APIC Description Table
+ *        Version 3
  *
  ******************************************************************************/
 
@@ -887,16 +608,16 @@ struct acpi_table_madt {
        u32 flags;
 };
 
-/* Flags */
+/* Masks for Flags field above */
 
-#define ACPI_MADT_PCAT_COMPAT       (1)        /* 00:    System also has dual 8259s */
+#define ACPI_MADT_PCAT_COMPAT       (1)        /* 00: System also has dual 8259s */
 
 /* Values for PCATCompat flag */
 
 #define ACPI_MADT_DUAL_PIC          0
 #define ACPI_MADT_MULTIPLE_APIC     1
 
-/* Values for subtable type in struct acpi_subtable_header */
+/* Values for MADT subtable type in struct acpi_subtable_header */
 
 enum acpi_madt_type {
        ACPI_MADT_TYPE_LOCAL_APIC = 0,
@@ -1007,11 +728,11 @@ struct acpi_madt_interrupt_source {
        u32 flags;              /* Interrupt Source Flags */
 };
 
-/* Flags field above */
+/* Masks for Flags field above */
 
 #define ACPI_MADT_CPEI_OVERRIDE     (1)
 
-/* 9: Processor Local X2_APIC (07/2008) */
+/* 9: Processor Local X2APIC (ACPI 4.0) */
 
 struct acpi_madt_local_x2apic {
        struct acpi_subtable_header header;
@@ -1021,7 +742,7 @@ struct acpi_madt_local_x2apic {
        u32 uid;                /* ACPI processor UID */
 };
 
-/* 10: Local X2APIC NMI (07/2008) */
+/* 10: Local X2APIC NMI (ACPI 4.0) */
 
 struct acpi_madt_local_x2apic_nmi {
        struct acpi_subtable_header header;
@@ -1058,28 +779,34 @@ struct acpi_madt_local_x2apic_nmi {
 
 /*******************************************************************************
  *
- * MCFG - PCI Memory Mapped Configuration table and sub-table
+ * MSCT - Maximum System Characteristics Table (ACPI 4.0)
+ *        Version 1
  *
  ******************************************************************************/
 
-struct acpi_table_mcfg {
+struct acpi_table_msct {
        struct acpi_table_header header;        /* Common ACPI table header */
-       u8 reserved[8];
+       u32 proximity_offset;   /* Location of proximity info struct(s) */
+       u32 max_proximity_domains;      /* Max number of proximity domains */
+       u32 max_clock_domains;  /* Max number of clock domains */
+       u64 max_address;        /* Max physical address in system */
 };
 
-/* Subtable */
+/* Subtable - Maximum Proximity Domain Information. Version 1 */
 
-struct acpi_mcfg_allocation {
-       u64 address;            /* Base address, processor-relative */
-       u16 pci_segment;        /* PCI segment group number */
-       u8 start_bus_number;    /* Starting PCI Bus number */
-       u8 end_bus_number;      /* Final PCI Bus number */
-       u32 reserved;
+struct acpi_msct_proximity {
+       u8 revision;
+       u8 length;
+       u32 range_start;        /* Start of domain range */
+       u32 range_end;          /* End of domain range */
+       u32 processor_capacity;
+       u64 memory_capacity;    /* In bytes */
 };
 
 /*******************************************************************************
  *
  * SBST - Smart Battery Specification Table
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -1093,6 +820,7 @@ struct acpi_table_sbst {
 /*******************************************************************************
  *
  * SLIT - System Locality Distance Information Table
+ *        Version 1
  *
  ******************************************************************************/
 
@@ -1102,62 +830,10 @@ struct acpi_table_slit {
        u8 entry[1];            /* Real size = localities^2 */
 };
 
-/*******************************************************************************
- *
- * SPCR - Serial Port Console Redirection table
- *
- ******************************************************************************/
-
-struct acpi_table_spcr {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 interface_type;      /* 0=full 16550, 1=subset of 16550 */
-       u8 reserved[3];
-       struct acpi_generic_address serial_port;
-       u8 interrupt_type;
-       u8 pc_interrupt;
-       u32 interrupt;
-       u8 baud_rate;
-       u8 parity;
-       u8 stop_bits;
-       u8 flow_control;
-       u8 terminal_type;
-       u8 reserved1;
-       u16 pci_device_id;
-       u16 pci_vendor_id;
-       u8 pci_bus;
-       u8 pci_device;
-       u8 pci_function;
-       u32 pci_flags;
-       u8 pci_segment;
-       u32 reserved2;
-};
-
-/*******************************************************************************
- *
- * SPMI - Server Platform Management Interface table
- *
- ******************************************************************************/
-
-struct acpi_table_spmi {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 reserved;
-       u8 interface_type;
-       u16 spec_revision;      /* Version of IPMI */
-       u8 interrupt_type;
-       u8 gpe_number;          /* GPE assigned */
-       u8 reserved1;
-       u8 pci_device_flag;
-       u32 interrupt;
-       struct acpi_generic_address ipmi_register;
-       u8 pci_segment;
-       u8 pci_bus;
-       u8 pci_device;
-       u8 pci_function;
-};
-
 /*******************************************************************************
  *
  * SRAT - System Resource Affinity Table
+ *        Version 3
  *
  ******************************************************************************/
 
@@ -1192,6 +868,10 @@ struct acpi_srat_cpu_affinity {
        u32 reserved;           /* Reserved, must be zero */
 };
 
+/* Flags */
+
+#define ACPI_SRAT_CPU_USE_AFFINITY  (1)        /* 00: Use affinity structure */
+
 /* 1: Memory Affinity */
 
 struct acpi_srat_mem_affinity {
@@ -1211,7 +891,7 @@ struct acpi_srat_mem_affinity {
 #define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1)     /* 01: Memory region is hot pluggable */
 #define ACPI_SRAT_MEM_NON_VOLATILE  (1<<2)     /* 02: Memory region is non-volatile */
 
-/* 2: Processor Local X2_APIC Affinity (07/2008) */
+/* 2: Processor Local X2_APIC Affinity (ACPI 4.0) */
 
 struct acpi_srat_x2apic_cpu_affinity {
        struct acpi_subtable_header header;
@@ -1219,122 +899,14 @@ struct acpi_srat_x2apic_cpu_affinity {
        u32 proximity_domain;
        u32 apic_id;
        u32 flags;
+       u32 clock_domain;
+       u32 reserved2;
 };
 
 /* Flags for struct acpi_srat_cpu_affinity and struct acpi_srat_x2apic_cpu_affinity */
 
 #define ACPI_SRAT_CPU_ENABLED       (1)        /* 00: Use affinity structure */
 
-/*******************************************************************************
- *
- * TCPA - Trusted Computing Platform Alliance table
- *
- ******************************************************************************/
-
-struct acpi_table_tcpa {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u16 reserved;
-       u32 max_log_length;     /* Maximum length for the event log area */
-       u64 log_address;        /* Address of the event log area */
-};
-
-/*******************************************************************************
- *
- * UEFI - UEFI Boot optimization Table
- *
- ******************************************************************************/
-
-struct acpi_table_uefi {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 identifier[16];      /* UUID identifier */
-       u16 data_offset;        /* Offset of remaining data in table */
-       u8 data;
-};
-
-/*******************************************************************************
- *
- * WDAT - Watchdog Action Table
- *
- ******************************************************************************/
-
-struct acpi_table_wdat {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u32 header_length;      /* Watchdog Header Length */
-       u16 pci_segment;        /* PCI Segment number */
-       u8 pci_bus;             /* PCI Bus number */
-       u8 pci_device;          /* PCI Device number */
-       u8 pci_function;        /* PCI Function number */
-       u8 reserved[3];
-       u32 timer_period;       /* Period of one timer count (msec) */
-       u32 max_count;          /* Maximum counter value supported */
-       u32 min_count;          /* Minimum counter value */
-       u8 flags;
-       u8 reserved2[3];
-       u32 entries;            /* Number of watchdog entries that follow */
-};
-
-/* WDAT Instruction Entries (actions) */
-
-struct acpi_wdat_entry {
-       struct acpi_whea_header whea_header;    /* Common header for WHEA tables */
-};
-
-/* Values for Action field above */
-
-enum acpi_wdat_actions {
-       ACPI_WDAT_RESET = 1,
-       ACPI_WDAT_GET_CURRENT_COUNTDOWN = 4,
-       ACPI_WDAT_GET_COUNTDOWN = 5,
-       ACPI_WDAT_SET_COUNTDOWN = 6,
-       ACPI_WDAT_GET_RUNNING_STATE = 8,
-       ACPI_WDAT_SET_RUNNING_STATE = 9,
-       ACPI_WDAT_GET_STOPPED_STATE = 10,
-       ACPI_WDAT_SET_STOPPED_STATE = 11,
-       ACPI_WDAT_GET_REBOOT = 16,
-       ACPI_WDAT_SET_REBOOT = 17,
-       ACPI_WDAT_GET_SHUTDOWN = 18,
-       ACPI_WDAT_SET_SHUTDOWN = 19,
-       ACPI_WDAT_GET_STATUS = 32,
-       ACPI_WDAT_SET_STATUS = 33,
-       ACPI_WDAT_ACTION_RESERVED = 34  /* 34 and greater are reserved */
-};
-
-/* Values for Instruction field above */
-
-enum acpi_wdat_instructions {
-       ACPI_WDAT_READ_VALUE = 0,
-       ACPI_WDAT_READ_COUNTDOWN = 1,
-       ACPI_WDAT_WRITE_VALUE = 2,
-       ACPI_WDAT_WRITE_COUNTDOWN = 3,
-       ACPI_WDAT_INSTRUCTION_RESERVED = 4,     /* 4 and greater are reserved */
-       ACPI_WDAT_PRESERVE_REGISTER = 0x80      /* Except for this value */
-};
-
-/*******************************************************************************
- *
- * WDRT - Watchdog Resource Table
- *
- ******************************************************************************/
-
-struct acpi_table_wdrt {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u32 header_length;      /* Watchdog Header Length */
-       u8 pci_segment;         /* PCI Segment number */
-       u8 pci_bus;             /* PCI Bus number */
-       u8 pci_device;          /* PCI Device number */
-       u8 pci_function;        /* PCI Function number */
-       u32 timer_period;       /* Period of one timer count (msec) */
-       u32 max_count;          /* Maximum counter value supported */
-       u32 min_count;          /* Minimum counter value */
-       u8 flags;
-       u8 reserved[3];
-       u32 entries;            /* Number of watchdog entries that follow */
-};
-
-/* Flags */
-
-#define ACPI_WDRT_TIMER_ENABLED     (1)        /* 00: Timer enabled */
-
 /* Reset to default packing */
 
 #pragma pack()
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
new file mode 100644 (file)
index 0000000..6f3dce9
--- /dev/null
@@ -0,0 +1,868 @@
+#ifndef __ACTBL2_H__
+#define __ACTBL2_H__
+
+/*******************************************************************************
+ *
+ * Additional ACPI Tables (2)
+ *
+ * These tables are not consumed directly by the ACPICA subsystem, but are
+ * included here to support device drivers and the AML disassembler.
+ *
+ * The tables in this file are defined by third-party specifications, and are
+ * not defined directly by the ACPI specification itself.
+ *
+ ******************************************************************************/
+
+/*
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
+ */
+#define ACPI_SIG_ASF            "ASF!" /* Alert Standard Format table */
+#define ACPI_SIG_BOOT           "BOOT" /* Simple Boot Flag Table */
+#define ACPI_SIG_DBGP           "DBGP" /* Debug Port table */
+#define ACPI_SIG_DMAR           "DMAR" /* DMA Remapping table */
+#define ACPI_SIG_HPET           "HPET" /* High Precision Event Timer table */
+#define ACPI_SIG_IBFT           "IBFT" /* i_sCSI Boot Firmware Table */
+#define ACPI_SIG_IVRS           "IVRS" /* I/O Virtualization Reporting Structure */
+#define ACPI_SIG_MCFG           "MCFG" /* PCI Memory Mapped Configuration table */
+#define ACPI_SIG_SLIC           "SLIC" /* Software Licensing Description Table */
+#define ACPI_SIG_SPCR           "SPCR" /* Serial Port Console Redirection table */
+#define ACPI_SIG_SPMI           "SPMI" /* Server Platform Management Interface table */
+#define ACPI_SIG_TCPA           "TCPA" /* Trusted Computing Platform Alliance table */
+#define ACPI_SIG_UEFI           "UEFI" /* Uefi Boot Optimization Table */
+#define ACPI_SIG_WAET           "WAET" /* Windows ACPI Emulated devices Table */
+#define ACPI_SIG_WDAT           "WDAT" /* Watchdog Action Table */
+#define ACPI_SIG_WDRT           "WDRT" /* Watchdog Resource Table */
+
+/*
+ * All tables must be byte-packed to match the ACPI specification, since
+ * the tables are provided by the system BIOS.
+ */
+#pragma pack(1)
+
+/*
+ * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
+ * This is the only type that is even remotely portable. Anything else is not
+ * portable, so do not use any other bitfield types.
+ */
+
+/*******************************************************************************
+ *
+ * ASF - Alert Standard Format table (Signature "ASF!")
+ *       Revision 0x10
+ *
+ * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
+ *
+ ******************************************************************************/
+
+struct acpi_table_asf {
+       struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* ASF subtable header */
+
+struct acpi_asf_header {
+       u8 type;
+       u8 reserved;
+       u16 length;
+};
+
+/* Values for Type field above */
+
+enum acpi_asf_type {
+       ACPI_ASF_TYPE_INFO = 0,
+       ACPI_ASF_TYPE_ALERT = 1,
+       ACPI_ASF_TYPE_CONTROL = 2,
+       ACPI_ASF_TYPE_BOOT = 3,
+       ACPI_ASF_TYPE_ADDRESS = 4,
+       ACPI_ASF_TYPE_RESERVED = 5
+};
+
+/*
+ * ASF subtables
+ */
+
+/* 0: ASF Information */
+
+struct acpi_asf_info {
+       struct acpi_asf_header header;
+       u8 min_reset_value;
+       u8 min_poll_interval;
+       u16 system_id;
+       u32 mfg_id;
+       u8 flags;
+       u8 reserved2[3];
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_ASF_SMBUS_PROTOCOLS    (1)
+
+/* 1: ASF Alerts */
+
+struct acpi_asf_alert {
+       struct acpi_asf_header header;
+       u8 assert_mask;
+       u8 deassert_mask;
+       u8 alerts;
+       u8 data_length;
+};
+
+struct acpi_asf_alert_data {
+       u8 address;
+       u8 command;
+       u8 mask;
+       u8 value;
+       u8 sensor_type;
+       u8 type;
+       u8 offset;
+       u8 source_type;
+       u8 severity;
+       u8 sensor_number;
+       u8 entity;
+       u8 instance;
+};
+
+/* 2: ASF Remote Control */
+
+struct acpi_asf_remote {
+       struct acpi_asf_header header;
+       u8 controls;
+       u8 data_length;
+       u16 reserved2;
+};
+
+struct acpi_asf_control_data {
+       u8 function;
+       u8 address;
+       u8 command;
+       u8 value;
+};
+
+/* 3: ASF RMCP Boot Options */
+
+struct acpi_asf_rmcp {
+       struct acpi_asf_header header;
+       u8 capabilities[7];
+       u8 completion_code;
+       u32 enterprise_id;
+       u8 command;
+       u16 parameter;
+       u16 boot_options;
+       u16 oem_parameters;
+};
+
+/* 4: ASF Address */
+
+struct acpi_asf_address {
+       struct acpi_asf_header header;
+       u8 eprom_address;
+       u8 devices;
+};
+
+/*******************************************************************************
+ *
+ * BOOT - Simple Boot Flag Table
+ *        Version 1
+ *
+ * Conforms to the "Simple Boot Flag Specification", Version 2.1
+ *
+ ******************************************************************************/
+
+struct acpi_table_boot {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 cmos_index;          /* Index in CMOS RAM for the boot register */
+       u8 reserved[3];
+};
+
+/*******************************************************************************
+ *
+ * DBGP - Debug Port table
+ *        Version 1
+ *
+ * Conforms to the "Debug Port Specification", Version 1.00, 2/9/2000
+ *
+ ******************************************************************************/
+
+struct acpi_table_dbgp {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 type;                /* 0=full 16550, 1=subset of 16550 */
+       u8 reserved[3];
+       struct acpi_generic_address debug_port;
+};
+
+/*******************************************************************************
+ *
+ * DMAR - DMA Remapping table
+ *        Version 1
+ *
+ * Conforms to "Intel Virtualization Technology for Directed I/O",
+ * Version 1.2, Sept. 2008
+ *
+ ******************************************************************************/
+
+struct acpi_table_dmar {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 width;               /* Host Address Width */
+       u8 flags;
+       u8 reserved[10];
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_INTR_REMAP        (1)
+
+/* DMAR subtable header */
+
+struct acpi_dmar_header {
+       u16 type;
+       u16 length;
+};
+
+/* Values for subtable type in struct acpi_dmar_header */
+
+enum acpi_dmar_type {
+       ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
+       ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
+       ACPI_DMAR_TYPE_ATSR = 2,
+       ACPI_DMAR_HARDWARE_AFFINITY = 3,
+       ACPI_DMAR_TYPE_RESERVED = 4     /* 4 and greater are reserved */
+};
+
+/* DMAR Device Scope structure */
+
+struct acpi_dmar_device_scope {
+       u8 entry_type;
+       u8 length;
+       u16 reserved;
+       u8 enumeration_id;
+       u8 bus;
+};
+
+/* Values for entry_type in struct acpi_dmar_device_scope */
+
+enum acpi_dmar_scope_type {
+       ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
+       ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
+       ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
+       ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
+       ACPI_DMAR_SCOPE_TYPE_HPET = 4,
+       ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
+};
+
+struct acpi_dmar_pci_path {
+       u8 dev;
+       u8 fn;
+};
+
+/*
+ * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
+ */
+
+/* 0: Hardware Unit Definition */
+
+struct acpi_dmar_hardware_unit {
+       struct acpi_dmar_header header;
+       u8 flags;
+       u8 reserved;
+       u16 segment;
+       u64 address;            /* Register Base Address */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_INCLUDE_ALL       (1)
+
+/* 1: Reserved Memory Defininition */
+
+struct acpi_dmar_reserved_memory {
+       struct acpi_dmar_header header;
+       u16 reserved;
+       u16 segment;
+       u64 base_address;       /* 4_k aligned base address */
+       u64 end_address;        /* 4_k aligned limit address */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_ALLOW_ALL         (1)
+
+/* 2: Root Port ATS Capability Reporting Structure */
+
+struct acpi_dmar_atsr {
+       struct acpi_dmar_header header;
+       u8 flags;
+       u8 reserved;
+       u16 segment;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_ALL_PORTS         (1)
+
+/* 3: Remapping Hardware Static Affinity Structure */
+
+struct acpi_dmar_rhsa {
+       struct acpi_dmar_header header;
+       u32 reserved;
+       u64 base_address;
+       u32 proximity_domain;
+};
+
+/*******************************************************************************
+ *
+ * HPET - High Precision Event Timer table
+ *        Version 1
+ *
+ * Conforms to "IA-PC HPET (High Precision Event Timers) Specification",
+ * Version 1.0a, October 2004
+ *
+ ******************************************************************************/
+
+struct acpi_table_hpet {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 id;                 /* Hardware ID of event timer block */
+       struct acpi_generic_address address;    /* Address of event timer block */
+       u8 sequence;            /* HPET sequence number */
+       u16 minimum_tick;       /* Main counter min tick, periodic mode */
+       u8 flags;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_HPET_PAGE_PROTECT_MASK (3)
+
+/* Values for Page Protect flags */
+
+enum acpi_hpet_page_protect {
+       ACPI_HPET_NO_PAGE_PROTECT = 0,
+       ACPI_HPET_PAGE_PROTECT4 = 1,
+       ACPI_HPET_PAGE_PROTECT64 = 2
+};
+
+/*******************************************************************************
+ *
+ * IBFT - Boot Firmware Table
+ *        Version 1
+ *
+ * Conforms to "iSCSI Boot Firmware Table (iBFT) as Defined in ACPI 3.0b
+ * Specification", Version 1.01, March 1, 2007
+ *
+ * Note: It appears that this table is not intended to appear in the RSDT/XSDT.
+ * Therefore, it is not currently supported by the disassembler.
+ *
+ ******************************************************************************/
+
+struct acpi_table_ibft {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 reserved[12];
+};
+
+/* IBFT common subtable header */
+
+struct acpi_ibft_header {
+       u8 type;
+       u8 version;
+       u16 length;
+       u8 index;
+       u8 flags;
+};
+
+/* Values for Type field above */
+
+enum acpi_ibft_type {
+       ACPI_IBFT_TYPE_NOT_USED = 0,
+       ACPI_IBFT_TYPE_CONTROL = 1,
+       ACPI_IBFT_TYPE_INITIATOR = 2,
+       ACPI_IBFT_TYPE_NIC = 3,
+       ACPI_IBFT_TYPE_TARGET = 4,
+       ACPI_IBFT_TYPE_EXTENSIONS = 5,
+       ACPI_IBFT_TYPE_RESERVED = 6     /* 6 and greater are reserved */
+};
+
+/* IBFT subtables */
+
+struct acpi_ibft_control {
+       struct acpi_ibft_header header;
+       u16 extensions;
+       u16 initiator_offset;
+       u16 nic0_offset;
+       u16 target0_offset;
+       u16 nic1_offset;
+       u16 target1_offset;
+};
+
+struct acpi_ibft_initiator {
+       struct acpi_ibft_header header;
+       u8 sns_server[16];
+       u8 slp_server[16];
+       u8 primary_server[16];
+       u8 secondary_server[16];
+       u16 name_length;
+       u16 name_offset;
+};
+
+struct acpi_ibft_nic {
+       struct acpi_ibft_header header;
+       u8 ip_address[16];
+       u8 subnet_mask_prefix;
+       u8 origin;
+       u8 gateway[16];
+       u8 primary_dns[16];
+       u8 secondary_dns[16];
+       u8 dhcp[16];
+       u16 vlan;
+       u8 mac_address[6];
+       u16 pci_address;
+       u16 name_length;
+       u16 name_offset;
+};
+
+struct acpi_ibft_target {
+       struct acpi_ibft_header header;
+       u8 target_ip_address[16];
+       u16 target_ip_socket;
+       u8 target_boot_lun[8];
+       u8 chap_type;
+       u8 nic_association;
+       u16 target_name_length;
+       u16 target_name_offset;
+       u16 chap_name_length;
+       u16 chap_name_offset;
+       u16 chap_secret_length;
+       u16 chap_secret_offset;
+       u16 reverse_chap_name_length;
+       u16 reverse_chap_name_offset;
+       u16 reverse_chap_secret_length;
+       u16 reverse_chap_secret_offset;
+};
+
+/*******************************************************************************
+ *
+ * IVRS - I/O Virtualization Reporting Structure
+ *        Version 1
+ *
+ * Conforms to "AMD I/O Virtualization Technology (IOMMU) Specification",
+ * Revision 1.26, February 2009.
+ *
+ ******************************************************************************/
+
+struct acpi_table_ivrs {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 info;               /* Common virtualization info */
+       u64 reserved;
+};
+
+/* Values for Info field above */
+
+#define ACPI_IVRS_PHYSICAL_SIZE     0x00007F00 /* 7 bits, physical address size */
+#define ACPI_IVRS_VIRTUAL_SIZE      0x003F8000 /* 7 bits, virtual address size */
+#define ACPI_IVRS_ATS_RESERVED      0x00400000 /* ATS address translation range reserved */
+
+/* IVRS subtable header */
+
+struct acpi_ivrs_header {
+       u8 type;                /* Subtable type */
+       u8 flags;
+       u16 length;             /* Subtable length */
+       u16 device_id;          /* ID of IOMMU */
+};
+
+/* Values for subtable Type above */
+
+enum acpi_ivrs_type {
+       ACPI_IVRS_TYPE_HARDWARE = 0x10,
+       ACPI_IVRS_TYPE_MEMORY1 = 0x20,
+       ACPI_IVRS_TYPE_MEMORY2 = 0x21,
+       ACPI_IVRS_TYPE_MEMORY3 = 0x22
+};
+
+/* Masks for Flags field above for IVHD subtable */
+
+#define ACPI_IVHD_TT_ENABLE         (1)
+#define ACPI_IVHD_PASS_PW           (1<<1)
+#define ACPI_IVHD_RES_PASS_PW       (1<<2)
+#define ACPI_IVHD_ISOC              (1<<3)
+#define ACPI_IVHD_IOTLB             (1<<4)
+
+/* Masks for Flags field above for IVMD subtable */
+
+#define ACPI_IVMD_UNITY             (1)
+#define ACPI_IVMD_READ              (1<<1)
+#define ACPI_IVMD_WRITE             (1<<2)
+#define ACPI_IVMD_EXCLUSION_RANGE   (1<<3)
+
+/*
+ * IVRS subtables, correspond to Type in struct acpi_ivrs_header
+ */
+
+/* 0x10: I/O Virtualization Hardware Definition Block (IVHD) */
+
+struct acpi_ivrs_hardware {
+       struct acpi_ivrs_header header;
+       u16 capability_offset;  /* Offset for IOMMU control fields */
+       u64 base_address;       /* IOMMU control registers */
+       u16 pci_segment_group;
+       u16 info;               /* MSI number and unit ID */
+       u32 reserved;
+};
+
+/* Masks for Info field above */
+
+#define ACPI_IVHD_MSI_NUMBER_MASK   0x001F     /* 5 bits, MSI message number */
+#define ACPI_IVHD_UNIT_ID_MASK      0x1F00     /* 5 bits, unit_iD */
+
+/*
+ * Device Entries for IVHD subtable, appear after struct acpi_ivrs_hardware structure.
+ * Upper two bits of the Type field are the (encoded) length of the structure.
+ * Currently, only 4 and 8 byte entries are defined. 16 and 32 byte entries
+ * are reserved for future use but not defined.
+ */
+struct acpi_ivrs_de_header {
+       u8 type;
+       u16 id;
+       u8 data_setting;
+};
+
+/* Length of device entry is in the top two bits of Type field above */
+
+#define ACPI_IVHD_ENTRY_LENGTH      0xC0
+
+/* Values for device entry Type field above */
+
+enum acpi_ivrs_device_entry_type {
+       /* 4-byte device entries, all use struct acpi_ivrs_device4 */
+
+       ACPI_IVRS_TYPE_PAD4 = 0,
+       ACPI_IVRS_TYPE_ALL = 1,
+       ACPI_IVRS_TYPE_SELECT = 2,
+       ACPI_IVRS_TYPE_START = 3,
+       ACPI_IVRS_TYPE_END = 4,
+
+       /* 8-byte device entries */
+
+       ACPI_IVRS_TYPE_PAD8 = 64,
+       ACPI_IVRS_TYPE_NOT_USED = 65,
+       ACPI_IVRS_TYPE_ALIAS_SELECT = 66,       /* Uses struct acpi_ivrs_device8a */
+       ACPI_IVRS_TYPE_ALIAS_START = 67,        /* Uses struct acpi_ivrs_device8a */
+       ACPI_IVRS_TYPE_EXT_SELECT = 70, /* Uses struct acpi_ivrs_device8b */
+       ACPI_IVRS_TYPE_EXT_START = 71,  /* Uses struct acpi_ivrs_device8b */
+       ACPI_IVRS_TYPE_SPECIAL = 72     /* Uses struct acpi_ivrs_device8c */
+};
+
+/* Values for Data field above */
+
+#define ACPI_IVHD_INIT_PASS         (1)
+#define ACPI_IVHD_EINT_PASS         (1<<1)
+#define ACPI_IVHD_NMI_PASS          (1<<2)
+#define ACPI_IVHD_SYSTEM_MGMT       (3<<4)
+#define ACPI_IVHD_LINT0_PASS        (1<<6)
+#define ACPI_IVHD_LINT1_PASS        (1<<7)
+
+/* Types 0-4: 4-byte device entry */
+
+struct acpi_ivrs_device4 {
+       struct acpi_ivrs_de_header header;
+};
+
+/* Types 66-67: 8-byte device entry */
+
+struct acpi_ivrs_device8a {
+       struct acpi_ivrs_de_header header;
+       u8 reserved1;
+       u16 used_id;
+       u8 reserved2;
+};
+
+/* Types 70-71: 8-byte device entry */
+
+struct acpi_ivrs_device8b {
+       struct acpi_ivrs_de_header header;
+       u32 extended_data;
+};
+
+/* Values for extended_data above */
+
+#define ACPI_IVHD_ATS_DISABLED      (1<<31)
+
+/* Type 72: 8-byte device entry */
+
+struct acpi_ivrs_device8c {
+       struct acpi_ivrs_de_header header;
+       u8 handle;
+       u16 used_id;
+       u8 variety;
+};
+
+/* Values for Variety field above */
+
+#define ACPI_IVHD_IOAPIC            1
+#define ACPI_IVHD_HPET              2
+
+/* 0x20, 0x21, 0x22: I/O Virtualization Memory Definition Block (IVMD) */
+
+struct acpi_ivrs_memory {
+       struct acpi_ivrs_header header;
+       u16 aux_data;
+       u64 reserved;
+       u64 start_address;
+       u64 memory_length;
+};
+
+/*******************************************************************************
+ *
+ * MCFG - PCI Memory Mapped Configuration table and sub-table
+ *        Version 1
+ *
+ * Conforms to "PCI Firmware Specification", Revision 3.0, June 20, 2005
+ *
+ ******************************************************************************/
+
+struct acpi_table_mcfg {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 reserved[8];
+};
+
+/* Subtable */
+
+struct acpi_mcfg_allocation {
+       u64 address;            /* Base address, processor-relative */
+       u16 pci_segment;        /* PCI segment group number */
+       u8 start_bus_number;    /* Starting PCI Bus number */
+       u8 end_bus_number;      /* Final PCI Bus number */
+       u32 reserved;
+};
+
+/*******************************************************************************
+ *
+ * SPCR - Serial Port Console Redirection table
+ *        Version 1
+ *
+ * Conforms to "Serial Port Console Redirection Table",
+ * Version 1.00, January 11, 2002
+ *
+ ******************************************************************************/
+
+struct acpi_table_spcr {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 interface_type;      /* 0=full 16550, 1=subset of 16550 */
+       u8 reserved[3];
+       struct acpi_generic_address serial_port;
+       u8 interrupt_type;
+       u8 pc_interrupt;
+       u32 interrupt;
+       u8 baud_rate;
+       u8 parity;
+       u8 stop_bits;
+       u8 flow_control;
+       u8 terminal_type;
+       u8 reserved1;
+       u16 pci_device_id;
+       u16 pci_vendor_id;
+       u8 pci_bus;
+       u8 pci_device;
+       u8 pci_function;
+       u32 pci_flags;
+       u8 pci_segment;
+       u32 reserved2;
+};
+
+/* Masks for pci_flags field above */
+
+#define ACPI_SPCR_DO_NOT_DISABLE    (1)
+
+/*******************************************************************************
+ *
+ * SPMI - Server Platform Management Interface table
+ *        Version 5
+ *
+ * Conforms to "Intelligent Platform Management Interface Specification
+ * Second Generation v2.0", Document Revision 1.0, February 12, 2004 with
+ * June 12, 2009 markup.
+ *
+ ******************************************************************************/
+
+struct acpi_table_spmi {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 interface_type;
+       u8 reserved;            /* Must be 1 */
+       u16 spec_revision;      /* Version of IPMI */
+       u8 interrupt_type;
+       u8 gpe_number;          /* GPE assigned */
+       u8 reserved1;
+       u8 pci_device_flag;
+       u32 interrupt;
+       struct acpi_generic_address ipmi_register;
+       u8 pci_segment;
+       u8 pci_bus;
+       u8 pci_device;
+       u8 pci_function;
+       u8 reserved2;
+};
+
+/* Values for interface_type above */
+
+enum acpi_spmi_interface_types {
+       ACPI_SPMI_NOT_USED = 0,
+       ACPI_SPMI_KEYBOARD = 1,
+       ACPI_SPMI_SMI = 2,
+       ACPI_SPMI_BLOCK_TRANSFER = 3,
+       ACPI_SPMI_SMBUS = 4,
+       ACPI_SPMI_RESERVED = 5  /* 5 and above are reserved */
+};
+
+/*******************************************************************************
+ *
+ * TCPA - Trusted Computing Platform Alliance table
+ *        Version 1
+ *
+ * Conforms to "TCG PC Specific Implementation Specification",
+ * Version 1.1, August 18, 2003
+ *
+ ******************************************************************************/
+
+struct acpi_table_tcpa {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u16 reserved;
+       u32 max_log_length;     /* Maximum length for the event log area */
+       u64 log_address;        /* Address of the event log area */
+};
+
+/*******************************************************************************
+ *
+ * UEFI - UEFI Boot optimization Table
+ *        Version 1
+ *
+ * Conforms to "Unified Extensible Firmware Interface Specification",
+ * Version 2.3, May 8, 2009
+ *
+ ******************************************************************************/
+
+struct acpi_table_uefi {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 identifier[16];      /* UUID identifier */
+       u16 data_offset;        /* Offset of remaining data in table */
+};
+
+/*******************************************************************************
+ *
+ * WAET - Windows ACPI Emulated devices Table
+ *        Version 1
+ *
+ * Conforms to "Windows ACPI Emulated Devices Table", version 1.0, April 6, 2009
+ *
+ ******************************************************************************/
+
+struct acpi_table_waet {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 flags;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_WAET_RTC_NO_ACK        (1)        /* RTC requires no int acknowledge */
+#define ACPI_WAET_TIMER_ONE_READ    (1<<1)     /* PM timer requires only one read */
+
+/*******************************************************************************
+ *
+ * WDAT - Watchdog Action Table
+ *        Version 1
+ *
+ * Conforms to "Hardware Watchdog Timers Design Specification",
+ * Copyright 2006 Microsoft Corporation.
+ *
+ ******************************************************************************/
+
+struct acpi_table_wdat {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 header_length;      /* Watchdog Header Length */
+       u16 pci_segment;        /* PCI Segment number */
+       u8 pci_bus;             /* PCI Bus number */
+       u8 pci_device;          /* PCI Device number */
+       u8 pci_function;        /* PCI Function number */
+       u8 reserved[3];
+       u32 timer_period;       /* Period of one timer count (msec) */
+       u32 max_count;          /* Maximum counter value supported */
+       u32 min_count;          /* Minimum counter value */
+       u8 flags;
+       u8 reserved2[3];
+       u32 entries;            /* Number of watchdog entries that follow */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_WDAT_ENABLED           (1)
+#define ACPI_WDAT_STOPPED           0x80
+
+/* WDAT Instruction Entries (actions) */
+
+struct acpi_wdat_entry {
+       u8 action;
+       u8 instruction;
+       u16 reserved;
+       struct acpi_generic_address register_region;
+       u32 value;              /* Value used with Read/Write register */
+       u32 mask;               /* Bitmask required for this register instruction */
+};
+
+/* Values for Action field above */
+
+enum acpi_wdat_actions {
+       ACPI_WDAT_RESET = 1,
+       ACPI_WDAT_GET_CURRENT_COUNTDOWN = 4,
+       ACPI_WDAT_GET_COUNTDOWN = 5,
+       ACPI_WDAT_SET_COUNTDOWN = 6,
+       ACPI_WDAT_GET_RUNNING_STATE = 8,
+       ACPI_WDAT_SET_RUNNING_STATE = 9,
+       ACPI_WDAT_GET_STOPPED_STATE = 10,
+       ACPI_WDAT_SET_STOPPED_STATE = 11,
+       ACPI_WDAT_GET_REBOOT = 16,
+       ACPI_WDAT_SET_REBOOT = 17,
+       ACPI_WDAT_GET_SHUTDOWN = 18,
+       ACPI_WDAT_SET_SHUTDOWN = 19,
+       ACPI_WDAT_GET_STATUS = 32,
+       ACPI_WDAT_SET_STATUS = 33,
+       ACPI_WDAT_ACTION_RESERVED = 34  /* 34 and greater are reserved */
+};
+
+/* Values for Instruction field above */
+
+enum acpi_wdat_instructions {
+       ACPI_WDAT_READ_VALUE = 0,
+       ACPI_WDAT_READ_COUNTDOWN = 1,
+       ACPI_WDAT_WRITE_VALUE = 2,
+       ACPI_WDAT_WRITE_COUNTDOWN = 3,
+       ACPI_WDAT_INSTRUCTION_RESERVED = 4,     /* 4 and greater are reserved */
+       ACPI_WDAT_PRESERVE_REGISTER = 0x80      /* Except for this value */
+};
+
+/*******************************************************************************
+ *
+ * WDRT - Watchdog Resource Table
+ *        Version 1
+ *
+ * Conforms to "Watchdog Timer Hardware Requirements for Windows Server 2003",
+ * Version 1.01, August 28, 2006
+ *
+ ******************************************************************************/
+
+struct acpi_table_wdrt {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       struct acpi_generic_address control_register;
+       struct acpi_generic_address count_register;
+       u16 pci_device_id;
+       u16 pci_vendor_id;
+       u8 pci_bus;             /* PCI Bus number */
+       u8 pci_device;          /* PCI Device number */
+       u8 pci_function;        /* PCI Function number */
+       u8 pci_segment;         /* PCI Segment number */
+       u16 max_count;          /* Maximum counter value supported */
+       u8 units;
+};
+
+/* Reset to default packing */
+
+#pragma pack()
+
+#endif                         /* __ACTBL2_H__ */
index 37ba576..153f12d 100644 (file)
@@ -288,7 +288,7 @@ typedef u32 acpi_physical_address;
 /*
  * Some compilers complain about unused variables. Sometimes we don't want to
  * use all the variables (for example, _acpi_module_name). This allows us
- * to to tell the compiler in a per-variable manner that a variable
+ * to tell the compiler in a per-variable manner that a variable
  * is unused
  */
 #ifndef ACPI_UNUSED_VAR
@@ -338,7 +338,7 @@ typedef u32 acpi_physical_address;
 
 /* PM Timer ticks per second (HZ) */
 
-#define PM_TIMER_FREQUENCY  3579545
+#define PM_TIMER_FREQUENCY              3579545
 
 /*******************************************************************************
  *
@@ -732,7 +732,8 @@ typedef u8 acpi_adr_space_type;
 #define ACPI_ADR_SPACE_SMBUS            (acpi_adr_space_type) 4
 #define ACPI_ADR_SPACE_CMOS             (acpi_adr_space_type) 5
 #define ACPI_ADR_SPACE_PCI_BAR_TARGET   (acpi_adr_space_type) 6
-#define ACPI_ADR_SPACE_DATA_TABLE       (acpi_adr_space_type) 7
+#define ACPI_ADR_SPACE_IPMI             (acpi_adr_space_type) 7
+#define ACPI_ADR_SPACE_DATA_TABLE       (acpi_adr_space_type) 8
 #define ACPI_ADR_SPACE_FIXED_HARDWARE   (acpi_adr_space_type) 127
 
 /*
@@ -921,7 +922,7 @@ typedef
 void (*acpi_notify_handler) (acpi_handle device, u32 value, void *context);
 
 typedef
-void (*acpi_object_handler) (acpi_handle object, u32 function, void *data);
+void (*acpi_object_handler) (acpi_handle object, void *data);
 
 typedef acpi_status(*acpi_init_handler) (acpi_handle object, u32 function);
 
@@ -969,38 +970,60 @@ acpi_status(*acpi_walk_callback) (acpi_handle obj_handle,
 #define ACPI_INTERRUPT_NOT_HANDLED      0x00
 #define ACPI_INTERRUPT_HANDLED          0x01
 
-/* Length of _HID, _UID, _CID, and UUID values */
+/* Length of 32-bit EISAID values when converted back to a string */
+
+#define ACPI_EISAID_STRING_SIZE         8      /* Includes null terminator */
+
+/* Length of UUID (string) values */
 
-#define ACPI_DEVICE_ID_LENGTH           0x09
-#define ACPI_MAX_CID_LENGTH             48
 #define ACPI_UUID_LENGTH                16
 
-/* Common string version of device HIDs and UIDs */
+/* Structures used for device/processor HID, UID, CID */
 
 struct acpica_device_id {
-       char value[ACPI_DEVICE_ID_LENGTH];
+       u32 length;             /* Length of string + null */
+       char *string;
 };
 
-/* Common string version of device CIDs */
-
-struct acpi_compatible_id {
-       char value[ACPI_MAX_CID_LENGTH];
+struct acpica_device_id_list {
+       u32 count;              /* Number of IDs in Ids array */
+       u32 list_size;          /* Size of list, including ID strings */
+       struct acpica_device_id ids[1]; /* ID array */
 };
 
-struct acpi_compatible_id_list {
-       u32 count;
-       u32 size;
-       struct acpi_compatible_id id[1];
+/*
+ * Structure returned from acpi_get_object_info.
+ * Optimized for both 32- and 64-bit builds
+ */
+struct acpi_device_info {
+       u32 info_size;          /* Size of info, including ID strings */
+       u32 name;               /* ACPI object Name */
+       acpi_object_type type;  /* ACPI object Type */
+       u8 param_count;         /* If a method, required parameter count */
+       u8 valid;               /* Indicates which optional fields are valid */
+       u8 flags;               /* Miscellaneous info */
+       u8 highest_dstates[4];  /* _sx_d values: 0xFF indicates not valid */
+       u8 lowest_dstates[5];   /* _sx_w values: 0xFF indicates not valid */
+       u32 current_status;     /* _STA value */
+       acpi_integer address;   /* _ADR value */
+       struct acpica_device_id hardware_id;    /* _HID value */
+       struct acpica_device_id unique_id;      /* _UID value */
+       struct acpica_device_id_list compatible_id_list;        /* _CID list <must be last> */
 };
 
-/* Structure and flags for acpi_get_object_info */
+/* Values for Flags field above (acpi_get_object_info) */
+
+#define ACPI_PCI_ROOT_BRIDGE            0x01
 
-#define ACPI_VALID_STA                  0x0001
-#define ACPI_VALID_ADR                  0x0002
-#define ACPI_VALID_HID                  0x0004
-#define ACPI_VALID_UID                  0x0008
-#define ACPI_VALID_CID                  0x0010
-#define ACPI_VALID_SXDS                 0x0020
+/* Flags for Valid field above (acpi_get_object_info) */
+
+#define ACPI_VALID_STA                  0x01
+#define ACPI_VALID_ADR                  0x02
+#define ACPI_VALID_HID                  0x04
+#define ACPI_VALID_UID                  0x08
+#define ACPI_VALID_CID                  0x10
+#define ACPI_VALID_SXDS                 0x20
+#define ACPI_VALID_SXWS                 0x40
 
 /* Flags for _STA method */
 
@@ -1011,29 +1034,6 @@ struct acpi_compatible_id_list {
 #define ACPI_STA_DEVICE_OK              0x08   /* Synonym */
 #define ACPI_STA_BATTERY_PRESENT        0x10
 
-#define ACPI_COMMON_OBJ_INFO \
-       acpi_object_type                type;           /* ACPI object type */ \
-       acpi_name                       name    /* ACPI object Name */
-
-struct acpi_obj_info_header {
-       ACPI_COMMON_OBJ_INFO;
-};
-
-/* Structure returned from Get Object Info */
-
-struct acpi_device_info {
-       ACPI_COMMON_OBJ_INFO;
-
-       u32 param_count;        /* If a method, required parameter count */
-       u32 valid;              /* Indicates which fields below are valid */
-       u32 current_status;     /* _STA value */
-       acpi_integer address;   /* _ADR value if any */
-       struct acpica_device_id hardware_id;    /* _HID value if any */
-       struct acpica_device_id unique_id;      /* _UID value if any */
-       u8 highest_dstates[4];  /* _sx_d values: 0xFF indicates not valid */
-       struct acpi_compatible_id_list compatibility_id;        /* List of _CIDs if any */
-};
-
 /* Context structs for address space handlers */
 
 struct acpi_pci_id {
index 935c5d7..6aadbf8 100644 (file)
@@ -57,7 +57,7 @@
 /*
  * Some compilers complain about unused variables. Sometimes we don't want to
  * use all the variables (for example, _acpi_module_name). This allows us
- * to to tell the compiler warning in a per-variable manner that a variable
+ * to tell the compiler warning in a per-variable manner that a variable
  * is unused.
  */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
index fcb8e4b..9d7febd 100644 (file)
@@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #define ACPI_FREE(a)            kfree(a)
 
 /* Used within ACPICA to show where it is safe to preempt execution */
-
+#include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
        do { \
-               if (!irqs_disabled()) \
+               if (!in_atomic_preempt_off()) \
                        cond_resched(); \
        } while (0)
 
index d6c379d..9cca378 100644 (file)
@@ -141,6 +141,8 @@ extern int __gpio_to_irq(unsigned gpio);
  * but more typically is configured entirely from userspace.
  */
 extern int gpio_export(unsigned gpio, bool direction_may_change);
+extern int gpio_export_link(struct device *dev, const char *name,
+                       unsigned gpio);
 extern void gpio_unexport(unsigned gpio);
 
 #endif /* CONFIG_GPIO_SYSFS */
@@ -185,6 +187,12 @@ static inline int gpio_export(unsigned gpio, bool direction_may_change)
        return -ENOSYS;
 }
 
+static inline int gpio_export_link(struct device *dev, const char *name,
+                               unsigned gpio)
+{
+       return -ENOSYS;
+}
+
 static inline void gpio_unexport(unsigned gpio)
 {
 }
index eddbce0..e5f234a 100644 (file)
@@ -2,34 +2,35 @@
 #define _ASM_GENERIC_KMAP_TYPES_H
 
 #ifdef __WITH_KM_FENCE
-# define D(n) __KM_FENCE_##n ,
+# define KMAP_D(n) __KM_FENCE_##n ,
 #else
-# define D(n)
+# define KMAP_D(n)
 #endif
 
 enum km_type {
-D(0)   KM_BOUNCE_READ,
-D(1)   KM_SKB_SUNRPC_DATA,
-D(2)   KM_SKB_DATA_SOFTIRQ,
-D(3)   KM_USER0,
-D(4)   KM_USER1,
-D(5)   KM_BIO_SRC_IRQ,
-D(6)   KM_BIO_DST_IRQ,
-D(7)   KM_PTE0,
-D(8)   KM_PTE1,
-D(9)   KM_IRQ0,
-D(10)  KM_IRQ1,
-D(11)  KM_SOFTIRQ0,
-D(12)  KM_SOFTIRQ1,
-D(13)  KM_SYNC_ICACHE,
-D(14)  KM_SYNC_DCACHE,
-D(15)  KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */
-D(16)  KM_IRQ_PTE,
-D(17)  KM_NMI,
-D(18)  KM_NMI_PTE,
-D(19)  KM_TYPE_NR
+KMAP_D(0)      KM_BOUNCE_READ,
+KMAP_D(1)      KM_SKB_SUNRPC_DATA,
+KMAP_D(2)      KM_SKB_DATA_SOFTIRQ,
+KMAP_D(3)      KM_USER0,
+KMAP_D(4)      KM_USER1,
+KMAP_D(5)      KM_BIO_SRC_IRQ,
+KMAP_D(6)      KM_BIO_DST_IRQ,
+KMAP_D(7)      KM_PTE0,
+KMAP_D(8)      KM_PTE1,
+KMAP_D(9)      KM_IRQ0,
+KMAP_D(10)     KM_IRQ1,
+KMAP_D(11)     KM_SOFTIRQ0,
+KMAP_D(12)     KM_SOFTIRQ1,
+KMAP_D(13)     KM_SYNC_ICACHE,
+KMAP_D(14)     KM_SYNC_DCACHE,
+/* UML specific, for copy_*_user - used in do_op_one_page */
+KMAP_D(15)     KM_UML_USERCOPY,
+KMAP_D(16)     KM_IRQ_PTE,
+KMAP_D(17)     KM_NMI,
+KMAP_D(18)     KM_NMI_PTE,
+KMAP_D(19)     KM_TYPE_NR
 };
 
-#undef D
+#undef KMAP_D
 
 #endif
index 3b69ad3..dd63bd3 100644 (file)
@@ -35,6 +35,9 @@
 #define MADV_DONTFORK  10              /* don't inherit across fork */
 #define MADV_DOFORK    11              /* do inherit across fork */
 
+#define MADV_MERGEABLE   12            /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 13            /* KSM may not merge identical pages */
+
 /* compatibility flags */
 #define MAP_FILE       0
 
index 7cab4de..32c8bd6 100644 (file)
@@ -11,6 +11,7 @@
 #define MAP_POPULATE   0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK   0x10000         /* do not block on IO */
 #define MAP_STACK      0x20000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB    0x40000         /* create a huge page mapping */
 
 #define MCL_CURRENT    1               /* lock all current mappings */
 #define MCL_FUTURE     2               /* lock all future mappings */
index d083561..b3bfabc 100644 (file)
@@ -23,4 +23,20 @@ extern char __ctors_start[], __ctors_end[];
 #define dereference_function_descriptor(p) (p)
 #endif
 
+/* random extra sections (if any).  Override
+ * in asm/sections.h */
+#ifndef arch_is_kernel_text
+static inline int arch_is_kernel_text(unsigned long addr)
+{
+       return 0;
+}
+#endif
+
+#ifndef arch_is_kernel_data
+static inline int arch_is_kernel_data(unsigned long addr)
+{
+       return 0;
+}
+#endif
+
 #endif /* _ASM_GENERIC_SECTIONS_H_ */
index ea8087b..5c122ae 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Access to user system call parameters and results
  *
- * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2008-2009 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
@@ -32,9 +32,13 @@ struct pt_regs;
  * If @task is not executing a system call, i.e. it's blocked
  * inside the kernel for a fault or signal, returns -1.
  *
+ * Note this returns int even on 64-bit machines.  Only 32 bits of
+ * system call number can be meaningful.  If the actual arch value
+ * is 64 bits, this truncates to 32 bits so 0xffffffff means -1.
+ *
  * It's only valid to call this when @task is known to be blocked.
  */
-long syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
+int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
 
 /**
  * syscall_rollback - roll back registers after an aborted system call
index 1125e5a..d76b66a 100644 (file)
@@ -620,8 +620,8 @@ __SYSCALL(__NR_move_pages, sys_move_pages)
 
 #define __NR_rt_tgsigqueueinfo 240
 __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 241
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open 241
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 
 #undef __NR_syscalls
 #define __NR_syscalls 242
index 45b67d9..c8e64bb 100644 (file)
@@ -88,7 +88,37 @@ struct drm_device;
 #define DRM_UT_CORE            0x01
 #define DRM_UT_DRIVER          0x02
 #define DRM_UT_KMS             0x04
-#define DRM_UT_MODE            0x08
+/*
+ * Three debug levels are defined.
+ * drm_core, drm_driver, drm_kms
+ * drm_core level can be used in the generic drm code. For example:
+ *     drm_ioctl, drm_mm, drm_memory
+ * The macro definiton of DRM_DEBUG is used.
+ *     DRM_DEBUG(fmt, args...)
+ *     The debug info by using the DRM_DEBUG can be obtained by adding
+ *     the boot option of "drm.debug=1".
+ *
+ * drm_driver level can be used in the specific drm driver. It is used
+ * to add the debug info related with the drm driver. For example:
+ * i915_drv, i915_dma, i915_gem, radeon_drv,
+ *     The macro definition of DRM_DEBUG_DRIVER can be used.
+ *     DRM_DEBUG_DRIVER(fmt, args...)
+ *     The debug info by using the DRM_DEBUG_DRIVER can be obtained by
+ *     adding the boot option of "drm.debug=0x02"
+ *
+ * drm_kms level can be used in the KMS code related with specific drm driver.
+ * It is used to add the debug info related with KMS mode. For example:
+ * the connector/crtc ,
+ *     The macro definition of DRM_DEBUG_KMS can be used.
+ *     DRM_DEBUG_KMS(fmt, args...)
+ *     The debug info by using the DRM_DEBUG_KMS can be obtained by
+ *     adding the boot option of "drm.debug=0x04"
+ *
+ * If we add the boot option of "drm.debug=0x06", we can get the debug info by
+ * using the DRM_DEBUG_KMS and DRM_DEBUG_DRIVER.
+ * If we add the boot option of "drm.debug=0x05", we can get the debug info by
+ * using the DRM_DEBUG_KMS and DRM_DEBUG.
+ */
 
 extern void drm_ut_debug_printk(unsigned int request_level,
                                const char *prefix,
@@ -174,19 +204,14 @@ extern void drm_ut_debug_printk(unsigned int request_level,
                                        __func__, fmt, ##args);         \
        } while (0)
 
-#define DRM_DEBUG_DRIVER(prefix, fmt, args...)                         \
+#define DRM_DEBUG_DRIVER(fmt, args...)                                 \
        do {                                                            \
-               drm_ut_debug_printk(DRM_UT_DRIVER, prefix,              \
+               drm_ut_debug_printk(DRM_UT_DRIVER, DRM_NAME,            \
                                        __func__, fmt, ##args);         \
        } while (0)
-#define DRM_DEBUG_KMS(prefix, fmt, args...)                            \
+#define DRM_DEBUG_KMS(fmt, args...)                            \
        do {                                                            \
-               drm_ut_debug_printk(DRM_UT_KMS, prefix,                 \
-                                        __func__, fmt, ##args);        \
-       } while (0)
-#define DRM_DEBUG_MODE(prefix, fmt, args...)                           \
-       do {                                                            \
-               drm_ut_debug_printk(DRM_UT_MODE, prefix,                \
+               drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME,               \
                                         __func__, fmt, ##args);        \
        } while (0)
 #define DRM_LOG(fmt, args...)                                          \
@@ -210,9 +235,8 @@ extern void drm_ut_debug_printk(unsigned int request_level,
                                        NULL, fmt, ##args);             \
        } while (0)
 #else
-#define DRM_DEBUG_DRIVER(prefix, fmt, args...) do { } while (0)
-#define DRM_DEBUG_KMS(prefix, fmt, args...)    do { } while (0)
-#define DRM_DEBUG_MODE(prefix, fmt, args...)   do { } while (0)
+#define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
+#define DRM_DEBUG_KMS(fmt, args...)    do { } while (0)
 #define DRM_DEBUG(fmt, arg...)          do { } while (0)
 #define DRM_LOG(fmt, arg...)           do { } while (0)
 #define DRM_LOG_KMS(fmt, args...) do { } while (0)
@@ -786,6 +810,9 @@ struct drm_driver {
        int (*gem_init_object) (struct drm_gem_object *obj);
        void (*gem_free_object) (struct drm_gem_object *obj);
 
+       /* vga arb irq handler */
+       void (*vgaarb_irq)(struct drm_device *dev, bool state);
+
        /* Driver private ops for this object */
        struct vm_operations_struct *gem_vm_ops;
 
@@ -1417,7 +1444,7 @@ drm_gem_object_unreference(struct drm_gem_object *obj)
 
 int drm_gem_handle_create(struct drm_file *file_priv,
                          struct drm_gem_object *obj,
-                         int *handlep);
+                         u32 *handlep);
 
 static inline void
 drm_gem_object_handle_reference(struct drm_gem_object *obj)
@@ -1443,7 +1470,7 @@ drm_gem_object_handle_unreference(struct drm_gem_object *obj)
 
 struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,
                                             struct drm_file *filp,
-                                            int handle);
+                                            u32 handle);
 int drm_gem_close_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h
new file mode 100644 (file)
index 0000000..7bfb063
--- /dev/null
@@ -0,0 +1,38 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Red Hat Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ **************************************************************************/
+/*
+ * Authors:
+ * Dave Airlie <airlied@redhat.com>
+ */
+
+#ifndef _DRM_CACHE_H_
+#define _DRM_CACHE_H_
+
+void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
+
+#endif
index 7300fb8..ae1e9e1 100644 (file)
@@ -259,6 +259,8 @@ struct drm_framebuffer {
        void *fbdev;
        u32 pseudo_palette[17];
        struct list_head filp_head;
+       /* if you are using the helper */
+       void *helper_private;
 };
 
 struct drm_property_blob {
@@ -572,6 +574,12 @@ struct drm_mode_config {
        struct drm_property *tv_right_margin_property;
        struct drm_property *tv_top_margin_property;
        struct drm_property *tv_bottom_margin_property;
+       struct drm_property *tv_brightness_property;
+       struct drm_property *tv_contrast_property;
+       struct drm_property *tv_flicker_reduction_property;
+       struct drm_property *tv_overscan_property;
+       struct drm_property *tv_saturation_property;
+       struct drm_property *tv_hue_property;
 
        /* Optional properties */
        struct drm_property *scaling_mode_property;
@@ -736,4 +744,12 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
 extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                                    void *data, struct drm_file *file_priv);
 extern bool drm_detect_hdmi_monitor(struct edid *edid);
+extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
+                               int hdisplay, int vdisplay, int vrefresh,
+                               bool reduced, bool interlaced);
+extern struct drm_display_mode *drm_gtf_mode(struct drm_device *dev,
+                               int hdisplay, int vdisplay, int vrefresh,
+                               bool interlaced, int margins);
+extern int drm_add_modes_noedid(struct drm_connector *connector,
+                               int hdisplay, int vdisplay);
 #endif /* __DRM_CRTC_H__ */
index 6769ff6..4c8daca 100644 (file)
@@ -79,6 +79,8 @@ struct drm_encoder_helper_funcs {
        /* detect for DAC style encoders */
        enum drm_connector_status (*detect)(struct drm_encoder *encoder,
                                            struct drm_connector *connector);
+       /* disable encoder when not in use - more explicit than dpms off */
+       void (*disable)(struct drm_encoder *encoder);
 };
 
 struct drm_connector_helper_funcs {
@@ -98,6 +100,7 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                                     int x, int y,
                                     struct drm_framebuffer *old_fb);
 extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
+extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
 
 extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode);
 
diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h
new file mode 100644 (file)
index 0000000..2f65633
--- /dev/null
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __DRM_ENCODER_SLAVE_H__
+#define __DRM_ENCODER_SLAVE_H__
+
+#include "drmP.h"
+#include "drm_crtc.h"
+
+/**
+ * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver
+ * @set_config:        Initialize any encoder-specific modesetting parameters.
+ *             The meaning of the @params parameter is implementation
+ *             dependent. It will usually be a structure with DVO port
+ *             data format settings or timings. It's not required for
+ *             the new parameters to take effect until the next mode
+ *             is set.
+ *
+ * Most of its members are analogous to the function pointers in
+ * &drm_encoder_helper_funcs and they can optionally be used to
+ * initialize the latter. Connector-like methods (e.g. @get_modes and
+ * @set_property) will typically be wrapped around and only be called
+ * if the encoder is the currently selected one for the connector.
+ */
+struct drm_encoder_slave_funcs {
+       void (*set_config)(struct drm_encoder *encoder,
+                          void *params);
+
+       void (*destroy)(struct drm_encoder *encoder);
+       void (*dpms)(struct drm_encoder *encoder, int mode);
+       void (*save)(struct drm_encoder *encoder);
+       void (*restore)(struct drm_encoder *encoder);
+       bool (*mode_fixup)(struct drm_encoder *encoder,
+                          struct drm_display_mode *mode,
+                          struct drm_display_mode *adjusted_mode);
+       int (*mode_valid)(struct drm_encoder *encoder,
+                         struct drm_display_mode *mode);
+       void (*mode_set)(struct drm_encoder *encoder,
+                        struct drm_display_mode *mode,
+                        struct drm_display_mode *adjusted_mode);
+
+       enum drm_connector_status (*detect)(struct drm_encoder *encoder,
+                                           struct drm_connector *connector);
+       int (*get_modes)(struct drm_encoder *encoder,
+                        struct drm_connector *connector);
+       int (*create_resources)(struct drm_encoder *encoder,
+                                struct drm_connector *connector);
+       int (*set_property)(struct drm_encoder *encoder,
+                           struct drm_connector *connector,
+                           struct drm_property *property,
+                           uint64_t val);
+
+};
+
+/**
+ * struct drm_encoder_slave - Slave encoder struct
+ * @base: DRM encoder object.
+ * @slave_funcs: Slave encoder callbacks.
+ * @slave_priv: Slave encoder private data.
+ * @bus_priv: Bus specific data.
+ *
+ * A &drm_encoder_slave has two sets of callbacks, @slave_funcs and the
+ * ones in @base. The former are never actually called by the common
+ * CRTC code, it's just a convenience for splitting the encoder
+ * functions in an upper, GPU-specific layer and a (hopefully)
+ * GPU-agnostic lower layer: It's the GPU driver responsibility to
+ * call the slave methods when appropriate.
+ *
+ * drm_i2c_encoder_init() provides a way to get an implementation of
+ * this.
+ */
+struct drm_encoder_slave {
+       struct drm_encoder base;
+
+       struct drm_encoder_slave_funcs *slave_funcs;
+       void *slave_priv;
+       void *bus_priv;
+};
+#define to_encoder_slave(x) container_of((x), struct drm_encoder_slave, base)
+
+int drm_i2c_encoder_init(struct drm_device *dev,
+                        struct drm_encoder_slave *encoder,
+                        struct i2c_adapter *adap,
+                        const struct i2c_board_info *info);
+
+
+/**
+ * struct drm_i2c_encoder_driver
+ *
+ * Describes a device driver for an encoder connected to the GPU
+ * through an I2C bus. In addition to the entry points in @i2c_driver
+ * an @encoder_init function should be provided. It will be called to
+ * give the driver an opportunity to allocate any per-encoder data
+ * structures and to initialize the @slave_funcs and (optionally)
+ * @slave_priv members of @encoder.
+ */
+struct drm_i2c_encoder_driver {
+       struct i2c_driver i2c_driver;
+
+       int (*encoder_init)(struct i2c_client *client,
+                           struct drm_device *dev,
+                           struct drm_encoder_slave *encoder);
+
+};
+#define to_drm_i2c_encoder_driver(x) container_of((x),                 \
+                                                 struct drm_i2c_encoder_driver, \
+                                                 i2c_driver)
+
+/**
+ * drm_i2c_encoder_get_client - Get the I2C client corresponding to an encoder
+ */
+static inline struct i2c_client *drm_i2c_encoder_get_client(struct drm_encoder *encoder)
+{
+       return (struct i2c_client *)to_encoder_slave(encoder)->bus_priv;
+}
+
+/**
+ * drm_i2c_encoder_register - Register an I2C encoder driver
+ * @owner:     Module containing the driver.
+ * @driver:    Driver to be registered.
+ */
+static inline int drm_i2c_encoder_register(struct module *owner,
+                                          struct drm_i2c_encoder_driver *driver)
+{
+       return i2c_register_driver(owner, &driver->i2c_driver);
+}
+
+/**
+ * drm_i2c_encoder_unregister - Unregister an I2C encoder driver
+ * @driver:    Driver to be unregistered.
+ */
+static inline void drm_i2c_encoder_unregister(struct drm_i2c_encoder_driver *driver)
+{
+       i2c_del_driver(&driver->i2c_driver);
+}
+
+void drm_i2c_encoder_destroy(struct drm_encoder *encoder);
+
+#endif
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
new file mode 100644 (file)
index 0000000..88fffbd
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2006-2009 Red Hat Inc.
+ * Copyright (c) 2006-2008 Intel Corporation
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
+ * DRM framebuffer helper functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@linux.ie>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+#ifndef DRM_FB_HELPER_H
+#define DRM_FB_HELPER_H
+
+struct drm_fb_helper_crtc {
+       uint32_t crtc_id;
+       struct drm_mode_set mode_set;
+};
+
+struct drm_fb_helper_funcs {
+       void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
+                         u16 blue, int regno);
+};
+
+struct drm_fb_helper {
+       struct drm_framebuffer *fb;
+       struct drm_device *dev;
+       struct drm_display_mode *mode;
+       int crtc_count;
+       struct drm_fb_helper_crtc *crtc_info;
+       struct drm_fb_helper_funcs *funcs;
+       int conn_limit;
+       struct list_head kernel_fb_list;
+};
+
+int drm_fb_helper_single_fb_probe(struct drm_device *dev,
+                                 int (*fb_create)(struct drm_device *dev,
+                                                  uint32_t fb_width,
+                                                  uint32_t fb_height,
+                                                  uint32_t surface_width,
+                                                  uint32_t surface_height,
+                                                  struct drm_framebuffer **fb_ptr));
+int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count,
+                                 int max_conn);
+void drm_fb_helper_free(struct drm_fb_helper *helper);
+int drm_fb_helper_blank(int blank, struct fb_info *info);
+int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info);
+int drm_fb_helper_set_par(struct fb_info *info);
+int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info);
+int drm_fb_helper_setcolreg(unsigned regno,
+                           unsigned red,
+                           unsigned green,
+                           unsigned blue,
+                           unsigned transp,
+                           struct fb_info *info);
+
+void drm_fb_helper_restore(void);
+void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
+                           uint32_t fb_width, uint32_t fb_height);
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch);
+
+#endif
index 63e425b..15af9b3 100644 (file)
@@ -44,8 +44,6 @@
 
 #if __OS_HAS_AGP
 
-#include <linux/vmalloc.h>
-
 #ifdef HAVE_PAGE_AGP
 #include <asm/agp.h>
 #else
index f833207..62329f9 100644 (file)
@@ -37,6 +37,9 @@
  * Generic range manager structs
  */
 #include <linux/list.h>
+#ifdef CONFIG_DEBUG_FS
+#include <linux/seq_file.h>
+#endif
 
 struct drm_mm_node {
        struct list_head fl_entry;
@@ -96,4 +99,8 @@ static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)
        return block->mm;
 }
 
+#ifdef CONFIG_DEBUG_FS
+int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm);
+#endif
+
 #endif
index ae304cc..1f90841 100644 (file)
 #define DRM_MODE_DPMS_OFF      3
 
 /* Scaling mode options */
-#define DRM_MODE_SCALE_NON_GPU         0
-#define DRM_MODE_SCALE_FULLSCREEN      1
-#define DRM_MODE_SCALE_NO_SCALE                2
-#define DRM_MODE_SCALE_ASPECT          3
+#define DRM_MODE_SCALE_NONE            0 /* Unmodified timing (display or
+                                            software can still scale) */
+#define DRM_MODE_SCALE_FULLSCREEN      1 /* Full screen, ignore aspect */
+#define DRM_MODE_SCALE_CENTER          2 /* Centered, no scaling */
+#define DRM_MODE_SCALE_ASPECT          3 /* Full screen, preserve aspect */
 
 /* Dithering mode options */
 #define DRM_MODE_DITHERING_OFF 0
@@ -141,6 +142,7 @@ struct drm_mode_get_encoder {
 #define DRM_MODE_SUBCONNECTOR_Composite        5
 #define DRM_MODE_SUBCONNECTOR_SVIDEO   6
 #define DRM_MODE_SUBCONNECTOR_Component        8
+#define DRM_MODE_SUBCONNECTOR_SCART    9
 
 #define DRM_MODE_CONNECTOR_Unknown     0
 #define DRM_MODE_CONNECTOR_VGA         1
@@ -155,6 +157,7 @@ struct drm_mode_get_encoder {
 #define DRM_MODE_CONNECTOR_DisplayPort 10
 #define DRM_MODE_CONNECTOR_HDMIA       11
 #define DRM_MODE_CONNECTOR_HDMIB       12
+#define DRM_MODE_CONNECTOR_TV          13
 
 struct drm_mode_get_connector {
 
diff --git a/include/drm/drm_sysfs.h b/include/drm/drm_sysfs.h
new file mode 100644 (file)
index 0000000..1d8e033
--- /dev/null
@@ -0,0 +1,12 @@
+#ifndef _DRM_SYSFS_H_
+#define _DRM_SYSFS_H_
+
+/**
+ * This minimalistic include file is intended for users (read TTM) that
+ * don't want to include the full drmP.h file.
+ */
+
+extern int drm_class_device_register(struct device *dev);
+extern void drm_class_device_unregister(struct device *dev);
+
+#endif
index 2ba61e1..3b9932a 100644 (file)
@@ -802,11 +802,12 @@ struct drm_radeon_gem_create {
        uint32_t        flags;
 };
 
-#define RADEON_TILING_MACRO 0x1
-#define RADEON_TILING_MICRO 0x2
-#define RADEON_TILING_SWAP  0x4
-#define RADEON_TILING_SURFACE  0x8 /* this object requires a surface
-                                   * when mapped - i.e. front buffer */
+#define RADEON_TILING_MACRO       0x1
+#define RADEON_TILING_MICRO       0x2
+#define RADEON_TILING_SWAP_16BIT  0x4
+#define RADEON_TILING_SWAP_32BIT  0x8
+#define RADEON_TILING_SURFACE     0x10 /* this object requires a surface
+                                       * when mapped - i.e. front buffer */
 
 struct drm_radeon_gem_set_tiling {
        uint32_t        handle;
@@ -899,6 +900,7 @@ struct drm_radeon_cs {
 #define RADEON_INFO_DEVICE_ID          0x00
 #define RADEON_INFO_NUM_GB_PIPES       0x01
 #define RADEON_INFO_NUM_Z_PIPES        0x02
+#define RADEON_INFO_ACCEL_WORKING      0x03
 
 struct drm_radeon_info {
        uint32_t                request;
index cd22ab4..4911461 100644 (file)
@@ -155,6 +155,7 @@ struct ttm_buffer_object {
         * Members constant at init.
         */
 
+       struct ttm_bo_global *glob;
        struct ttm_bo_device *bdev;
        unsigned long buffer_start;
        enum ttm_bo_type type;
@@ -245,14 +246,15 @@ struct ttm_buffer_object {
  * premapped region.
  */
 
+#define TTM_BO_MAP_IOMEM_MASK 0x80
 struct ttm_bo_kmap_obj {
        void *virtual;
        struct page *page;
        enum {
-               ttm_bo_map_iomap,
-               ttm_bo_map_vmap,
-               ttm_bo_map_kmap,
-               ttm_bo_map_premapped,
+               ttm_bo_map_iomap        = 1 | TTM_BO_MAP_IOMEM_MASK,
+               ttm_bo_map_vmap         = 2,
+               ttm_bo_map_kmap         = 3,
+               ttm_bo_map_premapped    = 4 | TTM_BO_MAP_IOMEM_MASK,
        } bo_kmap_type;
 };
 
@@ -522,8 +524,7 @@ extern int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type);
 static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map,
                                         bool *is_iomem)
 {
-       *is_iomem = (map->bo_kmap_type == ttm_bo_map_iomap ||
-                    map->bo_kmap_type == ttm_bo_map_premapped);
+       *is_iomem = !!(map->bo_kmap_type & TTM_BO_MAP_IOMEM_MASK);
        return map->virtual;
 }
 
index a68829d..e8cd6d2 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "ttm/ttm_bo_api.h"
 #include "ttm/ttm_memory.h"
+#include "ttm/ttm_module.h"
 #include "drm_mm.h"
 #include "linux/workqueue.h"
 #include "linux/fs.h"
@@ -161,7 +162,7 @@ struct ttm_tt {
        long last_lomem_page;
        uint32_t page_flags;
        unsigned long num_pages;
-       struct ttm_bo_device *bdev;
+       struct ttm_bo_global *glob;
        struct ttm_backend *be;
        struct task_struct *tsk;
        unsigned long start;
@@ -364,24 +365,73 @@ struct ttm_bo_driver {
        void (*fault_reserve_notify)(struct ttm_buffer_object *bo);
 };
 
-#define TTM_NUM_MEM_TYPES 8
+/**
+ * struct ttm_bo_global_ref - Argument to initialize a struct ttm_bo_global.
+ */
+
+struct ttm_bo_global_ref {
+       struct ttm_global_reference ref;
+       struct ttm_mem_global *mem_glob;
+};
 
-#define TTM_BO_PRIV_FLAG_MOVING  0     /* Buffer object is moving and needs
-                                          idling before CPU mapping */
-#define TTM_BO_PRIV_FLAG_MAX 1
 /**
- * struct ttm_bo_device - Buffer object driver device-specific data.
+ * struct ttm_bo_global - Buffer object driver global data.
  *
  * @mem_glob: Pointer to a struct ttm_mem_global object for accounting.
- * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
- * @count: Current number of buffer object.
- * @pages: Current number of pinned pages.
  * @dummy_read_page: Pointer to a dummy page used for mapping requests
  * of unpopulated pages.
- * @shrink: A shrink callback object used for buffre object swap.
+ * @shrink: A shrink callback object used for buffer object swap.
  * @ttm_bo_extra_size: Extra size (sizeof(struct ttm_buffer_object) excluded)
  * used by a buffer object. This is excluding page arrays and backing pages.
  * @ttm_bo_size: This is @ttm_bo_extra_size + sizeof(struct ttm_buffer_object).
+ * @device_list_mutex: Mutex protecting the device list.
+ * This mutex is held while traversing the device list for pm options.
+ * @lru_lock: Spinlock protecting the bo subsystem lru lists.
+ * @device_list: List of buffer object devices.
+ * @swap_lru: Lru list of buffer objects used for swapping.
+ */
+
+struct ttm_bo_global {
+
+       /**
+        * Constant after init.
+        */
+
+       struct kobject kobj;
+       struct ttm_mem_global *mem_glob;
+       struct page *dummy_read_page;
+       struct ttm_mem_shrink shrink;
+       size_t ttm_bo_extra_size;
+       size_t ttm_bo_size;
+       struct mutex device_list_mutex;
+       spinlock_t lru_lock;
+
+       /**
+        * Protected by device_list_mutex.
+        */
+       struct list_head device_list;
+
+       /**
+        * Protected by the lru_lock.
+        */
+       struct list_head swap_lru;
+
+       /**
+        * Internal protection.
+        */
+       atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0     /* Buffer object is moving and needs
+                                          idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
        /*
         * Constant after bo device init / atomic.
         */
-
-       struct ttm_mem_global *mem_glob;
+       struct list_head device_list;
+       struct ttm_bo_global *glob;
        struct ttm_bo_driver *driver;
-       struct page *dummy_read_page;
-       struct ttm_mem_shrink shrink;
-
-       size_t ttm_bo_extra_size;
-       size_t ttm_bo_size;
-
        rwlock_t vm_lock;
+       struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
        /*
         * Protected by the vm lock.
         */
-       struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
        struct rb_root addr_space_rb;
        struct drm_mm addr_space_mm;
 
        /*
-        * Might want to change this to one lock per manager.
-        */
-       spinlock_t lru_lock;
-       /*
-        * Protected by the lru lock.
+        * Protected by the global:lru lock.
         */
        struct list_head ddestroy;
-       struct list_head swap_lru;
 
        /*
         * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
                             unsigned long *bus_offset,
                             unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-                             struct ttm_mem_global *mem_glob,
+                             struct ttm_bo_global *glob,
                              struct ttm_bo_driver *driver,
                              uint64_t file_page_offset, bool need_dma32);
 
index d8b8f04..6983a7c 100644 (file)
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+       struct kobject kobj;
        struct ttm_mem_shrink *shrink;
        struct workqueue_struct *swap_queue;
        struct work_struct work;
        wait_queue_head_t queue;
        spinlock_t lock;
-       uint64_t emer_memory;
-       uint64_t max_memory;
-       uint64_t swap_limit;
-       uint64_t used_memory;
-       uint64_t used_total_memory;
-       uint64_t total_memory_swap_limit;
-       uint64_t max_total_memory;
-       uint64_t emer_total_memory;
+       struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+       unsigned int num_zones;
+       struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+       struct ttm_mem_zone *zone_highmem;
+#else
+       struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-                               bool no_wait, bool interruptible, bool himem);
+                               bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-                               uint64_t amount, bool himem);
+                               uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+                                    struct page *page,
+                                    bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+                                    struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
index d1d4338..cf416ae 100644 (file)
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */
index 3fce811..dfcd920 100644 (file)
@@ -41,8 +41,6 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
 #include <asm/acpi.h>
-#include <linux/dmi.h>
-
 
 enum acpi_irq_model_id {
        ACPI_IRQ_MODEL_PIC = 0,
@@ -219,10 +217,8 @@ static inline int acpi_video_display_switch_support(void)
 #endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */
 
 extern int acpi_blacklisted(void);
-#ifdef CONFIG_DMI
 extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
 extern int acpi_osi_setup(char *str);
-#endif
 
 #ifdef CONFIG_ACPI_NUMA
 int acpi_get_pxm(acpi_handle handle);
index 47f7d93..aea219d 100644 (file)
@@ -225,8 +225,6 @@ static inline void exit_aio(struct mm_struct *mm) { }
 
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
 
-#include <linux/aio_abi.h>
-
 static inline struct kiocb *list_kiocb(struct list_head *h)
 {
        return list_entry(h, struct kiocb, ki_list);
index e0a0cdc..69a21e0 100644 (file)
@@ -8,6 +8,9 @@
 #ifndef _LINUX_ANON_INODES_H
 #define _LINUX_ANON_INODES_H
 
+struct file *anon_inode_getfile(const char *name,
+                               const struct file_operations *fops,
+                               void *priv, int flags);
 int anon_inode_getfd(const char *name, const struct file_operations *fops,
                     void *priv, int flags);
 
index bc3ab70..dd97fb8 100644 (file)
@@ -132,9 +132,6 @@ static inline void *alloc_remap(int nid, unsigned long size)
 }
 #endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
 
-extern unsigned long __meminitdata nr_kernel_pages;
-extern unsigned long __meminitdata nr_all_pages;
-
 extern void *alloc_large_system_hash(const char *tablename,
                                     unsigned long bucketsize,
                                     unsigned long numentries,
@@ -145,6 +142,8 @@ extern void *alloc_large_system_hash(const char *tablename,
                                     unsigned long limit);
 
 #define HASH_EARLY     0x00000001      /* Allocating during early boot? */
+#define HASH_SMALL     0x00000002      /* sub-page allocation allowed, min
+                                        * shift passed via *_hash_shift */
 
 /* Only NUMA needs hash distribution. 64bit NUMA architectures have
  * sufficient vmalloc space.
index c302110..c8f2a5f 100644 (file)
@@ -7,7 +7,7 @@
  *
  * See here for the libcap library ("POSIX draft" compliance):
  *
- * ftp://linux.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+ * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
  */
 
 #ifndef _LINUX_CAPABILITY_H
index b8125b2..47dac5e 100644 (file)
@@ -52,6 +52,7 @@ struct proc_event {
                PROC_EVENT_EXEC = 0x00000002,
                PROC_EVENT_UID  = 0x00000004,
                PROC_EVENT_GID  = 0x00000040,
+               PROC_EVENT_SID  = 0x00000080,
                /* "next" should be 0x00000400 */
                /* "last" is the last process event: exit */
                PROC_EVENT_EXIT = 0x80000000
@@ -89,6 +90,11 @@ struct proc_event {
                        } e;
                } id;
 
+               struct sid_proc_event {
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
+               } sid;
+
                struct exit_proc_event {
                        __kernel_pid_t process_pid;
                        __kernel_pid_t process_tgid;
@@ -102,6 +108,7 @@ struct proc_event {
 void proc_fork_connector(struct task_struct *task);
 void proc_exec_connector(struct task_struct *task);
 void proc_id_connector(struct task_struct *task, int which_id);
+void proc_sid_connector(struct task_struct *task);
 void proc_exit_connector(struct task_struct *task);
 #else
 static inline void proc_fork_connector(struct task_struct *task)
@@ -114,6 +121,9 @@ static inline void proc_id_connector(struct task_struct *task,
                                     int which_id)
 {}
 
+static inline void proc_sid_connector(struct task_struct *task)
+{}
+
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif /* CONFIG_PROC_EVENTS */
index 796df12..9b1d458 100644 (file)
@@ -714,6 +714,18 @@ static inline int cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)
        return test_and_set_bit(cpumask_check(cpu), cpumask_bits(cpumask));
 }
 
+/**
+ * cpumask_test_and_clear_cpu - atomically test and clear a cpu in a cpumask
+ * @cpu: cpu number (< nr_cpu_ids)
+ * @cpumask: the cpumask pointer
+ *
+ * test_and_clear_bit wrapper for cpumasks.
+ */
+static inline int cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)
+{
+       return test_and_clear_bit(cpumask_check(cpu), cpumask_bits(cpumask));
+}
+
 /**
  * cpumask_setall - set all cpus (< nr_cpu_ids) in a cpumask
  * @dstp: the cpumask pointer
index 1fbdea4..a5049ea 100644 (file)
@@ -499,6 +499,7 @@ struct cyclades_card {
                void __iomem *p9050;
                struct RUNTIME_9060 __iomem *p9060;
        } ctl_addr;
+       struct BOARD_CTRL __iomem *board_ctrl;  /* cyz specific */
        int irq;
        unsigned int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */
        unsigned int first_line;        /* minor number of first channel on card */
@@ -541,6 +542,15 @@ struct cyclades_port {
        int                     magic;
        struct tty_port         port;
        struct cyclades_card    *card;
+       union {
+               struct {
+                       void __iomem *base_addr;
+               } cyy;
+               struct {
+                       struct CH_CTRL __iomem  *ch_ctrl;
+                       struct BUF_CTRL __iomem *buf_ctrl;
+               } cyz;
+       } u;
        int                     line;
        int                     flags;          /* defined in tty.h */
        int                     type;           /* UART type */
@@ -568,7 +578,6 @@ struct cyclades_port {
        struct cyclades_idle_stats      idle_stats;
        struct cyclades_icount  icount;
        struct completion       shutdown_wait;
-       wait_queue_head_t       delta_msr_wait;
        int throttle;
 };
 
index 847b763..aca31bf 100644 (file)
@@ -193,7 +193,7 @@ struct class {
        struct kobject                  *dev_kobj;
 
        int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
-       char *(*nodename)(struct device *dev);
+       char *(*devnode)(struct device *dev, mode_t *mode);
 
        void (*class_release)(struct class *class);
        void (*dev_release)(struct device *dev);
@@ -298,7 +298,7 @@ struct device_type {
        const char *name;
        const struct attribute_group **groups;
        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
-       char *(*nodename)(struct device *dev);
+       char *(*devnode)(struct device *dev, mode_t *mode);
        void (*release)(struct device *dev);
 
        const struct dev_pm_ops *pm;
@@ -487,7 +487,8 @@ extern struct device *device_find_child(struct device *dev, void *data,
 extern int device_rename(struct device *dev, char *new_name);
 extern int device_move(struct device *dev, struct device *new_parent,
                       enum dpm_order dpm_order);
-extern const char *device_get_nodename(struct device *dev, const char **tmp);
+extern const char *device_get_devnode(struct device *dev,
+                                     mode_t *mode, const char **tmp);
 extern void *dev_get_drvdata(const struct device *dev);
 extern void dev_set_drvdata(struct device *dev, void *data);
 
index 51c8d2d..b6cb542 100644 (file)
@@ -173,7 +173,8 @@ typedef enum fe_modulation {
 typedef enum fe_transmit_mode {
        TRANSMISSION_MODE_2K,
        TRANSMISSION_MODE_8K,
-       TRANSMISSION_MODE_AUTO
+       TRANSMISSION_MODE_AUTO,
+       TRANSMISSION_MODE_4K
 } fe_transmit_mode_t;
 
 typedef enum fe_bandwidth {
@@ -268,15 +269,42 @@ struct dvb_frontend_event {
 #define DTV_FE_CAPABILITY      16
 #define DTV_DELIVERY_SYSTEM    17
 
-#define DTV_API_VERSION                                35
-#define DTV_API_VERSION                                35
-#define DTV_CODE_RATE_HP                       36
-#define DTV_CODE_RATE_LP                       37
-#define DTV_GUARD_INTERVAL                     38
-#define DTV_TRANSMISSION_MODE                  39
-#define DTV_HIERARCHY                          40
+/* ISDB-T and ISDB-Tsb */
+#define DTV_ISDBT_PARTIAL_RECEPTION    18
+#define DTV_ISDBT_SOUND_BROADCASTING   19
 
-#define DTV_MAX_COMMAND                                DTV_HIERARCHY
+#define DTV_ISDBT_SB_SUBCHANNEL_ID     20
+#define DTV_ISDBT_SB_SEGMENT_IDX       21
+#define DTV_ISDBT_SB_SEGMENT_COUNT     22
+
+#define DTV_ISDBT_LAYERA_FEC                   23
+#define DTV_ISDBT_LAYERA_MODULATION            24
+#define DTV_ISDBT_LAYERA_SEGMENT_COUNT         25
+#define DTV_ISDBT_LAYERA_TIME_INTERLEAVING     26
+
+#define DTV_ISDBT_LAYERB_FEC                   27
+#define DTV_ISDBT_LAYERB_MODULATION            28
+#define DTV_ISDBT_LAYERB_SEGMENT_COUNT         29
+#define DTV_ISDBT_LAYERB_TIME_INTERLEAVING     30
+
+#define DTV_ISDBT_LAYERC_FEC                   31
+#define DTV_ISDBT_LAYERC_MODULATION            32
+#define DTV_ISDBT_LAYERC_SEGMENT_COUNT         33
+#define DTV_ISDBT_LAYERC_TIME_INTERLEAVING     34
+
+#define DTV_API_VERSION                35
+
+#define DTV_CODE_RATE_HP       36
+#define DTV_CODE_RATE_LP       37
+#define DTV_GUARD_INTERVAL     38
+#define DTV_TRANSMISSION_MODE  39
+#define DTV_HIERARCHY          40
+
+#define DTV_ISDBT_LAYER_ENABLED        41
+
+#define DTV_ISDBS_TS_ID                42
+
+#define DTV_MAX_COMMAND                                DTV_ISDBS_TS_ID
 
 typedef enum fe_pilot {
        PILOT_ON,
index 25b823b..540b058 100644 (file)
@@ -24,6 +24,6 @@
 #define _DVBVERSION_H_
 
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 0
+#define DVB_API_VERSION_MINOR 1
 
 #endif /*_DVBVERSION_H_*/
index 3b85ba6..94dd103 100644 (file)
@@ -27,6 +27,7 @@
 
 #ifdef CONFIG_EVENTFD
 
+struct file *eventfd_file_create(unsigned int count, int flags);
 struct eventfd_ctx *eventfd_ctx_get(struct eventfd_ctx *ctx);
 void eventfd_ctx_put(struct eventfd_ctx *ctx);
 struct file *eventfd_fget(int fd);
@@ -40,6 +41,11 @@ int eventfd_signal(struct eventfd_ctx *ctx, int n);
  * Ugly ugly ugly error layer to support modules that uses eventfd but
  * pretend to work in !CONFIG_EVENTFD configurations. Namely, AIO.
  */
+static inline struct file *eventfd_file_create(unsigned int count, int flags)
+{
+       return ERR_PTR(-ENOSYS);
+}
+
 static inline struct eventfd_ctx *eventfd_ctx_fdget(int fd)
 {
        return ERR_PTR(-ENOSYS);
index 45ff184..1d747f7 100644 (file)
@@ -31,10 +31,32 @@ struct flex_array {
        };
 };
 
-#define FLEX_ARRAY_INIT(size, total) { { {\
-       .element_size = (size),         \
-       .total_nr_elements = (total),   \
-} } }
+/* Number of bytes left in base struct flex_array, excluding metadata */
+#define FLEX_ARRAY_BASE_BYTES_LEFT                                     \
+       (FLEX_ARRAY_BASE_SIZE - offsetof(struct flex_array, parts))
+
+/* Number of pointers in base to struct flex_array_part pages */
+#define FLEX_ARRAY_NR_BASE_PTRS                                                \
+       (FLEX_ARRAY_BASE_BYTES_LEFT / sizeof(struct flex_array_part *))
+
+/* Number of elements of size that fit in struct flex_array_part */
+#define FLEX_ARRAY_ELEMENTS_PER_PART(size)                             \
+       (FLEX_ARRAY_PART_SIZE / size)
+
+/*
+ * Defines a statically allocated flex array and ensures its parameters are
+ * valid.
+ */
+#define DEFINE_FLEX_ARRAY(__arrayname, __element_size, __total)                \
+       struct flex_array __arrayname = { { {                           \
+               .element_size = (__element_size),                       \
+               .total_nr_elements = (__total),                         \
+       } } };                                                          \
+       static inline void __arrayname##_invalid_parameter(void)        \
+       {                                                               \
+               BUILD_BUG_ON((__total) > FLEX_ARRAY_NR_BASE_PTRS *      \
+                       FLEX_ARRAY_ELEMENTS_PER_PART(__element_size));  \
+       }
 
 struct flex_array *flex_array_alloc(int element_size, unsigned int total,
                gfp_t flags);
@@ -44,6 +66,8 @@ void flex_array_free(struct flex_array *fa);
 void flex_array_free_parts(struct flex_array *fa);
 int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
                gfp_t flags);
+int flex_array_clear(struct flex_array *fa, unsigned int element_nr);
 void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
+int flex_array_shrink(struct flex_array *fa);
 
 #endif /* _FLEX_ARRAY_H */
index 90162fb..5180352 100644 (file)
@@ -1066,8 +1066,8 @@ struct file_lock {
        struct fasync_struct *  fl_fasync; /* for lease break notifications */
        unsigned long fl_break_time;    /* for nonblocking lease breaks */
 
-       struct file_lock_operations *fl_ops;    /* Callbacks for filesystems */
-       struct lock_manager_operations *fl_lmops;       /* Callbacks for lockmanagers */
+       const struct file_lock_operations *fl_ops;      /* Callbacks for filesystems */
+       const struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */
        union {
                struct nfs_lock_info    nfs_fl;
                struct nfs4_lock_info   nfs4_fl;
@@ -1318,8 +1318,8 @@ struct super_block {
        unsigned long long      s_maxbytes;     /* Max file size */
        struct file_system_type *s_type;
        const struct super_operations   *s_op;
-       struct dquot_operations *dq_op;
-       struct quotactl_ops     *s_qcop;
+       const struct dquot_operations   *dq_op;
+       const struct quotactl_ops       *s_qcop;
        const struct export_operations *s_export_op;
        unsigned long           s_flags;
        unsigned long           s_magic;
index dc3b132..3c0924a 100644 (file)
@@ -446,7 +446,6 @@ static inline void unpause_graph_tracing(void) { }
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
 #ifdef CONFIG_TRACING
-#include <linux/sched.h>
 
 /* flags for current->trace */
 enum {
index bd099ba..4ec5e67 100644 (file)
@@ -4,6 +4,7 @@
 #include <linux/ring_buffer.h>
 #include <linux/trace_seq.h>
 #include <linux/percpu.h>
+#include <linux/hardirq.h>
 
 struct trace_array;
 struct tracer;
@@ -130,10 +131,15 @@ struct ftrace_event_call {
        void                    *data;
 
        atomic_t                profile_count;
-       int                     (*profile_enable)(struct ftrace_event_call *);
-       void                    (*profile_disable)(struct ftrace_event_call *);
+       int                     (*profile_enable)(void);
+       void                    (*profile_disable)(void);
 };
 
+#define FTRACE_MAX_PROFILE_SIZE        2048
+
+extern char                    *trace_profile_buf;
+extern char                    *trace_profile_buf_nmi;
+
 #define MAX_FILTER_PRED                32
 #define MAX_FILTER_STR_VAL     256     /* Should handle KSYM_SYMBOL_LEN */
 
index 44263cb..297df45 100644 (file)
@@ -142,7 +142,7 @@ struct gendisk {
                                          * disks that can't be partitioned. */
 
        char disk_name[DISK_NAME_LEN];  /* name of major driver */
-       char *(*nodename)(struct gendisk *gd);
+       char *(*devnode)(struct gendisk *gd, mode_t *mode);
        /* Array of pointers to partitions indexed by partno.
         * Protected with matching bdev lock but stat and other
         * non-critical accesses use RCU.  Always access through
@@ -151,7 +151,7 @@ struct gendisk {
        struct disk_part_tbl *part_tbl;
        struct hd_struct part0;
 
-       struct block_device_operations *fops;
+       const struct block_device_operations *fops;
        struct request_queue *queue;
        void *private_data;
 
index 7c777a0..557bdad 100644 (file)
@@ -220,7 +220,7 @@ static inline enum zone_type gfp_zone(gfp_t flags)
                                         ((1 << ZONES_SHIFT) - 1);
 
        if (__builtin_constant_p(bit))
-               BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
+               MAYBE_BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
        else {
 #ifdef CONFIG_DEBUG_VM
                BUG_ON((GFP_ZONE_BAD >> bit) & 1);
@@ -326,7 +326,6 @@ void free_pages_exact(void *virt, size_t size);
 extern void __free_pages(struct page *page, unsigned int order);
 extern void free_pages(unsigned long addr, unsigned int order);
 extern void free_hot_page(struct page *page);
-extern void free_cold_page(struct page *page);
 
 #define __free_page(page) __free_pages((page), 0)
 #define free_page(addr) free_pages((addr),0)
@@ -336,18 +335,6 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);
 void drain_all_pages(void);
 void drain_local_pages(void *dummy);
 
-extern bool oom_killer_disabled;
-
-static inline void oom_killer_disable(void)
-{
-       oom_killer_disabled = true;
-}
-
-static inline void oom_killer_enable(void)
-{
-       oom_killer_disabled = false;
-}
-
 extern gfp_t gfp_allowed_mask;
 
 static inline void set_gfp_allowed_mask(gfp_t mask)
index e10c49a..059bd18 100644 (file)
@@ -12,6 +12,8 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 
+struct device;
+
 /*
  * Some platforms don't support the GPIO programming interface.
  *
@@ -89,6 +91,15 @@ static inline int gpio_export(unsigned gpio, bool direction_may_change)
        return -EINVAL;
 }
 
+static inline int gpio_export_link(struct device *dev, const char *name,
+                               unsigned gpio)
+{
+       /* GPIO can never have been exported */
+       WARN_ON(1);
+       return -EINVAL;
+}
+
+
 static inline void gpio_unexport(unsigned gpio)
 {
        /* GPIO can never have been exported */
index 940aeb5..92b08cf 100644 (file)
@@ -96,7 +96,6 @@ struct esp_struct {
        int                     xmit_head;
        int                     xmit_tail;
        int                     xmit_cnt;
-       wait_queue_head_t       delta_msr_wait;
        wait_queue_head_t       break_wait;
        struct async_icount     icount; /* kernel counters for the 4 input interrupts */
        struct hayes_esp_config config; /* port configuration */
index a0ebdac..10f6284 100644 (file)
@@ -494,6 +494,7 @@ struct hid_device {                                                 /* device report descriptor */
 
        /* hiddev event handler */
        int (*hiddev_connect)(struct hid_device *, unsigned int);
+       void (*hiddev_disconnect)(struct hid_device *);
        void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
                                  struct hid_usage *, __s32);
        void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
@@ -691,6 +692,7 @@ struct hid_device *hid_allocate_device(void);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
 int hid_check_keys_pressed(struct hid_device *hid);
 int hid_connect(struct hid_device *hid, unsigned int connect_mask);
+void hid_disconnect(struct hid_device *hid);
 
 /**
  * hid_map_usage - map usage input bits
@@ -800,6 +802,7 @@ static inline int __must_check hid_hw_start(struct hid_device *hdev,
  */
 static inline void hid_hw_stop(struct hid_device *hdev)
 {
+       hid_disconnect(hdev);
        hdev->ll_driver->stop(hdev);
 }
 
index 5cbc620..176e7ee 100644 (file)
@@ -24,7 +24,9 @@ int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void __user *
 int hugetlb_overcommit_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *);
 int hugetlb_treat_movable_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *);
 int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *);
-int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, struct page **, struct vm_area_struct **, unsigned long *, int *, int, int);
+int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *,
+                       struct page **, struct vm_area_struct **,
+                       unsigned long *, int *, int, unsigned int flags);
 void unmap_hugepage_range(struct vm_area_struct *,
                        unsigned long, unsigned long, struct page *);
 void __unmap_hugepage_range(struct vm_area_struct *,
@@ -110,6 +112,21 @@ static inline void hugetlb_report_meminfo(struct seq_file *m)
 
 #endif /* !CONFIG_HUGETLB_PAGE */
 
+#define HUGETLB_ANON_FILE "anon_hugepage"
+
+enum {
+       /*
+        * The file will be used as an shm file so shmfs accounting rules
+        * apply
+        */
+       HUGETLB_SHMFS_INODE     = 1,
+       /*
+        * The file is being created on the internal vfs mount and shmfs
+        * accounting rules do not apply
+        */
+       HUGETLB_ANONHUGE_INODE  = 2,
+};
+
 #ifdef CONFIG_HUGETLBFS
 struct hugetlbfs_config {
        uid_t   uid;
@@ -148,7 +165,7 @@ static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb)
 extern const struct file_operations hugetlbfs_file_operations;
 extern struct vm_operations_struct hugetlb_vm_ops;
 struct file *hugetlb_file_setup(const char *name, size_t size, int acct,
-                                               struct user_struct **user);
+                               struct user_struct **user, int creat_flags);
 int hugetlb_get_quota(struct address_space *mapping, long delta);
 void hugetlb_put_quota(struct address_space *mapping, long delta);
 
@@ -170,7 +187,7 @@ static inline void set_file_hugepages(struct file *file)
 
 #define is_file_hugepages(file)                        0
 #define set_file_hugepages(file)               BUG()
-#define hugetlb_file_setup(name,size,acct,user)        ERR_PTR(-ENOSYS)
+#define hugetlb_file_setup(name,size,acct,user,creat)  ERR_PTR(-ENOSYS)
 
 #endif /* !CONFIG_HUGETLBFS */
 
@@ -185,7 +202,8 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
 #define HSTATE_NAME_LEN 32
 /* Defines one hugetlb page size */
 struct hstate {
-       int hugetlb_next_nid;
+       int next_nid_to_alloc;
+       int next_nid_to_free;
        unsigned int order;
        unsigned long mask;
        unsigned long max_huge_pages;
index c9087de..e844a0b 100644 (file)
    legacy chip driver needs to identify a bus or a bus driver needs to
    identify a legacy client. If you don't need them, just don't set them. */
 
-/*
- * ---- Driver types -----------------------------------------------------
- */
-
-#define I2C_DRIVERID_MSP3400    1
-#define I2C_DRIVERID_TUNER      2
-#define I2C_DRIVERID_TDA7432   27      /* Stereo sound processor       */
-#define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_SAA711X   73      /* saa711x video encoders       */
-#define I2C_DRIVERID_INFRARED  75      /* I2C InfraRed on Video boards */
-
 /*
  * ---- Adapter types ----------------------------------------------------
  */
index f4784c0..57d41b0 100644 (file)
@@ -98,7 +98,6 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
 
 /**
  * struct i2c_driver - represent an I2C device driver
- * @id: Unique driver ID (optional)
  * @class: What kind of i2c device we instantiate (for detect)
  * @attach_adapter: Callback for bus addition (for legacy drivers)
  * @detach_adapter: Callback for bus removal (for legacy drivers)
@@ -135,7 +134,6 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
  * not allowed.
  */
 struct i2c_driver {
-       int id;
        unsigned int class;
 
        /* Notifies the driver that a new bus has appeared or is about to be
index 9e7f2e8..21a6f5d 100644 (file)
@@ -106,13 +106,13 @@ extern struct group_info init_groups;
 
 extern struct cred init_cred;
 
-#ifdef CONFIG_PERF_COUNTERS
-# define INIT_PERF_COUNTERS(tsk)                                       \
-       .perf_counter_mutex =                                           \
-                __MUTEX_INITIALIZER(tsk.perf_counter_mutex),           \
-       .perf_counter_list = LIST_HEAD_INIT(tsk.perf_counter_list),
+#ifdef CONFIG_PERF_EVENTS
+# define INIT_PERF_EVENTS(tsk)                                 \
+       .perf_event_mutex =                                             \
+                __MUTEX_INITIALIZER(tsk.perf_event_mutex),             \
+       .perf_event_list = LIST_HEAD_INIT(tsk.perf_event_list),
 #else
-# define INIT_PERF_COUNTERS(tsk)
+# define INIT_PERF_EVENTS(tsk)
 #endif
 
 /*
@@ -178,7 +178,7 @@ extern struct cred init_cred;
        },                                                              \
        .dirties = INIT_PROP_LOCAL_SINGLE(dirties),                     \
        INIT_IDS                                                        \
-       INIT_PERF_COUNTERS(tsk)                                         \
+       INIT_PERF_EVENTS(tsk)                                           \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
        INIT_FTRACE_GRAPH                                               \
index 786e7b8..83aa812 100644 (file)
@@ -184,5 +184,9 @@ extern void __devm_release_region(struct device *dev, struct resource *parent,
 extern int iomem_map_sanity_check(resource_size_t addr, unsigned long size);
 extern int iomem_is_exclusive(u64 addr);
 
+extern int
+walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
+               void *arg, int (*func)(unsigned long, unsigned long, void *));
+
 #endif /* __ASSEMBLY__ */
 #endif /* _LINUX_IOPORT_H */
index a1187a0..331530c 100644 (file)
@@ -556,7 +556,7 @@ struct transaction_s
         * This transaction is being forced and some process is
         * waiting for it to finish.
         */
-       int t_synchronous_commit:1;
+       unsigned int t_synchronous_commit:1;
 };
 
 /**
index 2b5b1e0..d3cd23f 100644 (file)
@@ -146,7 +146,7 @@ extern int _cond_resched(void);
 #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)
 
 #define abs(x) ({                              \
-               int __x = (x);                  \
+               long __x = (x);                 \
                (__x < 0) ? -__x : __x;         \
        })
 
@@ -246,14 +246,16 @@ extern int printk_ratelimit(void);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
                                   unsigned int interval_msec);
 
+extern int printk_delay_msec;
+
 /*
  * Print a one-time message (analogous to WARN_ONCE() et al):
  */
 #define printk_once(x...) ({                   \
-       static int __print_once = 1;            \
+       static bool __print_once = true;        \
                                                \
        if (__print_once) {                     \
-               __print_once = 0;               \
+               __print_once = false;           \
                printk(x);                      \
        }                                       \
 })
@@ -676,13 +678,17 @@ struct sysinfo {
 };
 
 /* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition))
+
+/* Force a compilation error if condition is constant and true */
+#define MAYBE_BUILD_BUG_ON(cond) ((void)sizeof(char[1 - 2 * !!(cond)]))
 
 /* Force a compilation error if condition is true, but also produce a
    result (of value 0 and type size_t), so the expression can be used
    e.g. in a structure initializer (or where-ever else comma expressions
    aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1)
+#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)
index 29f62e1..ad6bdf5 100644 (file)
@@ -38,7 +38,7 @@ extern struct kfifo *kfifo_alloc(unsigned int size, gfp_t gfp_mask,
                                 spinlock_t *lock);
 extern void kfifo_free(struct kfifo *fifo);
 extern unsigned int __kfifo_put(struct kfifo *fifo,
-                               unsigned char *buffer, unsigned int len);
+                               const unsigned char *buffer, unsigned int len);
 extern unsigned int __kfifo_get(struct kfifo *fifo,
                                unsigned char *buffer, unsigned int len);
 
@@ -77,7 +77,7 @@ static inline void kfifo_reset(struct kfifo *fifo)
  * bytes copied.
  */
 static inline unsigned int kfifo_put(struct kfifo *fifo,
-                                    unsigned char *buffer, unsigned int len)
+                               const unsigned char *buffer, unsigned int len)
 {
        unsigned long flags;
        unsigned int ret;
index dc2fd54..e880d4c 100644 (file)
@@ -144,10 +144,15 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
        int name##_end[0];
 
 #define kmemcheck_annotate_bitfield(ptr, name)                         \
-       do if (ptr) {                                                   \
-               int _n = (long) &((ptr)->name##_end)                    \
+       do {                                                            \
+               int _n;                                                 \
+                                                                       \
+               if (!ptr)                                               \
+                       break;                                          \
+                                                                       \
+               _n = (long) &((ptr)->name##_end)                        \
                        - (long) &((ptr)->name##_begin);                \
-               BUILD_BUG_ON(_n < 0);                                   \
+               MAYBE_BUILD_BUG_ON(_n < 0);                             \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
        } while (0)
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
new file mode 100644 (file)
index 0000000..a485c14
--- /dev/null
@@ -0,0 +1,79 @@
+#ifndef __LINUX_KSM_H
+#define __LINUX_KSM_H
+/*
+ * Memory merging support.
+ *
+ * This code enables dynamic sharing of identical pages found in different
+ * memory areas, even if they are not shared by fork().
+ */
+
+#include <linux/bitops.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/vmstat.h>
+
+#ifdef CONFIG_KSM
+int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
+               unsigned long end, int advice, unsigned long *vm_flags);
+int __ksm_enter(struct mm_struct *mm);
+void __ksm_exit(struct mm_struct *mm);
+
+static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+       if (test_bit(MMF_VM_MERGEABLE, &oldmm->flags))
+               return __ksm_enter(mm);
+       return 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm)
+{
+       if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
+               __ksm_exit(mm);
+}
+
+/*
+ * A KSM page is one of those write-protected "shared pages" or "merged pages"
+ * which KSM maps into multiple mms, wherever identical anonymous page content
+ * is found in VM_MERGEABLE vmas.  It's a PageAnon page, with NULL anon_vma.
+ */
+static inline int PageKsm(struct page *page)
+{
+       return ((unsigned long)page->mapping == PAGE_MAPPING_ANON);
+}
+
+/*
+ * But we have to avoid the checking which page_add_anon_rmap() performs.
+ */
+static inline void page_add_ksm_rmap(struct page *page)
+{
+       if (atomic_inc_and_test(&page->_mapcount)) {
+               page->mapping = (void *) PAGE_MAPPING_ANON;
+               __inc_zone_page_state(page, NR_ANON_PAGES);
+       }
+}
+#else  /* !CONFIG_KSM */
+
+static inline int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
+               unsigned long end, int advice, unsigned long *vm_flags)
+{
+       return 0;
+}
+
+static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+       return 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm)
+{
+}
+
+static inline int PageKsm(struct page *page)
+{
+       return 0;
+}
+
+/* No stub required for page_add_ksm_rmap(page) */
+#endif /* !CONFIG_KSM */
+
+#endif
index 4af5603..b7bbb5d 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/preempt.h>
-#include <linux/marker.h>
 #include <linux/msi.h>
 #include <asm/signal.h>
 
index ad651f4..3cc2f2c 100644 (file)
@@ -32,8 +32,17 @@ struct lis3lv02d_platform_data {
 #define LIS3_IRQ2_DATA_READY   (4 << 3)
 #define LIS3_IRQ2_CLICK                (7 << 3)
 #define LIS3_IRQ_OPEN_DRAIN    (1 << 6)
-#define LIS3_IRQ_ACTIVE_HIGH   (1 << 7)
+#define LIS3_IRQ_ACTIVE_LOW    (1 << 7)
        unsigned char irq_cfg;
+
+#define LIS3_WAKEUP_X_LO       (1 << 0)
+#define LIS3_WAKEUP_X_HI       (1 << 1)
+#define LIS3_WAKEUP_Y_LO       (1 << 2)
+#define LIS3_WAKEUP_Y_HI       (1 << 3)
+#define LIS3_WAKEUP_Z_LO       (1 << 4)
+#define LIS3_WAKEUP_Z_HI       (1 << 5)
+       unsigned char wakeup_flags;
+       unsigned char wakeup_thresh;
 };
 
 #endif /* __LIS3LV02D_H_ */
index c325b18..a34dea4 100644 (file)
@@ -338,49 +338,6 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp)
        }
 }
 
-static inline int __nlm_cmp_addr4(const struct sockaddr *sap1,
-                                 const struct sockaddr *sap2)
-{
-       const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
-       const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
-       return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
-}
-
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
-                                 const struct sockaddr *sap2)
-{
-       const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
-       const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
-       return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
-}
-#else  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
-static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
-                                 const struct sockaddr *sap2)
-{
-       return 0;
-}
-#endif /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
-
-/*
- * Compare two host addresses
- *
- * Return TRUE if the addresses are the same; otherwise FALSE.
- */
-static inline int nlm_cmp_addr(const struct sockaddr *sap1,
-                              const struct sockaddr *sap2)
-{
-       if (sap1->sa_family == sap2->sa_family) {
-               switch (sap1->sa_family) {
-               case AF_INET:
-                       return __nlm_cmp_addr4(sap1, sap2);
-               case AF_INET6:
-                       return __nlm_cmp_addr6(sap1, sap2);
-               }
-       }
-       return 0;
-}
-
 /*
  * Compare two NLM locks.
  * When the second lock is of type F_UNLCK, this acts like a wildcard.
@@ -395,7 +352,7 @@ static inline int nlm_compare_locks(const struct file_lock *fl1,
             &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);
 }
 
-extern struct lock_manager_operations nlmsvc_lock_operations;
+extern const struct lock_manager_operations nlmsvc_lock_operations;
 
 #endif /* __KERNEL__ */
 
index 536ca12..78c3bed 100644 (file)
 #define DL_UNITDATA_IND                0x3108
 #define DL_INFORMATION_IND     0x0008
 
-/* intern layer 2 managment */
+/* intern layer 2 management */
 #define MDL_ASSIGN_REQ         0x1804
 #define MDL_ASSIGN_IND         0x1904
 #define MDL_REMOVE_REQ         0x1A04
index 1923327..76285e0 100644 (file)
@@ -12,7 +12,9 @@
 #define SYSFS_MAGIC            0x62656572
 #define SECURITYFS_MAGIC       0x73636673
 #define SELINUX_MAGIC          0xf97cff8c
+#define RAMFS_MAGIC            0x858458f6      /* some random number */
 #define TMPFS_MAGIC            0x01021994
+#define HUGETLBFS_MAGIC        0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC         0x73717368
 #define EFS_SUPER_MAGIC                0x414A53
 #define EXT2_SUPER_MAGIC       0xEF53
@@ -53,4 +55,8 @@
 #define INOTIFYFS_SUPER_MAGIC  0x2BAD1DEA
 
 #define STACK_END_MAGIC                0x57AC6E9D
+
+#define DEVPTS_SUPER_MAGIC     0x1cd1
+#define SOCKFS_MAGIC           0x534F434B
+
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/include/linux/marker.h b/include/linux/marker.h
deleted file mode 100644 (file)
index b85e74c..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef _LINUX_MARKER_H
-#define _LINUX_MARKER_H
-
-/*
- * Code markup for dynamic and static tracing.
- *
- * See Documentation/marker.txt.
- *
- * (C) Copyright 2006 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
- */
-
-#include <stdarg.h>
-#include <linux/types.h>
-
-struct module;
-struct marker;
-
-/**
- * marker_probe_func - Type of a marker probe function
- * @probe_private: probe private data
- * @call_private: call site private data
- * @fmt: format string
- * @args: variable argument list pointer. Use a pointer to overcome C's
- *        inability to pass this around as a pointer in a portable manner in
- *        the callee otherwise.
- *
- * Type of marker probe functions. They receive the mdata and need to parse the
- * format string to recover the variable argument list.
- */
-typedef void marker_probe_func(void *probe_private, void *call_private,
-               const char *fmt, va_list *args);
-
-struct marker_probe_closure {
-       marker_probe_func *func;        /* Callback */
-       void *probe_private;            /* Private probe data */
-};
-
-struct marker {
-       const char *name;       /* Marker name */
-       const char *format;     /* Marker format string, describing the
-                                * variable argument list.
-                                */
-       char state;             /* Marker state. */
-       char ptype;             /* probe type : 0 : single, 1 : multi */
-                               /* Probe wrapper */
-       void (*call)(const struct marker *mdata, void *call_private, ...);
-       struct marker_probe_closure single;
-       struct marker_probe_closure *multi;
-       const char *tp_name;    /* Optional tracepoint name */
-       void *tp_cb;            /* Optional tracepoint callback */
-} __attribute__((aligned(8)));
-
-#ifdef CONFIG_MARKERS
-
-#define _DEFINE_MARKER(name, tp_name_str, tp_cb, format)               \
-               static const char __mstrtab_##name[]                    \
-               __attribute__((section("__markers_strings")))           \
-               = #name "\0" format;                                    \
-               static struct marker __mark_##name                      \
-               __attribute__((section("__markers"), aligned(8))) =     \
-               { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)],   \
-                 0, 0, marker_probe_cb, { __mark_empty_function, NULL},\
-                 NULL, tp_name_str, tp_cb }
-
-#define DEFINE_MARKER(name, format)                                    \
-               _DEFINE_MARKER(name, NULL, NULL, format)
-
-#define DEFINE_MARKER_TP(name, tp_name, tp_cb, format)                 \
-               _DEFINE_MARKER(name, #tp_name, tp_cb, format)
-
-/*
- * Note : the empty asm volatile with read constraint is used here instead of a
- * "used" attribute to fix a gcc 4.1.x bug.
- * Make sure the alignment of the structure in the __markers section will
- * not add unwanted padding between the beginning of the section and the
- * structure. Force alignment to the same alignment as the section start.
- *
- * The "generic" argument controls which marker enabling mechanism must be used.
- * If generic is true, a variable read is used.
- * If generic is false, immediate values are used.
- */
-#define __trace_mark(generic, name, call_private, format, args...)     \
-       do {                                                            \
-               DEFINE_MARKER(name, format);                            \
-               __mark_check_format(format, ## args);                   \
-               if (unlikely(__mark_##name.state)) {                    \
-                       (*__mark_##name.call)                           \
-                               (&__mark_##name, call_private, ## args);\
-               }                                                       \
-       } while (0)
-
-#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
-       do {                                                            \
-               void __check_tp_type(void)                              \
-               {                                                       \
-                       register_trace_##tp_name(tp_cb);                \
-               }                                                       \
-               DEFINE_MARKER_TP(name, tp_name, tp_cb, format);         \
-               __mark_check_format(format, ## args);                   \
-               (*__mark_##name.call)(&__mark_##name, call_private,     \
-                                       ## args);                       \
-       } while (0)
-
-extern void marker_update_probe_range(struct marker *begin,
-       struct marker *end);
-
-#define GET_MARKER(name)       (__mark_##name)
-
-#else /* !CONFIG_MARKERS */
-#define DEFINE_MARKER(name, tp_name, tp_cb, format)
-#define __trace_mark(generic, name, call_private, format, args...) \
-               __mark_check_format(format, ## args)
-#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
-       do {                                                            \
-               void __check_tp_type(void)                              \
-               {                                                       \
-                       register_trace_##tp_name(tp_cb);                \
-               }                                                       \
-               __mark_check_format(format, ## args);                   \
-       } while (0)
-static inline void marker_update_probe_range(struct marker *begin,
-       struct marker *end)
-{ }
-#define GET_MARKER(name)
-#endif /* CONFIG_MARKERS */
-
-/**
- * trace_mark - Marker using code patching
- * @name: marker name, not quoted.
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker using optimized code patching technique (imv_read())
- * to be enabled when immediate values are present.
- */
-#define trace_mark(name, format, args...) \
-       __trace_mark(0, name, NULL, format, ## args)
-
-/**
- * _trace_mark - Marker using variable read
- * @name: marker name, not quoted.
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker using a standard memory read (_imv_read()) to be
- * enabled. Should be used for markers in code paths where instruction
- * modification based enabling is not welcome. (__init and __exit functions,
- * lockdep, some traps, printk).
- */
-#define _trace_mark(name, format, args...) \
-       __trace_mark(1, name, NULL, format, ## args)
-
-/**
- * trace_mark_tp - Marker in a tracepoint callback
- * @name: marker name, not quoted.
- * @tp_name: tracepoint name, not quoted.
- * @tp_cb: tracepoint callback. Should have an associated global symbol so it
- *         is not optimized away by the compiler (should not be static).
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker in a tracepoint callback.
- */
-#define trace_mark_tp(name, tp_name, tp_cb, format, args...)   \
-       __trace_mark_tp(name, NULL, tp_name, tp_cb, format, ## args)
-
-/**
- * MARK_NOARGS - Format string for a marker with no argument.
- */
-#define MARK_NOARGS " "
-
-/* To be used for string format validity checking with gcc */
-static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...)
-{
-}
-
-#define __mark_check_format(format, args...)                           \
-       do {                                                            \
-               if (0)                                                  \
-                       ___mark_check_format(format, ## args);          \
-       } while (0)
-
-extern marker_probe_func __mark_empty_function;
-
-extern void marker_probe_cb(const struct marker *mdata,
-       void *call_private, ...);
-
-/*
- * Connect a probe to a marker.
- * private data pointer must be a valid allocated memory address, or NULL.
- */
-extern int marker_probe_register(const char *name, const char *format,
-                               marker_probe_func *probe, void *probe_private);
-
-/*
- * Returns the private data given to marker_probe_register.
- */
-extern int marker_probe_unregister(const char *name,
-       marker_probe_func *probe, void *probe_private);
-/*
- * Unregister a marker by providing the registered private data.
- */
-extern int marker_probe_unregister_private_data(marker_probe_func *probe,
-       void *probe_private);
-
-extern void *marker_get_private_data(const char *name, marker_probe_func *probe,
-       int num);
-
-/*
- * marker_synchronize_unregister must be called between the last marker probe
- * unregistration and the first one of
- * - the end of module exit function
- * - the free of any resource used by the probes
- * to ensure the code and data are valid for any possibly running probes.
- */
-#define marker_synchronize_unregister() synchronize_sched()
-
-#endif
index d95f72e..fed9692 100644 (file)
@@ -191,14 +191,6 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
 
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
 
-/*
- * Walk through all memory which is registered as resource.
- * arg is (start_pfn, nr_pages, private_arg_pointer)
- */
-extern int walk_memory_resource(unsigned long start_pfn,
-                       unsigned long nr_pages, void *arg,
-                       int (*func)(unsigned long, unsigned long, void *));
-
 #ifdef CONFIG_MEMORY_HOTREMOVE
 
 extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);
index 9be484d..7c08052 100644 (file)
@@ -47,22 +47,16 @@ mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)
 }
 
 /*
- * 2 mempool_alloc_t's and a mempool_free_t to kmalloc/kzalloc and kfree
- * the amount of memory specified by pool_data
+ * a mempool_alloc_t and a mempool_free_t to kmalloc and kfree the
+ * amount of memory specified by pool_data
  */
 void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);
-void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data);
 void mempool_kfree(void *element, void *pool_data);
 static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)
 {
        return mempool_create(min_nr, mempool_kmalloc, mempool_kfree,
                              (void *) size);
 }
-static inline mempool_t *mempool_create_kzalloc_pool(int min_nr, size_t size)
-{
-       return mempool_create(min_nr, mempool_kzalloc, mempool_kfree,
-                             (void *) size);
-}
 
 /*
  * A mempool_alloc_t and mempool_free_t for a simple page allocator that
index 0521177..adaf3c1 100644 (file)
@@ -41,7 +41,8 @@ struct miscdevice  {
        struct list_head list;
        struct device *parent;
        struct device *this_device;
-       const char *devnode;
+       const char *nodename;
+       mode_t mode;
 };
 
 extern int misc_register(struct miscdevice * misc);
index 9a72cc7..b6eae5e 100644 (file)
@@ -25,6 +25,7 @@ extern unsigned long max_mapnr;
 #endif
 
 extern unsigned long num_physpages;
+extern unsigned long totalram_pages;
 extern void * high_memory;
 extern int page_cluster;
 
@@ -103,6 +104,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_MIXEDMAP    0x10000000      /* Can contain "struct page" and pure PFN pages */
 #define VM_SAO         0x20000000      /* Strong Access Ordering (powerpc) */
 #define VM_PFN_AT_MMAP 0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
+#define VM_MERGEABLE   0x80000000      /* KSM may merge identical pages */
 
 #ifndef VM_STACK_DEFAULT_FLAGS         /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
@@ -283,6 +285,14 @@ static inline int is_vmalloc_addr(const void *x)
        return 0;
 #endif
 }
+#ifdef CONFIG_MMU
+extern int is_vmalloc_or_module_addr(const void *x);
+#else
+static int is_vmalloc_or_module_addr(const void *x)
+{
+       return 0;
+}
+#endif
 
 static inline struct page *compound_head(struct page *page)
 {
@@ -700,17 +710,8 @@ extern void pagefault_out_of_memory(void);
 
 extern void show_free_areas(void);
 
-#ifdef CONFIG_SHMEM
-extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
-#else
-static inline int shmem_lock(struct file *file, int lock,
-                           struct user_struct *user)
-{
-       return 0;
-}
-#endif
+int shmem_lock(struct file *file, int lock, struct user_struct *user);
 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-
 int shmem_zero_setup(struct vm_area_struct *);
 
 #ifndef CONFIG_MMU
@@ -815,6 +816,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        struct page **pages, struct vm_area_struct **vmas);
 int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                        struct page **pages);
+struct page *get_dump_page(unsigned long addr);
 
 extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
 extern void do_invalidatepage(struct page *page, unsigned long offset);
@@ -1058,6 +1060,8 @@ extern void setup_per_cpu_pageset(void);
 static inline void setup_per_cpu_pageset(void) {}
 #endif
 
+extern void zone_pcp_update(struct zone *zone);
+
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
 
@@ -1226,7 +1230,8 @@ struct page *follow_page(struct vm_area_struct *, unsigned long address,
 #define FOLL_WRITE     0x01    /* check pte is writable */
 #define FOLL_TOUCH     0x02    /* mark page accessed */
 #define FOLL_GET       0x04    /* do get_page on page */
-#define FOLL_ANON      0x08    /* give ZERO_PAGE if no pgtable */
+#define FOLL_DUMP      0x08    /* give error on hole if it would be zero */
+#define FOLL_FORCE     0x10    /* get_user_pages read/write w/o permission */
 
 typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
                        void *data);
index 7fbb972..8835b87 100644 (file)
@@ -5,7 +5,7 @@
  * page_is_file_cache - should the page be on a file LRU or anon LRU?
  * @page: the page to test
  *
- * Returns LRU_FILE if @page is page cache page backed by a regular filesystem,
+ * Returns 1 if @page is page cache page backed by a regular filesystem,
  * or 0 if @page is anonymous, tmpfs or otherwise ram or swap backed.
  * Used by functions that manipulate the LRU lists, to sort a page
  * onto the right LRU list.
  */
 static inline int page_is_file_cache(struct page *page)
 {
-       if (PageSwapBacked(page))
-               return 0;
-
-       /* The page is page cache backed by a normal filesystem. */
-       return LRU_FILE;
+       return !PageSwapBacked(page);
 }
 
 static inline void
@@ -39,21 +35,36 @@ del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
        mem_cgroup_del_lru_list(page, l);
 }
 
+/**
+ * page_lru_base_type - which LRU list type should a page be on?
+ * @page: the page to test
+ *
+ * Used for LRU list index arithmetic.
+ *
+ * Returns the base LRU type - file or anon - @page should be on.
+ */
+static inline enum lru_list page_lru_base_type(struct page *page)
+{
+       if (page_is_file_cache(page))
+               return LRU_INACTIVE_FILE;
+       return LRU_INACTIVE_ANON;
+}
+
 static inline void
 del_page_from_lru(struct zone *zone, struct page *page)
 {
-       enum lru_list l = LRU_BASE;
+       enum lru_list l;
 
        list_del(&page->lru);
        if (PageUnevictable(page)) {
                __ClearPageUnevictable(page);
                l = LRU_UNEVICTABLE;
        } else {
+               l = page_lru_base_type(page);
                if (PageActive(page)) {
                        __ClearPageActive(page);
                        l += LRU_ACTIVE;
                }
-               l += page_is_file_cache(page);
        }
        __dec_zone_state(zone, NR_LRU_BASE + l);
        mem_cgroup_del_lru_list(page, l);
@@ -68,14 +79,14 @@ del_page_from_lru(struct zone *zone, struct page *page)
  */
 static inline enum lru_list page_lru(struct page *page)
 {
-       enum lru_list lru = LRU_BASE;
+       enum lru_list lru;
 
        if (PageUnevictable(page))
                lru = LRU_UNEVICTABLE;
        else {
+               lru = page_lru_base_type(page);
                if (PageActive(page))
                        lru += LRU_ACTIVE;
-               lru += page_is_file_cache(page);
        }
 
        return lru;
index 403aa50..2ee22e8 100644 (file)
@@ -40,6 +40,8 @@ struct mmc_csd {
 };
 
 struct mmc_ext_csd {
+       u8                      rev;
+       unsigned int            sa_timeout;             /* Units: 100ns */
        unsigned int            hs_max_dtr;
        unsigned int            sectors;
 };
@@ -62,7 +64,8 @@ struct sdio_cccr {
                                low_speed:1,
                                wide_bus:1,
                                high_power:1,
-                               high_speed:1;
+                               high_speed:1,
+                               disable_cd:1;
 };
 
 struct sdio_cis {
@@ -94,6 +97,8 @@ struct mmc_card {
 #define MMC_STATE_READONLY     (1<<1)          /* card is read-only */
 #define MMC_STATE_HIGHSPEED    (1<<2)          /* card is in high speed mode */
 #define MMC_STATE_BLOCKADDR    (1<<3)          /* card uses block-addressing */
+       unsigned int            quirks;         /* card quirks */
+#define MMC_QUIRK_LENIENT_FN0  (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 
        u32                     raw_cid[4];     /* raw card CID */
        u32                     raw_csd[4];     /* raw card CSD */
@@ -129,6 +134,11 @@ struct mmc_card {
 #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
 
+static inline int mmc_card_lenient_fn0(const struct mmc_card *c)
+{
+       return c->quirks & MMC_QUIRK_LENIENT_FN0;
+}
+
 #define mmc_card_name(c)       ((c)->cid.prod_name)
 #define mmc_card_id(c)         (dev_name(&(c)->dev))
 
index 7ac8b50..e4898e9 100644 (file)
@@ -139,6 +139,7 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
+extern int mmc_try_claim_host(struct mmc_host *host);
 
 /**
  *     mmc_claim_host - exclusively claim a host
index 3e7615e..81bb423 100644 (file)
@@ -51,6 +51,35 @@ struct mmc_ios {
 };
 
 struct mmc_host_ops {
+       /*
+        * Hosts that support power saving can use the 'enable' and 'disable'
+        * methods to exit and enter power saving states. 'enable' is called
+        * when the host is claimed and 'disable' is called (or scheduled with
+        * a delay) when the host is released. The 'disable' is scheduled if
+        * the disable delay set by 'mmc_set_disable_delay()' is non-zero,
+        * otherwise 'disable' is called immediately. 'disable' may be
+        * scheduled repeatedly, to permit ever greater power saving at the
+        * expense of ever greater latency to re-enable. Rescheduling is
+        * determined by the return value of the 'disable' method. A positive
+        * value gives the delay in milliseconds.
+        *
+        * In the case where a host function (like set_ios) may be called
+        * with or without the host claimed, enabling and disabling can be
+        * done directly and will nest correctly. Call 'mmc_host_enable()' and
+        * 'mmc_host_lazy_disable()' for this purpose, but note that these
+        * functions must be paired.
+        *
+        * Alternatively, 'mmc_host_enable()' may be paired with
+        * 'mmc_host_disable()' which calls 'disable' immediately.  In this
+        * case the 'disable' method will be called with 'lazy' set to 0.
+        * This is mainly useful for error paths.
+        *
+        * Because lazy disable may be called from a work queue, the 'disable'
+        * method must claim the host when 'lazy' != 0, which will work
+        * correctly because recursion is detected and handled.
+        */
+       int (*enable)(struct mmc_host *host);
+       int (*disable)(struct mmc_host *host, int lazy);
        void    (*request)(struct mmc_host *host, struct mmc_request *req);
        /*
         * Avoid calling these three functions too often or in a "fast path",
@@ -118,6 +147,9 @@ struct mmc_host {
 #define MMC_CAP_SPI            (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL     (1 << 5)        /* Needs polling for card-detection */
 #define MMC_CAP_8_BIT_DATA     (1 << 6)        /* Can the host do 8 bit transfers */
+#define MMC_CAP_DISABLE                (1 << 7)        /* Can the host be disabled */
+#define MMC_CAP_NONREMOVABLE   (1 << 8)        /* Nonremovable e.g. eMMC */
+#define MMC_CAP_WAIT_WHILE_BUSY        (1 << 9)        /* Waits while card is busy */
 
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
@@ -142,9 +174,18 @@ struct mmc_host {
        unsigned int            removed:1;      /* host is being removed */
 #endif
 
+       /* Only used with MMC_CAP_DISABLE */
+       int                     enabled;        /* host is enabled */
+       int                     nesting_cnt;    /* "enable" nesting count */
+       int                     en_dis_recurs;  /* detect recursion */
+       unsigned int            disable_delay;  /* disable delay in msecs */
+       struct delayed_work     disable;        /* disabling work */
+
        struct mmc_card         *card;          /* device attached to this host */
 
        wait_queue_head_t       wq;
+       struct task_struct      *claimer;       /* task that has host claimed */
+       int                     claim_cnt;      /* "claim" nesting count */
 
        struct delayed_work     detect;
 
@@ -183,6 +224,9 @@ static inline void *mmc_priv(struct mmc_host *host)
 extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
 extern int mmc_resume_host(struct mmc_host *);
 
+extern void mmc_power_save_host(struct mmc_host *host);
+extern void mmc_power_restore_host(struct mmc_host *host);
+
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
@@ -197,5 +241,19 @@ struct regulator;
 int mmc_regulator_get_ocrmask(struct regulator *supply);
 int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit);
 
+int mmc_card_awake(struct mmc_host *host);
+int mmc_card_sleep(struct mmc_host *host);
+int mmc_card_can_sleep(struct mmc_host *host);
+
+int mmc_host_enable(struct mmc_host *host);
+int mmc_host_disable(struct mmc_host *host);
+int mmc_host_lazy_disable(struct mmc_host *host);
+
+static inline void mmc_set_disable_delay(struct mmc_host *host,
+                                        unsigned int disable_delay)
+{
+       host->disable_delay = disable_delay;
+}
+
 #endif
 
index 14b81f3..c02c8db 100644 (file)
@@ -31,6 +31,7 @@
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
 #define MMC_SET_DSR               4   /* bc   [31:16] RCA            */
+#define MMC_SLEEP_AWAKE                  5   /* ac   [31:16] RCA 15:flg R1b */
 #define MMC_SWITCH                6   /* ac   [31:0] See below   R1b */
 #define MMC_SELECT_CARD           7   /* ac   [31:16] RCA        R1  */
 #define MMC_SEND_EXT_CSD          8   /* adtc                    R1  */
 #define R1_STATUS(x)            (x & 0xFFFFE000)
 #define R1_CURRENT_STATE(x)    ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA      (1 << 8)        /* sx, a */
+#define R1_SWITCH_ERROR                (1 << 7)        /* sx, c */
 #define R1_APP_CMD             (1 << 5)        /* sr, c */
 
 /*
@@ -254,6 +256,7 @@ struct _mmc_csd {
 #define EXT_CSD_CARD_TYPE      196     /* RO */
 #define EXT_CSD_REV            192     /* RO */
 #define EXT_CSD_SEC_CNT                212     /* RO, 4 bytes */
+#define EXT_CSD_S_A_TIMEOUT    217
 
 /*
  * EXT_CSD field definitions
index 451bdfc..ac3ab68 100644 (file)
@@ -67,6 +67,7 @@ struct sdio_func {
 
 #define sdio_get_drvdata(f)    dev_get_drvdata(&(f)->dev)
 #define sdio_set_drvdata(f,d)  dev_set_drvdata(&(f)->dev, d)
+#define dev_to_sdio_func(d)    container_of(d, struct sdio_func, dev)
 
 /*
  * SDIO function device driver
@@ -81,6 +82,8 @@ struct sdio_driver {
        struct device_driver drv;
 };
 
+#define to_sdio_driver(d)      container_of(d, struct sdio_driver, drv)
+
 /**
  * SDIO_DEVICE - macro used to describe a specific SDIO device
  * @vend: the 16 bit manufacturer code
diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
new file mode 100644 (file)
index 0000000..70fffeb
--- /dev/null
@@ -0,0 +1,9 @@
+#ifndef _LINUX_MMU_CONTEXT_H
+#define _LINUX_MMU_CONTEXT_H
+
+struct mm_struct;
+
+void use_mm(struct mm_struct *mm);
+void unuse_mm(struct mm_struct *mm);
+
+#endif
index b77486d..4e02ee2 100644 (file)
@@ -61,6 +61,15 @@ struct mmu_notifier_ops {
                                 struct mm_struct *mm,
                                 unsigned long address);
 
+       /*
+        * change_pte is called in cases that pte mapping to page is changed:
+        * for example, when ksm remaps pte to point to a new shared page.
+        */
+       void (*change_pte)(struct mmu_notifier *mn,
+                          struct mm_struct *mm,
+                          unsigned long address,
+                          pte_t pte);
+
        /*
         * Before this is invoked any secondary MMU is still ok to
         * read/write to the page previously pointed to by the Linux
@@ -154,6 +163,8 @@ extern void __mmu_notifier_mm_destroy(struct mm_struct *mm);
 extern void __mmu_notifier_release(struct mm_struct *mm);
 extern int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
                                          unsigned long address);
+extern void __mmu_notifier_change_pte(struct mm_struct *mm,
+                                     unsigned long address, pte_t pte);
 extern void __mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address);
 extern void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
@@ -175,6 +186,13 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
 
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+                                          unsigned long address, pte_t pte)
+{
+       if (mm_has_notifiers(mm))
+               __mmu_notifier_change_pte(mm, address, pte);
+}
+
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address)
 {
@@ -236,6 +254,16 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
        __young;                                                        \
 })
 
+#define set_pte_at_notify(__mm, __address, __ptep, __pte)              \
+({                                                                     \
+       struct mm_struct *___mm = __mm;                                 \
+       unsigned long ___address = __address;                           \
+       pte_t ___pte = __pte;                                           \
+                                                                       \
+       set_pte_at(___mm, ___address, __ptep, ___pte);                  \
+       mmu_notifier_change_pte(___mm, ___address, ___pte);             \
+})
+
 #else /* CONFIG_MMU_NOTIFIER */
 
 static inline void mmu_notifier_release(struct mm_struct *mm)
@@ -248,6 +276,11 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
 
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+                                          unsigned long address, pte_t pte)
+{
+}
+
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address)
 {
@@ -273,6 +306,7 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 
 #define ptep_clear_flush_young_notify ptep_clear_flush_young
 #define ptep_clear_flush_notify ptep_clear_flush
+#define set_pte_at_notify set_pte_at
 
 #endif /* CONFIG_MMU_NOTIFIER */
 
index 8895985..652ef01 100644 (file)
@@ -38,6 +38,7 @@
 #define MIGRATE_UNMOVABLE     0
 #define MIGRATE_RECLAIMABLE   1
 #define MIGRATE_MOVABLE       2
+#define MIGRATE_PCPTYPES      3 /* the number of types on the pcp lists */
 #define MIGRATE_RESERVE       3
 #define MIGRATE_ISOLATE       4 /* can't allocate from here */
 #define MIGRATE_TYPES         5
@@ -94,11 +95,15 @@ enum zone_stat_item {
        NR_SLAB_RECLAIMABLE,
        NR_SLAB_UNRECLAIMABLE,
        NR_PAGETABLE,           /* used for pagetables */
+       NR_KERNEL_STACK,
+       /* Second 128 byte cacheline */
        NR_UNSTABLE_NFS,        /* NFS unstable pages */
        NR_BOUNCE,
        NR_VMSCAN_WRITE,
-       /* Second 128 byte cacheline */
        NR_WRITEBACK_TEMP,      /* Writeback using temporary buffers */
+       NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
+       NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
+       NR_SHMEM,               /* shmem pages (included tmpfs/GEM pages) */
 #ifdef CONFIG_NUMA
        NUMA_HIT,               /* allocated in intended node */
        NUMA_MISS,              /* allocated in non intended node */
@@ -165,7 +170,9 @@ struct per_cpu_pages {
        int count;              /* number of pages in the list */
        int high;               /* high watermark, emptying needed */
        int batch;              /* chunk size for buddy add/remove */
-       struct list_head list;  /* the list of pages */
+
+       /* Lists of pages, one per migrate type stored on the pcp-lists */
+       struct list_head lists[MIGRATE_PCPTYPES];
 };
 
 struct per_cpu_pageset {
@@ -269,6 +276,11 @@ struct zone_reclaim_stat {
         */
        unsigned long           recent_rotated[2];
        unsigned long           recent_scanned[2];
+
+       /*
+        * accumulated for batching
+        */
+       unsigned long           nr_saved_scan[NR_LRU_LISTS];
 };
 
 struct zone {
@@ -323,7 +335,6 @@ struct zone {
        spinlock_t              lru_lock;       
        struct zone_lru {
                struct list_head list;
-               unsigned long nr_saved_scan;    /* accumulated for batching */
        } lru[NR_LRU_LISTS];
 
        struct zone_reclaim_stat reclaim_stat;
index 1bf5900..f58e9d8 100644 (file)
@@ -399,6 +399,17 @@ struct i2c_device_id {
                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
+/* spi */
+
+#define SPI_NAME_SIZE  32
+#define SPI_MODULE_PREFIX "spi:"
+
+struct spi_device_id {
+       char name[SPI_NAME_SIZE];
+       kernel_ulong_t driver_data      /* Data private to the driver */
+                       __attribute__((aligned(sizeof(kernel_ulong_t))));
+};
+
 /* dmi */
 enum dmi_field {
        DMI_NONE,
index f8f92d0..1c755b2 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/stringify.h>
 #include <linux/kobject.h>
 #include <linux/moduleparam.h>
-#include <linux/marker.h>
 #include <linux/tracepoint.h>
 
 #include <asm/local.h>
@@ -327,10 +326,6 @@ struct module
        /* The command line arguments (may be mangled).  People like
           keeping pointers to this stuff */
        char *args;
-#ifdef CONFIG_MARKERS
-       struct marker *markers;
-       unsigned int num_markers;
-#endif
 #ifdef CONFIG_TRACEPOINTS
        struct tracepoint *tracepoints;
        unsigned int num_tracepoints;
@@ -535,8 +530,6 @@ int unregister_module_notifier(struct notifier_block * nb);
 
 extern void print_modules(void);
 
-extern void module_update_markers(void);
-
 extern void module_update_tracepoints(void);
 extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);
 
@@ -651,10 +644,6 @@ static inline void print_modules(void)
 {
 }
 
-static inline void module_update_markers(void)
-{
-}
-
 static inline void module_update_tracepoints(void)
 {
 }
index d870ae2..ec0f607 100644 (file)
@@ -40,7 +40,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
  *  - follow links at the end
  *  - require a directory
  *  - ending slashes ok even for nonexistent files
- *  - internal "there are more path compnents" flag
+ *  - internal "there are more path components" flag
  *  - locked when lookup done with dcache_lock held
  *  - dentry cache is untrusted; force a real lookup
  */
index 33b2836..c4c0602 100644 (file)
@@ -234,7 +234,7 @@ enum nfs_opnum4 {
 Needs to be updated if more operations are defined in future.*/
 
 #define FIRST_NFS4_OP  OP_ACCESS
-#define LAST_NFS4_OP   OP_RELEASE_LOCKOWNER
+#define LAST_NFS4_OP   OP_RECLAIM_COMPLETE
 
 enum nfsstat4 {
        NFS4_OK = 0,
index 2b49d67..510ffdd 100644 (file)
@@ -56,8 +56,11 @@ extern struct svc_version    nfsd_version2, nfsd_version3,
 extern u32                     nfsd_supported_minorversion;
 extern struct mutex            nfsd_mutex;
 extern struct svc_serv         *nfsd_serv;
+extern spinlock_t              nfsd_drc_lock;
+extern unsigned int            nfsd_drc_max_mem;
+extern unsigned int            nfsd_drc_mem_used;
 
-extern struct seq_operations nfs_exports_op;
+extern const struct seq_operations nfs_exports_op;
 
 /*
  * Function prototypes.
@@ -163,7 +166,7 @@ extern int nfsd_max_blksize;
 extern unsigned int max_delegations;
 int nfs4_state_init(void);
 void nfsd4_free_slabs(void);
-void nfs4_state_start(void);
+int nfs4_state_start(void);
 void nfs4_state_shutdown(void);
 time_t nfs4_lease_time(void);
 void nfs4_reset_lease(time_t leasetime);
@@ -171,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir);
 #else
 static inline int nfs4_state_init(void) { return 0; }
 static inline void nfsd4_free_slabs(void) { }
-static inline void nfs4_state_start(void) { }
+static inline int nfs4_state_start(void) { return 0; }
 static inline void nfs4_state_shutdown(void) { }
 static inline time_t nfs4_lease_time(void) { return 0; }
 static inline void nfs4_reset_lease(time_t leasetime) { }
index 57ab2ed..b38d113 100644 (file)
@@ -60,6 +60,12 @@ typedef struct {
 #define si_stateownerid   si_opaque.so_stateownerid
 #define si_fileid         si_opaque.so_fileid
 
+struct nfsd4_cb_sequence {
+       /* args/res */
+       u32                     cbs_minorversion;
+       struct nfs4_client      *cbs_clp;
+};
+
 struct nfs4_delegation {
        struct list_head        dl_perfile;
        struct list_head        dl_perclnt;
@@ -81,38 +87,35 @@ struct nfs4_delegation {
 /* client delegation callback info */
 struct nfs4_cb_conn {
        /* SETCLIENTID info */
-       u32                     cb_addr;
-       unsigned short          cb_port;
+       struct sockaddr_storage cb_addr;
+       size_t                  cb_addrlen;
        u32                     cb_prog;
        u32                     cb_minorversion;
        u32                     cb_ident;       /* minorversion 0 only */
        /* RPC client info */
        atomic_t                cb_set;     /* successful CB_NULL call */
        struct rpc_clnt *       cb_client;
-       struct rpc_cred *       cb_cred;
 };
 
-/* Maximum number of slots per session. 128 is useful for long haul TCP */
-#define NFSD_MAX_SLOTS_PER_SESSION     128
-/* Maximum number of pages per slot cache entry */
-#define NFSD_PAGES_PER_SLOT    1
+/* Maximum number of slots per session. 160 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION     160
 /* Maximum number of operations per session compound */
 #define NFSD_MAX_OPS_PER_COMPOUND      16
-
-struct nfsd4_cache_entry {
-       __be32          ce_status;
-       struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
-       struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
-       int             ce_cachethis;
-       short           ce_resused;
-       int             ce_opcnt;
-       int             ce_rpchdrlen;
-};
+/* Maximum  session per slot cache size */
+#define NFSD_SLOT_CACHE_SIZE           1024
+/* Maximum number of NFSD_SLOT_CACHE_SIZE slots per session */
+#define NFSD_CACHE_SIZE_SLOTS_PER_SESSION      32
+#define NFSD_MAX_MEM_PER_SESSION  \
+               (NFSD_CACHE_SIZE_SLOTS_PER_SESSION * NFSD_SLOT_CACHE_SIZE)
 
 struct nfsd4_slot {
-       bool                            sl_inuse;
-       u32                             sl_seqid;
-       struct nfsd4_cache_entry        sl_cache_entry;
+       bool    sl_inuse;
+       bool    sl_cachethis;
+       u16     sl_opcnt;
+       u32     sl_seqid;
+       __be32  sl_status;
+       u32     sl_datalen;
+       char    sl_data[];
 };
 
 struct nfsd4_channel_attrs {
@@ -126,6 +129,25 @@ struct nfsd4_channel_attrs {
        u32             rdma_attrs;
 };
 
+struct nfsd4_create_session {
+       clientid_t                      clientid;
+       struct nfs4_sessionid           sessionid;
+       u32                             seqid;
+       u32                             flags;
+       struct nfsd4_channel_attrs      fore_channel;
+       struct nfsd4_channel_attrs      back_channel;
+       u32                             callback_prog;
+       u32                             uid;
+       u32                             gid;
+};
+
+/* The single slot clientid cache structure */
+struct nfsd4_clid_slot {
+       u32                             sl_seqid;
+       __be32                          sl_status;
+       struct nfsd4_create_session     sl_cr_ses;
+};
+
 struct nfsd4_session {
        struct kref             se_ref;
        struct list_head        se_hash;        /* hash by sessionid */
@@ -135,7 +157,7 @@ struct nfsd4_session {
        struct nfs4_sessionid   se_sessionid;
        struct nfsd4_channel_attrs se_fchannel;
        struct nfsd4_channel_attrs se_bchannel;
-       struct nfsd4_slot       se_slots[];     /* forward channel slots */
+       struct nfsd4_slot       *se_slots[];    /* forward channel slots */
 };
 
 static inline void
@@ -180,7 +202,7 @@ struct nfs4_client {
        char                    cl_recdir[HEXDIR_LEN]; /* recovery dir */
        nfs4_verifier           cl_verifier;    /* generated by client */
        time_t                  cl_time;        /* time of last lease renewal */
-       __be32                  cl_addr;        /* client ipaddress */
+       struct sockaddr_storage cl_addr;        /* client ipaddress */
        u32                     cl_flavor;      /* setclientid pseudoflavor */
        char                    *cl_principal;  /* setclientid principal name */
        struct svc_cred         cl_cred;        /* setclientid principal */
@@ -192,9 +214,17 @@ struct nfs4_client {
 
        /* for nfs41 */
        struct list_head        cl_sessions;
-       struct nfsd4_slot       cl_slot;        /* create_session slot */
+       struct nfsd4_clid_slot  cl_cs_slot;     /* create_session slot */
        u32                     cl_exchange_flags;
        struct nfs4_sessionid   cl_sessionid;
+
+       /* for nfs41 callbacks */
+       /* We currently support a single back channel with a single slot */
+       unsigned long           cl_cb_slot_busy;
+       u32                     cl_cb_seq_nr;
+       struct svc_xprt         *cl_cb_xprt;    /* 4.1 callback transport */
+       struct rpc_wait_queue   cl_cb_waitq;    /* backchannel callers may */
+                                               /* wait here for slots */
 };
 
 /* struct nfs4_client_reset
@@ -345,6 +375,7 @@ extern int nfs4_in_grace(void);
 extern __be32 nfs4_check_open_reclaim(clientid_t *clid);
 extern void put_nfs4_client(struct nfs4_client *clp);
 extern void nfs4_free_stateowner(struct kref *kref);
+extern int set_callback_cred(void);
 extern void nfsd4_probe_callback(struct nfs4_client *clp);
 extern void nfsd4_cb_recall(struct nfs4_delegation *dp);
 extern void nfs4_put_delegation(struct nfs4_delegation *dp);
index 2bacf75..73164c2 100644 (file)
@@ -51,7 +51,7 @@ struct nfsd4_compound_state {
        /* For sessions DRC */
        struct nfsd4_session    *session;
        struct nfsd4_slot       *slot;
-       __be32                  *statp;
+       __be32                  *datap;
        size_t                  iovlen;
        u32                     minorversion;
        u32                     status;
@@ -366,18 +366,6 @@ struct nfsd4_exchange_id {
        int             spa_how;
 };
 
-struct nfsd4_create_session {
-       clientid_t              clientid;
-       struct nfs4_sessionid   sessionid;
-       u32                     seqid;
-       u32                     flags;
-       struct nfsd4_channel_attrs fore_channel;
-       struct nfsd4_channel_attrs back_channel;
-       u32                     callback_prog;
-       u32                     uid;
-       u32                     gid;
-};
-
 struct nfsd4_sequence {
        struct nfs4_sessionid   sessionid;              /* request/response */
        u32                     seqid;                  /* request/response */
@@ -479,13 +467,12 @@ struct nfsd4_compoundres {
 static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
 {
        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
-       return args->opcnt == 1;
+       return resp->opcnt == 1 && args->ops[0].opnum == OP_SEQUENCE;
 }
 
 static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
 {
-       return !resp->cstate.slot->sl_cache_entry.ce_cachethis ||
-                       nfsd4_is_solo_sequence(resp);
+       return !resp->cstate.slot->sl_cachethis || nfsd4_is_solo_sequence(resp);
 }
 
 #define NFS4_SVC_XDRSIZE               sizeof(struct nfsd4_compoundargs)
index a7979ba..6aac5fe 100644 (file)
@@ -30,5 +30,16 @@ extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
 extern int register_oom_notifier(struct notifier_block *nb);
 extern int unregister_oom_notifier(struct notifier_block *nb);
 
+extern bool oom_killer_disabled;
+
+static inline void oom_killer_disable(void)
+{
+       oom_killer_disabled = true;
+}
+
+static inline void oom_killer_enable(void)
+{
+       oom_killer_disabled = false;
+}
 #endif /* __KERNEL__*/
 #endif /* _INCLUDE_LINUX_OOM_H */
index 2b87acf..13de789 100644 (file)
@@ -158,6 +158,9 @@ static inline int TestSetPage##uname(struct page *page)                     \
 static inline int TestClearPage##uname(struct page *page)              \
                { return test_and_clear_bit(PG_##lname, &page->flags); }
 
+#define __TESTCLEARFLAG(uname, lname)                                  \
+static inline int __TestClearPage##uname(struct page *page)            \
+               { return __test_and_clear_bit(PG_##lname, &page->flags); }
 
 #define PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname)              \
        SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname)
@@ -184,6 +187,9 @@ static inline void __ClearPage##uname(struct page *page) {  }
 #define TESTCLEARFLAG_FALSE(uname)                                     \
 static inline int TestClearPage##uname(struct page *page) { return 0; }
 
+#define __TESTCLEARFLAG_FALSE(uname)                                   \
+static inline int __TestClearPage##uname(struct page *page) { return 0; }
+
 struct page;   /* forward declaration */
 
 TESTPAGEFLAG(Locked, locked) TESTSETFLAG(Locked, locked)
@@ -250,11 +256,11 @@ PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)
 #ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
 #define MLOCK_PAGES 1
 PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)
-       TESTSCFLAG(Mlocked, mlocked)
+       TESTSCFLAG(Mlocked, mlocked) __TESTCLEARFLAG(Mlocked, mlocked)
 #else
 #define MLOCK_PAGES 0
-PAGEFLAG_FALSE(Mlocked)
-       SETPAGEFLAG_NOOP(Mlocked) TESTCLEARFLAG_FALSE(Mlocked)
+PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked)
+       TESTCLEARFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)
 #endif
 
 #ifdef CONFIG_ARCH_USES_PG_UNCACHED
@@ -396,8 +402,8 @@ static inline void __ClearPageTail(struct page *page)
  */
 #define PAGE_FLAGS_CHECK_AT_PREP       ((1 << NR_PAGEFLAGS) - 1)
 
-#endif /* !__GENERATING_BOUNDS_H */
-
+#define PAGE_FLAGS_PRIVATE                             \
+       (1 << PG_private | 1 << PG_private_2)
 /**
  * page_has_private - Determine if page has private stuff
  * @page: The page to be checked
@@ -405,8 +411,11 @@ static inline void __ClearPageTail(struct page *page)
  * Determine if a page has private stuff, indicating that release routines
  * should be invoked upon it.
  */
-#define page_has_private(page)                 \
-       ((page)->flags & ((1 << PG_private) |   \
-                         (1 << PG_private_2)))
+static inline int page_has_private(struct page *page)
+{
+       return !!(page->flags & PAGE_FLAGS_PRIVATE);
+}
+
+#endif /* !__GENERATING_BOUNDS_H */
 
 #endif /* PAGE_FLAGS_H */
index 13f126c..ada779f 100644 (file)
@@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void)
 
 #endif
 
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 #include <linux/swap.h>
+
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
 extern unsigned short lookup_swap_cgroup(swp_entry_t ent);
 extern int swap_cgroup_swapon(int type, unsigned long max_pages);
 extern void swap_cgroup_swapoff(int type);
 #else
-#include <linux/swap.h>
 
 static inline
 unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
index 3b6b788..7803565 100644 (file)
 #define PCI_DEVICE_ID_AMD_8131_BRIDGE  0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC    0x7451
 #define PCI_DEVICE_ID_AMD_8132_BRIDGE  0x7458
+#define PCI_DEVICE_ID_AMD_SB900_SMBUS  0x780b
 #define PCI_DEVICE_ID_AMD_CS5535_IDE    0x208F
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
index 972f90d..368bd70 100644 (file)
@@ -1,5 +1,9 @@
 /*
- *  Performance counters:
+ *  NOTE: this file will be removed in a future kernel release, it is
+ *  provided as a courtesy copy of user-space code that relies on the
+ *  old (pre-rename) symbols and constants.
+ *
+ *  Performance events:
  *
  *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
  *    Copyright (C) 2008-2009, Red Hat, Inc., Ingo Molnar
@@ -131,19 +135,19 @@ enum perf_counter_sample_format {
  * as specified by attr.read_format:
  *
  * struct read_format {
- *     { u64           value;
- *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
- *       { u64         time_running; } && PERF_FORMAT_RUNNING
- *       { u64         id;           } && PERF_FORMAT_ID
- *     } && !PERF_FORMAT_GROUP
+ *     { u64           value;
+ *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *       { u64         time_running; } && PERF_FORMAT_RUNNING
+ *       { u64         id;           } && PERF_FORMAT_ID
+ *     } && !PERF_FORMAT_GROUP
  *
- *     { u64           nr;
- *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
- *       { u64         time_running; } && PERF_FORMAT_RUNNING
- *       { u64         value;
- *         { u64       id;           } && PERF_FORMAT_ID
- *       }             cntr[nr];
- *     } && PERF_FORMAT_GROUP
+ *     { u64           nr;
+ *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *       { u64         time_running; } && PERF_FORMAT_RUNNING
+ *       { u64         value;
+ *         { u64       id;           } && PERF_FORMAT_ID
+ *       }             cntr[nr];
+ *     } && PERF_FORMAT_GROUP
  * };
  */
 enum perf_counter_read_format {
@@ -199,10 +203,14 @@ struct perf_counter_attr {
                                inherit_stat   :  1, /* per task counts       */
                                enable_on_exec :  1, /* next exec enables     */
                                task           :  1, /* trace fork/exit       */
+                               watermark      :  1, /* wakeup_watermark      */
 
-                               __reserved_1   : 50;
+                               __reserved_1   : 49;
 
-       __u32                   wakeup_events;  /* wakeup every n events */
+       union {
+               __u32           wakeup_events;    /* wakeup every n events */
+               __u32           wakeup_watermark; /* bytes before wakeup   */
+       };
        __u32                   __reserved_2;
 
        __u64                   __reserved_3;
@@ -310,9 +318,9 @@ enum perf_event_type {
 
        /*
         * struct {
-        *      struct perf_event_header        header;
-        *      u64                             id;
-        *      u64                             lost;
+        *      struct perf_event_header        header;
+        *      u64                             id;
+        *      u64                             lost;
         * };
         */
        PERF_EVENT_LOST                 = 2,
@@ -332,6 +340,7 @@ enum perf_event_type {
         *      struct perf_event_header        header;
         *      u32                             pid, ppid;
         *      u32                             tid, ptid;
+        *      u64                             time;
         * };
         */
        PERF_EVENT_EXIT                 = 4,
@@ -352,16 +361,17 @@ enum perf_event_type {
         *      struct perf_event_header        header;
         *      u32                             pid, ppid;
         *      u32                             tid, ptid;
+        *      { u64                           time;     } && PERF_SAMPLE_TIME
         * };
         */
        PERF_EVENT_FORK                 = 7,
 
        /*
         * struct {
-        *      struct perf_event_header        header;
-        *      u32                             pid, tid;
+        *      struct perf_event_header        header;
+        *      u32                             pid, tid;
         *
-        *      struct read_format              values;
+        *      struct read_format              values;
         * };
         */
        PERF_EVENT_READ                 = 8,
@@ -377,23 +387,23 @@ enum perf_event_type {
         *      { u64                   id;       } && PERF_SAMPLE_ID
         *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
         *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
-        *      { u64                   period;   } && PERF_SAMPLE_PERIOD
+        *      { u64                   period;   } && PERF_SAMPLE_PERIOD
         *
         *      { struct read_format    values;   } && PERF_SAMPLE_READ
         *
         *      { u64                   nr,
         *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
         *
-        *      #
-        *      # The RAW record below is opaque data wrt the ABI
-        *      #
-        *      # That is, the ABI doesn't make any promises wrt to
-        *      # the stability of its content, it may vary depending
-        *      # on event, hardware, kernel version and phase of
-        *      # the moon.
-        *      #
-        *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
-        *      #
+        *      #
+        *      # The RAW record below is opaque data wrt the ABI
+        *      #
+        *      # That is, the ABI doesn't make any promises wrt to
+        *      # the stability of its content, it may vary depending
+        *      # on event, hardware, kernel version and phase of
+        *      # the moon.
+        *      #
+        *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
+        *      #
         *
         *      { u32                   size;
         *        char                  data[size];}&& PERF_SAMPLE_RAW
@@ -416,392 +426,16 @@ enum perf_callchain_context {
        PERF_CONTEXT_MAX                = (__u64)-4095,
 };
 
-#define PERF_FLAG_FD_NO_GROUP  (1U << 0)
-#define PERF_FLAG_FD_OUTPUT    (1U << 1)
+#define PERF_FLAG_FD_NO_GROUP          (1U << 0)
+#define PERF_FLAG_FD_OUTPUT            (1U << 1)
 
-#ifdef __KERNEL__
 /*
- * Kernel-internal data types and definitions:
- */
-
-#ifdef CONFIG_PERF_COUNTERS
-# include <asm/perf_counter.h>
-#endif
-
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/rculist.h>
-#include <linux/rcupdate.h>
-#include <linux/spinlock.h>
-#include <linux/hrtimer.h>
-#include <linux/fs.h>
-#include <linux/pid_namespace.h>
-#include <asm/atomic.h>
-
-#define PERF_MAX_STACK_DEPTH           255
-
-struct perf_callchain_entry {
-       __u64                           nr;
-       __u64                           ip[PERF_MAX_STACK_DEPTH];
-};
-
-struct perf_raw_record {
-       u32                             size;
-       void                            *data;
-};
-
-struct task_struct;
-
-/**
- * struct hw_perf_counter - performance counter hardware details:
- */
-struct hw_perf_counter {
-#ifdef CONFIG_PERF_COUNTERS
-       union {
-               struct { /* hardware */
-                       u64             config;
-                       unsigned long   config_base;
-                       unsigned long   counter_base;
-                       int             idx;
-               };
-               union { /* software */
-                       atomic64_t      count;
-                       struct hrtimer  hrtimer;
-               };
-       };
-       atomic64_t                      prev_count;
-       u64                             sample_period;
-       u64                             last_period;
-       atomic64_t                      period_left;
-       u64                             interrupts;
-
-       u64                             freq_count;
-       u64                             freq_interrupts;
-       u64                             freq_stamp;
-#endif
-};
-
-struct perf_counter;
-
-/**
- * struct pmu - generic performance monitoring unit
- */
-struct pmu {
-       int (*enable)                   (struct perf_counter *counter);
-       void (*disable)                 (struct perf_counter *counter);
-       void (*read)                    (struct perf_counter *counter);
-       void (*unthrottle)              (struct perf_counter *counter);
-};
-
-/**
- * enum perf_counter_active_state - the states of a counter
- */
-enum perf_counter_active_state {
-       PERF_COUNTER_STATE_ERROR        = -2,
-       PERF_COUNTER_STATE_OFF          = -1,
-       PERF_COUNTER_STATE_INACTIVE     =  0,
-       PERF_COUNTER_STATE_ACTIVE       =  1,
-};
-
-struct file;
-
-struct perf_mmap_data {
-       struct rcu_head                 rcu_head;
-       int                             nr_pages;       /* nr of data pages  */
-       int                             writable;       /* are we writable   */
-       int                             nr_locked;      /* nr pages mlocked  */
-
-       atomic_t                        poll;           /* POLL_ for wakeups */
-       atomic_t                        events;         /* event limit       */
-
-       atomic_long_t                   head;           /* write position    */
-       atomic_long_t                   done_head;      /* completed head    */
-
-       atomic_t                        lock;           /* concurrent writes */
-       atomic_t                        wakeup;         /* needs a wakeup    */
-       atomic_t                        lost;           /* nr records lost   */
-
-       struct perf_counter_mmap_page   *user_page;
-       void                            *data_pages[0];
-};
-
-struct perf_pending_entry {
-       struct perf_pending_entry *next;
-       void (*func)(struct perf_pending_entry *);
-};
-
-/**
- * struct perf_counter - performance counter kernel representation:
- */
-struct perf_counter {
-#ifdef CONFIG_PERF_COUNTERS
-       struct list_head                list_entry;
-       struct list_head                event_entry;
-       struct list_head                sibling_list;
-       int                             nr_siblings;
-       struct perf_counter             *group_leader;
-       struct perf_counter             *output;
-       const struct pmu                *pmu;
-
-       enum perf_counter_active_state  state;
-       atomic64_t                      count;
-
-       /*
-        * These are the total time in nanoseconds that the counter
-        * has been enabled (i.e. eligible to run, and the task has
-        * been scheduled in, if this is a per-task counter)
-        * and running (scheduled onto the CPU), respectively.
-        *
-        * They are computed from tstamp_enabled, tstamp_running and
-        * tstamp_stopped when the counter is in INACTIVE or ACTIVE state.
-        */
-       u64                             total_time_enabled;
-       u64                             total_time_running;
-
-       /*
-        * These are timestamps used for computing total_time_enabled
-        * and total_time_running when the counter is in INACTIVE or
-        * ACTIVE state, measured in nanoseconds from an arbitrary point
-        * in time.
-        * tstamp_enabled: the notional time when the counter was enabled
-        * tstamp_running: the notional time when the counter was scheduled on
-        * tstamp_stopped: in INACTIVE state, the notional time when the
-        *      counter was scheduled off.
-        */
-       u64                             tstamp_enabled;
-       u64                             tstamp_running;
-       u64                             tstamp_stopped;
-
-       struct perf_counter_attr        attr;
-       struct hw_perf_counter          hw;
-
-       struct perf_counter_context     *ctx;
-       struct file                     *filp;
-
-       /*
-        * These accumulate total time (in nanoseconds) that children
-        * counters have been enabled and running, respectively.
-        */
-       atomic64_t                      child_total_time_enabled;
-       atomic64_t                      child_total_time_running;
-
-       /*
-        * Protect attach/detach and child_list:
-        */
-       struct mutex                    child_mutex;
-       struct list_head                child_list;
-       struct perf_counter             *parent;
-
-       int                             oncpu;
-       int                             cpu;
-
-       struct list_head                owner_entry;
-       struct task_struct              *owner;
-
-       /* mmap bits */
-       struct mutex                    mmap_mutex;
-       atomic_t                        mmap_count;
-       struct perf_mmap_data           *data;
-
-       /* poll related */
-       wait_queue_head_t               waitq;
-       struct fasync_struct            *fasync;
-
-       /* delayed work for NMIs and such */
-       int                             pending_wakeup;
-       int                             pending_kill;
-       int                             pending_disable;
-       struct perf_pending_entry       pending;
-
-       atomic_t                        event_limit;
-
-       void (*destroy)(struct perf_counter *);
-       struct rcu_head                 rcu_head;
-
-       struct pid_namespace            *ns;
-       u64                             id;
-#endif
-};
-
-/**
- * struct perf_counter_context - counter context structure
- *
- * Used as a container for task counters and CPU counters as well:
- */
-struct perf_counter_context {
-       /*
-        * Protect the states of the counters in the list,
-        * nr_active, and the list:
-        */
-       spinlock_t                      lock;
-       /*
-        * Protect the list of counters.  Locking either mutex or lock
-        * is sufficient to ensure the list doesn't change; to change
-        * the list you need to lock both the mutex and the spinlock.
-        */
-       struct mutex                    mutex;
-
-       struct list_head                counter_list;
-       struct list_head                event_list;
-       int                             nr_counters;
-       int                             nr_active;
-       int                             is_active;
-       int                             nr_stat;
-       atomic_t                        refcount;
-       struct task_struct              *task;
-
-       /*
-        * Context clock, runs when context enabled.
-        */
-       u64                             time;
-       u64                             timestamp;
-
-       /*
-        * These fields let us detect when two contexts have both
-        * been cloned (inherited) from a common ancestor.
-        */
-       struct perf_counter_context     *parent_ctx;
-       u64                             parent_gen;
-       u64                             generation;
-       int                             pin_count;
-       struct rcu_head                 rcu_head;
-};
-
-/**
- * struct perf_counter_cpu_context - per cpu counter context structure
+ * In case some app still references the old symbols:
  */
-struct perf_cpu_context {
-       struct perf_counter_context     ctx;
-       struct perf_counter_context     *task_ctx;
-       int                             active_oncpu;
-       int                             max_pertask;
-       int                             exclusive;
 
-       /*
-        * Recursion avoidance:
-        *
-        * task, softirq, irq, nmi context
-        */
-       int                             recursion[4];
-};
+#define __NR_perf_counter_open         __NR_perf_event_open
 
-#ifdef CONFIG_PERF_COUNTERS
+#define PR_TASK_PERF_COUNTERS_DISABLE  PR_TASK_PERF_EVENTS_DISABLE
+#define PR_TASK_PERF_COUNTERS_ENABLE   PR_TASK_PERF_EVENTS_ENABLE
 
-/*
- * Set by architecture code:
- */
-extern int perf_max_counters;
-
-extern const struct pmu *hw_perf_counter_init(struct perf_counter *counter);
-
-extern void perf_counter_task_sched_in(struct task_struct *task, int cpu);
-extern void perf_counter_task_sched_out(struct task_struct *task,
-                                       struct task_struct *next, int cpu);
-extern void perf_counter_task_tick(struct task_struct *task, int cpu);
-extern int perf_counter_init_task(struct task_struct *child);
-extern void perf_counter_exit_task(struct task_struct *child);
-extern void perf_counter_free_task(struct task_struct *task);
-extern void set_perf_counter_pending(void);
-extern void perf_counter_do_pending(void);
-extern void perf_counter_print_debug(void);
-extern void __perf_disable(void);
-extern bool __perf_enable(void);
-extern void perf_disable(void);
-extern void perf_enable(void);
-extern int perf_counter_task_disable(void);
-extern int perf_counter_task_enable(void);
-extern int hw_perf_group_sched_in(struct perf_counter *group_leader,
-              struct perf_cpu_context *cpuctx,
-              struct perf_counter_context *ctx, int cpu);
-extern void perf_counter_update_userpage(struct perf_counter *counter);
-
-struct perf_sample_data {
-       struct pt_regs                  *regs;
-       u64                             addr;
-       u64                             period;
-       struct perf_raw_record          *raw;
-};
-
-extern int perf_counter_overflow(struct perf_counter *counter, int nmi,
-                                struct perf_sample_data *data);
-extern void perf_counter_output(struct perf_counter *counter, int nmi,
-                               struct perf_sample_data *data);
-
-/*
- * Return 1 for a software counter, 0 for a hardware counter
- */
-static inline int is_software_counter(struct perf_counter *counter)
-{
-       return (counter->attr.type != PERF_TYPE_RAW) &&
-               (counter->attr.type != PERF_TYPE_HARDWARE) &&
-               (counter->attr.type != PERF_TYPE_HW_CACHE);
-}
-
-extern atomic_t perf_swcounter_enabled[PERF_COUNT_SW_MAX];
-
-extern void __perf_swcounter_event(u32, u64, int, struct pt_regs *, u64);
-
-static inline void
-perf_swcounter_event(u32 event, u64 nr, int nmi, struct pt_regs *regs, u64 addr)
-{
-       if (atomic_read(&perf_swcounter_enabled[event]))
-               __perf_swcounter_event(event, nr, nmi, regs, addr);
-}
-
-extern void __perf_counter_mmap(struct vm_area_struct *vma);
-
-static inline void perf_counter_mmap(struct vm_area_struct *vma)
-{
-       if (vma->vm_flags & VM_EXEC)
-               __perf_counter_mmap(vma);
-}
-
-extern void perf_counter_comm(struct task_struct *tsk);
-extern void perf_counter_fork(struct task_struct *tsk);
-
-extern struct perf_callchain_entry *perf_callchain(struct pt_regs *regs);
-
-extern int sysctl_perf_counter_paranoid;
-extern int sysctl_perf_counter_mlock;
-extern int sysctl_perf_counter_sample_rate;
-
-extern void perf_counter_init(void);
-extern void perf_tpcounter_event(int event_id, u64 addr, u64 count,
-                                void *record, int entry_size);
-
-#ifndef perf_misc_flags
-#define perf_misc_flags(regs)  (user_mode(regs) ? PERF_EVENT_MISC_USER : \
-                                PERF_EVENT_MISC_KERNEL)
-#define perf_instruction_pointer(regs) instruction_pointer(regs)
-#endif
-
-#else
-static inline void
-perf_counter_task_sched_in(struct task_struct *task, int cpu)          { }
-static inline void
-perf_counter_task_sched_out(struct task_struct *task,
-                           struct task_struct *next, int cpu)          { }
-static inline void
-perf_counter_task_tick(struct task_struct *task, int cpu)              { }
-static inline int perf_counter_init_task(struct task_struct *child)    { return 0; }
-static inline void perf_counter_exit_task(struct task_struct *child)   { }
-static inline void perf_counter_free_task(struct task_struct *task)    { }
-static inline void perf_counter_do_pending(void)                       { }
-static inline void perf_counter_print_debug(void)                      { }
-static inline void perf_disable(void)                                  { }
-static inline void perf_enable(void)                                   { }
-static inline int perf_counter_task_disable(void)      { return -EINVAL; }
-static inline int perf_counter_task_enable(void)       { return -EINVAL; }
-
-static inline void
-perf_swcounter_event(u32 event, u64 nr, int nmi,
-                    struct pt_regs *regs, u64 addr)                    { }
-
-static inline void perf_counter_mmap(struct vm_area_struct *vma)       { }
-static inline void perf_counter_comm(struct task_struct *tsk)          { }
-static inline void perf_counter_fork(struct task_struct *tsk)          { }
-static inline void perf_counter_init(void)                             { }
-#endif
-
-#endif /* __KERNEL__ */
 #endif /* _LINUX_PERF_COUNTER_H */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
new file mode 100644 (file)
index 0000000..acefaf7
--- /dev/null
@@ -0,0 +1,858 @@
+/*
+ * Performance events:
+ *
+ *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
+ *    Copyright (C) 2008-2009, Red Hat, Inc., Ingo Molnar
+ *    Copyright (C) 2008-2009, Red Hat, Inc., Peter Zijlstra
+ *
+ * Data type definitions, declarations, prototypes.
+ *
+ *    Started by: Thomas Gleixner and Ingo Molnar
+ *
+ * For licencing details see kernel-base/COPYING
+ */
+#ifndef _LINUX_PERF_EVENT_H
+#define _LINUX_PERF_EVENT_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <asm/byteorder.h>
+
+/*
+ * User-space ABI bits:
+ */
+
+/*
+ * attr.type
+ */
+enum perf_type_id {
+       PERF_TYPE_HARDWARE                      = 0,
+       PERF_TYPE_SOFTWARE                      = 1,
+       PERF_TYPE_TRACEPOINT                    = 2,
+       PERF_TYPE_HW_CACHE                      = 3,
+       PERF_TYPE_RAW                           = 4,
+
+       PERF_TYPE_MAX,                          /* non-ABI */
+};
+
+/*
+ * Generalized performance event event_id types, used by the
+ * attr.event_id parameter of the sys_perf_event_open()
+ * syscall:
+ */
+enum perf_hw_id {
+       /*
+        * Common hardware events, generalized by the kernel:
+        */
+       PERF_COUNT_HW_CPU_CYCLES                = 0,
+       PERF_COUNT_HW_INSTRUCTIONS              = 1,
+       PERF_COUNT_HW_CACHE_REFERENCES          = 2,
+       PERF_COUNT_HW_CACHE_MISSES              = 3,
+       PERF_COUNT_HW_BRANCH_INSTRUCTIONS       = 4,
+       PERF_COUNT_HW_BRANCH_MISSES             = 5,
+       PERF_COUNT_HW_BUS_CYCLES                = 6,
+
+       PERF_COUNT_HW_MAX,                      /* non-ABI */
+};
+
+/*
+ * Generalized hardware cache events:
+ *
+ *       { L1-D, L1-I, LLC, ITLB, DTLB, BPU } x
+ *       { read, write, prefetch } x
+ *       { accesses, misses }
+ */
+enum perf_hw_cache_id {
+       PERF_COUNT_HW_CACHE_L1D                 = 0,
+       PERF_COUNT_HW_CACHE_L1I                 = 1,
+       PERF_COUNT_HW_CACHE_LL                  = 2,
+       PERF_COUNT_HW_CACHE_DTLB                = 3,
+       PERF_COUNT_HW_CACHE_ITLB                = 4,
+       PERF_COUNT_HW_CACHE_BPU                 = 5,
+
+       PERF_COUNT_HW_CACHE_MAX,                /* non-ABI */
+};
+
+enum perf_hw_cache_op_id {
+       PERF_COUNT_HW_CACHE_OP_READ             = 0,
+       PERF_COUNT_HW_CACHE_OP_WRITE            = 1,
+       PERF_COUNT_HW_CACHE_OP_PREFETCH         = 2,
+
+       PERF_COUNT_HW_CACHE_OP_MAX,             /* non-ABI */
+};
+
+enum perf_hw_cache_op_result_id {
+       PERF_COUNT_HW_CACHE_RESULT_ACCESS       = 0,
+       PERF_COUNT_HW_CACHE_RESULT_MISS         = 1,
+
+       PERF_COUNT_HW_CACHE_RESULT_MAX,         /* non-ABI */
+};
+
+/*
+ * Special "software" events provided by the kernel, even if the hardware
+ * does not support performance events. These events measure various
+ * physical and sw events of the kernel (and allow the profiling of them as
+ * well):
+ */
+enum perf_sw_ids {
+       PERF_COUNT_SW_CPU_CLOCK                 = 0,
+       PERF_COUNT_SW_TASK_CLOCK                = 1,
+       PERF_COUNT_SW_PAGE_FAULTS               = 2,
+       PERF_COUNT_SW_CONTEXT_SWITCHES          = 3,
+       PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
+       PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
+       PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
+
+       PERF_COUNT_SW_MAX,                      /* non-ABI */
+};
+
+/*
+ * Bits that can be set in attr.sample_type to request information
+ * in the overflow packets.
+ */
+enum perf_event_sample_format {
+       PERF_SAMPLE_IP                          = 1U << 0,
+       PERF_SAMPLE_TID                         = 1U << 1,
+       PERF_SAMPLE_TIME                        = 1U << 2,
+       PERF_SAMPLE_ADDR                        = 1U << 3,
+       PERF_SAMPLE_READ                        = 1U << 4,
+       PERF_SAMPLE_CALLCHAIN                   = 1U << 5,
+       PERF_SAMPLE_ID                          = 1U << 6,
+       PERF_SAMPLE_CPU                         = 1U << 7,
+       PERF_SAMPLE_PERIOD                      = 1U << 8,
+       PERF_SAMPLE_STREAM_ID                   = 1U << 9,
+       PERF_SAMPLE_RAW                         = 1U << 10,
+
+       PERF_SAMPLE_MAX = 1U << 11,             /* non-ABI */
+};
+
+/*
+ * The format of the data returned by read() on a perf event fd,
+ * as specified by attr.read_format:
+ *
+ * struct read_format {
+ *     { u64           value;
+ *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *       { u64         time_running; } && PERF_FORMAT_RUNNING
+ *       { u64         id;           } && PERF_FORMAT_ID
+ *     } && !PERF_FORMAT_GROUP
+ *
+ *     { u64           nr;
+ *       { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *       { u64         time_running; } && PERF_FORMAT_RUNNING
+ *       { u64         value;
+ *         { u64       id;           } && PERF_FORMAT_ID
+ *       }             cntr[nr];
+ *     } && PERF_FORMAT_GROUP
+ * };
+ */
+enum perf_event_read_format {
+       PERF_FORMAT_TOTAL_TIME_ENABLED          = 1U << 0,
+       PERF_FORMAT_TOTAL_TIME_RUNNING          = 1U << 1,
+       PERF_FORMAT_ID                          = 1U << 2,
+       PERF_FORMAT_GROUP                       = 1U << 3,
+
+       PERF_FORMAT_MAX = 1U << 4,              /* non-ABI */
+};
+
+#define PERF_ATTR_SIZE_VER0    64      /* sizeof first published struct */
+
+/*
+ * Hardware event_id to monitor via a performance monitoring event:
+ */
+struct perf_event_attr {
+
+       /*
+        * Major type: hardware/software/tracepoint/etc.
+        */
+       __u32                   type;
+
+       /*
+        * Size of the attr structure, for fwd/bwd compat.
+        */
+       __u32                   size;
+
+       /*
+        * Type specific configuration information.
+        */
+       __u64                   config;
+
+       union {
+               __u64           sample_period;
+               __u64           sample_freq;
+       };
+
+       __u64                   sample_type;
+       __u64                   read_format;
+
+       __u64                   disabled       :  1, /* off by default        */
+                               inherit        :  1, /* children inherit it   */
+                               pinned         :  1, /* must always be on PMU */
+                               exclusive      :  1, /* only group on PMU     */
+                               exclude_user   :  1, /* don't count user      */
+                               exclude_kernel :  1, /* ditto kernel          */
+                               exclude_hv     :  1, /* ditto hypervisor      */
+                               exclude_idle   :  1, /* don't count when idle */
+                               mmap           :  1, /* include mmap data     */
+                               comm           :  1, /* include comm data     */
+                               freq           :  1, /* use freq, not period  */
+                               inherit_stat   :  1, /* per task counts       */
+                               enable_on_exec :  1, /* next exec enables     */
+                               task           :  1, /* trace fork/exit       */
+                               watermark      :  1, /* wakeup_watermark      */
+
+                               __reserved_1   : 49;
+
+       union {
+               __u32           wakeup_events;    /* wakeup every n events */
+               __u32           wakeup_watermark; /* bytes before wakeup   */
+       };
+       __u32                   __reserved_2;
+
+       __u64                   __reserved_3;
+};
+
+/*
+ * Ioctls that can be done on a perf event fd:
+ */
+#define PERF_EVENT_IOC_ENABLE          _IO ('$', 0)
+#define PERF_EVENT_IOC_DISABLE         _IO ('$', 1)
+#define PERF_EVENT_IOC_REFRESH         _IO ('$', 2)
+#define PERF_EVENT_IOC_RESET           _IO ('$', 3)
+#define PERF_EVENT_IOC_PERIOD          _IOW('$', 4, u64)
+#define PERF_EVENT_IOC_SET_OUTPUT      _IO ('$', 5)
+
+enum perf_event_ioc_flags {
+       PERF_IOC_FLAG_GROUP             = 1U << 0,
+};
+
+/*
+ * Structure of the page that can be mapped via mmap
+ */
+struct perf_event_mmap_page {
+       __u32   version;                /* version number of this structure */
+       __u32   compat_version;         /* lowest version this is compat with */
+
+       /*
+        * Bits needed to read the hw events in user-space.
+        *
+        *   u32 seq;
+        *   s64 count;
+        *
+        *   do {
+        *     seq = pc->lock;
+        *
+        *     barrier()
+        *     if (pc->index) {
+        *       count = pmc_read(pc->index - 1);
+        *       count += pc->offset;
+        *     } else
+        *       goto regular_read;
+        *
+        *     barrier();
+        *   } while (pc->lock != seq);
+        *
+        * NOTE: for obvious reason this only works on self-monitoring
+        *       processes.
+        */
+       __u32   lock;                   /* seqlock for synchronization */
+       __u32   index;                  /* hardware event identifier */
+       __s64   offset;                 /* add to hardware event value */
+       __u64   time_enabled;           /* time event active */
+       __u64   time_running;           /* time event on cpu */
+
+               /*
+                * Hole for extension of the self monitor capabilities
+                */
+
+       __u64   __reserved[123];        /* align to 1k */
+
+       /*
+        * Control data for the mmap() data buffer.
+        *
+        * User-space reading the @data_head value should issue an rmb(), on
+        * SMP capable platforms, after reading this value -- see
+        * perf_event_wakeup().
+        *
+        * When the mapping is PROT_WRITE the @data_tail value should be
+        * written by userspace to reflect the last read data. In this case
+        * the kernel will not over-write unread data.
+        */
+       __u64   data_head;              /* head in the data section */
+       __u64   data_tail;              /* user-space written tail */
+};
+
+#define PERF_RECORD_MISC_CPUMODE_MASK          (3 << 0)
+#define PERF_RECORD_MISC_CPUMODE_UNKNOWN               (0 << 0)
+#define PERF_RECORD_MISC_KERNEL                        (1 << 0)
+#define PERF_RECORD_MISC_USER                  (2 << 0)
+#define PERF_RECORD_MISC_HYPERVISOR            (3 << 0)
+
+struct perf_event_header {
+       __u32   type;
+       __u16   misc;
+       __u16   size;
+};
+
+enum perf_event_type {
+
+       /*
+        * The MMAP events record the PROT_EXEC mappings so that we can
+        * correlate userspace IPs to code. They have the following structure:
+        *
+        * struct {
+        *      struct perf_event_header        header;
+        *
+        *      u32                             pid, tid;
+        *      u64                             addr;
+        *      u64                             len;
+        *      u64                             pgoff;
+        *      char                            filename[];
+        * };
+        */
+       PERF_RECORD_MMAP                        = 1,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *      u64                             id;
+        *      u64                             lost;
+        * };
+        */
+       PERF_RECORD_LOST                        = 2,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *
+        *      u32                             pid, tid;
+        *      char                            comm[];
+        * };
+        */
+       PERF_RECORD_COMM                        = 3,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *      u32                             pid, ppid;
+        *      u32                             tid, ptid;
+        *      u64                             time;
+        * };
+        */
+       PERF_RECORD_EXIT                        = 4,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *      u64                             time;
+        *      u64                             id;
+        *      u64                             stream_id;
+        * };
+        */
+       PERF_RECORD_THROTTLE            = 5,
+       PERF_RECORD_UNTHROTTLE          = 6,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *      u32                             pid, ppid;
+        *      u32                             tid, ptid;
+        *      { u64                           time;     } && PERF_SAMPLE_TIME
+        * };
+        */
+       PERF_RECORD_FORK                        = 7,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *      u32                             pid, tid;
+        *
+        *      struct read_format              values;
+        * };
+        */
+       PERF_RECORD_READ                        = 8,
+
+       /*
+        * struct {
+        *      struct perf_event_header        header;
+        *
+        *      { u64                   ip;       } && PERF_SAMPLE_IP
+        *      { u32                   pid, tid; } && PERF_SAMPLE_TID
+        *      { u64                   time;     } && PERF_SAMPLE_TIME
+        *      { u64                   addr;     } && PERF_SAMPLE_ADDR
+        *      { u64                   id;       } && PERF_SAMPLE_ID
+        *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
+        *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
+        *      { u64                   period;   } && PERF_SAMPLE_PERIOD
+        *
+        *      { struct read_format    values;   } && PERF_SAMPLE_READ
+        *
+        *      { u64                   nr,
+        *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
+        *
+        *      #
+        *      # The RAW record below is opaque data wrt the ABI
+        *      #
+        *      # That is, the ABI doesn't make any promises wrt to
+        *      # the stability of its content, it may vary depending
+        *      # on event, hardware, kernel version and phase of
+        *      # the moon.
+        *      #
+        *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
+        *      #
+        *
+        *      { u32                   size;
+        *        char                  data[size];}&& PERF_SAMPLE_RAW
+        * };
+        */
+       PERF_RECORD_SAMPLE              = 9,
+
+       PERF_RECORD_MAX,                        /* non-ABI */
+};
+
+enum perf_callchain_context {
+       PERF_CONTEXT_HV                 = (__u64)-32,
+       PERF_CONTEXT_KERNEL             = (__u64)-128,
+       PERF_CONTEXT_USER               = (__u64)-512,
+
+       PERF_CONTEXT_GUEST              = (__u64)-2048,
+       PERF_CONTEXT_GUEST_KERNEL       = (__u64)-2176,
+       PERF_CONTEXT_GUEST_USER         = (__u64)-2560,
+
+       PERF_CONTEXT_MAX                = (__u64)-4095,
+};
+
+#define PERF_FLAG_FD_NO_GROUP  (1U << 0)
+#define PERF_FLAG_FD_OUTPUT    (1U << 1)
+
+#ifdef __KERNEL__
+/*
+ * Kernel-internal data types and definitions:
+ */
+
+#ifdef CONFIG_PERF_EVENTS
+# include <asm/perf_event.h>
+#endif
+
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/rculist.h>
+#include <linux/rcupdate.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/fs.h>
+#include <linux/pid_namespace.h>
+#include <asm/atomic.h>
+
+#define PERF_MAX_STACK_DEPTH           255
+
+struct perf_callchain_entry {
+       __u64                           nr;
+       __u64                           ip[PERF_MAX_STACK_DEPTH];
+};
+
+struct perf_raw_record {
+       u32                             size;
+       void                            *data;
+};
+
+struct task_struct;
+
+/**
+ * struct hw_perf_event - performance event hardware details:
+ */
+struct hw_perf_event {
+#ifdef CONFIG_PERF_EVENTS
+       union {
+               struct { /* hardware */
+                       u64             config;
+                       unsigned long   config_base;
+                       unsigned long   event_base;
+                       int             idx;
+               };
+               union { /* software */
+                       atomic64_t      count;
+                       struct hrtimer  hrtimer;
+               };
+       };
+       atomic64_t                      prev_count;
+       u64                             sample_period;
+       u64                             last_period;
+       atomic64_t                      period_left;
+       u64                             interrupts;
+
+       u64                             freq_count;
+       u64                             freq_interrupts;
+       u64                             freq_stamp;
+#endif
+};
+
+struct perf_event;
+
+/**
+ * struct pmu - generic performance monitoring unit
+ */
+struct pmu {
+       int (*enable)                   (struct perf_event *event);
+       void (*disable)                 (struct perf_event *event);
+       void (*read)                    (struct perf_event *event);
+       void (*unthrottle)              (struct perf_event *event);
+};
+
+/**
+ * enum perf_event_active_state - the states of a event
+ */
+enum perf_event_active_state {
+       PERF_EVENT_STATE_ERROR          = -2,
+       PERF_EVENT_STATE_OFF            = -1,
+       PERF_EVENT_STATE_INACTIVE       =  0,
+       PERF_EVENT_STATE_ACTIVE         =  1,
+};
+
+struct file;
+
+struct perf_mmap_data {
+       struct rcu_head                 rcu_head;
+       int                             nr_pages;       /* nr of data pages  */
+       int                             writable;       /* are we writable   */
+       int                             nr_locked;      /* nr pages mlocked  */
+
+       atomic_t                        poll;           /* POLL_ for wakeups */
+       atomic_t                        events;         /* event_id limit       */
+
+       atomic_long_t                   head;           /* write position    */
+       atomic_long_t                   done_head;      /* completed head    */
+
+       atomic_t                        lock;           /* concurrent writes */
+       atomic_t                        wakeup;         /* needs a wakeup    */
+       atomic_t                        lost;           /* nr records lost   */
+
+       long                            watermark;      /* wakeup watermark  */
+
+       struct perf_event_mmap_page     *user_page;
+       void                            *data_pages[0];
+};
+
+struct perf_pending_entry {
+       struct perf_pending_entry *next;
+       void (*func)(struct perf_pending_entry *);
+};
+
+/**
+ * struct perf_event - performance event kernel representation:
+ */
+struct perf_event {
+#ifdef CONFIG_PERF_EVENTS
+       struct list_head                group_entry;
+       struct list_head                event_entry;
+       struct list_head                sibling_list;
+       int                             nr_siblings;
+       struct perf_event               *group_leader;
+       struct perf_event               *output;
+       const struct pmu                *pmu;
+
+       enum perf_event_active_state    state;
+       atomic64_t                      count;
+
+       /*
+        * These are the total time in nanoseconds that the event
+        * has been enabled (i.e. eligible to run, and the task has
+        * been scheduled in, if this is a per-task event)
+        * and running (scheduled onto the CPU), respectively.
+        *
+        * They are computed from tstamp_enabled, tstamp_running and
+        * tstamp_stopped when the event is in INACTIVE or ACTIVE state.
+        */
+       u64                             total_time_enabled;
+       u64                             total_time_running;
+
+       /*
+        * These are timestamps used for computing total_time_enabled
+        * and total_time_running when the event is in INACTIVE or
+        * ACTIVE state, measured in nanoseconds from an arbitrary point
+        * in time.
+        * tstamp_enabled: the notional time when the event was enabled
+        * tstamp_running: the notional time when the event was scheduled on
+        * tstamp_stopped: in INACTIVE state, the notional time when the
+        *      event was scheduled off.
+        */
+       u64                             tstamp_enabled;
+       u64                             tstamp_running;
+       u64                             tstamp_stopped;
+
+       struct perf_event_attr  attr;
+       struct hw_perf_event            hw;
+
+       struct perf_event_context       *ctx;
+       struct file                     *filp;
+
+       /*
+        * These accumulate total time (in nanoseconds) that children
+        * events have been enabled and running, respectively.
+        */
+       atomic64_t                      child_total_time_enabled;
+       atomic64_t                      child_total_time_running;
+
+       /*
+        * Protect attach/detach and child_list:
+        */
+       struct mutex                    child_mutex;
+       struct list_head                child_list;
+       struct perf_event               *parent;
+
+       int                             oncpu;
+       int                             cpu;
+
+       struct list_head                owner_entry;
+       struct task_struct              *owner;
+
+       /* mmap bits */
+       struct mutex                    mmap_mutex;
+       atomic_t                        mmap_count;
+       struct perf_mmap_data           *data;
+
+       /* poll related */
+       wait_queue_head_t               waitq;
+       struct fasync_struct            *fasync;
+
+       /* delayed work for NMIs and such */
+       int                             pending_wakeup;
+       int                             pending_kill;
+       int                             pending_disable;
+       struct perf_pending_entry       pending;
+
+       atomic_t                        event_limit;
+
+       void (*destroy)(struct perf_event *);
+       struct rcu_head                 rcu_head;
+
+       struct pid_namespace            *ns;
+       u64                             id;
+#endif
+};
+
+/**
+ * struct perf_event_context - event context structure
+ *
+ * Used as a container for task events and CPU events as well:
+ */
+struct perf_event_context {
+       /*
+        * Protect the states of the events in the list,
+        * nr_active, and the list:
+        */
+       spinlock_t                      lock;
+       /*
+        * Protect the list of events.  Locking either mutex or lock
+        * is sufficient to ensure the list doesn't change; to change
+        * the list you need to lock both the mutex and the spinlock.
+        */
+       struct mutex                    mutex;
+
+       struct list_head                group_list;
+       struct list_head                event_list;
+       int                             nr_events;
+       int                             nr_active;
+       int                             is_active;
+       int                             nr_stat;
+       atomic_t                        refcount;
+       struct task_struct              *task;
+
+       /*
+        * Context clock, runs when context enabled.
+        */
+       u64                             time;
+       u64                             timestamp;
+
+       /*
+        * These fields let us detect when two contexts have both
+        * been cloned (inherited) from a common ancestor.
+        */
+       struct perf_event_context       *parent_ctx;
+       u64                             parent_gen;
+       u64                             generation;
+       int                             pin_count;
+       struct rcu_head                 rcu_head;
+};
+
+/**
+ * struct perf_event_cpu_context - per cpu event context structure
+ */
+struct perf_cpu_context {
+       struct perf_event_context       ctx;
+       struct perf_event_context       *task_ctx;
+       int                             active_oncpu;
+       int                             max_pertask;
+       int                             exclusive;
+
+       /*
+        * Recursion avoidance:
+        *
+        * task, softirq, irq, nmi context
+        */
+       int                             recursion[4];
+};
+
+struct perf_output_handle {
+       struct perf_event               *event;
+       struct perf_mmap_data           *data;
+       unsigned long                   head;
+       unsigned long                   offset;
+       int                             nmi;
+       int                             sample;
+       int                             locked;
+       unsigned long                   flags;
+};
+
+#ifdef CONFIG_PERF_EVENTS
+
+/*
+ * Set by architecture code:
+ */
+extern int perf_max_events;
+
+extern const struct pmu *hw_perf_event_init(struct perf_event *event);
+
+extern void perf_event_task_sched_in(struct task_struct *task, int cpu);
+extern void perf_event_task_sched_out(struct task_struct *task,
+                                       struct task_struct *next, int cpu);
+extern void perf_event_task_tick(struct task_struct *task, int cpu);
+extern int perf_event_init_task(struct task_struct *child);
+extern void perf_event_exit_task(struct task_struct *child);
+extern void perf_event_free_task(struct task_struct *task);
+extern void set_perf_event_pending(void);
+extern void perf_event_do_pending(void);
+extern void perf_event_print_debug(void);
+extern void __perf_disable(void);
+extern bool __perf_enable(void);
+extern void perf_disable(void);
+extern void perf_enable(void);
+extern int perf_event_task_disable(void);
+extern int perf_event_task_enable(void);
+extern int hw_perf_group_sched_in(struct perf_event *group_leader,
+              struct perf_cpu_context *cpuctx,
+              struct perf_event_context *ctx, int cpu);
+extern void perf_event_update_userpage(struct perf_event *event);
+
+struct perf_sample_data {
+       u64                             type;
+
+       u64                             ip;
+       struct {
+               u32     pid;
+               u32     tid;
+       }                               tid_entry;
+       u64                             time;
+       u64                             addr;
+       u64                             id;
+       u64                             stream_id;
+       struct {
+               u32     cpu;
+               u32     reserved;
+       }                               cpu_entry;
+       u64                             period;
+       struct perf_callchain_entry     *callchain;
+       struct perf_raw_record          *raw;
+};
+
+extern void perf_output_sample(struct perf_output_handle *handle,
+                              struct perf_event_header *header,
+                              struct perf_sample_data *data,
+                              struct perf_event *event);
+extern void perf_prepare_sample(struct perf_event_header *header,
+                               struct perf_sample_data *data,
+                               struct perf_event *event,
+                               struct pt_regs *regs);
+
+extern int perf_event_overflow(struct perf_event *event, int nmi,
+                                struct perf_sample_data *data,
+                                struct pt_regs *regs);
+
+/*
+ * Return 1 for a software event, 0 for a hardware event
+ */
+static inline int is_software_event(struct perf_event *event)
+{
+       return (event->attr.type != PERF_TYPE_RAW) &&
+               (event->attr.type != PERF_TYPE_HARDWARE) &&
+               (event->attr.type != PERF_TYPE_HW_CACHE);
+}
+
+extern atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX];
+
+extern void __perf_sw_event(u32, u64, int, struct pt_regs *, u64);
+
+static inline void
+perf_sw_event(u32 event_id, u64 nr, int nmi, struct pt_regs *regs, u64 addr)
+{
+       if (atomic_read(&perf_swevent_enabled[event_id]))
+               __perf_sw_event(event_id, nr, nmi, regs, addr);
+}
+
+extern void __perf_event_mmap(struct vm_area_struct *vma);
+
+static inline void perf_event_mmap(struct vm_area_struct *vma)
+{
+       if (vma->vm_flags & VM_EXEC)
+               __perf_event_mmap(vma);
+}
+
+extern void perf_event_comm(struct task_struct *tsk);
+extern void perf_event_fork(struct task_struct *tsk);
+
+extern struct perf_callchain_entry *perf_callchain(struct pt_regs *regs);
+
+extern int sysctl_perf_event_paranoid;
+extern int sysctl_perf_event_mlock;
+extern int sysctl_perf_event_sample_rate;
+
+extern void perf_event_init(void);
+extern void perf_tp_event(int event_id, u64 addr, u64 count,
+                                void *record, int entry_size);
+
+#ifndef perf_misc_flags
+#define perf_misc_flags(regs)  (user_mode(regs) ? PERF_RECORD_MISC_USER : \
+                                PERF_RECORD_MISC_KERNEL)
+#define perf_instruction_pointer(regs) instruction_pointer(regs)
+#endif
+
+extern int perf_output_begin(struct perf_output_handle *handle,
+                            struct perf_event *event, unsigned int size,
+                            int nmi, int sample);
+extern void perf_output_end(struct perf_output_handle *handle);
+extern void perf_output_copy(struct perf_output_handle *handle,
+                            const void *buf, unsigned int len);
+#else
+static inline void
+perf_event_task_sched_in(struct task_struct *task, int cpu)            { }
+static inline void
+perf_event_task_sched_out(struct task_struct *task,
+                           struct task_struct *next, int cpu)          { }
+static inline void
+perf_event_task_tick(struct task_struct *task, int cpu)                        { }
+static inline int perf_event_init_task(struct task_struct *child)      { return 0; }
+static inline void perf_event_exit_task(struct task_struct *child)     { }
+static inline void perf_event_free_task(struct task_struct *task)      { }
+static inline void perf_event_do_pending(void)                         { }
+static inline void perf_event_print_debug(void)                                { }
+static inline void perf_disable(void)                                  { }
+static inline void perf_enable(void)                                   { }
+static inline int perf_event_task_disable(void)                                { return -EINVAL; }
+static inline int perf_event_task_enable(void)                         { return -EINVAL; }
+
+static inline void
+perf_sw_event(u32 event_id, u64 nr, int nmi,
+                    struct pt_regs *regs, u64 addr)                    { }
+
+static inline void perf_event_mmap(struct vm_area_struct *vma)         { }
+static inline void perf_event_comm(struct task_struct *tsk)            { }
+static inline void perf_event_fork(struct task_struct *tsk)            { }
+static inline void perf_event_init(void)                               { }
+
+#endif
+
+#define perf_output_put(handle, x) \
+       perf_output_copy((handle), &(x), sizeof(x))
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_PERF_EVENT_H */
index b063c73..fddfafa 100644 (file)
@@ -360,6 +360,7 @@ struct pnp_driver {
        unsigned int flags;
        int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
        void (*remove) (struct pnp_dev *dev);
+       void (*shutdown) (struct pnp_dev *dev);
        int (*suspend) (struct pnp_dev *dev, pm_message_t state);
        int (*resume) (struct pnp_dev *dev);
        struct device_driver driver;
index 6729f7d..7fc194a 100644 (file)
@@ -65,6 +65,9 @@
 #define MUTEX_DEBUG_INIT       0x11
 #define MUTEX_DEBUG_FREE       0x22
 
+/********** lib/flex_array.c **********/
+#define FLEX_ARRAY_FREE        0x6c    /* for use-after-free poisoning */
+
 /********** security/ **********/
 #define KEY_DESTROY            0xbd
 
index b00df4c..07bff66 100644 (file)
@@ -85,7 +85,7 @@
 #define PR_SET_TIMERSLACK 29
 #define PR_GET_TIMERSLACK 30
 
-#define PR_TASK_PERF_COUNTERS_DISABLE          31
-#define PR_TASK_PERF_COUNTERS_ENABLE           32
+#define PR_TASK_PERF_EVENTS_DISABLE            31
+#define PR_TASK_PERF_EVENTS_ENABLE             32
 
 #endif /* _LINUX_PRCTL_H */
index e6e77d3..379eaed 100644 (file)
@@ -78,10 +78,19 @@ struct proc_dir_entry {
        struct list_head pde_openers;   /* who did ->open, but not ->release */
 };
 
+enum kcore_type {
+       KCORE_TEXT,
+       KCORE_VMALLOC,
+       KCORE_RAM,
+       KCORE_VMEMMAP,
+       KCORE_OTHER,
+};
+
 struct kcore_list {
-       struct kcore_list *next;
+       struct list_head list;
        unsigned long addr;
        size_t size;
+       int type;
 };
 
 struct vmcore {
@@ -233,11 +242,12 @@ static inline void dup_mm_exe_file(struct mm_struct *oldmm,
 #endif /* CONFIG_PROC_FS */
 
 #if !defined(CONFIG_PROC_KCORE)
-static inline void kclist_add(struct kcore_list *new, void *addr, size_t size)
+static inline void
+kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
 {
 }
 #else
-extern void kclist_add(struct kcore_list *, void *, size_t);
+extern void kclist_add(struct kcore_list *, void *, size_t, int type);
 #endif
 
 union proc_op {
index 26361c4..3ebb231 100644 (file)
@@ -135,8 +135,8 @@ static inline int sb_any_quota_active(struct super_block *sb)
 /*
  * Operations supported for diskquotas.
  */
-extern struct dquot_operations dquot_operations;
-extern struct quotactl_ops vfs_quotactl_ops;
+extern const struct dquot_operations dquot_operations;
+extern const struct quotactl_ops vfs_quotactl_ops;
 
 #define sb_dquot_ops (&dquot_operations)
 #define sb_quotactl_ops (&vfs_quotactl_ops)
index f9ddd03..589a409 100644 (file)
@@ -102,7 +102,7 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
  */
 #define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
        for (pos = rcu_dereference((head)->first);                       \
-               (!is_a_nulls(pos)) &&                   \
+               (!is_a_nulls(pos)) &&                   \
                ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
                pos = rcu_dereference(pos->next))
 
index 95e0615..6fe0363 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Read-Copy Update mechanism for mutual exclusion 
+ * Read-Copy Update mechanism for mutual exclusion
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  * Copyright IBM Corporation, 2001
  *
  * Author: Dipankar Sarma <dipankar@in.ibm.com>
- * 
+ *
  * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
  * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
  * Papers:
@@ -26,7 +26,7 @@
  * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
  *
  * For detailed explanation of Read-Copy Update mechanism see -
- *             http://lse.sourceforge.net/locking/rcupdate.html
+ *             http://lse.sourceforge.net/locking/rcupdate.html
  *
  */
 
@@ -52,8 +52,13 @@ struct rcu_head {
 };
 
 /* Exported common interfaces */
+#ifdef CONFIG_TREE_PREEMPT_RCU
 extern void synchronize_rcu(void);
+#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
+#define synchronize_rcu synchronize_sched
+#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */
 extern void synchronize_rcu_bh(void);
+extern void synchronize_sched(void);
 extern void rcu_barrier(void);
 extern void rcu_barrier_bh(void);
 extern void rcu_barrier_sched(void);
@@ -261,24 +266,6 @@ struct rcu_synchronize {
 
 extern void wakeme_after_rcu(struct rcu_head  *head);
 
-/**
- * synchronize_sched - block until all CPUs have exited any non-preemptive
- * kernel code sequences.
- *
- * This means that all preempt_disable code sequences, including NMI and
- * hardware-interrupt handlers, in progress on entry will have completed
- * before this primitive returns.  However, this does not guarantee that
- * softirq handlers will have completed, since in some kernels, these
- * handlers can run in process context, and can block.
- *
- * This primitive provides the guarantees made by the (now removed)
- * synchronize_kernel() API.  In contrast, synchronize_rcu() only
- * guarantees that rcu_read_lock() sections will have completed.
- * In "classic RCU", these two guarantees happen to be one and
- * the same, but can differ in realtime RCU implementations.
- */
-#define synchronize_sched() __synchronize_sched()
-
 /**
  * call_rcu - Queue an RCU callback for invocation after a grace period.
  * @head: structure to be used for queueing the RCU updates.
index a893077..3768277 100644 (file)
@@ -24,7 +24,7 @@
  * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
  *
  * For detailed explanation of Read-Copy Update mechanism see -
- *     Documentation/RCU
+ *     Documentation/RCU
  */
 
 #ifndef __LINUX_RCUTREE_H
@@ -53,6 +53,8 @@ static inline void __rcu_read_unlock(void)
        preempt_enable();
 }
 
+#define __synchronize_sched() synchronize_rcu()
+
 static inline void exit_rcu(void)
 {
 }
@@ -68,8 +70,6 @@ static inline void __rcu_read_unlock_bh(void)
        local_bh_enable();
 }
 
-#define __synchronize_sched() synchronize_rcu()
-
 extern void call_rcu_sched(struct rcu_head *head,
                           void (*func)(struct rcu_head *rcu));
 
index bf116d0..477841d 100644 (file)
@@ -71,14 +71,10 @@ void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned lon
 void page_add_file_rmap(struct page *);
 void page_remove_rmap(struct page *);
 
-#ifdef CONFIG_DEBUG_VM
-void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address);
-#else
-static inline void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address)
+static inline void page_dup_rmap(struct page *page)
 {
        atomic_inc(&page->_mapcount);
 }
-#endif
 
 /*
  * Called from mm/vmscan.c to handle paging out
index 8af3d24..3cbc6c0 100644 (file)
@@ -100,7 +100,7 @@ struct robust_list_head;
 struct bio;
 struct fs_struct;
 struct bts_context;
-struct perf_counter_context;
+struct perf_event_context;
 
 /*
  * List of flags we want to share for kernel threads,
@@ -140,6 +140,10 @@ extern int nr_processes(void);
 extern unsigned long nr_running(void);
 extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_iowait(void);
+extern unsigned long nr_iowait_cpu(void);
+extern unsigned long this_cpu_load(void);
+
+
 extern void calc_global_load(void);
 extern u64 cpu_nr_migrations(int cpu);
 
@@ -257,7 +261,7 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);
 extern void init_idle(struct task_struct *idle, int cpu);
 extern void init_idle_bootup_task(struct task_struct *idle);
 
-extern int runqueue_is_locked(void);
+extern int runqueue_is_locked(int cpu);
 extern void task_rq_unlock_wait(struct task_struct *p);
 
 extern cpumask_var_t nohz_cpu_mask;
@@ -422,6 +426,15 @@ static inline unsigned long get_mm_hiwater_rss(struct mm_struct *mm)
        return max(mm->hiwater_rss, get_mm_rss(mm));
 }
 
+static inline void setmax_mm_hiwater_rss(unsigned long *maxrss,
+                                        struct mm_struct *mm)
+{
+       unsigned long hiwater_rss = get_mm_hiwater_rss(mm);
+
+       if (*maxrss < hiwater_rss)
+               *maxrss = hiwater_rss;
+}
+
 static inline unsigned long get_mm_hiwater_vm(struct mm_struct *mm)
 {
        return max(mm->hiwater_vm, mm->total_vm);
@@ -434,7 +447,9 @@ extern int get_dumpable(struct mm_struct *mm);
 /* dumpable bits */
 #define MMF_DUMPABLE      0  /* core dump is permitted */
 #define MMF_DUMP_SECURELY 1  /* core file is readable only by root */
+
 #define MMF_DUMPABLE_BITS 2
+#define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1)
 
 /* coredump filter bits */
 #define MMF_DUMP_ANON_PRIVATE  2
@@ -444,6 +459,7 @@ extern int get_dumpable(struct mm_struct *mm);
 #define MMF_DUMP_ELF_HEADERS   6
 #define MMF_DUMP_HUGETLB_PRIVATE 7
 #define MMF_DUMP_HUGETLB_SHARED  8
+
 #define MMF_DUMP_FILTER_SHIFT  MMF_DUMPABLE_BITS
 #define MMF_DUMP_FILTER_BITS   7
 #define MMF_DUMP_FILTER_MASK \
@@ -457,6 +473,10 @@ extern int get_dumpable(struct mm_struct *mm);
 #else
 # define MMF_DUMP_MASK_DEFAULT_ELF     0
 #endif
+                                       /* leave room for more dump flags */
+#define MMF_VM_MERGEABLE       16      /* KSM may merge identical pages */
+
+#define MMF_INIT_MASK          (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK)
 
 struct sighand_struct {
        atomic_t                count;
@@ -601,6 +621,7 @@ struct signal_struct {
        unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
        unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
        unsigned long inblock, oublock, cinblock, coublock;
+       unsigned long maxrss, cmaxrss;
        struct task_io_accounting ioac;
 
        /*
@@ -632,6 +653,8 @@ struct signal_struct {
        unsigned audit_tty;
        struct tty_audit_buf *tty_audit_buf;
 #endif
+
+       int oom_adj;    /* OOM kill score adjustment (bit shift) */
 };
 
 /* Context switch must be unlocked if interrupts are to be enabled */
@@ -701,7 +724,7 @@ struct user_struct {
 #endif
 #endif
 
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
        atomic_long_t locked_vm;
 #endif
 };
@@ -1075,6 +1098,8 @@ struct sched_class {
        void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
                             int oldprio, int running);
 
+       unsigned int (*get_rr_interval) (struct task_struct *task);
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
        void (*moved_group) (struct task_struct *p);
 #endif
@@ -1212,7 +1237,6 @@ struct task_struct {
         * a short time
         */
        unsigned char fpu_counter;
-       s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
 #ifdef CONFIG_BLK_DEV_IO_TRACE
        unsigned int btrace_seq;
 #endif
@@ -1449,10 +1473,10 @@ struct task_struct {
        struct list_head pi_state_list;
        struct futex_pi_state *pi_state_cache;
 #endif
-#ifdef CONFIG_PERF_COUNTERS
-       struct perf_counter_context *perf_counter_ctxp;
-       struct mutex perf_counter_mutex;
-       struct list_head perf_counter_list;
+#ifdef CONFIG_PERF_EVENTS
+       struct perf_event_context *perf_event_ctxp;
+       struct mutex perf_event_mutex;
+       struct list_head perf_event_list;
 #endif
 #ifdef CONFIG_NUMA
        struct mempolicy *mempolicy;    /* Protected by alloc_lock */
@@ -1505,6 +1529,7 @@ struct task_struct {
        /* bitmask of trace recursion */
        unsigned long trace_recursion;
 #endif /* CONFIG_TRACING */
+       unsigned long stack_start;
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -1711,7 +1736,7 @@ extern cputime_t task_gtime(struct task_struct *p);
 #define PF_FROZEN      0x00010000      /* frozen for system suspend */
 #define PF_FSTRANS     0x00020000      /* inside a filesystem transaction */
 #define PF_KSWAPD      0x00040000      /* I am kswapd */
-#define PF_SWAPOFF     0x00080000      /* I am in swapoff */
+#define PF_OOM_ORIGIN  0x00080000      /* Allocating much memory to others */
 #define PF_LESS_THROTTLE 0x00100000    /* Throttle me less: I clean memory */
 #define PF_KTHREAD     0x00200000      /* I am a kernel thread */
 #define PF_RANDOMIZE   0x00400000      /* randomize virtual address space */
@@ -1753,7 +1778,6 @@ extern cputime_t task_gtime(struct task_struct *p);
 
 #define RCU_READ_UNLOCK_BLOCKED (1 << 0) /* blocked while in RCU read-side. */
 #define RCU_READ_UNLOCK_NEED_QS (1 << 1) /* RCU core needs CPU response. */
-#define RCU_READ_UNLOCK_GOT_QS  (1 << 2) /* CPU has responded to RCU core. */
 
 static inline void rcu_copy_process(struct task_struct *p)
 {
index e5bb75a..c8613c3 100644 (file)
@@ -122,6 +122,7 @@ struct serial_uart_config {
 
 /* Internal flags used only by kernel */
 #define ASYNCB_INITIALIZED     31 /* Serial port was initialized */
+#define ASYNCB_SUSPENDED       30 /* Serial port is suspended */
 #define ASYNCB_NORMAL_ACTIVE   29 /* Normal device is active */
 #define ASYNCB_BOOT_AUTOCONF   28 /* Autoconfigure port on bootup */
 #define ASYNCB_CLOSING         27 /* Serial port is closing */
@@ -133,6 +134,7 @@ struct serial_uart_config {
 #define ASYNCB_FIRST_KERNEL    22
 
 #define ASYNC_HUP_NOTIFY       (1U << ASYNCB_HUP_NOTIFY)
+#define ASYNC_SUSPENDED                (1U << ASYNCB_SUSPENDED)
 #define ASYNC_FOURPORT         (1U << ASYNCB_FOURPORT)
 #define ASYNC_SAK              (1U << ASYNCB_SAK)
 #define ASYNC_SPLIT_TERMIOS    (1U << ASYNCB_SPLIT_TERMIOS)
index d4d2a78..fb46aba 100644 (file)
@@ -22,6 +22,7 @@ struct plat_serial8250_port {
        void __iomem    *membase;       /* ioremap cookie or NULL */
        resource_size_t mapbase;        /* resource base */
        unsigned int    irq;            /* interrupt number */
+       unsigned long   irqflags;       /* request_irq flags */
        unsigned int    uartclk;        /* UART clock rate */
        void            *private_data;
        unsigned char   regshift;       /* register shift */
index 23d2fb0..d58e460 100644 (file)
@@ -20,6 +20,8 @@
 #ifndef LINUX_SERIAL_CORE_H
 #define LINUX_SERIAL_CORE_H
 
+#include <linux/serial.h>
+
 /*
  * The type definitions.  These are from Ted Ts'o's serial.h
  */
 #include <linux/sysrq.h>
 
 struct uart_port;
-struct uart_info;
 struct serial_struct;
 struct device;
 
@@ -265,6 +266,7 @@ struct uart_port {
        unsigned int            (*serial_in)(struct uart_port *, int);
        void                    (*serial_out)(struct uart_port *, int, int);
        unsigned int            irq;                    /* irq number */
+       unsigned long           irqflags;               /* irq flags  */
        unsigned int            uartclk;                /* base uart clock */
        unsigned int            fifosize;               /* tx fifo size */
        unsigned char           x_char;                 /* xon/xoff char */
@@ -283,7 +285,7 @@ struct uart_port {
 
        unsigned int            read_status_mask;       /* driver specific */
        unsigned int            ignore_status_mask;     /* driver specific */
-       struct uart_info        *info;                  /* pointer to parent info */
+       struct uart_state       *state;                 /* pointer to parent state */
        struct uart_icount      icount;                 /* statistics */
 
        struct console          *cons;                  /* struct console, if any */
@@ -334,53 +336,17 @@ struct uart_port {
        void                    *private_data;          /* generic platform data pointer */
 };
 
-/*
- * This is the state information which is only valid when the port
- * is open; it may be cleared the core driver once the device has
- * been closed.  Either the low level driver or the core can modify
- * stuff here.
- */
-typedef unsigned int __bitwise__ uif_t;
-
-struct uart_info {
-       struct tty_port         port;
-       struct circ_buf         xmit;
-       uif_t                   flags;
-
-/*
- * Definitions for info->flags.  These are _private_ to serial_core, and
- * are specific to this structure.  They may be queried by low level drivers.
- *
- * FIXME: use the ASY_ definitions
- */
-#define UIF_CHECK_CD           ((__force uif_t) (1 << 25))
-#define UIF_CTS_FLOW           ((__force uif_t) (1 << 26))
-#define UIF_NORMAL_ACTIVE      ((__force uif_t) (1 << 29))
-#define UIF_INITIALIZED                ((__force uif_t) (1 << 31))
-#define UIF_SUSPENDED          ((__force uif_t) (1 << 30))
-
-       struct tasklet_struct   tlet;
-       wait_queue_head_t       delta_msr_wait;
-};
-
 /*
  * This is the state information which is persistent across opens.
- * The low level driver must not to touch any elements contained
- * within.
  */
 struct uart_state {
-       unsigned int            close_delay;            /* msec */
-       unsigned int            closing_wait;           /* msec */
-
-#define USF_CLOSING_WAIT_INF   (0)
-#define USF_CLOSING_WAIT_NONE  (~0U)
+       struct tty_port         port;
 
-       int                     count;
        int                     pm_state;
-       struct uart_info        info;
-       struct uart_port        *port;
+       struct circ_buf         xmit;
 
-       struct mutex            mutex;
+       struct tasklet_struct   tlet;
+       struct uart_port        *uart_port;
 };
 
 #define UART_XMIT_SIZE PAGE_SIZE
@@ -461,7 +427,7 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
 
 static inline int uart_tx_stopped(struct uart_port *port)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
        if(tty->stopped || tty->hw_stopped)
                return 1;
        return 0;
@@ -476,7 +442,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
        if (port->sysrq) {
                if (ch && time_before(jiffies, port->sysrq)) {
-                       handle_sysrq(ch, port->info->port.tty);
+                       handle_sysrq(ch, port->state->port.tty);
                        port->sysrq = 0;
                        return 1;
                }
@@ -494,7 +460,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
  */
 static inline int uart_handle_break(struct uart_port *port)
 {
-       struct uart_info *info = port->info;
+       struct uart_state *state = port->state;
 #ifdef SUPPORT_SYSRQ
        if (port->cons && port->cons->index == port->line) {
                if (!port->sysrq) {
@@ -505,7 +471,7 @@ static inline int uart_handle_break(struct uart_port *port)
        }
 #endif
        if (port->flags & UPF_SAK)
-               do_SAK(info->port.tty);
+               do_SAK(state->port.tty);
        return 0;
 }
 
@@ -515,22 +481,23 @@ static inline int uart_handle_break(struct uart_port *port)
  *     @status: new carrier detect status, nonzero if active
  */
 static inline void
-uart_handle_dcd_change(struct uart_port *port, unsigned int status)
+uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
 {
-       struct uart_info *info = port->info;
+       struct uart_state *state = uport->state;
+       struct tty_port *port = &state->port;
 
-       port->icount.dcd++;
+       uport->icount.dcd++;
 
 #ifdef CONFIG_HARD_PPS
-       if ((port->flags & UPF_HARDPPS_CD) && status)
+       if ((uport->flags & UPF_HARDPPS_CD) && status)
                hardpps();
 #endif
 
-       if (info->flags & UIF_CHECK_CD) {
+       if (port->flags & ASYNC_CHECK_CD) {
                if (status)
-                       wake_up_interruptible(&info->port.open_wait);
-               else if (info->port.tty)
-                       tty_hangup(info->port.tty);
+                       wake_up_interruptible(&port->open_wait);
+               else if (port->tty)
+                       tty_hangup(port->tty);
        }
 }
 
@@ -540,24 +507,24 @@ uart_handle_dcd_change(struct uart_port *port, unsigned int status)
  *     @status: new clear to send status, nonzero if active
  */
 static inline void
-uart_handle_cts_change(struct uart_port *port, unsigned int status)
+uart_handle_cts_change(struct uart_port *uport, unsigned int status)
 {
-       struct uart_info *info = port->info;
-       struct tty_struct *tty = info->port.tty;
+       struct tty_port *port = &uport->state->port;
+       struct tty_struct *tty = port->tty;
 
-       port->icount.cts++;
+       uport->icount.cts++;
 
-       if (info->flags & UIF_CTS_FLOW) {
+       if (port->flags & ASYNC_CTS_FLOW) {
                if (tty->hw_stopped) {
                        if (status) {
                                tty->hw_stopped = 0;
-                               port->ops->start_tx(port);
-                               uart_write_wakeup(port);
+                               uport->ops->start_tx(uport);
+                               uart_write_wakeup(uport);
                        }
                } else {
                        if (!status) {
                                tty->hw_stopped = 1;
-                               port->ops->stop_tx(port);
+                               uport->ops->stop_tx(uport);
                        }
                }
        }
@@ -569,7 +536,7 @@ static inline void
 uart_insert_char(struct uart_port *port, unsigned int status,
                 unsigned int overrun, unsigned int ch, unsigned int flag)
 {
-       struct tty_struct *tty = port->info->port.tty;
+       struct tty_struct *tty = port->state->port.tty;
 
        if ((status & port->ignore_status_mask & ~overrun) == 0)
                tty_insert_flip_char(tty, ch, flag);
diff --git a/include/linux/spi/mc33880.h b/include/linux/spi/mc33880.h
new file mode 100644 (file)
index 0000000..82ffccd
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef LINUX_SPI_MC33880_H
+#define LINUX_SPI_MC33880_H
+
+struct mc33880_platform_data {
+       /* number assigned to the first GPIO */
+       unsigned        base;
+};
+
+#endif
+
index c47c4b4..97b60b3 100644 (file)
@@ -20,6 +20,7 @@
 #define __LINUX_SPI_H
 
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 
 /*
  * INTERFACES between SPI master-side drivers and SPI infrastructure.
@@ -86,7 +87,7 @@ struct spi_device {
        int                     irq;
        void                    *controller_state;
        void                    *controller_data;
-       char                    modalias[32];
+       char                    modalias[SPI_NAME_SIZE];
 
        /*
         * likely need more hooks for more protocol options affecting how
@@ -145,6 +146,7 @@ struct spi_message;
 
 /**
  * struct spi_driver - Host side "protocol" driver
+ * @id_table: List of SPI devices supported by this driver
  * @probe: Binds this driver to the spi device.  Drivers can verify
  *     that the device is actually present, and may need to configure
  *     characteristics (such as bits_per_word) which weren't needed for
@@ -170,6 +172,7 @@ struct spi_message;
  * MMC, RTC, filesystem character device nodes, and hardware monitoring.
  */
 struct spi_driver {
+       const struct spi_device_id *id_table;
        int                     (*probe)(struct spi_device *spi);
        int                     (*remove)(struct spi_device *spi);
        void                    (*shutdown)(struct spi_device *spi);
@@ -207,6 +210,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  *     each slave has a chipselect signal, but it's common that not
  *     every chipselect is connected to a slave.
  * @dma_alignment: SPI controller constraint on DMA buffers alignment.
+ * @mode_bits: flags understood by this controller driver
+ * @flags: other constraints relevant to this driver
  * @setup: updates the device mode and clocking records used by a
  *     device's SPI controller; protocol code may call this.  This
  *     must fail if an unrecognized or unsupported mode is requested.
@@ -253,6 +258,8 @@ struct spi_master {
        /* other constraints relevant to this driver */
        u16                     flags;
 #define SPI_MASTER_HALF_DUPLEX BIT(0)          /* can't do full duplex */
+#define SPI_MASTER_NO_RX       BIT(1)          /* can't do buffer read */
+#define SPI_MASTER_NO_TX       BIT(2)          /* can't do buffer write */
 
        /* Setup mode and clock, etc (spi driver may call many times).
         *
@@ -533,42 +540,7 @@ static inline void spi_message_free(struct spi_message *m)
 }
 
 extern int spi_setup(struct spi_device *spi);
-
-/**
- * spi_async - asynchronous SPI transfer
- * @spi: device with which data will be exchanged
- * @message: describes the data transfers, including completion callback
- * Context: any (irqs may be blocked, etc)
- *
- * This call may be used in_irq and other contexts which can't sleep,
- * as well as from task contexts which can sleep.
- *
- * The completion callback is invoked in a context which can't sleep.
- * Before that invocation, the value of message->status is undefined.
- * When the callback is issued, message->status holds either zero (to
- * indicate complete success) or a negative error code.  After that
- * callback returns, the driver which issued the transfer request may
- * deallocate the associated memory; it's no longer in use by any SPI
- * core or controller driver code.
- *
- * Note that although all messages to a spi_device are handled in
- * FIFO order, messages may go to different devices in other orders.
- * Some device might be higher priority, or have various "hard" access
- * time requirements, for example.
- *
- * On detection of any fault during the transfer, processing of
- * the entire message is aborted, and the device is deselected.
- * Until returning from the associated message completion callback,
- * no other spi_message queued to that device will be processed.
- * (This rule applies equally to all the synchronous transfer calls,
- * which are wrappers around this core asynchronous primitive.)
- */
-static inline int
-spi_async(struct spi_device *spi, struct spi_message *message)
-{
-       message->spi = spi;
-       return spi->master->transfer(spi, message);
-}
+extern int spi_async(struct spi_device *spi, struct spi_message *message);
 
 /*---------------------------------------------------------------------------*/
 
@@ -732,7 +704,7 @@ struct spi_board_info {
         * controller_data goes to spi_device.controller_data,
         * irq is copied too
         */
-       char            modalias[32];
+       char            modalias[SPI_NAME_SIZE];
        const void      *platform_data;
        void            *controller_data;
        int             irq;
@@ -800,4 +772,7 @@ spi_unregister_device(struct spi_device *spi)
                device_unregister(&spi->dev);
 }
 
+extern const struct spi_device_id *
+spi_get_device_id(const struct spi_device *sdev);
+
 #endif /* __LINUX_SPI_H */
index 3f63218..996df4d 100644 (file)
@@ -111,7 +111,7 @@ struct rpc_credops {
        void                    (*crdestroy)(struct rpc_cred *);
 
        int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-       void                    (*crbind)(struct rpc_task *, struct rpc_cred *);
+       void                    (*crbind)(struct rpc_task *, struct rpc_cred *, int);
        __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
        int                     (*crrefresh)(struct rpc_task *);
        __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
@@ -140,7 +140,7 @@ struct rpc_cred *   rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *
 void                   rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
 struct rpc_cred *      rpcauth_lookupcred(struct rpc_auth *, int);
 void                   rpcauth_bindcred(struct rpc_task *, struct rpc_cred *, int);
-void                   rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *);
+void                   rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *, int);
 void                   put_rpccred(struct rpc_cred *);
 void                   rpcauth_unbindcred(struct rpc_task *);
 __be32 *               rpcauth_marshcred(struct rpc_task *, __be32 *);
index ab3f6e9..8ed9642 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/sunrpc/timer.h>
 #include <asm/signal.h>
 #include <linux/path.h>
+#include <net/ipv6.h>
 
 struct rpc_inode;
 
@@ -113,6 +114,7 @@ struct rpc_create_args {
        rpc_authflavor_t        authflavor;
        unsigned long           flags;
        char                    *client_name;
+       struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 };
 
 /* Values for "flags" field */
@@ -188,5 +190,117 @@ static inline void rpc_set_port(struct sockaddr *sap,
 #define IPV6_SCOPE_DELIMITER           '%'
 #define IPV6_SCOPE_ID_LEN              sizeof("%nnnnnnnnnn")
 
+static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+                                  const struct sockaddr *sap2)
+{
+       const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
+       const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
+
+       return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
+}
+
+static inline bool __rpc_copy_addr4(struct sockaddr *dst,
+                                   const struct sockaddr *src)
+{
+       const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
+       struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+
+       dsin->sin_family = ssin->sin_family;
+       dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
+       return true;
+}
+
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                  const struct sockaddr *sap2)
+{
+       const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
+       const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
+       return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
+}
+
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                   const struct sockaddr *src)
+{
+       const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
+       struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
+
+       dsin6->sin6_family = ssin6->sin6_family;
+       ipv6_addr_copy(&dsin6->sin6_addr, &ssin6->sin6_addr);
+       return true;
+}
+#else  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                  const struct sockaddr *sap2)
+{
+       return false;
+}
+
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                   const struct sockaddr *src)
+{
+       return false;
+}
+#endif /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+
+/**
+ * rpc_cmp_addr - compare the address portion of two sockaddrs.
+ * @sap1: first sockaddr
+ * @sap2: second sockaddr
+ *
+ * Just compares the family and address portion. Ignores port, scope, etc.
+ * Returns true if the addrs are equal, false if they aren't.
+ */
+static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
+                               const struct sockaddr *sap2)
+{
+       if (sap1->sa_family == sap2->sa_family) {
+               switch (sap1->sa_family) {
+               case AF_INET:
+                       return __rpc_cmp_addr4(sap1, sap2);
+               case AF_INET6:
+                       return __rpc_cmp_addr6(sap1, sap2);
+               }
+       }
+       return false;
+}
+
+/**
+ * rpc_copy_addr - copy the address portion of one sockaddr to another
+ * @dst: destination sockaddr
+ * @src: source sockaddr
+ *
+ * Just copies the address portion and family. Ignores port, scope, etc.
+ * Caller is responsible for making certain that dst is large enough to hold
+ * the address in src. Returns true if address family is supported. Returns
+ * false otherwise.
+ */
+static inline bool rpc_copy_addr(struct sockaddr *dst,
+                                const struct sockaddr *src)
+{
+       switch (src->sa_family) {
+       case AF_INET:
+               return __rpc_copy_addr4(dst, src);
+       case AF_INET6:
+               return __rpc_copy_addr6(dst, src);
+       }
+       return false;
+}
+
+/**
+ * rpc_get_scope_id - return scopeid for a given sockaddr
+ * @sa: sockaddr to get scopeid from
+ *
+ * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
+ * not an AF_INET6 address.
+ */
+static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+{
+       if (sa->sa_family != AF_INET6)
+               return 0;
+
+       return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
+}
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_CLNT_H */
index ea80096..52e8cb0 100644 (file)
@@ -94,8 +94,6 @@ struct svc_serv {
        struct module *         sv_module;      /* optional module to count when
                                                 * adding threads */
        svc_thread_fn           sv_function;    /* main function for threads */
-       unsigned int            sv_drc_max_pages; /* Total pages for DRC */
-       unsigned int            sv_drc_pages_used;/* DRC pages used */
 #if defined(CONFIG_NFS_V4_1)
        struct list_head        sv_cb_list;     /* queue for callback requests
                                                 * that arrive over the same
index 2223ae0..5f4e18b 100644 (file)
@@ -65,6 +65,7 @@ struct svc_xprt {
        size_t                  xpt_locallen;   /* length of address */
        struct sockaddr_storage xpt_remote;     /* remote peer's address */
        size_t                  xpt_remotelen;  /* length of address */
+       struct rpc_wait_queue   xpt_bc_pending; /* backchannel wait queue */
 };
 
 int    svc_reg_xprt_class(struct svc_xprt_class *);
index 04dba23..1b353a7 100644 (file)
@@ -28,6 +28,7 @@ struct svc_sock {
        /* private TCP part */
        u32                     sk_reclen;      /* length of record */
        u32                     sk_tcplen;      /* current read length */
+       struct rpc_xprt         *sk_bc_xprt;    /* NFSv4.1 backchannel xprt */
 };
 
 /*
index c090df4..6f9457a 100644 (file)
@@ -124,6 +124,23 @@ struct rpc_xprt_ops {
        void            (*print_stats)(struct rpc_xprt *xprt, struct seq_file *seq);
 };
 
+/*
+ * RPC transport identifiers
+ *
+ * To preserve compatibility with the historical use of raw IP protocol
+ * id's for transport selection, UDP and TCP identifiers are specified
+ * with the previous values. No such restriction exists for new transports,
+ * except that they may not collide with these values (17 and 6,
+ * respectively).
+ */
+#define XPRT_TRANSPORT_BC       (1 << 31)
+enum xprt_transports {
+       XPRT_TRANSPORT_UDP      = IPPROTO_UDP,
+       XPRT_TRANSPORT_TCP      = IPPROTO_TCP,
+       XPRT_TRANSPORT_BC_TCP   = IPPROTO_TCP | XPRT_TRANSPORT_BC,
+       XPRT_TRANSPORT_RDMA     = 256
+};
+
 struct rpc_xprt {
        struct kref             kref;           /* Reference count */
        struct rpc_xprt_ops *   ops;            /* transport methods */
@@ -179,6 +196,7 @@ struct rpc_xprt {
        spinlock_t              reserve_lock;   /* lock slot table */
        u32                     xid;            /* Next XID value to use */
        struct rpc_task *       snd_task;       /* Task blocked in send */
+       struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 #if defined(CONFIG_NFS_V4_1)
        struct svc_serv         *bc_serv;       /* The RPC service which will */
                                                /* process the callback */
@@ -231,6 +249,7 @@ struct xprt_create {
        struct sockaddr *       srcaddr;        /* optional local address */
        struct sockaddr *       dstaddr;        /* remote peer address */
        size_t                  addrlen;
+       struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 };
 
 struct xprt_class {
index 54a379c..c2f04e1 100644 (file)
 #ifndef _LINUX_SUNRPC_XPRTRDMA_H
 #define _LINUX_SUNRPC_XPRTRDMA_H
 
-/*
- * RPC transport identifier for RDMA
- */
-#define XPRT_TRANSPORT_RDMA    256
-
 /*
  * rpcbind (v3+) RDMA netid.
  */
index c2a46c4..3f14a02 100644 (file)
 int            init_socket_xprt(void);
 void           cleanup_socket_xprt(void);
 
-/*
- * RPC transport identifiers for UDP, TCP
- *
- * To preserve compatibility with the historical use of raw IP protocol
- * id's for transport selection, these are specified with the previous
- * values. No such restriction exists for new transports, except that
- * they may not collide with these values (17 and 6, respectively).
- */
-#define XPRT_TRANSPORT_UDP     IPPROTO_UDP
-#define XPRT_TRANSPORT_TCP     IPPROTO_TCP
-
 /*
  * RPC slot table sizes for UDP, TCP transports
  */
index 7c15334..6c990e6 100644 (file)
@@ -419,10 +419,22 @@ static inline swp_entry_t get_swap_page(void)
 }
 
 /* linux/mm/thrash.c */
-#define put_swap_token(mm)     do { } while (0)
-#define grab_swap_token(mm)    do { } while (0)
-#define has_swap_token(mm)     0
-#define disable_swap_token()   do { } while (0)
+static inline void put_swap_token(struct mm_struct *mm)
+{
+}
+
+static inline void grab_swap_token(struct mm_struct *mm)
+{
+}
+
+static inline int has_swap_token(struct mm_struct *mm)
+{
+       return 0;
+}
+
+static inline void disable_swap_token(void)
+{
+}
 
 static inline void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
index a8e3782..a990ace 100644 (file)
@@ -55,7 +55,7 @@ struct compat_timeval;
 struct robust_list_head;
 struct getcpu_cache;
 struct old_linux_dirent;
-struct perf_counter_attr;
+struct perf_event_attr;
 
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -100,33 +100,25 @@ struct perf_counter_attr;
 
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE(sname)                                        \
-static int prof_sysenter_enable_##sname(struct ftrace_event_call *event_call)  \
+static int prof_sysenter_enable_##sname(void)                                 \
 {                                                                             \
-       int ret = 0;                                                           \
-       if (!atomic_inc_return(&event_enter_##sname.profile_count))            \
-               ret = reg_prof_syscall_enter("sys"#sname);                     \
-       return ret;                                                            \
+       return reg_prof_syscall_enter("sys"#sname);                            \
 }                                                                             \
                                                                               \
-static void prof_sysenter_disable_##sname(struct ftrace_event_call *event_call)\
+static void prof_sysenter_disable_##sname(void)                                       \
 {                                                                             \
-       if (atomic_add_negative(-1, &event_enter_##sname.profile_count))       \
-               unreg_prof_syscall_enter("sys"#sname);                         \
+       unreg_prof_syscall_enter("sys"#sname);                                 \
 }
 
 #define TRACE_SYS_EXIT_PROFILE(sname)                                         \
-static int prof_sysexit_enable_##sname(struct ftrace_event_call *event_call)   \
+static int prof_sysexit_enable_##sname(void)                                  \
 {                                                                             \
-       int ret = 0;                                                           \
-       if (!atomic_inc_return(&event_exit_##sname.profile_count))             \
-               ret = reg_prof_syscall_exit("sys"#sname);                      \
-       return ret;                                                            \
+       return reg_prof_syscall_exit("sys"#sname);                             \
 }                                                                             \
                                                                               \
-static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
+static void prof_sysexit_disable_##sname(void)                                \
 {                                                                              \
-       if (atomic_add_negative(-1, &event_exit_##sname.profile_count))        \
-               unreg_prof_syscall_exit("sys"#sname);                          \
+       unreg_prof_syscall_exit("sys"#sname);                                  \
 }
 
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                   \
@@ -468,8 +460,7 @@ asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
                                void __user *data);
 asmlinkage long sys_umount(char __user *name, int flags);
 asmlinkage long sys_oldumount(char __user *name);
-asmlinkage long sys_truncate(const char __user *path,
-                               unsigned long length);
+asmlinkage long sys_truncate(const char __user *path, long length);
 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
 asmlinkage long sys_stat(char __user *filename,
                        struct __old_kernel_stat __user *statbuf);
@@ -885,7 +876,7 @@ asmlinkage long sys_ppoll(struct pollfd __user *, unsigned int,
 int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
 
 
-asmlinkage long sys_perf_counter_open(
-               struct perf_counter_attr __user *attr_uptr,
+asmlinkage long sys_perf_event_open(
+               struct perf_event_attr __user *attr_uptr,
                pid_t pid, int cpu, int group_fd, unsigned long flags);
 #endif
index a916a31..f0f43d0 100644 (file)
@@ -187,7 +187,12 @@ struct tty_port;
 struct tty_port_operations {
        /* Return 1 if the carrier is raised */
        int (*carrier_raised)(struct tty_port *port);
+       /* Control the DTR line */
        void (*dtr_rts)(struct tty_port *port, int raise);
+       /* Called when the last close completes or a hangup finishes
+          IFF the port was initialized. Do not use to free resources */
+       void (*shutdown)(struct tty_port *port);
+       void (*drop)(struct tty_port *port);
 };
        
 struct tty_port {
@@ -198,11 +203,12 @@ struct tty_port {
        int                     count;          /* Usage count */
        wait_queue_head_t       open_wait;      /* Open waiters */
        wait_queue_head_t       close_wait;     /* Close waiters */
+       wait_queue_head_t       delta_msr_wait; /* Modem status change */
        unsigned long           flags;          /* TTY flags ASY_*/
        struct mutex            mutex;          /* Locking */
        unsigned char           *xmit_buf;      /* Optional buffer */
-       int                     close_delay;    /* Close port delay */
-       int                     closing_wait;   /* Delay for output */
+       unsigned int            close_delay;    /* Close port delay */
+       unsigned int            closing_wait;   /* Delay for output */
        int                     drain_delay;    /* Set to zero if no pure time
                                                   based drain is needed else
                                                   set to size of fifo */
@@ -459,6 +465,12 @@ extern int tty_port_block_til_ready(struct tty_port *port,
 extern int tty_port_close_start(struct tty_port *port,
                                struct tty_struct *tty, struct file *filp);
 extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
+extern void tty_port_close(struct tty_port *port,
+                               struct tty_struct *tty, struct file *filp);
+extern inline int tty_port_users(struct tty_port *port)
+{
+       return port->count + port->blocked_open;
+}
 
 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
@@ -524,5 +536,8 @@ extern int pcxe_open(struct tty_struct *tty, struct file *filp);
 extern int vt_ioctl(struct tty_struct *tty, struct file *file,
                    unsigned int cmd, unsigned long arg);
 
+extern long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
+                    unsigned int cmd, unsigned long arg);
+
 #endif /* __KERNEL__ */
 #endif
index ae779bb..adb4406 100644 (file)
@@ -26,6 +26,7 @@
 #include <sound/ac97_codec.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 
 /*
  * UCB1400 AC-link registers
 #define UCB_ID                 0x7e
 #define UCB_ID_1400             0x4304
 
+struct ucb1400_gpio_data {
+       int gpio_offset;
+       int (*gpio_setup)(struct device *dev, int ngpio);
+       int (*gpio_teardown)(struct device *dev, int ngpio);
+};
+
+struct ucb1400_gpio {
+       struct gpio_chip        gc;
+       struct snd_ac97         *ac97;
+};
+
 struct ucb1400_ts {
        struct input_dev        *ts_idev;
        struct task_struct      *ts_task;
@@ -95,6 +107,7 @@ struct ucb1400_ts {
 
 struct ucb1400 {
        struct platform_device  *ucb1400_ts;
+       struct platform_device  *ucb1400_gpio;
 };
 
 static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
@@ -147,4 +160,10 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
 unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
                              int adcsync);
 
+#ifdef CONFIG_GPIO_UCB1400
+void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data);
+#else
+static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {}
+#endif
+
 #endif
index b1e3c2f..a34fa89 100644 (file)
@@ -195,7 +195,7 @@ struct usb_interface {
 
        struct device dev;              /* interface specific device info */
        struct device *usb_dev;
-       int pm_usage_cnt;               /* usage counter for autosuspend */
+       atomic_t pm_usage_cnt;          /* usage counter for autosuspend */
        struct work_struct reset_ws;    /* for resets in atomic context */
 };
 #define        to_usb_interface(d) container_of(d, struct usb_interface, dev)
@@ -551,13 +551,13 @@ extern void usb_autopm_put_interface_async(struct usb_interface *intf);
 
 static inline void usb_autopm_enable(struct usb_interface *intf)
 {
-       intf->pm_usage_cnt = 0;
+       atomic_set(&intf->pm_usage_cnt, 0);
        usb_autopm_set_interface(intf);
 }
 
 static inline void usb_autopm_disable(struct usb_interface *intf)
 {
-       intf->pm_usage_cnt = 1;
+       atomic_set(&intf->pm_usage_cnt, 1);
        usb_autopm_set_interface(intf);
 }
 
@@ -922,7 +922,7 @@ extern struct bus_type usb_bus_type;
 /**
  * struct usb_class_driver - identifies a USB driver that wants to use the USB major number
  * @name: the usb class device name for this driver.  Will show up in sysfs.
- * @nodename: Callback to provide a naming hint for a possible
+ * @devnode: Callback to provide a naming hint for a possible
  *     device node to create.
  * @fops: pointer to the struct file_operations of this driver.
  * @minor_base: the start of the minor range for this driver.
@@ -933,7 +933,7 @@ extern struct bus_type usb_bus_type;
  */
 struct usb_class_driver {
        char *name;
-       char *(*nodename)(struct device *dev);
+       char *(*devnode)(struct device *dev, mode_t *mode);
        const struct file_operations *fops;
        int minor_base;
 };
@@ -1036,9 +1036,10 @@ typedef void (*usb_complete_t)(struct urb *);
  * @transfer_flags: A variety of flags may be used to affect how URB
  *     submission, unlinking, or operation are handled.  Different
  *     kinds of URB can use different flags.
- * @transfer_buffer:  This identifies the buffer to (or from) which
- *     the I/O request will be performed (unless URB_NO_TRANSFER_DMA_MAP
- *     is set).  This buffer must be suitable for DMA; allocate it with
+ * @transfer_buffer:  This identifies the buffer to (or from) which the I/O
+ *     request will be performed unless URB_NO_TRANSFER_DMA_MAP is set
+ *     (however, do not leave garbage in transfer_buffer even then).
+ *     This buffer must be suitable for DMA; allocate it with
  *     kmalloc() or equivalent.  For transfers to "in" endpoints, contents
  *     of this buffer will be modified.  This buffer is used for the data
  *     stage of control transfers.
@@ -1071,7 +1072,7 @@ typedef void (*usb_complete_t)(struct urb *);
  * @start_frame: Returns the initial frame for isochronous transfers.
  * @number_of_packets: Lists the number of ISO transfer buffers.
  * @interval: Specifies the polling interval for interrupt or isochronous
- *     transfers.  The units are frames (milliseconds) for for full and low
+ *     transfers.  The units are frames (milliseconds) for full and low
  *     speed devices, and microframes (1/8 millisecond) for highspeed ones.
  * @error_count: Returns the number of ISO transfers that reported errors.
  * @context: For use in completion functions.  This normally points to
@@ -1104,9 +1105,15 @@ typedef void (*usb_complete_t)(struct urb *);
  * allocate a DMA buffer with usb_buffer_alloc() or call usb_buffer_map().
  * When these transfer flags are provided, host controller drivers will
  * attempt to use the dma addresses found in the transfer_dma and/or
- * setup_dma fields rather than determining a dma address themselves.  (Note
- * that transfer_buffer and setup_packet must still be set because not all
- * host controllers use DMA, nor do virtual root hubs).
+ * setup_dma fields rather than determining a dma address themselves.
+ *
+ * Note that transfer_buffer must still be set if the controller
+ * does not support DMA (as indicated by bus.uses_dma) and when talking
+ * to root hub. If you have to trasfer between highmem zone and the device
+ * on such controller, create a bounce buffer or bail out with an error.
+ * If transfer_buffer cannot be set (is in highmem) and the controller is DMA
+ * capable, assign NULL to it, so that usbmon knows not to use the value.
+ * The setup_packet must always be set, so it cannot be located in highmem.
  *
  * Initialization:
  *
index b5744bc..eaf9dff 100644 (file)
 #define USB_SUBCLASS_AUDIOCONTROL      0x01
 #define USB_SUBCLASS_AUDIOSTREAMING    0x02
 #define USB_SUBCLASS_MIDISTREAMING     0x03
-#define USB_SUBCLASS_VENDOR_SPEC       0xff
-
-/* A.5 Audio Class-Specific AC interface Descriptor Subtypes*/
-#define HEADER                         0x01
-#define INPUT_TERMINAL                 0x02
-#define OUTPUT_TERMINAL                        0x03
-#define MIXER_UNIT                     0x04
-#define SELECTOR_UNIT                  0x05
-#define FEATURE_UNIT                   0x06
-#define PROCESSING_UNIT                        0x07
-#define EXTENSION_UNIT                 0x08
-
-#define AS_GENERAL                     0x01
-#define FORMAT_TYPE                    0x02
-#define FORMAT_SPECIFIC                        0x03
-
-#define EP_GENERAL                     0x01
-
-#define MS_GENERAL                     0x01
-#define MIDI_IN_JACK                   0x02
-#define MIDI_OUT_JACK                  0x03
-
-/* endpoint attributes */
-#define EP_ATTR_MASK                   0x0c
-#define EP_ATTR_ASYNC                  0x04
-#define EP_ATTR_ADAPTIVE               0x08
-#define EP_ATTR_SYNC                   0x0c
-
-/* cs endpoint attributes */
-#define EP_CS_ATTR_SAMPLE_RATE         0x01
-#define EP_CS_ATTR_PITCH_CONTROL       0x02
-#define EP_CS_ATTR_FILL_MAX            0x80
-
-/* Audio Class specific Request Codes */
-#define USB_AUDIO_SET_INTF             0x21
-#define USB_AUDIO_SET_ENDPOINT         0x22
-#define USB_AUDIO_GET_INTF             0xa1
-#define USB_AUDIO_GET_ENDPOINT         0xa2
-
-#define SET_   0x00
-#define GET_   0x80
-
-#define _CUR   0x1
-#define _MIN   0x2
-#define _MAX   0x3
-#define _RES   0x4
-#define _MEM   0x5
-
-#define SET_CUR                (SET_ | _CUR)
-#define GET_CUR                (GET_ | _CUR)
-#define SET_MIN                (SET_ | _MIN)
-#define GET_MIN                (GET_ | _MIN)
-#define SET_MAX                (SET_ | _MAX)
-#define GET_MAX                (GET_ | _MAX)
-#define SET_RES                (SET_ | _RES)
-#define GET_RES                (GET_ | _RES)
-#define SET_MEM                (SET_ | _MEM)
-#define GET_MEM                (GET_ | _MEM)
-
-#define GET_STAT       0xff
-
-#define USB_AC_TERMINAL_UNDEFINED      0x100
-#define USB_AC_TERMINAL_STREAMING      0x101
-#define USB_AC_TERMINAL_VENDOR_SPEC    0x1FF
+
+/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
+#define UAC_HEADER                     0x01
+#define UAC_INPUT_TERMINAL             0x02
+#define UAC_OUTPUT_TERMINAL            0x03
+#define UAC_MIXER_UNIT                 0x04
+#define UAC_SELECTOR_UNIT              0x05
+#define UAC_FEATURE_UNIT               0x06
+#define UAC_PROCESSING_UNIT            0x07
+#define UAC_EXTENSION_UNIT             0x08
+
+/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
+#define UAC_AS_GENERAL                 0x01
+#define UAC_FORMAT_TYPE                        0x02
+#define UAC_FORMAT_SPECIFIC            0x03
+
+/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
+#define UAC_EP_GENERAL                 0x01
+
+/* A.9 Audio Class-Specific Request Codes */
+#define UAC_SET_                       0x00
+#define UAC_GET_                       0x80
+
+#define UAC__CUR                       0x1
+#define UAC__MIN                       0x2
+#define UAC__MAX                       0x3
+#define UAC__RES                       0x4
+#define UAC__MEM                       0x5
+
+#define UAC_SET_CUR                    (UAC_SET_ | UAC__CUR)
+#define UAC_GET_CUR                    (UAC_GET_ | UAC__CUR)
+#define UAC_SET_MIN                    (UAC_SET_ | UAC__MIN)
+#define UAC_GET_MIN                    (UAC_GET_ | UAC__MIN)
+#define UAC_SET_MAX                    (UAC_SET_ | UAC__MAX)
+#define UAC_GET_MAX                    (UAC_GET_ | UAC__MAX)
+#define UAC_SET_RES                    (UAC_SET_ | UAC__RES)
+#define UAC_GET_RES                    (UAC_GET_ | UAC__RES)
+#define UAC_SET_MEM                    (UAC_SET_ | UAC__MEM)
+#define UAC_GET_MEM                    (UAC_GET_ | UAC__MEM)
+
+#define UAC_GET_STAT                   0xff
+
+/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
+#define UAC_MS_HEADER                  0x01
+#define UAC_MIDI_IN_JACK               0x02
+#define UAC_MIDI_OUT_JACK              0x03
+
+/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
+#define UAC_MS_GENERAL                 0x01
+
+/* Terminals - 2.1 USB Terminal Types */
+#define UAC_TERMINAL_UNDEFINED         0x100
+#define UAC_TERMINAL_STREAMING         0x101
+#define UAC_TERMINAL_VENDOR_SPEC       0x1FF
 
 /* Terminal Control Selectors */
 /* 4.3.2  Class-Specific AC Interface Descriptor */
-struct usb_ac_header_descriptor {
+struct uac_ac_header_descriptor {
        __u8  bLength;                  /* 8 + n */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-       __u8  bDescriptorSubtype;       /* USB_MS_HEADER */
+       __u8  bDescriptorSubtype;       /* UAC_MS_HEADER */
        __le16 bcdADC;                  /* 0x0100 */
        __le16 wTotalLength;            /* includes Unit and Terminal desc. */
        __u8  bInCollection;            /* n */
        __u8  baInterfaceNr[];          /* [n] */
 } __attribute__ ((packed));
 
-#define USB_DT_AC_HEADER_SIZE(n)       (8 + (n))
+#define UAC_DT_AC_HEADER_SIZE(n)       (8 + (n))
 
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_AC_HEADER_DESCRIPTOR(n)                    \
-struct usb_ac_header_descriptor_##n {                          \
+#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                    \
+struct uac_ac_header_descriptor_##n {                          \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -116,7 +106,7 @@ struct usb_ac_header_descriptor_##n {                               \
 } __attribute__ ((packed))
 
 /* 4.3.2.1 Input Terminal Descriptor */
-struct usb_input_terminal_descriptor {
+struct uac_input_terminal_descriptor {
        __u8  bLength;                  /* in bytes: 12 */
        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
        __u8  bDescriptorSubtype;       /* INPUT_TERMINAL descriptor subtype */
@@ -129,18 +119,19 @@ struct usb_input_terminal_descriptor {
        __u8  iTerminal;
 } __attribute__ ((packed));
 
-#define USB_DT_AC_INPUT_TERMINAL_SIZE                  12
+#define UAC_DT_INPUT_TERMINAL_SIZE                     12
 
-#define USB_AC_INPUT_TERMINAL_UNDEFINED                        0x200
-#define USB_AC_INPUT_TERMINAL_MICROPHONE               0x201
-#define USB_AC_INPUT_TERMINAL_DESKTOP_MICROPHONE       0x202
-#define USB_AC_INPUT_TERMINAL_PERSONAL_MICROPHONE      0x203
-#define USB_AC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE      0x204
-#define USB_AC_INPUT_TERMINAL_MICROPHONE_ARRAY         0x205
-#define USB_AC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY    0x206
+/* Terminals - 2.2 Input Terminal Types */
+#define UAC_INPUT_TERMINAL_UNDEFINED                   0x200
+#define UAC_INPUT_TERMINAL_MICROPHONE                  0x201
+#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE          0x202
+#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE         0x203
+#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE         0x204
+#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY            0x205
+#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY       0x206
 
 /* 4.3.2.2 Output Terminal Descriptor */
-struct usb_output_terminal_descriptor {
+struct uac_output_terminal_descriptor {
        __u8  bLength;                  /* in bytes: 9 */
        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
        __u8  bDescriptorSubtype;       /* OUTPUT_TERMINAL descriptor subtype */
@@ -151,23 +142,24 @@ struct usb_output_terminal_descriptor {
        __u8  iTerminal;
 } __attribute__ ((packed));
 
-#define USB_DT_AC_OUTPUT_TERMINAL_SIZE                         9
+#define UAC_DT_OUTPUT_TERMINAL_SIZE                    9
 
-#define USB_AC_OUTPUT_TERMINAL_UNDEFINED                       0x300
-#define USB_AC_OUTPUT_TERMINAL_SPEAKER                         0x301
-#define USB_AC_OUTPUT_TERMINAL_HEADPHONES                      0x302
-#define USB_AC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO      0x303
-#define USB_AC_OUTPUT_TERMINAL_DESKTOP_SPEAKER                 0x304
-#define USB_AC_OUTPUT_TERMINAL_ROOM_SPEAKER                    0x305
-#define USB_AC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER           0x306
-#define USB_AC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER                0x307
+/* Terminals - 2.3 Output Terminal Types */
+#define UAC_OUTPUT_TERMINAL_UNDEFINED                  0x300
+#define UAC_OUTPUT_TERMINAL_SPEAKER                    0x301
+#define UAC_OUTPUT_TERMINAL_HEADPHONES                 0x302
+#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO 0x303
+#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER            0x304
+#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER               0x305
+#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER      0x306
+#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER   0x307
 
 /* Set bControlSize = 2 as default setting */
-#define USB_DT_AC_FEATURE_UNIT_SIZE(ch)                (7 + ((ch) + 1) * 2)
+#define UAC_DT_FEATURE_UNIT_SIZE(ch)           (7 + ((ch) + 1) * 2)
 
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_AC_FEATURE_UNIT_DESCRIPTOR(ch)             \
-struct usb_ac_feature_unit_descriptor_##ch {                   \
+#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                \
+struct uac_feature_unit_descriptor_##ch {                      \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -179,7 +171,7 @@ struct usb_ac_feature_unit_descriptor_##ch {                        \
 } __attribute__ ((packed))
 
 /* 4.5.2 Class-Specific AS Interface Descriptor */
-struct usb_as_header_descriptor {
+struct uac_as_header_descriptor {
        __u8  bLength;                  /* in bytes: 7 */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* AS_GENERAL */
@@ -188,16 +180,17 @@ struct usb_as_header_descriptor {
        __le16 wFormatTag;              /* The Audio Data Format */
 } __attribute__ ((packed));
 
-#define USB_DT_AS_HEADER_SIZE          7
+#define UAC_DT_AS_HEADER_SIZE          7
 
-#define USB_AS_AUDIO_FORMAT_TYPE_I_UNDEFINED   0x0
-#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM         0x1
-#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM8                0x2
-#define USB_AS_AUDIO_FORMAT_TYPE_I_IEEE_FLOAT  0x3
-#define USB_AS_AUDIO_FORMAT_TYPE_I_ALAW                0x4
-#define USB_AS_AUDIO_FORMAT_TYPE_I_MULAW       0x5
+/* Formats - A.1.1 Audio Data Format Type I Codes */
+#define UAC_FORMAT_TYPE_I_UNDEFINED    0x0
+#define UAC_FORMAT_TYPE_I_PCM          0x1
+#define UAC_FORMAT_TYPE_I_PCM8         0x2
+#define UAC_FORMAT_TYPE_I_IEEE_FLOAT   0x3
+#define UAC_FORMAT_TYPE_I_ALAW         0x4
+#define UAC_FORMAT_TYPE_I_MULAW                0x5
 
-struct usb_as_format_type_i_continuous_descriptor {
+struct uac_format_type_i_continuous_descriptor {
        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
@@ -210,9 +203,9 @@ struct usb_as_format_type_i_continuous_descriptor {
        __u8  tUpperSamFreq[3];
 } __attribute__ ((packed));
 
-#define USB_AS_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE      14
+#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE 14
 
-struct usb_as_formate_type_i_discrete_descriptor {
+struct uac_format_type_i_discrete_descriptor {
        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
@@ -224,8 +217,8 @@ struct usb_as_formate_type_i_discrete_descriptor {
        __u8  tSamFreq[][3];
 } __attribute__ ((packed));
 
-#define DECLARE_USB_AS_FORMAT_TYPE_I_DISCRETE_DESC(n)          \
-struct usb_as_formate_type_i_discrete_descriptor_##n {         \
+#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)             \
+struct uac_format_type_i_discrete_descriptor_##n {             \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -237,18 +230,15 @@ struct usb_as_formate_type_i_discrete_descriptor_##n {            \
        __u8  tSamFreq[n][3];                                   \
 } __attribute__ ((packed))
 
-#define USB_AS_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n)     (8 + (n * 3))
-
-#define USB_AS_FORMAT_TYPE_UNDEFINED   0x0
-#define USB_AS_FORMAT_TYPE_I           0x1
-#define USB_AS_FORMAT_TYPE_II          0x2
-#define USB_AS_FORMAT_TYPE_III         0x3
+#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n)        (8 + (n * 3))
 
-#define USB_AS_ENDPOINT_ASYNC          (1 << 2)
-#define USB_AS_ENDPOINT_ADAPTIVE       (2 << 2)
-#define USB_AS_ENDPOINT_SYNC           (3 << 2)
+/* Formats - A.2 Format Type Codes */
+#define UAC_FORMAT_TYPE_UNDEFINED      0x0
+#define UAC_FORMAT_TYPE_I              0x1
+#define UAC_FORMAT_TYPE_II             0x2
+#define UAC_FORMAT_TYPE_III            0x3
 
-struct usb_as_iso_endpoint_descriptor {
+struct uac_iso_endpoint_descriptor {
        __u8  bLength;                  /* in bytes: 7 */
        __u8  bDescriptorType;          /* USB_DT_CS_ENDPOINT */
        __u8  bDescriptorSubtype;       /* EP_GENERAL */
@@ -256,30 +246,37 @@ struct usb_as_iso_endpoint_descriptor {
        __u8  bLockDelayUnits;
        __le16 wLockDelay;
 };
-#define USB_AS_ISO_ENDPOINT_DESC_SIZE  7
-
-#define FU_CONTROL_UNDEFINED           0x00
-#define MUTE_CONTROL                   0x01
-#define VOLUME_CONTROL                 0x02
-#define BASS_CONTROL                   0x03
-#define MID_CONTROL                    0x04
-#define TREBLE_CONTROL                 0x05
-#define GRAPHIC_EQUALIZER_CONTROL      0x06
-#define AUTOMATIC_GAIN_CONTROL         0x07
-#define DELAY_CONTROL                  0x08
-#define BASS_BOOST_CONTROL             0x09
-#define LOUDNESS_CONTROL               0x0a
-
-#define FU_MUTE                (1 << (MUTE_CONTROL - 1))
-#define FU_VOLUME      (1 << (VOLUME_CONTROL - 1))
-#define FU_BASS                (1 << (BASS_CONTROL - 1))
-#define FU_MID         (1 << (MID_CONTROL - 1))
-#define FU_TREBLE      (1 << (TREBLE_CONTROL - 1))
-#define FU_GRAPHIC_EQ  (1 << (GRAPHIC_EQUALIZER_CONTROL - 1))
-#define FU_AUTO_GAIN   (1 << (AUTOMATIC_GAIN_CONTROL - 1))
-#define FU_DELAY       (1 << (DELAY_CONTROL - 1))
-#define FU_BASS_BOOST  (1 << (BASS_BOOST_CONTROL - 1))
-#define FU_LOUDNESS    (1 << (LOUDNESS_CONTROL - 1))
+#define UAC_ISO_ENDPOINT_DESC_SIZE     7
+
+#define UAC_EP_CS_ATTR_SAMPLE_RATE     0x01
+#define UAC_EP_CS_ATTR_PITCH_CONTROL   0x02
+#define UAC_EP_CS_ATTR_FILL_MAX                0x80
+
+/* A.10.2 Feature Unit Control Selectors */
+#define UAC_FU_CONTROL_UNDEFINED       0x00
+#define UAC_MUTE_CONTROL               0x01
+#define UAC_VOLUME_CONTROL             0x02
+#define UAC_BASS_CONTROL               0x03
+#define UAC_MID_CONTROL                        0x04
+#define UAC_TREBLE_CONTROL             0x05
+#define UAC_GRAPHIC_EQUALIZER_CONTROL  0x06
+#define UAC_AUTOMATIC_GAIN_CONTROL     0x07
+#define UAC_DELAY_CONTROL              0x08
+#define UAC_BASS_BOOST_CONTROL         0x09
+#define UAC_LOUDNESS_CONTROL           0x0a
+
+#define UAC_FU_MUTE            (1 << (UAC_MUTE_CONTROL - 1))
+#define UAC_FU_VOLUME          (1 << (UAC_VOLUME_CONTROL - 1))
+#define UAC_FU_BASS            (1 << (UAC_BASS_CONTROL - 1))
+#define UAC_FU_MID             (1 << (UAC_MID_CONTROL - 1))
+#define UAC_FU_TREBLE          (1 << (UAC_TREBLE_CONTROL - 1))
+#define UAC_FU_GRAPHIC_EQ      (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1))
+#define UAC_FU_AUTO_GAIN       (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1))
+#define UAC_FU_DELAY           (1 << (UAC_DELAY_CONTROL - 1))
+#define UAC_FU_BASS_BOOST      (1 << (UAC_BASS_BOOST_CONTROL - 1))
+#define UAC_FU_LOUDNESS                (1 << (UAC_LOUDNESS_CONTROL - 1))
+
+#ifdef __KERNEL__
 
 struct usb_audio_control {
        struct list_head list;
@@ -290,18 +287,6 @@ struct usb_audio_control {
        int (*get)(struct usb_audio_control *con, u8 cmd);
 };
 
-static inline int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
-{
-       con->data[cmd] = value;
-
-       return 0;
-}
-
-static inline int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
-{
-       return con->data[cmd];
-}
-
 struct usb_audio_control_selector {
        struct list_head list;
        struct list_head control;
@@ -311,4 +296,6 @@ struct usb_audio_control_selector {
        struct usb_descriptor_header *desc;
 };
 
+#endif /* __KERNEL__ */
+
 #endif /* __LINUX_USB_AUDIO_H */
index 9322363..94012e6 100644 (file)
@@ -258,6 +258,8 @@ struct usb_device_descriptor {
 #define USB_CLASS_APP_SPEC             0xfe
 #define USB_CLASS_VENDOR_SPEC          0xff
 
+#define USB_SUBCLASS_VENDOR_SPEC       0xff
+
 /*-------------------------------------------------------------------------*/
 
 /* USB_DT_CONFIG: Configuration descriptor information.
@@ -348,6 +350,12 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_NUMBER_MASK       0x0f    /* in bEndpointAddress */
 #define USB_ENDPOINT_DIR_MASK          0x80
 
+#define USB_ENDPOINT_SYNCTYPE          0x0c
+#define USB_ENDPOINT_SYNC_NONE         (0 << 2)
+#define USB_ENDPOINT_SYNC_ASYNC                (1 << 2)
+#define USB_ENDPOINT_SYNC_ADAPTIVE     (2 << 2)
+#define USB_ENDPOINT_SYNC_SYNC         (3 << 2)
+
 #define USB_ENDPOINT_XFERTYPE_MASK     0x03    /* in bmAttributes */
 #define USB_ENDPOINT_XFER_CONTROL      0
 #define USB_ENDPOINT_XFER_ISOC         1
index 5b88e36..af4b86f 100644 (file)
@@ -105,6 +105,7 @@ struct ehci_regs {
 #define PORT_WKDISC_E  (1<<21)         /* wake on disconnect (enable) */
 #define PORT_WKCONN_E  (1<<20)         /* wake on connect (enable) */
 /* 19:16 for port testing */
+#define PORT_TEST_PKT  (0x4<<16)       /* Port Test Control - packet test */
 #define PORT_LED_OFF   (0<<14)
 #define PORT_LED_AMBER (1<<14)
 #define PORT_LED_GREEN (2<<14)
@@ -132,6 +133,19 @@ struct ehci_regs {
 #define USBMODE_CM_HC  (3<<0)          /* host controller mode */
 #define USBMODE_CM_IDLE        (0<<0)          /* idle state */
 
+/* Moorestown has some non-standard registers, partially due to the fact that
+ * its EHCI controller has both TT and LPM support. HOSTPCx are extentions to
+ * PORTSCx
+ */
+#define HOSTPC0                0x84            /* HOSTPC extension */
+#define HOSTPC_PHCD    (1<<22)         /* Phy clock disable */
+#define HOSTPC_PSPD    (3<<25)         /* Port speed detection */
+#define USBMODE_EX     0xc8            /* USB Device mode extension */
+#define USBMODE_EX_VBPS        (1<<5)          /* VBus Power Select On */
+#define USBMODE_EX_HC  (3<<0)          /* host controller mode */
+#define TXFILLTUNING   0x24            /* TX FIFO Tuning register */
+#define TXFIFO_DEFAULT (8<<16)         /* FIFO burst threshold 8 */
+
 /* Appendix C, Debug port ... intended for use with special "debug devices"
  * that can help if there's no serial console.  (nonstandard enumeration.)
  */
@@ -157,4 +171,25 @@ struct ehci_dbg_port {
 #define DBGP_EPADDR(dev, ep)   (((dev)<<8)|(ep))
 } __attribute__ ((packed));
 
+#ifdef CONFIG_EARLY_PRINTK_DBGP
+#include <linux/init.h>
+extern int __init early_dbgp_init(char *s);
+extern struct console early_dbgp_console;
+#endif /* CONFIG_EARLY_PRINTK_DBGP */
+
+#ifdef CONFIG_EARLY_PRINTK_DBGP
+/* Call backs from ehci host driver to ehci debug driver */
+extern int dbgp_external_startup(void);
+extern int dbgp_reset_prep(void);
+#else
+static inline int dbgp_reset_prep(void)
+{
+       return 1;
+}
+static inline int dbgp_external_startup(void)
+{
+       return -1;
+}
+#endif
+
 #endif /* __LINUX_USB_EHCI_DEF_H */
diff --git a/include/linux/usb/isp1362.h b/include/linux/usb/isp1362.h
new file mode 100644 (file)
index 0000000..642684b
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * board initialization code should put one of these into dev->platform_data
+ * and place the isp1362 onto platform_bus.
+ */
+
+#ifndef __LINUX_USB_ISP1362_H__
+#define __LINUX_USB_ISP1362_H__
+
+struct isp1362_platform_data {
+       /* Enable internal pulldown resistors on downstream ports */
+       unsigned sel15Kres:1;
+       /* Clock cannot be stopped */
+       unsigned clknotstop:1;
+       /* On-chip overcurrent protection */
+       unsigned oc_enable:1;
+       /* INT output polarity */
+       unsigned int_act_high:1;
+       /* INT edge or level triggered */
+       unsigned int_edge_triggered:1;
+       /* DREQ output polarity */
+       unsigned dreq_act_high:1;
+       /* DACK input polarity */
+       unsigned dack_act_high:1;
+       /* chip can be resumed via H_WAKEUP pin */
+       unsigned remote_wakeup_connected:1;
+       /* Switch or not to switch (keep always powered) */
+       unsigned no_power_switching:1;
+       /* Ganged port power switching (0) or individual port power switching (1) */
+       unsigned power_switching_mode:1;
+       /* Given port_power, msec/2 after power on till power good */
+       u8 potpg;
+       /* Hardware reset set/clear */
+       void (*reset) (struct device *dev, int set);
+       /* Clock start/stop */
+       void (*clock) (struct device *dev, int start);
+       /* Inter-io delay (ns). The chip is picky about access timings; it
+        * expects at least:
+        * 110ns delay between consecutive accesses to DATA_REG,
+        * 300ns delay between access to ADDR_REG and DATA_REG (registers)
+        * 462ns delay between access to ADDR_REG and DATA_REG (buffer memory)
+        * WE MUST NOT be activated during these intervals (even without CS!)
+        */
+       void (*delay) (struct device *dev, unsigned int delay);
+};
+
+#endif
diff --git a/include/linux/usb/isp1760.h b/include/linux/usb/isp1760.h
new file mode 100644 (file)
index 0000000..de7de53
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * board initialization should put one of these into dev->platform_data
+ * and place the isp1760 onto platform_bus named "isp1760-hcd".
+ */
+
+#ifndef __LINUX_USB_ISP1760_H
+#define __LINUX_USB_ISP1760_H
+
+struct isp1760_platform_data {
+       unsigned is_isp1761:1;                  /* Chip is ISP1761 */
+       unsigned bus_width_16:1;                /* 16/32-bit data bus width */
+       unsigned port1_otg:1;                   /* Port 1 supports OTG */
+       unsigned analog_oc:1;                   /* Analog overcurrent */
+       unsigned dack_polarity_high:1;          /* DACK active high */
+       unsigned dreq_polarity_high:1;          /* DREQ active high */
+};
+
+#endif /* __LINUX_USB_ISP1760_H */
index 0ec50ba..c17eb64 100644 (file)
@@ -59,6 +59,7 @@ enum port_dev_state {
  * @bulk_out_buffer: pointer to the bulk out buffer for this port.
  * @bulk_out_size: the size of the bulk_out_buffer, in bytes.
  * @write_urb: pointer to the bulk out struct urb for this port.
+ * @write_fifo: kfifo used to buffer outgoing data
  * @write_urb_busy: port`s writing status
  * @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
  *     port.
@@ -96,6 +97,7 @@ struct usb_serial_port {
        unsigned char           *bulk_out_buffer;
        int                     bulk_out_size;
        struct urb              *write_urb;
+       struct kfifo            *write_fifo;
        int                     write_urb_busy;
        __u8                    bulk_out_endpointAddress;
 
@@ -238,9 +240,8 @@ struct usb_serial_driver {
        int (*resume)(struct usb_serial *serial);
 
        /* serial function calls */
-       /* Called by console with tty = NULL and by tty */
-       int  (*open)(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+       /* Called by console and by the tty layer */
+       int  (*open)(struct tty_struct *tty, struct usb_serial_port *port);
        void (*close)(struct usb_serial_port *port);
        int  (*write)(struct tty_struct *tty, struct usb_serial_port *port,
                        const unsigned char *buf, int count);
@@ -261,6 +262,9 @@ struct usb_serial_driver {
           be an attached tty at this point */
        void (*dtr_rts)(struct usb_serial_port *port, int on);
        int  (*carrier_raised)(struct usb_serial_port *port);
+       /* Called by the usb serial hooks to allow the user to rework the
+          termios state */
+       void (*init_termios)(struct tty_struct *tty);
        /* USB events */
        void (*read_int_callback)(struct urb *urb);
        void (*write_int_callback)(struct urb *urb);
@@ -300,7 +304,7 @@ static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 extern struct usb_serial *usb_serial_get_by_index(unsigned int minor);
 extern void usb_serial_put(struct usb_serial *serial);
 extern int usb_serial_generic_open(struct tty_struct *tty,
-               struct usb_serial_port *port, struct file *filp);
+       struct usb_serial_port *port);
 extern int usb_serial_generic_write(struct tty_struct *tty,
        struct usb_serial_port *port, const unsigned char *buf, int count);
 extern void usb_serial_generic_close(struct usb_serial_port *port);
index 0044d9b..b2a7d8b 100644 (file)
@@ -77,6 +77,7 @@ struct usbdevfs_connectinfo {
 
 #define USBDEVFS_URB_SHORT_NOT_OK      0x01
 #define USBDEVFS_URB_ISO_ASAP          0x02
+#define USBDEVFS_URB_BULK_CONTINUATION 0x04
 #define USBDEVFS_URB_NO_FSBR           0x20
 #define USBDEVFS_URB_ZERO_PACKET       0x40
 #define USBDEVFS_URB_NO_INTERRUPT      0x80
@@ -175,4 +176,6 @@ struct usbdevfs_ioctl32 {
 #define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)
 #define USBDEVFS_DISCONNECT        _IO('U', 22)
 #define USBDEVFS_CONNECT           _IO('U', 23)
+#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)
+#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)
 #endif /* _LINUX_USBDEVICE_FS_H */
index 3689d7d..b59e78c 100644 (file)
@@ -910,9 +910,10 @@ enum v4l2_colorfx {
        V4L2_COLORFX_SEPIA      = 2,
 };
 #define V4L2_CID_AUTOBRIGHTNESS                        (V4L2_CID_BASE+32)
+#define V4L2_CID_BAND_STOP_FILTER              (V4L2_CID_BASE+33)
 
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+33)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)
index 4fca4f5..057a2e0 100644 (file)
@@ -34,7 +34,7 @@ struct virtqueue {
  *     out_num: the number of sg readable by other side
  *     in_num: the number of sg which are writable (after readable ones)
  *     data: the token identifying the buffer.
- *      Returns 0 or an error.
+ *      Returns remaining capacity of queue (sg segments) or a negative error.
  * @kick: update after add_buf
  *     vq: the struct virtqueue
  *     After one or more add_buf calls, invoke this to kick the other side.
index b3c4a60..ea7226a 100644 (file)
@@ -4,8 +4,6 @@
  * compatible drivers/servers. */
 #include <linux/virtio_config.h>
 
-/* The ID for virtio console */
-#define VIRTIO_ID_9P   9
 /* Maximum number of virtio channels per partition (1 for now) */
 #define MAX_9P_CHAN    1
 
index 8726ff7..09d7300 100644 (file)
@@ -4,9 +4,6 @@
  * compatible drivers/servers. */
 #include <linux/virtio_config.h>
 
-/* The ID for virtio_balloon */
-#define VIRTIO_ID_BALLOON      5
-
 /* The feature bitmap for virtio balloon */
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST        0 /* Tell before reclaiming pages */
 
index 8dab9f2..15cb666 100644 (file)
@@ -5,9 +5,6 @@
 #include <linux/types.h>
 #include <linux/virtio_config.h>
 
-/* The ID for virtio_block */
-#define VIRTIO_ID_BLOCK        2
-
 /* Feature bits */
 #define VIRTIO_BLK_F_BARRIER   0       /* Does host support barriers? */
 #define VIRTIO_BLK_F_SIZE_MAX  1       /* Indicates maximum segment size */
@@ -17,6 +14,7 @@
 #define VIRTIO_BLK_F_BLK_SIZE  6       /* Block size of disk is available*/
 #define VIRTIO_BLK_F_SCSI      7       /* Supports scsi command passthru */
 #define VIRTIO_BLK_F_IDENTIFY  8       /* ATA IDENTIFY supported */
+#define VIRTIO_BLK_F_FLUSH     9       /* Cache flush command support */
 
 #define VIRTIO_BLK_ID_BYTES    (sizeof(__u16[256]))    /* IDENTIFY DATA */
 
@@ -38,6 +36,17 @@ struct virtio_blk_config {
        __u8 identify[VIRTIO_BLK_ID_BYTES];
 } __attribute__((packed));
 
+/*
+ * Command types
+ *
+ * Usage is a bit tricky as some bits are used as flags and some are not.
+ *
+ * Rules:
+ *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
+ *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
+ *   and may not be combined with any of the other flags.
+ */
+
 /* These two define direction. */
 #define VIRTIO_BLK_T_IN                0
 #define VIRTIO_BLK_T_OUT       1
@@ -45,6 +54,9 @@ struct virtio_blk_config {
 /* This bit says it's a scsi command, not an actual read or write. */
 #define VIRTIO_BLK_T_SCSI_CMD  2
 
+/* Cache flush command */
+#define VIRTIO_BLK_T_FLUSH     4
+
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER   0x80000000
 
index e547e3c..0093dd7 100644 (file)
@@ -109,8 +109,7 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
                                      unsigned int fbit)
 {
        /* Did you forget to fix assumptions on max features? */
-       if (__builtin_constant_p(fbit))
-               BUILD_BUG_ON(fbit >= 32);
+       MAYBE_BUILD_BUG_ON(fbit >= 32);
 
        if (fbit < VIRTIO_TRANSPORT_F_START)
                virtio_check_driver_offered_feature(vdev, fbit);
index dc16111..b5f5198 100644 (file)
@@ -5,9 +5,6 @@
 /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
  * anyone can use the definitions to implement compatible drivers/servers. */
 
-/* The ID for virtio console */
-#define VIRTIO_ID_CONSOLE      3
-
 /* Feature bits */
 #define VIRTIO_CONSOLE_F_SIZE  0       /* Does host provide console size? */
 
diff --git a/include/linux/virtio_ids.h b/include/linux/virtio_ids.h
new file mode 100644 (file)
index 0000000..06660c0
--- /dev/null
@@ -0,0 +1,17 @@
+#ifndef _LINUX_VIRTIO_IDS_H
+#define _LINUX_VIRTIO_IDS_H
+/*
+ * Virtio IDs
+ *
+ * This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ */
+
+#define VIRTIO_ID_NET          1 /* virtio net */
+#define VIRTIO_ID_BLOCK                2 /* virtio block */
+#define VIRTIO_ID_CONSOLE      3 /* virtio console */
+#define VIRTIO_ID_RNG          4 /* virtio ring */
+#define VIRTIO_ID_BALLOON      5 /* virtio balloon */
+#define VIRTIO_ID_9P           9 /* 9p virtio console */
+
+#endif /* _LINUX_VIRTIO_IDS_H */
index d8dd539..1f41734 100644 (file)
@@ -6,9 +6,6 @@
 #include <linux/virtio_config.h>
 #include <linux/if_ether.h>
 
-/* The ID for virtio_net */
-#define VIRTIO_ID_NET  1
-
 /* The feature bitmap for virtio net */
 #define VIRTIO_NET_F_CSUM      0       /* Host handles pkts w/ partial csum */
 #define VIRTIO_NET_F_GUEST_CSUM        1       /* Guest handles pkts w/ partial csum */
index 1a85dab..48121c3 100644 (file)
@@ -4,7 +4,4 @@
  * compatible drivers/servers. */
 #include <linux/virtio_config.h>
 
-/* The ID for virtio_rng */
-#define VIRTIO_ID_RNG  4
-
 #endif /* _LINUX_VIRTIO_RNG_H */
index 81a97cf..2d0f222 100644 (file)
@@ -166,15 +166,8 @@ static inline unsigned long zone_page_state(struct zone *zone,
        return x;
 }
 
-extern unsigned long global_lru_pages(void);
-
-static inline unsigned long zone_lru_pages(struct zone *zone)
-{
-       return (zone_page_state(zone, NR_ACTIVE_ANON)
-               + zone_page_state(zone, NR_ACTIVE_FILE)
-               + zone_page_state(zone, NR_INACTIVE_ANON)
-               + zone_page_state(zone, NR_INACTIVE_FILE));
-}
+extern unsigned long global_reclaimable_pages(void);
+extern unsigned long zone_reclaimable_pages(struct zone *zone);
 
 #ifdef CONFIG_NUMA
 /*
@@ -210,11 +203,6 @@ extern void zone_statistics(struct zone *, struct zone *);
 
 #endif /* CONFIG_NUMA */
 
-#define __add_zone_page_state(__z, __i, __d)   \
-               __mod_zone_page_state(__z, __i, __d)
-#define __sub_zone_page_state(__z, __i, __d)   \
-               __mod_zone_page_state(__z, __i,-(__d))
-
 #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d)
 #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d))
 
index 02c1c02..7afca0d 100644 (file)
@@ -1,17 +1,6 @@
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
 
-#ifdef __KERNEL__
-struct notifier_block;
-
-struct vt_notifier_param {
-       struct vc_data *vc;     /* VC on which the update happened */
-       unsigned int c;         /* Printed char */
-};
-
-extern int register_vt_notifier(struct notifier_block *nb);
-extern int unregister_vt_notifier(struct notifier_block *nb);
-#endif
 
 /*
  * These constants are also useful for user-level apps (e.g., VC
@@ -74,4 +63,25 @@ struct vt_consize {
 #define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
 #define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
 
+struct vt_event {
+       unsigned int event;
+#define VT_EVENT_SWITCH                0x0001  /* Console switch */
+#define VT_EVENT_BLANK         0x0002  /* Screen blank */
+#define VT_EVENT_UNBLANK       0x0004  /* Screen unblank */
+#define VT_EVENT_RESIZE                0x0008  /* Resize display */
+#define VT_MAX_EVENT           0x000F
+       unsigned int old;               /* Old console */
+       unsigned int new;               /* New console (if changing) */
+       unsigned int pad[4];            /* Padding for expansion */
+};
+
+#define VT_WAITEVENT   0x560E  /* Wait for an event */
+
+struct vt_setactivate {
+       unsigned int console;
+       struct vt_mode mode;
+};
+
+#define VT_SETACTIVATE 0x560F  /* Activate and set the mode of a console */
+
 #endif /* _LINUX_VT_H */
index 2f11134..c0c4e11 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/console_struct.h>
 #include <linux/mm.h>
 #include <linux/consolemap.h>
+#include <linux/notifier.h>
 
 /*
  * Presently, a lot of graphics programs do not restore the contents of
@@ -91,7 +92,8 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 #endif
 
 /* vt.c */
-int vt_waitactive(int vt);
+void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
+int vt_waitactive(int n);
 void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
 extern int unbind_con_driver(const struct consw *csw, int first, int last,
@@ -116,4 +118,16 @@ struct vt_spawn_console {
 };
 extern struct vt_spawn_console vt_spawn_con;
 
+extern int vt_move_to_console(unsigned int vt, int alloc);
+
+/* Interfaces for VC notification of character events (for accessibility etc) */
+
+struct vt_notifier_param {
+       struct vc_data *vc;     /* VC on which the update happened */
+       unsigned int c;         /* Printed char */
+};
+
+extern int register_vt_notifier(struct notifier_block *nb);
+extern int unregister_vt_notifier(struct notifier_block *nb);
+
 #endif /* _VT_KERN_H */
index 6273fa9..7ef0c7b 100644 (file)
@@ -94,7 +94,7 @@ struct execute_work {
 /*
  * initialize all of a work item in one go
  *
- * NOTE! No point in using "atomic_long_set()": useing a direct
+ * NOTE! No point in using "atomic_long_set()": using a direct
  * assignment of the work data initializer allows the compiler
  * to generate better code.
  */
diff --git a/include/media/davinci/ccdc_types.h b/include/media/davinci/ccdc_types.h
new file mode 100644 (file)
index 0000000..5773874
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ **************************************************************************/
+#ifndef _CCDC_TYPES_H
+#define _CCDC_TYPES_H
+enum ccdc_pixfmt {
+       CCDC_PIXFMT_RAW,
+       CCDC_PIXFMT_YCBCR_16BIT,
+       CCDC_PIXFMT_YCBCR_8BIT
+};
+
+enum ccdc_frmfmt {
+       CCDC_FRMFMT_PROGRESSIVE,
+       CCDC_FRMFMT_INTERLACED
+};
+
+/* PIXEL ORDER IN MEMORY from LSB to MSB */
+/* only applicable for 8-bit input mode  */
+enum ccdc_pixorder {
+       CCDC_PIXORDER_YCBYCR,
+       CCDC_PIXORDER_CBYCRY,
+};
+
+enum ccdc_buftype {
+       CCDC_BUFTYPE_FLD_INTERLEAVED,
+       CCDC_BUFTYPE_FLD_SEPARATED
+};
+#endif
diff --git a/include/media/davinci/dm355_ccdc.h b/include/media/davinci/dm355_ccdc.h
new file mode 100644 (file)
index 0000000..df8a7b1
--- /dev/null
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2005-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _DM355_CCDC_H
+#define _DM355_CCDC_H
+#include <media/davinci/ccdc_types.h>
+#include <media/davinci/vpfe_types.h>
+
+/* enum for No of pixel per line to be avg. in Black Clamping */
+enum ccdc_sample_length {
+       CCDC_SAMPLE_1PIXELS,
+       CCDC_SAMPLE_2PIXELS,
+       CCDC_SAMPLE_4PIXELS,
+       CCDC_SAMPLE_8PIXELS,
+       CCDC_SAMPLE_16PIXELS
+};
+
+/* enum for No of lines in Black Clamping */
+enum ccdc_sample_line {
+       CCDC_SAMPLE_1LINES,
+       CCDC_SAMPLE_2LINES,
+       CCDC_SAMPLE_4LINES,
+       CCDC_SAMPLE_8LINES,
+       CCDC_SAMPLE_16LINES
+};
+
+/* enum for Alaw gama width */
+enum ccdc_gamma_width {
+       CCDC_GAMMA_BITS_13_4,
+       CCDC_GAMMA_BITS_12_3,
+       CCDC_GAMMA_BITS_11_2,
+       CCDC_GAMMA_BITS_10_1,
+       CCDC_GAMMA_BITS_09_0
+};
+
+enum ccdc_colpats {
+       CCDC_RED,
+       CCDC_GREEN_RED,
+       CCDC_GREEN_BLUE,
+       CCDC_BLUE
+};
+
+struct ccdc_col_pat {
+       enum ccdc_colpats olop;
+       enum ccdc_colpats olep;
+       enum ccdc_colpats elop;
+       enum ccdc_colpats elep;
+};
+
+enum ccdc_datasft {
+       CCDC_DATA_NO_SHIFT,
+       CCDC_DATA_SHIFT_1BIT,
+       CCDC_DATA_SHIFT_2BIT,
+       CCDC_DATA_SHIFT_3BIT,
+       CCDC_DATA_SHIFT_4BIT,
+       CCDC_DATA_SHIFT_5BIT,
+       CCDC_DATA_SHIFT_6BIT
+};
+
+enum ccdc_data_size {
+       CCDC_DATA_16BITS,
+       CCDC_DATA_15BITS,
+       CCDC_DATA_14BITS,
+       CCDC_DATA_13BITS,
+       CCDC_DATA_12BITS,
+       CCDC_DATA_11BITS,
+       CCDC_DATA_10BITS,
+       CCDC_DATA_8BITS
+};
+enum ccdc_mfilt1 {
+       CCDC_NO_MEDIAN_FILTER1,
+       CCDC_AVERAGE_FILTER1,
+       CCDC_MEDIAN_FILTER1
+};
+
+enum ccdc_mfilt2 {
+       CCDC_NO_MEDIAN_FILTER2,
+       CCDC_AVERAGE_FILTER2,
+       CCDC_MEDIAN_FILTER2
+};
+
+/* structure for ALaw */
+struct ccdc_a_law {
+       /* Enable/disable A-Law */
+       unsigned char enable;
+       /* Gama Width Input */
+       enum ccdc_gamma_width gama_wd;
+};
+
+/* structure for Black Clamping */
+struct ccdc_black_clamp {
+       /* only if bClampEnable is TRUE */
+       unsigned char b_clamp_enable;
+       /* only if bClampEnable is TRUE */
+       enum ccdc_sample_length sample_pixel;
+       /* only if bClampEnable is TRUE */
+       enum ccdc_sample_line sample_ln;
+       /* only if bClampEnable is TRUE */
+       unsigned short start_pixel;
+       /* only if bClampEnable is FALSE */
+       unsigned short sgain;
+       unsigned short dc_sub;
+};
+
+/* structure for Black Level Compensation */
+struct ccdc_black_compensation {
+       /* Constant value to subtract from Red component */
+       unsigned char r;
+       /* Constant value to subtract from Gr component */
+       unsigned char gr;
+       /* Constant value to subtract from Blue component */
+       unsigned char b;
+       /* Constant value to subtract from Gb component */
+       unsigned char gb;
+};
+
+struct ccdc_float {
+       int integer;
+       unsigned int decimal;
+};
+
+#define CCDC_CSC_COEFF_TABLE_SIZE      16
+/* structure for color space converter */
+struct ccdc_csc {
+       unsigned char enable;
+       /*
+        * S8Q5. Use 2 decimal precision, user values range from -3.00 to 3.99.
+        * example - to use 1.03, set integer part as 1, and decimal part as 3
+        * to use -1.03, set integer part as -1 and decimal part as 3
+        */
+       struct ccdc_float coeff[CCDC_CSC_COEFF_TABLE_SIZE];
+};
+
+/* Structures for Vertical Defect Correction*/
+enum ccdc_vdf_csl {
+       CCDC_VDF_NORMAL,
+       CCDC_VDF_HORZ_INTERPOL_SAT,
+       CCDC_VDF_HORZ_INTERPOL
+};
+
+enum ccdc_vdf_cuda {
+       CCDC_VDF_WHOLE_LINE_CORRECT,
+       CCDC_VDF_UPPER_DISABLE
+};
+
+enum ccdc_dfc_mwr {
+       CCDC_DFC_MWR_WRITE_COMPLETE,
+       CCDC_DFC_WRITE_REG
+};
+
+enum ccdc_dfc_mrd {
+       CCDC_DFC_READ_COMPLETE,
+       CCDC_DFC_READ_REG
+};
+
+enum ccdc_dfc_ma_rst {
+       CCDC_DFC_INCR_ADDR,
+       CCDC_DFC_CLR_ADDR
+};
+
+enum ccdc_dfc_mclr {
+       CCDC_DFC_CLEAR_COMPLETE,
+       CCDC_DFC_CLEAR
+};
+
+struct ccdc_dft_corr_ctl {
+       enum ccdc_vdf_csl vdfcsl;
+       enum ccdc_vdf_cuda vdfcuda;
+       unsigned int vdflsft;
+};
+
+struct ccdc_dft_corr_mem_ctl {
+       enum ccdc_dfc_mwr dfcmwr;
+       enum ccdc_dfc_mrd dfcmrd;
+       enum ccdc_dfc_ma_rst dfcmarst;
+       enum ccdc_dfc_mclr dfcmclr;
+};
+
+#define CCDC_DFT_TABLE_SIZE    16
+/*
+ * Main Structure for vertical defect correction. Vertical defect
+ * correction can correct upto 16 defects if defects less than 16
+ * then pad the rest with 0
+ */
+struct ccdc_vertical_dft {
+       unsigned char ver_dft_en;
+       unsigned char gen_dft_en;
+       unsigned int saturation_ctl;
+       struct ccdc_dft_corr_ctl dft_corr_ctl;
+       struct ccdc_dft_corr_mem_ctl dft_corr_mem_ctl;
+       int table_size;
+       unsigned int dft_corr_horz[CCDC_DFT_TABLE_SIZE];
+       unsigned int dft_corr_vert[CCDC_DFT_TABLE_SIZE];
+       unsigned int dft_corr_sub1[CCDC_DFT_TABLE_SIZE];
+       unsigned int dft_corr_sub2[CCDC_DFT_TABLE_SIZE];
+       unsigned int dft_corr_sub3[CCDC_DFT_TABLE_SIZE];
+};
+
+struct ccdc_data_offset {
+       unsigned char horz_offset;
+       unsigned char vert_offset;
+};
+
+/*
+ * Structure for CCDC configuration parameters for raw capture mode passed
+ * by application
+ */
+struct ccdc_config_params_raw {
+       /* data shift to be applied before storing */
+       enum ccdc_datasft datasft;
+       /* data size value from 8 to 16 bits */
+       enum ccdc_data_size data_sz;
+       /* median filter for sdram */
+       enum ccdc_mfilt1 mfilt1;
+       enum ccdc_mfilt2 mfilt2;
+       /* low pass filter enable/disable */
+       unsigned char lpf_enable;
+       /* Threshold of median filter */
+       int med_filt_thres;
+       /*
+        * horz and vertical data offset. Appliable for defect correction
+        * and lsc
+        */
+       struct ccdc_data_offset data_offset;
+       /* Structure for Optional A-Law */
+       struct ccdc_a_law alaw;
+       /* Structure for Optical Black Clamp */
+       struct ccdc_black_clamp blk_clamp;
+       /* Structure for Black Compensation */
+       struct ccdc_black_compensation blk_comp;
+       /* struture for vertical Defect Correction Module Configuration */
+       struct ccdc_vertical_dft vertical_dft;
+       /* structure for color space converter Module Configuration */
+       struct ccdc_csc csc;
+       /* color patters for bayer capture */
+       struct ccdc_col_pat col_pat_field0;
+       struct ccdc_col_pat col_pat_field1;
+};
+
+#ifdef __KERNEL__
+#include <linux/io.h>
+
+#define CCDC_WIN_PAL   {0, 0, 720, 576}
+#define CCDC_WIN_VGA   {0, 0, 640, 480}
+
+struct ccdc_params_ycbcr {
+       /* pixel format */
+       enum ccdc_pixfmt pix_fmt;
+       /* progressive or interlaced frame */
+       enum ccdc_frmfmt frm_fmt;
+       /* video window */
+       struct v4l2_rect win;
+       /* field id polarity */
+       enum vpfe_pin_pol fid_pol;
+       /* vertical sync polarity */
+       enum vpfe_pin_pol vd_pol;
+       /* horizontal sync polarity */
+       enum vpfe_pin_pol hd_pol;
+       /* enable BT.656 embedded sync mode */
+       int bt656_enable;
+       /* cb:y:cr:y or y:cb:y:cr in memory */
+       enum ccdc_pixorder pix_order;
+       /* interleaved or separated fields  */
+       enum ccdc_buftype buf_type;
+};
+
+/* Gain applied to Raw Bayer data */
+struct ccdc_gain {
+       unsigned short r_ye;
+       unsigned short gr_cy;
+       unsigned short gb_g;
+       unsigned short b_mg;
+};
+
+/* Structure for CCDC configuration parameters for raw capture mode */
+struct ccdc_params_raw {
+       /* pixel format */
+       enum ccdc_pixfmt pix_fmt;
+       /* progressive or interlaced frame */
+       enum ccdc_frmfmt frm_fmt;
+       /* video window */
+       struct v4l2_rect win;
+       /* field id polarity */
+       enum vpfe_pin_pol fid_pol;
+       /* vertical sync polarity */
+       enum vpfe_pin_pol vd_pol;
+       /* horizontal sync polarity */
+       enum vpfe_pin_pol hd_pol;
+       /* interleaved or separated fields */
+       enum ccdc_buftype buf_type;
+       /* Gain values */
+       struct ccdc_gain gain;
+       /* offset */
+       unsigned int ccdc_offset;
+       /* horizontal flip enable */
+       unsigned char horz_flip_enable;
+       /*
+        * enable to store the image in inverse order in memory
+        * (bottom to top)
+        */
+       unsigned char image_invert_enable;
+       /* Configurable part of raw data */
+       struct ccdc_config_params_raw config_params;
+};
+
+#endif
+#endif                         /* DM355_CCDC_H */
diff --git a/include/media/davinci/dm644x_ccdc.h b/include/media/davinci/dm644x_ccdc.h
new file mode 100644 (file)
index 0000000..3e178eb
--- /dev/null
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2006-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _DM644X_CCDC_H
+#define _DM644X_CCDC_H
+#include <media/davinci/ccdc_types.h>
+#include <media/davinci/vpfe_types.h>
+
+/* enum for No of pixel per line to be avg. in Black Clamping*/
+enum ccdc_sample_length {
+       CCDC_SAMPLE_1PIXELS,
+       CCDC_SAMPLE_2PIXELS,
+       CCDC_SAMPLE_4PIXELS,
+       CCDC_SAMPLE_8PIXELS,
+       CCDC_SAMPLE_16PIXELS
+};
+
+/* enum for No of lines in Black Clamping */
+enum ccdc_sample_line {
+       CCDC_SAMPLE_1LINES,
+       CCDC_SAMPLE_2LINES,
+       CCDC_SAMPLE_4LINES,
+       CCDC_SAMPLE_8LINES,
+       CCDC_SAMPLE_16LINES
+};
+
+/* enum for Alaw gama width */
+enum ccdc_gama_width {
+       CCDC_GAMMA_BITS_15_6,
+       CCDC_GAMMA_BITS_14_5,
+       CCDC_GAMMA_BITS_13_4,
+       CCDC_GAMMA_BITS_12_3,
+       CCDC_GAMMA_BITS_11_2,
+       CCDC_GAMMA_BITS_10_1,
+       CCDC_GAMMA_BITS_09_0
+};
+
+enum ccdc_data_size {
+       CCDC_DATA_16BITS,
+       CCDC_DATA_15BITS,
+       CCDC_DATA_14BITS,
+       CCDC_DATA_13BITS,
+       CCDC_DATA_12BITS,
+       CCDC_DATA_11BITS,
+       CCDC_DATA_10BITS,
+       CCDC_DATA_8BITS
+};
+
+/* structure for ALaw */
+struct ccdc_a_law {
+       /* Enable/disable A-Law */
+       unsigned char enable;
+       /* Gama Width Input */
+       enum ccdc_gama_width gama_wd;
+};
+
+/* structure for Black Clamping */
+struct ccdc_black_clamp {
+       unsigned char enable;
+       /* only if bClampEnable is TRUE */
+       enum ccdc_sample_length sample_pixel;
+       /* only if bClampEnable is TRUE */
+       enum ccdc_sample_line sample_ln;
+       /* only if bClampEnable is TRUE */
+       unsigned short start_pixel;
+       /* only if bClampEnable is TRUE */
+       unsigned short sgain;
+       /* only if bClampEnable is FALSE */
+       unsigned short dc_sub;
+};
+
+/* structure for Black Level Compensation */
+struct ccdc_black_compensation {
+       /* Constant value to subtract from Red component */
+       char r;
+       /* Constant value to subtract from Gr component */
+       char gr;
+       /* Constant value to subtract from Blue component */
+       char b;
+       /* Constant value to subtract from Gb component */
+       char gb;
+};
+
+/* structure for fault pixel correction */
+struct ccdc_fault_pixel {
+       /* Enable or Disable fault pixel correction */
+       unsigned char enable;
+       /* Number of fault pixel */
+       unsigned short fp_num;
+       /* Address of fault pixel table */
+       unsigned int fpc_table_addr;
+};
+
+/* Structure for CCDC configuration parameters for raw capture mode passed
+ * by application
+ */
+struct ccdc_config_params_raw {
+       /* data size value from 8 to 16 bits */
+       enum ccdc_data_size data_sz;
+       /* Structure for Optional A-Law */
+       struct ccdc_a_law alaw;
+       /* Structure for Optical Black Clamp */
+       struct ccdc_black_clamp blk_clamp;
+       /* Structure for Black Compensation */
+       struct ccdc_black_compensation blk_comp;
+       /* Structure for Fault Pixel Module Configuration */
+       struct ccdc_fault_pixel fault_pxl;
+};
+
+
+#ifdef __KERNEL__
+#include <linux/io.h>
+/* Define to enable/disable video port */
+#define FP_NUM_BYTES           4
+/* Define for extra pixel/line and extra lines/frame */
+#define NUM_EXTRAPIXELS                8
+#define NUM_EXTRALINES         8
+
+/* settings for commonly used video formats */
+#define CCDC_WIN_PAL     {0, 0, 720, 576}
+/* ntsc square pixel */
+#define CCDC_WIN_VGA   {0, 0, (640 + NUM_EXTRAPIXELS), (480 + NUM_EXTRALINES)}
+
+/* Structure for CCDC configuration parameters for raw capture mode */
+struct ccdc_params_raw {
+       /* pixel format */
+       enum ccdc_pixfmt pix_fmt;
+       /* progressive or interlaced frame */
+       enum ccdc_frmfmt frm_fmt;
+       /* video window */
+       struct v4l2_rect win;
+       /* field id polarity */
+       enum vpfe_pin_pol fid_pol;
+       /* vertical sync polarity */
+       enum vpfe_pin_pol vd_pol;
+       /* horizontal sync polarity */
+       enum vpfe_pin_pol hd_pol;
+       /* interleaved or separated fields */
+       enum ccdc_buftype buf_type;
+       /*
+        * enable to store the image in inverse
+        * order in memory(bottom to top)
+        */
+       unsigned char image_invert_enable;
+       /* configurable paramaters */
+       struct ccdc_config_params_raw config_params;
+};
+
+struct ccdc_params_ycbcr {
+       /* pixel format */
+       enum ccdc_pixfmt pix_fmt;
+       /* progressive or interlaced frame */
+       enum ccdc_frmfmt frm_fmt;
+       /* video window */
+       struct v4l2_rect win;
+       /* field id polarity */
+       enum vpfe_pin_pol fid_pol;
+       /* vertical sync polarity */
+       enum vpfe_pin_pol vd_pol;
+       /* horizontal sync polarity */
+       enum vpfe_pin_pol hd_pol;
+       /* enable BT.656 embedded sync mode */
+       int bt656_enable;
+       /* cb:y:cr:y or y:cb:y:cr in memory */
+       enum ccdc_pixorder pix_order;
+       /* interleaved or separated fields  */
+       enum ccdc_buftype buf_type;
+};
+#endif
+#endif                         /* _DM644X_CCDC_H */
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h
new file mode 100644 (file)
index 0000000..71d8982
--- /dev/null
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _VPFE_CAPTURE_H
+#define _VPFE_CAPTURE_H
+
+#ifdef __KERNEL__
+
+/* Header files */
+#include <media/v4l2-dev.h>
+#include <linux/videodev2.h>
+#include <linux/clk.h>
+#include <linux/i2c.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-device.h>
+#include <media/videobuf-dma-contig.h>
+#include <media/davinci/vpfe_types.h>
+
+#define VPFE_CAPTURE_NUM_DECODERS        5
+
+/* Macros */
+#define VPFE_MAJOR_RELEASE              0
+#define VPFE_MINOR_RELEASE              0
+#define VPFE_BUILD                      1
+#define VPFE_CAPTURE_VERSION_CODE       ((VPFE_MAJOR_RELEASE << 16) | \
+                                       (VPFE_MINOR_RELEASE << 8)  | \
+                                       VPFE_BUILD)
+
+#define CAPTURE_DRV_NAME               "vpfe-capture"
+
+struct vpfe_pixel_format {
+       struct v4l2_fmtdesc fmtdesc;
+       /* bytes per pixel */
+       int bpp;
+};
+
+struct vpfe_std_info {
+       int active_pixels;
+       int active_lines;
+       /* current frame format */
+       int frame_format;
+};
+
+struct vpfe_route {
+       u32 input;
+       u32 output;
+};
+
+struct vpfe_subdev_info {
+       /* Sub device name */
+       char name[32];
+       /* Sub device group id */
+       int grp_id;
+       /* Number of inputs supported */
+       int num_inputs;
+       /* inputs available at the sub device */
+       struct v4l2_input *inputs;
+       /* Sub dev routing information for each input */
+       struct vpfe_route *routes;
+       /* check if sub dev supports routing */
+       int can_route;
+       /* ccdc bus/interface configuration */
+       struct vpfe_hw_if_param ccdc_if_params;
+       /* i2c subdevice board info */
+       struct i2c_board_info board_info;
+};
+
+struct vpfe_config {
+       /* Number of sub devices connected to vpfe */
+       int num_subdevs;
+       /* information about each subdev */
+       struct vpfe_subdev_info *sub_devs;
+       /* evm card info */
+       char *card_name;
+       /* ccdc name */
+       char *ccdc;
+       /* vpfe clock */
+       struct clk *vpssclk;
+       struct clk *slaveclk;
+};
+
+struct vpfe_device {
+       /* V4l2 specific parameters */
+       /* Identifies video device for this channel */
+       struct video_device *video_dev;
+       /* sub devices */
+       struct v4l2_subdev **sd;
+       /* vpfe cfg */
+       struct vpfe_config *cfg;
+       /* V4l2 device */
+       struct v4l2_device v4l2_dev;
+       /* parent device */
+       struct device *pdev;
+       /* Used to keep track of state of the priority */
+       struct v4l2_prio_state prio;
+       /* number of open instances of the channel */
+       u32 usrs;
+       /* Indicates id of the field which is being displayed */
+       u32 field_id;
+       /* flag to indicate whether decoder is initialized */
+       u8 initialized;
+       /* current interface type */
+       struct vpfe_hw_if_param vpfe_if_params;
+       /* ptr to currently selected sub device */
+       struct vpfe_subdev_info *current_subdev;
+       /* current input at the sub device */
+       int current_input;
+       /* Keeps track of the information about the standard */
+       struct vpfe_std_info std_info;
+       /* std index into std table */
+       int std_index;
+       /* CCDC IRQs used when CCDC/ISIF output to SDRAM */
+       unsigned int ccdc_irq0;
+       unsigned int ccdc_irq1;
+       /* number of buffers in fbuffers */
+       u32 numbuffers;
+       /* List of buffer pointers for storing frames */
+       u8 *fbuffers[VIDEO_MAX_FRAME];
+       /* Pointer pointing to current v4l2_buffer */
+       struct videobuf_buffer *cur_frm;
+       /* Pointer pointing to next v4l2_buffer */
+       struct videobuf_buffer *next_frm;
+       /*
+        * This field keeps track of type of buffer exchange mechanism
+        * user has selected
+        */
+       enum v4l2_memory memory;
+       /* Used to store pixel format */
+       struct v4l2_format fmt;
+       /*
+        * used when IMP is chained to store the crop window which
+        * is different from the image window
+        */
+       struct v4l2_rect crop;
+       /* Buffer queue used in video-buf */
+       struct videobuf_queue buffer_queue;
+       /* Queue of filled frames */
+       struct list_head dma_queue;
+       /* Used in video-buf */
+       spinlock_t irqlock;
+       /* IRQ lock for DMA queue */
+       spinlock_t dma_queue_lock;
+       /* lock used to access this structure */
+       struct mutex lock;
+       /* number of users performing IO */
+       u32 io_usrs;
+       /* Indicates whether streaming started */
+       u8 started;
+       /*
+        * offset where second field starts from the starting of the
+        * buffer for field seperated YCbCr formats
+        */
+       u32 field_off;
+};
+
+/* File handle structure */
+struct vpfe_fh {
+       struct vpfe_device *vpfe_dev;
+       /* Indicates whether this file handle is doing IO */
+       u8 io_allowed;
+       /* Used to keep track priority of this instance */
+       enum v4l2_priority prio;
+};
+
+struct vpfe_config_params {
+       u8 min_numbuffers;
+       u8 numbuffers;
+       u32 min_bufsize;
+       u32 device_bufsize;
+};
+
+#endif                         /* End of __KERNEL__ */
+/**
+ * VPFE_CMD_S_CCDC_RAW_PARAMS - EXPERIMENTAL IOCTL to set raw capture params
+ * This can be used to configure modules such as defect pixel correction,
+ * color space conversion, culling etc. This is an experimental ioctl that
+ * will change in future kernels. So use this ioctl with care !
+ * TODO: This is to be split into multiple ioctls and also explore the
+ * possibility of extending the v4l2 api to include this
+ **/
+#define VPFE_CMD_S_CCDC_RAW_PARAMS _IOW('V', BASE_VIDIOC_PRIVATE + 1, \
+                                       void *)
+#endif                         /* _DAVINCI_VPFE_H */
diff --git a/include/media/davinci/vpfe_types.h b/include/media/davinci/vpfe_types.h
new file mode 100644 (file)
index 0000000..76fb74b
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option)any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _VPFE_TYPES_H
+#define _VPFE_TYPES_H
+
+#ifdef __KERNEL__
+
+enum vpfe_pin_pol {
+       VPFE_PINPOL_POSITIVE,
+       VPFE_PINPOL_NEGATIVE
+};
+
+enum vpfe_hw_if_type {
+       /* BT656 - 8 bit */
+       VPFE_BT656,
+       /* BT1120 - 16 bit */
+       VPFE_BT1120,
+       /* Raw Bayer */
+       VPFE_RAW_BAYER,
+       /* YCbCr - 8 bit with external sync */
+       VPFE_YCBCR_SYNC_8,
+       /* YCbCr - 16 bit with external sync */
+       VPFE_YCBCR_SYNC_16,
+       /* BT656 - 10 bit */
+       VPFE_BT656_10BIT
+};
+
+/* interface description */
+struct vpfe_hw_if_param {
+       enum vpfe_hw_if_type if_type;
+       enum vpfe_pin_pol hdpol;
+       enum vpfe_pin_pol vdpol;
+};
+
+#endif
+#endif
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
new file mode 100644 (file)
index 0000000..fcdff74
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2009 Texas Instruments Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * vpss - video processing subsystem module header file.
+ *
+ * Include this header file if a driver needs to configure vpss system
+ * module. It exports a set of library functions  for video drivers to
+ * configure vpss system module functions such as clock enable/disable,
+ * vpss interrupt mux to arm, and other common vpss system module
+ * functions.
+ */
+#ifndef _VPSS_H
+#define _VPSS_H
+
+/* selector for ccdc input selection on DM355 */
+enum vpss_ccdc_source_sel {
+       VPSS_CCDCIN,
+       VPSS_HSSIIN
+};
+
+/* Used for enable/diable VPSS Clock */
+enum vpss_clock_sel {
+       /* DM355/DM365 */
+       VPSS_CCDC_CLOCK,
+       VPSS_IPIPE_CLOCK,
+       VPSS_H3A_CLOCK,
+       VPSS_CFALD_CLOCK,
+       /*
+        * When using VPSS_VENC_CLOCK_SEL in vpss_enable_clock() api
+        * following applies:-
+        * en = 0 selects ENC_CLK
+        * en = 1 selects ENC_CLK/2
+        */
+       VPSS_VENC_CLOCK_SEL,
+       VPSS_VPBE_CLOCK,
+};
+
+/* select input to ccdc on dm355 */
+int vpss_select_ccdc_source(enum vpss_ccdc_source_sel src_sel);
+/* enable/disable a vpss clock, 0 - success, -1 - failure */
+int vpss_enable_clock(enum vpss_clock_sel clock_sel, int en);
+
+/* wbl reset for dm644x */
+enum vpss_wbl_sel {
+       VPSS_PCR_AEW_WBL_0 = 16,
+       VPSS_PCR_AF_WBL_0,
+       VPSS_PCR_RSZ4_WBL_0,
+       VPSS_PCR_RSZ3_WBL_0,
+       VPSS_PCR_RSZ2_WBL_0,
+       VPSS_PCR_RSZ1_WBL_0,
+       VPSS_PCR_PREV_WBL_0,
+       VPSS_PCR_CCDC_WBL_O,
+};
+int vpss_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel);
+#endif
index 23ecead..3d74e60 100644 (file)
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
+#include <media/v4l2-device.h>
 
 struct soc_camera_device {
        struct list_head list;
        struct device dev;
-       struct device *control;
-       unsigned short width;           /* Current window */
-       unsigned short height;          /* sizes */
-       unsigned short x_min;           /* Camera capabilities */
-       unsigned short y_min;
-       unsigned short x_current;       /* Current window location */
-       unsigned short y_current;
+       struct device *pdev;            /* Platform device */
+       s32 user_width;
+       s32 user_height;
        unsigned short width_min;
-       unsigned short width_max;
        unsigned short height_min;
-       unsigned short height_max;
        unsigned short y_skip_top;      /* Lines to skip at the top */
-       unsigned short gain;
-       unsigned short exposure;
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        unsigned char buswidth;         /* See comment in .c */
@@ -46,7 +39,6 @@ struct soc_camera_device {
        struct soc_camera_format_xlate *user_formats;
        int num_user_formats;
        enum v4l2_field field;          /* Preserve field over close() */
-       struct module *owner;
        void *host_priv;                /* Per-device host private data */
        /* soc_camera.c private count. Only accessed with .video_lock held */
        int use_count;
@@ -59,8 +51,8 @@ struct soc_camera_file {
 };
 
 struct soc_camera_host {
+       struct v4l2_device v4l2_dev;
        struct list_head list;
-       struct device *dev;
        unsigned char nr;                               /* Host number */
        void *priv;
        const char *drv_name;
@@ -73,9 +65,18 @@ struct soc_camera_host_ops {
        void (*remove)(struct soc_camera_device *);
        int (*suspend)(struct soc_camera_device *, pm_message_t);
        int (*resume)(struct soc_camera_device *);
+       /*
+        * .get_formats() is called for each client device format, but
+        * .put_formats() is only called once. Further, if any of the calls to
+        * .get_formats() fail, .put_formats() will not be called at all, the
+        * failing .get_formats() must then clean up internally.
+        */
        int (*get_formats)(struct soc_camera_device *, int,
                           struct soc_camera_format_xlate *);
-       int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
+       void (*put_formats)(struct soc_camera_device *);
+       int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
+       int (*get_crop)(struct soc_camera_device *, struct v4l2_crop *);
+       int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *);
        int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        void (*init_videobuf)(struct videobuf_queue *,
@@ -83,7 +84,11 @@ struct soc_camera_host_ops {
        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
        int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
        int (*set_bus_param)(struct soc_camera_device *, __u32);
+       int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *);
+       int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);
        unsigned int (*poll)(struct file *, poll_table *);
+       const struct v4l2_queryctrl *controls;
+       int num_controls;
 };
 
 #define SOCAM_SENSOR_INVERT_PCLK       (1 << 0)
@@ -102,6 +107,12 @@ struct soc_camera_link {
        int i2c_adapter_id;
        struct i2c_board_info *board_info;
        const char *module_name;
+       /*
+        * For non-I2C devices platform platform has to provide methods to
+        * add a device to the system and to remove
+        */
+       int (*add_device)(struct soc_camera_link *, struct device *);
+       void (*del_device)(struct soc_camera_link *);
        /* Optional callbacks to power on or off and reset the sensor */
        int (*power)(struct device *, int);
        int (*reset)(struct device *);
@@ -115,27 +126,45 @@ struct soc_camera_link {
        void (*free_bus)(struct soc_camera_link *);
 };
 
-static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
+static inline struct soc_camera_device *to_soc_camera_dev(
+       const struct device *dev)
 {
        return container_of(dev, struct soc_camera_device, dev);
 }
 
-static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
+static inline struct soc_camera_host *to_soc_camera_host(
+       const struct device *dev)
 {
-       return dev_get_drvdata(dev);
+       struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
+
+       return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev);
 }
 
-extern int soc_camera_host_register(struct soc_camera_host *ici);
-extern void soc_camera_host_unregister(struct soc_camera_host *ici);
-extern int soc_camera_device_register(struct soc_camera_device *icd);
-extern void soc_camera_device_unregister(struct soc_camera_device *icd);
+static inline struct soc_camera_link *to_soc_camera_link(
+       const struct soc_camera_device *icd)
+{
+       return icd->dev.platform_data;
+}
 
-extern int soc_camera_video_start(struct soc_camera_device *icd);
-extern void soc_camera_video_stop(struct soc_camera_device *icd);
+static inline struct device *to_soc_camera_control(
+       const struct soc_camera_device *icd)
+{
+       return dev_get_drvdata(&icd->dev);
+}
 
-extern const struct soc_camera_data_format *soc_camera_format_by_fourcc(
+static inline struct v4l2_subdev *soc_camera_to_subdev(
+       const struct soc_camera_device *icd)
+{
+       struct device *control = to_soc_camera_control(icd);
+       return dev_get_drvdata(control);
+}
+
+int soc_camera_host_register(struct soc_camera_host *ici);
+void soc_camera_host_unregister(struct soc_camera_host *ici);
+
+const struct soc_camera_data_format *soc_camera_format_by_fourcc(
        struct soc_camera_device *icd, unsigned int fourcc);
-extern const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
+const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
        struct soc_camera_device *icd, unsigned int fourcc);
 
 struct soc_camera_data_format {
@@ -163,30 +192,11 @@ struct soc_camera_format_xlate {
 };
 
 struct soc_camera_ops {
-       struct module *owner;
-       int (*probe)(struct soc_camera_device *);
-       void (*remove)(struct soc_camera_device *);
        int (*suspend)(struct soc_camera_device *, pm_message_t state);
        int (*resume)(struct soc_camera_device *);
-       int (*init)(struct soc_camera_device *);
-       int (*release)(struct soc_camera_device *);
-       int (*start_capture)(struct soc_camera_device *);
-       int (*stop_capture)(struct soc_camera_device *);
-       int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
-       int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
-       int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-       int (*get_chip_id)(struct soc_camera_device *,
-                          struct v4l2_dbg_chip_ident *);
-       int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
        int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-       int (*get_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
-       int (*set_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
-#endif
-       int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
-       int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
        const struct v4l2_queryctrl *controls;
        int num_controls;
 };
@@ -268,6 +278,21 @@ static inline unsigned long soc_camera_bus_param_compatible(
                common_flags;
 }
 
+static inline void soc_camera_limit_side(unsigned int *start,
+               unsigned int *length, unsigned int start_min,
+               unsigned int length_min, unsigned int length_max)
+{
+       if (*length < length_min)
+               *length = length_min;
+       else if (*length > length_max)
+               *length = length_max;
+
+       if (*start < start_min)
+               *start = start_min;
+       else if (*start > start_min + length_max - *length)
+               *start = start_min + length_max - *length;
+}
+
 extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
                                                   unsigned long flags);
 
index 1d092b4..bb70401 100644 (file)
 #define __SOC_CAMERA_H__
 
 #include <linux/videodev2.h>
+#include <media/soc_camera.h>
+
+struct device;
 
 struct soc_camera_platform_info {
-       int iface;
-       char *format_name;
+       const char *format_name;
        unsigned long format_depth;
        struct v4l2_pix_format format;
        unsigned long bus_param;
-       void (*power)(int);
+       struct device *dev;
        int (*set_capture)(struct soc_camera_platform_info *info, int enable);
+       struct soc_camera_link link;
 };
 
 #endif /* __SOC_CAMERA_H__ */
index c146f2f..4d5b53f 100644 (file)
 #define TUNER_PHILIPS_FM1216MK5                79
 #define TUNER_PHILIPS_FQ1216LME_MK3    80      /* Active loopthrough, no FM */
 #define TUNER_PARTSNIC_PTI_5NF05       81
+#define TUNER_PHILIPS_CU1216L           82
+#define TUNER_NXP_TDA18271             83
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)
index 5e7ee96..74387e8 100644 (file)
@@ -104,10 +104,6 @@ enum tvp514x_output {
  * @ vs_polarity: VSYNC Polarity configuration for current interface.
  */
 struct tvp514x_platform_data {
-       char *master;
-       int (*power_set) (enum v4l2_power on);
-       int (*ifparm) (struct v4l2_ifparm *p);
-       int (*priv_data_set) (void *);
        /* Interface control params */
        bool clk_polarity;
        bool hs_polarity;
index 94e908c..cf16689 100644 (file)
@@ -135,6 +135,9 @@ enum {
        /* module adv7175: just ident 7175 */
        V4L2_IDENT_ADV7175 = 7175,
 
+       /* module adv7180: just ident 7180 */
+       V4L2_IDENT_ADV7180 = 7180,
+
        /* module saa7185: just ident 7185 */
        V4L2_IDENT_SAA7185 = 7185,
 
index 33a1842..1c25b10 100644 (file)
@@ -139,29 +139,23 @@ struct v4l2_subdev_ops;
 /* Load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
-               struct i2c_adapter *adapter,
-               const char *module_name, const char *client_type, u8 addr);
-/* Probe and load an i2c module and return an initialized v4l2_subdev struct.
-   Only call request_module if module_name != NULL.
-   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
-               const unsigned short *addrs);
-/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
-               struct i2c_adapter *adapter,
-               const char *module_name, const char *client_type, u8 addr);
+               int irq, void *platform_data,
+               u8 addr, const unsigned short *probe_addrs);
 
 /* Load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
+static inline struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
-               int irq, void *platform_data,
-               u8 addr, const unsigned short *probe_addrs);
+               u8 addr, const unsigned short *probe_addrs)
+{
+       return v4l2_i2c_new_subdev_cfg(v4l2_dev, adapter, module_name,
+                               client_type, 0, NULL, addr, probe_addrs);
+}
 
 struct i2c_board_info;
 
index 2058dd4..73c9867 100644 (file)
@@ -100,8 +100,10 @@ struct video_device
 
    Also note that vdev->minor is set to -1 if the registration failed. */
 int __must_check video_register_device(struct video_device *vdev, int type, int nr);
-int __must_check video_register_device_index(struct video_device *vdev,
-                                               int type, int nr, int index);
+
+/* Same as video_register_device, but no warning is issued if the desired
+   device node number was already in use. */
+int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr);
 
 /* Unregister video devices. Will do nothing if vdev == NULL or
    vdev->minor < 0. */
index 9388583..c8f94e8 100644 (file)
@@ -482,7 +482,7 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id,
  *   message.
  * @cm_id: Connection identifier associated with the connection message.
  * @service_timeout: The lower 5-bits specify the maximum time required for
- *   the sender to reply to to the connection message.  The upper 3-bits
+ *   the sender to reply to the connection message.  The upper 3-bits
  *   specify additional control flags.
  * @private_data: Optional user-defined private data sent with the
  *   message receipt acknowledgement.
index cff8a8c..f87777d 100644 (file)
@@ -92,8 +92,7 @@ struct fc_esb {
        __u8    _esb_resvd[4];
        __u8    esb_service_params[112]; /* TBD */
        __u8    esb_seq_status[8];      /* sequence statuses, 8 bytes each */
-} __attribute__((packed));;
-
+} __attribute__((packed));
 
 /*
  * Define expected size for ASSERTs.
index 1493c54..eaf46bd 100644 (file)
@@ -225,6 +225,169 @@ TRACE_EVENT(kmem_cache_free,
 
        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
 );
+
+TRACE_EVENT(mm_page_free_direct,
+
+       TP_PROTO(struct page *page, unsigned int order),
+
+       TP_ARGS(page, order),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page            )
+               __field(        unsigned int,   order           )
+       ),
+
+       TP_fast_assign(
+               __entry->page           = page;
+               __entry->order          = order;
+       ),
+
+       TP_printk("page=%p pfn=%lu order=%d",
+                       __entry->page,
+                       page_to_pfn(__entry->page),
+                       __entry->order)
+);
+
+TRACE_EVENT(mm_pagevec_free,
+
+       TP_PROTO(struct page *page, int cold),
+
+       TP_ARGS(page, cold),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page            )
+               __field(        int,            cold            )
+       ),
+
+       TP_fast_assign(
+               __entry->page           = page;
+               __entry->cold           = cold;
+       ),
+
+       TP_printk("page=%p pfn=%lu order=0 cold=%d",
+                       __entry->page,
+                       page_to_pfn(__entry->page),
+                       __entry->cold)
+);
+
+TRACE_EVENT(mm_page_alloc,
+
+       TP_PROTO(struct page *page, unsigned int order,
+                       gfp_t gfp_flags, int migratetype),
+
+       TP_ARGS(page, order, gfp_flags, migratetype),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page            )
+               __field(        unsigned int,   order           )
+               __field(        gfp_t,          gfp_flags       )
+               __field(        int,            migratetype     )
+       ),
+
+       TP_fast_assign(
+               __entry->page           = page;
+               __entry->order          = order;
+               __entry->gfp_flags      = gfp_flags;
+               __entry->migratetype    = migratetype;
+       ),
+
+       TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
+               __entry->page,
+               page_to_pfn(__entry->page),
+               __entry->order,
+               __entry->migratetype,
+               show_gfp_flags(__entry->gfp_flags))
+);
+
+TRACE_EVENT(mm_page_alloc_zone_locked,
+
+       TP_PROTO(struct page *page, unsigned int order, int migratetype),
+
+       TP_ARGS(page, order, migratetype),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page            )
+               __field(        unsigned int,   order           )
+               __field(        int,            migratetype     )
+       ),
+
+       TP_fast_assign(
+               __entry->page           = page;
+               __entry->order          = order;
+               __entry->migratetype    = migratetype;
+       ),
+
+       TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
+               __entry->page,
+               page_to_pfn(__entry->page),
+               __entry->order,
+               __entry->migratetype,
+               __entry->order == 0)
+);
+
+TRACE_EVENT(mm_page_pcpu_drain,
+
+       TP_PROTO(struct page *page, int order, int migratetype),
+
+       TP_ARGS(page, order, migratetype),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page            )
+               __field(        int,            order           )
+               __field(        int,            migratetype     )
+       ),
+
+       TP_fast_assign(
+               __entry->page           = page;
+               __entry->order          = order;
+               __entry->migratetype    = migratetype;
+       ),
+
+       TP_printk("page=%p pfn=%lu order=%d migratetype=%d",
+               __entry->page,
+               page_to_pfn(__entry->page),
+               __entry->order,
+               __entry->migratetype)
+);
+
+TRACE_EVENT(mm_page_alloc_extfrag,
+
+       TP_PROTO(struct page *page,
+                       int alloc_order, int fallback_order,
+                       int alloc_migratetype, int fallback_migratetype),
+
+       TP_ARGS(page,
+               alloc_order, fallback_order,
+               alloc_migratetype, fallback_migratetype),
+
+       TP_STRUCT__entry(
+               __field(        struct page *,  page                    )
+               __field(        int,            alloc_order             )
+               __field(        int,            fallback_order          )
+               __field(        int,            alloc_migratetype       )
+               __field(        int,            fallback_migratetype    )
+       ),
+
+       TP_fast_assign(
+               __entry->page                   = page;
+               __entry->alloc_order            = alloc_order;
+               __entry->fallback_order         = fallback_order;
+               __entry->alloc_migratetype      = alloc_migratetype;
+               __entry->fallback_migratetype   = fallback_migratetype;
+       ),
+
+       TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
+               __entry->page,
+               page_to_pfn(__entry->page),
+               __entry->alloc_order,
+               __entry->fallback_order,
+               pageblock_order,
+               __entry->alloc_migratetype,
+               __entry->fallback_migratetype,
+               __entry->fallback_order < pageblock_order,
+               __entry->alloc_migratetype == __entry->fallback_migratetype)
+);
+
 #endif /* _TRACE_KMEM_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
new file mode 100644 (file)
index 0000000..ea6d579
--- /dev/null
@@ -0,0 +1,81 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM power
+
+#if !defined(_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_POWER_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+#ifndef _TRACE_POWER_ENUM_
+#define _TRACE_POWER_ENUM_
+enum {
+       POWER_NONE = 0,
+       POWER_CSTATE = 1,
+       POWER_PSTATE = 2,
+};
+#endif
+
+
+
+TRACE_EVENT(power_start,
+
+       TP_PROTO(unsigned int type, unsigned int state),
+
+       TP_ARGS(type, state),
+
+       TP_STRUCT__entry(
+               __field(        u64,            type            )
+               __field(        u64,            state           )
+       ),
+
+       TP_fast_assign(
+               __entry->type = type;
+               __entry->state = state;
+       ),
+
+       TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
+);
+
+TRACE_EVENT(power_end,
+
+       TP_PROTO(int dummy),
+
+       TP_ARGS(dummy),
+
+       TP_STRUCT__entry(
+               __field(        u64,            dummy           )
+       ),
+
+       TP_fast_assign(
+               __entry->dummy = 0xffff;
+       ),
+
+       TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+
+);
+
+
+TRACE_EVENT(power_frequency,
+
+       TP_PROTO(unsigned int type, unsigned int state),
+
+       TP_ARGS(type, state),
+
+       TP_STRUCT__entry(
+               __field(        u64,            type            )
+               __field(        u64,            state           )
+       ),
+
+       TP_fast_assign(
+               __entry->type = type;
+               __entry->state = state;
+       ),
+
+       TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long) __entry->state)
+);
+
+#endif /* _TRACE_POWER_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
index b48f1ad..4069c43 100644 (file)
@@ -379,6 +379,39 @@ TRACE_EVENT(sched_stat_wait,
                        (unsigned long long)__entry->delay)
 );
 
+/*
+ * Tracepoint for accounting runtime (time the task is executing
+ * on a CPU).
+ */
+TRACE_EVENT(sched_stat_runtime,
+
+       TP_PROTO(struct task_struct *tsk, u64 runtime, u64 vruntime),
+
+       TP_ARGS(tsk, runtime, vruntime),
+
+       TP_STRUCT__entry(
+               __array( char,  comm,   TASK_COMM_LEN   )
+               __field( pid_t, pid                     )
+               __field( u64,   runtime                 )
+               __field( u64,   vruntime                        )
+       ),
+
+       TP_fast_assign(
+               memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
+               __entry->pid            = tsk->pid;
+               __entry->runtime        = runtime;
+               __entry->vruntime       = vruntime;
+       )
+       TP_perf_assign(
+               __perf_count(runtime);
+       ),
+
+       TP_printk("task: %s:%d runtime: %Lu [ns], vruntime: %Lu [ns]",
+                       __entry->comm, __entry->pid,
+                       (unsigned long long)__entry->runtime,
+                       (unsigned long long)__entry->vruntime)
+);
+
 /*
  * Tracepoint for accounting sleep time (time the task is not runnable,
  * including iowait, see below).
index 72a3b43..cc0d966 100644 (file)
@@ -378,24 +378,18 @@ static inline int ftrace_get_offsets_##call(                              \
 #ifdef CONFIG_EVENT_PROFILE
 
 /*
- * Generate the functions needed for tracepoint perf_counter support.
+ * Generate the functions needed for tracepoint perf_event support.
  *
  * NOTE: The insertion profile callback (ftrace_profile_<call>) is defined later
  *
- * static int ftrace_profile_enable_<call>(struct ftrace_event_call *event_call)
+ * static int ftrace_profile_enable_<call>(void)
  * {
- *     int ret = 0;
- *
- *     if (!atomic_inc_return(&event_call->profile_count))
- *             ret = register_trace_<call>(ftrace_profile_<call>);
- *
- *     return ret;
+ *     return register_trace_<call>(ftrace_profile_<call>);
  * }
  *
- * static void ftrace_profile_disable_<call>(struct ftrace_event_call *event_call)
+ * static void ftrace_profile_disable_<call>(void)
  * {
- *     if (atomic_add_negative(-1, &event->call->profile_count))
- *             unregister_trace_<call>(ftrace_profile_<call>);
+ *     unregister_trace_<call>(ftrace_profile_<call>);
  * }
  *
  */
@@ -405,20 +399,14 @@ static inline int ftrace_get_offsets_##call(                              \
                                                                        \
 static void ftrace_profile_##call(proto);                              \
                                                                        \
-static int ftrace_profile_enable_##call(struct ftrace_event_call *event_call) \
+static int ftrace_profile_enable_##call(void)                          \
 {                                                                      \
-       int ret = 0;                                                    \
-                                                                       \
-       if (!atomic_inc_return(&event_call->profile_count))             \
-               ret = register_trace_##call(ftrace_profile_##call);     \
-                                                                       \
-       return ret;                                                     \
+       return register_trace_##call(ftrace_profile_##call);            \
 }                                                                      \
                                                                        \
-static void ftrace_profile_disable_##call(struct ftrace_event_call *event_call)\
+static void ftrace_profile_disable_##call(void)                                \
 {                                                                      \
-       if (atomic_add_negative(-1, &event_call->profile_count))        \
-               unregister_trace_##call(ftrace_profile_##call);         \
+       unregister_trace_##call(ftrace_profile_##call);                 \
 }
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
@@ -656,15 +644,16 @@ __attribute__((section("_ftrace_events"))) event_##call = {               \
  * {
  *     struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
  *     struct ftrace_event_call *event_call = &event_<call>;
- *     extern void perf_tpcounter_event(int, u64, u64, void *, int);
+ *     extern void perf_tp_event(int, u64, u64, void *, int);
  *     struct ftrace_raw_##call *entry;
  *     u64 __addr = 0, __count = 1;
  *     unsigned long irq_flags;
+ *     struct trace_entry *ent;
  *     int __entry_size;
  *     int __data_size;
+ *     int __cpu
  *     int pc;
  *
- *     local_save_flags(irq_flags);
  *     pc = preempt_count();
  *
  *     __data_size = ftrace_get_offsets_<call>(&__data_offsets, args);
@@ -675,25 +664,34 @@ __attribute__((section("_ftrace_events"))) event_##call = {               \
  *                          sizeof(u64));
  *     __entry_size -= sizeof(u32);
  *
- *     do {
- *             char raw_data[__entry_size]; <- allocate our sample in the stack
- *             struct trace_entry *ent;
+ *     // Protect the non nmi buffer
+ *     // This also protects the rcu read side
+ *     local_irq_save(irq_flags);
+ *     __cpu = smp_processor_id();
+ *
+ *     if (in_nmi())
+ *             raw_data = rcu_dereference(trace_profile_buf_nmi);
+ *     else
+ *             raw_data = rcu_dereference(trace_profile_buf);
+ *
+ *     if (!raw_data)
+ *             goto end;
  *
- *             zero dead bytes from alignment to avoid stack leak to userspace:
+ *     raw_data = per_cpu_ptr(raw_data, __cpu);
  *
- *             *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
- *             entry = (struct ftrace_raw_<call> *)raw_data;
- *             ent = &entry->ent;
- *             tracing_generic_entry_update(ent, irq_flags, pc);
- *             ent->type = event_call->id;
+ *     //zero dead bytes from alignment to avoid stack leak to userspace:
+ *     *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
+ *     entry = (struct ftrace_raw_<call> *)raw_data;
+ *     ent = &entry->ent;
+ *     tracing_generic_entry_update(ent, irq_flags, pc);
+ *     ent->type = event_call->id;
  *
- *             <tstruct> <- do some jobs with dynamic arrays
+ *     <tstruct> <- do some jobs with dynamic arrays
  *
- *             <assign>  <- affect our values
+ *     <assign>  <- affect our values
  *
- *             perf_tpcounter_event(event_call->id, __addr, __count, entry,
- *                          __entry_size);  <- submit them to perf counter
- *     } while (0);
+ *     perf_tp_event(event_call->id, __addr, __count, entry,
+ *                  __entry_size);  <- submit them to perf counter
  *
  * }
  */
@@ -712,15 +710,17 @@ static void ftrace_profile_##call(proto)                          \
 {                                                                      \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
        struct ftrace_event_call *event_call = &event_##call;           \
-       extern void perf_tpcounter_event(int, u64, u64, void *, int);   \
+       extern void perf_tp_event(int, u64, u64, void *, int);  \
        struct ftrace_raw_##call *entry;                                \
        u64 __addr = 0, __count = 1;                                    \
        unsigned long irq_flags;                                        \
+       struct trace_entry *ent;                                        \
        int __entry_size;                                               \
        int __data_size;                                                \
+       char *raw_data;                                                 \
+       int __cpu;                                                      \
        int pc;                                                         \
                                                                        \
-       local_save_flags(irq_flags);                                    \
        pc = preempt_count();                                           \
                                                                        \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
@@ -728,23 +728,38 @@ static void ftrace_profile_##call(proto)                          \
                             sizeof(u64));                              \
        __entry_size -= sizeof(u32);                                    \
                                                                        \
-       do {                                                            \
-               char raw_data[__entry_size];                            \
-               struct trace_entry *ent;                                \
+       if (WARN_ONCE(__entry_size > FTRACE_MAX_PROFILE_SIZE,           \
+                     "profile buffer not large enough"))               \
+               return;                                                 \
+                                                                       \
+       local_irq_save(irq_flags);                                      \
+       __cpu = smp_processor_id();                                     \
                                                                        \
-               *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL; \
-               entry = (struct ftrace_raw_##call *)raw_data;           \
-               ent = &entry->ent;                                      \
-               tracing_generic_entry_update(ent, irq_flags, pc);       \
-               ent->type = event_call->id;                             \
+       if (in_nmi())                                                   \
+               raw_data = rcu_dereference(trace_profile_buf_nmi);              \
+       else                                                            \
+               raw_data = rcu_dereference(trace_profile_buf);          \
                                                                        \
-               tstruct                                                 \
+       if (!raw_data)                                                  \
+               goto end;                                               \
                                                                        \
-               { assign; }                                             \
+       raw_data = per_cpu_ptr(raw_data, __cpu);                        \
                                                                        \
-               perf_tpcounter_event(event_call->id, __addr, __count, entry,\
+       *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;         \
+       entry = (struct ftrace_raw_##call *)raw_data;                   \
+       ent = &entry->ent;                                              \
+       tracing_generic_entry_update(ent, irq_flags, pc);               \
+       ent->type = event_call->id;                                     \
+                                                                       \
+       tstruct                                                         \
+                                                                       \
+       { assign; }                                                     \
+                                                                       \
+       perf_tp_event(event_call->id, __addr, __count, entry,           \
                             __entry_size);                             \
-       } while (0);                                                    \
+                                                                       \
+end:                                                                   \
+       local_irq_restore(irq_flags);                                   \
                                                                        \
 }
 
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
new file mode 100644 (file)
index 0000000..c051a50
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+ * Header file for TI DA8XX LCD controller platform data.
+ *
+ * Copyright (C) 2008-2009 MontaVista Software Inc.
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef DA8XX_FB_H
+#define DA8XX_FB_H
+
+enum panel_type {
+       QVGA = 0
+};
+
+enum panel_shade {
+       MONOCHROME = 0,
+       COLOR_ACTIVE,
+       COLOR_PASSIVE,
+};
+
+enum raster_load_mode {
+       LOAD_DATA = 1,
+       LOAD_PALETTE,
+};
+
+struct display_panel {
+       enum panel_type panel_type; /* QVGA */
+       int max_bpp;
+       int min_bpp;
+       enum panel_shade panel_shade;
+};
+
+struct da8xx_lcdc_platform_data {
+       const char manu_name[10];
+       void *controller_data;
+       const char type[25];
+};
+
+struct lcd_ctrl_config {
+       const struct display_panel *p_disp_panel;
+
+       /* AC Bias Pin Frequency */
+       int ac_bias;
+
+       /* AC Bias Pin Transitions per Interrupt */
+       int ac_bias_intrpt;
+
+       /* DMA burst size */
+       int dma_burst_sz;
+
+       /* Bits per pixel */
+       int bpp;
+
+       /* FIFO DMA Request Delay */
+       int fdd;
+
+       /* TFT Alternative Signal Mapping (Only for active) */
+       unsigned char tft_alt_mode;
+
+       /* 12 Bit Per Pixel (5-6-5) Mode (Only for passive) */
+       unsigned char stn_565_mode;
+
+       /* Mono 8-bit Mode: 1=D0-D7 or 0=D0-D3 */
+       unsigned char mono_8bit_mode;
+
+       /* Invert line clock */
+       unsigned char invert_line_clock;
+
+       /* Invert frame clock  */
+       unsigned char invert_frm_clock;
+
+       /* Horizontal and Vertical Sync Edge: 0=rising 1=falling */
+       unsigned char sync_edge;
+
+       /* Horizontal and Vertical Sync: Control: 0=ignore */
+       unsigned char sync_ctrl;
+
+       /* Raster Data Order Select: 1=Most-to-least 0=Least-to-most */
+       unsigned char raster_order;
+};
+
+struct lcd_sync_arg {
+       int back_porch;
+       int front_porch;
+       int pulse_width;
+};
+
+/* ioctls */
+#define FBIOGET_CONTRAST       _IOR('F', 1, int)
+#define FBIOPUT_CONTRAST       _IOW('F', 2, int)
+#define FBIGET_BRIGHTNESS      _IOR('F', 3, int)
+#define FBIPUT_BRIGHTNESS      _IOW('F', 3, int)
+#define FBIGET_COLOR           _IOR('F', 5, int)
+#define FBIPUT_COLOR           _IOW('F', 6, int)
+#define FBIPUT_HSYNC           _IOW('F', 9, int)
+#define FBIPUT_VSYNC           _IOW('F', 10, int)
+
+#endif  /* ifndef DA8XX_FB_H */
+
index 8e8b76d..0aa6579 100644 (file)
@@ -331,7 +331,8 @@ config TREE_PREEMPT_RCU
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
          thousands of CPUs, but for which real-time response
-         is also required.
+         is also required.  It also scales down nicely to
+         smaller systems.
 
 endchoice
 
@@ -915,31 +916,36 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
-config HAVE_PERF_COUNTERS
+config HAVE_PERF_EVENTS
        bool
        help
          See tools/perf/design.txt for details.
 
-menu "Performance Counters"
+menu "Kernel Performance Events And Counters"
 
-config PERF_COUNTERS
-       bool "Kernel Performance Counters"
-       default y if PROFILING
-       depends on HAVE_PERF_COUNTERS
+config PERF_EVENTS
+       bool "Kernel performance events and counters"
+       default y if (PROFILING || PERF_COUNTERS)
+       depends on HAVE_PERF_EVENTS
        select ANON_INODES
        help
-         Enable kernel support for performance counter hardware.
+         Enable kernel support for various performance events provided
+         by software and hardware.
+
+         Software events are supported either build-in or via the
+         use of generic tracepoints.
 
-         Performance counters are special hardware registers available
-         on most modern CPUs. These registers count the number of certain
+         Most modern CPUs support performance events via performance
+         counter registers. These registers count the number of certain
          types of hw events: such as instructions executed, cachemisses
          suffered, or branches mis-predicted - without slowing down the
          kernel or applications. These registers can also trigger interrupts
          when a threshold number of events have passed - and can thus be
          used to profile the code that runs on that CPU.
 
-         The Linux Performance Counter subsystem provides an abstraction of
-         these hardware capabilities, available via a system call. It
+         The Linux Performance Event subsystem provides an abstraction of
+         these software and hardware cevent apabilities, available via a
+         system call and used by the "perf" utility in tools/perf/. It
          provides per task and per CPU counters, and it provides event
          capabilities on top of those.
 
@@ -947,17 +953,29 @@ config PERF_COUNTERS
 
 config EVENT_PROFILE
        bool "Tracepoint profiling sources"
-       depends on PERF_COUNTERS && EVENT_TRACING
+       depends on PERF_EVENTS && EVENT_TRACING
        default y
        help
-        Allow the use of tracepoints as software performance counters.
+        Allow the use of tracepoints as software performance events.
 
-        When this is enabled, you can create perf counters based on
+        When this is enabled, you can create perf events based on
         tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
         found in debugfs://tracing/events/*/*/id. (The -e/--events
         option to the perf tool can parse and interpret symbolic
         tracepoints, in the subsystem:tracepoint_name format.)
 
+config PERF_COUNTERS
+       bool "Kernel performance counters (old config option)"
+       depends on HAVE_PERF_EVENTS
+       help
+         This config has been obsoleted by the PERF_EVENTS
+         config option - please see that one for details.
+
+         It has no effect on the kernel whether you enable
+         it or not, it is a compatibility placeholder.
+
+         Say N if unsure.
+
 endmenu
 
 config VM_EVENT_COUNTERS
@@ -1054,13 +1072,6 @@ config PROFILING
 config TRACEPOINTS
        bool
 
-config MARKERS
-       bool "Activate markers"
-       select TRACEPOINTS
-       help
-         Place an empty function call at each marker site. Can be
-         dynamically changed for a probe function.
-
 source "arch/Kconfig"
 
 config SLOW_WORK
index a208691..6107223 100644 (file)
@@ -669,12 +669,12 @@ asmlinkage void __init start_kernel(void)
 #endif
        thread_info_cache_init();
        cred_init();
-       fork_init(num_physpages);
+       fork_init(totalram_pages);
        proc_caches_init();
        buffer_init();
        key_init();
        security_init();
-       vfs_caches_init(num_physpages);
+       vfs_caches_init(totalram_pages);
        radix_tree_init();
        signals_init();
        /* rootfs populating might need page-writeback */
index c5e68ad..ee9d697 100644 (file)
@@ -77,7 +77,7 @@ struct mqueue_inode_info {
 
 static const struct inode_operations mqueue_dir_inode_operations;
 static const struct file_operations mqueue_file_operations;
-static struct super_operations mqueue_super_ops;
+static const struct super_operations mqueue_super_ops;
 static void remove_notification(struct mqueue_inode_info *info);
 
 static struct kmem_cache *mqueue_inode_cachep;
@@ -1224,7 +1224,7 @@ static const struct file_operations mqueue_file_operations = {
        .read = mqueue_read_file,
 };
 
-static struct super_operations mqueue_super_ops = {
+static const struct super_operations mqueue_super_ops = {
        .alloc_inode = mqueue_alloc_inode,
        .destroy_inode = mqueue_destroy_inode,
        .statfs = simple_statfs,
index 30162a5..9eb1488 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -370,7 +370,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
                if (shmflg & SHM_NORESERVE)
                        acctflag = VM_NORESERVE;
                file = hugetlb_file_setup(name, size, acctflag,
-                                                       &shp->mlock_user);
+                                       &shp->mlock_user, HUGETLB_SHMFS_INODE);
        } else {
                /*
                 * Do not allow no accounting for OVERCOMMIT_NEVER, even
index b8e4ba9..79ce84e 100644 (file)
@@ -942,7 +942,7 @@ static int sysvipc_proc_show(struct seq_file *s, void *it)
        return iface->show(s, it);
 }
 
-static struct seq_operations sysvipc_proc_seqops = {
+static const struct seq_operations sysvipc_proc_seqops = {
        .start = sysvipc_proc_start,
        .stop  = sysvipc_proc_stop,
        .next  = sysvipc_proc_next,
index 3d9c7e2..187c89b 100644 (file)
@@ -87,7 +87,6 @@ obj-$(CONFIG_RELAY) += relay.o
 obj-$(CONFIG_SYSCTL) += utsname_sysctl.o
 obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
 obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
-obj-$(CONFIG_MARKERS) += marker.o
 obj-$(CONFIG_TRACEPOINTS) += tracepoint.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
 obj-$(CONFIG_FUNCTION_TRACER) += trace/
@@ -96,7 +95,7 @@ obj-$(CONFIG_X86_DS) += trace/
 obj-$(CONFIG_RING_BUFFER) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_SLOW_WORK) += slow-work.o
-obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
+obj-$(CONFIG_PERF_EVENTS) += perf_event.o
 
 ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
index c7ece8f..cd83d99 100644 (file)
@@ -596,7 +596,7 @@ void cgroup_unlock(void)
 static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode);
 static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry);
 static int cgroup_populate_dir(struct cgroup *cgrp);
-static struct inode_operations cgroup_dir_inode_operations;
+static const struct inode_operations cgroup_dir_inode_operations;
 static struct file_operations proc_cgroupstats_operations;
 
 static struct backing_dev_info cgroup_backing_dev_info = {
@@ -961,7 +961,7 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
        return ret;
 }
 
-static struct super_operations cgroup_ops = {
+static const struct super_operations cgroup_ops = {
        .statfs = simple_statfs,
        .drop_inode = generic_delete_inode,
        .show_options = cgroup_show_options,
@@ -1711,7 +1711,7 @@ static struct file_operations cgroup_file_operations = {
        .release = cgroup_file_release,
 };
 
-static struct inode_operations cgroup_dir_inode_operations = {
+static const struct inode_operations cgroup_dir_inode_operations = {
        .lookup = simple_lookup,
        .mkdir = cgroup_mkdir,
        .rmdir = cgroup_rmdir,
@@ -2314,7 +2314,7 @@ static int cgroup_tasks_show(struct seq_file *s, void *v)
        return seq_printf(s, "%d\n", *(int *)v);
 }
 
-static struct seq_operations cgroup_tasks_seq_operations = {
+static const struct seq_operations cgroup_tasks_seq_operations = {
        .start = cgroup_tasks_start,
        .stop = cgroup_tasks_stop,
        .next = cgroup_tasks_next,
index ae5d866..60d6fdc 100644 (file)
@@ -47,7 +47,7 @@
 #include <linux/tracehook.h>
 #include <linux/fs_struct.h>
 #include <linux/init_task.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <trace/events/sched.h>
 
 #include <asm/uaccess.h>
@@ -154,8 +154,8 @@ static void delayed_put_task_struct(struct rcu_head *rhp)
 {
        struct task_struct *tsk = container_of(rhp, struct task_struct, rcu);
 
-#ifdef CONFIG_PERF_COUNTERS
-       WARN_ON_ONCE(tsk->perf_counter_ctxp);
+#ifdef CONFIG_PERF_EVENTS
+       WARN_ON_ONCE(tsk->perf_event_ctxp);
 #endif
        trace_sched_process_free(tsk);
        put_task_struct(tsk);
@@ -359,8 +359,10 @@ void __set_special_pids(struct pid *pid)
 {
        struct task_struct *curr = current->group_leader;
 
-       if (task_session(curr) != pid)
+       if (task_session(curr) != pid) {
                change_pid(curr, PIDTYPE_SID, pid);
+               proc_sid_connector(curr);
+       }
 
        if (task_pgrp(curr) != pid)
                change_pid(curr, PIDTYPE_PGID, pid);
@@ -945,6 +947,8 @@ NORET_TYPE void do_exit(long code)
        if (group_dead) {
                hrtimer_cancel(&tsk->signal->real_timer);
                exit_itimers(tsk->signal);
+               if (tsk->mm)
+                       setmax_mm_hiwater_rss(&tsk->signal->maxrss, tsk->mm);
        }
        acct_collect(code, group_dead);
        if (group_dead)
@@ -981,7 +985,7 @@ NORET_TYPE void do_exit(long code)
         * Flush inherited counters to the parent - before the parent
         * gets woken up by child-exit notifications.
         */
-       perf_counter_exit_task(tsk);
+       perf_event_exit_task(tsk);
 
        exit_notify(tsk, group_dead);
 #ifdef CONFIG_NUMA
@@ -1208,6 +1212,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
        if (likely(!traced) && likely(!task_detached(p))) {
                struct signal_struct *psig;
                struct signal_struct *sig;
+               unsigned long maxrss;
 
                /*
                 * The resource counters for the group leader are in its
@@ -1256,6 +1261,9 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
                psig->coublock +=
                        task_io_get_oublock(p) +
                        sig->oublock + sig->coublock;
+               maxrss = max(sig->maxrss, sig->cmaxrss);
+               if (psig->cmaxrss < maxrss)
+                       psig->cmaxrss = maxrss;
                task_io_accounting_add(&psig->ioac, &p->ioac);
                task_io_accounting_add(&psig->ioac, &sig->ioac);
                spin_unlock_irq(&p->real_parent->sighand->siglock);
index bfee931..8f45b0e 100644 (file)
@@ -49,6 +49,7 @@
 #include <linux/ftrace.h>
 #include <linux/profile.h>
 #include <linux/rmap.h>
+#include <linux/ksm.h>
 #include <linux/acct.h>
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
@@ -61,7 +62,7 @@
 #include <linux/blkdev.h>
 #include <linux/fs_struct.h>
 #include <linux/magic.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -136,9 +137,17 @@ struct kmem_cache *vm_area_cachep;
 /* SLAB cache for mm_struct structures (tsk->mm) */
 static struct kmem_cache *mm_cachep;
 
+static void account_kernel_stack(struct thread_info *ti, int account)
+{
+       struct zone *zone = page_zone(virt_to_page(ti));
+
+       mod_zone_page_state(zone, NR_KERNEL_STACK, account);
+}
+
 void free_task(struct task_struct *tsk)
 {
        prop_local_destroy_single(&tsk->dirties);
+       account_kernel_stack(tsk->stack, -1);
        free_thread_info(tsk->stack);
        rt_mutex_debug_task_free(tsk);
        ftrace_graph_exit_task(tsk);
@@ -253,6 +262,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
        tsk->btrace_seq = 0;
 #endif
        tsk->splice_pipe = NULL;
+
+       account_kernel_stack(ti, 1);
+
        return tsk;
 
 out:
@@ -288,6 +300,9 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
        rb_link = &mm->mm_rb.rb_node;
        rb_parent = NULL;
        pprev = &mm->mmap;
+       retval = ksm_fork(mm, oldmm);
+       if (retval)
+               goto out;
 
        for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
                struct file *file;
@@ -424,7 +439,8 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
        atomic_set(&mm->mm_count, 1);
        init_rwsem(&mm->mmap_sem);
        INIT_LIST_HEAD(&mm->mmlist);
-       mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
+       mm->flags = (current->mm) ?
+               (current->mm->flags & MMF_INIT_MASK) : default_dump_filter;
        mm->core_state = NULL;
        mm->nr_ptes = 0;
        set_mm_counter(mm, file_rss, 0);
@@ -485,6 +501,7 @@ void mmput(struct mm_struct *mm)
 
        if (atomic_dec_and_test(&mm->mm_users)) {
                exit_aio(mm);
+               ksm_exit(mm);
                exit_mmap(mm);
                set_mm_exe_file(mm, NULL);
                if (!list_empty(&mm->mmlist)) {
@@ -849,6 +866,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
        sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;
        sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;
        sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;
+       sig->maxrss = sig->cmaxrss = 0;
        task_io_accounting_init(&sig->ioac);
        sig->sum_sched_runtime = 0;
        taskstats_tgid_init(sig);
@@ -863,6 +881,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 
        tty_audit_fork(sig);
 
+       sig->oom_adj = current->signal->oom_adj;
+
        return 0;
 }
 
@@ -1075,10 +1095,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 
        p->bts = NULL;
 
+       p->stack_start = stack_start;
+
        /* Perform scheduler related setup. Assign this task to a CPU. */
        sched_fork(p, clone_flags);
 
-       retval = perf_counter_init_task(p);
+       retval = perf_event_init_task(p);
        if (retval)
                goto bad_fork_cleanup_policy;
 
@@ -1253,7 +1275,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
        write_unlock_irq(&tasklist_lock);
        proc_fork_connector(p);
        cgroup_post_fork(p);
-       perf_counter_fork(p);
+       perf_event_fork(p);
        return p;
 
 bad_fork_free_pid:
@@ -1280,7 +1302,7 @@ bad_fork_cleanup_semundo:
 bad_fork_cleanup_audit:
        audit_free(p);
 bad_fork_cleanup_policy:
-       perf_counter_free_task(p);
+       perf_event_free_task(p);
 #ifdef CONFIG_NUMA
        mpol_put(p->mempolicy);
 bad_fork_cleanup_cgroup:
index 3a29dbe..8b6b8b6 100644 (file)
@@ -59,7 +59,8 @@ static inline int is_kernel_inittext(unsigned long addr)
 
 static inline int is_kernel_text(unsigned long addr)
 {
-       if (addr >= (unsigned long)_stext && addr <= (unsigned long)_etext)
+       if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
+           arch_is_kernel_text(addr))
                return 1;
        return in_gate_area_no_task(addr);
 }
index 26539e3..3765ff3 100644 (file)
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(kfifo_free);
  * writer, you don't need extra locking to use these functions.
  */
 unsigned int __kfifo_put(struct kfifo *fifo,
-                        unsigned char *buffer, unsigned int len)
+                       const unsigned char *buffer, unsigned int len)
 {
        unsigned int l;
 
index 9fcb53a..689d20f 100644 (file)
@@ -143,6 +143,7 @@ struct subprocess_info {
 static int ____call_usermodehelper(void *data)
 {
        struct subprocess_info *sub_info = data;
+       enum umh_wait wait = sub_info->wait;
        int retval;
 
        BUG_ON(atomic_read(&sub_info->cred->usage) != 1);
@@ -184,10 +185,14 @@ static int ____call_usermodehelper(void *data)
         */
        set_user_nice(current, 0);
 
+       if (wait == UMH_WAIT_EXEC)
+               complete(sub_info->complete);
+
        retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
 
        /* Exec failed? */
-       sub_info->retval = retval;
+       if (wait != UMH_WAIT_EXEC)
+               sub_info->retval = retval;
        do_exit(0);
 }
 
@@ -266,16 +271,14 @@ static void __call_usermodehelper(struct work_struct *work)
 
        switch (wait) {
        case UMH_NO_WAIT:
+       case UMH_WAIT_EXEC:
                break;
 
        case UMH_WAIT_PROC:
                if (pid > 0)
                        break;
                sub_info->retval = pid;
-               /* FALLTHROUGH */
-
-       case UMH_WAIT_EXEC:
-               complete(sub_info->complete);
+               break;
        }
 }
 
index ef177d6..cfadc12 100644 (file)
@@ -1321,7 +1321,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
        return 0;
 }
 
-static struct seq_operations kprobes_seq_ops = {
+static const struct seq_operations kprobes_seq_ops = {
        .start = kprobe_seq_start,
        .next  = kprobe_seq_next,
        .stop  = kprobe_seq_stop,
index f74d2d7..3815ac1 100644 (file)
@@ -578,6 +578,9 @@ static int static_obj(void *obj)
        if ((addr >= start) && (addr < end))
                return 1;
 
+       if (arch_is_kernel_data(addr))
+               return 1;
+
 #ifdef CONFIG_SMP
        /*
         * percpu var?
index d4b3dbc..d4aba4f 100644 (file)
@@ -594,7 +594,7 @@ static int ls_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations lockstat_ops = {
+static const struct seq_operations lockstat_ops = {
        .start  = ls_start,
        .next   = ls_next,
        .stop   = ls_stop,
diff --git a/kernel/marker.c b/kernel/marker.c
deleted file mode 100644 (file)
index ea54f26..0000000
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
- * Copyright (C) 2007 Mathieu Desnoyers
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/types.h>
-#include <linux/jhash.h>
-#include <linux/list.h>
-#include <linux/rcupdate.h>
-#include <linux/marker.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-
-extern struct marker __start___markers[];
-extern struct marker __stop___markers[];
-
-/* Set to 1 to enable marker debug output */
-static const int marker_debug;
-
-/*
- * markers_mutex nests inside module_mutex. Markers mutex protects the builtin
- * and module markers and the hash table.
- */
-static DEFINE_MUTEX(markers_mutex);
-
-/*
- * Marker hash table, containing the active markers.
- * Protected by module_mutex.
- */
-#define MARKER_HASH_BITS 6
-#define MARKER_TABLE_SIZE (1 << MARKER_HASH_BITS)
-static struct hlist_head marker_table[MARKER_TABLE_SIZE];
-
-/*
- * Note about RCU :
- * It is used to make sure every handler has finished using its private data
- * between two consecutive operation (add or remove) on a given marker.  It is
- * also used to delay the free of multiple probes array until a quiescent state
- * is reached.
- * marker entries modifications are protected by the markers_mutex.
- */
-struct marker_entry {
-       struct hlist_node hlist;
-       char *format;
-                       /* Probe wrapper */
-       void (*call)(const struct marker *mdata, void *call_private, ...);
-       struct marker_probe_closure single;
-       struct marker_probe_closure *multi;
-       int refcount;   /* Number of times armed. 0 if disarmed. */
-       struct rcu_head rcu;
-       void *oldptr;
-       int rcu_pending;
-       unsigned char ptype:1;
-       unsigned char format_allocated:1;
-       char name[0];   /* Contains name'\0'format'\0' */
-};
-
-/**
- * __mark_empty_function - Empty probe callback
- * @probe_private: probe private data
- * @call_private: call site private data
- * @fmt: format string
- * @...: variable argument list
- *
- * Empty callback provided as a probe to the markers. By providing this to a
- * disabled marker, we make sure the  execution flow is always valid even
- * though the function pointer change and the marker enabling are two distinct
- * operations that modifies the execution flow of preemptible code.
- */
-notrace void __mark_empty_function(void *probe_private, void *call_private,
-       const char *fmt, va_list *args)
-{
-}
-EXPORT_SYMBOL_GPL(__mark_empty_function);
-
-/*
- * marker_probe_cb Callback that prepares the variable argument list for probes.
- * @mdata: pointer of type struct marker
- * @call_private: caller site private data
- * @...:  Variable argument list.
- *
- * Since we do not use "typical" pointer based RCU in the 1 argument case, we
- * need to put a full smp_rmb() in this branch. This is why we do not use
- * rcu_dereference() for the pointer read.
- */
-notrace void marker_probe_cb(const struct marker *mdata,
-               void *call_private, ...)
-{
-       va_list args;
-       char ptype;
-
-       /*
-        * rcu_read_lock_sched does two things : disabling preemption to make
-        * sure the teardown of the callbacks can be done correctly when they
-        * are in modules and they insure RCU read coherency.
-        */
-       rcu_read_lock_sched_notrace();
-       ptype = mdata->ptype;
-       if (likely(!ptype)) {
-               marker_probe_func *func;
-               /* Must read the ptype before ptr. They are not data dependant,
-                * so we put an explicit smp_rmb() here. */
-               smp_rmb();
-               func = mdata->single.func;
-               /* Must read the ptr before private data. They are not data
-                * dependant, so we put an explicit smp_rmb() here. */
-               smp_rmb();
-               va_start(args, call_private);
-               func(mdata->single.probe_private, call_private, mdata->format,
-                       &args);
-               va_end(args);
-       } else {
-               struct marker_probe_closure *multi;
-               int i;
-               /*
-                * Read mdata->ptype before mdata->multi.
-                */
-               smp_rmb();
-               multi = mdata->multi;
-               /*
-                * multi points to an array, therefore accessing the array
-                * depends on reading multi. However, even in this case,
-                * we must insure that the pointer is read _before_ the array
-                * data. Same as rcu_dereference, but we need a full smp_rmb()
-                * in the fast path, so put the explicit barrier here.
-                */
-               smp_read_barrier_depends();
-               for (i = 0; multi[i].func; i++) {
-                       va_start(args, call_private);
-                       multi[i].func(multi[i].probe_private, call_private,
-                               mdata->format, &args);
-                       va_end(args);
-               }
-       }
-       rcu_read_unlock_sched_notrace();
-}
-EXPORT_SYMBOL_GPL(marker_probe_cb);
-
-/*
- * marker_probe_cb Callback that does not prepare the variable argument list.
- * @mdata: pointer of type struct marker
- * @call_private: caller site private data
- * @...:  Variable argument list.
- *
- * Should be connected to markers "MARK_NOARGS".
- */
-static notrace void marker_probe_cb_noarg(const struct marker *mdata,
-               void *call_private, ...)
-{
-       va_list args;   /* not initialized */
-       char ptype;
-
-       rcu_read_lock_sched_notrace();
-       ptype = mdata->ptype;
-       if (likely(!ptype)) {
-               marker_probe_func *func;
-               /* Must read the ptype before ptr. They are not data dependant,
-                * so we put an explicit smp_rmb() here. */
-               smp_rmb();
-               func = mdata->single.func;
-               /* Must read the ptr before private data. They are not data
-                * dependant, so we put an explicit smp_rmb() here. */
-               smp_rmb();
-               func(mdata->single.probe_private, call_private, mdata->format,
-                       &args);
-       } else {
-               struct marker_probe_closure *multi;
-               int i;
-               /*
-                * Read mdata->ptype before mdata->multi.
-                */
-               smp_rmb();
-               multi = mdata->multi;
-               /*
-                * multi points to an array, therefore accessing the array
-                * depends on reading multi. However, even in this case,
-                * we must insure that the pointer is read _before_ the array
-                * data. Same as rcu_dereference, but we need a full smp_rmb()
-                * in the fast path, so put the explicit barrier here.
-                */
-               smp_read_barrier_depends();
-               for (i = 0; multi[i].func; i++)
-                       multi[i].func(multi[i].probe_private, call_private,
-                               mdata->format, &args);
-       }
-       rcu_read_unlock_sched_notrace();
-}
-
-static void free_old_closure(struct rcu_head *head)
-{
-       struct marker_entry *entry = container_of(head,
-               struct marker_entry, rcu);
-       kfree(entry->oldptr);
-       /* Make sure we free the data before setting the pending flag to 0 */
-       smp_wmb();
-       entry->rcu_pending = 0;
-}
-
-static void debug_print_probes(struct marker_entry *entry)
-{
-       int i;
-
-       if (!marker_debug)
-               return;
-
-       if (!entry->ptype) {
-               printk(KERN_DEBUG "Single probe : %p %p\n",
-                       entry->single.func,
-                       entry->single.probe_private);
-       } else {
-               for (i = 0; entry->multi[i].func; i++)
-                       printk(KERN_DEBUG "Multi probe %d : %p %p\n", i,
-                               entry->multi[i].func,
-                               entry->multi[i].probe_private);
-       }
-}
-
-static struct marker_probe_closure *
-marker_entry_add_probe(struct marker_entry *entry,
-               marker_probe_func *probe, void *probe_private)
-{
-       int nr_probes = 0;
-       struct marker_probe_closure *old, *new;
-
-       WARN_ON(!probe);
-
-       debug_print_probes(entry);
-       old = entry->multi;
-       if (!entry->ptype) {
-               if (entry->single.func == probe &&
-                               entry->single.probe_private == probe_private)
-                       return ERR_PTR(-EBUSY);
-               if (entry->single.func == __mark_empty_function) {
-                       /* 0 -> 1 probes */
-                       entry->single.func = probe;
-                       entry->single.probe_private = probe_private;
-                       entry->refcount = 1;
-                       entry->ptype = 0;
-                       debug_print_probes(entry);
-                       return NULL;
-               } else {
-                       /* 1 -> 2 probes */
-                       nr_probes = 1;
-                       old = NULL;
-               }
-       } else {
-               /* (N -> N+1), (N != 0, 1) probes */
-               for (nr_probes = 0; old[nr_probes].func; nr_probes++)
-                       if (old[nr_probes].func == probe
-                                       && old[nr_probes].probe_private
-                                               == probe_private)
-                               return ERR_PTR(-EBUSY);
-       }
-       /* + 2 : one for new probe, one for NULL func */
-       new = kzalloc((nr_probes + 2) * sizeof(struct marker_probe_closure),
-                       GFP_KERNEL);
-       if (new == NULL)
-               return ERR_PTR(-ENOMEM);
-       if (!old)
-               new[0] = entry->single;
-       else
-               memcpy(new, old,
-                       nr_probes * sizeof(struct marker_probe_closure));
-       new[nr_probes].func = probe;
-       new[nr_probes].probe_private = probe_private;
-       entry->refcount = nr_probes + 1;
-       entry->multi = new;
-       entry->ptype = 1;
-       debug_print_probes(entry);
-       return old;
-}
-
-static struct marker_probe_closure *
-marker_entry_remove_probe(struct marker_entry *entry,
-               marker_probe_func *probe, void *probe_private)
-{
-       int nr_probes = 0, nr_del = 0, i;
-       struct marker_probe_closure *old, *new;
-
-       old = entry->multi;
-
-       debug_print_probes(entry);
-       if (!entry->ptype) {
-               /* 0 -> N is an error */
-               WARN_ON(entry->single.func == __mark_empty_function);
-               /* 1 -> 0 probes */
-               WARN_ON(probe && entry->single.func != probe);
-               WARN_ON(entry->single.probe_private != probe_private);
-               entry->single.func = __mark_empty_function;
-               entry->refcount = 0;
-               entry->ptype = 0;
-               debug_print_probes(entry);
-               return NULL;
-       } else {
-               /* (N -> M), (N > 1, M >= 0) probes */
-               for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
-                       if ((!probe || old[nr_probes].func == probe)
-                                       && old[nr_probes].probe_private
-                                               == probe_private)
-                               nr_del++;
-               }
-       }
-
-       if (nr_probes - nr_del == 0) {
-               /* N -> 0, (N > 1) */
-               entry->single.func = __mark_empty_function;
-               entry->refcount = 0;
-               entry->ptype = 0;
-       } else if (nr_probes - nr_del == 1) {
-               /* N -> 1, (N > 1) */
-               for (i = 0; old[i].func; i++)
-                       if ((probe && old[i].func != probe) ||
-                                       old[i].probe_private != probe_private)
-                               entry->single = old[i];
-               entry->refcount = 1;
-               entry->ptype = 0;
-       } else {
-               int j = 0;
-               /* N -> M, (N > 1, M > 1) */
-               /* + 1 for NULL */
-               new = kzalloc((nr_probes - nr_del + 1)
-                       * sizeof(struct marker_probe_closure), GFP_KERNEL);
-               if (new == NULL)
-                       return ERR_PTR(-ENOMEM);
-               for (i = 0; old[i].func; i++)
-                       if ((probe && old[i].func != probe) ||
-                                       old[i].probe_private != probe_private)
-                               new[j++] = old[i];
-               entry->refcount = nr_probes - nr_del;
-               entry->ptype = 1;
-               entry->multi = new;
-       }
-       debug_print_probes(entry);
-       return old;
-}
-
-/*
- * Get marker if the marker is present in the marker hash table.
- * Must be called with markers_mutex held.
- * Returns NULL if not present.
- */
-static struct marker_entry *get_marker(const char *name)
-{
-       struct hlist_head *head;
-       struct hlist_node *node;
-       struct marker_entry *e;
-       u32 hash = jhash(name, strlen(name), 0);
-
-       head = &marker_table[hash & ((1 << MARKER_HASH_BITS)-1)];
-       hlist_for_each_entry(e, node, head, hlist) {
-               if (!strcmp(name, e->name))
-                       return e;
-       }
-       return NULL;
-}
-
-/*
- * Add the marker to the marker hash table. Must be called with markers_mutex
- * held.
- */
-static struct marker_entry *add_marker(const char *name, const char *format)
-{
-       struct hlist_head *head;
-       struct hlist_node *node;
-       struct marker_entry *e;
-       size_t name_len = strlen(name) + 1;
-       size_t format_len = 0;
-       u32 hash = jhash(name, name_len-1, 0);
-
-       if (format)
-               format_len = strlen(format) + 1;
-       head = &marker_table[hash & ((1 << MARKER_HASH_BITS)-1)];
-       hlist_for_each_entry(e, node, head, hlist) {
-               if (!strcmp(name, e->name)) {
-                       printk(KERN_NOTICE
-                               "Marker %s busy\n", name);
-                       return ERR_PTR(-EBUSY); /* Already there */
-               }
-       }
-       /*
-        * Using kmalloc here to allocate a variable length element. Could
-        * cause some memory fragmentation if overused.
-        */
-       e = kmalloc(sizeof(struct marker_entry) + name_len + format_len,
-                       GFP_KERNEL);
-       if (!e)
-               return ERR_PTR(-ENOMEM);
-       memcpy(&e->name[0], name, name_len);
-       if (format) {
-               e->format = &e->name[name_len];
-               memcpy(e->format, format, format_len);
-               if (strcmp(e->format, MARK_NOARGS) == 0)
-                       e->call = marker_probe_cb_noarg;
-               else
-                       e->call = marker_probe_cb;
-               trace_mark(core_marker_format, "name %s format %s",
-                               e->name, e->format);
-       } else {
-               e->format = NULL;
-               e->call = marker_probe_cb;
-       }
-       e->single.func = __mark_empty_function;
-       e->single.probe_private = NULL;
-       e->multi = NULL;
-       e->ptype = 0;
-       e->format_allocated = 0;
-       e->refcount = 0;
-       e->rcu_pending = 0;
-       hlist_add_head(&e->hlist, head);
-       return e;
-}
-
-/*
- * Remove the marker from the marker hash table. Must be called with mutex_lock
- * held.
- */
-static int remove_marker(const char *name)
-{
-       struct hlist_head *head;
-       struct hlist_node *node;
-       struct marker_entry *e;
-       int found = 0;
-       size_t len = strlen(name) + 1;
-       u32 hash = jhash(name, len-1, 0);
-
-       head = &marker_table[hash & ((1 << MARKER_HASH_BITS)-1)];
-       hlist_for_each_entry(e, node, head, hlist) {
-               if (!strcmp(name, e->name)) {
-                       found = 1;
-                       break;
-               }
-       }
-       if (!found)
-               return -ENOENT;
-       if (e->single.func != __mark_empty_function)
-               return -EBUSY;
-       hlist_del(&e->hlist);
-       if (e->format_allocated)
-               kfree(e->format);
-       /* Make sure the call_rcu has been executed */
-       if (e->rcu_pending)
-               rcu_barrier_sched();
-       kfree(e);
-       return 0;
-}
-
-/*
- * Set the mark_entry format to the format found in the element.
- */
-static int marker_set_format(struct marker_entry *entry, const char *format)
-{
-       entry->format = kstrdup(format, GFP_KERNEL);
-       if (!entry->format)
-               return -ENOMEM;
-       entry->format_allocated = 1;
-
-       trace_mark(core_marker_format, "name %s format %s",
-                       entry->name, entry->format);
-       return 0;
-}
-
-/*
- * Sets the probe callback corresponding to one marker.
- */
-static int set_marker(struct marker_entry *entry, struct marker *elem,
-               int active)
-{
-       int ret = 0;
-       WARN_ON(strcmp(entry->name, elem->name) != 0);
-
-       if (entry->format) {
-               if (strcmp(entry->format, elem->format) != 0) {
-                       printk(KERN_NOTICE
-                               "Format mismatch for probe %s "
-                               "(%s), marker (%s)\n",
-                               entry->name,
-                               entry->format,
-                               elem->format);
-                       return -EPERM;
-               }
-       } else {
-               ret = marker_set_format(entry, elem->format);
-               if (ret)
-                       return ret;
-       }
-
-       /*
-        * probe_cb setup (statically known) is done here. It is
-        * asynchronous with the rest of execution, therefore we only
-        * pass from a "safe" callback (with argument) to an "unsafe"
-        * callback (does not set arguments).
-        */
-       elem->call = entry->call;
-       /*
-        * Sanity check :
-        * We only update the single probe private data when the ptr is
-        * set to a _non_ single probe! (0 -> 1 and N -> 1, N != 1)
-        */
-       WARN_ON(elem->single.func != __mark_empty_function
-               && elem->single.probe_private != entry->single.probe_private
-               && !elem->ptype);
-       elem->single.probe_private = entry->single.probe_private;
-       /*
-        * Make sure the private data is valid when we update the
-        * single probe ptr.
-        */
-       smp_wmb();
-       elem->single.func = entry->single.func;
-       /*
-        * We also make sure that the new probe callbacks array is consistent
-        * before setting a pointer to it.
-        */
-       rcu_assign_pointer(elem->multi, entry->multi);
-       /*
-        * Update the function or multi probe array pointer before setting the
-        * ptype.
-        */
-       smp_wmb();
-       elem->ptype = entry->ptype;
-
-       if (elem->tp_name && (active ^ elem->state)) {
-               WARN_ON(!elem->tp_cb);
-               /*
-                * It is ok to directly call the probe registration because type
-                * checking has been done in the __trace_mark_tp() macro.
-                */
-
-               if (active) {
-                       /*
-                        * try_module_get should always succeed because we hold
-                        * lock_module() to get the tp_cb address.
-                        */
-                       ret = try_module_get(__module_text_address(
-                               (unsigned long)elem->tp_cb));
-                       BUG_ON(!ret);
-                       ret = tracepoint_probe_register_noupdate(
-                               elem->tp_name,
-                               elem->tp_cb);
-               } else {
-                       ret = tracepoint_probe_unregister_noupdate(
-                               elem->tp_name,
-                               elem->tp_cb);
-                       /*
-                        * tracepoint_probe_update_all() must be called
-                        * before the module containing tp_cb is unloaded.
-                        */
-                       module_put(__module_text_address(
-                               (unsigned long)elem->tp_cb));
-               }
-       }
-       elem->state = active;
-
-       return ret;
-}
-
-/*
- * Disable a marker and its probe callback.
- * Note: only waiting an RCU period after setting elem->call to the empty
- * function insures that the original callback is not used anymore. This insured
- * by rcu_read_lock_sched around the call site.
- */
-static void disable_marker(struct marker *elem)
-{
-       int ret;
-
-       /* leave "call" as is. It is known statically. */
-       if (elem->tp_name && elem->state) {
-               WARN_ON(!elem->tp_cb);
-               /*
-                * It is ok to directly call the probe registration because type
-                * checking has been done in the __trace_mark_tp() macro.
-                */
-               ret = tracepoint_probe_unregister_noupdate(elem->tp_name,
-                       elem->tp_cb);
-               WARN_ON(ret);
-               /*
-                * tracepoint_probe_update_all() must be called
-                * before the module containing tp_cb is unloaded.
-                */
-               module_put(__module_text_address((unsigned long)elem->tp_cb));
-       }
-       elem->state = 0;
-       elem->single.func = __mark_empty_function;
-       /* Update the function before setting the ptype */
-       smp_wmb();
-       elem->ptype = 0;        /* single probe */
-       /*
-        * Leave the private data and id there, because removal is racy and
-        * should be done only after an RCU period. These are never used until
-        * the next initialization anyway.
-        */
-}
-
-/**
- * marker_update_probe_range - Update a probe range
- * @begin: beginning of the range
- * @end: end of the range
- *
- * Updates the probe callback corresponding to a range of markers.
- */
-void marker_update_probe_range(struct marker *begin,
-       struct marker *end)
-{
-       struct marker *iter;
-       struct marker_entry *mark_entry;
-
-       mutex_lock(&markers_mutex);
-       for (iter = begin; iter < end; iter++) {
-               mark_entry = get_marker(iter->name);
-               if (mark_entry) {
-                       set_marker(mark_entry, iter, !!mark_entry->refcount);
-                       /*
-                        * ignore error, continue
-                        */
-               } else {
-                       disable_marker(iter);
-               }
-       }
-       mutex_unlock(&markers_mutex);
-}
-
-/*
- * Update probes, removing the faulty probes.
- *
- * Internal callback only changed before the first probe is connected to it.
- * Single probe private data can only be changed on 0 -> 1 and 2 -> 1
- * transitions.  All other transitions will leave the old private data valid.
- * This makes the non-atomicity of the callback/private data updates valid.
- *
- * "special case" updates :
- * 0 -> 1 callback
- * 1 -> 0 callback
- * 1 -> 2 callbacks
- * 2 -> 1 callbacks
- * Other updates all behave the same, just like the 2 -> 3 or 3 -> 2 updates.
- * Site effect : marker_set_format may delete the marker entry (creating a
- * replacement).
- */
-static void marker_update_probes(void)
-{
-       /* Core kernel markers */
-       marker_update_probe_range(__start___markers, __stop___markers);
-       /* Markers in modules. */
-       module_update_markers();
-       tracepoint_probe_update_all();
-}
-
-/**
- * marker_probe_register -  Connect a probe to a marker
- * @name: marker name
- * @format: format string
- * @probe: probe handler
- * @probe_private: probe private data
- *
- * private data must be a valid allocated memory address, or NULL.
- * Returns 0 if ok, error value on error.
- * The probe address must at least be aligned on the architecture pointer size.
- */
-int marker_probe_register(const char *name, const char *format,
-                       marker_probe_func *probe, void *probe_private)
-{
-       struct marker_entry *entry;
-       int ret = 0;
-       struct marker_probe_closure *old;
-
-       mutex_lock(&markers_mutex);
-       entry = get_marker(name);
-       if (!entry) {
-               entry = add_marker(name, format);
-               if (IS_ERR(entry))
-                       ret = PTR_ERR(entry);
-       } else if (format) {
-               if (!entry->format)
-                       ret = marker_set_format(entry, format);
-               else if (strcmp(entry->format, format))
-                       ret = -EPERM;
-       }
-       if (ret)
-               goto end;
-
-       /*
-        * If we detect that a call_rcu is pending for this marker,
-        * make sure it's executed now.
-        */
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       old = marker_entry_add_probe(entry, probe, probe_private);
-       if (IS_ERR(old)) {
-               ret = PTR_ERR(old);
-               goto end;
-       }
-       mutex_unlock(&markers_mutex);
-       marker_update_probes();
-       mutex_lock(&markers_mutex);
-       entry = get_marker(name);
-       if (!entry)
-               goto end;
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       entry->oldptr = old;
-       entry->rcu_pending = 1;
-       /* write rcu_pending before calling the RCU callback */
-       smp_wmb();
-       call_rcu_sched(&entry->rcu, free_old_closure);
-end:
-       mutex_unlock(&markers_mutex);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(marker_probe_register);
-
-/**
- * marker_probe_unregister -  Disconnect a probe from a marker
- * @name: marker name
- * @probe: probe function pointer
- * @probe_private: probe private data
- *
- * Returns the private data given to marker_probe_register, or an ERR_PTR().
- * We do not need to call a synchronize_sched to make sure the probes have
- * finished running before doing a module unload, because the module unload
- * itself uses stop_machine(), which insures that every preempt disabled section
- * have finished.
- */
-int marker_probe_unregister(const char *name,
-       marker_probe_func *probe, void *probe_private)
-{
-       struct marker_entry *entry;
-       struct marker_probe_closure *old;
-       int ret = -ENOENT;
-
-       mutex_lock(&markers_mutex);
-       entry = get_marker(name);
-       if (!entry)
-               goto end;
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       old = marker_entry_remove_probe(entry, probe, probe_private);
-       mutex_unlock(&markers_mutex);
-       marker_update_probes();
-       mutex_lock(&markers_mutex);
-       entry = get_marker(name);
-       if (!entry)
-               goto end;
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       entry->oldptr = old;
-       entry->rcu_pending = 1;
-       /* write rcu_pending before calling the RCU callback */
-       smp_wmb();
-       call_rcu_sched(&entry->rcu, free_old_closure);
-       remove_marker(name);    /* Ignore busy error message */
-       ret = 0;
-end:
-       mutex_unlock(&markers_mutex);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(marker_probe_unregister);
-
-static struct marker_entry *
-get_marker_from_private_data(marker_probe_func *probe, void *probe_private)
-{
-       struct marker_entry *entry;
-       unsigned int i;
-       struct hlist_head *head;
-       struct hlist_node *node;
-
-       for (i = 0; i < MARKER_TABLE_SIZE; i++) {
-               head = &marker_table[i];
-               hlist_for_each_entry(entry, node, head, hlist) {
-                       if (!entry->ptype) {
-                               if (entry->single.func == probe
-                                               && entry->single.probe_private
-                                               == probe_private)
-                                       return entry;
-                       } else {
-                               struct marker_probe_closure *closure;
-                               closure = entry->multi;
-                               for (i = 0; closure[i].func; i++) {
-                                       if (closure[i].func == probe &&
-                                                       closure[i].probe_private
-                                                       == probe_private)
-                                               return entry;
-                               }
-                       }
-               }
-       }
-       return NULL;
-}
-
-/**
- * marker_probe_unregister_private_data -  Disconnect a probe from a marker
- * @probe: probe function
- * @probe_private: probe private data
- *
- * Unregister a probe by providing the registered private data.
- * Only removes the first marker found in hash table.
- * Return 0 on success or error value.
- * We do not need to call a synchronize_sched to make sure the probes have
- * finished running before doing a module unload, because the module unload
- * itself uses stop_machine(), which insures that every preempt disabled section
- * have finished.
- */
-int marker_probe_unregister_private_data(marker_probe_func *probe,
-               void *probe_private)
-{
-       struct marker_entry *entry;
-       int ret = 0;
-       struct marker_probe_closure *old;
-
-       mutex_lock(&markers_mutex);
-       entry = get_marker_from_private_data(probe, probe_private);
-       if (!entry) {
-               ret = -ENOENT;
-               goto end;
-       }
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       old = marker_entry_remove_probe(entry, NULL, probe_private);
-       mutex_unlock(&markers_mutex);
-       marker_update_probes();
-       mutex_lock(&markers_mutex);
-       entry = get_marker_from_private_data(probe, probe_private);
-       if (!entry)
-               goto end;
-       if (entry->rcu_pending)
-               rcu_barrier_sched();
-       entry->oldptr = old;
-       entry->rcu_pending = 1;
-       /* write rcu_pending before calling the RCU callback */
-       smp_wmb();
-       call_rcu_sched(&entry->rcu, free_old_closure);
-       remove_marker(entry->name);     /* Ignore busy error message */
-end:
-       mutex_unlock(&markers_mutex);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(marker_probe_unregister_private_data);
-
-/**
- * marker_get_private_data - Get a marker's probe private data
- * @name: marker name
- * @probe: probe to match
- * @num: get the nth matching probe's private data
- *
- * Returns the nth private data pointer (starting from 0) matching, or an
- * ERR_PTR.
- * Returns the private data pointer, or an ERR_PTR.
- * The private data pointer should _only_ be dereferenced if the caller is the
- * owner of the data, or its content could vanish. This is mostly used to
- * confirm that a caller is the owner of a registered probe.
- */
-void *marker_get_private_data(const char *name, marker_probe_func *probe,
-               int num)
-{
-       struct hlist_head *head;
-       struct hlist_node *node;
-       struct marker_entry *e;
-       size_t name_len = strlen(name) + 1;
-       u32 hash = jhash(name, name_len-1, 0);
-       int i;
-
-       head = &marker_table[hash & ((1 << MARKER_HASH_BITS)-1)];
-       hlist_for_each_entry(e, node, head, hlist) {
-               if (!strcmp(name, e->name)) {
-                       if (!e->ptype) {
-                               if (num == 0 && e->single.func == probe)
-                                       return e->single.probe_private;
-                       } else {
-                               struct marker_probe_closure *closure;
-                               int match = 0;
-                               closure = e->multi;
-                               for (i = 0; closure[i].func; i++) {
-                                       if (closure[i].func != probe)
-                                               continue;
-                                       if (match++ == num)
-                                               return closure[i].probe_private;
-                               }
-                       }
-                       break;
-               }
-       }
-       return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL_GPL(marker_get_private_data);
-
-#ifdef CONFIG_MODULES
-
-int marker_module_notify(struct notifier_block *self,
-                        unsigned long val, void *data)
-{
-       struct module *mod = data;
-
-       switch (val) {
-       case MODULE_STATE_COMING:
-               marker_update_probe_range(mod->markers,
-                       mod->markers + mod->num_markers);
-               break;
-       case MODULE_STATE_GOING:
-               marker_update_probe_range(mod->markers,
-                       mod->markers + mod->num_markers);
-               break;
-       }
-       return 0;
-}
-
-struct notifier_block marker_module_nb = {
-       .notifier_call = marker_module_notify,
-       .priority = 0,
-};
-
-static int init_markers(void)
-{
-       return register_module_notifier(&marker_module_nb);
-}
-__initcall(init_markers);
-
-#endif /* CONFIG_MODULES */
index 05ce49c..e6bc4b2 100644 (file)
@@ -47,6 +47,7 @@
 #include <linux/rculist.h>
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
+#include <asm/mmu_context.h>
 #include <linux/license.h>
 #include <asm/sections.h>
 #include <linux/tracepoint.h>
@@ -1535,6 +1536,10 @@ static void free_module(struct module *mod)
 
        /* Finally, free the core (containing the module structure) */
        module_free(mod, mod->module_core);
+
+#ifdef CONFIG_MPU
+       update_protections(current->mm);
+#endif
 }
 
 void *__symbol_get(const char *symbol)
@@ -2237,10 +2242,6 @@ static noinline struct module *load_module(void __user *umod,
                                  sizeof(*mod->ctors), &mod->num_ctors);
 #endif
 
-#ifdef CONFIG_MARKERS
-       mod->markers = section_objs(hdr, sechdrs, secstrings, "__markers",
-                                   sizeof(*mod->markers), &mod->num_markers);
-#endif
 #ifdef CONFIG_TRACEPOINTS
        mod->tracepoints = section_objs(hdr, sechdrs, secstrings,
                                        "__tracepoints",
@@ -2958,20 +2959,6 @@ void module_layout(struct module *mod,
 EXPORT_SYMBOL(module_layout);
 #endif
 
-#ifdef CONFIG_MARKERS
-void module_update_markers(void)
-{
-       struct module *mod;
-
-       mutex_lock(&module_mutex);
-       list_for_each_entry(mod, &modules, list)
-               if (!mod->taints)
-                       marker_update_probe_range(mod->markers,
-                               mod->markers + mod->num_markers);
-       mutex_unlock(&module_mutex);
-}
-#endif
-
 #ifdef CONFIG_TRACEPOINTS
 void module_update_tracepoints(void)
 {
index 512ab73..bcdef26 100644 (file)
@@ -177,7 +177,7 @@ static const struct tnt tnts[] = {
  *  'W' - Taint on warning.
  *  'C' - modules from drivers/staging are loaded.
  *
- *     The string is overwritten by the next call to print_taint().
+ *     The string is overwritten by the next call to print_tainted().
  */
 const char *print_tainted(void)
 {
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
deleted file mode 100644 (file)
index 8cb94a5..0000000
+++ /dev/null
@@ -1,4963 +0,0 @@
-/*
- * Performance counter core code
- *
- *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
- *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
- *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- *  Copyright  Â©  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
- *
- *  For licensing details see kernel-base/COPYING
- */
-
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/cpu.h>
-#include <linux/smp.h>
-#include <linux/file.h>
-#include <linux/poll.h>
-#include <linux/sysfs.h>
-#include <linux/dcache.h>
-#include <linux/percpu.h>
-#include <linux/ptrace.h>
-#include <linux/vmstat.h>
-#include <linux/hardirq.h>
-#include <linux/rculist.h>
-#include <linux/uaccess.h>
-#include <linux/syscalls.h>
-#include <linux/anon_inodes.h>
-#include <linux/kernel_stat.h>
-#include <linux/perf_counter.h>
-
-#include <asm/irq_regs.h>
-
-/*
- * Each CPU has a list of per CPU counters:
- */
-DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context);
-
-int perf_max_counters __read_mostly = 1;
-static int perf_reserved_percpu __read_mostly;
-static int perf_overcommit __read_mostly = 1;
-
-static atomic_t nr_counters __read_mostly;
-static atomic_t nr_mmap_counters __read_mostly;
-static atomic_t nr_comm_counters __read_mostly;
-static atomic_t nr_task_counters __read_mostly;
-
-/*
- * perf counter paranoia level:
- *  -1 - not paranoid at all
- *   0 - disallow raw tracepoint access for unpriv
- *   1 - disallow cpu counters for unpriv
- *   2 - disallow kernel profiling for unpriv
- */
-int sysctl_perf_counter_paranoid __read_mostly = 1;
-
-static inline bool perf_paranoid_tracepoint_raw(void)
-{
-       return sysctl_perf_counter_paranoid > -1;
-}
-
-static inline bool perf_paranoid_cpu(void)
-{
-       return sysctl_perf_counter_paranoid > 0;
-}
-
-static inline bool perf_paranoid_kernel(void)
-{
-       return sysctl_perf_counter_paranoid > 1;
-}
-
-int sysctl_perf_counter_mlock __read_mostly = 512; /* 'free' kb per user */
-
-/*
- * max perf counter sample rate
- */
-int sysctl_perf_counter_sample_rate __read_mostly = 100000;
-
-static atomic64_t perf_counter_id;
-
-/*
- * Lock for (sysadmin-configurable) counter reservations:
- */
-static DEFINE_SPINLOCK(perf_resource_lock);
-
-/*
- * Architecture provided APIs - weak aliases:
- */
-extern __weak const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
-{
-       return NULL;
-}
-
-void __weak hw_perf_disable(void)              { barrier(); }
-void __weak hw_perf_enable(void)               { barrier(); }
-
-void __weak hw_perf_counter_setup(int cpu)     { barrier(); }
-void __weak hw_perf_counter_setup_online(int cpu)      { barrier(); }
-
-int __weak
-hw_perf_group_sched_in(struct perf_counter *group_leader,
-              struct perf_cpu_context *cpuctx,
-              struct perf_counter_context *ctx, int cpu)
-{
-       return 0;
-}
-
-void __weak perf_counter_print_debug(void)     { }
-
-static DEFINE_PER_CPU(int, perf_disable_count);
-
-void __perf_disable(void)
-{
-       __get_cpu_var(perf_disable_count)++;
-}
-
-bool __perf_enable(void)
-{
-       return !--__get_cpu_var(perf_disable_count);
-}
-
-void perf_disable(void)
-{
-       __perf_disable();
-       hw_perf_disable();
-}
-
-void perf_enable(void)
-{
-       if (__perf_enable())
-               hw_perf_enable();
-}
-
-static void get_ctx(struct perf_counter_context *ctx)
-{
-       WARN_ON(!atomic_inc_not_zero(&ctx->refcount));
-}
-
-static void free_ctx(struct rcu_head *head)
-{
-       struct perf_counter_context *ctx;
-
-       ctx = container_of(head, struct perf_counter_context, rcu_head);
-       kfree(ctx);
-}
-
-static void put_ctx(struct perf_counter_context *ctx)
-{
-       if (atomic_dec_and_test(&ctx->refcount)) {
-               if (ctx->parent_ctx)
-                       put_ctx(ctx->parent_ctx);
-               if (ctx->task)
-                       put_task_struct(ctx->task);
-               call_rcu(&ctx->rcu_head, free_ctx);
-       }
-}
-
-static void unclone_ctx(struct perf_counter_context *ctx)
-{
-       if (ctx->parent_ctx) {
-               put_ctx(ctx->parent_ctx);
-               ctx->parent_ctx = NULL;
-       }
-}
-
-/*
- * If we inherit counters we want to return the parent counter id
- * to userspace.
- */
-static u64 primary_counter_id(struct perf_counter *counter)
-{
-       u64 id = counter->id;
-
-       if (counter->parent)
-               id = counter->parent->id;
-
-       return id;
-}
-
-/*
- * Get the perf_counter_context for a task and lock it.
- * This has to cope with with the fact that until it is locked,
- * the context could get moved to another task.
- */
-static struct perf_counter_context *
-perf_lock_task_context(struct task_struct *task, unsigned long *flags)
-{
-       struct perf_counter_context *ctx;
-
-       rcu_read_lock();
- retry:
-       ctx = rcu_dereference(task->perf_counter_ctxp);
-       if (ctx) {
-               /*
-                * If this context is a clone of another, it might
-                * get swapped for another underneath us by
-                * perf_counter_task_sched_out, though the
-                * rcu_read_lock() protects us from any context
-                * getting freed.  Lock the context and check if it
-                * got swapped before we could get the lock, and retry
-                * if so.  If we locked the right context, then it
-                * can't get swapped on us any more.
-                */
-               spin_lock_irqsave(&ctx->lock, *flags);
-               if (ctx != rcu_dereference(task->perf_counter_ctxp)) {
-                       spin_unlock_irqrestore(&ctx->lock, *flags);
-                       goto retry;
-               }
-
-               if (!atomic_inc_not_zero(&ctx->refcount)) {
-                       spin_unlock_irqrestore(&ctx->lock, *flags);
-                       ctx = NULL;
-               }
-       }
-       rcu_read_unlock();
-       return ctx;
-}
-
-/*
- * Get the context for a task and increment its pin_count so it
- * can't get swapped to another task.  This also increments its
- * reference count so that the context can't get freed.
- */
-static struct perf_counter_context *perf_pin_task_context(struct task_struct *task)
-{
-       struct perf_counter_context *ctx;
-       unsigned long flags;
-
-       ctx = perf_lock_task_context(task, &flags);
-       if (ctx) {
-               ++ctx->pin_count;
-               spin_unlock_irqrestore(&ctx->lock, flags);
-       }
-       return ctx;
-}
-
-static void perf_unpin_context(struct perf_counter_context *ctx)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&ctx->lock, flags);
-       --ctx->pin_count;
-       spin_unlock_irqrestore(&ctx->lock, flags);
-       put_ctx(ctx);
-}
-
-/*
- * Add a counter from the lists for its context.
- * Must be called with ctx->mutex and ctx->lock held.
- */
-static void
-list_add_counter(struct perf_counter *counter, struct perf_counter_context *ctx)
-{
-       struct perf_counter *group_leader = counter->group_leader;
-
-       /*
-        * Depending on whether it is a standalone or sibling counter,
-        * add it straight to the context's counter list, or to the group
-        * leader's sibling list:
-        */
-       if (group_leader == counter)
-               list_add_tail(&counter->list_entry, &ctx->counter_list);
-       else {
-               list_add_tail(&counter->list_entry, &group_leader->sibling_list);
-               group_leader->nr_siblings++;
-       }
-
-       list_add_rcu(&counter->event_entry, &ctx->event_list);
-       ctx->nr_counters++;
-       if (counter->attr.inherit_stat)
-               ctx->nr_stat++;
-}
-
-/*
- * Remove a counter from the lists for its context.
- * Must be called with ctx->mutex and ctx->lock held.
- */
-static void
-list_del_counter(struct perf_counter *counter, struct perf_counter_context *ctx)
-{
-       struct perf_counter *sibling, *tmp;
-
-       if (list_empty(&counter->list_entry))
-               return;
-       ctx->nr_counters--;
-       if (counter->attr.inherit_stat)
-               ctx->nr_stat--;
-
-       list_del_init(&counter->list_entry);
-       list_del_rcu(&counter->event_entry);
-
-       if (counter->group_leader != counter)
-               counter->group_leader->nr_siblings--;
-
-       /*
-        * If this was a group counter with sibling counters then
-        * upgrade the siblings to singleton counters by adding them
-        * to the context list directly:
-        */
-       list_for_each_entry_safe(sibling, tmp,
-                                &counter->sibling_list, list_entry) {
-
-               list_move_tail(&sibling->list_entry, &ctx->counter_list);
-               sibling->group_leader = sibling;
-       }
-}
-
-static void
-counter_sched_out(struct perf_counter *counter,
-                 struct perf_cpu_context *cpuctx,
-                 struct perf_counter_context *ctx)
-{
-       if (counter->state != PERF_COUNTER_STATE_ACTIVE)
-               return;
-
-       counter->state = PERF_COUNTER_STATE_INACTIVE;
-       if (counter->pending_disable) {
-               counter->pending_disable = 0;
-               counter->state = PERF_COUNTER_STATE_OFF;
-       }
-       counter->tstamp_stopped = ctx->time;
-       counter->pmu->disable(counter);
-       counter->oncpu = -1;
-
-       if (!is_software_counter(counter))
-               cpuctx->active_oncpu--;
-       ctx->nr_active--;
-       if (counter->attr.exclusive || !cpuctx->active_oncpu)
-               cpuctx->exclusive = 0;
-}
-
-static void
-group_sched_out(struct perf_counter *group_counter,
-               struct perf_cpu_context *cpuctx,
-               struct perf_counter_context *ctx)
-{
-       struct perf_counter *counter;
-
-       if (group_counter->state != PERF_COUNTER_STATE_ACTIVE)
-               return;
-
-       counter_sched_out(group_counter, cpuctx, ctx);
-
-       /*
-        * Schedule out siblings (if any):
-        */
-       list_for_each_entry(counter, &group_counter->sibling_list, list_entry)
-               counter_sched_out(counter, cpuctx, ctx);
-
-       if (group_counter->attr.exclusive)
-               cpuctx->exclusive = 0;
-}
-
-/*
- * Cross CPU call to remove a performance counter
- *
- * We disable the counter on the hardware level first. After that we
- * remove it from the context list.
- */
-static void __perf_counter_remove_from_context(void *info)
-{
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter *counter = info;
-       struct perf_counter_context *ctx = counter->ctx;
-
-       /*
-        * If this is a task context, we need to check whether it is
-        * the current task context of this cpu. If not it has been
-        * scheduled out before the smp call arrived.
-        */
-       if (ctx->task && cpuctx->task_ctx != ctx)
-               return;
-
-       spin_lock(&ctx->lock);
-       /*
-        * Protect the list operation against NMI by disabling the
-        * counters on a global level.
-        */
-       perf_disable();
-
-       counter_sched_out(counter, cpuctx, ctx);
-
-       list_del_counter(counter, ctx);
-
-       if (!ctx->task) {
-               /*
-                * Allow more per task counters with respect to the
-                * reservation:
-                */
-               cpuctx->max_pertask =
-                       min(perf_max_counters - ctx->nr_counters,
-                           perf_max_counters - perf_reserved_percpu);
-       }
-
-       perf_enable();
-       spin_unlock(&ctx->lock);
-}
-
-
-/*
- * Remove the counter from a task's (or a CPU's) list of counters.
- *
- * Must be called with ctx->mutex held.
- *
- * CPU counters are removed with a smp call. For task counters we only
- * call when the task is on a CPU.
- *
- * If counter->ctx is a cloned context, callers must make sure that
- * every task struct that counter->ctx->task could possibly point to
- * remains valid.  This is OK when called from perf_release since
- * that only calls us on the top-level context, which can't be a clone.
- * When called from perf_counter_exit_task, it's OK because the
- * context has been detached from its task.
- */
-static void perf_counter_remove_from_context(struct perf_counter *counter)
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       struct task_struct *task = ctx->task;
-
-       if (!task) {
-               /*
-                * Per cpu counters are removed via an smp call and
-                * the removal is always sucessful.
-                */
-               smp_call_function_single(counter->cpu,
-                                        __perf_counter_remove_from_context,
-                                        counter, 1);
-               return;
-       }
-
-retry:
-       task_oncpu_function_call(task, __perf_counter_remove_from_context,
-                                counter);
-
-       spin_lock_irq(&ctx->lock);
-       /*
-        * If the context is active we need to retry the smp call.
-        */
-       if (ctx->nr_active && !list_empty(&counter->list_entry)) {
-               spin_unlock_irq(&ctx->lock);
-               goto retry;
-       }
-
-       /*
-        * The lock prevents that this context is scheduled in so we
-        * can remove the counter safely, if the call above did not
-        * succeed.
-        */
-       if (!list_empty(&counter->list_entry)) {
-               list_del_counter(counter, ctx);
-       }
-       spin_unlock_irq(&ctx->lock);
-}
-
-static inline u64 perf_clock(void)
-{
-       return cpu_clock(smp_processor_id());
-}
-
-/*
- * Update the record of the current time in a context.
- */
-static void update_context_time(struct perf_counter_context *ctx)
-{
-       u64 now = perf_clock();
-
-       ctx->time += now - ctx->timestamp;
-       ctx->timestamp = now;
-}
-
-/*
- * Update the total_time_enabled and total_time_running fields for a counter.
- */
-static void update_counter_times(struct perf_counter *counter)
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       u64 run_end;
-
-       if (counter->state < PERF_COUNTER_STATE_INACTIVE ||
-           counter->group_leader->state < PERF_COUNTER_STATE_INACTIVE)
-               return;
-
-       counter->total_time_enabled = ctx->time - counter->tstamp_enabled;
-
-       if (counter->state == PERF_COUNTER_STATE_INACTIVE)
-               run_end = counter->tstamp_stopped;
-       else
-               run_end = ctx->time;
-
-       counter->total_time_running = run_end - counter->tstamp_running;
-}
-
-/*
- * Update total_time_enabled and total_time_running for all counters in a group.
- */
-static void update_group_times(struct perf_counter *leader)
-{
-       struct perf_counter *counter;
-
-       update_counter_times(leader);
-       list_for_each_entry(counter, &leader->sibling_list, list_entry)
-               update_counter_times(counter);
-}
-
-/*
- * Cross CPU call to disable a performance counter
- */
-static void __perf_counter_disable(void *info)
-{
-       struct perf_counter *counter = info;
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter_context *ctx = counter->ctx;
-
-       /*
-        * If this is a per-task counter, need to check whether this
-        * counter's task is the current task on this cpu.
-        */
-       if (ctx->task && cpuctx->task_ctx != ctx)
-               return;
-
-       spin_lock(&ctx->lock);
-
-       /*
-        * If the counter is on, turn it off.
-        * If it is in error state, leave it in error state.
-        */
-       if (counter->state >= PERF_COUNTER_STATE_INACTIVE) {
-               update_context_time(ctx);
-               update_group_times(counter);
-               if (counter == counter->group_leader)
-                       group_sched_out(counter, cpuctx, ctx);
-               else
-                       counter_sched_out(counter, cpuctx, ctx);
-               counter->state = PERF_COUNTER_STATE_OFF;
-       }
-
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Disable a counter.
- *
- * If counter->ctx is a cloned context, callers must make sure that
- * every task struct that counter->ctx->task could possibly point to
- * remains valid.  This condition is satisifed when called through
- * perf_counter_for_each_child or perf_counter_for_each because they
- * hold the top-level counter's child_mutex, so any descendant that
- * goes to exit will block in sync_child_counter.
- * When called from perf_pending_counter it's OK because counter->ctx
- * is the current context on this CPU and preemption is disabled,
- * hence we can't get into perf_counter_task_sched_out for this context.
- */
-static void perf_counter_disable(struct perf_counter *counter)
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       struct task_struct *task = ctx->task;
-
-       if (!task) {
-               /*
-                * Disable the counter on the cpu that it's on
-                */
-               smp_call_function_single(counter->cpu, __perf_counter_disable,
-                                        counter, 1);
-               return;
-       }
-
- retry:
-       task_oncpu_function_call(task, __perf_counter_disable, counter);
-
-       spin_lock_irq(&ctx->lock);
-       /*
-        * If the counter is still active, we need to retry the cross-call.
-        */
-       if (counter->state == PERF_COUNTER_STATE_ACTIVE) {
-               spin_unlock_irq(&ctx->lock);
-               goto retry;
-       }
-
-       /*
-        * Since we have the lock this context can't be scheduled
-        * in, so we can change the state safely.
-        */
-       if (counter->state == PERF_COUNTER_STATE_INACTIVE) {
-               update_group_times(counter);
-               counter->state = PERF_COUNTER_STATE_OFF;
-       }
-
-       spin_unlock_irq(&ctx->lock);
-}
-
-static int
-counter_sched_in(struct perf_counter *counter,
-                struct perf_cpu_context *cpuctx,
-                struct perf_counter_context *ctx,
-                int cpu)
-{
-       if (counter->state <= PERF_COUNTER_STATE_OFF)
-               return 0;
-
-       counter->state = PERF_COUNTER_STATE_ACTIVE;
-       counter->oncpu = cpu;   /* TODO: put 'cpu' into cpuctx->cpu */
-       /*
-        * The new state must be visible before we turn it on in the hardware:
-        */
-       smp_wmb();
-
-       if (counter->pmu->enable(counter)) {
-               counter->state = PERF_COUNTER_STATE_INACTIVE;
-               counter->oncpu = -1;
-               return -EAGAIN;
-       }
-
-       counter->tstamp_running += ctx->time - counter->tstamp_stopped;
-
-       if (!is_software_counter(counter))
-               cpuctx->active_oncpu++;
-       ctx->nr_active++;
-
-       if (counter->attr.exclusive)
-               cpuctx->exclusive = 1;
-
-       return 0;
-}
-
-static int
-group_sched_in(struct perf_counter *group_counter,
-              struct perf_cpu_context *cpuctx,
-              struct perf_counter_context *ctx,
-              int cpu)
-{
-       struct perf_counter *counter, *partial_group;
-       int ret;
-
-       if (group_counter->state == PERF_COUNTER_STATE_OFF)
-               return 0;
-
-       ret = hw_perf_group_sched_in(group_counter, cpuctx, ctx, cpu);
-       if (ret)
-               return ret < 0 ? ret : 0;
-
-       if (counter_sched_in(group_counter, cpuctx, ctx, cpu))
-               return -EAGAIN;
-
-       /*
-        * Schedule in siblings as one group (if any):
-        */
-       list_for_each_entry(counter, &group_counter->sibling_list, list_entry) {
-               if (counter_sched_in(counter, cpuctx, ctx, cpu)) {
-                       partial_group = counter;
-                       goto group_error;
-               }
-       }
-
-       return 0;
-
-group_error:
-       /*
-        * Groups can be scheduled in as one unit only, so undo any
-        * partial group before returning:
-        */
-       list_for_each_entry(counter, &group_counter->sibling_list, list_entry) {
-               if (counter == partial_group)
-                       break;
-               counter_sched_out(counter, cpuctx, ctx);
-       }
-       counter_sched_out(group_counter, cpuctx, ctx);
-
-       return -EAGAIN;
-}
-
-/*
- * Return 1 for a group consisting entirely of software counters,
- * 0 if the group contains any hardware counters.
- */
-static int is_software_only_group(struct perf_counter *leader)
-{
-       struct perf_counter *counter;
-
-       if (!is_software_counter(leader))
-               return 0;
-
-       list_for_each_entry(counter, &leader->sibling_list, list_entry)
-               if (!is_software_counter(counter))
-                       return 0;
-
-       return 1;
-}
-
-/*
- * Work out whether we can put this counter group on the CPU now.
- */
-static int group_can_go_on(struct perf_counter *counter,
-                          struct perf_cpu_context *cpuctx,
-                          int can_add_hw)
-{
-       /*
-        * Groups consisting entirely of software counters can always go on.
-        */
-       if (is_software_only_group(counter))
-               return 1;
-       /*
-        * If an exclusive group is already on, no other hardware
-        * counters can go on.
-        */
-       if (cpuctx->exclusive)
-               return 0;
-       /*
-        * If this group is exclusive and there are already
-        * counters on the CPU, it can't go on.
-        */
-       if (counter->attr.exclusive && cpuctx->active_oncpu)
-               return 0;
-       /*
-        * Otherwise, try to add it if all previous groups were able
-        * to go on.
-        */
-       return can_add_hw;
-}
-
-static void add_counter_to_ctx(struct perf_counter *counter,
-                              struct perf_counter_context *ctx)
-{
-       list_add_counter(counter, ctx);
-       counter->tstamp_enabled = ctx->time;
-       counter->tstamp_running = ctx->time;
-       counter->tstamp_stopped = ctx->time;
-}
-
-/*
- * Cross CPU call to install and enable a performance counter
- *
- * Must be called with ctx->mutex held
- */
-static void __perf_install_in_context(void *info)
-{
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter *counter = info;
-       struct perf_counter_context *ctx = counter->ctx;
-       struct perf_counter *leader = counter->group_leader;
-       int cpu = smp_processor_id();
-       int err;
-
-       /*
-        * If this is a task context, we need to check whether it is
-        * the current task context of this cpu. If not it has been
-        * scheduled out before the smp call arrived.
-        * Or possibly this is the right context but it isn't
-        * on this cpu because it had no counters.
-        */
-       if (ctx->task && cpuctx->task_ctx != ctx) {
-               if (cpuctx->task_ctx || ctx->task != current)
-                       return;
-               cpuctx->task_ctx = ctx;
-       }
-
-       spin_lock(&ctx->lock);
-       ctx->is_active = 1;
-       update_context_time(ctx);
-
-       /*
-        * Protect the list operation against NMI by disabling the
-        * counters on a global level. NOP for non NMI based counters.
-        */
-       perf_disable();
-
-       add_counter_to_ctx(counter, ctx);
-
-       /*
-        * Don't put the counter on if it is disabled or if
-        * it is in a group and the group isn't on.
-        */
-       if (counter->state != PERF_COUNTER_STATE_INACTIVE ||
-           (leader != counter && leader->state != PERF_COUNTER_STATE_ACTIVE))
-               goto unlock;
-
-       /*
-        * An exclusive counter can't go on if there are already active
-        * hardware counters, and no hardware counter can go on if there
-        * is already an exclusive counter on.
-        */
-       if (!group_can_go_on(counter, cpuctx, 1))
-               err = -EEXIST;
-       else
-               err = counter_sched_in(counter, cpuctx, ctx, cpu);
-
-       if (err) {
-               /*
-                * This counter couldn't go on.  If it is in a group
-                * then we have to pull the whole group off.
-                * If the counter group is pinned then put it in error state.
-                */
-               if (leader != counter)
-                       group_sched_out(leader, cpuctx, ctx);
-               if (leader->attr.pinned) {
-                       update_group_times(leader);
-                       leader->state = PERF_COUNTER_STATE_ERROR;
-               }
-       }
-
-       if (!err && !ctx->task && cpuctx->max_pertask)
-               cpuctx->max_pertask--;
-
- unlock:
-       perf_enable();
-
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Attach a performance counter to a context
- *
- * First we add the counter to the list with the hardware enable bit
- * in counter->hw_config cleared.
- *
- * If the counter is attached to a task which is on a CPU we use a smp
- * call to enable it in the task context. The task might have been
- * scheduled away, but we check this in the smp call again.
- *
- * Must be called with ctx->mutex held.
- */
-static void
-perf_install_in_context(struct perf_counter_context *ctx,
-                       struct perf_counter *counter,
-                       int cpu)
-{
-       struct task_struct *task = ctx->task;
-
-       if (!task) {
-               /*
-                * Per cpu counters are installed via an smp call and
-                * the install is always sucessful.
-                */
-               smp_call_function_single(cpu, __perf_install_in_context,
-                                        counter, 1);
-               return;
-       }
-
-retry:
-       task_oncpu_function_call(task, __perf_install_in_context,
-                                counter);
-
-       spin_lock_irq(&ctx->lock);
-       /*
-        * we need to retry the smp call.
-        */
-       if (ctx->is_active && list_empty(&counter->list_entry)) {
-               spin_unlock_irq(&ctx->lock);
-               goto retry;
-       }
-
-       /*
-        * The lock prevents that this context is scheduled in so we
-        * can add the counter safely, if it the call above did not
-        * succeed.
-        */
-       if (list_empty(&counter->list_entry))
-               add_counter_to_ctx(counter, ctx);
-       spin_unlock_irq(&ctx->lock);
-}
-
-/*
- * Put a counter into inactive state and update time fields.
- * Enabling the leader of a group effectively enables all
- * the group members that aren't explicitly disabled, so we
- * have to update their ->tstamp_enabled also.
- * Note: this works for group members as well as group leaders
- * since the non-leader members' sibling_lists will be empty.
- */
-static void __perf_counter_mark_enabled(struct perf_counter *counter,
-                                       struct perf_counter_context *ctx)
-{
-       struct perf_counter *sub;
-
-       counter->state = PERF_COUNTER_STATE_INACTIVE;
-       counter->tstamp_enabled = ctx->time - counter->total_time_enabled;
-       list_for_each_entry(sub, &counter->sibling_list, list_entry)
-               if (sub->state >= PERF_COUNTER_STATE_INACTIVE)
-                       sub->tstamp_enabled =
-                               ctx->time - sub->total_time_enabled;
-}
-
-/*
- * Cross CPU call to enable a performance counter
- */
-static void __perf_counter_enable(void *info)
-{
-       struct perf_counter *counter = info;
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter_context *ctx = counter->ctx;
-       struct perf_counter *leader = counter->group_leader;
-       int err;
-
-       /*
-        * If this is a per-task counter, need to check whether this
-        * counter's task is the current task on this cpu.
-        */
-       if (ctx->task && cpuctx->task_ctx != ctx) {
-               if (cpuctx->task_ctx || ctx->task != current)
-                       return;
-               cpuctx->task_ctx = ctx;
-       }
-
-       spin_lock(&ctx->lock);
-       ctx->is_active = 1;
-       update_context_time(ctx);
-
-       if (counter->state >= PERF_COUNTER_STATE_INACTIVE)
-               goto unlock;
-       __perf_counter_mark_enabled(counter, ctx);
-
-       /*
-        * If the counter is in a group and isn't the group leader,
-        * then don't put it on unless the group is on.
-        */
-       if (leader != counter && leader->state != PERF_COUNTER_STATE_ACTIVE)
-               goto unlock;
-
-       if (!group_can_go_on(counter, cpuctx, 1)) {
-               err = -EEXIST;
-       } else {
-               perf_disable();
-               if (counter == leader)
-                       err = group_sched_in(counter, cpuctx, ctx,
-                                            smp_processor_id());
-               else
-                       err = counter_sched_in(counter, cpuctx, ctx,
-                                              smp_processor_id());
-               perf_enable();
-       }
-
-       if (err) {
-               /*
-                * If this counter can't go on and it's part of a
-                * group, then the whole group has to come off.
-                */
-               if (leader != counter)
-                       group_sched_out(leader, cpuctx, ctx);
-               if (leader->attr.pinned) {
-                       update_group_times(leader);
-                       leader->state = PERF_COUNTER_STATE_ERROR;
-               }
-       }
-
- unlock:
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Enable a counter.
- *
- * If counter->ctx is a cloned context, callers must make sure that
- * every task struct that counter->ctx->task could possibly point to
- * remains valid.  This condition is satisfied when called through
- * perf_counter_for_each_child or perf_counter_for_each as described
- * for perf_counter_disable.
- */
-static void perf_counter_enable(struct perf_counter *counter)
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       struct task_struct *task = ctx->task;
-
-       if (!task) {
-               /*
-                * Enable the counter on the cpu that it's on
-                */
-               smp_call_function_single(counter->cpu, __perf_counter_enable,
-                                        counter, 1);
-               return;
-       }
-
-       spin_lock_irq(&ctx->lock);
-       if (counter->state >= PERF_COUNTER_STATE_INACTIVE)
-               goto out;
-
-       /*
-        * If the counter is in error state, clear that first.
-        * That way, if we see the counter in error state below, we
-        * know that it has gone back into error state, as distinct
-        * from the task having been scheduled away before the
-        * cross-call arrived.
-        */
-       if (counter->state == PERF_COUNTER_STATE_ERROR)
-               counter->state = PERF_COUNTER_STATE_OFF;
-
- retry:
-       spin_unlock_irq(&ctx->lock);
-       task_oncpu_function_call(task, __perf_counter_enable, counter);
-
-       spin_lock_irq(&ctx->lock);
-
-       /*
-        * If the context is active and the counter is still off,
-        * we need to retry the cross-call.
-        */
-       if (ctx->is_active && counter->state == PERF_COUNTER_STATE_OFF)
-               goto retry;
-
-       /*
-        * Since we have the lock this context can't be scheduled
-        * in, so we can change the state safely.
-        */
-       if (counter->state == PERF_COUNTER_STATE_OFF)
-               __perf_counter_mark_enabled(counter, ctx);
-
- out:
-       spin_unlock_irq(&ctx->lock);
-}
-
-static int perf_counter_refresh(struct perf_counter *counter, int refresh)
-{
-       /*
-        * not supported on inherited counters
-        */
-       if (counter->attr.inherit)
-               return -EINVAL;
-
-       atomic_add(refresh, &counter->event_limit);
-       perf_counter_enable(counter);
-
-       return 0;
-}
-
-void __perf_counter_sched_out(struct perf_counter_context *ctx,
-                             struct perf_cpu_context *cpuctx)
-{
-       struct perf_counter *counter;
-
-       spin_lock(&ctx->lock);
-       ctx->is_active = 0;
-       if (likely(!ctx->nr_counters))
-               goto out;
-       update_context_time(ctx);
-
-       perf_disable();
-       if (ctx->nr_active) {
-               list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-                       if (counter != counter->group_leader)
-                               counter_sched_out(counter, cpuctx, ctx);
-                       else
-                               group_sched_out(counter, cpuctx, ctx);
-               }
-       }
-       perf_enable();
- out:
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Test whether two contexts are equivalent, i.e. whether they
- * have both been cloned from the same version of the same context
- * and they both have the same number of enabled counters.
- * If the number of enabled counters is the same, then the set
- * of enabled counters should be the same, because these are both
- * inherited contexts, therefore we can't access individual counters
- * in them directly with an fd; we can only enable/disable all
- * counters via prctl, or enable/disable all counters in a family
- * via ioctl, which will have the same effect on both contexts.
- */
-static int context_equiv(struct perf_counter_context *ctx1,
-                        struct perf_counter_context *ctx2)
-{
-       return ctx1->parent_ctx && ctx1->parent_ctx == ctx2->parent_ctx
-               && ctx1->parent_gen == ctx2->parent_gen
-               && !ctx1->pin_count && !ctx2->pin_count;
-}
-
-static void __perf_counter_read(void *counter);
-
-static void __perf_counter_sync_stat(struct perf_counter *counter,
-                                    struct perf_counter *next_counter)
-{
-       u64 value;
-
-       if (!counter->attr.inherit_stat)
-               return;
-
-       /*
-        * Update the counter value, we cannot use perf_counter_read()
-        * because we're in the middle of a context switch and have IRQs
-        * disabled, which upsets smp_call_function_single(), however
-        * we know the counter must be on the current CPU, therefore we
-        * don't need to use it.
-        */
-       switch (counter->state) {
-       case PERF_COUNTER_STATE_ACTIVE:
-               __perf_counter_read(counter);
-               break;
-
-       case PERF_COUNTER_STATE_INACTIVE:
-               update_counter_times(counter);
-               break;
-
-       default:
-               break;
-       }
-
-       /*
-        * In order to keep per-task stats reliable we need to flip the counter
-        * values when we flip the contexts.
-        */
-       value = atomic64_read(&next_counter->count);
-       value = atomic64_xchg(&counter->count, value);
-       atomic64_set(&next_counter->count, value);
-
-       swap(counter->total_time_enabled, next_counter->total_time_enabled);
-       swap(counter->total_time_running, next_counter->total_time_running);
-
-       /*
-        * Since we swizzled the values, update the user visible data too.
-        */
-       perf_counter_update_userpage(counter);
-       perf_counter_update_userpage(next_counter);
-}
-
-#define list_next_entry(pos, member) \
-       list_entry(pos->member.next, typeof(*pos), member)
-
-static void perf_counter_sync_stat(struct perf_counter_context *ctx,
-                                  struct perf_counter_context *next_ctx)
-{
-       struct perf_counter *counter, *next_counter;
-
-       if (!ctx->nr_stat)
-               return;
-
-       counter = list_first_entry(&ctx->event_list,
-                                  struct perf_counter, event_entry);
-
-       next_counter = list_first_entry(&next_ctx->event_list,
-                                       struct perf_counter, event_entry);
-
-       while (&counter->event_entry != &ctx->event_list &&
-              &next_counter->event_entry != &next_ctx->event_list) {
-
-               __perf_counter_sync_stat(counter, next_counter);
-
-               counter = list_next_entry(counter, event_entry);
-               next_counter = list_next_entry(next_counter, event_entry);
-       }
-}
-
-/*
- * Called from scheduler to remove the counters of the current task,
- * with interrupts disabled.
- *
- * We stop each counter and update the counter value in counter->count.
- *
- * This does not protect us against NMI, but disable()
- * sets the disabled bit in the control field of counter _before_
- * accessing the counter control register. If a NMI hits, then it will
- * not restart the counter.
- */
-void perf_counter_task_sched_out(struct task_struct *task,
-                                struct task_struct *next, int cpu)
-{
-       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
-       struct perf_counter_context *ctx = task->perf_counter_ctxp;
-       struct perf_counter_context *next_ctx;
-       struct perf_counter_context *parent;
-       struct pt_regs *regs;
-       int do_switch = 1;
-
-       regs = task_pt_regs(task);
-       perf_swcounter_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, regs, 0);
-
-       if (likely(!ctx || !cpuctx->task_ctx))
-               return;
-
-       update_context_time(ctx);
-
-       rcu_read_lock();
-       parent = rcu_dereference(ctx->parent_ctx);
-       next_ctx = next->perf_counter_ctxp;
-       if (parent && next_ctx &&
-           rcu_dereference(next_ctx->parent_ctx) == parent) {
-               /*
-                * Looks like the two contexts are clones, so we might be
-                * able to optimize the context switch.  We lock both
-                * contexts and check that they are clones under the
-                * lock (including re-checking that neither has been
-                * uncloned in the meantime).  It doesn't matter which
-                * order we take the locks because no other cpu could
-                * be trying to lock both of these tasks.
-                */
-               spin_lock(&ctx->lock);
-               spin_lock_nested(&next_ctx->lock, SINGLE_DEPTH_NESTING);
-               if (context_equiv(ctx, next_ctx)) {
-                       /*
-                        * XXX do we need a memory barrier of sorts
-                        * wrt to rcu_dereference() of perf_counter_ctxp
-                        */
-                       task->perf_counter_ctxp = next_ctx;
-                       next->perf_counter_ctxp = ctx;
-                       ctx->task = next;
-                       next_ctx->task = task;
-                       do_switch = 0;
-
-                       perf_counter_sync_stat(ctx, next_ctx);
-               }
-               spin_unlock(&next_ctx->lock);
-               spin_unlock(&ctx->lock);
-       }
-       rcu_read_unlock();
-
-       if (do_switch) {
-               __perf_counter_sched_out(ctx, cpuctx);
-               cpuctx->task_ctx = NULL;
-       }
-}
-
-/*
- * Called with IRQs disabled
- */
-static void __perf_counter_task_sched_out(struct perf_counter_context *ctx)
-{
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-
-       if (!cpuctx->task_ctx)
-               return;
-
-       if (WARN_ON_ONCE(ctx != cpuctx->task_ctx))
-               return;
-
-       __perf_counter_sched_out(ctx, cpuctx);
-       cpuctx->task_ctx = NULL;
-}
-
-/*
- * Called with IRQs disabled
- */
-static void perf_counter_cpu_sched_out(struct perf_cpu_context *cpuctx)
-{
-       __perf_counter_sched_out(&cpuctx->ctx, cpuctx);
-}
-
-static void
-__perf_counter_sched_in(struct perf_counter_context *ctx,
-                       struct perf_cpu_context *cpuctx, int cpu)
-{
-       struct perf_counter *counter;
-       int can_add_hw = 1;
-
-       spin_lock(&ctx->lock);
-       ctx->is_active = 1;
-       if (likely(!ctx->nr_counters))
-               goto out;
-
-       ctx->timestamp = perf_clock();
-
-       perf_disable();
-
-       /*
-        * First go through the list and put on any pinned groups
-        * in order to give them the best chance of going on.
-        */
-       list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-               if (counter->state <= PERF_COUNTER_STATE_OFF ||
-                   !counter->attr.pinned)
-                       continue;
-               if (counter->cpu != -1 && counter->cpu != cpu)
-                       continue;
-
-               if (counter != counter->group_leader)
-                       counter_sched_in(counter, cpuctx, ctx, cpu);
-               else {
-                       if (group_can_go_on(counter, cpuctx, 1))
-                               group_sched_in(counter, cpuctx, ctx, cpu);
-               }
-
-               /*
-                * If this pinned group hasn't been scheduled,
-                * put it in error state.
-                */
-               if (counter->state == PERF_COUNTER_STATE_INACTIVE) {
-                       update_group_times(counter);
-                       counter->state = PERF_COUNTER_STATE_ERROR;
-               }
-       }
-
-       list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-               /*
-                * Ignore counters in OFF or ERROR state, and
-                * ignore pinned counters since we did them already.
-                */
-               if (counter->state <= PERF_COUNTER_STATE_OFF ||
-                   counter->attr.pinned)
-                       continue;
-
-               /*
-                * Listen to the 'cpu' scheduling filter constraint
-                * of counters:
-                */
-               if (counter->cpu != -1 && counter->cpu != cpu)
-                       continue;
-
-               if (counter != counter->group_leader) {
-                       if (counter_sched_in(counter, cpuctx, ctx, cpu))
-                               can_add_hw = 0;
-               } else {
-                       if (group_can_go_on(counter, cpuctx, can_add_hw)) {
-                               if (group_sched_in(counter, cpuctx, ctx, cpu))
-                                       can_add_hw = 0;
-                       }
-               }
-       }
-       perf_enable();
- out:
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Called from scheduler to add the counters of the current task
- * with interrupts disabled.
- *
- * We restore the counter value and then enable it.
- *
- * This does not protect us against NMI, but enable()
- * sets the enabled bit in the control field of counter _before_
- * accessing the counter control register. If a NMI hits, then it will
- * keep the counter running.
- */
-void perf_counter_task_sched_in(struct task_struct *task, int cpu)
-{
-       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
-       struct perf_counter_context *ctx = task->perf_counter_ctxp;
-
-       if (likely(!ctx))
-               return;
-       if (cpuctx->task_ctx == ctx)
-               return;
-       __perf_counter_sched_in(ctx, cpuctx, cpu);
-       cpuctx->task_ctx = ctx;
-}
-
-static void perf_counter_cpu_sched_in(struct perf_cpu_context *cpuctx, int cpu)
-{
-       struct perf_counter_context *ctx = &cpuctx->ctx;
-
-       __perf_counter_sched_in(ctx, cpuctx, cpu);
-}
-
-#define MAX_INTERRUPTS (~0ULL)
-
-static void perf_log_throttle(struct perf_counter *counter, int enable);
-
-static void perf_adjust_period(struct perf_counter *counter, u64 events)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       u64 period, sample_period;
-       s64 delta;
-
-       events *= hwc->sample_period;
-       period = div64_u64(events, counter->attr.sample_freq);
-
-       delta = (s64)(period - hwc->sample_period);
-       delta = (delta + 7) / 8; /* low pass filter */
-
-       sample_period = hwc->sample_period + delta;
-
-       if (!sample_period)
-               sample_period = 1;
-
-       hwc->sample_period = sample_period;
-}
-
-static void perf_ctx_adjust_freq(struct perf_counter_context *ctx)
-{
-       struct perf_counter *counter;
-       struct hw_perf_counter *hwc;
-       u64 interrupts, freq;
-
-       spin_lock(&ctx->lock);
-       list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-               if (counter->state != PERF_COUNTER_STATE_ACTIVE)
-                       continue;
-
-               hwc = &counter->hw;
-
-               interrupts = hwc->interrupts;
-               hwc->interrupts = 0;
-
-               /*
-                * unthrottle counters on the tick
-                */
-               if (interrupts == MAX_INTERRUPTS) {
-                       perf_log_throttle(counter, 1);
-                       counter->pmu->unthrottle(counter);
-                       interrupts = 2*sysctl_perf_counter_sample_rate/HZ;
-               }
-
-               if (!counter->attr.freq || !counter->attr.sample_freq)
-                       continue;
-
-               /*
-                * if the specified freq < HZ then we need to skip ticks
-                */
-               if (counter->attr.sample_freq < HZ) {
-                       freq = counter->attr.sample_freq;
-
-                       hwc->freq_count += freq;
-                       hwc->freq_interrupts += interrupts;
-
-                       if (hwc->freq_count < HZ)
-                               continue;
-
-                       interrupts = hwc->freq_interrupts;
-                       hwc->freq_interrupts = 0;
-                       hwc->freq_count -= HZ;
-               } else
-                       freq = HZ;
-
-               perf_adjust_period(counter, freq * interrupts);
-
-               /*
-                * In order to avoid being stalled by an (accidental) huge
-                * sample period, force reset the sample period if we didn't
-                * get any events in this freq period.
-                */
-               if (!interrupts) {
-                       perf_disable();
-                       counter->pmu->disable(counter);
-                       atomic64_set(&hwc->period_left, 0);
-                       counter->pmu->enable(counter);
-                       perf_enable();
-               }
-       }
-       spin_unlock(&ctx->lock);
-}
-
-/*
- * Round-robin a context's counters:
- */
-static void rotate_ctx(struct perf_counter_context *ctx)
-{
-       struct perf_counter *counter;
-
-       if (!ctx->nr_counters)
-               return;
-
-       spin_lock(&ctx->lock);
-       /*
-        * Rotate the first entry last (works just fine for group counters too):
-        */
-       perf_disable();
-       list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-               list_move_tail(&counter->list_entry, &ctx->counter_list);
-               break;
-       }
-       perf_enable();
-
-       spin_unlock(&ctx->lock);
-}
-
-void perf_counter_task_tick(struct task_struct *curr, int cpu)
-{
-       struct perf_cpu_context *cpuctx;
-       struct perf_counter_context *ctx;
-
-       if (!atomic_read(&nr_counters))
-               return;
-
-       cpuctx = &per_cpu(perf_cpu_context, cpu);
-       ctx = curr->perf_counter_ctxp;
-
-       perf_ctx_adjust_freq(&cpuctx->ctx);
-       if (ctx)
-               perf_ctx_adjust_freq(ctx);
-
-       perf_counter_cpu_sched_out(cpuctx);
-       if (ctx)
-               __perf_counter_task_sched_out(ctx);
-
-       rotate_ctx(&cpuctx->ctx);
-       if (ctx)
-               rotate_ctx(ctx);
-
-       perf_counter_cpu_sched_in(cpuctx, cpu);
-       if (ctx)
-               perf_counter_task_sched_in(curr, cpu);
-}
-
-/*
- * Enable all of a task's counters that have been marked enable-on-exec.
- * This expects task == current.
- */
-static void perf_counter_enable_on_exec(struct task_struct *task)
-{
-       struct perf_counter_context *ctx;
-       struct perf_counter *counter;
-       unsigned long flags;
-       int enabled = 0;
-
-       local_irq_save(flags);
-       ctx = task->perf_counter_ctxp;
-       if (!ctx || !ctx->nr_counters)
-               goto out;
-
-       __perf_counter_task_sched_out(ctx);
-
-       spin_lock(&ctx->lock);
-
-       list_for_each_entry(counter, &ctx->counter_list, list_entry) {
-               if (!counter->attr.enable_on_exec)
-                       continue;
-               counter->attr.enable_on_exec = 0;
-               if (counter->state >= PERF_COUNTER_STATE_INACTIVE)
-                       continue;
-               __perf_counter_mark_enabled(counter, ctx);
-               enabled = 1;
-       }
-
-       /*
-        * Unclone this context if we enabled any counter.
-        */
-       if (enabled)
-               unclone_ctx(ctx);
-
-       spin_unlock(&ctx->lock);
-
-       perf_counter_task_sched_in(task, smp_processor_id());
- out:
-       local_irq_restore(flags);
-}
-
-/*
- * Cross CPU call to read the hardware counter
- */
-static void __perf_counter_read(void *info)
-{
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter *counter = info;
-       struct perf_counter_context *ctx = counter->ctx;
-       unsigned long flags;
-
-       /*
-        * If this is a task context, we need to check whether it is
-        * the current task context of this cpu.  If not it has been
-        * scheduled out before the smp call arrived.  In that case
-        * counter->count would have been updated to a recent sample
-        * when the counter was scheduled out.
-        */
-       if (ctx->task && cpuctx->task_ctx != ctx)
-               return;
-
-       local_irq_save(flags);
-       if (ctx->is_active)
-               update_context_time(ctx);
-       counter->pmu->read(counter);
-       update_counter_times(counter);
-       local_irq_restore(flags);
-}
-
-static u64 perf_counter_read(struct perf_counter *counter)
-{
-       /*
-        * If counter is enabled and currently active on a CPU, update the
-        * value in the counter structure:
-        */
-       if (counter->state == PERF_COUNTER_STATE_ACTIVE) {
-               smp_call_function_single(counter->oncpu,
-                                        __perf_counter_read, counter, 1);
-       } else if (counter->state == PERF_COUNTER_STATE_INACTIVE) {
-               update_counter_times(counter);
-       }
-
-       return atomic64_read(&counter->count);
-}
-
-/*
- * Initialize the perf_counter context in a task_struct:
- */
-static void
-__perf_counter_init_context(struct perf_counter_context *ctx,
-                           struct task_struct *task)
-{
-       memset(ctx, 0, sizeof(*ctx));
-       spin_lock_init(&ctx->lock);
-       mutex_init(&ctx->mutex);
-       INIT_LIST_HEAD(&ctx->counter_list);
-       INIT_LIST_HEAD(&ctx->event_list);
-       atomic_set(&ctx->refcount, 1);
-       ctx->task = task;
-}
-
-static struct perf_counter_context *find_get_context(pid_t pid, int cpu)
-{
-       struct perf_counter_context *ctx;
-       struct perf_cpu_context *cpuctx;
-       struct task_struct *task;
-       unsigned long flags;
-       int err;
-
-       /*
-        * If cpu is not a wildcard then this is a percpu counter:
-        */
-       if (cpu != -1) {
-               /* Must be root to operate on a CPU counter: */
-               if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
-                       return ERR_PTR(-EACCES);
-
-               if (cpu < 0 || cpu > num_possible_cpus())
-                       return ERR_PTR(-EINVAL);
-
-               /*
-                * We could be clever and allow to attach a counter to an
-                * offline CPU and activate it when the CPU comes up, but
-                * that's for later.
-                */
-               if (!cpu_isset(cpu, cpu_online_map))
-                       return ERR_PTR(-ENODEV);
-
-               cpuctx = &per_cpu(perf_cpu_context, cpu);
-               ctx = &cpuctx->ctx;
-               get_ctx(ctx);
-
-               return ctx;
-       }
-
-       rcu_read_lock();
-       if (!pid)
-               task = current;
-       else
-               task = find_task_by_vpid(pid);
-       if (task)
-               get_task_struct(task);
-       rcu_read_unlock();
-
-       if (!task)
-               return ERR_PTR(-ESRCH);
-
-       /*
-        * Can't attach counters to a dying task.
-        */
-       err = -ESRCH;
-       if (task->flags & PF_EXITING)
-               goto errout;
-
-       /* Reuse ptrace permission checks for now. */
-       err = -EACCES;
-       if (!ptrace_may_access(task, PTRACE_MODE_READ))
-               goto errout;
-
- retry:
-       ctx = perf_lock_task_context(task, &flags);
-       if (ctx) {
-               unclone_ctx(ctx);
-               spin_unlock_irqrestore(&ctx->lock, flags);
-       }
-
-       if (!ctx) {
-               ctx = kmalloc(sizeof(struct perf_counter_context), GFP_KERNEL);
-               err = -ENOMEM;
-               if (!ctx)
-                       goto errout;
-               __perf_counter_init_context(ctx, task);
-               get_ctx(ctx);
-               if (cmpxchg(&task->perf_counter_ctxp, NULL, ctx)) {
-                       /*
-                        * We raced with some other task; use
-                        * the context they set.
-                        */
-                       kfree(ctx);
-                       goto retry;
-               }
-               get_task_struct(task);
-       }
-
-       put_task_struct(task);
-       return ctx;
-
- errout:
-       put_task_struct(task);
-       return ERR_PTR(err);
-}
-
-static void free_counter_rcu(struct rcu_head *head)
-{
-       struct perf_counter *counter;
-
-       counter = container_of(head, struct perf_counter, rcu_head);
-       if (counter->ns)
-               put_pid_ns(counter->ns);
-       kfree(counter);
-}
-
-static void perf_pending_sync(struct perf_counter *counter);
-
-static void free_counter(struct perf_counter *counter)
-{
-       perf_pending_sync(counter);
-
-       if (!counter->parent) {
-               atomic_dec(&nr_counters);
-               if (counter->attr.mmap)
-                       atomic_dec(&nr_mmap_counters);
-               if (counter->attr.comm)
-                       atomic_dec(&nr_comm_counters);
-               if (counter->attr.task)
-                       atomic_dec(&nr_task_counters);
-       }
-
-       if (counter->output) {
-               fput(counter->output->filp);
-               counter->output = NULL;
-       }
-
-       if (counter->destroy)
-               counter->destroy(counter);
-
-       put_ctx(counter->ctx);
-       call_rcu(&counter->rcu_head, free_counter_rcu);
-}
-
-/*
- * Called when the last reference to the file is gone.
- */
-static int perf_release(struct inode *inode, struct file *file)
-{
-       struct perf_counter *counter = file->private_data;
-       struct perf_counter_context *ctx = counter->ctx;
-
-       file->private_data = NULL;
-
-       WARN_ON_ONCE(ctx->parent_ctx);
-       mutex_lock(&ctx->mutex);
-       perf_counter_remove_from_context(counter);
-       mutex_unlock(&ctx->mutex);
-
-       mutex_lock(&counter->owner->perf_counter_mutex);
-       list_del_init(&counter->owner_entry);
-       mutex_unlock(&counter->owner->perf_counter_mutex);
-       put_task_struct(counter->owner);
-
-       free_counter(counter);
-
-       return 0;
-}
-
-static int perf_counter_read_size(struct perf_counter *counter)
-{
-       int entry = sizeof(u64); /* value */
-       int size = 0;
-       int nr = 1;
-
-       if (counter->attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
-               size += sizeof(u64);
-
-       if (counter->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
-               size += sizeof(u64);
-
-       if (counter->attr.read_format & PERF_FORMAT_ID)
-               entry += sizeof(u64);
-
-       if (counter->attr.read_format & PERF_FORMAT_GROUP) {
-               nr += counter->group_leader->nr_siblings;
-               size += sizeof(u64);
-       }
-
-       size += entry * nr;
-
-       return size;
-}
-
-static u64 perf_counter_read_value(struct perf_counter *counter)
-{
-       struct perf_counter *child;
-       u64 total = 0;
-
-       total += perf_counter_read(counter);
-       list_for_each_entry(child, &counter->child_list, child_list)
-               total += perf_counter_read(child);
-
-       return total;
-}
-
-static int perf_counter_read_entry(struct perf_counter *counter,
-                                  u64 read_format, char __user *buf)
-{
-       int n = 0, count = 0;
-       u64 values[2];
-
-       values[n++] = perf_counter_read_value(counter);
-       if (read_format & PERF_FORMAT_ID)
-               values[n++] = primary_counter_id(counter);
-
-       count = n * sizeof(u64);
-
-       if (copy_to_user(buf, values, count))
-               return -EFAULT;
-
-       return count;
-}
-
-static int perf_counter_read_group(struct perf_counter *counter,
-                                  u64 read_format, char __user *buf)
-{
-       struct perf_counter *leader = counter->group_leader, *sub;
-       int n = 0, size = 0, err = -EFAULT;
-       u64 values[3];
-
-       values[n++] = 1 + leader->nr_siblings;
-       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
-               values[n++] = leader->total_time_enabled +
-                       atomic64_read(&leader->child_total_time_enabled);
-       }
-       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
-               values[n++] = leader->total_time_running +
-                       atomic64_read(&leader->child_total_time_running);
-       }
-
-       size = n * sizeof(u64);
-
-       if (copy_to_user(buf, values, size))
-               return -EFAULT;
-
-       err = perf_counter_read_entry(leader, read_format, buf + size);
-       if (err < 0)
-               return err;
-
-       size += err;
-
-       list_for_each_entry(sub, &leader->sibling_list, list_entry) {
-               err = perf_counter_read_entry(sub, read_format,
-                               buf + size);
-               if (err < 0)
-                       return err;
-
-               size += err;
-       }
-
-       return size;
-}
-
-static int perf_counter_read_one(struct perf_counter *counter,
-                                u64 read_format, char __user *buf)
-{
-       u64 values[4];
-       int n = 0;
-
-       values[n++] = perf_counter_read_value(counter);
-       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
-               values[n++] = counter->total_time_enabled +
-                       atomic64_read(&counter->child_total_time_enabled);
-       }
-       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
-               values[n++] = counter->total_time_running +
-                       atomic64_read(&counter->child_total_time_running);
-       }
-       if (read_format & PERF_FORMAT_ID)
-               values[n++] = primary_counter_id(counter);
-
-       if (copy_to_user(buf, values, n * sizeof(u64)))
-               return -EFAULT;
-
-       return n * sizeof(u64);
-}
-
-/*
- * Read the performance counter - simple non blocking version for now
- */
-static ssize_t
-perf_read_hw(struct perf_counter *counter, char __user *buf, size_t count)
-{
-       u64 read_format = counter->attr.read_format;
-       int ret;
-
-       /*
-        * Return end-of-file for a read on a counter that is in
-        * error state (i.e. because it was pinned but it couldn't be
-        * scheduled on to the CPU at some point).
-        */
-       if (counter->state == PERF_COUNTER_STATE_ERROR)
-               return 0;
-
-       if (count < perf_counter_read_size(counter))
-               return -ENOSPC;
-
-       WARN_ON_ONCE(counter->ctx->parent_ctx);
-       mutex_lock(&counter->child_mutex);
-       if (read_format & PERF_FORMAT_GROUP)
-               ret = perf_counter_read_group(counter, read_format, buf);
-       else
-               ret = perf_counter_read_one(counter, read_format, buf);
-       mutex_unlock(&counter->child_mutex);
-
-       return ret;
-}
-
-static ssize_t
-perf_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
-{
-       struct perf_counter *counter = file->private_data;
-
-       return perf_read_hw(counter, buf, count);
-}
-
-static unsigned int perf_poll(struct file *file, poll_table *wait)
-{
-       struct perf_counter *counter = file->private_data;
-       struct perf_mmap_data *data;
-       unsigned int events = POLL_HUP;
-
-       rcu_read_lock();
-       data = rcu_dereference(counter->data);
-       if (data)
-               events = atomic_xchg(&data->poll, 0);
-       rcu_read_unlock();
-
-       poll_wait(file, &counter->waitq, wait);
-
-       return events;
-}
-
-static void perf_counter_reset(struct perf_counter *counter)
-{
-       (void)perf_counter_read(counter);
-       atomic64_set(&counter->count, 0);
-       perf_counter_update_userpage(counter);
-}
-
-/*
- * Holding the top-level counter's child_mutex means that any
- * descendant process that has inherited this counter will block
- * in sync_child_counter if it goes to exit, thus satisfying the
- * task existence requirements of perf_counter_enable/disable.
- */
-static void perf_counter_for_each_child(struct perf_counter *counter,
-                                       void (*func)(struct perf_counter *))
-{
-       struct perf_counter *child;
-
-       WARN_ON_ONCE(counter->ctx->parent_ctx);
-       mutex_lock(&counter->child_mutex);
-       func(counter);
-       list_for_each_entry(child, &counter->child_list, child_list)
-               func(child);
-       mutex_unlock(&counter->child_mutex);
-}
-
-static void perf_counter_for_each(struct perf_counter *counter,
-                                 void (*func)(struct perf_counter *))
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       struct perf_counter *sibling;
-
-       WARN_ON_ONCE(ctx->parent_ctx);
-       mutex_lock(&ctx->mutex);
-       counter = counter->group_leader;
-
-       perf_counter_for_each_child(counter, func);
-       func(counter);
-       list_for_each_entry(sibling, &counter->sibling_list, list_entry)
-               perf_counter_for_each_child(counter, func);
-       mutex_unlock(&ctx->mutex);
-}
-
-static int perf_counter_period(struct perf_counter *counter, u64 __user *arg)
-{
-       struct perf_counter_context *ctx = counter->ctx;
-       unsigned long size;
-       int ret = 0;
-       u64 value;
-
-       if (!counter->attr.sample_period)
-               return -EINVAL;
-
-       size = copy_from_user(&value, arg, sizeof(value));
-       if (size != sizeof(value))
-               return -EFAULT;
-
-       if (!value)
-               return -EINVAL;
-
-       spin_lock_irq(&ctx->lock);
-       if (counter->attr.freq) {
-               if (value > sysctl_perf_counter_sample_rate) {
-                       ret = -EINVAL;
-                       goto unlock;
-               }
-
-               counter->attr.sample_freq = value;
-       } else {
-               counter->attr.sample_period = value;
-               counter->hw.sample_period = value;
-       }
-unlock:
-       spin_unlock_irq(&ctx->lock);
-
-       return ret;
-}
-
-int perf_counter_set_output(struct perf_counter *counter, int output_fd);
-
-static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-       struct perf_counter *counter = file->private_data;
-       void (*func)(struct perf_counter *);
-       u32 flags = arg;
-
-       switch (cmd) {
-       case PERF_COUNTER_IOC_ENABLE:
-               func = perf_counter_enable;
-               break;
-       case PERF_COUNTER_IOC_DISABLE:
-               func = perf_counter_disable;
-               break;
-       case PERF_COUNTER_IOC_RESET:
-               func = perf_counter_reset;
-               break;
-
-       case PERF_COUNTER_IOC_REFRESH:
-               return perf_counter_refresh(counter, arg);
-
-       case PERF_COUNTER_IOC_PERIOD:
-               return perf_counter_period(counter, (u64 __user *)arg);
-
-       case PERF_COUNTER_IOC_SET_OUTPUT:
-               return perf_counter_set_output(counter, arg);
-
-       default:
-               return -ENOTTY;
-       }
-
-       if (flags & PERF_IOC_FLAG_GROUP)
-               perf_counter_for_each(counter, func);
-       else
-               perf_counter_for_each_child(counter, func);
-
-       return 0;
-}
-
-int perf_counter_task_enable(void)
-{
-       struct perf_counter *counter;
-
-       mutex_lock(&current->perf_counter_mutex);
-       list_for_each_entry(counter, &current->perf_counter_list, owner_entry)
-               perf_counter_for_each_child(counter, perf_counter_enable);
-       mutex_unlock(&current->perf_counter_mutex);
-
-       return 0;
-}
-
-int perf_counter_task_disable(void)
-{
-       struct perf_counter *counter;
-
-       mutex_lock(&current->perf_counter_mutex);
-       list_for_each_entry(counter, &current->perf_counter_list, owner_entry)
-               perf_counter_for_each_child(counter, perf_counter_disable);
-       mutex_unlock(&current->perf_counter_mutex);
-
-       return 0;
-}
-
-#ifndef PERF_COUNTER_INDEX_OFFSET
-# define PERF_COUNTER_INDEX_OFFSET 0
-#endif
-
-static int perf_counter_index(struct perf_counter *counter)
-{
-       if (counter->state != PERF_COUNTER_STATE_ACTIVE)
-               return 0;
-
-       return counter->hw.idx + 1 - PERF_COUNTER_INDEX_OFFSET;
-}
-
-/*
- * Callers need to ensure there can be no nesting of this function, otherwise
- * the seqlock logic goes bad. We can not serialize this because the arch
- * code calls this from NMI context.
- */
-void perf_counter_update_userpage(struct perf_counter *counter)
-{
-       struct perf_counter_mmap_page *userpg;
-       struct perf_mmap_data *data;
-
-       rcu_read_lock();
-       data = rcu_dereference(counter->data);
-       if (!data)
-               goto unlock;
-
-       userpg = data->user_page;
-
-       /*
-        * Disable preemption so as to not let the corresponding user-space
-        * spin too long if we get preempted.
-        */
-       preempt_disable();
-       ++userpg->lock;
-       barrier();
-       userpg->index = perf_counter_index(counter);
-       userpg->offset = atomic64_read(&counter->count);
-       if (counter->state == PERF_COUNTER_STATE_ACTIVE)
-               userpg->offset -= atomic64_read(&counter->hw.prev_count);
-
-       userpg->time_enabled = counter->total_time_enabled +
-                       atomic64_read(&counter->child_total_time_enabled);
-
-       userpg->time_running = counter->total_time_running +
-                       atomic64_read(&counter->child_total_time_running);
-
-       barrier();
-       ++userpg->lock;
-       preempt_enable();
-unlock:
-       rcu_read_unlock();
-}
-
-static int perf_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
-       struct perf_counter *counter = vma->vm_file->private_data;
-       struct perf_mmap_data *data;
-       int ret = VM_FAULT_SIGBUS;
-
-       if (vmf->flags & FAULT_FLAG_MKWRITE) {
-               if (vmf->pgoff == 0)
-                       ret = 0;
-               return ret;
-       }
-
-       rcu_read_lock();
-       data = rcu_dereference(counter->data);
-       if (!data)
-               goto unlock;
-
-       if (vmf->pgoff == 0) {
-               vmf->page = virt_to_page(data->user_page);
-       } else {
-               int nr = vmf->pgoff - 1;
-
-               if ((unsigned)nr > data->nr_pages)
-                       goto unlock;
-
-               if (vmf->flags & FAULT_FLAG_WRITE)
-                       goto unlock;
-
-               vmf->page = virt_to_page(data->data_pages[nr]);
-       }
-
-       get_page(vmf->page);
-       vmf->page->mapping = vma->vm_file->f_mapping;
-       vmf->page->index   = vmf->pgoff;
-
-       ret = 0;
-unlock:
-       rcu_read_unlock();
-
-       return ret;
-}
-
-static int perf_mmap_data_alloc(struct perf_counter *counter, int nr_pages)
-{
-       struct perf_mmap_data *data;
-       unsigned long size;
-       int i;
-
-       WARN_ON(atomic_read(&counter->mmap_count));
-
-       size = sizeof(struct perf_mmap_data);
-       size += nr_pages * sizeof(void *);
-
-       data = kzalloc(size, GFP_KERNEL);
-       if (!data)
-               goto fail;
-
-       data->user_page = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!data->user_page)
-               goto fail_user_page;
-
-       for (i = 0; i < nr_pages; i++) {
-               data->data_pages[i] = (void *)get_zeroed_page(GFP_KERNEL);
-               if (!data->data_pages[i])
-                       goto fail_data_pages;
-       }
-
-       data->nr_pages = nr_pages;
-       atomic_set(&data->lock, -1);
-
-       rcu_assign_pointer(counter->data, data);
-
-       return 0;
-
-fail_data_pages:
-       for (i--; i >= 0; i--)
-               free_page((unsigned long)data->data_pages[i]);
-
-       free_page((unsigned long)data->user_page);
-
-fail_user_page:
-       kfree(data);
-
-fail:
-       return -ENOMEM;
-}
-
-static void perf_mmap_free_page(unsigned long addr)
-{
-       struct page *page = virt_to_page((void *)addr);
-
-       page->mapping = NULL;
-       __free_page(page);
-}
-
-static void __perf_mmap_data_free(struct rcu_head *rcu_head)
-{
-       struct perf_mmap_data *data;
-       int i;
-
-       data = container_of(rcu_head, struct perf_mmap_data, rcu_head);
-
-       perf_mmap_free_page((unsigned long)data->user_page);
-       for (i = 0; i < data->nr_pages; i++)
-               perf_mmap_free_page((unsigned long)data->data_pages[i]);
-
-       kfree(data);
-}
-
-static void perf_mmap_data_free(struct perf_counter *counter)
-{
-       struct perf_mmap_data *data = counter->data;
-
-       WARN_ON(atomic_read(&counter->mmap_count));
-
-       rcu_assign_pointer(counter->data, NULL);
-       call_rcu(&data->rcu_head, __perf_mmap_data_free);
-}
-
-static void perf_mmap_open(struct vm_area_struct *vma)
-{
-       struct perf_counter *counter = vma->vm_file->private_data;
-
-       atomic_inc(&counter->mmap_count);
-}
-
-static void perf_mmap_close(struct vm_area_struct *vma)
-{
-       struct perf_counter *counter = vma->vm_file->private_data;
-
-       WARN_ON_ONCE(counter->ctx->parent_ctx);
-       if (atomic_dec_and_mutex_lock(&counter->mmap_count, &counter->mmap_mutex)) {
-               struct user_struct *user = current_user();
-
-               atomic_long_sub(counter->data->nr_pages + 1, &user->locked_vm);
-               vma->vm_mm->locked_vm -= counter->data->nr_locked;
-               perf_mmap_data_free(counter);
-               mutex_unlock(&counter->mmap_mutex);
-       }
-}
-
-static struct vm_operations_struct perf_mmap_vmops = {
-       .open           = perf_mmap_open,
-       .close          = perf_mmap_close,
-       .fault          = perf_mmap_fault,
-       .page_mkwrite   = perf_mmap_fault,
-};
-
-static int perf_mmap(struct file *file, struct vm_area_struct *vma)
-{
-       struct perf_counter *counter = file->private_data;
-       unsigned long user_locked, user_lock_limit;
-       struct user_struct *user = current_user();
-       unsigned long locked, lock_limit;
-       unsigned long vma_size;
-       unsigned long nr_pages;
-       long user_extra, extra;
-       int ret = 0;
-
-       if (!(vma->vm_flags & VM_SHARED))
-               return -EINVAL;
-
-       vma_size = vma->vm_end - vma->vm_start;
-       nr_pages = (vma_size / PAGE_SIZE) - 1;
-
-       /*
-        * If we have data pages ensure they're a power-of-two number, so we
-        * can do bitmasks instead of modulo.
-        */
-       if (nr_pages != 0 && !is_power_of_2(nr_pages))
-               return -EINVAL;
-
-       if (vma_size != PAGE_SIZE * (1 + nr_pages))
-               return -EINVAL;
-
-       if (vma->vm_pgoff != 0)
-               return -EINVAL;
-
-       WARN_ON_ONCE(counter->ctx->parent_ctx);
-       mutex_lock(&counter->mmap_mutex);
-       if (counter->output) {
-               ret = -EINVAL;
-               goto unlock;
-       }
-
-       if (atomic_inc_not_zero(&counter->mmap_count)) {
-               if (nr_pages != counter->data->nr_pages)
-                       ret = -EINVAL;
-               goto unlock;
-       }
-
-       user_extra = nr_pages + 1;
-       user_lock_limit = sysctl_perf_counter_mlock >> (PAGE_SHIFT - 10);
-
-       /*
-        * Increase the limit linearly with more CPUs:
-        */
-       user_lock_limit *= num_online_cpus();
-
-       user_locked = atomic_long_read(&user->locked_vm) + user_extra;
-
-       extra = 0;
-       if (user_locked > user_lock_limit)
-               extra = user_locked - user_lock_limit;
-
-       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
-       lock_limit >>= PAGE_SHIFT;
-       locked = vma->vm_mm->locked_vm + extra;
-
-       if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) {
-               ret = -EPERM;
-               goto unlock;
-       }
-
-       WARN_ON(counter->data);
-       ret = perf_mmap_data_alloc(counter, nr_pages);
-       if (ret)
-               goto unlock;
-
-       atomic_set(&counter->mmap_count, 1);
-       atomic_long_add(user_extra, &user->locked_vm);
-       vma->vm_mm->locked_vm += extra;
-       counter->data->nr_locked = extra;
-       if (vma->vm_flags & VM_WRITE)
-               counter->data->writable = 1;
-
-unlock:
-       mutex_unlock(&counter->mmap_mutex);
-
-       vma->vm_flags |= VM_RESERVED;
-       vma->vm_ops = &perf_mmap_vmops;
-
-       return ret;
-}
-
-static int perf_fasync(int fd, struct file *filp, int on)
-{
-       struct inode *inode = filp->f_path.dentry->d_inode;
-       struct perf_counter *counter = filp->private_data;
-       int retval;
-
-       mutex_lock(&inode->i_mutex);
-       retval = fasync_helper(fd, filp, on, &counter->fasync);
-       mutex_unlock(&inode->i_mutex);
-
-       if (retval < 0)
-               return retval;
-
-       return 0;
-}
-
-static const struct file_operations perf_fops = {
-       .release                = perf_release,
-       .read                   = perf_read,
-       .poll                   = perf_poll,
-       .unlocked_ioctl         = perf_ioctl,
-       .compat_ioctl           = perf_ioctl,
-       .mmap                   = perf_mmap,
-       .fasync                 = perf_fasync,
-};
-
-/*
- * Perf counter wakeup
- *
- * If there's data, ensure we set the poll() state and publish everything
- * to user-space before waking everybody up.
- */
-
-void perf_counter_wakeup(struct perf_counter *counter)
-{
-       wake_up_all(&counter->waitq);
-
-       if (counter->pending_kill) {
-               kill_fasync(&counter->fasync, SIGIO, counter->pending_kill);
-               counter->pending_kill = 0;
-       }
-}
-
-/*
- * Pending wakeups
- *
- * Handle the case where we need to wakeup up from NMI (or rq->lock) context.
- *
- * The NMI bit means we cannot possibly take locks. Therefore, maintain a
- * single linked list and use cmpxchg() to add entries lockless.
- */
-
-static void perf_pending_counter(struct perf_pending_entry *entry)
-{
-       struct perf_counter *counter = container_of(entry,
-                       struct perf_counter, pending);
-
-       if (counter->pending_disable) {
-               counter->pending_disable = 0;
-               __perf_counter_disable(counter);
-       }
-
-       if (counter->pending_wakeup) {
-               counter->pending_wakeup = 0;
-               perf_counter_wakeup(counter);
-       }
-}
-
-#define PENDING_TAIL ((struct perf_pending_entry *)-1UL)
-
-static DEFINE_PER_CPU(struct perf_pending_entry *, perf_pending_head) = {
-       PENDING_TAIL,
-};
-
-static void perf_pending_queue(struct perf_pending_entry *entry,
-                              void (*func)(struct perf_pending_entry *))
-{
-       struct perf_pending_entry **head;
-
-       if (cmpxchg(&entry->next, NULL, PENDING_TAIL) != NULL)
-               return;
-
-       entry->func = func;
-
-       head = &get_cpu_var(perf_pending_head);
-
-       do {
-               entry->next = *head;
-       } while (cmpxchg(head, entry->next, entry) != entry->next);
-
-       set_perf_counter_pending();
-
-       put_cpu_var(perf_pending_head);
-}
-
-static int __perf_pending_run(void)
-{
-       struct perf_pending_entry *list;
-       int nr = 0;
-
-       list = xchg(&__get_cpu_var(perf_pending_head), PENDING_TAIL);
-       while (list != PENDING_TAIL) {
-               void (*func)(struct perf_pending_entry *);
-               struct perf_pending_entry *entry = list;
-
-               list = list->next;
-
-               func = entry->func;
-               entry->next = NULL;
-               /*
-                * Ensure we observe the unqueue before we issue the wakeup,
-                * so that we won't be waiting forever.
-                * -- see perf_not_pending().
-                */
-               smp_wmb();
-
-               func(entry);
-               nr++;
-       }
-
-       return nr;
-}
-
-static inline int perf_not_pending(struct perf_counter *counter)
-{
-       /*
-        * If we flush on whatever cpu we run, there is a chance we don't
-        * need to wait.
-        */
-       get_cpu();
-       __perf_pending_run();
-       put_cpu();
-
-       /*
-        * Ensure we see the proper queue state before going to sleep
-        * so that we do not miss the wakeup. -- see perf_pending_handle()
-        */
-       smp_rmb();
-       return counter->pending.next == NULL;
-}
-
-static void perf_pending_sync(struct perf_counter *counter)
-{
-       wait_event(counter->waitq, perf_not_pending(counter));
-}
-
-void perf_counter_do_pending(void)
-{
-       __perf_pending_run();
-}
-
-/*
- * Callchain support -- arch specific
- */
-
-__weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
-{
-       return NULL;
-}
-
-/*
- * Output
- */
-
-struct perf_output_handle {
-       struct perf_counter     *counter;
-       struct perf_mmap_data   *data;
-       unsigned long           head;
-       unsigned long           offset;
-       int                     nmi;
-       int                     sample;
-       int                     locked;
-       unsigned long           flags;
-};
-
-static bool perf_output_space(struct perf_mmap_data *data,
-                             unsigned int offset, unsigned int head)
-{
-       unsigned long tail;
-       unsigned long mask;
-
-       if (!data->writable)
-               return true;
-
-       mask = (data->nr_pages << PAGE_SHIFT) - 1;
-       /*
-        * Userspace could choose to issue a mb() before updating the tail
-        * pointer. So that all reads will be completed before the write is
-        * issued.
-        */
-       tail = ACCESS_ONCE(data->user_page->data_tail);
-       smp_rmb();
-
-       offset = (offset - tail) & mask;
-       head   = (head   - tail) & mask;
-
-       if ((int)(head - offset) < 0)
-               return false;
-
-       return true;
-}
-
-static void perf_output_wakeup(struct perf_output_handle *handle)
-{
-       atomic_set(&handle->data->poll, POLL_IN);
-
-       if (handle->nmi) {
-               handle->counter->pending_wakeup = 1;
-               perf_pending_queue(&handle->counter->pending,
-                                  perf_pending_counter);
-       } else
-               perf_counter_wakeup(handle->counter);
-}
-
-/*
- * Curious locking construct.
- *
- * We need to ensure a later event doesn't publish a head when a former
- * event isn't done writing. However since we need to deal with NMIs we
- * cannot fully serialize things.
- *
- * What we do is serialize between CPUs so we only have to deal with NMI
- * nesting on a single CPU.
- *
- * We only publish the head (and generate a wakeup) when the outer-most
- * event completes.
- */
-static void perf_output_lock(struct perf_output_handle *handle)
-{
-       struct perf_mmap_data *data = handle->data;
-       int cpu;
-
-       handle->locked = 0;
-
-       local_irq_save(handle->flags);
-       cpu = smp_processor_id();
-
-       if (in_nmi() && atomic_read(&data->lock) == cpu)
-               return;
-
-       while (atomic_cmpxchg(&data->lock, -1, cpu) != -1)
-               cpu_relax();
-
-       handle->locked = 1;
-}
-
-static void perf_output_unlock(struct perf_output_handle *handle)
-{
-       struct perf_mmap_data *data = handle->data;
-       unsigned long head;
-       int cpu;
-
-       data->done_head = data->head;
-
-       if (!handle->locked)
-               goto out;
-
-again:
-       /*
-        * The xchg implies a full barrier that ensures all writes are done
-        * before we publish the new head, matched by a rmb() in userspace when
-        * reading this position.
-        */
-       while ((head = atomic_long_xchg(&data->done_head, 0)))
-               data->user_page->data_head = head;
-
-       /*
-        * NMI can happen here, which means we can miss a done_head update.
-        */
-
-       cpu = atomic_xchg(&data->lock, -1);
-       WARN_ON_ONCE(cpu != smp_processor_id());
-
-       /*
-        * Therefore we have to validate we did not indeed do so.
-        */
-       if (unlikely(atomic_long_read(&data->done_head))) {
-               /*
-                * Since we had it locked, we can lock it again.
-                */
-               while (atomic_cmpxchg(&data->lock, -1, cpu) != -1)
-                       cpu_relax();
-
-               goto again;
-       }
-
-       if (atomic_xchg(&data->wakeup, 0))
-               perf_output_wakeup(handle);
-out:
-       local_irq_restore(handle->flags);
-}
-
-static void perf_output_copy(struct perf_output_handle *handle,
-                            const void *buf, unsigned int len)
-{
-       unsigned int pages_mask;
-       unsigned int offset;
-       unsigned int size;
-       void **pages;
-
-       offset          = handle->offset;
-       pages_mask      = handle->data->nr_pages - 1;
-       pages           = handle->data->data_pages;
-
-       do {
-               unsigned int page_offset;
-               int nr;
-
-               nr          = (offset >> PAGE_SHIFT) & pages_mask;
-               page_offset = offset & (PAGE_SIZE - 1);
-               size        = min_t(unsigned int, PAGE_SIZE - page_offset, len);
-
-               memcpy(pages[nr] + page_offset, buf, size);
-
-               len         -= size;
-               buf         += size;
-               offset      += size;
-       } while (len);
-
-       handle->offset = offset;
-
-       /*
-        * Check we didn't copy past our reservation window, taking the
-        * possible unsigned int wrap into account.
-        */
-       WARN_ON_ONCE(((long)(handle->head - handle->offset)) < 0);
-}
-
-#define perf_output_put(handle, x) \
-       perf_output_copy((handle), &(x), sizeof(x))
-
-static int perf_output_begin(struct perf_output_handle *handle,
-                            struct perf_counter *counter, unsigned int size,
-                            int nmi, int sample)
-{
-       struct perf_counter *output_counter;
-       struct perf_mmap_data *data;
-       unsigned int offset, head;
-       int have_lost;
-       struct {
-               struct perf_event_header header;
-               u64                      id;
-               u64                      lost;
-       } lost_event;
-
-       rcu_read_lock();
-       /*
-        * For inherited counters we send all the output towards the parent.
-        */
-       if (counter->parent)
-               counter = counter->parent;
-
-       output_counter = rcu_dereference(counter->output);
-       if (output_counter)
-               counter = output_counter;
-
-       data = rcu_dereference(counter->data);
-       if (!data)
-               goto out;
-
-       handle->data    = data;
-       handle->counter = counter;
-       handle->nmi     = nmi;
-       handle->sample  = sample;
-
-       if (!data->nr_pages)
-               goto fail;
-
-       have_lost = atomic_read(&data->lost);
-       if (have_lost)
-               size += sizeof(lost_event);
-
-       perf_output_lock(handle);
-
-       do {
-               offset = head = atomic_long_read(&data->head);
-               head += size;
-               if (unlikely(!perf_output_space(data, offset, head)))
-                       goto fail;
-       } while (atomic_long_cmpxchg(&data->head, offset, head) != offset);
-
-       handle->offset  = offset;
-       handle->head    = head;
-
-       if ((offset >> PAGE_SHIFT) != (head >> PAGE_SHIFT))
-               atomic_set(&data->wakeup, 1);
-
-       if (have_lost) {
-               lost_event.header.type = PERF_EVENT_LOST;
-               lost_event.header.misc = 0;
-               lost_event.header.size = sizeof(lost_event);
-               lost_event.id          = counter->id;
-               lost_event.lost        = atomic_xchg(&data->lost, 0);
-
-               perf_output_put(handle, lost_event);
-       }
-
-       return 0;
-
-fail:
-       atomic_inc(&data->lost);
-       perf_output_unlock(handle);
-out:
-       rcu_read_unlock();
-
-       return -ENOSPC;
-}
-
-static void perf_output_end(struct perf_output_handle *handle)
-{
-       struct perf_counter *counter = handle->counter;
-       struct perf_mmap_data *data = handle->data;
-
-       int wakeup_events = counter->attr.wakeup_events;
-
-       if (handle->sample && wakeup_events) {
-               int events = atomic_inc_return(&data->events);
-               if (events >= wakeup_events) {
-                       atomic_sub(wakeup_events, &data->events);
-                       atomic_set(&data->wakeup, 1);
-               }
-       }
-
-       perf_output_unlock(handle);
-       rcu_read_unlock();
-}
-
-static u32 perf_counter_pid(struct perf_counter *counter, struct task_struct *p)
-{
-       /*
-        * only top level counters have the pid namespace they were created in
-        */
-       if (counter->parent)
-               counter = counter->parent;
-
-       return task_tgid_nr_ns(p, counter->ns);
-}
-
-static u32 perf_counter_tid(struct perf_counter *counter, struct task_struct *p)
-{
-       /*
-        * only top level counters have the pid namespace they were created in
-        */
-       if (counter->parent)
-               counter = counter->parent;
-
-       return task_pid_nr_ns(p, counter->ns);
-}
-
-static void perf_output_read_one(struct perf_output_handle *handle,
-                                struct perf_counter *counter)
-{
-       u64 read_format = counter->attr.read_format;
-       u64 values[4];
-       int n = 0;
-
-       values[n++] = atomic64_read(&counter->count);
-       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
-               values[n++] = counter->total_time_enabled +
-                       atomic64_read(&counter->child_total_time_enabled);
-       }
-       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
-               values[n++] = counter->total_time_running +
-                       atomic64_read(&counter->child_total_time_running);
-       }
-       if (read_format & PERF_FORMAT_ID)
-               values[n++] = primary_counter_id(counter);
-
-       perf_output_copy(handle, values, n * sizeof(u64));
-}
-
-/*
- * XXX PERF_FORMAT_GROUP vs inherited counters seems difficult.
- */
-static void perf_output_read_group(struct perf_output_handle *handle,
-                           struct perf_counter *counter)
-{
-       struct perf_counter *leader = counter->group_leader, *sub;
-       u64 read_format = counter->attr.read_format;
-       u64 values[5];
-       int n = 0;
-
-       values[n++] = 1 + leader->nr_siblings;
-
-       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
-               values[n++] = leader->total_time_enabled;
-
-       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
-               values[n++] = leader->total_time_running;
-
-       if (leader != counter)
-               leader->pmu->read(leader);
-
-       values[n++] = atomic64_read(&leader->count);
-       if (read_format & PERF_FORMAT_ID)
-               values[n++] = primary_counter_id(leader);
-
-       perf_output_copy(handle, values, n * sizeof(u64));
-
-       list_for_each_entry(sub, &leader->sibling_list, list_entry) {
-               n = 0;
-
-               if (sub != counter)
-                       sub->pmu->read(sub);
-
-               values[n++] = atomic64_read(&sub->count);
-               if (read_format & PERF_FORMAT_ID)
-                       values[n++] = primary_counter_id(sub);
-
-               perf_output_copy(handle, values, n * sizeof(u64));
-       }
-}
-
-static void perf_output_read(struct perf_output_handle *handle,
-                            struct perf_counter *counter)
-{
-       if (counter->attr.read_format & PERF_FORMAT_GROUP)
-               perf_output_read_group(handle, counter);
-       else
-               perf_output_read_one(handle, counter);
-}
-
-void perf_counter_output(struct perf_counter *counter, int nmi,
-                               struct perf_sample_data *data)
-{
-       int ret;
-       u64 sample_type = counter->attr.sample_type;
-       struct perf_output_handle handle;
-       struct perf_event_header header;
-       u64 ip;
-       struct {
-               u32 pid, tid;
-       } tid_entry;
-       struct perf_callchain_entry *callchain = NULL;
-       int callchain_size = 0;
-       u64 time;
-       struct {
-               u32 cpu, reserved;
-       } cpu_entry;
-
-       header.type = PERF_EVENT_SAMPLE;
-       header.size = sizeof(header);
-
-       header.misc = 0;
-       header.misc |= perf_misc_flags(data->regs);
-
-       if (sample_type & PERF_SAMPLE_IP) {
-               ip = perf_instruction_pointer(data->regs);
-               header.size += sizeof(ip);
-       }
-
-       if (sample_type & PERF_SAMPLE_TID) {
-               /* namespace issues */
-               tid_entry.pid = perf_counter_pid(counter, current);
-               tid_entry.tid = perf_counter_tid(counter, current);
-
-               header.size += sizeof(tid_entry);
-       }
-
-       if (sample_type & PERF_SAMPLE_TIME) {
-               /*
-                * Maybe do better on x86 and provide cpu_clock_nmi()
-                */
-               time = sched_clock();
-
-               header.size += sizeof(u64);
-       }
-
-       if (sample_type & PERF_SAMPLE_ADDR)
-               header.size += sizeof(u64);
-
-       if (sample_type & PERF_SAMPLE_ID)
-               header.size += sizeof(u64);
-
-       if (sample_type & PERF_SAMPLE_STREAM_ID)
-               header.size += sizeof(u64);
-
-       if (sample_type & PERF_SAMPLE_CPU) {
-               header.size += sizeof(cpu_entry);
-
-               cpu_entry.cpu = raw_smp_processor_id();
-               cpu_entry.reserved = 0;
-       }
-
-       if (sample_type & PERF_SAMPLE_PERIOD)
-               header.size += sizeof(u64);
-
-       if (sample_type & PERF_SAMPLE_READ)
-               header.size += perf_counter_read_size(counter);
-
-       if (sample_type & PERF_SAMPLE_CALLCHAIN) {
-               callchain = perf_callchain(data->regs);
-
-               if (callchain) {
-                       callchain_size = (1 + callchain->nr) * sizeof(u64);
-                       header.size += callchain_size;
-               } else
-                       header.size += sizeof(u64);
-       }
-
-       if (sample_type & PERF_SAMPLE_RAW) {
-               int size = sizeof(u32);
-
-               if (data->raw)
-                       size += data->raw->size;
-               else
-                       size += sizeof(u32);
-
-               WARN_ON_ONCE(size & (sizeof(u64)-1));
-               header.size += size;
-       }
-
-       ret = perf_output_begin(&handle, counter, header.size, nmi, 1);
-       if (ret)
-               return;
-
-       perf_output_put(&handle, header);
-
-       if (sample_type & PERF_SAMPLE_IP)
-               perf_output_put(&handle, ip);
-
-       if (sample_type & PERF_SAMPLE_TID)
-               perf_output_put(&handle, tid_entry);
-
-       if (sample_type & PERF_SAMPLE_TIME)
-               perf_output_put(&handle, time);
-
-       if (sample_type & PERF_SAMPLE_ADDR)
-               perf_output_put(&handle, data->addr);
-
-       if (sample_type & PERF_SAMPLE_ID) {
-               u64 id = primary_counter_id(counter);
-
-               perf_output_put(&handle, id);
-       }
-
-       if (sample_type & PERF_SAMPLE_STREAM_ID)
-               perf_output_put(&handle, counter->id);
-
-       if (sample_type & PERF_SAMPLE_CPU)
-               perf_output_put(&handle, cpu_entry);
-
-       if (sample_type & PERF_SAMPLE_PERIOD)
-               perf_output_put(&handle, data->period);
-
-       if (sample_type & PERF_SAMPLE_READ)
-               perf_output_read(&handle, counter);
-
-       if (sample_type & PERF_SAMPLE_CALLCHAIN) {
-               if (callchain)
-                       perf_output_copy(&handle, callchain, callchain_size);
-               else {
-                       u64 nr = 0;
-                       perf_output_put(&handle, nr);
-               }
-       }
-
-       if (sample_type & PERF_SAMPLE_RAW) {
-               if (data->raw) {
-                       perf_output_put(&handle, data->raw->size);
-                       perf_output_copy(&handle, data->raw->data, data->raw->size);
-               } else {
-                       struct {
-                               u32     size;
-                               u32     data;
-                       } raw = {
-                               .size = sizeof(u32),
-                               .data = 0,
-                       };
-                       perf_output_put(&handle, raw);
-               }
-       }
-
-       perf_output_end(&handle);
-}
-
-/*
- * read event
- */
-
-struct perf_read_event {
-       struct perf_event_header        header;
-
-       u32                             pid;
-       u32                             tid;
-};
-
-static void
-perf_counter_read_event(struct perf_counter *counter,
-                       struct task_struct *task)
-{
-       struct perf_output_handle handle;
-       struct perf_read_event event = {
-               .header = {
-                       .type = PERF_EVENT_READ,
-                       .misc = 0,
-                       .size = sizeof(event) + perf_counter_read_size(counter),
-               },
-               .pid = perf_counter_pid(counter, task),
-               .tid = perf_counter_tid(counter, task),
-       };
-       int ret;
-
-       ret = perf_output_begin(&handle, counter, event.header.size, 0, 0);
-       if (ret)
-               return;
-
-       perf_output_put(&handle, event);
-       perf_output_read(&handle, counter);
-
-       perf_output_end(&handle);
-}
-
-/*
- * task tracking -- fork/exit
- *
- * enabled by: attr.comm | attr.mmap | attr.task
- */
-
-struct perf_task_event {
-       struct task_struct              *task;
-       struct perf_counter_context     *task_ctx;
-
-       struct {
-               struct perf_event_header        header;
-
-               u32                             pid;
-               u32                             ppid;
-               u32                             tid;
-               u32                             ptid;
-       } event;
-};
-
-static void perf_counter_task_output(struct perf_counter *counter,
-                                    struct perf_task_event *task_event)
-{
-       struct perf_output_handle handle;
-       int size = task_event->event.header.size;
-       struct task_struct *task = task_event->task;
-       int ret = perf_output_begin(&handle, counter, size, 0, 0);
-
-       if (ret)
-               return;
-
-       task_event->event.pid = perf_counter_pid(counter, task);
-       task_event->event.ppid = perf_counter_pid(counter, current);
-
-       task_event->event.tid = perf_counter_tid(counter, task);
-       task_event->event.ptid = perf_counter_tid(counter, current);
-
-       perf_output_put(&handle, task_event->event);
-       perf_output_end(&handle);
-}
-
-static int perf_counter_task_match(struct perf_counter *counter)
-{
-       if (counter->attr.comm || counter->attr.mmap || counter->attr.task)
-               return 1;
-
-       return 0;
-}
-
-static void perf_counter_task_ctx(struct perf_counter_context *ctx,
-                                 struct perf_task_event *task_event)
-{
-       struct perf_counter *counter;
-
-       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
-               return;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(counter, &ctx->event_list, event_entry) {
-               if (perf_counter_task_match(counter))
-                       perf_counter_task_output(counter, task_event);
-       }
-       rcu_read_unlock();
-}
-
-static void perf_counter_task_event(struct perf_task_event *task_event)
-{
-       struct perf_cpu_context *cpuctx;
-       struct perf_counter_context *ctx = task_event->task_ctx;
-
-       cpuctx = &get_cpu_var(perf_cpu_context);
-       perf_counter_task_ctx(&cpuctx->ctx, task_event);
-       put_cpu_var(perf_cpu_context);
-
-       rcu_read_lock();
-       if (!ctx)
-               ctx = rcu_dereference(task_event->task->perf_counter_ctxp);
-       if (ctx)
-               perf_counter_task_ctx(ctx, task_event);
-       rcu_read_unlock();
-}
-
-static void perf_counter_task(struct task_struct *task,
-                             struct perf_counter_context *task_ctx,
-                             int new)
-{
-       struct perf_task_event task_event;
-
-       if (!atomic_read(&nr_comm_counters) &&
-           !atomic_read(&nr_mmap_counters) &&
-           !atomic_read(&nr_task_counters))
-               return;
-
-       task_event = (struct perf_task_event){
-               .task     = task,
-               .task_ctx = task_ctx,
-               .event    = {
-                       .header = {
-                               .type = new ? PERF_EVENT_FORK : PERF_EVENT_EXIT,
-                               .misc = 0,
-                               .size = sizeof(task_event.event),
-                       },
-                       /* .pid  */
-                       /* .ppid */
-                       /* .tid  */
-                       /* .ptid */
-               },
-       };
-
-       perf_counter_task_event(&task_event);
-}
-
-void perf_counter_fork(struct task_struct *task)
-{
-       perf_counter_task(task, NULL, 1);
-}
-
-/*
- * comm tracking
- */
-
-struct perf_comm_event {
-       struct task_struct      *task;
-       char                    *comm;
-       int                     comm_size;
-
-       struct {
-               struct perf_event_header        header;
-
-               u32                             pid;
-               u32                             tid;
-       } event;
-};
-
-static void perf_counter_comm_output(struct perf_counter *counter,
-                                    struct perf_comm_event *comm_event)
-{
-       struct perf_output_handle handle;
-       int size = comm_event->event.header.size;
-       int ret = perf_output_begin(&handle, counter, size, 0, 0);
-
-       if (ret)
-               return;
-
-       comm_event->event.pid = perf_counter_pid(counter, comm_event->task);
-       comm_event->event.tid = perf_counter_tid(counter, comm_event->task);
-
-       perf_output_put(&handle, comm_event->event);
-       perf_output_copy(&handle, comm_event->comm,
-                                  comm_event->comm_size);
-       perf_output_end(&handle);
-}
-
-static int perf_counter_comm_match(struct perf_counter *counter)
-{
-       if (counter->attr.comm)
-               return 1;
-
-       return 0;
-}
-
-static void perf_counter_comm_ctx(struct perf_counter_context *ctx,
-                                 struct perf_comm_event *comm_event)
-{
-       struct perf_counter *counter;
-
-       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
-               return;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(counter, &ctx->event_list, event_entry) {
-               if (perf_counter_comm_match(counter))
-                       perf_counter_comm_output(counter, comm_event);
-       }
-       rcu_read_unlock();
-}
-
-static void perf_counter_comm_event(struct perf_comm_event *comm_event)
-{
-       struct perf_cpu_context *cpuctx;
-       struct perf_counter_context *ctx;
-       unsigned int size;
-       char comm[TASK_COMM_LEN];
-
-       memset(comm, 0, sizeof(comm));
-       strncpy(comm, comm_event->task->comm, sizeof(comm));
-       size = ALIGN(strlen(comm)+1, sizeof(u64));
-
-       comm_event->comm = comm;
-       comm_event->comm_size = size;
-
-       comm_event->event.header.size = sizeof(comm_event->event) + size;
-
-       cpuctx = &get_cpu_var(perf_cpu_context);
-       perf_counter_comm_ctx(&cpuctx->ctx, comm_event);
-       put_cpu_var(perf_cpu_context);
-
-       rcu_read_lock();
-       /*
-        * doesn't really matter which of the child contexts the
-        * events ends up in.
-        */
-       ctx = rcu_dereference(current->perf_counter_ctxp);
-       if (ctx)
-               perf_counter_comm_ctx(ctx, comm_event);
-       rcu_read_unlock();
-}
-
-void perf_counter_comm(struct task_struct *task)
-{
-       struct perf_comm_event comm_event;
-
-       if (task->perf_counter_ctxp)
-               perf_counter_enable_on_exec(task);
-
-       if (!atomic_read(&nr_comm_counters))
-               return;
-
-       comm_event = (struct perf_comm_event){
-               .task   = task,
-               /* .comm      */
-               /* .comm_size */
-               .event  = {
-                       .header = {
-                               .type = PERF_EVENT_COMM,
-                               .misc = 0,
-                               /* .size */
-                       },
-                       /* .pid */
-                       /* .tid */
-               },
-       };
-
-       perf_counter_comm_event(&comm_event);
-}
-
-/*
- * mmap tracking
- */
-
-struct perf_mmap_event {
-       struct vm_area_struct   *vma;
-
-       const char              *file_name;
-       int                     file_size;
-
-       struct {
-               struct perf_event_header        header;
-
-               u32                             pid;
-               u32                             tid;
-               u64                             start;
-               u64                             len;
-               u64                             pgoff;
-       } event;
-};
-
-static void perf_counter_mmap_output(struct perf_counter *counter,
-                                    struct perf_mmap_event *mmap_event)
-{
-       struct perf_output_handle handle;
-       int size = mmap_event->event.header.size;
-       int ret = perf_output_begin(&handle, counter, size, 0, 0);
-
-       if (ret)
-               return;
-
-       mmap_event->event.pid = perf_counter_pid(counter, current);
-       mmap_event->event.tid = perf_counter_tid(counter, current);
-
-       perf_output_put(&handle, mmap_event->event);
-       perf_output_copy(&handle, mmap_event->file_name,
-                                  mmap_event->file_size);
-       perf_output_end(&handle);
-}
-
-static int perf_counter_mmap_match(struct perf_counter *counter,
-                                  struct perf_mmap_event *mmap_event)
-{
-       if (counter->attr.mmap)
-               return 1;
-
-       return 0;
-}
-
-static void perf_counter_mmap_ctx(struct perf_counter_context *ctx,
-                                 struct perf_mmap_event *mmap_event)
-{
-       struct perf_counter *counter;
-
-       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
-               return;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(counter, &ctx->event_list, event_entry) {
-               if (perf_counter_mmap_match(counter, mmap_event))
-                       perf_counter_mmap_output(counter, mmap_event);
-       }
-       rcu_read_unlock();
-}
-
-static void perf_counter_mmap_event(struct perf_mmap_event *mmap_event)
-{
-       struct perf_cpu_context *cpuctx;
-       struct perf_counter_context *ctx;
-       struct vm_area_struct *vma = mmap_event->vma;
-       struct file *file = vma->vm_file;
-       unsigned int size;
-       char tmp[16];
-       char *buf = NULL;
-       const char *name;
-
-       memset(tmp, 0, sizeof(tmp));
-
-       if (file) {
-               /*
-                * d_path works from the end of the buffer backwards, so we
-                * need to add enough zero bytes after the string to handle
-                * the 64bit alignment we do later.
-                */
-               buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
-               if (!buf) {
-                       name = strncpy(tmp, "//enomem", sizeof(tmp));
-                       goto got_name;
-               }
-               name = d_path(&file->f_path, buf, PATH_MAX);
-               if (IS_ERR(name)) {
-                       name = strncpy(tmp, "//toolong", sizeof(tmp));
-                       goto got_name;
-               }
-       } else {
-               if (arch_vma_name(mmap_event->vma)) {
-                       name = strncpy(tmp, arch_vma_name(mmap_event->vma),
-                                      sizeof(tmp));
-                       goto got_name;
-               }
-
-               if (!vma->vm_mm) {
-                       name = strncpy(tmp, "[vdso]", sizeof(tmp));
-                       goto got_name;
-               }
-
-               name = strncpy(tmp, "//anon", sizeof(tmp));
-               goto got_name;
-       }
-
-got_name:
-       size = ALIGN(strlen(name)+1, sizeof(u64));
-
-       mmap_event->file_name = name;
-       mmap_event->file_size = size;
-
-       mmap_event->event.header.size = sizeof(mmap_event->event) + size;
-
-       cpuctx = &get_cpu_var(perf_cpu_context);
-       perf_counter_mmap_ctx(&cpuctx->ctx, mmap_event);
-       put_cpu_var(perf_cpu_context);
-
-       rcu_read_lock();
-       /*
-        * doesn't really matter which of the child contexts the
-        * events ends up in.
-        */
-       ctx = rcu_dereference(current->perf_counter_ctxp);
-       if (ctx)
-               perf_counter_mmap_ctx(ctx, mmap_event);
-       rcu_read_unlock();
-
-       kfree(buf);
-}
-
-void __perf_counter_mmap(struct vm_area_struct *vma)
-{
-       struct perf_mmap_event mmap_event;
-
-       if (!atomic_read(&nr_mmap_counters))
-               return;
-
-       mmap_event = (struct perf_mmap_event){
-               .vma    = vma,
-               /* .file_name */
-               /* .file_size */
-               .event  = {
-                       .header = {
-                               .type = PERF_EVENT_MMAP,
-                               .misc = 0,
-                               /* .size */
-                       },
-                       /* .pid */
-                       /* .tid */
-                       .start  = vma->vm_start,
-                       .len    = vma->vm_end - vma->vm_start,
-                       .pgoff  = vma->vm_pgoff,
-               },
-       };
-
-       perf_counter_mmap_event(&mmap_event);
-}
-
-/*
- * IRQ throttle logging
- */
-
-static void perf_log_throttle(struct perf_counter *counter, int enable)
-{
-       struct perf_output_handle handle;
-       int ret;
-
-       struct {
-               struct perf_event_header        header;
-               u64                             time;
-               u64                             id;
-               u64                             stream_id;
-       } throttle_event = {
-               .header = {
-                       .type = PERF_EVENT_THROTTLE,
-                       .misc = 0,
-                       .size = sizeof(throttle_event),
-               },
-               .time           = sched_clock(),
-               .id             = primary_counter_id(counter),
-               .stream_id      = counter->id,
-       };
-
-       if (enable)
-               throttle_event.header.type = PERF_EVENT_UNTHROTTLE;
-
-       ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);
-       if (ret)
-               return;
-
-       perf_output_put(&handle, throttle_event);
-       perf_output_end(&handle);
-}
-
-/*
- * Generic counter overflow handling, sampling.
- */
-
-int perf_counter_overflow(struct perf_counter *counter, int nmi,
-                         struct perf_sample_data *data)
-{
-       int events = atomic_read(&counter->event_limit);
-       int throttle = counter->pmu->unthrottle != NULL;
-       struct hw_perf_counter *hwc = &counter->hw;
-       int ret = 0;
-
-       if (!throttle) {
-               hwc->interrupts++;
-       } else {
-               if (hwc->interrupts != MAX_INTERRUPTS) {
-                       hwc->interrupts++;
-                       if (HZ * hwc->interrupts >
-                                       (u64)sysctl_perf_counter_sample_rate) {
-                               hwc->interrupts = MAX_INTERRUPTS;
-                               perf_log_throttle(counter, 0);
-                               ret = 1;
-                       }
-               } else {
-                       /*
-                        * Keep re-disabling counters even though on the previous
-                        * pass we disabled it - just in case we raced with a
-                        * sched-in and the counter got enabled again:
-                        */
-                       ret = 1;
-               }
-       }
-
-       if (counter->attr.freq) {
-               u64 now = sched_clock();
-               s64 delta = now - hwc->freq_stamp;
-
-               hwc->freq_stamp = now;
-
-               if (delta > 0 && delta < TICK_NSEC)
-                       perf_adjust_period(counter, NSEC_PER_SEC / (int)delta);
-       }
-
-       /*
-        * XXX event_limit might not quite work as expected on inherited
-        * counters
-        */
-
-       counter->pending_kill = POLL_IN;
-       if (events && atomic_dec_and_test(&counter->event_limit)) {
-               ret = 1;
-               counter->pending_kill = POLL_HUP;
-               if (nmi) {
-                       counter->pending_disable = 1;
-                       perf_pending_queue(&counter->pending,
-                                          perf_pending_counter);
-               } else
-                       perf_counter_disable(counter);
-       }
-
-       perf_counter_output(counter, nmi, data);
-       return ret;
-}
-
-/*
- * Generic software counter infrastructure
- */
-
-/*
- * We directly increment counter->count and keep a second value in
- * counter->hw.period_left to count intervals. This period counter
- * is kept in the range [-sample_period, 0] so that we can use the
- * sign as trigger.
- */
-
-static u64 perf_swcounter_set_period(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       u64 period = hwc->last_period;
-       u64 nr, offset;
-       s64 old, val;
-
-       hwc->last_period = hwc->sample_period;
-
-again:
-       old = val = atomic64_read(&hwc->period_left);
-       if (val < 0)
-               return 0;
-
-       nr = div64_u64(period + val, period);
-       offset = nr * period;
-       val -= offset;
-       if (atomic64_cmpxchg(&hwc->period_left, old, val) != old)
-               goto again;
-
-       return nr;
-}
-
-static void perf_swcounter_overflow(struct perf_counter *counter,
-                                   int nmi, struct perf_sample_data *data)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       u64 overflow;
-
-       data->period = counter->hw.last_period;
-       overflow = perf_swcounter_set_period(counter);
-
-       if (hwc->interrupts == MAX_INTERRUPTS)
-               return;
-
-       for (; overflow; overflow--) {
-               if (perf_counter_overflow(counter, nmi, data)) {
-                       /*
-                        * We inhibit the overflow from happening when
-                        * hwc->interrupts == MAX_INTERRUPTS.
-                        */
-                       break;
-               }
-       }
-}
-
-static void perf_swcounter_unthrottle(struct perf_counter *counter)
-{
-       /*
-        * Nothing to do, we already reset hwc->interrupts.
-        */
-}
-
-static void perf_swcounter_add(struct perf_counter *counter, u64 nr,
-                              int nmi, struct perf_sample_data *data)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-
-       atomic64_add(nr, &counter->count);
-
-       if (!hwc->sample_period)
-               return;
-
-       if (!data->regs)
-               return;
-
-       if (!atomic64_add_negative(nr, &hwc->period_left))
-               perf_swcounter_overflow(counter, nmi, data);
-}
-
-static int perf_swcounter_is_counting(struct perf_counter *counter)
-{
-       /*
-        * The counter is active, we're good!
-        */
-       if (counter->state == PERF_COUNTER_STATE_ACTIVE)
-               return 1;
-
-       /*
-        * The counter is off/error, not counting.
-        */
-       if (counter->state != PERF_COUNTER_STATE_INACTIVE)
-               return 0;
-
-       /*
-        * The counter is inactive, if the context is active
-        * we're part of a group that didn't make it on the 'pmu',
-        * not counting.
-        */
-       if (counter->ctx->is_active)
-               return 0;
-
-       /*
-        * We're inactive and the context is too, this means the
-        * task is scheduled out, we're counting events that happen
-        * to us, like migration events.
-        */
-       return 1;
-}
-
-static int perf_swcounter_match(struct perf_counter *counter,
-                               enum perf_type_id type,
-                               u32 event, struct pt_regs *regs)
-{
-       if (!perf_swcounter_is_counting(counter))
-               return 0;
-
-       if (counter->attr.type != type)
-               return 0;
-       if (counter->attr.config != event)
-               return 0;
-
-       if (regs) {
-               if (counter->attr.exclude_user && user_mode(regs))
-                       return 0;
-
-               if (counter->attr.exclude_kernel && !user_mode(regs))
-                       return 0;
-       }
-
-       return 1;
-}
-
-static void perf_swcounter_ctx_event(struct perf_counter_context *ctx,
-                                    enum perf_type_id type,
-                                    u32 event, u64 nr, int nmi,
-                                    struct perf_sample_data *data)
-{
-       struct perf_counter *counter;
-
-       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
-               return;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(counter, &ctx->event_list, event_entry) {
-               if (perf_swcounter_match(counter, type, event, data->regs))
-                       perf_swcounter_add(counter, nr, nmi, data);
-       }
-       rcu_read_unlock();
-}
-
-static int *perf_swcounter_recursion_context(struct perf_cpu_context *cpuctx)
-{
-       if (in_nmi())
-               return &cpuctx->recursion[3];
-
-       if (in_irq())
-               return &cpuctx->recursion[2];
-
-       if (in_softirq())
-               return &cpuctx->recursion[1];
-
-       return &cpuctx->recursion[0];
-}
-
-static void do_perf_swcounter_event(enum perf_type_id type, u32 event,
-                                   u64 nr, int nmi,
-                                   struct perf_sample_data *data)
-{
-       struct perf_cpu_context *cpuctx = &get_cpu_var(perf_cpu_context);
-       int *recursion = perf_swcounter_recursion_context(cpuctx);
-       struct perf_counter_context *ctx;
-
-       if (*recursion)
-               goto out;
-
-       (*recursion)++;
-       barrier();
-
-       perf_swcounter_ctx_event(&cpuctx->ctx, type, event,
-                                nr, nmi, data);
-       rcu_read_lock();
-       /*
-        * doesn't really matter which of the child contexts the
-        * events ends up in.
-        */
-       ctx = rcu_dereference(current->perf_counter_ctxp);
-       if (ctx)
-               perf_swcounter_ctx_event(ctx, type, event, nr, nmi, data);
-       rcu_read_unlock();
-
-       barrier();
-       (*recursion)--;
-
-out:
-       put_cpu_var(perf_cpu_context);
-}
-
-void __perf_swcounter_event(u32 event, u64 nr, int nmi,
-                           struct pt_regs *regs, u64 addr)
-{
-       struct perf_sample_data data = {
-               .regs = regs,
-               .addr = addr,
-       };
-
-       do_perf_swcounter_event(PERF_TYPE_SOFTWARE, event, nr, nmi, &data);
-}
-
-static void perf_swcounter_read(struct perf_counter *counter)
-{
-}
-
-static int perf_swcounter_enable(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-
-       if (hwc->sample_period) {
-               hwc->last_period = hwc->sample_period;
-               perf_swcounter_set_period(counter);
-       }
-       return 0;
-}
-
-static void perf_swcounter_disable(struct perf_counter *counter)
-{
-}
-
-static const struct pmu perf_ops_generic = {
-       .enable         = perf_swcounter_enable,
-       .disable        = perf_swcounter_disable,
-       .read           = perf_swcounter_read,
-       .unthrottle     = perf_swcounter_unthrottle,
-};
-
-/*
- * hrtimer based swcounter callback
- */
-
-static enum hrtimer_restart perf_swcounter_hrtimer(struct hrtimer *hrtimer)
-{
-       enum hrtimer_restart ret = HRTIMER_RESTART;
-       struct perf_sample_data data;
-       struct perf_counter *counter;
-       u64 period;
-
-       counter = container_of(hrtimer, struct perf_counter, hw.hrtimer);
-       counter->pmu->read(counter);
-
-       data.addr = 0;
-       data.regs = get_irq_regs();
-       /*
-        * In case we exclude kernel IPs or are somehow not in interrupt
-        * context, provide the next best thing, the user IP.
-        */
-       if ((counter->attr.exclude_kernel || !data.regs) &&
-                       !counter->attr.exclude_user)
-               data.regs = task_pt_regs(current);
-
-       if (data.regs) {
-               if (perf_counter_overflow(counter, 0, &data))
-                       ret = HRTIMER_NORESTART;
-       }
-
-       period = max_t(u64, 10000, counter->hw.sample_period);
-       hrtimer_forward_now(hrtimer, ns_to_ktime(period));
-
-       return ret;
-}
-
-/*
- * Software counter: cpu wall time clock
- */
-
-static void cpu_clock_perf_counter_update(struct perf_counter *counter)
-{
-       int cpu = raw_smp_processor_id();
-       s64 prev;
-       u64 now;
-
-       now = cpu_clock(cpu);
-       prev = atomic64_read(&counter->hw.prev_count);
-       atomic64_set(&counter->hw.prev_count, now);
-       atomic64_add(now - prev, &counter->count);
-}
-
-static int cpu_clock_perf_counter_enable(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       int cpu = raw_smp_processor_id();
-
-       atomic64_set(&hwc->prev_count, cpu_clock(cpu));
-       hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       hwc->hrtimer.function = perf_swcounter_hrtimer;
-       if (hwc->sample_period) {
-               u64 period = max_t(u64, 10000, hwc->sample_period);
-               __hrtimer_start_range_ns(&hwc->hrtimer,
-                               ns_to_ktime(period), 0,
-                               HRTIMER_MODE_REL, 0);
-       }
-
-       return 0;
-}
-
-static void cpu_clock_perf_counter_disable(struct perf_counter *counter)
-{
-       if (counter->hw.sample_period)
-               hrtimer_cancel(&counter->hw.hrtimer);
-       cpu_clock_perf_counter_update(counter);
-}
-
-static void cpu_clock_perf_counter_read(struct perf_counter *counter)
-{
-       cpu_clock_perf_counter_update(counter);
-}
-
-static const struct pmu perf_ops_cpu_clock = {
-       .enable         = cpu_clock_perf_counter_enable,
-       .disable        = cpu_clock_perf_counter_disable,
-       .read           = cpu_clock_perf_counter_read,
-};
-
-/*
- * Software counter: task time clock
- */
-
-static void task_clock_perf_counter_update(struct perf_counter *counter, u64 now)
-{
-       u64 prev;
-       s64 delta;
-
-       prev = atomic64_xchg(&counter->hw.prev_count, now);
-       delta = now - prev;
-       atomic64_add(delta, &counter->count);
-}
-
-static int task_clock_perf_counter_enable(struct perf_counter *counter)
-{
-       struct hw_perf_counter *hwc = &counter->hw;
-       u64 now;
-
-       now = counter->ctx->time;
-
-       atomic64_set(&hwc->prev_count, now);
-       hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       hwc->hrtimer.function = perf_swcounter_hrtimer;
-       if (hwc->sample_period) {
-               u64 period = max_t(u64, 10000, hwc->sample_period);
-               __hrtimer_start_range_ns(&hwc->hrtimer,
-                               ns_to_ktime(period), 0,
-                               HRTIMER_MODE_REL, 0);
-       }
-
-       return 0;
-}
-
-static void task_clock_perf_counter_disable(struct perf_counter *counter)
-{
-       if (counter->hw.sample_period)
-               hrtimer_cancel(&counter->hw.hrtimer);
-       task_clock_perf_counter_update(counter, counter->ctx->time);
-
-}
-
-static void task_clock_perf_counter_read(struct perf_counter *counter)
-{
-       u64 time;
-
-       if (!in_nmi()) {
-               update_context_time(counter->ctx);
-               time = counter->ctx->time;
-       } else {
-               u64 now = perf_clock();
-               u64 delta = now - counter->ctx->timestamp;
-               time = counter->ctx->time + delta;
-       }
-
-       task_clock_perf_counter_update(counter, time);
-}
-
-static const struct pmu perf_ops_task_clock = {
-       .enable         = task_clock_perf_counter_enable,
-       .disable        = task_clock_perf_counter_disable,
-       .read           = task_clock_perf_counter_read,
-};
-
-#ifdef CONFIG_EVENT_PROFILE
-void perf_tpcounter_event(int event_id, u64 addr, u64 count, void *record,
-                         int entry_size)
-{
-       struct perf_raw_record raw = {
-               .size = entry_size,
-               .data = record,
-       };
-
-       struct perf_sample_data data = {
-               .regs = get_irq_regs(),
-               .addr = addr,
-               .raw = &raw,
-       };
-
-       if (!data.regs)
-               data.regs = task_pt_regs(current);
-
-       do_perf_swcounter_event(PERF_TYPE_TRACEPOINT, event_id, count, 1, &data);
-}
-EXPORT_SYMBOL_GPL(perf_tpcounter_event);
-
-extern int ftrace_profile_enable(int);
-extern void ftrace_profile_disable(int);
-
-static void tp_perf_counter_destroy(struct perf_counter *counter)
-{
-       ftrace_profile_disable(counter->attr.config);
-}
-
-static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)
-{
-       /*
-        * Raw tracepoint data is a severe data leak, only allow root to
-        * have these.
-        */
-       if ((counter->attr.sample_type & PERF_SAMPLE_RAW) &&
-                       perf_paranoid_tracepoint_raw() &&
-                       !capable(CAP_SYS_ADMIN))
-               return ERR_PTR(-EPERM);
-
-       if (ftrace_profile_enable(counter->attr.config))
-               return NULL;
-
-       counter->destroy = tp_perf_counter_destroy;
-
-       return &perf_ops_generic;
-}
-#else
-static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)
-{
-       return NULL;
-}
-#endif
-
-atomic_t perf_swcounter_enabled[PERF_COUNT_SW_MAX];
-
-static void sw_perf_counter_destroy(struct perf_counter *counter)
-{
-       u64 event = counter->attr.config;
-
-       WARN_ON(counter->parent);
-
-       atomic_dec(&perf_swcounter_enabled[event]);
-}
-
-static const struct pmu *sw_perf_counter_init(struct perf_counter *counter)
-{
-       const struct pmu *pmu = NULL;
-       u64 event = counter->attr.config;
-
-       /*
-        * Software counters (currently) can't in general distinguish
-        * between user, kernel and hypervisor events.
-        * However, context switches and cpu migrations are considered
-        * to be kernel events, and page faults are never hypervisor
-        * events.
-        */
-       switch (event) {
-       case PERF_COUNT_SW_CPU_CLOCK:
-               pmu = &perf_ops_cpu_clock;
-
-               break;
-       case PERF_COUNT_SW_TASK_CLOCK:
-               /*
-                * If the user instantiates this as a per-cpu counter,
-                * use the cpu_clock counter instead.
-                */
-               if (counter->ctx->task)
-                       pmu = &perf_ops_task_clock;
-               else
-                       pmu = &perf_ops_cpu_clock;
-
-               break;
-       case PERF_COUNT_SW_PAGE_FAULTS:
-       case PERF_COUNT_SW_PAGE_FAULTS_MIN:
-       case PERF_COUNT_SW_PAGE_FAULTS_MAJ:
-       case PERF_COUNT_SW_CONTEXT_SWITCHES:
-       case PERF_COUNT_SW_CPU_MIGRATIONS:
-               if (!counter->parent) {
-                       atomic_inc(&perf_swcounter_enabled[event]);
-                       counter->destroy = sw_perf_counter_destroy;
-               }
-               pmu = &perf_ops_generic;
-               break;
-       }
-
-       return pmu;
-}
-
-/*
- * Allocate and initialize a counter structure
- */
-static struct perf_counter *
-perf_counter_alloc(struct perf_counter_attr *attr,
-                  int cpu,
-                  struct perf_counter_context *ctx,
-                  struct perf_counter *group_leader,
-                  struct perf_counter *parent_counter,
-                  gfp_t gfpflags)
-{
-       const struct pmu *pmu;
-       struct perf_counter *counter;
-       struct hw_perf_counter *hwc;
-       long err;
-
-       counter = kzalloc(sizeof(*counter), gfpflags);
-       if (!counter)
-               return ERR_PTR(-ENOMEM);
-
-       /*
-        * Single counters are their own group leaders, with an
-        * empty sibling list:
-        */
-       if (!group_leader)
-               group_leader = counter;
-
-       mutex_init(&counter->child_mutex);
-       INIT_LIST_HEAD(&counter->child_list);
-
-       INIT_LIST_HEAD(&counter->list_entry);
-       INIT_LIST_HEAD(&counter->event_entry);
-       INIT_LIST_HEAD(&counter->sibling_list);
-       init_waitqueue_head(&counter->waitq);
-
-       mutex_init(&counter->mmap_mutex);
-
-       counter->cpu            = cpu;
-       counter->attr           = *attr;
-       counter->group_leader   = group_leader;
-       counter->pmu            = NULL;
-       counter->ctx            = ctx;
-       counter->oncpu          = -1;
-
-       counter->parent         = parent_counter;
-
-       counter->ns             = get_pid_ns(current->nsproxy->pid_ns);
-       counter->id             = atomic64_inc_return(&perf_counter_id);
-
-       counter->state          = PERF_COUNTER_STATE_INACTIVE;
-
-       if (attr->disabled)
-               counter->state = PERF_COUNTER_STATE_OFF;
-
-       pmu = NULL;
-
-       hwc = &counter->hw;
-       hwc->sample_period = attr->sample_period;
-       if (attr->freq && attr->sample_freq)
-               hwc->sample_period = 1;
-       hwc->last_period = hwc->sample_period;
-
-       atomic64_set(&hwc->period_left, hwc->sample_period);
-
-       /*
-        * we currently do not support PERF_FORMAT_GROUP on inherited counters
-        */
-       if (attr->inherit && (attr->read_format & PERF_FORMAT_GROUP))
-               goto done;
-
-       switch (attr->type) {
-       case PERF_TYPE_RAW:
-       case PERF_TYPE_HARDWARE:
-       case PERF_TYPE_HW_CACHE:
-               pmu = hw_perf_counter_init(counter);
-               break;
-
-       case PERF_TYPE_SOFTWARE:
-               pmu = sw_perf_counter_init(counter);
-               break;
-
-       case PERF_TYPE_TRACEPOINT:
-               pmu = tp_perf_counter_init(counter);
-               break;
-
-       default:
-               break;
-       }
-done:
-       err = 0;
-       if (!pmu)
-               err = -EINVAL;
-       else if (IS_ERR(pmu))
-               err = PTR_ERR(pmu);
-
-       if (err) {
-               if (counter->ns)
-                       put_pid_ns(counter->ns);
-               kfree(counter);
-               return ERR_PTR(err);
-       }
-
-       counter->pmu = pmu;
-
-       if (!counter->parent) {
-               atomic_inc(&nr_counters);
-               if (counter->attr.mmap)
-                       atomic_inc(&nr_mmap_counters);
-               if (counter->attr.comm)
-                       atomic_inc(&nr_comm_counters);
-               if (counter->attr.task)
-                       atomic_inc(&nr_task_counters);
-       }
-
-       return counter;
-}
-
-static int perf_copy_attr(struct perf_counter_attr __user *uattr,
-                         struct perf_counter_attr *attr)
-{
-       int ret;
-       u32 size;
-
-       if (!access_ok(VERIFY_WRITE, uattr, PERF_ATTR_SIZE_VER0))
-               return -EFAULT;
-
-       /*
-        * zero the full structure, so that a short copy will be nice.
-        */
-       memset(attr, 0, sizeof(*attr));
-
-       ret = get_user(size, &uattr->size);
-       if (ret)
-               return ret;
-
-       if (size > PAGE_SIZE)   /* silly large */
-               goto err_size;
-
-       if (!size)              /* abi compat */
-               size = PERF_ATTR_SIZE_VER0;
-
-       if (size < PERF_ATTR_SIZE_VER0)
-               goto err_size;
-
-       /*
-        * If we're handed a bigger struct than we know of,
-        * ensure all the unknown bits are 0.
-        */
-       if (size > sizeof(*attr)) {
-               unsigned long val;
-               unsigned long __user *addr;
-               unsigned long __user *end;
-
-               addr = PTR_ALIGN((void __user *)uattr + sizeof(*attr),
-                               sizeof(unsigned long));
-               end  = PTR_ALIGN((void __user *)uattr + size,
-                               sizeof(unsigned long));
-
-               for (; addr < end; addr += sizeof(unsigned long)) {
-                       ret = get_user(val, addr);
-                       if (ret)
-                               return ret;
-                       if (val)
-                               goto err_size;
-               }
-               size = sizeof(*attr);
-       }
-
-       ret = copy_from_user(attr, uattr, size);
-       if (ret)
-               return -EFAULT;
-
-       /*
-        * If the type exists, the corresponding creation will verify
-        * the attr->config.
-        */
-       if (attr->type >= PERF_TYPE_MAX)
-               return -EINVAL;
-
-       if (attr->__reserved_1 || attr->__reserved_2 || attr->__reserved_3)
-               return -EINVAL;
-
-       if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
-               return -EINVAL;
-
-       if (attr->read_format & ~(PERF_FORMAT_MAX-1))
-               return -EINVAL;
-
-out:
-       return ret;
-
-err_size:
-       put_user(sizeof(*attr), &uattr->size);
-       ret = -E2BIG;
-       goto out;
-}
-
-int perf_counter_set_output(struct perf_counter *counter, int output_fd)
-{
-       struct perf_counter *output_counter = NULL;
-       struct file *output_file = NULL;
-       struct perf_counter *old_output;
-       int fput_needed = 0;
-       int ret = -EINVAL;
-
-       if (!output_fd)
-               goto set;
-
-       output_file = fget_light(output_fd, &fput_needed);
-       if (!output_file)
-               return -EBADF;
-
-       if (output_file->f_op != &perf_fops)
-               goto out;
-
-       output_counter = output_file->private_data;
-
-       /* Don't chain output fds */
-       if (output_counter->output)
-               goto out;
-
-       /* Don't set an output fd when we already have an output channel */
-       if (counter->data)
-               goto out;
-
-       atomic_long_inc(&output_file->f_count);
-
-set:
-       mutex_lock(&counter->mmap_mutex);
-       old_output = counter->output;
-       rcu_assign_pointer(counter->output, output_counter);
-       mutex_unlock(&counter->mmap_mutex);
-
-       if (old_output) {
-               /*
-                * we need to make sure no existing perf_output_*()
-                * is still referencing this counter.
-                */
-               synchronize_rcu();
-               fput(old_output->filp);
-       }
-
-       ret = 0;
-out:
-       fput_light(output_file, fput_needed);
-       return ret;
-}
-
-/**
- * sys_perf_counter_open - open a performance counter, associate it to a task/cpu
- *
- * @attr_uptr: event type attributes for monitoring/sampling
- * @pid:               target pid
- * @cpu:               target cpu
- * @group_fd:          group leader counter fd
- */
-SYSCALL_DEFINE5(perf_counter_open,
-               struct perf_counter_attr __user *, attr_uptr,
-               pid_t, pid, int, cpu, int, group_fd, unsigned long, flags)
-{
-       struct perf_counter *counter, *group_leader;
-       struct perf_counter_attr attr;
-       struct perf_counter_context *ctx;
-       struct file *counter_file = NULL;
-       struct file *group_file = NULL;
-       int fput_needed = 0;
-       int fput_needed2 = 0;
-       int err;
-
-       /* for future expandability... */
-       if (flags & ~(PERF_FLAG_FD_NO_GROUP | PERF_FLAG_FD_OUTPUT))
-               return -EINVAL;
-
-       err = perf_copy_attr(attr_uptr, &attr);
-       if (err)
-               return err;
-
-       if (!attr.exclude_kernel) {
-               if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-       }
-
-       if (attr.freq) {
-               if (attr.sample_freq > sysctl_perf_counter_sample_rate)
-                       return -EINVAL;
-       }
-
-       /*
-        * Get the target context (task or percpu):
-        */
-       ctx = find_get_context(pid, cpu);
-       if (IS_ERR(ctx))
-               return PTR_ERR(ctx);
-
-       /*
-        * Look up the group leader (we will attach this counter to it):
-        */
-       group_leader = NULL;
-       if (group_fd != -1 && !(flags & PERF_FLAG_FD_NO_GROUP)) {
-               err = -EINVAL;
-               group_file = fget_light(group_fd, &fput_needed);
-               if (!group_file)
-                       goto err_put_context;
-               if (group_file->f_op != &perf_fops)
-                       goto err_put_context;
-
-               group_leader = group_file->private_data;
-               /*
-                * Do not allow a recursive hierarchy (this new sibling
-                * becoming part of another group-sibling):
-                */
-               if (group_leader->group_leader != group_leader)
-                       goto err_put_context;
-               /*
-                * Do not allow to attach to a group in a different
-                * task or CPU context:
-                */
-               if (group_leader->ctx != ctx)
-                       goto err_put_context;
-               /*
-                * Only a group leader can be exclusive or pinned
-                */
-               if (attr.exclusive || attr.pinned)
-                       goto err_put_context;
-       }
-
-       counter = perf_counter_alloc(&attr, cpu, ctx, group_leader,
-                                    NULL, GFP_KERNEL);
-       err = PTR_ERR(counter);
-       if (IS_ERR(counter))
-               goto err_put_context;
-
-       err = anon_inode_getfd("[perf_counter]", &perf_fops, counter, 0);
-       if (err < 0)
-               goto err_free_put_context;
-
-       counter_file = fget_light(err, &fput_needed2);
-       if (!counter_file)
-               goto err_free_put_context;
-
-       if (flags & PERF_FLAG_FD_OUTPUT) {
-               err = perf_counter_set_output(counter, group_fd);
-               if (err)
-                       goto err_fput_free_put_context;
-       }
-
-       counter->filp = counter_file;
-       WARN_ON_ONCE(ctx->parent_ctx);
-       mutex_lock(&ctx->mutex);
-       perf_install_in_context(ctx, counter, cpu);
-       ++ctx->generation;
-       mutex_unlock(&ctx->mutex);
-
-       counter->owner = current;
-       get_task_struct(current);
-       mutex_lock(&current->perf_counter_mutex);
-       list_add_tail(&counter->owner_entry, &current->perf_counter_list);
-       mutex_unlock(&current->perf_counter_mutex);
-
-err_fput_free_put_context:
-       fput_light(counter_file, fput_needed2);
-
-err_free_put_context:
-       if (err < 0)
-               kfree(counter);
-
-err_put_context:
-       if (err < 0)
-               put_ctx(ctx);
-
-       fput_light(group_file, fput_needed);
-
-       return err;
-}
-
-/*
- * inherit a counter from parent task to child task:
- */
-static struct perf_counter *
-inherit_counter(struct perf_counter *parent_counter,
-             struct task_struct *parent,
-             struct perf_counter_context *parent_ctx,
-             struct task_struct *child,
-             struct perf_counter *group_leader,
-             struct perf_counter_context *child_ctx)
-{
-       struct perf_counter *child_counter;
-
-       /*
-        * Instead of creating recursive hierarchies of counters,
-        * we link inherited counters back to the original parent,
-        * which has a filp for sure, which we use as the reference
-        * count:
-        */
-       if (parent_counter->parent)
-               parent_counter = parent_counter->parent;
-
-       child_counter = perf_counter_alloc(&parent_counter->attr,
-                                          parent_counter->cpu, child_ctx,
-                                          group_leader, parent_counter,
-                                          GFP_KERNEL);
-       if (IS_ERR(child_counter))
-               return child_counter;
-       get_ctx(child_ctx);
-
-       /*
-        * Make the child state follow the state of the parent counter,
-        * not its attr.disabled bit.  We hold the parent's mutex,
-        * so we won't race with perf_counter_{en, dis}able_family.
-        */
-       if (parent_counter->state >= PERF_COUNTER_STATE_INACTIVE)
-               child_counter->state = PERF_COUNTER_STATE_INACTIVE;
-       else
-               child_counter->state = PERF_COUNTER_STATE_OFF;
-
-       if (parent_counter->attr.freq)
-               child_counter->hw.sample_period = parent_counter->hw.sample_period;
-
-       /*
-        * Link it up in the child's context:
-        */
-       add_counter_to_ctx(child_counter, child_ctx);
-
-       /*
-        * Get a reference to the parent filp - we will fput it
-        * when the child counter exits. This is safe to do because
-        * we are in the parent and we know that the filp still
-        * exists and has a nonzero count:
-        */
-       atomic_long_inc(&parent_counter->filp->f_count);
-
-       /*
-        * Link this into the parent counter's child list
-        */
-       WARN_ON_ONCE(parent_counter->ctx->parent_ctx);
-       mutex_lock(&parent_counter->child_mutex);
-       list_add_tail(&child_counter->child_list, &parent_counter->child_list);
-       mutex_unlock(&parent_counter->child_mutex);
-
-       return child_counter;
-}
-
-static int inherit_group(struct perf_counter *parent_counter,
-             struct task_struct *parent,
-             struct perf_counter_context *parent_ctx,
-             struct task_struct *child,
-             struct perf_counter_context *child_ctx)
-{
-       struct perf_counter *leader;
-       struct perf_counter *sub;
-       struct perf_counter *child_ctr;
-
-       leader = inherit_counter(parent_counter, parent, parent_ctx,
-                                child, NULL, child_ctx);
-       if (IS_ERR(leader))
-               return PTR_ERR(leader);
-       list_for_each_entry(sub, &parent_counter->sibling_list, list_entry) {
-               child_ctr = inherit_counter(sub, parent, parent_ctx,
-                                           child, leader, child_ctx);
-               if (IS_ERR(child_ctr))
-                       return PTR_ERR(child_ctr);
-       }
-       return 0;
-}
-
-static void sync_child_counter(struct perf_counter *child_counter,
-                              struct task_struct *child)
-{
-       struct perf_counter *parent_counter = child_counter->parent;
-       u64 child_val;
-
-       if (child_counter->attr.inherit_stat)
-               perf_counter_read_event(child_counter, child);
-
-       child_val = atomic64_read(&child_counter->count);
-
-       /*
-        * Add back the child's count to the parent's count:
-        */
-       atomic64_add(child_val, &parent_counter->count);
-       atomic64_add(child_counter->total_time_enabled,
-                    &parent_counter->child_total_time_enabled);
-       atomic64_add(child_counter->total_time_running,
-                    &parent_counter->child_total_time_running);
-
-       /*
-        * Remove this counter from the parent's list
-        */
-       WARN_ON_ONCE(parent_counter->ctx->parent_ctx);
-       mutex_lock(&parent_counter->child_mutex);
-       list_del_init(&child_counter->child_list);
-       mutex_unlock(&parent_counter->child_mutex);
-
-       /*
-        * Release the parent counter, if this was the last
-        * reference to it.
-        */
-       fput(parent_counter->filp);
-}
-
-static void
-__perf_counter_exit_task(struct perf_counter *child_counter,
-                        struct perf_counter_context *child_ctx,
-                        struct task_struct *child)
-{
-       struct perf_counter *parent_counter;
-
-       update_counter_times(child_counter);
-       perf_counter_remove_from_context(child_counter);
-
-       parent_counter = child_counter->parent;
-       /*
-        * It can happen that parent exits first, and has counters
-        * that are still around due to the child reference. These
-        * counters need to be zapped - but otherwise linger.
-        */
-       if (parent_counter) {
-               sync_child_counter(child_counter, child);
-               free_counter(child_counter);
-       }
-}
-
-/*
- * When a child task exits, feed back counter values to parent counters.
- */
-void perf_counter_exit_task(struct task_struct *child)
-{
-       struct perf_counter *child_counter, *tmp;
-       struct perf_counter_context *child_ctx;
-       unsigned long flags;
-
-       if (likely(!child->perf_counter_ctxp)) {
-               perf_counter_task(child, NULL, 0);
-               return;
-       }
-
-       local_irq_save(flags);
-       /*
-        * We can't reschedule here because interrupts are disabled,
-        * and either child is current or it is a task that can't be
-        * scheduled, so we are now safe from rescheduling changing
-        * our context.
-        */
-       child_ctx = child->perf_counter_ctxp;
-       __perf_counter_task_sched_out(child_ctx);
-
-       /*
-        * Take the context lock here so that if find_get_context is
-        * reading child->perf_counter_ctxp, we wait until it has
-        * incremented the context's refcount before we do put_ctx below.
-        */
-       spin_lock(&child_ctx->lock);
-       child->perf_counter_ctxp = NULL;
-       /*
-        * If this context is a clone; unclone it so it can't get
-        * swapped to another process while we're removing all
-        * the counters from it.
-        */
-       unclone_ctx(child_ctx);
-       spin_unlock_irqrestore(&child_ctx->lock, flags);
-
-       /*
-        * Report the task dead after unscheduling the counters so that we
-        * won't get any samples after PERF_EVENT_EXIT. We can however still
-        * get a few PERF_EVENT_READ events.
-        */
-       perf_counter_task(child, child_ctx, 0);
-
-       /*
-        * We can recurse on the same lock type through:
-        *
-        *   __perf_counter_exit_task()
-        *     sync_child_counter()
-        *       fput(parent_counter->filp)
-        *         perf_release()
-        *           mutex_lock(&ctx->mutex)
-        *
-        * But since its the parent context it won't be the same instance.
-        */
-       mutex_lock_nested(&child_ctx->mutex, SINGLE_DEPTH_NESTING);
-
-again:
-       list_for_each_entry_safe(child_counter, tmp, &child_ctx->counter_list,
-                                list_entry)
-               __perf_counter_exit_task(child_counter, child_ctx, child);
-
-       /*
-        * If the last counter was a group counter, it will have appended all
-        * its siblings to the list, but we obtained 'tmp' before that which
-        * will still point to the list head terminating the iteration.
-        */
-       if (!list_empty(&child_ctx->counter_list))
-               goto again;
-
-       mutex_unlock(&child_ctx->mutex);
-
-       put_ctx(child_ctx);
-}
-
-/*
- * free an unexposed, unused context as created by inheritance by
- * init_task below, used by fork() in case of fail.
- */
-void perf_counter_free_task(struct task_struct *task)
-{
-       struct perf_counter_context *ctx = task->perf_counter_ctxp;
-       struct perf_counter *counter, *tmp;
-
-       if (!ctx)
-               return;
-
-       mutex_lock(&ctx->mutex);
-again:
-       list_for_each_entry_safe(counter, tmp, &ctx->counter_list, list_entry) {
-               struct perf_counter *parent = counter->parent;
-
-               if (WARN_ON_ONCE(!parent))
-                       continue;
-
-               mutex_lock(&parent->child_mutex);
-               list_del_init(&counter->child_list);
-               mutex_unlock(&parent->child_mutex);
-
-               fput(parent->filp);
-
-               list_del_counter(counter, ctx);
-               free_counter(counter);
-       }
-
-       if (!list_empty(&ctx->counter_list))
-               goto again;
-
-       mutex_unlock(&ctx->mutex);
-
-       put_ctx(ctx);
-}
-
-/*
- * Initialize the perf_counter context in task_struct
- */
-int perf_counter_init_task(struct task_struct *child)
-{
-       struct perf_counter_context *child_ctx, *parent_ctx;
-       struct perf_counter_context *cloned_ctx;
-       struct perf_counter *counter;
-       struct task_struct *parent = current;
-       int inherited_all = 1;
-       int ret = 0;
-
-       child->perf_counter_ctxp = NULL;
-
-       mutex_init(&child->perf_counter_mutex);
-       INIT_LIST_HEAD(&child->perf_counter_list);
-
-       if (likely(!parent->perf_counter_ctxp))
-               return 0;
-
-       /*
-        * This is executed from the parent task context, so inherit
-        * counters that have been marked for cloning.
-        * First allocate and initialize a context for the child.
-        */
-
-       child_ctx = kmalloc(sizeof(struct perf_counter_context), GFP_KERNEL);
-       if (!child_ctx)
-               return -ENOMEM;
-
-       __perf_counter_init_context(child_ctx, child);
-       child->perf_counter_ctxp = child_ctx;
-       get_task_struct(child);
-
-       /*
-        * If the parent's context is a clone, pin it so it won't get
-        * swapped under us.
-        */
-       parent_ctx = perf_pin_task_context(parent);
-
-       /*
-        * No need to check if parent_ctx != NULL here; since we saw
-        * it non-NULL earlier, the only reason for it to become NULL
-        * is if we exit, and since we're currently in the middle of
-        * a fork we can't be exiting at the same time.
-        */
-
-       /*
-        * Lock the parent list. No need to lock the child - not PID
-        * hashed yet and not running, so nobody can access it.
-        */
-       mutex_lock(&parent_ctx->mutex);
-
-       /*
-        * We dont have to disable NMIs - we are only looking at
-        * the list, not manipulating it:
-        */
-       list_for_each_entry_rcu(counter, &parent_ctx->event_list, event_entry) {
-               if (counter != counter->group_leader)
-                       continue;
-
-               if (!counter->attr.inherit) {
-                       inherited_all = 0;
-                       continue;
-               }
-
-               ret = inherit_group(counter, parent, parent_ctx,
-                                            child, child_ctx);
-               if (ret) {
-                       inherited_all = 0;
-                       break;
-               }
-       }
-
-       if (inherited_all) {
-               /*
-                * Mark the child context as a clone of the parent
-                * context, or of whatever the parent is a clone of.
-                * Note that if the parent is a clone, it could get
-                * uncloned at any point, but that doesn't matter
-                * because the list of counters and the generation
-                * count can't have changed since we took the mutex.
-                */
-               cloned_ctx = rcu_dereference(parent_ctx->parent_ctx);
-               if (cloned_ctx) {
-                       child_ctx->parent_ctx = cloned_ctx;
-                       child_ctx->parent_gen = parent_ctx->parent_gen;
-               } else {
-                       child_ctx->parent_ctx = parent_ctx;
-                       child_ctx->parent_gen = parent_ctx->generation;
-               }
-               get_ctx(child_ctx->parent_ctx);
-       }
-
-       mutex_unlock(&parent_ctx->mutex);
-
-       perf_unpin_context(parent_ctx);
-
-       return ret;
-}
-
-static void __cpuinit perf_counter_init_cpu(int cpu)
-{
-       struct perf_cpu_context *cpuctx;
-
-       cpuctx = &per_cpu(perf_cpu_context, cpu);
-       __perf_counter_init_context(&cpuctx->ctx, NULL);
-
-       spin_lock(&perf_resource_lock);
-       cpuctx->max_pertask = perf_max_counters - perf_reserved_percpu;
-       spin_unlock(&perf_resource_lock);
-
-       hw_perf_counter_setup(cpu);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-static void __perf_counter_exit_cpu(void *info)
-{
-       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
-       struct perf_counter_context *ctx = &cpuctx->ctx;
-       struct perf_counter *counter, *tmp;
-
-       list_for_each_entry_safe(counter, tmp, &ctx->counter_list, list_entry)
-               __perf_counter_remove_from_context(counter);
-}
-static void perf_counter_exit_cpu(int cpu)
-{
-       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
-       struct perf_counter_context *ctx = &cpuctx->ctx;
-
-       mutex_lock(&ctx->mutex);
-       smp_call_function_single(cpu, __perf_counter_exit_cpu, NULL, 1);
-       mutex_unlock(&ctx->mutex);
-}
-#else
-static inline void perf_counter_exit_cpu(int cpu) { }
-#endif
-
-static int __cpuinit
-perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
-{
-       unsigned int cpu = (long)hcpu;
-
-       switch (action) {
-
-       case CPU_UP_PREPARE:
-       case CPU_UP_PREPARE_FROZEN:
-               perf_counter_init_cpu(cpu);
-               break;
-
-       case CPU_ONLINE:
-       case CPU_ONLINE_FROZEN:
-               hw_perf_counter_setup_online(cpu);
-               break;
-
-       case CPU_DOWN_PREPARE:
-       case CPU_DOWN_PREPARE_FROZEN:
-               perf_counter_exit_cpu(cpu);
-               break;
-
-       default:
-               break;
-       }
-
-       return NOTIFY_OK;
-}
-
-/*
- * This has to have a higher priority than migration_notifier in sched.c.
- */
-static struct notifier_block __cpuinitdata perf_cpu_nb = {
-       .notifier_call          = perf_cpu_notify,
-       .priority               = 20,
-};
-
-void __init perf_counter_init(void)
-{
-       perf_cpu_notify(&perf_cpu_nb, (unsigned long)CPU_UP_PREPARE,
-                       (void *)(long)smp_processor_id());
-       perf_cpu_notify(&perf_cpu_nb, (unsigned long)CPU_ONLINE,
-                       (void *)(long)smp_processor_id());
-       register_cpu_notifier(&perf_cpu_nb);
-}
-
-static ssize_t perf_show_reserve_percpu(struct sysdev_class *class, char *buf)
-{
-       return sprintf(buf, "%d\n", perf_reserved_percpu);
-}
-
-static ssize_t
-perf_set_reserve_percpu(struct sysdev_class *class,
-                       const char *buf,
-                       size_t count)
-{
-       struct perf_cpu_context *cpuctx;
-       unsigned long val;
-       int err, cpu, mpt;
-
-       err = strict_strtoul(buf, 10, &val);
-       if (err)
-               return err;
-       if (val > perf_max_counters)
-               return -EINVAL;
-
-       spin_lock(&perf_resource_lock);
-       perf_reserved_percpu = val;
-       for_each_online_cpu(cpu) {
-               cpuctx = &per_cpu(perf_cpu_context, cpu);
-               spin_lock_irq(&cpuctx->ctx.lock);
-               mpt = min(perf_max_counters - cpuctx->ctx.nr_counters,
-                         perf_max_counters - perf_reserved_percpu);
-               cpuctx->max_pertask = mpt;
-               spin_unlock_irq(&cpuctx->ctx.lock);
-       }
-       spin_unlock(&perf_resource_lock);
-
-       return count;
-}
-
-static ssize_t perf_show_overcommit(struct sysdev_class *class, char *buf)
-{
-       return sprintf(buf, "%d\n", perf_overcommit);
-}
-
-static ssize_t
-perf_set_overcommit(struct sysdev_class *class, const char *buf, size_t count)
-{
-       unsigned long val;
-       int err;
-
-       err = strict_strtoul(buf, 10, &val);
-       if (err)
-               return err;
-       if (val > 1)
-               return -EINVAL;
-
-       spin_lock(&perf_resource_lock);
-       perf_overcommit = val;
-       spin_unlock(&perf_resource_lock);
-
-       return count;
-}
-
-static SYSDEV_CLASS_ATTR(
-                               reserve_percpu,
-                               0644,
-                               perf_show_reserve_percpu,
-                               perf_set_reserve_percpu
-                       );
-
-static SYSDEV_CLASS_ATTR(
-                               overcommit,
-                               0644,
-                               perf_show_overcommit,
-                               perf_set_overcommit
-                       );
-
-static struct attribute *perfclass_attrs[] = {
-       &attr_reserve_percpu.attr,
-       &attr_overcommit.attr,
-       NULL
-};
-
-static struct attribute_group perfclass_attr_group = {
-       .attrs                  = perfclass_attrs,
-       .name                   = "perf_counters",
-};
-
-static int __init perf_counter_sysfs_init(void)
-{
-       return sysfs_create_group(&cpu_sysdev_class.kset.kobj,
-                                 &perfclass_attr_group);
-}
-device_initcall(perf_counter_sysfs_init);
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
new file mode 100644 (file)
index 0000000..76ac4db
--- /dev/null
@@ -0,0 +1,5000 @@
+/*
+ * Performance events core code:
+ *
+ *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
+ *  Copyright  Â©  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
+ *
+ * For licensing details see kernel-base/COPYING
+ */
+
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/cpu.h>
+#include <linux/smp.h>
+#include <linux/file.h>
+#include <linux/poll.h>
+#include <linux/sysfs.h>
+#include <linux/dcache.h>
+#include <linux/percpu.h>
+#include <linux/ptrace.h>
+#include <linux/vmstat.h>
+#include <linux/hardirq.h>
+#include <linux/rculist.h>
+#include <linux/uaccess.h>
+#include <linux/syscalls.h>
+#include <linux/anon_inodes.h>
+#include <linux/kernel_stat.h>
+#include <linux/perf_event.h>
+
+#include <asm/irq_regs.h>
+
+/*
+ * Each CPU has a list of per CPU events:
+ */
+DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context);
+
+int perf_max_events __read_mostly = 1;
+static int perf_reserved_percpu __read_mostly;
+static int perf_overcommit __read_mostly = 1;
+
+static atomic_t nr_events __read_mostly;
+static atomic_t nr_mmap_events __read_mostly;
+static atomic_t nr_comm_events __read_mostly;
+static atomic_t nr_task_events __read_mostly;
+
+/*
+ * perf event paranoia level:
+ *  -1 - not paranoid at all
+ *   0 - disallow raw tracepoint access for unpriv
+ *   1 - disallow cpu events for unpriv
+ *   2 - disallow kernel profiling for unpriv
+ */
+int sysctl_perf_event_paranoid __read_mostly = 1;
+
+static inline bool perf_paranoid_tracepoint_raw(void)
+{
+       return sysctl_perf_event_paranoid > -1;
+}
+
+static inline bool perf_paranoid_cpu(void)
+{
+       return sysctl_perf_event_paranoid > 0;
+}
+
+static inline bool perf_paranoid_kernel(void)
+{
+       return sysctl_perf_event_paranoid > 1;
+}
+
+int sysctl_perf_event_mlock __read_mostly = 512; /* 'free' kb per user */
+
+/*
+ * max perf event sample rate
+ */
+int sysctl_perf_event_sample_rate __read_mostly = 100000;
+
+static atomic64_t perf_event_id;
+
+/*
+ * Lock for (sysadmin-configurable) event reservations:
+ */
+static DEFINE_SPINLOCK(perf_resource_lock);
+
+/*
+ * Architecture provided APIs - weak aliases:
+ */
+extern __weak const struct pmu *hw_perf_event_init(struct perf_event *event)
+{
+       return NULL;
+}
+
+void __weak hw_perf_disable(void)              { barrier(); }
+void __weak hw_perf_enable(void)               { barrier(); }
+
+void __weak hw_perf_event_setup(int cpu)       { barrier(); }
+void __weak hw_perf_event_setup_online(int cpu)        { barrier(); }
+
+int __weak
+hw_perf_group_sched_in(struct perf_event *group_leader,
+              struct perf_cpu_context *cpuctx,
+              struct perf_event_context *ctx, int cpu)
+{
+       return 0;
+}
+
+void __weak perf_event_print_debug(void)       { }
+
+static DEFINE_PER_CPU(int, perf_disable_count);
+
+void __perf_disable(void)
+{
+       __get_cpu_var(perf_disable_count)++;
+}
+
+bool __perf_enable(void)
+{
+       return !--__get_cpu_var(perf_disable_count);
+}
+
+void perf_disable(void)
+{
+       __perf_disable();
+       hw_perf_disable();
+}
+
+void perf_enable(void)
+{
+       if (__perf_enable())
+               hw_perf_enable();
+}
+
+static void get_ctx(struct perf_event_context *ctx)
+{
+       WARN_ON(!atomic_inc_not_zero(&ctx->refcount));
+}
+
+static void free_ctx(struct rcu_head *head)
+{
+       struct perf_event_context *ctx;
+
+       ctx = container_of(head, struct perf_event_context, rcu_head);
+       kfree(ctx);
+}
+
+static void put_ctx(struct perf_event_context *ctx)
+{
+       if (atomic_dec_and_test(&ctx->refcount)) {
+               if (ctx->parent_ctx)
+                       put_ctx(ctx->parent_ctx);
+               if (ctx->task)
+                       put_task_struct(ctx->task);
+               call_rcu(&ctx->rcu_head, free_ctx);
+       }
+}
+
+static void unclone_ctx(struct perf_event_context *ctx)
+{
+       if (ctx->parent_ctx) {
+               put_ctx(ctx->parent_ctx);
+               ctx->parent_ctx = NULL;
+       }
+}
+
+/*
+ * If we inherit events we want to return the parent event id
+ * to userspace.
+ */
+static u64 primary_event_id(struct perf_event *event)
+{
+       u64 id = event->id;
+
+       if (event->parent)
+               id = event->parent->id;
+
+       return id;
+}
+
+/*
+ * Get the perf_event_context for a task and lock it.
+ * This has to cope with with the fact that until it is locked,
+ * the context could get moved to another task.
+ */
+static struct perf_event_context *
+perf_lock_task_context(struct task_struct *task, unsigned long *flags)
+{
+       struct perf_event_context *ctx;
+
+       rcu_read_lock();
+ retry:
+       ctx = rcu_dereference(task->perf_event_ctxp);
+       if (ctx) {
+               /*
+                * If this context is a clone of another, it might
+                * get swapped for another underneath us by
+                * perf_event_task_sched_out, though the
+                * rcu_read_lock() protects us from any context
+                * getting freed.  Lock the context and check if it
+                * got swapped before we could get the lock, and retry
+                * if so.  If we locked the right context, then it
+                * can't get swapped on us any more.
+                */
+               spin_lock_irqsave(&ctx->lock, *flags);
+               if (ctx != rcu_dereference(task->perf_event_ctxp)) {
+                       spin_unlock_irqrestore(&ctx->lock, *flags);
+                       goto retry;
+               }
+
+               if (!atomic_inc_not_zero(&ctx->refcount)) {
+                       spin_unlock_irqrestore(&ctx->lock, *flags);
+                       ctx = NULL;
+               }
+       }
+       rcu_read_unlock();
+       return ctx;
+}
+
+/*
+ * Get the context for a task and increment its pin_count so it
+ * can't get swapped to another task.  This also increments its
+ * reference count so that the context can't get freed.
+ */
+static struct perf_event_context *perf_pin_task_context(struct task_struct *task)
+{
+       struct perf_event_context *ctx;
+       unsigned long flags;
+
+       ctx = perf_lock_task_context(task, &flags);
+       if (ctx) {
+               ++ctx->pin_count;
+               spin_unlock_irqrestore(&ctx->lock, flags);
+       }
+       return ctx;
+}
+
+static void perf_unpin_context(struct perf_event_context *ctx)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&ctx->lock, flags);
+       --ctx->pin_count;
+       spin_unlock_irqrestore(&ctx->lock, flags);
+       put_ctx(ctx);
+}
+
+/*
+ * Add a event from the lists for its context.
+ * Must be called with ctx->mutex and ctx->lock held.
+ */
+static void
+list_add_event(struct perf_event *event, struct perf_event_context *ctx)
+{
+       struct perf_event *group_leader = event->group_leader;
+
+       /*
+        * Depending on whether it is a standalone or sibling event,
+        * add it straight to the context's event list, or to the group
+        * leader's sibling list:
+        */
+       if (group_leader == event)
+               list_add_tail(&event->group_entry, &ctx->group_list);
+       else {
+               list_add_tail(&event->group_entry, &group_leader->sibling_list);
+               group_leader->nr_siblings++;
+       }
+
+       list_add_rcu(&event->event_entry, &ctx->event_list);
+       ctx->nr_events++;
+       if (event->attr.inherit_stat)
+               ctx->nr_stat++;
+}
+
+/*
+ * Remove a event from the lists for its context.
+ * Must be called with ctx->mutex and ctx->lock held.
+ */
+static void
+list_del_event(struct perf_event *event, struct perf_event_context *ctx)
+{
+       struct perf_event *sibling, *tmp;
+
+       if (list_empty(&event->group_entry))
+               return;
+       ctx->nr_events--;
+       if (event->attr.inherit_stat)
+               ctx->nr_stat--;
+
+       list_del_init(&event->group_entry);
+       list_del_rcu(&event->event_entry);
+
+       if (event->group_leader != event)
+               event->group_leader->nr_siblings--;
+
+       /*
+        * If this was a group event with sibling events then
+        * upgrade the siblings to singleton events by adding them
+        * to the context list directly:
+        */
+       list_for_each_entry_safe(sibling, tmp, &event->sibling_list, group_entry) {
+
+               list_move_tail(&sibling->group_entry, &ctx->group_list);
+               sibling->group_leader = sibling;
+       }
+}
+
+static void
+event_sched_out(struct perf_event *event,
+                 struct perf_cpu_context *cpuctx,
+                 struct perf_event_context *ctx)
+{
+       if (event->state != PERF_EVENT_STATE_ACTIVE)
+               return;
+
+       event->state = PERF_EVENT_STATE_INACTIVE;
+       if (event->pending_disable) {
+               event->pending_disable = 0;
+               event->state = PERF_EVENT_STATE_OFF;
+       }
+       event->tstamp_stopped = ctx->time;
+       event->pmu->disable(event);
+       event->oncpu = -1;
+
+       if (!is_software_event(event))
+               cpuctx->active_oncpu--;
+       ctx->nr_active--;
+       if (event->attr.exclusive || !cpuctx->active_oncpu)
+               cpuctx->exclusive = 0;
+}
+
+static void
+group_sched_out(struct perf_event *group_event,
+               struct perf_cpu_context *cpuctx,
+               struct perf_event_context *ctx)
+{
+       struct perf_event *event;
+
+       if (group_event->state != PERF_EVENT_STATE_ACTIVE)
+               return;
+
+       event_sched_out(group_event, cpuctx, ctx);
+
+       /*
+        * Schedule out siblings (if any):
+        */
+       list_for_each_entry(event, &group_event->sibling_list, group_entry)
+               event_sched_out(event, cpuctx, ctx);
+
+       if (group_event->attr.exclusive)
+               cpuctx->exclusive = 0;
+}
+
+/*
+ * Cross CPU call to remove a performance event
+ *
+ * We disable the event on the hardware level first. After that we
+ * remove it from the context list.
+ */
+static void __perf_event_remove_from_context(void *info)
+{
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event *event = info;
+       struct perf_event_context *ctx = event->ctx;
+
+       /*
+        * If this is a task context, we need to check whether it is
+        * the current task context of this cpu. If not it has been
+        * scheduled out before the smp call arrived.
+        */
+       if (ctx->task && cpuctx->task_ctx != ctx)
+               return;
+
+       spin_lock(&ctx->lock);
+       /*
+        * Protect the list operation against NMI by disabling the
+        * events on a global level.
+        */
+       perf_disable();
+
+       event_sched_out(event, cpuctx, ctx);
+
+       list_del_event(event, ctx);
+
+       if (!ctx->task) {
+               /*
+                * Allow more per task events with respect to the
+                * reservation:
+                */
+               cpuctx->max_pertask =
+                       min(perf_max_events - ctx->nr_events,
+                           perf_max_events - perf_reserved_percpu);
+       }
+
+       perf_enable();
+       spin_unlock(&ctx->lock);
+}
+
+
+/*
+ * Remove the event from a task's (or a CPU's) list of events.
+ *
+ * Must be called with ctx->mutex held.
+ *
+ * CPU events are removed with a smp call. For task events we only
+ * call when the task is on a CPU.
+ *
+ * If event->ctx is a cloned context, callers must make sure that
+ * every task struct that event->ctx->task could possibly point to
+ * remains valid.  This is OK when called from perf_release since
+ * that only calls us on the top-level context, which can't be a clone.
+ * When called from perf_event_exit_task, it's OK because the
+ * context has been detached from its task.
+ */
+static void perf_event_remove_from_context(struct perf_event *event)
+{
+       struct perf_event_context *ctx = event->ctx;
+       struct task_struct *task = ctx->task;
+
+       if (!task) {
+               /*
+                * Per cpu events are removed via an smp call and
+                * the removal is always sucessful.
+                */
+               smp_call_function_single(event->cpu,
+                                        __perf_event_remove_from_context,
+                                        event, 1);
+               return;
+       }
+
+retry:
+       task_oncpu_function_call(task, __perf_event_remove_from_context,
+                                event);
+
+       spin_lock_irq(&ctx->lock);
+       /*
+        * If the context is active we need to retry the smp call.
+        */
+       if (ctx->nr_active && !list_empty(&event->group_entry)) {
+               spin_unlock_irq(&ctx->lock);
+               goto retry;
+       }
+
+       /*
+        * The lock prevents that this context is scheduled in so we
+        * can remove the event safely, if the call above did not
+        * succeed.
+        */
+       if (!list_empty(&event->group_entry)) {
+               list_del_event(event, ctx);
+       }
+       spin_unlock_irq(&ctx->lock);
+}
+
+static inline u64 perf_clock(void)
+{
+       return cpu_clock(smp_processor_id());
+}
+
+/*
+ * Update the record of the current time in a context.
+ */
+static void update_context_time(struct perf_event_context *ctx)
+{
+       u64 now = perf_clock();
+
+       ctx->time += now - ctx->timestamp;
+       ctx->timestamp = now;
+}
+
+/*
+ * Update the total_time_enabled and total_time_running fields for a event.
+ */
+static void update_event_times(struct perf_event *event)
+{
+       struct perf_event_context *ctx = event->ctx;
+       u64 run_end;
+
+       if (event->state < PERF_EVENT_STATE_INACTIVE ||
+           event->group_leader->state < PERF_EVENT_STATE_INACTIVE)
+               return;
+
+       event->total_time_enabled = ctx->time - event->tstamp_enabled;
+
+       if (event->state == PERF_EVENT_STATE_INACTIVE)
+               run_end = event->tstamp_stopped;
+       else
+               run_end = ctx->time;
+
+       event->total_time_running = run_end - event->tstamp_running;
+}
+
+/*
+ * Update total_time_enabled and total_time_running for all events in a group.
+ */
+static void update_group_times(struct perf_event *leader)
+{
+       struct perf_event *event;
+
+       update_event_times(leader);
+       list_for_each_entry(event, &leader->sibling_list, group_entry)
+               update_event_times(event);
+}
+
+/*
+ * Cross CPU call to disable a performance event
+ */
+static void __perf_event_disable(void *info)
+{
+       struct perf_event *event = info;
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event_context *ctx = event->ctx;
+
+       /*
+        * If this is a per-task event, need to check whether this
+        * event's task is the current task on this cpu.
+        */
+       if (ctx->task && cpuctx->task_ctx != ctx)
+               return;
+
+       spin_lock(&ctx->lock);
+
+       /*
+        * If the event is on, turn it off.
+        * If it is in error state, leave it in error state.
+        */
+       if (event->state >= PERF_EVENT_STATE_INACTIVE) {
+               update_context_time(ctx);
+               update_group_times(event);
+               if (event == event->group_leader)
+                       group_sched_out(event, cpuctx, ctx);
+               else
+                       event_sched_out(event, cpuctx, ctx);
+               event->state = PERF_EVENT_STATE_OFF;
+       }
+
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Disable a event.
+ *
+ * If event->ctx is a cloned context, callers must make sure that
+ * every task struct that event->ctx->task could possibly point to
+ * remains valid.  This condition is satisifed when called through
+ * perf_event_for_each_child or perf_event_for_each because they
+ * hold the top-level event's child_mutex, so any descendant that
+ * goes to exit will block in sync_child_event.
+ * When called from perf_pending_event it's OK because event->ctx
+ * is the current context on this CPU and preemption is disabled,
+ * hence we can't get into perf_event_task_sched_out for this context.
+ */
+static void perf_event_disable(struct perf_event *event)
+{
+       struct perf_event_context *ctx = event->ctx;
+       struct task_struct *task = ctx->task;
+
+       if (!task) {
+               /*
+                * Disable the event on the cpu that it's on
+                */
+               smp_call_function_single(event->cpu, __perf_event_disable,
+                                        event, 1);
+               return;
+       }
+
+ retry:
+       task_oncpu_function_call(task, __perf_event_disable, event);
+
+       spin_lock_irq(&ctx->lock);
+       /*
+        * If the event is still active, we need to retry the cross-call.
+        */
+       if (event->state == PERF_EVENT_STATE_ACTIVE) {
+               spin_unlock_irq(&ctx->lock);
+               goto retry;
+       }
+
+       /*
+        * Since we have the lock this context can't be scheduled
+        * in, so we can change the state safely.
+        */
+       if (event->state == PERF_EVENT_STATE_INACTIVE) {
+               update_group_times(event);
+               event->state = PERF_EVENT_STATE_OFF;
+       }
+
+       spin_unlock_irq(&ctx->lock);
+}
+
+static int
+event_sched_in(struct perf_event *event,
+                struct perf_cpu_context *cpuctx,
+                struct perf_event_context *ctx,
+                int cpu)
+{
+       if (event->state <= PERF_EVENT_STATE_OFF)
+               return 0;
+
+       event->state = PERF_EVENT_STATE_ACTIVE;
+       event->oncpu = cpu;     /* TODO: put 'cpu' into cpuctx->cpu */
+       /*
+        * The new state must be visible before we turn it on in the hardware:
+        */
+       smp_wmb();
+
+       if (event->pmu->enable(event)) {
+               event->state = PERF_EVENT_STATE_INACTIVE;
+               event->oncpu = -1;
+               return -EAGAIN;
+       }
+
+       event->tstamp_running += ctx->time - event->tstamp_stopped;
+
+       if (!is_software_event(event))
+               cpuctx->active_oncpu++;
+       ctx->nr_active++;
+
+       if (event->attr.exclusive)
+               cpuctx->exclusive = 1;
+
+       return 0;
+}
+
+static int
+group_sched_in(struct perf_event *group_event,
+              struct perf_cpu_context *cpuctx,
+              struct perf_event_context *ctx,
+              int cpu)
+{
+       struct perf_event *event, *partial_group;
+       int ret;
+
+       if (group_event->state == PERF_EVENT_STATE_OFF)
+               return 0;
+
+       ret = hw_perf_group_sched_in(group_event, cpuctx, ctx, cpu);
+       if (ret)
+               return ret < 0 ? ret : 0;
+
+       if (event_sched_in(group_event, cpuctx, ctx, cpu))
+               return -EAGAIN;
+
+       /*
+        * Schedule in siblings as one group (if any):
+        */
+       list_for_each_entry(event, &group_event->sibling_list, group_entry) {
+               if (event_sched_in(event, cpuctx, ctx, cpu)) {
+                       partial_group = event;
+                       goto group_error;
+               }
+       }
+
+       return 0;
+
+group_error:
+       /*
+        * Groups can be scheduled in as one unit only, so undo any
+        * partial group before returning:
+        */
+       list_for_each_entry(event, &group_event->sibling_list, group_entry) {
+               if (event == partial_group)
+                       break;
+               event_sched_out(event, cpuctx, ctx);
+       }
+       event_sched_out(group_event, cpuctx, ctx);
+
+       return -EAGAIN;
+}
+
+/*
+ * Return 1 for a group consisting entirely of software events,
+ * 0 if the group contains any hardware events.
+ */
+static int is_software_only_group(struct perf_event *leader)
+{
+       struct perf_event *event;
+
+       if (!is_software_event(leader))
+               return 0;
+
+       list_for_each_entry(event, &leader->sibling_list, group_entry)
+               if (!is_software_event(event))
+                       return 0;
+
+       return 1;
+}
+
+/*
+ * Work out whether we can put this event group on the CPU now.
+ */
+static int group_can_go_on(struct perf_event *event,
+                          struct perf_cpu_context *cpuctx,
+                          int can_add_hw)
+{
+       /*
+        * Groups consisting entirely of software events can always go on.
+        */
+       if (is_software_only_group(event))
+               return 1;
+       /*
+        * If an exclusive group is already on, no other hardware
+        * events can go on.
+        */
+       if (cpuctx->exclusive)
+               return 0;
+       /*
+        * If this group is exclusive and there are already
+        * events on the CPU, it can't go on.
+        */
+       if (event->attr.exclusive && cpuctx->active_oncpu)
+               return 0;
+       /*
+        * Otherwise, try to add it if all previous groups were able
+        * to go on.
+        */
+       return can_add_hw;
+}
+
+static void add_event_to_ctx(struct perf_event *event,
+                              struct perf_event_context *ctx)
+{
+       list_add_event(event, ctx);
+       event->tstamp_enabled = ctx->time;
+       event->tstamp_running = ctx->time;
+       event->tstamp_stopped = ctx->time;
+}
+
+/*
+ * Cross CPU call to install and enable a performance event
+ *
+ * Must be called with ctx->mutex held
+ */
+static void __perf_install_in_context(void *info)
+{
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event *event = info;
+       struct perf_event_context *ctx = event->ctx;
+       struct perf_event *leader = event->group_leader;
+       int cpu = smp_processor_id();
+       int err;
+
+       /*
+        * If this is a task context, we need to check whether it is
+        * the current task context of this cpu. If not it has been
+        * scheduled out before the smp call arrived.
+        * Or possibly this is the right context but it isn't
+        * on this cpu because it had no events.
+        */
+       if (ctx->task && cpuctx->task_ctx != ctx) {
+               if (cpuctx->task_ctx || ctx->task != current)
+                       return;
+               cpuctx->task_ctx = ctx;
+       }
+
+       spin_lock(&ctx->lock);
+       ctx->is_active = 1;
+       update_context_time(ctx);
+
+       /*
+        * Protect the list operation against NMI by disabling the
+        * events on a global level. NOP for non NMI based events.
+        */
+       perf_disable();
+
+       add_event_to_ctx(event, ctx);
+
+       /*
+        * Don't put the event on if it is disabled or if
+        * it is in a group and the group isn't on.
+        */
+       if (event->state != PERF_EVENT_STATE_INACTIVE ||
+           (leader != event && leader->state != PERF_EVENT_STATE_ACTIVE))
+               goto unlock;
+
+       /*
+        * An exclusive event can't go on if there are already active
+        * hardware events, and no hardware event can go on if there
+        * is already an exclusive event on.
+        */
+       if (!group_can_go_on(event, cpuctx, 1))
+               err = -EEXIST;
+       else
+               err = event_sched_in(event, cpuctx, ctx, cpu);
+
+       if (err) {
+               /*
+                * This event couldn't go on.  If it is in a group
+                * then we have to pull the whole group off.
+                * If the event group is pinned then put it in error state.
+                */
+               if (leader != event)
+                       group_sched_out(leader, cpuctx, ctx);
+               if (leader->attr.pinned) {
+                       update_group_times(leader);
+                       leader->state = PERF_EVENT_STATE_ERROR;
+               }
+       }
+
+       if (!err && !ctx->task && cpuctx->max_pertask)
+               cpuctx->max_pertask--;
+
+ unlock:
+       perf_enable();
+
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Attach a performance event to a context
+ *
+ * First we add the event to the list with the hardware enable bit
+ * in event->hw_config cleared.
+ *
+ * If the event is attached to a task which is on a CPU we use a smp
+ * call to enable it in the task context. The task might have been
+ * scheduled away, but we check this in the smp call again.
+ *
+ * Must be called with ctx->mutex held.
+ */
+static void
+perf_install_in_context(struct perf_event_context *ctx,
+                       struct perf_event *event,
+                       int cpu)
+{
+       struct task_struct *task = ctx->task;
+
+       if (!task) {
+               /*
+                * Per cpu events are installed via an smp call and
+                * the install is always sucessful.
+                */
+               smp_call_function_single(cpu, __perf_install_in_context,
+                                        event, 1);
+               return;
+       }
+
+retry:
+       task_oncpu_function_call(task, __perf_install_in_context,
+                                event);
+
+       spin_lock_irq(&ctx->lock);
+       /*
+        * we need to retry the smp call.
+        */
+       if (ctx->is_active && list_empty(&event->group_entry)) {
+               spin_unlock_irq(&ctx->lock);
+               goto retry;
+       }
+
+       /*
+        * The lock prevents that this context is scheduled in so we
+        * can add the event safely, if it the call above did not
+        * succeed.
+        */
+       if (list_empty(&event->group_entry))
+               add_event_to_ctx(event, ctx);
+       spin_unlock_irq(&ctx->lock);
+}
+
+/*
+ * Put a event into inactive state and update time fields.
+ * Enabling the leader of a group effectively enables all
+ * the group members that aren't explicitly disabled, so we
+ * have to update their ->tstamp_enabled also.
+ * Note: this works for group members as well as group leaders
+ * since the non-leader members' sibling_lists will be empty.
+ */
+static void __perf_event_mark_enabled(struct perf_event *event,
+                                       struct perf_event_context *ctx)
+{
+       struct perf_event *sub;
+
+       event->state = PERF_EVENT_STATE_INACTIVE;
+       event->tstamp_enabled = ctx->time - event->total_time_enabled;
+       list_for_each_entry(sub, &event->sibling_list, group_entry)
+               if (sub->state >= PERF_EVENT_STATE_INACTIVE)
+                       sub->tstamp_enabled =
+                               ctx->time - sub->total_time_enabled;
+}
+
+/*
+ * Cross CPU call to enable a performance event
+ */
+static void __perf_event_enable(void *info)
+{
+       struct perf_event *event = info;
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event_context *ctx = event->ctx;
+       struct perf_event *leader = event->group_leader;
+       int err;
+
+       /*
+        * If this is a per-task event, need to check whether this
+        * event's task is the current task on this cpu.
+        */
+       if (ctx->task && cpuctx->task_ctx != ctx) {
+               if (cpuctx->task_ctx || ctx->task != current)
+                       return;
+               cpuctx->task_ctx = ctx;
+       }
+
+       spin_lock(&ctx->lock);
+       ctx->is_active = 1;
+       update_context_time(ctx);
+
+       if (event->state >= PERF_EVENT_STATE_INACTIVE)
+               goto unlock;
+       __perf_event_mark_enabled(event, ctx);
+
+       /*
+        * If the event is in a group and isn't the group leader,
+        * then don't put it on unless the group is on.
+        */
+       if (leader != event && leader->state != PERF_EVENT_STATE_ACTIVE)
+               goto unlock;
+
+       if (!group_can_go_on(event, cpuctx, 1)) {
+               err = -EEXIST;
+       } else {
+               perf_disable();
+               if (event == leader)
+                       err = group_sched_in(event, cpuctx, ctx,
+                                            smp_processor_id());
+               else
+                       err = event_sched_in(event, cpuctx, ctx,
+                                              smp_processor_id());
+               perf_enable();
+       }
+
+       if (err) {
+               /*
+                * If this event can't go on and it's part of a
+                * group, then the whole group has to come off.
+                */
+               if (leader != event)
+                       group_sched_out(leader, cpuctx, ctx);
+               if (leader->attr.pinned) {
+                       update_group_times(leader);
+                       leader->state = PERF_EVENT_STATE_ERROR;
+               }
+       }
+
+ unlock:
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Enable a event.
+ *
+ * If event->ctx is a cloned context, callers must make sure that
+ * every task struct that event->ctx->task could possibly point to
+ * remains valid.  This condition is satisfied when called through
+ * perf_event_for_each_child or perf_event_for_each as described
+ * for perf_event_disable.
+ */
+static void perf_event_enable(struct perf_event *event)
+{
+       struct perf_event_context *ctx = event->ctx;
+       struct task_struct *task = ctx->task;
+
+       if (!task) {
+               /*
+                * Enable the event on the cpu that it's on
+                */
+               smp_call_function_single(event->cpu, __perf_event_enable,
+                                        event, 1);
+               return;
+       }
+
+       spin_lock_irq(&ctx->lock);
+       if (event->state >= PERF_EVENT_STATE_INACTIVE)
+               goto out;
+
+       /*
+        * If the event is in error state, clear that first.
+        * That way, if we see the event in error state below, we
+        * know that it has gone back into error state, as distinct
+        * from the task having been scheduled away before the
+        * cross-call arrived.
+        */
+       if (event->state == PERF_EVENT_STATE_ERROR)
+               event->state = PERF_EVENT_STATE_OFF;
+
+ retry:
+       spin_unlock_irq(&ctx->lock);
+       task_oncpu_function_call(task, __perf_event_enable, event);
+
+       spin_lock_irq(&ctx->lock);
+
+       /*
+        * If the context is active and the event is still off,
+        * we need to retry the cross-call.
+        */
+       if (ctx->is_active && event->state == PERF_EVENT_STATE_OFF)
+               goto retry;
+
+       /*
+        * Since we have the lock this context can't be scheduled
+        * in, so we can change the state safely.
+        */
+       if (event->state == PERF_EVENT_STATE_OFF)
+               __perf_event_mark_enabled(event, ctx);
+
+ out:
+       spin_unlock_irq(&ctx->lock);
+}
+
+static int perf_event_refresh(struct perf_event *event, int refresh)
+{
+       /*
+        * not supported on inherited events
+        */
+       if (event->attr.inherit)
+               return -EINVAL;
+
+       atomic_add(refresh, &event->event_limit);
+       perf_event_enable(event);
+
+       return 0;
+}
+
+void __perf_event_sched_out(struct perf_event_context *ctx,
+                             struct perf_cpu_context *cpuctx)
+{
+       struct perf_event *event;
+
+       spin_lock(&ctx->lock);
+       ctx->is_active = 0;
+       if (likely(!ctx->nr_events))
+               goto out;
+       update_context_time(ctx);
+
+       perf_disable();
+       if (ctx->nr_active) {
+               list_for_each_entry(event, &ctx->group_list, group_entry) {
+                       if (event != event->group_leader)
+                               event_sched_out(event, cpuctx, ctx);
+                       else
+                               group_sched_out(event, cpuctx, ctx);
+               }
+       }
+       perf_enable();
+ out:
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Test whether two contexts are equivalent, i.e. whether they
+ * have both been cloned from the same version of the same context
+ * and they both have the same number of enabled events.
+ * If the number of enabled events is the same, then the set
+ * of enabled events should be the same, because these are both
+ * inherited contexts, therefore we can't access individual events
+ * in them directly with an fd; we can only enable/disable all
+ * events via prctl, or enable/disable all events in a family
+ * via ioctl, which will have the same effect on both contexts.
+ */
+static int context_equiv(struct perf_event_context *ctx1,
+                        struct perf_event_context *ctx2)
+{
+       return ctx1->parent_ctx && ctx1->parent_ctx == ctx2->parent_ctx
+               && ctx1->parent_gen == ctx2->parent_gen
+               && !ctx1->pin_count && !ctx2->pin_count;
+}
+
+static void __perf_event_read(void *event);
+
+static void __perf_event_sync_stat(struct perf_event *event,
+                                    struct perf_event *next_event)
+{
+       u64 value;
+
+       if (!event->attr.inherit_stat)
+               return;
+
+       /*
+        * Update the event value, we cannot use perf_event_read()
+        * because we're in the middle of a context switch and have IRQs
+        * disabled, which upsets smp_call_function_single(), however
+        * we know the event must be on the current CPU, therefore we
+        * don't need to use it.
+        */
+       switch (event->state) {
+       case PERF_EVENT_STATE_ACTIVE:
+               __perf_event_read(event);
+               break;
+
+       case PERF_EVENT_STATE_INACTIVE:
+               update_event_times(event);
+               break;
+
+       default:
+               break;
+       }
+
+       /*
+        * In order to keep per-task stats reliable we need to flip the event
+        * values when we flip the contexts.
+        */
+       value = atomic64_read(&next_event->count);
+       value = atomic64_xchg(&event->count, value);
+       atomic64_set(&next_event->count, value);
+
+       swap(event->total_time_enabled, next_event->total_time_enabled);
+       swap(event->total_time_running, next_event->total_time_running);
+
+       /*
+        * Since we swizzled the values, update the user visible data too.
+        */
+       perf_event_update_userpage(event);
+       perf_event_update_userpage(next_event);
+}
+
+#define list_next_entry(pos, member) \
+       list_entry(pos->member.next, typeof(*pos), member)
+
+static void perf_event_sync_stat(struct perf_event_context *ctx,
+                                  struct perf_event_context *next_ctx)
+{
+       struct perf_event *event, *next_event;
+
+       if (!ctx->nr_stat)
+               return;
+
+       event = list_first_entry(&ctx->event_list,
+                                  struct perf_event, event_entry);
+
+       next_event = list_first_entry(&next_ctx->event_list,
+                                       struct perf_event, event_entry);
+
+       while (&event->event_entry != &ctx->event_list &&
+              &next_event->event_entry != &next_ctx->event_list) {
+
+               __perf_event_sync_stat(event, next_event);
+
+               event = list_next_entry(event, event_entry);
+               next_event = list_next_entry(next_event, event_entry);
+       }
+}
+
+/*
+ * Called from scheduler to remove the events of the current task,
+ * with interrupts disabled.
+ *
+ * We stop each event and update the event value in event->count.
+ *
+ * This does not protect us against NMI, but disable()
+ * sets the disabled bit in the control field of event _before_
+ * accessing the event control register. If a NMI hits, then it will
+ * not restart the event.
+ */
+void perf_event_task_sched_out(struct task_struct *task,
+                                struct task_struct *next, int cpu)
+{
+       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
+       struct perf_event_context *ctx = task->perf_event_ctxp;
+       struct perf_event_context *next_ctx;
+       struct perf_event_context *parent;
+       struct pt_regs *regs;
+       int do_switch = 1;
+
+       regs = task_pt_regs(task);
+       perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, regs, 0);
+
+       if (likely(!ctx || !cpuctx->task_ctx))
+               return;
+
+       update_context_time(ctx);
+
+       rcu_read_lock();
+       parent = rcu_dereference(ctx->parent_ctx);
+       next_ctx = next->perf_event_ctxp;
+       if (parent && next_ctx &&
+           rcu_dereference(next_ctx->parent_ctx) == parent) {
+               /*
+                * Looks like the two contexts are clones, so we might be
+                * able to optimize the context switch.  We lock both
+                * contexts and check that they are clones under the
+                * lock (including re-checking that neither has been
+                * uncloned in the meantime).  It doesn't matter which
+                * order we take the locks because no other cpu could
+                * be trying to lock both of these tasks.
+                */
+               spin_lock(&ctx->lock);
+               spin_lock_nested(&next_ctx->lock, SINGLE_DEPTH_NESTING);
+               if (context_equiv(ctx, next_ctx)) {
+                       /*
+                        * XXX do we need a memory barrier of sorts
+                        * wrt to rcu_dereference() of perf_event_ctxp
+                        */
+                       task->perf_event_ctxp = next_ctx;
+                       next->perf_event_ctxp = ctx;
+                       ctx->task = next;
+                       next_ctx->task = task;
+                       do_switch = 0;
+
+                       perf_event_sync_stat(ctx, next_ctx);
+               }
+               spin_unlock(&next_ctx->lock);
+               spin_unlock(&ctx->lock);
+       }
+       rcu_read_unlock();
+
+       if (do_switch) {
+               __perf_event_sched_out(ctx, cpuctx);
+               cpuctx->task_ctx = NULL;
+       }
+}
+
+/*
+ * Called with IRQs disabled
+ */
+static void __perf_event_task_sched_out(struct perf_event_context *ctx)
+{
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+
+       if (!cpuctx->task_ctx)
+               return;
+
+       if (WARN_ON_ONCE(ctx != cpuctx->task_ctx))
+               return;
+
+       __perf_event_sched_out(ctx, cpuctx);
+       cpuctx->task_ctx = NULL;
+}
+
+/*
+ * Called with IRQs disabled
+ */
+static void perf_event_cpu_sched_out(struct perf_cpu_context *cpuctx)
+{
+       __perf_event_sched_out(&cpuctx->ctx, cpuctx);
+}
+
+static void
+__perf_event_sched_in(struct perf_event_context *ctx,
+                       struct perf_cpu_context *cpuctx, int cpu)
+{
+       struct perf_event *event;
+       int can_add_hw = 1;
+
+       spin_lock(&ctx->lock);
+       ctx->is_active = 1;
+       if (likely(!ctx->nr_events))
+               goto out;
+
+       ctx->timestamp = perf_clock();
+
+       perf_disable();
+
+       /*
+        * First go through the list and put on any pinned groups
+        * in order to give them the best chance of going on.
+        */
+       list_for_each_entry(event, &ctx->group_list, group_entry) {
+               if (event->state <= PERF_EVENT_STATE_OFF ||
+                   !event->attr.pinned)
+                       continue;
+               if (event->cpu != -1 && event->cpu != cpu)
+                       continue;
+
+               if (event != event->group_leader)
+                       event_sched_in(event, cpuctx, ctx, cpu);
+               else {
+                       if (group_can_go_on(event, cpuctx, 1))
+                               group_sched_in(event, cpuctx, ctx, cpu);
+               }
+
+               /*
+                * If this pinned group hasn't been scheduled,
+                * put it in error state.
+                */
+               if (event->state == PERF_EVENT_STATE_INACTIVE) {
+                       update_group_times(event);
+                       event->state = PERF_EVENT_STATE_ERROR;
+               }
+       }
+
+       list_for_each_entry(event, &ctx->group_list, group_entry) {
+               /*
+                * Ignore events in OFF or ERROR state, and
+                * ignore pinned events since we did them already.
+                */
+               if (event->state <= PERF_EVENT_STATE_OFF ||
+                   event->attr.pinned)
+                       continue;
+
+               /*
+                * Listen to the 'cpu' scheduling filter constraint
+                * of events:
+                */
+               if (event->cpu != -1 && event->cpu != cpu)
+                       continue;
+
+               if (event != event->group_leader) {
+                       if (event_sched_in(event, cpuctx, ctx, cpu))
+                               can_add_hw = 0;
+               } else {
+                       if (group_can_go_on(event, cpuctx, can_add_hw)) {
+                               if (group_sched_in(event, cpuctx, ctx, cpu))
+                                       can_add_hw = 0;
+                       }
+               }
+       }
+       perf_enable();
+ out:
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Called from scheduler to add the events of the current task
+ * with interrupts disabled.
+ *
+ * We restore the event value and then enable it.
+ *
+ * This does not protect us against NMI, but enable()
+ * sets the enabled bit in the control field of event _before_
+ * accessing the event control register. If a NMI hits, then it will
+ * keep the event running.
+ */
+void perf_event_task_sched_in(struct task_struct *task, int cpu)
+{
+       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
+       struct perf_event_context *ctx = task->perf_event_ctxp;
+
+       if (likely(!ctx))
+               return;
+       if (cpuctx->task_ctx == ctx)
+               return;
+       __perf_event_sched_in(ctx, cpuctx, cpu);
+       cpuctx->task_ctx = ctx;
+}
+
+static void perf_event_cpu_sched_in(struct perf_cpu_context *cpuctx, int cpu)
+{
+       struct perf_event_context *ctx = &cpuctx->ctx;
+
+       __perf_event_sched_in(ctx, cpuctx, cpu);
+}
+
+#define MAX_INTERRUPTS (~0ULL)
+
+static void perf_log_throttle(struct perf_event *event, int enable);
+
+static void perf_adjust_period(struct perf_event *event, u64 events)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       u64 period, sample_period;
+       s64 delta;
+
+       events *= hwc->sample_period;
+       period = div64_u64(events, event->attr.sample_freq);
+
+       delta = (s64)(period - hwc->sample_period);
+       delta = (delta + 7) / 8; /* low pass filter */
+
+       sample_period = hwc->sample_period + delta;
+
+       if (!sample_period)
+               sample_period = 1;
+
+       hwc->sample_period = sample_period;
+}
+
+static void perf_ctx_adjust_freq(struct perf_event_context *ctx)
+{
+       struct perf_event *event;
+       struct hw_perf_event *hwc;
+       u64 interrupts, freq;
+
+       spin_lock(&ctx->lock);
+       list_for_each_entry(event, &ctx->group_list, group_entry) {
+               if (event->state != PERF_EVENT_STATE_ACTIVE)
+                       continue;
+
+               hwc = &event->hw;
+
+               interrupts = hwc->interrupts;
+               hwc->interrupts = 0;
+
+               /*
+                * unthrottle events on the tick
+                */
+               if (interrupts == MAX_INTERRUPTS) {
+                       perf_log_throttle(event, 1);
+                       event->pmu->unthrottle(event);
+                       interrupts = 2*sysctl_perf_event_sample_rate/HZ;
+               }
+
+               if (!event->attr.freq || !event->attr.sample_freq)
+                       continue;
+
+               /*
+                * if the specified freq < HZ then we need to skip ticks
+                */
+               if (event->attr.sample_freq < HZ) {
+                       freq = event->attr.sample_freq;
+
+                       hwc->freq_count += freq;
+                       hwc->freq_interrupts += interrupts;
+
+                       if (hwc->freq_count < HZ)
+                               continue;
+
+                       interrupts = hwc->freq_interrupts;
+                       hwc->freq_interrupts = 0;
+                       hwc->freq_count -= HZ;
+               } else
+                       freq = HZ;
+
+               perf_adjust_period(event, freq * interrupts);
+
+               /*
+                * In order to avoid being stalled by an (accidental) huge
+                * sample period, force reset the sample period if we didn't
+                * get any events in this freq period.
+                */
+               if (!interrupts) {
+                       perf_disable();
+                       event->pmu->disable(event);
+                       atomic64_set(&hwc->period_left, 0);
+                       event->pmu->enable(event);
+                       perf_enable();
+               }
+       }
+       spin_unlock(&ctx->lock);
+}
+
+/*
+ * Round-robin a context's events:
+ */
+static void rotate_ctx(struct perf_event_context *ctx)
+{
+       struct perf_event *event;
+
+       if (!ctx->nr_events)
+               return;
+
+       spin_lock(&ctx->lock);
+       /*
+        * Rotate the first entry last (works just fine for group events too):
+        */
+       perf_disable();
+       list_for_each_entry(event, &ctx->group_list, group_entry) {
+               list_move_tail(&event->group_entry, &ctx->group_list);
+               break;
+       }
+       perf_enable();
+
+       spin_unlock(&ctx->lock);
+}
+
+void perf_event_task_tick(struct task_struct *curr, int cpu)
+{
+       struct perf_cpu_context *cpuctx;
+       struct perf_event_context *ctx;
+
+       if (!atomic_read(&nr_events))
+               return;
+
+       cpuctx = &per_cpu(perf_cpu_context, cpu);
+       ctx = curr->perf_event_ctxp;
+
+       perf_ctx_adjust_freq(&cpuctx->ctx);
+       if (ctx)
+               perf_ctx_adjust_freq(ctx);
+
+       perf_event_cpu_sched_out(cpuctx);
+       if (ctx)
+               __perf_event_task_sched_out(ctx);
+
+       rotate_ctx(&cpuctx->ctx);
+       if (ctx)
+               rotate_ctx(ctx);
+
+       perf_event_cpu_sched_in(cpuctx, cpu);
+       if (ctx)
+               perf_event_task_sched_in(curr, cpu);
+}
+
+/*
+ * Enable all of a task's events that have been marked enable-on-exec.
+ * This expects task == current.
+ */
+static void perf_event_enable_on_exec(struct task_struct *task)
+{
+       struct perf_event_context *ctx;
+       struct perf_event *event;
+       unsigned long flags;
+       int enabled = 0;
+
+       local_irq_save(flags);
+       ctx = task->perf_event_ctxp;
+       if (!ctx || !ctx->nr_events)
+               goto out;
+
+       __perf_event_task_sched_out(ctx);
+
+       spin_lock(&ctx->lock);
+
+       list_for_each_entry(event, &ctx->group_list, group_entry) {
+               if (!event->attr.enable_on_exec)
+                       continue;
+               event->attr.enable_on_exec = 0;
+               if (event->state >= PERF_EVENT_STATE_INACTIVE)
+                       continue;
+               __perf_event_mark_enabled(event, ctx);
+               enabled = 1;
+       }
+
+       /*
+        * Unclone this context if we enabled any event.
+        */
+       if (enabled)
+               unclone_ctx(ctx);
+
+       spin_unlock(&ctx->lock);
+
+       perf_event_task_sched_in(task, smp_processor_id());
+ out:
+       local_irq_restore(flags);
+}
+
+/*
+ * Cross CPU call to read the hardware event
+ */
+static void __perf_event_read(void *info)
+{
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event *event = info;
+       struct perf_event_context *ctx = event->ctx;
+       unsigned long flags;
+
+       /*
+        * If this is a task context, we need to check whether it is
+        * the current task context of this cpu.  If not it has been
+        * scheduled out before the smp call arrived.  In that case
+        * event->count would have been updated to a recent sample
+        * when the event was scheduled out.
+        */
+       if (ctx->task && cpuctx->task_ctx != ctx)
+               return;
+
+       local_irq_save(flags);
+       if (ctx->is_active)
+               update_context_time(ctx);
+       event->pmu->read(event);
+       update_event_times(event);
+       local_irq_restore(flags);
+}
+
+static u64 perf_event_read(struct perf_event *event)
+{
+       /*
+        * If event is enabled and currently active on a CPU, update the
+        * value in the event structure:
+        */
+       if (event->state == PERF_EVENT_STATE_ACTIVE) {
+               smp_call_function_single(event->oncpu,
+                                        __perf_event_read, event, 1);
+       } else if (event->state == PERF_EVENT_STATE_INACTIVE) {
+               update_event_times(event);
+       }
+
+       return atomic64_read(&event->count);
+}
+
+/*
+ * Initialize the perf_event context in a task_struct:
+ */
+static void
+__perf_event_init_context(struct perf_event_context *ctx,
+                           struct task_struct *task)
+{
+       memset(ctx, 0, sizeof(*ctx));
+       spin_lock_init(&ctx->lock);
+       mutex_init(&ctx->mutex);
+       INIT_LIST_HEAD(&ctx->group_list);
+       INIT_LIST_HEAD(&ctx->event_list);
+       atomic_set(&ctx->refcount, 1);
+       ctx->task = task;
+}
+
+static struct perf_event_context *find_get_context(pid_t pid, int cpu)
+{
+       struct perf_event_context *ctx;
+       struct perf_cpu_context *cpuctx;
+       struct task_struct *task;
+       unsigned long flags;
+       int err;
+
+       /*
+        * If cpu is not a wildcard then this is a percpu event:
+        */
+       if (cpu != -1) {
+               /* Must be root to operate on a CPU event: */
+               if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
+                       return ERR_PTR(-EACCES);
+
+               if (cpu < 0 || cpu > num_possible_cpus())
+                       return ERR_PTR(-EINVAL);
+
+               /*
+                * We could be clever and allow to attach a event to an
+                * offline CPU and activate it when the CPU comes up, but
+                * that's for later.
+                */
+               if (!cpu_isset(cpu, cpu_online_map))
+                       return ERR_PTR(-ENODEV);
+
+               cpuctx = &per_cpu(perf_cpu_context, cpu);
+               ctx = &cpuctx->ctx;
+               get_ctx(ctx);
+
+               return ctx;
+       }
+
+       rcu_read_lock();
+       if (!pid)
+               task = current;
+       else
+               task = find_task_by_vpid(pid);
+       if (task)
+               get_task_struct(task);
+       rcu_read_unlock();
+
+       if (!task)
+               return ERR_PTR(-ESRCH);
+
+       /*
+        * Can't attach events to a dying task.
+        */
+       err = -ESRCH;
+       if (task->flags & PF_EXITING)
+               goto errout;
+
+       /* Reuse ptrace permission checks for now. */
+       err = -EACCES;
+       if (!ptrace_may_access(task, PTRACE_MODE_READ))
+               goto errout;
+
+ retry:
+       ctx = perf_lock_task_context(task, &flags);
+       if (ctx) {
+               unclone_ctx(ctx);
+               spin_unlock_irqrestore(&ctx->lock, flags);
+       }
+
+       if (!ctx) {
+               ctx = kmalloc(sizeof(struct perf_event_context), GFP_KERNEL);
+               err = -ENOMEM;
+               if (!ctx)
+                       goto errout;
+               __perf_event_init_context(ctx, task);
+               get_ctx(ctx);
+               if (cmpxchg(&task->perf_event_ctxp, NULL, ctx)) {
+                       /*
+                        * We raced with some other task; use
+                        * the context they set.
+                        */
+                       kfree(ctx);
+                       goto retry;
+               }
+               get_task_struct(task);
+       }
+
+       put_task_struct(task);
+       return ctx;
+
+ errout:
+       put_task_struct(task);
+       return ERR_PTR(err);
+}
+
+static void free_event_rcu(struct rcu_head *head)
+{
+       struct perf_event *event;
+
+       event = container_of(head, struct perf_event, rcu_head);
+       if (event->ns)
+               put_pid_ns(event->ns);
+       kfree(event);
+}
+
+static void perf_pending_sync(struct perf_event *event);
+
+static void free_event(struct perf_event *event)
+{
+       perf_pending_sync(event);
+
+       if (!event->parent) {
+               atomic_dec(&nr_events);
+               if (event->attr.mmap)
+                       atomic_dec(&nr_mmap_events);
+               if (event->attr.comm)
+                       atomic_dec(&nr_comm_events);
+               if (event->attr.task)
+                       atomic_dec(&nr_task_events);
+       }
+
+       if (event->output) {
+               fput(event->output->filp);
+               event->output = NULL;
+       }
+
+       if (event->destroy)
+               event->destroy(event);
+
+       put_ctx(event->ctx);
+       call_rcu(&event->rcu_head, free_event_rcu);
+}
+
+/*
+ * Called when the last reference to the file is gone.
+ */
+static int perf_release(struct inode *inode, struct file *file)
+{
+       struct perf_event *event = file->private_data;
+       struct perf_event_context *ctx = event->ctx;
+
+       file->private_data = NULL;
+
+       WARN_ON_ONCE(ctx->parent_ctx);
+       mutex_lock(&ctx->mutex);
+       perf_event_remove_from_context(event);
+       mutex_unlock(&ctx->mutex);
+
+       mutex_lock(&event->owner->perf_event_mutex);
+       list_del_init(&event->owner_entry);
+       mutex_unlock(&event->owner->perf_event_mutex);
+       put_task_struct(event->owner);
+
+       free_event(event);
+
+       return 0;
+}
+
+static int perf_event_read_size(struct perf_event *event)
+{
+       int entry = sizeof(u64); /* value */
+       int size = 0;
+       int nr = 1;
+
+       if (event->attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
+               size += sizeof(u64);
+
+       if (event->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
+               size += sizeof(u64);
+
+       if (event->attr.read_format & PERF_FORMAT_ID)
+               entry += sizeof(u64);
+
+       if (event->attr.read_format & PERF_FORMAT_GROUP) {
+               nr += event->group_leader->nr_siblings;
+               size += sizeof(u64);
+       }
+
+       size += entry * nr;
+
+       return size;
+}
+
+static u64 perf_event_read_value(struct perf_event *event)
+{
+       struct perf_event *child;
+       u64 total = 0;
+
+       total += perf_event_read(event);
+       list_for_each_entry(child, &event->child_list, child_list)
+               total += perf_event_read(child);
+
+       return total;
+}
+
+static int perf_event_read_entry(struct perf_event *event,
+                                  u64 read_format, char __user *buf)
+{
+       int n = 0, count = 0;
+       u64 values[2];
+
+       values[n++] = perf_event_read_value(event);
+       if (read_format & PERF_FORMAT_ID)
+               values[n++] = primary_event_id(event);
+
+       count = n * sizeof(u64);
+
+       if (copy_to_user(buf, values, count))
+               return -EFAULT;
+
+       return count;
+}
+
+static int perf_event_read_group(struct perf_event *event,
+                                  u64 read_format, char __user *buf)
+{
+       struct perf_event *leader = event->group_leader, *sub;
+       int n = 0, size = 0, err = -EFAULT;
+       u64 values[3];
+
+       values[n++] = 1 + leader->nr_siblings;
+       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+               values[n++] = leader->total_time_enabled +
+                       atomic64_read(&leader->child_total_time_enabled);
+       }
+       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+               values[n++] = leader->total_time_running +
+                       atomic64_read(&leader->child_total_time_running);
+       }
+
+       size = n * sizeof(u64);
+
+       if (copy_to_user(buf, values, size))
+               return -EFAULT;
+
+       err = perf_event_read_entry(leader, read_format, buf + size);
+       if (err < 0)
+               return err;
+
+       size += err;
+
+       list_for_each_entry(sub, &leader->sibling_list, group_entry) {
+               err = perf_event_read_entry(sub, read_format,
+                               buf + size);
+               if (err < 0)
+                       return err;
+
+               size += err;
+       }
+
+       return size;
+}
+
+static int perf_event_read_one(struct perf_event *event,
+                                u64 read_format, char __user *buf)
+{
+       u64 values[4];
+       int n = 0;
+
+       values[n++] = perf_event_read_value(event);
+       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+               values[n++] = event->total_time_enabled +
+                       atomic64_read(&event->child_total_time_enabled);
+       }
+       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+               values[n++] = event->total_time_running +
+                       atomic64_read(&event->child_total_time_running);
+       }
+       if (read_format & PERF_FORMAT_ID)
+               values[n++] = primary_event_id(event);
+
+       if (copy_to_user(buf, values, n * sizeof(u64)))
+               return -EFAULT;
+
+       return n * sizeof(u64);
+}
+
+/*
+ * Read the performance event - simple non blocking version for now
+ */
+static ssize_t
+perf_read_hw(struct perf_event *event, char __user *buf, size_t count)
+{
+       u64 read_format = event->attr.read_format;
+       int ret;
+
+       /*
+        * Return end-of-file for a read on a event that is in
+        * error state (i.e. because it was pinned but it couldn't be
+        * scheduled on to the CPU at some point).
+        */
+       if (event->state == PERF_EVENT_STATE_ERROR)
+               return 0;
+
+       if (count < perf_event_read_size(event))
+               return -ENOSPC;
+
+       WARN_ON_ONCE(event->ctx->parent_ctx);
+       mutex_lock(&event->child_mutex);
+       if (read_format & PERF_FORMAT_GROUP)
+               ret = perf_event_read_group(event, read_format, buf);
+       else
+               ret = perf_event_read_one(event, read_format, buf);
+       mutex_unlock(&event->child_mutex);
+
+       return ret;
+}
+
+static ssize_t
+perf_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+{
+       struct perf_event *event = file->private_data;
+
+       return perf_read_hw(event, buf, count);
+}
+
+static unsigned int perf_poll(struct file *file, poll_table *wait)
+{
+       struct perf_event *event = file->private_data;
+       struct perf_mmap_data *data;
+       unsigned int events = POLL_HUP;
+
+       rcu_read_lock();
+       data = rcu_dereference(event->data);
+       if (data)
+               events = atomic_xchg(&data->poll, 0);
+       rcu_read_unlock();
+
+       poll_wait(file, &event->waitq, wait);
+
+       return events;
+}
+
+static void perf_event_reset(struct perf_event *event)
+{
+       (void)perf_event_read(event);
+       atomic64_set(&event->count, 0);
+       perf_event_update_userpage(event);
+}
+
+/*
+ * Holding the top-level event's child_mutex means that any
+ * descendant process that has inherited this event will block
+ * in sync_child_event if it goes to exit, thus satisfying the
+ * task existence requirements of perf_event_enable/disable.
+ */
+static void perf_event_for_each_child(struct perf_event *event,
+                                       void (*func)(struct perf_event *))
+{
+       struct perf_event *child;
+
+       WARN_ON_ONCE(event->ctx->parent_ctx);
+       mutex_lock(&event->child_mutex);
+       func(event);
+       list_for_each_entry(child, &event->child_list, child_list)
+               func(child);
+       mutex_unlock(&event->child_mutex);
+}
+
+static void perf_event_for_each(struct perf_event *event,
+                                 void (*func)(struct perf_event *))
+{
+       struct perf_event_context *ctx = event->ctx;
+       struct perf_event *sibling;
+
+       WARN_ON_ONCE(ctx->parent_ctx);
+       mutex_lock(&ctx->mutex);
+       event = event->group_leader;
+
+       perf_event_for_each_child(event, func);
+       func(event);
+       list_for_each_entry(sibling, &event->sibling_list, group_entry)
+               perf_event_for_each_child(event, func);
+       mutex_unlock(&ctx->mutex);
+}
+
+static int perf_event_period(struct perf_event *event, u64 __user *arg)
+{
+       struct perf_event_context *ctx = event->ctx;
+       unsigned long size;
+       int ret = 0;
+       u64 value;
+
+       if (!event->attr.sample_period)
+               return -EINVAL;
+
+       size = copy_from_user(&value, arg, sizeof(value));
+       if (size != sizeof(value))
+               return -EFAULT;
+
+       if (!value)
+               return -EINVAL;
+
+       spin_lock_irq(&ctx->lock);
+       if (event->attr.freq) {
+               if (value > sysctl_perf_event_sample_rate) {
+                       ret = -EINVAL;
+                       goto unlock;
+               }
+
+               event->attr.sample_freq = value;
+       } else {
+               event->attr.sample_period = value;
+               event->hw.sample_period = value;
+       }
+unlock:
+       spin_unlock_irq(&ctx->lock);
+
+       return ret;
+}
+
+int perf_event_set_output(struct perf_event *event, int output_fd);
+
+static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+       struct perf_event *event = file->private_data;
+       void (*func)(struct perf_event *);
+       u32 flags = arg;
+
+       switch (cmd) {
+       case PERF_EVENT_IOC_ENABLE:
+               func = perf_event_enable;
+               break;
+       case PERF_EVENT_IOC_DISABLE:
+               func = perf_event_disable;
+               break;
+       case PERF_EVENT_IOC_RESET:
+               func = perf_event_reset;
+               break;
+
+       case PERF_EVENT_IOC_REFRESH:
+               return perf_event_refresh(event, arg);
+
+       case PERF_EVENT_IOC_PERIOD:
+               return perf_event_period(event, (u64 __user *)arg);
+
+       case PERF_EVENT_IOC_SET_OUTPUT:
+               return perf_event_set_output(event, arg);
+
+       default:
+               return -ENOTTY;
+       }
+
+       if (flags & PERF_IOC_FLAG_GROUP)
+               perf_event_for_each(event, func);
+       else
+               perf_event_for_each_child(event, func);
+
+       return 0;
+}
+
+int perf_event_task_enable(void)
+{
+       struct perf_event *event;
+
+       mutex_lock(&current->perf_event_mutex);
+       list_for_each_entry(event, &current->perf_event_list, owner_entry)
+               perf_event_for_each_child(event, perf_event_enable);
+       mutex_unlock(&current->perf_event_mutex);
+
+       return 0;
+}
+
+int perf_event_task_disable(void)
+{
+       struct perf_event *event;
+
+       mutex_lock(&current->perf_event_mutex);
+       list_for_each_entry(event, &current->perf_event_list, owner_entry)
+               perf_event_for_each_child(event, perf_event_disable);
+       mutex_unlock(&current->perf_event_mutex);
+
+       return 0;
+}
+
+#ifndef PERF_EVENT_INDEX_OFFSET
+# define PERF_EVENT_INDEX_OFFSET 0
+#endif
+
+static int perf_event_index(struct perf_event *event)
+{
+       if (event->state != PERF_EVENT_STATE_ACTIVE)
+               return 0;
+
+       return event->hw.idx + 1 - PERF_EVENT_INDEX_OFFSET;
+}
+
+/*
+ * Callers need to ensure there can be no nesting of this function, otherwise
+ * the seqlock logic goes bad. We can not serialize this because the arch
+ * code calls this from NMI context.
+ */
+void perf_event_update_userpage(struct perf_event *event)
+{
+       struct perf_event_mmap_page *userpg;
+       struct perf_mmap_data *data;
+
+       rcu_read_lock();
+       data = rcu_dereference(event->data);
+       if (!data)
+               goto unlock;
+
+       userpg = data->user_page;
+
+       /*
+        * Disable preemption so as to not let the corresponding user-space
+        * spin too long if we get preempted.
+        */
+       preempt_disable();
+       ++userpg->lock;
+       barrier();
+       userpg->index = perf_event_index(event);
+       userpg->offset = atomic64_read(&event->count);
+       if (event->state == PERF_EVENT_STATE_ACTIVE)
+               userpg->offset -= atomic64_read(&event->hw.prev_count);
+
+       userpg->time_enabled = event->total_time_enabled +
+                       atomic64_read(&event->child_total_time_enabled);
+
+       userpg->time_running = event->total_time_running +
+                       atomic64_read(&event->child_total_time_running);
+
+       barrier();
+       ++userpg->lock;
+       preempt_enable();
+unlock:
+       rcu_read_unlock();
+}
+
+static int perf_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+       struct perf_event *event = vma->vm_file->private_data;
+       struct perf_mmap_data *data;
+       int ret = VM_FAULT_SIGBUS;
+
+       if (vmf->flags & FAULT_FLAG_MKWRITE) {
+               if (vmf->pgoff == 0)
+                       ret = 0;
+               return ret;
+       }
+
+       rcu_read_lock();
+       data = rcu_dereference(event->data);
+       if (!data)
+               goto unlock;
+
+       if (vmf->pgoff == 0) {
+               vmf->page = virt_to_page(data->user_page);
+       } else {
+               int nr = vmf->pgoff - 1;
+
+               if ((unsigned)nr > data->nr_pages)
+                       goto unlock;
+
+               if (vmf->flags & FAULT_FLAG_WRITE)
+                       goto unlock;
+
+               vmf->page = virt_to_page(data->data_pages[nr]);
+       }
+
+       get_page(vmf->page);
+       vmf->page->mapping = vma->vm_file->f_mapping;
+       vmf->page->index   = vmf->pgoff;
+
+       ret = 0;
+unlock:
+       rcu_read_unlock();
+
+       return ret;
+}
+
+static int perf_mmap_data_alloc(struct perf_event *event, int nr_pages)
+{
+       struct perf_mmap_data *data;
+       unsigned long size;
+       int i;
+
+       WARN_ON(atomic_read(&event->mmap_count));
+
+       size = sizeof(struct perf_mmap_data);
+       size += nr_pages * sizeof(void *);
+
+       data = kzalloc(size, GFP_KERNEL);
+       if (!data)
+               goto fail;
+
+       data->user_page = (void *)get_zeroed_page(GFP_KERNEL);
+       if (!data->user_page)
+               goto fail_user_page;
+
+       for (i = 0; i < nr_pages; i++) {
+               data->data_pages[i] = (void *)get_zeroed_page(GFP_KERNEL);
+               if (!data->data_pages[i])
+                       goto fail_data_pages;
+       }
+
+       data->nr_pages = nr_pages;
+       atomic_set(&data->lock, -1);
+
+       if (event->attr.watermark) {
+               data->watermark = min_t(long, PAGE_SIZE * nr_pages,
+                                     event->attr.wakeup_watermark);
+       }
+       if (!data->watermark)
+               data->watermark = max(PAGE_SIZE, PAGE_SIZE * nr_pages / 4);
+
+       rcu_assign_pointer(event->data, data);
+
+       return 0;
+
+fail_data_pages:
+       for (i--; i >= 0; i--)
+               free_page((unsigned long)data->data_pages[i]);
+
+       free_page((unsigned long)data->user_page);
+
+fail_user_page:
+       kfree(data);
+
+fail:
+       return -ENOMEM;
+}
+
+static void perf_mmap_free_page(unsigned long addr)
+{
+       struct page *page = virt_to_page((void *)addr);
+
+       page->mapping = NULL;
+       __free_page(page);
+}
+
+static void __perf_mmap_data_free(struct rcu_head *rcu_head)
+{
+       struct perf_mmap_data *data;
+       int i;
+
+       data = container_of(rcu_head, struct perf_mmap_data, rcu_head);
+
+       perf_mmap_free_page((unsigned long)data->user_page);
+       for (i = 0; i < data->nr_pages; i++)
+               perf_mmap_free_page((unsigned long)data->data_pages[i]);
+
+       kfree(data);
+}
+
+static void perf_mmap_data_free(struct perf_event *event)
+{
+       struct perf_mmap_data *data = event->data;
+
+       WARN_ON(atomic_read(&event->mmap_count));
+
+       rcu_assign_pointer(event->data, NULL);
+       call_rcu(&data->rcu_head, __perf_mmap_data_free);
+}
+
+static void perf_mmap_open(struct vm_area_struct *vma)
+{
+       struct perf_event *event = vma->vm_file->private_data;
+
+       atomic_inc(&event->mmap_count);
+}
+
+static void perf_mmap_close(struct vm_area_struct *vma)
+{
+       struct perf_event *event = vma->vm_file->private_data;
+
+       WARN_ON_ONCE(event->ctx->parent_ctx);
+       if (atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) {
+               struct user_struct *user = current_user();
+
+               atomic_long_sub(event->data->nr_pages + 1, &user->locked_vm);
+               vma->vm_mm->locked_vm -= event->data->nr_locked;
+               perf_mmap_data_free(event);
+               mutex_unlock(&event->mmap_mutex);
+       }
+}
+
+static struct vm_operations_struct perf_mmap_vmops = {
+       .open           = perf_mmap_open,
+       .close          = perf_mmap_close,
+       .fault          = perf_mmap_fault,
+       .page_mkwrite   = perf_mmap_fault,
+};
+
+static int perf_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       struct perf_event *event = file->private_data;
+       unsigned long user_locked, user_lock_limit;
+       struct user_struct *user = current_user();
+       unsigned long locked, lock_limit;
+       unsigned long vma_size;
+       unsigned long nr_pages;
+       long user_extra, extra;
+       int ret = 0;
+
+       if (!(vma->vm_flags & VM_SHARED))
+               return -EINVAL;
+
+       vma_size = vma->vm_end - vma->vm_start;
+       nr_pages = (vma_size / PAGE_SIZE) - 1;
+
+       /*
+        * If we have data pages ensure they're a power-of-two number, so we
+        * can do bitmasks instead of modulo.
+        */
+       if (nr_pages != 0 && !is_power_of_2(nr_pages))
+               return -EINVAL;
+
+       if (vma_size != PAGE_SIZE * (1 + nr_pages))
+               return -EINVAL;
+
+       if (vma->vm_pgoff != 0)
+               return -EINVAL;
+
+       WARN_ON_ONCE(event->ctx->parent_ctx);
+       mutex_lock(&event->mmap_mutex);
+       if (event->output) {
+               ret = -EINVAL;
+               goto unlock;
+       }
+
+       if (atomic_inc_not_zero(&event->mmap_count)) {
+               if (nr_pages != event->data->nr_pages)
+                       ret = -EINVAL;
+               goto unlock;
+       }
+
+       user_extra = nr_pages + 1;
+       user_lock_limit = sysctl_perf_event_mlock >> (PAGE_SHIFT - 10);
+
+       /*
+        * Increase the limit linearly with more CPUs:
+        */
+       user_lock_limit *= num_online_cpus();
+
+       user_locked = atomic_long_read(&user->locked_vm) + user_extra;
+
+       extra = 0;
+       if (user_locked > user_lock_limit)
+               extra = user_locked - user_lock_limit;
+
+       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+       lock_limit >>= PAGE_SHIFT;
+       locked = vma->vm_mm->locked_vm + extra;
+
+       if ((locked > lock_limit) && perf_paranoid_tracepoint_raw() &&
+               !capable(CAP_IPC_LOCK)) {
+               ret = -EPERM;
+               goto unlock;
+       }
+
+       WARN_ON(event->data);
+       ret = perf_mmap_data_alloc(event, nr_pages);
+       if (ret)
+               goto unlock;
+
+       atomic_set(&event->mmap_count, 1);
+       atomic_long_add(user_extra, &user->locked_vm);
+       vma->vm_mm->locked_vm += extra;
+       event->data->nr_locked = extra;
+       if (vma->vm_flags & VM_WRITE)
+               event->data->writable = 1;
+
+unlock:
+       mutex_unlock(&event->mmap_mutex);
+
+       vma->vm_flags |= VM_RESERVED;
+       vma->vm_ops = &perf_mmap_vmops;
+
+       return ret;
+}
+
+static int perf_fasync(int fd, struct file *filp, int on)
+{
+       struct inode *inode = filp->f_path.dentry->d_inode;
+       struct perf_event *event = filp->private_data;
+       int retval;
+
+       mutex_lock(&inode->i_mutex);
+       retval = fasync_helper(fd, filp, on, &event->fasync);
+       mutex_unlock(&inode->i_mutex);
+
+       if (retval < 0)
+               return retval;
+
+       return 0;
+}
+
+static const struct file_operations perf_fops = {
+       .release                = perf_release,
+       .read                   = perf_read,
+       .poll                   = perf_poll,
+       .unlocked_ioctl         = perf_ioctl,
+       .compat_ioctl           = perf_ioctl,
+       .mmap                   = perf_mmap,
+       .fasync                 = perf_fasync,
+};
+
+/*
+ * Perf event wakeup
+ *
+ * If there's data, ensure we set the poll() state and publish everything
+ * to user-space before waking everybody up.
+ */
+
+void perf_event_wakeup(struct perf_event *event)
+{
+       wake_up_all(&event->waitq);
+
+       if (event->pending_kill) {
+               kill_fasync(&event->fasync, SIGIO, event->pending_kill);
+               event->pending_kill = 0;
+       }
+}
+
+/*
+ * Pending wakeups
+ *
+ * Handle the case where we need to wakeup up from NMI (or rq->lock) context.
+ *
+ * The NMI bit means we cannot possibly take locks. Therefore, maintain a
+ * single linked list and use cmpxchg() to add entries lockless.
+ */
+
+static void perf_pending_event(struct perf_pending_entry *entry)
+{
+       struct perf_event *event = container_of(entry,
+                       struct perf_event, pending);
+
+       if (event->pending_disable) {
+               event->pending_disable = 0;
+               __perf_event_disable(event);
+       }
+
+       if (event->pending_wakeup) {
+               event->pending_wakeup = 0;
+               perf_event_wakeup(event);
+       }
+}
+
+#define PENDING_TAIL ((struct perf_pending_entry *)-1UL)
+
+static DEFINE_PER_CPU(struct perf_pending_entry *, perf_pending_head) = {
+       PENDING_TAIL,
+};
+
+static void perf_pending_queue(struct perf_pending_entry *entry,
+                              void (*func)(struct perf_pending_entry *))
+{
+       struct perf_pending_entry **head;
+
+       if (cmpxchg(&entry->next, NULL, PENDING_TAIL) != NULL)
+               return;
+
+       entry->func = func;
+
+       head = &get_cpu_var(perf_pending_head);
+
+       do {
+               entry->next = *head;
+       } while (cmpxchg(head, entry->next, entry) != entry->next);
+
+       set_perf_event_pending();
+
+       put_cpu_var(perf_pending_head);
+}
+
+static int __perf_pending_run(void)
+{
+       struct perf_pending_entry *list;
+       int nr = 0;
+
+       list = xchg(&__get_cpu_var(perf_pending_head), PENDING_TAIL);
+       while (list != PENDING_TAIL) {
+               void (*func)(struct perf_pending_entry *);
+               struct perf_pending_entry *entry = list;
+
+               list = list->next;
+
+               func = entry->func;
+               entry->next = NULL;
+               /*
+                * Ensure we observe the unqueue before we issue the wakeup,
+                * so that we won't be waiting forever.
+                * -- see perf_not_pending().
+                */
+               smp_wmb();
+
+               func(entry);
+               nr++;
+       }
+
+       return nr;
+}
+
+static inline int perf_not_pending(struct perf_event *event)
+{
+       /*
+        * If we flush on whatever cpu we run, there is a chance we don't
+        * need to wait.
+        */
+       get_cpu();
+       __perf_pending_run();
+       put_cpu();
+
+       /*
+        * Ensure we see the proper queue state before going to sleep
+        * so that we do not miss the wakeup. -- see perf_pending_handle()
+        */
+       smp_rmb();
+       return event->pending.next == NULL;
+}
+
+static void perf_pending_sync(struct perf_event *event)
+{
+       wait_event(event->waitq, perf_not_pending(event));
+}
+
+void perf_event_do_pending(void)
+{
+       __perf_pending_run();
+}
+
+/*
+ * Callchain support -- arch specific
+ */
+
+__weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
+{
+       return NULL;
+}
+
+/*
+ * Output
+ */
+static bool perf_output_space(struct perf_mmap_data *data, unsigned long tail,
+                             unsigned long offset, unsigned long head)
+{
+       unsigned long mask;
+
+       if (!data->writable)
+               return true;
+
+       mask = (data->nr_pages << PAGE_SHIFT) - 1;
+
+       offset = (offset - tail) & mask;
+       head   = (head   - tail) & mask;
+
+       if ((int)(head - offset) < 0)
+               return false;
+
+       return true;
+}
+
+static void perf_output_wakeup(struct perf_output_handle *handle)
+{
+       atomic_set(&handle->data->poll, POLL_IN);
+
+       if (handle->nmi) {
+               handle->event->pending_wakeup = 1;
+               perf_pending_queue(&handle->event->pending,
+                                  perf_pending_event);
+       } else
+               perf_event_wakeup(handle->event);
+}
+
+/*
+ * Curious locking construct.
+ *
+ * We need to ensure a later event_id doesn't publish a head when a former
+ * event_id isn't done writing. However since we need to deal with NMIs we
+ * cannot fully serialize things.
+ *
+ * What we do is serialize between CPUs so we only have to deal with NMI
+ * nesting on a single CPU.
+ *
+ * We only publish the head (and generate a wakeup) when the outer-most
+ * event_id completes.
+ */
+static void perf_output_lock(struct perf_output_handle *handle)
+{
+       struct perf_mmap_data *data = handle->data;
+       int cpu;
+
+       handle->locked = 0;
+
+       local_irq_save(handle->flags);
+       cpu = smp_processor_id();
+
+       if (in_nmi() && atomic_read(&data->lock) == cpu)
+               return;
+
+       while (atomic_cmpxchg(&data->lock, -1, cpu) != -1)
+               cpu_relax();
+
+       handle->locked = 1;
+}
+
+static void perf_output_unlock(struct perf_output_handle *handle)
+{
+       struct perf_mmap_data *data = handle->data;
+       unsigned long head;
+       int cpu;
+
+       data->done_head = data->head;
+
+       if (!handle->locked)
+               goto out;
+
+again:
+       /*
+        * The xchg implies a full barrier that ensures all writes are done
+        * before we publish the new head, matched by a rmb() in userspace when
+        * reading this position.
+        */
+       while ((head = atomic_long_xchg(&data->done_head, 0)))
+               data->user_page->data_head = head;
+
+       /*
+        * NMI can happen here, which means we can miss a done_head update.
+        */
+
+       cpu = atomic_xchg(&data->lock, -1);
+       WARN_ON_ONCE(cpu != smp_processor_id());
+
+       /*
+        * Therefore we have to validate we did not indeed do so.
+        */
+       if (unlikely(atomic_long_read(&data->done_head))) {
+               /*
+                * Since we had it locked, we can lock it again.
+                */
+               while (atomic_cmpxchg(&data->lock, -1, cpu) != -1)
+                       cpu_relax();
+
+               goto again;
+       }
+
+       if (atomic_xchg(&data->wakeup, 0))
+               perf_output_wakeup(handle);
+out:
+       local_irq_restore(handle->flags);
+}
+
+void perf_output_copy(struct perf_output_handle *handle,
+                     const void *buf, unsigned int len)
+{
+       unsigned int pages_mask;
+       unsigned int offset;
+       unsigned int size;
+       void **pages;
+
+       offset          = handle->offset;
+       pages_mask      = handle->data->nr_pages - 1;
+       pages           = handle->data->data_pages;
+
+       do {
+               unsigned int page_offset;
+               int nr;
+
+               nr          = (offset >> PAGE_SHIFT) & pages_mask;
+               page_offset = offset & (PAGE_SIZE - 1);
+               size        = min_t(unsigned int, PAGE_SIZE - page_offset, len);
+
+               memcpy(pages[nr] + page_offset, buf, size);
+
+               len         -= size;
+               buf         += size;
+               offset      += size;
+       } while (len);
+
+       handle->offset = offset;
+
+       /*
+        * Check we didn't copy past our reservation window, taking the
+        * possible unsigned int wrap into account.
+        */
+       WARN_ON_ONCE(((long)(handle->head - handle->offset)) < 0);
+}
+
+int perf_output_begin(struct perf_output_handle *handle,
+                     struct perf_event *event, unsigned int size,
+                     int nmi, int sample)
+{
+       struct perf_event *output_event;
+       struct perf_mmap_data *data;
+       unsigned long tail, offset, head;
+       int have_lost;
+       struct {
+               struct perf_event_header header;
+               u64                      id;
+               u64                      lost;
+       } lost_event;
+
+       rcu_read_lock();
+       /*
+        * For inherited events we send all the output towards the parent.
+        */
+       if (event->parent)
+               event = event->parent;
+
+       output_event = rcu_dereference(event->output);
+       if (output_event)
+               event = output_event;
+
+       data = rcu_dereference(event->data);
+       if (!data)
+               goto out;
+
+       handle->data    = data;
+       handle->event   = event;
+       handle->nmi     = nmi;
+       handle->sample  = sample;
+
+       if (!data->nr_pages)
+               goto fail;
+
+       have_lost = atomic_read(&data->lost);
+       if (have_lost)
+               size += sizeof(lost_event);
+
+       perf_output_lock(handle);
+
+       do {
+               /*
+                * Userspace could choose to issue a mb() before updating the
+                * tail pointer. So that all reads will be completed before the
+                * write is issued.
+                */
+               tail = ACCESS_ONCE(data->user_page->data_tail);
+               smp_rmb();
+               offset = head = atomic_long_read(&data->head);
+               head += size;
+               if (unlikely(!perf_output_space(data, tail, offset, head)))
+                       goto fail;
+       } while (atomic_long_cmpxchg(&data->head, offset, head) != offset);
+
+       handle->offset  = offset;
+       handle->head    = head;
+
+       if (head - tail > data->watermark)
+               atomic_set(&data->wakeup, 1);
+
+       if (have_lost) {
+               lost_event.header.type = PERF_RECORD_LOST;
+               lost_event.header.misc = 0;
+               lost_event.header.size = sizeof(lost_event);
+               lost_event.id          = event->id;
+               lost_event.lost        = atomic_xchg(&data->lost, 0);
+
+               perf_output_put(handle, lost_event);
+       }
+
+       return 0;
+
+fail:
+       atomic_inc(&data->lost);
+       perf_output_unlock(handle);
+out:
+       rcu_read_unlock();
+
+       return -ENOSPC;
+}
+
+void perf_output_end(struct perf_output_handle *handle)
+{
+       struct perf_event *event = handle->event;
+       struct perf_mmap_data *data = handle->data;
+
+       int wakeup_events = event->attr.wakeup_events;
+
+       if (handle->sample && wakeup_events) {
+               int events = atomic_inc_return(&data->events);
+               if (events >= wakeup_events) {
+                       atomic_sub(wakeup_events, &data->events);
+                       atomic_set(&data->wakeup, 1);
+               }
+       }
+
+       perf_output_unlock(handle);
+       rcu_read_unlock();
+}
+
+static u32 perf_event_pid(struct perf_event *event, struct task_struct *p)
+{
+       /*
+        * only top level events have the pid namespace they were created in
+        */
+       if (event->parent)
+               event = event->parent;
+
+       return task_tgid_nr_ns(p, event->ns);
+}
+
+static u32 perf_event_tid(struct perf_event *event, struct task_struct *p)
+{
+       /*
+        * only top level events have the pid namespace they were created in
+        */
+       if (event->parent)
+               event = event->parent;
+
+       return task_pid_nr_ns(p, event->ns);
+}
+
+static void perf_output_read_one(struct perf_output_handle *handle,
+                                struct perf_event *event)
+{
+       u64 read_format = event->attr.read_format;
+       u64 values[4];
+       int n = 0;
+
+       values[n++] = atomic64_read(&event->count);
+       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+               values[n++] = event->total_time_enabled +
+                       atomic64_read(&event->child_total_time_enabled);
+       }
+       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+               values[n++] = event->total_time_running +
+                       atomic64_read(&event->child_total_time_running);
+       }
+       if (read_format & PERF_FORMAT_ID)
+               values[n++] = primary_event_id(event);
+
+       perf_output_copy(handle, values, n * sizeof(u64));
+}
+
+/*
+ * XXX PERF_FORMAT_GROUP vs inherited events seems difficult.
+ */
+static void perf_output_read_group(struct perf_output_handle *handle,
+                           struct perf_event *event)
+{
+       struct perf_event *leader = event->group_leader, *sub;
+       u64 read_format = event->attr.read_format;
+       u64 values[5];
+       int n = 0;
+
+       values[n++] = 1 + leader->nr_siblings;
+
+       if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
+               values[n++] = leader->total_time_enabled;
+
+       if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
+               values[n++] = leader->total_time_running;
+
+       if (leader != event)
+               leader->pmu->read(leader);
+
+       values[n++] = atomic64_read(&leader->count);
+       if (read_format & PERF_FORMAT_ID)
+               values[n++] = primary_event_id(leader);
+
+       perf_output_copy(handle, values, n * sizeof(u64));
+
+       list_for_each_entry(sub, &leader->sibling_list, group_entry) {
+               n = 0;
+
+               if (sub != event)
+                       sub->pmu->read(sub);
+
+               values[n++] = atomic64_read(&sub->count);
+               if (read_format & PERF_FORMAT_ID)
+                       values[n++] = primary_event_id(sub);
+
+               perf_output_copy(handle, values, n * sizeof(u64));
+       }
+}
+
+static void perf_output_read(struct perf_output_handle *handle,
+                            struct perf_event *event)
+{
+       if (event->attr.read_format & PERF_FORMAT_GROUP)
+               perf_output_read_group(handle, event);
+       else
+               perf_output_read_one(handle, event);
+}
+
+void perf_output_sample(struct perf_output_handle *handle,
+                       struct perf_event_header *header,
+                       struct perf_sample_data *data,
+                       struct perf_event *event)
+{
+       u64 sample_type = data->type;
+
+       perf_output_put(handle, *header);
+
+       if (sample_type & PERF_SAMPLE_IP)
+               perf_output_put(handle, data->ip);
+
+       if (sample_type & PERF_SAMPLE_TID)
+               perf_output_put(handle, data->tid_entry);
+
+       if (sample_type & PERF_SAMPLE_TIME)
+               perf_output_put(handle, data->time);
+
+       if (sample_type & PERF_SAMPLE_ADDR)
+               perf_output_put(handle, data->addr);
+
+       if (sample_type & PERF_SAMPLE_ID)
+               perf_output_put(handle, data->id);
+
+       if (sample_type & PERF_SAMPLE_STREAM_ID)
+               perf_output_put(handle, data->stream_id);
+
+       if (sample_type & PERF_SAMPLE_CPU)
+               perf_output_put(handle, data->cpu_entry);
+
+       if (sample_type & PERF_SAMPLE_PERIOD)
+               perf_output_put(handle, data->period);
+
+       if (sample_type & PERF_SAMPLE_READ)
+               perf_output_read(handle, event);
+
+       if (sample_type & PERF_SAMPLE_CALLCHAIN) {
+               if (data->callchain) {
+                       int size = 1;
+
+                       if (data->callchain)
+                               size += data->callchain->nr;
+
+                       size *= sizeof(u64);
+
+                       perf_output_copy(handle, data->callchain, size);
+               } else {
+                       u64 nr = 0;
+                       perf_output_put(handle, nr);
+               }
+       }
+
+       if (sample_type & PERF_SAMPLE_RAW) {
+               if (data->raw) {
+                       perf_output_put(handle, data->raw->size);
+                       perf_output_copy(handle, data->raw->data,
+                                        data->raw->size);
+               } else {
+                       struct {
+                               u32     size;
+                               u32     data;
+                       } raw = {
+                               .size = sizeof(u32),
+                               .data = 0,
+                       };
+                       perf_output_put(handle, raw);
+               }
+       }
+}
+
+void perf_prepare_sample(struct perf_event_header *header,
+                        struct perf_sample_data *data,
+                        struct perf_event *event,
+                        struct pt_regs *regs)
+{
+       u64 sample_type = event->attr.sample_type;
+
+       data->type = sample_type;
+
+       header->type = PERF_RECORD_SAMPLE;
+       header->size = sizeof(*header);
+
+       header->misc = 0;
+       header->misc |= perf_misc_flags(regs);
+
+       if (sample_type & PERF_SAMPLE_IP) {
+               data->ip = perf_instruction_pointer(regs);
+
+               header->size += sizeof(data->ip);
+       }
+
+       if (sample_type & PERF_SAMPLE_TID) {
+               /* namespace issues */
+               data->tid_entry.pid = perf_event_pid(event, current);
+               data->tid_entry.tid = perf_event_tid(event, current);
+
+               header->size += sizeof(data->tid_entry);
+       }
+
+       if (sample_type & PERF_SAMPLE_TIME) {
+               data->time = perf_clock();
+
+               header->size += sizeof(data->time);
+       }
+
+       if (sample_type & PERF_SAMPLE_ADDR)
+               header->size += sizeof(data->addr);
+
+       if (sample_type & PERF_SAMPLE_ID) {
+               data->id = primary_event_id(event);
+
+               header->size += sizeof(data->id);
+       }
+
+       if (sample_type & PERF_SAMPLE_STREAM_ID) {
+               data->stream_id = event->id;
+
+               header->size += sizeof(data->stream_id);
+       }
+
+       if (sample_type & PERF_SAMPLE_CPU) {
+               data->cpu_entry.cpu             = raw_smp_processor_id();
+               data->cpu_entry.reserved        = 0;
+
+               header->size += sizeof(data->cpu_entry);
+       }
+
+       if (sample_type & PERF_SAMPLE_PERIOD)
+               header->size += sizeof(data->period);
+
+       if (sample_type & PERF_SAMPLE_READ)
+               header->size += perf_event_read_size(event);
+
+       if (sample_type & PERF_SAMPLE_CALLCHAIN) {
+               int size = 1;
+
+               data->callchain = perf_callchain(regs);
+
+               if (data->callchain)
+                       size += data->callchain->nr;
+
+               header->size += size * sizeof(u64);
+       }
+
+       if (sample_type & PERF_SAMPLE_RAW) {
+               int size = sizeof(u32);
+
+               if (data->raw)
+                       size += data->raw->size;
+               else
+                       size += sizeof(u32);
+
+               WARN_ON_ONCE(size & (sizeof(u64)-1));
+               header->size += size;
+       }
+}
+
+static void perf_event_output(struct perf_event *event, int nmi,
+                               struct perf_sample_data *data,
+                               struct pt_regs *regs)
+{
+       struct perf_output_handle handle;
+       struct perf_event_header header;
+
+       perf_prepare_sample(&header, data, event, regs);
+
+       if (perf_output_begin(&handle, event, header.size, nmi, 1))
+               return;
+
+       perf_output_sample(&handle, &header, data, event);
+
+       perf_output_end(&handle);
+}
+
+/*
+ * read event_id
+ */
+
+struct perf_read_event {
+       struct perf_event_header        header;
+
+       u32                             pid;
+       u32                             tid;
+};
+
+static void
+perf_event_read_event(struct perf_event *event,
+                       struct task_struct *task)
+{
+       struct perf_output_handle handle;
+       struct perf_read_event read_event = {
+               .header = {
+                       .type = PERF_RECORD_READ,
+                       .misc = 0,
+                       .size = sizeof(read_event) + perf_event_read_size(event),
+               },
+               .pid = perf_event_pid(event, task),
+               .tid = perf_event_tid(event, task),
+       };
+       int ret;
+
+       ret = perf_output_begin(&handle, event, read_event.header.size, 0, 0);
+       if (ret)
+               return;
+
+       perf_output_put(&handle, read_event);
+       perf_output_read(&handle, event);
+
+       perf_output_end(&handle);
+}
+
+/*
+ * task tracking -- fork/exit
+ *
+ * enabled by: attr.comm | attr.mmap | attr.task
+ */
+
+struct perf_task_event {
+       struct task_struct              *task;
+       struct perf_event_context       *task_ctx;
+
+       struct {
+               struct perf_event_header        header;
+
+               u32                             pid;
+               u32                             ppid;
+               u32                             tid;
+               u32                             ptid;
+               u64                             time;
+       } event_id;
+};
+
+static void perf_event_task_output(struct perf_event *event,
+                                    struct perf_task_event *task_event)
+{
+       struct perf_output_handle handle;
+       int size;
+       struct task_struct *task = task_event->task;
+       int ret;
+
+       size  = task_event->event_id.header.size;
+       ret = perf_output_begin(&handle, event, size, 0, 0);
+
+       if (ret)
+               return;
+
+       task_event->event_id.pid = perf_event_pid(event, task);
+       task_event->event_id.ppid = perf_event_pid(event, current);
+
+       task_event->event_id.tid = perf_event_tid(event, task);
+       task_event->event_id.ptid = perf_event_tid(event, current);
+
+       task_event->event_id.time = perf_clock();
+
+       perf_output_put(&handle, task_event->event_id);
+
+       perf_output_end(&handle);
+}
+
+static int perf_event_task_match(struct perf_event *event)
+{
+       if (event->attr.comm || event->attr.mmap || event->attr.task)
+               return 1;
+
+       return 0;
+}
+
+static void perf_event_task_ctx(struct perf_event_context *ctx,
+                                 struct perf_task_event *task_event)
+{
+       struct perf_event *event;
+
+       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
+               return;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
+               if (perf_event_task_match(event))
+                       perf_event_task_output(event, task_event);
+       }
+       rcu_read_unlock();
+}
+
+static void perf_event_task_event(struct perf_task_event *task_event)
+{
+       struct perf_cpu_context *cpuctx;
+       struct perf_event_context *ctx = task_event->task_ctx;
+
+       cpuctx = &get_cpu_var(perf_cpu_context);
+       perf_event_task_ctx(&cpuctx->ctx, task_event);
+       put_cpu_var(perf_cpu_context);
+
+       rcu_read_lock();
+       if (!ctx)
+               ctx = rcu_dereference(task_event->task->perf_event_ctxp);
+       if (ctx)
+               perf_event_task_ctx(ctx, task_event);
+       rcu_read_unlock();
+}
+
+static void perf_event_task(struct task_struct *task,
+                             struct perf_event_context *task_ctx,
+                             int new)
+{
+       struct perf_task_event task_event;
+
+       if (!atomic_read(&nr_comm_events) &&
+           !atomic_read(&nr_mmap_events) &&
+           !atomic_read(&nr_task_events))
+               return;
+
+       task_event = (struct perf_task_event){
+               .task     = task,
+               .task_ctx = task_ctx,
+               .event_id    = {
+                       .header = {
+                               .type = new ? PERF_RECORD_FORK : PERF_RECORD_EXIT,
+                               .misc = 0,
+                               .size = sizeof(task_event.event_id),
+                       },
+                       /* .pid  */
+                       /* .ppid */
+                       /* .tid  */
+                       /* .ptid */
+               },
+       };
+
+       perf_event_task_event(&task_event);
+}
+
+void perf_event_fork(struct task_struct *task)
+{
+       perf_event_task(task, NULL, 1);
+}
+
+/*
+ * comm tracking
+ */
+
+struct perf_comm_event {
+       struct task_struct      *task;
+       char                    *comm;
+       int                     comm_size;
+
+       struct {
+               struct perf_event_header        header;
+
+               u32                             pid;
+               u32                             tid;
+       } event_id;
+};
+
+static void perf_event_comm_output(struct perf_event *event,
+                                    struct perf_comm_event *comm_event)
+{
+       struct perf_output_handle handle;
+       int size = comm_event->event_id.header.size;
+       int ret = perf_output_begin(&handle, event, size, 0, 0);
+
+       if (ret)
+               return;
+
+       comm_event->event_id.pid = perf_event_pid(event, comm_event->task);
+       comm_event->event_id.tid = perf_event_tid(event, comm_event->task);
+
+       perf_output_put(&handle, comm_event->event_id);
+       perf_output_copy(&handle, comm_event->comm,
+                                  comm_event->comm_size);
+       perf_output_end(&handle);
+}
+
+static int perf_event_comm_match(struct perf_event *event)
+{
+       if (event->attr.comm)
+               return 1;
+
+       return 0;
+}
+
+static void perf_event_comm_ctx(struct perf_event_context *ctx,
+                                 struct perf_comm_event *comm_event)
+{
+       struct perf_event *event;
+
+       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
+               return;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
+               if (perf_event_comm_match(event))
+                       perf_event_comm_output(event, comm_event);
+       }
+       rcu_read_unlock();
+}
+
+static void perf_event_comm_event(struct perf_comm_event *comm_event)
+{
+       struct perf_cpu_context *cpuctx;
+       struct perf_event_context *ctx;
+       unsigned int size;
+       char comm[TASK_COMM_LEN];
+
+       memset(comm, 0, sizeof(comm));
+       strncpy(comm, comm_event->task->comm, sizeof(comm));
+       size = ALIGN(strlen(comm)+1, sizeof(u64));
+
+       comm_event->comm = comm;
+       comm_event->comm_size = size;
+
+       comm_event->event_id.header.size = sizeof(comm_event->event_id) + size;
+
+       cpuctx = &get_cpu_var(perf_cpu_context);
+       perf_event_comm_ctx(&cpuctx->ctx, comm_event);
+       put_cpu_var(perf_cpu_context);
+
+       rcu_read_lock();
+       /*
+        * doesn't really matter which of the child contexts the
+        * events ends up in.
+        */
+       ctx = rcu_dereference(current->perf_event_ctxp);
+       if (ctx)
+               perf_event_comm_ctx(ctx, comm_event);
+       rcu_read_unlock();
+}
+
+void perf_event_comm(struct task_struct *task)
+{
+       struct perf_comm_event comm_event;
+
+       if (task->perf_event_ctxp)
+               perf_event_enable_on_exec(task);
+
+       if (!atomic_read(&nr_comm_events))
+               return;
+
+       comm_event = (struct perf_comm_event){
+               .task   = task,
+               /* .comm      */
+               /* .comm_size */
+               .event_id  = {
+                       .header = {
+                               .type = PERF_RECORD_COMM,
+                               .misc = 0,
+                               /* .size */
+                       },
+                       /* .pid */
+                       /* .tid */
+               },
+       };
+
+       perf_event_comm_event(&comm_event);
+}
+
+/*
+ * mmap tracking
+ */
+
+struct perf_mmap_event {
+       struct vm_area_struct   *vma;
+
+       const char              *file_name;
+       int                     file_size;
+
+       struct {
+               struct perf_event_header        header;
+
+               u32                             pid;
+               u32                             tid;
+               u64                             start;
+               u64                             len;
+               u64                             pgoff;
+       } event_id;
+};
+
+static void perf_event_mmap_output(struct perf_event *event,
+                                    struct perf_mmap_event *mmap_event)
+{
+       struct perf_output_handle handle;
+       int size = mmap_event->event_id.header.size;
+       int ret = perf_output_begin(&handle, event, size, 0, 0);
+
+       if (ret)
+               return;
+
+       mmap_event->event_id.pid = perf_event_pid(event, current);
+       mmap_event->event_id.tid = perf_event_tid(event, current);
+
+       perf_output_put(&handle, mmap_event->event_id);
+       perf_output_copy(&handle, mmap_event->file_name,
+                                  mmap_event->file_size);
+       perf_output_end(&handle);
+}
+
+static int perf_event_mmap_match(struct perf_event *event,
+                                  struct perf_mmap_event *mmap_event)
+{
+       if (event->attr.mmap)
+               return 1;
+
+       return 0;
+}
+
+static void perf_event_mmap_ctx(struct perf_event_context *ctx,
+                                 struct perf_mmap_event *mmap_event)
+{
+       struct perf_event *event;
+
+       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
+               return;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
+               if (perf_event_mmap_match(event, mmap_event))
+                       perf_event_mmap_output(event, mmap_event);
+       }
+       rcu_read_unlock();
+}
+
+static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
+{
+       struct perf_cpu_context *cpuctx;
+       struct perf_event_context *ctx;
+       struct vm_area_struct *vma = mmap_event->vma;
+       struct file *file = vma->vm_file;
+       unsigned int size;
+       char tmp[16];
+       char *buf = NULL;
+       const char *name;
+
+       memset(tmp, 0, sizeof(tmp));
+
+       if (file) {
+               /*
+                * d_path works from the end of the buffer backwards, so we
+                * need to add enough zero bytes after the string to handle
+                * the 64bit alignment we do later.
+                */
+               buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
+               if (!buf) {
+                       name = strncpy(tmp, "//enomem", sizeof(tmp));
+                       goto got_name;
+               }
+               name = d_path(&file->f_path, buf, PATH_MAX);
+               if (IS_ERR(name)) {
+                       name = strncpy(tmp, "//toolong", sizeof(tmp));
+                       goto got_name;
+               }
+       } else {
+               if (arch_vma_name(mmap_event->vma)) {
+                       name = strncpy(tmp, arch_vma_name(mmap_event->vma),
+                                      sizeof(tmp));
+                       goto got_name;
+               }
+
+               if (!vma->vm_mm) {
+                       name = strncpy(tmp, "[vdso]", sizeof(tmp));
+                       goto got_name;
+               }
+
+               name = strncpy(tmp, "//anon", sizeof(tmp));
+               goto got_name;
+       }
+
+got_name:
+       size = ALIGN(strlen(name)+1, sizeof(u64));
+
+       mmap_event->file_name = name;
+       mmap_event->file_size = size;
+
+       mmap_event->event_id.header.size = sizeof(mmap_event->event_id) + size;
+
+       cpuctx = &get_cpu_var(perf_cpu_context);
+       perf_event_mmap_ctx(&cpuctx->ctx, mmap_event);
+       put_cpu_var(perf_cpu_context);
+
+       rcu_read_lock();
+       /*
+        * doesn't really matter which of the child contexts the
+        * events ends up in.
+        */
+       ctx = rcu_dereference(current->perf_event_ctxp);
+       if (ctx)
+               perf_event_mmap_ctx(ctx, mmap_event);
+       rcu_read_unlock();
+
+       kfree(buf);
+}
+
+void __perf_event_mmap(struct vm_area_struct *vma)
+{
+       struct perf_mmap_event mmap_event;
+
+       if (!atomic_read(&nr_mmap_events))
+               return;
+
+       mmap_event = (struct perf_mmap_event){
+               .vma    = vma,
+               /* .file_name */
+               /* .file_size */
+               .event_id  = {
+                       .header = {
+                               .type = PERF_RECORD_MMAP,
+                               .misc = 0,
+                               /* .size */
+                       },
+                       /* .pid */
+                       /* .tid */
+                       .start  = vma->vm_start,
+                       .len    = vma->vm_end - vma->vm_start,
+                       .pgoff  = vma->vm_pgoff,
+               },
+       };
+
+       perf_event_mmap_event(&mmap_event);
+}
+
+/*
+ * IRQ throttle logging
+ */
+
+static void perf_log_throttle(struct perf_event *event, int enable)
+{
+       struct perf_output_handle handle;
+       int ret;
+
+       struct {
+               struct perf_event_header        header;
+               u64                             time;
+               u64                             id;
+               u64                             stream_id;
+       } throttle_event = {
+               .header = {
+                       .type = PERF_RECORD_THROTTLE,
+                       .misc = 0,
+                       .size = sizeof(throttle_event),
+               },
+               .time           = perf_clock(),
+               .id             = primary_event_id(event),
+               .stream_id      = event->id,
+       };
+
+       if (enable)
+               throttle_event.header.type = PERF_RECORD_UNTHROTTLE;
+
+       ret = perf_output_begin(&handle, event, sizeof(throttle_event), 1, 0);
+       if (ret)
+               return;
+
+       perf_output_put(&handle, throttle_event);
+       perf_output_end(&handle);
+}
+
+/*
+ * Generic event overflow handling, sampling.
+ */
+
+static int __perf_event_overflow(struct perf_event *event, int nmi,
+                                  int throttle, struct perf_sample_data *data,
+                                  struct pt_regs *regs)
+{
+       int events = atomic_read(&event->event_limit);
+       struct hw_perf_event *hwc = &event->hw;
+       int ret = 0;
+
+       throttle = (throttle && event->pmu->unthrottle != NULL);
+
+       if (!throttle) {
+               hwc->interrupts++;
+       } else {
+               if (hwc->interrupts != MAX_INTERRUPTS) {
+                       hwc->interrupts++;
+                       if (HZ * hwc->interrupts >
+                                       (u64)sysctl_perf_event_sample_rate) {
+                               hwc->interrupts = MAX_INTERRUPTS;
+                               perf_log_throttle(event, 0);
+                               ret = 1;
+                       }
+               } else {
+                       /*
+                        * Keep re-disabling events even though on the previous
+                        * pass we disabled it - just in case we raced with a
+                        * sched-in and the event got enabled again:
+                        */
+                       ret = 1;
+               }
+       }
+
+       if (event->attr.freq) {
+               u64 now = perf_clock();
+               s64 delta = now - hwc->freq_stamp;
+
+               hwc->freq_stamp = now;
+
+               if (delta > 0 && delta < TICK_NSEC)
+                       perf_adjust_period(event, NSEC_PER_SEC / (int)delta);
+       }
+
+       /*
+        * XXX event_limit might not quite work as expected on inherited
+        * events
+        */
+
+       event->pending_kill = POLL_IN;
+       if (events && atomic_dec_and_test(&event->event_limit)) {
+               ret = 1;
+               event->pending_kill = POLL_HUP;
+               if (nmi) {
+                       event->pending_disable = 1;
+                       perf_pending_queue(&event->pending,
+                                          perf_pending_event);
+               } else
+                       perf_event_disable(event);
+       }
+
+       perf_event_output(event, nmi, data, regs);
+       return ret;
+}
+
+int perf_event_overflow(struct perf_event *event, int nmi,
+                         struct perf_sample_data *data,
+                         struct pt_regs *regs)
+{
+       return __perf_event_overflow(event, nmi, 1, data, regs);
+}
+
+/*
+ * Generic software event infrastructure
+ */
+
+/*
+ * We directly increment event->count and keep a second value in
+ * event->hw.period_left to count intervals. This period event
+ * is kept in the range [-sample_period, 0] so that we can use the
+ * sign as trigger.
+ */
+
+static u64 perf_swevent_set_period(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       u64 period = hwc->last_period;
+       u64 nr, offset;
+       s64 old, val;
+
+       hwc->last_period = hwc->sample_period;
+
+again:
+       old = val = atomic64_read(&hwc->period_left);
+       if (val < 0)
+               return 0;
+
+       nr = div64_u64(period + val, period);
+       offset = nr * period;
+       val -= offset;
+       if (atomic64_cmpxchg(&hwc->period_left, old, val) != old)
+               goto again;
+
+       return nr;
+}
+
+static void perf_swevent_overflow(struct perf_event *event,
+                                   int nmi, struct perf_sample_data *data,
+                                   struct pt_regs *regs)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       int throttle = 0;
+       u64 overflow;
+
+       data->period = event->hw.last_period;
+       overflow = perf_swevent_set_period(event);
+
+       if (hwc->interrupts == MAX_INTERRUPTS)
+               return;
+
+       for (; overflow; overflow--) {
+               if (__perf_event_overflow(event, nmi, throttle,
+                                           data, regs)) {
+                       /*
+                        * We inhibit the overflow from happening when
+                        * hwc->interrupts == MAX_INTERRUPTS.
+                        */
+                       break;
+               }
+               throttle = 1;
+       }
+}
+
+static void perf_swevent_unthrottle(struct perf_event *event)
+{
+       /*
+        * Nothing to do, we already reset hwc->interrupts.
+        */
+}
+
+static void perf_swevent_add(struct perf_event *event, u64 nr,
+                              int nmi, struct perf_sample_data *data,
+                              struct pt_regs *regs)
+{
+       struct hw_perf_event *hwc = &event->hw;
+
+       atomic64_add(nr, &event->count);
+
+       if (!hwc->sample_period)
+               return;
+
+       if (!regs)
+               return;
+
+       if (!atomic64_add_negative(nr, &hwc->period_left))
+               perf_swevent_overflow(event, nmi, data, regs);
+}
+
+static int perf_swevent_is_counting(struct perf_event *event)
+{
+       /*
+        * The event is active, we're good!
+        */
+       if (event->state == PERF_EVENT_STATE_ACTIVE)
+               return 1;
+
+       /*
+        * The event is off/error, not counting.
+        */
+       if (event->state != PERF_EVENT_STATE_INACTIVE)
+               return 0;
+
+       /*
+        * The event is inactive, if the context is active
+        * we're part of a group that didn't make it on the 'pmu',
+        * not counting.
+        */
+       if (event->ctx->is_active)
+               return 0;
+
+       /*
+        * We're inactive and the context is too, this means the
+        * task is scheduled out, we're counting events that happen
+        * to us, like migration events.
+        */
+       return 1;
+}
+
+static int perf_swevent_match(struct perf_event *event,
+                               enum perf_type_id type,
+                               u32 event_id, struct pt_regs *regs)
+{
+       if (!perf_swevent_is_counting(event))
+               return 0;
+
+       if (event->attr.type != type)
+               return 0;
+       if (event->attr.config != event_id)
+               return 0;
+
+       if (regs) {
+               if (event->attr.exclude_user && user_mode(regs))
+                       return 0;
+
+               if (event->attr.exclude_kernel && !user_mode(regs))
+                       return 0;
+       }
+
+       return 1;
+}
+
+static void perf_swevent_ctx_event(struct perf_event_context *ctx,
+                                    enum perf_type_id type,
+                                    u32 event_id, u64 nr, int nmi,
+                                    struct perf_sample_data *data,
+                                    struct pt_regs *regs)
+{
+       struct perf_event *event;
+
+       if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
+               return;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
+               if (perf_swevent_match(event, type, event_id, regs))
+                       perf_swevent_add(event, nr, nmi, data, regs);
+       }
+       rcu_read_unlock();
+}
+
+static int *perf_swevent_recursion_context(struct perf_cpu_context *cpuctx)
+{
+       if (in_nmi())
+               return &cpuctx->recursion[3];
+
+       if (in_irq())
+               return &cpuctx->recursion[2];
+
+       if (in_softirq())
+               return &cpuctx->recursion[1];
+
+       return &cpuctx->recursion[0];
+}
+
+static void do_perf_sw_event(enum perf_type_id type, u32 event_id,
+                                   u64 nr, int nmi,
+                                   struct perf_sample_data *data,
+                                   struct pt_regs *regs)
+{
+       struct perf_cpu_context *cpuctx = &get_cpu_var(perf_cpu_context);
+       int *recursion = perf_swevent_recursion_context(cpuctx);
+       struct perf_event_context *ctx;
+
+       if (*recursion)
+               goto out;
+
+       (*recursion)++;
+       barrier();
+
+       perf_swevent_ctx_event(&cpuctx->ctx, type, event_id,
+                                nr, nmi, data, regs);
+       rcu_read_lock();
+       /*
+        * doesn't really matter which of the child contexts the
+        * events ends up in.
+        */
+       ctx = rcu_dereference(current->perf_event_ctxp);
+       if (ctx)
+               perf_swevent_ctx_event(ctx, type, event_id, nr, nmi, data, regs);
+       rcu_read_unlock();
+
+       barrier();
+       (*recursion)--;
+
+out:
+       put_cpu_var(perf_cpu_context);
+}
+
+void __perf_sw_event(u32 event_id, u64 nr, int nmi,
+                           struct pt_regs *regs, u64 addr)
+{
+       struct perf_sample_data data = {
+               .addr = addr,
+       };
+
+       do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, nmi,
+                               &data, regs);
+}
+
+static void perf_swevent_read(struct perf_event *event)
+{
+}
+
+static int perf_swevent_enable(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+
+       if (hwc->sample_period) {
+               hwc->last_period = hwc->sample_period;
+               perf_swevent_set_period(event);
+       }
+       return 0;
+}
+
+static void perf_swevent_disable(struct perf_event *event)
+{
+}
+
+static const struct pmu perf_ops_generic = {
+       .enable         = perf_swevent_enable,
+       .disable        = perf_swevent_disable,
+       .read           = perf_swevent_read,
+       .unthrottle     = perf_swevent_unthrottle,
+};
+
+/*
+ * hrtimer based swevent callback
+ */
+
+static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer)
+{
+       enum hrtimer_restart ret = HRTIMER_RESTART;
+       struct perf_sample_data data;
+       struct pt_regs *regs;
+       struct perf_event *event;
+       u64 period;
+
+       event   = container_of(hrtimer, struct perf_event, hw.hrtimer);
+       event->pmu->read(event);
+
+       data.addr = 0;
+       regs = get_irq_regs();
+       /*
+        * In case we exclude kernel IPs or are somehow not in interrupt
+        * context, provide the next best thing, the user IP.
+        */
+       if ((event->attr.exclude_kernel || !regs) &&
+                       !event->attr.exclude_user)
+               regs = task_pt_regs(current);
+
+       if (regs) {
+               if (perf_event_overflow(event, 0, &data, regs))
+                       ret = HRTIMER_NORESTART;
+       }
+
+       period = max_t(u64, 10000, event->hw.sample_period);
+       hrtimer_forward_now(hrtimer, ns_to_ktime(period));
+
+       return ret;
+}
+
+/*
+ * Software event: cpu wall time clock
+ */
+
+static void cpu_clock_perf_event_update(struct perf_event *event)
+{
+       int cpu = raw_smp_processor_id();
+       s64 prev;
+       u64 now;
+
+       now = cpu_clock(cpu);
+       prev = atomic64_read(&event->hw.prev_count);
+       atomic64_set(&event->hw.prev_count, now);
+       atomic64_add(now - prev, &event->count);
+}
+
+static int cpu_clock_perf_event_enable(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       int cpu = raw_smp_processor_id();
+
+       atomic64_set(&hwc->prev_count, cpu_clock(cpu));
+       hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+       hwc->hrtimer.function = perf_swevent_hrtimer;
+       if (hwc->sample_period) {
+               u64 period = max_t(u64, 10000, hwc->sample_period);
+               __hrtimer_start_range_ns(&hwc->hrtimer,
+                               ns_to_ktime(period), 0,
+                               HRTIMER_MODE_REL, 0);
+       }
+
+       return 0;
+}
+
+static void cpu_clock_perf_event_disable(struct perf_event *event)
+{
+       if (event->hw.sample_period)
+               hrtimer_cancel(&event->hw.hrtimer);
+       cpu_clock_perf_event_update(event);
+}
+
+static void cpu_clock_perf_event_read(struct perf_event *event)
+{
+       cpu_clock_perf_event_update(event);
+}
+
+static const struct pmu perf_ops_cpu_clock = {
+       .enable         = cpu_clock_perf_event_enable,
+       .disable        = cpu_clock_perf_event_disable,
+       .read           = cpu_clock_perf_event_read,
+};
+
+/*
+ * Software event: task time clock
+ */
+
+static void task_clock_perf_event_update(struct perf_event *event, u64 now)
+{
+       u64 prev;
+       s64 delta;
+
+       prev = atomic64_xchg(&event->hw.prev_count, now);
+       delta = now - prev;
+       atomic64_add(delta, &event->count);
+}
+
+static int task_clock_perf_event_enable(struct perf_event *event)
+{
+       struct hw_perf_event *hwc = &event->hw;
+       u64 now;
+
+       now = event->ctx->time;
+
+       atomic64_set(&hwc->prev_count, now);
+       hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+       hwc->hrtimer.function = perf_swevent_hrtimer;
+       if (hwc->sample_period) {
+               u64 period = max_t(u64, 10000, hwc->sample_period);
+               __hrtimer_start_range_ns(&hwc->hrtimer,
+                               ns_to_ktime(period), 0,
+                               HRTIMER_MODE_REL, 0);
+       }
+
+       return 0;
+}
+
+static void task_clock_perf_event_disable(struct perf_event *event)
+{
+       if (event->hw.sample_period)
+               hrtimer_cancel(&event->hw.hrtimer);
+       task_clock_perf_event_update(event, event->ctx->time);
+
+}
+
+static void task_clock_perf_event_read(struct perf_event *event)
+{
+       u64 time;
+
+       if (!in_nmi()) {
+               update_context_time(event->ctx);
+               time = event->ctx->time;
+       } else {
+               u64 now = perf_clock();
+               u64 delta = now - event->ctx->timestamp;
+               time = event->ctx->time + delta;
+       }
+
+       task_clock_perf_event_update(event, time);
+}
+
+static const struct pmu perf_ops_task_clock = {
+       .enable         = task_clock_perf_event_enable,
+       .disable        = task_clock_perf_event_disable,
+       .read           = task_clock_perf_event_read,
+};
+
+#ifdef CONFIG_EVENT_PROFILE
+void perf_tp_event(int event_id, u64 addr, u64 count, void *record,
+                         int entry_size)
+{
+       struct perf_raw_record raw = {
+               .size = entry_size,
+               .data = record,
+       };
+
+       struct perf_sample_data data = {
+               .addr = addr,
+               .raw = &raw,
+       };
+
+       struct pt_regs *regs = get_irq_regs();
+
+       if (!regs)
+               regs = task_pt_regs(current);
+
+       do_perf_sw_event(PERF_TYPE_TRACEPOINT, event_id, count, 1,
+                               &data, regs);
+}
+EXPORT_SYMBOL_GPL(perf_tp_event);
+
+extern int ftrace_profile_enable(int);
+extern void ftrace_profile_disable(int);
+
+static void tp_perf_event_destroy(struct perf_event *event)
+{
+       ftrace_profile_disable(event->attr.config);
+}
+
+static const struct pmu *tp_perf_event_init(struct perf_event *event)
+{
+       /*
+        * Raw tracepoint data is a severe data leak, only allow root to
+        * have these.
+        */
+       if ((event->attr.sample_type & PERF_SAMPLE_RAW) &&
+                       perf_paranoid_tracepoint_raw() &&
+                       !capable(CAP_SYS_ADMIN))
+               return ERR_PTR(-EPERM);
+
+       if (ftrace_profile_enable(event->attr.config))
+               return NULL;
+
+       event->destroy = tp_perf_event_destroy;
+
+       return &perf_ops_generic;
+}
+#else
+static const struct pmu *tp_perf_event_init(struct perf_event *event)
+{
+       return NULL;
+}
+#endif
+
+atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX];
+
+static void sw_perf_event_destroy(struct perf_event *event)
+{
+       u64 event_id = event->attr.config;
+
+       WARN_ON(event->parent);
+
+       atomic_dec(&perf_swevent_enabled[event_id]);
+}
+
+static const struct pmu *sw_perf_event_init(struct perf_event *event)
+{
+       const struct pmu *pmu = NULL;
+       u64 event_id = event->attr.config;
+
+       /*
+        * Software events (currently) can't in general distinguish
+        * between user, kernel and hypervisor events.
+        * However, context switches and cpu migrations are considered
+        * to be kernel events, and page faults are never hypervisor
+        * events.
+        */
+       switch (event_id) {
+       case PERF_COUNT_SW_CPU_CLOCK:
+               pmu = &perf_ops_cpu_clock;
+
+               break;
+       case PERF_COUNT_SW_TASK_CLOCK:
+               /*
+                * If the user instantiates this as a per-cpu event,
+                * use the cpu_clock event instead.
+                */
+               if (event->ctx->task)
+                       pmu = &perf_ops_task_clock;
+               else
+                       pmu = &perf_ops_cpu_clock;
+
+               break;
+       case PERF_COUNT_SW_PAGE_FAULTS:
+       case PERF_COUNT_SW_PAGE_FAULTS_MIN:
+       case PERF_COUNT_SW_PAGE_FAULTS_MAJ:
+       case PERF_COUNT_SW_CONTEXT_SWITCHES:
+       case PERF_COUNT_SW_CPU_MIGRATIONS:
+               if (!event->parent) {
+                       atomic_inc(&perf_swevent_enabled[event_id]);
+                       event->destroy = sw_perf_event_destroy;
+               }
+               pmu = &perf_ops_generic;
+               break;
+       }
+
+       return pmu;
+}
+
+/*
+ * Allocate and initialize a event structure
+ */
+static struct perf_event *
+perf_event_alloc(struct perf_event_attr *attr,
+                  int cpu,
+                  struct perf_event_context *ctx,
+                  struct perf_event *group_leader,
+                  struct perf_event *parent_event,
+                  gfp_t gfpflags)
+{
+       const struct pmu *pmu;
+       struct perf_event *event;
+       struct hw_perf_event *hwc;
+       long err;
+
+       event = kzalloc(sizeof(*event), gfpflags);
+       if (!event)
+               return ERR_PTR(-ENOMEM);
+
+       /*
+        * Single events are their own group leaders, with an
+        * empty sibling list:
+        */
+       if (!group_leader)
+               group_leader = event;
+
+       mutex_init(&event->child_mutex);
+       INIT_LIST_HEAD(&event->child_list);
+
+       INIT_LIST_HEAD(&event->group_entry);
+       INIT_LIST_HEAD(&event->event_entry);
+       INIT_LIST_HEAD(&event->sibling_list);
+       init_waitqueue_head(&event->waitq);
+
+       mutex_init(&event->mmap_mutex);
+
+       event->cpu              = cpu;
+       event->attr             = *attr;
+       event->group_leader     = group_leader;
+       event->pmu              = NULL;
+       event->ctx              = ctx;
+       event->oncpu            = -1;
+
+       event->parent           = parent_event;
+
+       event->ns               = get_pid_ns(current->nsproxy->pid_ns);
+       event->id               = atomic64_inc_return(&perf_event_id);
+
+       event->state            = PERF_EVENT_STATE_INACTIVE;
+
+       if (attr->disabled)
+               event->state = PERF_EVENT_STATE_OFF;
+
+       pmu = NULL;
+
+       hwc = &event->hw;
+       hwc->sample_period = attr->sample_period;
+       if (attr->freq && attr->sample_freq)
+               hwc->sample_period = 1;
+       hwc->last_period = hwc->sample_period;
+
+       atomic64_set(&hwc->period_left, hwc->sample_period);
+
+       /*
+        * we currently do not support PERF_FORMAT_GROUP on inherited events
+        */
+       if (attr->inherit && (attr->read_format & PERF_FORMAT_GROUP))
+               goto done;
+
+       switch (attr->type) {
+       case PERF_TYPE_RAW:
+       case PERF_TYPE_HARDWARE:
+       case PERF_TYPE_HW_CACHE:
+               pmu = hw_perf_event_init(event);
+               break;
+
+       case PERF_TYPE_SOFTWARE:
+               pmu = sw_perf_event_init(event);
+               break;
+
+       case PERF_TYPE_TRACEPOINT:
+               pmu = tp_perf_event_init(event);
+               break;
+
+       default:
+               break;
+       }
+done:
+       err = 0;
+       if (!pmu)
+               err = -EINVAL;
+       else if (IS_ERR(pmu))
+               err = PTR_ERR(pmu);
+
+       if (err) {
+               if (event->ns)
+                       put_pid_ns(event->ns);
+               kfree(event);
+               return ERR_PTR(err);
+       }
+
+       event->pmu = pmu;
+
+       if (!event->parent) {
+               atomic_inc(&nr_events);
+               if (event->attr.mmap)
+                       atomic_inc(&nr_mmap_events);
+               if (event->attr.comm)
+                       atomic_inc(&nr_comm_events);
+               if (event->attr.task)
+                       atomic_inc(&nr_task_events);
+       }
+
+       return event;
+}
+
+static int perf_copy_attr(struct perf_event_attr __user *uattr,
+                         struct perf_event_attr *attr)
+{
+       u32 size;
+       int ret;
+
+       if (!access_ok(VERIFY_WRITE, uattr, PERF_ATTR_SIZE_VER0))
+               return -EFAULT;
+
+       /*
+        * zero the full structure, so that a short copy will be nice.
+        */
+       memset(attr, 0, sizeof(*attr));
+
+       ret = get_user(size, &uattr->size);
+       if (ret)
+               return ret;
+
+       if (size > PAGE_SIZE)   /* silly large */
+               goto err_size;
+
+       if (!size)              /* abi compat */
+               size = PERF_ATTR_SIZE_VER0;
+
+       if (size < PERF_ATTR_SIZE_VER0)
+               goto err_size;
+
+       /*
+        * If we're handed a bigger struct than we know of,
+        * ensure all the unknown bits are 0 - i.e. new
+        * user-space does not rely on any kernel feature
+        * extensions we dont know about yet.
+        */
+       if (size > sizeof(*attr)) {
+               unsigned char __user *addr;
+               unsigned char __user *end;
+               unsigned char val;
+
+               addr = (void __user *)uattr + sizeof(*attr);
+               end  = (void __user *)uattr + size;
+
+               for (; addr < end; addr++) {
+                       ret = get_user(val, addr);
+                       if (ret)
+                               return ret;
+                       if (val)
+                               goto err_size;
+               }
+               size = sizeof(*attr);
+       }
+
+       ret = copy_from_user(attr, uattr, size);
+       if (ret)
+               return -EFAULT;
+
+       /*
+        * If the type exists, the corresponding creation will verify
+        * the attr->config.
+        */
+       if (attr->type >= PERF_TYPE_MAX)
+               return -EINVAL;
+
+       if (attr->__reserved_1 || attr->__reserved_2 || attr->__reserved_3)
+               return -EINVAL;
+
+       if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
+               return -EINVAL;
+
+       if (attr->read_format & ~(PERF_FORMAT_MAX-1))
+               return -EINVAL;
+
+out:
+       return ret;
+
+err_size:
+       put_user(sizeof(*attr), &uattr->size);
+       ret = -E2BIG;
+       goto out;
+}
+
+int perf_event_set_output(struct perf_event *event, int output_fd)
+{
+       struct perf_event *output_event = NULL;
+       struct file *output_file = NULL;
+       struct perf_event *old_output;
+       int fput_needed = 0;
+       int ret = -EINVAL;
+
+       if (!output_fd)
+               goto set;
+
+       output_file = fget_light(output_fd, &fput_needed);
+       if (!output_file)
+               return -EBADF;
+
+       if (output_file->f_op != &perf_fops)
+               goto out;
+
+       output_event = output_file->private_data;
+
+       /* Don't chain output fds */
+       if (output_event->output)
+               goto out;
+
+       /* Don't set an output fd when we already have an output channel */
+       if (event->data)
+               goto out;
+
+       atomic_long_inc(&output_file->f_count);
+
+set:
+       mutex_lock(&event->mmap_mutex);
+       old_output = event->output;
+       rcu_assign_pointer(event->output, output_event);
+       mutex_unlock(&event->mmap_mutex);
+
+       if (old_output) {
+               /*
+                * we need to make sure no existing perf_output_*()
+                * is still referencing this event.
+                */
+               synchronize_rcu();
+               fput(old_output->filp);
+       }
+
+       ret = 0;
+out:
+       fput_light(output_file, fput_needed);
+       return ret;
+}
+
+/**
+ * sys_perf_event_open - open a performance event, associate it to a task/cpu
+ *
+ * @attr_uptr: event_id type attributes for monitoring/sampling
+ * @pid:               target pid
+ * @cpu:               target cpu
+ * @group_fd:          group leader event fd
+ */
+SYSCALL_DEFINE5(perf_event_open,
+               struct perf_event_attr __user *, attr_uptr,
+               pid_t, pid, int, cpu, int, group_fd, unsigned long, flags)
+{
+       struct perf_event *event, *group_leader;
+       struct perf_event_attr attr;
+       struct perf_event_context *ctx;
+       struct file *event_file = NULL;
+       struct file *group_file = NULL;
+       int fput_needed = 0;
+       int fput_needed2 = 0;
+       int err;
+
+       /* for future expandability... */
+       if (flags & ~(PERF_FLAG_FD_NO_GROUP | PERF_FLAG_FD_OUTPUT))
+               return -EINVAL;
+
+       err = perf_copy_attr(attr_uptr, &attr);
+       if (err)
+               return err;
+
+       if (!attr.exclude_kernel) {
+               if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
+                       return -EACCES;
+       }
+
+       if (attr.freq) {
+               if (attr.sample_freq > sysctl_perf_event_sample_rate)
+                       return -EINVAL;
+       }
+
+       /*
+        * Get the target context (task or percpu):
+        */
+       ctx = find_get_context(pid, cpu);
+       if (IS_ERR(ctx))
+               return PTR_ERR(ctx);
+
+       /*
+        * Look up the group leader (we will attach this event to it):
+        */
+       group_leader = NULL;
+       if (group_fd != -1 && !(flags & PERF_FLAG_FD_NO_GROUP)) {
+               err = -EINVAL;
+               group_file = fget_light(group_fd, &fput_needed);
+               if (!group_file)
+                       goto err_put_context;
+               if (group_file->f_op != &perf_fops)
+                       goto err_put_context;
+
+               group_leader = group_file->private_data;
+               /*
+                * Do not allow a recursive hierarchy (this new sibling
+                * becoming part of another group-sibling):
+                */
+               if (group_leader->group_leader != group_leader)
+                       goto err_put_context;
+               /*
+                * Do not allow to attach to a group in a different
+                * task or CPU context:
+                */
+               if (group_leader->ctx != ctx)
+                       goto err_put_context;
+               /*
+                * Only a group leader can be exclusive or pinned
+                */
+               if (attr.exclusive || attr.pinned)
+                       goto err_put_context;
+       }
+
+       event = perf_event_alloc(&attr, cpu, ctx, group_leader,
+                                    NULL, GFP_KERNEL);
+       err = PTR_ERR(event);
+       if (IS_ERR(event))
+               goto err_put_context;
+
+       err = anon_inode_getfd("[perf_event]", &perf_fops, event, 0);
+       if (err < 0)
+               goto err_free_put_context;
+
+       event_file = fget_light(err, &fput_needed2);
+       if (!event_file)
+               goto err_free_put_context;
+
+       if (flags & PERF_FLAG_FD_OUTPUT) {
+               err = perf_event_set_output(event, group_fd);
+               if (err)
+                       goto err_fput_free_put_context;
+       }
+
+       event->filp = event_file;
+       WARN_ON_ONCE(ctx->parent_ctx);
+       mutex_lock(&ctx->mutex);
+       perf_install_in_context(ctx, event, cpu);
+       ++ctx->generation;
+       mutex_unlock(&ctx->mutex);
+
+       event->owner = current;
+       get_task_struct(current);
+       mutex_lock(&current->perf_event_mutex);
+       list_add_tail(&event->owner_entry, &current->perf_event_list);
+       mutex_unlock(&current->perf_event_mutex);
+
+err_fput_free_put_context:
+       fput_light(event_file, fput_needed2);
+
+err_free_put_context:
+       if (err < 0)
+               kfree(event);
+
+err_put_context:
+       if (err < 0)
+               put_ctx(ctx);
+
+       fput_light(group_file, fput_needed);
+
+       return err;
+}
+
+/*
+ * inherit a event from parent task to child task:
+ */
+static struct perf_event *
+inherit_event(struct perf_event *parent_event,
+             struct task_struct *parent,
+             struct perf_event_context *parent_ctx,
+             struct task_struct *child,
+             struct perf_event *group_leader,
+             struct perf_event_context *child_ctx)
+{
+       struct perf_event *child_event;
+
+       /*
+        * Instead of creating recursive hierarchies of events,
+        * we link inherited events back to the original parent,
+        * which has a filp for sure, which we use as the reference
+        * count:
+        */
+       if (parent_event->parent)
+               parent_event = parent_event->parent;
+
+       child_event = perf_event_alloc(&parent_event->attr,
+                                          parent_event->cpu, child_ctx,
+                                          group_leader, parent_event,
+                                          GFP_KERNEL);
+       if (IS_ERR(child_event))
+               return child_event;
+       get_ctx(child_ctx);
+
+       /*
+        * Make the child state follow the state of the parent event,
+        * not its attr.disabled bit.  We hold the parent's mutex,
+        * so we won't race with perf_event_{en, dis}able_family.
+        */
+       if (parent_event->state >= PERF_EVENT_STATE_INACTIVE)
+               child_event->state = PERF_EVENT_STATE_INACTIVE;
+       else
+               child_event->state = PERF_EVENT_STATE_OFF;
+
+       if (parent_event->attr.freq)
+               child_event->hw.sample_period = parent_event->hw.sample_period;
+
+       /*
+        * Link it up in the child's context:
+        */
+       add_event_to_ctx(child_event, child_ctx);
+
+       /*
+        * Get a reference to the parent filp - we will fput it
+        * when the child event exits. This is safe to do because
+        * we are in the parent and we know that the filp still
+        * exists and has a nonzero count:
+        */
+       atomic_long_inc(&parent_event->filp->f_count);
+
+       /*
+        * Link this into the parent event's child list
+        */
+       WARN_ON_ONCE(parent_event->ctx->parent_ctx);
+       mutex_lock(&parent_event->child_mutex);
+       list_add_tail(&child_event->child_list, &parent_event->child_list);
+       mutex_unlock(&parent_event->child_mutex);
+
+       return child_event;
+}
+
+static int inherit_group(struct perf_event *parent_event,
+             struct task_struct *parent,
+             struct perf_event_context *parent_ctx,
+             struct task_struct *child,
+             struct perf_event_context *child_ctx)
+{
+       struct perf_event *leader;
+       struct perf_event *sub;
+       struct perf_event *child_ctr;
+
+       leader = inherit_event(parent_event, parent, parent_ctx,
+                                child, NULL, child_ctx);
+       if (IS_ERR(leader))
+               return PTR_ERR(leader);
+       list_for_each_entry(sub, &parent_event->sibling_list, group_entry) {
+               child_ctr = inherit_event(sub, parent, parent_ctx,
+                                           child, leader, child_ctx);
+               if (IS_ERR(child_ctr))
+                       return PTR_ERR(child_ctr);
+       }
+       return 0;
+}
+
+static void sync_child_event(struct perf_event *child_event,
+                              struct task_struct *child)
+{
+       struct perf_event *parent_event = child_event->parent;
+       u64 child_val;
+
+       if (child_event->attr.inherit_stat)
+               perf_event_read_event(child_event, child);
+
+       child_val = atomic64_read(&child_event->count);
+
+       /*
+        * Add back the child's count to the parent's count:
+        */
+       atomic64_add(child_val, &parent_event->count);
+       atomic64_add(child_event->total_time_enabled,
+                    &parent_event->child_total_time_enabled);
+       atomic64_add(child_event->total_time_running,
+                    &parent_event->child_total_time_running);
+
+       /*
+        * Remove this event from the parent's list
+        */
+       WARN_ON_ONCE(parent_event->ctx->parent_ctx);
+       mutex_lock(&parent_event->child_mutex);
+       list_del_init(&child_event->child_list);
+       mutex_unlock(&parent_event->child_mutex);
+
+       /*
+        * Release the parent event, if this was the last
+        * reference to it.
+        */
+       fput(parent_event->filp);
+}
+
+static void
+__perf_event_exit_task(struct perf_event *child_event,
+                        struct perf_event_context *child_ctx,
+                        struct task_struct *child)
+{
+       struct perf_event *parent_event;
+
+       update_event_times(child_event);
+       perf_event_remove_from_context(child_event);
+
+       parent_event = child_event->parent;
+       /*
+        * It can happen that parent exits first, and has events
+        * that are still around due to the child reference. These
+        * events need to be zapped - but otherwise linger.
+        */
+       if (parent_event) {
+               sync_child_event(child_event, child);
+               free_event(child_event);
+       }
+}
+
+/*
+ * When a child task exits, feed back event values to parent events.
+ */
+void perf_event_exit_task(struct task_struct *child)
+{
+       struct perf_event *child_event, *tmp;
+       struct perf_event_context *child_ctx;
+       unsigned long flags;
+
+       if (likely(!child->perf_event_ctxp)) {
+               perf_event_task(child, NULL, 0);
+               return;
+       }
+
+       local_irq_save(flags);
+       /*
+        * We can't reschedule here because interrupts are disabled,
+        * and either child is current or it is a task that can't be
+        * scheduled, so we are now safe from rescheduling changing
+        * our context.
+        */
+       child_ctx = child->perf_event_ctxp;
+       __perf_event_task_sched_out(child_ctx);
+
+       /*
+        * Take the context lock here so that if find_get_context is
+        * reading child->perf_event_ctxp, we wait until it has
+        * incremented the context's refcount before we do put_ctx below.
+        */
+       spin_lock(&child_ctx->lock);
+       child->perf_event_ctxp = NULL;
+       /*
+        * If this context is a clone; unclone it so it can't get
+        * swapped to another process while we're removing all
+        * the events from it.
+        */
+       unclone_ctx(child_ctx);
+       spin_unlock_irqrestore(&child_ctx->lock, flags);
+
+       /*
+        * Report the task dead after unscheduling the events so that we
+        * won't get any samples after PERF_RECORD_EXIT. We can however still
+        * get a few PERF_RECORD_READ events.
+        */
+       perf_event_task(child, child_ctx, 0);
+
+       /*
+        * We can recurse on the same lock type through:
+        *
+        *   __perf_event_exit_task()
+        *     sync_child_event()
+        *       fput(parent_event->filp)
+        *         perf_release()
+        *           mutex_lock(&ctx->mutex)
+        *
+        * But since its the parent context it won't be the same instance.
+        */
+       mutex_lock_nested(&child_ctx->mutex, SINGLE_DEPTH_NESTING);
+
+again:
+       list_for_each_entry_safe(child_event, tmp, &child_ctx->group_list,
+                                group_entry)
+               __perf_event_exit_task(child_event, child_ctx, child);
+
+       /*
+        * If the last event was a group event, it will have appended all
+        * its siblings to the list, but we obtained 'tmp' before that which
+        * will still point to the list head terminating the iteration.
+        */
+       if (!list_empty(&child_ctx->group_list))
+               goto again;
+
+       mutex_unlock(&child_ctx->mutex);
+
+       put_ctx(child_ctx);
+}
+
+/*
+ * free an unexposed, unused context as created by inheritance by
+ * init_task below, used by fork() in case of fail.
+ */
+void perf_event_free_task(struct task_struct *task)
+{
+       struct perf_event_context *ctx = task->perf_event_ctxp;
+       struct perf_event *event, *tmp;
+
+       if (!ctx)
+               return;
+
+       mutex_lock(&ctx->mutex);
+again:
+       list_for_each_entry_safe(event, tmp, &ctx->group_list, group_entry) {
+               struct perf_event *parent = event->parent;
+
+               if (WARN_ON_ONCE(!parent))
+                       continue;
+
+               mutex_lock(&parent->child_mutex);
+               list_del_init(&event->child_list);
+               mutex_unlock(&parent->child_mutex);
+
+               fput(parent->filp);
+
+               list_del_event(event, ctx);
+               free_event(event);
+       }
+
+       if (!list_empty(&ctx->group_list))
+               goto again;
+
+       mutex_unlock(&ctx->mutex);
+
+       put_ctx(ctx);
+}
+
+/*
+ * Initialize the perf_event context in task_struct
+ */
+int perf_event_init_task(struct task_struct *child)
+{
+       struct perf_event_context *child_ctx, *parent_ctx;
+       struct perf_event_context *cloned_ctx;
+       struct perf_event *event;
+       struct task_struct *parent = current;
+       int inherited_all = 1;
+       int ret = 0;
+
+       child->perf_event_ctxp = NULL;
+
+       mutex_init(&child->perf_event_mutex);
+       INIT_LIST_HEAD(&child->perf_event_list);
+
+       if (likely(!parent->perf_event_ctxp))
+               return 0;
+
+       /*
+        * This is executed from the parent task context, so inherit
+        * events that have been marked for cloning.
+        * First allocate and initialize a context for the child.
+        */
+
+       child_ctx = kmalloc(sizeof(struct perf_event_context), GFP_KERNEL);
+       if (!child_ctx)
+               return -ENOMEM;
+
+       __perf_event_init_context(child_ctx, child);
+       child->perf_event_ctxp = child_ctx;
+       get_task_struct(child);
+
+       /*
+        * If the parent's context is a clone, pin it so it won't get
+        * swapped under us.
+        */
+       parent_ctx = perf_pin_task_context(parent);
+
+       /*
+        * No need to check if parent_ctx != NULL here; since we saw
+        * it non-NULL earlier, the only reason for it to become NULL
+        * is if we exit, and since we're currently in the middle of
+        * a fork we can't be exiting at the same time.
+        */
+
+       /*
+        * Lock the parent list. No need to lock the child - not PID
+        * hashed yet and not running, so nobody can access it.
+        */
+       mutex_lock(&parent_ctx->mutex);
+
+       /*
+        * We dont have to disable NMIs - we are only looking at
+        * the list, not manipulating it:
+        */
+       list_for_each_entry_rcu(event, &parent_ctx->event_list, event_entry) {
+               if (event != event->group_leader)
+                       continue;
+
+               if (!event->attr.inherit) {
+                       inherited_all = 0;
+                       continue;
+               }
+
+               ret = inherit_group(event, parent, parent_ctx,
+                                            child, child_ctx);
+               if (ret) {
+                       inherited_all = 0;
+                       break;
+               }
+       }
+
+       if (inherited_all) {
+               /*
+                * Mark the child context as a clone of the parent
+                * context, or of whatever the parent is a clone of.
+                * Note that if the parent is a clone, it could get
+                * uncloned at any point, but that doesn't matter
+                * because the list of events and the generation
+                * count can't have changed since we took the mutex.
+                */
+               cloned_ctx = rcu_dereference(parent_ctx->parent_ctx);
+               if (cloned_ctx) {
+                       child_ctx->parent_ctx = cloned_ctx;
+                       child_ctx->parent_gen = parent_ctx->parent_gen;
+               } else {
+                       child_ctx->parent_ctx = parent_ctx;
+                       child_ctx->parent_gen = parent_ctx->generation;
+               }
+               get_ctx(child_ctx->parent_ctx);
+       }
+
+       mutex_unlock(&parent_ctx->mutex);
+
+       perf_unpin_context(parent_ctx);
+
+       return ret;
+}
+
+static void __cpuinit perf_event_init_cpu(int cpu)
+{
+       struct perf_cpu_context *cpuctx;
+
+       cpuctx = &per_cpu(perf_cpu_context, cpu);
+       __perf_event_init_context(&cpuctx->ctx, NULL);
+
+       spin_lock(&perf_resource_lock);
+       cpuctx->max_pertask = perf_max_events - perf_reserved_percpu;
+       spin_unlock(&perf_resource_lock);
+
+       hw_perf_event_setup(cpu);
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+static void __perf_event_exit_cpu(void *info)
+{
+       struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
+       struct perf_event_context *ctx = &cpuctx->ctx;
+       struct perf_event *event, *tmp;
+
+       list_for_each_entry_safe(event, tmp, &ctx->group_list, group_entry)
+               __perf_event_remove_from_context(event);
+}
+static void perf_event_exit_cpu(int cpu)
+{
+       struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu);
+       struct perf_event_context *ctx = &cpuctx->ctx;
+
+       mutex_lock(&ctx->mutex);
+       smp_call_function_single(cpu, __perf_event_exit_cpu, NULL, 1);
+       mutex_unlock(&ctx->mutex);
+}
+#else
+static inline void perf_event_exit_cpu(int cpu) { }
+#endif
+
+static int __cpuinit
+perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
+{
+       unsigned int cpu = (long)hcpu;
+
+       switch (action) {
+
+       case CPU_UP_PREPARE:
+       case CPU_UP_PREPARE_FROZEN:
+               perf_event_init_cpu(cpu);
+               break;
+
+       case CPU_ONLINE:
+       case CPU_ONLINE_FROZEN:
+               hw_perf_event_setup_online(cpu);
+               break;
+
+       case CPU_DOWN_PREPARE:
+       case CPU_DOWN_PREPARE_FROZEN:
+               perf_event_exit_cpu(cpu);
+               break;
+
+       default:
+               break;
+       }
+
+       return NOTIFY_OK;
+}
+
+/*
+ * This has to have a higher priority than migration_notifier in sched.c.
+ */
+static struct notifier_block __cpuinitdata perf_cpu_nb = {
+       .notifier_call          = perf_cpu_notify,
+       .priority               = 20,
+};
+
+void __init perf_event_init(void)
+{
+       perf_cpu_notify(&perf_cpu_nb, (unsigned long)CPU_UP_PREPARE,
+                       (void *)(long)smp_processor_id());
+       perf_cpu_notify(&perf_cpu_nb, (unsigned long)CPU_ONLINE,
+                       (void *)(long)smp_processor_id());
+       register_cpu_notifier(&perf_cpu_nb);
+}
+
+static ssize_t perf_show_reserve_percpu(struct sysdev_class *class, char *buf)
+{
+       return sprintf(buf, "%d\n", perf_reserved_percpu);
+}
+
+static ssize_t
+perf_set_reserve_percpu(struct sysdev_class *class,
+                       const char *buf,
+                       size_t count)
+{
+       struct perf_cpu_context *cpuctx;
+       unsigned long val;
+       int err, cpu, mpt;
+
+       err = strict_strtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val > perf_max_events)
+               return -EINVAL;
+
+       spin_lock(&perf_resource_lock);
+       perf_reserved_percpu = val;
+       for_each_online_cpu(cpu) {
+               cpuctx = &per_cpu(perf_cpu_context, cpu);
+               spin_lock_irq(&cpuctx->ctx.lock);
+               mpt = min(perf_max_events - cpuctx->ctx.nr_events,
+                         perf_max_events - perf_reserved_percpu);
+               cpuctx->max_pertask = mpt;
+               spin_unlock_irq(&cpuctx->ctx.lock);
+       }
+       spin_unlock(&perf_resource_lock);
+
+       return count;
+}
+
+static ssize_t perf_show_overcommit(struct sysdev_class *class, char *buf)
+{
+       return sprintf(buf, "%d\n", perf_overcommit);
+}
+
+static ssize_t
+perf_set_overcommit(struct sysdev_class *class, const char *buf, size_t count)
+{
+       unsigned long val;
+       int err;
+
+       err = strict_strtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val > 1)
+               return -EINVAL;
+
+       spin_lock(&perf_resource_lock);
+       perf_overcommit = val;
+       spin_unlock(&perf_resource_lock);
+
+       return count;
+}
+
+static SYSDEV_CLASS_ATTR(
+                               reserve_percpu,
+                               0644,
+                               perf_show_reserve_percpu,
+                               perf_set_reserve_percpu
+                       );
+
+static SYSDEV_CLASS_ATTR(
+                               overcommit,
+                               0644,
+                               perf_show_overcommit,
+                               perf_set_overcommit
+                       );
+
+static struct attribute *perfclass_attrs[] = {
+       &attr_reserve_percpu.attr,
+       &attr_overcommit.attr,
+       NULL
+};
+
+static struct attribute_group perfclass_attr_group = {
+       .attrs                  = perfclass_attrs,
+       .name                   = "perf_events",
+};
+
+static int __init perf_event_sysfs_init(void)
+{
+       return sysfs_create_group(&cpu_sysdev_class.kset.kobj,
+                                 &perfclass_attr_group);
+}
+device_initcall(perf_event_sysfs_init);
index 31310b5..d3f722d 100644 (file)
@@ -40,7 +40,7 @@
 #define pid_hashfn(nr, ns)     \
        hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
 static struct hlist_head *pid_hash;
-static int pidhash_shift;
+static unsigned int pidhash_shift = 4;
 struct pid init_struct_pid = INIT_STRUCT_PID;
 
 int pid_max = PID_MAX_DEFAULT;
@@ -499,19 +499,12 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns)
 void __init pidhash_init(void)
 {
        int i, pidhash_size;
-       unsigned long megabytes = nr_kernel_pages >> (20 - PAGE_SHIFT);
 
-       pidhash_shift = max(4, fls(megabytes * 4));
-       pidhash_shift = min(12, pidhash_shift);
+       pid_hash = alloc_large_system_hash("PID", sizeof(*pid_hash), 0, 18,
+                                          HASH_EARLY | HASH_SMALL,
+                                          &pidhash_shift, NULL, 4096);
        pidhash_size = 1 << pidhash_shift;
 
-       printk("PID hash table entries: %d (order: %d, %Zd bytes)\n",
-               pidhash_size, pidhash_shift,
-               pidhash_size * sizeof(struct hlist_head));
-
-       pid_hash = alloc_bootmem(pidhash_size * sizeof(*(pid_hash)));
-       if (!pid_hash)
-               panic("Could not alloc pidhash!\n");
        for (i = 0; i < pidhash_size; i++)
                INIT_HLIST_HEAD(&pid_hash[i]);
 }
index a3961b2..5187136 100644 (file)
 #define SUSPEND_CONSOLE        (MAX_NR_CONSOLES-1)
 
 static int orig_fgconsole, orig_kmsg;
-static int disable_vt_switch;
-
-/*
- * Normally during a suspend, we allocate a new console and switch to it.
- * When we resume, we switch back to the original console.  This switch
- * can be slow, so on systems where the framebuffer can handle restoration
- * of video registers anyways, there's little point in doing the console
- * switch.  This function allows you to disable it by passing it '0'.
- */
-void pm_set_vt_switch(int do_switch)
-{
-       acquire_console_sem();
-       disable_vt_switch = !do_switch;
-       release_console_sem();
-}
-EXPORT_SYMBOL(pm_set_vt_switch);
 
 int pm_prepare_console(void)
 {
-       acquire_console_sem();
-
-       if (disable_vt_switch) {
-               release_console_sem();
-               return 0;
-       }
-
-       orig_fgconsole = fg_console;
-
-       if (vc_allocate(SUSPEND_CONSOLE)) {
-         /* we can't have a free VC for now. Too bad,
-          * we don't want to mess the screen for now. */
-               release_console_sem();
+       orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
+       if (orig_fgconsole < 0)
                return 1;
-       }
 
-       if (set_console(SUSPEND_CONSOLE)) {
-               /*
-                * We're unable to switch to the SUSPEND_CONSOLE.
-                * Let the calling function know so it can decide
-                * what to do.
-                */
-               release_console_sem();
-               return 1;
-       }
-       release_console_sem();
-
-       if (vt_waitactive(SUSPEND_CONSOLE)) {
-               pr_debug("Suspend: Can't switch VCs.");
-               return 1;
-       }
        orig_kmsg = kmsg_redirect;
        kmsg_redirect = SUSPEND_CONSOLE;
        return 0;
@@ -71,19 +28,9 @@ int pm_prepare_console(void)
 
 void pm_restore_console(void)
 {
-       acquire_console_sem();
-       if (disable_vt_switch) {
-               release_console_sem();
-               return;
-       }
-       set_console(orig_fgconsole);
-       release_console_sem();
-
-       if (vt_waitactive(orig_fgconsole)) {
-               pr_debug("Resume: Can't switch VCs.");
-               return;
+       if (orig_fgconsole >= 0) {
+               vt_move_to_console(orig_fgconsole, 0);
+               kmsg_redirect = orig_kmsg;
        }
-
-       kmsg_redirect = orig_kmsg;
 }
 #endif
index da2072d..cc2e553 100644 (file)
@@ -9,6 +9,7 @@
 #undef DEBUG
 
 #include <linux/interrupt.h>
+#include <linux/oom.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
index 97955b0..36cb168 100644 (file)
@@ -619,7 +619,7 @@ __register_nosave_region(unsigned long start_pfn, unsigned long end_pfn,
                BUG_ON(!region);
        } else
                /* This allocation cannot fail */
-               region = alloc_bootmem_low(sizeof(struct nosave_region));
+               region = alloc_bootmem(sizeof(struct nosave_region));
        region->start_pfn = start_pfn;
        region->end_pfn = end_pfn;
        list_add_tail(&region->list, &nosave_regions);
index 602033a..f38b07f 100644 (file)
@@ -206,12 +206,11 @@ __setup("log_buf_len=", log_buf_len_setup);
 #ifdef CONFIG_BOOT_PRINTK_DELAY
 
 static unsigned int boot_delay; /* msecs delay after each printk during bootup */
-static unsigned long long printk_delay_msec; /* per msec, based on boot_delay */
+static unsigned long long loops_per_msec;      /* based on boot_delay */
 
 static int __init boot_delay_setup(char *str)
 {
        unsigned long lpj;
-       unsigned long long loops_per_msec;
 
        lpj = preset_lpj ? preset_lpj : 1000000;        /* some guess */
        loops_per_msec = (unsigned long long)lpj / 1000 * HZ;
@@ -220,10 +219,9 @@ static int __init boot_delay_setup(char *str)
        if (boot_delay > 10 * 1000)
                boot_delay = 0;
 
-       printk_delay_msec = loops_per_msec;
-       printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
-               "HZ: %d, printk_delay_msec: %llu\n",
-               boot_delay, preset_lpj, lpj, HZ, printk_delay_msec);
+       pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
+               "HZ: %d, loops_per_msec: %llu\n",
+               boot_delay, preset_lpj, lpj, HZ, loops_per_msec);
        return 1;
 }
 __setup("boot_delay=", boot_delay_setup);
@@ -236,7 +234,7 @@ static void boot_delay_msec(void)
        if (boot_delay == 0 || system_state != SYSTEM_BOOTING)
                return;
 
-       k = (unsigned long long)printk_delay_msec * boot_delay;
+       k = (unsigned long long)loops_per_msec * boot_delay;
 
        timeout = jiffies + msecs_to_jiffies(boot_delay);
        while (k) {
@@ -655,6 +653,20 @@ static int recursion_bug;
 static int new_text_line = 1;
 static char printk_buf[1024];
 
+int printk_delay_msec __read_mostly;
+
+static inline void printk_delay(void)
+{
+       if (unlikely(printk_delay_msec)) {
+               int m = printk_delay_msec;
+
+               while (m--) {
+                       mdelay(1);
+                       touch_nmi_watchdog();
+               }
+       }
+}
+
 asmlinkage int vprintk(const char *fmt, va_list args)
 {
        int printed_len = 0;
@@ -664,6 +676,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
        char *p;
 
        boot_delay_msec();
+       printk_delay();
 
        preempt_disable();
        /* This stops the holder of console_sem just where we want him */
index 419250e..a55d3a3 100644 (file)
@@ -442,48 +442,51 @@ void profile_tick(int type)
 
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <asm/uaccess.h>
 
-static int prof_cpu_mask_read_proc(char *page, char **start, off_t off,
-                       int count, int *eof, void *data)
+static int prof_cpu_mask_proc_show(struct seq_file *m, void *v)
 {
-       int len = cpumask_scnprintf(page, count, data);
-       if (count - len < 2)
-               return -EINVAL;
-       len += sprintf(page + len, "\n");
-       return len;
+       seq_cpumask(m, prof_cpu_mask);
+       seq_putc(m, '\n');
+       return 0;
 }
 
-static int prof_cpu_mask_write_proc(struct file *file,
-       const char __user *buffer,  unsigned long count, void *data)
+static int prof_cpu_mask_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, prof_cpu_mask_proc_show, NULL);
+}
+
+static ssize_t prof_cpu_mask_proc_write(struct file *file,
+       const char __user *buffer, size_t count, loff_t *pos)
 {
-       struct cpumask *mask = data;
-       unsigned long full_count = count, err;
        cpumask_var_t new_value;
+       int err;
 
        if (!alloc_cpumask_var(&new_value, GFP_KERNEL))
                return -ENOMEM;
 
        err = cpumask_parse_user(buffer, count, new_value);
        if (!err) {
-               cpumask_copy(mask, new_value);
-               err = full_count;
+               cpumask_copy(prof_cpu_mask, new_value);
+               err = count;
        }
        free_cpumask_var(new_value);
        return err;
 }
 
+static const struct file_operations prof_cpu_mask_proc_fops = {
+       .open           = prof_cpu_mask_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = prof_cpu_mask_proc_write,
+};
+
 void create_prof_cpu_mask(struct proc_dir_entry *root_irq_dir)
 {
-       struct proc_dir_entry *entry;
-
        /* create /proc/irq/prof_cpu_mask */
-       entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
-       if (!entry)
-               return;
-       entry->data = prof_cpu_mask;
-       entry->read_proc = prof_cpu_mask_read_proc;
-       entry->write_proc = prof_cpu_mask_write_proc;
+       proc_create("prof_cpu_mask", 0600, root_irq_dir, &prof_cpu_mask_proc_fops);
 }
 
 /*
index bd5d5c8..37ac454 100644 (file)
@@ -19,7 +19,7 @@
  *
  * Authors: Dipankar Sarma <dipankar@in.ibm.com>
  *         Manfred Spraul <manfred@colorfullife.com>
- * 
+ *
  * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
  * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
  * Papers:
@@ -27,7 +27,7 @@
  * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
  *
  * For detailed explanation of Read-Copy Update mechanism see -
- *             http://lse.sourceforge.net/locking/rcupdate.html
+ *             http://lse.sourceforge.net/locking/rcupdate.html
  *
  */
 #include <linux/types.h>
@@ -74,6 +74,8 @@ void wakeme_after_rcu(struct rcu_head  *head)
        complete(&rcu->completion);
 }
 
+#ifdef CONFIG_TREE_PREEMPT_RCU
+
 /**
  * synchronize_rcu - wait until a grace period has elapsed.
  *
@@ -87,7 +89,7 @@ void synchronize_rcu(void)
 {
        struct rcu_synchronize rcu;
 
-       if (rcu_blocking_is_gp())
+       if (!rcu_scheduler_active)
                return;
 
        init_completion(&rcu.completion);
@@ -98,6 +100,46 @@ void synchronize_rcu(void)
 }
 EXPORT_SYMBOL_GPL(synchronize_rcu);
 
+#endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */
+
+/**
+ * synchronize_sched - wait until an rcu-sched grace period has elapsed.
+ *
+ * Control will return to the caller some time after a full rcu-sched
+ * grace period has elapsed, in other words after all currently executing
+ * rcu-sched read-side critical sections have completed.   These read-side
+ * critical sections are delimited by rcu_read_lock_sched() and
+ * rcu_read_unlock_sched(), and may be nested.  Note that preempt_disable(),
+ * local_irq_disable(), and so on may be used in place of
+ * rcu_read_lock_sched().
+ *
+ * This means that all preempt_disable code sequences, including NMI and
+ * hardware-interrupt handlers, in progress on entry will have completed
+ * before this primitive returns.  However, this does not guarantee that
+ * softirq handlers will have completed, since in some kernels, these
+ * handlers can run in process context, and can block.
+ *
+ * This primitive provides the guarantees made by the (now removed)
+ * synchronize_kernel() API.  In contrast, synchronize_rcu() only
+ * guarantees that rcu_read_lock() sections will have completed.
+ * In "classic RCU", these two guarantees happen to be one and
+ * the same, but can differ in realtime RCU implementations.
+ */
+void synchronize_sched(void)
+{
+       struct rcu_synchronize rcu;
+
+       if (rcu_blocking_is_gp())
+               return;
+
+       init_completion(&rcu.completion);
+       /* Will wake me after RCU finished. */
+       call_rcu_sched(&rcu.head, wakeme_after_rcu);
+       /* Wait for it. */
+       wait_for_completion(&rcu.completion);
+}
+EXPORT_SYMBOL_GPL(synchronize_sched);
+
 /**
  * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
  *
index b33db53..233768f 100644 (file)
@@ -18,7 +18,7 @@
  * Copyright (C) IBM Corporation, 2005, 2006
  *
  * Authors: Paul E. McKenney <paulmck@us.ibm.com>
- *          Josh Triplett <josh@freedesktop.org>
+ *       Josh Triplett <josh@freedesktop.org>
  *
  * See also:  Documentation/RCU/torture.txt
  */
@@ -50,7 +50,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and "
-              "Josh Triplett <josh@freedesktop.org>");
+             "Josh Triplett <josh@freedesktop.org>");
 
 static int nreaders = -1;      /* # reader threads, defaults to 2*ncpus */
 static int nfakewriters = 4;   /* # fake writer threads */
@@ -110,8 +110,8 @@ struct rcu_torture {
 };
 
 static LIST_HEAD(rcu_torture_freelist);
-static struct rcu_torture *rcu_torture_current = NULL;
-static long rcu_torture_current_version = 0;
+static struct rcu_torture *rcu_torture_current;
+static long rcu_torture_current_version;
 static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN];
 static DEFINE_SPINLOCK(rcu_torture_lock);
 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
@@ -124,11 +124,11 @@ static atomic_t n_rcu_torture_alloc_fail;
 static atomic_t n_rcu_torture_free;
 static atomic_t n_rcu_torture_mberror;
 static atomic_t n_rcu_torture_error;
-static long n_rcu_torture_timers = 0;
+static long n_rcu_torture_timers;
 static struct list_head rcu_torture_removed;
 static cpumask_var_t shuffle_tmp_mask;
 
-static int stutter_pause_test = 0;
+static int stutter_pause_test;
 
 #if defined(MODULE) || defined(CONFIG_RCU_TORTURE_TEST_RUNNABLE)
 #define RCUTORTURE_RUNNABLE_INIT 1
@@ -267,7 +267,8 @@ struct rcu_torture_ops {
        int irq_capable;
        char *name;
 };
-static struct rcu_torture_ops *cur_ops = NULL;
+
+static struct rcu_torture_ops *cur_ops;
 
 /*
  * Definitions for rcu torture testing.
@@ -281,14 +282,17 @@ static int rcu_torture_read_lock(void) __acquires(RCU)
 
 static void rcu_read_delay(struct rcu_random_state *rrsp)
 {
-       long delay;
-       const long longdelay = 200;
+       const unsigned long shortdelay_us = 200;
+       const unsigned long longdelay_ms = 50;
 
-       /* We want there to be long-running readers, but not all the time. */
+       /* We want a short delay sometimes to make a reader delay the grace
+        * period, and we want a long delay occasionally to trigger
+        * force_quiescent_state. */
 
-       delay = rcu_random(rrsp) % (nrealreaders * 2 * longdelay);
-       if (!delay)
-               udelay(longdelay);
+       if (!(rcu_random(rrsp) % (nrealreaders * 2000 * longdelay_ms)))
+               mdelay(longdelay_ms);
+       if (!(rcu_random(rrsp) % (nrealreaders * 2 * shortdelay_us)))
+               udelay(shortdelay_us);
 }
 
 static void rcu_torture_read_unlock(int idx) __releases(RCU)
@@ -339,8 +343,8 @@ static struct rcu_torture_ops rcu_ops = {
        .sync           = synchronize_rcu,
        .cb_barrier     = rcu_barrier,
        .stats          = NULL,
-       .irq_capable    = 1,
-       .name           = "rcu"
+       .irq_capable    = 1,
+       .name           = "rcu"
 };
 
 static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
@@ -638,7 +642,8 @@ rcu_torture_writer(void *arg)
 
        do {
                schedule_timeout_uninterruptible(1);
-               if ((rp = rcu_torture_alloc()) == NULL)
+               rp = rcu_torture_alloc();
+               if (rp == NULL)
                        continue;
                rp->rtort_pipe_count = 0;
                udelay(rcu_random(&rand) & 0x3ff);
@@ -1110,7 +1115,7 @@ rcu_torture_init(void)
                printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
                       torture_type);
                mutex_unlock(&fullstop_mutex);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (cur_ops->init)
                cur_ops->init(); /* no "goto unwind" prior to this point!!! */
@@ -1161,7 +1166,7 @@ rcu_torture_init(void)
                goto unwind;
        }
        fakewriter_tasks = kzalloc(nfakewriters * sizeof(fakewriter_tasks[0]),
-                                  GFP_KERNEL);
+                                  GFP_KERNEL);
        if (fakewriter_tasks == NULL) {
                VERBOSE_PRINTK_ERRSTRING("out of memory");
                firsterr = -ENOMEM;
@@ -1170,7 +1175,7 @@ rcu_torture_init(void)
        for (i = 0; i < nfakewriters; i++) {
                VERBOSE_PRINTK_STRING("Creating rcu_torture_fakewriter task");
                fakewriter_tasks[i] = kthread_run(rcu_torture_fakewriter, NULL,
-                                                 "rcu_torture_fakewriter");
+                                                 "rcu_torture_fakewriter");
                if (IS_ERR(fakewriter_tasks[i])) {
                        firsterr = PTR_ERR(fakewriter_tasks[i]);
                        VERBOSE_PRINTK_ERRSTRING("Failed to create fakewriter");
index 6b11b07..52b06f6 100644 (file)
@@ -25,7 +25,7 @@
  * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
  *
  * For detailed explanation of Read-Copy Update mechanism see -
- *     Documentation/RCU
+ *     Documentation/RCU
  */
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -107,27 +107,23 @@ static void __cpuinit rcu_init_percpu_data(int cpu, struct rcu_state *rsp,
  */
 void rcu_sched_qs(int cpu)
 {
-       unsigned long flags;
        struct rcu_data *rdp;
 
-       local_irq_save(flags);
        rdp = &per_cpu(rcu_sched_data, cpu);
-       rdp->passed_quiesc = 1;
        rdp->passed_quiesc_completed = rdp->completed;
-       rcu_preempt_qs(cpu);
-       local_irq_restore(flags);
+       barrier();
+       rdp->passed_quiesc = 1;
+       rcu_preempt_note_context_switch(cpu);
 }
 
 void rcu_bh_qs(int cpu)
 {
-       unsigned long flags;
        struct rcu_data *rdp;
 
-       local_irq_save(flags);
        rdp = &per_cpu(rcu_bh_data, cpu);
-       rdp->passed_quiesc = 1;
        rdp->passed_quiesc_completed = rdp->completed;
-       local_irq_restore(flags);
+       barrier();
+       rdp->passed_quiesc = 1;
 }
 
 #ifdef CONFIG_NO_HZ
@@ -605,8 +601,6 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags)
 {
        struct rcu_data *rdp = rsp->rda[smp_processor_id()];
        struct rcu_node *rnp = rcu_get_root(rsp);
-       struct rcu_node *rnp_cur;
-       struct rcu_node *rnp_end;
 
        if (!cpu_needs_another_gp(rsp, rdp)) {
                spin_unlock_irqrestore(&rnp->lock, flags);
@@ -615,6 +609,7 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags)
 
        /* Advance to a new grace period and initialize state. */
        rsp->gpnum++;
+       WARN_ON_ONCE(rsp->signaled == RCU_GP_INIT);
        rsp->signaled = RCU_GP_INIT; /* Hold off force_quiescent_state. */
        rsp->jiffies_force_qs = jiffies + RCU_JIFFIES_TILL_FORCE_QS;
        record_gp_stall_check_time(rsp);
@@ -631,7 +626,9 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags)
 
        /* Special-case the common single-level case. */
        if (NUM_RCU_NODES == 1) {
+               rcu_preempt_check_blocked_tasks(rnp);
                rnp->qsmask = rnp->qsmaskinit;
+               rnp->gpnum = rsp->gpnum;
                rsp->signaled = RCU_SIGNAL_INIT; /* force_quiescent_state OK. */
                spin_unlock_irqrestore(&rnp->lock, flags);
                return;
@@ -644,42 +641,28 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags)
        spin_lock(&rsp->onofflock);  /* irqs already disabled. */
 
        /*
-        * Set the quiescent-state-needed bits in all the non-leaf RCU
-        * nodes for all currently online CPUs.  This operation relies
-        * on the layout of the hierarchy within the rsp->node[] array.
-        * Note that other CPUs will access only the leaves of the
-        * hierarchy, which still indicate that no grace period is in
-        * progress.  In addition, we have excluded CPU-hotplug operations.
-        *
-        * We therefore do not need to hold any locks.  Any required
-        * memory barriers will be supplied by the locks guarding the
-        * leaf rcu_nodes in the hierarchy.
-        */
-
-       rnp_end = rsp->level[NUM_RCU_LVLS - 1];
-       for (rnp_cur = &rsp->node[0]; rnp_cur < rnp_end; rnp_cur++)
-               rnp_cur->qsmask = rnp_cur->qsmaskinit;
-
-       /*
-        * Now set up the leaf nodes.  Here we must be careful.  First,
-        * we need to hold the lock in order to exclude other CPUs, which
-        * might be contending for the leaf nodes' locks.  Second, as
-        * soon as we initialize a given leaf node, its CPUs might run
-        * up the rest of the hierarchy.  We must therefore acquire locks
-        * for each node that we touch during this stage.  (But we still
-        * are excluding CPU-hotplug operations.)
+        * Set the quiescent-state-needed bits in all the rcu_node
+        * structures for all currently online CPUs in breadth-first
+        * order, starting from the root rcu_node structure.  This
+        * operation relies on the layout of the hierarchy within the
+        * rsp->node[] array.  Note that other CPUs will access only
+        * the leaves of the hierarchy, which still indicate that no
+        * grace period is in progress, at least until the corresponding
+        * leaf node has been initialized.  In addition, we have excluded
+        * CPU-hotplug operations.
         *
         * Note that the grace period cannot complete until we finish
         * the initialization process, as there will be at least one
         * qsmask bit set in the root node until that time, namely the
-        * one corresponding to this CPU.
+        * one corresponding to this CPU, due to the fact that we have
+        * irqs disabled.
         */
-       rnp_end = &rsp->node[NUM_RCU_NODES];
-       rnp_cur = rsp->level[NUM_RCU_LVLS - 1];
-       for (; rnp_cur < rnp_end; rnp_cur++) {
-               spin_lock(&rnp_cur->lock);      /* irqs already disabled. */
-               rnp_cur->qsmask = rnp_cur->qsmaskinit;
-               spin_unlock(&rnp_cur->lock);    /* irqs already disabled. */
+       for (rnp = &rsp->node[0]; rnp < &rsp->node[NUM_RCU_NODES]; rnp++) {
+               spin_lock(&rnp->lock);  /* irqs already disabled. */
+               rcu_preempt_check_blocked_tasks(rnp);
+               rnp->qsmask = rnp->qsmaskinit;
+               rnp->gpnum = rsp->gpnum;
+               spin_unlock(&rnp->lock);        /* irqs already disabled. */
        }
 
        rsp->signaled = RCU_SIGNAL_INIT; /* force_quiescent_state now OK. */
@@ -722,6 +705,7 @@ rcu_process_gp_end(struct rcu_state *rsp, struct rcu_data *rdp)
 static void cpu_quiet_msk_finish(struct rcu_state *rsp, unsigned long flags)
        __releases(rnp->lock)
 {
+       WARN_ON_ONCE(rsp->completed == rsp->gpnum);
        rsp->completed = rsp->gpnum;
        rcu_process_gp_end(rsp, rsp->rda[smp_processor_id()]);
        rcu_start_gp(rsp, flags);  /* releases root node's rnp->lock. */
@@ -739,6 +723,8 @@ cpu_quiet_msk(unsigned long mask, struct rcu_state *rsp, struct rcu_node *rnp,
              unsigned long flags)
        __releases(rnp->lock)
 {
+       struct rcu_node *rnp_c;
+
        /* Walk up the rcu_node hierarchy. */
        for (;;) {
                if (!(rnp->qsmask & mask)) {
@@ -762,8 +748,10 @@ cpu_quiet_msk(unsigned long mask, struct rcu_state *rsp, struct rcu_node *rnp,
                        break;
                }
                spin_unlock_irqrestore(&rnp->lock, flags);
+               rnp_c = rnp;
                rnp = rnp->parent;
                spin_lock_irqsave(&rnp->lock, flags);
+               WARN_ON_ONCE(rnp_c->qsmask);
        }
 
        /*
@@ -776,10 +764,10 @@ cpu_quiet_msk(unsigned long mask, struct rcu_state *rsp, struct rcu_node *rnp,
 
 /*
  * Record a quiescent state for the specified CPU, which must either be
- * the current CPU or an offline CPU.  The lastcomp argument is used to
- * make sure we are still in the grace period of interest.  We don't want
- * to end the current grace period based on quiescent states detected in
- * an earlier grace period!
+ * the current CPU.  The lastcomp argument is used to make sure we are
+ * still in the grace period of interest.  We don't want to end the current
+ * grace period based on quiescent states detected in an earlier grace
+ * period!
  */
 static void
 cpu_quiet(int cpu, struct rcu_state *rsp, struct rcu_data *rdp, long lastcomp)
@@ -814,7 +802,6 @@ cpu_quiet(int cpu, struct rcu_state *rsp, struct rcu_data *rdp, long lastcomp)
                 * This GP can't end until cpu checks in, so all of our
                 * callbacks can be processed during the next GP.
                 */
-               rdp = rsp->rda[smp_processor_id()];
                rdp->nxttail[RCU_NEXT_READY_TAIL] = rdp->nxttail[RCU_NEXT_TAIL];
 
                cpu_quiet_msk(mask, rsp, rnp, flags); /* releases rnp->lock */
@@ -872,7 +859,7 @@ static void __rcu_offline_cpu(int cpu, struct rcu_state *rsp)
        spin_lock_irqsave(&rsp->onofflock, flags);
 
        /* Remove the outgoing CPU from the masks in the rcu_node hierarchy. */
-       rnp = rdp->mynode;
+       rnp = rdp->mynode;      /* this is the outgoing CPU's rnp. */
        mask = rdp->grpmask;    /* rnp->grplo is constant. */
        do {
                spin_lock(&rnp->lock);          /* irqs already disabled. */
@@ -881,7 +868,7 @@ static void __rcu_offline_cpu(int cpu, struct rcu_state *rsp)
                        spin_unlock(&rnp->lock); /* irqs remain disabled. */
                        break;
                }
-               rcu_preempt_offline_tasks(rsp, rnp);
+               rcu_preempt_offline_tasks(rsp, rnp, rdp);
                mask = rnp->grpmask;
                spin_unlock(&rnp->lock);        /* irqs remain disabled. */
                rnp = rnp->parent;
@@ -890,9 +877,6 @@ static void __rcu_offline_cpu(int cpu, struct rcu_state *rsp)
 
        spin_unlock(&rsp->onofflock);           /* irqs remain disabled. */
 
-       /* Being offline is a quiescent state, so go record it. */
-       cpu_quiet(cpu, rsp, rdp, lastcomp);
-
        /*
         * Move callbacks from the outgoing CPU to the running CPU.
         * Note that the outgoing CPU is now quiscent, so it is now
@@ -1457,20 +1441,7 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptable)
                rnp = rnp->parent;
        } while (rnp != NULL && !(rnp->qsmaskinit & mask));
 
-       spin_unlock(&rsp->onofflock);           /* irqs remain disabled. */
-
-       /*
-        * A new grace period might start here.  If so, we will be part of
-        * it, and its gpnum will be greater than ours, so we will
-        * participate.  It is also possible for the gpnum to have been
-        * incremented before this function was called, and the bitmasks
-        * to not be filled out until now, in which case we will also
-        * participate due to our gpnum being behind.
-        */
-
-       /* Since it is coming online, the CPU is in a quiescent state. */
-       cpu_quiet(cpu, rsp, rdp, lastcomp);
-       local_irq_restore(flags);
+       spin_unlock_irqrestore(&rsp->onofflock, flags);
 }
 
 static void __cpuinit rcu_online_cpu(int cpu)
index bf8a6f9..8e8287a 100644 (file)
@@ -142,7 +142,7 @@ struct rcu_data {
         */
        struct rcu_head *nxtlist;
        struct rcu_head **nxttail[RCU_NEXT_SIZE];
-       long            qlen;           /* # of queued callbacks */
+       long            qlen;           /* # of queued callbacks */
        long            blimit;         /* Upper limit on a processed batch */
 
 #ifdef CONFIG_NO_HZ
index 4778936..1cee04f 100644 (file)
@@ -64,22 +64,31 @@ EXPORT_SYMBOL_GPL(rcu_batches_completed);
  * not in a quiescent state.  There might be any number of tasks blocked
  * while in an RCU read-side critical section.
  */
-static void rcu_preempt_qs_record(int cpu)
+static void rcu_preempt_qs(int cpu)
 {
        struct rcu_data *rdp = &per_cpu(rcu_preempt_data, cpu);
-       rdp->passed_quiesc = 1;
        rdp->passed_quiesc_completed = rdp->completed;
+       barrier();
+       rdp->passed_quiesc = 1;
 }
 
 /*
- * We have entered the scheduler or are between softirqs in ksoftirqd.
- * If we are in an RCU read-side critical section, we need to reflect
- * that in the state of the rcu_node structure corresponding to this CPU.
- * Caller must disable hardirqs.
+ * We have entered the scheduler, and the current task might soon be
+ * context-switched away from.  If this task is in an RCU read-side
+ * critical section, we will no longer be able to rely on the CPU to
+ * record that fact, so we enqueue the task on the appropriate entry
+ * of the blocked_tasks[] array.  The task will dequeue itself when
+ * it exits the outermost enclosing RCU read-side critical section.
+ * Therefore, the current grace period cannot be permitted to complete
+ * until the blocked_tasks[] entry indexed by the low-order bit of
+ * rnp->gpnum empties.
+ *
+ * Caller must disable preemption.
  */
-static void rcu_preempt_qs(int cpu)
+static void rcu_preempt_note_context_switch(int cpu)
 {
        struct task_struct *t = current;
+       unsigned long flags;
        int phase;
        struct rcu_data *rdp;
        struct rcu_node *rnp;
@@ -90,7 +99,7 @@ static void rcu_preempt_qs(int cpu)
                /* Possibly blocking in an RCU read-side critical section. */
                rdp = rcu_preempt_state.rda[cpu];
                rnp = rdp->mynode;
-               spin_lock(&rnp->lock);
+               spin_lock_irqsave(&rnp->lock, flags);
                t->rcu_read_unlock_special |= RCU_READ_UNLOCK_BLOCKED;
                t->rcu_blocked_node = rnp;
 
@@ -103,11 +112,15 @@ static void rcu_preempt_qs(int cpu)
                 * state for the current grace period), then as long
                 * as that task remains queued, the current grace period
                 * cannot end.
+                *
+                * But first, note that the current CPU must still be
+                * on line!
                 */
-               phase = !(rnp->qsmask & rdp->grpmask) ^ (rnp->gpnum & 0x1);
+               WARN_ON_ONCE((rdp->grpmask & rnp->qsmaskinit) == 0);
+               WARN_ON_ONCE(!list_empty(&t->rcu_node_entry));
+               phase = (rnp->gpnum + !(rnp->qsmask & rdp->grpmask)) & 0x1;
                list_add(&t->rcu_node_entry, &rnp->blocked_tasks[phase]);
-               smp_mb();  /* Ensure later ctxt swtch seen after above. */
-               spin_unlock(&rnp->lock);
+               spin_unlock_irqrestore(&rnp->lock, flags);
        }
 
        /*
@@ -119,9 +132,10 @@ static void rcu_preempt_qs(int cpu)
         * grace period, then the fact that the task has been enqueued
         * means that we continue to block the current grace period.
         */
-       rcu_preempt_qs_record(cpu);
-       t->rcu_read_unlock_special &= ~(RCU_READ_UNLOCK_NEED_QS |
-                                       RCU_READ_UNLOCK_GOT_QS);
+       rcu_preempt_qs(cpu);
+       local_irq_save(flags);
+       t->rcu_read_unlock_special &= ~RCU_READ_UNLOCK_NEED_QS;
+       local_irq_restore(flags);
 }
 
 /*
@@ -157,7 +171,7 @@ static void rcu_read_unlock_special(struct task_struct *t)
        special = t->rcu_read_unlock_special;
        if (special & RCU_READ_UNLOCK_NEED_QS) {
                t->rcu_read_unlock_special &= ~RCU_READ_UNLOCK_NEED_QS;
-               t->rcu_read_unlock_special |= RCU_READ_UNLOCK_GOT_QS;
+               rcu_preempt_qs(smp_processor_id());
        }
 
        /* Hardware IRQ handlers cannot block. */
@@ -177,10 +191,10 @@ static void rcu_read_unlock_special(struct task_struct *t)
                 */
                for (;;) {
                        rnp = t->rcu_blocked_node;
-                       spin_lock(&rnp->lock);
+                       spin_lock(&rnp->lock);  /* irqs already disabled. */
                        if (rnp == t->rcu_blocked_node)
                                break;
-                       spin_unlock(&rnp->lock);
+                       spin_unlock(&rnp->lock);  /* irqs remain disabled. */
                }
                empty = list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x1]);
                list_del_init(&t->rcu_node_entry);
@@ -194,9 +208,8 @@ static void rcu_read_unlock_special(struct task_struct *t)
                 */
                if (!empty && rnp->qsmask == 0 &&
                    list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x1])) {
-                       t->rcu_read_unlock_special &=
-                               ~(RCU_READ_UNLOCK_NEED_QS |
-                                 RCU_READ_UNLOCK_GOT_QS);
+                       struct rcu_node *rnp_p;
+
                        if (rnp->parent == NULL) {
                                /* Only one rcu_node in the tree. */
                                cpu_quiet_msk_finish(&rcu_preempt_state, flags);
@@ -205,9 +218,10 @@ static void rcu_read_unlock_special(struct task_struct *t)
                        /* Report up the rest of the hierarchy. */
                        mask = rnp->grpmask;
                        spin_unlock_irqrestore(&rnp->lock, flags);
-                       rnp = rnp->parent;
-                       spin_lock_irqsave(&rnp->lock, flags);
-                       cpu_quiet_msk(mask, &rcu_preempt_state, rnp, flags);
+                       rnp_p = rnp->parent;
+                       spin_lock_irqsave(&rnp_p->lock, flags);
+                       WARN_ON_ONCE(rnp->qsmask);
+                       cpu_quiet_msk(mask, &rcu_preempt_state, rnp_p, flags);
                        return;
                }
                spin_unlock(&rnp->lock);
@@ -258,6 +272,19 @@ static void rcu_print_task_stall(struct rcu_node *rnp)
 
 #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
 
+/*
+ * Check that the list of blocked tasks for the newly completed grace
+ * period is in fact empty.  It is a serious bug to complete a grace
+ * period that still has RCU readers blocked!  This function must be
+ * invoked -before- updating this rnp's ->gpnum, and the rnp's ->lock
+ * must be held by the caller.
+ */
+static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)
+{
+       WARN_ON_ONCE(!list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x1]));
+       WARN_ON_ONCE(rnp->qsmask);
+}
+
 /*
  * Check for preempted RCU readers for the specified rcu_node structure.
  * If the caller needs a reliable answer, it must hold the rcu_node's
@@ -280,7 +307,8 @@ static int rcu_preempted_readers(struct rcu_node *rnp)
  * The caller must hold rnp->lock with irqs disabled.
  */
 static void rcu_preempt_offline_tasks(struct rcu_state *rsp,
-                                     struct rcu_node *rnp)
+                                     struct rcu_node *rnp,
+                                     struct rcu_data *rdp)
 {
        int i;
        struct list_head *lp;
@@ -292,6 +320,9 @@ static void rcu_preempt_offline_tasks(struct rcu_state *rsp,
                WARN_ONCE(1, "Last CPU thought to be offlined?");
                return;  /* Shouldn't happen: at least one CPU online. */
        }
+       WARN_ON_ONCE(rnp != rdp->mynode &&
+                    (!list_empty(&rnp->blocked_tasks[0]) ||
+                     !list_empty(&rnp->blocked_tasks[1])));
 
        /*
         * Move tasks up to root rcu_node.  Rely on the fact that the
@@ -335,20 +366,12 @@ static void rcu_preempt_check_callbacks(int cpu)
        struct task_struct *t = current;
 
        if (t->rcu_read_lock_nesting == 0) {
-               t->rcu_read_unlock_special &=
-                       ~(RCU_READ_UNLOCK_NEED_QS | RCU_READ_UNLOCK_GOT_QS);
-               rcu_preempt_qs_record(cpu);
+               t->rcu_read_unlock_special &= ~RCU_READ_UNLOCK_NEED_QS;
+               rcu_preempt_qs(cpu);
                return;
        }
-       if (per_cpu(rcu_preempt_data, cpu).qs_pending) {
-               if (t->rcu_read_unlock_special & RCU_READ_UNLOCK_GOT_QS) {
-                       rcu_preempt_qs_record(cpu);
-                       t->rcu_read_unlock_special &= ~RCU_READ_UNLOCK_GOT_QS;
-               } else if (!(t->rcu_read_unlock_special &
-                            RCU_READ_UNLOCK_NEED_QS)) {
-                       t->rcu_read_unlock_special |= RCU_READ_UNLOCK_NEED_QS;
-               }
-       }
+       if (per_cpu(rcu_preempt_data, cpu).qs_pending)
+               t->rcu_read_unlock_special |= RCU_READ_UNLOCK_NEED_QS;
 }
 
 /*
@@ -434,7 +457,7 @@ EXPORT_SYMBOL_GPL(rcu_batches_completed);
  * Because preemptable RCU does not exist, we never have to check for
  * CPUs being in quiescent states.
  */
-static void rcu_preempt_qs(int cpu)
+static void rcu_preempt_note_context_switch(int cpu)
 {
 }
 
@@ -450,6 +473,16 @@ static void rcu_print_task_stall(struct rcu_node *rnp)
 
 #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
 
+/*
+ * Because there is no preemptable RCU, there can be no readers blocked,
+ * so there is no need to check for blocked tasks.  So check only for
+ * bogus qsmask values.
+ */
+static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)
+{
+       WARN_ON_ONCE(rnp->qsmask);
+}
+
 /*
  * Because preemptable RCU does not exist, there are never any preempted
  * RCU readers.
@@ -466,7 +499,8 @@ static int rcu_preempted_readers(struct rcu_node *rnp)
  * tasks that were blocked within RCU read-side critical sections.
  */
 static void rcu_preempt_offline_tasks(struct rcu_state *rsp,
-                                     struct rcu_node *rnp)
+                                     struct rcu_node *rnp,
+                                     struct rcu_data *rdp)
 {
 }
 
index 0ea1bff..c89f5e9 100644 (file)
@@ -20,7 +20,7 @@
  * Papers:  http://www.rdrop.com/users/paulmck/RCU
  *
  * For detailed explanation of Read-Copy Update mechanism see -
- *             Documentation/RCU
+ *             Documentation/RCU
  *
  */
 #include <linux/types.h>
index 78b0872..fb11a58 100644 (file)
@@ -223,13 +223,13 @@ int release_resource(struct resource *old)
 
 EXPORT_SYMBOL(release_resource);
 
-#if defined(CONFIG_MEMORY_HOTPLUG) && !defined(CONFIG_ARCH_HAS_WALK_MEMORY)
+#if !defined(CONFIG_ARCH_HAS_WALK_MEMORY)
 /*
  * Finds the lowest memory reosurce exists within [res->start.res->end)
- * the caller must specify res->start, res->end, res->flags.
+ * the caller must specify res->start, res->end, res->flags and "name".
  * If found, returns 0, res is overwritten, if not found, returns -1.
  */
-static int find_next_system_ram(struct resource *res)
+static int find_next_system_ram(struct resource *res, char *name)
 {
        resource_size_t start, end;
        struct resource *p;
@@ -245,6 +245,8 @@ static int find_next_system_ram(struct resource *res)
                /* system ram is just marked as IORESOURCE_MEM */
                if (p->flags != res->flags)
                        continue;
+               if (name && strcmp(p->name, name))
+                       continue;
                if (p->start > end) {
                        p = NULL;
                        break;
@@ -262,19 +264,26 @@ static int find_next_system_ram(struct resource *res)
                res->end = p->end;
        return 0;
 }
-int
-walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
-                       int (*func)(unsigned long, unsigned long, void *))
+
+/*
+ * This function calls callback against all memory range of "System RAM"
+ * which are marked as IORESOURCE_MEM and IORESOUCE_BUSY.
+ * Now, this function is only for "System RAM".
+ */
+int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
+               void *arg, int (*func)(unsigned long, unsigned long, void *))
 {
        struct resource res;
        unsigned long pfn, len;
        u64 orig_end;
        int ret = -1;
+
        res.start = (u64) start_pfn << PAGE_SHIFT;
        res.end = ((u64)(start_pfn + nr_pages) << PAGE_SHIFT) - 1;
        res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
        orig_end = res.end;
-       while ((res.start < res.end) && (find_next_system_ram(&res) >= 0)) {
+       while ((res.start < res.end) &&
+               (find_next_system_ram(&res, "System RAM") >= 0)) {
                pfn = (unsigned long)(res.start >> PAGE_SHIFT);
                len = (unsigned long)((res.end + 1 - res.start) >> PAGE_SHIFT);
                ret = (*func)(pfn, len, arg);
index faf4d46..0ac9053 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/completion.h>
 #include <linux/kernel_stat.h>
 #include <linux/debug_locks.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/security.h>
 #include <linux/notifier.h>
 #include <linux/profile.h>
@@ -681,15 +681,9 @@ inline void update_rq_clock(struct rq *rq)
  * This interface allows printk to be called with the runqueue lock
  * held and know whether or not it is OK to wake up the klogd.
  */
-int runqueue_is_locked(void)
+int runqueue_is_locked(int cpu)
 {
-       int cpu = get_cpu();
-       struct rq *rq = cpu_rq(cpu);
-       int ret;
-
-       ret = spin_is_locked(&rq->lock);
-       put_cpu();
-       return ret;
+       return spin_is_locked(&cpu_rq(cpu)->lock);
 }
 
 /*
@@ -2059,7 +2053,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
                if (task_hot(p, old_rq->clock, NULL))
                        schedstat_inc(p, se.nr_forced2_migrations);
 #endif
-               perf_swcounter_event(PERF_COUNT_SW_CPU_MIGRATIONS,
+               perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS,
                                     1, 1, NULL, 0);
        }
        p->se.vruntime -= old_cfsrq->min_vruntime -
@@ -2724,7 +2718,7 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
         */
        prev_state = prev->state;
        finish_arch_switch(prev);
-       perf_counter_task_sched_in(current, cpu_of(rq));
+       perf_event_task_sched_in(current, cpu_of(rq));
        finish_lock_switch(rq, prev);
 
        fire_sched_in_preempt_notifiers(current);
@@ -2910,6 +2904,19 @@ unsigned long nr_iowait(void)
        return sum;
 }
 
+unsigned long nr_iowait_cpu(void)
+{
+       struct rq *this = this_rq();
+       return atomic_read(&this->nr_iowait);
+}
+
+unsigned long this_cpu_load(void)
+{
+       struct rq *this = this_rq();
+       return this->cpu_load[0];
+}
+
+
 /* Variables and functions for calc_load */
 static atomic_long_t calc_load_tasks;
 static unsigned long calc_load_update;
@@ -5199,7 +5206,7 @@ void scheduler_tick(void)
        curr->sched_class->task_tick(rq, curr, 0);
        spin_unlock(&rq->lock);
 
-       perf_counter_task_tick(curr, cpu);
+       perf_event_task_tick(curr, cpu);
 
 #ifdef CONFIG_SMP
        rq->idle_at_tick = idle_cpu(cpu);
@@ -5415,7 +5422,7 @@ need_resched_nonpreemptible:
 
        if (likely(prev != next)) {
                sched_info_switch(prev, next);
-               perf_counter_task_sched_out(prev, next, cpu);
+               perf_event_task_sched_out(prev, next, cpu);
 
                rq->nr_switches++;
                rq->curr = next;
@@ -6825,23 +6832,8 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
        if (retval)
                goto out_unlock;
 
-       /*
-        * Time slice is 0 for SCHED_FIFO tasks and for SCHED_OTHER
-        * tasks that are on an otherwise idle runqueue:
-        */
-       time_slice = 0;
-       if (p->policy == SCHED_RR) {
-               time_slice = DEF_TIMESLICE;
-       } else if (p->policy != SCHED_FIFO) {
-               struct sched_entity *se = &p->se;
-               unsigned long flags;
-               struct rq *rq;
+       time_slice = p->sched_class->get_rr_interval(p);
 
-               rq = task_rq_lock(p, &flags);
-               if (rq->cfs.load.weight)
-                       time_slice = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
-               task_rq_unlock(rq, &flags);
-       }
        read_unlock(&tasklist_lock);
        jiffies_to_timespec(time_slice, &t);
        retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
@@ -7692,7 +7684,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
 /*
  * Register at high priority so that task migration (migrate_all_tasks)
  * happens before everything else.  This has to be lower priority than
- * the notifier in the perf_counter subsystem, though.
+ * the notifier in the perf_event subsystem, though.
  */
 static struct notifier_block __cpuinitdata migration_notifier = {
        .notifier_call = migration_call,
@@ -9171,6 +9163,7 @@ void __init sched_init_smp(void)
        cpumask_var_t non_isolated_cpus;
 
        alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
+       alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
 
 #if defined(CONFIG_NUMA)
        sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
@@ -9202,7 +9195,6 @@ void __init sched_init_smp(void)
        sched_init_granularity();
        free_cpumask_var(non_isolated_cpus);
 
-       alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
        init_sched_rt_class();
 }
 #else
@@ -9549,7 +9541,7 @@ void __init sched_init(void)
        alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
 #endif /* SMP */
 
-       perf_counter_init();
+       perf_event_init();
 
        scheduler_running = 1;
 }
index e1d16c9..ac2e1dc 100644 (file)
@@ -48,13 +48,6 @@ static __read_mostly int sched_clock_running;
 __read_mostly int sched_clock_stable;
 
 struct sched_clock_data {
-       /*
-        * Raw spinlock - this is a special case: this might be called
-        * from within instrumentation code so we dont want to do any
-        * instrumentation ourselves.
-        */
-       raw_spinlock_t          lock;
-
        u64                     tick_raw;
        u64                     tick_gtod;
        u64                     clock;
@@ -80,7 +73,6 @@ void sched_clock_init(void)
        for_each_possible_cpu(cpu) {
                struct sched_clock_data *scd = cpu_sdc(cpu);
 
-               scd->lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
                scd->tick_raw = 0;
                scd->tick_gtod = ktime_now;
                scd->clock = ktime_now;
@@ -109,14 +101,19 @@ static inline u64 wrap_max(u64 x, u64 y)
  *  - filter out backward motion
  *  - use the GTOD tick value to create a window to filter crazy TSC values
  */
-static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
+static u64 sched_clock_local(struct sched_clock_data *scd)
 {
-       s64 delta = now - scd->tick_raw;
-       u64 clock, min_clock, max_clock;
+       u64 now, clock, old_clock, min_clock, max_clock;
+       s64 delta;
 
+again:
+       now = sched_clock();
+       delta = now - scd->tick_raw;
        if (unlikely(delta < 0))
                delta = 0;
 
+       old_clock = scd->clock;
+
        /*
         * scd->clock = clamp(scd->tick_gtod + delta,
         *                    max(scd->tick_gtod, scd->clock),
@@ -124,84 +121,73 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
         */
 
        clock = scd->tick_gtod + delta;
-       min_clock = wrap_max(scd->tick_gtod, scd->clock);
-       max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);
+       min_clock = wrap_max(scd->tick_gtod, old_clock);
+       max_clock = wrap_max(old_clock, scd->tick_gtod + TICK_NSEC);
 
        clock = wrap_max(clock, min_clock);
        clock = wrap_min(clock, max_clock);
 
-       scd->clock = clock;
+       if (cmpxchg(&scd->clock, old_clock, clock) != old_clock)
+               goto again;
 
-       return scd->clock;
+       return clock;
 }
 
-static void lock_double_clock(struct sched_clock_data *data1,
-                               struct sched_clock_data *data2)
+static u64 sched_clock_remote(struct sched_clock_data *scd)
 {
-       if (data1 < data2) {
-               __raw_spin_lock(&data1->lock);
-               __raw_spin_lock(&data2->lock);
+       struct sched_clock_data *my_scd = this_scd();
+       u64 this_clock, remote_clock;
+       u64 *ptr, old_val, val;
+
+       sched_clock_local(my_scd);
+again:
+       this_clock = my_scd->clock;
+       remote_clock = scd->clock;
+
+       /*
+        * Use the opportunity that we have both locks
+        * taken to couple the two clocks: we take the
+        * larger time as the latest time for both
+        * runqueues. (this creates monotonic movement)
+        */
+       if (likely((s64)(remote_clock - this_clock) < 0)) {
+               ptr = &scd->clock;
+               old_val = remote_clock;
+               val = this_clock;
        } else {
-               __raw_spin_lock(&data2->lock);
-               __raw_spin_lock(&data1->lock);
+               /*
+                * Should be rare, but possible:
+                */
+               ptr = &my_scd->clock;
+               old_val = this_clock;
+               val = remote_clock;
        }
+
+       if (cmpxchg(ptr, old_val, val) != old_val)
+               goto again;
+
+       return val;
 }
 
 u64 sched_clock_cpu(int cpu)
 {
-       u64 now, clock, this_clock, remote_clock;
        struct sched_clock_data *scd;
+       u64 clock;
+
+       WARN_ON_ONCE(!irqs_disabled());
 
        if (sched_clock_stable)
                return sched_clock();
 
-       scd = cpu_sdc(cpu);
-
-       /*
-        * Normally this is not called in NMI context - but if it is,
-        * trying to do any locking here is totally lethal.
-        */
-       if (unlikely(in_nmi()))
-               return scd->clock;
-
        if (unlikely(!sched_clock_running))
                return 0ull;
 
-       WARN_ON_ONCE(!irqs_disabled());
-       now = sched_clock();
-
-       if (cpu != raw_smp_processor_id()) {
-               struct sched_clock_data *my_scd = this_scd();
-
-               lock_double_clock(scd, my_scd);
-
-               this_clock = __update_sched_clock(my_scd, now);
-               remote_clock = scd->clock;
-
-               /*
-                * Use the opportunity that we have both locks
-                * taken to couple the two clocks: we take the
-                * larger time as the latest time for both
-                * runqueues. (this creates monotonic movement)
-                */
-               if (likely((s64)(remote_clock - this_clock) < 0)) {
-                       clock = this_clock;
-                       scd->clock = clock;
-               } else {
-                       /*
-                        * Should be rare, but possible:
-                        */
-                       clock = remote_clock;
-                       my_scd->clock = remote_clock;
-               }
-
-               __raw_spin_unlock(&my_scd->lock);
-       } else {
-               __raw_spin_lock(&scd->lock);
-               clock = __update_sched_clock(scd, now);
-       }
+       scd = cpu_sdc(cpu);
 
-       __raw_spin_unlock(&scd->lock);
+       if (cpu != smp_processor_id())
+               clock = sched_clock_remote(scd);
+       else
+               clock = sched_clock_local(scd);
 
        return clock;
 }
@@ -223,11 +209,9 @@ void sched_clock_tick(void)
        now_gtod = ktime_to_ns(ktime_get());
        now = sched_clock();
 
-       __raw_spin_lock(&scd->lock);
        scd->tick_raw = now;
        scd->tick_gtod = now_gtod;
-       __update_sched_clock(scd, now);
-       __raw_spin_unlock(&scd->lock);
+       sched_clock_local(scd);
 }
 
 /*
index 10d218a..ecc637a 100644 (file)
@@ -513,6 +513,7 @@ static void update_curr(struct cfs_rq *cfs_rq)
        if (entity_is_task(curr)) {
                struct task_struct *curtask = task_of(curr);
 
+               trace_sched_stat_runtime(curtask, delta_exec, curr->vruntime);
                cpuacct_charge(curtask, delta_exec);
                account_group_exec_runtime(curtask, delta_exec);
        }
@@ -709,31 +710,28 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
        if (initial && sched_feat(START_DEBIT))
                vruntime += sched_vslice(cfs_rq, se);
 
-       if (!initial) {
-               /* sleeps upto a single latency don't count. */
-               if (sched_feat(FAIR_SLEEPERS)) {
-                       unsigned long thresh = sysctl_sched_latency;
+       /* sleeps up to a single latency don't count. */
+       if (!initial && sched_feat(FAIR_SLEEPERS)) {
+               unsigned long thresh = sysctl_sched_latency;
 
-                       /*
-                        * Convert the sleeper threshold into virtual time.
-                        * SCHED_IDLE is a special sub-class.  We care about
-                        * fairness only relative to other SCHED_IDLE tasks,
-                        * all of which have the same weight.
-                        */
-                       if (sched_feat(NORMALIZED_SLEEPER) &&
-                                       (!entity_is_task(se) ||
-                                        task_of(se)->policy != SCHED_IDLE))
-                               thresh = calc_delta_fair(thresh, se);
+               /*
+                * Convert the sleeper threshold into virtual time.
+                * SCHED_IDLE is a special sub-class.  We care about
+                * fairness only relative to other SCHED_IDLE tasks,
+                * all of which have the same weight.
+                */
+               if (sched_feat(NORMALIZED_SLEEPER) && (!entity_is_task(se) ||
+                                task_of(se)->policy != SCHED_IDLE))
+                       thresh = calc_delta_fair(thresh, se);
 
-                       /*
-                        * Halve their sleep time's effect, to allow
-                        * for a gentler effect of sleepers:
-                        */
-                       if (sched_feat(GENTLE_FAIR_SLEEPERS))
-                               thresh >>= 1;
+               /*
+                * Halve their sleep time's effect, to allow
+                * for a gentler effect of sleepers:
+                */
+               if (sched_feat(GENTLE_FAIR_SLEEPERS))
+                       thresh >>= 1;
 
-                       vruntime -= thresh;
-               }
+               vruntime -= thresh;
        }
 
        /* ensure we never gain time by being placed backwards. */
@@ -1342,7 +1340,8 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
        int sync = wake_flags & WF_SYNC;
 
        if (sd_flag & SD_BALANCE_WAKE) {
-               if (sched_feat(AFFINE_WAKEUPS))
+               if (sched_feat(AFFINE_WAKEUPS) &&
+                   cpumask_test_cpu(cpu, &p->cpus_allowed))
                        want_affine = 1;
                new_cpu = prev_cpu;
        }
@@ -1940,6 +1939,25 @@ static void moved_group_fair(struct task_struct *p)
 }
 #endif
 
+unsigned int get_rr_interval_fair(struct task_struct *task)
+{
+       struct sched_entity *se = &task->se;
+       unsigned long flags;
+       struct rq *rq;
+       unsigned int rr_interval = 0;
+
+       /*
+        * Time slice is 0 for SCHED_OTHER tasks that are on an otherwise
+        * idle runqueue:
+        */
+       rq = task_rq_lock(task, &flags);
+       if (rq->cfs.load.weight)
+               rr_interval = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
+       task_rq_unlock(rq, &flags);
+
+       return rr_interval;
+}
+
 /*
  * All the scheduling class methods:
  */
@@ -1968,6 +1986,8 @@ static const struct sched_class fair_sched_class = {
        .prio_changed           = prio_changed_fair,
        .switched_to            = switched_to_fair,
 
+       .get_rr_interval        = get_rr_interval_fair,
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
        .moved_group            = moved_group_fair,
 #endif
index a8b448a..b133a28 100644 (file)
@@ -97,6 +97,11 @@ static void prio_changed_idle(struct rq *rq, struct task_struct *p,
                check_preempt_curr(rq, p, 0);
 }
 
+unsigned int get_rr_interval_idle(struct task_struct *task)
+{
+       return 0;
+}
+
 /*
  * Simple, special scheduling class for the per-CPU idle tasks:
  */
@@ -122,6 +127,8 @@ static const struct sched_class idle_sched_class = {
        .set_curr_task          = set_curr_task_idle,
        .task_tick              = task_tick_idle,
 
+       .get_rr_interval        = get_rr_interval_idle,
+
        .prio_changed           = prio_changed_idle,
        .switched_to            = switched_to_idle,
 
index 13de712..a4d790c 100644 (file)
@@ -1734,6 +1734,17 @@ static void set_curr_task_rt(struct rq *rq)
        dequeue_pushable_task(rq, p);
 }
 
+unsigned int get_rr_interval_rt(struct task_struct *task)
+{
+       /*
+        * Time slice is 0 for SCHED_FIFO tasks
+        */
+       if (task->policy == SCHED_RR)
+               return DEF_TIMESLICE;
+       else
+               return 0;
+}
+
 static const struct sched_class rt_sched_class = {
        .next                   = &fair_sched_class,
        .enqueue_task           = enqueue_task_rt,
@@ -1762,6 +1773,8 @@ static const struct sched_class rt_sched_class = {
        .set_curr_task          = set_curr_task_rt,
        .task_tick              = task_tick_rt,
 
+       .get_rr_interval        = get_rr_interval_rt,
+
        .prio_changed           = prio_changed_rt,
        .switched_to            = switched_to_rt,
 };
index 8e21850..fd47a25 100644 (file)
@@ -29,8 +29,7 @@ enum {
 
 struct call_function_data {
        struct call_single_data csd;
-       spinlock_t              lock;
-       unsigned int            refs;
+       atomic_t                refs;
        cpumask_var_t           cpumask;
 };
 
@@ -39,9 +38,7 @@ struct call_single_queue {
        spinlock_t              lock;
 };
 
-static DEFINE_PER_CPU(struct call_function_data, cfd_data) = {
-       .lock                   = __SPIN_LOCK_UNLOCKED(cfd_data.lock),
-};
+static DEFINE_PER_CPU(struct call_function_data, cfd_data);
 
 static int
 hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
@@ -196,25 +193,18 @@ void generic_smp_call_function_interrupt(void)
        list_for_each_entry_rcu(data, &call_function.queue, csd.list) {
                int refs;
 
-               spin_lock(&data->lock);
-               if (!cpumask_test_cpu(cpu, data->cpumask)) {
-                       spin_unlock(&data->lock);
+               if (!cpumask_test_and_clear_cpu(cpu, data->cpumask))
                        continue;
-               }
-               cpumask_clear_cpu(cpu, data->cpumask);
-               spin_unlock(&data->lock);
 
                data->csd.func(data->csd.info);
 
-               spin_lock(&data->lock);
-               WARN_ON(data->refs == 0);
-               refs = --data->refs;
+               refs = atomic_dec_return(&data->refs);
+               WARN_ON(refs < 0);
                if (!refs) {
                        spin_lock(&call_function.lock);
                        list_del_rcu(&data->csd.list);
                        spin_unlock(&call_function.lock);
                }
-               spin_unlock(&data->lock);
 
                if (refs)
                        continue;
@@ -419,23 +409,20 @@ void smp_call_function_many(const struct cpumask *mask,
        data = &__get_cpu_var(cfd_data);
        csd_lock(&data->csd);
 
-       spin_lock_irqsave(&data->lock, flags);
        data->csd.func = func;
        data->csd.info = info;
        cpumask_and(data->cpumask, mask, cpu_online_mask);
        cpumask_clear_cpu(this_cpu, data->cpumask);
-       data->refs = cpumask_weight(data->cpumask);
+       atomic_set(&data->refs, cpumask_weight(data->cpumask));
 
-       spin_lock(&call_function.lock);
+       spin_lock_irqsave(&call_function.lock, flags);
        /*
         * Place entry at the _HEAD_ of the list, so that any cpu still
         * observing the entry in generic_smp_call_function_interrupt()
         * will not miss any other list entries:
         */
        list_add_rcu(&data->csd.list, &call_function.queue);
-       spin_unlock(&call_function.lock);
-
-       spin_unlock_irqrestore(&data->lock, flags);
+       spin_unlock_irqrestore(&call_function.lock, flags);
 
        /*
         * Make the list addition visible before sending the ipi.
index b3f1097..ebcb156 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/prctl.h>
 #include <linux/highuid.h>
 #include <linux/fs.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/resource.h>
 #include <linux/kernel.h>
 #include <linux/kexec.h>
@@ -1338,6 +1338,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
        unsigned long flags;
        cputime_t utime, stime;
        struct task_cputime cputime;
+       unsigned long maxrss = 0;
 
        memset((char *) r, 0, sizeof *r);
        utime = stime = cputime_zero;
@@ -1346,6 +1347,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
                utime = task_utime(current);
                stime = task_stime(current);
                accumulate_thread_rusage(p, r);
+               maxrss = p->signal->maxrss;
                goto out;
        }
 
@@ -1363,6 +1365,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
                        r->ru_majflt = p->signal->cmaj_flt;
                        r->ru_inblock = p->signal->cinblock;
                        r->ru_oublock = p->signal->coublock;
+                       maxrss = p->signal->cmaxrss;
 
                        if (who == RUSAGE_CHILDREN)
                                break;
@@ -1377,6 +1380,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
                        r->ru_majflt += p->signal->maj_flt;
                        r->ru_inblock += p->signal->inblock;
                        r->ru_oublock += p->signal->oublock;
+                       if (maxrss < p->signal->maxrss)
+                               maxrss = p->signal->maxrss;
                        t = p;
                        do {
                                accumulate_thread_rusage(t, r);
@@ -1392,6 +1397,15 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
 out:
        cputime_to_timeval(utime, &r->ru_utime);
        cputime_to_timeval(stime, &r->ru_stime);
+
+       if (who != RUSAGE_CHILDREN) {
+               struct mm_struct *mm = get_task_mm(p);
+               if (mm) {
+                       setmax_mm_hiwater_rss(&maxrss, mm);
+                       mmput(mm);
+               }
+       }
+       r->ru_maxrss = maxrss * (PAGE_SIZE / 1024); /* convert pages to KBs */
 }
 
 int getrusage(struct task_struct *p, int who, struct rusage __user *ru)
@@ -1511,11 +1525,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                case PR_SET_TSC:
                        error = SET_TSC_CTL(arg2);
                        break;
-               case PR_TASK_PERF_COUNTERS_DISABLE:
-                       error = perf_counter_task_disable();
+               case PR_TASK_PERF_EVENTS_DISABLE:
+                       error = perf_event_task_disable();
                        break;
-               case PR_TASK_PERF_COUNTERS_ENABLE:
-                       error = perf_counter_task_enable();
+               case PR_TASK_PERF_EVENTS_ENABLE:
+                       error = perf_event_task_enable();
                        break;
                case PR_GET_TIMERSLACK:
                        error = current->timer_slack_ns;
index 68320f6..515bc23 100644 (file)
@@ -177,4 +177,4 @@ cond_syscall(sys_eventfd);
 cond_syscall(sys_eventfd2);
 
 /* performance counters: */
-cond_syscall(sys_perf_counter_open);
+cond_syscall(sys_perf_event_open);
index 1a631ba..0dfaa47 100644 (file)
@@ -50,7 +50,7 @@
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
 #include <linux/slow-work.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -106,6 +106,9 @@ static int __maybe_unused one = 1;
 static int __maybe_unused two = 2;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;
+#ifdef CONFIG_PRINTK
+static int ten_thousand = 10000;
+#endif
 
 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
 static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
@@ -722,6 +725,17 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "printk_delay",
+               .data           = &printk_delay_msec,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &zero,
+               .extra2         = &ten_thousand,
+       },
 #endif
        {
                .ctl_name       = KERN_NGROUPS_MAX,
@@ -964,28 +978,28 @@ static struct ctl_table kern_table[] = {
                .child          = slow_work_sysctls,
        },
 #endif
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
        {
                .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "perf_counter_paranoid",
-               .data           = &sysctl_perf_counter_paranoid,
-               .maxlen         = sizeof(sysctl_perf_counter_paranoid),
+               .procname       = "perf_event_paranoid",
+               .data           = &sysctl_perf_event_paranoid,
+               .maxlen         = sizeof(sysctl_perf_event_paranoid),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
        {
                .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "perf_counter_mlock_kb",
-               .data           = &sysctl_perf_counter_mlock,
-               .maxlen         = sizeof(sysctl_perf_counter_mlock),
+               .procname       = "perf_event_mlock_kb",
+               .data           = &sysctl_perf_event_mlock,
+               .maxlen         = sizeof(sysctl_perf_event_mlock),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
        {
                .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "perf_counter_max_sample_rate",
-               .data           = &sysctl_perf_counter_sample_rate,
-               .maxlen         = sizeof(sysctl_perf_counter_sample_rate),
+               .procname       = "perf_event_max_sample_rate",
+               .data           = &sysctl_perf_event_sample_rate,
+               .maxlen         = sizeof(sysctl_perf_event_sample_rate),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
index bbb5107..811e5c3 100644 (file)
@@ -37,7 +37,7 @@
 #include <linux/delay.h>
 #include <linux/tick.h>
 #include <linux/kallsyms.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <linux/sched.h>
 
 #include <asm/uaccess.h>
@@ -1187,7 +1187,7 @@ static void run_timer_softirq(struct softirq_action *h)
 {
        struct tvec_base *base = __get_cpu_var(tvec_bases);
 
-       perf_counter_do_pending();
+       perf_event_do_pending();
 
        hrtimer_run_pending();
 
index e716346..b416512 100644 (file)
@@ -83,7 +83,7 @@ config RING_BUFFER_ALLOW_SWAP
 # This allows those options to appear when no other tracer is selected. But the
 # options do not appear when something else selects it. We need the two options
 # GENERIC_TRACER and TRACING to avoid circular dependencies to accomplish the
-# hidding of the automatic options options.
+# hidding of the automatic options.
 
 config TRACING
        bool
index 844164d..26f03ac 100644 (file)
@@ -42,7 +42,6 @@ obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += trace_functions_graph.o
 obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o
 obj-$(CONFIG_HW_BRANCH_TRACER) += trace_hw_branches.o
-obj-$(CONFIG_POWER_TRACER) += trace_power.o
 obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
 obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o
 obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o
@@ -54,5 +53,6 @@ obj-$(CONFIG_EVENT_TRACING) += trace_export.o
 obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o
 obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o
 obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
+obj-$(CONFIG_EVENT_TRACING) += power-traces.o
 
 libftrace-y := ftrace.o
index cc615f8..23df777 100644 (file)
@@ -1520,7 +1520,7 @@ static int t_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations show_ftrace_seq_ops = {
+static const struct seq_operations show_ftrace_seq_ops = {
        .start = t_start,
        .next = t_next,
        .stop = t_stop,
@@ -2414,11 +2414,9 @@ unsigned long ftrace_graph_funcs[FTRACE_GRAPH_MAX_FUNCS] __read_mostly;
 static void *
 __g_next(struct seq_file *m, loff_t *pos)
 {
-       unsigned long *array = m->private;
-
        if (*pos >= ftrace_graph_count)
                return NULL;
-       return &array[*pos];
+       return &ftrace_graph_funcs[*pos];
 }
 
 static void *
@@ -2461,7 +2459,7 @@ static int g_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations ftrace_graph_seq_ops = {
+static const struct seq_operations ftrace_graph_seq_ops = {
        .start = g_start,
        .next = g_next,
        .stop = g_stop,
@@ -2482,16 +2480,10 @@ ftrace_graph_open(struct inode *inode, struct file *file)
                ftrace_graph_count = 0;
                memset(ftrace_graph_funcs, 0, sizeof(ftrace_graph_funcs));
        }
+       mutex_unlock(&graph_lock);
 
-       if (file->f_mode & FMODE_READ) {
+       if (file->f_mode & FMODE_READ)
                ret = seq_open(file, &ftrace_graph_seq_ops);
-               if (!ret) {
-                       struct seq_file *m = file->private_data;
-                       m->private = ftrace_graph_funcs;
-               }
-       } else
-               file->private_data = ftrace_graph_funcs;
-       mutex_unlock(&graph_lock);
 
        return ret;
 }
@@ -2560,7 +2552,6 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,
                   size_t cnt, loff_t *ppos)
 {
        struct trace_parser parser;
-       unsigned long *array;
        size_t read = 0;
        ssize_t ret;
 
@@ -2574,12 +2565,6 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,
                goto out;
        }
 
-       if (file->f_mode & FMODE_READ) {
-               struct seq_file *m = file->private_data;
-               array = m->private;
-       } else
-               array = file->private_data;
-
        if (trace_parser_get_init(&parser, FTRACE_BUFF_MAX)) {
                ret = -ENOMEM;
                goto out;
@@ -2591,7 +2576,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,
                parser.buffer[parser.idx] = 0;
 
                /* we allow only one expression at a time */
-               ret = ftrace_set_func(array, &ftrace_graph_count,
+               ret = ftrace_set_func(ftrace_graph_funcs, &ftrace_graph_count,
                                        parser.buffer);
                if (ret)
                        goto out;
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c
new file mode 100644 (file)
index 0000000..e06c6e3
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ * Power trace points
+ *
+ * Copyright (C) 2009 Arjan van de Ven <arjan@linux.intel.com>
+ */
+
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/power.h>
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_end);
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency);
+
index 6eef389..d4ff019 100644 (file)
@@ -201,8 +201,6 @@ int tracing_is_on(void)
 }
 EXPORT_SYMBOL_GPL(tracing_is_on);
 
-#include "trace.h"
-
 #define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array))
 #define RB_ALIGNMENT           4U
 #define RB_MAX_SMALL_DATA      (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX)
index fd52a19..6c0f6a8 100644 (file)
@@ -125,13 +125,13 @@ int ftrace_dump_on_oops;
 
 static int tracing_set_tracer(const char *buf);
 
-#define BOOTUP_TRACER_SIZE             100
-static char bootup_tracer_buf[BOOTUP_TRACER_SIZE] __initdata;
+#define MAX_TRACER_SIZE                100
+static char bootup_tracer_buf[MAX_TRACER_SIZE] __initdata;
 static char *default_bootup_tracer;
 
 static int __init set_ftrace(char *str)
 {
-       strncpy(bootup_tracer_buf, str, BOOTUP_TRACER_SIZE);
+       strncpy(bootup_tracer_buf, str, MAX_TRACER_SIZE);
        default_bootup_tracer = bootup_tracer_buf;
        /* We are using ftrace early, expand it */
        ring_buffer_expanded = 1;
@@ -241,13 +241,6 @@ static struct tracer               *trace_types __read_mostly;
 /* current_trace points to the tracer that is currently active */
 static struct tracer           *current_trace __read_mostly;
 
-/*
- * max_tracer_type_len is used to simplify the allocating of
- * buffers to read userspace tracer names. We keep track of
- * the longest tracer name registered.
- */
-static int                     max_tracer_type_len;
-
 /*
  * trace_types_lock is used to protect the trace_types list.
  * This lock is also used to keep user access serialized.
@@ -275,12 +268,18 @@ static DEFINE_SPINLOCK(tracing_start_lock);
  */
 void trace_wake_up(void)
 {
+       int cpu;
+
+       if (trace_flags & TRACE_ITER_BLOCK)
+               return;
        /*
         * The runqueue_is_locked() can fail, but this is the best we
         * have for now:
         */
-       if (!(trace_flags & TRACE_ITER_BLOCK) && !runqueue_is_locked())
+       cpu = get_cpu();
+       if (!runqueue_is_locked(cpu))
                wake_up(&trace_wait);
+       put_cpu();
 }
 
 static int __init set_buf_size(char *str)
@@ -619,7 +618,6 @@ __releases(kernel_lock)
 __acquires(kernel_lock)
 {
        struct tracer *t;
-       int len;
        int ret = 0;
 
        if (!type->name) {
@@ -627,6 +625,11 @@ __acquires(kernel_lock)
                return -1;
        }
 
+       if (strlen(type->name) > MAX_TRACER_SIZE) {
+               pr_info("Tracer has a name longer than %d\n", MAX_TRACER_SIZE);
+               return -1;
+       }
+
        /*
         * When this gets called we hold the BKL which means that
         * preemption is disabled. Various trace selftests however
@@ -641,7 +644,7 @@ __acquires(kernel_lock)
        for (t = trace_types; t; t = t->next) {
                if (strcmp(type->name, t->name) == 0) {
                        /* already found */
-                       pr_info("Trace %s already registered\n",
+                       pr_info("Tracer %s already registered\n",
                                type->name);
                        ret = -1;
                        goto out;
@@ -692,9 +695,6 @@ __acquires(kernel_lock)
 
        type->next = trace_types;
        trace_types = type;
-       len = strlen(type->name);
-       if (len > max_tracer_type_len)
-               max_tracer_type_len = len;
 
  out:
        tracing_selftest_running = false;
@@ -703,7 +703,7 @@ __acquires(kernel_lock)
        if (ret || !default_bootup_tracer)
                goto out_unlock;
 
-       if (strncmp(default_bootup_tracer, type->name, BOOTUP_TRACER_SIZE))
+       if (strncmp(default_bootup_tracer, type->name, MAX_TRACER_SIZE))
                goto out_unlock;
 
        printk(KERN_INFO "Starting tracer '%s'\n", type->name);
@@ -725,14 +725,13 @@ __acquires(kernel_lock)
 void unregister_tracer(struct tracer *type)
 {
        struct tracer **t;
-       int len;
 
        mutex_lock(&trace_types_lock);
        for (t = &trace_types; *t; t = &(*t)->next) {
                if (*t == type)
                        goto found;
        }
-       pr_info("Trace %s not registered\n", type->name);
+       pr_info("Tracer %s not registered\n", type->name);
        goto out;
 
  found:
@@ -745,17 +744,7 @@ void unregister_tracer(struct tracer *type)
                        current_trace->stop(&global_trace);
                current_trace = &nop_trace;
        }
-
-       if (strlen(type->name) != max_tracer_type_len)
-               goto out;
-
-       max_tracer_type_len = 0;
-       for (t = &trace_types; *t; t = &(*t)->next) {
-               len = strlen((*t)->name);
-               if (len > max_tracer_type_len)
-                       max_tracer_type_len = len;
-       }
- out:
+out:
        mutex_unlock(&trace_types_lock);
 }
 
@@ -1960,7 +1949,7 @@ static int s_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations tracer_seq_ops = {
+static const struct seq_operations tracer_seq_ops = {
        .start          = s_start,
        .next           = s_next,
        .stop           = s_stop,
@@ -2174,7 +2163,7 @@ static int t_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations show_traces_seq_ops = {
+static const struct seq_operations show_traces_seq_ops = {
        .start          = t_start,
        .next           = t_next,
        .stop           = t_stop,
@@ -2604,7 +2593,7 @@ static ssize_t
 tracing_set_trace_read(struct file *filp, char __user *ubuf,
                       size_t cnt, loff_t *ppos)
 {
-       char buf[max_tracer_type_len+2];
+       char buf[MAX_TRACER_SIZE+2];
        int r;
 
        mutex_lock(&trace_types_lock);
@@ -2754,15 +2743,15 @@ static ssize_t
 tracing_set_trace_write(struct file *filp, const char __user *ubuf,
                        size_t cnt, loff_t *ppos)
 {
-       char buf[max_tracer_type_len+1];
+       char buf[MAX_TRACER_SIZE+1];
        int i;
        size_t ret;
        int err;
 
        ret = cnt;
 
-       if (cnt > max_tracer_type_len)
-               cnt = max_tracer_type_len;
+       if (cnt > MAX_TRACER_SIZE)
+               cnt = MAX_TRACER_SIZE;
 
        if (copy_from_user(&buf, ubuf, cnt))
                return -EFAULT;
index 86bcff9..405cb85 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/ftrace.h>
 #include <trace/boot.h>
 #include <linux/kmemtrace.h>
-#include <trace/power.h>
 
 #include <linux/trace_seq.h>
 #include <linux/ftrace_event.h>
@@ -37,7 +36,6 @@ enum trace_type {
        TRACE_HW_BRANCHES,
        TRACE_KMEM_ALLOC,
        TRACE_KMEM_FREE,
-       TRACE_POWER,
        TRACE_BLK,
 
        __TRACE_LAST_TYPE,
@@ -207,7 +205,6 @@ extern void __ftrace_bad_type(void);
                IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,      \
                          TRACE_GRAPH_RET);             \
                IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
-               IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
                IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry,       \
                          TRACE_KMEM_ALLOC);    \
                IF_ASSIGN(var, ent, struct kmemtrace_free_entry,        \
index a431748..ead3d72 100644 (file)
@@ -330,23 +330,6 @@ FTRACE_ENTRY(hw_branch, hw_branch_entry,
        F_printk("from: %llx to: %llx", __entry->from, __entry->to)
 );
 
-FTRACE_ENTRY(power, trace_power,
-
-       TRACE_POWER,
-
-       F_STRUCT(
-               __field_struct( struct power_trace,     state_data      )
-               __field_desc(   s64,    state_data,     stamp           )
-               __field_desc(   s64,    state_data,     end             )
-               __field_desc(   int,    state_data,     type            )
-               __field_desc(   int,    state_data,     state           )
-       ),
-
-       F_printk("%llx->%llx type:%u state:%u",
-                __entry->stamp, __entry->end,
-                __entry->type, __entry->state)
-);
-
 FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
 
        TRACE_KMEM_ALLOC,
index 55a25c9..dd44b87 100644 (file)
@@ -8,6 +8,57 @@
 #include <linux/module.h>
 #include "trace.h"
 
+/*
+ * We can't use a size but a type in alloc_percpu()
+ * So let's create a dummy type that matches the desired size
+ */
+typedef struct {char buf[FTRACE_MAX_PROFILE_SIZE];} profile_buf_t;
+
+char           *trace_profile_buf;
+EXPORT_SYMBOL_GPL(trace_profile_buf);
+
+char           *trace_profile_buf_nmi;
+EXPORT_SYMBOL_GPL(trace_profile_buf_nmi);
+
+/* Count the events in use (per event id, not per instance) */
+static int     total_profile_count;
+
+static int ftrace_profile_enable_event(struct ftrace_event_call *event)
+{
+       char *buf;
+       int ret = -ENOMEM;
+
+       if (atomic_inc_return(&event->profile_count))
+               return 0;
+
+       if (!total_profile_count++) {
+               buf = (char *)alloc_percpu(profile_buf_t);
+               if (!buf)
+                       goto fail_buf;
+
+               rcu_assign_pointer(trace_profile_buf, buf);
+
+               buf = (char *)alloc_percpu(profile_buf_t);
+               if (!buf)
+                       goto fail_buf_nmi;
+
+               rcu_assign_pointer(trace_profile_buf_nmi, buf);
+       }
+
+       ret = event->profile_enable();
+       if (!ret)
+               return 0;
+
+       kfree(trace_profile_buf_nmi);
+fail_buf_nmi:
+       kfree(trace_profile_buf);
+fail_buf:
+       total_profile_count--;
+       atomic_dec(&event->profile_count);
+
+       return ret;
+}
+
 int ftrace_profile_enable(int event_id)
 {
        struct ftrace_event_call *event;
@@ -17,7 +68,7 @@ int ftrace_profile_enable(int event_id)
        list_for_each_entry(event, &ftrace_events, list) {
                if (event->id == event_id && event->profile_enable &&
                    try_module_get(event->mod)) {
-                       ret = event->profile_enable(event);
+                       ret = ftrace_profile_enable_event(event);
                        break;
                }
        }
@@ -26,6 +77,33 @@ int ftrace_profile_enable(int event_id)
        return ret;
 }
 
+static void ftrace_profile_disable_event(struct ftrace_event_call *event)
+{
+       char *buf, *nmi_buf;
+
+       if (!atomic_add_negative(-1, &event->profile_count))
+               return;
+
+       event->profile_disable();
+
+       if (!--total_profile_count) {
+               buf = trace_profile_buf;
+               rcu_assign_pointer(trace_profile_buf, NULL);
+
+               nmi_buf = trace_profile_buf_nmi;
+               rcu_assign_pointer(trace_profile_buf_nmi, NULL);
+
+               /*
+                * Ensure every events in profiling have finished before
+                * releasing the buffers
+                */
+               synchronize_sched();
+
+               free_percpu(buf);
+               free_percpu(nmi_buf);
+       }
+}
+
 void ftrace_profile_disable(int event_id)
 {
        struct ftrace_event_call *event;
@@ -33,7 +111,7 @@ void ftrace_profile_disable(int event_id)
        mutex_lock(&event_mutex);
        list_for_each_entry(event, &ftrace_events, list) {
                if (event->id == event_id) {
-                       event->profile_disable(event);
+                       ftrace_profile_disable_event(event);
                        module_put(event->mod);
                        break;
                }
index 56c260b..6f03c8a 100644 (file)
@@ -271,42 +271,32 @@ ftrace_event_write(struct file *file, const char __user *ubuf,
 static void *
 t_next(struct seq_file *m, void *v, loff_t *pos)
 {
-       struct list_head *list = m->private;
-       struct ftrace_event_call *call;
+       struct ftrace_event_call *call = v;
 
        (*pos)++;
 
-       for (;;) {
-               if (list == &ftrace_events)
-                       return NULL;
-
-               call = list_entry(list, struct ftrace_event_call, list);
-
+       list_for_each_entry_continue(call, &ftrace_events, list) {
                /*
                 * The ftrace subsystem is for showing formats only.
                 * They can not be enabled or disabled via the event files.
                 */
                if (call->regfunc)
-                       break;
-
-               list = list->next;
+                       return call;
        }
 
-       m->private = list->next;
-
-       return call;
+       return NULL;
 }
 
 static void *t_start(struct seq_file *m, loff_t *pos)
 {
-       struct ftrace_event_call *call = NULL;
+       struct ftrace_event_call *call;
        loff_t l;
 
        mutex_lock(&event_mutex);
 
-       m->private = ftrace_events.next;
+       call = list_entry(&ftrace_events, struct ftrace_event_call, list);
        for (l = 0; l <= *pos; ) {
-               call = t_next(m, NULL, &l);
+               call = t_next(m, call, &l);
                if (!call)
                        break;
        }
@@ -316,37 +306,28 @@ static void *t_start(struct seq_file *m, loff_t *pos)
 static void *
 s_next(struct seq_file *m, void *v, loff_t *pos)
 {
-       struct list_head *list = m->private;
-       struct ftrace_event_call *call;
+       struct ftrace_event_call *call = v;
 
        (*pos)++;
 
- retry:
-       if (list == &ftrace_events)
-               return NULL;
-
-       call = list_entry(list, struct ftrace_event_call, list);
-
-       if (!call->enabled) {
-               list = list->next;
-               goto retry;
+       list_for_each_entry_continue(call, &ftrace_events, list) {
+               if (call->enabled)
+                       return call;
        }
 
-       m->private = list->next;
-
-       return call;
+       return NULL;
 }
 
 static void *s_start(struct seq_file *m, loff_t *pos)
 {
-       struct ftrace_event_call *call = NULL;
+       struct ftrace_event_call *call;
        loff_t l;
 
        mutex_lock(&event_mutex);
 
-       m->private = ftrace_events.next;
+       call = list_entry(&ftrace_events, struct ftrace_event_call, list);
        for (l = 0; l <= *pos; ) {
-               call = s_next(m, NULL, &l);
+               call = s_next(m, call, &l);
                if (!call)
                        break;
        }
index ca7d7c4..23b6385 100644 (file)
@@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter)
                    seq_print_ip_sym(seq, it->from, symflags) &&
                    trace_seq_printf(seq, "\n"))
                        return TRACE_TYPE_HANDLED;
-               return TRACE_TYPE_PARTIAL_LINE;;
+               return TRACE_TYPE_PARTIAL_LINE;
        }
        return TRACE_TYPE_UNHANDLED;
 }
diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c
deleted file mode 100644 (file)
index fe1a00f..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * ring buffer based C-state tracer
- *
- * Arjan van de Ven <arjan@linux.intel.com>
- * Copyright (C) 2008 Intel Corporation
- *
- * Much is borrowed from trace_boot.c which is
- * Copyright (C) 2008 Frederic Weisbecker <fweisbec@gmail.com>
- *
- */
-
-#include <linux/init.h>
-#include <linux/debugfs.h>
-#include <trace/power.h>
-#include <linux/kallsyms.h>
-#include <linux/module.h>
-
-#include "trace.h"
-#include "trace_output.h"
-
-static struct trace_array *power_trace;
-static int __read_mostly trace_power_enabled;
-
-static void probe_power_start(struct power_trace *it, unsigned int type,
-                               unsigned int level)
-{
-       if (!trace_power_enabled)
-               return;
-
-       memset(it, 0, sizeof(struct power_trace));
-       it->state = level;
-       it->type = type;
-       it->stamp = ktime_get();
-}
-
-
-static void probe_power_end(struct power_trace *it)
-{
-       struct ftrace_event_call *call = &event_power;
-       struct ring_buffer_event *event;
-       struct ring_buffer *buffer;
-       struct trace_power *entry;
-       struct trace_array_cpu *data;
-       struct trace_array *tr = power_trace;
-
-       if (!trace_power_enabled)
-               return;
-
-       buffer = tr->buffer;
-
-       preempt_disable();
-       it->end = ktime_get();
-       data = tr->data[smp_processor_id()];
-
-       event = trace_buffer_lock_reserve(buffer, TRACE_POWER,
-                                         sizeof(*entry), 0, 0);
-       if (!event)
-               goto out;
-       entry   = ring_buffer_event_data(event);
-       entry->state_data = *it;
-       if (!filter_check_discard(call, entry, buffer, event))
-               trace_buffer_unlock_commit(buffer, event, 0, 0);
- out:
-       preempt_enable();
-}
-
-static void probe_power_mark(struct power_trace *it, unsigned int type,
-                               unsigned int level)
-{
-       struct ftrace_event_call *call = &event_power;
-       struct ring_buffer_event *event;
-       struct ring_buffer *buffer;
-       struct trace_power *entry;
-       struct trace_array_cpu *data;
-       struct trace_array *tr = power_trace;
-
-       if (!trace_power_enabled)
-               return;
-
-       buffer = tr->buffer;
-
-       memset(it, 0, sizeof(struct power_trace));
-       it->state = level;
-       it->type = type;
-       it->stamp = ktime_get();
-       preempt_disable();
-       it->end = it->stamp;
-       data = tr->data[smp_processor_id()];
-
-       event = trace_buffer_lock_reserve(buffer, TRACE_POWER,
-                                         sizeof(*entry), 0, 0);
-       if (!event)
-               goto out;
-       entry   = ring_buffer_event_data(event);
-       entry->state_data = *it;
-       if (!filter_check_discard(call, entry, buffer, event))
-               trace_buffer_unlock_commit(buffer, event, 0, 0);
- out:
-       preempt_enable();
-}
-
-static int tracing_power_register(void)
-{
-       int ret;
-
-       ret = register_trace_power_start(probe_power_start);
-       if (ret) {
-               pr_info("power trace: Couldn't activate tracepoint"
-                       " probe to trace_power_start\n");
-               return ret;
-       }
-       ret = register_trace_power_end(probe_power_end);
-       if (ret) {
-               pr_info("power trace: Couldn't activate tracepoint"
-                       " probe to trace_power_end\n");
-               goto fail_start;
-       }
-       ret = register_trace_power_mark(probe_power_mark);
-       if (ret) {
-               pr_info("power trace: Couldn't activate tracepoint"
-                       " probe to trace_power_mark\n");
-               goto fail_end;
-       }
-       return ret;
-fail_end:
-       unregister_trace_power_end(probe_power_end);
-fail_start:
-       unregister_trace_power_start(probe_power_start);
-       return ret;
-}
-
-static void start_power_trace(struct trace_array *tr)
-{
-       trace_power_enabled = 1;
-}
-
-static void stop_power_trace(struct trace_array *tr)
-{
-       trace_power_enabled = 0;
-}
-
-static void power_trace_reset(struct trace_array *tr)
-{
-       trace_power_enabled = 0;
-       unregister_trace_power_start(probe_power_start);
-       unregister_trace_power_end(probe_power_end);
-       unregister_trace_power_mark(probe_power_mark);
-}
-
-
-static int power_trace_init(struct trace_array *tr)
-{
-       power_trace = tr;
-
-       trace_power_enabled = 1;
-       tracing_power_register();
-
-       tracing_reset_online_cpus(tr);
-       return 0;
-}
-
-static enum print_line_t power_print_line(struct trace_iterator *iter)
-{
-       int ret = 0;
-       struct trace_entry *entry = iter->ent;
-       struct trace_power *field ;
-       struct power_trace *it;
-       struct trace_seq *s = &iter->seq;
-       struct timespec stamp;
-       struct timespec duration;
-
-       trace_assign_type(field, entry);
-       it = &field->state_data;
-       stamp = ktime_to_timespec(it->stamp);
-       duration = ktime_to_timespec(ktime_sub(it->end, it->stamp));
-
-       if (entry->type == TRACE_POWER) {
-               if (it->type == POWER_CSTATE)
-                       ret = trace_seq_printf(s, "[%5ld.%09ld] CSTATE: Going to C%i on cpu %i for %ld.%09ld\n",
-                                         stamp.tv_sec,
-                                         stamp.tv_nsec,
-                                         it->state, iter->cpu,
-                                         duration.tv_sec,
-                                         duration.tv_nsec);
-               if (it->type == POWER_PSTATE)
-                       ret = trace_seq_printf(s, "[%5ld.%09ld] PSTATE: Going to P%i on cpu %i\n",
-                                         stamp.tv_sec,
-                                         stamp.tv_nsec,
-                                         it->state, iter->cpu);
-               if (!ret)
-                       return TRACE_TYPE_PARTIAL_LINE;
-               return TRACE_TYPE_HANDLED;
-       }
-       return TRACE_TYPE_UNHANDLED;
-}
-
-static void power_print_header(struct seq_file *s)
-{
-       seq_puts(s, "#   TIMESTAMP      STATE  EVENT\n");
-       seq_puts(s, "#       |            |      |\n");
-}
-
-static struct tracer power_tracer __read_mostly =
-{
-       .name           = "power",
-       .init           = power_trace_init,
-       .start          = start_power_trace,
-       .stop           = stop_power_trace,
-       .reset          = power_trace_reset,
-       .print_line     = power_print_line,
-       .print_header   = power_print_header,
-};
-
-static int init_power_trace(void)
-{
-       return register_tracer(&power_tracer);
-}
-device_initcall(init_power_trace);
index 687699d..2547d88 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/ftrace.h>
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/marker.h>
 #include <linux/mutex.h>
 #include <linux/ctype.h>
 #include <linux/list.h>
index 8712ce3..9fbce6c 100644 (file)
@@ -2,7 +2,7 @@
 #include <trace/events/syscalls.h>
 #include <linux/kernel.h>
 #include <linux/ftrace.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <asm/syscall.h>
 
 #include "trace_output.h"
@@ -384,10 +384,13 @@ static int sys_prof_refcount_exit;
 
 static void prof_syscall_enter(struct pt_regs *regs, long id)
 {
-       struct syscall_trace_enter *rec;
        struct syscall_metadata *sys_data;
+       struct syscall_trace_enter *rec;
+       unsigned long flags;
+       char *raw_data;
        int syscall_nr;
        int size;
+       int cpu;
 
        syscall_nr = syscall_get_nr(current, regs);
        if (!test_bit(syscall_nr, enabled_prof_enter_syscalls))
@@ -402,20 +405,38 @@ static void prof_syscall_enter(struct pt_regs *regs, long id)
        size = ALIGN(size + sizeof(u32), sizeof(u64));
        size -= sizeof(u32);
 
-       do {
-               char raw_data[size];
+       if (WARN_ONCE(size > FTRACE_MAX_PROFILE_SIZE,
+                     "profile buffer not large enough"))
+               return;
+
+       /* Protect the per cpu buffer, begin the rcu read side */
+       local_irq_save(flags);
 
-               /* zero the dead bytes from align to not leak stack to user */
-               *(u64 *)(&raw_data[size - sizeof(u64)]) = 0ULL;
+       cpu = smp_processor_id();
+
+       if (in_nmi())
+               raw_data = rcu_dereference(trace_profile_buf_nmi);
+       else
+               raw_data = rcu_dereference(trace_profile_buf);
+
+       if (!raw_data)
+               goto end;
 
-               rec = (struct syscall_trace_enter *) raw_data;
-               tracing_generic_entry_update(&rec->ent, 0, 0);
-               rec->ent.type = sys_data->enter_id;
-               rec->nr = syscall_nr;
-               syscall_get_arguments(current, regs, 0, sys_data->nb_args,
-                                      (unsigned long *)&rec->args);
-               perf_tpcounter_event(sys_data->enter_id, 0, 1, rec, size);
-       } while(0);
+       raw_data = per_cpu_ptr(raw_data, cpu);
+
+       /* zero the dead bytes from align to not leak stack to user */
+       *(u64 *)(&raw_data[size - sizeof(u64)]) = 0ULL;
+
+       rec = (struct syscall_trace_enter *) raw_data;
+       tracing_generic_entry_update(&rec->ent, 0, 0);
+       rec->ent.type = sys_data->enter_id;
+       rec->nr = syscall_nr;
+       syscall_get_arguments(current, regs, 0, sys_data->nb_args,
+                              (unsigned long *)&rec->args);
+       perf_tp_event(sys_data->enter_id, 0, 1, rec, size);
+
+end:
+       local_irq_restore(flags);
 }
 
 int reg_prof_syscall_enter(char *name)
@@ -460,8 +481,12 @@ void unreg_prof_syscall_enter(char *name)
 static void prof_syscall_exit(struct pt_regs *regs, long ret)
 {
        struct syscall_metadata *sys_data;
-       struct syscall_trace_exit rec;
+       struct syscall_trace_exit *rec;
+       unsigned long flags;
        int syscall_nr;
+       char *raw_data;
+       int size;
+       int cpu;
 
        syscall_nr = syscall_get_nr(current, regs);
        if (!test_bit(syscall_nr, enabled_prof_exit_syscalls))
@@ -471,12 +496,46 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret)
        if (!sys_data)
                return;
 
-       tracing_generic_entry_update(&rec.ent, 0, 0);
-       rec.ent.type = sys_data->exit_id;
-       rec.nr = syscall_nr;
-       rec.ret = syscall_get_return_value(current, regs);
+       /* We can probably do that at build time */
+       size = ALIGN(sizeof(*rec) + sizeof(u32), sizeof(u64));
+       size -= sizeof(u32);
 
-       perf_tpcounter_event(sys_data->exit_id, 0, 1, &rec, sizeof(rec));
+       /*
+        * Impossible, but be paranoid with the future
+        * How to put this check outside runtime?
+        */
+       if (WARN_ONCE(size > FTRACE_MAX_PROFILE_SIZE,
+               "exit event has grown above profile buffer size"))
+               return;
+
+       /* Protect the per cpu buffer, begin the rcu read side */
+       local_irq_save(flags);
+       cpu = smp_processor_id();
+
+       if (in_nmi())
+               raw_data = rcu_dereference(trace_profile_buf_nmi);
+       else
+               raw_data = rcu_dereference(trace_profile_buf);
+
+       if (!raw_data)
+               goto end;
+
+       raw_data = per_cpu_ptr(raw_data, cpu);
+
+       /* zero the dead bytes from align to not leak stack to user */
+       *(u64 *)(&raw_data[size - sizeof(u64)]) = 0ULL;
+
+       rec = (struct syscall_trace_exit *)raw_data;
+
+       tracing_generic_entry_update(&rec->ent, 0, 0);
+       rec->ent.type = sys_data->exit_id;
+       rec->nr = syscall_nr;
+       rec->ret = syscall_get_return_value(current, regs);
+
+       perf_tp_event(sys_data->exit_id, 0, 1, rec, size);
+
+end:
+       local_irq_restore(flags);
 }
 
 int reg_prof_syscall_exit(char *name)
index 9489a0a..cc89be5 100644 (file)
@@ -48,7 +48,7 @@ static struct hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE];
 
 /*
  * Note about RCU :
- * It is used to to delay the free of multiple probes array until a quiescent
+ * It is used to delay the free of multiple probes array until a quiescent
  * state is reached.
  * Tracepoint entries modifications are protected by the tracepoints_mutex.
  */
index 603c81b..846e039 100644 (file)
@@ -1,6 +1,8 @@
 config HAVE_ARCH_KMEMCHECK
        bool
 
+if HAVE_ARCH_KMEMCHECK
+
 menuconfig KMEMCHECK
        bool "kmemcheck: trap use of uninitialized memory"
        depends on DEBUG_KERNEL
@@ -89,3 +91,4 @@ config KMEMCHECK_BITOPS_OK
          accesses where not all the bits are initialized at the same time.
          This may also hide some real bugs.
 
+endif
index 7baed2f..66eef2e 100644 (file)
@@ -28,23 +28,6 @@ struct flex_array_part {
        char elements[FLEX_ARRAY_PART_SIZE];
 };
 
-static inline int __elements_per_part(int element_size)
-{
-       return FLEX_ARRAY_PART_SIZE / element_size;
-}
-
-static inline int bytes_left_in_base(void)
-{
-       int element_offset = offsetof(struct flex_array, parts);
-       int bytes_left = FLEX_ARRAY_BASE_SIZE - element_offset;
-       return bytes_left;
-}
-
-static inline int nr_base_part_ptrs(void)
-{
-       return bytes_left_in_base() / sizeof(struct flex_array_part *);
-}
-
 /*
  * If a user requests an allocation which is small
  * enough, we may simply use the space in the
@@ -54,7 +37,7 @@ static inline int nr_base_part_ptrs(void)
 static inline int elements_fit_in_base(struct flex_array *fa)
 {
        int data_size = fa->element_size * fa->total_nr_elements;
-       if (data_size <= bytes_left_in_base())
+       if (data_size <= FLEX_ARRAY_BASE_BYTES_LEFT)
                return 1;
        return 0;
 }
@@ -63,6 +46,7 @@ static inline int elements_fit_in_base(struct flex_array *fa)
  * flex_array_alloc - allocate a new flexible array
  * @element_size:      the size of individual elements in the array
  * @total:             total number of elements that this should hold
+ * @flags:             page allocation flags to use for base array
  *
  * Note: all locking must be provided by the caller.
  *
@@ -103,7 +87,8 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total,
                                        gfp_t flags)
 {
        struct flex_array *ret;
-       int max_size = nr_base_part_ptrs() * __elements_per_part(element_size);
+       int max_size = FLEX_ARRAY_NR_BASE_PTRS *
+                               FLEX_ARRAY_ELEMENTS_PER_PART(element_size);
 
        /* max_size will end up 0 if element_size > PAGE_SIZE */
        if (total > max_size)
@@ -113,17 +98,21 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total,
                return NULL;
        ret->element_size = element_size;
        ret->total_nr_elements = total;
+       if (elements_fit_in_base(ret) && !(flags & __GFP_ZERO))
+               memset(ret->parts[0], FLEX_ARRAY_FREE,
+                                               FLEX_ARRAY_BASE_BYTES_LEFT);
        return ret;
 }
 
 static int fa_element_to_part_nr(struct flex_array *fa,
                                        unsigned int element_nr)
 {
-       return element_nr / __elements_per_part(fa->element_size);
+       return element_nr / FLEX_ARRAY_ELEMENTS_PER_PART(fa->element_size);
 }
 
 /**
  * flex_array_free_parts - just free the second-level pages
+ * @fa:                the flex array from which to free parts
  *
  * This is to be used in cases where the base 'struct flex_array'
  * has been statically allocated and should not be free.
@@ -131,11 +120,10 @@ static int fa_element_to_part_nr(struct flex_array *fa,
 void flex_array_free_parts(struct flex_array *fa)
 {
        int part_nr;
-       int max_part = nr_base_part_ptrs();
 
        if (elements_fit_in_base(fa))
                return;
-       for (part_nr = 0; part_nr < max_part; part_nr++)
+       for (part_nr = 0; part_nr < FLEX_ARRAY_NR_BASE_PTRS; part_nr++)
                kfree(fa->parts[part_nr]);
 }
 
@@ -150,7 +138,8 @@ static unsigned int index_inside_part(struct flex_array *fa,
 {
        unsigned int part_offset;
 
-       part_offset = element_nr % __elements_per_part(fa->element_size);
+       part_offset = element_nr %
+                               FLEX_ARRAY_ELEMENTS_PER_PART(fa->element_size);
        return part_offset * fa->element_size;
 }
 
@@ -159,15 +148,12 @@ __fa_get_part(struct flex_array *fa, int part_nr, gfp_t flags)
 {
        struct flex_array_part *part = fa->parts[part_nr];
        if (!part) {
-               /*
-                * This leaves the part pages uninitialized
-                * and with potentially random data, just
-                * as if the user had kmalloc()'d the whole.
-                * __GFP_ZERO can be used to zero it.
-                */
-               part = kmalloc(FLEX_ARRAY_PART_SIZE, flags);
+               part = kmalloc(sizeof(struct flex_array_part), flags);
                if (!part)
                        return NULL;
+               if (!(flags & __GFP_ZERO))
+                       memset(part, FLEX_ARRAY_FREE,
+                               sizeof(struct flex_array_part));
                fa->parts[part_nr] = part;
        }
        return part;
@@ -175,9 +161,12 @@ __fa_get_part(struct flex_array *fa, int part_nr, gfp_t flags)
 
 /**
  * flex_array_put - copy data into the array at @element_nr
- * @src:       address of data to copy into the array
+ * @fa:                the flex array to copy data into
  * @element_nr:        index of the position in which to insert
  *             the new element.
+ * @src:       address of data to copy into the array
+ * @flags:     page allocation flags to use for array expansion
+ *
  *
  * Note that this *copies* the contents of @src into
  * the array.  If you are trying to store an array of
@@ -206,10 +195,39 @@ int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
        return 0;
 }
 
+/**
+ * flex_array_clear - clear element in array at @element_nr
+ * @fa:                the flex array of the element.
+ * @element_nr:        index of the position to clear.
+ *
+ * Locking must be provided by the caller.
+ */
+int flex_array_clear(struct flex_array *fa, unsigned int element_nr)
+{
+       int part_nr = fa_element_to_part_nr(fa, element_nr);
+       struct flex_array_part *part;
+       void *dst;
+
+       if (element_nr >= fa->total_nr_elements)
+               return -ENOSPC;
+       if (elements_fit_in_base(fa))
+               part = (struct flex_array_part *)&fa->parts[0];
+       else {
+               part = fa->parts[part_nr];
+               if (!part)
+                       return -EINVAL;
+       }
+       dst = &part->elements[index_inside_part(fa, element_nr)];
+       memset(dst, FLEX_ARRAY_FREE, fa->element_size);
+       return 0;
+}
+
 /**
  * flex_array_prealloc - guarantee that array space exists
+ * @fa:                the flex array for which to preallocate parts
  * @start:     index of first array element for which space is allocated
  * @end:       index of last (inclusive) element for which space is allocated
+ * @flags:     page allocation flags
  *
  * This will guarantee that no future calls to flex_array_put()
  * will allocate memory.  It can be used if you are expecting to
@@ -242,6 +260,7 @@ int flex_array_prealloc(struct flex_array *fa, unsigned int start,
 
 /**
  * flex_array_get - pull data back out of the array
+ * @fa:                the flex array from which to extract data
  * @element_nr:        index of the element to fetch from the array
  *
  * Returns a pointer to the data at index @element_nr.  Note
@@ -266,3 +285,43 @@ void *flex_array_get(struct flex_array *fa, unsigned int element_nr)
        }
        return &part->elements[index_inside_part(fa, element_nr)];
 }
+
+static int part_is_free(struct flex_array_part *part)
+{
+       int i;
+
+       for (i = 0; i < sizeof(struct flex_array_part); i++)
+               if (part->elements[i] != FLEX_ARRAY_FREE)
+                       return 0;
+       return 1;
+}
+
+/**
+ * flex_array_shrink - free unused second-level pages
+ * @fa:                the flex array to shrink
+ *
+ * Frees all second-level pages that consist solely of unused
+ * elements.  Returns the number of pages freed.
+ *
+ * Locking must be provided by the caller.
+ */
+int flex_array_shrink(struct flex_array *fa)
+{
+       struct flex_array_part *part;
+       int part_nr;
+       int ret = 0;
+
+       if (elements_fit_in_base(fa))
+               return ret;
+       for (part_nr = 0; part_nr < FLEX_ARRAY_NR_BASE_PTRS; part_nr++) {
+               part = fa->parts[part_nr];
+               if (!part)
+                       continue;
+               if (part_is_free(part)) {
+                       fa->parts[part_nr] = NULL;
+                       kfree(part);
+                       ret++;
+               }
+       }
+       return ret;
+}
index d320c18..73a14b8 100644 (file)
@@ -1092,13 +1092,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
 
        /* Reject out-of-range values early.  Large positive sizes are
           used for unknown buffer sizes. */
-       if (unlikely((int) size < 0)) {
-               /* There can be only one.. */
-               static char warn = 1;
-               WARN_ON(warn);
-               warn = 0;
+       if (WARN_ON_ONCE((int) size < 0))
                return 0;
-       }
 
        str = buf;
        end = buf + size;
@@ -1544,13 +1539,8 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
 
        struct printf_spec spec = {0};
 
-       if (unlikely((int) size < 0)) {
-               /* There can be only one.. */
-               static char warn = 1;
-               WARN_ON(warn);
-               warn = 0;
+       if (WARN_ON_ONCE((int) size < 0))
                return 0;
-       }
 
        str = buf;
        end = buf + size;
index c3e4a2b..46a31e5 100644 (file)
@@ -135,7 +135,7 @@ static const config configuration_table[10] = {
 
 /* ===========================================================================
  * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive
  *    input characters, so that a running hash key can be computed from the
  *    previous key instead of complete recalculation each time.
  */
@@ -146,7 +146,7 @@ static const config configuration_table[10] = {
  * Insert string str in the dictionary and set match_head to the previous head
  * of the hash chain (the most recent string with same hash key). Return
  * the previous length of the hash chain.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive
  *    input characters and the first MIN_MATCH bytes of str are valid
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
index 3aa519f..71eb0b4 100644 (file)
@@ -214,6 +214,18 @@ config HAVE_MLOCKED_PAGE_BIT
 config MMU_NOTIFIER
        bool
 
+config KSM
+       bool "Enable KSM for page merging"
+       depends on MMU
+       help
+         Enable Kernel Samepage Merging: KSM periodically scans those areas
+         of an application's address space that an app has advised may be
+         mergeable.  When it finds pages of identical content, it replaces
+         the many instances by a single resident page with that content, so
+         saving memory until one or another app needs to modify the content.
+         Recommended for use with KVM, or with other duplicative applications.
+         See Documentation/vm/ksm.txt for more information.
+
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
         default 4096
index aa99fd1..af7cfb4 100644 (file)
@@ -6,7 +6,7 @@ config DEBUG_PAGEALLOC
        ---help---
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types
-         of memory corruptions.
+         of memory corruption.
 
 config WANT_PAGE_DEBUG_FLAGS
        bool
@@ -17,11 +17,11 @@ config PAGE_POISONING
        depends on !HIBERNATION
        select DEBUG_PAGEALLOC
        select WANT_PAGE_DEBUG_FLAGS
-       help
+       ---help---
           Fill the pages with poison patterns after free_pages() and verify
           the patterns before alloc_pages(). This results in a large slowdown,
-          but helps to find certain types of memory corruptions.
+          but helps to find certain types of memory corruption.
 
-          This option cannot enalbe with hibernation. Otherwise, it will get
-          wrong messages for memory corruption because the free pages are not
-          saved to the suspend image.
+          This option cannot be enabled in combination with hibernation as
+          that would result in incorrect warnings of memory corruption after
+          a resume because free pages are not saved to the suspend image.
index ea4b18b..88193d7 100644 (file)
@@ -11,10 +11,10 @@ obj-y                       := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
                           maccess.o page_alloc.o page-writeback.o \
                           readahead.o swap.o truncate.o vmscan.o shmem.o \
                           prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
-                          page_isolation.o mm_init.o $(mmu-y)
+                          page_isolation.o mm_init.o mmu_context.o \
+                          pagewalk.o $(mmu-y)
 obj-y += init-mm.o
 
-obj-$(CONFIG_PROC_PAGE_MONITOR) += pagewalk.o
 obj-$(CONFIG_BOUNCE)   += bounce.o
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o thrash.o
 obj-$(CONFIG_HAS_DMA)  += dmapool.o
@@ -25,6 +25,7 @@ obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o
 obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o
 obj-$(CONFIG_SLOB) += slob.o
 obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
+obj-$(CONFIG_KSM) += ksm.o
 obj-$(CONFIG_PAGE_POISONING) += debug-pagealloc.o
 obj-$(CONFIG_SLAB) += slab.o
 obj-$(CONFIG_SLUB) += slub.o
index dd51c68..bcc7372 100644 (file)
@@ -119,6 +119,8 @@ void __remove_from_page_cache(struct page *page)
        page->mapping = NULL;
        mapping->nrpages--;
        __dec_zone_page_state(page, NR_FILE_PAGES);
+       if (PageSwapBacked(page))
+               __dec_zone_page_state(page, NR_SHMEM);
        BUG_ON(page_mapped(page));
 
        /*
@@ -431,6 +433,8 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping,
                if (likely(!error)) {
                        mapping->nrpages++;
                        __inc_zone_page_state(page, NR_FILE_PAGES);
+                       if (PageSwapBacked(page))
+                               __inc_zone_page_state(page, NR_SHMEM);
                        spin_unlock_irq(&mapping->tree_lock);
                } else {
                        page->mapping = NULL;
index b16d636..815dbd4 100644 (file)
@@ -456,24 +456,6 @@ static void enqueue_huge_page(struct hstate *h, struct page *page)
        h->free_huge_pages_node[nid]++;
 }
 
-static struct page *dequeue_huge_page(struct hstate *h)
-{
-       int nid;
-       struct page *page = NULL;
-
-       for (nid = 0; nid < MAX_NUMNODES; ++nid) {
-               if (!list_empty(&h->hugepage_freelists[nid])) {
-                       page = list_entry(h->hugepage_freelists[nid].next,
-                                         struct page, lru);
-                       list_del(&page->lru);
-                       h->free_huge_pages--;
-                       h->free_huge_pages_node[nid]--;
-                       break;
-               }
-       }
-       return page;
-}
-
 static struct page *dequeue_huge_page_vma(struct hstate *h,
                                struct vm_area_struct *vma,
                                unsigned long address, int avoid_reserve)
@@ -641,7 +623,7 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
 
 /*
  * Use a helper variable to find the next node and then
- * copy it back to hugetlb_next_nid afterwards:
+ * copy it back to next_nid_to_alloc afterwards:
  * otherwise there's a window in which a racer might
  * pass invalid nid MAX_NUMNODES to alloc_pages_exact_node.
  * But we don't need to use a spin_lock here: it really
@@ -650,13 +632,13 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
  * if we just successfully allocated a hugepage so that
  * the next caller gets hugepages on the next node.
  */
-static int hstate_next_node(struct hstate *h)
+static int hstate_next_node_to_alloc(struct hstate *h)
 {
        int next_nid;
-       next_nid = next_node(h->hugetlb_next_nid, node_online_map);
+       next_nid = next_node(h->next_nid_to_alloc, node_online_map);
        if (next_nid == MAX_NUMNODES)
                next_nid = first_node(node_online_map);
-       h->hugetlb_next_nid = next_nid;
+       h->next_nid_to_alloc = next_nid;
        return next_nid;
 }
 
@@ -667,14 +649,15 @@ static int alloc_fresh_huge_page(struct hstate *h)
        int next_nid;
        int ret = 0;
 
-       start_nid = h->hugetlb_next_nid;
+       start_nid = h->next_nid_to_alloc;
+       next_nid = start_nid;
 
        do {
-               page = alloc_fresh_huge_page_node(h, h->hugetlb_next_nid);
+               page = alloc_fresh_huge_page_node(h, next_nid);
                if (page)
                        ret = 1;
-               next_nid = hstate_next_node(h);
-       } while (!page && h->hugetlb_next_nid != start_nid);
+               next_nid = hstate_next_node_to_alloc(h);
+       } while (!page && next_nid != start_nid);
 
        if (ret)
                count_vm_event(HTLB_BUDDY_PGALLOC);
@@ -684,6 +667,61 @@ static int alloc_fresh_huge_page(struct hstate *h)
        return ret;
 }
 
+/*
+ * helper for free_pool_huge_page() - find next node
+ * from which to free a huge page
+ */
+static int hstate_next_node_to_free(struct hstate *h)
+{
+       int next_nid;
+       next_nid = next_node(h->next_nid_to_free, node_online_map);
+       if (next_nid == MAX_NUMNODES)
+               next_nid = first_node(node_online_map);
+       h->next_nid_to_free = next_nid;
+       return next_nid;
+}
+
+/*
+ * Free huge page from pool from next node to free.
+ * Attempt to keep persistent huge pages more or less
+ * balanced over allowed nodes.
+ * Called with hugetlb_lock locked.
+ */
+static int free_pool_huge_page(struct hstate *h, bool acct_surplus)
+{
+       int start_nid;
+       int next_nid;
+       int ret = 0;
+
+       start_nid = h->next_nid_to_free;
+       next_nid = start_nid;
+
+       do {
+               /*
+                * If we're returning unused surplus pages, only examine
+                * nodes with surplus pages.
+                */
+               if ((!acct_surplus || h->surplus_huge_pages_node[next_nid]) &&
+                   !list_empty(&h->hugepage_freelists[next_nid])) {
+                       struct page *page =
+                               list_entry(h->hugepage_freelists[next_nid].next,
+                                         struct page, lru);
+                       list_del(&page->lru);
+                       h->free_huge_pages--;
+                       h->free_huge_pages_node[next_nid]--;
+                       if (acct_surplus) {
+                               h->surplus_huge_pages--;
+                               h->surplus_huge_pages_node[next_nid]--;
+                       }
+                       update_and_free_page(h, page);
+                       ret = 1;
+               }
+               next_nid = hstate_next_node_to_free(h);
+       } while (!ret && next_nid != start_nid);
+
+       return ret;
+}
+
 static struct page *alloc_buddy_huge_page(struct hstate *h,
                        struct vm_area_struct *vma, unsigned long address)
 {
@@ -855,22 +893,13 @@ free:
  * When releasing a hugetlb pool reservation, any surplus pages that were
  * allocated to satisfy the reservation must be explicitly freed if they were
  * never used.
+ * Called with hugetlb_lock held.
  */
 static void return_unused_surplus_pages(struct hstate *h,
                                        unsigned long unused_resv_pages)
 {
-       static int nid = -1;
-       struct page *page;
        unsigned long nr_pages;
 
-       /*
-        * We want to release as many surplus pages as possible, spread
-        * evenly across all nodes. Iterate across all nodes until we
-        * can no longer free unreserved surplus pages. This occurs when
-        * the nodes with surplus pages have no free pages.
-        */
-       unsigned long remaining_iterations = nr_online_nodes;
-
        /* Uncommit the reservation */
        h->resv_huge_pages -= unused_resv_pages;
 
@@ -880,26 +909,17 @@ static void return_unused_surplus_pages(struct hstate *h,
 
        nr_pages = min(unused_resv_pages, h->surplus_huge_pages);
 
-       while (remaining_iterations-- && nr_pages) {
-               nid = next_node(nid, node_online_map);
-               if (nid == MAX_NUMNODES)
-                       nid = first_node(node_online_map);
-
-               if (!h->surplus_huge_pages_node[nid])
-                       continue;
-
-               if (!list_empty(&h->hugepage_freelists[nid])) {
-                       page = list_entry(h->hugepage_freelists[nid].next,
-                                         struct page, lru);
-                       list_del(&page->lru);
-                       update_and_free_page(h, page);
-                       h->free_huge_pages--;
-                       h->free_huge_pages_node[nid]--;
-                       h->surplus_huge_pages--;
-                       h->surplus_huge_pages_node[nid]--;
-                       nr_pages--;
-                       remaining_iterations = nr_online_nodes;
-               }
+       /*
+        * We want to release as many surplus pages as possible, spread
+        * evenly across all nodes. Iterate across all nodes until we
+        * can no longer free unreserved surplus pages. This occurs when
+        * the nodes with surplus pages have no free pages.
+        * free_pool_huge_page() will balance the the frees across the
+        * on-line nodes for us and will handle the hstate accounting.
+        */
+       while (nr_pages--) {
+               if (!free_pool_huge_page(h, 1))
+                       break;
        }
 }
 
@@ -1008,9 +1028,10 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
                void *addr;
 
                addr = __alloc_bootmem_node_nopanic(
-                               NODE_DATA(h->hugetlb_next_nid),
+                               NODE_DATA(h->next_nid_to_alloc),
                                huge_page_size(h), huge_page_size(h), 0);
 
+               hstate_next_node_to_alloc(h);
                if (addr) {
                        /*
                         * Use the beginning of the huge page to store the
@@ -1020,7 +1041,6 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
                        m = addr;
                        goto found;
                }
-               hstate_next_node(h);
                nr_nodes--;
        }
        return 0;
@@ -1141,31 +1161,43 @@ static inline void try_to_free_low(struct hstate *h, unsigned long count)
  */
 static int adjust_pool_surplus(struct hstate *h, int delta)
 {
-       static int prev_nid;
-       int nid = prev_nid;
+       int start_nid, next_nid;
        int ret = 0;
 
        VM_BUG_ON(delta != -1 && delta != 1);
-       do {
-               nid = next_node(nid, node_online_map);
-               if (nid == MAX_NUMNODES)
-                       nid = first_node(node_online_map);
 
-               /* To shrink on this node, there must be a surplus page */
-               if (delta < 0 && !h->surplus_huge_pages_node[nid])
-                       continue;
-               /* Surplus cannot exceed the total number of pages */
-               if (delta > 0 && h->surplus_huge_pages_node[nid] >=
+       if (delta < 0)
+               start_nid = h->next_nid_to_alloc;
+       else
+               start_nid = h->next_nid_to_free;
+       next_nid = start_nid;
+
+       do {
+               int nid = next_nid;
+               if (delta < 0)  {
+                       next_nid = hstate_next_node_to_alloc(h);
+                       /*
+                        * To shrink on this node, there must be a surplus page
+                        */
+                       if (!h->surplus_huge_pages_node[nid])
+                               continue;
+               }
+               if (delta > 0) {
+                       next_nid = hstate_next_node_to_free(h);
+                       /*
+                        * Surplus cannot exceed the total number of pages
+                        */
+                       if (h->surplus_huge_pages_node[nid] >=
                                                h->nr_huge_pages_node[nid])
-                       continue;
+                               continue;
+               }
 
                h->surplus_huge_pages += delta;
                h->surplus_huge_pages_node[nid] += delta;
                ret = 1;
                break;
-       } while (nid != prev_nid);
+       } while (next_nid != start_nid);
 
-       prev_nid = nid;
        return ret;
 }
 
@@ -1227,10 +1259,8 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count)
        min_count = max(count, min_count);
        try_to_free_low(h, min_count);
        while (min_count < persistent_huge_pages(h)) {
-               struct page *page = dequeue_huge_page(h);
-               if (!page)
+               if (!free_pool_huge_page(h, 0))
                        break;
-               update_and_free_page(h, page);
        }
        while (count < persistent_huge_pages(h)) {
                if (!adjust_pool_surplus(h, 1))
@@ -1442,7 +1472,8 @@ void __init hugetlb_add_hstate(unsigned order)
        h->free_huge_pages = 0;
        for (i = 0; i < MAX_NUMNODES; ++i)
                INIT_LIST_HEAD(&h->hugepage_freelists[i]);
-       h->hugetlb_next_nid = first_node(node_online_map);
+       h->next_nid_to_alloc = first_node(node_online_map);
+       h->next_nid_to_free = first_node(node_online_map);
        snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",
                                        huge_page_size(h)/1024);
 
@@ -1985,6 +2016,26 @@ static struct page *hugetlbfs_pagecache_page(struct hstate *h,
        return find_lock_page(mapping, idx);
 }
 
+/*
+ * Return whether there is a pagecache page to back given address within VMA.
+ * Caller follow_hugetlb_page() holds page_table_lock so we cannot lock_page.
+ */
+static bool hugetlbfs_pagecache_present(struct hstate *h,
+                       struct vm_area_struct *vma, unsigned long address)
+{
+       struct address_space *mapping;
+       pgoff_t idx;
+       struct page *page;
+
+       mapping = vma->vm_file->f_mapping;
+       idx = vma_hugecache_offset(h, vma, address);
+
+       page = find_get_page(mapping, idx);
+       if (page)
+               put_page(page);
+       return page != NULL;
+}
+
 static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
                        unsigned long address, pte_t *ptep, unsigned int flags)
 {
@@ -2180,54 +2231,55 @@ follow_huge_pud(struct mm_struct *mm, unsigned long address,
        return NULL;
 }
 
-static int huge_zeropage_ok(pte_t *ptep, int write, int shared)
-{
-       if (!ptep || write || shared)
-               return 0;
-       else
-               return huge_pte_none(huge_ptep_get(ptep));
-}
-
 int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
                        struct page **pages, struct vm_area_struct **vmas,
                        unsigned long *position, int *length, int i,
-                       int write)
+                       unsigned int flags)
 {
        unsigned long pfn_offset;
        unsigned long vaddr = *position;
        int remainder = *length;
        struct hstate *h = hstate_vma(vma);
-       int zeropage_ok = 0;
-       int shared = vma->vm_flags & VM_SHARED;
 
        spin_lock(&mm->page_table_lock);
        while (vaddr < vma->vm_end && remainder) {
                pte_t *pte;
+               int absent;
                struct page *page;
 
                /*
                 * Some archs (sparc64, sh*) have multiple pte_ts to
-                * each hugepage.  We have to make sure we get the
+                * each hugepage.  We have to make sure we get the
                 * first, for the page indexing below to work.
                 */
                pte = huge_pte_offset(mm, vaddr & huge_page_mask(h));
-               if (huge_zeropage_ok(pte, write, shared))
-                       zeropage_ok = 1;
+               absent = !pte || huge_pte_none(huge_ptep_get(pte));
+
+               /*
+                * When coredumping, it suits get_dump_page if we just return
+                * an error where there's an empty slot with no huge pagecache
+                * to back it.  This way, we avoid allocating a hugepage, and
+                * the sparse dumpfile avoids allocating disk blocks, but its
+                * huge holes still show up with zeroes where they need to be.
+                */
+               if (absent && (flags & FOLL_DUMP) &&
+                   !hugetlbfs_pagecache_present(h, vma, vaddr)) {
+                       remainder = 0;
+                       break;
+               }
 
-               if (!pte ||
-                   (huge_pte_none(huge_ptep_get(pte)) && !zeropage_ok) ||
-                   (write && !pte_write(huge_ptep_get(pte)))) {
+               if (absent ||
+                   ((flags & FOLL_WRITE) && !pte_write(huge_ptep_get(pte)))) {
                        int ret;
 
                        spin_unlock(&mm->page_table_lock);
-                       ret = hugetlb_fault(mm, vma, vaddr, write);
+                       ret = hugetlb_fault(mm, vma, vaddr,
+                               (flags & FOLL_WRITE) ? FAULT_FLAG_WRITE : 0);
                        spin_lock(&mm->page_table_lock);
                        if (!(ret & VM_FAULT_ERROR))
                                continue;
 
                        remainder = 0;
-                       if (!i)
-                               i = -EFAULT;
                        break;
                }
 
@@ -2235,10 +2287,7 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
                page = pte_page(huge_ptep_get(pte));
 same_page:
                if (pages) {
-                       if (zeropage_ok)
-                               pages[i] = ZERO_PAGE(0);
-                       else
-                               pages[i] = mem_map_offset(page, pfn_offset);
+                       pages[i] = mem_map_offset(page, pfn_offset);
                        get_page(pages[i]);
                }
 
@@ -2262,7 +2311,7 @@ same_page:
        *length = remainder;
        *position = vaddr;
 
-       return i;
+       return i ? i : -EFAULT;
 }
 
 void hugetlb_change_protection(struct vm_area_struct *vma,
index f290c4d..22ec8d2 100644 (file)
@@ -37,6 +37,8 @@ static inline void __put_page(struct page *page)
        atomic_dec(&page->_count);
 }
 
+extern unsigned long highest_memmap_pfn;
+
 /*
  * in mm/vmscan.c:
  */
@@ -46,7 +48,6 @@ extern void putback_lru_page(struct page *page);
 /*
  * in mm/page_alloc.c
  */
-extern unsigned long highest_memmap_pfn;
 extern void __free_pages_bootmem(struct page *page, unsigned int order);
 extern void prep_compound_page(struct page *page, unsigned long order);
 
@@ -250,13 +251,8 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
 }
 #endif /* CONFIG_SPARSEMEM */
 
-#define GUP_FLAGS_WRITE                  0x1
-#define GUP_FLAGS_FORCE                  0x2
-#define GUP_FLAGS_IGNORE_VMA_PERMISSIONS 0x4
-#define GUP_FLAGS_IGNORE_SIGKILL         0x8
-
 int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-                    unsigned long start, int len, int flags,
+                    unsigned long start, int len, unsigned int foll_flags,
                     struct page **pages, struct vm_area_struct **vmas);
 
 #define ZONE_RECLAIM_NOSCAN    -2
diff --git a/mm/ksm.c b/mm/ksm.c
new file mode 100644 (file)
index 0000000..37cc373
--- /dev/null
+++ b/mm/ksm.c
@@ -0,0 +1,1703 @@
+/*
+ * Memory merging support.
+ *
+ * This code enables dynamic sharing of identical pages found in different
+ * memory areas, even if they are not shared by fork()
+ *
+ * Copyright (C) 2008-2009 Red Hat, Inc.
+ * Authors:
+ *     Izik Eidus
+ *     Andrea Arcangeli
+ *     Chris Wright
+ *     Hugh Dickins
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ */
+
+#include <linux/errno.h>
+#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/mman.h>
+#include <linux/sched.h>
+#include <linux/rwsem.h>
+#include <linux/pagemap.h>
+#include <linux/rmap.h>
+#include <linux/spinlock.h>
+#include <linux/jhash.h>
+#include <linux/delay.h>
+#include <linux/kthread.h>
+#include <linux/wait.h>
+#include <linux/slab.h>
+#include <linux/rbtree.h>
+#include <linux/mmu_notifier.h>
+#include <linux/ksm.h>
+
+#include <asm/tlbflush.h>
+
+/*
+ * A few notes about the KSM scanning process,
+ * to make it easier to understand the data structures below:
+ *
+ * In order to reduce excessive scanning, KSM sorts the memory pages by their
+ * contents into a data structure that holds pointers to the pages' locations.
+ *
+ * Since the contents of the pages may change at any moment, KSM cannot just
+ * insert the pages into a normal sorted tree and expect it to find anything.
+ * Therefore KSM uses two data structures - the stable and the unstable tree.
+ *
+ * The stable tree holds pointers to all the merged pages (ksm pages), sorted
+ * by their contents.  Because each such page is write-protected, searching on
+ * this tree is fully assured to be working (except when pages are unmapped),
+ * and therefore this tree is called the stable tree.
+ *
+ * In addition to the stable tree, KSM uses a second data structure called the
+ * unstable tree: this tree holds pointers to pages which have been found to
+ * be "unchanged for a period of time".  The unstable tree sorts these pages
+ * by their contents, but since they are not write-protected, KSM cannot rely
+ * upon the unstable tree to work correctly - the unstable tree is liable to
+ * be corrupted as its contents are modified, and so it is called unstable.
+ *
+ * KSM solves this problem by several techniques:
+ *
+ * 1) The unstable tree is flushed every time KSM completes scanning all
+ *    memory areas, and then the tree is rebuilt again from the beginning.
+ * 2) KSM will only insert into the unstable tree, pages whose hash value
+ *    has not changed since the previous scan of all memory areas.
+ * 3) The unstable tree is a RedBlack Tree - so its balancing is based on the
+ *    colors of the nodes and not on their contents, assuring that even when
+ *    the tree gets "corrupted" it won't get out of balance, so scanning time
+ *    remains the same (also, searching and inserting nodes in an rbtree uses
+ *    the same algorithm, so we have no overhead when we flush and rebuild).
+ * 4) KSM never flushes the stable tree, which means that even if it were to
+ *    take 10 attempts to find a page in the unstable tree, once it is found,
+ *    it is secured in the stable tree.  (When we scan a new page, we first
+ *    compare it against the stable tree, and then against the unstable tree.)
+ */
+
+/**
+ * struct mm_slot - ksm information per mm that is being scanned
+ * @link: link to the mm_slots hash list
+ * @mm_list: link into the mm_slots list, rooted in ksm_mm_head
+ * @rmap_list: head for this mm_slot's list of rmap_items
+ * @mm: the mm that this information is valid for
+ */
+struct mm_slot {
+       struct hlist_node link;
+       struct list_head mm_list;
+       struct list_head rmap_list;
+       struct mm_struct *mm;
+};
+
+/**
+ * struct ksm_scan - cursor for scanning
+ * @mm_slot: the current mm_slot we are scanning
+ * @address: the next address inside that to be scanned
+ * @rmap_item: the current rmap that we are scanning inside the rmap_list
+ * @seqnr: count of completed full scans (needed when removing unstable node)
+ *
+ * There is only the one ksm_scan instance of this cursor structure.
+ */
+struct ksm_scan {
+       struct mm_slot *mm_slot;
+       unsigned long address;
+       struct rmap_item *rmap_item;
+       unsigned long seqnr;
+};
+
+/**
+ * struct rmap_item - reverse mapping item for virtual addresses
+ * @link: link into mm_slot's rmap_list (rmap_list is per mm)
+ * @mm: the memory structure this rmap_item is pointing into
+ * @address: the virtual address this rmap_item tracks (+ flags in low bits)
+ * @oldchecksum: previous checksum of the page at that virtual address
+ * @node: rb_node of this rmap_item in either unstable or stable tree
+ * @next: next rmap_item hanging off the same node of the stable tree
+ * @prev: previous rmap_item hanging off the same node of the stable tree
+ */
+struct rmap_item {
+       struct list_head link;
+       struct mm_struct *mm;
+       unsigned long address;          /* + low bits used for flags below */
+       union {
+               unsigned int oldchecksum;               /* when unstable */
+               struct rmap_item *next;                 /* when stable */
+       };
+       union {
+               struct rb_node node;                    /* when tree node */
+               struct rmap_item *prev;                 /* in stable list */
+       };
+};
+
+#define SEQNR_MASK     0x0ff   /* low bits of unstable tree seqnr */
+#define NODE_FLAG      0x100   /* is a node of unstable or stable tree */
+#define STABLE_FLAG    0x200   /* is a node or list item of stable tree */
+
+/* The stable and unstable tree heads */
+static struct rb_root root_stable_tree = RB_ROOT;
+static struct rb_root root_unstable_tree = RB_ROOT;
+
+#define MM_SLOTS_HASH_HEADS 1024
+static struct hlist_head *mm_slots_hash;
+
+static struct mm_slot ksm_mm_head = {
+       .mm_list = LIST_HEAD_INIT(ksm_mm_head.mm_list),
+};
+static struct ksm_scan ksm_scan = {
+       .mm_slot = &ksm_mm_head,
+};
+
+static struct kmem_cache *rmap_item_cache;
+static struct kmem_cache *mm_slot_cache;
+
+/* The number of nodes in the stable tree */
+static unsigned long ksm_pages_shared;
+
+/* The number of page slots additionally sharing those nodes */
+static unsigned long ksm_pages_sharing;
+
+/* The number of nodes in the unstable tree */
+static unsigned long ksm_pages_unshared;
+
+/* The number of rmap_items in use: to calculate pages_volatile */
+static unsigned long ksm_rmap_items;
+
+/* Limit on the number of unswappable pages used */
+static unsigned long ksm_max_kernel_pages = 2000;
+
+/* Number of pages ksmd should scan in one batch */
+static unsigned int ksm_thread_pages_to_scan = 200;
+
+/* Milliseconds ksmd should sleep between batches */
+static unsigned int ksm_thread_sleep_millisecs = 20;
+
+#define KSM_RUN_STOP   0
+#define KSM_RUN_MERGE  1
+#define KSM_RUN_UNMERGE        2
+static unsigned int ksm_run = KSM_RUN_MERGE;
+
+static DECLARE_WAIT_QUEUE_HEAD(ksm_thread_wait);
+static DEFINE_MUTEX(ksm_thread_mutex);
+static DEFINE_SPINLOCK(ksm_mmlist_lock);
+
+#define KSM_KMEM_CACHE(__struct, __flags) kmem_cache_create("ksm_"#__struct,\
+               sizeof(struct __struct), __alignof__(struct __struct),\
+               (__flags), NULL)
+
+static int __init ksm_slab_init(void)
+{
+       rmap_item_cache = KSM_KMEM_CACHE(rmap_item, 0);
+       if (!rmap_item_cache)
+               goto out;
+
+       mm_slot_cache = KSM_KMEM_CACHE(mm_slot, 0);
+       if (!mm_slot_cache)
+               goto out_free;
+
+       return 0;
+
+out_free:
+       kmem_cache_destroy(rmap_item_cache);
+out:
+       return -ENOMEM;
+}
+
+static void __init ksm_slab_free(void)
+{
+       kmem_cache_destroy(mm_slot_cache);
+       kmem_cache_destroy(rmap_item_cache);
+       mm_slot_cache = NULL;
+}
+
+static inline struct rmap_item *alloc_rmap_item(void)
+{
+       struct rmap_item *rmap_item;
+
+       rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+       if (rmap_item)
+               ksm_rmap_items++;
+       return rmap_item;
+}
+
+static inline void free_rmap_item(struct rmap_item *rmap_item)
+{
+       ksm_rmap_items--;
+       rmap_item->mm = NULL;   /* debug safety */
+       kmem_cache_free(rmap_item_cache, rmap_item);
+}
+
+static inline struct mm_slot *alloc_mm_slot(void)
+{
+       if (!mm_slot_cache)     /* initialization failed */
+               return NULL;
+       return kmem_cache_zalloc(mm_slot_cache, GFP_KERNEL);
+}
+
+static inline void free_mm_slot(struct mm_slot *mm_slot)
+{
+       kmem_cache_free(mm_slot_cache, mm_slot);
+}
+
+static int __init mm_slots_hash_init(void)
+{
+       mm_slots_hash = kzalloc(MM_SLOTS_HASH_HEADS * sizeof(struct hlist_head),
+                               GFP_KERNEL);
+       if (!mm_slots_hash)
+               return -ENOMEM;
+       return 0;
+}
+
+static void __init mm_slots_hash_free(void)
+{
+       kfree(mm_slots_hash);
+}
+
+static struct mm_slot *get_mm_slot(struct mm_struct *mm)
+{
+       struct mm_slot *mm_slot;
+       struct hlist_head *bucket;
+       struct hlist_node *node;
+
+       bucket = &mm_slots_hash[((unsigned long)mm / sizeof(struct mm_struct))
+                               % MM_SLOTS_HASH_HEADS];
+       hlist_for_each_entry(mm_slot, node, bucket, link) {
+               if (mm == mm_slot->mm)
+                       return mm_slot;
+       }
+       return NULL;
+}
+
+static void insert_to_mm_slots_hash(struct mm_struct *mm,
+                                   struct mm_slot *mm_slot)
+{
+       struct hlist_head *bucket;
+
+       bucket = &mm_slots_hash[((unsigned long)mm / sizeof(struct mm_struct))
+                               % MM_SLOTS_HASH_HEADS];
+       mm_slot->mm = mm;
+       INIT_LIST_HEAD(&mm_slot->rmap_list);
+       hlist_add_head(&mm_slot->link, bucket);
+}
+
+static inline int in_stable_tree(struct rmap_item *rmap_item)
+{
+       return rmap_item->address & STABLE_FLAG;
+}
+
+/*
+ * ksmd, and unmerge_and_remove_all_rmap_items(), must not touch an mm's
+ * page tables after it has passed through ksm_exit() - which, if necessary,
+ * takes mmap_sem briefly to serialize against them.  ksm_exit() does not set
+ * a special flag: they can just back out as soon as mm_users goes to zero.
+ * ksm_test_exit() is used throughout to make this test for exit: in some
+ * places for correctness, in some places just to avoid unnecessary work.
+ */
+static inline bool ksm_test_exit(struct mm_struct *mm)
+{
+       return atomic_read(&mm->mm_users) == 0;
+}
+
+/*
+ * We use break_ksm to break COW on a ksm page: it's a stripped down
+ *
+ *     if (get_user_pages(current, mm, addr, 1, 1, 1, &page, NULL) == 1)
+ *             put_page(page);
+ *
+ * but taking great care only to touch a ksm page, in a VM_MERGEABLE vma,
+ * in case the application has unmapped and remapped mm,addr meanwhile.
+ * Could a ksm page appear anywhere else?  Actually yes, in a VM_PFNMAP
+ * mmap of /dev/mem or /dev/kmem, where we would not want to touch it.
+ */
+static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
+{
+       struct page *page;
+       int ret = 0;
+
+       do {
+               cond_resched();
+               page = follow_page(vma, addr, FOLL_GET);
+               if (!page)
+                       break;
+               if (PageKsm(page))
+                       ret = handle_mm_fault(vma->vm_mm, vma, addr,
+                                                       FAULT_FLAG_WRITE);
+               else
+                       ret = VM_FAULT_WRITE;
+               put_page(page);
+       } while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS | VM_FAULT_OOM)));
+       /*
+        * We must loop because handle_mm_fault() may back out if there's
+        * any difficulty e.g. if pte accessed bit gets updated concurrently.
+        *
+        * VM_FAULT_WRITE is what we have been hoping for: it indicates that
+        * COW has been broken, even if the vma does not permit VM_WRITE;
+        * but note that a concurrent fault might break PageKsm for us.
+        *
+        * VM_FAULT_SIGBUS could occur if we race with truncation of the
+        * backing file, which also invalidates anonymous pages: that's
+        * okay, that truncation will have unmapped the PageKsm for us.
+        *
+        * VM_FAULT_OOM: at the time of writing (late July 2009), setting
+        * aside mem_cgroup limits, VM_FAULT_OOM would only be set if the
+        * current task has TIF_MEMDIE set, and will be OOM killed on return
+        * to user; and ksmd, having no mm, would never be chosen for that.
+        *
+        * But if the mm is in a limited mem_cgroup, then the fault may fail
+        * with VM_FAULT_OOM even if the current task is not TIF_MEMDIE; and
+        * even ksmd can fail in this way - though it's usually breaking ksm
+        * just to undo a merge it made a moment before, so unlikely to oom.
+        *
+        * That's a pity: we might therefore have more kernel pages allocated
+        * than we're counting as nodes in the stable tree; but ksm_do_scan
+        * will retry to break_cow on each pass, so should recover the page
+        * in due course.  The important thing is to not let VM_MERGEABLE
+        * be cleared while any such pages might remain in the area.
+        */
+       return (ret & VM_FAULT_OOM) ? -ENOMEM : 0;
+}
+
+static void break_cow(struct mm_struct *mm, unsigned long addr)
+{
+       struct vm_area_struct *vma;
+
+       down_read(&mm->mmap_sem);
+       if (ksm_test_exit(mm))
+               goto out;
+       vma = find_vma(mm, addr);
+       if (!vma || vma->vm_start > addr)
+               goto out;
+       if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+               goto out;
+       break_ksm(vma, addr);
+out:
+       up_read(&mm->mmap_sem);
+}
+
+static struct page *get_mergeable_page(struct rmap_item *rmap_item)
+{
+       struct mm_struct *mm = rmap_item->mm;
+       unsigned long addr = rmap_item->address;
+       struct vm_area_struct *vma;
+       struct page *page;
+
+       down_read(&mm->mmap_sem);
+       if (ksm_test_exit(mm))
+               goto out;
+       vma = find_vma(mm, addr);
+       if (!vma || vma->vm_start > addr)
+               goto out;
+       if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+               goto out;
+
+       page = follow_page(vma, addr, FOLL_GET);
+       if (!page)
+               goto out;
+       if (PageAnon(page)) {
+               flush_anon_page(vma, page, addr);
+               flush_dcache_page(page);
+       } else {
+               put_page(page);
+out:           page = NULL;
+       }
+       up_read(&mm->mmap_sem);
+       return page;
+}
+
+/*
+ * get_ksm_page: checks if the page at the virtual address in rmap_item
+ * is still PageKsm, in which case we can trust the content of the page,
+ * and it returns the gotten page; but NULL if the page has been zapped.
+ */
+static struct page *get_ksm_page(struct rmap_item *rmap_item)
+{
+       struct page *page;
+
+       page = get_mergeable_page(rmap_item);
+       if (page && !PageKsm(page)) {
+               put_page(page);
+               page = NULL;
+       }
+       return page;
+}
+
+/*
+ * Removing rmap_item from stable or unstable tree.
+ * This function will clean the information from the stable/unstable tree.
+ */
+static void remove_rmap_item_from_tree(struct rmap_item *rmap_item)
+{
+       if (in_stable_tree(rmap_item)) {
+               struct rmap_item *next_item = rmap_item->next;
+
+               if (rmap_item->address & NODE_FLAG) {
+                       if (next_item) {
+                               rb_replace_node(&rmap_item->node,
+                                               &next_item->node,
+                                               &root_stable_tree);
+                               next_item->address |= NODE_FLAG;
+                               ksm_pages_sharing--;
+                       } else {
+                               rb_erase(&rmap_item->node, &root_stable_tree);
+                               ksm_pages_shared--;
+                       }
+               } else {
+                       struct rmap_item *prev_item = rmap_item->prev;
+
+                       BUG_ON(prev_item->next != rmap_item);
+                       prev_item->next = next_item;
+                       if (next_item) {
+                               BUG_ON(next_item->prev != rmap_item);
+                               next_item->prev = rmap_item->prev;
+                       }
+                       ksm_pages_sharing--;
+               }
+
+               rmap_item->next = NULL;
+
+       } else if (rmap_item->address & NODE_FLAG) {
+               unsigned char age;
+               /*
+                * Usually ksmd can and must skip the rb_erase, because
+                * root_unstable_tree was already reset to RB_ROOT.
+                * But be careful when an mm is exiting: do the rb_erase
+                * if this rmap_item was inserted by this scan, rather
+                * than left over from before.
+                */
+               age = (unsigned char)(ksm_scan.seqnr - rmap_item->address);
+               BUG_ON(age > 1);
+               if (!age)
+                       rb_erase(&rmap_item->node, &root_unstable_tree);
+               ksm_pages_unshared--;
+       }
+
+       rmap_item->address &= PAGE_MASK;
+
+       cond_resched();         /* we're called from many long loops */
+}
+
+static void remove_trailing_rmap_items(struct mm_slot *mm_slot,
+                                      struct list_head *cur)
+{
+       struct rmap_item *rmap_item;
+
+       while (cur != &mm_slot->rmap_list) {
+               rmap_item = list_entry(cur, struct rmap_item, link);
+               cur = cur->next;
+               remove_rmap_item_from_tree(rmap_item);
+               list_del(&rmap_item->link);
+               free_rmap_item(rmap_item);
+       }
+}
+
+/*
+ * Though it's very tempting to unmerge in_stable_tree(rmap_item)s rather
+ * than check every pte of a given vma, the locking doesn't quite work for
+ * that - an rmap_item is assigned to the stable tree after inserting ksm
+ * page and upping mmap_sem.  Nor does it fit with the way we skip dup'ing
+ * rmap_items from parent to child at fork time (so as not to waste time
+ * if exit comes before the next scan reaches it).
+ *
+ * Similarly, although we'd like to remove rmap_items (so updating counts
+ * and freeing memory) when unmerging an area, it's easier to leave that
+ * to the next pass of ksmd - consider, for example, how ksmd might be
+ * in cmp_and_merge_page on one of the rmap_items we would be removing.
+ */
+static int unmerge_ksm_pages(struct vm_area_struct *vma,
+                            unsigned long start, unsigned long end)
+{
+       unsigned long addr;
+       int err = 0;
+
+       for (addr = start; addr < end && !err; addr += PAGE_SIZE) {
+               if (ksm_test_exit(vma->vm_mm))
+                       break;
+               if (signal_pending(current))
+                       err = -ERESTARTSYS;
+               else
+                       err = break_ksm(vma, addr);
+       }
+       return err;
+}
+
+#ifdef CONFIG_SYSFS
+/*
+ * Only called through the sysfs control interface:
+ */
+static int unmerge_and_remove_all_rmap_items(void)
+{
+       struct mm_slot *mm_slot;
+       struct mm_struct *mm;
+       struct vm_area_struct *vma;
+       int err = 0;
+
+       spin_lock(&ksm_mmlist_lock);
+       ksm_scan.mm_slot = list_entry(ksm_mm_head.mm_list.next,
+                                               struct mm_slot, mm_list);
+       spin_unlock(&ksm_mmlist_lock);
+
+       for (mm_slot = ksm_scan.mm_slot;
+                       mm_slot != &ksm_mm_head; mm_slot = ksm_scan.mm_slot) {
+               mm = mm_slot->mm;
+               down_read(&mm->mmap_sem);
+               for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                       if (ksm_test_exit(mm))
+                               break;
+                       if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+                               continue;
+                       err = unmerge_ksm_pages(vma,
+                                               vma->vm_start, vma->vm_end);
+                       if (err)
+                               goto error;
+               }
+
+               remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
+
+               spin_lock(&ksm_mmlist_lock);
+               ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
+                                               struct mm_slot, mm_list);
+               if (ksm_test_exit(mm)) {
+                       hlist_del(&mm_slot->link);
+                       list_del(&mm_slot->mm_list);
+                       spin_unlock(&ksm_mmlist_lock);
+
+                       free_mm_slot(mm_slot);
+                       clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+                       up_read(&mm->mmap_sem);
+                       mmdrop(mm);
+               } else {
+                       spin_unlock(&ksm_mmlist_lock);
+                       up_read(&mm->mmap_sem);
+               }
+       }
+
+       ksm_scan.seqnr = 0;
+       return 0;
+
+error:
+       up_read(&mm->mmap_sem);
+       spin_lock(&ksm_mmlist_lock);
+       ksm_scan.mm_slot = &ksm_mm_head;
+       spin_unlock(&ksm_mmlist_lock);
+       return err;
+}
+#endif /* CONFIG_SYSFS */
+
+static u32 calc_checksum(struct page *page)
+{
+       u32 checksum;
+       void *addr = kmap_atomic(page, KM_USER0);
+       checksum = jhash2(addr, PAGE_SIZE / 4, 17);
+       kunmap_atomic(addr, KM_USER0);
+       return checksum;
+}
+
+static int memcmp_pages(struct page *page1, struct page *page2)
+{
+       char *addr1, *addr2;
+       int ret;
+
+       addr1 = kmap_atomic(page1, KM_USER0);
+       addr2 = kmap_atomic(page2, KM_USER1);
+       ret = memcmp(addr1, addr2, PAGE_SIZE);
+       kunmap_atomic(addr2, KM_USER1);
+       kunmap_atomic(addr1, KM_USER0);
+       return ret;
+}
+
+static inline int pages_identical(struct page *page1, struct page *page2)
+{
+       return !memcmp_pages(page1, page2);
+}
+
+static int write_protect_page(struct vm_area_struct *vma, struct page *page,
+                             pte_t *orig_pte)
+{
+       struct mm_struct *mm = vma->vm_mm;
+       unsigned long addr;
+       pte_t *ptep;
+       spinlock_t *ptl;
+       int swapped;
+       int err = -EFAULT;
+
+       addr = page_address_in_vma(page, vma);
+       if (addr == -EFAULT)
+               goto out;
+
+       ptep = page_check_address(page, mm, addr, &ptl, 0);
+       if (!ptep)
+               goto out;
+
+       if (pte_write(*ptep)) {
+               pte_t entry;
+
+               swapped = PageSwapCache(page);
+               flush_cache_page(vma, addr, page_to_pfn(page));
+               /*
+                * Ok this is tricky, when get_user_pages_fast() run it doesnt
+                * take any lock, therefore the check that we are going to make
+                * with the pagecount against the mapcount is racey and
+                * O_DIRECT can happen right after the check.
+                * So we clear the pte and flush the tlb before the check
+                * this assure us that no O_DIRECT can happen after the check
+                * or in the middle of the check.
+                */
+               entry = ptep_clear_flush(vma, addr, ptep);
+               /*
+                * Check that no O_DIRECT or similar I/O is in progress on the
+                * page
+                */
+               if ((page_mapcount(page) + 2 + swapped) != page_count(page)) {
+                       set_pte_at_notify(mm, addr, ptep, entry);
+                       goto out_unlock;
+               }
+               entry = pte_wrprotect(entry);
+               set_pte_at_notify(mm, addr, ptep, entry);
+       }
+       *orig_pte = *ptep;
+       err = 0;
+
+out_unlock:
+       pte_unmap_unlock(ptep, ptl);
+out:
+       return err;
+}
+
+/**
+ * replace_page - replace page in vma by new ksm page
+ * @vma:      vma that holds the pte pointing to oldpage
+ * @oldpage:  the page we are replacing by newpage
+ * @newpage:  the ksm page we replace oldpage by
+ * @orig_pte: the original value of the pte
+ *
+ * Returns 0 on success, -EFAULT on failure.
+ */
+static int replace_page(struct vm_area_struct *vma, struct page *oldpage,
+                       struct page *newpage, pte_t orig_pte)
+{
+       struct mm_struct *mm = vma->vm_mm;
+       pgd_t *pgd;
+       pud_t *pud;
+       pmd_t *pmd;
+       pte_t *ptep;
+       spinlock_t *ptl;
+       unsigned long addr;
+       pgprot_t prot;
+       int err = -EFAULT;
+
+       prot = vm_get_page_prot(vma->vm_flags & ~VM_WRITE);
+
+       addr = page_address_in_vma(oldpage, vma);
+       if (addr == -EFAULT)
+               goto out;
+
+       pgd = pgd_offset(mm, addr);
+       if (!pgd_present(*pgd))
+               goto out;
+
+       pud = pud_offset(pgd, addr);
+       if (!pud_present(*pud))
+               goto out;
+
+       pmd = pmd_offset(pud, addr);
+       if (!pmd_present(*pmd))
+               goto out;
+
+       ptep = pte_offset_map_lock(mm, pmd, addr, &ptl);
+       if (!pte_same(*ptep, orig_pte)) {
+               pte_unmap_unlock(ptep, ptl);
+               goto out;
+       }
+
+       get_page(newpage);
+       page_add_ksm_rmap(newpage);
+
+       flush_cache_page(vma, addr, pte_pfn(*ptep));
+       ptep_clear_flush(vma, addr, ptep);
+       set_pte_at_notify(mm, addr, ptep, mk_pte(newpage, prot));
+
+       page_remove_rmap(oldpage);
+       put_page(oldpage);
+
+       pte_unmap_unlock(ptep, ptl);
+       err = 0;
+out:
+       return err;
+}
+
+/*
+ * try_to_merge_one_page - take two pages and merge them into one
+ * @vma: the vma that hold the pte pointing into oldpage
+ * @oldpage: the page that we want to replace with newpage
+ * @newpage: the page that we want to map instead of oldpage
+ *
+ * Note:
+ * oldpage should be a PageAnon page, while newpage should be a PageKsm page,
+ * or a newly allocated kernel page which page_add_ksm_rmap will make PageKsm.
+ *
+ * This function returns 0 if the pages were merged, -EFAULT otherwise.
+ */
+static int try_to_merge_one_page(struct vm_area_struct *vma,
+                                struct page *oldpage,
+                                struct page *newpage)
+{
+       pte_t orig_pte = __pte(0);
+       int err = -EFAULT;
+
+       if (!(vma->vm_flags & VM_MERGEABLE))
+               goto out;
+
+       if (!PageAnon(oldpage))
+               goto out;
+
+       get_page(newpage);
+       get_page(oldpage);
+
+       /*
+        * We need the page lock to read a stable PageSwapCache in
+        * write_protect_page().  We use trylock_page() instead of
+        * lock_page() because we don't want to wait here - we
+        * prefer to continue scanning and merging different pages,
+        * then come back to this page when it is unlocked.
+        */
+       if (!trylock_page(oldpage))
+               goto out_putpage;
+       /*
+        * If this anonymous page is mapped only here, its pte may need
+        * to be write-protected.  If it's mapped elsewhere, all of its
+        * ptes are necessarily already write-protected.  But in either
+        * case, we need to lock and check page_count is not raised.
+        */
+       if (write_protect_page(vma, oldpage, &orig_pte)) {
+               unlock_page(oldpage);
+               goto out_putpage;
+       }
+       unlock_page(oldpage);
+
+       if (pages_identical(oldpage, newpage))
+               err = replace_page(vma, oldpage, newpage, orig_pte);
+
+out_putpage:
+       put_page(oldpage);
+       put_page(newpage);
+out:
+       return err;
+}
+
+/*
+ * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
+ * but no new kernel page is allocated: kpage must already be a ksm page.
+ */
+static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
+                                     unsigned long addr1,
+                                     struct page *page1,
+                                     struct page *kpage)
+{
+       struct vm_area_struct *vma;
+       int err = -EFAULT;
+
+       down_read(&mm1->mmap_sem);
+       if (ksm_test_exit(mm1))
+               goto out;
+
+       vma = find_vma(mm1, addr1);
+       if (!vma || vma->vm_start > addr1)
+               goto out;
+
+       err = try_to_merge_one_page(vma, page1, kpage);
+out:
+       up_read(&mm1->mmap_sem);
+       return err;
+}
+
+/*
+ * try_to_merge_two_pages - take two identical pages and prepare them
+ * to be merged into one page.
+ *
+ * This function returns 0 if we successfully mapped two identical pages
+ * into one page, -EFAULT otherwise.
+ *
+ * Note that this function allocates a new kernel page: if one of the pages
+ * is already a ksm page, try_to_merge_with_ksm_page should be used.
+ */
+static int try_to_merge_two_pages(struct mm_struct *mm1, unsigned long addr1,
+                                 struct page *page1, struct mm_struct *mm2,
+                                 unsigned long addr2, struct page *page2)
+{
+       struct vm_area_struct *vma;
+       struct page *kpage;
+       int err = -EFAULT;
+
+       /*
+        * The number of nodes in the stable tree
+        * is the number of kernel pages that we hold.
+        */
+       if (ksm_max_kernel_pages &&
+           ksm_max_kernel_pages <= ksm_pages_shared)
+               return err;
+
+       kpage = alloc_page(GFP_HIGHUSER);
+       if (!kpage)
+               return err;
+
+       down_read(&mm1->mmap_sem);
+       if (ksm_test_exit(mm1)) {
+               up_read(&mm1->mmap_sem);
+               goto out;
+       }
+       vma = find_vma(mm1, addr1);
+       if (!vma || vma->vm_start > addr1) {
+               up_read(&mm1->mmap_sem);
+               goto out;
+       }
+
+       copy_user_highpage(kpage, page1, addr1, vma);
+       err = try_to_merge_one_page(vma, page1, kpage);
+       up_read(&mm1->mmap_sem);
+
+       if (!err) {
+               err = try_to_merge_with_ksm_page(mm2, addr2, page2, kpage);
+               /*
+                * If that fails, we have a ksm page with only one pte
+                * pointing to it: so break it.
+                */
+               if (err)
+                       break_cow(mm1, addr1);
+       }
+out:
+       put_page(kpage);
+       return err;
+}
+
+/*
+ * stable_tree_search - search page inside the stable tree
+ * @page: the page that we are searching identical pages to.
+ * @page2: pointer into identical page that we are holding inside the stable
+ *        tree that we have found.
+ * @rmap_item: the reverse mapping item
+ *
+ * This function checks if there is a page inside the stable tree
+ * with identical content to the page that we are scanning right now.
+ *
+ * This function return rmap_item pointer to the identical item if found,
+ * NULL otherwise.
+ */
+static struct rmap_item *stable_tree_search(struct page *page,
+                                           struct page **page2,
+                                           struct rmap_item *rmap_item)
+{
+       struct rb_node *node = root_stable_tree.rb_node;
+
+       while (node) {
+               struct rmap_item *tree_rmap_item, *next_rmap_item;
+               int ret;
+
+               tree_rmap_item = rb_entry(node, struct rmap_item, node);
+               while (tree_rmap_item) {
+                       BUG_ON(!in_stable_tree(tree_rmap_item));
+                       cond_resched();
+                       page2[0] = get_ksm_page(tree_rmap_item);
+                       if (page2[0])
+                               break;
+                       next_rmap_item = tree_rmap_item->next;
+                       remove_rmap_item_from_tree(tree_rmap_item);
+                       tree_rmap_item = next_rmap_item;
+               }
+               if (!tree_rmap_item)
+                       return NULL;
+
+               ret = memcmp_pages(page, page2[0]);
+
+               if (ret < 0) {
+                       put_page(page2[0]);
+                       node = node->rb_left;
+               } else if (ret > 0) {
+                       put_page(page2[0]);
+                       node = node->rb_right;
+               } else {
+                       return tree_rmap_item;
+               }
+       }
+
+       return NULL;
+}
+
+/*
+ * stable_tree_insert - insert rmap_item pointing to new ksm page
+ * into the stable tree.
+ *
+ * @page: the page that we are searching identical page to inside the stable
+ *       tree.
+ * @rmap_item: pointer to the reverse mapping item.
+ *
+ * This function returns rmap_item if success, NULL otherwise.
+ */
+static struct rmap_item *stable_tree_insert(struct page *page,
+                                           struct rmap_item *rmap_item)
+{
+       struct rb_node **new = &root_stable_tree.rb_node;
+       struct rb_node *parent = NULL;
+
+       while (*new) {
+               struct rmap_item *tree_rmap_item, *next_rmap_item;
+               struct page *tree_page;
+               int ret;
+
+               tree_rmap_item = rb_entry(*new, struct rmap_item, node);
+               while (tree_rmap_item) {
+                       BUG_ON(!in_stable_tree(tree_rmap_item));
+                       cond_resched();
+                       tree_page = get_ksm_page(tree_rmap_item);
+                       if (tree_page)
+                               break;
+                       next_rmap_item = tree_rmap_item->next;
+                       remove_rmap_item_from_tree(tree_rmap_item);
+                       tree_rmap_item = next_rmap_item;
+               }
+               if (!tree_rmap_item)
+                       return NULL;
+
+               ret = memcmp_pages(page, tree_page);
+               put_page(tree_page);
+
+               parent = *new;
+               if (ret < 0)
+                       new = &parent->rb_left;
+               else if (ret > 0)
+                       new = &parent->rb_right;
+               else {
+                       /*
+                        * It is not a bug that stable_tree_search() didn't
+                        * find this node: because at that time our page was
+                        * not yet write-protected, so may have changed since.
+                        */
+                       return NULL;
+               }
+       }
+
+       rmap_item->address |= NODE_FLAG | STABLE_FLAG;
+       rmap_item->next = NULL;
+       rb_link_node(&rmap_item->node, parent, new);
+       rb_insert_color(&rmap_item->node, &root_stable_tree);
+
+       ksm_pages_shared++;
+       return rmap_item;
+}
+
+/*
+ * unstable_tree_search_insert - search and insert items into the unstable tree.
+ *
+ * @page: the page that we are going to search for identical page or to insert
+ *       into the unstable tree
+ * @page2: pointer into identical page that was found inside the unstable tree
+ * @rmap_item: the reverse mapping item of page
+ *
+ * This function searches for a page in the unstable tree identical to the
+ * page currently being scanned; and if no identical page is found in the
+ * tree, we insert rmap_item as a new object into the unstable tree.
+ *
+ * This function returns pointer to rmap_item found to be identical
+ * to the currently scanned page, NULL otherwise.
+ *
+ * This function does both searching and inserting, because they share
+ * the same walking algorithm in an rbtree.
+ */
+static struct rmap_item *unstable_tree_search_insert(struct page *page,
+                                               struct page **page2,
+                                               struct rmap_item *rmap_item)
+{
+       struct rb_node **new = &root_unstable_tree.rb_node;
+       struct rb_node *parent = NULL;
+
+       while (*new) {
+               struct rmap_item *tree_rmap_item;
+               int ret;
+
+               tree_rmap_item = rb_entry(*new, struct rmap_item, node);
+               page2[0] = get_mergeable_page(tree_rmap_item);
+               if (!page2[0])
+                       return NULL;
+
+               /*
+                * Don't substitute an unswappable ksm page
+                * just for one good swappable forked page.
+                */
+               if (page == page2[0]) {
+                       put_page(page2[0]);
+                       return NULL;
+               }
+
+               ret = memcmp_pages(page, page2[0]);
+
+               parent = *new;
+               if (ret < 0) {
+                       put_page(page2[0]);
+                       new = &parent->rb_left;
+               } else if (ret > 0) {
+                       put_page(page2[0]);
+                       new = &parent->rb_right;
+               } else {
+                       return tree_rmap_item;
+               }
+       }
+
+       rmap_item->address |= NODE_FLAG;
+       rmap_item->address |= (ksm_scan.seqnr & SEQNR_MASK);
+       rb_link_node(&rmap_item->node, parent, new);
+       rb_insert_color(&rmap_item->node, &root_unstable_tree);
+
+       ksm_pages_unshared++;
+       return NULL;
+}
+
+/*
+ * stable_tree_append - add another rmap_item to the linked list of
+ * rmap_items hanging off a given node of the stable tree, all sharing
+ * the same ksm page.
+ */
+static void stable_tree_append(struct rmap_item *rmap_item,
+                              struct rmap_item *tree_rmap_item)
+{
+       rmap_item->next = tree_rmap_item->next;
+       rmap_item->prev = tree_rmap_item;
+
+       if (tree_rmap_item->next)
+               tree_rmap_item->next->prev = rmap_item;
+
+       tree_rmap_item->next = rmap_item;
+       rmap_item->address |= STABLE_FLAG;
+
+       ksm_pages_sharing++;
+}
+
+/*
+ * cmp_and_merge_page - first see if page can be merged into the stable tree;
+ * if not, compare checksum to previous and if it's the same, see if page can
+ * be inserted into the unstable tree, or merged with a page already there and
+ * both transferred to the stable tree.
+ *
+ * @page: the page that we are searching identical page to.
+ * @rmap_item: the reverse mapping into the virtual address of this page
+ */
+static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
+{
+       struct page *page2[1];
+       struct rmap_item *tree_rmap_item;
+       unsigned int checksum;
+       int err;
+
+       if (in_stable_tree(rmap_item))
+               remove_rmap_item_from_tree(rmap_item);
+
+       /* We first start with searching the page inside the stable tree */
+       tree_rmap_item = stable_tree_search(page, page2, rmap_item);
+       if (tree_rmap_item) {
+               if (page == page2[0])                   /* forked */
+                       err = 0;
+               else
+                       err = try_to_merge_with_ksm_page(rmap_item->mm,
+                                                        rmap_item->address,
+                                                        page, page2[0]);
+               put_page(page2[0]);
+
+               if (!err) {
+                       /*
+                        * The page was successfully merged:
+                        * add its rmap_item to the stable tree.
+                        */
+                       stable_tree_append(rmap_item, tree_rmap_item);
+               }
+               return;
+       }
+
+       /*
+        * A ksm page might have got here by fork, but its other
+        * references have already been removed from the stable tree.
+        * Or it might be left over from a break_ksm which failed
+        * when the mem_cgroup had reached its limit: try again now.
+        */
+       if (PageKsm(page))
+               break_cow(rmap_item->mm, rmap_item->address);
+
+       /*
+        * In case the hash value of the page was changed from the last time we
+        * have calculated it, this page to be changed frequely, therefore we
+        * don't want to insert it to the unstable tree, and we don't want to
+        * waste our time to search if there is something identical to it there.
+        */
+       checksum = calc_checksum(page);
+       if (rmap_item->oldchecksum != checksum) {
+               rmap_item->oldchecksum = checksum;
+               return;
+       }
+
+       tree_rmap_item = unstable_tree_search_insert(page, page2, rmap_item);
+       if (tree_rmap_item) {
+               err = try_to_merge_two_pages(rmap_item->mm,
+                                            rmap_item->address, page,
+                                            tree_rmap_item->mm,
+                                            tree_rmap_item->address, page2[0]);
+               /*
+                * As soon as we merge this page, we want to remove the
+                * rmap_item of the page we have merged with from the unstable
+                * tree, and insert it instead as new node in the stable tree.
+                */
+               if (!err) {
+                       rb_erase(&tree_rmap_item->node, &root_unstable_tree);
+                       tree_rmap_item->address &= ~NODE_FLAG;
+                       ksm_pages_unshared--;
+
+                       /*
+                        * If we fail to insert the page into the stable tree,
+                        * we will have 2 virtual addresses that are pointing
+                        * to a ksm page left outside the stable tree,
+                        * in which case we need to break_cow on both.
+                        */
+                       if (stable_tree_insert(page2[0], tree_rmap_item))
+                               stable_tree_append(rmap_item, tree_rmap_item);
+                       else {
+                               break_cow(tree_rmap_item->mm,
+                                               tree_rmap_item->address);
+                               break_cow(rmap_item->mm, rmap_item->address);
+                       }
+               }
+
+               put_page(page2[0]);
+       }
+}
+
+static struct rmap_item *get_next_rmap_item(struct mm_slot *mm_slot,
+                                           struct list_head *cur,
+                                           unsigned long addr)
+{
+       struct rmap_item *rmap_item;
+
+       while (cur != &mm_slot->rmap_list) {
+               rmap_item = list_entry(cur, struct rmap_item, link);
+               if ((rmap_item->address & PAGE_MASK) == addr) {
+                       if (!in_stable_tree(rmap_item))
+                               remove_rmap_item_from_tree(rmap_item);
+                       return rmap_item;
+               }
+               if (rmap_item->address > addr)
+                       break;
+               cur = cur->next;
+               remove_rmap_item_from_tree(rmap_item);
+               list_del(&rmap_item->link);
+               free_rmap_item(rmap_item);
+       }
+
+       rmap_item = alloc_rmap_item();
+       if (rmap_item) {
+               /* It has already been zeroed */
+               rmap_item->mm = mm_slot->mm;
+               rmap_item->address = addr;
+               list_add_tail(&rmap_item->link, cur);
+       }
+       return rmap_item;
+}
+
+static struct rmap_item *scan_get_next_rmap_item(struct page **page)
+{
+       struct mm_struct *mm;
+       struct mm_slot *slot;
+       struct vm_area_struct *vma;
+       struct rmap_item *rmap_item;
+
+       if (list_empty(&ksm_mm_head.mm_list))
+               return NULL;
+
+       slot = ksm_scan.mm_slot;
+       if (slot == &ksm_mm_head) {
+               root_unstable_tree = RB_ROOT;
+
+               spin_lock(&ksm_mmlist_lock);
+               slot = list_entry(slot->mm_list.next, struct mm_slot, mm_list);
+               ksm_scan.mm_slot = slot;
+               spin_unlock(&ksm_mmlist_lock);
+next_mm:
+               ksm_scan.address = 0;
+               ksm_scan.rmap_item = list_entry(&slot->rmap_list,
+                                               struct rmap_item, link);
+       }
+
+       mm = slot->mm;
+       down_read(&mm->mmap_sem);
+       if (ksm_test_exit(mm))
+               vma = NULL;
+       else
+               vma = find_vma(mm, ksm_scan.address);
+
+       for (; vma; vma = vma->vm_next) {
+               if (!(vma->vm_flags & VM_MERGEABLE))
+                       continue;
+               if (ksm_scan.address < vma->vm_start)
+                       ksm_scan.address = vma->vm_start;
+               if (!vma->anon_vma)
+                       ksm_scan.address = vma->vm_end;
+
+               while (ksm_scan.address < vma->vm_end) {
+                       if (ksm_test_exit(mm))
+                               break;
+                       *page = follow_page(vma, ksm_scan.address, FOLL_GET);
+                       if (*page && PageAnon(*page)) {
+                               flush_anon_page(vma, *page, ksm_scan.address);
+                               flush_dcache_page(*page);
+                               rmap_item = get_next_rmap_item(slot,
+                                       ksm_scan.rmap_item->link.next,
+                                       ksm_scan.address);
+                               if (rmap_item) {
+                                       ksm_scan.rmap_item = rmap_item;
+                                       ksm_scan.address += PAGE_SIZE;
+                               } else
+                                       put_page(*page);
+                               up_read(&mm->mmap_sem);
+                               return rmap_item;
+                       }
+                       if (*page)
+                               put_page(*page);
+                       ksm_scan.address += PAGE_SIZE;
+                       cond_resched();
+               }
+       }
+
+       if (ksm_test_exit(mm)) {
+               ksm_scan.address = 0;
+               ksm_scan.rmap_item = list_entry(&slot->rmap_list,
+                                               struct rmap_item, link);
+       }
+       /*
+        * Nuke all the rmap_items that are above this current rmap:
+        * because there were no VM_MERGEABLE vmas with such addresses.
+        */
+       remove_trailing_rmap_items(slot, ksm_scan.rmap_item->link.next);
+
+       spin_lock(&ksm_mmlist_lock);
+       ksm_scan.mm_slot = list_entry(slot->mm_list.next,
+                                               struct mm_slot, mm_list);
+       if (ksm_scan.address == 0) {
+               /*
+                * We've completed a full scan of all vmas, holding mmap_sem
+                * throughout, and found no VM_MERGEABLE: so do the same as
+                * __ksm_exit does to remove this mm from all our lists now.
+                * This applies either when cleaning up after __ksm_exit
+                * (but beware: we can reach here even before __ksm_exit),
+                * or when all VM_MERGEABLE areas have been unmapped (and
+                * mmap_sem then protects against race with MADV_MERGEABLE).
+                */
+               hlist_del(&slot->link);
+               list_del(&slot->mm_list);
+               spin_unlock(&ksm_mmlist_lock);
+
+               free_mm_slot(slot);
+               clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+               up_read(&mm->mmap_sem);
+               mmdrop(mm);
+       } else {
+               spin_unlock(&ksm_mmlist_lock);
+               up_read(&mm->mmap_sem);
+       }
+
+       /* Repeat until we've completed scanning the whole list */
+       slot = ksm_scan.mm_slot;
+       if (slot != &ksm_mm_head)
+               goto next_mm;
+
+       ksm_scan.seqnr++;
+       return NULL;
+}
+
+/**
+ * ksm_do_scan  - the ksm scanner main worker function.
+ * @scan_npages - number of pages we want to scan before we return.
+ */
+static void ksm_do_scan(unsigned int scan_npages)
+{
+       struct rmap_item *rmap_item;
+       struct page *page;
+
+       while (scan_npages--) {
+               cond_resched();
+               rmap_item = scan_get_next_rmap_item(&page);
+               if (!rmap_item)
+                       return;
+               if (!PageKsm(page) || !in_stable_tree(rmap_item))
+                       cmp_and_merge_page(page, rmap_item);
+               else if (page_mapcount(page) == 1) {
+                       /*
+                        * Replace now-unshared ksm page by ordinary page.
+                        */
+                       break_cow(rmap_item->mm, rmap_item->address);
+                       remove_rmap_item_from_tree(rmap_item);
+                       rmap_item->oldchecksum = calc_checksum(page);
+               }
+               put_page(page);
+       }
+}
+
+static int ksmd_should_run(void)
+{
+       return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_list);
+}
+
+static int ksm_scan_thread(void *nothing)
+{
+       set_user_nice(current, 5);
+
+       while (!kthread_should_stop()) {
+               mutex_lock(&ksm_thread_mutex);
+               if (ksmd_should_run())
+                       ksm_do_scan(ksm_thread_pages_to_scan);
+               mutex_unlock(&ksm_thread_mutex);
+
+               if (ksmd_should_run()) {
+                       schedule_timeout_interruptible(
+                               msecs_to_jiffies(ksm_thread_sleep_millisecs));
+               } else {
+                       wait_event_interruptible(ksm_thread_wait,
+                               ksmd_should_run() || kthread_should_stop());
+               }
+       }
+       return 0;
+}
+
+int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
+               unsigned long end, int advice, unsigned long *vm_flags)
+{
+       struct mm_struct *mm = vma->vm_mm;
+       int err;
+
+       switch (advice) {
+       case MADV_MERGEABLE:
+               /*
+                * Be somewhat over-protective for now!
+                */
+               if (*vm_flags & (VM_MERGEABLE | VM_SHARED  | VM_MAYSHARE   |
+                                VM_PFNMAP    | VM_IO      | VM_DONTEXPAND |
+                                VM_RESERVED  | VM_HUGETLB | VM_INSERTPAGE |
+                                VM_MIXEDMAP  | VM_SAO))
+                       return 0;               /* just ignore the advice */
+
+               if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
+                       err = __ksm_enter(mm);
+                       if (err)
+                               return err;
+               }
+
+               *vm_flags |= VM_MERGEABLE;
+               break;
+
+       case MADV_UNMERGEABLE:
+               if (!(*vm_flags & VM_MERGEABLE))
+                       return 0;               /* just ignore the advice */
+
+               if (vma->anon_vma) {
+                       err = unmerge_ksm_pages(vma, start, end);
+                       if (err)
+                               return err;
+               }
+
+               *vm_flags &= ~VM_MERGEABLE;
+               break;
+       }
+
+       return 0;
+}
+
+int __ksm_enter(struct mm_struct *mm)
+{
+       struct mm_slot *mm_slot;
+       int needs_wakeup;
+
+       mm_slot = alloc_mm_slot();
+       if (!mm_slot)
+               return -ENOMEM;
+
+       /* Check ksm_run too?  Would need tighter locking */
+       needs_wakeup = list_empty(&ksm_mm_head.mm_list);
+
+       spin_lock(&ksm_mmlist_lock);
+       insert_to_mm_slots_hash(mm, mm_slot);
+       /*
+        * Insert just behind the scanning cursor, to let the area settle
+        * down a little; when fork is followed by immediate exec, we don't
+        * want ksmd to waste time setting up and tearing down an rmap_list.
+        */
+       list_add_tail(&mm_slot->mm_list, &ksm_scan.mm_slot->mm_list);
+       spin_unlock(&ksm_mmlist_lock);
+
+       set_bit(MMF_VM_MERGEABLE, &mm->flags);
+       atomic_inc(&mm->mm_count);
+
+       if (needs_wakeup)
+               wake_up_interruptible(&ksm_thread_wait);
+
+       return 0;
+}
+
+void __ksm_exit(struct mm_struct *mm)
+{
+       struct mm_slot *mm_slot;
+       int easy_to_free = 0;
+
+       /*
+        * This process is exiting: if it's straightforward (as is the
+        * case when ksmd was never running), free mm_slot immediately.
+        * But if it's at the cursor or has rmap_items linked to it, use
+        * mmap_sem to synchronize with any break_cows before pagetables
+        * are freed, and leave the mm_slot on the list for ksmd to free.
+        * Beware: ksm may already have noticed it exiting and freed the slot.
+        */
+
+       spin_lock(&ksm_mmlist_lock);
+       mm_slot = get_mm_slot(mm);
+       if (mm_slot && ksm_scan.mm_slot != mm_slot) {
+               if (list_empty(&mm_slot->rmap_list)) {
+                       hlist_del(&mm_slot->link);
+                       list_del(&mm_slot->mm_list);
+                       easy_to_free = 1;
+               } else {
+                       list_move(&mm_slot->mm_list,
+                                 &ksm_scan.mm_slot->mm_list);
+               }
+       }
+       spin_unlock(&ksm_mmlist_lock);
+
+       if (easy_to_free) {
+               free_mm_slot(mm_slot);
+               clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+               mmdrop(mm);
+       } else if (mm_slot) {
+               down_write(&mm->mmap_sem);
+               up_write(&mm->mmap_sem);
+       }
+}
+
+#ifdef CONFIG_SYSFS
+/*
+ * This all compiles without CONFIG_SYSFS, but is a waste of space.
+ */
+
+#define KSM_ATTR_RO(_name) \
+       static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
+#define KSM_ATTR(_name) \
+       static struct kobj_attribute _name##_attr = \
+               __ATTR(_name, 0644, _name##_show, _name##_store)
+
+static ssize_t sleep_millisecs_show(struct kobject *kobj,
+                                   struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%u\n", ksm_thread_sleep_millisecs);
+}
+
+static ssize_t sleep_millisecs_store(struct kobject *kobj,
+                                    struct kobj_attribute *attr,
+                                    const char *buf, size_t count)
+{
+       unsigned long msecs;
+       int err;
+
+       err = strict_strtoul(buf, 10, &msecs);
+       if (err || msecs > UINT_MAX)
+               return -EINVAL;
+
+       ksm_thread_sleep_millisecs = msecs;
+
+       return count;
+}
+KSM_ATTR(sleep_millisecs);
+
+static ssize_t pages_to_scan_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%u\n", ksm_thread_pages_to_scan);
+}
+
+static ssize_t pages_to_scan_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t count)
+{
+       int err;
+       unsigned long nr_pages;
+
+       err = strict_strtoul(buf, 10, &nr_pages);
+       if (err || nr_pages > UINT_MAX)
+               return -EINVAL;
+
+       ksm_thread_pages_to_scan = nr_pages;
+
+       return count;
+}
+KSM_ATTR(pages_to_scan);
+
+static ssize_t run_show(struct kobject *kobj, struct kobj_attribute *attr,
+                       char *buf)
+{
+       return sprintf(buf, "%u\n", ksm_run);
+}
+
+static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
+                        const char *buf, size_t count)
+{
+       int err;
+       unsigned long flags;
+
+       err = strict_strtoul(buf, 10, &flags);
+       if (err || flags > UINT_MAX)
+               return -EINVAL;
+       if (flags > KSM_RUN_UNMERGE)
+               return -EINVAL;
+
+       /*
+        * KSM_RUN_MERGE sets ksmd running, and 0 stops it running.
+        * KSM_RUN_UNMERGE stops it running and unmerges all rmap_items,
+        * breaking COW to free the unswappable pages_shared (but leaves
+        * mm_slots on the list for when ksmd may be set running again).
+        */
+
+       mutex_lock(&ksm_thread_mutex);
+       if (ksm_run != flags) {
+               ksm_run = flags;
+               if (flags & KSM_RUN_UNMERGE) {
+                       current->flags |= PF_OOM_ORIGIN;
+                       err = unmerge_and_remove_all_rmap_items();
+                       current->flags &= ~PF_OOM_ORIGIN;
+                       if (err) {
+                               ksm_run = KSM_RUN_STOP;
+                               count = err;
+                       }
+               }
+       }
+       mutex_unlock(&ksm_thread_mutex);
+
+       if (flags & KSM_RUN_MERGE)
+               wake_up_interruptible(&ksm_thread_wait);
+
+       return count;
+}
+KSM_ATTR(run);
+
+static ssize_t max_kernel_pages_store(struct kobject *kobj,
+                                     struct kobj_attribute *attr,
+                                     const char *buf, size_t count)
+{
+       int err;
+       unsigned long nr_pages;
+
+       err = strict_strtoul(buf, 10, &nr_pages);
+       if (err)
+               return -EINVAL;
+
+       ksm_max_kernel_pages = nr_pages;
+
+       return count;
+}
+
+static ssize_t max_kernel_pages_show(struct kobject *kobj,
+                                    struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%lu\n", ksm_max_kernel_pages);
+}
+KSM_ATTR(max_kernel_pages);
+
+static ssize_t pages_shared_show(struct kobject *kobj,
+                                struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%lu\n", ksm_pages_shared);
+}
+KSM_ATTR_RO(pages_shared);
+
+static ssize_t pages_sharing_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%lu\n", ksm_pages_sharing);
+}
+KSM_ATTR_RO(pages_sharing);
+
+static ssize_t pages_unshared_show(struct kobject *kobj,
+                                  struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%lu\n", ksm_pages_unshared);
+}
+KSM_ATTR_RO(pages_unshared);
+
+static ssize_t pages_volatile_show(struct kobject *kobj,
+                                  struct kobj_attribute *attr, char *buf)
+{
+       long ksm_pages_volatile;
+
+       ksm_pages_volatile = ksm_rmap_items - ksm_pages_shared
+                               - ksm_pages_sharing - ksm_pages_unshared;
+       /*
+        * It was not worth any locking to calculate that statistic,
+        * but it might therefore sometimes be negative: conceal that.
+        */
+       if (ksm_pages_volatile < 0)
+               ksm_pages_volatile = 0;
+       return sprintf(buf, "%ld\n", ksm_pages_volatile);
+}
+KSM_ATTR_RO(pages_volatile);
+
+static ssize_t full_scans_show(struct kobject *kobj,
+                              struct kobj_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%lu\n", ksm_scan.seqnr);
+}
+KSM_ATTR_RO(full_scans);
+
+static struct attribute *ksm_attrs[] = {
+       &sleep_millisecs_attr.attr,
+       &pages_to_scan_attr.attr,
+       &run_attr.attr,
+       &max_kernel_pages_attr.attr,
+       &pages_shared_attr.attr,
+       &pages_sharing_attr.attr,
+       &pages_unshared_attr.attr,
+       &pages_volatile_attr.attr,
+       &full_scans_attr.attr,
+       NULL,
+};
+
+static struct attribute_group ksm_attr_group = {
+       .attrs = ksm_attrs,
+       .name = "ksm",
+};
+#endif /* CONFIG_SYSFS */
+
+static int __init ksm_init(void)
+{
+       struct task_struct *ksm_thread;
+       int err;
+
+       err = ksm_slab_init();
+       if (err)
+               goto out;
+
+       err = mm_slots_hash_init();
+       if (err)
+               goto out_free1;
+
+       ksm_thread = kthread_run(ksm_scan_thread, NULL, "ksmd");
+       if (IS_ERR(ksm_thread)) {
+               printk(KERN_ERR "ksm: creating kthread failed\n");
+               err = PTR_ERR(ksm_thread);
+               goto out_free2;
+       }
+
+#ifdef CONFIG_SYSFS
+       err = sysfs_create_group(mm_kobj, &ksm_attr_group);
+       if (err) {
+               printk(KERN_ERR "ksm: register sysfs failed\n");
+               kthread_stop(ksm_thread);
+               goto out_free2;
+       }
+#endif /* CONFIG_SYSFS */
+
+       return 0;
+
+out_free2:
+       mm_slots_hash_free();
+out_free1:
+       ksm_slab_free();
+out:
+       return err;
+}
+module_init(ksm_init)
index 76eb419..d9ae206 100644 (file)
@@ -11,6 +11,7 @@
 #include <linux/mempolicy.h>
 #include <linux/hugetlb.h>
 #include <linux/sched.h>
+#include <linux/ksm.h>
 
 /*
  * Any behaviour which results in changes to the vma->vm_flags needs to
@@ -41,7 +42,7 @@ static long madvise_behavior(struct vm_area_struct * vma,
        struct mm_struct * mm = vma->vm_mm;
        int error = 0;
        pgoff_t pgoff;
-       int new_flags = vma->vm_flags;
+       unsigned long new_flags = vma->vm_flags;
 
        switch (behavior) {
        case MADV_NORMAL:
@@ -57,8 +58,18 @@ static long madvise_behavior(struct vm_area_struct * vma,
                new_flags |= VM_DONTCOPY;
                break;
        case MADV_DOFORK:
+               if (vma->vm_flags & VM_IO) {
+                       error = -EINVAL;
+                       goto out;
+               }
                new_flags &= ~VM_DONTCOPY;
                break;
+       case MADV_MERGEABLE:
+       case MADV_UNMERGEABLE:
+               error = ksm_madvise(vma, start, end, behavior, &new_flags);
+               if (error)
+                       goto out;
+               break;
        }
 
        if (new_flags == vma->vm_flags) {
@@ -211,37 +222,16 @@ static long
 madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
                unsigned long start, unsigned long end, int behavior)
 {
-       long error;
-
        switch (behavior) {
-       case MADV_DOFORK:
-               if (vma->vm_flags & VM_IO) {
-                       error = -EINVAL;
-                       break;
-               }
-       case MADV_DONTFORK:
-       case MADV_NORMAL:
-       case MADV_SEQUENTIAL:
-       case MADV_RANDOM:
-               error = madvise_behavior(vma, prev, start, end, behavior);
-               break;
        case MADV_REMOVE:
-               error = madvise_remove(vma, prev, start, end);
-               break;
-
+               return madvise_remove(vma, prev, start, end);
        case MADV_WILLNEED:
-               error = madvise_willneed(vma, prev, start, end);
-               break;
-
+               return madvise_willneed(vma, prev, start, end);
        case MADV_DONTNEED:
-               error = madvise_dontneed(vma, prev, start, end);
-               break;
-
+               return madvise_dontneed(vma, prev, start, end);
        default:
-               BUG();
-               break;
+               return madvise_behavior(vma, prev, start, end, behavior);
        }
-       return error;
 }
 
 static int
@@ -256,12 +246,17 @@ madvise_behavior_valid(int behavior)
        case MADV_REMOVE:
        case MADV_WILLNEED:
        case MADV_DONTNEED:
+#ifdef CONFIG_KSM
+       case MADV_MERGEABLE:
+       case MADV_UNMERGEABLE:
+#endif
                return 1;
 
        default:
                return 0;
        }
 }
+
 /*
  * The madvise(2) system call.
  *
@@ -286,6 +281,12 @@ madvise_behavior_valid(int behavior)
  *             so the kernel can free resources associated with it.
  *  MADV_REMOVE - the application wants to free up the given range of
  *             pages and associated backing store.
+ *  MADV_DONTFORK - omit this area from child's address space when forking:
+ *             typically, to avoid COWing pages pinned by get_user_pages().
+ *  MADV_DOFORK - cancel MADV_DONTFORK: no longer omit this area when forking.
+ *  MADV_MERGEABLE - the application recommends that KSM try to merge pages in
+ *             this area with pages of identical content from other such areas.
+ *  MADV_UNMERGEABLE- cancel MADV_MERGEABLE: no longer merge pages with others.
  *
  * return values:
  *  zero    - success
index fd4529d..9b10d87 100644 (file)
@@ -648,7 +648,7 @@ unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
        int nid = z->zone_pgdat->node_id;
        int zid = zone_idx(z);
        struct mem_cgroup_per_zone *mz;
-       int lru = LRU_FILE * !!file + !!active;
+       int lru = LRU_FILE * file + active;
        int ret;
 
        BUG_ON(!mem_cont);
index e8f63d9..b1443ac 100644 (file)
@@ -45,6 +45,7 @@
 #include <linux/swap.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/module.h>
 #include <linux/delayacct.h>
@@ -107,6 +108,18 @@ static int __init disable_randmaps(char *s)
 }
 __setup("norandmaps", disable_randmaps);
 
+unsigned long zero_pfn __read_mostly;
+unsigned long highest_memmap_pfn __read_mostly;
+
+/*
+ * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init()
+ */
+static int __init init_zero_pfn(void)
+{
+       zero_pfn = page_to_pfn(ZERO_PAGE(0));
+       return 0;
+}
+core_initcall(init_zero_pfn);
 
 /*
  * If a p?d_bad entry is found while walking page tables, report
@@ -443,6 +456,20 @@ static inline int is_cow_mapping(unsigned int flags)
        return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
 }
 
+#ifndef is_zero_pfn
+static inline int is_zero_pfn(unsigned long pfn)
+{
+       return pfn == zero_pfn;
+}
+#endif
+
+#ifndef my_zero_pfn
+static inline unsigned long my_zero_pfn(unsigned long addr)
+{
+       return zero_pfn;
+}
+#endif
+
 /*
  * vm_normal_page -- This function gets the "struct page" associated with a pte.
  *
@@ -498,7 +525,9 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
        if (HAVE_PTE_SPECIAL) {
                if (likely(!pte_special(pte)))
                        goto check_pfn;
-               if (!(vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)))
+               if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
+                       return NULL;
+               if (!is_zero_pfn(pfn))
                        print_bad_pte(vma, addr, pte, NULL);
                return NULL;
        }
@@ -520,6 +549,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
                }
        }
 
+       if (is_zero_pfn(pfn))
+               return NULL;
 check_pfn:
        if (unlikely(pfn > highest_memmap_pfn)) {
                print_bad_pte(vma, addr, pte, NULL);
@@ -597,8 +628,8 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
        page = vm_normal_page(vma, addr, pte);
        if (page) {
                get_page(page);
-               page_dup_rmap(page, vma, addr);
-               rss[!!PageAnon(page)]++;
+               page_dup_rmap(page);
+               rss[PageAnon(page)]++;
        }
 
 out_set_pte:
@@ -1143,9 +1174,14 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address,
                goto no_page;
        if ((flags & FOLL_WRITE) && !pte_write(pte))
                goto unlock;
+
        page = vm_normal_page(vma, address, pte);
-       if (unlikely(!page))
-               goto bad_page;
+       if (unlikely(!page)) {
+               if ((flags & FOLL_DUMP) ||
+                   !is_zero_pfn(pte_pfn(pte)))
+                       goto bad_page;
+               page = pte_page(pte);
+       }
 
        if (flags & FOLL_GET)
                get_page(page);
@@ -1173,65 +1209,46 @@ no_page:
        pte_unmap_unlock(ptep, ptl);
        if (!pte_none(pte))
                return page;
-       /* Fall through to ZERO_PAGE handling */
+
 no_page_table:
        /*
         * When core dumping an enormous anonymous area that nobody
-        * has touched so far, we don't want to allocate page tables.
+        * has touched so far, we don't want to allocate unnecessary pages or
+        * page tables.  Return error instead of NULL to skip handle_mm_fault,
+        * then get_dump_page() will return NULL to leave a hole in the dump.
+        * But we can only make this optimization where a hole would surely
+        * be zero-filled if handle_mm_fault() actually did handle it.
         */
-       if (flags & FOLL_ANON) {
-               page = ZERO_PAGE(0);
-               if (flags & FOLL_GET)
-                       get_page(page);
-               BUG_ON(flags & FOLL_WRITE);
-       }
+       if ((flags & FOLL_DUMP) &&
+           (!vma->vm_ops || !vma->vm_ops->fault))
+               return ERR_PTR(-EFAULT);
        return page;
 }
 
-/* Can we do the FOLL_ANON optimization? */
-static inline int use_zero_page(struct vm_area_struct *vma)
-{
-       /*
-        * We don't want to optimize FOLL_ANON for make_pages_present()
-        * when it tries to page in a VM_LOCKED region. As to VM_SHARED,
-        * we want to get the page from the page tables to make sure
-        * that we serialize and update with any other user of that
-        * mapping.
-        */
-       if (vma->vm_flags & (VM_LOCKED | VM_SHARED))
-               return 0;
-       /*
-        * And if we have a fault routine, it's not an anonymous region.
-        */
-       return !vma->vm_ops || !vma->vm_ops->fault;
-}
-
-
-
 int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-                    unsigned long start, int nr_pages, int flags,
+                    unsigned long start, int nr_pages, unsigned int gup_flags,
                     struct page **pages, struct vm_area_struct **vmas)
 {
        int i;
-       unsigned int vm_flags = 0;
-       int write = !!(flags & GUP_FLAGS_WRITE);
-       int force = !!(flags & GUP_FLAGS_FORCE);
-       int ignore = !!(flags & GUP_FLAGS_IGNORE_VMA_PERMISSIONS);
-       int ignore_sigkill = !!(flags & GUP_FLAGS_IGNORE_SIGKILL);
+       unsigned long vm_flags;
 
        if (nr_pages <= 0)
                return 0;
+
+       VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET));
+
        /* 
         * Require read or write permissions.
-        * If 'force' is set, we only require the "MAY" flags.
+        * If FOLL_FORCE is set, we only require the "MAY" flags.
         */
-       vm_flags  = write ? (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD);
-       vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
+       vm_flags  = (gup_flags & FOLL_WRITE) ?
+                       (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD);
+       vm_flags &= (gup_flags & FOLL_FORCE) ?
+                       (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
        i = 0;
 
        do {
                struct vm_area_struct *vma;
-               unsigned int foll_flags;
 
                vma = find_extend_vma(mm, start);
                if (!vma && in_gate_area(tsk, start)) {
@@ -1243,7 +1260,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        pte_t *pte;
 
                        /* user gate pages are read-only */
-                       if (!ignore && write)
+                       if (gup_flags & FOLL_WRITE)
                                return i ? : -EFAULT;
                        if (pg > TASK_SIZE)
                                pgd = pgd_offset_k(pg);
@@ -1277,38 +1294,26 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 
                if (!vma ||
                    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
-                   (!ignore && !(vm_flags & vma->vm_flags)))
+                   !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;
 
                if (is_vm_hugetlb_page(vma)) {
                        i = follow_hugetlb_page(mm, vma, pages, vmas,
-                                               &start, &nr_pages, i, write);
+                                       &start, &nr_pages, i, gup_flags);
                        continue;
                }
 
-               foll_flags = FOLL_TOUCH;
-               if (pages)
-                       foll_flags |= FOLL_GET;
-               if (!write && use_zero_page(vma))
-                       foll_flags |= FOLL_ANON;
-
                do {
                        struct page *page;
+                       unsigned int foll_flags = gup_flags;
 
                        /*
                         * If we have a pending SIGKILL, don't keep faulting
-                        * pages and potentially allocating memory, unless
-                        * current is handling munlock--e.g., on exit. In
-                        * that case, we are not allocating memory.  Rather,
-                        * we're only unlocking already resident/mapped pages.
+                        * pages and potentially allocating memory.
                         */
-                       if (unlikely(!ignore_sigkill &&
-                                       fatal_signal_pending(current)))
+                       if (unlikely(fatal_signal_pending(current)))
                                return i ? i : -ERESTARTSYS;
 
-                       if (write)
-                               foll_flags |= FOLL_WRITE;
-
                        cond_resched();
                        while (!(page = follow_page(vma, start, foll_flags))) {
                                int ret;
@@ -1419,18 +1424,47 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                unsigned long start, int nr_pages, int write, int force,
                struct page **pages, struct vm_area_struct **vmas)
 {
-       int flags = 0;
+       int flags = FOLL_TOUCH;
 
+       if (pages)
+               flags |= FOLL_GET;
        if (write)
-               flags |= GUP_FLAGS_WRITE;
+               flags |= FOLL_WRITE;
        if (force)
-               flags |= GUP_FLAGS_FORCE;
+               flags |= FOLL_FORCE;
 
        return __get_user_pages(tsk, mm, start, nr_pages, flags, pages, vmas);
 }
-
 EXPORT_SYMBOL(get_user_pages);
 
+/**
+ * get_dump_page() - pin user page in memory while writing it to core dump
+ * @addr: user address
+ *
+ * Returns struct page pointer of user page pinned for dump,
+ * to be freed afterwards by page_cache_release() or put_page().
+ *
+ * Returns NULL on any kind of failure - a hole must then be inserted into
+ * the corefile, to preserve alignment with its headers; and also returns
+ * NULL wherever the ZERO_PAGE, or an anonymous pte_none, has been found -
+ * allowing a hole to be left in the corefile to save diskspace.
+ *
+ * Called without mmap_sem, but after all other threads have been killed.
+ */
+#ifdef CONFIG_ELF_CORE
+struct page *get_dump_page(unsigned long addr)
+{
+       struct vm_area_struct *vma;
+       struct page *page;
+
+       if (__get_user_pages(current, current->mm, addr, 1,
+                       FOLL_FORCE | FOLL_DUMP | FOLL_GET, &page, &vma) < 1)
+               return NULL;
+       flush_cache_page(vma, addr, page_to_pfn(page));
+       return page;
+}
+#endif /* CONFIG_ELF_CORE */
+
 pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr,
                        spinlock_t **ptl)
 {
@@ -1608,7 +1642,8 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
         * If we don't have pte special, then we have to use the pfn_valid()
         * based VM_MIXEDMAP scheme (see vm_normal_page), and thus we *must*
         * refcount the page if pfn_valid is true (hence insert_page rather
-        * than insert_pfn).
+        * than insert_pfn).  If a zero_pfn were inserted into a VM_MIXEDMAP
+        * without pte special, it would there be refcounted as a normal page.
         */
        if (!HAVE_PTE_SPECIAL && pfn_valid(pfn)) {
                struct page *page;
@@ -1974,7 +2009,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
         * Take out anonymous pages first, anonymous shared vmas are
         * not dirty accountable.
         */
-       if (PageAnon(old_page)) {
+       if (PageAnon(old_page) && !PageKsm(old_page)) {
                if (!trylock_page(old_page)) {
                        page_cache_get(old_page);
                        pte_unmap_unlock(page_table, ptl);
@@ -2075,10 +2110,19 @@ gotten:
 
        if (unlikely(anon_vma_prepare(vma)))
                goto oom;
-       VM_BUG_ON(old_page == ZERO_PAGE(0));
-       new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
-       if (!new_page)
-               goto oom;
+
+       if (is_zero_pfn(pte_pfn(orig_pte))) {
+               new_page = alloc_zeroed_user_highpage_movable(vma, address);
+               if (!new_page)
+                       goto oom;
+       } else {
+               new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
+               if (!new_page)
+                       goto oom;
+               cow_user_page(new_page, old_page, address, vma);
+       }
+       __SetPageUptodate(new_page);
+
        /*
         * Don't let another task, with possibly unlocked vma,
         * keep the mlocked page.
@@ -2088,8 +2132,6 @@ gotten:
                clear_page_mlock(old_page);
                unlock_page(old_page);
        }
-       cow_user_page(new_page, old_page, address, vma);
-       __SetPageUptodate(new_page);
 
        if (mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))
                goto oom_free_new;
@@ -2115,9 +2157,14 @@ gotten:
                 * seen in the presence of one thread doing SMC and another
                 * thread doing COW.
                 */
-               ptep_clear_flush_notify(vma, address, page_table);
+               ptep_clear_flush(vma, address, page_table);
                page_add_new_anon_rmap(new_page, vma, address);
-               set_pte_at(mm, address, page_table, entry);
+               /*
+                * We call the notify macro here because, when using secondary
+                * mmu page tables (such as kvm shadow page tables), we want the
+                * new page to be mapped directly into the secondary page table.
+                */
+               set_pte_at_notify(mm, address, page_table, entry);
                update_mmu_cache(vma, address, entry);
                if (old_page) {
                        /*
@@ -2625,6 +2672,16 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
        spinlock_t *ptl;
        pte_t entry;
 
+       if (!(flags & FAULT_FLAG_WRITE)) {
+               entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
+                                               vma->vm_page_prot));
+               ptl = pte_lockptr(mm, pmd);
+               spin_lock(ptl);
+               if (!pte_none(*page_table))
+                       goto unlock;
+               goto setpte;
+       }
+
        /* Allocate our own private page. */
        pte_unmap(page_table);
 
@@ -2639,13 +2696,16 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                goto oom_free_page;
 
        entry = mk_pte(page, vma->vm_page_prot);
-       entry = maybe_mkwrite(pte_mkdirty(entry), vma);
+       if (vma->vm_flags & VM_WRITE)
+               entry = pte_mkwrite(pte_mkdirty(entry));
 
        page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
        if (!pte_none(*page_table))
                goto release;
+
        inc_mm_counter(mm, anon_rss);
        page_add_new_anon_rmap(page, vma, address);
+setpte:
        set_pte_at(mm, address, page_table, entry);
 
        /* No need to invalidate - it was non-present before */
index e4412a6..821dee5 100644 (file)
@@ -339,8 +339,11 @@ EXPORT_SYMBOL_GPL(__remove_pages);
 
 void online_page(struct page *page)
 {
+       unsigned long pfn = page_to_pfn(page);
+
        totalram_pages++;
-       num_physpages++;
+       if (pfn >= num_physpages)
+               num_physpages = pfn + 1;
 
 #ifdef CONFIG_HIGHMEM
        if (PageHighMem(page))
@@ -410,7 +413,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
        if (!populated_zone(zone))
                need_zonelists_rebuild = 1;
 
-       ret = walk_memory_resource(pfn, nr_pages, &onlined_pages,
+       ret = walk_system_ram_range(pfn, nr_pages, &onlined_pages,
                online_pages_range);
        if (ret) {
                printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
@@ -422,6 +425,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
        zone->present_pages += onlined_pages;
        zone->zone_pgdat->node_present_pages += onlined_pages;
 
+       zone_pcp_update(zone);
        setup_per_zone_wmarks();
        calculate_zone_inactive_ratio(zone);
        if (onlined_pages) {
@@ -701,7 +705,7 @@ offline_isolated_pages_cb(unsigned long start, unsigned long nr_pages,
 static void
 offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)
 {
-       walk_memory_resource(start_pfn, end_pfn - start_pfn, NULL,
+       walk_system_ram_range(start_pfn, end_pfn - start_pfn, NULL,
                                offline_isolated_pages_cb);
 }
 
@@ -727,7 +731,7 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
        long offlined = 0;
        int ret;
 
-       ret = walk_memory_resource(start_pfn, end_pfn - start_pfn, &offlined,
+       ret = walk_system_ram_range(start_pfn, end_pfn - start_pfn, &offlined,
                        check_pages_isolated_cb);
        if (ret < 0)
                offlined = (long)ret;
@@ -831,7 +835,6 @@ repeat:
        zone->present_pages -= offlined_pages;
        zone->zone_pgdat->node_present_pages -= offlined_pages;
        totalram_pages -= offlined_pages;
-       num_physpages -= offlined_pages;
 
        setup_per_zone_wmarks();
        calculate_zone_inactive_ratio(zone);
index 32e75d4..1a3bc3d 100644 (file)
@@ -308,13 +308,6 @@ void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
 }
 EXPORT_SYMBOL(mempool_kmalloc);
 
-void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data)
-{
-       size_t size = (size_t)pool_data;
-       return kzalloc(size, gfp_mask);
-}
-EXPORT_SYMBOL(mempool_kzalloc);
-
 void mempool_kfree(void *element, void *pool_data)
 {
        kfree(element);
index 939888f..16052e8 100644 (file)
@@ -67,6 +67,8 @@ int putback_lru_pages(struct list_head *l)
 
        list_for_each_entry_safe(page, page2, l, lru) {
                list_del(&page->lru);
+               dec_zone_page_state(page, NR_ISOLATED_ANON +
+                               page_is_file_cache(page));
                putback_lru_page(page);
                count++;
        }
@@ -147,7 +149,7 @@ out:
 static void remove_file_migration_ptes(struct page *old, struct page *new)
 {
        struct vm_area_struct *vma;
-       struct address_space *mapping = page_mapping(new);
+       struct address_space *mapping = new->mapping;
        struct prio_tree_iter iter;
        pgoff_t pgoff = new->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
 
@@ -270,7 +272,7 @@ static int migrate_page_move_mapping(struct address_space *mapping,
        pslot = radix_tree_lookup_slot(&mapping->page_tree,
                                        page_index(page));
 
-       expected_count = 2 + !!page_has_private(page);
+       expected_count = 2 + page_has_private(page);
        if (page_count(page) != expected_count ||
                        (struct page *)radix_tree_deref_slot(pslot) != page) {
                spin_unlock_irq(&mapping->tree_lock);
@@ -312,7 +314,10 @@ static int migrate_page_move_mapping(struct address_space *mapping,
         */
        __dec_zone_page_state(page, NR_FILE_PAGES);
        __inc_zone_page_state(newpage, NR_FILE_PAGES);
-
+       if (PageSwapBacked(page)) {
+               __dec_zone_page_state(page, NR_SHMEM);
+               __inc_zone_page_state(newpage, NR_SHMEM);
+       }
        spin_unlock_irq(&mapping->tree_lock);
 
        return 0;
@@ -664,13 +669,15 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
                         *    needs to be effective.
                         */
                        try_to_free_buffers(page);
+                       goto rcu_unlock;
                }
-               goto rcu_unlock;
+               goto skip_unmap;
        }
 
        /* Establish migration ptes or remove ptes */
        try_to_unmap(page, 1);
 
+skip_unmap:
        if (!page_mapped(page))
                rc = move_to_new_page(newpage, page);
 
@@ -693,6 +700,8 @@ unlock:
                 * restored.
                 */
                list_del(&page->lru);
+               dec_zone_page_state(page, NR_ISOLATED_ANON +
+                               page_is_file_cache(page));
                putback_lru_page(page);
        }
 
@@ -737,6 +746,13 @@ int migrate_pages(struct list_head *from,
        struct page *page2;
        int swapwrite = current->flags & PF_SWAPWRITE;
        int rc;
+       unsigned long flags;
+
+       local_irq_save(flags);
+       list_for_each_entry(page, from, lru)
+               __inc_zone_page_state(page, NR_ISOLATED_ANON +
+                               page_is_file_cache(page));
+       local_irq_restore(flags);
 
        if (!swapwrite)
                current->flags |= PF_SWAPWRITE;
index 45eb650..bd6f0e4 100644 (file)
@@ -139,49 +139,36 @@ static void munlock_vma_page(struct page *page)
 }
 
 /**
- * __mlock_vma_pages_range() -  mlock/munlock a range of pages in the vma.
+ * __mlock_vma_pages_range() -  mlock a range of pages in the vma.
  * @vma:   target vma
  * @start: start address
  * @end:   end address
- * @mlock: 0 indicate munlock, otherwise mlock.
  *
- * If @mlock == 0, unlock an mlocked range;
- * else mlock the range of pages.  This takes care of making the pages present ,
- * too.
+ * This takes care of making the pages present too.
  *
  * return 0 on success, negative error code on error.
  *
  * vma->vm_mm->mmap_sem must be held for at least read.
  */
 static long __mlock_vma_pages_range(struct vm_area_struct *vma,
-                                  unsigned long start, unsigned long end,
-                                  int mlock)
+                                   unsigned long start, unsigned long end)
 {
        struct mm_struct *mm = vma->vm_mm;
        unsigned long addr = start;
        struct page *pages[16]; /* 16 gives a reasonable batch */
        int nr_pages = (end - start) / PAGE_SIZE;
        int ret = 0;
-       int gup_flags = 0;
+       int gup_flags;
 
        VM_BUG_ON(start & ~PAGE_MASK);
        VM_BUG_ON(end   & ~PAGE_MASK);
        VM_BUG_ON(start < vma->vm_start);
        VM_BUG_ON(end   > vma->vm_end);
-       VM_BUG_ON((!rwsem_is_locked(&mm->mmap_sem)) &&
-                 (atomic_read(&mm->mm_users) != 0));
-
-       /*
-        * mlock:   don't page populate if vma has PROT_NONE permission.
-        * munlock: always do munlock although the vma has PROT_NONE
-        *          permission, or SIGKILL is pending.
-        */
-       if (!mlock)
-               gup_flags |= GUP_FLAGS_IGNORE_VMA_PERMISSIONS |
-                            GUP_FLAGS_IGNORE_SIGKILL;
+       VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem));
 
+       gup_flags = FOLL_TOUCH | FOLL_GET;
        if (vma->vm_flags & VM_WRITE)
-               gup_flags |= GUP_FLAGS_WRITE;
+               gup_flags |= FOLL_WRITE;
 
        while (nr_pages > 0) {
                int i;
@@ -201,51 +188,45 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
                 * This can happen for, e.g., VM_NONLINEAR regions before
                 * a page has been allocated and mapped at a given offset,
                 * or for addresses that map beyond end of a file.
-                * We'll mlock the the pages if/when they get faulted in.
+                * We'll mlock the pages if/when they get faulted in.
                 */
                if (ret < 0)
                        break;
-               if (ret == 0) {
-                       /*
-                        * We know the vma is there, so the only time
-                        * we cannot get a single page should be an
-                        * error (ret < 0) case.
-                        */
-                       WARN_ON(1);
-                       break;
-               }
 
                lru_add_drain();        /* push cached pages to LRU */
 
                for (i = 0; i < ret; i++) {
                        struct page *page = pages[i];
 
-                       lock_page(page);
-                       /*
-                        * Because we lock page here and migration is blocked
-                        * by the elevated reference, we need only check for
-                        * page truncation (file-cache only).
-                        */
                        if (page->mapping) {
-                               if (mlock)
+                               /*
+                                * That preliminary check is mainly to avoid
+                                * the pointless overhead of lock_page on the
+                                * ZERO_PAGE: which might bounce very badly if
+                                * there is contention.  However, we're still
+                                * dirtying its cacheline with get/put_page:
+                                * we'll add another __get_user_pages flag to
+                                * avoid it if that case turns out to matter.
+                                */
+                               lock_page(page);
+                               /*
+                                * Because we lock page here and migration is
+                                * blocked by the elevated reference, we need
+                                * only check for file-cache page truncation.
+                                */
+                               if (page->mapping)
                                        mlock_vma_page(page);
-                               else
-                                       munlock_vma_page(page);
+                               unlock_page(page);
                        }
-                       unlock_page(page);
-                       put_page(page);         /* ref from get_user_pages() */
-
-                       /*
-                        * here we assume that get_user_pages() has given us
-                        * a list of virtually contiguous pages.
-                        */
-                       addr += PAGE_SIZE;      /* for next get_user_pages() */
-                       nr_pages--;
+                       put_page(page); /* ref from get_user_pages() */
                }
+
+               addr += ret * PAGE_SIZE;
+               nr_pages -= ret;
                ret = 0;
        }
 
-       return ret;     /* count entire vma as locked_vm */
+       return ret;     /* 0 or negative error code */
 }
 
 /*
@@ -289,7 +270,7 @@ long mlock_vma_pages_range(struct vm_area_struct *vma,
                        is_vm_hugetlb_page(vma) ||
                        vma == get_gate_vma(current))) {
 
-               __mlock_vma_pages_range(vma, start, end, 1);
+               __mlock_vma_pages_range(vma, start, end);
 
                /* Hide errors from mmap() and other callers */
                return 0;
@@ -310,7 +291,6 @@ no_mlock:
        return nr_pages;                /* error or pages NOT mlocked */
 }
 
-
 /*
  * munlock_vma_pages_range() - munlock all pages in the vma range.'
  * @vma - vma containing range to be munlock()ed.
@@ -330,10 +310,38 @@ no_mlock:
  * free them.  This will result in freeing mlocked pages.
  */
 void munlock_vma_pages_range(struct vm_area_struct *vma,
-                          unsigned long start, unsigned long end)
+                            unsigned long start, unsigned long end)
 {
+       unsigned long addr;
+
+       lru_add_drain();
        vma->vm_flags &= ~VM_LOCKED;
-       __mlock_vma_pages_range(vma, start, end, 0);
+
+       for (addr = start; addr < end; addr += PAGE_SIZE) {
+               struct page *page;
+               /*
+                * Although FOLL_DUMP is intended for get_dump_page(),
+                * it just so happens that its special treatment of the
+                * ZERO_PAGE (returning an error instead of doing get_page)
+                * suits munlock very well (and if somehow an abnormal page
+                * has sneaked into the range, we won't oops here: great).
+                */
+               page = follow_page(vma, addr, FOLL_GET | FOLL_DUMP);
+               if (page && !IS_ERR(page)) {
+                       lock_page(page);
+                       /*
+                        * Like in __mlock_vma_pages_range(),
+                        * because we lock page here and migration is
+                        * blocked by the elevated reference, we need
+                        * only check for file-cache page truncation.
+                        */
+                       if (page->mapping)
+                               munlock_vma_page(page);
+                       unlock_page(page);
+                       put_page(page);
+               }
+               cond_resched();
+       }
 }
 
 /*
@@ -400,18 +408,14 @@ success:
         * It's okay if try_to_unmap_one unmaps a page just after we
         * set VM_LOCKED, __mlock_vma_pages_range will bring it back.
         */
-       vma->vm_flags = newflags;
 
        if (lock) {
-               ret = __mlock_vma_pages_range(vma, start, end, 1);
-
-               if (ret > 0) {
-                       mm->locked_vm -= ret;
-                       ret = 0;
-               } else
-                       ret = __mlock_posix_error_return(ret); /* translate if needed */
+               vma->vm_flags = newflags;
+               ret = __mlock_vma_pages_range(vma, start, end);
+               if (ret < 0)
+                       ret = __mlock_posix_error_return(ret);
        } else {
-               __mlock_vma_pages_range(vma, start, end, 0);
+               munlock_vma_pages_range(vma, start, end);
        }
 
 out:
index 26892e3..21d4029 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -28,7 +28,7 @@
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
 #include <linux/mmu_notifier.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
@@ -570,9 +570,9 @@ again:                      remove_next = 1 + (end > next->vm_end);
 
        /*
         * When changing only vma->vm_end, we don't really need
-        * anon_vma lock: but is that case worth optimizing out?
+        * anon_vma lock.
         */
-       if (vma->anon_vma)
+       if (vma->anon_vma && (insert || importer || start != vma->vm_start))
                anon_vma = vma->anon_vma;
        if (anon_vma) {
                spin_lock(&anon_vma->lock);
@@ -656,9 +656,6 @@ again:                      remove_next = 1 + (end > next->vm_end);
        validate_mm(mm);
 }
 
-/* Flags that can be inherited from an existing mapping when merging */
-#define VM_MERGEABLE_FLAGS (VM_CAN_NONLINEAR)
-
 /*
  * If the vma has a ->close operation then the driver probably needs to release
  * per-vma resources, so we don't attempt to merge those.
@@ -666,7 +663,8 @@ again:                      remove_next = 1 + (end > next->vm_end);
 static inline int is_mergeable_vma(struct vm_area_struct *vma,
                        struct file *file, unsigned long vm_flags)
 {
-       if ((vma->vm_flags ^ vm_flags) & ~VM_MERGEABLE_FLAGS)
+       /* VM_CAN_NONLINEAR may get set later by f_op->mmap() */
+       if ((vma->vm_flags ^ vm_flags) & ~VM_CAN_NONLINEAR)
                return 0;
        if (vma->vm_file != file)
                return 0;
@@ -951,6 +949,24 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
        if (mm->map_count > sysctl_max_map_count)
                return -ENOMEM;
 
+       if (flags & MAP_HUGETLB) {
+               struct user_struct *user = NULL;
+               if (file)
+                       return -EINVAL;
+
+               /*
+                * VM_NORESERVE is used because the reservations will be
+                * taken when vm_ops->mmap() is called
+                * A dummy user value is used because we are not locking
+                * memory so no accounting is necessary
+                */
+               len = ALIGN(len, huge_page_size(&default_hstate));
+               file = hugetlb_file_setup(HUGETLB_ANON_FILE, len, VM_NORESERVE,
+                                               &user, HUGETLB_ANONHUGE_INODE);
+               if (IS_ERR(file))
+                       return PTR_ERR(file);
+       }
+
        /* Obtain the address to map to. we verify (or select) it and ensure
         * that it represents a valid section of the address space.
         */
@@ -965,11 +981,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
        vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
                        mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
 
-       if (flags & MAP_LOCKED) {
+       if (flags & MAP_LOCKED)
                if (!can_do_mlock())
                        return -EPERM;
-               vm_flags |= VM_LOCKED;
-       }
 
        /* mlock MCL_FUTURE? */
        if (vm_flags & VM_LOCKED) {
@@ -1195,21 +1209,21 @@ munmap_back:
                        goto unmap_and_free_vma;
                if (vm_flags & VM_EXECUTABLE)
                        added_exe_file_vma(mm);
+
+               /* Can addr have changed??
+                *
+                * Answer: Yes, several device drivers can do it in their
+                *         f_op->mmap method. -DaveM
+                */
+               addr = vma->vm_start;
+               pgoff = vma->vm_pgoff;
+               vm_flags = vma->vm_flags;
        } else if (vm_flags & VM_SHARED) {
                error = shmem_zero_setup(vma);
                if (error)
                        goto free_vma;
        }
 
-       /* Can addr have changed??
-        *
-        * Answer: Yes, several device drivers can do it in their
-        *         f_op->mmap method. -DaveM
-        */
-       addr = vma->vm_start;
-       pgoff = vma->vm_pgoff;
-       vm_flags = vma->vm_flags;
-
        if (vma_wants_writenotify(vma))
                vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
 
@@ -1220,7 +1234,7 @@ munmap_back:
        if (correct_wcount)
                atomic_inc(&inode->i_writecount);
 out:
-       perf_counter_mmap(vma);
+       perf_event_mmap(vma);
 
        mm->total_vm += len >> PAGE_SHIFT;
        vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -2111,6 +2125,7 @@ void exit_mmap(struct mm_struct *mm)
        /* Use -1 here to ensure all VMAs in the mm are unmapped */
        end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
        vm_unacct_memory(nr_accounted);
+
        free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
        tlb_finish_mmu(tlb, 0, end);
 
@@ -2308,7 +2323,7 @@ int install_special_mapping(struct mm_struct *mm,
 
        mm->total_vm += len >> PAGE_SHIFT;
 
-       perf_counter_mmap(vma);
+       perf_event_mmap(vma);
 
        return 0;
 }
diff --git a/mm/mmu_context.c b/mm/mmu_context.c
new file mode 100644 (file)
index 0000000..ded9081
--- /dev/null
@@ -0,0 +1,58 @@
+/* Copyright (C) 2009 Red Hat, Inc.
+ *
+ * See ../COPYING for licensing terms.
+ */
+
+#include <linux/mm.h>
+#include <linux/mmu_context.h>
+#include <linux/sched.h>
+
+#include <asm/mmu_context.h>
+
+/*
+ * use_mm
+ *     Makes the calling kernel thread take on the specified
+ *     mm context.
+ *     Called by the retry thread execute retries within the
+ *     iocb issuer's mm context, so that copy_from/to_user
+ *     operations work seamlessly for aio.
+ *     (Note: this routine is intended to be called only
+ *     from a kernel thread context)
+ */
+void use_mm(struct mm_struct *mm)
+{
+       struct mm_struct *active_mm;
+       struct task_struct *tsk = current;
+
+       task_lock(tsk);
+       active_mm = tsk->active_mm;
+       if (active_mm != mm) {
+               atomic_inc(&mm->mm_count);
+               tsk->active_mm = mm;
+       }
+       tsk->mm = mm;
+       switch_mm(active_mm, mm, tsk);
+       task_unlock(tsk);
+
+       if (active_mm != mm)
+               mmdrop(active_mm);
+}
+
+/*
+ * unuse_mm
+ *     Reverses the effect of use_mm, i.e. releases the
+ *     specified mm context which was earlier taken on
+ *     by the calling kernel thread
+ *     (Note: this routine is intended to be called only
+ *     from a kernel thread context)
+ */
+void unuse_mm(struct mm_struct *mm)
+{
+       struct task_struct *tsk = current;
+
+       task_lock(tsk);
+       tsk->mm = NULL;
+       /* active_mm is still 'mm' */
+       enter_lazy_tlb(mm, tsk);
+       task_unlock(tsk);
+}
index 5f4ef02..7e33f2c 100644 (file)
@@ -99,6 +99,26 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return young;
 }
 
+void __mmu_notifier_change_pte(struct mm_struct *mm, unsigned long address,
+                              pte_t pte)
+{
+       struct mmu_notifier *mn;
+       struct hlist_node *n;
+
+       rcu_read_lock();
+       hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+               if (mn->ops->change_pte)
+                       mn->ops->change_pte(mn, mm, address, pte);
+               /*
+                * Some drivers don't have change_pte,
+                * so we must call invalidate_page in that case.
+                */
+               else if (mn->ops->invalidate_page)
+                       mn->ops->invalidate_page(mn, mm, address);
+       }
+       rcu_read_unlock();
+}
+
 void __mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address)
 {
index d80311b..8bc969d 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/swapops.h>
 #include <linux/mmu_notifier.h>
 #include <linux/migrate.h>
-#include <linux/perf_counter.h>
+#include <linux/perf_event.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
@@ -300,7 +300,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
                error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
                if (error)
                        goto out;
-               perf_counter_mmap(vma);
+               perf_event_mmap(vma);
                nstart = tmp;
 
                if (nstart < prev->vm_end)
index a39b7b9..20a07db 100644 (file)
@@ -11,6 +11,7 @@
 #include <linux/hugetlb.h>
 #include <linux/slab.h>
 #include <linux/shm.h>
+#include <linux/ksm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
 #include <linux/capability.h>
@@ -174,6 +175,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
        unsigned long excess = 0;
        unsigned long hiwater_vm;
        int split = 0;
+       int err;
 
        /*
         * We'd prefer to avoid failure later on in do_munmap:
@@ -182,6 +184,18 @@ static unsigned long move_vma(struct vm_area_struct *vma,
        if (mm->map_count >= sysctl_max_map_count - 3)
                return -ENOMEM;
 
+       /*
+        * Advise KSM to break any KSM pages in the area to be moved:
+        * it would be confusing if they were to turn up at the new
+        * location, where they happen to coincide with different KSM
+        * pages recently unmapped.  But leave vma->vm_flags as it was,
+        * so KSM can come around to merge on vma and new_vma afterwards.
+        */
+       err = ksm_madvise(vma, old_addr, old_addr + old_len,
+                                               MADV_UNMERGEABLE, &vm_flags);
+       if (err)
+               return err;
+
        new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT);
        new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff);
        if (!new_vma)
index 66e81e7..8d48424 100644 (file)
@@ -33,6 +33,7 @@
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
 #include "internal.h"
 
 static inline __attribute__((format(printf, 1, 2)))
@@ -56,12 +57,11 @@ void no_printk(const char *fmt, ...)
        no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__)
 #endif
 
-#include "internal.h"
-
 void *high_memory;
 struct page *mem_map;
 unsigned long max_mapnr;
 unsigned long num_physpages;
+unsigned long highest_memmap_pfn;
 struct percpu_counter vm_committed_as;
 int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
 int sysctl_overcommit_ratio = 50; /* default is 50% */
@@ -170,21 +170,20 @@ unsigned int kobjsize(const void *objp)
 }
 
 int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-                    unsigned long start, int nr_pages, int flags,
+                    unsigned long start, int nr_pages, unsigned int foll_flags,
                     struct page **pages, struct vm_area_struct **vmas)
 {
        struct vm_area_struct *vma;
        unsigned long vm_flags;
        int i;
-       int write = !!(flags & GUP_FLAGS_WRITE);
-       int force = !!(flags & GUP_FLAGS_FORCE);
-       int ignore = !!(flags & GUP_FLAGS_IGNORE_VMA_PERMISSIONS);
 
        /* calculate required read or write permissions.
-        * - if 'force' is set, we only require the "MAY" flags.
+        * If FOLL_FORCE is set, we only require the "MAY" flags.
         */
-       vm_flags  = write ? (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD);
-       vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
+       vm_flags  = (foll_flags & FOLL_WRITE) ?
+                       (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD);
+       vm_flags &= (foll_flags & FOLL_FORCE) ?
+                       (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
 
        for (i = 0; i < nr_pages; i++) {
                vma = find_vma(mm, start);
@@ -192,8 +191,8 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        goto finish_or_fault;
 
                /* protect what we can, including chardevs */
-               if (vma->vm_flags & (VM_IO | VM_PFNMAP) ||
-                   (!ignore && !(vm_flags & vma->vm_flags)))
+               if ((vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
+                   !(vm_flags & vma->vm_flags))
                        goto finish_or_fault;
 
                if (pages) {
@@ -212,7 +211,6 @@ finish_or_fault:
        return i ? : -EFAULT;
 }
 
-
 /*
  * get a list of pages in an address range belonging to the specified process
  * and indicate the VMA that covers each page
@@ -227,9 +225,9 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
        int flags = 0;
 
        if (write)
-               flags |= GUP_FLAGS_WRITE;
+               flags |= FOLL_WRITE;
        if (force)
-               flags |= GUP_FLAGS_FORCE;
+               flags |= FOLL_FORCE;
 
        return __get_user_pages(tsk, mm, start, nr_pages, flags, pages, vmas);
 }
@@ -626,6 +624,22 @@ static void put_nommu_region(struct vm_region *region)
        __put_nommu_region(region);
 }
 
+/*
+ * update protection on a vma
+ */
+static void protect_vma(struct vm_area_struct *vma, unsigned long flags)
+{
+#ifdef CONFIG_MPU
+       struct mm_struct *mm = vma->vm_mm;
+       long start = vma->vm_start & PAGE_MASK;
+       while (start < vma->vm_end) {
+               protect_page(mm, start, flags);
+               start += PAGE_SIZE;
+       }
+       update_protections(mm);
+#endif
+}
+
 /*
  * add a VMA into a process's mm_struct in the appropriate place in the list
  * and tree and add to the address space's page tree also if not an anonymous
@@ -645,6 +659,8 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
        mm->map_count++;
        vma->vm_mm = mm;
 
+       protect_vma(vma, vma->vm_flags);
+
        /* add the VMA to the mapping */
        if (vma->vm_file) {
                mapping = vma->vm_file->f_mapping;
@@ -707,6 +723,8 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
 
        kenter("%p", vma);
 
+       protect_vma(vma, 0);
+
        mm->map_count--;
        if (mm->mmap_cache == vma)
                mm->mmap_cache = NULL;
index a7b2460..ea2147d 100644 (file)
@@ -34,6 +34,23 @@ int sysctl_oom_dump_tasks;
 static DEFINE_SPINLOCK(zone_scan_lock);
 /* #define DEBUG */
 
+/*
+ * Is all threads of the target process nodes overlap ours?
+ */
+static int has_intersects_mems_allowed(struct task_struct *tsk)
+{
+       struct task_struct *t;
+
+       t = tsk;
+       do {
+               if (cpuset_mems_allowed_intersects(current, t))
+                       return 1;
+               t = next_thread(t);
+       } while (t != tsk);
+
+       return 0;
+}
+
 /**
  * badness - calculate a numeric value for how bad this task has been
  * @p: task struct of which task we should calculate
@@ -58,6 +75,13 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
        unsigned long points, cpu_time, run_time;
        struct mm_struct *mm;
        struct task_struct *child;
+       int oom_adj = p->signal->oom_adj;
+       struct task_cputime task_time;
+       unsigned long utime;
+       unsigned long stime;
+
+       if (oom_adj == OOM_DISABLE)
+               return 0;
 
        task_lock(p);
        mm = p->mm;
@@ -79,7 +103,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
        /*
         * swapoff can easily use up all memory, so kill those first.
         */
-       if (p->flags & PF_SWAPOFF)
+       if (p->flags & PF_OOM_ORIGIN)
                return ULONG_MAX;
 
        /*
@@ -102,8 +126,11 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
          * of seconds. There is no particular reason for this other than
          * that it turned out to work very well in practice.
         */
-       cpu_time = (cputime_to_jiffies(p->utime) + cputime_to_jiffies(p->stime))
-               >> (SHIFT_HZ + 3);
+       thread_group_cputime(p, &task_time);
+       utime = cputime_to_jiffies(task_time.utime);
+       stime = cputime_to_jiffies(task_time.stime);
+       cpu_time = (utime + stime) >> (SHIFT_HZ + 3);
+
 
        if (uptime >= p->start_time.tv_sec)
                run_time = (uptime - p->start_time.tv_sec) >> 10;
@@ -144,19 +171,19 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
         * because p may have allocated or otherwise mapped memory on
         * this node before. However it will be less likely.
         */
-       if (!cpuset_mems_allowed_intersects(current, p))
+       if (!has_intersects_mems_allowed(p))
                points /= 8;
 
        /*
-        * Adjust the score by oomkilladj.
+        * Adjust the score by oom_adj.
         */
-       if (p->oomkilladj) {
-               if (p->oomkilladj > 0) {
+       if (oom_adj) {
+               if (oom_adj > 0) {
                        if (!points)
                                points = 1;
-                       points <<= p->oomkilladj;
+                       points <<= oom_adj;
                } else
-                       points >>= -(p->oomkilladj);
+                       points >>= -(oom_adj);
        }
 
 #ifdef DEBUG
@@ -200,13 +227,13 @@ static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist,
 static struct task_struct *select_bad_process(unsigned long *ppoints,
                                                struct mem_cgroup *mem)
 {
-       struct task_struct *g, *p;
+       struct task_struct *p;
        struct task_struct *chosen = NULL;
        struct timespec uptime;
        *ppoints = 0;
 
        do_posix_clock_monotonic_gettime(&uptime);
-       do_each_thread(g, p) {
+       for_each_process(p) {
                unsigned long points;
 
                /*
@@ -251,7 +278,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
                        *ppoints = ULONG_MAX;
                }
 
-               if (p->oomkilladj == OOM_DISABLE)
+               if (p->signal->oom_adj == OOM_DISABLE)
                        continue;
 
                points = badness(p, uptime.tv_sec);
@@ -259,7 +286,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
                        chosen = p;
                        *ppoints = points;
                }
-       } while_each_thread(g, p);
+       }
 
        return chosen;
 }
@@ -304,7 +331,7 @@ static void dump_tasks(const struct mem_cgroup *mem)
                }
                printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d     %3d %s\n",
                       p->pid, __task_cred(p)->uid, p->tgid, mm->total_vm,
-                      get_mm_rss(mm), (int)task_cpu(p), p->oomkilladj,
+                      get_mm_rss(mm), (int)task_cpu(p), p->signal->oom_adj,
                       p->comm);
                task_unlock(p);
        } while_each_thread(g, p);
@@ -346,11 +373,6 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
 
 static int oom_kill_task(struct task_struct *p)
 {
-       struct mm_struct *mm;
-       struct task_struct *g, *q;
-
-       mm = p->mm;
-
        /* WARNING: mm may not be dereferenced since we did not obtain its
         * value from get_task_mm(p).  This is OK since all we need to do is
         * compare mm to q->mm below.
@@ -359,30 +381,11 @@ static int oom_kill_task(struct task_struct *p)
         * change to NULL at any time since we do not hold task_lock(p).
         * However, this is of no concern to us.
         */
-
-       if (mm == NULL)
+       if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
                return 1;
 
-       /*
-        * Don't kill the process if any threads are set to OOM_DISABLE
-        */
-       do_each_thread(g, q) {
-               if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
-                       return 1;
-       } while_each_thread(g, q);
-
        __oom_kill_task(p, 1);
 
-       /*
-        * kill all processes that share the ->mm (i.e. all threads),
-        * but are in a different thread group. Don't let them have access
-        * to memory reserves though, otherwise we might deplete all memory.
-        */
-       do_each_thread(g, q) {
-               if (q->mm == mm && !same_thread_group(q, p))
-                       force_sig(SIGKILL, q);
-       } while_each_thread(g, q);
-
        return 0;
 }
 
@@ -394,8 +397,9 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 
        if (printk_ratelimit()) {
                printk(KERN_WARNING "%s invoked oom-killer: "
-                       "gfp_mask=0x%x, order=%d, oomkilladj=%d\n",
-                       current->comm, gfp_mask, order, current->oomkilladj);
+                       "gfp_mask=0x%x, order=%d, oom_adj=%d\n",
+                       current->comm, gfp_mask, order,
+                       current->signal->oom_adj);
                task_lock(current);
                cpuset_print_task_mems_allowed(current);
                task_unlock(current);
index 1eea4fa..5f378dd 100644 (file)
@@ -380,7 +380,8 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
                struct zone *z =
                        &NODE_DATA(node)->node_zones[ZONE_HIGHMEM];
 
-               x += zone_page_state(z, NR_FREE_PAGES) + zone_lru_pages(z);
+               x += zone_page_state(z, NR_FREE_PAGES) +
+                    zone_reclaimable_pages(z);
        }
        /*
         * Make sure that the number of highmem pages is never larger
@@ -404,7 +405,7 @@ unsigned long determine_dirtyable_memory(void)
 {
        unsigned long x;
 
-       x = global_page_state(NR_FREE_PAGES) + global_lru_pages();
+       x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
 
        if (!vm_highmem_is_dirtyable)
                x -= highmem_dirtyable_memory(x);
@@ -485,6 +486,7 @@ static void balance_dirty_pages(struct address_space *mapping)
        unsigned long bdi_thresh;
        unsigned long pages_written = 0;
        unsigned long write_chunk = sync_writeback_pages();
+       unsigned long pause = 1;
 
        struct backing_dev_info *bdi = mapping->backing_dev_info;
 
@@ -561,7 +563,15 @@ static void balance_dirty_pages(struct address_space *mapping)
                if (pages_written >= write_chunk)
                        break;          /* We've done our duty */
 
-               schedule_timeout(1);
+               schedule_timeout_interruptible(pause);
+
+               /*
+                * Increase the delay for each loop, up to our previous
+                * default of taking a 100ms nap.
+                */
+               pause <<= 1;
+               if (pause > HZ / 10)
+                       pause = HZ / 10;
        }
 
        if (bdi_nr_reclaimable + bdi_nr_writeback < bdi_thresh &&
index a0de15f..5717f27 100644 (file)
@@ -48,6 +48,7 @@
 #include <linux/page_cgroup.h>
 #include <linux/debugobjects.h>
 #include <linux/kmemleak.h>
+#include <trace/events/kmem.h>
 
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
@@ -71,7 +72,6 @@ EXPORT_SYMBOL(node_states);
 
 unsigned long totalram_pages __read_mostly;
 unsigned long totalreserve_pages __read_mostly;
-unsigned long highest_memmap_pfn __read_mostly;
 int percpu_pagelist_fraction;
 gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK;
 
@@ -123,8 +123,8 @@ static char * const zone_names[MAX_NR_ZONES] = {
 
 int min_free_kbytes = 1024;
 
-unsigned long __meminitdata nr_kernel_pages;
-unsigned long __meminitdata nr_all_pages;
+static unsigned long __meminitdata nr_kernel_pages;
+static unsigned long __meminitdata nr_all_pages;
 static unsigned long __meminitdata dma_reserve;
 
 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP
@@ -510,7 +510,7 @@ static inline int free_pages_check(struct page *page)
 }
 
 /*
- * Frees a list of pages. 
+ * Frees a number of pages from the PCP lists
  * Assumes all pages on list are in same zone, and of same order.
  * count is the number of pages to free.
  *
@@ -520,22 +520,42 @@ static inline int free_pages_check(struct page *page)
  * And clear the zone's pages_scanned counter, to hold off the "all pages are
  * pinned" detection logic.
  */
-static void free_pages_bulk(struct zone *zone, int count,
-                                       struct list_head *list, int order)
+static void free_pcppages_bulk(struct zone *zone, int count,
+                                       struct per_cpu_pages *pcp)
 {
+       int migratetype = 0;
+       int batch_free = 0;
+
        spin_lock(&zone->lock);
        zone_clear_flag(zone, ZONE_ALL_UNRECLAIMABLE);
        zone->pages_scanned = 0;
 
-       __mod_zone_page_state(zone, NR_FREE_PAGES, count << order);
-       while (count--) {
+       __mod_zone_page_state(zone, NR_FREE_PAGES, count);
+       while (count) {
                struct page *page;
+               struct list_head *list;
 
-               VM_BUG_ON(list_empty(list));
-               page = list_entry(list->prev, struct page, lru);
-               /* have to delete it as __free_one_page list manipulates */
-               list_del(&page->lru);
-               __free_one_page(page, zone, order, page_private(page));
+               /*
+                * Remove pages from lists in a round-robin fashion. A
+                * batch_free count is maintained that is incremented when an
+                * empty list is encountered.  This is so more pages are freed
+                * off fuller lists instead of spinning excessively around empty
+                * lists
+                */
+               do {
+                       batch_free++;
+                       if (++migratetype == MIGRATE_PCPTYPES)
+                               migratetype = 0;
+                       list = &pcp->lists[migratetype];
+               } while (list_empty(list));
+
+               do {
+                       page = list_entry(list->prev, struct page, lru);
+                       /* must delete as __free_one_page list manipulates */
+                       list_del(&page->lru);
+                       __free_one_page(page, zone, 0, migratetype);
+                       trace_mm_page_pcpu_drain(page, 0, migratetype);
+               } while (--count && --batch_free && !list_empty(list));
        }
        spin_unlock(&zone->lock);
 }
@@ -557,7 +577,7 @@ static void __free_pages_ok(struct page *page, unsigned int order)
        unsigned long flags;
        int i;
        int bad = 0;
-       int wasMlocked = TestClearPageMlocked(page);
+       int wasMlocked = __TestClearPageMlocked(page);
 
        kmemcheck_free_shadow(page, order);
 
@@ -783,6 +803,17 @@ static int move_freepages_block(struct zone *zone, struct page *page,
        return move_freepages(zone, start_page, end_page, migratetype);
 }
 
+static void change_pageblock_range(struct page *pageblock_page,
+                                       int start_order, int migratetype)
+{
+       int nr_pageblocks = 1 << (start_order - pageblock_order);
+
+       while (nr_pageblocks--) {
+               set_pageblock_migratetype(pageblock_page, migratetype);
+               pageblock_page += pageblock_nr_pages;
+       }
+}
+
 /* Remove an element from the buddy allocator from the fallback list */
 static inline struct page *
 __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
@@ -836,11 +867,16 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
                        list_del(&page->lru);
                        rmv_page_order(page);
 
-                       if (current_order == pageblock_order)
-                               set_pageblock_migratetype(page,
+                       /* Take ownership for orders >= pageblock_order */
+                       if (current_order >= pageblock_order)
+                               change_pageblock_range(page, current_order,
                                                        start_migratetype);
 
                        expand(zone, page, order, current_order, area, migratetype);
+
+                       trace_mm_page_alloc_extfrag(page, order, current_order,
+                               start_migratetype, migratetype);
+
                        return page;
                }
        }
@@ -874,6 +910,7 @@ retry_reserve:
                }
        }
 
+       trace_mm_page_alloc_zone_locked(page, order, migratetype);
        return page;
 }
 
@@ -934,7 +971,7 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
                to_drain = pcp->batch;
        else
                to_drain = pcp->count;
-       free_pages_bulk(zone, to_drain, &pcp->list, 0);
+       free_pcppages_bulk(zone, to_drain, pcp);
        pcp->count -= to_drain;
        local_irq_restore(flags);
 }
@@ -960,7 +997,7 @@ static void drain_pages(unsigned int cpu)
 
                pcp = &pset->pcp;
                local_irq_save(flags);
-               free_pages_bulk(zone, pcp->count, &pcp->list, 0);
+               free_pcppages_bulk(zone, pcp->count, pcp);
                pcp->count = 0;
                local_irq_restore(flags);
        }
@@ -1026,7 +1063,8 @@ static void free_hot_cold_page(struct page *page, int cold)
        struct zone *zone = page_zone(page);
        struct per_cpu_pages *pcp;
        unsigned long flags;
-       int wasMlocked = TestClearPageMlocked(page);
+       int migratetype;
+       int wasMlocked = __TestClearPageMlocked(page);
 
        kmemcheck_free_shadow(page, 0);
 
@@ -1043,35 +1081,49 @@ static void free_hot_cold_page(struct page *page, int cold)
        kernel_map_pages(page, 1, 0);
 
        pcp = &zone_pcp(zone, get_cpu())->pcp;
-       set_page_private(page, get_pageblock_migratetype(page));
+       migratetype = get_pageblock_migratetype(page);
+       set_page_private(page, migratetype);
        local_irq_save(flags);
        if (unlikely(wasMlocked))
                free_page_mlock(page);
        __count_vm_event(PGFREE);
 
+       /*
+        * We only track unmovable, reclaimable and movable on pcp lists.
+        * Free ISOLATE pages back to the allocator because they are being
+        * offlined but treat RESERVE as movable pages so we can get those
+        * areas back if necessary. Otherwise, we may have to free
+        * excessively into the page allocator
+        */
+       if (migratetype >= MIGRATE_PCPTYPES) {
+               if (unlikely(migratetype == MIGRATE_ISOLATE)) {
+                       free_one_page(zone, page, 0, migratetype);
+                       goto out;
+               }
+               migratetype = MIGRATE_MOVABLE;
+       }
+
        if (cold)
-               list_add_tail(&page->lru, &pcp->list);
+               list_add_tail(&page->lru, &pcp->lists[migratetype]);
        else
-               list_add(&page->lru, &pcp->list);
+               list_add(&page->lru, &pcp->lists[migratetype]);
        pcp->count++;
        if (pcp->count >= pcp->high) {
-               free_pages_bulk(zone, pcp->batch, &pcp->list, 0);
+               free_pcppages_bulk(zone, pcp->batch, pcp);
                pcp->count -= pcp->batch;
        }
+
+out:
        local_irq_restore(flags);
        put_cpu();
 }
 
 void free_hot_page(struct page *page)
 {
+       trace_mm_page_free_direct(page, 0);
        free_hot_cold_page(page, 0);
 }
        
-void free_cold_page(struct page *page)
-{
-       free_hot_cold_page(page, 1);
-}
-
 /*
  * split_page takes a non-compound higher-order page, and splits it into
  * n (1<<order) sub-pages: page[0..n]
@@ -1119,35 +1171,23 @@ again:
        cpu  = get_cpu();
        if (likely(order == 0)) {
                struct per_cpu_pages *pcp;
+               struct list_head *list;
 
                pcp = &zone_pcp(zone, cpu)->pcp;
+               list = &pcp->lists[migratetype];
                local_irq_save(flags);
-               if (!pcp->count) {
-                       pcp->count = rmqueue_bulk(zone, 0,
-                                       pcp->batch, &pcp->list,
+               if (list_empty(list)) {
+                       pcp->count += rmqueue_bulk(zone, 0,
+                                       pcp->batch, list,
                                        migratetype, cold);
-                       if (unlikely(!pcp->count))
+                       if (unlikely(list_empty(list)))
                                goto failed;
                }
 
-               /* Find a page of the appropriate migrate type */
-               if (cold) {
-                       list_for_each_entry_reverse(page, &pcp->list, lru)
-                               if (page_private(page) == migratetype)
-                                       break;
-               } else {
-                       list_for_each_entry(page, &pcp->list, lru)
-                               if (page_private(page) == migratetype)
-                                       break;
-               }
-
-               /* Allocate more to the pcp list if necessary */
-               if (unlikely(&page->lru == &pcp->list)) {
-                       pcp->count += rmqueue_bulk(zone, 0,
-                                       pcp->batch, &pcp->list,
-                                       migratetype, cold);
-                       page = list_entry(pcp->list.next, struct page, lru);
-               }
+               if (cold)
+                       page = list_entry(list->prev, struct page, lru);
+               else
+                       page = list_entry(list->next, struct page, lru);
 
                list_del(&page->lru);
                pcp->count--;
@@ -1627,10 +1667,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
 
        /* We now go into synchronous reclaim */
        cpuset_memory_pressure_bump();
-
-       /*
-        * The task's cpuset might have expanded its set of allowable nodes
-        */
        p->flags |= PF_MEMALLOC;
        lockdep_set_current_reclaim_state(gfp_mask);
        reclaim_state.reclaimed_slab = 0;
@@ -1765,6 +1801,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 
        wake_all_kswapd(order, zonelist, high_zoneidx);
 
+restart:
        /*
         * OK, we're below the kswapd watermark and have kicked background
         * reclaim. Now things get more complex, so set up alloc_flags according
@@ -1772,7 +1809,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
         */
        alloc_flags = gfp_to_alloc_flags(gfp_mask);
 
-restart:
        /* This is the last chance, in general, before the goto nopage. */
        page = get_page_from_freelist(gfp_mask, nodemask, order, zonelist,
                        high_zoneidx, alloc_flags & ~ALLOC_NO_WATERMARKS,
@@ -1907,6 +1943,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
                                zonelist, high_zoneidx, nodemask,
                                preferred_zone, migratetype);
 
+       trace_mm_page_alloc(page, order, gfp_mask, migratetype);
        return page;
 }
 EXPORT_SYMBOL(__alloc_pages_nodemask);
@@ -1916,44 +1953,41 @@ EXPORT_SYMBOL(__alloc_pages_nodemask);
  */
 unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order)
 {
-       struct page * page;
+       struct page *page;
+
+       /*
+        * __get_free_pages() returns a 32-bit address, which cannot represent
+        * a highmem page
+        */
+       VM_BUG_ON((gfp_mask & __GFP_HIGHMEM) != 0);
+
        page = alloc_pages(gfp_mask, order);
        if (!page)
                return 0;
        return (unsigned long) page_address(page);
 }
-
 EXPORT_SYMBOL(__get_free_pages);
 
 unsigned long get_zeroed_page(gfp_t gfp_mask)
 {
-       struct page * page;
-
-       /*
-        * get_zeroed_page() returns a 32-bit address, which cannot represent
-        * a highmem page
-        */
-       VM_BUG_ON((gfp_mask & __GFP_HIGHMEM) != 0);
-
-       page = alloc_pages(gfp_mask | __GFP_ZERO, 0);
-       if (page)
-               return (unsigned long) page_address(page);
-       return 0;
+       return __get_free_pages(gfp_mask | __GFP_ZERO, 0);
 }
-
 EXPORT_SYMBOL(get_zeroed_page);
 
 void __pagevec_free(struct pagevec *pvec)
 {
        int i = pagevec_count(pvec);
 
-       while (--i >= 0)
+       while (--i >= 0) {
+               trace_mm_pagevec_free(pvec->pages[i], pvec->cold);
                free_hot_cold_page(pvec->pages[i], pvec->cold);
+       }
 }
 
 void __free_pages(struct page *page, unsigned int order)
 {
        if (put_page_testzero(page)) {
+               trace_mm_page_free_direct(page, order);
                if (order == 0)
                        free_hot_page(page);
                else
@@ -2128,23 +2162,28 @@ void show_free_areas(void)
                }
        }
 
-       printk("Active_anon:%lu active_file:%lu inactive_anon:%lu\n"
-               " inactive_file:%lu"
+       printk("active_anon:%lu inactive_anon:%lu isolated_anon:%lu\n"
+               " active_file:%lu inactive_file:%lu isolated_file:%lu\n"
                " unevictable:%lu"
-               " dirty:%lu writeback:%lu unstable:%lu\n"
-               " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
+               " dirty:%lu writeback:%lu unstable:%lu buffer:%lu\n"
+               " free:%lu slab_reclaimable:%lu slab_unreclaimable:%lu\n"
+               " mapped:%lu shmem:%lu pagetables:%lu bounce:%lu\n",
                global_page_state(NR_ACTIVE_ANON),
-               global_page_state(NR_ACTIVE_FILE),
                global_page_state(NR_INACTIVE_ANON),
+               global_page_state(NR_ISOLATED_ANON),
+               global_page_state(NR_ACTIVE_FILE),
                global_page_state(NR_INACTIVE_FILE),
+               global_page_state(NR_ISOLATED_FILE),
                global_page_state(NR_UNEVICTABLE),
                global_page_state(NR_FILE_DIRTY),
                global_page_state(NR_WRITEBACK),
                global_page_state(NR_UNSTABLE_NFS),
+               nr_blockdev_pages(),
                global_page_state(NR_FREE_PAGES),
-               global_page_state(NR_SLAB_RECLAIMABLE) +
-                       global_page_state(NR_SLAB_UNRECLAIMABLE),
+               global_page_state(NR_SLAB_RECLAIMABLE),
+               global_page_state(NR_SLAB_UNRECLAIMABLE),
                global_page_state(NR_FILE_MAPPED),
+               global_page_state(NR_SHMEM),
                global_page_state(NR_PAGETABLE),
                global_page_state(NR_BOUNCE));
 
@@ -2162,7 +2201,21 @@ void show_free_areas(void)
                        " active_file:%lukB"
                        " inactive_file:%lukB"
                        " unevictable:%lukB"
+                       " isolated(anon):%lukB"
+                       " isolated(file):%lukB"
                        " present:%lukB"
+                       " mlocked:%lukB"
+                       " dirty:%lukB"
+                       " writeback:%lukB"
+                       " mapped:%lukB"
+                       " shmem:%lukB"
+                       " slab_reclaimable:%lukB"
+                       " slab_unreclaimable:%lukB"
+                       " kernel_stack:%lukB"
+                       " pagetables:%lukB"
+                       " unstable:%lukB"
+                       " bounce:%lukB"
+                       " writeback_tmp:%lukB"
                        " pages_scanned:%lu"
                        " all_unreclaimable? %s"
                        "\n",
@@ -2176,7 +2229,22 @@ void show_free_areas(void)
                        K(zone_page_state(zone, NR_ACTIVE_FILE)),
                        K(zone_page_state(zone, NR_INACTIVE_FILE)),
                        K(zone_page_state(zone, NR_UNEVICTABLE)),
+                       K(zone_page_state(zone, NR_ISOLATED_ANON)),
+                       K(zone_page_state(zone, NR_ISOLATED_FILE)),
                        K(zone->present_pages),
+                       K(zone_page_state(zone, NR_MLOCK)),
+                       K(zone_page_state(zone, NR_FILE_DIRTY)),
+                       K(zone_page_state(zone, NR_WRITEBACK)),
+                       K(zone_page_state(zone, NR_FILE_MAPPED)),
+                       K(zone_page_state(zone, NR_SHMEM)),
+                       K(zone_page_state(zone, NR_SLAB_RECLAIMABLE)),
+                       K(zone_page_state(zone, NR_SLAB_UNRECLAIMABLE)),
+                       zone_page_state(zone, NR_KERNEL_STACK) *
+                               THREAD_SIZE / 1024,
+                       K(zone_page_state(zone, NR_PAGETABLE)),
+                       K(zone_page_state(zone, NR_UNSTABLE_NFS)),
+                       K(zone_page_state(zone, NR_BOUNCE)),
+                       K(zone_page_state(zone, NR_WRITEBACK_TEMP)),
                        zone->pages_scanned,
                        (zone_is_all_unreclaimable(zone) ? "yes" : "no")
                        );
@@ -2783,7 +2851,8 @@ static void setup_zone_migrate_reserve(struct zone *zone)
 {
        unsigned long start_pfn, pfn, end_pfn;
        struct page *page;
-       unsigned long reserve, block_migratetype;
+       unsigned long block_migratetype;
+       int reserve;
 
        /* Get the start pfn, end pfn and the number of blocks to reserve */
        start_pfn = zone->zone_start_pfn;
@@ -2791,6 +2860,15 @@ static void setup_zone_migrate_reserve(struct zone *zone)
        reserve = roundup(min_wmark_pages(zone), pageblock_nr_pages) >>
                                                        pageblock_order;
 
+       /*
+        * Reserve blocks are generally in place to help high-order atomic
+        * allocations that are short-lived. A min_free_kbytes value that
+        * would result in more than 2 reserve blocks for atomic allocations
+        * is assumed to be in place to help anti-fragmentation for the
+        * future allocation of hugepages at runtime.
+        */
+       reserve = min(2, reserve);
+
        for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
                if (!pfn_valid(pfn))
                        continue;
@@ -2961,6 +3039,7 @@ static int zone_batchsize(struct zone *zone)
 static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
 {
        struct per_cpu_pages *pcp;
+       int migratetype;
 
        memset(p, 0, sizeof(*p));
 
@@ -2968,7 +3047,8 @@ static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
        pcp->count = 0;
        pcp->high = 6 * batch;
        pcp->batch = max(1UL, 1 * batch);
-       INIT_LIST_HEAD(&pcp->list);
+       for (migratetype = 0; migratetype < MIGRATE_PCPTYPES; migratetype++)
+               INIT_LIST_HEAD(&pcp->lists[migratetype]);
 }
 
 /*
@@ -3146,6 +3226,32 @@ int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
        return 0;
 }
 
+static int __zone_pcp_update(void *data)
+{
+       struct zone *zone = data;
+       int cpu;
+       unsigned long batch = zone_batchsize(zone), flags;
+
+       for (cpu = 0; cpu < NR_CPUS; cpu++) {
+               struct per_cpu_pageset *pset;
+               struct per_cpu_pages *pcp;
+
+               pset = zone_pcp(zone, cpu);
+               pcp = &pset->pcp;
+
+               local_irq_save(flags);
+               free_pcppages_bulk(zone, pcp->count, pcp);
+               setup_pageset(pset, batch);
+               local_irq_restore(flags);
+       }
+       return 0;
+}
+
+void zone_pcp_update(struct zone *zone)
+{
+       stop_machine(__zone_pcp_update, zone, NULL);
+}
+
 static __meminit void zone_pcp_init(struct zone *zone)
 {
        int cpu;
@@ -3720,7 +3826,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                zone_pcp_init(zone);
                for_each_lru(l) {
                        INIT_LIST_HEAD(&zone->lru[l].list);
-                       zone->lru[l].nr_saved_scan = 0;
+                       zone->reclaim_stat.nr_saved_scan[l] = 0;
                }
                zone->reclaim_stat.recent_rotated[0] = 0;
                zone->reclaim_stat.recent_rotated[1] = 0;
@@ -4509,7 +4615,7 @@ void setup_per_zone_wmarks(void)
        calculate_totalreserve_pages();
 }
 
-/**
+/*
  * The inactive anon list should be small enough that the VM never has to
  * do too much work, but large enough that each inactive page has a chance
  * to be referenced again before it is swapped out.
@@ -4732,7 +4838,14 @@ void *__init alloc_large_system_hash(const char *tablename,
                        numentries <<= (PAGE_SHIFT - scale);
 
                /* Make sure we've got at least a 0-order allocation.. */
-               if (unlikely((numentries * bucketsize) < PAGE_SIZE))
+               if (unlikely(flags & HASH_SMALL)) {
+                       /* Makes no sense without HASH_EARLY */
+                       WARN_ON(!(flags & HASH_EARLY));
+                       if (!(numentries >> *_hash_shift)) {
+                               numentries = 1UL << *_hash_shift;
+                               BUG_ON(!numentries);
+                       }
+               } else if (unlikely((numentries * bucketsize) < PAGE_SIZE))
                        numentries = PAGE_SIZE / bucketsize;
        }
        numentries = roundup_pow_of_two(numentries);
@@ -4874,13 +4987,16 @@ int set_migratetype_isolate(struct page *page)
        struct zone *zone;
        unsigned long flags;
        int ret = -EBUSY;
+       int zone_idx;
 
        zone = page_zone(page);
+       zone_idx = zone_idx(zone);
        spin_lock_irqsave(&zone->lock, flags);
        /*
         * In future, more migrate types will be able to be isolation target.
         */
-       if (get_pageblock_migratetype(page) != MIGRATE_MOVABLE)
+       if (get_pageblock_migratetype(page) != MIGRATE_MOVABLE &&
+           zone_idx != ZONE_MOVABLE)
                goto out;
        set_pageblock_migratetype(page, MIGRATE_ISOLATE);
        move_freepages_block(zone, page, MIGRATE_ISOLATE);
index f22b4eb..3d535d5 100644 (file)
@@ -116,10 +116,16 @@ static int __init_refok init_section_page_cgroup(unsigned long pfn)
                nid = page_to_nid(pfn_to_page(pfn));
                table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
                VM_BUG_ON(!slab_is_available());
-               base = kmalloc_node(table_size,
+               if (node_state(nid, N_HIGH_MEMORY)) {
+                       base = kmalloc_node(table_size,
                                GFP_KERNEL | __GFP_NOWARN, nid);
-               if (!base)
-                       base = vmalloc_node(table_size, nid);
+                       if (!base)
+                               base = vmalloc_node(table_size, nid);
+               } else {
+                       base = kmalloc(table_size, GFP_KERNEL | __GFP_NOWARN);
+                       if (!base)
+                               base = vmalloc(table_size);
+               }
        } else {
                /*
                 * We don't have to allocate page_cgroup again, but
index 0895b5c..720fc03 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -710,27 +710,6 @@ void page_add_file_rmap(struct page *page)
        }
 }
 
-#ifdef CONFIG_DEBUG_VM
-/**
- * page_dup_rmap - duplicate pte mapping to a page
- * @page:      the page to add the mapping to
- * @vma:       the vm area being duplicated
- * @address:   the user virtual address mapped
- *
- * For copy_page_range only: minimal extract from page_add_file_rmap /
- * page_add_anon_rmap, avoiding unnecessary tests (already checked) so it's
- * quicker.
- *
- * The caller needs to hold the pte lock.
- */
-void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address)
-{
-       if (PageAnon(page))
-               __page_check_anon_rmap(page, vma, address);
-       atomic_inc(&page->_mapcount);
-}
-#endif
-
 /**
  * page_remove_rmap - take down pte mapping from a page
  * @page: page to remove mapping from
@@ -739,34 +718,37 @@ void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long
  */
 void page_remove_rmap(struct page *page)
 {
-       if (atomic_add_negative(-1, &page->_mapcount)) {
-               /*
-                * Now that the last pte has gone, s390 must transfer dirty
-                * flag from storage key to struct page.  We can usually skip
-                * this if the page is anon, so about to be freed; but perhaps
-                * not if it's in swapcache - there might be another pte slot
-                * containing the swap entry, but page not yet written to swap.
-                */
-               if ((!PageAnon(page) || PageSwapCache(page)) &&
-                   page_test_dirty(page)) {
-                       page_clear_dirty(page);
-                       set_page_dirty(page);
-               }
-               if (PageAnon(page))
-                       mem_cgroup_uncharge_page(page);
-               __dec_zone_page_state(page,
-                       PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED);
-               mem_cgroup_update_mapped_file_stat(page, -1);
-               /*
-                * It would be tidy to reset the PageAnon mapping here,
-                * but that might overwrite a racing page_add_anon_rmap
-                * which increments mapcount after us but sets mapping
-                * before us: so leave the reset to free_hot_cold_page,
-                * and remember that it's only reliable while mapped.
-                * Leaving it set also helps swapoff to reinstate ptes
-                * faster for those pages still in swapcache.
-                */
+       /* page still mapped by someone else? */
+       if (!atomic_add_negative(-1, &page->_mapcount))
+               return;
+
+       /*
+        * Now that the last pte has gone, s390 must transfer dirty
+        * flag from storage key to struct page.  We can usually skip
+        * this if the page is anon, so about to be freed; but perhaps
+        * not if it's in swapcache - there might be another pte slot
+        * containing the swap entry, but page not yet written to swap.
+        */
+       if ((!PageAnon(page) || PageSwapCache(page)) && page_test_dirty(page)) {
+               page_clear_dirty(page);
+               set_page_dirty(page);
        }
+       if (PageAnon(page)) {
+               mem_cgroup_uncharge_page(page);
+               __dec_zone_page_state(page, NR_ANON_PAGES);
+       } else {
+               __dec_zone_page_state(page, NR_FILE_MAPPED);
+       }
+       mem_cgroup_update_mapped_file_stat(page, -1);
+       /*
+        * It would be tidy to reset the PageAnon mapping here,
+        * but that might overwrite a racing page_add_anon_rmap
+        * which increments mapcount after us but sets mapping
+        * before us: so leave the reset to free_hot_cold_page,
+        * and remember that it's only reliable while mapped.
+        * Leaving it set also helps swapoff to reinstate ptes
+        * faster for those pages still in swapcache.
+        */
 }
 
 /*
index bd20f8b..b206a7a 100644 (file)
@@ -49,7 +49,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/backing-dev.h>
 #include <linux/shmem_fs.h>
 #include <linux/writeback.h>
-#include <linux/vfs.h>
 #include <linux/blkdev.h>
 #include <linux/security.h>
 #include <linux/swapops.h>
@@ -1097,6 +1096,10 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
        shmem_swp_unmap(entry);
 unlock:
        spin_unlock(&info->lock);
+       /*
+        * add_to_swap_cache() doesn't return -EEXIST, so we can safely
+        * clear SWAP_HAS_CACHE flag.
+        */
        swapcache_free(swap, NULL);
 redirty:
        set_page_dirty(page);
@@ -2306,17 +2309,14 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
        int err = -ENOMEM;
 
        /* Round up to L1_CACHE_BYTES to resist false sharing */
-       sbinfo = kmalloc(max((int)sizeof(struct shmem_sb_info),
+       sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
                                L1_CACHE_BYTES), GFP_KERNEL);
        if (!sbinfo)
                return -ENOMEM;
 
-       sbinfo->max_blocks = 0;
-       sbinfo->max_inodes = 0;
        sbinfo->mode = S_IRWXUGO | S_ISVTX;
        sbinfo->uid = current_fsuid();
        sbinfo->gid = current_fsgid();
-       sbinfo->mpol = NULL;
        sb->s_fs_info = sbinfo;
 
 #ifdef CONFIG_TMPFS
@@ -2590,6 +2590,11 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
        return 0;
 }
 
+int shmem_lock(struct file *file, int lock, struct user_struct *user)
+{
+       return 0;
+}
+
 #define shmem_vm_ops                           generic_file_vm_ops
 #define shmem_file_operations                  ramfs_file_operations
 #define shmem_get_inode(sb, mode, dev, flags)  ramfs_get_inode(sb, mode, dev)
index 7b5d4de..7dfa481 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1384,7 +1384,7 @@ void __init kmem_cache_init(void)
         * Fragmentation resistance on low memory - only use bigger
         * page orders on machines with more than 32MB of memory.
         */
-       if (num_physpages > (32 << 20) >> PAGE_SHIFT)
+       if (totalram_pages > (32 << 20) >> PAGE_SHIFT)
                slab_break_gfp_order = BREAK_GFP_ORDER_HI;
 
        /* Bootstrap is tricky, because several objects are allocated
index 0a216aa..4996fc7 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3345,6 +3345,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
 {
        struct kmem_cache *s;
 
+       if (WARN_ON(!name))
+               return NULL;
+
        down_write(&slub_lock);
        s = find_mergeable(size, align, flags, name, ctor);
        if (s) {
index a13ea64..d9714bd 100644 (file)
@@ -48,8 +48,14 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
 {
        /* If the main allocator is up use that, fallback to bootmem. */
        if (slab_is_available()) {
-               struct page *page = alloc_pages_node(node,
+               struct page *page;
+
+               if (node_state(node, N_HIGH_MEMORY))
+                       page = alloc_pages_node(node,
                                GFP_KERNEL | __GFP_ZERO, get_order(size));
+               else
+                       page = alloc_pages(GFP_KERNEL | __GFP_ZERO,
+                               get_order(size));
                if (page)
                        return page_address(page);
                return NULL;
index da432d9..6ce4aab 100644 (file)
@@ -62,9 +62,12 @@ static struct mem_section noinline __init_refok *sparse_index_alloc(int nid)
        unsigned long array_size = SECTIONS_PER_ROOT *
                                   sizeof(struct mem_section);
 
-       if (slab_is_available())
-               section = kmalloc_node(array_size, GFP_KERNEL, nid);
-       else
+       if (slab_is_available()) {
+               if (node_state(nid, N_HIGH_MEMORY))
+                       section = kmalloc_node(array_size, GFP_KERNEL, nid);
+               else
+                       section = kmalloc(array_size, GFP_KERNEL);
+       } else
                section = alloc_bootmem_node(NODE_DATA(nid), array_size);
 
        if (section)
index cb29ae5..308e57d 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -118,7 +118,7 @@ static void pagevec_move_tail(struct pagevec *pvec)
                        spin_lock(&zone->lru_lock);
                }
                if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
-                       int lru = page_is_file_cache(page);
+                       int lru = page_lru_base_type(page);
                        list_move_tail(&page->lru, &zone->lru[lru].list);
                        pgmoved++;
                }
@@ -181,7 +181,7 @@ void activate_page(struct page *page)
        spin_lock_irq(&zone->lru_lock);
        if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
                int file = page_is_file_cache(page);
-               int lru = LRU_BASE + file;
+               int lru = page_lru_base_type(page);
                del_page_from_lru_list(zone, page, lru);
 
                SetPageActive(page);
@@ -189,7 +189,7 @@ void activate_page(struct page *page)
                add_page_to_lru_list(zone, page, lru);
                __count_vm_event(PGACTIVATE);
 
-               update_page_reclaim_stat(zone, page, !!file, 1);
+               update_page_reclaim_stat(zone, page, file, 1);
        }
        spin_unlock_irq(&zone->lru_lock);
 }
@@ -496,7 +496,7 @@ EXPORT_SYMBOL(pagevec_lookup_tag);
  */
 void __init swap_setup(void)
 {
-       unsigned long megs = num_physpages >> (20 - PAGE_SHIFT);
+       unsigned long megs = totalram_pages >> (20 - PAGE_SHIFT);
 
 #ifdef CONFIG_SWAP
        bdi_init(swapper_space.backing_dev_info);
index 5ae6b8b..6d1daeb 100644 (file)
@@ -67,10 +67,10 @@ void show_swap_cache_info(void)
 }
 
 /*
- * add_to_swap_cache resembles add_to_page_cache_locked on swapper_space,
+ * __add_to_swap_cache resembles add_to_page_cache_locked on swapper_space,
  * but sets SwapCache flag and private instead of mapping and index.
  */
-int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
+static int __add_to_swap_cache(struct page *page, swp_entry_t entry)
 {
        int error;
 
@@ -78,28 +78,43 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
        VM_BUG_ON(PageSwapCache(page));
        VM_BUG_ON(!PageSwapBacked(page));
 
+       page_cache_get(page);
+       SetPageSwapCache(page);
+       set_page_private(page, entry.val);
+
+       spin_lock_irq(&swapper_space.tree_lock);
+       error = radix_tree_insert(&swapper_space.page_tree, entry.val, page);
+       if (likely(!error)) {
+               total_swapcache_pages++;
+               __inc_zone_page_state(page, NR_FILE_PAGES);
+               INC_CACHE_INFO(add_total);
+       }
+       spin_unlock_irq(&swapper_space.tree_lock);
+
+       if (unlikely(error)) {
+               /*
+                * Only the context which have set SWAP_HAS_CACHE flag
+                * would call add_to_swap_cache().
+                * So add_to_swap_cache() doesn't returns -EEXIST.
+                */
+               VM_BUG_ON(error == -EEXIST);
+               set_page_private(page, 0UL);
+               ClearPageSwapCache(page);
+               page_cache_release(page);
+       }
+
+       return error;
+}
+
+
+int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
+{
+       int error;
+
        error = radix_tree_preload(gfp_mask);
        if (!error) {
-               page_cache_get(page);
-               SetPageSwapCache(page);
-               set_page_private(page, entry.val);
-
-               spin_lock_irq(&swapper_space.tree_lock);
-               error = radix_tree_insert(&swapper_space.page_tree,
-                                               entry.val, page);
-               if (likely(!error)) {
-                       total_swapcache_pages++;
-                       __inc_zone_page_state(page, NR_FILE_PAGES);
-                       INC_CACHE_INFO(add_total);
-               }
-               spin_unlock_irq(&swapper_space.tree_lock);
+               error = __add_to_swap_cache(page, entry);
                radix_tree_preload_end();
-
-               if (unlikely(error)) {
-                       set_page_private(page, 0UL);
-                       ClearPageSwapCache(page);
-                       page_cache_release(page);
-               }
        }
        return error;
 }
@@ -137,38 +152,34 @@ int add_to_swap(struct page *page)
        VM_BUG_ON(!PageLocked(page));
        VM_BUG_ON(!PageUptodate(page));
 
-       for (;;) {
-               entry = get_swap_page();
-               if (!entry.val)
-                       return 0;
+       entry = get_swap_page();
+       if (!entry.val)
+               return 0;
 
+       /*
+        * Radix-tree node allocations from PF_MEMALLOC contexts could
+        * completely exhaust the page allocator. __GFP_NOMEMALLOC
+        * stops emergency reserves from being allocated.
+        *
+        * TODO: this could cause a theoretical memory reclaim
+        * deadlock in the swap out path.
+        */
+       /*
+        * Add it to the swap cache and mark it dirty
+        */
+       err = add_to_swap_cache(page, entry,
+                       __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
+
+       if (!err) {     /* Success */
+               SetPageDirty(page);
+               return 1;
+       } else {        /* -ENOMEM radix-tree allocation failure */
                /*
-                * Radix-tree node allocations from PF_MEMALLOC contexts could
-                * completely exhaust the page allocator. __GFP_NOMEMALLOC
-                * stops emergency reserves from being allocated.
-                *
-                * TODO: this could cause a theoretical memory reclaim
-                * deadlock in the swap out path.
-                */
-               /*
-                * Add it to the swap cache and mark it dirty
+                * add_to_swap_cache() doesn't return -EEXIST, so we can safely
+                * clear SWAP_HAS_CACHE flag.
                 */
-               err = add_to_swap_cache(page, entry,
-                               __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
-
-               switch (err) {
-               case 0:                         /* Success */
-                       SetPageDirty(page);
-                       return 1;
-               case -EEXIST:
-                       /* Raced with "speculative" read_swap_cache_async */
-                       swapcache_free(entry, NULL);
-                       continue;
-               default:
-                       /* -ENOMEM radix-tree allocation failure */
-                       swapcache_free(entry, NULL);
-                       return 0;
-               }
+               swapcache_free(entry, NULL);
+               return 0;
        }
 }
 
@@ -289,27 +300,32 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                                break;          /* Out of memory */
                }
 
+               /*
+                * call radix_tree_preload() while we can wait.
+                */
+               err = radix_tree_preload(gfp_mask & GFP_KERNEL);
+               if (err)
+                       break;
+
                /*
                 * Swap entry may have been freed since our caller observed it.
                 */
                err = swapcache_prepare(entry);
-               if (err == -EEXIST) /* seems racy */
+               if (err == -EEXIST) {   /* seems racy */
+                       radix_tree_preload_end();
                        continue;
-               if (err)           /* swp entry is obsolete ? */
+               }
+               if (err) {              /* swp entry is obsolete ? */
+                       radix_tree_preload_end();
                        break;
+               }
 
-               /*
-                * Associate the page with swap entry in the swap cache.
-                * May fail (-EEXIST) if there is already a page associated
-                * with this entry in the swap cache: added by a racing
-                * read_swap_cache_async, or add_to_swap or shmem_writepage
-                * re-using the just freed swap entry for an existing page.
-                * May fail (-ENOMEM) if radix-tree node allocation failed.
-                */
+               /* May fail (-ENOMEM) if radix-tree node allocation failed. */
                __set_page_locked(new_page);
                SetPageSwapBacked(new_page);
-               err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
+               err = __add_to_swap_cache(new_page, entry);
                if (likely(!err)) {
+                       radix_tree_preload_end();
                        /*
                         * Initiate read into locked page and return.
                         */
@@ -317,8 +333,13 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                        swap_readpage(new_page);
                        return new_page;
                }
+               radix_tree_preload_end();
                ClearPageSwapBacked(new_page);
                __clear_page_locked(new_page);
+               /*
+                * add_to_swap_cache() doesn't return -EEXIST, so we can safely
+                * clear SWAP_HAS_CACHE flag.
+                */
                swapcache_free(entry, NULL);
        } while (err != -ENOMEM);
 
index 74f1102..f1bf19d 100644 (file)
@@ -1575,9 +1575,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
        p->flags &= ~SWP_WRITEOK;
        spin_unlock(&swap_lock);
 
-       current->flags |= PF_SWAPOFF;
+       current->flags |= PF_OOM_ORIGIN;
        err = try_to_unuse(type);
-       current->flags &= ~PF_SWAPOFF;
+       current->flags &= ~PF_OOM_ORIGIN;
 
        if (err) {
                /* re-insert swap space back into swap_list */
index 204b824..69511e6 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/rcupdate.h>
 #include <linux/pfn.h>
 #include <linux/kmemleak.h>
-
+#include <linux/highmem.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 #include <asm/tlbflush.h>
@@ -168,11 +168,9 @@ static int vmap_page_range_noflush(unsigned long start, unsigned long end,
                next = pgd_addr_end(addr, end);
                err = vmap_pud_range(pgd, addr, next, prot, pages, &nr);
                if (err)
-                       break;
+                       return err;
        } while (pgd++, addr = next, addr != end);
 
-       if (unlikely(err))
-               return err;
        return nr;
 }
 
@@ -186,7 +184,7 @@ static int vmap_page_range(unsigned long start, unsigned long end,
        return ret;
 }
 
-static inline int is_vmalloc_or_module_addr(const void *x)
+int is_vmalloc_or_module_addr(const void *x)
 {
        /*
         * ARM, x86-64 and sparc64 put modules in a special place,
@@ -1272,17 +1270,21 @@ struct vm_struct *remove_vm_area(const void *addr)
        if (va && va->flags & VM_VM_AREA) {
                struct vm_struct *vm = va->private;
                struct vm_struct *tmp, **p;
-
-               vmap_debug_free_range(va->va_start, va->va_end);
-               free_unmap_vmap_area(va);
-               vm->size -= PAGE_SIZE;
-
+               /*
+                * remove from list and disallow access to this vm_struct
+                * before unmap. (address range confliction is maintained by
+                * vmap.)
+                */
                write_lock(&vmlist_lock);
                for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
                        ;
                *p = tmp->next;
                write_unlock(&vmlist_lock);
 
+               vmap_debug_free_range(va->va_start, va->va_end);
+               free_unmap_vmap_area(va);
+               vm->size -= PAGE_SIZE;
+
                return vm;
        }
        return NULL;
@@ -1384,7 +1386,7 @@ void *vmap(struct page **pages, unsigned int count,
 
        might_sleep();
 
-       if (count > num_physpages)
+       if (count > totalram_pages)
                return NULL;
 
        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
@@ -1491,7 +1493,7 @@ static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
        unsigned long real_size = size;
 
        size = PAGE_ALIGN(size);
-       if (!size || (size >> PAGE_SHIFT) > num_physpages)
+       if (!size || (size >> PAGE_SHIFT) > totalram_pages)
                return NULL;
 
        area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END,
@@ -1641,10 +1643,120 @@ void *vmalloc_32_user(unsigned long size)
 }
 EXPORT_SYMBOL(vmalloc_32_user);
 
+/*
+ * small helper routine , copy contents to buf from addr.
+ * If the page is not present, fill zero.
+ */
+
+static int aligned_vread(char *buf, char *addr, unsigned long count)
+{
+       struct page *p;
+       int copied = 0;
+
+       while (count) {
+               unsigned long offset, length;
+
+               offset = (unsigned long)addr & ~PAGE_MASK;
+               length = PAGE_SIZE - offset;
+               if (length > count)
+                       length = count;
+               p = vmalloc_to_page(addr);
+               /*
+                * To do safe access to this _mapped_ area, we need
+                * lock. But adding lock here means that we need to add
+                * overhead of vmalloc()/vfree() calles for this _debug_
+                * interface, rarely used. Instead of that, we'll use
+                * kmap() and get small overhead in this access function.
+                */
+               if (p) {
+                       /*
+                        * we can expect USER0 is not used (see vread/vwrite's
+                        * function description)
+                        */
+                       void *map = kmap_atomic(p, KM_USER0);
+                       memcpy(buf, map + offset, length);
+                       kunmap_atomic(map, KM_USER0);
+               } else
+                       memset(buf, 0, length);
+
+               addr += length;
+               buf += length;
+               copied += length;
+               count -= length;
+       }
+       return copied;
+}
+
+static int aligned_vwrite(char *buf, char *addr, unsigned long count)
+{
+       struct page *p;
+       int copied = 0;
+
+       while (count) {
+               unsigned long offset, length;
+
+               offset = (unsigned long)addr & ~PAGE_MASK;
+               length = PAGE_SIZE - offset;
+               if (length > count)
+                       length = count;
+               p = vmalloc_to_page(addr);
+               /*
+                * To do safe access to this _mapped_ area, we need
+                * lock. But adding lock here means that we need to add
+                * overhead of vmalloc()/vfree() calles for this _debug_
+                * interface, rarely used. Instead of that, we'll use
+                * kmap() and get small overhead in this access function.
+                */
+               if (p) {
+                       /*
+                        * we can expect USER0 is not used (see vread/vwrite's
+                        * function description)
+                        */
+                       void *map = kmap_atomic(p, KM_USER0);
+                       memcpy(map + offset, buf, length);
+                       kunmap_atomic(map, KM_USER0);
+               }
+               addr += length;
+               buf += length;
+               copied += length;
+               count -= length;
+       }
+       return copied;
+}
+
+/**
+ *     vread() -  read vmalloc area in a safe way.
+ *     @buf:           buffer for reading data
+ *     @addr:          vm address.
+ *     @count:         number of bytes to be read.
+ *
+ *     Returns # of bytes which addr and buf should be increased.
+ *     (same number to @count). Returns 0 if [addr...addr+count) doesn't
+ *     includes any intersect with alive vmalloc area.
+ *
+ *     This function checks that addr is a valid vmalloc'ed area, and
+ *     copy data from that area to a given buffer. If the given memory range
+ *     of [addr...addr+count) includes some valid address, data is copied to
+ *     proper area of @buf. If there are memory holes, they'll be zero-filled.
+ *     IOREMAP area is treated as memory hole and no copy is done.
+ *
+ *     If [addr...addr+count) doesn't includes any intersects with alive
+ *     vm_struct area, returns 0.
+ *     @buf should be kernel's buffer. Because this function uses KM_USER0,
+ *     the caller should guarantee KM_USER0 is not used.
+ *
+ *     Note: In usual ops, vread() is never necessary because the caller
+ *     should know vmalloc() area is valid and can use memcpy().
+ *     This is for routines which have to access vmalloc area without
+ *     any informaion, as /dev/kmem.
+ *
+ */
+
 long vread(char *buf, char *addr, unsigned long count)
 {
        struct vm_struct *tmp;
        char *vaddr, *buf_start = buf;
+       unsigned long buflen = count;
        unsigned long n;
 
        /* Don't allow overflow */
@@ -1652,7 +1764,7 @@ long vread(char *buf, char *addr, unsigned long count)
                count = -(unsigned long) addr;
 
        read_lock(&vmlist_lock);
-       for (tmp = vmlist; tmp; tmp = tmp->next) {
+       for (tmp = vmlist; count && tmp; tmp = tmp->next) {
                vaddr = (char *) tmp->addr;
                if (addr >= vaddr + tmp->size - PAGE_SIZE)
                        continue;
@@ -1665,32 +1777,72 @@ long vread(char *buf, char *addr, unsigned long count)
                        count--;
                }
                n = vaddr + tmp->size - PAGE_SIZE - addr;
-               do {
-                       if (count == 0)
-                               goto finished;
-                       *buf = *addr;
-                       buf++;
-                       addr++;
-                       count--;
-               } while (--n > 0);
+               if (n > count)
+                       n = count;
+               if (!(tmp->flags & VM_IOREMAP))
+                       aligned_vread(buf, addr, n);
+               else /* IOREMAP area is treated as memory hole */
+                       memset(buf, 0, n);
+               buf += n;
+               addr += n;
+               count -= n;
        }
 finished:
        read_unlock(&vmlist_lock);
-       return buf - buf_start;
+
+       if (buf == buf_start)
+               return 0;
+       /* zero-fill memory holes */
+       if (buf != buf_start + buflen)
+               memset(buf, 0, buflen - (buf - buf_start));
+
+       return buflen;
 }
 
+/**
+ *     vwrite() -  write vmalloc area in a safe way.
+ *     @buf:           buffer for source data
+ *     @addr:          vm address.
+ *     @count:         number of bytes to be read.
+ *
+ *     Returns # of bytes which addr and buf should be incresed.
+ *     (same number to @count).
+ *     If [addr...addr+count) doesn't includes any intersect with valid
+ *     vmalloc area, returns 0.
+ *
+ *     This function checks that addr is a valid vmalloc'ed area, and
+ *     copy data from a buffer to the given addr. If specified range of
+ *     [addr...addr+count) includes some valid address, data is copied from
+ *     proper area of @buf. If there are memory holes, no copy to hole.
+ *     IOREMAP area is treated as memory hole and no copy is done.
+ *
+ *     If [addr...addr+count) doesn't includes any intersects with alive
+ *     vm_struct area, returns 0.
+ *     @buf should be kernel's buffer. Because this function uses KM_USER0,
+ *     the caller should guarantee KM_USER0 is not used.
+ *
+ *     Note: In usual ops, vwrite() is never necessary because the caller
+ *     should know vmalloc() area is valid and can use memcpy().
+ *     This is for routines which have to access vmalloc area without
+ *     any informaion, as /dev/kmem.
+ *
+ *     The caller should guarantee KM_USER1 is not used.
+ */
+
 long vwrite(char *buf, char *addr, unsigned long count)
 {
        struct vm_struct *tmp;
-       char *vaddr, *buf_start = buf;
-       unsigned long n;
+       char *vaddr;
+       unsigned long n, buflen;
+       int copied = 0;
 
        /* Don't allow overflow */
        if ((unsigned long) addr + count < count)
                count = -(unsigned long) addr;
+       buflen = count;
 
        read_lock(&vmlist_lock);
-       for (tmp = vmlist; tmp; tmp = tmp->next) {
+       for (tmp = vmlist; count && tmp; tmp = tmp->next) {
                vaddr = (char *) tmp->addr;
                if (addr >= vaddr + tmp->size - PAGE_SIZE)
                        continue;
@@ -1702,18 +1854,21 @@ long vwrite(char *buf, char *addr, unsigned long count)
                        count--;
                }
                n = vaddr + tmp->size - PAGE_SIZE - addr;
-               do {
-                       if (count == 0)
-                               goto finished;
-                       *addr = *buf;
-                       buf++;
-                       addr++;
-                       count--;
-               } while (--n > 0);
+               if (n > count)
+                       n = count;
+               if (!(tmp->flags & VM_IOREMAP)) {
+                       aligned_vwrite(buf, addr, n);
+                       copied++;
+               }
+               buf += n;
+               addr += n;
+               count -= n;
        }
 finished:
        read_unlock(&vmlist_lock);
-       return buf - buf_start;
+       if (!copied)
+               return 0;
+       return buflen;
 }
 
 /**
index ba8228e..613e89f 100644 (file)
@@ -148,8 +148,8 @@ static struct zone_reclaim_stat *get_reclaim_stat(struct zone *zone,
        return &zone->reclaim_stat;
 }
 
-static unsigned long zone_nr_pages(struct zone *zone, struct scan_control *sc,
-                                  enum lru_list lru)
+static unsigned long zone_nr_lru_pages(struct zone *zone,
+                               struct scan_control *sc, enum lru_list lru)
 {
        if (!scanning_global_lru(sc))
                return mem_cgroup_zone_nr_pages(sc->mem_cgroup, zone, lru);
@@ -286,7 +286,12 @@ static inline int page_mapping_inuse(struct page *page)
 
 static inline int is_page_cache_freeable(struct page *page)
 {
-       return page_count(page) - !!page_has_private(page) == 2;
+       /*
+        * A freeable page cache page is referenced only by the caller
+        * that isolated the page, the page cache radix tree and
+        * optional buffer heads at page->private.
+        */
+       return page_count(page) - page_has_private(page) == 2;
 }
 
 static int may_write_to_queue(struct backing_dev_info *bdi)
@@ -361,7 +366,6 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
         * block, for some throttling. This happens by accident, because
         * swap_backing_dev_info is bust: it doesn't reflect the
         * congestion state of the swapdevs.  Easy to fix, if needed.
-        * See swapfile.c:page_queue_congested().
         */
        if (!is_page_cache_freeable(page))
                return PAGE_KEEP;
@@ -531,7 +535,7 @@ redo:
                 * unevictable page on [in]active list.
                 * We know how to handle that.
                 */
-               lru = active + page_is_file_cache(page);
+               lru = active + page_lru_base_type(page);
                lru_cache_add_lru(page, lru);
        } else {
                /*
@@ -821,7 +825,7 @@ int __isolate_lru_page(struct page *page, int mode, int file)
        if (mode != ISOLATE_BOTH && (!PageActive(page) != !mode))
                return ret;
 
-       if (mode != ISOLATE_BOTH && (!page_is_file_cache(page) != !file))
+       if (mode != ISOLATE_BOTH && page_is_file_cache(page) != file)
                return ret;
 
        /*
@@ -935,6 +939,16 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
                        /* Check that we have not crossed a zone boundary. */
                        if (unlikely(page_zone_id(cursor_page) != zone_id))
                                continue;
+
+                       /*
+                        * If we don't have enough swap space, reclaiming of
+                        * anon page which don't already have a swap slot is
+                        * pointless.
+                        */
+                       if (nr_swap_pages <= 0 && PageAnon(cursor_page) &&
+                                       !PageSwapCache(cursor_page))
+                               continue;
+
                        if (__isolate_lru_page(cursor_page, mode, file) == 0) {
                                list_move(&cursor_page->lru, dst);
                                mem_cgroup_del_lru(cursor_page);
@@ -961,7 +975,7 @@ static unsigned long isolate_pages_global(unsigned long nr,
        if (file)
                lru += LRU_FILE;
        return isolate_lru_pages(nr, &z->lru[lru].list, dst, scanned, order,
-                                                               mode, !!file);
+                                                               mode, file);
 }
 
 /*
@@ -976,7 +990,7 @@ static unsigned long clear_active_flags(struct list_head *page_list,
        struct page *page;
 
        list_for_each_entry(page, page_list, lru) {
-               lru = page_is_file_cache(page);
+               lru = page_lru_base_type(page);
                if (PageActive(page)) {
                        lru += LRU_ACTIVE;
                        ClearPageActive(page);
@@ -1033,6 +1047,31 @@ int isolate_lru_page(struct page *page)
        return ret;
 }
 
+/*
+ * Are there way too many processes in the direct reclaim path already?
+ */
+static int too_many_isolated(struct zone *zone, int file,
+               struct scan_control *sc)
+{
+       unsigned long inactive, isolated;
+
+       if (current_is_kswapd())
+               return 0;
+
+       if (!scanning_global_lru(sc))
+               return 0;
+
+       if (file) {
+               inactive = zone_page_state(zone, NR_INACTIVE_FILE);
+               isolated = zone_page_state(zone, NR_ISOLATED_FILE);
+       } else {
+               inactive = zone_page_state(zone, NR_INACTIVE_ANON);
+               isolated = zone_page_state(zone, NR_ISOLATED_ANON);
+       }
+
+       return isolated > inactive;
+}
+
 /*
  * shrink_inactive_list() is a helper for shrink_zone().  It returns the number
  * of reclaimed pages
@@ -1048,6 +1087,14 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
        struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
        int lumpy_reclaim = 0;
 
+       while (unlikely(too_many_isolated(zone, file, sc))) {
+               congestion_wait(WRITE, HZ/10);
+
+               /* We are about to die and free our memory. Return now. */
+               if (fatal_signal_pending(current))
+                       return SWAP_CLUSTER_MAX;
+       }
+
        /*
         * If we need a large contiguous chunk of memory, or have
         * trouble getting a small set of contiguous pages, we
@@ -1072,10 +1119,26 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                unsigned long nr_active;
                unsigned int count[NR_LRU_LISTS] = { 0, };
                int mode = lumpy_reclaim ? ISOLATE_BOTH : ISOLATE_INACTIVE;
+               unsigned long nr_anon;
+               unsigned long nr_file;
 
                nr_taken = sc->isolate_pages(sc->swap_cluster_max,
                             &page_list, &nr_scan, sc->order, mode,
                                zone, sc->mem_cgroup, 0, file);
+
+               if (scanning_global_lru(sc)) {
+                       zone->pages_scanned += nr_scan;
+                       if (current_is_kswapd())
+                               __count_zone_vm_events(PGSCAN_KSWAPD, zone,
+                                                      nr_scan);
+                       else
+                               __count_zone_vm_events(PGSCAN_DIRECT, zone,
+                                                      nr_scan);
+               }
+
+               if (nr_taken == 0)
+                       goto done;
+
                nr_active = clear_active_flags(&page_list, count);
                __count_vm_events(PGDEACTIVATE, nr_active);
 
@@ -1088,8 +1151,10 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                __mod_zone_page_state(zone, NR_INACTIVE_ANON,
                                                -count[LRU_INACTIVE_ANON]);
 
-               if (scanning_global_lru(sc))
-                       zone->pages_scanned += nr_scan;
+               nr_anon = count[LRU_ACTIVE_ANON] + count[LRU_INACTIVE_ANON];
+               nr_file = count[LRU_ACTIVE_FILE] + count[LRU_INACTIVE_FILE];
+               __mod_zone_page_state(zone, NR_ISOLATED_ANON, nr_anon);
+               __mod_zone_page_state(zone, NR_ISOLATED_FILE, nr_file);
 
                reclaim_stat->recent_scanned[0] += count[LRU_INACTIVE_ANON];
                reclaim_stat->recent_scanned[0] += count[LRU_ACTIVE_ANON];
@@ -1123,18 +1188,12 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                }
 
                nr_reclaimed += nr_freed;
+
                local_irq_disable();
-               if (current_is_kswapd()) {
-                       __count_zone_vm_events(PGSCAN_KSWAPD, zone, nr_scan);
+               if (current_is_kswapd())
                        __count_vm_events(KSWAPD_STEAL, nr_freed);
-               } else if (scanning_global_lru(sc))
-                       __count_zone_vm_events(PGSCAN_DIRECT, zone, nr_scan);
-
                __count_zone_vm_events(PGSTEAL, zone, nr_freed);
 
-               if (nr_taken == 0)
-                       goto done;
-
                spin_lock(&zone->lru_lock);
                /*
                 * Put back any unfreeable pages.
@@ -1153,8 +1212,8 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                        SetPageLRU(page);
                        lru = page_lru(page);
                        add_page_to_lru_list(zone, page, lru);
-                       if (PageActive(page)) {
-                               int file = !!page_is_file_cache(page);
+                       if (is_active_lru(lru)) {
+                               int file = is_file_lru(lru);
                                reclaim_stat->recent_rotated[file]++;
                        }
                        if (!pagevec_add(&pvec, page)) {
@@ -1163,10 +1222,13 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                                spin_lock_irq(&zone->lru_lock);
                        }
                }
+               __mod_zone_page_state(zone, NR_ISOLATED_ANON, -nr_anon);
+               __mod_zone_page_state(zone, NR_ISOLATED_FILE, -nr_file);
+
        } while (nr_scanned < max_scan);
-       spin_unlock(&zone->lru_lock);
+
 done:
-       local_irq_enable();
+       spin_unlock_irq(&zone->lru_lock);
        pagevec_release(&pvec);
        return nr_reclaimed;
 }
@@ -1215,15 +1277,10 @@ static void move_active_pages_to_lru(struct zone *zone,
 
        while (!list_empty(list)) {
                page = lru_to_page(list);
-               prefetchw_prev_lru_page(page, list, flags);
 
                VM_BUG_ON(PageLRU(page));
                SetPageLRU(page);
 
-               VM_BUG_ON(!PageActive(page));
-               if (!is_active_lru(lru))
-                       ClearPageActive(page);  /* we are de-activating */
-
                list_move(&page->lru, &zone->lru[lru].list);
                mem_cgroup_add_lru_list(page, lru);
                pgmoved++;
@@ -1244,7 +1301,7 @@ static void move_active_pages_to_lru(struct zone *zone,
 static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                        struct scan_control *sc, int priority, int file)
 {
-       unsigned long pgmoved;
+       unsigned long nr_taken;
        unsigned long pgscanned;
        unsigned long vm_flags;
        LIST_HEAD(l_hold);      /* The pages which were snipped off */
@@ -1252,10 +1309,11 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
        LIST_HEAD(l_inactive);
        struct page *page;
        struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
+       unsigned long nr_rotated = 0;
 
        lru_add_drain();
        spin_lock_irq(&zone->lru_lock);
-       pgmoved = sc->isolate_pages(nr_pages, &l_hold, &pgscanned, sc->order,
+       nr_taken = sc->isolate_pages(nr_pages, &l_hold, &pgscanned, sc->order,
                                        ISOLATE_ACTIVE, zone,
                                        sc->mem_cgroup, 1, file);
        /*
@@ -1265,16 +1323,16 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
        if (scanning_global_lru(sc)) {
                zone->pages_scanned += pgscanned;
        }
-       reclaim_stat->recent_scanned[!!file] += pgmoved;
+       reclaim_stat->recent_scanned[file] += nr_taken;
 
        __count_zone_vm_events(PGREFILL, zone, pgscanned);
        if (file)
-               __mod_zone_page_state(zone, NR_ACTIVE_FILE, -pgmoved);
+               __mod_zone_page_state(zone, NR_ACTIVE_FILE, -nr_taken);
        else
-               __mod_zone_page_state(zone, NR_ACTIVE_ANON, -pgmoved);
+               __mod_zone_page_state(zone, NR_ACTIVE_ANON, -nr_taken);
+       __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, nr_taken);
        spin_unlock_irq(&zone->lru_lock);
 
-       pgmoved = 0;  /* count referenced (mapping) mapped pages */
        while (!list_empty(&l_hold)) {
                cond_resched();
                page = lru_to_page(&l_hold);
@@ -1288,7 +1346,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                /* page_referenced clears PageReferenced */
                if (page_mapping_inuse(page) &&
                    page_referenced(page, 0, sc->mem_cgroup, &vm_flags)) {
-                       pgmoved++;
+                       nr_rotated++;
                        /*
                         * Identify referenced, file-backed active pages and
                         * give them one more trip around the active list. So
@@ -1304,6 +1362,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                        }
                }
 
+               ClearPageActive(page);  /* we are de-activating */
                list_add(&page->lru, &l_inactive);
        }
 
@@ -1317,13 +1376,13 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
         * helps balance scan pressure between file and anonymous pages in
         * get_scan_ratio.
         */
-       reclaim_stat->recent_rotated[!!file] += pgmoved;
+       reclaim_stat->recent_rotated[file] += nr_rotated;
 
        move_active_pages_to_lru(zone, &l_active,
                                                LRU_ACTIVE + file * LRU_FILE);
        move_active_pages_to_lru(zone, &l_inactive,
                                                LRU_BASE   + file * LRU_FILE);
-
+       __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);
        spin_unlock_irq(&zone->lru_lock);
 }
 
@@ -1429,10 +1488,10 @@ static void get_scan_ratio(struct zone *zone, struct scan_control *sc,
        unsigned long ap, fp;
        struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
 
-       anon  = zone_nr_pages(zone, sc, LRU_ACTIVE_ANON) +
-               zone_nr_pages(zone, sc, LRU_INACTIVE_ANON);
-       file  = zone_nr_pages(zone, sc, LRU_ACTIVE_FILE) +
-               zone_nr_pages(zone, sc, LRU_INACTIVE_FILE);
+       anon  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_ANON) +
+               zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON);
+       file  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_FILE) +
+               zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE);
 
        if (scanning_global_lru(sc)) {
                free  = zone_page_state(zone, NR_FREE_PAGES);
@@ -1526,6 +1585,7 @@ static void shrink_zone(int priority, struct zone *zone,
        enum lru_list l;
        unsigned long nr_reclaimed = sc->nr_reclaimed;
        unsigned long swap_cluster_max = sc->swap_cluster_max;
+       struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
        int noswap = 0;
 
        /* If we have no swap space, do not bother scanning anon pages. */
@@ -1540,17 +1600,14 @@ static void shrink_zone(int priority, struct zone *zone,
                int file = is_file_lru(l);
                unsigned long scan;
 
-               scan = zone_nr_pages(zone, sc, l);
+               scan = zone_nr_lru_pages(zone, sc, l);
                if (priority || noswap) {
                        scan >>= priority;
                        scan = (scan * percent[file]) / 100;
                }
-               if (scanning_global_lru(sc))
-                       nr[l] = nr_scan_try_batch(scan,
-                                                 &zone->lru[l].nr_saved_scan,
-                                                 swap_cluster_max);
-               else
-                       nr[l] = scan;
+               nr[l] = nr_scan_try_batch(scan,
+                                         &reclaim_stat->nr_saved_scan[l],
+                                         swap_cluster_max);
        }
 
        while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] ||
@@ -1685,7 +1742,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                        if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                                continue;
 
-                       lru_pages += zone_lru_pages(zone);
+                       lru_pages += zone_reclaimable_pages(zone);
                }
        }
 
@@ -1902,7 +1959,7 @@ loop_again:
                for (i = 0; i <= end_zone; i++) {
                        struct zone *zone = pgdat->node_zones + i;
 
-                       lru_pages += zone_lru_pages(zone);
+                       lru_pages += zone_reclaimable_pages(zone);
                }
 
                /*
@@ -1946,7 +2003,7 @@ loop_again:
                        if (zone_is_all_unreclaimable(zone))
                                continue;
                        if (nr_slab == 0 && zone->pages_scanned >=
-                                               (zone_lru_pages(zone) * 6))
+                                       (zone_reclaimable_pages(zone) * 6))
                                        zone_set_flag(zone,
                                                      ZONE_ALL_UNRECLAIMABLE);
                        /*
@@ -2113,12 +2170,39 @@ void wakeup_kswapd(struct zone *zone, int order)
        wake_up_interruptible(&pgdat->kswapd_wait);
 }
 
-unsigned long global_lru_pages(void)
+/*
+ * The reclaimable count would be mostly accurate.
+ * The less reclaimable pages may be
+ * - mlocked pages, which will be moved to unevictable list when encountered
+ * - mapped pages, which may require several travels to be reclaimed
+ * - dirty pages, which is not "instantly" reclaimable
+ */
+unsigned long global_reclaimable_pages(void)
+{
+       int nr;
+
+       nr = global_page_state(NR_ACTIVE_FILE) +
+            global_page_state(NR_INACTIVE_FILE);
+
+       if (nr_swap_pages > 0)
+               nr += global_page_state(NR_ACTIVE_ANON) +
+                     global_page_state(NR_INACTIVE_ANON);
+
+       return nr;
+}
+
+unsigned long zone_reclaimable_pages(struct zone *zone)
 {
-       return global_page_state(NR_ACTIVE_ANON)
-               + global_page_state(NR_ACTIVE_FILE)
-               + global_page_state(NR_INACTIVE_ANON)
-               + global_page_state(NR_INACTIVE_FILE);
+       int nr;
+
+       nr = zone_page_state(zone, NR_ACTIVE_FILE) +
+            zone_page_state(zone, NR_INACTIVE_FILE);
+
+       if (nr_swap_pages > 0)
+               nr += zone_page_state(zone, NR_ACTIVE_ANON) +
+                     zone_page_state(zone, NR_INACTIVE_ANON);
+
+       return nr;
 }
 
 #ifdef CONFIG_HIBERNATION
@@ -2133,6 +2217,7 @@ static void shrink_all_zones(unsigned long nr_pages, int prio,
 {
        struct zone *zone;
        unsigned long nr_reclaimed = 0;
+       struct zone_reclaim_stat *reclaim_stat;
 
        for_each_populated_zone(zone) {
                enum lru_list l;
@@ -2149,11 +2234,14 @@ static void shrink_all_zones(unsigned long nr_pages, int prio,
                                                l == LRU_ACTIVE_FILE))
                                continue;
 
-                       zone->lru[l].nr_saved_scan += (lru_pages >> prio) + 1;
-                       if (zone->lru[l].nr_saved_scan >= nr_pages || pass > 3) {
+                       reclaim_stat = get_reclaim_stat(zone, sc);
+                       reclaim_stat->nr_saved_scan[l] +=
+                                               (lru_pages >> prio) + 1;
+                       if (reclaim_stat->nr_saved_scan[l]
+                                               >= nr_pages || pass > 3) {
                                unsigned long nr_to_scan;
 
-                               zone->lru[l].nr_saved_scan = 0;
+                               reclaim_stat->nr_saved_scan[l] = 0;
                                nr_to_scan = min(nr_pages, lru_pages);
                                nr_reclaimed += shrink_list(l, nr_to_scan, zone,
                                                                sc, prio);
@@ -2190,7 +2278,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
 
        current->reclaim_state = &reclaim_state;
 
-       lru_pages = global_lru_pages();
+       lru_pages = global_reclaimable_pages();
        nr_slab = global_page_state(NR_SLAB_RECLAIMABLE);
        /* If slab caches are huge, it's better to hit them first */
        while (nr_slab >= lru_pages) {
@@ -2232,7 +2320,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
 
                        reclaim_state.reclaimed_slab = 0;
                        shrink_slab(sc.nr_scanned, sc.gfp_mask,
-                                       global_lru_pages());
+                                   global_reclaimable_pages());
                        sc.nr_reclaimed += reclaim_state.reclaimed_slab;
                        if (sc.nr_reclaimed >= nr_pages)
                                goto out;
@@ -2249,7 +2337,8 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
        if (!sc.nr_reclaimed) {
                do {
                        reclaim_state.reclaimed_slab = 0;
-                       shrink_slab(nr_pages, sc.gfp_mask, global_lru_pages());
+                       shrink_slab(nr_pages, sc.gfp_mask,
+                                   global_reclaimable_pages());
                        sc.nr_reclaimed += reclaim_state.reclaimed_slab;
                } while (sc.nr_reclaimed < nr_pages &&
                                reclaim_state.reclaimed_slab > 0);
@@ -2569,7 +2658,7 @@ static void check_move_unevictable_page(struct page *page, struct zone *zone)
 retry:
        ClearPageUnevictable(page);
        if (page_evictable(page, NULL)) {
-               enum lru_list l = LRU_INACTIVE_ANON + page_is_file_cache(page);
+               enum lru_list l = page_lru_base_type(page);
 
                __dec_zone_state(zone, NR_UNEVICTABLE);
                list_move(&page->lru, &zone->lru[l].list);
index 138bed5..c81321f 100644 (file)
@@ -639,11 +639,14 @@ static const char * const vmstat_text[] = {
        "nr_slab_reclaimable",
        "nr_slab_unreclaimable",
        "nr_page_table_pages",
+       "nr_kernel_stack",
        "nr_unstable",
        "nr_bounce",
        "nr_vmscan_write",
        "nr_writeback_temp",
-
+       "nr_isolated_anon",
+       "nr_isolated_file",
+       "nr_shmem",
 #ifdef CONFIG_NUMA
        "numa_hit",
        "numa_miss",
index 9bf0b73..b2e07f0 100644 (file)
@@ -43,6 +43,7 @@
 #include <net/9p/transport.h>
 #include <linux/scatterlist.h>
 #include <linux/virtio.h>
+#include <linux/virtio_ids.h>
 #include <linux/virtio_9p.h>
 
 #define VIRTQUEUE_NUM  128
@@ -200,7 +201,7 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
 
        req->status = REQ_STATUS_SENT;
 
-       if (chan->vq->vq_ops->add_buf(chan->vq, chan->sg, out, in, req->tc)) {
+       if (chan->vq->vq_ops->add_buf(chan->vq, chan->sg, out, in, req->tc) < 0) {
                P9_DPRINTK(P9_DEBUG_TRANS,
                        "9p debug: virtio rpc add_buf returned failure");
                return -EIO;
@@ -334,8 +335,6 @@ static void p9_virtio_remove(struct virtio_device *vdev)
        }
 }
 
-#define VIRTIO_ID_9P 9
-
 static struct virtio_device_id id_table[] = {
        { VIRTIO_ID_9P, VIRTIO_DEV_ANY_ID },
        { 0 },
index 09bedeb..49d8495 100644 (file)
@@ -577,11 +577,6 @@ static int hidp_session(void *arg)
        }
 
        if (session->hid) {
-               if (session->hid->claimed & HID_CLAIMED_INPUT)
-                       hidinput_disconnect(session->hid);
-               if (session->hid->claimed & HID_CLAIMED_HIDRAW)
-                       hidraw_disconnect(session->hid);
-
                hid_destroy_device(session->hid);
                session->hid = NULL;
        }
@@ -747,8 +742,6 @@ static void hidp_stop(struct hid_device *hid)
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);
 
-       if (hid->claimed & HID_CLAIMED_INPUT)
-               hidinput_disconnect(hid);
        hid->claimed = 0;
 }
 
index 30d5446..524712a 100644 (file)
@@ -1206,12 +1206,12 @@ EXPORT_SYMBOL_GPL(sk_setup_caps);
 
 void __init sk_init(void)
 {
-       if (num_physpages <= 4096) {
+       if (totalram_pages <= 4096) {
                sysctl_wmem_max = 32767;
                sysctl_rmem_max = 32767;
                sysctl_wmem_default = 32767;
                sysctl_rmem_default = 32767;
-       } else if (num_physpages >= 131072) {
+       } else if (totalram_pages >= 131072) {
                sysctl_wmem_max = 131071;
                sysctl_rmem_max = 131071;
        }
index 923db06..bc44670 100644 (file)
@@ -1049,10 +1049,10 @@ static int __init dccp_init(void)
         *
         * The methodology is similar to that of the buffer cache.
         */
-       if (num_physpages >= (128 * 1024))
-               goal = num_physpages >> (21 - PAGE_SHIFT);
+       if (totalram_pages >= (128 * 1024))
+               goal = totalram_pages >> (21 - PAGE_SHIFT);
        else
-               goal = num_physpages >> (23 - PAGE_SHIFT);
+               goal = totalram_pages >> (23 - PAGE_SHIFT);
 
        if (thash_entries)
                goal = (thash_entries *
index 9383d3e..57662ca 100644 (file)
@@ -1750,7 +1750,7 @@ void __init dn_route_init(void)
        dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
        add_timer(&dn_route_timer);
 
-       goal = num_physpages >> (26 - PAGE_SHIFT);
+       goal = totalram_pages >> (26 - PAGE_SHIFT);
 
        for(order = 0; (1UL << order) < goal; order++)
                /* NOTHING */;
index 91867d3..df93473 100644 (file)
@@ -3414,7 +3414,7 @@ int __init ip_rt_init(void)
                alloc_large_system_hash("IP route cache",
                                        sizeof(struct rt_hash_bucket),
                                        rhash_entries,
-                                       (num_physpages >= 128 * 1024) ?
+                                       (totalram_pages >= 128 * 1024) ?
                                        15 : 17,
                                        0,
                                        &rt_hash_log,
index 19a0612..21387eb 100644 (file)
@@ -2862,7 +2862,7 @@ void __init tcp_init(void)
                alloc_large_system_hash("TCP established",
                                        sizeof(struct inet_ehash_bucket),
                                        thash_entries,
-                                       (num_physpages >= 128 * 1024) ?
+                                       (totalram_pages >= 128 * 1024) ?
                                        13 : 15,
                                        0,
                                        &tcp_hashinfo.ehash_size,
@@ -2879,7 +2879,7 @@ void __init tcp_init(void)
                alloc_large_system_hash("TCP bind",
                                        sizeof(struct inet_bind_hashbucket),
                                        tcp_hashinfo.ehash_size,
-                                       (num_physpages >= 128 * 1024) ?
+                                       (totalram_pages >= 128 * 1024) ?
                                        13 : 15,
                                        0,
                                        &tcp_hashinfo.bhash_size,
index 3907510..090675e 100644 (file)
@@ -324,7 +324,7 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations ipmr_mfc_seq_ops = {
+static const struct seq_operations ipmr_mfc_seq_ops = {
        .start = ipmr_mfc_seq_start,
        .next  = ipmr_mfc_seq_next,
        .stop  = ipmr_mfc_seq_stop,
index b371098..7c9ec3d 100644 (file)
@@ -1245,9 +1245,9 @@ static int nf_conntrack_init_init_net(void)
         * machine has 512 buckets. >= 1GB machines have 16384 buckets. */
        if (!nf_conntrack_htable_size) {
                nf_conntrack_htable_size
-                       = (((num_physpages << PAGE_SHIFT) / 16384)
+                       = (((totalram_pages << PAGE_SHIFT) / 16384)
                           / sizeof(struct hlist_head));
-               if (num_physpages > (1024 * 1024 * 1024 / PAGE_SIZE))
+               if (totalram_pages > (1024 * 1024 * 1024 / PAGE_SIZE))
                        nf_conntrack_htable_size = 16384;
                if (nf_conntrack_htable_size < 32)
                        nf_conntrack_htable_size = 32;
index a6ac83a..f01955c 100644 (file)
@@ -617,7 +617,7 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
        int cpu;
 
        /* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */
-       if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > num_physpages)
+       if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages)
                return NULL;
 
        newinfo = kzalloc(XT_TABLE_INFO_SZ, GFP_KERNEL);
index 219dcdb..dd16e40 100644 (file)
@@ -194,9 +194,9 @@ static int htable_create_v0(struct xt_hashlimit_info *minfo, u_int8_t family)
        if (minfo->cfg.size)
                size = minfo->cfg.size;
        else {
-               size = ((num_physpages << PAGE_SHIFT) / 16384) /
+               size = ((totalram_pages << PAGE_SHIFT) / 16384) /
                       sizeof(struct list_head);
-               if (num_physpages > (1024 * 1024 * 1024 / PAGE_SIZE))
+               if (totalram_pages > (1024 * 1024 * 1024 / PAGE_SIZE))
                        size = 8192;
                if (size < 16)
                        size = 16;
@@ -266,9 +266,9 @@ static int htable_create(struct xt_hashlimit_mtinfo1 *minfo, u_int8_t family)
        if (minfo->cfg.size) {
                size = minfo->cfg.size;
        } else {
-               size = (num_physpages << PAGE_SHIFT) / 16384 /
+               size = (totalram_pages << PAGE_SHIFT) / 16384 /
                       sizeof(struct list_head);
-               if (num_physpages > 1024 * 1024 * 1024 / PAGE_SIZE)
+               if (totalram_pages > 1024 * 1024 * 1024 / PAGE_SIZE)
                        size = 8192;
                if (size < 16)
                        size = 16;
index c5aab6a..55180b9 100644 (file)
@@ -2091,10 +2091,10 @@ static int __init netlink_proto_init(void)
        if (!nl_table)
                goto panic;
 
-       if (num_physpages >= (128 * 1024))
-               limit = num_physpages >> (21 - PAGE_SHIFT);
+       if (totalram_pages >= (128 * 1024))
+               limit = totalram_pages >> (21 - PAGE_SHIFT);
        else
-               limit = num_physpages >> (23 - PAGE_SHIFT);
+               limit = totalram_pages >> (23 - PAGE_SHIFT);
 
        order = get_bitmask_order(limit) - 1 + PAGE_SHIFT;
        limit = (1UL << order) / sizeof(struct hlist_head);
index d923124..bc0019f 100644 (file)
@@ -96,7 +96,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
 }
 
 /*
- * allocate a new client call and attempt to to get a connection slot for it
+ * allocate a new client call and attempt to get a connection slot for it
  */
 static struct rxrpc_call *rxrpc_alloc_client_call(
        struct rxrpc_sock *rx,
index 375d64c..2c5c76b 100644 (file)
@@ -77,7 +77,7 @@
  *   The service curve parameters are converted to the internal
  *   representation. The slope values are scaled to avoid overflow.
  *   the inverse slope values as well as the y-projection of the 1st
- *   segment are kept in order to to avoid 64-bit divide operations
+ *   segment are kept in order to avoid 64-bit divide operations
  *   that are expensive on 32-bit architectures.
  */
 
index c557f1f..612dc87 100644 (file)
@@ -1184,10 +1184,10 @@ SCTP_STATIC __init int sctp_init(void)
        /* Size and allocate the association hash table.
         * The methodology is similar to that of the tcp hash tables.
         */
-       if (num_physpages >= (128 * 1024))
-               goal = num_physpages >> (22 - PAGE_SHIFT);
+       if (totalram_pages >= (128 * 1024))
+               goal = totalram_pages >> (22 - PAGE_SHIFT);
        else
-               goal = num_physpages >> (24 - PAGE_SHIFT);
+               goal = totalram_pages >> (24 - PAGE_SHIFT);
 
        for (order = 0; (1UL << order) < goal; order++)
                ;
index 2a022c0..49917a1 100644 (file)
@@ -86,6 +86,7 @@
 #include <linux/audit.h>
 #include <linux/wireless.h>
 #include <linux/nsproxy.h>
+#include <linux/magic.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -235,8 +236,6 @@ int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr,
        return __put_user(klen, ulen);
 }
 
-#define SOCKFS_MAGIC 0x534F434B
-
 static struct kmem_cache *sock_inode_cachep __read_mostly;
 
 static struct inode *sock_alloc_inode(struct super_block *sb)
@@ -285,7 +284,7 @@ static int init_inodecache(void)
        return 0;
 }
 
-static struct super_operations sockfs_ops = {
+static const struct super_operations sockfs_ops = {
        .alloc_inode =  sock_alloc_inode,
        .destroy_inode =sock_destroy_inode,
        .statfs =       simple_statfs,
index 0c431c2..54a4e04 100644 (file)
@@ -385,7 +385,7 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
 EXPORT_SYMBOL_GPL(rpcauth_init_cred);
 
 void
-rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred)
+rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred, int lookupflags)
 {
        task->tk_msg.rpc_cred = get_rpccred(cred);
        dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,
@@ -394,7 +394,7 @@ rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred)
 EXPORT_SYMBOL_GPL(rpcauth_generic_bind_cred);
 
 static void
-rpcauth_bind_root_cred(struct rpc_task *task)
+rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags)
 {
        struct rpc_auth *auth = task->tk_client->cl_auth;
        struct auth_cred acred = {
@@ -405,7 +405,7 @@ rpcauth_bind_root_cred(struct rpc_task *task)
 
        dprintk("RPC: %5u looking up %s cred\n",
                task->tk_pid, task->tk_client->cl_auth->au_ops->au_name);
-       ret = auth->au_ops->lookup_cred(auth, &acred, 0);
+       ret = auth->au_ops->lookup_cred(auth, &acred, lookupflags);
        if (!IS_ERR(ret))
                task->tk_msg.rpc_cred = ret;
        else
@@ -413,14 +413,14 @@ rpcauth_bind_root_cred(struct rpc_task *task)
 }
 
 static void
-rpcauth_bind_new_cred(struct rpc_task *task)
+rpcauth_bind_new_cred(struct rpc_task *task, int lookupflags)
 {
        struct rpc_auth *auth = task->tk_client->cl_auth;
        struct rpc_cred *ret;
 
        dprintk("RPC: %5u looking up %s cred\n",
                task->tk_pid, auth->au_ops->au_name);
-       ret = rpcauth_lookupcred(auth, 0);
+       ret = rpcauth_lookupcred(auth, lookupflags);
        if (!IS_ERR(ret))
                task->tk_msg.rpc_cred = ret;
        else
@@ -430,12 +430,16 @@ rpcauth_bind_new_cred(struct rpc_task *task)
 void
 rpcauth_bindcred(struct rpc_task *task, struct rpc_cred *cred, int flags)
 {
+       int lookupflags = 0;
+
+       if (flags & RPC_TASK_ASYNC)
+               lookupflags |= RPCAUTH_LOOKUP_NEW;
        if (cred != NULL)
-               cred->cr_ops->crbind(task, cred);
+               cred->cr_ops->crbind(task, cred, lookupflags);
        else if (flags & RPC_TASK_ROOTCREDS)
-               rpcauth_bind_root_cred(task);
+               rpcauth_bind_root_cred(task, lookupflags);
        else
-               rpcauth_bind_new_cred(task);
+               rpcauth_bind_new_cred(task, lookupflags);
 }
 
 void
index 4028502..bf88bf8 100644 (file)
@@ -55,13 +55,13 @@ struct rpc_cred *rpc_lookup_machine_cred(void)
 EXPORT_SYMBOL_GPL(rpc_lookup_machine_cred);
 
 static void
-generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred)
+generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred, int lookupflags)
 {
        struct rpc_auth *auth = task->tk_client->cl_auth;
        struct auth_cred *acred = &container_of(cred, struct generic_cred, gc_base)->acred;
        struct rpc_cred *ret;
 
-       ret = auth->au_ops->lookup_cred(auth, acred, 0);
+       ret = auth->au_ops->lookup_cred(auth, acred, lookupflags);
        if (!IS_ERR(ret))
                task->tk_msg.rpc_cred = ret;
        else
index 2e6a148..f6c51e5 100644 (file)
@@ -1374,8 +1374,10 @@ svcauth_gss_release(struct svc_rqst *rqstp)
                if (stat)
                        goto out_err;
                break;
-       default:
-               goto out_err;
+       /*
+        * For any other gc_svc value, svcauth_gss_accept() already set
+        * the auth_error appropriately; just fall through:
+        */
        }
 
 out:
index 45cdaff..d6eee29 100644 (file)
@@ -103,23 +103,21 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
 EXPORT_SYMBOL_GPL(sunrpc_cache_lookup);
 
 
-static void queue_loose(struct cache_detail *detail, struct cache_head *ch);
+static void cache_dequeue(struct cache_detail *detail, struct cache_head *ch);
 
-static int cache_fresh_locked(struct cache_head *head, time_t expiry)
+static void cache_fresh_locked(struct cache_head *head, time_t expiry)
 {
        head->expiry_time = expiry;
        head->last_refresh = get_seconds();
-       return !test_and_set_bit(CACHE_VALID, &head->flags);
+       set_bit(CACHE_VALID, &head->flags);
 }
 
 static void cache_fresh_unlocked(struct cache_head *head,
-                       struct cache_detail *detail, int new)
+                                struct cache_detail *detail)
 {
-       if (new)
-               cache_revisit_request(head);
        if (test_and_clear_bit(CACHE_PENDING, &head->flags)) {
                cache_revisit_request(head);
-               queue_loose(detail, head);
+               cache_dequeue(detail, head);
        }
 }
 
@@ -132,7 +130,6 @@ struct cache_head *sunrpc_cache_update(struct cache_detail *detail,
         */
        struct cache_head **head;
        struct cache_head *tmp;
-       int is_new;
 
        if (!test_bit(CACHE_VALID, &old->flags)) {
                write_lock(&detail->hash_lock);
@@ -141,9 +138,9 @@ struct cache_head *sunrpc_cache_update(struct cache_detail *detail,
                                set_bit(CACHE_NEGATIVE, &old->flags);
                        else
                                detail->update(old, new);
-                       is_new = cache_fresh_locked(old, new->expiry_time);
+                       cache_fresh_locked(old, new->expiry_time);
                        write_unlock(&detail->hash_lock);
-                       cache_fresh_unlocked(old, detail, is_new);
+                       cache_fresh_unlocked(old, detail);
                        return old;
                }
                write_unlock(&detail->hash_lock);
@@ -167,11 +164,11 @@ struct cache_head *sunrpc_cache_update(struct cache_detail *detail,
        *head = tmp;
        detail->entries++;
        cache_get(tmp);
-       is_new = cache_fresh_locked(tmp, new->expiry_time);
+       cache_fresh_locked(tmp, new->expiry_time);
        cache_fresh_locked(old, 0);
        write_unlock(&detail->hash_lock);
-       cache_fresh_unlocked(tmp, detail, is_new);
-       cache_fresh_unlocked(old, detail, 0);
+       cache_fresh_unlocked(tmp, detail);
+       cache_fresh_unlocked(old, detail);
        cache_put(old, detail);
        return tmp;
 }
@@ -184,6 +181,22 @@ static int cache_make_upcall(struct cache_detail *cd, struct cache_head *h)
        return cd->cache_upcall(cd, h);
 }
 
+static inline int cache_is_valid(struct cache_detail *detail, struct cache_head *h)
+{
+       if (!test_bit(CACHE_VALID, &h->flags) ||
+           h->expiry_time < get_seconds())
+               return -EAGAIN;
+       else if (detail->flush_time > h->last_refresh)
+               return -EAGAIN;
+       else {
+               /* entry is valid */
+               if (test_bit(CACHE_NEGATIVE, &h->flags))
+                       return -ENOENT;
+               else
+                       return 0;
+       }
+}
+
 /*
  * This is the generic cache management routine for all
  * the authentication caches.
@@ -192,8 +205,10 @@ static int cache_make_upcall(struct cache_detail *cd, struct cache_head *h)
  *
  *
  * Returns 0 if the cache_head can be used, or cache_puts it and returns
- * -EAGAIN if upcall is pending,
- * -ETIMEDOUT if upcall failed and should be retried,
+ * -EAGAIN if upcall is pending and request has been queued
+ * -ETIMEDOUT if upcall failed or request could not be queue or
+ *           upcall completed but item is still invalid (implying that
+ *           the cache item has been replaced with a newer one).
  * -ENOENT if cache entry was negative
  */
 int cache_check(struct cache_detail *detail,
@@ -203,17 +218,7 @@ int cache_check(struct cache_detail *detail,
        long refresh_age, age;
 
        /* First decide return status as best we can */
-       if (!test_bit(CACHE_VALID, &h->flags) ||
-           h->expiry_time < get_seconds())
-               rv = -EAGAIN;
-       else if (detail->flush_time > h->last_refresh)
-               rv = -EAGAIN;
-       else {
-               /* entry is valid */
-               if (test_bit(CACHE_NEGATIVE, &h->flags))
-                       rv = -ENOENT;
-               else rv = 0;
-       }
+       rv = cache_is_valid(detail, h);
 
        /* now see if we want to start an upcall */
        refresh_age = (h->expiry_time - h->last_refresh);
@@ -229,10 +234,11 @@ int cache_check(struct cache_detail *detail,
                        switch (cache_make_upcall(detail, h)) {
                        case -EINVAL:
                                clear_bit(CACHE_PENDING, &h->flags);
+                               cache_revisit_request(h);
                                if (rv == -EAGAIN) {
                                        set_bit(CACHE_NEGATIVE, &h->flags);
-                                       cache_fresh_unlocked(h, detail,
-                                            cache_fresh_locked(h, get_seconds()+CACHE_NEW_EXPIRY));
+                                       cache_fresh_locked(h, get_seconds()+CACHE_NEW_EXPIRY);
+                                       cache_fresh_unlocked(h, detail);
                                        rv = -ENOENT;
                                }
                                break;
@@ -245,10 +251,14 @@ int cache_check(struct cache_detail *detail,
                }
        }
 
-       if (rv == -EAGAIN)
-               if (cache_defer_req(rqstp, h) != 0)
-                       rv = -ETIMEDOUT;
-
+       if (rv == -EAGAIN) {
+               if (cache_defer_req(rqstp, h) < 0) {
+                       /* Request is not deferred */
+                       rv = cache_is_valid(detail, h);
+                       if (rv == -EAGAIN)
+                               rv = -ETIMEDOUT;
+               }
+       }
        if (rv)
                cache_put(h, detail);
        return rv;
@@ -396,7 +406,7 @@ static int cache_clean(void)
                                )
                                continue;
                        if (test_and_clear_bit(CACHE_PENDING, &ch->flags))
-                               queue_loose(current_detail, ch);
+                               cache_dequeue(current_detail, ch);
 
                        if (atomic_read(&ch->ref.refcount) == 1)
                                break;
@@ -412,8 +422,10 @@ static int cache_clean(void)
                if (!ch)
                        current_index ++;
                spin_unlock(&cache_list_lock);
-               if (ch)
+               if (ch) {
+                       cache_revisit_request(ch);
                        cache_put(ch, d);
+               }
        } else
                spin_unlock(&cache_list_lock);
 
@@ -488,7 +500,7 @@ static int cache_defer_cnt;
 
 static int cache_defer_req(struct cache_req *req, struct cache_head *item)
 {
-       struct cache_deferred_req *dreq;
+       struct cache_deferred_req *dreq, *discard;
        int hash = DFR_HASH(item);
 
        if (cache_defer_cnt >= DFR_MAX) {
@@ -496,11 +508,11 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
                 * or continue and drop the oldest below
                 */
                if (net_random()&1)
-                       return -ETIMEDOUT;
+                       return -ENOMEM;
        }
        dreq = req->defer(req);
        if (dreq == NULL)
-               return -ETIMEDOUT;
+               return -ENOMEM;
 
        dreq->item = item;
 
@@ -513,23 +525,24 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
        list_add(&dreq->hash, &cache_defer_hash[hash]);
 
        /* it is in, now maybe clean up */
-       dreq = NULL;
+       discard = NULL;
        if (++cache_defer_cnt > DFR_MAX) {
-               dreq = list_entry(cache_defer_list.prev,
-                                 struct cache_deferred_req, recent);
-               list_del(&dreq->recent);
-               list_del(&dreq->hash);
+               discard = list_entry(cache_defer_list.prev,
+                                    struct cache_deferred_req, recent);
+               list_del_init(&discard->recent);
+               list_del_init(&discard->hash);
                cache_defer_cnt--;
        }
        spin_unlock(&cache_defer_lock);
 
-       if (dreq) {
+       if (discard)
                /* there was one too many */
-               dreq->revisit(dreq, 1);
-       }
+               discard->revisit(discard, 1);
+
        if (!test_bit(CACHE_PENDING, &item->flags)) {
                /* must have just been validated... */
                cache_revisit_request(item);
+               return -EAGAIN;
        }
        return 0;
 }
@@ -551,7 +564,7 @@ static void cache_revisit_request(struct cache_head *item)
                        dreq = list_entry(lp, struct cache_deferred_req, hash);
                        lp = lp->next;
                        if (dreq->item == item) {
-                               list_del(&dreq->hash);
+                               list_del_init(&dreq->hash);
                                list_move(&dreq->recent, &pending);
                                cache_defer_cnt--;
                        }
@@ -577,7 +590,7 @@ void cache_clean_deferred(void *owner)
 
        list_for_each_entry_safe(dreq, tmp, &cache_defer_list, recent) {
                if (dreq->owner == owner) {
-                       list_del(&dreq->hash);
+                       list_del_init(&dreq->hash);
                        list_move(&dreq->recent, &pending);
                        cache_defer_cnt--;
                }
@@ -887,7 +900,7 @@ static int cache_release(struct inode *inode, struct file *filp,
 
 
 
-static void queue_loose(struct cache_detail *detail, struct cache_head *ch)
+static void cache_dequeue(struct cache_detail *detail, struct cache_head *ch)
 {
        struct cache_queue *cq;
        spin_lock(&queue_lock);
index fac0ca9..a417d5a 100644 (file)
@@ -288,6 +288,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                .srcaddr = args->saddress,
                .dstaddr = args->address,
                .addrlen = args->addrsize,
+               .bc_xprt = args->bc_xprt,
        };
        char servername[48];
 
index 7f676bd..858a443 100644 (file)
@@ -930,7 +930,7 @@ void rpc_remove_cache_dir(struct dentry *dentry)
 /*
  * populate the filesystem
  */
-static struct super_operations s_ops = {
+static const struct super_operations s_ops = {
        .alloc_inode    = rpc_alloc_inode,
        .destroy_inode  = rpc_destroy_inode,
        .statfs         = simple_statfs,
index 8f459ab..cef74ba 100644 (file)
@@ -21,6 +21,8 @@
 
 #include <linux/sunrpc/clnt.h>
 
+#include "sunrpc.h"
+
 #ifdef RPC_DEBUG
 #define RPCDBG_FACILITY                RPCDBG_SCHED
 #define RPC_TASK_MAGIC_ID      0xf00baa
@@ -711,11 +713,6 @@ static void rpc_async_schedule(struct work_struct *work)
        __rpc_execute(container_of(work, struct rpc_task, u.tk_work));
 }
 
-struct rpc_buffer {
-       size_t  len;
-       char    data[];
-};
-
 /**
  * rpc_malloc - allocate an RPC buffer
  * @task: RPC task that will use this buffer
index 5d9dd74..90c292e 100644 (file)
@@ -27,11 +27,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _NET_SUNRPC_SUNRPC_H
 #define _NET_SUNRPC_SUNRPC_H
 
+#include <linux/net.h>
+
+/*
+ * Header for dynamically allocated rpc buffers.
+ */
+struct rpc_buffer {
+       size_t  len;
+       char    data[];
+};
+
 static inline int rpc_reply_expected(struct rpc_task *task)
 {
        return (task->tk_msg.rpc_proc != NULL) &&
                (task->tk_msg.rpc_proc->p_decode != NULL);
 }
 
+int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
+                   struct page *headpage, unsigned long headoffset,
+                   struct page *tailpage, unsigned long tailoffset);
+
 #endif /* _NET_SUNRPC_SUNRPC_H */
 
index 27d4433..df124f7 100644 (file)
@@ -160,6 +160,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt,
        mutex_init(&xprt->xpt_mutex);
        spin_lock_init(&xprt->xpt_lock);
        set_bit(XPT_BUSY, &xprt->xpt_flags);
+       rpc_init_wait_queue(&xprt->xpt_bc_pending, "xpt_bc_pending");
 }
 EXPORT_SYMBOL_GPL(svc_xprt_init);
 
@@ -710,10 +711,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
        spin_unlock_bh(&pool->sp_lock);
 
        len = 0;
-       if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
-               dprintk("svc_recv: found XPT_CLOSE\n");
-               svc_delete_xprt(xprt);
-       } else if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {
+       if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {
                struct svc_xprt *newxpt;
                newxpt = xprt->xpt_ops->xpo_accept(xprt);
                if (newxpt) {
@@ -739,7 +737,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
                        svc_xprt_received(newxpt);
                }
                svc_xprt_received(xprt);
-       } else {
+       } else if (!test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
                dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",
                        rqstp, pool->sp_id, xprt,
                        atomic_read(&xprt->xpt_ref.refcount));
@@ -752,6 +750,11 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
                dprintk("svc: got len=%d\n", len);
        }
 
+       if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
+               dprintk("svc_recv: found XPT_CLOSE\n");
+               svc_delete_xprt(xprt);
+       }
+
        /* No data, incomplete (TCP) read, or accept() */
        if (len == 0 || len == -EAGAIN) {
                rqstp->rq_res.len = 0;
@@ -808,6 +811,7 @@ int svc_send(struct svc_rqst *rqstp)
        else
                len = xprt->xpt_ops->xpo_sendto(rqstp);
        mutex_unlock(&xprt->xpt_mutex);
+       rpc_wake_up(&xprt->xpt_bc_pending);
        svc_xprt_release(rqstp);
 
        if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN)
@@ -1166,11 +1170,6 @@ static void *svc_pool_stats_start(struct seq_file *m, loff_t *pos)
 
        dprintk("svc_pool_stats_start, *pidx=%u\n", pidx);
 
-       lock_kernel();
-       /* bump up the pseudo refcount while traversing */
-       svc_get(serv);
-       unlock_kernel();
-
        if (!pidx)
                return SEQ_START_TOKEN;
        return (pidx > serv->sv_nrpools ? NULL : &serv->sv_pools[pidx-1]);
@@ -1198,12 +1197,6 @@ static void *svc_pool_stats_next(struct seq_file *m, void *p, loff_t *pos)
 
 static void svc_pool_stats_stop(struct seq_file *m, void *p)
 {
-       struct svc_serv *serv = m->private;
-
-       lock_kernel();
-       /* this function really, really should have been called svc_put() */
-       svc_destroy(serv);
-       unlock_kernel();
 }
 
 static int svc_pool_stats_show(struct seq_file *m, void *p)
index 6caffa3..117f68a 100644 (file)
@@ -668,6 +668,7 @@ static int unix_gid_find(uid_t uid, struct group_info **gip,
        case 0:
                *gip = ug->gi;
                get_group_info(*gip);
+               cache_put(&ug->h, &unix_gid_cache);
                return 0;
        default:
                return -EAGAIN;
index 23128ee..ccc5e83 100644 (file)
@@ -49,6 +49,7 @@
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/stats.h>
+#include <linux/sunrpc/xprt.h>
 
 #define RPCDBG_FACILITY        RPCDBG_SVCXPRT
 
@@ -153,49 +154,27 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)
 }
 
 /*
- * Generic sendto routine
+ * send routine intended to be shared by the fore- and back-channel
  */
-static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
+int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
+                   struct page *headpage, unsigned long headoffset,
+                   struct page *tailpage, unsigned long tailoffset)
 {
-       struct svc_sock *svsk =
-               container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
-       struct socket   *sock = svsk->sk_sock;
-       int             slen;
-       union {
-               struct cmsghdr  hdr;
-               long            all[SVC_PKTINFO_SPACE / sizeof(long)];
-       } buffer;
-       struct cmsghdr *cmh = &buffer.hdr;
-       int             len = 0;
        int             result;
        int             size;
        struct page     **ppage = xdr->pages;
        size_t          base = xdr->page_base;
        unsigned int    pglen = xdr->page_len;
        unsigned int    flags = MSG_MORE;
-       RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
+       int             slen;
+       int             len = 0;
 
        slen = xdr->len;
 
-       if (rqstp->rq_prot == IPPROTO_UDP) {
-               struct msghdr msg = {
-                       .msg_name       = &rqstp->rq_addr,
-                       .msg_namelen    = rqstp->rq_addrlen,
-                       .msg_control    = cmh,
-                       .msg_controllen = sizeof(buffer),
-                       .msg_flags      = MSG_MORE,
-               };
-
-               svc_set_cmsg_data(rqstp, cmh);
-
-               if (sock_sendmsg(sock, &msg, 0) < 0)
-                       goto out;
-       }
-
        /* send head */
        if (slen == xdr->head[0].iov_len)
                flags = 0;
-       len = kernel_sendpage(sock, rqstp->rq_respages[0], 0,
+       len = kernel_sendpage(sock, headpage, headoffset,
                                  xdr->head[0].iov_len, flags);
        if (len != xdr->head[0].iov_len)
                goto out;
@@ -219,16 +198,58 @@ static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
                base = 0;
                ppage++;
        }
+
        /* send tail */
        if (xdr->tail[0].iov_len) {
-               result = kernel_sendpage(sock, rqstp->rq_respages[0],
-                                            ((unsigned long)xdr->tail[0].iov_base)
-                                               & (PAGE_SIZE-1),
-                                            xdr->tail[0].iov_len, 0);
-
+               result = kernel_sendpage(sock, tailpage, tailoffset,
+                                  xdr->tail[0].iov_len, 0);
                if (result > 0)
                        len += result;
        }
+
+out:
+       return len;
+}
+
+
+/*
+ * Generic sendto routine
+ */
+static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
+{
+       struct svc_sock *svsk =
+               container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
+       struct socket   *sock = svsk->sk_sock;
+       union {
+               struct cmsghdr  hdr;
+               long            all[SVC_PKTINFO_SPACE / sizeof(long)];
+       } buffer;
+       struct cmsghdr *cmh = &buffer.hdr;
+       int             len = 0;
+       unsigned long tailoff;
+       unsigned long headoff;
+       RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
+
+       if (rqstp->rq_prot == IPPROTO_UDP) {
+               struct msghdr msg = {
+                       .msg_name       = &rqstp->rq_addr,
+                       .msg_namelen    = rqstp->rq_addrlen,
+                       .msg_control    = cmh,
+                       .msg_controllen = sizeof(buffer),
+                       .msg_flags      = MSG_MORE,
+               };
+
+               svc_set_cmsg_data(rqstp, cmh);
+
+               if (sock_sendmsg(sock, &msg, 0) < 0)
+                       goto out;
+       }
+
+       tailoff = ((unsigned long)xdr->tail[0].iov_base) & (PAGE_SIZE-1);
+       headoff = 0;
+       len = svc_send_common(sock, xdr, rqstp->rq_respages[0], headoff,
+                              rqstp->rq_respages[0], tailoff);
+
 out:
        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n",
                svsk, xdr->head[0].iov_base, xdr->head[0].iov_len,
@@ -431,6 +452,32 @@ static void svc_tcp_write_space(struct sock *sk)
        svc_write_space(sk);
 }
 
+/*
+ * See net/ipv6/ip_sockglue.c : ip_cmsg_recv_pktinfo
+ */
+static int svc_udp_get_dest_address4(struct svc_rqst *rqstp,
+                                    struct cmsghdr *cmh)
+{
+       struct in_pktinfo *pki = CMSG_DATA(cmh);
+       if (cmh->cmsg_type != IP_PKTINFO)
+               return 0;
+       rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
+       return 1;
+}
+
+/*
+ * See net/ipv6/datagram.c : datagram_recv_ctl
+ */
+static int svc_udp_get_dest_address6(struct svc_rqst *rqstp,
+                                    struct cmsghdr *cmh)
+{
+       struct in6_pktinfo *pki = CMSG_DATA(cmh);
+       if (cmh->cmsg_type != IPV6_PKTINFO)
+               return 0;
+       ipv6_addr_copy(&rqstp->rq_daddr.addr6, &pki->ipi6_addr);
+       return 1;
+}
+
 /*
  * Copy the UDP datagram's destination address to the rqstp structure.
  * The 'destination' address in this case is the address to which the
@@ -438,23 +485,17 @@ static void svc_tcp_write_space(struct sock *sk)
  * hosts, this can change from msg to msg. Note that only the IP
  * address changes, the port number should remain the same.
  */
-static void svc_udp_get_dest_address(struct svc_rqst *rqstp,
-                                    struct cmsghdr *cmh)
+static int svc_udp_get_dest_address(struct svc_rqst *rqstp,
+                                   struct cmsghdr *cmh)
 {
-       struct svc_sock *svsk =
-               container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
-       switch (svsk->sk_sk->sk_family) {
-       case AF_INET: {
-               struct in_pktinfo *pki = CMSG_DATA(cmh);
-               rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
-               break;
-               }
-       case AF_INET6: {
-               struct in6_pktinfo *pki = CMSG_DATA(cmh);
-               ipv6_addr_copy(&rqstp->rq_daddr.addr6, &pki->ipi6_addr);
-               break;
-               }
+       switch (cmh->cmsg_level) {
+       case SOL_IP:
+               return svc_udp_get_dest_address4(rqstp, cmh);
+       case SOL_IPV6:
+               return svc_udp_get_dest_address6(rqstp, cmh);
        }
+
+       return 0;
 }
 
 /*
@@ -531,16 +572,15 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
 
        rqstp->rq_prot = IPPROTO_UDP;
 
-       if (cmh->cmsg_level != IPPROTO_IP ||
-           cmh->cmsg_type != IP_PKTINFO) {
+       if (!svc_udp_get_dest_address(rqstp, cmh)) {
                if (net_ratelimit())
-                       printk("rpcsvc: received unknown control message:"
-                              "%d/%d\n",
-                              cmh->cmsg_level, cmh->cmsg_type);
+                       printk(KERN_WARNING
+                               "svc: received unknown control message %d/%d; "
+                               "dropping RPC reply datagram\n",
+                                       cmh->cmsg_level, cmh->cmsg_type);
                skb_free_datagram(svsk->sk_sk, skb);
                return 0;
        }
-       svc_udp_get_dest_address(rqstp, cmh);
 
        if (skb_is_nonlinear(skb)) {
                /* we have to copy */
@@ -651,8 +691,7 @@ static struct svc_xprt_class svc_udp_class = {
 
 static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
 {
-       int one = 1;
-       mm_segment_t oldfs;
+       int err, level, optname, one = 1;
 
        svc_xprt_init(&svc_udp_class, &svsk->sk_xprt, serv);
        clear_bit(XPT_CACHE_AUTH, &svsk->sk_xprt.xpt_flags);
@@ -671,12 +710,22 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
        set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
        set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags);
 
-       oldfs = get_fs();
-       set_fs(KERNEL_DS);
        /* make sure we get destination address info */
-       svsk->sk_sock->ops->setsockopt(svsk->sk_sock, IPPROTO_IP, IP_PKTINFO,
-                                      (char __user *)&one, sizeof(one));
-       set_fs(oldfs);
+       switch (svsk->sk_sk->sk_family) {
+       case AF_INET:
+               level = SOL_IP;
+               optname = IP_PKTINFO;
+               break;
+       case AF_INET6:
+               level = SOL_IPV6;
+               optname = IPV6_RECVPKTINFO;
+               break;
+       default:
+               BUG();
+       }
+       err = kernel_setsockopt(svsk->sk_sock, level, optname,
+                                       (char *)&one, sizeof(one));
+       dprintk("svc: kernel_setsockopt returned %d\n", err);
 }
 
 /*
@@ -826,21 +875,15 @@ failed:
 }
 
 /*
- * Receive data from a TCP socket.
+ * Receive data.
+ * If we haven't gotten the record length yet, get the next four bytes.
+ * Otherwise try to gobble up as much as possible up to the complete
+ * record length.
  */
-static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
+static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)
 {
-       struct svc_sock *svsk =
-               container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
        struct svc_serv *serv = svsk->sk_xprt.xpt_server;
-       int             len;
-       struct kvec *vec;
-       int pnum, vlen;
-
-       dprintk("svc: tcp_recv %p data %d conn %d close %d\n",
-               svsk, test_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags),
-               test_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags),
-               test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));
+       int len;
 
        if (test_and_clear_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags))
                /* sndbuf needs to have room for one request
@@ -861,10 +904,6 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
 
        clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 
-       /* Receive data. If we haven't got the record length yet, get
-        * the next four bytes. Otherwise try to gobble up as much as
-        * possible up to the complete record length.
-        */
        if (svsk->sk_tcplen < sizeof(rpc_fraghdr)) {
                int             want = sizeof(rpc_fraghdr) - svsk->sk_tcplen;
                struct kvec     iov;
@@ -879,7 +918,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
                        dprintk("svc: short recvfrom while reading record "
                                "length (%d of %d)\n", len, want);
                        svc_xprt_received(&svsk->sk_xprt);
-                       return -EAGAIN; /* record header not complete */
+                       goto err_again; /* record header not complete */
                }
 
                svsk->sk_reclen = ntohl(svsk->sk_reclen);
@@ -894,6 +933,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
                                        "per record not supported\n");
                        goto err_delete;
                }
+
                svsk->sk_reclen &= RPC_FRAGMENT_SIZE_MASK;
                dprintk("svc: TCP record, %d bytes\n", svsk->sk_reclen);
                if (svsk->sk_reclen > serv->sv_max_mesg) {
@@ -914,17 +954,121 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
                dprintk("svc: incomplete TCP record (%d of %d)\n",
                        len, svsk->sk_reclen);
                svc_xprt_received(&svsk->sk_xprt);
-               return -EAGAIN; /* record not complete */
+               goto err_again; /* record not complete */
        }
        len = svsk->sk_reclen;
        set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 
+       return len;
+ error:
+       if (len == -EAGAIN) {
+               dprintk("RPC: TCP recv_record got EAGAIN\n");
+               svc_xprt_received(&svsk->sk_xprt);
+       }
+       return len;
+ err_delete:
+       set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
+ err_again:
+       return -EAGAIN;
+}
+
+static int svc_process_calldir(struct svc_sock *svsk, struct svc_rqst *rqstp,
+                              struct rpc_rqst **reqpp, struct kvec *vec)
+{
+       struct rpc_rqst *req = NULL;
+       u32 *p;
+       u32 xid;
+       u32 calldir;
+       int len;
+
+       len = svc_recvfrom(rqstp, vec, 1, 8);
+       if (len < 0)
+               goto error;
+
+       p = (u32 *)rqstp->rq_arg.head[0].iov_base;
+       xid = *p++;
+       calldir = *p;
+
+       if (calldir == 0) {
+               /* REQUEST is the most common case */
+               vec[0] = rqstp->rq_arg.head[0];
+       } else {
+               /* REPLY */
+               if (svsk->sk_bc_xprt)
+                       req = xprt_lookup_rqst(svsk->sk_bc_xprt, xid);
+
+               if (!req) {
+                       printk(KERN_NOTICE
+                               "%s: Got unrecognized reply: "
+                               "calldir 0x%x sk_bc_xprt %p xid %08x\n",
+                               __func__, ntohl(calldir),
+                               svsk->sk_bc_xprt, xid);
+                       vec[0] = rqstp->rq_arg.head[0];
+                       goto out;
+               }
+
+               memcpy(&req->rq_private_buf, &req->rq_rcv_buf,
+                      sizeof(struct xdr_buf));
+               /* copy the xid and call direction */
+               memcpy(req->rq_private_buf.head[0].iov_base,
+                      rqstp->rq_arg.head[0].iov_base, 8);
+               vec[0] = req->rq_private_buf.head[0];
+       }
+ out:
+       vec[0].iov_base += 8;
+       vec[0].iov_len -= 8;
+       len = svsk->sk_reclen - 8;
+ error:
+       *reqpp = req;
+       return len;
+}
+
+/*
+ * Receive data from a TCP socket.
+ */
+static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
+{
+       struct svc_sock *svsk =
+               container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
+       struct svc_serv *serv = svsk->sk_xprt.xpt_server;
+       int             len;
+       struct kvec *vec;
+       int pnum, vlen;
+       struct rpc_rqst *req = NULL;
+
+       dprintk("svc: tcp_recv %p data %d conn %d close %d\n",
+               svsk, test_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags),
+               test_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags),
+               test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));
+
+       len = svc_tcp_recv_record(svsk, rqstp);
+       if (len < 0)
+               goto error;
+
        vec = rqstp->rq_vec;
        vec[0] = rqstp->rq_arg.head[0];
        vlen = PAGE_SIZE;
+
+       /*
+        * We have enough data for the whole tcp record. Let's try and read the
+        * first 8 bytes to get the xid and the call direction. We can use this
+        * to figure out if this is a call or a reply to a callback. If
+        * sk_reclen is < 8 (xid and calldir), then this is a malformed packet.
+        * In that case, don't bother with the calldir and just read the data.
+        * It will be rejected in svc_process.
+        */
+       if (len >= 8) {
+               len = svc_process_calldir(svsk, rqstp, &req, vec);
+               if (len < 0)
+                       goto err_again;
+               vlen -= 8;
+       }
+
        pnum = 1;
        while (vlen < len) {
-               vec[pnum].iov_base = page_address(rqstp->rq_pages[pnum]);
+               vec[pnum].iov_base = (req) ?
+                       page_address(req->rq_private_buf.pages[pnum - 1]) :
+                       page_address(rqstp->rq_pages[pnum]);
                vec[pnum].iov_len = PAGE_SIZE;
                pnum++;
                vlen += PAGE_SIZE;
@@ -934,8 +1078,18 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
        /* Now receive data */
        len = svc_recvfrom(rqstp, vec, pnum, len);
        if (len < 0)
-               goto error;
+               goto err_again;
 
+       /*
+        * Account for the 8 bytes we read earlier
+        */
+       len += 8;
+
+       if (req) {
+               xprt_complete_rqst(req->rq_task, len);
+               len = 0;
+               goto out;
+       }
        dprintk("svc: TCP complete record (%d bytes)\n", len);
        rqstp->rq_arg.len = len;
        rqstp->rq_arg.page_base = 0;
@@ -949,6 +1103,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
        rqstp->rq_xprt_ctxt   = NULL;
        rqstp->rq_prot        = IPPROTO_TCP;
 
+out:
        /* Reset TCP read info */
        svsk->sk_reclen = 0;
        svsk->sk_tcplen = 0;
@@ -960,21 +1115,19 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
 
        return len;
 
- err_delete:
-       set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
-       return -EAGAIN;
-
- error:
+err_again:
        if (len == -EAGAIN) {
                dprintk("RPC: TCP recvfrom got EAGAIN\n");
                svc_xprt_received(&svsk->sk_xprt);
-       } else {
+               return len;
+       }
+error:
+       if (len != -EAGAIN) {
                printk(KERN_NOTICE "%s: recvfrom returned errno %d\n",
                       svsk->sk_xprt.xpt_server->sv_name, -len);
-               goto err_delete;
+               set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
        }
-
-       return len;
+       return -EAGAIN;
 }
 
 /*
index f412a85..fd46d42 100644 (file)
@@ -832,6 +832,11 @@ static void xprt_timer(struct rpc_task *task)
        spin_unlock_bh(&xprt->transport_lock);
 }
 
+static inline int xprt_has_timer(struct rpc_xprt *xprt)
+{
+       return xprt->idle_timeout != 0;
+}
+
 /**
  * xprt_prepare_transmit - reserve the transport before sending a request
  * @task: RPC task about to send a request
@@ -1013,7 +1018,7 @@ void xprt_release(struct rpc_task *task)
        if (!list_empty(&req->rq_list))
                list_del(&req->rq_list);
        xprt->last_used = jiffies;
-       if (list_empty(&xprt->recv))
+       if (list_empty(&xprt->recv) && xprt_has_timer(xprt))
                mod_timer(&xprt->timer,
                                xprt->last_used + xprt->idle_timeout);
        spin_unlock_bh(&xprt->transport_lock);
@@ -1082,8 +1087,11 @@ found:
 #endif /* CONFIG_NFS_V4_1 */
 
        INIT_WORK(&xprt->task_cleanup, xprt_autoclose);
-       setup_timer(&xprt->timer, xprt_init_autodisconnect,
-                       (unsigned long)xprt);
+       if (xprt_has_timer(xprt))
+               setup_timer(&xprt->timer, xprt_init_autodisconnect,
+                           (unsigned long)xprt);
+       else
+               init_timer(&xprt->timer);
        xprt->last_used = jiffies;
        xprt->cwnd = RPC_INITCWND;
        xprt->bind_index = 0;
@@ -1102,7 +1110,6 @@ found:
 
        dprintk("RPC:       created transport %p with %u slots\n", xprt,
                        xprt->max_reqs);
-
        return xprt;
 }
 
index 5151f9f..0cf5e8c 100644 (file)
@@ -730,12 +730,12 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt)
                goto err;
 
        mr = ib_alloc_fast_reg_mr(xprt->sc_pd, RPCSVC_MAXPAGES);
-       if (!mr)
+       if (IS_ERR(mr))
                goto err_free_frmr;
 
        pl = ib_alloc_fast_reg_page_list(xprt->sc_cm_id->device,
                                         RPCSVC_MAXPAGES);
-       if (!pl)
+       if (IS_ERR(pl))
                goto err_free_mr;
 
        frmr->mr = mr;
index 62438f3..bee4154 100644 (file)
@@ -32,6 +32,7 @@
 #include <linux/tcp.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/sched.h>
+#include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/xprtsock.h>
 #include <linux/file.h>
 #ifdef CONFIG_NFS_V4_1
@@ -43,6 +44,7 @@
 #include <net/udp.h>
 #include <net/tcp.h>
 
+#include "sunrpc.h"
 /*
  * xprtsock tunables
  */
@@ -2098,6 +2100,134 @@ static void xs_tcp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
                        xprt->stat.bklog_u);
 }
 
+/*
+ * Allocate a bunch of pages for a scratch buffer for the rpc code. The reason
+ * we allocate pages instead doing a kmalloc like rpc_malloc is because we want
+ * to use the server side send routines.
+ */
+void *bc_malloc(struct rpc_task *task, size_t size)
+{
+       struct page *page;
+       struct rpc_buffer *buf;
+
+       BUG_ON(size > PAGE_SIZE - sizeof(struct rpc_buffer));
+       page = alloc_page(GFP_KERNEL);
+
+       if (!page)
+               return NULL;
+
+       buf = page_address(page);
+       buf->len = PAGE_SIZE;
+
+       return buf->data;
+}
+
+/*
+ * Free the space allocated in the bc_alloc routine
+ */
+void bc_free(void *buffer)
+{
+       struct rpc_buffer *buf;
+
+       if (!buffer)
+               return;
+
+       buf = container_of(buffer, struct rpc_buffer, data);
+       free_page((unsigned long)buf);
+}
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_send_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+       int len;
+       struct xdr_buf *xbufp = &req->rq_snd_buf;
+       struct rpc_xprt *xprt = req->rq_xprt;
+       struct sock_xprt *transport =
+                               container_of(xprt, struct sock_xprt, xprt);
+       struct socket *sock = transport->sock;
+       unsigned long headoff;
+       unsigned long tailoff;
+
+       /*
+        * Set up the rpc header and record marker stuff
+        */
+       xs_encode_tcp_record_marker(xbufp);
+
+       tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+       headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+       len = svc_send_common(sock, xbufp,
+                             virt_to_page(xbufp->head[0].iov_base), headoff,
+                             xbufp->tail[0].iov_base, tailoff);
+
+       if (len != xbufp->len) {
+               printk(KERN_NOTICE "Error sending entire callback!\n");
+               len = -EAGAIN;
+       }
+
+       return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+       struct rpc_rqst *req = task->tk_rqstp;
+       struct svc_xprt *xprt;
+       struct svc_sock         *svsk;
+       u32                     len;
+
+       dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+       /*
+        * Get the server socket associated with this callback xprt
+        */
+       xprt = req->rq_xprt->bc_xprt;
+       svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+       /*
+        * Grab the mutex to serialize data as the connection is shared
+        * with the fore channel
+        */
+       if (!mutex_trylock(&xprt->xpt_mutex)) {
+               rpc_sleep_on(&xprt->xpt_bc_pending, task, NULL);
+               if (!mutex_trylock(&xprt->xpt_mutex))
+                       return -EAGAIN;
+               rpc_wake_up_queued_task(&xprt->xpt_bc_pending, task);
+       }
+       if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+               len = -ENOTCONN;
+       else
+               len = bc_sendto(req);
+       mutex_unlock(&xprt->xpt_mutex);
+
+       if (len > 0)
+               len = 0;
+
+       return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+       return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+       return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
        .set_buffer_size        = xs_udp_set_buffer_size,
        .reserve_xprt           = xprt_reserve_xprt_cong,
@@ -2134,6 +2264,22 @@ static struct rpc_xprt_ops xs_tcp_ops = {
        .print_stats            = xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+       .reserve_xprt           = xprt_reserve_xprt,
+       .release_xprt           = xprt_release_xprt,
+       .buf_alloc              = bc_malloc,
+       .buf_free               = bc_free,
+       .send_request           = bc_send_request,
+       .set_retrans_timeout    = xprt_set_retrans_timeout_def,
+       .close                  = bc_close,
+       .destroy                = bc_destroy,
+       .print_stats            = xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
                                      unsigned int slot_table_size)
 {
@@ -2322,11 +2468,93 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
        return ERR_PTR(-EINVAL);
 }
 
+/**
+ * xs_setup_bc_tcp - Set up transport to use a TCP backchannel socket
+ * @args: rpc transport creation arguments
+ *
+ */
+static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args)
+{
+       struct sockaddr *addr = args->dstaddr;
+       struct rpc_xprt *xprt;
+       struct sock_xprt *transport;
+       struct svc_sock *bc_sock;
+
+       if (!args->bc_xprt)
+               ERR_PTR(-EINVAL);
+
+       xprt = xs_setup_xprt(args, xprt_tcp_slot_table_entries);
+       if (IS_ERR(xprt))
+               return xprt;
+       transport = container_of(xprt, struct sock_xprt, xprt);
+
+       xprt->prot = IPPROTO_TCP;
+       xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
+       xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+       xprt->timeout = &xs_tcp_default_timeout;
+
+       /* backchannel */
+       xprt_set_bound(xprt);
+       xprt->bind_timeout = 0;
+       xprt->connect_timeout = 0;
+       xprt->reestablish_timeout = 0;
+       xprt->idle_timeout = 0;
+
+       /*
+        * The backchannel uses the same socket connection as the
+        * forechannel
+        */
+       xprt->bc_xprt = args->bc_xprt;
+       bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+       bc_sock->sk_bc_xprt = xprt;
+       transport->sock = bc_sock->sk_sock;
+       transport->inet = bc_sock->sk_sk;
+
+       xprt->ops = &bc_tcp_ops;
+
+       switch (addr->sa_family) {
+       case AF_INET:
+               xs_format_peer_addresses(xprt, "tcp",
+                                        RPCBIND_NETID_TCP);
+               break;
+       case AF_INET6:
+               xs_format_peer_addresses(xprt, "tcp",
+                                  RPCBIND_NETID_TCP6);
+               break;
+       default:
+               kfree(xprt);
+               return ERR_PTR(-EAFNOSUPPORT);
+       }
+
+       if (xprt_bound(xprt))
+               dprintk("RPC:       set up xprt to %s (port %s) via %s\n",
+                               xprt->address_strings[RPC_DISPLAY_ADDR],
+                               xprt->address_strings[RPC_DISPLAY_PORT],
+                               xprt->address_strings[RPC_DISPLAY_PROTO]);
+       else
+               dprintk("RPC:       set up xprt to %s (autobind) via %s\n",
+                               xprt->address_strings[RPC_DISPLAY_ADDR],
+                               xprt->address_strings[RPC_DISPLAY_PROTO]);
+
+       /*
+        * Since we don't want connections for the backchannel, we set
+        * the xprt status to connected
+        */
+       xprt_set_connected(xprt);
+
+
+       if (try_module_get(THIS_MODULE))
+               return xprt;
+       kfree(xprt->slot);
+       kfree(xprt);
+       return ERR_PTR(-EINVAL);
+}
+
 static struct xprt_class       xs_udp_transport = {
        .list           = LIST_HEAD_INIT(xs_udp_transport.list),
        .name           = "udp",
        .owner          = THIS_MODULE,
-       .ident          = IPPROTO_UDP,
+       .ident          = XPRT_TRANSPORT_UDP,
        .setup          = xs_setup_udp,
 };
 
@@ -2334,10 +2562,18 @@ static struct xprt_class        xs_tcp_transport = {
        .list           = LIST_HEAD_INIT(xs_tcp_transport.list),
        .name           = "tcp",
        .owner          = THIS_MODULE,
-       .ident          = IPPROTO_TCP,
+       .ident          = XPRT_TRANSPORT_TCP,
        .setup          = xs_setup_tcp,
 };
 
+static struct xprt_class       xs_bc_tcp_transport = {
+       .list           = LIST_HEAD_INIT(xs_bc_tcp_transport.list),
+       .name           = "tcp NFSv4.1 backchannel",
+       .owner          = THIS_MODULE,
+       .ident          = XPRT_TRANSPORT_BC_TCP,
+       .setup          = xs_setup_bc_tcp,
+};
+
 /**
  * init_socket_xprt - set up xprtsock's sysctls, register with RPC client
  *
@@ -2351,6 +2587,7 @@ int init_socket_xprt(void)
 
        xprt_register_transport(&xs_udp_transport);
        xprt_register_transport(&xs_tcp_transport);
+       xprt_register_transport(&xs_bc_tcp_transport);
 
        return 0;
 }
@@ -2370,6 +2607,7 @@ void cleanup_socket_xprt(void)
 
        xprt_unregister_transport(&xs_udp_transport);
        xprt_unregister_transport(&xs_tcp_transport);
+       xprt_unregister_transport(&xs_bc_tcp_transport);
 }
 
 static int param_set_uint_minmax(const char *val, struct kernel_param *kp,
index 429dd06..561a45c 100644 (file)
@@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,
                return 0;
        }
 
-       return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);;
+       return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);
 }
 EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);
 
index 428b065..b92bde3 100644 (file)
@@ -7,12 +7,6 @@ menuconfig SAMPLES
 
 if SAMPLES
 
-config SAMPLE_MARKERS
-       tristate "Build markers examples -- loadable modules only"
-       depends on MARKERS && m
-       help
-         This build markers example modules.
-
 config SAMPLE_TRACEPOINTS
        tristate "Build tracepoints examples -- loadable modules only"
        depends on TRACEPOINTS && m
index 13e4b47..43343a0 100644 (file)
@@ -1,3 +1,3 @@
 # Makefile for Linux samples code
 
-obj-$(CONFIG_SAMPLES)  += markers/ kobject/ kprobes/ tracepoints/ trace_events/
+obj-$(CONFIG_SAMPLES)  += kobject/ kprobes/ tracepoints/ trace_events/
diff --git a/samples/markers/Makefile b/samples/markers/Makefile
deleted file mode 100644 (file)
index 6d72312..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# builds the kprobes example kernel modules;
-# then to use one (as root):  insmod <module_name.ko>
-
-obj-$(CONFIG_SAMPLE_MARKERS) += probe-example.o marker-example.o
diff --git a/samples/markers/marker-example.c b/samples/markers/marker-example.c
deleted file mode 100644 (file)
index e9cd9c0..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* marker-example.c
- *
- * Executes a marker when /proc/marker-example is opened.
- *
- * (C) Copyright 2007 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
- */
-
-#include <linux/module.h>
-#include <linux/marker.h>
-#include <linux/sched.h>
-#include <linux/proc_fs.h>
-
-struct proc_dir_entry *pentry_example;
-
-static int my_open(struct inode *inode, struct file *file)
-{
-       int i;
-
-       trace_mark(subsystem_event, "integer %d string %s", 123,
-               "example string");
-       for (i = 0; i < 10; i++)
-               trace_mark(subsystem_eventb, MARK_NOARGS);
-       return -EPERM;
-}
-
-static struct file_operations mark_ops = {
-       .open = my_open,
-};
-
-static int __init example_init(void)
-{
-       printk(KERN_ALERT "example init\n");
-       pentry_example = proc_create("marker-example", 0444, NULL, &mark_ops);
-       if (!pentry_example)
-               return -EPERM;
-       return 0;
-}
-
-static void __exit example_exit(void)
-{
-       printk(KERN_ALERT "example exit\n");
-       remove_proc_entry("marker-example", NULL);
-}
-
-module_init(example_init)
-module_exit(example_exit)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Marker example");
diff --git a/samples/markers/probe-example.c b/samples/markers/probe-example.c
deleted file mode 100644 (file)
index 2dfb3b3..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/* probe-example.c
- *
- * Connects two functions to marker call sites.
- *
- * (C) Copyright 2007 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
- */
-
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/marker.h>
-#include <asm/atomic.h>
-
-struct probe_data {
-       const char *name;
-       const char *format;
-       marker_probe_func *probe_func;
-};
-
-void probe_subsystem_event(void *probe_data, void *call_data,
-       const char *format, va_list *args)
-{
-       /* Declare args */
-       unsigned int value;
-       const char *mystr;
-
-       /* Assign args */
-       value = va_arg(*args, typeof(value));
-       mystr = va_arg(*args, typeof(mystr));
-
-       /* Call printk */
-       printk(KERN_INFO "Value %u, string %s\n", value, mystr);
-
-       /* or count, check rights, serialize data in a buffer */
-}
-
-atomic_t eventb_count = ATOMIC_INIT(0);
-
-void probe_subsystem_eventb(void *probe_data, void *call_data,
-       const char *format, va_list *args)
-{
-       /* Increment counter */
-       atomic_inc(&eventb_count);
-}
-
-static struct probe_data probe_array[] =
-{
-       {       .name = "subsystem_event",
-               .format = "integer %d string %s",
-               .probe_func = probe_subsystem_event },
-       {       .name = "subsystem_eventb",
-               .format = MARK_NOARGS,
-               .probe_func = probe_subsystem_eventb },
-};
-
-static int __init probe_init(void)
-{
-       int result;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(probe_array); i++) {
-               result = marker_probe_register(probe_array[i].name,
-                               probe_array[i].format,
-                               probe_array[i].probe_func, &probe_array[i]);
-               if (result)
-                       printk(KERN_INFO "Unable to register probe %s\n",
-                               probe_array[i].name);
-       }
-       return 0;
-}
-
-static void __exit probe_fini(void)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(probe_array); i++)
-               marker_probe_unregister(probe_array[i].name,
-                       probe_array[i].probe_func, &probe_array[i]);
-       printk(KERN_INFO "Number of event b : %u\n",
-                       atomic_read(&eventb_count));
-       marker_synchronize_unregister();
-}
-
-module_init(probe_init);
-module_exit(probe_fini);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("SUBSYSTEM Probe");
index f4053dc..8f14c81 100644 (file)
@@ -13,7 +13,6 @@
 # 2) modpost is then used to
 # 3)  create one <module>.mod.c file pr. module
 # 4)  create one Module.symvers file with CRC for all exported symbols
-# 4a) [CONFIG_MARKERS] create one Module.markers file listing defined markers
 # 5) compile all <module>.mod.c files
 # 6) final link of the module to a <module.ko> file
 
@@ -59,10 +58,6 @@ include scripts/Makefile.lib
 
 kernelsymfile := $(objtree)/Module.symvers
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
-kernelmarkersfile := $(objtree)/Module.markers
-modulemarkersfile := $(firstword $(KBUILD_EXTMOD))/Module.markers
-
-markersfile = $(if $(KBUILD_EXTMOD),$(modulemarkersfile),$(kernelmarkersfile))
 
 # Step 1), find all modules listed in $(MODVERDIR)/
 __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
@@ -85,8 +80,6 @@ modpost = scripts/mod/modpost                    \
  $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
- $(if $(CONFIG_MARKERS),-K $(kernelmarkersfile)) \
- $(if $(CONFIG_MARKERS),-M $(markersfile))      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
  $(if $(cross_build),-c)
 
@@ -101,17 +94,12 @@ quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
 
 vmlinux.o: FORCE
-       @rm -fr $(kernelmarkersfile)
        $(call cmd,kernel-mod)
 
 # Declare generated files as targets for modpost
 $(symverfile):         __modpost ;
 $(modules:.ko=.mod.c): __modpost ;
 
-ifdef CONFIG_MARKERS
-$(markersfile):               __modpost ;
-endif
-
 
 # Step 5), compile all *.mod.c files
 
index 72c1520..8ab4486 100644 (file)
@@ -16,8 +16,7 @@
  * tells make when to remake a file.
  *
  * To use this list as-is however has the drawback that virtually
- * every file in the kernel includes <linux/config.h> which then again
- * includes <linux/autoconf.h>
+ * every file in the kernel includes <linux/autoconf.h>.
  *
  * If the user re-runs make *config, linux/autoconf.h will be
  * regenerated.  make notices that and will rebuild every file which
@@ -126,7 +125,6 @@ char *depfile;
 char *cmdline;
 
 void usage(void)
-
 {
        fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
        exit(1);
index 2d5ece7..87bbb8b 100755 (executable)
@@ -10,7 +10,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.28';
+my $V = '0.29';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -28,6 +28,41 @@ my $mailback = 0;
 my $summary_file = 0;
 my $root;
 my %debug;
+my $help = 0;
+
+sub help {
+       my ($exitcode) = @_;
+
+       print << "EOM";
+Usage: $P [OPTION]... [FILE]...
+Version: $V
+
+Options:
+  -q, --quiet                quiet
+  --no-tree                  run without a kernel tree
+  --no-signoff               do not check for 'Signed-off-by' line
+  --patch                    treat FILE as patchfile (default)
+  --emacs                    emacs compile window format
+  --terse                    one line per report
+  -f, --file                 treat FILE as regular source file
+  --subjective, --strict     enable more subjective tests
+  --root=PATH                PATH to the kernel tree root
+  --no-summary               suppress the per-file summary
+  --mailback                 only produce a report in case of warnings/errors
+  --summary-file             include the filename in summary
+  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of
+                             'values', 'possible', 'type', and 'attr' (default
+                             is all off)
+  --test-only=WORD           report only warnings/errors containing WORD
+                             literally
+  -h, --help, --version      display this help and exit
+
+When FILE is - read standard input.
+EOM
+
+       exit($exitcode);
+}
+
 GetOptions(
        'q|quiet+'      => \$quiet,
        'tree!'         => \$tree,
@@ -35,7 +70,7 @@ GetOptions(
        'patch!'        => \$chk_patch,
        'emacs!'        => \$emacs,
        'terse!'        => \$terse,
-       'file!'         => \$file,
+       'f|file!'       => \$file,
        'subjective!'   => \$check,
        'strict!'       => \$check,
        'root=s'        => \$root,
@@ -45,22 +80,16 @@ GetOptions(
 
        'debug=s'       => \%debug,
        'test-only=s'   => \$tst_only,
-) or exit;
+       'h|help'        => \$help,
+       'version'       => \$help
+) or help(1);
+
+help(0) if ($help);
 
 my $exit = 0;
 
 if ($#ARGV < 0) {
-       print "usage: $P [options] patchfile\n";
-       print "version: $V\n";
-       print "options: -q               => quiet\n";
-       print "         --no-tree        => run without a kernel tree\n";
-       print "         --terse          => one line per report\n";
-       print "         --emacs          => emacs compile window format\n";
-       print "         --file           => check a source file\n";
-       print "         --strict         => enable more subjective tests\n";
-       print "         --root           => path to the kernel tree root\n";
-       print "         --no-summary     => suppress the per-file summary\n";
-       print "         --summary-file   => include the filename in summary\n";
+       print "$P: no input files\n";
        exit(1);
 }
 
@@ -153,7 +182,7 @@ our $UTF8   = qr {
 }x;
 
 our $typeTypedefs = qr{(?x:
-       (?:__)?(?:u|s|be|le)(?:\d|\d\d)|
+       (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
        atomic_t
 )};
 
@@ -356,6 +385,13 @@ sub sanitise_line {
                        $off++;
                        next;
                }
+               if ($sanitise_quote eq '' && substr($line, $off, 2) eq '//') {
+                       $sanitise_quote = '//';
+
+                       substr($res, $off, 2, $sanitise_quote);
+                       $off++;
+                       next;
+               }
 
                # A \ in a string means ignore the next character.
                if (($sanitise_quote eq "'" || $sanitise_quote eq '"') &&
@@ -379,6 +415,8 @@ sub sanitise_line {
                #print "c<$c> SQ<$sanitise_quote>\n";
                if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
                        substr($res, $off, 1, $;);
+               } elsif ($off != 0 && $sanitise_quote eq '//' && $c ne "\t") {
+                       substr($res, $off, 1, $;);
                } elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
                        substr($res, $off, 1, 'X');
                } else {
@@ -386,6 +424,10 @@ sub sanitise_line {
                }
        }
 
+       if ($sanitise_quote eq '//') {
+               $sanitise_quote = '';
+       }
+
        # The pathname on a #include may be surrounded by '<' and '>'.
        if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
                my $clean = 'X' x length($1);
@@ -1336,6 +1378,18 @@ sub process {
                        WARN("adding a line without newline at end of file\n" . $herecurr);
                }
 
+# Blackfin: use hi/lo macros
+               if ($realfile =~ m@arch/blackfin/.*\.S$@) {
+                       if ($line =~ /\.[lL][[:space:]]*=.*&[[:space:]]*0x[fF][fF][fF][fF]/) {
+                               my $herevet = "$here\n" . cat_vet($line) . "\n";
+                               ERROR("use the LO() macro, not (... & 0xFFFF)\n" . $herevet);
+                       }
+                       if ($line =~ /\.[hH][[:space:]]*=.*>>[[:space:]]*16/) {
+                               my $herevet = "$here\n" . cat_vet($line) . "\n";
+                               ERROR("use the HI() macro, not (... >> 16)\n" . $herevet);
+                       }
+               }
+
 # check we are in a valid source file C or perl if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|pl)$/);
 
@@ -1355,6 +1409,16 @@ sub process {
                        WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr);
                }
 
+# Blackfin: don't use __builtin_bfin_[cs]sync
+               if ($line =~ /__builtin_bfin_csync/) {
+                       my $herevet = "$here\n" . cat_vet($line) . "\n";
+                       ERROR("use the CSYNC() macro in asm/blackfin.h\n" . $herevet);
+               }
+               if ($line =~ /__builtin_bfin_ssync/) {
+                       my $herevet = "$here\n" . cat_vet($line) . "\n";
+                       ERROR("use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
+               }
+
 # Check for potential 'bare' types
                my ($stat, $cond, $line_nr_next, $remain_next, $off_next);
                if ($realcnt && $line =~ /.\s*\S/) {
@@ -1372,6 +1436,8 @@ sub process {
                        # Ignore functions being called
                        } elsif ($s =~ /^.\s*$Ident\s*\(/s) {
 
+                       } elsif ($s =~ /^.\s*else\b/s) {
+
                        # declarations always start with types
                        } elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {
                                my $type = $1;
@@ -1532,8 +1598,9 @@ sub process {
                                    $s =~ /^\s*#\s*?/ ||
                                    $s =~ /^\s*$Ident\s*:/) {
                                        $continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
-                                       $s =~ s/^.*?\n//;
-                                       $cond_lines++;
+                                       if ($s =~ s/^.*?\n//) {
+                                               $cond_lines++;
+                                       }
                                }
                        }
 
@@ -1891,7 +1958,7 @@ sub process {
                                                # A unary '*' may be const
 
                                        } elsif ($ctx =~ /.xW/) {
-                                               ERROR("Aspace prohibited after that '$op' $at\n" . $hereptr);
+                                               ERROR("space prohibited after that '$op' $at\n" . $hereptr);
                                        }
 
                                # unary ++ and unary -- are allowed no space on one side.
@@ -2243,7 +2310,8 @@ sub process {
                                DECLARE_PER_CPU|
                                DEFINE_PER_CPU|
                                __typeof__\(|
-                               \.$Ident\s*=\s*
+                               \.$Ident\s*=\s*|
+                               ^\"|\"$
                        }x;
                        #print "REST<$rest> dstat<$dstat>\n";
                        if ($rest ne '') {
index e0c6891..263a44d 100644 (file)
 
 typedef unsigned short unicode;
 
-void usage(char *argv0)
+static void usage(char *argv0)
 {
   fprintf(stderr, "Usage: \n"
          "        %s chartable [hashsize] [hashstep] [maxhashlevel]\n", argv0);
   exit(EX_USAGE);
 }
 
-int getunicode(char **p0)
+static int getunicode(char **p0)
 {
   char *p = *p0;
 
@@ -49,7 +49,7 @@ unicode unitable[MAX_FONTLEN][255];
                                /* Massive overkill, but who cares? */
 int unicount[MAX_FONTLEN];
 
-void addpair(int fp, int un)
+static void addpair(int fp, int un)
 {
   int i;
 
index 3a8297b..af6b836 100644 (file)
@@ -176,7 +176,7 @@ static int is_unknown_symbol(struct symbol *sym)
                        strcmp(defn->string, "{") == 0);
 }
 
-struct symbol *__add_symbol(const char *name, enum symbol_type type,
+static struct symbol *__add_symbol(const char *name, enum symbol_type type,
                            struct string_list *defn, int is_extern,
                            int is_reference)
 {
@@ -265,7 +265,7 @@ struct symbol *add_symbol(const char *name, enum symbol_type type,
        return __add_symbol(name, type, defn, is_extern, 0);
 }
 
-struct symbol *add_reference_symbol(const char *name, enum symbol_type type,
+static struct symbol *add_reference_symbol(const char *name, enum symbol_type type,
                                    struct string_list *defn, int is_extern)
 {
        return __add_symbol(name, type, defn, is_extern, 1);
@@ -313,7 +313,7 @@ static int equal_list(struct string_list *a, struct string_list *b)
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-struct string_list *read_node(FILE *f)
+static struct string_list *read_node(FILE *f)
 {
        char buffer[256];
        struct string_list node = {
index 278a45b..cdb44b6 100755 (executable)
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.17';
+my $V = '0.20';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -29,6 +29,8 @@ my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
 my $email_git_min_percent = 5;
 my $email_git_since = "1-year-ago";
+my $email_git_blame = 0;
+my $email_remove_duplicates = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
 my $scm = 0;
@@ -36,6 +38,7 @@ my $web = 0;
 my $subsystem = 0;
 my $status = 0;
 my $from_filename = 0;
+my $pattern_depth = 0;
 my $version = 0;
 my $help = 0;
 
@@ -68,6 +71,8 @@ if (!GetOptions(
                'git-max-maintainers=i' => \$email_git_max_maintainers,
                'git-min-percent=i' => \$email_git_min_percent,
                'git-since=s' => \$email_git_since,
+               'git-blame!' => \$email_git_blame,
+               'remove-duplicates!' => \$email_remove_duplicates,
                'm!' => \$email_maintainer,
                'n!' => \$email_usename,
                'l!' => \$email_list,
@@ -78,6 +83,7 @@ if (!GetOptions(
                'status!' => \$status,
                'scm!' => \$scm,
                'web!' => \$web,
+               'pattern-depth=i' => \$pattern_depth,
                'f|file' => \$from_filename,
                'v|version' => \$version,
                'h|help' => \$help,
@@ -101,14 +107,19 @@ if ($#ARGV < 0) {
     die "$P: argument missing: patchfile or -f file please\n";
 }
 
+if ($output_separator ne ", ") {
+    $output_multiline = 0;
+}
+
 my $selections = $email + $scm + $status + $subsystem + $web;
 if ($selections == 0) {
     usage();
     die "$P:  Missing required option: email, scm, status, subsystem or web\n";
 }
 
-if ($email && ($email_maintainer + $email_list + $email_subscriber_list
-              + $email_git + $email_git_penguin_chiefs) == 0) {
+if ($email &&
+    ($email_maintainer + $email_list + $email_subscriber_list +
+     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
     usage();
     die "$P: Please select at least 1 email option\n";
 }
@@ -147,9 +158,36 @@ while (<MAINT>) {
 }
 close(MAINT);
 
+my %mailmap;
+
+if ($email_remove_duplicates) {
+    open(MAILMAP, "<${lk_path}.mailmap") || warn "$P: Can't open .mailmap\n";
+    while (<MAILMAP>) {
+       my $line = $_;
+
+       next if ($line =~ m/^\s*#/);
+       next if ($line =~ m/^\s*$/);
+
+       my ($name, $address) = parse_email($line);
+       $line = format_email($name, $address);
+
+       next if ($line =~ m/^\s*$/);
+
+       if (exists($mailmap{$name})) {
+           my $obj = $mailmap{$name};
+           push(@$obj, $address);
+       } else {
+           my @arr = ($address);
+           $mailmap{$name} = \@arr;
+       }
+    }
+    close(MAILMAP);
+}
+
 ## use the filenames on the command line or find the filenames in the patchfiles
 
 my @files = ();
+my @range = ();
 
 foreach my $file (@ARGV) {
     ##if $file is a directory and it lacks a trailing slash, add one
@@ -162,13 +200,19 @@ foreach my $file (@ARGV) {
        push(@files, $file);
     } else {
        my $file_cnt = @files;
+       my $lastfile;
        open(PATCH, "<$file") or die "$P: Can't open ${file}\n";
        while (<PATCH>) {
            if (m/^\+\+\+\s+(\S+)/) {
                my $filename = $1;
                $filename =~ s@^[^/]*/@@;
                $filename =~ s@\n@@;
+               $lastfile = $filename;
                push(@files, $filename);
+           } elsif (m/^\@\@ -(\d+),(\d+)/) {
+               if ($email_git_blame) {
+                   push(@range, "$lastfile:$1:$2");
+               }
            }
        }
        close(PATCH);
@@ -201,6 +245,7 @@ foreach my $file (@files) {
            if ($type eq 'X') {
                if (file_match_pattern($file, $value)) {
                    $exclude = 1;
+                   last;
                }
            }
        }
@@ -208,35 +253,45 @@ foreach my $file (@files) {
 
     if (!$exclude) {
        my $tvi = 0;
+       my %hash;
        foreach my $line (@typevalue) {
            if ($line =~ m/^(\C):\s*(.*)/) {
                my $type = $1;
                my $value = $2;
                if ($type eq 'F') {
                    if (file_match_pattern($file, $value)) {
-                       add_categories($tvi);
+                       my $value_pd = ($value =~ tr@/@@);
+                       my $file_pd = ($file  =~ tr@/@@);
+                       $value_pd++ if (substr($value,-1,1) ne "/");
+                       if ($pattern_depth == 0 ||
+                           (($file_pd - $value_pd) < $pattern_depth)) {
+                           $hash{$tvi} = $value_pd;
+                       }
                    }
                }
            }
            $tvi++;
        }
+       foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+           add_categories($line);
+       }
     }
 
     if ($email && $email_git) {
        recent_git_signoffs($file);
     }
 
+    if ($email && $email_git_blame) {
+       git_assign_blame($file);
+    }
 }
 
 if ($email) {
     foreach my $chief (@penguin_chief) {
        if ($chief =~ m/^(.*):(.*)/) {
            my $email_address;
-           if ($email_usename) {
-               $email_address = format_email($1, $2);
-           } else {
-               $email_address = $2;
-           }
+
+           $email_address = format_email($1, $2);
            if ($email_git_penguin_chiefs) {
                push(@email_to, $email_address);
            } else {
@@ -258,22 +313,22 @@ if ($email || $email_list) {
 }
 
 if ($scm) {
-    @scm = sort_and_uniq(@scm);
+    @scm = uniq(@scm);
     output(@scm);
 }
 
 if ($status) {
-    @status = sort_and_uniq(@status);
+    @status = uniq(@status);
     output(@status);
 }
 
 if ($subsystem) {
-    @subsystem = sort_and_uniq(@subsystem);
+    @subsystem = uniq(@subsystem);
     output(@subsystem);
 }
 
 if ($web) {
-    @web = sort_and_uniq(@web);
+    @web = uniq(@web);
     output(@web);
 }
 
@@ -311,10 +366,12 @@ MAINTAINER field selection options:
     --git-max-maintainers => maximum maintainers to add (default: 5)
     --git-min-percent => minimum percentage of commits required (default: 5)
     --git-since => git history to use (default: 1-year-ago)
+    --git-blame => use git blame to find modified commits for patch or file
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
     --l => include list(s) if any
     --s => include subscriber only list(s) if any
+    --remove-duplicates => minimize duplicate email names/addresses
   --scm => print SCM tree(s) if any
   --status => print status if any
   --subsystem => print subsystem name if any
@@ -322,24 +379,28 @@ MAINTAINER field selection options:
 
 Output type options:
   --separator [, ] => separator for multiple entries on 1 line
+    using --separator also sets --nomultiline if --separator is not [, ]
   --multiline => print 1 entry per line
 
-Default options:
-  [--email --git --m --n --l --multiline]
-
 Other options:
+  --pattern-depth => Number of pattern directory traversals (default: 0 (all))
   --version => show version
   --help => show this help information
 
+Default options:
+  [--email --git --m --n --l --multiline --pattern-depth=0 --remove-duplicates]
+
 Notes:
   Using "-f directory" may give unexpected results:
-
-  Used with "--git", git signators for _all_ files in and below
-     directory are examined as git recurses directories.
-     Any specified X: (exclude) pattern matches are _not_ ignored.
-  Used with "--nogit", directory is used as a pattern match,
-     no individual file within the directory or subdirectory
-     is matched.
+      Used with "--git", git signators for _all_ files in and below
+          directory are examined as git recurses directories.
+          Any specified X: (exclude) pattern matches are _not_ ignored.
+      Used with "--nogit", directory is used as a pattern match,
+         no individual file within the directory or subdirectory
+         is matched.
+      Used with "--git-blame", does not iterate all files in directory
+  Using "--git-blame" is slow and may add old committers and authors
+      that are no longer active maintainers to the output.
 EOT
 }
 
@@ -370,30 +431,100 @@ sub top_of_kernel_tree {
        return 0;
 }
 
-sub format_email {
-    my ($name, $email) = @_;
+sub parse_email {
+    my ($formatted_email) = @_;
+
+    my $name = "";
+    my $address = "";
+
+    if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) {
+       $name = $1;
+       $address = $2;
+    } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) {
+       $address = $1;
+    } elsif ($formatted_email =~ /^(.+\@\S*).*$/) {
+       $address = $1;
+    }
 
     $name =~ s/^\s+|\s+$//g;
     $name =~ s/^\"|\"$//g;
-    $email =~ s/^\s+|\s+$//g;
+    $address =~ s/^\s+|\s+$//g;
+
+    if ($name =~ /[^a-z0-9 \.\-]/i) {    ##has "must quote" chars
+       $name =~ s/(?<!\\)"/\\"/g;       ##escape quotes
+       $name = "\"$name\"";
+    }
+
+    return ($name, $address);
+}
+
+sub format_email {
+    my ($name, $address) = @_;
 
-    my $formatted_email = "";
+    my $formatted_email;
+
+    $name =~ s/^\s+|\s+$//g;
+    $name =~ s/^\"|\"$//g;
+    $address =~ s/^\s+|\s+$//g;
 
     if ($name =~ /[^a-z0-9 \.\-]/i) {    ##has "must quote" chars
        $name =~ s/(?<!\\)"/\\"/g;       ##escape quotes
-       $formatted_email = "\"${name}\"\ \<${email}\>";
+       $name = "\"$name\"";
+    }
+
+    if ($email_usename) {
+       if ("$name" eq "") {
+           $formatted_email = "$address";
+       } else {
+           $formatted_email = "$name <${address}>";
+       }
     } else {
-       $formatted_email = "${name} \<${email}\>";
+       $formatted_email = $address;
     }
+
     return $formatted_email;
 }
 
-sub add_categories {
+sub find_starting_index {
+
     my ($index) = @_;
 
-    $index = $index - 1;
-    while ($index >= 0) {
+    while ($index > 0) {
        my $tv = $typevalue[$index];
+       if (!($tv =~ m/^(\C):\s*(.*)/)) {
+           last;
+       }
+       $index--;
+    }
+
+    return $index;
+}
+
+sub find_ending_index {
+    my ($index) = @_;
+
+    while ($index < @typevalue) {
+       my $tv = $typevalue[$index];
+       if (!($tv =~ m/^(\C):\s*(.*)/)) {
+           last;
+       }
+       $index++;
+    }
+
+    return $index;
+}
+
+sub add_categories {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    push(@subsystem, $typevalue[$start]);
+
+    for ($i = $start + 1; $i < $end; $i++) {
+       my $tv = $typevalue[$i];
        if ($tv =~ m/^(\C):\s*(.*)/) {
            my $ptype = $1;
            my $pvalue = $2;
@@ -414,19 +545,19 @@ sub add_categories {
                    }
                }
            } elsif ($ptype eq "M") {
-               my $p_used = 0;
-               if ($index >= 0) {
-                   my $tv = $typevalue[$index - 1];
-                   if ($tv =~ m/^(\C):\s*(.*)/) {
-                       if ($1 eq "P") {
-                           if ($email_usename) {
-                               push_email_address(format_email($2, $pvalue));
-                               $p_used = 1;
+               my ($name, $address) = parse_email($pvalue);
+               if ($name eq "") {
+                   if ($i > 0) {
+                       my $tv = $typevalue[$i - 1];
+                       if ($tv =~ m/^(\C):\s*(.*)/) {
+                           if ($1 eq "P") {
+                               $name = $2;
+                               $pvalue = format_email($name, $address);
                            }
                        }
                    }
                }
-               if (!$p_used) {
+               if ($email_maintainer) {
                    push_email_addresses($pvalue);
                }
            } elsif ($ptype eq "T") {
@@ -436,31 +567,41 @@ sub add_categories {
            } elsif ($ptype eq "S") {
                push(@status, $pvalue);
            }
-
-           $index--;
-       } else {
-           push(@subsystem,$tv);
-           $index = -1;
        }
     }
 }
 
+my %email_hash_name;
+my %email_hash_address;
+
+sub email_inuse {
+    my ($name, $address) = @_;
+
+    return 1 if (($name eq "") && ($address eq ""));
+    return 1 if (($name ne "") && exists($email_hash_name{$name}));
+    return 1 if (($address ne "") && exists($email_hash_address{$address}));
+
+    return 0;
+}
+
 sub push_email_address {
-    my ($email_address) = @_;
+    my ($line) = @_;
+
+    my ($name, $address) = parse_email($line);
 
-    my $email_name = "";
-    if ($email_address =~ m/([^<]+)<(.*\@.*)>$/) {
-       $email_name = $1;
-       $email_address = $2;
+    if ($address eq "") {
+       return 0;
     }
 
-    if ($email_maintainer) {
-       if ($email_usename && $email_name) {
-           push(@email_to, format_email($email_name, $email_address));
-       } else {
-           push(@email_to, $email_address);
-       }
+    if (!$email_remove_duplicates) {
+       push(@email_to, format_email($name, $address));
+    } elsif (!email_inuse($name, $address)) {
+       push(@email_to, format_email($name, $address));
+       $email_hash_name{$name}++;
+       $email_hash_address{$address}++;
     }
+
+    return 1;
 }
 
 sub push_email_addresses {
@@ -476,7 +617,9 @@ sub push_email_addresses {
            push_email_address($entry);
        }
     } else {
-       warn("Invalid MAINTAINERS address: '" . $address . "'\n");
+       if (!push_email_address($address)) {
+           warn("Invalid MAINTAINERS address: '" . $address . "'\n");
+       }
     }
 }
 
@@ -492,6 +635,32 @@ sub which {
     return "";
 }
 
+sub mailmap {
+    my @lines = @_;
+    my %hash;
+
+    foreach my $line (@lines) {
+       my ($name, $address) = parse_email($line);
+       if (!exists($hash{$name})) {
+           $hash{$name} = $address;
+       } elsif ($address ne $hash{$name}) {
+           $address = $hash{$name};
+           $line = format_email($name, $address);
+       }
+       if (exists($mailmap{$name})) {
+           my $obj = $mailmap{$name};
+           foreach my $map_address (@$obj) {
+               if (($map_address eq $address) &&
+                   ($map_address ne $hash{$name})) {
+                   $line = format_email($name, $hash{$name});
+               }
+           }
+       }
+    }
+
+    return @lines;
+}
+
 sub recent_git_signoffs {
     my ($file) = @_;
 
@@ -500,6 +669,7 @@ sub recent_git_signoffs {
     my $output = "";
     my $count = 0;
     my @lines = ();
+    my %hash;
     my $total_sign_offs;
 
     if (which("git") eq "") {
@@ -513,52 +683,119 @@ sub recent_git_signoffs {
     }
 
     $cmd = "git log --since=${email_git_since} -- ${file}";
-    $cmd .= " | grep -Ei \"^[-_        a-z]+by:.*\\\@.*\$\"";
-    if (!$email_git_penguin_chiefs) {
-       $cmd .= " | grep -Ev \"${penguin_chiefs}\"";
-    }
-    $cmd .= " | cut -f2- -d\":\"";
-    $cmd .= " | sort | uniq -c | sort -rn";
 
     $output = `${cmd}`;
     $output =~ s/^\s*//gm;
 
     @lines = split("\n", $output);
 
-    $total_sign_offs = 0;
+    @lines = grep(/^[-_        a-z]+by:.*\@.*$/i, @lines);
+    if (!$email_git_penguin_chiefs) {
+       @lines = grep(!/${penguin_chiefs}/i, @lines);
+    }
+    # cut -f2- -d":"
+    s/.*:\s*(.+)\s*/$1/ for (@lines);
+
+    $total_sign_offs = @lines;
+
+    if ($email_remove_duplicates) {
+       @lines = mailmap(@lines);
+    }
+
+    @lines = sort(@lines);
+
+    # uniq -c
+    $hash{$_}++ for @lines;
+
+    # sort -rn
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+       my $sign_offs = $hash{$line};
+       $count++;
+       last if ($sign_offs < $email_git_min_signatures ||
+                $count > $email_git_max_maintainers ||
+                $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
+       push_email_address($line);
+    }
+}
+
+sub save_commits {
+    my ($cmd, @commits) = @_;
+    my $output;
+    my @lines = ();
+
+    $output = `${cmd}`;
+
+    @lines = split("\n", $output);
     foreach my $line (@lines) {
-       if ($line =~ m/([0-9]+)\s+(.*)/) {
-           $total_sign_offs += $1;
-       } else {
-           die("$P: Unexpected git output: ${line}\n");
+       if ($line =~ m/^(\w+) /) {
+           push (@commits, $1);
        }
     }
+    return @commits;
+}
 
-    foreach my $line (@lines) {
-       if ($line =~ m/([0-9]+)\s+(.*)/) {
-           my $sign_offs = $1;
-           $line = $2;
-           $count++;
-           if ($sign_offs < $email_git_min_signatures ||
-               $count > $email_git_max_maintainers ||
-               $sign_offs * 100 / $total_sign_offs < $email_git_min_percent) {
-               last;
-           }
+sub git_assign_blame {
+    my ($file) = @_;
+
+    my @lines = ();
+    my @commits = ();
+    my $cmd;
+    my $output;
+    my %hash;
+    my $total_sign_offs;
+    my $count;
+
+    if (@range) {
+       foreach my $file_range_diff (@range) {
+           next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
+           my $diff_file = $1;
+           my $diff_start = $2;
+           my $diff_length = $3;
+           next if (!("$file" eq "$diff_file"));
+           $cmd = "git blame -l -L $diff_start,+$diff_length $file";
+           @commits = save_commits($cmd, @commits);
        }
-       if ($line =~ m/(.+)<(.+)>/) {
-           my $git_name = $1;
-           my $git_addr = $2;
-           if ($email_usename) {
-               push(@email_to, format_email($git_name, $git_addr));
-           } else {
-               push(@email_to, $git_addr);
-           }
-       } elsif ($line =~ m/<(.+)>/) {
-           my $git_addr = $1;
-           push(@email_to, $git_addr);
-       } else {
-           push(@email_to, $line);
+    } else {
+       if (-f $file) {
+           $cmd = "git blame -l $file";
+           @commits = save_commits($cmd, @commits);
+       }
+    }
+
+    $total_sign_offs = 0;
+    @commits = uniq(@commits);
+    foreach my $commit (@commits) {
+       $cmd = "git log -1 ${commit}";
+
+       $output = `${cmd}`;
+       $output =~ s/^\s*//gm;
+       @lines = split("\n", $output);
+
+       @lines = grep(/^[-_     a-z]+by:.*\@.*$/i, @lines);
+       if (!$email_git_penguin_chiefs) {
+           @lines = grep(!/${penguin_chiefs}/i, @lines);
+       }
+
+       # cut -f2- -d":"
+       s/.*:\s*(.+)\s*/$1/ for (@lines);
+
+       $total_sign_offs += @lines;
+
+       if ($email_remove_duplicates) {
+           @lines = mailmap(@lines);
        }
+
+       $hash{$_}++ for @lines;
+    }
+
+    $count = 0;
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+       my $sign_offs = $hash{$line};
+       $count++;
+       last if ($sign_offs < $email_git_min_signatures ||
+                $count > $email_git_max_maintainers ||
+                $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
+       push_email_address($line);
     }
 }
 
index 64343cc..86c3896 100644 (file)
@@ -585,7 +585,7 @@ static int prefix_underscores_count(const char *str)
 {
        const char *tail = str;
 
-       while (*tail != '_')
+       while (*tail == '_')
                tail++;
 
        return tail - str;
index 40e0045..62a9025 100644 (file)
@@ -657,6 +657,15 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
        return 1;
 }
 
+/* Looks like: spi:S */
+static int do_spi_entry(const char *filename, struct spi_device_id *id,
+                       char *alias)
+{
+       sprintf(alias, SPI_MODULE_PREFIX "%s", id->name);
+
+       return 1;
+}
+
 static const struct dmifield {
        const char *prefix;
        int field;
@@ -853,6 +862,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                do_table(symval, sym->st_size,
                         sizeof(struct i2c_device_id), "i2c",
                         do_i2c_entry, mod);
+       else if (sym_is(symname, "__mod_spi_device_table"))
+               do_table(symval, sym->st_size,
+                        sizeof(struct spi_device_id), "spi",
+                        do_spi_entry, mod);
        else if (sym_is(symname, "__mod_dmi_device_table"))
                do_table(symval, sym->st_size,
                         sizeof(struct dmi_system_id), "dmi",
index 4522948..801a16a 100644 (file)
@@ -691,7 +691,7 @@ static int number_prefix(const char *sym)
  *   The $ syntax is for sections where ld append a dot number
  *   to make section name unique.
  */
-int match(const char *sym, const char * const pat[])
+static int match(const char *sym, const char * const pat[])
 {
        const char *p;
        while (*pat) {
@@ -1746,7 +1746,7 @@ static void add_header(struct buffer *b, struct module *mod)
        buf_printf(b, "};\n");
 }
 
-void add_staging_flag(struct buffer *b, const char *name)
+static void add_staging_flag(struct buffer *b, const char *name)
 {
        static const char *staging_dir = "drivers/staging";
 
index aadc522..ecf9c7d 100644 (file)
@@ -334,8 +334,6 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
                deps_drivers/net/dummy.o := \
                  drivers/net/dummy.c \
                    $(wildcard include/config/net/fastroute.h) \
-                 include/linux/config.h \
-                   $(wildcard include/config/h.h) \
                  include/linux/module.h \
 
           Sum all files in the same dir or subdirs.
index ca757d4..b4ced85 100644 (file)
 
 #include "flask.h"
 
-void usage(char *name)
+static void usage(char *name)
 {
        printf("usage: %s [-m] policy_file context_file\n", name);
        exit(1);
 }
 
-void find_common_name(char *cname, char *dest, int len)
+static void find_common_name(char *cname, char *dest, int len)
 {
        char *start, *end;
 
diff --git a/scripts/tracing/power.pl b/scripts/tracing/power.pl
deleted file mode 100644 (file)
index 4f729b3..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2008, Intel Corporation
-#
-# This file is part of the Linux kernel
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-# Authors:
-#      Arjan van de Ven <arjan@linux.intel.com>
-
-
-#
-# This script turns a cstate ftrace output into a SVG graphic that shows
-# historic C-state information
-#
-#
-#      cat /sys/kernel/debug/tracing/trace | perl power.pl > out.svg
-#
-
-my @styles;
-my $base = 0;
-
-my @pstate_last;
-my @pstate_level;
-
-$styles[0] = "fill:rgb(0,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[1] = "fill:rgb(0,255,0);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[2] = "fill:rgb(255,0,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[3] = "fill:rgb(255,255,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[4] = "fill:rgb(255,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[5] = "fill:rgb(0,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[6] = "fill:rgb(0,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[7] = "fill:rgb(0,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[8] = "fill:rgb(0,25,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-
-
-print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
-print "<svg width=\"10000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
-
-my $scale = 30000.0;
-while (<>) {
-       my $line = $_;
-       if ($line =~ /([0-9\.]+)\] CSTATE: Going to C([0-9]) on cpu ([0-9]+) for ([0-9\.]+)/) {
-               if ($base == 0) {
-                       $base = $1;
-               }
-               my $time = $1 - $base;
-               $time = $time * $scale;
-               my $C = $2;
-               my $cpu = $3;
-               my $y = 400 * $cpu;
-               my $duration = $4 * $scale;
-               my $msec = int($4 * 100000)/100.0;
-               my $height = $C * 20;
-               $style = $styles[$C];
-
-               $y = $y + 140 - $height;
-
-               $x2 = $time + 4;
-               $y2 = $y + 4;
-
-
-               print "<rect x=\"$time\" width=\"$duration\" y=\"$y\" height=\"$height\" style=\"$style\"/>\n";
-               print "<text transform=\"translate($x2,$y2) rotate(90)\">C$C $msec</text>\n";
-       }
-       if ($line =~ /([0-9\.]+)\] PSTATE: Going to P([0-9]) on cpu ([0-9]+)/) {
-               my $time = $1 - $base;
-               my $state = $2;
-               my $cpu = $3;
-
-               if (defined($pstate_last[$cpu])) {
-                       my $from = $pstate_last[$cpu];
-                       my $oldstate = $pstate_state[$cpu];
-                       my $duration = ($time-$from) * $scale;
-
-                       $from = $from * $scale;
-                       my $to = $from + $duration;
-                       my $height = 140 - ($oldstate * (140/8));
-
-                       my $y = 400 * $cpu + 200 + $height;
-                       my $y2 = $y+4;
-                       my $style = $styles[8];
-
-                       print "<rect x=\"$from\" y=\"$y\" width=\"$duration\" height=\"5\" style=\"$style\"/>\n";
-                       print "<text transform=\"translate($from,$y2)\">P$oldstate (cpu $cpu)</text>\n";
-               };
-
-               $pstate_last[$cpu] = $time;
-               $pstate_state[$cpu] = $state;
-       }
-}
-
-
-print "</svg>\n";
index 6bfc7ea..8e9777b 100644 (file)
@@ -146,7 +146,7 @@ static int ima_measurements_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations ima_measurments_seqops = {
+static const struct seq_operations ima_measurments_seqops = {
        .start = ima_measurements_start,
        .next = ima_measurements_next,
        .stop = ima_measurements_stop,
@@ -221,7 +221,7 @@ static int ima_ascii_measurements_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations ima_ascii_measurements_seqops = {
+static const struct seq_operations ima_ascii_measurements_seqops = {
        .start = ima_measurements_start,
        .next = ima_measurements_next,
        .stop = ima_measurements_stop,
index acae7ef..c33b6bb 100644 (file)
 #include <net/netlabel.h>
 #include <net/cipso_ipv4.h>
 #include <linux/audit.h>
+#include <linux/magic.h>
 #include "smack.h"
 
 #define task_security(task)    (task_cred_xxx((task), security))
 
-/*
- * I hope these are the hokeyist lines of code in the module. Casey.
- */
-#define DEVPTS_SUPER_MAGIC     0x1cd1
-#define SOCKFS_MAGIC           0x534F434B
-#define TMPFS_MAGIC            0x01021994
-
 /**
  * smk_fetch - Fetch the smack label from a file.
  * @ip: a pointer to the inode
index f83a809..aeead75 100644 (file)
@@ -187,7 +187,7 @@ static void load_seq_stop(struct seq_file *s, void *v)
        /* No-op */
 }
 
-static struct seq_operations load_seq_ops = {
+static const struct seq_operations load_seq_ops = {
        .start = load_seq_start,
        .next  = load_seq_next,
        .show  = load_seq_show,
@@ -503,7 +503,7 @@ static void cipso_seq_stop(struct seq_file *s, void *v)
        /* No-op */
 }
 
-static struct seq_operations cipso_seq_ops = {
+static const struct seq_operations cipso_seq_ops = {
        .start = cipso_seq_start,
        .stop  = cipso_seq_stop,
        .next  = cipso_seq_next,
@@ -697,7 +697,7 @@ static void netlbladdr_seq_stop(struct seq_file *s, void *v)
        /* No-op */
 }
 
-static struct seq_operations netlbladdr_seq_ops = {
+static const struct seq_operations netlbladdr_seq_ops = {
        .start = netlbladdr_seq_start,
        .stop  = netlbladdr_seq_stop,
        .next  = netlbladdr_seq_next,
index 1edab7b..3136c88 100644 (file)
@@ -110,9 +110,6 @@ static void start_adc(struct cs4297a_state *s);
 // rather than 64k as some of the games work more responsively.
 // log base 2( buff sz = 32k).
 
-//static unsigned long defaultorder = 3;
-//MODULE_PARM(defaultorder, "i");
-
 //
 // Turn on/off debugging compilation by commenting out "#define CSDEBUG"
 //
index 1075344..8db6aef 100644 (file)
@@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode)
        curr_tempo = 60;
        curr_timebase = 100;
        opened = 1;
-
-       ;
-
        {
                def_tmr.expires = (1) + jiffies;
                add_timer(&def_tmr);
index c64e55a..686e5aa 100644 (file)
@@ -1027,7 +1027,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream,
                       - wm9081->fs);
        for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
                cur_val = abs((wm9081->sysclk_rate /
-                              clk_sys_rates[i].ratio) - wm9081->fs);;
+                              clk_sys_rates[i].ratio) - wm9081->fs);
                if (cur_val < best_val) {
                        best = i;
                        best_val = cur_val;
index 5b9ed64..d11a6d7 100644 (file)
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,
                        do_div(tmp, freq_out);
                        val = tmp;
 
-                       val = (val << 16) | 64;;
+                       val = (val << 16) | 64;
                        ssp_write_reg(ssp, SSACDD, val);
 
                        ssacd |= (0x6 << 4);
index 8e79a41..c215d32 100644 (file)
@@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
 {
        int ret = 0;
 #ifdef ENFORCE_RATES
-       struct snd_pcm_runtime *runtime = substream->runtime;;
+       struct snd_pcm_runtime *runtime = substream->runtime;
 #endif
 
        mutex_lock(&clk_lock);
index bb4b88e..49c9981 100644 (file)
@@ -29,7 +29,7 @@ MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
 
-static char *sound_nodename(struct device *dev)
+static char *sound_devnode(struct device *dev, mode_t *mode)
 {
        if (MAJOR(dev->devt) == SOUND_MAJOR)
                return NULL;
@@ -50,7 +50,7 @@ static int __init init_soundcore(void)
                return PTR_ERR(sound_class);
        }
 
-       sound_class->nodename = sound_nodename;
+       sound_class->devnode = sound_devnode;
 
        return 0;
 }
diff --git a/tools/perf/Documentation/perf-sched.txt b/tools/perf/Documentation/perf-sched.txt
new file mode 100644 (file)
index 0000000..1ce7919
--- /dev/null
@@ -0,0 +1,41 @@
+perf-sched(1)
+==============
+
+NAME
+----
+perf-sched - Tool to trace/measure scheduler properties (latencies)
+
+SYNOPSIS
+--------
+[verse]
+'perf sched' {record|latency|replay|trace}
+
+DESCRIPTION
+-----------
+There's four variants of perf sched:
+
+  'perf sched record <command>' to record the scheduling events
+  of an arbitrary workload.
+
+  'perf sched latency' to report the per task scheduling latencies
+  and other scheduling properties of the workload.
+
+  'perf sched trace' to see a detailed trace of the workload that
+  was recorded.
+
+  'perf sched replay' to simulate the workload that was recorded
+  via perf sched record. (this is done by starting up mockup threads
+  that mimic the workload based on the events in the trace. These
+  threads can then replay the timings (CPU runtime and sleep patterns)
+  of the workload as it occured when it was recorded - and can repeat
+  it a number of times, measuring its performance.)
+
+OPTIONS
+-------
+-D::
+--dump-raw-trace=::
+        Display verbose dump of the sched data.
+
+SEE ALSO
+--------
+linkperf:perf-record[1]
diff --git a/tools/perf/Documentation/perf-timechart.txt b/tools/perf/Documentation/perf-timechart.txt
new file mode 100644 (file)
index 0000000..1c2ed30
--- /dev/null
@@ -0,0 +1,38 @@
+perf-timechart(1)
+=================
+
+NAME
+----
+perf-timechart - Tool to visualize total system behavior during a workload
+
+SYNOPSIS
+--------
+[verse]
+'perf timechart' {record}
+
+DESCRIPTION
+-----------
+There are two variants of perf timechart:
+
+  'perf timechart record <command>' to record the system level events
+  of an arbitrary workload.
+
+  'perf timechart' to turn a trace into a Scalable Vector Graphics file,
+  that can be viewed with popular SVG viewers such as 'Inkscape'.
+
+OPTIONS
+-------
+-o::
+--output=::
+        Select the output file (default: output.svg)
+-i::
+--input=::
+        Select the input file (default: perf.data)
+-w::
+--width=::
+        Select the width of the SVG file (default: 1000)
+
+
+SEE ALSO
+--------
+linkperf:perf-record[1]
diff --git a/tools/perf/Documentation/perf-trace.txt b/tools/perf/Documentation/perf-trace.txt
new file mode 100644 (file)
index 0000000..41ed753
--- /dev/null
@@ -0,0 +1,25 @@
+perf-trace(1)
+==============
+
+NAME
+----
+perf-trace - Read perf.data (created by perf record) and display trace output
+
+SYNOPSIS
+--------
+[verse]
+'perf trace' [-i <file> | --input=file] symbol_name
+
+DESCRIPTION
+-----------
+This command reads the input file and displays the trace recorded.
+
+OPTIONS
+-------
+-D::
+--dump-raw-trace=::
+        Display verbose dump of the trace data.
+
+SEE ALSO
+--------
+linkperf:perf-record[1]
index 9f8d207..b5f1953 100644 (file)
@@ -318,7 +318,7 @@ export PERL_PATH
 
 LIB_FILE=libperf.a
 
-LIB_H += ../../include/linux/perf_counter.h
+LIB_H += ../../include/linux/perf_event.h
 LIB_H += ../../include/linux/rbtree.h
 LIB_H += ../../include/linux/list.h
 LIB_H += util/include/linux/list.h
@@ -373,13 +373,16 @@ LIB_OBJS += util/thread.o
 LIB_OBJS += util/trace-event-parse.o
 LIB_OBJS += util/trace-event-read.o
 LIB_OBJS += util/trace-event-info.o
+LIB_OBJS += util/svghelper.o
 
 BUILTIN_OBJS += builtin-annotate.o
 BUILTIN_OBJS += builtin-help.o
+BUILTIN_OBJS += builtin-sched.o
 BUILTIN_OBJS += builtin-list.o
 BUILTIN_OBJS += builtin-record.o
 BUILTIN_OBJS += builtin-report.o
 BUILTIN_OBJS += builtin-stat.o
+BUILTIN_OBJS += builtin-timechart.o
 BUILTIN_OBJS += builtin-top.o
 BUILTIN_OBJS += builtin-trace.o
 
@@ -710,6 +713,12 @@ builtin-help.o: builtin-help.c common-cmds.h PERF-CFLAGS
                '-DPERF_MAN_PATH="$(mandir_SQ)"' \
                '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
 
+builtin-timechart.o: builtin-timechart.c common-cmds.h PERF-CFLAGS
+       $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
+               '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
+               '-DPERF_MAN_PATH="$(mandir_SQ)"' \
+               '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
+
 $(BUILT_INS): perf$X
        $(QUIET_BUILT_IN)$(RM) $@ && \
        ln perf$X $@ 2>/dev/null || \
index 043d85b..1ec7416 100644 (file)
@@ -505,7 +505,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                return -1;
        }
 
-       if (event->header.misc & PERF_EVENT_MISC_KERNEL) {
+       if (event->header.misc & PERF_RECORD_MISC_KERNEL) {
                show = SHOW_KERNEL;
                level = 'k';
 
@@ -513,7 +513,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 
                dump_printf(" ...... dso: %s\n", dso->name);
 
-       } else if (event->header.misc & PERF_EVENT_MISC_USER) {
+       } else if (event->header.misc & PERF_RECORD_MISC_USER) {
 
                show = SHOW_USER;
                level = '.';
@@ -565,7 +565,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
 
        thread = threads__findnew(event->mmap.pid, &threads, &last_match);
 
-       dump_printf("%p [%p]: PERF_EVENT_MMAP %d: [%p(%p) @ %p]: %s\n",
+       dump_printf("%p [%p]: PERF_RECORD_MMAP %d: [%p(%p) @ %p]: %s\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->mmap.pid,
@@ -575,7 +575,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
                event->mmap.filename);
 
        if (thread == NULL || map == NULL) {
-               dump_printf("problem processing PERF_EVENT_MMAP, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_MMAP, skipping event.\n");
                return 0;
        }
 
@@ -591,14 +591,14 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)
        struct thread *thread;
 
        thread = threads__findnew(event->comm.pid, &threads, &last_match);
-       dump_printf("%p [%p]: PERF_EVENT_COMM: %s:%d\n",
+       dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->comm.comm, event->comm.pid);
 
        if (thread == NULL ||
            thread__set_comm(thread, event->comm.comm)) {
-               dump_printf("problem processing PERF_EVENT_COMM, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");
                return -1;
        }
        total_comm++;
@@ -614,7 +614,7 @@ process_fork_event(event_t *event, unsigned long offset, unsigned long head)
 
        thread = threads__findnew(event->fork.pid, &threads, &last_match);
        parent = threads__findnew(event->fork.ppid, &threads, &last_match);
-       dump_printf("%p [%p]: PERF_EVENT_FORK: %d:%d\n",
+       dump_printf("%p [%p]: PERF_RECORD_FORK: %d:%d\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->fork.pid, event->fork.ppid);
@@ -627,7 +627,7 @@ process_fork_event(event_t *event, unsigned long offset, unsigned long head)
                return 0;
 
        if (!thread || !parent || thread__fork(thread, parent)) {
-               dump_printf("problem processing PERF_EVENT_FORK, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_FORK, skipping event.\n");
                return -1;
        }
        total_fork++;
@@ -639,23 +639,23 @@ static int
 process_event(event_t *event, unsigned long offset, unsigned long head)
 {
        switch (event->header.type) {
-       case PERF_EVENT_SAMPLE:
+       case PERF_RECORD_SAMPLE:
                return process_sample_event(event, offset, head);
 
-       case PERF_EVENT_MMAP:
+       case PERF_RECORD_MMAP:
                return process_mmap_event(event, offset, head);
 
-       case PERF_EVENT_COMM:
+       case PERF_RECORD_COMM:
                return process_comm_event(event, offset, head);
 
-       case PERF_EVENT_FORK:
+       case PERF_RECORD_FORK:
                return process_fork_event(event, offset, head);
        /*
         * We dont process them right now but they are fine:
         */
 
-       case PERF_EVENT_THROTTLE:
-       case PERF_EVENT_UNTHROTTLE:
+       case PERF_RECORD_THROTTLE:
+       case PERF_RECORD_UNTHROTTLE:
                return 0;
 
        default:
index 99a12fe..a5a050a 100644 (file)
@@ -48,6 +48,8 @@ static int                    call_graph                      = 0;
 static int                     inherit_stat                    = 0;
 static int                     no_samples                      = 0;
 static int                     sample_address                  = 0;
+static int                     multiplex                       = 0;
+static int                     multiplex_fd                    = -1;
 
 static long                    samples;
 static struct timeval          last_read;
@@ -75,7 +77,7 @@ static struct mmap_data               mmap_array[MAX_NR_CPUS][MAX_COUNTERS];
 
 static unsigned long mmap_read_head(struct mmap_data *md)
 {
-       struct perf_counter_mmap_page *pc = md->base;
+       struct perf_event_mmap_page *pc = md->base;
        long head;
 
        head = pc->data_head;
@@ -86,7 +88,7 @@ static unsigned long mmap_read_head(struct mmap_data *md)
 
 static void mmap_write_tail(struct mmap_data *md, unsigned long tail)
 {
-       struct perf_counter_mmap_page *pc = md->base;
+       struct perf_event_mmap_page *pc = md->base;
 
        /*
         * ensure all reads are done before we write the tail out.
@@ -231,7 +233,7 @@ static pid_t pid_synthesize_comm_event(pid_t pid, int full)
                }
        }
 
-       comm_ev.header.type = PERF_EVENT_COMM;
+       comm_ev.header.type = PERF_RECORD_COMM;
        size = ALIGN(size, sizeof(u64));
        comm_ev.header.size = sizeof(comm_ev) - (sizeof(comm_ev.comm) - size);
 
@@ -286,7 +288,7 @@ static void pid_synthesize_mmap_samples(pid_t pid, pid_t tgid)
        while (1) {
                char bf[BUFSIZ], *pbf = bf;
                struct mmap_event mmap_ev = {
-                       .header = { .type = PERF_EVENT_MMAP },
+                       .header = { .type = PERF_RECORD_MMAP },
                };
                int n;
                size_t size;
@@ -353,7 +355,7 @@ static void synthesize_all(void)
 
 static int group_fd;
 
-static struct perf_header_attr *get_header_attr(struct perf_counter_attr *a, int nr)
+static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int nr)
 {
        struct perf_header_attr *h_attr;
 
@@ -369,7 +371,7 @@ static struct perf_header_attr *get_header_attr(struct perf_counter_attr *a, int
 
 static void create_counter(int counter, int cpu, pid_t pid)
 {
-       struct perf_counter_attr *attr = attrs + counter;
+       struct perf_event_attr *attr = attrs + counter;
        struct perf_header_attr *h_attr;
        int track = !counter; /* only the first counter needs these */
        struct {
@@ -415,7 +417,7 @@ static void create_counter(int counter, int cpu, pid_t pid)
        attr->disabled          = 1;
 
 try_again:
-       fd[nr_cpu][counter] = sys_perf_counter_open(attr, pid, cpu, group_fd, 0);
+       fd[nr_cpu][counter] = sys_perf_event_open(attr, pid, cpu, group_fd, 0);
 
        if (fd[nr_cpu][counter] < 0) {
                int err = errno;
@@ -442,7 +444,7 @@ try_again:
                printf("\n");
                error("perfcounter syscall returned with %d (%s)\n",
                        fd[nr_cpu][counter], strerror(err));
-               die("No CONFIG_PERF_COUNTERS=y kernel support configured?\n");
+               die("No CONFIG_PERF_EVENTS=y kernel support configured?\n");
                exit(-1);
        }
 
@@ -470,22 +472,31 @@ try_again:
         */
        if (group && group_fd == -1)
                group_fd = fd[nr_cpu][counter];
+       if (multiplex && multiplex_fd == -1)
+               multiplex_fd = fd[nr_cpu][counter];
 
-       event_array[nr_poll].fd = fd[nr_cpu][counter];
-       event_array[nr_poll].events = POLLIN;
-       nr_poll++;
-
-       mmap_array[nr_cpu][counter].counter = counter;
-       mmap_array[nr_cpu][counter].prev = 0;
-       mmap_array[nr_cpu][counter].mask = mmap_pages*page_size - 1;
-       mmap_array[nr_cpu][counter].base = mmap(NULL, (mmap_pages+1)*page_size,
-                       PROT_READ|PROT_WRITE, MAP_SHARED, fd[nr_cpu][counter], 0);
-       if (mmap_array[nr_cpu][counter].base == MAP_FAILED) {
-               error("failed to mmap with %d (%s)\n", errno, strerror(errno));
-               exit(-1);
+       if (multiplex && fd[nr_cpu][counter] != multiplex_fd) {
+               int ret;
+
+               ret = ioctl(fd[nr_cpu][counter], PERF_EVENT_IOC_SET_OUTPUT, multiplex_fd);
+               assert(ret != -1);
+       } else {
+               event_array[nr_poll].fd = fd[nr_cpu][counter];
+               event_array[nr_poll].events = POLLIN;
+               nr_poll++;
+
+               mmap_array[nr_cpu][counter].counter = counter;
+               mmap_array[nr_cpu][counter].prev = 0;
+               mmap_array[nr_cpu][counter].mask = mmap_pages*page_size - 1;
+               mmap_array[nr_cpu][counter].base = mmap(NULL, (mmap_pages+1)*page_size,
+                               PROT_READ|PROT_WRITE, MAP_SHARED, fd[nr_cpu][counter], 0);
+               if (mmap_array[nr_cpu][counter].base == MAP_FAILED) {
+                       error("failed to mmap with %d (%s)\n", errno, strerror(errno));
+                       exit(-1);
+               }
        }
 
-       ioctl(fd[nr_cpu][counter], PERF_COUNTER_IOC_ENABLE);
+       ioctl(fd[nr_cpu][counter], PERF_EVENT_IOC_ENABLE);
 }
 
 static void open_counters(int cpu, pid_t pid)
@@ -513,6 +524,7 @@ static int __cmd_record(int argc, const char **argv)
        pid_t pid = 0;
        int flags;
        int ret;
+       unsigned long waking = 0;
 
        page_size = sysconf(_SC_PAGE_SIZE);
        nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
@@ -614,17 +626,29 @@ static int __cmd_record(int argc, const char **argv)
                int hits = samples;
 
                for (i = 0; i < nr_cpu; i++) {
-                       for (counter = 0; counter < nr_counters; counter++)
-                               mmap_read(&mmap_array[i][counter]);
+                       for (counter = 0; counter < nr_counters; counter++) {
+                               if (mmap_array[i][counter].base)
+                                       mmap_read(&mmap_array[i][counter]);
+                       }
                }
 
                if (hits == samples) {
                        if (done)
                                break;
-                       ret = poll(event_array, nr_poll, 100);
+                       ret = poll(event_array, nr_poll, -1);
+                       waking++;
+               }
+
+               if (done) {
+                       for (i = 0; i < nr_cpu; i++) {
+                               for (counter = 0; counter < nr_counters; counter++)
+                                       ioctl(fd[i][counter], PERF_EVENT_IOC_DISABLE);
+                       }
                }
        }
 
+       fprintf(stderr, "[ perf record: Woken up %ld times to write data ]\n", waking);
+
        /*
         * Approximate RIP event size: 24 bytes.
         */
@@ -681,6 +705,8 @@ static const struct option options[] = {
                    "Sample addresses"),
        OPT_BOOLEAN('n', "no-samples", &no_samples,
                    "don't sample"),
+       OPT_BOOLEAN('M', "multiplex", &multiplex,
+                   "multiplex counter output in a single channel"),
        OPT_END()
 };
 
index cdf9a8d..19669c2 100644 (file)
@@ -1121,7 +1121,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                more_data += sizeof(u64);
        }
 
-       dump_printf("%p [%p]: PERF_EVENT_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
+       dump_printf("%p [%p]: PERF_RECORD_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->header.misc,
@@ -1158,9 +1158,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
        if (comm_list && !strlist__has_entry(comm_list, thread->comm))
                return 0;
 
-       cpumode = event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK;
+       cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
-       if (cpumode == PERF_EVENT_MISC_KERNEL) {
+       if (cpumode == PERF_RECORD_MISC_KERNEL) {
                show = SHOW_KERNEL;
                level = 'k';
 
@@ -1168,7 +1168,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 
                dump_printf(" ...... dso: %s\n", dso->name);
 
-       } else if (cpumode == PERF_EVENT_MISC_USER) {
+       } else if (cpumode == PERF_RECORD_MISC_USER) {
 
                show = SHOW_USER;
                level = '.';
@@ -1210,7 +1210,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
 
        thread = threads__findnew(event->mmap.pid, &threads, &last_match);
 
-       dump_printf("%p [%p]: PERF_EVENT_MMAP %d/%d: [%p(%p) @ %p]: %s\n",
+       dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->mmap.pid,
@@ -1221,7 +1221,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)
                event->mmap.filename);
 
        if (thread == NULL || map == NULL) {
-               dump_printf("problem processing PERF_EVENT_MMAP, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_MMAP, skipping event.\n");
                return 0;
        }
 
@@ -1238,14 +1238,14 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)
 
        thread = threads__findnew(event->comm.pid, &threads, &last_match);
 
-       dump_printf("%p [%p]: PERF_EVENT_COMM: %s:%d\n",
+       dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->comm.comm, event->comm.pid);
 
        if (thread == NULL ||
            thread__set_comm_adjust(thread, event->comm.comm)) {
-               dump_printf("problem processing PERF_EVENT_COMM, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");
                return -1;
        }
        total_comm++;
@@ -1262,10 +1262,10 @@ process_task_event(event_t *event, unsigned long offset, unsigned long head)
        thread = threads__findnew(event->fork.pid, &threads, &last_match);
        parent = threads__findnew(event->fork.ppid, &threads, &last_match);
 
-       dump_printf("%p [%p]: PERF_EVENT_%s: (%d:%d):(%d:%d)\n",
+       dump_printf("%p [%p]: PERF_RECORD_%s: (%d:%d):(%d:%d)\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
-               event->header.type == PERF_EVENT_FORK ? "FORK" : "EXIT",
+               event->header.type == PERF_RECORD_FORK ? "FORK" : "EXIT",
                event->fork.pid, event->fork.tid,
                event->fork.ppid, event->fork.ptid);
 
@@ -1276,11 +1276,11 @@ process_task_event(event_t *event, unsigned long offset, unsigned long head)
        if (thread == parent)
                return 0;
 
-       if (event->header.type == PERF_EVENT_EXIT)
+       if (event->header.type == PERF_RECORD_EXIT)
                return 0;
 
        if (!thread || !parent || thread__fork(thread, parent)) {
-               dump_printf("problem processing PERF_EVENT_FORK, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_FORK, skipping event.\n");
                return -1;
        }
        total_fork++;
@@ -1291,7 +1291,7 @@ process_task_event(event_t *event, unsigned long offset, unsigned long head)
 static int
 process_lost_event(event_t *event, unsigned long offset, unsigned long head)
 {
-       dump_printf("%p [%p]: PERF_EVENT_LOST: id:%Ld: lost:%Ld\n",
+       dump_printf("%p [%p]: PERF_RECORD_LOST: id:%Ld: lost:%Ld\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->lost.id,
@@ -1305,7 +1305,7 @@ process_lost_event(event_t *event, unsigned long offset, unsigned long head)
 static int
 process_read_event(event_t *event, unsigned long offset, unsigned long head)
 {
-       struct perf_counter_attr *attr;
+       struct perf_event_attr *attr;
 
        attr = perf_header__find_attr(event->read.id, header);
 
@@ -1319,7 +1319,7 @@ process_read_event(event_t *event, unsigned long offset, unsigned long head)
                                           event->read.value);
        }
 
-       dump_printf("%p [%p]: PERF_EVENT_READ: %d %d %s %Lu\n",
+       dump_printf("%p [%p]: PERF_RECORD_READ: %d %d %s %Lu\n",
                        (void *)(offset + head),
                        (void *)(long)(event->header.size),
                        event->read.pid,
@@ -1337,31 +1337,31 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
        trace_event(event);
 
        switch (event->header.type) {
-       case PERF_EVENT_SAMPLE:
+       case PERF_RECORD_SAMPLE:
                return process_sample_event(event, offset, head);
 
-       case PERF_EVENT_MMAP:
+       case PERF_RECORD_MMAP:
                return process_mmap_event(event, offset, head);
 
-       case PERF_EVENT_COMM:
+       case PERF_RECORD_COMM:
                return process_comm_event(event, offset, head);
 
-       case PERF_EVENT_FORK:
-       case PERF_EVENT_EXIT:
+       case PERF_RECORD_FORK:
+       case PERF_RECORD_EXIT:
                return process_task_event(event, offset, head);
 
-       case PERF_EVENT_LOST:
+       case PERF_RECORD_LOST:
                return process_lost_event(event, offset, head);
 
-       case PERF_EVENT_READ:
+       case PERF_RECORD_READ:
                return process_read_event(event, offset, head);
 
        /*
         * We dont process them right now but they are fine:
         */
 
-       case PERF_EVENT_THROTTLE:
-       case PERF_EVENT_UNTHROTTLE:
+       case PERF_RECORD_THROTTLE:
+       case PERF_RECORD_UNTHROTTLE:
                return 0;
 
        default:
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
new file mode 100644 (file)
index 0000000..ea9c15c
--- /dev/null
@@ -0,0 +1,2004 @@
+#include "builtin.h"
+#include "perf.h"
+
+#include "util/util.h"
+#include "util/cache.h"
+#include "util/symbol.h"
+#include "util/thread.h"
+#include "util/header.h"
+
+#include "util/parse-options.h"
+#include "util/trace-event.h"
+
+#include "util/debug.h"
+
+#include <sys/types.h>
+#include <sys/prctl.h>
+
+#include <semaphore.h>
+#include <pthread.h>
+#include <math.h>
+
+static char                    const *input_name = "perf.data";
+static int                     input;
+static unsigned long           page_size;
+static unsigned long           mmap_window = 32;
+
+static unsigned long           total_comm = 0;
+
+static struct rb_root          threads;
+static struct thread           *last_match;
+
+static struct perf_header      *header;
+static u64                     sample_type;
+
+static char                    default_sort_order[] = "avg, max, switch, runtime";
+static char                    *sort_order = default_sort_order;
+
+#define PR_SET_NAME            15               /* Set process name */
+#define MAX_CPUS               4096
+
+#define BUG_ON(x)              assert(!(x))
+
+static u64                     run_measurement_overhead;
+static u64                     sleep_measurement_overhead;
+
+#define COMM_LEN               20
+#define SYM_LEN                        129
+
+#define MAX_PID                        65536
+
+static unsigned long           nr_tasks;
+
+struct sched_atom;
+
+struct task_desc {
+       unsigned long           nr;
+       unsigned long           pid;
+       char                    comm[COMM_LEN];
+
+       unsigned long           nr_events;
+       unsigned long           curr_event;
+       struct sched_atom       **atoms;
+
+       pthread_t               thread;
+       sem_t                   sleep_sem;
+
+       sem_t                   ready_for_work;
+       sem_t                   work_done_sem;
+
+       u64                     cpu_usage;
+};
+
+enum sched_event_type {
+       SCHED_EVENT_RUN,
+       SCHED_EVENT_SLEEP,
+       SCHED_EVENT_WAKEUP,
+};
+
+struct sched_atom {
+       enum sched_event_type   type;
+       u64                     timestamp;
+       u64                     duration;
+       unsigned long           nr;
+       int                     specific_wait;
+       sem_t                   *wait_sem;
+       struct task_desc        *wakee;
+};
+
+static struct task_desc                *pid_to_task[MAX_PID];
+
+static struct task_desc                **tasks;
+
+static pthread_mutex_t         start_work_mutex = PTHREAD_MUTEX_INITIALIZER;
+static u64                     start_time;
+
+static pthread_mutex_t         work_done_wait_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static unsigned long           nr_run_events;
+static unsigned long           nr_sleep_events;
+static unsigned long           nr_wakeup_events;
+
+static unsigned long           nr_sleep_corrections;
+static unsigned long           nr_run_events_optimized;
+
+static unsigned long           targetless_wakeups;
+static unsigned long           multitarget_wakeups;
+
+static u64                     cpu_usage;
+static u64                     runavg_cpu_usage;
+static u64                     parent_cpu_usage;
+static u64                     runavg_parent_cpu_usage;
+
+static unsigned long           nr_runs;
+static u64                     sum_runtime;
+static u64                     sum_fluct;
+static u64                     run_avg;
+
+static unsigned long           replay_repeat = 10;
+static unsigned long           nr_timestamps;
+static unsigned long           nr_unordered_timestamps;
+static unsigned long           nr_state_machine_bugs;
+static unsigned long           nr_context_switch_bugs;
+static unsigned long           nr_events;
+static unsigned long           nr_lost_chunks;
+static unsigned long           nr_lost_events;
+
+#define TASK_STATE_TO_CHAR_STR "RSDTtZX"
+
+enum thread_state {
+       THREAD_SLEEPING = 0,
+       THREAD_WAIT_CPU,
+       THREAD_SCHED_IN,
+       THREAD_IGNORE
+};
+
+struct work_atom {
+       struct list_head        list;
+       enum thread_state       state;
+       u64                     sched_out_time;
+       u64                     wake_up_time;
+       u64                     sched_in_time;
+       u64                     runtime;
+};
+
+struct work_atoms {
+       struct list_head        work_list;
+       struct thread           *thread;
+       struct rb_node          node;
+       u64                     max_lat;
+       u64                     total_lat;
+       u64                     nb_atoms;
+       u64                     total_runtime;
+};
+
+typedef int (*sort_fn_t)(struct work_atoms *, struct work_atoms *);
+
+static struct rb_root          atom_root, sorted_atom_root;
+
+static u64                     all_runtime;
+static u64                     all_count;
+
+
+static u64 get_nsecs(void)
+{
+       struct timespec ts;
+
+       clock_gettime(CLOCK_MONOTONIC, &ts);
+
+       return ts.tv_sec * 1000000000ULL + ts.tv_nsec;
+}
+
+static void burn_nsecs(u64 nsecs)
+{
+       u64 T0 = get_nsecs(), T1;
+
+       do {
+               T1 = get_nsecs();
+       } while (T1 + run_measurement_overhead < T0 + nsecs);
+}
+
+static void sleep_nsecs(u64 nsecs)
+{
+       struct timespec ts;
+
+       ts.tv_nsec = nsecs % 999999999;
+       ts.tv_sec = nsecs / 999999999;
+
+       nanosleep(&ts, NULL);
+}
+
+static void calibrate_run_measurement_overhead(void)
+{
+       u64 T0, T1, delta, min_delta = 1000000000ULL;
+       int i;
+
+       for (i = 0; i < 10; i++) {
+               T0 = get_nsecs();
+               burn_nsecs(0);
+               T1 = get_nsecs();
+               delta = T1-T0;
+               min_delta = min(min_delta, delta);
+       }
+       run_measurement_overhead = min_delta;
+
+       printf("run measurement overhead: %Ld nsecs\n", min_delta);
+}
+
+static void calibrate_sleep_measurement_overhead(void)
+{
+       u64 T0, T1, delta, min_delta = 1000000000ULL;
+       int i;
+
+       for (i = 0; i < 10; i++) {
+               T0 = get_nsecs();
+               sleep_nsecs(10000);
+               T1 = get_nsecs();
+               delta = T1-T0;
+               min_delta = min(min_delta, delta);
+       }
+       min_delta -= 10000;
+       sleep_measurement_overhead = min_delta;
+
+       printf("sleep measurement overhead: %Ld nsecs\n", min_delta);
+}
+
+static struct sched_atom *
+get_new_event(struct task_desc *task, u64 timestamp)
+{
+       struct sched_atom *event = calloc(1, sizeof(*event));
+       unsigned long idx = task->nr_events;
+       size_t size;
+
+       event->timestamp = timestamp;
+       event->nr = idx;
+
+       task->nr_events++;
+       size = sizeof(struct sched_atom *) * task->nr_events;
+       task->atoms = realloc(task->atoms, size);
+       BUG_ON(!task->atoms);
+
+       task->atoms[idx] = event;
+
+       return event;
+}
+
+static struct sched_atom *last_event(struct task_desc *task)
+{
+       if (!task->nr_events)
+               return NULL;
+
+       return task->atoms[task->nr_events - 1];
+}
+
+static void
+add_sched_event_run(struct task_desc *task, u64 timestamp, u64 duration)
+{
+       struct sched_atom *event, *curr_event = last_event(task);
+
+       /*
+        * optimize an existing RUN event by merging this one
+        * to it:
+        */
+       if (curr_event && curr_event->type == SCHED_EVENT_RUN) {
+               nr_run_events_optimized++;
+               curr_event->duration += duration;
+               return;
+       }
+
+       event = get_new_event(task, timestamp);
+
+       event->type = SCHED_EVENT_RUN;
+       event->duration = duration;
+
+       nr_run_events++;
+}
+
+static void
+add_sched_event_wakeup(struct task_desc *task, u64 timestamp,
+                      struct task_desc *wakee)
+{
+       struct sched_atom *event, *wakee_event;
+
+       event = get_new_event(task, timestamp);
+       event->type = SCHED_EVENT_WAKEUP;
+       event->wakee = wakee;
+
+       wakee_event = last_event(wakee);
+       if (!wakee_event || wakee_event->type != SCHED_EVENT_SLEEP) {
+               targetless_wakeups++;
+               return;
+       }
+       if (wakee_event->wait_sem) {
+               multitarget_wakeups++;
+               return;
+       }
+
+       wakee_event->wait_sem = calloc(1, sizeof(*wakee_event->wait_sem));
+       sem_init(wakee_event->wait_sem, 0, 0);
+       wakee_event->specific_wait = 1;
+       event->wait_sem = wakee_event->wait_sem;
+
+       nr_wakeup_events++;
+}
+
+static void
+add_sched_event_sleep(struct task_desc *task, u64 timestamp,
+                     u64 task_state __used)
+{
+       struct sched_atom *event = get_new_event(task, timestamp);
+
+       event->type = SCHED_EVENT_SLEEP;
+
+       nr_sleep_events++;
+}
+
+static struct task_desc *register_pid(unsigned long pid, const char *comm)
+{
+       struct task_desc *task;
+
+       BUG_ON(pid >= MAX_PID);
+
+       task = pid_to_task[pid];
+
+       if (task)
+               return task;
+
+       task = calloc(1, sizeof(*task));
+       task->pid = pid;
+       task->nr = nr_tasks;
+       strcpy(task->comm, comm);
+       /*
+        * every task starts in sleeping state - this gets ignored
+        * if there's no wakeup pointing to this sleep state:
+        */
+       add_sched_event_sleep(task, 0, 0);
+
+       pid_to_task[pid] = task;
+       nr_tasks++;
+       tasks = realloc(tasks, nr_tasks*sizeof(struct task_task *));
+       BUG_ON(!tasks);
+       tasks[task->nr] = task;
+
+       if (verbose)
+               printf("registered task #%ld, PID %ld (%s)\n", nr_tasks, pid, comm);
+
+       return task;
+}
+
+
+static void print_task_traces(void)
+{
+       struct task_desc *task;
+       unsigned long i;
+
+       for (i = 0; i < nr_tasks; i++) {
+               task = tasks[i];
+               printf("task %6ld (%20s:%10ld), nr_events: %ld\n",
+                       task->nr, task->comm, task->pid, task->nr_events);
+       }
+}
+
+static void add_cross_task_wakeups(void)
+{
+       struct task_desc *task1, *task2;
+       unsigned long i, j;
+
+       for (i = 0; i < nr_tasks; i++) {
+               task1 = tasks[i];
+               j = i + 1;
+               if (j == nr_tasks)
+                       j = 0;
+               task2 = tasks[j];
+               add_sched_event_wakeup(task1, 0, task2);
+       }
+}
+
+static void
+process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom)
+{
+       int ret = 0;
+       u64 now;
+       long long delta;
+
+       now = get_nsecs();
+       delta = start_time + atom->timestamp - now;
+
+       switch (atom->type) {
+               case SCHED_EVENT_RUN:
+                       burn_nsecs(atom->duration);
+                       break;
+               case SCHED_EVENT_SLEEP:
+                       if (atom->wait_sem)
+                               ret = sem_wait(atom->wait_sem);
+                       BUG_ON(ret);
+                       break;
+               case SCHED_EVENT_WAKEUP:
+                       if (atom->wait_sem)
+                               ret = sem_post(atom->wait_sem);
+                       BUG_ON(ret);
+                       break;
+               default:
+                       BUG_ON(1);
+       }
+}
+
+static u64 get_cpu_usage_nsec_parent(void)
+{
+       struct rusage ru;
+       u64 sum;
+       int err;
+
+       err = getrusage(RUSAGE_SELF, &ru);
+       BUG_ON(err);
+
+       sum =  ru.ru_utime.tv_sec*1e9 + ru.ru_utime.tv_usec*1e3;
+       sum += ru.ru_stime.tv_sec*1e9 + ru.ru_stime.tv_usec*1e3;
+
+       return sum;
+}
+
+static u64 get_cpu_usage_nsec_self(void)
+{
+       char filename [] = "/proc/1234567890/sched";
+       unsigned long msecs, nsecs;
+       char *line = NULL;
+       u64 total = 0;
+       size_t len = 0;
+       ssize_t chars;
+       FILE *file;
+       int ret;
+
+       sprintf(filename, "/proc/%d/sched", getpid());
+       file = fopen(filename, "r");
+       BUG_ON(!file);
+
+       while ((chars = getline(&line, &len, file)) != -1) {
+               ret = sscanf(line, "se.sum_exec_runtime : %ld.%06ld\n",
+                       &msecs, &nsecs);
+               if (ret == 2) {
+                       total = msecs*1e6 + nsecs;
+                       break;
+               }
+       }
+       if (line)
+               free(line);
+       fclose(file);
+
+       return total;
+}
+
+static void *thread_func(void *ctx)
+{
+       struct task_desc *this_task = ctx;
+       u64 cpu_usage_0, cpu_usage_1;
+       unsigned long i, ret;
+       char comm2[22];
+
+       sprintf(comm2, ":%s", this_task->comm);
+       prctl(PR_SET_NAME, comm2);
+
+again:
+       ret = sem_post(&this_task->ready_for_work);
+       BUG_ON(ret);
+       ret = pthread_mutex_lock(&start_work_mutex);
+       BUG_ON(ret);
+       ret = pthread_mutex_unlock(&start_work_mutex);
+       BUG_ON(ret);
+
+       cpu_usage_0 = get_cpu_usage_nsec_self();
+
+       for (i = 0; i < this_task->nr_events; i++) {
+               this_task->curr_event = i;
+               process_sched_event(this_task, this_task->atoms[i]);
+       }
+
+       cpu_usage_1 = get_cpu_usage_nsec_self();
+       this_task->cpu_usage = cpu_usage_1 - cpu_usage_0;
+
+       ret = sem_post(&this_task->work_done_sem);
+       BUG_ON(ret);
+
+       ret = pthread_mutex_lock(&work_done_wait_mutex);
+       BUG_ON(ret);
+       ret = pthread_mutex_unlock(&work_done_wait_mutex);
+       BUG_ON(ret);
+
+       goto again;
+}
+
+static void create_tasks(void)
+{
+       struct task_desc *task;
+       pthread_attr_t attr;
+       unsigned long i;
+       int err;
+
+       err = pthread_attr_init(&attr);
+       BUG_ON(err);
+       err = pthread_attr_setstacksize(&attr, (size_t)(16*1024));
+       BUG_ON(err);
+       err = pthread_mutex_lock(&start_work_mutex);
+       BUG_ON(err);
+       err = pthread_mutex_lock(&work_done_wait_mutex);
+       BUG_ON(err);
+       for (i = 0; i < nr_tasks; i++) {
+               task = tasks[i];
+               sem_init(&task->sleep_sem, 0, 0);
+               sem_init(&task->ready_for_work, 0, 0);
+               sem_init(&task->work_done_sem, 0, 0);
+               task->curr_event = 0;
+               err = pthread_create(&task->thread, &attr, thread_func, task);
+               BUG_ON(err);
+       }
+}
+
+static void wait_for_tasks(void)
+{
+       u64 cpu_usage_0, cpu_usage_1;
+       struct task_desc *task;
+       unsigned long i, ret;
+
+       start_time = get_nsecs();
+       cpu_usage = 0;
+       pthread_mutex_unlock(&work_done_wait_mutex);
+
+       for (i = 0; i < nr_tasks; i++) {
+               task = tasks[i];
+               ret = sem_wait(&task->ready_for_work);
+               BUG_ON(ret);
+               sem_init(&task->ready_for_work, 0, 0);
+       }
+       ret = pthread_mutex_lock(&work_done_wait_mutex);
+       BUG_ON(ret);
+
+       cpu_usage_0 = get_cpu_usage_nsec_parent();
+
+       pthread_mutex_unlock(&start_work_mutex);
+
+       for (i = 0; i < nr_tasks; i++) {
+               task = tasks[i];
+               ret = sem_wait(&task->work_done_sem);
+               BUG_ON(ret);
+               sem_init(&task->work_done_sem, 0, 0);
+               cpu_usage += task->cpu_usage;
+               task->cpu_usage = 0;
+       }
+
+       cpu_usage_1 = get_cpu_usage_nsec_parent();
+       if (!runavg_cpu_usage)
+               runavg_cpu_usage = cpu_usage;
+       runavg_cpu_usage = (runavg_cpu_usage*9 + cpu_usage)/10;
+
+       parent_cpu_usage = cpu_usage_1 - cpu_usage_0;
+       if (!runavg_parent_cpu_usage)
+               runavg_parent_cpu_usage = parent_cpu_usage;
+       runavg_parent_cpu_usage = (runavg_parent_cpu_usage*9 +
+                                  parent_cpu_usage)/10;
+
+       ret = pthread_mutex_lock(&start_work_mutex);
+       BUG_ON(ret);
+
+       for (i = 0; i < nr_tasks; i++) {
+               task = tasks[i];
+               sem_init(&task->sleep_sem, 0, 0);
+               task->curr_event = 0;
+       }
+}
+
+static void run_one_test(void)
+{
+       u64 T0, T1, delta, avg_delta, fluct, std_dev;
+
+       T0 = get_nsecs();
+       wait_for_tasks();
+       T1 = get_nsecs();
+
+       delta = T1 - T0;
+       sum_runtime += delta;
+       nr_runs++;
+
+       avg_delta = sum_runtime / nr_runs;
+       if (delta < avg_delta)
+               fluct = avg_delta - delta;
+       else
+               fluct = delta - avg_delta;
+       sum_fluct += fluct;
+       std_dev = sum_fluct / nr_runs / sqrt(nr_runs);
+       if (!run_avg)
+               run_avg = delta;
+       run_avg = (run_avg*9 + delta)/10;
+
+       printf("#%-3ld: %0.3f, ",
+               nr_runs, (double)delta/1000000.0);
+
+       printf("ravg: %0.2f, ",
+               (double)run_avg/1e6);
+
+       printf("cpu: %0.2f / %0.2f",
+               (double)cpu_usage/1e6, (double)runavg_cpu_usage/1e6);
+
+#if 0
+       /*
+        * rusage statistics done by the parent, these are less
+        * accurate than the sum_exec_runtime based statistics:
+        */
+       printf(" [%0.2f / %0.2f]",
+               (double)parent_cpu_usage/1e6,
+               (double)runavg_parent_cpu_usage/1e6);
+#endif
+
+       printf("\n");
+
+       if (nr_sleep_corrections)
+               printf(" (%ld sleep corrections)\n", nr_sleep_corrections);
+       nr_sleep_corrections = 0;
+}
+
+static void test_calibrations(void)
+{
+       u64 T0, T1;
+
+       T0 = get_nsecs();
+       burn_nsecs(1e6);
+       T1 = get_nsecs();
+
+       printf("the run test took %Ld nsecs\n", T1-T0);
+
+       T0 = get_nsecs();
+       sleep_nsecs(1e6);
+       T1 = get_nsecs();
+
+       printf("the sleep test took %Ld nsecs\n", T1-T0);
+}
+
+static int
+process_comm_event(event_t *event, unsigned long offset, unsigned long head)
+{
+       struct thread *thread;
+
+       thread = threads__findnew(event->comm.pid, &threads, &last_match);
+
+       dump_printf("%p [%p]: perf_event_comm: %s:%d\n",
+               (void *)(offset + head),
+               (void *)(long)(event->header.size),
+               event->comm.comm, event->comm.pid);
+
+       if (thread == NULL ||
+           thread__set_comm(thread, event->comm.comm)) {
+               dump_printf("problem processing perf_event_comm, skipping event.\n");
+               return -1;
+       }
+       total_comm++;
+
+       return 0;
+}
+
+
+struct raw_event_sample {
+       u32 size;
+       char data[0];
+};
+
+#define FILL_FIELD(ptr, field, event, data)    \
+       ptr.field = (typeof(ptr.field)) raw_field_value(event, #field, data)
+
+#define FILL_ARRAY(ptr, array, event, data)                    \
+do {                                                           \
+       void *__array = raw_field_ptr(event, #array, data);     \
+       memcpy(ptr.array, __array, sizeof(ptr.array));  \
+} while(0)
+
+#define FILL_COMMON_FIELDS(ptr, event, data)                   \
+do {                                                           \
+       FILL_FIELD(ptr, common_type, event, data);              \
+       FILL_FIELD(ptr, common_flags, event, data);             \
+       FILL_FIELD(ptr, common_preempt_count, event, data);     \
+       FILL_FIELD(ptr, common_pid, event, data);               \
+       FILL_FIELD(ptr, common_tgid, event, data);              \
+} while (0)
+
+
+
+struct trace_switch_event {
+       u32 size;
+
+       u16 common_type;
+       u8 common_flags;
+       u8 common_preempt_count;
+       u32 common_pid;
+       u32 common_tgid;
+
+       char prev_comm[16];
+       u32 prev_pid;
+       u32 prev_prio;
+       u64 prev_state;
+       char next_comm[16];
+       u32 next_pid;
+       u32 next_prio;
+};
+
+struct trace_runtime_event {
+       u32 size;
+
+       u16 common_type;
+       u8 common_flags;
+       u8 common_preempt_count;
+       u32 common_pid;
+       u32 common_tgid;
+
+       char comm[16];
+       u32 pid;
+       u64 runtime;
+       u64 vruntime;
+};
+
+struct trace_wakeup_event {
+       u32 size;
+
+       u16 common_type;
+       u8 common_flags;
+       u8 common_preempt_count;
+       u32 common_pid;
+       u32 common_tgid;
+
+       char comm[16];
+       u32 pid;
+
+       u32 prio;
+       u32 success;
+       u32 cpu;
+};
+
+struct trace_fork_event {
+       u32 size;
+
+       u16 common_type;
+       u8 common_flags;
+       u8 common_preempt_count;
+       u32 common_pid;
+       u32 common_tgid;
+
+       char parent_comm[16];
+       u32 parent_pid;
+       char child_comm[16];
+       u32 child_pid;
+};
+
+struct trace_sched_handler {
+       void (*switch_event)(struct trace_switch_event *,
+                            struct event *,
+                            int cpu,
+                            u64 timestamp,
+                            struct thread *thread);
+
+       void (*runtime_event)(struct trace_runtime_event *,
+                             struct event *,
+                             int cpu,
+                             u64 timestamp,
+                             struct thread *thread);
+
+       void (*wakeup_event)(struct trace_wakeup_event *,
+                            struct event *,
+                            int cpu,
+                            u64 timestamp,
+                            struct thread *thread);
+
+       void (*fork_event)(struct trace_fork_event *,
+                          struct event *,
+                          int cpu,
+                          u64 timestamp,
+                          struct thread *thread);
+};
+
+
+static void
+replay_wakeup_event(struct trace_wakeup_event *wakeup_event,
+                   struct event *event,
+                   int cpu __used,
+                   u64 timestamp __used,
+                   struct thread *thread __used)
+{
+       struct task_desc *waker, *wakee;
+
+       if (verbose) {
+               printf("sched_wakeup event %p\n", event);
+
+               printf(" ... pid %d woke up %s/%d\n",
+                       wakeup_event->common_pid,
+                       wakeup_event->comm,
+                       wakeup_event->pid);
+       }
+
+       waker = register_pid(wakeup_event->common_pid, "<unknown>");
+       wakee = register_pid(wakeup_event->pid, wakeup_event->comm);
+
+       add_sched_event_wakeup(waker, timestamp, wakee);
+}
+
+static u64 cpu_last_switched[MAX_CPUS];
+
+static void
+replay_switch_event(struct trace_switch_event *switch_event,
+                   struct event *event,
+                   int cpu,
+                   u64 timestamp,
+                   struct thread *thread __used)
+{
+       struct task_desc *prev, *next;
+       u64 timestamp0;
+       s64 delta;
+
+       if (verbose)
+               printf("sched_switch event %p\n", event);
+
+       if (cpu >= MAX_CPUS || cpu < 0)
+               return;
+
+       timestamp0 = cpu_last_switched[cpu];
+       if (timestamp0)
+               delta = timestamp - timestamp0;
+       else
+               delta = 0;
+
+       if (delta < 0)
+               die("hm, delta: %Ld < 0 ?\n", delta);
+
+       if (verbose) {
+               printf(" ... switch from %s/%d to %s/%d [ran %Ld nsecs]\n",
+                       switch_event->prev_comm, switch_event->prev_pid,
+                       switch_event->next_comm, switch_event->next_pid,
+                       delta);
+       }
+
+       prev = register_pid(switch_event->prev_pid, switch_event->prev_comm);
+       next = register_pid(switch_event->next_pid, switch_event->next_comm);
+
+       cpu_last_switched[cpu] = timestamp;
+
+       add_sched_event_run(prev, timestamp, delta);
+       add_sched_event_sleep(prev, timestamp, switch_event->prev_state);
+}
+
+
+static void
+replay_fork_event(struct trace_fork_event *fork_event,
+                 struct event *event,
+                 int cpu __used,
+                 u64 timestamp __used,
+                 struct thread *thread __used)
+{
+       if (verbose) {
+               printf("sched_fork event %p\n", event);
+               printf("... parent: %s/%d\n", fork_event->parent_comm, fork_event->parent_pid);
+               printf("...  child: %s/%d\n", fork_event->child_comm, fork_event->child_pid);
+       }
+       register_pid(fork_event->parent_pid, fork_event->parent_comm);
+       register_pid(fork_event->child_pid, fork_event->child_comm);
+}
+
+static struct trace_sched_handler replay_ops  = {
+       .wakeup_event           = replay_wakeup_event,
+       .switch_event           = replay_switch_event,
+       .fork_event             = replay_fork_event,
+};
+
+struct sort_dimension {
+       const char              *name;
+       sort_fn_t               cmp;
+       struct list_head        list;
+};
+
+static LIST_HEAD(cmp_pid);
+
+static int
+thread_lat_cmp(struct list_head *list, struct work_atoms *l, struct work_atoms *r)
+{
+       struct sort_dimension *sort;
+       int ret = 0;
+
+       BUG_ON(list_empty(list));
+
+       list_for_each_entry(sort, list, list) {
+               ret = sort->cmp(l, r);
+               if (ret)
+                       return ret;
+       }
+
+       return ret;
+}
+
+static struct work_atoms *
+thread_atoms_search(struct rb_root *root, struct thread *thread,
+                        struct list_head *sort_list)
+{
+       struct rb_node *node = root->rb_node;
+       struct work_atoms key = { .thread = thread };
+
+       while (node) {
+               struct work_atoms *atoms;
+               int cmp;
+
+               atoms = container_of(node, struct work_atoms, node);
+
+               cmp = thread_lat_cmp(sort_list, &key, atoms);
+               if (cmp > 0)
+                       node = node->rb_left;
+               else if (cmp < 0)
+                       node = node->rb_right;
+               else {
+                       BUG_ON(thread != atoms->thread);
+                       return atoms;
+               }
+       }
+       return NULL;
+}
+
+static void
+__thread_latency_insert(struct rb_root *root, struct work_atoms *data,
+                        struct list_head *sort_list)
+{
+       struct rb_node **new = &(root->rb_node), *parent = NULL;
+
+       while (*new) {
+               struct work_atoms *this;
+               int cmp;
+
+               this = container_of(*new, struct work_atoms, node);
+               parent = *new;
+
+               cmp = thread_lat_cmp(sort_list, data, this);
+
+               if (cmp > 0)
+                       new = &((*new)->rb_left);
+               else
+                       new = &((*new)->rb_right);
+       }
+
+       rb_link_node(&data->node, parent, new);
+       rb_insert_color(&data->node, root);
+}
+
+static void thread_atoms_insert(struct thread *thread)
+{
+       struct work_atoms *atoms;
+
+       atoms = calloc(sizeof(*atoms), 1);
+       if (!atoms)
+               die("No memory");
+
+       atoms->thread = thread;
+       INIT_LIST_HEAD(&atoms->work_list);
+       __thread_latency_insert(&atom_root, atoms, &cmp_pid);
+}
+
+static void
+latency_fork_event(struct trace_fork_event *fork_event __used,
+                  struct event *event __used,
+                  int cpu __used,
+                  u64 timestamp __used,
+                  struct thread *thread __used)
+{
+       /* should insert the newcomer */
+}
+
+__used
+static char sched_out_state(struct trace_switch_event *switch_event)
+{
+       const char *str = TASK_STATE_TO_CHAR_STR;
+
+       return str[switch_event->prev_state];
+}
+
+static void
+add_sched_out_event(struct work_atoms *atoms,
+                   char run_state,
+                   u64 timestamp)
+{
+       struct work_atom *atom;
+
+       atom = calloc(sizeof(*atom), 1);
+       if (!atom)
+               die("Non memory");
+
+       atom->sched_out_time = timestamp;
+
+       if (run_state == 'R') {
+               atom->state = THREAD_WAIT_CPU;
+               atom->wake_up_time = atom->sched_out_time;
+       }
+
+       list_add_tail(&atom->list, &atoms->work_list);
+}
+
+static void
+add_runtime_event(struct work_atoms *atoms, u64 delta, u64 timestamp __used)
+{
+       struct work_atom *atom;
+
+       BUG_ON(list_empty(&atoms->work_list));
+
+       atom = list_entry(atoms->work_list.prev, struct work_atom, list);
+
+       atom->runtime += delta;
+       atoms->total_runtime += delta;
+}
+
+static void
+add_sched_in_event(struct work_atoms *atoms, u64 timestamp)
+{
+       struct work_atom *atom;
+       u64 delta;
+
+       if (list_empty(&atoms->work_list))
+               return;
+
+       atom = list_entry(atoms->work_list.prev, struct work_atom, list);
+
+       if (atom->state != THREAD_WAIT_CPU)
+               return;
+
+       if (timestamp < atom->wake_up_time) {
+               atom->state = THREAD_IGNORE;
+               return;
+       }
+
+       atom->state = THREAD_SCHED_IN;
+       atom->sched_in_time = timestamp;
+
+       delta = atom->sched_in_time - atom->wake_up_time;
+       atoms->total_lat += delta;
+       if (delta > atoms->max_lat)
+               atoms->max_lat = delta;
+       atoms->nb_atoms++;
+}
+
+static void
+latency_switch_event(struct trace_switch_event *switch_event,
+                    struct event *event __used,
+                    int cpu,
+                    u64 timestamp,
+                    struct thread *thread __used)
+{
+       struct work_atoms *out_events, *in_events;
+       struct thread *sched_out, *sched_in;
+       u64 timestamp0;
+       s64 delta;
+
+       BUG_ON(cpu >= MAX_CPUS || cpu < 0);
+
+       timestamp0 = cpu_last_switched[cpu];
+       cpu_last_switched[cpu] = timestamp;
+       if (timestamp0)
+               delta = timestamp - timestamp0;
+       else
+               delta = 0;
+
+       if (delta < 0)
+               die("hm, delta: %Ld < 0 ?\n", delta);
+
+
+       sched_out = threads__findnew(switch_event->prev_pid, &threads, &last_match);
+       sched_in = threads__findnew(switch_event->next_pid, &threads, &last_match);
+
+       out_events = thread_atoms_search(&atom_root, sched_out, &cmp_pid);
+       if (!out_events) {
+               thread_atoms_insert(sched_out);
+               out_events = thread_atoms_search(&atom_root, sched_out, &cmp_pid);
+               if (!out_events)
+                       die("out-event: Internal tree error");
+       }
+       add_sched_out_event(out_events, sched_out_state(switch_event), timestamp);
+
+       in_events = thread_atoms_search(&atom_root, sched_in, &cmp_pid);
+       if (!in_events) {
+               thread_atoms_insert(sched_in);
+               in_events = thread_atoms_search(&atom_root, sched_in, &cmp_pid);
+               if (!in_events)
+                       die("in-event: Internal tree error");
+               /*
+                * Take came in we have not heard about yet,
+                * add in an initial atom in runnable state:
+                */
+               add_sched_out_event(in_events, 'R', timestamp);
+       }
+       add_sched_in_event(in_events, timestamp);
+}
+
+static void
+latency_runtime_event(struct trace_runtime_event *runtime_event,
+                    struct event *event __used,
+                    int cpu,
+                    u64 timestamp,
+                    struct thread *this_thread __used)
+{
+       struct work_atoms *atoms;
+       struct thread *thread;
+
+       BUG_ON(cpu >= MAX_CPUS || cpu < 0);
+
+       thread = threads__findnew(runtime_event->pid, &threads, &last_match);
+       atoms = thread_atoms_search(&atom_root, thread, &cmp_pid);
+       if (!atoms) {
+               thread_atoms_insert(thread);
+               atoms = thread_atoms_search(&atom_root, thread, &cmp_pid);
+               if (!atoms)
+                       die("in-event: Internal tree error");
+               add_sched_out_event(atoms, 'R', timestamp);
+       }
+
+       add_runtime_event(atoms, runtime_event->runtime, timestamp);
+}
+
+static void
+latency_wakeup_event(struct trace_wakeup_event *wakeup_event,
+                    struct event *__event __used,
+                    int cpu __used,
+                    u64 timestamp,
+                    struct thread *thread __used)
+{
+       struct work_atoms *atoms;
+       struct work_atom *atom;
+       struct thread *wakee;
+
+       /* Note for later, it may be interesting to observe the failing cases */
+       if (!wakeup_event->success)
+               return;
+
+       wakee = threads__findnew(wakeup_event->pid, &threads, &last_match);
+       atoms = thread_atoms_search(&atom_root, wakee, &cmp_pid);
+       if (!atoms) {
+               thread_atoms_insert(wakee);
+               atoms = thread_atoms_search(&atom_root, wakee, &cmp_pid);
+               if (!atoms)
+                       die("wakeup-event: Internal tree error");
+               add_sched_out_event(atoms, 'S', timestamp);
+       }
+
+       BUG_ON(list_empty(&atoms->work_list));
+
+       atom = list_entry(atoms->work_list.prev, struct work_atom, list);
+
+       if (atom->state != THREAD_SLEEPING)
+               nr_state_machine_bugs++;
+
+       nr_timestamps++;
+       if (atom->sched_out_time > timestamp) {
+               nr_unordered_timestamps++;
+               return;
+       }
+
+       atom->state = THREAD_WAIT_CPU;
+       atom->wake_up_time = timestamp;
+}
+
+static struct trace_sched_handler lat_ops  = {
+       .wakeup_event           = latency_wakeup_event,
+       .switch_event           = latency_switch_event,
+       .runtime_event          = latency_runtime_event,
+       .fork_event             = latency_fork_event,
+};
+
+static void output_lat_thread(struct work_atoms *work_list)
+{
+       int i;
+       int ret;
+       u64 avg;
+
+       if (!work_list->nb_atoms)
+               return;
+       /*
+        * Ignore idle threads:
+        */
+       if (!strcmp(work_list->thread->comm, "swapper"))
+               return;
+
+       all_runtime += work_list->total_runtime;
+       all_count += work_list->nb_atoms;
+
+       ret = printf("  %s:%d ", work_list->thread->comm, work_list->thread->pid);
+
+       for (i = 0; i < 24 - ret; i++)
+               printf(" ");
+
+       avg = work_list->total_lat / work_list->nb_atoms;
+
+       printf("|%11.3f ms |%9llu | avg:%9.3f ms | max:%9.3f ms |\n",
+             (double)work_list->total_runtime / 1e6,
+                work_list->nb_atoms, (double)avg / 1e6,
+                (double)work_list->max_lat / 1e6);
+}
+
+static int pid_cmp(struct work_atoms *l, struct work_atoms *r)
+{
+       if (l->thread->pid < r->thread->pid)
+               return -1;
+       if (l->thread->pid > r->thread->pid)
+               return 1;
+
+       return 0;
+}
+
+static struct sort_dimension pid_sort_dimension = {
+       .name                   = "pid",
+       .cmp                    = pid_cmp,
+};
+
+static int avg_cmp(struct work_atoms *l, struct work_atoms *r)
+{
+       u64 avgl, avgr;
+
+       if (!l->nb_atoms)
+               return -1;
+
+       if (!r->nb_atoms)
+               return 1;
+
+       avgl = l->total_lat / l->nb_atoms;
+       avgr = r->total_lat / r->nb_atoms;
+
+       if (avgl < avgr)
+               return -1;
+       if (avgl > avgr)
+               return 1;
+
+       return 0;
+}
+
+static struct sort_dimension avg_sort_dimension = {
+       .name                   = "avg",
+       .cmp                    = avg_cmp,
+};
+
+static int max_cmp(struct work_atoms *l, struct work_atoms *r)
+{
+       if (l->max_lat < r->max_lat)
+               return -1;
+       if (l->max_lat > r->max_lat)
+               return 1;
+
+       return 0;
+}
+
+static struct sort_dimension max_sort_dimension = {
+       .name                   = "max",
+       .cmp                    = max_cmp,
+};
+
+static int switch_cmp(struct work_atoms *l, struct work_atoms *r)
+{
+       if (l->nb_atoms < r->nb_atoms)
+               return -1;
+       if (l->nb_atoms > r->nb_atoms)
+               return 1;
+
+       return 0;
+}
+
+static struct sort_dimension switch_sort_dimension = {
+       .name                   = "switch",
+       .cmp                    = switch_cmp,
+};
+
+static int runtime_cmp(struct work_atoms *l, struct work_atoms *r)
+{
+       if (l->total_runtime < r->total_runtime)
+               return -1;
+       if (l->total_runtime > r->total_runtime)
+               return 1;
+
+       return 0;
+}
+
+static struct sort_dimension runtime_sort_dimension = {
+       .name                   = "runtime",
+       .cmp                    = runtime_cmp,
+};
+
+static struct sort_dimension *available_sorts[] = {
+       &pid_sort_dimension,
+       &avg_sort_dimension,
+       &max_sort_dimension,
+       &switch_sort_dimension,
+       &runtime_sort_dimension,
+};
+
+#define NB_AVAILABLE_SORTS     (int)(sizeof(available_sorts) / sizeof(struct sort_dimension *))
+
+static LIST_HEAD(sort_list);
+
+static int sort_dimension__add(char *tok, struct list_head *list)
+{
+       int i;
+
+       for (i = 0; i < NB_AVAILABLE_SORTS; i++) {
+               if (!strcmp(available_sorts[i]->name, tok)) {
+                       list_add_tail(&available_sorts[i]->list, list);
+
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+static void setup_sorting(void);
+
+static void sort_lat(void)
+{
+       struct rb_node *node;
+
+       for (;;) {
+               struct work_atoms *data;
+               node = rb_first(&atom_root);
+               if (!node)
+                       break;
+
+               rb_erase(node, &atom_root);
+               data = rb_entry(node, struct work_atoms, node);
+               __thread_latency_insert(&sorted_atom_root, data, &sort_list);
+       }
+}
+
+static struct trace_sched_handler *trace_handler;
+
+static void
+process_sched_wakeup_event(struct raw_event_sample *raw,
+                          struct event *event,
+                          int cpu __used,
+                          u64 timestamp __used,
+                          struct thread *thread __used)
+{
+       struct trace_wakeup_event wakeup_event;
+
+       FILL_COMMON_FIELDS(wakeup_event, event, raw->data);
+
+       FILL_ARRAY(wakeup_event, comm, event, raw->data);
+       FILL_FIELD(wakeup_event, pid, event, raw->data);
+       FILL_FIELD(wakeup_event, prio, event, raw->data);
+       FILL_FIELD(wakeup_event, success, event, raw->data);
+       FILL_FIELD(wakeup_event, cpu, event, raw->data);
+
+       if (trace_handler->wakeup_event)
+               trace_handler->wakeup_event(&wakeup_event, event, cpu, timestamp, thread);
+}
+
+/*
+ * Track the current task - that way we can know whether there's any
+ * weird events, such as a task being switched away that is not current.
+ */
+static int max_cpu;
+
+static u32 curr_pid[MAX_CPUS] = { [0 ... MAX_CPUS-1] = -1 };
+
+static struct thread *curr_thread[MAX_CPUS];
+
+static char next_shortname1 = 'A';
+static char next_shortname2 = '0';
+
+static void
+map_switch_event(struct trace_switch_event *switch_event,
+                struct event *event __used,
+                int this_cpu,
+                u64 timestamp,
+                struct thread *thread __used)
+{
+       struct thread *sched_out, *sched_in;
+       int new_shortname;
+       u64 timestamp0;
+       s64 delta;
+       int cpu;
+
+       BUG_ON(this_cpu >= MAX_CPUS || this_cpu < 0);
+
+       if (this_cpu > max_cpu)
+               max_cpu = this_cpu;
+
+       timestamp0 = cpu_last_switched[this_cpu];
+       cpu_last_switched[this_cpu] = timestamp;
+       if (timestamp0)
+               delta = timestamp - timestamp0;
+       else
+               delta = 0;
+
+       if (delta < 0)
+               die("hm, delta: %Ld < 0 ?\n", delta);
+
+
+       sched_out = threads__findnew(switch_event->prev_pid, &threads, &last_match);
+       sched_in = threads__findnew(switch_event->next_pid, &threads, &last_match);
+
+       curr_thread[this_cpu] = sched_in;
+
+       printf("  ");
+
+       new_shortname = 0;
+       if (!sched_in->shortname[0]) {
+               sched_in->shortname[0] = next_shortname1;
+               sched_in->shortname[1] = next_shortname2;
+
+               if (next_shortname1 < 'Z') {
+                       next_shortname1++;
+               } else {
+                       next_shortname1='A';
+                       if (next_shortname2 < '9') {
+                               next_shortname2++;
+                       } else {
+                               next_shortname2='0';
+                       }
+               }
+               new_shortname = 1;
+       }
+
+       for (cpu = 0; cpu <= max_cpu; cpu++) {
+               if (cpu != this_cpu)
+                       printf(" ");
+               else
+                       printf("*");
+
+               if (curr_thread[cpu]) {
+                       if (curr_thread[cpu]->pid)
+                               printf("%2s ", curr_thread[cpu]->shortname);
+                       else
+                               printf(".  ");
+               } else
+                       printf("   ");
+       }
+
+       printf("  %12.6f secs ", (double)timestamp/1e9);
+       if (new_shortname) {
+               printf("%s => %s:%d\n",
+                       sched_in->shortname, sched_in->comm, sched_in->pid);
+       } else {
+               printf("\n");
+       }
+}
+
+
+static void
+process_sched_switch_event(struct raw_event_sample *raw,
+                          struct event *event,
+                          int this_cpu,
+                          u64 timestamp __used,
+                          struct thread *thread __used)
+{
+       struct trace_switch_event switch_event;
+
+       FILL_COMMON_FIELDS(switch_event, event, raw->data);
+
+       FILL_ARRAY(switch_event, prev_comm, event, raw->data);
+       FILL_FIELD(switch_event, prev_pid, event, raw->data);
+       FILL_FIELD(switch_event, prev_prio, event, raw->data);
+       FILL_FIELD(switch_event, prev_state, event, raw->data);
+       FILL_ARRAY(switch_event, next_comm, event, raw->data);
+       FILL_FIELD(switch_event, next_pid, event, raw->data);
+       FILL_FIELD(switch_event, next_prio, event, raw->data);
+
+       if (curr_pid[this_cpu] != (u32)-1) {
+               /*
+                * Are we trying to switch away a PID that is
+                * not current?
+                */
+               if (curr_pid[this_cpu] != switch_event.prev_pid)
+                       nr_context_switch_bugs++;
+       }
+       if (trace_handler->switch_event)
+               trace_handler->switch_event(&switch_event, event, this_cpu, timestamp, thread);
+
+       curr_pid[this_cpu] = switch_event.next_pid;
+}
+
+static void
+process_sched_runtime_event(struct raw_event_sample *raw,
+                          struct event *event,
+                          int cpu __used,
+                          u64 timestamp __used,
+                          struct thread *thread __used)
+{
+       struct trace_runtime_event runtime_event;
+
+       FILL_ARRAY(runtime_event, comm, event, raw->data);
+       FILL_FIELD(runtime_event, pid, event, raw->data);
+       FILL_FIELD(runtime_event, runtime, event, raw->data);
+       FILL_FIELD(runtime_event, vruntime, event, raw->data);
+
+       if (trace_handler->runtime_event)
+               trace_handler->runtime_event(&runtime_event, event, cpu, timestamp, thread);
+}
+
+static void
+process_sched_fork_event(struct raw_event_sample *raw,
+                        struct event *event,
+                        int cpu __used,
+                        u64 timestamp __used,
+                        struct thread *thread __used)
+{
+       struct trace_fork_event fork_event;
+
+       FILL_COMMON_FIELDS(fork_event, event, raw->data);
+
+       FILL_ARRAY(fork_event, parent_comm, event, raw->data);
+       FILL_FIELD(fork_event, parent_pid, event, raw->data);
+       FILL_ARRAY(fork_event, child_comm, event, raw->data);
+       FILL_FIELD(fork_event, child_pid, event, raw->data);
+
+       if (trace_handler->fork_event)
+               trace_handler->fork_event(&fork_event, event, cpu, timestamp, thread);
+}
+
+static void
+process_sched_exit_event(struct event *event,
+                        int cpu __used,
+                        u64 timestamp __used,
+                        struct thread *thread __used)
+{
+       if (verbose)
+               printf("sched_exit event %p\n", event);
+}
+
+static void
+process_raw_event(event_t *raw_event __used, void *more_data,
+                 int cpu, u64 timestamp, struct thread *thread)
+{
+       struct raw_event_sample *raw = more_data;
+       struct event *event;
+       int type;
+
+       type = trace_parse_common_type(raw->data);
+       event = trace_find_event(type);
+
+       if (!strcmp(event->name, "sched_switch"))
+               process_sched_switch_event(raw, event, cpu, timestamp, thread);
+       if (!strcmp(event->name, "sched_stat_runtime"))
+               process_sched_runtime_event(raw, event, cpu, timestamp, thread);
+       if (!strcmp(event->name, "sched_wakeup"))
+               process_sched_wakeup_event(raw, event, cpu, timestamp, thread);
+       if (!strcmp(event->name, "sched_wakeup_new"))
+               process_sched_wakeup_event(raw, event, cpu, timestamp, thread);
+       if (!strcmp(event->name, "sched_process_fork"))
+               process_sched_fork_event(raw, event, cpu, timestamp, thread);
+       if (!strcmp(event->name, "sched_process_exit"))
+               process_sched_exit_event(event, cpu, timestamp, thread);
+}
+
+static int
+process_sample_event(event_t *event, unsigned long offset, unsigned long head)
+{
+       char level;
+       int show = 0;
+       struct dso *dso = NULL;
+       struct thread *thread;
+       u64 ip = event->ip.ip;
+       u64 timestamp = -1;
+       u32 cpu = -1;
+       u64 period = 1;
+       void *more_data = event->ip.__more_data;
+       int cpumode;
+
+       thread = threads__findnew(event->ip.pid, &threads, &last_match);
+
+       if (sample_type & PERF_SAMPLE_TIME) {
+               timestamp = *(u64 *)more_data;
+               more_data += sizeof(u64);
+       }
+
+       if (sample_type & PERF_SAMPLE_CPU) {
+               cpu = *(u32 *)more_data;
+               more_data += sizeof(u32);
+               more_data += sizeof(u32); /* reserved */
+       }
+
+       if (sample_type & PERF_SAMPLE_PERIOD) {
+               period = *(u64 *)more_data;
+               more_data += sizeof(u64);
+       }
+
+       dump_printf("%p [%p]: PERF_RECORD_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
+               (void *)(offset + head),
+               (void *)(long)(event->header.size),
+               event->header.misc,
+               event->ip.pid, event->ip.tid,
+               (void *)(long)ip,
+               (long long)period);
+
+       dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);
+
+       if (thread == NULL) {
+               eprintf("problem processing %d event, skipping it.\n",
+                       event->header.type);
+               return -1;
+       }
+
+       cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+
+       if (cpumode == PERF_RECORD_MISC_KERNEL) {
+               show = SHOW_KERNEL;
+               level = 'k';
+
+               dso = kernel_dso;
+
+               dump_printf(" ...... dso: %s\n", dso->name);
+
+       } else if (cpumode == PERF_RECORD_MISC_USER) {
+
+               show = SHOW_USER;
+               level = '.';
+
+       } else {
+               show = SHOW_HV;
+               level = 'H';
+
+               dso = hypervisor_dso;
+
+               dump_printf(" ...... dso: [hypervisor]\n");
+       }
+
+       if (sample_type & PERF_SAMPLE_RAW)
+               process_raw_event(event, more_data, cpu, timestamp, thread);
+
+       return 0;
+}
+
+static int
+process_event(event_t *event, unsigned long offset, unsigned long head)
+{
+       trace_event(event);
+
+       nr_events++;
+       switch (event->header.type) {
+       case PERF_RECORD_MMAP:
+               return 0;
+       case PERF_RECORD_LOST:
+               nr_lost_chunks++;
+               nr_lost_events += event->lost.lost;
+               return 0;
+
+       case PERF_RECORD_COMM:
+               return process_comm_event(event, offset, head);
+
+       case PERF_RECORD_EXIT ... PERF_RECORD_READ:
+               return 0;
+
+       case PERF_RECORD_SAMPLE:
+               return process_sample_event(event, offset, head);
+
+       case PERF_RECORD_MAX:
+       default:
+               return -1;
+       }
+
+       return 0;
+}
+
+static int read_events(void)
+{
+       int ret, rc = EXIT_FAILURE;
+       unsigned long offset = 0;
+       unsigned long head = 0;
+       struct stat perf_stat;
+       event_t *event;
+       uint32_t size;
+       char *buf;
+
+       trace_report();
+       register_idle_thread(&threads, &last_match);
+
+       input = open(input_name, O_RDONLY);
+       if (input < 0) {
+               perror("failed to open file");
+               exit(-1);
+       }
+
+       ret = fstat(input, &perf_stat);
+       if (ret < 0) {
+               perror("failed to stat file");
+               exit(-1);
+       }
+
+       if (!perf_stat.st_size) {
+               fprintf(stderr, "zero-sized file, nothing to do!\n");
+               exit(0);
+       }
+       header = perf_header__read(input);
+       head = header->data_offset;
+       sample_type = perf_header__sample_type(header);
+
+       if (!(sample_type & PERF_SAMPLE_RAW))
+               die("No trace sample to read. Did you call perf record "
+                   "without -R?");
+
+       if (load_kernel() < 0) {
+               perror("failed to load kernel symbols");
+               return EXIT_FAILURE;
+       }
+
+remap:
+       buf = (char *)mmap(NULL, page_size * mmap_window, PROT_READ,
+                          MAP_SHARED, input, offset);
+       if (buf == MAP_FAILED) {
+               perror("failed to mmap file");
+               exit(-1);
+       }
+
+more:
+       event = (event_t *)(buf + head);
+
+       size = event->header.size;
+       if (!size)
+               size = 8;
+
+       if (head + event->header.size >= page_size * mmap_window) {
+               unsigned long shift = page_size * (head / page_size);
+               int res;
+
+               res = munmap(buf, page_size * mmap_window);
+               assert(res == 0);
+
+               offset += shift;
+               head -= shift;
+               goto remap;
+       }
+
+       size = event->header.size;
+
+
+       if (!size || process_event(event, offset, head) < 0) {
+
+               /*
+                * assume we lost track of the stream, check alignment, and
+                * increment a single u64 in the hope to catch on again 'soon'.
+                */
+
+               if (unlikely(head & 7))
+                       head &= ~7ULL;
+
+               size = 8;
+       }
+
+       head += size;
+
+       if (offset + head < (unsigned long)perf_stat.st_size)
+               goto more;
+
+       rc = EXIT_SUCCESS;
+       close(input);
+
+       return rc;
+}
+
+static void print_bad_events(void)
+{
+       if (nr_unordered_timestamps && nr_timestamps) {
+               printf("  INFO: %.3f%% unordered timestamps (%ld out of %ld)\n",
+                       (double)nr_unordered_timestamps/(double)nr_timestamps*100.0,
+                       nr_unordered_timestamps, nr_timestamps);
+       }
+       if (nr_lost_events && nr_events) {
+               printf("  INFO: %.3f%% lost events (%ld out of %ld, in %ld chunks)\n",
+                       (double)nr_lost_events/(double)nr_events*100.0,
+                       nr_lost_events, nr_events, nr_lost_chunks);
+       }
+       if (nr_state_machine_bugs && nr_timestamps) {
+               printf("  INFO: %.3f%% state machine bugs (%ld out of %ld)",
+                       (double)nr_state_machine_bugs/(double)nr_timestamps*100.0,
+                       nr_state_machine_bugs, nr_timestamps);
+               if (nr_lost_events)
+                       printf(" (due to lost events?)");
+               printf("\n");
+       }
+       if (nr_context_switch_bugs && nr_timestamps) {
+               printf("  INFO: %.3f%% context switch bugs (%ld out of %ld)",
+                       (double)nr_context_switch_bugs/(double)nr_timestamps*100.0,
+                       nr_context_switch_bugs, nr_timestamps);
+               if (nr_lost_events)
+                       printf(" (due to lost events?)");
+               printf("\n");
+       }
+}
+
+static void __cmd_lat(void)
+{
+       struct rb_node *next;
+
+       setup_pager();
+       read_events();
+       sort_lat();
+
+       printf("\n -----------------------------------------------------------------------------------------\n");
+       printf("  Task                  |   Runtime ms  | Switches | Average delay ms | Maximum delay ms |\n");
+       printf(" -----------------------------------------------------------------------------------------\n");
+
+       next = rb_first(&sorted_atom_root);
+
+       while (next) {
+               struct work_atoms *work_list;
+
+               work_list = rb_entry(next, struct work_atoms, node);
+               output_lat_thread(work_list);
+               next = rb_next(next);
+       }
+
+       printf(" -----------------------------------------------------------------------------------------\n");
+       printf("  TOTAL:                |%11.3f ms |%9Ld |\n",
+               (double)all_runtime/1e6, all_count);
+
+       printf(" ---------------------------------------------------\n");
+
+       print_bad_events();
+       printf("\n");
+
+}
+
+static struct trace_sched_handler map_ops  = {
+       .wakeup_event           = NULL,
+       .switch_event           = map_switch_event,
+       .runtime_event          = NULL,
+       .fork_event             = NULL,
+};
+
+static void __cmd_map(void)
+{
+       max_cpu = sysconf(_SC_NPROCESSORS_CONF);
+
+       setup_pager();
+       read_events();
+       print_bad_events();
+}
+
+static void __cmd_replay(void)
+{
+       unsigned long i;
+
+       calibrate_run_measurement_overhead();
+       calibrate_sleep_measurement_overhead();
+
+       test_calibrations();
+
+       read_events();
+
+       printf("nr_run_events:        %ld\n", nr_run_events);
+       printf("nr_sleep_events:      %ld\n", nr_sleep_events);
+       printf("nr_wakeup_events:     %ld\n", nr_wakeup_events);
+
+       if (targetless_wakeups)
+               printf("target-less wakeups:  %ld\n", targetless_wakeups);
+       if (multitarget_wakeups)
+               printf("multi-target wakeups: %ld\n", multitarget_wakeups);
+       if (nr_run_events_optimized)
+               printf("run atoms optimized: %ld\n",
+                       nr_run_events_optimized);
+
+       print_task_traces();
+       add_cross_task_wakeups();
+
+       create_tasks();
+       printf("------------------------------------------------------------\n");
+       for (i = 0; i < replay_repeat; i++)
+               run_one_test();
+}
+
+
+static const char * const sched_usage[] = {
+       "perf sched [<options>] {record|latency|map|replay|trace}",
+       NULL
+};
+
+static const struct option sched_options[] = {
+       OPT_STRING('i', "input", &input_name, "file",
+                   "input file name"),
+       OPT_BOOLEAN('v', "verbose", &verbose,
+                   "be more verbose (show symbol address, etc)"),
+       OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
+                   "dump raw trace in ASCII"),
+       OPT_END()
+};
+
+static const char * const latency_usage[] = {
+       "perf sched latency [<options>]",
+       NULL
+};
+
+static const struct option latency_options[] = {
+       OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
+                  "sort by key(s): runtime, switch, avg, max"),
+       OPT_BOOLEAN('v', "verbose", &verbose,
+                   "be more verbose (show symbol address, etc)"),
+       OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
+                   "dump raw trace in ASCII"),
+       OPT_END()
+};
+
+static const char * const replay_usage[] = {
+       "perf sched replay [<options>]",
+       NULL
+};
+
+static const struct option replay_options[] = {
+       OPT_INTEGER('r', "repeat", &replay_repeat,
+                   "repeat the workload replay N times (-1: infinite)"),
+       OPT_BOOLEAN('v', "verbose", &verbose,
+                   "be more verbose (show symbol address, etc)"),
+       OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
+                   "dump raw trace in ASCII"),
+       OPT_END()
+};
+
+static void setup_sorting(void)
+{
+       char *tmp, *tok, *str = strdup(sort_order);
+
+       for (tok = strtok_r(str, ", ", &tmp);
+                       tok; tok = strtok_r(NULL, ", ", &tmp)) {
+               if (sort_dimension__add(tok, &sort_list) < 0) {
+                       error("Unknown --sort key: `%s'", tok);
+                       usage_with_options(latency_usage, latency_options);
+               }
+       }
+
+       free(str);
+
+       sort_dimension__add((char *)"pid", &cmp_pid);
+}
+
+static const char *record_args[] = {
+       "record",
+       "-a",
+       "-R",
+       "-M",
+       "-f",
+       "-m", "1024",
+       "-c", "1",
+       "-e", "sched:sched_switch:r",
+       "-e", "sched:sched_stat_wait:r",
+       "-e", "sched:sched_stat_sleep:r",
+       "-e", "sched:sched_stat_iowait:r",
+       "-e", "sched:sched_stat_runtime:r",
+       "-e", "sched:sched_process_exit:r",
+       "-e", "sched:sched_process_fork:r",
+       "-e", "sched:sched_wakeup:r",
+       "-e", "sched:sched_migrate_task:r",
+};
+
+static int __cmd_record(int argc, const char **argv)
+{
+       unsigned int rec_argc, i, j;
+       const char **rec_argv;
+
+       rec_argc = ARRAY_SIZE(record_args) + argc - 1;
+       rec_argv = calloc(rec_argc + 1, sizeof(char *));
+
+       for (i = 0; i < ARRAY_SIZE(record_args); i++)
+               rec_argv[i] = strdup(record_args[i]);
+
+       for (j = 1; j < (unsigned int)argc; j++, i++)
+               rec_argv[i] = argv[j];
+
+       BUG_ON(i != rec_argc);
+
+       return cmd_record(i, rec_argv, NULL);
+}
+
+int cmd_sched(int argc, const char **argv, const char *prefix __used)
+{
+       symbol__init();
+       page_size = getpagesize();
+
+       argc = parse_options(argc, argv, sched_options, sched_usage,
+                            PARSE_OPT_STOP_AT_NON_OPTION);
+       if (!argc)
+               usage_with_options(sched_usage, sched_options);
+
+       if (!strncmp(argv[0], "rec", 3)) {
+               return __cmd_record(argc, argv);
+       } else if (!strncmp(argv[0], "lat", 3)) {
+               trace_handler = &lat_ops;
+               if (argc > 1) {
+                       argc = parse_options(argc, argv, latency_options, latency_usage, 0);
+                       if (argc)
+                               usage_with_options(latency_usage, latency_options);
+               }
+               setup_sorting();
+               __cmd_lat();
+       } else if (!strcmp(argv[0], "map")) {
+               trace_handler = &map_ops;
+               setup_sorting();
+               __cmd_map();
+       } else if (!strncmp(argv[0], "rep", 3)) {
+               trace_handler = &replay_ops;
+               if (argc) {
+                       argc = parse_options(argc, argv, replay_options, replay_usage, 0);
+                       if (argc)
+                               usage_with_options(replay_usage, replay_options);
+               }
+               __cmd_replay();
+       } else if (!strcmp(argv[0], "trace")) {
+               /*
+                * Aliased to 'perf trace' for now:
+                */
+               return cmd_trace(argc, argv, prefix);
+       } else {
+               usage_with_options(sched_usage, sched_options);
+       }
+
+       return 0;
+}
index 61b8282..16af2d8 100644 (file)
@@ -48,7 +48,7 @@
 #include <sys/prctl.h>
 #include <math.h>
 
-static struct perf_counter_attr default_attrs[] = {
+static struct perf_event_attr default_attrs[] = {
 
   { .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK     },
   { .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CONTEXT_SWITCHES},
@@ -130,11 +130,11 @@ struct stats                      runtime_cycles_stats;
         attrs[counter].config == PERF_COUNT_##c)
 
 #define ERR_PERF_OPEN \
-"Error: counter %d, sys_perf_counter_open() syscall returned with %d (%s)\n"
+"Error: counter %d, sys_perf_event_open() syscall returned with %d (%s)\n"
 
 static void create_perf_stat_counter(int counter, int pid)
 {
-       struct perf_counter_attr *attr = attrs + counter;
+       struct perf_event_attr *attr = attrs + counter;
 
        if (scale)
                attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
@@ -144,7 +144,7 @@ static void create_perf_stat_counter(int counter, int pid)
                unsigned int cpu;
 
                for (cpu = 0; cpu < nr_cpus; cpu++) {
-                       fd[cpu][counter] = sys_perf_counter_open(attr, -1, cpu, -1, 0);
+                       fd[cpu][counter] = sys_perf_event_open(attr, -1, cpu, -1, 0);
                        if (fd[cpu][counter] < 0 && verbose)
                                fprintf(stderr, ERR_PERF_OPEN, counter,
                                        fd[cpu][counter], strerror(errno));
@@ -154,7 +154,7 @@ static void create_perf_stat_counter(int counter, int pid)
                attr->disabled       = 1;
                attr->enable_on_exec = 1;
 
-               fd[0][counter] = sys_perf_counter_open(attr, pid, -1, -1, 0);
+               fd[0][counter] = sys_perf_event_open(attr, pid, -1, -1, 0);
                if (fd[0][counter] < 0 && verbose)
                        fprintf(stderr, ERR_PERF_OPEN, counter,
                                fd[0][counter], strerror(errno));
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
new file mode 100644 (file)
index 0000000..4405681
--- /dev/null
@@ -0,0 +1,1158 @@
+/*
+ * builtin-timechart.c - make an svg timechart of system activity
+ *
+ * (C) Copyright 2009 Intel Corporation
+ *
+ * Authors:
+ *     Arjan van de Ven <arjan@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+
+#include "builtin.h"
+
+#include "util/util.h"
+
+#include "util/color.h"
+#include <linux/list.h>
+#include "util/cache.h"
+#include <linux/rbtree.h>
+#include "util/symbol.h"
+#include "util/string.h"
+#include "util/callchain.h"
+#include "util/strlist.h"
+
+#include "perf.h"
+#include "util/header.h"
+#include "util/parse-options.h"
+#include "util/parse-events.h"
+#include "util/svghelper.h"
+
+static char            const *input_name = "perf.data";
+static char            const *output_name = "output.svg";
+
+
+static unsigned long   page_size;
+static unsigned long   mmap_window = 32;
+static u64             sample_type;
+
+static unsigned int    numcpus;
+static u64             min_freq;       /* Lowest CPU frequency seen */
+static u64             max_freq;       /* Highest CPU frequency seen */
+static u64             turbo_frequency;
+
+static u64             first_time, last_time;
+
+
+static struct perf_header      *header;
+
+struct per_pid;
+struct per_pidcomm;
+
+struct cpu_sample;
+struct power_event;
+struct wake_event;
+
+struct sample_wrapper;
+
+/*
+ * Datastructure layout:
+ * We keep an list of "pid"s, matching the kernels notion of a task struct.
+ * Each "pid" entry, has a list of "comm"s.
+ *     this is because we want to track different programs different, while
+ *     exec will reuse the original pid (by design).
+ * Each comm has a list of samples that will be used to draw
+ * final graph.
+ */
+
+struct per_pid {
+       struct per_pid *next;
+
+       int             pid;
+       int             ppid;
+
+       u64             start_time;
+       u64             end_time;
+       u64             total_time;
+       int             display;
+
+       struct per_pidcomm *all;
+       struct per_pidcomm *current;
+
+       int painted;
+};
+
+
+struct per_pidcomm {
+       struct per_pidcomm *next;
+
+       u64             start_time;
+       u64             end_time;
+       u64             total_time;
+
+       int             Y;
+       int             display;
+
+       long            state;
+       u64             state_since;
+
+       char            *comm;
+
+       struct cpu_sample *samples;
+};
+
+struct sample_wrapper {
+       struct sample_wrapper *next;
+
+       u64             timestamp;
+       unsigned char   data[0];
+};
+
+#define TYPE_NONE      0
+#define TYPE_RUNNING   1
+#define TYPE_WAITING   2
+#define TYPE_BLOCKED   3
+
+struct cpu_sample {
+       struct cpu_sample *next;
+
+       u64 start_time;
+       u64 end_time;
+       int type;
+       int cpu;
+};
+
+static struct per_pid *all_data;
+
+#define CSTATE 1
+#define PSTATE 2
+
+struct power_event {
+       struct power_event *next;
+       int type;
+       int state;
+       u64 start_time;
+       u64 end_time;
+       int cpu;
+};
+
+struct wake_event {
+       struct wake_event *next;
+       int waker;
+       int wakee;
+       u64 time;
+};
+
+static struct power_event    *power_events;
+static struct wake_event     *wake_events;
+
+struct sample_wrapper *all_samples;
+
+static struct per_pid *find_create_pid(int pid)
+{
+       struct per_pid *cursor = all_data;
+
+       while (cursor) {
+               if (cursor->pid == pid)
+                       return cursor;
+               cursor = cursor->next;
+       }
+       cursor = malloc(sizeof(struct per_pid));
+       assert(cursor != NULL);
+       memset(cursor, 0, sizeof(struct per_pid));
+       cursor->pid = pid;
+       cursor->next = all_data;
+       all_data = cursor;
+       return cursor;
+}
+
+static void pid_set_comm(int pid, char *comm)
+{
+       struct per_pid *p;
+       struct per_pidcomm *c;
+       p = find_create_pid(pid);
+       c = p->all;
+       while (c) {
+               if (c->comm && strcmp(c->comm, comm) == 0) {
+                       p->current = c;
+                       return;
+               }
+               if (!c->comm) {
+                       c->comm = strdup(comm);
+                       p->current = c;
+                       return;
+               }
+               c = c->next;
+       }
+       c = malloc(sizeof(struct per_pidcomm));
+       assert(c != NULL);
+       memset(c, 0, sizeof(struct per_pidcomm));
+       c->comm = strdup(comm);
+       p->current = c;
+       c->next = p->all;
+       p->all = c;
+}
+
+static void pid_fork(int pid, int ppid, u64 timestamp)
+{
+       struct per_pid *p, *pp;
+       p = find_create_pid(pid);
+       pp = find_create_pid(ppid);
+       p->ppid = ppid;
+       if (pp->current && pp->current->comm && !p->current)
+               pid_set_comm(pid, pp->current->comm);
+
+       p->start_time = timestamp;
+       if (p->current) {
+               p->current->start_time = timestamp;
+               p->current->state_since = timestamp;
+       }
+}
+
+static void pid_exit(int pid, u64 timestamp)
+{
+       struct per_pid *p;
+       p = find_create_pid(pid);
+       p->end_time = timestamp;
+       if (p->current)
+               p->current->end_time = timestamp;
+}
+
+static void
+pid_put_sample(int pid, int type, unsigned int cpu, u64 start, u64 end)
+{
+       struct per_pid *p;
+       struct per_pidcomm *c;
+       struct cpu_sample *sample;
+
+       p = find_create_pid(pid);
+       c = p->current;
+       if (!c) {
+               c = malloc(sizeof(struct per_pidcomm));
+               assert(c != NULL);
+               memset(c, 0, sizeof(struct per_pidcomm));
+               p->current = c;
+               c->next = p->all;
+               p->all = c;
+       }
+
+       sample = malloc(sizeof(struct cpu_sample));
+       assert(sample != NULL);
+       memset(sample, 0, sizeof(struct cpu_sample));
+       sample->start_time = start;
+       sample->end_time = end;
+       sample->type = type;
+       sample->next = c->samples;
+       sample->cpu = cpu;
+       c->samples = sample;
+
+       if (sample->type == TYPE_RUNNING && end > start && start > 0) {
+               c->total_time += (end-start);
+               p->total_time += (end-start);
+       }
+
+       if (c->start_time == 0 || c->start_time > start)
+               c->start_time = start;
+       if (p->start_time == 0 || p->start_time > start)
+               p->start_time = start;
+
+       if (cpu > numcpus)
+               numcpus = cpu;
+}
+
+#define MAX_CPUS 4096
+
+static u64 cpus_cstate_start_times[MAX_CPUS];
+static int cpus_cstate_state[MAX_CPUS];
+static u64 cpus_pstate_start_times[MAX_CPUS];
+static u64 cpus_pstate_state[MAX_CPUS];
+
+static int
+process_comm_event(event_t *event)
+{
+       pid_set_comm(event->comm.pid, event->comm.comm);
+       return 0;
+}
+static int
+process_fork_event(event_t *event)
+{
+       pid_fork(event->fork.pid, event->fork.ppid, event->fork.time);
+       return 0;
+}
+
+static int
+process_exit_event(event_t *event)
+{
+       pid_exit(event->fork.pid, event->fork.time);
+       return 0;
+}
+
+struct trace_entry {
+       u32                     size;
+       unsigned short          type;
+       unsigned char           flags;
+       unsigned char           preempt_count;
+       int                     pid;
+       int                     tgid;
+};
+
+struct power_entry {
+       struct trace_entry te;
+       s64     type;
+       s64     value;
+};
+
+#define TASK_COMM_LEN 16
+struct wakeup_entry {
+       struct trace_entry te;
+       char comm[TASK_COMM_LEN];
+       int   pid;
+       int   prio;
+       int   success;
+};
+
+/*
+ * trace_flag_type is an enumeration that holds different
+ * states when a trace occurs. These are:
+ *  IRQS_OFF            - interrupts were disabled
+ *  IRQS_NOSUPPORT      - arch does not support irqs_disabled_flags
+ *  NEED_RESCED         - reschedule is requested
+ *  HARDIRQ             - inside an interrupt handler
+ *  SOFTIRQ             - inside a softirq handler
+ */
+enum trace_flag_type {
+       TRACE_FLAG_IRQS_OFF             = 0x01,
+       TRACE_FLAG_IRQS_NOSUPPORT       = 0x02,
+       TRACE_FLAG_NEED_RESCHED         = 0x04,
+       TRACE_FLAG_HARDIRQ              = 0x08,
+       TRACE_FLAG_SOFTIRQ              = 0x10,
+};
+
+
+
+struct sched_switch {
+       struct trace_entry te;
+       char prev_comm[TASK_COMM_LEN];
+       int  prev_pid;
+       int  prev_prio;
+       long prev_state; /* Arjan weeps. */
+       char next_comm[TASK_COMM_LEN];
+       int  next_pid;
+       int  next_prio;
+};
+
+static void c_state_start(int cpu, u64 timestamp, int state)
+{
+       cpus_cstate_start_times[cpu] = timestamp;
+       cpus_cstate_state[cpu] = state;
+}
+
+static void c_state_end(int cpu, u64 timestamp)
+{
+       struct power_event *pwr;
+       pwr = malloc(sizeof(struct power_event));
+       if (!pwr)
+               return;
+       memset(pwr, 0, sizeof(struct power_event));
+
+       pwr->state = cpus_cstate_state[cpu];
+       pwr->start_time = cpus_cstate_start_times[cpu];
+       pwr->end_time = timestamp;
+       pwr->cpu = cpu;
+       pwr->type = CSTATE;
+       pwr->next = power_events;
+
+       power_events = pwr;
+}
+
+static void p_state_change(int cpu, u64 timestamp, u64 new_freq)
+{
+       struct power_event *pwr;
+       pwr = malloc(sizeof(struct power_event));
+
+       if (new_freq > 8000000) /* detect invalid data */
+               return;
+
+       if (!pwr)
+               return;
+       memset(pwr, 0, sizeof(struct power_event));
+
+       pwr->state = cpus_pstate_state[cpu];
+       pwr->start_time = cpus_pstate_start_times[cpu];
+       pwr->end_time = timestamp;
+       pwr->cpu = cpu;
+       pwr->type = PSTATE;
+       pwr->next = power_events;
+
+       if (!pwr->start_time)
+               pwr->start_time = first_time;
+
+       power_events = pwr;
+
+       cpus_pstate_state[cpu] = new_freq;
+       cpus_pstate_start_times[cpu] = timestamp;
+
+       if ((u64)new_freq > max_freq)
+               max_freq = new_freq;
+
+       if (new_freq < min_freq || min_freq == 0)
+               min_freq = new_freq;
+
+       if (new_freq == max_freq - 1000)
+                       turbo_frequency = max_freq;
+}
+
+static void
+sched_wakeup(int cpu, u64 timestamp, int pid, struct trace_entry *te)
+{
+       struct wake_event *we;
+       struct per_pid *p;
+       struct wakeup_entry *wake = (void *)te;
+
+       we = malloc(sizeof(struct wake_event));
+       if (!we)
+               return;
+
+       memset(we, 0, sizeof(struct wake_event));
+       we->time = timestamp;
+       we->waker = pid;
+
+       if ((te->flags & TRACE_FLAG_HARDIRQ) || (te->flags & TRACE_FLAG_SOFTIRQ))
+               we->waker = -1;
+
+       we->wakee = wake->pid;
+       we->next = wake_events;
+       wake_events = we;
+       p = find_create_pid(we->wakee);
+
+       if (p && p->current && p->current->state == TYPE_NONE) {
+               p->current->state_since = timestamp;
+               p->current->state = TYPE_WAITING;
+       }
+       if (p && p->current && p->current->state == TYPE_BLOCKED) {
+               pid_put_sample(p->pid, p->current->state, cpu, p->current->state_since, timestamp);
+               p->current->state_since = timestamp;
+               p->current->state = TYPE_WAITING;
+       }
+}
+
+static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)
+{
+       struct per_pid *p = NULL, *prev_p;
+       struct sched_switch *sw = (void *)te;
+
+
+       prev_p = find_create_pid(sw->prev_pid);
+
+       p = find_create_pid(sw->next_pid);
+
+       if (prev_p->current && prev_p->current->state != TYPE_NONE)
+               pid_put_sample(sw->prev_pid, TYPE_RUNNING, cpu, prev_p->current->state_since, timestamp);
+       if (p && p->current) {
+               if (p->current->state != TYPE_NONE)
+                       pid_put_sample(sw->next_pid, p->current->state, cpu, p->current->state_since, timestamp);
+
+                       p->current->state_since = timestamp;
+                       p->current->state = TYPE_RUNNING;
+       }
+
+       if (prev_p->current) {
+               prev_p->current->state = TYPE_NONE;
+               prev_p->current->state_since = timestamp;
+               if (sw->prev_state & 2)
+                       prev_p->current->state = TYPE_BLOCKED;
+               if (sw->prev_state == 0)
+                       prev_p->current->state = TYPE_WAITING;
+       }
+}
+
+
+static int
+process_sample_event(event_t *event)
+{
+       int cursor = 0;
+       u64 addr = 0;
+       u64 stamp = 0;
+       u32 cpu = 0;
+       u32 pid = 0;
+       struct trace_entry *te;
+
+       if (sample_type & PERF_SAMPLE_IP)
+               cursor++;
+
+       if (sample_type & PERF_SAMPLE_TID) {
+               pid = event->sample.array[cursor]>>32;
+               cursor++;
+       }
+       if (sample_type & PERF_SAMPLE_TIME) {
+               stamp = event->sample.array[cursor++];
+
+               if (!first_time || first_time > stamp)
+                       first_time = stamp;
+               if (last_time < stamp)
+                       last_time = stamp;
+
+       }
+       if (sample_type & PERF_SAMPLE_ADDR)
+               addr = event->sample.array[cursor++];
+       if (sample_type & PERF_SAMPLE_ID)
+               cursor++;
+       if (sample_type & PERF_SAMPLE_STREAM_ID)
+               cursor++;
+       if (sample_type & PERF_SAMPLE_CPU)
+               cpu = event->sample.array[cursor++] & 0xFFFFFFFF;
+       if (sample_type & PERF_SAMPLE_PERIOD)
+               cursor++;
+
+       te = (void *)&event->sample.array[cursor];
+
+       if (sample_type & PERF_SAMPLE_RAW && te->size > 0) {
+               char *event_str;
+               struct power_entry *pe;
+
+               pe = (void *)te;
+
+               event_str = perf_header__find_event(te->type);
+
+               if (!event_str)
+                       return 0;
+
+               if (strcmp(event_str, "power:power_start") == 0)
+                       c_state_start(cpu, stamp, pe->value);
+
+               if (strcmp(event_str, "power:power_end") == 0)
+                       c_state_end(cpu, stamp);
+
+               if (strcmp(event_str, "power:power_frequency") == 0)
+                       p_state_change(cpu, stamp, pe->value);
+
+               if (strcmp(event_str, "sched:sched_wakeup") == 0)
+                       sched_wakeup(cpu, stamp, pid, te);
+
+               if (strcmp(event_str, "sched:sched_switch") == 0)
+                       sched_switch(cpu, stamp, te);
+       }
+       return 0;
+}
+
+/*
+ * After the last sample we need to wrap up the current C/P state
+ * and close out each CPU for these.
+ */
+static void end_sample_processing(void)
+{
+       u64 cpu;
+       struct power_event *pwr;
+
+       for (cpu = 0; cpu < numcpus; cpu++) {
+               pwr = malloc(sizeof(struct power_event));
+               if (!pwr)
+                       return;
+               memset(pwr, 0, sizeof(struct power_event));
+
+               /* C state */
+#if 0
+               pwr->state = cpus_cstate_state[cpu];
+               pwr->start_time = cpus_cstate_start_times[cpu];
+               pwr->end_time = last_time;
+               pwr->cpu = cpu;
+               pwr->type = CSTATE;
+               pwr->next = power_events;
+
+               power_events = pwr;
+#endif
+               /* P state */
+
+               pwr = malloc(sizeof(struct power_event));
+               if (!pwr)
+                       return;
+               memset(pwr, 0, sizeof(struct power_event));
+
+               pwr->state = cpus_pstate_state[cpu];
+               pwr->start_time = cpus_pstate_start_times[cpu];
+               pwr->end_time = last_time;
+               pwr->cpu = cpu;
+               pwr->type = PSTATE;
+               pwr->next = power_events;
+
+               if (!pwr->start_time)
+                       pwr->start_time = first_time;
+               if (!pwr->state)
+                       pwr->state = min_freq;
+               power_events = pwr;
+       }
+}
+
+static u64 sample_time(event_t *event)
+{
+       int cursor;
+
+       cursor = 0;
+       if (sample_type & PERF_SAMPLE_IP)
+               cursor++;
+       if (sample_type & PERF_SAMPLE_TID)
+               cursor++;
+       if (sample_type & PERF_SAMPLE_TIME)
+               return event->sample.array[cursor];
+       return 0;
+}
+
+
+/*
+ * We first queue all events, sorted backwards by insertion.
+ * The order will get flipped later.
+ */
+static int
+queue_sample_event(event_t *event)
+{
+       struct sample_wrapper *copy, *prev;
+       int size;
+
+       size = event->sample.header.size + sizeof(struct sample_wrapper) + 8;
+
+       copy = malloc(size);
+       if (!copy)
+               return 1;
+
+       memset(copy, 0, size);
+
+       copy->next = NULL;
+       copy->timestamp = sample_time(event);
+
+       memcpy(&copy->data, event, event->sample.header.size);
+
+       /* insert in the right place in the list */
+
+       if (!all_samples) {
+               /* first sample ever */
+               all_samples = copy;
+               return 0;
+       }
+
+       if (all_samples->timestamp < copy->timestamp) {
+               /* insert at the head of the list */
+               copy->next = all_samples;
+               all_samples = copy;
+               return 0;
+       }
+
+       prev = all_samples;
+       while (prev->next) {
+               if (prev->next->timestamp < copy->timestamp) {
+                       copy->next = prev->next;
+                       prev->next = copy;
+                       return 0;
+               }
+               prev = prev->next;
+       }
+       /* insert at the end of the list */
+       prev->next = copy;
+
+       return 0;
+}
+
+static void sort_queued_samples(void)
+{
+       struct sample_wrapper *cursor, *next;
+
+       cursor = all_samples;
+       all_samples = NULL;
+
+       while (cursor) {
+               next = cursor->next;
+               cursor->next = all_samples;
+               all_samples = cursor;
+               cursor = next;
+       }
+}
+
+/*
+ * Sort the pid datastructure
+ */
+static void sort_pids(void)
+{
+       struct per_pid *new_list, *p, *cursor, *prev;
+       /* sort by ppid first, then by pid, lowest to highest */
+
+       new_list = NULL;
+
+       while (all_data) {
+               p = all_data;
+               all_data = p->next;
+               p->next = NULL;
+
+               if (new_list == NULL) {
+                       new_list = p;
+                       p->next = NULL;
+                       continue;
+               }
+               prev = NULL;
+               cursor = new_list;
+               while (cursor) {
+                       if (cursor->ppid > p->ppid ||
+                               (cursor->ppid == p->ppid && cursor->pid > p->pid)) {
+                               /* must insert before */
+                               if (prev) {
+                                       p->next = prev->next;
+                                       prev->next = p;
+                                       cursor = NULL;
+                                       continue;
+                               } else {
+                                       p->next = new_list;
+                                       new_list = p;
+                                       cursor = NULL;
+                                       continue;
+                               }
+                       }
+
+                       prev = cursor;
+                       cursor = cursor->next;
+                       if (!cursor)
+                               prev->next = p;
+               }
+       }
+       all_data = new_list;
+}
+
+
+static void draw_c_p_states(void)
+{
+       struct power_event *pwr;
+       pwr = power_events;
+
+       /*
+        * two pass drawing so that the P state bars are on top of the C state blocks
+        */
+       while (pwr) {
+               if (pwr->type == CSTATE)
+                       svg_cstate(pwr->cpu, pwr->start_time, pwr->end_time, pwr->state);
+               pwr = pwr->next;
+       }
+
+       pwr = power_events;
+       while (pwr) {
+               if (pwr->type == PSTATE) {
+                       if (!pwr->state)
+                               pwr->state = min_freq;
+                       svg_pstate(pwr->cpu, pwr->start_time, pwr->end_time, pwr->state);
+               }
+               pwr = pwr->next;
+       }
+}
+
+static void draw_wakeups(void)
+{
+       struct wake_event *we;
+       struct per_pid *p;
+       struct per_pidcomm *c;
+
+       we = wake_events;
+       while (we) {
+               int from = 0, to = 0;
+               char *task_from = NULL, *task_to = NULL;
+
+               /* locate the column of the waker and wakee */
+               p = all_data;
+               while (p) {
+                       if (p->pid == we->waker || p->pid == we->wakee) {
+                               c = p->all;
+                               while (c) {
+                                       if (c->Y && c->start_time <= we->time && c->end_time >= we->time) {
+                                               if (p->pid == we->waker) {
+                                                       from = c->Y;
+                                                       task_from = c->comm;
+                                               }
+                                               if (p->pid == we->wakee) {
+                                                       to = c->Y;
+                                                       task_to = c->comm;
+                                               }
+                                       }
+                                       c = c->next;
+                               }
+                       }
+                       p = p->next;
+               }
+
+               if (we->waker == -1)
+                       svg_interrupt(we->time, to);
+               else if (from && to && abs(from - to) == 1)
+                       svg_wakeline(we->time, from, to);
+               else
+                       svg_partial_wakeline(we->time, from, task_from, to, task_to);
+               we = we->next;
+       }
+}
+
+static void draw_cpu_usage(void)
+{
+       struct per_pid *p;
+       struct per_pidcomm *c;
+       struct cpu_sample *sample;
+       p = all_data;
+       while (p) {
+               c = p->all;
+               while (c) {
+                       sample = c->samples;
+                       while (sample) {
+                               if (sample->type == TYPE_RUNNING)
+                                       svg_process(sample->cpu, sample->start_time, sample->end_time, "sample", c->comm);
+
+                               sample = sample->next;
+                       }
+                       c = c->next;
+               }
+               p = p->next;
+       }
+}
+
+static void draw_process_bars(void)
+{
+       struct per_pid *p;
+       struct per_pidcomm *c;
+       struct cpu_sample *sample;
+       int Y = 0;
+
+       Y = 2 * numcpus + 2;
+
+       p = all_data;
+       while (p) {
+               c = p->all;
+               while (c) {
+                       if (!c->display) {
+                               c->Y = 0;
+                               c = c->next;
+                               continue;
+                       }
+
+                       svg_box(Y, c->start_time, c->end_time, "process");
+                       sample = c->samples;
+                       while (sample) {
+                               if (sample->type == TYPE_RUNNING)
+                                       svg_sample(Y, sample->cpu, sample->start_time, sample->end_time);
+                               if (sample->type == TYPE_BLOCKED)
+                                       svg_box(Y, sample->start_time, sample->end_time, "blocked");
+                               if (sample->type == TYPE_WAITING)
+                                       svg_waiting(Y, sample->start_time, sample->end_time);
+                               sample = sample->next;
+                       }
+
+                       if (c->comm) {
+                               char comm[256];
+                               if (c->total_time > 5000000000) /* 5 seconds */
+                                       sprintf(comm, "%s:%i (%2.2fs)", c->comm, p->pid, c->total_time / 1000000000.0);
+                               else
+                                       sprintf(comm, "%s:%i (%3.1fms)", c->comm, p->pid, c->total_time / 1000000.0);
+
+                               svg_text(Y, c->start_time, comm);
+                       }
+                       c->Y = Y;
+                       Y++;
+                       c = c->next;
+               }
+               p = p->next;
+       }
+}
+
+static int determine_display_tasks(u64 threshold)
+{
+       struct per_pid *p;
+       struct per_pidcomm *c;
+       int count = 0;
+
+       p = all_data;
+       while (p) {
+               p->display = 0;
+               if (p->start_time == 1)
+                       p->start_time = first_time;
+
+               /* no exit marker, task kept running to the end */
+               if (p->end_time == 0)
+                       p->end_time = last_time;
+               if (p->total_time >= threshold)
+                       p->display = 1;
+
+               c = p->all;
+
+               while (c) {
+                       c->display = 0;
+
+                       if (c->start_time == 1)
+                               c->start_time = first_time;
+
+                       if (c->total_time >= threshold) {
+                               c->display = 1;
+                               count++;
+                       }
+
+                       if (c->end_time == 0)
+                               c->end_time = last_time;
+
+                       c = c->next;
+               }
+               p = p->next;
+       }
+       return count;
+}
+
+
+
+#define TIME_THRESH 10000000
+
+static void write_svg_file(const char *filename)
+{
+       u64 i;
+       int count;
+
+       numcpus++;
+
+
+       count = determine_display_tasks(TIME_THRESH);
+
+       /* We'd like to show at least 15 tasks; be less picky if we have fewer */
+       if (count < 15)
+               count = determine_display_tasks(TIME_THRESH / 10);
+
+       open_svg(filename, numcpus, count, first_time, last_time);
+
+       svg_time_grid();
+       svg_legenda();
+
+       for (i = 0; i < numcpus; i++)
+               svg_cpu_box(i, max_freq, turbo_frequency);
+
+       draw_cpu_usage();
+       draw_process_bars();
+       draw_c_p_states();
+       draw_wakeups();
+
+       svg_close();
+}
+
+static int
+process_event(event_t *event)
+{
+
+       switch (event->header.type) {
+
+       case PERF_RECORD_COMM:
+               return process_comm_event(event);
+       case PERF_RECORD_FORK:
+               return process_fork_event(event);
+       case PERF_RECORD_EXIT:
+               return process_exit_event(event);
+       case PERF_RECORD_SAMPLE:
+               return queue_sample_event(event);
+
+       /*
+        * We dont process them right now but they are fine:
+        */
+       case PERF_RECORD_MMAP:
+       case PERF_RECORD_THROTTLE:
+       case PERF_RECORD_UNTHROTTLE:
+               return 0;
+
+       default:
+               return -1;
+       }
+
+       return 0;
+}
+
+static void process_samples(void)
+{
+       struct sample_wrapper *cursor;
+       event_t *event;
+
+       sort_queued_samples();
+
+       cursor = all_samples;
+       while (cursor) {
+               event = (void *)&cursor->data;
+               cursor = cursor->next;
+               process_sample_event(event);
+       }
+}
+
+
+static int __cmd_timechart(void)
+{
+       int ret, rc = EXIT_FAILURE;
+       unsigned long offset = 0;
+       unsigned long head, shift;
+       struct stat statbuf;
+       event_t *event;
+       uint32_t size;
+       char *buf;
+       int input;
+
+       input = open(input_name, O_RDONLY);
+       if (input < 0) {
+               fprintf(stderr, " failed to open file: %s", input_name);
+               if (!strcmp(input_name, "perf.data"))
+                       fprintf(stderr, "  (try 'perf record' first)");
+               fprintf(stderr, "\n");
+               exit(-1);
+       }
+
+       ret = fstat(input, &statbuf);
+       if (ret < 0) {
+               perror("failed to stat file");
+               exit(-1);
+       }
+
+       if (!statbuf.st_size) {
+               fprintf(stderr, "zero-sized file, nothing to do!\n");
+               exit(0);
+       }
+
+       header = perf_header__read(input);
+       head = header->data_offset;
+
+       sample_type = perf_header__sample_type(header);
+
+       shift = page_size * (head / page_size);
+       offset += shift;
+       head -= shift;
+
+remap:
+       buf = (char *)mmap(NULL, page_size * mmap_window, PROT_READ,
+                          MAP_SHARED, input, offset);
+       if (buf == MAP_FAILED) {
+               perror("failed to mmap file");
+               exit(-1);
+       }
+
+more:
+       event = (event_t *)(buf + head);
+
+       size = event->header.size;
+       if (!size)
+               size = 8;
+
+       if (head + event->header.size >= page_size * mmap_window) {
+               int ret2;
+
+               shift = page_size * (head / page_size);
+
+               ret2 = munmap(buf, page_size * mmap_window);
+               assert(ret2 == 0);
+
+               offset += shift;
+               head -= shift;
+               goto remap;
+       }
+
+       size = event->header.size;
+
+       if (!size || process_event(event) < 0) {
+
+               printf("%p [%p]: skipping unknown header type: %d\n",
+                       (void *)(offset + head),
+                       (void *)(long)(event->header.size),
+                       event->header.type);
+
+               /*
+                * assume we lost track of the stream, check alignment, and
+                * increment a single u64 in the hope to catch on again 'soon'.
+                */
+
+               if (unlikely(head & 7))
+                       head &= ~7ULL;
+
+               size = 8;
+       }
+
+       head += size;
+
+       if (offset + head >= header->data_offset + header->data_size)
+               goto done;
+
+       if (offset + head < (unsigned long)statbuf.st_size)
+               goto more;
+
+done:
+       rc = EXIT_SUCCESS;
+       close(input);
+
+
+       process_samples();
+
+       end_sample_processing();
+
+       sort_pids();
+
+       write_svg_file(output_name);
+
+       printf("Written %2.1f seconds of trace to %s.\n", (last_time - first_time) / 1000000000.0, output_name);
+
+       return rc;
+}
+
+static const char * const timechart_usage[] = {
+       "perf timechart [<options>] {record}",
+       NULL
+};
+
+static const char *record_args[] = {
+       "record",
+       "-a",
+       "-R",
+       "-M",
+       "-f",
+       "-c", "1",
+       "-e", "power:power_start",
+       "-e", "power:power_end",
+       "-e", "power:power_frequency",
+       "-e", "sched:sched_wakeup",
+       "-e", "sched:sched_switch",
+};
+
+static int __cmd_record(int argc, const char **argv)
+{
+       unsigned int rec_argc, i, j;
+       const char **rec_argv;
+
+       rec_argc = ARRAY_SIZE(record_args) + argc - 1;
+       rec_argv = calloc(rec_argc + 1, sizeof(char *));
+
+       for (i = 0; i < ARRAY_SIZE(record_args); i++)
+               rec_argv[i] = strdup(record_args[i]);
+
+       for (j = 1; j < (unsigned int)argc; j++, i++)
+               rec_argv[i] = argv[j];
+
+       return cmd_record(i, rec_argv, NULL);
+}
+
+static const struct option options[] = {
+       OPT_STRING('i', "input", &input_name, "file",
+                   "input file name"),
+       OPT_STRING('o', "output", &output_name, "file",
+                   "output file name"),
+       OPT_INTEGER('w', "width", &svg_page_width,
+                   "page width"),
+       OPT_END()
+};
+
+
+int cmd_timechart(int argc, const char **argv, const char *prefix __used)
+{
+       symbol__init();
+
+       page_size = getpagesize();
+
+       argc = parse_options(argc, argv, options, timechart_usage,
+                       PARSE_OPT_STOP_AT_NON_OPTION);
+
+       if (argc && !strncmp(argv[0], "rec", 3))
+               return __cmd_record(argc, argv);
+       else if (argc)
+               usage_with_options(timechart_usage, options);
+
+       setup_pager();
+
+       return __cmd_timechart();
+}
index 4002ccb..1ca8889 100644 (file)
@@ -901,7 +901,7 @@ struct mmap_data {
 
 static unsigned int mmap_read_head(struct mmap_data *md)
 {
-       struct perf_counter_mmap_page *pc = md->base;
+       struct perf_event_mmap_page *pc = md->base;
        int head;
 
        head = pc->data_head;
@@ -977,9 +977,9 @@ static void mmap_read_counter(struct mmap_data *md)
 
                old += size;
 
-               if (event->header.type == PERF_EVENT_SAMPLE) {
+               if (event->header.type == PERF_RECORD_SAMPLE) {
                        int user =
-       (event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK) == PERF_EVENT_MISC_USER;
+       (event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK) == PERF_RECORD_MISC_USER;
                        process_event(event->ip.ip, md->counter, user);
                }
        }
@@ -1005,7 +1005,7 @@ int group_fd;
 
 static void start_counter(int i, int counter)
 {
-       struct perf_counter_attr *attr;
+       struct perf_event_attr *attr;
        int cpu;
 
        cpu = profile_cpu;
@@ -1019,7 +1019,7 @@ static void start_counter(int i, int counter)
        attr->inherit           = (cpu < 0) && inherit;
 
 try_again:
-       fd[i][counter] = sys_perf_counter_open(attr, target_pid, cpu, group_fd, 0);
+       fd[i][counter] = sys_perf_event_open(attr, target_pid, cpu, group_fd, 0);
 
        if (fd[i][counter] < 0) {
                int err = errno;
@@ -1044,7 +1044,7 @@ try_again:
                printf("\n");
                error("perfcounter syscall returned with %d (%s)\n",
                        fd[i][counter], strerror(err));
-               die("No CONFIG_PERF_COUNTERS=y kernel support configured?\n");
+               die("No CONFIG_PERF_EVENTS=y kernel support configured?\n");
                exit(-1);
        }
        assert(fd[i][counter] >= 0);
index 914ab36..e9d256e 100644 (file)
@@ -35,14 +35,14 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)
 
        thread = threads__findnew(event->comm.pid, &threads, &last_match);
 
-       dump_printf("%p [%p]: PERF_EVENT_COMM: %s:%d\n",
+       dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->comm.comm, event->comm.pid);
 
        if (thread == NULL ||
            thread__set_comm(thread, event->comm.comm)) {
-               dump_printf("problem processing PERF_EVENT_COMM, skipping event.\n");
+               dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");
                return -1;
        }
        total_comm++;
@@ -82,7 +82,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                more_data += sizeof(u64);
        }
 
-       dump_printf("%p [%p]: PERF_EVENT_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
+       dump_printf("%p [%p]: PERF_RECORD_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
                (void *)(offset + head),
                (void *)(long)(event->header.size),
                event->header.misc,
@@ -98,9 +98,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                return -1;
        }
 
-       cpumode = event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK;
+       cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
-       if (cpumode == PERF_EVENT_MISC_KERNEL) {
+       if (cpumode == PERF_RECORD_MISC_KERNEL) {
                show = SHOW_KERNEL;
                level = 'k';
 
@@ -108,7 +108,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 
                dump_printf(" ...... dso: %s\n", dso->name);
 
-       } else if (cpumode == PERF_EVENT_MISC_USER) {
+       } else if (cpumode == PERF_RECORD_MISC_USER) {
 
                show = SHOW_USER;
                level = '.';
@@ -146,19 +146,19 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
        trace_event(event);
 
        switch (event->header.type) {
-       case PERF_EVENT_MMAP ... PERF_EVENT_LOST:
+       case PERF_RECORD_MMAP ... PERF_RECORD_LOST:
                return 0;
 
-       case PERF_EVENT_COMM:
+       case PERF_RECORD_COMM:
                return process_comm_event(event, offset, head);
 
-       case PERF_EVENT_EXIT ... PERF_EVENT_READ:
+       case PERF_RECORD_EXIT ... PERF_RECORD_READ:
                return 0;
 
-       case PERF_EVENT_SAMPLE:
+       case PERF_RECORD_SAMPLE:
                return process_sample_event(event, offset, head);
 
-       case PERF_EVENT_MAX:
+       case PERF_RECORD_MAX:
        default:
                return -1;
        }
index 3a63e41..e11d8d2 100644 (file)
@@ -16,12 +16,14 @@ extern int check_pager_config(const char *cmd);
 
 extern int cmd_annotate(int argc, const char **argv, const char *prefix);
 extern int cmd_help(int argc, const char **argv, const char *prefix);
+extern int cmd_sched(int argc, const char **argv, const char *prefix);
+extern int cmd_list(int argc, const char **argv, const char *prefix);
 extern int cmd_record(int argc, const char **argv, const char *prefix);
 extern int cmd_report(int argc, const char **argv, const char *prefix);
 extern int cmd_stat(int argc, const char **argv, const char *prefix);
+extern int cmd_timechart(int argc, const char **argv, const char *prefix);
 extern int cmd_top(int argc, const char **argv, const char *prefix);
-extern int cmd_version(int argc, const char **argv, const char *prefix);
-extern int cmd_list(int argc, const char **argv, const char *prefix);
 extern int cmd_trace(int argc, const char **argv, const char *prefix);
+extern int cmd_version(int argc, const char **argv, const char *prefix);
 
 #endif
index eebce30..00326e2 100644 (file)
@@ -4,7 +4,10 @@
 #
 perf-annotate                  mainporcelain common
 perf-list                      mainporcelain common
+perf-sched                     mainporcelain common
 perf-record                    mainporcelain common
 perf-report                    mainporcelain common
 perf-stat                      mainporcelain common
+perf-timechart                 mainporcelain common
 perf-top                       mainporcelain common
+perf-trace                     mainporcelain common
index f71e0d2..f1946d1 100644 (file)
@@ -18,10 +18,10 @@ underlying hardware counters.
 Performance counters are accessed via special file descriptors.
 There's one file descriptor per virtual counter used.
 
-The special file descriptor is opened via the perf_counter_open()
+The special file descriptor is opened via the perf_event_open()
 system call:
 
-   int sys_perf_counter_open(struct perf_counter_hw_event *hw_event_uptr,
+   int sys_perf_event_open(struct perf_event_hw_event *hw_event_uptr,
                             pid_t pid, int cpu, int group_fd,
                             unsigned long flags);
 
@@ -32,9 +32,9 @@ can be used to set the blocking mode, etc.
 Multiple counters can be kept open at a time, and the counters
 can be poll()ed.
 
-When creating a new counter fd, 'perf_counter_hw_event' is:
+When creating a new counter fd, 'perf_event_hw_event' is:
 
-struct perf_counter_hw_event {
+struct perf_event_hw_event {
         /*
          * The MSB of the config word signifies if the rest contains cpu
          * specific (raw) counter configuration data, if unset, the next
@@ -93,7 +93,7 @@ specified by 'event_id':
 
 /*
  * Generalized performance counter event types, used by the hw_event.event_id
- * parameter of the sys_perf_counter_open() syscall:
+ * parameter of the sys_perf_event_open() syscall:
  */
 enum hw_event_ids {
        /*
@@ -159,7 +159,7 @@ in size.
  * reads on the counter should return the indicated quantities,
  * in increasing order of bit value, after the counter value.
  */
-enum perf_counter_read_format {
+enum perf_event_read_format {
         PERF_FORMAT_TOTAL_TIME_ENABLED  =  1,
         PERF_FORMAT_TOTAL_TIME_RUNNING  =  2,
 };
@@ -178,7 +178,7 @@ interrupt:
  * Bits that can be set in hw_event.record_type to request information
  * in the overflow packets.
  */
-enum perf_counter_record_format {
+enum perf_event_record_format {
         PERF_RECORD_IP          = 1U << 0,
         PERF_RECORD_TID         = 1U << 1,
         PERF_RECORD_TIME        = 1U << 2,
@@ -228,7 +228,7 @@ these events are recorded in the ring-buffer (see below).
 The 'comm' bit allows tracking of process comm data on process creation.
 This too is recorded in the ring-buffer (see below).
 
-The 'pid' parameter to the perf_counter_open() system call allows the
+The 'pid' parameter to the perf_event_open() system call allows the
 counter to be specific to a task:
 
  pid == 0: if the pid parameter is zero, the counter is attached to the
@@ -258,7 +258,7 @@ The 'flags' parameter is currently unused and must be zero.
 
 The 'group_fd' parameter allows counter "groups" to be set up.  A
 counter group has one counter which is the group "leader".  The leader
-is created first, with group_fd = -1 in the perf_counter_open call
+is created first, with group_fd = -1 in the perf_event_open call
 that creates it.  The rest of the group members are created
 subsequently, with group_fd giving the fd of the group leader.
 (A single counter on its own is created with group_fd = -1 and is
@@ -277,13 +277,13 @@ tracking are logged into a ring-buffer. This ring-buffer is created and
 accessed through mmap().
 
 The mmap size should be 1+2^n pages, where the first page is a meta-data page
-(struct perf_counter_mmap_page) that contains various bits of information such
+(struct perf_event_mmap_page) that contains various bits of information such
 as where the ring-buffer head is.
 
 /*
  * Structure of the page that can be mapped via mmap
  */
-struct perf_counter_mmap_page {
+struct perf_event_mmap_page {
         __u32   version;                /* version number of this structure */
         __u32   compat_version;         /* lowest version this is compat with */
 
@@ -317,7 +317,7 @@ struct perf_counter_mmap_page {
          * Control data for the mmap() data buffer.
          *
          * User-space reading this value should issue an rmb(), on SMP capable
-         * platforms, after reading this value -- see perf_counter_wakeup().
+         * platforms, after reading this value -- see perf_event_wakeup().
          */
         __u32   data_head;              /* head in the data section */
 };
@@ -327,9 +327,9 @@ NOTE: the hw-counter userspace bits are arch specific and are currently only
 
 The following 2^n pages are the ring-buffer which contains events of the form:
 
-#define PERF_EVENT_MISC_KERNEL          (1 << 0)
-#define PERF_EVENT_MISC_USER            (1 << 1)
-#define PERF_EVENT_MISC_OVERFLOW        (1 << 2)
+#define PERF_RECORD_MISC_KERNEL          (1 << 0)
+#define PERF_RECORD_MISC_USER            (1 << 1)
+#define PERF_RECORD_MISC_OVERFLOW        (1 << 2)
 
 struct perf_event_header {
         __u32   type;
@@ -353,8 +353,8 @@ enum perf_event_type {
          *      char                            filename[];
          * };
          */
-        PERF_EVENT_MMAP                 = 1,
-        PERF_EVENT_MUNMAP               = 2,
+        PERF_RECORD_MMAP                 = 1,
+        PERF_RECORD_MUNMAP               = 2,
 
         /*
          * struct {
@@ -364,10 +364,10 @@ enum perf_event_type {
          *      char                            comm[];
          * };
          */
-        PERF_EVENT_COMM                 = 3,
+        PERF_RECORD_COMM                 = 3,
 
         /*
-         * When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field
+         * When header.misc & PERF_RECORD_MISC_OVERFLOW the event_type field
          * will be PERF_RECORD_*
          *
          * struct {
@@ -397,7 +397,7 @@ Notification of new events is possible through poll()/select()/epoll() and
 fcntl() managing signals.
 
 Normally a notification is generated for every page filled, however one can
-additionally set perf_counter_hw_event.wakeup_events to generate one every
+additionally set perf_event_hw_event.wakeup_events to generate one every
 so many counter overflow events.
 
 Future work will include a splice() interface to the ring-buffer.
@@ -409,11 +409,11 @@ events but does continue to exist and maintain its count value.
 
 An individual counter or counter group can be enabled with
 
-       ioctl(fd, PERF_COUNTER_IOC_ENABLE);
+       ioctl(fd, PERF_EVENT_IOC_ENABLE);
 
 or disabled with
 
-       ioctl(fd, PERF_COUNTER_IOC_DISABLE);
+       ioctl(fd, PERF_EVENT_IOC_DISABLE);
 
 Enabling or disabling the leader of a group enables or disables the
 whole group; that is, while the group leader is disabled, none of the
@@ -424,16 +424,16 @@ other counter.
 
 Additionally, non-inherited overflow counters can use
 
-       ioctl(fd, PERF_COUNTER_IOC_REFRESH, nr);
+       ioctl(fd, PERF_EVENT_IOC_REFRESH, nr);
 
 to enable a counter for 'nr' events, after which it gets disabled again.
 
 A process can enable or disable all the counter groups that are
 attached to it, using prctl:
 
-       prctl(PR_TASK_PERF_COUNTERS_ENABLE);
+       prctl(PR_TASK_PERF_EVENTS_ENABLE);
 
-       prctl(PR_TASK_PERF_COUNTERS_DISABLE);
+       prctl(PR_TASK_PERF_EVENTS_DISABLE);
 
 This applies to all counters on the current process, whether created
 by this process or by another, and doesn't affect any counters that
@@ -447,11 +447,11 @@ Arch requirements
 If your architecture does not have hardware performance metrics, you can
 still use the generic software counters based on hrtimers for sampling.
 
-So to start with, in order to add HAVE_PERF_COUNTERS to your Kconfig, you
+So to start with, in order to add HAVE_PERF_EVENTS to your Kconfig, you
 will need at least this:
-       - asm/perf_counter.h - a basic stub will suffice at first
+       - asm/perf_event.h - a basic stub will suffice at first
        - support for atomic64 types (and associated helper functions)
-       - set_perf_counter_pending() implemented
+       - set_perf_event_pending() implemented
 
 If your architecture does have hardware capabilities, you can override the
-weak stub hw_perf_counter_init() to register hardware counters.
+weak stub hw_perf_event_init() to register hardware counters.
index fe4589d..19fc7fe 100644 (file)
@@ -289,10 +289,12 @@ static void handle_internal_command(int argc, const char **argv)
                { "record", cmd_record, 0 },
                { "report", cmd_report, 0 },
                { "stat", cmd_stat, 0 },
+               { "timechart", cmd_timechart, 0 },
                { "top", cmd_top, 0 },
                { "annotate", cmd_annotate, 0 },
                { "version", cmd_version, 0 },
                { "trace", cmd_trace, 0 },
+               { "sched", cmd_sched, 0 },
        };
        unsigned int i;
        static const char ext[] = STRIP_EXTENSION;
index 2abeb20..8cc4623 100644 (file)
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-#include "../../include/linux/perf_counter.h"
+#include "../../include/linux/perf_event.h"
 #include "util/types.h"
 
 /*
- * prctl(PR_TASK_PERF_COUNTERS_DISABLE) will (cheaply) disable all
+ * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all
  * counters in the current task.
  */
-#define PR_TASK_PERF_COUNTERS_DISABLE   31
-#define PR_TASK_PERF_COUNTERS_ENABLE    32
+#define PR_TASK_PERF_EVENTS_DISABLE   31
+#define PR_TASK_PERF_EVENTS_ENABLE    32
 
 #ifndef NSEC_PER_SEC
 # define NSEC_PER_SEC                  1000000000ULL
@@ -90,12 +90,12 @@ static inline unsigned long long rdclock(void)
        _min1 < _min2 ? _min1 : _min2; })
 
 static inline int
-sys_perf_counter_open(struct perf_counter_attr *attr,
+sys_perf_event_open(struct perf_event_attr *attr,
                      pid_t pid, int cpu, int group_fd,
                      unsigned long flags)
 {
        attr->size = sizeof(*attr);
-       return syscall(__NR_perf_counter_open, attr, pid, cpu,
+       return syscall(__NR_perf_event_open, attr, pid, cpu,
                       group_fd, flags);
 }
 
index fa2d4e9..2c9c26d 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __PERF_EVENT_H
-#define __PERF_EVENT_H
+#ifndef __PERF_RECORD_H
+#define __PERF_RECORD_H
 #include "../perf.h"
 #include "util.h"
 #include <linux/list.h>
@@ -39,6 +39,7 @@ struct fork_event {
        struct perf_event_header header;
        u32 pid, ppid;
        u32 tid, ptid;
+       u64 time;
 };
 
 struct lost_event {
@@ -52,13 +53,19 @@ struct lost_event {
  */
 struct read_event {
        struct perf_event_header header;
-       u32 pid,tid;
+       u32 pid, tid;
        u64 value;
        u64 time_enabled;
        u64 time_running;
        u64 id;
 };
 
+struct sample_event{
+       struct perf_event_header        header;
+       u64 array[];
+};
+
+
 typedef union event_union {
        struct perf_event_header        header;
        struct ip_event                 ip;
@@ -67,6 +74,7 @@ typedef union event_union {
        struct fork_event               fork;
        struct lost_event               lost;
        struct read_event               read;
+       struct sample_event             sample;
 } event_t;
 
 struct map {
index ec4d4c2..e306857 100644 (file)
@@ -7,10 +7,9 @@
 #include "header.h"
 
 /*
- *
+ * Create new perf.data header attribute:
  */
-
-struct perf_header_attr *perf_header_attr__new(struct perf_counter_attr *attr)
+struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr)
 {
        struct perf_header_attr *self = malloc(sizeof(*self));
 
@@ -43,9 +42,8 @@ void perf_header_attr__add_id(struct perf_header_attr *self, u64 id)
 }
 
 /*
- *
+ * Create new perf.data header:
  */
-
 struct perf_header *perf_header__new(void)
 {
        struct perf_header *self = malloc(sizeof(*self));
@@ -86,6 +84,46 @@ void perf_header__add_attr(struct perf_header *self,
        self->attr[pos] = attr;
 }
 
+#define MAX_EVENT_NAME 64
+
+struct perf_trace_event_type {
+       u64     event_id;
+       char    name[MAX_EVENT_NAME];
+};
+
+static int event_count;
+static struct perf_trace_event_type *events;
+
+void perf_header__push_event(u64 id, const char *name)
+{
+       if (strlen(name) > MAX_EVENT_NAME)
+               printf("Event %s will be truncated\n", name);
+
+       if (!events) {
+               events = malloc(sizeof(struct perf_trace_event_type));
+               if (!events)
+                       die("nomem");
+       } else {
+               events = realloc(events, (event_count + 1) * sizeof(struct perf_trace_event_type));
+               if (!events)
+                       die("nomem");
+       }
+       memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));
+       events[event_count].event_id = id;
+       strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);
+       event_count++;
+}
+
+char *perf_header__find_event(u64 id)
+{
+       int i;
+       for (i = 0 ; i < event_count; i++) {
+               if (events[i].event_id == id)
+                       return events[i].name;
+       }
+       return NULL;
+}
+
 static const char *__perf_magic = "PERFFILE";
 
 #define PERF_MAGIC     (*(u64 *)__perf_magic)
@@ -96,7 +134,7 @@ struct perf_file_section {
 };
 
 struct perf_file_attr {
-       struct perf_counter_attr        attr;
+       struct perf_event_attr  attr;
        struct perf_file_section        ids;
 };
 
@@ -106,6 +144,7 @@ struct perf_file_header {
        u64                             attr_size;
        struct perf_file_section        attrs;
        struct perf_file_section        data;
+       struct perf_file_section        event_types;
 };
 
 static void do_write(int fd, void *buf, size_t size)
@@ -154,6 +193,11 @@ void perf_header__write(struct perf_header *self, int fd)
                do_write(fd, &f_attr, sizeof(f_attr));
        }
 
+       self->event_offset = lseek(fd, 0, SEEK_CUR);
+       self->event_size = event_count * sizeof(struct perf_trace_event_type);
+       if (events)
+               do_write(fd, events, self->event_size);
+
 
        self->data_offset = lseek(fd, 0, SEEK_CUR);
 
@@ -169,6 +213,10 @@ void perf_header__write(struct perf_header *self, int fd)
                        .offset = self->data_offset,
                        .size   = self->data_size,
                },
+               .event_types = {
+                       .offset = self->event_offset,
+                       .size   = self->event_size,
+               },
        };
 
        lseek(fd, 0, SEEK_SET);
@@ -234,6 +282,17 @@ struct perf_header *perf_header__read(int fd)
                lseek(fd, tmp, SEEK_SET);
        }
 
+       if (f_header.event_types.size) {
+               lseek(fd, f_header.event_types.offset, SEEK_SET);
+               events = malloc(f_header.event_types.size);
+               if (!events)
+                       die("nomem");
+               do_read(fd, events, f_header.event_types.size);
+               event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);
+       }
+       self->event_offset = f_header.event_types.offset;
+       self->event_size   = f_header.event_types.size;
+
        self->data_offset = f_header.data.offset;
        self->data_size   = f_header.data.size;
 
@@ -261,7 +320,7 @@ u64 perf_header__sample_type(struct perf_header *header)
        return type;
 }
 
-struct perf_counter_attr *
+struct perf_event_attr *
 perf_header__find_attr(u64 id, struct perf_header *header)
 {
        int i;
index 5d0a72e..a0761bc 100644 (file)
@@ -1,12 +1,12 @@
 #ifndef _PERF_HEADER_H
 #define _PERF_HEADER_H
 
-#include "../../../include/linux/perf_counter.h"
+#include "../../../include/linux/perf_event.h"
 #include <sys/types.h>
 #include "types.h"
 
 struct perf_header_attr {
-       struct perf_counter_attr attr;
+       struct perf_event_attr attr;
        int ids, size;
        u64 *id;
        off_t id_offset;
@@ -19,6 +19,8 @@ struct perf_header {
        s64 attr_offset;
        u64 data_offset;
        u64 data_size;
+       u64 event_offset;
+       u64 event_size;
 };
 
 struct perf_header *perf_header__read(int fd);
@@ -27,12 +29,16 @@ void perf_header__write(struct perf_header *self, int fd);
 void perf_header__add_attr(struct perf_header *self,
                           struct perf_header_attr *attr);
 
+void perf_header__push_event(u64 id, const char *name);
+char *perf_header__find_event(u64 id);
+
+
 struct perf_header_attr *
-perf_header_attr__new(struct perf_counter_attr *attr);
+perf_header_attr__new(struct perf_event_attr *attr);
 void perf_header_attr__add_id(struct perf_header_attr *self, u64 id);
 
 u64 perf_header__sample_type(struct perf_header *header);
-struct perf_counter_attr *
+struct perf_event_attr *
 perf_header__find_attr(u64 id, struct perf_header *header);
 
 
index a587d41..13ab4b8 100644 (file)
@@ -6,10 +6,11 @@
 #include "exec_cmd.h"
 #include "string.h"
 #include "cache.h"
+#include "header.h"
 
 int                                    nr_counters;
 
-struct perf_counter_attr               attrs[MAX_COUNTERS];
+struct perf_event_attr         attrs[MAX_COUNTERS];
 
 struct event_symbol {
        u8              type;
@@ -18,6 +19,12 @@ struct event_symbol {
        const char      *alias;
 };
 
+enum event_result {
+       EVT_FAILED,
+       EVT_HANDLED,
+       EVT_HANDLED_ALL
+};
+
 char debugfs_path[MAXPATHLEN];
 
 #define CHW(x) .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_##x
@@ -41,13 +48,13 @@ static struct event_symbol event_symbols[] = {
   { CSW(CPU_MIGRATIONS),       "cpu-migrations",       "migrations"    },
 };
 
-#define __PERF_COUNTER_FIELD(config, name) \
-       ((config & PERF_COUNTER_##name##_MASK) >> PERF_COUNTER_##name##_SHIFT)
+#define __PERF_EVENT_FIELD(config, name) \
+       ((config & PERF_EVENT_##name##_MASK) >> PERF_EVENT_##name##_SHIFT)
 
-#define PERF_COUNTER_RAW(config)       __PERF_COUNTER_FIELD(config, RAW)
-#define PERF_COUNTER_CONFIG(config)    __PERF_COUNTER_FIELD(config, CONFIG)
-#define PERF_COUNTER_TYPE(config)      __PERF_COUNTER_FIELD(config, TYPE)
-#define PERF_COUNTER_ID(config)                __PERF_COUNTER_FIELD(config, EVENT)
+#define PERF_EVENT_RAW(config) __PERF_EVENT_FIELD(config, RAW)
+#define PERF_EVENT_CONFIG(config)      __PERF_EVENT_FIELD(config, CONFIG)
+#define PERF_EVENT_TYPE(config)        __PERF_EVENT_FIELD(config, TYPE)
+#define PERF_EVENT_ID(config)          __PERF_EVENT_FIELD(config, EVENT)
 
 static const char *hw_event_names[] = {
        "cycles",
@@ -139,7 +146,7 @@ static int tp_event_has_id(struct dirent *sys_dir, struct dirent *evt_dir)
           (strcmp(evt_dirent.d_name, "..")) &&                                \
           (!tp_event_has_id(&sys_dirent, &evt_dirent)))
 
-#define MAX_EVENT_LENGTH 30
+#define MAX_EVENT_LENGTH 512
 
 int valid_debugfs_mount(const char *debugfs)
 {
@@ -344,8 +351,8 @@ static int parse_aliases(const char **str, const char *names[][MAX_ALIASES], int
        return -1;
 }
 
-static int
-parse_generic_hw_event(const char **str, struct perf_counter_attr *attr)
+static enum event_result
+parse_generic_hw_event(const char **str, struct perf_event_attr *attr)
 {
        const char *s = *str;
        int cache_type = -1, cache_op = -1, cache_result = -1;
@@ -356,7 +363,7 @@ parse_generic_hw_event(const char **str, struct perf_counter_attr *attr)
         * then bail out:
         */
        if (cache_type == -1)
-               return 0;
+               return EVT_FAILED;
 
        while ((cache_op == -1 || cache_result == -1) && *s == '-') {
                ++s;
@@ -402,27 +409,115 @@ parse_generic_hw_event(const char **str, struct perf_counter_attr *attr)
        attr->type = PERF_TYPE_HW_CACHE;
 
        *str = s;
-       return 1;
+       return EVT_HANDLED;
+}
+
+static enum event_result
+parse_single_tracepoint_event(char *sys_name,
+                             const char *evt_name,
+                             unsigned int evt_length,
+                             char *flags,
+                             struct perf_event_attr *attr,
+                             const char **strp)
+{
+       char evt_path[MAXPATHLEN];
+       char id_buf[4];
+       u64 id;
+       int fd;
+
+       if (flags) {
+               if (!strncmp(flags, "record", strlen(flags))) {
+                       attr->sample_type |= PERF_SAMPLE_RAW;
+                       attr->sample_type |= PERF_SAMPLE_TIME;
+                       attr->sample_type |= PERF_SAMPLE_CPU;
+               }
+       }
+
+       snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
+                sys_name, evt_name);
+
+       fd = open(evt_path, O_RDONLY);
+       if (fd < 0)
+               return EVT_FAILED;
+
+       if (read(fd, id_buf, sizeof(id_buf)) < 0) {
+               close(fd);
+               return EVT_FAILED;
+       }
+
+       close(fd);
+       id = atoll(id_buf);
+       attr->config = id;
+       attr->type = PERF_TYPE_TRACEPOINT;
+       *strp = evt_name + evt_length;
+
+       return EVT_HANDLED;
+}
+
+/* sys + ':' + event + ':' + flags*/
+#define MAX_EVOPT_LEN  (MAX_EVENT_LENGTH * 2 + 2 + 128)
+static enum event_result
+parse_subsystem_tracepoint_event(char *sys_name, char *flags)
+{
+       char evt_path[MAXPATHLEN];
+       struct dirent *evt_ent;
+       DIR *evt_dir;
+
+       snprintf(evt_path, MAXPATHLEN, "%s/%s", debugfs_path, sys_name);
+       evt_dir = opendir(evt_path);
+
+       if (!evt_dir) {
+               perror("Can't open event dir");
+               return EVT_FAILED;
+       }
+
+       while ((evt_ent = readdir(evt_dir))) {
+               char event_opt[MAX_EVOPT_LEN + 1];
+               int len;
+               unsigned int rem = MAX_EVOPT_LEN;
+
+               if (!strcmp(evt_ent->d_name, ".")
+                   || !strcmp(evt_ent->d_name, "..")
+                   || !strcmp(evt_ent->d_name, "enable")
+                   || !strcmp(evt_ent->d_name, "filter"))
+                       continue;
+
+               len = snprintf(event_opt, MAX_EVOPT_LEN, "%s:%s", sys_name,
+                              evt_ent->d_name);
+               if (len < 0)
+                       return EVT_FAILED;
+
+               rem -= len;
+               if (flags) {
+                       if (rem < strlen(flags) + 1)
+                               return EVT_FAILED;
+
+                       strcat(event_opt, ":");
+                       strcat(event_opt, flags);
+               }
+
+               if (parse_events(NULL, event_opt, 0))
+                       return EVT_FAILED;
+       }
+
+       return EVT_HANDLED_ALL;
 }
 
-static int parse_tracepoint_event(const char **strp,
-                                   struct perf_counter_attr *attr)
+
+static enum event_result parse_tracepoint_event(const char **strp,
+                                   struct perf_event_attr *attr)
 {
        const char *evt_name;
        char *flags;
        char sys_name[MAX_EVENT_LENGTH];
-       char id_buf[4];
-       int fd;
        unsigned int sys_length, evt_length;
-       u64 id;
-       char evt_path[MAXPATHLEN];
 
        if (valid_debugfs_mount(debugfs_path))
                return 0;
 
        evt_name = strchr(*strp, ':');
        if (!evt_name)
-               return 0;
+               return EVT_FAILED;
 
        sys_length = evt_name - *strp;
        if (sys_length >= MAX_EVENT_LENGTH)
@@ -434,32 +529,22 @@ static int parse_tracepoint_event(const char **strp,
 
        flags = strchr(evt_name, ':');
        if (flags) {
-               *flags = '\0';
+               /* split it out: */
+               evt_name = strndup(evt_name, flags - evt_name);
                flags++;
-               if (!strncmp(flags, "record", strlen(flags)))
-                       attr->sample_type |= PERF_SAMPLE_RAW;
        }
 
        evt_length = strlen(evt_name);
        if (evt_length >= MAX_EVENT_LENGTH)
-               return 0;
-
-       snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
-                sys_name, evt_name);
-       fd = open(evt_path, O_RDONLY);
-       if (fd < 0)
-               return 0;
+               return EVT_FAILED;
 
-       if (read(fd, id_buf, sizeof(id_buf)) < 0) {
-               close(fd);
-               return 0;
-       }
-       close(fd);
-       id = atoll(id_buf);
-       attr->config = id;
-       attr->type = PERF_TYPE_TRACEPOINT;
-       *strp = evt_name + evt_length;
-       return 1;
+       if (!strcmp(evt_name, "*")) {
+               *strp = evt_name + evt_length;
+               return parse_subsystem_tracepoint_event(sys_name, flags);
+       } else
+               return parse_single_tracepoint_event(sys_name, evt_name,
+                                                    evt_length, flags,
+                                                    attr, strp);
 }
 
 static int check_events(const char *str, unsigned int i)
@@ -477,8 +562,8 @@ static int check_events(const char *str, unsigned int i)
        return 0;
 }
 
-static int
-parse_symbolic_event(const char **strp, struct perf_counter_attr *attr)
+static enum event_result
+parse_symbolic_event(const char **strp, struct perf_event_attr *attr)
 {
        const char *str = *strp;
        unsigned int i;
@@ -490,32 +575,33 @@ parse_symbolic_event(const char **strp, struct perf_counter_attr *attr)
                        attr->type = event_symbols[i].type;
                        attr->config = event_symbols[i].config;
                        *strp = str + n;
-                       return 1;
+                       return EVT_HANDLED;
                }
        }
-       return 0;
+       return EVT_FAILED;
 }
 
-static int parse_raw_event(const char **strp, struct perf_counter_attr *attr)
+static enum event_result
+parse_raw_event(const char **strp, struct perf_event_attr *attr)
 {
        const char *str = *strp;
        u64 config;
        int n;
 
        if (*str != 'r')
-               return 0;
+               return EVT_FAILED;
        n = hex2u64(str + 1, &config);
        if (n > 0) {
                *strp = str + n + 1;
                attr->type = PERF_TYPE_RAW;
                attr->config = config;
-               return 1;
+               return EVT_HANDLED;
        }
-       return 0;
+       return EVT_FAILED;
 }
 
-static int
-parse_numeric_event(const char **strp, struct perf_counter_attr *attr)
+static enum event_result
+parse_numeric_event(const char **strp, struct perf_event_attr *attr)
 {
        const char *str = *strp;
        char *endp;
@@ -530,14 +616,14 @@ parse_numeric_event(const char **strp, struct perf_counter_attr *attr)
                        attr->type = type;
                        attr->config = config;
                        *strp = endp;
-                       return 1;
+                       return EVT_HANDLED;
                }
        }
-       return 0;
+       return EVT_FAILED;
 }
 
-static int
-parse_event_modifier(const char **strp, struct perf_counter_attr *attr)
+static enum event_result
+parse_event_modifier(const char **strp, struct perf_event_attr *attr)
 {
        const char *str = *strp;
        int eu = 1, ek = 1, eh = 1;
@@ -569,37 +655,84 @@ parse_event_modifier(const char **strp, struct perf_counter_attr *attr)
  * Each event can have multiple symbolic names.
  * Symbolic names are (almost) exactly matched.
  */
-static int parse_event_symbols(const char **str, struct perf_counter_attr *attr)
+static enum event_result
+parse_event_symbols(const char **str, struct perf_event_attr *attr)
 {
-       if (!(parse_tracepoint_event(str, attr) ||
-             parse_raw_event(str, attr) ||
-             parse_numeric_event(str, attr) ||
-             parse_symbolic_event(str, attr) ||
-             parse_generic_hw_event(str, attr)))
-               return 0;
+       enum event_result ret;
+
+       ret = parse_tracepoint_event(str, attr);
+       if (ret != EVT_FAILED)
+               goto modifier;
+
+       ret = parse_raw_event(str, attr);
+       if (ret != EVT_FAILED)
+               goto modifier;
+
+       ret = parse_numeric_event(str, attr);
+       if (ret != EVT_FAILED)
+               goto modifier;
+
+       ret = parse_symbolic_event(str, attr);
+       if (ret != EVT_FAILED)
+               goto modifier;
 
+       ret = parse_generic_hw_event(str, attr);
+       if (ret != EVT_FAILED)
+               goto modifier;
+
+       return EVT_FAILED;
+
+modifier:
        parse_event_modifier(str, attr);
 
-       return 1;
+       return ret;
 }
 
+static void store_event_type(const char *orgname)
+{
+       char filename[PATH_MAX], *c;
+       FILE *file;
+       int id;
+
+       sprintf(filename, "/sys/kernel/debug/tracing/events/%s/id", orgname);
+       c = strchr(filename, ':');
+       if (c)
+               *c = '/';
+
+       file = fopen(filename, "r");
+       if (!file)
+               return;
+       if (fscanf(file, "%i", &id) < 1)
+               die("cannot store event ID");
+       fclose(file);
+       perf_header__push_event(id, orgname);
+}
+
+
 int parse_events(const struct option *opt __used, const char *str, int unset __used)
 {
-       struct perf_counter_attr attr;
+       struct perf_event_attr attr;
+       enum event_result ret;
+
+       if (strchr(str, ':'))
+               store_event_type(str);
 
        for (;;) {
                if (nr_counters == MAX_COUNTERS)
                        return -1;
 
                memset(&attr, 0, sizeof(attr));
-               if (!parse_event_symbols(&str, &attr))
+               ret = parse_event_symbols(&str, &attr);
+               if (ret == EVT_FAILED)
                        return -1;
 
                if (!(*str == 0 || *str == ',' || isspace(*str)))
                        return -1;
 
-               attrs[nr_counters] = attr;
-               nr_counters++;
+               if (ret != EVT_HANDLED_ALL) {
+                       attrs[nr_counters] = attr;
+                       nr_counters++;
+               }
 
                if (*str == 0)
                        break;
index 60704c1..30c6081 100644 (file)
@@ -16,7 +16,7 @@ extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
 
 extern int                     nr_counters;
 
-extern struct perf_counter_attr attrs[MAX_COUNTERS];
+extern struct perf_event_attr attrs[MAX_COUNTERS];
 
 extern const char *event_name(int ctr);
 extern const char *__event_name(int type, u64 config);
index 8aa3464..2ee248f 100644 (file)
@@ -104,6 +104,8 @@ struct option {
        { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb }
 #define OPT_CALLBACK(s, l, v, a, h, f) \
        { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) }
+#define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \
+       { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG }
 #define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \
        { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .defval = (intptr_t)d, .flags = PARSE_OPT_LASTARG_DEFAULT }
 
diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c
new file mode 100644 (file)
index 0000000..a778fd0
--- /dev/null
@@ -0,0 +1,488 @@
+/*
+ * svghelper.c - helper functions for outputting svg
+ *
+ * (C) Copyright 2009 Intel Corporation
+ *
+ * Authors:
+ *     Arjan van de Ven <arjan@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "svghelper.h"
+
+static u64 first_time, last_time;
+static u64 turbo_frequency, max_freq;
+
+
+#define SLOT_MULT 30.0
+#define SLOT_HEIGHT 25.0
+
+int svg_page_width = 1000;
+
+#define MIN_TEXT_SIZE 0.001
+
+static u64 total_height;
+static FILE *svgfile;
+
+static double cpu2slot(int cpu)
+{
+       return 2 * cpu + 1;
+}
+
+static double cpu2y(int cpu)
+{
+       return cpu2slot(cpu) * SLOT_MULT;
+}
+
+static double time2pixels(u64 time)
+{
+       double X;
+
+       X = 1.0 * svg_page_width * (time - first_time) / (last_time - first_time);
+       return X;
+}
+
+/*
+ * Round text sizes so that the svg viewer only needs a discrete
+ * number of renderings of the font
+ */
+static double round_text_size(double size)
+{
+       int loop = 100;
+       double target = 10.0;
+
+       if (size >= 10.0)
+               return size;
+       while (loop--) {
+               if (size >= target)
+                       return target;
+               target = target / 2.0;
+       }
+       return size;
+}
+
+void open_svg(const char *filename, int cpus, int rows, u64 start, u64 end)
+{
+       int new_width;
+
+       svgfile = fopen(filename, "w");
+       if (!svgfile) {
+               fprintf(stderr, "Cannot open %s for output\n", filename);
+               return;
+       }
+       first_time = start;
+       first_time = first_time / 100000000 * 100000000;
+       last_time = end;
+
+       /*
+        * if the recording is short, we default to a width of 1000, but
+        * for longer recordings we want at least 200 units of width per second
+        */
+       new_width = (last_time - first_time) / 5000000;
+
+       if (new_width > svg_page_width)
+               svg_page_width = new_width;
+
+       total_height = (1 + rows + cpu2slot(cpus)) * SLOT_MULT;
+       fprintf(svgfile, "<?xml version=\"1.0\" standalone=\"no\"?> \n");
+       fprintf(svgfile, "<svg width=\"%i\" height=\"%llu\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n", svg_page_width, total_height);
+
+       fprintf(svgfile, "<defs>\n  <style type=\"text/css\">\n    <![CDATA[\n");
+
+       fprintf(svgfile, "      rect          { stroke-width: 1; }\n");
+       fprintf(svgfile, "      rect.process  { fill:rgb(180,180,180); fill-opacity:0.9; stroke-width:1;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.process2 { fill:rgb(180,180,180); fill-opacity:0.9; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.sample   { fill:rgb(  0,  0,255); fill-opacity:0.8; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.blocked  { fill:rgb(255,  0,  0); fill-opacity:0.5; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.waiting  { fill:rgb(214,214,  0); fill-opacity:0.3; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.WAITING  { fill:rgb(255,214, 48); fill-opacity:0.6; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+       fprintf(svgfile, "      rect.cpu      { fill:rgb(192,192,192); fill-opacity:0.2; stroke-width:0.5; stroke:rgb(128,128,128); } \n");
+       fprintf(svgfile, "      rect.pstate   { fill:rgb(128,128,128); fill-opacity:0.8; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c1       { fill:rgb(255,214,214); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c2       { fill:rgb(255,172,172); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c3       { fill:rgb(255,130,130); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c4       { fill:rgb(255, 88, 88); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c5       { fill:rgb(255, 44, 44); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      rect.c6       { fill:rgb(255,  0,  0); fill-opacity:0.5; stroke-width:0; } \n");
+       fprintf(svgfile, "      line.pstate   { stroke:rgb(255,255,  0); stroke-opacity:0.8; stroke-width:2; } \n");
+
+       fprintf(svgfile, "    ]]>\n   </style>\n</defs>\n");
+}
+
+void svg_box(int Yslot, u64 start, u64 end, const char *type)
+{
+       if (!svgfile)
+               return;
+
+       fprintf(svgfile, "<rect x=\"%4.8f\" width=\"%4.8f\" y=\"%4.1f\" height=\"%4.1f\" class=\"%s\"/>\n",
+               time2pixels(start), time2pixels(end)-time2pixels(start), Yslot * SLOT_MULT, SLOT_HEIGHT, type);
+}
+
+void svg_sample(int Yslot, int cpu, u64 start, u64 end)
+{
+       double text_size;
+       if (!svgfile)
+               return;
+
+       fprintf(svgfile, "<rect x=\"%4.8f\" width=\"%4.8f\" y=\"%4.1f\" height=\"%4.1f\" class=\"sample\"/>\n",
+               time2pixels(start), time2pixels(end)-time2pixels(start), Yslot * SLOT_MULT, SLOT_HEIGHT);
+
+       text_size = (time2pixels(end)-time2pixels(start));
+       if (cpu > 9)
+               text_size = text_size/2;
+       if (text_size > 1.25)
+               text_size = 1.25;
+       text_size = round_text_size(text_size);
+
+       if (text_size > MIN_TEXT_SIZE)
+               fprintf(svgfile, "<text x=\"%1.8f\" y=\"%1.8f\" font-size=\"%1.8fpt\">%i</text>\n",
+                       time2pixels(start), Yslot *  SLOT_MULT + SLOT_HEIGHT - 1, text_size,  cpu + 1);
+
+}
+
+static char *time_to_string(u64 duration)
+{
+       static char text[80];
+
+       text[0] = 0;
+
+       if (duration < 1000) /* less than 1 usec */
+               return text;
+
+       if (duration < 1000 * 1000) { /* less than 1 msec */
+               sprintf(text, "%4.1f us", duration / 1000.0);
+               return text;
+       }
+       sprintf(text, "%4.1f ms", duration / 1000.0 / 1000);
+
+       return text;
+}
+
+void svg_waiting(int Yslot, u64 start, u64 end)
+{
+       char *text;
+       const char *style;
+       double font_size;
+
+       if (!svgfile)
+               return;
+
+       style = "waiting";
+
+       if (end-start > 10 * 1000000) /* 10 msec */
+               style = "WAITING";
+
+       text = time_to_string(end-start);
+
+       font_size = 1.0 * (time2pixels(end)-time2pixels(start));
+
+       if (font_size > 3)
+               font_size = 3;
+
+       font_size = round_text_size(font_size);
+
+       fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\">\n", time2pixels(start), Yslot * SLOT_MULT);
+       fprintf(svgfile, "<rect x=\"0\" width=\"%4.8f\" y=\"0\" height=\"%4.1f\" class=\"%s\"/>\n",
+               time2pixels(end)-time2pixels(start), SLOT_HEIGHT, style);
+       if (font_size > MIN_TEXT_SIZE)
+               fprintf(svgfile, "<text transform=\"rotate(90)\" font-size=\"%1.8fpt\"> %s</text>\n",
+                       font_size, text);
+       fprintf(svgfile, "</g>\n");
+}
+
+static char *cpu_model(void)
+{
+       static char cpu_m[255];
+       char buf[256];
+       FILE *file;
+
+       cpu_m[0] = 0;
+       /* CPU type */
+       file = fopen("/proc/cpuinfo", "r");
+       if (file) {
+               while (fgets(buf, 255, file)) {
+                       if (strstr(buf, "model name")) {
+                               strncpy(cpu_m, &buf[13], 255);
+                               break;
+                       }
+               }
+               fclose(file);
+       }
+       return cpu_m;
+}
+
+void svg_cpu_box(int cpu, u64 __max_freq, u64 __turbo_freq)
+{
+       char cpu_string[80];
+       if (!svgfile)
+               return;
+
+       max_freq = __max_freq;
+       turbo_frequency = __turbo_freq;
+
+       fprintf(svgfile, "<rect x=\"%4.8f\" width=\"%4.8f\" y=\"%4.1f\" height=\"%4.1f\" class=\"cpu\"/>\n",
+               time2pixels(first_time),
+               time2pixels(last_time)-time2pixels(first_time),
+               cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT);
+
+       sprintf(cpu_string, "CPU %i", (int)cpu+1);
+       fprintf(svgfile, "<text x=\"%4.8f\" y=\"%4.8f\">%s</text>\n",
+               10+time2pixels(first_time), cpu2y(cpu) + SLOT_HEIGHT/2, cpu_string);
+
+       fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f)\" font-size=\"1.25pt\">%s</text>\n",
+               10+time2pixels(first_time), cpu2y(cpu) + SLOT_MULT + SLOT_HEIGHT - 4, cpu_model());
+}
+
+void svg_process(int cpu, u64 start, u64 end, const char *type, const char *name)
+{
+       double width;
+
+       if (!svgfile)
+               return;
+
+
+       fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\">\n", time2pixels(start), cpu2y(cpu));
+       fprintf(svgfile, "<rect x=\"0\" width=\"%4.8f\" y=\"0\" height=\"%4.1f\" class=\"%s\"/>\n",
+               time2pixels(end)-time2pixels(start), SLOT_MULT+SLOT_HEIGHT, type);
+       width = time2pixels(end)-time2pixels(start);
+       if (width > 6)
+               width = 6;
+
+       width = round_text_size(width);
+
+       if (width > MIN_TEXT_SIZE)
+               fprintf(svgfile, "<text transform=\"rotate(90)\" font-size=\"%3.8fpt\">%s</text>\n",
+                       width, name);
+
+       fprintf(svgfile, "</g>\n");
+}
+
+void svg_cstate(int cpu, u64 start, u64 end, int type)
+{
+       double width;
+       char style[128];
+
+       if (!svgfile)
+               return;
+
+
+       if (type > 6)
+               type = 6;
+       sprintf(style, "c%i", type);
+
+       fprintf(svgfile, "<rect class=\"%s\" x=\"%4.8f\" width=\"%4.8f\" y=\"%4.1f\" height=\"%4.1f\"/>\n",
+               style,
+               time2pixels(start), time2pixels(end)-time2pixels(start),
+               cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT);
+
+       width = (time2pixels(end)-time2pixels(start))/2.0;
+       if (width > 6)
+               width = 6;
+
+       width = round_text_size(width);
+
+       if (width > MIN_TEXT_SIZE)
+               fprintf(svgfile, "<text x=\"%4.8f\" y=\"%4.8f\" font-size=\"%3.8fpt\">C%i</text>\n",
+                       time2pixels(start), cpu2y(cpu)+width, width, type);
+}
+
+static char *HzToHuman(unsigned long hz)
+{
+       static char buffer[1024];
+       unsigned long long Hz;
+
+       memset(buffer, 0, 1024);
+
+       Hz = hz;
+
+       /* default: just put the Number in */
+       sprintf(buffer, "%9lli", Hz);
+
+       if (Hz > 1000)
+               sprintf(buffer, " %6lli Mhz", (Hz+500)/1000);
+
+       if (Hz > 1500000)
+               sprintf(buffer, " %6.2f Ghz", (Hz+5000.0)/1000000);
+
+       if (Hz == turbo_frequency)
+               sprintf(buffer, "Turbo");
+
+       return buffer;
+}
+
+void svg_pstate(int cpu, u64 start, u64 end, u64 freq)
+{
+       double height = 0;
+
+       if (!svgfile)
+               return;
+
+       if (max_freq)
+               height = freq * 1.0 / max_freq * (SLOT_HEIGHT + SLOT_MULT);
+       height = 1 + cpu2y(cpu) + SLOT_MULT + SLOT_HEIGHT - height;
+       fprintf(svgfile, "<line x1=\"%4.8f\" x2=\"%4.8f\" y1=\"%4.1f\" y2=\"%4.1f\" class=\"pstate\"/>\n",
+               time2pixels(start), time2pixels(end), height, height);
+       fprintf(svgfile, "<text x=\"%4.8f\" y=\"%4.8f\" font-size=\"0.25pt\">%s</text>\n",
+               time2pixels(start), height+0.9, HzToHuman(freq));
+
+}
+
+
+void svg_partial_wakeline(u64 start, int row1, char *desc1, int row2, char *desc2)
+{
+       double height;
+
+       if (!svgfile)
+               return;
+
+
+       if (row1 < row2) {
+               if (row1) {
+                       fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                               time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT,  time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/32);
+                       if (desc2)
+                               fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\"><text transform=\"rotate(90)\" font-size=\"0.02pt\">%s &gt;</text></g>\n",
+                                       time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT + SLOT_HEIGHT/48, desc2);
+               }
+               if (row2) {
+                       fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                               time2pixels(start), row2 * SLOT_MULT - SLOT_MULT/32,  time2pixels(start), row2 * SLOT_MULT);
+                       if (desc1)
+                               fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\"><text transform=\"rotate(90)\" font-size=\"0.02pt\">%s &gt;</text></g>\n",
+                                       time2pixels(start), row2 * SLOT_MULT - SLOT_MULT/32, desc1);
+               }
+       } else {
+               if (row2) {
+                       fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                               time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT,  time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/32);
+                       if (desc1)
+                               fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\"><text transform=\"rotate(90)\" font-size=\"0.02pt\">%s &lt;</text></g>\n",
+                                       time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/48, desc1);
+               }
+               if (row1) {
+                       fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                               time2pixels(start), row1 * SLOT_MULT - SLOT_MULT/32,  time2pixels(start), row1 * SLOT_MULT);
+                       if (desc2)
+                               fprintf(svgfile, "<g transform=\"translate(%4.8f,%4.8f)\"><text transform=\"rotate(90)\" font-size=\"0.02pt\">%s &lt;</text></g>\n",
+                                       time2pixels(start), row1 * SLOT_MULT - SLOT_HEIGHT/32, desc2);
+               }
+       }
+       height = row1 * SLOT_MULT;
+       if (row2 > row1)
+               height += SLOT_HEIGHT;
+       if (row1)
+               fprintf(svgfile, "<circle  cx=\"%4.8f\" cy=\"%4.2f\" r = \"0.01\"  style=\"fill:rgb(32,255,32)\"/>\n",
+                       time2pixels(start), height);
+}
+
+void svg_wakeline(u64 start, int row1, int row2)
+{
+       double height;
+
+       if (!svgfile)
+               return;
+
+
+       if (row1 < row2)
+               fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                       time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT,  time2pixels(start), row2 * SLOT_MULT);
+       else
+               fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%4.2f\" style=\"stroke:rgb(32,255,32);stroke-width:0.009\"/>\n",
+                       time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT,  time2pixels(start), row1 * SLOT_MULT);
+
+       height = row1 * SLOT_MULT;
+       if (row2 > row1)
+               height += SLOT_HEIGHT;
+       fprintf(svgfile, "<circle  cx=\"%4.8f\" cy=\"%4.2f\" r = \"0.01\"  style=\"fill:rgb(32,255,32)\"/>\n",
+                       time2pixels(start), height);
+}
+
+void svg_interrupt(u64 start, int row)
+{
+       if (!svgfile)
+               return;
+
+       fprintf(svgfile, "<circle  cx=\"%4.8f\" cy=\"%4.2f\" r = \"0.01\"  style=\"fill:rgb(255,128,128)\"/>\n",
+                       time2pixels(start), row * SLOT_MULT);
+       fprintf(svgfile, "<circle  cx=\"%4.8f\" cy=\"%4.2f\" r = \"0.01\"  style=\"fill:rgb(255,128,128)\"/>\n",
+                       time2pixels(start), row * SLOT_MULT + SLOT_HEIGHT);
+}
+
+void svg_text(int Yslot, u64 start, const char *text)
+{
+       if (!svgfile)
+               return;
+
+       fprintf(svgfile, "<text x=\"%4.8f\" y=\"%4.8f\">%s</text>\n",
+               time2pixels(start), Yslot * SLOT_MULT+SLOT_HEIGHT/2, text);
+}
+
+static void svg_legenda_box(int X, const char *text, const char *style)
+{
+       double boxsize;
+       boxsize = SLOT_HEIGHT / 2;
+
+       fprintf(svgfile, "<rect x=\"%i\" width=\"%4.8f\" y=\"0\" height=\"%4.1f\" class=\"%s\"/>\n",
+               X, boxsize, boxsize, style);
+       fprintf(svgfile, "<text transform=\"translate(%4.8f, %4.8f)\" font-size=\"%4.8fpt\">%s</text>\n",
+               X + boxsize + 5, boxsize, 0.8 * boxsize, text);
+}
+
+void svg_legenda(void)
+{
+       if (!svgfile)
+               return;
+
+       svg_legenda_box(0,      "Running", "sample");
+       svg_legenda_box(100,    "Idle","rect.c1");
+       svg_legenda_box(200,    "Deeper Idle", "rect.c3");
+       svg_legenda_box(350,    "Deepest Idle", "rect.c6");
+       svg_legenda_box(550,    "Sleeping", "process2");
+       svg_legenda_box(650,    "Waiting for cpu", "waiting");
+       svg_legenda_box(800,    "Blocked on IO", "blocked");
+}
+
+void svg_time_grid(void)
+{
+       u64 i;
+
+       if (!svgfile)
+               return;
+
+       i = first_time;
+       while (i < last_time) {
+               int color = 220;
+               double thickness = 0.075;
+               if ((i % 100000000) == 0) {
+                       thickness = 0.5;
+                       color = 192;
+               }
+               if ((i % 1000000000) == 0) {
+                       thickness = 2.0;
+                       color = 128;
+               }
+
+               fprintf(svgfile, "<line x1=\"%4.8f\" y1=\"%4.2f\" x2=\"%4.8f\" y2=\"%llu\" style=\"stroke:rgb(%i,%i,%i);stroke-width:%1.3f\"/>\n",
+                       time2pixels(i), SLOT_MULT/2, time2pixels(i), total_height, color, color, color, thickness);
+
+               i += 10000000;
+       }
+}
+
+void svg_close(void)
+{
+       if (svgfile) {
+               fprintf(svgfile, "</svg>\n");
+               fclose(svgfile);
+               svgfile = NULL;
+       }
+}
diff --git a/tools/perf/util/svghelper.h b/tools/perf/util/svghelper.h
new file mode 100644 (file)
index 0000000..cd93195
--- /dev/null
@@ -0,0 +1,28 @@
+#ifndef _INCLUDE_GUARD_SVG_HELPER_
+#define _INCLUDE_GUARD_SVG_HELPER_
+
+#include "types.h"
+
+extern void open_svg(const char *filename, int cpus, int rows, u64 start, u64 end);
+extern void svg_box(int Yslot, u64 start, u64 end, const char *type);
+extern void svg_sample(int Yslot, int cpu, u64 start, u64 end);
+extern void svg_waiting(int Yslot, u64 start, u64 end);
+extern void svg_cpu_box(int cpu, u64 max_frequency, u64 turbo_frequency);
+
+
+extern void svg_process(int cpu, u64 start, u64 end, const char *type, const char *name);
+extern void svg_cstate(int cpu, u64 start, u64 end, int type);
+extern void svg_pstate(int cpu, u64 start, u64 end, u64 freq);
+
+
+extern void svg_time_grid(void);
+extern void svg_legenda(void);
+extern void svg_wakeline(u64 start, int row1, int row2);
+extern void svg_partial_wakeline(u64 start, int row1, char *desc1, int row2, char *desc2);
+extern void svg_interrupt(u64 start, int row);
+extern void svg_text(int Yslot, u64 start, const char *text);
+extern void svg_close(void);
+
+extern int svg_page_width;
+
+#endif
index 7635928..45efb5d 100644 (file)
@@ -8,7 +8,7 @@
 
 static struct thread *thread__new(pid_t pid)
 {
-       struct thread *self = malloc(sizeof(*self));
+       struct thread *self = calloc(1, sizeof(*self));
 
        if (self != NULL) {
                self->pid = pid;
@@ -85,7 +85,7 @@ register_idle_thread(struct rb_root *threads, struct thread **last_match)
 {
        struct thread *thread = threads__findnew(0, threads, last_match);
 
-       if (!thread || thread__set_comm(thread, "[init]")) {
+       if (!thread || thread__set_comm(thread, "swapper")) {
                fprintf(stderr, "problem inserting idle task.\n");
                exit(-1);
        }
index 634f280..32aea3c 100644 (file)
@@ -4,10 +4,11 @@
 #include "symbol.h"
 
 struct thread {
-       struct rb_node   rb_node;
-       struct list_head maps;
-       pid_t            pid;
-       char             *comm;
+       struct rb_node          rb_node;
+       struct list_head        maps;
+       pid_t                   pid;
+       char                    shortname[3];
+       char                    *comm;
 };
 
 int thread__set_comm(struct thread *self, const char *comm);
index 6c9302a..af4b057 100644 (file)
@@ -458,7 +458,7 @@ static void read_proc_kallsyms(void)
 static void read_ftrace_printk(void)
 {
        unsigned int size, check_size;
-       const char *path;
+       char *path;
        struct stat st;
        int ret;
 
@@ -468,23 +468,24 @@ static void read_ftrace_printk(void)
                /* not found */
                size = 0;
                write_or_die(&size, 4);
-               return;
+               goto out;
        }
        size = get_size(path);
        write_or_die(&size, 4);
        check_size = copy_file(path);
        if (size != check_size)
                die("error in size of file '%s'", path);
-
+out:
+       put_tracing_file(path);
 }
 
 static struct tracepoint_path *
-get_tracepoints_path(struct perf_counter_attr *pattrs, int nb_counters)
+get_tracepoints_path(struct perf_event_attr *pattrs, int nb_events)
 {
        struct tracepoint_path path, *ppath = &path;
        int i;
 
-       for (i = 0; i < nb_counters; i++) {
+       for (i = 0; i < nb_events; i++) {
                if (pattrs[i].type != PERF_TYPE_TRACEPOINT)
                        continue;
                ppath->next = tracepoint_id_to_path(pattrs[i].config);
@@ -495,7 +496,7 @@ get_tracepoints_path(struct perf_counter_attr *pattrs, int nb_counters)
 
        return path.next;
 }
-void read_tracing_data(struct perf_counter_attr *pattrs, int nb_counters)
+void read_tracing_data(struct perf_event_attr *pattrs, int nb_events)
 {
        char buf[BUFSIZ];
        struct tracepoint_path *tps;
@@ -529,7 +530,7 @@ void read_tracing_data(struct perf_counter_attr *pattrs, int nb_counters)
        page_size = getpagesize();
        write_or_die(&page_size, 4);
 
-       tps = get_tracepoints_path(pattrs, nb_counters);
+       tps = get_tracepoints_path(pattrs, nb_events);
 
        read_header_files();
        read_ftrace_files(tps);
index 629e602..f6a8437 100644 (file)
@@ -1776,6 +1776,29 @@ static unsigned long long read_size(void *ptr, int size)
        }
 }
 
+unsigned long long
+raw_field_value(struct event *event, const char *name, void *data)
+{
+       struct format_field *field;
+
+       field = find_any_field(event, name);
+       if (!field)
+               return 0ULL;
+
+       return read_size(data + field->offset, field->size);
+}
+
+void *raw_field_ptr(struct event *event, const char *name, void *data)
+{
+       struct format_field *field;
+
+       field = find_any_field(event, name);
+       if (!field)
+               return NULL;
+
+       return data + field->offset;
+}
+
 static int get_common_info(const char *type, int *offset, int *size)
 {
        struct event *event;
@@ -1799,7 +1822,7 @@ static int get_common_info(const char *type, int *offset, int *size)
        return 0;
 }
 
-static int parse_common_type(void *data)
+int trace_parse_common_type(void *data)
 {
        static int type_offset;
        static int type_size;
@@ -1832,7 +1855,7 @@ static int parse_common_pid(void *data)
        return read_size(data + pid_offset, pid_size);
 }
 
-static struct event *find_event(int id)
+struct event *trace_find_event(int id)
 {
        struct event *event;
 
@@ -2420,8 +2443,8 @@ get_return_for_leaf(int cpu, int cur_pid, unsigned long long cur_func,
        int type;
        int pid;
 
-       type = parse_common_type(next->data);
-       event = find_event(type);
+       type = trace_parse_common_type(next->data);
+       event = trace_find_event(type);
        if (!event)
                return NULL;
 
@@ -2502,8 +2525,8 @@ print_graph_entry_leaf(struct event *event, void *data, struct record *ret_rec)
        int type;
        int i;
 
-       type = parse_common_type(ret_rec->data);
-       ret_event = find_event(type);
+       type = trace_parse_common_type(ret_rec->data);
+       ret_event = trace_find_event(type);
 
        field = find_field(ret_event, "rettime");
        if (!field)
@@ -2696,11 +2719,13 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs,
        nsecs -= secs * NSECS_PER_SEC;
        usecs = nsecs / NSECS_PER_USEC;
 
-       type = parse_common_type(data);
+       type = trace_parse_common_type(data);
 
-       event = find_event(type);
-       if (!event)
-               die("ug! no event found for type %d", type);
+       event = trace_find_event(type);
+       if (!event) {
+               printf("ug! no event found for type %d\n", type);
+               return;
+       }
 
        pid = parse_common_pid(data);
 
index a1217a1..1b5c847 100644 (file)
@@ -458,12 +458,13 @@ struct record *trace_read_data(int cpu)
        return data;
 }
 
-void trace_report (void)
+void trace_report(void)
 {
        const char *input_file = "trace.info";
        char buf[BUFSIZ];
        char test[] = { 23, 8, 68 };
        char *version;
+       int show_version = 0;
        int show_funcs = 0;
        int show_printk = 0;
 
@@ -480,7 +481,8 @@ void trace_report (void)
                die("not a trace file (missing tracing)");
 
        version = read_string();
-       printf("version = %s\n", version);
+       if (show_version)
+               printf("version = %s\n", version);
        free(version);
 
        read_or_die(buf, 1);
index 420294a..693f815 100644 (file)
@@ -234,7 +234,12 @@ extern int header_page_data_offset;
 extern int header_page_data_size;
 
 int parse_header_page(char *buf, unsigned long size);
+int trace_parse_common_type(void *data);
+struct event *trace_find_event(int id);
+unsigned long long
+raw_field_value(struct event *event, const char *name, void *data);
+void *raw_field_ptr(struct event *event, const char *name, void *data);
 
-void read_tracing_data(struct perf_counter_attr *pattrs, int nb_counters);
+void read_tracing_data(struct perf_event_attr *pattrs, int nb_events);
 
 #endif /* _TRACE_EVENTS_H */
index f1d3fe3..83b3dde 100644 (file)
@@ -446,7 +446,7 @@ static int cpio_mkfile_line(const char *line)
        return rc;
 }
 
-void usage(const char *prog)
+static void usage(const char *prog)
 {
        fprintf(stderr, "Usage:\n"
                "\t%s <cpio_list>\n"